Imported Upstream version 8.23upstream/8.23

2235 files changed, 124015 insertions, 108538 deletions

diff --git a/.mailmap b/.mailmap
index dcabcb53..b5cf17cf 100644
--- a/.mailmap
+++ b/.mailmap
@@ -26,6 +26,7 @@ Pádraig Brady <p@draigBrady.com> <P@draigBrady.com>
 <psfales@alcatel-lucent.com> <psfales@lucent.com>
 <karl@gnu.org> <karl@freefriends.org>
 <stephane.raimbault@gmail.com> <stephane.raimbault@makina-corpus.com>
+<jarkko.sakkinen@iki.fi> <jarkko.sakkinen@linux.intel.com>
 
 # Prefer spelled-out middle name and its address.
 Arne Henrik Juul <arnej@imf.unit.no> Arne H. Juul <arnej@solan.unit.no>
diff --git a/.prev-version b/.prev-version
index e0b7b02e..92189430 100644
--- a/.prev-version
+++ b/.prev-version
@@ -1 +1 @@
-8.20
+8.22
diff --git a/.tarball-version b/.tarball-version
index 671d7055..3c7af72b 100644
--- a/.tarball-version
+++ b/.tarball-version
@@ -1 +1 @@
-8.21
+8.23
diff --git a/.version b/.version
index 671d7055..3c7af72b 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-8.21
+8.23
diff --git a/.vg-suppressions b/.vg-suppressions
index 557927e4..db940cb2 100644
--- a/.vg-suppressions
+++ b/.vg-suppressions
@@ -1,6 +1,6 @@
 # Suppress valgrind diagnostics we don't care about.
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/AUTHORS b/AUTHORS
index df21e90a..0296830b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -12,6 +12,7 @@ chown: David MacKenzie, Jim Meyering
 chroot: Roland McGrath
 cksum: Q. Frank Xia
 comm: Richard M. Stallman, David MacKenzie
+coreutils: Alex Deymo
 cp: Torbjörn Granlund, David MacKenzie, Jim Meyering
 csplit: Stuart Kemp, David MacKenzie
 cut: David M. Ihnat, David MacKenzie, Jim Meyering
diff --git a/ChangeLog b/ChangeLog
index 205b3d4e..f9ce4441 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,4196 @@
+2014-07-18  Pádraig Brady  <P@draigBrady.com>
+
+	version 8.23
+	* NEWS: Record release date.
+
+	build: port new bootstrap script to POSIX shells
+	* build-aux/gen-single-binary.sh: Avoid bash only constructs.
+	Reported by Assaf Gordon
+
+	tests: fix false failure with spaces in the test directory
+	* tests/misc/env.sh: Skip if we can't execute the generated shebang,
+	which would be the case if there are spaces in the directory hierarchy.
+	This is triggered by `make distcheck`
+
+2014-07-18  Pádraig Brady  <P@draigBrady.com>
+
+	build: don't distribute generated coreutils.h
+	This issue was identified by the manifest comparisons
+	done by `make distcheck`
+
+	* src/local.mk (noinst_HEADERS): Remove coreutils.h from this always
+	distributed list.
+	(nodist_src_coreutils_SOURCES): Add coreutils.h as its contents
+	are determined at configure time, so pointless to distribute.
+	(src_coreutils_SOURCES): Define explicitly so that the corresponding
+	nodist_ variable is honored.
+	(DISTCLEANFILES): Add coreutils.h to this rather than CLEANFILES,
+	as its contents are determined at configure time.
+
+2014-07-18  Pádraig Brady  <P@draigBrady.com>
+
+	tests: fix false failure in cp --preserve=context test
+	With libselinux-2.2.1-6.fc20.x86_64, kernel-3.12.6-300.fc20.x86_64
+	`cp --preserve=context src dst` was seen to succeed when src and
+	dst where on the same fixed context file system, as lsetfilecon()
+	returned success in this case when the context wasn't being changed.
+
+	* tests/cp/cp-a-selinux.sh: Copy from a different file system to
+	most likely have a different context that will test context
+	setting logic correctly.
+
+2014-07-18  Pádraig Brady  <P@draigBrady.com>
+
+	maint: avoid a syntax-check warning in previous commit
+	* cfg.mk: Avoid warning for @AMDEP_TRUE@ usage in man/local.mk
+
+2014-07-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+	build: port to non-GNU make
+	This fixes a problem with native Solaris 'make', which does not
+	grok '-include' lines (a GNU extension to POSIX 'make').
+	* configure.ac (man/dynamic-deps.mk): Create it, with an old
+	time stamp, if doing dynamic dependency tracking.
+	* man/local.mk (DISTCLEANFILES): Put man/dynamic-deps.mk here,
+	rather than in CLEANFILES.
+	(man/dynamic-deps.mk): Don't create it read-only, so that we
+	can easily touch it later.
+	Include it with '@AMDEP_TRUE@@am__include@', not with '-include',
+	as '-include' does not work with native Solaris 'make'.
+
+2014-07-16  Assaf Gordon  <assafgordon@gmail.com>
+
+	numfmt: fix isblank() usage for some unibyte locales
+	* src/numfmt.c (simple_strtod_int): Replace isdigit() with c_isdigit()
+	to avoid locale concerns and -Wchar-subscripts warnings on cygwin.
+	Remove the now redundant locale guard.
+	(simple_strtod_human): Cast characters to unsigned so that the promoted
+	int value passed to isblank() is positive, allowing it to work correctly
+	for all characters in unibyte locales.  Previously character 0xA0,
+	i.e. non-breaking space, would be misclassified for example.
+	(process_suffixed_number): Likewise.
+	(skip_fields): Likewise.
+	Both issues were triggered by the -Wchar-subscripts warning on GCC 4.8.3
+	on cygwin, due to the is*() implementations used there, but the issue
+	is present on all platforms defaulting to signed chars.
+	* NEWS: Mention the bug fix.
+
+	Reported by Eric Blake
+
+2014-07-14  Pádraig Brady  <P@draigBrady.com>
+
+	tests: fix portabilitiy issue in new od-endian test
+	* tests/misc/od-endian.sh: '\n' is not generally supported
+	in the replacement, so use the more portable "\\$NL".
+
+	tests: fix portability issue in new dd/ascii test
+	* tests/dd/ascii.sh: Quote so that '\\' is passed
+	to printf rather than a single '\', as that's not portable.
+	bash, dash, zsh and external solaris printf were seen to support
+	  printf '\%03o' 1 2
+	while ksh, freebsh shell and external GNU printf need the more portable
+	  printf '\\%03o' 1 2
+	Note we don't use env here to call the coreutils printf implementation,
+	as there are many printf calls, so relying on portable shell
+	implementations will be faster.
+
+	tests: avoid hang when files created with wrong permissions
+	* tests/split/b-chunk.sh: Never show the rm prompt which would
+	hang the test suite.  This was seen when split erroneously
+	created files with no persmissions, which was triggered by
+	this compiler bug in clang 3.4:
+	http://llvm.org/bugs/show_bug.cgi?id=18346
+
+	maint: avoid clang -Wint-to-pointer-cast warning
+	* src/chroot.c: Explicitly cast int to pointer type.
+
+2014-07-13  Pádraig Brady  <P@draigBrady.com>
+
+	build: update gnulib submodule to latest
+	* gnulib: Sync recent cleanups and the fix for
+	missing df entries in the presence of bind mounts:
+	http://bugs.gnu.org/17833
+	* NEWS: Detail the df bug fix.
+
+2014-07-13  Pádraig Brady  <P@draigBrady.com>
+
+	sort: avoid undefined operation with destroying locked mutex
+	This didn't seem to cause any invalid operation on GNU/Linux at least,
+	but depending on the implementation, mutex deadlocks could occur.
+	For example this might be the cause of lockups seen on Solaris:
+	http://lists.gnu.org/archive/html/coreutils/2013-03/msg00048.html
+
+	This was identified with valgrind 3.9.0 with this setup:
+
+	  seq 200000 > file.sort
+	  valgrind --tool=drd src/sort file.sort -o file.sort
+
+	With that, valgrind would _intermittently_ report the following:
+
+	 Destroying locked mutex: mutex 0x5419548, recursion count 1, owner 2.
+	    at 0x4C2E3F0: pthread_mutex_destroy(in vgpreload_drd-amd64-linux.so)
+	    by 0x409FA2: sortlines (sort.c:3649)
+	    by 0x409E26: sortlines (sort.c:3621)
+	    by 0x40AA9E: sort (sort.c:3955)
+	    by 0x40C5D9: main (sort.c:4739)
+	 mutex 0x5419548 was first observed at:
+	    at 0x4C2DE82: pthread_mutex_init(in vgpreload_drd-amd64-linux.so)
+	    by 0x409266: init_node (sort.c:3276)
+	    by 0x4092F4: init_node (sort.c:3286)
+	    by 0x4090DD: merge_tree_init (sort.c:3234)
+	    by 0x40AA5A: sort (sort.c:3951)
+	    by 0x40C5D9: main (sort.c:4739)
+
+	 Thread 2:
+	 The object at address 0x5419548 is not a mutex.
+	    at 0x4C2F4A4: pthread_mutex_unlock(in vgpreload_drd-amd64-linux.so)
+	    by 0x4093CA: unlock_node (sort.c:3323)
+	    by 0x409C85: merge_loop (sort.c:3531)
+	    by 0x409F8F: sortlines (sort.c:3644)
+	    by 0x409CE3: sortlines_thread (sort.c:3574)
+	    by 0x4E44F32: start_thread (in /usr/lib64/libpthread-2.18.so)
+	    by 0x514EEAC: clone (in /usr/lib64/libc-2.18.so)
+
+	* src/sort.c (sortlines): Move pthread_mutex_destroy() out to
+	merge_tree_destroy(), so that we don't overlap mutex destruction
+	with threads still operating on the nodes.
+	(sort): Call the destructors only with "lint" defined, as the
+	memory used will be deallocated implicitly at process end.
+	* NEWS: Mention the bug fix.
+
+2014-07-13  Shayan Pooya  <shayan@liveve.org>
+
+	sort: fix two threading issues reported by valgrind
+	Neither issue impacts on the correct operation of sort.
+	The issues were detected by both valgrind 3.8.1 and 3.9.0 using:
+
+	  seq 200000 > file.sort
+	  valgrind --tool=drd src/sort file.sort -o file.sort
+
+	For tool usage and error details see:
+	 http://valgrind.org/docs/manual/drd-manual.html
+
+	* src/sort.c (queue_insert): Unlock mutex _after_ signalling the
+	associated condition variable.  Valgrind flags this with:
+	  "Probably a race condition: condition variable 0xffeffffb0 has been
+	   signaled but the associated mutex 0xffeffff88 is not locked by the
+	   signalling thread."
+	The explanation at the above URL is:
+	  "Sending a signal to a condition variable while no lock is held on
+	   the mutex associated with the condition variable.  This is a common
+	   programming error which can cause subtle race conditions and
+	   unpredictable behavior."
+	This should at least give more defined scheduling behavior.
+
+	(merge_tree_destroy): Make symmetrical with merge_tree_init() thus
+	destroying the correct mutex.  Valgrind flags this with:
+	  "The object at address 0x5476cf8 is not a mutex."
+
+2014-07-13  Pádraig Brady  <P@draigBrady.com>
+
+	maint: avoid an inconsequential mem leak
+	* src/df.c (get_disk): Avoid an inconsequential mem leak
+	spotted by coverity.  Also s/duplicities/duplicates/.
+
+2014-07-13  Jim Meyering  <meyering@fb.com>
+
+	build: adjust new rule not to depend on bash-4.x
+	* man/local.mk (man/dynamic-deps.mk): Use the same code to
+	derive FOO from man/FOO.1 as in the .x.1 rule below.
+	Using the more concise "name=$${man:4: -2}" is not portable enough.
+
+2014-07-13  Alex Deymo  <deymo@chromium.org>
+
+	build: support building all tools in a single binary
+	Add the --enable-single-binary option to the configure file.
+	When enabled, this option builds a single binary file containing
+	the selected tools.  Which tool gets executed depends on the value
+	of argv[0] which can be set implicitly through symlinks to the
+	single program.
+
+	This setup reduces significantly the size of a complete coreutils
+	install, since code from lib/libcoreutils.a is not duplicated in
+	every one of the more than 100 binaries.  Runtime overhead is
+	increased due to more dynamic libraries being loaded, and extra
+	initialization being performed for all utils.  Also initially
+	a larger binary is loaded from storage, though this is usually
+	alleviated due to caching and lazy mmaping of unused blocks,
+	and in fact the single binary should have better caching
+	characteristics.
+
+	Comparing the size of the individual versus single binary on x86_64:
+	  $ cd src
+	  $ size coreutils
+	  $ size -t $(../build-aux/gen-lists-of-programs.sh --list-progs |
+	              grep -Ev '(coreutils|libstdbuf)') | tail -n1
+	     text    data     bss     dec     hex filename
+	  1097416    5388   88432 1191236  122d44 src/coreutils
+	  4901010  124964  163768 5189742  4f306e (TOTALS)
+
+	Storage requirements are reduced similarly:
+	  $ cd src
+	  $ du -h coreutils
+	  $ du -ch $(../build-aux/gen-lists-of-programs.sh --list-progs |
+	             grep -Ev '(coreutils|libstdbuf)') | tail -n1
+	  1.2M    coreutils
+	  5.3M    total
+
+	When installing, the makefile will create either symlinks or
+	shebangs based on the --enable-single-binary setting, for
+	each configured tool. In this way, all the tools are still
+	callable individually, but they are all implemented by the same
+	"coreutils" binary installed on the same directory.
+
+	* .gitignore: Add new generated files.
+	* Makefile.am: New rules to generate build-aux/gen-single-binary.sh
+	  and install symlinks.
+	* NEWS: Mention the new feature.
+	* README: Add "coreutils" to the list of utils.
+	* bootstrap.conf: Regenerate src/single-binary.mk
+	* build-aux/gen-lists-of-programs.sh: New --list-progs option.
+	* build-aux/gen-single-binary.sh: Regenerate
+	* configure.ac: New --enable-single-binary option and other variables.
+	Disallow --enable-single-binary=symlinks with --program-prefix et. al.
+	* man/coreutils.x: Manpage hook.
+	* man/local.mk: Add manpage hook and fix dependencies.
+	* src/coreutils.c: Multicall implementation.
+	* src/local.mk: New rules for the single binary option.
+	* tests/local.mk: Add $single_binary_progs to support
+	require_built_() from init.cfg
+	* tests/misc/env.sh: Avoid the use of symlink to echo.
+	* tests/misc/help-version.sh: Add exception for coreutils.
+	* tests/install/basic-1.sh: Really avoid using ginstall strip
+	functionality if there is an issue with the independent strip command.
+	* src/kill.c: Changes to call exit() in main.
+	* src/readlink.c: Likewise.
+	* src/shuf.c: Likewise.
+	* src/timeout.c: Likewise.
+	* src/truncate.c: Likewise.
+
+2014-07-04  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	maint: simplify parsing df's output in shell scripts
+	Avoid complicated and error-prone parsing of df's output via
+	sed(1), cut(1), etc., and instead use df's more modern --output
+	option.
+
+	* src/ioblksize.h (in a comment): Simplify the extraction of the
+	device name of the mounted file system from df's output.
+	* tests/dd/skip-seek-past-dev.sh: Likewise.
+	* tests/du/2g.sh: Likewise for the 'avail' column here.
+	Also avoid the deprecated use of "tail -NUM".
+	* tests/misc/stat-mount.sh: While at it, remove the determination
+	of the mount point of "." via df(1) plus sed(1) as it is unused
+	since commit v8.5-159-gf57cb37 anyway.  Instead, improve this test
+	by verifying that the output of "stat -c%m ." at least starts with
+	a slash '/'.
+
+2014-07-02  Pádraig Brady  <P@draigBrady.com>
+
+	pwd: revert default mode back to -P
+	Revert commit v8.22-131-g3e89d5b as even though POSIX
+	states that the default mode should be -L,
+	common practice for stand-alone pwd implementations
+	is to default to -P.
+
+	* src/pwd.c (usage): Retain mention of the default mode of operation.
+
+	Suggested by Bob Proulx
+
+2014-07-02  Pádraig Brady  <P@draigBrady.com>
+
+	tests: avoid false failure with spaces in mount point paths
+	* tests/ls/readdir-mountpoint-inode.sh: Quote appropriately
+	to process mount points with spaces in the path.
+	Previously items like these would usually be skipped,
+	though if the path also contained a '-' for example,
+	that would stat stdin, thus producing a wrong inode
+	and a false failure.
+	Fixes http://bugs.gnu.org/17863
+
+	tests: avoid errors on systems without getmntent
+	* tests/df/no-mtab-status.sh: Skip if getmntent() not available.
+	* tests/df/skip-duplicates.sh: Likewise.
+	Fixes http://bugs.gnu.org/17863
+
+2014-07-02  Jim Meyering  <meyering@fb.com>
+
+	tests: use "env builtin" in place of "$abs_top_builddir/src/builtin"
+	This works for any program that might also be a shell built-in.
+	It is more concise.  In addition, it makes output more reproducible:
+	some diagnostics include argv[0], which will now be just the program
+	name, rather than the full absolute name of the executable.
+	* tests/misc/sort-compress.sh: Use env kill, rather than absolute name.
+	* tests/install/trap.sh: Likewise.
+	* tests/misc/timeout.sh: Likewise.
+	* tests/touch/no-dereference.sh: Do the same for two uses of "test".
+	* tests/touch/no-create-missing.sh: Likewise.
+
+2014-07-02  Alex Deymo  <deymo@chromium.org>
+
+	maint: fix context_t init warning on systems without selinux
+	On systems without libselinux, context_t is defined as an int type,
+	but defined as a pointer type by SELinux.
+
+	* src/chcon.c: Init with 0 rather than NULL to avoid warning.
+
+2014-07-01  Jim Meyering  <meyering@fb.com>
+
+	tests: adapt tests to change in pwd's default
+	* tests/misc/pwd-option.sh (base): Initialize with -P,
+	now that -L is the default, to accommodate an initial
+	working directory with a symlink component.
+	* tests/misc/readlink-fp-loop.sh: Use $(env pwd -P) to get the
+	absolute working directory.  Using "env" ensures we do not invoke
+	any shell built-in, and PATH ensures we invoke the one from coreutils.
+	* tests/readlink/can-e.sh: Likewise.
+	* tests/readlink/can-f.sh: Likewise.
+	* tests/readlink/can-m.sh: Likewise.
+
+2014-07-01  Pádraig Brady  <P@draigBrady.com>
+
+	maint: fix const correctness warnings with security_context_t
+	The security_context_t type was always an artificial separation
+	from a standard char* string, and various libselinux using code
+	assumed both were synonymous.  In addition, prior to libselinux 2.3
+	function declarations were incorrect wrt constness of this type.
+	Here we replace security_context_t with char*, and also
+	provide a wrapper function to cater for the const issue on
+	older libselinux.
+
+	* src/system.h (se_const): A new function to avoid and identify
+	the const issue on older libselinux.
+	* src/copy.c: s/security_context_t/char */.
+	* src/cp.c: Likewise.
+	* src/id.c: Likewise.
+	* src/install.c: Likewise.
+	* src/ls.c: Likewise.
+	* src/mkdir.c: Likewise.
+	* src/mkfifo.c: Likewise.
+	* src/mknod.c: Likewise.
+	* src/runcon.c: Likewise.
+	* src/selinux.c: Likewise.
+	* tests/cp/no-ctx.sh: Likewise.
+	* src/chcon.c: Likesize.
+
+2014-07-01  Namhyung Kim  <namhyung@gmail.com>
+
+	chcon: avoid redundant context allocations
+	Since context is verified by security_check_context() it can be used in
+	change_file_context() without converting to context_t every time.
+
+	* src/chcon.c (change_file_context): Use specified_context directly.
+
+2014-07-01  Namhyung Kim  <namhyung@gmail.com>
+
+	chcon: use security_check_context() for context validation
+	context_new() and _free() are used for checking validity of a
+	specified context.  libselinux provides security_check_context
+	for this purpose so use it.
+
+	Note that context_new() can fail for a valid context - e.g. ENOMEM.
+
+	* src/chcon.c (main): Use security_check_context().
+
+2014-06-30  Pádraig Brady  <P@draigBrady.com>
+
+	pwd: assume -L mode by default, as per POSIX
+	* src/pwd.c (main): Adjust default mode to be "logical"
+	and independent of the POSIXLY_CORRECT env var.
+	(usage): Mention the default mode of operation.
+	* doc/coreutils.texi (pwd invocation): Adjust accordingly.
+	* tests/misc/pwd-option.sh: Likewise.
+	* NEWS: Mention the change in behavior.
+
+2014-06-26  Pádraig Brady  <P@draigBrady.com>
+
+	tests: use predetermined NON_ROOT_GID
+	* HACKING: GID is more useful in tests than group name, so rename
+	input param from NON_ROOT_GROUP to NON_ROOT_GID to make it obvious
+	that only a group ID is now acceptable, thus allowing GID lookups
+	to be avoided throughout the tests.
+	* init.cfg (require_root_): Likewise.
+	* tests/misc/truncate-owned-by-other.sh: Avoid looking up the GID.
+	* tests/touch/now-owned-by-other.sh: Likewise.
+	* tests/misc/chroot-credentials.sh: Likewise.  Also fix an instance
+	of comparison against NON_ROOT_GROUP which would have given a false
+	failure if a non numeric value was passed in.
+	* tests/id/setgid.sh: Use previously looked up gid as a more
+	accurate base for the subsequent adjustment, and move
+	the uid lookup within chroot, rather than having the overhead
+	of a separate `id` invocation.
+
+	maint: mention when the du cycle warning bug was introduced
+	* NEWS: Mention bug introduced in v8.1 (with commit v8.0-88-g8ba5d1a).
+
+2014-06-26  Petr Stodůlka  <pstodulk@redhat.com>
+
+	id: output the effective group for the process
+	* src/id.c (print_full_info): When no user is specified,
+	output the effective group for the _process_, rather than
+	the default group from the system database, which may be different.
+	* tests/id/setgid.sh: Add a case for `id` as well as `id -G`.
+	* NEWS: Mention the bug fix.
+	Fixes http://bugs.gnu.org/7320
+	Reported at http://bugzilla.redhat.com/1016163
+
+2014-06-25  Pádraig Brady  <P@draigBrady.com>
+
+	df: report correct device in presence of eclipsed mounts
+	* src/df.c (last_device_for_mount): A new function to identify
+	the last device mounted for a mount point.
+	(get_disk): Use the above to discard mount entries for a device,
+	where a later mount entry uses a different device name than
+	that of the user specified device.
+	* tests/df/over-mount-device.sh: A new root test.
+	* tests/local.mk: Reference the new test.
+	* NEWS: Reword for all these related recent fixes.
+	Discussed at: http://bugs.gnu.org/16539#69
+
+2014-06-24  Pádraig Brady  <P@draigBrady.com>
+
+	df: look for accessible mount points for specified devices
+	* src/df.c (get_disk): Include whether we can access the mount dir,
+	in the mount entry selection criteria.  This handles the case where
+	a device is (bind) mounted multiple times with the shortest mount path
+	not being accessible, while some of the other mount points are.
+	Discussed at: http://bugs.gnu.org/16539#63
+
+2014-06-24  Pádraig Brady  <P@draigBrady.com>
+
+	df: output placeholder values for inaccessible mount points
+	A system provided mount entry may be unavailable due to TOCTOU race,
+	or if another device has been over-mounted at that position, or due to
+	access permissions.  In all these cases output "-" placeholder values
+	rather than either producing an error, or in the over-mount case
+	outputting values for the wrong device.
+
+	* src/df.c (device_list): A new global list now updated by
+	filter_mount_list().
+	(filter_mount_list): Adjust to take a parameter as to whether
+	update the global mount list, or only the mount <-> device ID mapping.
+	(get_dev): Use the device ID mapping to ensure we're not outputting
+	stats for the wrong device.  Also output placeholder values when we
+	can't access a system specified mount point.
+	(get_all_entries): Set the DEVICE_ONLY param for filter_mount_list().
+	(devname_for_dev): A new function to search the mount <-> dev mapping.
+	* test/df/skip-duplicates.sh: Adjust accordingly.
+	* NEWS: Mention the bug fixes.
+
+	Discussed at: http://bugs.gnu.org/16539
+
+2014-06-24  Pádraig Brady  <P@draigBrady.com>
+
+	du: ignore directory cycles due to bind mounts
+	* src/du.c (process_file): Treat cycles due to bind mounts
+	like cycles due to following symlinks.
+	* tests/du/bind-mount-dir-cycle.sh: Adjust accordingly.
+	* NEWS: Mention the change in behavior.
+	Reported at http://bugzilla.redhat.com/836557
+
+	doc: state in ls --help, that -h affects --size format
+	* src/ls.c (usage): State that --human changes --size format.
+	Fixes http://bugs.gnu.org/17838
+
+2014-06-19  Pádraig Brady  <P@draigBrady.com>
+
+	doc: clarify chgrp restrictions
+	* doc/coreutils.texi (chown invocation): Mention the system dependent
+	restrictions on setting groups.
+	(chgrp invocation): Likewise. Reference the 'chown' superset.
+	* man/chgrp.x: Cross reference chown(1) which is the superset interface,
+	and also chown(2) which gives details of the platform restrictions.
+	Fixes http://bugs.gnu.org/17495
+
+2014-06-18  Pádraig Brady  <P@draigBrady.com>
+
+	df: use all of the last device details provided
+	* src/df.c (filter_mount_list): Recent commit v8.22-108-g25a2c94
+	failed to copy file system type along with the updated device name.
+	Therefore simply replace the existing mount entry with the
+	current one with all the latest device details.  Note the name,
+	even if not shorter in this entry, will be replaced with a shorter
+	name in a subsequent mount entry.
+	* tests/df/skip-duplicates.sh: Add a test case.
+
+	seq: fix incorrect output with start or end of -0
+	* src/seq.c (main): Avoid seq_fast() with a start or end of -0.
+	* tests/misc/seq.pl: Add test cases.
+	* NEWS: Mention the fix.
+	Fixes http://bugs.gnu.org/17800
+
+2014-06-13  Pádraig Brady  <P@draigBrady.com>
+
+	tail: fix --follow to use polling mode for VXFS
+	Veritas File System can run in single instance or clustered mode,
+	so mark as remote to avoid using inotify for the latter case.
+
+	* src/stat.c (human_fstype): Tag VXFS as remote, to use polling
+	for the clustered variant (VXCFS).
+	* NEWS: Mention the bug fix.
+
+	Reported by Ondřej Vašík in http://bugzilla.redhat.com/1104244
+	Fixes http://bugs.gnu.org/17770
+
+2014-06-12  Pádraig Brady  <P@draigBrady.com>
+
+	maint: suppress a theoretical buffer overflow warning
+	* src/numfmt.c (double_to_human): The printf format is built up in
+	a stack buffer which is big enough to hold any of the possible formats.
+	However the size parameter passed to snprintf was too big by 1
+	when GROUP was true.  So decrease the buffer available to snprintf
+	to avoid this theoretical in practise but valid coverity warning.
+
+2014-06-11  Pádraig Brady  <P@draigBrady.com>
+
+	tests: fix version printing for ginstall in one test
+	* tests/install/d-slashdot.sh: 'ginstall' is the binary name
+	in the build directory, not 'install'.
+
+2014-06-11  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	install: allow options -D and -t to be used together
+	* src/install.c (install_file_in_file_parents): Factor out the
+	creation of any parent directories into ...
+	(mkancesdirs_safe_wd): ... this new function.
+	(install_file_in_dir): Add the parameter 'mkdir_and_install', and
+	call the above new function if it evaluates to true.
+	(main): During parsing of the -t option, move the check whether
+	the target_directory exists down  after the option parsing loop,
+	and do not complain about stat(optarg,...) failing if -D was given.
+	Pass 'mkdir_and_install' to install_file_in_dir().
+	* doc/coreutils.texi (install invocation): Remove the (false)
+	restriction that -D would be ignored together with -t.  Instead,
+	clarify install's new bahavior.
+	Fix the node's reference in the top-level @direntry for consistency.
+	* src/install/basic-1.sh: Add tests for the now-allowed combination
+	of the -D and -t options.
+	* NEWS: Mention the improvement.
+
+2014-06-11  Pádraig Brady  <P@draigBrady.com>
+
+	build: update gnulib submodule and tests/init.sh to latest
+	* gnulib: Update to latest.
+	* tests/init.sh: Update from gnulib.
+
+2014-06-11  Pádraig Brady  <P@draigBrady.com>
+
+	build: update GCC warnings
+	* configure.ac: Remove the -Wsuggest-attribute=pure
+	enablement on GCC >= 4.7, as that was moot since
+	gnulib was already enabling that warning in its default set.
+	The false positive was seen with 4.6.2, but confirmed
+	not present in 4.6.3, so that's sufficiently old to
+	just leave this enabled unconditionally.
+
+	Remove the -Wsuggest-attribute={const,noreturn}
+	enablement, as gnulib already has those in the default set.
+
+	Enable the -Wlogical-op warning for GCC >= 4.8.0
+	as that is confirmed OK with coreutils at least, due to
+	fixing: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=43772
+
+	Remove the -Wno-logical-op override since the main
+	-Wlogical-op flag is now sufficient to control this warning
+	as of GCC 4.6.3 at least.
+
+2014-06-03  Pádraig Brady  <P@draigBrady.com>
+
+	tests: consolidate tests for true and false
+	* src/true.c (main): Add a comment about the possibility
+	of true returning EXIT_FAILURE due to write failure.
+	* tests/misc/false-status.sh: Fix so we're testing
+	the tool and not the shell builtin.  Add a case for true(1).
+	* tests/misc/help-version.sh: Skip /dev/full test
+	for true as well as false since the exit status is tested separately.
+	Also remove the iterations for different LC_MESSAGES, as this was only
+	applied for false(1).  Translations are not honored in the test dir
+	and so would need separate handling in any case.
+
+2014-06-02  Ben Walton  <bdwalton@gmail.com>
+
+	maint: avoid compiler warnings with some assert() implementations
+	* src/df.c (get_dev): asssert() on Solaris 10 is not marked as
+	__noreturn__ and thus the compiler may think V is uninitialized
+	later on in the function.
+	* THANKS.in: Remove the now committer.
+
+	build: be more specific about .git repo before enabling warnings
+	* configure.ac: When looking for a .git checkout, exclude repos that
+	contain a .tarball-version file as these are probably releases
+	that are imported into git for patch management.
+
+2014-06-01  Pádraig Brady  <P@draigBrady.com>
+
+	cut: restore special case handling of -f with -d$'\n'
+	commits v8.20-98-g51ce0bf and v8.20-99-gd302aed changed cut(1)
+	to process each line independently and thus promptly output
+	each line without buffering.  As part of those changes we removed
+	the special handling of --delimiter=$'\n' --fields=... which
+	could be used to select arbitrary (ranges of) lines, so as to
+	simplify and optimize the implementation while also matching the
+	behavior of different cut(1) implementations.
+
+	However that GNU behavior was in place for a long time, and
+	could be useful in certain cases like making a separated list like
+	`seq 10 | cut -f1- -d$'\n' --output-delimiter=,` although other tools
+	like head(1) and paste(1) are more suited to this operation.
+	This patch reinstates that functionality but restricts the
+	"line behind" buffering behavior to only the -d$'\n' case.
+
+	We also fix the following related edge case to be more consistent:
+
+	  before> printf "\n" | cut -s -d$'\n' -f1- | wc -l
+	  2
+	  before> printf "\n" | cut    -d$'\n' -f1- | wc -l
+	  1
+	  after > printf "\n" | cut -s -d$'\n' -f1- | wc -l
+	  1
+	  after > printf "\n" | cut    -d$'\n' -f1- | wc -l
+	  1
+
+	* src/cut.c (cut_fields): Adjust as discussed above.
+	* tests/misc/cut.pl: Likewise.
+	* NEWS: Mention the change in behavior both for v8.21
+	and this effective revert.
+	* cfg.mk (old_NEWS_hash): Adjust for originally omitted v8.21 entry.
+	* src/paste.c: s/delimeter/delimiter/ comment typo fix.
+
+2014-06-01  Pádraig Brady  <P@draigBrady.com>
+
+	stat: avoid redundant stat() calls
+	* src/stat.c (find_bind_mount): NAME is invariant in the loop,
+	so only stat(NAME) outside the loop.
+
+2014-05-29  Pádraig Brady  <P@draigBrady.com>
+
+	df: use the last device name provided by the system
+	The device name reported for a particular mount entry
+	may no longer be valid if the mount point was subsequently
+	mounted on a different device.  Therefore honor the order
+	of the mount list returned by the system and use the last
+	reported device name.
+
+	* src/df.c (filter_mount_list): When discarding the current
+	mount entry, ensure that a new device name is not also discarded.
+	* tests/df/skip-duplicates.sh: Add a test case.  Also fix
+	a false failure in the edge case of a system with only a
+	single file system.
+	* NEWS: Mention the fix.
+
+2014-05-26  Pádraig Brady  <P@draigBrady.com>
+
+	stdbuf: support OS X
+	* src/stdbuf.c (set_LD_PRELOAD): Adjust to use Mac OS X
+	specific environment variables on __APPLE__ platforms.
+	Fixes http://bugs.gnu.org/17590
+
+2014-05-26  Jim Meyering  <meyering@fb.com>
+
+	build: uname: avoid shadowing warning
+	* src/uname.c (main) [__APPLE__]: Rename inner "s" to "cs",
+	to avoid gcc shadowing warning.
+
+2014-05-26  Pádraig Brady  <P@draigBrady.com>
+
+	doc: clarify --zero-terminated option
+	* src/join.c (usage): Reword to avoid implication that
+	the NUL byte is only generated as the output delimeter.
+	* src/sort.c (usage): Likewise.
+	* src/shuf.c (usage): Likewise. Also since we're changing the
+	translation string take the opportunity to separate out
+	the description to a separate string to reduce translation overhead.
+	* src/uniq.c (usage): Likewise.
+	* src/stty.c (usage): s/null/NUL/ for consistency.
+	* src/basename.c (usage): Reword for accuracy/consistency.
+	* src/dirname.c (usage): Likewise.
+	* src/du.c (usage): Likewise.
+	* src/env.c (usage): Likewise.
+	* src/printenv.c (usage): Likewise.
+	* src/readlink.c (usage): Likewise.
+	* src/realpath.c (usage): Likewise.
+	* doc/coreutils.texi: Consolidate/share the descriptions of
+	--null, --zero and --zero-terminated.
+
+2014-05-25  Jim Meyering  <meyering@fb.com>
+
+	build: libstdbuf.so: avoid new OS X link failure
+	* src/local.mk (src_libstdbuf_so_LDADD): Add $(LIBINTL),
+	to avoid link failure on OS X.
+
+	cat,cp,split: use a larger buffer for copying
+	* src/ioblksize.h (IO_BUFSIZE): Double the size, to 128KB.
+	Add four more columns to the blksize-vs-bandwidth table
+
+2014-05-24  Paul Eggert  <eggert@cs.ucla.edu>
+
+	doc: use nicer quotes
+	* doc/coreutils.texi: Add "@documentencoding UTF-8".
+
+2014-05-23  Pádraig Brady  <P@draigBrady.com>
+
+	stat,tail: improve support for LogFS and ConfigFS
+	* src/stat.c (human_fstype): Add new file system ID definitions.
+	* NEWS: Mention the improvement.
+
+2014-05-22  Pádraig Brady  <P@draigBrady.com>
+
+	maint: enforce consistent width and case of file system constants
+	* src/stat.c (human_fstype): Adjust a couple of existing constants
+	to be a consistent width and capitalization so that the
+	src/fs-magic-compare target works without reporting false positives.
+	* cfg.mk (sc_fs-magic-compare): A new syntax check to enforce this.
+
+	Improved by: Jim Meyering
+
+2014-05-21  Pádraig Brady  <P@draigBrady.com>
+
+	stdbuf: support compilers other than __GNUC__
+	__SUNPRO_C >= 0x590 /*12.0*/ supports __attribute((constructor))
+	required by stdbuf, so use a more direct check for this.
+
+	Note ensure that --libexecdir is set to the appropriate
+	install location for libstdbuf.so so that stdbuf works
+	when installed on the system like it does when running
+	tests in the build directory.
+
+	* configure.ac (stdbuf_supported): Use a test prog to determine support.
+	* src/libstdbuf.c (stdbuf): Define appropriately for non GCC compilers,
+	and provide early feedback (compilation warning) if trying to compile
+	libstdbuf without the necessary support.
+	* src/stdbuf.c (set_LD_PRELOAD): Add a note on having stdbuf
+	look for libstdbuf.so in the default lib search path.
+	* cfg.mk (sc_prohibit-gl-attributes): Adjust so we can exclude
+	libstdbuf.so from prohibiting '__attribute', since we want
+	this form to avoid silently eliding this required attribute on non GCC.
+
+	Reported and tested by Rich Burridge.
+
+2014-05-21  Pádraig Brady  <P@draigBrady.com>
+
+	tests: use chroot --user rather than internal setuidgid tool
+	* init.cfg (require_root_): Adjust to use chroot, and make
+	`require_built_ chroot` implicit when chroot used in the test.
+	* po/POTFILES.in: Remove reference to setuidgid tool.
+	* src/.gitignore: Likewise.
+	* src/local.mk: Likewise.
+	* src/setuidgid.c: Remove.
+	* tests/cp/preserve-gid.sh: s/setuidgid/chroot --user/.
+	* tests/cp/special-bits.sh: Likewise.
+	* tests/id/setgid.sh: Likewise.
+	* tests/misc/truncate-owned-by-other.sh
+	* tests/mv/sticky-to-xpart.sh: Likewise.
+	* tests/rm/fail-2eperm.sh: Likewise.
+	* tests/rm/no-give-up.sh: Likewise.
+	* tests/touch/now-owned-by-other.sh: Likewise.
+	* tests/misc/chroot-fail.sh: Skip if chroot not built.
+
+	chroot: make changing root check more robust
+	* src/chroot.c (is_root): A new helper function to
+	determine if the passed argument is the root directory
+	based on inode comparison.
+	(main): Use the new helper rather than comparing strings.
+	* tests/misc/chroot-fail.sh: Add cases for alternative root paths.
+
+	chroot: exit immediately upon failure
+	* src/chroot.c (main): Consistently exit with failure status immediately
+	upon hitting a terminal issue, rather than diagnosing multiple issues
+	lest users think previous failing actions are optional.
+
+2014-05-21  Pádraig Brady  <P@draigBrady.com>
+
+	chroot: with --userspec clear root's supplemental groups
+	It's dangerous and confusing to leave root's supplemental
+	groups in place when specifying other users with --userspec.
+	In the edge case that that is desired one can explicitly
+	specify --groups.
+
+	Also we implicitly set the system defined supplemental groups
+	for a user.  The existing mechanism where supplemental groups
+	needed to be explicitly specified is confusing and not general
+	when the lookup needs to be done within the chroot.
+
+	Also we extend the --groups syntax slightly to allow clearing
+	the set of supplementary groups using --groups=''.
+
+	* src/chroot.c (setgroups): On systems without supplemental groups,
+	clearing then is a noop and so should return success.
+	(main): Lookup the primary GID with getpwuid() when just a numeric
+	uid is specified, and also infer the USERNAME from this call,
+	needed when we're later looking up the supplemental groups for a user.
+	Support clearing supplemental groups, either implicitly for
+	unknown users, or explicitly when --groups='' is specified.
+	* tests/misc/chroot-credentials.sh: Various new test cases
+	* doc/coreutils.texi (chroot invocation): Adjust for the new behavior.
+	* NEWS: Mention the change in behavior.
+
+2014-05-16  Pádraig Brady  <P@draigBrady.com>
+
+	chroot: don't chdir() if not changing root
+	This allows chroot to be used as a light weight tool
+	to change user identification for a command,
+	while not changing the current working directory.
+	It also makes `chroot / true` consistently succeed on
+	all platforms for non root users.
+
+	* src/chroot.c (main): If the same root is specified. i.e. '/'
+	then don't change the current working directory, and avoid the
+	overhead of the other redundant calls.
+	* tests/misc/chroot-fail.sh: Remove failure guard previously
+	needed on some systems.  Also add an explicit case to ensure
+	we don't change directory.
+	* NEWS: Mention the change in behavior.
+
+2014-05-13  Pádraig Brady  <P@draigBrady.com>
+
+	maint: avoid clang -Wtautological-constant-out-of-range-compare warning
+	* src/df.c (decode_output_arg): Use only enum constants to avoid
+	clang "warning: comparison of constant -1 with expression of
+	type 'display_field_t' is always false"
+
+2014-05-13  Pádraig Brady  <P@draigBrady.com>
+
+	df: ignore non file system entries in /proc/mounts
+	Linux with network namespaces contains entries in /proc/mounts like:
+	  proc net:[4026532464] proc rw,nosuid,nodev,noexec,relatime 0 0
+	resulting in a failure to stat 'net:[...]', inducing a warning
+	and an exit with failure status.
+
+	* src/df.c (get_dev): Ignore all relative mount points.
+	* tests/df/skip-duplicates.sh: Add an entry to test relative dirs.
+
+2014-05-13  Pádraig Brady  <P@draigBrady.com>
+
+	df: fix handling of symlinks in mount list
+	The symlink handling in commit v8.21-172-g33660b4 was incomplete
+	in the case where there were symlinks in the mount list itself.
+	For example, in the case where /dev/mapper/fedora-home was in the
+	mount list and that in turn was a symlink to /dev/dm-2, we have:
+
+	  before> df --out=source /dev/mapper/fedora-home
+	          devtmpfs
+
+	  after > df --out=source /dev/mapper/fedora-home
+	          /dev/mapper/fedora-home
+
+	* src/df.c (get_disk): Compare canonicalized device names from
+	the mount list.  Note we still display the non canonicalized name,
+	even if longer, as we assume that is the most representative.
+	* tests/df/df-symlink.sh: This could theoretically fail on some systems
+	depending on the content of the mount list, but adjust to fail on any
+	system where symlinks are present in the mount list for the current dir.
+
+2014-05-13  Pádraig Brady  <P@draigBrady.com>
+
+	df: also deduplicate virtual file systems
+	* src/df.c (filter_mountlist): Remove the constraint that
+	a '/' needs to be in the device name for a mount entry to
+	be considered for deduplication.  Virtual file systems also
+	have storage associated with them (like tmpfs for example),
+	and thus need to be deduplicated since they will be shown
+	in the default df output and subject to --total processing also.
+	* test/df/skip-duplicates.sh: Add a test to ensure we deduplicate
+	all entries, even for virtual file systems.  Also avoid possible
+	length operations on many remote file systems in the initial
+	check of df operation.  Also avoid the assumption that "/root"
+	is on the same file system as "/".
+	* NEWS: Mention the change in behavior.
+
+	tests: fix spurious failure with leading spaces in file names
+	* tests/ls/stat-vs-dirent.sh: This test lists all parent directories,
+	and would spuriously fail if any of those had a file name with a
+	leading space as the first entry.  There is only ever a single space
+	between the right aligned inode number and the file name, so
+	process accordingly.
+
+2014-05-12  Assaf Gordon  <assafgordon@gmail.com>
+
+	build: avoid bootstrap error with gettext 0.18.3.1
+	* bootstrap: Create critical bootstrap files for autopoint,
+	before gnulib re-generates them, avoiding the issue.  See:
+	http://lists.gnu.org/archive/html/coreutils/2013-11/msg00038.html
+	http://savannah.gnu.org/bugs/?40083
+	https://pad.lv/1311895
+
+2014-05-10  Jim Meyering  <meyering@fb.com>
+
+	shred: don't infloop upon negative size
+	* src/shred.c (main): With the preceding change, shred -s-2 FILE
+	would write 64KB blocks forever -- or until disk full. This change
+	makes shred reject a negative size.
+	* tests/misc/shred-negative.sh: New file.
+	* tests/local.mk (all_tests): Add it.
+
+2014-05-10  Paul Eggert  <eggert@cs.ucla.edu>
+
+	shred: fix overflow checking of command-line options
+	* src/shred.c (main): Limit -n (number of passes) value to
+	ULONG_MAX, not to UINT32_MAX, since the vars are unsigned long.
+	Limit the -s (file size) value to OFF_T_MAX.
+
+2014-05-07  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	tests: improve new ascii test of dd
+	* tests/dd/ascii.sh: Avoid unnecessary subshells.  Catch dd's
+	exit code.  Remove testing artifact.  In the case of a comparison
+	failure, show the differences in octal format in addition to
+	"binary files differ".  Simplify the creation of the 'in' file.
+
+2014-05-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+	dd: fix conv=ascii, conv=ebcdic, conv=ibm to match POSIX
+	Problem reported by Don Baggett in <http:/bugs.gnu.org/17422>.
+	* NEWS:
+	* doc/coreutils.texi (dd invocation): Document this.
+	* src/dd.c (conversions): conv=ascii implies conv=unblock.
+	conv=ebcdic and conv=ibm imply conv=block.
+	(ascii_to_ebcdic, ebcdic_to_ascii): Correct to match
+	POSIX 1003.1-2013.
+	* tests/dd/ascii.sh: New file.
+	* tests/local.mk (all_tests): Add it.
+
+2014-05-07  Pádraig Brady  <P@draigBrady.com>
+
+	tests: improve diagnostics when asserting empty files
+	* tests/chmod/c-option.sh: Use `compare /dev/null ... || fail=1`
+	rather than `test -s ... && fail=1`, so that the file contents
+	are output, thus improving diagnostics for failing tests.
+	* tests/cp/acl.sh: Likewise.
+	* tests/cp/cp-a-selinux.sh: Likewise.
+	* tests/cp/cp-mv-enotsup-xattr.sh: Likewise.
+	* tests/cp/reflink-perm.sh: Likewise.
+	* tests/dd/misc.sh: Likewise.
+	* tests/misc/env-null.sh: Likewise.
+	* tests/misc/env.sh: Likewise.
+	* tests/misc/nice.sh: Likewise.
+	* tests/misc/nohup.sh: Likewise.
+	* tests/misc/printenv.sh: Likewise.
+	* tests/misc/xattr.sh: Likewise.
+	* tests/mv/update.sh: Likewise.
+	* tests/rm/deep-2.sh: Likewise.
+	* tests/rm/read-only.sh: Likewise.
+	* tests/split/r-chunk.sh: Likewise.
+	* tests/tail-2/follow-stdin.sh: Likewise.
+	* tests/tail-2/inotify-race.sh: Likewise.
+	* tests/tail-2/wait.sh: Likewise.
+	* tests/touch/no-dereference.sh: Likewise.
+
+	* cfg.mk (sc_prohibit_test_empty:): New syntax-check.
+	* tests/cp/proc-zero-len.sh: Adjust to avoid false syntax-check failure.
+	* tests/cp/proc-zero-len.sh: Likewise.
+	* tests/mv/part-symlink.sh: Likewise.
+	* tests/tail-2/infloop-1.sh: Likewise.
+
+2014-05-06  Pádraig Brady  <P@draigBrady.com>
+
+	mv,cp: preserve symlink xattrs when copying across file systems
+	* src/copy.c (copy_internal): Include the copy_attr() call for symlinks.
+	This should not dereference symlinks, since llistxattr() is used
+	in attr_copy_file() in libattr, and so should copy all but the filtered
+	extended attributes.  Note we don't just move the copy_attr() call
+	before the set_owner() call, as that would break capabilities
+	for non symlinks.
+	* tests/cp/cp-mv-enotsup-xattr.sh: Add a test case.
+	* NEWS: Mention the bug fix.
+	Fixes http://bugs.gnu.org/16131
+
+2014-05-05  Jarkko Sakkinen  <jarkko.sakkinen@linux.intel.com>
+
+	tests: initial SMACK tests
+	* init.cfg (require_smack_): New function.
+	* local.mk: Referenced new tests.
+	* tests/id/smack.sh: SMACK tests (new file).
+	* tests/mkdir/smack-no-root.sh: SMACK tests (new file).
+	* tests/mkdir/smack-root.sh: SMACK tests (new file).
+
+2014-05-04  Jim Meyering  <meyering@fb.com>
+
+	maint: autotools-install: update tool version numbers to latest
+	* scripts/autotools-install (tarballs): Update to latest.
+
+2014-05-03  Jim Meyering  <meyering@fb.com>
+
+	maint: don't let envvar setting break ChangeLog generation
+	* Makefile.am (gen-ChangeLog): Clear amend_git_log when we
+	don't set it, so that an envvar setting cannot cause trouble.
+
+2014-05-02  Pádraig Brady  <P@draigBrady.com>
+
+	numfmt: improve processing throughput by 800%
+	The devmsg() calls that took quote_n() arguments,
+	didn't normally output anything, but still incurred
+	the overhead of those quote_n() calls.
+
+	* src/numfmt.c (devmsg): Move the inline function
+	with _internal_ enablement check to...
+	* src/system.h: ...here as a variadic macro, with
+	the enablement check at the outer level.
+	* src/factor.c: As per numfmt.c but there is no
+	performance change in this case.
+	* NEWS: Mention the significant performance improvement.
+
+2014-05-02  Pádraig Brady  <P@draigBrady.com>
+
+	numfmt: support zero padding using --format="%010f"
+	* src/numfmt.c (setup_padding_buffer): Simplify the code by not
+	explicitly dealing with heap exhaustion.
+	(parse_format_string): Likewise.  Handle multiple grouping
+	modifiers as does the standard printf.  Handle the new leading
+	zero --format modifier.
+	(double_to_human): Use more defensive coding against overwriting
+	stack buffers.  Honor the leading zeros width.
+	(usage): Mention the leading zero --format modifier.
+	(main): Allow --padding in combo with a --format (width),
+	as the number of leading zeros are useful independent of
+	the main field width.
+	* doc/coreutils.texi (numfmt invocation): Likewise.
+	* tests/misc/numfmt.pl: Add new test cases.
+	* NEWS: Mention the improvement.
+
+2014-04-29  Pádraig Brady  <P@draigBrady.com>
+
+	doc: clarify the pr --page-width descriptions
+	* doc/coreutils.texi (pr invocation): Clarify that -w or -W
+	will be rounded down so that each column has the same width.
+	Adjust the wording for -W, to avoid the implication that the
+	width of -S is insignificant to the page width.
+	* src/pr.c (usage): Add a period to avoid ambiguity in
+	the man page output.
+
+2014-04-29  Pádraig Brady  <P@draigBrady.com>
+
+	ptx: fix whitespace trimming with multiple files
+	This issue was identified by running the test suite with
+	http://code.google.com/p/address-sanitizer/
+	which is included in GCC 4.8 and enabled with -fsanitize=address
+
+	This was checked on Fedora 20 with GCC 4.8 as follows:
+
+	  $ yum install libasan  # http://bugzilla.redhat.com/991003
+	  $ rm -f src/ptx.o
+	  $ make check AM_CFLAGS='-fsanitize=address' SUBDIRS=. VERBOSE=yes
+	  $ failure identified in tests/test-suite.log
+
+	To see this particular failure triggered with multiple files:
+
+	  $ src/ptx <(echo a) <(echo a) 2>&1 | asan_symbolize.py -d
+
+	=================================================================
+	==32178==ERROR: AddressSanitizer: heap-buffer-overflow on address
+	0x60200000e74f at pc 0x435442 bp 0x7fffe8a1b290 sp 0x7fffe8a1b288
+	READ of size 1 at 0x60200000e74f thread T0
+	    #0 0x435441 in define_all_fields coreutils/src/ptx.c:1425
+	    #1 0x7fa206d31d64 in __libc_start_main ??:?
+	    #2 0x42f77c in _start ??:?
+	0x60200000e74f is located 1 bytes to the left of 3-byte region
+	[0x60200000e750,0x60200000e753) allocated by thread T0 here:
+	    #0 0x421809 in realloc ??:?
+	    #1 0x439b4e in fread_file coreutils/lib/read-file.c:97
+	Shadow bytes around the buggy address:
+	  0x0c047fff9c90: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
+	  0x0c047fff9ca0: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
+	  0x0c047fff9cb0: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
+	  0x0c047fff9cc0: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
+	  0x0c047fff9cd0: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fd fd
+	=>0x0c047fff9ce0: fa fa 03 fa fa fa fd fd fa[fa]03 fa fa fa 00 00
+	  0x0c047fff9cf0: fa fa 04 fa fa fa 04 fa fa fa fd fa fa fa fd fa
+	  0x0c047fff9d00: fa fa 00 fa fa fa fd fa fa fa 00 fa fa fa 00 fa
+	  0x0c047fff9d10: fa fa fd fa fa fa fd fa fa fa fd fa fa fa fd fa
+	  0x0c047fff9d20: fa fa fd fa fa fa fd fa fa fa fd fa fa fa fd fa
+	  0x0c047fff9d30: fa fa fd fa fa fa 00 fa fa fa 00 fa fa fa 00 fa
+	Shadow byte legend (one shadow byte represents 8 application bytes):
+	  Addressable:           00
+	  Partially addressable: 01 02 03 04 05 06 07
+	  Heap left redzone:     fa
+	  Heap right redzone:    fb
+	  Freed heap region:     fd
+	  Stack left redzone:    f1
+	  Stack mid redzone:     f2
+	  Stack right redzone:   f3
+	  Stack partial redzone: f4
+	  Stack after return:    f5
+	  Stack use after scope: f8
+	  Global redzone:        f9
+	  Global init order:     f6
+	  Poisoned by user:      f7
+	  ASan internal:         fe
+	==32178==ABORTING
+
+	The initial report and high level analysis were from Jim Meyering...
+
+	  "The underlying problem is that swallow_file_in_memory()
+	  is setting the contents of the global text_buffer for the first file,
+	  then updating it (clobbering old value) for the second file.
+	  Yet, some pointers to the initial buffer have been squirreled away
+	  and later, one of them (keyafter) is presumed to point into
+	  the new "text_buffer", which it does not.  The subsequent
+	  SKIP_WHITE_BACKWARDS use backs up "cursor" and goes out of bounds."
+
+	* src/ptx.c (text_buffers): Maintain references for the limits of each
+	buffer corresponding to each file, rather than just the last processed.
+	(struct OCCURS): Add a member to map back to the corresponding file.
+	Note normally this could be computed from the "reference" member
+	rather than needing the extra storage, however this is not possible
+	when in --references mode.
+	(find_occurs_in_text): Reference the array rather than a single entry.
+	(define_all_fields): Likewise.  Also avoid computing the file index
+	since this is now stored directly.
+	(main): Update text_buffers[] array rather than a single text_buffer.
+	* tests/misc/ptx-overrun.sh: Even though this issue is already triggered
+	with AddressSanitizer, add a new case to demonstrate the whitespace
+	trimming issue, and to trigger without AddressSanitizer.
+	Fixes https://bugs.gnu.org/16171
+
+2014-04-25  Pádraig Brady  <P@draigBrady.com>
+
+	maint: make ChangeLog generation more robust
+	* Makefile.am (gen-ChangeLog): Sync changes from GNU hello,
+	to ensure exit status is propagated, and to support an optional
+	git-log-fix file.
+
+2014-04-25  Edgars Irmejs  <edgars.irmejs@gmail.com>
+
+	maint: remove trailing comma from enum to make gl/ c89 compat
+	* gl/lib/fadvise.c (fadvice_t): This might go to gnulib some day so
+	remove the trailing comma.
+	Fixes http://bugs.gnu.org/17329
+
+2014-04-22  Assaf Gordon  <assafgordon@gmail.com>
+
+	doc: clarify meaning of stat's mtime and ctime formats
+	* src/stat.c (usage): s/modification time/data modification time/;
+	s/change time/status change time/
+	* doc/coreutils.texi: Ditto.
+
+2014-04-18  Pádraig Brady  <P@draigBrady.com>
+
+	tests: make ls tests independent of COLORTERM env
+	Since the recent commit v8.22-68-g08783f1, ls coloring
+	is now dependent on the COLORTERM environment variable.
+
+	* tests/envvar-check: Unset COLORTERM from test environment.
+	* tests/ls/color-dtype-dir.sh: Ensure coloring is used.
+	* tests/misc/ls-misc.pl: Likewise.
+
+	Prompted by the continuous integration build failure at:
+	http://hydra.nixos.org/build/10397646
+
+2014-04-17  Pádraig Brady  <P@draigBrady.com>
+
+	doc: disambiguate chmod man page reference to (a) users
+	* man/chmod.x: Don't rely on the bold markup for 'a' to
+	distinguish it as that's not done in all cases.
+
+2014-04-17  David Michael  <fedora.dm0@gmail.com>
+
+	dircolors: add hurd and mach-gnu-color terminal types
+	mach-color was replaced by mach-gnu-color in Hurd in 2012.
+	mach-color is left for compatibility and corresponding
+	definitions for mach-color are still found in ncurses.
+
+	* src/dircolors.hin: Add hurd and mach-gnu-color.
+
+2014-04-17  Guilherme de Almeida Suckevicz  <guito.linux@gmail.com>
+
+	ls: don't output colors with unknown TERM env variable
+	--colors controls whether to output colors depending on
+	whether we're connected to a terminal or not, while this
+	change gives control over which terminals we output colors to.
+
+	* NEWS: Mention the change in behavior.
+	* src/ls.c (known_term_type): A new function to search the static
+	list from dircolors.h
+	(parse_ls_colors): Honor the TERM when both LS_COLORS and COLORTERM
+	are non empty.
+	* tests/ls/color-term.sh: A new test.
+	* tests/local.mk: Reference the new test.
+	Fixes http://bugs.gnu.org/15992
+
+2014-04-16  Benno Schulenberg  <bensberg@justemail.net>
+
+	doc: improve remove prompt translator comment
+	* src/remove.c (prompt): Explain where the difficulty with translating
+	these two strings resides, and suggest an alternative: the one that
+	Paul Eggert first proposed back in 2002, which seems fully resistant.
+
+2014-04-16  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	maint: df: avoid sizeof(char**) static analysis warning
+	* src/df.c (alloc_table_row): Use the size of char** to enlarge
+	the table.  Spotted by Coverity.
+
+2014-04-11  Pádraig Brady  <P@draigBrady.com>
+
+	tests: fix false dd conv=sparse failure on newer XFS
+	* tests/dd/sparse.sh: When testing that a hole is created,
+	use an existing sparse destination file, so that we're
+	not write extending the file size, and thus avoiding
+	speculative preallocation which can result in smaller
+	holes than requested.
+	Workaround suggested by Brian Foster
+
+2014-04-10  Pádraig Brady  <P@draigBrady.com>
+
+	maint: avoid static analysis warnings in ln.c
+	* src/ln.c (do_link): It's not obvious that record_file() is a noop
+	in the symlink case (in that case dest_set is NULL and so ignored).
+	So to make it obvious, and to avoid false positives seen in coverity,
+	add the explicit condition here.
+
+2014-04-09  Pádraig Brady  <P@draigBrady.com>
+
+	maint: document timeout --preserve-status in v8.21 NEWS
+	* NEWS: Add the omitted new feature.
+	* cfk.mk (old_NEWS_hash): Adjust accordingly.
+
+	doc: clarify in --help that -Z doesn't take an argument
+	* NEWS: Fix a confusing old entry.
+	* cfg.mk (old_NEWS_hash): Adjust accordingly.
+	* src/cp.c (usage): Separate the -Z and --context descriptions.
+	* src/install.c: Likewise.
+	* src/mkdir.c: Likewise.
+	* src/mkfifo.c: Likewise.
+	* src/mknod.c: Likewise.
+	Fixes http://bugs.gnu.org/17220
+
+2014-04-05  Pádraig Brady  <P@draigBrady.com>
+
+	maint: various cleanups
+	* tests/misc/numfmt.pl: Fix comment misspelling.
+	* src/cut.c: Likewise.
+	* src/tsort.c (detect_loop): Replace an fprintf() with error().
+
+	shred: overwrite inode storage used by some file systems
+	* doc/coreutils.texi (shred invocation): Mention some reasons
+	why clearing slack space might be useful.
+	* src/shred.c (do_wipefd): Add initial writes for each pass
+	for small regular files in case the storage for those is
+	in the inode, and thus a larger write up to a block size would
+	bypass that.  Move the direct I/O control to...
+	(dopass): ... here so we can avoid enabling it for these small
+	initial writes.  It's better to retry direct I/O for each pass
+	anyway to handle the case where direct I/O is disabled for only
+	the last portion of a file when the size is not a multiple of
+	the block size.  Note we don't avoid the sync for the initial
+	write as it will be small but more importantly could be on a
+	different part of the disk and so worth doing independently
+	to ensure the write is not discarded.
+	* tests/misc/shred-exact.sh: Check some more direct I/O cases.
+	* NEWS: Mention the improvements.
+	The inode storage issue was mentioned by Paul Eggert.
+
+2014-04-04  Pádraig Brady  <P@draigBrady.com>
+
+	shred: avoid a data pass on empty files
+	* src/shred.c (do_wipefd): Don't increase the size written
+	for an empty file up to a full block.  Also increase the size
+	to OFF_T_MAX in the edge case where we do overflow.
+	* NEWS: Mention the shred improvements from recent changes.
+	* tests/misc/shred-passes.sh: Adjust as we no longer
+	write a BLKSIZE of data for empty files.
+
+2014-04-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+	cp: don't reserve a device number
+	* src/copy.c (copy_internal): Replace dev_t arg DEVICE with struct
+	stat pointer arg PARENT.  All callers changed.  This removes an
+	unwarranted assumption that dev_t values of 0 cannot occur in file
+	systems.  See: http://bugs.gnu.org/17179
+
+	shred: shred one block even for empty files
+	* src/shred.c (do_wipefd): Shred one block of empty regular files.
+	This reverts an unintended part of the previous change.
+
+	shred: port to GNU/Linux behavior with tape drives
+	See: http://bugs.gnu.org/17149
+	* src/shred.c [__linux__]: Include <sys/mtio.h>.
+	(dorewind): New function, which works around the lseek problem with
+	tape drives on GNU/Linux, the same way that dd does.
+	(dopass): Use it.  New arg ST, needed for dorewind.  All uses changed.
+	(do_wipefd): Don't rely on undefined behavior on integer overflow
+	of file sizes.  Use INT_ADD_OVERFLOW instead.
+
+2014-04-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+	head: port to Darwin and use simpler seeks
+	This removes an unportable assumption that if lseek succeeds, the
+	file is capable of seeking.  See: http://bugs.gnu.org/17145
+	* src/head.c (elseek): New function, for consistency in reporting
+	lseek failures.
+	(elide_tail_bytes_file, elide_tail_lines_seekable)
+	(elide_tail_lines_file, head_lines, head): Use it.
+	(elide_tail_bytes_file, elide_tail_lines_file):
+	New args CURRENT_POS and SIZE.  All uses changed.  Don't bother
+	invoking lseek, since we know the file's pos and size now.
+	(elide_tail_bytes_file): Change a local from uintmax_t to off_t,
+	since it fits.
+	(head): Use lseek only on regular files, since its behavior on
+	unseekable devices is implementation-defined.
+	* NEWS: Document this.
+
+2014-03-31  Paul Eggert  <eggert@cs.ucla.edu>
+
+	head: fix bug with head -c-N when stdin is not at start
+	* src/head.c (elide_tail_bytes_file): Fix typo in lseek invocation.
+	* tests/misc/head-c.sh: Add test for this bug.
+	* NEWS: Document this.
+
+2014-03-26  Pádraig Brady  <P@draigBrady.com>
+
+	mv: fix issues with previous prompt adjustments
+	* src/copy.c (overwrite_ok): Fix the gettext calls so
+	that the second string is tagged for translation.
+	Display the correct "replace ..." prompt when in move_mode.
+	* tests/mv/i-3.sh: Display the output on failure to ease debugging.
+
+2014-03-26  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	ptx: avoid --format long option falling through into --help
+	* src/ptx.c (main): Add a 'break' after the --format handling case.
+	Otherwise it would fall through into the usage case.
+	* tests/misc/ptx.pl: Add test cases for --format=tex and --format=roff.
+	* NEWS (Bug fixes): Mention the fix.
+	Bug introduced in 1999-04-04 commit, SH-UTILS-1_16f-269-gd815c15.
+	Spotted by coverity (MISSING_BREAK).
+
+2014-03-26  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	basename: mention that the -s option implies -a in usage
+	* src/basename.c (usage): Mention that -s implies -a.
+	(main): Add "fall through" comment to case 's'.
+
+	Spotted by coverity: MISSING_BREAK.
+
+2014-03-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+	cp: simplify overwrite logic
+	* src/copy.c (overwrite_ok): Rename from overwrite_prompt.  Invoke
+	yesno instead of having the caller do it; that's cleaner.  Return
+	bool, not void.  All callers changed.
+
+	cp: improve quality of overwrite prompt
+	* src/copy.c (overwrite_prompt): New arg X.  All callers changed.
+	Use X to improve the quality of the prompt (Bug#17087).
+	* tests/mv/i-2.sh, tests/mv/i-3.sh: Change test to match new prompt.
+
+2014-03-24  Pádraig Brady  <P@draigBrady.com>
+
+	split: avoid unnecessary input buffering
+	Input buffering is best avoided because it introduces
+	delayed processing of output for intermittent input,
+	especially when the output size is less than that of
+	the input buffer.  This is significant when output
+	is being further processed which could happen if split
+	is writing to precreated fifos, or through --filter.
+
+	If input is arriving quickly from a pipe then this will
+	already be buffered before we read it, so fast arriving
+	input shouldn't be a performance issue.
+
+	* src/split.c (lines_split, lines_bytes_split, bytes_split,
+	lines_chunk_split, bytes_chunk_extract): s/full_read/safe_read/.
+	* THANKS.in: Mention the reporter.
+	* NEWS: Mention the improvement.
+
+2014-03-19  Pádraig Brady  <P@draigBrady.com>
+
+	doc: clarify the operation of uniq -uD
+	The description of -u was inaccurate when combined with -D:
+
+	  $ printf '%s\n' '1 a' '2 a' | uniq -uD -f1
+	  1 a
+
+	* doc/coreutils.texi (uniq invocation): Clarify that it's
+	the last repeated line that is suppressed from the output.
+
+	Fixes http://bugs.gnu.org/17022
+
+2014-03-19  Edward Welbourne  <eddy@chaos.org.uk>
+
+	doc: avoid regex ambiguity in chmod mode description
+	* man/chmod.x: s/[+-=]/[-+=]/
+	* doc/perm.texi (Symbolic Modes): Likewise.
+	* THANKS.in: Remove patch owner.
+	Fixes http://bugs.gnu.org/17041
+
+2014-03-19  Pádraig Brady  <P@draigBrady.com>
+
+	chroot: always diagnose failure to set supplemental groups
+	* src/chroot.c (setgroups): Change this replacement to
+	fail when called so that platforms like Interix without support for
+	supplemental groups don't silently ignore a --groups option.
+
+2014-03-19  Dylan Simon  <dylan@dylex.net>
+
+	chmod: fix erroneous warnings with -R --changes
+	For files with "special" bits set, we would stat the relative
+	file name in the wrong directory, giving an erroneous ENOENT diagnostic.
+	This issue was introduced with commit v5.92-653-gc1994c1
+	which changed fts to not change directory on traversal.
+
+	* src/chmod.c (mode_changed): Use fts->fts_cwd_fd with fstatat rather
+	than stat.  All callers changed.
+	* tests/chmod/c-option.sh: Add a test case.
+	* NEWS: Mention the fix.
+	Fixes http://bugs.gnu.org/17035
+
+2014-03-19  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	maint: fix typo in comment in fadvise.c
+	* gl/lib/fadvise.c: s/the the/the/, indroduced in commit
+	v8.22-40-g4f21182.  Promted by sc_prohibit_doubled_word.
+	While at it, also s/be candidate/be a candidate/.
+
+2014-03-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+	stat: port birthtime to Solaris 11
+	Problem reported by Rich Burridge.
+	* src/stat.c [HAVE_GETATTRAT]: Include <attr.h>, <sys/nvpair.h>.
+	(print_statfs, print_stat, print_it):
+	Pass fd, too, for the benefit of get_birthtime.
+	All uses changed.
+	(get_birthtime): New function, for porting to Solaris 11.
+	(print_stat): Use it.
+
+	* configure.ac (getattrat, LIB_NVPAIR): New checks.
+	* src/local.mk (src_stat_LDADD): Add $(LIB_NVPAIR).
+
+2014-03-14  Jim Meyering  <meyering@fb.com>
+
+	ln: with -sr, don't segfault for a TARGET of ''
+	Prior to this change, "ln -sr '' F" would segfault, attempting
+	to read path2[1] in relpath.c's path_common_prefix function.
+	This problem arises whenever canonicalize_filename_mode returns
+	NULL.
+	* src/ln.c (convert_abs_rel): Call relpath only when
+	both canonicalize_filename_mode calls return non-NULL.
+	* tests/ln/relative.sh: Add a test to trigger this failure.
+	* THANKS.in: List reporter's name/address.
+	* NEWS (Bug fixes): Mention it.
+	Reported by Erik Bernstein in 739752@bugs.debian.org.
+	Fixes http://bugs.gnu.org/17010.
+
+2014-03-13  Jim Meyering  <meyering@fb.com>
+
+	maint: avoid "attribute-const"-suggesting warning from gcc
+	* gl/lib/fadvise.c: Use a pragma to turn off this warning option:
+	-Wsuggest-attribute=const.  Without this change, building with
+	--enable-gcc-warnings would evoke this error:
+
+	    lib/fadvise.c:25:1: error: function might be candidate for\
+	    attribute 'const' [-Werror=suggest-attribute=const]
+
+2014-03-13  Jim Meyering  <jim@meyering.net>
+
+	scripts: autotools-install: update
+	* scripts/autotools-install: Update version numbers of latest
+	automake and gettext packages.
+
+2014-03-13  Pádraig Brady  <P@draigBrady.com>
+
+	chroot: improve --userspec and --groups look-up
+	- Support arbitrary numbers in --groups, consistent with
+	  what is already done for --userspec
+	- Avoid look-ups entirely for --groups items with a leading '+'
+	- Support names that are actually numbers in --groups
+	- Ignore an empty --groups="" option for consistency with --userspec
+	- Look up both inside and outside the chroot with inside taking
+	  precedence.  The look-up outside may load required libraries
+	  to complete the look-up inside the chroot.  This can happen for
+	  example with a 32 bit chroot on a 64 bit system, where the
+	  32 bit NSS plugins within the chroot fail to load.
+
+	* src/chroot.c (parse_additional_groups): A new function refactored
+	from set_addition_groups(), to just do the parsing.  The actual
+	setgroups() call is separated out for calling from the chroot later.
+	(main): Call parse_user_spec() and parse_additional_groups()
+	both outside and inside the chroot for the reasons outlined above.
+	* tests/misc/chroot-credentials.sh: Ensure arbitrary numeric IDs
+	can be specified without causing look-up errors.
+	* NEWS: Mention the improvements.
+	* THANKS.in: Add Norihiro Kamae who initially reported the issue
+	with a proposed patch.
+	Also thanks to Dmitry V. Levin for his diagnosis and sample patch.
+
+2014-03-09  Aleksej Serdjukov  <deletesoftware@yandex.ru>
+
+	doc: fix typo in texinfo docs
+	* doc/coreutils.texi (Operating on characters): s/This/These/.
+	Fixes http://bug.gnu.org/16973
+
+2014-03-07  Pádraig Brady  <P@draigBrady.com>
+
+	doc: fix readpath typo in texinfo contents
+	* docs/coreutils.texi: s/readpath/realpath/
+	Fixes http://bugs.gnu.org/16964
+
+2014-03-05  Pádraig Brady  <P@draigBrady.com>
+
+	tests: avoid the :> construct which can hide errors
+	On most shells `:>file || framework_failure_` will not evaluate
+	the framework_failure_ even if there was an error writing the file.
+	shells which do evaluate the failure are ksh 93u+ and bash 4.2,
+	while shells wich don't include bash 4.3, solaris, freebsd, dash.
+
+	Furthermore this construct is problematic on Solaris 10 sh,
+	which will try to optimize away a `:' command in a loop
+	after the first iteration, even if it is redirected.
+
+	* tests/cp/link-deref.sh: Remove the leading colon on redirections.
+	* tests/cp/reflink-perm.sh: Likewise.
+	* tests/id/zero.sh: Likewise.
+	* tests/install/install-C.sh: Likewise.
+	* tests/misc/env.sh: Likewise.
+	* tests/misc/md5sum-bsd.sh: Likewise.
+	* tests/misc/runcon-no-reorder.sh: Likewise.
+	* tests/mv/partition-perm.sh: Likewise.
+	* tests/rm/r-root.sh: Likewise.
+	* tests/split/l-chunk.sh: Likewise.
+	* tests/split/line-bytes.sh: Likewise.
+	* tests/tail-2/inotify-rotate.sh: Likewise.
+	* tests/tail-2/retry.sh: Likewise.
+	* tests/tail-2/symlink.sh: Likewise.
+	* tests/tail-2/wait.sh: Likewise.
+	* tests/touch/read-only.sh: Likewise.
+	+ cfg.mk (sc_prohibit_colon_redirection): A new syntax check
+	to avoid further instances of this creeping in.
+
+2014-03-05  Pádraig Brady  <P@draigBrady.com>
+
+	tests: fix false failure in nohup.sh in non tty builds
+	* tests/misc/nohup.sh: When running tests without a controlling tty,
+	an exec failure is triggered in a subshell, which causes POSIX
+	shells to immediately exit the subshell.  This was brought
+	to notice by the newly conforming bash 4.3.
+	Fixes http:/bugs.gnu.org/16940
+
+2014-03-03  Pádraig Brady  <P@draigBrady.com>
+
+	doc: improve df --human and --si, help and man page
+	* src/df.c (usage): Adjust the --human and --si descriptions
+	to not depend on each other.  Also include an example that is
+	illustrative of the rounding, suffix, width, and localized fractions.
+	* src/system.h (emit_size_note). Adjust so that it's obvious the
+	description is pertaining to the input SIZE argument, and not
+	to any sizes that might be output by df for example.
+	Fixes http://bugs.gnu.org/16922
+
+2014-02-27  Pádraig Brady  <P@draigBrady.com>
+
+	date: fix crash or infinite loop when parsing a malformed TZ=""
+	* NEWS: Mention the fix.
+	* gnulib: Update to incorporate the fix.
+	This is the only change in this gnulib update.
+	* tests/misc/date.pl: Add a test for this case.
+
+	Fixes http://bugs.gnu.org/16872
+
+2014-02-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	cp: copy files by inode only if that facility is available
+	* src/copy.c (copy_dir): Use the new SAVEDIR_SORT_FASTREAD, not
+	SAVEDIR_SORT_INODE.  Problem reported by Bernhard Voelker in:
+	http://lists.gnu.org/archive/html/coreutils/2014-02/msg00037.html
+
+	build: update gnulib submodule to latest
+
+2014-02-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+	cp: copy files by inode
+	Problem reported by Bernhard Voelker in:
+	http://lists.gnu.org/archive/html/coreutils/2014-02/msg00034.html
+	* src/copy.c (copy_dir): Adjust to recent gnulib change.
+
+	build: update gnulib submodule to latest
+
+2014-02-26  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	shuf: convert error diagnostic to lowercase
+	* src/shuf.c (main): s/No/no/, introduced by commit v8.22-25-g9f60f37.
+	* NEWS: Also adjust the NEWS for that recent commit to make it
+	clear this was new bug rather than a regression.
+
+	Prompted by the syntax-check rule sc_error_message_uppercase
+
+2014-02-26  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	doc: add dd example for failing disks
+	* doc/coreutils.texi (dd invocation): Add an example for how to call
+	dd to save data from a failing disk.  Mention GNU 'ddrescue' as one
+	of the more specialized tools in such a case.
+
+2014-02-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+	shuf: with -r, don't dump core if the input is empty
+	Problem reported by valiant xiao in <http://bugs.gnu.org/16855>.
+	* NEWS: Document this.
+	* src/shuf.c (main): With -r, report an error if the input is empty.
+	* tests/misc/shuf.sh: Test for the bug.
+
+2014-02-21  Paul Eggert  <eggert@cs.ucla.edu>
+
+	doc: fix problems with @w and @kbd (Bug#16802)
+	* doc/coreutils.texi: Prefer '@allowcodebreaks false' to '@w'.
+	Also, don't use @kbd except for keyboard input.
+
+2014-02-10  Pádraig Brady  <P@draigBrady.com>
+
+	cp: with --link always use linkat() if available
+	* src/copy.c (copy_reg): If linkat() is available it doesn't
+	matter about the gnulib emulation provided, and thus the
+	LINK_FOLLOWS_SYMLINKS should not have significance here.
+	This was noticed on FreeBSD and the consequence is that
+	cp --link will create hardlinks to symlinks there, rather
+	than emulating with symlinks to symlinks.
+	* tests/cp/link-deref.sh: Adjust the checks to cater
+	for all cases where hardlinks to symlinks are supported.
+
+2014-02-09  Pádraig Brady  <P@draigBrady.com>
+
+	head,tail: consistently diagnose write errors
+	If we can't output more data, we should immediately
+	diagnose the issue and exit rather than consuming all
+	of input (in some cases).
+
+	* src/tail.c (xwrite_stdout): Also diagnose the case where
+	only some data is written.  Also clearerr() to avoid the
+	redundant less specific error from atexit (close_stdout);
+	* src/head.c (xwrite_stdout): Copy this new function from tail,
+	and use it to write all output.
+	* tests/misc/head-write-error.sh: A new test to ensure we
+	exit immediately on write error.
+	* tests/local.mk: Reference the new test.
+
+2014-02-09  �лек�ей Шилин  <rootlexx@mail.ru>
+
+	head: fix --lines=-0 outputting nothing if no newline at EOF
+	* src/head.c (elide_tail_lines_pipe): Just output all input in
+	this case to avoid the issue and also avoid redundant '\n' processing.
+	(elide_tail_lines_seekable): Likewise.
+	* tests/misc/head-elide-tail.pl: Add tests for no '\n' at EOF.
+	* NEWS: Mention the fix.
+	Fixes http://bugs.gnu.org/16329
+
+2014-02-09  John  <da_audiophile@yahoo.com>
+
+	dircolors: add a new entry to colorize 'm4a' files
+	* src/dircolors.hin: Add entry for mpeg4 audio files.
+	Fixes http://bugs.gnu.org/16700
+
+2014-02-09  Niels Möller  <nisse@lysator.liu.se>
+
+	od: add an --endian option to control byte swapping
+	* src/od.c (main): Handle the new --endian option,
+	taking "little" and "big" as parameters.
+	(usage): Describe the new option.
+	(PRINT_FIELDS): Adjust to swap bytes if required.
+	* tests/misc/od-endian.sh: A new test to verify
+	the byte swapping operations for hex (ints) and floats
+	for all sizes between 1 and 16 inclusive.
+	* test/local.mk: Reference the new test.
+	* doc/coreutils.texi (od invocation): Describe the new option.
+	* NEWS: Mention the new feature.
+
+2014-01-29  Pádraig Brady  <P@draigBrady.com>
+
+	stat,tail: improve support for HFS+ and HFSX
+	* src/stat.c (human_fstype): Add new file system ID definitions.
+	* NEWS: Mention the improvement.
+	Fixes http://bugs.gnu.org/16336
+
+2014-01-24  Assaf Gordon  <assafgordon@gmail.com>
+
+	tests: skip chown/separator with conflicting group IDs
+	* tests/chown/separator.sh: skip test if the user's group has
+	multiple entries.
+	Fixes http://bugs.gnu.org/16532
+
+2014-01-21  Pádraig Brady  <P@draigBrady.com>
+
+	build: suppress an erroneous warning --with-selinux=no
+	* m4/jm-macros.m4: Don't check the SELinux cached variables
+	--without-selinux.
+	Reported-by: Bernhard Voelker
+
+2014-01-17  Pádraig Brady  <P@draigBrady.com>
+
+	build: remove no longer used spawn-pipe files from POTFILES.in
+	This should have been part of the previous commit v8.22-14-gf18999b
+
+	* po/POTFILES.in: Remove gnulib files no longer used.
+	Prompted by the continuous integration build failure at:
+	http://hydra.nixos.org/build/8288209/
+
+2014-01-17  Pádraig Brady  <P@draigBrady.com>
+
+	build: avoid unneeded spawn-pipe gnulib module
+	* bootstrap.conf: Reference the used pipe-posix module
+	rather than the uneeded and larger spawn-pipe module,
+	which the pipe module is the deprecated equivalent of.
+
+2014-01-17  Chengwei Yang  <chengwei.yang@intel.com>
+
+	doc: clarify SMACK related --help and documentation
+	* src/ls.c: Remove all mention of SELinux since ls
+	should treat all security context labels equally.
+	* doc/coreutils.texi (ls invocation): Likewise.
+	(id invocation): Clarify that -Z outputs the context
+	inherited by the process, rather than one specific to a user.
+	Note for SMACK this can be set instead by the SMACK64EXEC label,
+	in the unusual case where this is set on the id executable.
+	* src/id.c (usage): Likewise.
+	* src/mkdir.c (usage): Clarify that -Z is specific to SELinux,
+	while --context=CTX is also supported for SMACK.
+	* src/mkfifo.c (usage): Likewise.
+	* src/mknod.c (usage): Likewise.
+
+2014-01-17  Pádraig Brady  <P@draigBrady.com>
+
+	ln: fix replacing symbolic links whose targets can't exist
+	* src/ln.c (errno_nonexisting): A new function to determine if
+	the errno implies that a file doesn't or can't (currently) exist.
+	(target_directory_operand): Use the new function to expand the
+	set of errors we handle.
+	* tests/ln/sf-1.sh: Add test cases for the newly handled errors.
+	* THANKS.in: Mention the reporter.
+	* NEWS: Mention the bug fix.
+
+2014-01-14  Pádraig Brady  <P@draigBrady.com>
+
+	tests: restrict a recent SELinux test to SELinux systems
+	* tests/cp/no-ctx.sh: Since the test diagnoses whether the
+	intercepted lgetfilecon() calls are actually called or not,
+	restrict the test to systems where that occurs.
+	The test cases are minimal on non SELinux systems and should
+	be well covered by other tests.
+	Reported-by: Bernhard Voelker
+
+2014-01-13  Nicolas Iooss  <nicolas.iooss@m4x.org>
+
+	copy: fix a segfault in SELinux context copying code
+	* src/selinux.c (restorecon_private): On ArchLinux the
+	`fakeroot cp -a file1 file2` command segfaulted due
+	to getfscreatecon() returning a NULL context.
+	So map this to the sometimes ignored ENODATA error,
+	rather than crashing.
+	* tests/cp/no-ctx.sh: Add a new test case.
+	* tests/local.mk: Reference the new test.
+	* NEWS: Mention the fix.
+	Fixes http://bugs.gnu.org/16335
+
+2014-01-13  Pádraig Brady  <P@draigBrady.com>
+
+	maint: tests: refactor gcc commands for building shared lib
+	* init.cfg (gcc_shared_): A new function refactored from tests.
+	(require_gcc_shared_): Adjust to call gcc_shared_() to build the
+	test library, and remove that library before the function returns.
+	* tests/cp/nfs-removal-race.sh: Call the new gcc_shared_().
+	* tests/df/no-mtab-status.sh: Likewise.
+	* tests/df/skip-duplicates.sh: Likewise.
+	* tests/ls/getxattr-speedup.sh: Likewise.
+	* tests/rm/r-root.sh: Likewise.
+
+	copy: fix SELinux context preservation for existing directories
+	* src/copy.c (copy_internal): Use the global process context
+	to set the context of existing directories before they're populated.
+	This is more consistent with the new directory case, and fixes
+	a bug for existing directories where we erroneously set the
+	context to the last copied descendent, rather than to that of
+	the source directory itself.
+	* tests/cp/cp-a-selinux.sh: Add a test for this case.
+	* NEWS: Mention the fix.
+	* THANKS.in: Add reporter Michal Trunecka.
+
+2014-01-10  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	tests: improve test for a working setfacl
+	Prompted by a test framework failure of tests/mkdir/p-acl.sh on armv7l:
+	The previous test for a working setfacl was not sufficient in some
+	circumstances.
+
+	* init.cfg (require_setfacl_): Call setfacl twice with conflictive
+	ACL specs, and use ACL specs which can't be mapped into regular file
+	permission bits.  Document the reasons.
+
+2014-01-09  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	tests: avoid FP failure when cp fails for /proc/cpuinfo
+	On emulated aarch64 systems like in the qemu-based OpenBuildService
+	of openSUSE, cp fails to copy /proc/cpuinfo because the inode number
+	changes between the initial stat() call and copying the file:
+
+	  $ cp /proc/cpuinfo exp
+	  cp: skipping file '/proc/cpuinfo', as it was \
+	  replaced while being copied
+
+	* tests/cp/proc-zero-len.sh: When cp fails, check on the above
+	error message to skip the test.
+
+2014-01-02  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	maint: fix copyright holder and year in selinux sources
+	* src/selinux.c: As the copyright is assigned to the FSF for all
+	of coreutils, replace the copyright holder from "Red Hat, Inc."
+	to "Free Software Foundation, Inc.".  Prompted by a warning of
+	'make update-copyright'.  Also update the copyright year.
+
+	maint: update all copyright year number ranges
+	Run "make update-copyright", but then also run this,
+	  perl -pi -e 's/2\d\d\d-//' tests/sample-test
+	to make that one script use the single most recent year number.
+
+2014-01-02  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	maint: prevent update-copyright from updating files from gnulib
+	The files 'bootstrap' and 'tests/init.sh' are taken from the
+	gnulib submodule.  Therefore, 'make update-copyright' there should
+	already have updated the copyright year in these 2 files.
+
+	* .x-update-copyright: Add entries for the above mentioned files.
+
+2014-01-02  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	build: update gnulib submodule, bootstrap and tests/init.sh to latest
+	* gnulib: Update to latest.
+	* bootstrap: Update from gnulib.
+	* tests/init.sh: Likewise.
+
+2013-12-13  Pádraig Brady  <P@draigBrady.com>
+
+	maint: post-release administrivia
+	* NEWS: Add header line for next release.
+	* .prev-version: Record previous version.
+	* cfg.mk (old_NEWS_hash): Auto-update.
+
+	version 8.22
+	* NEWS: Record release date.
+
+2013-12-13  Pádraig Brady  <P@draigBrady.com>
+
+	stat,tail: improve support for hostfs and smackfs
+	hostfs is provided by the Linux UML subsystem.
+	smackfs is provided by the Linux Smack security module.
+
+	* src/stat.c (human_fstype): Add new file system ID definitions.
+	* NEWS: Mention the improvement, and adjust for the fact that
+	SNFS is a remote file system.
+
+2013-12-13  Pádraig Brady  <P@draigBrady.com>
+
+	tests: avoid unlikely deadlock in dd/no-allocate on some shells
+	* test/dd/no-allocate.sh: Use 'wait' to ensure we don't have
+	multiple writers to the fifo, which was seen to trigger
+	a very hard to reproduce deadlock with make -j20 on solaris.
+	Also avoid writing to the fifo with the shell; instead using dd.
+	(check_dd_seek_alloc): A new function refactored from the various
+	cases, which are now constructed from function parameters.
+
+	tests: restrict cp --link inode comparisons to compatible systems
+	* tests/cp/link-deref.sh: On systems were cp can't determine if
+	gnulib linkat() emulation might create a symlink instead of a hardlink
+	to a symlink, copy.c will create a symlink to the symlink so that
+	it has more control over its metadata.  Also even if the system
+	supports this operation, the particular file system under test may not.
+	So avoid the hardlinked symlink verification in these cases.
+	This fixes a false failure on aix, solaris and freebsd.
+
+	build: default to avoiding openssl system libraries
+	* configure.ac: Don't change the gnulib default of 'no' for
+	whether to link with openssl system libraries if available.
+	Distributions can explicitly enable this as their policy allows.
+	* NEWS: Adjust accordingly.
+
+2013-12-12  Tiger Lee  <i@tigerlee.me>
+
+	doc: fix typo in numfmt invocation
+	* doc/coreutils.texi (numfmt invocation): s/nun/num/.
+	Fixes http://bugs.gnu.org/16122
+
+2013-12-11  Pádraig Brady  <P@draigBrady.com>
+
+	tests: df/total-unprocessed: fix false failure with lofs
+	* tests/df/total-unprocessed.sh: Skip the test when we can't
+	determine the file system type as the exclusion filter is not
+	applied in that case.  "lofs" being ignored is effectively
+	an unknown file system type.
+
+	tests: avoid warnings due to new filefrag -v format
+	* tests/cp/sparse-fiemap.sh: Newer versions of filefrag output
+	more fields, in different orders, so handle that to avoid warnings.
+
+2013-12-09  Pádraig Brady  <P@draigBrady.com>
+
+	build: update gnulib to fix a tests build failure
+	* gnulib: Update to incorporate a fix for building tests
+	with -Werror=old-style-declaration
+
+	tests: fix false failure due to xargs usage
+	* tests/readlink/multi.sh: Ensure there is a trailing delimeter
+	or xargs may (on AIX 7 at least) suppress the last argument.
+
+	tests: fix false failure on systems without /dev/stdin
+	* tests/rm/interactive-once.sh: Ensure the expected output
+	matches with the output on systems without /dev/stdin (like AIX 7).
+	Also change some fail=1 to a more appropriate framework_failure_.
+
+	build: update gnulib and improve --with-openssl configure help
+	* configure.ac: Use gl_SET_CRYPTO_CHECK_DEFAULT() to set the
+	coreutils default for --with-openssl early, so that the
+	help text can be provided in a standard and complete form.
+	* gnulib: Update to incorporate a build fix on platforms
+	with only some of md5 and sha* implemented by libcrypto.
+
+2013-12-09  Pádraig Brady  <P@draigBrady.com>
+
+	tests: fix false failure due to gdb inline function handling
+	Inline functions are awkward to breakpoint as mentioned at:
+	https://sourceware.org/bugzilla/show_bug.cgi?id=10738
+	The normal case here was for the breakpoint on the inline function
+	to fail, resulting in a 10s delay before skipping the test.
+	However on GCC 4.7.2 on ppc64 at least it was seen that
+	the test failed erroneously due to the breakpoint being successfully
+	set on an "out of line" function, but an inline function was
+	actually being called.
+
+	* tests/tail-2/inotify-race.sh: Switch to a line based breakpoint,
+	rather than a symbol base one, which avoids issues with breakpoints
+	on inline functions.  Also skip_ on the initial breakpoint check
+	in case the breakpoint is not traversed which would be the case
+	on remote file systems for example.
+
+2013-12-09  Pádraig Brady  <P@draigBrady.com>
+
+	tail: use consistent diagnostics with and without inotify
+	* src/tail.c: With inotify, when a file is initially absent,
+	we fstat(-1) for that file spec, thus recording an errnum of EBADF,
+	which caused the "has become accessible" diagnostic to be issued,
+	when the file first appears.  Instead we avoid the fstat(-1) and
+	thus emit the more natural and consistent "has appeared" diagnostic.
+	* tests/tail-2/retry.sh: Use the new diagnostic which also causes
+	this test to pass on systems without inotify.
+
+2013-12-09  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	tests: avoid false df failure with nfs and lofs
+	* tests/df/total-unprocessed.sh: -t nfs and --local are
+	_not_ mutually exclusive on solaris, with lofs mounts.
+
+2013-12-07  Pádraig Brady  <P@draigBrady.com>
+
+	tests: avoid problematic $(< file) shell construct
+	* tests/cp/link-deref.sh: This was seen to cause an issue
+	with dash v0.5.6 at least, so change to a simpler expression.
+
+	tests: fix false failure on platforms using newfstatat
+	* tests/ls/stat-free-color.sh: Add newfstatat to the list
+	of syscalls to trace.  Also add all "stat" syscalls to the
+	list of syscalls that we verify that strace supports.
+	Also only create a single dangling symlink to check, since
+	we already only check for a single "stat" call.
+	Fixes http://bugs.gnu.org/16075 seen on AArch64
+
+	tests: avoid a false memory leak test failure
+	* tests/misc/shuf-reservoir.sh: Restrict the valgrind
+	"exit on leak" behavior to developer environments where
+	specific "lint" code is enabled to avoid inconsequential leaks.
+
+2013-12-06  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	tests: fix shuf test verifying that -i and -e can not be combined
+	Previously, the test triggered another error diagnostic:
+	  shuf: invalid input range ‘-e’
+	and therefore eclipsed the expected one:
+	  shuf: cannot combine -e and -i options
+
+	While at it, reindent a line with more than 80 characters, present
+	since the previous commit to silence sc_long_lines.
+
+	* tests/misc/shuf.sh: Pass a valid range to the -i option.
+
+2013-12-06  Paul Eggert  <eggert@cs.ucla.edu>
+
+	shuf: --repeat, not --repetitions; default --head-count is infinity
+	Original problem reported by Philipp Thomas in
+	<http://bugs.gnu.org/16061>.
+	* NEWS: shuf --repeat, not shuf --repetitions.
+	* doc/coreutils.texi (shuf invocation):
+	* src/shuf.c (usage, long_opts, main):
+	* tests/misc/shuf.sh:
+	Likewise.  Also, the default head-count is infinity.
+
+2013-12-05  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	doc: clarify that df now generally processes special files correctly
+	Since v8.21-172-g33660b4, df not only treats symbolic link arguments
+	differently, as stated there, but now generally processes special file
+	arguments in a non-canonicalized form correctly:
+
+	  $ cd /dev && df-old sdb
+	  Filesystem     1K-blocks  Used Available Use% Mounted on
+	  devtmpfs         1014572    48   1014524   1% /dev
+
+	  $ cd /dev && df-new sdb
+	  Filesystem     1K-blocks    Used Available Use% Mounted on
+	  /dev/sdb        10190136 6039532   3609932  63% /home
+
+	Document df's new behavior.
+
+	* doc/coreutils.texi (df invocation): In the paragraph describing
+	df's behavior regarding special file arguments, relax the condition
+	for such special files from "... is an absolute name of ..." to
+	"... resolves to ...".
+	* NEWS (Bug fixes): Mention the new behavior also here.
+
+2013-12-05  Pádraig Brady  <P@draigBrady.com>
+
+	tests: fix false failure with disabled SELinux support
+	This could trigger on SELinux systems where we build --qithout-selinux
+	or where the SELinux development libraries are not installed.
+
+	* init.cfg (require_selinux_enforcing_): Call require_selinux_()
+	to determine if the current build supports SELinux.  This avoids
+	a false failure in tests/mkdir/selinux.sh where only mkdir would
+	determine that SELinux was disabled and thus ignore invalid contexts.
+	(require_selinux_): Refactor a little to distinguish whether it's
+	the build or the (file) system that doesn't support SELinux.
+
+2013-12-05  Pádraig Brady  <P@draigBrady.com>
+
+	selinux: fix --context=CTX for cp and diagnose defaultcon() errors
+	* src/selinux.h (ignorable_ctx_err): A new function used
+	to determine if a warning should be given after a call
+	to defaultcon() or restorecon().
+	* src/cp.c (main): Fix the setfscreatecon() call to use
+	the argument passed by the user.
+	* src/mkdir.c (make_ancestor): Show all but "ignoreable" errors
+	from defaultcon() and restorecon().
+	* tests/misc/selinux.sh: Add a test run as root in selinux enforcing
+	mode, to ensure cp --context=invalid is honored and fails immediately.
+
+2013-12-04  Pádraig Brady  <P@draigBrady.com>
+
+	md5sum, sha*sum: use libcrypto where available
+	libcrypto is generally available and has well optimized
+	crypto hash routines particular to various systems.
+	For example, testing sha1sum with openssl-1.0.0j
+	on an i3-2310M, gives a performance boost of about 40%:
+
+	$ time sha1sum.old --tag ~/test.iso
+	SHA1 (/home/padraig/test.iso) = 3c27f7ed01965fd2b89e22128fd62dc51a3bef30
+	real    0m4.692s
+	user    0m4.499s
+	sys     0m0.162s
+
+	$ time sha1sum.new --tag ~/test.iso
+	SHA1 (/home/padraig/test.iso) = 3c27f7ed01965fd2b89e22128fd62dc51a3bef30
+	real    0m2.685s
+	user    0m2.512s
+	sys     0m0.170s
+
+	* configure.ac: By default, enable use of libcrypto if available.
+	* src/local.mk: Link with libcrypto.
+	* NEWS: Mention the md5sum and sha*sum improvements.
+
+2013-12-04  Pádraig Brady  <P@draigBrady.com>
+
+	df: handle bind mounts when processing device nodes
+	* src/df.c (get_disk): Use the same heuristic used in
+	get_point() to select the shortest file system mount point,
+	in an attempt to show the base mounted file system.
+	* NEWS: Mention the bug fix.
+
+2013-12-04  Pádraig Brady  <P@draigBrady.com>
+
+	df: dereference symlinks to disk device nodes
+	This is so the matching for the device is done on the canonical name
+	of the disk node, rather than on the path of the symlink.
+	In any case the user will generally want to use the symlink target.
+
+	* src/df.c (get_disk): Canonicalize the passed file,
+	before matching against the list of mounted file system devices.
+	Note we pass the original symlink name to the "file" output field,
+	as the symlink target is usually available through the "source" field.
+	* tests/df/df-symlink.sh: Test the dereferencing operation.
+	* tests/local.mk: Mention the new test.
+	* NEWS: Mention the fix.
+	Reported by Ondrej Oprala
+
+2013-12-04  Pádraig Brady  <P@draigBrady.com>
+
+	build: update gnulib submodule to latest
+	Note tests/init.sh and bootstrap are still in sync with gnulib.
+
+	* gnulib: Sync two configure check fixes.
+	- Avoid generating core dumps from regex configure check
+	- Fix compile error in getcwd configure check
+
+2013-12-04  Pádraig Brady  <P@draigBrady.com>
+
+	build: update gnulib submodule to latest
+	Note tests/init.sh and bootstrap are still in sync with gnulib.
+
+	* gnulib: Sync many fixes/changes, including the base64
+	encoding speedup mentioned in commit v8.21-145-g9120845
+	Also included is support for enabling use of libcrypto hash routines
+	which are generally well optimized for particular systems.
+
+2013-12-03  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	maint: avoid '%s' quoting notation in diagnostic messages
+	Add a new rule to ensure the use of quote() instead of '%s' or `%s'
+	in format strings of diagnostics messages.
+
+	* cfg.mk (sc_prohibit_quotes_notation): Add rule.
+	* TODO: Remove the entry regarding the '%s' notation.
+	* src/mkfifo.c (main): Remove the offending and in this case even
+	duplicate quoting in the format string of the error diagnostic.
+	* src/mknod.c (main): Likewise.
+	* src/df.c (decode_output_arg): Change two invocations of error()
+	according to the above new rule.
+	* src/numfmt.c: Fix numerous wrong quote notations to fit the above
+	new rule, mostly in internal debugging diagnostic messages.
+
+2013-12-03  Pádraig Brady  <P@draigBrady.com>
+
+	doc: remove obsolete info on terminal alignment bugs
+	* doc/coreutils.texi (ls invocation): Remove the note about
+	OSX terminals not aligning properly as this is no longer the case.
+	Tested by: Philipp Thomas
+
+2013-11-29  Pádraig Brady  <P@draigBrady.com>
+
+	build: fix potential factor build failure on arm and powerpc
+	* src/longlong.h: Sync with the latest longlong.h from libgmp to:
+	- avoid arm asm when being compiled for the thumb instruction [sub]set
+	- avoid old powerpc assembly that is incompatible with newer GCC
+	- add arm64 optimized count_trailing_zeros()
+	- add sparc64 optimized add_ssaaaa() and umul_ppmm()
+
+2013-11-29  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	tests: add a test for rm -r "/"
+	* tests/rm/r-root.sh: Add a non-root test.
+	* tests/local.mk (all_tests): Mention the test.
+
+2013-11-29  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	maint: remove various FIXME comments
+	* src/extent-scan.c (extent_need_sync): Remove the FIXME comment about
+	removing the work around.  As discussed in [1], the needed FIEMAP fix
+	never made it into the Linux kernel.
+
+	* src/realpath.c (longopts): Remove the FIXME comment about deprecating
+	the --strip option as it's a valid alias for --no-symlinks option.
+	Also discussed in [1].
+
+	[1] http://lists.gnu.org/archive/html/coreutils/2013-11/msg00103.html
+
+2013-11-29  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	df: remove long-obsolescent --megabytes option
+	This option has been undocumented for 12 years [1], and warned
+	about for a year [2].
+
+	[1] commit FILEUTILS-4_1_4-23-gd177203
+	[2] commit v8.17-43-g453ce92
+
+	* src/df.c (MEGABYTES_OPTION): Remove.
+	(long_options): Remove "megabytes" element.
+	(main): In the option parsing loop, remove the MEGABYTES_OPTION case.
+	* NEWS: Mention the change.
+
+2013-11-28  Pádraig Brady  <P@draigBrady.com>
+
+	build: fix selinux.c build failure on 32 bit
+	* src/selinux.c: Don't include the system "fts.h" as
+	that disallows _FILE_OFFSET_BITS=64 which gnulib auto enables
+	to support large files on 32 bit systems.  Instead include
+	our "xfts.h" which includes the less limited gnulib replacement,
+	and also a checked version of xfts_open().
+	(restorecon): Use the checked xfts_open() rather than the standard
+	fts_open().
+	Prompted by the continuous integration build failure at:
+	http://hydra.nixos.org/build/6934169
+
+2013-11-27  Pádraig Brady  <P@draigBrady.com>
+
+	build: avoid more selinux build failures
+	Handle both newer selinux libraries with mode_to_security_class(),
+	and systems without selinux at all.  We could easily adjust
+	gnulib to provide the necessary stubs for use by this module,
+	but it's more efficient to just stub out the module completely,
+	when not using selinux.
+
+	* src/selinux.h: Define stubs for the two module functions,
+	when SELinux is not available.
+	* src/selinux.c: Exclude all logic in preference for the stubs
+	when selinux isn't used.  Also when newer selinux libs are used,
+	don't use our conflicting static version of mode_to_security_class().
+	m4/jm-macros.m4: Check for the system mode_to_security_class().
+
+2013-11-27  Pádraig Brady  <P@draigBrady.com>
+
+	build: avoid build failure on non selinux systems
+	* src/selinux.c: This module introduced in commit v8.21-159-gd8e27ab
+	doesn't need to include <selinux/flask.h>.  That header file
+	isn't catered for by gnulib, but is not needed as we're not
+	explicitly referencing any class IDs.
+	Prompted by the continuous integration build failure at:
+	http://hydra.nixos.org/build/6920020
+
+2013-11-27  Pádraig Brady  <P@draigBrady.com>
+
+	selinux: adjust utils to run restorecon with -Z
+	cp, mv, install, mkdir, mkfifo, mknod are adjusted so that:
+	 -Z no longer accepts an argument.
+	 -Z or --context without an argument do not warn without SELinux.
+	 --context with an argument will warn without SELinux.
+
+	* src/local.mk: Reference the new selinux module where required.
+	* src/system.h: Make the argument to --context optional.
+	* src/mkdir.c: Likewise.  Also handle the SMACK case for --context.
+	Note we currently silently ignore -Z with SMACK.
+	* src/mkfifo.c: Likewise.
+	* src/mknod.c: Likewise.
+	* src/install.c: Likewise.  Note install(1) by default already
+	set the context for target files to their system default,
+	albeit with an older method.  Use the -Z option to select between
+	the old and new context restoration behavior, and document
+	the differences and details for how context restoration
+	is done in new and old methods, with a view disabling the
+	old method entirely in future.
+	* src/cp.c: Make the argument to --context optional.
+	Note -Z implies --no-preserve=context.  I.E. -Z overrides
+	that aspect of -a no matter what order specified.
+	(struct cp_options): Document the context handling options.
+	(main): Check/adjust option combinations after all
+	options are processed, to both simplify processing
+	and to make handling independent of order of options
+	on the command line.  Also improve the diagnostics
+	from a failed call to setfscreatecon().
+	(set_process_security_ctx): A new function,
+	refactored to set the default context from the source file,
+	or with the type adjusted as per the system default for
+	the destination path.
+	(set_file_security_ctx): A new function refactored to
+	set the security context of an existing file, either based on
+	the process context or the default system context for a path.
+	(copy_internal): Use the refactored functions to simplify
+	error handling and consistently fail or warn as needed.
+	(copy_reg): Likewise.
+	(copy_internal): With --preserve=context, also copy
+	context from non regular files.  Note for directories this may
+	impact the copying of subsequent files to that directory?
+	(copy_attr): If we're handling SELinux explicitly,
+	then exclude to avoid the redudant copy with --preserve=context,
+	and the problematic copy with -Z.  Note SELinux attribute exclusion
+	also now honors cp -a --no-preserve=context.  Note there was a
+	very small window over 10 years ago, where attr_copy_file was
+	available, while attr_copy_check_permissions was not, so we
+	don't bother adding an explicit m4 check for the latter function.
+	* src/mv.c: Support --context, but don't allow specifying an argument.
+	* src/chcon.c: Adjust a comment to be specific to SELinux.
+	* src/runcon.c: Likewise.
+	* src/copy.c: Honor the context settings to "restorecon" as appropriate.
+	* src/copy.h: Add a new setting to select "restorecon" functionality.
+	* tests/mkdir/selinux.sh: s/-Z/--context=/
+	* tests/cp/cp-a-selinux.sh: Augment this test with cases
+	testing basic -Z functionality, and also test the various
+	invalid option combinations and option precedence.
+	* tests/mkdir/restorecon.sh: Add a new test for the
+	more involved mkdir -Z handling, since the directory changing
+	and non existent directories need to be specially handled.
+	Also check the similar but simpler handling of -Z by mk{nod,fifo}.
+	* tests/local.mk: Reference the new test.
+	* doc/coreutils.texi (cp invocation): Update as per interface changes.
+	(mv invocation): Likewise.
+	(install invocation): Likewise.
+	(mkfifo invocation): Likewise.
+	(mknod invocation): Likewise.
+	(mkdir invocation): Likewise.
+	* NEWS: Mention the new feature and change in behavior.
+
+2013-11-27  Daniel J Walsh  <dwalsh@redhat.com>
+
+	selinux: a new module implementing "restorecon" functionality
+	* src/selinux.c: A new module implementing "restorecon" functionality.
+	There are two main functions to adjust the type of the referenced
+	file system item.  defaultcon() will setup the process context so
+	that new items will have the required context without races.  This is
+	the preferred method.  For existing files, the equivalent restorecon()
+	is available which has two modes.  With the "local" parameter set to
+	false, restorecon() will adjust the type according to the system
+	configuration for that file, and set to true will update the context
+	as per the context for the current process (disregarding type).
+	* src/selinux.h: Likewise.
+	* po/POTFILES.in: Reference the new module.
+
+2013-11-27  Pádraig Brady  <P@draigBrady.com>
+
+	shred: provide --remove methods to avoid excessive syncing
+	A sync operation is very often expensive.  For illustration
+	I timed the following python script which indicated that
+	each ext4 dir sync was taking about 2ms and 12ms, on an
+	SSD and traditional disk respectively.
+
+	  import os
+	  d=os.open(".", os.O_DIRECTORY|os.O_RDONLY)
+	  for i in range(1000):
+	     os.fdatasync(d)
+
+	So syncing for each character for each file can result
+	in significant delays.  Often this overhead is redundant,
+	as only the data is sensitive and not the file name.
+	Even if the names are sensitive, your file system may
+	employ synchronous metadata updates, which also makes
+	explicit syncing redundant.
+
+	* tests/misc/shred-remove.sh: Ensure all the new parameters
+	actually unlink the file.
+	* doc/coreutils.texi (shred invocation): Describe the new
+	parameters to the --remove option.
+	* src/shred.c (Usage): Likewise.
+	(main): Parse the new options.
+	(wipename): Inspect the new enum to see which of
+	the now optional tasks to perform.
+	* NEWS: Mention the new feature.
+	* THANKS.in: Add reporter Joseph D. Wagner
+
+2013-11-27  Pádraig Brady  <P@draigBrady.com>
+
+	tail: improve inotify handling of symlinks
+	Previous behavior failed to read contents of a (re)appearing file,
+	when symlinked by tail's watched file.  Also we now diagnose other
+	edge cases when running in inotify mode, where an initially
+	missing or regular file changes to a symlink.
+
+	* src/tail.c (main): If any arg is a symlink, use polling mode.
+	(recheck): Diagnose the edge case where a symlink appears during
+	inotify processing.
+	* tests/tail-2/symlink.sh: Test the fix. Mention the edge cases.
+	* tests/local.mk: Reference the new test.
+	* NEWS: Mention the fix.
+	Reported by: Ondrej Oprala
+
+2013-11-27  Pádraig Brady  <P@draigBrady.com>
+
+	df: add --output=file to directly output specified arguments
+	* src/df.c (usage): Document the new 'file' --output field.
+	(get_dev): Add a new parameter to pass the specified
+	argument from the command line through.  Use '-' if a
+	command line parameter is not being used.
+	* doc/coreutils.texi (df invocation): Describe the new 'file' field.
+	* tests/df/df-output.sh: Adjust all fields test, and
+	add a specific test for --output=file.
+	* NEWS: Mention the new feature.
+
+	timeout: avoid unlikely issues with --kill-after
+	* src/timeout.c (cleanup): When calling settimeout() from
+	this signal handler, ensure we don't call out to error()
+	or gettext(), which are not async-signal-safe.
+	Also reset the errno which may be cleared by settimeout().
+
+	tests: ensure factor tests can be regenerated
+	* tests/local.mk (factor-tests:) Add -f to the mv command that
+	replaces any existing generated tests.  This is required to avoid
+	prompts when root initially generates the tests, and they subsequently
+	need to be regenerated by a non root user.
+
+	sort: avoid issues when issuing diagnostics from child processes
+	* src/sort.c: (async_safe_die): A new limited version of error(),
+	that outputs fixed strings and unconverted errnos to stderr.
+	This is safe to call in the limited context of a signal handler,
+	or in this particular case, between the fork() and exec() of
+	a multithreaded process.
+	(move_fd_or_die): Use the async_safe_die() rather than error().
+	(maybe_create_temp): Likewise.
+	(open_temp): Likewise.
+	Fixes http://bugs.gnu.org/15970
+
+2013-11-26  Pádraig Brady  <P@draigBrady.com>
+
+	doc: clarify the operation of ls -k
+	* src/ls.c (usage): Mention -k only changes the display
+	for disk usage (directory total, and ls -s), and imply
+	that it can be overridden (by --block-size, and -h).
+	* doc/coreutils.texi (block size): Mention that ls -k
+	handling is different to other utilities.
+	Addresses http://bugs.gnu.org/14525
+
+2013-11-23  John  <da_audiophile@yahoo.com>
+
+	dircolors: add a new entry to colorize 'lz4' files
+	* src/dircolors.hin: Add entry for the speed optimized 'lz4' compressor.
+
+2013-11-22  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	tests: enhance rm test regarding "." and ".."
+	Recent commit 2da7009d changed the error diagnostic of rm(1) trying
+	to remove "." or "..".  Enhance the corresponding test.
+
+	* tests/rm/r-4.sh: Ensure rm(1) outputs the expected error diagnostic.
+
+2013-11-21  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	maint: avoid perl warning in sc_check-AUTHORS
+	With newer perl, "make syntax-check" issues many warnings like:
+	  -i used with no filenames on the command line, reading from STDIN.
+
+	* cfg.mk (sc_check-AUTHORS): Remove the -i flag in the perl
+	invocation as it is reading from a pipe.
+
+2013-11-21  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	doc: enhance diagnostic when rm skips "." or ".." arguments
+	The error diagnostic
+	  "rm: cannot remove directory: '.'"
+	does not give the user a hint for the reason.
+	Issue a clearer error message.
+
+	* src/remove.c (rm_fts): Enhance the error diagnostic in the above
+	case to emphasize that skipping is done deliberately.
+	In the corresponding comment, mention that POSIX mandates this
+	behavior.  Likewise in the subsequent comment for skipping "/".
+	* doc/coreutils.texi (rm invocation): In the paragraph describing
+	the above behavior, mention that POSIX mandates it.
+
+2013-11-18  Pádraig Brady  <P@draigBrady.com>
+
+	tests: fix false rm -I test failure when run as root
+	Fix a recent regression introduced in commit v8.21-127-g5ee7d8f
+
+	Also related to this is the recent query about root run `rm -I`
+	ignoring the mode bits of a file: https://bugzilla.redhat.com/1013171
+
+	* tests/rm/interactive-once.sh: Avoid the messages and
+	corresponding file presence checks with write protected files
+	when running as root.
+
+2013-11-17  Colin Leitner  <colin.leitner@googlemail.com>
+
+	stty: add support for mark/space parity
+	This adds support for using a constant or "stick" parity bit.
+
+	* src/stty.c (usage): Mention the new flag.
+	* tests/misc/stty.sh: Adjust for the new flag.
+	* NEWS: Mention the improvement.
+	* docs/coreutils.texi (stty invocation): Mention the new flag.
+
+2013-11-11  Pádraig Brady  <P@draigBrady.com>
+
+	base64: improve encoding I/O efficiency
+	Since the I/O overhead is significant to the relatively
+	simple processing done by this utility, use fputs() rather
+	than fputc() to output '\n'.
+	Time to process a 100MiB file was measured to
+	decrease from 0.417s to 0.383s, i.e. an 8% improvement.
+
+	Related to these changes, is a processing improvement in
+	gnulib, which increases throughput by 60% when processing
+	full buffers, which improves processing of a 100MiB file
+	with standard wrapped output, down to 0.256s.
+	http://git.sv.gnu.org/gitweb/?p=gnulib.git;a=commit;h=43fd1e7b
+
+	Also increase the encoding buffer size from 3 to 30KiB.
+	This was seen to give a further 8% improvement, taking
+	processing time down to 0.235s in the wrapped output case.
+	The decoding size buffer is not adjusted,
+	due to the noted caveat with --ignore-garbage.
+
+	* src/base64.c (BLOCKSIZE): Split into ENC_ and DEC_ variants,
+	with the former increased from 3KiB to 30KiB.
+	(wrap_write): Use the simpler fputc() rather than fputs()
+	to output the '\n' character.  Also check against EOF
+	rather than < 0 for errors.
+	(do_encode): Likewise.
+	* NEWS: Mention the large increase in performance, which
+	with the I/O improvements in coreutils and the processing
+	improvement in gnulib, amount to about a 60% throughput increase.
+
+2013-11-08  Pádraig Brady  <P@draigBrady.com>
+
+	shred: avoid data write pass with --size=0
+	* src/shred.c (dopass): Exit early to avoid redundant heap
+	allocation, and more importantly avoiding a file sync
+	when we're writting no data, as this can have side effects.
+	Also with --verbose, this avoids printing of "pass status"
+	which could be confusing as to whether data was actually written.
+	* tests/misc/shred-passes.sh: Ensure the status for data
+	passes are not written when not doing any data writes.
+
+	shred: increase I/O block size for periodic pattern case
+	* src/shred.c (dopass): In the periodic pattern case increase the
+	I/O block size from 12KiB to 60KiB (also a multiple of 3 and 4096).
+	* NEWS: Adjust accordingly.
+
+2013-11-08  Pádraig Brady  <P@draigBrady.com>
+
+	shred: fix direct I/O failures for last write to file
+	Since direct I/O is now enabled with commit v8.21-139-gebaf961
+	we must handle the case where we write an odd size at the
+	end of a file (with --exact), or we specify an odd --size that
+	is larger than 64KiB, or in the very unlikely case of a device
+	with an odd size.  This issue was present since direct I/O
+	support was first added in v5.3.0, but latent since v6.0.
+	Theoretically this could have also been an issue after that on
+	systems which didn't have alignment constraints, but did have
+	size constraints for direct I/O.
+
+	* src/shred.c (dopass): On the first pass for a file, always
+	retry a write that fails with EINVAL, so we handle direct I/O
+	failure at either the start or end of the file.  Adjust the comment
+	as the original case is out of date and implicitly handled
+	by this more general fix.
+	* tests/misc/shred-exact.sh: Add a test case.
+	* NEWS: Add a "bug fix" entry for shred since there are
+	two related issues now fixed.
+
+2013-11-07  Gian Piero Carrubba  <gpiero@rm-rf.it>
+	    Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	cp: fix --link regarding the dereferencing of symbolic links
+	* src/copy.c (create_hard_link): Add a bool 'dereference' parameter,
+	and pass AT_SYMLINK_FOLLOW as 'flags' to linkat() when dereference
+	is true.
+	(should_dereference): Add new 'bool' function to determine if a
+	file should be dereferenced or not.
+	(copy_internal): Use the above new should_dereference() and remember
+	its return value in a new local bool 'dereference' variable.  Use that
+	in all three calls to create_hard_link().
+	* src/cp.c (main): after parsing the options, if x.dereference is
+	still DEFEF_UNDEFINED and the x.recursive is true, then only set
+	x.dereference to DEREF_NEVER iff --link was not specified.
+	* doc/coreutils.texi (cp invocation): Mention that cp(1) does not
+	follow symbolic links in the source when --link is specified.
+	Likewise in the description of the -R option when used together with
+	that option.
+	* tests/cp/same-file.sh: Adapt the expected results for the -fl,
+	the -bl and the -bfl tests.
+	* tests/cp/link-deref.sh: Add a new test.
+	* tests/local.mk (all_tests): Reference the above new test.
+	* NEWS (Changes in behavior): Mention the change.
+
+	This fixes http://bugs.gnu.org/15173
+
+2013-11-06  Pádraig Brady  <P@draigBrady.com>
+
+	shred: write larger chunks when possible
+	* src/shred.c (dopass): When not needing to write periodic patterns,
+	use a 64KiB block size to reduce the number of write system calls.
+
+2013-11-05  Pádraig Brady  <P@draigBrady.com>
+
+	shred: enable direct I/O when possible
+	Commit v5.92-1057-g43d487b introduced a regression
+	in coreutils 6.0 where it removed the page alignment
+	of the buffer to write, thus disabling direct I/O.
+	We want to use direct I/O when possible to avoid
+	impacting the page cache at least, as we know we don't
+	want to cache the data we're writing.
+
+	* src/shred.c (dopass): Allocate the buffer on the heap,
+	while using a more general calculation to allow to have
+	the output size independent from the fillpattern() size
+	constraint of a multiple of 3.  Also we dispense with the
+	union as it's no longer needed given we're aligning on
+	a page boundary and thus don't need to explicitly handle
+	uint32_t alignment.
+
+2013-11-01  Pádraig Brady  <P@draigBrady.com>
+
+	md5sum, sha*sum: improve help for --check related options
+	* src/md5sum.c (usage): s/three/four/ in the message pertaining
+	to the --check related options.  Also clarify that --strict
+	is just significant for the formatting of the checksum lines.
+	Also since we're changing both strings, move the --strict description
+	in with the description of the other options and order alphabetically.
+	* THANKS.in: Added reporter: Daniel Mach
+
+	maint: simplify printing of md5sum file names
+	* src/md5sum.c (main): Add a comment as to why we continue
+	to escape names that do not have '\n' but do have '\\' chars.
+	(print_filename): Use the predetermined boolean to decide
+	whether to escape or not, so that in the common case we
+	can output the file name directly, rather than inspecting each char.
+	* tests/misc/md5sum.pl: Add case to show '\\' chars cause escaping.
+	* tests/misc/sha1sum.pl: Likewise.
+
+2013-11-01  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	build: fix dependencies of man/sha*sum.1
+	Although the above man pages depend on src/md5sum.c as a shared
+	source, the build of the man pages directly requires their own
+	executables to exist.
+
+	* man/local.mk (man/sha1sum.1): Change the dependency from
+	'src/md5sum' to 'src/sha1sum'.
+	(man/sha224sum.1): s/md5sum/sha224sum/
+	(man/sha256sum.1): s/md5sum/sha256sum/
+	(man/sha384sum.1): s/md5sum/sha384sum/
+	(man/sha512sum.1): s/md5sum/sha512sum/
+
+	Reported by Pádraig Brady in
+	http://lists.gnu.org/archive/html/coreutils/2013-11/msg00006.html
+
+2013-10-15  Mike Frysinger  <vapier@gentoo.org>
+
+	dircolors: add putty-256color terminal type
+	* src/dircolors.hin: Add putty-256color
+	Reported-by: Thomas D. <whissi@whissi.de>, via
+	http://bugs.gentoo.org/486786
+	Fixes http://bugs.gnu.org/15624
+
+2013-10-15  Pádraig Brady  <P@draigBrady.com>
+
+	maint: update the instructions for building prerequisites
+	* README-prereq: Update as per the latest required versions
+	in bootstrap.conf.  Also add a missing cd command.
+	Reported by Aaron Davies
+	Fixes http://bugs.gnu.org/15612
+
+2013-10-11  Ondřej Vašík  <ovasik@redhat.com>
+
+	cp: correct error message for invalid arguments of '--no-preserve'
+	* src/cp.c (decode_preserve_arg):
+	Correct error message for invalid arguments of '--no-preserve'.
+	Reported by M.Vadkerti in http://bugzilla.redhat.com/1018206
+	Fixes http://bugs.gnu.org/15588
+
+2013-10-10  Pádraig Brady  <P@draigBrady.com>
+
+	doc: clarify the example for cp --preserve=links
+	* doc/coreutils.texi (cp invocation): Give more detail about what's
+	happening in the example, explicitly calling out the --no-dereference
+	option required to make the -H and -L options significant.
+	Also mention the option order significance of the -H and -L options.
+	Fixes http://bugs.gnu.org/15579
+
+2013-10-07  Pádraig Brady  <P@draigBrady.com>
+
+	mktemp: fix incorrect exit status from previous commit
+	* src/mktemp.c (main): Use an exit() strategy consistent with the
+	previous clauses dealing with optional error messages to ensure
+	we exit with the correct status in all cases.
+	Prompted by the continuous integration build failure at:
+	http://hydra.nixos.org/build/6412979
+
+2013-10-06  Pádraig Brady  <P@draigBrady.com>
+
+	mktemp: with --quiet, only suppress I/O errors
+	The reason for having a --quiet option is to
+	suppress only some subset of possible errors.
+	The most useful separation here is with usage/internal errors,
+	and errors due to file creation etc. (i.e. I/O errors).
+
+	* src/mktemp.c (main): Match the --help and info docs and
+	only suppress the file/dir creation error messages.
+	* tests/misc/mktemp.pl: Adjust accordingly.
+
+2013-10-06  Pádraig Brady  <P@draigBrady.com>
+
+	mktemp: synchronize the -p option with docs
+	* src/mktemp.c (usage): Synchronize the -p option description with
+	the logic and info docs.  I.E. that -p is just an alias of --tmpdir.
+	Also for consistency treat --tmpdir='' the same with or without -t.
+	I.E. always ignore the --tmpdir option if the param is empty.
+	Fixes http://bugs.gnu.org/15425
+
+2013-10-06  Karl Berry  <karl@freefriends.org>
+
+	doc: expand the texinfo examples for the paste command
+	* doc/coreutils.texi (paste invocation): Move the synopsis to the top.
+	Provide examples for the different type of operations possible.
+	Add a specific common example to join consecutive lines with a space.
+
+2013-09-26  Sergio Durigan Junior  <sergiodj@sergiodj.net>
+
+	rm: with -I, prompt before deleting a write protected file
+	This regression was introduced in commit v6.7-71-g0928c24
+
+	* src/rm.c (main): Make the -I option behave like --interactive=once.
+	* tests/rm/interactive-once.sh: Add cases for single and multiple files.
+	* NEWS: Mention the bug fix.
+	Fixes http://bugs.gnu.org/9308
+
+2013-09-22  Pádraig Brady  <P@draigBrady.com>
+
+	maint: move all id(1) tests to the same directory
+	* tests/misc/id-context.sh -> tests/id/context.sh
+	* tests/misc/id-setgid.sh -> tests/id/setgid.sh
+	* tests/misc/id-uid.sh -> tests/id/uid.sh
+	* tests/misc/id-zero.sh -> tests/id/zero.sh
+	* tests/local.mk: Reference the renamed tests
+
+	tests: parameterize the "root" username
+	* tests/misc/chroot-credentials.sh: Don't assume uid 0
+	has the "root" name, nor any name for that matter.
+
+	maint: remove unused parameters to parse_user_spec()
+	* src/chown.c (main): Since "name" parameters to parse_user_spec()
+	are now optional, just pass NULL for those unused parameters.
+	* src/chroot.c (main): Likewise.
+
+	id: support specifying the user by user ID
+	* src/id.c (usage): Remove 'name' from the synopsis,
+	implying that one can also specify by user ID.
+	(main): Like chown(1), call parse_user_spec() to implement
+	user name or ID lookup with appropriate precedence.
+	* doc/coreutils.texi (id invocation): Mention that
+	a user ID is supported and how '+' affects lookup order.
+	* tests/misc/id-groups.sh: Remove test now subsumed into...
+	* tests/misc/id-uid.sh: New test covering new interface.
+	* tests/local.mk: Rename the test.
+	* NEWS: Mention the new feature.
+	Addresses http://bugs.gnu.org/15421
+
+2013-09-22  Pádraig Brady  <P@draigBrady.com>
+
+	build: update gnulib submodule to latest; also bootstrap to latest
+	Notes tests/init.sh is still in sync with gnulib.
+
+	* bootstrap: Update to latest.
+	* gnulib: Sync many fixes/changes, including:
+	a fix for http://bugs.gnu.org/15066
+	and preparation for http://bugs.gnu.org/15421
+
+2013-09-22  Pádraig Brady  <P@draigBrady.com>
+
+	tests: avoid a failure when there isn't a name for all user IDs
+	* tests/misc/id-zero.sh: Don't check exit status when in -n mode.
+
+	Prompted by the continuous integration build failure at:
+	http://hydra.nixos.org/build/6196762
+
+2013-09-21  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	id: add -z, --zero option
+	* src/group-list.h (print_group_list): Add a parameter for the
+	delimiter of type char.
+	* src/group-list.c (print_group_list): Likewise, and use it instead
+	of a white space character to delimit the group entries.
+	* src/groups.c (main): Pass white space character to print_group_list().
+	* src/id.c (longopts):  Add array element for the new long option.
+	(usage): Document the new option.  While at it, fix the alignment
+	of the descriptions to match that of HELP_OPTION_DESCRIPTION.
+	(main): Define the bool flag opt_zero indicating the use of the
+	new option.  In the getopt_long loop, handle it.
+	Output an error diagnostic in the case the --zero option has been
+	specified together with the default format.
+	In the case of -gG, pass either a NUL or a white space character to
+	print_group_list() - depending on the above new flag.
+	Likewise change the printing of the final newline character: output
+	a NUL instead if the --zero option has been specified.
+	* doc/coreutils.texi (id invocation): Document the new option.
+	While at it, move the @exitstatus macro down after the macro
+	@primaryAndSupplementaryGroups in order to be consistent with
+	other texinfo documents.
+	(groups invocation): Move @exitstatus down after the macro
+	@primaryAndSupplementaryGroups here, too.
+	* tests/misc/id-zero.sh: Add new test exercising the new option.
+	* tests/local.mk (all_tests): Reference it.
+	* NEWS (New features): Mention the new option.
+	Fixes http://bugs.gnu.org/9987
+
+2013-09-12  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	maint: avoid patching help2man
+	Commit cde1ea0e separated the coreutils-specific patches from help2man.
+	Most changes had been made to accommodate to the coreutils style guide,
+	i.e., to avoid syntax-check failures like sc_long_lines.
+	Yet 2 changes had to be put into the patch help2man.diff.
+	But this added the dependency to patch(1) in distribution builds.
+	Incidentally, the 2 remaining parts of the patch can easily be
+	done outside of help2man.  Therefore, this commit partly reverts
+	the recent separation of help2man into 'help2man.in' and
+	'help2man.diff', and instead uses the original help2man script.
+
+	* man/help2man.in: Rename to ...
+	* man/help2man: ... this file.
+	* man/help2man.diff: Remove.
+	* man/local.mk (mandeps): Remove man/help2man.
+	(man/help2man): Remove recipe.
+	(.x.1): Add the --info-page option when calling help2man in order
+	to change the name of the texinfo manual from the default, "info PRG",
+	to "info coreutils 'PRG invocation'".
+	Furthermore, use an sed pattern to remove the sentence starting
+	with "For complete documentation".
+	* .gitignore (/man/help2man): Remove entry.
+	* .x-update-copyright: Replace the entries for the files
+	'man/help2man.diff' and 'man/help2man.in' by 'man/help2man'.
+	* cfg.mk (sc_long_lines): Instead of 'man/help2man.in', exempt
+	'man/help2man' from this test.
+	(sc_po_check): Likewise.
+	(sc_space_tab): Instead of 'man/help2man.diff', exempt 'man/help2man'
+	from this test.
+	(sc_trailing_blank): Likewise.
+	(sc_prohibit_tab_based_indentation): Instead of 'man/help2man.in' and
+	'man/help2man.diff', exempt 'man/help2man'.
+	* man/dummy-man: Recognize the option --info-page=... as no-op.
+
+2013-09-12  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	maint: use help2man configured with --disable-nls
+	Prompted by the continuous integration build failure at:
+	http://hydra.nixos.org/build/6038769
+
+	The previously committed 'help2man' requires a Perl module
+	which does not seem to be installed everywhere - and which
+	is not needed for our purposes:
+
+	  Can't locate Locale/gettext.pm in @INC
+	  BEGIN failed--compilation aborted at ./man/help2man line 28.
+
+	This module was pulled in automatically by the default configure call.
+	Use the NLS-disabled version instead.
+
+	* man/help2man.in: Use help2man configured with the --disable-nls
+	option to avoid the dependency to the above Perl module.
+	* man/help2man.diff: Adapt the line numbers of the hunks in the
+	coreutils-specific patch for help2man to apply without fuzz.
+
+	Reported by Pádraig Brady.
+
+2013-09-10  Pádraig Brady  <P@draigBrady.com>
+
+	build: fix corrupted patch causing bootstrap failures
+	The patch was corrupted in commit v8.21-50-g7b65f8e
+
+	* gl/modules/tempname.diff: Fix the offsets so that the patch
+	applies cleanly.  Note that this was only apparent with patch < 2.6.
+	With patch >= 2.6, patch will not indicate an error applying
+	the second hunk of the patch and silently ignore it.
+	I double checked that all patches now apply cleanly by adjusting
+	gnulib-tool to run patch with --fuzz=0 which might be advisable
+	going forward, even on a per project basis.
+	The silent ignoring of hunks by newer patch(1) has been reported.
+	Fixes http://bugs.gnu.org/15255
+
+2013-09-09  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	maint: update help2man to 1.43.3
+	Instead of diverging further from the upstream GNU help2man project
+	(http://www.gnu.org/software/help2man/), hold a copy of the original
+	script and keep track of our changes in a separate patch file.
+
+	The man pages created with the new version show the following,
+	non-invasive differences:
+	a) command options in the EXAMPLE sections are no longer in bold format,
+	b) file names are underlined now consistently.
+
+	* man/help2man: Rename to ...
+	* man/help2man.in: ... this file, and update content from the
+	upstream GNU help2man project.
+	* man/help2man.diff: Add patch file for help2man to remove the
+	sentence "For complete documentation ..." (see commit 5d4f09d8),
+	and to emit "info coreutils 'PROG invocation'" into the man
+	pages (77abf69a).
+	* man/local.mk (mandeps): Add help2man to the dependencies of
+	the man pages.
+	(man/help2man): Add rule to generate this script from the upstream
+	help2man.in file and the help2man.diff patch.
+	* .gitignore: Add man/help2man as it is no longer version controlled.
+	* cfg.mk (sc_long_lines): Exempt help2man.in from this check.
+	(sc_po_check): Likewise.
+	(sc_space_tab): Likewise.
+	(sc_trailing_blank): Exempt man/help2man.diff from this check.
+	(sc_prohibit_tab_based_indentation): Instead of help2man, now exempt
+	both help2man.in and help2man.diff from this test.
+	* .x-update-copyright: Add new file and add the above new help2man
+	files as well as the COPYING file.
+
+2013-09-05  FUJIWARA Katsunori  <foozy@lares.dti.ne.jp>
+
+	ls: fix possible incorrect exit status when recursing directories
+	If there is an error reading a directory that was referenced
+	through recursion, rather than directly on the command line,
+	then exit with the "less serious" exit code, rather than the
+	"serious" exit code reserved for command line arguments.
+	This issue was introduced in commit v5.2.1-1908-gb58dea5
+
+	* src/ls.c (print_dir): Ensure that the command_line_arg param
+	is false for directories being recursed into.
+	* NEWS: Mention the bug fix.
+	Fixes http://bugs.gnu.org/15249
+
+2013-09-01  Pádraig Brady  <P@draigBrady.com>
+
+	maint: update out of date confusing comments
+	* src/copy.c (copy_internal): Change mention of the removed --reply=no
+	option, to the similar in this context --no-clobber.
+	* src/sort.c: SI and IEC suffixes can now be mixed when --human-numeric.
+
+2013-08-29  Pádraig Brady  <P@draigBrady.com>
+
+	df: fix "blocks" translation in header
+	* src/df.c (get_header): Get the translation of "blocks" here,
+	rather than just marking the string for translation.
+	Fixes http://bugs.gnu.org/15054
+
+2013-08-10  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	doc: clarify when seq ends
+	* doc/coreutils.texi (seq invocation): Add a sentence clarifying
+	that seq terminates when LAST becomes smaller than the current number
+	plus INCREMENT.
+	* src/seq.c (usage): Likewise.
+	Fixes http://bugs.gnu.org/15068
+
+2013-08-07  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	doc: use more modern file system type examples in df description
+	* doc/coreutils.texi (df invocation): In the example list of common
+	file system types, exchange the entries which are not so common
+	anymore (4.2, ufs, efs, hsfs, pcfs) by far more prominent ones
+	(ext2, ext3, ext4, xfs, btrfs, iso9660, ntfs, fat).
+
+2013-08-07  Filipus Klutiero  <chealer@gmail.com>
+
+	doc: fix typo in description of df
+	* doc/coreutils.texi (df invocation): s/pseude/pseudo/
+	* THANKS.in (Filipus Klutiero): Remove entry, now that it will be
+	automatically included in the generated THANKS file.
+	Fixes http://bugs.gnu.org/15041
+
+2013-08-05  Benno Schulenberg  <bensberg@justemail.net>
+
+	doc: more semicolons instead of periods in option descriptions
+	Also slightly rephrase some descriptions for extra clarity, and
+	add more consistent indentation.
+
+	* src/df.c (usage): Semicolon, no final period.
+	* src/du.c (usage): Likewise, plus indentation and clarifying words.
+	* src/ls.c (usage): Semicolon, rephrasings, added parentheses for
+	clarity, indentation.
+	* src/rm.c (usage): Semicolons.
+	* src/tail.c (usage): Adjust -f description to prefer explanatory
+	language instead of option syntax.
+
+2013-08-03  Pádraig Brady  <P@draigBrady.com>
+
+	doc: clarify that uniq -d outputs a single entry per group
+	* src/uniq.c (usage): Clarify the -d option.
+	Fixes http://bugs.gnu.org/14996
+
+2013-08-02  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	maint: update copyright year number ranges of numfmt sources
+	Run "make update-copyright".
+
+	* src/numfmt.c: Update copyright year number range.  This file has
+	obviously been added to coreutils after and without the annual update.
+	* tests/misc/numfmt.pl: Likewise.
+
+2013-08-01  Benno Schulenberg  <bensberg@justemail.net>
+
+	doc: use semicolon instead of period in option descriptions
+	Also do not end option descriptions with a period, properly indent
+	continuation lines, and make some tiny clarifications.
+
+	* src/du.c (usage): Lowercase after semicolon.
+	* src/ls.c (usage): Semicolons instead of periods, small rephrasing
+	and two hyphens for clarity, proper indentation.
+	* src/mktemp.c (usage): Semicolons and lowercase.
+	* src/od.c (usage): Semicolons.
+	* src/ptx.c (usage): Use the standard phrase, clarify default option.
+	* src/setuidgid.c (usage): Properly indent continuation line.
+	* src/split.c (usage): Semicolons, lowercase, no final period.
+	* src/stat.c (usage): Semicolons, lowercase.
+	* src/tail.c (usage): Proper indentation, one shorter rephrasing,
+	semicolons, no final periods.
+	* src/timeout.c (usage): Properly indent, semicolons, no final periods.
+	Fixes http://bugs.gnu.org/14976
+
+2013-08-01  Pádraig Brady  <P@draigBrady.com>
+
+	doc: clarify that cp by default doesn't adjust existing file perms
+	* doc/coreutils.texi (cp invocation): Mention explicitly what
+	happens to permissions of existing files when -p is not specified.
+	Fixes http://bugs.gnu.org/14972
+
+2013-07-29  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	tests: fix another test failure in test/du/inodes.sh
+	Prompted by the continuous integration build failure at:
+	http://hydra.nixos.org/build/5584121
+
+	du(1) uses the first file object of the two test files linked to the
+	same inode, 'd/f' and 'd/h', whatever the system returns first.
+	Use 'd/f' in both the expected and the actual output.
+
+	* test/du/inodes.sh: Change the expected output as described above
+	when returning the --all directory entries (without -l).  Also replace
+	the name of the hardlink 'd/h' by 'd/f' in the actual output.
+
+2013-07-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+	doc: fix typo
+	* doc/coreutils.texi (du invocation): @itemx -> @item.
+
+2013-07-28  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	maint: cleanup compare calls in test/du/inodes.sh
+	* test/du/inodes.sh: In the cases where compare() fails, that function
+	would show the unified diff automatically.  Therefore, remove the
+	excess "cat out".
+	In the cases where expecting an empty file, use compare() again
+	rather than the simpler "test -s" because possible error reports
+	will then include the file's content for the same reason as above.
+
+2013-07-28  Pádraig Brady  <P@draigBrady.com>
+
+	maint: avoid clang static analysis issues in csplit
+	* src/csplit.c (find_lines): Assert that load_buffer() updates the
+	global buffers, thus "b" will be non NULL, thus suppressing subsequent
+	NULL pointer derefence warnings.
+	(process_regexp): Avoid a redundant assignment of the "line" pointer.
+	(process_line_count): Likewise.  Also reduce the "line" pointer scope.
+
+2013-07-28  Pádraig Brady  <P@draigBrady.com>
+
+	tests: fix intermittent failure in test/du/inodes.sh
+	Prompted by the continuous integration build failure at:
+	http://hydra.nixos.org/build/5582213
+
+	* test/du/inodes.sh: Due to undefined order in returned directory
+	entries, the expected output might not match, so sort both expected
+	and actual output when returning --all directory entries.
+	Also use a simpler test for ensuring no errors are output.
+
+2013-07-27  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	du: add --inodes option
+	This new option can be used to find directories with a huge
+	amount of files.  The GNU find utility has the printf format
+	"%h" which prints the number of entries in a directory, but
+	this is non-cumulative and doesn't handle hard links.
+
+	* src/du.c (struct duinfo): Add new member for counting inodes.
+	(duinfo_init): Initialize inodes member with Zero.
+	(duinfo_set): Set inodes counter to 1.
+	(duinfo_add): Sum up the 2 given inodes counters.
+	(opt_inodes): Add new boolean flag to remember if the --inodes
+	option has been specified.
+	(INODES_OPTION): Add new enum value to be used ...
+	(long_options): ... here.
+	(usage): Add description of the new option.
+	(print_size): Pass inodes counter or size to print_only_size,
+	depending on the inodes mode.
+	(process_file): Adapt threshold handling: with --inodes, print or
+	elide the entries according to the struct member inodes.
+	(main): Add a case for accepting the new INODES_OPTION.
+	Print a warning diagnostic when --inodes is used together with the
+	option --apparent-size or -b.
+	Reset the output_block_size to 1 ... and thus ignoring the
+	options -m and -k.
+	* tests/du/inodes.sh: Add a new test.
+	* tests/local.mk (all_tests): Mention it.
+	* doc/coreutils.texi (du invocation): Document the new option.
+	* NEWS: Mention the new option.
+
+2013-07-25  Ken Booth  <ken@booths.org.uk>
+
+	mv: replace empty directories in cross file system move
+	src/copy.c (copy_internal): Use rmdir() rather than unlink()
+	when the source is a directory, so that empty directories
+	are replaced in the destination as per POSIX.
+	* tests/mv/part-rename.sh: Augment with various combinations.
+	* NEWS: Mention the bug fix.
+	Fixes http://bugs.gnu.org/14763
+
+2013-07-22  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	maint: use new gnulib function to free mount entries in du
+	* src/du.c (fill_mount_table): Use free_mount_entry() instead
+	of freeing struct members manually.
+
+2013-07-22  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	maint: make some shell and perl scripts executable in 'tests/'
+	Some newer test scripts - partially ones from me - are not executable.
+	It does not seem to be a problem, but for consistency and to avoid
+	future problems on unusual platforms or shells change the permissions
+	by adding the executable bit.
+
+	* cfg.mk (sc_tests_executable): Add new syntax-check rule to ensure
+	that all test scripts are executable.
+	* tests/df/df-output.sh: Change file mode from 644 to 755.
+	* tests/du/threshold.sh: Likewise.
+	* tests/factor/run.sh: Likewise.
+	* tests/init.sh: Likewise.
+	* tests/misc/csplit-suppress-matched.pl: Likewise.
+	* tests/misc/numfmt.pl: Likewise.
+	* tests/tail-2/retry.sh: Likewise.
+
+2013-07-19  Rasmus Villemoes  <rv@rasmusvillemoes.dk>
+
+	rm: output number of arguments at the interactive prompt
+	Include the number of arguments which rm received in the "Remove all
+	arguments?" prompt.  This is useful in the, presumably, common case
+	where the arguments were not provided by hand, but instead were the
+	result of various shell expansions.  A simple, if somewhat contrived,
+	example (assuming rm is aliased to rm -I) could be:
+
+	  rm * .o
+
+	where the prompt "Remove 120 arguments?" is more likely to make
+	the user catch the problem.
+
+	* src/rm.c (main): Include correctly pluralized n_files
+	in the output message.  Also remove the now redudant "all".
+	* tests/rm/interactive-always.sh: Adjust to the new prompt.
+	* tests/rm/interactive-once.sh: Likewise.
+
+2013-07-19  Pádraig Brady  <P@draigBrady.com>
+
+	dd: make status=none suppress all diagnostics
+	* src/dd.c (STATUS_NONE): Simplify the enum so that
+	it's more general than just suppressing transfer counts.
+	Then test this in all locations where non fatal diagnostics
+	are output.
+	* tests/dd/misc.sh: Ensure the diagnostic about
+	being unable to skip past the end of input is suppressed.
+	* NEWS: Mention the change in behavior.
+	Fixes http://bugs.gnu.org/14897
+
+2013-07-12  Pádraig Brady  <P@draigBrady.com>
+
+	head: avoid redundant allocations when reading empty files
+	* src/head.c (elide_tail_lines_file): For seekable empty files,
+	or seekable files where the current offset is after the
+	end of the file, return immediately.  Previously the short
+	circuit code could not be reached due to logic error.
+	Spotted by coverity.
+
+2013-07-12  Pádraig Brady  <P@draigBrady.com>
+
+	maint: avoid a valgrind memory leak warning from pinky
+	Similarly to commit v8.21-84-g8d2da3f in src/uptime.c
+	avoid a "definitely lost" error from valgrind.  Note this
+	only happens with pinky when compiled without optimization,
+	in which case certain paths aren't eliminated casuing
+	valgrind to trigger the message.  Note also that coverity
+	flags this "resource leak" too.
+
+	* src/pinky.c (short_pinky): free utmp_buf for developer builds.
+
+2013-07-11  Anton Ovchinnikov  <revolver112@gmail.com>
+
+	df: reduce memory usage when filtering mount entries
+	Avoid Valgrind reports of "definitely lost" items
+	and while at it, free all discarded mount entries
+	to minimize the amount of memory used.
+
+	* src/df.c (filter_mount_list): Use the newly exported
+	free_mount_entry() from gnulib to free all mount entries
+	as they're discarded.
+
+2013-07-11  Pádraig Brady  <P@draigBrady.com>
+
+	build: update gnulib submodule to latest
+
+2013-07-11  Pádraig Brady  <P@draigBrady.com>
+
+	build: fix a build warning on 32 bit systems in shuf.c
+	Prompted by the continuous integration build failure at:
+	http://hydra.nixos.org/build/5508873
+
+	* src/shuf.c (write_random_numbers): Convert to an int type
+	that matches the prinft format spec.
+
+2013-07-11  Assaf Gordon  <assafgordon@gmail.com>
+
+	shuf: add --repetition to support repetition in output
+	main(): Process new option.  Replace input_numbers_option_used()
+	with a local variable.  Re-organize argument processing.
+	usage(): Describe the new option.
+	(write_random_numbers): A new function to generate a
+	permutation of the specified input range with repetition.
+	(write_random_lines): Likewise for stdin and --echo.
+	(write_permuted_numbers):  New function refactored from
+	write_permuted_output().
+	(write_permuted_lines): Likewise.
+	* tests/misc/shuf.sh: Add tests for --repetitions option.
+	* doc/coreutils.texi: Mention --repetitions, add examples.
+	* TODO: Mention an optimization to avoid needing to
+	read all of the input into memory with --repetitions.
+	* NEWS: Mention new shuf option.
+
+	tests: add more tests for shuf option combinations
+	* test/misc/shuf.sh: Add tests for erroneous conditions
+	like multiple '-o' and '--random-source'.
+
+2013-07-11  Pádraig Brady  <P@draigBrady.com>
+
+	maint: adjust indentation in df.c
+	* src/df.c: Adjust indentation and spacing with has
+	gotten quite out of line in a couple of places.
+
+2013-07-09  Pádraig Brady  <P@draigBrady.com>
+
+	df: fix mount list processing with unstatable mount dirs
+	* src/df.c (filter_mount_list): Initialize devlist->dev_num correctly
+	when unable to stat() a mount point.  This will avoid possible invalid
+	deduplication done on the list due to use of uninitialized memory.
+	* tests/df/skip-duplicates.sh: Ensure this code path is exercised.
+	Also refactor the test to be table driven.
+	* NEWS: Mention the bug fix.
+
+2013-07-07  Anton Ovchinnikov  <revolver112@gmail.com>
+
+	maint: avoid a valgrind memory leak warning from uptime
+	* src/uptime.c (uptime): Free utmp_buf returned from read_utmp,
+	to avoid a "definitely lost" warning from valgrind.
+
+2013-07-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+	build: update gnulib submodule to latest
+
+2013-07-05  Pádraig Brady  <P@draigBrady.com>
+
+	tests: fix "shuf unreadable" test to work when run as root
+	* tests/misc/shuf.sh: Restrict the test to the significant
+	case where we can't in fact read the "unreadable" file.
+
+2013-07-02  Pádraig Brady  <P@draigBrady.com>
+
+	stat: ensure --context emits an "unrecognized option" diagnostic
+	* src/stat.c (long_options): Remove the "context" option as it's
+	no longer referenced since commit v8.5-65-g13f3237
+
+2013-07-02  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	mkdir,mkfifo,mknod: give scontext-related variable a better scope
+	* src/mkdir.c (main): Move the variable ret and issuing the error
+	message into the body of the scontext-related if-block.
+	* src/mkfifo.c (main): Likewise.
+	* src/mknod.c (main): Likewise.
+
+2013-07-02  Pádraig Brady  <P@draigBrady.com>
+
+	maint: refactor SMACK interface to a separate module
+	Consolidate all smack routines and checks in a module.
+	We replace and wrap the most commonly used smack routines,
+	which allows removing ifdefs throughout the code.
+
+	* gl/lib/smack.h: A new header containing the implementation
+	of the wrapped and replacement routines.  Note the is_smack_enabled()
+	routine should be optimized out at compile time when compiled
+	on a system without libsmack.
+	* gl/modules/smack: Describe the new module and move the
+	configure time code here from ...
+	* m4/jm-macros.m4: ... here.
+	* bootstrap.conf: Reference the new module.
+	* src/id.c: Use the routines without ifdefs where possible.
+	* src/ls.c: Likewise.
+	* src/mkdir.c: Likewise.
+	* src/mkfifo.c: Likewise.
+	* src/mknod.c: Likewise.
+
+2013-07-02  Pádraig Brady  <P@draigBrady.com>
+
+	id: don't show SMACK errors unless -Z is specified
+	* src/id.c (main): Be consistent with the SELinux case,
+	and only show errors in getting the security context
+	when -Z is specified.
+
+2013-07-01  Jarkko Sakkinen  <jarkko.sakkinen@linux.intel.com>
+
+	mkdir,mkfifo,mknod: with -Z, create SMACK security context
+	Enable creation of SMACK security context with -Z command-line switch
+	if SMACK is enabled.
+
+	* mkdir.c (main): Set process security context to given SMACK label.
+	* mkfifo.c (main): Likewise.
+	* mknod.c (main): Likewise.
+	* src/local.mk: link mk{dir, fifo, nod} with libsmack.
+	* NEWS: Mention the new feature.
+
+2013-06-27  D. Hugh Redelmeier  <hugh@mimosa.com>
+
+	doc: fix details on the interaction of df with device nodes
+	* man/df.x: Don't say that a dev node is always on the root file system.
+	* doc/coreutils.texi (df invocation): Likewise.  Also state that the
+	device node to mounted file system interpretation is only done when
+	passed absolute paths to device nodes.
+
+2013-06-24  Jarkko Sakkinen  <jarkko.sakkinen@iki.fi>
+
+	ls: with -Z, show SMACK security context
+	Enable showing of file SMACK security with '-Z' command-line switch
+	if SMACK is enabled.  Showing SMACK context of a file does not strictly
+	require SMACK to be enabled but this required to make choice whether to
+	show SELinux or SMACK security context.
+
+	* src/ls.c (getfilecon_cache): Retrieve SMACK context if available.
+	(gobble_file): Handle SMACK context similarly to SELinux context.
+	* src/local.mk: Link lsl with libsmack.
+	* NEWS: Mention the new feature.
+	* .mailmap: Merge the Author's 2 email addresses.
+
+2013-06-22  Pádraig Brady  <P@draigBrady.com>
+
+	stdbuf: make it mandatory to specify a buffering option
+	This is consistent with the documented interface and
+	avoids any ambiguity in a user thinking that stdbuf without options
+	might reset to a "standard" buffering setup.
+
+	* src/stdbuf.c (set_libstdbuf_options): Indicate with the return value
+	whether any env variables were actually set.
+	(main): Fail unless some env variables were set.
+	* tests/misc/stdbuf.sh: Ensure this constraint is enforced.
+	* NEWS: Mention the small change in behavior.
+
+2013-06-22  Pádraig Brady  <P@draigBrady.com>
+
+	doc: clarify that truncate --size represents bytes by default
+	* src/truncate.c (usage): Mention that --size is in bytes which
+	is by far the most common usage.
+	* doc/coreutils.texi (truncate invocation): Likewise. Also cross
+	reference the --io-blocks option.
+	Reported in http://bugs.gnu.org/14686
+
+2013-06-20  Jarkko Sakkinen  <jarkko.sakkinen@linux.intel.com>
+
+	id: adjust/restrict smack support to newer versions of libsmack
+	There was slight change to libsmack such that positive values are
+	reserved for returning length of the label for smack_new_label_from_*
+	functions.
+
+	* m4/jm-macros.m4: Set HAVE_SMACK when both smack_new_label_from_self()
+	and recently added smack_new_label_from_path() are present.
+	The latter's presence indicates the newer API of the former.
+	* src/id.c (main): Check that smack_new_label_from_self() < 0,
+	and not just non-zero.
+
+2013-06-18  Pádraig Brady  <P@draigBrady.com>
+
+	tests: use appropriate precision when printing float limits
+	* src/getlimits.c (print_float): Adjust to use the ftoastr module,
+	which uses the appropriate precision so that no info is lost.
+	* cfg.mk (sc_prohibit_continued_string_alpha_in_column_1): Exclude od.c
+	fixes http://bugs.gnu.org/14650
+
+2013-06-13  Pádraig Brady  <P@draigBrady.com>
+
+	maint: update gitignore entries
+	* .gitignore: Exclude the generated doc/manual directory,
+	and also the src/fs-latest-magic.h file referenced in README-release.
+
+2013-06-12  Pádraig Brady  <P@draigBrady.com>
+
+	doc: clarify the description of du --separate-dirs
+	* src/du.c (usage): Clarify that --separate-dirs doesn't exclude
+	all directories.
+	* doc/coreutils.texi (du invocation): Avoid implying that -S
+	excludes the size of any non directory entries for a directory.
+	Also don't mention st_size as it's dependent on --apparent-size.
+	Reported by C de-Avillez in <https://launchpad.net/bugs/1187044>
+
+2013-06-05  Eric Blake  <eblake@redhat.com>
+
+	doc: mention prior stat change
+	For a file of size 1234 bytes, commit ca9aa759 had the side effect
+	of changing 'stat -c "%'s" file' from outputting "?s" to the nicer
+	"1,234", depending on locale.  This is worth mentioning in the NEWS.
+
+	Resolves part of http://bugs.gnu.org/14556.
+
+	* NEWS: Mention 8.7 improvement in stat.
+	* cfg.mk (old_NEWS_hash): Adjust accordingly.
+
+2013-06-05  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	build: update gnulib submodule; also bootstrap to latest
+	Notes tests/init.sh is still in sync with gnulib.
+
+	* bootstrap: Update to latest.
+	* gnulib: Update avoiding gnulib-test failures.
+
+2013-06-03  Pádraig Brady  <P@draigBrady.com>
+
+	tests: avoid a race in tail --retry testing
+	Prompted by the continuous integration build failure at:
+	http://hydra.nixos.org/build/5221053
+
+	* tests/tail-2/retry.sh: Ensure the 'out' file is truncated,
+	as it's used to arbitrate the run order of commands.
+	Relying on the truncation in the background tail command
+	is racy because the truncation can occur after the fork
+	of the background shell and thus wait4lines would not wait
+	for output to occur in 'out', which would mean that the
+	'missing' file could be populated by the time tail(1)
+	gets to process it.
+
+2013-06-03  Andreas Mohr  <andi@lisas.de>
+
+	doc: mention 'UTC' in date --utc help
+	src/date.c (usage): Make -u apparent in searches for UTC.
+
+2013-06-02  Jim Meyering  <meyering@fb.com>
+
+	od: -wN, N>64K, avoid misbehavior on systems with 32-bit size_t
+	* src/od.c (PRINT_FIELDS): Declare "i" to be of type uintmax_t, so that
+	the numerator in the expression for "next_pad" does not overflow.
+	(print_named_ascii): Likewise.
+	(print_ascii): Likewise.
+	Bug introduced via commit v6.12-42-g20c0b87.
+	* tests/misc/od.pl: Exercise each of the three affected code paths.
+	* NEWS (Bug fixes): Mention it.
+	Reported by Rich Burridge.
+
+	tests: head-c: avoid spurious failure with a 32-bit size_t
+	* tests/misc/head-c.sh: Don't try to elide 1 exabytes, since on
+	32-bit systems, that number is not representable as a size_t.
+	This command would fail on 32-bit systems, where SIZE_MAX < 1E:
+	  head --bytes=-E < /dev/null
+	Instead of "E", use $SSIZE_MAX.
+	For discussion, see http://bugs.gnu.org/13530
+
+2013-05-27  Jim Meyering  <meyering@fb.com>
+
+	tests: avoid spurious failure when SIZE_MAX is 2^32-1
+	* tests/split/line-bytes.sh: Since we've limited virtual memory to
+	20MB, choose a smaller size, 1GiB (which is <= SIZE_MAX) rather than
+	1EiB, which is larger than SIZE_MAX on 32-bit systems.
+	I confirmed that this test still fails when the split.c-modifying
+	part of v8.21-58-gfec363c is backed out.
+
+	tests: fix an ls test not to fail when user or group name contains SP
+	* tests/ls/block-size.sh (size_etc): The sed expression through which
+	we filtered the output of "ls -l ..." assumed that the user and group
+	name components of each line would not contain spaces.  Avoid the
+	problem by using -og instead of -l, thus not printing either of those
+	fields.  Adjust the sed expression accordingly.
+
+2013-05-27  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+	tests: numfmt: use the printf program, not the shell builtin
+	* tests/misc/numfmt.pl: Avoid a spurious failure when
+	/bin/sh is dash (as can happen on Debian systems).
+
+2013-05-24  Paul Eggert  <eggert@cs.ucla.edu>
+
+	stat: tune for large-LDAP case
+	* src/stat.c (print_stat): Omit unnecessary calls to setpwent, setgrent.
+	Problem reported by Fridolín Pokorný in	<http://bugs.gnu.org/14462>.
+
+2013-05-23  Pádraig Brady  <P@draigBrady.com>
+
+	split: with --line-bytes only allocate memory as needed
+	* src/split.c (line_bytes_split): Rewrite to only buffer
+	when necessary.  I.E. only increase the buffer when we've
+	already lines output in a split and we encounter a line
+	larger than the input buffer size, in which case a hold
+	buffer will be increased in increments of the input buffer size.
+	(lines_rr): Use the more abstract xalloc_die() just like
+	we did in line_bytes_split(), rather than explicitly
+	printing the "memory exhausted" message and exiting.
+	* tests/split/line-bytes.sh: Add a new test for this
+	function which previously had no test coverage.
+	* tests/local.mk: Reference the new test.
+	* NEWS: Mention the improvement.
+	Fixes http://bugs.gnu.org/13537
+
+2013-05-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+	maint: port --enable-gcc-warnings to clang
+	* configure.ac: If clang, add -Wno-format-extra-args and
+	-Wno-tautological-constant-out-of-range-compare.
+	* gl/lib/rand-isaac.c (ind):
+	* gl/lib/randread.c (readisaac):
+	* src/ls.c (dev_ino_push, dev_ino_pop):
+	* src/sort.c (buffer_linelim):
+	* src/system.h (is_nul):
+	* src/tail.c (tail_forever_inotify):
+	Rewrite to avoid casts that clang dislikes.
+	It's good to avoid casts anyway.
+	* src/expr.c (integer_overflow): Declare only if it exists.
+	(die): Remove; unused.
+	* src/ls.c (dev_ino_push): New function, replacing ...
+	(DEV_INO_PUSH): ... this removed macro.  All uses changed.
+	(decode_switches): Rewrite "str"+i to &str[i].
+
+	build: update gnulib submodule to latest
+
+	tests: don't assume expr was built with GMP
+	* tests/misc/cut-huge-range.sh (subtract_one): New string.
+	(CUT_MAX): Don't pass a too-large integer to 'expr'.
+
+2013-05-12  Pádraig Brady  <P@draigBrady.com>
+
+	doc: link to the list of rejected feature requests
+	* README: Update the email address best suited to discussing
+	feature requests, and also link to the list of previously
+	discussed and rejected requests.
+
+2013-05-12  Jim Meyering  <meyering@fb.com>
+
+	build: avoid new syntax-check failure
+	* po/POTFILES.in: Reflect renaming.
+
+2013-05-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+	maint: add FIXME comment
+
+	mkdir: don't assume umask equals POSIX default ACL mask
+	This fixes Bug#14371, reported by Killer Bassist.
+	* NEWS: Document this.
+	* src/mkdir.c (struct mkdir_options): Remove member ancestor_mode.
+	New member umask_value.  All uses changed.
+	* src/mkdir.c (make_ancestor): Fix umask assumption.
+	* src/mkdir.c, src/mkfifo.c, src/mknod.c (main):
+	Leave umask alone.  This requires invoking lchmod after creating
+	the file, which introduces a race condition, but this can't be
+	avoided on hosts with "POSIX" default ACLs, and there's no easy
+	way with network file systems to tell what kind of host the
+	directory is on.
+	* tests/local.mk (all_tests): Add tests/mkdir/p-acl.sh.
+	* tests/mkdir/p-acl.sh: New file.
+
+	build: update gnulib submodule to latest
+
+2013-05-08  Jarkko Sakkinen  <jarkko.sakkinen@iki.fi>
+
+	id: with -Z, show SMACK security context
+	Adds an optional dependency on libsmack.
+
+	* m4/jm-macros.m4: Look for the smack library/header.
+	* src/id.c (main): Output the smack context if available.
+	* src/local.mk: Link with libsmack if available.
+	* NEWS: Mention the new feature.
+
+2013-05-08  Cojocaru Alexandru  <xojoc@gmx.com>
+
+	cut: improve performance, especially with --output-delimiter
+	Use a sentinel value that's checked implicitly, rather than
+	a bit array, to determine if an item should be output.
+
+	Benchmark results for this change are:
+
+	$ yes abcdfeg | head -n1MB > big-file
+
+	$ for c in orig sentinel; do
+	    src/cut-$c 2>/dev/null
+	    echo -ne "\n== $c =="
+	    time src/cut-$c -b1,3 big-file > /dev/null
+	  done
+	== orig ==
+	real    0m0.049s
+	user    0m0.044s
+	sys     0m0.005s
+
+	== sentinel ==
+	real    0m0.035s
+	user    0m0.032s
+	sys     0m0.002s
+
+	 ## Again with --output-delimiter ##
+	$ for c in orig sentinel; do
+	    src/cut-$c 2>/dev/null
+	    echo -ne "\n== $c =="
+	    time src/cut-$c -b1,3 --output-delimiter=: big-file > /dev/null
+	  done
+	== orig ==
+	real    0m0.106s
+	user    0m0.103s
+	sys     0m0.002s
+
+	== sentinel ==
+	real    0m0.055s
+	user    0m0.052s
+	sys     0m0.003s
+
+	eol_range_start: Removed. 'n-' is no longer treated specially,
+	and instead SIZE_MAX is set for the 'hi' limit, and tested implicitly.
+	complement_rp: Used to complement 'rp' when '--complement' is specified.
+	ADD_RANGE_PAIR: Macro renamed to 'add_range_pair' function.
+	* tests/misc/cut-huge-range.sh: Adjust to the SENTINEL value.
+	Also remove the overlapping range test as this is no longer
+	dependent on large ranges and also is already handled with
+	the EOL-subsumed-3 test in cut.pl.
+
+2013-05-07  Cojocaru Alexandru  <xojoc@gmx.com>
+
+	cut: fix handling of overlapping ranges
+	This issue was introduced in commit v8.21-43-g3e466ad
+
+	* src/cut.c (set_fields): Process all range pairs when merging.
+	* tests/misc/cut-huge-range.sh: Add a test for this edge case.
+	Also fix an issue where we could miss reported errors due
+	to truncation of the 'err' file.
+
+2013-04-30  Pádraig Brady  <P@draigBrady.com>
+
+	doc: correct a URL to older textutils source
+	* doc/coreutils.texi (Putting the tools together): Adjust the
+	textutils-1.22 URL, and add a URL for newer sources.
+
+2013-04-29  Pádraig Brady  <P@draigBrady.com>
+
+	cut: reduce CPU usage for the the common case
+	Ensure appropriate functions are inlined.  This was seen to
+	be required with gcc 4.6.0 with -O2 on x86_64 at least.
+	It was reported that gcc 4.8.0 did inline these functions though.
+
+	Also reinstate the bit vector for the common case,
+	to further improve performance.
+
+	Benchmark results for both aspects of this change are:
+
+	$ yes abcdfeg | head -n1MB > big-file
+	$ for c in orig inline inline-array; do
+	    src/cut-$c 2>/dev/null
+	    echo -ne "\n== $c =="
+	    time src/cut-$c -b1,3 big-file > /dev/null
+	  done
+
+	== orig ==
+	real    0m0.088s
+	user    0m0.081s
+	sys     0m0.007s
+
+	== inline ==
+	real    0m0.070s
+	user    0m0.060s
+	sys     0m0.009s
+
+	== inline-array ==
+	real    0m0.049s
+	user    0m0.044s
+	sys     0m0.005s
+
+	* src/cut.c (set_fields): Set up the printable_field bit vector
+	for performance, but only when it's appropriate.  I.E. not
+	when either --output-delimeter or huge ranges are specified.
+	(next_item): Ensure it's inlined and avoid unnecessary processing.
+	(print_kth): Ensure it's inlined and add a branch for the fast path.
+	Related to http://bugs.gnu.org/13127
+
+2013-04-29  Cojocaru Alexandru  <xojoc@gmx.com>
+
+	cut: reduce CPU overhead in determining item to output
+	print_kth() is the central function of cut used to
+	determine if an item is to be output or not,
+	so simplify it by moving some logic outside.
+	Benchmark results for this change are:
+
+	$ yes abcdfeg | head -n1MB > big-file
+	$ for c in orig split; do
+	    src/cut-$c 2>/dev/null
+	    echo -ne "\n== $c =="
+	    time src/cut-$c -b1,3 big-file > /dev/null
+	  done
+
+	== orig ==
+	real    0m0.111s
+	user    0m0.108s
+	sys     0m0.002s
+
+	== split ==
+	real    0m0.088s
+	user    0m0.081s
+	sys     0m0.007s
+
+	* src/cut.c (print_kth): Refactor a branch to outside the function.
+	Related to http://bugs.gnu.org/13127
+
+2013-04-29  Cojocaru Alexandru  <xojoc@gmx.com>
+
+	cut: make memory allocation independent of range width
+	The current implementation of cut, uses a bit array,
+	an array of `struct range_pair's, and (when --output-delimiter
+	is specified) a hash_table.  The new implementation will use
+	only an array of `struct range_pair's.
+	The old implementation is memory inefficient because:
+	 1. When -b with a big num is specified, it allocates a lot of
+	    memory for `printable_field'.
+	 2. When --output-delimiter is specified, it will allocate 31 buckets.
+	    Even if only a few ranges are specified.
+
+	Note CPU overhead is increased to determine if an item is to be printed,
+	as shown by:
+
+	$ yes abcdfeg | head -n1MB > big-file
+	$ for c in with-bitarray without-bitarray; do
+	    src/cut-$c 2>/dev/null
+	    echo -ne "\n== $c =="
+	    time src/cut-$c -b1,3 big-file > /dev/null
+	  done
+
+	== with-bitarray ==
+	real    0m0.084s
+	user    0m0.078s
+	sys     0m0.006s
+
+	== without-bitarray ==
+	real    0m0.111s
+	user    0m0.108s
+	sys     0m0.002s
+
+	Subsequent patches will reduce this overhead.
+
+	* src/cut.c (set_fields): Set and initialize RP
+	instead of printable_field.
+	* src/cut.c (is_range_start_index): Use CURRENT_RP rather than a hash.
+	* tests/misc/cut.pl: Check if `eol_range_start' is set correctly.
+	* tests/misc/cut-huge-range.sh: Rename from cut-huge-to-eol-range.sh,
+	and add a test to verify large amounts of mem aren't allocated.
+	Fixes http://bugs.gnu.org/13127
+
+2013-04-28  Pádraig Brady  <P@draigBrady.com>
+
+	stat,tail: improve support for snfs
+	The StorNext distributed file system was previously known as CVFS.
+
+	* src/stat.c (human_fstype): Add new file system ID definition.
+	* NEWS: Mention the improvement.
+	Fixes http://bugs.gnu.org/14251
+
+2013-04-25  Pádraig Brady  <P@draigBrady.com>
+
+	tests: fix usage of require_ulimit_
+	* init.cfg (require_ulimit_v_): Renamed from require_ulimit_
+	as this only checks for ulimit -v support.  Other uses of
+	ulimit -t and ulimit -n in tests shouldn't cause false failures
+	if not supported.
+	* cfg.mk (sc_prohibit_test_ulimit_without_require_): A new syntax check
+	to ensure that require_ulimit_v_() is used iff required.
+	* tests/misc/head-c.sh: Add missing call to require_ulimit_v_.
+	* tests/rm/many-dir-entries-vs-OOM.sh: Likewise.
+	* tests/split/r-chunk.sh: Remove non mandatory require_ulimit_ call.
+	* tests/misc/sort-merge-fdlimit.sh: Likewise.
+	* tests/cp/link-heap.sh: Adjust to renamed require_ulimit_v_.
+	* tests/dd/no-allocate.sh: Likewise.
+	* tests/misc/csplit-heap.sh: Likewise.
+	* tests/misc/cut-huge-to-eol-range.sh: Likewise.
+	* tests/misc/printf-surprise.sh: Likewise.
+
+2013-04-22  Jim Meyering  <meyering@fb.com>
+
+	scripts: tweak URLs in autotools-install
+	* scripts/autotools-install (tarballs): Use http:// URLs rather
+	than ftp:// ones.  The former are more likely to work, these days.
+	Update URLs to point to the latest versions.
+
+2013-04-20  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	tail: exit following by descriptor when no tailable file left
+	As a side effect of the previous commit which fixes 'tail -f --retry'
+	to wait for a file to appear, tail would not exit when the last file
+	appears untailable and gives up on this file.
+	This can happen, for example, when the argument file name appears
+	as directory.  Tail sets the 'ignore' flag of this file to true,
+	but instead of exiting the program, tail would continue the loop.
+
+	* src/tail.c (any_live_files): Change the function to return true
+	if any of the files is still tailable or if tail should continue to
+	try to check again.
+	(tail_forever): Change the condition to break the loop in the
+	"no files remaining" case, because now any_live_files() will care
+	about it, as mentioned above.
+	(parse_options): When --retry is used without any follow mode,
+	then reset reopen_inaccessible_files to false.
+	* tests/tail-2/retry.sh: Add test case.
+
+2013-04-20  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	tail: let -f --retry wait for inaccessible files
+	The --retry option is indeed useful for both following modes
+	by name and by file descriptor.  The difference is that in the
+	latter case, it is effective only during the initial open.
+
+	As a regression of the implementation of the inotify support,
+	tail -f --retry would immediately exit if the given file is
+	inaccessible.
+
+	* src/tail.c (usage): Change the description of the --retry option:
+	remove the note that this option would mainly be useful when
+	following by name.
+	(main): Change diagnosing dubios uses of --retry option:
+	when the --retry option is used without following, then issue
+	a warning that this option is ignored; when it is used together
+	with --follow=descriptor, then issue a warning that it is only
+	effective for the initial open.
+	Disable inotify also in the case when the initial open in tail_file()
+	failed (which is the actual bug fix).
+	* init.cfg (retry_delay_): Pass excess arguments to the test function.
+	* tests/tail-2/retry.sh: Add new tests.
+	* tests/local.mk (all_tests): Mention it.
+	* doc/coreutils.texi (tail invocation): Enhance the documentation
+	of the --retry option.  Clarify the difference in tail's behavior
+	regarding the --retry option when combined with the following modes
+	name versus descriptor.
+	* NEWS (Bug fixes): Mention the fix.
+
+	Reported by Noel Morrison in:
+	http://lists.gnu.org/archive/html/coreutils/2013-04/msg00003.html
+
+2013-04-14  Pádraig Brady  <P@draigBrady.com>
+
+	tests: avoid false failures with non default groups
+	On OS X it was seen that the group ID used for new files,
+	are set to a that of the directory rather than the current user.
+	It's not currently understood when this happens, but it was confirmed
+	that ACLs, extended attributes and setgid bits are _not_ involved.
+
+	* init.cfg (skip_if_nondefault_group_): A new function to detect
+	and avoid this situation.  Document with links to the discussions
+	for hopefully future clarification.
+	* tests/install/install-C-root.sh: Use the new function.
+	* tests/install/install-C-selinux.sh: Likewise.
+	* tests/install/install-C.sh: Likewise.
+
+2013-04-14  Pádraig Brady  <P@draigBrady.com>
+
+	doc: mention caveats with using install --compare
+	* doc/coreutils.texi (install invocation): Mention that install(1) may
+	not correctly determine the default user or permissions for installed
+	files, and so is best used with options specifying these attributes.
+
+	head: with --bytes=-N only allocate memory as needed
+	* src/head.c (elide_tail_bytes_pipe): Don't use calloc as that
+	bypasses memory overcommit due to the zeroing requirement.
+	Also realloc rather than malloc the pointer array to avoid
+	dependence on overcommit entirely.
+	* tests/misc/head-c.sh: Add a test case.
+	Fixes http://bugs.gnu.org/13530
+
+2013-04-14  Ondrej Oprala  <ooprala@redhat.com>
+
+	dd: avoid buffer allocations unless needed
+	* src/dd.c: Add new static global variable ibuf.
+	(alloc_ibuf, alloc_obuf): New functions factored from dd_copy().
+	(dd_copy): Call the new functions to allocate memory for
+	ibuf and obuf when necessary.
+	(skip): Likewise.
+	* tests/dd/no-allocate.sh: New test.
+	* tests/local.mk: Reference the test.
+
+2013-04-10  Assaf Gordon  <assafgordon@gmail.com>
+
+	csplit: add the --suppress-matched option
+	With --suppress-matched, the lines that match the pattern will not be
+	printed in the output files.  I.E. the first line from the second
+	and subsequent splits will be suppressed.
+
+	* src/csplit.c: process_regexp(),process_line_count(): Don't output the
+	matched lines.  Since csplit includes "up to but not including" matched
+	lines in each split, the first line (in the next group) is the matched
+	line - so just skip it.
+	main(): Handle new option.
+	usage(): Mention new option.
+	* doc/coreutils.texi (csplit invocation): Mention new option, examples.
+	* tests/misc/csplit-suppress-matched.pl: New test script.
+	* tests/local.mk: Reference the new test.
+	* NEWS: Mention new feature.
+
+2013-04-07  Enrico Scholz  <enrico.scholz@informatik.tu-chemnitz.de>
+
+	build: fix man page build failure with some permissions setups
+	Use the more portable 'chmod a-w', instead of the 'chmod -w' form.
+	The latter is not always supported.  Also its operation is
+	dependent on umask controlling the permissions bits for new files,
+	which is not the case in the presence of POSIX default ACLs for e.g.
+	In that case, chmod may print a warning like the following, and
+	exit with failure status:
+
+	chmod: man/hostid.1-t: new permissions are r--rw-r--, not r--r--r--
+
+	* man/local.mk: s/-w/a-w/
+
+2013-04-04  Pádraig Brady  <P@draigBrady.com>
+
+	tests: avoid shared lib tests on unsupported platforms
+	* init.cfg (require_gcc_shared_): A new function to check
+	that we can build shared libraries in the particular manner
+	we use in our tests.
+	* tests/cp/nfs-removal-race.sh: Use require_gcc_shared_.
+	Then fail rather than skip, if the actual shared lib build fails.
+	* tests/df/no-mtab-status.sh: Likewise.
+	* tests/df/skip-duplicates.sh: Likewise.
+	* tests/ls/getxattr-speedup.sh: Likewise.
+	Reported in http://bugs.gnu.org/14024
+
+	tail: exit without reading input if would never output
+	* src/tail.c (main): If -n0 or -c0 were specified without -f,
+	then no data would ever be output, so exit without reading input.
+	* tests/tail-2/tail-n0f.sh: Augment the related test with this case.
+
+	shuf: exit without reading if would never output
+	* src/shuf.c (main): If -n0 specified then no data would ever be output,
+	so exit without reading input.
+	* tests/misc/shuf.sh: Augment the related test with this case.
+
+	doc: add details on ln --relative symlink resolution
+	* doc/coreutils.texi (ln invocation): Describe how symlinks are
+	resolved with --relative, and give an example showing the greater
+	control available through realpath(1).
+	* tests/ln/relative.sh: Add a test to demonstrate full symlink
+	resolution, in a case where it might not be wanted.
+
+2013-04-04  Rémy Lefevre  <lefevreremy@gmail.com>
+
+	ln: --relative: fix updating of existing symlinks
+	Don't dereference an existing symlink being replaced.
+	I.E. generate the symlink relative to the symlink's containing dir,
+	rather than to some arbitrary place it points to.
+
+	* src/ln.c (convert_abs_rel): Don't consider the final component
+	of the symlink name when canonicalizing, as we want to avoid
+	dereferencing the final component.
+	* tests/ln/relative.sh: Add a test case.
+	* NEWS: Mention the fix.
+	Resolves http://bugs.gnu.org/14116
+
+2013-03-25  Assaf Gordon  <assafgordon@gmail.com>
+
+	shuf: use reservoir-sampling for large or unknown sized inputs
+	Reservoir sampling optimizes selecting K random lines from large or
+	unknown-sized input: http://en.wikipedia.org/wiki/Reservoir_sampling
+	Note this also avoids reading any input when -n0 is specified.
+
+	* src/shuf.c (main): Use reservoir-sampling when the number of output
+	lines is known, and the input size is large or unknown.
+	(input_size): A new function to get the input size for regular files.
+	(read_input_reservoir_sampling): New function to read lines from input,
+	keeping only K lines in memory, replacing lines with decreasing prob.
+	(write_permuted_output_reservoir): New function to output reservoir.
+	* tests/misc/shuf-reservoir.sh: An expensive_ test using valgrind to
+	exercise the reservoir-sampling code.
+	* tests/local.mk: Reference new test.
+	* NEWS: Mention the improvement.
+
+2013-03-24  Pádraig Brady  <P@draigBrady.com>
+
+	stat,tail: improve support for efivarfs, exofs, f2fs and ubifs
+	* src/stat.c (human_fstype): Add new file system ID definitions.
+	* NEWS: Mention the improvement.
+	Fixes http://bugs.gnu.org/14020
+
+	maint: improve make src/fs-magic-compare
+	* README-release: fix the `make` command, and mention how
+	to get the latest results without requring running a
+	system with the latest kernel.
+	* src/local.mk (src/fs-latest-magic.h): A new target to
+	document how/where to place the latest magic header.
+	(src/fs-kernel-magic): Adjust to include separately
+	downloaded header if available.
+	(src/fs-magic): Undefine MANPAGER as it may impact the
+	ability to pipe the output of man(1).
+	(fs-magic-compare): Don't echo the commands run as they're
+	distracting from the output which needs to be examined.
+
+	build: fix issues when building with GMP
+	* m4/gmp.m4 (cu_GMP): Add an extra check that gmp.h is available
+	which is required on one Mac OS X 10.5.8 system at least,
+	where the lib was available but the header wasn't.
+	Also enable our GMP code on systems where GMP is not in a separate lib.
+
+2013-03-22  Pádraig Brady  <P@draigBrady.com>
+
+	doc: clarify the printable characters output by od
+	* src/od.c (usage): Mention any printable character is output,
+	Not just ASCII.
+	* doc/coreutils.texi (od invocation): Further clarify that only
+	single byte characters are output (due to the alignment requirement).
+	Also mention the fact that 3 digit octal sequences are output
+	for non printable characters without a corresponding C escape.
+	Reported in http://bugs.gnu.org/13947
+
+	doc: clarify stat the meaning of --format="%t %T"
+	* src/stat.c (usage): Mention that the values are only
+	defined for character and block special files.
+	* doc/coreutils.texi (stat invocation): Likewise.
+	Also mention st_rdev.
+	Reported in http://bugs.gnu.org/13927
+
+2013-03-06  Pádraig Brady  <P@draigBrady.com>
+
+	doc: mention `numfmt` as an alternative to `sort -h`
+	* doc/coreutils.texi (sort invocation): Mention that numfmt
+	can achieve the same results with a possibly more accurate sort.
+
+	doc: remove a redundant numfmt heading from texinfo
+	* doc/coreutils.texi (detailmenu): Remove the redundant numfmt heading.
+
+	maint: ensure proper backslash quoting in texinfo macros
+	* doc/coreutils.texi (ambiguousGroupNote): Ensure '\' is escaped
+	appropriately within the macro.  This was verified to generate
+	a single '\' in both "info" and "pdf" outputs.
+
+2013-03-04  Torbjörn Granlund  <tg@gmplib.org>
+
+	build: fix factor build failure on aarch64
+	* src/longlong.h (__aarch64__): Make add_ssaaaa and sub_ddmmss work.
+	* NEWS: Mention the build fix.
+	Reported at https://bugzilla.redhat.com/917735
+
+2013-02-28  Assaf Gordon  <assafgordon@gmail.com>
+
+	tests: don't skip all uniq tests when locale is missing
+	* tests/misc/uniq.pl: Previously, if LOCALE_FR was not defined, all
+	tests would be skipped. Modified to skip only the relevant test.
+
+	uniq: add the --group option
+	* src/uniq.c (usage): Summarize the new option,
+	and adjust the --all-repeated option to be more consistent.
+	(check_file): Merge the --group functionality into
+	the core loop for the default uniq operation since
+	it's very similar and can output lines immediately upon reading.
+	(main): Handle the new --group option and make it
+	mutually exclusive with other selection options.
+	* tests/misc/uniq.pl: Add tests.
+	* NEWS: Mention the new feature.
+	* doc/coreutils.texi (uniq invocation): Describe --group.
+
+2013-02-28  Pádraig Brady  <P@draigBrady.com>
+
+	doc: move some info from all --help messages, online
+	* src/system.h (emit_ancillary_info): Link to the bug report email
+	addresses and general help URLs online rather than specifying directly.
+	This give us greater scope to present better info like describing
+	the difference between bug-coreutils@gnu.org and coreutils@gnu.org etc.
+	* tests/misc/help-version.sh: Remove the check for bug-coreutils@gnu.org
+	* tests/local.mk: Remove the no longer needed PACKAGE_BUGREPORT.
+
+2013-02-28  Assaf Gordon  <assafgordon@gmail.com>
+
+	tests: add '--ignore-case' tests for uniq
+	* tests/misc/uniq.pl: add tests for --ignore-case.
+
+2013-02-28  Javier López  <chilicuil@ubuntu.com>
+
+	dircolors: add a new entry to colorize 'arc' files
+	* src/dircolors.hin: Add an entry for arc.  Suggested in:
+	https://bugs.launchpad.net/ubuntu/+source/coreutils/+bug/1088131
+
+2013-02-28  Assaf Gordon  <assafgordon@gmail.com>
+
+	join: Add the -z, --zero-terminated option
+	* NEWS: Mention join's new option: --zero-terminated (-z).
+	* src/join.c: Add new option, --zero-terminated (-z), to make
+	join use the NUL byte as separator/delimiter rather than newline.
+	(get_line): Use readlinebuffer_delim in place of readlinebuffer.
+	(main): Handle the new option.
+	(usage): Describe new option the same way sort does.
+	* doc/coreutils.texi (join invocation): Describe the new option.
+	* tests/misc/join.pl: add tests for -z option.
+
+2013-02-28  Ondřej Vašík  <ovasik@redhat.com>
+
+	dircolors: add new entries to colorized archive formats
+	* src/dircolors.hin:  Add .cab, .alz, .lzo, .lrz, .t7z, .tzo, .lha
+	to colorized archives.
+	Suggested by Ville Skyttä in https://bugzilla.redhat.com/868510
+
+2013-02-22  Ondrej Oprala  <ooprala@redhat.com>
+
+	install: cleanup properly if the strip program failed for any reason
+	* src/install.c (strip): Indicate failure with a return code instead
+	of terminating the program.
+	(install_file_in_file): Handle strip's return code and unlink the
+	created file if necessary.
+	* tests/install/strip-program.sh: Add a test to cover the changes.
+	* NEWS (Bug fixes): Mention the fix.
+	Reported by John Reiser in http://bugzilla.redhat.com/632444.
+
+2013-02-20  Joachim Schmitz  <jojo@schmitz-digital.de>
+
+	copy: ensure the correct root ID is checked on all platforms
+	* src/copy.c (copy_reg): Check ROOT_UID rather than 0,
+	which is significant on HP-NonStop.
+
+2013-02-20  Pádraig Brady  <P@draigBrady.com>
+
+	maint: cleanup up various uses of __attribute__
+	* src/cfg.mk (sc_prohibit-gl-attributes): Disallow the __attribute()
+	form without trailing underscores as that is not elided where required.
+	Also ensure we use gnulib macros rather than defining our own.
+	* src/system.h: Remove gnulib provided macros.
+	* src/chown-core.c: Likewise.
+	* src/chroot.c: Likewise.
+	* src/copy.c: Likewise.
+	* src/csplit.c: Likewise.
+	* src/dd.c: Likewise.
+	* src/expr.c: Likewise.
+	* src/extent-scan.c: Likewise.
+	* src/factor.c: Likewise.
+	* src/ls.c: Likewise.
+	* src/od.c: Likewise.
+	* src/paste.c: Likewise.
+	* src/ptx.c: Likewise.
+	* src/sort.c: Likewise.
+	* src/stat.c: Likewise.
+	* src/stty.c: Likewise.
+	* src/system.h: Likewise.
+	* src/tac.c: Likewise.
+	* src/test.c: Likewise.
+	* src/tsort.c: Likewise.
+
+2013-02-20  Joachim Schmitz  <jojo@schmitz-digital.de>
+
+	build: fix numfmt build error on compilers without __attribute
+	* src/numfmt.c (): Use the more standard _GL_ATTRIBUTE_PURE
+	which is elided where required.
+	Reported in http://bugs.gnu.org/10305
+
+2013-02-20  Pádraig Brady  <P@draigBrady.com>
+
+	tests: avoid false failures on file systems with smaller NAME_MAX
+	* tests/du/long-from-unreadable.sh: This test requires a NAME_MAX
+	of at least 200, so skip the test otherwise.
+	* tests/rm/deep-2.sh: Likewise.
+	Reported by C de-Avillez with ecryptfs where NAME_MAX = 143.
+
+2013-02-18  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+	maint: choose editor in the commit-msg git hook the same way git does
+	Git honours the GIT_EDITOR environment variable, the "core.editor" Git
+	configuration variable, and the EDITOR environment variable (in that
+	order, and defaulting to "vi" if none of them is set) to decide which
+	editor should be invoked for the user when he has to or want to edit
+	his commit message.
+
+	However, our commit-msg hook, when invoking an editor on behalf of the
+	user to allow him to fix a non-policy-complaint commit message, only
+	honoured the EDITOR environment variable.  To avoid potential annoying
+	inconsistencies, we should really use the same logic used by Git in the
+	selection of the editor.  Luckily, we don't have to duplicate this
+	logic (that would be brittle in the long term), as we can rely on the
+	"git var" command, designed exactly to be used in situations like this.
+
+	* scripts/git-hooks ($editor): Adjust definition.
+
+2013-02-18  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+	maint: don't reset PATH in the commit-msg git hook
+	I have a custom 'editor' script in ~/bin, and a system-provided
+	'editor' program in /usr/bin (on Debian, this is a link set up the
+	"debian alternatives" subsystem).  My '$EDITOR' and '$GIT_EDITOR'
+	variables are set simply to 'editor' (no absolute path), which I
+	expect should point to my 'editor' script, since ~/bin precedes
+	/usr/bin in my PATH definition.  But the 'commit-msg' hook used in
+	coreutils unconditionally resets its PATH to '/bin:/usr/bin', which
+	causes it to call the "wrong" editor (the one in /usr/bin, not the
+	one in ~/bin) when it makes me update a botched commit message.
+
+	* scripts/git-hooks: Don't reset $ENV{PATH} to '/bin:/usr/bin',
+	which was only done to avoid failure when enabling Perl's taint
+	checking.
+
+2013-02-14  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	maint: prevent trailing period at first line of a commit message
+	* scripts/git-hooks/commit-msg (bad_first_line): Return an error
+	message if the first line of a commit message ends with a period.
+
 2013-02-14  Pádraig Brady  <P@draigBrady.com>
 
+	maint: post-release administrivia
+	* NEWS: Add header line for next release.
+	* .prev-version: Record previous version.
+	* cfg.mk (old_NEWS_hash): Auto-update.
+
 	version 8.21
 	* NEWS: Record release date.
 
diff --git a/ChangeLog-2005 b/ChangeLog-2005
index 1ab59fae..5aafb1c8 100644
--- a/ChangeLog-2005
+++ b/ChangeLog-2005
@@ -11609,7 +11609,7 @@
 
 	-----
 
-	Copyright (C) 2002-2013 Free Software Foundation, Inc.
+	Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
diff --git a/ChangeLog-2006 b/ChangeLog-2006
index 5ea1c200..d173c814 100644
--- a/ChangeLog-2006
+++ b/ChangeLog-2006
@@ -4033,7 +4033,7 @@
 
 	-----
 
-	Copyright (C) 2006-2013 Free Software Foundation, Inc.
+	Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
diff --git a/ChangeLog-2007 b/ChangeLog-2007
index 33a75665..f4b34a1c 100644
--- a/ChangeLog-2007
+++ b/ChangeLog-2007
@@ -4015,7 +4015,7 @@
 
 	-----
 
-	Copyright (C) 2007-2013 Free Software Foundation, Inc.
+	Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
diff --git a/ChangeLog-2008 b/ChangeLog-2008
index 233e9fb3..c04457ab 100644
--- a/ChangeLog-2008
+++ b/ChangeLog-2008
@@ -372,7 +372,7 @@
 
 	-----
 
-	Copyright (C) 2008-2013 Free Software Foundation, Inc.
+	Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
diff --git a/GNUmakefile b/GNUmakefile
index 8759034e..4ab64294 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -5,7 +5,7 @@
 # It is necessary if you want to build targets usually of interest
 # only to the maintainer.
 
-# Copyright (C) 2001, 2003, 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/INSTALL b/INSTALL
index 007e9396..20998407 100644
--- a/INSTALL
+++ b/INSTALL
@@ -12,8 +12,8 @@ without warranty of any kind.
 Basic Installation
 ==================
 
-   Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
+   Briefly, the shell command `./configure && make && make install'
+should configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
 instructions specific to this package.  Some packages provide this
 `INSTALL' file but do not implement all of the features documented
diff --git a/Makefile.am b/Makefile.am
index 36e715d5..fb4af272 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 # Make coreutils.					-*-Makefile-*-
 
-# Copyright (C) 1990-2013 Free Software Foundation, Inc.
+# Copyright (C) 1990-2014 Free Software Foundation, Inc.
 
 # 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
@@ -50,6 +50,7 @@ EXTRA_DIST =				\
   bootstrap				\
   bootstrap.conf			\
   build-aux/gen-lists-of-programs.sh	\
+  build-aux/gen-single-binary.sh	\
   cfg.mk				\
   dist-check.mk				\
   maint.mk				\
@@ -57,6 +58,7 @@ EXTRA_DIST =				\
   thanks-gen
 
 gen_progs_lists = $(top_srcdir)/build-aux/gen-lists-of-programs.sh
+gen_single_binary = $(top_srcdir)/build-aux/gen-single-binary.sh
 
 # Keep these in sync with bootstrap.conf:bootstrap_post_import_hook().
 # Use '$(top_srcdir)/m4' and '$(srcdir)/src' for the benefit of non-GNU
@@ -70,6 +72,10 @@ $(srcdir)/src/cu-progs.mk: $(gen_progs_lists)
 	$(AM_V_GEN)rm -f $@ $@-t \
 	  && $(SHELL) $(gen_progs_lists) --automake >$@-t \
 	  && chmod a-w $@-t && mv -f $@-t $@
+$(srcdir)/src/single-binary.mk: $(gen_single_binary) $(srcdir)/src/local.mk
+	$(AM_V_GEN)rm -f $@ $@-t \
+	  && $(SHELL) $(gen_single_binary) $(srcdir)/src/local.mk >$@-t \
+	  && chmod a-w $@-t && mv -f $@-t $@
 
 ACLOCAL_AMFLAGS = -I m4
 
@@ -105,11 +111,14 @@ gen_start_date = 2008-02-08
 .PHONY: gen-ChangeLog
 gen-ChangeLog:
 	$(AM_V_GEN)if test -d .git; then				\
+	  log_fix="$(srcdir)/build-aux/git-log-fix";			\
+	  test -e "$$log_fix"						\
+	    && amend_git_log="--amend=$$log_fix"			\
+	    || amend_git_log=;						\
 	  $(top_srcdir)/build-aux/gitlog-to-changelog			\
-	    --amend=$(srcdir)/build-aux/git-log-fix			\
-	    --since=$(gen_start_date) > $(distdir)/cl-t;		\
-	  rm -f $(distdir)/ChangeLog;					\
-	  mv $(distdir)/cl-t $(distdir)/ChangeLog;			\
+	    $$amend_git_log --since=$(gen_start_date) > $(distdir)/cl-t && \
+	    { rm -f $(distdir)/ChangeLog &&				\
+	      mv $(distdir)/cl-t $(distdir)/ChangeLog; }		\
 	fi
 
 ALL_RECURSIVE_TARGETS += distcheck-hook
@@ -177,6 +186,24 @@ check-git-hook-script-sync:
 	rm -rf $$t;							\
 	test $$fail = 0
 
+# If we are building a single-binary, create symlinks or shebangs for
+# the selected tools when installing.
+install-exec-hook:
+	$(AM_V_at)ctrans=$$(printf coreutils | sed -e "$(transform)");	\
+	for p in $(single_binary_progs); do				\
+	  ptrans=$$(printf '%s' "$$p" | sed -e "$(transform)");		\
+	  rm -f $(DESTDIR)$(bindir)/$$ptrans$(EXEEXT) || exit $$?;	\
+	  if test "x$(single_binary_install_type)" = xshebangs; then	\
+	    printf '#!%s --coreutils-prog-shebang=%s\n'			\
+	      $(bindir)/$$ctrans$(EXEEXT) $$p				\
+	      >$(DESTDIR)$(bindir)/$$ptrans$(EXEEXT) || exit $$?;	\
+	    chmod a+x,a-w $(DESTDIR)$(bindir)/$$ptrans$(EXEEXT) || exit $$?;\
+	  else								\
+	    $(LN_S) -s $$ctrans$(EXEEXT)				\
+	      $(DESTDIR)$(bindir)/$$ptrans$(EXEEXT) || exit $$?;	\
+	  fi								\
+	done
+
 noinst_LIBRARIES =
 MOSTLYCLEANFILES =
 CLEANFILES =
diff --git a/Makefile.in b/Makefile.in
index d0caccc3..140a4286 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,7 +16,7 @@
 
 # Make coreutils.					-*-Makefile-*-
 
-# Copyright (C) 1990-2013 Free Software Foundation, Inc.
+# Copyright (C) 1990-2014 Free Software Foundation, Inc.
 
 # 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
@@ -32,7 +31,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 #
 # 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
@@ -53,7 +52,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl --lib=libcoreutils --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=gnulib-tests --aux-dir=build-aux --with-tests --avoid=canonicalize-lgpl --avoid=dummy --makefile-name=gnulib.mk --no-conditional-dependencies --no-libtool --macro-prefix=gl acl alignof alloca announce-gen areadlink-with-size argmatch argv-iter assert autobuild backupfile base64 buffer-lcm c-strcase c-strtod c-strtold calloc-gnu canon-host canonicalize chown cloexec closein closeout config-h configmake crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 cycle-check d-ino d-type di-set diacrit dirfd dirname do-release-commit-and-tag dtoastr dup2 environ error euidaccess exclude exitfail faccessat fadvise fchdir fchmodat fchownat fclose fcntl fcntl-safer fd-reopen fdatasync fdl fdopen fdutimensat file-type fileblocks filemode filenamecat filevercmp fnmatch-gnu fopen-safer fprintftime freopen freopen-safer fseeko fstatat fsusage fsync ftello ftoastr ftruncate fts full-read full-write getgroups gethrxtime getline getloadavg getlogin getndelim2 getopt-gnu getpagesize getpass-gnu gettext-h gettime gettimeofday getugroups getusershell git-version-gen gitlog-to-changelog gnu-make gnu-web-doc-update gnumakefile gnupload group-member hard-locale hash hash-pjw heap host-os human idcache ignore-value inttostr inttypes isapipe isatty isblank largefile lchmod lchown ldtoastr lib-ignore linebuffer link link-follow linkat long-options lstat maintainer-makefile malloc-gnu manywarnings mbrlen mbrtowc mbsalign mbswidth memcasecmp memchr memcmp2 mempcpy memrchr mgetgroups mkancesdirs mkdir mkdir-p mkfifo mknod mkstemp mktime modechange mountlist mpsort netinet_in non-recursive-gnulib-prefix-hack nproc obstack parse-datetime pathmax perl physmem pipe posix-shell posixtm posixver priv-set progname propername pthread putenv quote quotearg randint randperm read-file readlink readtokens readtokens0 readutmp realloc-gnu regex remove rename rmdir root-dev-ino rpmatch safe-read same save-cwd savedir savewd selinux-at settime sig2str sigaction ssize_t stat-macros stat-size stat-time statat stdbool stdlib-safer stpcpy stpncpy strdup-posix strftime strncat strnumcmp strpbrk strsignal strtod strtoimax strtoumax symlink sys_ioctl sys_resource sys_stat sys_wait termios timer-time timespec tzset uname unicodeio unistd-safer unlink-busy unlinkat unlocked-io unsetenv update-copyright uptime useless-if-before-free userspec utimecmp utimens vasprintf-posix vc-list-files verify verror version-etc-fsf wcswidth wcwidth winsz-ioctl winsz-termios write-any-file xalloc xfreopen xfts xgetcwd xgetgroups xgethostname xmemcoll xnanosleep xprintf xprintf-posix xreadlink xstrtod xstrtoimax xstrtol xstrtold xstrtoumax yesno
+# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl --lib=libcoreutils --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=gnulib-tests --aux-dir=build-aux --with-tests --avoid=canonicalize-lgpl --avoid=dummy --makefile-name=gnulib.mk --no-conditional-dependencies --no-libtool --macro-prefix=gl acl alignof alloca announce-gen areadlink-with-size argmatch argv-iter assert autobuild backupfile base64 buffer-lcm c-strcase c-strtod c-strtold calloc-gnu canon-host canonicalize chown cloexec closein closeout config-h configmake crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 cycle-check d-ino d-type di-set diacrit dirfd dirname do-release-commit-and-tag dtoastr dup2 environ error euidaccess exclude exitfail faccessat fadvise fchdir fchmodat fchownat fclose fcntl fcntl-safer fd-reopen fdatasync fdl fdopen fdutimensat file-type fileblocks filemode filenamecat filevercmp fnmatch-gnu fopen-safer fprintftime freopen freopen-safer fseeko fstatat fsusage fsync ftello ftoastr ftruncate fts full-read full-write getgroups gethrxtime getline getloadavg getlogin getndelim2 getopt-gnu getpagesize getpass-gnu gettext-h gettime gettimeofday getugroups getusershell git-version-gen gitlog-to-changelog gnu-make gnu-web-doc-update gnumakefile gnupload group-member hard-locale hash hash-pjw heap host-os human idcache ignore-value inttostr inttypes isapipe isatty isblank largefile lchmod lchown ldtoastr lib-ignore linebuffer link link-follow linkat long-options lstat maintainer-makefile malloc-gnu manywarnings mbrlen mbrtowc mbsalign mbswidth memcasecmp memchr memcmp2 mempcpy memrchr mgetgroups mkancesdirs mkdir mkdir-p mkfifo mknod mkstemp mktime modechange mountlist mpsort netinet_in non-recursive-gnulib-prefix-hack nproc obstack parse-datetime pathmax perl physmem pipe-posix posix-shell posixtm posixver priv-set progname propername pthread putenv quote quotearg randint randperm read-file readlink readtokens readtokens0 readutmp realloc-gnu regex remove rename rmdir root-dev-ino rpmatch safe-read same save-cwd savedir savewd selinux-at settime sig2str sigaction smack ssize_t stat-macros stat-size stat-time statat stdbool stdlib-safer stpcpy stpncpy strdup-posix strftime strncat strnumcmp strpbrk strsignal strtod strtoimax strtoumax symlink sys_ioctl sys_resource sys_stat sys_wait termios timer-time timespec tzset uname unicodeio unistd-safer unlink-busy unlinkat unlocked-io unsetenv update-copyright uptime useless-if-before-free userspec utimecmp utimens vasprintf-posix vc-list-files verify verror version-etc-fsf wcswidth wcwidth winsz-ioctl winsz-termios write-any-file xalloc xfreopen xfts xgetcwd xgetgroups xgethostname xmemcoll xnanosleep xprintf xprintf-posix xreadlink xstrtod xstrtoimax xstrtol xstrtold xstrtoumax yesno
 
 # Make coreutils programs.                             -*-Makefile-*-
 # This is included by the top-level Makefile.am.
@@ -61,7 +60,7 @@
 # Make coreutils documentation.				-*-Makefile-*-
 # This is included by the top-level Makefile.am.
 
-# Copyright (C) 1995-2013 Free Software Foundation, Inc.
+# Copyright (C) 1995-2014 Free Software Foundation, Inc.
 
 # 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
@@ -79,7 +78,7 @@
 # Make coreutils man pages.				-*-Makefile-*-
 # This is included by the top-level Makefile.am.
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 # 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
@@ -97,23 +96,51 @@
 
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -130,35 +157,256 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = README $(am__configure_deps) $(doc_coreutils_TEXINFOS) \
-	$(noinst_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/doc/stamp-vti $(srcdir)/doc/version.texi \
-	$(srcdir)/lib/gnulib.mk $(srcdir)/src/cu-progs.mk \
-	$(top_srcdir)/configure $(top_srcdir)/doc/local.mk \
-	$(top_srcdir)/lib/config.hin $(top_srcdir)/lib/local.mk \
-	$(top_srcdir)/man/local.mk $(top_srcdir)/src/local.mk \
-	$(top_srcdir)/tests/local.mk ABOUT-NLS AUTHORS COPYING \
-	ChangeLog INSTALL NEWS THANKS TODO build-aux/compile \
-	build-aux/config.guess build-aux/config.rpath \
-	build-aux/config.sub build-aux/depcomp build-aux/install-sh \
-	build-aux/mdate-sh build-aux/missing build-aux/texinfo.tex \
-	build-aux/ylwrap lib/alloca.c lib/parse-datetime.c
+DIST_COMMON = $(top_srcdir)/lib/local.mk $(srcdir)/lib/gnulib.mk \
+	$(top_srcdir)/src/local.mk $(srcdir)/src/cu-progs.mk \
+	$(top_srcdir)/src/single-binary.mk $(top_srcdir)/doc/local.mk \
+	$(top_srcdir)/man/local.mk $(top_srcdir)/tests/local.mk \
+	INSTALL NEWS README AUTHORS ChangeLog $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(top_srcdir)/lib/config.hin ABOUT-NLS \
+	$(top_srcdir)/lib/alloca.c lib/parse-datetime.c \
+	$(top_srcdir)/build-aux/depcomp $(top_srcdir)/build-aux/ylwrap \
+	$(doc_coreutils_TEXINFOS) $(top_srcdir)/build-aux/mdate-sh \
+	$(srcdir)/doc/version.texi $(srcdir)/doc/stamp-vti \
+	$(top_srcdir)/build-aux/texinfo.tex $(noinst_HEADERS) \
+	$(top_srcdir)/build-aux/test-driver COPYING THANKS TODO \
+	build-aux/compile build-aux/config.guess \
+	build-aux/config.rpath build-aux/config.sub build-aux/depcomp \
+	build-aux/install-sh build-aux/mdate-sh build-aux/missing \
+	build-aux/texinfo.tex build-aux/ylwrap \
+	$(top_srcdir)/build-aux/compile \
+	$(top_srcdir)/build-aux/config.guess \
+	$(top_srcdir)/build-aux/config.rpath \
+	$(top_srcdir)/build-aux/config.sub \
+	$(top_srcdir)/build-aux/install-sh \
+	$(top_srcdir)/build-aux/missing
 @LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_TRUE@am__append_1 = lib/unistr/u8-mbtoucr.c
 @LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@am__append_2 = lib/unistr/u8-uctomb.c lib/unistr/u8-uctomb-aux.c
 @LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@am__append_3 = lib/uniwidth/width.c
 EXTRA_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3)
-noinst_PROGRAMS = src/getlimits$(EXEEXT) src/make-prime-list$(EXEEXT) \
-	src/setuidgid$(EXEEXT)
+noinst_PROGRAMS = src/getlimits$(EXEEXT) src/make-prime-list$(EXEEXT)
+@SINGLE_BINARY_FALSE@src_coreutils_DEPENDENCIES =  \
+@SINGLE_BINARY_FALSE@	$(am__DEPENDENCIES_2)
+# Command arch
+# Command hostname
+# Command chroot
+# Command df
+# Command hostid
+# Command nice
+# Command pinky
+# Command stdbuf
+# Command stty
+# Command uptime
+# Command users
+# Command who
+# Command _
+# Command base64
+# Command basename
+# Command cat
+# Command chcon
+# Command chgrp
+# Command chmod
+# Command chown
+# Command cksum
+# Command comm
+# Command cp
+# Command csplit
+# Command cut
+# Command date
+# Command dd
+# Command dir
+# Command dircolors
+# Command dirname
+# Command du
+# Command echo
+# Command env
+# Command expand
+# Command expr
+# Command factor
+# Command false
+# Command fmt
+# Command fold
+# Command ginstall
+# Command groups
+# Command head
+# Command id
+# Command join
+# Command kill
+# Command link
+# Command ln
+# Command logname
+# Command ls
+# Command md5sum
+# Command mkdir
+# Command mkfifo
+# Command mknod
+# Command mktemp
+# Command mv
+# Command nl
+# Command nproc
+# Command nohup
+# Command numfmt
+# Command od
+# Command paste
+# Command pathchk
+# Command pr
+# Command printenv
+# Command printf
+# Command ptx
+# Command pwd
+# Command readlink
+# Command realpath
+# Command rm
+# Command rmdir
+# Command runcon
+# Command seq
+# Command sha1sum
+# Command sha224sum
+# Command sha256sum
+# Command sha384sum
+# Command sha512sum
+# Command shred
+# Command shuf
+# Command sleep
+# Command sort
+# Command split
+# Command stat
+# Command sum
+# Command sync
+# Command tac
+# Command tail
+# Command tee
+# Command test
+# Command timeout
+# Command touch
+# Command tr
+# Command true
+# Command truncate
+# Command tsort
+# Command tty
+# Command uname
+# Command unexpand
+# Command uniq
+# Command unlink
+# Command vdir
+# Command wc
+# Command whoami
+# Command yes
+@SINGLE_BINARY_TRUE@am__append_4 = src/libsinglebin_arch.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_hostname.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_chroot.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_df.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_hostid.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_nice.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_pinky.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_stdbuf.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_stty.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_uptime.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_users.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_who.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin__.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_base64.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_basename.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_cat.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_chcon.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_chgrp.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_chmod.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_chown.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_cksum.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_comm.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_cp.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_csplit.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_cut.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_date.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_dd.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_dir.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_dircolors.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_dirname.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_du.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_echo.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_env.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_expand.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_expr.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_factor.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_false.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_fmt.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_fold.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_ginstall.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_groups.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_head.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_id.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_join.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_kill.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_link.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_ln.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_logname.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_ls.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_md5sum.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_mkdir.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_mkfifo.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_mknod.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_mktemp.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_mv.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_nl.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_nproc.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_nohup.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_numfmt.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_od.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_paste.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_pathchk.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_pr.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_printenv.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_printf.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_ptx.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_pwd.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_readlink.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_realpath.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_rm.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_rmdir.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_runcon.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_seq.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_sha1sum.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_sha224sum.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_sha256sum.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_sha384sum.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_sha512sum.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_shred.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_shuf.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_sleep.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_sort.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_split.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_stat.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_sum.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_sync.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_tac.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_tail.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_tee.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_test.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_timeout.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_touch.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_tr.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_true.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_truncate.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_tsort.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_tty.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_uname.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_unexpand.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_uniq.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_unlink.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_vdir.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_wc.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_whoami.a \
+@SINGLE_BINARY_TRUE@	src/libsinglebin_yes.a
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
-	$(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/alloca.m4 \
-	$(top_srcdir)/m4/arpa_inet_h.m4 $(top_srcdir)/m4/assert.m4 \
-	$(top_srcdir)/m4/autobuild.m4 $(top_srcdir)/m4/backupfile.m4 \
-	$(top_srcdir)/m4/base64.m4 $(top_srcdir)/m4/bison.m4 \
-	$(top_srcdir)/m4/boottime.m4 $(top_srcdir)/m4/btowc.m4 \
-	$(top_srcdir)/m4/c-strtod.m4 $(top_srcdir)/m4/calloc.m4 \
-	$(top_srcdir)/m4/canon-host.m4 \
+	$(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/acl.m4 \
+	$(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/arpa_inet_h.m4 \
+	$(top_srcdir)/m4/assert.m4 $(top_srcdir)/m4/autobuild.m4 \
+	$(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/base64.m4 \
+	$(top_srcdir)/m4/bison.m4 $(top_srcdir)/m4/boottime.m4 \
+	$(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/c-strtod.m4 \
+	$(top_srcdir)/m4/calloc.m4 $(top_srcdir)/m4/canon-host.m4 \
 	$(top_srcdir)/m4/canonicalize.m4 \
 	$(top_srcdir)/m4/chdir-long.m4 $(top_srcdir)/m4/check-decl.m4 \
 	$(top_srcdir)/m4/chown.m4 $(top_srcdir)/m4/clock_time.m4 \
@@ -177,29 +425,28 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
 	$(top_srcdir)/m4/exponentd.m4 $(top_srcdir)/m4/exponentf.m4 \
 	$(top_srcdir)/m4/exponentl.m4 $(top_srcdir)/m4/extensions.m4 \
 	$(top_srcdir)/m4/extern-inline.m4 \
-	$(top_srcdir)/m4/faccessat.m4 $(top_srcdir)/m4/fatal-signal.m4 \
-	$(top_srcdir)/m4/fchdir.m4 $(top_srcdir)/m4/fchmodat.m4 \
-	$(top_srcdir)/m4/fchownat.m4 $(top_srcdir)/m4/fclose.m4 \
-	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/fcntl-safer.m4 \
-	$(top_srcdir)/m4/fcntl.m4 $(top_srcdir)/m4/fcntl_h.m4 \
-	$(top_srcdir)/m4/fdatasync.m4 $(top_srcdir)/m4/fdopen.m4 \
-	$(top_srcdir)/m4/fdopendir.m4 $(top_srcdir)/m4/fflush.m4 \
-	$(top_srcdir)/m4/fileblocks.m4 $(top_srcdir)/m4/filemode.m4 \
-	$(top_srcdir)/m4/filenamecat.m4 $(top_srcdir)/m4/flexmember.m4 \
-	$(top_srcdir)/m4/float_h.m4 $(top_srcdir)/m4/fnmatch.m4 \
-	$(top_srcdir)/m4/fopen.m4 $(top_srcdir)/m4/fpending.m4 \
-	$(top_srcdir)/m4/fpieee.m4 $(top_srcdir)/m4/fpurge.m4 \
-	$(top_srcdir)/m4/freadahead.m4 $(top_srcdir)/m4/freading.m4 \
-	$(top_srcdir)/m4/freadptr.m4 $(top_srcdir)/m4/freadseek.m4 \
-	$(top_srcdir)/m4/freopen.m4 $(top_srcdir)/m4/frexp.m4 \
-	$(top_srcdir)/m4/frexpl.m4 $(top_srcdir)/m4/fseek.m4 \
-	$(top_srcdir)/m4/fseeko.m4 $(top_srcdir)/m4/fseterr.m4 \
-	$(top_srcdir)/m4/fstat.m4 $(top_srcdir)/m4/fstatat.m4 \
-	$(top_srcdir)/m4/fstypename.m4 $(top_srcdir)/m4/fsusage.m4 \
-	$(top_srcdir)/m4/fsync.m4 $(top_srcdir)/m4/ftell.m4 \
-	$(top_srcdir)/m4/ftello.m4 $(top_srcdir)/m4/ftruncate.m4 \
-	$(top_srcdir)/m4/fts.m4 $(top_srcdir)/m4/futimens.m4 \
-	$(top_srcdir)/m4/getaddrinfo.m4 \
+	$(top_srcdir)/m4/faccessat.m4 $(top_srcdir)/m4/fchdir.m4 \
+	$(top_srcdir)/m4/fchmodat.m4 $(top_srcdir)/m4/fchownat.m4 \
+	$(top_srcdir)/m4/fclose.m4 $(top_srcdir)/m4/fcntl-o.m4 \
+	$(top_srcdir)/m4/fcntl-safer.m4 $(top_srcdir)/m4/fcntl.m4 \
+	$(top_srcdir)/m4/fcntl_h.m4 $(top_srcdir)/m4/fdatasync.m4 \
+	$(top_srcdir)/m4/fdopen.m4 $(top_srcdir)/m4/fdopendir.m4 \
+	$(top_srcdir)/m4/fflush.m4 $(top_srcdir)/m4/fileblocks.m4 \
+	$(top_srcdir)/m4/filemode.m4 $(top_srcdir)/m4/filenamecat.m4 \
+	$(top_srcdir)/m4/flexmember.m4 $(top_srcdir)/m4/float_h.m4 \
+	$(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/fopen.m4 \
+	$(top_srcdir)/m4/fpending.m4 $(top_srcdir)/m4/fpieee.m4 \
+	$(top_srcdir)/m4/fpurge.m4 $(top_srcdir)/m4/freadahead.m4 \
+	$(top_srcdir)/m4/freading.m4 $(top_srcdir)/m4/freadptr.m4 \
+	$(top_srcdir)/m4/freadseek.m4 $(top_srcdir)/m4/freopen.m4 \
+	$(top_srcdir)/m4/frexp.m4 $(top_srcdir)/m4/frexpl.m4 \
+	$(top_srcdir)/m4/fseek.m4 $(top_srcdir)/m4/fseeko.m4 \
+	$(top_srcdir)/m4/fseterr.m4 $(top_srcdir)/m4/fstat.m4 \
+	$(top_srcdir)/m4/fstatat.m4 $(top_srcdir)/m4/fstypename.m4 \
+	$(top_srcdir)/m4/fsusage.m4 $(top_srcdir)/m4/fsync.m4 \
+	$(top_srcdir)/m4/ftell.m4 $(top_srcdir)/m4/ftello.m4 \
+	$(top_srcdir)/m4/ftruncate.m4 $(top_srcdir)/m4/fts.m4 \
+	$(top_srcdir)/m4/futimens.m4 $(top_srcdir)/m4/getaddrinfo.m4 \
 	$(top_srcdir)/m4/getcwd-abort-bug.m4 \
 	$(top_srcdir)/m4/getcwd-path-max.m4 $(top_srcdir)/m4/getcwd.m4 \
 	$(top_srcdir)/m4/getdelim.m4 $(top_srcdir)/m4/getdtablesize.m4 \
@@ -211,7 +458,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
 	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettime.m4 \
 	$(top_srcdir)/m4/gettimeofday.m4 \
 	$(top_srcdir)/m4/getugroups.m4 \
-	$(top_srcdir)/m4/getusershell.m4 $(top_srcdir)/m4/glibc21.m4 \
+	$(top_srcdir)/m4/getusershell.m4 \
+	$(top_srcdir)/m4/gl-openssl.m4 $(top_srcdir)/m4/glibc21.m4 \
 	$(top_srcdir)/m4/gmp.m4 $(top_srcdir)/m4/gnu-make.m4 \
 	$(top_srcdir)/m4/gnulib-common.m4 \
 	$(top_srcdir)/m4/gnulib-comp.m4 \
@@ -275,41 +523,38 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
 	$(top_srcdir)/m4/opendir.m4 $(top_srcdir)/m4/parse-datetime.m4 \
 	$(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/perl.m4 \
 	$(top_srcdir)/m4/perror.m4 $(top_srcdir)/m4/physmem.m4 \
-	$(top_srcdir)/m4/pipe.m4 $(top_srcdir)/m4/pipe2.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/posix-shell.m4 \
-	$(top_srcdir)/m4/posix_spawn.m4 $(top_srcdir)/m4/posixtm.m4 \
+	$(top_srcdir)/m4/pipe.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/posix-shell.m4 $(top_srcdir)/m4/posixtm.m4 \
 	$(top_srcdir)/m4/posixver.m4 $(top_srcdir)/m4/prereq.m4 \
 	$(top_srcdir)/m4/printf-frexp.m4 \
 	$(top_srcdir)/m4/printf-frexpl.m4 $(top_srcdir)/m4/printf.m4 \
 	$(top_srcdir)/m4/priv-set.m4 $(top_srcdir)/m4/progtest.m4 \
 	$(top_srcdir)/m4/pthread.m4 $(top_srcdir)/m4/putenv.m4 \
 	$(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \
-	$(top_srcdir)/m4/raise.m4 $(top_srcdir)/m4/rawmemchr.m4 \
-	$(top_srcdir)/m4/read-file.m4 $(top_srcdir)/m4/read.m4 \
-	$(top_srcdir)/m4/readdir.m4 $(top_srcdir)/m4/readlink.m4 \
-	$(top_srcdir)/m4/readlinkat.m4 $(top_srcdir)/m4/readtokens.m4 \
-	$(top_srcdir)/m4/readutmp.m4 $(top_srcdir)/m4/realloc.m4 \
-	$(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/remove.m4 \
-	$(top_srcdir)/m4/rename.m4 $(top_srcdir)/m4/rewinddir.m4 \
-	$(top_srcdir)/m4/rmdir.m4 $(top_srcdir)/m4/rpmatch.m4 \
-	$(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/safe-write.m4 \
-	$(top_srcdir)/m4/same.m4 $(top_srcdir)/m4/save-cwd.m4 \
-	$(top_srcdir)/m4/savedir.m4 $(top_srcdir)/m4/savewd.m4 \
-	$(top_srcdir)/m4/sched_h.m4 $(top_srcdir)/m4/select.m4 \
+	$(top_srcdir)/m4/raise.m4 $(top_srcdir)/m4/read-file.m4 \
+	$(top_srcdir)/m4/read.m4 $(top_srcdir)/m4/readdir.m4 \
+	$(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/readlinkat.m4 \
+	$(top_srcdir)/m4/readtokens.m4 $(top_srcdir)/m4/readutmp.m4 \
+	$(top_srcdir)/m4/realloc.m4 $(top_srcdir)/m4/regex.m4 \
+	$(top_srcdir)/m4/remove.m4 $(top_srcdir)/m4/rename.m4 \
+	$(top_srcdir)/m4/rewinddir.m4 $(top_srcdir)/m4/rmdir.m4 \
+	$(top_srcdir)/m4/rpmatch.m4 $(top_srcdir)/m4/safe-read.m4 \
+	$(top_srcdir)/m4/safe-write.m4 $(top_srcdir)/m4/same.m4 \
+	$(top_srcdir)/m4/save-cwd.m4 $(top_srcdir)/m4/savedir.m4 \
+	$(top_srcdir)/m4/savewd.m4 $(top_srcdir)/m4/sched_h.m4 \
+	$(top_srcdir)/m4/secure_getenv.m4 $(top_srcdir)/m4/select.m4 \
 	$(top_srcdir)/m4/selinux-context-h.m4 \
 	$(top_srcdir)/m4/selinux-selinux-h.m4 \
 	$(top_srcdir)/m4/servent.m4 $(top_srcdir)/m4/setenv.m4 \
 	$(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/settime.m4 \
 	$(top_srcdir)/m4/sha1.m4 $(top_srcdir)/m4/sha256.m4 \
 	$(top_srcdir)/m4/sha512.m4 $(top_srcdir)/m4/sig2str.m4 \
-	$(top_srcdir)/m4/sig_atomic_t.m4 $(top_srcdir)/m4/sigaction.m4 \
-	$(top_srcdir)/m4/signal_h.m4 \
+	$(top_srcdir)/m4/sigaction.m4 $(top_srcdir)/m4/signal_h.m4 \
 	$(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/signbit.m4 \
 	$(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/sleep.m4 \
 	$(top_srcdir)/m4/snprintf.m4 $(top_srcdir)/m4/socketlib.m4 \
 	$(top_srcdir)/m4/sockets.m4 $(top_srcdir)/m4/socklen.m4 \
-	$(top_srcdir)/m4/sockpfaf.m4 $(top_srcdir)/m4/spawn-pipe.m4 \
-	$(top_srcdir)/m4/spawn_h.m4 $(top_srcdir)/m4/ssize_t.m4 \
+	$(top_srcdir)/m4/sockpfaf.m4 $(top_srcdir)/m4/ssize_t.m4 \
 	$(top_srcdir)/m4/st_dm_mode.m4 $(top_srcdir)/m4/stat-prog.m4 \
 	$(top_srcdir)/m4/stat-size.m4 $(top_srcdir)/m4/stat-time.m4 \
 	$(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdalign.m4 \
@@ -317,17 +562,16 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
 	$(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \
 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio_h.m4 \
 	$(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/stpcpy.m4 \
-	$(top_srcdir)/m4/stpncpy.m4 $(top_srcdir)/m4/strchrnul.m4 \
-	$(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \
-	$(top_srcdir)/m4/strerror_r.m4 $(top_srcdir)/m4/strftime.m4 \
-	$(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strncat.m4 \
-	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strsignal.m4 \
-	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
-	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
-	$(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/symlinkat.m4 \
-	$(top_srcdir)/m4/sys_ioctl_h.m4 \
+	$(top_srcdir)/m4/stpncpy.m4 $(top_srcdir)/m4/strdup.m4 \
+	$(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/strerror_r.m4 \
+	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/string_h.m4 \
+	$(top_srcdir)/m4/strncat.m4 $(top_srcdir)/m4/strndup.m4 \
+	$(top_srcdir)/m4/strnlen.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strsignal.m4 $(top_srcdir)/m4/strstr.m4 \
+	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoull.m4 \
+	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/symlink.m4 \
+	$(top_srcdir)/m4/symlinkat.m4 $(top_srcdir)/m4/sys_ioctl_h.m4 \
 	$(top_srcdir)/m4/sys_resource_h.m4 \
 	$(top_srcdir)/m4/sys_select_h.m4 \
 	$(top_srcdir)/m4/sys_socket_h.m4 \
@@ -346,28 +590,25 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
 	$(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlinkat.m4 \
 	$(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/unlocked-io.m4 \
 	$(top_srcdir)/m4/uptime.m4 $(top_srcdir)/m4/userspec.m4 \
-	$(top_srcdir)/m4/usleep.m4 $(top_srcdir)/m4/utimbuf.m4 \
-	$(top_srcdir)/m4/utimecmp.m4 $(top_srcdir)/m4/utimens.m4 \
-	$(top_srcdir)/m4/utimensat.m4 $(top_srcdir)/m4/utimes.m4 \
-	$(top_srcdir)/m4/vasnprintf.m4 \
+	$(top_srcdir)/m4/utimbuf.m4 $(top_srcdir)/m4/utimecmp.m4 \
+	$(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimensat.m4 \
+	$(top_srcdir)/m4/utimes.m4 $(top_srcdir)/m4/vasnprintf.m4 \
 	$(top_srcdir)/m4/vasprintf-posix.m4 \
 	$(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/version-etc.m4 \
 	$(top_srcdir)/m4/vfprintf-posix.m4 \
-	$(top_srcdir)/m4/vprintf-posix.m4 \
-	$(top_srcdir)/m4/wait-process.m4 $(top_srcdir)/m4/waitpid.m4 \
-	$(top_srcdir)/m4/warnings.m4 $(top_srcdir)/m4/wchar_h.m4 \
-	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \
-	$(top_srcdir)/m4/wcswidth.m4 $(top_srcdir)/m4/wctob.m4 \
-	$(top_srcdir)/m4/wctomb.m4 $(top_srcdir)/m4/wctype_h.m4 \
-	$(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wint_t.m4 \
-	$(top_srcdir)/m4/write-any-file.m4 $(top_srcdir)/m4/write.m4 \
-	$(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xattr.m4 \
-	$(top_srcdir)/m4/xgetcwd.m4 $(top_srcdir)/m4/xnanosleep.m4 \
-	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/xstrndup.m4 \
-	$(top_srcdir)/m4/xstrtod.m4 $(top_srcdir)/m4/xstrtol.m4 \
-	$(top_srcdir)/m4/xvasprintf.m4 $(top_srcdir)/m4/yesno.m4 \
-	$(top_srcdir)/m4/yield.m4 $(top_srcdir)/m4/cu-progs.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/vprintf-posix.m4 $(top_srcdir)/m4/warnings.m4 \
+	$(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \
+	$(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wcswidth.m4 \
+	$(top_srcdir)/m4/wctob.m4 $(top_srcdir)/m4/wctomb.m4 \
+	$(top_srcdir)/m4/wctype_h.m4 $(top_srcdir)/m4/wcwidth.m4 \
+	$(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/write-any-file.m4 \
+	$(top_srcdir)/m4/write.m4 $(top_srcdir)/m4/xalloc.m4 \
+	$(top_srcdir)/m4/xattr.m4 $(top_srcdir)/m4/xgetcwd.m4 \
+	$(top_srcdir)/m4/xnanosleep.m4 $(top_srcdir)/m4/xsize.m4 \
+	$(top_srcdir)/m4/xstrndup.m4 $(top_srcdir)/m4/xstrtod.m4 \
+	$(top_srcdir)/m4/xstrtol.m4 $(top_srcdir)/m4/xvasprintf.m4 \
+	$(top_srcdir)/m4/yesno.m4 $(top_srcdir)/m4/yield.m4 \
+	$(top_srcdir)/m4/cu-progs.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -379,32 +620,27 @@ CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 AM_V_AR = $(am__v_AR_@AM_V@)
 am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
-am__v_AR_0 = @echo "  AR    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
 lib_libcoreutils_a_AR = $(AR) $(ARFLAGS)
 am__DEPENDENCIES_1 =
 LIBOBJDIR = lib/
-am__lib_libcoreutils_a_SOURCES_DIST = lib/set-mode-acl.c \
-	lib/copy-acl.c lib/file-has-acl.c lib/allocator.c \
-	lib/areadlink.c lib/areadlink-with-size.c lib/areadlinkat.c \
-	lib/argmatch.c lib/argv-iter.c lib/argv-iter.h \
-	lib/backupfile.c lib/base64.h lib/base64.c lib/binary-io.h \
-	lib/binary-io.c lib/bitrotate.h lib/bitrotate.c \
-	lib/buffer-lcm.c lib/buffer-lcm.h lib/c-ctype.h lib/c-ctype.c \
-	lib/c-strcase.h lib/c-strcasecmp.c lib/c-strncasecmp.c \
-	lib/c-strtod.c lib/c-strtold.c lib/canon-host.c \
-	lib/canonicalize.c lib/careadlinkat.c lib/cloexec.c \
-	lib/close-stream.c lib/closein.c lib/closeout.c lib/md5.c \
-	lib/sha1.c lib/sha256.c lib/sha512.c lib/cycle-check.c \
-	lib/di-set.c lib/di-set.h lib/diacrit.h lib/diacrit.c \
-	lib/opendir-safer.c lib/dirname.c lib/basename.c \
-	lib/dirname-lgpl.c lib/basename-lgpl.c lib/stripslash.c \
-	lib/dtoastr.c lib/dtotimespec.c lib/exclude.c lib/exitfail.c \
-	lib/fadvise.c lib/fadvise.h lib/fatal-signal.h \
-	lib/fatal-signal.c lib/chmodat.c lib/chownat.c \
-	lib/creat-safer.c lib/open-safer.c lib/fd-hook.c \
+am__lib_libcoreutils_a_SOURCES_DIST = lib/copy-acl.c lib/set-acl.c \
+	lib/allocator.c lib/areadlink.c lib/areadlink-with-size.c \
+	lib/areadlinkat.c lib/argmatch.c lib/argv-iter.c \
+	lib/argv-iter.h lib/backupfile.c lib/base64.h lib/base64.c \
+	lib/bitrotate.h lib/bitrotate.c lib/buffer-lcm.c \
+	lib/buffer-lcm.h lib/c-ctype.h lib/c-ctype.c lib/c-strcase.h \
+	lib/c-strcasecmp.c lib/c-strncasecmp.c lib/c-strtod.c \
+	lib/c-strtold.c lib/canon-host.c lib/canonicalize.c \
+	lib/careadlinkat.c lib/cloexec.c lib/close-stream.c \
+	lib/closein.c lib/closeout.c lib/md5.c lib/sha1.c lib/sha256.c \
+	lib/sha512.c lib/cycle-check.c lib/di-set.c lib/di-set.h \
+	lib/diacrit.h lib/diacrit.c lib/opendir-safer.c lib/dirname.c \
+	lib/basename.c lib/dirname-lgpl.c lib/basename-lgpl.c \
+	lib/stripslash.c lib/dtoastr.c lib/dtotimespec.c lib/exclude.c \
+	lib/exitfail.c lib/fadvise.c lib/fadvise.h lib/chmodat.c \
+	lib/chownat.c lib/creat-safer.c lib/open-safer.c lib/fd-hook.c \
 	lib/fd-reopen.c lib/fd-reopen.h lib/fd-safer-flag.c \
 	lib/dup-safer-flag.c lib/fdutimensat.c lib/file-set.c \
 	lib/file-type.c lib/filemode.c lib/filenamecat.c \
@@ -428,10 +664,11 @@ am__lib_libcoreutils_a_SOURCES_DIST = lib/set-mode-acl.c \
 	lib/mgetgroups.c lib/mkancesdirs.c lib/dirchownmod.c \
 	lib/mkdir-p.c lib/modechange.c lib/mpsort.c lib/nproc.c \
 	lib/openat-die.c lib/openat-safer.c lib/parse-datetime.y \
-	lib/physmem.c lib/pipe2.c lib/pipe2-safer.c lib/posixtm.c \
-	lib/posixver.c lib/printf-frexp.c lib/printf-frexpl.c \
-	lib/priv-set.c lib/progname.h lib/progname.c lib/propername.h \
-	lib/propername.c lib/quotearg.c lib/randint.c lib/randint.h \
+	lib/physmem.c lib/posixtm.c lib/posixver.c lib/printf-frexp.c \
+	lib/printf-frexpl.c lib/priv-set.c lib/progname.h \
+	lib/progname.c lib/propername.h lib/propername.c \
+	lib/acl-errno-valid.c lib/file-has-acl.c lib/qcopy-acl.c \
+	lib/qset-acl.c lib/quotearg.c lib/randint.c lib/randint.h \
 	lib/randperm.c lib/randperm.h lib/randread.c lib/randread.h \
 	lib/rand-isaac.c lib/rand-isaac.h lib/read-file.c \
 	lib/readtokens.c lib/readtokens0.h lib/readtokens0.c \
@@ -439,20 +676,19 @@ am__lib_libcoreutils_a_SOURCES_DIST = lib/set-mode-acl.c \
 	lib/safe-write.c lib/same.c lib/save-cwd.c lib/savedir.c \
 	lib/savewd.h lib/savewd.c lib/se-context.in.h \
 	lib/se-selinux.in.h lib/se-context.c lib/se-selinux.c \
-	lib/settime.c lib/sig-handler.c lib/size_max.h lib/sockets.h \
-	lib/sockets.c lib/spawn-pipe.h lib/spawn-pipe.c lib/w32spawn.h \
-	lib/stat-time.c lib/statat.c lib/mkstemp-safer.c \
-	lib/strftime.c lib/striconv.h lib/striconv.c lib/strnlen1.h \
-	lib/strnlen1.c lib/strintcmp.c lib/strnumcmp.c lib/strnumcmp.h \
-	lib/sys_socket.c lib/tempname.c lib/glthread/threadlib.c \
-	lib/timespec.c lib/glthread/tls.h lib/glthread/tls.c \
-	lib/trim.c lib/u64.c lib/unicodeio.h lib/unicodeio.c \
-	lib/unistd.c lib/dup-safer.c lib/fd-safer.c lib/pipe-safer.c \
-	lib/unistr/u8-mbtoucr.c lib/unistr/u8-uctomb.c \
-	lib/unistr/u8-uctomb-aux.c lib/uniwidth/width.c lib/userspec.c \
-	lib/utimecmp.c lib/utimens.c lib/verror.h lib/verror.c \
-	lib/version-etc.h lib/version-etc.c lib/version-etc-fsf.c \
-	lib/wait-process.h lib/wait-process.c lib/wctype-h.c \
+	lib/settime.c lib/sig-handler.c lib/size_max.h lib/smack.h \
+	lib/sockets.h lib/sockets.c lib/stat-time.c lib/statat.c \
+	lib/mkstemp-safer.c lib/strftime.c lib/striconv.h \
+	lib/striconv.c lib/strnlen1.h lib/strnlen1.c lib/strintcmp.c \
+	lib/strnumcmp.c lib/strnumcmp.h lib/sys_socket.c \
+	lib/tempname.c lib/glthread/threadlib.c lib/timespec.c \
+	lib/glthread/tls.h lib/glthread/tls.c lib/trim.c lib/u64.c \
+	lib/unicodeio.h lib/unicodeio.c lib/unistd.c lib/dup-safer.c \
+	lib/fd-safer.c lib/pipe-safer.c lib/unistr/u8-mbtoucr.c \
+	lib/unistr/u8-uctomb.c lib/unistr/u8-uctomb-aux.c \
+	lib/uniwidth/width.c lib/userspec.c lib/utimecmp.c \
+	lib/utimens.c lib/verror.h lib/verror.c lib/version-etc.h \
+	lib/version-etc.c lib/version-etc-fsf.c lib/wctype-h.c \
 	lib/write-any-file.c lib/xmalloc.c lib/xalloc-die.c \
 	lib/xfreopen.c lib/xfreopen.h lib/xfts.c lib/xfts.h \
 	lib/xgetcwd.c lib/xgetgroups.c lib/xgethostname.h \
@@ -468,13 +704,12 @@ am__dirstamp = $(am__leading_dot)dirstamp
 @LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@am__objects_2 = lib/unistr/u8-uctomb.$(OBJEXT) \
 @LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@	lib/unistr/u8-uctomb-aux.$(OBJEXT)
 @LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@am__objects_3 = lib/uniwidth/width.$(OBJEXT)
-am_lib_libcoreutils_a_OBJECTS = lib/set-mode-acl.$(OBJEXT) \
-	lib/copy-acl.$(OBJEXT) lib/file-has-acl.$(OBJEXT) \
-	lib/allocator.$(OBJEXT) lib/areadlink.$(OBJEXT) \
-	lib/areadlink-with-size.$(OBJEXT) lib/areadlinkat.$(OBJEXT) \
-	lib/argmatch.$(OBJEXT) lib/argv-iter.$(OBJEXT) \
-	lib/backupfile.$(OBJEXT) lib/base64.$(OBJEXT) \
-	lib/binary-io.$(OBJEXT) lib/bitrotate.$(OBJEXT) \
+am_lib_libcoreutils_a_OBJECTS = lib/copy-acl.$(OBJEXT) \
+	lib/set-acl.$(OBJEXT) lib/allocator.$(OBJEXT) \
+	lib/areadlink.$(OBJEXT) lib/areadlink-with-size.$(OBJEXT) \
+	lib/areadlinkat.$(OBJEXT) lib/argmatch.$(OBJEXT) \
+	lib/argv-iter.$(OBJEXT) lib/backupfile.$(OBJEXT) \
+	lib/base64.$(OBJEXT) lib/bitrotate.$(OBJEXT) \
 	lib/buffer-lcm.$(OBJEXT) lib/c-ctype.$(OBJEXT) \
 	lib/c-strcasecmp.$(OBJEXT) lib/c-strncasecmp.$(OBJEXT) \
 	lib/c-strtod.$(OBJEXT) lib/c-strtold.$(OBJEXT) \
@@ -490,57 +725,57 @@ am_lib_libcoreutils_a_OBJECTS = lib/set-mode-acl.$(OBJEXT) \
 	lib/stripslash.$(OBJEXT) lib/dtoastr.$(OBJEXT) \
 	lib/dtotimespec.$(OBJEXT) lib/exclude.$(OBJEXT) \
 	lib/exitfail.$(OBJEXT) lib/fadvise.$(OBJEXT) \
-	lib/fatal-signal.$(OBJEXT) lib/chmodat.$(OBJEXT) \
-	lib/chownat.$(OBJEXT) lib/creat-safer.$(OBJEXT) \
-	lib/open-safer.$(OBJEXT) lib/fd-hook.$(OBJEXT) \
-	lib/fd-reopen.$(OBJEXT) lib/fd-safer-flag.$(OBJEXT) \
-	lib/dup-safer-flag.$(OBJEXT) lib/fdutimensat.$(OBJEXT) \
-	lib/file-set.$(OBJEXT) lib/file-type.$(OBJEXT) \
-	lib/filemode.$(OBJEXT) lib/filenamecat.$(OBJEXT) \
-	lib/filenamecat-lgpl.$(OBJEXT) lib/filevercmp.$(OBJEXT) \
-	lib/fopen-safer.$(OBJEXT) lib/fprintftime.$(OBJEXT) \
-	lib/freading.$(OBJEXT) lib/freadseek.$(OBJEXT) \
-	lib/freopen-safer.$(OBJEXT) lib/ftoastr.$(OBJEXT) \
-	lib/full-read.$(OBJEXT) lib/full-write.$(OBJEXT) \
-	lib/gethrxtime.$(OBJEXT) lib/xtime.$(OBJEXT) \
-	lib/getndelim2.$(OBJEXT) lib/gettime.$(OBJEXT) \
-	lib/getugroups.$(OBJEXT) lib/hard-locale.$(OBJEXT) \
-	lib/hash.$(OBJEXT) lib/hash-pjw.$(OBJEXT) \
-	lib/hash-triple.$(OBJEXT) lib/heap.$(OBJEXT) \
-	lib/human.$(OBJEXT) lib/i-ring.$(OBJEXT) lib/idcache.$(OBJEXT) \
-	lib/ino-map.$(OBJEXT) lib/imaxtostr.$(OBJEXT) \
-	lib/inttostr.$(OBJEXT) lib/offtostr.$(OBJEXT) \
-	lib/uinttostr.$(OBJEXT) lib/umaxtostr.$(OBJEXT) \
-	lib/ldtoastr.$(OBJEXT) lib/linebuffer.$(OBJEXT) \
-	lib/localcharset.$(OBJEXT) lib/glthread/lock.$(OBJEXT) \
-	lib/long-options.$(OBJEXT) lib/malloca.$(OBJEXT) \
-	lib/math.$(OBJEXT) lib/mbchar.$(OBJEXT) lib/mbiter.$(OBJEXT) \
-	lib/mbsalign.$(OBJEXT) lib/mbscasecmp.$(OBJEXT) \
-	lib/mbslen.$(OBJEXT) lib/mbsstr.$(OBJEXT) \
-	lib/mbswidth.$(OBJEXT) lib/mbuiter.$(OBJEXT) \
-	lib/memcasecmp.$(OBJEXT) lib/memchr2.$(OBJEXT) \
-	lib/memcmp2.$(OBJEXT) lib/memcoll.$(OBJEXT) \
-	lib/mgetgroups.$(OBJEXT) lib/mkancesdirs.$(OBJEXT) \
-	lib/dirchownmod.$(OBJEXT) lib/mkdir-p.$(OBJEXT) \
-	lib/modechange.$(OBJEXT) lib/mpsort.$(OBJEXT) \
-	lib/nproc.$(OBJEXT) lib/openat-die.$(OBJEXT) \
-	lib/openat-safer.$(OBJEXT) lib/parse-datetime.$(OBJEXT) \
-	lib/physmem.$(OBJEXT) lib/pipe2.$(OBJEXT) \
-	lib/pipe2-safer.$(OBJEXT) lib/posixtm.$(OBJEXT) \
-	lib/posixver.$(OBJEXT) lib/printf-frexp.$(OBJEXT) \
-	lib/printf-frexpl.$(OBJEXT) lib/priv-set.$(OBJEXT) \
-	lib/progname.$(OBJEXT) lib/propername.$(OBJEXT) \
-	lib/quotearg.$(OBJEXT) lib/randint.$(OBJEXT) \
-	lib/randperm.$(OBJEXT) lib/randread.$(OBJEXT) \
-	lib/rand-isaac.$(OBJEXT) lib/read-file.$(OBJEXT) \
-	lib/readtokens.$(OBJEXT) lib/readtokens0.$(OBJEXT) \
-	lib/root-dev-ino.$(OBJEXT) lib/safe-read.$(OBJEXT) \
-	lib/safe-write.$(OBJEXT) lib/same.$(OBJEXT) \
-	lib/save-cwd.$(OBJEXT) lib/savedir.$(OBJEXT) \
-	lib/savewd.$(OBJEXT) lib/se-context.$(OBJEXT) \
-	lib/se-selinux.$(OBJEXT) lib/settime.$(OBJEXT) \
-	lib/sig-handler.$(OBJEXT) lib/sockets.$(OBJEXT) \
-	lib/spawn-pipe.$(OBJEXT) lib/stat-time.$(OBJEXT) \
+	lib/chmodat.$(OBJEXT) lib/chownat.$(OBJEXT) \
+	lib/creat-safer.$(OBJEXT) lib/open-safer.$(OBJEXT) \
+	lib/fd-hook.$(OBJEXT) lib/fd-reopen.$(OBJEXT) \
+	lib/fd-safer-flag.$(OBJEXT) lib/dup-safer-flag.$(OBJEXT) \
+	lib/fdutimensat.$(OBJEXT) lib/file-set.$(OBJEXT) \
+	lib/file-type.$(OBJEXT) lib/filemode.$(OBJEXT) \
+	lib/filenamecat.$(OBJEXT) lib/filenamecat-lgpl.$(OBJEXT) \
+	lib/filevercmp.$(OBJEXT) lib/fopen-safer.$(OBJEXT) \
+	lib/fprintftime.$(OBJEXT) lib/freading.$(OBJEXT) \
+	lib/freadseek.$(OBJEXT) lib/freopen-safer.$(OBJEXT) \
+	lib/ftoastr.$(OBJEXT) lib/full-read.$(OBJEXT) \
+	lib/full-write.$(OBJEXT) lib/gethrxtime.$(OBJEXT) \
+	lib/xtime.$(OBJEXT) lib/getndelim2.$(OBJEXT) \
+	lib/gettime.$(OBJEXT) lib/getugroups.$(OBJEXT) \
+	lib/hard-locale.$(OBJEXT) lib/hash.$(OBJEXT) \
+	lib/hash-pjw.$(OBJEXT) lib/hash-triple.$(OBJEXT) \
+	lib/heap.$(OBJEXT) lib/human.$(OBJEXT) lib/i-ring.$(OBJEXT) \
+	lib/idcache.$(OBJEXT) lib/ino-map.$(OBJEXT) \
+	lib/imaxtostr.$(OBJEXT) lib/inttostr.$(OBJEXT) \
+	lib/offtostr.$(OBJEXT) lib/uinttostr.$(OBJEXT) \
+	lib/umaxtostr.$(OBJEXT) lib/ldtoastr.$(OBJEXT) \
+	lib/linebuffer.$(OBJEXT) lib/localcharset.$(OBJEXT) \
+	lib/glthread/lock.$(OBJEXT) lib/long-options.$(OBJEXT) \
+	lib/malloca.$(OBJEXT) lib/math.$(OBJEXT) lib/mbchar.$(OBJEXT) \
+	lib/mbiter.$(OBJEXT) lib/mbsalign.$(OBJEXT) \
+	lib/mbscasecmp.$(OBJEXT) lib/mbslen.$(OBJEXT) \
+	lib/mbsstr.$(OBJEXT) lib/mbswidth.$(OBJEXT) \
+	lib/mbuiter.$(OBJEXT) lib/memcasecmp.$(OBJEXT) \
+	lib/memchr2.$(OBJEXT) lib/memcmp2.$(OBJEXT) \
+	lib/memcoll.$(OBJEXT) lib/mgetgroups.$(OBJEXT) \
+	lib/mkancesdirs.$(OBJEXT) lib/dirchownmod.$(OBJEXT) \
+	lib/mkdir-p.$(OBJEXT) lib/modechange.$(OBJEXT) \
+	lib/mpsort.$(OBJEXT) lib/nproc.$(OBJEXT) \
+	lib/openat-die.$(OBJEXT) lib/openat-safer.$(OBJEXT) \
+	lib/parse-datetime.$(OBJEXT) lib/physmem.$(OBJEXT) \
+	lib/posixtm.$(OBJEXT) lib/posixver.$(OBJEXT) \
+	lib/printf-frexp.$(OBJEXT) lib/printf-frexpl.$(OBJEXT) \
+	lib/priv-set.$(OBJEXT) lib/progname.$(OBJEXT) \
+	lib/propername.$(OBJEXT) lib/acl-errno-valid.$(OBJEXT) \
+	lib/file-has-acl.$(OBJEXT) lib/qcopy-acl.$(OBJEXT) \
+	lib/qset-acl.$(OBJEXT) lib/quotearg.$(OBJEXT) \
+	lib/randint.$(OBJEXT) lib/randperm.$(OBJEXT) \
+	lib/randread.$(OBJEXT) lib/rand-isaac.$(OBJEXT) \
+	lib/read-file.$(OBJEXT) lib/readtokens.$(OBJEXT) \
+	lib/readtokens0.$(OBJEXT) lib/root-dev-ino.$(OBJEXT) \
+	lib/safe-read.$(OBJEXT) lib/safe-write.$(OBJEXT) \
+	lib/same.$(OBJEXT) lib/save-cwd.$(OBJEXT) \
+	lib/savedir.$(OBJEXT) lib/savewd.$(OBJEXT) \
+	lib/se-context.$(OBJEXT) lib/se-selinux.$(OBJEXT) \
+	lib/settime.$(OBJEXT) lib/sig-handler.$(OBJEXT) \
+	lib/sockets.$(OBJEXT) lib/stat-time.$(OBJEXT) \
 	lib/statat.$(OBJEXT) lib/mkstemp-safer.$(OBJEXT) \
 	lib/strftime.$(OBJEXT) lib/striconv.$(OBJEXT) \
 	lib/strnlen1.$(OBJEXT) lib/strintcmp.$(OBJEXT) \
@@ -554,26 +789,712 @@ am_lib_libcoreutils_a_OBJECTS = lib/set-mode-acl.$(OBJEXT) \
 	lib/userspec.$(OBJEXT) lib/utimecmp.$(OBJEXT) \
 	lib/utimens.$(OBJEXT) lib/verror.$(OBJEXT) \
 	lib/version-etc.$(OBJEXT) lib/version-etc-fsf.$(OBJEXT) \
-	lib/wait-process.$(OBJEXT) lib/wctype-h.$(OBJEXT) \
-	lib/write-any-file.$(OBJEXT) lib/xmalloc.$(OBJEXT) \
-	lib/xalloc-die.$(OBJEXT) lib/xfreopen.$(OBJEXT) \
-	lib/xfts.$(OBJEXT) lib/xgetcwd.$(OBJEXT) \
-	lib/xgetgroups.$(OBJEXT) lib/xgethostname.$(OBJEXT) \
-	lib/xmemcoll.$(OBJEXT) lib/xnanosleep.$(OBJEXT) \
-	lib/xprintf.$(OBJEXT) lib/xreadlink.$(OBJEXT) \
-	lib/xsize.$(OBJEXT) lib/xstriconv.$(OBJEXT) \
-	lib/xstrndup.$(OBJEXT) lib/xstrtod.$(OBJEXT) \
-	lib/xstrtoimax.$(OBJEXT) lib/xstrtol.$(OBJEXT) \
-	lib/xstrtoul.$(OBJEXT) lib/xstrtol-error.$(OBJEXT) \
-	lib/xstrtold.$(OBJEXT) lib/xstrtoumax.$(OBJEXT) \
-	lib/xvasprintf.$(OBJEXT) lib/xasprintf.$(OBJEXT) \
-	lib/yesno.$(OBJEXT)
+	lib/wctype-h.$(OBJEXT) lib/write-any-file.$(OBJEXT) \
+	lib/xmalloc.$(OBJEXT) lib/xalloc-die.$(OBJEXT) \
+	lib/xfreopen.$(OBJEXT) lib/xfts.$(OBJEXT) \
+	lib/xgetcwd.$(OBJEXT) lib/xgetgroups.$(OBJEXT) \
+	lib/xgethostname.$(OBJEXT) lib/xmemcoll.$(OBJEXT) \
+	lib/xnanosleep.$(OBJEXT) lib/xprintf.$(OBJEXT) \
+	lib/xreadlink.$(OBJEXT) lib/xsize.$(OBJEXT) \
+	lib/xstriconv.$(OBJEXT) lib/xstrndup.$(OBJEXT) \
+	lib/xstrtod.$(OBJEXT) lib/xstrtoimax.$(OBJEXT) \
+	lib/xstrtol.$(OBJEXT) lib/xstrtoul.$(OBJEXT) \
+	lib/xstrtol-error.$(OBJEXT) lib/xstrtold.$(OBJEXT) \
+	lib/xstrtoumax.$(OBJEXT) lib/xvasprintf.$(OBJEXT) \
+	lib/xasprintf.$(OBJEXT) lib/yesno.$(OBJEXT)
 lib_libcoreutils_a_OBJECTS = $(am_lib_libcoreutils_a_OBJECTS)
+src_libsinglebin___a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin___a_LIBADD =
+am__src_libsinglebin___a_SOURCES_DIST = src/lbracket.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin___a_OBJECTS = src/src_libsinglebin___a-lbracket.$(OBJEXT)
+src_libsinglebin___a_OBJECTS = $(am_src_libsinglebin___a_OBJECTS)
+src_libsinglebin_arch_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_arch_a_LIBADD =
+am__src_libsinglebin_arch_a_SOURCES_DIST = src/coreutils-arch.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_arch_a_OBJECTS = src/src_libsinglebin_arch_a-coreutils-arch.$(OBJEXT)
+src_libsinglebin_arch_a_OBJECTS =  \
+	$(am_src_libsinglebin_arch_a_OBJECTS)
+src_libsinglebin_base64_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_base64_a_LIBADD =
+am__src_libsinglebin_base64_a_SOURCES_DIST = src/base64.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_base64_a_OBJECTS = src/src_libsinglebin_base64_a-base64.$(OBJEXT)
+src_libsinglebin_base64_a_OBJECTS =  \
+	$(am_src_libsinglebin_base64_a_OBJECTS)
+src_libsinglebin_basename_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_basename_a_LIBADD =
+am__src_libsinglebin_basename_a_SOURCES_DIST = src/basename.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_basename_a_OBJECTS = src/src_libsinglebin_basename_a-basename.$(OBJEXT)
+src_libsinglebin_basename_a_OBJECTS =  \
+	$(am_src_libsinglebin_basename_a_OBJECTS)
+src_libsinglebin_cat_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_cat_a_LIBADD =
+am__src_libsinglebin_cat_a_SOURCES_DIST = src/cat.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_cat_a_OBJECTS =  \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_cat_a-cat.$(OBJEXT)
+src_libsinglebin_cat_a_OBJECTS = $(am_src_libsinglebin_cat_a_OBJECTS)
+src_libsinglebin_chcon_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_chcon_a_LIBADD =
+am__src_libsinglebin_chcon_a_SOURCES_DIST = src/chcon.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_chcon_a_OBJECTS = src/src_libsinglebin_chcon_a-chcon.$(OBJEXT)
+src_libsinglebin_chcon_a_OBJECTS =  \
+	$(am_src_libsinglebin_chcon_a_OBJECTS)
+src_libsinglebin_chgrp_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_chgrp_a_LIBADD =
+am__src_libsinglebin_chgrp_a_SOURCES_DIST = src/chgrp.c \
+	src/chown-core.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_chgrp_a_OBJECTS = src/src_libsinglebin_chgrp_a-chgrp.$(OBJEXT) \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_chgrp_a-chown-core.$(OBJEXT)
+src_libsinglebin_chgrp_a_OBJECTS =  \
+	$(am_src_libsinglebin_chgrp_a_OBJECTS)
+src_libsinglebin_chmod_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_chmod_a_LIBADD =
+am__src_libsinglebin_chmod_a_SOURCES_DIST = src/chmod.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_chmod_a_OBJECTS = src/src_libsinglebin_chmod_a-chmod.$(OBJEXT)
+src_libsinglebin_chmod_a_OBJECTS =  \
+	$(am_src_libsinglebin_chmod_a_OBJECTS)
+src_libsinglebin_chown_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_chown_a_LIBADD =
+am__src_libsinglebin_chown_a_SOURCES_DIST = src/chown.c \
+	src/chown-core.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_chown_a_OBJECTS = src/src_libsinglebin_chown_a-chown.$(OBJEXT) \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_chown_a-chown-core.$(OBJEXT)
+src_libsinglebin_chown_a_OBJECTS =  \
+	$(am_src_libsinglebin_chown_a_OBJECTS)
+src_libsinglebin_chroot_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_chroot_a_LIBADD =
+am__src_libsinglebin_chroot_a_SOURCES_DIST = src/chroot.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_chroot_a_OBJECTS = src/src_libsinglebin_chroot_a-chroot.$(OBJEXT)
+src_libsinglebin_chroot_a_OBJECTS =  \
+	$(am_src_libsinglebin_chroot_a_OBJECTS)
+src_libsinglebin_cksum_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_cksum_a_LIBADD =
+am__src_libsinglebin_cksum_a_SOURCES_DIST = src/cksum.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_cksum_a_OBJECTS = src/src_libsinglebin_cksum_a-cksum.$(OBJEXT)
+src_libsinglebin_cksum_a_OBJECTS =  \
+	$(am_src_libsinglebin_cksum_a_OBJECTS)
+src_libsinglebin_comm_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_comm_a_LIBADD =
+am__src_libsinglebin_comm_a_SOURCES_DIST = src/comm.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_comm_a_OBJECTS = src/src_libsinglebin_comm_a-comm.$(OBJEXT)
+src_libsinglebin_comm_a_OBJECTS =  \
+	$(am_src_libsinglebin_comm_a_OBJECTS)
+src_libsinglebin_cp_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_cp_a_LIBADD =
+am__src_libsinglebin_cp_a_SOURCES_DIST = src/cp.c src/copy.c \
+	src/cp-hash.c src/extent-scan.c src/extent-scan.h \
+	src/selinux.c src/selinux.h
+am__objects_4 = src/src_libsinglebin_cp_a-copy.$(OBJEXT) \
+	src/src_libsinglebin_cp_a-cp-hash.$(OBJEXT) \
+	src/src_libsinglebin_cp_a-extent-scan.$(OBJEXT)
+am__objects_5 = src/src_libsinglebin_cp_a-selinux.$(OBJEXT)
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_cp_a_OBJECTS =  \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_cp_a-cp.$(OBJEXT) \
+@SINGLE_BINARY_TRUE@	$(am__objects_4) $(am__objects_5)
+src_libsinglebin_cp_a_OBJECTS = $(am_src_libsinglebin_cp_a_OBJECTS)
+src_libsinglebin_csplit_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_csplit_a_LIBADD =
+am__src_libsinglebin_csplit_a_SOURCES_DIST = src/csplit.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_csplit_a_OBJECTS = src/src_libsinglebin_csplit_a-csplit.$(OBJEXT)
+src_libsinglebin_csplit_a_OBJECTS =  \
+	$(am_src_libsinglebin_csplit_a_OBJECTS)
+src_libsinglebin_cut_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_cut_a_LIBADD =
+am__src_libsinglebin_cut_a_SOURCES_DIST = src/cut.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_cut_a_OBJECTS =  \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_cut_a-cut.$(OBJEXT)
+src_libsinglebin_cut_a_OBJECTS = $(am_src_libsinglebin_cut_a_OBJECTS)
+src_libsinglebin_date_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_date_a_LIBADD =
+am__src_libsinglebin_date_a_SOURCES_DIST = src/date.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_date_a_OBJECTS = src/src_libsinglebin_date_a-date.$(OBJEXT)
+src_libsinglebin_date_a_OBJECTS =  \
+	$(am_src_libsinglebin_date_a_OBJECTS)
+src_libsinglebin_dd_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_dd_a_LIBADD =
+am__src_libsinglebin_dd_a_SOURCES_DIST = src/dd.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_dd_a_OBJECTS =  \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_dd_a-dd.$(OBJEXT)
+src_libsinglebin_dd_a_OBJECTS = $(am_src_libsinglebin_dd_a_OBJECTS)
+src_libsinglebin_df_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_df_a_LIBADD =
+am__src_libsinglebin_df_a_SOURCES_DIST = src/df.c \
+	src/find-mount-point.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_df_a_OBJECTS =  \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_df_a-df.$(OBJEXT) \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_df_a-find-mount-point.$(OBJEXT)
+src_libsinglebin_df_a_OBJECTS = $(am_src_libsinglebin_df_a_OBJECTS)
+src_libsinglebin_dir_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_dir_a_LIBADD =
+am__src_libsinglebin_dir_a_SOURCES_DIST = src/coreutils-dir.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_dir_a_OBJECTS = src/src_libsinglebin_dir_a-coreutils-dir.$(OBJEXT)
+src_libsinglebin_dir_a_OBJECTS = $(am_src_libsinglebin_dir_a_OBJECTS)
+src_libsinglebin_dircolors_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_dircolors_a_LIBADD =
+am__src_libsinglebin_dircolors_a_SOURCES_DIST = src/dircolors.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_dircolors_a_OBJECTS = src/src_libsinglebin_dircolors_a-dircolors.$(OBJEXT)
+src_libsinglebin_dircolors_a_OBJECTS =  \
+	$(am_src_libsinglebin_dircolors_a_OBJECTS)
+src_libsinglebin_dirname_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_dirname_a_LIBADD =
+am__src_libsinglebin_dirname_a_SOURCES_DIST = src/dirname.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_dirname_a_OBJECTS = src/src_libsinglebin_dirname_a-dirname.$(OBJEXT)
+src_libsinglebin_dirname_a_OBJECTS =  \
+	$(am_src_libsinglebin_dirname_a_OBJECTS)
+src_libsinglebin_du_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_du_a_LIBADD =
+am__src_libsinglebin_du_a_SOURCES_DIST = src/du.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_du_a_OBJECTS =  \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_du_a-du.$(OBJEXT)
+src_libsinglebin_du_a_OBJECTS = $(am_src_libsinglebin_du_a_OBJECTS)
+src_libsinglebin_echo_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_echo_a_LIBADD =
+am__src_libsinglebin_echo_a_SOURCES_DIST = src/echo.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_echo_a_OBJECTS = src/src_libsinglebin_echo_a-echo.$(OBJEXT)
+src_libsinglebin_echo_a_OBJECTS =  \
+	$(am_src_libsinglebin_echo_a_OBJECTS)
+src_libsinglebin_env_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_env_a_LIBADD =
+am__src_libsinglebin_env_a_SOURCES_DIST = src/env.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_env_a_OBJECTS =  \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_env_a-env.$(OBJEXT)
+src_libsinglebin_env_a_OBJECTS = $(am_src_libsinglebin_env_a_OBJECTS)
+src_libsinglebin_expand_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_expand_a_LIBADD =
+am__src_libsinglebin_expand_a_SOURCES_DIST = src/expand.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_expand_a_OBJECTS = src/src_libsinglebin_expand_a-expand.$(OBJEXT)
+src_libsinglebin_expand_a_OBJECTS =  \
+	$(am_src_libsinglebin_expand_a_OBJECTS)
+src_libsinglebin_expr_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_expr_a_LIBADD =
+am__src_libsinglebin_expr_a_SOURCES_DIST = src/expr.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_expr_a_OBJECTS = src/src_libsinglebin_expr_a-expr.$(OBJEXT)
+src_libsinglebin_expr_a_OBJECTS =  \
+	$(am_src_libsinglebin_expr_a_OBJECTS)
+src_libsinglebin_factor_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_factor_a_LIBADD =
+am__src_libsinglebin_factor_a_SOURCES_DIST = src/factor.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_factor_a_OBJECTS = src/src_libsinglebin_factor_a-factor.$(OBJEXT)
+src_libsinglebin_factor_a_OBJECTS =  \
+	$(am_src_libsinglebin_factor_a_OBJECTS)
+src_libsinglebin_false_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_false_a_LIBADD =
+am__src_libsinglebin_false_a_SOURCES_DIST = src/false.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_false_a_OBJECTS = src/src_libsinglebin_false_a-false.$(OBJEXT)
+src_libsinglebin_false_a_OBJECTS =  \
+	$(am_src_libsinglebin_false_a_OBJECTS)
+src_libsinglebin_fmt_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_fmt_a_LIBADD =
+am__src_libsinglebin_fmt_a_SOURCES_DIST = src/fmt.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_fmt_a_OBJECTS =  \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_fmt_a-fmt.$(OBJEXT)
+src_libsinglebin_fmt_a_OBJECTS = $(am_src_libsinglebin_fmt_a_OBJECTS)
+src_libsinglebin_fold_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_fold_a_LIBADD =
+am__src_libsinglebin_fold_a_SOURCES_DIST = src/fold.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_fold_a_OBJECTS = src/src_libsinglebin_fold_a-fold.$(OBJEXT)
+src_libsinglebin_fold_a_OBJECTS =  \
+	$(am_src_libsinglebin_fold_a_OBJECTS)
+src_libsinglebin_ginstall_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_ginstall_a_LIBADD =
+am__src_libsinglebin_ginstall_a_SOURCES_DIST = src/install.c \
+	src/prog-fprintf.c src/copy.c src/cp-hash.c src/extent-scan.c \
+	src/extent-scan.h src/selinux.c src/selinux.h
+am__objects_6 = src/src_libsinglebin_ginstall_a-copy.$(OBJEXT) \
+	src/src_libsinglebin_ginstall_a-cp-hash.$(OBJEXT) \
+	src/src_libsinglebin_ginstall_a-extent-scan.$(OBJEXT)
+am__objects_7 = src/src_libsinglebin_ginstall_a-selinux.$(OBJEXT)
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_ginstall_a_OBJECTS = src/src_libsinglebin_ginstall_a-install.$(OBJEXT) \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_ginstall_a-prog-fprintf.$(OBJEXT) \
+@SINGLE_BINARY_TRUE@	$(am__objects_6) $(am__objects_7)
+src_libsinglebin_ginstall_a_OBJECTS =  \
+	$(am_src_libsinglebin_ginstall_a_OBJECTS)
+src_libsinglebin_groups_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_groups_a_LIBADD =
+am__src_libsinglebin_groups_a_SOURCES_DIST = src/groups.c \
+	src/group-list.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_groups_a_OBJECTS = src/src_libsinglebin_groups_a-groups.$(OBJEXT) \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_groups_a-group-list.$(OBJEXT)
+src_libsinglebin_groups_a_OBJECTS =  \
+	$(am_src_libsinglebin_groups_a_OBJECTS)
+src_libsinglebin_head_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_head_a_LIBADD =
+am__src_libsinglebin_head_a_SOURCES_DIST = src/head.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_head_a_OBJECTS = src/src_libsinglebin_head_a-head.$(OBJEXT)
+src_libsinglebin_head_a_OBJECTS =  \
+	$(am_src_libsinglebin_head_a_OBJECTS)
+src_libsinglebin_hostid_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_hostid_a_LIBADD =
+am__src_libsinglebin_hostid_a_SOURCES_DIST = src/hostid.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_hostid_a_OBJECTS = src/src_libsinglebin_hostid_a-hostid.$(OBJEXT)
+src_libsinglebin_hostid_a_OBJECTS =  \
+	$(am_src_libsinglebin_hostid_a_OBJECTS)
+src_libsinglebin_hostname_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_hostname_a_LIBADD =
+am__src_libsinglebin_hostname_a_SOURCES_DIST = src/hostname.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_hostname_a_OBJECTS = src/src_libsinglebin_hostname_a-hostname.$(OBJEXT)
+src_libsinglebin_hostname_a_OBJECTS =  \
+	$(am_src_libsinglebin_hostname_a_OBJECTS)
+src_libsinglebin_id_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_id_a_LIBADD =
+am__src_libsinglebin_id_a_SOURCES_DIST = src/id.c src/group-list.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_id_a_OBJECTS =  \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_id_a-id.$(OBJEXT) \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_id_a-group-list.$(OBJEXT)
+src_libsinglebin_id_a_OBJECTS = $(am_src_libsinglebin_id_a_OBJECTS)
+src_libsinglebin_join_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_join_a_LIBADD =
+am__src_libsinglebin_join_a_SOURCES_DIST = src/join.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_join_a_OBJECTS = src/src_libsinglebin_join_a-join.$(OBJEXT)
+src_libsinglebin_join_a_OBJECTS =  \
+	$(am_src_libsinglebin_join_a_OBJECTS)
+src_libsinglebin_kill_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_kill_a_LIBADD =
+am__src_libsinglebin_kill_a_SOURCES_DIST = src/kill.c \
+	src/operand2sig.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_kill_a_OBJECTS = src/src_libsinglebin_kill_a-kill.$(OBJEXT) \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_kill_a-operand2sig.$(OBJEXT)
+src_libsinglebin_kill_a_OBJECTS =  \
+	$(am_src_libsinglebin_kill_a_OBJECTS)
+src_libsinglebin_link_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_link_a_LIBADD =
+am__src_libsinglebin_link_a_SOURCES_DIST = src/link.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_link_a_OBJECTS = src/src_libsinglebin_link_a-link.$(OBJEXT)
+src_libsinglebin_link_a_OBJECTS =  \
+	$(am_src_libsinglebin_link_a_OBJECTS)
+src_libsinglebin_ln_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_ln_a_LIBADD =
+am__src_libsinglebin_ln_a_SOURCES_DIST = src/ln.c src/relpath.c \
+	src/relpath.h
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_ln_a_OBJECTS =  \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_ln_a-ln.$(OBJEXT) \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_ln_a-relpath.$(OBJEXT)
+src_libsinglebin_ln_a_OBJECTS = $(am_src_libsinglebin_ln_a_OBJECTS)
+src_libsinglebin_logname_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_logname_a_LIBADD =
+am__src_libsinglebin_logname_a_SOURCES_DIST = src/logname.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_logname_a_OBJECTS = src/src_libsinglebin_logname_a-logname.$(OBJEXT)
+src_libsinglebin_logname_a_OBJECTS =  \
+	$(am_src_libsinglebin_logname_a_OBJECTS)
+src_libsinglebin_ls_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_ls_a_LIBADD =
+am__src_libsinglebin_ls_a_SOURCES_DIST = src/ls.c src/ls-ls.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_ls_a_OBJECTS =  \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_ls_a-ls.$(OBJEXT) \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_ls_a-ls-ls.$(OBJEXT)
+src_libsinglebin_ls_a_OBJECTS = $(am_src_libsinglebin_ls_a_OBJECTS)
+src_libsinglebin_md5sum_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_md5sum_a_LIBADD =
+am__src_libsinglebin_md5sum_a_SOURCES_DIST = src/md5sum.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_md5sum_a_OBJECTS = src/src_libsinglebin_md5sum_a-md5sum.$(OBJEXT)
+src_libsinglebin_md5sum_a_OBJECTS =  \
+	$(am_src_libsinglebin_md5sum_a_OBJECTS)
+src_libsinglebin_mkdir_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_mkdir_a_LIBADD =
+am__src_libsinglebin_mkdir_a_SOURCES_DIST = src/mkdir.c \
+	src/prog-fprintf.c src/selinux.c src/selinux.h
+am__objects_8 = src/src_libsinglebin_mkdir_a-selinux.$(OBJEXT)
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_mkdir_a_OBJECTS = src/src_libsinglebin_mkdir_a-mkdir.$(OBJEXT) \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_mkdir_a-prog-fprintf.$(OBJEXT) \
+@SINGLE_BINARY_TRUE@	$(am__objects_8)
+src_libsinglebin_mkdir_a_OBJECTS =  \
+	$(am_src_libsinglebin_mkdir_a_OBJECTS)
+src_libsinglebin_mkfifo_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_mkfifo_a_LIBADD =
+am__src_libsinglebin_mkfifo_a_SOURCES_DIST = src/mkfifo.c \
+	src/selinux.c src/selinux.h
+am__objects_9 = src/src_libsinglebin_mkfifo_a-selinux.$(OBJEXT)
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_mkfifo_a_OBJECTS = src/src_libsinglebin_mkfifo_a-mkfifo.$(OBJEXT) \
+@SINGLE_BINARY_TRUE@	$(am__objects_9)
+src_libsinglebin_mkfifo_a_OBJECTS =  \
+	$(am_src_libsinglebin_mkfifo_a_OBJECTS)
+src_libsinglebin_mknod_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_mknod_a_LIBADD =
+am__src_libsinglebin_mknod_a_SOURCES_DIST = src/mknod.c src/selinux.c \
+	src/selinux.h
+am__objects_10 = src/src_libsinglebin_mknod_a-selinux.$(OBJEXT)
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_mknod_a_OBJECTS = src/src_libsinglebin_mknod_a-mknod.$(OBJEXT) \
+@SINGLE_BINARY_TRUE@	$(am__objects_10)
+src_libsinglebin_mknod_a_OBJECTS =  \
+	$(am_src_libsinglebin_mknod_a_OBJECTS)
+src_libsinglebin_mktemp_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_mktemp_a_LIBADD =
+am__src_libsinglebin_mktemp_a_SOURCES_DIST = src/mktemp.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_mktemp_a_OBJECTS = src/src_libsinglebin_mktemp_a-mktemp.$(OBJEXT)
+src_libsinglebin_mktemp_a_OBJECTS =  \
+	$(am_src_libsinglebin_mktemp_a_OBJECTS)
+src_libsinglebin_mv_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_mv_a_LIBADD =
+am__src_libsinglebin_mv_a_SOURCES_DIST = src/mv.c src/remove.c \
+	src/copy.c src/cp-hash.c src/extent-scan.c src/extent-scan.h \
+	src/selinux.c src/selinux.h
+am__objects_11 = src/src_libsinglebin_mv_a-copy.$(OBJEXT) \
+	src/src_libsinglebin_mv_a-cp-hash.$(OBJEXT) \
+	src/src_libsinglebin_mv_a-extent-scan.$(OBJEXT)
+am__objects_12 = src/src_libsinglebin_mv_a-selinux.$(OBJEXT)
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_mv_a_OBJECTS =  \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_mv_a-mv.$(OBJEXT) \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_mv_a-remove.$(OBJEXT) \
+@SINGLE_BINARY_TRUE@	$(am__objects_11) $(am__objects_12)
+src_libsinglebin_mv_a_OBJECTS = $(am_src_libsinglebin_mv_a_OBJECTS)
+src_libsinglebin_nice_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_nice_a_LIBADD =
+am__src_libsinglebin_nice_a_SOURCES_DIST = src/nice.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_nice_a_OBJECTS = src/src_libsinglebin_nice_a-nice.$(OBJEXT)
+src_libsinglebin_nice_a_OBJECTS =  \
+	$(am_src_libsinglebin_nice_a_OBJECTS)
+src_libsinglebin_nl_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_nl_a_LIBADD =
+am__src_libsinglebin_nl_a_SOURCES_DIST = src/nl.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_nl_a_OBJECTS =  \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_nl_a-nl.$(OBJEXT)
+src_libsinglebin_nl_a_OBJECTS = $(am_src_libsinglebin_nl_a_OBJECTS)
+src_libsinglebin_nohup_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_nohup_a_LIBADD =
+am__src_libsinglebin_nohup_a_SOURCES_DIST = src/nohup.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_nohup_a_OBJECTS = src/src_libsinglebin_nohup_a-nohup.$(OBJEXT)
+src_libsinglebin_nohup_a_OBJECTS =  \
+	$(am_src_libsinglebin_nohup_a_OBJECTS)
+src_libsinglebin_nproc_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_nproc_a_LIBADD =
+am__src_libsinglebin_nproc_a_SOURCES_DIST = src/nproc.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_nproc_a_OBJECTS = src/src_libsinglebin_nproc_a-nproc.$(OBJEXT)
+src_libsinglebin_nproc_a_OBJECTS =  \
+	$(am_src_libsinglebin_nproc_a_OBJECTS)
+src_libsinglebin_numfmt_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_numfmt_a_LIBADD =
+am__src_libsinglebin_numfmt_a_SOURCES_DIST = src/numfmt.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_numfmt_a_OBJECTS = src/src_libsinglebin_numfmt_a-numfmt.$(OBJEXT)
+src_libsinglebin_numfmt_a_OBJECTS =  \
+	$(am_src_libsinglebin_numfmt_a_OBJECTS)
+src_libsinglebin_od_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_od_a_LIBADD =
+am__src_libsinglebin_od_a_SOURCES_DIST = src/od.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_od_a_OBJECTS =  \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_od_a-od.$(OBJEXT)
+src_libsinglebin_od_a_OBJECTS = $(am_src_libsinglebin_od_a_OBJECTS)
+src_libsinglebin_paste_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_paste_a_LIBADD =
+am__src_libsinglebin_paste_a_SOURCES_DIST = src/paste.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_paste_a_OBJECTS = src/src_libsinglebin_paste_a-paste.$(OBJEXT)
+src_libsinglebin_paste_a_OBJECTS =  \
+	$(am_src_libsinglebin_paste_a_OBJECTS)
+src_libsinglebin_pathchk_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_pathchk_a_LIBADD =
+am__src_libsinglebin_pathchk_a_SOURCES_DIST = src/pathchk.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_pathchk_a_OBJECTS = src/src_libsinglebin_pathchk_a-pathchk.$(OBJEXT)
+src_libsinglebin_pathchk_a_OBJECTS =  \
+	$(am_src_libsinglebin_pathchk_a_OBJECTS)
+src_libsinglebin_pinky_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_pinky_a_LIBADD =
+am__src_libsinglebin_pinky_a_SOURCES_DIST = src/pinky.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_pinky_a_OBJECTS = src/src_libsinglebin_pinky_a-pinky.$(OBJEXT)
+src_libsinglebin_pinky_a_OBJECTS =  \
+	$(am_src_libsinglebin_pinky_a_OBJECTS)
+src_libsinglebin_pr_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_pr_a_LIBADD =
+am__src_libsinglebin_pr_a_SOURCES_DIST = src/pr.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_pr_a_OBJECTS =  \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_pr_a-pr.$(OBJEXT)
+src_libsinglebin_pr_a_OBJECTS = $(am_src_libsinglebin_pr_a_OBJECTS)
+src_libsinglebin_printenv_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_printenv_a_LIBADD =
+am__src_libsinglebin_printenv_a_SOURCES_DIST = src/printenv.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_printenv_a_OBJECTS = src/src_libsinglebin_printenv_a-printenv.$(OBJEXT)
+src_libsinglebin_printenv_a_OBJECTS =  \
+	$(am_src_libsinglebin_printenv_a_OBJECTS)
+src_libsinglebin_printf_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_printf_a_LIBADD =
+am__src_libsinglebin_printf_a_SOURCES_DIST = src/printf.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_printf_a_OBJECTS = src/src_libsinglebin_printf_a-printf.$(OBJEXT)
+src_libsinglebin_printf_a_OBJECTS =  \
+	$(am_src_libsinglebin_printf_a_OBJECTS)
+src_libsinglebin_ptx_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_ptx_a_LIBADD =
+am__src_libsinglebin_ptx_a_SOURCES_DIST = src/ptx.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_ptx_a_OBJECTS =  \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_ptx_a-ptx.$(OBJEXT)
+src_libsinglebin_ptx_a_OBJECTS = $(am_src_libsinglebin_ptx_a_OBJECTS)
+src_libsinglebin_pwd_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_pwd_a_LIBADD =
+am__src_libsinglebin_pwd_a_SOURCES_DIST = src/pwd.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_pwd_a_OBJECTS =  \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_pwd_a-pwd.$(OBJEXT)
+src_libsinglebin_pwd_a_OBJECTS = $(am_src_libsinglebin_pwd_a_OBJECTS)
+src_libsinglebin_readlink_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_readlink_a_LIBADD =
+am__src_libsinglebin_readlink_a_SOURCES_DIST = src/readlink.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_readlink_a_OBJECTS = src/src_libsinglebin_readlink_a-readlink.$(OBJEXT)
+src_libsinglebin_readlink_a_OBJECTS =  \
+	$(am_src_libsinglebin_readlink_a_OBJECTS)
+src_libsinglebin_realpath_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_realpath_a_LIBADD =
+am__src_libsinglebin_realpath_a_SOURCES_DIST = src/realpath.c \
+	src/relpath.c src/relpath.h
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_realpath_a_OBJECTS = src/src_libsinglebin_realpath_a-realpath.$(OBJEXT) \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_realpath_a-relpath.$(OBJEXT)
+src_libsinglebin_realpath_a_OBJECTS =  \
+	$(am_src_libsinglebin_realpath_a_OBJECTS)
+src_libsinglebin_rm_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_rm_a_LIBADD =
+am__src_libsinglebin_rm_a_SOURCES_DIST = src/rm.c src/remove.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_rm_a_OBJECTS =  \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_rm_a-rm.$(OBJEXT) \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_rm_a-remove.$(OBJEXT)
+src_libsinglebin_rm_a_OBJECTS = $(am_src_libsinglebin_rm_a_OBJECTS)
+src_libsinglebin_rmdir_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_rmdir_a_LIBADD =
+am__src_libsinglebin_rmdir_a_SOURCES_DIST = src/rmdir.c \
+	src/prog-fprintf.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_rmdir_a_OBJECTS = src/src_libsinglebin_rmdir_a-rmdir.$(OBJEXT) \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_rmdir_a-prog-fprintf.$(OBJEXT)
+src_libsinglebin_rmdir_a_OBJECTS =  \
+	$(am_src_libsinglebin_rmdir_a_OBJECTS)
+src_libsinglebin_runcon_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_runcon_a_LIBADD =
+am__src_libsinglebin_runcon_a_SOURCES_DIST = src/runcon.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_runcon_a_OBJECTS = src/src_libsinglebin_runcon_a-runcon.$(OBJEXT)
+src_libsinglebin_runcon_a_OBJECTS =  \
+	$(am_src_libsinglebin_runcon_a_OBJECTS)
+src_libsinglebin_seq_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_seq_a_LIBADD =
+am__src_libsinglebin_seq_a_SOURCES_DIST = src/seq.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_seq_a_OBJECTS =  \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_seq_a-seq.$(OBJEXT)
+src_libsinglebin_seq_a_OBJECTS = $(am_src_libsinglebin_seq_a_OBJECTS)
+src_libsinglebin_sha1sum_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_sha1sum_a_LIBADD =
+am__src_libsinglebin_sha1sum_a_SOURCES_DIST = src/md5sum.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_sha1sum_a_OBJECTS = src/src_libsinglebin_sha1sum_a-md5sum.$(OBJEXT)
+src_libsinglebin_sha1sum_a_OBJECTS =  \
+	$(am_src_libsinglebin_sha1sum_a_OBJECTS)
+src_libsinglebin_sha224sum_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_sha224sum_a_LIBADD =
+am__src_libsinglebin_sha224sum_a_SOURCES_DIST = src/md5sum.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_sha224sum_a_OBJECTS = src/src_libsinglebin_sha224sum_a-md5sum.$(OBJEXT)
+src_libsinglebin_sha224sum_a_OBJECTS =  \
+	$(am_src_libsinglebin_sha224sum_a_OBJECTS)
+src_libsinglebin_sha256sum_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_sha256sum_a_LIBADD =
+am__src_libsinglebin_sha256sum_a_SOURCES_DIST = src/md5sum.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_sha256sum_a_OBJECTS = src/src_libsinglebin_sha256sum_a-md5sum.$(OBJEXT)
+src_libsinglebin_sha256sum_a_OBJECTS =  \
+	$(am_src_libsinglebin_sha256sum_a_OBJECTS)
+src_libsinglebin_sha384sum_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_sha384sum_a_LIBADD =
+am__src_libsinglebin_sha384sum_a_SOURCES_DIST = src/md5sum.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_sha384sum_a_OBJECTS = src/src_libsinglebin_sha384sum_a-md5sum.$(OBJEXT)
+src_libsinglebin_sha384sum_a_OBJECTS =  \
+	$(am_src_libsinglebin_sha384sum_a_OBJECTS)
+src_libsinglebin_sha512sum_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_sha512sum_a_LIBADD =
+am__src_libsinglebin_sha512sum_a_SOURCES_DIST = src/md5sum.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_sha512sum_a_OBJECTS = src/src_libsinglebin_sha512sum_a-md5sum.$(OBJEXT)
+src_libsinglebin_sha512sum_a_OBJECTS =  \
+	$(am_src_libsinglebin_sha512sum_a_OBJECTS)
+src_libsinglebin_shred_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_shred_a_LIBADD =
+am__src_libsinglebin_shred_a_SOURCES_DIST = src/shred.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_shred_a_OBJECTS = src/src_libsinglebin_shred_a-shred.$(OBJEXT)
+src_libsinglebin_shred_a_OBJECTS =  \
+	$(am_src_libsinglebin_shred_a_OBJECTS)
+src_libsinglebin_shuf_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_shuf_a_LIBADD =
+am__src_libsinglebin_shuf_a_SOURCES_DIST = src/shuf.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_shuf_a_OBJECTS = src/src_libsinglebin_shuf_a-shuf.$(OBJEXT)
+src_libsinglebin_shuf_a_OBJECTS =  \
+	$(am_src_libsinglebin_shuf_a_OBJECTS)
+src_libsinglebin_sleep_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_sleep_a_LIBADD =
+am__src_libsinglebin_sleep_a_SOURCES_DIST = src/sleep.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_sleep_a_OBJECTS = src/src_libsinglebin_sleep_a-sleep.$(OBJEXT)
+src_libsinglebin_sleep_a_OBJECTS =  \
+	$(am_src_libsinglebin_sleep_a_OBJECTS)
+src_libsinglebin_sort_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_sort_a_LIBADD =
+am__src_libsinglebin_sort_a_SOURCES_DIST = src/sort.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_sort_a_OBJECTS = src/src_libsinglebin_sort_a-sort.$(OBJEXT)
+src_libsinglebin_sort_a_OBJECTS =  \
+	$(am_src_libsinglebin_sort_a_OBJECTS)
+src_libsinglebin_split_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_split_a_LIBADD =
+am__src_libsinglebin_split_a_SOURCES_DIST = src/split.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_split_a_OBJECTS = src/src_libsinglebin_split_a-split.$(OBJEXT)
+src_libsinglebin_split_a_OBJECTS =  \
+	$(am_src_libsinglebin_split_a_OBJECTS)
+src_libsinglebin_stat_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_stat_a_LIBADD =
+am__src_libsinglebin_stat_a_SOURCES_DIST = src/stat.c \
+	src/find-mount-point.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_stat_a_OBJECTS = src/src_libsinglebin_stat_a-stat.$(OBJEXT) \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_stat_a-find-mount-point.$(OBJEXT)
+src_libsinglebin_stat_a_OBJECTS =  \
+	$(am_src_libsinglebin_stat_a_OBJECTS)
+src_libsinglebin_stdbuf_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_stdbuf_a_LIBADD =
+am__src_libsinglebin_stdbuf_a_SOURCES_DIST = src/stdbuf.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_stdbuf_a_OBJECTS = src/src_libsinglebin_stdbuf_a-stdbuf.$(OBJEXT)
+src_libsinglebin_stdbuf_a_OBJECTS =  \
+	$(am_src_libsinglebin_stdbuf_a_OBJECTS)
+src_libsinglebin_stty_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_stty_a_LIBADD =
+am__src_libsinglebin_stty_a_SOURCES_DIST = src/stty.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_stty_a_OBJECTS = src/src_libsinglebin_stty_a-stty.$(OBJEXT)
+src_libsinglebin_stty_a_OBJECTS =  \
+	$(am_src_libsinglebin_stty_a_OBJECTS)
+src_libsinglebin_sum_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_sum_a_LIBADD =
+am__src_libsinglebin_sum_a_SOURCES_DIST = src/sum.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_sum_a_OBJECTS =  \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_sum_a-sum.$(OBJEXT)
+src_libsinglebin_sum_a_OBJECTS = $(am_src_libsinglebin_sum_a_OBJECTS)
+src_libsinglebin_sync_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_sync_a_LIBADD =
+am__src_libsinglebin_sync_a_SOURCES_DIST = src/sync.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_sync_a_OBJECTS = src/src_libsinglebin_sync_a-sync.$(OBJEXT)
+src_libsinglebin_sync_a_OBJECTS =  \
+	$(am_src_libsinglebin_sync_a_OBJECTS)
+src_libsinglebin_tac_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_tac_a_LIBADD =
+am__src_libsinglebin_tac_a_SOURCES_DIST = src/tac.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_tac_a_OBJECTS =  \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_tac_a-tac.$(OBJEXT)
+src_libsinglebin_tac_a_OBJECTS = $(am_src_libsinglebin_tac_a_OBJECTS)
+src_libsinglebin_tail_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_tail_a_LIBADD =
+am__src_libsinglebin_tail_a_SOURCES_DIST = src/tail.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_tail_a_OBJECTS = src/src_libsinglebin_tail_a-tail.$(OBJEXT)
+src_libsinglebin_tail_a_OBJECTS =  \
+	$(am_src_libsinglebin_tail_a_OBJECTS)
+src_libsinglebin_tee_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_tee_a_LIBADD =
+am__src_libsinglebin_tee_a_SOURCES_DIST = src/tee.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_tee_a_OBJECTS =  \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_tee_a-tee.$(OBJEXT)
+src_libsinglebin_tee_a_OBJECTS = $(am_src_libsinglebin_tee_a_OBJECTS)
+src_libsinglebin_test_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_test_a_LIBADD =
+am__src_libsinglebin_test_a_SOURCES_DIST = src/test.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_test_a_OBJECTS = src/src_libsinglebin_test_a-test.$(OBJEXT)
+src_libsinglebin_test_a_OBJECTS =  \
+	$(am_src_libsinglebin_test_a_OBJECTS)
+src_libsinglebin_timeout_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_timeout_a_LIBADD =
+am__src_libsinglebin_timeout_a_SOURCES_DIST = src/timeout.c \
+	src/operand2sig.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_timeout_a_OBJECTS = src/src_libsinglebin_timeout_a-timeout.$(OBJEXT) \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_timeout_a-operand2sig.$(OBJEXT)
+src_libsinglebin_timeout_a_OBJECTS =  \
+	$(am_src_libsinglebin_timeout_a_OBJECTS)
+src_libsinglebin_touch_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_touch_a_LIBADD =
+am__src_libsinglebin_touch_a_SOURCES_DIST = src/touch.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_touch_a_OBJECTS = src/src_libsinglebin_touch_a-touch.$(OBJEXT)
+src_libsinglebin_touch_a_OBJECTS =  \
+	$(am_src_libsinglebin_touch_a_OBJECTS)
+src_libsinglebin_tr_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_tr_a_LIBADD =
+am__src_libsinglebin_tr_a_SOURCES_DIST = src/tr.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_tr_a_OBJECTS =  \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_tr_a-tr.$(OBJEXT)
+src_libsinglebin_tr_a_OBJECTS = $(am_src_libsinglebin_tr_a_OBJECTS)
+src_libsinglebin_true_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_true_a_LIBADD =
+am__src_libsinglebin_true_a_SOURCES_DIST = src/true.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_true_a_OBJECTS = src/src_libsinglebin_true_a-true.$(OBJEXT)
+src_libsinglebin_true_a_OBJECTS =  \
+	$(am_src_libsinglebin_true_a_OBJECTS)
+src_libsinglebin_truncate_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_truncate_a_LIBADD =
+am__src_libsinglebin_truncate_a_SOURCES_DIST = src/truncate.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_truncate_a_OBJECTS = src/src_libsinglebin_truncate_a-truncate.$(OBJEXT)
+src_libsinglebin_truncate_a_OBJECTS =  \
+	$(am_src_libsinglebin_truncate_a_OBJECTS)
+src_libsinglebin_tsort_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_tsort_a_LIBADD =
+am__src_libsinglebin_tsort_a_SOURCES_DIST = src/tsort.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_tsort_a_OBJECTS = src/src_libsinglebin_tsort_a-tsort.$(OBJEXT)
+src_libsinglebin_tsort_a_OBJECTS =  \
+	$(am_src_libsinglebin_tsort_a_OBJECTS)
+src_libsinglebin_tty_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_tty_a_LIBADD =
+am__src_libsinglebin_tty_a_SOURCES_DIST = src/tty.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_tty_a_OBJECTS =  \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_tty_a-tty.$(OBJEXT)
+src_libsinglebin_tty_a_OBJECTS = $(am_src_libsinglebin_tty_a_OBJECTS)
+src_libsinglebin_uname_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_uname_a_LIBADD =
+am__src_libsinglebin_uname_a_SOURCES_DIST = src/uname.c \
+	src/uname-uname.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_uname_a_OBJECTS = src/src_libsinglebin_uname_a-uname.$(OBJEXT) \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_uname_a-uname-uname.$(OBJEXT)
+src_libsinglebin_uname_a_OBJECTS =  \
+	$(am_src_libsinglebin_uname_a_OBJECTS)
+src_libsinglebin_unexpand_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_unexpand_a_LIBADD =
+am__src_libsinglebin_unexpand_a_SOURCES_DIST = src/unexpand.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_unexpand_a_OBJECTS = src/src_libsinglebin_unexpand_a-unexpand.$(OBJEXT)
+src_libsinglebin_unexpand_a_OBJECTS =  \
+	$(am_src_libsinglebin_unexpand_a_OBJECTS)
+src_libsinglebin_uniq_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_uniq_a_LIBADD =
+am__src_libsinglebin_uniq_a_SOURCES_DIST = src/uniq.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_uniq_a_OBJECTS = src/src_libsinglebin_uniq_a-uniq.$(OBJEXT)
+src_libsinglebin_uniq_a_OBJECTS =  \
+	$(am_src_libsinglebin_uniq_a_OBJECTS)
+src_libsinglebin_unlink_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_unlink_a_LIBADD =
+am__src_libsinglebin_unlink_a_SOURCES_DIST = src/unlink.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_unlink_a_OBJECTS = src/src_libsinglebin_unlink_a-unlink.$(OBJEXT)
+src_libsinglebin_unlink_a_OBJECTS =  \
+	$(am_src_libsinglebin_unlink_a_OBJECTS)
+src_libsinglebin_uptime_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_uptime_a_LIBADD =
+am__src_libsinglebin_uptime_a_SOURCES_DIST = src/uptime.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_uptime_a_OBJECTS = src/src_libsinglebin_uptime_a-uptime.$(OBJEXT)
+src_libsinglebin_uptime_a_OBJECTS =  \
+	$(am_src_libsinglebin_uptime_a_OBJECTS)
+src_libsinglebin_users_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_users_a_LIBADD =
+am__src_libsinglebin_users_a_SOURCES_DIST = src/users.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_users_a_OBJECTS = src/src_libsinglebin_users_a-users.$(OBJEXT)
+src_libsinglebin_users_a_OBJECTS =  \
+	$(am_src_libsinglebin_users_a_OBJECTS)
+src_libsinglebin_vdir_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_vdir_a_LIBADD =
+am__src_libsinglebin_vdir_a_SOURCES_DIST = src/coreutils-vdir.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_vdir_a_OBJECTS = src/src_libsinglebin_vdir_a-coreutils-vdir.$(OBJEXT)
+src_libsinglebin_vdir_a_OBJECTS =  \
+	$(am_src_libsinglebin_vdir_a_OBJECTS)
+src_libsinglebin_wc_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_wc_a_LIBADD =
+am__src_libsinglebin_wc_a_SOURCES_DIST = src/wc.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_wc_a_OBJECTS =  \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_wc_a-wc.$(OBJEXT)
+src_libsinglebin_wc_a_OBJECTS = $(am_src_libsinglebin_wc_a_OBJECTS)
+src_libsinglebin_who_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_who_a_LIBADD =
+am__src_libsinglebin_who_a_SOURCES_DIST = src/who.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_who_a_OBJECTS =  \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_who_a-who.$(OBJEXT)
+src_libsinglebin_who_a_OBJECTS = $(am_src_libsinglebin_who_a_OBJECTS)
+src_libsinglebin_whoami_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_whoami_a_LIBADD =
+am__src_libsinglebin_whoami_a_SOURCES_DIST = src/whoami.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_whoami_a_OBJECTS = src/src_libsinglebin_whoami_a-whoami.$(OBJEXT)
+src_libsinglebin_whoami_a_OBJECTS =  \
+	$(am_src_libsinglebin_whoami_a_OBJECTS)
+src_libsinglebin_yes_a_AR = $(AR) $(ARFLAGS)
+src_libsinglebin_yes_a_LIBADD =
+am__src_libsinglebin_yes_a_SOURCES_DIST = src/yes.c
+@SINGLE_BINARY_TRUE@am_src_libsinglebin_yes_a_OBJECTS =  \
+@SINGLE_BINARY_TRUE@	src/src_libsinglebin_yes_a-yes.$(OBJEXT)
+src_libsinglebin_yes_a_OBJECTS = $(am_src_libsinglebin_yes_a_OBJECTS)
 src_libver_a_AR = $(AR) $(ARFLAGS)
 src_libver_a_LIBADD =
 nodist_src_libver_a_OBJECTS = src/version.$(OBJEXT)
 src_libver_a_OBJECTS = $(nodist_src_libver_a_OBJECTS)
-am__EXEEXT_1 = src/arch$(EXEEXT) src/hostname$(EXEEXT)
+am__EXEEXT_1 = src/arch$(EXEEXT) src/coreutils$(EXEEXT) \
+	src/hostname$(EXEEXT)
 am__EXEEXT_2 = src/chroot$(EXEEXT) src/df$(EXEEXT) src/hostid$(EXEEXT) \
 	src/libstdbuf.so$(EXEEXT) src/nice$(EXEEXT) src/pinky$(EXEEXT) \
 	src/stdbuf$(EXEEXT) src/stty$(EXEEXT) src/uptime$(EXEEXT) \
@@ -652,9 +1573,17 @@ src_cksum_DEPENDENCIES = $(am__DEPENDENCIES_2)
 src_comm_SOURCES = src/comm.c
 src_comm_OBJECTS = src/comm.$(OBJEXT)
 src_comm_DEPENDENCIES = $(am__DEPENDENCIES_2)
-am__objects_4 = src/copy.$(OBJEXT) src/cp-hash.$(OBJEXT) \
+am_src_coreutils_OBJECTS = src/src_coreutils-coreutils.$(OBJEXT)
+nodist_src_coreutils_OBJECTS =
+src_coreutils_OBJECTS = $(am_src_coreutils_OBJECTS) \
+	$(nodist_src_coreutils_OBJECTS)
+src_coreutils_LINK = $(CCLD) $(src_coreutils_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+am__objects_13 = src/copy.$(OBJEXT) src/cp-hash.$(OBJEXT) \
 	src/extent-scan.$(OBJEXT)
-am_src_cp_OBJECTS = src/cp.$(OBJEXT) $(am__objects_4)
+am__objects_14 = src/selinux.$(OBJEXT)
+am_src_cp_OBJECTS = src/cp.$(OBJEXT) $(am__objects_13) \
+	$(am__objects_14)
 src_cp_OBJECTS = $(am_src_cp_OBJECTS)
 am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -681,7 +1610,7 @@ am_src_dir_OBJECTS = src/ls.$(OBJEXT) src/ls-dir.$(OBJEXT)
 src_dir_OBJECTS = $(am_src_dir_OBJECTS)
 am__DEPENDENCIES_5 = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 src_dir_DEPENDENCIES = $(am__DEPENDENCIES_5)
 src_dircolors_SOURCES = src/dircolors.c
 src_dircolors_OBJECTS = src/dircolors.$(OBJEXT)
@@ -721,11 +1650,13 @@ src_getlimits_SOURCES = src/getlimits.c
 src_getlimits_OBJECTS = src/getlimits.$(OBJEXT)
 src_getlimits_DEPENDENCIES = $(am__DEPENDENCIES_2) \
 	$(am__DEPENDENCIES_1)
-am__objects_5 = src/src_ginstall-copy.$(OBJEXT) \
+am__objects_15 = src/src_ginstall-copy.$(OBJEXT) \
 	src/src_ginstall-cp-hash.$(OBJEXT) \
 	src/src_ginstall-extent-scan.$(OBJEXT)
+am__objects_16 = src/src_ginstall-selinux.$(OBJEXT)
 am_src_ginstall_OBJECTS = src/src_ginstall-install.$(OBJEXT) \
-	src/src_ginstall-prog-fprintf.$(OBJEXT) $(am__objects_5)
+	src/src_ginstall-prog-fprintf.$(OBJEXT) $(am__objects_15) \
+	$(am__objects_16)
 src_ginstall_OBJECTS = $(am_src_ginstall_OBJECTS)
 src_ginstall_DEPENDENCIES = $(am__DEPENDENCIES_2) \
 	$(am__DEPENDENCIES_4) $(am__DEPENDENCIES_1) \
@@ -745,7 +1676,8 @@ src_hostname_DEPENDENCIES = $(am__DEPENDENCIES_2) \
 	$(am__DEPENDENCIES_1)
 am_src_id_OBJECTS = src/id.$(OBJEXT) src/group-list.$(OBJEXT)
 src_id_OBJECTS = $(am_src_id_OBJECTS)
-src_id_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
+src_id_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 src_join_SOURCES = src/join.c
 src_join_OBJECTS = src/join.$(OBJEXT)
 src_join_DEPENDENCIES = $(am__DEPENDENCIES_2)
@@ -754,7 +1686,7 @@ src_kill_OBJECTS = $(am_src_kill_OBJECTS)
 src_kill_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
 src_libstdbuf_so_SOURCES = src/libstdbuf.c
 src_libstdbuf_so_OBJECTS = src/src_libstdbuf_so-libstdbuf.$(OBJEXT)
-src_libstdbuf_so_DEPENDENCIES =
+src_libstdbuf_so_DEPENDENCIES = $(am__DEPENDENCIES_1)
 src_libstdbuf_so_LINK = $(CCLD) $(src_libstdbuf_so_CFLAGS) $(CFLAGS) \
 	$(src_libstdbuf_so_LDFLAGS) $(LDFLAGS) -o $@
 src_link_SOURCES = src/link.c
@@ -770,27 +1702,31 @@ am_src_ls_OBJECTS = src/ls.$(OBJEXT) src/ls-ls.$(OBJEXT)
 src_ls_OBJECTS = $(am_src_ls_OBJECTS)
 src_ls_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 src_make_prime_list_SOURCES = src/make-prime-list.c
 src_make_prime_list_OBJECTS = src/make-prime-list.$(OBJEXT)
 src_make_prime_list_DEPENDENCIES =
 src_md5sum_SOURCES = src/md5sum.c
 src_md5sum_OBJECTS = src/src_md5sum-md5sum.$(OBJEXT)
-src_md5sum_DEPENDENCIES = $(am__DEPENDENCIES_2)
-am_src_mkdir_OBJECTS = src/mkdir.$(OBJEXT) src/prog-fprintf.$(OBJEXT)
+src_md5sum_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
+am_src_mkdir_OBJECTS = src/mkdir.$(OBJEXT) src/prog-fprintf.$(OBJEXT) \
+	$(am__objects_14)
 src_mkdir_OBJECTS = $(am_src_mkdir_OBJECTS)
-src_mkdir_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
-src_mkfifo_SOURCES = src/mkfifo.c
-src_mkfifo_OBJECTS = src/mkfifo.$(OBJEXT)
-src_mkfifo_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
-src_mknod_SOURCES = src/mknod.c
-src_mknod_OBJECTS = src/mknod.$(OBJEXT)
-src_mknod_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
+src_mkdir_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+am_src_mkfifo_OBJECTS = src/mkfifo.$(OBJEXT) $(am__objects_14)
+src_mkfifo_OBJECTS = $(am_src_mkfifo_OBJECTS)
+src_mkfifo_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+am_src_mknod_OBJECTS = src/mknod.$(OBJEXT) $(am__objects_14)
+src_mknod_OBJECTS = $(am_src_mknod_OBJECTS)
+src_mknod_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 src_mktemp_SOURCES = src/mktemp.c
 src_mktemp_OBJECTS = src/mktemp.$(OBJEXT)
 src_mktemp_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_src_mv_OBJECTS = src/mv.$(OBJEXT) src/remove.$(OBJEXT) \
-	$(am__objects_4)
+	$(am__objects_13) $(am__objects_14)
 src_mv_OBJECTS = $(am_src_mv_OBJECTS)
 am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
 src_mv_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_4) \
@@ -809,9 +1745,7 @@ src_nproc_OBJECTS = src/nproc.$(OBJEXT)
 src_nproc_DEPENDENCIES = $(am__DEPENDENCIES_2)
 src_numfmt_SOURCES = src/numfmt.c
 src_numfmt_OBJECTS = src/numfmt.$(OBJEXT)
-src_numfmt_LDADD = $(LDADD)
-src_numfmt_DEPENDENCIES = src/libver.a lib/libcoreutils.a \
-	$(am__DEPENDENCIES_1) lib/libcoreutils.a
+src_numfmt_DEPENDENCIES = $(am__DEPENDENCIES_2)
 src_od_SOURCES = src/od.c
 src_od_OBJECTS = src/od.$(OBJEXT)
 src_od_DEPENDENCIES = $(am__DEPENDENCIES_2)
@@ -858,24 +1792,25 @@ src_runcon_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
 src_seq_SOURCES = src/seq.c
 src_seq_OBJECTS = src/seq.$(OBJEXT)
 src_seq_DEPENDENCIES = $(am__DEPENDENCIES_2)
-src_setuidgid_SOURCES = src/setuidgid.c
-src_setuidgid_OBJECTS = src/setuidgid.$(OBJEXT)
-src_setuidgid_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_src_sha1sum_OBJECTS = src/src_sha1sum-md5sum.$(OBJEXT)
 src_sha1sum_OBJECTS = $(am_src_sha1sum_OBJECTS)
-src_sha1sum_DEPENDENCIES = $(am__DEPENDENCIES_2)
+src_sha1sum_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
 am_src_sha224sum_OBJECTS = src/src_sha224sum-md5sum.$(OBJEXT)
 src_sha224sum_OBJECTS = $(am_src_sha224sum_OBJECTS)
-src_sha224sum_DEPENDENCIES = $(am__DEPENDENCIES_2)
+src_sha224sum_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+	$(am__DEPENDENCIES_1)
 am_src_sha256sum_OBJECTS = src/src_sha256sum-md5sum.$(OBJEXT)
 src_sha256sum_OBJECTS = $(am_src_sha256sum_OBJECTS)
-src_sha256sum_DEPENDENCIES = $(am__DEPENDENCIES_2)
+src_sha256sum_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+	$(am__DEPENDENCIES_1)
 am_src_sha384sum_OBJECTS = src/src_sha384sum-md5sum.$(OBJEXT)
 src_sha384sum_OBJECTS = $(am_src_sha384sum_OBJECTS)
-src_sha384sum_DEPENDENCIES = $(am__DEPENDENCIES_2)
+src_sha384sum_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+	$(am__DEPENDENCIES_1)
 am_src_sha512sum_OBJECTS = src/src_sha512sum-md5sum.$(OBJEXT)
 src_sha512sum_OBJECTS = $(am_src_sha512sum_OBJECTS)
-src_sha512sum_DEPENDENCIES = $(am__DEPENDENCIES_2)
+src_sha512sum_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+	$(am__DEPENDENCIES_1)
 src_shred_SOURCES = src/shred.c
 src_shred_OBJECTS = src/shred.$(OBJEXT)
 src_shred_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
@@ -888,14 +1823,16 @@ src_sleep_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
 src_sort_SOURCES = src/sort.c
 src_sort_OBJECTS = src/sort.$(OBJEXT)
 src_sort_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 src_split_SOURCES = src/split.c
 src_split_OBJECTS = src/split.$(OBJEXT)
 src_split_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
 am_src_stat_OBJECTS = src/stat.$(OBJEXT) \
 	src/find-mount-point.$(OBJEXT)
 src_stat_OBJECTS = $(am_src_stat_OBJECTS)
-src_stat_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
+src_stat_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 src_stdbuf_SOURCES = src/stdbuf.c
 src_stdbuf_OBJECTS = src/stdbuf.$(OBJEXT)
 src_stdbuf_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
@@ -977,6 +1914,18 @@ src_whoami_DEPENDENCIES = $(am__DEPENDENCIES_2)
 src_yes_SOURCES = src/yes.c
 src_yes_OBJECTS = src/yes.$(OBJEXT)
 src_yes_DEPENDENCIES = $(am__DEPENDENCIES_2)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/lib
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -984,30 +1933,139 @@ am__mv = mv -f
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+am__yacc_c2h = sed -e s/cc$$/hh/ -e s/cpp$$/hpp/ -e s/cxx$$/hxx/ \
+		   -e s/c++$$/h++/ -e s/c$$/h/
 YACCCOMPILE = $(YACC) $(AM_YFLAGS) $(YFLAGS)
 AM_V_YACC = $(am__v_YACC_@AM_V@)
 am__v_YACC_ = $(am__v_YACC_@AM_DEFAULT_V@)
-am__v_YACC_0 = @echo "  YACC  " $@;
+am__v_YACC_0 = @echo "  YACC    " $@;
+am__v_YACC_1 = 
 YLWRAP = $(top_srcdir)/build-aux/ylwrap
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(lib_libcoreutils_a_SOURCES) \
 	$(EXTRA_lib_libcoreutils_a_SOURCES) \
+	$(src_libsinglebin___a_SOURCES) \
+	$(src_libsinglebin_arch_a_SOURCES) \
+	$(src_libsinglebin_base64_a_SOURCES) \
+	$(src_libsinglebin_basename_a_SOURCES) \
+	$(src_libsinglebin_cat_a_SOURCES) \
+	$(src_libsinglebin_chcon_a_SOURCES) \
+	$(src_libsinglebin_chgrp_a_SOURCES) \
+	$(src_libsinglebin_chmod_a_SOURCES) \
+	$(src_libsinglebin_chown_a_SOURCES) \
+	$(src_libsinglebin_chroot_a_SOURCES) \
+	$(src_libsinglebin_cksum_a_SOURCES) \
+	$(src_libsinglebin_comm_a_SOURCES) \
+	$(src_libsinglebin_cp_a_SOURCES) \
+	$(src_libsinglebin_csplit_a_SOURCES) \
+	$(src_libsinglebin_cut_a_SOURCES) \
+	$(src_libsinglebin_date_a_SOURCES) \
+	$(src_libsinglebin_dd_a_SOURCES) \
+	$(src_libsinglebin_df_a_SOURCES) \
+	$(src_libsinglebin_dir_a_SOURCES) \
+	$(src_libsinglebin_dircolors_a_SOURCES) \
+	$(src_libsinglebin_dirname_a_SOURCES) \
+	$(src_libsinglebin_du_a_SOURCES) \
+	$(src_libsinglebin_echo_a_SOURCES) \
+	$(src_libsinglebin_env_a_SOURCES) \
+	$(src_libsinglebin_expand_a_SOURCES) \
+	$(src_libsinglebin_expr_a_SOURCES) \
+	$(src_libsinglebin_factor_a_SOURCES) \
+	$(src_libsinglebin_false_a_SOURCES) \
+	$(src_libsinglebin_fmt_a_SOURCES) \
+	$(src_libsinglebin_fold_a_SOURCES) \
+	$(src_libsinglebin_ginstall_a_SOURCES) \
+	$(src_libsinglebin_groups_a_SOURCES) \
+	$(src_libsinglebin_head_a_SOURCES) \
+	$(src_libsinglebin_hostid_a_SOURCES) \
+	$(src_libsinglebin_hostname_a_SOURCES) \
+	$(src_libsinglebin_id_a_SOURCES) \
+	$(src_libsinglebin_join_a_SOURCES) \
+	$(src_libsinglebin_kill_a_SOURCES) \
+	$(src_libsinglebin_link_a_SOURCES) \
+	$(src_libsinglebin_ln_a_SOURCES) \
+	$(src_libsinglebin_logname_a_SOURCES) \
+	$(src_libsinglebin_ls_a_SOURCES) \
+	$(src_libsinglebin_md5sum_a_SOURCES) \
+	$(src_libsinglebin_mkdir_a_SOURCES) \
+	$(src_libsinglebin_mkfifo_a_SOURCES) \
+	$(src_libsinglebin_mknod_a_SOURCES) \
+	$(src_libsinglebin_mktemp_a_SOURCES) \
+	$(src_libsinglebin_mv_a_SOURCES) \
+	$(src_libsinglebin_nice_a_SOURCES) \
+	$(src_libsinglebin_nl_a_SOURCES) \
+	$(src_libsinglebin_nohup_a_SOURCES) \
+	$(src_libsinglebin_nproc_a_SOURCES) \
+	$(src_libsinglebin_numfmt_a_SOURCES) \
+	$(src_libsinglebin_od_a_SOURCES) \
+	$(src_libsinglebin_paste_a_SOURCES) \
+	$(src_libsinglebin_pathchk_a_SOURCES) \
+	$(src_libsinglebin_pinky_a_SOURCES) \
+	$(src_libsinglebin_pr_a_SOURCES) \
+	$(src_libsinglebin_printenv_a_SOURCES) \
+	$(src_libsinglebin_printf_a_SOURCES) \
+	$(src_libsinglebin_ptx_a_SOURCES) \
+	$(src_libsinglebin_pwd_a_SOURCES) \
+	$(src_libsinglebin_readlink_a_SOURCES) \
+	$(src_libsinglebin_realpath_a_SOURCES) \
+	$(src_libsinglebin_rm_a_SOURCES) \
+	$(src_libsinglebin_rmdir_a_SOURCES) \
+	$(src_libsinglebin_runcon_a_SOURCES) \
+	$(src_libsinglebin_seq_a_SOURCES) \
+	$(src_libsinglebin_sha1sum_a_SOURCES) \
+	$(src_libsinglebin_sha224sum_a_SOURCES) \
+	$(src_libsinglebin_sha256sum_a_SOURCES) \
+	$(src_libsinglebin_sha384sum_a_SOURCES) \
+	$(src_libsinglebin_sha512sum_a_SOURCES) \
+	$(src_libsinglebin_shred_a_SOURCES) \
+	$(src_libsinglebin_shuf_a_SOURCES) \
+	$(src_libsinglebin_sleep_a_SOURCES) \
+	$(src_libsinglebin_sort_a_SOURCES) \
+	$(src_libsinglebin_split_a_SOURCES) \
+	$(src_libsinglebin_stat_a_SOURCES) \
+	$(src_libsinglebin_stdbuf_a_SOURCES) \
+	$(src_libsinglebin_stty_a_SOURCES) \
+	$(src_libsinglebin_sum_a_SOURCES) \
+	$(src_libsinglebin_sync_a_SOURCES) \
+	$(src_libsinglebin_tac_a_SOURCES) \
+	$(src_libsinglebin_tail_a_SOURCES) \
+	$(src_libsinglebin_tee_a_SOURCES) \
+	$(src_libsinglebin_test_a_SOURCES) \
+	$(src_libsinglebin_timeout_a_SOURCES) \
+	$(src_libsinglebin_touch_a_SOURCES) \
+	$(src_libsinglebin_tr_a_SOURCES) \
+	$(src_libsinglebin_true_a_SOURCES) \
+	$(src_libsinglebin_truncate_a_SOURCES) \
+	$(src_libsinglebin_tsort_a_SOURCES) \
+	$(src_libsinglebin_tty_a_SOURCES) \
+	$(src_libsinglebin_uname_a_SOURCES) \
+	$(src_libsinglebin_unexpand_a_SOURCES) \
+	$(src_libsinglebin_uniq_a_SOURCES) \
+	$(src_libsinglebin_unlink_a_SOURCES) \
+	$(src_libsinglebin_uptime_a_SOURCES) \
+	$(src_libsinglebin_users_a_SOURCES) \
+	$(src_libsinglebin_vdir_a_SOURCES) \
+	$(src_libsinglebin_wc_a_SOURCES) \
+	$(src_libsinglebin_who_a_SOURCES) \
+	$(src_libsinglebin_whoami_a_SOURCES) \
+	$(src_libsinglebin_yes_a_SOURCES) \
 	$(nodist_src_libver_a_SOURCES) $(src___SOURCES) \
 	$(src_arch_SOURCES) src/base64.c src/basename.c src/cat.c \
 	src/chcon.c $(src_chgrp_SOURCES) src/chmod.c \
 	$(src_chown_SOURCES) src/chroot.c src/cksum.c src/comm.c \
+	$(src_coreutils_SOURCES) $(nodist_src_coreutils_SOURCES) \
 	$(src_cp_SOURCES) src/csplit.c src/cut.c src/date.c src/dd.c \
 	$(src_df_SOURCES) $(src_dir_SOURCES) src/dircolors.c \
 	src/dirname.c src/du.c src/echo.c src/env.c src/expand.c \
@@ -1017,52 +2075,186 @@ SOURCES = $(lib_libcoreutils_a_SOURCES) \
 	src/join.c $(src_kill_SOURCES) src/libstdbuf.c src/link.c \
 	$(src_ln_SOURCES) src/logname.c $(src_ls_SOURCES) \
 	src/make-prime-list.c src/md5sum.c $(src_mkdir_SOURCES) \
-	src/mkfifo.c src/mknod.c src/mktemp.c $(src_mv_SOURCES) \
-	src/nice.c src/nl.c src/nohup.c src/nproc.c src/numfmt.c \
-	src/od.c src/paste.c src/pathchk.c src/pinky.c src/pr.c \
-	src/printenv.c src/printf.c src/ptx.c src/pwd.c src/readlink.c \
-	$(src_realpath_SOURCES) $(src_rm_SOURCES) $(src_rmdir_SOURCES) \
-	src/runcon.c src/seq.c src/setuidgid.c $(src_sha1sum_SOURCES) \
-	$(src_sha224sum_SOURCES) $(src_sha256sum_SOURCES) \
-	$(src_sha384sum_SOURCES) $(src_sha512sum_SOURCES) src/shred.c \
-	src/shuf.c src/sleep.c src/sort.c src/split.c \
-	$(src_stat_SOURCES) src/stdbuf.c src/stty.c src/sum.c \
-	src/sync.c src/tac.c src/tail.c src/tee.c src/test.c \
-	$(src_timeout_SOURCES) src/touch.c src/tr.c src/true.c \
-	src/truncate.c src/tsort.c src/tty.c $(src_uname_SOURCES) \
-	src/unexpand.c src/uniq.c src/unlink.c src/uptime.c \
-	src/users.c $(src_vdir_SOURCES) src/wc.c src/who.c \
-	src/whoami.c src/yes.c
+	$(src_mkfifo_SOURCES) $(src_mknod_SOURCES) src/mktemp.c \
+	$(src_mv_SOURCES) src/nice.c src/nl.c src/nohup.c src/nproc.c \
+	src/numfmt.c src/od.c src/paste.c src/pathchk.c src/pinky.c \
+	src/pr.c src/printenv.c src/printf.c src/ptx.c src/pwd.c \
+	src/readlink.c $(src_realpath_SOURCES) $(src_rm_SOURCES) \
+	$(src_rmdir_SOURCES) src/runcon.c src/seq.c \
+	$(src_sha1sum_SOURCES) $(src_sha224sum_SOURCES) \
+	$(src_sha256sum_SOURCES) $(src_sha384sum_SOURCES) \
+	$(src_sha512sum_SOURCES) src/shred.c src/shuf.c src/sleep.c \
+	src/sort.c src/split.c $(src_stat_SOURCES) src/stdbuf.c \
+	src/stty.c src/sum.c src/sync.c src/tac.c src/tail.c src/tee.c \
+	src/test.c $(src_timeout_SOURCES) src/touch.c src/tr.c \
+	src/true.c src/truncate.c src/tsort.c src/tty.c \
+	$(src_uname_SOURCES) src/unexpand.c src/uniq.c src/unlink.c \
+	src/uptime.c src/users.c $(src_vdir_SOURCES) src/wc.c \
+	src/who.c src/whoami.c src/yes.c
 DIST_SOURCES = $(am__lib_libcoreutils_a_SOURCES_DIST) \
-	$(EXTRA_lib_libcoreutils_a_SOURCES) $(src___SOURCES) \
+	$(EXTRA_lib_libcoreutils_a_SOURCES) \
+	$(am__src_libsinglebin___a_SOURCES_DIST) \
+	$(am__src_libsinglebin_arch_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_base64_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_basename_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_cat_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_chcon_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_chgrp_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_chmod_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_chown_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_chroot_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_cksum_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_comm_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_cp_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_csplit_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_cut_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_date_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_dd_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_df_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_dir_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_dircolors_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_dirname_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_du_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_echo_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_env_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_expand_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_expr_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_factor_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_false_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_fmt_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_fold_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_ginstall_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_groups_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_head_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_hostid_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_hostname_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_id_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_join_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_kill_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_link_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_ln_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_logname_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_ls_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_md5sum_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_mkdir_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_mkfifo_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_mknod_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_mktemp_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_mv_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_nice_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_nl_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_nohup_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_nproc_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_numfmt_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_od_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_paste_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_pathchk_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_pinky_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_pr_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_printenv_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_printf_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_ptx_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_pwd_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_readlink_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_realpath_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_rm_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_rmdir_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_runcon_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_seq_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_sha1sum_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_sha224sum_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_sha256sum_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_sha384sum_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_sha512sum_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_shred_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_shuf_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_sleep_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_sort_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_split_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_stat_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_stdbuf_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_stty_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_sum_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_sync_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_tac_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_tail_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_tee_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_test_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_timeout_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_touch_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_tr_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_true_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_truncate_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_tsort_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_tty_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_uname_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_unexpand_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_uniq_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_unlink_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_uptime_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_users_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_vdir_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_wc_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_who_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_whoami_a_SOURCES_DIST) \
+	$(am__src_libsinglebin_yes_a_SOURCES_DIST) $(src___SOURCES) \
 	$(src_arch_SOURCES) src/base64.c src/basename.c src/cat.c \
 	src/chcon.c $(src_chgrp_SOURCES) src/chmod.c \
 	$(src_chown_SOURCES) src/chroot.c src/cksum.c src/comm.c \
-	$(src_cp_SOURCES) src/csplit.c src/cut.c src/date.c src/dd.c \
-	$(src_df_SOURCES) $(src_dir_SOURCES) src/dircolors.c \
-	src/dirname.c src/du.c src/echo.c src/env.c src/expand.c \
-	src/expr.c src/factor.c src/false.c src/fmt.c src/fold.c \
-	src/getlimits.c $(src_ginstall_SOURCES) $(src_groups_SOURCES) \
-	src/head.c src/hostid.c src/hostname.c $(src_id_SOURCES) \
-	src/join.c $(src_kill_SOURCES) src/libstdbuf.c src/link.c \
+	$(src_coreutils_SOURCES) $(src_cp_SOURCES) src/csplit.c \
+	src/cut.c src/date.c src/dd.c $(src_df_SOURCES) \
+	$(src_dir_SOURCES) src/dircolors.c src/dirname.c src/du.c \
+	src/echo.c src/env.c src/expand.c src/expr.c src/factor.c \
+	src/false.c src/fmt.c src/fold.c src/getlimits.c \
+	$(src_ginstall_SOURCES) $(src_groups_SOURCES) src/head.c \
+	src/hostid.c src/hostname.c $(src_id_SOURCES) src/join.c \
+	$(src_kill_SOURCES) src/libstdbuf.c src/link.c \
 	$(src_ln_SOURCES) src/logname.c $(src_ls_SOURCES) \
 	src/make-prime-list.c src/md5sum.c $(src_mkdir_SOURCES) \
-	src/mkfifo.c src/mknod.c src/mktemp.c $(src_mv_SOURCES) \
-	src/nice.c src/nl.c src/nohup.c src/nproc.c src/numfmt.c \
-	src/od.c src/paste.c src/pathchk.c src/pinky.c src/pr.c \
-	src/printenv.c src/printf.c src/ptx.c src/pwd.c src/readlink.c \
-	$(src_realpath_SOURCES) $(src_rm_SOURCES) $(src_rmdir_SOURCES) \
-	src/runcon.c src/seq.c src/setuidgid.c $(src_sha1sum_SOURCES) \
-	$(src_sha224sum_SOURCES) $(src_sha256sum_SOURCES) \
-	$(src_sha384sum_SOURCES) $(src_sha512sum_SOURCES) src/shred.c \
-	src/shuf.c src/sleep.c src/sort.c src/split.c \
-	$(src_stat_SOURCES) src/stdbuf.c src/stty.c src/sum.c \
-	src/sync.c src/tac.c src/tail.c src/tee.c src/test.c \
-	$(src_timeout_SOURCES) src/touch.c src/tr.c src/true.c \
-	src/truncate.c src/tsort.c src/tty.c $(src_uname_SOURCES) \
-	src/unexpand.c src/uniq.c src/unlink.c src/uptime.c \
-	src/users.c $(src_vdir_SOURCES) src/wc.c src/who.c \
-	src/whoami.c src/yes.c
+	$(src_mkfifo_SOURCES) $(src_mknod_SOURCES) src/mktemp.c \
+	$(src_mv_SOURCES) src/nice.c src/nl.c src/nohup.c src/nproc.c \
+	src/numfmt.c src/od.c src/paste.c src/pathchk.c src/pinky.c \
+	src/pr.c src/printenv.c src/printf.c src/ptx.c src/pwd.c \
+	src/readlink.c $(src_realpath_SOURCES) $(src_rm_SOURCES) \
+	$(src_rmdir_SOURCES) src/runcon.c src/seq.c \
+	$(src_sha1sum_SOURCES) $(src_sha224sum_SOURCES) \
+	$(src_sha256sum_SOURCES) $(src_sha384sum_SOURCES) \
+	$(src_sha512sum_SOURCES) src/shred.c src/shuf.c src/sleep.c \
+	src/sort.c src/split.c $(src_stat_SOURCES) src/stdbuf.c \
+	src/stty.c src/sum.c src/sync.c src/tac.c src/tail.c src/tee.c \
+	src/test.c $(src_timeout_SOURCES) src/touch.c src/tr.c \
+	src/true.c src/truncate.c src/tsort.c src/tty.c \
+	$(src_uname_SOURCES) src/unexpand.c src/uniq.c src/unlink.c \
+	src/uptime.c src/users.c $(src_vdir_SOURCES) src/wc.c \
+	src/who.c src/whoami.c src/yes.c
+AM_V_DVIPS = $(am__v_DVIPS_@AM_V@)
+am__v_DVIPS_ = $(am__v_DVIPS_@AM_DEFAULT_V@)
+am__v_DVIPS_0 = @echo "  DVIPS   " $@;
+am__v_DVIPS_1 = 
+AM_V_MAKEINFO = $(am__v_MAKEINFO_@AM_V@)
+am__v_MAKEINFO_ = $(am__v_MAKEINFO_@AM_DEFAULT_V@)
+am__v_MAKEINFO_0 = @echo "  MAKEINFO" $@;
+am__v_MAKEINFO_1 = 
+AM_V_INFOHTML = $(am__v_INFOHTML_@AM_V@)
+am__v_INFOHTML_ = $(am__v_INFOHTML_@AM_DEFAULT_V@)
+am__v_INFOHTML_0 = @echo "  INFOHTML" $@;
+am__v_INFOHTML_1 = 
+AM_V_TEXI2DVI = $(am__v_TEXI2DVI_@AM_V@)
+am__v_TEXI2DVI_ = $(am__v_TEXI2DVI_@AM_DEFAULT_V@)
+am__v_TEXI2DVI_0 = @echo "  TEXI2DVI" $@;
+am__v_TEXI2DVI_1 = 
+AM_V_TEXI2PDF = $(am__v_TEXI2PDF_@AM_V@)
+am__v_TEXI2PDF_ = $(am__v_TEXI2PDF_@AM_DEFAULT_V@)
+am__v_TEXI2PDF_0 = @echo "  TEXI2PDF" $@;
+am__v_TEXI2PDF_1 = 
+AM_V_texinfo = $(am__v_texinfo_@AM_V@)
+am__v_texinfo_ = $(am__v_texinfo_@AM_DEFAULT_V@)
+am__v_texinfo_0 = -q
+am__v_texinfo_1 = 
+AM_V_texidevnull = $(am__v_texidevnull_@AM_V@)
+am__v_texidevnull_ = $(am__v_texidevnull_@AM_DEFAULT_V@)
+am__v_texidevnull_0 = > /dev/null
+am__v_texidevnull_1 = 
 INFO_DEPS = $(srcdir)/doc/coreutils.info
 TEXINFO_TEX = $(top_srcdir)/build-aux/texinfo.tex
 am__TEXINFO_TEX_DIR = $(top_srcdir)/build-aux
@@ -1076,13 +2268,14 @@ TEXI2PDF = $(TEXI2DVI) --pdf --batch
 MAKEINFOHTML = $(MAKEINFO) --html
 AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
 DVIPS = dvips
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -1121,112 +2314,210 @@ MANS = $(man1_MANS)
 HEADERS = $(noinst_HEADERS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	check recheck check-html recheck-html distdir dist dist-all \
-	distcheck
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	cscope check recheck distdir dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-# If stdout is a non-dumb tty, use colors.  If test -t is not supported,
-# then this fails; a conservative approach.  Of course do not redirect
-# stdout here, just stderr.
-am__tty_colors = \
-red=; grn=; lgn=; blu=; std=; \
-test "X$(AM_COLOR_TESTS)" != Xno \
-&& test "X$$TERM" != Xdumb \
-&& { test "X$(AM_COLOR_TESTS)" = Xalways || test -t 1 2>/dev/null; } \
-&& { \
-  red=''; \
-  grn=''; \
-  lgn=''; \
-  blu=''; \
-  std=''; \
+CSCOPE = cscope
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red=''; \
+    grn=''; \
+    lgn=''; \
+    blu=''; \
+    mgn=''; \
+    brg=''; \
+    std=''; \
+  fi; \
 }
-# Restructured Text title and section.
-am__rst_title = sed 's/.*/   &   /;h;s/./=/g;p;x;p;g;p;s/.*//'
-am__rst_section = sed 'p;s/./=/g;p;g'
-# Put stdin (possibly several lines separated by ".  ") in a box.
-# Prefix each line by 'col' and terminate each with 'std', for coloring.
-# Multi line coloring is problematic with "less -R", so we really need
-# to color each line individually.
-am__text_box = $(AWK) '{			\
-  n = split($$0, lines, "\\.  "); max = 0;	\
-  for (i = 1; i <= n; ++i)			\
-    if (max < length(lines[i]))			\
-      max = length(lines[i]);			\
-  for (i = 0; i < max; ++i)			\
-    line = line "=";				\
-  print col line std;				\
-  for (i = 1; i <= n; ++i)			\
-    if (lines[i])				\
-      print col lines[i] std;			\
-  print col line std;				\
+am__recheck_rx = ^[ 	]*:recheck:[ 	]*
+am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
+am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+  recheck = 1; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+        { \
+          if ((getline line2 < ($$0 ".log")) < 0) \
+	    recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+        { \
+          recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+        { \
+          break; \
+        } \
+    }; \
+  if (recheck) \
+    print $$0; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
 }'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+  print "fatal: making $@: " msg | "cat >&2"; \
+  exit 1; \
+} \
+function rst_section(header) \
+{ \
+  print header; \
+  len = length(header); \
+  for (i = 1; i <= len; i = i + 1) \
+    printf "="; \
+  printf "\n\n"; \
+} \
+{ \
+  copy_in_global_log = 1; \
+  global_test_result = "RUN"; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+         fatal("failed to read from " $$0 ".trs"); \
+      if (line ~ /$(am__global_test_result_rx)/) \
+        { \
+          sub("$(am__global_test_result_rx)", "", line); \
+          sub("[ 	]*$$", "", line); \
+          global_test_result = line; \
+        } \
+      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+        copy_in_global_log = 0; \
+    }; \
+  if (copy_in_global_log) \
+    { \
+      rst_section(global_test_result ": " $$0); \
+      while ((rc = (getline line < ($$0 ".log"))) != 0) \
+      { \
+        if (rc < 0) \
+          fatal("failed to read from " $$0 ".log"); \
+        print line; \
+      }; \
+      printf "\n"; \
+    }; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
 # Solaris 10 'make', and several other traditional 'make' implementations,
 # pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
 # by disabling -e (using the XSI extension "set +e") if it's set.
 am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
 # To be inserted before the command running the test.  Creates the
 # directory for the log if needed.  Stores in $dir the directory
-# containing $f, in $tst the test, in $log the log, and passes
-# TESTS_ENVIRONMENT.  Save and restore TERM around use of
-# TESTS_ENVIRONMENT, in case that unsets it.
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
 am__check_pre = \
 $(am__sh_e_setup);					\
 $(am__vpath_adj_setup) $(am__vpath_adj)			\
+$(am__tty_colors);					\
 srcdir=$(srcdir); export srcdir;			\
-rm -f $@-t;						\
-am__trap='rm -f '\''$(abs_builddir)/$@-t'\''; (exit $$st); exit $$st'; \
-trap "st=129; $$am__trap" 1; trap "st=130; $$am__trap" 2;	\
-trap "st=141; $$am__trap" 13; trap "st=143; $$am__trap" 15; \
-am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;		\
-test "x$$am__odir" = x. || $(MKDIR_P) "$$am__odir" || exit $$?;	\
+case "$@" in						\
+  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
+    *) am__odir=.;; 					\
+esac;							\
+test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
+  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
 if test -f "./$$f"; then dir=./;			\
 elif test -f "$$f"; then dir=;				\
 else dir="$(srcdir)/"; fi;				\
-tst=$$dir$$f; log='$@'; __SAVED_TERM=$$TERM;		\
-$(TESTS_ENVIRONMENT)
-# To be appended to the command running the test.  Handle the stdout
-# and stderr redirection, and catch the exit status.
-am__check_post = \
->$@-t 2>&1;						\
-estatus=$$?;						\
-if test -n '$(DISABLE_HARD_ERRORS)'			\
-   && test $$estatus -eq 99; then			\
-  estatus=1;						\
-fi;							\
-TERM=$$__SAVED_TERM; export TERM;			\
-$(am__tty_colors);					\
-xfailed=PASS;						\
+tst=$$dir$$f; log='$@'; 				\
+if test -n '$(DISABLE_HARD_ERRORS)'; then		\
+  am__enable_hard_errors=no; 				\
+else							\
+  am__enable_hard_errors=yes; 				\
+fi; 							\
 case " $(XFAIL_TESTS) " in				\
   *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
-    xfailed=XFAIL;;					\
-esac;							\
-case $$estatus.$$xfailed in				\
-    0.XFAIL) col=$$red; res=XPASS;;			\
-    0.*)     col=$$grn; res=PASS ;;			\
-    77.*)    col=$$blu; res=SKIP ;;			\
-    99.*)    col=$$red; res=FAIL ;;			\
-    *.XFAIL) col=$$lgn; res=XFAIL;;			\
-    *.*)     col=$$red; res=FAIL ;;			\
-esac;							\
-echo "$${col}$$res$${std}: $$f";			\
-echo "$$res: $$f (exit: $$estatus)" |			\
-  $(am__rst_section) >$@;				\
-cat $@-t >>$@;						\
-rm -f $@-t
+    am__expect_failure=yes;;				\
+  *)							\
+    am__expect_failure=no;;				\
+esac; 							\
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+  bases=`echo $$bases`
 RECHECK_LOGS = $(TEST_LOGS)
-TEST_SUITE_HTML = $(TEST_SUITE_LOG:.log=.html)
 am__test_logs1 = $(TESTS:=.log)
 am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
 am__test_logs3 = $(am__test_logs2:.sh.log=.log)
+SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver
 SH_LOG_COMPILE = $(SH_LOG_COMPILER) $(AM_SH_LOG_FLAGS) $(SH_LOG_FLAGS)
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
 am__test_logs4 = $(am__test_logs3:.pl.log=.log)
+PL_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver
 PL_LOG_COMPILE = $(PL_LOG_COMPILER) $(AM_PL_LOG_FLAGS) $(PL_LOG_FLAGS)
 TEST_LOGS = $(am__test_logs4:.xpl.log=.log)
+XPL_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver
 XPL_LOG_COMPILE = $(XPL_LOG_COMPILER) $(AM_XPL_LOG_FLAGS) \
 	$(XPL_LOG_FLAGS)
-TEST_LOGS_TMP = $(TEST_LOGS:.log=.log-t)
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
@@ -1237,6 +2528,7 @@ am__remove_distdir = \
       && rm -rf "$(distdir)" \
       || { sleep 5 && rm -rf "$(distdir)"; }; \
   else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -1264,6 +2556,7 @@ am__relativize = \
   reldir="$$dir2"
 GZIP_ENV = --best
 DIST_ARCHIVES = $(distdir).tar.xz
+DIST_TARGETS = dist-xz
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -1543,27 +2836,6 @@ GNULIB_PIPE = @GNULIB_PIPE@
 GNULIB_PIPE2 = @GNULIB_PIPE2@
 GNULIB_POPEN = @GNULIB_POPEN@
 GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@
-GNULIB_POSIX_SPAWN = @GNULIB_POSIX_SPAWN@
-GNULIB_POSIX_SPAWNATTR_DESTROY = @GNULIB_POSIX_SPAWNATTR_DESTROY@
-GNULIB_POSIX_SPAWNATTR_GETFLAGS = @GNULIB_POSIX_SPAWNATTR_GETFLAGS@
-GNULIB_POSIX_SPAWNATTR_GETPGROUP = @GNULIB_POSIX_SPAWNATTR_GETPGROUP@
-GNULIB_POSIX_SPAWNATTR_GETSCHEDPARAM = @GNULIB_POSIX_SPAWNATTR_GETSCHEDPARAM@
-GNULIB_POSIX_SPAWNATTR_GETSCHEDPOLICY = @GNULIB_POSIX_SPAWNATTR_GETSCHEDPOLICY@
-GNULIB_POSIX_SPAWNATTR_GETSIGDEFAULT = @GNULIB_POSIX_SPAWNATTR_GETSIGDEFAULT@
-GNULIB_POSIX_SPAWNATTR_GETSIGMASK = @GNULIB_POSIX_SPAWNATTR_GETSIGMASK@
-GNULIB_POSIX_SPAWNATTR_INIT = @GNULIB_POSIX_SPAWNATTR_INIT@
-GNULIB_POSIX_SPAWNATTR_SETFLAGS = @GNULIB_POSIX_SPAWNATTR_SETFLAGS@
-GNULIB_POSIX_SPAWNATTR_SETPGROUP = @GNULIB_POSIX_SPAWNATTR_SETPGROUP@
-GNULIB_POSIX_SPAWNATTR_SETSCHEDPARAM = @GNULIB_POSIX_SPAWNATTR_SETSCHEDPARAM@
-GNULIB_POSIX_SPAWNATTR_SETSCHEDPOLICY = @GNULIB_POSIX_SPAWNATTR_SETSCHEDPOLICY@
-GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT = @GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT@
-GNULIB_POSIX_SPAWNATTR_SETSIGMASK = @GNULIB_POSIX_SPAWNATTR_SETSIGMASK@
-GNULIB_POSIX_SPAWNP = @GNULIB_POSIX_SPAWNP@
-GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE@
-GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2@
-GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN@
-GNULIB_POSIX_SPAWN_FILE_ACTIONS_DESTROY = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_DESTROY@
-GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT@
 GNULIB_POWF = @GNULIB_POWF@
 GNULIB_PREAD = @GNULIB_PREAD@
 GNULIB_PRINTF = @GNULIB_PRINTF@
@@ -1606,6 +2878,7 @@ GNULIB_ROUNDL = @GNULIB_ROUNDL@
 GNULIB_RPMATCH = @GNULIB_RPMATCH@
 GNULIB_SCANDIR = @GNULIB_SCANDIR@
 GNULIB_SCANF = @GNULIB_SCANF@
+GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@
 GNULIB_SELECT = @GNULIB_SELECT@
 GNULIB_SEND = @GNULIB_SEND@
 GNULIB_SENDTO = @GNULIB_SENDTO@
@@ -1943,9 +3216,6 @@ HAVE_PIPE2 = @HAVE_PIPE2@
 HAVE_POPEN = @HAVE_POPEN@
 HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@
 HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@
-HAVE_POSIX_SPAWN = @HAVE_POSIX_SPAWN@
-HAVE_POSIX_SPAWNATTR_T = @HAVE_POSIX_SPAWNATTR_T@
-HAVE_POSIX_SPAWN_FILE_ACTIONS_T = @HAVE_POSIX_SPAWN_FILE_ACTIONS_T@
 HAVE_POWF = @HAVE_POWF@
 HAVE_PREAD = @HAVE_PREAD@
 HAVE_PSELECT = @HAVE_PSELECT@
@@ -1976,6 +3246,7 @@ HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = @HAVE_SAME_LONG_DOUBLE_AS_DOUBLE@
 HAVE_SA_FAMILY_T = @HAVE_SA_FAMILY_T@
 HAVE_SCANDIR = @HAVE_SCANDIR@
 HAVE_SCHED_H = @HAVE_SCHED_H@
+HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
 HAVE_SETENV = @HAVE_SETENV@
 HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
 HAVE_SIGACTION = @HAVE_SIGACTION@
@@ -1989,7 +3260,6 @@ HAVE_SINF = @HAVE_SINF@
 HAVE_SINHF = @HAVE_SINHF@
 HAVE_SINL = @HAVE_SINL@
 HAVE_SLEEP = @HAVE_SLEEP@
-HAVE_SPAWN_H = @HAVE_SPAWN_H@
 HAVE_SQRTF = @HAVE_SQRTF@
 HAVE_SQRTL = @HAVE_SQRTL@
 HAVE_STDINT_H = @HAVE_STDINT_H@
@@ -2120,14 +3390,17 @@ LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@
 LIB_ACL = @LIB_ACL@
 LIB_CAP = @LIB_CAP@
 LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@
+LIB_CRYPTO = @LIB_CRYPTO@
 LIB_EACCESS = @LIB_EACCESS@
 LIB_FDATASYNC = @LIB_FDATASYNC@
 LIB_GETHRXTIME = @LIB_GETHRXTIME@
 LIB_GMP = @LIB_GMP@
 LIB_NANOSLEEP = @LIB_NANOSLEEP@
+LIB_NVPAIR = @LIB_NVPAIR@
 LIB_PTHREAD = @LIB_PTHREAD@
 LIB_SELECT = @LIB_SELECT@
 LIB_SELINUX = @LIB_SELINUX@
+LIB_SMACK = @LIB_SMACK@
 LIB_TIMER_TIME = @LIB_TIMER_TIME@
 LIB_XATTR = @LIB_XATTR@
 LN_S = @LN_S@
@@ -2169,7 +3442,6 @@ NEXT_AS_FIRST_DIRECTIVE_PTHREAD_H = @NEXT_AS_FIRST_DIRECTIVE_PTHREAD_H@
 NEXT_AS_FIRST_DIRECTIVE_SCHED_H = @NEXT_AS_FIRST_DIRECTIVE_SCHED_H@
 NEXT_AS_FIRST_DIRECTIVE_SELINUX_SELINUX_H = @NEXT_AS_FIRST_DIRECTIVE_SELINUX_SELINUX_H@
 NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H = @NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H@
-NEXT_AS_FIRST_DIRECTIVE_SPAWN_H = @NEXT_AS_FIRST_DIRECTIVE_SPAWN_H@
 NEXT_AS_FIRST_DIRECTIVE_STDARG_H = @NEXT_AS_FIRST_DIRECTIVE_STDARG_H@
 NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
 NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@
@@ -2208,7 +3480,6 @@ NEXT_PTHREAD_H = @NEXT_PTHREAD_H@
 NEXT_SCHED_H = @NEXT_SCHED_H@
 NEXT_SELINUX_SELINUX_H = @NEXT_SELINUX_SELINUX_H@
 NEXT_SIGNAL_H = @NEXT_SIGNAL_H@
-NEXT_SPAWN_H = @NEXT_SPAWN_H@
 NEXT_STDARG_H = @NEXT_STDARG_H@
 NEXT_STDDEF_H = @NEXT_STDDEF_H@
 NEXT_STDINT_H = @NEXT_STDINT_H@
@@ -2306,11 +3577,13 @@ REPLACE_GAI_STRERROR = @REPLACE_GAI_STRERROR@
 REPLACE_GETCWD = @REPLACE_GETCWD@
 REPLACE_GETDELIM = @REPLACE_GETDELIM@
 REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
+REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
 REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
 REPLACE_GETLINE = @REPLACE_GETLINE@
 REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
 REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
+REPLACE_GMTIME = @REPLACE_GMTIME@
 REPLACE_HUGE_VAL = @REPLACE_HUGE_VAL@
 REPLACE_HYPOT = @REPLACE_HYPOT@
 REPLACE_HYPOTF = @REPLACE_HYPOTF@
@@ -2335,6 +3608,7 @@ REPLACE_LDEXPL = @REPLACE_LDEXPL@
 REPLACE_LINK = @REPLACE_LINK@
 REPLACE_LINKAT = @REPLACE_LINKAT@
 REPLACE_LOCALECONV = @REPLACE_LOCALECONV@
+REPLACE_LOCALTIME = @REPLACE_LOCALTIME@
 REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
 REPLACE_LOG = @REPLACE_LOG@
 REPLACE_LOG10 = @REPLACE_LOG10@
@@ -2381,10 +3655,6 @@ REPLACE_OPENAT = @REPLACE_OPENAT@
 REPLACE_OPENDIR = @REPLACE_OPENDIR@
 REPLACE_PERROR = @REPLACE_PERROR@
 REPLACE_POPEN = @REPLACE_POPEN@
-REPLACE_POSIX_SPAWN = @REPLACE_POSIX_SPAWN@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN@
 REPLACE_PREAD = @REPLACE_PREAD@
 REPLACE_PRINTF = @REPLACE_PRINTF@
 REPLACE_PSELECT = @REPLACE_PSELECT@
@@ -2435,6 +3705,7 @@ REPLACE_STRSTR = @REPLACE_STRSTR@
 REPLACE_STRTOD = @REPLACE_STRTOD@
 REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@
 REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
+REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@
 REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
 REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@
 REPLACE_SYMLINK = @REPLACE_SYMLINK@
@@ -2465,6 +3736,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
 REPLACE_WRITE = @REPLACE_WRITE@
 SCHED_H = @SCHED_H@
+SED = @SED@
 SELINUX_CONTEXT_H = @SELINUX_CONTEXT_H@
 SEQ_LIBM = @SEQ_LIBM@
 SERVENT_LIB = @SERVENT_LIB@
@@ -2557,8 +3829,13 @@ pkglibexec_PROGRAMS = @pkglibexec_PROGRAMS@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+single_binary_deps = @single_binary_deps@
+single_binary_install_type = @single_binary_install_type@
+single_binary_libs = @single_binary_libs@
+single_binary_progs = @single_binary_progs@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
@@ -2594,22 +3871,12 @@ changelog_etc = \
 #	http://www.opengroup.org/susv3/utilities/make.html
 #	for the 2004 POSIX specification]
 #endif
-
-#script: script.in
-#	rm -f $@-t $@
-#	sed -e 's#@''PREFERABLY_POSIX_SHELL''@#$(PREFERABLY_POSIX_SHELL)#g' \
-#	    -e 's#@''POSIX_SHELL''@#$(POSIX_SHELL)#g' \
-#	    -e $(top_srcdir)/lib/$@.in >$@-t
-#	chmod a+x $@-t
-#	mv $@-t $@
-#EXTRA_DIST += script.in
-#MOSTLYCLEANFILES += script script-t
 EXTRA_DIST = $(changelog_etc) .mailmap .prev-version .version \
 	.vg-suppressions THANKS.in THANKS-to-translators THANKStt.in \
 	bootstrap bootstrap.conf build-aux/gen-lists-of-programs.sh \
-	cfg.mk dist-check.mk maint.mk tests/GNUmakefile thanks-gen \
-	lib/acl-internal.h lib/acl.h lib/acl_entries.c lib/alignof.h \
-	lib/alloca.c lib/alloca.in.h lib/allocator.h \
+	build-aux/gen-single-binary.sh cfg.mk dist-check.mk maint.mk \
+	tests/GNUmakefile thanks-gen lib/alignof.h lib/alloca.c \
+	lib/alloca.in.h lib/allocator.h \
 	$(top_srcdir)/build-aux/announce-gen lib/areadlink.h \
 	lib/areadlink.h lib/areadlink.h lib/at-func.c lib/argmatch.h \
 	lib/arpa_inet.in.h lib/openat-priv.h lib/openat-proc.c \
@@ -2619,10 +3886,11 @@ EXTRA_DIST = $(changelog_etc) .mailmap .prev-version .version \
 	lib/chdir-long.c lib/chdir-long.h lib/chown.c \
 	lib/fchown-stub.c lib/cloexec.h lib/close.c lib/close-stream.h \
 	lib/closedir.c lib/dirent-private.h lib/closein.h \
-	lib/closeout.h lib/md5.h lib/sha1.h lib/sha256.h lib/sha512.h \
-	lib/ctype.in.h lib/cycle-check.h lib/dev-ino.h lib/dirent.in.h \
-	lib/dirent--.h lib/dirent-safer.h lib/dirfd.c lib/stripslash.c \
-	lib/dirname.h \
+	lib/closeout.h lib/gl_openssl.h lib/md5.h lib/gl_openssl.h \
+	lib/sha1.h lib/gl_openssl.h lib/sha256.h lib/gl_openssl.h \
+	lib/sha512.h lib/ctype.in.h lib/cycle-check.h lib/dev-ino.h \
+	lib/dirent.in.h lib/dirent--.h lib/dirent-safer.h lib/dirfd.c \
+	lib/stripslash.c lib/dirname.h \
 	$(top_srcdir)/build-aux/do-release-commit-and-tag \
 	lib/dosname.h lib/ftoastr.c lib/ftoastr.h lib/dup.c lib/dup2.c \
 	lib/errno.in.h lib/error.c lib/error.h lib/euidaccess.c \
@@ -2695,18 +3963,12 @@ EXTRA_DIST = $(changelog_etc) .mailmap .prev-version .version \
 	lib/obstack.c lib/obstack.h lib/open.c lib/openat.c \
 	lib/openat.h lib/fcntl--.h lib/fcntl-safer.h \
 	lib/dirent-private.h lib/opendir.c lib/parse-datetime.c \
-	lib/parse-datetime.h lib/pathmax.h lib/physmem.h lib/pipe.h \
-	lib/spawn_int.h lib/spawni.c lib/spawn_faction_addclose.c \
-	lib/spawn_int.h lib/spawn_faction_adddup2.c lib/spawn_int.h \
-	lib/spawn_faction_addopen.c lib/spawn_int.h \
-	lib/spawn_faction_destroy.c lib/spawn_faction_init.c \
-	lib/spawn_int.h lib/spawnattr_destroy.c lib/spawnattr_init.c \
-	lib/spawnattr_setflags.c lib/spawnattr_setsigmask.c \
-	lib/spawnp.c lib/posixtm.h lib/posixver.h lib/printf-frexp.h \
+	lib/parse-datetime.h lib/pathmax.h lib/physmem.h lib/pipe.c \
+	lib/posixtm.h lib/posixver.h lib/printf-frexp.h \
 	lib/printf-frexp.c lib/printf-frexpl.h lib/priv-set.h \
-	lib/pthread.c lib/pthread.in.h lib/putenv.c lib/quote.h \
-	lib/quote.h lib/quotearg.h lib/raise.c lib/rawmemchr.c \
-	lib/rawmemchr.valgrind lib/read.c lib/read-file.h \
+	lib/pthread.c lib/pthread.in.h lib/putenv.c lib/acl-internal.h \
+	lib/acl.h lib/acl_entries.c lib/quote.h lib/quote.h \
+	lib/quotearg.h lib/raise.c lib/read.c lib/read-file.h \
 	lib/dirent-private.h lib/readdir.c lib/readlink.c \
 	lib/at-func.c lib/readlinkat.c lib/readtokens.h lib/readutmp.c \
 	lib/readutmp.h lib/realloc.c lib/realloc.c lib/regcomp.c \
@@ -2715,28 +3977,28 @@ EXTRA_DIST = $(changelog_etc) .mailmap .prev-version .version \
 	lib/dirent-private.h lib/rewinddir.c lib/rmdir.c \
 	lib/root-uid.h lib/rpmatch.c lib/safe-read.h lib/safe-read.c \
 	lib/safe-write.h lib/same.h lib/same-inode.h lib/save-cwd.h \
-	lib/savedir.h lib/sched.in.h lib/select.c lib/at-func.c \
-	lib/selinux-at.c lib/selinux-at.h lib/getfilecon.c \
-	lib/setenv.c lib/sig2str.c lib/sig2str.h lib/sig-handler.h \
-	lib/sigaction.c lib/signal.in.h lib/float+.h lib/signbitd.c \
-	lib/signbitf.c lib/signbitl.c lib/sigprocmask.c \
+	lib/savedir.h lib/sched.in.h lib/secure_getenv.c lib/select.c \
+	lib/at-func.c lib/selinux-at.c lib/selinux-at.h \
+	lib/getfilecon.c lib/setenv.c lib/sig2str.c lib/sig2str.h \
+	lib/sig-handler.h lib/sigaction.c lib/signal.in.h lib/float+.h \
+	lib/signbitd.c lib/signbitf.c lib/signbitl.c lib/sigprocmask.c \
 	$(top_srcdir)/build-aux/snippet/_Noreturn.h \
 	$(top_srcdir)/build-aux/snippet/arg-nonnull.h \
 	$(top_srcdir)/build-aux/snippet/c++defs.h \
 	$(top_srcdir)/build-aux/snippet/unused-parameter.h \
 	$(top_srcdir)/build-aux/snippet/warn-on-use.h lib/snprintf.c \
-	lib/w32sock.h lib/spawn.in.h lib/stat.c lib/stat-macros.h \
-	lib/stat-size.h lib/stat-time.h lib/stdalign.in.h \
-	lib/stdarg.in.h lib/stdbool.in.h lib/stddef.in.h \
-	lib/stdint.in.h lib/stdio.in.h lib/stdlib.in.h lib/stdlib--.h \
-	lib/stdlib-safer.h lib/stpcpy.c lib/stpncpy.c lib/strchrnul.c \
-	lib/strchrnul.valgrind lib/strdup.c lib/streq.h lib/strerror.c \
-	lib/strerror-override.c lib/strerror-override.h lib/strftime.h \
-	lib/string.in.h lib/strncat.c lib/strndup.c lib/strnlen.c \
-	lib/strnumcmp-in.h lib/strpbrk.c lib/siglist.h lib/strsignal.c \
-	lib/str-two-way.h lib/strstr.c lib/strtod.c lib/strtoimax.c \
-	lib/strtol.c lib/strtoll.c lib/strtol.c lib/strtoul.c \
-	lib/strtoull.c lib/strtoimax.c lib/strtoumax.c lib/symlink.c \
+	lib/w32sock.h lib/stat.c lib/stat-macros.h lib/stat-size.h \
+	lib/stat-time.h lib/stdalign.in.h lib/stdarg.in.h \
+	lib/stdbool.in.h lib/stddef.in.h lib/stdint.in.h \
+	lib/stdio.in.h lib/stdlib.in.h lib/stdlib--.h \
+	lib/stdlib-safer.h lib/stpcpy.c lib/stpncpy.c lib/strdup.c \
+	lib/streq.h lib/strerror.c lib/strerror-override.c \
+	lib/strerror-override.h lib/strftime.h lib/string.in.h \
+	lib/strncat.c lib/strndup.c lib/strnlen.c lib/strnumcmp-in.h \
+	lib/strpbrk.c lib/siglist.h lib/strsignal.c lib/str-two-way.h \
+	lib/strstr.c lib/strtod.c lib/strtoimax.c lib/strtol.c \
+	lib/strtoll.c lib/strtol.c lib/strtoul.c lib/strtoull.c \
+	lib/strtoimax.c lib/strtoumax.c lib/symlink.c \
 	lib/sys_ioctl.in.h lib/sys_resource.in.h lib/sys_select.in.h \
 	lib/sys_socket.in.h lib/sys_stat.in.h lib/sys_time.in.h \
 	lib/sys_types.in.h lib/sys_uio.in.h lib/sys_utsname.in.h \
@@ -2754,23 +4016,23 @@ EXTRA_DIST = $(changelog_etc) .mailmap .prev-version .version \
 	lib/printf-args.h lib/printf-parse.c lib/printf-parse.h \
 	lib/vasnprintf.c lib/vasnprintf.h lib/asprintf.c \
 	lib/vasprintf.c $(top_srcdir)/build-aux/vc-list-files \
-	lib/verify.h lib/vfprintf.c lib/vprintf.c lib/waitpid.c \
-	lib/wchar.in.h lib/wcrtomb.c lib/wcswidth-impl.h \
-	lib/wcswidth.c lib/wctype.in.h lib/wcwidth.c lib/write.c \
-	lib/write-any-file.h lib/xalloc.h lib/xalloc-oversized.h \
-	lib/xgetcwd.h lib/xnanosleep.h lib/xreadlink.h lib/xstrtod.h \
-	lib/xstrtol.h lib/xstrtod.c lib/xstrtod.h lib/xalloc.h \
-	lib/yesno.h src/dcgen src/dircolors.hin src/primes.h \
-	src/tac-pipe.c src/extract-magic src/c99-to-c89.diff \
-	man/help2man man/dummy-man $(man1_MANS:.1=.x) \
-	$(EXTRA_MANS:.1=.x) $(all_tests) init.cfg tests/Coreutils.pm \
-	tests/CuSkip.pm tests/CuTmpdir.pm tests/d_type-check \
-	tests/envvar-check tests/factor/run.sh \
-	tests/factor/create-test.sh tests/filefrag-extent-compare \
-	tests/fiemap-capable tests/init.sh tests/lang-default \
-	tests/no-perl tests/other-fs-tmpdir tests/sample-test \
-	$(pr_data)
+	lib/verify.h lib/vfprintf.c lib/vprintf.c lib/wchar.in.h \
+	lib/wcrtomb.c lib/wcswidth-impl.h lib/wcswidth.c \
+	lib/wctype.in.h lib/wcwidth.c lib/write.c lib/write-any-file.h \
+	lib/xalloc.h lib/xalloc-oversized.h lib/xgetcwd.h \
+	lib/xnanosleep.h lib/xreadlink.h lib/xstrtod.h lib/xstrtol.h \
+	lib/xstrtod.c lib/xstrtod.h lib/xalloc.h lib/yesno.h src/dcgen \
+	src/dircolors.hin src/primes.h src/tac-pipe.c \
+	src/extract-magic src/c99-to-c89.diff man/help2man \
+	man/dummy-man $(man1_MANS:.1=.x) $(EXTRA_MANS:.1=.x) \
+	$(all_tests) init.cfg tests/Coreutils.pm tests/CuSkip.pm \
+	tests/CuTmpdir.pm tests/d_type-check tests/envvar-check \
+	tests/factor/run.sh tests/factor/create-test.sh \
+	tests/filefrag-extent-compare tests/fiemap-capable \
+	tests/init.sh tests/lang-default tests/no-perl \
+	tests/other-fs-tmpdir tests/sample-test $(pr_data)
 gen_progs_lists = $(top_srcdir)/build-aux/gen-lists-of-programs.sh
+gen_single_binary = $(top_srcdir)/build-aux/gen-single-binary.sh
 ACLOCAL_AMFLAGS = -I m4
 
 # Just prior to distribution, ...
@@ -2813,18 +4075,31 @@ BUILT_SOURCES = .version $(ALLOCA_H) lib/arpa/inet.h lib/configmake.h \
 	$(NETINET_IN_H) lib/parse-datetime.c $(PTHREAD_H) $(SCHED_H) \
 	lib/selinux/selinux.h $(SELINUX_CONTEXT_H) lib/signal.h \
 	lib/arg-nonnull.h lib/c++defs.h lib/unused-parameter.h \
-	lib/warn-on-use.h lib/spawn.h $(STDALIGN_H) $(STDARG_H) \
-	$(STDBOOL_H) $(STDDEF_H) $(STDINT_H) lib/stdio.h lib/stdlib.h \
-	lib/string.h lib/sys/ioctl.h lib/sys/resource.h \
-	lib/sys/select.h lib/sys/socket.h lib/sys/stat.h \
-	lib/sys/time.h lib/sys/types.h lib/sys/uio.h lib/sys/utsname.h \
-	lib/sys/wait.h lib/termios.h lib/time.h lib/unistd.h \
-	$(LIBUNISTRING_UNISTR_H) $(LIBUNISTRING_UNITYPES_H) \
-	$(LIBUNISTRING_UNIWIDTH_H) lib/wchar.h lib/wctype.h \
-	src/dircolors.h $(top_srcdir)/src/primes.h src/fs-is-local.h \
-	src/fs.h src/version.c src/version.h
+	lib/warn-on-use.h $(STDALIGN_H) $(STDARG_H) $(STDBOOL_H) \
+	$(STDDEF_H) $(STDINT_H) lib/stdio.h lib/stdlib.h lib/string.h \
+	lib/sys/ioctl.h lib/sys/resource.h lib/sys/select.h \
+	lib/sys/socket.h lib/sys/stat.h lib/sys/time.h lib/sys/types.h \
+	lib/sys/uio.h lib/sys/utsname.h lib/sys/wait.h lib/termios.h \
+	lib/time.h lib/unistd.h $(LIBUNISTRING_UNISTR_H) \
+	$(LIBUNISTRING_UNITYPES_H) $(LIBUNISTRING_UNIWIDTH_H) \
+	lib/wchar.h lib/wctype.h src/coreutils.h src/dircolors.h \
+	$(top_srcdir)/src/primes.h src/fs-is-local.h src/fs.h \
+	src/version.c src/version.h
 gen_start_date = 2008-02-08
-DISTCLEANFILES = VERSION src/version.c src/version.h
+
+# Generates a list of macro invocations like:
+#   SINGLE_BINARY_PROGRAM(program_name_str, main_name)
+# once for each program list on $(single_binary_progs). Note that
+# for [ the macro invocation is:
+#   SINGLE_BINARY_PROGRAM("[", _)
+
+# Most prog.1 man pages depend on src/$prog, except when they are part of a
+# single binary, in which case they depend on src/coreutils. The exceptions
+# are handled by converting $name to $prog on the following code.
+# $(ALL_MANS) includes the $(EXTRA_MANS) so even the programs that are not
+# being installed will have the right dependency for the manpages.
+DISTCLEANFILES = VERSION src/fs-latest-magic.h src/coreutils.h \
+	src/version.c src/version.h man/dynamic-deps.mk
 MAINTAINERCLEANFILES = THANKS-to-translators lib/iconv_open-aix.h \
 	lib/iconv_open-hpux.h lib/iconv_open-irix.h \
 	lib/iconv_open-osf.h lib/iconv_open-solaris.h \
@@ -2837,7 +4112,7 @@ ASSORT = LC_ALL=C sort
 
 # Extract all lines up to the first one starting with "##".
 prologue = perl -ne '/^\#\#/ and exit; print' $(srcdir)/THANKS.in
-noinst_LIBRARIES = lib/libcoreutils.a src/libver.a
+noinst_LIBRARIES = lib/libcoreutils.a src/libver.a $(am__append_4)
 MOSTLYCLEANFILES = lib/core lib/*.stackdump lib/alloca.h \
 	lib/alloca.h-t lib/arpa/inet.h lib/arpa/inet.h-t lib/ctype.h \
 	lib/ctype.h-t lib/dirent.h lib/dirent.h-t lib/errno.h \
@@ -2856,51 +4131,59 @@ MOSTLYCLEANFILES = lib/core lib/*.stackdump lib/alloca.h \
 	lib/signal.h-t lib/arg-nonnull.h lib/arg-nonnull.h-t \
 	lib/c++defs.h lib/c++defs.h-t lib/unused-parameter.h \
 	lib/unused-parameter.h-t lib/warn-on-use.h lib/warn-on-use.h-t \
-	lib/spawn.h lib/spawn.h-t lib/stdalign.h lib/stdalign.h-t \
-	lib/stdarg.h lib/stdarg.h-t lib/stdbool.h lib/stdbool.h-t \
-	lib/stddef.h lib/stddef.h-t lib/stdint.h lib/stdint.h-t \
-	lib/stdio.h lib/stdio.h-t lib/stdlib.h lib/stdlib.h-t \
-	lib/string.h lib/string.h-t lib/sys/ioctl.h lib/sys/ioctl.h-t \
-	lib/sys/resource.h lib/sys/resource.h-t lib/sys/select.h \
-	lib/sys/select.h-t lib/sys/socket.h lib/sys/socket.h-t \
-	lib/sys/stat.h lib/sys/stat.h-t lib/sys/time.h \
-	lib/sys/time.h-t lib/sys/types.h lib/sys/types.h-t \
-	lib/sys/uio.h lib/sys/uio.h-t lib/sys/utsname.h \
-	lib/sys/utsname.h-t lib/sys/wait.h lib/sys/wait.h-t \
-	lib/termios.h lib/termios.h-t lib/time.h lib/time.h-t \
-	lib/unistd.h lib/unistd.h-t lib/unistr.h lib/unistr.h-t \
-	lib/unitypes.h lib/unitypes.h-t lib/uniwidth.h \
-	lib/uniwidth.h-t lib/wchar.h lib/wchar.h-t lib/wctype.h \
-	lib/wctype.h-t
+	lib/stdalign.h lib/stdalign.h-t lib/stdarg.h lib/stdarg.h-t \
+	lib/stdbool.h lib/stdbool.h-t lib/stddef.h lib/stddef.h-t \
+	lib/stdint.h lib/stdint.h-t lib/stdio.h lib/stdio.h-t \
+	lib/stdlib.h lib/stdlib.h-t lib/string.h lib/string.h-t \
+	lib/sys/ioctl.h lib/sys/ioctl.h-t lib/sys/resource.h \
+	lib/sys/resource.h-t lib/sys/select.h lib/sys/select.h-t \
+	lib/sys/socket.h lib/sys/socket.h-t lib/sys/stat.h \
+	lib/sys/stat.h-t lib/sys/time.h lib/sys/time.h-t \
+	lib/sys/types.h lib/sys/types.h-t lib/sys/uio.h \
+	lib/sys/uio.h-t lib/sys/utsname.h lib/sys/utsname.h-t \
+	lib/sys/wait.h lib/sys/wait.h-t lib/termios.h lib/termios.h-t \
+	lib/time.h lib/time.h-t lib/unistd.h lib/unistd.h-t \
+	lib/unistr.h lib/unistr.h-t lib/unitypes.h lib/unitypes.h-t \
+	lib/uniwidth.h lib/uniwidth.h-t lib/wchar.h lib/wchar.h-t \
+	lib/wctype.h lib/wctype.h-t
 
 # Also remove these sometimes-built programs.
 # For example, even when excluded, they're built via 'sc_check-AUTHORS'
 # or 'dist'.
 CLEANFILES = lib/configmake.h lib/configmake.h-t lib/charset.alias \
 	lib/ref-add.sed lib/ref-del.sed $(SCRIPTS) \
-	$(no_install__progs) src/fs-def src/fs-magic \
+	$(no_install__progs) src/coreutils_symlinks \
+	src/coreutils_shebangs src/fs-def src/fs-magic \
 	src/fs-kernel-magic $(ALL_MANS) $(factor_tests)
 MOSTLYCLEANDIRS = lib/arpa lib/netinet lib/selinux lib/sys lib/sys \
 	lib/sys lib/sys lib/sys lib/sys lib/sys lib/sys
 AM_CPPFLAGS = -Ilib -I$(top_srcdir)/lib -Isrc -I$(top_srcdir)/src
-lib_libcoreutils_a_SOURCES = lib/set-mode-acl.c lib/copy-acl.c \
-	lib/file-has-acl.c lib/allocator.c lib/areadlink.c \
-	lib/areadlink-with-size.c lib/areadlinkat.c lib/argmatch.c \
-	lib/argv-iter.c lib/argv-iter.h lib/backupfile.c lib/base64.h \
-	lib/base64.c lib/binary-io.h lib/binary-io.c lib/bitrotate.h \
-	lib/bitrotate.c lib/buffer-lcm.c lib/buffer-lcm.h \
-	lib/c-ctype.h lib/c-ctype.c lib/c-strcase.h lib/c-strcasecmp.c \
-	lib/c-strncasecmp.c lib/c-strtod.c lib/c-strtold.c \
-	lib/canon-host.c lib/canonicalize.c lib/careadlinkat.c \
-	lib/cloexec.c lib/close-stream.c lib/closein.c lib/closeout.c \
-	lib/md5.c lib/sha1.c lib/sha256.c lib/sha512.c \
-	lib/cycle-check.c lib/di-set.c lib/di-set.h lib/diacrit.h \
-	lib/diacrit.c lib/opendir-safer.c lib/dirname.c lib/basename.c \
-	lib/dirname-lgpl.c lib/basename-lgpl.c lib/stripslash.c \
-	lib/dtoastr.c lib/dtotimespec.c lib/exclude.c lib/exitfail.c \
-	lib/fadvise.c lib/fadvise.h lib/fatal-signal.h \
-	lib/fatal-signal.c lib/chmodat.c lib/chownat.c \
-	lib/creat-safer.c lib/open-safer.c lib/fd-hook.c \
+
+#script: script.in
+#	rm -f $@-t $@
+#	sed -e 's#@''PREFERABLY_POSIX_SHELL''@#$(PREFERABLY_POSIX_SHELL)#g' \
+#	    -e 's#@''POSIX_SHELL''@#$(POSIX_SHELL)#g' \
+#	    -e $(top_srcdir)/lib/$@.in >$@-t
+#	chmod a+x $@-t
+#	mv $@-t $@
+#EXTRA_DIST += script.in
+#MOSTLYCLEANFILES += script script-t
+lib_libcoreutils_a_SOURCES = lib/copy-acl.c lib/set-acl.c \
+	lib/allocator.c lib/areadlink.c lib/areadlink-with-size.c \
+	lib/areadlinkat.c lib/argmatch.c lib/argv-iter.c \
+	lib/argv-iter.h lib/backupfile.c lib/base64.h lib/base64.c \
+	lib/bitrotate.h lib/bitrotate.c lib/buffer-lcm.c \
+	lib/buffer-lcm.h lib/c-ctype.h lib/c-ctype.c lib/c-strcase.h \
+	lib/c-strcasecmp.c lib/c-strncasecmp.c lib/c-strtod.c \
+	lib/c-strtold.c lib/canon-host.c lib/canonicalize.c \
+	lib/careadlinkat.c lib/cloexec.c lib/close-stream.c \
+	lib/closein.c lib/closeout.c lib/md5.c lib/sha1.c lib/sha256.c \
+	lib/sha512.c lib/cycle-check.c lib/di-set.c lib/di-set.h \
+	lib/diacrit.h lib/diacrit.c lib/opendir-safer.c lib/dirname.c \
+	lib/basename.c lib/dirname-lgpl.c lib/basename-lgpl.c \
+	lib/stripslash.c lib/dtoastr.c lib/dtotimespec.c lib/exclude.c \
+	lib/exitfail.c lib/fadvise.c lib/fadvise.h lib/chmodat.c \
+	lib/chownat.c lib/creat-safer.c lib/open-safer.c lib/fd-hook.c \
 	lib/fd-reopen.c lib/fd-reopen.h lib/fd-safer-flag.c \
 	lib/dup-safer-flag.c lib/fdutimensat.c lib/file-set.c \
 	lib/file-type.c lib/filemode.c lib/filenamecat.c \
@@ -2924,10 +4207,11 @@ lib_libcoreutils_a_SOURCES = lib/set-mode-acl.c lib/copy-acl.c \
 	lib/mgetgroups.c lib/mkancesdirs.c lib/dirchownmod.c \
 	lib/mkdir-p.c lib/modechange.c lib/mpsort.c lib/nproc.c \
 	lib/openat-die.c lib/openat-safer.c lib/parse-datetime.y \
-	lib/physmem.c lib/pipe2.c lib/pipe2-safer.c lib/posixtm.c \
-	lib/posixver.c lib/printf-frexp.c lib/printf-frexpl.c \
-	lib/priv-set.c lib/progname.h lib/progname.c lib/propername.h \
-	lib/propername.c lib/quotearg.c lib/randint.c lib/randint.h \
+	lib/physmem.c lib/posixtm.c lib/posixver.c lib/printf-frexp.c \
+	lib/printf-frexpl.c lib/priv-set.c lib/progname.h \
+	lib/progname.c lib/propername.h lib/propername.c \
+	lib/acl-errno-valid.c lib/file-has-acl.c lib/qcopy-acl.c \
+	lib/qset-acl.c lib/quotearg.c lib/randint.c lib/randint.h \
 	lib/randperm.c lib/randperm.h lib/randread.c lib/randread.h \
 	lib/rand-isaac.c lib/rand-isaac.h lib/read-file.c \
 	lib/readtokens.c lib/readtokens0.h lib/readtokens0.c \
@@ -2935,19 +4219,18 @@ lib_libcoreutils_a_SOURCES = lib/set-mode-acl.c lib/copy-acl.c \
 	lib/safe-write.c lib/same.c lib/save-cwd.c lib/savedir.c \
 	lib/savewd.h lib/savewd.c lib/se-context.in.h \
 	lib/se-selinux.in.h lib/se-context.c lib/se-selinux.c \
-	lib/settime.c lib/sig-handler.c lib/size_max.h lib/sockets.h \
-	lib/sockets.c lib/spawn-pipe.h lib/spawn-pipe.c lib/w32spawn.h \
-	lib/stat-time.c lib/statat.c lib/mkstemp-safer.c \
-	lib/strftime.c lib/striconv.h lib/striconv.c lib/strnlen1.h \
-	lib/strnlen1.c lib/strintcmp.c lib/strnumcmp.c lib/strnumcmp.h \
-	lib/sys_socket.c lib/tempname.c lib/glthread/threadlib.c \
-	lib/timespec.c lib/glthread/tls.h lib/glthread/tls.c \
-	lib/trim.c lib/u64.c lib/unicodeio.h lib/unicodeio.c \
-	lib/unistd.c lib/dup-safer.c lib/fd-safer.c lib/pipe-safer.c \
-	$(am__append_1) $(am__append_2) $(am__append_3) lib/userspec.c \
-	lib/utimecmp.c lib/utimens.c lib/verror.h lib/verror.c \
-	lib/version-etc.h lib/version-etc.c lib/version-etc-fsf.c \
-	lib/wait-process.h lib/wait-process.c lib/wctype-h.c \
+	lib/settime.c lib/sig-handler.c lib/size_max.h lib/smack.h \
+	lib/sockets.h lib/sockets.c lib/stat-time.c lib/statat.c \
+	lib/mkstemp-safer.c lib/strftime.c lib/striconv.h \
+	lib/striconv.c lib/strnlen1.h lib/strnlen1.c lib/strintcmp.c \
+	lib/strnumcmp.c lib/strnumcmp.h lib/sys_socket.c \
+	lib/tempname.c lib/glthread/threadlib.c lib/timespec.c \
+	lib/glthread/tls.h lib/glthread/tls.c lib/trim.c lib/u64.c \
+	lib/unicodeio.h lib/unicodeio.c lib/unistd.c lib/dup-safer.c \
+	lib/fd-safer.c lib/pipe-safer.c $(am__append_1) \
+	$(am__append_2) $(am__append_3) lib/userspec.c lib/utimecmp.c \
+	lib/utimens.c lib/verror.h lib/verror.c lib/version-etc.h \
+	lib/version-etc.c lib/version-etc-fsf.c lib/wctype-h.c \
 	lib/write-any-file.c lib/xmalloc.c lib/xalloc-die.c \
 	lib/xfreopen.c lib/xfreopen.h lib/xfts.c lib/xfts.h \
 	lib/xgetcwd.c lib/xgetgroups.c lib/xgethostname.h \
@@ -2960,66 +4243,67 @@ lib_libcoreutils_a_SOURCES = lib/set-mode-acl.c lib/copy-acl.c \
 	lib/xvasprintf.c lib/xasprintf.c lib/yesno.c
 lib_libcoreutils_a_LIBADD = $(gl_LIBOBJS) @ALLOCA@
 lib_libcoreutils_a_DEPENDENCIES = $(gl_LIBOBJS) @ALLOCA@
-EXTRA_lib_libcoreutils_a_SOURCES = lib/acl_entries.c lib/alloca.c \
-	lib/at-func.c lib/openat-proc.c lib/btowc.c lib/c-strtod.c \
-	lib/calloc.c lib/calloc.c lib/chdir-long.c lib/chown.c \
-	lib/fchown-stub.c lib/close.c lib/closedir.c lib/dirfd.c \
-	lib/stripslash.c lib/ftoastr.c lib/dup.c lib/dup2.c \
-	lib/error.c lib/euidaccess.c lib/at-func.c lib/faccessat.c \
-	lib/fchdir.c lib/at-func.c lib/fchmodat.c lib/at-func.c \
-	lib/fchownat.c lib/fclose.c lib/fcntl.c lib/fdatasync.c \
-	lib/fdopen.c lib/fdopendir.c lib/fflush.c lib/fileblocks.c \
-	lib/float.c lib/itold.c lib/fnmatch.c lib/fnmatch_loop.c \
-	lib/fopen.c lib/fpending.c lib/fpurge.c lib/freadahead.c \
-	lib/freadptr.c lib/freopen.c lib/frexp.c lib/frexp.c \
-	lib/frexpl.c lib/fseek.c lib/fseeko.c lib/fseterr.c \
-	lib/fstat.c lib/at-func.c lib/fstatat.c lib/fsusage.c \
-	lib/fsync.c lib/ftell.c lib/ftello.c lib/ftruncate.c \
-	lib/fts-cycle.c lib/fts.c lib/full-write.c lib/futimens.c \
-	lib/gai_strerror.c lib/getaddrinfo.c lib/getcwd.c \
-	lib/getcwd-lgpl.c lib/getdelim.c lib/getdtablesize.c \
-	lib/getgroups.c lib/gethostname.c lib/getline.c \
-	lib/getloadavg.c lib/getlogin.c lib/getopt.c lib/getopt1.c \
-	lib/getpagesize.c lib/getpass.c lib/gettimeofday.c \
-	lib/getusershell.c lib/group-member.c lib/iconv.c \
-	lib/iconv_close.c lib/iconv_open.c lib/inet_ntop.c \
-	lib/anytostr.c lib/isapipe.c lib/isatty.c lib/isblank.c \
-	lib/isnan.c lib/isnand.c lib/isnan.c lib/isnanf.c lib/isnan.c \
-	lib/isnanl.c lib/iswblank.c lib/lchown.c lib/ftoastr.c \
-	lib/link.c lib/at-func2.c lib/linkat.c lib/localeconv.c \
-	lib/lseek.c lib/lstat.c lib/malloc.c lib/malloc.c lib/mbrlen.c \
+EXTRA_lib_libcoreutils_a_SOURCES = lib/alloca.c lib/at-func.c \
+	lib/openat-proc.c lib/btowc.c lib/c-strtod.c lib/calloc.c \
+	lib/calloc.c lib/chdir-long.c lib/chown.c lib/fchown-stub.c \
+	lib/close.c lib/closedir.c lib/dirfd.c lib/stripslash.c \
+	lib/ftoastr.c lib/dup.c lib/dup2.c lib/error.c \
+	lib/euidaccess.c lib/at-func.c lib/faccessat.c lib/fchdir.c \
+	lib/at-func.c lib/fchmodat.c lib/at-func.c lib/fchownat.c \
+	lib/fclose.c lib/fcntl.c lib/fdatasync.c lib/fdopen.c \
+	lib/fdopendir.c lib/fflush.c lib/fileblocks.c lib/float.c \
+	lib/itold.c lib/fnmatch.c lib/fnmatch_loop.c lib/fopen.c \
+	lib/fpending.c lib/fpurge.c lib/freadahead.c lib/freadptr.c \
+	lib/freopen.c lib/frexp.c lib/frexp.c lib/frexpl.c lib/fseek.c \
+	lib/fseeko.c lib/fseterr.c lib/fstat.c lib/at-func.c \
+	lib/fstatat.c lib/fsusage.c lib/fsync.c lib/ftell.c \
+	lib/ftello.c lib/ftruncate.c lib/fts-cycle.c lib/fts.c \
+	lib/full-write.c lib/futimens.c lib/gai_strerror.c \
+	lib/getaddrinfo.c lib/getcwd.c lib/getcwd-lgpl.c \
+	lib/getdelim.c lib/getdtablesize.c lib/getgroups.c \
+	lib/gethostname.c lib/getline.c lib/getloadavg.c \
+	lib/getlogin.c lib/getopt.c lib/getopt1.c lib/getpagesize.c \
+	lib/getpass.c lib/gettimeofday.c lib/getusershell.c \
+	lib/group-member.c lib/iconv.c lib/iconv_close.c \
+	lib/iconv_open.c lib/inet_ntop.c lib/anytostr.c lib/isapipe.c \
+	lib/isatty.c lib/isblank.c lib/isnan.c lib/isnand.c \
+	lib/isnan.c lib/isnanf.c lib/isnan.c lib/isnanl.c \
+	lib/iswblank.c lib/lchown.c lib/ftoastr.c lib/link.c \
+	lib/at-func2.c lib/linkat.c lib/localeconv.c lib/lseek.c \
+	lib/lstat.c lib/malloc.c lib/malloc.c lib/mbrlen.c \
 	lib/mbrtowc.c lib/mbsinit.c lib/mbsrtowcs-state.c \
 	lib/mbsrtowcs.c lib/mbtowc.c lib/memchr.c lib/mempcpy.c \
 	lib/memrchr.c lib/mkdir.c lib/mkfifo.c lib/mknod.c \
 	lib/mkstemp.c lib/mktime.c lib/mountlist.c lib/msvc-inval.c \
 	lib/msvc-nothrow.c lib/nanosleep.c lib/nl_langinfo.c \
-	lib/obstack.c lib/open.c lib/openat.c lib/opendir.c \
-	lib/spawni.c lib/spawn_faction_addclose.c \
-	lib/spawn_faction_adddup2.c lib/spawn_faction_addopen.c \
-	lib/spawn_faction_destroy.c lib/spawn_faction_init.c \
-	lib/spawnattr_destroy.c lib/spawnattr_init.c \
-	lib/spawnattr_setflags.c lib/spawnattr_setsigmask.c \
-	lib/spawnp.c lib/printf-frexp.c lib/pthread.c lib/putenv.c \
-	lib/raise.c lib/rawmemchr.c lib/read.c lib/readdir.c \
+	lib/obstack.c lib/open.c lib/openat.c lib/opendir.c lib/pipe.c \
+	lib/printf-frexp.c lib/pthread.c lib/putenv.c \
+	lib/acl_entries.c lib/raise.c lib/read.c lib/readdir.c \
 	lib/readlink.c lib/at-func.c lib/readlinkat.c lib/readutmp.c \
 	lib/realloc.c lib/realloc.c lib/regcomp.c lib/regex.c \
 	lib/regex_internal.c lib/regexec.c lib/remove.c lib/rename.c \
 	lib/rewinddir.c lib/rmdir.c lib/rpmatch.c lib/safe-read.c \
-	lib/select.c lib/at-func.c lib/selinux-at.c lib/getfilecon.c \
-	lib/setenv.c lib/sig2str.c lib/sigaction.c lib/signbitd.c \
-	lib/signbitf.c lib/signbitl.c lib/sigprocmask.c lib/snprintf.c \
-	lib/stat.c lib/stpcpy.c lib/stpncpy.c lib/strchrnul.c \
-	lib/strdup.c lib/strerror.c lib/strerror-override.c \
-	lib/strncat.c lib/strndup.c lib/strnlen.c lib/strpbrk.c \
-	lib/strsignal.c lib/strstr.c lib/strtod.c lib/strtoimax.c \
-	lib/strtol.c lib/strtoll.c lib/strtol.c lib/strtoul.c \
-	lib/strtoull.c lib/strtoimax.c lib/strtoumax.c lib/symlink.c \
-	lib/time_r.c lib/uname.c lib/unlink.c lib/at-func.c \
-	lib/unlinkat.c lib/unsetenv.c lib/at-func.c lib/utimensat.c \
-	lib/asnprintf.c lib/printf-args.c lib/printf-parse.c \
-	lib/vasnprintf.c lib/asprintf.c lib/vasprintf.c lib/vfprintf.c \
-	lib/vprintf.c lib/waitpid.c lib/wcrtomb.c lib/wcswidth.c \
-	lib/wcwidth.c lib/write.c lib/xstrtod.c
+	lib/secure_getenv.c lib/select.c lib/at-func.c \
+	lib/selinux-at.c lib/getfilecon.c lib/setenv.c lib/sig2str.c \
+	lib/sigaction.c lib/signbitd.c lib/signbitf.c lib/signbitl.c \
+	lib/sigprocmask.c lib/snprintf.c lib/stat.c lib/stpcpy.c \
+	lib/stpncpy.c lib/strdup.c lib/strerror.c \
+	lib/strerror-override.c lib/strncat.c lib/strndup.c \
+	lib/strnlen.c lib/strpbrk.c lib/strsignal.c lib/strstr.c \
+	lib/strtod.c lib/strtoimax.c lib/strtol.c lib/strtoll.c \
+	lib/strtol.c lib/strtoul.c lib/strtoull.c lib/strtoimax.c \
+	lib/strtoumax.c lib/symlink.c lib/time_r.c lib/uname.c \
+	lib/unlink.c lib/at-func.c lib/unlinkat.c lib/unsetenv.c \
+	lib/at-func.c lib/utimensat.c lib/asnprintf.c \
+	lib/printf-args.c lib/printf-parse.c lib/vasnprintf.c \
+	lib/asprintf.c lib/vasprintf.c lib/vfprintf.c lib/vprintf.c \
+	lib/wcrtomb.c lib/wcswidth.c lib/wcwidth.c lib/write.c \
+	lib/xstrtod.c
+
+# Use this preprocessor expression to decide whether #include_next works.
+# Do not rely on a 'configure'-time test for this, since the expression
+# might appear in an installed header, which is used by some other compiler.
+HAVE_INCLUDE_NEXT = lib/(__GNUC__ lib/|| lib/60000000 lib/<= lib/__DECC_VER)
 GPERF = gperf
 charset_alias = $(DESTDIR)$(libdir)/charset.alias
 charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
@@ -3035,7 +4319,7 @@ WARN_ON_USE_H = lib/warn-on-use.h
 
 # FIXME: once lib/ and gnulib-tests/ are also converted, hoist to Makefile.am
 AM_CFLAGS = $(WERROR_CFLAGS)
-no_install__progs = src/arch src/hostname
+no_install__progs = src/arch src/coreutils src/hostname
 build_if_possible__progs = src/chroot src/df src/hostid \
 	src/libstdbuf.so src/nice src/pinky src/stdbuf src/stty \
 	src/uptime src/users src/who
@@ -3118,6 +4402,9 @@ src_cksum_LDADD = $(LDADD)
 src_comm_LDADD = $(LDADD)
 src_nproc_LDADD = $(LDADD)
 src_cp_LDADD = $(LDADD) $(copy_ldadd) $(LIBICONV)
+@SINGLE_BINARY_FALSE@src_coreutils_LDADD = $(LDADD)
+#src_coreutils_LDFLAGS = $(AM_LDFLAGS)
+@SINGLE_BINARY_TRUE@src_coreutils_LDADD = $(single_binary_deps) $(LDADD) $(single_binary_libs)
 src_csplit_LDADD = $(LDADD)
 src_cut_LDADD = $(LDADD)
 src_date_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
@@ -3150,7 +4437,7 @@ src_hostid_LDADD = $(LDADD)
 
 # for gethostname, uname
 src_hostname_LDADD = $(LDADD) $(GETHOSTNAME_LIB)
-src_id_LDADD = $(LDADD) $(LIB_SELINUX)
+src_id_LDADD = $(LDADD) $(LIB_SELINUX) $(LIB_SMACK)
 src_join_LDADD = $(LDADD)
 
 # for strsignal
@@ -3160,22 +4447,25 @@ src_ln_LDADD = $(LDADD)
 src_logname_LDADD = $(LDADD)
 
 # for cap_get_file
-src_ls_LDADD = $(LDADD) $(LIB_SELINUX) $(LIB_CLOCK_GETTIME) $(LIB_CAP) \
-	$(LIB_ACL)
+src_ls_LDADD = $(LDADD) $(LIB_SELINUX) $(LIB_SMACK) \
+	$(LIB_CLOCK_GETTIME) $(LIB_CAP) $(LIB_ACL)
 
 # This must *not* depend on anything in lib/, since it is used to generate
 # src/primes.h.  If it depended on libcoreutils.a, that would pull all lib/*.c
 # into BUILT_SOURCES.
 src_make_prime_list_LDADD = 
-src_md5sum_LDADD = $(LDADD)
-src_mkdir_LDADD = $(LDADD) $(LIB_SELINUX)
-src_mkfifo_LDADD = $(LDADD) $(LIB_SELINUX)
-src_mknod_LDADD = $(LDADD) $(LIB_SELINUX)
+
+# for libcrypto hash routines
+src_md5sum_LDADD = $(LDADD) $(LIB_CRYPTO)
+src_mkdir_LDADD = $(LDADD) $(LIB_SELINUX) $(LIB_SMACK)
+src_mkfifo_LDADD = $(LDADD) $(LIB_SELINUX) $(LIB_SMACK)
+src_mknod_LDADD = $(LDADD) $(LIB_SELINUX) $(LIB_SMACK)
 src_mktemp_LDADD = $(LDADD)
 src_mv_LDADD = $(LDADD) $(copy_ldadd) $(remove_ldadd)
 src_nice_LDADD = $(LDADD)
 src_nl_LDADD = $(LDADD)
 src_nohup_LDADD = $(LDADD)
+src_numfmt_LDADD = $(LDADD)
 src_od_LDADD = $(LDADD)
 src_paste_LDADD = $(LDADD)
 src_pathchk_LDADD = $(LDADD)
@@ -3193,12 +4483,11 @@ src_rm_LDADD = $(LDADD) $(remove_ldadd)
 src_rmdir_LDADD = $(LDADD)
 src_runcon_LDADD = $(LDADD) $(LIB_SELINUX)
 src_seq_LDADD = $(LDADD)
-src_setuidgid_LDADD = $(LDADD)
-src_sha1sum_LDADD = $(LDADD)
-src_sha224sum_LDADD = $(LDADD)
-src_sha256sum_LDADD = $(LDADD)
-src_sha384sum_LDADD = $(LDADD)
-src_sha512sum_LDADD = $(LDADD)
+src_sha1sum_LDADD = $(LDADD) $(LIB_CRYPTO)
+src_sha224sum_LDADD = $(LDADD) $(LIB_CRYPTO)
+src_sha256sum_LDADD = $(LDADD) $(LIB_CRYPTO)
+src_sha384sum_LDADD = $(LDADD) $(LIB_CRYPTO)
+src_sha512sum_LDADD = $(LDADD) $(LIB_CRYPTO)
 src_shred_LDADD = $(LDADD) $(LIB_FDATASYNC)
 src_shuf_LDADD = $(LDADD)
 
@@ -3207,9 +4496,11 @@ src_sleep_LDADD = $(LDADD) $(LIB_NANOSLEEP)
 
 # for pthread
 src_sort_LDADD = $(LDADD) $(LIB_EACCESS) $(LIB_NANOSLEEP) \
-	$(LIB_PTHREAD)
+	$(LIB_CRYPTO) $(LIB_PTHREAD)
 src_split_LDADD = $(LDADD) $(LIBICONV)
-src_stat_LDADD = $(LDADD) $(LIB_SELINUX)
+
+# for nvlist_lookup_uint64_array
+src_stat_LDADD = $(LDADD) $(LIB_SELINUX) $(LIB_NVPAIR)
 src_stdbuf_LDADD = $(LDADD) $(LIBICONV)
 src_stty_LDADD = $(LDADD)
 src_sum_LDADD = $(LDADD)
@@ -3249,17 +4540,25 @@ RELEASE_YEAR = \
   `sed -n '/.*COPYRIGHT_YEAR = \([0-9][0-9][0-9][0-9]\) };/s//\1/p' \
     $(top_srcdir)/lib/version-etc.c`
 
+selinux_sources = \
+  src/selinux.c \
+  src/selinux.h
+
 copy_sources = \
   src/copy.c \
   src/cp-hash.c \
   src/extent-scan.c \
   src/extent-scan.h
 
-src_ginstall_SOURCES = src/install.c src/prog-fprintf.c $(copy_sources)
+src_ginstall_SOURCES = src/install.c src/prog-fprintf.c $(copy_sources) \
+		       $(selinux_sources)
+
 
 # This is for the '[' program.  Automake transliterates '[' and '/' to '_'.
 src___SOURCES = src/lbracket.c
-src_cp_SOURCES = src/cp.c $(copy_sources)
+nodist_src_coreutils_SOURCES = src/coreutils.h
+src_coreutils_SOURCES = src/coreutils.c
+src_cp_SOURCES = src/cp.c $(copy_sources) $(selinux_sources)
 src_dir_SOURCES = src/ls.c src/ls-dir.c
 src_vdir_SOURCES = src/ls.c src/ls-vdir.c
 src_id_SOURCES = src/id.c src/group-list.c
@@ -3271,10 +4570,12 @@ src_chgrp_SOURCES = src/chgrp.c src/chown-core.c
 src_kill_SOURCES = src/kill.c src/operand2sig.c
 src_realpath_SOURCES = src/realpath.c src/relpath.c src/relpath.h
 src_timeout_SOURCES = src/timeout.c src/operand2sig.c
-src_mv_SOURCES = src/mv.c src/remove.c $(copy_sources)
+src_mv_SOURCES = src/mv.c src/remove.c $(copy_sources) $(selinux_sources)
 src_rm_SOURCES = src/rm.c src/remove.c
-src_mkdir_SOURCES = src/mkdir.c src/prog-fprintf.c
+src_mkdir_SOURCES = src/mkdir.c src/prog-fprintf.c $(selinux_sources)
 src_rmdir_SOURCES = src/rmdir.c src/prog-fprintf.c
+src_mkfifo_SOURCES = src/mkfifo.c $(selinux_sources)
+src_mknod_SOURCES = src/mknod.c $(selinux_sources)
 src_df_SOURCES = src/df.c src/find-mount-point.c
 src_stat_SOURCES = src/stat.c src/find-mount-point.c
 src_uname_SOURCES = src/uname.c src/uname-uname.c
@@ -3294,13 +4595,289 @@ src_ginstall_CPPFLAGS = -DENABLE_MATCHPATHCON=1 $(AM_CPPFLAGS)
 
 # Ensure we don't link against libcoreutils.a as that lib is
 # not compiled with -fPIC which causes issues on 64 bit at least
-src_libstdbuf_so_LDADD = 
+src_libstdbuf_so_LDADD = $(LIBINTL)
 
 # Note libstdbuf is only compiled if GCC is available
 # (as per the check in configure.ac), so these flags should be available.
 # libtool is probably required to relax this dependency.
 src_libstdbuf_so_LDFLAGS = -shared
 src_libstdbuf_so_CFLAGS = -fPIC $(AM_CFLAGS)
+# Single binary dependencies
+@SINGLE_BINARY_TRUE@src_coreutils_CFLAGS = -DSINGLE_BINARY $(AM_CFLAGS)
+@SINGLE_BINARY_TRUE@src_coreutils_DEPENDENCIES = $(LDADD) $(single_binary_deps)
+@SINGLE_BINARY_TRUE@src_libsinglebin_dir_a_DEPENDENCIES = src/libsinglebin_ls.a
+@SINGLE_BINARY_TRUE@src_libsinglebin_vdir_a_DEPENDENCIES = src/libsinglebin_ls.a
+@SINGLE_BINARY_TRUE@src_libsinglebin_arch_a_DEPENDENCIES = src/libsinglebin_uname.a
+@SINGLE_BINARY_TRUE@src_libsinglebin_arch_a_SOURCES = src/coreutils-arch.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_arch_a_ldadd = src/libsinglebin_uname.a
+@SINGLE_BINARY_TRUE@src_libsinglebin_arch_a_CFLAGS = "-Dmain=_single_binary_main_arch(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_arch"  -Dusage=_usage_arch $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_hostname_a_SOURCES = src/hostname.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_hostname_a_ldadd = $(GETHOSTNAME_LIB)
+@SINGLE_BINARY_TRUE@src_libsinglebin_hostname_a_CFLAGS = "-Dmain=_single_binary_main_hostname(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_hostname"  -Dusage=_usage_hostname $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_chroot_a_SOURCES = src/chroot.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_chroot_a_CFLAGS = "-Dmain=_single_binary_main_chroot(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_chroot"  -Dusage=_usage_chroot $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_df_a_SOURCES = src/df.c src/find-mount-point.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_df_a_ldadd = $(LIBICONV)
+@SINGLE_BINARY_TRUE@src_libsinglebin_df_a_CFLAGS = "-Dmain=_single_binary_main_df(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_df"  -Dusage=_usage_df $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_hostid_a_SOURCES = src/hostid.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_hostid_a_CFLAGS = "-Dmain=_single_binary_main_hostid(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_hostid"  -Dusage=_usage_hostid $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_nice_a_SOURCES = src/nice.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_nice_a_CFLAGS = "-Dmain=_single_binary_main_nice(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_nice"  -Dusage=_usage_nice $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_pinky_a_SOURCES = src/pinky.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_pinky_a_ldadd = $(GETADDRINFO_LIB)
+@SINGLE_BINARY_TRUE@src_libsinglebin_pinky_a_CFLAGS = "-Dmain=_single_binary_main_pinky(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_pinky"  -Dusage=_usage_pinky $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_stdbuf_a_SOURCES = src/stdbuf.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_stdbuf_a_ldadd = $(LIBICONV)
+@SINGLE_BINARY_TRUE@src_libsinglebin_stdbuf_a_CFLAGS = "-Dmain=_single_binary_main_stdbuf(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_stdbuf"  -Dusage=_usage_stdbuf $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_stty_a_SOURCES = src/stty.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_stty_a_CFLAGS = "-Dmain=_single_binary_main_stty(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_stty"  -Dusage=_usage_stty $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_uptime_a_SOURCES = src/uptime.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_uptime_a_ldadd = $(GETLOADAVG_LIBS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_uptime_a_CFLAGS = "-Dmain=_single_binary_main_uptime(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_uptime"  -Dusage=_usage_uptime $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_users_a_SOURCES = src/users.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_users_a_CFLAGS = "-Dmain=_single_binary_main_users(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_users"  -Dusage=_usage_users $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_who_a_SOURCES = src/who.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_who_a_ldadd = $(GETADDRINFO_LIB)
+@SINGLE_BINARY_TRUE@src_libsinglebin_who_a_CFLAGS = "-Dmain=_single_binary_main_who(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_who"  -Dusage=_usage_who $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin___a_SOURCES = src/lbracket.c
+@SINGLE_BINARY_TRUE@src_libsinglebin___a_ldadd = $(src_test_LDADD)
+@SINGLE_BINARY_TRUE@src_libsinglebin___a_CFLAGS = "-Dmain=_single_binary_main__(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main__"  -Dusage=_usage__ $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_base64_a_SOURCES = src/base64.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_base64_a_CFLAGS = "-Dmain=_single_binary_main_base64(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_base64"  -Dusage=_usage_base64 $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_basename_a_SOURCES = src/basename.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_basename_a_CFLAGS = "-Dmain=_single_binary_main_basename(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_basename"  -Dusage=_usage_basename $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_cat_a_SOURCES = src/cat.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_cat_a_ldadd = $(LIBICONV)
+@SINGLE_BINARY_TRUE@src_libsinglebin_cat_a_CFLAGS = "-Dmain=_single_binary_main_cat(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_cat"  -Dusage=_usage_cat $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_chcon_a_SOURCES = src/chcon.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_chcon_a_ldadd = $(LIB_SELINUX)
+@SINGLE_BINARY_TRUE@src_libsinglebin_chcon_a_CFLAGS = "-Dmain=_single_binary_main_chcon(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_chcon"  -Dusage=_usage_chcon $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_chgrp_a_SOURCES = src/chgrp.c src/chown-core.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_chgrp_a_CFLAGS = "-Dmain=_single_binary_main_chgrp(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_chgrp"  -Dusage=_usage_chgrp $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_chmod_a_SOURCES = src/chmod.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_chmod_a_CFLAGS = "-Dmain=_single_binary_main_chmod(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_chmod"  -Dusage=_usage_chmod $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_chown_a_SOURCES = src/chown.c src/chown-core.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_chown_a_CFLAGS = "-Dmain=_single_binary_main_chown(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_chown"  -Dusage=_usage_chown $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_cksum_a_SOURCES = src/cksum.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_cksum_a_CFLAGS = "-Dmain=_single_binary_main_cksum(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_cksum"  -Dusage=_usage_cksum $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_comm_a_SOURCES = src/comm.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_comm_a_CFLAGS = "-Dmain=_single_binary_main_comm(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_comm"  -Dusage=_usage_comm $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_cp_a_SOURCES = src/cp.c $(copy_sources) $(selinux_sources)
+@SINGLE_BINARY_TRUE@src_libsinglebin_cp_a_ldadd = $(copy_ldadd)  $(LIBICONV)
+@SINGLE_BINARY_TRUE@src_libsinglebin_cp_a_CFLAGS = "-Dmain=_single_binary_main_cp(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_cp"  -Dusage=_usage_cp $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_csplit_a_SOURCES = src/csplit.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_csplit_a_CFLAGS = "-Dmain=_single_binary_main_csplit(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_csplit"  -Dusage=_usage_csplit $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_cut_a_SOURCES = src/cut.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_cut_a_CFLAGS = "-Dmain=_single_binary_main_cut(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_cut"  -Dusage=_usage_cut $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_date_a_SOURCES = src/date.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_date_a_ldadd = $(LIB_CLOCK_GETTIME)
+@SINGLE_BINARY_TRUE@src_libsinglebin_date_a_CFLAGS = "-Dmain=_single_binary_main_date(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_date"  -Dusage=_usage_date $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_dd_a_SOURCES = src/dd.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_dd_a_ldadd = $(LIB_GETHRXTIME)  $(LIB_FDATASYNC)
+@SINGLE_BINARY_TRUE@src_libsinglebin_dd_a_CFLAGS = "-Dmain=_single_binary_main_dd(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_dd"  -Dusage=_usage_dd $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_dir_a_SOURCES = src/coreutils-dir.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_dir_a_ldadd = $(src_ls_LDADD) src/libsinglebin_ls.a
+@SINGLE_BINARY_TRUE@src_libsinglebin_dir_a_CFLAGS = "-Dmain=_single_binary_main_dir(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_dir"  -Dusage=_usage_dir $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_dircolors_a_SOURCES = src/dircolors.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_dircolors_a_CFLAGS = "-Dmain=_single_binary_main_dircolors(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_dircolors"  -Dusage=_usage_dircolors $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_dirname_a_SOURCES = src/dirname.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_dirname_a_CFLAGS = "-Dmain=_single_binary_main_dirname(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_dirname"  -Dusage=_usage_dirname $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_du_a_SOURCES = src/du.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_du_a_ldadd = $(LIBICONV)
+@SINGLE_BINARY_TRUE@src_libsinglebin_du_a_CFLAGS = "-Dmain=_single_binary_main_du(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_du"  -Dusage=_usage_du $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_echo_a_SOURCES = src/echo.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_echo_a_CFLAGS = "-Dmain=_single_binary_main_echo(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_echo"  -Dusage=_usage_echo $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_env_a_SOURCES = src/env.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_env_a_CFLAGS = "-Dmain=_single_binary_main_env(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_env"  -Dusage=_usage_env $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_expand_a_SOURCES = src/expand.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_expand_a_CFLAGS = "-Dmain=_single_binary_main_expand(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_expand"  -Dusage=_usage_expand $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_expr_a_SOURCES = src/expr.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_expr_a_ldadd = $(LIB_GMP)
+@SINGLE_BINARY_TRUE@src_libsinglebin_expr_a_CFLAGS = "-Dmain=_single_binary_main_expr(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_expr"  -Dusage=_usage_expr $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_factor_a_SOURCES = src/factor.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_factor_a_ldadd = $(LIB_GMP)  $(LIBICONV)
+@SINGLE_BINARY_TRUE@src_libsinglebin_factor_a_CFLAGS = "-Dmain=_single_binary_main_factor(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_factor"  -Dusage=_usage_factor $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_false_a_SOURCES = src/false.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_false_a_CFLAGS = "-Dmain=_single_binary_main_false(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_false"  -Dusage=_usage_false $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_fmt_a_SOURCES = src/fmt.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_fmt_a_CFLAGS = "-Dmain=_single_binary_main_fmt(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_fmt"  -Dusage=_usage_fmt $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_fold_a_SOURCES = src/fold.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_fold_a_CFLAGS = "-Dmain=_single_binary_main_fold(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_fold"  -Dusage=_usage_fold $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_ginstall_a_SOURCES = src/install.c src/prog-fprintf.c $(copy_sources) $(selinux_sources)
+@SINGLE_BINARY_TRUE@src_libsinglebin_ginstall_a_ldadd = $(copy_ldadd)  $(LIB_SELINUX)  $(LIB_CLOCK_GETTIME)
+@SINGLE_BINARY_TRUE@src_libsinglebin_ginstall_a_CFLAGS = "-Dmain=_single_binary_main_ginstall(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_ginstall"  -Dusage=_usage_ginstall $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_ginstall_a_CPPFLAGS = -DENABLE_MATCHPATHCON=1 $(AM_CPPFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_groups_a_SOURCES = src/groups.c src/group-list.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_groups_a_CFLAGS = "-Dmain=_single_binary_main_groups(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_groups"  -Dusage=_usage_groups $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_head_a_SOURCES = src/head.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_head_a_CFLAGS = "-Dmain=_single_binary_main_head(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_head"  -Dusage=_usage_head $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_id_a_SOURCES = src/id.c src/group-list.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_id_a_ldadd = $(LIB_SELINUX)  $(LIB_SMACK)
+@SINGLE_BINARY_TRUE@src_libsinglebin_id_a_CFLAGS = "-Dmain=_single_binary_main_id(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_id"  -Dusage=_usage_id $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_join_a_SOURCES = src/join.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_join_a_CFLAGS = "-Dmain=_single_binary_main_join(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_join"  -Dusage=_usage_join $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_kill_a_SOURCES = src/kill.c src/operand2sig.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_kill_a_ldadd = $(LIBTHREAD)
+@SINGLE_BINARY_TRUE@src_libsinglebin_kill_a_CFLAGS = "-Dmain=_single_binary_main_kill(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_kill"  -Dusage=_usage_kill $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_link_a_SOURCES = src/link.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_link_a_CFLAGS = "-Dmain=_single_binary_main_link(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_link"  -Dusage=_usage_link $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_ln_a_SOURCES = src/ln.c src/relpath.c src/relpath.h
+@SINGLE_BINARY_TRUE@src_libsinglebin_ln_a_CFLAGS = "-Dmain=_single_binary_main_ln(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_ln"  -Dusage=_usage_ln $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_logname_a_SOURCES = src/logname.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_logname_a_CFLAGS = "-Dmain=_single_binary_main_logname(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_logname"  -Dusage=_usage_logname $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_ls_a_SOURCES = src/ls.c src/ls-ls.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_ls_a_ldadd = $(LIB_SELINUX)  $(LIB_SMACK)  $(LIB_CLOCK_GETTIME)  $(LIB_CAP)  $(LIB_ACL)
+@SINGLE_BINARY_TRUE@src_libsinglebin_ls_a_CFLAGS = "-Dmain=_single_binary_main_ls(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_ls"  -Dusage=_usage_ls $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_md5sum_a_SOURCES = src/md5sum.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_md5sum_a_ldadd = $(LIB_CRYPTO)
+@SINGLE_BINARY_TRUE@src_libsinglebin_md5sum_a_CFLAGS = "-Dmain=_single_binary_main_md5sum(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_md5sum"  -Dusage=_usage_md5sum $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_md5sum_a_CPPFLAGS = -DHASH_ALGO_MD5=1 $(AM_CPPFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_mkdir_a_SOURCES = src/mkdir.c src/prog-fprintf.c $(selinux_sources)
+@SINGLE_BINARY_TRUE@src_libsinglebin_mkdir_a_ldadd = $(LIB_SELINUX)  $(LIB_SMACK)
+@SINGLE_BINARY_TRUE@src_libsinglebin_mkdir_a_CFLAGS = "-Dmain=_single_binary_main_mkdir(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_mkdir"  -Dusage=_usage_mkdir $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_mkfifo_a_SOURCES = src/mkfifo.c $(selinux_sources)
+@SINGLE_BINARY_TRUE@src_libsinglebin_mkfifo_a_ldadd = $(LIB_SELINUX)  $(LIB_SMACK)
+@SINGLE_BINARY_TRUE@src_libsinglebin_mkfifo_a_CFLAGS = "-Dmain=_single_binary_main_mkfifo(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_mkfifo"  -Dusage=_usage_mkfifo $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_mknod_a_SOURCES = src/mknod.c $(selinux_sources)
+@SINGLE_BINARY_TRUE@src_libsinglebin_mknod_a_ldadd = $(LIB_SELINUX)  $(LIB_SMACK)
+@SINGLE_BINARY_TRUE@src_libsinglebin_mknod_a_CFLAGS = "-Dmain=_single_binary_main_mknod(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_mknod"  -Dusage=_usage_mknod $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_mktemp_a_SOURCES = src/mktemp.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_mktemp_a_CFLAGS = "-Dmain=_single_binary_main_mktemp(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_mktemp"  -Dusage=_usage_mktemp $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_mv_a_SOURCES = src/mv.c src/remove.c $(copy_sources) $(selinux_sources)
+@SINGLE_BINARY_TRUE@src_libsinglebin_mv_a_ldadd = $(copy_ldadd)  $(remove_ldadd)
+@SINGLE_BINARY_TRUE@src_libsinglebin_mv_a_CFLAGS = "-Dmain=_single_binary_main_mv(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_mv"  -Dusage=_usage_mv $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_nl_a_SOURCES = src/nl.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_nl_a_CFLAGS = "-Dmain=_single_binary_main_nl(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_nl"  -Dusage=_usage_nl $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_nproc_a_SOURCES = src/nproc.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_nproc_a_CFLAGS = "-Dmain=_single_binary_main_nproc(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_nproc"  -Dusage=_usage_nproc $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_nohup_a_SOURCES = src/nohup.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_nohup_a_CFLAGS = "-Dmain=_single_binary_main_nohup(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_nohup"  -Dusage=_usage_nohup $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_numfmt_a_SOURCES = src/numfmt.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_numfmt_a_CFLAGS = "-Dmain=_single_binary_main_numfmt(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_numfmt"  -Dusage=_usage_numfmt $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_od_a_SOURCES = src/od.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_od_a_CFLAGS = "-Dmain=_single_binary_main_od(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_od"  -Dusage=_usage_od $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_paste_a_SOURCES = src/paste.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_paste_a_CFLAGS = "-Dmain=_single_binary_main_paste(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_paste"  -Dusage=_usage_paste $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_pathchk_a_SOURCES = src/pathchk.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_pathchk_a_CFLAGS = "-Dmain=_single_binary_main_pathchk(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_pathchk"  -Dusage=_usage_pathchk $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_pr_a_SOURCES = src/pr.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_pr_a_ldadd = $(LIB_CLOCK_GETTIME)
+@SINGLE_BINARY_TRUE@src_libsinglebin_pr_a_CFLAGS = "-Dmain=_single_binary_main_pr(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_pr"  -Dusage=_usage_pr $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_printenv_a_SOURCES = src/printenv.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_printenv_a_CFLAGS = "-Dmain=_single_binary_main_printenv(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_printenv"  -Dusage=_usage_printenv $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_printf_a_SOURCES = src/printf.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_printf_a_ldadd = $(LIBICONV)
+@SINGLE_BINARY_TRUE@src_libsinglebin_printf_a_CFLAGS = "-Dmain=_single_binary_main_printf(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_printf"  -Dusage=_usage_printf $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_ptx_a_SOURCES = src/ptx.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_ptx_a_ldadd = $(LIBICONV)
+@SINGLE_BINARY_TRUE@src_libsinglebin_ptx_a_CFLAGS = "-Dmain=_single_binary_main_ptx(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_ptx"  -Dusage=_usage_ptx $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_pwd_a_SOURCES = src/pwd.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_pwd_a_CFLAGS = "-Dmain=_single_binary_main_pwd(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_pwd"  -Dusage=_usage_pwd $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_readlink_a_SOURCES = src/readlink.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_readlink_a_CFLAGS = "-Dmain=_single_binary_main_readlink(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_readlink"  -Dusage=_usage_readlink $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_realpath_a_SOURCES = src/realpath.c src/relpath.c src/relpath.h
+@SINGLE_BINARY_TRUE@src_libsinglebin_realpath_a_ldadd = $(LIBICONV)
+@SINGLE_BINARY_TRUE@src_libsinglebin_realpath_a_CFLAGS = "-Dmain=_single_binary_main_realpath(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_realpath"  -Dusage=_usage_realpath $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_rm_a_SOURCES = src/rm.c src/remove.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_rm_a_ldadd = $(remove_ldadd)
+@SINGLE_BINARY_TRUE@src_libsinglebin_rm_a_CFLAGS = "-Dmain=_single_binary_main_rm(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_rm"  -Dusage=_usage_rm $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_rmdir_a_SOURCES = src/rmdir.c src/prog-fprintf.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_rmdir_a_CFLAGS = "-Dmain=_single_binary_main_rmdir(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_rmdir"  -Dusage=_usage_rmdir $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_runcon_a_SOURCES = src/runcon.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_runcon_a_ldadd = $(LIB_SELINUX)
+@SINGLE_BINARY_TRUE@src_libsinglebin_runcon_a_CFLAGS = "-Dmain=_single_binary_main_runcon(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_runcon"  -Dusage=_usage_runcon $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_seq_a_SOURCES = src/seq.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_seq_a_CFLAGS = "-Dmain=_single_binary_main_seq(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_seq"  -Dusage=_usage_seq $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_sha1sum_a_SOURCES = src/md5sum.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_sha1sum_a_ldadd = $(LIB_CRYPTO)
+@SINGLE_BINARY_TRUE@src_libsinglebin_sha1sum_a_CFLAGS = "-Dmain=_single_binary_main_sha1sum(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_sha1sum"  -Dusage=_usage_sha1sum $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_sha1sum_a_CPPFLAGS = -DHASH_ALGO_SHA1=1 $(AM_CPPFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_sha224sum_a_SOURCES = src/md5sum.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_sha224sum_a_ldadd = $(LIB_CRYPTO)
+@SINGLE_BINARY_TRUE@src_libsinglebin_sha224sum_a_CFLAGS = "-Dmain=_single_binary_main_sha224sum(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_sha224sum"  -Dusage=_usage_sha224sum $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_sha224sum_a_CPPFLAGS = -DHASH_ALGO_SHA224=1 $(AM_CPPFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_sha256sum_a_SOURCES = src/md5sum.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_sha256sum_a_ldadd = $(LIB_CRYPTO)
+@SINGLE_BINARY_TRUE@src_libsinglebin_sha256sum_a_CFLAGS = "-Dmain=_single_binary_main_sha256sum(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_sha256sum"  -Dusage=_usage_sha256sum $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_sha256sum_a_CPPFLAGS = -DHASH_ALGO_SHA256=1 $(AM_CPPFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_sha384sum_a_SOURCES = src/md5sum.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_sha384sum_a_ldadd = $(LIB_CRYPTO)
+@SINGLE_BINARY_TRUE@src_libsinglebin_sha384sum_a_CFLAGS = "-Dmain=_single_binary_main_sha384sum(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_sha384sum"  -Dusage=_usage_sha384sum $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_sha384sum_a_CPPFLAGS = -DHASH_ALGO_SHA384=1 $(AM_CPPFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_sha512sum_a_SOURCES = src/md5sum.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_sha512sum_a_ldadd = $(LIB_CRYPTO)
+@SINGLE_BINARY_TRUE@src_libsinglebin_sha512sum_a_CFLAGS = "-Dmain=_single_binary_main_sha512sum(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_sha512sum"  -Dusage=_usage_sha512sum $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_sha512sum_a_CPPFLAGS = -DHASH_ALGO_SHA512=1 $(AM_CPPFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_shred_a_SOURCES = src/shred.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_shred_a_ldadd = $(LIB_FDATASYNC)
+@SINGLE_BINARY_TRUE@src_libsinglebin_shred_a_CFLAGS = "-Dmain=_single_binary_main_shred(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_shred"  -Dusage=_usage_shred $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_shuf_a_SOURCES = src/shuf.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_shuf_a_CFLAGS = "-Dmain=_single_binary_main_shuf(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_shuf"  -Dusage=_usage_shuf $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_sleep_a_SOURCES = src/sleep.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_sleep_a_ldadd = $(LIB_NANOSLEEP)
+@SINGLE_BINARY_TRUE@src_libsinglebin_sleep_a_CFLAGS = "-Dmain=_single_binary_main_sleep(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_sleep"  -Dusage=_usage_sleep $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_sort_a_SOURCES = src/sort.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_sort_a_ldadd = $(LIB_EACCESS)  $(LIB_NANOSLEEP)  $(LIB_CRYPTO)  $(LIB_PTHREAD)
+@SINGLE_BINARY_TRUE@src_libsinglebin_sort_a_CFLAGS = "-Dmain=_single_binary_main_sort(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_sort"  -Dusage=_usage_sort $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_split_a_SOURCES = src/split.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_split_a_ldadd = $(LIBICONV)
+@SINGLE_BINARY_TRUE@src_libsinglebin_split_a_CFLAGS = "-Dmain=_single_binary_main_split(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_split"  -Dusage=_usage_split $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_stat_a_SOURCES = src/stat.c src/find-mount-point.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_stat_a_ldadd = $(LIB_SELINUX)  $(LIB_NVPAIR)
+@SINGLE_BINARY_TRUE@src_libsinglebin_stat_a_CFLAGS = "-Dmain=_single_binary_main_stat(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_stat"  -Dusage=_usage_stat $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_sum_a_SOURCES = src/sum.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_sum_a_CFLAGS = "-Dmain=_single_binary_main_sum(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_sum"  -Dusage=_usage_sum $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_sync_a_SOURCES = src/sync.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_sync_a_CFLAGS = "-Dmain=_single_binary_main_sync(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_sync"  -Dusage=_usage_sync $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_tac_a_SOURCES = src/tac.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_tac_a_CFLAGS = "-Dmain=_single_binary_main_tac(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_tac"  -Dusage=_usage_tac $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_tail_a_SOURCES = src/tail.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_tail_a_ldadd = $(LIB_NANOSLEEP)
+@SINGLE_BINARY_TRUE@src_libsinglebin_tail_a_CFLAGS = "-Dmain=_single_binary_main_tail(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_tail"  -Dusage=_usage_tail $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_tee_a_SOURCES = src/tee.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_tee_a_CFLAGS = "-Dmain=_single_binary_main_tee(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_tee"  -Dusage=_usage_tee $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_test_a_SOURCES = src/test.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_test_a_ldadd = $(LIB_EACCESS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_test_a_CFLAGS = "-Dmain=_single_binary_main_test(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_test"  -Dusage=_usage_test $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_timeout_a_SOURCES = src/timeout.c src/operand2sig.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_timeout_a_ldadd = $(LIB_TIMER_TIME)  $(LIBICONV)
+@SINGLE_BINARY_TRUE@src_libsinglebin_timeout_a_CFLAGS = "-Dmain=_single_binary_main_timeout(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_timeout"  -Dusage=_usage_timeout $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_touch_a_SOURCES = src/touch.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_touch_a_ldadd = $(LIB_CLOCK_GETTIME)
+@SINGLE_BINARY_TRUE@src_libsinglebin_touch_a_CFLAGS = "-Dmain=_single_binary_main_touch(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_touch"  -Dusage=_usage_touch $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_tr_a_SOURCES = src/tr.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_tr_a_CFLAGS = "-Dmain=_single_binary_main_tr(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_tr"  -Dusage=_usage_tr $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_true_a_SOURCES = src/true.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_true_a_CFLAGS = "-Dmain=_single_binary_main_true(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_true"  -Dusage=_usage_true $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_truncate_a_SOURCES = src/truncate.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_truncate_a_ldadd = $(LIBICONV)
+@SINGLE_BINARY_TRUE@src_libsinglebin_truncate_a_CFLAGS = "-Dmain=_single_binary_main_truncate(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_truncate"  -Dusage=_usage_truncate $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_tsort_a_SOURCES = src/tsort.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_tsort_a_CFLAGS = "-Dmain=_single_binary_main_tsort(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_tsort"  -Dusage=_usage_tsort $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_tty_a_SOURCES = src/tty.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_tty_a_CFLAGS = "-Dmain=_single_binary_main_tty(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_tty"  -Dusage=_usage_tty $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_uname_a_SOURCES = src/uname.c src/uname-uname.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_uname_a_ldadd = $(GETHOSTNAME_LIB)
+@SINGLE_BINARY_TRUE@src_libsinglebin_uname_a_CFLAGS = "-Dmain=_single_binary_main_uname(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_uname"  -Dusage=_usage_uname $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_unexpand_a_SOURCES = src/unexpand.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_unexpand_a_CFLAGS = "-Dmain=_single_binary_main_unexpand(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_unexpand"  -Dusage=_usage_unexpand $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_uniq_a_SOURCES = src/uniq.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_uniq_a_CFLAGS = "-Dmain=_single_binary_main_uniq(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_uniq"  -Dusage=_usage_uniq $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_unlink_a_SOURCES = src/unlink.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_unlink_a_CFLAGS = "-Dmain=_single_binary_main_unlink(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_unlink"  -Dusage=_usage_unlink $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_vdir_a_SOURCES = src/coreutils-vdir.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_vdir_a_ldadd = $(src_ls_LDADD) src/libsinglebin_ls.a
+@SINGLE_BINARY_TRUE@src_libsinglebin_vdir_a_CFLAGS = "-Dmain=_single_binary_main_vdir(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_vdir"  -Dusage=_usage_vdir $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_wc_a_SOURCES = src/wc.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_wc_a_CFLAGS = "-Dmain=_single_binary_main_wc(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_wc"  -Dusage=_usage_wc $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_whoami_a_SOURCES = src/whoami.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_whoami_a_CFLAGS = "-Dmain=_single_binary_main_whoami(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_whoami"  -Dusage=_usage_whoami $(src_coreutils_CFLAGS)
+@SINGLE_BINARY_TRUE@src_libsinglebin_yes_a_SOURCES = src/yes.c
+@SINGLE_BINARY_TRUE@src_libsinglebin_yes_a_CFLAGS = "-Dmain=_single_binary_main_yes(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_yes"  -Dusage=_usage_yes $(src_coreutils_CFLAGS)
+
+# Creates symlinks or shebangs to the installed programs when building
+# coreutils single binary.
+@SINGLE_BINARY_TRUE@EXTRA_src_coreutils_DEPENDENCIES = src/coreutils_$(single_binary_install_type)
 
 # false exits nonzero even with --help or --version.
 # test doesn't support --help or --version.
@@ -3439,7 +5016,7 @@ TESTS_ENVIRONMENT = \
   abs_top_builddir='$(abs_top_builddir)'	\
   abs_top_srcdir='$(abs_top_srcdir)'		\
   abs_srcdir='$(abs_srcdir)'			\
-  built_programs='$(built_programs)'		\
+  built_programs='$(built_programs) $(single_binary_progs)' \
   host_os=$(host_os)				\
   host_triplet='$(host_triplet)'		\
   srcdir='$(srcdir)'				\
@@ -3451,7 +5028,6 @@ TESTS_ENVIRONMENT = \
   EGREP='$(EGREP)'				\
   EXEEXT='$(EXEEXT)'				\
   MAKE=$(MAKE)					\
-  PACKAGE_BUGREPORT='$(PACKAGE_BUGREPORT)'	\
   PACKAGE_VERSION=$(PACKAGE_VERSION)		\
   PERL='$(PERL)'				\
   PREFERABLY_POSIX_SHELL='$(PREFERABLY_POSIX_SHELL)' \
@@ -3472,16 +5048,18 @@ all_root_tests = \
   tests/cp/sparse-fiemap.sh			\
   tests/dd/skip-seek-past-dev.sh		\
   tests/df/problematic-chars.sh			\
+  tests/df/over-mount-device.sh			\
   tests/du/bind-mount-dir-cycle.sh		\
+  tests/id/setgid.sh				\
   tests/install/install-C-root.sh		\
   tests/ls/capability.sh			\
   tests/ls/nameless-uid.sh			\
   tests/misc/chcon.sh				\
   tests/misc/chroot-credentials.sh		\
-  tests/misc/id-setgid.sh			\
   tests/misc/selinux.sh				\
   tests/misc/truncate-owned-by-other.sh		\
   tests/mkdir/writable-under-readonly.sh	\
+  tests/mkdir/smack-root.sh			\
   tests/mv/sticky-to-xpart.sh			\
   tests/rm/fail-2eperm.sh			\
   tests/rm/no-give-up.sh			\
@@ -3513,6 +5091,7 @@ all_tests = \
   tests/rm/ext3-perf.sh				\
   tests/rm/cycle.sh				\
   tests/cp/link-heap.sh				\
+  tests/cp/no-ctx.sh				\
   tests/misc/tty-eof.pl				\
   tests/tail-2/inotify-hash-abuse.sh		\
   tests/tail-2/inotify-hash-abuse2.sh		\
@@ -3553,6 +5132,7 @@ all_tests = \
   tests/rm/r-2.sh				\
   tests/rm/r-3.sh				\
   tests/rm/r-4.sh				\
+  tests/rm/r-root.sh				\
   tests/rm/readdir-bug.sh			\
   tests/rm/rm1.sh				\
   tests/touch/empty-file.sh			\
@@ -3589,6 +5169,7 @@ all_tests = \
   tests/misc/xstrtol.pl				\
   tests/tail-2/pid.sh				\
   tests/misc/od.pl				\
+  tests/misc/od-endian.sh			\
   tests/misc/od-float.sh			\
   tests/misc/mktemp.pl				\
   tests/misc/arch.sh				\
@@ -3596,8 +5177,9 @@ all_tests = \
   tests/pr/pr-tests.pl				\
   tests/misc/pwd-option.sh			\
   tests/misc/chcon-fail.sh			\
+  tests/misc/coreutils.sh			\
   tests/misc/cut.pl				\
-  tests/misc/cut-huge-to-eol-range.sh		\
+  tests/misc/cut-huge-range.sh			\
   tests/misc/wc.pl				\
   tests/misc/wc-files0-from.pl			\
   tests/misc/wc-files0.sh			\
@@ -3612,6 +5194,7 @@ all_tests = \
   tests/misc/csplit.sh				\
   tests/misc/csplit-1000.sh			\
   tests/misc/csplit-heap.sh			\
+  tests/misc/csplit-suppress-matched.pl		\
   tests/misc/date-sec.sh			\
   tests/misc/dircolors.pl			\
   tests/misc/dirname.pl				\
@@ -3625,9 +5208,7 @@ all_tests = \
   tests/misc/groups-version.sh			\
   tests/misc/head-c.sh				\
   tests/misc/head-pos.sh			\
-  tests/misc/id-context.sh			\
-  tests/misc/id-groups.sh			\
-  tests/misc/id-setgid.sh			\
+  tests/misc/head-write-error.sh		\
   tests/misc/md5sum.pl				\
   tests/misc/md5sum-bsd.sh			\
   tests/misc/md5sum-newline.pl			\
@@ -3662,9 +5243,11 @@ all_tests = \
   tests/misc/sha384sum.pl			\
   tests/misc/sha512sum.pl			\
   tests/misc/shred-exact.sh			\
+  tests/misc/shred-negative.sh			\
   tests/misc/shred-passes.sh			\
   tests/misc/shred-remove.sh			\
   tests/misc/shuf.sh				\
+  tests/misc/shuf-reservoir.sh			\
   tests/misc/sort.pl				\
   tests/misc/sort-benchmark-random.sh		\
   tests/misc/sort-compress.sh			\
@@ -3695,6 +5278,7 @@ all_tests = \
   tests/split/b-chunk.sh			\
   tests/split/fail.sh				\
   tests/split/lines.sh				\
+  tests/split/line-bytes.sh			\
   tests/split/l-chunk.sh			\
   tests/split/r-chunk.sh			\
   tests/split/numeric.sh			\
@@ -3740,6 +5324,8 @@ all_tests = \
   tests/misc/uniq-perf.sh			\
   tests/misc/xattr.sh				\
   tests/tail-2/wait.sh				\
+  tests/tail-2/retry.sh				\
+  tests/tail-2/symlink.sh				\
   tests/chmod/c-option.sh			\
   tests/chmod/equal-x.sh			\
   tests/chmod/equals.sh				\
@@ -3778,6 +5364,7 @@ all_tests = \
   tests/cp/file-perm-race.sh			\
   tests/cp/into-self.sh				\
   tests/cp/link.sh				\
+  tests/cp/link-deref.sh			\
   tests/cp/link-no-deref.sh			\
   tests/cp/link-preserve.sh			\
   tests/cp/link-symlink.sh			\
@@ -3808,13 +5395,16 @@ all_tests = \
   tests/df/header.sh				\
   tests/df/df-P.sh				\
   tests/df/df-output.sh				\
+  tests/df/df-symlink.sh			\
   tests/df/unreadable.sh			\
   tests/df/total-unprocessed.sh			\
   tests/df/no-mtab-status.sh			\
   tests/df/skip-duplicates.sh			\
   tests/df/skip-rootfs.sh			\
+  tests/dd/ascii.sh				\
   tests/dd/direct.sh				\
   tests/dd/misc.sh				\
+  tests/dd/no-allocate.sh				\
   tests/dd/nocache.sh				\
   tests/dd/not-rewound.sh			\
   tests/dd/reblock.sh				\
@@ -3841,6 +5431,7 @@ all_tests = \
   tests/du/inacc-dest.sh			\
   tests/du/inacc-dir.sh				\
   tests/du/inaccessible-cwd.sh			\
+  tests/du/inodes.sh				\
   tests/du/long-from-unreadable.sh		\
   tests/du/long-sloop.sh			\
   tests/du/max-depth.sh				\
@@ -3855,6 +5446,11 @@ all_tests = \
   tests/du/two-args.sh				\
   tests/id/gnu-zero-uids.sh			\
   tests/id/no-context.sh			\
+  tests/id/context.sh				\
+  tests/id/uid.sh				\
+  tests/id/setgid.sh				\
+  tests/id/zero.sh				\
+  tests/id/smack.sh				\
   tests/install/basic-1.sh			\
   tests/install/create-leading.sh		\
   tests/install/d-slashdot.sh			\
@@ -3875,6 +5471,7 @@ all_tests = \
   tests/ls/color-clear-to-eol.sh		\
   tests/ls/color-dtype-dir.sh			\
   tests/ls/color-norm.sh			\
+  tests/ls/color-term.sh			\
   tests/ls/dangle.sh				\
   tests/ls/dired.sh				\
   tests/ls/file-type.sh				\
@@ -3903,14 +5500,18 @@ all_tests = \
   tests/mkdir/p-1.sh				\
   tests/mkdir/p-2.sh				\
   tests/mkdir/p-3.sh				\
+  tests/mkdir/p-acl.sh				\
   tests/mkdir/p-slashdot.sh			\
   tests/mkdir/p-thru-slink.sh			\
   tests/mkdir/p-v.sh				\
   tests/mkdir/parents.sh			\
   tests/mkdir/perm.sh				\
   tests/mkdir/selinux.sh			\
+  tests/mkdir/restorecon.sh			\
   tests/mkdir/special-1.sh			\
   tests/mkdir/t-slash.sh			\
+  tests/mkdir/smack-no-root.sh			\
+  tests/mkdir/smack-root.sh			\
   tests/mv/acl.sh				\
   tests/mv/atomic.sh				\
   tests/mv/atomic2.sh				\
@@ -4163,10 +5764,10 @@ all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-.SUFFIXES: .1 .c .dvi .html .log .o .obj .pl .pl$(EXEEXT) .ps .sed .sh .sh$(EXEEXT) .sin .x .xpl .xpl$(EXEEXT) .y
+.SUFFIXES: .1 .c .dvi .log .o .obj .pl .pl$(EXEEXT) .ps .sed .sh .sh$(EXEEXT) .sin .trs .x .xpl .xpl$(EXEEXT) .y
 am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/lib/local.mk $(srcdir)/lib/gnulib.mk $(top_srcdir)/src/local.mk $(srcdir)/src/cu-progs.mk $(top_srcdir)/doc/local.mk $(top_srcdir)/man/local.mk $(top_srcdir)/tests/local.mk $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/lib/local.mk $(srcdir)/lib/gnulib.mk $(top_srcdir)/src/local.mk $(srcdir)/src/cu-progs.mk $(top_srcdir)/src/single-binary.mk $(top_srcdir)/doc/local.mk $(top_srcdir)/man/local.mk $(top_srcdir)/tests/local.mk $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -4189,7 +5790,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
-$(top_srcdir)/lib/local.mk $(srcdir)/lib/gnulib.mk $(top_srcdir)/src/local.mk $(srcdir)/src/cu-progs.mk $(top_srcdir)/doc/local.mk $(top_srcdir)/man/local.mk $(top_srcdir)/tests/local.mk:
+$(top_srcdir)/lib/local.mk $(srcdir)/lib/gnulib.mk $(top_srcdir)/src/local.mk $(srcdir)/src/cu-progs.mk $(top_srcdir)/src/single-binary.mk $(top_srcdir)/doc/local.mk $(top_srcdir)/man/local.mk $(top_srcdir)/tests/local.mk:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -4201,8 +5802,8 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 
 lib/config.h: lib/stamp-h1
-	@if test ! -f $@; then rm -f lib/stamp-h1; else :; fi
-	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) lib/stamp-h1; else :; fi
+	@test -f $@ || rm -f lib/stamp-h1
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) lib/stamp-h1
 
 lib/stamp-h1: $(top_srcdir)/lib/config.hin $(top_builddir)/config.status
 	@rm -f lib/stamp-h1
@@ -4223,11 +5824,9 @@ lib/$(am__dirstamp):
 lib/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) lib/$(DEPDIR)
 	@: > lib/$(DEPDIR)/$(am__dirstamp)
-lib/set-mode-acl.$(OBJEXT): lib/$(am__dirstamp) \
-	lib/$(DEPDIR)/$(am__dirstamp)
 lib/copy-acl.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
-lib/file-has-acl.$(OBJEXT): lib/$(am__dirstamp) \
+lib/set-acl.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
 lib/allocator.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
@@ -4245,8 +5844,6 @@ lib/backupfile.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
 lib/base64.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
-lib/binary-io.$(OBJEXT): lib/$(am__dirstamp) \
-	lib/$(DEPDIR)/$(am__dirstamp)
 lib/bitrotate.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
 lib/buffer-lcm.$(OBJEXT): lib/$(am__dirstamp) \
@@ -4309,8 +5906,6 @@ lib/exitfail.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
 lib/fadvise.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
-lib/fatal-signal.$(OBJEXT): lib/$(am__dirstamp) \
-	lib/$(DEPDIR)/$(am__dirstamp)
 lib/chmodat.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
 lib/chownat.$(OBJEXT): lib/$(am__dirstamp) \
@@ -4455,9 +6050,6 @@ lib/parse-datetime.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
 lib/physmem.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
-lib/pipe2.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp)
-lib/pipe2-safer.$(OBJEXT): lib/$(am__dirstamp) \
-	lib/$(DEPDIR)/$(am__dirstamp)
 lib/posixtm.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
 lib/posixver.$(OBJEXT): lib/$(am__dirstamp) \
@@ -4472,6 +6064,14 @@ lib/progname.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
 lib/propername.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
+lib/acl-errno-valid.$(OBJEXT): lib/$(am__dirstamp) \
+	lib/$(DEPDIR)/$(am__dirstamp)
+lib/file-has-acl.$(OBJEXT): lib/$(am__dirstamp) \
+	lib/$(DEPDIR)/$(am__dirstamp)
+lib/qcopy-acl.$(OBJEXT): lib/$(am__dirstamp) \
+	lib/$(DEPDIR)/$(am__dirstamp)
+lib/qset-acl.$(OBJEXT): lib/$(am__dirstamp) \
+	lib/$(DEPDIR)/$(am__dirstamp)
 lib/quotearg.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
 lib/randint.$(OBJEXT): lib/$(am__dirstamp) \
@@ -4511,8 +6111,6 @@ lib/sig-handler.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
 lib/sockets.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
-lib/spawn-pipe.$(OBJEXT): lib/$(am__dirstamp) \
-	lib/$(DEPDIR)/$(am__dirstamp)
 lib/stat-time.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
 lib/statat.$(OBJEXT): lib/$(am__dirstamp) \
@@ -4583,8 +6181,6 @@ lib/version-etc.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
 lib/version-etc-fsf.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
-lib/wait-process.$(OBJEXT): lib/$(am__dirstamp) \
-	lib/$(DEPDIR)/$(am__dirstamp)
 lib/wctype-h.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
 lib/write-any-file.$(OBJEXT): lib/$(am__dirstamp) \
@@ -4634,8 +6230,6 @@ lib/xvasprintf.$(OBJEXT): lib/$(am__dirstamp) \
 lib/xasprintf.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
 lib/yesno.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp)
-lib/acl_entries.$(OBJEXT): lib/$(am__dirstamp) \
-	lib/$(DEPDIR)/$(am__dirstamp)
 lib/alloca.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
 lib/at-func.$(OBJEXT): lib/$(am__dirstamp) \
@@ -4837,35 +6431,14 @@ lib/openat.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
 lib/opendir.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
-lib/spawni.$(OBJEXT): lib/$(am__dirstamp) \
-	lib/$(DEPDIR)/$(am__dirstamp)
-lib/spawn_faction_addclose.$(OBJEXT): lib/$(am__dirstamp) \
-	lib/$(DEPDIR)/$(am__dirstamp)
-lib/spawn_faction_adddup2.$(OBJEXT): lib/$(am__dirstamp) \
-	lib/$(DEPDIR)/$(am__dirstamp)
-lib/spawn_faction_addopen.$(OBJEXT): lib/$(am__dirstamp) \
-	lib/$(DEPDIR)/$(am__dirstamp)
-lib/spawn_faction_destroy.$(OBJEXT): lib/$(am__dirstamp) \
-	lib/$(DEPDIR)/$(am__dirstamp)
-lib/spawn_faction_init.$(OBJEXT): lib/$(am__dirstamp) \
-	lib/$(DEPDIR)/$(am__dirstamp)
-lib/spawnattr_destroy.$(OBJEXT): lib/$(am__dirstamp) \
-	lib/$(DEPDIR)/$(am__dirstamp)
-lib/spawnattr_init.$(OBJEXT): lib/$(am__dirstamp) \
-	lib/$(DEPDIR)/$(am__dirstamp)
-lib/spawnattr_setflags.$(OBJEXT): lib/$(am__dirstamp) \
-	lib/$(DEPDIR)/$(am__dirstamp)
-lib/spawnattr_setsigmask.$(OBJEXT): lib/$(am__dirstamp) \
-	lib/$(DEPDIR)/$(am__dirstamp)
-lib/spawnp.$(OBJEXT): lib/$(am__dirstamp) \
-	lib/$(DEPDIR)/$(am__dirstamp)
+lib/pipe.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp)
 lib/pthread.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
 lib/putenv.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
-lib/raise.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp)
-lib/rawmemchr.$(OBJEXT): lib/$(am__dirstamp) \
+lib/acl_entries.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
+lib/raise.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp)
 lib/read.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp)
 lib/readdir.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
@@ -4893,6 +6466,8 @@ lib/rewinddir.$(OBJEXT): lib/$(am__dirstamp) \
 lib/rmdir.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp)
 lib/rpmatch.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
+lib/secure_getenv.$(OBJEXT): lib/$(am__dirstamp) \
+	lib/$(DEPDIR)/$(am__dirstamp)
 lib/select.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
 lib/selinux-at.$(OBJEXT): lib/$(am__dirstamp) \
@@ -4920,8 +6495,6 @@ lib/stpcpy.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
 lib/stpncpy.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
-lib/strchrnul.$(OBJEXT): lib/$(am__dirstamp) \
-	lib/$(DEPDIR)/$(am__dirstamp)
 lib/strdup.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
 lib/strerror.$(OBJEXT): lib/$(am__dirstamp) \
@@ -4983,8 +6556,6 @@ lib/vfprintf.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
 lib/vprintf.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
-lib/waitpid.$(OBJEXT): lib/$(am__dirstamp) \
-	lib/$(DEPDIR)/$(am__dirstamp)
 lib/wcrtomb.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
 lib/wcswidth.$(OBJEXT): lib/$(am__dirstamp) \
@@ -4992,6 +6563,7 @@ lib/wcswidth.$(OBJEXT): lib/$(am__dirstamp) \
 lib/wcwidth.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
 lib/write.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp)
+
 lib/libcoreutils.a: $(lib_libcoreutils_a_OBJECTS) $(lib_libcoreutils_a_DEPENDENCIES) $(EXTRA_lib_libcoreutils_a_DEPENDENCIES) lib/$(am__dirstamp)
 	$(AM_V_at)-rm -f lib/libcoreutils.a
 	$(AM_V_AR)$(lib_libcoreutils_a_AR) lib/libcoreutils.a $(lib_libcoreutils_a_OBJECTS) $(lib_libcoreutils_a_LIBADD)
@@ -5002,8 +6574,808 @@ src/$(am__dirstamp):
 src/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) src/$(DEPDIR)
 	@: > src/$(DEPDIR)/$(am__dirstamp)
+src/src_libsinglebin___a-lbracket.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin__.a: $(src_libsinglebin___a_OBJECTS) $(src_libsinglebin___a_DEPENDENCIES) $(EXTRA_src_libsinglebin___a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin__.a
+	$(AM_V_AR)$(src_libsinglebin___a_AR) src/libsinglebin__.a $(src_libsinglebin___a_OBJECTS) $(src_libsinglebin___a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin__.a
+src/src_libsinglebin_arch_a-coreutils-arch.$(OBJEXT):  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_arch.a: $(src_libsinglebin_arch_a_OBJECTS) $(src_libsinglebin_arch_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_arch_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_arch.a
+	$(AM_V_AR)$(src_libsinglebin_arch_a_AR) src/libsinglebin_arch.a $(src_libsinglebin_arch_a_OBJECTS) $(src_libsinglebin_arch_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_arch.a
+src/src_libsinglebin_base64_a-base64.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_base64.a: $(src_libsinglebin_base64_a_OBJECTS) $(src_libsinglebin_base64_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_base64_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_base64.a
+	$(AM_V_AR)$(src_libsinglebin_base64_a_AR) src/libsinglebin_base64.a $(src_libsinglebin_base64_a_OBJECTS) $(src_libsinglebin_base64_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_base64.a
+src/src_libsinglebin_basename_a-basename.$(OBJEXT):  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_basename.a: $(src_libsinglebin_basename_a_OBJECTS) $(src_libsinglebin_basename_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_basename_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_basename.a
+	$(AM_V_AR)$(src_libsinglebin_basename_a_AR) src/libsinglebin_basename.a $(src_libsinglebin_basename_a_OBJECTS) $(src_libsinglebin_basename_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_basename.a
+src/src_libsinglebin_cat_a-cat.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_cat.a: $(src_libsinglebin_cat_a_OBJECTS) $(src_libsinglebin_cat_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_cat_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_cat.a
+	$(AM_V_AR)$(src_libsinglebin_cat_a_AR) src/libsinglebin_cat.a $(src_libsinglebin_cat_a_OBJECTS) $(src_libsinglebin_cat_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_cat.a
+src/src_libsinglebin_chcon_a-chcon.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_chcon.a: $(src_libsinglebin_chcon_a_OBJECTS) $(src_libsinglebin_chcon_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_chcon_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_chcon.a
+	$(AM_V_AR)$(src_libsinglebin_chcon_a_AR) src/libsinglebin_chcon.a $(src_libsinglebin_chcon_a_OBJECTS) $(src_libsinglebin_chcon_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_chcon.a
+src/src_libsinglebin_chgrp_a-chgrp.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/src_libsinglebin_chgrp_a-chown-core.$(OBJEXT):  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_chgrp.a: $(src_libsinglebin_chgrp_a_OBJECTS) $(src_libsinglebin_chgrp_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_chgrp_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_chgrp.a
+	$(AM_V_AR)$(src_libsinglebin_chgrp_a_AR) src/libsinglebin_chgrp.a $(src_libsinglebin_chgrp_a_OBJECTS) $(src_libsinglebin_chgrp_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_chgrp.a
+src/src_libsinglebin_chmod_a-chmod.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_chmod.a: $(src_libsinglebin_chmod_a_OBJECTS) $(src_libsinglebin_chmod_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_chmod_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_chmod.a
+	$(AM_V_AR)$(src_libsinglebin_chmod_a_AR) src/libsinglebin_chmod.a $(src_libsinglebin_chmod_a_OBJECTS) $(src_libsinglebin_chmod_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_chmod.a
+src/src_libsinglebin_chown_a-chown.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/src_libsinglebin_chown_a-chown-core.$(OBJEXT):  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_chown.a: $(src_libsinglebin_chown_a_OBJECTS) $(src_libsinglebin_chown_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_chown_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_chown.a
+	$(AM_V_AR)$(src_libsinglebin_chown_a_AR) src/libsinglebin_chown.a $(src_libsinglebin_chown_a_OBJECTS) $(src_libsinglebin_chown_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_chown.a
+src/src_libsinglebin_chroot_a-chroot.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_chroot.a: $(src_libsinglebin_chroot_a_OBJECTS) $(src_libsinglebin_chroot_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_chroot_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_chroot.a
+	$(AM_V_AR)$(src_libsinglebin_chroot_a_AR) src/libsinglebin_chroot.a $(src_libsinglebin_chroot_a_OBJECTS) $(src_libsinglebin_chroot_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_chroot.a
+src/src_libsinglebin_cksum_a-cksum.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_cksum.a: $(src_libsinglebin_cksum_a_OBJECTS) $(src_libsinglebin_cksum_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_cksum_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_cksum.a
+	$(AM_V_AR)$(src_libsinglebin_cksum_a_AR) src/libsinglebin_cksum.a $(src_libsinglebin_cksum_a_OBJECTS) $(src_libsinglebin_cksum_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_cksum.a
+src/src_libsinglebin_comm_a-comm.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_comm.a: $(src_libsinglebin_comm_a_OBJECTS) $(src_libsinglebin_comm_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_comm_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_comm.a
+	$(AM_V_AR)$(src_libsinglebin_comm_a_AR) src/libsinglebin_comm.a $(src_libsinglebin_comm_a_OBJECTS) $(src_libsinglebin_comm_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_comm.a
+src/src_libsinglebin_cp_a-cp.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/src_libsinglebin_cp_a-copy.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/src_libsinglebin_cp_a-cp-hash.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/src_libsinglebin_cp_a-extent-scan.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/src_libsinglebin_cp_a-selinux.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_cp.a: $(src_libsinglebin_cp_a_OBJECTS) $(src_libsinglebin_cp_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_cp_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_cp.a
+	$(AM_V_AR)$(src_libsinglebin_cp_a_AR) src/libsinglebin_cp.a $(src_libsinglebin_cp_a_OBJECTS) $(src_libsinglebin_cp_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_cp.a
+src/src_libsinglebin_csplit_a-csplit.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_csplit.a: $(src_libsinglebin_csplit_a_OBJECTS) $(src_libsinglebin_csplit_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_csplit_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_csplit.a
+	$(AM_V_AR)$(src_libsinglebin_csplit_a_AR) src/libsinglebin_csplit.a $(src_libsinglebin_csplit_a_OBJECTS) $(src_libsinglebin_csplit_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_csplit.a
+src/src_libsinglebin_cut_a-cut.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_cut.a: $(src_libsinglebin_cut_a_OBJECTS) $(src_libsinglebin_cut_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_cut_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_cut.a
+	$(AM_V_AR)$(src_libsinglebin_cut_a_AR) src/libsinglebin_cut.a $(src_libsinglebin_cut_a_OBJECTS) $(src_libsinglebin_cut_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_cut.a
+src/src_libsinglebin_date_a-date.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_date.a: $(src_libsinglebin_date_a_OBJECTS) $(src_libsinglebin_date_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_date_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_date.a
+	$(AM_V_AR)$(src_libsinglebin_date_a_AR) src/libsinglebin_date.a $(src_libsinglebin_date_a_OBJECTS) $(src_libsinglebin_date_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_date.a
+src/src_libsinglebin_dd_a-dd.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_dd.a: $(src_libsinglebin_dd_a_OBJECTS) $(src_libsinglebin_dd_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_dd_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_dd.a
+	$(AM_V_AR)$(src_libsinglebin_dd_a_AR) src/libsinglebin_dd.a $(src_libsinglebin_dd_a_OBJECTS) $(src_libsinglebin_dd_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_dd.a
+src/src_libsinglebin_df_a-df.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/src_libsinglebin_df_a-find-mount-point.$(OBJEXT):  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_df.a: $(src_libsinglebin_df_a_OBJECTS) $(src_libsinglebin_df_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_df_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_df.a
+	$(AM_V_AR)$(src_libsinglebin_df_a_AR) src/libsinglebin_df.a $(src_libsinglebin_df_a_OBJECTS) $(src_libsinglebin_df_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_df.a
+src/src_libsinglebin_dir_a-coreutils-dir.$(OBJEXT):  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_dir.a: $(src_libsinglebin_dir_a_OBJECTS) $(src_libsinglebin_dir_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_dir_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_dir.a
+	$(AM_V_AR)$(src_libsinglebin_dir_a_AR) src/libsinglebin_dir.a $(src_libsinglebin_dir_a_OBJECTS) $(src_libsinglebin_dir_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_dir.a
+src/src_libsinglebin_dircolors_a-dircolors.$(OBJEXT):  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_dircolors.a: $(src_libsinglebin_dircolors_a_OBJECTS) $(src_libsinglebin_dircolors_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_dircolors_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_dircolors.a
+	$(AM_V_AR)$(src_libsinglebin_dircolors_a_AR) src/libsinglebin_dircolors.a $(src_libsinglebin_dircolors_a_OBJECTS) $(src_libsinglebin_dircolors_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_dircolors.a
+src/src_libsinglebin_dirname_a-dirname.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_dirname.a: $(src_libsinglebin_dirname_a_OBJECTS) $(src_libsinglebin_dirname_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_dirname_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_dirname.a
+	$(AM_V_AR)$(src_libsinglebin_dirname_a_AR) src/libsinglebin_dirname.a $(src_libsinglebin_dirname_a_OBJECTS) $(src_libsinglebin_dirname_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_dirname.a
+src/src_libsinglebin_du_a-du.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_du.a: $(src_libsinglebin_du_a_OBJECTS) $(src_libsinglebin_du_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_du_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_du.a
+	$(AM_V_AR)$(src_libsinglebin_du_a_AR) src/libsinglebin_du.a $(src_libsinglebin_du_a_OBJECTS) $(src_libsinglebin_du_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_du.a
+src/src_libsinglebin_echo_a-echo.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_echo.a: $(src_libsinglebin_echo_a_OBJECTS) $(src_libsinglebin_echo_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_echo_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_echo.a
+	$(AM_V_AR)$(src_libsinglebin_echo_a_AR) src/libsinglebin_echo.a $(src_libsinglebin_echo_a_OBJECTS) $(src_libsinglebin_echo_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_echo.a
+src/src_libsinglebin_env_a-env.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_env.a: $(src_libsinglebin_env_a_OBJECTS) $(src_libsinglebin_env_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_env_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_env.a
+	$(AM_V_AR)$(src_libsinglebin_env_a_AR) src/libsinglebin_env.a $(src_libsinglebin_env_a_OBJECTS) $(src_libsinglebin_env_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_env.a
+src/src_libsinglebin_expand_a-expand.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_expand.a: $(src_libsinglebin_expand_a_OBJECTS) $(src_libsinglebin_expand_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_expand_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_expand.a
+	$(AM_V_AR)$(src_libsinglebin_expand_a_AR) src/libsinglebin_expand.a $(src_libsinglebin_expand_a_OBJECTS) $(src_libsinglebin_expand_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_expand.a
+src/src_libsinglebin_expr_a-expr.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_expr.a: $(src_libsinglebin_expr_a_OBJECTS) $(src_libsinglebin_expr_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_expr_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_expr.a
+	$(AM_V_AR)$(src_libsinglebin_expr_a_AR) src/libsinglebin_expr.a $(src_libsinglebin_expr_a_OBJECTS) $(src_libsinglebin_expr_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_expr.a
+src/src_libsinglebin_factor_a-factor.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_factor.a: $(src_libsinglebin_factor_a_OBJECTS) $(src_libsinglebin_factor_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_factor_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_factor.a
+	$(AM_V_AR)$(src_libsinglebin_factor_a_AR) src/libsinglebin_factor.a $(src_libsinglebin_factor_a_OBJECTS) $(src_libsinglebin_factor_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_factor.a
+src/src_libsinglebin_false_a-false.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_false.a: $(src_libsinglebin_false_a_OBJECTS) $(src_libsinglebin_false_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_false_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_false.a
+	$(AM_V_AR)$(src_libsinglebin_false_a_AR) src/libsinglebin_false.a $(src_libsinglebin_false_a_OBJECTS) $(src_libsinglebin_false_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_false.a
+src/src_libsinglebin_fmt_a-fmt.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_fmt.a: $(src_libsinglebin_fmt_a_OBJECTS) $(src_libsinglebin_fmt_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_fmt_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_fmt.a
+	$(AM_V_AR)$(src_libsinglebin_fmt_a_AR) src/libsinglebin_fmt.a $(src_libsinglebin_fmt_a_OBJECTS) $(src_libsinglebin_fmt_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_fmt.a
+src/src_libsinglebin_fold_a-fold.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_fold.a: $(src_libsinglebin_fold_a_OBJECTS) $(src_libsinglebin_fold_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_fold_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_fold.a
+	$(AM_V_AR)$(src_libsinglebin_fold_a_AR) src/libsinglebin_fold.a $(src_libsinglebin_fold_a_OBJECTS) $(src_libsinglebin_fold_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_fold.a
+src/src_libsinglebin_ginstall_a-install.$(OBJEXT):  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/src_libsinglebin_ginstall_a-prog-fprintf.$(OBJEXT):  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/src_libsinglebin_ginstall_a-copy.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/src_libsinglebin_ginstall_a-cp-hash.$(OBJEXT):  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/src_libsinglebin_ginstall_a-extent-scan.$(OBJEXT):  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/src_libsinglebin_ginstall_a-selinux.$(OBJEXT):  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_ginstall.a: $(src_libsinglebin_ginstall_a_OBJECTS) $(src_libsinglebin_ginstall_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_ginstall_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_ginstall.a
+	$(AM_V_AR)$(src_libsinglebin_ginstall_a_AR) src/libsinglebin_ginstall.a $(src_libsinglebin_ginstall_a_OBJECTS) $(src_libsinglebin_ginstall_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_ginstall.a
+src/src_libsinglebin_groups_a-groups.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/src_libsinglebin_groups_a-group-list.$(OBJEXT):  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_groups.a: $(src_libsinglebin_groups_a_OBJECTS) $(src_libsinglebin_groups_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_groups_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_groups.a
+	$(AM_V_AR)$(src_libsinglebin_groups_a_AR) src/libsinglebin_groups.a $(src_libsinglebin_groups_a_OBJECTS) $(src_libsinglebin_groups_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_groups.a
+src/src_libsinglebin_head_a-head.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_head.a: $(src_libsinglebin_head_a_OBJECTS) $(src_libsinglebin_head_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_head_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_head.a
+	$(AM_V_AR)$(src_libsinglebin_head_a_AR) src/libsinglebin_head.a $(src_libsinglebin_head_a_OBJECTS) $(src_libsinglebin_head_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_head.a
+src/src_libsinglebin_hostid_a-hostid.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_hostid.a: $(src_libsinglebin_hostid_a_OBJECTS) $(src_libsinglebin_hostid_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_hostid_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_hostid.a
+	$(AM_V_AR)$(src_libsinglebin_hostid_a_AR) src/libsinglebin_hostid.a $(src_libsinglebin_hostid_a_OBJECTS) $(src_libsinglebin_hostid_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_hostid.a
+src/src_libsinglebin_hostname_a-hostname.$(OBJEXT):  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_hostname.a: $(src_libsinglebin_hostname_a_OBJECTS) $(src_libsinglebin_hostname_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_hostname_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_hostname.a
+	$(AM_V_AR)$(src_libsinglebin_hostname_a_AR) src/libsinglebin_hostname.a $(src_libsinglebin_hostname_a_OBJECTS) $(src_libsinglebin_hostname_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_hostname.a
+src/src_libsinglebin_id_a-id.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/src_libsinglebin_id_a-group-list.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_id.a: $(src_libsinglebin_id_a_OBJECTS) $(src_libsinglebin_id_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_id_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_id.a
+	$(AM_V_AR)$(src_libsinglebin_id_a_AR) src/libsinglebin_id.a $(src_libsinglebin_id_a_OBJECTS) $(src_libsinglebin_id_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_id.a
+src/src_libsinglebin_join_a-join.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_join.a: $(src_libsinglebin_join_a_OBJECTS) $(src_libsinglebin_join_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_join_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_join.a
+	$(AM_V_AR)$(src_libsinglebin_join_a_AR) src/libsinglebin_join.a $(src_libsinglebin_join_a_OBJECTS) $(src_libsinglebin_join_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_join.a
+src/src_libsinglebin_kill_a-kill.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/src_libsinglebin_kill_a-operand2sig.$(OBJEXT):  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_kill.a: $(src_libsinglebin_kill_a_OBJECTS) $(src_libsinglebin_kill_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_kill_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_kill.a
+	$(AM_V_AR)$(src_libsinglebin_kill_a_AR) src/libsinglebin_kill.a $(src_libsinglebin_kill_a_OBJECTS) $(src_libsinglebin_kill_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_kill.a
+src/src_libsinglebin_link_a-link.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_link.a: $(src_libsinglebin_link_a_OBJECTS) $(src_libsinglebin_link_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_link_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_link.a
+	$(AM_V_AR)$(src_libsinglebin_link_a_AR) src/libsinglebin_link.a $(src_libsinglebin_link_a_OBJECTS) $(src_libsinglebin_link_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_link.a
+src/src_libsinglebin_ln_a-ln.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/src_libsinglebin_ln_a-relpath.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_ln.a: $(src_libsinglebin_ln_a_OBJECTS) $(src_libsinglebin_ln_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_ln_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_ln.a
+	$(AM_V_AR)$(src_libsinglebin_ln_a_AR) src/libsinglebin_ln.a $(src_libsinglebin_ln_a_OBJECTS) $(src_libsinglebin_ln_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_ln.a
+src/src_libsinglebin_logname_a-logname.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_logname.a: $(src_libsinglebin_logname_a_OBJECTS) $(src_libsinglebin_logname_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_logname_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_logname.a
+	$(AM_V_AR)$(src_libsinglebin_logname_a_AR) src/libsinglebin_logname.a $(src_libsinglebin_logname_a_OBJECTS) $(src_libsinglebin_logname_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_logname.a
+src/src_libsinglebin_ls_a-ls.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/src_libsinglebin_ls_a-ls-ls.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_ls.a: $(src_libsinglebin_ls_a_OBJECTS) $(src_libsinglebin_ls_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_ls_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_ls.a
+	$(AM_V_AR)$(src_libsinglebin_ls_a_AR) src/libsinglebin_ls.a $(src_libsinglebin_ls_a_OBJECTS) $(src_libsinglebin_ls_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_ls.a
+src/src_libsinglebin_md5sum_a-md5sum.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_md5sum.a: $(src_libsinglebin_md5sum_a_OBJECTS) $(src_libsinglebin_md5sum_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_md5sum_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_md5sum.a
+	$(AM_V_AR)$(src_libsinglebin_md5sum_a_AR) src/libsinglebin_md5sum.a $(src_libsinglebin_md5sum_a_OBJECTS) $(src_libsinglebin_md5sum_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_md5sum.a
+src/src_libsinglebin_mkdir_a-mkdir.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/src_libsinglebin_mkdir_a-prog-fprintf.$(OBJEXT):  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/src_libsinglebin_mkdir_a-selinux.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_mkdir.a: $(src_libsinglebin_mkdir_a_OBJECTS) $(src_libsinglebin_mkdir_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_mkdir_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_mkdir.a
+	$(AM_V_AR)$(src_libsinglebin_mkdir_a_AR) src/libsinglebin_mkdir.a $(src_libsinglebin_mkdir_a_OBJECTS) $(src_libsinglebin_mkdir_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_mkdir.a
+src/src_libsinglebin_mkfifo_a-mkfifo.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/src_libsinglebin_mkfifo_a-selinux.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_mkfifo.a: $(src_libsinglebin_mkfifo_a_OBJECTS) $(src_libsinglebin_mkfifo_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_mkfifo_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_mkfifo.a
+	$(AM_V_AR)$(src_libsinglebin_mkfifo_a_AR) src/libsinglebin_mkfifo.a $(src_libsinglebin_mkfifo_a_OBJECTS) $(src_libsinglebin_mkfifo_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_mkfifo.a
+src/src_libsinglebin_mknod_a-mknod.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/src_libsinglebin_mknod_a-selinux.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_mknod.a: $(src_libsinglebin_mknod_a_OBJECTS) $(src_libsinglebin_mknod_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_mknod_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_mknod.a
+	$(AM_V_AR)$(src_libsinglebin_mknod_a_AR) src/libsinglebin_mknod.a $(src_libsinglebin_mknod_a_OBJECTS) $(src_libsinglebin_mknod_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_mknod.a
+src/src_libsinglebin_mktemp_a-mktemp.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_mktemp.a: $(src_libsinglebin_mktemp_a_OBJECTS) $(src_libsinglebin_mktemp_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_mktemp_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_mktemp.a
+	$(AM_V_AR)$(src_libsinglebin_mktemp_a_AR) src/libsinglebin_mktemp.a $(src_libsinglebin_mktemp_a_OBJECTS) $(src_libsinglebin_mktemp_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_mktemp.a
+src/src_libsinglebin_mv_a-mv.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/src_libsinglebin_mv_a-remove.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/src_libsinglebin_mv_a-copy.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/src_libsinglebin_mv_a-cp-hash.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/src_libsinglebin_mv_a-extent-scan.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/src_libsinglebin_mv_a-selinux.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_mv.a: $(src_libsinglebin_mv_a_OBJECTS) $(src_libsinglebin_mv_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_mv_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_mv.a
+	$(AM_V_AR)$(src_libsinglebin_mv_a_AR) src/libsinglebin_mv.a $(src_libsinglebin_mv_a_OBJECTS) $(src_libsinglebin_mv_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_mv.a
+src/src_libsinglebin_nice_a-nice.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_nice.a: $(src_libsinglebin_nice_a_OBJECTS) $(src_libsinglebin_nice_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_nice_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_nice.a
+	$(AM_V_AR)$(src_libsinglebin_nice_a_AR) src/libsinglebin_nice.a $(src_libsinglebin_nice_a_OBJECTS) $(src_libsinglebin_nice_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_nice.a
+src/src_libsinglebin_nl_a-nl.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_nl.a: $(src_libsinglebin_nl_a_OBJECTS) $(src_libsinglebin_nl_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_nl_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_nl.a
+	$(AM_V_AR)$(src_libsinglebin_nl_a_AR) src/libsinglebin_nl.a $(src_libsinglebin_nl_a_OBJECTS) $(src_libsinglebin_nl_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_nl.a
+src/src_libsinglebin_nohup_a-nohup.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_nohup.a: $(src_libsinglebin_nohup_a_OBJECTS) $(src_libsinglebin_nohup_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_nohup_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_nohup.a
+	$(AM_V_AR)$(src_libsinglebin_nohup_a_AR) src/libsinglebin_nohup.a $(src_libsinglebin_nohup_a_OBJECTS) $(src_libsinglebin_nohup_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_nohup.a
+src/src_libsinglebin_nproc_a-nproc.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_nproc.a: $(src_libsinglebin_nproc_a_OBJECTS) $(src_libsinglebin_nproc_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_nproc_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_nproc.a
+	$(AM_V_AR)$(src_libsinglebin_nproc_a_AR) src/libsinglebin_nproc.a $(src_libsinglebin_nproc_a_OBJECTS) $(src_libsinglebin_nproc_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_nproc.a
+src/src_libsinglebin_numfmt_a-numfmt.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_numfmt.a: $(src_libsinglebin_numfmt_a_OBJECTS) $(src_libsinglebin_numfmt_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_numfmt_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_numfmt.a
+	$(AM_V_AR)$(src_libsinglebin_numfmt_a_AR) src/libsinglebin_numfmt.a $(src_libsinglebin_numfmt_a_OBJECTS) $(src_libsinglebin_numfmt_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_numfmt.a
+src/src_libsinglebin_od_a-od.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_od.a: $(src_libsinglebin_od_a_OBJECTS) $(src_libsinglebin_od_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_od_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_od.a
+	$(AM_V_AR)$(src_libsinglebin_od_a_AR) src/libsinglebin_od.a $(src_libsinglebin_od_a_OBJECTS) $(src_libsinglebin_od_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_od.a
+src/src_libsinglebin_paste_a-paste.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_paste.a: $(src_libsinglebin_paste_a_OBJECTS) $(src_libsinglebin_paste_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_paste_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_paste.a
+	$(AM_V_AR)$(src_libsinglebin_paste_a_AR) src/libsinglebin_paste.a $(src_libsinglebin_paste_a_OBJECTS) $(src_libsinglebin_paste_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_paste.a
+src/src_libsinglebin_pathchk_a-pathchk.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_pathchk.a: $(src_libsinglebin_pathchk_a_OBJECTS) $(src_libsinglebin_pathchk_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_pathchk_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_pathchk.a
+	$(AM_V_AR)$(src_libsinglebin_pathchk_a_AR) src/libsinglebin_pathchk.a $(src_libsinglebin_pathchk_a_OBJECTS) $(src_libsinglebin_pathchk_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_pathchk.a
+src/src_libsinglebin_pinky_a-pinky.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_pinky.a: $(src_libsinglebin_pinky_a_OBJECTS) $(src_libsinglebin_pinky_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_pinky_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_pinky.a
+	$(AM_V_AR)$(src_libsinglebin_pinky_a_AR) src/libsinglebin_pinky.a $(src_libsinglebin_pinky_a_OBJECTS) $(src_libsinglebin_pinky_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_pinky.a
+src/src_libsinglebin_pr_a-pr.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_pr.a: $(src_libsinglebin_pr_a_OBJECTS) $(src_libsinglebin_pr_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_pr_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_pr.a
+	$(AM_V_AR)$(src_libsinglebin_pr_a_AR) src/libsinglebin_pr.a $(src_libsinglebin_pr_a_OBJECTS) $(src_libsinglebin_pr_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_pr.a
+src/src_libsinglebin_printenv_a-printenv.$(OBJEXT):  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_printenv.a: $(src_libsinglebin_printenv_a_OBJECTS) $(src_libsinglebin_printenv_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_printenv_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_printenv.a
+	$(AM_V_AR)$(src_libsinglebin_printenv_a_AR) src/libsinglebin_printenv.a $(src_libsinglebin_printenv_a_OBJECTS) $(src_libsinglebin_printenv_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_printenv.a
+src/src_libsinglebin_printf_a-printf.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_printf.a: $(src_libsinglebin_printf_a_OBJECTS) $(src_libsinglebin_printf_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_printf_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_printf.a
+	$(AM_V_AR)$(src_libsinglebin_printf_a_AR) src/libsinglebin_printf.a $(src_libsinglebin_printf_a_OBJECTS) $(src_libsinglebin_printf_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_printf.a
+src/src_libsinglebin_ptx_a-ptx.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_ptx.a: $(src_libsinglebin_ptx_a_OBJECTS) $(src_libsinglebin_ptx_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_ptx_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_ptx.a
+	$(AM_V_AR)$(src_libsinglebin_ptx_a_AR) src/libsinglebin_ptx.a $(src_libsinglebin_ptx_a_OBJECTS) $(src_libsinglebin_ptx_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_ptx.a
+src/src_libsinglebin_pwd_a-pwd.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_pwd.a: $(src_libsinglebin_pwd_a_OBJECTS) $(src_libsinglebin_pwd_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_pwd_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_pwd.a
+	$(AM_V_AR)$(src_libsinglebin_pwd_a_AR) src/libsinglebin_pwd.a $(src_libsinglebin_pwd_a_OBJECTS) $(src_libsinglebin_pwd_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_pwd.a
+src/src_libsinglebin_readlink_a-readlink.$(OBJEXT):  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_readlink.a: $(src_libsinglebin_readlink_a_OBJECTS) $(src_libsinglebin_readlink_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_readlink_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_readlink.a
+	$(AM_V_AR)$(src_libsinglebin_readlink_a_AR) src/libsinglebin_readlink.a $(src_libsinglebin_readlink_a_OBJECTS) $(src_libsinglebin_readlink_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_readlink.a
+src/src_libsinglebin_realpath_a-realpath.$(OBJEXT):  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/src_libsinglebin_realpath_a-relpath.$(OBJEXT):  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_realpath.a: $(src_libsinglebin_realpath_a_OBJECTS) $(src_libsinglebin_realpath_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_realpath_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_realpath.a
+	$(AM_V_AR)$(src_libsinglebin_realpath_a_AR) src/libsinglebin_realpath.a $(src_libsinglebin_realpath_a_OBJECTS) $(src_libsinglebin_realpath_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_realpath.a
+src/src_libsinglebin_rm_a-rm.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/src_libsinglebin_rm_a-remove.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_rm.a: $(src_libsinglebin_rm_a_OBJECTS) $(src_libsinglebin_rm_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_rm_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_rm.a
+	$(AM_V_AR)$(src_libsinglebin_rm_a_AR) src/libsinglebin_rm.a $(src_libsinglebin_rm_a_OBJECTS) $(src_libsinglebin_rm_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_rm.a
+src/src_libsinglebin_rmdir_a-rmdir.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/src_libsinglebin_rmdir_a-prog-fprintf.$(OBJEXT):  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_rmdir.a: $(src_libsinglebin_rmdir_a_OBJECTS) $(src_libsinglebin_rmdir_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_rmdir_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_rmdir.a
+	$(AM_V_AR)$(src_libsinglebin_rmdir_a_AR) src/libsinglebin_rmdir.a $(src_libsinglebin_rmdir_a_OBJECTS) $(src_libsinglebin_rmdir_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_rmdir.a
+src/src_libsinglebin_runcon_a-runcon.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_runcon.a: $(src_libsinglebin_runcon_a_OBJECTS) $(src_libsinglebin_runcon_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_runcon_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_runcon.a
+	$(AM_V_AR)$(src_libsinglebin_runcon_a_AR) src/libsinglebin_runcon.a $(src_libsinglebin_runcon_a_OBJECTS) $(src_libsinglebin_runcon_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_runcon.a
+src/src_libsinglebin_seq_a-seq.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_seq.a: $(src_libsinglebin_seq_a_OBJECTS) $(src_libsinglebin_seq_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_seq_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_seq.a
+	$(AM_V_AR)$(src_libsinglebin_seq_a_AR) src/libsinglebin_seq.a $(src_libsinglebin_seq_a_OBJECTS) $(src_libsinglebin_seq_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_seq.a
+src/src_libsinglebin_sha1sum_a-md5sum.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_sha1sum.a: $(src_libsinglebin_sha1sum_a_OBJECTS) $(src_libsinglebin_sha1sum_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_sha1sum_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_sha1sum.a
+	$(AM_V_AR)$(src_libsinglebin_sha1sum_a_AR) src/libsinglebin_sha1sum.a $(src_libsinglebin_sha1sum_a_OBJECTS) $(src_libsinglebin_sha1sum_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_sha1sum.a
+src/src_libsinglebin_sha224sum_a-md5sum.$(OBJEXT):  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_sha224sum.a: $(src_libsinglebin_sha224sum_a_OBJECTS) $(src_libsinglebin_sha224sum_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_sha224sum_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_sha224sum.a
+	$(AM_V_AR)$(src_libsinglebin_sha224sum_a_AR) src/libsinglebin_sha224sum.a $(src_libsinglebin_sha224sum_a_OBJECTS) $(src_libsinglebin_sha224sum_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_sha224sum.a
+src/src_libsinglebin_sha256sum_a-md5sum.$(OBJEXT):  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_sha256sum.a: $(src_libsinglebin_sha256sum_a_OBJECTS) $(src_libsinglebin_sha256sum_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_sha256sum_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_sha256sum.a
+	$(AM_V_AR)$(src_libsinglebin_sha256sum_a_AR) src/libsinglebin_sha256sum.a $(src_libsinglebin_sha256sum_a_OBJECTS) $(src_libsinglebin_sha256sum_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_sha256sum.a
+src/src_libsinglebin_sha384sum_a-md5sum.$(OBJEXT):  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_sha384sum.a: $(src_libsinglebin_sha384sum_a_OBJECTS) $(src_libsinglebin_sha384sum_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_sha384sum_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_sha384sum.a
+	$(AM_V_AR)$(src_libsinglebin_sha384sum_a_AR) src/libsinglebin_sha384sum.a $(src_libsinglebin_sha384sum_a_OBJECTS) $(src_libsinglebin_sha384sum_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_sha384sum.a
+src/src_libsinglebin_sha512sum_a-md5sum.$(OBJEXT):  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_sha512sum.a: $(src_libsinglebin_sha512sum_a_OBJECTS) $(src_libsinglebin_sha512sum_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_sha512sum_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_sha512sum.a
+	$(AM_V_AR)$(src_libsinglebin_sha512sum_a_AR) src/libsinglebin_sha512sum.a $(src_libsinglebin_sha512sum_a_OBJECTS) $(src_libsinglebin_sha512sum_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_sha512sum.a
+src/src_libsinglebin_shred_a-shred.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_shred.a: $(src_libsinglebin_shred_a_OBJECTS) $(src_libsinglebin_shred_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_shred_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_shred.a
+	$(AM_V_AR)$(src_libsinglebin_shred_a_AR) src/libsinglebin_shred.a $(src_libsinglebin_shred_a_OBJECTS) $(src_libsinglebin_shred_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_shred.a
+src/src_libsinglebin_shuf_a-shuf.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_shuf.a: $(src_libsinglebin_shuf_a_OBJECTS) $(src_libsinglebin_shuf_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_shuf_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_shuf.a
+	$(AM_V_AR)$(src_libsinglebin_shuf_a_AR) src/libsinglebin_shuf.a $(src_libsinglebin_shuf_a_OBJECTS) $(src_libsinglebin_shuf_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_shuf.a
+src/src_libsinglebin_sleep_a-sleep.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_sleep.a: $(src_libsinglebin_sleep_a_OBJECTS) $(src_libsinglebin_sleep_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_sleep_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_sleep.a
+	$(AM_V_AR)$(src_libsinglebin_sleep_a_AR) src/libsinglebin_sleep.a $(src_libsinglebin_sleep_a_OBJECTS) $(src_libsinglebin_sleep_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_sleep.a
+src/src_libsinglebin_sort_a-sort.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_sort.a: $(src_libsinglebin_sort_a_OBJECTS) $(src_libsinglebin_sort_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_sort_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_sort.a
+	$(AM_V_AR)$(src_libsinglebin_sort_a_AR) src/libsinglebin_sort.a $(src_libsinglebin_sort_a_OBJECTS) $(src_libsinglebin_sort_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_sort.a
+src/src_libsinglebin_split_a-split.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_split.a: $(src_libsinglebin_split_a_OBJECTS) $(src_libsinglebin_split_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_split_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_split.a
+	$(AM_V_AR)$(src_libsinglebin_split_a_AR) src/libsinglebin_split.a $(src_libsinglebin_split_a_OBJECTS) $(src_libsinglebin_split_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_split.a
+src/src_libsinglebin_stat_a-stat.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/src_libsinglebin_stat_a-find-mount-point.$(OBJEXT):  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_stat.a: $(src_libsinglebin_stat_a_OBJECTS) $(src_libsinglebin_stat_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_stat_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_stat.a
+	$(AM_V_AR)$(src_libsinglebin_stat_a_AR) src/libsinglebin_stat.a $(src_libsinglebin_stat_a_OBJECTS) $(src_libsinglebin_stat_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_stat.a
+src/src_libsinglebin_stdbuf_a-stdbuf.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_stdbuf.a: $(src_libsinglebin_stdbuf_a_OBJECTS) $(src_libsinglebin_stdbuf_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_stdbuf_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_stdbuf.a
+	$(AM_V_AR)$(src_libsinglebin_stdbuf_a_AR) src/libsinglebin_stdbuf.a $(src_libsinglebin_stdbuf_a_OBJECTS) $(src_libsinglebin_stdbuf_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_stdbuf.a
+src/src_libsinglebin_stty_a-stty.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_stty.a: $(src_libsinglebin_stty_a_OBJECTS) $(src_libsinglebin_stty_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_stty_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_stty.a
+	$(AM_V_AR)$(src_libsinglebin_stty_a_AR) src/libsinglebin_stty.a $(src_libsinglebin_stty_a_OBJECTS) $(src_libsinglebin_stty_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_stty.a
+src/src_libsinglebin_sum_a-sum.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_sum.a: $(src_libsinglebin_sum_a_OBJECTS) $(src_libsinglebin_sum_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_sum_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_sum.a
+	$(AM_V_AR)$(src_libsinglebin_sum_a_AR) src/libsinglebin_sum.a $(src_libsinglebin_sum_a_OBJECTS) $(src_libsinglebin_sum_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_sum.a
+src/src_libsinglebin_sync_a-sync.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_sync.a: $(src_libsinglebin_sync_a_OBJECTS) $(src_libsinglebin_sync_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_sync_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_sync.a
+	$(AM_V_AR)$(src_libsinglebin_sync_a_AR) src/libsinglebin_sync.a $(src_libsinglebin_sync_a_OBJECTS) $(src_libsinglebin_sync_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_sync.a
+src/src_libsinglebin_tac_a-tac.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_tac.a: $(src_libsinglebin_tac_a_OBJECTS) $(src_libsinglebin_tac_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_tac_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_tac.a
+	$(AM_V_AR)$(src_libsinglebin_tac_a_AR) src/libsinglebin_tac.a $(src_libsinglebin_tac_a_OBJECTS) $(src_libsinglebin_tac_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_tac.a
+src/src_libsinglebin_tail_a-tail.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_tail.a: $(src_libsinglebin_tail_a_OBJECTS) $(src_libsinglebin_tail_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_tail_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_tail.a
+	$(AM_V_AR)$(src_libsinglebin_tail_a_AR) src/libsinglebin_tail.a $(src_libsinglebin_tail_a_OBJECTS) $(src_libsinglebin_tail_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_tail.a
+src/src_libsinglebin_tee_a-tee.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_tee.a: $(src_libsinglebin_tee_a_OBJECTS) $(src_libsinglebin_tee_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_tee_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_tee.a
+	$(AM_V_AR)$(src_libsinglebin_tee_a_AR) src/libsinglebin_tee.a $(src_libsinglebin_tee_a_OBJECTS) $(src_libsinglebin_tee_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_tee.a
+src/src_libsinglebin_test_a-test.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_test.a: $(src_libsinglebin_test_a_OBJECTS) $(src_libsinglebin_test_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_test_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_test.a
+	$(AM_V_AR)$(src_libsinglebin_test_a_AR) src/libsinglebin_test.a $(src_libsinglebin_test_a_OBJECTS) $(src_libsinglebin_test_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_test.a
+src/src_libsinglebin_timeout_a-timeout.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/src_libsinglebin_timeout_a-operand2sig.$(OBJEXT):  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_timeout.a: $(src_libsinglebin_timeout_a_OBJECTS) $(src_libsinglebin_timeout_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_timeout_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_timeout.a
+	$(AM_V_AR)$(src_libsinglebin_timeout_a_AR) src/libsinglebin_timeout.a $(src_libsinglebin_timeout_a_OBJECTS) $(src_libsinglebin_timeout_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_timeout.a
+src/src_libsinglebin_touch_a-touch.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_touch.a: $(src_libsinglebin_touch_a_OBJECTS) $(src_libsinglebin_touch_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_touch_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_touch.a
+	$(AM_V_AR)$(src_libsinglebin_touch_a_AR) src/libsinglebin_touch.a $(src_libsinglebin_touch_a_OBJECTS) $(src_libsinglebin_touch_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_touch.a
+src/src_libsinglebin_tr_a-tr.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_tr.a: $(src_libsinglebin_tr_a_OBJECTS) $(src_libsinglebin_tr_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_tr_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_tr.a
+	$(AM_V_AR)$(src_libsinglebin_tr_a_AR) src/libsinglebin_tr.a $(src_libsinglebin_tr_a_OBJECTS) $(src_libsinglebin_tr_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_tr.a
+src/src_libsinglebin_true_a-true.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_true.a: $(src_libsinglebin_true_a_OBJECTS) $(src_libsinglebin_true_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_true_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_true.a
+	$(AM_V_AR)$(src_libsinglebin_true_a_AR) src/libsinglebin_true.a $(src_libsinglebin_true_a_OBJECTS) $(src_libsinglebin_true_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_true.a
+src/src_libsinglebin_truncate_a-truncate.$(OBJEXT):  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_truncate.a: $(src_libsinglebin_truncate_a_OBJECTS) $(src_libsinglebin_truncate_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_truncate_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_truncate.a
+	$(AM_V_AR)$(src_libsinglebin_truncate_a_AR) src/libsinglebin_truncate.a $(src_libsinglebin_truncate_a_OBJECTS) $(src_libsinglebin_truncate_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_truncate.a
+src/src_libsinglebin_tsort_a-tsort.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_tsort.a: $(src_libsinglebin_tsort_a_OBJECTS) $(src_libsinglebin_tsort_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_tsort_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_tsort.a
+	$(AM_V_AR)$(src_libsinglebin_tsort_a_AR) src/libsinglebin_tsort.a $(src_libsinglebin_tsort_a_OBJECTS) $(src_libsinglebin_tsort_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_tsort.a
+src/src_libsinglebin_tty_a-tty.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_tty.a: $(src_libsinglebin_tty_a_OBJECTS) $(src_libsinglebin_tty_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_tty_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_tty.a
+	$(AM_V_AR)$(src_libsinglebin_tty_a_AR) src/libsinglebin_tty.a $(src_libsinglebin_tty_a_OBJECTS) $(src_libsinglebin_tty_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_tty.a
+src/src_libsinglebin_uname_a-uname.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/src_libsinglebin_uname_a-uname-uname.$(OBJEXT):  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_uname.a: $(src_libsinglebin_uname_a_OBJECTS) $(src_libsinglebin_uname_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_uname_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_uname.a
+	$(AM_V_AR)$(src_libsinglebin_uname_a_AR) src/libsinglebin_uname.a $(src_libsinglebin_uname_a_OBJECTS) $(src_libsinglebin_uname_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_uname.a
+src/src_libsinglebin_unexpand_a-unexpand.$(OBJEXT):  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_unexpand.a: $(src_libsinglebin_unexpand_a_OBJECTS) $(src_libsinglebin_unexpand_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_unexpand_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_unexpand.a
+	$(AM_V_AR)$(src_libsinglebin_unexpand_a_AR) src/libsinglebin_unexpand.a $(src_libsinglebin_unexpand_a_OBJECTS) $(src_libsinglebin_unexpand_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_unexpand.a
+src/src_libsinglebin_uniq_a-uniq.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_uniq.a: $(src_libsinglebin_uniq_a_OBJECTS) $(src_libsinglebin_uniq_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_uniq_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_uniq.a
+	$(AM_V_AR)$(src_libsinglebin_uniq_a_AR) src/libsinglebin_uniq.a $(src_libsinglebin_uniq_a_OBJECTS) $(src_libsinglebin_uniq_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_uniq.a
+src/src_libsinglebin_unlink_a-unlink.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_unlink.a: $(src_libsinglebin_unlink_a_OBJECTS) $(src_libsinglebin_unlink_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_unlink_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_unlink.a
+	$(AM_V_AR)$(src_libsinglebin_unlink_a_AR) src/libsinglebin_unlink.a $(src_libsinglebin_unlink_a_OBJECTS) $(src_libsinglebin_unlink_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_unlink.a
+src/src_libsinglebin_uptime_a-uptime.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_uptime.a: $(src_libsinglebin_uptime_a_OBJECTS) $(src_libsinglebin_uptime_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_uptime_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_uptime.a
+	$(AM_V_AR)$(src_libsinglebin_uptime_a_AR) src/libsinglebin_uptime.a $(src_libsinglebin_uptime_a_OBJECTS) $(src_libsinglebin_uptime_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_uptime.a
+src/src_libsinglebin_users_a-users.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_users.a: $(src_libsinglebin_users_a_OBJECTS) $(src_libsinglebin_users_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_users_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_users.a
+	$(AM_V_AR)$(src_libsinglebin_users_a_AR) src/libsinglebin_users.a $(src_libsinglebin_users_a_OBJECTS) $(src_libsinglebin_users_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_users.a
+src/src_libsinglebin_vdir_a-coreutils-vdir.$(OBJEXT):  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_vdir.a: $(src_libsinglebin_vdir_a_OBJECTS) $(src_libsinglebin_vdir_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_vdir_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_vdir.a
+	$(AM_V_AR)$(src_libsinglebin_vdir_a_AR) src/libsinglebin_vdir.a $(src_libsinglebin_vdir_a_OBJECTS) $(src_libsinglebin_vdir_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_vdir.a
+src/src_libsinglebin_wc_a-wc.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_wc.a: $(src_libsinglebin_wc_a_OBJECTS) $(src_libsinglebin_wc_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_wc_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_wc.a
+	$(AM_V_AR)$(src_libsinglebin_wc_a_AR) src/libsinglebin_wc.a $(src_libsinglebin_wc_a_OBJECTS) $(src_libsinglebin_wc_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_wc.a
+src/src_libsinglebin_who_a-who.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_who.a: $(src_libsinglebin_who_a_OBJECTS) $(src_libsinglebin_who_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_who_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_who.a
+	$(AM_V_AR)$(src_libsinglebin_who_a_AR) src/libsinglebin_who.a $(src_libsinglebin_who_a_OBJECTS) $(src_libsinglebin_who_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_who.a
+src/src_libsinglebin_whoami_a-whoami.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_whoami.a: $(src_libsinglebin_whoami_a_OBJECTS) $(src_libsinglebin_whoami_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_whoami_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_whoami.a
+	$(AM_V_AR)$(src_libsinglebin_whoami_a_AR) src/libsinglebin_whoami.a $(src_libsinglebin_whoami_a_OBJECTS) $(src_libsinglebin_whoami_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_whoami.a
+src/src_libsinglebin_yes_a-yes.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/libsinglebin_yes.a: $(src_libsinglebin_yes_a_OBJECTS) $(src_libsinglebin_yes_a_DEPENDENCIES) $(EXTRA_src_libsinglebin_yes_a_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_at)-rm -f src/libsinglebin_yes.a
+	$(AM_V_AR)$(src_libsinglebin_yes_a_AR) src/libsinglebin_yes.a $(src_libsinglebin_yes_a_OBJECTS) $(src_libsinglebin_yes_a_LIBADD)
+	$(AM_V_at)$(RANLIB) src/libsinglebin_yes.a
 src/version.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/libver.a: $(src_libver_a_OBJECTS) $(src_libver_a_DEPENDENCIES) $(EXTRA_src_libver_a_DEPENDENCIES) src/$(am__dirstamp)
 	$(AM_V_at)-rm -f src/libver.a
 	$(AM_V_AR)$(src_libver_a_AR) src/libver.a $(src_libver_a_OBJECTS) $(src_libver_a_LIBADD)
@@ -5017,10 +7389,11 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -5041,7 +7414,8 @@ uninstall-binPROGRAMS:
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@ -5060,10 +7434,11 @@ install-pkglibexecPROGRAMS: $(pkglibexec_PROGRAMS)
 	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -5084,7 +7459,8 @@ uninstall-pkglibexecPROGRAMS:
 	@list='$(pkglibexec_PROGRAMS)'; test -n "$(pkglibexecdir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(pkglibexecdir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(pkglibexecdir)" && rm -f $$files
@@ -5093,148 +7469,187 @@ clean-pkglibexecPROGRAMS:
 	-test -z "$(pkglibexec_PROGRAMS)" || rm -f $(pkglibexec_PROGRAMS)
 src/lbracket.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/[$(EXEEXT): $(src___OBJECTS) $(src___DEPENDENCIES) $(EXTRA_src___DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/[$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src___OBJECTS) $(src___LDADD) $(LIBS)
 src/uname.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/uname-arch.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/arch$(EXEEXT): $(src_arch_OBJECTS) $(src_arch_DEPENDENCIES) $(EXTRA_src_arch_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/arch$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_arch_OBJECTS) $(src_arch_LDADD) $(LIBS)
 src/base64.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/base64$(EXEEXT): $(src_base64_OBJECTS) $(src_base64_DEPENDENCIES) $(EXTRA_src_base64_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/base64$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_base64_OBJECTS) $(src_base64_LDADD) $(LIBS)
 src/basename.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/basename$(EXEEXT): $(src_basename_OBJECTS) $(src_basename_DEPENDENCIES) $(EXTRA_src_basename_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/basename$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_basename_OBJECTS) $(src_basename_LDADD) $(LIBS)
 src/cat.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/cat$(EXEEXT): $(src_cat_OBJECTS) $(src_cat_DEPENDENCIES) $(EXTRA_src_cat_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/cat$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_cat_OBJECTS) $(src_cat_LDADD) $(LIBS)
 src/chcon.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/chcon$(EXEEXT): $(src_chcon_OBJECTS) $(src_chcon_DEPENDENCIES) $(EXTRA_src_chcon_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/chcon$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_chcon_OBJECTS) $(src_chcon_LDADD) $(LIBS)
 src/chgrp.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/chown-core.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/chgrp$(EXEEXT): $(src_chgrp_OBJECTS) $(src_chgrp_DEPENDENCIES) $(EXTRA_src_chgrp_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/chgrp$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_chgrp_OBJECTS) $(src_chgrp_LDADD) $(LIBS)
 src/chmod.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/chmod$(EXEEXT): $(src_chmod_OBJECTS) $(src_chmod_DEPENDENCIES) $(EXTRA_src_chmod_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/chmod$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_chmod_OBJECTS) $(src_chmod_LDADD) $(LIBS)
 src/chown.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/chown$(EXEEXT): $(src_chown_OBJECTS) $(src_chown_DEPENDENCIES) $(EXTRA_src_chown_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/chown$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_chown_OBJECTS) $(src_chown_LDADD) $(LIBS)
 src/chroot.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/chroot$(EXEEXT): $(src_chroot_OBJECTS) $(src_chroot_DEPENDENCIES) $(EXTRA_src_chroot_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/chroot$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_chroot_OBJECTS) $(src_chroot_LDADD) $(LIBS)
 src/cksum.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/cksum$(EXEEXT): $(src_cksum_OBJECTS) $(src_cksum_DEPENDENCIES) $(EXTRA_src_cksum_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/cksum$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_cksum_OBJECTS) $(src_cksum_LDADD) $(LIBS)
 src/comm.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/comm$(EXEEXT): $(src_comm_OBJECTS) $(src_comm_DEPENDENCIES) $(EXTRA_src_comm_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/comm$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_comm_OBJECTS) $(src_comm_LDADD) $(LIBS)
+src/src_coreutils-coreutils.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+src/coreutils$(EXEEXT): $(src_coreutils_OBJECTS) $(src_coreutils_DEPENDENCIES) $(EXTRA_src_coreutils_DEPENDENCIES) src/$(am__dirstamp)
+	@rm -f src/coreutils$(EXEEXT)
+	$(AM_V_CCLD)$(src_coreutils_LINK) $(src_coreutils_OBJECTS) $(src_coreutils_LDADD) $(LIBS)
 src/cp.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/copy.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/cp-hash.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/extent-scan.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+src/selinux.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
 src/cp$(EXEEXT): $(src_cp_OBJECTS) $(src_cp_DEPENDENCIES) $(EXTRA_src_cp_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/cp$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_cp_OBJECTS) $(src_cp_LDADD) $(LIBS)
 src/csplit.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/csplit$(EXEEXT): $(src_csplit_OBJECTS) $(src_csplit_DEPENDENCIES) $(EXTRA_src_csplit_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/csplit$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_csplit_OBJECTS) $(src_csplit_LDADD) $(LIBS)
 src/cut.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/cut$(EXEEXT): $(src_cut_OBJECTS) $(src_cut_DEPENDENCIES) $(EXTRA_src_cut_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/cut$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_cut_OBJECTS) $(src_cut_LDADD) $(LIBS)
 src/date.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/date$(EXEEXT): $(src_date_OBJECTS) $(src_date_DEPENDENCIES) $(EXTRA_src_date_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/date$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_date_OBJECTS) $(src_date_LDADD) $(LIBS)
 src/dd.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/dd$(EXEEXT): $(src_dd_OBJECTS) $(src_dd_DEPENDENCIES) $(EXTRA_src_dd_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/dd$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_dd_OBJECTS) $(src_dd_LDADD) $(LIBS)
 src/df.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/find-mount-point.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/df$(EXEEXT): $(src_df_OBJECTS) $(src_df_DEPENDENCIES) $(EXTRA_src_df_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/df$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_df_OBJECTS) $(src_df_LDADD) $(LIBS)
 src/ls.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/ls-dir.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/dir$(EXEEXT): $(src_dir_OBJECTS) $(src_dir_DEPENDENCIES) $(EXTRA_src_dir_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/dir$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_dir_OBJECTS) $(src_dir_LDADD) $(LIBS)
 src/dircolors.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/dircolors$(EXEEXT): $(src_dircolors_OBJECTS) $(src_dircolors_DEPENDENCIES) $(EXTRA_src_dircolors_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/dircolors$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_dircolors_OBJECTS) $(src_dircolors_LDADD) $(LIBS)
 src/dirname.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/dirname$(EXEEXT): $(src_dirname_OBJECTS) $(src_dirname_DEPENDENCIES) $(EXTRA_src_dirname_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/dirname$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_dirname_OBJECTS) $(src_dirname_LDADD) $(LIBS)
 src/du.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/du$(EXEEXT): $(src_du_OBJECTS) $(src_du_DEPENDENCIES) $(EXTRA_src_du_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/du$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_du_OBJECTS) $(src_du_LDADD) $(LIBS)
 src/echo.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/echo$(EXEEXT): $(src_echo_OBJECTS) $(src_echo_DEPENDENCIES) $(EXTRA_src_echo_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/echo$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_echo_OBJECTS) $(src_echo_LDADD) $(LIBS)
 src/env.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/env$(EXEEXT): $(src_env_OBJECTS) $(src_env_DEPENDENCIES) $(EXTRA_src_env_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/env$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_env_OBJECTS) $(src_env_LDADD) $(LIBS)
 src/expand.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/expand$(EXEEXT): $(src_expand_OBJECTS) $(src_expand_DEPENDENCIES) $(EXTRA_src_expand_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/expand$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_expand_OBJECTS) $(src_expand_LDADD) $(LIBS)
 src/expr.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/expr$(EXEEXT): $(src_expr_OBJECTS) $(src_expr_DEPENDENCIES) $(EXTRA_src_expr_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/expr$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_expr_OBJECTS) $(src_expr_LDADD) $(LIBS)
 src/factor.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/factor$(EXEEXT): $(src_factor_OBJECTS) $(src_factor_DEPENDENCIES) $(EXTRA_src_factor_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/factor$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_factor_OBJECTS) $(src_factor_LDADD) $(LIBS)
 src/false.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/false$(EXEEXT): $(src_false_OBJECTS) $(src_false_DEPENDENCIES) $(EXTRA_src_false_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/false$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_false_OBJECTS) $(src_false_LDADD) $(LIBS)
 src/fmt.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/fmt$(EXEEXT): $(src_fmt_OBJECTS) $(src_fmt_DEPENDENCIES) $(EXTRA_src_fmt_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/fmt$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_fmt_OBJECTS) $(src_fmt_LDADD) $(LIBS)
 src/fold.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/fold$(EXEEXT): $(src_fold_OBJECTS) $(src_fold_DEPENDENCIES) $(EXTRA_src_fold_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/fold$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_fold_OBJECTS) $(src_fold_LDADD) $(LIBS)
 src/getlimits.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/getlimits$(EXEEXT): $(src_getlimits_OBJECTS) $(src_getlimits_DEPENDENCIES) $(EXTRA_src_getlimits_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/getlimits$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_getlimits_OBJECTS) $(src_getlimits_LDADD) $(LIBS)
@@ -5248,6 +7663,9 @@ src/src_ginstall-cp-hash.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/src_ginstall-extent-scan.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+src/src_ginstall-selinux.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
 src/ginstall$(EXEEXT): $(src_ginstall_OBJECTS) $(src_ginstall_DEPENDENCIES) $(EXTRA_src_ginstall_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/ginstall$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_ginstall_OBJECTS) $(src_ginstall_LDADD) $(LIBS)
@@ -5255,883 +7673,435 @@ src/groups.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/group-list.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/groups$(EXEEXT): $(src_groups_OBJECTS) $(src_groups_DEPENDENCIES) $(EXTRA_src_groups_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/groups$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_groups_OBJECTS) $(src_groups_LDADD) $(LIBS)
 src/head.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/head$(EXEEXT): $(src_head_OBJECTS) $(src_head_DEPENDENCIES) $(EXTRA_src_head_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/head$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_head_OBJECTS) $(src_head_LDADD) $(LIBS)
 src/hostid.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/hostid$(EXEEXT): $(src_hostid_OBJECTS) $(src_hostid_DEPENDENCIES) $(EXTRA_src_hostid_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/hostid$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_hostid_OBJECTS) $(src_hostid_LDADD) $(LIBS)
 src/hostname.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/hostname$(EXEEXT): $(src_hostname_OBJECTS) $(src_hostname_DEPENDENCIES) $(EXTRA_src_hostname_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/hostname$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_hostname_OBJECTS) $(src_hostname_LDADD) $(LIBS)
 src/id.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/id$(EXEEXT): $(src_id_OBJECTS) $(src_id_DEPENDENCIES) $(EXTRA_src_id_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/id$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_id_OBJECTS) $(src_id_LDADD) $(LIBS)
 src/join.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/join$(EXEEXT): $(src_join_OBJECTS) $(src_join_DEPENDENCIES) $(EXTRA_src_join_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/join$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_join_OBJECTS) $(src_join_LDADD) $(LIBS)
 src/kill.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/operand2sig.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/kill$(EXEEXT): $(src_kill_OBJECTS) $(src_kill_DEPENDENCIES) $(EXTRA_src_kill_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/kill$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_kill_OBJECTS) $(src_kill_LDADD) $(LIBS)
 src/src_libstdbuf_so-libstdbuf.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/libstdbuf.so$(EXEEXT): $(src_libstdbuf_so_OBJECTS) $(src_libstdbuf_so_DEPENDENCIES) $(EXTRA_src_libstdbuf_so_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/libstdbuf.so$(EXEEXT)
 	$(AM_V_CCLD)$(src_libstdbuf_so_LINK) $(src_libstdbuf_so_OBJECTS) $(src_libstdbuf_so_LDADD) $(LIBS)
 src/link.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/link$(EXEEXT): $(src_link_OBJECTS) $(src_link_DEPENDENCIES) $(EXTRA_src_link_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/link$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_link_OBJECTS) $(src_link_LDADD) $(LIBS)
 src/ln.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/relpath.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/ln$(EXEEXT): $(src_ln_OBJECTS) $(src_ln_DEPENDENCIES) $(EXTRA_src_ln_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/ln$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_ln_OBJECTS) $(src_ln_LDADD) $(LIBS)
 src/logname.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/logname$(EXEEXT): $(src_logname_OBJECTS) $(src_logname_DEPENDENCIES) $(EXTRA_src_logname_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/logname$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_logname_OBJECTS) $(src_logname_LDADD) $(LIBS)
 src/ls-ls.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/ls$(EXEEXT): $(src_ls_OBJECTS) $(src_ls_DEPENDENCIES) $(EXTRA_src_ls_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/ls$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_ls_OBJECTS) $(src_ls_LDADD) $(LIBS)
 src/make-prime-list.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/make-prime-list$(EXEEXT): $(src_make_prime_list_OBJECTS) $(src_make_prime_list_DEPENDENCIES) $(EXTRA_src_make_prime_list_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/make-prime-list$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_make_prime_list_OBJECTS) $(src_make_prime_list_LDADD) $(LIBS)
 src/src_md5sum-md5sum.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/md5sum$(EXEEXT): $(src_md5sum_OBJECTS) $(src_md5sum_DEPENDENCIES) $(EXTRA_src_md5sum_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/md5sum$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_md5sum_OBJECTS) $(src_md5sum_LDADD) $(LIBS)
 src/mkdir.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/prog-fprintf.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/mkdir$(EXEEXT): $(src_mkdir_OBJECTS) $(src_mkdir_DEPENDENCIES) $(EXTRA_src_mkdir_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/mkdir$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_mkdir_OBJECTS) $(src_mkdir_LDADD) $(LIBS)
 src/mkfifo.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/mkfifo$(EXEEXT): $(src_mkfifo_OBJECTS) $(src_mkfifo_DEPENDENCIES) $(EXTRA_src_mkfifo_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/mkfifo$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_mkfifo_OBJECTS) $(src_mkfifo_LDADD) $(LIBS)
 src/mknod.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/mknod$(EXEEXT): $(src_mknod_OBJECTS) $(src_mknod_DEPENDENCIES) $(EXTRA_src_mknod_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/mknod$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_mknod_OBJECTS) $(src_mknod_LDADD) $(LIBS)
 src/mktemp.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/mktemp$(EXEEXT): $(src_mktemp_OBJECTS) $(src_mktemp_DEPENDENCIES) $(EXTRA_src_mktemp_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/mktemp$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_mktemp_OBJECTS) $(src_mktemp_LDADD) $(LIBS)
 src/mv.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/remove.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/mv$(EXEEXT): $(src_mv_OBJECTS) $(src_mv_DEPENDENCIES) $(EXTRA_src_mv_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/mv$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_mv_OBJECTS) $(src_mv_LDADD) $(LIBS)
 src/nice.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/nice$(EXEEXT): $(src_nice_OBJECTS) $(src_nice_DEPENDENCIES) $(EXTRA_src_nice_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/nice$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_nice_OBJECTS) $(src_nice_LDADD) $(LIBS)
 src/nl.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/nl$(EXEEXT): $(src_nl_OBJECTS) $(src_nl_DEPENDENCIES) $(EXTRA_src_nl_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/nl$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_nl_OBJECTS) $(src_nl_LDADD) $(LIBS)
 src/nohup.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/nohup$(EXEEXT): $(src_nohup_OBJECTS) $(src_nohup_DEPENDENCIES) $(EXTRA_src_nohup_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/nohup$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_nohup_OBJECTS) $(src_nohup_LDADD) $(LIBS)
 src/nproc.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/nproc$(EXEEXT): $(src_nproc_OBJECTS) $(src_nproc_DEPENDENCIES) $(EXTRA_src_nproc_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/nproc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_nproc_OBJECTS) $(src_nproc_LDADD) $(LIBS)
 src/numfmt.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/numfmt$(EXEEXT): $(src_numfmt_OBJECTS) $(src_numfmt_DEPENDENCIES) $(EXTRA_src_numfmt_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/numfmt$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_numfmt_OBJECTS) $(src_numfmt_LDADD) $(LIBS)
 src/od.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/od$(EXEEXT): $(src_od_OBJECTS) $(src_od_DEPENDENCIES) $(EXTRA_src_od_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/od$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_od_OBJECTS) $(src_od_LDADD) $(LIBS)
 src/paste.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/paste$(EXEEXT): $(src_paste_OBJECTS) $(src_paste_DEPENDENCIES) $(EXTRA_src_paste_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/paste$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_paste_OBJECTS) $(src_paste_LDADD) $(LIBS)
 src/pathchk.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/pathchk$(EXEEXT): $(src_pathchk_OBJECTS) $(src_pathchk_DEPENDENCIES) $(EXTRA_src_pathchk_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/pathchk$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_pathchk_OBJECTS) $(src_pathchk_LDADD) $(LIBS)
 src/pinky.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/pinky$(EXEEXT): $(src_pinky_OBJECTS) $(src_pinky_DEPENDENCIES) $(EXTRA_src_pinky_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/pinky$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_pinky_OBJECTS) $(src_pinky_LDADD) $(LIBS)
 src/pr.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/pr$(EXEEXT): $(src_pr_OBJECTS) $(src_pr_DEPENDENCIES) $(EXTRA_src_pr_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/pr$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_pr_OBJECTS) $(src_pr_LDADD) $(LIBS)
 src/printenv.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/printenv$(EXEEXT): $(src_printenv_OBJECTS) $(src_printenv_DEPENDENCIES) $(EXTRA_src_printenv_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/printenv$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_printenv_OBJECTS) $(src_printenv_LDADD) $(LIBS)
 src/printf.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/printf$(EXEEXT): $(src_printf_OBJECTS) $(src_printf_DEPENDENCIES) $(EXTRA_src_printf_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/printf$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_printf_OBJECTS) $(src_printf_LDADD) $(LIBS)
 src/ptx.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/ptx$(EXEEXT): $(src_ptx_OBJECTS) $(src_ptx_DEPENDENCIES) $(EXTRA_src_ptx_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/ptx$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_ptx_OBJECTS) $(src_ptx_LDADD) $(LIBS)
 src/pwd.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/pwd$(EXEEXT): $(src_pwd_OBJECTS) $(src_pwd_DEPENDENCIES) $(EXTRA_src_pwd_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/pwd$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_pwd_OBJECTS) $(src_pwd_LDADD) $(LIBS)
 src/readlink.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/readlink$(EXEEXT): $(src_readlink_OBJECTS) $(src_readlink_DEPENDENCIES) $(EXTRA_src_readlink_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/readlink$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_readlink_OBJECTS) $(src_readlink_LDADD) $(LIBS)
 src/realpath.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/realpath$(EXEEXT): $(src_realpath_OBJECTS) $(src_realpath_DEPENDENCIES) $(EXTRA_src_realpath_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/realpath$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_realpath_OBJECTS) $(src_realpath_LDADD) $(LIBS)
 src/rm.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/rm$(EXEEXT): $(src_rm_OBJECTS) $(src_rm_DEPENDENCIES) $(EXTRA_src_rm_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/rm$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_rm_OBJECTS) $(src_rm_LDADD) $(LIBS)
 src/rmdir.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/rmdir$(EXEEXT): $(src_rmdir_OBJECTS) $(src_rmdir_DEPENDENCIES) $(EXTRA_src_rmdir_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/rmdir$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_rmdir_OBJECTS) $(src_rmdir_LDADD) $(LIBS)
 src/runcon.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/runcon$(EXEEXT): $(src_runcon_OBJECTS) $(src_runcon_DEPENDENCIES) $(EXTRA_src_runcon_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/runcon$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_runcon_OBJECTS) $(src_runcon_LDADD) $(LIBS)
 src/seq.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/seq$(EXEEXT): $(src_seq_OBJECTS) $(src_seq_DEPENDENCIES) $(EXTRA_src_seq_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/seq$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_seq_OBJECTS) $(src_seq_LDADD) $(LIBS)
-src/setuidgid.$(OBJEXT): src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/setuidgid$(EXEEXT): $(src_setuidgid_OBJECTS) $(src_setuidgid_DEPENDENCIES) $(EXTRA_src_setuidgid_DEPENDENCIES) src/$(am__dirstamp)
-	@rm -f src/setuidgid$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(src_setuidgid_OBJECTS) $(src_setuidgid_LDADD) $(LIBS)
 src/src_sha1sum-md5sum.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/sha1sum$(EXEEXT): $(src_sha1sum_OBJECTS) $(src_sha1sum_DEPENDENCIES) $(EXTRA_src_sha1sum_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/sha1sum$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_sha1sum_OBJECTS) $(src_sha1sum_LDADD) $(LIBS)
 src/src_sha224sum-md5sum.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/sha224sum$(EXEEXT): $(src_sha224sum_OBJECTS) $(src_sha224sum_DEPENDENCIES) $(EXTRA_src_sha224sum_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/sha224sum$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_sha224sum_OBJECTS) $(src_sha224sum_LDADD) $(LIBS)
 src/src_sha256sum-md5sum.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/sha256sum$(EXEEXT): $(src_sha256sum_OBJECTS) $(src_sha256sum_DEPENDENCIES) $(EXTRA_src_sha256sum_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/sha256sum$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_sha256sum_OBJECTS) $(src_sha256sum_LDADD) $(LIBS)
 src/src_sha384sum-md5sum.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/sha384sum$(EXEEXT): $(src_sha384sum_OBJECTS) $(src_sha384sum_DEPENDENCIES) $(EXTRA_src_sha384sum_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/sha384sum$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_sha384sum_OBJECTS) $(src_sha384sum_LDADD) $(LIBS)
 src/src_sha512sum-md5sum.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/sha512sum$(EXEEXT): $(src_sha512sum_OBJECTS) $(src_sha512sum_DEPENDENCIES) $(EXTRA_src_sha512sum_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/sha512sum$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_sha512sum_OBJECTS) $(src_sha512sum_LDADD) $(LIBS)
 src/shred.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/shred$(EXEEXT): $(src_shred_OBJECTS) $(src_shred_DEPENDENCIES) $(EXTRA_src_shred_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/shred$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_shred_OBJECTS) $(src_shred_LDADD) $(LIBS)
 src/shuf.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/shuf$(EXEEXT): $(src_shuf_OBJECTS) $(src_shuf_DEPENDENCIES) $(EXTRA_src_shuf_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/shuf$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_shuf_OBJECTS) $(src_shuf_LDADD) $(LIBS)
 src/sleep.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/sleep$(EXEEXT): $(src_sleep_OBJECTS) $(src_sleep_DEPENDENCIES) $(EXTRA_src_sleep_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/sleep$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_sleep_OBJECTS) $(src_sleep_LDADD) $(LIBS)
 src/sort.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/sort$(EXEEXT): $(src_sort_OBJECTS) $(src_sort_DEPENDENCIES) $(EXTRA_src_sort_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/sort$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_sort_OBJECTS) $(src_sort_LDADD) $(LIBS)
 src/split.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/split$(EXEEXT): $(src_split_OBJECTS) $(src_split_DEPENDENCIES) $(EXTRA_src_split_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/split$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_split_OBJECTS) $(src_split_LDADD) $(LIBS)
 src/stat.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/stat$(EXEEXT): $(src_stat_OBJECTS) $(src_stat_DEPENDENCIES) $(EXTRA_src_stat_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/stat$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_stat_OBJECTS) $(src_stat_LDADD) $(LIBS)
 src/stdbuf.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/stdbuf$(EXEEXT): $(src_stdbuf_OBJECTS) $(src_stdbuf_DEPENDENCIES) $(EXTRA_src_stdbuf_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/stdbuf$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_stdbuf_OBJECTS) $(src_stdbuf_LDADD) $(LIBS)
 src/stty.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/stty$(EXEEXT): $(src_stty_OBJECTS) $(src_stty_DEPENDENCIES) $(EXTRA_src_stty_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/stty$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_stty_OBJECTS) $(src_stty_LDADD) $(LIBS)
 src/sum.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/sum$(EXEEXT): $(src_sum_OBJECTS) $(src_sum_DEPENDENCIES) $(EXTRA_src_sum_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/sum$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_sum_OBJECTS) $(src_sum_LDADD) $(LIBS)
 src/sync.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/sync$(EXEEXT): $(src_sync_OBJECTS) $(src_sync_DEPENDENCIES) $(EXTRA_src_sync_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/sync$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_sync_OBJECTS) $(src_sync_LDADD) $(LIBS)
 src/tac.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/tac$(EXEEXT): $(src_tac_OBJECTS) $(src_tac_DEPENDENCIES) $(EXTRA_src_tac_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/tac$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_tac_OBJECTS) $(src_tac_LDADD) $(LIBS)
 src/tail.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/tail$(EXEEXT): $(src_tail_OBJECTS) $(src_tail_DEPENDENCIES) $(EXTRA_src_tail_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/tail$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_tail_OBJECTS) $(src_tail_LDADD) $(LIBS)
 src/tee.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/tee$(EXEEXT): $(src_tee_OBJECTS) $(src_tee_DEPENDENCIES) $(EXTRA_src_tee_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/tee$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_tee_OBJECTS) $(src_tee_LDADD) $(LIBS)
 src/test.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/test$(EXEEXT): $(src_test_OBJECTS) $(src_test_DEPENDENCIES) $(EXTRA_src_test_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/test$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_test_OBJECTS) $(src_test_LDADD) $(LIBS)
 src/timeout.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/timeout$(EXEEXT): $(src_timeout_OBJECTS) $(src_timeout_DEPENDENCIES) $(EXTRA_src_timeout_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/timeout$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_timeout_OBJECTS) $(src_timeout_LDADD) $(LIBS)
 src/touch.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/touch$(EXEEXT): $(src_touch_OBJECTS) $(src_touch_DEPENDENCIES) $(EXTRA_src_touch_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/touch$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_touch_OBJECTS) $(src_touch_LDADD) $(LIBS)
 src/tr.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/tr$(EXEEXT): $(src_tr_OBJECTS) $(src_tr_DEPENDENCIES) $(EXTRA_src_tr_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/tr$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_tr_OBJECTS) $(src_tr_LDADD) $(LIBS)
 src/true.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/true$(EXEEXT): $(src_true_OBJECTS) $(src_true_DEPENDENCIES) $(EXTRA_src_true_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/true$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_true_OBJECTS) $(src_true_LDADD) $(LIBS)
 src/truncate.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/truncate$(EXEEXT): $(src_truncate_OBJECTS) $(src_truncate_DEPENDENCIES) $(EXTRA_src_truncate_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/truncate$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_truncate_OBJECTS) $(src_truncate_LDADD) $(LIBS)
 src/tsort.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/tsort$(EXEEXT): $(src_tsort_OBJECTS) $(src_tsort_DEPENDENCIES) $(EXTRA_src_tsort_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/tsort$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_tsort_OBJECTS) $(src_tsort_LDADD) $(LIBS)
 src/tty.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/tty$(EXEEXT): $(src_tty_OBJECTS) $(src_tty_DEPENDENCIES) $(EXTRA_src_tty_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/tty$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_tty_OBJECTS) $(src_tty_LDADD) $(LIBS)
 src/uname-uname.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/uname$(EXEEXT): $(src_uname_OBJECTS) $(src_uname_DEPENDENCIES) $(EXTRA_src_uname_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/uname$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_uname_OBJECTS) $(src_uname_LDADD) $(LIBS)
 src/unexpand.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/unexpand$(EXEEXT): $(src_unexpand_OBJECTS) $(src_unexpand_DEPENDENCIES) $(EXTRA_src_unexpand_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/unexpand$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_unexpand_OBJECTS) $(src_unexpand_LDADD) $(LIBS)
 src/uniq.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/uniq$(EXEEXT): $(src_uniq_OBJECTS) $(src_uniq_DEPENDENCIES) $(EXTRA_src_uniq_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/uniq$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_uniq_OBJECTS) $(src_uniq_LDADD) $(LIBS)
 src/unlink.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/unlink$(EXEEXT): $(src_unlink_OBJECTS) $(src_unlink_DEPENDENCIES) $(EXTRA_src_unlink_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/unlink$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_unlink_OBJECTS) $(src_unlink_LDADD) $(LIBS)
 src/uptime.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/uptime$(EXEEXT): $(src_uptime_OBJECTS) $(src_uptime_DEPENDENCIES) $(EXTRA_src_uptime_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/uptime$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_uptime_OBJECTS) $(src_uptime_LDADD) $(LIBS)
 src/users.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/users$(EXEEXT): $(src_users_OBJECTS) $(src_users_DEPENDENCIES) $(EXTRA_src_users_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/users$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_users_OBJECTS) $(src_users_LDADD) $(LIBS)
 src/ls-vdir.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/vdir$(EXEEXT): $(src_vdir_OBJECTS) $(src_vdir_DEPENDENCIES) $(EXTRA_src_vdir_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/vdir$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_vdir_OBJECTS) $(src_vdir_LDADD) $(LIBS)
 src/wc.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/wc$(EXEEXT): $(src_wc_OBJECTS) $(src_wc_DEPENDENCIES) $(EXTRA_src_wc_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/wc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_wc_OBJECTS) $(src_wc_LDADD) $(LIBS)
 src/who.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/who$(EXEEXT): $(src_who_OBJECTS) $(src_who_DEPENDENCIES) $(EXTRA_src_who_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/who$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_who_OBJECTS) $(src_who_LDADD) $(LIBS)
 src/whoami.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+
 src/whoami$(EXEEXT): $(src_whoami_OBJECTS) $(src_whoami_DEPENDENCIES) $(EXTRA_src_whoami_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/whoami$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_whoami_OBJECTS) $(src_whoami_LDADD) $(LIBS)
 src/yes.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
 src/yes$(EXEEXT): $(src_yes_OBJECTS) $(src_yes_DEPENDENCIES) $(EXTRA_src_yes_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/yes$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_yes_OBJECTS) $(src_yes_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
-	-rm -f lib/acl_entries.$(OBJEXT)
-	-rm -f lib/alloca.$(OBJEXT)
-	-rm -f lib/allocator.$(OBJEXT)
-	-rm -f lib/anytostr.$(OBJEXT)
-	-rm -f lib/areadlink-with-size.$(OBJEXT)
-	-rm -f lib/areadlink.$(OBJEXT)
-	-rm -f lib/areadlinkat.$(OBJEXT)
-	-rm -f lib/argmatch.$(OBJEXT)
-	-rm -f lib/argv-iter.$(OBJEXT)
-	-rm -f lib/asnprintf.$(OBJEXT)
-	-rm -f lib/asprintf.$(OBJEXT)
-	-rm -f lib/at-func.$(OBJEXT)
-	-rm -f lib/at-func2.$(OBJEXT)
-	-rm -f lib/backupfile.$(OBJEXT)
-	-rm -f lib/base64.$(OBJEXT)
-	-rm -f lib/basename-lgpl.$(OBJEXT)
-	-rm -f lib/basename.$(OBJEXT)
-	-rm -f lib/binary-io.$(OBJEXT)
-	-rm -f lib/bitrotate.$(OBJEXT)
-	-rm -f lib/btowc.$(OBJEXT)
-	-rm -f lib/buffer-lcm.$(OBJEXT)
-	-rm -f lib/c-ctype.$(OBJEXT)
-	-rm -f lib/c-strcasecmp.$(OBJEXT)
-	-rm -f lib/c-strncasecmp.$(OBJEXT)
-	-rm -f lib/c-strtod.$(OBJEXT)
-	-rm -f lib/c-strtold.$(OBJEXT)
-	-rm -f lib/calloc.$(OBJEXT)
-	-rm -f lib/canon-host.$(OBJEXT)
-	-rm -f lib/canonicalize.$(OBJEXT)
-	-rm -f lib/careadlinkat.$(OBJEXT)
-	-rm -f lib/chdir-long.$(OBJEXT)
-	-rm -f lib/chmodat.$(OBJEXT)
-	-rm -f lib/chown.$(OBJEXT)
-	-rm -f lib/chownat.$(OBJEXT)
-	-rm -f lib/cloexec.$(OBJEXT)
-	-rm -f lib/close-stream.$(OBJEXT)
-	-rm -f lib/close.$(OBJEXT)
-	-rm -f lib/closedir.$(OBJEXT)
-	-rm -f lib/closein.$(OBJEXT)
-	-rm -f lib/closeout.$(OBJEXT)
-	-rm -f lib/copy-acl.$(OBJEXT)
-	-rm -f lib/creat-safer.$(OBJEXT)
-	-rm -f lib/cycle-check.$(OBJEXT)
-	-rm -f lib/di-set.$(OBJEXT)
-	-rm -f lib/diacrit.$(OBJEXT)
-	-rm -f lib/dirchownmod.$(OBJEXT)
-	-rm -f lib/dirfd.$(OBJEXT)
-	-rm -f lib/dirname-lgpl.$(OBJEXT)
-	-rm -f lib/dirname.$(OBJEXT)
-	-rm -f lib/dtoastr.$(OBJEXT)
-	-rm -f lib/dtotimespec.$(OBJEXT)
-	-rm -f lib/dup-safer-flag.$(OBJEXT)
-	-rm -f lib/dup-safer.$(OBJEXT)
-	-rm -f lib/dup.$(OBJEXT)
-	-rm -f lib/dup2.$(OBJEXT)
-	-rm -f lib/error.$(OBJEXT)
-	-rm -f lib/euidaccess.$(OBJEXT)
-	-rm -f lib/exclude.$(OBJEXT)
-	-rm -f lib/exitfail.$(OBJEXT)
-	-rm -f lib/faccessat.$(OBJEXT)
-	-rm -f lib/fadvise.$(OBJEXT)
-	-rm -f lib/fatal-signal.$(OBJEXT)
-	-rm -f lib/fchdir.$(OBJEXT)
-	-rm -f lib/fchmodat.$(OBJEXT)
-	-rm -f lib/fchown-stub.$(OBJEXT)
-	-rm -f lib/fchownat.$(OBJEXT)
-	-rm -f lib/fclose.$(OBJEXT)
-	-rm -f lib/fcntl.$(OBJEXT)
-	-rm -f lib/fd-hook.$(OBJEXT)
-	-rm -f lib/fd-reopen.$(OBJEXT)
-	-rm -f lib/fd-safer-flag.$(OBJEXT)
-	-rm -f lib/fd-safer.$(OBJEXT)
-	-rm -f lib/fdatasync.$(OBJEXT)
-	-rm -f lib/fdopen.$(OBJEXT)
-	-rm -f lib/fdopendir.$(OBJEXT)
-	-rm -f lib/fdutimensat.$(OBJEXT)
-	-rm -f lib/fflush.$(OBJEXT)
-	-rm -f lib/file-has-acl.$(OBJEXT)
-	-rm -f lib/file-set.$(OBJEXT)
-	-rm -f lib/file-type.$(OBJEXT)
-	-rm -f lib/fileblocks.$(OBJEXT)
-	-rm -f lib/filemode.$(OBJEXT)
-	-rm -f lib/filenamecat-lgpl.$(OBJEXT)
-	-rm -f lib/filenamecat.$(OBJEXT)
-	-rm -f lib/filevercmp.$(OBJEXT)
-	-rm -f lib/float.$(OBJEXT)
-	-rm -f lib/fnmatch.$(OBJEXT)
-	-rm -f lib/fnmatch_loop.$(OBJEXT)
-	-rm -f lib/fopen-safer.$(OBJEXT)
-	-rm -f lib/fopen.$(OBJEXT)
-	-rm -f lib/fpending.$(OBJEXT)
-	-rm -f lib/fprintftime.$(OBJEXT)
-	-rm -f lib/fpurge.$(OBJEXT)
-	-rm -f lib/freadahead.$(OBJEXT)
-	-rm -f lib/freading.$(OBJEXT)
-	-rm -f lib/freadptr.$(OBJEXT)
-	-rm -f lib/freadseek.$(OBJEXT)
-	-rm -f lib/freopen-safer.$(OBJEXT)
-	-rm -f lib/freopen.$(OBJEXT)
-	-rm -f lib/frexp.$(OBJEXT)
-	-rm -f lib/frexpl.$(OBJEXT)
-	-rm -f lib/fseek.$(OBJEXT)
-	-rm -f lib/fseeko.$(OBJEXT)
-	-rm -f lib/fseterr.$(OBJEXT)
-	-rm -f lib/fstat.$(OBJEXT)
-	-rm -f lib/fstatat.$(OBJEXT)
-	-rm -f lib/fsusage.$(OBJEXT)
-	-rm -f lib/fsync.$(OBJEXT)
-	-rm -f lib/ftell.$(OBJEXT)
-	-rm -f lib/ftello.$(OBJEXT)
-	-rm -f lib/ftoastr.$(OBJEXT)
-	-rm -f lib/ftruncate.$(OBJEXT)
-	-rm -f lib/fts-cycle.$(OBJEXT)
-	-rm -f lib/fts.$(OBJEXT)
-	-rm -f lib/full-read.$(OBJEXT)
-	-rm -f lib/full-write.$(OBJEXT)
-	-rm -f lib/futimens.$(OBJEXT)
-	-rm -f lib/gai_strerror.$(OBJEXT)
-	-rm -f lib/getaddrinfo.$(OBJEXT)
-	-rm -f lib/getcwd-lgpl.$(OBJEXT)
-	-rm -f lib/getcwd.$(OBJEXT)
-	-rm -f lib/getdelim.$(OBJEXT)
-	-rm -f lib/getdtablesize.$(OBJEXT)
-	-rm -f lib/getfilecon.$(OBJEXT)
-	-rm -f lib/getgroups.$(OBJEXT)
-	-rm -f lib/gethostname.$(OBJEXT)
-	-rm -f lib/gethrxtime.$(OBJEXT)
-	-rm -f lib/getline.$(OBJEXT)
-	-rm -f lib/getloadavg.$(OBJEXT)
-	-rm -f lib/getlogin.$(OBJEXT)
-	-rm -f lib/getndelim2.$(OBJEXT)
-	-rm -f lib/getopt.$(OBJEXT)
-	-rm -f lib/getopt1.$(OBJEXT)
-	-rm -f lib/getpagesize.$(OBJEXT)
-	-rm -f lib/getpass.$(OBJEXT)
-	-rm -f lib/gettime.$(OBJEXT)
-	-rm -f lib/gettimeofday.$(OBJEXT)
-	-rm -f lib/getugroups.$(OBJEXT)
-	-rm -f lib/getusershell.$(OBJEXT)
-	-rm -f lib/glthread/lock.$(OBJEXT)
-	-rm -f lib/glthread/threadlib.$(OBJEXT)
-	-rm -f lib/glthread/tls.$(OBJEXT)
-	-rm -f lib/group-member.$(OBJEXT)
-	-rm -f lib/hard-locale.$(OBJEXT)
-	-rm -f lib/hash-pjw.$(OBJEXT)
-	-rm -f lib/hash-triple.$(OBJEXT)
-	-rm -f lib/hash.$(OBJEXT)
-	-rm -f lib/heap.$(OBJEXT)
-	-rm -f lib/human.$(OBJEXT)
-	-rm -f lib/i-ring.$(OBJEXT)
-	-rm -f lib/iconv.$(OBJEXT)
-	-rm -f lib/iconv_close.$(OBJEXT)
-	-rm -f lib/iconv_open.$(OBJEXT)
-	-rm -f lib/idcache.$(OBJEXT)
-	-rm -f lib/imaxtostr.$(OBJEXT)
-	-rm -f lib/inet_ntop.$(OBJEXT)
-	-rm -f lib/ino-map.$(OBJEXT)
-	-rm -f lib/inttostr.$(OBJEXT)
-	-rm -f lib/isapipe.$(OBJEXT)
-	-rm -f lib/isatty.$(OBJEXT)
-	-rm -f lib/isblank.$(OBJEXT)
-	-rm -f lib/isnan.$(OBJEXT)
-	-rm -f lib/isnand.$(OBJEXT)
-	-rm -f lib/isnanf.$(OBJEXT)
-	-rm -f lib/isnanl.$(OBJEXT)
-	-rm -f lib/iswblank.$(OBJEXT)
-	-rm -f lib/itold.$(OBJEXT)
-	-rm -f lib/lchown.$(OBJEXT)
-	-rm -f lib/ldtoastr.$(OBJEXT)
-	-rm -f lib/linebuffer.$(OBJEXT)
-	-rm -f lib/link.$(OBJEXT)
-	-rm -f lib/linkat.$(OBJEXT)
-	-rm -f lib/localcharset.$(OBJEXT)
-	-rm -f lib/localeconv.$(OBJEXT)
-	-rm -f lib/long-options.$(OBJEXT)
-	-rm -f lib/lseek.$(OBJEXT)
-	-rm -f lib/lstat.$(OBJEXT)
-	-rm -f lib/malloc.$(OBJEXT)
-	-rm -f lib/malloca.$(OBJEXT)
-	-rm -f lib/math.$(OBJEXT)
-	-rm -f lib/mbchar.$(OBJEXT)
-	-rm -f lib/mbiter.$(OBJEXT)
-	-rm -f lib/mbrlen.$(OBJEXT)
-	-rm -f lib/mbrtowc.$(OBJEXT)
-	-rm -f lib/mbsalign.$(OBJEXT)
-	-rm -f lib/mbscasecmp.$(OBJEXT)
-	-rm -f lib/mbsinit.$(OBJEXT)
-	-rm -f lib/mbslen.$(OBJEXT)
-	-rm -f lib/mbsrtowcs-state.$(OBJEXT)
-	-rm -f lib/mbsrtowcs.$(OBJEXT)
-	-rm -f lib/mbsstr.$(OBJEXT)
-	-rm -f lib/mbswidth.$(OBJEXT)
-	-rm -f lib/mbtowc.$(OBJEXT)
-	-rm -f lib/mbuiter.$(OBJEXT)
-	-rm -f lib/md5.$(OBJEXT)
-	-rm -f lib/memcasecmp.$(OBJEXT)
-	-rm -f lib/memchr.$(OBJEXT)
-	-rm -f lib/memchr2.$(OBJEXT)
-	-rm -f lib/memcmp2.$(OBJEXT)
-	-rm -f lib/memcoll.$(OBJEXT)
-	-rm -f lib/mempcpy.$(OBJEXT)
-	-rm -f lib/memrchr.$(OBJEXT)
-	-rm -f lib/mgetgroups.$(OBJEXT)
-	-rm -f lib/mkancesdirs.$(OBJEXT)
-	-rm -f lib/mkdir-p.$(OBJEXT)
-	-rm -f lib/mkdir.$(OBJEXT)
-	-rm -f lib/mkfifo.$(OBJEXT)
-	-rm -f lib/mknod.$(OBJEXT)
-	-rm -f lib/mkstemp-safer.$(OBJEXT)
-	-rm -f lib/mkstemp.$(OBJEXT)
-	-rm -f lib/mktime.$(OBJEXT)
-	-rm -f lib/modechange.$(OBJEXT)
-	-rm -f lib/mountlist.$(OBJEXT)
-	-rm -f lib/mpsort.$(OBJEXT)
-	-rm -f lib/msvc-inval.$(OBJEXT)
-	-rm -f lib/msvc-nothrow.$(OBJEXT)
-	-rm -f lib/nanosleep.$(OBJEXT)
-	-rm -f lib/nl_langinfo.$(OBJEXT)
-	-rm -f lib/nproc.$(OBJEXT)
-	-rm -f lib/obstack.$(OBJEXT)
-	-rm -f lib/offtostr.$(OBJEXT)
-	-rm -f lib/open-safer.$(OBJEXT)
-	-rm -f lib/open.$(OBJEXT)
-	-rm -f lib/openat-die.$(OBJEXT)
-	-rm -f lib/openat-proc.$(OBJEXT)
-	-rm -f lib/openat-safer.$(OBJEXT)
-	-rm -f lib/openat.$(OBJEXT)
-	-rm -f lib/opendir-safer.$(OBJEXT)
-	-rm -f lib/opendir.$(OBJEXT)
-	-rm -f lib/parse-datetime.$(OBJEXT)
-	-rm -f lib/physmem.$(OBJEXT)
-	-rm -f lib/pipe-safer.$(OBJEXT)
-	-rm -f lib/pipe2-safer.$(OBJEXT)
-	-rm -f lib/pipe2.$(OBJEXT)
-	-rm -f lib/posixtm.$(OBJEXT)
-	-rm -f lib/posixver.$(OBJEXT)
-	-rm -f lib/printf-args.$(OBJEXT)
-	-rm -f lib/printf-frexp.$(OBJEXT)
-	-rm -f lib/printf-frexpl.$(OBJEXT)
-	-rm -f lib/printf-parse.$(OBJEXT)
-	-rm -f lib/priv-set.$(OBJEXT)
-	-rm -f lib/progname.$(OBJEXT)
-	-rm -f lib/propername.$(OBJEXT)
-	-rm -f lib/pthread.$(OBJEXT)
-	-rm -f lib/putenv.$(OBJEXT)
-	-rm -f lib/quotearg.$(OBJEXT)
-	-rm -f lib/raise.$(OBJEXT)
-	-rm -f lib/rand-isaac.$(OBJEXT)
-	-rm -f lib/randint.$(OBJEXT)
-	-rm -f lib/randperm.$(OBJEXT)
-	-rm -f lib/randread.$(OBJEXT)
-	-rm -f lib/rawmemchr.$(OBJEXT)
-	-rm -f lib/read-file.$(OBJEXT)
-	-rm -f lib/read.$(OBJEXT)
-	-rm -f lib/readdir.$(OBJEXT)
-	-rm -f lib/readlink.$(OBJEXT)
-	-rm -f lib/readlinkat.$(OBJEXT)
-	-rm -f lib/readtokens.$(OBJEXT)
-	-rm -f lib/readtokens0.$(OBJEXT)
-	-rm -f lib/readutmp.$(OBJEXT)
-	-rm -f lib/realloc.$(OBJEXT)
-	-rm -f lib/regcomp.$(OBJEXT)
-	-rm -f lib/regex.$(OBJEXT)
-	-rm -f lib/regex_internal.$(OBJEXT)
-	-rm -f lib/regexec.$(OBJEXT)
-	-rm -f lib/remove.$(OBJEXT)
-	-rm -f lib/rename.$(OBJEXT)
-	-rm -f lib/rewinddir.$(OBJEXT)
-	-rm -f lib/rmdir.$(OBJEXT)
-	-rm -f lib/root-dev-ino.$(OBJEXT)
-	-rm -f lib/rpmatch.$(OBJEXT)
-	-rm -f lib/safe-read.$(OBJEXT)
-	-rm -f lib/safe-write.$(OBJEXT)
-	-rm -f lib/same.$(OBJEXT)
-	-rm -f lib/save-cwd.$(OBJEXT)
-	-rm -f lib/savedir.$(OBJEXT)
-	-rm -f lib/savewd.$(OBJEXT)
-	-rm -f lib/se-context.$(OBJEXT)
-	-rm -f lib/se-selinux.$(OBJEXT)
-	-rm -f lib/select.$(OBJEXT)
-	-rm -f lib/selinux-at.$(OBJEXT)
-	-rm -f lib/set-mode-acl.$(OBJEXT)
-	-rm -f lib/setenv.$(OBJEXT)
-	-rm -f lib/settime.$(OBJEXT)
-	-rm -f lib/sha1.$(OBJEXT)
-	-rm -f lib/sha256.$(OBJEXT)
-	-rm -f lib/sha512.$(OBJEXT)
-	-rm -f lib/sig-handler.$(OBJEXT)
-	-rm -f lib/sig2str.$(OBJEXT)
-	-rm -f lib/sigaction.$(OBJEXT)
-	-rm -f lib/signbitd.$(OBJEXT)
-	-rm -f lib/signbitf.$(OBJEXT)
-	-rm -f lib/signbitl.$(OBJEXT)
-	-rm -f lib/sigprocmask.$(OBJEXT)
-	-rm -f lib/snprintf.$(OBJEXT)
-	-rm -f lib/sockets.$(OBJEXT)
-	-rm -f lib/spawn-pipe.$(OBJEXT)
-	-rm -f lib/spawn_faction_addclose.$(OBJEXT)
-	-rm -f lib/spawn_faction_adddup2.$(OBJEXT)
-	-rm -f lib/spawn_faction_addopen.$(OBJEXT)
-	-rm -f lib/spawn_faction_destroy.$(OBJEXT)
-	-rm -f lib/spawn_faction_init.$(OBJEXT)
-	-rm -f lib/spawnattr_destroy.$(OBJEXT)
-	-rm -f lib/spawnattr_init.$(OBJEXT)
-	-rm -f lib/spawnattr_setflags.$(OBJEXT)
-	-rm -f lib/spawnattr_setsigmask.$(OBJEXT)
-	-rm -f lib/spawni.$(OBJEXT)
-	-rm -f lib/spawnp.$(OBJEXT)
-	-rm -f lib/stat-time.$(OBJEXT)
-	-rm -f lib/stat.$(OBJEXT)
-	-rm -f lib/statat.$(OBJEXT)
-	-rm -f lib/stpcpy.$(OBJEXT)
-	-rm -f lib/stpncpy.$(OBJEXT)
-	-rm -f lib/strchrnul.$(OBJEXT)
-	-rm -f lib/strdup.$(OBJEXT)
-	-rm -f lib/strerror-override.$(OBJEXT)
-	-rm -f lib/strerror.$(OBJEXT)
-	-rm -f lib/strftime.$(OBJEXT)
-	-rm -f lib/striconv.$(OBJEXT)
-	-rm -f lib/strintcmp.$(OBJEXT)
-	-rm -f lib/stripslash.$(OBJEXT)
-	-rm -f lib/strncat.$(OBJEXT)
-	-rm -f lib/strndup.$(OBJEXT)
-	-rm -f lib/strnlen.$(OBJEXT)
-	-rm -f lib/strnlen1.$(OBJEXT)
-	-rm -f lib/strnumcmp.$(OBJEXT)
-	-rm -f lib/strpbrk.$(OBJEXT)
-	-rm -f lib/strsignal.$(OBJEXT)
-	-rm -f lib/strstr.$(OBJEXT)
-	-rm -f lib/strtod.$(OBJEXT)
-	-rm -f lib/strtoimax.$(OBJEXT)
-	-rm -f lib/strtol.$(OBJEXT)
-	-rm -f lib/strtoll.$(OBJEXT)
-	-rm -f lib/strtoul.$(OBJEXT)
-	-rm -f lib/strtoull.$(OBJEXT)
-	-rm -f lib/strtoumax.$(OBJEXT)
-	-rm -f lib/symlink.$(OBJEXT)
-	-rm -f lib/sys_socket.$(OBJEXT)
-	-rm -f lib/tempname.$(OBJEXT)
-	-rm -f lib/time_r.$(OBJEXT)
-	-rm -f lib/timespec.$(OBJEXT)
-	-rm -f lib/trim.$(OBJEXT)
-	-rm -f lib/u64.$(OBJEXT)
-	-rm -f lib/uinttostr.$(OBJEXT)
-	-rm -f lib/umaxtostr.$(OBJEXT)
-	-rm -f lib/uname.$(OBJEXT)
-	-rm -f lib/unicodeio.$(OBJEXT)
-	-rm -f lib/unistd.$(OBJEXT)
-	-rm -f lib/unistr/u8-mbtoucr.$(OBJEXT)
-	-rm -f lib/unistr/u8-uctomb-aux.$(OBJEXT)
-	-rm -f lib/unistr/u8-uctomb.$(OBJEXT)
-	-rm -f lib/uniwidth/width.$(OBJEXT)
-	-rm -f lib/unlink.$(OBJEXT)
-	-rm -f lib/unlinkat.$(OBJEXT)
-	-rm -f lib/unsetenv.$(OBJEXT)
-	-rm -f lib/userspec.$(OBJEXT)
-	-rm -f lib/utimecmp.$(OBJEXT)
-	-rm -f lib/utimens.$(OBJEXT)
-	-rm -f lib/utimensat.$(OBJEXT)
-	-rm -f lib/vasnprintf.$(OBJEXT)
-	-rm -f lib/vasprintf.$(OBJEXT)
-	-rm -f lib/verror.$(OBJEXT)
-	-rm -f lib/version-etc-fsf.$(OBJEXT)
-	-rm -f lib/version-etc.$(OBJEXT)
-	-rm -f lib/vfprintf.$(OBJEXT)
-	-rm -f lib/vprintf.$(OBJEXT)
-	-rm -f lib/wait-process.$(OBJEXT)
-	-rm -f lib/waitpid.$(OBJEXT)
-	-rm -f lib/wcrtomb.$(OBJEXT)
-	-rm -f lib/wcswidth.$(OBJEXT)
-	-rm -f lib/wctype-h.$(OBJEXT)
-	-rm -f lib/wcwidth.$(OBJEXT)
-	-rm -f lib/write-any-file.$(OBJEXT)
-	-rm -f lib/write.$(OBJEXT)
-	-rm -f lib/xalloc-die.$(OBJEXT)
-	-rm -f lib/xasprintf.$(OBJEXT)
-	-rm -f lib/xfreopen.$(OBJEXT)
-	-rm -f lib/xfts.$(OBJEXT)
-	-rm -f lib/xgetcwd.$(OBJEXT)
-	-rm -f lib/xgetgroups.$(OBJEXT)
-	-rm -f lib/xgethostname.$(OBJEXT)
-	-rm -f lib/xmalloc.$(OBJEXT)
-	-rm -f lib/xmemcoll.$(OBJEXT)
-	-rm -f lib/xnanosleep.$(OBJEXT)
-	-rm -f lib/xprintf.$(OBJEXT)
-	-rm -f lib/xreadlink.$(OBJEXT)
-	-rm -f lib/xsize.$(OBJEXT)
-	-rm -f lib/xstriconv.$(OBJEXT)
-	-rm -f lib/xstrndup.$(OBJEXT)
-	-rm -f lib/xstrtod.$(OBJEXT)
-	-rm -f lib/xstrtoimax.$(OBJEXT)
-	-rm -f lib/xstrtol-error.$(OBJEXT)
-	-rm -f lib/xstrtol.$(OBJEXT)
-	-rm -f lib/xstrtold.$(OBJEXT)
-	-rm -f lib/xstrtoul.$(OBJEXT)
-	-rm -f lib/xstrtoumax.$(OBJEXT)
-	-rm -f lib/xtime.$(OBJEXT)
-	-rm -f lib/xvasprintf.$(OBJEXT)
-	-rm -f lib/yesno.$(OBJEXT)
-	-rm -f src/base64.$(OBJEXT)
-	-rm -f src/basename.$(OBJEXT)
-	-rm -f src/cat.$(OBJEXT)
-	-rm -f src/chcon.$(OBJEXT)
-	-rm -f src/chgrp.$(OBJEXT)
-	-rm -f src/chmod.$(OBJEXT)
-	-rm -f src/chown-core.$(OBJEXT)
-	-rm -f src/chown.$(OBJEXT)
-	-rm -f src/chroot.$(OBJEXT)
-	-rm -f src/cksum.$(OBJEXT)
-	-rm -f src/comm.$(OBJEXT)
-	-rm -f src/copy.$(OBJEXT)
-	-rm -f src/cp-hash.$(OBJEXT)
-	-rm -f src/cp.$(OBJEXT)
-	-rm -f src/csplit.$(OBJEXT)
-	-rm -f src/cut.$(OBJEXT)
-	-rm -f src/date.$(OBJEXT)
-	-rm -f src/dd.$(OBJEXT)
-	-rm -f src/df.$(OBJEXT)
-	-rm -f src/dircolors.$(OBJEXT)
-	-rm -f src/dirname.$(OBJEXT)
-	-rm -f src/du.$(OBJEXT)
-	-rm -f src/echo.$(OBJEXT)
-	-rm -f src/env.$(OBJEXT)
-	-rm -f src/expand.$(OBJEXT)
-	-rm -f src/expr.$(OBJEXT)
-	-rm -f src/extent-scan.$(OBJEXT)
-	-rm -f src/factor.$(OBJEXT)
-	-rm -f src/false.$(OBJEXT)
-	-rm -f src/find-mount-point.$(OBJEXT)
-	-rm -f src/fmt.$(OBJEXT)
-	-rm -f src/fold.$(OBJEXT)
-	-rm -f src/getlimits.$(OBJEXT)
-	-rm -f src/group-list.$(OBJEXT)
-	-rm -f src/groups.$(OBJEXT)
-	-rm -f src/head.$(OBJEXT)
-	-rm -f src/hostid.$(OBJEXT)
-	-rm -f src/hostname.$(OBJEXT)
-	-rm -f src/id.$(OBJEXT)
-	-rm -f src/join.$(OBJEXT)
-	-rm -f src/kill.$(OBJEXT)
-	-rm -f src/lbracket.$(OBJEXT)
-	-rm -f src/link.$(OBJEXT)
-	-rm -f src/ln.$(OBJEXT)
-	-rm -f src/logname.$(OBJEXT)
-	-rm -f src/ls-dir.$(OBJEXT)
-	-rm -f src/ls-ls.$(OBJEXT)
-	-rm -f src/ls-vdir.$(OBJEXT)
-	-rm -f src/ls.$(OBJEXT)
-	-rm -f src/make-prime-list.$(OBJEXT)
-	-rm -f src/mkdir.$(OBJEXT)
-	-rm -f src/mkfifo.$(OBJEXT)
-	-rm -f src/mknod.$(OBJEXT)
-	-rm -f src/mktemp.$(OBJEXT)
-	-rm -f src/mv.$(OBJEXT)
-	-rm -f src/nice.$(OBJEXT)
-	-rm -f src/nl.$(OBJEXT)
-	-rm -f src/nohup.$(OBJEXT)
-	-rm -f src/nproc.$(OBJEXT)
-	-rm -f src/numfmt.$(OBJEXT)
-	-rm -f src/od.$(OBJEXT)
-	-rm -f src/operand2sig.$(OBJEXT)
-	-rm -f src/paste.$(OBJEXT)
-	-rm -f src/pathchk.$(OBJEXT)
-	-rm -f src/pinky.$(OBJEXT)
-	-rm -f src/pr.$(OBJEXT)
-	-rm -f src/printenv.$(OBJEXT)
-	-rm -f src/printf.$(OBJEXT)
-	-rm -f src/prog-fprintf.$(OBJEXT)
-	-rm -f src/ptx.$(OBJEXT)
-	-rm -f src/pwd.$(OBJEXT)
-	-rm -f src/readlink.$(OBJEXT)
-	-rm -f src/realpath.$(OBJEXT)
-	-rm -f src/relpath.$(OBJEXT)
-	-rm -f src/remove.$(OBJEXT)
-	-rm -f src/rm.$(OBJEXT)
-	-rm -f src/rmdir.$(OBJEXT)
-	-rm -f src/runcon.$(OBJEXT)
-	-rm -f src/seq.$(OBJEXT)
-	-rm -f src/setuidgid.$(OBJEXT)
-	-rm -f src/shred.$(OBJEXT)
-	-rm -f src/shuf.$(OBJEXT)
-	-rm -f src/sleep.$(OBJEXT)
-	-rm -f src/sort.$(OBJEXT)
-	-rm -f src/split.$(OBJEXT)
-	-rm -f src/src_ginstall-copy.$(OBJEXT)
-	-rm -f src/src_ginstall-cp-hash.$(OBJEXT)
-	-rm -f src/src_ginstall-extent-scan.$(OBJEXT)
-	-rm -f src/src_ginstall-install.$(OBJEXT)
-	-rm -f src/src_ginstall-prog-fprintf.$(OBJEXT)
-	-rm -f src/src_libstdbuf_so-libstdbuf.$(OBJEXT)
-	-rm -f src/src_md5sum-md5sum.$(OBJEXT)
-	-rm -f src/src_sha1sum-md5sum.$(OBJEXT)
-	-rm -f src/src_sha224sum-md5sum.$(OBJEXT)
-	-rm -f src/src_sha256sum-md5sum.$(OBJEXT)
-	-rm -f src/src_sha384sum-md5sum.$(OBJEXT)
-	-rm -f src/src_sha512sum-md5sum.$(OBJEXT)
-	-rm -f src/stat.$(OBJEXT)
-	-rm -f src/stdbuf.$(OBJEXT)
-	-rm -f src/stty.$(OBJEXT)
-	-rm -f src/sum.$(OBJEXT)
-	-rm -f src/sync.$(OBJEXT)
-	-rm -f src/tac.$(OBJEXT)
-	-rm -f src/tail.$(OBJEXT)
-	-rm -f src/tee.$(OBJEXT)
-	-rm -f src/test.$(OBJEXT)
-	-rm -f src/timeout.$(OBJEXT)
-	-rm -f src/touch.$(OBJEXT)
-	-rm -f src/tr.$(OBJEXT)
-	-rm -f src/true.$(OBJEXT)
-	-rm -f src/truncate.$(OBJEXT)
-	-rm -f src/tsort.$(OBJEXT)
-	-rm -f src/tty.$(OBJEXT)
-	-rm -f src/uname-arch.$(OBJEXT)
-	-rm -f src/uname-uname.$(OBJEXT)
-	-rm -f src/uname.$(OBJEXT)
-	-rm -f src/unexpand.$(OBJEXT)
-	-rm -f src/uniq.$(OBJEXT)
-	-rm -f src/unlink.$(OBJEXT)
-	-rm -f src/uptime.$(OBJEXT)
-	-rm -f src/users.$(OBJEXT)
-	-rm -f src/version.$(OBJEXT)
-	-rm -f src/wc.$(OBJEXT)
-	-rm -f src/who.$(OBJEXT)
-	-rm -f src/whoami.$(OBJEXT)
-	-rm -f src/yes.$(OBJEXT)
+	-rm -f lib/*.$(OBJEXT)
+	-rm -f lib/glthread/*.$(OBJEXT)
+	-rm -f lib/unistr/*.$(OBJEXT)
+	-rm -f lib/uniwidth/*.$(OBJEXT)
+	-rm -f src/*.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/acl-errno-valid.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/acl_entries.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/alloca.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/allocator.Po@am__quote@
@@ -6149,7 +8119,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/base64.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/basename-lgpl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/basename.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/binary-io.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/bitrotate.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/btowc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/buffer-lcm.Po@am__quote@
@@ -6193,7 +8162,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/exitfail.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/faccessat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/fadvise.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/fatal-signal.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/fchdir.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/fchmodat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/fchown-stub.Po@am__quote@
@@ -6361,8 +8329,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/parse-datetime.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/physmem.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/pipe-safer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/pipe2-safer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/pipe2.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/pipe.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/posixtm.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/posixver.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/printf-args.Po@am__quote@
@@ -6374,13 +8341,14 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/propername.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/pthread.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/putenv.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/qcopy-acl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/qset-acl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/quotearg.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/raise.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/rand-isaac.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/randint.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/randperm.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/randread.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/rawmemchr.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/read-file.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/read.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/readdir.Po@am__quote@
@@ -6408,9 +8376,10 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/savewd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/se-context.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/se-selinux.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/secure_getenv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/select.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/selinux-at.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/set-mode-acl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/set-acl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/setenv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/settime.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/sha1.Po@am__quote@
@@ -6425,24 +8394,11 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/sigprocmask.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/snprintf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/sockets.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/spawn-pipe.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/spawn_faction_addclose.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/spawn_faction_adddup2.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/spawn_faction_addopen.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/spawn_faction_destroy.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/spawn_faction_init.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/spawnattr_destroy.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/spawnattr_init.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/spawnattr_setflags.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/spawnattr_setsigmask.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/spawni.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/spawnp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/stat-time.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/stat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/statat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/stpcpy.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/stpncpy.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/strchrnul.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/strdup.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/strerror-override.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/strerror.Po@am__quote@
@@ -6491,8 +8447,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/version-etc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/vfprintf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/vprintf.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/wait-process.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/waitpid.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/wcrtomb.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/wcswidth.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/wctype-h.Po@am__quote@
@@ -6609,18 +8563,157 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/rm.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/rmdir.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/runcon.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/selinux.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/seq.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/setuidgid.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/shred.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/shuf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/sleep.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/sort.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/split.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_coreutils-coreutils.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_ginstall-copy.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_ginstall-cp-hash.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_ginstall-extent-scan.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_ginstall-install.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_ginstall-prog-fprintf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_ginstall-selinux.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin___a-lbracket.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_arch_a-coreutils-arch.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_base64_a-base64.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_basename_a-basename.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_cat_a-cat.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_chcon_a-chcon.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_chgrp_a-chgrp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_chgrp_a-chown-core.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_chmod_a-chmod.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_chown_a-chown-core.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_chown_a-chown.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_chroot_a-chroot.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_cksum_a-cksum.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_comm_a-comm.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_cp_a-copy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_cp_a-cp-hash.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_cp_a-cp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_cp_a-extent-scan.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_cp_a-selinux.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_csplit_a-csplit.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_cut_a-cut.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_date_a-date.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_dd_a-dd.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_df_a-df.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_df_a-find-mount-point.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_dir_a-coreutils-dir.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_dircolors_a-dircolors.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_dirname_a-dirname.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_du_a-du.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_echo_a-echo.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_env_a-env.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_expand_a-expand.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_expr_a-expr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_factor_a-factor.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_false_a-false.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_fmt_a-fmt.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_fold_a-fold.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_ginstall_a-copy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_ginstall_a-cp-hash.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_ginstall_a-extent-scan.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_ginstall_a-install.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_ginstall_a-prog-fprintf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_ginstall_a-selinux.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_groups_a-group-list.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_groups_a-groups.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_head_a-head.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_hostid_a-hostid.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_hostname_a-hostname.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_id_a-group-list.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_id_a-id.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_join_a-join.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_kill_a-kill.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_kill_a-operand2sig.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_link_a-link.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_ln_a-ln.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_ln_a-relpath.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_logname_a-logname.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_ls_a-ls-ls.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_ls_a-ls.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_md5sum_a-md5sum.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_mkdir_a-mkdir.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_mkdir_a-prog-fprintf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_mkdir_a-selinux.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_mkfifo_a-mkfifo.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_mkfifo_a-selinux.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_mknod_a-mknod.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_mknod_a-selinux.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_mktemp_a-mktemp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_mv_a-copy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_mv_a-cp-hash.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_mv_a-extent-scan.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_mv_a-mv.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_mv_a-remove.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_mv_a-selinux.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_nice_a-nice.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_nl_a-nl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_nohup_a-nohup.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_nproc_a-nproc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_numfmt_a-numfmt.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_od_a-od.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_paste_a-paste.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_pathchk_a-pathchk.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_pinky_a-pinky.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_pr_a-pr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_printenv_a-printenv.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_printf_a-printf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_ptx_a-ptx.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_pwd_a-pwd.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_readlink_a-readlink.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_realpath_a-realpath.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_realpath_a-relpath.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_rm_a-remove.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_rm_a-rm.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_rmdir_a-prog-fprintf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_rmdir_a-rmdir.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_runcon_a-runcon.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_seq_a-seq.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_sha1sum_a-md5sum.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_sha224sum_a-md5sum.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_sha256sum_a-md5sum.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_sha384sum_a-md5sum.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_sha512sum_a-md5sum.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_shred_a-shred.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_shuf_a-shuf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_sleep_a-sleep.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_sort_a-sort.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_split_a-split.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_stat_a-find-mount-point.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_stat_a-stat.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_stdbuf_a-stdbuf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_stty_a-stty.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_sum_a-sum.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_sync_a-sync.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_tac_a-tac.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_tail_a-tail.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_tee_a-tee.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_test_a-test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_timeout_a-operand2sig.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_timeout_a-timeout.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_touch_a-touch.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_tr_a-tr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_true_a-true.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_truncate_a-truncate.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_tsort_a-tsort.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_tty_a-tty.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_uname_a-uname-uname.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_uname_a-uname.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_unexpand_a-unexpand.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_uniq_a-uniq.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_unlink_a-unlink.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_uptime_a-uptime.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_users_a-users.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_vdir_a-coreutils-vdir.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_wc_a-wc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_who_a-who.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_whoami_a-whoami.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libsinglebin_yes_a-yes.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libstdbuf_so-libstdbuf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_md5sum-md5sum.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_sha1sum-md5sum.Po@am__quote@
@@ -6674,6 +8767,1938 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
+src/src_libsinglebin___a-lbracket.o: src/lbracket.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin___a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin___a-lbracket.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin___a-lbracket.Tpo -c -o src/src_libsinglebin___a-lbracket.o `test -f 'src/lbracket.c' || echo '$(srcdir)/'`src/lbracket.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin___a-lbracket.Tpo src/$(DEPDIR)/src_libsinglebin___a-lbracket.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/lbracket.c' object='src/src_libsinglebin___a-lbracket.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin___a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin___a-lbracket.o `test -f 'src/lbracket.c' || echo '$(srcdir)/'`src/lbracket.c
+
+src/src_libsinglebin___a-lbracket.obj: src/lbracket.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin___a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin___a-lbracket.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin___a-lbracket.Tpo -c -o src/src_libsinglebin___a-lbracket.obj `if test -f 'src/lbracket.c'; then $(CYGPATH_W) 'src/lbracket.c'; else $(CYGPATH_W) '$(srcdir)/src/lbracket.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin___a-lbracket.Tpo src/$(DEPDIR)/src_libsinglebin___a-lbracket.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/lbracket.c' object='src/src_libsinglebin___a-lbracket.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin___a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin___a-lbracket.obj `if test -f 'src/lbracket.c'; then $(CYGPATH_W) 'src/lbracket.c'; else $(CYGPATH_W) '$(srcdir)/src/lbracket.c'; fi`
+
+src/src_libsinglebin_arch_a-coreutils-arch.o: src/coreutils-arch.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_arch_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_arch_a-coreutils-arch.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_arch_a-coreutils-arch.Tpo -c -o src/src_libsinglebin_arch_a-coreutils-arch.o `test -f 'src/coreutils-arch.c' || echo '$(srcdir)/'`src/coreutils-arch.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_arch_a-coreutils-arch.Tpo src/$(DEPDIR)/src_libsinglebin_arch_a-coreutils-arch.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/coreutils-arch.c' object='src/src_libsinglebin_arch_a-coreutils-arch.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_arch_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_arch_a-coreutils-arch.o `test -f 'src/coreutils-arch.c' || echo '$(srcdir)/'`src/coreutils-arch.c
+
+src/src_libsinglebin_arch_a-coreutils-arch.obj: src/coreutils-arch.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_arch_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_arch_a-coreutils-arch.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_arch_a-coreutils-arch.Tpo -c -o src/src_libsinglebin_arch_a-coreutils-arch.obj `if test -f 'src/coreutils-arch.c'; then $(CYGPATH_W) 'src/coreutils-arch.c'; else $(CYGPATH_W) '$(srcdir)/src/coreutils-arch.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_arch_a-coreutils-arch.Tpo src/$(DEPDIR)/src_libsinglebin_arch_a-coreutils-arch.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/coreutils-arch.c' object='src/src_libsinglebin_arch_a-coreutils-arch.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_arch_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_arch_a-coreutils-arch.obj `if test -f 'src/coreutils-arch.c'; then $(CYGPATH_W) 'src/coreutils-arch.c'; else $(CYGPATH_W) '$(srcdir)/src/coreutils-arch.c'; fi`
+
+src/src_libsinglebin_base64_a-base64.o: src/base64.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_base64_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_base64_a-base64.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_base64_a-base64.Tpo -c -o src/src_libsinglebin_base64_a-base64.o `test -f 'src/base64.c' || echo '$(srcdir)/'`src/base64.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_base64_a-base64.Tpo src/$(DEPDIR)/src_libsinglebin_base64_a-base64.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/base64.c' object='src/src_libsinglebin_base64_a-base64.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_base64_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_base64_a-base64.o `test -f 'src/base64.c' || echo '$(srcdir)/'`src/base64.c
+
+src/src_libsinglebin_base64_a-base64.obj: src/base64.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_base64_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_base64_a-base64.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_base64_a-base64.Tpo -c -o src/src_libsinglebin_base64_a-base64.obj `if test -f 'src/base64.c'; then $(CYGPATH_W) 'src/base64.c'; else $(CYGPATH_W) '$(srcdir)/src/base64.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_base64_a-base64.Tpo src/$(DEPDIR)/src_libsinglebin_base64_a-base64.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/base64.c' object='src/src_libsinglebin_base64_a-base64.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_base64_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_base64_a-base64.obj `if test -f 'src/base64.c'; then $(CYGPATH_W) 'src/base64.c'; else $(CYGPATH_W) '$(srcdir)/src/base64.c'; fi`
+
+src/src_libsinglebin_basename_a-basename.o: src/basename.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_basename_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_basename_a-basename.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_basename_a-basename.Tpo -c -o src/src_libsinglebin_basename_a-basename.o `test -f 'src/basename.c' || echo '$(srcdir)/'`src/basename.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_basename_a-basename.Tpo src/$(DEPDIR)/src_libsinglebin_basename_a-basename.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/basename.c' object='src/src_libsinglebin_basename_a-basename.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_basename_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_basename_a-basename.o `test -f 'src/basename.c' || echo '$(srcdir)/'`src/basename.c
+
+src/src_libsinglebin_basename_a-basename.obj: src/basename.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_basename_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_basename_a-basename.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_basename_a-basename.Tpo -c -o src/src_libsinglebin_basename_a-basename.obj `if test -f 'src/basename.c'; then $(CYGPATH_W) 'src/basename.c'; else $(CYGPATH_W) '$(srcdir)/src/basename.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_basename_a-basename.Tpo src/$(DEPDIR)/src_libsinglebin_basename_a-basename.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/basename.c' object='src/src_libsinglebin_basename_a-basename.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_basename_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_basename_a-basename.obj `if test -f 'src/basename.c'; then $(CYGPATH_W) 'src/basename.c'; else $(CYGPATH_W) '$(srcdir)/src/basename.c'; fi`
+
+src/src_libsinglebin_cat_a-cat.o: src/cat.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_cat_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_cat_a-cat.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_cat_a-cat.Tpo -c -o src/src_libsinglebin_cat_a-cat.o `test -f 'src/cat.c' || echo '$(srcdir)/'`src/cat.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_cat_a-cat.Tpo src/$(DEPDIR)/src_libsinglebin_cat_a-cat.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/cat.c' object='src/src_libsinglebin_cat_a-cat.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_cat_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_cat_a-cat.o `test -f 'src/cat.c' || echo '$(srcdir)/'`src/cat.c
+
+src/src_libsinglebin_cat_a-cat.obj: src/cat.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_cat_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_cat_a-cat.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_cat_a-cat.Tpo -c -o src/src_libsinglebin_cat_a-cat.obj `if test -f 'src/cat.c'; then $(CYGPATH_W) 'src/cat.c'; else $(CYGPATH_W) '$(srcdir)/src/cat.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_cat_a-cat.Tpo src/$(DEPDIR)/src_libsinglebin_cat_a-cat.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/cat.c' object='src/src_libsinglebin_cat_a-cat.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_cat_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_cat_a-cat.obj `if test -f 'src/cat.c'; then $(CYGPATH_W) 'src/cat.c'; else $(CYGPATH_W) '$(srcdir)/src/cat.c'; fi`
+
+src/src_libsinglebin_chcon_a-chcon.o: src/chcon.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_chcon_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_chcon_a-chcon.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_chcon_a-chcon.Tpo -c -o src/src_libsinglebin_chcon_a-chcon.o `test -f 'src/chcon.c' || echo '$(srcdir)/'`src/chcon.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_chcon_a-chcon.Tpo src/$(DEPDIR)/src_libsinglebin_chcon_a-chcon.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/chcon.c' object='src/src_libsinglebin_chcon_a-chcon.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_chcon_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_chcon_a-chcon.o `test -f 'src/chcon.c' || echo '$(srcdir)/'`src/chcon.c
+
+src/src_libsinglebin_chcon_a-chcon.obj: src/chcon.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_chcon_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_chcon_a-chcon.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_chcon_a-chcon.Tpo -c -o src/src_libsinglebin_chcon_a-chcon.obj `if test -f 'src/chcon.c'; then $(CYGPATH_W) 'src/chcon.c'; else $(CYGPATH_W) '$(srcdir)/src/chcon.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_chcon_a-chcon.Tpo src/$(DEPDIR)/src_libsinglebin_chcon_a-chcon.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/chcon.c' object='src/src_libsinglebin_chcon_a-chcon.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_chcon_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_chcon_a-chcon.obj `if test -f 'src/chcon.c'; then $(CYGPATH_W) 'src/chcon.c'; else $(CYGPATH_W) '$(srcdir)/src/chcon.c'; fi`
+
+src/src_libsinglebin_chgrp_a-chgrp.o: src/chgrp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_chgrp_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_chgrp_a-chgrp.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_chgrp_a-chgrp.Tpo -c -o src/src_libsinglebin_chgrp_a-chgrp.o `test -f 'src/chgrp.c' || echo '$(srcdir)/'`src/chgrp.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_chgrp_a-chgrp.Tpo src/$(DEPDIR)/src_libsinglebin_chgrp_a-chgrp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/chgrp.c' object='src/src_libsinglebin_chgrp_a-chgrp.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_chgrp_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_chgrp_a-chgrp.o `test -f 'src/chgrp.c' || echo '$(srcdir)/'`src/chgrp.c
+
+src/src_libsinglebin_chgrp_a-chgrp.obj: src/chgrp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_chgrp_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_chgrp_a-chgrp.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_chgrp_a-chgrp.Tpo -c -o src/src_libsinglebin_chgrp_a-chgrp.obj `if test -f 'src/chgrp.c'; then $(CYGPATH_W) 'src/chgrp.c'; else $(CYGPATH_W) '$(srcdir)/src/chgrp.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_chgrp_a-chgrp.Tpo src/$(DEPDIR)/src_libsinglebin_chgrp_a-chgrp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/chgrp.c' object='src/src_libsinglebin_chgrp_a-chgrp.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_chgrp_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_chgrp_a-chgrp.obj `if test -f 'src/chgrp.c'; then $(CYGPATH_W) 'src/chgrp.c'; else $(CYGPATH_W) '$(srcdir)/src/chgrp.c'; fi`
+
+src/src_libsinglebin_chgrp_a-chown-core.o: src/chown-core.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_chgrp_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_chgrp_a-chown-core.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_chgrp_a-chown-core.Tpo -c -o src/src_libsinglebin_chgrp_a-chown-core.o `test -f 'src/chown-core.c' || echo '$(srcdir)/'`src/chown-core.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_chgrp_a-chown-core.Tpo src/$(DEPDIR)/src_libsinglebin_chgrp_a-chown-core.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/chown-core.c' object='src/src_libsinglebin_chgrp_a-chown-core.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_chgrp_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_chgrp_a-chown-core.o `test -f 'src/chown-core.c' || echo '$(srcdir)/'`src/chown-core.c
+
+src/src_libsinglebin_chgrp_a-chown-core.obj: src/chown-core.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_chgrp_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_chgrp_a-chown-core.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_chgrp_a-chown-core.Tpo -c -o src/src_libsinglebin_chgrp_a-chown-core.obj `if test -f 'src/chown-core.c'; then $(CYGPATH_W) 'src/chown-core.c'; else $(CYGPATH_W) '$(srcdir)/src/chown-core.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_chgrp_a-chown-core.Tpo src/$(DEPDIR)/src_libsinglebin_chgrp_a-chown-core.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/chown-core.c' object='src/src_libsinglebin_chgrp_a-chown-core.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_chgrp_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_chgrp_a-chown-core.obj `if test -f 'src/chown-core.c'; then $(CYGPATH_W) 'src/chown-core.c'; else $(CYGPATH_W) '$(srcdir)/src/chown-core.c'; fi`
+
+src/src_libsinglebin_chmod_a-chmod.o: src/chmod.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_chmod_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_chmod_a-chmod.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_chmod_a-chmod.Tpo -c -o src/src_libsinglebin_chmod_a-chmod.o `test -f 'src/chmod.c' || echo '$(srcdir)/'`src/chmod.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_chmod_a-chmod.Tpo src/$(DEPDIR)/src_libsinglebin_chmod_a-chmod.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/chmod.c' object='src/src_libsinglebin_chmod_a-chmod.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_chmod_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_chmod_a-chmod.o `test -f 'src/chmod.c' || echo '$(srcdir)/'`src/chmod.c
+
+src/src_libsinglebin_chmod_a-chmod.obj: src/chmod.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_chmod_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_chmod_a-chmod.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_chmod_a-chmod.Tpo -c -o src/src_libsinglebin_chmod_a-chmod.obj `if test -f 'src/chmod.c'; then $(CYGPATH_W) 'src/chmod.c'; else $(CYGPATH_W) '$(srcdir)/src/chmod.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_chmod_a-chmod.Tpo src/$(DEPDIR)/src_libsinglebin_chmod_a-chmod.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/chmod.c' object='src/src_libsinglebin_chmod_a-chmod.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_chmod_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_chmod_a-chmod.obj `if test -f 'src/chmod.c'; then $(CYGPATH_W) 'src/chmod.c'; else $(CYGPATH_W) '$(srcdir)/src/chmod.c'; fi`
+
+src/src_libsinglebin_chown_a-chown.o: src/chown.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_chown_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_chown_a-chown.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_chown_a-chown.Tpo -c -o src/src_libsinglebin_chown_a-chown.o `test -f 'src/chown.c' || echo '$(srcdir)/'`src/chown.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_chown_a-chown.Tpo src/$(DEPDIR)/src_libsinglebin_chown_a-chown.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/chown.c' object='src/src_libsinglebin_chown_a-chown.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_chown_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_chown_a-chown.o `test -f 'src/chown.c' || echo '$(srcdir)/'`src/chown.c
+
+src/src_libsinglebin_chown_a-chown.obj: src/chown.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_chown_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_chown_a-chown.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_chown_a-chown.Tpo -c -o src/src_libsinglebin_chown_a-chown.obj `if test -f 'src/chown.c'; then $(CYGPATH_W) 'src/chown.c'; else $(CYGPATH_W) '$(srcdir)/src/chown.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_chown_a-chown.Tpo src/$(DEPDIR)/src_libsinglebin_chown_a-chown.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/chown.c' object='src/src_libsinglebin_chown_a-chown.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_chown_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_chown_a-chown.obj `if test -f 'src/chown.c'; then $(CYGPATH_W) 'src/chown.c'; else $(CYGPATH_W) '$(srcdir)/src/chown.c'; fi`
+
+src/src_libsinglebin_chown_a-chown-core.o: src/chown-core.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_chown_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_chown_a-chown-core.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_chown_a-chown-core.Tpo -c -o src/src_libsinglebin_chown_a-chown-core.o `test -f 'src/chown-core.c' || echo '$(srcdir)/'`src/chown-core.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_chown_a-chown-core.Tpo src/$(DEPDIR)/src_libsinglebin_chown_a-chown-core.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/chown-core.c' object='src/src_libsinglebin_chown_a-chown-core.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_chown_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_chown_a-chown-core.o `test -f 'src/chown-core.c' || echo '$(srcdir)/'`src/chown-core.c
+
+src/src_libsinglebin_chown_a-chown-core.obj: src/chown-core.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_chown_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_chown_a-chown-core.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_chown_a-chown-core.Tpo -c -o src/src_libsinglebin_chown_a-chown-core.obj `if test -f 'src/chown-core.c'; then $(CYGPATH_W) 'src/chown-core.c'; else $(CYGPATH_W) '$(srcdir)/src/chown-core.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_chown_a-chown-core.Tpo src/$(DEPDIR)/src_libsinglebin_chown_a-chown-core.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/chown-core.c' object='src/src_libsinglebin_chown_a-chown-core.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_chown_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_chown_a-chown-core.obj `if test -f 'src/chown-core.c'; then $(CYGPATH_W) 'src/chown-core.c'; else $(CYGPATH_W) '$(srcdir)/src/chown-core.c'; fi`
+
+src/src_libsinglebin_chroot_a-chroot.o: src/chroot.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_chroot_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_chroot_a-chroot.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_chroot_a-chroot.Tpo -c -o src/src_libsinglebin_chroot_a-chroot.o `test -f 'src/chroot.c' || echo '$(srcdir)/'`src/chroot.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_chroot_a-chroot.Tpo src/$(DEPDIR)/src_libsinglebin_chroot_a-chroot.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/chroot.c' object='src/src_libsinglebin_chroot_a-chroot.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_chroot_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_chroot_a-chroot.o `test -f 'src/chroot.c' || echo '$(srcdir)/'`src/chroot.c
+
+src/src_libsinglebin_chroot_a-chroot.obj: src/chroot.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_chroot_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_chroot_a-chroot.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_chroot_a-chroot.Tpo -c -o src/src_libsinglebin_chroot_a-chroot.obj `if test -f 'src/chroot.c'; then $(CYGPATH_W) 'src/chroot.c'; else $(CYGPATH_W) '$(srcdir)/src/chroot.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_chroot_a-chroot.Tpo src/$(DEPDIR)/src_libsinglebin_chroot_a-chroot.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/chroot.c' object='src/src_libsinglebin_chroot_a-chroot.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_chroot_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_chroot_a-chroot.obj `if test -f 'src/chroot.c'; then $(CYGPATH_W) 'src/chroot.c'; else $(CYGPATH_W) '$(srcdir)/src/chroot.c'; fi`
+
+src/src_libsinglebin_cksum_a-cksum.o: src/cksum.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_cksum_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_cksum_a-cksum.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_cksum_a-cksum.Tpo -c -o src/src_libsinglebin_cksum_a-cksum.o `test -f 'src/cksum.c' || echo '$(srcdir)/'`src/cksum.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_cksum_a-cksum.Tpo src/$(DEPDIR)/src_libsinglebin_cksum_a-cksum.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/cksum.c' object='src/src_libsinglebin_cksum_a-cksum.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_cksum_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_cksum_a-cksum.o `test -f 'src/cksum.c' || echo '$(srcdir)/'`src/cksum.c
+
+src/src_libsinglebin_cksum_a-cksum.obj: src/cksum.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_cksum_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_cksum_a-cksum.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_cksum_a-cksum.Tpo -c -o src/src_libsinglebin_cksum_a-cksum.obj `if test -f 'src/cksum.c'; then $(CYGPATH_W) 'src/cksum.c'; else $(CYGPATH_W) '$(srcdir)/src/cksum.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_cksum_a-cksum.Tpo src/$(DEPDIR)/src_libsinglebin_cksum_a-cksum.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/cksum.c' object='src/src_libsinglebin_cksum_a-cksum.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_cksum_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_cksum_a-cksum.obj `if test -f 'src/cksum.c'; then $(CYGPATH_W) 'src/cksum.c'; else $(CYGPATH_W) '$(srcdir)/src/cksum.c'; fi`
+
+src/src_libsinglebin_comm_a-comm.o: src/comm.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_comm_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_comm_a-comm.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_comm_a-comm.Tpo -c -o src/src_libsinglebin_comm_a-comm.o `test -f 'src/comm.c' || echo '$(srcdir)/'`src/comm.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_comm_a-comm.Tpo src/$(DEPDIR)/src_libsinglebin_comm_a-comm.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/comm.c' object='src/src_libsinglebin_comm_a-comm.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_comm_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_comm_a-comm.o `test -f 'src/comm.c' || echo '$(srcdir)/'`src/comm.c
+
+src/src_libsinglebin_comm_a-comm.obj: src/comm.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_comm_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_comm_a-comm.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_comm_a-comm.Tpo -c -o src/src_libsinglebin_comm_a-comm.obj `if test -f 'src/comm.c'; then $(CYGPATH_W) 'src/comm.c'; else $(CYGPATH_W) '$(srcdir)/src/comm.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_comm_a-comm.Tpo src/$(DEPDIR)/src_libsinglebin_comm_a-comm.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/comm.c' object='src/src_libsinglebin_comm_a-comm.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_comm_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_comm_a-comm.obj `if test -f 'src/comm.c'; then $(CYGPATH_W) 'src/comm.c'; else $(CYGPATH_W) '$(srcdir)/src/comm.c'; fi`
+
+src/src_libsinglebin_cp_a-cp.o: src/cp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_cp_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_cp_a-cp.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_cp_a-cp.Tpo -c -o src/src_libsinglebin_cp_a-cp.o `test -f 'src/cp.c' || echo '$(srcdir)/'`src/cp.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_cp_a-cp.Tpo src/$(DEPDIR)/src_libsinglebin_cp_a-cp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/cp.c' object='src/src_libsinglebin_cp_a-cp.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_cp_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_cp_a-cp.o `test -f 'src/cp.c' || echo '$(srcdir)/'`src/cp.c
+
+src/src_libsinglebin_cp_a-cp.obj: src/cp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_cp_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_cp_a-cp.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_cp_a-cp.Tpo -c -o src/src_libsinglebin_cp_a-cp.obj `if test -f 'src/cp.c'; then $(CYGPATH_W) 'src/cp.c'; else $(CYGPATH_W) '$(srcdir)/src/cp.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_cp_a-cp.Tpo src/$(DEPDIR)/src_libsinglebin_cp_a-cp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/cp.c' object='src/src_libsinglebin_cp_a-cp.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_cp_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_cp_a-cp.obj `if test -f 'src/cp.c'; then $(CYGPATH_W) 'src/cp.c'; else $(CYGPATH_W) '$(srcdir)/src/cp.c'; fi`
+
+src/src_libsinglebin_cp_a-copy.o: src/copy.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_cp_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_cp_a-copy.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_cp_a-copy.Tpo -c -o src/src_libsinglebin_cp_a-copy.o `test -f 'src/copy.c' || echo '$(srcdir)/'`src/copy.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_cp_a-copy.Tpo src/$(DEPDIR)/src_libsinglebin_cp_a-copy.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/copy.c' object='src/src_libsinglebin_cp_a-copy.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_cp_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_cp_a-copy.o `test -f 'src/copy.c' || echo '$(srcdir)/'`src/copy.c
+
+src/src_libsinglebin_cp_a-copy.obj: src/copy.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_cp_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_cp_a-copy.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_cp_a-copy.Tpo -c -o src/src_libsinglebin_cp_a-copy.obj `if test -f 'src/copy.c'; then $(CYGPATH_W) 'src/copy.c'; else $(CYGPATH_W) '$(srcdir)/src/copy.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_cp_a-copy.Tpo src/$(DEPDIR)/src_libsinglebin_cp_a-copy.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/copy.c' object='src/src_libsinglebin_cp_a-copy.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_cp_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_cp_a-copy.obj `if test -f 'src/copy.c'; then $(CYGPATH_W) 'src/copy.c'; else $(CYGPATH_W) '$(srcdir)/src/copy.c'; fi`
+
+src/src_libsinglebin_cp_a-cp-hash.o: src/cp-hash.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_cp_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_cp_a-cp-hash.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_cp_a-cp-hash.Tpo -c -o src/src_libsinglebin_cp_a-cp-hash.o `test -f 'src/cp-hash.c' || echo '$(srcdir)/'`src/cp-hash.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_cp_a-cp-hash.Tpo src/$(DEPDIR)/src_libsinglebin_cp_a-cp-hash.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/cp-hash.c' object='src/src_libsinglebin_cp_a-cp-hash.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_cp_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_cp_a-cp-hash.o `test -f 'src/cp-hash.c' || echo '$(srcdir)/'`src/cp-hash.c
+
+src/src_libsinglebin_cp_a-cp-hash.obj: src/cp-hash.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_cp_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_cp_a-cp-hash.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_cp_a-cp-hash.Tpo -c -o src/src_libsinglebin_cp_a-cp-hash.obj `if test -f 'src/cp-hash.c'; then $(CYGPATH_W) 'src/cp-hash.c'; else $(CYGPATH_W) '$(srcdir)/src/cp-hash.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_cp_a-cp-hash.Tpo src/$(DEPDIR)/src_libsinglebin_cp_a-cp-hash.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/cp-hash.c' object='src/src_libsinglebin_cp_a-cp-hash.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_cp_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_cp_a-cp-hash.obj `if test -f 'src/cp-hash.c'; then $(CYGPATH_W) 'src/cp-hash.c'; else $(CYGPATH_W) '$(srcdir)/src/cp-hash.c'; fi`
+
+src/src_libsinglebin_cp_a-extent-scan.o: src/extent-scan.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_cp_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_cp_a-extent-scan.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_cp_a-extent-scan.Tpo -c -o src/src_libsinglebin_cp_a-extent-scan.o `test -f 'src/extent-scan.c' || echo '$(srcdir)/'`src/extent-scan.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_cp_a-extent-scan.Tpo src/$(DEPDIR)/src_libsinglebin_cp_a-extent-scan.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/extent-scan.c' object='src/src_libsinglebin_cp_a-extent-scan.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_cp_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_cp_a-extent-scan.o `test -f 'src/extent-scan.c' || echo '$(srcdir)/'`src/extent-scan.c
+
+src/src_libsinglebin_cp_a-extent-scan.obj: src/extent-scan.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_cp_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_cp_a-extent-scan.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_cp_a-extent-scan.Tpo -c -o src/src_libsinglebin_cp_a-extent-scan.obj `if test -f 'src/extent-scan.c'; then $(CYGPATH_W) 'src/extent-scan.c'; else $(CYGPATH_W) '$(srcdir)/src/extent-scan.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_cp_a-extent-scan.Tpo src/$(DEPDIR)/src_libsinglebin_cp_a-extent-scan.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/extent-scan.c' object='src/src_libsinglebin_cp_a-extent-scan.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_cp_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_cp_a-extent-scan.obj `if test -f 'src/extent-scan.c'; then $(CYGPATH_W) 'src/extent-scan.c'; else $(CYGPATH_W) '$(srcdir)/src/extent-scan.c'; fi`
+
+src/src_libsinglebin_cp_a-selinux.o: src/selinux.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_cp_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_cp_a-selinux.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_cp_a-selinux.Tpo -c -o src/src_libsinglebin_cp_a-selinux.o `test -f 'src/selinux.c' || echo '$(srcdir)/'`src/selinux.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_cp_a-selinux.Tpo src/$(DEPDIR)/src_libsinglebin_cp_a-selinux.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/selinux.c' object='src/src_libsinglebin_cp_a-selinux.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_cp_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_cp_a-selinux.o `test -f 'src/selinux.c' || echo '$(srcdir)/'`src/selinux.c
+
+src/src_libsinglebin_cp_a-selinux.obj: src/selinux.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_cp_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_cp_a-selinux.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_cp_a-selinux.Tpo -c -o src/src_libsinglebin_cp_a-selinux.obj `if test -f 'src/selinux.c'; then $(CYGPATH_W) 'src/selinux.c'; else $(CYGPATH_W) '$(srcdir)/src/selinux.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_cp_a-selinux.Tpo src/$(DEPDIR)/src_libsinglebin_cp_a-selinux.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/selinux.c' object='src/src_libsinglebin_cp_a-selinux.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_cp_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_cp_a-selinux.obj `if test -f 'src/selinux.c'; then $(CYGPATH_W) 'src/selinux.c'; else $(CYGPATH_W) '$(srcdir)/src/selinux.c'; fi`
+
+src/src_libsinglebin_csplit_a-csplit.o: src/csplit.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_csplit_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_csplit_a-csplit.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_csplit_a-csplit.Tpo -c -o src/src_libsinglebin_csplit_a-csplit.o `test -f 'src/csplit.c' || echo '$(srcdir)/'`src/csplit.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_csplit_a-csplit.Tpo src/$(DEPDIR)/src_libsinglebin_csplit_a-csplit.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/csplit.c' object='src/src_libsinglebin_csplit_a-csplit.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_csplit_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_csplit_a-csplit.o `test -f 'src/csplit.c' || echo '$(srcdir)/'`src/csplit.c
+
+src/src_libsinglebin_csplit_a-csplit.obj: src/csplit.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_csplit_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_csplit_a-csplit.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_csplit_a-csplit.Tpo -c -o src/src_libsinglebin_csplit_a-csplit.obj `if test -f 'src/csplit.c'; then $(CYGPATH_W) 'src/csplit.c'; else $(CYGPATH_W) '$(srcdir)/src/csplit.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_csplit_a-csplit.Tpo src/$(DEPDIR)/src_libsinglebin_csplit_a-csplit.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/csplit.c' object='src/src_libsinglebin_csplit_a-csplit.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_csplit_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_csplit_a-csplit.obj `if test -f 'src/csplit.c'; then $(CYGPATH_W) 'src/csplit.c'; else $(CYGPATH_W) '$(srcdir)/src/csplit.c'; fi`
+
+src/src_libsinglebin_cut_a-cut.o: src/cut.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_cut_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_cut_a-cut.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_cut_a-cut.Tpo -c -o src/src_libsinglebin_cut_a-cut.o `test -f 'src/cut.c' || echo '$(srcdir)/'`src/cut.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_cut_a-cut.Tpo src/$(DEPDIR)/src_libsinglebin_cut_a-cut.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/cut.c' object='src/src_libsinglebin_cut_a-cut.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_cut_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_cut_a-cut.o `test -f 'src/cut.c' || echo '$(srcdir)/'`src/cut.c
+
+src/src_libsinglebin_cut_a-cut.obj: src/cut.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_cut_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_cut_a-cut.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_cut_a-cut.Tpo -c -o src/src_libsinglebin_cut_a-cut.obj `if test -f 'src/cut.c'; then $(CYGPATH_W) 'src/cut.c'; else $(CYGPATH_W) '$(srcdir)/src/cut.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_cut_a-cut.Tpo src/$(DEPDIR)/src_libsinglebin_cut_a-cut.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/cut.c' object='src/src_libsinglebin_cut_a-cut.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_cut_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_cut_a-cut.obj `if test -f 'src/cut.c'; then $(CYGPATH_W) 'src/cut.c'; else $(CYGPATH_W) '$(srcdir)/src/cut.c'; fi`
+
+src/src_libsinglebin_date_a-date.o: src/date.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_date_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_date_a-date.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_date_a-date.Tpo -c -o src/src_libsinglebin_date_a-date.o `test -f 'src/date.c' || echo '$(srcdir)/'`src/date.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_date_a-date.Tpo src/$(DEPDIR)/src_libsinglebin_date_a-date.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/date.c' object='src/src_libsinglebin_date_a-date.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_date_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_date_a-date.o `test -f 'src/date.c' || echo '$(srcdir)/'`src/date.c
+
+src/src_libsinglebin_date_a-date.obj: src/date.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_date_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_date_a-date.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_date_a-date.Tpo -c -o src/src_libsinglebin_date_a-date.obj `if test -f 'src/date.c'; then $(CYGPATH_W) 'src/date.c'; else $(CYGPATH_W) '$(srcdir)/src/date.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_date_a-date.Tpo src/$(DEPDIR)/src_libsinglebin_date_a-date.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/date.c' object='src/src_libsinglebin_date_a-date.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_date_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_date_a-date.obj `if test -f 'src/date.c'; then $(CYGPATH_W) 'src/date.c'; else $(CYGPATH_W) '$(srcdir)/src/date.c'; fi`
+
+src/src_libsinglebin_dd_a-dd.o: src/dd.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_dd_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_dd_a-dd.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_dd_a-dd.Tpo -c -o src/src_libsinglebin_dd_a-dd.o `test -f 'src/dd.c' || echo '$(srcdir)/'`src/dd.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_dd_a-dd.Tpo src/$(DEPDIR)/src_libsinglebin_dd_a-dd.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dd.c' object='src/src_libsinglebin_dd_a-dd.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_dd_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_dd_a-dd.o `test -f 'src/dd.c' || echo '$(srcdir)/'`src/dd.c
+
+src/src_libsinglebin_dd_a-dd.obj: src/dd.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_dd_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_dd_a-dd.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_dd_a-dd.Tpo -c -o src/src_libsinglebin_dd_a-dd.obj `if test -f 'src/dd.c'; then $(CYGPATH_W) 'src/dd.c'; else $(CYGPATH_W) '$(srcdir)/src/dd.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_dd_a-dd.Tpo src/$(DEPDIR)/src_libsinglebin_dd_a-dd.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dd.c' object='src/src_libsinglebin_dd_a-dd.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_dd_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_dd_a-dd.obj `if test -f 'src/dd.c'; then $(CYGPATH_W) 'src/dd.c'; else $(CYGPATH_W) '$(srcdir)/src/dd.c'; fi`
+
+src/src_libsinglebin_df_a-df.o: src/df.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_df_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_df_a-df.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_df_a-df.Tpo -c -o src/src_libsinglebin_df_a-df.o `test -f 'src/df.c' || echo '$(srcdir)/'`src/df.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_df_a-df.Tpo src/$(DEPDIR)/src_libsinglebin_df_a-df.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/df.c' object='src/src_libsinglebin_df_a-df.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_df_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_df_a-df.o `test -f 'src/df.c' || echo '$(srcdir)/'`src/df.c
+
+src/src_libsinglebin_df_a-df.obj: src/df.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_df_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_df_a-df.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_df_a-df.Tpo -c -o src/src_libsinglebin_df_a-df.obj `if test -f 'src/df.c'; then $(CYGPATH_W) 'src/df.c'; else $(CYGPATH_W) '$(srcdir)/src/df.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_df_a-df.Tpo src/$(DEPDIR)/src_libsinglebin_df_a-df.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/df.c' object='src/src_libsinglebin_df_a-df.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_df_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_df_a-df.obj `if test -f 'src/df.c'; then $(CYGPATH_W) 'src/df.c'; else $(CYGPATH_W) '$(srcdir)/src/df.c'; fi`
+
+src/src_libsinglebin_df_a-find-mount-point.o: src/find-mount-point.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_df_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_df_a-find-mount-point.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_df_a-find-mount-point.Tpo -c -o src/src_libsinglebin_df_a-find-mount-point.o `test -f 'src/find-mount-point.c' || echo '$(srcdir)/'`src/find-mount-point.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_df_a-find-mount-point.Tpo src/$(DEPDIR)/src_libsinglebin_df_a-find-mount-point.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/find-mount-point.c' object='src/src_libsinglebin_df_a-find-mount-point.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_df_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_df_a-find-mount-point.o `test -f 'src/find-mount-point.c' || echo '$(srcdir)/'`src/find-mount-point.c
+
+src/src_libsinglebin_df_a-find-mount-point.obj: src/find-mount-point.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_df_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_df_a-find-mount-point.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_df_a-find-mount-point.Tpo -c -o src/src_libsinglebin_df_a-find-mount-point.obj `if test -f 'src/find-mount-point.c'; then $(CYGPATH_W) 'src/find-mount-point.c'; else $(CYGPATH_W) '$(srcdir)/src/find-mount-point.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_df_a-find-mount-point.Tpo src/$(DEPDIR)/src_libsinglebin_df_a-find-mount-point.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/find-mount-point.c' object='src/src_libsinglebin_df_a-find-mount-point.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_df_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_df_a-find-mount-point.obj `if test -f 'src/find-mount-point.c'; then $(CYGPATH_W) 'src/find-mount-point.c'; else $(CYGPATH_W) '$(srcdir)/src/find-mount-point.c'; fi`
+
+src/src_libsinglebin_dir_a-coreutils-dir.o: src/coreutils-dir.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_dir_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_dir_a-coreutils-dir.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_dir_a-coreutils-dir.Tpo -c -o src/src_libsinglebin_dir_a-coreutils-dir.o `test -f 'src/coreutils-dir.c' || echo '$(srcdir)/'`src/coreutils-dir.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_dir_a-coreutils-dir.Tpo src/$(DEPDIR)/src_libsinglebin_dir_a-coreutils-dir.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/coreutils-dir.c' object='src/src_libsinglebin_dir_a-coreutils-dir.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_dir_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_dir_a-coreutils-dir.o `test -f 'src/coreutils-dir.c' || echo '$(srcdir)/'`src/coreutils-dir.c
+
+src/src_libsinglebin_dir_a-coreutils-dir.obj: src/coreutils-dir.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_dir_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_dir_a-coreutils-dir.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_dir_a-coreutils-dir.Tpo -c -o src/src_libsinglebin_dir_a-coreutils-dir.obj `if test -f 'src/coreutils-dir.c'; then $(CYGPATH_W) 'src/coreutils-dir.c'; else $(CYGPATH_W) '$(srcdir)/src/coreutils-dir.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_dir_a-coreutils-dir.Tpo src/$(DEPDIR)/src_libsinglebin_dir_a-coreutils-dir.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/coreutils-dir.c' object='src/src_libsinglebin_dir_a-coreutils-dir.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_dir_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_dir_a-coreutils-dir.obj `if test -f 'src/coreutils-dir.c'; then $(CYGPATH_W) 'src/coreutils-dir.c'; else $(CYGPATH_W) '$(srcdir)/src/coreutils-dir.c'; fi`
+
+src/src_libsinglebin_dircolors_a-dircolors.o: src/dircolors.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_dircolors_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_dircolors_a-dircolors.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_dircolors_a-dircolors.Tpo -c -o src/src_libsinglebin_dircolors_a-dircolors.o `test -f 'src/dircolors.c' || echo '$(srcdir)/'`src/dircolors.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_dircolors_a-dircolors.Tpo src/$(DEPDIR)/src_libsinglebin_dircolors_a-dircolors.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dircolors.c' object='src/src_libsinglebin_dircolors_a-dircolors.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_dircolors_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_dircolors_a-dircolors.o `test -f 'src/dircolors.c' || echo '$(srcdir)/'`src/dircolors.c
+
+src/src_libsinglebin_dircolors_a-dircolors.obj: src/dircolors.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_dircolors_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_dircolors_a-dircolors.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_dircolors_a-dircolors.Tpo -c -o src/src_libsinglebin_dircolors_a-dircolors.obj `if test -f 'src/dircolors.c'; then $(CYGPATH_W) 'src/dircolors.c'; else $(CYGPATH_W) '$(srcdir)/src/dircolors.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_dircolors_a-dircolors.Tpo src/$(DEPDIR)/src_libsinglebin_dircolors_a-dircolors.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dircolors.c' object='src/src_libsinglebin_dircolors_a-dircolors.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_dircolors_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_dircolors_a-dircolors.obj `if test -f 'src/dircolors.c'; then $(CYGPATH_W) 'src/dircolors.c'; else $(CYGPATH_W) '$(srcdir)/src/dircolors.c'; fi`
+
+src/src_libsinglebin_dirname_a-dirname.o: src/dirname.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_dirname_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_dirname_a-dirname.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_dirname_a-dirname.Tpo -c -o src/src_libsinglebin_dirname_a-dirname.o `test -f 'src/dirname.c' || echo '$(srcdir)/'`src/dirname.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_dirname_a-dirname.Tpo src/$(DEPDIR)/src_libsinglebin_dirname_a-dirname.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dirname.c' object='src/src_libsinglebin_dirname_a-dirname.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_dirname_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_dirname_a-dirname.o `test -f 'src/dirname.c' || echo '$(srcdir)/'`src/dirname.c
+
+src/src_libsinglebin_dirname_a-dirname.obj: src/dirname.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_dirname_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_dirname_a-dirname.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_dirname_a-dirname.Tpo -c -o src/src_libsinglebin_dirname_a-dirname.obj `if test -f 'src/dirname.c'; then $(CYGPATH_W) 'src/dirname.c'; else $(CYGPATH_W) '$(srcdir)/src/dirname.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_dirname_a-dirname.Tpo src/$(DEPDIR)/src_libsinglebin_dirname_a-dirname.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dirname.c' object='src/src_libsinglebin_dirname_a-dirname.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_dirname_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_dirname_a-dirname.obj `if test -f 'src/dirname.c'; then $(CYGPATH_W) 'src/dirname.c'; else $(CYGPATH_W) '$(srcdir)/src/dirname.c'; fi`
+
+src/src_libsinglebin_du_a-du.o: src/du.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_du_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_du_a-du.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_du_a-du.Tpo -c -o src/src_libsinglebin_du_a-du.o `test -f 'src/du.c' || echo '$(srcdir)/'`src/du.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_du_a-du.Tpo src/$(DEPDIR)/src_libsinglebin_du_a-du.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/du.c' object='src/src_libsinglebin_du_a-du.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_du_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_du_a-du.o `test -f 'src/du.c' || echo '$(srcdir)/'`src/du.c
+
+src/src_libsinglebin_du_a-du.obj: src/du.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_du_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_du_a-du.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_du_a-du.Tpo -c -o src/src_libsinglebin_du_a-du.obj `if test -f 'src/du.c'; then $(CYGPATH_W) 'src/du.c'; else $(CYGPATH_W) '$(srcdir)/src/du.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_du_a-du.Tpo src/$(DEPDIR)/src_libsinglebin_du_a-du.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/du.c' object='src/src_libsinglebin_du_a-du.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_du_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_du_a-du.obj `if test -f 'src/du.c'; then $(CYGPATH_W) 'src/du.c'; else $(CYGPATH_W) '$(srcdir)/src/du.c'; fi`
+
+src/src_libsinglebin_echo_a-echo.o: src/echo.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_echo_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_echo_a-echo.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_echo_a-echo.Tpo -c -o src/src_libsinglebin_echo_a-echo.o `test -f 'src/echo.c' || echo '$(srcdir)/'`src/echo.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_echo_a-echo.Tpo src/$(DEPDIR)/src_libsinglebin_echo_a-echo.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/echo.c' object='src/src_libsinglebin_echo_a-echo.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_echo_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_echo_a-echo.o `test -f 'src/echo.c' || echo '$(srcdir)/'`src/echo.c
+
+src/src_libsinglebin_echo_a-echo.obj: src/echo.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_echo_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_echo_a-echo.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_echo_a-echo.Tpo -c -o src/src_libsinglebin_echo_a-echo.obj `if test -f 'src/echo.c'; then $(CYGPATH_W) 'src/echo.c'; else $(CYGPATH_W) '$(srcdir)/src/echo.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_echo_a-echo.Tpo src/$(DEPDIR)/src_libsinglebin_echo_a-echo.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/echo.c' object='src/src_libsinglebin_echo_a-echo.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_echo_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_echo_a-echo.obj `if test -f 'src/echo.c'; then $(CYGPATH_W) 'src/echo.c'; else $(CYGPATH_W) '$(srcdir)/src/echo.c'; fi`
+
+src/src_libsinglebin_env_a-env.o: src/env.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_env_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_env_a-env.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_env_a-env.Tpo -c -o src/src_libsinglebin_env_a-env.o `test -f 'src/env.c' || echo '$(srcdir)/'`src/env.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_env_a-env.Tpo src/$(DEPDIR)/src_libsinglebin_env_a-env.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/env.c' object='src/src_libsinglebin_env_a-env.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_env_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_env_a-env.o `test -f 'src/env.c' || echo '$(srcdir)/'`src/env.c
+
+src/src_libsinglebin_env_a-env.obj: src/env.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_env_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_env_a-env.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_env_a-env.Tpo -c -o src/src_libsinglebin_env_a-env.obj `if test -f 'src/env.c'; then $(CYGPATH_W) 'src/env.c'; else $(CYGPATH_W) '$(srcdir)/src/env.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_env_a-env.Tpo src/$(DEPDIR)/src_libsinglebin_env_a-env.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/env.c' object='src/src_libsinglebin_env_a-env.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_env_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_env_a-env.obj `if test -f 'src/env.c'; then $(CYGPATH_W) 'src/env.c'; else $(CYGPATH_W) '$(srcdir)/src/env.c'; fi`
+
+src/src_libsinglebin_expand_a-expand.o: src/expand.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_expand_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_expand_a-expand.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_expand_a-expand.Tpo -c -o src/src_libsinglebin_expand_a-expand.o `test -f 'src/expand.c' || echo '$(srcdir)/'`src/expand.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_expand_a-expand.Tpo src/$(DEPDIR)/src_libsinglebin_expand_a-expand.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/expand.c' object='src/src_libsinglebin_expand_a-expand.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_expand_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_expand_a-expand.o `test -f 'src/expand.c' || echo '$(srcdir)/'`src/expand.c
+
+src/src_libsinglebin_expand_a-expand.obj: src/expand.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_expand_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_expand_a-expand.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_expand_a-expand.Tpo -c -o src/src_libsinglebin_expand_a-expand.obj `if test -f 'src/expand.c'; then $(CYGPATH_W) 'src/expand.c'; else $(CYGPATH_W) '$(srcdir)/src/expand.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_expand_a-expand.Tpo src/$(DEPDIR)/src_libsinglebin_expand_a-expand.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/expand.c' object='src/src_libsinglebin_expand_a-expand.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_expand_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_expand_a-expand.obj `if test -f 'src/expand.c'; then $(CYGPATH_W) 'src/expand.c'; else $(CYGPATH_W) '$(srcdir)/src/expand.c'; fi`
+
+src/src_libsinglebin_expr_a-expr.o: src/expr.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_expr_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_expr_a-expr.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_expr_a-expr.Tpo -c -o src/src_libsinglebin_expr_a-expr.o `test -f 'src/expr.c' || echo '$(srcdir)/'`src/expr.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_expr_a-expr.Tpo src/$(DEPDIR)/src_libsinglebin_expr_a-expr.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/expr.c' object='src/src_libsinglebin_expr_a-expr.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_expr_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_expr_a-expr.o `test -f 'src/expr.c' || echo '$(srcdir)/'`src/expr.c
+
+src/src_libsinglebin_expr_a-expr.obj: src/expr.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_expr_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_expr_a-expr.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_expr_a-expr.Tpo -c -o src/src_libsinglebin_expr_a-expr.obj `if test -f 'src/expr.c'; then $(CYGPATH_W) 'src/expr.c'; else $(CYGPATH_W) '$(srcdir)/src/expr.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_expr_a-expr.Tpo src/$(DEPDIR)/src_libsinglebin_expr_a-expr.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/expr.c' object='src/src_libsinglebin_expr_a-expr.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_expr_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_expr_a-expr.obj `if test -f 'src/expr.c'; then $(CYGPATH_W) 'src/expr.c'; else $(CYGPATH_W) '$(srcdir)/src/expr.c'; fi`
+
+src/src_libsinglebin_factor_a-factor.o: src/factor.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_factor_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_factor_a-factor.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_factor_a-factor.Tpo -c -o src/src_libsinglebin_factor_a-factor.o `test -f 'src/factor.c' || echo '$(srcdir)/'`src/factor.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_factor_a-factor.Tpo src/$(DEPDIR)/src_libsinglebin_factor_a-factor.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/factor.c' object='src/src_libsinglebin_factor_a-factor.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_factor_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_factor_a-factor.o `test -f 'src/factor.c' || echo '$(srcdir)/'`src/factor.c
+
+src/src_libsinglebin_factor_a-factor.obj: src/factor.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_factor_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_factor_a-factor.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_factor_a-factor.Tpo -c -o src/src_libsinglebin_factor_a-factor.obj `if test -f 'src/factor.c'; then $(CYGPATH_W) 'src/factor.c'; else $(CYGPATH_W) '$(srcdir)/src/factor.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_factor_a-factor.Tpo src/$(DEPDIR)/src_libsinglebin_factor_a-factor.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/factor.c' object='src/src_libsinglebin_factor_a-factor.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_factor_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_factor_a-factor.obj `if test -f 'src/factor.c'; then $(CYGPATH_W) 'src/factor.c'; else $(CYGPATH_W) '$(srcdir)/src/factor.c'; fi`
+
+src/src_libsinglebin_false_a-false.o: src/false.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_false_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_false_a-false.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_false_a-false.Tpo -c -o src/src_libsinglebin_false_a-false.o `test -f 'src/false.c' || echo '$(srcdir)/'`src/false.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_false_a-false.Tpo src/$(DEPDIR)/src_libsinglebin_false_a-false.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/false.c' object='src/src_libsinglebin_false_a-false.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_false_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_false_a-false.o `test -f 'src/false.c' || echo '$(srcdir)/'`src/false.c
+
+src/src_libsinglebin_false_a-false.obj: src/false.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_false_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_false_a-false.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_false_a-false.Tpo -c -o src/src_libsinglebin_false_a-false.obj `if test -f 'src/false.c'; then $(CYGPATH_W) 'src/false.c'; else $(CYGPATH_W) '$(srcdir)/src/false.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_false_a-false.Tpo src/$(DEPDIR)/src_libsinglebin_false_a-false.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/false.c' object='src/src_libsinglebin_false_a-false.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_false_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_false_a-false.obj `if test -f 'src/false.c'; then $(CYGPATH_W) 'src/false.c'; else $(CYGPATH_W) '$(srcdir)/src/false.c'; fi`
+
+src/src_libsinglebin_fmt_a-fmt.o: src/fmt.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_fmt_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_fmt_a-fmt.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_fmt_a-fmt.Tpo -c -o src/src_libsinglebin_fmt_a-fmt.o `test -f 'src/fmt.c' || echo '$(srcdir)/'`src/fmt.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_fmt_a-fmt.Tpo src/$(DEPDIR)/src_libsinglebin_fmt_a-fmt.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/fmt.c' object='src/src_libsinglebin_fmt_a-fmt.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_fmt_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_fmt_a-fmt.o `test -f 'src/fmt.c' || echo '$(srcdir)/'`src/fmt.c
+
+src/src_libsinglebin_fmt_a-fmt.obj: src/fmt.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_fmt_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_fmt_a-fmt.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_fmt_a-fmt.Tpo -c -o src/src_libsinglebin_fmt_a-fmt.obj `if test -f 'src/fmt.c'; then $(CYGPATH_W) 'src/fmt.c'; else $(CYGPATH_W) '$(srcdir)/src/fmt.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_fmt_a-fmt.Tpo src/$(DEPDIR)/src_libsinglebin_fmt_a-fmt.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/fmt.c' object='src/src_libsinglebin_fmt_a-fmt.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_fmt_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_fmt_a-fmt.obj `if test -f 'src/fmt.c'; then $(CYGPATH_W) 'src/fmt.c'; else $(CYGPATH_W) '$(srcdir)/src/fmt.c'; fi`
+
+src/src_libsinglebin_fold_a-fold.o: src/fold.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_fold_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_fold_a-fold.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_fold_a-fold.Tpo -c -o src/src_libsinglebin_fold_a-fold.o `test -f 'src/fold.c' || echo '$(srcdir)/'`src/fold.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_fold_a-fold.Tpo src/$(DEPDIR)/src_libsinglebin_fold_a-fold.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/fold.c' object='src/src_libsinglebin_fold_a-fold.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_fold_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_fold_a-fold.o `test -f 'src/fold.c' || echo '$(srcdir)/'`src/fold.c
+
+src/src_libsinglebin_fold_a-fold.obj: src/fold.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_fold_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_fold_a-fold.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_fold_a-fold.Tpo -c -o src/src_libsinglebin_fold_a-fold.obj `if test -f 'src/fold.c'; then $(CYGPATH_W) 'src/fold.c'; else $(CYGPATH_W) '$(srcdir)/src/fold.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_fold_a-fold.Tpo src/$(DEPDIR)/src_libsinglebin_fold_a-fold.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/fold.c' object='src/src_libsinglebin_fold_a-fold.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_fold_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_fold_a-fold.obj `if test -f 'src/fold.c'; then $(CYGPATH_W) 'src/fold.c'; else $(CYGPATH_W) '$(srcdir)/src/fold.c'; fi`
+
+src/src_libsinglebin_ginstall_a-install.o: src/install.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_ginstall_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ginstall_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_ginstall_a-install.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_ginstall_a-install.Tpo -c -o src/src_libsinglebin_ginstall_a-install.o `test -f 'src/install.c' || echo '$(srcdir)/'`src/install.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_ginstall_a-install.Tpo src/$(DEPDIR)/src_libsinglebin_ginstall_a-install.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/install.c' object='src/src_libsinglebin_ginstall_a-install.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_ginstall_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ginstall_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_ginstall_a-install.o `test -f 'src/install.c' || echo '$(srcdir)/'`src/install.c
+
+src/src_libsinglebin_ginstall_a-install.obj: src/install.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_ginstall_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ginstall_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_ginstall_a-install.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_ginstall_a-install.Tpo -c -o src/src_libsinglebin_ginstall_a-install.obj `if test -f 'src/install.c'; then $(CYGPATH_W) 'src/install.c'; else $(CYGPATH_W) '$(srcdir)/src/install.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_ginstall_a-install.Tpo src/$(DEPDIR)/src_libsinglebin_ginstall_a-install.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/install.c' object='src/src_libsinglebin_ginstall_a-install.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_ginstall_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ginstall_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_ginstall_a-install.obj `if test -f 'src/install.c'; then $(CYGPATH_W) 'src/install.c'; else $(CYGPATH_W) '$(srcdir)/src/install.c'; fi`
+
+src/src_libsinglebin_ginstall_a-prog-fprintf.o: src/prog-fprintf.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_ginstall_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ginstall_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_ginstall_a-prog-fprintf.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_ginstall_a-prog-fprintf.Tpo -c -o src/src_libsinglebin_ginstall_a-prog-fprintf.o `test -f 'src/prog-fprintf.c' || echo '$(srcdir)/'`src/prog-fprintf.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_ginstall_a-prog-fprintf.Tpo src/$(DEPDIR)/src_libsinglebin_ginstall_a-prog-fprintf.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/prog-fprintf.c' object='src/src_libsinglebin_ginstall_a-prog-fprintf.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_ginstall_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ginstall_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_ginstall_a-prog-fprintf.o `test -f 'src/prog-fprintf.c' || echo '$(srcdir)/'`src/prog-fprintf.c
+
+src/src_libsinglebin_ginstall_a-prog-fprintf.obj: src/prog-fprintf.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_ginstall_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ginstall_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_ginstall_a-prog-fprintf.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_ginstall_a-prog-fprintf.Tpo -c -o src/src_libsinglebin_ginstall_a-prog-fprintf.obj `if test -f 'src/prog-fprintf.c'; then $(CYGPATH_W) 'src/prog-fprintf.c'; else $(CYGPATH_W) '$(srcdir)/src/prog-fprintf.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_ginstall_a-prog-fprintf.Tpo src/$(DEPDIR)/src_libsinglebin_ginstall_a-prog-fprintf.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/prog-fprintf.c' object='src/src_libsinglebin_ginstall_a-prog-fprintf.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_ginstall_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ginstall_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_ginstall_a-prog-fprintf.obj `if test -f 'src/prog-fprintf.c'; then $(CYGPATH_W) 'src/prog-fprintf.c'; else $(CYGPATH_W) '$(srcdir)/src/prog-fprintf.c'; fi`
+
+src/src_libsinglebin_ginstall_a-copy.o: src/copy.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_ginstall_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ginstall_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_ginstall_a-copy.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_ginstall_a-copy.Tpo -c -o src/src_libsinglebin_ginstall_a-copy.o `test -f 'src/copy.c' || echo '$(srcdir)/'`src/copy.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_ginstall_a-copy.Tpo src/$(DEPDIR)/src_libsinglebin_ginstall_a-copy.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/copy.c' object='src/src_libsinglebin_ginstall_a-copy.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_ginstall_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ginstall_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_ginstall_a-copy.o `test -f 'src/copy.c' || echo '$(srcdir)/'`src/copy.c
+
+src/src_libsinglebin_ginstall_a-copy.obj: src/copy.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_ginstall_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ginstall_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_ginstall_a-copy.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_ginstall_a-copy.Tpo -c -o src/src_libsinglebin_ginstall_a-copy.obj `if test -f 'src/copy.c'; then $(CYGPATH_W) 'src/copy.c'; else $(CYGPATH_W) '$(srcdir)/src/copy.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_ginstall_a-copy.Tpo src/$(DEPDIR)/src_libsinglebin_ginstall_a-copy.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/copy.c' object='src/src_libsinglebin_ginstall_a-copy.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_ginstall_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ginstall_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_ginstall_a-copy.obj `if test -f 'src/copy.c'; then $(CYGPATH_W) 'src/copy.c'; else $(CYGPATH_W) '$(srcdir)/src/copy.c'; fi`
+
+src/src_libsinglebin_ginstall_a-cp-hash.o: src/cp-hash.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_ginstall_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ginstall_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_ginstall_a-cp-hash.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_ginstall_a-cp-hash.Tpo -c -o src/src_libsinglebin_ginstall_a-cp-hash.o `test -f 'src/cp-hash.c' || echo '$(srcdir)/'`src/cp-hash.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_ginstall_a-cp-hash.Tpo src/$(DEPDIR)/src_libsinglebin_ginstall_a-cp-hash.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/cp-hash.c' object='src/src_libsinglebin_ginstall_a-cp-hash.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_ginstall_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ginstall_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_ginstall_a-cp-hash.o `test -f 'src/cp-hash.c' || echo '$(srcdir)/'`src/cp-hash.c
+
+src/src_libsinglebin_ginstall_a-cp-hash.obj: src/cp-hash.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_ginstall_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ginstall_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_ginstall_a-cp-hash.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_ginstall_a-cp-hash.Tpo -c -o src/src_libsinglebin_ginstall_a-cp-hash.obj `if test -f 'src/cp-hash.c'; then $(CYGPATH_W) 'src/cp-hash.c'; else $(CYGPATH_W) '$(srcdir)/src/cp-hash.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_ginstall_a-cp-hash.Tpo src/$(DEPDIR)/src_libsinglebin_ginstall_a-cp-hash.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/cp-hash.c' object='src/src_libsinglebin_ginstall_a-cp-hash.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_ginstall_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ginstall_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_ginstall_a-cp-hash.obj `if test -f 'src/cp-hash.c'; then $(CYGPATH_W) 'src/cp-hash.c'; else $(CYGPATH_W) '$(srcdir)/src/cp-hash.c'; fi`
+
+src/src_libsinglebin_ginstall_a-extent-scan.o: src/extent-scan.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_ginstall_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ginstall_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_ginstall_a-extent-scan.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_ginstall_a-extent-scan.Tpo -c -o src/src_libsinglebin_ginstall_a-extent-scan.o `test -f 'src/extent-scan.c' || echo '$(srcdir)/'`src/extent-scan.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_ginstall_a-extent-scan.Tpo src/$(DEPDIR)/src_libsinglebin_ginstall_a-extent-scan.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/extent-scan.c' object='src/src_libsinglebin_ginstall_a-extent-scan.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_ginstall_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ginstall_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_ginstall_a-extent-scan.o `test -f 'src/extent-scan.c' || echo '$(srcdir)/'`src/extent-scan.c
+
+src/src_libsinglebin_ginstall_a-extent-scan.obj: src/extent-scan.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_ginstall_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ginstall_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_ginstall_a-extent-scan.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_ginstall_a-extent-scan.Tpo -c -o src/src_libsinglebin_ginstall_a-extent-scan.obj `if test -f 'src/extent-scan.c'; then $(CYGPATH_W) 'src/extent-scan.c'; else $(CYGPATH_W) '$(srcdir)/src/extent-scan.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_ginstall_a-extent-scan.Tpo src/$(DEPDIR)/src_libsinglebin_ginstall_a-extent-scan.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/extent-scan.c' object='src/src_libsinglebin_ginstall_a-extent-scan.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_ginstall_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ginstall_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_ginstall_a-extent-scan.obj `if test -f 'src/extent-scan.c'; then $(CYGPATH_W) 'src/extent-scan.c'; else $(CYGPATH_W) '$(srcdir)/src/extent-scan.c'; fi`
+
+src/src_libsinglebin_ginstall_a-selinux.o: src/selinux.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_ginstall_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ginstall_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_ginstall_a-selinux.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_ginstall_a-selinux.Tpo -c -o src/src_libsinglebin_ginstall_a-selinux.o `test -f 'src/selinux.c' || echo '$(srcdir)/'`src/selinux.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_ginstall_a-selinux.Tpo src/$(DEPDIR)/src_libsinglebin_ginstall_a-selinux.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/selinux.c' object='src/src_libsinglebin_ginstall_a-selinux.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_ginstall_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ginstall_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_ginstall_a-selinux.o `test -f 'src/selinux.c' || echo '$(srcdir)/'`src/selinux.c
+
+src/src_libsinglebin_ginstall_a-selinux.obj: src/selinux.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_ginstall_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ginstall_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_ginstall_a-selinux.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_ginstall_a-selinux.Tpo -c -o src/src_libsinglebin_ginstall_a-selinux.obj `if test -f 'src/selinux.c'; then $(CYGPATH_W) 'src/selinux.c'; else $(CYGPATH_W) '$(srcdir)/src/selinux.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_ginstall_a-selinux.Tpo src/$(DEPDIR)/src_libsinglebin_ginstall_a-selinux.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/selinux.c' object='src/src_libsinglebin_ginstall_a-selinux.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_ginstall_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ginstall_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_ginstall_a-selinux.obj `if test -f 'src/selinux.c'; then $(CYGPATH_W) 'src/selinux.c'; else $(CYGPATH_W) '$(srcdir)/src/selinux.c'; fi`
+
+src/src_libsinglebin_groups_a-groups.o: src/groups.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_groups_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_groups_a-groups.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_groups_a-groups.Tpo -c -o src/src_libsinglebin_groups_a-groups.o `test -f 'src/groups.c' || echo '$(srcdir)/'`src/groups.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_groups_a-groups.Tpo src/$(DEPDIR)/src_libsinglebin_groups_a-groups.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/groups.c' object='src/src_libsinglebin_groups_a-groups.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_groups_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_groups_a-groups.o `test -f 'src/groups.c' || echo '$(srcdir)/'`src/groups.c
+
+src/src_libsinglebin_groups_a-groups.obj: src/groups.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_groups_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_groups_a-groups.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_groups_a-groups.Tpo -c -o src/src_libsinglebin_groups_a-groups.obj `if test -f 'src/groups.c'; then $(CYGPATH_W) 'src/groups.c'; else $(CYGPATH_W) '$(srcdir)/src/groups.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_groups_a-groups.Tpo src/$(DEPDIR)/src_libsinglebin_groups_a-groups.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/groups.c' object='src/src_libsinglebin_groups_a-groups.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_groups_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_groups_a-groups.obj `if test -f 'src/groups.c'; then $(CYGPATH_W) 'src/groups.c'; else $(CYGPATH_W) '$(srcdir)/src/groups.c'; fi`
+
+src/src_libsinglebin_groups_a-group-list.o: src/group-list.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_groups_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_groups_a-group-list.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_groups_a-group-list.Tpo -c -o src/src_libsinglebin_groups_a-group-list.o `test -f 'src/group-list.c' || echo '$(srcdir)/'`src/group-list.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_groups_a-group-list.Tpo src/$(DEPDIR)/src_libsinglebin_groups_a-group-list.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/group-list.c' object='src/src_libsinglebin_groups_a-group-list.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_groups_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_groups_a-group-list.o `test -f 'src/group-list.c' || echo '$(srcdir)/'`src/group-list.c
+
+src/src_libsinglebin_groups_a-group-list.obj: src/group-list.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_groups_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_groups_a-group-list.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_groups_a-group-list.Tpo -c -o src/src_libsinglebin_groups_a-group-list.obj `if test -f 'src/group-list.c'; then $(CYGPATH_W) 'src/group-list.c'; else $(CYGPATH_W) '$(srcdir)/src/group-list.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_groups_a-group-list.Tpo src/$(DEPDIR)/src_libsinglebin_groups_a-group-list.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/group-list.c' object='src/src_libsinglebin_groups_a-group-list.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_groups_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_groups_a-group-list.obj `if test -f 'src/group-list.c'; then $(CYGPATH_W) 'src/group-list.c'; else $(CYGPATH_W) '$(srcdir)/src/group-list.c'; fi`
+
+src/src_libsinglebin_head_a-head.o: src/head.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_head_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_head_a-head.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_head_a-head.Tpo -c -o src/src_libsinglebin_head_a-head.o `test -f 'src/head.c' || echo '$(srcdir)/'`src/head.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_head_a-head.Tpo src/$(DEPDIR)/src_libsinglebin_head_a-head.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/head.c' object='src/src_libsinglebin_head_a-head.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_head_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_head_a-head.o `test -f 'src/head.c' || echo '$(srcdir)/'`src/head.c
+
+src/src_libsinglebin_head_a-head.obj: src/head.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_head_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_head_a-head.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_head_a-head.Tpo -c -o src/src_libsinglebin_head_a-head.obj `if test -f 'src/head.c'; then $(CYGPATH_W) 'src/head.c'; else $(CYGPATH_W) '$(srcdir)/src/head.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_head_a-head.Tpo src/$(DEPDIR)/src_libsinglebin_head_a-head.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/head.c' object='src/src_libsinglebin_head_a-head.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_head_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_head_a-head.obj `if test -f 'src/head.c'; then $(CYGPATH_W) 'src/head.c'; else $(CYGPATH_W) '$(srcdir)/src/head.c'; fi`
+
+src/src_libsinglebin_hostid_a-hostid.o: src/hostid.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_hostid_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_hostid_a-hostid.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_hostid_a-hostid.Tpo -c -o src/src_libsinglebin_hostid_a-hostid.o `test -f 'src/hostid.c' || echo '$(srcdir)/'`src/hostid.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_hostid_a-hostid.Tpo src/$(DEPDIR)/src_libsinglebin_hostid_a-hostid.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/hostid.c' object='src/src_libsinglebin_hostid_a-hostid.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_hostid_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_hostid_a-hostid.o `test -f 'src/hostid.c' || echo '$(srcdir)/'`src/hostid.c
+
+src/src_libsinglebin_hostid_a-hostid.obj: src/hostid.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_hostid_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_hostid_a-hostid.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_hostid_a-hostid.Tpo -c -o src/src_libsinglebin_hostid_a-hostid.obj `if test -f 'src/hostid.c'; then $(CYGPATH_W) 'src/hostid.c'; else $(CYGPATH_W) '$(srcdir)/src/hostid.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_hostid_a-hostid.Tpo src/$(DEPDIR)/src_libsinglebin_hostid_a-hostid.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/hostid.c' object='src/src_libsinglebin_hostid_a-hostid.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_hostid_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_hostid_a-hostid.obj `if test -f 'src/hostid.c'; then $(CYGPATH_W) 'src/hostid.c'; else $(CYGPATH_W) '$(srcdir)/src/hostid.c'; fi`
+
+src/src_libsinglebin_hostname_a-hostname.o: src/hostname.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_hostname_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_hostname_a-hostname.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_hostname_a-hostname.Tpo -c -o src/src_libsinglebin_hostname_a-hostname.o `test -f 'src/hostname.c' || echo '$(srcdir)/'`src/hostname.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_hostname_a-hostname.Tpo src/$(DEPDIR)/src_libsinglebin_hostname_a-hostname.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/hostname.c' object='src/src_libsinglebin_hostname_a-hostname.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_hostname_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_hostname_a-hostname.o `test -f 'src/hostname.c' || echo '$(srcdir)/'`src/hostname.c
+
+src/src_libsinglebin_hostname_a-hostname.obj: src/hostname.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_hostname_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_hostname_a-hostname.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_hostname_a-hostname.Tpo -c -o src/src_libsinglebin_hostname_a-hostname.obj `if test -f 'src/hostname.c'; then $(CYGPATH_W) 'src/hostname.c'; else $(CYGPATH_W) '$(srcdir)/src/hostname.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_hostname_a-hostname.Tpo src/$(DEPDIR)/src_libsinglebin_hostname_a-hostname.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/hostname.c' object='src/src_libsinglebin_hostname_a-hostname.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_hostname_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_hostname_a-hostname.obj `if test -f 'src/hostname.c'; then $(CYGPATH_W) 'src/hostname.c'; else $(CYGPATH_W) '$(srcdir)/src/hostname.c'; fi`
+
+src/src_libsinglebin_id_a-id.o: src/id.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_id_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_id_a-id.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_id_a-id.Tpo -c -o src/src_libsinglebin_id_a-id.o `test -f 'src/id.c' || echo '$(srcdir)/'`src/id.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_id_a-id.Tpo src/$(DEPDIR)/src_libsinglebin_id_a-id.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/id.c' object='src/src_libsinglebin_id_a-id.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_id_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_id_a-id.o `test -f 'src/id.c' || echo '$(srcdir)/'`src/id.c
+
+src/src_libsinglebin_id_a-id.obj: src/id.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_id_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_id_a-id.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_id_a-id.Tpo -c -o src/src_libsinglebin_id_a-id.obj `if test -f 'src/id.c'; then $(CYGPATH_W) 'src/id.c'; else $(CYGPATH_W) '$(srcdir)/src/id.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_id_a-id.Tpo src/$(DEPDIR)/src_libsinglebin_id_a-id.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/id.c' object='src/src_libsinglebin_id_a-id.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_id_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_id_a-id.obj `if test -f 'src/id.c'; then $(CYGPATH_W) 'src/id.c'; else $(CYGPATH_W) '$(srcdir)/src/id.c'; fi`
+
+src/src_libsinglebin_id_a-group-list.o: src/group-list.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_id_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_id_a-group-list.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_id_a-group-list.Tpo -c -o src/src_libsinglebin_id_a-group-list.o `test -f 'src/group-list.c' || echo '$(srcdir)/'`src/group-list.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_id_a-group-list.Tpo src/$(DEPDIR)/src_libsinglebin_id_a-group-list.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/group-list.c' object='src/src_libsinglebin_id_a-group-list.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_id_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_id_a-group-list.o `test -f 'src/group-list.c' || echo '$(srcdir)/'`src/group-list.c
+
+src/src_libsinglebin_id_a-group-list.obj: src/group-list.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_id_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_id_a-group-list.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_id_a-group-list.Tpo -c -o src/src_libsinglebin_id_a-group-list.obj `if test -f 'src/group-list.c'; then $(CYGPATH_W) 'src/group-list.c'; else $(CYGPATH_W) '$(srcdir)/src/group-list.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_id_a-group-list.Tpo src/$(DEPDIR)/src_libsinglebin_id_a-group-list.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/group-list.c' object='src/src_libsinglebin_id_a-group-list.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_id_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_id_a-group-list.obj `if test -f 'src/group-list.c'; then $(CYGPATH_W) 'src/group-list.c'; else $(CYGPATH_W) '$(srcdir)/src/group-list.c'; fi`
+
+src/src_libsinglebin_join_a-join.o: src/join.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_join_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_join_a-join.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_join_a-join.Tpo -c -o src/src_libsinglebin_join_a-join.o `test -f 'src/join.c' || echo '$(srcdir)/'`src/join.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_join_a-join.Tpo src/$(DEPDIR)/src_libsinglebin_join_a-join.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/join.c' object='src/src_libsinglebin_join_a-join.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_join_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_join_a-join.o `test -f 'src/join.c' || echo '$(srcdir)/'`src/join.c
+
+src/src_libsinglebin_join_a-join.obj: src/join.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_join_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_join_a-join.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_join_a-join.Tpo -c -o src/src_libsinglebin_join_a-join.obj `if test -f 'src/join.c'; then $(CYGPATH_W) 'src/join.c'; else $(CYGPATH_W) '$(srcdir)/src/join.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_join_a-join.Tpo src/$(DEPDIR)/src_libsinglebin_join_a-join.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/join.c' object='src/src_libsinglebin_join_a-join.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_join_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_join_a-join.obj `if test -f 'src/join.c'; then $(CYGPATH_W) 'src/join.c'; else $(CYGPATH_W) '$(srcdir)/src/join.c'; fi`
+
+src/src_libsinglebin_kill_a-kill.o: src/kill.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_kill_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_kill_a-kill.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_kill_a-kill.Tpo -c -o src/src_libsinglebin_kill_a-kill.o `test -f 'src/kill.c' || echo '$(srcdir)/'`src/kill.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_kill_a-kill.Tpo src/$(DEPDIR)/src_libsinglebin_kill_a-kill.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/kill.c' object='src/src_libsinglebin_kill_a-kill.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_kill_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_kill_a-kill.o `test -f 'src/kill.c' || echo '$(srcdir)/'`src/kill.c
+
+src/src_libsinglebin_kill_a-kill.obj: src/kill.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_kill_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_kill_a-kill.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_kill_a-kill.Tpo -c -o src/src_libsinglebin_kill_a-kill.obj `if test -f 'src/kill.c'; then $(CYGPATH_W) 'src/kill.c'; else $(CYGPATH_W) '$(srcdir)/src/kill.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_kill_a-kill.Tpo src/$(DEPDIR)/src_libsinglebin_kill_a-kill.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/kill.c' object='src/src_libsinglebin_kill_a-kill.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_kill_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_kill_a-kill.obj `if test -f 'src/kill.c'; then $(CYGPATH_W) 'src/kill.c'; else $(CYGPATH_W) '$(srcdir)/src/kill.c'; fi`
+
+src/src_libsinglebin_kill_a-operand2sig.o: src/operand2sig.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_kill_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_kill_a-operand2sig.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_kill_a-operand2sig.Tpo -c -o src/src_libsinglebin_kill_a-operand2sig.o `test -f 'src/operand2sig.c' || echo '$(srcdir)/'`src/operand2sig.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_kill_a-operand2sig.Tpo src/$(DEPDIR)/src_libsinglebin_kill_a-operand2sig.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/operand2sig.c' object='src/src_libsinglebin_kill_a-operand2sig.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_kill_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_kill_a-operand2sig.o `test -f 'src/operand2sig.c' || echo '$(srcdir)/'`src/operand2sig.c
+
+src/src_libsinglebin_kill_a-operand2sig.obj: src/operand2sig.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_kill_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_kill_a-operand2sig.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_kill_a-operand2sig.Tpo -c -o src/src_libsinglebin_kill_a-operand2sig.obj `if test -f 'src/operand2sig.c'; then $(CYGPATH_W) 'src/operand2sig.c'; else $(CYGPATH_W) '$(srcdir)/src/operand2sig.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_kill_a-operand2sig.Tpo src/$(DEPDIR)/src_libsinglebin_kill_a-operand2sig.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/operand2sig.c' object='src/src_libsinglebin_kill_a-operand2sig.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_kill_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_kill_a-operand2sig.obj `if test -f 'src/operand2sig.c'; then $(CYGPATH_W) 'src/operand2sig.c'; else $(CYGPATH_W) '$(srcdir)/src/operand2sig.c'; fi`
+
+src/src_libsinglebin_link_a-link.o: src/link.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_link_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_link_a-link.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_link_a-link.Tpo -c -o src/src_libsinglebin_link_a-link.o `test -f 'src/link.c' || echo '$(srcdir)/'`src/link.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_link_a-link.Tpo src/$(DEPDIR)/src_libsinglebin_link_a-link.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/link.c' object='src/src_libsinglebin_link_a-link.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_link_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_link_a-link.o `test -f 'src/link.c' || echo '$(srcdir)/'`src/link.c
+
+src/src_libsinglebin_link_a-link.obj: src/link.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_link_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_link_a-link.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_link_a-link.Tpo -c -o src/src_libsinglebin_link_a-link.obj `if test -f 'src/link.c'; then $(CYGPATH_W) 'src/link.c'; else $(CYGPATH_W) '$(srcdir)/src/link.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_link_a-link.Tpo src/$(DEPDIR)/src_libsinglebin_link_a-link.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/link.c' object='src/src_libsinglebin_link_a-link.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_link_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_link_a-link.obj `if test -f 'src/link.c'; then $(CYGPATH_W) 'src/link.c'; else $(CYGPATH_W) '$(srcdir)/src/link.c'; fi`
+
+src/src_libsinglebin_ln_a-ln.o: src/ln.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ln_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_ln_a-ln.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_ln_a-ln.Tpo -c -o src/src_libsinglebin_ln_a-ln.o `test -f 'src/ln.c' || echo '$(srcdir)/'`src/ln.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_ln_a-ln.Tpo src/$(DEPDIR)/src_libsinglebin_ln_a-ln.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/ln.c' object='src/src_libsinglebin_ln_a-ln.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ln_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_ln_a-ln.o `test -f 'src/ln.c' || echo '$(srcdir)/'`src/ln.c
+
+src/src_libsinglebin_ln_a-ln.obj: src/ln.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ln_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_ln_a-ln.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_ln_a-ln.Tpo -c -o src/src_libsinglebin_ln_a-ln.obj `if test -f 'src/ln.c'; then $(CYGPATH_W) 'src/ln.c'; else $(CYGPATH_W) '$(srcdir)/src/ln.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_ln_a-ln.Tpo src/$(DEPDIR)/src_libsinglebin_ln_a-ln.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/ln.c' object='src/src_libsinglebin_ln_a-ln.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ln_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_ln_a-ln.obj `if test -f 'src/ln.c'; then $(CYGPATH_W) 'src/ln.c'; else $(CYGPATH_W) '$(srcdir)/src/ln.c'; fi`
+
+src/src_libsinglebin_ln_a-relpath.o: src/relpath.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ln_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_ln_a-relpath.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_ln_a-relpath.Tpo -c -o src/src_libsinglebin_ln_a-relpath.o `test -f 'src/relpath.c' || echo '$(srcdir)/'`src/relpath.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_ln_a-relpath.Tpo src/$(DEPDIR)/src_libsinglebin_ln_a-relpath.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/relpath.c' object='src/src_libsinglebin_ln_a-relpath.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ln_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_ln_a-relpath.o `test -f 'src/relpath.c' || echo '$(srcdir)/'`src/relpath.c
+
+src/src_libsinglebin_ln_a-relpath.obj: src/relpath.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ln_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_ln_a-relpath.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_ln_a-relpath.Tpo -c -o src/src_libsinglebin_ln_a-relpath.obj `if test -f 'src/relpath.c'; then $(CYGPATH_W) 'src/relpath.c'; else $(CYGPATH_W) '$(srcdir)/src/relpath.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_ln_a-relpath.Tpo src/$(DEPDIR)/src_libsinglebin_ln_a-relpath.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/relpath.c' object='src/src_libsinglebin_ln_a-relpath.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ln_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_ln_a-relpath.obj `if test -f 'src/relpath.c'; then $(CYGPATH_W) 'src/relpath.c'; else $(CYGPATH_W) '$(srcdir)/src/relpath.c'; fi`
+
+src/src_libsinglebin_logname_a-logname.o: src/logname.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_logname_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_logname_a-logname.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_logname_a-logname.Tpo -c -o src/src_libsinglebin_logname_a-logname.o `test -f 'src/logname.c' || echo '$(srcdir)/'`src/logname.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_logname_a-logname.Tpo src/$(DEPDIR)/src_libsinglebin_logname_a-logname.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/logname.c' object='src/src_libsinglebin_logname_a-logname.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_logname_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_logname_a-logname.o `test -f 'src/logname.c' || echo '$(srcdir)/'`src/logname.c
+
+src/src_libsinglebin_logname_a-logname.obj: src/logname.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_logname_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_logname_a-logname.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_logname_a-logname.Tpo -c -o src/src_libsinglebin_logname_a-logname.obj `if test -f 'src/logname.c'; then $(CYGPATH_W) 'src/logname.c'; else $(CYGPATH_W) '$(srcdir)/src/logname.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_logname_a-logname.Tpo src/$(DEPDIR)/src_libsinglebin_logname_a-logname.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/logname.c' object='src/src_libsinglebin_logname_a-logname.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_logname_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_logname_a-logname.obj `if test -f 'src/logname.c'; then $(CYGPATH_W) 'src/logname.c'; else $(CYGPATH_W) '$(srcdir)/src/logname.c'; fi`
+
+src/src_libsinglebin_ls_a-ls.o: src/ls.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ls_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_ls_a-ls.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_ls_a-ls.Tpo -c -o src/src_libsinglebin_ls_a-ls.o `test -f 'src/ls.c' || echo '$(srcdir)/'`src/ls.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_ls_a-ls.Tpo src/$(DEPDIR)/src_libsinglebin_ls_a-ls.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/ls.c' object='src/src_libsinglebin_ls_a-ls.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ls_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_ls_a-ls.o `test -f 'src/ls.c' || echo '$(srcdir)/'`src/ls.c
+
+src/src_libsinglebin_ls_a-ls.obj: src/ls.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ls_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_ls_a-ls.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_ls_a-ls.Tpo -c -o src/src_libsinglebin_ls_a-ls.obj `if test -f 'src/ls.c'; then $(CYGPATH_W) 'src/ls.c'; else $(CYGPATH_W) '$(srcdir)/src/ls.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_ls_a-ls.Tpo src/$(DEPDIR)/src_libsinglebin_ls_a-ls.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/ls.c' object='src/src_libsinglebin_ls_a-ls.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ls_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_ls_a-ls.obj `if test -f 'src/ls.c'; then $(CYGPATH_W) 'src/ls.c'; else $(CYGPATH_W) '$(srcdir)/src/ls.c'; fi`
+
+src/src_libsinglebin_ls_a-ls-ls.o: src/ls-ls.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ls_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_ls_a-ls-ls.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_ls_a-ls-ls.Tpo -c -o src/src_libsinglebin_ls_a-ls-ls.o `test -f 'src/ls-ls.c' || echo '$(srcdir)/'`src/ls-ls.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_ls_a-ls-ls.Tpo src/$(DEPDIR)/src_libsinglebin_ls_a-ls-ls.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/ls-ls.c' object='src/src_libsinglebin_ls_a-ls-ls.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ls_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_ls_a-ls-ls.o `test -f 'src/ls-ls.c' || echo '$(srcdir)/'`src/ls-ls.c
+
+src/src_libsinglebin_ls_a-ls-ls.obj: src/ls-ls.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ls_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_ls_a-ls-ls.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_ls_a-ls-ls.Tpo -c -o src/src_libsinglebin_ls_a-ls-ls.obj `if test -f 'src/ls-ls.c'; then $(CYGPATH_W) 'src/ls-ls.c'; else $(CYGPATH_W) '$(srcdir)/src/ls-ls.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_ls_a-ls-ls.Tpo src/$(DEPDIR)/src_libsinglebin_ls_a-ls-ls.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/ls-ls.c' object='src/src_libsinglebin_ls_a-ls-ls.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ls_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_ls_a-ls-ls.obj `if test -f 'src/ls-ls.c'; then $(CYGPATH_W) 'src/ls-ls.c'; else $(CYGPATH_W) '$(srcdir)/src/ls-ls.c'; fi`
+
+src/src_libsinglebin_md5sum_a-md5sum.o: src/md5sum.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_md5sum_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_md5sum_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_md5sum_a-md5sum.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_md5sum_a-md5sum.Tpo -c -o src/src_libsinglebin_md5sum_a-md5sum.o `test -f 'src/md5sum.c' || echo '$(srcdir)/'`src/md5sum.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_md5sum_a-md5sum.Tpo src/$(DEPDIR)/src_libsinglebin_md5sum_a-md5sum.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/md5sum.c' object='src/src_libsinglebin_md5sum_a-md5sum.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_md5sum_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_md5sum_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_md5sum_a-md5sum.o `test -f 'src/md5sum.c' || echo '$(srcdir)/'`src/md5sum.c
+
+src/src_libsinglebin_md5sum_a-md5sum.obj: src/md5sum.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_md5sum_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_md5sum_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_md5sum_a-md5sum.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_md5sum_a-md5sum.Tpo -c -o src/src_libsinglebin_md5sum_a-md5sum.obj `if test -f 'src/md5sum.c'; then $(CYGPATH_W) 'src/md5sum.c'; else $(CYGPATH_W) '$(srcdir)/src/md5sum.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_md5sum_a-md5sum.Tpo src/$(DEPDIR)/src_libsinglebin_md5sum_a-md5sum.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/md5sum.c' object='src/src_libsinglebin_md5sum_a-md5sum.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_md5sum_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_md5sum_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_md5sum_a-md5sum.obj `if test -f 'src/md5sum.c'; then $(CYGPATH_W) 'src/md5sum.c'; else $(CYGPATH_W) '$(srcdir)/src/md5sum.c'; fi`
+
+src/src_libsinglebin_mkdir_a-mkdir.o: src/mkdir.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mkdir_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_mkdir_a-mkdir.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_mkdir_a-mkdir.Tpo -c -o src/src_libsinglebin_mkdir_a-mkdir.o `test -f 'src/mkdir.c' || echo '$(srcdir)/'`src/mkdir.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_mkdir_a-mkdir.Tpo src/$(DEPDIR)/src_libsinglebin_mkdir_a-mkdir.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/mkdir.c' object='src/src_libsinglebin_mkdir_a-mkdir.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mkdir_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_mkdir_a-mkdir.o `test -f 'src/mkdir.c' || echo '$(srcdir)/'`src/mkdir.c
+
+src/src_libsinglebin_mkdir_a-mkdir.obj: src/mkdir.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mkdir_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_mkdir_a-mkdir.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_mkdir_a-mkdir.Tpo -c -o src/src_libsinglebin_mkdir_a-mkdir.obj `if test -f 'src/mkdir.c'; then $(CYGPATH_W) 'src/mkdir.c'; else $(CYGPATH_W) '$(srcdir)/src/mkdir.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_mkdir_a-mkdir.Tpo src/$(DEPDIR)/src_libsinglebin_mkdir_a-mkdir.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/mkdir.c' object='src/src_libsinglebin_mkdir_a-mkdir.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mkdir_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_mkdir_a-mkdir.obj `if test -f 'src/mkdir.c'; then $(CYGPATH_W) 'src/mkdir.c'; else $(CYGPATH_W) '$(srcdir)/src/mkdir.c'; fi`
+
+src/src_libsinglebin_mkdir_a-prog-fprintf.o: src/prog-fprintf.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mkdir_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_mkdir_a-prog-fprintf.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_mkdir_a-prog-fprintf.Tpo -c -o src/src_libsinglebin_mkdir_a-prog-fprintf.o `test -f 'src/prog-fprintf.c' || echo '$(srcdir)/'`src/prog-fprintf.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_mkdir_a-prog-fprintf.Tpo src/$(DEPDIR)/src_libsinglebin_mkdir_a-prog-fprintf.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/prog-fprintf.c' object='src/src_libsinglebin_mkdir_a-prog-fprintf.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mkdir_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_mkdir_a-prog-fprintf.o `test -f 'src/prog-fprintf.c' || echo '$(srcdir)/'`src/prog-fprintf.c
+
+src/src_libsinglebin_mkdir_a-prog-fprintf.obj: src/prog-fprintf.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mkdir_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_mkdir_a-prog-fprintf.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_mkdir_a-prog-fprintf.Tpo -c -o src/src_libsinglebin_mkdir_a-prog-fprintf.obj `if test -f 'src/prog-fprintf.c'; then $(CYGPATH_W) 'src/prog-fprintf.c'; else $(CYGPATH_W) '$(srcdir)/src/prog-fprintf.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_mkdir_a-prog-fprintf.Tpo src/$(DEPDIR)/src_libsinglebin_mkdir_a-prog-fprintf.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/prog-fprintf.c' object='src/src_libsinglebin_mkdir_a-prog-fprintf.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mkdir_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_mkdir_a-prog-fprintf.obj `if test -f 'src/prog-fprintf.c'; then $(CYGPATH_W) 'src/prog-fprintf.c'; else $(CYGPATH_W) '$(srcdir)/src/prog-fprintf.c'; fi`
+
+src/src_libsinglebin_mkdir_a-selinux.o: src/selinux.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mkdir_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_mkdir_a-selinux.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_mkdir_a-selinux.Tpo -c -o src/src_libsinglebin_mkdir_a-selinux.o `test -f 'src/selinux.c' || echo '$(srcdir)/'`src/selinux.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_mkdir_a-selinux.Tpo src/$(DEPDIR)/src_libsinglebin_mkdir_a-selinux.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/selinux.c' object='src/src_libsinglebin_mkdir_a-selinux.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mkdir_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_mkdir_a-selinux.o `test -f 'src/selinux.c' || echo '$(srcdir)/'`src/selinux.c
+
+src/src_libsinglebin_mkdir_a-selinux.obj: src/selinux.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mkdir_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_mkdir_a-selinux.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_mkdir_a-selinux.Tpo -c -o src/src_libsinglebin_mkdir_a-selinux.obj `if test -f 'src/selinux.c'; then $(CYGPATH_W) 'src/selinux.c'; else $(CYGPATH_W) '$(srcdir)/src/selinux.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_mkdir_a-selinux.Tpo src/$(DEPDIR)/src_libsinglebin_mkdir_a-selinux.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/selinux.c' object='src/src_libsinglebin_mkdir_a-selinux.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mkdir_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_mkdir_a-selinux.obj `if test -f 'src/selinux.c'; then $(CYGPATH_W) 'src/selinux.c'; else $(CYGPATH_W) '$(srcdir)/src/selinux.c'; fi`
+
+src/src_libsinglebin_mkfifo_a-mkfifo.o: src/mkfifo.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mkfifo_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_mkfifo_a-mkfifo.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_mkfifo_a-mkfifo.Tpo -c -o src/src_libsinglebin_mkfifo_a-mkfifo.o `test -f 'src/mkfifo.c' || echo '$(srcdir)/'`src/mkfifo.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_mkfifo_a-mkfifo.Tpo src/$(DEPDIR)/src_libsinglebin_mkfifo_a-mkfifo.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/mkfifo.c' object='src/src_libsinglebin_mkfifo_a-mkfifo.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mkfifo_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_mkfifo_a-mkfifo.o `test -f 'src/mkfifo.c' || echo '$(srcdir)/'`src/mkfifo.c
+
+src/src_libsinglebin_mkfifo_a-mkfifo.obj: src/mkfifo.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mkfifo_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_mkfifo_a-mkfifo.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_mkfifo_a-mkfifo.Tpo -c -o src/src_libsinglebin_mkfifo_a-mkfifo.obj `if test -f 'src/mkfifo.c'; then $(CYGPATH_W) 'src/mkfifo.c'; else $(CYGPATH_W) '$(srcdir)/src/mkfifo.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_mkfifo_a-mkfifo.Tpo src/$(DEPDIR)/src_libsinglebin_mkfifo_a-mkfifo.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/mkfifo.c' object='src/src_libsinglebin_mkfifo_a-mkfifo.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mkfifo_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_mkfifo_a-mkfifo.obj `if test -f 'src/mkfifo.c'; then $(CYGPATH_W) 'src/mkfifo.c'; else $(CYGPATH_W) '$(srcdir)/src/mkfifo.c'; fi`
+
+src/src_libsinglebin_mkfifo_a-selinux.o: src/selinux.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mkfifo_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_mkfifo_a-selinux.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_mkfifo_a-selinux.Tpo -c -o src/src_libsinglebin_mkfifo_a-selinux.o `test -f 'src/selinux.c' || echo '$(srcdir)/'`src/selinux.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_mkfifo_a-selinux.Tpo src/$(DEPDIR)/src_libsinglebin_mkfifo_a-selinux.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/selinux.c' object='src/src_libsinglebin_mkfifo_a-selinux.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mkfifo_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_mkfifo_a-selinux.o `test -f 'src/selinux.c' || echo '$(srcdir)/'`src/selinux.c
+
+src/src_libsinglebin_mkfifo_a-selinux.obj: src/selinux.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mkfifo_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_mkfifo_a-selinux.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_mkfifo_a-selinux.Tpo -c -o src/src_libsinglebin_mkfifo_a-selinux.obj `if test -f 'src/selinux.c'; then $(CYGPATH_W) 'src/selinux.c'; else $(CYGPATH_W) '$(srcdir)/src/selinux.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_mkfifo_a-selinux.Tpo src/$(DEPDIR)/src_libsinglebin_mkfifo_a-selinux.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/selinux.c' object='src/src_libsinglebin_mkfifo_a-selinux.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mkfifo_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_mkfifo_a-selinux.obj `if test -f 'src/selinux.c'; then $(CYGPATH_W) 'src/selinux.c'; else $(CYGPATH_W) '$(srcdir)/src/selinux.c'; fi`
+
+src/src_libsinglebin_mknod_a-mknod.o: src/mknod.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mknod_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_mknod_a-mknod.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_mknod_a-mknod.Tpo -c -o src/src_libsinglebin_mknod_a-mknod.o `test -f 'src/mknod.c' || echo '$(srcdir)/'`src/mknod.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_mknod_a-mknod.Tpo src/$(DEPDIR)/src_libsinglebin_mknod_a-mknod.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/mknod.c' object='src/src_libsinglebin_mknod_a-mknod.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mknod_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_mknod_a-mknod.o `test -f 'src/mknod.c' || echo '$(srcdir)/'`src/mknod.c
+
+src/src_libsinglebin_mknod_a-mknod.obj: src/mknod.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mknod_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_mknod_a-mknod.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_mknod_a-mknod.Tpo -c -o src/src_libsinglebin_mknod_a-mknod.obj `if test -f 'src/mknod.c'; then $(CYGPATH_W) 'src/mknod.c'; else $(CYGPATH_W) '$(srcdir)/src/mknod.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_mknod_a-mknod.Tpo src/$(DEPDIR)/src_libsinglebin_mknod_a-mknod.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/mknod.c' object='src/src_libsinglebin_mknod_a-mknod.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mknod_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_mknod_a-mknod.obj `if test -f 'src/mknod.c'; then $(CYGPATH_W) 'src/mknod.c'; else $(CYGPATH_W) '$(srcdir)/src/mknod.c'; fi`
+
+src/src_libsinglebin_mknod_a-selinux.o: src/selinux.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mknod_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_mknod_a-selinux.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_mknod_a-selinux.Tpo -c -o src/src_libsinglebin_mknod_a-selinux.o `test -f 'src/selinux.c' || echo '$(srcdir)/'`src/selinux.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_mknod_a-selinux.Tpo src/$(DEPDIR)/src_libsinglebin_mknod_a-selinux.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/selinux.c' object='src/src_libsinglebin_mknod_a-selinux.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mknod_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_mknod_a-selinux.o `test -f 'src/selinux.c' || echo '$(srcdir)/'`src/selinux.c
+
+src/src_libsinglebin_mknod_a-selinux.obj: src/selinux.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mknod_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_mknod_a-selinux.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_mknod_a-selinux.Tpo -c -o src/src_libsinglebin_mknod_a-selinux.obj `if test -f 'src/selinux.c'; then $(CYGPATH_W) 'src/selinux.c'; else $(CYGPATH_W) '$(srcdir)/src/selinux.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_mknod_a-selinux.Tpo src/$(DEPDIR)/src_libsinglebin_mknod_a-selinux.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/selinux.c' object='src/src_libsinglebin_mknod_a-selinux.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mknod_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_mknod_a-selinux.obj `if test -f 'src/selinux.c'; then $(CYGPATH_W) 'src/selinux.c'; else $(CYGPATH_W) '$(srcdir)/src/selinux.c'; fi`
+
+src/src_libsinglebin_mktemp_a-mktemp.o: src/mktemp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mktemp_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_mktemp_a-mktemp.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_mktemp_a-mktemp.Tpo -c -o src/src_libsinglebin_mktemp_a-mktemp.o `test -f 'src/mktemp.c' || echo '$(srcdir)/'`src/mktemp.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_mktemp_a-mktemp.Tpo src/$(DEPDIR)/src_libsinglebin_mktemp_a-mktemp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/mktemp.c' object='src/src_libsinglebin_mktemp_a-mktemp.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mktemp_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_mktemp_a-mktemp.o `test -f 'src/mktemp.c' || echo '$(srcdir)/'`src/mktemp.c
+
+src/src_libsinglebin_mktemp_a-mktemp.obj: src/mktemp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mktemp_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_mktemp_a-mktemp.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_mktemp_a-mktemp.Tpo -c -o src/src_libsinglebin_mktemp_a-mktemp.obj `if test -f 'src/mktemp.c'; then $(CYGPATH_W) 'src/mktemp.c'; else $(CYGPATH_W) '$(srcdir)/src/mktemp.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_mktemp_a-mktemp.Tpo src/$(DEPDIR)/src_libsinglebin_mktemp_a-mktemp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/mktemp.c' object='src/src_libsinglebin_mktemp_a-mktemp.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mktemp_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_mktemp_a-mktemp.obj `if test -f 'src/mktemp.c'; then $(CYGPATH_W) 'src/mktemp.c'; else $(CYGPATH_W) '$(srcdir)/src/mktemp.c'; fi`
+
+src/src_libsinglebin_mv_a-mv.o: src/mv.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mv_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_mv_a-mv.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_mv_a-mv.Tpo -c -o src/src_libsinglebin_mv_a-mv.o `test -f 'src/mv.c' || echo '$(srcdir)/'`src/mv.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_mv_a-mv.Tpo src/$(DEPDIR)/src_libsinglebin_mv_a-mv.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/mv.c' object='src/src_libsinglebin_mv_a-mv.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mv_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_mv_a-mv.o `test -f 'src/mv.c' || echo '$(srcdir)/'`src/mv.c
+
+src/src_libsinglebin_mv_a-mv.obj: src/mv.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mv_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_mv_a-mv.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_mv_a-mv.Tpo -c -o src/src_libsinglebin_mv_a-mv.obj `if test -f 'src/mv.c'; then $(CYGPATH_W) 'src/mv.c'; else $(CYGPATH_W) '$(srcdir)/src/mv.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_mv_a-mv.Tpo src/$(DEPDIR)/src_libsinglebin_mv_a-mv.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/mv.c' object='src/src_libsinglebin_mv_a-mv.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mv_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_mv_a-mv.obj `if test -f 'src/mv.c'; then $(CYGPATH_W) 'src/mv.c'; else $(CYGPATH_W) '$(srcdir)/src/mv.c'; fi`
+
+src/src_libsinglebin_mv_a-remove.o: src/remove.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mv_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_mv_a-remove.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_mv_a-remove.Tpo -c -o src/src_libsinglebin_mv_a-remove.o `test -f 'src/remove.c' || echo '$(srcdir)/'`src/remove.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_mv_a-remove.Tpo src/$(DEPDIR)/src_libsinglebin_mv_a-remove.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/remove.c' object='src/src_libsinglebin_mv_a-remove.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mv_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_mv_a-remove.o `test -f 'src/remove.c' || echo '$(srcdir)/'`src/remove.c
+
+src/src_libsinglebin_mv_a-remove.obj: src/remove.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mv_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_mv_a-remove.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_mv_a-remove.Tpo -c -o src/src_libsinglebin_mv_a-remove.obj `if test -f 'src/remove.c'; then $(CYGPATH_W) 'src/remove.c'; else $(CYGPATH_W) '$(srcdir)/src/remove.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_mv_a-remove.Tpo src/$(DEPDIR)/src_libsinglebin_mv_a-remove.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/remove.c' object='src/src_libsinglebin_mv_a-remove.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mv_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_mv_a-remove.obj `if test -f 'src/remove.c'; then $(CYGPATH_W) 'src/remove.c'; else $(CYGPATH_W) '$(srcdir)/src/remove.c'; fi`
+
+src/src_libsinglebin_mv_a-copy.o: src/copy.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mv_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_mv_a-copy.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_mv_a-copy.Tpo -c -o src/src_libsinglebin_mv_a-copy.o `test -f 'src/copy.c' || echo '$(srcdir)/'`src/copy.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_mv_a-copy.Tpo src/$(DEPDIR)/src_libsinglebin_mv_a-copy.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/copy.c' object='src/src_libsinglebin_mv_a-copy.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mv_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_mv_a-copy.o `test -f 'src/copy.c' || echo '$(srcdir)/'`src/copy.c
+
+src/src_libsinglebin_mv_a-copy.obj: src/copy.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mv_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_mv_a-copy.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_mv_a-copy.Tpo -c -o src/src_libsinglebin_mv_a-copy.obj `if test -f 'src/copy.c'; then $(CYGPATH_W) 'src/copy.c'; else $(CYGPATH_W) '$(srcdir)/src/copy.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_mv_a-copy.Tpo src/$(DEPDIR)/src_libsinglebin_mv_a-copy.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/copy.c' object='src/src_libsinglebin_mv_a-copy.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mv_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_mv_a-copy.obj `if test -f 'src/copy.c'; then $(CYGPATH_W) 'src/copy.c'; else $(CYGPATH_W) '$(srcdir)/src/copy.c'; fi`
+
+src/src_libsinglebin_mv_a-cp-hash.o: src/cp-hash.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mv_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_mv_a-cp-hash.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_mv_a-cp-hash.Tpo -c -o src/src_libsinglebin_mv_a-cp-hash.o `test -f 'src/cp-hash.c' || echo '$(srcdir)/'`src/cp-hash.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_mv_a-cp-hash.Tpo src/$(DEPDIR)/src_libsinglebin_mv_a-cp-hash.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/cp-hash.c' object='src/src_libsinglebin_mv_a-cp-hash.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mv_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_mv_a-cp-hash.o `test -f 'src/cp-hash.c' || echo '$(srcdir)/'`src/cp-hash.c
+
+src/src_libsinglebin_mv_a-cp-hash.obj: src/cp-hash.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mv_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_mv_a-cp-hash.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_mv_a-cp-hash.Tpo -c -o src/src_libsinglebin_mv_a-cp-hash.obj `if test -f 'src/cp-hash.c'; then $(CYGPATH_W) 'src/cp-hash.c'; else $(CYGPATH_W) '$(srcdir)/src/cp-hash.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_mv_a-cp-hash.Tpo src/$(DEPDIR)/src_libsinglebin_mv_a-cp-hash.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/cp-hash.c' object='src/src_libsinglebin_mv_a-cp-hash.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mv_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_mv_a-cp-hash.obj `if test -f 'src/cp-hash.c'; then $(CYGPATH_W) 'src/cp-hash.c'; else $(CYGPATH_W) '$(srcdir)/src/cp-hash.c'; fi`
+
+src/src_libsinglebin_mv_a-extent-scan.o: src/extent-scan.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mv_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_mv_a-extent-scan.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_mv_a-extent-scan.Tpo -c -o src/src_libsinglebin_mv_a-extent-scan.o `test -f 'src/extent-scan.c' || echo '$(srcdir)/'`src/extent-scan.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_mv_a-extent-scan.Tpo src/$(DEPDIR)/src_libsinglebin_mv_a-extent-scan.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/extent-scan.c' object='src/src_libsinglebin_mv_a-extent-scan.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mv_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_mv_a-extent-scan.o `test -f 'src/extent-scan.c' || echo '$(srcdir)/'`src/extent-scan.c
+
+src/src_libsinglebin_mv_a-extent-scan.obj: src/extent-scan.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mv_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_mv_a-extent-scan.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_mv_a-extent-scan.Tpo -c -o src/src_libsinglebin_mv_a-extent-scan.obj `if test -f 'src/extent-scan.c'; then $(CYGPATH_W) 'src/extent-scan.c'; else $(CYGPATH_W) '$(srcdir)/src/extent-scan.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_mv_a-extent-scan.Tpo src/$(DEPDIR)/src_libsinglebin_mv_a-extent-scan.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/extent-scan.c' object='src/src_libsinglebin_mv_a-extent-scan.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mv_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_mv_a-extent-scan.obj `if test -f 'src/extent-scan.c'; then $(CYGPATH_W) 'src/extent-scan.c'; else $(CYGPATH_W) '$(srcdir)/src/extent-scan.c'; fi`
+
+src/src_libsinglebin_mv_a-selinux.o: src/selinux.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mv_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_mv_a-selinux.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_mv_a-selinux.Tpo -c -o src/src_libsinglebin_mv_a-selinux.o `test -f 'src/selinux.c' || echo '$(srcdir)/'`src/selinux.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_mv_a-selinux.Tpo src/$(DEPDIR)/src_libsinglebin_mv_a-selinux.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/selinux.c' object='src/src_libsinglebin_mv_a-selinux.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mv_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_mv_a-selinux.o `test -f 'src/selinux.c' || echo '$(srcdir)/'`src/selinux.c
+
+src/src_libsinglebin_mv_a-selinux.obj: src/selinux.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mv_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_mv_a-selinux.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_mv_a-selinux.Tpo -c -o src/src_libsinglebin_mv_a-selinux.obj `if test -f 'src/selinux.c'; then $(CYGPATH_W) 'src/selinux.c'; else $(CYGPATH_W) '$(srcdir)/src/selinux.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_mv_a-selinux.Tpo src/$(DEPDIR)/src_libsinglebin_mv_a-selinux.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/selinux.c' object='src/src_libsinglebin_mv_a-selinux.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_mv_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_mv_a-selinux.obj `if test -f 'src/selinux.c'; then $(CYGPATH_W) 'src/selinux.c'; else $(CYGPATH_W) '$(srcdir)/src/selinux.c'; fi`
+
+src/src_libsinglebin_nice_a-nice.o: src/nice.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_nice_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_nice_a-nice.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_nice_a-nice.Tpo -c -o src/src_libsinglebin_nice_a-nice.o `test -f 'src/nice.c' || echo '$(srcdir)/'`src/nice.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_nice_a-nice.Tpo src/$(DEPDIR)/src_libsinglebin_nice_a-nice.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nice.c' object='src/src_libsinglebin_nice_a-nice.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_nice_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_nice_a-nice.o `test -f 'src/nice.c' || echo '$(srcdir)/'`src/nice.c
+
+src/src_libsinglebin_nice_a-nice.obj: src/nice.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_nice_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_nice_a-nice.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_nice_a-nice.Tpo -c -o src/src_libsinglebin_nice_a-nice.obj `if test -f 'src/nice.c'; then $(CYGPATH_W) 'src/nice.c'; else $(CYGPATH_W) '$(srcdir)/src/nice.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_nice_a-nice.Tpo src/$(DEPDIR)/src_libsinglebin_nice_a-nice.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nice.c' object='src/src_libsinglebin_nice_a-nice.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_nice_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_nice_a-nice.obj `if test -f 'src/nice.c'; then $(CYGPATH_W) 'src/nice.c'; else $(CYGPATH_W) '$(srcdir)/src/nice.c'; fi`
+
+src/src_libsinglebin_nl_a-nl.o: src/nl.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_nl_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_nl_a-nl.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_nl_a-nl.Tpo -c -o src/src_libsinglebin_nl_a-nl.o `test -f 'src/nl.c' || echo '$(srcdir)/'`src/nl.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_nl_a-nl.Tpo src/$(DEPDIR)/src_libsinglebin_nl_a-nl.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nl.c' object='src/src_libsinglebin_nl_a-nl.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_nl_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_nl_a-nl.o `test -f 'src/nl.c' || echo '$(srcdir)/'`src/nl.c
+
+src/src_libsinglebin_nl_a-nl.obj: src/nl.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_nl_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_nl_a-nl.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_nl_a-nl.Tpo -c -o src/src_libsinglebin_nl_a-nl.obj `if test -f 'src/nl.c'; then $(CYGPATH_W) 'src/nl.c'; else $(CYGPATH_W) '$(srcdir)/src/nl.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_nl_a-nl.Tpo src/$(DEPDIR)/src_libsinglebin_nl_a-nl.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nl.c' object='src/src_libsinglebin_nl_a-nl.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_nl_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_nl_a-nl.obj `if test -f 'src/nl.c'; then $(CYGPATH_W) 'src/nl.c'; else $(CYGPATH_W) '$(srcdir)/src/nl.c'; fi`
+
+src/src_libsinglebin_nohup_a-nohup.o: src/nohup.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_nohup_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_nohup_a-nohup.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_nohup_a-nohup.Tpo -c -o src/src_libsinglebin_nohup_a-nohup.o `test -f 'src/nohup.c' || echo '$(srcdir)/'`src/nohup.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_nohup_a-nohup.Tpo src/$(DEPDIR)/src_libsinglebin_nohup_a-nohup.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nohup.c' object='src/src_libsinglebin_nohup_a-nohup.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_nohup_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_nohup_a-nohup.o `test -f 'src/nohup.c' || echo '$(srcdir)/'`src/nohup.c
+
+src/src_libsinglebin_nohup_a-nohup.obj: src/nohup.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_nohup_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_nohup_a-nohup.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_nohup_a-nohup.Tpo -c -o src/src_libsinglebin_nohup_a-nohup.obj `if test -f 'src/nohup.c'; then $(CYGPATH_W) 'src/nohup.c'; else $(CYGPATH_W) '$(srcdir)/src/nohup.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_nohup_a-nohup.Tpo src/$(DEPDIR)/src_libsinglebin_nohup_a-nohup.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nohup.c' object='src/src_libsinglebin_nohup_a-nohup.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_nohup_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_nohup_a-nohup.obj `if test -f 'src/nohup.c'; then $(CYGPATH_W) 'src/nohup.c'; else $(CYGPATH_W) '$(srcdir)/src/nohup.c'; fi`
+
+src/src_libsinglebin_nproc_a-nproc.o: src/nproc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_nproc_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_nproc_a-nproc.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_nproc_a-nproc.Tpo -c -o src/src_libsinglebin_nproc_a-nproc.o `test -f 'src/nproc.c' || echo '$(srcdir)/'`src/nproc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_nproc_a-nproc.Tpo src/$(DEPDIR)/src_libsinglebin_nproc_a-nproc.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nproc.c' object='src/src_libsinglebin_nproc_a-nproc.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_nproc_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_nproc_a-nproc.o `test -f 'src/nproc.c' || echo '$(srcdir)/'`src/nproc.c
+
+src/src_libsinglebin_nproc_a-nproc.obj: src/nproc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_nproc_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_nproc_a-nproc.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_nproc_a-nproc.Tpo -c -o src/src_libsinglebin_nproc_a-nproc.obj `if test -f 'src/nproc.c'; then $(CYGPATH_W) 'src/nproc.c'; else $(CYGPATH_W) '$(srcdir)/src/nproc.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_nproc_a-nproc.Tpo src/$(DEPDIR)/src_libsinglebin_nproc_a-nproc.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nproc.c' object='src/src_libsinglebin_nproc_a-nproc.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_nproc_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_nproc_a-nproc.obj `if test -f 'src/nproc.c'; then $(CYGPATH_W) 'src/nproc.c'; else $(CYGPATH_W) '$(srcdir)/src/nproc.c'; fi`
+
+src/src_libsinglebin_numfmt_a-numfmt.o: src/numfmt.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_numfmt_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_numfmt_a-numfmt.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_numfmt_a-numfmt.Tpo -c -o src/src_libsinglebin_numfmt_a-numfmt.o `test -f 'src/numfmt.c' || echo '$(srcdir)/'`src/numfmt.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_numfmt_a-numfmt.Tpo src/$(DEPDIR)/src_libsinglebin_numfmt_a-numfmt.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/numfmt.c' object='src/src_libsinglebin_numfmt_a-numfmt.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_numfmt_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_numfmt_a-numfmt.o `test -f 'src/numfmt.c' || echo '$(srcdir)/'`src/numfmt.c
+
+src/src_libsinglebin_numfmt_a-numfmt.obj: src/numfmt.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_numfmt_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_numfmt_a-numfmt.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_numfmt_a-numfmt.Tpo -c -o src/src_libsinglebin_numfmt_a-numfmt.obj `if test -f 'src/numfmt.c'; then $(CYGPATH_W) 'src/numfmt.c'; else $(CYGPATH_W) '$(srcdir)/src/numfmt.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_numfmt_a-numfmt.Tpo src/$(DEPDIR)/src_libsinglebin_numfmt_a-numfmt.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/numfmt.c' object='src/src_libsinglebin_numfmt_a-numfmt.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_numfmt_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_numfmt_a-numfmt.obj `if test -f 'src/numfmt.c'; then $(CYGPATH_W) 'src/numfmt.c'; else $(CYGPATH_W) '$(srcdir)/src/numfmt.c'; fi`
+
+src/src_libsinglebin_od_a-od.o: src/od.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_od_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_od_a-od.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_od_a-od.Tpo -c -o src/src_libsinglebin_od_a-od.o `test -f 'src/od.c' || echo '$(srcdir)/'`src/od.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_od_a-od.Tpo src/$(DEPDIR)/src_libsinglebin_od_a-od.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/od.c' object='src/src_libsinglebin_od_a-od.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_od_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_od_a-od.o `test -f 'src/od.c' || echo '$(srcdir)/'`src/od.c
+
+src/src_libsinglebin_od_a-od.obj: src/od.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_od_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_od_a-od.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_od_a-od.Tpo -c -o src/src_libsinglebin_od_a-od.obj `if test -f 'src/od.c'; then $(CYGPATH_W) 'src/od.c'; else $(CYGPATH_W) '$(srcdir)/src/od.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_od_a-od.Tpo src/$(DEPDIR)/src_libsinglebin_od_a-od.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/od.c' object='src/src_libsinglebin_od_a-od.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_od_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_od_a-od.obj `if test -f 'src/od.c'; then $(CYGPATH_W) 'src/od.c'; else $(CYGPATH_W) '$(srcdir)/src/od.c'; fi`
+
+src/src_libsinglebin_paste_a-paste.o: src/paste.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_paste_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_paste_a-paste.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_paste_a-paste.Tpo -c -o src/src_libsinglebin_paste_a-paste.o `test -f 'src/paste.c' || echo '$(srcdir)/'`src/paste.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_paste_a-paste.Tpo src/$(DEPDIR)/src_libsinglebin_paste_a-paste.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/paste.c' object='src/src_libsinglebin_paste_a-paste.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_paste_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_paste_a-paste.o `test -f 'src/paste.c' || echo '$(srcdir)/'`src/paste.c
+
+src/src_libsinglebin_paste_a-paste.obj: src/paste.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_paste_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_paste_a-paste.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_paste_a-paste.Tpo -c -o src/src_libsinglebin_paste_a-paste.obj `if test -f 'src/paste.c'; then $(CYGPATH_W) 'src/paste.c'; else $(CYGPATH_W) '$(srcdir)/src/paste.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_paste_a-paste.Tpo src/$(DEPDIR)/src_libsinglebin_paste_a-paste.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/paste.c' object='src/src_libsinglebin_paste_a-paste.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_paste_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_paste_a-paste.obj `if test -f 'src/paste.c'; then $(CYGPATH_W) 'src/paste.c'; else $(CYGPATH_W) '$(srcdir)/src/paste.c'; fi`
+
+src/src_libsinglebin_pathchk_a-pathchk.o: src/pathchk.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_pathchk_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_pathchk_a-pathchk.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_pathchk_a-pathchk.Tpo -c -o src/src_libsinglebin_pathchk_a-pathchk.o `test -f 'src/pathchk.c' || echo '$(srcdir)/'`src/pathchk.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_pathchk_a-pathchk.Tpo src/$(DEPDIR)/src_libsinglebin_pathchk_a-pathchk.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/pathchk.c' object='src/src_libsinglebin_pathchk_a-pathchk.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_pathchk_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_pathchk_a-pathchk.o `test -f 'src/pathchk.c' || echo '$(srcdir)/'`src/pathchk.c
+
+src/src_libsinglebin_pathchk_a-pathchk.obj: src/pathchk.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_pathchk_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_pathchk_a-pathchk.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_pathchk_a-pathchk.Tpo -c -o src/src_libsinglebin_pathchk_a-pathchk.obj `if test -f 'src/pathchk.c'; then $(CYGPATH_W) 'src/pathchk.c'; else $(CYGPATH_W) '$(srcdir)/src/pathchk.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_pathchk_a-pathchk.Tpo src/$(DEPDIR)/src_libsinglebin_pathchk_a-pathchk.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/pathchk.c' object='src/src_libsinglebin_pathchk_a-pathchk.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_pathchk_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_pathchk_a-pathchk.obj `if test -f 'src/pathchk.c'; then $(CYGPATH_W) 'src/pathchk.c'; else $(CYGPATH_W) '$(srcdir)/src/pathchk.c'; fi`
+
+src/src_libsinglebin_pinky_a-pinky.o: src/pinky.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_pinky_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_pinky_a-pinky.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_pinky_a-pinky.Tpo -c -o src/src_libsinglebin_pinky_a-pinky.o `test -f 'src/pinky.c' || echo '$(srcdir)/'`src/pinky.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_pinky_a-pinky.Tpo src/$(DEPDIR)/src_libsinglebin_pinky_a-pinky.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/pinky.c' object='src/src_libsinglebin_pinky_a-pinky.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_pinky_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_pinky_a-pinky.o `test -f 'src/pinky.c' || echo '$(srcdir)/'`src/pinky.c
+
+src/src_libsinglebin_pinky_a-pinky.obj: src/pinky.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_pinky_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_pinky_a-pinky.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_pinky_a-pinky.Tpo -c -o src/src_libsinglebin_pinky_a-pinky.obj `if test -f 'src/pinky.c'; then $(CYGPATH_W) 'src/pinky.c'; else $(CYGPATH_W) '$(srcdir)/src/pinky.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_pinky_a-pinky.Tpo src/$(DEPDIR)/src_libsinglebin_pinky_a-pinky.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/pinky.c' object='src/src_libsinglebin_pinky_a-pinky.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_pinky_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_pinky_a-pinky.obj `if test -f 'src/pinky.c'; then $(CYGPATH_W) 'src/pinky.c'; else $(CYGPATH_W) '$(srcdir)/src/pinky.c'; fi`
+
+src/src_libsinglebin_pr_a-pr.o: src/pr.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_pr_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_pr_a-pr.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_pr_a-pr.Tpo -c -o src/src_libsinglebin_pr_a-pr.o `test -f 'src/pr.c' || echo '$(srcdir)/'`src/pr.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_pr_a-pr.Tpo src/$(DEPDIR)/src_libsinglebin_pr_a-pr.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/pr.c' object='src/src_libsinglebin_pr_a-pr.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_pr_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_pr_a-pr.o `test -f 'src/pr.c' || echo '$(srcdir)/'`src/pr.c
+
+src/src_libsinglebin_pr_a-pr.obj: src/pr.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_pr_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_pr_a-pr.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_pr_a-pr.Tpo -c -o src/src_libsinglebin_pr_a-pr.obj `if test -f 'src/pr.c'; then $(CYGPATH_W) 'src/pr.c'; else $(CYGPATH_W) '$(srcdir)/src/pr.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_pr_a-pr.Tpo src/$(DEPDIR)/src_libsinglebin_pr_a-pr.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/pr.c' object='src/src_libsinglebin_pr_a-pr.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_pr_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_pr_a-pr.obj `if test -f 'src/pr.c'; then $(CYGPATH_W) 'src/pr.c'; else $(CYGPATH_W) '$(srcdir)/src/pr.c'; fi`
+
+src/src_libsinglebin_printenv_a-printenv.o: src/printenv.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_printenv_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_printenv_a-printenv.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_printenv_a-printenv.Tpo -c -o src/src_libsinglebin_printenv_a-printenv.o `test -f 'src/printenv.c' || echo '$(srcdir)/'`src/printenv.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_printenv_a-printenv.Tpo src/$(DEPDIR)/src_libsinglebin_printenv_a-printenv.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/printenv.c' object='src/src_libsinglebin_printenv_a-printenv.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_printenv_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_printenv_a-printenv.o `test -f 'src/printenv.c' || echo '$(srcdir)/'`src/printenv.c
+
+src/src_libsinglebin_printenv_a-printenv.obj: src/printenv.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_printenv_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_printenv_a-printenv.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_printenv_a-printenv.Tpo -c -o src/src_libsinglebin_printenv_a-printenv.obj `if test -f 'src/printenv.c'; then $(CYGPATH_W) 'src/printenv.c'; else $(CYGPATH_W) '$(srcdir)/src/printenv.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_printenv_a-printenv.Tpo src/$(DEPDIR)/src_libsinglebin_printenv_a-printenv.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/printenv.c' object='src/src_libsinglebin_printenv_a-printenv.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_printenv_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_printenv_a-printenv.obj `if test -f 'src/printenv.c'; then $(CYGPATH_W) 'src/printenv.c'; else $(CYGPATH_W) '$(srcdir)/src/printenv.c'; fi`
+
+src/src_libsinglebin_printf_a-printf.o: src/printf.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_printf_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_printf_a-printf.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_printf_a-printf.Tpo -c -o src/src_libsinglebin_printf_a-printf.o `test -f 'src/printf.c' || echo '$(srcdir)/'`src/printf.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_printf_a-printf.Tpo src/$(DEPDIR)/src_libsinglebin_printf_a-printf.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/printf.c' object='src/src_libsinglebin_printf_a-printf.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_printf_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_printf_a-printf.o `test -f 'src/printf.c' || echo '$(srcdir)/'`src/printf.c
+
+src/src_libsinglebin_printf_a-printf.obj: src/printf.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_printf_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_printf_a-printf.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_printf_a-printf.Tpo -c -o src/src_libsinglebin_printf_a-printf.obj `if test -f 'src/printf.c'; then $(CYGPATH_W) 'src/printf.c'; else $(CYGPATH_W) '$(srcdir)/src/printf.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_printf_a-printf.Tpo src/$(DEPDIR)/src_libsinglebin_printf_a-printf.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/printf.c' object='src/src_libsinglebin_printf_a-printf.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_printf_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_printf_a-printf.obj `if test -f 'src/printf.c'; then $(CYGPATH_W) 'src/printf.c'; else $(CYGPATH_W) '$(srcdir)/src/printf.c'; fi`
+
+src/src_libsinglebin_ptx_a-ptx.o: src/ptx.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ptx_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_ptx_a-ptx.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_ptx_a-ptx.Tpo -c -o src/src_libsinglebin_ptx_a-ptx.o `test -f 'src/ptx.c' || echo '$(srcdir)/'`src/ptx.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_ptx_a-ptx.Tpo src/$(DEPDIR)/src_libsinglebin_ptx_a-ptx.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/ptx.c' object='src/src_libsinglebin_ptx_a-ptx.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ptx_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_ptx_a-ptx.o `test -f 'src/ptx.c' || echo '$(srcdir)/'`src/ptx.c
+
+src/src_libsinglebin_ptx_a-ptx.obj: src/ptx.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ptx_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_ptx_a-ptx.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_ptx_a-ptx.Tpo -c -o src/src_libsinglebin_ptx_a-ptx.obj `if test -f 'src/ptx.c'; then $(CYGPATH_W) 'src/ptx.c'; else $(CYGPATH_W) '$(srcdir)/src/ptx.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_ptx_a-ptx.Tpo src/$(DEPDIR)/src_libsinglebin_ptx_a-ptx.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/ptx.c' object='src/src_libsinglebin_ptx_a-ptx.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_ptx_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_ptx_a-ptx.obj `if test -f 'src/ptx.c'; then $(CYGPATH_W) 'src/ptx.c'; else $(CYGPATH_W) '$(srcdir)/src/ptx.c'; fi`
+
+src/src_libsinglebin_pwd_a-pwd.o: src/pwd.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_pwd_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_pwd_a-pwd.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_pwd_a-pwd.Tpo -c -o src/src_libsinglebin_pwd_a-pwd.o `test -f 'src/pwd.c' || echo '$(srcdir)/'`src/pwd.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_pwd_a-pwd.Tpo src/$(DEPDIR)/src_libsinglebin_pwd_a-pwd.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/pwd.c' object='src/src_libsinglebin_pwd_a-pwd.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_pwd_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_pwd_a-pwd.o `test -f 'src/pwd.c' || echo '$(srcdir)/'`src/pwd.c
+
+src/src_libsinglebin_pwd_a-pwd.obj: src/pwd.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_pwd_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_pwd_a-pwd.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_pwd_a-pwd.Tpo -c -o src/src_libsinglebin_pwd_a-pwd.obj `if test -f 'src/pwd.c'; then $(CYGPATH_W) 'src/pwd.c'; else $(CYGPATH_W) '$(srcdir)/src/pwd.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_pwd_a-pwd.Tpo src/$(DEPDIR)/src_libsinglebin_pwd_a-pwd.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/pwd.c' object='src/src_libsinglebin_pwd_a-pwd.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_pwd_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_pwd_a-pwd.obj `if test -f 'src/pwd.c'; then $(CYGPATH_W) 'src/pwd.c'; else $(CYGPATH_W) '$(srcdir)/src/pwd.c'; fi`
+
+src/src_libsinglebin_readlink_a-readlink.o: src/readlink.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_readlink_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_readlink_a-readlink.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_readlink_a-readlink.Tpo -c -o src/src_libsinglebin_readlink_a-readlink.o `test -f 'src/readlink.c' || echo '$(srcdir)/'`src/readlink.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_readlink_a-readlink.Tpo src/$(DEPDIR)/src_libsinglebin_readlink_a-readlink.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/readlink.c' object='src/src_libsinglebin_readlink_a-readlink.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_readlink_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_readlink_a-readlink.o `test -f 'src/readlink.c' || echo '$(srcdir)/'`src/readlink.c
+
+src/src_libsinglebin_readlink_a-readlink.obj: src/readlink.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_readlink_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_readlink_a-readlink.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_readlink_a-readlink.Tpo -c -o src/src_libsinglebin_readlink_a-readlink.obj `if test -f 'src/readlink.c'; then $(CYGPATH_W) 'src/readlink.c'; else $(CYGPATH_W) '$(srcdir)/src/readlink.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_readlink_a-readlink.Tpo src/$(DEPDIR)/src_libsinglebin_readlink_a-readlink.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/readlink.c' object='src/src_libsinglebin_readlink_a-readlink.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_readlink_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_readlink_a-readlink.obj `if test -f 'src/readlink.c'; then $(CYGPATH_W) 'src/readlink.c'; else $(CYGPATH_W) '$(srcdir)/src/readlink.c'; fi`
+
+src/src_libsinglebin_realpath_a-realpath.o: src/realpath.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_realpath_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_realpath_a-realpath.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_realpath_a-realpath.Tpo -c -o src/src_libsinglebin_realpath_a-realpath.o `test -f 'src/realpath.c' || echo '$(srcdir)/'`src/realpath.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_realpath_a-realpath.Tpo src/$(DEPDIR)/src_libsinglebin_realpath_a-realpath.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/realpath.c' object='src/src_libsinglebin_realpath_a-realpath.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_realpath_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_realpath_a-realpath.o `test -f 'src/realpath.c' || echo '$(srcdir)/'`src/realpath.c
+
+src/src_libsinglebin_realpath_a-realpath.obj: src/realpath.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_realpath_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_realpath_a-realpath.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_realpath_a-realpath.Tpo -c -o src/src_libsinglebin_realpath_a-realpath.obj `if test -f 'src/realpath.c'; then $(CYGPATH_W) 'src/realpath.c'; else $(CYGPATH_W) '$(srcdir)/src/realpath.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_realpath_a-realpath.Tpo src/$(DEPDIR)/src_libsinglebin_realpath_a-realpath.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/realpath.c' object='src/src_libsinglebin_realpath_a-realpath.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_realpath_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_realpath_a-realpath.obj `if test -f 'src/realpath.c'; then $(CYGPATH_W) 'src/realpath.c'; else $(CYGPATH_W) '$(srcdir)/src/realpath.c'; fi`
+
+src/src_libsinglebin_realpath_a-relpath.o: src/relpath.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_realpath_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_realpath_a-relpath.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_realpath_a-relpath.Tpo -c -o src/src_libsinglebin_realpath_a-relpath.o `test -f 'src/relpath.c' || echo '$(srcdir)/'`src/relpath.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_realpath_a-relpath.Tpo src/$(DEPDIR)/src_libsinglebin_realpath_a-relpath.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/relpath.c' object='src/src_libsinglebin_realpath_a-relpath.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_realpath_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_realpath_a-relpath.o `test -f 'src/relpath.c' || echo '$(srcdir)/'`src/relpath.c
+
+src/src_libsinglebin_realpath_a-relpath.obj: src/relpath.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_realpath_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_realpath_a-relpath.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_realpath_a-relpath.Tpo -c -o src/src_libsinglebin_realpath_a-relpath.obj `if test -f 'src/relpath.c'; then $(CYGPATH_W) 'src/relpath.c'; else $(CYGPATH_W) '$(srcdir)/src/relpath.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_realpath_a-relpath.Tpo src/$(DEPDIR)/src_libsinglebin_realpath_a-relpath.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/relpath.c' object='src/src_libsinglebin_realpath_a-relpath.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_realpath_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_realpath_a-relpath.obj `if test -f 'src/relpath.c'; then $(CYGPATH_W) 'src/relpath.c'; else $(CYGPATH_W) '$(srcdir)/src/relpath.c'; fi`
+
+src/src_libsinglebin_rm_a-rm.o: src/rm.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_rm_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_rm_a-rm.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_rm_a-rm.Tpo -c -o src/src_libsinglebin_rm_a-rm.o `test -f 'src/rm.c' || echo '$(srcdir)/'`src/rm.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_rm_a-rm.Tpo src/$(DEPDIR)/src_libsinglebin_rm_a-rm.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/rm.c' object='src/src_libsinglebin_rm_a-rm.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_rm_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_rm_a-rm.o `test -f 'src/rm.c' || echo '$(srcdir)/'`src/rm.c
+
+src/src_libsinglebin_rm_a-rm.obj: src/rm.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_rm_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_rm_a-rm.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_rm_a-rm.Tpo -c -o src/src_libsinglebin_rm_a-rm.obj `if test -f 'src/rm.c'; then $(CYGPATH_W) 'src/rm.c'; else $(CYGPATH_W) '$(srcdir)/src/rm.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_rm_a-rm.Tpo src/$(DEPDIR)/src_libsinglebin_rm_a-rm.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/rm.c' object='src/src_libsinglebin_rm_a-rm.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_rm_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_rm_a-rm.obj `if test -f 'src/rm.c'; then $(CYGPATH_W) 'src/rm.c'; else $(CYGPATH_W) '$(srcdir)/src/rm.c'; fi`
+
+src/src_libsinglebin_rm_a-remove.o: src/remove.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_rm_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_rm_a-remove.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_rm_a-remove.Tpo -c -o src/src_libsinglebin_rm_a-remove.o `test -f 'src/remove.c' || echo '$(srcdir)/'`src/remove.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_rm_a-remove.Tpo src/$(DEPDIR)/src_libsinglebin_rm_a-remove.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/remove.c' object='src/src_libsinglebin_rm_a-remove.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_rm_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_rm_a-remove.o `test -f 'src/remove.c' || echo '$(srcdir)/'`src/remove.c
+
+src/src_libsinglebin_rm_a-remove.obj: src/remove.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_rm_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_rm_a-remove.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_rm_a-remove.Tpo -c -o src/src_libsinglebin_rm_a-remove.obj `if test -f 'src/remove.c'; then $(CYGPATH_W) 'src/remove.c'; else $(CYGPATH_W) '$(srcdir)/src/remove.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_rm_a-remove.Tpo src/$(DEPDIR)/src_libsinglebin_rm_a-remove.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/remove.c' object='src/src_libsinglebin_rm_a-remove.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_rm_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_rm_a-remove.obj `if test -f 'src/remove.c'; then $(CYGPATH_W) 'src/remove.c'; else $(CYGPATH_W) '$(srcdir)/src/remove.c'; fi`
+
+src/src_libsinglebin_rmdir_a-rmdir.o: src/rmdir.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_rmdir_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_rmdir_a-rmdir.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_rmdir_a-rmdir.Tpo -c -o src/src_libsinglebin_rmdir_a-rmdir.o `test -f 'src/rmdir.c' || echo '$(srcdir)/'`src/rmdir.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_rmdir_a-rmdir.Tpo src/$(DEPDIR)/src_libsinglebin_rmdir_a-rmdir.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/rmdir.c' object='src/src_libsinglebin_rmdir_a-rmdir.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_rmdir_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_rmdir_a-rmdir.o `test -f 'src/rmdir.c' || echo '$(srcdir)/'`src/rmdir.c
+
+src/src_libsinglebin_rmdir_a-rmdir.obj: src/rmdir.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_rmdir_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_rmdir_a-rmdir.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_rmdir_a-rmdir.Tpo -c -o src/src_libsinglebin_rmdir_a-rmdir.obj `if test -f 'src/rmdir.c'; then $(CYGPATH_W) 'src/rmdir.c'; else $(CYGPATH_W) '$(srcdir)/src/rmdir.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_rmdir_a-rmdir.Tpo src/$(DEPDIR)/src_libsinglebin_rmdir_a-rmdir.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/rmdir.c' object='src/src_libsinglebin_rmdir_a-rmdir.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_rmdir_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_rmdir_a-rmdir.obj `if test -f 'src/rmdir.c'; then $(CYGPATH_W) 'src/rmdir.c'; else $(CYGPATH_W) '$(srcdir)/src/rmdir.c'; fi`
+
+src/src_libsinglebin_rmdir_a-prog-fprintf.o: src/prog-fprintf.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_rmdir_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_rmdir_a-prog-fprintf.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_rmdir_a-prog-fprintf.Tpo -c -o src/src_libsinglebin_rmdir_a-prog-fprintf.o `test -f 'src/prog-fprintf.c' || echo '$(srcdir)/'`src/prog-fprintf.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_rmdir_a-prog-fprintf.Tpo src/$(DEPDIR)/src_libsinglebin_rmdir_a-prog-fprintf.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/prog-fprintf.c' object='src/src_libsinglebin_rmdir_a-prog-fprintf.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_rmdir_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_rmdir_a-prog-fprintf.o `test -f 'src/prog-fprintf.c' || echo '$(srcdir)/'`src/prog-fprintf.c
+
+src/src_libsinglebin_rmdir_a-prog-fprintf.obj: src/prog-fprintf.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_rmdir_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_rmdir_a-prog-fprintf.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_rmdir_a-prog-fprintf.Tpo -c -o src/src_libsinglebin_rmdir_a-prog-fprintf.obj `if test -f 'src/prog-fprintf.c'; then $(CYGPATH_W) 'src/prog-fprintf.c'; else $(CYGPATH_W) '$(srcdir)/src/prog-fprintf.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_rmdir_a-prog-fprintf.Tpo src/$(DEPDIR)/src_libsinglebin_rmdir_a-prog-fprintf.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/prog-fprintf.c' object='src/src_libsinglebin_rmdir_a-prog-fprintf.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_rmdir_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_rmdir_a-prog-fprintf.obj `if test -f 'src/prog-fprintf.c'; then $(CYGPATH_W) 'src/prog-fprintf.c'; else $(CYGPATH_W) '$(srcdir)/src/prog-fprintf.c'; fi`
+
+src/src_libsinglebin_runcon_a-runcon.o: src/runcon.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_runcon_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_runcon_a-runcon.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_runcon_a-runcon.Tpo -c -o src/src_libsinglebin_runcon_a-runcon.o `test -f 'src/runcon.c' || echo '$(srcdir)/'`src/runcon.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_runcon_a-runcon.Tpo src/$(DEPDIR)/src_libsinglebin_runcon_a-runcon.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/runcon.c' object='src/src_libsinglebin_runcon_a-runcon.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_runcon_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_runcon_a-runcon.o `test -f 'src/runcon.c' || echo '$(srcdir)/'`src/runcon.c
+
+src/src_libsinglebin_runcon_a-runcon.obj: src/runcon.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_runcon_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_runcon_a-runcon.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_runcon_a-runcon.Tpo -c -o src/src_libsinglebin_runcon_a-runcon.obj `if test -f 'src/runcon.c'; then $(CYGPATH_W) 'src/runcon.c'; else $(CYGPATH_W) '$(srcdir)/src/runcon.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_runcon_a-runcon.Tpo src/$(DEPDIR)/src_libsinglebin_runcon_a-runcon.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/runcon.c' object='src/src_libsinglebin_runcon_a-runcon.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_runcon_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_runcon_a-runcon.obj `if test -f 'src/runcon.c'; then $(CYGPATH_W) 'src/runcon.c'; else $(CYGPATH_W) '$(srcdir)/src/runcon.c'; fi`
+
+src/src_libsinglebin_seq_a-seq.o: src/seq.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_seq_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_seq_a-seq.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_seq_a-seq.Tpo -c -o src/src_libsinglebin_seq_a-seq.o `test -f 'src/seq.c' || echo '$(srcdir)/'`src/seq.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_seq_a-seq.Tpo src/$(DEPDIR)/src_libsinglebin_seq_a-seq.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/seq.c' object='src/src_libsinglebin_seq_a-seq.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_seq_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_seq_a-seq.o `test -f 'src/seq.c' || echo '$(srcdir)/'`src/seq.c
+
+src/src_libsinglebin_seq_a-seq.obj: src/seq.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_seq_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_seq_a-seq.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_seq_a-seq.Tpo -c -o src/src_libsinglebin_seq_a-seq.obj `if test -f 'src/seq.c'; then $(CYGPATH_W) 'src/seq.c'; else $(CYGPATH_W) '$(srcdir)/src/seq.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_seq_a-seq.Tpo src/$(DEPDIR)/src_libsinglebin_seq_a-seq.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/seq.c' object='src/src_libsinglebin_seq_a-seq.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_seq_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_seq_a-seq.obj `if test -f 'src/seq.c'; then $(CYGPATH_W) 'src/seq.c'; else $(CYGPATH_W) '$(srcdir)/src/seq.c'; fi`
+
+src/src_libsinglebin_sha1sum_a-md5sum.o: src/md5sum.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_sha1sum_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_sha1sum_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_sha1sum_a-md5sum.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_sha1sum_a-md5sum.Tpo -c -o src/src_libsinglebin_sha1sum_a-md5sum.o `test -f 'src/md5sum.c' || echo '$(srcdir)/'`src/md5sum.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_sha1sum_a-md5sum.Tpo src/$(DEPDIR)/src_libsinglebin_sha1sum_a-md5sum.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/md5sum.c' object='src/src_libsinglebin_sha1sum_a-md5sum.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_sha1sum_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_sha1sum_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_sha1sum_a-md5sum.o `test -f 'src/md5sum.c' || echo '$(srcdir)/'`src/md5sum.c
+
+src/src_libsinglebin_sha1sum_a-md5sum.obj: src/md5sum.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_sha1sum_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_sha1sum_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_sha1sum_a-md5sum.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_sha1sum_a-md5sum.Tpo -c -o src/src_libsinglebin_sha1sum_a-md5sum.obj `if test -f 'src/md5sum.c'; then $(CYGPATH_W) 'src/md5sum.c'; else $(CYGPATH_W) '$(srcdir)/src/md5sum.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_sha1sum_a-md5sum.Tpo src/$(DEPDIR)/src_libsinglebin_sha1sum_a-md5sum.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/md5sum.c' object='src/src_libsinglebin_sha1sum_a-md5sum.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_sha1sum_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_sha1sum_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_sha1sum_a-md5sum.obj `if test -f 'src/md5sum.c'; then $(CYGPATH_W) 'src/md5sum.c'; else $(CYGPATH_W) '$(srcdir)/src/md5sum.c'; fi`
+
+src/src_libsinglebin_sha224sum_a-md5sum.o: src/md5sum.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_sha224sum_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_sha224sum_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_sha224sum_a-md5sum.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_sha224sum_a-md5sum.Tpo -c -o src/src_libsinglebin_sha224sum_a-md5sum.o `test -f 'src/md5sum.c' || echo '$(srcdir)/'`src/md5sum.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_sha224sum_a-md5sum.Tpo src/$(DEPDIR)/src_libsinglebin_sha224sum_a-md5sum.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/md5sum.c' object='src/src_libsinglebin_sha224sum_a-md5sum.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_sha224sum_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_sha224sum_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_sha224sum_a-md5sum.o `test -f 'src/md5sum.c' || echo '$(srcdir)/'`src/md5sum.c
+
+src/src_libsinglebin_sha224sum_a-md5sum.obj: src/md5sum.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_sha224sum_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_sha224sum_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_sha224sum_a-md5sum.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_sha224sum_a-md5sum.Tpo -c -o src/src_libsinglebin_sha224sum_a-md5sum.obj `if test -f 'src/md5sum.c'; then $(CYGPATH_W) 'src/md5sum.c'; else $(CYGPATH_W) '$(srcdir)/src/md5sum.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_sha224sum_a-md5sum.Tpo src/$(DEPDIR)/src_libsinglebin_sha224sum_a-md5sum.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/md5sum.c' object='src/src_libsinglebin_sha224sum_a-md5sum.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_sha224sum_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_sha224sum_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_sha224sum_a-md5sum.obj `if test -f 'src/md5sum.c'; then $(CYGPATH_W) 'src/md5sum.c'; else $(CYGPATH_W) '$(srcdir)/src/md5sum.c'; fi`
+
+src/src_libsinglebin_sha256sum_a-md5sum.o: src/md5sum.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_sha256sum_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_sha256sum_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_sha256sum_a-md5sum.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_sha256sum_a-md5sum.Tpo -c -o src/src_libsinglebin_sha256sum_a-md5sum.o `test -f 'src/md5sum.c' || echo '$(srcdir)/'`src/md5sum.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_sha256sum_a-md5sum.Tpo src/$(DEPDIR)/src_libsinglebin_sha256sum_a-md5sum.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/md5sum.c' object='src/src_libsinglebin_sha256sum_a-md5sum.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_sha256sum_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_sha256sum_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_sha256sum_a-md5sum.o `test -f 'src/md5sum.c' || echo '$(srcdir)/'`src/md5sum.c
+
+src/src_libsinglebin_sha256sum_a-md5sum.obj: src/md5sum.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_sha256sum_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_sha256sum_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_sha256sum_a-md5sum.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_sha256sum_a-md5sum.Tpo -c -o src/src_libsinglebin_sha256sum_a-md5sum.obj `if test -f 'src/md5sum.c'; then $(CYGPATH_W) 'src/md5sum.c'; else $(CYGPATH_W) '$(srcdir)/src/md5sum.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_sha256sum_a-md5sum.Tpo src/$(DEPDIR)/src_libsinglebin_sha256sum_a-md5sum.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/md5sum.c' object='src/src_libsinglebin_sha256sum_a-md5sum.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_sha256sum_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_sha256sum_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_sha256sum_a-md5sum.obj `if test -f 'src/md5sum.c'; then $(CYGPATH_W) 'src/md5sum.c'; else $(CYGPATH_W) '$(srcdir)/src/md5sum.c'; fi`
+
+src/src_libsinglebin_sha384sum_a-md5sum.o: src/md5sum.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_sha384sum_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_sha384sum_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_sha384sum_a-md5sum.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_sha384sum_a-md5sum.Tpo -c -o src/src_libsinglebin_sha384sum_a-md5sum.o `test -f 'src/md5sum.c' || echo '$(srcdir)/'`src/md5sum.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_sha384sum_a-md5sum.Tpo src/$(DEPDIR)/src_libsinglebin_sha384sum_a-md5sum.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/md5sum.c' object='src/src_libsinglebin_sha384sum_a-md5sum.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_sha384sum_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_sha384sum_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_sha384sum_a-md5sum.o `test -f 'src/md5sum.c' || echo '$(srcdir)/'`src/md5sum.c
+
+src/src_libsinglebin_sha384sum_a-md5sum.obj: src/md5sum.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_sha384sum_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_sha384sum_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_sha384sum_a-md5sum.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_sha384sum_a-md5sum.Tpo -c -o src/src_libsinglebin_sha384sum_a-md5sum.obj `if test -f 'src/md5sum.c'; then $(CYGPATH_W) 'src/md5sum.c'; else $(CYGPATH_W) '$(srcdir)/src/md5sum.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_sha384sum_a-md5sum.Tpo src/$(DEPDIR)/src_libsinglebin_sha384sum_a-md5sum.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/md5sum.c' object='src/src_libsinglebin_sha384sum_a-md5sum.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_sha384sum_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_sha384sum_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_sha384sum_a-md5sum.obj `if test -f 'src/md5sum.c'; then $(CYGPATH_W) 'src/md5sum.c'; else $(CYGPATH_W) '$(srcdir)/src/md5sum.c'; fi`
+
+src/src_libsinglebin_sha512sum_a-md5sum.o: src/md5sum.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_sha512sum_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_sha512sum_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_sha512sum_a-md5sum.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_sha512sum_a-md5sum.Tpo -c -o src/src_libsinglebin_sha512sum_a-md5sum.o `test -f 'src/md5sum.c' || echo '$(srcdir)/'`src/md5sum.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_sha512sum_a-md5sum.Tpo src/$(DEPDIR)/src_libsinglebin_sha512sum_a-md5sum.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/md5sum.c' object='src/src_libsinglebin_sha512sum_a-md5sum.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_sha512sum_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_sha512sum_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_sha512sum_a-md5sum.o `test -f 'src/md5sum.c' || echo '$(srcdir)/'`src/md5sum.c
+
+src/src_libsinglebin_sha512sum_a-md5sum.obj: src/md5sum.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_sha512sum_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_sha512sum_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_sha512sum_a-md5sum.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_sha512sum_a-md5sum.Tpo -c -o src/src_libsinglebin_sha512sum_a-md5sum.obj `if test -f 'src/md5sum.c'; then $(CYGPATH_W) 'src/md5sum.c'; else $(CYGPATH_W) '$(srcdir)/src/md5sum.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_sha512sum_a-md5sum.Tpo src/$(DEPDIR)/src_libsinglebin_sha512sum_a-md5sum.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/md5sum.c' object='src/src_libsinglebin_sha512sum_a-md5sum.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsinglebin_sha512sum_a_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_sha512sum_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_sha512sum_a-md5sum.obj `if test -f 'src/md5sum.c'; then $(CYGPATH_W) 'src/md5sum.c'; else $(CYGPATH_W) '$(srcdir)/src/md5sum.c'; fi`
+
+src/src_libsinglebin_shred_a-shred.o: src/shred.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_shred_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_shred_a-shred.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_shred_a-shred.Tpo -c -o src/src_libsinglebin_shred_a-shred.o `test -f 'src/shred.c' || echo '$(srcdir)/'`src/shred.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_shred_a-shred.Tpo src/$(DEPDIR)/src_libsinglebin_shred_a-shred.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/shred.c' object='src/src_libsinglebin_shred_a-shred.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_shred_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_shred_a-shred.o `test -f 'src/shred.c' || echo '$(srcdir)/'`src/shred.c
+
+src/src_libsinglebin_shred_a-shred.obj: src/shred.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_shred_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_shred_a-shred.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_shred_a-shred.Tpo -c -o src/src_libsinglebin_shred_a-shred.obj `if test -f 'src/shred.c'; then $(CYGPATH_W) 'src/shred.c'; else $(CYGPATH_W) '$(srcdir)/src/shred.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_shred_a-shred.Tpo src/$(DEPDIR)/src_libsinglebin_shred_a-shred.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/shred.c' object='src/src_libsinglebin_shred_a-shred.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_shred_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_shred_a-shred.obj `if test -f 'src/shred.c'; then $(CYGPATH_W) 'src/shred.c'; else $(CYGPATH_W) '$(srcdir)/src/shred.c'; fi`
+
+src/src_libsinglebin_shuf_a-shuf.o: src/shuf.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_shuf_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_shuf_a-shuf.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_shuf_a-shuf.Tpo -c -o src/src_libsinglebin_shuf_a-shuf.o `test -f 'src/shuf.c' || echo '$(srcdir)/'`src/shuf.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_shuf_a-shuf.Tpo src/$(DEPDIR)/src_libsinglebin_shuf_a-shuf.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/shuf.c' object='src/src_libsinglebin_shuf_a-shuf.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_shuf_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_shuf_a-shuf.o `test -f 'src/shuf.c' || echo '$(srcdir)/'`src/shuf.c
+
+src/src_libsinglebin_shuf_a-shuf.obj: src/shuf.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_shuf_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_shuf_a-shuf.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_shuf_a-shuf.Tpo -c -o src/src_libsinglebin_shuf_a-shuf.obj `if test -f 'src/shuf.c'; then $(CYGPATH_W) 'src/shuf.c'; else $(CYGPATH_W) '$(srcdir)/src/shuf.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_shuf_a-shuf.Tpo src/$(DEPDIR)/src_libsinglebin_shuf_a-shuf.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/shuf.c' object='src/src_libsinglebin_shuf_a-shuf.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_shuf_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_shuf_a-shuf.obj `if test -f 'src/shuf.c'; then $(CYGPATH_W) 'src/shuf.c'; else $(CYGPATH_W) '$(srcdir)/src/shuf.c'; fi`
+
+src/src_libsinglebin_sleep_a-sleep.o: src/sleep.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_sleep_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_sleep_a-sleep.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_sleep_a-sleep.Tpo -c -o src/src_libsinglebin_sleep_a-sleep.o `test -f 'src/sleep.c' || echo '$(srcdir)/'`src/sleep.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_sleep_a-sleep.Tpo src/$(DEPDIR)/src_libsinglebin_sleep_a-sleep.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/sleep.c' object='src/src_libsinglebin_sleep_a-sleep.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_sleep_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_sleep_a-sleep.o `test -f 'src/sleep.c' || echo '$(srcdir)/'`src/sleep.c
+
+src/src_libsinglebin_sleep_a-sleep.obj: src/sleep.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_sleep_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_sleep_a-sleep.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_sleep_a-sleep.Tpo -c -o src/src_libsinglebin_sleep_a-sleep.obj `if test -f 'src/sleep.c'; then $(CYGPATH_W) 'src/sleep.c'; else $(CYGPATH_W) '$(srcdir)/src/sleep.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_sleep_a-sleep.Tpo src/$(DEPDIR)/src_libsinglebin_sleep_a-sleep.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/sleep.c' object='src/src_libsinglebin_sleep_a-sleep.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_sleep_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_sleep_a-sleep.obj `if test -f 'src/sleep.c'; then $(CYGPATH_W) 'src/sleep.c'; else $(CYGPATH_W) '$(srcdir)/src/sleep.c'; fi`
+
+src/src_libsinglebin_sort_a-sort.o: src/sort.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_sort_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_sort_a-sort.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_sort_a-sort.Tpo -c -o src/src_libsinglebin_sort_a-sort.o `test -f 'src/sort.c' || echo '$(srcdir)/'`src/sort.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_sort_a-sort.Tpo src/$(DEPDIR)/src_libsinglebin_sort_a-sort.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/sort.c' object='src/src_libsinglebin_sort_a-sort.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_sort_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_sort_a-sort.o `test -f 'src/sort.c' || echo '$(srcdir)/'`src/sort.c
+
+src/src_libsinglebin_sort_a-sort.obj: src/sort.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_sort_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_sort_a-sort.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_sort_a-sort.Tpo -c -o src/src_libsinglebin_sort_a-sort.obj `if test -f 'src/sort.c'; then $(CYGPATH_W) 'src/sort.c'; else $(CYGPATH_W) '$(srcdir)/src/sort.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_sort_a-sort.Tpo src/$(DEPDIR)/src_libsinglebin_sort_a-sort.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/sort.c' object='src/src_libsinglebin_sort_a-sort.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_sort_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_sort_a-sort.obj `if test -f 'src/sort.c'; then $(CYGPATH_W) 'src/sort.c'; else $(CYGPATH_W) '$(srcdir)/src/sort.c'; fi`
+
+src/src_libsinglebin_split_a-split.o: src/split.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_split_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_split_a-split.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_split_a-split.Tpo -c -o src/src_libsinglebin_split_a-split.o `test -f 'src/split.c' || echo '$(srcdir)/'`src/split.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_split_a-split.Tpo src/$(DEPDIR)/src_libsinglebin_split_a-split.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/split.c' object='src/src_libsinglebin_split_a-split.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_split_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_split_a-split.o `test -f 'src/split.c' || echo '$(srcdir)/'`src/split.c
+
+src/src_libsinglebin_split_a-split.obj: src/split.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_split_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_split_a-split.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_split_a-split.Tpo -c -o src/src_libsinglebin_split_a-split.obj `if test -f 'src/split.c'; then $(CYGPATH_W) 'src/split.c'; else $(CYGPATH_W) '$(srcdir)/src/split.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_split_a-split.Tpo src/$(DEPDIR)/src_libsinglebin_split_a-split.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/split.c' object='src/src_libsinglebin_split_a-split.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_split_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_split_a-split.obj `if test -f 'src/split.c'; then $(CYGPATH_W) 'src/split.c'; else $(CYGPATH_W) '$(srcdir)/src/split.c'; fi`
+
+src/src_libsinglebin_stat_a-stat.o: src/stat.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_stat_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_stat_a-stat.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_stat_a-stat.Tpo -c -o src/src_libsinglebin_stat_a-stat.o `test -f 'src/stat.c' || echo '$(srcdir)/'`src/stat.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_stat_a-stat.Tpo src/$(DEPDIR)/src_libsinglebin_stat_a-stat.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/stat.c' object='src/src_libsinglebin_stat_a-stat.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_stat_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_stat_a-stat.o `test -f 'src/stat.c' || echo '$(srcdir)/'`src/stat.c
+
+src/src_libsinglebin_stat_a-stat.obj: src/stat.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_stat_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_stat_a-stat.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_stat_a-stat.Tpo -c -o src/src_libsinglebin_stat_a-stat.obj `if test -f 'src/stat.c'; then $(CYGPATH_W) 'src/stat.c'; else $(CYGPATH_W) '$(srcdir)/src/stat.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_stat_a-stat.Tpo src/$(DEPDIR)/src_libsinglebin_stat_a-stat.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/stat.c' object='src/src_libsinglebin_stat_a-stat.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_stat_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_stat_a-stat.obj `if test -f 'src/stat.c'; then $(CYGPATH_W) 'src/stat.c'; else $(CYGPATH_W) '$(srcdir)/src/stat.c'; fi`
+
+src/src_libsinglebin_stat_a-find-mount-point.o: src/find-mount-point.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_stat_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_stat_a-find-mount-point.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_stat_a-find-mount-point.Tpo -c -o src/src_libsinglebin_stat_a-find-mount-point.o `test -f 'src/find-mount-point.c' || echo '$(srcdir)/'`src/find-mount-point.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_stat_a-find-mount-point.Tpo src/$(DEPDIR)/src_libsinglebin_stat_a-find-mount-point.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/find-mount-point.c' object='src/src_libsinglebin_stat_a-find-mount-point.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_stat_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_stat_a-find-mount-point.o `test -f 'src/find-mount-point.c' || echo '$(srcdir)/'`src/find-mount-point.c
+
+src/src_libsinglebin_stat_a-find-mount-point.obj: src/find-mount-point.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_stat_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_stat_a-find-mount-point.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_stat_a-find-mount-point.Tpo -c -o src/src_libsinglebin_stat_a-find-mount-point.obj `if test -f 'src/find-mount-point.c'; then $(CYGPATH_W) 'src/find-mount-point.c'; else $(CYGPATH_W) '$(srcdir)/src/find-mount-point.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_stat_a-find-mount-point.Tpo src/$(DEPDIR)/src_libsinglebin_stat_a-find-mount-point.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/find-mount-point.c' object='src/src_libsinglebin_stat_a-find-mount-point.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_stat_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_stat_a-find-mount-point.obj `if test -f 'src/find-mount-point.c'; then $(CYGPATH_W) 'src/find-mount-point.c'; else $(CYGPATH_W) '$(srcdir)/src/find-mount-point.c'; fi`
+
+src/src_libsinglebin_stdbuf_a-stdbuf.o: src/stdbuf.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_stdbuf_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_stdbuf_a-stdbuf.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_stdbuf_a-stdbuf.Tpo -c -o src/src_libsinglebin_stdbuf_a-stdbuf.o `test -f 'src/stdbuf.c' || echo '$(srcdir)/'`src/stdbuf.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_stdbuf_a-stdbuf.Tpo src/$(DEPDIR)/src_libsinglebin_stdbuf_a-stdbuf.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/stdbuf.c' object='src/src_libsinglebin_stdbuf_a-stdbuf.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_stdbuf_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_stdbuf_a-stdbuf.o `test -f 'src/stdbuf.c' || echo '$(srcdir)/'`src/stdbuf.c
+
+src/src_libsinglebin_stdbuf_a-stdbuf.obj: src/stdbuf.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_stdbuf_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_stdbuf_a-stdbuf.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_stdbuf_a-stdbuf.Tpo -c -o src/src_libsinglebin_stdbuf_a-stdbuf.obj `if test -f 'src/stdbuf.c'; then $(CYGPATH_W) 'src/stdbuf.c'; else $(CYGPATH_W) '$(srcdir)/src/stdbuf.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_stdbuf_a-stdbuf.Tpo src/$(DEPDIR)/src_libsinglebin_stdbuf_a-stdbuf.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/stdbuf.c' object='src/src_libsinglebin_stdbuf_a-stdbuf.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_stdbuf_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_stdbuf_a-stdbuf.obj `if test -f 'src/stdbuf.c'; then $(CYGPATH_W) 'src/stdbuf.c'; else $(CYGPATH_W) '$(srcdir)/src/stdbuf.c'; fi`
+
+src/src_libsinglebin_stty_a-stty.o: src/stty.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_stty_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_stty_a-stty.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_stty_a-stty.Tpo -c -o src/src_libsinglebin_stty_a-stty.o `test -f 'src/stty.c' || echo '$(srcdir)/'`src/stty.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_stty_a-stty.Tpo src/$(DEPDIR)/src_libsinglebin_stty_a-stty.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/stty.c' object='src/src_libsinglebin_stty_a-stty.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_stty_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_stty_a-stty.o `test -f 'src/stty.c' || echo '$(srcdir)/'`src/stty.c
+
+src/src_libsinglebin_stty_a-stty.obj: src/stty.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_stty_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_stty_a-stty.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_stty_a-stty.Tpo -c -o src/src_libsinglebin_stty_a-stty.obj `if test -f 'src/stty.c'; then $(CYGPATH_W) 'src/stty.c'; else $(CYGPATH_W) '$(srcdir)/src/stty.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_stty_a-stty.Tpo src/$(DEPDIR)/src_libsinglebin_stty_a-stty.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/stty.c' object='src/src_libsinglebin_stty_a-stty.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_stty_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_stty_a-stty.obj `if test -f 'src/stty.c'; then $(CYGPATH_W) 'src/stty.c'; else $(CYGPATH_W) '$(srcdir)/src/stty.c'; fi`
+
+src/src_libsinglebin_sum_a-sum.o: src/sum.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_sum_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_sum_a-sum.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_sum_a-sum.Tpo -c -o src/src_libsinglebin_sum_a-sum.o `test -f 'src/sum.c' || echo '$(srcdir)/'`src/sum.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_sum_a-sum.Tpo src/$(DEPDIR)/src_libsinglebin_sum_a-sum.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/sum.c' object='src/src_libsinglebin_sum_a-sum.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_sum_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_sum_a-sum.o `test -f 'src/sum.c' || echo '$(srcdir)/'`src/sum.c
+
+src/src_libsinglebin_sum_a-sum.obj: src/sum.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_sum_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_sum_a-sum.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_sum_a-sum.Tpo -c -o src/src_libsinglebin_sum_a-sum.obj `if test -f 'src/sum.c'; then $(CYGPATH_W) 'src/sum.c'; else $(CYGPATH_W) '$(srcdir)/src/sum.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_sum_a-sum.Tpo src/$(DEPDIR)/src_libsinglebin_sum_a-sum.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/sum.c' object='src/src_libsinglebin_sum_a-sum.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_sum_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_sum_a-sum.obj `if test -f 'src/sum.c'; then $(CYGPATH_W) 'src/sum.c'; else $(CYGPATH_W) '$(srcdir)/src/sum.c'; fi`
+
+src/src_libsinglebin_sync_a-sync.o: src/sync.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_sync_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_sync_a-sync.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_sync_a-sync.Tpo -c -o src/src_libsinglebin_sync_a-sync.o `test -f 'src/sync.c' || echo '$(srcdir)/'`src/sync.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_sync_a-sync.Tpo src/$(DEPDIR)/src_libsinglebin_sync_a-sync.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/sync.c' object='src/src_libsinglebin_sync_a-sync.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_sync_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_sync_a-sync.o `test -f 'src/sync.c' || echo '$(srcdir)/'`src/sync.c
+
+src/src_libsinglebin_sync_a-sync.obj: src/sync.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_sync_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_sync_a-sync.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_sync_a-sync.Tpo -c -o src/src_libsinglebin_sync_a-sync.obj `if test -f 'src/sync.c'; then $(CYGPATH_W) 'src/sync.c'; else $(CYGPATH_W) '$(srcdir)/src/sync.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_sync_a-sync.Tpo src/$(DEPDIR)/src_libsinglebin_sync_a-sync.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/sync.c' object='src/src_libsinglebin_sync_a-sync.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_sync_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_sync_a-sync.obj `if test -f 'src/sync.c'; then $(CYGPATH_W) 'src/sync.c'; else $(CYGPATH_W) '$(srcdir)/src/sync.c'; fi`
+
+src/src_libsinglebin_tac_a-tac.o: src/tac.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_tac_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_tac_a-tac.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_tac_a-tac.Tpo -c -o src/src_libsinglebin_tac_a-tac.o `test -f 'src/tac.c' || echo '$(srcdir)/'`src/tac.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_tac_a-tac.Tpo src/$(DEPDIR)/src_libsinglebin_tac_a-tac.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tac.c' object='src/src_libsinglebin_tac_a-tac.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_tac_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_tac_a-tac.o `test -f 'src/tac.c' || echo '$(srcdir)/'`src/tac.c
+
+src/src_libsinglebin_tac_a-tac.obj: src/tac.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_tac_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_tac_a-tac.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_tac_a-tac.Tpo -c -o src/src_libsinglebin_tac_a-tac.obj `if test -f 'src/tac.c'; then $(CYGPATH_W) 'src/tac.c'; else $(CYGPATH_W) '$(srcdir)/src/tac.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_tac_a-tac.Tpo src/$(DEPDIR)/src_libsinglebin_tac_a-tac.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tac.c' object='src/src_libsinglebin_tac_a-tac.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_tac_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_tac_a-tac.obj `if test -f 'src/tac.c'; then $(CYGPATH_W) 'src/tac.c'; else $(CYGPATH_W) '$(srcdir)/src/tac.c'; fi`
+
+src/src_libsinglebin_tail_a-tail.o: src/tail.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_tail_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_tail_a-tail.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_tail_a-tail.Tpo -c -o src/src_libsinglebin_tail_a-tail.o `test -f 'src/tail.c' || echo '$(srcdir)/'`src/tail.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_tail_a-tail.Tpo src/$(DEPDIR)/src_libsinglebin_tail_a-tail.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tail.c' object='src/src_libsinglebin_tail_a-tail.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_tail_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_tail_a-tail.o `test -f 'src/tail.c' || echo '$(srcdir)/'`src/tail.c
+
+src/src_libsinglebin_tail_a-tail.obj: src/tail.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_tail_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_tail_a-tail.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_tail_a-tail.Tpo -c -o src/src_libsinglebin_tail_a-tail.obj `if test -f 'src/tail.c'; then $(CYGPATH_W) 'src/tail.c'; else $(CYGPATH_W) '$(srcdir)/src/tail.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_tail_a-tail.Tpo src/$(DEPDIR)/src_libsinglebin_tail_a-tail.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tail.c' object='src/src_libsinglebin_tail_a-tail.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_tail_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_tail_a-tail.obj `if test -f 'src/tail.c'; then $(CYGPATH_W) 'src/tail.c'; else $(CYGPATH_W) '$(srcdir)/src/tail.c'; fi`
+
+src/src_libsinglebin_tee_a-tee.o: src/tee.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_tee_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_tee_a-tee.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_tee_a-tee.Tpo -c -o src/src_libsinglebin_tee_a-tee.o `test -f 'src/tee.c' || echo '$(srcdir)/'`src/tee.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_tee_a-tee.Tpo src/$(DEPDIR)/src_libsinglebin_tee_a-tee.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tee.c' object='src/src_libsinglebin_tee_a-tee.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_tee_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_tee_a-tee.o `test -f 'src/tee.c' || echo '$(srcdir)/'`src/tee.c
+
+src/src_libsinglebin_tee_a-tee.obj: src/tee.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_tee_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_tee_a-tee.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_tee_a-tee.Tpo -c -o src/src_libsinglebin_tee_a-tee.obj `if test -f 'src/tee.c'; then $(CYGPATH_W) 'src/tee.c'; else $(CYGPATH_W) '$(srcdir)/src/tee.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_tee_a-tee.Tpo src/$(DEPDIR)/src_libsinglebin_tee_a-tee.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tee.c' object='src/src_libsinglebin_tee_a-tee.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_tee_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_tee_a-tee.obj `if test -f 'src/tee.c'; then $(CYGPATH_W) 'src/tee.c'; else $(CYGPATH_W) '$(srcdir)/src/tee.c'; fi`
+
+src/src_libsinglebin_test_a-test.o: src/test.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_test_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_test_a-test.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_test_a-test.Tpo -c -o src/src_libsinglebin_test_a-test.o `test -f 'src/test.c' || echo '$(srcdir)/'`src/test.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_test_a-test.Tpo src/$(DEPDIR)/src_libsinglebin_test_a-test.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/test.c' object='src/src_libsinglebin_test_a-test.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_test_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_test_a-test.o `test -f 'src/test.c' || echo '$(srcdir)/'`src/test.c
+
+src/src_libsinglebin_test_a-test.obj: src/test.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_test_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_test_a-test.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_test_a-test.Tpo -c -o src/src_libsinglebin_test_a-test.obj `if test -f 'src/test.c'; then $(CYGPATH_W) 'src/test.c'; else $(CYGPATH_W) '$(srcdir)/src/test.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_test_a-test.Tpo src/$(DEPDIR)/src_libsinglebin_test_a-test.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/test.c' object='src/src_libsinglebin_test_a-test.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_test_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_test_a-test.obj `if test -f 'src/test.c'; then $(CYGPATH_W) 'src/test.c'; else $(CYGPATH_W) '$(srcdir)/src/test.c'; fi`
+
+src/src_libsinglebin_timeout_a-timeout.o: src/timeout.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_timeout_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_timeout_a-timeout.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_timeout_a-timeout.Tpo -c -o src/src_libsinglebin_timeout_a-timeout.o `test -f 'src/timeout.c' || echo '$(srcdir)/'`src/timeout.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_timeout_a-timeout.Tpo src/$(DEPDIR)/src_libsinglebin_timeout_a-timeout.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/timeout.c' object='src/src_libsinglebin_timeout_a-timeout.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_timeout_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_timeout_a-timeout.o `test -f 'src/timeout.c' || echo '$(srcdir)/'`src/timeout.c
+
+src/src_libsinglebin_timeout_a-timeout.obj: src/timeout.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_timeout_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_timeout_a-timeout.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_timeout_a-timeout.Tpo -c -o src/src_libsinglebin_timeout_a-timeout.obj `if test -f 'src/timeout.c'; then $(CYGPATH_W) 'src/timeout.c'; else $(CYGPATH_W) '$(srcdir)/src/timeout.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_timeout_a-timeout.Tpo src/$(DEPDIR)/src_libsinglebin_timeout_a-timeout.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/timeout.c' object='src/src_libsinglebin_timeout_a-timeout.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_timeout_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_timeout_a-timeout.obj `if test -f 'src/timeout.c'; then $(CYGPATH_W) 'src/timeout.c'; else $(CYGPATH_W) '$(srcdir)/src/timeout.c'; fi`
+
+src/src_libsinglebin_timeout_a-operand2sig.o: src/operand2sig.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_timeout_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_timeout_a-operand2sig.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_timeout_a-operand2sig.Tpo -c -o src/src_libsinglebin_timeout_a-operand2sig.o `test -f 'src/operand2sig.c' || echo '$(srcdir)/'`src/operand2sig.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_timeout_a-operand2sig.Tpo src/$(DEPDIR)/src_libsinglebin_timeout_a-operand2sig.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/operand2sig.c' object='src/src_libsinglebin_timeout_a-operand2sig.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_timeout_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_timeout_a-operand2sig.o `test -f 'src/operand2sig.c' || echo '$(srcdir)/'`src/operand2sig.c
+
+src/src_libsinglebin_timeout_a-operand2sig.obj: src/operand2sig.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_timeout_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_timeout_a-operand2sig.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_timeout_a-operand2sig.Tpo -c -o src/src_libsinglebin_timeout_a-operand2sig.obj `if test -f 'src/operand2sig.c'; then $(CYGPATH_W) 'src/operand2sig.c'; else $(CYGPATH_W) '$(srcdir)/src/operand2sig.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_timeout_a-operand2sig.Tpo src/$(DEPDIR)/src_libsinglebin_timeout_a-operand2sig.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/operand2sig.c' object='src/src_libsinglebin_timeout_a-operand2sig.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_timeout_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_timeout_a-operand2sig.obj `if test -f 'src/operand2sig.c'; then $(CYGPATH_W) 'src/operand2sig.c'; else $(CYGPATH_W) '$(srcdir)/src/operand2sig.c'; fi`
+
+src/src_libsinglebin_touch_a-touch.o: src/touch.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_touch_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_touch_a-touch.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_touch_a-touch.Tpo -c -o src/src_libsinglebin_touch_a-touch.o `test -f 'src/touch.c' || echo '$(srcdir)/'`src/touch.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_touch_a-touch.Tpo src/$(DEPDIR)/src_libsinglebin_touch_a-touch.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/touch.c' object='src/src_libsinglebin_touch_a-touch.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_touch_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_touch_a-touch.o `test -f 'src/touch.c' || echo '$(srcdir)/'`src/touch.c
+
+src/src_libsinglebin_touch_a-touch.obj: src/touch.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_touch_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_touch_a-touch.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_touch_a-touch.Tpo -c -o src/src_libsinglebin_touch_a-touch.obj `if test -f 'src/touch.c'; then $(CYGPATH_W) 'src/touch.c'; else $(CYGPATH_W) '$(srcdir)/src/touch.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_touch_a-touch.Tpo src/$(DEPDIR)/src_libsinglebin_touch_a-touch.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/touch.c' object='src/src_libsinglebin_touch_a-touch.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_touch_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_touch_a-touch.obj `if test -f 'src/touch.c'; then $(CYGPATH_W) 'src/touch.c'; else $(CYGPATH_W) '$(srcdir)/src/touch.c'; fi`
+
+src/src_libsinglebin_tr_a-tr.o: src/tr.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_tr_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_tr_a-tr.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_tr_a-tr.Tpo -c -o src/src_libsinglebin_tr_a-tr.o `test -f 'src/tr.c' || echo '$(srcdir)/'`src/tr.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_tr_a-tr.Tpo src/$(DEPDIR)/src_libsinglebin_tr_a-tr.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tr.c' object='src/src_libsinglebin_tr_a-tr.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_tr_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_tr_a-tr.o `test -f 'src/tr.c' || echo '$(srcdir)/'`src/tr.c
+
+src/src_libsinglebin_tr_a-tr.obj: src/tr.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_tr_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_tr_a-tr.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_tr_a-tr.Tpo -c -o src/src_libsinglebin_tr_a-tr.obj `if test -f 'src/tr.c'; then $(CYGPATH_W) 'src/tr.c'; else $(CYGPATH_W) '$(srcdir)/src/tr.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_tr_a-tr.Tpo src/$(DEPDIR)/src_libsinglebin_tr_a-tr.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tr.c' object='src/src_libsinglebin_tr_a-tr.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_tr_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_tr_a-tr.obj `if test -f 'src/tr.c'; then $(CYGPATH_W) 'src/tr.c'; else $(CYGPATH_W) '$(srcdir)/src/tr.c'; fi`
+
+src/src_libsinglebin_true_a-true.o: src/true.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_true_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_true_a-true.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_true_a-true.Tpo -c -o src/src_libsinglebin_true_a-true.o `test -f 'src/true.c' || echo '$(srcdir)/'`src/true.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_true_a-true.Tpo src/$(DEPDIR)/src_libsinglebin_true_a-true.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/true.c' object='src/src_libsinglebin_true_a-true.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_true_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_true_a-true.o `test -f 'src/true.c' || echo '$(srcdir)/'`src/true.c
+
+src/src_libsinglebin_true_a-true.obj: src/true.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_true_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_true_a-true.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_true_a-true.Tpo -c -o src/src_libsinglebin_true_a-true.obj `if test -f 'src/true.c'; then $(CYGPATH_W) 'src/true.c'; else $(CYGPATH_W) '$(srcdir)/src/true.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_true_a-true.Tpo src/$(DEPDIR)/src_libsinglebin_true_a-true.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/true.c' object='src/src_libsinglebin_true_a-true.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_true_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_true_a-true.obj `if test -f 'src/true.c'; then $(CYGPATH_W) 'src/true.c'; else $(CYGPATH_W) '$(srcdir)/src/true.c'; fi`
+
+src/src_libsinglebin_truncate_a-truncate.o: src/truncate.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_truncate_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_truncate_a-truncate.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_truncate_a-truncate.Tpo -c -o src/src_libsinglebin_truncate_a-truncate.o `test -f 'src/truncate.c' || echo '$(srcdir)/'`src/truncate.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_truncate_a-truncate.Tpo src/$(DEPDIR)/src_libsinglebin_truncate_a-truncate.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/truncate.c' object='src/src_libsinglebin_truncate_a-truncate.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_truncate_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_truncate_a-truncate.o `test -f 'src/truncate.c' || echo '$(srcdir)/'`src/truncate.c
+
+src/src_libsinglebin_truncate_a-truncate.obj: src/truncate.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_truncate_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_truncate_a-truncate.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_truncate_a-truncate.Tpo -c -o src/src_libsinglebin_truncate_a-truncate.obj `if test -f 'src/truncate.c'; then $(CYGPATH_W) 'src/truncate.c'; else $(CYGPATH_W) '$(srcdir)/src/truncate.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_truncate_a-truncate.Tpo src/$(DEPDIR)/src_libsinglebin_truncate_a-truncate.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/truncate.c' object='src/src_libsinglebin_truncate_a-truncate.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_truncate_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_truncate_a-truncate.obj `if test -f 'src/truncate.c'; then $(CYGPATH_W) 'src/truncate.c'; else $(CYGPATH_W) '$(srcdir)/src/truncate.c'; fi`
+
+src/src_libsinglebin_tsort_a-tsort.o: src/tsort.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_tsort_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_tsort_a-tsort.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_tsort_a-tsort.Tpo -c -o src/src_libsinglebin_tsort_a-tsort.o `test -f 'src/tsort.c' || echo '$(srcdir)/'`src/tsort.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_tsort_a-tsort.Tpo src/$(DEPDIR)/src_libsinglebin_tsort_a-tsort.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tsort.c' object='src/src_libsinglebin_tsort_a-tsort.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_tsort_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_tsort_a-tsort.o `test -f 'src/tsort.c' || echo '$(srcdir)/'`src/tsort.c
+
+src/src_libsinglebin_tsort_a-tsort.obj: src/tsort.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_tsort_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_tsort_a-tsort.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_tsort_a-tsort.Tpo -c -o src/src_libsinglebin_tsort_a-tsort.obj `if test -f 'src/tsort.c'; then $(CYGPATH_W) 'src/tsort.c'; else $(CYGPATH_W) '$(srcdir)/src/tsort.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_tsort_a-tsort.Tpo src/$(DEPDIR)/src_libsinglebin_tsort_a-tsort.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tsort.c' object='src/src_libsinglebin_tsort_a-tsort.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_tsort_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_tsort_a-tsort.obj `if test -f 'src/tsort.c'; then $(CYGPATH_W) 'src/tsort.c'; else $(CYGPATH_W) '$(srcdir)/src/tsort.c'; fi`
+
+src/src_libsinglebin_tty_a-tty.o: src/tty.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_tty_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_tty_a-tty.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_tty_a-tty.Tpo -c -o src/src_libsinglebin_tty_a-tty.o `test -f 'src/tty.c' || echo '$(srcdir)/'`src/tty.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_tty_a-tty.Tpo src/$(DEPDIR)/src_libsinglebin_tty_a-tty.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tty.c' object='src/src_libsinglebin_tty_a-tty.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_tty_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_tty_a-tty.o `test -f 'src/tty.c' || echo '$(srcdir)/'`src/tty.c
+
+src/src_libsinglebin_tty_a-tty.obj: src/tty.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_tty_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_tty_a-tty.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_tty_a-tty.Tpo -c -o src/src_libsinglebin_tty_a-tty.obj `if test -f 'src/tty.c'; then $(CYGPATH_W) 'src/tty.c'; else $(CYGPATH_W) '$(srcdir)/src/tty.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_tty_a-tty.Tpo src/$(DEPDIR)/src_libsinglebin_tty_a-tty.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tty.c' object='src/src_libsinglebin_tty_a-tty.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_tty_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_tty_a-tty.obj `if test -f 'src/tty.c'; then $(CYGPATH_W) 'src/tty.c'; else $(CYGPATH_W) '$(srcdir)/src/tty.c'; fi`
+
+src/src_libsinglebin_uname_a-uname.o: src/uname.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_uname_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_uname_a-uname.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_uname_a-uname.Tpo -c -o src/src_libsinglebin_uname_a-uname.o `test -f 'src/uname.c' || echo '$(srcdir)/'`src/uname.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_uname_a-uname.Tpo src/$(DEPDIR)/src_libsinglebin_uname_a-uname.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/uname.c' object='src/src_libsinglebin_uname_a-uname.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_uname_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_uname_a-uname.o `test -f 'src/uname.c' || echo '$(srcdir)/'`src/uname.c
+
+src/src_libsinglebin_uname_a-uname.obj: src/uname.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_uname_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_uname_a-uname.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_uname_a-uname.Tpo -c -o src/src_libsinglebin_uname_a-uname.obj `if test -f 'src/uname.c'; then $(CYGPATH_W) 'src/uname.c'; else $(CYGPATH_W) '$(srcdir)/src/uname.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_uname_a-uname.Tpo src/$(DEPDIR)/src_libsinglebin_uname_a-uname.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/uname.c' object='src/src_libsinglebin_uname_a-uname.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_uname_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_uname_a-uname.obj `if test -f 'src/uname.c'; then $(CYGPATH_W) 'src/uname.c'; else $(CYGPATH_W) '$(srcdir)/src/uname.c'; fi`
+
+src/src_libsinglebin_uname_a-uname-uname.o: src/uname-uname.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_uname_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_uname_a-uname-uname.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_uname_a-uname-uname.Tpo -c -o src/src_libsinglebin_uname_a-uname-uname.o `test -f 'src/uname-uname.c' || echo '$(srcdir)/'`src/uname-uname.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_uname_a-uname-uname.Tpo src/$(DEPDIR)/src_libsinglebin_uname_a-uname-uname.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/uname-uname.c' object='src/src_libsinglebin_uname_a-uname-uname.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_uname_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_uname_a-uname-uname.o `test -f 'src/uname-uname.c' || echo '$(srcdir)/'`src/uname-uname.c
+
+src/src_libsinglebin_uname_a-uname-uname.obj: src/uname-uname.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_uname_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_uname_a-uname-uname.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_uname_a-uname-uname.Tpo -c -o src/src_libsinglebin_uname_a-uname-uname.obj `if test -f 'src/uname-uname.c'; then $(CYGPATH_W) 'src/uname-uname.c'; else $(CYGPATH_W) '$(srcdir)/src/uname-uname.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_uname_a-uname-uname.Tpo src/$(DEPDIR)/src_libsinglebin_uname_a-uname-uname.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/uname-uname.c' object='src/src_libsinglebin_uname_a-uname-uname.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_uname_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_uname_a-uname-uname.obj `if test -f 'src/uname-uname.c'; then $(CYGPATH_W) 'src/uname-uname.c'; else $(CYGPATH_W) '$(srcdir)/src/uname-uname.c'; fi`
+
+src/src_libsinglebin_unexpand_a-unexpand.o: src/unexpand.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_unexpand_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_unexpand_a-unexpand.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_unexpand_a-unexpand.Tpo -c -o src/src_libsinglebin_unexpand_a-unexpand.o `test -f 'src/unexpand.c' || echo '$(srcdir)/'`src/unexpand.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_unexpand_a-unexpand.Tpo src/$(DEPDIR)/src_libsinglebin_unexpand_a-unexpand.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/unexpand.c' object='src/src_libsinglebin_unexpand_a-unexpand.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_unexpand_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_unexpand_a-unexpand.o `test -f 'src/unexpand.c' || echo '$(srcdir)/'`src/unexpand.c
+
+src/src_libsinglebin_unexpand_a-unexpand.obj: src/unexpand.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_unexpand_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_unexpand_a-unexpand.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_unexpand_a-unexpand.Tpo -c -o src/src_libsinglebin_unexpand_a-unexpand.obj `if test -f 'src/unexpand.c'; then $(CYGPATH_W) 'src/unexpand.c'; else $(CYGPATH_W) '$(srcdir)/src/unexpand.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_unexpand_a-unexpand.Tpo src/$(DEPDIR)/src_libsinglebin_unexpand_a-unexpand.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/unexpand.c' object='src/src_libsinglebin_unexpand_a-unexpand.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_unexpand_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_unexpand_a-unexpand.obj `if test -f 'src/unexpand.c'; then $(CYGPATH_W) 'src/unexpand.c'; else $(CYGPATH_W) '$(srcdir)/src/unexpand.c'; fi`
+
+src/src_libsinglebin_uniq_a-uniq.o: src/uniq.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_uniq_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_uniq_a-uniq.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_uniq_a-uniq.Tpo -c -o src/src_libsinglebin_uniq_a-uniq.o `test -f 'src/uniq.c' || echo '$(srcdir)/'`src/uniq.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_uniq_a-uniq.Tpo src/$(DEPDIR)/src_libsinglebin_uniq_a-uniq.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/uniq.c' object='src/src_libsinglebin_uniq_a-uniq.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_uniq_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_uniq_a-uniq.o `test -f 'src/uniq.c' || echo '$(srcdir)/'`src/uniq.c
+
+src/src_libsinglebin_uniq_a-uniq.obj: src/uniq.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_uniq_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_uniq_a-uniq.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_uniq_a-uniq.Tpo -c -o src/src_libsinglebin_uniq_a-uniq.obj `if test -f 'src/uniq.c'; then $(CYGPATH_W) 'src/uniq.c'; else $(CYGPATH_W) '$(srcdir)/src/uniq.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_uniq_a-uniq.Tpo src/$(DEPDIR)/src_libsinglebin_uniq_a-uniq.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/uniq.c' object='src/src_libsinglebin_uniq_a-uniq.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_uniq_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_uniq_a-uniq.obj `if test -f 'src/uniq.c'; then $(CYGPATH_W) 'src/uniq.c'; else $(CYGPATH_W) '$(srcdir)/src/uniq.c'; fi`
+
+src/src_libsinglebin_unlink_a-unlink.o: src/unlink.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_unlink_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_unlink_a-unlink.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_unlink_a-unlink.Tpo -c -o src/src_libsinglebin_unlink_a-unlink.o `test -f 'src/unlink.c' || echo '$(srcdir)/'`src/unlink.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_unlink_a-unlink.Tpo src/$(DEPDIR)/src_libsinglebin_unlink_a-unlink.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/unlink.c' object='src/src_libsinglebin_unlink_a-unlink.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_unlink_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_unlink_a-unlink.o `test -f 'src/unlink.c' || echo '$(srcdir)/'`src/unlink.c
+
+src/src_libsinglebin_unlink_a-unlink.obj: src/unlink.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_unlink_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_unlink_a-unlink.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_unlink_a-unlink.Tpo -c -o src/src_libsinglebin_unlink_a-unlink.obj `if test -f 'src/unlink.c'; then $(CYGPATH_W) 'src/unlink.c'; else $(CYGPATH_W) '$(srcdir)/src/unlink.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_unlink_a-unlink.Tpo src/$(DEPDIR)/src_libsinglebin_unlink_a-unlink.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/unlink.c' object='src/src_libsinglebin_unlink_a-unlink.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_unlink_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_unlink_a-unlink.obj `if test -f 'src/unlink.c'; then $(CYGPATH_W) 'src/unlink.c'; else $(CYGPATH_W) '$(srcdir)/src/unlink.c'; fi`
+
+src/src_libsinglebin_uptime_a-uptime.o: src/uptime.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_uptime_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_uptime_a-uptime.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_uptime_a-uptime.Tpo -c -o src/src_libsinglebin_uptime_a-uptime.o `test -f 'src/uptime.c' || echo '$(srcdir)/'`src/uptime.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_uptime_a-uptime.Tpo src/$(DEPDIR)/src_libsinglebin_uptime_a-uptime.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/uptime.c' object='src/src_libsinglebin_uptime_a-uptime.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_uptime_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_uptime_a-uptime.o `test -f 'src/uptime.c' || echo '$(srcdir)/'`src/uptime.c
+
+src/src_libsinglebin_uptime_a-uptime.obj: src/uptime.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_uptime_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_uptime_a-uptime.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_uptime_a-uptime.Tpo -c -o src/src_libsinglebin_uptime_a-uptime.obj `if test -f 'src/uptime.c'; then $(CYGPATH_W) 'src/uptime.c'; else $(CYGPATH_W) '$(srcdir)/src/uptime.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_uptime_a-uptime.Tpo src/$(DEPDIR)/src_libsinglebin_uptime_a-uptime.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/uptime.c' object='src/src_libsinglebin_uptime_a-uptime.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_uptime_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_uptime_a-uptime.obj `if test -f 'src/uptime.c'; then $(CYGPATH_W) 'src/uptime.c'; else $(CYGPATH_W) '$(srcdir)/src/uptime.c'; fi`
+
+src/src_libsinglebin_users_a-users.o: src/users.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_users_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_users_a-users.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_users_a-users.Tpo -c -o src/src_libsinglebin_users_a-users.o `test -f 'src/users.c' || echo '$(srcdir)/'`src/users.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_users_a-users.Tpo src/$(DEPDIR)/src_libsinglebin_users_a-users.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/users.c' object='src/src_libsinglebin_users_a-users.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_users_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_users_a-users.o `test -f 'src/users.c' || echo '$(srcdir)/'`src/users.c
+
+src/src_libsinglebin_users_a-users.obj: src/users.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_users_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_users_a-users.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_users_a-users.Tpo -c -o src/src_libsinglebin_users_a-users.obj `if test -f 'src/users.c'; then $(CYGPATH_W) 'src/users.c'; else $(CYGPATH_W) '$(srcdir)/src/users.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_users_a-users.Tpo src/$(DEPDIR)/src_libsinglebin_users_a-users.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/users.c' object='src/src_libsinglebin_users_a-users.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_users_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_users_a-users.obj `if test -f 'src/users.c'; then $(CYGPATH_W) 'src/users.c'; else $(CYGPATH_W) '$(srcdir)/src/users.c'; fi`
+
+src/src_libsinglebin_vdir_a-coreutils-vdir.o: src/coreutils-vdir.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_vdir_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_vdir_a-coreutils-vdir.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_vdir_a-coreutils-vdir.Tpo -c -o src/src_libsinglebin_vdir_a-coreutils-vdir.o `test -f 'src/coreutils-vdir.c' || echo '$(srcdir)/'`src/coreutils-vdir.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_vdir_a-coreutils-vdir.Tpo src/$(DEPDIR)/src_libsinglebin_vdir_a-coreutils-vdir.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/coreutils-vdir.c' object='src/src_libsinglebin_vdir_a-coreutils-vdir.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_vdir_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_vdir_a-coreutils-vdir.o `test -f 'src/coreutils-vdir.c' || echo '$(srcdir)/'`src/coreutils-vdir.c
+
+src/src_libsinglebin_vdir_a-coreutils-vdir.obj: src/coreutils-vdir.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_vdir_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_vdir_a-coreutils-vdir.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_vdir_a-coreutils-vdir.Tpo -c -o src/src_libsinglebin_vdir_a-coreutils-vdir.obj `if test -f 'src/coreutils-vdir.c'; then $(CYGPATH_W) 'src/coreutils-vdir.c'; else $(CYGPATH_W) '$(srcdir)/src/coreutils-vdir.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_vdir_a-coreutils-vdir.Tpo src/$(DEPDIR)/src_libsinglebin_vdir_a-coreutils-vdir.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/coreutils-vdir.c' object='src/src_libsinglebin_vdir_a-coreutils-vdir.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_vdir_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_vdir_a-coreutils-vdir.obj `if test -f 'src/coreutils-vdir.c'; then $(CYGPATH_W) 'src/coreutils-vdir.c'; else $(CYGPATH_W) '$(srcdir)/src/coreutils-vdir.c'; fi`
+
+src/src_libsinglebin_wc_a-wc.o: src/wc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_wc_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_wc_a-wc.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_wc_a-wc.Tpo -c -o src/src_libsinglebin_wc_a-wc.o `test -f 'src/wc.c' || echo '$(srcdir)/'`src/wc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_wc_a-wc.Tpo src/$(DEPDIR)/src_libsinglebin_wc_a-wc.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/wc.c' object='src/src_libsinglebin_wc_a-wc.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_wc_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_wc_a-wc.o `test -f 'src/wc.c' || echo '$(srcdir)/'`src/wc.c
+
+src/src_libsinglebin_wc_a-wc.obj: src/wc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_wc_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_wc_a-wc.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_wc_a-wc.Tpo -c -o src/src_libsinglebin_wc_a-wc.obj `if test -f 'src/wc.c'; then $(CYGPATH_W) 'src/wc.c'; else $(CYGPATH_W) '$(srcdir)/src/wc.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_wc_a-wc.Tpo src/$(DEPDIR)/src_libsinglebin_wc_a-wc.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/wc.c' object='src/src_libsinglebin_wc_a-wc.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_wc_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_wc_a-wc.obj `if test -f 'src/wc.c'; then $(CYGPATH_W) 'src/wc.c'; else $(CYGPATH_W) '$(srcdir)/src/wc.c'; fi`
+
+src/src_libsinglebin_who_a-who.o: src/who.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_who_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_who_a-who.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_who_a-who.Tpo -c -o src/src_libsinglebin_who_a-who.o `test -f 'src/who.c' || echo '$(srcdir)/'`src/who.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_who_a-who.Tpo src/$(DEPDIR)/src_libsinglebin_who_a-who.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/who.c' object='src/src_libsinglebin_who_a-who.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_who_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_who_a-who.o `test -f 'src/who.c' || echo '$(srcdir)/'`src/who.c
+
+src/src_libsinglebin_who_a-who.obj: src/who.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_who_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_who_a-who.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_who_a-who.Tpo -c -o src/src_libsinglebin_who_a-who.obj `if test -f 'src/who.c'; then $(CYGPATH_W) 'src/who.c'; else $(CYGPATH_W) '$(srcdir)/src/who.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_who_a-who.Tpo src/$(DEPDIR)/src_libsinglebin_who_a-who.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/who.c' object='src/src_libsinglebin_who_a-who.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_who_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_who_a-who.obj `if test -f 'src/who.c'; then $(CYGPATH_W) 'src/who.c'; else $(CYGPATH_W) '$(srcdir)/src/who.c'; fi`
+
+src/src_libsinglebin_whoami_a-whoami.o: src/whoami.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_whoami_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_whoami_a-whoami.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_whoami_a-whoami.Tpo -c -o src/src_libsinglebin_whoami_a-whoami.o `test -f 'src/whoami.c' || echo '$(srcdir)/'`src/whoami.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_whoami_a-whoami.Tpo src/$(DEPDIR)/src_libsinglebin_whoami_a-whoami.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/whoami.c' object='src/src_libsinglebin_whoami_a-whoami.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_whoami_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_whoami_a-whoami.o `test -f 'src/whoami.c' || echo '$(srcdir)/'`src/whoami.c
+
+src/src_libsinglebin_whoami_a-whoami.obj: src/whoami.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_whoami_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_whoami_a-whoami.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_whoami_a-whoami.Tpo -c -o src/src_libsinglebin_whoami_a-whoami.obj `if test -f 'src/whoami.c'; then $(CYGPATH_W) 'src/whoami.c'; else $(CYGPATH_W) '$(srcdir)/src/whoami.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_whoami_a-whoami.Tpo src/$(DEPDIR)/src_libsinglebin_whoami_a-whoami.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/whoami.c' object='src/src_libsinglebin_whoami_a-whoami.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_whoami_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_whoami_a-whoami.obj `if test -f 'src/whoami.c'; then $(CYGPATH_W) 'src/whoami.c'; else $(CYGPATH_W) '$(srcdir)/src/whoami.c'; fi`
+
+src/src_libsinglebin_yes_a-yes.o: src/yes.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_yes_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_yes_a-yes.o -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_yes_a-yes.Tpo -c -o src/src_libsinglebin_yes_a-yes.o `test -f 'src/yes.c' || echo '$(srcdir)/'`src/yes.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_yes_a-yes.Tpo src/$(DEPDIR)/src_libsinglebin_yes_a-yes.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/yes.c' object='src/src_libsinglebin_yes_a-yes.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_yes_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_yes_a-yes.o `test -f 'src/yes.c' || echo '$(srcdir)/'`src/yes.c
+
+src/src_libsinglebin_yes_a-yes.obj: src/yes.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_yes_a_CFLAGS) $(CFLAGS) -MT src/src_libsinglebin_yes_a-yes.obj -MD -MP -MF src/$(DEPDIR)/src_libsinglebin_yes_a-yes.Tpo -c -o src/src_libsinglebin_yes_a-yes.obj `if test -f 'src/yes.c'; then $(CYGPATH_W) 'src/yes.c'; else $(CYGPATH_W) '$(srcdir)/src/yes.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libsinglebin_yes_a-yes.Tpo src/$(DEPDIR)/src_libsinglebin_yes_a-yes.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/yes.c' object='src/src_libsinglebin_yes_a-yes.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libsinglebin_yes_a_CFLAGS) $(CFLAGS) -c -o src/src_libsinglebin_yes_a-yes.obj `if test -f 'src/yes.c'; then $(CYGPATH_W) 'src/yes.c'; else $(CYGPATH_W) '$(srcdir)/src/yes.c'; fi`
+
+src/src_coreutils-coreutils.o: src/coreutils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_coreutils_CFLAGS) $(CFLAGS) -MT src/src_coreutils-coreutils.o -MD -MP -MF src/$(DEPDIR)/src_coreutils-coreutils.Tpo -c -o src/src_coreutils-coreutils.o `test -f 'src/coreutils.c' || echo '$(srcdir)/'`src/coreutils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_coreutils-coreutils.Tpo src/$(DEPDIR)/src_coreutils-coreutils.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/coreutils.c' object='src/src_coreutils-coreutils.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_coreutils_CFLAGS) $(CFLAGS) -c -o src/src_coreutils-coreutils.o `test -f 'src/coreutils.c' || echo '$(srcdir)/'`src/coreutils.c
+
+src/src_coreutils-coreutils.obj: src/coreutils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_coreutils_CFLAGS) $(CFLAGS) -MT src/src_coreutils-coreutils.obj -MD -MP -MF src/$(DEPDIR)/src_coreutils-coreutils.Tpo -c -o src/src_coreutils-coreutils.obj `if test -f 'src/coreutils.c'; then $(CYGPATH_W) 'src/coreutils.c'; else $(CYGPATH_W) '$(srcdir)/src/coreutils.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_coreutils-coreutils.Tpo src/$(DEPDIR)/src_coreutils-coreutils.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/coreutils.c' object='src/src_coreutils-coreutils.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_coreutils_CFLAGS) $(CFLAGS) -c -o src/src_coreutils-coreutils.obj `if test -f 'src/coreutils.c'; then $(CYGPATH_W) 'src/coreutils.c'; else $(CYGPATH_W) '$(srcdir)/src/coreutils.c'; fi`
+
 src/src_ginstall-install.o: src/install.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_ginstall-install.o -MD -MP -MF src/$(DEPDIR)/src_ginstall-install.Tpo -c -o src/src_ginstall-install.o `test -f 'src/install.c' || echo '$(srcdir)/'`src/install.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_ginstall-install.Tpo src/$(DEPDIR)/src_ginstall-install.Po
@@ -6744,6 +10769,20 @@ src/src_ginstall-extent-scan.obj: src/extent-scan.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_ginstall-extent-scan.obj `if test -f 'src/extent-scan.c'; then $(CYGPATH_W) 'src/extent-scan.c'; else $(CYGPATH_W) '$(srcdir)/src/extent-scan.c'; fi`
 
+src/src_ginstall-selinux.o: src/selinux.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_ginstall-selinux.o -MD -MP -MF src/$(DEPDIR)/src_ginstall-selinux.Tpo -c -o src/src_ginstall-selinux.o `test -f 'src/selinux.c' || echo '$(srcdir)/'`src/selinux.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_ginstall-selinux.Tpo src/$(DEPDIR)/src_ginstall-selinux.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/selinux.c' object='src/src_ginstall-selinux.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_ginstall-selinux.o `test -f 'src/selinux.c' || echo '$(srcdir)/'`src/selinux.c
+
+src/src_ginstall-selinux.obj: src/selinux.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_ginstall-selinux.obj -MD -MP -MF src/$(DEPDIR)/src_ginstall-selinux.Tpo -c -o src/src_ginstall-selinux.obj `if test -f 'src/selinux.c'; then $(CYGPATH_W) 'src/selinux.c'; else $(CYGPATH_W) '$(srcdir)/src/selinux.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_ginstall-selinux.Tpo src/$(DEPDIR)/src_ginstall-selinux.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/selinux.c' object='src/src_ginstall-selinux.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_ginstall_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_ginstall-selinux.obj `if test -f 'src/selinux.c'; then $(CYGPATH_W) 'src/selinux.c'; else $(CYGPATH_W) '$(srcdir)/src/selinux.c'; fi`
+
 src/src_libstdbuf_so-libstdbuf.o: src/libstdbuf.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libstdbuf_so_CFLAGS) $(CFLAGS) -MT src/src_libstdbuf_so-libstdbuf.o -MD -MP -MF src/$(DEPDIR)/src_libstdbuf_so-libstdbuf.Tpo -c -o src/src_libstdbuf_so-libstdbuf.o `test -f 'src/libstdbuf.c' || echo '$(srcdir)/'`src/libstdbuf.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libstdbuf_so-libstdbuf.Tpo src/$(DEPDIR)/src_libstdbuf_so-libstdbuf.Po
@@ -6843,13 +10882,13 @@ src/src_sha512sum-md5sum.obj: src/md5sum.c
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_sha512sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_sha512sum-md5sum.obj `if test -f 'src/md5sum.c'; then $(CYGPATH_W) 'src/md5sum.c'; else $(CYGPATH_W) '$(srcdir)/src/md5sum.c'; fi`
 
 .y.c:
-	$(AM_V_YACC)$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h $*.h y.output $*.output -- $(YACCCOMPILE)
+	$(AM_V_YACC)$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h `echo $@ | $(am__yacc_c2h)` y.output $*.output -- $(YACCCOMPILE)
 doc/$(am__dirstamp):
 	@$(MKDIR_P) doc
 	@: > doc/$(am__dirstamp)
 
 $(srcdir)/doc/coreutils.info: doc/coreutils.texi $(srcdir)/doc/version.texi $(doc_coreutils_TEXINFOS)
-	restore=: && backupdir="$(am__leading_dot)am$$$$" && \
+	$(AM_V_MAKEINFO)restore=: && backupdir="$(am__leading_dot)am$$$$" && \
 	am__cwd=`pwd` && $(am__cd) $(srcdir) && \
 	rm -rf $$backupdir && mkdir $$backupdir && \
 	if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
@@ -6871,31 +10910,29 @@ $(srcdir)/doc/coreutils.info: doc/coreutils.texi $(srcdir)/doc/version.texi $(do
 	rm -rf $$backupdir; exit $$rc
 
 doc/coreutils.dvi: doc/coreutils.texi $(srcdir)/doc/version.texi $(doc_coreutils_TEXINFOS) doc/$(am__dirstamp)
-	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+	$(AM_V_TEXI2DVI)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I doc -I $(srcdir)/doc' \
-	$(TEXI2DVI) -o $@ `test -f 'doc/coreutils.texi' || echo '$(srcdir)/'`doc/coreutils.texi
+	$(TEXI2DVI) $(AM_V_texinfo) --build-dir=$(@:.dvi=.t2d) -o $@ $(AM_V_texidevnull) \
+	`test -f 'doc/coreutils.texi' || echo '$(srcdir)/'`doc/coreutils.texi
 
 doc/coreutils.pdf: doc/coreutils.texi $(srcdir)/doc/version.texi $(doc_coreutils_TEXINFOS) doc/$(am__dirstamp)
-	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+	$(AM_V_TEXI2PDF)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I doc -I $(srcdir)/doc' \
-	$(TEXI2PDF) -o $@ `test -f 'doc/coreutils.texi' || echo '$(srcdir)/'`doc/coreutils.texi
+	$(TEXI2PDF) $(AM_V_texinfo) --build-dir=$(@:.pdf=.t2p) -o $@ $(AM_V_texidevnull) \
+	`test -f 'doc/coreutils.texi' || echo '$(srcdir)/'`doc/coreutils.texi
 
 doc/coreutils.html: doc/coreutils.texi $(srcdir)/doc/version.texi $(doc_coreutils_TEXINFOS) doc/$(am__dirstamp)
-	rm -rf $(@:.html=.htp)
-	if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I doc -I $(srcdir)/doc \
+	$(AM_V_MAKEINFO)rm -rf $(@:.html=.htp)
+	$(AM_V_at)if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I doc -I $(srcdir)/doc \
 	 -o $(@:.html=.htp) `test -f 'doc/coreutils.texi' || echo '$(srcdir)/'`doc/coreutils.texi; \
 	then \
-	  rm -rf $@; \
-	  if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
-	    mv $(@:.html=) $@; else mv $(@:.html=.htp) $@; fi; \
+	  rm -rf $@ && mv $(@:.html=.htp) $@; \
 	else \
-	  if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
-	    rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
-	  exit 1; \
+	  rm -rf $(@:.html=.htp); exit 1; \
 	fi
 $(srcdir)/doc/version.texi:  $(srcdir)/doc/stamp-vti
 $(srcdir)/doc/stamp-vti: doc/coreutils.texi $(top_srcdir)/configure
-	test -f doc/$(am__dirstamp) || $(MAKE) $(AM_MAKEFLAGS) doc/$(am__dirstamp)
+	@test -f doc/$(am__dirstamp) || $(MAKE) $(AM_MAKEFLAGS) doc/$(am__dirstamp)
 	@(dir=.; test -f ./doc/coreutils.texi || dir=$(srcdir); \
 	set `$(SHELL) $(top_srcdir)/build-aux/mdate-sh $$dir/doc/coreutils.texi`; \
 	echo "@set UPDATED $$1 $$2 $$3"; \
@@ -6914,8 +10951,8 @@ mostlyclean-vti:
 maintainer-clean-vti:
 	-rm -f $(srcdir)/doc/stamp-vti $(srcdir)/doc/version.texi
 .dvi.ps:
-	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
-	$(DVIPS) -o $@ $<
+	$(AM_V_DVIPS)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+	$(DVIPS) $(AM_V_texinfo) -o $@ $<
 
 uninstall-dvi-am:
 	@$(NORMAL_UNINSTALL)
@@ -6994,10 +11031,7 @@ dist-info: $(INFO_DEPS)
 	done
 
 mostlyclean-aminfo:
-	-rm -rf coreutils.aux coreutils.cp coreutils.cps coreutils.fl coreutils.fn \
-	  coreutils.ky coreutils.log coreutils.op coreutils.pg \
-	  coreutils.tmp coreutils.toc coreutils.tp coreutils.tps \
-	  coreutils.vr
+	-rm -rf doc/coreutils.t2d doc/coreutils.t2p
 
 clean-aminfo:
 	-test -z "doc/coreutils.dvi doc/coreutils.pdf doc/coreutils.ps \
@@ -7054,22 +11088,25 @@ uninstall-man1:
 	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -7084,57 +11121,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -7150,12 +11142,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -7167,15 +11154,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -7184,163 +11167,217 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+	test ! -s cscope.files \
+	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+	-rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
+
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+	rm -f $< $@
+	$(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+	@:
 
 $(TEST_SUITE_LOG): $(TEST_LOGS)
-	@$(am__sh_e_setup);						\
-	list='$(TEST_LOGS)';						\
-	results=`for f in $$list; do					\
-		   test -r $$f && read line < $$f && echo "$$line"	\
-		     || echo FAIL;					\
-		 done`;							\
-	all=`echo "$$results" | sed '/^$$/d' | wc -l | sed -e 's/^[	 ]*//'`; \
-	fail=`echo "$$results" | grep -c '^FAIL'`;			\
-	pass=`echo "$$results" | grep -c '^PASS'`;			\
-	skip=`echo "$$results" | grep -c '^SKIP'`;			\
-	xfail=`echo "$$results" | grep -c '^XFAIL'`;			\
-	xpass=`echo "$$results" | grep -c '^XPASS'`;			\
-	failures=`expr $$fail + $$xpass`;				\
-	all=`expr $$all - $$skip`;					\
-	if test "$$all" -eq 1; then tests=test; All=;			\
-	else tests=tests; All="All "; fi;				\
-	case fail=$$fail:xpass=$$xpass:xfail=$$xfail in			\
-	  fail=0:xpass=0:xfail=0)					\
-	    msg="$$All$$all $$tests passed.  ";				\
-	    exit=true;;							\
-	  fail=0:xpass=0:xfail=*)					\
-	    msg="$$All$$all $$tests behaved as expected";		\
-	    if test "$$xfail" -eq 1; then xfailures=failure;		\
-	    else xfailures=failures; fi;				\
-	    msg="$$msg ($$xfail expected $$xfailures).  ";		\
-	    exit=true;;							\
-	  fail=*:xpass=0:xfail=*)					\
-	    msg="$$fail of $$all $$tests failed.  ";			\
-	    exit=false;;						\
-	  fail=*:xpass=*:xfail=*)					\
-	    msg="$$failures of $$all $$tests did not behave as expected"; \
-	    if test "$$xpass" -eq 1; then xpasses=pass;			\
-	    else xpasses=passes; fi;					\
-	    msg="$$msg ($$xpass unexpected $$xpasses).  ";		\
-	    exit=false;;						\
-	  *)								\
-	    echo >&2 "incorrect case"; exit 4;;				\
-	esac;								\
-	if test "$$skip" -ne 0; then					\
-	  if test "$$skip" -eq 1; then					\
-	    msg="$$msg($$skip test was not run).  ";			\
-	  else								\
-	    msg="$$msg($$skip tests were not run).  ";			\
-	  fi;								\
-	fi;								\
+	@$(am__set_TESTS_bases); \
+	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+	redo_bases=`for i in $$bases; do \
+	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+	            done`; \
+	if test -n "$$redo_bases"; then \
+	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+	  if $(am__make_dryrun); then :; else \
+	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
+	  fi; \
+	fi; \
+	if test -n "$$am__remaking_logs"; then \
+	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+	       "recursion detected" >&2; \
+	else \
+	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+	fi; \
+	if $(am__make_dryrun); then :; else \
+	  st=0;  \
+	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+	  for i in $$redo_bases; do \
+	    test -f $$i.trs && test -r $$i.trs \
+	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+	    test -f $$i.log && test -r $$i.log \
+	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+	  done; \
+	  test $$st -eq 0 || exit 1; \
+	fi
+	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+	ws='[ 	]'; \
+	results=`for b in $$bases; do echo $$b.trs; done`; \
+	test -n "$$results" || results=/dev/null; \
+	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
+	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
+	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
+	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
+	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+	  success=true; \
+	else \
+	  success=false; \
+	fi; \
+	br='==================='; br=$$br$$br$$br$$br; \
+	result_count () \
+	{ \
+	    if test x"$$1" = x"--maybe-color"; then \
+	      maybe_colorize=yes; \
+	    elif test x"$$1" = x"--no-color"; then \
+	      maybe_colorize=no; \
+	    else \
+	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
+	    fi; \
+	    shift; \
+	    desc=$$1 count=$$2; \
+	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
+	      color_start=$$3 color_end=$$std; \
+	    else \
+	      color_start= color_end=; \
+	    fi; \
+	    echo "$${color_start}# $$desc $$count$${color_end}"; \
+	}; \
+	create_testsuite_report () \
+	{ \
+	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
+	  result_count $$1 "PASS: " $$pass  "$$grn"; \
+	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
+	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+	  result_count $$1 "FAIL: " $$fail  "$$red"; \
+	  result_count $$1 "XPASS:" $$xpass "$$red"; \
+	  result_count $$1 "ERROR:" $$error "$$mgn"; \
+	}; \
 	{								\
 	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
 	    $(am__rst_title);						\
-	  echo "$$msg";							\
+	  create_testsuite_report --no-color;				\
 	  echo;								\
 	  echo ".. contents:: :depth: 2";				\
 	  echo;								\
-	  for f in $$list; do						\
-	    test -r $$f && read line < $$f || line=;			\
-	    case $$line in						\
-	      PASS:*|XFAIL:*);;						\
-	      *) echo; cat $$f;;					\
-	    esac;							\
-	  done;								\
-	} >$(TEST_SUITE_LOG).tmp;					\
+	  for b in $$bases; do echo $$b; done				\
+	    | $(am__create_global_log);					\
+	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
 	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
-	if test "$$failures" -ne 0; then				\
-	  msg="$${msg}See $(subdir)/$(TEST_SUITE_LOG).  ";		\
-	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
-	    msg="$${msg}Please report to $(PACKAGE_BUGREPORT).  ";	\
-	  fi;								\
-	fi;								\
-	test x"$$VERBOSE" = x || $$exit || cat $(TEST_SUITE_LOG);	\
-	$(am__tty_colors);						\
-	if $$exit; then							\
+	if $$success; then						\
 	  col="$$grn";							\
 	 else								\
 	  col="$$red";							\
+	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
 	fi;								\
-	echo "$$msg" | $(am__text_box) "col=$$col" "std=$$std";		\
-	$$exit || exit 1
-
-check-TESTS recheck:
-	@if test $@ != recheck; then \
-	   list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list; \
-	 fi
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-	@list='' list2='$(TEST_LOGS)'; for f in $$list2; do \
-	  test .log = $$f && continue; \
-	  if test $@ = recheck; then \
-	    test -f $$f || continue; \
-	    if test -r $$f && read line < $$f; then \
-	      case $$line in FAIL*|XPASS*) : ;; *) continue;; esac; \
-	    fi; \
-	  fi; \
-	  if test -z "$$list"; then list=$$f; else list="$$list $$f"; fi; \
-	done; \
-	if test $@ = recheck && test -n "$$list"; then \
-	  $(am__make_dryrun) || rm -f $$list || exit 1; \
-	fi; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$list"
-recheck: 
-
-am--mostlyclean-test-html:
-	list='$(TEST_LOGS:.log=.html)'; test -z "$$list" || rm -f $$list
-	rm -f $(TEST_SUITE_HTML)
-
-.log.html:
-	@list='$(RST2HTML) $$RST2HTML rst2html rst2html.py';		\
-	for r2h in $$list; do						\
-	  if ($$r2h --version) >/dev/null 2>&1; then			\
-	    R2H=$$r2h;							\
+	echo "$${col}$$br$${std}"; 					\
+	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}$$br$${std}"; 					\
+	create_testsuite_report --maybe-color;				\
+	echo "$$col$$br$$std";						\
+	if $$success; then :; else					\
+	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
+	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
+	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
 	  fi;								\
-	done;								\
-	if test -z "$$R2H"; then					\
-	  echo >&2 "cannot find rst2html, cannot create $@";		\
-	  exit 2;							\
+	  echo "$$col$$br$$std";					\
 	fi;								\
-	$$R2H $< >$@.tmp
-	@mv $@.tmp $@
-
-# Be sure to run check first, and then to convert the result.
-# Beware of concurrent executions.  Run "check" not "check-TESTS", as
-# check-SCRIPTS and other dependencies are rebuilt by the former only.
-# And expect check to fail.
-check-html recheck-html:
-	@target=`echo $@ | sed 's/-html$$//'`; \
-	rv=0; $(MAKE) $(AM_MAKEFLAGS) $$target || rv=$$?; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_HTML) TEST_LOGS= || exit 4; \
-	exit $$rv
+	$$success || exit 1
+
+check-TESTS:
+	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+	exit $$?;
+recheck: all 
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	bases=`for i in $$bases; do echo $$i; done \
+	         | $(am__list_recheck_tests)` || exit 1; \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	log_list=`echo $$log_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+	        am__force_recheck=am--force-recheck \
+	        TEST_LOGS="$$log_list"; \
+	exit $$?
 .sh.log:
-	@p='$<'; $(am__check_pre) $(SH_LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 @am__EXEEXT_TRUE@.sh$(EXEEXT).log:
-@am__EXEEXT_TRUE@	@p='$<'; $(am__check_pre) $(SH_LOG_COMPILE) "$$tst" $(am__check_post)
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 .pl.log:
-	@p='$<'; $(am__check_pre) $(PL_LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(PL_LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_PL_LOG_DRIVER_FLAGS) $(PL_LOG_DRIVER_FLAGS) -- $(PL_LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 @am__EXEEXT_TRUE@.pl$(EXEEXT).log:
-@am__EXEEXT_TRUE@	@p='$<'; $(am__check_pre) $(PL_LOG_COMPILE) "$$tst" $(am__check_post)
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(PL_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_PL_LOG_DRIVER_FLAGS) $(PL_LOG_DRIVER_FLAGS) -- $(PL_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 .xpl.log:
-	@p='$<'; $(am__check_pre) $(XPL_LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(XPL_LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_XPL_LOG_DRIVER_FLAGS) $(XPL_LOG_DRIVER_FLAGS) -- $(XPL_LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 @am__EXEEXT_TRUE@.xpl$(EXEEXT).log:
-@am__EXEEXT_TRUE@	@p='$<'; $(am__check_pre) $(XPL_LOG_COMPILE) "$$tst" $(am__check_post)
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(XPL_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_XPL_LOG_DRIVER_FLAGS) $(XPL_LOG_DRIVER_FLAGS) -- $(XPL_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 
 distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
 	$(am__remove_distdir)
 	test -d "$(distdir)" || mkdir "$(distdir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -7409,39 +11446,41 @@ distdir: $(DISTFILES)
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-lzip: distdir
 	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
-	$(am__remove_distdir)
-
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 dist-xz: distdir
 	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-shar: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-zip: distdir
 	-rm -f $(distdir).zip
 	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
-	$(am__remove_distdir)
+dist dist-all:
+	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+	$(am__post_remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
@@ -7452,8 +11491,6 @@ distcheck: dist
 	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lzma*) \
-	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.lz*) \
 	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
@@ -7465,9 +11502,9 @@ distcheck: dist
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod u+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
+	chmod -R a-w $(distdir)
+	chmod u+w $(distdir)
+	mkdir $(distdir)/_build $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
@@ -7475,9 +11512,10 @@ distcheck: dist
 	  && $(MAKE) $(AM_MAKEFLAGS) distcheck-hook \
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	  && ../configure \
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -7500,7 +11538,7 @@ distcheck: dist
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
 	  && cd "$$am__cwd" \
 	  || exit 1
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
@@ -7565,7 +11603,7 @@ mostlyclean-generic:
 	-test -z "$(ALLOCA)" || rm -f $(ALLOCA)
 	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
-	-test -z "$(TEST_LOGS_TMP)" || rm -f $(TEST_LOGS_TMP)
+	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
 	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 
 clean-generic:
@@ -7595,7 +11633,7 @@ maintainer-clean-generic:
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-recursive
 
-clean-am: clean-aminfo clean-binPROGRAMS clean-generic \
+clean-am: clean-aminfo clean-binPROGRAMS clean-generic clean-local \
 	clean-noinstLIBRARIES clean-noinstPROGRAMS \
 	clean-pkglibexecPROGRAMS mostlyclean-am
 
@@ -7639,7 +11677,8 @@ install-dvi-am: $(DVIS)
 	done
 install-exec-am: install-binPROGRAMS install-exec-local \
 	install-pkglibexecPROGRAMS
-
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 install-html: install-html-recursive
 
 install-html-am: $(HTMLS)
@@ -7748,9 +11787,8 @@ maintainer-clean-am: distclean-am maintainer-clean-aminfo \
 
 mostlyclean: mostlyclean-recursive
 
-mostlyclean-am: am--mostlyclean-test-html mostlyclean-aminfo \
-	mostlyclean-compile mostlyclean-generic mostlyclean-local \
-	mostlyclean-vti
+mostlyclean-am: mostlyclean-aminfo mostlyclean-compile \
+	mostlyclean-generic mostlyclean-local mostlyclean-vti
 
 pdf: pdf-recursive
 
@@ -7766,36 +11804,34 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dvi-am uninstall-html-am \
 
 uninstall-man: uninstall-man1
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
-	check-am check-html ctags-recursive install install-am \
-	install-strip recheck-html tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am all-local am--mostlyclean-test-html am--refresh \
-	check check-TESTS check-am check-html check-local clean \
-	clean-aminfo clean-binPROGRAMS clean-generic \
-	clean-noinstLIBRARIES clean-noinstPROGRAMS \
-	clean-pkglibexecPROGRAMS ctags ctags-recursive dist dist-all \
-	dist-bzip2 dist-gzip dist-hook dist-info dist-lzip dist-lzma \
-	dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
-	distclean-compile distclean-generic distclean-hdr \
+.MAKE: $(am__recursive_targets) all check check-am install install-am \
+	install-exec-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \
+	am--refresh check check-TESTS check-am check-local clean \
+	clean-aminfo clean-binPROGRAMS clean-cscope clean-generic \
+	clean-local clean-noinstLIBRARIES clean-noinstPROGRAMS \
+	clean-pkglibexecPROGRAMS cscope cscopelist-am ctags ctags-am \
+	dist dist-all dist-bzip2 dist-gzip dist-hook dist-info \
+	dist-lzip dist-shar dist-tarZ dist-xz dist-zip distcheck \
+	distclean distclean-compile distclean-generic distclean-hdr \
 	distclean-local distclean-tags distcleancheck distdir \
 	distuninstallcheck dvi dvi-am html html-am info info-am \
 	install install-am install-binPROGRAMS install-data \
 	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-exec-local install-html \
-	install-html-am install-info install-info-am install-man \
-	install-man1 install-pdf install-pdf-am \
+	install-exec-am install-exec-hook install-exec-local \
+	install-html install-html-am install-info install-info-am \
+	install-man install-man1 install-pdf install-pdf-am \
 	install-pkglibexecPROGRAMS install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-aminfo \
 	maintainer-clean-generic maintainer-clean-vti mostlyclean \
 	mostlyclean-aminfo mostlyclean-compile mostlyclean-generic \
 	mostlyclean-local mostlyclean-vti pdf pdf-am ps ps-am recheck \
-	recheck-html tags tags-recursive uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-dvi-am uninstall-html-am \
-	uninstall-info-am uninstall-local uninstall-man uninstall-man1 \
-	uninstall-pdf-am uninstall-pkglibexecPROGRAMS uninstall-ps-am
+	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \
+	uninstall-dvi-am uninstall-html-am uninstall-info-am \
+	uninstall-local uninstall-man uninstall-man1 uninstall-pdf-am \
+	uninstall-pkglibexecPROGRAMS uninstall-ps-am
 
 
 # Keep these in sync with bootstrap.conf:bootstrap_post_import_hook().
@@ -7810,6 +11846,10 @@ $(srcdir)/src/cu-progs.mk: $(gen_progs_lists)
 	$(AM_V_GEN)rm -f $@ $@-t \
 	  && $(SHELL) $(gen_progs_lists) --automake >$@-t \
 	  && chmod a-w $@-t && mv -f $@-t $@
+$(srcdir)/src/single-binary.mk: $(gen_single_binary) $(srcdir)/src/local.mk
+	$(AM_V_GEN)rm -f $@ $@-t \
+	  && $(SHELL) $(gen_single_binary) $(srcdir)/src/local.mk >$@-t \
+	  && chmod a-w $@-t && mv -f $@-t $@
 
 # Shortcut targets to make it easier to run (very) expensive tests.
 check-expensive:
@@ -7829,11 +11869,14 @@ dist-hook: gen-ChangeLog
 .PHONY: gen-ChangeLog
 gen-ChangeLog:
 	$(AM_V_GEN)if test -d .git; then				\
+	  log_fix="$(srcdir)/build-aux/git-log-fix";			\
+	  test -e "$$log_fix"						\
+	    && amend_git_log="--amend=$$log_fix"			\
+	    || amend_git_log=;						\
 	  $(top_srcdir)/build-aux/gitlog-to-changelog			\
-	    --amend=$(srcdir)/build-aux/git-log-fix			\
-	    --since=$(gen_start_date) > $(distdir)/cl-t;		\
-	  rm -f $(distdir)/ChangeLog;					\
-	  mv $(distdir)/cl-t $(distdir)/ChangeLog;			\
+	    $$amend_git_log --since=$(gen_start_date) > $(distdir)/cl-t && \
+	    { rm -f $(distdir)/ChangeLog &&				\
+	      mv $(distdir)/cl-t $(distdir)/ChangeLog; }		\
 	fi
 distcheck-hook: check-ls-dircolors
 	$(MAKE) my-distcheck
@@ -7888,6 +11931,24 @@ check-git-hook-script-sync:
 	rm -rf $$t;							\
 	test $$fail = 0
 
+# If we are building a single-binary, create symlinks or shebangs for
+# the selected tools when installing.
+install-exec-hook:
+	$(AM_V_at)ctrans=$$(printf coreutils | sed -e "$(transform)");	\
+	for p in $(single_binary_progs); do				\
+	  ptrans=$$(printf '%s' "$$p" | sed -e "$(transform)");		\
+	  rm -f $(DESTDIR)$(bindir)/$$ptrans$(EXEEXT) || exit $$?;	\
+	  if test "x$(single_binary_install_type)" = xshebangs; then	\
+	    printf '#!%s --coreutils-prog-shebang=%s\n'			\
+	      $(bindir)/$$ctrans$(EXEEXT) $$p				\
+	      >$(DESTDIR)$(bindir)/$$ptrans$(EXEEXT) || exit $$?;	\
+	    chmod a+x,a-w $(DESTDIR)$(bindir)/$$ptrans$(EXEEXT) || exit $$?;\
+	  else								\
+	    $(LN_S) -s $$ctrans$(EXEEXT)				\
+	      $(DESTDIR)$(bindir)/$$ptrans$(EXEEXT) || exit $$?;	\
+	  fi								\
+	done
+
 # We need the following in order to create <alloca.h> when the system
 # doesn't have one that works with the given compiler.
 @GL_GENERATE_ALLOCA_H_TRUE@lib/alloca.h: lib/alloca.in.h $(top_builddir)/config.status
@@ -7926,7 +11987,7 @@ lib/arpa/inet.h: lib/arpa_inet.in.h $(top_builddir)/config.status $(CXXDEFS_H) $
 	mv $@-t $@
 
 # Listed in the same order as the GNU makefile conventions, and
-# provided by autoconf 2.59c+.
+# provided by autoconf 2.59c+ or 2.70.
 # The Automake-defined pkg* macros are appended, in the order
 # listed in the Automake 1.10a+ documentation.
 lib/configmake.h: Makefile
@@ -7942,6 +12003,7 @@ lib/configmake.h: Makefile
 	  echo '#define SYSCONFDIR "$(sysconfdir)"'; \
 	  echo '#define SHAREDSTATEDIR "$(sharedstatedir)"'; \
 	  echo '#define LOCALSTATEDIR "$(localstatedir)"'; \
+	  echo '#define RUNSTATEDIR "$(runstatedir)"'; \
 	  echo '#define INCLUDEDIR "$(includedir)"'; \
 	  echo '#define OLDINCLUDEDIR "$(oldincludedir)"'; \
 	  echo '#define DOCDIR "$(docdir)"'; \
@@ -8180,6 +12242,7 @@ lib/inttypes.h: lib/inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(W
 	      -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \
 	      -e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \
 	      -e 's/@''REPLACE_STRTOIMAX''@/$(REPLACE_STRTOIMAX)/g' \
+	      -e 's/@''REPLACE_STRTOUMAX''@/$(REPLACE_STRTOUMAX)/g' \
 	      -e 's/@''INT32_MAX_LT_INTMAX_MAX''@/$(INT32_MAX_LT_INTMAX_MAX)/g' \
 	      -e 's/@''INT64_MAX_EQ_LONG_MAX''@/$(INT64_MAX_EQ_LONG_MAX)/g' \
 	      -e 's/@''UINT32_MAX_LT_UINTMAX_MAX''@/$(UINT32_MAX_LT_UINTMAX_MAX)/g' \
@@ -8761,52 +12824,6 @@ lib/warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h
 	  > $@-t && \
 	mv $@-t $@
 
-# We need the following in order to create a replacement for <spawn.h> when
-# the system doesn't have one.
-lib/spawn.h: lib/spawn.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''HAVE_SPAWN_H''@|$(HAVE_SPAWN_H)|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-	      -e 's|@''NEXT_SPAWN_H''@|$(NEXT_SPAWN_H)|g' \
-	      -e 's/@''GNULIB_POSIX_SPAWN''@/$(GNULIB_POSIX_SPAWN)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNP''@/$(GNULIB_POSIX_SPAWNP)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_DESTROY''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_DESTROY)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_INIT''@/$(GNULIB_POSIX_SPAWNATTR_INIT)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_GETFLAGS''@/$(GNULIB_POSIX_SPAWNATTR_GETFLAGS)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_SETFLAGS''@/$(GNULIB_POSIX_SPAWNATTR_SETFLAGS)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_GETPGROUP''@/$(GNULIB_POSIX_SPAWNATTR_GETPGROUP)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_SETPGROUP''@/$(GNULIB_POSIX_SPAWNATTR_SETPGROUP)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_GETSCHEDPARAM''@/$(GNULIB_POSIX_SPAWNATTR_GETSCHEDPARAM)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_SETSCHEDPARAM''@/$(GNULIB_POSIX_SPAWNATTR_SETSCHEDPARAM)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_GETSCHEDPOLICY''@/$(GNULIB_POSIX_SPAWNATTR_GETSCHEDPOLICY)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_SETSCHEDPOLICY''@/$(GNULIB_POSIX_SPAWNATTR_SETSCHEDPOLICY)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_GETSIGDEFAULT''@/$(GNULIB_POSIX_SPAWNATTR_GETSIGDEFAULT)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT''@/$(GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_GETSIGMASK''@/$(GNULIB_POSIX_SPAWNATTR_GETSIGMASK)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_SETSIGMASK''@/$(GNULIB_POSIX_SPAWNATTR_SETSIGMASK)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_DESTROY''@/$(GNULIB_POSIX_SPAWNATTR_DESTROY)/g' \
-	      -e 's|@''HAVE_POSIX_SPAWN''@|$(HAVE_POSIX_SPAWN)|g' \
-	      -e 's|@''HAVE_POSIX_SPAWNATTR_T''@|$(HAVE_POSIX_SPAWNATTR_T)|g' \
-	      -e 's|@''HAVE_POSIX_SPAWN_FILE_ACTIONS_T''@|$(HAVE_POSIX_SPAWN_FILE_ACTIONS_T)|g' \
-	      -e 's|@''REPLACE_POSIX_SPAWN''@|$(REPLACE_POSIX_SPAWN)|g' \
-	      -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE)|g' \
-	      -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2)|g' \
-	      -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN)|g' \
-	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-	      < $(top_srcdir)/lib/spawn.in.h; \
-	} > $@-t && \
-	mv $@-t $@
-
 # We need the following in order to create <stdalign.h> when the system
 # doesn't have one that works.
 @GL_GENERATE_STDALIGN_H_TRUE@lib/stdalign.h: lib/stdalign.in.h $(top_builddir)/config.status
@@ -9054,6 +13071,7 @@ lib/stdlib.h: lib/stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
 	      -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \
 	      -e 's/@''GNULIB_REALPATH''@/$(GNULIB_REALPATH)/g' \
 	      -e 's/@''GNULIB_RPMATCH''@/$(GNULIB_RPMATCH)/g' \
+	      -e 's/@''GNULIB_SECURE_GETENV''@/$(GNULIB_SECURE_GETENV)/g' \
 	      -e 's/@''GNULIB_SETENV''@/$(GNULIB_SETENV)/g' \
 	      -e 's/@''GNULIB_STRTOD''@/$(GNULIB_STRTOD)/g' \
 	      -e 's/@''GNULIB_STRTOLL''@/$(GNULIB_STRTOLL)/g' \
@@ -9082,6 +13100,7 @@ lib/stdlib.h: lib/stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
 	      -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \
 	      -e 's|@''HAVE_REALPATH''@|$(HAVE_REALPATH)|g' \
 	      -e 's|@''HAVE_RPMATCH''@|$(HAVE_RPMATCH)|g' \
+	      -e 's|@''HAVE_SECURE_GETENV''@|$(HAVE_SECURE_GETENV)|g' \
 	      -e 's|@''HAVE_DECL_SETENV''@|$(HAVE_DECL_SETENV)|g' \
 	      -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \
 	      -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \
@@ -9488,6 +13507,7 @@ lib/time.h: lib/time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
 	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \
+	      -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \
 	      -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \
 	      -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \
 	      -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \
@@ -9497,6 +13517,8 @@ lib/time.h: lib/time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU
 	      -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \
 	      -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \
 	      -e 's|@''HAVE_TIMEGM''@|$(HAVE_TIMEGM)|g' \
+	      -e 's|@''REPLACE_GMTIME''@|$(REPLACE_GMTIME)|g' \
+	      -e 's|@''REPLACE_LOCALTIME''@|$(REPLACE_LOCALTIME)|g' \
 	      -e 's|@''REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \
 	      -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \
 	      -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \
@@ -9624,6 +13646,7 @@ lib/unistd.h: lib/unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_N
 	      -e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \
 	      -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \
 	      -e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \
+	      -e 's|@''REPLACE_GETDTABLESIZE''@|$(REPLACE_GETDTABLESIZE)|g' \
 	      -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \
 	      -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \
 	      -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \
@@ -9826,6 +13849,26 @@ mostlyclean-local: mostlyclean-generic
 # Allow "make distdir" to succeed before "make all" has run.
 dist-hook: $(noinst_LIBRARIES)
 .PHONY: dist-hook
+src/coreutils_symlinks: Makefile
+	$(AM_V_GEN)touch $@
+	$(AM_V_at)for i in $(single_binary_progs); do \
+		rm -f src/$$i$(EXEEXT) || exit $$?; \
+		$(LN_S) -s coreutils$(EXEEXT) src/$$i$(EXEEXT) || exit $$?; \
+	done
+src/coreutils_shebangs: Makefile
+	$(AM_V_GEN)touch $@
+	$(AM_V_at)for i in $(single_binary_progs); do \
+		rm -f src/$$i$(EXEEXT) || exit $$?; \
+		printf '#!%s --coreutils-prog-shebang=%s\n' \
+			$(abs_top_builddir)/src/coreutils$(EXEEXT) $$i \
+			>src/$$i$(EXEEXT) || exit $$?; \
+		chmod a+x,a-w src/$$i$(EXEEXT) || exit $$?; \
+	done
+
+clean-local:
+	$(AM_V_at)for i in $(single_binary_progs); do \
+		rm -f src/$$i$(EXEEXT) || exit $$?; \
+	done
 src/dircolors.h: src/dcgen src/dircolors.hin
 	$(AM_V_GEN)rm -f $@ $@-t
 	$(AM_V_at)$(PERL) -w -- $(srcdir)/src/dcgen \
@@ -9844,24 +13887,32 @@ $(top_srcdir)/src/primes.h:
 # Also compare against /usr/include/linux/magic.h
 .PHONY: src/fs-magic-compare
 src/fs-magic-compare: src/fs-magic src/fs-kernel-magic src/fs-def
-	join -v1 -t@ src/fs-magic src/fs-def
-	join -v1 -t@ src/fs-kernel-magic src/fs-def
+	@join -v1 -t@ src/fs-magic src/fs-def
+	@join -v1 -t@ src/fs-kernel-magic src/fs-def
 src/fs-def: src/fs.h
 	grep '^# *define ' src/fs.h | $(ASSORT) > $@-t && mv $@-t $@
 src/fs-magic: Makefile
-	man statfs \
+	@MANPAGER= man statfs \
 	  |perl -ne '/File system types:/.../Nobody kno/ and print'	\
 	  |grep 0x | perl -p						\
 	    $(fs_normalize_perl_subst)					\
 	  | grep -Ev 'S_MAGIC_EXT[34]|STACK_END'			\
 	  | $(ASSORT)							\
 	  > $@-t && mv $@-t $@
-src/fs-kernel-magic: Makefile
-	perl -ne '/^#define.*0x/ and print' /usr/include/linux/magic.h	\
+# This rule currently gets the latest header, but probably isn't general
+# enough to enable by default.
+#	@kgit='https://git.kernel.org/cgit/linux/kernel/git'; \
+#	wget -q $$kgit/torvalds/linux.git/plain/include/uapi/linux/magic.h \
+#	  -O $@
+src/fs-latest-magic.h:
+	@touch $@
+src/fs-kernel-magic: Makefile src/fs-latest-magic.h
+	@perl -ne '/^#define.*0x/ and print'				\
+	  /usr/include/linux/magic.h src/fs-latest-magic.h		\
 	  | perl -p							\
 	    $(fs_normalize_perl_subst)					\
 	  | grep -Ev 'S_MAGIC_EXT[34]|STACK_END'			\
-	  | $(ASSORT)							\
+	  | $(ASSORT) -u						\
 	  > $@-t && mv $@-t $@
 src/fs-is-local.h: src/stat.c src/extract-magic
 	$(AM_V_GEN)rm -f $@
@@ -9886,6 +13937,15 @@ src/version.h: Makefile
 	$(AM_V_at)printf 'extern char const *Version;\n' > $@t
 	$(AM_V_at)chmod a-w $@t
 	$(AM_V_at)mv $@t $@
+src/coreutils.h: Makefile
+	$(AM_V_GEN)rm -f $@
+	$(AM_V_at)for prog in $(single_binary_progs); do	\
+	  prog=`basename $$prog`;				\
+	  main=`echo $$prog | tr '[' '_'`;			\
+	  echo "SINGLE_BINARY_PROGRAM(\"$$prog\", $$main)";	\
+	done | sort > $@t
+	$(AM_V_at)chmod a-w $@t
+	$(AM_V_at)mv $@t $@
 # Ensure that the list of programs in README matches the list
 # of programs we can build.
 check-local: check-README check-duplicate-no-install
@@ -9973,148 +14033,57 @@ sc-lower-case-var:
 
 check-local: check-texinfo
 
-# This is required because we have subtle inter-directory dependencies:
-# in order to generate all man pages, even those for which we don't
-# install a binary, require that all programs be built at distribution
-# time.  We can't use 'dist-hook' for this, since it would run too late:
-# the manpages must be generated before the distdir is created and filled.
-$(EXTRA_MANS): $(all_programs)
-
 # This is a kludge to remove generated 'man/*.1' from a non-srcdir build.
 # Without this, "make distcheck" might fail.
 distclean-local:
 	test x$(srcdir) = x$(builddir) || rm -f $(ALL_MANS)
 
 $(ALL_MANS): $(mandeps)
-
-# Most prog.1 man pages depend on src/prog.  List the exceptions:
-# Note that dir and vdir are exceptions only if you consider the name
-# of the .c file upon which they depend: ls.c.
-man/arch.1:      src/uname
-man/dir.1:       src/dir
-man/install.1:   src/ginstall
-man/vdir.1:      src/vdir
-
-man/base64.1:    src/base64
-man/basename.1:  src/basename
-man/cat.1:       src/cat
-man/chcon.1:     src/chcon
-man/chgrp.1:     src/chgrp
-man/chmod.1:     src/chmod
-man/chown.1:     src/chown
-man/chroot.1:    src/chroot
-man/cksum.1:     src/cksum
-man/comm.1:      src/comm
-man/cp.1:        src/cp
-man/csplit.1:    src/csplit
-man/cut.1:       src/cut
-man/date.1:      src/date
-man/dd.1:        src/dd
-man/df.1:        src/df
-man/dircolors.1: src/dircolors
-man/dirname.1:   src/dirname
-man/du.1:        src/du
-man/echo.1:      src/echo
-man/env.1:       src/env
-man/expand.1:    src/expand
-man/expr.1:      src/expr
-man/factor.1:    src/factor
-man/false.1:     src/false
-man/fmt.1:       src/fmt
-man/fold.1:      src/fold
-man/groups.1:    src/groups
-man/head.1:      src/head
-man/hostid.1:    src/hostid
-man/hostname.1:  src/hostname
-man/id.1:        src/id
-man/join.1:      src/join
-man/kill.1:      src/kill
-man/link.1:      src/link
-man/ln.1:        src/ln
-man/logname.1:   src/logname
-man/ls.1:        src/ls
-man/md5sum.1:    src/md5sum
-man/mkdir.1:     src/mkdir
-man/mkfifo.1:    src/mkfifo
-man/mknod.1:     src/mknod
-man/mktemp.1:    src/mktemp
-man/mv.1:        src/mv
-man/nice.1:      src/nice
-man/nl.1:        src/nl
-man/nohup.1:     src/nohup
-man/nproc.1:     src/nproc
-man/numfmt.1:    src/numfmt
-man/od.1:        src/od
-man/paste.1:     src/paste
-man/pathchk.1:   src/pathchk
-man/pinky.1:     src/pinky
-man/pr.1:        src/pr
-man/printenv.1:  src/printenv
-man/printf.1:    src/printf
-man/ptx.1:       src/ptx
-man/pwd.1:       src/pwd
-man/readlink.1:  src/readlink
-man/realpath.1:  src/realpath
-man/rm.1:        src/rm
-man/rmdir.1:     src/rmdir
-man/runcon.1:    src/runcon
-man/seq.1:       src/seq
-man/sha1sum.1:   src/md5sum
-man/sha224sum.1: src/md5sum
-man/sha256sum.1: src/md5sum
-man/sha384sum.1: src/md5sum
-man/sha512sum.1: src/md5sum
-man/shred.1:     src/shred
-man/shuf.1:      src/shuf
-man/sleep.1:     src/sleep
-man/sort.1:      src/sort
-man/split.1:     src/split
-man/stat.1:      src/stat
-man/stdbuf.1:    src/stdbuf
-man/stty.1:      src/stty
-man/sum.1:       src/sum
-man/sync.1:      src/sync
-man/tac.1:       src/tac
-man/tail.1:      src/tail
-man/tee.1:       src/tee
-man/test.1:      src/test
-man/timeout.1:   src/timeout
-man/touch.1:     src/touch
-man/tr.1:        src/tr
-man/true.1:      src/true
-man/truncate.1:  src/truncate
-man/tsort.1:     src/tsort
-man/tty.1:       src/tty
-man/uname.1:     src/uname
-man/unexpand.1:  src/unexpand
-man/uniq.1:      src/uniq
-man/unlink.1:    src/unlink
-man/uptime.1:    src/uptime
-man/users.1:     src/users
-man/wc.1:        src/wc
-man/who.1:       src/who
-man/whoami.1:    src/whoami
-man/yes.1:       src/yes
+man/dynamic-deps.mk: Makefile
+	$(AM_V_GEN)rm -f $@ $@-t
+	$(AM_V_at)for man in $(ALL_MANS); do				\
+		name=`echo "$$man"|sed 's|.*/||; s|\.1$$||'` || exit 1;	\
+		case $$name in						\
+		     arch) prog='uname';;				\
+		  install) prog='ginstall';;				\
+		     test) prog='[';;					\
+			*) prog=$$name;;				\
+		esac;							\
+		case " $(single_binary_progs) " in			\
+			*" $$prog "*)					\
+				echo $$man: src/coreutils$(EXEEXT);;	\
+			*)						\
+				echo $$man: src/$$prog$(EXEEXT);;	\
+		esac							\
+	done > $@-t							\
+	&& mv $@-t $@
+
+# Include the generated man dependencies.
+@AMDEP_TRUE@@am__include@ man/dynamic-deps.mk
 
 .x.1:
 	$(AM_V_GEN)name=`echo $@ | sed 's|.*/||; s|\.1$$||'` || exit 1;	\
 	case $$name in							\
-	  install) prog='ginstall';;					\
-	     test) prog='[';;						\
-		*) prog=$$name;;					\
+	  install) prog='ginstall'; argv=$$name;;			\
+	     test) prog='['; argv='[';;					\
+		*) prog=$$name; argv=$$prog;;				\
 	esac;								\
 	rm -f $@ $@-t							\
 	  && t=$*.td							\
 	  && rm -rf $$t							\
 	  && $(MKDIR_P) $$t						\
-	  && (cd $$t && $(LN_S) '$(abs_top_builddir)/src/'$$prog $$name) \
+	  && (cd $$t && $(LN_S) '$(abs_top_builddir)/src/'$$prog $$argv) \
 	  && $(run_help2man)						\
 		     --source='$(PACKAGE_STRING)'			\
 		     --include=$(srcdir)/man/$$name.x			\
-		     --output=$$t/$$name.1 $$t/$$name			\
-	  && sed 's|$*\.td/||g' $$t/$$name.1 > $@-t			\
+		     --output=$$t/$$name.1 $$t/$$argv			\
+		     --info-page='coreutils \(aq'$$name' invocation\(aq' \
+	  && sed \
+	       -e 's|$*\.td/||g' \
+	       -e '/For complete documentation/d' \
+	       $$t/$$name.1 > $@-t			\
 	  && rm -rf $$t							\
-	  && chmod -w $@-t						\
+	  && chmod a-w $@-t						\
 	  && mv $@-t $@
 .PHONY: check-root
 check-root:
@@ -10125,7 +14094,7 @@ $(factor_tests): $(tf)/run.sh $(tf)/create-test.sh
 	$(AM_V_at)$(SHELL) $(srcdir)/$(tf)/create-test.sh $@ \
 	  $(srcdir)/$(tf)/run.sh > $@-t
 	$(AM_V_at)chmod a+x $@-t
-	$(AM_V_at)mv $@-t $@
+	$(AM_V_at)mv -f $@-t $@
 
 $(TEST_LOGS): $(PROGRAMS)
 
diff --git a/NEWS b/NEWS
index 7122f410..4bffdf23 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,322 @@
 GNU coreutils NEWS                                    -*- outline -*-
 
+* Noteworthy changes in release 8.23 (2014-07-18) [stable]
+
+** Bug fixes
+
+  chmod -Rc no longer issues erroneous warnings for files with special bits set.
+  [bug introduced in coreutils-6.0]
+
+  cp -a, mv, and install --preserve-context, once again set the correct SELinux
+  context for existing directories in the destination.  Previously they set
+  the context of an existing directory to that of its last copied descendent.
+  [bug introduced in coreutils-8.22]
+
+  cp -a, mv, and install --preserve-context, no longer seg fault when running
+  with SELinux enabled, when copying from file systems that return an error
+  when reading the SELinux context for a file.
+  [bug introduced in coreutils-8.22]
+
+  cp -a and mv now preserve xattrs of symlinks copied across file systems.
+  [bug introduced with extended attribute preservation feature in coreutils-7.1]
+
+  date could crash or go into an infinite loop when parsing a malformed TZ="".
+  [bug introduced with the --date='TZ="" ..' parsing feature in coreutils-5.3.0]
+
+  dd's ASCII and EBCDIC conversions were incompatible with common practice and
+  with POSIX, and have been corrected as follows.  First, conv=ascii now
+  implies conv=unblock, and conv=ebcdic and conv=ibm now imply conv=block.
+  Second, the translation tables for dd conv=ascii and conv=ebcdic have been
+  corrected as shown in the following table, where A is the ASCII value, W is
+  the old, wrong EBCDIC value, and E is the new, corrected EBCDIC value; all
+  values are in octal.
+
+      A   W   E
+     041 117 132
+     133 112 255
+     135 132 275
+     136 137 232
+     174 152 117
+     176 241 137
+     313 232 152
+     325 255 112
+     345 275 241
+
+  [These dd bugs were present in "the beginning".]
+
+  df has more fixes related to the newer dynamic representation of file systems:
+  Duplicates are elided for virtual file systems like tmpfs.
+  Details for the correct device are output for points mounted multiple times.
+  Placeholder values are output for inaccessible file systems, rather than
+  than error messages or values for the wrong file system.
+  [These bugs were present in "the beginning".]
+
+  df now outputs all appropriate entries in the presence of bind mounts.
+  On some systems, entries would have been incorrectly elided due to
+  them being considered "dummy" mounts.
+  [bug introduced in coreutils-8.22]
+
+  du now silently ignores directory cycles introduced with bind mounts.
+  Previously it would issue a warning and exit with a failure status.
+  [bug introduced in coreutils-8.1]
+
+  head --bytes=-N and --lines=-N now handles devices more
+  consistently, not ignoring data from virtual devices like /dev/zero,
+  or on BSD systems data from tty devices.
+  [bug introduced in coreutils-5.0.1]
+
+  head --bytes=-N - no longer fails with a bogus diagnostic when stdin's
+  seek pointer is not at the beginning.
+  [bug introduced with the --bytes=-N feature in coreutils-5.0.1]
+
+  head --lines=-0, when the input does not contain a trailing '\n',
+  now copies all input to stdout.  Previously nothing was output in this case.
+  [bug introduced with the --lines=-N feature in coreutils-5.0.1]
+
+  id, when invoked with no user name argument, now prints the correct group ID.
+  Previously, in the default output format, it would print the default group ID
+  in the password database, which may be neither real nor effective.  For e.g.,
+  when run set-GID, or when the database changes outside the current session.
+  [bug introduced in coreutils-8.1]
+
+  ln -sf now replaces symbolic links whose targets can't exist.  Previously
+  it would display an error, requiring --no-dereference to avoid the issue.
+  [bug introduced in coreutils-5.3.0]
+
+  ln -sr '' F no longer segfaults.  Now works as expected.
+  [bug introduced with the --relative feature in coreutils-8.16]
+
+  numfmt now handles blanks correctly in all unibyte locales.  Previously
+  in locales where character 0xA0 is a blank, numfmt would mishandle it.
+  [bug introduced when numfmt was added in coreutils-8.21]
+
+  ptx --format long option parsing no longer falls through into the --help case.
+  [bug introduced in TEXTUTILS-1_22i]
+
+  ptx now consistently trims whitespace when processing multiple files.
+  [This bug was present in "the beginning".]
+
+  seq again generates correct output with start or end values = -0.
+  [bug introduced in coreutils-8.20.]
+
+  shuf --repeat no longer dumps core if the input is empty.
+  [bug introduced with the --repeat feature in coreutils-8.22]
+
+  sort when using multiple threads now avoids undefined behavior with mutex
+  destruction, which could cause deadlocks on some implementations.
+  [bug introduced in coreutils-8.6]
+
+  tail -f now uses polling mode for VXFS to cater for its clustered mode.
+  [bug introduced with inotify support added in coreutils-7.5]
+
+** New features
+
+  od accepts a new option: --endian=TYPE to handle inputs with different byte
+  orders, or to provide consistent output on systems with disparate endianness.
+
+  configure accepts the new option --enable-single-binary to build all the
+  selected programs in a single binary called "coreutils".  The selected
+  programs can still be called directly using symlinks to "coreutils" or
+  shebangs with the option --coreutils-prog= passed to this program.  The
+  install behavior is determined by the option --enable-single-binary=symlinks
+  or --enable-single-binary=shebangs (the default).  With the symlinks option,
+  you can't make a second symlink to any program because that will change the
+  name of the called program, which is used by coreutils to determine the
+  desired program.  The shebangs option doesn't suffer from this problem, but
+  the /proc/$pid/cmdline file might not be updated on all the platforms.  The
+  functionality of each program is not affected but this single binary will
+  depend on all the required dynamic libraries even to run simple programs.
+  If you desire to build some tools outside the single binary file, you can
+  pass the option --enable-single-binary-exceptions=PROG_LIST with the comma
+  separated list of programs you want to build separately.  This flag
+  considerably reduces the overall size of the installed binaries which makes
+  it suitable for embedded system.
+
+** Changes in behavior
+
+  chroot with an argument of "/" no longer implicitly changes the current
+  directory to "/", allowing changing only user credentials for a command.
+
+  chroot --userspec will now unset supplemental groups associated with root,
+  and instead use the supplemental groups of the specified user.
+
+  cut -d$'\n' again outputs lines identified in the --fields list, having
+  not done so in v8.21 and v8.22.  Note using this non portable functionality
+  will result in the delayed output of lines.
+
+  ls with none of LS_COLORS or COLORTERM environment variables set,
+  will now honor an empty or unknown TERM environment variable,
+  and not output colors even with --colors=always.
+
+** Improvements
+
+  chroot has better --userspec and --group look-ups, with numeric IDs never
+  causing name look-up errors.  Also look-ups are first done outside the chroot,
+  in case the look-up within the chroot fails due to library conflicts etc.
+
+  install now allows the combination of the -D and -t options.
+
+  numfmt supports zero padding of numbers using the standard printf
+  syntax of a leading zero, for example --format="%010f".
+  Also throughput was improved by up to 800% by avoiding redundant processing.
+
+  shred now supports multiple passes on GNU/Linux tape devices by rewinding
+  the tape before each pass, avoids redundant writes to empty files,
+  uses direct I/O for all passes where possible, and attempts to clear
+  inode storage used for small files on some file systems.
+
+  split avoids unnecessary input buffering, immediately writing input to output
+  which is significant with --filter or when writing to fifos or stdout etc.
+
+  stat and tail work better with HFS+, HFSX, LogFS and ConfigFS.  stat -f
+  --format=%T now reports the file system type, and tail -f now uses inotify,
+  rather than the default of issuing a warning and reverting to polling.
+
+
+* Noteworthy changes in release 8.22 (2013-12-13) [stable]
+
+** Bug fixes
+
+  df now processes the mount list correctly in the presence of unstatable
+  mount points.  Previously it may have failed to output some mount points.
+  [bug introduced in coreutils-8.21]
+
+  df now processes symbolic links and relative paths to special files containing
+  a mounted file system correctly.  Previously df displayed the statistics about
+  the file system the file is stored on rather than the one inside.
+  [This bug was present in "the beginning".]
+
+  df now processes disk device nodes correctly in the presence of bind mounts.
+  Now df shows the base mounted file system rather than the last one mounted.
+  [This bug was present in "the beginning".]
+
+  install now removes the target file if the strip program failed for any
+  reason.  Before, that file was left behind, sometimes even with wrong
+  permissions.
+  [This bug was present in "the beginning".]
+
+  ln --relative now updates existing symlinks correctly.  Previously it based
+  the relative link on the dereferenced path of an existing link.
+  [This bug was introduced when --relative was added in coreutils-8.16.]
+
+  ls --recursive will no longer exit with "serious" exit code (2), if there
+  is an error reading a directory not specified on the command line.
+  [Bug introduced in coreutils-5.3.0]
+
+  mkdir, mkfifo, and mknod now work better when creating a file in a directory
+  with a default ACL whose umask disagrees with the process's umask, on a
+  system such as GNU/Linux where directory ACL umasks override process umasks.
+  [bug introduced in coreutils-6.0]
+
+  mv will now replace empty directories in the destination with directories
+  from the source, when copying across file systems.
+  [This bug was present in "the beginning".]
+
+  od -wN with N larger than 64K on a system with 32-bit size_t would
+  print approximately 2*N bytes of extraneous padding.
+  [Bug introduced in coreutils-7.0]
+
+  rm -I now prompts for confirmation before removing a write protected file.
+  [Bug introduced in coreutils-6.8]
+
+  shred once again uses direct I/O on systems requiring aligned buffers.
+  Also direct I/O failures for odd sized writes at end of file are now handled.
+  [The "last write" bug was introduced in coreutils-5.3.0 but masked
+   by the alignment bug introduced in coreutils-6.0]
+
+  tail --retry -f now waits for the files specified to appear.  Before, tail
+  would immediately exit when such a file is initially inaccessible.
+  [This bug was introduced when inotify support was added in coreutils-7.5]
+
+  tail -F has improved handling of symlinks.  Previously tail didn't respond
+  to the symlink target (re)appearing after being (re)created.
+  [This bug was introduced when inotify support was added in coreutils-7.5]
+
+** New features
+
+  cp, install, mkdir, mknod, mkfifo and mv now support "restorecon"
+  functionality through the -Z option, to set the SELinux context
+  appropriate for the new item location in the file system.
+
+  csplit accepts a new option: --suppressed-matched, to elide the lines
+  used to identify the split points.
+
+  df --output now accepts a 'file' field, to propagate a specified
+  command line argument through to the output.
+
+  du accepts a new option: --inodes to show the number of inodes instead
+  of the blocks used.
+
+  id accepts a new option: --zero (-z) to delimit the output entries by
+  a NUL instead of a white space character.
+
+  id and ls with -Z report the SMACK security context where available.
+  mkdir, mkfifo and mknod with --context set the SMACK context where available.
+
+  id can now lookup by user ID, in addition to the existing name lookup.
+
+  join accepts a new option: --zero-terminated (-z). As with the sort,uniq
+  option of the same name, this makes join consume and produce NUL-terminated
+  lines rather than newline-terminated lines.
+
+  uniq accepts a new option: --group to print all items, while separating
+  unique groups with empty lines.
+
+  shred accepts new parameters to the --remove option to give greater
+  control over that operation, which can greatly reduce sync overhead.
+
+  shuf accepts a new option: --repeat (-r), which can repeat items in
+  the output.
+
+** Changes in behavior
+
+  cp --link now dereferences a symbolic link as source before creating the
+  hard link in the destination unless the -P,--no-deref option is specified.
+  Previously, it would create a hard link of the symbolic link, even when
+  the dereferencing options -L or -H were specified.
+
+  cp, install, mkdir, mknod and mkfifo no longer accept an argument to the
+  short -Z option.  The --context equivalent still takes an optional argument.
+
+  dd status=none now suppresses all non fatal diagnostic messages,
+  not just the transfer counts.
+
+  df no longer accepts the long-obsolescent --megabytes option.
+
+  stdbuf now requires at least one buffering mode option to be specified,
+  as per the documented interface.
+
+** Improvements
+
+  base64 encoding throughput for bulk data is increased by about 60%.
+
+  md5sum can use libcrypto hash routines where allowed to potentially
+  get better performance through using more system specific logic.
+  sha1sum for example has improved throughput by 40% on an i3-2310M.
+  This also affects sha1sum, sha224sum, sha256sum, sha384sum and sha512sum.
+
+  stat and tail work better with EFIVARFS, EXOFS, F2FS, HOSTFS, SMACKFS, SNFS
+  and UBIFS.  stat -f --format=%T now reports the file system type, and tail -f
+  now uses inotify for files on all those except SNFS, rather than the default
+  (for unknown file system types) of issuing a warning and reverting to polling.
+
+  shuf outputs subsets of large inputs much more efficiently.
+  Reservoir sampling is used to limit memory usage based on the number of
+  outputs, rather than the number of inputs.
+
+  shred increases the default write block size from 12KiB to 64KiB
+  to align with other utilities and reduce the system call overhead.
+
+  split --line-bytes=SIZE, now only allocates memory as needed rather
+  than allocating SIZE bytes at program start.
+
+  stty now supports configuring "stick" (mark/space) parity where available.
+
+** Build-related
+
+  factor now builds on aarch64 based systems [bug introduced in coreutils-8.20]
+
+
 * Noteworthy changes in release 8.21 (2013-02-14) [stable]
 
 ** New programs
@@ -16,6 +333,9 @@ GNU coreutils NEWS                                    -*- outline -*-
   with such a minimum SIZE (or a maximum SIZE if it is negative).
   du recognizes -t SIZE as equivalent, for compatibility with FreeBSD.
 
+  timeout now accepts the --preserve-status option to always propagate the exit
+  status, useful for commands that can run for an indeterminite amount of time.
+
 ** Bug fixes
 
   cp --no-preserve=mode now no longer exits non-zero.
@@ -79,6 +399,9 @@ GNU coreutils NEWS                                    -*- outline -*-
   the system by skipping duplicate entries (identified by the device number).
   Consequently, df also elides the early-boot pseudo file system type "rootfs".
 
+  cut -d$'\n' no longer outputs lines identified in the --fields list,
+  to align with other implementations and to avoid delayed output of lines.
+
   nl no longer supports the --page-increment option, which has been
   deprecated since coreutils-7.5.  Use --line-increment instead.
 
@@ -823,6 +1146,9 @@ GNU coreutils NEWS                                    -*- outline -*-
   However, with the above change to %X, %Y and %Z, we've made %W work
   the same way as the others.
 
+  stat gained support for several printf-style flags, such as %'s for
+  listing sizes with the current locale's thousands separator.
+
 
 * Noteworthy changes in release 8.6 (2010-10-15) [stable]
 
@@ -3891,7 +4217,7 @@ packages, see ./old/*/NEWS.
 
 ========================================================================
 
-Copyright (C) 2001-2013 Free Software Foundation, Inc.
+Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/README b/README
index a7cbacff..bd0bce59 100644
--- a/README
+++ b/README
@@ -7,15 +7,15 @@ arbitrary limits.
 
 The programs that can be built with this package are:
 
-  [ arch base64 basename cat chcon chgrp chmod chown chroot cksum comm cp
-  csplit cut date dd df dir dircolors dirname du echo env expand expr
-  factor false fmt fold groups head hostid hostname id install join kill
-  link ln logname ls md5sum mkdir mkfifo mknod mktemp mv nice nl nohup
-  nproc numfmt od paste pathchk pinky pr printenv printf ptx pwd readlink
-  realpath rm rmdir runcon seq sha1sum sha224sum sha256sum sha384sum sha512sum
-  shred shuf sleep sort split stat stdbuf stty sum sync tac tail tee test
-  timeout touch tr true truncate tsort tty uname unexpand uniq unlink
-  uptime users vdir wc who whoami yes
+  [ arch base64 basename cat chcon chgrp chmod chown chroot cksum comm
+  coreutils cp csplit cut date dd df dir dircolors dirname du echo env
+  expand expr factor false fmt fold groups head hostid hostname id install
+  join kill link ln logname ls md5sum mkdir mkfifo mknod mktemp mv nice nl
+  nohup nproc numfmt od paste pathchk pinky pr printenv printf ptx pwd
+  readlink realpath rm rmdir runcon seq sha1sum sha224sum sha256sum sha384sum
+  sha512sum shred shuf sleep sort split stat stdbuf stty sum sync tac tail
+  tee test timeout touch tr true truncate tsort tty uname unexpand uniq
+  unlink uptime users vdir wc who whoami yes
 
 See the file NEWS for a list of major changes in the current release.
 
@@ -207,9 +207,11 @@ Here are instructions for checking out the latest development sources:
 
 If your patch adds a new feature, please try to get some sort of consensus
 that it is a worthwhile change.  One way to do that is to send mail to
-bug-coreutils@gnu.org including as much description and justification
+coreutils@gnu.org including as much description and justification
 as you can.  Based on the feedback that generates, you may be able to
-convince us that it's worth adding.
+convince us that it's worth adding.  Please also consult the list of
+previously discussed but ultimately rejected feature requests at:
+http://www.gnu.org/software/coreutils/rejected_requests.html
 
 
 WARNING:  Now that we use the ./bootstrap script, you should not run
@@ -240,7 +242,7 @@ the address on the last line of --help output.
 
 ========================================================================
 
-Copyright (C) 1998-2013 Free Software Foundation, Inc.
+Copyright (C) 1998-2014 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/THANKS b/THANKS
index ab08fd96..e6299d6b 100644
--- a/THANKS
+++ b/THANKS
@@ -6,11 +6,12 @@ logs and ChangeLog files.  If your name has been left out, if you'd rather
 not be listed, or if you'd prefer a different address be used, please send a
 note to the bug-report mailing list (as seen at end of e.g., cp --help).
 
+???                                 kytek@cybercomm.net
+A Costa                             agcosta@gis.net
 Aaron Burgemeister                  dajoker@gmail.com
 Aaron Davies                        aaron.davies@gmail.com
 Aaron Hawley                        ashawley@uvm.edu
 Achim Blumensath                    blume@corona.oche.de
-A Costa                             agcosta@gis.net
 Adam Jimerson                       vendion@charter.net
 Adam Klein                          aklein@debian.org
 Adam Sampson                        ats@offog.org
@@ -25,7 +26,9 @@ Albert Chin-A-Young                 china@thewrittenword.com
 Albert Hopkins                      ahopkins@dynacare.com
 Alberto Accomazzi                   alberto@cfa0.harvard.edu
 aldomel                             aldomel@ix.netcom.com
+Aleksej Serdjukov                   deletesoftware@yandex.ru
 Alen Muzinic                        zveki@fly.cc.fer.hr
+Alex Deymo                          deymo@chromium.org
 Alexander Nguyen                    vinh@seas.ucla.edu
 Alexander V. Lukyanov               lav@netis.ru
 Alexandre Duret-Lutz                duret_g@epita.fr
@@ -37,29 +40,30 @@ Ambrose Feinstein                   ambrose@google.com
 Amr Ali                             amr.ali.cc@gmail.com
 Anders Kaseorg                      andersk@mit.edu
 Andi Kleen                          freitag@alancoxonachip.com
+Andre Novaes Cunha                  Andre.Cunha@br.global-one.net
 Andreas Dilger                      adilger@sun.com
 Andreas Frische                     andreasfrische@gmail.com
 Andreas Gruenbacher                 ag@bestbits.at
 Andreas Jaeger                      jaeger@gnu.org
 Andreas Luik                        luik@isa.de
+Andreas Mohr                        andi@lisas.de
 Andreas Schwab                      schwab@linux-m68k.org
 Andreas Stolcke                     stolcke@ICSI.Berkeley.EDU
 Andrei Gaponenko                    andr@triumf.ca
-Andre Novaes Cunha                  Andre.Cunha@br.global-one.net
 Andres Soolo                        andres@soolo.matti.ee
 Andrew Burgess                      aab@cichlid.com
 Andrew Church                       achurch@achurch.org
-Andrew Dalke                        dalke@bioreason.com
 Andrew D Warshall                   warshall@99main.com
+Andrew Dalke                        dalke@bioreason.com
 Andrew Fabbro                       andrew@fabbro.org
 Andrew Pham                         andpha@us.ibm.com
 Andrew Tridgell                     tridge@samba.org
 Andrey Borzenkov                    arvidjaar@mail.ru
 Andries Brouwer                     Andries.Brouwer@cwi.nl
 Andy Longton                        alongton@metamark.com
-�ngel González                      keisial@gmail.com
 Anoop Sharma                        sendtoanoop@gmail.com
 Anthony Thyssen                     anthony@griffith.edu.au
+Anton Ovchinnikov                   revolver112@gmail.com
 Antonio Rendas                      ajrendas@yahoo.com
 Ariel Faigon                        ariel@cthulhu.engr.sgi.com
 Arjan Opmeer                        arjan.opmeer@gmail.com
@@ -78,12 +82,12 @@ Axel Kittenberger                   Anshil@gmx.net
 Barry Kelly                         http://barrkel.blogspot.com/
 Bauke Jan Douma                     bjdouma@xs4all.nl
 Ben Elliston                        bje@air.net.au
-Bengt Martensson                    bengt@mathematik.uni-Bremen.de
 Ben Harris                          bjh21@netbsd.org
+Ben Walton                          bdwalton@gmail.com
+Bengt Martensson                    bengt@mathematik.uni-Bremen.de
 Benjamin Cutler                     cutlerbc@simla.colostate.edu
 Benno Schulenberg                   bensberg@justemail.net
 Benoît Knecht                       benoit.knecht@fsfe.org
-Ben Walton                          bwalton@artsci.utoronto.ca
 Bernard Giroud                      bernard.giroud@creditlyonnais.ch
 Bernd Eckenfels                     ecki@debian.org
 Bernd Leibing                       bernd.leibing@rz.uni-ulm.de
@@ -98,11 +102,12 @@ Bert Wesarg                         bert.wesarg@googlemail.com
 Bill Brelsford                      wb@k2di.net
 Bill Peters                         peters@gaffel.as.arizona.edu
 Bjorn Helgaas                       helgaas@rsn.hp.com
-Bob McCracken                       kerouac@ravenet.com
 Bo Borgerson                        gigabo@gmail.com
+Bob McCracken                       kerouac@ravenet.com
 Bob Proulx                          bob@proulx.com
 Branden Robinson                    branden@necrotic.deadbeast.net
 Brendan O'Dea                       bod@compusol.com.au
+Brian Foster                        bfoster@redhat.com
 Brian Kimball                       bfk@footbag.org
 Brian M. Carlson                    sandals@crustytoothpaste.ath.cx
 Brian Silverman                     bsilverman@conceptxdesign.com
@@ -112,15 +117,16 @@ Bruce Korb                          bkorb@gnu.org
 Bruce Robertson                     brucer@theodolite.dyndns.org
 Bruno Haible                        bruno@clisp.org
 Brynnen Owen                        owen@illinois.edu
+C de-Avillez                        hggdh2@gmail.com
 Carl Johnson                        carlj@cjlinux.home.org
 Carl Lowenstein                     cdl@mpl.UCSD.EDU
-Carlos Canau                        Carlos.Canau@relay.puug.pt
 Carl Roth                           roth@urs.us
-C de-Avillez                        hggdh2@gmail.com
+Carlos Canau                        Carlos.Canau@relay.puug.pt
 Charles Karney                      karney@pppl.gov
 Charles Randall                     crandall@matchlogic.com
 Chas. Owens                         chas.owens@gmail.com
 Chen Guo                            chen.guo.0625@gmail.com
+Chengwei Yang                       chengwei.yang@intel.com
 Chip Salzenberg                     chip@valinux.com
 Chris Clayton                       chris2553@googlemail.com
 Chris Faylor                        cgf@cygnus.com
@@ -128,6 +134,7 @@ Chris J. Bednar                     cjb@AdvancedDataSolutions.com
 Chris Jones                         cjns1989@gmail.com
 Chris Lesniewski                    ctl@mit.edu
 Chris Sylvain                       csylvain@umm.edu
+Chris Yeo                           cyeo@biking.org
 Christi Alice Scarborough           christi@chiark.greenend.org.uk
 Christian Harkort                   christian.harkort@web.de
 Christian Jullien                   eligis@orange.fr
@@ -135,42 +142,43 @@ Christian Krackowizer               ckrackowiz@std.schuler-ag.com
 Christian Rose                      menthos@menthos.com
 Christian von Roques                roques@pond.sub.org
 Christophe LYON                     christophe.lyon@st.com
-Chris Yeo                           cyeo@biking.org
 Chuck Hedrick                       hedrick@klinzhai.rutgers.edu
 Chusslove Illich                    caslav.ilic@gmx.net
 Clark Morgan                        cmorgan@aracnet.com
 Clement Wang                        clem.wang@overture.com
 Cliff Miller                        cbm@whatexit.org
 Cojocaru Alexandru                  xojoc@gmx.com
+Colin Leitner                       colin.leitner@googlemail.com
 Colin Plumb                         colin@nyx.net
 Colin Watson                        cjwatson@ubuntu.com
 Collin Rogowski                     collin@rogowski.de
 Cray-Cyber Project                  http://www.cray-cyber.org
 Cristian Cadar                      cristic@stanford.edu
 Cyril Bouthors                      cyril@bouthors.org
+D. Hugh Redelmeier                  hugh@mimosa.com
 Dale Scheetz                        dwarf@polaris.net
 Dameon G. Rogers                    dgr03@uark.edu
 Dan Hagerty                         hag@gnu.ai.it.edu
 Dan Hipschman                       dsh@linux.ucla.edu
+Dan Jacobson                        jidanni@jidanni.org
+Dan Pascu                           dan@services.iiruc.ro
 Daniel Bergstrom                    noa@melody.se
 Daniel Dunbar                       daniel@zuster.org
+Daniel J Walsh                      dwalsh@redhat.com
+Daniel Mach                         dmach@redhat.com
 Daniel P. Berrangé                  berrange@redhat.com
 Daniel Schepler                     dschepler@gmail.com
 Daniel Stavrovski                   d@stavrovski.net
 Daniel Tschinder                    daniel.tschinder@project-a.com
-Dániel Varga                        danielv@axelero.hu
-Dan Jacobson                        jidanni@jidanni.org
 Danny Levinson                      danny.levinson@overture.com
-Dan Pascu                           dan@services.iiruc.ro
 Darrel Francis                      d.francis@cheerful.com
 Darren Salt                         ds@youmustbejoking.demon.co.uk
 Dave Beckett                        dajobe@dajobe.org
-David Alan Gilbert                  gilbertd@treblig.org
 David A. Wheeler                    dwheeler@dwheeler.com
+David Alan Gilbert                  gilbertd@treblig.org
 David Bartley                       dtbartle@csclub.uwaterloo.ca
 David Diggles                       david.diggles@dnrm.qld.gov.au
 David Dyck                          dcd@tc.fluke.COM
-Davide Canova                       kc.canova@gmail.com
 David Eisner                        cradle@umd.edu
 David Flynn                         dav@chess.plus.com
 David Gast                          dgast@csulb.edu
@@ -179,39 +187,46 @@ David Luyer                         david_luyer@pacific.net.au
 David Madore                        david.madore@ens.fr
 David Malone                        dwmalone@cnri.dit.ie
 David Matei                         matei@cs.toronto.edu
+David Michael                       fedora.dm0@gmail.com
+Davide Canova                       kc.canova@gmail.com
 Dawson Engler                       engler@stanford.edu
 Dean Gaudet                         dean-savannah@arctic.org
 Deepak Goel                         deego@gnufans.org
-Denis Excoffier                     denis.excoffier@airbus.com
+Denis Excoffier                     gcc@Denis-Excoffier.org
 Denis McKeon                        dmckeon@swcp.com
 Dennis Clarke                       dclarke@blastwave.org
 Dennis Henriksen                    opus@flamingo.osrl.dk
 Dennis Smit                         ds@nerds-incorporated.org
 Derek Clegg                         dclegg@next.com
 Dick Streefland                     dick_streefland@tasking.com
-Dirk-Jan Faber                      djfaber@snow.nl
 Dirk Lattermann                     dlatt@t-online.de
+Dirk-Jan Faber                      djfaber@snow.nl
 Dmitry Rutsky                       rutsky@school.ioffe.rssi.ru
 Dmitry V. Levin                     ldv@altlinux.org
-Donni Erpel                         donald@appc11.gsi.de
 Don Parsons                         dparsons@synapse.kent.edu
+Donni Erpel                         donald@appc11.gsi.de
 Doug Coleman                        coleman@iarc1.ece.utexas.edu
 Doug McLaren                        dougmc@comco.com
 Dragos Harabor                      dharabor@us.oracle.com
 Duncan Roe                          duncanr@optimation.com.au
+Dylan Simon                         dylan@dylex.net
+Dániel Varga                        danielv@axelero.hu
 Ed Avis                             ed@membled.com
 Ed Santiago                         ed@edsantiago.com
+Edgars Irmejs                       edgars.irmejs@gmail.com
 Edward Schwartz                     edmcman@cmu.edu
-Edward Welbourne                    eddy@opera.com
+Edward Welbourne                    eddy@chaos.org.uk
 Edzer Pebesma                       Edzer.Pebesma@rivm.nl
 Egmont Koblinger                    egmont@uhulinux.hu
 Eirik Fuller                        eirik@hackrat.com
 Eivind                              eivindt@multinet.no
 Elbert Pol                          elbert.pol@gmail.com
-Elias Pipping                       pipping@gentoo.org
+Eldon Stegall                       eldon@eldondev.com
 Eli Zaretskii                       eliz@is.elta.co.il
+Elias Pipping                       pipping@gentoo.org
 Emile LeBlanc                       leblanc@math.toronto.edu
 Emmanuel Lacour                     elacour@home-dn.net
+Enrico Scholz                       enrico.scholz@informatik.tu-chemnitz.de
 Eric Backus                         ericb@lsid.hp.com
 Eric Blake                          eblake@redhat.com
 Eric G. Miller                      egm2@jps.net
@@ -219,6 +234,7 @@ Eric Pemente                        pemente@northpark.edu
 Eric S. Raymond                     esr@snark.thyrsus.com
 Erik Auerswald                      auerswal@unix-ag.uni-kl.de
 Erik Bennett                        bennett@cvo.oneworld.com
+Erik Bernstein                      erik@fscking.org
 Erik Corry                          erik@kroete2.freinet.de
 Evan Hunt                           ethanol@armory.com
 Felix Lee                           flee@teleport.com
@@ -230,19 +246,21 @@ Florent Bayle                       florent@sarcelle.net
 Florian Schlichting                 fschlich@cis.fu-berlin.de
 Florin Iucha                        fiucha@hsys.mic.ro
 Francesco Montorsi                  fr_m@hotmail.com
-François Pinard                     pinard@iro.umontreal.ca
 Frank Adler                         fadler@allesklar.de
 Frank T Lofaro                      ftlofaro@snooks.Egr.UNLV.EDU
-Frédéric L. W. Meunier              0@pervalidus.net
-Frederik Eaton                      frederik@caltech.edu
+François Pinard                     pinard@iro.umontreal.ca
 Fred Fish                           fnf@ninemoons.com
+Frederik Eaton                      frederik@caltech.edu
+Frédéric L. W. Meunier              0@pervalidus.net
+FUJIWARA Katsunori                  foozy@lares.dti.ne.jp
+G.P. Halkes                         buscom@ghalkes.nl
 Gabor Z. Papp                       gzp@gzp.org.hu
-Gaël Quéri                          gqueri@mail.dotcom.fr
 Galen Hazelwood                     galenh@micron.net
 Gary Anderson                       ganderson@clark.net
 Gary Johnson                        garyjohn@spk.agilent.com
 Gary V. Vaughan                     gary@gnu.org
 Gaute Hvoslef Kvalnes               gaute@verdsveven.com
+Gaël Quéri                          gqueri@mail.dotcom.fr
 Geoff Collyer                       geoff at collyer.net
 Geoff Kuenning                      geoff@cs.hmc.edu
 Geoff Odhner                        geoff@franklin.com
@@ -250,23 +268,25 @@ Geoff Whale                         geoffw@cse.unsw.EDU.AU
 Gerald Pfeifer                      gerald@pfeifer.com
 Gerhard Poul                        gpoul@gnu.org
 Germano Leichsenring                germano@jedi.cs.kobe-u.ac.jp
+Gian Piero Carrubba                 gpiero@rm-rf.it
 Gilles Espinasse                    g.esp@free.fr
 Giuseppe Scrivano                   gscrivano@gnu.org
 Glen Lenker                         glen.lenker@gmail.com
-Göran Uddeborg                      goeran@uddeborg.se
 GOTO Masanori                       gotom@debian.or.jp
-G.P. Halkes                         buscom@ghalkes.nl
 Greg Louis                          glouis@dynamicro.on.ca
 Greg McGary                         gkm@gnu.org
 Greg Metcalfe                       metcalfegreg@qwest.net
-Gregory Leblanc                     gleblanc@cu-portland.edu
 Greg Schafer                        gschafer@zip.com.au
 Greg Troxel                         gdt@bbn.com
 Greg Wooledge                       gawooledge@sherwin.com
+Gregory Leblanc                     gleblanc@cu-portland.edu
 Guenter Knauf                       lists@gknw.net
 Guido Leenders                      guido.leenders@invantive.com
+Guilherme de Almeida Suckevicz      guito.linux@gmail.com
 Guntram Blohm                       Extern.Guntram.Blohm@AUDI.DE
 Guochun Shi                         gshi@ncsa.uiuc.edu
+Göran Uddeborg                      goeran@uddeborg.se
+H. J. Lu                            hjl@valinux.com
 Hans Ginzel                         hans@matfyz.cz
 Hans Lermen                         lermen@fgan.de
 Hans Verkuil                        hans@wyst.hobby.nl
@@ -279,7 +299,6 @@ Heikki Orsila                       heikki.orsila@iki.fi
 Heiko Marr                          h.marr@webmasters.de
 Helen Faulkner                      helen_ml_faulkner@yahoo.co.uk
 Herbert Xu                          herbert@gondor.apana.org.au
-H. J. Lu                            hjl@valinux.com
 Holger Berger                       hberger@ess.nec.de
 Hon-Yin Kok                         hkok@yoda.unl.edu
 Hugh Daniel                         hugh@xanadu.com
@@ -296,14 +315,15 @@ Ingo Weinhold                       ingo_weinhold@gmx.de
 Ivan Labath                         labath3@st.fmph.uniba.sk
 Ivan Sichmann Freitas               ivansichfreitas@gmail.com
 Ivo Timmermans                      ivo@debian.org
+J. Scott Edwards                    qrw.software@gmail.com
 Jacky Fong                          jacky.fong@utoronto.ca
 Jakob Truelsen                      jakob@scalgo.com
+James                               james@albion.glarp.com
 James Antill                        jmanti%essex.ac.uk@seralph21.essex.ac.uk
 James Hunt                          jamesodhunt@hotmail.com
-James                               james@albion.glarp.com
 James Lemley                        James.Lemley@acxiom.com
-James Ralston                       ralston@pobox.com
 James R. Van Zandt                  jrv@debian.org
+James Ralston                       ralston@pobox.com
 James Sneeringer                    jvs@ocslink.com
 James Tanis                         jtt@soscorp.com
 James Youngman                      jay@gnu.org
@@ -314,25 +334,24 @@ Jan Engelhardt                      jengelh@medozas.de
 Jan Fedak                           J.Fedak@sh.cvut.cz
 Jan Moringen                        jan.moringen@uni-bielefeld.de
 Jan Nieuwenhuizen                   janneke@gnu.org
-Janos Farkas                        chexum@shadow.banki.hu
 Jan-Pawel Wrozstinski               jpwroz@gmail.com
+Janos Farkas                        chexum@shadow.banki.hu
 Jari Aalto                          jari.aalto@cante.net
 Jarkko Hietaniemi                   jhi@epsilon.hut.fi
+Jarkko Sakkinen                     jarkko.sakkinen@iki.fi
 Jarod Wilson                        jwilson@redhat.com
+Javier López                        chilicuil@ubuntu.com
 Jean Charles Delepine               delepine@u-picardie.fr
 Jean-Pierre Tosoni                  jpt.7196@gmail.com
 Jeff Liu                            jeff.liu@oracle.com
-jeff.liu                            jeff.liu@oracle.com
 Jeff Moore                          jbm@mordor.com
 Jeff Sheinberg                      jeff@bsrd.net
+jeff.liu                            jeff.liu@oracle.com
 Jens Elkner                         elkner@imsgroup.de
 Jens Schmidt                        jms@jsds.hamburg.com
 Jeph Cowan                          jeph@ucar.edu
-Jérémy Compostella                  jeremy.compostella@gmail.com
-Jérémy Magrin                       jeremy.magrin@epitech.eu
 Jeremy Maitin-Shepard               jbms@cmu.edu
 Jerome Abela                        abela@hsc.fr
-Jérôme Zago                         bug-coreutils-ml@agt-the-walker.net
 Jerry Snitselaar                    dev@snitselaar.org
 Jesse Kornblum                      kornblum@usna.edu
 Jesse Thilo                         jgt2@eecs.lehigh.edu
@@ -344,13 +363,14 @@ Jim Meyering                        jim@meyering.net
 Joachim Schmitz                     jojo@schmitz-digital.de
 Joakim Rosqvist                     dvljrt@cs.umu.se
 Jochen Hein                         jochen@jochen.org
-Joel E. Denny                       jdenny@clemson.edu
 Joe Orton                           joe@manyfish.co.uk
+Joel E. Denny                       jdenny@clemson.edu
 Joerg Sonnenberger                  joerg@britannica.bec.de
 Joey Degges                         jdegges@gmail.com
 Joey Hess                           joeyh@debian.org
 Johan Boule                         bohan@bohan.dyndns.org
 Johan Danielsson                    joda@pdc.kth.se
+John                                da_audiophile@yahoo.com
 John Bley                           jbb6@acpub.duke.edu
 John David Anglin                   dave.anglin@nrc.ca
 John Gatewood Ham                   zappaman@alphabox.compsci.buu.ac.th
@@ -367,20 +387,23 @@ Jon Ringuette                       jonr@scharp.org
 Joost van Baal                      joostvb@xs4all.nl
 Jordi Pujol                         jordipujolp@gmail.com
 Jorge Stolfi                        stolfi@ic.unicamp.br
+Joseph D. Wagner                    joe@josephdwagner.info
 Joseph S. Myers                     jsm28@cam.ac.uk
 Josh Triplett                       josh@freedesktop.org
 Joshua Hudson                       joshudson@gmail.com
 Josselin Mouette                    joss@debian.org
-J. Scott Edwards                    qrw.software@gmail.com
 Juan F. Codagnone                   juam@arnet.com.ar
 Juan M. Guerrero                    st001906@hrz1.hrz.tu-darmstadt.de
 Julian Bradfield                    jcb@inf.ed.ac.uk
 Jungshik Shin                       jshin@pantheon.yale.edu
 Juraj Marko                         jmarko@redhat.com
-Jürgen Fluk                         louis@dachau.marco.de
 Jurriaan                            thunder7@xs4all.nl
 Justin Pryzby                       justinpryzby@users.sourceforge.net
 jvogel                              jvogel@linkny.com
+Jérémy Compostella                  jeremy.compostella@gmail.com
+Jérémy Magrin                       jeremy.magrin@epitech.eu
+Jérôme Zago                         bug-coreutils-ml@agt-the-walker.net
+Jürgen Fluk                         louis@dachau.marco.de
 Kai Henningsen                      kai@debian.org
 Kai-Uwe Rommel                      rommel@informatik.tu-muenchen.de
 Kalle Olavi Niemitalo               kon@iki.fi
@@ -396,6 +419,8 @@ Kaveh R. Ghazi                      ghazi@caip.rutgers.edu
 Keith M. Briggs                     keith.briggs@bt.com
 Keith Owens                         kaos@audio.apana.org.au
 Keith Thompson                      kst@cts.com
+Ken Booth                           ken@booths.org.uk
+Ken Irving                          ken.irving@alaska.edu
 Ken Pizzini                         kenp@halcyon.com
 Kevin Lyda                          kevin@ie.suberic.net
 Kevin Mudrick                       kmudrick@healthmarketscience.com
@@ -406,7 +431,6 @@ Konrad Wróblewski                   coni@o2.pl
 Kristin E Thomas                    kristint@us.ibm.com
 Kristoffer Rose                     kris@diku.dk
 Krzysztof Goj                       krzysztof.goj@gmail.com
-???                                 kytek@cybercomm.net
 Ladislav Hagara                     ladislav.hagara@unob.cz
 Larry McVoy                         lm@sgi.com
 Lars Hecking                        lhecking@nmrc.ucc.ie
@@ -420,17 +444,18 @@ Lorne Baker                         lbaker@nitro.avint.net
 Ludovic Courtès                     ludo@gnu.org
 Luke Hassell                        lukehassell@yahoo.com
 Luke Kendall                        lukekendall@optushome.com.au
+M. P. Suzuki                        mpsuzuki@hiroshima-u.ac.jp
 Maciej Kwapulinski                  pikpok@univ.gda.pl
 Manas Garg                          manas@cygsoft.com
 Manfred Hollstein                   manfred@s-direktnet.de
 Marc Boucher                        marc@mbsi.ca
-Marcel Böhme                        http://www.comp.nus.edu.sg/~mboehme
 Marc Haber                          mh+debian-bugs@zugschlus.de
 Marc Kleine-Budde                   mkl@pengutronix.de
 Marc Lehman                         schmorp@schmorp.de
 Marc Mengel                         mengel@fnal.gov
-Marco Franzen                       Marco.Franzen@Thyron.com
 Marc Olzheim                        marcolz@stack.nl
+Marcel Böhme                        http://www.comp.nus.edu.sg/~mboehme
+Marco Franzen                       Marco.Franzen@Thyron.com
 Marcus Brinkmann                    http://www.marcus-brinkmann.de
 Marcus Daniels                      marcus@ee.pdx.edu
 Marek Polacek                       mpolacek@redhat.com
@@ -445,27 +470,32 @@ Mark Hubbart                        discord@mac.com
 Mark Kettenis                       kettenis@phys.uva.nl
 Mark Melahn                         mmelahn@gmail.com
 Mark Nudelman                       marknu@flash.net
+Mark W. Eichin                      eichin@cygnus.com
 Markus Demleitner                   msdemlei@auriga.ari.uni-heidelberg.de
 Markus Duft                         mduft@gentoo.org
-Mark W. Eichin                      eichin@cygnus.com
 Martial Bornet                      mbornet.pro@gmail.com
+Martin                              martin@dresden.nacamar.de
 Martin Buck                         martin.buck@ascom.ch
 Martin Gallant                      martyg@goodbit.net
 Martin Hippe                        martin.hippe@schlund.de
 Martin Jacobs                       martin.jacobs@arcor.de
-Martin                              martin@dresden.nacamar.de
 Martin Michlmayr                    tbm@cyrius.com
 Martin Mitchell                     martin@debian.org
 Martin P.J. Zinser                  zinser@decus.de
 Marty Leisner                       leisner@sdsp.mc.xerox.com
 Masami Takikawa                     takikawm@CS.ORST.EDU
-Matěj Cepl                          mcepl@redhat.com
-Matej Vela                          mvela@public.srce.hr
 Mate Wierdl                         mw@moni.msci.memphis.edu
+Matej Vela                          mvela@public.srce.hr
 Mathias Brodala                     info@noctus.net
 Mathieu Bridon                      bochecha@fedoraproject.org
 Matias A. Fonzo                     selk@dragora.org
 Matt Harden                         matth@mindspring.com
+Matt Kraai                          kraai@ftbfs.org
+Matt McCutchen                      matt@mattmccutchen.net
+Matt Perry                          matt@primefactor.com
+Matt Pham                           mattvpham@gmail.com
+Matt Schalit                        mschalit@pacbell.net
+Matt Swift                          swift@alum.mit.edu
 Matthew Arnison                     maffew@cat.org.au
 Matthew Braun                       matthew@ans.net
 Matthew Clarke                      Matthew_Clarke@mindlink.bc.ca
@@ -477,15 +507,12 @@ Matthew Woehlke                     mw_triad@users.sourceforge.net
 Matthias Urlichs                    smurf@noris.de
 Matti Aarnio                        matti.aarnio@zmailer.org
 Mattias Wadenstein                  maswan@acc.umu.se
-Matt Kraai                          kraai@ftbfs.org
-Matt McCutchen                      matt@mattmccutchen.net
-Matt Perry                          matt@primefactor.com
-Matt Pham                           mattvpham@gmail.com
-Matt Schalit                        mschalit@pacbell.net
-Matt Swift                          swift@alum.mit.edu
+Matěj Cepl                          mcepl@redhat.com
 Max Chang                           maxchang@ucla.edu
 Meelis Roos                         mroos@tartu.cyber.ee
 Micah Cowan                         micah@cowan.name
+Michael                             michael@aplatform.com
+Michael ???                         michael@roka.net
 Michael Bacarella                   mbac@netgraft.com
 Michael Deutschmann                 michael@talamasca.ocis.net
 Michael Elizabeth Chastain          mec.gnu@mindspring.com
@@ -497,8 +524,6 @@ Michael J. Daniel                   michael.j.daniel@comcast.net
 Michael McFarland                   sidlon@yahoo.com
 Michael McLagan                     mmclagan@invlogic.com
 Michael Meskes                      michael@fam-meskes.de
-Michael                             michael@aplatform.com
-Michael ???                         michael@roka.net
 Michael Mol                         mikemol@gmail.com
 Michael Piefel                      piefel@informatik.hu-berlin.de
 Michael Price                       mprice@atl.lmco.com
@@ -512,6 +537,7 @@ Michael Veksler                     mveksler@techunix.technion.ac.il
 Michail Litvak                      mci@owl.openwall.com
 Michal Politowski                   mpol@charybda.icm.edu.pl
 Michal Svec                         msvec@suse.cz
+Michal Trunecka                     mtruneck@redhat.com
 Michel Robitaille                   robitail@IRO.UMontreal.CA
 Michiel Bacchiani                   bacchian@raven.bu.edu
 Mikael Magnusson                    mikachu@gmail.com
@@ -525,8 +551,8 @@ Miles Bader                         miles@gnu.ai.mit.edu
 Minh Tran-Le                        tranle@intellicorp.com
 Moritz Orbach                       ml-coreutils@apfelboymchen.homeunix.net
 Morten Welinder                     terra@diku.dk
-M. P. Suzuki                        mpsuzuki@hiroshima-u.ac.jp
 Nadav Har'El                        nyh@math.technion.ac.il
+Namhyung Kim                        namhyung@gmail.com
 Nao Nishijima                       nao.nishijima.xt@hitachi.com
 Neal H Walfield                     neal@cs.uml.edu
 Neil F. Brown                       neilb@suse.de
@@ -538,6 +564,7 @@ Nick Graham                         nick.d.graham@gmail.com
 Nick Lawes                          nlawes@silverplatter.com
 Nickolai Zeldovich                  nickolai@cs.stanford.edu
 Nicolas François                    nicolas.francois@centraliens.net
+Nicolas Iooss                       nicolas.iooss@m4x.org
 Niels Möller                        nisse@lysator.liu.se
 Niklas Edmundsson                   nikke@acc.umu.se
 Nikola Milutinovic                  Nikola.Milutinovic@ev.co.yu
@@ -548,6 +575,7 @@ Nix                                 nix@esperi.org.uk
 Noah Friedman                       friedman@splode.com
 Noel Cragg                          noel@red-bean.com
 Norbert Kiesel                      nkiesel@tbdnetworks.com
+Norihiro Kamae                      norihiro@nagater.net
 Olatunji Oluwabukunmi Ruwase        tjruwase@stanford.edu
 Olav Morkrid                        olav@funcom.com
 Ole Laursen                         olau@hardworking.dk
@@ -555,10 +583,8 @@ Oliver Kiddle                       okiddle@yahoo.co.uk
 Olivier Fourdan                     ofourdan@redhat.com
 Ondrej Oprala                       ooprala@redhat.com
 Ondřej Vašík                        ovasik@redhat.com
-Ørn E. Hansen                       oehansen@daimi.aau.dk
 Oskar Liljeblad                     osk@hem.passagen.se
 Otavio Salvador                     otavio@ossystems.com.br
-Pádraig Brady                       p@draigbrady.com
 Paolo Bonzini                       bonzini@gnu.org
 Patrick Mauritz                     oxygene@studentenbude.ath.cx
 Patrick Schoenfeld                  schoenfeld@debian.org
@@ -590,16 +616,17 @@ Peter Samuelson                     psamuels@sampo.creighton.edu
 Peter Seebach                       seebs@taniemarie.solon.com
 Petr Pisar                          petr.pisar@atlas.cz
 Petr Salinger                       Petr.Salinger@seznam.cz
+Petr Stodůlka                       pstodulk@redhat.com
 Petr Uzel                           petr.uzel@suse.cz
 Petter Reinholdtsen                 pere@hungry.com
 Phelippe Neveu                      pneveu@pcigeomatics.com
-Philippe De Muyter                  phdm@macqel.be
-Philippe Schnoebelen                Philippe.Schnoebelen@imag.fr
+Phil Richards                       phil.richards@vf.vodafone.co.uk
+Philip Rowlands                     phr@doc.ic.ac.uk
 Philipp Gortan                      gortan@gmail.com
 Philipp Thomas                      pth@suse.de
-Philip Rowlands                     phr@doc.ic.ac.uk
+Philippe De Muyter                  phdm@macqel.be
+Philippe Schnoebelen                Philippe.Schnoebelen@imag.fr
 Phillip Jones                       mouse@datastacks.com
-Phil Richards                       phil.richards@vf.vodafone.co.uk
 Piergiorgio Sartor                  sartor@sony.de
 Pieter Bowman                       bowman@math.utah.edu
 Piotr Gackiewicz                    gacek@intertele.pl
@@ -608,16 +635,20 @@ Pozsár Balázs                       pozsy@uhulinux.hu
 Prashant TR                         tr@eth.net
 Priit Jõerüüt                       jemm4jemm@yahoo.com
 Primoz PETERLIN                     primozz.peterlin@gmail.com
+Pádraig Brady                       P@draigBrady.com
+Pádraig Brady                       p@draigBrady.com
 Raimonds Miltins                    raimonds@pro-9.com
 Rainer Orth                         ro@TechFak.Uni-Bielefeld.DE
-Ralf Wildenhues                     Ralf.Wildenhues@gmx.de
 Ralf W. Stephan                     stephan@tmt.de
+Ralf Wildenhues                     Ralf.Wildenhues@gmx.de
 Ralph Loader                        loader@maths.ox.ac.uk
 Rasmus Borup Hansen                 rbh@intomics.com
+Rasmus Villemoes                    rv@rasmusvillemoes.dk
 Raul Miller                         moth@magenta.com
 Raúl Núñez de Arenas Coronado       raul@pleyades.net
 Reuben Thomas                       rrt@sc3d.org
 ribalba                             geerd.dietger.hoffmann@gmail.com
+Rich Burridge                       rich.burridge@oracle.com
 Richard A Downing                   richard.downing@bcs.org.uk
 Richard Braakman                    dark@xs4all.nl
 Richard Dawe                        rich@phekda.freeserve.co.uk
@@ -629,12 +660,12 @@ Rick Stanley                        rstanley@rsiny.com
 Rik Faith                           faith@cs.unc.edu
 Risto Kankkunen                     kankkune@lingsoft.fi
 Rob Day                             robertkday@gmail.com
+Rob Wortman                         wyrm@haell.com
 Robert H. de Vries                  robert@and.nl
 Robert Lindgren                     robert@orcafat.com
 Robert Millan                       zeratul2@wanadoo.es
 Robert Schwebel                     r.schwebel@pengutronix.de
 Robin H. Johnson                    robbat2@gentoo.org
-Rob Wortman                         wyrm@haell.com
 Rodrigo Campos                      rodrigo@sdfg.com.ar
 Rogier Wolff                        R.E.Wolff@BitWizard.nl
 Roland Huebner                      ro-huebner@gmx.de
@@ -646,6 +677,7 @@ Ross Paterson                       rap@doc.ic.ac.uk
 Ross Ridge                          rridge@calum.csclub.uwaterloo.ca
 Rudolf Kastl                        rkastl@redhat.com
 Ruediger Meier                      sweet_f_a@gmx.de
+Rémy Lefevre                        lefevreremy@gmail.com
 Sahil Amoli                         sahilamoli@gmail.com
 Sami Farin                          sfarin@ratol.fi
 Sami Kerola                         kerolasa@iki.fi
@@ -657,19 +689,18 @@ Santiago Vila Doncel                sanvila@unex.es
 Savochkin Andrey Vladimirovich      saw@msu.ru
 Scott Harrison                      scott.gnu.2009@scottrix.co.uk
 Scott Lurndal                       slurn@griffin.engr.sgi.com
-Sébastien Maret                     smaret@umich.edu
 Sergei Steshenko                    sergstesh@yahoo.com
 Sergey Vlasov                       vsu@altlinux.org
+Sergio Durigan Junior               sergiodj@sergiodj.net
+Shayan Pooya                        shayan@liveve.org
 Shing-Shong Shei                    shei@cs.indiana.edu
 Simon Josefsson                     simon@josefsson.org
 Soeren Sonnenburg                   sonnenburg@informatik.hu-berlin.de
 Solar Designer                      solar@owl.openwall.com
 Stanislav Ievlev                    inger@altlinux.ru
 Stavros Passas                      stabat@ics.forth.gr
-Stefano Lattarini                   stefano.lattarini@gmail.com
 Stefan Vargyas                      stvar@yahoo.com
-Stéphane Chazelas                   Stephane_CHAZELAS@yahoo.fr
-Stéphane Raimbault                  stephane.raimbault@gmail.com
+Stefano Lattarini                   stefano.lattarini@gmail.com
 Stephan Krempel                     krempel@par-tec.com
 Stephen Depooter                    sbdep@myrealbox.com
 Stephen Eglen                       eglen@pcg.wustl.edu
@@ -677,25 +708,28 @@ Stephen Gildea                      gildea@stop.mail-abuse.org
 Stephen Smoogen                     smooge@mindspring.com
 Steve McConnel                      steve@acadcomp.sil.org
 Steve McIntyre                      steve@einval.com
+Steve Ward                          planet36@gmail.com
 Steven Drake                        sbd@users.sourceforge.net
 Steven G. Johnson                   stevenj@alum.mit.edu
 Steven Mocking                      ufo@quicknet.nl
-Steven Parkes                       smparkes@smparkes.net
 Steven P Watson                     steven@magelico.net
+Steven Parkes                       smparkes@smparkes.net
 Steven Schubiger                    schubiger@gmail.com
 Steven Schveighoffer                schveiguy@yahoo.com
-Steve Ward                          planet36@gmail.com
 Stuart Citrin                       ctrn3e8@gmail.com
 Stuart Kemp                         skemp@peter.bmc.com
 Stuart Shelton                      stuart@shelton.me
+Stéphane Chazelas                   Stephane_CHAZELAS@yahoo.fr
+Stéphane Raimbault                  stephane.raimbault@gmail.com
 Sven Breuner                        sven.breuner@itwm.fraunhofer.de
 Sven Joachim                        svenjoac@gmx.de
 Szakacsits Szabolcs                 szaka@sienet.hu
+Sébastien Maret                     smaret@umich.edu
 Tadayoshi Funaba                    tadf@kt.rim.or.jp
 TAKAI Kousuke                       takai@vlsi.kuee.kyoto-u.ac.jp
+The Wanderer                        inverseparadox@comcast.net
 Theodore Ts'o                       tytso@rsts-11.mit.edu
 Theodoros V. Kalamatianos           thkala@softlab.ece.ntua.gr
-The Wanderer                        inverseparadox@comcast.net
 Thiago Farina                       tfransosi@gmail.com
 Thien-Thi Nguyen                    ttn@gnuvola.org
 Thomas Bushnell                     thomas@gnu.ai.mit.edu
@@ -706,6 +740,7 @@ Thomas M.Ott                        thmo-13@gmx.de
 Thomas Quinot                       thomas@Cuivre.FR.EU.ORG
 Thomas Schwinge                     tschwinge@gnu.org
 Thomas Wolff                        mined@towo.net
+Tiger Lee                           i@tigerlee.me
 Tim J. Robbins                      tjr@FreeBSD.org
 Tim Mooney                          mooney@dogbert.cc.ndsu.NoDak.edu
 Tim Ryan                            Tim_Ryan@bnz.co.nz
@@ -716,12 +751,12 @@ Tobias Quathamer                    toddy@debian.org
 Tobias Stoeckmann                   tobias@bugol.de
 Toby Peterson                       toby@opendarwin.org
 Todd A. Jacobs                      tjacobs@codegnome.org
-Tomas Pospisek                      tpo@sourcepole.ch
-Tomas Smetana                       t.smetana@gmail.com
 Tom Fitzhenry                       tom@tom-fitzhenry.me.uk
 Tom Haynes                          thomas@netapp.com
-Tommi Kyntola                       tkyntola@cc.hut.fi
 Tom Quinn                           trq@dionysos.thphys.ox.ac.uk
+Tomas Pospisek                      tpo@sourcepole.ch
+Tomas Smetana                       t.smetana@gmail.com
+Tommi Kyntola                       tkyntola@cc.hut.fi
 Ton Hospel                          thospel@mail.dma.be
 Ton Nijkes                          ton@murphy.nl
 Tony Kocurko                        akocurko@mun.ca
@@ -729,8 +764,8 @@ Tony Leneis                         tony@plaza.ds.adp.com
 Tony Robinson                       ajr@eng.cam.ac.uk
 Toomas Soome                        Toomas.Soome@Elion.ee
 Toralf Förster                      toralf.foerster@gmx.de
-Torbjörn Granlund                   tg@gmplib.org
 Torbjorn Lindgren                   tl@funcom.no
+Torbjörn Granlund                   tg@gmplib.org
 Torsten Landschoff                  torsten@pclab.ifg.uni-kiel.de
 Travis Gummels                      tgummels@redhat.com
 Tristan Miller                      psychonaut@nothingisreal.com
@@ -741,9 +776,9 @@ Urs Thuermann                       urs@isnogud.escape.de
 Uwe H. Steinfeld                    usteinfeld@gmx.net
 Vesselin Atanasov                   vesselin@bgnet.bg
 Ville Skyttä                        ville.skytta@iki.fi
+Vin Shelton                         acs@alumni.princeton.edu
 Vincent Lefevre                     vincent@vinc17.org
 Vineet Chadha                       chadha@acis.ufl.edu
-Vin Shelton                         acs@alumni.princeton.edu
 Vitali Lovich                       vlovich@gmail.com
 Vitaly A. Ostanin                   vyt@altlinux.org
 Vito Caputo                         vcaputo@pengaru.com
@@ -771,6 +806,9 @@ Yann Dirson                         dirson@debian.org
 Yutaka Amanai                       yasai-itame1942@jade.plala.or.jp
 Zartaj Majeed                       zmajeed@sbcglobal.net
 Zvi Har'El                          rl@math.technion.ac.il
+�ngel González                      keisial@gmail.com
+Ørn E. Hansen                       oehansen@daimi.aau.dk
+�лек�ей Шилин                       rootlexx@mail.ru
 Марк Коренберг                      socketpair@gmail.com
 
 ;; Local Variables:
diff --git a/THANKS.in b/THANKS.in
index 67b60b9f..6fd79d32 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -77,7 +77,6 @@ Barry Kelly                         http://barrkel.blogspot.com/
 Bauke Jan Douma                     bjdouma@xs4all.nl
 Ben Elliston                        bje@air.net.au
 Ben Harris                          bjh21@netbsd.org
-Ben Walton                          bwalton@artsci.utoronto.ca
 Bengt Martensson                    bengt@mathematik.uni-Bremen.de
 Benjamin Cutler                     cutlerbc@simla.colostate.edu
 Bernard Giroud                      bernard.giroud@creditlyonnais.ch
@@ -95,6 +94,7 @@ Bjorn Helgaas                       helgaas@rsn.hp.com
 Bob McCracken                       kerouac@ravenet.com
 Branden Robinson                    branden@necrotic.deadbeast.net
 Brendan O'Dea                       bod@compusol.com.au
+Brian Foster                        bfoster@redhat.com
 Brian Kimball                       bfk@footbag.org
 Brian M. Carlson                    sandals@crustytoothpaste.ath.cx
 Brian Silverman                     bsilverman@conceptxdesign.com
@@ -138,6 +138,7 @@ Dameon G. Rogers                    dgr03@uark.edu
 Dan Hagerty                         hag@gnu.ai.it.edu
 Dan Pascu                           dan@services.iiruc.ro
 Daniel Bergstrom                    noa@melody.se
+Daniel Mach                         dmach@redhat.com
 Daniel P. Berrangé                  berrange@redhat.com
 Daniel Stavrovski                   d@stavrovski.net
 Daniel Tschinder                    daniel.tschinder@project-a.com
@@ -161,7 +162,7 @@ Davide Canova                       kc.canova@gmail.com
 Dawson Engler                       engler@stanford.edu
 Dean Gaudet                         dean-savannah@arctic.org
 Deepak Goel                         deego@gnufans.org
-Denis Excoffier                     denis.excoffier@airbus.com
+Denis Excoffier                     gcc@Denis-Excoffier.org
 Denis McKeon                        dmckeon@swcp.com
 Dennis Henriksen                    opus@flamingo.osrl.dk
 Dennis Clarke                       dclarke@blastwave.org
@@ -178,12 +179,12 @@ Doug McLaren                        dougmc@comco.com
 Dragos Harabor                      dharabor@us.oracle.com
 Duncan Roe                          duncanr@optimation.com.au
 Edward Schwartz                     edmcman@cmu.edu
-Edward Welbourne                    eddy@opera.com
 Edzer Pebesma                       Edzer.Pebesma@rivm.nl
 Egmont Koblinger                    egmont@uhulinux.hu
 Eirik Fuller                        eirik@hackrat.com
 Eivind                              eivindt@multinet.no
 Elbert Pol                          elbert.pol@gmail.com
+Eldon Stegall                       eldon@eldondev.com
 Eli Zaretskii                       eliz@is.elta.co.il
 Emile LeBlanc                       leblanc@math.toronto.edu
 Emmanuel Lacour                     elacour@home-dn.net
@@ -192,11 +193,11 @@ Eric G. Miller                      egm2@jps.net
 Eric Pemente                        pemente@northpark.edu
 Eric S. Raymond                     esr@snark.thyrsus.com
 Erik Bennett                        bennett@cvo.oneworld.com
+Erik Bernstein                      erik@fscking.org
 Erik Corry                          erik@kroete2.freinet.de
 Felix Lee                           flee@teleport.com
 Felix Rauch Valenti                 frauch@cse.unsw.edu.au
 Ferdinand                           fw@scenic.mine.nu
-Filipus Klutiero                    chealer@gmail.com
 Fletcher Mattox                     fletcher@cs.utexas.edu
 Florent Bayle                       florent@sarcelle.net
 Florian Schlichting                 fschlich@cis.fu-berlin.de
@@ -316,6 +317,7 @@ Jon Peatfield                       J.S.Peatfield@damtp.cam.ac.uk
 Joost van Baal                      joostvb@xs4all.nl
 Jordi Pujol                         jordipujolp@gmail.com
 Jorge Stolfi                        stolfi@ic.unicamp.br
+Joseph D. Wagner                    joe@josephdwagner.info
 Joseph S. Myers                     jsm28@cam.ac.uk
 Josh Triplett                       josh@freedesktop.org
 Joshua Hudson                       joshudson@gmail.com
@@ -340,6 +342,7 @@ Kaveh R. Ghazi                      ghazi@caip.rutgers.edu
 Keith M. Briggs                     keith.briggs@bt.com
 Keith Owens                         kaos@audio.apana.org.au
 Keith Thompson                      kst@cts.com
+Ken Irving                          ken.irving@alaska.edu
 Ken Pizzini                         kenp@halcyon.com
 Kevin Mudrick                       kmudrick@healthmarketscience.com
 Kirk Kelsey                         kirk.kelsey@0x4b.net
@@ -440,6 +443,7 @@ Michael Veksler                     mveksler@techunix.technion.ac.il
 Michail Litvak                      mci@owl.openwall.com
 Michal Politowski                   mpol@charybda.icm.edu.pl
 Michal Svec                         msvec@suse.cz
+Michal Trunecka                     mtruneck@redhat.com
 Michel Robitaille                   robitail@IRO.UMontreal.CA
 Michiel Bacchiani                   bacchian@raven.bu.edu
 Mike Castle                         dalgoda@ix.netcom.com
@@ -466,6 +470,7 @@ Nima Nikzad                         nnikzad@ucla.edu
 Noah Friedman                       friedman@splode.com
 Noel Cragg                          noel@red-bean.com
 Norbert Kiesel                      nkiesel@tbdnetworks.com
+Norihiro Kamae                      norihiro@nagater.net
 Olatunji Oluwabukunmi Ruwase        tjruwase@stanford.edu
 Olav Morkrid                        olav@funcom.com
 Ole Laursen                         olau@hardworking.dk
@@ -521,6 +526,7 @@ Ralph Loader                        loader@maths.ox.ac.uk
 Rasmus Borup Hansen                 rbh@intomics.com
 Raul Miller                         moth@magenta.com
 Raúl Núñez de Arenas Coronado       raul@pleyades.net
+Rich Burridge                       rich.burridge@oracle.com
 Richard A Downing                   richard.downing@bcs.org.uk
 Richard Braakman                    dark@xs4all.nl
 Richard Dawe                        rich@phekda.freeserve.co.uk
diff --git a/TODO b/TODO
index e10da7ca..68680f74 100644
--- a/TODO
+++ b/TODO
@@ -130,10 +130,6 @@ Add a distcheck-time test to ensure that every distributed
 file is either read-only(indicating generated) or is
 version-controlled and up to date.
 
-remove '%s' notation (now that they're all gone, add a maint.mk sc_
-    rule to ensure no new ones are added):
-  grep -E "\`%.{,4}s'" src/*.c
-
 remove all uses of the 'register' keyword: Done.  add a maint.mk rule
   for this, too.
 
@@ -154,7 +150,7 @@ pr's use of nstrftime can make it malloc a very large (up to SIZE_MAX) buffer
 
 -----
 
-Copyright (C) 2002-2013 Free Software Foundation, Inc.
+Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 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
diff --git a/aclocal.m4 b/aclocal.m4
index 7be751da..22010bf2 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,8 +1,7 @@
-# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
-# Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -12,33 +11,31 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-[m4_warning([this file was generated for autoconf 2.68.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
+To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11'
+[am__api_version='1.14'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.6], [],
+m4_if([$1], [1.14.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -54,24 +51,22 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.6])dnl
+[AM_AUTOMAKE_VERSION([1.14.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
 #
 # Of course, Automake must honor this variable whenever it calls a
 # tool from the auxiliary directory.  The problem is that $srcdir (and
@@ -90,7 +85,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 #
 # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
 # are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
+# harmless because $srcdir is '.', but things will broke when you
 # start a VPATH build or use an absolute $srcdir.
 #
 # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
@@ -116,22 +111,19 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 9
-
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
 # Define a conditional.
 AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
 AC_SUBST([$1_TRUE])dnl
 AC_SUBST([$1_FALSE])dnl
 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
@@ -150,16 +142,14 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
-# 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 12
 
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
 # will think it sees a *use*, and therefore will trigger all it's
 # C support machinery.  Also note that it means that autoscan, seeing
@@ -169,7 +159,7 @@ fi])])
 # _AM_DEPENDENCIES(NAME)
 # ----------------------
 # See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
 # We try a few techniques and use that to set a single cache variable.
 #
 # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@@ -182,12 +172,13 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
 AC_REQUIRE([AM_MAKE_INCLUDE])dnl
 AC_REQUIRE([AM_DEP_TRACK])dnl
 
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
+m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
+      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
+      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
+      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                    [depcc="$$1"   am_compiler_list=])
 
 AC_CACHE_CHECK([dependency style of $depcc],
                [am_cv_$1_dependencies_compiler_type],
@@ -195,8 +186,8 @@ AC_CACHE_CHECK([dependency style of $depcc],
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
   rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
@@ -236,16 +227,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -254,8 +245,8 @@ AC_CACHE_CHECK([dependency style of $depcc],
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
@@ -263,7 +254,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
       fi
       ;;
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -311,7 +302,7 @@ AM_CONDITIONAL([am__fastdep$1], [
 # AM_SET_DEPDIR
 # -------------
 # Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
 AC_DEFUN([AM_SET_DEPDIR],
 [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
 AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
@@ -321,9 +312,13 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
 # AM_DEP_TRACK
 # ------------
 AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+  [--enable-dependency-tracking],
+  [do not reject slow dependency extractors])
+AS_HELP_STRING(
+  [--disable-dependency-tracking],
+  [speeds up one-time build])])
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
@@ -338,20 +333,18 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-#serial 5
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 [{
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@ -364,7 +357,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
     # Strip MF so we end up with the name of the file.
     mf=`echo "$mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
+    # We used to match only the files named 'Makefile.in', but
     # some people rename them; so instead we look at the file content.
     # Grep'ing the first line is not enough: some people post-process
     # each Makefile.in and add a new line on top of each file to say so.
@@ -376,21 +369,19 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
+    # from the Makefile without running 'make'.
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
     # simplest approach to changing $(DEPDIR) to its actual value in the
     # expansion.
     for file in `sed -n "
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`AS_DIRNAME(["$file"])`
@@ -408,7 +399,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 # This macro should only be invoked once -- use via AC_REQUIRE.
 #
 # This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
+# is enabled.  FIXME.  This creates each '.P' file that we will
 # need in order to bootstrap the dependency handling code.
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 [AC_CONFIG_COMMANDS([depfiles],
@@ -418,18 +409,21 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 16
-
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
 
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+m4_define([AC_PROG_CC],
+m4_defn([AC_PROG_CC])
+[_AM_PROG_CC_C_O
+])
+
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 # AM_INIT_AUTOMAKE([OPTIONS])
 # -----------------------------------------------
@@ -442,7 +436,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.62])dnl
+[AC_PREREQ([2.65])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -471,31 +465,40 @@ AC_SUBST([CYGPATH_W])
 # Define the identity of the package.
 dnl Distinguish between old-style and new-style calls.
 m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+[AC_DIAGNOSE([obsolete],
+             [$0: two- and three-arguments forms are deprecated.])
+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+m4_if(
+  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+  [ok:ok],,
   [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
 _AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
 
 # Some tools Automake needs.
 AC_REQUIRE([AM_SANITY_CHECK])dnl
 AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+AM_MISSING_PROG([AUTOCONF], [autoconf])
+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+AM_MISSING_PROG([AUTOHEADER], [autoheader])
+AM_MISSING_PROG([MAKEINFO], [makeinfo])
 AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
 AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
@@ -506,34 +509,78 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
 			     [_AM_PROG_TAR([v7])])])
 _AM_IF_OPTION([no-dependencies],,
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
-		  [_AM_DEPENDENCIES(CC)],
-		  [define([AC_PROG_CC],
-			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+		  [_AM_DEPENDENCIES([CC])],
+		  [m4_define([AC_PROG_CC],
+			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_CXX],
-		  [_AM_DEPENDENCIES(CXX)],
-		  [define([AC_PROG_CXX],
-			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+		  [_AM_DEPENDENCIES([CXX])],
+		  [m4_define([AC_PROG_CXX],
+			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-		  [_AM_DEPENDENCIES(OBJC)],
-		  [define([AC_PROG_OBJC],
-			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+		  [_AM_DEPENDENCIES([OBJC])],
+		  [m4_define([AC_PROG_OBJC],
+			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+		  [_AM_DEPENDENCIES([OBJCXX])],
+		  [m4_define([AC_PROG_OBJCXX],
+			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
 ])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_REQUIRE([AM_SILENT_RULES])dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
 AC_CONFIG_COMMANDS_PRE(dnl
 [m4_provide_if([_AM_COMPILER_EXEEXT],
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-])
 
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
+  fi
+fi])
+
+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
 dnl mangled by Autoconf and run in a shell conditional statement.
 m4_define([_AC_COMPILER_EXEEXT],
 m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
 
-
 # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header
 # that is generated.  The stamp files are numbered to have different names.
@@ -555,15 +602,12 @@ for _am_header in $config_headers :; do
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # AM_PROG_INSTALL_SH
 # ------------------
 # Define $install_sh.
@@ -577,16 +621,14 @@ if test x"${install_sh}" != xset; then
     install_sh="\${SHELL} $am_aux_dir/install-sh"
   esac
 fi
-AC_SUBST(install_sh)])
+AC_SUBST([install_sh])])
 
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2003-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # Check whether the underlying file-system supports filenames
 # with a leading dot.  For instance MS-DOS doesn't.
 AC_DEFUN([AM_SET_LEADING_DOT],
@@ -602,14 +644,12 @@ AC_SUBST([am__leading_dot])])
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
-
 # AM_MAKE_INCLUDE()
 # -----------------
 # Check to see how make treats includes.
@@ -627,7 +667,7 @@ am__quote=
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
   am__include=include
@@ -652,52 +692,14 @@ AC_MSG_RESULT([$_am_result])
 rm -f confinc confmf
 ])
 
-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 6
-
-# AM_PROG_CC_C_O
-# --------------
-# Like AC_PROG_CC_C_O, but changed for automake.
-AC_DEFUN([AM_PROG_CC_C_O],
-[AC_REQUIRE([AC_PROG_CC_C_O])dnl
-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([compile])dnl
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-dnl Make sure AC_PROG_CC is never called again, or it will override our
-dnl setting of CC.
-m4_define([AC_PROG_CC],
-          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
-])
-
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 6
-
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
 AC_DEFUN([AM_MISSING_PROG],
@@ -705,11 +707,10 @@ AC_DEFUN([AM_MISSING_PROG],
 $1=${$1-"${am_missing_run}$2"}
 AC_SUBST($1)])
 
-
 # AM_MISSING_HAS_RUN
 # ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([missing])dnl
@@ -722,54 +723,22 @@ if test x"${MISSING+set}" != xset; then
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
+  AC_MSG_WARN(['missing' script is too old or missing])
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
-# Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 1
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
-  [[\\/$]]* | ?:[[\\/]]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
-
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
 AC_DEFUN([_AM_MANGLE_OPTION],
@@ -779,7 +748,7 @@ AC_DEFUN([_AM_MANGLE_OPTION],
 # --------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
 
 # _AM_SET_OPTIONS(OPTIONS)
 # ------------------------
@@ -793,24 +762,82 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-# Free Software Foundation, Inc.
+# _AM_PROG_CC_C_O
+# ---------------
+# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
+# to automatically call this.
+AC_DEFUN([_AM_PROG_CC_C_O],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+AC_LANG_PUSH([C])dnl
+AC_CACHE_CHECK(
+  [whether $CC understands -c and -o together],
+  [am_cv_prog_cc_c_o],
+  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i])
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+AC_LANG_POP([C])])
+
+# For backward compatibility.
+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
+# AM_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   (exit $ac_status); }])
+
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
 # AM_SANITY_CHECK
 # ---------------
 AC_DEFUN([AM_SANITY_CHECK],
 [AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
@@ -821,32 +848,40 @@ case `pwd` in
 esac
 case $srcdir in
   *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
 esac
 
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$[*]" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$[*]" != "X $srcdir/configure conftest.file" \
+	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+	# If neither matched, then we have a broken ls.  This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment.  This has actually
+	# happened.  Such a system could not be considered "sane".
+	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment])
+     fi
+     if test "$[2]" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
    test "$[2]" = conftest.file
    )
 then
@@ -856,31 +891,50 @@ else
    AC_MSG_ERROR([newly created file is older than distributed files!
 Check your system clock])
 fi
-AC_MSG_RESULT(yes)])
+AC_MSG_RESULT([yes])
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+  [AC_MSG_CHECKING([that generated files are newer than configure])
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   AC_MSG_RESULT([done])])
+rm -f conftest.file
+])
 
-# Copyright (C) 2009, 2011  Free Software Foundation, Inc.
+# Copyright (C) 2009-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # AM_SILENT_RULES([DEFAULT])
 # --------------------------
 # Enable less verbose build rules; with the default set to DEFAULT
-# (`yes' being less verbose, `no' or empty being verbose).
+# ("yes" being less verbose, "no" or empty being verbose).
 AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules],
-[  --enable-silent-rules          less verbose build output (undo: `make V=1')
-  --disable-silent-rules         verbose build output (undo: `make V=0')])
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no)  AM_DEFAULT_VERBOSITY=1;;
-*)   AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+[AC_ARG_ENABLE([silent-rules], [dnl
+AS_HELP_STRING(
+  [--enable-silent-rules],
+  [less verbose build output (undo: "make V=1")])
+AS_HELP_STRING(
+  [--disable-silent-rules],
+  [verbose build output (undo: "make V=0")])dnl
+])
+case $enable_silent_rules in @%:@ (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
 esac
 dnl
-dnl A few `make' implementations (e.g., NonStop OS and NextStep)
+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
 dnl do not support nested variable expansions.
 dnl See automake bug#9928 and bug#10237.
 am_make=${MAKE-make}
@@ -898,7 +952,7 @@ else
   am_cv_make_support_nested_variables=no
 fi])
 if test $am_cv_make_support_nested_variables = yes; then
-  dnl Using `$V' instead of `$(V)' breaks IRIX make.
+  dnl Using '$V' instead of '$(V)' breaks IRIX make.
   AM_V='$(V)'
   AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
 else
@@ -915,44 +969,40 @@ AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # AM_PROG_INSTALL_STRIP
 # ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
+# One issue with vendor 'install' (even GNU) is that you can't
 # specify the program used to strip binaries.  This is especially
 # annoying in cross-compiling environments, where the build's strip
 # is unlikely to handle the host's binaries.
 # Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
+# always use install-sh in "make install-strip", and initialize
 # STRIPPROG with the value of the STRIP variable (set by the user).
 AC_DEFUN([AM_PROG_INSTALL_STRIP],
 [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+# will honor the 'STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
 if test "$cross_compiling" != no; then
   AC_CHECK_TOOL([STRIP], [strip], :)
 fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2006-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 3
-
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@@ -966,18 +1016,16 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2004-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # _AM_PROG_TAR(FORMAT)
 # --------------------
 # Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
 #
 # Substitute a variable $(am__tar) that is a command
 # writing to stdout a FORMAT-tarball containing the directory
@@ -987,81 +1035,120 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 # Substitute a variable $(am__untar) that extract such
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
+#
 AC_DEFUN([_AM_PROG_TAR],
 [# Always define AMTAR for backward compatibility.  Yes, it's still used
 # in the wild :-(  We should find a proper way to deprecate it ...
 AC_SUBST([AMTAR], ['$${TAR-tar}'])
-m4_if([$1], [v7],
-     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
+
+# We'll loop over all known methods to create a tar archive until one works.
 _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
 
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
+m4_if([$1], [v7],
+  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+
+  [m4_case([$1],
+    [ustar],
+     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+      # There is notably a 21 bits limit for the UID and the GID.  In fact,
+      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+      # and bug#13588).
+      am_max_uid=2097151 # 2^21 - 1
+      am_max_gid=$am_max_uid
+      # The $UID and $GID variables are not portable, so we need to resort
+      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
+      # below are definitely unexpected, so allow the users to see them
+      # (that is, avoid stderr redirection).
+      am_uid=`id -u || echo unknown`
+      am_gid=`id -g || echo unknown`
+      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+      if test $am_uid -le $am_max_uid; then
+         AC_MSG_RESULT([yes])
+      else
+         AC_MSG_RESULT([no])
+         _am_tools=none
+      fi
+      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+      if test $am_gid -le $am_max_gid; then
+         AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no])
+        _am_tools=none
+      fi],
+
+  [pax],
+    [],
+
+  [m4_fatal([Unknown tar format])])
+
+  AC_MSG_CHECKING([how to create a $1 tar archive])
+
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        AM_RUN_LOG([$_am_tar --version]) && break
+      done
+      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x $1 -w "$$tardir"'
+      am__tar_='pax -L -x $1 -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+      am__untar='cpio -i -H $1 -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
 
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_$1}" && break
+
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      AM_RUN_LOG([$am__untar <conftest.tar])
+      AM_RUN_LOG([cat conftest.dir/file])
+      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+    fi
+  done
   rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
 
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
 AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
 m4_include([m4/00gnulib.m4])
+m4_include([m4/absolute-header.m4])
 m4_include([m4/acl.m4])
 m4_include([m4/alloca.m4])
 m4_include([m4/arpa_inet_h.m4])
@@ -1110,7 +1197,6 @@ m4_include([m4/exponentl.m4])
 m4_include([m4/extensions.m4])
 m4_include([m4/extern-inline.m4])
 m4_include([m4/faccessat.m4])
-m4_include([m4/fatal-signal.m4])
 m4_include([m4/fchdir.m4])
 m4_include([m4/fchmodat.m4])
 m4_include([m4/fchownat.m4])
@@ -1174,6 +1260,7 @@ m4_include([m4/gettime.m4])
 m4_include([m4/gettimeofday.m4])
 m4_include([m4/getugroups.m4])
 m4_include([m4/getusershell.m4])
+m4_include([m4/gl-openssl.m4])
 m4_include([m4/glibc21.m4])
 m4_include([m4/gmp.m4])
 m4_include([m4/gnu-make.m4])
@@ -1293,10 +1380,8 @@ m4_include([m4/perl.m4])
 m4_include([m4/perror.m4])
 m4_include([m4/physmem.m4])
 m4_include([m4/pipe.m4])
-m4_include([m4/pipe2.m4])
 m4_include([m4/po.m4])
 m4_include([m4/posix-shell.m4])
-m4_include([m4/posix_spawn.m4])
 m4_include([m4/posixtm.m4])
 m4_include([m4/posixver.m4])
 m4_include([m4/prereq.m4])
@@ -1310,7 +1395,6 @@ m4_include([m4/putenv.m4])
 m4_include([m4/quote.m4])
 m4_include([m4/quotearg.m4])
 m4_include([m4/raise.m4])
-m4_include([m4/rawmemchr.m4])
 m4_include([m4/read-file.m4])
 m4_include([m4/read.m4])
 m4_include([m4/readdir.m4])
@@ -1332,6 +1416,7 @@ m4_include([m4/save-cwd.m4])
 m4_include([m4/savedir.m4])
 m4_include([m4/savewd.m4])
 m4_include([m4/sched_h.m4])
+m4_include([m4/secure_getenv.m4])
 m4_include([m4/select.m4])
 m4_include([m4/selinux-context-h.m4])
 m4_include([m4/selinux-selinux-h.m4])
@@ -1343,7 +1428,6 @@ m4_include([m4/sha1.m4])
 m4_include([m4/sha256.m4])
 m4_include([m4/sha512.m4])
 m4_include([m4/sig2str.m4])
-m4_include([m4/sig_atomic_t.m4])
 m4_include([m4/sigaction.m4])
 m4_include([m4/signal_h.m4])
 m4_include([m4/signalblocking.m4])
@@ -1355,8 +1439,6 @@ m4_include([m4/socketlib.m4])
 m4_include([m4/sockets.m4])
 m4_include([m4/socklen.m4])
 m4_include([m4/sockpfaf.m4])
-m4_include([m4/spawn-pipe.m4])
-m4_include([m4/spawn_h.m4])
 m4_include([m4/ssize_t.m4])
 m4_include([m4/st_dm_mode.m4])
 m4_include([m4/stat-prog.m4])
@@ -1373,7 +1455,6 @@ m4_include([m4/stdio_h.m4])
 m4_include([m4/stdlib_h.m4])
 m4_include([m4/stpcpy.m4])
 m4_include([m4/stpncpy.m4])
-m4_include([m4/strchrnul.m4])
 m4_include([m4/strdup.m4])
 m4_include([m4/strerror.m4])
 m4_include([m4/strerror_r.m4])
@@ -1425,7 +1506,6 @@ m4_include([m4/unlinkdir.m4])
 m4_include([m4/unlocked-io.m4])
 m4_include([m4/uptime.m4])
 m4_include([m4/userspec.m4])
-m4_include([m4/usleep.m4])
 m4_include([m4/utimbuf.m4])
 m4_include([m4/utimecmp.m4])
 m4_include([m4/utimens.m4])
@@ -1437,8 +1517,6 @@ m4_include([m4/vasprintf.m4])
 m4_include([m4/version-etc.m4])
 m4_include([m4/vfprintf-posix.m4])
 m4_include([m4/vprintf-posix.m4])
-m4_include([m4/wait-process.m4])
-m4_include([m4/waitpid.m4])
 m4_include([m4/warnings.m4])
 m4_include([m4/wchar_h.m4])
 m4_include([m4/wchar_t.m4])
diff --git a/bootstrap b/bootstrap
index bee7765f..a3e68f00 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2013-01-20.16; # UTC
+scriptversion=2013-12-05.23; # UTC
 
 # Bootstrap this package from checked-out sources.
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
@@ -140,20 +140,21 @@ po_download_command_format2=\
 "wget --mirror -nd -q -np -A.po -P '%s' \
  http://translationproject.org/latest/%s/"
 
+# Prefer a non-empty tarname (4th argument of AC_INIT if given), else
+# fall back to the package name (1st argument with munging)
 extract_package_name='
-  /^AC_INIT(/{
-     /.*,.*,.*, */{
-       s///
-       s/[][]//g
-       s/)$//
+  /^AC_INIT(\[*/{
+     s///
+     /^[^,]*,[^,]*,[^,]*,[ []*\([^][ ,)]\)/{
+       s//\1/
+       s/[],)].*//
        p
        q
      }
-     s/AC_INIT(\[*//
-     s/]*,.*//
+     s/[],)].*//
      s/^GNU //
      y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
-     s/[^A-Za-z0-9_]/-/g
+     s/[^abcdefghijklmnopqrstuvwxyz0123456789_]/-/g
      p
   }
 '
@@ -208,12 +209,16 @@ bootstrap_sync=false
 # Use git to update gnulib sources
 use_git=true
 
+check_exists() {
+  ($1 --version </dev/null) >/dev/null 2>&1
+  test $? -lt 126
+}
+
 # find_tool ENVVAR NAMES...
 # -------------------------
 # Search for a required program.  Use the value of ENVVAR, if set,
-# otherwise find the first of the NAMES that can be run (i.e.,
-# supports --version).  If found, set ENVVAR to the program name,
-# die otherwise.
+# otherwise find the first of the NAMES that can be run.
+# If found, set ENVVAR to the program name, die otherwise.
 #
 # FIXME: code duplication, see also gnu-web-doc-update.
 find_tool ()
@@ -223,27 +228,21 @@ find_tool ()
   find_tool_names=$@
   eval "find_tool_res=\$$find_tool_envvar"
   if test x"$find_tool_res" = x; then
-    for i
-    do
-      if ($i --version </dev/null) >/dev/null 2>&1; then
-       find_tool_res=$i
-       break
+    for i; do
+      if check_exists $i; then
+        find_tool_res=$i
+        break
       fi
     done
-  else
-    find_tool_error_prefix="\$$find_tool_envvar: "
   fi
-  test x"$find_tool_res" != x \
-    || die "one of these is required: $find_tool_names"
-  ($find_tool_res --version </dev/null) >/dev/null 2>&1 \
-    || die "${find_tool_error_prefix}cannot run $find_tool_res --version"
+  if test x"$find_tool_res" = x; then
+    warn_ "one of these is required: $find_tool_names;"
+    die   "alternatively set $find_tool_envvar to a compatible tool"
+  fi
   eval "$find_tool_envvar=\$find_tool_res"
   eval "export $find_tool_envvar"
 }
 
-# Find sha1sum, named gsha1sum on MacPorts, and shasum on Mac OS X 10.6.
-find_tool SHA1SUM sha1sum gsha1sum shasum
-
 # Override the default configuration, if necessary.
 # Make sure that bootstrap.conf is sourced from the current directory
 # if we were invoked as "sh bootstrap".
@@ -255,12 +254,12 @@ esac
 # Extra files from gnulib, which override files from other sources.
 test -z "${gnulib_extra_files}" && \
   gnulib_extra_files="
-        $build_aux/install-sh
-        $build_aux/mdate-sh
-        $build_aux/texinfo.tex
-        $build_aux/depcomp
-        $build_aux/config.guess
-        $build_aux/config.sub
+        build-aux/install-sh
+        build-aux/mdate-sh
+        build-aux/texinfo.tex
+        build-aux/depcomp
+        build-aux/config.guess
+        build-aux/config.sub
         doc/INSTALL
 "
 
@@ -325,7 +324,7 @@ insert_if_absent() {
     die "Error: Duplicate entries in $file: " $duplicate_entries
   fi
   linesold=$(gitignore_entries $file | wc -l)
-  linesnew=$(echo "$str" | gitignore_entries - $file | sort -u | wc -l)
+  linesnew=$( { echo "$str"; cat $file; } | gitignore_entries | sort -u | wc -l)
   if [ $linesold != $linesnew ] ; then
     { echo "$str" | cat - $file > $file.bak && mv $file.bak $file; } \
       || die "insert_if_absent $file $str: failed"
@@ -468,8 +467,7 @@ check_versions() {
     if [ "$req_ver" = "-" ]; then
       # Merely require app to exist; not all prereq apps are well-behaved
       # so we have to rely on $? rather than get_version.
-      $app --version >/dev/null 2>&1
-      if [ 126 -le $? ]; then
+      if ! check_exists $app; then
         warn_ "Error: '$app' not found"
         ret=1
       fi
@@ -502,6 +500,12 @@ print_versions() {
   # can't depend on column -t
 }
 
+# Find sha1sum, named gsha1sum on MacPorts, shasum on Mac OS X 10.6.
+# Also find the compatible sha1 utility on the BSDs
+if test x"$SKIP_PO" = x; then
+  find_tool SHA1SUM sha1sum gsha1sum shasum sha1
+fi
+
 use_libtool=0
 # We'd like to use grep -E, to see if any of LT_INIT,
 # AC_PROG_LIBTOOL, AM_PROG_LIBTOOL is used in configure.ac,
@@ -547,13 +551,21 @@ if ! printf "$buildreq" | check_versions; then
   fi
 fi
 
+# Warn the user if autom4te appears to be broken; this causes known
+# issues with at least gettext 0.18.3.
+probe=$(echo 'm4_quote([hi])' | autom4te -l M4sugar -t 'm4_quote:$%' -)
+if test "x$probe" != xhi; then
+  warn_ "WARNING: your autom4te wrapper eats stdin;"
+  warn_ "if bootstrap fails, consider upgrading your autotools"
+fi
+
 echo "$0: Bootstrapping from checked-out $package sources..."
 
 # See if we can use gnulib's git-merge-changelog merge driver.
-if test -d .git && (git --version) >/dev/null 2>/dev/null ; then
+if $use_git && test -d .git && check_exists git; then
   if git config merge.merge-changelog.driver >/dev/null ; then
     :
-  elif (git-merge-changelog --version) >/dev/null 2>/dev/null ; then
+  elif check_exists git-merge-changelog; then
     echo "$0: initializing git-merge-changelog driver"
     git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver'
     git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B'
@@ -573,13 +585,17 @@ git_modules_config () {
   test -f .gitmodules && git config --file .gitmodules "$@"
 }
 
-gnulib_path=$(git_modules_config submodule.gnulib.path)
-test -z "$gnulib_path" && gnulib_path=gnulib
+if $use_git; then
+  gnulib_path=$(git_modules_config submodule.gnulib.path)
+  test -z "$gnulib_path" && gnulib_path=gnulib
+fi
 
-# Get gnulib files.
+# Get gnulib files.  Populate $GNULIB_SRCDIR, possibly updating a
+# submodule, for use in the rest of the script.
 
 case ${GNULIB_SRCDIR--} in
 -)
+  # Note that $use_git is necessarily true in this case.
   if git_modules_config submodule.gnulib.url >/dev/null; then
     echo "$0: getting gnulib files..."
     git submodule init || exit $?
@@ -600,8 +616,8 @@ case ${GNULIB_SRCDIR--} in
   GNULIB_SRCDIR=$gnulib_path
   ;;
 *)
-  # Use GNULIB_SRCDIR as a reference.
-  if test -d "$GNULIB_SRCDIR"/.git && \
+  # Use GNULIB_SRCDIR directly or as a reference.
+  if $use_git && test -d "$GNULIB_SRCDIR"/.git && \
         git_modules_config submodule.gnulib.url >/dev/null; then
     echo "$0: getting gnulib files..."
     if git submodule -h|grep -- --reference > /dev/null; then
@@ -627,12 +643,19 @@ case ${GNULIB_SRCDIR--} in
   ;;
 esac
 
+# $GNULIB_SRCDIR now points to the version of gnulib to use, and
+# we no longer need to use git or $gnulib_path below here.
+
 if $bootstrap_sync; then
   cmp -s "$0" "$GNULIB_SRCDIR/build-aux/bootstrap" || {
     echo "$0: updating bootstrap and restarting..."
+    case $(sh -c 'echo "$1"' -- a) in
+      a) ignored=--;;
+      *) ignored=ignored;;
+    esac
     exec sh -c \
       'cp "$1" "$2" && shift && exec "${CONFIG_SHELL-/bin/sh}" "$@"' \
-      -- "$GNULIB_SRCDIR/build-aux/bootstrap" \
+      $ignored "$GNULIB_SRCDIR/build-aux/bootstrap" \
       "$0" "$@" --no-bootstrap-sync
   }
 fi
@@ -680,11 +703,10 @@ update_po_files() {
     cksum_file="$ref_po_dir/$po.s1"
     if ! test -f "$cksum_file" ||
         ! test -f "$po_dir/$po.po" ||
-        ! $SHA1SUM -c --status "$cksum_file" \
-            < "$new_po" > /dev/null; then
+        ! $SHA1SUM -c "$cksum_file" < "$new_po" > /dev/null 2>&1; then
       echo "$me: updated $po_dir/$po.po..."
       cp "$new_po" "$po_dir/$po.po" \
-          && $SHA1SUM < "$new_po" > "$cksum_file"
+          && $SHA1SUM < "$new_po" > "$cksum_file" || return
     fi
   done
 }
@@ -785,6 +807,21 @@ version_controlled_file() {
   fi
 }
 
+# Avoid boostrap failure with gettext/autopoint bug in version 0.18.3.1
+# http://lists.gnu.org/archive/html/coreutils/2013-11/msg00038.html
+# Remove in 2015 when distros have upgraded to >= 0.18.3.2
+autopoint_version=$(get_version $AUTOPOINT)
+# Note autopoint returns version 0.18.3 for version 0.18.3.1
+if test "$autopoint_version" = '0.18.3' ; then
+  if test "$package" = 'coreutils' ; then
+    test -e 'm4/cu-progs.m4' || touch 'm4/cu-progs.m4'
+  fi
+  if ! test -e 'build-aux/git-version-gen' ; then
+    printf "#!/bin/sh\n" > 'build-aux/git-version-gen'
+    chmod a+x 'build-aux/git-version-gen'
+  fi
+fi
+
 # NOTE: we have to be careful to run both autopoint and libtoolize
 # before gnulib-tool, since gnulib-tool is likely to provide newer
 # versions of files "installed" by these two programs.
diff --git a/bootstrap.conf b/bootstrap.conf
index bb6c1450..c0b5f023 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,6 +1,6 @@
 # Bootstrap configuration.
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
@@ -177,7 +177,7 @@ gnulib_modules="
   pathmax
   perl
   physmem
-  pipe
+  pipe-posix
   posix-shell
   posixtm
   posixver
@@ -211,6 +211,7 @@ gnulib_modules="
   settime
   sig2str
   sigaction
+  smack
   ssize_t
   statat
   stat-macros
@@ -345,6 +346,13 @@ bootstrap_post_import_hook ()
 
   # Massage lib/gnulib.mk before using it later in the bootstrapping process.
   build-aux/prefix-gnulib-mk --lib-name=$gnulib_name lib/$gnulib_mk
+
+  # Regenerate src/single-binary.mk
+  (mkf=src/single-binary.mk tmp=single-binary.tmp \
+    && rm -f $mkf $tmp \
+    && build-aux/gen-single-binary.sh src/local.mk >$tmp \
+    && chmod a-w $tmp \
+    && mv -f $tmp $mkf)
 }
 
 
diff --git a/build-aux/ChangeLog-2007 b/build-aux/ChangeLog-2007
index 31397140..63b9dbe9 100644
--- a/build-aux/ChangeLog-2007
+++ b/build-aux/ChangeLog-2007
@@ -234,7 +234,7 @@
 
 	-----
 
-	Copyright (C) 2002-2013 Free Software Foundation, Inc.
+	Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
diff --git a/build-aux/announce-gen b/build-aux/announce-gen
index 3a64ec65..a3aebf76 100755
--- a/build-aux/announce-gen
+++ b/build-aux/announce-gen
@@ -9,7 +9,7 @@ my $VERSION = '2012-06-08 06:53'; # UTC
 # If you change this file with Emacs, please let the write hook
 # do its job.  Otherwise, update this string manually.
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 # 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
@@ -416,14 +416,15 @@ sub get_tool_versions ($$)
   @url_dir_list
     or (warn "URL directory name(s) not specified\n"), $fail = 1;
 
-  my @tool_list = split ',', $bootstrap_tools;
+  my @tool_list = split ',', $bootstrap_tools
+    if $bootstrap_tools;
 
   grep (/^gnulib$/, @tool_list) ^ defined $gnulib_version
     and (warn "when specifying gnulib as a tool, you must also specify\n"
         . "--gnulib-version=V, where V is the result of running git describe\n"
         . "in the gnulib source directory.\n"), $fail = 1;
 
-  exists $valid_release_types{$release_type}
+  !$release_type || exists $valid_release_types{$release_type}
     or (warn "'$release_type': invalid release type\n"), $fail = 1;
 
   @ARGV
diff --git a/build-aux/compile b/build-aux/compile
index 862a14e8..531136b0 100755
--- a/build-aux/compile
+++ b/build-aux/compile
@@ -1,10 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-03-05.13; # UTC
+scriptversion=2012-10-14.11; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -113,6 +112,11 @@ func_cl_dashl ()
       lib=$dir/$lib.lib
       break
     fi
+    if test -f "$dir/lib$lib.a"; then
+      found=yes
+      lib=$dir/lib$lib.a
+      break
+    fi
   done
   IFS=$save_IFS
 
diff --git a/build-aux/config.guess b/build-aux/config.guess
index 6ea34545..1f5c50c0 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2013 Free Software Foundation, Inc.
+#   Copyright 1992-2014 Free Software Foundation, Inc.
 
-timestamp='2013-02-04'
+timestamp='2014-03-23'
 
 # 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
@@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright 1992-2014 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -132,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
+	eval $set_cc_for_build
+	cat <<-EOF > $dummy.c
+	#include <features.h>
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#else
+	LIBC=gnu
+	#endif
+	EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+	;;
+esac
+
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -805,7 +826,7 @@ EOF
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
-    i*:MSYS*:*)
+    *:MSYS*:*)
 	echo ${UNAME_MACHINE}-pc-msys
 	exit ;;
     i*:windows32*:*)
@@ -853,21 +874,21 @@ EOF
 	exit ;;
     *:GNU:*:*)
 	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
 	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
     aarch64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     aarch64_be:Linux:*:*)
 	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -880,59 +901,54 @@ EOF
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    arc:Linux:*:* | arceb:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	else
 	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
 		| grep -q __ARM_PCS_VFP
 	    then
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
 	    else
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
 	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:Linux:*:*)
-	LIBC=gnu
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
 	exit ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -951,54 +967,63 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
-    or32:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+    openrisc*:Linux:*:*)
+	echo or1k-unknown-linux-${LIBC}
+	exit ;;
+    or32:Linux:*:* | or1k*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     padre:Linux:*:*)
-	echo sparc-unknown-linux-gnu
+	echo sparc-unknown-linux-${LIBC}
 	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+	echo hppa64-unknown-linux-${LIBC}
 	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
+	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+	  *)    echo hppa-unknown-linux-${LIBC} ;;
 	esac
 	exit ;;
     ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
+	echo powerpc64-unknown-linux-${LIBC}
 	exit ;;
     ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
+	echo powerpc-unknown-linux-${LIBC}
+	exit ;;
+    ppc64le:Linux:*:*)
+	echo powerpc64le-unknown-linux-${LIBC}
+	exit ;;
+    ppcle:Linux:*:*)
+	echo powerpcle-unknown-linux-${LIBC}
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 	exit ;;
     sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
 	exit ;;
     x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1231,19 +1256,31 @@ EOF
 	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    i386)
-		eval $set_cc_for_build
-		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		      grep IS_64BIT_ARCH >/dev/null
-		  then
-		      UNAME_PROCESSOR="x86_64"
-		  fi
-		fi ;;
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
+	eval $set_cc_for_build
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	    UNAME_PROCESSOR=powerpc
+	fi
+	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		    grep IS_64BIT_ARCH >/dev/null
+		then
+		    case $UNAME_PROCESSOR in
+			i386) UNAME_PROCESSOR=x86_64 ;;
+			powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		    esac
+		fi
+	    fi
+	elif test "$UNAME_PROCESSOR" = i386 ; then
+	    # Avoid executing cc on OS X 10.9, as it ships with a stub
+	    # that puts up a graphical alert prompting to install
+	    # developer tools.  Any system running Mac OS X 10.7 or
+	    # later (Darwin 11 and later) is required to have a 64-bit
+	    # processor. This is not true of the ARM version of Darwin
+	    # that Apple uses in portable devices.
+	    UNAME_PROCESSOR=x86_64
+	fi
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
@@ -1334,154 +1371,6 @@ EOF
 	exit ;;
 esac
 
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-	"4"
-#else
-	""
-#endif
-	); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    c34*)
-	echo c34-convex-bsd
-	exit ;;
-    c38*)
-	echo c38-convex-bsd
-	exit ;;
-    c4*)
-	echo c4-convex-bsd
-	exit ;;
-    esac
-fi
-
 cat >&2 <<EOF
 $0: unable to guess system type
 
diff --git a/build-aux/config.rpath b/build-aux/config.rpath
index c38b914d..b625621f 100755
--- a/build-aux/config.rpath
+++ b/build-aux/config.rpath
@@ -2,7 +2,7 @@
 # Output a system dependent set of variables, describing how to set the
 # run time search path of shared libraries in an executable.
 #
-#   Copyright 1996-2013 Free Software Foundation, Inc.
+#   Copyright 1996-2014 Free Software Foundation, Inc.
 #   Taken from GNU libtool, 2001
 #   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
@@ -367,11 +367,7 @@ else
     dgux*)
       hardcode_libdir_flag_spec='-L$libdir'
       ;;
-    freebsd2.2*)
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      ;;
-    freebsd2*)
+    freebsd2.[01]*)
       hardcode_direct=yes
       hardcode_minus_L=yes
       ;;
@@ -548,13 +544,11 @@ case "$host_os" in
   dgux*)
     library_names_spec='$libname$shrext'
     ;;
+  freebsd[23].*)
+    library_names_spec='$libname$shrext$versuffix'
+    ;;
   freebsd* | dragonfly*)
-    case "$host_os" in
-      freebsd[123]*)
-        library_names_spec='$libname$shrext$versuffix' ;;
-      *)
-        library_names_spec='$libname$shrext' ;;
-    esac
+    library_names_spec='$libname$shrext'
     ;;
   gnu*)
     library_names_spec='$libname$shrext'
diff --git a/build-aux/config.sub b/build-aux/config.sub
index 80211d0d..d654d03c 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2013 Free Software Foundation, Inc.
+#   Copyright 1992-2014 Free Software Foundation, Inc.
 
-timestamp='2013-02-04'
+timestamp='2014-05-01'
 
 # 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
@@ -68,7 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright 1992-2014 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -252,12 +252,12 @@ case $basic_machine in
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc \
+	| arc | arceb \
 	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
 	| avr | avr32 \
 	| be32 | be64 \
 	| bfin \
-	| c4x | clipper \
+	| c4x | c8051 | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| epiphany \
 	| fido | fr30 | frv \
@@ -265,6 +265,7 @@ case $basic_machine in
 	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| k1om \
 	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
@@ -282,8 +283,10 @@ case $basic_machine in
 	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa32r6 | mipsisa32r6el \
 	| mipsisa64 | mipsisa64el \
 	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64r6 | mipsisa64r6el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipsr5900 | mipsr5900el \
@@ -295,8 +298,7 @@ case $basic_machine in
 	| nds32 | nds32le | nds32be \
 	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
-	| open8 \
-	| or32 \
+	| open8 | or1k | or1knd | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
@@ -324,7 +326,7 @@ case $basic_machine in
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -366,13 +368,13 @@ case $basic_machine in
 	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
 	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| clipper-* | craynv-* | cydra-* \
+	| c8051-* | clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
@@ -381,6 +383,7 @@ case $basic_machine in
 	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| k1om-* \
 	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
@@ -400,8 +403,10 @@ case $basic_machine in
 	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa32r6-* | mipsisa32r6el-* \
 	| mipsisa64-* | mipsisa64el-* \
 	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64r6-* | mipsisa64r6el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipsr5900-* | mipsr5900el-* \
@@ -413,6 +418,7 @@ case $basic_machine in
 	| nios-* | nios2-* | nios2eb-* | nios2el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| open8-* \
+	| or1k*-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
@@ -794,7 +800,7 @@ case $basic_machine in
 		os=-mingw64
 		;;
 	mingw32)
-		basic_machine=i386-pc
+		basic_machine=i686-pc
 		os=-mingw32
 		;;
 	mingw32ce)
@@ -830,7 +836,7 @@ case $basic_machine in
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
 	msys)
-		basic_machine=i386-pc
+		basic_machine=i686-pc
 		os=-msys
 		;;
 	mvs)
@@ -1374,7 +1380,7 @@ case $os in
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1546,6 +1552,9 @@ case $basic_machine in
 	c4x-* | tic4x-*)
 		os=-coff
 		;;
+	c8051-*)
+		os=-elf
+		;;
 	hexagon-*)
 		os=-elf
 		;;
diff --git a/build-aux/depcomp b/build-aux/depcomp
index 91d4bf83..31788017 100755
--- a/build-aux/depcomp
+++ b/build-aux/depcomp
@@ -1,7 +1,7 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2012-10-18.11; # UTC
+scriptversion=2013-05-30.07; # UTC
 
 # Copyright (C) 1999-2013 Free Software Foundation, Inc.
 
@@ -517,6 +517,7 @@ $ {
   G
   p
 }' >> "$depfile"
+  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
   rm -f "$tmpdepfile"
   ;;
 
diff --git a/build-aux/do-release-commit-and-tag b/build-aux/do-release-commit-and-tag
index 0bd8ce86..5719d0e4 100755
--- a/build-aux/do-release-commit-and-tag
+++ b/build-aux/do-release-commit-and-tag
@@ -7,7 +7,7 @@ VERSION=2012-08-01.09 # UTC
 
 # Note: this is a bash script (could be zsh or dash)
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/build-aux/gen-lists-of-programs.sh b/build-aux/gen-lists-of-programs.sh
index bf63ee30..c95e5981 100755
--- a/build-aux/gen-lists-of-programs.sh
+++ b/build-aux/gen-lists-of-programs.sh
@@ -17,6 +17,7 @@ set -e
 # use "--enable-install-program=A,B" when invoking configure.
 disabled_by_default_progs='
     arch
+    coreutils
     hostname
 '
 
@@ -178,6 +179,12 @@ END
       echo default__progs += $progsdir/$p
     done
     ;;
+  1,--list-progs)
+    for p in $disabled_by_default_progs $build_if_possible_progs \
+        $normal_progs; do
+      echo $p
+    done
+    ;;
   *)
     echo "$0: invalid usage" >&2; exit 2
     ;;
diff --git a/build-aux/gen-single-binary.sh b/build-aux/gen-single-binary.sh
new file mode 100755
index 00000000..a2423e60
--- /dev/null
+++ b/build-aux/gen-single-binary.sh
@@ -0,0 +1,111 @@
+#!/bin/sh
+
+# Generate the list of rules for the single-binary option based on all the other
+# binaries found in src/local.mk.
+#
+# We need to duplicate the specific rules to build each program into a new
+# static library target. We can't reuse the existing target since we need to
+# create a .a file instead of linking the program. We can't do this at
+# ./configure since the file names need to be available when automake runs
+# to let it generate all the required rules in Makefile.in.  The configure
+# step will select which ones will be used to build, but they need to be
+# generated beforehand.
+#
+# Instead of maintaining a duplicated list of rules, we generate the
+# single-binary required rules based on the normal configuration found on
+# src/local.mk with this script.
+
+if test "x$1" = "x"; then
+  echo "Usage: $0 path/to/src/local.mk" >&2
+  exit 1
+fi
+
+set -e
+
+LOCAL_MK=$1
+GEN_LISTS_OF_PROGRAMS="`dirname "$0"`/gen-lists-of-programs.sh"
+
+ALL_PROGRAMS=$($GEN_LISTS_OF_PROGRAMS --list-progs \
+    | grep -v -F -e coreutils -e libstdbuf.so \
+    | tr '[' '_')
+
+# Compute default SOURCES. automake will assume the source file for the
+# src_${cmd} target to be src/${cmd}.c, but we will add rules to generate
+# the lib src_libsinglebin_${cmd}_a which won't match the autogenerated source
+# file. This loop will initialize the default source file and will be reset
+# later if needed.
+for cmd in $ALL_PROGRAMS; do
+  eval "src_${cmd}_SOURCES=src/${cmd}.c"
+done
+
+# Load actual values from src/local.mk. This will read all the variables from
+# the local.mk matching the src_${cmd}_... case.
+while read l; do
+  if echo "$l" | grep -E '^src_\w+ +\+?=' > /dev/null; then
+    var=$(echo $l | cut -f 1 -d ' ')
+    value=$(echo $l | cut -f 2- -d =)
+    if [ "$value" != " \$(LDADD)" ]; then
+      oldvalue=""
+      if echo $l | grep -F '+=' >/dev/null; then
+        eval "oldvalue=\${$var}"
+      fi
+      value=$(echo "$value" | sed "s/'/'\"'\"'/g")
+      eval "$var='$oldvalue "$value"'"
+    fi
+  fi
+done < $LOCAL_MK
+
+me=`echo "$0" | sed 's,.*/,,'`
+echo "## Automatically generated by $me.  DO NOT EDIT BY HAND!"
+
+# Override the sources for dir and vdir. We use a smaller version of dir and
+# vdir that relies on the ls main.
+src_dir_SOURCES="src/coreutils-dir.c"
+src_dir_LDADD="$src_dir_LDADD src/libsinglebin_ls.a"
+echo src_libsinglebin_dir_a_DEPENDENCIES = src/libsinglebin_ls.a
+src_vdir_SOURCES="src/coreutils-vdir.c"
+src_vdir_LDADD="$src_vdir_LDADD src/libsinglebin_ls.a"
+echo src_libsinglebin_vdir_a_DEPENDENCIES = src/libsinglebin_ls.a
+
+# Override the sources for arch likewise, using the main from uname.
+src_arch_SOURCES="src/coreutils-arch.c"
+src_arch_LDADD="$src_arch_LDADD src/libsinglebin_uname.a"
+echo src_libsinglebin_arch_a_DEPENDENCIES = src/libsinglebin_uname.a
+
+for cmd in $ALL_PROGRAMS; do
+  echo "# Command $cmd"
+  echo noinst_LIBRARIES += src/libsinglebin_${cmd}.a
+  base="src_libsinglebin_${cmd}_a"
+  # SOURCES
+  var=src_${cmd}_SOURCES
+  eval "value=\$$var"
+  echo "${base}_SOURCES = $value"
+
+  # LDADD
+  var=src_${cmd}_LDADD
+  eval "value=\$$var"
+  if [ "x$value" != "x" ]; then
+    echo "${base}_ldadd = $value"
+  fi
+
+  # CFLAGS
+  # Hack any other program defining a main() replacing its main by
+  # _single_binary_main_$PROGRAM_NAME.
+  echo "${base}_CFLAGS = \"-Dmain=_single_binary_main_${cmd}(int, char**) " \
+       "ATTRIBUTE_NORETURN; int _single_binary_main_${cmd}\" " \
+       "-Dusage=_usage_${cmd} \$(src_coreutils_CFLAGS)"
+  var=src_${cmd}_CFLAGS
+  eval "value=\$$var"
+  if [ "x$value" != "x" ]; then
+    echo "${base}_CFLAGS += $value"
+  fi
+
+  # CPPFLAGS
+  var=src_${cmd}_CPPFLAGS
+  eval "value=\$$var"
+  if [ "x$value" != "x" ]; then
+    echo "${base}_CPPFLAGS = $value"
+  fi
+done
+
+exit 0
diff --git a/build-aux/gendocs.sh b/build-aux/gendocs.sh
index 0c0bc4b0..b2e7b097 100755
--- a/build-aux/gendocs.sh
+++ b/build-aux/gendocs.sh
@@ -2,9 +2,9 @@
 # gendocs.sh -- generate a GNU manual in many formats.  This script is
 #   mentioned in maintain.texi.  See the help message below for usage details.
 
-scriptversion=2012-10-27.11
+scriptversion=2014-05-01.10
 
-# Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 # Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
@@ -56,7 +56,7 @@ unset use_texi2html
 
 version="gendocs.sh $scriptversion
 
-Copyright 2012 Free Software Foundation, Inc.
+Copyright 2013 Free Software Foundation, Inc.
 There is NO warranty.  You may redistribute this software
 under the terms of the GNU General Public License.
 For more information about these matters, see the files named COPYING."
@@ -69,16 +69,26 @@ discussion:
   http://www.gnu.org/prep/maintain_toc.html
 
 Options:
-  -s SRCFILE  read Texinfo from SRCFILE, instead of PACKAGE.{texinfo|texi|txi}
-  -o OUTDIR   write files into OUTDIR, instead of manual/.
-  -I DIR      append DIR to the Texinfo search path.
-  --email ADR use ADR as contact in generated web pages.
-  --docbook   convert through DocBook too (xml, txt, html, pdf).
-  --html ARG  pass indicated ARG to makeinfo or texi2html for HTML targets.
-  --info ARG  pass indicated ARG to makeinfo for Info, instead of --no-split.
-  --texi2html use texi2html to generate HTML targets.
-  --help      display this help and exit successfully.
-  --version   display version information and exit successfully.
+  --email ADR use ADR as contact in generated web pages; always give this.
+
+  -s SRCFILE   read Texinfo from SRCFILE, instead of PACKAGE.{texinfo|texi|txi}
+  -o OUTDIR    write files into OUTDIR, instead of manual/.
+  -I DIR       append DIR to the Texinfo search path.
+  --common ARG pass ARG in all invocations.
+  --html ARG   pass ARG to makeinfo or texi2html for HTML targets.
+  --info ARG   pass ARG to makeinfo for Info, instead of --no-split.
+  --no-ascii   skip generating the plain text output.
+  --no-html    skip generating the html output.
+  --no-info    skip generating the info output.
+  --no-tex     skip generating the dvi and pdf output.
+  --source ARG include ARG in tar archive of sources.
+  --split HOW  make split HTML by node, section, chapter; default node.
+
+  --texi2html  use texi2html to make HTML target, with all split versions.
+  --docbook    convert through DocBook too (xml, txt, html, pdf).
+
+  --help       display this help and exit successfully.
+  --version    display version information and exit successfully.
 
 Simple example: $prog --email bug-gnu-emacs@gnu.org emacs \"GNU Emacs Manual\"
 
@@ -92,8 +102,8 @@ Output will be in a new subdirectory \"manual\" (by default;
 use -o OUTDIR to override).  Move all the new files into your web CVS
 tree, as explained in the Web Pages node of maintain.texi.
 
-Please do use the --email ADDRESS option to specify your bug-reporting
-address in the generated HTML pages.
+Please use the --email ADDRESS option so your own bug-reporting
+address will be used in the generated HTML pages.
 
 MANUAL-TITLE is included as part of the HTML <title> of the overall
 manual/index.html file.  It should include the name of the package being
@@ -117,7 +127,7 @@ You can set the environment variables MAKEINFO, TEXI2DVI, TEXI2HTML,
 and PERL to control the programs that get executed, and
 GENDOCS_TEMPLATE_DIR to control where the gendocs_template file is
 looked for.  With --docbook, the environment variables DOCBOOK2HTML,
-DOCBOOK2PDF, and DOCBOOK2TXT are also respected.
+DOCBOOK2PDF, and DOCBOOK2TXT are also consulted.
 
 By default, makeinfo and texi2dvi are run in the default (English)
 locale, since that's the language of most Texinfo manuals.  If you
@@ -130,25 +140,40 @@ Email bug reports or enhancement requests to bug-texinfo@gnu.org.
 MANUAL_TITLE=
 PACKAGE=
 EMAIL=webmasters@gnu.org  # please override with --email
-commonarg= # Options passed to all the tools (-I dir).
-dirs=      # -I's directories.
+commonarg= # passed to all makeinfo/texi2html invcations.
+dirargs=   # passed to all tools (-I dir).
+dirs=      # -I directories.
 htmlarg=
 infoarg=--no-split
+generate_ascii=true
+generate_html=true
+generate_info=true
+generate_tex=true
 outdir=manual
+source_extra=
+split=node
 srcfile=
 
 while test $# -gt 0; do
   case $1 in
-    --email) shift; EMAIL=$1;;
-    --help) echo "$usage"; exit 0;;
-    --version) echo "$version"; exit 0;;
-    -s) shift; srcfile=$1;;
-    -o) shift; outdir=$1;;
-    -I) shift; commonarg="$commonarg -I '$1'"; dirs="$dirs $1";;
-    --docbook) docbook=yes;;
-    --html) shift; htmlarg=$1;;
-    --info) shift; infoarg=$1;;
+    -s)          shift; srcfile=$1;;
+    -o)          shift; outdir=$1;;
+    -I)          shift; dirargs="$dirargs -I '$1'"; dirs="$dirs $1";;
+    --common)    shift; commonarg=$1;;
+    --docbook)   docbook=yes;;
+    --email)     shift; EMAIL=$1;;
+    --html)      shift; htmlarg=$1;;
+    --info)      shift; infoarg=$1;;
+    --no-ascii)  generate_ascii=false;;
+    --no-html)   generate_ascii=false;;
+    --no-info)   generate_info=false;;
+    --no-tex)    generate_tex=false;;
+    --source)    shift; source_extra=$1;;
+    --split)     shift; split=$1;;
     --texi2html) use_texi2html=1;;
+
+    --help)      echo "$usage"; exit 0;;
+    --version)   echo "$version"; exit 0;;
     -*)
       echo "$0: Unknown option \`$1'." >&2
       echo "$0: Try \`--help' for more information." >&2
@@ -166,6 +191,9 @@ while test $# -gt 0; do
   shift
 done
 
+# makeinfo uses the dirargs, but texi2dvi doesn't.
+commonarg=" $dirargs $commonarg"
+
 # For most of the following, the base name is just $PACKAGE
 base=$PACKAGE
 
@@ -202,8 +230,9 @@ calcsize()
 
 # copy_images OUTDIR HTML-FILE...
 # -------------------------------
-# Copy all the images needed by the HTML-FILEs into OUTDIR.  Look
-# for them in the -I directories.
+# Copy all the images needed by the HTML-FILEs into OUTDIR.
+# Look for them in . and the -I directories; this is simpler than what
+# makeinfo supports with -I, but hopefully it will suffice.
 copy_images()
 {
   local odir
@@ -213,7 +242,7 @@ copy_images()
 BEGIN {
   \$me = '$prog';
   \$odir = '$odir';
-  @dirs = qw($dirs);
+  @dirs = qw(. $dirs);
 }
 " -e '
 /<img src="(.*?)"/g && ++$need{$1};
@@ -247,46 +276,64 @@ case $outdir in
   *)  abs_outdir=$srcdir/$outdir;;
 esac
 
-echo "Generating output formats for $srcfile"
-
-cmd="$SETLANG $MAKEINFO -o $PACKAGE.info $commonarg $infoarg \"$srcfile\""
-echo "Generating info file(s)... ($cmd)"
-eval "$cmd"
+echo "Making output for $srcfile"
+echo " in `pwd`"
 mkdir -p "$outdir/"
-tar czf "$outdir/$PACKAGE.info.tar.gz" $PACKAGE.info*
-info_tgz_size=`calcsize "$outdir/$PACKAGE.info.tar.gz"`
-# do not mv the info files, there's no point in having them available
-# separately on the web.
-
-cmd="$SETLANG $TEXI2DVI $commonarg \"$srcfile\""
-echo "Generating dvi ... ($cmd)"
-eval "$cmd"
-
-# compress/finish dvi:
-gzip -f -9 $PACKAGE.dvi
-dvi_gz_size=`calcsize $PACKAGE.dvi.gz`
-mv $PACKAGE.dvi.gz "$outdir/"
-
-cmd="$SETLANG $TEXI2DVI --pdf $commonarg \"$srcfile\""
-echo "Generating pdf ... ($cmd)"
-eval "$cmd"
-pdf_size=`calcsize $PACKAGE.pdf`
-mv $PACKAGE.pdf "$outdir/"
-
-opt="-o $PACKAGE.txt --no-split --no-headers $commonarg"
-cmd="$SETLANG $MAKEINFO $opt \"$srcfile\""
-echo "Generating ASCII... ($cmd)"
-eval "$cmd"
-ascii_size=`calcsize $PACKAGE.txt`
-gzip -f -9 -c $PACKAGE.txt >"$outdir/$PACKAGE.txt.gz"
-ascii_gz_size=`calcsize "$outdir/$PACKAGE.txt.gz"`
-mv $PACKAGE.txt "$outdir/"
 
+# 
+if $generate_info; then
+  cmd="$SETLANG $MAKEINFO -o $PACKAGE.info $commonarg $infoarg \"$srcfile\""
+  echo "Generating info... ($cmd)"
+  rm -f $PACKAGE.info* # get rid of any strays
+  eval "$cmd"
+  tar czf "$outdir/$PACKAGE.info.tar.gz" $PACKAGE.info*
+  ls -l "$outdir/$PACKAGE.info.tar.gz"
+  info_tgz_size=`calcsize "$outdir/$PACKAGE.info.tar.gz"`
+  # do not mv the info files, there's no point in having them available
+  # separately on the web.
+fi  # end info
+
+# 
+if $generate_tex; then
+  cmd="$SETLANG $TEXI2DVI $dirargs \"$srcfile\""
+  printf "\nGenerating dvi... ($cmd)\n"
+  eval "$cmd"
+  # compress/finish dvi:
+  gzip -f -9 $PACKAGE.dvi
+  dvi_gz_size=`calcsize $PACKAGE.dvi.gz`
+  mv $PACKAGE.dvi.gz "$outdir/"
+  ls -l "$outdir/$PACKAGE.dvi.gz"
+
+  cmd="$SETLANG $TEXI2DVI --pdf $dirargs \"$srcfile\""
+  printf "\nGenerating pdf... ($cmd)\n"
+  eval "$cmd"
+  pdf_size=`calcsize $PACKAGE.pdf`
+  mv $PACKAGE.pdf "$outdir/"
+  ls -l "$outdir/$PACKAGE.pdf"
+fi # end tex (dvi + pdf)
+
+# 
+if $generate_ascii; then
+  opt="-o $PACKAGE.txt --no-split --no-headers $commonarg"
+  cmd="$SETLANG $MAKEINFO $opt \"$srcfile\""
+  printf "\nGenerating ascii... ($cmd)\n"
+  eval "$cmd"
+  ascii_size=`calcsize $PACKAGE.txt`
+  gzip -f -9 -c $PACKAGE.txt >"$outdir/$PACKAGE.txt.gz"
+  ascii_gz_size=`calcsize "$outdir/$PACKAGE.txt.gz"`
+  mv $PACKAGE.txt "$outdir/"
+  ls -l "$outdir/$PACKAGE.txt" "$outdir/$PACKAGE.txt.gz"
+fi
+
+# 
+
+if $generate_html; then
+# Split HTML at level $1.  Used for texi2html.
 html_split()
 {
-  opt="--split=$1 $commonarg $htmlarg --node-files"
+  opt="--split=$1 --node-files $commonarg $htmlarg"
   cmd="$SETLANG $TEXI2HTML --output $PACKAGE.html $opt \"$srcfile\""
-  echo "Generating html by $1... ($cmd)"
+  printf "\nGenerating html by $1... ($cmd)\n"
   eval "$cmd"
   split_html_dir=$PACKAGE.html
   (
@@ -304,7 +351,7 @@ html_split()
 if test -z "$use_texi2html"; then
   opt="--no-split --html -o $PACKAGE.html $commonarg $htmlarg"
   cmd="$SETLANG $MAKEINFO $opt \"$srcfile\""
-  echo "Generating monolithic html... ($cmd)"
+  printf "\nGenerating monolithic html... ($cmd)\n"
   rm -rf $PACKAGE.html  # in case a directory is left over
   eval "$cmd"
   html_mono_size=`calcsize $PACKAGE.html`
@@ -312,24 +359,38 @@ if test -z "$use_texi2html"; then
   html_mono_gz_size=`calcsize "$outdir/$PACKAGE.html.gz"`
   copy_images "$outdir/" $PACKAGE.html
   mv $PACKAGE.html "$outdir/"
-
-  opt="--html -o $PACKAGE.html $commonarg $htmlarg"
+  ls -l "$outdir/$PACKAGE.html" "$outdir/$PACKAGE.html.gz"
+
+  # Before Texinfo 5.0, makeinfo did not accept a --split=HOW option,
+  # it just always split by node.  So if we're splitting by node anyway,
+  # leave it out.
+  if test "x$split" = xnode; then
+    split_arg=
+  else
+    split_arg=--split=$split
+  fi
+  #
+  opt="--html -o $PACKAGE.html $split_arg $commonarg $htmlarg"
   cmd="$SETLANG $MAKEINFO $opt \"$srcfile\""
-  echo "Generating html by node... ($cmd)"
+  printf "\nGenerating html by $split... ($cmd)\n"
   eval "$cmd"
   split_html_dir=$PACKAGE.html
   copy_images $split_html_dir/ $split_html_dir/*.html
   (
     cd $split_html_dir || exit 1
-    tar -czf "$abs_outdir/$PACKAGE.html_node.tar.gz" -- *
+    tar -czf "$abs_outdir/$PACKAGE.html_$split.tar.gz" -- *
   )
-  html_node_tgz_size=`calcsize "$outdir/$PACKAGE.html_node.tar.gz"`
-  rm -rf "$outdir/html_node/"
-  mv $split_html_dir "$outdir/html_node/"
-else
+  eval \
+    html_${split}_tgz_size=`calcsize "$outdir/$PACKAGE.html_$split.tar.gz"`
+  rm -rf "$outdir/html_$split/"
+  mv $split_html_dir "$outdir/html_$split/"
+  du -s "$outdir/html_$split/"
+  ls -l "$outdir/$PACKAGE.html_$split.tar.gz"
+
+else # use texi2html:
   opt="--output $PACKAGE.html $commonarg $htmlarg"
   cmd="$SETLANG $TEXI2HTML $opt \"$srcfile\""
-  echo "Generating monolithic html... ($cmd)"
+  printf "\nGenerating monolithic html with texi2html... ($cmd)\n"
   rm -rf $PACKAGE.html  # in case a directory is left over
   eval "$cmd"
   html_mono_size=`calcsize $PACKAGE.html`
@@ -341,20 +402,25 @@ else
   html_split chapter
   html_split section
 fi
+fi # end html
 
-echo Making .tar.gz for sources...
+# 
+printf "\nMaking .tar.gz for sources...\n"
 d=`dirname $srcfile`
 (
   cd "$d"
-  srcfiles=`ls *.texinfo *.texi *.txi *.eps 2>/dev/null` || true
-  tar cvzfh "$abs_outdir/$PACKAGE.texi.tar.gz" $srcfiles
+  srcfiles=`ls -d *.texinfo *.texi *.txi *.eps $source_extra 2>/dev/null` || true
+  tar czfh "$abs_outdir/$PACKAGE.texi.tar.gz" $srcfiles
+  ls -l "$abs_outdir/$PACKAGE.texi.tar.gz"
 )
 texi_tgz_size=`calcsize "$outdir/$PACKAGE.texi.tar.gz"`
 
+# 
+# Do everything again through docbook.
 if test -n "$docbook"; then
   opt="-o - --docbook $commonarg"
   cmd="$SETLANG $MAKEINFO $opt \"$srcfile\" >${srcdir}/$PACKAGE-db.xml"
-  echo "Generating docbook XML... ($cmd)"
+  printf "\nGenerating docbook XML... ($cmd)\n"
   eval "$cmd"
   docbook_xml_size=`calcsize $PACKAGE-db.xml`
   gzip -f -9 -c $PACKAGE-db.xml >"$outdir/$PACKAGE-db.xml.gz"
@@ -364,7 +430,7 @@ if test -n "$docbook"; then
   split_html_db_dir=html_node_db
   opt="$commonarg -o $split_html_db_dir"
   cmd="$DOCBOOK2HTML $opt \"${outdir}/$PACKAGE-db.xml\""
-  echo "Generating docbook HTML... ($cmd)"
+  printf "\nGenerating docbook HTML... ($cmd)\n"
   eval "$cmd"
   (
     cd ${split_html_db_dir} || exit 1
@@ -377,24 +443,26 @@ if test -n "$docbook"; then
   rmdir ${split_html_db_dir}
 
   cmd="$DOCBOOK2TXT \"${outdir}/$PACKAGE-db.xml\""
-  echo "Generating docbook ASCII... ($cmd)"
+  printf "\nGenerating docbook ASCII... ($cmd)\n"
   eval "$cmd"
   docbook_ascii_size=`calcsize $PACKAGE-db.txt`
   mv $PACKAGE-db.txt "$outdir/"
 
   cmd="$DOCBOOK2PDF \"${outdir}/$PACKAGE-db.xml\""
-  echo "Generating docbook PDF... ($cmd)"
+  printf "\nGenerating docbook PDF... ($cmd)\n"
   eval "$cmd"
   docbook_pdf_size=`calcsize $PACKAGE-db.pdf`
   mv $PACKAGE-db.pdf "$outdir/"
 fi
 
-echo "Writing index file..."
+# 
+printf "\nMaking index.html for $PACKAGE...\n"
 if test -z "$use_texi2html"; then
-   CONDS="/%%IF  *HTML_SECTION%%/,/%%ENDIF  *HTML_SECTION%%/d;\
-          /%%IF  *HTML_CHAPTER%%/,/%%ENDIF  *HTML_CHAPTER%%/d"
+  CONDS="/%%IF  *HTML_SECTION%%/,/%%ENDIF  *HTML_SECTION%%/d;\
+         /%%IF  *HTML_CHAPTER%%/,/%%ENDIF  *HTML_CHAPTER%%/d"
 else
-   CONDS="/%%ENDIF.*%%/d;/%%IF  *HTML_SECTION%%/d;/%%IF  *HTML_CHAPTER%%/d"
+  # should take account of --split here.
+  CONDS="/%%ENDIF.*%%/d;/%%IF  *HTML_SECTION%%/d;/%%IF  *HTML_CHAPTER%%/d"
 fi
 
 curdate=`$SETLANG date '+%B %d, %Y'`
diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
index 34682473..47d65767 100755
--- a/build-aux/git-version-gen
+++ b/build-aux/git-version-gen
@@ -1,8 +1,8 @@
 #!/bin/sh
 # Print a version string.
-scriptversion=2012-12-31.23; # UTC
+scriptversion=2014-06-19.19; # UTC
 
-# Copyright (C) 2007-2013 Free Software Foundation, Inc.
+# Copyright (C) 2007-2014 Free Software Foundation, Inc.
 #
 # 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
@@ -85,8 +85,9 @@ Print a version string.
 
 Options:
 
-   --prefix           prefix of git tags (default 'v')
-   --fallback         fallback version to use if \"git --version\" fails
+   --prefix PREFIX    prefix of git tags (default 'v')
+   --fallback VERSION
+                      fallback version to use if \"git --version\" fails
 
    --help             display this help and exit
    --version          output version information and exit
diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog
index e02d34c2..78afff4e 100755
--- a/build-aux/gitlog-to-changelog
+++ b/build-aux/gitlog-to-changelog
@@ -9,7 +9,7 @@ my $VERSION = '2012-07-29 06:11'; # UTC
 # If you change this file with Emacs, please let the write hook
 # do its job.  Otherwise, update this string manually.
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/build-aux/gnu-web-doc-update b/build-aux/gnu-web-doc-update
index 268ecc06..7af2f185 100755
--- a/build-aux/gnu-web-doc-update
+++ b/build-aux/gnu-web-doc-update
@@ -4,7 +4,7 @@
 
 VERSION=2012-12-16.14; # UTC
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/build-aux/gnupload b/build-aux/gnupload
index 782dd6fd..2da97d89 100755
--- a/build-aux/gnupload
+++ b/build-aux/gnupload
@@ -1,9 +1,9 @@
 #!/bin/sh
 # Sign files and upload them.
 
-scriptversion=2012-12-11.16; # UTC
+scriptversion=2013-03-19.17; # UTC
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 #
 # 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
@@ -39,9 +39,8 @@ nl='
 
 usage="Usage: $0 [OPTION]... [CMD] FILE... [[CMD] FILE...]
 
-Sign all FILES, and process them at selected destinations according to CMD.
-<http://www.gnu.org/prep/maintain/html_node/Automated-FTP-Uploads.html>
-explains further.
+Sign all FILES, and process them at the destinations specified with --to.
+If CMD is not given, it defaults to uploading.  See examples below.
 
 Commands:
   --delete                 delete FILES from destination
@@ -50,8 +49,7 @@ Commands:
   --                       treat the remaining arguments as files to upload
 
 Options:
-  --help                   print this help text and exit
-  --to DEST                specify one destination for FILES
+  --to DEST                specify a destination DEST for FILES
                            (multiple --to options are allowed)
   --user NAME              sign with key NAME
   --replace                allow replacements of existing files
@@ -59,10 +57,10 @@ Options:
   --dry-run                do nothing, show what would have been done
                            (including the constructed directive file)
   --version                output version information and exit
+  --help                   print this help text and exit
 
 If --symlink-regex is given without EXPR, then the link target name
 is created by replacing the version information with '-latest', e.g.:
-
   foo-1.3.4.tar.gz -> foo-latest.tar.gz
 
 Recognized destinations are:
@@ -80,6 +78,9 @@ in the current working directory, its contents are prepended to the
 actual command line options.  Use this to keep your defaults.  Comments
 (#) and empty lines in $conffile are allowed.
 
+<http://www.gnu.org/prep/maintain/html_node/Automated-FTP-Uploads.html>
+gives some further background.
+
 Examples:
 1. Upload foobar-1.0.tar.gz to ftp.gnu.org:
   gnupload --to ftp.gnu.org:foobar foobar-1.0.tar.gz
@@ -104,7 +105,7 @@ Examples:
            --delete oopsbar-0.9.91.tar.gz \\
            -- foobar-0.9.91.tar.gz
 
-gnupload uses the ncftpput program to do the transfers; if you don't
+gnupload executes a program ncftpput to do the transfers; if you don't
 happen to have an ncftp package installed, the ncftpput-ftp script in
 the build-aux/ directory of the gnulib package
 (http://savannah.gnu.org/projects/gnulib) may serve as a replacement.
@@ -132,6 +133,12 @@ while test -n "$1"; do
       if test -z "$2"; then
         echo "$0: Missing argument for --to" 1>&2
         exit 1
+      elif echo "$2" | grep 'ftp-upload\.gnu\.org' >/dev/null; then
+        echo "$0: Use ftp.gnu.org:PKGNAME or alpha.gnu.org:PKGNAME" >&2
+        echo "$0: for the destination, not ftp-upload.gnu.org (which" >&2
+        echo "$0:  is used for direct ftp uploads, not with gnupload)." >&2
+        echo "$0: See --help and its examples if need be." >&2
+        exit 1
       else
         to="$to $2"
         shift
diff --git a/build-aux/install-sh b/build-aux/install-sh
index 377bb868..0b0fdcbb 100755
--- a/build-aux/install-sh
+++ b/build-aux/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2011-11-20.07; # UTC
+scriptversion=2013-12-25.23; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -41,19 +41,15 @@ scriptversion=2011-11-20.07; # UTC
 # This script is compatible with the BSD install script, but was written
 # from scratch.
 
+tab='	'
 nl='
 '
-IFS=" ""	$nl"
+IFS=" $tab$nl"
 
-# set DOITPROG to echo to test this script
+# Set DOITPROG to "echo" to test this script.
 
-# Don't use :- since 4.3BSD and earlier shells don't like it.
 doit=${DOITPROG-}
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
+doit_exec=${doit:-exec}
 
 # Put in absolute file names if you don't have them in your path;
 # or use environment vars.
@@ -68,17 +64,6 @@ mvprog=${MVPROG-mv}
 rmprog=${RMPROG-rm}
 stripprog=${STRIPPROG-strip}
 
-posix_glob='?'
-initialize_posix_glob='
-  test "$posix_glob" != "?" || {
-    if (set -f) 2>/dev/null; then
-      posix_glob=
-    else
-      posix_glob=:
-    fi
-  }
-'
-
 posix_mkdir=
 
 # Desired mode of installed file.
@@ -97,7 +82,7 @@ dir_arg=
 dst_arg=
 
 copy_on_change=false
-no_target_directory=
+is_target_a_directory=possibly
 
 usage="\
 Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
@@ -137,46 +122,57 @@ while test $# -ne 0; do
     -d) dir_arg=true;;
 
     -g) chgrpcmd="$chgrpprog $2"
-	shift;;
+        shift;;
 
     --help) echo "$usage"; exit $?;;
 
     -m) mode=$2
-	case $mode in
-	  *' '* | *'	'* | *'
-'*	  | *'*'* | *'?'* | *'['*)
-	    echo "$0: invalid mode: $mode" >&2
-	    exit 1;;
-	esac
-	shift;;
+        case $mode in
+          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
+            echo "$0: invalid mode: $mode" >&2
+            exit 1;;
+        esac
+        shift;;
 
     -o) chowncmd="$chownprog $2"
-	shift;;
+        shift;;
 
     -s) stripcmd=$stripprog;;
 
-    -t) dst_arg=$2
-	# Protect names problematic for 'test' and other utilities.
-	case $dst_arg in
-	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
-	esac
-	shift;;
+    -t)
+        is_target_a_directory=always
+        dst_arg=$2
+        # Protect names problematic for 'test' and other utilities.
+        case $dst_arg in
+          -* | [=\(\)!]) dst_arg=./$dst_arg;;
+        esac
+        shift;;
 
-    -T) no_target_directory=true;;
+    -T) is_target_a_directory=never;;
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
-    --)	shift
-	break;;
+    --) shift
+        break;;
 
-    -*)	echo "$0: invalid option: $1" >&2
-	exit 1;;
+    -*) echo "$0: invalid option: $1" >&2
+        exit 1;;
 
     *)  break;;
   esac
   shift
 done
 
+# We allow the use of options -d and -T together, by making -d
+# take the precedence; this is for compatibility with GNU install.
+
+if test -n "$dir_arg"; then
+  if test -n "$dst_arg"; then
+    echo "$0: target directory not allowed when installing a directory." >&2
+    exit 1
+  fi
+fi
+
 if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
   # When -d is used, all remaining arguments are directories to create.
   # When -t is used, the destination is already specified.
@@ -208,6 +204,15 @@ if test $# -eq 0; then
 fi
 
 if test -z "$dir_arg"; then
+  if test $# -gt 1 || test "$is_target_a_directory" = always; then
+    if test ! -d "$dst_arg"; then
+      echo "$0: $dst_arg: Is not a directory." >&2
+      exit 1
+    fi
+  fi
+fi
+
+if test -z "$dir_arg"; then
   do_exit='(exit $ret); exit $ret'
   trap "ret=129; $do_exit" 1
   trap "ret=130; $do_exit" 2
@@ -223,16 +228,16 @@ if test -z "$dir_arg"; then
 
     *[0-7])
       if test -z "$stripcmd"; then
-	u_plus_rw=
+        u_plus_rw=
       else
-	u_plus_rw='% 200'
+        u_plus_rw='% 200'
       fi
       cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
     *)
       if test -z "$stripcmd"; then
-	u_plus_rw=
+        u_plus_rw=
       else
-	u_plus_rw=,u+rw
+        u_plus_rw=,u+rw
       fi
       cp_umask=$mode$u_plus_rw;;
   esac
@@ -269,41 +274,15 @@ do
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
     if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dst_arg: Is a directory" >&2
-	exit 1
+      if test "$is_target_a_directory" = never; then
+        echo "$0: $dst_arg: Is a directory" >&2
+        exit 1
       fi
       dstdir=$dst
       dst=$dstdir/`basename "$src"`
       dstdir_status=0
     else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-	(dirname "$dst") 2>/dev/null ||
-	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	     X"$dst" : 'X\(//\)[^/]' \| \
-	     X"$dst" : 'X\(//\)$' \| \
-	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-	echo X"$dst" |
-	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)[^/].*/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\).*/{
-		   s//\1/
-		   q
-		 }
-		 s/.*/./; q'
-      `
-
+      dstdir=`dirname "$dst"`
       test -d "$dstdir"
       dstdir_status=$?
     fi
@@ -314,74 +293,74 @@ do
   if test $dstdir_status != 0; then
     case $posix_mkdir in
       '')
-	# Create intermediate dirs using mode 755 as modified by the umask.
-	# This is like FreeBSD 'install' as of 1997-10-28.
-	umask=`umask`
-	case $stripcmd.$umask in
-	  # Optimize common cases.
-	  *[2367][2367]) mkdir_umask=$umask;;
-	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
-	  *[0-7])
-	    mkdir_umask=`expr $umask + 22 \
-	      - $umask % 100 % 40 + $umask % 20 \
-	      - $umask % 10 % 4 + $umask % 2
-	    `;;
-	  *) mkdir_umask=$umask,go-w;;
-	esac
-
-	# With -d, create the new directory with the user-specified mode.
-	# Otherwise, rely on $mkdir_umask.
-	if test -n "$dir_arg"; then
-	  mkdir_mode=-m$mode
-	else
-	  mkdir_mode=
-	fi
-
-	posix_mkdir=false
-	case $umask in
-	  *[123567][0-7][0-7])
-	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
-	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-	    ;;
-	  *)
-	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-	    if (umask $mkdir_umask &&
-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-	    then
-	      if test -z "$dir_arg" || {
-		   # Check for POSIX incompatibilities with -m.
-		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writable bit of parent directory when it shouldn't.
-		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-		   case $ls_ld_tmpdir in
-		     d????-?r-*) different_mode=700;;
-		     d????-?--*) different_mode=755;;
-		     *) false;;
-		   esac &&
-		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-		   }
-		 }
-	      then posix_mkdir=:
-	      fi
-	      rmdir "$tmpdir/d" "$tmpdir"
-	    else
-	      # Remove any dirs left behind by ancient mkdir implementations.
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-	    fi
-	    trap '' 0;;
-	esac;;
+        # Create intermediate dirs using mode 755 as modified by the umask.
+        # This is like FreeBSD 'install' as of 1997-10-28.
+        umask=`umask`
+        case $stripcmd.$umask in
+          # Optimize common cases.
+          *[2367][2367]) mkdir_umask=$umask;;
+          .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+          *[0-7])
+            mkdir_umask=`expr $umask + 22 \
+              - $umask % 100 % 40 + $umask % 20 \
+              - $umask % 10 % 4 + $umask % 2
+            `;;
+          *) mkdir_umask=$umask,go-w;;
+        esac
+
+        # With -d, create the new directory with the user-specified mode.
+        # Otherwise, rely on $mkdir_umask.
+        if test -n "$dir_arg"; then
+          mkdir_mode=-m$mode
+        else
+          mkdir_mode=
+        fi
+
+        posix_mkdir=false
+        case $umask in
+          *[123567][0-7][0-7])
+            # POSIX mkdir -p sets u+wx bits regardless of umask, which
+            # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+            ;;
+          *)
+            tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+            trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+            if (umask $mkdir_umask &&
+                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+            then
+              if test -z "$dir_arg" || {
+                   # Check for POSIX incompatibilities with -m.
+                   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+                   # other-writable bit of parent directory when it shouldn't.
+                   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+                   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+                   case $ls_ld_tmpdir in
+                     d????-?r-*) different_mode=700;;
+                     d????-?--*) different_mode=755;;
+                     *) false;;
+                   esac &&
+                   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+                     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+                     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+                   }
+                 }
+              then posix_mkdir=:
+              fi
+              rmdir "$tmpdir/d" "$tmpdir"
+            else
+              # Remove any dirs left behind by ancient mkdir implementations.
+              rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+            fi
+            trap '' 0;;
+        esac;;
     esac
 
     if
       $posix_mkdir && (
-	umask $mkdir_umask &&
-	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+        umask $mkdir_umask &&
+        $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
       )
     then :
     else
@@ -391,53 +370,51 @@ do
       # directory the slow way, step by step, checking for races as we go.
 
       case $dstdir in
-	/*) prefix='/';;
-	[-=\(\)!]*) prefix='./';;
-	*)  prefix='';;
+        /*) prefix='/';;
+        [-=\(\)!]*) prefix='./';;
+        *)  prefix='';;
       esac
 
-      eval "$initialize_posix_glob"
-
       oIFS=$IFS
       IFS=/
-      $posix_glob set -f
+      set -f
       set fnord $dstdir
       shift
-      $posix_glob set +f
+      set +f
       IFS=$oIFS
 
       prefixes=
 
       for d
       do
-	test X"$d" = X && continue
-
-	prefix=$prefix$d
-	if test -d "$prefix"; then
-	  prefixes=
-	else
-	  if $posix_mkdir; then
-	    (umask=$mkdir_umask &&
-	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-	    # Don't fail if two instances are running concurrently.
-	    test -d "$prefix" || exit 1
-	  else
-	    case $prefix in
-	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-	      *) qprefix=$prefix;;
-	    esac
-	    prefixes="$prefixes '$qprefix'"
-	  fi
-	fi
-	prefix=$prefix/
+        test X"$d" = X && continue
+
+        prefix=$prefix$d
+        if test -d "$prefix"; then
+          prefixes=
+        else
+          if $posix_mkdir; then
+            (umask=$mkdir_umask &&
+             $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+            # Don't fail if two instances are running concurrently.
+            test -d "$prefix" || exit 1
+          else
+            case $prefix in
+              *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+              *) qprefix=$prefix;;
+            esac
+            prefixes="$prefixes '$qprefix'"
+          fi
+        fi
+        prefix=$prefix/
       done
 
       if test -n "$prefixes"; then
-	# Don't fail if two instances are running concurrently.
-	(umask $mkdir_umask &&
-	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-	  test -d "$dstdir" || exit 1
-	obsolete_mkdir_used=true
+        # Don't fail if two instances are running concurrently.
+        (umask $mkdir_umask &&
+         eval "\$doit_exec \$mkdirprog $prefixes") ||
+          test -d "$dstdir" || exit 1
+        obsolete_mkdir_used=true
       fi
     fi
   fi
@@ -472,15 +449,12 @@ do
 
     # If -C, don't bother to copy if it wouldn't change the file.
     if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-
-       eval "$initialize_posix_glob" &&
-       $posix_glob set -f &&
+       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
+       set -f &&
        set X $old && old=:$2:$4:$5:$6 &&
        set X $new && new=:$2:$4:$5:$6 &&
-       $posix_glob set +f &&
-
+       set +f &&
        test "$old" = "$new" &&
        $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
     then
@@ -493,24 +467,24 @@ do
       # to itself, or perhaps because mv is so ancient that it does not
       # support -f.
       {
-	# Now remove or move aside any old file at destination location.
-	# We try this two ways since rm can't unlink itself on some
-	# systems and the destination file might be busy for other
-	# reasons.  In this case, the final cleanup might fail but the new
-	# file should still install successfully.
-	{
-	  test ! -f "$dst" ||
-	  $doit $rmcmd -f "$dst" 2>/dev/null ||
-	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-	  } ||
-	  { echo "$0: cannot unlink or rename $dst" >&2
-	    (exit 1); exit 1
-	  }
-	} &&
-
-	# Now rename the file to the real destination.
-	$doit $mvcmd "$dsttmp" "$dst"
+        # Now remove or move aside any old file at destination location.
+        # We try this two ways since rm can't unlink itself on some
+        # systems and the destination file might be busy for other
+        # reasons.  In this case, the final cleanup might fail but the new
+        # file should still install successfully.
+        {
+          test ! -f "$dst" ||
+          $doit $rmcmd -f "$dst" 2>/dev/null ||
+          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+            { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+          } ||
+          { echo "$0: cannot unlink or rename $dst" >&2
+            (exit 1); exit 1
+          }
+        } &&
+
+        # Now rename the file to the real destination.
+        $doit $mvcmd "$dsttmp" "$dst"
       }
     fi || exit 1
 
diff --git a/build-aux/missing b/build-aux/missing
index 86a8fc31..db98974f 100755
--- a/build-aux/missing
+++ b/build-aux/missing
@@ -1,11 +1,10 @@
 #! /bin/sh
-# Common stub for a few missing GNU programs while installing.
+# Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2012-01-06.13; # UTC
+scriptversion=2013-10-28.13; # UTC
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # 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
@@ -26,68 +25,40 @@ scriptversion=2012-01-06.13; # UTC
 # the same distribution terms that you use for the rest of that program.
 
 if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
+  echo 1>&2 "Try '$0 --help' for more information"
   exit 1
 fi
 
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
+case $1 in
 
-msg="missing on your system"
+  --is-lightweight)
+    # Used by our autoconf macros to check whether the available missing
+    # script is modern enough.
+    exit 0
+    ;;
 
-case $1 in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
+  --run)
+    # Back-compat with the calling convention used by older automake.
+    shift
+    ;;
 
   -h|--h|--he|--hel|--help)
     echo "\
 $0 [OPTION]... PROGRAM [ARGUMENT]...
 
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
 
 Options:
   -h, --help      display this help and exit
   -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
 
 Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  autom4te     touch the output file, or create a stub one
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  bison     yacc      flex         lex       help2man
 
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
 
 Send bug reports to <bug-automake@gnu.org>."
     exit $?
@@ -99,228 +70,141 @@ Send bug reports to <bug-automake@gnu.org>."
     ;;
 
   -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
+    echo 1>&2 "$0: unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
     exit 1
     ;;
 
 esac
 
-# normalize program name to check for.
-program=`echo "$1" | sed '
-  s/^gnu-//; t
-  s/^gnu//; t
-  s/^g//; t'`
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).  This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
-  lex*|yacc*)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case $f in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te*)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison*|yacc*)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if test $# -ne 1; then
-        eval LASTARG=\${$#}
-	case $LASTARG in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f y.tab.h; then
-	echo >y.tab.h
-    fi
-    if test ! -f y.tab.c; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex*|flex*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if test $# -ne 1; then
-        eval LASTARG=\${$#}
-	case $LASTARG in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f lex.yy.c; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit $?
-    fi
-    ;;
-
-  makeinfo*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '
-	/^@setfilename/{
-	  s/.* \([^ ]*\) *$/\1/
-	  p
-	  q
-	}' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
-    touch $file
-    ;;
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch.  This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+  msg="probably too old"
+elif test $st -eq 127; then
+  # Program was missing.
+  msg="missing on your system"
+else
+  # Program was found and executed, but failed.  Give up.
+  exit $st
+fi
 
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+  case $1 in
+    aclocal|automake)
+      echo "The '$1' program is part of the GNU Automake package:"
+      echo "<$gnu_software_URL/automake>"
+      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/autoconf>"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+    autoconf|autom4te|autoheader)
+      echo "The '$1' program is part of the GNU Autoconf package:"
+      echo "<$gnu_software_URL/autoconf/>"
+      echo "It also requires GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+  esac
+}
+
+give_advice ()
+{
+  # Normalize program name to check for.
+  normalized_program=`echo "$1" | sed '
+    s/^gnu-//; t
+    s/^gnu//; t
+    s/^g//; t'`
+
+  printf '%s\n' "'$1' is $msg."
+
+  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+  case $normalized_program in
+    autoconf*)
+      echo "You should only need it if you modified 'configure.ac',"
+      echo "or m4 files included by it."
+      program_details 'autoconf'
+      ;;
+    autoheader*)
+      echo "You should only need it if you modified 'acconfig.h' or"
+      echo "$configure_deps."
+      program_details 'autoheader'
+      ;;
+    automake*)
+      echo "You should only need it if you modified 'Makefile.am' or"
+      echo "$configure_deps."
+      program_details 'automake'
+      ;;
+    aclocal*)
+      echo "You should only need it if you modified 'acinclude.m4' or"
+      echo "$configure_deps."
+      program_details 'aclocal'
+      ;;
+   autom4te*)
+      echo "You might have modified some maintainer files that require"
+      echo "the 'autom4te' program to be rebuilt."
+      program_details 'autom4te'
+      ;;
+    bison*|yacc*)
+      echo "You should only need it if you modified a '.y' file."
+      echo "You may want to install the GNU Bison package:"
+      echo "<$gnu_software_URL/bison/>"
+      ;;
+    lex*|flex*)
+      echo "You should only need it if you modified a '.l' file."
+      echo "You may want to install the Fast Lexical Analyzer package:"
+      echo "<$flex_URL>"
+      ;;
+    help2man*)
+      echo "You should only need it if you modified a dependency" \
+           "of a man page."
+      echo "You may want to install the GNU Help2man package:"
+      echo "<$gnu_software_URL/help2man/>"
     ;;
-esac
-
-exit 0
+    makeinfo*)
+      echo "You should only need it if you modified a '.texi' file, or"
+      echo "any other file indirectly affecting the aspect of the manual."
+      echo "You might want to install the Texinfo package:"
+      echo "<$gnu_software_URL/texinfo/>"
+      echo "The spurious makeinfo call might also be the consequence of"
+      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+      echo "want to install GNU make:"
+      echo "<$gnu_software_URL/make/>"
+      ;;
+    *)
+      echo "You might have modified some files without having the proper"
+      echo "tools for further handling them.  Check the 'README' file, it"
+      echo "often tells you about the needed prerequisites for installing"
+      echo "this package.  You may also peek at any GNU archive site, in"
+      echo "case some other package contains this missing '$1' program."
+      ;;
+  esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+                       -e '2,$s/^/         /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/build-aux/prefix-gnulib-mk b/build-aux/prefix-gnulib-mk
index 7553f654..4d0518fa 100755
--- a/build-aux/prefix-gnulib-mk
+++ b/build-aux/prefix-gnulib-mk
@@ -189,10 +189,11 @@ sub process ($)
 {
   my ($file) = @_;
   my ($bak) = "$file.bak";
-  rename ($file, $bak) or die;
+  rename ($file, $bak) or die "$ME: rename $file $bak failed: $!\n";
   my $contents = contents ($bak);
   $contents = prefix ($contents);
-  my $out = new IO::File(">$file") or die;
+  my $out = new IO::File(">$file")
+    or die "$ME: $file: failed to open for writing: $!\n";
   print $out $contents;
 }
 
diff --git a/build-aux/snippet/arg-nonnull.h b/build-aux/snippet/arg-nonnull.h
index 8ea2a474..9ee8b155 100644
--- a/build-aux/snippet/arg-nonnull.h
+++ b/build-aux/snippet/arg-nonnull.h
@@ -1,5 +1,5 @@
 /* A C macro for declaring that specific arguments must not be NULL.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
diff --git a/build-aux/snippet/c++defs.h b/build-aux/snippet/c++defs.h
index b35b933c..67b12335 100644
--- a/build-aux/snippet/c++defs.h
+++ b/build-aux/snippet/c++defs.h
@@ -1,5 +1,5 @@
 /* C++ compatible function declaration macros.
-   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
diff --git a/build-aux/snippet/unused-parameter.h b/build-aux/snippet/unused-parameter.h
index 1347c278..41d9510c 100644
--- a/build-aux/snippet/unused-parameter.h
+++ b/build-aux/snippet/unused-parameter.h
@@ -1,5 +1,5 @@
 /* A C macro for declaring that specific function parameters are not used.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
diff --git a/build-aux/snippet/warn-on-use.h b/build-aux/snippet/warn-on-use.h
index 1736a1bd..1c4d7bd4 100644
--- a/build-aux/snippet/warn-on-use.h
+++ b/build-aux/snippet/warn-on-use.h
@@ -1,5 +1,5 @@
 /* A C macro for emitting warnings if a function is used.
-   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
diff --git a/build-aux/test-driver b/build-aux/test-driver
new file mode 100755
index 00000000..d3060566
--- /dev/null
+++ b/build-aux/test-driver
@@ -0,0 +1,139 @@
+#! /bin/sh
+# test-driver - basic testsuite driver script.
+
+scriptversion=2013-07-13.22; # UTC
+
+# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+#
+# 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, 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/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+# Make unconditional expansion of undefined variables an error.  This
+# helps a lot in preventing typo-related bugs.
+set -u
+
+usage_error ()
+{
+  echo "$0: $*" >&2
+  print_usage >&2
+  exit 2
+}
+
+print_usage ()
+{
+  cat <<END
+Usage:
+  test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
+              [--expect-failure={yes|no}] [--color-tests={yes|no}]
+              [--enable-hard-errors={yes|no}] [--]
+              TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
+The '--test-name', '--log-file' and '--trs-file' options are mandatory.
+END
+}
+
+test_name= # Used for reporting.
+log_file=  # Where to save the output of the test script.
+trs_file=  # Where to save the metadata of the test run.
+expect_failure=no
+color_tests=no
+enable_hard_errors=yes
+while test $# -gt 0; do
+  case $1 in
+  --help) print_usage; exit $?;;
+  --version) echo "test-driver $scriptversion"; exit $?;;
+  --test-name) test_name=$2; shift;;
+  --log-file) log_file=$2; shift;;
+  --trs-file) trs_file=$2; shift;;
+  --color-tests) color_tests=$2; shift;;
+  --expect-failure) expect_failure=$2; shift;;
+  --enable-hard-errors) enable_hard_errors=$2; shift;;
+  --) shift; break;;
+  -*) usage_error "invalid option: '$1'";;
+   *) break;;
+  esac
+  shift
+done
+
+missing_opts=
+test x"$test_name" = x && missing_opts="$missing_opts --test-name"
+test x"$log_file"  = x && missing_opts="$missing_opts --log-file"
+test x"$trs_file"  = x && missing_opts="$missing_opts --trs-file"
+if test x"$missing_opts" != x; then
+  usage_error "the following mandatory options are missing:$missing_opts"
+fi
+
+if test $# -eq 0; then
+  usage_error "missing argument"
+fi
+
+if test $color_tests = yes; then
+  # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
+  red='' # Red.
+  grn='' # Green.
+  lgn='' # Light green.
+  blu='' # Blue.
+  mgn='' # Magenta.
+  std=''     # No color.
+else
+  red= grn= lgn= blu= mgn= std=
+fi
+
+do_exit='rm -f $log_file $trs_file; (exit $st); exit $st'
+trap "st=129; $do_exit" 1
+trap "st=130; $do_exit" 2
+trap "st=141; $do_exit" 13
+trap "st=143; $do_exit" 15
+
+# Test script is run here.
+"$@" >$log_file 2>&1
+estatus=$?
+if test $enable_hard_errors = no && test $estatus -eq 99; then
+  estatus=1
+fi
+
+case $estatus:$expect_failure in
+  0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
+  0:*)   col=$grn res=PASS  recheck=no  gcopy=no;;
+  77:*)  col=$blu res=SKIP  recheck=no  gcopy=yes;;
+  99:*)  col=$mgn res=ERROR recheck=yes gcopy=yes;;
+  *:yes) col=$lgn res=XFAIL recheck=no  gcopy=yes;;
+  *:*)   col=$red res=FAIL  recheck=yes gcopy=yes;;
+esac
+
+# Report outcome to console.
+echo "${col}${res}${std}: $test_name"
+
+# Register the test result, and other relevant metadata.
+echo ":test-result: $res" > $trs_file
+echo ":global-test-result: $res" >> $trs_file
+echo ":recheck: $recheck" >> $trs_file
+echo ":copy-in-global-log: $gcopy" >> $trs_file
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/build-aux/texinfo.tex b/build-aux/texinfo.tex
index 85f184cc..6312dadb 100644
--- a/build-aux/texinfo.tex
+++ b/build-aux/texinfo.tex
@@ -3,11 +3,11 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2013-02-01.11}
+\def\texinfoversion{2014-05-20.16}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-% 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
+% 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
 %
 % This texinfo.tex file is free software: you can redistribute it and/or
 % modify it under the terms of the GNU General Public License as
@@ -281,9 +281,9 @@
   \toks6=\expandafter{\prevsectiondefs}%
   \toks8=\expandafter{\lastcolordefs}%
   \mark{%
-                   \the\toks0 \the\toks2
-      \noexpand\or \the\toks4 \the\toks6
-    \noexpand\else \the\toks8
+                   \the\toks0 \the\toks2  % 0: top marks (\last...)
+      \noexpand\or \the\toks4 \the\toks6  % 1: bottom marks (default, \prev...)
+    \noexpand\else \the\toks8             % 2: color marks
   }%
 }
 % \topmark doesn't work for the very first chapter (after the title
@@ -322,10 +322,13 @@
   %
   % Do this outside of the \shipout so @code etc. will be expanded in
   % the headline as they should be, not taken literally (outputting ''code).
+  \def\commmonheadfootline{\let\hsize=\pagewidth \texinfochars}
+  %
   \ifodd\pageno \getoddheadingmarks \else \getevenheadingmarks \fi
-  \setbox\headlinebox = \vbox{\let\hsize=\pagewidth \makeheadline}%
+  \global\setbox\headlinebox = \vbox{\commmonheadfootline \makeheadline}%
+  %
   \ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi
-  \setbox\footlinebox = \vbox{\let\hsize=\pagewidth \makefootline}%
+  \global\setbox\footlinebox = \vbox{\commmonheadfootline \makefootline}%
   %
   {%
     % Have to do this stuff outside the \shipout because we want it to
@@ -1135,10 +1138,12 @@ output) for that.)}
 
 \ifpdf
   %
-  % Color manipulation macros based on pdfcolor.tex,
+  % Color manipulation macros using ideas from pdfcolor.tex,
   % except using rgb instead of cmyk; the latter is said to render as a
   % very dark gray on-screen and a very dark halftone in print, instead
-  % of actual black.
+  % of actual black. The dark red here is dark enough to print on paper as
+  % nearly black, but still distinguishable for online viewing.  We use
+  % black by default, though.
   \def\rgbDarkRed{0.50 0.09 0.12}
   \def\rgbBlack{0 0 0}
   %
@@ -1248,10 +1253,9 @@ output) for that.)}
   % used to mark target names; must be expandable.
   \def\pdfmkpgn#1{#1}
   %
-  % by default, use a color that is dark enough to print on paper as
-  % nearly black, but still distinguishable for online viewing.
-  \def\urlcolor{\rgbDarkRed}
-  \def\linkcolor{\rgbDarkRed}
+  % by default, use black for everything.
+  \def\urlcolor{\rgbBlack}
+  \def\linkcolor{\rgbBlack}
   \def\endlink{\setcolor{\maincolor}\pdfendlink}
   %
   % Adding outlines to PDF; macros for calculating structure of outlines
@@ -2142,7 +2146,7 @@ end
   \let\tenttsl=\secttsl
   \def\curfontsize{sec}%
   \def\lsize{subsec}\def\lllsize{reduced}%
-  \resetmathfonts \setleading{16pt}}
+  \resetmathfonts \setleading{17pt}}
 \def\subsecfonts{%
   \let\tenrm=\ssecrm \let\tenit=\ssecit \let\tensl=\ssecsl
   \let\tenbf=\ssecbf \let\tentt=\ssectt \let\smallcaps=\ssecsc
@@ -2377,8 +2381,10 @@ end
   \ifx\next,%
   \else\ifx\next-%
   \else\ifx\next.%
+  \else\ifx\next\.%
+  \else\ifx\next\comma%
   \else\ptexslash
-  \fi\fi\fi
+  \fi\fi\fi\fi\fi
   \aftersmartic
 }
 
@@ -2475,14 +2481,14 @@ end
 }
 
 % We *must* turn on hyphenation at `-' and `_' in @code.
+% (But see \codedashfinish below.)
 % Otherwise, it is too hard to avoid overfull hboxes
 % in the Emacs manual, the Library manual, etc.
 %
 % Unfortunately, TeX uses one parameter (\hyphenchar) to control
 % both hyphenation at - and hyphenation within words.
 % We must therefore turn them both off (\tclose does that)
-% and arrange explicitly to hyphenate at a dash.
-%  -- rms.
+% and arrange explicitly to hyphenate at a dash. -- rms.
 {
   \catcode`\-=\active \catcode`\_=\active
   \catcode`\'=\active \catcode`\`=\active
@@ -2499,14 +2505,35 @@ end
      \let-\normaldash
      \let_\realunder
     \fi
+    % Given -foo (with a single dash), we do not want to allow a break
+    % after the hyphen.
+    \global\let\codedashprev=\codedash
+    %
     \codex
   }
+  %
+  \gdef\codedash{\futurelet\next\codedashfinish}
+  \gdef\codedashfinish{%
+    \normaldash % always output the dash character itself.
+    % 
+    % Now, output a discretionary to allow a line break, unless
+    % (a) the next character is a -, or
+    % (b) the preceding character is a -.
+    % E.g., given --posix, we do not want to allow a break after either -.
+    % Given --foo-bar, we do want to allow a break between the - and the b.
+    \ifx\next\codedash \else
+      \ifx\codedashprev\codedash 
+      \else \discretionary{}{}{}\fi
+    \fi
+    % we need the space after the = for the case when \next itself is a
+    % space token; it would get swallowed otherwise.  As in @code{- a}.
+    \global\let\codedashprev= \next
+  }
 }
-
+\def\normaldash{-}
+%
 \def\codex #1{\tclose{#1}\endgroup}
 
-\def\normaldash{-}
-\def\codedash{-\discretionary{}{}{}}
 \def\codeunder{%
   % this is all so @math{@code{var_name}+1} can work.  In math mode, _
   % is "active" (mathcode"8000) and \normalunderscore (or \char95, etc.)
@@ -2548,37 +2575,21 @@ end
 \let\file=\code
 \let\option=\code
 
-% @uref (abbreviation for `urlref') takes an optional (comma-separated)
-% second argument specifying the text to display and an optional third
-% arg as text to display instead of (rather than in addition to) the url
-% itself.  First (mandatory) arg is the url.
-% (This \urefnobreak definition isn't used now, leaving it for a while
-% for comparison.)
-\def\urefnobreak#1{\dourefnobreak #1,,,\finish}
-\def\dourefnobreak#1,#2,#3,#4\finish{\begingroup
-  \unsepspaces
-  \pdfurl{#1}%
-  \setbox0 = \hbox{\ignorespaces #3}%
-  \ifdim\wd0 > 0pt
-    \unhbox0 % third arg given, show only that
-  \else
-    \setbox0 = \hbox{\ignorespaces #2}%
-    \ifdim\wd0 > 0pt
-      \ifpdf
-        \unhbox0             % PDF: 2nd arg given, show only it
-      \else
-        \unhbox0\ (\code{#1})% DVI: 2nd arg given, show both it and url
-      \fi
-    \else
-      \code{#1}% only url given, so show it
-    \fi
-  \fi
-  \endlink
-\endgroup}
+% @uref (abbreviation for `urlref') aka @url takes an optional
+% (comma-separated) second argument specifying the text to display and
+% an optional third arg as text to display instead of (rather than in
+% addition to) the url itself.  First (mandatory) arg is the url.
 
-% This \urefbreak definition is the active one.
+% TeX-only option to allow changing PDF output to show only the second
+% arg (if given), and not the url (which is then just the link target).
+\newif\ifurefurlonlylink
+
+% The main macro is \urefbreak, which allows breaking at expected
+% places within the url.  (There used to be another version, which
+% didn't support automatic breaking.)
 \def\urefbreak{\begingroup \urefcatcodes \dourefbreak}
 \let\uref=\urefbreak
+%
 \def\dourefbreak#1{\urefbreakfinish #1,,,\finish}
 \def\urefbreakfinish#1,#2,#3,#4\finish{% doesn't work in @example
   \unsepspaces
@@ -2587,12 +2598,19 @@ end
   \ifdim\wd0 > 0pt
     \unhbox0 % third arg given, show only that
   \else
-    \setbox0 = \hbox{\ignorespaces #2}%
+    \setbox0 = \hbox{\ignorespaces #2}% look for second arg
     \ifdim\wd0 > 0pt
       \ifpdf
-        \unhbox0             % PDF: 2nd arg given, show only it
+        \ifurefurlonlylink
+          % PDF plus option to not display url, show just arg
+          \unhbox0             
+        \else
+          % PDF, normally display both arg and url for consistency,
+          % visibility, if the pdf is eventually used to print, etc.
+          \unhbox0\ (\urefcode{#1})%
+        \fi
       \else
-        \unhbox0\ (\urefcode{#1})% DVI: 2nd arg given, show both it and url
+        \unhbox0\ (\urefcode{#1})% DVI, always show arg and url
       \fi
     \else
       \urefcode{#1}% only url given, so show it
@@ -2632,8 +2650,10 @@ end
 % we put a little stretch before and after the breakable chars, to help
 % line breaking of long url's.  The unequal skips make look better in
 % cmtt at least, especially for dots.
-\def\urefprestretch{\urefprebreak \hskip0pt plus.13em }
-\def\urefpoststretch{\urefpostbreak \hskip0pt plus.1em }
+\def\urefprestretchamount{.13em}
+\def\urefpoststretchamount{.1em}
+\def\urefprestretch{\urefprebreak \hskip0pt plus\urefprestretchamount\relax}
+\def\urefpoststretch{\urefpostbreak \hskip0pt plus\urefprestretchamount\relax}
 %
 \def\urefcodeamp{\urefprestretch \&\urefpoststretch}
 \def\urefcodedot{\urefprestretch .\urefpoststretch}
@@ -2868,6 +2888,15 @@ end
   \def\inlinefmtname{#1}%
   \ifx\inlinefmtname\outfmtnametex \ignorespaces #2\fi
 }
+% 
+% @inlinefmtifelse{FMTNAME,THEN-TEXT,ELSE-TEXT} expands THEN-TEXT if
+% FMTNAME is tex, else ELSE-TEXT.
+\long\def\inlinefmtifelse#1{\doinlinefmtifelse #1,,,\finish}
+\long\def\doinlinefmtifelse#1,#2,#3,#4,\finish{%
+  \def\inlinefmtname{#1}%
+  \ifx\inlinefmtname\outfmtnametex \ignorespaces #2\else \ignorespaces #3\fi
+}
+%
 % For raw, must switch into @tex before parsing the argument, to avoid
 % setting catcodes prematurely.  Doing it this way means that, for
 % example, @inlineraw{html, foo{bar} gets a parse error instead of being
@@ -2884,6 +2913,23 @@ end
   \endgroup % close group opened by \tex.
 }
 
+% @inlineifset{VAR, TEXT} expands TEXT if VAR is @set.
+%
+\long\def\inlineifset#1{\doinlineifset #1,\finish}
+\long\def\doinlineifset#1,#2,\finish{%
+  \def\inlinevarname{#1}%
+  \expandafter\ifx\csname SET\inlinevarname\endcsname\relax
+  \else\ignorespaces#2\fi
+}
+
+% @inlineifclear{VAR, TEXT} expands TEXT if VAR is not @set.
+%
+\long\def\inlineifclear#1{\doinlineifclear #1,\finish}
+\long\def\doinlineifclear#1,#2,\finish{%
+  \def\inlinevarname{#1}%
+  \expandafter\ifx\csname SET\inlinevarname\endcsname\relax \ignorespaces#2\fi
+}
+
 
 \message{glyphs,}
 % and logos.
@@ -3639,7 +3685,7 @@ end
   \parskip=\smallskipamount
   \ifdim\parskip=0pt \parskip=2pt \fi
   %
-  % Try typesetting the item mark that if the document erroneously says
+  % Try typesetting the item mark so that if the document erroneously says
   % something like @itemize @samp (intending @table), there's an error
   % right away at the @itemize.  It's not the best error message in the
   % world, but it's better than leaving it to the @item.  This means if
@@ -3889,19 +3935,23 @@ end
 }
 
 % multitable-only commands.
-%
-% @headitem starts a heading row, which we typeset in bold.
-% Assignments have to be global since we are inside the implicit group
-% of an alignment entry.  \everycr resets \everytab so we don't have to
+% 
+% @headitem starts a heading row, which we typeset in bold.  Assignments
+% have to be global since we are inside the implicit group of an
+% alignment entry.  \everycr below resets \everytab so we don't have to
 % undo it ourselves.
 \def\headitemfont{\b}% for people to use in the template row; not changeable
 \def\headitem{%
   \checkenv\multitable
   \crcr
+  \gdef\headitemcrhook{\nobreak}% attempt to avoid page break after headings
   \global\everytab={\bf}% can't use \headitemfont since the parsing differs
   \the\everytab % for the first item
 }%
 %
+% default for tables with no headings.
+\let\headitemcrhook=\relax
+%
 % A \tab used to include \hskip1sp.  But then the space in a template
 % line is not enough.  That is bad.  So let's go back to just `&' until
 % we again encounter the problem the 1sp was intended to solve.
@@ -3932,15 +3982,15 @@ end
   %
   \everycr = {%
     \noalign{%
-      \global\everytab={}%
+      \global\everytab={}% Reset from possible headitem.
       \global\colcount=0 % Reset the column counter.
-      % Check for saved footnotes, etc.
+      %
+      % Check for saved footnotes, etc.:
       \checkinserts
-      % Keeps underfull box messages off when table breaks over pages.
-      %\filbreak
-	% Maybe so, but it also creates really weird page breaks when the
-	% table breaks over pages. Wouldn't \vfil be better?  Wait until the
-	% problem manifests itself, so it can be fixed for real --karl.
+      %
+      % Perhaps a \nobreak, then reset:
+      \headitemcrhook
+      \global\let\headitemcrhook=\relax
     }%
   }%
   %
@@ -4179,7 +4229,7 @@ end
 \def\value{\begingroup\makevalueexpandable\valuexxx}
 \def\valuexxx#1{\expandablevalue{#1}\endgroup}
 {
-  \catcode`\- = \active \catcode`\_ = \active
+  \catcode`\-=\active \catcode`\_=\active
   %
   \gdef\makevalueexpandable{%
     \let\value = \expandablevalue
@@ -4199,7 +4249,12 @@ end
 % variable's value contains other Texinfo commands, it's almost certain
 % it will fail (although perhaps we could fix that with sufficient work
 % to do a one-level expansion on the result, instead of complete).
-%
+% 
+% Unfortunately, this has the consequence that when _ is in the *value*
+% of an @set, it does not print properly in the roman fonts (get the cmr
+% dot accent at position 126 instead).  No fix comes to mind, and it's
+% been this way since 2003 or earlier, so just ignore it.
+% 
 \def\expandablevalue#1{%
   \expandafter\ifx\csname SET#1\endcsname\relax
     {[No value for ``#1'']}%
@@ -4211,8 +4266,9 @@ end
 
 % @ifset VAR ... @end ifset reads the `...' iff VAR has been defined
 % with @set.
-%
-% To get special treatment of `@end ifset,' call \makeond and the redefine.
+% 
+% To get the special treatment we need for `@end ifset,' we call
+% \makecond and then redefine.
 %
 \makecond{ifset}
 \def\ifset{\parsearg{\doifset{\let\next=\ifsetfail}}}
@@ -4376,7 +4432,7 @@ end
   % complicated, when \tex is in effect and \{ is a \delimiter again.
   % We can't use \lbracecmd and \rbracecmd because texindex assumes
   % braces and backslashes are used only as delimiters.  Perhaps we
-  % should define @lbrace and @rbrace commands a la @comma.
+  % should use @lbracechar and @rbracechar?
   \def\{{{\tt\char123}}%
   \def\}{{\tt\char125}}%
   %
@@ -4397,8 +4453,7 @@ end
   % @end macro
   % ...
   % @funindex commtest
-  %
-  % The above is not enough to reproduce the bug, but it gives the flavor.
+  % This is not enough to reproduce the bug, but it gives the flavor.
   %
   % Sample whatsit resulting:
   % .@write3{\entry{xyz}{@folio }{@code {xyz@endinput }}}
@@ -4599,8 +4654,21 @@ end
   \definedummyword\verb
   \definedummyword\w
   \definedummyword\xref
+  %
+  % Consider:
+  %   @macro mkind{arg1,arg2}
+  %   @cindex \arg2\
+  %   @end macro
+  %   @mkind{foo, bar}
+  % The space after the comma will end up in the temporary definition
+  % that we make for arg2 (see \parsemargdef ff.).  We want all this to be
+  % expanded for the sake of the index, so we end up just seeing "bar".
+  \let\xeatspaces = \eatspaces
 }
 
+% For testing: output @{ and @} in index sort strings as \{ and \}.
+\newif\ifusebracesinindexes
+
 % \indexnofonts is used when outputting the strings to sort the index
 % by, and when constructing control sequence names.  It eliminates all
 % control sequences and just writes whatever the best ASCII sort string
@@ -4629,11 +4697,16 @@ end
   % Unfortunately, texindex is not prepared to handle braces in the
   % content at all.  So for index sorting, we map @{ and @} to strings
   % starting with |, since that ASCII character is between ASCII { and }.
-  \def\{{|a}%
-  \def\lbracechar{|a}%
+  \ifusebracesinindexes
+    \def\lbracechar{\lbracecmd}%
+    \def\rbracechar{\rbracecmd}%
+  \else
+    \def\lbracechar{|a}%
+    \def\rbracechar{|b}%
+  \fi
+  \let\{=\lbracechar
+  \let\}=\rbracechar
   %
-  \def\}{|b}%
-  \def\rbracechar{|b}%
   %
   % Non-English letters.
   \def\AA{AA}%
@@ -5885,7 +5958,7 @@ end
     %
     % Now the second mark, after the heading break.  No break points
     % between here and the heading.
-    \let\prevsectiondefs=\lastsectiondefs
+    \global\let\prevsectiondefs=\lastsectiondefs
     \domark
     %
     % Only insert the space after the number if we have a section number.
@@ -6252,8 +6325,8 @@ end
   \catcode `\|=\other
   \catcode `\<=\other
   \catcode `\>=\other
-  \catcode`\`=\other
-  \catcode`\'=\other
+  \catcode `\`=\other
+  \catcode `\'=\other
   \escapechar=`\\
   %
   % ' is active in math mode (mathcode"8000).  So reset it, and all our
@@ -6277,7 +6350,7 @@ end
   \let\/=\ptexslash
   \let\*=\ptexstar
   \let\t=\ptext
-  \expandafter \let\csname top\endcsname=\ptextop  % outer
+  \expandafter \let\csname top\endcsname=\ptextop  % we've made it outer
   \let\frenchspacing=\plainfrenchspacing
   %
   \def\endldots{\mathinner{\ldots\ldots\ldots\ldots}}%
@@ -6361,8 +6434,6 @@ end
 				% side, and for 6pt waste from
 				% each corner char, and rule thickness
   \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip
-  % Flag to tell @lisp, etc., not to narrow margin.
-  \let\nonarrowing = t%
   %
   % If this cartouche directly follows a sectioning command, we need the
   % \parskip glue (backspaced over by default) or the cartouche can
@@ -6402,7 +6473,7 @@ end
 \newdimen\nonfillparindent
 \def\nonfillstart{%
   \aboveenvbreak
-  \hfuzz = 12pt % Don't be fussy
+  \ifdim\hfuzz < 12pt \hfuzz = 12pt \fi % Don't be fussy
   \sepspaces % Make spaces be word-separators rather than space tokens.
   \let\par = \lisppar % don't ignore blank lines
   \obeylines % each line of input is a line of output
@@ -6529,9 +6600,13 @@ end
 
 
 % @raggedright does more-or-less normal line breaking but no right
-% justification.  From plain.tex.
+% justification.  From plain.tex.  Don't stretch around special
+% characters in urls in this environment, since the stretch at the right
+% should be enough.
 \envdef\raggedright{%
-  \rightskip0pt plus2em \spaceskip.3333em \xspaceskip.5em\relax
+  \rightskip0pt plus2.4em \spaceskip.3333em \xspaceskip.5em\relax
+  \def\urefprestretchamount{0pt}%
+  \def\urefpoststretchamount{0pt}%
 }
 \let\Eraggedright\par
 
@@ -7424,7 +7499,7 @@ end
 
 % Parse the optional {params} list.  Set up \paramno and \paramlist
 % so \defmacro knows what to do.  Define \macarg.BLAH for each BLAH
-% in the params list to some hook where the argument si to be expanded.  If
+% in the params list to some hook where the argument is to be expanded.  If
 % there are less than 10 arguments that hook is to be replaced by ##N where N
 % is the position in that list, that is to say the macro arguments are to be
 % defined `a la TeX in the macro body.  
@@ -8286,6 +8361,7 @@ end
 \gdef\footnote{%
   \let\indent=\ptexindent
   \let\noindent=\ptexnoindent
+  %
   \global\advance\footnoteno by \@ne
   \edef\thisfootno{$^{\the\footnoteno}$}%
   %
@@ -8309,6 +8385,11 @@ end
 %
 \gdef\dofootnote{%
   \insert\footins\bgroup
+  %
+  % Nested footnotes are not supported in TeX, that would take a lot
+  % more work.  (\startsavinginserts does not suffice.)
+  \let\footnote=\errfootnote
+  %
   % We want to typeset this text as a normal paragraph, even if the
   % footnote reference occurs in (for example) a display environment.
   % So reset some parameters.
@@ -8346,13 +8427,19 @@ end
 }
 }%end \catcode `\@=11
 
+\def\errfootnote{%
+  \errhelp=\EMsimple
+  \errmessage{Nested footnotes not supported in texinfo.tex,
+    even though they work in makeinfo; sorry}
+}
+
 % In case a @footnote appears in a vbox, save the footnote text and create
 % the real \insert just after the vbox finished.  Otherwise, the insertion
 % would be lost.
 % Similarly, if a @footnote appears inside an alignment, save the footnote
 % text to a box and make the \insert when a row of the table is finished.
 % And the same can be done for other insert classes.  --kasal, 16nov03.
-
+%
 % Replace the \insert primitive by a cheating macro.
 % Deeper inside, just make sure that the saved insertions are not spilled
 % out prematurely.
@@ -8769,20 +8856,20 @@ end
 {
   \catcode`\_ = \active
   \globaldefs=1
-\parseargdef\documentlanguage{\begingroup
-  \let_=\normalunderscore  % normal _ character for filenames
+\parseargdef\documentlanguage{%
   \tex % read txi-??.tex file in plain TeX.
     % Read the file by the name they passed if it exists.
+    \let_ = \normalunderscore  % normal _ character for filename test
     \openin 1 txi-#1.tex
     \ifeof 1
-      \documentlanguagetrywithoutunderscore{#1_\finish}%
+      \documentlanguagetrywithoutunderscore #1_\finish
     \else
       \globaldefs = 1  % everything in the txi-LL files needs to persist
       \input txi-#1.tex
     \fi
     \closein 1
   \endgroup % end raw TeX
-\endgroup}
+}
 %
 % If they passed de_DE, and txi-de_DE.tex doesn't exist,
 % try txi-de.tex.
@@ -9920,11 +10007,9 @@ directory should work if nowhere else does.}
 \catcode`\"=\active
 \def\activedoublequote{{\tt\char34}}
 \let"=\activedoublequote
-\catcode`\~=\active
-\def~{{\tt\char126}}
+\catcode`\~=\active \def\activetilde{{\tt\char126}} \let~ = \activetilde
 \chardef\hat=`\^
-\catcode`\^=\active
-\def^{{\tt \hat}}
+\catcode`\^=\active \def\activehat{{\tt \hat}} \let^ = \activehat
 
 \catcode`\_=\active
 \def_{\ifusingtt\normalunderscore\_}
@@ -9934,16 +10019,26 @@ directory should work if nowhere else does.}
 
 \catcode`\|=\active
 \def|{{\tt\char124}}
+
 \chardef \less=`\<
-\catcode`\<=\active
-\def<{{\tt \less}}
+\catcode`\<=\active \def\activeless{{\tt \less}}\let< = \activeless
 \chardef \gtr=`\>
-\catcode`\>=\active
-\def>{{\tt \gtr}}
-\catcode`\+=\active
-\def+{{\tt \char 43}}
-\catcode`\$=\active
-\def${\ifusingit{{\sl\$}}\normaldollar}%$ font-lock fix
+\catcode`\>=\active \def\activegtr{{\tt \gtr}}\let> = \activegtr
+\catcode`\+=\active \def+{{\tt \char 43}}
+\catcode`\$=\active \def${\ifusingit{{\sl\$}}\normaldollar}%$ font-lock fix
+
+% used for headline/footline in the output routine, in case the page
+% breaks in the middle of an @tex block.
+\def\texinfochars{%
+  \let< = \activeless
+  \let> = \activegtr
+  \let~ = \activetilde 
+  \let^ = \activehat
+  \markupsetuplqdefault \markupsetuprqdefault 
+  \let\b = \strong
+  \let\i = \smartitalic
+  % in principle, all other definitions in \tex have to be undone too.
+}
 
 % If a .fmt file is being used, characters that might appear in a file
 % name cannot be active until we have parsed the command line.
diff --git a/build-aux/update-copyright b/build-aux/update-copyright
index c72d0e67..90624e90 100755
--- a/build-aux/update-copyright
+++ b/build-aux/update-copyright
@@ -5,7 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -wS -0777 -pi "$0" ${1+"$@"}'
 
 my $VERSION = '2013-01-03.09:41'; # UTC
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 #
 # 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
diff --git a/build-aux/useless-if-before-free b/build-aux/useless-if-before-free
index 663347a3..4c76c75d 100755
--- a/build-aux/useless-if-before-free
+++ b/build-aux/useless-if-before-free
@@ -10,7 +10,7 @@ my $VERSION = '2012-01-06 07:23'; # UTC
 # If you change this file with Emacs, please let the write hook
 # do its job.  Otherwise, update this string manually.
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/build-aux/vc-list-files b/build-aux/vc-list-files
index 7ec335fb..b2bca54c 100755
--- a/build-aux/vc-list-files
+++ b/build-aux/vc-list-files
@@ -4,7 +4,7 @@
 # Print a version string.
 scriptversion=2011-05-16.22; # UTC
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/build-aux/ylwrap b/build-aux/ylwrap
index 92536350..8f072a8e 100755
--- a/build-aux/ylwrap
+++ b/build-aux/ylwrap
@@ -1,10 +1,9 @@
 #! /bin/sh
 # ylwrap - wrapper for lex/yacc invocations.
 
-scriptversion=2011-08-25.18; # UTC
+scriptversion=2013-01-12.17; # UTC
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
-# 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 #
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
@@ -30,9 +29,41 @@ scriptversion=2011-08-25.18; # UTC
 # bugs to <bug-automake@gnu.org> or send patches to
 # <automake-patches@gnu.org>.
 
+get_dirname ()
+{
+  case $1 in
+    */*|*\\*) printf '%s\n' "$1" | sed -e 's|\([\\/]\)[^\\/]*$|\1|';;
+    # Otherwise,  we want the empty string (not ".").
+  esac
+}
+
+# guard FILE
+# ----------
+# The CPP macro used to guard inclusion of FILE.
+guard ()
+{
+  printf '%s\n' "$1"                                                    \
+    | sed                                                               \
+        -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'   \
+        -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'                        \
+        -e 's/__*/_/g'
+}
+
+# quote_for_sed [STRING]
+# ----------------------
+# Return STRING (or stdin) quoted to be used as a sed pattern.
+quote_for_sed ()
+{
+  case $# in
+    0) cat;;
+    1) printf '%s\n' "$1";;
+  esac \
+    | sed -e 's|[][\\.*]|\\&|g'
+}
+
 case "$1" in
   '')
-    echo "$0: No files given.  Try \`$0 --help' for more information." 1>&2
+    echo "$0: No files given.  Try '$0 --help' for more information." 1>&2
     exit 1
     ;;
   --basedir)
@@ -65,39 +96,71 @@ esac
 
 
 # The input.
-input="$1"
+input=$1
 shift
-case "$input" in
+# We'll later need for a correct munging of "#line" directives.
+input_sub_rx=`get_dirname "$input" | quote_for_sed`
+case $input in
   [\\/]* | ?:[\\/]*)
     # Absolute path; do nothing.
     ;;
   *)
     # Relative path.  Make it absolute.
-    input="`pwd`/$input"
+    input=`pwd`/$input
     ;;
 esac
+input_rx=`get_dirname "$input" | quote_for_sed`
+
+# Since DOS filename conventions don't allow two dots,
+# the DOS version of Bison writes out y_tab.c instead of y.tab.c
+# and y_tab.h instead of y.tab.h. Test to see if this is the case.
+y_tab_nodot=false
+if test -f y_tab.c || test -f y_tab.h; then
+  y_tab_nodot=true
+fi
+
+# The parser itself, the first file, is the destination of the .y.c
+# rule in the Makefile.
+parser=$1
+
+# A sed program to s/FROM/TO/g for all the FROM/TO so that, for
+# instance, we rename #include "y.tab.h" into #include "parse.h"
+# during the conversion from y.tab.c to parse.c.
+sed_fix_filenames=
 
-pairlist=
-while test "$#" -ne 0; do
-  if test "$1" = "--"; then
+# Also rename header guards, as Bison 2.7 for instance uses its header
+# guard in its implementation file.
+sed_fix_header_guards=
+
+while test $# -ne 0; do
+  if test x"$1" = x"--"; then
     shift
     break
   fi
-  pairlist="$pairlist $1"
+  from=$1
+  # Handle y_tab.c and y_tab.h output by DOS
+  if $y_tab_nodot; then
+    case $from in
+      "y.tab.c") from=y_tab.c;;
+      "y.tab.h") from=y_tab.h;;
+    esac
+  fi
   shift
+  to=$1
+  shift
+  sed_fix_filenames="${sed_fix_filenames}s|"`quote_for_sed "$from"`"|$to|g;"
+  sed_fix_header_guards="${sed_fix_header_guards}s|"`guard "$from"`"|"`guard "$to"`"|g;"
 done
 
 # The program to run.
-prog="$1"
+prog=$1
 shift
 # Make any relative path in $prog absolute.
-case "$prog" in
+case $prog in
   [\\/]* | ?:[\\/]*) ;;
-  *[\\/]*) prog="`pwd`/$prog" ;;
+  *[\\/]*) prog=`pwd`/$prog ;;
 esac
 
-# FIXME: add hostname here for parallel makes that run commands on
-# other machines.  But that might take us over the 14-char limit.
 dirname=ylwrap$$
 do_exit="cd '`pwd`' && rm -rf $dirname > /dev/null 2>&1;"' (exit $ret); exit $ret'
 trap "ret=129; $do_exit" 1
@@ -115,98 +178,56 @@ esac
 ret=$?
 
 if test $ret -eq 0; then
-  set X $pairlist
-  shift
-  first=yes
-  # Since DOS filename conventions don't allow two dots,
-  # the DOS version of Bison writes out y_tab.c instead of y.tab.c
-  # and y_tab.h instead of y.tab.h. Test to see if this is the case.
-  y_tab_nodot="no"
-  if test -f y_tab.c || test -f y_tab.h; then
-    y_tab_nodot="yes"
-  fi
-
-  # The directory holding the input.
-  input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
-  # Quote $INPUT_DIR so we can use it in a regexp.
-  # FIXME: really we should care about more than `.' and `\'.
-  input_rx=`echo "$input_dir" | sed 's,\\\\,\\\\\\\\,g;s,\\.,\\\\.,g'`
-
-  while test "$#" -ne 0; do
-    from="$1"
-    # Handle y_tab.c and y_tab.h output by DOS
-    if test $y_tab_nodot = "yes"; then
-      if test $from = "y.tab.c"; then
-        from="y_tab.c"
-      else
-        if test $from = "y.tab.h"; then
-          from="y_tab.h"
-        fi
-      fi
-    fi
+  for from in *
+  do
+    to=`printf '%s\n' "$from" | sed "$sed_fix_filenames"`
     if test -f "$from"; then
       # If $2 is an absolute path name, then just use that,
-      # otherwise prepend `../'.
-      case "$2" in
-        [\\/]* | ?:[\\/]*) target="$2";;
-        *) target="../$2";;
+      # otherwise prepend '../'.
+      case $to in
+        [\\/]* | ?:[\\/]*) target=$to;;
+        *) target=../$to;;
       esac
 
-      # We do not want to overwrite a header file if it hasn't
-      # changed.  This avoid useless recompilations.  However the
-      # parser itself (the first file) should always be updated,
-      # because it is the destination of the .y.c rule in the
-      # Makefile.  Divert the output of all other files to a temporary
-      # file so we can compare them to existing versions.
-      if test $first = no; then
-        realtarget="$target"
-        target="tmp-`echo $target | sed s/.*[\\/]//g`"
+      # Do not overwrite unchanged header files to avoid useless
+      # recompilations.  Always update the parser itself: it is the
+      # destination of the .y.c rule in the Makefile.  Divert the
+      # output of all other files to a temporary file so we can
+      # compare them to existing versions.
+      if test $from != $parser; then
+        realtarget=$target
+        target=tmp-`printf '%s\n' "$target" | sed 's|.*[\\/]||g'`
       fi
-      # Edit out `#line' or `#' directives.
-      #
-      # We don't want the resulting debug information to point at
-      # an absolute srcdir; it is better for it to just mention the
-      # .y file with no path.
-      #
-      # We want to use the real output file name, not yy.lex.c for
-      # instance.
-      #
-      # We want the include guards to be adjusted too.
-      FROM=`echo "$from" | sed \
-            -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
-            -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
-      TARGET=`echo "$2" | sed \
-            -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
-            -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
-
-      sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \
-          -e "s,$FROM,$TARGET," "$from" >"$target" || ret=$?
-
-      # Check whether header files must be updated.
-      if test $first = no; then
+
+      # Munge "#line" or "#" directives.  Don't let the resulting
+      # debug information point at an absolute srcdir.  Use the real
+      # output file name, not yy.lex.c for instance.  Adjust the
+      # include guards too.
+      sed -e "/^#/!b"                           \
+          -e "s|$input_rx|$input_sub_rx|"       \
+          -e "$sed_fix_filenames"               \
+          -e "$sed_fix_header_guards"           \
+        "$from" >"$target" || ret=$?
+
+      # Check whether files must be updated.
+      if test "$from" != "$parser"; then
         if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
-          echo "$2" is unchanged
+          echo "$to is unchanged"
           rm -f "$target"
         else
-          echo updating "$2"
+          echo "updating $to"
           mv -f "$target" "$realtarget"
         fi
       fi
     else
-      # A missing file is only an error for the first file.  This
-      # is a blatant hack to let us support using "yacc -d".  If -d
-      # is not specified, we don't want an error when the header
-      # file is "missing".
-      if test $first = yes; then
+      # A missing file is only an error for the parser.  This is a
+      # blatant hack to let us support using "yacc -d".  If -d is not
+      # specified, don't fail when the header file is "missing".
+      if test "$from" = "$parser"; then
         ret=1
       fi
     fi
-    shift
-    shift
-    first=no
   done
-else
-  ret=$?
 fi
 
 # Remove the directory.
diff --git a/cfg.mk b/cfg.mk
index 77356ab1..6d96e1b4 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,5 +1,5 @@
 # Customize maint.mk                           -*- makefile -*-
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
@@ -45,10 +45,10 @@ export VERBOSE = yes
 # 4914152 9e
 export XZ_OPT = -8e
 
-old_NEWS_hash = b93e7e43dd35f32961c354e41211b86e
+old_NEWS_hash = adf13e9314300d0dff82fa37b247d7db
 
 # Add an exemption for sc_makefile_at_at_check.
-_makefile_at_at_check_exceptions = ' && !/^cu_install_program =/'
+_makefile_at_at_check_exceptions = ' && !/^cu_install_prog/ && !/dynamic-dep/'
 
 # Our help-version script is in a slightly different location.
 _hv_file ?= $(srcdir)/tests/misc/help-version
@@ -115,6 +115,21 @@ sc_tests_list_consistency:
 	    | $(EGREP) "$$test_extensions_rx\$$";			\
 	} | sort | uniq -u | grep . && exit 1; :
 
+# Ensure that all version-controlled test scripts are executable.
+sc_tests_executable:
+	@test_extensions_rx=`echo $(TEST_EXTENSIONS)			\
+	  | sed -e "s/ / -o -name */g" -e "s/^/-name */"`; \
+	find tests/ \( $$test_extensions_rx \) \! -perm -111 -print \
+	  | sed -e "s/^/$(ME): Please make test executable: /" | grep . \
+	    && exit 1; :
+
+# Avoid :>file which doesn't propagate errors
+sc_prohibit_colon_redirection:
+	@cd $(srcdir)/tests && GIT_PAGER= git grep -n ': *>.*||' \
+	  && { echo '$(ME): '"The leading colon in :> will hide errors" 1>&2; \
+	       exit 1; }  \
+	  || :
+
 # Create a list of regular expressions matching the names
 # of files included from system.h.  Exclude a couple.
 .re-list:
@@ -143,6 +158,14 @@ sc_system_h_headers: .re-list
 		  1>&2;  exit 1; } || :;				\
 	fi
 
+# Files in src/ should not use '%s' notation in format strings,
+# i.e., single quotes around %s (or similar) should be avoided.
+sc_prohibit_quotes_notation:
+	@cd $(srcdir)/src && GIT_PAGER= git grep -n "\".*[\`']%s'.*\"" *.c \
+	  && { echo '$(ME): '"Use quote() to avoid quoted '%s' notation" 1>&2; \
+	       exit 1; }  \
+	  || :
+
 sc_sun_os_names:
 	@grep -nEi \
 	    'solaris[^[:alnum:]]*2\.(7|8|9|[1-9][0-9])|sunos[^[:alnum:]][6-9]' \
@@ -173,7 +196,7 @@ sc_check-AUTHORS: $(all_programs)
 	    exe='[';					\
 	  fi;						\
 	  LC_ALL=$$locale ./src/$$exe --version		\
-	    | perl -0 -pi -e 's/,\n/, /gm'		\
+	    | perl -0 -p -e 's/,\n/, /gm'		\
 	    | sed -n -e '/Written by /{ s//'"$$i"': /;'	\
 		  -e 's/,* and /, /; s/\.$$//; p; }';	\
 	done > $(au_actual) &&				\
@@ -201,13 +224,25 @@ sc_prohibit-j-printf-format:
 	  && { echo '$(ME): Use PRI*MAX instead of %j' 1>&2; exit 1; }  \
 	  || :
 
+# Ensure the alternative __attribute (keyword) form isn't used as
+# that form is not elided where required.  Also ensure that we don't
+# directly use attributes already defined by gnulib.
+# TODO: move the check for _GL... attributes to gnulib.
+sc_prohibit-gl-attributes:
+	@prohibit='__attribute |__(unused|pure|const)__'	\
+	in_vc_files='\.[ch]$$'					\
+	halt='Use _GL... attribute macros'			\
+	  $(_sc_search_regexp)
+
 # Look for lines longer than 80 characters, except omit:
 # - program-generated long lines in diff headers,
+# - the help2man script copied from upstream,
 # - tests involving long checksum lines, and
 # - the 'pr' test cases.
 LINE_LEN_MAX = 80
 FILTER_LONG_LINES =						\
   /^[^:]*\.diff:[^:]*:@@ / d;					\
+  \|^[^:]*man/help2man:| d;			\
   \|^[^:]*tests/misc/sha[0-9]*sum.*\.pl[-:]| d;			\
   \|^[^:]*tests/pr/|{ \|^[^:]*tests/pr/pr-tests:| !d; };
 sc_long_lines:
@@ -388,6 +423,13 @@ sc_prohibit_test_backticks:
 	halt='use $$(...), not `...` in tests/'				\
 	  $(_sc_search_regexp)
 
+# Ensure that compare is used to check empty files
+# so that the unexpected contents are displayed
+sc_prohibit_test_empty:
+	@prohibit='test -s.*&&' in_vc_files='^tests/'			\
+	halt='use `compare /dev/null ...`, not `test -s ...` in tests/'	\
+	  $(_sc_search_regexp)
+
 # Programs like sort, ls, expr use PROG_FAILURE in place of EXIT_FAILURE.
 # Others, use the EXIT_CANCELED, EXIT_ENOENT, etc. macros defined in system.h.
 # In those programs, ensure that EXIT_FAILURE is not used by mistake.
@@ -398,6 +440,13 @@ sc_some_programs_must_avoid_exit_failure:
 	    && { echo '$(ME): do not use EXIT_FAILURE in the above'	\
 		  1>&2; exit 1; } || :
 
+# Ensure that tests call the require_ulimit_v_ function if using ulimit -v
+sc_prohibit_test_ulimit_without_require_:
+	@(git grep -l require_ulimit_v_ tests;				\
+	  git grep -l 'ulimit -v' tests)				\
+	  | sort | uniq -u | grep . && { echo "$(ME): the above test(s)"\
+	  " should match require_ulimit_v_ with ulimit -v" 1>&2; exit 1; } || :
+
 # Ensure that tests call the print_ver_ function for programs which are
 # actually used in that test.
 sc_prohibit_test_calls_print_ver_with_irrelevant_argument:
@@ -528,6 +577,14 @@ sc_marked_devdiagnostics:
 	halt='found marked developer diagnostic(s)'                     \
 	  $(_sc_search_regexp)
 
+# Ensure we keep hex constants as 4 or 8 bytes for consistency
+# and so that make src/fs-magic-compare works consistently
+sc_fs-magic-compare:
+	@sed -n 's|.*/\* \(0x[0-9A-Fa-f]\{1,\}\) .*\*/|\1|p'		\
+	  $(srcdir)/src/stat.c | grep -Ev '^0x([0-9A-F]{4}){1,2}$$'	\
+	    && { echo '$(ME): Constants in src/stat.c should be 4 or 8' \
+		      'upper-case chars' 1>&2; exit 1; } || :
+
 # Override the default Cc: used in generating an announcement.
 announcement_Cc_ = $(translation_project_), \
   coreutils@gnu.org, coreutils-announce@gnu.org
@@ -541,10 +598,10 @@ update-copyright-env = \
 
 # List syntax-check exemptions.
 exclude_file_name_regexp--sc_space_tab = \
-  ^(tests/pr/|tests/misc/nl\.sh$$|gl/.*\.diff$$)
+  ^(tests/pr/|tests/misc/nl\.sh$$|gl/.*\.diff$$|man/help2man$$)
 exclude_file_name_regexp--sc_bindtextdomain = \
   ^(gl/.*|lib/euidaccess-stat|src/make-prime-list)\.c$$
-exclude_file_name_regexp--sc_trailing_blank = ^tests/pr/
+exclude_file_name_regexp--sc_trailing_blank = ^(tests/pr/|man/help2man)
 exclude_file_name_regexp--sc_system_h_headers = \
   ^src/((system|copy)\.h|libstdbuf\.c|make-prime-list\.c)$$
 
@@ -554,7 +611,7 @@ exclude_file_name_regexp--sc_require_config_h_first = \
 exclude_file_name_regexp--sc_require_config_h = \
   $(exclude_file_name_regexp--sc_require_config_h_first)
 
-exclude_file_name_regexp--sc_po_check = ^gl/
+exclude_file_name_regexp--sc_po_check = ^(gl/|man/help2man)
 exclude_file_name_regexp--sc_prohibit_always-defined_macros = \
   ^src/(seq|remove)\.c$$
 exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = ^tests/pr/
@@ -586,7 +643,7 @@ exclude_file_name_regexp--sc_prohibit_stat_st_blocks = \
   ^(src/system\.h|tests/du/2g\.sh)$$
 
 exclude_file_name_regexp--sc_prohibit_continued_string_alpha_in_column_1 = \
-  ^src/(system\.h|od\.c|printf\.c)$$
+  ^src/(system\.h|od\.c|printf\.c|getlimits\.c)$$
 
 exclude_file_name_regexp--sc_prohibit_test_backticks = \
   ^tests/(local\.mk|(init|misc/stdbuf|factor/create-test)\.sh)$$
@@ -598,6 +655,9 @@ exclude_file_name_regexp--sc_prohibit_operator_at_end_of_line = \
 exclude_file_name_regexp--sc_error_message_uppercase = ^src/factor\.c$$
 exclude_file_name_regexp--sc_prohibit_atoi_atof = ^src/make-prime-list\.c$$
 
+# Exception here as we don't want __attribute elided on non GCC
+exclude_file_name_regexp--sc_prohibit-gl-attributes = ^src/libstdbuf\.c$$
+
 # Augment AM_CFLAGS to include our per-directory options:
 AM_CFLAGS += $($(@D)_CFLAGS)
 
diff --git a/configure b/configure
index 3147a8a7..5602d6f1 100755
--- a/configure
+++ b/configure
@@ -1,13 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for GNU coreutils 8.21.
+# Generated by GNU Autoconf 2.69 for GNU coreutils 8.23.
 #
 # Report bugs to <bug-coreutils@gnu.org>.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -136,6 +134,31 @@ export LANGUAGE
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -214,21 +238,25 @@ IFS=$as_save_IFS
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in # ((((
-	  *v*x* | *x*v* ) as_opts=-vx ;;
-	  *v* ) as_opts=-v ;;
-	  *x* ) as_opts=-x ;;
-	  * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -331,6 +359,14 @@ $as_echo X"$as_dir" |
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -452,6 +488,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -486,16 +526,16 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -507,28 +547,8 @@ else
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -560,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='GNU coreutils'
 PACKAGE_TARNAME='coreutils'
-PACKAGE_VERSION='8.21'
-PACKAGE_STRING='GNU coreutils 8.21'
+PACKAGE_VERSION='8.23'
+PACKAGE_STRING='GNU coreutils 8.23'
 PACKAGE_BUGREPORT='bug-coreutils@gnu.org'
 PACKAGE_URL='http://www.gnu.org/software/coreutils/'
 
@@ -605,6 +625,8 @@ ac_includes_default="\
 gl_use_threads_default=
 ac_header_list=
 ac_func_list=
+with_openssl_default='no'
+LIB_CRYPTO=
 gl_fnmatch_required=POSIX
 gl_getopt_required=POSIX
 gl_getopt_required=POSIX
@@ -638,7 +660,14 @@ EXTRA_MANS
 man1_MANS
 pkglibexec_PROGRAMS
 bin_PROGRAMS
+single_binary_install_type
+single_binary_deps
+single_binary_libs
+single_binary_progs
 LIB_GMP
+LIB_NVPAIR
+SINGLE_BINARY_FALSE
+SINGLE_BINARY_TRUE
 GNULIB_TEST_WARN_CFLAGS
 GNULIB_WARN_CFLAGS
 WARN_CFLAGS
@@ -655,8 +684,6 @@ LIBCOREUTILS_LTLIBDEPS
 LIBCOREUTILS_LIBDEPS
 YIELD_LIB
 abs_aux_dir
-POSIX_SPAWN_PORTED_FALSE
-POSIX_SPAWN_PORTED_TRUE
 INTL_MACOSX_LIBS
 INET_PTON_LIB
 LOCALE_TR_UTF8
@@ -720,9 +747,7 @@ NEXT_STDARG_H
 GL_GENERATE_STDALIGN_H_FALSE
 GL_GENERATE_STDALIGN_H_TRUE
 STDALIGN_H
-HAVE_SPAWN_H
-NEXT_AS_FIRST_DIRECTIVE_SPAWN_H
-NEXT_SPAWN_H
+LIB_SMACK
 NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H
 NEXT_SIGNAL_H
 GL_GENERATE_SELINUX_CONTEXT_H_FALSE
@@ -754,6 +779,8 @@ GNULIB_SIGPROCMASK
 GNULIB_SIGNAL_H_SIGPIPE
 GNULIB_RAISE
 GNULIB_PTHREAD_SIGMASK
+USE_ACL
+LIB_ACL
 LIB_PTHREAD
 GL_GENERATE_PTHREAD_H_FALSE
 GL_GENERATE_PTHREAD_H_TRUE
@@ -764,34 +791,6 @@ HAVE_PTHREAD_SPINLOCK_T
 HAVE_PTHREAD_T
 HAVE_PTHREAD_H
 DEFAULT_POSIX2_VERSION
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE
-REPLACE_POSIX_SPAWN
-HAVE_POSIX_SPAWN_FILE_ACTIONS_T
-HAVE_POSIX_SPAWNATTR_T
-HAVE_POSIX_SPAWN
-GNULIB_POSIX_SPAWNATTR_DESTROY
-GNULIB_POSIX_SPAWNATTR_SETSIGMASK
-GNULIB_POSIX_SPAWNATTR_GETSIGMASK
-GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT
-GNULIB_POSIX_SPAWNATTR_GETSIGDEFAULT
-GNULIB_POSIX_SPAWNATTR_SETSCHEDPOLICY
-GNULIB_POSIX_SPAWNATTR_GETSCHEDPOLICY
-GNULIB_POSIX_SPAWNATTR_SETSCHEDPARAM
-GNULIB_POSIX_SPAWNATTR_GETSCHEDPARAM
-GNULIB_POSIX_SPAWNATTR_SETPGROUP
-GNULIB_POSIX_SPAWNATTR_GETPGROUP
-GNULIB_POSIX_SPAWNATTR_SETFLAGS
-GNULIB_POSIX_SPAWNATTR_GETFLAGS
-GNULIB_POSIX_SPAWNATTR_INIT
-GNULIB_POSIX_SPAWN_FILE_ACTIONS_DESTROY
-GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN
-GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2
-GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE
-GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT
-GNULIB_POSIX_SPAWNP
-GNULIB_POSIX_SPAWN
 PREFERABLY_POSIX_SHELL
 POSIX_SHELL
 PERL
@@ -818,6 +817,8 @@ REPLACE_PSELECT
 HAVE_PSELECT
 GNULIB_SELECT
 GNULIB_PSELECT
+REPLACE_LOCALTIME
+REPLACE_GMTIME
 REPLACE_TIMEGM
 REPLACE_NANOSLEEP
 REPLACE_MKTIME
@@ -909,6 +910,7 @@ LOCALE_ZH_CN
 LOCALE_JA
 NEXT_AS_FIRST_DIRECTIVE_MATH_H
 NEXT_MATH_H
+SED
 LTLIBMULTITHREAD
 LIBMULTITHREAD
 LTLIBTHREAD
@@ -971,6 +973,7 @@ PRIPTR_PREFIX
 PRI_MACROS_BROKEN
 INT64_MAX_EQ_LONG_MAX
 INT32_MAX_LT_INTMAX_MAX
+REPLACE_STRTOUMAX
 REPLACE_STRTOIMAX
 HAVE_DECL_STRTOUMAX
 HAVE_DECL_STRTOIMAX
@@ -1511,7 +1514,9 @@ NEXT_AS_FIRST_DIRECTIVE_CTYPE_H
 NEXT_CTYPE_H
 HAVE_ISBLANK
 GNULIB_ISBLANK
+LIB_CRYPTO
 pkglibexecdir
+runstatedir
 lispdir
 REPLACE_FDOPENDIR
 REPLACE_DIRFD
@@ -1563,6 +1568,7 @@ REPLACE_ISATTY
 REPLACE_GETPAGESIZE
 REPLACE_GETGROUPS
 REPLACE_GETLOGIN_R
+REPLACE_GETDTABLESIZE
 REPLACE_GETDOMAINNAME
 REPLACE_GETCWD
 REPLACE_FTRUNCATE
@@ -1685,6 +1691,7 @@ HAVE_STRTOLL
 HAVE_STRTOD
 HAVE_DECL_SETENV
 HAVE_SETENV
+HAVE_SECURE_GETENV
 HAVE_RPMATCH
 HAVE_REALPATH
 HAVE_RANDOM_R
@@ -1712,6 +1719,7 @@ GNULIB_STRTOULL
 GNULIB_STRTOLL
 GNULIB_STRTOD
 GNULIB_SETENV
+GNULIB_SECURE_GETENV
 GNULIB_RPMATCH
 GNULIB_REALPATH
 GNULIB_REALLOC_POSIX
@@ -1845,8 +1853,6 @@ GL_GENERATE_ALLOCA_H_FALSE
 GL_GENERATE_ALLOCA_H_TRUE
 ALLOCA_H
 ALLOCA
-USE_ACL
-LIB_ACL
 GL_COND_LIBTOOL_FALSE
 GL_COND_LIBTOOL_TRUE
 host_os
@@ -1953,14 +1959,16 @@ enable_silent_rules
 enable_dependency_tracking
 enable_largefile
 enable_threads
-enable_acl
 enable_assert
+with_openssl
 with_gnu_ld
 enable_rpath
 with_libiconv_prefix
 with_libpth_prefix
+enable_acl
 with_included_regex
 with_selinux
+enable_libsmack
 with_packager
 with_packager_version
 with_packager_bug_reports
@@ -1968,6 +1976,8 @@ enable_xattr
 enable_libcap
 with_tty_group
 enable_gcc_warnings
+enable_single_binary
+enable_single_binary_exceptions
 with_gmp
 enable_install_program
 enable_no_install_program
@@ -2441,8 +2451,6 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -2528,7 +2536,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GNU coreutils 8.21 to adapt to many kinds of systems.
+\`configure' configures GNU coreutils 8.23 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -2598,7 +2606,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GNU coreutils 8.21:";;
+     short | recursive ) echo "Configuration of GNU coreutils 8.23:";;
    esac
   cat <<\_ACEOF
 
@@ -2606,32 +2614,48 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-silent-rules          less verbose build output (undo: `make V=1')
-  --disable-silent-rules         verbose build output (undo: `make V=0')
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
+  --enable-silent-rules   less verbose build output (undo: "make V=1")
+  --disable-silent-rules  verbose build output (undo: "make V=0")
+  --enable-dependency-tracking
+                          do not reject slow dependency extractors
+  --disable-dependency-tracking
+                          speeds up one-time build
   --disable-largefile     omit support for large files
   --enable-threads={posix|solaris|pth|windows}
                           specify multithreading API
   --disable-threads       build without multithread safety
-  --disable-acl           do not support ACLs
   --disable-assert        turn off assertions
   --disable-rpath         do not hardcode runtime library paths
+  --disable-acl           do not support ACLs
+  --disable-libsmack      disable libsmack support
   --disable-xattr         do not support extended attributes
   --disable-libcap        disable libcap support
   --enable-gcc-warnings   turn on many GCC warnings (for developers; best with
                           GNU make)
+  --enable-single-binary=shebangs|symlinks
+                          Compile all the tools in a single binary, reducing
+                          the overall size. When compiled this way, shebangs
+                          (default when enabled) or symlinks are installed for
+                          each tool that points to the single binary.
+  --enable-single-binary-exceptions=PROG_LIST
+                          When used with --enable-single-binary, exclude the
+                          PROG_LIST from it, so these programs are compiled as
+                          separated files (comma-separated, default none))
   --enable-install-program=PROG_LIST
                           install the programs in PROG_LIST (comma-separated,
                           default: none)
   --enable-no-install-program=PROG_LIST
                           do NOT install the programs in PROG_LIST
-                          (comma-separated, default: arch,hostname)
+                          (comma-separated, default: arch,coreutils,hostname)
   --disable-nls           do not use Native Language Support
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-openssl          use libcrypto hash routines. Valid ARGs are: 'yes',
+                          'no', 'auto' => use if available, 'optional' => use
+                          if available and warn if not available; default is
+                          'no'
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-libiconv-prefix[=DIR]  search for libiconv in DIR/include and DIR/lib
   --without-libiconv-prefix     don't search for libiconv in includedir and libdir
@@ -2742,10 +2766,10 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-GNU coreutils configure 8.21
-generated by GNU Autoconf 2.68
+GNU coreutils configure 8.23
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -3022,7 +3046,7 @@ $as_echo "$ac_try_echo"; } >&5
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -3041,6 +3065,60 @@ fi
 
 } # ac_fn_c_try_link
 
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_c_check_type ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=no"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof ($2))
+	 return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof (($2)))
+	    return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  eval "$3=yes"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_type
+
 # ac_fn_c_check_func LINENO FUNC VAR
 # ----------------------------------
 # Tests whether FUNC exists, setting the cache variable VAR accordingly
@@ -3108,60 +3186,6 @@ $as_echo "$ac_res" >&6; }
 
 } # ac_fn_c_check_func
 
-# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
-# -------------------------------------------
-# Tests whether TYPE exists after having included INCLUDES, setting cache
-# variable VAR accordingly.
-ac_fn_c_check_type ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=no"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-if (sizeof ($2))
-	 return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-if (sizeof (($2)))
-	    return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  eval "$3=yes"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_type
-
 # ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
 # ---------------------------------------------
 # Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
@@ -3225,7 +3249,8 @@ int
 main ()
 {
 static int test_array [1 - 2 * !(($2) >= 0)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -3241,7 +3266,8 @@ int
 main ()
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -3267,7 +3293,8 @@ int
 main ()
 {
 static int test_array [1 - 2 * !(($2) < 0)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -3283,7 +3310,8 @@ int
 main ()
 {
 static int test_array [1 - 2 * !(($2) >= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -3317,7 +3345,8 @@ int
 main ()
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -3446,8 +3475,8 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GNU coreutils $as_me 8.21, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+It was created by GNU coreutils $as_me 8.23, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
@@ -3742,6 +3771,7 @@ as_fn_append ac_header_list " sys/socket.h"
 as_fn_append ac_func_list " fchdir"
 as_fn_append ac_header_list " dirent.h"
 as_fn_append ac_func_list " fdopendir"
+as_fn_append ac_func_list " getdtablesize"
 as_fn_append ac_func_list " faccessat"
 as_fn_append ac_func_list " posix_fadvise"
 as_fn_append ac_func_list " fchmodat"
@@ -3758,14 +3788,12 @@ as_fn_append ac_func_list " wmempcpy"
 as_fn_append ac_header_list " wctype.h"
 gl_fnmatch_required=GNU
 as_fn_append ac_header_list " stdio_ext.h"
-as_fn_append ac_func_list " __fpending"
 as_fn_append ac_func_list " fpurge"
 as_fn_append ac_func_list " __fpurge"
 as_fn_append ac_func_list " __freadahead"
 as_fn_append ac_func_list " __freading"
 as_fn_append ac_func_list " __freadptr"
 as_fn_append ac_func_list " __freadptrinc"
-as_fn_append ac_func_list " alarm"
 as_fn_append ac_func_list " __fseterr"
 as_fn_append ac_header_list " sys/stat.h"
 as_fn_append ac_func_list " fstatat"
@@ -3780,7 +3808,6 @@ as_fn_append ac_func_list " futimens"
 as_fn_append ac_header_list " netdb.h"
 as_fn_append ac_header_list " netinet/in.h"
 as_fn_append ac_func_list " getdelim"
-as_fn_append ac_func_list " getdtablesize"
 as_fn_append ac_func_list " microuptime"
 as_fn_append ac_func_list " nanouptime"
 as_fn_append ac_func_list " getlogin"
@@ -3825,8 +3852,7 @@ as_fn_append ac_func_list " mkstemp"
 as_fn_append ac_header_list " sys/statvfs.h"
 as_fn_append ac_header_list " sys/select.h"
 as_fn_append ac_func_list " nl_langinfo"
-as_fn_append ac_func_list " pipe2"
-as_fn_append ac_func_list " posix_spawn"
+as_fn_append ac_func_list " pipe"
 gl_printf_safe=yes
 as_fn_append ac_header_list " priv.h"
 as_fn_append ac_header_list " pthread.h"
@@ -3834,8 +3860,9 @@ as_fn_append ac_header_list " utmp.h"
 as_fn_append ac_header_list " utmpx.h"
 as_fn_append ac_func_list " utmpname"
 as_fn_append ac_func_list " utmpxname"
-as_fn_append ac_func_list " wcscoll"
+as_fn_append ac_header_list " malloc.h"
 as_fn_append ac_header_list " sched.h"
+as_fn_append ac_func_list " secure_getenv"
 as_fn_append ac_header_list " selinux/selinux.h"
 as_fn_append ac_func_list " setenv"
 as_fn_append ac_func_list " settimeofday"
@@ -3844,7 +3871,6 @@ as_fn_append ac_func_list " sigaction"
 as_fn_append ac_func_list " sigaltstack"
 as_fn_append ac_func_list " siginterrupt"
 as_fn_append ac_func_list " snprintf"
-as_fn_append ac_header_list " spawn.h"
 as_fn_append ac_func_list " stpncpy"
 as_fn_append ac_func_list " strdup"
 as_fn_append ac_func_list " strerror_r"
@@ -3859,7 +3885,6 @@ as_fn_append ac_header_list " sys/uio.h"
 as_fn_append ac_header_list " sys/utsname.h"
 as_fn_append ac_header_list " sys/wait.h"
 as_fn_append ac_func_list " localtime_r"
-as_fn_append ac_func_list " pipe"
 as_fn_append ac_func_list " unlinkat"
 as_fn_append ac_header_list " utime.h"
 as_fn_append ac_func_list " futimes"
@@ -3871,12 +3896,12 @@ as_fn_append ac_func_list " wcrtomb"
 as_fn_append ac_func_list " wcwidth"
 as_fn_append ac_func_list " wcswidth"
 as_fn_append ac_func_list " getegid"
+as_fn_append ac_func_list " ttyname"
 as_fn_append ac_func_list " newlocale"
 as_fn_append ac_func_list " sleep"
 as_fn_append ac_func_list " catgets"
 as_fn_append ac_func_list " symlinkat"
 as_fn_append ac_func_list " shutdown"
-as_fn_append ac_func_list " usleep"
 as_fn_append ac_func_list " wctob"
 as_fn_append ac_header_list " hurd.h"
 as_fn_append ac_header_list " paths.h"
@@ -3900,6 +3925,7 @@ as_fn_append ac_func_list " getgrgid_nomembers"
 as_fn_append ac_func_list " getgrnam_nomembers"
 as_fn_append ac_func_list " getgrent_nomembers"
 as_fn_append ac_header_list " OS.h"
+as_fn_append ac_header_list " gmp.h"
 gt_needs="$gt_needs need-formatstring-macros"
 # Check that the precious variables saved in the cache have kept the same
 # value.
@@ -4004,7 +4030,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 ac_config_headers="$ac_config_headers lib/config.h:lib/config.hin"
 
 
-am__api_version='1.11'
+am__api_version='1.14'
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -4043,7 +4069,7 @@ case $as_dir/ in #((
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -4101,9 +4127,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 $as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
@@ -4114,32 +4137,40 @@ case `pwd` in
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
 esac
 
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" "$LINENO" 5
-   fi
-
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$*" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$*" != "X $srcdir/configure conftest.file" \
+	&& test "$*" != "X conftest.file $srcdir/configure"; then
+
+	# If neither matched, then we have a broken ls.  This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment.  This has actually
+	# happened.  Such a system could not be considered "sane".
+	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment" "$LINENO" 5
+     fi
+     if test "$2" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
    test "$2" = conftest.file
    )
 then
@@ -4151,6 +4182,16 @@ Check your system clock" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
@@ -4173,12 +4214,12 @@ if test x"${MISSING+set}" != xset; then
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
 if test x"${install_sh}" != xset; then
@@ -4190,10 +4231,10 @@ if test x"${install_sh}" != xset; then
   esac
 fi
 
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
+# will honor the 'STRIP' environment variable to overrule this program.
 if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
@@ -4212,7 +4253,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4252,7 +4293,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4303,7 +4344,7 @@ do
   test -z "$as_dir" && as_dir=.
     for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
 	     'mkdir (GNU coreutils) '* | \
 	     'mkdir (coreutils) '* | \
@@ -4332,12 +4373,6 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
 $as_echo "$MKDIR_P" >&6; }
 
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  [\\/$]* | ?:[\\/]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -4356,7 +4391,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4420,6 +4455,45 @@ else
 fi
 rmdir .tst 2>/dev/null
 
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
   # is not polluted with repeated "-I."
@@ -4442,7 +4516,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='coreutils'
- VERSION='8.21'
+ VERSION='8.23'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4470,27 +4544,79 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+mkdir_p='$(MKDIR_P)'
+
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 # Always define AMTAR for backward compatibility.  Yes, it's still used
 # in the wild :-(  We should find a proper way to deprecate it ...
 AMTAR='$${TAR-tar}'
 
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar  pax cpio none'
+
 am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
 
 
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+  fi
+fi
 # Check whether --enable-silent-rules was given.
 if test "${enable_silent_rules+set}" = set; then :
   enableval=$enable_silent_rules;
 fi
 
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no)  AM_DEFAULT_VERBOSITY=1;;
-*)   AM_DEFAULT_VERBOSITY=0;;
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=0;;
 esac
 am_make=${MAKE-make}
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
@@ -4546,7 +4672,7 @@ am__quote=
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
   am__include=include
@@ -4612,7 +4738,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4652,7 +4778,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4705,7 +4831,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4746,7 +4872,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -4804,7 +4930,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4848,7 +4974,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5294,8 +5420,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -5380,6 +5505,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
 depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
@@ -5391,8 +5575,8 @@ else
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
   rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
@@ -5427,16 +5611,16 @@ else
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -5445,8 +5629,8 @@ else
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
@@ -5454,7 +5638,7 @@ else
       fi
       ;;
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -5658,7 +5842,7 @@ main ()
   return 0;
 }
 _ACEOF
-for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99
 do
   CC="$ac_save_CC $ac_arg"
   if ac_fn_c_try_compile "$LINENO"; then :
@@ -5698,8 +5882,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -5801,131 +5984,6 @@ $as_echo "none needed" >&6; } ;; #(
 $as_echo "$ac_cv_prog_cc_stdc" >&6; } ;;
 esac
 
-if test "x$CC" != xcc; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
-$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
-$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
-fi
-set dummy $CC; ac_cc=`$as_echo "$2" |
-		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-# Make sure it works both with $CC and with simple cc.
-# We do the test twice because some compilers refuse to overwrite an
-# existing .o file with -o, though they will create one.
-ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-rm -f conftest2.*
-if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-   test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-then
-  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-  if test "x$CC" != xcc; then
-    # Test first that cc exists at all.
-    if { ac_try='cc -c conftest.$ac_ext >&5'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-      rm -f conftest2.*
-      if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-	 test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-      then
-	# cc works too.
-	:
-      else
-	# cc exists but doesn't like -o.
-	eval ac_cv_prog_cc_${ac_cc}_c_o=no
-      fi
-    fi
-  fi
-else
-  eval ac_cv_prog_cc_${ac_cc}_c_o=no
-fi
-rm -f core conftest*
-
-fi
-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
-
-fi
-
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -6082,7 +6140,7 @@ do
     for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+      as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -6148,7 +6206,7 @@ do
     for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+      as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -6255,7 +6313,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6295,7 +6353,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6393,7 +6451,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="${ac_tool_prefix}ar"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6433,7 +6491,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="ar"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6500,7 +6558,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6540,7 +6598,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6780,8 +6838,6 @@ done
 
 
 
-
-
   ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
 if test "x$ac_cv_header_minix_config_h" = xyes; then :
   MINIX=yes
@@ -6800,15 +6856,10 @@ $as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
 
 $as_echo "#define _MINIX 1" >>confdefs.h
 
-  fi
-
-        case "$host_os" in
-    hpux*)
 
-$as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
+$as_echo "#define _NETBSD_SOURCE 1" >>confdefs.h
 
-      ;;
-  esac
+  fi
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
@@ -6851,6 +6902,54 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
 
   $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
+$as_echo_n "checking whether _XOPEN_SOURCE should be defined... " >&6; }
+if ${ac_cv_should_define__xopen_source+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_should_define__xopen_source=no
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+          #include <wchar.h>
+          mbstate_t x;
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+             #define _XOPEN_SOURCE 500
+             #include <wchar.h>
+             mbstate_t x;
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_should_define__xopen_source=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
+$as_echo "$ac_cv_should_define__xopen_source" >&6; }
+  test $ac_cv_should_define__xopen_source = yes &&
+    $as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
+
 
 
 
@@ -7208,6 +7307,7 @@ fi
 
 
 
+  # Code from module absolute-header:
   # Code from module accept:
   # Code from module accept-tests:
   # Code from module acl:
@@ -7360,7 +7460,6 @@ $as_echo "$as_me: autobuild timestamp... $date" >&6;}
   # Code from module faccessat-tests:
   # Code from module fadvise:
   # Code from module fadvise-tests:
-  # Code from module fatal-signal:
   # Code from module fchdir:
   # Code from module fchdir-tests:
   # Code from module fchmodat:
@@ -7676,28 +7775,9 @@ $as_echo "$as_me: autobuild timestamp... $date" >&6;}
   # Code from module perror:
   # Code from module perror-tests:
   # Code from module physmem:
-  # Code from module pipe:
   # Code from module pipe-posix:
   # Code from module pipe-posix-tests:
-  # Code from module pipe2:
-  # Code from module pipe2-safer:
-  # Code from module pipe2-tests:
   # Code from module posix-shell:
-  # Code from module posix_spawn-internal:
-  # Code from module posix_spawn_file_actions_addclose:
-  # Code from module posix_spawn_file_actions_addclose-tests:
-  # Code from module posix_spawn_file_actions_adddup2:
-  # Code from module posix_spawn_file_actions_adddup2-tests:
-  # Code from module posix_spawn_file_actions_addopen:
-  # Code from module posix_spawn_file_actions_addopen-tests:
-  # Code from module posix_spawn_file_actions_destroy:
-  # Code from module posix_spawn_file_actions_init:
-  # Code from module posix_spawnattr_destroy:
-  # Code from module posix_spawnattr_init:
-  # Code from module posix_spawnattr_setflags:
-  # Code from module posix_spawnattr_setsigmask:
-  # Code from module posix_spawnp:
-  # Code from module posix_spawnp-tests:
   # Code from module posixtm:
   # Code from module posixtm-tests:
   # Code from module posixver:
@@ -7711,7 +7791,14 @@ $as_echo "$as_me: autobuild timestamp... $date" >&6;}
   # Code from module progname:
   # Code from module propername:
   # Code from module pthread:
+
+$as_echo "#define _REENTRANT 1" >>confdefs.h
+
+
+$as_echo "#define _THREAD_SAFE 1" >>confdefs.h
+
   # Code from module putenv:
+  # Code from module qacl:
   # Code from module quote:
   # Code from module quotearg:
   # Code from module quotearg-simple:
@@ -7722,8 +7809,6 @@ $as_echo "$as_me: autobuild timestamp... $date" >&6;}
   # Code from module randperm:
   # Code from module randread:
   # Code from module randread-tests:
-  # Code from module rawmemchr:
-  # Code from module rawmemchr-tests:
   # Code from module read:
   # Code from module read-file:
   # Code from module read-file-tests:
@@ -7761,6 +7846,7 @@ $as_echo "$as_me: autobuild timestamp... $date" >&6;}
   # Code from module savewd:
   # Code from module sched:
   # Code from module sched-tests:
+  # Code from module secure_getenv:
   # Code from module select:
   # Code from module select-tests:
   # Code from module selinux-at:
@@ -7785,6 +7871,7 @@ $as_echo "$as_me: autobuild timestamp... $date" >&6;}
   # Code from module size_max:
   # Code from module sleep:
   # Code from module sleep-tests:
+  # Code from module smack:
   # Code from module snippet/_Noreturn:
   # Code from module snippet/arg-nonnull:
   # Code from module snippet/c++defs:
@@ -7797,10 +7884,6 @@ $as_echo "$as_me: autobuild timestamp... $date" >&6;}
   # Code from module sockets:
   # Code from module sockets-tests:
   # Code from module socklen:
-  # Code from module spawn:
-  # Code from module spawn-pipe:
-  # Code from module spawn-pipe-tests:
-  # Code from module spawn-tests:
   # Code from module ssize_t:
   # Code from module stat:
   # Code from module stat-macros:
@@ -7829,8 +7912,6 @@ $as_echo "$as_me: autobuild timestamp... $date" >&6;}
   # Code from module stdlib-tests:
   # Code from module stpcpy:
   # Code from module stpncpy:
-  # Code from module strchrnul:
-  # Code from module strchrnul-tests:
   # Code from module strdup-posix:
   # Code from module streq:
   # Code from module strerror:
@@ -7942,8 +8023,6 @@ $as_echo "$as_me: autobuild timestamp... $date" >&6;}
   # Code from module useless-if-before-free:
   # Code from module userspec:
   # Code from module userspec-tests:
-  # Code from module usleep:
-  # Code from module usleep-tests:
   # Code from module utimecmp:
   # Code from module utimens:
   # Code from module utimens-tests:
@@ -7967,8 +8046,6 @@ $as_echo "$as_me: autobuild timestamp... $date" >&6;}
   # Code from module vfprintf-posix-tests:
   # Code from module vprintf-posix:
   # Code from module vprintf-posix-tests:
-  # Code from module wait-process:
-  # Code from module waitpid:
   # Code from module warnings:
   # Code from module wchar:
   # Code from module wchar-tests:
@@ -8139,8 +8216,8 @@ ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
 $as_echo "#define C_ALLOCA 1" >>confdefs.h
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether 'alloca.c' needs Cray hooks" >&5
-$as_echo_n "checking whether 'alloca.c' needs Cray hooks... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
+$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
 if ${ac_cv_os_cray+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -8410,7 +8487,7 @@ DIR *dp = opendir (".");
              e = readdir (dp);
              if (! e)
                return 2;
-             if (stat (e->d_name, &st) != 0)
+             if (lstat (e->d_name, &st) != 0)
                return 3;
              if (e->d_ino != st.st_ino)
                return 4;
@@ -8950,6 +9027,7 @@ $as_echo "#define HAVE_C99_STRTOLD 1" >>confdefs.h
   GNULIB_REALLOC_POSIX=0;
   GNULIB_REALPATH=0;
   GNULIB_RPMATCH=0;
+  GNULIB_SECURE_GETENV=0;
   GNULIB_SETENV=0;
   GNULIB_STRTOD=0;
   GNULIB_STRTOLL=0;
@@ -8977,6 +9055,7 @@ $as_echo "#define HAVE_C99_STRTOLD 1" >>confdefs.h
   HAVE_RANDOM_R=1;
   HAVE_REALPATH=1;
   HAVE_RPMATCH=1;
+  HAVE_SECURE_GETENV=1;
   HAVE_SETENV=1;
   HAVE_DECL_SETENV=1;
   HAVE_STRTOD=1;
@@ -9372,6 +9451,7 @@ $as_echo "#define FUNC_REALPATH_WORKS 1" >>confdefs.h
   REPLACE_FTRUNCATE=0;
   REPLACE_GETCWD=0;
   REPLACE_GETDOMAINNAME=0;
+  REPLACE_GETDTABLESIZE=0;
   REPLACE_GETLOGIN_R=0;
   REPLACE_GETGROUPS=0;
   REPLACE_GETPAGESIZE=0;
@@ -10001,6 +10081,8 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
 
 
 
+
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if environ is properly declared" >&5
 $as_echo_n "checking if environ is properly declared... " >&6; }
   if ${gt_cv_var_environ_declaration+:} false; then :
@@ -10142,36 +10224,40 @@ if ${gl_cv_next_errno_h+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <errno.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'errno.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_errno_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
 
-               gl_header_literal_regex=`echo 'errno.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_errno_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+           gl_header=$gl_cv_absolute_errno_h
+           gl_cv_next_errno_h='"'$gl_header'"'
 
 
 fi
@@ -10586,23 +10672,6 @@ _ACEOF
 
 
 
-
-  ac_fn_c_check_type "$LINENO" "sig_atomic_t" "ac_cv_type_sig_atomic_t" "#include <signal.h>
-"
-if test "x$ac_cv_type_sig_atomic_t" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_SIG_ATOMIC_T 1
-_ACEOF
-
-
-else
-
-$as_echo "#define sig_atomic_t int" >>confdefs.h
-
-fi
-
-
 ac_fn_c_check_decl "$LINENO" "fchdir" "ac_cv_have_decl_fchdir" "$ac_includes_default"
 if test "x$ac_cv_have_decl_fchdir" = xyes; then :
   ac_have_decl=1
@@ -11110,8 +11179,6 @@ $as_echo "#define mbstate_t int" >>confdefs.h
 
 
 
-
-
   GNULIB_ACOSF=0;
   GNULIB_ACOSL=0;
   GNULIB_ASINF=0;
@@ -11398,7 +11465,16 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_frexp_no_libm" >&5
 $as_echo "$gl_cv_func_frexp_no_libm" >&6; }
 
+ac_fn_c_check_decl "$LINENO" "alarm" "ac_cv_have_decl_alarm" "$ac_includes_default"
+if test "x$ac_cv_have_decl_alarm" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
 
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_ALARM $ac_have_decl
+_ACEOF
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether long double and double are the same" >&5
@@ -11550,36 +11626,40 @@ if ${gl_cv_next_sys_types_h+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'sys/types.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
 
-               gl_header_literal_regex=`echo 'sys/types.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_sys_types_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+        gl_cv_absolute_sys_types_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_sys_types_h
+           gl_cv_next_sys_types_h='"'$gl_header'"'
 
 
 fi
@@ -11680,7 +11760,7 @@ if ${gl_cv_func_fflush_stdin+:} false; then :
 else
   echo hello world > conftest.txt
      if test "$cross_compiling" = yes; then :
-        gl_cv_func_fflush_stdin=no
+  gl_cv_func_fflush_stdin=cross
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -11749,8 +11829,18 @@ fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fflush_stdin" >&5
 $as_echo "$gl_cv_func_fflush_stdin" >&6; }
+  case $gl_cv_func_fflush_stdin in
+    yes) gl_func_fflush_stdin=1 ;;
+    no)  gl_func_fflush_stdin=0 ;;
+    *)   gl_func_fflush_stdin='(-1)' ;;
+  esac
+
+cat >>confdefs.h <<_ACEOF
+#define FUNC_FFLUSH_STDIN $gl_func_fflush_stdin
+_ACEOF
 
-      if test $gl_cv_func_fflush_stdin = no; then
+
+      if test $gl_cv_func_fflush_stdin != yes; then
         REPLACE_FSEEKO=1
       fi
 
@@ -11828,36 +11918,40 @@ else
              if test $ac_cv_header_sys_stat_h = yes; then
 
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/stat.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-
-               gl_header_literal_regex=`echo 'sys/stat.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_sys_stat_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'sys/stat.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_sys_stat_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_sys_stat_h
+           gl_cv_next_sys_stat_h='"'$gl_header'"'
           else
                gl_cv_next_sys_stat_h='<'sys/stat.h'>'
              fi
@@ -12299,36 +12393,40 @@ else
              if test $ac_cv_header_sys_socket_h = yes; then
 
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/socket.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-
-               gl_header_literal_regex=`echo 'sys/socket.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_sys_socket_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'sys/socket.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_sys_socket_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_sys_socket_h
+           gl_cv_next_sys_socket_h='"'$gl_header'"'
           else
                gl_cv_next_sys_socket_h='<'sys/socket.h'>'
              fi
@@ -12505,36 +12603,40 @@ else
              if test $ac_cv_header_netdb_h = yes; then
 
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <netdb.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-
-               gl_header_literal_regex=`echo 'netdb.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_netdb_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'netdb.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_netdb_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_netdb_h
+           gl_cv_next_netdb_h='"'$gl_header'"'
           else
                gl_cv_next_netdb_h='<'netdb.h'>'
              fi
@@ -13184,8 +13286,6 @@ _ACEOF
 
 
 
-
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for arithmetic hrtime_t" >&5
 $as_echo_n "checking for arithmetic hrtime_t... " >&6; }
 if ${gl_cv_arithmetic_hrtime_t+:} false; then :
@@ -13419,36 +13519,40 @@ else
              if test $ac_cv_header_getopt_h = yes; then
 
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <getopt.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-
-               gl_header_literal_regex=`echo 'getopt.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_getopt_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'getopt.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_getopt_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_getopt_h
+           gl_cv_next_getopt_h='"'$gl_header'"'
           else
                gl_cv_next_getopt_h='<'getopt.h'>'
              fi
@@ -14136,36 +14240,40 @@ else
              if test $ac_cv_header_sys_time_h = yes; then
 
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/time.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-
-               gl_header_literal_regex=`echo 'sys/time.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_sys_time_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'sys/time.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_sys_time_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_sys_time_h
+           gl_cv_next_sys_time_h='"'$gl_header'"'
           else
                gl_cv_next_sys_time_h='<'sys/time.h'>'
              fi
@@ -15489,36 +15597,40 @@ else
              if test $ac_cv_header_stdint_h = yes; then
 
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdint.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-
-               gl_header_literal_regex=`echo 'stdint.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_stdint_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'stdint.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_stdint_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_stdint_h
+           gl_cv_next_stdint_h='"'$gl_header'"'
           else
                gl_cv_next_stdint_h='<'stdint.h'>'
              fi
@@ -16166,6 +16278,7 @@ fi
   HAVE_DECL_STRTOIMAX=1;
   HAVE_DECL_STRTOUMAX=1;
   REPLACE_STRTOIMAX=0;
+  REPLACE_STRTOUMAX=0;
   INT32_MAX_LT_INTMAX_MAX=1;
   INT64_MAX_EQ_LONG_MAX='defined _LP64';
   PRI_MACROS_BROKEN=0;
@@ -16199,36 +16312,40 @@ else
              if test $ac_cv_header_inttypes_h = yes; then
 
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <inttypes.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-
-               gl_header_literal_regex=`echo 'inttypes.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_inttypes_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'inttypes.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_inttypes_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_inttypes_h
+           gl_cv_next_inttypes_h='"'$gl_header'"'
           else
                gl_cv_next_inttypes_h='<'inttypes.h'>'
              fi
@@ -16866,36 +16983,40 @@ else
              if test $ac_cv_header_wctype_h = yes; then
 
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <wctype.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-
-               gl_header_literal_regex=`echo 'wctype.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_wctype_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'wctype.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_wctype_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_wctype_h
+           gl_cv_next_wctype_h='"'$gl_header'"'
           else
                gl_cv_next_wctype_h='<'wctype.h'>'
              fi
@@ -17308,36 +17429,40 @@ if ${gl_cv_next_stddef_h+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stddef.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'stddef.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
 
-               gl_header_literal_regex=`echo 'stddef.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_stddef_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+        gl_cv_absolute_stddef_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_stddef_h
+           gl_cv_next_stddef_h='"'$gl_header'"'
 
 
 fi
@@ -18269,6 +18394,75 @@ $as_echo "$gl_threads_api" >&6; }
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if ${ac_cv_path_SED+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     { ac_script=; unset ac_script;}
+     if test -z "$SED"; then
+  ac_path_SED_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_SED" || continue
+# Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_SED_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_SED"; then
+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+  fi
+else
+  ac_cv_path_SED=$SED
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
+
 
 
       for ac_header in stdlib.h
@@ -19275,6 +19469,49 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_nul_retval" >&5
 $as_echo "$gl_cv_func_mbrtowc_nul_retval" >&6; }
 
+
+
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works on empty input" >&5
+$as_echo_n "checking whether mbrtowc works on empty input... " >&6; }
+if ${gl_cv_func_mbrtowc_empty_input+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                  case "$host_os" in
+                     # Guess no on AIX and glibc systems.
+        aix* | *-gnu*)
+                    gl_cv_func_mbrtowc_empty_input="guessing no" ;;
+        *)          gl_cv_func_mbrtowc_empty_input="guessing yes" ;;
+      esac
+      if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+           #include <wchar.h>
+           static wchar_t wc;
+           static mbstate_t mbs;
+           int
+           main (void)
+           {
+             return mbrtowc (&wc, "", 0, &mbs) == (size_t) -2;
+           }
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_mbrtowc_empty_input=no
+else
+  gl_cv_func_mbrtowc_empty_input=yes
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_empty_input" >&5
+$as_echo "$gl_cv_func_mbrtowc_empty_input" >&6; }
+
       case "$gl_cv_func_mbrtowc_null_arg1" in
         *yes) ;;
         *)
@@ -19307,6 +19544,14 @@ $as_echo "#define MBRTOWC_NUL_RETVAL_BUG 1" >>confdefs.h
            REPLACE_MBRTOWC=1
            ;;
       esac
+      case "$gl_cv_func_mbrtowc_empty_input" in
+        *yes) ;;
+        *)
+$as_echo "#define MBRTOWC_EMPTY_INPUT_BUG 1" >>confdefs.h
+
+           REPLACE_MBRTOWC=1
+           ;;
+      esac
     fi
   fi
 
@@ -19588,6 +19833,10 @@ _ACEOF
   REPLACE_NANOSLEEP=GNULIB_PORTCHECK;
   REPLACE_TIMEGM=GNULIB_PORTCHECK;
 
+      : ${GNULIB_GETTIMEOFDAY=0};
+        REPLACE_GMTIME=0;
+  REPLACE_LOCALTIME=0;
+
 
 
 
@@ -19704,36 +19953,40 @@ else
              if test $ac_cv_header_sys_select_h = yes; then
 
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/select.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-
-               gl_header_literal_regex=`echo 'sys/select.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_sys_select_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'sys/select.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_sys_select_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_sys_select_h
+           gl_cv_next_sys_select_h='"'$gl_header'"'
           else
                gl_cv_next_sys_select_h='<'sys/select.h'>'
              fi
@@ -20371,454 +20624,6 @@ $as_echo "#define HAVE__SYSTEM_CONFIGURATION 1" >>confdefs.h
 
 
 
-  GNULIB_POSIX_SPAWN=0;
-  GNULIB_POSIX_SPAWNP=0;
-  GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT=0;
-  GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE=0;
-  GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2=0;
-  GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN=0;
-  GNULIB_POSIX_SPAWN_FILE_ACTIONS_DESTROY=0;
-  GNULIB_POSIX_SPAWNATTR_INIT=0;
-  GNULIB_POSIX_SPAWNATTR_GETFLAGS=0;
-  GNULIB_POSIX_SPAWNATTR_SETFLAGS=0;
-  GNULIB_POSIX_SPAWNATTR_GETPGROUP=0;
-  GNULIB_POSIX_SPAWNATTR_SETPGROUP=0;
-  GNULIB_POSIX_SPAWNATTR_GETSCHEDPARAM=0;
-  GNULIB_POSIX_SPAWNATTR_SETSCHEDPARAM=0;
-  GNULIB_POSIX_SPAWNATTR_GETSCHEDPOLICY=0;
-  GNULIB_POSIX_SPAWNATTR_SETSCHEDPOLICY=0;
-  GNULIB_POSIX_SPAWNATTR_GETSIGDEFAULT=0;
-  GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT=0;
-  GNULIB_POSIX_SPAWNATTR_GETSIGMASK=0;
-  GNULIB_POSIX_SPAWNATTR_SETSIGMASK=0;
-  GNULIB_POSIX_SPAWNATTR_DESTROY=0;
-    HAVE_POSIX_SPAWN=1;
-  HAVE_POSIX_SPAWNATTR_T=1;
-  HAVE_POSIX_SPAWN_FILE_ACTIONS_T=1;
-
-  REPLACE_POSIX_SPAWN=0;
-  REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE=0;
-
-  REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2=0;
-
-  REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN=0;
-
-
-
-
-
-
-
-
-  if test $ac_cv_func_posix_spawn != yes; then
-    HAVE_POSIX_SPAWN=0
-  fi
-
-
-
-
-                                      if test $ac_cv_func_posix_spawn = yes; then
-
-
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether posix_spawn works" >&5
-$as_echo_n "checking whether posix_spawn works... " >&6; }
-if ${gl_cv_func_posix_spawn_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test $cross_compiling = no; then
-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <errno.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <spawn.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-
-extern char **environ;
-
-#ifndef STDIN_FILENO
-# define STDIN_FILENO 0
-#endif
-#ifndef STDOUT_FILENO
-# define STDOUT_FILENO 1
-#endif
-#ifndef STDERR_FILENO
-# define STDERR_FILENO 2
-#endif
-
-#ifndef WTERMSIG
-# define WTERMSIG(x) ((x) & 0x7f)
-#endif
-#ifndef WIFEXITED
-# define WIFEXITED(x) (WTERMSIG (x) == 0)
-#endif
-#ifndef WEXITSTATUS
-# define WEXITSTATUS(x) (((x) >> 8) & 0xff)
-#endif
-
-#define CHILD_PROGRAM_FILENAME "/non/exist/ent"
-
-static int
-fd_safer (int fd)
-{
-  if (0 <= fd && fd <= 2)
-    {
-      int f = fd_safer (dup (fd));
-      int e = errno;
-      close (fd);
-      errno = e;
-      fd = f;
-    }
-
-  return fd;
-}
-
-int
-main ()
-{
-  char *argv[2] = { CHILD_PROGRAM_FILENAME, NULL };
-  int ofd[2];
-  sigset_t blocked_signals;
-  sigset_t fatal_signal_set;
-  posix_spawn_file_actions_t actions;
-  bool actions_allocated;
-  posix_spawnattr_t attrs;
-  bool attrs_allocated;
-  int err;
-  pid_t child;
-  int status;
-  int exitstatus;
-
-  setvbuf (stdout, NULL, _IOFBF, 0);
-  puts ("This should be seen only once.");
-  if (pipe (ofd) < 0 || (ofd[1] = fd_safer (ofd[1])) < 0)
-    {
-      perror ("cannot create pipe");
-      exit (1);
-    }
-  sigprocmask (SIG_SETMASK, NULL, &blocked_signals);
-  sigemptyset (&fatal_signal_set);
-  sigaddset (&fatal_signal_set, SIGINT);
-  sigaddset (&fatal_signal_set, SIGTERM);
-  sigaddset (&fatal_signal_set, SIGHUP);
-  sigaddset (&fatal_signal_set, SIGPIPE);
-  sigprocmask (SIG_BLOCK, &fatal_signal_set, NULL);
-  actions_allocated = false;
-  attrs_allocated = false;
-  if ((err = posix_spawn_file_actions_init (&actions)) != 0
-      || (actions_allocated = true,
-          (err = posix_spawn_file_actions_adddup2 (&actions, ofd[0], STDIN_FILENO)) != 0
-          || (err = posix_spawn_file_actions_addclose (&actions, ofd[0])) != 0
-          || (err = posix_spawn_file_actions_addclose (&actions, ofd[1])) != 0
-          || (err = posix_spawnattr_init (&attrs)) != 0
-          || (attrs_allocated = true,
-              (err = posix_spawnattr_setsigmask (&attrs, &blocked_signals)) != 0
-              || (err = posix_spawnattr_setflags (&attrs, POSIX_SPAWN_SETSIGMASK)) != 0)
-          || (err = posix_spawnp (&child, CHILD_PROGRAM_FILENAME, &actions, &attrs, argv, environ)) != 0))
-    {
-      if (actions_allocated)
-        posix_spawn_file_actions_destroy (&actions);
-      if (attrs_allocated)
-        posix_spawnattr_destroy (&attrs);
-      sigprocmask (SIG_UNBLOCK, &fatal_signal_set, NULL);
-      if (err == ENOENT)
-        return 0;
-      else
-        {
-          errno = err;
-          perror ("subprocess failed");
-          exit (1);
-        }
-    }
-  posix_spawn_file_actions_destroy (&actions);
-  posix_spawnattr_destroy (&attrs);
-  sigprocmask (SIG_UNBLOCK, &fatal_signal_set, NULL);
-  close (ofd[0]);
-  close (ofd[1]);
-  status = 0;
-  while (waitpid (child, &status, 0) != child)
-    ;
-  if (!WIFEXITED (status))
-    {
-      fprintf (stderr, "subprocess terminated with unexpected wait status %d\n", status);
-      exit (1);
-    }
-  exitstatus = WEXITSTATUS (status);
-  if (exitstatus != 127)
-    {
-      fprintf (stderr, "subprocess terminated with unexpected exit status %d\n", exitstatus);
-      exit (1);
-    }
-  return 0;
-}
-
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  if test -s conftest$ac_exeext \
-             && ./conftest$ac_exeext > conftest.out \
-             && echo 'This should be seen only once.' > conftest.ok \
-             && cmp conftest.out conftest.ok > /dev/null; then
-            gl_cv_func_posix_spawn_works=yes
-          else
-            gl_cv_func_posix_spawn_works=no
-          fi
-else
-  gl_cv_func_posix_spawn_works=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-       if test $gl_cv_func_posix_spawn_works = yes; then
-         if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Test whether posix_spawn_file_actions_addopen supports filename arguments
-   that contain special characters such as '*'.  */
-
-#include <errno.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <spawn.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-
-extern char **environ;
-
-#ifndef STDIN_FILENO
-# define STDIN_FILENO 0
-#endif
-#ifndef STDOUT_FILENO
-# define STDOUT_FILENO 1
-#endif
-#ifndef STDERR_FILENO
-# define STDERR_FILENO 2
-#endif
-
-#ifndef WTERMSIG
-# define WTERMSIG(x) ((x) & 0x7f)
-#endif
-#ifndef WIFEXITED
-# define WIFEXITED(x) (WTERMSIG (x) == 0)
-#endif
-#ifndef WEXITSTATUS
-# define WEXITSTATUS(x) (((x) >> 8) & 0xff)
-#endif
-
-#define CHILD_PROGRAM_FILENAME "conftest"
-#define DATA_FILENAME "conftest%=*#?"
-
-static int
-parent_main (void)
-{
-  FILE *fp;
-  char *argv[3] = { CHILD_PROGRAM_FILENAME, "-child", NULL };
-  posix_spawn_file_actions_t actions;
-  bool actions_allocated;
-  int err;
-  pid_t child;
-  int status;
-  int exitstatus;
-
-  /* Create a data file with specific contents.  */
-  fp = fopen (DATA_FILENAME, "wb");
-  if (fp == NULL)
-    {
-      perror ("cannot create data file");
-      return 1;
-    }
-  fwrite ("Halle Potta", 1, 11, fp);
-  if (fflush (fp) || fclose (fp))
-    {
-      perror ("cannot prepare data file");
-      return 2;
-    }
-
-  /* Avoid reading from our stdin, as it could block.  */
-  freopen ("/dev/null", "rb", stdin);
-
-  /* Test whether posix_spawn_file_actions_addopen with this file name
-     actually works, but spawning a child that reads from this file.  */
-  actions_allocated = false;
-  if ((err = posix_spawn_file_actions_init (&actions)) != 0
-      || (actions_allocated = true,
-          (err = posix_spawn_file_actions_addopen (&actions, STDIN_FILENO, DATA_FILENAME, O_RDONLY, 0600)) != 0
-          || (err = posix_spawn (&child, CHILD_PROGRAM_FILENAME, &actions, NULL, argv, environ)) != 0))
-    {
-      if (actions_allocated)
-        posix_spawn_file_actions_destroy (&actions);
-      errno = err;
-      perror ("subprocess failed");
-      return 3;
-    }
-  posix_spawn_file_actions_destroy (&actions);
-  status = 0;
-  while (waitpid (child, &status, 0) != child)
-    ;
-  if (!WIFEXITED (status))
-    {
-      fprintf (stderr, "subprocess terminated with unexpected wait status %d\n", status);
-      return 4;
-    }
-  exitstatus = WEXITSTATUS (status);
-  if (exitstatus != 0)
-    {
-      fprintf (stderr, "subprocess terminated with unexpected exit status %d\n", exitstatus);
-      return 5;
-    }
-  return 0;
-}
-
-static int
-child_main (void)
-{
-  char buf[1024];
-
-  /* See if reading from STDIN_FILENO yields the expected contents.  */
-  if (fread (buf, 1, sizeof (buf), stdin) == 11
-      && memcmp (buf, "Halle Potta", 11) == 0)
-    return 0;
-  else
-    return 8;
-}
-
-static void
-cleanup_then_die (int sig)
-{
-  /* Clean up data file.  */
-  unlink (DATA_FILENAME);
-
-  /* Re-raise the signal and die from it.  */
-  signal (sig, SIG_DFL);
-  raise (sig);
-}
-
-int
-main (int argc, char *argv[])
-{
-  int exitstatus;
-
-  if (!(argc > 1 && strcmp (argv[1], "-child") == 0))
-    {
-      /* This is the parent process.  */
-      signal (SIGINT, cleanup_then_die);
-      signal (SIGTERM, cleanup_then_die);
-      #ifdef SIGHUP
-      signal (SIGHUP, cleanup_then_die);
-      #endif
-
-      exitstatus = parent_main ();
-    }
-  else
-    {
-      /* This is the child process.  */
-
-      exitstatus = child_main ();
-    }
-  unlink (DATA_FILENAME);
-  return exitstatus;
-}
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  gl_cv_func_posix_spawn_works=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-       fi
-     else
-       case "$host_os" in
-         aix*) gl_cv_func_posix_spawn_works="guessing no";;
-         *)    gl_cv_func_posix_spawn_works="guessing yes";;
-       esac
-     fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_posix_spawn_works" >&5
-$as_echo "$gl_cv_func_posix_spawn_works" >&6; }
-
-    case "$gl_cv_func_posix_spawn_works" in
-      *yes)
-
-$as_echo "#define HAVE_WORKING_POSIX_SPAWN 1" >>confdefs.h
-
-                                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether posix_spawnattr_setschedpolicy is supported" >&5
-$as_echo_n "checking whether posix_spawnattr_setschedpolicy is supported... " >&6; }
-if ${gl_cv_func_spawnattr_setschedpolicy+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <spawn.h>
-#if POSIX_SPAWN_SETSCHEDULER
- POSIX scheduling supported
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "POSIX scheduling supported" >/dev/null 2>&1; then :
-  gl_cv_func_spawnattr_setschedpolicy=yes
-else
-  gl_cv_func_spawnattr_setschedpolicy=no
-fi
-rm -f conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_spawnattr_setschedpolicy" >&5
-$as_echo "$gl_cv_func_spawnattr_setschedpolicy" >&6; }
-                                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether posix_spawnattr_setschedparam is supported" >&5
-$as_echo_n "checking whether posix_spawnattr_setschedparam is supported... " >&6; }
-if ${gl_cv_func_spawnattr_setschedparam+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <spawn.h>
-#if POSIX_SPAWN_SETSCHEDPARAM
- POSIX scheduling supported
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "POSIX scheduling supported" >/dev/null 2>&1; then :
-  gl_cv_func_spawnattr_setschedparam=yes
-else
-  gl_cv_func_spawnattr_setschedparam=no
-fi
-rm -f conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_spawnattr_setschedparam" >&5
-$as_echo "$gl_cv_func_spawnattr_setschedparam" >&6; }
-        ;;
-      *) REPLACE_POSIX_SPAWN=1 ;;
-    esac
-  fi
-
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for desired default level of POSIX conformance" >&5
 $as_echo_n "checking for desired default level of POSIX conformance... " >&6; }
   gl_default_posix2_version=none-specified
@@ -21122,6 +20927,8 @@ $as_echo "#define UNLINK_PARENT_BUG 1" >>confdefs.h
 
 
 
+
+
 # Check whether --with-selinux was given.
 if test "${with_selinux+set}" = set; then :
   withval=$with_selinux;
@@ -21195,12 +21002,14 @@ fi
 
 
   # Warn if SELinux is found but libselinux is absent;
-  if test "$ac_cv_search_setfilecon" = no &&
-     test "$host" = "$build" && test -d /selinux; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This system supports SELinux but libselinux is missing." >&5
+  if test "$ac_cv_search_setfilecon" = no; then
+    if test "$host" = "$build" && test -d /selinux; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This system supports SELinux but libselinux is missing." >&5
 $as_echo "$as_me: WARNING: This system supports SELinux but libselinux is missing." >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GNU coreutils will be compiled without SELinux support." >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GNU coreutils will be compiled without SELinux support." >&5
 $as_echo "$as_me: WARNING: GNU coreutils will be compiled without SELinux support." >&2;}
+    fi
+    with_selinux=no
   fi
 
 
@@ -21284,7 +21093,7 @@ else
                                  # Guess yes on glibc systems.
            *-gnu*)               gl_cv_func_snprintf_retval_c99="guessing yes";;
                                  # Guess yes on FreeBSD >= 5.
-           freebsd[1-4]*)        gl_cv_func_snprintf_retval_c99="guessing no";;
+           freebsd[1-4].*)       gl_cv_func_snprintf_retval_c99="guessing no";;
            freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing yes";;
                                  # Guess yes on Mac OS X >= 10.3.
            darwin[1-6].*)        gl_cv_func_snprintf_retval_c99="guessing no";;
@@ -21367,8 +21176,6 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_SNPRINTF $ac_have_decl
 _ACEOF
 
-
-
 ac_fn_c_check_decl "$LINENO" "stpncpy" "ac_cv_have_decl_stpncpy" "$ac_includes_default"
 if test "x$ac_cv_have_decl_stpncpy" = xyes; then :
   ac_have_decl=1
@@ -21646,36 +21453,40 @@ if ${gl_cv_next_string_h+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <string.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'string.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
 
-               gl_header_literal_regex=`echo 'string.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_string_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+        gl_cv_absolute_string_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_string_h
+           gl_cv_next_string_h='"'$gl_header'"'
 
 
 fi
@@ -22135,36 +21946,40 @@ if ${gl_cv_next_time_h+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <time.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'time.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
 
-               gl_header_literal_regex=`echo 'time.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_time_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+        gl_cv_absolute_time_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_time_h
+           gl_cv_next_time_h='"'$gl_header'"'
 
 
 fi
@@ -22195,8 +22010,6 @@ $as_echo "$gl_cv_next_time_h" >&6; }
 
 
 
-
-
 gl_libunistring_sed_extract_major='/^[0-9]/{s/^\([0-9]*\).*/\1/p;q;}
 i\
 0
@@ -22700,7 +22513,7 @@ else
                                  # Guess yes on glibc systems.
            *-gnu*)               gl_cv_func_printf_sizes_c99="guessing yes";;
                                  # Guess yes on FreeBSD >= 5.
-           freebsd[1-4]*)        gl_cv_func_printf_sizes_c99="guessing no";;
+           freebsd[1-4].*)       gl_cv_func_printf_sizes_c99="guessing no";;
            freebsd* | kfreebsd*) gl_cv_func_printf_sizes_c99="guessing yes";;
                                  # Guess yes on Mac OS X >= 10.3.
            darwin[1-6].*)        gl_cv_func_printf_sizes_c99="guessing no";;
@@ -22842,7 +22655,7 @@ else
                                  # Guess yes on glibc systems.
            *-gnu*)               gl_cv_func_printf_infinite="guessing yes";;
                                  # Guess yes on FreeBSD >= 6.
-           freebsd[1-5]*)        gl_cv_func_printf_infinite="guessing no";;
+           freebsd[1-5].*)       gl_cv_func_printf_infinite="guessing no";;
            freebsd* | kfreebsd*) gl_cv_func_printf_infinite="guessing yes";;
                                  # Guess yes on Mac OS X >= 10.3.
            darwin[1-6].*)        gl_cv_func_printf_infinite="guessing no";;
@@ -22973,7 +22786,7 @@ else
                                          # Guess yes on glibc systems.
                    *-gnu*)               gl_cv_func_printf_infinite_long_double="guessing yes";;
                                          # Guess yes on FreeBSD >= 6.
-                   freebsd[1-5]*)        gl_cv_func_printf_infinite_long_double="guessing no";;
+                   freebsd[1-5].*)       gl_cv_func_printf_infinite_long_double="guessing no";;
                    freebsd* | kfreebsd*) gl_cv_func_printf_infinite_long_double="guessing yes";;
                                          # Guess yes on HP-UX >= 11.
                    hpux[7-9]* | hpux10*) gl_cv_func_printf_infinite_long_double="guessing no";;
@@ -23401,7 +23214,7 @@ else
                                  # Guess yes on glibc systems.
            *-gnu*)               gl_cv_func_printf_directive_f="guessing yes";;
                                  # Guess yes on FreeBSD >= 6.
-           freebsd[1-5]*)        gl_cv_func_printf_directive_f="guessing no";;
+           freebsd[1-5].*)       gl_cv_func_printf_directive_f="guessing no";;
            freebsd* | kfreebsd*) gl_cv_func_printf_directive_f="guessing yes";;
                                  # Guess yes on Mac OS X >= 10.3.
            darwin[1-6].*)        gl_cv_func_printf_directive_f="guessing no";;
@@ -24228,17 +24041,6 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_tiocgwinsz_needs_termios_h" >&5
 $as_echo "$gl_cv_sys_tiocgwinsz_needs_termios_h" >&6; }
 
-ac_fn_c_check_decl "$LINENO" "alarm" "ac_cv_have_decl_alarm" "$ac_includes_default"
-if test "x$ac_cv_have_decl_alarm" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_ALARM $ac_have_decl
-_ACEOF
-
 
 
 
@@ -24309,6 +24111,8 @@ $as_echo "#define FUNC_UNGETC_BROKEN 1" >>confdefs.h
 
 
 
+
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
 $as_echo_n "checking for LC_MESSAGES... " >&6; }
 if ${gt_cv_val_LC_MESSAGES+:} false; then :
@@ -24463,8 +24267,6 @@ _ACEOF
 
 
 
-
-
    if false; then
   GL_COND_LIBTOOL_TRUE=
   GL_COND_LIBTOOL_FALSE='#'
@@ -24488,448 +24290,6 @@ fi
 
   gl_source_base='lib'
 
-  # Check whether --enable-acl was given.
-if test "${enable_acl+set}" = set; then :
-  enableval=$enable_acl;
-else
-  enable_acl=auto
-fi
-
-
-  LIB_ACL=
-  use_acl=0
-  if test "x$enable_acl" != "xno"; then
-        for ac_header in sys/acl.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "sys/acl.h" "ac_cv_header_sys_acl_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_acl_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_ACL_H 1
-_ACEOF
-
-fi
-
-done
-
-    if test $ac_cv_header_sys_acl_h = yes; then
-      ac_save_LIBS=$LIBS
-
-                  if test $use_acl = 0; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing acl_get_file" >&5
-$as_echo_n "checking for library containing acl_get_file... " >&6; }
-if ${ac_cv_search_acl_get_file+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char acl_get_file ();
-int
-main ()
-{
-return acl_get_file ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' acl pacl; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_acl_get_file=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_acl_get_file+:} false; then :
-  break
-fi
-done
-if ${ac_cv_search_acl_get_file+:} false; then :
-
-else
-  ac_cv_search_acl_get_file=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_acl_get_file" >&5
-$as_echo "$ac_cv_search_acl_get_file" >&6; }
-ac_res=$ac_cv_search_acl_get_file
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-  if test "$ac_cv_search_acl_get_file" != "none required"; then
-             LIB_ACL=$ac_cv_search_acl_get_file
-           fi
-           for ac_func in acl_get_file acl_get_fd acl_set_file acl_set_fd \
-              acl_free acl_from_mode acl_from_text \
-              acl_delete_def_file acl_extended_file \
-              acl_delete_fd_np acl_delete_file_np \
-              acl_copy_ext_native acl_create_entry_np \
-              acl_to_short_text acl_free_text
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-           # If the acl_get_file bug is detected, don't enable the ACL support.
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working acl_get_file" >&5
-$as_echo_n "checking for working acl_get_file... " >&6; }
-if ${gl_cv_func_working_acl_get_file+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  gl_cv_func_working_acl_get_file=cross-compiling
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-           #include <sys/acl.h>
-           #include <errno.h>
-
-int
-main ()
-{
-if (!acl_get_file (".", ACL_TYPE_ACCESS) && errno == ENOENT)
-              return 1;
-            return 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_working_acl_get_file=yes
-else
-  gl_cv_func_working_acl_get_file=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_acl_get_file" >&5
-$as_echo "$gl_cv_func_working_acl_get_file" >&6; }
-
-  if test $gl_cv_func_working_acl_get_file = yes; then :
-  use_acl=1
-fi
-
-           if test $use_acl = 1; then
-                          for ac_header in acl/libacl.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "acl/libacl.h" "ac_cv_header_acl_libacl_h" "$ac_includes_default"
-if test "x$ac_cv_header_acl_libacl_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_ACL_LIBACL_H 1
-_ACEOF
-
-fi
-
-done
-
-
-
-
-
-
-
-
-
-  for ac_func in acl_entries
-do :
-  ac_fn_c_check_func "$LINENO" "acl_entries" "ac_cv_func_acl_entries"
-if test "x$ac_cv_func_acl_entries" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_ACL_ENTRIES 1
-_ACEOF
-
-else
-
-    gl_LIBOBJS="$gl_LIBOBJS $ac_func.$ac_objext"
-
-fi
-done
-
-
-             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ACL_FIRST_ENTRY" >&5
-$as_echo_n "checking for ACL_FIRST_ENTRY... " >&6; }
-if ${gl_cv_acl_ACL_FIRST_ENTRY+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/acl.h>
-int type = ACL_FIRST_ENTRY;
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_acl_ACL_FIRST_ENTRY=yes
-else
-  gl_cv_acl_ACL_FIRST_ENTRY=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_acl_ACL_FIRST_ENTRY" >&5
-$as_echo "$gl_cv_acl_ACL_FIRST_ENTRY" >&6; }
-             if test $gl_cv_acl_ACL_FIRST_ENTRY = yes; then
-
-$as_echo "#define HAVE_ACL_FIRST_ENTRY 1" >>confdefs.h
-
-             fi
-                          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ACL_TYPE_EXTENDED" >&5
-$as_echo_n "checking for ACL_TYPE_EXTENDED... " >&6; }
-if ${gl_cv_acl_ACL_TYPE_EXTENDED+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/acl.h>
-int type = ACL_TYPE_EXTENDED;
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_acl_ACL_TYPE_EXTENDED=yes
-else
-  gl_cv_acl_ACL_TYPE_EXTENDED=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_acl_ACL_TYPE_EXTENDED" >&5
-$as_echo "$gl_cv_acl_ACL_TYPE_EXTENDED" >&6; }
-             if test $gl_cv_acl_ACL_TYPE_EXTENDED = yes; then
-
-$as_echo "#define HAVE_ACL_TYPE_EXTENDED 1" >>confdefs.h
-
-             fi
-           else
-             LIB_ACL=
-           fi
-
-fi
-
-      fi
-
-            if test $use_acl = 0; then
-        for ac_func in facl
-do :
-  ac_fn_c_check_func "$LINENO" "facl" "ac_cv_func_facl"
-if test "x$ac_cv_func_facl" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_FACL 1
-_ACEOF
-
-fi
-done
-
-        if test $ac_cv_func_facl = yes; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing acl_trivial" >&5
-$as_echo_n "checking for library containing acl_trivial... " >&6; }
-if ${ac_cv_search_acl_trivial+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char acl_trivial ();
-int
-main ()
-{
-return acl_trivial ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' sec; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_acl_trivial=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_acl_trivial+:} false; then :
-  break
-fi
-done
-if ${ac_cv_search_acl_trivial+:} false; then :
-
-else
-  ac_cv_search_acl_trivial=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_acl_trivial" >&5
-$as_echo "$ac_cv_search_acl_trivial" >&6; }
-ac_res=$ac_cv_search_acl_trivial
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-  if test "$ac_cv_search_acl_trivial" != "none required"; then
-               LIB_ACL=$ac_cv_search_acl_trivial
-             fi
-
-fi
-
-          for ac_func in acl_trivial
-do :
-  ac_fn_c_check_func "$LINENO" "acl_trivial" "ac_cv_func_acl_trivial"
-if test "x$ac_cv_func_acl_trivial" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_ACL_TRIVIAL 1
-_ACEOF
-
-fi
-done
-
-          use_acl=1
-        fi
-      fi
-
-            if test $use_acl = 0; then
-        for ac_func in getacl
-do :
-  ac_fn_c_check_func "$LINENO" "getacl" "ac_cv_func_getacl"
-if test "x$ac_cv_func_getacl" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_GETACL 1
-_ACEOF
-
-fi
-done
-
-        if test $ac_cv_func_getacl = yes; then
-          use_acl=1
-        fi
-                for ac_header in aclv.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "aclv.h" "ac_cv_header_aclv_h" "#include <sys/types.h>
-"
-if test "x$ac_cv_header_aclv_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_ACLV_H 1
-_ACEOF
-
-fi
-
-done
-
-      fi
-
-            if test $use_acl = 0; then
-        for ac_func in aclx_get
-do :
-  ac_fn_c_check_func "$LINENO" "aclx_get" "ac_cv_func_aclx_get"
-if test "x$ac_cv_func_aclx_get" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_ACLX_GET 1
-_ACEOF
-
-fi
-done
-
-        if test $ac_cv_func_aclx_get = yes; then
-          use_acl=1
-        fi
-      fi
-
-            if test $use_acl = 0 || test "$ac_cv_func_aclx_get" = yes; then
-        for ac_func in statacl
-do :
-  ac_fn_c_check_func "$LINENO" "statacl" "ac_cv_func_statacl"
-if test "x$ac_cv_func_statacl" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_STATACL 1
-_ACEOF
-
-fi
-done
-
-        if test $ac_cv_func_statacl = yes; then
-          use_acl=1
-        fi
-      fi
-
-            if test $use_acl = 0; then
-        for ac_func in aclsort
-do :
-  ac_fn_c_check_func "$LINENO" "aclsort" "ac_cv_func_aclsort"
-if test "x$ac_cv_func_aclsort" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_ACLSORT 1
-_ACEOF
-
-fi
-done
-
-        if test $ac_cv_func_aclsort = yes; then
-          use_acl=1
-        fi
-      fi
-
-      LIBS=$ac_save_LIBS
-    fi
-    if test "x$enable_acl$use_acl" = "xyes0"; then
-      as_fn_error $? "ACLs enabled but support not detected" "$LINENO" 5
-    elif test "x$enable_acl$use_acl" = "xauto0"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libacl development library was not found or not usable." >&5
-$as_echo "$as_me: WARNING: libacl development library was not found or not usable." >&2;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GNU coreutils will be built without ACL support." >&5
-$as_echo "$as_me: WARNING: GNU coreutils will be built without ACL support." >&2;}
-    fi
-  fi
-
-
-cat >>confdefs.h <<_ACEOF
-#define USE_ACL $use_acl
-_ACEOF
-
-  USE_ACL=$use_acl
-
-
-
 
   if test $ac_cv_func_alloca_works = no; then
     :
@@ -25022,36 +24382,40 @@ else
              if test $ac_cv_header_arpa_inet_h = yes; then
 
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <arpa/inet.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-
-               gl_header_literal_regex=`echo 'arpa/inet.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_arpa_inet_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'arpa/inet.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_arpa_inet_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_arpa_inet_h
+           gl_cv_next_arpa_inet_h='"'$gl_header'"'
           else
                gl_cv_next_arpa_inet_h='<'arpa/inet.h'>'
              fi
@@ -25861,22 +25225,376 @@ $as_echo "#define GNULIB_TEST_CLOSEDIR 1" >>confdefs.h
     localedir='${datarootdir}/locale'
 
   fi
+    if test "x$runstatedir" = x; then
+    runstatedir='${localstatedir}/run'
+
+  fi
 
       pkglibexecdir='${libexecdir}/${PACKAGE}'
 
 
 
 
-  :
 
 
 
-  :
 
 
 
 
+# Check whether --with-openssl was given.
+if test "${with_openssl+set}" = set; then :
+  withval=$with_openssl;
+else
+  with_openssl=$with_openssl_default
+fi
+
+
+  if test "xMD5" = xMD5; then
+    ALG_header=md5.h
+  else
+    ALG_header=sha.h
+  fi
+
+
+  if test "x$with_openssl" != xno; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MD5 in -lcrypto" >&5
+$as_echo_n "checking for MD5 in -lcrypto... " >&6; }
+if ${ac_cv_lib_crypto_MD5+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcrypto  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char MD5 ();
+int
+main ()
+{
+return MD5 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_crypto_MD5=yes
+else
+  ac_cv_lib_crypto_MD5=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_MD5" >&5
+$as_echo "$ac_cv_lib_crypto_MD5" >&6; }
+if test "x$ac_cv_lib_crypto_MD5" = xyes; then :
+  for ac_header in openssl/$ALG_header
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+ LIB_CRYPTO=-lcrypto
+
+$as_echo "#define HAVE_OPENSSL_MD5 1" >>confdefs.h
+
+fi
+
+done
+
+fi
+
+    if test "x$LIB_CRYPTO" = x; then
+      if test "x$with_openssl" = xyes; then
+        as_fn_error $? "openssl development library not found for MD5" "$LINENO" 5
+      elif test "x$with_openssl" = xoptional; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: openssl development library not found for MD5" >&5
+$as_echo "$as_me: WARNING: openssl development library not found for MD5" >&2;}
+      fi
+    fi
+  fi
+
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-openssl was given.
+if test "${with_openssl+set}" = set; then :
+  withval=$with_openssl;
+else
+  with_openssl=$with_openssl_default
+fi
+
+
+  if test "xSHA1" = xMD5; then
+    ALG_header=md5.h
+  else
+    ALG_header=sha.h
+  fi
+
+
+  if test "x$with_openssl" != xno; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHA1 in -lcrypto" >&5
+$as_echo_n "checking for SHA1 in -lcrypto... " >&6; }
+if ${ac_cv_lib_crypto_SHA1+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcrypto  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char SHA1 ();
+int
+main ()
+{
+return SHA1 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_crypto_SHA1=yes
+else
+  ac_cv_lib_crypto_SHA1=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_SHA1" >&5
+$as_echo "$ac_cv_lib_crypto_SHA1" >&6; }
+if test "x$ac_cv_lib_crypto_SHA1" = xyes; then :
+  for ac_header in openssl/$ALG_header
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+ LIB_CRYPTO=-lcrypto
+
+$as_echo "#define HAVE_OPENSSL_SHA1 1" >>confdefs.h
+
+fi
+
+done
+
+fi
+
+    if test "x$LIB_CRYPTO" = x; then
+      if test "x$with_openssl" = xyes; then
+        as_fn_error $? "openssl development library not found for SHA1" "$LINENO" 5
+      elif test "x$with_openssl" = xoptional; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: openssl development library not found for SHA1" >&5
+$as_echo "$as_me: WARNING: openssl development library not found for SHA1" >&2;}
+      fi
+    fi
+  fi
+
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-openssl was given.
+if test "${with_openssl+set}" = set; then :
+  withval=$with_openssl;
+else
+  with_openssl=$with_openssl_default
+fi
+
+
+  if test "xSHA256" = xMD5; then
+    ALG_header=md5.h
+  else
+    ALG_header=sha.h
+  fi
+
+
+  if test "x$with_openssl" != xno; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHA256 in -lcrypto" >&5
+$as_echo_n "checking for SHA256 in -lcrypto... " >&6; }
+if ${ac_cv_lib_crypto_SHA256+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcrypto  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char SHA256 ();
+int
+main ()
+{
+return SHA256 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_crypto_SHA256=yes
+else
+  ac_cv_lib_crypto_SHA256=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_SHA256" >&5
+$as_echo "$ac_cv_lib_crypto_SHA256" >&6; }
+if test "x$ac_cv_lib_crypto_SHA256" = xyes; then :
+  for ac_header in openssl/$ALG_header
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+ LIB_CRYPTO=-lcrypto
+
+$as_echo "#define HAVE_OPENSSL_SHA256 1" >>confdefs.h
+
+fi
+
+done
+
+fi
 
+    if test "x$LIB_CRYPTO" = x; then
+      if test "x$with_openssl" = xyes; then
+        as_fn_error $? "openssl development library not found for SHA256" "$LINENO" 5
+      elif test "x$with_openssl" = xoptional; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: openssl development library not found for SHA256" >&5
+$as_echo "$as_me: WARNING: openssl development library not found for SHA256" >&2;}
+      fi
+    fi
+  fi
+
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-openssl was given.
+if test "${with_openssl+set}" = set; then :
+  withval=$with_openssl;
+else
+  with_openssl=$with_openssl_default
+fi
+
+
+  if test "xSHA512" = xMD5; then
+    ALG_header=md5.h
+  else
+    ALG_header=sha.h
+  fi
+
+
+  if test "x$with_openssl" != xno; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHA512 in -lcrypto" >&5
+$as_echo_n "checking for SHA512 in -lcrypto... " >&6; }
+if ${ac_cv_lib_crypto_SHA512+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcrypto  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char SHA512 ();
+int
+main ()
+{
+return SHA512 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_crypto_SHA512=yes
+else
+  ac_cv_lib_crypto_SHA512=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_SHA512" >&5
+$as_echo "$ac_cv_lib_crypto_SHA512" >&6; }
+if test "x$ac_cv_lib_crypto_SHA512" = xyes; then :
+  for ac_header in openssl/$ALG_header
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+ LIB_CRYPTO=-lcrypto
+
+$as_echo "#define HAVE_OPENSSL_SHA512 1" >>confdefs.h
+
+fi
+
+done
+
+fi
+
+    if test "x$LIB_CRYPTO" = x; then
+      if test "x$with_openssl" = xyes; then
+        as_fn_error $? "openssl development library not found for SHA512" "$LINENO" 5
+      elif test "x$with_openssl" = xoptional; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: openssl development library not found for SHA512" >&5
+$as_echo "$as_me: WARNING: openssl development library not found for SHA512" >&2;}
+      fi
+    fi
+  fi
 
 
 
@@ -25899,36 +25617,40 @@ if ${gl_cv_next_ctype_h+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ctype.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'ctype.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
 
-               gl_header_literal_regex=`echo 'ctype.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_ctype_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+        gl_cv_absolute_ctype_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_ctype_h
+           gl_cv_next_ctype_h='"'$gl_header'"'
 
 
 fi
@@ -25984,7 +25706,7 @@ DIR *dp = opendir (".");
              e = readdir (dp);
              if (! e)
                return 2;
-             if (stat (e->d_name, &st) != 0)
+             if (lstat (e->d_name, &st) != 0)
                return 3;
              if (e->d_ino != st.st_ino)
                return 4;
@@ -26077,36 +25799,40 @@ else
              if test $ac_cv_header_dirent_h = yes; then
 
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <dirent.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-
-               gl_header_literal_regex=`echo 'dirent.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_dirent_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'dirent.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_dirent_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_dirent_h
+           gl_cv_next_dirent_h='"'$gl_header'"'
           else
                gl_cv_next_dirent_h='<'dirent.h'>'
              fi
@@ -26398,6 +26124,7 @@ $as_echo "#define GNULIB_TEST_DUP 1" >>confdefs.h
 
 
 
+
 $as_echo "#define HAVE_DUP2 1" >>confdefs.h
 
 
@@ -26416,7 +26143,9 @@ else
            linux*) # On linux between 2008-07-27 and 2009-05-11, dup2 of a
                    # closed fd may yield -EBADF instead of -1 / errno=EBADF.
              gl_cv_func_dup2_works="guessing no" ;;
-           freebsd*) # on FreeBSD 6.1, dup2(1,1000000) gives EMFILE, not EBADF.
+           aix* | freebsd*)
+                   # on AIX 7.1 and FreeBSD 6.1, dup2 (1,toobig) gives EMFILE,
+                   # not EBADF.
              gl_cv_func_dup2_works="guessing no" ;;
            haiku*) # on Haiku alpha 2, dup2(1, 1) resets FD_CLOEXEC.
              gl_cv_func_dup2_works="guessing no" ;;
@@ -26433,6 +26162,11 @@ int
 main ()
 {
 int result = 0;
+#ifdef HAVE_GETDTABLESIZE
+            int bad_fd = getdtablesize ();
+#else
+            int bad_fd = 1000000;
+#endif
 #ifdef FD_CLOEXEC
             if (fcntl (1, F_SETFD, FD_CLOEXEC) == -1)
               result |= 1;
@@ -26447,11 +26181,13 @@ int result = 0;
             if (dup2 (0, 0) != -1)
               result |= 8;
             /* Many gnulib modules require POSIX conformance of EBADF.  */
-            if (dup2 (2, 1000000) == -1 && errno != EBADF)
+            if (dup2 (2, bad_fd) == -1 && errno != EBADF)
               result |= 16;
-            /* Flush out a cygwin core dump.  */
+            /* Flush out some cygwin core dumps.  */
             if (dup2 (2, -1) != -1 || errno != EBADF)
               result |= 32;
+            dup2 (2, 255);
+            dup2 (2, 256);
             return result;
 
   ;
@@ -26476,6 +26212,17 @@ $as_echo "$gl_cv_func_dup2_works" >&6; }
       *yes) ;;
       *)
         REPLACE_DUP2=1
+        for ac_func in setdtablesize
+do :
+  ac_fn_c_check_func "$LINENO" "setdtablesize" "ac_cv_func_setdtablesize"
+if test "x$ac_cv_func_setdtablesize" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SETDTABLESIZE 1
+_ACEOF
+
+fi
+done
+
         ;;
     esac
   fi
@@ -26900,11 +26647,6 @@ $as_echo "#define GNULIB_TEST_FACCESSAT 1" >>confdefs.h
 
 
 
-  :
-
-
-
-
 
 
   if test $ac_cv_have_decl_fchdir = no; then
@@ -27202,7 +26944,7 @@ if ${gl_cv_func_fflush_stdin+:} false; then :
 else
   echo hello world > conftest.txt
      if test "$cross_compiling" = yes; then :
-        gl_cv_func_fflush_stdin=no
+  gl_cv_func_fflush_stdin=cross
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -27271,8 +27013,18 @@ fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fflush_stdin" >&5
 $as_echo "$gl_cv_func_fflush_stdin" >&6; }
+  case $gl_cv_func_fflush_stdin in
+    yes) gl_func_fflush_stdin=1 ;;
+    no)  gl_func_fflush_stdin=0 ;;
+    *)   gl_func_fflush_stdin='(-1)' ;;
+  esac
+
+cat >>confdefs.h <<_ACEOF
+#define FUNC_FFLUSH_STDIN $gl_func_fflush_stdin
+_ACEOF
 
-  if test $gl_cv_func_fflush_stdin = no; then
+
+  if test $gl_cv_func_fflush_stdin != yes; then
     REPLACE_FCLOSE=1
   fi
 
@@ -27339,6 +27091,9 @@ else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+#ifdef HAVE_GETDTABLESIZE
+# include <unistd.h>
+#endif
 #include <fcntl.h>
 #include <errno.h>
 
@@ -27346,8 +27101,15 @@ int
 main ()
 {
 int result = 0;
+#ifdef HAVE_GETDTABLESIZE
+      int bad_fd = getdtablesize ();
+#else
+      int bad_fd = 1000000;
+#endif
       if (fcntl (0, F_DUPFD, -1) != -1) result |= 1;
       if (errno != EINVAL) result |= 2;
+      if (fcntl (0, F_DUPFD, bad_fd) != -1) result |= 4;
+      if (errno != EINVAL) result |= 8;
       return result;
 
   ;
@@ -27514,36 +27276,40 @@ if ${gl_cv_next_fcntl_h+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <fcntl.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'fcntl.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
 
-               gl_header_literal_regex=`echo 'fcntl.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_fcntl_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+        gl_cv_absolute_fcntl_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_fcntl_h
+           gl_cv_next_fcntl_h='"'$gl_header'"'
 
 
 fi
@@ -27922,7 +27688,7 @@ if ${gl_cv_func_fflush_stdin+:} false; then :
 else
   echo hello world > conftest.txt
      if test "$cross_compiling" = yes; then :
-        gl_cv_func_fflush_stdin=no
+  gl_cv_func_fflush_stdin=cross
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -27991,8 +27757,18 @@ fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fflush_stdin" >&5
 $as_echo "$gl_cv_func_fflush_stdin" >&6; }
+  case $gl_cv_func_fflush_stdin in
+    yes) gl_func_fflush_stdin=1 ;;
+    no)  gl_func_fflush_stdin=0 ;;
+    *)   gl_func_fflush_stdin='(-1)' ;;
+  esac
 
-  if test $gl_cv_func_fflush_stdin = no; then
+cat >>confdefs.h <<_ACEOF
+#define FUNC_FFLUSH_STDIN $gl_func_fflush_stdin
+_ACEOF
+
+
+  if test $gl_cv_func_fflush_stdin != yes; then
     REPLACE_FFLUSH=1
   fi
 
@@ -28255,36 +28031,40 @@ if ${gl_cv_next_float_h+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <float.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'float.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_float_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
 
-               gl_header_literal_regex=`echo 'float.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_float_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+           gl_header=$gl_cv_absolute_float_h
+           gl_cv_next_float_h='"'$gl_header'"'
 
 
 fi
@@ -28652,14 +28432,42 @@ _ACEOF
 
 
 
-
   fp_headers='
-#     include <stdio.h>
-#     if HAVE_STDIO_EXT_H
-#      include <stdio_ext.h>
-#     endif
-'
-  ac_fn_c_check_decl "$LINENO" "__fpending" "ac_cv_have_decl___fpending" "$fp_headers
+    #include <stdio.h>
+    #if HAVE_STDIO_EXT_H
+    # include <stdio_ext.h>
+    #endif
+  '
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __fpending" >&5
+$as_echo_n "checking for __fpending... " >&6; }
+if ${gl_cv_func___fpending+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$fp_headers
+int
+main ()
+{
+return ! __fpending (stdin);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  gl_cv_func___fpending=yes
+else
+  gl_cv_func___fpending=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func___fpending" >&5
+$as_echo "$gl_cv_func___fpending" >&6; }
+  if test $gl_cv_func___fpending = yes; then
+    ac_fn_c_check_decl "$LINENO" "__fpending" "ac_cv_have_decl___fpending" "$fp_headers
 "
 if test "x$ac_cv_have_decl___fpending" = xyes; then :
   ac_have_decl=1
@@ -28671,8 +28479,9 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL___FPENDING $ac_have_decl
 _ACEOF
 
+  fi
 
-  if test $ac_cv_func___fpending = no; then
+  if test $gl_cv_func___fpending = no; then
 
 
 
@@ -28973,7 +28782,8 @@ else
 #include <float.h>
 #include <math.h>
 #include <string.h>
-#if HAVE_ALARM
+#if HAVE_DECL_ALARM
+# include <signal.h>
 # include <unistd.h>
 #endif
 /* HP cc on HP-UX 10.20 has a bug with the constant expression -0.0.
@@ -28996,9 +28806,10 @@ int main()
   int i;
   volatile double x;
   double zero = 0.0;
-#if HAVE_ALARM
+#if HAVE_DECL_ALARM
   /* NeXTstep 3.3 frexp() runs into an endless loop when called on an infinite
      number.  Let the test fail in this case.  */
+  signal (SIGALRM, SIG_DFL);
   alarm (5);
 #endif
   /* Test on denormalized numbers.  */
@@ -29396,7 +29207,7 @@ if ${gl_cv_func_fflush_stdin+:} false; then :
 else
   echo hello world > conftest.txt
      if test "$cross_compiling" = yes; then :
-        gl_cv_func_fflush_stdin=no
+  gl_cv_func_fflush_stdin=cross
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -29465,8 +29276,18 @@ fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fflush_stdin" >&5
 $as_echo "$gl_cv_func_fflush_stdin" >&6; }
+  case $gl_cv_func_fflush_stdin in
+    yes) gl_func_fflush_stdin=1 ;;
+    no)  gl_func_fflush_stdin=0 ;;
+    *)   gl_func_fflush_stdin='(-1)' ;;
+  esac
+
+cat >>confdefs.h <<_ACEOF
+#define FUNC_FFLUSH_STDIN $gl_func_fflush_stdin
+_ACEOF
 
-      if test $gl_cv_func_fflush_stdin = no; then
+
+      if test $gl_cv_func_fflush_stdin != yes; then
         REPLACE_FSEEKO=1
       fi
 
@@ -31189,6 +31010,9 @@ else
 # define is_ENAMETOOLONG(x) 0
 #endif
 
+/* Use the getcwd function, not any macro.  */
+#undef getcwd
+
 /* Don't get link errors because mkdir is redefined to rpl_mkdir.  */
 #undef mkdir
 
@@ -31375,6 +31199,7 @@ else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+#include <errno.h>
 #include <stdlib.h>
 #if HAVE_UNISTD_H
 # include <unistd.h>
@@ -31516,7 +31341,7 @@ fi
       ;;
   esac
       case "$gl_cv_func_getcwd_path_max" in
-    "no, it has the AIX bug") ;;
+    "no"|"no, it has the AIX bug") ;;
     *)
 
 $as_echo "#define HAVE_MINIMALLY_WORKING_GETCWD 1" >>confdefs.h
@@ -31766,11 +31591,62 @@ $as_echo "#define GNULIB_TEST_GETDELIM 1" >>confdefs.h
 
 
 
-  if test $ac_cv_func_getdtablesize != yes; then
+
+  if test $ac_cv_func_getdtablesize = yes; then
+    # Cygwin 1.7.25 automatically increases the RLIMIT_NOFILE soft limit
+    # up to an unchangeable hard limit; all other platforms correctly
+    # require setrlimit before getdtablesize() can report a larger value.
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getdtablesize works" >&5
+$as_echo_n "checking whether getdtablesize works... " >&6; }
+if ${gl_cv_func_getdtablesize_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  case "$host_os" in
+          cygwin*) # on cygwin 1.5.25, getdtablesize() automatically grows
+            gl_cv_func_getdtablesize_works="guessing no" ;;
+          *) gl_cv_func_getdtablesize_works="guessing yes" ;;
+         esac
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+        #include <unistd.h>
+int
+main ()
+{
+int size = getdtablesize();
+           if (dup2 (0, getdtablesize()) != -1)
+             return 1;
+           if (size != getdtablesize())
+             return 2;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_getdtablesize_works=yes
+else
+  gl_cv_func_getdtablesize_works=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getdtablesize_works" >&5
+$as_echo "$gl_cv_func_getdtablesize_works" >&6; }
+    case "$gl_cv_func_getdtablesize_works" in
+      *yes) ;;
+      *) REPLACE_GETDTABLESIZE=1 ;;
+    esac
+  else
     HAVE_GETDTABLESIZE=0
   fi
 
-  if test $HAVE_GETDTABLESIZE = 0; then
+  if test $HAVE_GETDTABLESIZE = 0 || test $REPLACE_GETDTABLESIZE = 1; then
 
 
 
@@ -33255,12 +33131,8 @@ $as_echo "$gl_cv_func_gettimeofday_clobber" >&6; }
    *yes)
      REPLACE_GETTIMEOFDAY=1
 
-
-$as_echo "#define gmtime rpl_gmtime" >>confdefs.h
-
-
-$as_echo "#define localtime rpl_localtime" >>confdefs.h
-
+  REPLACE_GMTIME=1
+  REPLACE_LOCALTIME=1
 
 
 $as_echo "#define GETTIMEOFDAY_CLOBBERS_LOCALTIME 1" >>confdefs.h
@@ -33395,12 +33267,8 @@ $as_echo "#define HAVE_RUN_TZSET_TEST 1" >>confdefs.h
         *yes)
           REPLACE_GETTIMEOFDAY=1
 
-
-$as_echo "#define gmtime rpl_gmtime" >>confdefs.h
-
-
-$as_echo "#define localtime rpl_localtime" >>confdefs.h
-
+  REPLACE_GMTIME=1
+  REPLACE_LOCALTIME=1
 
 
 $as_echo "#define tzset rpl_tzset" >>confdefs.h
@@ -33827,36 +33695,40 @@ else
              if test $ac_cv_header_iconv_h = yes; then
 
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <iconv.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-
-               gl_header_literal_regex=`echo 'iconv.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_iconv_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'iconv.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_iconv_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_iconv_h
+           gl_cv_next_iconv_h='"'$gl_header'"'
           else
                gl_cv_next_iconv_h='<'iconv.h'>'
              fi
@@ -35419,36 +35291,40 @@ else
              if test $ac_cv_header_langinfo_h = yes; then
 
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <langinfo.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-
-               gl_header_literal_regex=`echo 'langinfo.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_langinfo_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'langinfo.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_langinfo_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_langinfo_h
+           gl_cv_next_langinfo_h='"'$gl_header'"'
           else
                gl_cv_next_langinfo_h='<'langinfo.h'>'
              fi
@@ -36283,36 +36159,40 @@ if ${gl_cv_next_locale_h+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <locale.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'locale.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_locale_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
 
-               gl_header_literal_regex=`echo 'locale.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_locale_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+           gl_header=$gl_cv_absolute_locale_h
+           gl_cv_next_locale_h='"'$gl_header'"'
 
 
 fi
@@ -36408,6 +36288,9 @@ main ()
 
 #if __FreeBSD__ == 4
 error "No, in FreeBSD 4.0 recursive mutexes actually don't work."
+#elif (defined __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ \
+       && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070)
+error "No, in Mac OS X < 10.7 recursive mutexes actually don't work."
 #else
 int x = (int)PTHREAD_MUTEX_RECURSIVE;
 return !x;
@@ -36428,6 +36311,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 
+cat >>confdefs.h <<_ACEOF
+#define GNULIB_LOCK 1
+_ACEOF
+
+
+
+
 
 
 
@@ -36587,6 +36477,7 @@ $as_echo "#define GNULIB_TEST_LSTAT 1" >>confdefs.h
 
 
 
+
       for ac_header in stdlib.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
@@ -36741,36 +36632,40 @@ else
              if test $ac_cv_header_math_h = yes; then
 
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <math.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-
-               gl_header_literal_regex=`echo 'math.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_math_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'math.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_math_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_math_h
+           gl_cv_next_math_h='"'$gl_header'"'
           else
                gl_cv_next_math_h='<'math.h'>'
              fi
@@ -37466,6 +37361,49 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_nul_retval" >&5
 $as_echo "$gl_cv_func_mbrtowc_nul_retval" >&6; }
 
+
+
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works on empty input" >&5
+$as_echo_n "checking whether mbrtowc works on empty input... " >&6; }
+if ${gl_cv_func_mbrtowc_empty_input+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                  case "$host_os" in
+                     # Guess no on AIX and glibc systems.
+        aix* | *-gnu*)
+                    gl_cv_func_mbrtowc_empty_input="guessing no" ;;
+        *)          gl_cv_func_mbrtowc_empty_input="guessing yes" ;;
+      esac
+      if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+           #include <wchar.h>
+           static wchar_t wc;
+           static mbstate_t mbs;
+           int
+           main (void)
+           {
+             return mbrtowc (&wc, "", 0, &mbs) == (size_t) -2;
+           }
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_mbrtowc_empty_input=no
+else
+  gl_cv_func_mbrtowc_empty_input=yes
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_empty_input" >&5
+$as_echo "$gl_cv_func_mbrtowc_empty_input" >&6; }
+
       case "$gl_cv_func_mbrtowc_null_arg1" in
         *yes) ;;
         *)
@@ -37498,6 +37436,14 @@ $as_echo "#define MBRTOWC_NUL_RETVAL_BUG 1" >>confdefs.h
            REPLACE_MBRTOWC=1
            ;;
       esac
+      case "$gl_cv_func_mbrtowc_empty_input" in
+        *yes) ;;
+        *)
+$as_echo "#define MBRTOWC_EMPTY_INPUT_BUG 1" >>confdefs.h
+
+           REPLACE_MBRTOWC=1
+           ;;
+      esac
     fi
   fi
 
@@ -38910,8 +38856,8 @@ else
 # include <unistd.h>
 #endif
 
-#ifndef HAVE_ALARM
-# define alarm(X) /* empty */
+#if HAVE_DECL_ALARM
+# include <signal.h>
 #endif
 
 /* Work around redefinition to rpl_putenv by other config tests.  */
@@ -39047,10 +38993,13 @@ main ()
   int time_t_signed_magnitude = (time_t) ~ (time_t) 0 < (time_t) -1;
   int time_t_signed = ! ((time_t) 0 < (time_t) -1);
 
+#if HAVE_DECL_ALARM
   /* This test makes some buggy mktime implementations loop.
      Give up after 60 seconds; a mktime slower than that
      isn't worth using anyway.  */
+  signal (SIGALRM, SIG_DFL);
   alarm (60);
+#endif
 
   time_t_max = (! time_t_signed
                 ? (time_t) -1
@@ -39443,6 +39392,17 @@ $as_echo "$fu_cv_sys_mounted_getmntent1" >&6; }
 
 $as_echo "#define MOUNTED_GETMNTENT1 1" >>confdefs.h
 
+      for ac_func in hasmntopt
+do :
+  ac_fn_c_check_func "$LINENO" "hasmntopt" "ac_cv_func_hasmntopt"
+if test "x$ac_cv_func_hasmntopt" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_HASMNTOPT 1
+_ACEOF
+
+fi
+done
+
     fi
   fi
 
@@ -40125,36 +40085,40 @@ else
              if test $ac_cv_header_netdb_h = yes; then
 
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <netdb.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-
-               gl_header_literal_regex=`echo 'netdb.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_netdb_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'netdb.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_netdb_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_netdb_h
+           gl_cv_next_netdb_h='"'$gl_header'"'
           else
                gl_cv_next_netdb_h='<'netdb.h'>'
              fi
@@ -40252,36 +40216,40 @@ else
              if test $ac_cv_header_netinet_in_h = yes; then
 
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <netinet/in.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-
-               gl_header_literal_regex=`echo 'netinet/in.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_netinet_in_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'netinet/in.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_netinet_in_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_netinet_in_h
+           gl_cv_next_netinet_in_h='"'$gl_header'"'
           else
                gl_cv_next_netinet_in_h='<'netinet/in.h'>'
              fi
@@ -40983,7 +40951,7 @@ fi
 done
 
 
-  for ac_func in pstat_getstatic pstat_getdynamic sysmp getsysinfo sysctl table
+  for ac_func in pstat_getstatic pstat_getdynamic sysmp getsysinfo sysctl table sysinfo
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -40995,7 +40963,16 @@ _ACEOF
 fi
 done
 
+  ac_fn_c_check_member "$LINENO" "struct sysinfo" "mem_unit" "ac_cv_member_struct_sysinfo_mem_unit" "#include <sys/sysinfo.h>
+"
+if test "x$ac_cv_member_struct_sysinfo_mem_unit" = xyes; then :
 
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_SYSINFO_MEM_UNIT 1
+_ACEOF
+
+
+fi
 
 
 
@@ -41003,30 +40980,35 @@ done
 
 
 
-  if test $ac_cv_func_pipe2 != yes; then
-    HAVE_PIPE2=0
+  if test $ac_cv_func_pipe != yes; then
+    HAVE_PIPE=0
   fi
 
+  if test $HAVE_PIPE = 0; then
+
 
 
 
 
 
-          GNULIB_PIPE2=1
 
 
+  gl_LIBOBJS="$gl_LIBOBJS pipe.$ac_objext"
 
+  fi
 
 
-$as_echo "#define GNULIB_TEST_PIPE2 1" >>confdefs.h
 
 
 
+          GNULIB_PIPE=1
 
 
-cat >>confdefs.h <<_ACEOF
-#define GNULIB_PIPE2_SAFER 1
-_ACEOF
+
+
+
+$as_echo "#define GNULIB_TEST_PIPE 1" >>confdefs.h
+
 
 
 
@@ -41085,500 +41067,6 @@ $as_echo "$gl_cv_posix_shell" >&6; }
 
 
 
-
-
-
-
-
-  if test $REPLACE_POSIX_SPAWN = 1; then
-    REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE=1
-  else
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether posix_spawn_file_actions_addclose works" >&5
-$as_echo_n "checking whether posix_spawn_file_actions_addclose works... " >&6; }
-if ${gl_cv_func_posix_spawn_file_actions_addclose_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  # Guess no on Solaris, yes otherwise.
-          case "$host_os" in
-            solaris*) gl_cv_func_posix_spawn_file_actions_addclose_works="guessing no";;
-            *)        gl_cv_func_posix_spawn_file_actions_addclose_works="guessing yes";;
-          esac
-
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <spawn.h>
-int main ()
-{
-  posix_spawn_file_actions_t actions;
-  if (posix_spawn_file_actions_init (&actions) != 0)
-    return 1;
-  if (posix_spawn_file_actions_addclose (&actions, 10000000) == 0)
-    return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_posix_spawn_file_actions_addclose_works=yes
-else
-  gl_cv_func_posix_spawn_file_actions_addclose_works=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_posix_spawn_file_actions_addclose_works" >&5
-$as_echo "$gl_cv_func_posix_spawn_file_actions_addclose_works" >&6; }
-    case "$gl_cv_func_posix_spawn_file_actions_addclose_works" in
-      *yes) ;;
-      *) REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE=1 ;;
-    esac
-  fi
-
-  if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = 1; then
-
-
-
-
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS spawn_faction_addclose.$ac_objext"
-
-  fi
-
-
-
-
-
-          GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE=1
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE 1" >>confdefs.h
-
-
-
-
-
-
-
-
-
-  if test $REPLACE_POSIX_SPAWN = 1; then
-    REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2=1
-  else
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether posix_spawn_file_actions_adddup2 works" >&5
-$as_echo_n "checking whether posix_spawn_file_actions_adddup2 works... " >&6; }
-if ${gl_cv_func_posix_spawn_file_actions_adddup2_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  # Guess no on Solaris, yes otherwise.
-          case "$host_os" in
-            solaris*) gl_cv_func_posix_spawn_file_actions_adddup2_works="guessing no";;
-            *)        gl_cv_func_posix_spawn_file_actions_adddup2_works="guessing yes";;
-          esac
-
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <spawn.h>
-int main ()
-{
-  posix_spawn_file_actions_t actions;
-  if (posix_spawn_file_actions_init (&actions) != 0)
-    return 1;
-  if (posix_spawn_file_actions_adddup2 (&actions, 10000000, 2) == 0)
-    return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_posix_spawn_file_actions_adddup2_works=yes
-else
-  gl_cv_func_posix_spawn_file_actions_adddup2_works=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_posix_spawn_file_actions_adddup2_works" >&5
-$as_echo "$gl_cv_func_posix_spawn_file_actions_adddup2_works" >&6; }
-    case "$gl_cv_func_posix_spawn_file_actions_adddup2_works" in
-      *yes) ;;
-      *) REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2=1 ;;
-    esac
-  fi
-
-  if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = 1; then
-
-
-
-
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS spawn_faction_adddup2.$ac_objext"
-
-  fi
-
-
-
-
-
-          GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2=1
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 1" >>confdefs.h
-
-
-
-
-
-
-
-
-
-  if test $REPLACE_POSIX_SPAWN = 1; then
-    REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN=1
-  else
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether posix_spawn_file_actions_addopen works" >&5
-$as_echo_n "checking whether posix_spawn_file_actions_addopen works... " >&6; }
-if ${gl_cv_func_posix_spawn_file_actions_addopen_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  # Guess no on Solaris, yes otherwise.
-          case "$host_os" in
-            solaris*) gl_cv_func_posix_spawn_file_actions_addopen_works="guessing no";;
-            *)        gl_cv_func_posix_spawn_file_actions_addopen_works="guessing yes";;
-          esac
-
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <spawn.h>
-#include <fcntl.h>
-int main ()
-{
-  posix_spawn_file_actions_t actions;
-  if (posix_spawn_file_actions_init (&actions) != 0)
-    return 1;
-  if (posix_spawn_file_actions_addopen (&actions, 10000000, "foo", 0, O_RDONLY)
-      == 0)
-    return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_posix_spawn_file_actions_addopen_works=yes
-else
-  gl_cv_func_posix_spawn_file_actions_addopen_works=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_posix_spawn_file_actions_addopen_works" >&5
-$as_echo "$gl_cv_func_posix_spawn_file_actions_addopen_works" >&6; }
-    case "$gl_cv_func_posix_spawn_file_actions_addopen_works" in
-      *yes) ;;
-      *) REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN=1 ;;
-    esac
-  fi
-
-  if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = 1; then
-
-
-
-
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS spawn_faction_addopen.$ac_objext"
-
-  fi
-
-
-
-
-
-          GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN=1
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN 1" >>confdefs.h
-
-
-
-
-
-
-  if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
-
-
-
-
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS spawn_faction_destroy.$ac_objext"
-
-  fi
-
-
-
-
-
-          GNULIB_POSIX_SPAWN_FILE_ACTIONS_DESTROY=1
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_POSIX_SPAWN_FILE_ACTIONS_DESTROY 1" >>confdefs.h
-
-
-
-
-
-
-  if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
-
-
-
-
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS spawn_faction_init.$ac_objext"
-
-  fi
-
-
-
-
-
-          GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT=1
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_POSIX_SPAWN_FILE_ACTIONS_INIT 1" >>confdefs.h
-
-
-
-
-
-
-  if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
-
-
-
-
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS spawnattr_destroy.$ac_objext"
-
-  fi
-
-
-
-
-
-          GNULIB_POSIX_SPAWNATTR_DESTROY=1
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_POSIX_SPAWNATTR_DESTROY 1" >>confdefs.h
-
-
-
-
-
-
-  if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
-
-
-
-
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS spawnattr_init.$ac_objext"
-
-  fi
-
-
-
-
-
-          GNULIB_POSIX_SPAWNATTR_INIT=1
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_POSIX_SPAWNATTR_INIT 1" >>confdefs.h
-
-
-
-
-
-
-  if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
-
-
-
-
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS spawnattr_setflags.$ac_objext"
-
-  fi
-
-
-
-
-
-          GNULIB_POSIX_SPAWNATTR_SETFLAGS=1
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_POSIX_SPAWNATTR_SETFLAGS 1" >>confdefs.h
-
-
-
-
-
-
-  if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
-
-
-
-
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS spawnattr_setsigmask.$ac_objext"
-
-  fi
-
-
-
-
-
-          GNULIB_POSIX_SPAWNATTR_SETSIGMASK=1
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_POSIX_SPAWNATTR_SETSIGMASK 1" >>confdefs.h
-
-
-
-
-
-
-  if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
-
-
-
-
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS spawnp.$ac_objext"
-
-
-
-
-
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS spawni.$ac_objext"
-
-
-  for ac_header in paths.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "paths.h" "ac_cv_header_paths_h" "$ac_includes_default"
-if test "x$ac_cv_header_paths_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_PATHS_H 1
-_ACEOF
-
-fi
-
-done
-
-  for ac_func in confstr sched_setparam sched_setscheduler setegid seteuid vfork
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-  fi
-
-
-
-
-
-          GNULIB_POSIX_SPAWNP=1
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_POSIX_SPAWNP 1" >>confdefs.h
-
-
-
-
     :
 
 
@@ -41609,7 +41097,8 @@ else
 #include <float.h>
 #include <math.h>
 #include <string.h>
-#if HAVE_ALARM
+#if HAVE_DECL_ALARM
+# include <signal.h>
 # include <unistd.h>
 #endif
 /* HP cc on HP-UX 10.20 has a bug with the constant expression -0.0.
@@ -41632,9 +41121,10 @@ int main()
   int i;
   volatile double x;
   double zero = 0.0;
-#if HAVE_ALARM
+#if HAVE_DECL_ALARM
   /* NeXTstep 3.3 frexp() runs into an endless loop when called on an infinite
      number.  Let the test fail in this case.  */
+  signal (SIGALRM, SIG_DFL);
   alarm (5);
 #endif
   /* Test on denormalized numbers.  */
@@ -42088,36 +41578,40 @@ else
              if test $ac_cv_header_pthread_h = yes; then
 
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pthread.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-
-               gl_header_literal_regex=`echo 'pthread.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_pthread_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'pthread.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_pthread_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_pthread_h
+           gl_cv_next_pthread_h='"'$gl_header'"'
           else
                gl_cv_next_pthread_h='<'pthread.h'>'
              fi
@@ -42143,6 +41637,37 @@ $as_echo "$gl_cv_next_pthread_h" >&6; }
 
    if test $ac_cv_header_pthread_h = yes; then
      HAVE_PTHREAD_H=1
+     # mingw 3.0 uses winpthreads which installs broken macros via <pthread.h>
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether <pthread.h> pollutes the namespace" >&5
+$as_echo_n "checking whether <pthread.h> pollutes the namespace... " >&6; }
+if ${gl_cv_header_pthread_h_pollution+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <pthread.h>
+            #ifdef strtok_r
+            #error
+             break me
+            #endif
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_header_pthread_h_pollution=no
+else
+  gl_cv_header_pthread_h_pollution=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_pthread_h_pollution" >&5
+$as_echo "$gl_cv_header_pthread_h_pollution" >&6; }
    else
      HAVE_PTHREAD_H=0
    fi
@@ -42195,6 +41720,8 @@ fi
 
   gl_LIBOBJS="$gl_LIBOBJS pthread.$ac_objext"
 
+   elif test $gl_cv_header_pthread_h_pollution = yes; then
+     PTHREAD_H=pthread.h
    else
      PTHREAD_H=
    fi
@@ -42260,6 +41787,13 @@ $as_echo "$gl_cv_lib_pthread" >&6; }
 
 
 
+cat >>confdefs.h <<_ACEOF
+#define GNULIB_PTHREAD 1
+_ACEOF
+
+
+
+
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for putenv compatible with GNU and SVID" >&5
 $as_echo_n "checking for putenv compatible with GNU and SVID... " >&6; }
 if ${gl_cv_func_svid_putenv+:} false; then :
@@ -42330,6 +41864,19 @@ $as_echo "$gl_cv_func_svid_putenv" >&6; }
 
   gl_LIBOBJS="$gl_LIBOBJS putenv.$ac_objext"
 
+
+  ac_fn_c_check_decl "$LINENO" "_putenv" "ac_cv_have_decl__putenv" "$ac_includes_default"
+if test "x$ac_cv_have_decl__putenv" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL__PUTENV $ac_have_decl
+_ACEOF
+
+
   fi
 
 
@@ -42347,101 +41894,494 @@ $as_echo "#define GNULIB_TEST_PUTENV 1" >>confdefs.h
 
 
 
-      :
+  # Check whether --enable-acl was given.
+if test "${enable_acl+set}" = set; then :
+  enableval=$enable_acl;
+else
+  enable_acl=auto
+fi
 
 
-  :
 
+  LIB_ACL=
+  use_acl=0
+  if test "x$enable_acl" != "xno"; then
+        for ac_header in sys/acl.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "sys/acl.h" "ac_cv_header_sys_acl_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_acl_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_ACL_H 1
+_ACEOF
+
+fi
 
+done
 
+    if test $ac_cv_header_sys_acl_h = yes; then
+      ac_save_LIBS=$LIBS
 
+                  if test $use_acl = 0; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing acl_get_file" >&5
+$as_echo_n "checking for library containing acl_get_file... " >&6; }
+if ${ac_cv_search_acl_get_file+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-  for ac_func in raise
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char acl_get_file ();
+int
+main ()
+{
+return acl_get_file ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' acl pacl; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_acl_get_file=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_acl_get_file+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_acl_get_file+:} false; then :
+
+else
+  ac_cv_search_acl_get_file=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_acl_get_file" >&5
+$as_echo "$ac_cv_search_acl_get_file" >&6; }
+ac_res=$ac_cv_search_acl_get_file
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  if test "$ac_cv_search_acl_get_file" != "none required"; then
+             LIB_ACL=$ac_cv_search_acl_get_file
+           fi
+           for ac_func in acl_get_file acl_get_fd acl_set_file acl_set_fd \
+              acl_free acl_from_mode acl_from_text \
+              acl_delete_def_file acl_extended_file \
+              acl_delete_fd_np acl_delete_file_np \
+              acl_copy_ext_native acl_create_entry_np \
+              acl_to_short_text acl_free_text
 do :
-  ac_fn_c_check_func "$LINENO" "raise" "ac_cv_func_raise"
-if test "x$ac_cv_func_raise" = xyes; then :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_RAISE 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
-  if test $ac_cv_func_raise = no; then
-    HAVE_RAISE=0
-  else
-    if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
-      REPLACE_RAISE=1
-    fi
+           # If the acl_get_file bug is detected, don't enable the ACL support.
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working acl_get_file" >&5
+$as_echo_n "checking for working acl_get_file... " >&6; }
+if ${gl_cv_func_working_acl_get_file+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  gl_cv_func_working_acl_get_file=no
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+           #include <sys/acl.h>
+           #include <errno.h>
+
+int
+main ()
+{
+if (!acl_get_file (".", ACL_TYPE_ACCESS) && errno == ENOENT)
+              return 1;
+            return 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  if test $cross_compiling = yes; then
+          gl_cv_func_working_acl_get_file="guessing yes"
+        elif ./conftest$ac_exeext; then
+          gl_cv_func_working_acl_get_file=yes
+        fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_acl_get_file" >&5
+$as_echo "$gl_cv_func_working_acl_get_file" >&6; }
+  if test "$gl_cv_func_working_acl_get_file" != no; then :
+  use_acl=1
+fi
 
+           if test $use_acl = 1; then
+                          for ac_header in acl/libacl.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "acl/libacl.h" "ac_cv_header_acl_libacl_h" "$ac_includes_default"
+if test "x$ac_cv_header_acl_libacl_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_ACL_LIBACL_H 1
+_ACEOF
 
+fi
 
+done
+
+
+
+
+
+
+
+
+
+  for ac_func in acl_entries
+do :
+  ac_fn_c_check_func "$LINENO" "acl_entries" "ac_cv_func_acl_entries"
+if test "x$ac_cv_func_acl_entries" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_ACL_ENTRIES 1
+_ACEOF
+
+else
+
+    gl_LIBOBJS="$gl_LIBOBJS $ac_func.$ac_objext"
 
-  if test $gl_cv_type_sigset_t = yes; then
-    ac_fn_c_check_func "$LINENO" "sigprocmask" "ac_cv_func_sigprocmask"
-if test "x$ac_cv_func_sigprocmask" = xyes; then :
-  gl_cv_func_sigprocmask=1
 fi
+done
 
-  fi
-  if test -z "$gl_cv_func_sigprocmask"; then
-    HAVE_POSIX_SIGNALBLOCKING=0
-  fi
 
-      if test $HAVE_POSIX_SIGNALBLOCKING = 0; then
-        :
+             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ACL_FIRST_ENTRY" >&5
+$as_echo_n "checking for ACL_FIRST_ENTRY... " >&6; }
+if ${gl_cv_acl_ACL_FIRST_ENTRY+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <sys/acl.h>
+int type = ACL_FIRST_ENTRY;
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_acl_ACL_FIRST_ENTRY=yes
+else
+  gl_cv_acl_ACL_FIRST_ENTRY=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_acl_ACL_FIRST_ENTRY" >&5
+$as_echo "$gl_cv_acl_ACL_FIRST_ENTRY" >&6; }
+             if test $gl_cv_acl_ACL_FIRST_ENTRY = yes; then
+
+$as_echo "#define HAVE_ACL_FIRST_ENTRY 1" >>confdefs.h
+
+             fi
+                          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ACL_TYPE_EXTENDED" >&5
+$as_echo_n "checking for ACL_TYPE_EXTENDED... " >&6; }
+if ${gl_cv_acl_ACL_TYPE_EXTENDED+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <sys/acl.h>
+int type = ACL_TYPE_EXTENDED;
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_acl_ACL_TYPE_EXTENDED=yes
+else
+  gl_cv_acl_ACL_TYPE_EXTENDED=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_acl_ACL_TYPE_EXTENDED" >&5
+$as_echo "$gl_cv_acl_ACL_TYPE_EXTENDED" >&6; }
+             if test $gl_cv_acl_ACL_TYPE_EXTENDED = yes; then
+
+$as_echo "#define HAVE_ACL_TYPE_EXTENDED 1" >>confdefs.h
+
+             fi
+           else
+             LIB_ACL=
+           fi
+
+fi
+
       fi
 
+            if test $use_acl = 0; then
+        for ac_func in facl
+do :
+  ac_fn_c_check_func "$LINENO" "facl" "ac_cv_func_facl"
+if test "x$ac_cv_func_facl" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_FACL 1
+_ACEOF
+
+fi
+done
+
+        if test $ac_cv_func_facl = yes; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing acl_trivial" >&5
+$as_echo_n "checking for library containing acl_trivial... " >&6; }
+if ${ac_cv_search_acl_trivial+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char acl_trivial ();
+int
+main ()
+{
+return acl_trivial ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' sec; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_acl_trivial=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_acl_trivial+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_acl_trivial+:} false; then :
 
-  if test $HAVE_RAISE = 0 || test $REPLACE_RAISE = 1; then
+else
+  ac_cv_search_acl_trivial=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_acl_trivial" >&5
+$as_echo "$ac_cv_search_acl_trivial" >&6; }
+ac_res=$ac_cv_search_acl_trivial
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  if test "$ac_cv_search_acl_trivial" != "none required"; then
+               LIB_ACL=$ac_cv_search_acl_trivial
+             fi
 
+fi
 
+          for ac_func in acl_trivial
+do :
+  ac_fn_c_check_func "$LINENO" "acl_trivial" "ac_cv_func_acl_trivial"
+if test "x$ac_cv_func_acl_trivial" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_ACL_TRIVIAL 1
+_ACEOF
 
+fi
+done
 
+          use_acl=1
+        fi
+      fi
 
+            if test $use_acl = 0; then
+        for ac_func in getacl
+do :
+  ac_fn_c_check_func "$LINENO" "getacl" "ac_cv_func_getacl"
+if test "x$ac_cv_func_getacl" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_GETACL 1
+_ACEOF
 
+fi
+done
 
+        if test $ac_cv_func_getacl = yes; then
+          use_acl=1
+        fi
+                for ac_header in aclv.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "aclv.h" "ac_cv_header_aclv_h" "#include <sys/types.h>
+"
+if test "x$ac_cv_header_aclv_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_ACLV_H 1
+_ACEOF
 
-  gl_LIBOBJS="$gl_LIBOBJS raise.$ac_objext"
+fi
 
-    :
-  fi
+done
 
+      fi
 
+            if test $use_acl = 0; then
+        for ac_func in aclx_get
+do :
+  ac_fn_c_check_func "$LINENO" "aclx_get" "ac_cv_func_aclx_get"
+if test "x$ac_cv_func_aclx_get" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_ACLX_GET 1
+_ACEOF
 
+fi
+done
 
+        if test $ac_cv_func_aclx_get = yes; then
+          use_acl=1
+        fi
+      fi
 
-          GNULIB_RAISE=1
+            if test $use_acl = 0 || test "$ac_cv_func_aclx_get" = yes; then
+        for ac_func in statacl
+do :
+  ac_fn_c_check_func "$LINENO" "statacl" "ac_cv_func_statacl"
+if test "x$ac_cv_func_statacl" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_STATACL 1
+_ACEOF
 
+fi
+done
 
+        if test $ac_cv_func_statacl = yes; then
+          use_acl=1
+        fi
+      fi
 
+            if test $use_acl = 0; then
+        for ac_func in aclsort
+do :
+  ac_fn_c_check_func "$LINENO" "aclsort" "ac_cv_func_aclsort"
+if test "x$ac_cv_func_aclsort" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_ACLSORT 1
+_ACEOF
 
+fi
+done
 
-$as_echo "#define GNULIB_TEST_RAISE 1" >>confdefs.h
+        if test $ac_cv_func_aclsort = yes; then
+          use_acl=1
+        fi
+      fi
+
+      LIBS=$ac_save_LIBS
+    fi
+    if test "x$enable_acl$use_acl" = "xyes0"; then
+      as_fn_error $? "ACLs enabled but support not detected" "$LINENO" 5
+    elif test "x$enable_acl$use_acl" = "xauto0"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libacl development library was not found or not usable." >&5
+$as_echo "$as_me: WARNING: libacl development library was not found or not usable." >&2;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GNU coreutils will be built without ACL support." >&5
+$as_echo "$as_me: WARNING: GNU coreutils will be built without ACL support." >&2;}
+    fi
+  fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define USE_ACL $use_acl
+_ACEOF
+
+  USE_ACL=$use_acl
+
+
+
+      :
 
 
+  :
 
 
 
 
 
-  for ac_func in rawmemchr
+  for ac_func in raise
 do :
-  ac_fn_c_check_func "$LINENO" "rawmemchr" "ac_cv_func_rawmemchr"
-if test "x$ac_cv_func_rawmemchr" = xyes; then :
+  ac_fn_c_check_func "$LINENO" "raise" "ac_cv_func_raise"
+if test "x$ac_cv_func_raise" = xyes; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_RAWMEMCHR 1
+#define HAVE_RAISE 1
 _ACEOF
 
 fi
 done
 
-  if test $ac_cv_func_rawmemchr = no; then
-    HAVE_RAWMEMCHR=0
+  if test $ac_cv_func_raise = no; then
+    HAVE_RAISE=0
+  else
+    if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
+      REPLACE_RAISE=1
+    fi
+
+
+
+
+  if test $gl_cv_type_sigset_t = yes; then
+    ac_fn_c_check_func "$LINENO" "sigprocmask" "ac_cv_func_sigprocmask"
+if test "x$ac_cv_func_sigprocmask" = xyes; then :
+  gl_cv_func_sigprocmask=1
+fi
+
+  fi
+  if test -z "$gl_cv_func_sigprocmask"; then
+    HAVE_POSIX_SIGNALBLOCKING=0
   fi
 
-  if test $HAVE_RAWMEMCHR = 0; then
+      if test $HAVE_POSIX_SIGNALBLOCKING = 0; then
+        :
+      fi
+
+  fi
+
+  if test $HAVE_RAISE = 0 || test $REPLACE_RAISE = 1; then
 
 
 
@@ -42450,7 +42390,7 @@ done
 
 
 
-  gl_LIBOBJS="$gl_LIBOBJS rawmemchr.$ac_objext"
+  gl_LIBOBJS="$gl_LIBOBJS raise.$ac_objext"
 
     :
   fi
@@ -42459,13 +42399,13 @@ done
 
 
 
-          GNULIB_RAWMEMCHR=1
+          GNULIB_RAISE=1
 
 
 
 
 
-$as_echo "#define GNULIB_TEST_RAWMEMCHR 1" >>confdefs.h
+$as_echo "#define GNULIB_TEST_RAISE 1" >>confdefs.h
 
 
 
@@ -43131,6 +43071,7 @@ fi
     # If cross compiling, assume the test would fail and use the included
     # regex.c.
 
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working re_compile_pattern" >&5
 $as_echo_n "checking for working re_compile_pattern... " >&6; }
 if ${gl_cv_func_re_compile_pattern_working+:} false; then :
@@ -43146,9 +43087,19 @@ else
             #include <locale.h>
             #include <limits.h>
             #include <string.h>
-            #if HAVE_ALARM
-            # include <unistd.h>
+
+            #if defined M_CHECK_ACTION || HAVE_DECL_ALARM
             # include <signal.h>
+            # include <unistd.h>
+            #endif
+
+            #if HAVE_MALLOC_H
+            # include <malloc.h>
+            #endif
+
+            #ifdef M_CHECK_ACTION
+            /* Exit with distinguishable exit code.  */
+            static void sigabrt_no_core (int sig) { raise (SIGTERM); }
             #endif
 
 int
@@ -43161,11 +43112,18 @@ int result = 0;
             const char *s;
             struct re_registers regs;
 
-#if HAVE_ALARM
-            /* Some builds of glibc go into an infinite loop on this test.  */
+            /* Some builds of glibc go into an infinite loop on this
+               test.  Use alarm to force death, and mallopt to avoid
+               malloc recursion in diagnosing the corrupted heap. */
+#if HAVE_DECL_ALARM
             signal (SIGALRM, SIG_DFL);
             alarm (2);
 #endif
+#ifdef M_CHECK_ACTION
+            signal (SIGABRT, sigabrt_no_core);
+            mallopt (M_CHECK_ACTION, 2);
+#endif
+
             if (setlocale (LC_ALL, "en_US.UTF-8"))
               {
                 {
@@ -43196,17 +43154,28 @@ int result = 0;
                      */
                   static char const pat[] = "[^x]x";
                   static char const data[] =
-                    "\xe1\x80\x80\xe1\x80\xbb\xe1\x80\xbd\xe1\x80\x94\xe1\x80"
-                    "\xba\xe1\x80\xaf\xe1\x80\x95\xe1\x80\xbax";
+                    /* <U1000><U103B><U103D><U1014><U103A><U102F><U1015><U103A> */
+                    "\xe1\x80\x80"
+                    "\xe1\x80\xbb"
+                    "\xe1\x80\xbd"
+                    "\xe1\x80\x94"
+                    "\xe1\x80\xba"
+                    "\xe1\x80\xaf"
+                    "\xe1\x80\x95"
+                    "\xe1\x80\xba"
+                    "x";
                   re_set_syntax (0);
                   memset (&regex, 0, sizeof regex);
                   s = re_compile_pattern (pat, sizeof pat - 1, &regex);
                   if (s)
                     result |= 1;
-                  else if (re_search (&regex, data, sizeof data - 1,
-                                      0, sizeof data - 1, 0)
-                           != 21)
-                    result |= 1;
+                  else
+                    {
+                      i = re_search (&regex, data, sizeof data - 1,
+                                     0, sizeof data - 1, 0);
+                      if (i != 0 && i != 21)
+                        result |= 1;
+                    }
                 }
 
                 if (! setlocale (LC_ALL, "C"))
@@ -43403,6 +43372,7 @@ $as_echo "#define regfree rpl_regfree" >>confdefs.h
 
 
 
+
   for ac_header in libintl.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
@@ -44094,36 +44064,40 @@ else
              if test $ac_cv_header_sched_h = yes; then
 
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sched.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-
-               gl_header_literal_regex=`echo 'sched.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_sched_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'sched.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_sched_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_sched_h
+           gl_cv_next_sched_h='"'$gl_header'"'
           else
                gl_cv_next_sched_h='<'sched.h'>'
              fi
@@ -44182,6 +44156,68 @@ fi
 
 
 
+
+
+  if test $ac_cv_func_secure_getenv = no; then
+    HAVE_SECURE_GETENV=0
+  fi
+
+  if test $HAVE_SECURE_GETENV = 0; then
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS secure_getenv.$ac_objext"
+
+
+  for ac_func in __secure_getenv
+do :
+  ac_fn_c_check_func "$LINENO" "__secure_getenv" "ac_cv_func___secure_getenv"
+if test "x$ac_cv_func___secure_getenv" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE___SECURE_GETENV 1
+_ACEOF
+
+fi
+done
+
+  if test $ac_cv_func___secure_getenv = no; then
+    for ac_func in issetugid
+do :
+  ac_fn_c_check_func "$LINENO" "issetugid" "ac_cv_func_issetugid"
+if test "x$ac_cv_func_issetugid" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_ISSETUGID 1
+_ACEOF
+
+fi
+done
+
+  fi
+
+  fi
+
+
+
+
+
+          GNULIB_SECURE_GETENV=1
+
+
+
+
+
+$as_echo "#define GNULIB_TEST_SECURE_GETENV 1" >>confdefs.h
+
+
+
+
+
+
   if test "$ac_cv_header_winsock2_h" = yes; then
     REPLACE_SELECT=1
   else
@@ -44417,36 +44453,40 @@ else
              if test $ac_cv_header_selinux_selinux_h = yes; then
 
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <selinux/selinux.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-
-               gl_header_literal_regex=`echo 'selinux/selinux.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_selinux_selinux_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'selinux/selinux.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_selinux_selinux_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_selinux_selinux_h
+           gl_cv_next_selinux_selinux_h='"'$gl_header'"'
           else
                gl_cv_next_selinux_selinux_h='<'selinux/selinux.h'>'
              fi
@@ -44877,36 +44917,40 @@ if ${gl_cv_next_signal_h+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <signal.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'signal.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_signal_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
 
-               gl_header_literal_regex=`echo 'signal.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_signal_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+           gl_header=$gl_cv_absolute_signal_h
+           gl_cv_next_signal_h='"'$gl_header'"'
 
 
 fi
@@ -45854,6 +45898,112 @@ _ACEOF
   fi
 
 
+  # Check whether libsmack is available
+  LIB_SMACK=
+  # Check whether --enable-libsmack was given.
+if test "${enable_libsmack+set}" = set; then :
+  enableval=$enable_libsmack;
+fi
+
+  if test "X$enable_libsmack" != "Xno"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for smack_new_label_from_self in -lsmack" >&5
+$as_echo_n "checking for smack_new_label_from_self in -lsmack... " >&6; }
+if ${ac_cv_lib_smack_smack_new_label_from_self+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsmack  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char smack_new_label_from_self ();
+int
+main ()
+{
+return smack_new_label_from_self ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_smack_smack_new_label_from_self=yes
+else
+  ac_cv_lib_smack_smack_new_label_from_self=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_smack_smack_new_label_from_self" >&5
+$as_echo "$ac_cv_lib_smack_smack_new_label_from_self" >&6; }
+if test "x$ac_cv_lib_smack_smack_new_label_from_self" = xyes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for smack_new_label_from_path in -lsmack" >&5
+$as_echo_n "checking for smack_new_label_from_path in -lsmack... " >&6; }
+if ${ac_cv_lib_smack_smack_new_label_from_path+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsmack  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char smack_new_label_from_path ();
+int
+main ()
+{
+return smack_new_label_from_path ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_smack_smack_new_label_from_path=yes
+else
+  ac_cv_lib_smack_smack_new_label_from_path=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_smack_smack_new_label_from_path" >&5
+$as_echo "$ac_cv_lib_smack_smack_new_label_from_path" >&6; }
+if test "x$ac_cv_lib_smack_smack_new_label_from_path" = xyes; then :
+  ac_fn_c_check_header_mongrel "$LINENO" "sys/smack.h" "ac_cv_header_sys_smack_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_smack_h" = xyes; then :
+  LIB_SMACK=-lsmack
+
+$as_echo "#define HAVE_SMACK 1" >>confdefs.h
+
+
+fi
+
+
+fi
+
+fi
+
+    if test "X$LIB_SMACK" = "X"; then
+      if test "X$enable_libsmack" = "Xyes"; then
+        as_fn_error $? "libsmack library was not found or not usable" "$LINENO" 5
+      fi
+    fi
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libsmack support disabled by user" >&5
+$as_echo "$as_me: WARNING: libsmack support disabled by user" >&2;}
+  fi
+
 
 
   gl_cv_func_snprintf_usable=no
@@ -46285,136 +46435,6 @@ _ACEOF
 fi
 
 
-
-
-
-
-
-
-
-
-
-
-
-     if test $gl_cv_have_include_next = yes; then
-       gl_cv_next_spawn_h='<'spawn.h'>'
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <spawn.h>" >&5
-$as_echo_n "checking absolute name of <spawn.h>... " >&6; }
-if ${gl_cv_next_spawn_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-             if test $ac_cv_header_spawn_h = yes; then
-
-
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <spawn.h>
-
-_ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
-
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-
-               gl_header_literal_regex=`echo 'spawn.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_spawn_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
-          else
-               gl_cv_next_spawn_h='<'spawn.h'>'
-             fi
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_spawn_h" >&5
-$as_echo "$gl_cv_next_spawn_h" >&6; }
-     fi
-     NEXT_SPAWN_H=$gl_cv_next_spawn_h
-
-     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-       gl_next_as_first_directive='<'spawn.h'>'
-     else
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-       gl_next_as_first_directive=$gl_cv_next_spawn_h
-     fi
-     NEXT_AS_FIRST_DIRECTIVE_SPAWN_H=$gl_next_as_first_directive
-
-
-
-
-
-  if test $ac_cv_header_spawn_h = yes; then
-    HAVE_SPAWN_H=1
-    ac_fn_c_check_type "$LINENO" "posix_spawnattr_t" "ac_cv_type_posix_spawnattr_t" "
-#include <spawn.h>
-
-"
-if test "x$ac_cv_type_posix_spawnattr_t" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_POSIX_SPAWNATTR_T 1
-_ACEOF
-
-
-else
-  HAVE_POSIX_SPAWNATTR_T=0
-fi
-
-    ac_fn_c_check_type "$LINENO" "posix_spawn_file_actions_t" "ac_cv_type_posix_spawn_file_actions_t" "
-#include <spawn.h>
-
-"
-if test "x$ac_cv_type_posix_spawn_file_actions_t" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_POSIX_SPAWN_FILE_ACTIONS_T 1
-_ACEOF
-
-
-else
-  HAVE_POSIX_SPAWN_FILE_ACTIONS_T=0
-fi
-
-  else
-    HAVE_SPAWN_H=0
-    HAVE_POSIX_SPAWNATTR_T=0
-    HAVE_POSIX_SPAWN_FILE_ACTIONS_T=0
-  fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ssize_t" >&5
 $as_echo_n "checking for ssize_t... " >&6; }
 if ${gt_cv_ssize_t+:} false; then :
@@ -46754,10 +46774,12 @@ else
 
             /* Test _Alignas only on platforms where gnulib can help.  */
             #if \
-                (__GNUC__ || __IBMC__ || __IBMCPP__ \
+                ((defined __cplusplus && 201103 <= __cplusplus) \
+                 || __GNUC__ || __IBMC__ || __IBMCPP__ || __ICC \
                  || 0x5110 <= __SUNPRO_C || 1300 <= _MSC_VER)
-              int alignas (8) alignas_int = 1;
-              char test_alignas[_Alignof (alignas_int) == 8 ? 1 : -1];
+              struct alignas_test { char c; char alignas (8) alignas_8; };
+              char test_alignas[offsetof (struct alignas_test, alignas_8) == 8
+                                ? 1 : -1];
             #endif
 
 int
@@ -46863,36 +46885,40 @@ if ${gl_cv_next_stdarg_h+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'stdarg.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_stdarg_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
 
-               gl_header_literal_regex=`echo 'stdarg.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_stdarg_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+           gl_header=$gl_cv_absolute_stdarg_h
+           gl_cv_next_stdarg_h='"'$gl_header'"'
 
 
 fi
@@ -47066,36 +47092,40 @@ if ${gl_cv_next_stddef_h+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stddef.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'stddef.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_stddef_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
 
-               gl_header_literal_regex=`echo 'stddef.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_stddef_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+           gl_header=$gl_cv_absolute_stddef_h
+           gl_cv_next_stddef_h='"'$gl_header'"'
 
 
 fi
@@ -47138,36 +47168,40 @@ if ${gl_cv_next_stdio_h+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'stdio.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_stdio_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
 
-               gl_header_literal_regex=`echo 'stdio.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_stdio_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+           gl_header=$gl_cv_absolute_stdio_h
+           gl_cv_next_stdio_h='"'$gl_header'"'
 
 
 fi
@@ -47246,36 +47280,40 @@ if ${gl_cv_next_stdlib_h+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'stdlib.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_stdlib_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
 
-               gl_header_literal_regex=`echo 'stdlib.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_stdlib_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+           gl_header=$gl_cv_absolute_stdlib_h
+           gl_cv_next_stdlib_h='"'$gl_header'"'
 
 
 fi
@@ -47488,115 +47526,6 @@ $as_echo "#define GNULIB_TEST_STPNCPY 1" >>confdefs.h
 
 
 
-  for ac_func in strchrnul
-do :
-  ac_fn_c_check_func "$LINENO" "strchrnul" "ac_cv_func_strchrnul"
-if test "x$ac_cv_func_strchrnul" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_STRCHRNUL 1
-_ACEOF
-
-fi
-done
-
-  if test $ac_cv_func_strchrnul = no; then
-    HAVE_STRCHRNUL=0
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strchrnul works" >&5
-$as_echo_n "checking whether strchrnul works... " >&6; }
-if ${gl_cv_func_strchrnul_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#if defined __CYGWIN__
- #include <cygwin/version.h>
- #if CYGWIN_VERSION_DLL_COMBINED > CYGWIN_VERSION_DLL_MAKE_COMBINED (1007, 9)
-  Lucky user
- #endif
-#else
-  Lucky user
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Lucky user" >/dev/null 2>&1; then :
-  gl_cv_func_strchrnul_works="guessing yes"
-else
-  gl_cv_func_strchrnul_works="guessing no"
-fi
-rm -f conftest*
-
-
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <string.h> /* for strchrnul */
-
-int
-main ()
-{
-const char *buf = "a";
-      return strchrnul (buf, 'b') != buf + 1;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_strchrnul_works=yes
-else
-  gl_cv_func_strchrnul_works=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strchrnul_works" >&5
-$as_echo "$gl_cv_func_strchrnul_works" >&6; }
-    case "$gl_cv_func_strchrnul_works" in
-      *yes) ;;
-      *) REPLACE_STRCHRNUL=1 ;;
-    esac
-  fi
-
-  if test $HAVE_STRCHRNUL = 0 || test $REPLACE_STRCHRNUL = 1; then
-
-
-
-
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS strchrnul.$ac_objext"
-
-    :
-  fi
-
-
-
-
-
-          GNULIB_STRCHRNUL=1
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_STRCHRNUL 1" >>confdefs.h
-
-
-
-
-
-
-
   if test $ac_cv_func_strdup = yes; then
     if test $gl_cv_func_malloc_posix != yes; then
       REPLACE_STRDUP=1
@@ -48467,7 +48396,7 @@ $as_echo "#define GNULIB_TEST_STRTOD 1" >>confdefs.h
     HAVE_DECL_STRTOIMAX=0
   fi
 
-  if test $ac_cv_func_strtoimax = yes; then
+  if test "$ac_cv_func_strtoimax" = yes; then
     HAVE_STRTOIMAX=1
              { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strtoimax works" >&5
 $as_echo_n "checking whether strtoimax works... " >&6; }
@@ -48540,10 +48469,14 @@ $as_echo "$gl_cv_func_strtoimax" >&6; }
       *no) REPLACE_STRTOIMAX=1 ;;
     esac
   else
+    if test "$ac_cv_have_decl_strtoimax" = yes; then
+      # HP-UX 11.11 has "#define strtoimax(...) ..." but no function.
+      REPLACE_STRTOIMAX=1
+    fi
     HAVE_STRTOIMAX=0
   fi
 
-  if test $HAVE_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; then
+  if test $HAVE_DECL_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; then
 
 
 
@@ -48684,11 +48617,16 @@ $as_echo "#define GNULIB_TEST_STRTOULL 1" >>confdefs.h
 
 
 
-  if test "$ac_cv_have_decl_strtoumax" != yes; then
+  if test "$ac_cv_have_decl_strtoumax" = yes; then
+    if test "$ac_cv_func_strtoumax" != yes; then
+      # HP-UX 11.11 has "#define strtoimax(...) ..." but no function.
+      REPLACE_STRTOUMAX=1
+    fi
+  else
     HAVE_DECL_STRTOUMAX=0
   fi
 
-  if test $ac_cv_func_strtoumax = no; then
+  if test $HAVE_DECL_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1; then
 
 
 
@@ -48870,36 +48808,40 @@ else
              if test $ac_cv_header_sys_ioctl_h = yes; then
 
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/ioctl.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-
-               gl_header_literal_regex=`echo 'sys/ioctl.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_sys_ioctl_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'sys/ioctl.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_sys_ioctl_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_sys_ioctl_h
+           gl_cv_next_sys_ioctl_h='"'$gl_header'"'
           else
                gl_cv_next_sys_ioctl_h='<'sys/ioctl.h'>'
              fi
@@ -48950,36 +48892,40 @@ else
              if test $ac_cv_header_sys_resource_h = yes; then
 
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/resource.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-
-               gl_header_literal_regex=`echo 'sys/resource.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_sys_resource_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'sys/resource.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_sys_resource_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_sys_resource_h
+           gl_cv_next_sys_resource_h='"'$gl_header'"'
           else
                gl_cv_next_sys_resource_h='<'sys/resource.h'>'
              fi
@@ -49118,36 +49064,40 @@ else
              if test $ac_cv_header_sys_select_h = yes; then
 
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/select.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-
-               gl_header_literal_regex=`echo 'sys/select.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_sys_select_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'sys/select.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_sys_select_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_sys_select_h
+           gl_cv_next_sys_select_h='"'$gl_header'"'
           else
                gl_cv_next_sys_select_h='<'sys/select.h'>'
              fi
@@ -49316,36 +49266,40 @@ else
              if test $ac_cv_header_sys_socket_h = yes; then
 
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/socket.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-
-               gl_header_literal_regex=`echo 'sys/socket.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_sys_socket_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'sys/socket.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_sys_socket_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_sys_socket_h
+           gl_cv_next_sys_socket_h='"'$gl_header'"'
           else
                gl_cv_next_sys_socket_h='<'sys/socket.h'>'
              fi
@@ -49515,36 +49469,40 @@ else
              if test $ac_cv_header_sys_stat_h = yes; then
 
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/stat.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-
-               gl_header_literal_regex=`echo 'sys/stat.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_sys_stat_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'sys/stat.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_sys_stat_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_sys_stat_h
+           gl_cv_next_sys_stat_h='"'$gl_header'"'
           else
                gl_cv_next_sys_stat_h='<'sys/stat.h'>'
              fi
@@ -49610,81 +49568,6 @@ fi
 
 
 
-     if test $gl_cv_have_include_next = yes; then
-       gl_cv_next_sys_types_h='<'sys/types.h'>'
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/types.h>" >&5
-$as_echo_n "checking absolute name of <sys/types.h>... " >&6; }
-if ${gl_cv_next_sys_types_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-
-_ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
-
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-
-               gl_header_literal_regex=`echo 'sys/types.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_sys_types_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_types_h" >&5
-$as_echo "$gl_cv_next_sys_types_h" >&6; }
-     fi
-     NEXT_SYS_TYPES_H=$gl_cv_next_sys_types_h
-
-     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-       gl_next_as_first_directive='<'sys/types.h'>'
-     else
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-       gl_next_as_first_directive=$gl_cv_next_sys_types_h
-     fi
-     NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H=$gl_next_as_first_directive
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 
@@ -49700,36 +49583,40 @@ else
              if test $ac_cv_header_sys_uio_h = yes; then
 
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/uio.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-
-               gl_header_literal_regex=`echo 'sys/uio.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_sys_uio_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'sys/uio.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_sys_uio_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_sys_uio_h
+           gl_cv_next_sys_uio_h='"'$gl_header'"'
           else
                gl_cv_next_sys_uio_h='<'sys/uio.h'>'
              fi
@@ -49785,36 +49672,40 @@ else
              if test $ac_cv_header_sys_utsname_h = yes; then
 
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/utsname.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-
-               gl_header_literal_regex=`echo 'sys/utsname.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_sys_utsname_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'sys/utsname.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_sys_utsname_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_sys_utsname_h
+           gl_cv_next_sys_utsname_h='"'$gl_header'"'
           else
                gl_cv_next_sys_utsname_h='<'sys/utsname.h'>'
              fi
@@ -49891,36 +49782,40 @@ else
              if test $ac_cv_header_sys_wait_h = yes; then
 
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/wait.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-
-               gl_header_literal_regex=`echo 'sys/wait.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_sys_wait_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'sys/wait.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_sys_wait_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_sys_wait_h
+           gl_cv_next_sys_wait_h='"'$gl_header'"'
           else
                gl_cv_next_sys_wait_h='<'sys/wait.h'>'
              fi
@@ -49979,36 +49874,40 @@ else
              if test $ac_cv_header_termios_h = yes; then
 
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <termios.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-
-               gl_header_literal_regex=`echo 'termios.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_termios_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'termios.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_termios_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_termios_h
+           gl_cv_next_termios_h='"'$gl_header'"'
           else
                gl_cv_next_termios_h='<'termios.h'>'
              fi
@@ -50150,6 +50049,7 @@ $as_echo "#define GNULIB_TEST_TIME_R 1" >>confdefs.h
 
 
 
+
   LIB_TIMER_TIME=
 
   gl_saved_libs=$LIBS
@@ -50210,16 +50110,15 @@ if test "$ac_res" != no; then :
                     LIB_TIMER_TIME=$ac_cv_search_timer_settime
 fi
 
-                    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+                                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
 #include <features.h>
-#ifdef __GNU_LIBRARY__
- #if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || (__GLIBC__ > 2)) \
-     && !defined __UCLIBC__
-  Thread emulation available
- #endif
-#endif
+          #ifdef __GNU_LIBRARY__
+           #if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || (__GLIBC__ > 2)) \
+               && !(__UCLIBC__ && __HAS_NO_THREADS__)
+            Thread emulation available
+           #endif
+          #endif
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
@@ -50315,36 +50214,40 @@ else
              if test $ac_cv_header_unistd_h = yes; then
 
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <unistd.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-
-               gl_header_literal_regex=`echo 'unistd.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_unistd_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'unistd.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_unistd_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_unistd_h
+           gl_cv_next_unistd_h='"'$gl_header'"'
           else
                gl_cv_next_unistd_h='<'unistd.h'>'
              fi
@@ -52169,54 +52072,6 @@ $as_echo "#define GNULIB_TEST_VPRINTF_POSIX 1" >>confdefs.h
 
 
 
-  for ac_func in waitid
-do :
-  ac_fn_c_check_func "$LINENO" "waitid" "ac_cv_func_waitid"
-if test "x$ac_cv_func_waitid" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_WAITID 1
-_ACEOF
-
-fi
-done
-
-
-
-
-  HAVE_WAITPID=1
-  case $host_os in
-    mingw*) HAVE_WAITPID=0 ;;
-  esac
-
-  if test $HAVE_WAITPID = 0; then
-
-
-
-
-
-
-
-
-  gl_LIBOBJS="$gl_LIBOBJS waitpid.$ac_objext"
-
-  fi
-
-
-
-
-
-          GNULIB_WAITPID=1
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_WAITPID 1" >>confdefs.h
-
-
-
-
-
 
 
 
@@ -52239,36 +52094,40 @@ else
              if test $ac_cv_header_wchar_h = yes; then
 
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <wchar.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-
-               gl_header_literal_regex=`echo 'wchar.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_wchar_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'wchar.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_wchar_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_wchar_h
+           gl_cv_next_wchar_h='"'$gl_header'"'
           else
                gl_cv_next_wchar_h='<'wchar.h'>'
              fi
@@ -52688,36 +52547,40 @@ else
              if test $ac_cv_header_wctype_h = yes; then
 
 
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <wctype.h>
-
 _ACEOF
-                                                                                                                        case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
 
-               case "$host_os" in
-                 mingw*)
-                                                                                                                                     gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-                                             gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-
-               gl_header_literal_regex=`echo 'wctype.h' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-                   s|^/[^/]|//&|
-                   p
-                   q
-                 }'
-                                                            gl_cv_next_wctype_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                      sed -n "$gl_absolute_header_sed"`'"'
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'wctype.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_wctype_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_wctype_h
+           gl_cv_next_wctype_h='"'$gl_header'"'
           else
                gl_cv_next_wctype_h='<'wctype.h'>'
              fi
@@ -53982,6 +53845,7 @@ $as_echo "#define GNULIB_TEST_CONNECT 1" >>confdefs.h
 
 
 
+
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
 $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
 if ${ac_cv_c_bigendian+:} false; then :
@@ -57549,71 +57413,6 @@ $as_echo "#define GNULIB_TEST_PERROR 1" >>confdefs.h
 
 
 
-
-  if test $ac_cv_func_pipe != yes; then
-    HAVE_PIPE=0
-  fi
-
-  if test $HAVE_PIPE = 0; then
-
-
-
-
-
-
-
-
-  gltests_LIBOBJS="$gltests_LIBOBJS pipe.$ac_objext"
-
-  fi
-
-
-
-
-
-    if test "$GNULIB_PIPE" != 1; then
-        if test "$GNULIB_PIPE" = 0; then
-      GNULIB_PIPE=$gl_module_indicator_condition
-    else
-      GNULIB_PIPE="($GNULIB_PIPE || $gl_module_indicator_condition)"
-    fi
-  fi
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_PIPE 1" >>confdefs.h
-
-
-
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-[
-  #if defined _MSC_VER || defined __MINGW32__
-    notposix
-  #endif
-    ]
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "notposix" >/dev/null 2>&1; then :
-  posix_spawn_ported=no
-else
-  posix_spawn_ported=yes
-fi
-rm -f conftest*
-
-   if test $posix_spawn_ported = yes; then
-  POSIX_SPAWN_PORTED_TRUE=
-  POSIX_SPAWN_PORTED_FALSE='#'
-else
-  POSIX_SPAWN_PORTED_TRUE='#'
-  POSIX_SPAWN_PORTED_FALSE=
-fi
-
-
-
-
   # Check for mmap(). Don't use AC_FUNC_MMAP, because it checks too much: it
   # fails on HP-UX 11, because MAP_FIXED mappings do not work. But this is
   # irrelevant for anonymous mappings.
@@ -58743,102 +58542,6 @@ $as_echo "#define UNLINK_CANNOT_UNLINK_DIR 1" >>confdefs.h
   abs_aux_dir=`cd "$ac_aux_dir"; pwd`
 
 
-
-
-
-  ac_fn_c_check_type "$LINENO" "useconds_t" "ac_cv_type_useconds_t" "$ac_includes_default"
-if test "x$ac_cv_type_useconds_t" = xyes; then :
-
-else
-
-$as_echo "#define useconds_t unsigned int" >>confdefs.h
-
-fi
-
-  if test $ac_cv_func_usleep = no; then
-    HAVE_USLEEP=0
-  else
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether usleep allows large arguments" >&5
-$as_echo_n "checking whether usleep allows large arguments... " >&6; }
-if ${gl_cv_func_usleep_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  case "$host_os" in
-                   # Guess yes on glibc systems.
-           *-gnu*) gl_cv_func_usleep_works="guessing yes" ;;
-                   # If we don't know, assume the worst.
-           *)      gl_cv_func_usleep_works="guessing no" ;;
-         esac
-
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <unistd.h>
-
-int
-main ()
-{
-return !!usleep (1000000);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_func_usleep_works=yes
-else
-  gl_cv_func_usleep_works=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_usleep_works" >&5
-$as_echo "$gl_cv_func_usleep_works" >&6; }
-    case "$gl_cv_func_usleep_works" in
-      *yes) ;;
-      *)
-        REPLACE_USLEEP=1
-        ;;
-    esac
-  fi
-
-  if test $HAVE_USLEEP = 0 || test $REPLACE_USLEEP = 1; then
-
-
-
-
-
-
-
-
-  gltests_LIBOBJS="$gltests_LIBOBJS usleep.$ac_objext"
-
-  fi
-
-
-
-
-
-    if test "$GNULIB_USLEEP" != 1; then
-        if test "$GNULIB_USLEEP" = 0; then
-      GNULIB_USLEEP=$gl_module_indicator_condition
-    else
-      GNULIB_USLEEP="($GNULIB_USLEEP || $gl_module_indicator_condition)"
-    fi
-  fi
-
-
-
-
-
-$as_echo "#define GNULIB_TEST_USLEEP 1" >>confdefs.h
-
-
-
-
   abs_aux_dir=`cd "$ac_aux_dir"; pwd`
 
 
@@ -60268,9 +59971,21 @@ $as_echo "#define ARGMATCH_DIE_DECL void usage (int _e)" >>confdefs.h
   # used by shred
 
 
-  # Used by install.c.
   coreutils_saved_libs=$LIBS
     LIBS="$LIBS $LIB_SELINUX"
+    # Used by selinux.c.
+    for ac_func in mode_to_security_class
+do :
+  ac_fn_c_check_func "$LINENO" "mode_to_security_class" "ac_cv_func_mode_to_security_class"
+if test "x$ac_cv_func_mode_to_security_class" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_MODE_TO_SECURITY_CLASS 1
+_ACEOF
+
+fi
+done
+
+    # Used by install.c.
     for ac_func in matchpathcon_init_prefix
 do :
   ac_fn_c_check_func "$LINENO" "matchpathcon_init_prefix" "ac_cv_func_matchpathcon_init_prefix"
@@ -60281,17 +59996,19 @@ _ACEOF
 
 else
 
-      case "$ac_cv_search_setfilecon:$ac_cv_header_selinux_selinux_h" in
-        no:*) # SELinux disabled
-          ;;
-        *:no) # SELinux disabled
-          ;;
-        *)
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SELinux enabled, but matchpathcon_init_prefix not found" >&5
+      if test "$with_selinux" != no; then
+        case "$ac_cv_search_setfilecon:$ac_cv_header_selinux_selinux_h" in
+          no:*) # SELinux disabled
+            ;;
+          *:no) # SELinux disabled
+            ;;
+          *)
+          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SELinux enabled, but matchpathcon_init_prefix not found" >&5
 $as_echo "$as_me: WARNING: SELinux enabled, but matchpathcon_init_prefix not found" >&2;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The install utility may run slowly" >&5
+          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The install utility may run slowly" >&5
 $as_echo "$as_me: WARNING: The install utility may run slowly" >&2;}
-      esac
+        esac
+      fi
 
 fi
 done
@@ -60784,7 +60501,9 @@ main ()
 
 _ACEOF
 if ac_fn_c_try_cpp "$LINENO"; then :
-  test -d "$srcdir"/.git && gl_gcc_warnings=yes
+  test -d "$srcdir"/.git \
+                          && ! test -f "$srcdir"/.tarball-version \
+                          && gl_gcc_warnings=yes
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
@@ -60794,14 +60513,52 @@ fi
 
 
 if test "$gl_gcc_warnings" = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Werror" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Werror -Wunknown-warning-option" >&5
+$as_echo_n "checking whether C compiler handles -Werror -Wunknown-warning-option... " >&6; }
+if ${gl_cv_warn_c__Werror__Wunknown_warning_option+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  gl_save_compiler_FLAGS="$CFLAGS"
+  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Werror -Wunknown-warning-option"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  gl_cv_warn_c__Werror__Wunknown_warning_option=yes
+else
+  gl_cv_warn_c__Werror__Wunknown_warning_option=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  CFLAGS="$gl_save_compiler_FLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Werror__Wunknown_warning_option" >&5
+$as_echo "$gl_cv_warn_c__Werror__Wunknown_warning_option" >&6; }
+if test "x$gl_cv_warn_c__Werror__Wunknown_warning_option" = xyes; then :
+  gl_unknown_warnings_are_errors='-Wunknown-warning-option -Werror'
+else
+  gl_unknown_warnings_are_errors=
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Werror" >&5
 $as_echo_n "checking whether C compiler handles -Werror... " >&6; }
 if ${gl_cv_warn_c__Werror+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
   gl_save_compiler_FLAGS="$CFLAGS"
-  as_fn_append CFLAGS " -Werror"
+  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Werror"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -60813,12 +60570,13 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   gl_cv_warn_c__Werror=yes
 else
   gl_cv_warn_c__Werror=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS="$gl_save_compiler_FLAGS"
 
 fi
@@ -60847,7 +60605,7 @@ fi
   nw="$nw -Wunreachable-code"       # Too many warnings for now
   nw="$nw -Wpadded"                 # Our structs are not padded
   nw="$nw -Wredundant-decls"        # openat.h declares e.g., mkdirat
-  nw="$nw -Wlogical-op"             # any use of fwrite provokes this
+  nw="$nw -Wlogical-op"             # Too many warnings until GCC 4.8.0
   nw="$nw -Wformat-nonliteral"      # who.c and pinky.c strftime uses
   nw="$nw -Wvla"                    # warnings in gettext.h
   nw="$nw -Wnested-externs"         # use of XARGMATCH/verify_function__
@@ -60979,6 +60737,7 @@ $as_echo "$gl_cv_cc_uninitialized_supported" >&6; }
     -W \
     -Wabi \
     -Waddress \
+    -Waggressive-loop-optimizations \
     -Wall \
     -Warray-bounds \
     -Wattributes \
@@ -61006,7 +60765,6 @@ $as_echo "$gl_cv_cc_uninitialized_supported" >&6; }
     -Wformat-security \
     -Wformat-y2k \
     -Wformat-zero-length \
-    -Wformat=2 \
     -Wfree-nonheap-object \
     -Wignored-qualifiers \
     -Wimplicit \
@@ -61024,12 +60782,9 @@ $as_echo "$gl_cv_cc_uninitialized_supported" >&6; }
     -Wmissing-braces \
     -Wmissing-declarations \
     -Wmissing-field-initializers \
-    -Wmissing-format-attribute \
     -Wmissing-include-dirs \
-    -Wmissing-noreturn \
     -Wmissing-parameter-type \
     -Wmissing-prototypes \
-    -Wmudflap \
     -Wmultichar \
     -Wnarrowing \
     -Wnested-externs \
@@ -61047,6 +60802,7 @@ $as_echo "$gl_cv_cc_uninitialized_supported" >&6; }
     -Wpointer-sign \
     -Wpointer-to-int-cast \
     -Wpragmas \
+    -Wreturn-local-addr \
     -Wreturn-type \
     -Wsequence-point \
     -Wshadow \
@@ -61068,7 +60824,6 @@ $as_echo "$gl_cv_cc_uninitialized_supported" >&6; }
     -Wtype-limits \
     -Wuninitialized \
     -Wunknown-pragmas \
-    -Wunreachable-code \
     -Wunsafe-loop-optimizations \
     -Wunused \
     -Wunused-but-set-parameter \
@@ -61087,6 +60842,8 @@ $as_echo "$gl_cv_cc_uninitialized_supported" >&6; }
     -Wvla \
     -Wvolatile-register-var \
     -Wwrite-strings \
+    -fdiagnostics-show-option \
+    -funit-at-a-time \
     \
     ; do
     gl_manywarn_set="$gl_manywarn_set $gl_manywarn_item"
@@ -61119,7 +60876,12 @@ $as_echo "$gl_cv_cc_uninitialized_supported" >&6; }
   ws=$gl_warn_set
 
   for w in $ws; do
-    as_gl_Warn=`$as_echo "gl_cv_warn_c_$w" | $as_tr_sh`
+
+as_gl_Warn=`$as_echo "gl_cv_warn_c_$w" | $as_tr_sh`
+gl_positive="$w"
+case $gl_positive in
+  -Wno-*) gl_positive=-W`expr "X$gl_positive" : 'X-Wno-\(.*\)'` ;;
+esac
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles $w" >&5
 $as_echo_n "checking whether C compiler handles $w... " >&6; }
 if eval \${$as_gl_Warn+:} false; then :
@@ -61127,7 +60889,7 @@ if eval \${$as_gl_Warn+:} false; then :
 else
 
   gl_save_compiler_FLAGS="$CFLAGS"
-  as_fn_append CFLAGS " $w"
+  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors $gl_positive"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -61139,12 +60901,13 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_gl_Warn=yes"
 else
   eval "$as_gl_Warn=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS="$gl_save_compiler_FLAGS"
 
 fi
@@ -61157,14 +60920,15 @@ fi
 
 
   done
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-sign-compare" >&5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-sign-compare" >&5
 $as_echo_n "checking whether C compiler handles -Wno-sign-compare... " >&6; }
 if ${gl_cv_warn_c__Wno_sign_compare+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
   gl_save_compiler_FLAGS="$CFLAGS"
-  as_fn_append CFLAGS " -Wno-sign-compare"
+  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wsign-compare"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -61176,12 +60940,13 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   gl_cv_warn_c__Wno_sign_compare=yes
 else
   gl_cv_warn_c__Wno_sign_compare=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS="$gl_save_compiler_FLAGS"
 
 fi
@@ -61192,14 +60957,15 @@ if test "x$gl_cv_warn_c__Wno_sign_compare" = xyes; then :
 fi
 
      # Too many warnings for now
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-unused-parameter" >&5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-unused-parameter" >&5
 $as_echo_n "checking whether C compiler handles -Wno-unused-parameter... " >&6; }
 if ${gl_cv_warn_c__Wno_unused_parameter+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
   gl_save_compiler_FLAGS="$CFLAGS"
-  as_fn_append CFLAGS " -Wno-unused-parameter"
+  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wunused-parameter"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -61211,12 +60977,13 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   gl_cv_warn_c__Wno_unused_parameter=yes
 else
   gl_cv_warn_c__Wno_unused_parameter=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS="$gl_save_compiler_FLAGS"
 
 fi
@@ -61227,15 +60994,15 @@ if test "x$gl_cv_warn_c__Wno_unused_parameter" = xyes; then :
 fi
 
  # Too many warnings for now
-  as_gl_Warn=`$as_echo "gl_cv_warn_c_-Wsuggest-attribute=const" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wsuggest-attribute=const" >&5
-$as_echo_n "checking whether C compiler handles -Wsuggest-attribute=const... " >&6; }
-if eval \${$as_gl_Warn+:} false; then :
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-format-nonliteral" >&5
+$as_echo_n "checking whether C compiler handles -Wno-format-nonliteral... " >&6; }
+if ${gl_cv_warn_c__Wno_format_nonliteral+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
   gl_save_compiler_FLAGS="$CFLAGS"
-  as_fn_append CFLAGS " -Wsuggest-attribute=const"
+  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wformat-nonliteral"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -61247,68 +61014,55 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$as_gl_Warn=yes"
+if ac_fn_c_try_link "$LINENO"; then :
+  gl_cv_warn_c__Wno_format_nonliteral=yes
 else
-  eval "$as_gl_Warn=no"
+  gl_cv_warn_c__Wno_format_nonliteral=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS="$gl_save_compiler_FLAGS"
 
 fi
-eval ac_res=\$$as_gl_Warn
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_gl_Warn"\" = x"yes"; then :
-  as_fn_append WARN_CFLAGS " -Wsuggest-attribute=const"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Wno_format_nonliteral" >&5
+$as_echo "$gl_cv_warn_c__Wno_format_nonliteral" >&6; }
+if test "x$gl_cv_warn_c__Wno_format_nonliteral" = xyes; then :
+  as_fn_append WARN_CFLAGS " -Wno-format-nonliteral"
 fi
 
 
-  as_gl_Warn=`$as_echo "gl_cv_warn_c_-Wsuggest-attribute=noreturn" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wsuggest-attribute=noreturn" >&5
-$as_echo_n "checking whether C compiler handles -Wsuggest-attribute=noreturn... " >&6; }
-if eval \${$as_gl_Warn+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
 
-  gl_save_compiler_FLAGS="$CFLAGS"
-  as_fn_append CFLAGS " -Wsuggest-attribute=noreturn"
+  # Enable this warning only with gcc-4.8 and newer.  Before that
+  # bounds checking as done in truncate.c was incorrectly flagged.
+  # See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=43772
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+#if (4) < __GNUC__ || ((4) == __GNUC__ && (8) <= __GNUC_MINOR__)
+/* ok */
+#else
+# error "your version of gcc is older than 4.8"
+#endif
+
 int
 main ()
 {
 
   ;
   return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$as_gl_Warn=yes"
-else
-  eval "$as_gl_Warn=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS="$gl_save_compiler_FLAGS"
-
-fi
-eval ac_res=\$$as_gl_Warn
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_gl_Warn"\" = x"yes"; then :
-  as_fn_append WARN_CFLAGS " -Wsuggest-attribute=noreturn"
-fi
+},
 
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-format-nonliteral" >&5
-$as_echo_n "checking whether C compiler handles -Wno-format-nonliteral... " >&6; }
-if ${gl_cv_warn_c__Wno_format_nonliteral+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wlogical-op" >&5
+$as_echo_n "checking whether C compiler handles -Wlogical-op... " >&6; }
+if ${gl_cv_warn_c__Wlogical_op+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
   gl_save_compiler_FLAGS="$CFLAGS"
-  as_fn_append CFLAGS " -Wno-format-nonliteral"
+  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wlogical-op"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -61320,36 +61074,40 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_warn_c__Wno_format_nonliteral=yes
+if ac_fn_c_try_link "$LINENO"; then :
+  gl_cv_warn_c__Wlogical_op=yes
 else
-  gl_cv_warn_c__Wno_format_nonliteral=no
+  gl_cv_warn_c__Wlogical_op=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS="$gl_save_compiler_FLAGS"
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Wno_format_nonliteral" >&5
-$as_echo "$gl_cv_warn_c__Wno_format_nonliteral" >&6; }
-if test "x$gl_cv_warn_c__Wno_format_nonliteral" = xyes; then :
-  as_fn_append WARN_CFLAGS " -Wno-format-nonliteral"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Wlogical_op" >&5
+$as_echo "$gl_cv_warn_c__Wlogical_op" >&6; }
+if test "x$gl_cv_warn_c__Wlogical_op" = xyes; then :
+  as_fn_append WARN_CFLAGS " -Wlogical-op"
 fi
 
 
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+
 
-  # Enable this warning only with gcc-4.7 and newer.  With 4.6.2 20111027,
-  # it suggests test.c's advance function may be pure, even though it
-  # increments a global variable.  Oops.
-  # Normally we'd write code to test for the precise failure, but that
-  # requires a relatively large input to make gcc exhibit the failure.
+  # clang is unduly picky about some things.
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler is clang" >&5
+$as_echo_n "checking whether the compiler is clang... " >&6; }
+if ${utils_cv_clang+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#if (4) < __GNUC__ || ((4) == __GNUC__ && (7) <= __GNUC_MINOR__)
-/* ok */
-#else
-# error "your version of gcc is older than 4.7"
-#endif
+            #ifndef __clang__
+              #error "not clang"
+            #endif
 
 int
 main ()
@@ -61357,19 +61115,27 @@ main ()
 
   ;
   return 0;
-},
-
+}
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  as_gl_Warn=`$as_echo "gl_cv_warn_c_-Wsuggest-attribute=pure" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wsuggest-attribute=pure" >&5
-$as_echo_n "checking whether C compiler handles -Wsuggest-attribute=pure... " >&6; }
-if eval \${$as_gl_Warn+:} false; then :
+if ac_fn_c_try_compile "$LINENO"; then :
+  utils_cv_clang=yes
+else
+  utils_cv_clang=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $utils_cv_clang" >&5
+$as_echo "$utils_cv_clang" >&6; }
+  if test $utils_cv_clang = yes; then
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-format-extra-args" >&5
+$as_echo_n "checking whether C compiler handles -Wno-format-extra-args... " >&6; }
+if ${gl_cv_warn_c__Wno_format_extra_args+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
   gl_save_compiler_FLAGS="$CFLAGS"
-  as_fn_append CFLAGS " -Wsuggest-attribute=pure"
+  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wformat-extra-args"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -61381,38 +61147,32 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$as_gl_Warn=yes"
+if ac_fn_c_try_link "$LINENO"; then :
+  gl_cv_warn_c__Wno_format_extra_args=yes
 else
-  eval "$as_gl_Warn=no"
+  gl_cv_warn_c__Wno_format_extra_args=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS="$gl_save_compiler_FLAGS"
 
 fi
-eval ac_res=\$$as_gl_Warn
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_gl_Warn"\" = x"yes"; then :
-  as_fn_append WARN_CFLAGS " -Wsuggest-attribute=pure"
-fi
-
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Wno_format_extra_args" >&5
+$as_echo "$gl_cv_warn_c__Wno_format_extra_args" >&6; }
+if test "x$gl_cv_warn_c__Wno_format_extra_args" = xyes; then :
+  as_fn_append WARN_CFLAGS " -Wno-format-extra-args"
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
 
 
 
-  # In spite of excluding -Wlogical-op above, it is enabled, as of
-  # gcc 4.5.0 20090517, and it provokes warnings in cat.c, dd.c, truncate.c
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-logical-op" >&5
-$as_echo_n "checking whether C compiler handles -Wno-logical-op... " >&6; }
-if ${gl_cv_warn_c__Wno_logical_op+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-tautological-constant-out-of-range-compare" >&5
+$as_echo_n "checking whether C compiler handles -Wno-tautological-constant-out-of-range-compare... " >&6; }
+if ${gl_cv_warn_c__Wno_tautological_constant_out_of_range_compare+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
   gl_save_compiler_FLAGS="$CFLAGS"
-  as_fn_append CFLAGS " -Wno-logical-op"
+  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wtautological-constant-out-of-range-compare"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -61424,31 +61184,34 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_warn_c__Wno_logical_op=yes
+if ac_fn_c_try_link "$LINENO"; then :
+  gl_cv_warn_c__Wno_tautological_constant_out_of_range_compare=yes
 else
-  gl_cv_warn_c__Wno_logical_op=no
+  gl_cv_warn_c__Wno_tautological_constant_out_of_range_compare=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS="$gl_save_compiler_FLAGS"
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Wno_logical_op" >&5
-$as_echo "$gl_cv_warn_c__Wno_logical_op" >&6; }
-if test "x$gl_cv_warn_c__Wno_logical_op" = xyes; then :
-  as_fn_append WARN_CFLAGS " -Wno-logical-op"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Wno_tautological_constant_out_of_range_compare" >&5
+$as_echo "$gl_cv_warn_c__Wno_tautological_constant_out_of_range_compare" >&6; }
+if test "x$gl_cv_warn_c__Wno_tautological_constant_out_of_range_compare" = xyes; then :
+  as_fn_append WARN_CFLAGS " -Wno-tautological-constant-out-of-range-compare"
 fi
 
 
+  fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -fdiagnostics-show-option" >&5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -fdiagnostics-show-option" >&5
 $as_echo_n "checking whether C compiler handles -fdiagnostics-show-option... " >&6; }
 if ${gl_cv_warn_c__fdiagnostics_show_option+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
   gl_save_compiler_FLAGS="$CFLAGS"
-  as_fn_append CFLAGS " -fdiagnostics-show-option"
+  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -fdiagnostics-show-option"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -61460,12 +61223,13 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   gl_cv_warn_c__fdiagnostics_show_option=yes
 else
   gl_cv_warn_c__fdiagnostics_show_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS="$gl_save_compiler_FLAGS"
 
 fi
@@ -61476,14 +61240,15 @@ if test "x$gl_cv_warn_c__fdiagnostics_show_option" = xyes; then :
 fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -funit-at-a-time" >&5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -funit-at-a-time" >&5
 $as_echo_n "checking whether C compiler handles -funit-at-a-time... " >&6; }
 if ${gl_cv_warn_c__funit_at_a_time+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
   gl_save_compiler_FLAGS="$CFLAGS"
-  as_fn_append CFLAGS " -funit-at-a-time"
+  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -funit-at-a-time"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -61495,12 +61260,13 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   gl_cv_warn_c__funit_at_a_time=yes
 else
   gl_cv_warn_c__funit_at_a_time=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS="$gl_save_compiler_FLAGS"
 
 fi
@@ -61574,6 +61340,43 @@ $as_echo "#define GNULIB_PORTCHECK 1" >>confdefs.h
 
 fi
 
+# Check whether --enable-single-binary was given.
+if test "${enable_single_binary+set}" = set; then :
+  enableval=$enable_single_binary; gl_single_binary=no ;
+   case $enableval in
+     yes) gl_single_binary=shebangs ;;
+     no|shebangs|symlinks) gl_single_binary=$enableval ;;
+     *)      as_fn_error $? "bad value $enableval for single-binary option.
+                           Options are: symlinks, shebangs, no." "$LINENO" 5 ;;
+   esac
+else
+  gl_single_binary=no
+
+fi
+
+# Check whether --enable-single-binary-exceptions was given.
+if test "${enable_single_binary_exceptions+set}" = set; then :
+  enableval=$enable_single_binary_exceptions; gl_single_binary_exceptions=$enableval
+else
+  gl_single_binary_exceptions=
+
+fi
+
+if test "$gl_single_binary" = 'symlinks'; then
+  if ! test "`echo ls | sed \"$program_transform_name\"`" = 'ls'; then
+    as_fn_error $? "program name transformations are not currently supported
+                  with --enable-single-binary=symlinks." "$LINENO" 5
+  fi
+fi
+ if test "$gl_single_binary" != no; then
+  SINGLE_BINARY_TRUE=
+  SINGLE_BINARY_FALSE='#'
+else
+  SINGLE_BINARY_TRUE='#'
+  SINGLE_BINARY_FALSE=
+fi
+
+
 for ac_header in vfork.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h" "$ac_includes_default"
@@ -61944,6 +61747,23 @@ $as_echo "#define LOCALTIME_CACHE 1" >>confdefs.h
 
 fi
 
+# Assume that if getattrat exists, it's compatible with Solaris 11.
+for ac_func in getattrat
+do :
+  ac_fn_c_check_func "$LINENO" "getattrat" "ac_cv_func_getattrat"
+if test "x$ac_cv_func_getattrat" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_GETATTRAT 1
+_ACEOF
+
+fi
+done
+
+if test $ac_cv_func_getattrat = yes; then
+  LIB_NVPAIR=-lnvpair
+
+fi
+
 # SCO-ODT-3.0 is reported to need -los to link programs using initgroups
 for ac_func in initgroups
 do :
@@ -62650,6 +62470,8 @@ _ACEOF
 
 
 
+
+
   LIB_GMP=
 
 
@@ -62663,8 +62485,11 @@ fi
 
 
   if test $cu_use_gmp != no; then
-    cu_saved_libs=$LIBS
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing __gmpz_init" >&5
+            HAVE_GMP=0
+
+    if test $ac_cv_header_gmp_h = yes; then
+      cu_saved_libs=$LIBS
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing __gmpz_init" >&5
 $as_echo_n "checking for library containing __gmpz_init... " >&6; }
 if ${ac_cv_search___gmpz_init+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -62718,13 +62543,13 @@ ac_res=$ac_cv_search___gmpz_init
 if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
   test "$ac_cv_search___gmpz_init" = "none required" ||
-       {
-        LIB_GMP=$ac_cv_search___gmpz_init
+           LIB_GMP=$ac_cv_search___gmpz_init
 
 $as_echo "#define HAVE_GMP 1" >>confdefs.h
 
-        # This only available in GMP >= 5
-        ac_fn_c_check_decl "$LINENO" "mpz_inits" "ac_cv_have_decl_mpz_inits" "#include <gmp.h>
+         HAVE_GMP=1
+         # This only available in GMP >= 5
+         ac_fn_c_check_decl "$LINENO" "mpz_inits" "ac_cv_have_decl_mpz_inits" "#include <gmp.h>
 "
 if test "x$ac_cv_have_decl_mpz_inits" = xyes; then :
   ac_have_decl=1
@@ -62736,15 +62561,17 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_MPZ_INITS $ac_have_decl
 _ACEOF
 
-       }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libgmp development library was not found or not usable." >&5
-$as_echo "$as_me: WARNING: libgmp development library was not found or not usable." >&2;}
-       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GNU coreutils will be built without GMP support." >&5
-$as_echo "$as_me: WARNING: GNU coreutils will be built without GMP support." >&2;}
+
 fi
 
-    LIBS=$cu_saved_libs
+      LIBS=$cu_saved_libs
+    fi
+    if test $HAVE_GMP != 1; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libgmp development library was not found or not usable." >&5
+$as_echo "$as_me: WARNING: libgmp development library was not found or not usable." >&2;}
+     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GNU coreutils will be built without GMP support." >&5
+$as_echo "$as_me: WARNING: GNU coreutils will be built without GMP support." >&2;}
+    fi
   fi
 
 
@@ -62759,27 +62586,41 @@ if test $gl_cv_list_mounted_fs = yes && test $gl_cv_fs_space = yes; then
 }
 fi
 
-# Limit stdbuf to ELF systems with GCC
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether this is an ELF system" >&5
-$as_echo_n "checking whether this is an ELF system... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether this is system supports stdbuf" >&5
+$as_echo_n "checking whether this is system supports stdbuf... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#if __ELF__
-yes
-#endif
+
+    static int stdbuf = 0;
+
+    /* Restrict to ELF systems with compilers
+       that support the constructor attribute.  */
+    void __attribute__ ((constructor))
+    stdbuf_init (void)
+    {
+      #if __ELF__
+        stdbuf = 1;
+      #endif
+    }
+int
+main ()
+{
+
+    return !(stdbuf == 1);
+  ;
+  return 0;
+}
+
 _ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then :
-  elf_sys=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  stdbuf_supported=yes
 else
-  elf_sys=no
+  stdbuf_supported=no
 fi
-rm -f conftest*
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $elf_sys" >&5
-$as_echo "$elf_sys" >&6; }
-if test "$elf_sys" = "yes" && \
-   test "$GCC" = "yes"; then
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $stdbuf_supported" >&5
+$as_echo "$stdbuf_supported" >&6; }
+if test "$stdbuf_supported" = "yes"; then
   {
   if test -z "$optional_bin_progs"; then
     optional_bin_progs=stdbuf
@@ -63442,7 +63283,7 @@ fi
     optional_bin_progs="$optional_bin_progs yes"
   fi
 }
-no_install_progs_default='arch hostname'
+no_install_progs_default='arch coreutils hostname'
 # Given the name of a variable containing a space-separated
 # list of install-by-default programs and the actual list of
 # do-not-install-by-default programs, modify the former variable
@@ -63454,7 +63295,7 @@ no_install_progs_default='arch hostname'
 # and since the corresponding ./configure option argument is
 # comma-separated on input.
 {
-  gl_no_install_progs_default=`echo 'arch,hostname'|sed 's/,/ /g'`
+  gl_no_install_progs_default=`echo 'arch,coreutils,hostname'|sed 's/,/ /g'`
   # Check whether --enable-install-program was given.
 if test "${enable_install_program+set}" = set; then :
   enableval=$enable_install_program; gl_do_install_prog=$enableval
@@ -63550,6 +63391,66 @@ man1_MANS=`
 # a distribution tarball.
 EXTRA_MANS=`for p in $no_install_progs_default; do echo man/$p.1; done`
 
+# Replace all the programs by the single binary and symlinks if specified.
+single_binary_progs=
+single_binary_libs=
+single_binary_deps=
+single_binary_install_type=
+if test "$gl_single_binary" != no; then
+  man1_MANS="$man1_MANS man/coreutils.1"
+  # Convert the list to a space separated list
+  gl_single_binary_exceptions=`echo $gl_single_binary_exceptions | tr ',' ' '`
+
+  single_binary_progs=`echo $optional_bin_progs`
+  optional_bin_progs="coreutils"
+  for prog in $gl_single_binary_exceptions; do
+    # Fail if requested to exclude a program than was not part of coreutils.
+    case " $single_binary_progs " in
+      *" $prog "*)
+        {
+  single_binary_progs=`for gl_rem_i in $single_binary_progs; do
+        test "$gl_rem_i" = "$prog" || echo "$gl_rem_i"
+      done | tr '\012' ' ' | sed 's/ $//'; echo`
+} ;
+        {
+  if test -z "$optional_bin_progs"; then
+    optional_bin_progs=$prog
+  else
+    optional_bin_progs="$optional_bin_progs $prog"
+  fi
+} ;;
+      *) as_fn_error $? "'$prog' is not being compiled." "$LINENO" 5 ;;
+    esac
+  done
+
+  # single_binary_libs holds the list of libs required by the selected
+  # programs, such as for example -lrt.
+  single_binary_libs=`
+    for p in $single_binary_progs; do
+      # Convert '[' to '_'
+      test x"$p" = x'[' && p='_'
+      printf '$(src_libsinglebin_%s_a_ldadd) ' "$p"
+    done`
+  # single_binary_deps holds the list of libsinglebin_*.a files that have the
+  # compiled code of each selected program in a "library" format.
+  single_binary_deps=`
+    for p in $single_binary_progs; do
+      # Convert '[' to '_'
+      test x"$p" = x'[' && p='_'
+      printf 'src/libsinglebin_%s.a ' "$p"
+    done`
+  single_binary_install_type="$gl_single_binary"
+fi
+single_binary_progs=$single_binary_progs
+
+single_binary_libs=$single_binary_libs
+
+single_binary_deps=$single_binary_deps
+
+single_binary_install_type=$single_binary_install_type
+
+
+
 # The programs built and installed by "make && make install".
 # Since this is AC_SUBST'd, Automake won't be able to perform rewrite
 # with $(EXEEXT) appending on it, so we have to do it ourselves -- in
@@ -63691,7 +63592,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -65088,6 +64989,14 @@ $as_echo "$gt_cv_locale_fr" >&6; }
 
 
 
+# If doing dynamic dependency checking, create man/dynamic-deps.mk so
+# that 'make' doesn't complain about its being absent.  Use an old
+# time stamp, so that 'make' thinks it is older than 'Makefile'.
+# Use time stamp 1, since some 'make' implementations treat 0 specially.
+# Use 'touch -t', since older 'touch' implementations don't grok -d.
+ac_config_commands="$ac_config_commands man/dynamic-deps.mk"
+
+
 ac_config_files="$ac_config_files Makefile po/Makefile.in gnulib-tests/Makefile"
 
 cat >confcache <<\_ACEOF
@@ -65199,6 +65108,14 @@ LIBOBJS=$ac_libobjs
 LTLIBOBJS=$ac_ltlibobjs
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
  if test -n "$EXEEXT"; then
   am__EXEEXT_TRUE=
   am__EXEEXT_FALSE='#'
@@ -65292,9 +65209,6 @@ fi
     esac
   done
 
-  # If $ALLOCA is not empty, prefix its value with "lib/".
-  test -n "$ALLOCA" && ALLOCA="lib/$ALLOCA"
-
 
 if test -z "${GL_GENERATE_STDBOOL_H_TRUE}" && test -z "${GL_GENERATE_STDBOOL_H_FALSE}"; then
   as_fn_error $? "conditional \"GL_GENERATE_STDBOOL_H\" was never defined.
@@ -65359,10 +65273,6 @@ fi
 
 
 
-if test -z "${POSIX_SPAWN_PORTED_TRUE}" && test -z "${POSIX_SPAWN_PORTED_FALSE}"; then
-  as_fn_error $? "conditional \"POSIX_SPAWN_PORTED\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 
     gltests_libobjs=
     gltests_ltlibobjs=
@@ -65383,6 +65293,10 @@ if test -z "${HAVE_PERL_TRUE}" && test -z "${HAVE_PERL_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_PERL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${SINGLE_BINARY_TRUE}" && test -z "${SINGLE_BINARY_FALSE}"; then
+  as_fn_error $? "conditional \"SINGLE_BINARY\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${CROSS_COMPILING_TRUE}" && test -z "${CROSS_COMPILING_FALSE}"; then
   as_fn_error $? "conditional \"CROSS_COMPILING\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -65685,16 +65599,16 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -65754,28 +65668,16 @@ else
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -65796,8 +65698,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by GNU coreutils $as_me 8.21, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+This file was extended by GNU coreutils $as_me 8.23, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -65868,11 +65770,11 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-GNU coreutils config.status 8.21
-configured by $0, generated by GNU Autoconf 2.68,
+GNU coreutils config.status 8.23
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -65963,7 +65865,7 @@ fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
@@ -66009,6 +65911,7 @@ do
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "$GNUmakefile") CONFIG_LINKS="$CONFIG_LINKS $GNUmakefile:$GNUmakefile" ;;
     "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
+    "man/dynamic-deps.mk") CONFIG_COMMANDS="$CONFIG_COMMANDS man/dynamic-deps.mk" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
     "gnulib-tests/Makefile") CONFIG_FILES="$CONFIG_FILES gnulib-tests/Makefile" ;;
@@ -66640,7 +66543,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
 
   case $ac_file$ac_mode in
     "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@ -66653,7 +66556,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
     # Strip MF so we end up with the name of the file.
     mf=`echo "$mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
+    # We used to match only the files named 'Makefile.in', but
     # some people rename them; so instead we look at the file content.
     # Grep'ing the first line is not enough: some people post-process
     # each Makefile.in and add a new line on top of each file to say so.
@@ -66687,21 +66590,19 @@ $as_echo X"$mf" |
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
+    # from the Makefile without running 'make'.
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
     # simplest approach to changing $(DEPDIR) to its actual value in the
     # expansion.
     for file in `sed -n "
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`$as_dirname -- "$file" ||
@@ -66744,7 +66645,7 @@ $as_echo X"$file" |
       case "$ac_file" in */Makefile.in)
         # Adjust a relative srcdir.
         ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+        ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
         ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
         # In autoconf-2.13 it is called $ac_given_srcdir.
         # In autoconf-2.50 it is called $srcdir.
@@ -66848,6 +66749,8 @@ $as_echo X"$file" |
         ;;
       esac
     done ;;
+    "man/dynamic-deps.mk":C) test -n "$AMDEP_TRUE" ||
+   TZ=UTC0 touch -t 197001010000.01 man/dynamic-deps.mk ;;
 
   esac
 done # for ac_tag
diff --git a/configure.ac b/configure.ac
index 3f0c58b9..ae78cb18 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # -*- autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-# Copyright (C) 1991-2013 Free Software Foundation, Inc.
+# Copyright (C) 1991-2014 Free Software Foundation, Inc.
 
 # 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
@@ -100,7 +100,9 @@ AC_ARG_ENABLE([gcc-warnings],
    # we're running from a git repo, then auto enable the warnings.
    gl_gcc_warnings=no
    gl_GCC_VERSION_IFELSE([4], [6],
-                         [test -d "$srcdir"/.git && gl_gcc_warnings=yes])]
+                         [test -d "$srcdir"/.git \
+                          && ! test -f "$srcdir"/.tarball-version \
+                          && gl_gcc_warnings=yes])]
 )
 
 if test "$gl_gcc_warnings" = yes; then
@@ -123,7 +125,7 @@ if test "$gl_gcc_warnings" = yes; then
   nw="$nw -Wunreachable-code"       # Too many warnings for now
   nw="$nw -Wpadded"                 # Our structs are not padded
   nw="$nw -Wredundant-decls"        # openat.h declares e.g., mkdirat
-  nw="$nw -Wlogical-op"             # any use of fwrite provokes this
+  nw="$nw -Wlogical-op"             # Too many warnings until GCC 4.8.0
   nw="$nw -Wformat-nonliteral"      # who.c and pinky.c strftime uses
   nw="$nw -Wvla"                    # warnings in gettext.h
   nw="$nw -Wnested-externs"         # use of XARGMATCH/verify_function__
@@ -149,20 +151,27 @@ if test "$gl_gcc_warnings" = yes; then
   done
   gl_WARN_ADD([-Wno-sign-compare])     # Too many warnings for now
   gl_WARN_ADD([-Wno-unused-parameter]) # Too many warnings for now
-  gl_WARN_ADD([-Wsuggest-attribute=const])
-  gl_WARN_ADD([-Wsuggest-attribute=noreturn])
   gl_WARN_ADD([-Wno-format-nonliteral])
 
-  # Enable this warning only with gcc-4.7 and newer.  With 4.6.2 20111027,
-  # it suggests test.c's advance function may be pure, even though it
-  # increments a global variable.  Oops.
-  # Normally we'd write code to test for the precise failure, but that
-  # requires a relatively large input to make gcc exhibit the failure.
-  gl_GCC_VERSION_IFELSE([4], [7], [gl_WARN_ADD([-Wsuggest-attribute=pure])])
-
-  # In spite of excluding -Wlogical-op above, it is enabled, as of
-  # gcc 4.5.0 20090517, and it provokes warnings in cat.c, dd.c, truncate.c
-  gl_WARN_ADD([-Wno-logical-op])
+  # Enable this warning only with gcc-4.8 and newer.  Before that
+  # bounds checking as done in truncate.c was incorrectly flagged.
+  # See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=43772
+  gl_GCC_VERSION_IFELSE([4], [8], [gl_WARN_ADD([-Wlogical-op])])
+
+  # clang is unduly picky about some things.
+  AC_CACHE_CHECK([whether the compiler is clang], [utils_cv_clang],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM([[
+            #ifndef __clang__
+              #error "not clang"
+            #endif
+          ]])],
+       [utils_cv_clang=yes],
+       [utils_cv_clang=no])])
+  if test $utils_cv_clang = yes; then
+    gl_WARN_ADD([-Wno-format-extra-args])
+    gl_WARN_ADD([-Wno-tautological-constant-out-of-range-compare])
+  fi
 
   gl_WARN_ADD([-fdiagnostics-show-option])
   gl_WARN_ADD([-funit-at-a-time])
@@ -204,6 +213,36 @@ if test "$gl_gcc_warnings" = yes; then
   AC_SUBST([GNULIB_TEST_WARN_CFLAGS])
 fi
 
+AC_ARG_ENABLE([single-binary],
+  [AS_HELP_STRING([--enable-single-binary=[shebangs|symlinks]],
+     [Compile all the tools in a single binary, reducing the overall size.
+      When compiled this way, shebangs (default when enabled) or symlinks are
+      installed for each tool that points to the single binary.])],
+  [gl_single_binary=no ;
+   case $enableval in
+     yes) gl_single_binary=shebangs ;;
+     no|shebangs|symlinks) gl_single_binary=$enableval ;;
+     *)      AC_MSG_ERROR([bad value $enableval for single-binary option.
+                           Options are: symlinks, shebangs, no.]) ;;
+   esac],
+  [gl_single_binary=no]
+)
+AC_ARG_ENABLE([single-binary-exceptions],
+  [AS_HELP_STRING([--enable-single-binary-exceptions=PROG_LIST],
+     [When used with --enable-single-binary, exclude the PROG_LIST from
+      it, so these programs are compiled as separated files
+      (comma-separated, default none))])],
+  [gl_single_binary_exceptions=$enableval],
+  [gl_single_binary_exceptions=]
+)
+if test "$gl_single_binary" = 'symlinks'; then
+  if ! test "`echo ls | sed \"$program_transform_name\"`" = 'ls'; then
+    AC_MSG_ERROR([program name transformations are not currently supported
+                  with --enable-single-binary=symlinks.])
+  fi
+fi
+AM_CONDITIONAL([SINGLE_BINARY], [test "$gl_single_binary" != no])
+
 AC_FUNC_FORK
 
 optional_bin_progs=
@@ -261,6 +300,13 @@ if test $utils_cv_localtime_cache = yes; then
   AC_DEFINE([LOCALTIME_CACHE], [1], [FIXME])
 fi
 
+# Assume that if getattrat exists, it's compatible with Solaris 11.
+AC_CHECK_FUNCS([getattrat])
+if test $ac_cv_func_getattrat = yes; then
+  LIB_NVPAIR=-lnvpair
+  AC_SUBST([LIB_NVPAIR])
+fi
+
 # SCO-ODT-3.0 is reported to need -los to link programs using initgroups
 AC_CHECK_FUNCS([initgroups])
 if test $ac_cv_func_initgroups = no; then
@@ -408,14 +454,26 @@ if test $gl_cv_list_mounted_fs = yes && test $gl_cv_fs_space = yes; then
   gl_ADD_PROG([optional_bin_progs], [df])
 fi
 
-# Limit stdbuf to ELF systems with GCC
-AC_MSG_CHECKING([whether this is an ELF system])
-AC_EGREP_CPP([yes], [#if __ELF__
-yes
-#endif], [elf_sys=yes], [elf_sys=no])
-AC_MSG_RESULT([$elf_sys])
-if test "$elf_sys" = "yes" && \
-   test "$GCC" = "yes"; then
+AC_MSG_CHECKING([whether this is system supports stdbuf])
+AC_COMPILE_IFELSE(
+  [AC_LANG_PROGRAM([[
+    static int stdbuf = 0;
+
+    /* Restrict to ELF systems with compilers
+       that support the constructor attribute.  */
+    void __attribute__ ((constructor))
+    stdbuf_init (void)
+    {
+      #if __ELF__
+        stdbuf = 1;
+      #endif
+    }]],[[
+    return !(stdbuf == 1);]])
+  ],
+  [stdbuf_supported=yes],
+  [stdbuf_supported=no])
+AC_MSG_RESULT([$stdbuf_supported])
+if test "$stdbuf_supported" = "yes"; then
   gl_ADD_PROG([optional_bin_progs], [stdbuf])
 fi
 
@@ -451,6 +509,52 @@ man1_MANS=`
 # a distribution tarball.
 EXTRA_MANS=`for p in $no_install_progs_default; do echo man/$p.1; done`
 
+# Replace all the programs by the single binary and symlinks if specified.
+single_binary_progs=
+single_binary_libs=
+single_binary_deps=
+single_binary_install_type=
+if test "$gl_single_binary" != no; then
+  man1_MANS="$man1_MANS man/coreutils.1"
+  # Convert the list to a space separated list
+  gl_single_binary_exceptions=`echo $gl_single_binary_exceptions | tr ',' ' '`
+
+  single_binary_progs=`echo $optional_bin_progs`
+  optional_bin_progs="coreutils"
+  for prog in $gl_single_binary_exceptions; do
+    # Fail if requested to exclude a program than was not part of coreutils.
+    case " $single_binary_progs " in
+      *" $prog "*)
+        gl_REMOVE_PROG([single_binary_progs], [$prog]) ;
+        gl_ADD_PROG([optional_bin_progs], [$prog]) ;;
+      *) AC_MSG_ERROR(['$prog' is not being compiled.]) ;;
+    esac
+  done
+
+  # single_binary_libs holds the list of libs required by the selected
+  # programs, such as for example -lrt.
+  single_binary_libs=`
+    for p in $single_binary_progs; do
+      # Convert '[' to '_'
+      test x"$p" = x'@<:@' && p='_'
+      printf '$(src_libsinglebin_%s_a_ldadd) ' "$p"
+    done`
+  # single_binary_deps holds the list of libsinglebin_*.a files that have the
+  # compiled code of each selected program in a "library" format.
+  single_binary_deps=`
+    for p in $single_binary_progs; do
+      # Convert '[' to '_'
+      test x"$p" = x'@<:@' && p='_'
+      printf 'src/libsinglebin_%s.a ' "$p"
+    done`
+  single_binary_install_type="$gl_single_binary"
+fi
+AC_SUBST([single_binary_progs], [$single_binary_progs])
+AC_SUBST([single_binary_libs], [$single_binary_libs])
+AC_SUBST([single_binary_deps], [$single_binary_deps])
+AC_SUBST([single_binary_install_type], [$single_binary_install_type])
+
+
 # The programs built and installed by "make && make install".
 # Since this is AC_SUBST'd, Automake won't be able to perform rewrite
 # with $(EXEEXT) appending on it, so we have to do it ourselves -- in
@@ -483,6 +587,15 @@ AM_GNU_GETTEXT_VERSION([0.18.1])
 # For a test of uniq: it uses the $LOCALE_FR envvar.
 gt_LOCALE_FR
 
+# If doing dynamic dependency checking, create man/dynamic-deps.mk so
+# that 'make' doesn't complain about its being absent.  Use an old
+# time stamp, so that 'make' thinks it is older than 'Makefile'.
+# Use time stamp 1, since some 'make' implementations treat 0 specially.
+# Use 'touch -t', since older 'touch' implementations don't grok -d.
+AC_CONFIG_COMMANDS([man/dynamic-deps.mk],
+  [test -n "$AMDEP_TRUE" ||
+   TZ=UTC0 touch -t 197001010000.01 man/dynamic-deps.mk])
+
 AC_CONFIG_FILES(
   Makefile
   po/Makefile.in
diff --git a/doc/ChangeLog-2007 b/doc/ChangeLog-2007
index 81130762..87b26f63 100644
--- a/doc/ChangeLog-2007
+++ b/doc/ChangeLog-2007
@@ -2002,7 +2002,7 @@
 
 	-----
 
-	Copyright (C) 2001-2013 Free Software Foundation, Inc.
+	Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
diff --git a/doc/coreutils.info b/doc/coreutils.info
index 27bba641..495797ec 100644
--- a/doc/coreutils.info
+++ b/doc/coreutils.info
@@ -1,6 +1,17 @@
-This is doc/coreutils.info, produced by makeinfo version 4.13 from
-./doc/coreutils.texi.
+This is coreutils.info, produced by makeinfo version 5.1 from
+coreutils.texi.
 
+This manual documents version 8.23 of the GNU core utilities, including
+the standard programs for text and file manipulation.
+
+   Copyright © 1994-2014 Free Software Foundation, Inc.
+
+     Permission is granted to copy, distribute and/or modify this
+     document under the terms of the GNU Free Documentation License,
+     Version 1.3 or any later version published by the Free Software
+     Foundation; with no Invariant Sections, with no Front-Cover Texts,
+     and with no Back-Cover Texts.  A copy of the license is included in
+     the section entitled “GNU Free Documentation License�.
 INFO-DIR-SECTION Basics
 START-INFO-DIR-ENTRY
 * Coreutils: (coreutils).       Core GNU (file, text, shell) utilities.
@@ -22,6 +33,7 @@ START-INFO-DIR-ENTRY
 * chroot: (coreutils)chroot invocation.         Specify the root directory.
 * cksum: (coreutils)cksum invocation.           Print POSIX CRC checksum.
 * comm: (coreutils)comm invocation.             Compare sorted files by line.
+* coreutils: (coreutils)coreutils invocation.   Multi-call program.
 * cp: (coreutils)cp invocation.                 Copy files.
 * csplit: (coreutils)csplit invocation.         Split by context.
 * cut: (coreutils)cut invocation.               Print selected parts of lines.
@@ -45,7 +57,7 @@ START-INFO-DIR-ENTRY
 * hostid: (coreutils)hostid invocation.         Print numeric host identifier.
 * hostname: (coreutils)hostname invocation.     Print or set system name.
 * id: (coreutils)id invocation.                 Print user identity.
-* install: (coreutils)install invocation.       Copy and change attributes.
+* install: (coreutils)install invocation.       Copy files and set attributes.
 * join: (coreutils)join invocation.             Join lines on a common field.
 * kill: (coreutils)kill invocation.             Send a signal to processes.
 * link: (coreutils)link invocation.             Make hard links between files.
@@ -72,7 +84,7 @@ START-INFO-DIR-ENTRY
 * ptx: (coreutils)ptx invocation.               Produce permuted indexes.
 * pwd: (coreutils)pwd invocation.               Print working directory.
 * readlink: (coreutils)readlink invocation.     Print referent of a symlink.
-* realpath: (coreutils)readpath invocation.     Print resolved file names.
+* realpath: (coreutils)realpath invocation.     Print resolved file names.
 * rm: (coreutils)rm invocation.                 Remove files.
 * rmdir: (coreutils)rmdir invocation.           Remove empty directories.
 * runcon: (coreutils)runcon invocation.         Run in specified SELinux CTX.
@@ -113,35 +125,23 @@ START-INFO-DIR-ENTRY
 * yes: (coreutils)yes invocation.               Print a string indefinitely.
 END-INFO-DIR-ENTRY
 
-   This manual documents version 8.21 of the GNU core utilities,
-including the standard programs for text and file manipulation.
-
-   Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
-     Permission is granted to copy, distribute and/or modify this
-     document under the terms of the GNU Free Documentation License,
-     Version 1.3 or any later version published by the Free Software
-     Foundation; with no Invariant Sections, with no Front-Cover Texts,
-     and with no Back-Cover Texts.  A copy of the license is included
-     in the section entitled "GNU Free Documentation License".
-
 
 File: coreutils.info,  Node: Top,  Next: Introduction,  Up: (dir)
 
 GNU Coreutils
 *************
 
-This manual documents version 8.21 of the GNU core utilities, including
+This manual documents version 8.23 of the GNU core utilities, including
 the standard programs for text and file manipulation.
 
-   Copyright (C) 1994-2013 Free Software Foundation, Inc.
+   Copyright © 1994-2014 Free Software Foundation, Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
      Version 1.3 or any later version published by the Free Software
      Foundation; with no Invariant Sections, with no Front-Cover Texts,
-     and with no Back-Cover Texts.  A copy of the license is included
-     in the section entitled "GNU Free Documentation License".
+     and with no Back-Cover Texts.  A copy of the license is included in
+     the section entitled “GNU Free Documentation License�.
 
 * Menu:
 
@@ -177,7 +177,7 @@ the standard programs for text and file manipulation.
 * GNU Free Documentation License:: Copying and sharing this manual
 * Concept index::                General index
 
- --- The Detailed Node Listing ---
+ — The Detailed Node Listing —
 
 Common Options
 
@@ -186,13 +186,14 @@ Common Options
 * Block size::                   Block size
 * Floating point::               Floating point number representation
 * Signal specifications::        Specifying signals
-* Disambiguating names and IDs:: chgrp and chown owner and group syntax
+* Disambiguating names and IDs:: chgrp, chown, chroot, id: user and group syntax
 * Random sources::               Sources of random data
 * Target directory::             Target directory
 * Trailing slashes::             Trailing slashes
 * Traversing symlinks::          Traversing symlinks to directories
 * Treating / specially::         Treating / specially
 * Standards conformance::        Standards conformance
+* coreutils invocation::         Multi-call binary invocation
 
 Output of entire files
 
@@ -209,8 +210,6 @@ Formatting file contents
 * pr invocation::                Paginate or columnate files for printing
 * fold invocation::              Wrap input lines to fit in specified width
 
-`numfmt': General Options, Units
-
 Output of parts of files
 
 * head invocation::              Output the first part of files
@@ -236,13 +235,13 @@ Operating on sorted files
 * ptx invocation::               Produce a permuted index of file contents
 * tsort invocation::             Topological sort
 
-`ptx': Produce permuted indexes
+‘ptx’: Produce permuted indexes
 
 * General options in ptx::       Options which affect general program behavior
 * Charset selection in ptx::     Underlying character set considerations
 * Input processing in ptx::      Input fields, contexts, and keyword selection
 * Output formatting in ptx::     Types of output format, and sizing the fields
-* Compatibility in ptx::         The GNU extensions to `ptx'
+* Compatibility in ptx::         The GNU extensions to ‘ptx’
 
 Operating on fields
 
@@ -256,7 +255,7 @@ Operating on characters
 * expand invocation::            Convert tabs to spaces
 * unexpand invocation::          Convert spaces to tabs
 
-`tr': Translate, squeeze, and/or delete characters
+‘tr’: Translate, squeeze, and/or delete characters
 
 * Character sets::               Specifying sets of characters
 * Translating::                  Changing one set of characters to another
@@ -267,9 +266,9 @@ Directory listing
 * ls invocation::                List directory contents
 * dir invocation::               Briefly list directory contents
 * vdir invocation::              Verbosely list directory contents
-* dircolors invocation::         Color setup for `ls'
+* dircolors invocation::         Color setup for ‘ls’
 
-`ls':  List directory contents
+‘ls’:  List directory contents
 
 * Which files are listed::       Which files are listed
 * What information is listed::   What information is listed
@@ -326,7 +325,7 @@ Conditions
 * test invocation::              Check file types and compare values
 * expr invocation::              Evaluate expressions
 
-`test': Check file types and compare values
+‘test’: Check file types and compare values
 
 * File type tests::              File type tests
 * Access permission tests::      Access permission tests
@@ -334,12 +333,12 @@ Conditions
 * String tests::                 String tests
 * Numeric tests::                Numeric tests
 
-`expr': Evaluate expression
+‘expr’: Evaluate expression
 
 * String expressions::           + : match substr index length
 * Numeric expressions::          + - * / %
 * Relations for expr::           | & < <= = == != >= >
-* Examples of expr::             Examples of using `expr'
+* Examples of expr::             Examples of using ‘expr’
 
 Redirection
 
@@ -360,7 +359,7 @@ Working context
 * printenv invocation::          Print all or some environment variables
 * tty invocation::               Print file name of terminal on standard input
 
-`stty': Print or change terminal characteristics
+‘stty’: Print or change terminal characteristics
 
 * Control::                      Control settings
 * Input::                        Input settings
@@ -389,7 +388,7 @@ System context
 * hostid invocation::            Print numeric host identifier
 * uptime invocation::            Print system uptime and load
 
-`date': Print or set system date and time
+‘date’: Print or set system date and time
 
 * Time conversion specifiers::   %[HIklMNpPrRsSTXzZ]
 * Date conversion specifiers::   %[aAbBcCdDeFgGhjmuUVwWxyY]
@@ -439,7 +438,7 @@ Date input formats
 * General date syntax::          Common rules
 * Calendar date items::          19 Dec 1994
 * Time of day items::            9:20pm
-* Time zone items::              EST, PDT, UTC, ...
+* Time zone items::              EST, PDT, UTC, …
 * Combined date and time of day items:: 1972-09-24T20:02:00,000000-0500
 * Day of week items::            Monday and others
 * Relative items in date strings:: next tuesday, 2 years ago
@@ -452,16 +451,17 @@ Opening the software toolbox
 
 * Toolbox introduction::         Toolbox introduction
 * I/O redirection::              I/O redirection
-* The who command::              The `who' command
-* The cut command::              The `cut' command
-* The sort command::             The `sort' command
-* The uniq command::             The `uniq' command
+* The who command::              The ‘who’ command
+* The cut command::              The ‘cut’ command
+* The sort command::             The ‘sort’ command
+* The uniq command::             The ‘uniq’ command
 * Putting the tools together::   Putting the tools together
 
 Copying This Manual
 
 * GNU Free Documentation License::     Copying and sharing this manual
 
+
 
 File: coreutils.info,  Node: Introduction,  Next: Common options,  Prev: Top,  Up: Top
 
@@ -479,13 +479,13 @@ Remember to include the version number, machine architecture, input
 files, and any other information needed to reproduce the bug: your
 input, what you expected, what you got, and why it is wrong.  Diffs are
 welcome, but please include a description of the problem as well, since
-this is sometimes difficult to infer.  *Note Bugs: (gcc)Bugs.
+this is sometimes difficult to infer.  *Note (gcc)Bugs::.
 
    This manual was originally derived from the Unix man pages in the
 distributions, which were written by David MacKenzie and updated by Jim
 Meyering.  What you are reading now is the authoritative documentation
 for these utilities; the man pages are no longer being maintained.  The
-original `fmt' man page was written by Ross Paterson.  Franc,ois Pinard
+original ‘fmt’ man page was written by Ross Paterson.  François Pinard
 did the initial conversion to Texinfo format.  Karl Berry did the
 indexing, some reorganization, and editing of the results.  Brian
 Youmans of the Free Software Foundation office staff combined the
@@ -506,64 +506,63 @@ these options.)
 
    Normally options and operands can appear in any order, and programs
 act as if all the options appear before any operands.  For example,
-`sort -r passwd -t :' acts like `sort -r -t : passwd', since `:' is an
-option-argument of `-t'.  However, if the `POSIXLY_CORRECT' environment
+‘sort -r passwd -t :’ acts like ‘sort -r -t : passwd’, since ‘:’ is an
+option-argument of ‘-t’.  However, if the ‘POSIXLY_CORRECT’ environment
 variable is set, options must appear before operands, unless otherwise
 specified for a particular command.
 
-   A few programs can usefully have trailing operands with leading `-'.
+   A few programs can usefully have trailing operands with leading ‘-’.
 With such a program, options must precede operands even if
-`POSIXLY_CORRECT' is not set, and this fact is noted in the program
-description.  For example, the `env' command's options must appear
+‘POSIXLY_CORRECT’ is not set, and this fact is noted in the program
+description.  For example, the ‘env’ command’s options must appear
 before its operands, since in some cases the operands specify a command
 that itself contains options.
 
    Most programs that accept long options recognize unambiguous
-abbreviations of those options.  For example, `rmdir
---ignore-fail-on-non-empty' can be invoked as `rmdir --ignore-fail' or
-even `rmdir --i'.  Ambiguous options, such as `ls --h', are identified
+abbreviations of those options.  For example, ‘rmdir
+--ignore-fail-on-non-empty’ can be invoked as ‘rmdir --ignore-fail’ or
+even ‘rmdir --i’.  Ambiguous options, such as ‘ls --h’, are identified
 as such.
 
-   Some of these programs recognize the `--help' and `--version'
-options only when one of them is the sole command line argument.  For
-these programs, abbreviations of the long options are not always
-recognized.
+   Some of these programs recognize the ‘--help’ and ‘--version’ options
+only when one of them is the sole command line argument.  For these
+programs, abbreviations of the long options are not always recognized.
 
-`--help'
+‘--help’
      Print a usage message listing all available options, then exit
      successfully.
 
-`--version'
+‘--version’
      Print the version number, then exit successfully.
 
-`--'
+‘--’
      Delimit the option list.  Later arguments, if any, are treated as
-     operands even if they begin with `-'.  For example, `sort -- -r'
-     reads from the file named `-r'.
+     operands even if they begin with ‘-’.  For example, ‘sort -- -r’
+     reads from the file named ‘-r’.
 
-
-   A single `-' operand is not really an option, though it looks like
+   A single ‘-’ operand is not really an option, though it looks like
 one.  It stands for standard input, or for standard output if that is
-clear from the context.  For example, `sort -' reads from standard
-input, and is equivalent to plain `sort', and `tee -' writes an extra
-copy of its input to standard output.  Unless otherwise specified, `-'
+clear from the context.  For example, ‘sort -’ reads from standard
+input, and is equivalent to plain ‘sort’, and ‘tee -’ writes an extra
+copy of its input to standard output.  Unless otherwise specified, ‘-’
 can appear as any operand that requires a file name.
 
 * Menu:
 
 * Exit status::                 Indicating program success or failure.
 * Backup options::              -b -S, in some programs.
-* Block size::                  BLOCK_SIZE and --block-size, in some programs.
+* Block size::                  BLOCK_SIZE and –block-size, in some programs.
 * Floating point::              Floating point number representation.
-* Signal specifications::       Specifying signals using the --signal option.
-* Disambiguating names and IDs:: chgrp and chown owner and group syntax
-* Random sources::              --random-source, in some programs.
+* Signal specifications::       Specifying signals using the –signal option.
+* Disambiguating names and IDs:: chgrp, chown, chroot, id: user and group syntax
+* Random sources::              –random-source, in some programs.
 * Target directory::            Specifying a target directory, in some programs.
-* Trailing slashes::            --strip-trailing-slashes, in some programs.
+* Trailing slashes::            –strip-trailing-slashes, in some programs.
 * Traversing symlinks::         -H, -L, or -P, in some programs.
-* Treating / specially::        --preserve-root and --no-preserve-root.
-* Special built-in utilities::  `break', `:', ...
+* Treating / specially::        –preserve-root and –no-preserve-root.
+* Special built-in utilities::  ‘break’, ‘:’, …
 * Standards conformance::       Conformance to the POSIX standard.
+* coreutils invocation::        Multi-call binary invocation.
 
 
 File: coreutils.info,  Node: Exit status,  Next: Backup options,  Up: Common options
@@ -572,16 +571,16 @@ File: coreutils.info,  Node: Exit status,  Next: Backup options,  Up: Common opt
 ===============
 
 Nearly every command invocation yields an integral "exit status" that
-can be used to change how other commands work.  For the vast majority
-of commands, an exit status of zero indicates success.  Failure is
-indicated by a nonzero value--typically `1', though it may differ on
+can be used to change how other commands work.  For the vast majority of
+commands, an exit status of zero indicates success.  Failure is
+indicated by a nonzero value—typically ‘1’, though it may differ on
 unusual platforms as POSIX requires only that it be nonzero.
 
    However, some of the programs documented here do produce other exit
-status values and a few associate different meanings with the values
-`0' and `1'.  Here are some of the exceptions: `chroot', `env', `expr',
-`nice', `nohup', `numfmt', `printenv', `sort', `stdbuf', `test',
-`timeout', `tty'.
+status values and a few associate different meanings with the values ‘0’
+and ‘1’.  Here are some of the exceptions: ‘chroot’, ‘env’, ‘expr’,
+‘nice’, ‘nohup’, ‘numfmt’, ‘printenv’, ‘sort’, ‘stdbuf’, ‘test’,
+‘timeout’, ‘tty’.
 
 
 File: coreutils.info,  Node: Backup options,  Next: Block size,  Prev: Exit status,  Up: Common options
@@ -589,55 +588,53 @@ File: coreutils.info,  Node: Backup options,  Next: Block size,  Prev: Exit stat
 2.2 Backup options
 ==================
 
-Some GNU programs (at least `cp', `install', `ln', and `mv') optionally
+Some GNU programs (at least ‘cp’, ‘install’, ‘ln’, and ‘mv’) optionally
 make backups of files before writing new versions.  These options
 control the details of these backups.  The options are also briefly
 mentioned in the descriptions of the particular programs.
 
-`-b'
-`--backup[=METHOD]'
+‘-b’
+‘--backup[=METHOD]’
      Make a backup of each file that would otherwise be overwritten or
      removed.  Without this option, the original versions are destroyed.
      Use METHOD to determine the type of backups to make.  When this
      option is used but METHOD is not specified, then the value of the
-     `VERSION_CONTROL' environment variable is used.  And if
-     `VERSION_CONTROL' is not set, the default backup type is
-     `existing'.
+     ‘VERSION_CONTROL’ environment variable is used.  And if
+     ‘VERSION_CONTROL’ is not set, the default backup type is
+     ‘existing’.
 
-     Note that the short form of this option, `-b' does not accept any
-     argument.  Using `-b' is equivalent to using `--backup=existing'.
+     Note that the short form of this option, ‘-b’ does not accept any
+     argument.  Using ‘-b’ is equivalent to using ‘--backup=existing’.
 
-     This option corresponds to the Emacs variable `version-control';
+     This option corresponds to the Emacs variable ‘version-control’;
      the values for METHOD are the same as those used in Emacs.  This
      option also accepts more descriptive names.  The valid METHODs are
      (unique abbreviations are accepted):
 
-    `none'
-    `off'
+     ‘none’
+     ‘off’
           Never make backups.
 
-    `numbered'
-    `t'
+     ‘numbered’
+     ‘t’
           Always make numbered backups.
 
-    `existing'
-    `nil'
+     ‘existing’
+     ‘nil’
           Make numbered backups of files that already have them, simple
           backups of the others.
 
-    `simple'
-    `never'
-          Always make simple backups.  Please note `never' is not to be
-          confused with `none'.
-
-
-`-S SUFFIX'
-`--suffix=SUFFIX'
-     Append SUFFIX to each backup file made with `-b'.  If this option
-     is not specified, the value of the `SIMPLE_BACKUP_SUFFIX'
-     environment variable is used.  And if `SIMPLE_BACKUP_SUFFIX' is not
-     set, the default is `~', just as in Emacs.
+     ‘simple’
+     ‘never’
+          Always make simple backups.  Please note ‘never’ is not to be
+          confused with ‘none’.
 
+‘-S SUFFIX’
+‘--suffix=SUFFIX’
+     Append SUFFIX to each backup file made with ‘-b’.  If this option
+     is not specified, the value of the ‘SIMPLE_BACKUP_SUFFIX’
+     environment variable is used.  And if ‘SIMPLE_BACKUP_SUFFIX’ is not
+     set, the default is ‘~’, just as in Emacs.
 
 
 File: coreutils.info,  Node: Block size,  Next: Floating point,  Prev: Backup options,  Up: Common options
@@ -645,45 +642,44 @@ File: coreutils.info,  Node: Block size,  Next: Floating point,  Prev: Backup op
 2.3 Block size
 ==============
 
-Some GNU programs (at least `df', `du', and `ls') display sizes in
-"blocks".  You can adjust the block size and method of display to make
-sizes easier to read.  The block size used for display is independent
-of any file system block size.  Fractional block counts are rounded up
-to the nearest integer.
+Some GNU programs (at least ‘df’, ‘du’, and ‘ls’) display sizes in
+“blocks�.  You can adjust the block size and method of display to make
+sizes easier to read.  The block size used for display is independent of
+any file system block size.  Fractional block counts are rounded up to
+the nearest integer.
 
    The default block size is chosen by examining the following
 environment variables in turn; the first one that is set determines the
 block size.
 
-`DF_BLOCK_SIZE'
-     This specifies the default block size for the `df' command.
-     Similarly, `DU_BLOCK_SIZE' specifies the default for `du' and
-     `LS_BLOCK_SIZE' for `ls'.
+‘DF_BLOCK_SIZE’
+     This specifies the default block size for the ‘df’ command.
+     Similarly, ‘DU_BLOCK_SIZE’ specifies the default for ‘du’ and
+     ‘LS_BLOCK_SIZE’ for ‘ls’.
 
-`BLOCK_SIZE'
+‘BLOCK_SIZE’
      This specifies the default block size for all three commands, if
      the above command-specific environment variables are not set.
 
-`BLOCKSIZE'
+‘BLOCKSIZE’
      This specifies the default block size for all values that are
-     normally printed as blocks, if neither `BLOCK_SIZE' nor the above
+     normally printed as blocks, if neither ‘BLOCK_SIZE’ nor the above
      command-specific environment variables are set.  Unlike the other
-     environment variables, `BLOCKSIZE' does not affect values that are
+     environment variables, ‘BLOCKSIZE’ does not affect values that are
      normally printed as byte counts, e.g., the file sizes contained in
-     `ls -l' output.
+     ‘ls -l’ output.
 
-`POSIXLY_CORRECT'
-     If neither `COMMAND_BLOCK_SIZE', nor `BLOCK_SIZE', nor `BLOCKSIZE'
+‘POSIXLY_CORRECT’
+     If neither ‘COMMAND_BLOCK_SIZE’, nor ‘BLOCK_SIZE’, nor ‘BLOCKSIZE’
      is set, but this variable is set, the block size defaults to 512.
 
-
    If none of the above environment variables are set, the block size
 currently defaults to 1024 bytes in most contexts, but this number may
-change in the future.  For `ls' file sizes, the block size defaults to
-1 byte.
+change in the future.  For ‘ls’ file sizes, the block size defaults to 1
+byte.
 
    A block size specification can be a positive integer specifying the
-number of bytes per block, or it can be `human-readable' or `si' to
+number of bytes per block, or it can be ‘human-readable’ or ‘si’ to
 select a human-readable format.  Integers may be followed by suffixes
 that are upward compatible with the SI prefixes
 (http://www.bipm.org/en/si/si_brochure/chapter3/prefixes.html) for
@@ -692,96 +688,83 @@ prefixes (http://physics.nist.gov/cuu/Units/binary.html) for binary
 multiples.
 
    With human-readable formats, output sizes are followed by a size
-letter such as `M' for megabytes.  `BLOCK_SIZE=human-readable' uses
-powers of 1024; `M' stands for 1,048,576 bytes.  `BLOCK_SIZE=si' is
-similar, but uses powers of 1000 and appends `B'; `MB' stands for
+letter such as ‘M’ for megabytes.  ‘BLOCK_SIZE=human-readable’ uses
+powers of 1024; ‘M’ stands for 1,048,576 bytes.  ‘BLOCK_SIZE=si’ is
+similar, but uses powers of 1000 and appends ‘B’; ‘MB’ stands for
 1,000,000 bytes.
 
-   A block size specification preceded by `'' causes output sizes to be
-displayed with thousands separators.  The `LC_NUMERIC' locale specifies
+   A block size specification preceded by ‘'’ causes output sizes to be
+displayed with thousands separators.  The ‘LC_NUMERIC’ locale specifies
 the thousands separator and grouping.  For example, in an American
-English locale, `--block-size="'1kB"' would cause a size of 1234000
-bytes to be displayed as `1,234'.  In the default C locale, there is no
-thousands separator so a leading `'' has no effect.
+English locale, ‘--block-size="'1kB"’ would cause a size of 1234000
+bytes to be displayed as ‘1,234’.  In the default C locale, there is no
+thousands separator so a leading ‘'’ has no effect.
 
    An integer block size can be followed by a suffix to specify a
-multiple of that size.  A bare size letter, or one followed by `iB',
+multiple of that size.  A bare size letter, or one followed by ‘iB’,
 specifies a multiple using powers of 1024.  A size letter followed by
-`B' specifies powers of 1000 instead.  For example, `1M' and `1MiB' are
-equivalent to `1048576', whereas `1MB' is equivalent to `1000000'.
+‘B’ specifies powers of 1000 instead.  For example, ‘1M’ and ‘1MiB’ are
+equivalent to ‘1048576’, whereas ‘1MB’ is equivalent to ‘1000000’.
 
-   A plain suffix without a preceding integer acts as if `1' were
-prepended, except that it causes a size indication to be appended to
-the output.  For example, `--block-size="kB"' displays 3000 as `3kB'.
+   A plain suffix without a preceding integer acts as if ‘1’ were
+prepended, except that it causes a size indication to be appended to the
+output.  For example, ‘--block-size="kB"’ displays 3000 as ‘3kB’.
 
-   The following suffixes are defined.  Large sizes like `1Y' may be
+   The following suffixes are defined.  Large sizes like ‘1Y’ may be
 rejected by your computer due to limitations of its arithmetic.
 
-`kB'
+‘kB’
      kilobyte: 10^3 = 1000.
-
-`k'
-`K'
-`KiB'
-     kibibyte: 2^10 = 1024.  `K' is special: the SI prefix is `k' and
-     the ISO/IEC 80000-13 prefix is `Ki', but tradition and POSIX use
-     `k' to mean `KiB'.
-
-`MB'
+‘k’
+‘K’
+‘KiB’
+     kibibyte: 2^{10} = 1024.  ‘K’ is special: the SI prefix is ‘k’ and
+     the ISO/IEC 80000-13 prefix is ‘Ki’, but tradition and POSIX use
+     ‘k’ to mean ‘KiB’.
+‘MB’
      megabyte: 10^6 = 1,000,000.
-
-`M'
-`MiB'
-     mebibyte: 2^20 = 1,048,576.
-
-`GB'
+‘M’
+‘MiB’
+     mebibyte: 2^{20} = 1,048,576.
+‘GB’
      gigabyte: 10^9 = 1,000,000,000.
-
-`G'
-`GiB'
-     gibibyte: 2^30 = 1,073,741,824.
-
-`TB'
-     terabyte:  10^12 = 1,000,000,000,000.
-
-`T'
-`TiB'
-     tebibyte: 2^40 = 1,099,511,627,776.
-
-`PB'
-     petabyte: 10^15 = 1,000,000,000,000,000.
-
-`P'
-`PiB'
-     pebibyte: 2^50 = 1,125,899,906,842,624.
-
-`EB'
-     exabyte: 10^18 = 1,000,000,000,000,000,000.
-
-`E'
-`EiB'
-     exbibyte: 2^60 = 1,152,921,504,606,846,976.
-
-`ZB'
-     zettabyte: 10^21 = 1,000,000,000,000,000,000,000
-
-`Z'
-`ZiB'
-     2^70 = 1,180,591,620,717,411,303,424.
-
-`YB'
-     yottabyte: 10^24 = 1,000,000,000,000,000,000,000,000.
-
-`Y'
-`YiB'
-     2^80 = 1,208,925,819,614,629,174,706,176.
+‘G’
+‘GiB’
+     gibibyte: 2^{30} = 1,073,741,824.
+‘TB’
+     terabyte: 10^{12} = 1,000,000,000,000.
+‘T’
+‘TiB’
+     tebibyte: 2^{40} = 1,099,511,627,776.
+‘PB’
+     petabyte: 10^{15} = 1,000,000,000,000,000.
+‘P’
+‘PiB’
+     pebibyte: 2^{50} = 1,125,899,906,842,624.
+‘EB’
+     exabyte: 10^{18} = 1,000,000,000,000,000,000.
+‘E’
+‘EiB’
+     exbibyte: 2^{60} = 1,152,921,504,606,846,976.
+‘ZB’
+     zettabyte: 10^{21} = 1,000,000,000,000,000,000,000
+‘Z’
+‘ZiB’
+     2^{70} = 1,180,591,620,717,411,303,424.
+‘YB’
+     yottabyte: 10^{24} = 1,000,000,000,000,000,000,000,000.
+‘Y’
+‘YiB’
+     2^{80} = 1,208,925,819,614,629,174,706,176.
 
    Block size defaults can be overridden by an explicit
-`--block-size=SIZE' option.  The `-k' option is equivalent to
-`--block-size=1K', which is the default unless the `POSIXLY_CORRECT'
-environment variable is set.  The `-h' or `--human-readable' option is
-equivalent to `--block-size=human-readable'.  The `--si' option is
-equivalent to `--block-size=si'.
+‘--block-size=SIZE’ option.  The ‘-k’ option is equivalent to
+‘--block-size=1K’, which is the default unless the ‘POSIXLY_CORRECT’
+environment variable is set.  The ‘-h’ or ‘--human-readable’ option is
+equivalent to ‘--block-size=human-readable’.  The ‘--si’ option is
+equivalent to ‘--block-size=si’.  Note for ‘ls’ the ‘-k’ option does not
+control the display of the apparent file sizes, whereas the
+‘--block-size’ option does.
 
 
 File: coreutils.info,  Node: Floating point,  Next: Signal specifications,  Prev: Block size,  Up: Common options
@@ -791,23 +774,23 @@ File: coreutils.info,  Node: Floating point,  Next: Signal specifications,  Prev
 
 Commands that accept or produce floating point numbers employ the
 floating point representation of the underlying system, and suffer from
-rounding error, overflow, and similar floating-point issues.  Almost
-all modern systems use IEEE-754 floating point, and it is typically
-portable to assume IEEE-754 behavior these days.  IEEE-754 has positive
-and negative infinity, distinguishes positive from negative zero, and
-uses special values called NaNs to represent invalid computations such
-as dividing zero by itself.  For more information, please see David
-Goldberg's paper What Every Computer Scientist Should Know About
+rounding error, overflow, and similar floating-point issues.  Almost all
+modern systems use IEEE-754 floating point, and it is typically portable
+to assume IEEE-754 behavior these days.  IEEE-754 has positive and
+negative infinity, distinguishes positive from negative zero, and uses
+special values called NaNs to represent invalid computations such as
+dividing zero by itself.  For more information, please see David
+Goldberg’s paper What Every Computer Scientist Should Know About
 Floating-Point Arithmetic (http://www.validlab.com/goldberg/paper.pdf).
 
    Commands that accept floating point numbers as options, operands or
-input use the standard C functions `strtod' and `strtold' to convert
+input use the standard C functions ‘strtod’ and ‘strtold’ to convert
 from text to floating point numbers.  These floating point numbers
-therefore can use scientific notation like `1.0e-34' and `-10e100'.
+therefore can use scientific notation like ‘1.0e-34’ and ‘-10e100’.
 Modern C implementations also accept hexadecimal floating point numbers
-such as `-0x.ep-3', which stands for -14/16 times 2^-3, which equals
--0.109375.  The `LC_NUMERIC' locale determines the decimal-point
-character.  *Note Parsing of Floats: (libc)Parsing of Floats.
+such as ‘-0x.ep-3’, which stands for −14/16 times 2^-3, which equals
+−0.109375.  The ‘LC_NUMERIC’ locale determines the decimal-point
+character.  *Note (libc)Parsing of Floats::.
 
 
 File: coreutils.info,  Node: Signal specifications,  Next: Disambiguating names and IDs,  Prev: Floating point,  Up: Common options
@@ -815,138 +798,113 @@ File: coreutils.info,  Node: Signal specifications,  Next: Disambiguating names
 2.5 Signal specifications
 =========================
 
-A SIGNAL may be a signal name like `HUP', or a signal number like `1',
+A SIGNAL may be a signal name like ‘HUP’, or a signal number like ‘1’,
 or an exit status of a process terminated by the signal.  A signal name
-can be given in canonical form or prefixed by `SIG'.  The case of the
+can be given in canonical form or prefixed by ‘SIG’.  The case of the
 letters is ignored.  The following signal names and numbers are
 supported on all POSIX compliant systems:
 
-`HUP'
+‘HUP’
      1.  Hangup.
-
-`INT'
+‘INT’
      2.  Terminal interrupt.
-
-`QUIT'
+‘QUIT’
      3.  Terminal quit.
-
-`ABRT'
+‘ABRT’
      6.  Process abort.
-
-`KILL'
+‘KILL’
      9.  Kill (cannot be caught or ignored).
-
-`ALRM'
+‘ALRM’
      14.  Alarm Clock.
-
-`TERM'
+‘TERM’
      15.  Termination.
 
 Other supported signal names have system-dependent corresponding
 numbers.  All systems conforming to POSIX 1003.1-2001 also support the
 following signals:
 
-`BUS'
+‘BUS’
      Access to an undefined portion of a memory object.
-
-`CHLD'
+‘CHLD’
      Child process terminated, stopped, or continued.
-
-`CONT'
+‘CONT’
      Continue executing, if stopped.
-
-`FPE'
+‘FPE’
      Erroneous arithmetic operation.
-
-`ILL'
+‘ILL’
      Illegal Instruction.
-
-`PIPE'
+‘PIPE’
      Write on a pipe with no one to read it.
-
-`SEGV'
+‘SEGV’
      Invalid memory reference.
-
-`STOP'
+‘STOP’
      Stop executing (cannot be caught or ignored).
-
-`TSTP'
+‘TSTP’
      Terminal stop.
-
-`TTIN'
+‘TTIN’
      Background process attempting read.
-
-`TTOU'
+‘TTOU’
      Background process attempting write.
-
-`URG'
+‘URG’
      High bandwidth data is available at a socket.
-
-`USR1'
+‘USR1’
      User-defined signal 1.
-
-`USR2'
+‘USR2’
      User-defined signal 2.
 
 POSIX 1003.1-2001 systems that support the XSI extension also support
 the following signals:
 
-`POLL'
+‘POLL’
      Pollable event.
-
-`PROF'
+‘PROF’
      Profiling timer expired.
-
-`SYS'
+‘SYS’
      Bad system call.
-
-`TRAP'
+‘TRAP’
      Trace/breakpoint trap.
-
-`VTALRM'
+‘VTALRM’
      Virtual timer expired.
-
-`XCPU'
+‘XCPU’
      CPU time limit exceeded.
-
-`XFSZ'
+‘XFSZ’
      File size limit exceeded.
 
-POSIX 1003.1-2001 systems that support the XRT extension also support
-at least eight real-time signals called `RTMIN', `RTMIN+1', ...,
-`RTMAX-1', `RTMAX'.
+POSIX 1003.1-2001 systems that support the XRT extension also support at
+least eight real-time signals called ‘RTMIN’, ‘RTMIN+1’, …, ‘RTMAX-1’,
+‘RTMAX’.
 
 
 File: coreutils.info,  Node: Disambiguating names and IDs,  Next: Random sources,  Prev: Signal specifications,  Up: Common options
 
-2.6 chown and chgrp: Disambiguating user names and IDs
-======================================================
+2.6 chown, chgrp, chroot, id: Disambiguating user names and IDs
+===============================================================
 
-Since the OWNER and GROUP arguments to `chown' and `chgrp' may be
-specified as names or numeric IDs, there is an apparent ambiguity.
-What if a user or group _name_ is a string of digits?  (1) Should the
-command interpret it as a user name or as an ID?  POSIX requires that
-`chown' and `chgrp' first attempt to resolve the specified string as a
-name, and only once that fails, then try to interpret it as an ID.
-This is troublesome when you want to specify a numeric ID, say 42, and
-it must work even in a pathological situation where `42' is a user name
-that maps to some other user ID, say 1000.  Simply invoking `chown 42
-F', will set `F's owner ID to 1000--not what you intended.
-
-   GNU `chown' and `chgrp' provide a way to work around this, that at
-the same time may result in a significant performance improvement by
-eliminating a database look-up.  Simply precede each numeric user ID
-and/or group ID with a `+', in order to force its interpretation as an
-integer:
+Since the USER and GROUP arguments to these commands may be specified as
+names or numeric IDs, there is an apparent ambiguity.  What if a user or
+group _name_ is a string of digits?  (1) Should the command interpret it
+as a user name or as an ID?  POSIX requires that these commands first
+attempt to resolve the specified string as a name, and only once that
+fails, then try to interpret it as an ID.  This is troublesome when you
+want to specify a numeric ID, say 42, and it must work even in a
+pathological situation where ‘42’ is a user name that maps to some other
+user ID, say 1000.  Simply invoking ‘chown 42 F’, will set ‘F’s owner ID
+to 1000—not what you intended.
+
+   GNU ‘chown’, ‘chgrp’, ‘chroot’, and ‘id’ provide a way to work around
+this, that at the same time may result in a significant performance
+improvement by eliminating a database look-up.  Simply precede each
+numeric user ID and/or group ID with a ‘+’, in order to force its
+interpretation as an integer:
 
      chown +42 F
      chgrp +$numeric_group_id another-file
      chown +0:+0 /
 
-   GNU `chown' and `chgrp' skip the name look-up process for each
-`+'-prefixed string, because a string containing `+' is never a valid
-user or group name.  This syntax is accepted on most common Unix
-systems, but not on Solaris 10.
+   The name look-up process is skipped for each ‘+’-prefixed string,
+because a string containing ‘+’ is never a valid user or group name.
+This syntax is accepted on most common Unix systems, but not on Solaris
+10.
 
    ---------- Footnotes ----------
 
@@ -958,16 +916,16 @@ File: coreutils.info,  Node: Random sources,  Next: Target directory,  Prev: Dis
 2.7 Sources of random data
 ==========================
 
-The `shuf', `shred', and `sort' commands sometimes need random data to
-do their work.  For example, `sort -R' must choose a hash function at
+The ‘shuf’, ‘shred’, and ‘sort’ commands sometimes need random data to
+do their work.  For example, ‘sort -R’ must choose a hash function at
 random, and it needs random data to make this selection.
 
    By default these commands use an internal pseudorandom generator
 initialized by a small amount of entropy, but can be directed to use an
-external source with the `--random-source=FILE' option.  An error is
+external source with the ‘--random-source=FILE’ option.  An error is
 reported if FILE does not contain enough bytes.
 
-   For example, the device file `/dev/urandom' could be used as the
+   For example, the device file ‘/dev/urandom’ could be used as the
 source of random data.  Typically, this device gathers environmental
 noise from device drivers and other sources into an entropy pool, and
 uses the pool to generate random bits.  If the pool is short of data,
@@ -976,10 +934,10 @@ cryptographically secure pseudorandom number generator.  But be aware
 that this device is not designed for bulk random data generation and is
 relatively slow.
 
-   `/dev/urandom' suffices for most practical uses, but applications
-requiring high-value or long-term protection of private data may
-require an alternate data source like `/dev/random' or `/dev/arandom'.
-The set of available sources depends on your operating system.
+   ‘/dev/urandom’ suffices for most practical uses, but applications
+requiring high-value or long-term protection of private data may require
+an alternate data source like ‘/dev/random’ or ‘/dev/arandom’.  The set
+of available sources depends on your operating system.
 
    To reproduce the results of an earlier invocation of a command, you
 can save some random data into a file and then use that file as the
@@ -991,60 +949,59 @@ File: coreutils.info,  Node: Target directory,  Next: Trailing slashes,  Prev: R
 2.8 Target directory
 ====================
 
-The `cp', `install', `ln', and `mv' commands normally treat the last
+The ‘cp’, ‘install’, ‘ln’, and ‘mv’ commands normally treat the last
 operand specially when it is a directory or a symbolic link to a
-directory.  For example, `cp source dest' is equivalent to `cp source
-dest/source' if `dest' is a directory.  Sometimes this behavior is not
+directory.  For example, ‘cp source dest’ is equivalent to ‘cp source
+dest/source’ if ‘dest’ is a directory.  Sometimes this behavior is not
 exactly what is wanted, so these commands support the following options
 to allow more fine-grained control:
 
-`-T'
-`--no-target-directory'
+‘-T’
+‘--no-target-directory’
      Do not treat the last operand specially when it is a directory or a
      symbolic link to a directory.  This can help avoid race conditions
      in programs that operate in a shared area.  For example, when the
-     command `mv /tmp/source /tmp/dest' succeeds, there is no guarantee
-     that `/tmp/source' was renamed to `/tmp/dest': it could have been
-     renamed to `/tmp/dest/source' instead, if some other process
-     created `/tmp/dest' as a directory.  However, if `mv -T
-     /tmp/source /tmp/dest' succeeds, there is no question that
-     `/tmp/source' was renamed to `/tmp/dest'.
+     command ‘mv /tmp/source /tmp/dest’ succeeds, there is no guarantee
+     that ‘/tmp/source’ was renamed to ‘/tmp/dest’: it could have been
+     renamed to ‘/tmp/dest/source’ instead, if some other process
+     created ‘/tmp/dest’ as a directory.  However, if ‘mv -T /tmp/source
+     /tmp/dest’ succeeds, there is no question that ‘/tmp/source’ was
+     renamed to ‘/tmp/dest’.
 
      In the opposite situation, where you want the last operand to be
      treated as a directory and want a diagnostic otherwise, you can use
-     the `--target-directory' (`-t') option.
+     the ‘--target-directory’ (‘-t’) option.
 
-`-t DIRECTORY'
-`--target-directory=DIRECTORY'
+‘-t DIRECTORY’
+‘--target-directory=DIRECTORY’
      Use DIRECTORY as the directory component of each destination file
      name.
 
      The interface for most programs is that after processing options
      and a finite (possibly zero) number of fixed-position arguments,
-     the remaining argument list is either expected to be empty, or is
-     a list of items (usually files) that will all be handled
-     identically.  The `xargs' program is designed to work well with
-     this convention.
+     the remaining argument list is either expected to be empty, or is a
+     list of items (usually files) that will all be handled identically.
+     The ‘xargs’ program is designed to work well with this convention.
 
-     The commands in the `mv'-family are unusual in that they take a
+     The commands in the ‘mv’-family are unusual in that they take a
      variable number of arguments with a special case at the _end_
      (namely, the target directory).  This makes it nontrivial to
-     perform some operations, e.g., "move all files from here to
-     ../d/", because `mv * ../d/' might exhaust the argument space, and
-     `ls | xargs ...' doesn't have a clean way to specify an extra
-     final argument for each invocation of the subject command.  (It
-     can be done by going through a shell command, but that requires
-     more human labor and brain power than it should.)
-
-     The `--target-directory' (`-t') option allows the `cp', `install',
-     `ln', and `mv' programs to be used conveniently with `xargs'.  For
+     perform some operations, e.g., “move all files from here to ../d/�,
+     because ‘mv * ../d/’ might exhaust the argument space, and ‘ls |
+     xargs ...’ doesn’t have a clean way to specify an extra final
+     argument for each invocation of the subject command.  (It can be
+     done by going through a shell command, but that requires more human
+     labor and brain power than it should.)
+
+     The ‘--target-directory’ (‘-t’) option allows the ‘cp’, ‘install’,
+     ‘ln’, and ‘mv’ programs to be used conveniently with ‘xargs’.  For
      example, you can move the files from the current directory to a
-     sibling directory, `d' like this:
+     sibling directory, ‘d’ like this:
 
           ls | xargs mv -t ../d --
 
-     However, this doesn't move files whose names begin with `.'.  If
-     you use the GNU `find' program, you can move those files too, with
+     However, this doesn’t move files whose names begin with ‘.’.  If
+     you use the GNU ‘find’ program, you can move those files too, with
      this command:
 
           find . -mindepth 1 -maxdepth 1 \
@@ -1052,15 +1009,14 @@ to allow more fine-grained control:
 
      But both of the above approaches fail if there are no files in the
      current directory, or if any file has a name containing a blank or
-     some other special characters.  The following example removes
-     those limitations and requires both GNU `find' and GNU `xargs':
+     some other special characters.  The following example removes those
+     limitations and requires both GNU ‘find’ and GNU ‘xargs’:
 
           find . -mindepth 1 -maxdepth 1 -print0 \
             | xargs --null --no-run-if-empty \
                 mv -t ../d
 
-
-The `--target-directory' (`-t') and `--no-target-directory' (`-T')
+The ‘--target-directory’ (‘-t’) and ‘--no-target-directory’ (‘-T’)
 options cannot be combined.
 
 
@@ -1069,15 +1025,15 @@ File: coreutils.info,  Node: Trailing slashes,  Next: Traversing symlinks,  Prev
 2.9 Trailing slashes
 ====================
 
-Some GNU programs (at least `cp' and `mv') allow you to remove any
+Some GNU programs (at least ‘cp’ and ‘mv’) allow you to remove any
 trailing slashes from each SOURCE argument before operating on it.  The
-`--strip-trailing-slashes' option enables this behavior.
+‘--strip-trailing-slashes’ option enables this behavior.
 
    This is useful when a SOURCE argument may have a trailing slash and
 specify a symbolic link to a directory.  This scenario is in fact rather
 common because some shells can automatically append a trailing slash
 when performing file name completion on such symbolic links.  Without
-this option, `mv', for example, (via the system's rename function) must
+this option, ‘mv’, for example, (via the system’s rename function) must
 interpret a trailing slash as a request to dereference the symbolic link
 and so must rename the indirectly referenced _directory_ and not the
 symbolic link.  Although it may seem surprising that such behavior be
@@ -1090,59 +1046,58 @@ File: coreutils.info,  Node: Traversing symlinks,  Next: Treating / specially,
 2.10 Traversing symlinks
 ========================
 
-The following options modify how `chown' and `chgrp' traverse a
-hierarchy when the `--recursive' (`-R') option is also specified.  If
+The following options modify how ‘chown’ and ‘chgrp’ traverse a
+hierarchy when the ‘--recursive’ (‘-R’) option is also specified.  If
 more than one of the following options is specified, only the final one
 takes effect.  These options specify whether processing a symbolic link
 to a directory entails operating on just the symbolic link or on all
 files in the hierarchy rooted at that directory.
 
-   These options are independent of `--dereference' and
-`--no-dereference' (`-h'), which control whether to modify a symlink or
+   These options are independent of ‘--dereference’ and
+‘--no-dereference’ (‘-h’), which control whether to modify a symlink or
 its referent.
 
-`-H'
-     If `--recursive' (`-R') is specified and a command line argument
-     is a symbolic link to a directory, traverse it.
+‘-H’
+     If ‘--recursive’ (‘-R’) is specified and a command line argument is
+     a symbolic link to a directory, traverse it.
 
-`-L'
+‘-L’
      In a recursive traversal, traverse every symbolic link to a
      directory that is encountered.
 
-`-P'
-     Do not traverse any symbolic links.  This is the default if none
-     of `-H', `-L', or `-P' is specified.
-
+‘-P’
+     Do not traverse any symbolic links.  This is the default if none of
+     ‘-H’, ‘-L’, or ‘-P’ is specified.
 
 
 File: coreutils.info,  Node: Treating / specially,  Next: Special built-in utilities,  Prev: Traversing symlinks,  Up: Common options
 
-2.11 Treating `/' specially
+2.11 Treating ‘/’ specially
 ===========================
 
 Certain commands can operate destructively on entire hierarchies.  For
-example, if a user with appropriate privileges mistakenly runs `rm -rf
-/ tmp/junk', that may remove all files on the entire system.  Since
-there are so few legitimate uses for such a command, GNU `rm' normally
-declines to operate on any directory that resolves to `/'.  If you
+example, if a user with appropriate privileges mistakenly runs ‘rm -rf /
+tmp/junk’, that may remove all files on the entire system.  Since there
+are so few legitimate uses for such a command, GNU ‘rm’ normally
+declines to operate on any directory that resolves to ‘/’.  If you
 really want to try to remove all the files on your system, you can use
-the `--no-preserve-root' option, but the default behavior, specified by
-the `--preserve-root' option, is safer for most purposes.
+the ‘--no-preserve-root’ option, but the default behavior, specified by
+the ‘--preserve-root’ option, is safer for most purposes.
 
-   The commands `chgrp', `chmod' and `chown' can also operate
+   The commands ‘chgrp’, ‘chmod’ and ‘chown’ can also operate
 destructively on entire hierarchies, so they too support these options.
-Although, unlike `rm', they don't actually unlink files, these commands
-are arguably more dangerous when operating recursively on `/', since
-they often work much more quickly, and hence damage more files before
-an alert user can interrupt them.  Tradition and POSIX require these
-commands to operate recursively on `/', so they default to
-`--no-preserve-root', but using the `--preserve-root' option makes them
+Although, unlike ‘rm’, they don’t actually unlink files, these commands
+are arguably more dangerous when operating recursively on ‘/’, since
+they often work much more quickly, and hence damage more files before an
+alert user can interrupt them.  Tradition and POSIX require these
+commands to operate recursively on ‘/’, so they default to
+‘--no-preserve-root’, but using the ‘--preserve-root’ option makes them
 safer for most purposes.  For convenience you can specify
-`--preserve-root' in an alias or in a shell function.
+‘--preserve-root’ in an alias or in a shell function.
 
-   Note that the `--preserve-root' option also ensures that `chgrp' and
-`chown' do not modify `/' even when dereferencing a symlink pointing to
-`/'.
+   Note that the ‘--preserve-root’ option also ensures that ‘chgrp’ and
+‘chown’ do not modify ‘/’ even when dereferencing a symlink pointing to
+‘/’.
 
 
 File: coreutils.info,  Node: Special built-in utilities,  Next: Standards conformance,  Prev: Treating / specially,  Up: Common options
@@ -1150,10 +1105,10 @@ File: coreutils.info,  Node: Special built-in utilities,  Next: Standards confor
 2.12 Special built-in utilities
 ===============================
 
-Some programs like `nice' can invoke other programs; for example, the
-command `nice cat file' invokes the program `cat' by executing the
-command `cat file'.  However, "special built-in utilities" like `exit'
-cannot be invoked this way.  For example, the command `nice exit' does
+Some programs like ‘nice’ can invoke other programs; for example, the
+command ‘nice cat file’ invokes the program ‘cat’ by executing the
+command ‘cat file’.  However, "special built-in utilities" like ‘exit’
+cannot be invoked this way.  For example, the command ‘nice exit’ does
 not have a well-defined behavior: it may generate an error message
 instead of exiting.
 
@@ -1163,45 +1118,56 @@ standardized by POSIX 1003.1-2004.
      . : break continue eval exec exit export readonly return set shift
      times trap unset
 
-   For example, because `.', `:', and `exec' are special, the commands
-`nice . foo.sh', `nice :', and `nice exec pwd' do not work as you might
+   For example, because ‘.’, ‘:’, and ‘exec’ are special, the commands
+‘nice . foo.sh’, ‘nice :’, and ‘nice exec pwd’ do not work as you might
 expect.
 
    Many shells extend this list.  For example, Bash has several extra
-special built-in utilities like `history', and `suspend', and with Bash
-the command `nice suspend' generates an error message instead of
+special built-in utilities like ‘history’, and ‘suspend’, and with Bash
+the command ‘nice suspend’ generates an error message instead of
 suspending.
 
 
-File: coreutils.info,  Node: Standards conformance,  Prev: Special built-in utilities,  Up: Common options
+File: coreutils.info,  Node: Standards conformance,  Next: coreutils invocation,  Prev: Special built-in utilities,  Up: Common options
 
 2.13 Standards conformance
 ==========================
 
-In a few cases, the GNU utilities' default behavior is incompatible
-with the POSIX standard.  To suppress these incompatibilities, define
-the `POSIXLY_CORRECT' environment variable.  Unless you are checking
-for POSIX conformance, you probably do not need to define
-`POSIXLY_CORRECT'.
+In a few cases, the GNU utilities’ default behavior is incompatible with
+the POSIX standard.  To suppress these incompatibilities, define the
+‘POSIXLY_CORRECT’ environment variable.  Unless you are checking for
+POSIX conformance, you probably do not need to define ‘POSIXLY_CORRECT’.
 
    Newer versions of POSIX are occasionally incompatible with older
 versions.  For example, older versions of POSIX required the command
-`sort +1' to sort based on the second and succeeding fields in each
+‘sort +1’ to sort based on the second and succeeding fields in each
 input line, but starting with POSIX 1003.1-2001 the same command is
-required to sort the file named `+1', and you must instead use the
-command `sort -k 2' to get the field-based sort.
+required to sort the file named ‘+1’, and you must instead use the
+command ‘sort -k 2’ to get the field-based sort.
 
    The GNU utilities normally conform to the version of POSIX that is
 standard for your system.  To cause them to conform to a different
-version of POSIX, define the `_POSIX2_VERSION' environment variable to
-a value of the form YYYYMM specifying the year and month the standard
-was adopted.  Three values are currently supported for
-`_POSIX2_VERSION': `199209' stands for POSIX 1003.2-1992, `200112'
-stands for POSIX 1003.1-2001, and `200809' stands for POSIX 1003.1-2008.
-For example, if you have a newer system but are running software that
-assumes an older version of POSIX and uses `sort +1' or `tail +10', you
-can work around any compatibility problems by setting
-`_POSIX2_VERSION=199209' in your environment.
+version of POSIX, define the ‘_POSIX2_VERSION’ environment variable to a
+value of the form YYYYMM specifying the year and month the standard was
+adopted.  Three values are currently supported for ‘_POSIX2_VERSION’:
+‘199209’ stands for POSIX 1003.2-1992, ‘200112’ stands for POSIX
+1003.1-2001, and ‘200809’ stands for POSIX 1003.1-2008.  For example, if
+you have a newer system but are running software that assumes an older
+version of POSIX and uses ‘sort +1’ or ‘tail +10’, you can work around
+any compatibility problems by setting ‘_POSIX2_VERSION=199209’ in your
+environment.
+
+
+File: coreutils.info,  Node: coreutils invocation,  Prev: Standards conformance,  Up: Common options
+
+2.14 ‘coreutils’: Multi-call binary
+===================================
+
+‘coreutils’ invokes an individual utility, either implicitly selected by
+the last component of ‘argv[0]’, or by explicitly calling ‘coreutils’
+with the ‘--coreutils-prog’ option.  Synopsis:
+
+     coreutils --coreutils-prog=PROGRAM …
 
 
 File: coreutils.info,  Node: Output of entire files,  Next: Formatting file contents,  Prev: Common options,  Up: Top
@@ -1223,64 +1189,63 @@ in some way.
 
 File: coreutils.info,  Node: cat invocation,  Next: tac invocation,  Up: Output of entire files
 
-3.1 `cat': Concatenate and write files
+3.1 ‘cat’: Concatenate and write files
 ======================================
 
-`cat' copies each FILE (`-' means standard input), or standard input if
+‘cat’ copies each FILE (‘-’ means standard input), or standard input if
 none are given, to standard output.  Synopsis:
 
-     cat [OPTION] [FILE]...
+     cat [OPTION] [FILE]…
 
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-A'
-`--show-all'
-     Equivalent to `-vET'.
+‘-A’
+‘--show-all’
+     Equivalent to ‘-vET’.
 
-`-b'
-`--number-nonblank'
+‘-b’
+‘--number-nonblank’
      Number all nonempty output lines, starting with 1.
 
-`-e'
-     Equivalent to `-vE'.
+‘-e’
+     Equivalent to ‘-vE’.
 
-`-E'
-`--show-ends'
-     Display a `$' after the end of each line.
+‘-E’
+‘--show-ends’
+     Display a ‘$’ after the end of each line.
 
-`-n'
-`--number'
+‘-n’
+‘--number’
      Number all output lines, starting with 1.  This option is ignored
-     if `-b' is in effect.
+     if ‘-b’ is in effect.
 
-`-s'
-`--squeeze-blank'
+‘-s’
+‘--squeeze-blank’
      Suppress repeated adjacent empty lines; output just one empty line
      instead of several.
 
-`-t'
-     Equivalent to `-vT'.
+‘-t’
+     Equivalent to ‘-vT’.
 
-`-T'
-`--show-tabs'
-     Display TAB characters as `^I'.
+‘-T’
+‘--show-tabs’
+     Display TAB characters as ‘^I’.
 
-`-u'
+‘-u’
      Ignored; for POSIX compatibility.
 
-`-v'
-`--show-nonprinting'
-     Display control characters except for LFD and TAB using `^'
+‘-v’
+‘--show-nonprinting’
+     Display control characters except for LFD and TAB using ‘^’
      notation and precede characters that have the high bit set with
-     `M-'.
-
+     ‘M-’.
 
    On systems like MS-DOS that distinguish between text and binary
-files, `cat' normally reads and writes in binary mode.  However, `cat'
-reads in text mode if one of the options `-bensAE' is used or if `cat'
+files, ‘cat’ normally reads and writes in binary mode.  However, ‘cat’
+reads in text mode if one of the options ‘-bensAE’ is used or if ‘cat’
 is reading from standard input and standard input is a terminal.
-Similarly, `cat' writes in text mode if one of the options `-bensAE' is
+Similarly, ‘cat’ writes in text mode if one of the options ‘-bensAE’ is
 used or if standard output is a terminal.
 
    An exit status of zero indicates success, and a nonzero value
@@ -1297,14 +1262,14 @@ indicates failure.
 
 File: coreutils.info,  Node: tac invocation,  Next: nl invocation,  Prev: cat invocation,  Up: Output of entire files
 
-3.2 `tac': Concatenate and write files in reverse
+3.2 ‘tac’: Concatenate and write files in reverse
 =================================================
 
-`tac' copies each FILE (`-' means standard input), or standard input if
+‘tac’ copies each FILE (‘-’ means standard input), or standard input if
 none are given, to standard output, reversing the records (lines by
 default) in each separately.  Synopsis:
 
-     tac [OPTION]... [FILE]...
+     tac [OPTION]… [FILE]…
 
    "Records" are separated by instances of a string (newline by
 default).  By default, this separator string is attached to the end of
@@ -1313,22 +1278,21 @@ the record that it follows in the file.
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-b'
-`--before'
+‘-b’
+‘--before’
      The separator is attached to the beginning of the record that it
      precedes in the file.
 
-`-r'
-`--regex'
+‘-r’
+‘--regex’
      Treat the separator string as a regular expression.
 
-`-s SEPARATOR'
-`--separator=SEPARATOR'
+‘-s SEPARATOR’
+‘--separator=SEPARATOR’
      Use SEPARATOR as the record separator, instead of newline.
 
-
    On systems like MS-DOS that distinguish between text and binary
-files, `tac' reads and writes in binary mode.
+files, ‘tac’ reads and writes in binary mode.
 
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
@@ -1341,17 +1305,17 @@ indicates failure.
 
 File: coreutils.info,  Node: nl invocation,  Next: od invocation,  Prev: tac invocation,  Up: Output of entire files
 
-3.3 `nl': Number lines and write files
+3.3 ‘nl’: Number lines and write files
 ======================================
 
-`nl' writes each FILE (`-' means standard input), or standard input if
+‘nl’ writes each FILE (‘-’ means standard input), or standard input if
 none are given, to standard output, with line numbers added to some or
 all of the lines.  Synopsis:
 
-     nl [OPTION]... [FILE]...
+     nl [OPTION]… [FILE]…
 
-   `nl' decomposes its input into (logical) pages; by default, the line
-number is reset to 1 at the top of each logical page.  `nl' treats all
+   ‘nl’ decomposes its input into (logical) pages; by default, the line
+number is reset to 1 at the top of each logical page.  ‘nl’ treats all
 of the input files as a single document; it does not reset line numbers
 or logical pages between files.
 
@@ -1362,317 +1326,302 @@ style from the others.
    The beginnings of the sections of logical pages are indicated in the
 input file by a line containing exactly one of these delimiter strings:
 
-`\:\:\:'
+‘\:\:\:’
      start of header;
-
-`\:\:'
+‘\:\:’
      start of body;
-
-`\:'
+‘\:’
      start of footer.
 
    The two characters from which these strings are made can be changed
-from `\' and `:' via options (see below), but the pattern and length of
+from ‘\’ and ‘:’ via options (see below), but the pattern and length of
 each string cannot be changed.
 
    A section delimiter is replaced by an empty line on output.  Any text
 that comes before the first section delimiter string in the input file
-is considered to be part of a body section, so `nl' treats a file that
+is considered to be part of a body section, so ‘nl’ treats a file that
 contains no section delimiters as a single body section.
 
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-b STYLE'
-`--body-numbering=STYLE'
+‘-b STYLE’
+‘--body-numbering=STYLE’
      Select the numbering style for lines in the body section of each
      logical page.  When a line is not numbered, the current line number
      is not incremented, but the line number separator character is
      still prepended to the line.  The styles are:
 
-    `a'
+     ‘a’
           number all lines,
-
-    `t'
+     ‘t’
           number only nonempty lines (default for body),
-
-    `n'
+     ‘n’
           do not number lines (default for header and footer),
-
-    `pBRE'
+     ‘pBRE’
           number only lines that contain a match for the basic regular
           expression BRE.  *Note Regular Expressions: (grep)Regular
           Expressions.
 
-`-d CD'
-`--section-delimiter=CD'
-     Set the section delimiter characters to CD; default is `\:'.  If
-     only C is given, the second remains `:'.  (Remember to protect `\'
+‘-d CD’
+‘--section-delimiter=CD’
+     Set the section delimiter characters to CD; default is ‘\:’.  If
+     only C is given, the second remains ‘:’.  (Remember to protect ‘\’
      or other metacharacters from shell expansion with quotes or extra
      backslashes.)
 
-`-f STYLE'
-`--footer-numbering=STYLE'
-     Analogous to `--body-numbering'.
+‘-f STYLE’
+‘--footer-numbering=STYLE’
+     Analogous to ‘--body-numbering’.
 
-`-h STYLE'
-`--header-numbering=STYLE'
-     Analogous to `--body-numbering'.
+‘-h STYLE’
+‘--header-numbering=STYLE’
+     Analogous to ‘--body-numbering’.
 
-`-i NUMBER'
-`--line-increment=NUMBER'
+‘-i NUMBER’
+‘--line-increment=NUMBER’
      Increment line numbers by NUMBER (default 1).
 
-`-l NUMBER'
-`--join-blank-lines=NUMBER'
+‘-l NUMBER’
+‘--join-blank-lines=NUMBER’
      Consider NUMBER (default 1) consecutive empty lines to be one
      logical line for numbering, and only number the last one.  Where
      fewer than NUMBER consecutive empty lines occur, do not number
      them.  An empty line is one that contains no characters, not even
      spaces or tabs.
 
-`-n FORMAT'
-`--number-format=FORMAT'
-     Select the line numbering format (default is `rn'):
+‘-n FORMAT’
+‘--number-format=FORMAT’
+     Select the line numbering format (default is ‘rn’):
 
-    `ln'
+     ‘ln’
           left justified, no leading zeros;
-
-    `rn'
+     ‘rn’
           right justified, no leading zeros;
-
-    `rz'
+     ‘rz’
           right justified, leading zeros.
 
-`-p'
-`--no-renumber'
+‘-p’
+‘--no-renumber’
      Do not reset the line number at the start of a logical page.
 
-`-s STRING'
-`--number-separator=STRING'
+‘-s STRING’
+‘--number-separator=STRING’
      Separate the line number from the text line in the output with
      STRING (default is the TAB character).
 
-`-v NUMBER'
-`--starting-line-number=NUMBER'
-     Set the initial line number on each logical page to NUMBER
-     (default 1).
+‘-v NUMBER’
+‘--starting-line-number=NUMBER’
+     Set the initial line number on each logical page to NUMBER (default
+     1).
 
-`-w NUMBER'
-`--number-width=NUMBER'
+‘-w NUMBER’
+‘--number-width=NUMBER’
      Use NUMBER characters for line numbers (default 6).
 
-
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
 
 
 File: coreutils.info,  Node: od invocation,  Next: base64 invocation,  Prev: nl invocation,  Up: Output of entire files
 
-3.4 `od': Write files in octal or other formats
+3.4 ‘od’: Write files in octal or other formats
 ===============================================
 
-`od' writes an unambiguous representation of each FILE (`-' means
+‘od’ writes an unambiguous representation of each FILE (‘-’ means
 standard input), or standard input if none are given.  Synopses:
 
-     od [OPTION]... [FILE]...
-     od [-abcdfilosx]... [FILE] [[+]OFFSET[.][b]]
-     od [OPTION]... --traditional [FILE] [[+]OFFSET[.][b] [[+]LABEL[.][b]]]
+     od [OPTION]… [FILE]…
+     od [-abcdfilosx]… [FILE] [[+]OFFSET[.][b]]
+     od [OPTION]… --traditional [FILE] [[+]OFFSET[.][b] [[+]LABEL[.][b]]]
 
    Each line of output consists of the offset in the input, followed by
-groups of data from the file.  By default, `od' prints the offset in
-octal, and each group of file data is a C `short int''s worth of input
+groups of data from the file.  By default, ‘od’ prints the offset in
+octal, and each group of file data is a C ‘short int’’s worth of input
 printed as a single octal number.
 
    If OFFSET is given, it specifies how many input bytes to skip before
 formatting and writing.  By default, it is interpreted as an octal
 number, but the optional trailing decimal point causes it to be
 interpreted as decimal.  If no decimal is specified and the offset
-begins with `0x' or `0X' it is interpreted as a hexadecimal number.  If
-there is a trailing `b', the number of bytes skipped will be OFFSET
+begins with ‘0x’ or ‘0X’ it is interpreted as a hexadecimal number.  If
+there is a trailing ‘b’, the number of bytes skipped will be OFFSET
 multiplied by 512.
 
    If a command is of both the first and second forms, the second form
-is assumed if the last operand begins with `+' or (if there are two
-operands) a digit.  For example, in `od foo 10' and `od +10' the `10'
-is an offset, whereas in `od 10' the `10' is a file name.
+is assumed if the last operand begins with ‘+’ or (if there are two
+operands) a digit.  For example, in ‘od foo 10’ and ‘od +10’ the ‘10’ is
+an offset, whereas in ‘od 10’ the ‘10’ is a file name.
 
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-A RADIX'
-`--address-radix=RADIX'
+‘-A RADIX’
+‘--address-radix=RADIX’
      Select the base in which file offsets are printed.  RADIX can be
      one of the following:
 
-    `d'
+     ‘d’
           decimal;
-
-    `o'
+     ‘o’
           octal;
-
-    `x'
+     ‘x’
           hexadecimal;
-
-    `n'
+     ‘n’
           none (do not print offsets).
 
      The default is octal.
 
-`-j BYTES'
-`--skip-bytes=BYTES'
+‘--endian=ORDER’
+     Reorder input bytes, to handle inputs with differing byte orders,
+     or to provide consistent output independent of the endian
+     convention of the current system.  Swapping is performed according
+     to the specified ‘--type’ size and endian ORDER, which can be
+     ‘little’ or ‘big’.
+
+‘-j BYTES’
+‘--skip-bytes=BYTES’
      Skip BYTES input bytes before formatting and writing.  If BYTES
-     begins with `0x' or `0X', it is interpreted in hexadecimal;
-     otherwise, if it begins with `0', in octal; otherwise, in decimal.
+     begins with ‘0x’ or ‘0X’, it is interpreted in hexadecimal;
+     otherwise, if it begins with ‘0’, in octal; otherwise, in decimal.
      BYTES may be, or may be an integer optionally followed by, one of
      the following multiplicative suffixes:
-          `b'  =>            512 ("blocks")
-          `KB' =>           1000 (KiloBytes)
-          `K'  =>           1024 (KibiBytes)
-          `MB' =>      1000*1000 (MegaBytes)
-          `M'  =>      1024*1024 (MebiBytes)
-          `GB' => 1000*1000*1000 (GigaBytes)
-          `G'  => 1024*1024*1024 (GibiBytes)
-     and so on for `T', `P', `E', `Z', and `Y'.
-
-`-N BYTES'
-`--read-bytes=BYTES'
+          ‘b’  =>            512 ("blocks")
+          ‘KB’ =>           1000 (KiloBytes)
+          ‘K’  =>           1024 (KibiBytes)
+          ‘MB’ =>      1000*1000 (MegaBytes)
+          ‘M’  =>      1024*1024 (MebiBytes)
+          ‘GB’ => 1000*1000*1000 (GigaBytes)
+          ‘G’  => 1024*1024*1024 (GibiBytes)
+     and so on for ‘T’, ‘P’, ‘E’, ‘Z’, and ‘Y’.
+
+‘-N BYTES’
+‘--read-bytes=BYTES’
      Output at most BYTES bytes of the input.  Prefixes and suffixes on
-     `bytes' are interpreted as for the `-j' option.
+     ‘bytes’ are interpreted as for the ‘-j’ option.
 
-`-S BYTES'
-`--strings[=BYTES]'
+‘-S BYTES’
+‘--strings[=BYTES]’
      Instead of the normal output, output only "string constants": at
      least BYTES consecutive ASCII graphic characters, followed by a
-     zero byte (ASCII NUL).  Prefixes and suffixes on BYTES are
-     interpreted as for the `-j' option.
+     zero byte (ASCII NUL). Prefixes and suffixes on BYTES are
+     interpreted as for the ‘-j’ option.
 
-     If BYTES is omitted with `--strings', the default is 3.
+     If BYTES is omitted with ‘--strings’, the default is 3.
 
-`-t TYPE'
-`--format=TYPE'
+‘-t TYPE’
+‘--format=TYPE’
      Select the format in which to output the file data.  TYPE is a
      string of one or more of the below type indicator characters.  If
      you include more than one type indicator character in a single TYPE
-     string, or use this option more than once, `od' writes one copy of
+     string, or use this option more than once, ‘od’ writes one copy of
      each output line using each of the data types that you specified,
      in the order that you specified.
 
-     Adding a trailing "z" to any type specification appends a display
-     of the ASCII character representation of the printable characters
-     to the output line generated by the type specification.
+     Adding a trailing “z� to any type specification appends a display
+     of the single byte character representation of the printable
+     characters to the output line generated by the type specification.
 
-    `a'
+     ‘a’
           named character, ignoring high-order bit
-
-    `c'
-          ASCII character or backslash escape,
-
-    `d'
+     ‘c’
+          printable single byte character, C backslash escape or a 3
+          digit octal sequence
+     ‘d’
           signed decimal
-
-    `f'
+     ‘f’
           floating point (*note Floating point::)
-
-    `o'
+     ‘o’
           octal
-
-    `u'
+     ‘u’
           unsigned decimal
-
-    `x'
+     ‘x’
           hexadecimal
 
-     The type `a' outputs things like `sp' for space, `nl' for newline,
-     and `nul' for a zero byte.  Only the least significant seven bits
-     of each byte is used; the high-order bit is ignored.  Type `c'
-     outputs ` ', `\n', and `\0', respectively.
+     The type ‘a’ outputs things like ‘sp’ for space, ‘nl’ for newline,
+     and ‘nul’ for a zero byte.  Only the least significant seven bits
+     of each byte is used; the high-order bit is ignored.  Type ‘c’
+     outputs ‘ ’, ‘\n’, and ‘\0’, respectively.
 
-     Except for types `a' and `c', you can specify the number of bytes
+     Except for types ‘a’ and ‘c’, you can specify the number of bytes
      to use in interpreting each number in the given data type by
      following the type indicator character with a decimal integer.
-     Alternately, you can specify the size of one of the C compiler's
+     Alternately, you can specify the size of one of the C compiler’s
      built-in data types by following the type indicator character with
-     one of the following characters.  For integers (`d', `o', `u',
-     `x'):
+     one of the following characters.  For integers (‘d’, ‘o’, ‘u’,
+     ‘x’):
 
-    `C'
+     ‘C’
           char
-
-    `S'
+     ‘S’
           short
-
-    `I'
+     ‘I’
           int
-
-    `L'
+     ‘L’
           long
 
-     For floating point (`f'):
+     For floating point (‘f’):
 
-    F
+     F
           float
-
-    D
+     D
           double
-
-    L
+     L
           long double
 
-`-v'
-`--output-duplicates'
+‘-v’
+‘--output-duplicates’
      Output consecutive lines that are identical.  By default, when two
-     or more consecutive output lines would be identical, `od' outputs
+     or more consecutive output lines would be identical, ‘od’ outputs
      only the first line, and puts just an asterisk on the following
      line to indicate the elision.
 
-`-w[N]'
-`--width[=N]'
-     Dump `n' input bytes per output line.  This must be a multiple of
+‘-w[N]’
+‘--width[=N]’
+     Dump ‘n’ input bytes per output line.  This must be a multiple of
      the least common multiple of the sizes associated with the
      specified output types.
 
      If this option is not given at all, the default is 16.  If N is
      omitted, the default is 32.
 
-
    The next several options are shorthands for format specifications.
-GNU `od' accepts any combination of shorthands and format specification
+GNU ‘od’ accepts any combination of shorthands and format specification
 options.  These options accumulate.
 
-`-a'
-     Output as named characters.  Equivalent to `-t a'.
+‘-a’
+     Output as named characters.  Equivalent to ‘-t a’.
 
-`-b'
-     Output as octal bytes.  Equivalent to `-t o1'.
+‘-b’
+     Output as octal bytes.  Equivalent to ‘-t o1’.
 
-`-c'
-     Output as ASCII characters or backslash escapes.  Equivalent to
-     `-t c'.
+‘-c’
+     Output as printable single byte characters, C backslash escapes or
+     3 digit octal sequences.  Equivalent to ‘-t c’.
 
-`-d'
-     Output as unsigned decimal two-byte units.  Equivalent to `-t u2'.
+‘-d’
+     Output as unsigned decimal two-byte units.  Equivalent to ‘-t u2’.
 
-`-f'
-     Output as floats.  Equivalent to `-t fF'.
+‘-f’
+     Output as floats.  Equivalent to ‘-t fF’.
 
-`-i'
-     Output as decimal ints.  Equivalent to `-t dI'.
+‘-i’
+     Output as decimal ints.  Equivalent to ‘-t dI’.
 
-`-l'
-     Output as decimal long ints.  Equivalent to `-t dL'.
+‘-l’
+     Output as decimal long ints.  Equivalent to ‘-t dL’.
 
-`-o'
-     Output as octal two-byte units.  Equivalent to `-t o2'.
+‘-o’
+     Output as octal two-byte units.  Equivalent to ‘-t o2’.
 
-`-s'
-     Output as decimal two-byte units.  Equivalent to `-t d2'.
+‘-s’
+     Output as decimal two-byte units.  Equivalent to ‘-t d2’.
 
-`-x'
-     Output as hexadecimal two-byte units.  Equivalent to `-t x2'.
+‘-x’
+     Output as hexadecimal two-byte units.  Equivalent to ‘-t x2’.
 
-`--traditional'
-     Recognize the non-option label argument that traditional `od'
+‘--traditional’
+     Recognize the non-option label argument that traditional ‘od’
      accepted.  The following syntax:
 
           od --traditional [FILE] [[+]OFFSET[.][b] [[+]LABEL[.][b]]]
@@ -1683,22 +1632,21 @@ options.  These options accumulate.
      initial pseudo-address.  The pseudo-addresses are displayed in
      parentheses following any normal address.
 
-
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
 
 
 File: coreutils.info,  Node: base64 invocation,  Prev: od invocation,  Up: Output of entire files
 
-3.5 `base64': Transform data into printable data
+3.5 ‘base64’: Transform data into printable data
 ================================================
 
-`base64' transforms data read from a file, or standard input, into (or
-from) base64 encoded form.  The base64 encoded form uses printable
-ASCII characters to represent binary data.  Synopses:
+‘base64’ transforms data read from a file, or standard input, into (or
+from) base64 encoded form.  The base64 encoded form uses printable ASCII
+characters to represent binary data.  Synopses:
 
-     base64 [OPTION]... [FILE]
-     base64 --decode [OPTION]... [FILE]
+     base64 [OPTION]… [FILE]
+     base64 --decode [OPTION]… [FILE]
 
    The base64 encoding expands data to roughly 133% of the original.
 The format conforms to RFC 4648
@@ -1707,26 +1655,25 @@ The format conforms to RFC 4648
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-w COLS'
-`--wrap=COLS'
+‘-w COLS’
+‘--wrap=COLS’
      During encoding, wrap lines after COLS characters.  This must be a
      positive number.
 
      The default is to wrap after 76 characters.  Use the value 0 to
      disable line wrapping altogether.
 
-`-d'
-`--decode'
+‘-d’
+‘--decode’
      Change the mode of operation, from the default of encoding data, to
      decoding data.  Input is expected to be base64 encoded data, and
      the output will be the original data.
 
-`-i'
-`--ignore-garbage'
+‘-i’
+‘--ignore-garbage’
      When decoding, newlines are always accepted.  During decoding,
      ignore unrecognized bytes, to permit distorted data to be decoded.
 
-
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
 
@@ -1748,15 +1695,15 @@ These commands reformat the contents of files.
 
 File: coreutils.info,  Node: fmt invocation,  Next: numfmt invocation,  Up: Formatting file contents
 
-4.1 `fmt': Reformat paragraph text
+4.1 ‘fmt’: Reformat paragraph text
 ==================================
 
-`fmt' fills and joins lines to produce output lines of (at most) a
-given number of characters (75 by default).  Synopsis:
+‘fmt’ fills and joins lines to produce output lines of (at most) a given
+number of characters (75 by default).  Synopsis:
 
-     fmt [OPTION]... [FILE]...
+     fmt [OPTION]… [FILE]…
 
-   `fmt' reads from the specified FILE arguments (or standard input if
+   ‘fmt’ reads from the specified FILE arguments (or standard input if
 none are given), and writes to standard output.
 
    By default, blank lines, spaces between words, and indentation are
@@ -1764,87 +1711,86 @@ preserved in the output; successive input lines with different
 indentation are not joined; tabs are expanded on input and introduced on
 output.
 
-   `fmt' prefers breaking lines at the end of a sentence, and tries to
+   ‘fmt’ prefers breaking lines at the end of a sentence, and tries to
 avoid line breaks after the first word of a sentence or before the last
 word of a sentence.  A "sentence break" is defined as either the end of
-a paragraph or a word ending in any of `.?!', followed by two spaces or
+a paragraph or a word ending in any of ‘.?!’, followed by two spaces or
 end of line, ignoring any intervening parentheses or quotes.  Like TeX,
-`fmt' reads entire "paragraphs" before choosing line breaks; the
+‘fmt’ reads entire “paragraphs� before choosing line breaks; the
 algorithm is a variant of that given by Donald E. Knuth and Michael F.
-Plass in "Breaking Paragraphs Into Lines", `Software--Practice &
-Experience' 11, 11 (November 1981), 1119-1184.
+Plass in “Breaking Paragraphs Into Lines�, ‘Software—Practice &
+Experience’ 11, 11 (November 1981), 1119–1184.
 
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-c'
-`--crown-margin'
+‘-c’
+‘--crown-margin’
      "Crown margin" mode: preserve the indentation of the first two
      lines within a paragraph, and align the left margin of each
      subsequent line with that of the second line.
 
-`-t'
-`--tagged-paragraph'
+‘-t’
+‘--tagged-paragraph’
      "Tagged paragraph" mode: like crown margin mode, except that if
      indentation of the first line of a paragraph is the same as the
      indentation of the second, the first line is treated as a one-line
      paragraph.
 
-`-s'
-`--split-only'
+‘-s’
+‘--split-only’
      Split lines only.  Do not join short lines to form longer ones.
-     This prevents sample lines of code, and other such "formatted"
-     text from being unduly combined.
+     This prevents sample lines of code, and other such “formatted� text
+     from being unduly combined.
 
-`-u'
-`--uniform-spacing'
+‘-u’
+‘--uniform-spacing’
      Uniform spacing.  Reduce spacing between words to one space, and
      spacing between sentences to two spaces.
 
-`-WIDTH'
-`-w WIDTH'
-`--width=WIDTH'
+‘-WIDTH’
+‘-w WIDTH’
+‘--width=WIDTH’
      Fill output lines up to WIDTH characters (default 75 or GOAL plus
      10, if GOAL is provided).
 
-`-g GOAL'
-`--goal=GOAL'
-     `fmt' initially tries to make lines GOAL characters wide.  By
+‘-g GOAL’
+‘--goal=GOAL’
+     ‘fmt’ initially tries to make lines GOAL characters wide.  By
      default, this is 7% shorter than WIDTH.
 
-`-p PREFIX'
-`--prefix=PREFIX'
+‘-p PREFIX’
+‘--prefix=PREFIX’
      Only lines beginning with PREFIX (possibly preceded by whitespace)
-     are subject to formatting.  The prefix and any preceding
-     whitespace are stripped for the formatting and then re-attached to
-     each formatted output line.  One use is to format certain kinds of
+     are subject to formatting.  The prefix and any preceding whitespace
+     are stripped for the formatting and then re-attached to each
+     formatted output line.  One use is to format certain kinds of
      program comments, while leaving the code unchanged.
 
-
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
 
 
 File: coreutils.info,  Node: numfmt invocation,  Next: pr invocation,  Prev: fmt invocation,  Up: Formatting file contents
 
-4.2 `numfmt': Reformat numbers
+4.2 ‘numfmt’: Reformat numbers
 ==============================
 
-`numfmt' reads numbers in various representations and reformats them as
+‘numfmt’ reads numbers in various representations and reformats them as
 requested.  The most common usage is converting numbers to/from _human_
-representation (e.g. `4G' ==> `4,000,000,000').
+representation (e.g.  ‘4G’ ↦ ‘4,000,000,000’).
 
-     numfmt [OPTION]... [NUMBER]
+     numfmt [OPTION]… [NUMBER]
 
-   `numfmt' converts each NUMBER on the command-line according to the
+   ‘numfmt’ converts each NUMBER on the command-line according to the
 specified options (see below).  If no NUMBERs are given, it reads
-numbers from standard input.  `numfmt' can optionally extract numbers
+numbers from standard input.  ‘numfmt’ can optionally extract numbers
 from specific columns, maintaining proper line padding and alignment.
 
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
 
-   See `--invalid' for additional information regarding exit status.
+   See ‘--invalid’ for additional information regarding exit status.
 
 4.2.1 General options
 ---------------------
@@ -1852,86 +1798,87 @@ indicates failure.
 The program accepts the following options.  Also see *note Common
 options::.
 
-`--debug'
-     Print (to standard error) warning messages about possible
-     erroneous usage.
+‘--debug’
+     Print (to standard error) warning messages about possible erroneous
+     usage.
 
-`-d D'
-`--delimiter=D'
+‘-d D’
+‘--delimiter=D’
      Use the character D as input field separator (default: whitespace).
      _Note_: Using non-default delimiter turns off automatic padding.
 
-`--field=N'
+‘--field=N’
      Convert the number in input field N (default: 1).
 
-`--format=FORMAT'
+‘--format=FORMAT’
      Use printf-style floating FORMAT string.  The FORMAT string must
-     contain one `%f' directive, optionally with `'', `-', or width
-     modifiers.  The `'' modifier will enable `--grouping', the `-'
-     modifier will enable left-aligned `--padding' and the width
-     modifier will enable right-aligned `--padding'.
-
-`--from=UNIT'
-     Auto-scales input numbers according to UNIT.  See UNITS below.
-     The default is no scaling, meaning suffixes (e.g. `M', `G') will
+     contain one ‘%f’ directive, optionally with ‘'’, ‘-’, ‘0’, or width
+     modifiers.  The ‘'’ modifier will enable ‘--grouping’, the ‘-’
+     modifier will enable left-aligned ‘--padding’ and the width
+     modifier will enable right-aligned ‘--padding’.  The ‘0’ width
+     modifier (without the ‘-’ modifier) will generate leading zeros on
+     the number, up to the specified width.
+
+‘--from=UNIT’
+     Auto-scales input numbers according to UNIT.  See UNITS below.  The
+     default is no scaling, meaning suffixes (e.g.  ‘M’, ‘G’) will
      trigger an error.
 
-`--from-unit=N'
+‘--from-unit=N’
      Specify the input unit size (instead of the default 1).  Use this
-     option when the input numbers represent other units (e.g. if the
-     input number `10' represents 10 units of 512 bytes, use
-     `--from=unit=512').
-
-`--grouping'
-     Group digits in output numbers according to the current locale's
-     grouping rules (e.g _Thousands Separator_ character, commonly `.'
-     (dot) or `,' comma).  This option has no effect in `POSIX/C'
+     option when the input numbers represent other units (e.g.  if the
+     input number ‘10’ represents 10 units of 512 bytes, use
+     ‘--from=unit=512’).
+
+‘--grouping’
+     Group digits in output numbers according to the current locale’s
+     grouping rules (e.g _Thousands Separator_ character, commonly ‘.’
+     (dot) or ‘,’ comma).  This option has no effect in ‘POSIX/C’
      locale.
 
-`--header[=N]'
+‘--header[=N]’
      Print the first N (default: 1) lines without any conversion.
 
-`--invalid=MODE'
+‘--invalid=MODE’
      The default action on input errors is to exit immediately with
-     status code 2.  `--invalid=`abort'' explicitly specifies this
-     default mode.  With a MODE of `fail', print a warning for _each_
-     conversion error, and exit with status 2.  With a MODE of `warn',
+     status code 2.  ‘--invalid=‘abort’’ explicitly specifies this
+     default mode.  With a MODE of ‘fail’, print a warning for _each_
+     conversion error, and exit with status 2.  With a MODE of ‘warn’,
      exit with status 0, even in the presence of conversion errors, and
-     with a MODE of `ignore' do not even print diagnostics.
+     with a MODE of ‘ignore’ do not even print diagnostics.
 
-`--padding=N'
+‘--padding=N’
      Pad the output numbers to N characters, by adding spaces.  If N is
      a positive number, numbers will be right-aligned.  If N is a
-     negative number, numbers will be left-aligned.  By default,
-     numbers are automatically aligned based on the input line's width
-     (only with the default delimiter).
+     negative number, numbers will be left-aligned.  By default, numbers
+     are automatically aligned based on the input line’s width (only
+     with the default delimiter).
 
-`--round=METHOD'
+‘--round=METHOD’
      When converting number representations, round the number according
-     to METHOD, which can be `up', `down', `from-zero' (the default),
-     `towards-zero', `nearest'.
+     to METHOD, which can be ‘up’, ‘down’, ‘from-zero’ (the default),
+     ‘towards-zero’, ‘nearest’.
 
-`--suffix=SUFFIX'
-     Add `SUFFIX' to the output numbers, and accept optional `SUFFIX' in
+‘--suffix=SUFFIX’
+     Add ‘SUFFIX’ to the output numbers, and accept optional ‘SUFFIX’ in
      input numbers.
 
-`--to=UNIT'
+‘--to=UNIT’
      Auto-scales output numbers according to UNIT.  See _Units_ below.
-     The default is no scaling, meaning all the digits of the number
-     are printed.
+     The default is no scaling, meaning all the digits of the number are
+     printed.
 
-`--to-unit=N'
+‘--to-unit=N’
      Specify the output unit size (instead of the default 1).  Use this
-     option when the output numbers represent other units (e.g. to
-     represent `4,000,000' bytes in blocks of 1KB, use `--to=si
-     --to=units=1000').
-
+     option when the output numbers represent other units (e.g.  to
+     represent ‘4,000,000’ bytes in blocks of 1KB, use ‘--to=si
+     --to=units=1000’).
 
 4.2.2 Possible UNITs:
 ---------------------
 
-The following are the possible UNIT options with `--from=UNITS' and
-`--to=UNITS':
+The following are the possible UNIT options with ‘--from=UNITS’ and
+‘--to=UNITS’:
 
 NONE
      No scaling is performed.  For input numbers, no suffixes are
@@ -1945,14 +1892,14 @@ SI
      suffixes.  For output numbers, values larger than 1000 will be
      rounded, and printed with one of the following suffixes:
 
-          `K'  =>  1000^1 = 10^3 (Kilo)
-          `M'  =>  1000^2 = 10^6 (Mega)
-          `G'  =>  1000^3 = 10^9 (Giga)
-          `T'  =>  1000^4 = 10^12 (Tera)
-          `P'  =>  1000^5 = 10^15 (Peta)
-          `E'  =>  1000^6 = 10^18 (Exa)
-          `Z'  =>  1000^7 = 10^21 (Zetta)
-          `Y'  =>  1000^8 = 10^24 (Yotta)
+          ‘K’  =>  1000^1 = 10^3 (Kilo)
+          ‘M’  =>  1000^2 = 10^6 (Mega)
+          ‘G’  =>  1000^3 = 10^9 (Giga)
+          ‘T’  =>  1000^4 = 10^{12} (Tera)
+          ‘P’  =>  1000^5 = 10^{15} (Peta)
+          ‘E’  =>  1000^6 = 10^{18} (Exa)
+          ‘Z’  =>  1000^7 = 10^{21} (Zetta)
+          ‘Y’  =>  1000^8 = 10^{24} (Yotta)
 
 IEC
      Auto-scale numbers according to the _International Electronical
@@ -1960,19 +1907,19 @@ IEC
      following suffixes.  For output numbers, values larger than 1024
      will be rounded, and printed with one of the following suffixes:
 
-          `K'  =>  1024^1 = 2^10 (Kibi)
-          `M'  =>  1024^2 = 2^20 (Mebi)
-          `G'  =>  1024^3 = 2^30 (Gibi)
-          `T'  =>  1024^4 = 2^40 (Tebi)
-          `P'  =>  1024^5 = 2^50 (Pebi)
-          `E'  =>  1024^6 = 2^60 (Exbi)
-          `Z'  =>  1024^7 = 2^70 (Zebi)
-          `Y'  =>  1024^8 = 2^80 (Yobi)
+          ‘K’  =>  1024^1 = 2^{10} (Kibi)
+          ‘M’  =>  1024^2 = 2^{20} (Mebi)
+          ‘G’  =>  1024^3 = 2^{30} (Gibi)
+          ‘T’  =>  1024^4 = 2^{40} (Tebi)
+          ‘P’  =>  1024^5 = 2^{50} (Pebi)
+          ‘E’  =>  1024^6 = 2^{60} (Exbi)
+          ‘Z’  =>  1024^7 = 2^{70} (Zebi)
+          ‘Y’  =>  1024^8 = 2^{80} (Yobi)
 
-     The `iec' option uses a single letter suffix (e.g. `G'), which is
+     The ‘iec’ option uses a single letter suffix (e.g.  ‘G’), which is
      not fully standard, as the _iec_ standard recommends a two-letter
-     symbol (e.g `Gi') - but in practice, this method common.  Compare
-     with the `iec-i' option.
+     symbol (e.g ‘Gi’) - but in practice, this method common.  Compare
+     with the ‘iec-i’ option.
 
 IEC-I
      Auto-scale numbers according to the _International Electronical
@@ -1980,32 +1927,31 @@ IEC-I
      following suffixes.  For output numbers, values larger than 1024
      will be rounded, and printed with one of the following suffixes:
 
-          `Ki'  =>  1024^1 = 2^10 (Kibi)
-          `Mi'  =>  1024^2 = 2^20 (Mebi)
-          `Gi'  =>  1024^3 = 2^30 (Gibi)
-          `Ti'  =>  1024^4 = 2^40 (Tebi)
-          `Pi'  =>  1024^5 = 2^50 (Pebi)
-          `Ei'  =>  1024^6 = 2^60 (Exbi)
-          `Zi'  =>  1024^7 = 2^70 (Zebi)
-          `Yi'  =>  1024^8 = 2^80 (Yobi)
+          ‘Ki’  =>  1024^1 = 2^{10} (Kibi)
+          ‘Mi’  =>  1024^2 = 2^{20} (Mebi)
+          ‘Gi’  =>  1024^3 = 2^{30} (Gibi)
+          ‘Ti’  =>  1024^4 = 2^{40} (Tebi)
+          ‘Pi’  =>  1024^5 = 2^{50} (Pebi)
+          ‘Ei’  =>  1024^6 = 2^{60} (Exbi)
+          ‘Zi’  =>  1024^7 = 2^{70} (Zebi)
+          ‘Yi’  =>  1024^8 = 2^{80} (Yobi)
 
-     The `iec-i' option uses a two-letter suffix symbol (e.g. `Gi'), as
+     The ‘iec-i’ option uses a two-letter suffix symbol (e.g.  ‘Gi’), as
      the _iec_ standard recommends, but this is not always common in
-     practice.  Compare with the `iec' option.
+     practice.  Compare with the ‘iec’ option.
 
 AUTO
-     `auto' can only be used with `--from'.  With this method, numbers
-     with `K',`M',`G',`T',`P',`E',`Z',`Y' suffixes are interpreted as
-     _SI_ values, and numbers with `Ki',
-     `Mi',`Gi',`Ti',`Pi',`Ei',`Zi',`Yi' suffixes are interpreted as
+     ‘auto’ can only be used with ‘--from’.  With this method, numbers
+     with ‘K’,‘M’,‘G’,‘T’,‘P’,‘E’,‘Z’,‘Y’ suffixes are interpreted as
+     _SI_ values, and numbers with ‘Ki’,
+     ‘Mi’,‘Gi’,‘Ti’,‘Pi’,‘Ei’,‘Zi’,‘Yi’ suffixes are interpreted as
      _IEC_ values.
 
-
-4.2.3 Examples of using `numfmt'
+4.2.3 Examples of using ‘numfmt’
 --------------------------------
 
 Converting a single number from/to _human_ representation:
-     $ nunfmt --to=si 500000
+     $ numfmt --to=si 500000
      500K
 
      $ numfmt --to=iec 500000
@@ -2026,16 +1972,16 @@ Converting a single number from/to _human_ representation:
      $ numfmt --from=auto 1Mi
      1048576
 
-   Converting from `SI' to `IEC' scales (e.g. when a harddisk capacity
-is advertised as `1TB', while checking the drive's capacity gives lower
+   Converting from ‘SI’ to ‘IEC’ scales (e.g.  when a harddisk capacity
+is advertised as ‘1TB’, while checking the drive’s capacity gives lower
 values):
 
      $ numfmt --from=si --to=iec 1T
      932G
 
    Converting a single field from an input file / piped input (these
-contrived examples are for demonstration purposes only, as both `ls' and
-`df' support the `--human-readable' option to output sizes in
+contrived examples are for demonstration purposes only, as both ‘ls’ and
+‘df’ support the ‘--human-readable’ option to output sizes in
 human-readable format):
 
      # Third field (file size) will be shown in SI representation
@@ -2052,7 +1998,7 @@ human-readable format):
      tmpfs              794M        7580     804960   1% /run/shm
      /dev/sdb1          694G   651424756   46074696  94% /home
 
-   Output can be tweaked using `--padding' or `--format':
+   Output can be tweaked using ‘--padding’ or ‘--format’:
 
      # Pad to 10 characters, right-aligned
      $ du -s * | numfmt --to=si --padding=10
@@ -2082,8 +2028,8 @@ human-readable format):
      1.7K       configure
      20         configure.ac
 
-   With locales that support grouping digits, using `--grouping' or
-`--format' enables grouping.  In `POSIX' locale, grouping is silently
+   With locales that support grouping digits, using ‘--grouping’ or
+‘--format’ enables grouping.  In ‘POSIX’ locale, grouping is silently
 ignored:
 
      $ LC_ALL=C numfmt --from=iec --grouping 2G
@@ -2110,253 +2056,253 @@ ignored:
 
 File: coreutils.info,  Node: pr invocation,  Next: fold invocation,  Prev: numfmt invocation,  Up: Formatting file contents
 
-4.3 `pr': Paginate or columnate files for printing
+4.3 ‘pr’: Paginate or columnate files for printing
 ==================================================
 
-`pr' writes each FILE (`-' means standard input), or standard input if
-none are given, to standard output, paginating and optionally
-outputting in multicolumn format; optionally merges all FILEs, printing
-all in parallel, one per column.  Synopsis:
+‘pr’ writes each FILE (‘-’ means standard input), or standard input if
+none are given, to standard output, paginating and optionally outputting
+in multicolumn format; optionally merges all FILEs, printing all in
+parallel, one per column.  Synopsis:
 
-     pr [OPTION]... [FILE]...
+     pr [OPTION]… [FILE]…
 
    By default, a 5-line header is printed at each page: two blank lines;
 a line with the date, the file name, and the page count; and two more
-blank lines.  A footer of five blank lines is also printed.  The
-default PAGE_LENGTH is 66 lines.  The default number of text lines is
-therefore 56.  The text line of the header takes the form `DATE STRING
-PAGE', with spaces inserted around STRING so that the line takes up the
-full PAGE_WIDTH.  Here, DATE is the date (see the `-D' or
-`--date-format' option for details), STRING is the centered header
-string, and PAGE identifies the page number.  The `LC_MESSAGES' locale
-category affects the spelling of PAGE; in the default C locale, it is
-`Page NUMBER' where NUMBER is the decimal page number.
+blank lines.  A footer of five blank lines is also printed.  The default
+PAGE_LENGTH is 66 lines.  The default number of text lines is therefore
+56.  The text line of the header takes the form ‘DATE STRING PAGE’, with
+spaces inserted around STRING so that the line takes up the full
+PAGE_WIDTH.  Here, DATE is the date (see the ‘-D’ or ‘--date-format’
+option for details), STRING is the centered header string, and PAGE
+identifies the page number.  The ‘LC_MESSAGES’ locale category affects
+the spelling of PAGE; in the default C locale, it is ‘Page NUMBER’ where
+NUMBER is the decimal page number.
 
    Form feeds in the input cause page breaks in the output.  Multiple
 form feeds produce empty pages.
 
    Columns are of equal width, separated by an optional string (default
-is `space').  For multicolumn output, lines will always be truncated to
-PAGE_WIDTH (default 72), unless you use the `-J' option.  For single
-column output no line truncation occurs by default.  Use `-W' option to
+is ‘space’).  For multicolumn output, lines will always be truncated to
+PAGE_WIDTH (default 72), unless you use the ‘-J’ option.  For single
+column output no line truncation occurs by default.  Use ‘-W’ option to
 truncate lines in that case.
 
    The program accepts the following options.  Also see *note Common
 options::.
 
-`+FIRST_PAGE[:LAST_PAGE]'
-`--pages=FIRST_PAGE[:LAST_PAGE]'
+‘+FIRST_PAGE[:LAST_PAGE]’
+‘--pages=FIRST_PAGE[:LAST_PAGE]’
      Begin printing with page FIRST_PAGE and stop with LAST_PAGE.
-     Missing `:LAST_PAGE' implies end of file.  While estimating the
-     number of skipped pages each form feed in the input file results
-     in a new page.  Page counting with and without `+FIRST_PAGE' is
+     Missing ‘:LAST_PAGE’ implies end of file.  While estimating the
+     number of skipped pages each form feed in the input file results in
+     a new page.  Page counting with and without ‘+FIRST_PAGE’ is
      identical.  By default, counting starts with the first page of
-     input file (not first page printed).  Line numbering may be
-     altered by `-N' option.
-
-`-COLUMN'
-`--columns=COLUMN'
-     With each single FILE, produce COLUMN columns of output (default
-     is 1) and print columns down, unless `-a' is used.  The column
-     width is automatically decreased as COLUMN increases; unless you
-     use the `-W/-w' option to increase PAGE_WIDTH as well.  This
-     option might well cause some lines to be truncated.  The number of
-     lines in the columns on each page are balanced.  The options `-e'
-     and `-i' are on for multiple text-column output.  Together with
-     `-J' option column alignment and line truncation is turned off.
-     Lines of full length are joined in a free field format and `-S'
-     option may set field separators.  `-COLUMN' may not be used with
-     `-m' option.
-
-`-a'
-`--across'
+     input file (not first page printed).  Line numbering may be altered
+     by ‘-N’ option.
+
+‘-COLUMN’
+‘--columns=COLUMN’
+     With each single FILE, produce COLUMN columns of output (default is
+     1) and print columns down, unless ‘-a’ is used.  The column width
+     is automatically decreased as COLUMN increases; unless you use the
+     ‘-W/-w’ option to increase PAGE_WIDTH as well.  This option might
+     well cause some lines to be truncated.  The number of lines in the
+     columns on each page are balanced.  The options ‘-e’ and ‘-i’ are
+     on for multiple text-column output.  Together with ‘-J’ option
+     column alignment and line truncation is turned off.  Lines of full
+     length are joined in a free field format and ‘-S’ option may set
+     field separators.  ‘-COLUMN’ may not be used with ‘-m’ option.
+
+‘-a’
+‘--across’
      With each single FILE, print columns across rather than down.  The
-     `-COLUMN' option must be given with COLUMN greater than one.  If a
+     ‘-COLUMN’ option must be given with COLUMN greater than one.  If a
      line is too long to fit in a column, it is truncated.
 
-`-c'
-`--show-control-chars'
-     Print control characters using hat notation (e.g., `^G'); print
+‘-c’
+‘--show-control-chars’
+     Print control characters using hat notation (e.g., ‘^G’); print
      other nonprinting characters in octal backslash notation.  By
      default, nonprinting characters are not changed.
 
-`-d'
-`--double-space'
+‘-d’
+‘--double-space’
      Double space the output.
 
-`-D FORMAT'
-`--date-format=FORMAT'
-     Format header dates using FORMAT, using the same conventions as
-     for the command `date +FORMAT'.  *Note date invocation::.  Except
-     for directives, which start with `%', characters in FORMAT are
-     printed unchanged.  You can use this option to specify an
-     arbitrary string in place of the header date, e.g.,
-     `--date-format="Monday morning"'.
-
-     The default date format is `%Y-%m-%d %H:%M' (for example,
-     `2001-12-04 23:59'); but if the `POSIXLY_CORRECT' environment
-     variable is set and the `LC_TIME' locale category specifies the
-     POSIX locale, the default is `%b %e %H:%M %Y' (for example, `Dec
-     4 23:59 2001'.
+‘-D FORMAT’
+‘--date-format=FORMAT’
+     Format header dates using FORMAT, using the same conventions as for
+     the command ‘date +FORMAT’.  *Note date invocation::.  Except for
+     directives, which start with ‘%’, characters in FORMAT are printed
+     unchanged.  You can use this option to specify an arbitrary string
+     in place of the header date, e.g., ‘--date-format="Monday
+     morning"’.
+
+     The default date format is ‘%Y-%m-%d %H:%M’ (for example,
+     ‘2001-12-04 23:59’); but if the ‘POSIXLY_CORRECT’ environment
+     variable is set and the ‘LC_TIME’ locale category specifies the
+     POSIX locale, the default is ‘%b %e %H:%M %Y’ (for example, ‘Dec  4
+     23:59 2001’.
 
      Time stamps are listed according to the time zone rules specified
-     by the `TZ' environment variable, or by the system default rules if
-     `TZ' is not set.  *Note Specifying the Time Zone with `TZ':
+     by the ‘TZ’ environment variable, or by the system default rules if
+     ‘TZ’ is not set.  *Note Specifying the Time Zone with ‘TZ’:
      (libc)TZ Variable.
 
-`-e[IN-TABCHAR[IN-TABWIDTH]]'
-`--expand-tabs[=IN-TABCHAR[IN-TABWIDTH]]'
+‘-e[IN-TABCHAR[IN-TABWIDTH]]’
+‘--expand-tabs[=IN-TABCHAR[IN-TABWIDTH]]’
      Expand TABs to spaces on input.  Optional argument IN-TABCHAR is
      the input tab character (default is the TAB character).  Second
-     optional argument IN-TABWIDTH is the input tab character's width
+     optional argument IN-TABWIDTH is the input tab character’s width
      (default is 8).
 
-`-f'
-`-F'
-`--form-feed'
-     Use a form feed instead of newlines to separate output pages.
-     This does not alter the default page length of 66 lines.
+‘-f’
+‘-F’
+‘--form-feed’
+     Use a form feed instead of newlines to separate output pages.  This
+     does not alter the default page length of 66 lines.
 
-`-h HEADER'
-`--header=HEADER'
+‘-h HEADER’
+‘--header=HEADER’
      Replace the file name in the header with the centered string
      HEADER.  When using the shell, HEADER should be quoted and should
-     be separated from `-h' by a space.
+     be separated from ‘-h’ by a space.
 
-`-i[OUT-TABCHAR[OUT-TABWIDTH]]'
-`--output-tabs[=OUT-TABCHAR[OUT-TABWIDTH]]'
+‘-i[OUT-TABCHAR[OUT-TABWIDTH]]’
+‘--output-tabs[=OUT-TABCHAR[OUT-TABWIDTH]]’
      Replace spaces with TABs on output.  Optional argument OUT-TABCHAR
-     is the output tab character (default is the TAB character).
-     Second optional argument OUT-TABWIDTH is the output tab
-     character's width (default is 8).
+     is the output tab character (default is the TAB character).  Second
+     optional argument OUT-TABWIDTH is the output tab character’s width
+     (default is 8).
 
-`-J'
-`--join-lines'
+‘-J’
+‘--join-lines’
      Merge lines of full length.  Used together with the column options
-     `-COLUMN', `-a -COLUMN' or `-m'.  Turns off `-W/-w' line
+     ‘-COLUMN’, ‘-a -COLUMN’ or ‘-m’.  Turns off ‘-W/-w’ line
      truncation; no column alignment used; may be used with
-     `--sep-string[=STRING]'.  `-J' has been introduced (together with
-     `-W' and `--sep-string') to disentangle the old (POSIX-compliant)
-     options `-w' and `-s' along with the three column options.
+     ‘--sep-string[=STRING]’.  ‘-J’ has been introduced (together with
+     ‘-W’ and ‘--sep-string’) to disentangle the old (POSIX-compliant)
+     options ‘-w’ and ‘-s’ along with the three column options.
 
-`-l PAGE_LENGTH'
-`--length=PAGE_LENGTH'
+‘-l PAGE_LENGTH’
+‘--length=PAGE_LENGTH’
      Set the page length to PAGE_LENGTH (default 66) lines, including
      the lines of the header [and the footer].  If PAGE_LENGTH is less
      than or equal to 10, the header and footer are omitted, as if the
-     `-t' option had been given.
+     ‘-t’ option had been given.
 
-`-m'
-`--merge'
+‘-m’
+‘--merge’
      Merge and print all FILEs in parallel, one in each column.  If a
      line is too long to fit in a column, it is truncated, unless the
-     `-J' option is used.  `--sep-string[=STRING]' may be used.  Empty
+     ‘-J’ option is used.  ‘--sep-string[=STRING]’ may be used.  Empty
      pages in some FILEs (form feeds set) produce empty columns, still
      marked by STRING.  The result is a continuous line numbering and
      column marking throughout the whole merged file.  Completely empty
      merged pages show no separators or line numbers.  The default
-     header becomes `DATE PAGE' with spaces inserted in the middle; this
-     may be used with the `-h' or `--header' option to fill up the
+     header becomes ‘DATE PAGE’ with spaces inserted in the middle; this
+     may be used with the ‘-h’ or ‘--header’ option to fill up the
      middle blank part.
 
-`-n[NUMBER-SEPARATOR[DIGITS]]'
-`--number-lines[=NUMBER-SEPARATOR[DIGITS]]'
+‘-n[NUMBER-SEPARATOR[DIGITS]]’
+‘--number-lines[=NUMBER-SEPARATOR[DIGITS]]’
      Provide DIGITS digit line numbering (default for DIGITS is 5).
-     With multicolumn output the number occupies the first DIGITS
-     column positions of each text column or only each line of `-m'
-     output.  With single column output the number precedes each line
-     just as `-m' does.  Default counting of the line numbers starts
-     with the first line of the input file (not the first line printed,
-     compare the `--page' option and `-N' option).  Optional argument
+     With multicolumn output the number occupies the first DIGITS column
+     positions of each text column or only each line of ‘-m’ output.
+     With single column output the number precedes each line just as
+     ‘-m’ does.  Default counting of the line numbers starts with the
+     first line of the input file (not the first line printed, compare
+     the ‘--page’ option and ‘-N’ option).  Optional argument
      NUMBER-SEPARATOR is the character appended to the line number to
      separate it from the text followed.  The default separator is the
      TAB character.  In a strict sense a TAB is always printed with
      single column output only.  The TAB width varies with the TAB
-     position, e.g., with the left MARGIN specified by `-o' option.
-     With multicolumn output priority is given to `equal width of
-     output columns' (a POSIX specification).  The TAB width is fixed
-     to the value of the first column and does not change with
-     different values of left MARGIN.  That means a fixed number of
-     spaces is always printed in the place of the NUMBER-SEPARATOR TAB.
-     The tabification depends upon the output position.
-
-`-N LINE_NUMBER'
-`--first-line-number=LINE_NUMBER'
+     position, e.g., with the left MARGIN specified by ‘-o’ option.
+     With multicolumn output priority is given to ‘equal width of output
+     columns’ (a POSIX specification).  The TAB width is fixed to the
+     value of the first column and does not change with different values
+     of left MARGIN.  That means a fixed number of spaces is always
+     printed in the place of the NUMBER-SEPARATOR TAB.  The tabification
+     depends upon the output position.
+
+‘-N LINE_NUMBER’
+‘--first-line-number=LINE_NUMBER’
      Start line counting with the number LINE_NUMBER at first line of
      first page printed (in most cases not the first line of the input
      file).
 
-`-o MARGIN'
-`--indent=MARGIN'
+‘-o MARGIN’
+‘--indent=MARGIN’
      Indent each line with a margin MARGIN spaces wide (default is
      zero).  The total page width is the size of the margin plus the
-     PAGE_WIDTH set with the `-W/-w' option.  A limited overflow may
-     occur with numbered single column output (compare `-n' option).
+     PAGE_WIDTH set with the ‘-W/-w’ option.  A limited overflow may
+     occur with numbered single column output (compare ‘-n’ option).
 
-`-r'
-`--no-file-warnings'
+‘-r’
+‘--no-file-warnings’
      Do not print a warning message when an argument FILE cannot be
      opened.  (The exit status will still be nonzero, however.)
 
-`-s[CHAR]'
-`--separator[=CHAR]'
+‘-s[CHAR]’
+‘--separator[=CHAR]’
      Separate columns by a single character CHAR.  The default for CHAR
-     is the TAB character without `-w' and `no character' with `-w'.
-     Without `-s' the default separator `space' is set.  `-s[char]'
+     is the TAB character without ‘-w’ and ‘no character’ with ‘-w’.
+     Without ‘-s’ the default separator ‘space’ is set.  ‘-s[char]’
      turns off line truncation of all three column options
-     (`-COLUMN'|`-a -COLUMN'|`-m') unless `-w' is set.  This is a
+     (‘-COLUMN’|‘-a -COLUMN’|‘-m’) unless ‘-w’ is set.  This is a
      POSIX-compliant formulation.
 
-`-S[STRING]'
-`--sep-string[=STRING]'
-     Use STRING to separate output columns.  The `-S' option doesn't
-     affect the `-W/-w' option, unlike the `-s' option which does.  It
-     does not affect line truncation or column alignment.  Without
-     `-S', and with `-J', `pr' uses the default output separator, TAB.
-     Without `-S' or `-J', `pr' uses a `space' (same as `-S" "').  If
-     no `STRING' argument is specified, `""' is assumed.
-
-`-t'
-`--omit-header'
-     Do not print the usual header [and footer] on each page, and do
-     not fill out the bottom of pages (with blank lines or a form
-     feed).  No page structure is produced, but form feeds set in the
-     input files are retained.  The predefined pagination is not
-     changed.  `-t' or `-T' may be useful together with other options;
-     e.g.: `-t -e4', expand TAB characters in the input file to 4
-     spaces but don't make any other changes.  Use of `-t' overrides
-     `-h'.
-
-`-T'
-`--omit-pagination'
+‘-S[STRING]’
+‘--sep-string[=STRING]’
+     Use STRING to separate output columns.  The ‘-S’ option doesn’t
+     affect the ‘-W/-w’ option, unlike the ‘-s’ option which does.  It
+     does not affect line truncation or column alignment.  Without ‘-S’,
+     and with ‘-J’, ‘pr’ uses the default output separator, TAB.
+     Without ‘-S’ or ‘-J’, ‘pr’ uses a ‘space’ (same as ‘-S" "’).  If no
+     ‘STRING’ argument is specified, ‘""’ is assumed.
+
+‘-t’
+‘--omit-header’
+     Do not print the usual header [and footer] on each page, and do not
+     fill out the bottom of pages (with blank lines or a form feed).  No
+     page structure is produced, but form feeds set in the input files
+     are retained.  The predefined pagination is not changed.  ‘-t’ or
+     ‘-T’ may be useful together with other options; e.g.: ‘-t -e4’,
+     expand TAB characters in the input file to 4 spaces but don’t make
+     any other changes.  Use of ‘-t’ overrides ‘-h’.
+
+‘-T’
+‘--omit-pagination’
      Do not print header [and footer].  In addition eliminate all form
      feeds set in the input files.
 
-`-v'
-`--show-nonprinting'
+‘-v’
+‘--show-nonprinting’
      Print nonprinting characters in octal backslash notation.
 
-`-w PAGE_WIDTH'
-`--width=PAGE_WIDTH'
+‘-w PAGE_WIDTH’
+‘--width=PAGE_WIDTH’
      Set page width to PAGE_WIDTH characters for multiple text-column
-     output only (default for PAGE_WIDTH is 72).  `-s[CHAR]' turns off
-     the default page width and any line truncation and column
-     alignment.  Lines of full length are merged, regardless of the
-     column options set.  No PAGE_WIDTH setting is possible with single
-     column output.  A POSIX-compliant formulation.
-
-`-W PAGE_WIDTH'
-`--page_width=PAGE_WIDTH'
-     Set the page width to PAGE_WIDTH characters.  That's valid with and
-     without a column option.  Text lines are truncated, unless `-J' is
-     used.  Together with one of the three column options (`-COLUMN',
-     `-a -COLUMN' or `-m') column alignment is always used.  The
-     separator options `-S' or `-s' don't affect the `-W' option.
-     Default is 72 characters.  Without `-W PAGE_WIDTH' and without any
-     of the column options NO line truncation is used (defined to keep
-     downward compatibility and to meet most frequent tasks).  That's
-     equivalent to `-W 72 -J'.  The header line is never truncated.
-
+     output only (default for PAGE_WIDTH is 72).  The specified
+     PAGE_WIDTH is rounded down so that columns have equal width.
+     ‘-s[CHAR]’ turns off the default page width and any line truncation
+     and column alignment.  Lines of full length are merged, regardless
+     of the column options set.  No PAGE_WIDTH setting is possible with
+     single column output.  A POSIX-compliant formulation.
+
+‘-W PAGE_WIDTH’
+‘--page_width=PAGE_WIDTH’
+     Set the page width to PAGE_WIDTH characters, honored with and
+     without a column option.  With a column option, the specified
+     PAGE_WIDTH is rounded down so that columns have equal width.  Text
+     lines are truncated, unless ‘-J’ is used.  Together with one of the
+     three column options (‘-COLUMN’, ‘-a -COLUMN’ or ‘-m’) column
+     alignment is always used.  The separator options ‘-S’ or ‘-s’ don’t
+     disable the ‘-W’ option.  Default is 72 characters.  Without ‘-W
+     PAGE_WIDTH’ and without any of the column options NO line
+     truncation is used (defined to keep downward compatibility and to
+     meet most frequent tasks).  That’s equivalent to ‘-W 72 -J’.  The
+     header line is never truncated.
 
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
@@ -2364,43 +2310,42 @@ indicates failure.
 
 File: coreutils.info,  Node: fold invocation,  Prev: pr invocation,  Up: Formatting file contents
 
-4.4 `fold': Wrap input lines to fit in specified width
+4.4 ‘fold’: Wrap input lines to fit in specified width
 ======================================================
 
-`fold' writes each FILE (`-' means standard input), or standard input
-if none are given, to standard output, breaking long lines.  Synopsis:
+‘fold’ writes each FILE (‘-’ means standard input), or standard input if
+none are given, to standard output, breaking long lines.  Synopsis:
 
-     fold [OPTION]... [FILE]...
+     fold [OPTION]… [FILE]…
 
-   By default, `fold' breaks lines wider than 80 columns.  The output
-is split into as many lines as necessary.
+   By default, ‘fold’ breaks lines wider than 80 columns.  The output is
+split into as many lines as necessary.
 
-   `fold' counts screen columns by default; thus, a tab may count more
+   ‘fold’ counts screen columns by default; thus, a tab may count more
 than one column, backspace decreases the column count, and carriage
 return sets the column to zero.
 
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-b'
-`--bytes'
+‘-b’
+‘--bytes’
      Count bytes rather than columns, so that tabs, backspaces, and
      carriage returns are each counted as taking up one column, just
      like other characters.
 
-`-s'
-`--spaces'
+‘-s’
+‘--spaces’
      Break at word boundaries: the line is broken after the last blank
      before the maximum line length.  If the line contains no such
      blanks, the line is broken at the maximum line length as usual.
 
-`-w WIDTH'
-`--width=WIDTH'
+‘-w WIDTH’
+‘--width=WIDTH’
      Use a maximum line length of WIDTH columns instead of 80.
 
-     For compatibility `fold' supports an obsolete option syntax
-     `-WIDTH'.  New scripts should use `-w WIDTH' instead.
-
+     For compatibility ‘fold’ supports an obsolete option syntax
+     ‘-WIDTH’.  New scripts should use ‘-w WIDTH’ instead.
 
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
@@ -2423,16 +2368,16 @@ These commands output pieces of the input.
 
 File: coreutils.info,  Node: head invocation,  Next: tail invocation,  Up: Output of parts of files
 
-5.1 `head': Output the first part of files
+5.1 ‘head’: Output the first part of files
 ==========================================
 
-`head' prints the first part (10 lines by default) of each FILE; it
+‘head’ prints the first part (10 lines by default) of each FILE; it
 reads from standard input if no files are given or when given a FILE of
-`-'.  Synopsis:
+‘-’.  Synopsis:
 
-     head [OPTION]... [FILE]...
+     head [OPTION]… [FILE]…
 
-   If more than one FILE is specified, `head' prints a one-line header
+   If more than one FILE is specified, ‘head’ prints a one-line header
 consisting of:
 
      ==> FILE NAME <==
@@ -2442,45 +2387,44 @@ before the output for each FILE.
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-c K'
-`--bytes=K'
+‘-c K’
+‘--bytes=K’
      Print the first K bytes, instead of initial lines.  However, if K
-     starts with a `-', print all but the last K bytes of each file.  K
+     starts with a ‘-’, print all but the last K bytes of each file.  K
      may be, or may be an integer optionally followed by, one of the
      following multiplicative suffixes:
-          `b'  =>            512 ("blocks")
-          `KB' =>           1000 (KiloBytes)
-          `K'  =>           1024 (KibiBytes)
-          `MB' =>      1000*1000 (MegaBytes)
-          `M'  =>      1024*1024 (MebiBytes)
-          `GB' => 1000*1000*1000 (GigaBytes)
-          `G'  => 1024*1024*1024 (GibiBytes)
-     and so on for `T', `P', `E', `Z', and `Y'.
-
-`-n K'
-`--lines=K'
-     Output the first K lines.  However, if K starts with a `-', print
+          ‘b’  =>            512 ("blocks")
+          ‘KB’ =>           1000 (KiloBytes)
+          ‘K’  =>           1024 (KibiBytes)
+          ‘MB’ =>      1000*1000 (MegaBytes)
+          ‘M’  =>      1024*1024 (MebiBytes)
+          ‘GB’ => 1000*1000*1000 (GigaBytes)
+          ‘G’  => 1024*1024*1024 (GibiBytes)
+     and so on for ‘T’, ‘P’, ‘E’, ‘Z’, and ‘Y’.
+
+‘-n K’
+‘--lines=K’
+     Output the first K lines.  However, if K starts with a ‘-’, print
      all but the last K lines of each file.  Size multiplier suffixes
-     are the same as with the `-c' option.
+     are the same as with the ‘-c’ option.
 
-`-q'
-`--quiet'
-`--silent'
+‘-q’
+‘--quiet’
+‘--silent’
      Never print file name headers.
 
-`-v'
-`--verbose'
+‘-v’
+‘--verbose’
      Always print file name headers.
 
-
-   For compatibility `head' also supports an obsolete option syntax
-`-COUNTOPTIONS', which is recognized only if it is specified first.
-COUNT is a decimal number optionally followed by a size letter (`b',
-`k', `m') as in `-c', or `l' to mean count by lines, or other option
-letters (`cqv').  Scripts intended for standard hosts should use `-c
-COUNT' or `-n COUNT' instead.  If your script must also run on hosts
+   For compatibility ‘head’ also supports an obsolete option syntax
+‘-COUNTOPTIONS’, which is recognized only if it is specified first.
+COUNT is a decimal number optionally followed by a size letter (‘b’,
+‘k’, ‘m’) as in ‘-c’, or ‘l’ to mean count by lines, or other option
+letters (‘cqv’).  Scripts intended for standard hosts should use ‘-c
+COUNT’ or ‘-n COUNT’ instead.  If your script must also run on hosts
 that support only the obsolete syntax, it is usually simpler to avoid
-`head', e.g., by using `sed 5q' instead of `head -5'.
+‘head’, e.g., by using ‘sed 5q’ instead of ‘head -5’.
 
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
@@ -2488,198 +2432,207 @@ indicates failure.
 
 File: coreutils.info,  Node: tail invocation,  Next: split invocation,  Prev: head invocation,  Up: Output of parts of files
 
-5.2 `tail': Output the last part of files
+5.2 ‘tail’: Output the last part of files
 =========================================
 
-`tail' prints the last part (10 lines by default) of each FILE; it
-reads from standard input if no files are given or when given a FILE of
-`-'.  Synopsis:
+‘tail’ prints the last part (10 lines by default) of each FILE; it reads
+from standard input if no files are given or when given a FILE of ‘-’.
+Synopsis:
 
-     tail [OPTION]... [FILE]...
+     tail [OPTION]… [FILE]…
 
-   If more than one FILE is specified, `tail' prints a one-line header
+   If more than one FILE is specified, ‘tail’ prints a one-line header
 consisting of:
 
      ==> FILE NAME <==
 
 before the output for each FILE.
 
-   GNU `tail' can output any amount of data (some other versions of
-`tail' cannot).  It also has no `-r' option (print in reverse), since
+   GNU ‘tail’ can output any amount of data (some other versions of
+‘tail’ cannot).  It also has no ‘-r’ option (print in reverse), since
 reversing a file is really a different job from printing the end of a
-file; BSD `tail' (which is the one with `-r') can only reverse files
+file; BSD ‘tail’ (which is the one with ‘-r’) can only reverse files
 that are at most as large as its buffer, which is typically 32 KiB.  A
-more reliable and versatile way to reverse files is the GNU `tac'
+more reliable and versatile way to reverse files is the GNU ‘tac’
 command.
 
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-c K'
-`--bytes=K'
+‘-c K’
+‘--bytes=K’
      Output the last K bytes, instead of final lines.  However, if K
-     starts with a `+', start printing with the Kth byte from the start
+     starts with a ‘+’, start printing with the Kth byte from the start
      of each file, instead of from the end.  K may be, or may be an
-     integer optionally followed by, one of the following
-     multiplicative suffixes:
-          `b'  =>            512 ("blocks")
-          `KB' =>           1000 (KiloBytes)
-          `K'  =>           1024 (KibiBytes)
-          `MB' =>      1000*1000 (MegaBytes)
-          `M'  =>      1024*1024 (MebiBytes)
-          `GB' => 1000*1000*1000 (GigaBytes)
-          `G'  => 1024*1024*1024 (GibiBytes)
-     and so on for `T', `P', `E', `Z', and `Y'.
-
-`-f'
-`--follow[=HOW]'
+     integer optionally followed by, one of the following multiplicative
+     suffixes:
+          ‘b’  =>            512 ("blocks")
+          ‘KB’ =>           1000 (KiloBytes)
+          ‘K’  =>           1024 (KibiBytes)
+          ‘MB’ =>      1000*1000 (MegaBytes)
+          ‘M’  =>      1024*1024 (MebiBytes)
+          ‘GB’ => 1000*1000*1000 (GigaBytes)
+          ‘G’  => 1024*1024*1024 (GibiBytes)
+     and so on for ‘T’, ‘P’, ‘E’, ‘Z’, and ‘Y’.
+
+‘-f’
+‘--follow[=HOW]’
      Loop forever trying to read more characters at the end of the file,
      presumably because the file is growing.  If more than one file is
-     given, `tail' prints a header whenever it gets output from a
+     given, ‘tail’ prints a header whenever it gets output from a
      different file, to indicate which file that output is from.
 
-     There are two ways to specify how you'd like to track files with
-     this option, but that difference is noticeable only when a
-     followed file is removed or renamed.  If you'd like to continue to
-     track the end of a growing file even after it has been unlinked,
-     use `--follow=descriptor'.  This is the default behavior, but it
-     is not useful if you're tracking a log file that may be rotated
-     (removed or renamed, then reopened).  In that case, use
-     `--follow=name' to track the named file, perhaps by reopening it
-     periodically to see if it has been removed and recreated by some
-     other program.  Note that the inotify-based implementation handles
-     this case without the need for any periodic reopening.
+     There are two ways to specify how you’d like to track files with
+     this option, but that difference is noticeable only when a followed
+     file is removed or renamed.  If you’d like to continue to track the
+     end of a growing file even after it has been unlinked, use
+     ‘--follow=descriptor’.  This is the default behavior, but it is not
+     useful if you’re tracking a log file that may be rotated (removed
+     or renamed, then reopened).  In that case, use ‘--follow=name’ to
+     track the named file, perhaps by reopening it periodically to see
+     if it has been removed and recreated by some other program.  Note
+     that the inotify-based implementation handles this case without the
+     need for any periodic reopening.
 
      No matter which method you use, if the tracked file is determined
-     to have shrunk, `tail' prints a message saying the file has been
+     to have shrunk, ‘tail’ prints a message saying the file has been
      truncated and resumes tracking the end of the file from the
      newly-determined endpoint.
 
-     When a file is removed, `tail''s behavior depends on whether it is
-     following the name or the descriptor.  When following by name,
-     tail can detect that a file has been removed and gives a message
-     to that effect, and if `--retry' has been specified it will
-     continue checking periodically to see if the file reappears.  When
-     following a descriptor, tail does not detect that the file has
-     been unlinked or renamed and issues no message;  even though the
-     file may no longer be accessible via its original name, it may
-     still be growing.
-
-     The option values `descriptor' and `name' may be specified only
-     with the long form of the option, not with `-f'.
-
-     The `-f' option is ignored if no FILE operand is specified and
-     standard input is a FIFO or a pipe.  Likewise, the `-f' option has
-     no effect for any operand specified as `-', when standard input is
+     When a file is removed, ‘tail’’s behavior depends on whether it is
+     following the name or the descriptor.  When following by name, tail
+     can detect that a file has been removed and gives a message to that
+     effect, and if ‘--retry’ has been specified it will continue
+     checking periodically to see if the file reappears.  When following
+     a descriptor, tail does not detect that the file has been unlinked
+     or renamed and issues no message; even though the file may no
+     longer be accessible via its original name, it may still be
+     growing.
+
+     The option values ‘descriptor’ and ‘name’ may be specified only
+     with the long form of the option, not with ‘-f’.
+
+     The ‘-f’ option is ignored if no FILE operand is specified and
+     standard input is a FIFO or a pipe.  Likewise, the ‘-f’ option has
+     no effect for any operand specified as ‘-’, when standard input is
      a FIFO or a pipe.
 
      With kernel inotify support, output is triggered by file changes
-     and is generally very prompt.  Otherwise, `tail' sleeps for one
-     second between checks-- use `--sleep-interval=N' to change that
-     default--which can make the output appear slightly less responsive
+     and is generally very prompt.  Otherwise, ‘tail’ sleeps for one
+     second between checks— use ‘--sleep-interval=N’ to change that
+     default—which can make the output appear slightly less responsive
      or bursty.  When using tail without inotify support, you can make
      it more responsive by using a sub-second sleep interval, e.g., via
      an alias like this:
 
           alias tail='tail -s.1'
 
-`-F'
-     This option is the same as `--follow=name --retry'.  That is, tail
+‘-F’
+     This option is the same as ‘--follow=name --retry’.  That is, tail
      will attempt to reopen a file when it is removed.  Should this
      fail, tail will keep trying until it becomes accessible again.
 
-`--retry'
-     This option is useful mainly when following by name (i.e., with
-     `--follow=name').  Without this option, when tail encounters a
-     file that doesn't exist or is otherwise inaccessible, it reports
-     that fact and never checks it again.
+‘--retry’
+     Indefinitely try to open the specified file.  This option is useful
+     mainly when following (and otherwise issues a warning).
+
+     When following by file descriptor (i.e., with
+     ‘--follow=descriptor’), this option only affects the initial open
+     of the file, as after a successful open, ‘tail’ will start
+     following the file descriptor.
 
-`--sleep-interval=NUMBER'
+     When following by name (i.e., with ‘--follow=name’), ‘tail’
+     infinitely retries to re-open the given files until killed.
+
+     Without this option, when ‘tail’ encounters a file that doesn’t
+     exist or is otherwise inaccessible, it reports that fact and never
+     checks it again.
+
+‘--sleep-interval=NUMBER’
      Change the number of seconds to wait between iterations (the
      default is 1.0).  During one iteration, every specified file is
      checked to see if it has changed size.  Historical implementations
-     of `tail' have required that NUMBER be an integer.  However, GNU
-     `tail' accepts an arbitrary floating point number.  *Note Floating
-     point::.  When `tail' uses inotify, this polling-related option is
-     usually ignored.  However, if you also specify `--pid=P', `tail'
+     of ‘tail’ have required that NUMBER be an integer.  However, GNU
+     ‘tail’ accepts an arbitrary floating point number.  *Note Floating
+     point::.  When ‘tail’ uses inotify, this polling-related option is
+     usually ignored.  However, if you also specify ‘--pid=P’, ‘tail’
      checks whether process P is alive at least every NUMBER seconds.
 
-`--pid=PID'
+‘--pid=PID’
      When following by name or by descriptor, you may specify the
      process ID, PID, of the sole writer of all FILE arguments.  Then,
      shortly after that process terminates, tail will also terminate.
      This will work properly only if the writer and the tailing process
      are running on the same machine.  For example, to save the output
      of a build in a file and to watch the file grow, if you invoke
-     `make' and `tail' like this then the tail process will stop when
+     ‘make’ and ‘tail’ like this then the tail process will stop when
      your build completes.  Without this option, you would have had to
-     kill the `tail -f' process yourself.
+     kill the ‘tail -f’ process yourself.
 
           $ make >& makerr & tail --pid=$! -f makerr
 
      If you specify a PID that is not in use or that does not correspond
-     to the process that is writing to the tailed files, then `tail'
-     may terminate long before any FILEs stop growing or it may not
+     to the process that is writing to the tailed files, then ‘tail’ may
+     terminate long before any FILEs stop growing or it may not
      terminate until long after the real writer has terminated.  Note
-     that `--pid' cannot be supported on some systems; `tail' will
-     print a warning if this is the case.
-
-`--max-unchanged-stats=N'
-     When tailing a file by name, if there have been N (default
-     n=5) consecutive iterations for which the file has not changed,
-     then `open'/`fstat' the file to determine if that file name is
-     still associated with the same device/inode-number pair as before.
-     When following a log file that is rotated, this is approximately
-     the number of seconds between when tail prints the last
-     pre-rotation lines and when it prints the lines that have
-     accumulated in the new log file.  This option is meaningful only
-     when polling (i.e., without inotify) and when following by name.
-
-`-n K'
-`--lines=K'
-     Output the last K lines.  However, if K starts with a `+', start
+     that ‘--pid’ cannot be supported on some systems; ‘tail’ will print
+     a warning if this is the case.
+
+‘--max-unchanged-stats=N’
+     When tailing a file by name, if there have been N (default n=5)
+     consecutive iterations for which the file has not changed, then
+     ‘open’/‘fstat’ the file to determine if that file name is still
+     associated with the same device/inode-number pair as before.  When
+     following a log file that is rotated, this is approximately the
+     number of seconds between when tail prints the last pre-rotation
+     lines and when it prints the lines that have accumulated in the new
+     log file.  This option is meaningful only when polling (i.e.,
+     without inotify) and when following by name.
+
+‘-n K’
+‘--lines=K’
+     Output the last K lines.  However, if K starts with a ‘+’, start
      printing with the Kth line from the start of each file, instead of
      from the end.  Size multiplier suffixes are the same as with the
-     `-c' option.
+     ‘-c’ option.
 
-`-q'
-`--quiet'
-`--silent'
+‘-q’
+‘--quiet’
+‘--silent’
      Never print file name headers.
 
-`-v'
-`--verbose'
+‘-v’
+‘--verbose’
      Always print file name headers.
 
-
-   For compatibility `tail' also supports an obsolete usage `tail
--[COUNT][bcl][f] [FILE]', which is recognized only if it does not
+   For compatibility ‘tail’ also supports an obsolete usage ‘tail
+-[COUNT][bcl][f] [FILE]’, which is recognized only if it does not
 conflict with the usage described above.  This obsolete form uses
 exactly one option and at most one file.  In the option, COUNT is an
-optional decimal number optionally followed by a size letter (`b', `c',
-`l') to mean count by 512-byte blocks, bytes, or lines, optionally
-followed by `f' which has the same meaning as `-f'.
+optional decimal number optionally followed by a size letter (‘b’, ‘c’,
+‘l’) to mean count by 512-byte blocks, bytes, or lines, optionally
+followed by ‘f’ which has the same meaning as ‘-f’.
 
-   On older systems, the leading `-' can be replaced by `+' in the
+   On older systems, the leading ‘-’ can be replaced by ‘+’ in the
 obsolete option syntax with the same meaning as in counts, and obsolete
 usage overrides normal usage when the two conflict.  This obsolete
-behavior can be enabled or disabled with the `_POSIX2_VERSION'
+behavior can be enabled or disabled with the ‘_POSIX2_VERSION’
 environment variable (*note Standards conformance::).
 
    Scripts intended for use on standard hosts should avoid obsolete
-syntax and should use `-c COUNT[b]', `-n COUNT', and/or `-f' instead.
+syntax and should use ‘-c COUNT[b]’, ‘-n COUNT’, and/or ‘-f’ instead.
 If your script must also run on hosts that support only the obsolete
 syntax, you can often rewrite it to avoid problematic usages, e.g., by
-using `sed -n '$p'' rather than `tail -1'.  If that's not possible, the
-script can use a test like `if tail -c +1 </dev/null >/dev/null 2>&1;
-then ...' to decide which syntax to use.
+using ‘sed -n '$p'’ rather than ‘tail -1’.  If that’s not possible, the
+script can use a test like ‘if tail -c +1 </dev/null >/dev/null 2>&1;
+then …’ to decide which syntax to use.
 
    Even if your script assumes the standard behavior, you should still
 beware usages whose behaviors differ depending on the POSIX version.
-For example, avoid `tail - main.c', since it might be interpreted as
-either `tail main.c' or as `tail -- - main.c'; avoid `tail -c 4', since
-it might mean either `tail -c4' or `tail -c 10 4'; and avoid `tail +4',
-since it might mean either `tail ./+4' or `tail -n +4'.
+For example, avoid ‘tail - main.c’, since it might be interpreted as
+either ‘tail main.c’ or as ‘tail -- - main.c’; avoid ‘tail -c 4’, since
+it might mean either ‘tail -c4’ or ‘tail -c 10 4’; and avoid ‘tail +4’,
+since it might mean either ‘tail ./+4’ or ‘tail -n +4’.
 
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
@@ -2687,97 +2640,97 @@ indicates failure.
 
 File: coreutils.info,  Node: split invocation,  Next: csplit invocation,  Prev: tail invocation,  Up: Output of parts of files
 
-5.3 `split': Split a file into pieces.
+5.3 ‘split’: Split a file into pieces.
 ======================================
 
-`split' creates output files containing consecutive or interleaved
-sections of INPUT  (standard input if none is given or INPUT is `-').
+‘split’ creates output files containing consecutive or interleaved
+sections of INPUT (standard input if none is given or INPUT is ‘-’).
 Synopsis:
 
      split [OPTION] [INPUT [PREFIX]]
 
-   By default, `split' puts 1000 lines of INPUT (or whatever is left
+   By default, ‘split’ puts 1000 lines of INPUT (or whatever is left
 over for the last section), into each output file.
 
-   The output files' names consist of PREFIX (`x' by default) followed
-by a group of characters (`aa', `ab', ... by default), such that
+   The output files’ names consist of PREFIX (‘x’ by default) followed
+by a group of characters (‘aa’, ‘ab’, … by default), such that
 concatenating the output files in traditional sorted order by file name
-produces the original input file (except `-nr/N').  By default split
+produces the original input file (except ‘-nr/N’).  By default split
 will initially create files with two generated suffix characters, and
 will increase this width by two when the next most significant position
-reaches the last character.  (`yz', `zaaa', `zaab', ...).  In this way
-an arbitrary number of output files are supported, which sort as
-described above, even in the presence of an `--additional-suffix'
-option.  If the `-a' option is specified and the output file names are
-exhausted, `split' reports an error without deleting the output files
-that it did create.
+reaches the last character.  (‘yz’, ‘zaaa’, ‘zaab’, …).  In this way an
+arbitrary number of output files are supported, which sort as described
+above, even in the presence of an ‘--additional-suffix’ option.  If the
+‘-a’ option is specified and the output file names are exhausted,
+‘split’ reports an error without deleting the output files that it did
+create.
 
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-l LINES'
-`--lines=LINES'
+‘-l LINES’
+‘--lines=LINES’
      Put LINES lines of INPUT into each output file.
 
-     For compatibility `split' also supports an obsolete option syntax
-     `-LINES'.  New scripts should use `-l LINES' instead.
+     For compatibility ‘split’ also supports an obsolete option syntax
+     ‘-LINES’.  New scripts should use ‘-l LINES’ instead.
 
-`-b SIZE'
-`--bytes=SIZE'
-     Put SIZE bytes of INPUT into each output file.  SIZE may be, or
-     may be an integer optionally followed by, one of the following
+‘-b SIZE’
+‘--bytes=SIZE’
+     Put SIZE bytes of INPUT into each output file.  SIZE may be, or may
+     be an integer optionally followed by, one of the following
      multiplicative suffixes:
-          `b'  =>            512 ("blocks")
-          `KB' =>           1000 (KiloBytes)
-          `K'  =>           1024 (KibiBytes)
-          `MB' =>      1000*1000 (MegaBytes)
-          `M'  =>      1024*1024 (MebiBytes)
-          `GB' => 1000*1000*1000 (GigaBytes)
-          `G'  => 1024*1024*1024 (GibiBytes)
-     and so on for `T', `P', `E', `Z', and `Y'.
-
-`-C SIZE'
-`--line-bytes=SIZE'
+          ‘b’  =>            512 ("blocks")
+          ‘KB’ =>           1000 (KiloBytes)
+          ‘K’  =>           1024 (KibiBytes)
+          ‘MB’ =>      1000*1000 (MegaBytes)
+          ‘M’  =>      1024*1024 (MebiBytes)
+          ‘GB’ => 1000*1000*1000 (GigaBytes)
+          ‘G’  => 1024*1024*1024 (GibiBytes)
+     and so on for ‘T’, ‘P’, ‘E’, ‘Z’, and ‘Y’.
+
+‘-C SIZE’
+‘--line-bytes=SIZE’
      Put into each output file as many complete lines of INPUT as
      possible without exceeding SIZE bytes.  Individual lines longer
      than SIZE bytes are broken into multiple files.  SIZE has the same
-     format as for the `--bytes' option.
+     format as for the ‘--bytes’ option.
 
-`--filter=COMMAND'
+‘--filter=COMMAND’
      With this option, rather than simply writing to each output file,
-     write through a pipe to the specified shell COMMAND for each
-     output file.  COMMAND should use the $FILE environment variable,
-     which is set to a different output file name for each invocation
-     of the command.  For example, imagine that you have a 1TiB
-     compressed file that, if uncompressed, would be too large to
-     reside on disk, yet you must split it into individually-compressed
-     pieces of a more manageable size.  To do that, you might run this
-     command:
+     write through a pipe to the specified shell COMMAND for each output
+     file.  COMMAND should use the $FILE environment variable, which is
+     set to a different output file name for each invocation of the
+     command.  For example, imagine that you have a 1TiB compressed file
+     that, if uncompressed, would be too large to reside on disk, yet
+     you must split it into individually-compressed pieces of a more
+     manageable size.  To do that, you might run this command:
 
           xz -dc BIG.xz | split -b200G --filter='xz > $FILE.xz' - big-
 
      Assuming a 10:1 compression ratio, that would create about fifty
-     20GiB files with names `big-aa.xz', `big-ab.xz', `big-ac.xz', etc.
+     20GiB files with names ‘big-aa.xz’, ‘big-ab.xz’, ‘big-ac.xz’, etc.
+
+‘-n CHUNKS’
+‘--number=CHUNKS’
 
-`-n CHUNKS'
-`--number=CHUNKS'
      Split INPUT to CHUNKS output files where CHUNKS may be:
 
           N      generate N files based on current size of INPUT
           K/N    only output Kth of N to stdout
           l/N    generate N files without splitting lines
           l/K/N  likewise but only output Kth of N to stdout
-          r/N    like `l' but use round robin distribution
+          r/N    like ‘l’ but use round robin distribution
           r/K/N  likewise but only output Kth of N to stdout
 
      Any excess bytes remaining after dividing the INPUT into N chunks,
      are assigned to the last chunk.  Any excess bytes appearing after
-     the initial calculation are discarded (except when using `r' mode).
+     the initial calculation are discarded (except when using ‘r’ mode).
 
      All N files are created even if there are fewer than N lines, or
      the INPUT is truncated.
 
-     For `l' mode, chunks are approximately INPUT size / N.  The INPUT
+     For ‘l’ mode, chunks are approximately INPUT size / N.  The INPUT
      is partitioned into N equal sized portions, with the last assigned
      any excess.  If a line _starts_ within a partition it is written
      completely to the corresponding file.  Since lines are not split
@@ -2785,50 +2738,49 @@ options::.
      or smaller than the partition size, and even empty if a line is so
      long as to completely overlap the partition.
 
-     For `r' mode, the size of INPUT is irrelevant, and so can be a
-     pipe for example.
+     For ‘r’ mode, the size of INPUT is irrelevant, and so can be a pipe
+     for example.
 
-`-a LENGTH'
-`--suffix-length=LENGTH'
-     Use suffixes of length LENGTH.  If a LENGTH of 0 is specified,
-     this is the same as if (any previous) `-a' was not specified, and
-     thus enables the default behavior, which starts the suffix length
-     at 2, and unless `-n' or `--numeric-suffixes=FROM' is specified,
-     will auto increase the length by 2 as required.
+‘-a LENGTH’
+‘--suffix-length=LENGTH’
+     Use suffixes of length LENGTH.  If a LENGTH of 0 is specified, this
+     is the same as if (any previous) ‘-a’ was not specified, and thus
+     enables the default behavior, which starts the suffix length at 2,
+     and unless ‘-n’ or ‘--numeric-suffixes=FROM’ is specified, will
+     auto increase the length by 2 as required.
 
-`-d'
-`--numeric-suffixes[=FROM]'
+‘-d’
+‘--numeric-suffixes[=FROM]’
      Use digits in suffixes rather than lower-case letters.  The
      numerical suffix counts from FROM if specified, 0 otherwise.  Note
      specifying a FROM value also disables the default auto suffix
      length expansion described above, and so you may also want to
-     specify `-a' to allow suffixes beyond `99'.
+     specify ‘-a’ to allow suffixes beyond ‘99’.
 
-`--additional-suffix=SUFFIX'
+‘--additional-suffix=SUFFIX’
      Append an additional SUFFIX to output file names.  SUFFIX must not
      contain slash.
 
-`-e'
-`--elide-empty-files'
+‘-e’
+‘--elide-empty-files’
      Suppress the generation of zero-length output files.  This can
-     happen with the `--number' option if a file is (truncated to be)
+     happen with the ‘--number’ option if a file is (truncated to be)
      shorter than the number requested, or if a line is so long as to
      completely span a chunk.  The output file sequence numbers, always
      run consecutively even when this option is specified.
 
-`-u'
-`--unbuffered'
-     Immediately copy input to output in `--number r/...' mode, which
-     is a much slower mode of operation.
+‘-u’
+‘--unbuffered’
+     Immediately copy input to output in ‘--number r/…’ mode, which is a
+     much slower mode of operation.
 
-`--verbose'
+‘--verbose’
      Write a diagnostic just before each output file is opened.
 
-
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
 
-   Here are a few examples to illustrate how the `--number' (`-n')
+   Here are a few examples to illustrate how the ‘--number’ (‘-n’)
 option works:
 
    Notice how, by default, one line may be split onto two or more:
@@ -2884,13 +2836,13 @@ just the 7th "chunk" of 33:
 
 File: coreutils.info,  Node: csplit invocation,  Prev: split invocation,  Up: Output of parts of files
 
-5.4 `csplit': Split a file into context-determined pieces
+5.4 ‘csplit’: Split a file into context-determined pieces
 =========================================================
 
-`csplit' creates zero or more output files containing sections of INPUT
-(standard input if INPUT is `-').  Synopsis:
+‘csplit’ creates zero or more output files containing sections of INPUT
+(standard input if INPUT is ‘-’).  Synopsis:
 
-     csplit [OPTION]... INPUT PATTERN...
+     csplit [OPTION]… INPUT PATTERN…
 
    The contents of the output files are determined by the PATTERN
 arguments, as detailed below.  An error occurs if a PATTERN argument
@@ -2898,93 +2850,95 @@ refers to a nonexistent line of the input file (e.g., if no remaining
 line matches a given regular expression).  After every PATTERN has been
 matched, any remaining input is copied into one last output file.
 
-   By default, `csplit' prints the number of bytes written to each
+   By default, ‘csplit’ prints the number of bytes written to each
 output file after it has been created.
 
    The types of pattern arguments are:
 
-`N'
+‘N’
      Create an output file containing the input up to but not including
      line N (a positive integer).  If followed by a repeat count, also
-     create an output file containing the next N lines of the input
-     file once for each repeat.
+     create an output file containing the next N lines of the input file
+     once for each repeat.
 
-`/REGEXP/[OFFSET]'
+‘/REGEXP/[OFFSET]’
      Create an output file containing the current line up to (but not
      including) the next line of the input file that contains a match
      for REGEXP.  The optional OFFSET is an integer.  If it is given,
-     the input up to (but not including) the matching line plus or
-     minus OFFSET is put into the output file, and the line after that
-     begins the next section of input.
+     the input up to (but not including) the matching line plus or minus
+     OFFSET is put into the output file, and the line after that begins
+     the next section of input.
 
-`%REGEXP%[OFFSET]'
+‘%REGEXP%[OFFSET]’
      Like the previous type, except that it does not create an output
      file, so that section of the input file is effectively ignored.
 
-`{REPEAT-COUNT}'
+‘{REPEAT-COUNT}’
      Repeat the previous pattern REPEAT-COUNT additional times.  The
      REPEAT-COUNT can either be a positive integer or an asterisk,
      meaning repeat as many times as necessary until the input is
      exhausted.
 
-
-   The output files' names consist of a prefix (`xx' by default)
+   The output files’ names consist of a prefix (‘xx’ by default)
 followed by a suffix.  By default, the suffix is an ascending sequence
-of two-digit decimal numbers from `00' to `99'.  In any case,
+of two-digit decimal numbers from ‘00’ to ‘99’.  In any case,
 concatenating the output files in sorted order by file name produces the
 original input file.
 
-   By default, if `csplit' encounters an error or receives a hangup,
+   By default, if ‘csplit’ encounters an error or receives a hangup,
 interrupt, quit, or terminate signal, it removes any output files that
 it has created so far before it exits.
 
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-f PREFIX'
-`--prefix=PREFIX'
+‘-f PREFIX’
+‘--prefix=PREFIX’
      Use PREFIX as the output file name prefix.
 
-`-b SUFFIX'
-`--suffix=SUFFIX'
+‘-b SUFFIX’
+‘--suffix=SUFFIX’
      Use SUFFIX as the output file name suffix.  When this option is
      specified, the suffix string must include exactly one
-     `printf(3)'-style conversion specification, possibly including
+     ‘printf(3)’-style conversion specification, possibly including
      format specification flags, a field width, a precision
      specifications, or all of these kinds of modifiers.  The format
      letter must convert a binary unsigned integer argument to readable
-     form.  The format letters `d' and `i' are aliases for `u', and the
-     `u', `o', `x', and `X' conversions are allowed.  The entire SUFFIX
-     is given (with the current output file number) to `sprintf(3)' to
-     form the file name suffixes for each of the individual output
-     files in turn.  If this option is used, the `--digits' option is
-     ignored.
-
-`-n DIGITS'
-`--digits=DIGITS'
+     form.  The format letters ‘d’ and ‘i’ are aliases for ‘u’, and the
+     ‘u’, ‘o’, ‘x’, and ‘X’ conversions are allowed.  The entire SUFFIX
+     is given (with the current output file number) to ‘sprintf(3)’ to
+     form the file name suffixes for each of the individual output files
+     in turn.  If this option is used, the ‘--digits’ option is ignored.
+
+‘-n DIGITS’
+‘--digits=DIGITS’
      Use output file names containing numbers that are DIGITS digits
      long instead of the default 2.
 
-`-k'
-`--keep-files'
+‘-k’
+‘--keep-files’
      Do not remove output files when errors are encountered.
 
-`-z'
-`--elide-empty-files'
+‘--suppress-matched’
+     Do not output lines matching the specified PATTERN.  I.E. suppress
+     the boundary line from the start of the second and subsequent
+     splits.
+
+‘-z’
+‘--elide-empty-files’
      Suppress the generation of zero-length output files.  (In cases
-     where the section delimiters of the input file are supposed to
-     mark the first lines of each of the sections, the first output
-     file will generally be a zero-length file unless you use this
-     option.)  The output file sequence numbers always run
-     consecutively starting from 0, even when this option is specified.
-
-`-s'
-`-q'
-`--silent'
-`--quiet'
+     where the section delimiters of the input file are supposed to mark
+     the first lines of each of the sections, the first output file will
+     generally be a zero-length file unless you use this option.)  The
+     output file sequence numbers always run consecutively starting from
+     0, even when this option is specified.
+
+‘-s’
+‘-q’
+‘--silent’
+‘--quiet’
      Do not print counts of output file sizes.
 
-
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
 
@@ -3006,7 +2960,7 @@ has just created.  List the names of those output files:
      $ ls
      xx00  xx01  xx02
 
-   Use `head' to show their contents:
+   Use ‘head’ to show their contents:
 
      $ head xx*
      ==> xx00 <==
@@ -3029,6 +2983,10 @@ has just created.  List the names of those output files:
      13
      14
 
+   Example of splitting input by empty lines:
+
+     $ csplit --suppress-matched INPUT.TXT '/^$/' '{*}'
+
 
 File: coreutils.info,  Node: Summarizing files,  Next: Operating on sorted files,  Prev: Output of parts of files,  Up: Top
 
@@ -3050,28 +3008,28 @@ of files.
 
 File: coreutils.info,  Node: wc invocation,  Next: sum invocation,  Up: Summarizing files
 
-6.1 `wc': Print newline, word, and byte counts
+6.1 ‘wc’: Print newline, word, and byte counts
 ==============================================
 
-`wc' counts the number of bytes, characters, whitespace-separated
-words, and newlines in each given FILE, or standard input if none are
-given or for a FILE of `-'.  Synopsis:
+‘wc’ counts the number of bytes, characters, whitespace-separated words,
+and newlines in each given FILE, or standard input if none are given or
+for a FILE of ‘-’.  Synopsis:
 
-     wc [OPTION]... [FILE]...
+     wc [OPTION]… [FILE]…
 
-   `wc' prints one line of counts for each file, and if the file was
+   ‘wc’ prints one line of counts for each file, and if the file was
 given as an argument, it prints the file name following the counts.  If
-more than one FILE is given, `wc' prints a final line containing the
-cumulative counts, with the file name `total'.  The counts are printed
+more than one FILE is given, ‘wc’ prints a final line containing the
+cumulative counts, with the file name ‘total’.  The counts are printed
 in this order: newlines, words, characters, bytes, maximum line length.
-Each count is printed right-justified in a field with at least one
-space between fields so that the numbers and file names normally line
-up nicely in columns.  The width of the count fields varies depending
-on the inputs, so you should not depend on a particular field width.
+Each count is printed right-justified in a field with at least one space
+between fields so that the numbers and file names normally line up
+nicely in columns.  The width of the count fields varies depending on
+the inputs, so you should not depend on a particular field width.
 However, as a GNU extension, if only one count is printed, it is
 guaranteed to be printed without leading spaces.
 
-   By default, `wc' prints three counts: the newline, words, and byte
+   By default, ‘wc’ prints three counts: the newline, words, and byte
 counts.  Options can specify that only certain counts be printed.
 Options do not undo others previously given, so
 
@@ -3079,93 +3037,91 @@ Options do not undo others previously given, so
 
 prints both the byte counts and the word counts.
 
-   With the `--max-line-length' option, `wc' prints the length of the
+   With the ‘--max-line-length’ option, ‘wc’ prints the length of the
 longest line per file, and if there is more than one file it prints the
 maximum (not the sum) of those lengths.  The line lengths here are
-measured in screen columns, according to the current locale and
-assuming tab positions in every 8th column.
+measured in screen columns, according to the current locale and assuming
+tab positions in every 8th column.
 
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-c'
-`--bytes'
+‘-c’
+‘--bytes’
      Print only the byte counts.
 
-`-m'
-`--chars'
+‘-m’
+‘--chars’
      Print only the character counts.
 
-`-w'
-`--words'
+‘-w’
+‘--words’
      Print only the word counts.
 
-`-l'
-`--lines'
+‘-l’
+‘--lines’
      Print only the newline counts.
 
-`-L'
-`--max-line-length'
+‘-L’
+‘--max-line-length’
      Print only the maximum line lengths.
 
-`--files0-from=FILE'
+‘--files0-from=FILE’
      Disallow processing files named on the command line, and instead
      process those named in file FILE; each name being terminated by a
-     zero byte (ASCII NUL).  This is useful when the list of file names
-     is so long that it may exceed a command line length limitation.
-     In such cases, running `wc' via `xargs' is undesirable because it
-     splits the list into pieces and makes `wc' print a total for each
-     sublist rather than for the entire list.  One way to produce a
-     list of ASCII NUL terminated file names is with GNU `find', using
-     its `-print0' predicate.  If FILE is `-' then the ASCII NUL
-     terminated file names are read from standard input.
-
-     For example, to find the length of the longest line in any `.c' or
-     `.h' file in the current hierarchy, do this:
+     zero byte (ASCII NUL). This is useful when the list of file names
+     is so long that it may exceed a command line length limitation.  In
+     such cases, running ‘wc’ via ‘xargs’ is undesirable because it
+     splits the list into pieces and makes ‘wc’ print a total for each
+     sublist rather than for the entire list.  One way to produce a list
+     of ASCII NUL terminated file names is with GNU ‘find’, using its
+     ‘-print0’ predicate.  If FILE is ‘-’ then the ASCII NUL terminated
+     file names are read from standard input.
+
+     For example, to find the length of the longest line in any ‘.c’ or
+     ‘.h’ file in the current hierarchy, do this:
 
           find . -name '*.[ch]' -print0 |
             wc -L --files0-from=- | tail -n1
 
-
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
 
 
 File: coreutils.info,  Node: sum invocation,  Next: cksum invocation,  Prev: wc invocation,  Up: Summarizing files
 
-6.2 `sum': Print checksum and block counts
+6.2 ‘sum’: Print checksum and block counts
 ==========================================
 
-`sum' computes a 16-bit checksum for each given FILE, or standard input
-if none are given or for a FILE of `-'.  Synopsis:
+‘sum’ computes a 16-bit checksum for each given FILE, or standard input
+if none are given or for a FILE of ‘-’.  Synopsis:
 
-     sum [OPTION]... [FILE]...
+     sum [OPTION]… [FILE]…
 
-   `sum' prints the checksum for each FILE followed by the number of
+   ‘sum’ prints the checksum for each FILE followed by the number of
 blocks in the file (rounded up).  If more than one FILE is given, file
-names are also printed (by default).  (With the `--sysv' option,
+names are also printed (by default).  (With the ‘--sysv’ option,
 corresponding file names are printed when there is at least one file
 argument.)
 
-   By default, GNU `sum' computes checksums using an algorithm
-compatible with BSD `sum' and prints file sizes in units of 1024-byte
+   By default, GNU ‘sum’ computes checksums using an algorithm
+compatible with BSD ‘sum’ and prints file sizes in units of 1024-byte
 blocks.
 
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-r'
+‘-r’
      Use the default (BSD compatible) algorithm.  This option is
-     included for compatibility with the System V `sum'.  Unless `-s'
+     included for compatibility with the System V ‘sum’.  Unless ‘-s’
      was also given, it has no effect.
 
-`-s'
-`--sysv'
+‘-s’
+‘--sysv’
      Compute checksums using an algorithm compatible with System V
-     `sum''s default, and print file sizes in units of 512-byte blocks.
+     ‘sum’’s default, and print file sizes in units of 512-byte blocks.
 
-
-   `sum' is provided for compatibility; the `cksum' program (see next
+   ‘sum’ is provided for compatibility; the ‘cksum’ program (see next
 section) is preferable in new applications.
 
    An exit status of zero indicates success, and a nonzero value
@@ -3174,28 +3130,28 @@ indicates failure.
 
 File: coreutils.info,  Node: cksum invocation,  Next: md5sum invocation,  Prev: sum invocation,  Up: Summarizing files
 
-6.3 `cksum': Print CRC checksum and byte counts
+6.3 ‘cksum’: Print CRC checksum and byte counts
 ===============================================
 
-`cksum' computes a cyclic redundancy check (CRC) checksum for each
-given FILE, or standard input if none are given or for a FILE of `-'.
+‘cksum’ computes a cyclic redundancy check (CRC) checksum for each given
+FILE, or standard input if none are given or for a FILE of ‘-’.
 Synopsis:
 
-     cksum [OPTION]... [FILE]...
+     cksum [OPTION]… [FILE]…
 
-   `cksum' prints the CRC checksum for each file along with the number
+   ‘cksum’ prints the CRC checksum for each file along with the number
 of bytes in the file, and the file name unless no arguments were given.
 
-   `cksum' is typically used to ensure that files transferred by
+   ‘cksum’ is typically used to ensure that files transferred by
 unreliable means (e.g., netnews) have not been corrupted, by comparing
-the `cksum' output for the received files with the `cksum' output for
+the ‘cksum’ output for the received files with the ‘cksum’ output for
 the original files (typically given in the distribution).
 
    The CRC algorithm is specified by the POSIX standard.  It is not
-compatible with the BSD or System V `sum' algorithms (see the previous
+compatible with the BSD or System V ‘sum’ algorithms (see the previous
 section); it is more robust.
 
-   The only options are `--help' and `--version'.  *Note Common
+   The only options are ‘--help’ and ‘--version’.  *Note Common
 options::.
 
    An exit status of zero indicates success, and a nonzero value
@@ -3204,14 +3160,14 @@ indicates failure.
 
 File: coreutils.info,  Node: md5sum invocation,  Next: sha1sum invocation,  Prev: cksum invocation,  Up: Summarizing files
 
-6.4 `md5sum': Print or check MD5 digests
+6.4 ‘md5sum’: Print or check MD5 digests
 ========================================
 
-`md5sum' computes a 128-bit checksum (or "fingerprint" or
+‘md5sum’ computes a 128-bit checksum (or "fingerprint" or
 "message-digest") for each specified FILE.
 
    Note: The MD5 digest is more reliable than a simple CRC (provided by
-the `cksum' command) for detecting accidental file corruption, as the
+the ‘cksum’ command) for detecting accidental file corruption, as the
 chances of accidentally having two files with identical MD5 are
 vanishingly small.  However, it should not be considered secure against
 malicious tampering: although finding a file with a given MD5
@@ -3220,116 +3176,115 @@ modify certain files, including digital certificates, so that they
 appear valid when signed with an MD5 digest.  For more secure hashes,
 consider using SHA-2.  *Note sha2 utilities::.
 
-   If a FILE is specified as `-' or if no files are given `md5sum'
-computes the checksum for the standard input.  `md5sum' can also
+   If a FILE is specified as ‘-’ or if no files are given ‘md5sum’
+computes the checksum for the standard input.  ‘md5sum’ can also
 determine whether a file and checksum are consistent.  Synopsis:
 
-     md5sum [OPTION]... [FILE]...
+     md5sum [OPTION]… [FILE]…
 
-   For each FILE, `md5sum' outputs the MD5 checksum, a flag indicating
+   For each FILE, ‘md5sum’ outputs the MD5 checksum, a flag indicating
 binary or text input mode, and the file name.  If FILE contains a
 backslash or newline, the line is started with a backslash, and each
 problematic character in the file name is escaped with a backslash,
 making the output unambiguous even in the presence of arbitrary file
-names.  If FILE is omitted or specified as `-', standard input is read.
+names.  If FILE is omitted or specified as ‘-’, standard input is read.
 
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-b'
-`--binary'
+‘-b’
+‘--binary’
      Treat each input file as binary, by reading it in binary mode and
-     outputting a `*' flag.  This is the inverse of `--text'.  On
+     outputting a ‘*’ flag.  This is the inverse of ‘--text’.  On
      systems like GNU that do not distinguish between binary and text
      files, this option merely flags each input mode as binary: the MD5
-     checksum is unaffected.  This option is the default on systems
-     like MS-DOS that distinguish between binary and text files, except
-     for reading standard input when standard input is a terminal.
+     checksum is unaffected.  This option is the default on systems like
+     MS-DOS that distinguish between binary and text files, except for
+     reading standard input when standard input is a terminal.
 
-`-c'
-`--check'
+‘-c’
+‘--check’
      Read file names and checksum information (not data) from each FILE
      (or from stdin if no FILE was specified) and report whether the
-     checksums match the contents of the named files.  The input to
-     this mode of `md5sum' is usually the output of a prior,
-     checksum-generating run of `md5sum'.  Each valid line of input
+     checksums match the contents of the named files.  The input to this
+     mode of ‘md5sum’ is usually the output of a prior,
+     checksum-generating run of ‘md5sum’.  Each valid line of input
      consists of an MD5 checksum, a binary/text flag, and then a file
-     name.  Binary mode is indicated with `*', text with ` ' (space).
-     For each such line, `md5sum' reads the named file and computes its
+     name.  Binary mode is indicated with ‘*’, text with ‘ ’ (space).
+     For each such line, ‘md5sum’ reads the named file and computes its
      MD5 checksum.  Then, if the computed message digest does not match
      the one on the line with the file name, the file is noted as having
-     failed the test.  Otherwise, the file passes the test.  By
-     default, for each valid line, one line is written to standard
-     output indicating whether the named file passed the test.  After
-     all checks have been performed, if there were any failures, a
-     warning is issued to standard error.  Use the `--status' option to
-     inhibit that output.  If any listed file cannot be opened or read,
-     if any valid line has an MD5 checksum inconsistent with the
-     associated file, or if no valid line is found, `md5sum' exits with
-     nonzero status.  Otherwise, it exits successfully.
-
-`--quiet'
+     failed the test.  Otherwise, the file passes the test.  By default,
+     for each valid line, one line is written to standard output
+     indicating whether the named file passed the test.  After all
+     checks have been performed, if there were any failures, a warning
+     is issued to standard error.  Use the ‘--status’ option to inhibit
+     that output.  If any listed file cannot be opened or read, if any
+     valid line has an MD5 checksum inconsistent with the associated
+     file, or if no valid line is found, ‘md5sum’ exits with nonzero
+     status.  Otherwise, it exits successfully.
+
+‘--quiet’
      This option is useful only when verifying checksums.  When
-     verifying checksums, don't generate an 'OK' message per
+     verifying checksums, don’t generate an ’OK’ message per
      successfully checked file.  Files that fail the verification are
      reported in the default one-line-per-file format.  If there is any
      checksum mismatch, print a warning summarizing the failures to
      standard error.
 
-`--status'
+‘--status’
      This option is useful only when verifying checksums.  When
-     verifying checksums, don't generate the default one-line-per-file
-     diagnostic and don't output the warning summarizing any failures.
+     verifying checksums, don’t generate the default one-line-per-file
+     diagnostic and don’t output the warning summarizing any failures.
      Failures to open or read a file still evoke individual diagnostics
      to standard error.  If all listed files are readable and are
      consistent with the associated MD5 checksums, exit successfully.
      Otherwise exit with a status code indicating there was a failure.
 
-`--tag'
+‘--tag’
      Output BSD style checksums, which indicate the checksum algorithm
      used.  As a GNU extension, file names with problematic characters
-     are escaped as described above, with the same escaping indicator
-     of `\' at the start of the line, being used.  The `--tag' option
-     implies binary mode, and is disallowed with `--text' mode as
+     are escaped as described above, with the same escaping indicator of
+     ‘\’ at the start of the line, being used.  The ‘--tag’ option
+     implies binary mode, and is disallowed with ‘--text’ mode as
      supporting that would unnecessarily complicate the output format,
      while providing little benefit.
 
-`-t'
-`--text'
+‘-t’
+‘--text’
      Treat each input file as text, by reading it in text mode and
-     outputting a ` ' flag.  This is the inverse of `--binary'.  This
+     outputting a ‘ ’ flag.  This is the inverse of ‘--binary’.  This
      option is the default on systems like GNU that do not distinguish
-     between binary and text files.  On other systems, it is the
-     default for reading standard input when standard input is a
-     terminal.  This mode is never defaulted to if `--tag' is used.
+     between binary and text files.  On other systems, it is the default
+     for reading standard input when standard input is a terminal.  This
+     mode is never defaulted to if ‘--tag’ is used.
 
-`-w'
-`--warn'
+‘-w’
+‘--warn’
      When verifying checksums, warn about improperly formatted MD5
      checksum lines.  This option is useful only if all but a few lines
      in the checked input are valid.
 
-`--strict'
+‘--strict’
      When verifying checksums, if one or more input line is invalid,
      exit nonzero after all warnings have been issued.
 
-
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
 
 
 File: coreutils.info,  Node: sha1sum invocation,  Next: sha2 utilities,  Prev: md5sum invocation,  Up: Summarizing files
 
-6.5 `sha1sum': Print or check SHA-1 digests
+6.5 ‘sha1sum’: Print or check SHA-1 digests
 ===========================================
 
-`sha1sum' computes a 160-bit checksum for each specified FILE.  The
+‘sha1sum’ computes a 160-bit checksum for each specified FILE.  The
 usage and options of this command are precisely the same as for
-`md5sum'.  *Note md5sum invocation::.
+‘md5sum’.  *Note md5sum invocation::.
 
    Note: The SHA-1 digest is more secure than MD5, and no collisions of
-it are known (different files having the same fingerprint).  However,
-it is known that they can be produced with considerable, but not
+it are known (different files having the same fingerprint).  However, it
+is known that they can be produced with considerable, but not
 unreasonable, resources.  For this reason, it is generally considered
 that SHA-1 should be gradually phased out in favor of the more secure
 SHA-2 hash algorithms.  *Note sha2 utilities::.
@@ -3340,11 +3295,11 @@ File: coreutils.info,  Node: sha2 utilities,  Prev: sha1sum invocation,  Up: Sum
 6.6 sha2 utilities: Print or check SHA-2 digests
 ================================================
 
-The commands `sha224sum', `sha256sum', `sha384sum' and `sha512sum'
-compute checksums of various lengths (respectively 224, 256, 384 and
-512 bits), collectively known as the SHA-2 hashes.  The usage and
-options of these commands are precisely the same as for `md5sum'.
-*Note md5sum invocation::.
+The commands ‘sha224sum’, ‘sha256sum’, ‘sha384sum’ and ‘sha512sum’
+compute checksums of various lengths (respectively 224, 256, 384 and 512
+bits), collectively known as the SHA-2 hashes.  The usage and options of
+these commands are precisely the same as for ‘md5sum’.  *Note md5sum
+invocation::.
 
    Note: The SHA384 and SHA512 digests are considerably slower to
 compute, especially on 32-bit computers, than SHA224 or SHA256.
@@ -3369,70 +3324,69 @@ These commands work with (or produce) sorted files.
 
 File: coreutils.info,  Node: sort invocation,  Next: shuf invocation,  Up: Operating on sorted files
 
-7.1 `sort': Sort text files
+7.1 ‘sort’: Sort text files
 ===========================
 
-`sort' sorts, merges, or compares all the lines from the given files,
-or standard input if none are given or for a FILE of `-'.  By default,
-`sort' writes the results to standard output.  Synopsis:
+‘sort’ sorts, merges, or compares all the lines from the given files, or
+standard input if none are given or for a FILE of ‘-’.  By default,
+‘sort’ writes the results to standard output.  Synopsis:
 
-     sort [OPTION]... [FILE]...
+     sort [OPTION]… [FILE]…
 
-   `sort' has three modes of operation: sort (the default), merge, and
+   ‘sort’ has three modes of operation: sort (the default), merge, and
 check for sortedness.  The following options change the operation mode:
 
-`-c'
-`--check'
-`--check=diagnose-first'
+‘-c’
+‘--check’
+‘--check=diagnose-first’
      Check whether the given file is already sorted: if it is not all
      sorted, print a diagnostic containing the first out-of-order line
      and exit with a status of 1.  Otherwise, exit successfully.  At
      most one input file can be given.
 
-`-C'
-`--check=quiet'
-`--check=silent'
+‘-C’
+‘--check=quiet’
+‘--check=silent’
      Exit successfully if the given file is already sorted, and exit
      with status 1 otherwise.  At most one input file can be given.
-     This is like `-c', except it does not print a diagnostic.
+     This is like ‘-c’, except it does not print a diagnostic.
 
-`-m'
-`--merge'
+‘-m’
+‘--merge’
      Merge the given files by sorting them as a group.  Each input file
      must always be individually sorted.  It always works to sort
      instead of merge; merging is provided because it is faster, in the
      case where it works.
 
-
-   A pair of lines is compared as follows: `sort' compares each pair of
+   A pair of lines is compared as follows: ‘sort’ compares each pair of
 fields, in the order specified on the command line, according to the
 associated ordering options, until a difference is found or no fields
-are left.  If no key fields are specified, `sort' uses a default key of
-the entire line.  Finally, as a last resort when all keys compare
-equal, `sort' compares entire lines as if no ordering options other
-than `--reverse' (`-r') were specified.  The `--stable' (`-s') option
-disables this "last-resort comparison" so that lines in which all
-fields compare equal are left in their original relative order.  The
-`--unique' (`-u') option also disables the last-resort comparison.
+are left.  If no key fields are specified, ‘sort’ uses a default key of
+the entire line.  Finally, as a last resort when all keys compare equal,
+‘sort’ compares entire lines as if no ordering options other than
+‘--reverse’ (‘-r’) were specified.  The ‘--stable’ (‘-s’) option
+disables this "last-resort comparison" so that lines in which all fields
+compare equal are left in their original relative order.  The ‘--unique’
+(‘-u’) option also disables the last-resort comparison.
 
    Unless otherwise specified, all comparisons use the character
-collating sequence specified by the `LC_COLLATE' locale.(1)
+collating sequence specified by the ‘LC_COLLATE’ locale.(1)
 
-   GNU `sort' (as specified for all GNU utilities) has no limit on
-input line length or restrictions on bytes allowed within lines.  In
-addition, if the final byte of an input file is not a newline, GNU
-`sort' silently supplies one.  A line's trailing newline is not part of
-the line for comparison purposes.
+   GNU ‘sort’ (as specified for all GNU utilities) has no limit on input
+line length or restrictions on bytes allowed within lines.  In addition,
+if the final byte of an input file is not a newline, GNU ‘sort’ silently
+supplies one.  A line’s trailing newline is not part of the line for
+comparison purposes.
 
    Exit status:
 
      0 if no error occurred
-     1 if invoked with `-c' or `-C' and the input is not sorted
+     1 if invoked with ‘-c’ or ‘-C’ and the input is not sorted
      2 if an error occurred
 
-   If the environment variable `TMPDIR' is set, `sort' uses its value
-as the directory for temporary files instead of `/tmp'.  The
-`--temporary-directory' (`-T') option in turn overrides the environment
+   If the environment variable ‘TMPDIR’ is set, ‘sort’ uses its value as
+the directory for temporary files instead of ‘/tmp’.  The
+‘--temporary-directory’ (‘-T’) option in turn overrides the environment
 variable.
 
    The following options affect the ordering of output lines.  They may
@@ -3440,145 +3394,142 @@ be specified globally or as part of a specific key field.  If no key
 fields are specified, global options apply to comparison of entire
 lines; otherwise the global options are inherited by key fields that do
 not specify any special options of their own.  In pre-POSIX versions of
-`sort', global options affect only later key fields, so portable shell
+‘sort’, global options affect only later key fields, so portable shell
 scripts should specify global options first.
 
-`-b'
-`--ignore-leading-blanks'
+‘-b’
+‘--ignore-leading-blanks’
      Ignore leading blanks when finding sort keys in each line.  By
-     default a blank is a space or a tab, but the `LC_CTYPE' locale can
-     change this.  Note blanks may be ignored by your locale's collating
+     default a blank is a space or a tab, but the ‘LC_CTYPE’ locale can
+     change this.  Note blanks may be ignored by your locale’s collating
      rules, but without this option they will be significant for
-     character positions specified in keys with the `-k' option.
+     character positions specified in keys with the ‘-k’ option.
 
-`-d'
-`--dictionary-order'
+‘-d’
+‘--dictionary-order’
      Sort in "phone directory" order: ignore all characters except
      letters, digits and blanks when sorting.  By default letters and
      digits are those of ASCII and a blank is a space or a tab, but the
-     `LC_CTYPE' locale can change this.
+     ‘LC_CTYPE’ locale can change this.
 
-`-f'
-`--ignore-case'
+‘-f’
+‘--ignore-case’
      Fold lowercase characters into the equivalent uppercase characters
-     when comparing so that, for example, `b' and `B' sort as equal.
-     The `LC_CTYPE' locale determines character types.  When used with
-     `--unique' those lower case equivalent lines are thrown away.
+     when comparing so that, for example, ‘b’ and ‘B’ sort as equal.
+     The ‘LC_CTYPE’ locale determines character types.  When used with
+     ‘--unique’ those lower case equivalent lines are thrown away.
      (There is currently no way to throw away the upper case equivalent
-     instead.  (Any `--reverse' given would only affect the final
+     instead.  (Any ‘--reverse’ given would only affect the final
      result, after the throwing away.))
 
-`-g'
-`--general-numeric-sort'
-`--sort=general-numeric'
+‘-g’
+‘--general-numeric-sort’
+‘--sort=general-numeric’
      Sort numerically, converting a prefix of each line to a long
      double-precision floating point number.  *Note Floating point::.
      Do not report overflow, underflow, or conversion errors.  Use the
      following collating sequence:
 
-        * Lines that do not start with numbers (all considered to be
+        • Lines that do not start with numbers (all considered to be
           equal).
-
-        * NaNs ("Not a Number" values, in IEEE floating point
+        • NaNs (“Not a Number� values, in IEEE floating point
           arithmetic) in a consistent but machine-dependent order.
-
-        * Minus infinity.
-
-        * Finite numbers in ascending numeric order (with -0 and +0
+        • Minus infinity.
+        • Finite numbers in ascending numeric order (with -0 and +0
           equal).
-
-        * Plus infinity.
+        • Plus infinity.
 
      Use this option only if there is no alternative; it is much slower
-     than `--numeric-sort' (`-n') and it can lose information when
+     than ‘--numeric-sort’ (‘-n’) and it can lose information when
      converting to floating point.
 
-`-h'
-`--human-numeric-sort'
-`--sort=human-numeric'
+‘-h’
+‘--human-numeric-sort’
+‘--sort=human-numeric’
      Sort numerically, first by numeric sign (negative, zero, or
-     positive); then by SI suffix (either empty, or `k' or `K', or one
-     of `MGTPEZY', in that order; *note Block size::); and finally by
-     numeric value.  For example, `1023M' sorts before `1G' because `M'
-     (mega) precedes `G' (giga) as an SI suffix.  This option sorts
+     positive); then by SI suffix (either empty, or ‘k’ or ‘K’, or one
+     of ‘MGTPEZY’, in that order; *note Block size::); and finally by
+     numeric value.  For example, ‘1023M’ sorts before ‘1G’ because ‘M’
+     (mega) precedes ‘G’ (giga) as an SI suffix.  This option sorts
      values that are consistently scaled to the nearest suffix,
      regardless of whether suffixes denote powers of 1000 or 1024, and
-     it therefore sorts the output of any single invocation of the
-     `df', `du', or `ls' commands that are invoked with their
-     `--human-readable' or `--si' options.  The syntax for numbers is
-     the same as for the `--numeric-sort' option; the SI suffix must
-     immediately follow the number.
-
-`-i'
-`--ignore-nonprinting'
-     Ignore nonprinting characters.  The `LC_CTYPE' locale determines
+     it therefore sorts the output of any single invocation of the ‘df’,
+     ‘du’, or ‘ls’ commands that are invoked with their
+     ‘--human-readable’ or ‘--si’ options.  The syntax for numbers is
+     the same as for the ‘--numeric-sort’ option; the SI suffix must
+     immediately follow the number.  Note also the ‘numfmt’ command,
+     which can be used to reformat numbers to human format _after_ the
+     sort, thus often allowing sort to operate on more accurate numbers.
+
+‘-i’
+‘--ignore-nonprinting’
+     Ignore nonprinting characters.  The ‘LC_CTYPE’ locale determines
      character types.  This option has no effect if the stronger
-     `--dictionary-order' (`-d') option is also given.
+     ‘--dictionary-order’ (‘-d’) option is also given.
 
-`-M'
-`--month-sort'
-`--sort=month'
+‘-M’
+‘--month-sort’
+‘--sort=month’
      An initial string, consisting of any amount of blanks, followed by
      a month name abbreviation, is folded to UPPER case and compared in
-     the order `JAN' < `FEB' < ... < `DEC'.  Invalid names compare low
-     to valid names.  The `LC_TIME' locale category determines the
-     month spellings.  By default a blank is a space or a tab, but the
-     `LC_CTYPE' locale can change this.
-
-`-n'
-`--numeric-sort'
-`--sort=numeric'
+     the order ‘JAN’ < ‘FEB’ < … < ‘DEC’.  Invalid names compare low to
+     valid names.  The ‘LC_TIME’ locale category determines the month
+     spellings.  By default a blank is a space or a tab, but the
+     ‘LC_CTYPE’ locale can change this.
+
+‘-n’
+‘--numeric-sort’
+‘--sort=numeric’
      Sort numerically.  The number begins each line and consists of
-     optional blanks, an optional `-' sign, and zero or more digits
+     optional blanks, an optional ‘-’ sign, and zero or more digits
      possibly separated by thousands separators, optionally followed by
-     a decimal-point character and zero or more digits.  An empty
-     number is treated as `0'.  The `LC_NUMERIC' locale specifies the
+     a decimal-point character and zero or more digits.  An empty number
+     is treated as ‘0’.  The ‘LC_NUMERIC’ locale specifies the
      decimal-point character and thousands separator.  By default a
-     blank is a space or a tab, but the `LC_CTYPE' locale can change
+     blank is a space or a tab, but the ‘LC_CTYPE’ locale can change
      this.
 
      Comparison is exact; there is no rounding error.
 
-     Neither a leading `+' nor exponential notation is recognized.  To
-     compare such strings numerically, use the `--general-numeric-sort'
-     (`-g') option.
+     Neither a leading ‘+’ nor exponential notation is recognized.  To
+     compare such strings numerically, use the ‘--general-numeric-sort’
+     (‘-g’) option.
 
-`-V'
-`--version-sort'
+‘-V’
+‘--version-sort’
      Sort by version name and number.  It behaves like a standard sort,
      except that each sequence of decimal digits is treated numerically
      as an index/version number.  (*Note Details about version sort::.)
 
-`-r'
-`--reverse'
+‘-r’
+‘--reverse’
      Reverse the result of comparison, so that lines with greater key
      values appear earlier in the output instead of later.
 
-`-R'
-`--random-sort'
-`--sort=random'
+‘-R’
+‘--random-sort’
+‘--sort=random’
      Sort by hashing the input keys and then sorting the hash values.
      Choose the hash function at random, ensuring that it is free of
-     collisions so that differing keys have differing hash values.
-     This is like a random permutation of the inputs (*note shuf
+     collisions so that differing keys have differing hash values.  This
+     is like a random permutation of the inputs (*note shuf
      invocation::), except that keys with the same value sort together.
 
      If multiple random sort fields are specified, the same random hash
      function is used for all fields.  To use different random hash
-     functions for different fields, you can invoke `sort' more than
+     functions for different fields, you can invoke ‘sort’ more than
      once.
 
-     The choice of hash function is affected by the `--random-source'
+     The choice of hash function is affected by the ‘--random-source’
      option.
 
-
    Other options are:
 
-`--compress-program=PROG'
+‘--compress-program=PROG’
      Compress any temporary files with the program PROG.
 
      With no arguments, PROG must compress standard input to standard
-     output, and when given the `-d' option it must decompress standard
+     output, and when given the ‘-d’ option it must decompress standard
      input to standard output.
 
      Terminate with an error if PROG exits with nonzero status.
@@ -3586,50 +3537,50 @@ scripts should specify global options first.
      White space and the backslash character should not appear in PROG;
      they are reserved for future use.
 
-`--files0-from=FILE'
+‘--files0-from=FILE’
      Disallow processing files named on the command line, and instead
      process those named in file FILE; each name being terminated by a
-     zero byte (ASCII NUL).  This is useful when the list of file names
-     is so long that it may exceed a command line length limitation.
-     In such cases, running `sort' via `xargs' is undesirable because
-     it splits the list into pieces and makes `sort' print sorted
-     output for each sublist rather than for the entire list.  One way
-     to produce a list of ASCII NUL terminated file names is with GNU
-     `find', using its `-print0' predicate.  If FILE is `-' then the
+     zero byte (ASCII NUL). This is useful when the list of file names
+     is so long that it may exceed a command line length limitation.  In
+     such cases, running ‘sort’ via ‘xargs’ is undesirable because it
+     splits the list into pieces and makes ‘sort’ print sorted output
+     for each sublist rather than for the entire list.  One way to
+     produce a list of ASCII NUL terminated file names is with GNU
+     ‘find’, using its ‘-print0’ predicate.  If FILE is ‘-’ then the
      ASCII NUL terminated file names are read from standard input.
 
-`-k POS1[,POS2]'
-`--key=POS1[,POS2]'
+‘-k POS1[,POS2]’
+‘--key=POS1[,POS2]’
      Specify a sort field that consists of the part of the line between
      POS1 and POS2 (or the end of the line, if POS2 is omitted),
      _inclusive_.
 
-     Each POS has the form `F[.C][OPTS]', where F is the number of the
+     Each POS has the form ‘F[.C][OPTS]’, where F is the number of the
      field to use, and C is the number of the first character from the
      beginning of the field.  Fields and character positions are
      numbered starting with 1; a character position of zero in POS2
-     indicates the field's last character.  If `.C' is omitted from
+     indicates the field’s last character.  If ‘.C’ is omitted from
      POS1, it defaults to 1 (the beginning of the field); if omitted
      from POS2, it defaults to 0 (the end of the field).  OPTS are
      ordering options, allowing individual keys to be sorted according
      to different rules; see below for details.  Keys can span multiple
      fields.
 
-     Example:  To sort on the second field, use `--key=2,2' (`-k 2,2').
+     Example: To sort on the second field, use ‘--key=2,2’ (‘-k 2,2’).
      See below for more notes on keys and more examples.  See also the
-     `--debug' option to help determine the part of the line being used
+     ‘--debug’ option to help determine the part of the line being used
      in the sort.
 
-`--debug'
+‘--debug’
      Highlight the portion of each line used for sorting.  Also issue
      warnings about questionable usage to stderr.
 
-`--batch-size=NMERGE'
+‘--batch-size=NMERGE’
      Merge at most NMERGE inputs at once.
 
-     When `sort' has to merge more than NMERGE inputs, it merges them
-     in groups of NMERGE, saving the result in a temporary file, which
-     is then used as an input in a subsequent merge.
+     When ‘sort’ has to merge more than NMERGE inputs, it merges them in
+     groups of NMERGE, saving the result in a temporary file, which is
+     then used as an input in a subsequent merge.
 
      A large value of NMERGE may improve merge performance and decrease
      temporary storage utilization at the expense of increased memory
@@ -3642,166 +3593,167 @@ scripts should specify global options first.
      in the future.
 
      The value of NMERGE may be bounded by a resource limit for open
-     file descriptors.  The commands `ulimit -n' or `getconf OPEN_MAX'
+     file descriptors.  The commands ‘ulimit -n’ or ‘getconf OPEN_MAX’
      may display limits for your systems; these limits may be modified
      further if your program already has some files open, or if the
      operating system has other limits on the number of open files.  If
-     the value of NMERGE exceeds the resource limit, `sort' silently
+     the value of NMERGE exceeds the resource limit, ‘sort’ silently
      uses a smaller value.
 
-`-o OUTPUT-FILE'
-`--output=OUTPUT-FILE'
+‘-o OUTPUT-FILE’
+‘--output=OUTPUT-FILE’
      Write output to OUTPUT-FILE instead of standard output.  Normally,
-     `sort' reads all input before opening OUTPUT-FILE, so you can
-     safely sort a file in place by using commands like `sort -o F F'
-     and `cat F | sort -o F'.  However, `sort' with `--merge' (`-m')
-     can open the output file before reading all input, so a command
-     like `cat F | sort -m -o F - G' is not safe as `sort' might start
-     writing `F' before `cat' is done reading it.
-
-     On newer systems, `-o' cannot appear after an input file if
-     `POSIXLY_CORRECT' is set, e.g., `sort F -o F'.  Portable scripts
-     should specify `-o OUTPUT-FILE' before any input files.
-
-`--random-source=FILE'
+     ‘sort’ reads all input before opening OUTPUT-FILE, so you can
+     safely sort a file in place by using commands like ‘sort -o F F’
+     and ‘cat F | sort -o F’.  However, ‘sort’ with ‘--merge’ (‘-m’) can
+     open the output file before reading all input, so a command like
+     ‘cat F | sort -m -o F - G’ is not safe as ‘sort’ might start
+     writing ‘F’ before ‘cat’ is done reading it.
+
+     On newer systems, ‘-o’ cannot appear after an input file if
+     ‘POSIXLY_CORRECT’ is set, e.g., ‘sort F -o F’.  Portable scripts
+     should specify ‘-o OUTPUT-FILE’ before any input files.
+
+‘--random-source=FILE’
      Use FILE as a source of random data used to determine which random
-     hash function to use with the `-R' option.  *Note Random sources::.
+     hash function to use with the ‘-R’ option.  *Note Random sources::.
 
-`-s'
-`--stable'
-     Make `sort' stable by disabling its last-resort comparison.  This
+‘-s’
+‘--stable’
+
+     Make ‘sort’ stable by disabling its last-resort comparison.  This
      option has no effect if no fields or global ordering options other
-     than `--reverse' (`-r') are specified.
+     than ‘--reverse’ (‘-r’) are specified.
 
-`-S SIZE'
-`--buffer-size=SIZE'
+‘-S SIZE’
+‘--buffer-size=SIZE’
      Use a main-memory sort buffer of the given SIZE.  By default, SIZE
-     is in units of 1024 bytes.  Appending `%' causes SIZE to be
-     interpreted as a percentage of physical memory.  Appending `K'
-     multiplies SIZE by 1024 (the default), `M' by 1,048,576, `G' by
-     1,073,741,824, and so on for `T', `P', `E', `Z', and `Y'.
-     Appending `b' causes SIZE to be interpreted as a byte count, with
+     is in units of 1024 bytes.  Appending ‘%’ causes SIZE to be
+     interpreted as a percentage of physical memory.  Appending ‘K’
+     multiplies SIZE by 1024 (the default), ‘M’ by 1,048,576, ‘G’ by
+     1,073,741,824, and so on for ‘T’, ‘P’, ‘E’, ‘Z’, and ‘Y’.
+     Appending ‘b’ causes SIZE to be interpreted as a byte count, with
      no multiplication.
 
-     This option can improve the performance of `sort' by causing it to
+     This option can improve the performance of ‘sort’ by causing it to
      start with a larger or smaller sort buffer than the default.
      However, this option affects only the initial buffer size.  The
-     buffer grows beyond SIZE if `sort' encounters input lines larger
+     buffer grows beyond SIZE if ‘sort’ encounters input lines larger
      than SIZE.
 
-`-t SEPARATOR'
-`--field-separator=SEPARATOR'
+‘-t SEPARATOR’
+‘--field-separator=SEPARATOR’
      Use character SEPARATOR as the field separator when finding the
      sort keys in each line.  By default, fields are separated by the
      empty string between a non-blank character and a blank character.
-     By default a blank is a space or a tab, but the `LC_CTYPE' locale
+     By default a blank is a space or a tab, but the ‘LC_CTYPE’ locale
      can change this.
 
-     That is, given the input line ` foo bar', `sort' breaks it into
-     fields ` foo' and ` bar'.  The field separator is not considered
-     to be part of either the field preceding or the field following,
-     so with `sort -t " "' the same input line has three fields: an
-     empty field, `foo', and `bar'.  However, fields that extend to the
-     end of the line, as `-k 2', or fields consisting of a range, as
-     `-k 2,3', retain the field separators present between the
-     endpoints of the range.
+     That is, given the input line ‘ foo bar’, ‘sort’ breaks it into
+     fields ‘ foo’ and ‘ bar’.  The field separator is not considered to
+     be part of either the field preceding or the field following, so
+     with ‘sort -t " "’ the same input line has three fields: an empty
+     field, ‘foo’, and ‘bar’.  However, fields that extend to the end of
+     the line, as ‘-k 2’, or fields consisting of a range, as ‘-k 2,3’,
+     retain the field separators present between the endpoints of the
+     range.
 
      To specify ASCII NUL as the field separator, use the two-character
-     string `\0', e.g., `sort -t '\0''.
+     string ‘\0’, e.g., ‘sort -t '\0'’.
 
-`-T TEMPDIR'
-`--temporary-directory=TEMPDIR'
+‘-T TEMPDIR’
+‘--temporary-directory=TEMPDIR’
      Use directory TEMPDIR to store temporary files, overriding the
-     `TMPDIR' environment variable.  If this option is given more than
+     ‘TMPDIR’ environment variable.  If this option is given more than
      once, temporary files are stored in all the directories given.  If
      you have a large sort or merge that is I/O-bound, you can often
      improve performance by using this option to specify directories on
      different disks and controllers.
 
-`--parallel=N'
-     Set the number of sorts run in parallel to N. By default, N is set
+‘--parallel=N’
+     Set the number of sorts run in parallel to N.  By default, N is set
      to the number of available processors, but limited to 8, as there
-     are diminishing performance gains after that.  Note also that
-     using N threads increases the memory usage by a factor of log N.
-     Also see *note nproc invocation::.
+     are diminishing performance gains after that.  Note also that using
+     N threads increases the memory usage by a factor of log N.  Also
+     see *note nproc invocation::.
+
+‘-u’
+‘--unique’
 
-`-u'
-`--unique'
      Normally, output only the first of a sequence of lines that compare
-     equal.  For the `--check' (`-c' or `-C') option, check that no
-     pair of consecutive lines compares equal.
+     equal.  For the ‘--check’ (‘-c’ or ‘-C’) option, check that no pair
+     of consecutive lines compares equal.
 
      This option also disables the default last-resort comparison.
 
-     The commands `sort -u' and `sort | uniq' are equivalent, but this
-     equivalence does not extend to arbitrary `sort' options.  For
-     example, `sort -n -u' inspects only the value of the initial
-     numeric string when checking for uniqueness, whereas `sort -n |
-     uniq' inspects the entire line.  *Note uniq invocation::.
+     The commands ‘sort -u’ and ‘sort | uniq’ are equivalent, but this
+     equivalence does not extend to arbitrary ‘sort’ options.  For
+     example, ‘sort -n -u’ inspects only the value of the initial
+     numeric string when checking for uniqueness, whereas ‘sort -n |
+     uniq’ inspects the entire line.  *Note uniq invocation::.
 
-`-z'
-`--zero-terminated'
+‘-z’
+‘--zero-terminated’
      Delimit items with a zero byte rather than a newline (ASCII LF).
      I.e., treat input as items separated by ASCII NUL and terminate
-     output items with ASCII NUL.  This option can be useful in
-     conjunction with `perl -0' or `find -print0' and `xargs -0' which
+     output items with ASCII NUL. This option can be useful in
+     conjunction with ‘perl -0’ or ‘find -print0’ and ‘xargs -0’ which
      do the same in order to reliably handle arbitrary file names (even
      those containing blanks or other special characters).
 
-
-   Historical (BSD and System V) implementations of `sort' have
-differed in their interpretation of some options, particularly `-b',
-`-f', and `-n'.  GNU sort follows the POSIX behavior, which is usually
-(but not always!) like the System V behavior.  According to POSIX, `-n'
-no longer implies `-b'.  For consistency, `-M' has been changed in the
-same way.  This may affect the meaning of character positions in field
+   Historical (BSD and System V) implementations of ‘sort’ have differed
+in their interpretation of some options, particularly ‘-b’, ‘-f’, and
+‘-n’.  GNU sort follows the POSIX behavior, which is usually (but not
+always!)  like the System V behavior.  According to POSIX, ‘-n’ no
+longer implies ‘-b’.  For consistency, ‘-M’ has been changed in the same
+way.  This may affect the meaning of character positions in field
 specifications in obscure cases.  The only fix is to add an explicit
-`-b'.
+‘-b’.
 
-   A position in a sort field specified with `-k' may have any of the
-option letters `MbdfghinRrV' appended to it, in which case no global
-ordering options are inherited by that particular field.  The `-b'
+   A position in a sort field specified with ‘-k’ may have any of the
+option letters ‘MbdfghinRrV’ appended to it, in which case no global
+ordering options are inherited by that particular field.  The ‘-b’
 option may be independently attached to either or both of the start and
 end positions of a field specification, and if it is inherited from the
 global options it will be attached to both.  If input lines can contain
-leading or adjacent blanks and `-t' is not used, then `-k' is typically
-combined with `-b' or an option that implicitly ignores leading blanks
-(`Mghn') as otherwise the varying numbers of leading blanks in fields
+leading or adjacent blanks and ‘-t’ is not used, then ‘-k’ is typically
+combined with ‘-b’ or an option that implicitly ignores leading blanks
+(‘Mghn’) as otherwise the varying numbers of leading blanks in fields
 can cause confusing results.
 
    If the start position in a sort field specifier falls after the end
-of the line or after the end field, the field is empty.  If the `-b'
-option was specified, the `.C' part of a field specification is counted
+of the line or after the end field, the field is empty.  If the ‘-b’
+option was specified, the ‘.C’ part of a field specification is counted
 from the first nonblank character of the field.
 
-   On older systems, `sort' supports an obsolete origin-zero syntax
-`+POS1 [-POS2]' for specifying sort keys.  The obsolete sequence `sort
-+A.X -B.Y' is equivalent to `sort -k A+1.X+1,B' if Y is `0' or absent,
-otherwise it is equivalent to `sort -k A+1.X+1,B+1.Y'.
+   On older systems, ‘sort’ supports an obsolete origin-zero syntax
+‘+POS1 [-POS2]’ for specifying sort keys.  The obsolete sequence ‘sort
++A.X -B.Y’ is equivalent to ‘sort -k A+1.X+1,B’ if Y is ‘0’ or absent,
+otherwise it is equivalent to ‘sort -k A+1.X+1,B+1.Y’.
 
    This obsolete behavior can be enabled or disabled with the
-`_POSIX2_VERSION' environment variable (*note Standards conformance::);
-it can also be enabled when `POSIXLY_CORRECT' is not set by using the
-obsolete syntax with `-POS2' present.
+‘_POSIX2_VERSION’ environment variable (*note Standards conformance::);
+it can also be enabled when ‘POSIXLY_CORRECT’ is not set by using the
+obsolete syntax with ‘-POS2’ present.
 
    Scripts intended for use on standard hosts should avoid obsolete
-syntax and should use `-k' instead.  For example, avoid `sort +2',
-since it might be interpreted as either `sort ./+2' or `sort -k 3'.  If
-your script must also run on hosts that support only the obsolete
-syntax, it can use a test like `if sort -k 1 </dev/null >/dev/null
-2>&1; then ...' to decide which syntax to use.
+syntax and should use ‘-k’ instead.  For example, avoid ‘sort +2’, since
+it might be interpreted as either ‘sort ./+2’ or ‘sort -k 3’.  If your
+script must also run on hosts that support only the obsolete syntax, it
+can use a test like ‘if sort -k 1 </dev/null >/dev/null 2>&1; then …’ to
+decide which syntax to use.
 
    Here are some examples to illustrate various combinations of options.
 
-   * Sort in descending (reverse) numeric order.
+   • Sort in descending (reverse) numeric order.
 
           sort -n -r
 
-   * Run no more than 4 sorts concurrently, using a buffer size of 10M.
+   • Run no more than 4 sorts concurrently, using a buffer size of 10M.
 
           sort --parallel=4 -S 10M
 
-   * Sort alphabetically, omitting the first and second fields and the
+   • Sort alphabetically, omitting the first and second fields and the
      blanks at the start of the third field.  This uses a single key
      composed of the characters beginning at the start of the first
      nonblank character in field three and extending to the end of each
@@ -3809,46 +3761,46 @@ syntax, it can use a test like `if sort -k 1 </dev/null >/dev/null
 
           sort -k 3b
 
-   * Sort numerically on the second field and resolve ties by sorting
+   • Sort numerically on the second field and resolve ties by sorting
      alphabetically on the third and fourth characters of field five.
-     Use `:' as the field delimiter.
+     Use ‘:’ as the field delimiter.
 
           sort -t : -k 2,2n -k 5.3,5.4
 
-     Note that if you had written `-k 2n' instead of `-k 2,2n' `sort'
+     Note that if you had written ‘-k 2n’ instead of ‘-k 2,2n’ ‘sort’
      would have used all characters beginning in the second field and
-     extending to the end of the line as the primary _numeric_ key.
-     For the large majority of applications, treating keys spanning
-     more than one field as numeric will not do what you expect.
+     extending to the end of the line as the primary _numeric_ key.  For
+     the large majority of applications, treating keys spanning more
+     than one field as numeric will not do what you expect.
 
-     Also note that the `n' modifier was applied to the field-end
+     Also note that the ‘n’ modifier was applied to the field-end
      specifier for the first key.  It would have been equivalent to
-     specify `-k 2n,2' or `-k 2n,2n'.  All modifiers except `b' apply
-     to the associated _field_, regardless of whether the modifier
+     specify ‘-k 2n,2’ or ‘-k 2n,2n’.  All modifiers except ‘b’ apply to
+     the associated _field_, regardless of whether the modifier
      character is attached to the field-start and/or the field-end part
      of the key specifier.
 
-   * Sort the password file on the fifth field and ignore any leading
+   • Sort the password file on the fifth field and ignore any leading
      blanks.  Sort lines with equal values in field five on the numeric
-     user ID in field three.  Fields are separated by `:'.
+     user ID in field three.  Fields are separated by ‘:’.
 
           sort -t : -k 5b,5 -k 3,3n /etc/passwd
           sort -t : -n -k 5b,5 -k 3,3 /etc/passwd
           sort -t : -b -k 5,5 -k 3,3n /etc/passwd
 
      These three commands have equivalent effect.  The first specifies
-     that the first key's start position ignores leading blanks and the
+     that the first key’s start position ignores leading blanks and the
      second key is sorted numerically.  The other two commands rely on
      global options being inherited by sort keys that lack modifiers.
-     The inheritance works in this case because `-k 5b,5b' and `-k
-     5b,5' are equivalent, as the location of a field-end lacking a `.C'
+     The inheritance works in this case because ‘-k 5b,5b’ and ‘-k 5b,5’
+     are equivalent, as the location of a field-end lacking a ‘.C’
      character position is not affected by whether initial blanks are
      skipped.
 
-   * Sort a set of log files, primarily by IPv4 address and secondarily
-     by time stamp.  If two lines' primary and secondary keys are
-     identical, output the lines in the same order that they were
-     input.  The log files contain lines that look like this:
+   • Sort a set of log files, primarily by IPv4 address and secondarily
+     by time stamp.  If two lines’ primary and secondary keys are
+     identical, output the lines in the same order that they were input.
+     The log files contain lines that look like this:
 
           4.150.156.3 - - [01/Apr/2004:06:31:51 +0000] message 1
           211.24.3.231 - - [24/Apr/2004:20:17:39 +0000] message 2
@@ -3860,111 +3812,116 @@ syntax, it can use a test like `if sort -k 1 </dev/null >/dev/null
           sort -s -t ' ' -k 4.9n -k 4.5M -k 4.2n -k 4.14,4.21 file*.log |
           sort -s -t '.' -k 1,1n -k 2,2n -k 3,3n -k 4,4n
 
-     This example cannot be done with a single `sort' invocation, since
-     IPv4 address components are separated by `.' while dates come just
+     This example cannot be done with a single ‘sort’ invocation, since
+     IPv4 address components are separated by ‘.’ while dates come just
      after a space.  So it is broken down into two invocations of
-     `sort': the first sorts by time stamp and the second by IPv4
+     ‘sort’: the first sorts by time stamp and the second by IPv4
      address.  The time stamp is sorted by year, then month, then day,
-     and finally by hour-minute-second field, using `-k' to isolate each
-     field.  Except for hour-minute-second there's no need to specify
-     the end of each key field, since the `n' and `M' modifiers sort
+     and finally by hour-minute-second field, using ‘-k’ to isolate each
+     field.  Except for hour-minute-second there’s no need to specify
+     the end of each key field, since the ‘n’ and ‘M’ modifiers sort
      based on leading prefixes that cannot cross field boundaries.  The
      IPv4 addresses are sorted lexicographically.  The second sort uses
-     `-s' so that ties in the primary key are broken by the secondary
-     key; the first sort uses `-s' so that the combination of the two
+     ‘-s’ so that ties in the primary key are broken by the secondary
+     key; the first sort uses ‘-s’ so that the combination of the two
      sorts is stable.
 
-   * Generate a tags file in case-insensitive sorted order.
+   • Generate a tags file in case-insensitive sorted order.
 
           find src -type f -print0 | sort -z -f | xargs -0 etags --append
 
-     The use of `-print0', `-z', and `-0' in this case means that file
+     The use of ‘-print0’, ‘-z’, and ‘-0’ in this case means that file
      names that contain blanks or other special characters are not
      broken up by the sort operation.
 
-   * Use the common DSU, Decorate Sort Undecorate idiom to sort lines
+   • Use the common DSU, Decorate Sort Undecorate idiom to sort lines
      according to their length.
 
           awk '{print length, $0}' /etc/passwd | sort -n | cut -f2- -d' '
 
-     In general this technique can be used to sort data that the `sort'
+     In general this technique can be used to sort data that the ‘sort’
      command does not support, or is inefficient at, sorting directly.
 
-   * Shuffle a list of directories, but preserve the order of files
+   • Shuffle a list of directories, but preserve the order of files
      within each directory.  For instance, one could use this to
      generate a music playlist in which albums are shuffled but the
      songs of each album are played in order.
 
           ls */* | sort -t / -k 1,1R -k 2,2
 
-
    ---------- Footnotes ----------
 
-   (1) If you use a non-POSIX locale (e.g., by setting `LC_ALL' to
-`en_US'), then `sort' may produce output that is sorted differently
-than you're accustomed to.  In that case, set the `LC_ALL' environment
-variable to `C'.  Note that setting only `LC_COLLATE' has two problems.
-First, it is ineffective if `LC_ALL' is also set.  Second, it has
-undefined behavior if `LC_CTYPE' (or `LANG', if `LC_CTYPE' is unset) is
+   (1) If you use a non-POSIX locale (e.g., by setting ‘LC_ALL’ to
+‘en_US’), then ‘sort’ may produce output that is sorted differently than
+you’re accustomed to.  In that case, set the ‘LC_ALL’ environment
+variable to ‘C’.  Note that setting only ‘LC_COLLATE’ has two problems.
+First, it is ineffective if ‘LC_ALL’ is also set.  Second, it has
+undefined behavior if ‘LC_CTYPE’ (or ‘LANG’, if ‘LC_CTYPE’ is unset) is
 set to an incompatible value.  For example, you get undefined behavior
-if `LC_CTYPE' is `ja_JP.PCK' but `LC_COLLATE' is `en_US.UTF-8'.
+if ‘LC_CTYPE’ is ‘ja_JP.PCK’ but ‘LC_COLLATE’ is ‘en_US.UTF-8’.
 
 
 File: coreutils.info,  Node: shuf invocation,  Next: uniq invocation,  Prev: sort invocation,  Up: Operating on sorted files
 
-7.2 `shuf': Shuffling text
+7.2 ‘shuf’: Shuffling text
 ==========================
 
-`shuf' shuffles its input by outputting a random permutation of its
+‘shuf’ shuffles its input by outputting a random permutation of its
 input lines.  Each output permutation is equally likely.  Synopses:
 
-     shuf [OPTION]... [FILE]
-     shuf -e [OPTION]... [ARG]...
-     shuf -i LO-HI [OPTION]...
+     shuf [OPTION]… [FILE]
+     shuf -e [OPTION]… [ARG]…
+     shuf -i LO-HI [OPTION]…
 
-   `shuf' has three modes of operation that affect where it obtains its
+   ‘shuf’ has three modes of operation that affect where it obtains its
 input lines.  By default, it reads lines from standard input.  The
 following options change the operation mode:
 
-`-e'
-`--echo'
+‘-e’
+‘--echo’
      Treat each command-line operand as an input line.
 
-`-i LO-HI'
-`--input-range=LO-HI'
+‘-i LO-HI’
+‘--input-range=LO-HI’
      Act as if input came from a file containing the range of unsigned
-     decimal integers LO...HI, one per line.
+     decimal integers LO…HI, one per line.
 
-
-   `shuf''s other options can affect its behavior in all operation
+   ‘shuf’’s other options can affect its behavior in all operation
 modes:
 
-`-n LINES'
-`--head-count=COUNT'
+‘-n LINES’
+‘--head-count=COUNT’
      Output at most COUNT lines.  By default, all input lines are
      output.
 
-`-o OUTPUT-FILE'
-`--output=OUTPUT-FILE'
-     Write output to OUTPUT-FILE instead of standard output.  `shuf'
+‘-o OUTPUT-FILE’
+‘--output=OUTPUT-FILE’
+     Write output to OUTPUT-FILE instead of standard output.  ‘shuf’
      reads all input before opening OUTPUT-FILE, so you can safely
-     shuffle a file in place by using commands like `shuf -o F <F' and
-     `cat F | shuf -o F'.
+     shuffle a file in place by using commands like ‘shuf -o F <F’ and
+     ‘cat F | shuf -o F’.
 
-`--random-source=FILE'
+‘--random-source=FILE’
      Use FILE as a source of random data used to determine which
      permutation to generate.  *Note Random sources::.
 
-`-z'
-`--zero-terminated'
+‘-r’
+‘--repeat’
+     Repeat output values, that is, select with replacement.  With this
+     option the output is not a permutation of the input; instead, each
+     output line is randomly chosen from all the inputs.  This option is
+     typically combined with ‘--head-count’; if ‘--head-count’ is not
+     given, ‘shuf’ repeats indefinitely.
+
+‘-z’
+‘--zero-terminated’
      Delimit items with a zero byte rather than a newline (ASCII LF).
      I.e., treat input as items separated by ASCII NUL and terminate
-     output items with ASCII NUL.  This option can be useful in
-     conjunction with `perl -0' or `find -print0' and `xargs -0' which
+     output items with ASCII NUL. This option can be useful in
+     conjunction with ‘perl -0’ or ‘find -print0’ and ‘xargs -0’ which
      do the same in order to reliably handle arbitrary file names (even
      those containing blanks or other special characters).
 
-
    For example:
 
      shuf <<EOF
@@ -3992,17 +3949,25 @@ might output:
      spades
      hearts
 
-and the command `shuf -i 1-4' might output:
+and the command ‘shuf -i 1-4’ might output:
 
      4
      2
      1
      3
 
-These examples all have four input lines, so `shuf' might produce any
-of the twenty-four possible permutations of the input.  In general, if
-there are N input lines, there are N! (i.e., N factorial, or N * (N -
-1) * ... * 1) possible output permutations.
+The above examples all have four input lines, so ‘shuf’ might produce
+any of the twenty-four possible permutations of the input.  In general,
+if there are N input lines, there are N!  (i.e., N factorial, or N * (N
+- 1) * … * 1) possible output permutations.
+
+To output 50 random numbers each in the range 0 through 9, use:
+
+     shuf -r -n 50 -i 0-9
+
+To simulate 100 coin flips, use:
+
+     shuf -r -n 100 -e Head Tail
 
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
@@ -4010,215 +3975,242 @@ indicates failure.
 
 File: coreutils.info,  Node: uniq invocation,  Next: comm invocation,  Prev: shuf invocation,  Up: Operating on sorted files
 
-7.3 `uniq': Uniquify files
+7.3 ‘uniq’: Uniquify files
 ==========================
 
-`uniq' writes the unique lines in the given `input', or standard input
-if nothing is given or for an INPUT name of `-'.  Synopsis:
+‘uniq’ writes the unique lines in the given ‘input’, or standard input
+if nothing is given or for an INPUT name of ‘-’.  Synopsis:
 
-     uniq [OPTION]... [INPUT [OUTPUT]]
+     uniq [OPTION]… [INPUT [OUTPUT]]
 
-   By default, `uniq' prints its input lines, except that it discards
+   By default, ‘uniq’ prints its input lines, except that it discards
 all but the first of adjacent repeated lines, so that no output lines
 are repeated.  Optionally, it can instead discard lines that are not
 repeated, or all repeated lines.
 
    The input need not be sorted, but repeated input lines are detected
 only if they are adjacent.  If you want to discard non-adjacent
-duplicate lines, perhaps you want to use `sort -u'.  *Note sort
+duplicate lines, perhaps you want to use ‘sort -u’.  *Note sort
 invocation::.
 
-   Comparisons honor the rules specified by the `LC_COLLATE' locale
+   Comparisons honor the rules specified by the ‘LC_COLLATE’ locale
 category.
 
-   If no OUTPUT file is specified, `uniq' writes to standard output.
+   If no OUTPUT file is specified, ‘uniq’ writes to standard output.
 
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-f N'
-`--skip-fields=N'
+‘-f N’
+‘--skip-fields=N’
      Skip N fields on each line before checking for uniqueness.  Use a
      null string for comparison if a line has fewer than N fields.
      Fields are sequences of non-space non-tab characters that are
      separated from each other by at least one space or tab.
 
-     For compatibility `uniq' supports an obsolete option syntax `-N'.
-     New scripts should use `-f N' instead.
+     For compatibility ‘uniq’ supports an obsolete option syntax ‘-N’.
+     New scripts should use ‘-f N’ instead.
 
-`-s N'
-`--skip-chars=N'
+‘-s N’
+‘--skip-chars=N’
      Skip N characters before checking for uniqueness.  Use a null
      string for comparison if a line has fewer than N characters.  If
      you use both the field and character skipping options, fields are
      skipped over first.
 
-     On older systems, `uniq' supports an obsolete option syntax `+N'.
+     On older systems, ‘uniq’ supports an obsolete option syntax ‘+N’.
      This obsolete behavior can be enabled or disabled with the
-     `_POSIX2_VERSION' environment variable (*note Standards
+     ‘_POSIX2_VERSION’ environment variable (*note Standards
      conformance::), but portable scripts should avoid commands whose
-     behavior depends on this variable.  For example, use `uniq ./+10'
-     or `uniq -s 10' rather than the ambiguous `uniq +10'.
+     behavior depends on this variable.  For example, use ‘uniq ./+10’
+     or ‘uniq -s 10’ rather than the ambiguous ‘uniq +10’.
 
-`-c'
-`--count'
+‘-c’
+‘--count’
      Print the number of times each line occurred along with the line.
 
-`-i'
-`--ignore-case'
+‘-i’
+‘--ignore-case’
      Ignore differences in case when comparing lines.
 
-`-d'
-`--repeated'
+‘-d’
+‘--repeated’
      Discard lines that are not repeated.  When used by itself, this
-     option causes `uniq' to print the first copy of each repeated line,
+     option causes ‘uniq’ to print the first copy of each repeated line,
      and nothing else.
 
-`-D'
-`--all-repeated[=DELIMIT-METHOD]'
+‘-D’
+‘--all-repeated[=DELIMIT-METHOD]’
      Do not discard the second and subsequent repeated input lines, but
      discard lines that are not repeated.  This option is useful mainly
      in conjunction with other options e.g., to ignore case or to
-     compare only selected fields.  The optional DELIMIT-METHOD tells
-     how to delimit groups of repeated lines, and must be one of the
-     following:
+     compare only selected fields.  The optional DELIMIT-METHOD
+     specifies how to delimit groups of repeated lines, and must be one
+     of the following:
 
-    `none'
+     ‘none’
           Do not delimit groups of repeated lines.  This is equivalent
-          to `--all-repeated' (`-D').
+          to ‘--all-repeated’ (‘-D’).
 
-    `prepend'
+     ‘prepend’
           Output a newline before each group of repeated lines.  With
-          `--zero-terminated' (`-z'), use a zero byte (ASCII NUL)
-          instead of a newline.
+          ‘--zero-terminated’ (‘-z’), use a zero byte (ASCII NUL)
+          instead of a newline as the delimiter.
+
+     ‘separate’
+          Separate groups of repeated lines with a single newline.  This
+          is the same as using ‘prepend’, except that no delimiter is
+          inserted before the first group, and hence may be better
+          suited for output direct to users.  With ‘--zero-terminated’
+          (‘-z’), use a zero byte (ASCII NUL) instead of a newline as
+          the delimiter.
 
-    `separate'
-          Separate groups of repeated lines with a single newline.
-          With `--zero-terminated' (`-z'), use a zero byte (ASCII NUL)
-          instead of a newline.  This is the same as using `prepend',
-          except that no delimiter is inserted before the first group,
-          and hence may be better suited for output direct to users.
+     Note that when groups are delimited and the input stream contains
+     two or more consecutive blank lines, then the output is ambiguous.
+     To avoid that, filter the input through ‘tr -s '\n'’ to replace
+     each sequence of consecutive newlines with a single newline.
+
+     This is a GNU extension.
+
+‘--group[=DELIMIT-METHOD]’
+     Output all lines, and delimit each unique group.  With
+     ‘--zero-terminated’ (‘-z’), use a zero byte (ASCII NUL) instead of
+     a newline as the delimiter.  The optional DELIMIT-METHOD specifies
+     how to delimit groups, and must be one of the following:
+
+     ‘separate’
+          Separate unique groups with a single delimiter.  This is the
+          default delimiting method if none is specified, and better
+          suited for output direct to users.
+
+     ‘prepend’
+          Output a delimiter before each group of unique items.
+
+     ‘append’
+          Output a delimiter after each group of unique items.
+
+     ‘both’
+          Output a delimiter around each group of unique items.
 
      Note that when groups are delimited and the input stream contains
      two or more consecutive blank lines, then the output is ambiguous.
-     To avoid that, filter the input through `tr -s '\n'' to replace
+     To avoid that, filter the input through ‘tr -s '\n'’ to replace
      each sequence of consecutive newlines with a single newline.
 
      This is a GNU extension.
 
-`-u'
-`--unique'
-     Discard the first repeated line.  When used by itself, this option
-     causes `uniq' to print unique lines, and nothing else.
+‘-u’
+‘--unique’
+     Discard the last line that would be output for a repeated input
+     group.  When used by itself, this option causes ‘uniq’ to print
+     unique lines, and nothing else.
 
-`-w N'
-`--check-chars=N'
+‘-w N’
+‘--check-chars=N’
      Compare at most N characters on each line (after skipping any
      specified fields and characters).  By default the entire rest of
      the lines are compared.
 
-`-z'
-`--zero-terminated'
+‘-z’
+‘--zero-terminated’
      Delimit items with a zero byte rather than a newline (ASCII LF).
      I.e., treat input as items separated by ASCII NUL and terminate
-     output items with ASCII NUL.  This option can be useful in
-     conjunction with `perl -0' or `find -print0' and `xargs -0' which
+     output items with ASCII NUL. This option can be useful in
+     conjunction with ‘perl -0’ or ‘find -print0’ and ‘xargs -0’ which
      do the same in order to reliably handle arbitrary file names (even
      those containing blanks or other special characters).
 
-
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
 
 
 File: coreutils.info,  Node: comm invocation,  Next: ptx invocation,  Prev: uniq invocation,  Up: Operating on sorted files
 
-7.4 `comm': Compare two sorted files line by line
+7.4 ‘comm’: Compare two sorted files line by line
 =================================================
 
-`comm' writes to standard output lines that are common, and lines that
-are unique, to two input files; a file name of `-' means standard
-input.  Synopsis:
+‘comm’ writes to standard output lines that are common, and lines that
+are unique, to two input files; a file name of ‘-’ means standard input.
+Synopsis:
 
-     comm [OPTION]... FILE1 FILE2
+     comm [OPTION]… FILE1 FILE2
 
-   Before `comm' can be used, the input files must be sorted using the
-collating sequence specified by the `LC_COLLATE' locale.  If an input
+   Before ‘comm’ can be used, the input files must be sorted using the
+collating sequence specified by the ‘LC_COLLATE’ locale.  If an input
 file ends in a non-newline character, a newline is silently appended.
-The `sort' command with no options always outputs a file that is
-suitable input to `comm'.
+The ‘sort’ command with no options always outputs a file that is
+suitable input to ‘comm’.
 
-   With no options, `comm' produces three-column output.  Column one
+   With no options, ‘comm’ produces three-column output.  Column one
 contains lines unique to FILE1, column two contains lines unique to
 FILE2, and column three contains lines common to both files.  Columns
 are separated by a single TAB character.
 
-   The options `-1', `-2', and `-3' suppress printing of the
+   The options ‘-1’, ‘-2’, and ‘-3’ suppress printing of the
 corresponding columns (and separators).  Also see *note Common
 options::.
 
-   Unlike some other comparison utilities, `comm' has an exit status
+   Unlike some other comparison utilities, ‘comm’ has an exit status
 that does not depend on the result of the comparison.  Upon normal
-completion `comm' produces an exit code of zero.  If there is an error
+completion ‘comm’ produces an exit code of zero.  If there is an error
 it exits with nonzero status.
 
-   If the `--check-order' option is given, unsorted inputs will cause a
-fatal error message.  If the option `--nocheck-order' is given,
-unsorted inputs will never cause an error message.  If neither of these
-options is given, wrongly sorted inputs are diagnosed only if an input
-file is found to contain unpairable lines.  If an input file is
-diagnosed as being unsorted, the `comm' command will exit with a
-nonzero status (and the output should not be used).
+   If the ‘--check-order’ option is given, unsorted inputs will cause a
+fatal error message.  If the option ‘--nocheck-order’ is given, unsorted
+inputs will never cause an error message.  If neither of these options
+is given, wrongly sorted inputs are diagnosed only if an input file is
+found to contain unpairable lines.  If an input file is diagnosed as
+being unsorted, the ‘comm’ command will exit with a nonzero status (and
+the output should not be used).
 
-   Forcing `comm' to process wrongly sorted input files containing
-unpairable lines by specifying `--nocheck-order' is not guaranteed to
+   Forcing ‘comm’ to process wrongly sorted input files containing
+unpairable lines by specifying ‘--nocheck-order’ is not guaranteed to
 produce any particular output.  The output will probably not correspond
 with whatever you hoped it would be.
 
-`--check-order'
+‘--check-order’
      Fail with an error message if either input file is wrongly ordered.
 
-`--nocheck-order'
+‘--nocheck-order’
      Do not check that both input files are in sorted order.
 
      Other options are:
 
-`--output-delimiter=STR'
+‘--output-delimiter=STR’
      Print STR between adjacent output columns, rather than the default
      of a single TAB character.
 
      The delimiter STR may not be empty.
 
-
 
 File: coreutils.info,  Node: ptx invocation,  Next: tsort invocation,  Prev: comm invocation,  Up: Operating on sorted files
 
-7.5 `ptx': Produce permuted indexes
+7.5 ‘ptx’: Produce permuted indexes
 ===================================
 
-`ptx' reads a text file and essentially produces a permuted index, with
+‘ptx’ reads a text file and essentially produces a permuted index, with
 each keyword in its context.  The calling sketch is either one of:
 
-     ptx [OPTION ...] [FILE ...]
-     ptx -G [OPTION ...] [INPUT [OUTPUT]]
+     ptx [OPTION …] [FILE …]
+     ptx -G [OPTION …] [INPUT [OUTPUT]]
 
-   The `-G' (or its equivalent: `--traditional') option disables all
-GNU extensions and reverts to traditional mode, thus introducing some
-limitations and changing several of the program's default option values.
-When `-G' is not specified, GNU extensions are always enabled.  GNU
-extensions to `ptx' are documented wherever appropriate in this
+   The ‘-G’ (or its equivalent: ‘--traditional’) option disables all GNU
+extensions and reverts to traditional mode, thus introducing some
+limitations and changing several of the program’s default option values.
+When ‘-G’ is not specified, GNU extensions are always enabled.  GNU
+extensions to ‘ptx’ are documented wherever appropriate in this
 document.  *Note Compatibility in ptx::, for the full list.
 
    Individual options are explained in the following sections.
 
    When GNU extensions are enabled, there may be zero, one or several
 FILEs after the options.  If there is no FILE, the program reads the
-standard input.  If there is one or several FILEs, they give the name
-of input files which are all read in turn, as if all the input files
-were concatenated.  However, there is a full contextual break between
-each file and, when automatic referencing is requested, file names and
-line numbers refer to individual text input files.  In all cases, the
-program outputs the permuted index to the standard output.
+standard input.  If there is one or several FILEs, they give the name of
+input files which are all read in turn, as if all the input files were
+concatenated.  However, there is a full contextual break between each
+file and, when automatic referencing is requested, file names and line
+numbers refer to individual text input files.  In all cases, the program
+outputs the permuted index to the standard output.
 
    When GNU extensions are _not_ enabled, that is, when the program
 operates in traditional mode, there may be zero, one or two parameters
@@ -4229,11 +4221,11 @@ instead of the standard input.  If two parameters are given, they give
 respectively the name of the INPUT file to read and the name of the
 OUTPUT file to produce.  _Be very careful_ to note that, in this case,
 the contents of file given by the second parameter is destroyed.  This
-behavior is dictated by System V `ptx' compatibility; GNU Standards
+behavior is dictated by System V ‘ptx’ compatibility; GNU Standards
 normally discourage output parameters not introduced by an option.
 
    Note that for _any_ file named as the value of an option or as an
-input text file, a single dash `-' may be used, in which case standard
+input text file, a single dash ‘-’ may be used, in which case standard
 input is assumed.  However, it would not make sense to use this
 convention more than once per program invocation.
 
@@ -4251,20 +4243,19 @@ File: coreutils.info,  Node: General options in ptx,  Next: Charset selection in
 7.5.1 General options
 ---------------------
 
-`-G'
-`--traditional'
+‘-G’
+‘--traditional’
      As already explained, this option disables all GNU extensions to
-     `ptx' and switches to traditional mode.
+     ‘ptx’ and switches to traditional mode.
 
-`--help'
+‘--help’
      Print a short help on standard output, then exit without further
      processing.
 
-`--version'
+‘--version’
      Print the program version on standard output, then exit without
      further processing.
 
-
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
 
@@ -4277,34 +4268,33 @@ File: coreutils.info,  Node: Charset selection in ptx,  Next: Input processing i
 As it is set up now, the program assumes that the input file is coded
 using 8-bit ISO 8859-1 code, also known as Latin-1 character set,
 _unless_ it is compiled for MS-DOS, in which case it uses the character
-set of the IBM-PC.  (GNU `ptx' is not known to work on smaller MS-DOS
-machines anymore.)  Compared to 7-bit ASCII, the set of characters
-which are letters is different; this alters the behavior of regular
-expression matching.  Thus, the default regular expression for a
-keyword allows foreign or diacriticized letters.  Keyword sorting,
-however, is still crude; it obeys the underlying character set ordering
-quite blindly.
-
-`-f'
-`--ignore-case'
+set of the IBM-PC.  (GNU ‘ptx’ is not known to work on smaller MS-DOS
+machines anymore.)  Compared to 7-bit ASCII, the set of characters which
+are letters is different; this alters the behavior of regular expression
+matching.  Thus, the default regular expression for a keyword allows
+foreign or diacriticized letters.  Keyword sorting, however, is still
+crude; it obeys the underlying character set ordering quite blindly.
+
+‘-f’
+‘--ignore-case’
      Fold lower case letters to upper case for sorting.
 
-
 
 File: coreutils.info,  Node: Input processing in ptx,  Next: Output formatting in ptx,  Prev: Charset selection in ptx,  Up: ptx invocation
 
 7.5.3 Word selection and input processing
 -----------------------------------------
 
-`-b FILE'
-`--break-file=FILE'
-     This option provides an alternative (to `-W') method of describing
+‘-b FILE’
+‘--break-file=FILE’
+
+     This option provides an alternative (to ‘-W’) method of describing
      which characters make up words.  It introduces the name of a file
      which contains a list of characters which can_not_ be part of one
-     word; this file is called the "Break file".  Any character which
-     is not part of the Break file is a word constituent.  If both
-     options `-b' and `-W' are specified, then `-W' has precedence and
-     `-b' is ignored.
+     word; this file is called the "Break file".  Any character which is
+     not part of the Break file is a word constituent.  If both options
+     ‘-b’ and ‘-W’ are specified, then ‘-W’ has precedence and ‘-b’ is
+     ignored.
 
      When GNU extensions are enabled, the only way to avoid newline as a
      break character is to write all the break characters in the file
@@ -4313,56 +4303,59 @@ File: coreutils.info,  Node: Input processing in ptx,  Next: Output formatting i
      considered as break characters even if not included in the Break
      file.
 
-`-i FILE'
-`--ignore-file=FILE'
-     The file associated with this option contains a list of words
-     which will never be taken as keywords in concordance output.  It
-     is called the "Ignore file".  The file contains exactly one word
-     in each line; the end of line separation of words is not subject
-     to the value of the `-S' option.
-
-`-o FILE'
-`--only-file=FILE'
-     The file associated with this option contains a list of words
-     which will be retained in concordance output; any word not
-     mentioned in this file is ignored.  The file is called the "Only
-     file".  The file contains exactly one word in each line; the end
-     of line separation of words is not subject to the value of the
-     `-S' option.
+‘-i FILE’
+‘--ignore-file=FILE’
+
+     The file associated with this option contains a list of words which
+     will never be taken as keywords in concordance output.  It is
+     called the "Ignore file".  The file contains exactly one word in
+     each line; the end of line separation of words is not subject to
+     the value of the ‘-S’ option.
+
+‘-o FILE’
+‘--only-file=FILE’
+
+     The file associated with this option contains a list of words which
+     will be retained in concordance output; any word not mentioned in
+     this file is ignored.  The file is called the "Only file".  The
+     file contains exactly one word in each line; the end of line
+     separation of words is not subject to the value of the ‘-S’ option.
 
      There is no default for the Only file.  When both an Only file and
      an Ignore file are specified, a word is considered a keyword only
      if it is listed in the Only file and not in the Ignore file.
 
-`-r'
-`--references'
+‘-r’
+‘--references’
+
      On each input line, the leading sequence of non-white space
      characters will be taken to be a reference that has the purpose of
-     identifying this input line in the resulting permuted index.
-     *Note Output formatting in ptx::, for more information about
-     reference production.  Using this option changes the default value
-     for option `-S'.
+     identifying this input line in the resulting permuted index.  *Note
+     Output formatting in ptx::, for more information about reference
+     production.  Using this option changes the default value for option
+     ‘-S’.
 
      Using this option, the program does not try very hard to remove
      references from contexts in output, but it succeeds in doing so
-     _when_ the context ends exactly at the newline.  If option `-r' is
-     used with `-S' default value, or when GNU extensions are disabled,
-     this condition is always met and references are completely
-     excluded from the output contexts.
+     _when_ the context ends exactly at the newline.  If option ‘-r’ is
+     used with ‘-S’ default value, or when GNU extensions are disabled,
+     this condition is always met and references are completely excluded
+     from the output contexts.
+
+‘-S REGEXP’
+‘--sentence-regexp=REGEXP’
 
-`-S REGEXP'
-`--sentence-regexp=REGEXP'
      This option selects which regular expression will describe the end
      of a line or the end of a sentence.  In fact, this regular
      expression is not the only distinction between end of lines or end
      of sentences, and input line boundaries have no special
      significance outside this option.  By default, when GNU extensions
-     are enabled and if `-r' option is not used, end of sentences are
+     are enabled and if ‘-r’ option is not used, end of sentences are
      used.  In this case, this REGEX is imported from GNU Emacs:
 
           [.?!][]\"')}]*\\($\\|\t\\|  \\)[ \t\n]*
 
-     Whenever GNU extensions are disabled or if `-r' option is used, end
+     Whenever GNU extensions are disabled or if ‘-r’ option is used, end
      of lines are used; in this case, the default REGEXP is just:
 
           \n
@@ -4371,39 +4364,39 @@ File: coreutils.info,  Node: Input processing in ptx,  Next: Output formatting i
      line or end of sentence recognition.  In this case, the whole file
      is considered to be a single big line or sentence.  The user might
      want to disallow all truncation flag generation as well, through
-     option `-F ""'.  *Note Syntax of Regular Expressions:
+     option ‘-F ""’.  *Note Syntax of Regular Expressions:
      (emacs)Regexps.
 
-     When the keywords happen to be near the beginning of the input
-     line or sentence, this often creates an unused area at the
-     beginning of the output context line; when the keywords happen to
-     be near the end of the input line or sentence, this often creates
-     an unused area at the end of the output context line.  The program
-     tries to fill those unused areas by wrapping around context in
-     them; the tail of the input line or sentence is used to fill the
-     unused area on the left of the output line; the head of the input
-     line or sentence is used to fill the unused area on the right of
-     the output line.
+     When the keywords happen to be near the beginning of the input line
+     or sentence, this often creates an unused area at the beginning of
+     the output context line; when the keywords happen to be near the
+     end of the input line or sentence, this often creates an unused
+     area at the end of the output context line.  The program tries to
+     fill those unused areas by wrapping around context in them; the
+     tail of the input line or sentence is used to fill the unused area
+     on the left of the output line; the head of the input line or
+     sentence is used to fill the unused area on the right of the output
+     line.
 
      As a matter of convenience to the user, many usual backslashed
      escape sequences from the C language are recognized and converted
-     to the corresponding characters by `ptx' itself.
+     to the corresponding characters by ‘ptx’ itself.
+
+‘-W REGEXP’
+‘--word-regexp=REGEXP’
 
-`-W REGEXP'
-`--word-regexp=REGEXP'
      This option selects which regular expression will describe each
      keyword.  By default, if GNU extensions are enabled, a word is a
-     sequence of letters; the REGEXP used is `\w+'.  When GNU
-     extensions are disabled, a word is by default anything which ends
-     with a space, a tab or a newline; the REGEXP used is `[^ \t\n]+'.
+     sequence of letters; the REGEXP used is ‘\w+’.  When GNU extensions
+     are disabled, a word is by default anything which ends with a
+     space, a tab or a newline; the REGEXP used is ‘[^ \t\n]+’.
 
      An empty REGEXP is equivalent to not using this option.  *Note
      Syntax of Regular Expressions: (emacs)Regexps.
 
      As a matter of convenience to the user, many usual backslashed
      escape sequences, as found in the C language, are recognized and
-     converted to the corresponding characters by `ptx' itself.
-
+     converted to the corresponding characters by ‘ptx’ itself.
 
 
 File: coreutils.info,  Node: Output formatting in ptx,  Next: Compatibility in ptx,  Prev: Input processing in ptx,  Up: ptx invocation
@@ -4411,35 +4404,36 @@ File: coreutils.info,  Node: Output formatting in ptx,  Next: Compatibility in p
 7.5.4 Output formatting
 -----------------------
 
-Output format is mainly controlled by the `-O' and `-T' options
-described in the table below.  When neither `-O' nor `-T' are selected,
+Output format is mainly controlled by the ‘-O’ and ‘-T’ options
+described in the table below.  When neither ‘-O’ nor ‘-T’ are selected,
 and if GNU extensions are enabled, the program chooses an output format
 suitable for a dumb terminal.  Each keyword occurrence is output to the
 center of one line, surrounded by its left and right contexts.  Each
 field is properly justified, so the concordance output can be readily
-observed.  As a special feature, if automatic references are selected
-by option `-A' and are output before the left context, that is, if
-option `-R' is _not_ selected, then a colon is added after the
-reference; this nicely interfaces with GNU Emacs `next-error'
-processing.  In this default output format, each white space character,
-like newline and tab, is merely changed to exactly one space, with no
-special attempt to compress consecutive spaces.  This might change in
-the future.  Except for those white space characters, every other
-character of the underlying set of 256 characters is transmitted
-verbatim.
+observed.  As a special feature, if automatic references are selected by
+option ‘-A’ and are output before the left context, that is, if option
+‘-R’ is _not_ selected, then a colon is added after the reference; this
+nicely interfaces with GNU Emacs ‘next-error’ processing.  In this
+default output format, each white space character, like newline and tab,
+is merely changed to exactly one space, with no special attempt to
+compress consecutive spaces.  This might change in the future.  Except
+for those white space characters, every other character of the
+underlying set of 256 characters is transmitted verbatim.
 
    Output format is further controlled by the following options.
 
-`-g NUMBER'
-`--gap-size=NUMBER'
+‘-g NUMBER’
+‘--gap-size=NUMBER’
+
      Select the size of the minimum white space gap between the fields
      on the output line.
 
-`-w NUMBER'
-`--width=NUMBER'
+‘-w NUMBER’
+‘--width=NUMBER’
+
      Select the maximum output width of each final line.  If references
      are used, they are included or excluded from the maximum output
-     width depending on the value of option `-R'.  If this option is not
+     width depending on the value of option ‘-R’.  If this option is not
      selected, that is, when references are output before the left
      context, the maximum output width takes into account the maximum
      length of all references.  If this option is selected, that is,
@@ -4447,93 +4441,99 @@ verbatim.
      output width does not take into account the space taken by
      references, nor the gap that precedes them.
 
-`-A'
-`--auto-reference'
+‘-A’
+‘--auto-reference’
+
      Select automatic references.  Each input line will have an
      automatic reference made up of the file name and the line ordinal,
      with a single colon between them.  However, the file name will be
-     empty when standard input is being read.  If both `-A' and `-r'
-     are selected, then the input reference is still read and skipped,
-     but the automatic reference is used at output time, overriding the
+     empty when standard input is being read.  If both ‘-A’ and ‘-r’ are
+     selected, then the input reference is still read and skipped, but
+     the automatic reference is used at output time, overriding the
      input reference.
 
-`-R'
-`--right-side-refs'
-     In the default output format, when option `-R' is not used, any
-     references produced by the effect of options `-r' or `-A' are
+‘-R’
+‘--right-side-refs’
+
+     In the default output format, when option ‘-R’ is not used, any
+     references produced by the effect of options ‘-r’ or ‘-A’ are
      placed to the far right of output lines, after the right context.
-     With default output format, when the `-R' option is specified,
+     With default output format, when the ‘-R’ option is specified,
      references are rather placed at the beginning of each output line,
-     before the left context.  For any other output format, option `-R'
-     is ignored, with one exception:  with `-R' the width of references
-     is _not_ taken into account in total output width given by `-w'.
+     before the left context.  For any other output format, option ‘-R’
+     is ignored, with one exception: with ‘-R’ the width of references
+     is _not_ taken into account in total output width given by ‘-w’.
 
      This option is automatically selected whenever GNU extensions are
      disabled.
 
-`-F STRING'
-`--flac-truncation=STRING'
+‘-F STRING’
+‘--flac-truncation=STRING’
+
      This option will request that any truncation in the output be
-     reported using the string STRING.  Most output fields
-     theoretically extend towards the beginning or the end of the
-     current line, or current sentence, as selected with option `-S'.
-     But there is a maximum allowed output line width, changeable
-     through option `-w', which is further divided into space for
-     various output fields.  When a field has to be truncated because
-     it cannot extend beyond the beginning or the end of the current
-     line to fit in, then a truncation occurs.  By default, the string
-     used is a single slash, as in `-F /'.
-
-     STRING may have more than one character, as in `-F ...'.  Also, in
-     the particular case when STRING is empty (`-F ""'), truncation
+     reported using the string STRING.  Most output fields theoretically
+     extend towards the beginning or the end of the current line, or
+     current sentence, as selected with option ‘-S’.  But there is a
+     maximum allowed output line width, changeable through option ‘-w’,
+     which is further divided into space for various output fields.
+     When a field has to be truncated because it cannot extend beyond
+     the beginning or the end of the current line to fit in, then a
+     truncation occurs.  By default, the string used is a single slash,
+     as in ‘-F /’.
+
+     STRING may have more than one character, as in ‘-F …’.  Also, in
+     the particular case when STRING is empty (‘-F ""’), truncation
      flagging is disabled, and no truncation marks are appended in this
      case.
 
      As a matter of convenience to the user, many usual backslashed
      escape sequences, as found in the C language, are recognized and
-     converted to the corresponding characters by `ptx' itself.
+     converted to the corresponding characters by ‘ptx’ itself.
 
-`-M STRING'
-`--macro-name=STRING'
-     Select another STRING to be used instead of `xx', while generating
-     output suitable for `nroff', `troff' or TeX.
+‘-M STRING’
+‘--macro-name=STRING’
 
-`-O'
-`--format=roff'
-     Choose an output format suitable for `nroff' or `troff'
-     processing.  Each output line will look like:
+     Select another STRING to be used instead of ‘xx’, while generating
+     output suitable for ‘nroff’, ‘troff’ or TeX.
+
+‘-O’
+‘--format=roff’
+
+     Choose an output format suitable for ‘nroff’ or ‘troff’ processing.
+     Each output line will look like:
 
           .xx "TAIL" "BEFORE" "KEYWORD_AND_AFTER" "HEAD" "REF"
 
-     so it will be possible to write a `.xx' roff macro to take care of
+     so it will be possible to write a ‘.xx’ roff macro to take care of
      the output typesetting.  This is the default output format when GNU
-     extensions are disabled.  Option `-M' can be used to change `xx'
-     to another macro name.
+     extensions are disabled.  Option ‘-M’ can be used to change ‘xx’ to
+     another macro name.
 
      In this output format, each non-graphical character, like newline
      and tab, is merely changed to exactly one space, with no special
-     attempt to compress consecutive spaces.  Each quote character: `"'
-     is doubled so it will be correctly processed by `nroff' or `troff'.
+     attempt to compress consecutive spaces.  Each quote character ‘"’
+     is doubled so it will be correctly processed by ‘nroff’ or ‘troff’.
+
+‘-T’
+‘--format=tex’
 
-`-T'
-`--format=tex'
      Choose an output format suitable for TeX processing.  Each output
      line will look like:
 
           \xx {TAIL}{BEFORE}{KEYWORD}{AFTER}{HEAD}{REF}
 
-     so it will be possible to write a `\xx' definition to take care of
+     so it will be possible to write a ‘\xx’ definition to take care of
      the output typesetting.  Note that when references are not being
-     produced, that is, neither option `-A' nor option `-r' is
-     selected, the last parameter of each `\xx' call is inhibited.
-     Option `-M' can be used to change `xx' to another macro name.
-
-     In this output format, some special characters, like `$', `%',
-     `&', `#' and `_' are automatically protected with a backslash.
-     Curly brackets `{', `}' are protected with a backslash and a pair
-     of dollar signs (to force mathematical mode).  The backslash
-     itself produces the sequence `\backslash{}'.  Circumflex and tilde
-     diacritical marks produce the sequence `^\{ }' and `~\{ }'
+     produced, that is, neither option ‘-A’ nor option ‘-r’ is selected,
+     the last parameter of each ‘\xx’ call is inhibited.  Option ‘-M’
+     can be used to change ‘xx’ to another macro name.
+
+     In this output format, some special characters, like ‘$’, ‘%’, ‘&’,
+     ‘#’ and ‘_’ are automatically protected with a backslash.  Curly
+     brackets ‘{’, ‘}’ are protected with a backslash and a pair of
+     dollar signs (to force mathematical mode).  The backslash itself
+     produces the sequence ‘\backslash{}’.  Circumflex and tilde
+     diacritical marks produce the sequence ‘^\{ }’ and ‘~\{ }’
      respectively.  Other diacriticized characters of the underlying
      character set produce an appropriate TeX sequence as far as
      possible.  The other non-graphical characters, like newline and
@@ -4542,86 +4542,84 @@ verbatim.
      compress consecutive spaces.  Let me know how to improve this
      special character processing for TeX.
 
-
 
 File: coreutils.info,  Node: Compatibility in ptx,  Prev: Output formatting in ptx,  Up: ptx invocation
 
-7.5.5 The GNU extensions to `ptx'
+7.5.5 The GNU extensions to ‘ptx’
 ---------------------------------
 
-This version of `ptx' contains a few features which do not exist in
-System V `ptx'.  These extra features are suppressed by using the `-G'
+This version of ‘ptx’ contains a few features which do not exist in
+System V ‘ptx’.  These extra features are suppressed by using the ‘-G’
 command line option, unless overridden by other command line options.
 Some GNU extensions cannot be recovered by overriding, so the simple
-rule is to avoid `-G' if you care about GNU extensions.  Here are the
-differences between this program and System V `ptx'.
+rule is to avoid ‘-G’ if you care about GNU extensions.  Here are the
+differences between this program and System V ‘ptx’.
 
-   * This program can read many input files at once, it always writes
+   • This program can read many input files at once, it always writes
      the resulting concordance on standard output.  On the other hand,
-     System V `ptx' reads only one file and sends the result to
-     standard output or, if a second FILE parameter is given on the
-     command, to that FILE.
+     System V ‘ptx’ reads only one file and sends the result to standard
+     output or, if a second FILE parameter is given on the command, to
+     that FILE.
 
      Having output parameters not introduced by options is a dangerous
-     practice which GNU avoids as far as possible.  So, for using `ptx'
+     practice which GNU avoids as far as possible.  So, for using ‘ptx’
      portably between GNU and System V, you should always use it with a
-     single input file, and always expect the result on standard
-     output.  You might also want to automatically configure in a `-G'
-     option to `ptx' calls in products using `ptx', if the configurator
-     finds that the installed `ptx' accepts `-G'.
-
-   * The only options available in System V `ptx' are options `-b',
-     `-f', `-g', `-i', `-o', `-r', `-t' and `-w'.  All other options
-     are GNU extensions and are not repeated in this enumeration.
-     Moreover, some options have a slightly different meaning when GNU
-     extensions are enabled, as explained below.
-
-   * By default, concordance output is not formatted for `troff' or
-     `nroff'.  It is rather formatted for a dumb terminal.  `troff' or
-     `nroff' output may still be selected through option `-O'.
-
-   * Unless `-R' option is used, the maximum reference width is
+     single input file, and always expect the result on standard output.
+     You might also want to automatically configure in a ‘-G’ option to
+     ‘ptx’ calls in products using ‘ptx’, if the configurator finds that
+     the installed ‘ptx’ accepts ‘-G’.
+
+   • The only options available in System V ‘ptx’ are options ‘-b’,
+     ‘-f’, ‘-g’, ‘-i’, ‘-o’, ‘-r’, ‘-t’ and ‘-w’.  All other options are
+     GNU extensions and are not repeated in this enumeration.  Moreover,
+     some options have a slightly different meaning when GNU extensions
+     are enabled, as explained below.
+
+   • By default, concordance output is not formatted for ‘troff’ or
+     ‘nroff’.  It is rather formatted for a dumb terminal.  ‘troff’ or
+     ‘nroff’ output may still be selected through option ‘-O’.
+
+   • Unless ‘-R’ option is used, the maximum reference width is
      subtracted from the total output line width.  With GNU extensions
      disabled, width of references is not taken into account in the
      output line width computations.
 
-   * All 256 bytes, even ASCII NUL bytes, are always read and processed
+   • All 256 bytes, even ASCII NUL bytes, are always read and processed
      from input file with no adverse effect, even if GNU extensions are
-     disabled.  However, System V `ptx' does not accept 8-bit
+     disabled.  However, System V ‘ptx’ does not accept 8-bit
      characters, a few control characters are rejected, and the tilde
-     `~' is also rejected.
+     ‘~’ is also rejected.
 
-   * Input line length is only limited by available memory, even if GNU
-     extensions are disabled.  However, System V `ptx' processes only
+   • Input line length is only limited by available memory, even if GNU
+     extensions are disabled.  However, System V ‘ptx’ processes only
      the first 200 characters in each line.
 
-   * The break (non-word) characters default to be every character
+   • The break (non-word) characters default to be every character
      except all letters of the underlying character set, diacriticized
      or not.  When GNU extensions are disabled, the break characters
      default to space, tab and newline only.
 
-   * The program makes better use of output line width.  If GNU
-     extensions are disabled, the program rather tries to imitate
-     System V `ptx', but still, there are some slight disposition
-     glitches this program does not completely reproduce.
-
-   * The user can specify both an Ignore file and an Only file.  This
-     is not allowed with System V `ptx'.
+   • The program makes better use of output line width.  If GNU
+     extensions are disabled, the program rather tries to imitate System
+     V ‘ptx’, but still, there are some slight disposition glitches this
+     program does not completely reproduce.
 
+   • The user can specify both an Ignore file and an Only file.  This is
+     not allowed with System V ‘ptx’.
 
 
 File: coreutils.info,  Node: tsort invocation,  Prev: ptx invocation,  Up: Operating on sorted files
 
-7.6 `tsort': Topological sort
+7.6 ‘tsort’: Topological sort
 =============================
 
-`tsort' performs a topological sort on the given FILE, or standard
-input if no input file is given or for a FILE of `-'.  For more details
-and some history, see *note tsort background::.  Synopsis:
+‘tsort’ performs a topological sort on the given FILE, or standard input
+if no input file is given or for a FILE of ‘-’.  For more details and
+some history, see *note tsort background::.  Synopsis:
 
      tsort [OPTION] [FILE]
 
-   `tsort' reads its input as pairs of strings, separated by blanks,
+   ‘tsort’ reads its input as pairs of strings, separated by blanks,
 indicating a partial ordering.  The output is a total ordering that
 corresponds to the given partial ordering.
 
@@ -4643,11 +4641,11 @@ will produce the output
      e
      f
 
-   Consider a more realistic example.  You have a large set of
-functions all in one file, and they may all be declared static except
-one.  Currently that one (say `main') is the first function defined in
-the file, and the ones it calls directly follow it, followed by those
-they call, etc.  Let's say that you are determined to take advantage of
+   Consider a more realistic example.  You have a large set of functions
+all in one file, and they may all be declared static except one.
+Currently that one (say ‘main’) is the first function defined in the
+file, and the ones it calls directly follow it, followed by those they
+call, etc.  Let’s say that you are determined to take advantage of
 prototypes, so you have to choose between declaring all of those
 functions (which means duplicating a lot of information from the
 definitions) and rearranging the functions so that as many as possible
@@ -4680,7 +4678,7 @@ that the function on the left calls the one on the right directly.
      file_lines dump_remainder
      recheck pretty_name
 
-   then you can use `tsort' to produce an ordering of those functions
+   then you can use ‘tsort’ to produce an ordering of those functions
 that satisfies your requirement.
 
      example$ tsort call-graph | tac
@@ -4702,15 +4700,15 @@ that satisfies your requirement.
      tail_forever
      main
 
-   `tsort' detects any cycles in the input and writes the first cycle
+   ‘tsort’ detects any cycles in the input and writes the first cycle
 encountered to standard error.
 
    Note that for a given partial ordering, generally there is no unique
 total ordering.  In the context of the call graph above, the function
-`parse_options' may be placed anywhere in the list as long as it
-precedes `main'.
+‘parse_options’ may be placed anywhere in the list as long as it
+precedes ‘main’.
 
-   The only options are `--help' and `--version'.  *Note Common
+   The only options are ‘--help’ and ‘--version’.  *Note Common
 options::.
 
    An exit status of zero indicates success, and a nonzero value
@@ -4723,41 +4721,40 @@ indicates failure.
 
 File: coreutils.info,  Node: tsort background,  Up: tsort invocation
 
-7.6.1 `tsort': Background
+7.6.1 ‘tsort’: Background
 -------------------------
 
-`tsort' exists because very early versions of the Unix linker processed
-an archive file exactly once, and in order.  As `ld' read each object
-in the archive, it decided whether it was needed in the program based on
-whether it defined any symbols which were undefined at that point in
-the link.
+‘tsort’ exists because very early versions of the Unix linker processed
+an archive file exactly once, and in order.  As ‘ld’ read each object in
+the archive, it decided whether it was needed in the program based on
+whether it defined any symbols which were undefined at that point in the
+link.
 
    This meant that dependencies within the archive had to be handled
-specially.  For example, `scanf' probably calls `read'.  That means
-that in a single pass through an archive, it was important for `scanf.o'
-to appear before read.o, because otherwise a program which calls
-`scanf' but not `read' might end up with an unexpected unresolved
-reference to `read'.
+specially.  For example, ‘scanf’ probably calls ‘read’.  That means that
+in a single pass through an archive, it was important for ‘scanf.o’ to
+appear before read.o, because otherwise a program which calls ‘scanf’
+but not ‘read’ might end up with an unexpected unresolved reference to
+‘read’.
 
    The way to address this problem was to first generate a set of
 dependencies of one object file on another.  This was done by a shell
-script called `lorder'.  The GNU tools don't provide a version of
+script called ‘lorder’.  The GNU tools don’t provide a version of
 lorder, as far as I know, but you can still find it in BSD
 distributions.
 
-   Then you ran `tsort' over the `lorder' output, and you used the
+   Then you ran ‘tsort’ over the ‘lorder’ output, and you used the
 resulting sort to define the order in which you added objects to the
 archive.
 
-   This whole procedure has been obsolete since about 1980, because
-Unix archives now contain a symbol table (traditionally built by
-`ranlib', now generally built by `ar' itself), and the Unix linker uses
-the symbol table to effectively make multiple passes over an archive
-file.
+   This whole procedure has been obsolete since about 1980, because Unix
+archives now contain a symbol table (traditionally built by ‘ranlib’,
+now generally built by ‘ar’ itself), and the Unix linker uses the symbol
+table to effectively make multiple passes over an archive file.
 
-   Anyhow, that's where tsort came from.  To solve an old problem with
-the way the linker handled archive files, which has since been solved
-in different ways.
+   Anyhow, that’s where tsort came from.  To solve an old problem with
+the way the linker handled archive files, which has since been solved in
+different ways.
 
 
 File: coreutils.info,  Node: Operating on fields,  Next: Operating on characters,  Prev: Operating on sorted files,  Up: Top
@@ -4774,93 +4771,90 @@ File: coreutils.info,  Node: Operating on fields,  Next: Operating on characters
 
 File: coreutils.info,  Node: cut invocation,  Next: paste invocation,  Up: Operating on fields
 
-8.1 `cut': Print selected parts of lines
+8.1 ‘cut’: Print selected parts of lines
 ========================================
 
-`cut' writes to standard output selected parts of each line of each
+‘cut’ writes to standard output selected parts of each line of each
 input file, or standard input if no files are given or for a file name
-of `-'.  Synopsis:
+of ‘-’.  Synopsis:
 
-     cut OPTION... [FILE]...
+     cut OPTION… [FILE]…
 
    In the table which follows, the BYTE-LIST, CHARACTER-LIST, and
-FIELD-LIST are one or more numbers or ranges (two numbers separated by
-a dash) separated by commas.  Bytes, characters, and fields are
-numbered starting at 1.  Incomplete ranges may be given: `-M' means
-`1-M'; `N-' means `N' through end of line or last field.  The list
-elements can be repeated, can overlap, and can be specified in any
-order; but the selected input is written in the same order that it is
-read, and is written exactly once.
+FIELD-LIST are one or more numbers or ranges (two numbers separated by a
+dash) separated by commas.  Bytes, characters, and fields are numbered
+starting at 1.  Incomplete ranges may be given: ‘-M’ means ‘1-M’; ‘N-’
+means ‘N’ through end of line or last field.  The list elements can be
+repeated, can overlap, and can be specified in any order; but the
+selected input is written in the same order that it is read, and is
+written exactly once.
 
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-b BYTE-LIST'
-`--bytes=BYTE-LIST'
+‘-b BYTE-LIST’
+‘--bytes=BYTE-LIST’
      Select for printing only the bytes in positions listed in
      BYTE-LIST.  Tabs and backspaces are treated like any other
      character; they take up 1 byte.  If an output delimiter is
-     specified, (see the description of `--output-delimiter'), then
+     specified, (see the description of ‘--output-delimiter’), then
      output that string between ranges of selected bytes.
 
-`-c CHARACTER-LIST'
-`--characters=CHARACTER-LIST'
+‘-c CHARACTER-LIST’
+‘--characters=CHARACTER-LIST’
      Select for printing only the characters in positions listed in
-     CHARACTER-LIST.  The same as `-b' for now, but
-     internationalization will change that.  Tabs and backspaces are
-     treated like any other character; they take up 1 character.  If an
-     output delimiter is specified, (see the description of
-     `--output-delimiter'), then output that string between ranges of
-     selected bytes.
-
-`-f FIELD-LIST'
-`--fields=FIELD-LIST'
+     CHARACTER-LIST.  The same as ‘-b’ for now, but internationalization
+     will change that.  Tabs and backspaces are treated like any other
+     character; they take up 1 character.  If an output delimiter is
+     specified, (see the description of ‘--output-delimiter’), then
+     output that string between ranges of selected bytes.
+
+‘-f FIELD-LIST’
+‘--fields=FIELD-LIST’
      Select for printing only the fields listed in FIELD-LIST.  Fields
      are separated by a TAB character by default.  Also print any line
-     that contains no delimiter character, unless the
-     `--only-delimited' (`-s') option is specified.
+     that contains no delimiter character, unless the ‘--only-delimited’
+     (‘-s’) option is specified.
 
-     Note `awk' supports more sophisticated field processing, and by
-     default will use (and discard) runs of blank characters to
-     separate fields, and ignore leading and trailing blanks.
+     Note ‘awk’ supports more sophisticated field processing, and by
+     default will use (and discard) runs of blank characters to separate
+     fields, and ignore leading and trailing blanks.
           awk '{print $2}'    # print the second field
           awk '{print $NF-1}' # print the penultimate field
           awk '{print $2,$1}' # reorder the first two fields
 
-     In the unlikely event that `awk' is unavailable, one can use the
-     `join' command, to process blank characters as `awk' does above.
+     In the unlikely event that ‘awk’ is unavailable, one can use the
+     ‘join’ command, to process blank characters as ‘awk’ does above.
           join -a1 -o 1.2     - /dev/null # print the second field
           join -a1 -o 1.2,1.1 - /dev/null # reorder the first two fields
 
-`-d INPUT_DELIM_BYTE'
-`--delimiter=INPUT_DELIM_BYTE'
-     With `-f', use the first byte of INPUT_DELIM_BYTE as the input
+‘-d INPUT_DELIM_BYTE’
+‘--delimiter=INPUT_DELIM_BYTE’
+     With ‘-f’, use the first byte of INPUT_DELIM_BYTE as the input
      fields separator (default is TAB).
 
-`-n'
+‘-n’
      Do not split multi-byte characters (no-op for now).
 
-`-s'
-`--only-delimited'
-     For `-f', do not print lines that do not contain the field
+‘-s’
+‘--only-delimited’
+     For ‘-f’, do not print lines that do not contain the field
      separator character.  Normally, any line without a field separator
      is printed verbatim.
 
-`--output-delimiter=OUTPUT_DELIM_STRING'
-     With `-f', output fields are separated by OUTPUT_DELIM_STRING.
-     The default with `-f' is to use the input delimiter.  When using
-     `-b' or `-c' to select ranges of byte or character offsets (as
-     opposed to ranges of fields), output OUTPUT_DELIM_STRING between
+‘--output-delimiter=OUTPUT_DELIM_STRING’
+     With ‘-f’, output fields are separated by OUTPUT_DELIM_STRING.  The
+     default with ‘-f’ is to use the input delimiter.  When using ‘-b’
+     or ‘-c’ to select ranges of byte or character offsets (as opposed
+     to ranges of fields), output OUTPUT_DELIM_STRING between
      non-overlapping ranges of selected bytes.
 
-`--complement'
-     This option is a GNU extension.  Select for printing the
-     complement of the bytes, characters or fields selected with the
-     `-b', `-c' or `-f' options.  In other words, do _not_ print the
-     bytes, characters or fields specified via those options.  This
-     option is useful when you have many fields and want to print all
-     but a few of them.
-
+‘--complement’
+     This option is a GNU extension.  Select for printing the complement
+     of the bytes, characters or fields selected with the ‘-b’, ‘-c’ or
+     ‘-f’ options.  In other words, do _not_ print the bytes, characters
+     or fields specified via those options.  This option is useful when
+     you have many fields and want to print all but a few of them.
 
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
@@ -4868,16 +4862,19 @@ indicates failure.
 
 File: coreutils.info,  Node: paste invocation,  Next: join invocation,  Prev: cut invocation,  Up: Operating on fields
 
-8.2 `paste': Merge lines of files
+8.2 ‘paste’: Merge lines of files
 =================================
 
-`paste' writes to standard output lines consisting of sequentially
+‘paste’ writes to standard output lines consisting of sequentially
 corresponding lines of each given file, separated by a TAB character.
-Standard input is used for a file name of `-' or if no input files are
+Standard input is used for a file name of ‘-’ or if no input files are
 given.
 
-   For example:
+   Synopsis:
 
+     paste [OPTION]… [FILE]…
+
+   For example, with:
      $ cat num2
      1
      2
@@ -4885,20 +4882,35 @@ given.
      a
      b
      c
+
+   Take lines sequentially from each file:
      $ paste num2 let3
      1       a
      2       b
              c
 
-   Synopsis:
+   Duplicate lines from a file:
+     $ paste num2 let3 num2
+     1       a      1
+     2       b      2
+             c
 
-     paste [OPTION]... [FILE]...
+   Intermix lines from stdin:
+     $ paste - let3 - < num2
+     1       a      2
+             b
+             c
+
+   Join consecutive lines with a space:
+     $ seq 4 | paste -d ' ' - -
+     1 2
+     3 4
 
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-s'
-`--serial'
+‘-s’
+‘--serial’
      Paste the lines of one file at a time rather than one line from
      each file.  Using the above example data:
 
@@ -4906,8 +4918,8 @@ options::.
           1       2
           a       b       c
 
-`-d DELIM-LIST'
-`--delimiters=DELIM-LIST'
+‘-d DELIM-LIST’
+‘--delimiters=DELIM-LIST’
      Consecutively use the characters in DELIM-LIST instead of TAB to
      separate merged lines.  When DELIM-LIST is exhausted, start again
      at its beginning.  Using the above example data:
@@ -4917,41 +4929,40 @@ options::.
           2%b_2
           %c_
 
-
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
 
 
 File: coreutils.info,  Node: join invocation,  Prev: paste invocation,  Up: Operating on fields
 
-8.3 `join': Join lines on a common field
+8.3 ‘join’: Join lines on a common field
 ========================================
 
-`join' writes to standard output a line for each pair of input lines
+‘join’ writes to standard output a line for each pair of input lines
 that have identical join fields.  Synopsis:
 
-     join [OPTION]... FILE1 FILE2
+     join [OPTION]… FILE1 FILE2
 
-   Either FILE1 or FILE2 (but not both) can be `-', meaning standard
+   Either FILE1 or FILE2 (but not both) can be ‘-’, meaning standard
 input.  FILE1 and FILE2 should be sorted on the join fields.
 
    Normally, the sort order is that of the collating sequence specified
-by the `LC_COLLATE' locale.  Unless the `-t' option is given, the sort
-comparison ignores blanks at the start of the join field, as in `sort
--b'.  If the `--ignore-case' option is given, the sort comparison
-ignores the case of characters in the join field, as in `sort -f'.
-
-   The `sort' and `join' commands should use consistent locales and
-options if the output of `sort' is fed to `join'.  You can use a
-command like `sort -k 1b,1' to sort a file on its default join field,
-but if you select a non-default locale, join field, separator, or
-comparison options, then you should do so consistently between `join'
-and `sort'.  If `join -t ''' is specified then the whole line is
-considered which matches the default operation of sort.
+by the ‘LC_COLLATE’ locale.  Unless the ‘-t’ option is given, the sort
+comparison ignores blanks at the start of the join field, as in ‘sort
+-b’.  If the ‘--ignore-case’ option is given, the sort comparison
+ignores the case of characters in the join field, as in ‘sort -f’.
+
+   The ‘sort’ and ‘join’ commands should use consistent locales and
+options if the output of ‘sort’ is fed to ‘join’.  You can use a command
+like ‘sort -k 1b,1’ to sort a file on its default join field, but if you
+select a non-default locale, join field, separator, or comparison
+options, then you should do so consistently between ‘join’ and ‘sort’.
+If ‘join -t ''’ is specified then the whole line is considered which
+matches the default operation of sort.
 
    If the input has no unpairable lines, a GNU extension is available;
-the sort order can be any order that considers two fields to be equal
-if and only if the sort comparison described above considers them to be
+the sort order can be any order that considers two fields to be equal if
+and only if the sort comparison described above considers them to be
 equal.  For example:
 
      $ cat file1
@@ -4967,116 +4978,121 @@ equal.  For example:
      c c1 c2
      b b1 b2
 
-   If the `--check-order' option is given, unsorted inputs will cause a
-fatal error message.  If the option `--nocheck-order' is given,
-unsorted inputs will never cause an error message.  If neither of these
-options is given, wrongly sorted inputs are diagnosed only if an input
-file is found to contain unpairable lines, and when both input files
-are non empty.  If an input file is diagnosed as being unsorted, the
-`join' command will exit with a nonzero status (and the output should
-not be used).
-
-   Forcing `join' to process wrongly sorted input files containing
-unpairable lines by specifying `--nocheck-order' is not guaranteed to
+   If the ‘--check-order’ option is given, unsorted inputs will cause a
+fatal error message.  If the option ‘--nocheck-order’ is given, unsorted
+inputs will never cause an error message.  If neither of these options
+is given, wrongly sorted inputs are diagnosed only if an input file is
+found to contain unpairable lines, and when both input files are non
+empty.  If an input file is diagnosed as being unsorted, the ‘join’
+command will exit with a nonzero status (and the output should not be
+used).
+
+   Forcing ‘join’ to process wrongly sorted input files containing
+unpairable lines by specifying ‘--nocheck-order’ is not guaranteed to
 produce any particular output.  The output will probably not correspond
 with whatever you hoped it would be.
 
    The defaults are:
-   * the join field is the first field in each line;
-
-   * fields in the input are separated by one or more blanks, with
+   • the join field is the first field in each line;
+   • fields in the input are separated by one or more blanks, with
      leading blanks on the line ignored;
-
-   * fields in the output are separated by a space;
-
-   * each output line consists of the join field, the remaining fields
+   • fields in the output are separated by a space;
+   • each output line consists of the join field, the remaining fields
      from FILE1, then the remaining fields from FILE2.
 
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-a FILE-NUMBER'
+‘-a FILE-NUMBER’
      Print a line for each unpairable line in file FILE-NUMBER (either
-     `1' or `2'), in addition to the normal output.
+     ‘1’ or ‘2’), in addition to the normal output.
 
-`--check-order'
+‘--check-order’
      Fail with an error message if either input file is wrongly ordered.
 
-`--nocheck-order'
+‘--nocheck-order’
      Do not check that both input files are in sorted order.  This is
      the default.
 
-`-e STRING'
+‘-e STRING’
      Replace those output fields that are missing in the input with
-     STRING.  I.e., missing fields specified with the `-12jo' options.
+     STRING.  I.e., missing fields specified with the ‘-12jo’ options.
 
-`--header'
+‘--header’
      Treat the first line of each input file as a header line.  The
      header lines will be joined and printed as the first output line.
-     If `-o' is used to specify output format, the header line will be
+     If ‘-o’ is used to specify output format, the header line will be
      printed according to the specified format.  The header lines will
-     not be checked for ordering even if `--check-order' is specified.
+     not be checked for ordering even if ‘--check-order’ is specified.
      Also if the header lines from each file do not match, the heading
      fields from the first file will be used.
 
-`-i'
-`--ignore-case'
+‘-i’
+‘--ignore-case’
      Ignore differences in case when comparing keys.  With this option,
      the lines of the input files must be ordered in the same way.  Use
-     `sort -f' to produce this ordering.
+     ‘sort -f’ to produce this ordering.
 
-`-1 FIELD'
+‘-1 FIELD’
      Join on field FIELD (a positive integer) of file 1.
 
-`-2 FIELD'
+‘-2 FIELD’
      Join on field FIELD (a positive integer) of file 2.
 
-`-j FIELD'
-     Equivalent to `-1 FIELD -2 FIELD'.
+‘-j FIELD’
+     Equivalent to ‘-1 FIELD -2 FIELD’.
 
-`-o FIELD-LIST'
-`-o auto'
-     If the keyword `auto' is specified, infer the output format from
+‘-o FIELD-LIST’
+‘-o auto’
+     If the keyword ‘auto’ is specified, infer the output format from
      the first line in each file.  This is the same as the default
-     output format but also ensures the same number of fields are
-     output for each line.  Missing fields are replaced with the `-e'
-     option and extra fields are discarded.
+     output format but also ensures the same number of fields are output
+     for each line.  Missing fields are replaced with the ‘-e’ option
+     and extra fields are discarded.
 
      Otherwise, construct each output line according to the format in
      FIELD-LIST.  Each element in FIELD-LIST is either the single
-     character `0' or has the form M.N where the file number, M, is `1'
-     or `2' and N is a positive field number.
+     character ‘0’ or has the form M.N where the file number, M, is ‘1’
+     or ‘2’ and N is a positive field number.
 
-     A field specification of `0' denotes the join field.  In most
-     cases, the functionality of the `0' field spec may be reproduced
+     A field specification of ‘0’ denotes the join field.  In most
+     cases, the functionality of the ‘0’ field spec may be reproduced
      using the explicit M.N that corresponds to the join field.
-     However, when printing unpairable lines (using either of the `-a'
-     or `-v' options), there is no way to specify the join field using
+     However, when printing unpairable lines (using either of the ‘-a’
+     or ‘-v’ options), there is no way to specify the join field using
      M.N in FIELD-LIST if there are unpairable lines in both files.  To
-     give `join' that functionality, POSIX invented the `0' field
+     give ‘join’ that functionality, POSIX invented the ‘0’ field
      specification notation.
 
      The elements in FIELD-LIST are separated by commas or blanks.
      Blank separators typically need to be quoted for the shell.  For
-     example, the commands `join -o 1.2,2.2' and `join -o '1.2 2.2''
-     are equivalent.
+     example, the commands ‘join -o 1.2,2.2’ and ‘join -o '1.2 2.2'’ are
+     equivalent.
 
-     All output lines--including those printed because of any -a or -v
-     option--are subject to the specified FIELD-LIST.
+     All output lines—including those printed because of any -a or -v
+     option—are subject to the specified FIELD-LIST.
 
-`-t CHAR'
+‘-t CHAR’
      Use character CHAR as the input and output field separator.  Treat
      as significant each occurrence of CHAR in the input file.  Use
-     `sort -t CHAR', without the `-b' option of `sort', to produce this
-     ordering.  If `join -t ''' is specified, the whole line is
-     considered, matching the default operation of sort.  If `-t '\0''
+     ‘sort -t CHAR’, without the ‘-b’ option of ‘sort’, to produce this
+     ordering.  If ‘join -t ''’ is specified, the whole line is
+     considered, matching the default operation of sort.  If ‘-t '\0'’
      is specified then the ASCII NUL character is used to delimit the
      fields.
 
-`-v FILE-NUMBER'
+‘-v FILE-NUMBER’
      Print a line for each unpairable line in file FILE-NUMBER (either
-     `1' or `2'), instead of the normal output.
+     ‘1’ or ‘2’), instead of the normal output.
 
+‘-z’
+‘--zero-terminated’
+     Delimit items with a zero byte rather than a newline (ASCII LF).
+     I.e., treat input as items separated by ASCII NUL and terminate
+     output items with ASCII NUL. This option can be useful in
+     conjunction with ‘perl -0’ or ‘find -print0’ and ‘xargs -0’ which
+     do the same in order to reliably handle arbitrary file names (even
+     those containing blanks or other special characters).
 
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
@@ -5087,7 +5103,7 @@ File: coreutils.info,  Node: Operating on characters,  Next: Directory listing,
 9 Operating on characters
 *************************
 
-This commands operate on individual characters.
+These commands operate on individual characters.
 
 * Menu:
 
@@ -5098,41 +5114,38 @@ This commands operate on individual characters.
 
 File: coreutils.info,  Node: tr invocation,  Next: expand invocation,  Up: Operating on characters
 
-9.1 `tr': Translate, squeeze, and/or delete characters
+9.1 ‘tr’: Translate, squeeze, and/or delete characters
 ======================================================
 
 Synopsis:
 
-     tr [OPTION]... SET1 [SET2]
+     tr [OPTION]… SET1 [SET2]
 
-   `tr' copies standard input to standard output, performing one of the
+   ‘tr’ copies standard input to standard output, performing one of the
 following operations:
 
-   * translate, and optionally squeeze repeated characters in the
+   • translate, and optionally squeeze repeated characters in the
      result,
-
-   * squeeze repeated characters,
-
-   * delete characters,
-
-   * delete characters, then squeeze repeated characters from the
+   • squeeze repeated characters,
+   • delete characters,
+   • delete characters, then squeeze repeated characters from the
      result.
 
    The SET1 and (if given) SET2 arguments define ordered sets of
 characters, referred to below as SET1 and SET2.  These sets are the
-characters of the input that `tr' operates on.  The `--complement'
-(`-c', `-C') option replaces SET1 with its complement (all of the
+characters of the input that ‘tr’ operates on.  The ‘--complement’
+(‘-c’, ‘-C’) option replaces SET1 with its complement (all of the
 characters that are not in SET1).
 
-   Currently `tr' fully supports only single-byte characters.
-Eventually it will support multibyte characters; when it does, the `-C'
-option will cause it to complement the set of characters, whereas `-c'
+   Currently ‘tr’ fully supports only single-byte characters.
+Eventually it will support multibyte characters; when it does, the ‘-C’
+option will cause it to complement the set of characters, whereas ‘-c’
 will cause it to complement the set of values.  This distinction will
 matter only when some values are not characters, and this is possible
 only in locales using multibyte encodings when the input contains
 encoding errors.
 
-   The program accepts the `--help' and `--version' options.  *Note
+   The program accepts the ‘--help’ and ‘--version’ options.  *Note
 Common options::.  Options must precede operands.
 
    An exit status of zero indicates success, and a nonzero value
@@ -5158,128 +5171,113 @@ for convenience.  Some of them can be used only in SET1 or SET2, as
 noted below.
 
 Backslash escapes
+
      The following backslash escape sequences are recognized:
 
-    `\a'
+     ‘\a’
           Control-G.
-
-    `\b'
+     ‘\b’
           Control-H.
-
-    `\f'
+     ‘\f’
           Control-L.
-
-    `\n'
+     ‘\n’
           Control-J.
-
-    `\r'
+     ‘\r’
           Control-M.
-
-    `\t'
+     ‘\t’
           Control-I.
-
-    `\v'
+     ‘\v’
           Control-K.
-
-    `\OOO'
-          The 8-bit character with the value given by OOO, which is 1
-          to 3 octal digits.  Note that `\400' is interpreted as the
-          two-byte sequence, `\040' `0'.
-
-    `\\'
+     ‘\OOO’
+          The 8-bit character with the value given by OOO, which is 1 to
+          3 octal digits.  Note that ‘\400’ is interpreted as the
+          two-byte sequence, ‘\040’ ‘0’.
+     ‘\\’
           A backslash.
 
      While a backslash followed by a character not listed above is
      interpreted as that character, the backslash also effectively
-     removes any special significance, so it is useful to escape `[',
-     `]', `*', and `-'.
+     removes any special significance, so it is useful to escape ‘[’,
+     ‘]’, ‘*’, and ‘-’.
 
 Ranges
-     The notation `M-N' expands to all of the characters from M through
-     N, in ascending order.  M should collate before N; if it doesn't,
-     an error results.  As an example, `0-9' is the same as
-     `0123456789'.
 
-     GNU `tr' does not support the System V syntax that uses square
+     The notation ‘M-N’ expands to all of the characters from M through
+     N, in ascending order.  M should collate before N; if it doesn’t,
+     an error results.  As an example, ‘0-9’ is the same as
+     ‘0123456789’.
+
+     GNU ‘tr’ does not support the System V syntax that uses square
      brackets to enclose ranges.  Translations specified in that format
      sometimes work as expected, since the brackets are often
      transliterated to themselves.  However, they should be avoided
-     because they sometimes behave unexpectedly.  For example, `tr -d
-     '[0-9]'' deletes brackets as well as digits.
+     because they sometimes behave unexpectedly.  For example, ‘tr -d
+     '[0-9]'’ deletes brackets as well as digits.
 
      Many historically common and even accepted uses of ranges are not
-     portable.  For example, on EBCDIC hosts using the `A-Z' range will
-     not do what most would expect because `A' through `Z' are not
+     portable.  For example, on EBCDIC hosts using the ‘A-Z’ range will
+     not do what most would expect because ‘A’ through ‘Z’ are not
      contiguous as they are in ASCII.  If you can rely on a POSIX
-     compliant version of `tr', then the best way to work around this
-     is to use character classes (see below).  Otherwise, it is most
+     compliant version of ‘tr’, then the best way to work around this is
+     to use character classes (see below).  Otherwise, it is most
      portable (and most ugly) to enumerate the members of the ranges.
 
 Repeated characters
-     The notation `[C*N]' in SET2 expands to N copies of character C.
-     Thus, `[y*6]' is the same as `yyyyyy'.  The notation `[C*]' in
+
+     The notation ‘[C*N]’ in SET2 expands to N copies of character C.
+     Thus, ‘[y*6]’ is the same as ‘yyyyyy’.  The notation ‘[C*]’ in
      STRING2 expands to as many copies of C as are needed to make SET2
-     as long as SET1.  If N begins with `0', it is interpreted in
-     octal, otherwise in decimal.
+     as long as SET1.  If N begins with ‘0’, it is interpreted in octal,
+     otherwise in decimal.
 
 Character classes
-     The notation `[:CLASS:]' expands to all of the characters in the
+
+     The notation ‘[:CLASS:]’ expands to all of the characters in the
      (predefined) class CLASS.  The characters expand in no particular
-     order, except for the `upper' and `lower' classes, which expand in
-     ascending order.  When the `--delete' (`-d') and
-     `--squeeze-repeats' (`-s') options are both given, any character
+     order, except for the ‘upper’ and ‘lower’ classes, which expand in
+     ascending order.  When the ‘--delete’ (‘-d’) and
+     ‘--squeeze-repeats’ (‘-s’) options are both given, any character
      class can be used in SET2.  Otherwise, only the character classes
-     `lower' and `upper' are accepted in SET2, and then only if the
-     corresponding character class (`upper' and `lower', respectively)
+     ‘lower’ and ‘upper’ are accepted in SET2, and then only if the
+     corresponding character class (‘upper’ and ‘lower’, respectively)
      is specified in the same relative position in SET1.  Doing this
      specifies case conversion.  The class names are given below; an
      error results when an invalid class name is given.
 
-    `alnum'
+     ‘alnum’
           Letters and digits.
-
-    `alpha'
+     ‘alpha’
           Letters.
-
-    `blank'
+     ‘blank’
           Horizontal whitespace.
-
-    `cntrl'
+     ‘cntrl’
           Control characters.
-
-    `digit'
+     ‘digit’
           Digits.
-
-    `graph'
+     ‘graph’
           Printable characters, not including space.
-
-    `lower'
+     ‘lower’
           Lowercase letters.
-
-    `print'
+     ‘print’
           Printable characters, including space.
-
-    `punct'
+     ‘punct’
           Punctuation characters.
-
-    `space'
+     ‘space’
           Horizontal or vertical whitespace.
-
-    `upper'
+     ‘upper’
           Uppercase letters.
-
-    `xdigit'
+     ‘xdigit’
           Hexadecimal digits.
 
 Equivalence classes
-     The syntax `[=C=]' expands to all of the characters that are
-     equivalent to C, in no particular order.  Equivalence classes are
-     a relatively recent invention intended to support non-English
-     alphabets.  But there seems to be no standard way to define them
-     or determine their contents.  Therefore, they are not fully
-     implemented in GNU `tr'; each character's equivalence class
-     consists only of that character, which is of no particular use.
 
+     The syntax ‘[=C=]’ expands to all of the characters that are
+     equivalent to C, in no particular order.  Equivalence classes are a
+     relatively recent invention intended to support non-English
+     alphabets.  But there seems to be no standard way to define them or
+     determine their contents.  Therefore, they are not fully
+     implemented in GNU ‘tr’; each character’s equivalence class
+     consists only of that character, which is of no particular use.
 
 
 File: coreutils.info,  Node: Translating,  Next: Squeezing,  Prev: Character sets,  Up: tr invocation
@@ -5287,8 +5285,8 @@ File: coreutils.info,  Node: Translating,  Next: Squeezing,  Prev: Character set
 9.1.2 Translating
 -----------------
 
-`tr' performs translation when SET1 and SET2 are both given and the
-`--delete' (`-d') option is not given.  `tr' translates each character
+‘tr’ performs translation when SET1 and SET2 are both given and the
+‘--delete’ (‘-d’) option is not given.  ‘tr’ translates each character
 of its input that is in SET1 to the corresponding character in SET2.
 Characters not in SET1 are passed through unchanged.  When a character
 appears more than once in SET1 and the corresponding characters in SET2
@@ -5298,41 +5296,41 @@ two commands are equivalent:
      tr aaa xyz
      tr a z
 
-   A common use of `tr' is to convert lowercase characters to
-uppercase.  This can be done in many ways.  Here are three of them:
+   A common use of ‘tr’ is to convert lowercase characters to uppercase.
+This can be done in many ways.  Here are three of them:
 
      tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ
      tr a-z A-Z
      tr '[:lower:]' '[:upper:]'
 
-But note that using ranges like `a-z' above is not portable.
+But note that using ranges like ‘a-z’ above is not portable.
 
-   When `tr' is performing translation, SET1 and SET2 typically have
-the same length.  If SET1 is shorter than SET2, the extra characters at
-the end of SET2 are ignored.
+   When ‘tr’ is performing translation, SET1 and SET2 typically have the
+same length.  If SET1 is shorter than SET2, the extra characters at the
+end of SET2 are ignored.
 
    On the other hand, making SET1 longer than SET2 is not portable;
-POSIX says that the result is undefined.  In this situation, BSD `tr'
+POSIX says that the result is undefined.  In this situation, BSD ‘tr’
 pads SET2 to the length of SET1 by repeating the last character of SET2
-as many times as necessary.  System V `tr' truncates SET1 to the length
+as many times as necessary.  System V ‘tr’ truncates SET1 to the length
 of SET2.
 
-   By default, GNU `tr' handles this case like BSD `tr'.  When the
-`--truncate-set1' (`-t') option is given, GNU `tr' handles this case
-like the System V `tr' instead.  This option is ignored for operations
+   By default, GNU ‘tr’ handles this case like BSD ‘tr’.  When the
+‘--truncate-set1’ (‘-t’) option is given, GNU ‘tr’ handles this case
+like the System V ‘tr’ instead.  This option is ignored for operations
 other than translation.
 
-   Acting like System V `tr' in this case breaks the relatively common
+   Acting like System V ‘tr’ in this case breaks the relatively common
 BSD idiom:
 
      tr -cs A-Za-z0-9 '\012'
 
-because it converts only zero bytes (the first element in the
-complement of SET1), rather than all non-alphanumerics, to newlines.
+because it converts only zero bytes (the first element in the complement
+of SET1), rather than all non-alphanumerics, to newlines.
 
 By the way, the above idiom is not portable because it uses ranges, and
 it assumes that the octal code for newline is 012.  Assuming a POSIX
-compliant `tr', here is a better way to write it:
+compliant ‘tr’, here is a better way to write it:
 
      tr -cs '[:alnum:]' '[\n*]'
 
@@ -5342,45 +5340,45 @@ File: coreutils.info,  Node: Squeezing,  Prev: Translating,  Up: tr invocation
 9.1.3 Squeezing repeats and deleting
 ------------------------------------
 
-When given just the `--delete' (`-d') option, `tr' removes any input
+When given just the ‘--delete’ (‘-d’) option, ‘tr’ removes any input
 characters that are in SET1.
 
-   When given just the `--squeeze-repeats' (`-s') option, `tr' replaces
+   When given just the ‘--squeeze-repeats’ (‘-s’) option, ‘tr’ replaces
 each input sequence of a repeated character that is in SET1 with a
 single occurrence of that character.
 
-   When given both `--delete' and `--squeeze-repeats', `tr' first
+   When given both ‘--delete’ and ‘--squeeze-repeats’, ‘tr’ first
 performs any deletions using SET1, then squeezes repeats from any
 remaining characters using SET2.
 
-   The `--squeeze-repeats' option may also be used when translating, in
-which case `tr' first performs translation, then squeezes repeats from
+   The ‘--squeeze-repeats’ option may also be used when translating, in
+which case ‘tr’ first performs translation, then squeezes repeats from
 any remaining characters using SET2.
 
    Here are some examples to illustrate various combinations of options:
 
-   * Remove all zero bytes:
+   • Remove all zero bytes:
 
           tr -d '\0'
 
-   * Put all words on lines by themselves.  This converts all
+   • Put all words on lines by themselves.  This converts all
      non-alphanumeric characters to newlines, then squeezes each string
      of repeated newlines into a single newline:
 
           tr -cs '[:alnum:]' '[\n*]'
 
-   * Convert each sequence of repeated newlines to a single newline:
+   • Convert each sequence of repeated newlines to a single newline:
 
           tr -s '\n'
 
-   * Find doubled occurrences of words in a document.  For example,
-     people often write "the the" with the repeated words separated by
-     a newline.  The Bourne shell script below works first by
-     converting each sequence of punctuation and blank characters to a
-     single newline.  That puts each "word" on a line by itself.  Next
-     it maps all uppercase characters to lower case, and finally it
-     runs `uniq' with the `-d' option to print out only the words that
-     were repeated.
+   • Find doubled occurrences of words in a document.  For example,
+     people often write “the the� with the repeated words separated by a
+     newline.  The Bourne shell script below works first by converting
+     each sequence of punctuation and blank characters to a single
+     newline.  That puts each “word� on a line by itself.  Next it maps
+     all uppercase characters to lower case, and finally it runs ‘uniq’
+     with the ‘-d’ option to print out only the words that were
+     repeated.
 
           #!/bin/sh
           cat -- "$@" \
@@ -5388,93 +5386,89 @@ any remaining characters using SET2.
             | tr '[:upper:]' '[:lower:]' \
             | uniq -d
 
-   * Deleting a small set of characters is usually straightforward.
-     For example, to remove all `a's, `x's, and `M's you would do this:
+   • Deleting a small set of characters is usually straightforward.  For
+     example, to remove all ‘a’s, ‘x’s, and ‘M’s you would do this:
 
           tr -d axM
 
-     However, when `-' is one of those characters, it can be tricky
-     because `-' has special meanings.  Performing the same task as
-     above but also removing all `-' characters, we might try `tr -d
-     -axM', but that would fail because `tr' would try to interpret
-     `-a' as a command-line option.  Alternatively, we could try
-     putting the hyphen inside the string, `tr -d a-xM', but that
-     wouldn't work either because it would make `tr' interpret `a-x' as
-     the range of characters `a'...`x' rather than the three.  One way
-     to solve the problem is to put the hyphen at the end of the list
-     of characters:
+     However, when ‘-’ is one of those characters, it can be tricky
+     because ‘-’ has special meanings.  Performing the same task as
+     above but also removing all ‘-’ characters, we might try ‘tr -d
+     -axM’, but that would fail because ‘tr’ would try to interpret ‘-a’
+     as a command-line option.  Alternatively, we could try putting the
+     hyphen inside the string, ‘tr -d a-xM’, but that wouldn’t work
+     either because it would make ‘tr’ interpret ‘a-x’ as the range of
+     characters ‘a’…‘x’ rather than the three.  One way to solve the
+     problem is to put the hyphen at the end of the list of characters:
 
           tr -d axM-
 
-     Or you can use `--' to terminate option processing:
+     Or you can use ‘--’ to terminate option processing:
 
           tr -d -- -axM
 
-     More generally, use the character class notation `[=c=]' with `-'
-     (or any other character) in place of the `c':
+     More generally, use the character class notation ‘[=c=]’ with ‘-’
+     (or any other character) in place of the ‘c’:
 
           tr -d '[=-=]axM'
 
      Note how single quotes are used in the above example to protect the
      square brackets from interpretation by a shell.
 
-
 
 File: coreutils.info,  Node: expand invocation,  Next: unexpand invocation,  Prev: tr invocation,  Up: Operating on characters
 
-9.2 `expand': Convert tabs to spaces
+9.2 ‘expand’: Convert tabs to spaces
 ====================================
 
-`expand' writes the contents of each given FILE, or standard input if
-none are given or for a FILE of `-', to standard output, with tab
+‘expand’ writes the contents of each given FILE, or standard input if
+none are given or for a FILE of ‘-’, to standard output, with tab
 characters converted to the appropriate number of spaces.  Synopsis:
 
-     expand [OPTION]... [FILE]...
+     expand [OPTION]… [FILE]…
 
-   By default, `expand' converts all tabs to spaces.  It preserves
+   By default, ‘expand’ converts all tabs to spaces.  It preserves
 backspace characters in the output; they decrement the column count for
-tab calculations.  The default action is equivalent to `-t 8' (set tabs
+tab calculations.  The default action is equivalent to ‘-t 8’ (set tabs
 every 8 columns).
 
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-t TAB1[,TAB2]...'
-`--tabs=TAB1[,TAB2]...'
+‘-t TAB1[,TAB2]…’
+‘--tabs=TAB1[,TAB2]…’
      If only one tab stop is given, set the tabs TAB1 spaces apart
-     (default is 8).  Otherwise, set the tabs at columns TAB1, TAB2,
-     ... (numbered from 0), and replace any tabs beyond the last tab
-     stop given with single spaces.  Tab stops can be separated by
-     blanks as well as by commas.
+     (default is 8).  Otherwise, set the tabs at columns TAB1, TAB2, …
+     (numbered from 0), and replace any tabs beyond the last tab stop
+     given with single spaces.  Tab stops can be separated by blanks as
+     well as by commas.
 
-     For compatibility, GNU `expand' also accepts the obsolete option
-     syntax, `-T1[,T2]...'.  New scripts should use `-t T1[,T2]...'
-     instead.
+     For compatibility, GNU ‘expand’ also accepts the obsolete option
+     syntax, ‘-T1[,T2]…’.  New scripts should use ‘-t T1[,T2]…’ instead.
 
-`-i'
-`--initial'
+‘-i’
+‘--initial’
      Only convert initial tabs (those that precede all non-space or
      non-tab characters) on each line to spaces.
 
-
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
 
 
 File: coreutils.info,  Node: unexpand invocation,  Prev: expand invocation,  Up: Operating on characters
 
-9.3 `unexpand': Convert spaces to tabs
+9.3 ‘unexpand’: Convert spaces to tabs
 ======================================
 
-`unexpand' writes the contents of each given FILE, or standard input if
-none are given or for a FILE of `-', to standard output, converting
+‘unexpand’ writes the contents of each given FILE, or standard input if
+none are given or for a FILE of ‘-’, to standard output, converting
 blanks at the beginning of each line into as many tab characters as
 needed.  In the default POSIX locale, a "blank" is a space or a tab;
 other locales may specify additional blank characters.  Synopsis:
 
-     unexpand [OPTION]... [FILE]...
+     unexpand [OPTION]… [FILE]…
 
-   By default, `unexpand' converts only initial blanks (those that
+   By default, ‘unexpand’ converts only initial blanks (those that
 precede all non-blank characters) on each line.  It preserves backspace
 characters in the output; they decrement the column count for tab
 calculations.  By default, tabs are set at every 8th column.
@@ -5482,25 +5476,24 @@ calculations.  By default, tabs are set at every 8th column.
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-t TAB1[,TAB2]...'
-`--tabs=TAB1[,TAB2]...'
+‘-t TAB1[,TAB2]…’
+‘--tabs=TAB1[,TAB2]…’
      If only one tab stop is given, set the tabs TAB1 columns apart
-     instead of the default 8.  Otherwise, set the tabs at columns
-     TAB1, TAB2, ... (numbered from 0), and leave blanks beyond the tab
-     stops given unchanged.  Tab stops can be separated by blanks as
-     well as by commas.  This option implies the `-a' option.
-
-     For compatibility, GNU `unexpand' supports the obsolete option
-     syntax, `-TAB1[,TAB2]...', where tab stops must be separated by
-     commas.  (Unlike `-t', this obsolete option does not imply `-a'.)
-     New scripts should use `--first-only -t TAB1[,TAB2]...' instead.
-
-`-a'
-`--all'
+     instead of the default 8.  Otherwise, set the tabs at columns TAB1,
+     TAB2, … (numbered from 0), and leave blanks beyond the tab stops
+     given unchanged.  Tab stops can be separated by blanks as well as
+     by commas.  This option implies the ‘-a’ option.
+
+     For compatibility, GNU ‘unexpand’ supports the obsolete option
+     syntax, ‘-TAB1[,TAB2]…’, where tab stops must be separated by
+     commas.  (Unlike ‘-t’, this obsolete option does not imply ‘-a’.)
+     New scripts should use ‘--first-only -t TAB1[,TAB2]…’ instead.
+
+‘-a’
+‘--all’
      Also convert all sequences of two or more blanks just before a tab
      stop, even if they occur after non-blank characters in a line.
 
-
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
 
@@ -5510,8 +5503,8 @@ File: coreutils.info,  Node: Directory listing,  Next: Basic operations,  Prev:
 10 Directory listing
 ********************
 
-This chapter describes the `ls' command and its variants `dir' and
-`vdir', which list information about files.
+This chapter describes the ‘ls’ command and its variants ‘dir’ and
+‘vdir’, which list information about files.
 
 * Menu:
 
@@ -5523,31 +5516,31 @@ This chapter describes the `ls' command and its variants `dir' and
 
 File: coreutils.info,  Node: ls invocation,  Next: dir invocation,  Up: Directory listing
 
-10.1 `ls': List directory contents
+10.1 ‘ls’: List directory contents
 ==================================
 
-The `ls' program lists information about files (of any type, including
-directories).  Options and file arguments can be intermixed
-arbitrarily, as usual.
+The ‘ls’ program lists information about files (of any type, including
+directories).  Options and file arguments can be intermixed arbitrarily,
+as usual.
 
    For non-option command-line arguments that are directories, by
-default `ls' lists the contents of directories, not recursively, and
-omitting files with names beginning with `.'.  For other non-option
-arguments, by default `ls' lists just the file name.  If no non-option
-argument is specified, `ls' operates on the current directory, acting
-as if it had been invoked with a single argument of `.'.
+default ‘ls’ lists the contents of directories, not recursively, and
+omitting files with names beginning with ‘.’.  For other non-option
+arguments, by default ‘ls’ lists just the file name.  If no non-option
+argument is specified, ‘ls’ operates on the current directory, acting as
+if it had been invoked with a single argument of ‘.’.
 
    By default, the output is sorted alphabetically, according to the
-locale settings in effect.(1) If standard output is a terminal, the
+locale settings in effect.(1)  If standard output is a terminal, the
 output is in columns (sorted vertically) and control characters are
 output as question marks; otherwise, the output is listed one per line
 and control characters are output as-is.
 
-   Because `ls' is such a fundamental program, it has accumulated many
+   Because ‘ls’ is such a fundamental program, it has accumulated many
 options over the years.  They are described in the subsections below;
 within each section, options are listed alphabetically (ignoring case).
 The division of options into the subsections is not absolute, since some
-options affect more than one aspect of `ls''s operation.
+options affect more than one aspect of ‘ls’’s operation.
 
    Exit status:
 
@@ -5573,10 +5566,10 @@ options affect more than one aspect of `ls''s operation.
 
    ---------- Footnotes ----------
 
-   (1) If you use a non-POSIX locale (e.g., by setting `LC_ALL' to
-`en_US'), then `ls' may produce output that is sorted differently than
-you're accustomed to.  In that case, set the `LC_ALL' environment
-variable to `C'.
+   (1) If you use a non-POSIX locale (e.g., by setting ‘LC_ALL’ to
+‘en_US’), then ‘ls’ may produce output that is sorted differently than
+you’re accustomed to.  In that case, set the ‘LC_ALL’ environment
+variable to ‘C’.
 
 
 File: coreutils.info,  Node: Which files are listed,  Next: What information is listed,  Up: ls invocation
@@ -5584,72 +5577,71 @@ File: coreutils.info,  Node: Which files are listed,  Next: What information is
 10.1.1 Which files are listed
 -----------------------------
 
-These options determine which files `ls' lists information for.  By
-default, `ls' lists files and the contents of any directories on the
+These options determine which files ‘ls’ lists information for.  By
+default, ‘ls’ lists files and the contents of any directories on the
 command line, except that in directories it ignores files whose names
-start with `.'.
+start with ‘.’.
 
-`-a'
-`--all'
-     In directories, do not ignore file names that start with `.'.
+‘-a’
+‘--all’
+     In directories, do not ignore file names that start with ‘.’.
 
-`-A'
-`--almost-all'
-     In directories, do not ignore all file names that start with `.';
-     ignore only `.' and `..'.  The `--all' (`-a') option overrides
-     this option.
+‘-A’
+‘--almost-all’
+     In directories, do not ignore all file names that start with ‘.’;
+     ignore only ‘.’ and ‘..’.  The ‘--all’ (‘-a’) option overrides this
+     option.
 
-`-B'
-`--ignore-backups'
-     In directories, ignore files that end with `~'.  This option is
-     equivalent to `--ignore='*~' --ignore='.*~''.
+‘-B’
+‘--ignore-backups’
+     In directories, ignore files that end with ‘~’.  This option is
+     equivalent to ‘--ignore='*~' --ignore='.*~'’.
 
-`-d'
-`--directory'
+‘-d’
+‘--directory’
      List just the names of directories, as with other types of files,
      rather than listing their contents.  Do not follow symbolic links
-     listed on the command line unless the `--dereference-command-line'
-     (`-H'), `--dereference' (`-L'), or
-     `--dereference-command-line-symlink-to-dir' options are specified.
+     listed on the command line unless the ‘--dereference-command-line’
+     (‘-H’), ‘--dereference’ (‘-L’), or
+     ‘--dereference-command-line-symlink-to-dir’ options are specified.
 
-`-H'
-`--dereference-command-line'
+‘-H’
+‘--dereference-command-line’
      If a command line argument specifies a symbolic link, show
      information for the file the link references rather than for the
      link itself.
 
-`--dereference-command-line-symlink-to-dir'
-     Do not dereference symbolic links, with one exception: if a
-     command line argument specifies a symbolic link that refers to a
-     directory, show information for that directory rather than for the
-     link itself.  This is the default behavior when no other
-     dereferencing-related option has been specified (`--classify'
-     (`-F'), `--directory' (`-d'), (`-l'), `--dereference' (`-L'), or
-     `--dereference-command-line' (`-H')).
+‘--dereference-command-line-symlink-to-dir’
+     Do not dereference symbolic links, with one exception: if a command
+     line argument specifies a symbolic link that refers to a directory,
+     show information for that directory rather than for the link
+     itself.  This is the default behavior when no other
+     dereferencing-related option has been specified (‘--classify’
+     (‘-F’), ‘--directory’ (‘-d’), (‘-l’), ‘--dereference’ (‘-L’), or
+     ‘--dereference-command-line’ (‘-H’)).
 
-`--group-directories-first'
+‘--group-directories-first’
      Group all the directories before the files and then sort the
      directories and the files separately using the selected sort key
-     (see -sort option).  That is, this option specifies a primary sort
-     key, and the -sort option specifies a secondary key.  However, any
-     use of `--sort=none' (`-U') disables this option altogether.
+     (see –sort option).  That is, this option specifies a primary sort
+     key, and the –sort option specifies a secondary key.  However, any
+     use of ‘--sort=none’ (‘-U’) disables this option altogether.
 
-`--hide=PATTERN'
+‘--hide=PATTERN’
      In directories, ignore files whose names match the shell pattern
-     PATTERN, unless the `--all' (`-a') or `--almost-all' (`-A') is
-     also given.  This option acts like `--ignore=PATTERN' except that
-     it has no effect if `--all' (`-a') or `--almost-all' (`-A') is
-     also given.
-
-     This option can be useful in shell aliases.  For example, if `lx'
-     is an alias for `ls --hide='*~'' and `ly' is an alias for `ls
-     --ignore='*~'', then the command `lx -A' lists the file `README~'
-     even though `ly -A' would not.
-
-`-I PATTERN'
-`--ignore=PATTERN'
+     PATTERN, unless the ‘--all’ (‘-a’) or ‘--almost-all’ (‘-A’) is also
+     given.  This option acts like ‘--ignore=PATTERN’ except that it has
+     no effect if ‘--all’ (‘-a’) or ‘--almost-all’ (‘-A’) is also given.
+
+     This option can be useful in shell aliases.  For example, if ‘lx’
+     is an alias for ‘ls --hide='*~'’ and ‘ly’ is an alias for ‘ls
+     --ignore='*~'’, then the command ‘lx -A’ lists the file ‘README~’
+     even though ‘ly -A’ would not.
+
+‘-I PATTERN’
+‘--ignore=PATTERN’
      In directories, ignore files whose names match the shell pattern
-     (not regular expression) PATTERN.  As in the shell, an initial `.'
+     (not regular expression) PATTERN.  As in the shell, an initial ‘.’
      in a file name does not match a wildcard at the start of PATTERN.
      Sometimes it is useful to give this option several times.  For
      example,
@@ -5657,41 +5649,40 @@ start with `.'.
           $ ls --ignore='.??*' --ignore='.[^.]' --ignore='#*'
 
      The first option ignores names of length 3 or more that start with
-     `.', the second ignores all two-character names that start with `.'
-     except `..', and the third ignores names that start with `#'.
+     ‘.’, the second ignores all two-character names that start with ‘.’
+     except ‘..’, and the third ignores names that start with ‘#’.
 
-`-L'
-`--dereference'
+‘-L’
+‘--dereference’
      When showing file information for a symbolic link, show information
      for the file the link references rather than the link itself.
-     However, even with this option, `ls' still prints the name of the
+     However, even with this option, ‘ls’ still prints the name of the
      link itself, not the name of the file that the link points to.
 
-`-R'
-`--recursive'
+‘-R’
+‘--recursive’
      List the contents of all directories recursively.
 
-
 
 File: coreutils.info,  Node: What information is listed,  Next: Sorting the output,  Prev: Which files are listed,  Up: ls invocation
 
 10.1.2 What information is listed
 ---------------------------------
 
-These options affect the information that `ls' displays.  By default,
+These options affect the information that ‘ls’ displays.  By default,
 only file names are shown.
 
-`--author'
-     List each file's author when producing long format directory
+‘--author’
+     List each file’s author when producing long format directory
      listings.  In GNU/Hurd, file authors can differ from their owners,
      but in other operating systems the two are the same.
 
-`-D'
-`--dired'
-     With the long listing (`-l') format, print an additional line after
+‘-D’
+‘--dired’
+     With the long listing (‘-l’) format, print an additional line after
      the main output:
 
-          //DIRED// BEG1 END1 BEG2 END2 ...
+          //DIRED// BEG1 END1 BEG2 END2 …
 
      The BEGN and ENDN are unsigned integers that record the byte
      position of the beginning and end of each file name in the output.
@@ -5699,10 +5690,10 @@ only file names are shown.
      contain unusual characters such as space or newline, without fancy
      searching.
 
-     If directories are being listed recursively (`-R'), output a
+     If directories are being listed recursively (‘-R’), output a
      similar line with offsets for each subdirectory name:
 
-          //SUBDIRED// BEG1 END1 ...
+          //SUBDIRED// BEG1 END1 …
 
      Finally, output a line of the form:
 
@@ -5738,22 +5729,22 @@ only file names are shown.
           //SUBDIRED// 2 3 167 172 228 240 290 296
           //DIRED-OPTIONS// --quoting-style=literal
 
-     Note that the pairs of offsets on the `//DIRED//' line above
-     delimit these names: `f1', `f2', `sub', `sub2', `deeper', `file'.
-     The offsets on the `//SUBDIRED//' line delimit the following
-     directory names: `a', `a/sub', `a/sub/deeper', `a/sub2'.
+     Note that the pairs of offsets on the ‘//DIRED//’ line above
+     delimit these names: ‘f1’, ‘f2’, ‘sub’, ‘sub2’, ‘deeper’, ‘file’.
+     The offsets on the ‘//SUBDIRED//’ line delimit the following
+     directory names: ‘a’, ‘a/sub’, ‘a/sub/deeper’, ‘a/sub2’.
 
      Here is an example of how to extract the fifth entry name,
-     `deeper', corresponding to the pair of offsets, 222 and 228:
+     ‘deeper’, corresponding to the pair of offsets, 222 and 228:
 
           $ ls -gloRF --dired a > out
           $ dd bs=1 skip=222 count=6 < out 2>/dev/null; echo
           deeper
 
      Note that although the listing above includes a trailing slash for
-     the `deeper' entry, the offsets select the name without the
-     trailing slash.  However, if you invoke `ls' with `--dired' along
-     with an option like `--escape' (aka `-b') and operate on a file
+     the ‘deeper’ entry, the offsets select the name without the
+     trailing slash.  However, if you invoke ‘ls’ with ‘--dired’ along
+     with an option like ‘--escape’ (aka ‘-b’) and operate on a file
      whose name contains special characters, notice that the backslash
      _is_ included:
 
@@ -5764,45 +5755,45 @@ only file names are shown.
           //DIRED-OPTIONS// --quoting-style=escape
 
      If you use a quoting style that adds quote marks (e.g.,
-     `--quoting-style=c'), then the offsets include the quote marks.
-     So beware that the user may select the quoting style via the
-     environment variable `QUOTING_STYLE'.  Hence, applications using
-     `--dired' should either specify an explicit
-     `--quoting-style=literal' option (aka `-N' or `--literal') on the
+     ‘--quoting-style=c’), then the offsets include the quote marks.  So
+     beware that the user may select the quoting style via the
+     environment variable ‘QUOTING_STYLE’.  Hence, applications using
+     ‘--dired’ should either specify an explicit
+     ‘--quoting-style=literal’ option (aka ‘-N’ or ‘--literal’) on the
      command line, or else be prepared to parse the escaped names.
 
-`--full-time'
-     Produce long format directory listings, and list times in full.
-     It is equivalent to using `--format=long' with
-     `--time-style=full-iso' (*note Formatting file timestamps::).
+‘--full-time’
+     Produce long format directory listings, and list times in full.  It
+     is equivalent to using ‘--format=long’ with ‘--time-style=full-iso’
+     (*note Formatting file timestamps::).
 
-`-g'
-     Produce long format directory listings, but don't display owner
+‘-g’
+     Produce long format directory listings, but don’t display owner
      information.
 
-`-G'
-`--no-group'
+‘-G’
+‘--no-group’
      Inhibit display of group information in a long format directory
-     listing.  (This is the default in some non-GNU versions of `ls',
-     so we provide this option for compatibility.)
-
-`-h'
-`--human-readable'
-     Append a size letter to each size, such as `M' for mebibytes.
-     Powers of 1024 are used, not 1000; `M' stands for 1,048,576 bytes.
-     This option is equivalent to `--block-size=human-readable'.  Use
-     the `--si' option if you prefer powers of 1000.
-
-`-i'
-`--inode'
+     listing.  (This is the default in some non-GNU versions of ‘ls’, so
+     we provide this option for compatibility.)
+
+‘-h’
+‘--human-readable’
+     Append a size letter to each size, such as ‘M’ for mebibytes.
+     Powers of 1024 are used, not 1000; ‘M’ stands for 1,048,576 bytes.
+     This option is equivalent to ‘--block-size=human-readable’.  Use
+     the ‘--si’ option if you prefer powers of 1000.
+
+‘-i’
+‘--inode’
      Print the inode number (also called the file serial number and
      index number) of each file to the left of the file name.  (This
      number uniquely identifies each file within a particular file
      system.)
 
-`-l'
-`--format=long'
-`--format=verbose'
+‘-l’
+‘--format=long’
+‘--format=verbose’
      In addition to the name of each file, print the file type, file
      mode bits, number of hard links, owner name, group name, size, and
      timestamp (*note Formatting file timestamps::), normally the
@@ -5810,140 +5801,126 @@ only file names are shown.
      cannot be determined.
 
      Normally the size is printed as a byte count without punctuation,
-     but this can be overridden (*note Block size::).  For example, `-h'
+     but this can be overridden (*note Block size::).  For example, ‘-h’
      prints an abbreviated, human-readable count, and
-     `--block-size="'1"' prints a byte count with the thousands
+     ‘--block-size="'1"’ prints a byte count with the thousands
      separator of the current locale.
 
      For each directory that is listed, preface the files with a line
-     `total BLOCKS', where BLOCKS is the total disk allocation for all
+     ‘total BLOCKS’, where BLOCKS is the total disk allocation for all
      files in that directory.  The block size currently defaults to 1024
-     bytes, but this can be overridden (*note Block size::).  The
-     BLOCKS computed counts each hard link separately; this is arguably
-     a deficiency.
+     bytes, but this can be overridden (*note Block size::).  The BLOCKS
+     computed counts each hard link separately; this is arguably a
+     deficiency.
 
      The file type is one of the following characters:
 
-    `-'
+     ‘-’
           regular file
-
-    `b'
+     ‘b’
           block special file
-
-    `c'
+     ‘c’
           character special file
-
-    `C'
-          high performance ("contiguous data") file
-
-    `d'
+     ‘C’
+          high performance (“contiguous data�) file
+     ‘d’
           directory
-
-    `D'
+     ‘D’
           door (Solaris 2.5 and up)
-
-    `l'
+     ‘l’
           symbolic link
-
-    `M'
-          off-line ("migrated") file (Cray DMF)
-
-    `n'
+     ‘M’
+          off-line (“migrated�) file (Cray DMF)
+     ‘n’
           network special file (HP-UX)
-
-    `p'
+     ‘p’
           FIFO (named pipe)
-
-    `P'
+     ‘P’
           port (Solaris 10 and up)
-
-    `s'
+     ‘s’
           socket
-
-    `?'
+     ‘?’
           some other file type
 
      The file mode bits listed are similar to symbolic mode
-     specifications (*note Symbolic Modes::).  But `ls' combines
+     specifications (*note Symbolic Modes::).  But ‘ls’ combines
      multiple bits into the third character of each set of permissions
      as follows:
 
-    `s'
+     ‘s’
           If the set-user-ID or set-group-ID bit and the corresponding
           executable bit are both set.
 
-    `S'
+     ‘S’
           If the set-user-ID or set-group-ID bit is set but the
           corresponding executable bit is not set.
 
-    `t'
+     ‘t’
           If the restricted deletion flag or sticky bit, and the
           other-executable bit, are both set.  The restricted deletion
           flag is another name for the sticky bit.  *Note Mode
           Structure::.
 
-    `T'
+     ‘T’
           If the restricted deletion flag or sticky bit is set but the
           other-executable bit is not set.
 
-    `x'
+     ‘x’
           If the executable bit is set and none of the above apply.
 
-    `-'
+     ‘-’
           Otherwise.
 
      Following the file mode bits is a single character that specifies
      whether an alternate access method such as an access control list
      applies to the file.  When the character following the file mode
-     bits is a space, there is no alternate access method.  When it is
-     a printing character, then there is such a method.
+     bits is a space, there is no alternate access method.  When it is a
+     printing character, then there is such a method.
 
-     GNU `ls' uses a `.' character to indicate a file with an SELinux
-     security context, but no other alternate access method.
+     GNU ‘ls’ uses a ‘.’ character to indicate a file with a security
+     context, but no other alternate access method.
 
      A file with any other combination of alternate access methods is
-     marked with a `+' character.
+     marked with a ‘+’ character.
 
-`-n'
-`--numeric-uid-gid'
+‘-n’
+‘--numeric-uid-gid’
      Produce long format directory listings, but display numeric user
      and group IDs instead of the owner and group names.
 
-`-o'
-     Produce long format directory listings, but don't display group
-     information.  It is equivalent to using `--format=long' with
-     `--no-group' .
+‘-o’
+     Produce long format directory listings, but don’t display group
+     information.  It is equivalent to using ‘--format=long’ with
+     ‘--no-group’ .
 
-`-s'
-`--size'
+‘-s’
+‘--size’
      Print the disk allocation of each file to the left of the file
      name.  This is the amount of disk space used by the file, which is
-     usually a bit more than the file's size, but it can be less if the
+     usually a bit more than the file’s size, but it can be less if the
      file has holes.
 
-     Normally the disk allocation is printed in units of 1024 bytes,
-     but this can be overridden (*note Block size::).
+     Normally the disk allocation is printed in units of 1024 bytes, but
+     this can be overridden (*note Block size::).
 
      For files that are NFS-mounted from an HP-UX system to a BSD
-     system, this option reports sizes that are half the correct
-     values.  On HP-UX systems, it reports sizes that are twice the
-     correct values for files that are NFS-mounted from BSD systems.
-     This is due to a flaw in HP-UX; it also affects the HP-UX `ls'
-     program.
-
-`--si'
-     Append an SI-style abbreviation to each size, such as `M' for
-     megabytes.  Powers of 1000 are used, not 1024; `M' stands for
-     1,000,000 bytes.  This option is equivalent to `--block-size=si'.
-     Use the `-h' or `--human-readable' option if you prefer powers of
+     system, this option reports sizes that are half the correct values.
+     On HP-UX systems, it reports sizes that are twice the correct
+     values for files that are NFS-mounted from BSD systems.  This is
+     due to a flaw in HP-UX; it also affects the HP-UX ‘ls’ program.
+
+‘--si’
+     Append an SI-style abbreviation to each size, such as ‘M’ for
+     megabytes.  Powers of 1000 are used, not 1024; ‘M’ stands for
+     1,000,000 bytes.  This option is equivalent to ‘--block-size=si’.
+     Use the ‘-h’ or ‘--human-readable’ option if you prefer powers of
      1024.
 
-`-Z'
-`--context'
-     Display the SELinux security context or `?' if none is found.
-     When used with the `-l' option, print the security context to the
-     left of the size column.
-
+‘-Z’
+‘--context’
+     Display the SELinux security context or ‘?’ if none is found.  When
+     used with the ‘-l’ option, print the security context to the left
+     of the size column.
 
 
 File: coreutils.info,  Node: Sorting the output,  Next: Details about version sort,  Prev: What information is listed,  Up: ls invocation
@@ -5951,67 +5928,66 @@ File: coreutils.info,  Node: Sorting the output,  Next: Details about version so
 10.1.3 Sorting the output
 -------------------------
 
-These options change the order in which `ls' sorts the information it
+These options change the order in which ‘ls’ sorts the information it
 outputs.  By default, sorting is done by character code (e.g., ASCII
 order).
 
-`-c'
-`--time=ctime'
-`--time=status'
-     If the long listing format (e.g., `-l', `-o') is being used, print
-     the status change time (the `ctime' in the inode) instead of the
-     modification time.  When explicitly sorting by time (`--sort=time'
-     or `-t') or when not using a long listing format, sort according
-     to the status change time.
-
-`-f'
-     Primarily, like `-U'--do not sort; list the files in whatever
-     order they are stored in the directory.  But also enable `-a' (list
-     all files) and disable `-l', `--color', and `-s' (if they were
-     specified before the `-f').
-
-`-r'
-`--reverse'
-     Reverse whatever the sorting method is--e.g., list files in reverse
+‘-c’
+‘--time=ctime’
+‘--time=status’
+     If the long listing format (e.g., ‘-l’, ‘-o’) is being used, print
+     the status change time (the ‘ctime’ in the inode) instead of the
+     modification time.  When explicitly sorting by time (‘--sort=time’
+     or ‘-t’) or when not using a long listing format, sort according to
+     the status change time.
+
+‘-f’
+     Primarily, like ‘-U’—do not sort; list the files in whatever order
+     they are stored in the directory.  But also enable ‘-a’ (list all
+     files) and disable ‘-l’, ‘--color’, and ‘-s’ (if they were
+     specified before the ‘-f’).
+
+‘-r’
+‘--reverse’
+     Reverse whatever the sorting method is—e.g., list files in reverse
      alphabetical order, youngest first, smallest first, or whatever.
 
-`-S'
-`--sort=size'
+‘-S’
+‘--sort=size’
      Sort by file size, largest first.
 
-`-t'
-`--sort=time'
-     Sort by modification time (the `mtime' in the inode), newest first.
-
-`-u'
-`--time=atime'
-`--time=access'
-`--time=use'
-     If the long listing format (e.g., `--format=long') is being used,
-     print the last access time (the `atime' in the inode).  When
-     explicitly sorting by time (`--sort=time' or `-t') or when not
+‘-t’
+‘--sort=time’
+     Sort by modification time (the ‘mtime’ in the inode), newest first.
+
+‘-u’
+‘--time=atime’
+‘--time=access’
+‘--time=use’
+     If the long listing format (e.g., ‘--format=long’) is being used,
+     print the last access time (the ‘atime’ in the inode).  When
+     explicitly sorting by time (‘--sort=time’ or ‘-t’) or when not
      using a long listing format, sort according to the access time.
 
-`-U'
-`--sort=none'
+‘-U’
+‘--sort=none’
      Do not sort; list the files in whatever order they are stored in
      the directory.  (Do not do any of the other unrelated things that
-     `-f' does.)  This is especially useful when listing very large
+     ‘-f’ does.)  This is especially useful when listing very large
      directories, since not doing any sorting can be noticeably faster.
 
-`-v'
-`--sort=version'
+‘-v’
+‘--sort=version’
      Sort by version name and number, lowest first.  It behaves like a
      default sort, except that each sequence of decimal digits is
      treated numerically as an index/version number.  (*Note Details
      about version sort::.)
 
-`-X'
-`--sort=extension'
+‘-X’
+‘--sort=extension’
      Sort directory contents alphabetically by file extension
-     (characters after the last `.'); files with no extension are
-     sorted first.
-
+     (characters after the last ‘.’); files with no extension are sorted
+     first.
 
 
 File: coreutils.info,  Node: Details about version sort,  Next: General output formatting,  Prev: Sorting the output,  Up: ls invocation
@@ -6022,8 +5998,8 @@ File: coreutils.info,  Node: Details about version sort,  Next: General output f
 Version sorting handles the fact that file names frequently include
 indices or version numbers.  Standard sorting usually does not produce
 the order that one expects because comparisons are made on a
-character-by-character basis.  Version sorting is especially useful
-when browsing directories that contain many files with indices/version
+character-by-character basis.  Version sorting is especially useful when
+browsing directories that contain many files with indices/version
 numbers in their names:
 
      $ ls -1            $ ls -1v
@@ -6033,9 +6009,9 @@ numbers in their names:
 
    Version-sorted strings are compared such that if VER1 and VER2 are
 version numbers and PREFIX and SUFFIX (SUFFIX matching the regular
-expression `(\.[A-Za-z~][A-Za-z0-9~]*)*') are strings then VER1 < VER2
-implies that the name composed of "PREFIX VER1 SUFFIX" sorts before
-"PREFIX VER2 SUFFIX".
+expression ‘(\.[A-Za-z~][A-Za-z0-9~]*)*’) are strings then VER1 < VER2
+implies that the name composed of “PREFIX VER1 SUFFIX� sorts before
+“PREFIX VER2 SUFFIX�.
 
    Note also that leading zeros of numeric parts are ignored:
 
@@ -6044,14 +6020,13 @@ implies that the name composed of "PREFIX VER1 SUFFIX" sorts before
      abc-1.012b.tgz     abc-1.007.tgz
      abc-1.01a.tgz      abc-1.012b.tgz
 
-   This functionality is implemented using gnulib's `filevercmp'
+   This functionality is implemented using gnulib’s ‘filevercmp’
 function, which has some caveats worth noting.
 
-   * `LC_COLLATE' is ignored, which means `ls -v' and `sort -V' will
-     sort non-numeric prefixes as if the `LC_COLLATE' locale category
-     was set to `C'.
-
-   * Some suffixes will not be matched by the regular expression
+   • ‘LC_COLLATE’ is ignored, which means ‘ls -v’ and ‘sort -V’ will
+     sort non-numeric prefixes as if the ‘LC_COLLATE’ locale category
+     was set to ‘C’.
+   • Some suffixes will not be matched by the regular expression
      mentioned above.  Consequently these examples may not sort as you
      expect:
 
@@ -6069,213 +6044,204 @@ File: coreutils.info,  Node: General output formatting,  Next: Formatting file t
 
 These options affect the appearance of the overall output.
 
-`-1'
-`--format=single-column'
-     List one file per line.  This is the default for `ls' when standard
+‘-1’
+‘--format=single-column’
+     List one file per line.  This is the default for ‘ls’ when standard
      output is not a terminal.
 
-`-C'
-`--format=vertical'
+‘-C’
+‘--format=vertical’
      List files in columns, sorted vertically.  This is the default for
-     `ls' if standard output is a terminal.  It is always the default
-     for the `dir' program.  GNU `ls' uses variable width columns to
+     ‘ls’ if standard output is a terminal.  It is always the default
+     for the ‘dir’ program.  GNU ‘ls’ uses variable width columns to
      display as many files as possible in the fewest lines.
 
-`--color [=WHEN]'
+‘--color [=WHEN]’
      Specify whether to use color for distinguishing file types.  WHEN
      may be omitted, or one of:
-        * none - Do not use color at all.  This is the default.
-
-        * auto - Only use color if standard output is a terminal.
-
-        * always - Always use color.
-     Specifying `--color' and no WHEN is equivalent to `--color=always'.
-     Piping a colorized listing through a pager like `more' or `less'
-     usually produces unreadable results.  However, using `more -f'
-     does seem to work.
-
-     Note that using the `--color' option may incur a noticeable
+        • none - Do not use color at all.  This is the default.
+        • auto - Only use color if standard output is a terminal.
+        • always - Always use color.
+     Specifying ‘--color’ and no WHEN is equivalent to ‘--color=always’.
+     Piping a colorized listing through a pager like ‘more’ or ‘less’
+     usually produces unreadable results.  However, using ‘more -f’ does
+     seem to work.
+
+     Note that using the ‘--color’ option may incur a noticeable
      performance penalty when run in a directory with very many entries,
-     because the default settings require that `ls' `stat' every single
+     because the default settings require that ‘ls’ ‘stat’ every single
      file it lists.  However, if you would like most of the file-type
      coloring but can live without the other coloring options (e.g.,
      executable, orphan, sticky, other-writable, capability), use
-     `dircolors' to set the `LS_COLORS' environment variable like this,
+     ‘dircolors’ to set the ‘LS_COLORS’ environment variable like this,
           eval $(dircolors -p | perl -pe \
             's/^((CAP|S[ET]|O[TR]|M|E)\w+).*/$1 00/' | dircolors -)
-     and on a `dirent.d_type'-capable file system, `ls' will perform
-     only one `stat' call per command line argument.
+     and on a ‘dirent.d_type’-capable file system, ‘ls’ will perform
+     only one ‘stat’ call per command line argument.
 
-`-F'
-`--classify'
-`--indicator-style=classify'
+‘-F’
+‘--classify’
+‘--indicator-style=classify’
      Append a character to each file name indicating the file type.
-     Also, for regular files that are executable, append `*'.  The file
-     type indicators are `/' for directories, `@' for symbolic links,
-     `|' for FIFOs, `=' for sockets, `>' for doors, and nothing for
+     Also, for regular files that are executable, append ‘*’.  The file
+     type indicators are ‘/’ for directories, ‘@’ for symbolic links,
+     ‘|’ for FIFOs, ‘=’ for sockets, ‘>’ for doors, and nothing for
      regular files.  Do not follow symbolic links listed on the command
-     line unless the `--dereference-command-line' (`-H'),
-     `--dereference' (`-L'), or
-     `--dereference-command-line-symlink-to-dir' options are specified.
+     line unless the ‘--dereference-command-line’ (‘-H’),
+     ‘--dereference’ (‘-L’), or
+     ‘--dereference-command-line-symlink-to-dir’ options are specified.
 
-`--file-type'
-`--indicator-style=file-type'
+‘--file-type’
+‘--indicator-style=file-type’
      Append a character to each file name indicating the file type.
-     This is like `-F', except that executables are not marked.
+     This is like ‘-F’, except that executables are not marked.
 
-`--indicator-style=WORD'
+‘--indicator-style=WORD’
      Append a character indicator with style WORD to entry names, as
      follows:
 
-    `none'
+     ‘none’
           Do not append any character indicator; this is the default.
-
-    `slash'
-          Append `/' for directories.  This is the same as the `-p'
+     ‘slash’
+          Append ‘/’ for directories.  This is the same as the ‘-p’
+          option.
+     ‘file-type’
+          Append ‘/’ for directories, ‘@’ for symbolic links, ‘|’ for
+          FIFOs, ‘=’ for sockets, and nothing for regular files.  This
+          is the same as the ‘--file-type’ option.
+     ‘classify’
+          Append ‘*’ for executable regular files, otherwise behave as
+          for ‘file-type’.  This is the same as the ‘-F’ or ‘--classify’
           option.
 
-    `file-type'
-          Append `/' for directories, `@' for symbolic links, `|' for
-          FIFOs, `=' for sockets, and nothing for regular files.  This
-          is the same as the `--file-type' option.
-
-    `classify'
-          Append `*' for executable regular files, otherwise behave as
-          for `file-type'.  This is the same as the `-F' or
-          `--classify' option.
-
-`-k'
-`--kibibytes'
+‘-k’
+‘--kibibytes’
      Set the default block size to its normal value of 1024 bytes,
      overriding any contrary specification in environment variables
      (*note Block size::).  This option is in turn overridden by the
-     `--block-size', `-h' or `--human-readable', and `--si' options.
+     ‘--block-size’, ‘-h’ or ‘--human-readable’, and ‘--si’ options.
 
-     The `-k' or `--kibibytes' option affects the per-directory block
-     count written by the `-l' and similar options, and the size
-     written by the `-s' or `--size' option.  It does not affect the
-     file size written by `-l'.
+     The ‘-k’ or ‘--kibibytes’ option affects the per-directory block
+     count written by the ‘-l’ and similar options, and the size written
+     by the ‘-s’ or ‘--size’ option.  It does not affect the file size
+     written by ‘-l’.
 
-`-m'
-`--format=commas'
+‘-m’
+‘--format=commas’
      List files horizontally, with as many as will fit on each line,
-     separated by `, ' (a comma and a space).
+     separated by ‘, ’ (a comma and a space).
 
-`-p'
-`--indicator-style=slash'
-     Append a `/' to directory names.
+‘-p’
+‘--indicator-style=slash’
+     Append a ‘/’ to directory names.
 
-`-x'
-`--format=across'
-`--format=horizontal'
+‘-x’
+‘--format=across’
+‘--format=horizontal’
      List the files in columns, sorted horizontally.
 
-`-T COLS'
-`--tabsize=COLS'
+‘-T COLS’
+‘--tabsize=COLS’
      Assume that each tab stop is COLS columns wide.  The default is 8.
-     `ls' uses tabs where possible in the output, for efficiency.  If
+     ‘ls’ uses tabs where possible in the output, for efficiency.  If
      COLS is zero, do not use tabs at all.
 
-     Some terminal emulators (at least Apple Terminal 1.5 (133) from
-     Mac OS X 10.4.8) do not properly align columns to the right of a
-     TAB following a non-ASCII byte.  If you use such a terminal
-     emulator, use the `-T0' option or put `TABSIZE=0' in your
-     environment to tell `ls' to align using spaces, not tabs.
+     Some terminal emulators might not properly align columns to the
+     right of a TAB following a non-ASCII byte.  You can avoid that
+     issue by using the ‘-T0’ option or put ‘TABSIZE=0’ in your
+     environment, to tell ‘ls’ to align using spaces, not tabs.
 
-`-w'
-`--width=COLS'
+‘-w’
+‘--width=COLS’
      Assume the screen is COLS columns wide.  The default is taken from
      the terminal settings if possible; otherwise the environment
-     variable `COLUMNS' is used if it is set; otherwise the default is
+     variable ‘COLUMNS’ is used if it is set; otherwise the default is
      80.
 
-
 
 File: coreutils.info,  Node: Formatting file timestamps,  Next: Formatting the file names,  Prev: General output formatting,  Up: ls invocation
 
 10.1.6 Formatting file timestamps
 ---------------------------------
 
-By default, file timestamps are listed in abbreviated form, using a
-date like `Mar 30  2002' for non-recent timestamps, and a
-date-without-year and time like `Mar 30 23:45' for recent timestamps.
-This format can change depending on the current locale as detailed
-below.
+By default, file timestamps are listed in abbreviated form, using a date
+like ‘Mar 30  2002’ for non-recent timestamps, and a date-without-year
+and time like ‘Mar 30 23:45’ for recent timestamps.  This format can
+change depending on the current locale as detailed below.
 
    A timestamp is considered to be "recent" if it is less than six
 months old, and is not dated in the future.  If a timestamp dated today
 is not listed in recent form, the timestamp is in the future, which
 means you probably have clock skew problems which may break programs
-like `make' that rely on file timestamps.
+like ‘make’ that rely on file timestamps.
 
    Time stamps are listed according to the time zone rules specified by
-the `TZ' environment variable, or by the system default rules if `TZ'
-is not set.  *Note Specifying the Time Zone with `TZ': (libc)TZ
-Variable.
+the ‘TZ’ environment variable, or by the system default rules if ‘TZ’ is
+not set.  *Note Specifying the Time Zone with ‘TZ’: (libc)TZ Variable.
 
    The following option changes how file timestamps are printed.
 
-`--time-style=STYLE'
+‘--time-style=STYLE’
      List timestamps in style STYLE.  The STYLE should be one of the
      following:
 
-    `+FORMAT'
-          List timestamps using FORMAT, where FORMAT is interpreted
-          like the format argument of `date' (*note date invocation::).
-          For example, `--time-style="+%Y-%m-%d %H:%M:%S"' causes `ls'
-          to list timestamps like `2002-03-30 23:45:56'.  As with
-          `date', FORMAT's interpretation is affected by the `LC_TIME'
-          locale category.
+     ‘+FORMAT’
+          List timestamps using FORMAT, where FORMAT is interpreted like
+          the format argument of ‘date’ (*note date invocation::).  For
+          example, ‘--time-style="+%Y-%m-%d %H:%M:%S"’ causes ‘ls’ to
+          list timestamps like ‘2002-03-30 23:45:56’.  As with ‘date’,
+          FORMAT’s interpretation is affected by the ‘LC_TIME’ locale
+          category.
 
           If FORMAT contains two format strings separated by a newline,
           the former is used for non-recent files and the latter for
           recent files; if you want output columns to line up, you may
           need to insert spaces in one of the two formats.
 
-    `full-iso'
+     ‘full-iso’
           List timestamps in full using ISO 8601 date, time, and time
-          zone format with nanosecond precision, e.g., `2002-03-30
-          23:45:56.477817180 -0700'.  This style is equivalent to
-          `+%Y-%m-%d %H:%M:%S.%N %z'.
+          zone format with nanosecond precision, e.g., ‘2002-03-30
+          23:45:56.477817180 -0700’.  This style is equivalent to
+          ‘+%Y-%m-%d %H:%M:%S.%N %z’.
 
           This is useful because the time output includes all the
           information that is available from the operating system.  For
-          example, this can help explain `make''s behavior, since GNU
-          `make' uses the full timestamp to determine whether a file is
+          example, this can help explain ‘make’’s behavior, since GNU
+          ‘make’ uses the full timestamp to determine whether a file is
           out of date.
 
-    `long-iso'
-          List ISO 8601 date and time in minutes, e.g., `2002-03-30
-          23:45'.  These timestamps are shorter than `full-iso'
+     ‘long-iso’
+          List ISO 8601 date and time in minutes, e.g., ‘2002-03-30
+          23:45’.  These timestamps are shorter than ‘full-iso’
           timestamps, and are usually good enough for everyday work.
-          This style is equivalent to `+%Y-%m-%d %H:%M'.
+          This style is equivalent to ‘+%Y-%m-%d %H:%M’.
 
-    `iso'
+     ‘iso’
           List ISO 8601 dates for non-recent timestamps (e.g.,
-          `2002-03-30 '), and ISO 8601 month, day, hour, and minute for
-          recent timestamps (e.g., `03-30 23:45').  These timestamps
-          are uglier than `long-iso' timestamps, but they carry nearly
-          the same information in a smaller space and their brevity
-          helps `ls' output fit within traditional 80-column output
-          lines.  The following two `ls' invocations are equivalent:
+          ‘2002-03-30 ’), and ISO 8601 month, day, hour, and minute for
+          recent timestamps (e.g., ‘03-30 23:45’).  These timestamps are
+          uglier than ‘long-iso’ timestamps, but they carry nearly the
+          same information in a smaller space and their brevity helps
+          ‘ls’ output fit within traditional 80-column output lines.
+          The following two ‘ls’ invocations are equivalent:
 
                newline='
                '
                ls -l --time-style="+%Y-%m-%d $newline%m-%d %H:%M"
                ls -l --time-style="iso"
 
-    `locale'
+     ‘locale’
           List timestamps in a locale-dependent form.  For example, a
-          Finnish locale might list non-recent timestamps like `maalis
-          30  2002' and recent timestamps like `maalis 30 23:45'.
+          Finnish locale might list non-recent timestamps like ‘maalis
+          30  2002’ and recent timestamps like ‘maalis 30 23:45’.
           Locale-dependent timestamps typically consume more space than
-          `iso' timestamps and are harder for programs to parse because
+          ‘iso’ timestamps and are harder for programs to parse because
           locale conventions vary so widely, but they are easier for
           many people to read.
 
-          The `LC_TIME' locale category specifies the timestamp format.
-          The default POSIX locale uses timestamps like `Mar 30  2002'
-          and `Mar 30 23:45'; in this locale, the following two `ls'
+          The ‘LC_TIME’ locale category specifies the timestamp format.
+          The default POSIX locale uses timestamps like ‘Mar 30  2002’
+          and ‘Mar 30 23:45’; in this locale, the following two ‘ls’
           invocations are equivalent:
 
                newline='
@@ -6284,24 +6250,23 @@ Variable.
                ls -l --time-style="locale"
 
           Other locales behave differently.  For example, in a German
-          locale, `--time-style="locale"' might be equivalent to
-          `--time-style="+%e. %b %Y $newline%e. %b %H:%M"' and might
-          generate timestamps like `30. Ma"r 2002 ' and `30. Ma"r
-          23:45'.
+          locale, ‘--time-style="locale"’ might be equivalent to
+          ‘--time-style="+%e. %b %Y $newline%e. %b %H:%M"’ and might
+          generate timestamps like ‘30. Mär 2002 ’ and ‘30. Mär 23:45’.
 
-    `posix-STYLE'
-          List POSIX-locale timestamps if the `LC_TIME' locale category
+     ‘posix-STYLE’
+          List POSIX-locale timestamps if the ‘LC_TIME’ locale category
           is POSIX, STYLE timestamps otherwise.  For example, the
-          `posix-long-iso' style lists timestamps like `Mar 30  2002'
-          and `Mar 30 23:45' when in the POSIX locale, and like
-          `2002-03-30 23:45' otherwise.
+          ‘posix-long-iso’ style lists timestamps like ‘Mar 30  2002’
+          and ‘Mar 30 23:45’ when in the POSIX locale, and like
+          ‘2002-03-30 23:45’ otherwise.
 
-   You can specify the default value of the `--time-style' option with
-the environment variable `TIME_STYLE'; if `TIME_STYLE' is not set the
-default style is `locale'.  GNU Emacs 21.3 and later use the `--dired'
+   You can specify the default value of the ‘--time-style’ option with
+the environment variable ‘TIME_STYLE’; if ‘TIME_STYLE’ is not set the
+default style is ‘locale’.  GNU Emacs 21.3 and later use the ‘--dired’
 option and therefore can parse any date format, but if you are using
 Emacs 21.1 or 21.2 and specify a non-POSIX locale you may need to set
-`TIME_STYLE="posix-long-iso"'.
+‘TIME_STYLE="posix-long-iso"’.
 
    To avoid certain denial-of-service attacks, timestamps that would be
 longer than 1000 bytes may be treated as errors.
@@ -6314,152 +6279,144 @@ File: coreutils.info,  Node: Formatting the file names,  Prev: Formatting file t
 
 These options change how file names themselves are printed.
 
-`-b'
-`--escape'
-`--quoting-style=escape'
+‘-b’
+‘--escape’
+‘--quoting-style=escape’
      Quote nongraphic characters in file names using alphabetic and
      octal backslash sequences like those used in C.
 
-`-N'
-`--literal'
-`--quoting-style=literal'
-     Do not quote file names.  However, with `ls' nongraphic characters
-     are still printed as question marks if the output is a terminal
-     and you do not specify the `--show-control-chars' option.
+‘-N’
+‘--literal’
+‘--quoting-style=literal’
+     Do not quote file names.  However, with ‘ls’ nongraphic characters
+     are still printed as question marks if the output is a terminal and
+     you do not specify the ‘--show-control-chars’ option.
 
-`-q'
-`--hide-control-chars'
+‘-q’
+‘--hide-control-chars’
      Print question marks instead of nongraphic characters in file
      names.  This is the default if the output is a terminal and the
-     program is `ls'.
+     program is ‘ls’.
 
-`-Q'
-`--quote-name'
-`--quoting-style=c'
-     Enclose file names in double quotes and quote nongraphic
-     characters as in C.
+‘-Q’
+‘--quote-name’
+‘--quoting-style=c’
+     Enclose file names in double quotes and quote nongraphic characters
+     as in C.
 
-`--quoting-style=WORD'
+‘--quoting-style=WORD’
      Use style WORD to quote file names and other strings that may
      contain arbitrary characters.  The WORD should be one of the
      following:
 
-    `literal'
-          Output strings as-is; this is the same as the `-N' or
-          `--literal' option.
-
-    `shell'
+     ‘literal’
+          Output strings as-is; this is the same as the ‘-N’ or
+          ‘--literal’ option.
+     ‘shell’
           Quote strings for the shell if they contain shell
           metacharacters or would cause ambiguous output.  The quoting
-          is suitable for POSIX-compatible shells like `bash', but it
-          does not always work for incompatible shells like `csh'.
-
-    `shell-always'
+          is suitable for POSIX-compatible shells like ‘bash’, but it
+          does not always work for incompatible shells like ‘csh’.
+     ‘shell-always’
           Quote strings for the shell, even if they would normally not
           require quoting.
-
-    `c'
+     ‘c’
           Quote strings as for C character string literals, including
           the surrounding double-quote characters; this is the same as
-          the `-Q' or `--quote-name' option.
-
-    `escape'
+          the ‘-Q’ or ‘--quote-name’ option.
+     ‘escape’
           Quote strings as for C character string literals, except omit
           the surrounding double-quote characters; this is the same as
-          the `-b' or `--escape' option.
-
-    `clocale'
+          the ‘-b’ or ‘--escape’ option.
+     ‘clocale’
           Quote strings as for C character string literals, except use
           surrounding quotation marks appropriate for the locale.
-
-    `locale'
+     ‘locale’
           Quote strings as for C character string literals, except use
           surrounding quotation marks appropriate for the locale, and
           quote 'like this' instead of "like this" in the default C
           locale.  This looks nicer on many displays.
 
-     You can specify the default value of the `--quoting-style' option
-     with the environment variable `QUOTING_STYLE'.  If that environment
-     variable is not set, the default value is `literal', but this
-     default may change to `shell' in a future version of this package.
+     You can specify the default value of the ‘--quoting-style’ option
+     with the environment variable ‘QUOTING_STYLE’.  If that environment
+     variable is not set, the default value is ‘literal’, but this
+     default may change to ‘shell’ in a future version of this package.
 
-`--show-control-chars'
+‘--show-control-chars’
      Print nongraphic characters as-is in file names.  This is the
-     default unless the output is a terminal and the program is `ls'.
-
+     default unless the output is a terminal and the program is ‘ls’.
 
 
 File: coreutils.info,  Node: dir invocation,  Next: vdir invocation,  Prev: ls invocation,  Up: Directory listing
 
-10.2 `dir': Briefly list directory contents
+10.2 ‘dir’: Briefly list directory contents
 ===========================================
 
-`dir' is equivalent to `ls -C -b'; that is, by default files are listed
-in columns, sorted vertically, and special characters are represented
-by backslash escape sequences.
+‘dir’ is equivalent to ‘ls -C -b’; that is, by default files are listed
+in columns, sorted vertically, and special characters are represented by
+backslash escape sequences.
 
-   *Note `ls': ls invocation.
+   *Note ‘ls’: ls invocation.
 
 
 File: coreutils.info,  Node: vdir invocation,  Next: dircolors invocation,  Prev: dir invocation,  Up: Directory listing
 
-10.3 `vdir': Verbosely list directory contents
+10.3 ‘vdir’: Verbosely list directory contents
 ==============================================
 
-`vdir' is equivalent to `ls -l -b'; that is, by default files are
-listed in long format and special characters are represented by
-backslash escape sequences.
+‘vdir’ is equivalent to ‘ls -l -b’; that is, by default files are listed
+in long format and special characters are represented by backslash
+escape sequences.
 
 
 File: coreutils.info,  Node: dircolors invocation,  Prev: vdir invocation,  Up: Directory listing
 
-10.4 `dircolors': Color setup for `ls'
+10.4 ‘dircolors’: Color setup for ‘ls’
 ======================================
 
-`dircolors' outputs a sequence of shell commands to set up the terminal
-for color output from `ls' (and `dir', etc.).  Typical usage:
+‘dircolors’ outputs a sequence of shell commands to set up the terminal
+for color output from ‘ls’ (and ‘dir’, etc.).  Typical usage:
 
-     eval "$(dircolors [OPTION]... [FILE])"
+     eval "$(dircolors [OPTION]… [FILE])"
 
-   If FILE is specified, `dircolors' reads it to determine which colors
+   If FILE is specified, ‘dircolors’ reads it to determine which colors
 to use for which file types and extensions.  Otherwise, a precompiled
 database is used.  For details on the format of these files, run
-`dircolors --print-database'.
+‘dircolors --print-database’.
 
-   To make `dircolors' read a `~/.dircolors' file if it exists, you can
-put the following lines in your `~/.bashrc' (or adapt them to your
+   To make ‘dircolors’ read a ‘~/.dircolors’ file if it exists, you can
+put the following lines in your ‘~/.bashrc’ (or adapt them to your
 favorite shell):
 
      d=.dircolors
      test -r $d && eval "$(dircolors $d)"
 
-   The output is a shell command to set the `LS_COLORS' environment
+   The output is a shell command to set the ‘LS_COLORS’ environment
 variable.  You can specify the shell syntax to use on the command line,
-or `dircolors' will guess it from the value of the `SHELL' environment
+or ‘dircolors’ will guess it from the value of the ‘SHELL’ environment
 variable.
 
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-b'
-`--sh'
-`--bourne-shell'
-     Output Bourne shell commands.  This is the default if the `SHELL'
-     environment variable is set and does not end with `csh' or `tcsh'.
+‘-b’
+‘--sh’
+‘--bourne-shell’
+     Output Bourne shell commands.  This is the default if the ‘SHELL’
+     environment variable is set and does not end with ‘csh’ or ‘tcsh’.
 
-`-c'
-`--csh'
-`--c-shell'
-     Output C shell commands.  This is the default if `SHELL' ends with
-     `csh' or `tcsh'.
+‘-c’
+‘--csh’
+‘--c-shell’
+     Output C shell commands.  This is the default if ‘SHELL’ ends with
+     ‘csh’ or ‘tcsh’.
 
-`-p'
-`--print-database'
+‘-p’
+‘--print-database’
      Print the (compiled-in) default color configuration database.  This
      output is itself a valid configuration file, and is fairly
      descriptive of the possibilities.
 
-
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
 
@@ -6484,90 +6441,88 @@ copying, moving (renaming), and deleting (removing).
 
 File: coreutils.info,  Node: cp invocation,  Next: dd invocation,  Up: Basic operations
 
-11.1 `cp': Copy files and directories
+11.1 ‘cp’: Copy files and directories
 =====================================
 
-`cp' copies files (or, optionally, directories).  The copy is
-completely independent of the original.  You can either copy one file to
-another, or copy arbitrarily many files to a destination directory.
-Synopses:
+‘cp’ copies files (or, optionally, directories).  The copy is completely
+independent of the original.  You can either copy one file to another,
+or copy arbitrarily many files to a destination directory.  Synopses:
 
-     cp [OPTION]... [-T] SOURCE DEST
-     cp [OPTION]... SOURCE... DIRECTORY
-     cp [OPTION]... -t DIRECTORY SOURCE...
+     cp [OPTION]… [-T] SOURCE DEST
+     cp [OPTION]… SOURCE… DIRECTORY
+     cp [OPTION]… -t DIRECTORY SOURCE…
 
-   * If two file names are given, `cp' copies the first file to the
+   • If two file names are given, ‘cp’ copies the first file to the
      second.
 
-   * If the `--target-directory' (`-t') option is given, or failing
-     that if the last file is a directory and the
-     `--no-target-directory' (`-T') option is not given, `cp' copies
-     each SOURCE file to the specified directory, using the SOURCEs'
-     names.
+   • If the ‘--target-directory’ (‘-t’) option is given, or failing that
+     if the last file is a directory and the ‘--no-target-directory’
+     (‘-T’) option is not given, ‘cp’ copies each SOURCE file to the
+     specified directory, using the SOURCEs’ names.
 
    Generally, files are written just as they are read.  For exceptions,
-see the `--sparse' option below.
+see the ‘--sparse’ option below.
 
-   By default, `cp' does not copy directories.  However, the `-R',
-`-a', and `-r' options cause `cp' to copy recursively by descending
-into source directories and copying files to corresponding destination
+   By default, ‘cp’ does not copy directories.  However, the ‘-R’, ‘-a’,
+and ‘-r’ options cause ‘cp’ to copy recursively by descending into
+source directories and copying files to corresponding destination
 directories.
 
-   When copying from a symbolic link, `cp' normally follows the link
-only when not copying recursively.  This default can be overridden with
-the `--archive' (`-a'), `-d', `--dereference' (`-L'),
-`--no-dereference' (`-P'), and `-H' options.  If more than one of these
-options is specified, the last one silently overrides the others.
-
-   When copying to a symbolic link, `cp' follows the link only when it
-refers to an existing regular file.  However, when copying to a
-dangling symbolic link, `cp' refuses by default, and fails with a
-diagnostic, since the operation is inherently dangerous.  This behavior
-is contrary to historical practice and to POSIX.  Set `POSIXLY_CORRECT'
-to make `cp' attempt to create the target of a dangling destination
-symlink, in spite of the possible risk.  Also, when an option like
-`--backup' or `--link' acts to rename or remove the destination before
-copying, `cp' renames or removes the symbolic link rather than the file
-it points to.
-
-   By default, `cp' copies the contents of special files only when not
+   When copying from a symbolic link, ‘cp’ normally follows the link
+only when not copying recursively or when ‘--link’ (‘-l’) is used.  This
+default can be overridden with the ‘--archive’ (‘-a’), ‘-d’,
+‘--dereference’ (‘-L’), ‘--no-dereference’ (‘-P’), and ‘-H’ options.  If
+more than one of these options is specified, the last one silently
+overrides the others.
+
+   When copying to a symbolic link, ‘cp’ follows the link only when it
+refers to an existing regular file.  However, when copying to a dangling
+symbolic link, ‘cp’ refuses by default, and fails with a diagnostic,
+since the operation is inherently dangerous.  This behavior is contrary
+to historical practice and to POSIX.  Set ‘POSIXLY_CORRECT’ to make ‘cp’
+attempt to create the target of a dangling destination symlink, in spite
+of the possible risk.  Also, when an option like ‘--backup’ or ‘--link’
+acts to rename or remove the destination before copying, ‘cp’ renames or
+removes the symbolic link rather than the file it points to.
+
+   By default, ‘cp’ copies the contents of special files only when not
 copying recursively.  This default can be overridden with the
-`--copy-contents' option.
+‘--copy-contents’ option.
 
-   `cp' generally refuses to copy a file onto itself, with the
-following exception: if `--force --backup' is specified with SOURCE and
-DEST identical, and referring to a regular file, `cp' will make a
-backup file, either regular or numbered, as specified in the usual ways
-(*note Backup options::).  This is useful when you simply want to make
-a backup of an existing file before changing it.
+   ‘cp’ generally refuses to copy a file onto itself, with the following
+exception: if ‘--force --backup’ is specified with SOURCE and DEST
+identical, and referring to a regular file, ‘cp’ will make a backup
+file, either regular or numbered, as specified in the usual ways (*note
+Backup options::).  This is useful when you simply want to make a backup
+of an existing file before changing it.
 
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-a'
-`--archive'
+‘-a’
+‘--archive’
      Preserve as much as possible of the structure and attributes of the
      original files in the copy (but do not attempt to preserve internal
-     directory structure; i.e., `ls -U' may list the entries in a copied
+     directory structure; i.e., ‘ls -U’ may list the entries in a copied
      directory in a different order).  Try to preserve SELinux security
      context and extended attributes (xattr), but ignore any failure to
-     do that and print no corresponding diagnostic.  Equivalent to `-dR
-     --preserve=all' with the reduced diagnostics.
+     do that and print no corresponding diagnostic.  Equivalent to ‘-dR
+     --preserve=all’ with the reduced diagnostics.
 
-`--attributes-only'
+‘--attributes-only’
      Copy only the specified attributes of the source file to the
      destination.  If the destination already exists, do not alter its
-     contents.  See the `--preserve' option for controlling which
+     contents.  See the ‘--preserve’ option for controlling which
      attributes to copy.
 
-`-b'
-`--backup[=METHOD]'
+‘-b’
+‘--backup[=METHOD]’
      *Note Backup options::.  Make a backup of each file that would
-     otherwise be overwritten or removed.  As a special case, `cp'
-     makes a backup of SOURCE when the force and backup options are
-     given and SOURCE and DEST are the same name for an existing,
-     regular file.  One useful application of this combination of
-     options is this tiny Bourne shell script:
+     otherwise be overwritten or removed.  As a special case, ‘cp’ makes
+     a backup of SOURCE when the force and backup options are given and
+     SOURCE and DEST are the same name for an existing, regular file.
+     One useful application of this combination of options is this tiny
+     Bourne shell script:
 
           #!/bin/sh
           # Usage: backup FILE...
@@ -6578,292 +6533,295 @@ options::.
           done
           exit $fail
 
-`--copy-contents'
+‘--copy-contents’
      If copying recursively, copy the contents of any special files
-     (e.g., FIFOs and device files) as if they were regular files.
-     This means trying to read the data in each source file and writing
-     it to the destination.  It is usually a mistake to use this
-     option, as it normally has undesirable effects on special files
-     like FIFOs and the ones typically found in the `/dev' directory.
-     In most cases, `cp -R --copy-contents' will hang indefinitely
-     trying to read from FIFOs and special files like `/dev/console',
-     and it will fill up your destination disk if you use it to copy
-     `/dev/zero'.  This option has no effect unless copying
-     recursively, and it does not affect the copying of symbolic links.
-
-`-d'
-     Copy symbolic links as symbolic links rather than copying the
-     files that they point to, and preserve hard links between source
-     files in the copies.  Equivalent to `--no-dereference
-     --preserve=links'.
-
-`-f'
-`--force'
+     (e.g., FIFOs and device files) as if they were regular files.  This
+     means trying to read the data in each source file and writing it to
+     the destination.  It is usually a mistake to use this option, as it
+     normally has undesirable effects on special files like FIFOs and
+     the ones typically found in the ‘/dev’ directory.  In most cases,
+     ‘cp -R --copy-contents’ will hang indefinitely trying to read from
+     FIFOs and special files like ‘/dev/console’, and it will fill up
+     your destination disk if you use it to copy ‘/dev/zero’.  This
+     option has no effect unless copying recursively, and it does not
+     affect the copying of symbolic links.
+
+‘-d’
+     Copy symbolic links as symbolic links rather than copying the files
+     that they point to, and preserve hard links between source files in
+     the copies.  Equivalent to ‘--no-dereference --preserve=links’.
+
+‘-f’
+‘--force’
      When copying without this option and an existing destination file
      cannot be opened for writing, the copy fails.  However, with
-     `--force', when a destination file cannot be opened, `cp' then
-     removes it and tries to open it again.  Contrast this behavior
-     with that enabled by `--link' and `--symbolic-link', whereby the
+     ‘--force’, when a destination file cannot be opened, ‘cp’ then
+     removes it and tries to open it again.  Contrast this behavior with
+     that enabled by ‘--link’ and ‘--symbolic-link’, whereby the
      destination file is never opened but rather is removed
      unconditionally.  Also see the description of
-     `--remove-destination'.
+     ‘--remove-destination’.
 
-     This option is independent of the `--interactive' or `-i' option:
+     This option is independent of the ‘--interactive’ or ‘-i’ option:
      neither cancels the effect of the other.
 
-     This option is ignored when the `--no-clobber' or `-n' option is
+     This option is ignored when the ‘--no-clobber’ or ‘-n’ option is
      also used.
 
-`-H'
+‘-H’
      If a command line argument specifies a symbolic link, then copy the
      file it points to rather than the symbolic link itself.  However,
      copy (preserving its nature) any symbolic link that is encountered
      via recursive traversal.
 
-`-i'
-`--interactive'
+‘-i’
+‘--interactive’
      When copying a file other than a directory, prompt whether to
-     overwrite an existing destination file.  The `-i' option overrides
-     a previous `-n' option.
+     overwrite an existing destination file.  The ‘-i’ option overrides
+     a previous ‘-n’ option.
 
-`-l'
-`--link'
+‘-l’
+‘--link’
      Make hard links instead of copies of non-directories.
 
-`-L'
-`--dereference'
+‘-L’
+‘--dereference’
      Follow symbolic links when copying from them.  With this option,
-     `cp' cannot create a symbolic link.  For example, a symlink (to
+     ‘cp’ cannot create a symbolic link.  For example, a symlink (to
      regular file) in the source tree will be copied to a regular file
      in the destination tree.
 
-`-n'
-`--no-clobber'
-     Do not overwrite an existing file.  The `-n' option overrides a
-     previous `-i' option.  This option is mutually exclusive with `-b'
-     or `--backup' option.
-
-`-P'
-`--no-dereference'
-     Copy symbolic links as symbolic links rather than copying the
-     files that they point to.  This option affects only symbolic links
-     in the source; symbolic links in the destination are always
-     followed if possible.
-
-`-p'
-`--preserve[=ATTRIBUTE_LIST]'
+‘-n’
+‘--no-clobber’
+     Do not overwrite an existing file.  The ‘-n’ option overrides a
+     previous ‘-i’ option.  This option is mutually exclusive with ‘-b’
+     or ‘--backup’ option.
+
+‘-P’
+‘--no-dereference’
+     Copy symbolic links as symbolic links rather than copying the files
+     that they point to.  This option affects only symbolic links in the
+     source; symbolic links in the destination are always followed if
+     possible.
+
+‘-p’
+‘--preserve[=ATTRIBUTE_LIST]’
      Preserve the specified attributes of the original files.  If
-     specified, the ATTRIBUTE_LIST must be a comma-separated list of
-     one or more of the following strings:
+     specified, the ATTRIBUTE_LIST must be a comma-separated list of one
+     or more of the following strings:
 
-    `mode'
+     ‘mode’
           Preserve the file mode bits and access control lists.
-
-    `ownership'
+     ‘ownership’
           Preserve the owner and group.  On most modern systems, only
           users with appropriate privileges may change the owner of a
-          file, and ordinary users may preserve the group ownership of
-          a file only if they happen to be a member of the desired
-          group.
-
-    `timestamps'
+          file, and ordinary users may preserve the group ownership of a
+          file only if they happen to be a member of the desired group.
+     ‘timestamps’
           Preserve the times of last access and last modification, when
           possible.  On older systems, it is not possible to preserve
           these attributes when the affected file is a symbolic link.
-          However, many systems now provide the `utimensat' function,
+          However, many systems now provide the ‘utimensat’ function,
           which makes it possible even for symbolic links.
-
-    `links'
+     ‘links’
           Preserve in the destination files any links between
-          corresponding source files.  Note that with `-L' or `-H',
-          this option can convert symbolic links to hard links.  For
-          example,
+          corresponding source files.  Note that with ‘-L’ or ‘-H’, this
+          option can convert symbolic links to hard links.  For example,
                $ mkdir c; : > a; ln -s a b; cp -aH a b c; ls -i1 c
                74161745 a
                74161745 b
-          Note the inputs: `b' is a symlink to regular file `a', yet
-          the files in destination directory, `c/', are hard-linked.
-          Since `-a' implies `--preserve=links', and since `-H' tells
-          `cp' to dereference command line arguments, it sees two files
-          with the same inode number, and preserves the perceived hard
-          link.
-
-          Here is a similar example that exercises `cp''s `-L' option:
+          Note the inputs: ‘b’ is a symlink to regular file ‘a’, yet the
+          files in destination directory, ‘c/’, are hard-linked.  Since
+          ‘-a’ implies ‘--no-dereference’ it would copy the symlink, but
+          the later ‘-H’ tells ‘cp’ to dereference the command line
+          arguments where it then sees two files with the same inode
+          number.  Then the ‘--preserve=links’ option also implied by
+          ‘-a’ will preserve the perceived hard link.
+
+          Here is a similar example that exercises ‘cp’’s ‘-L’ option:
                $ mkdir b c; (cd b; : > a; ln -s a b); cp -aL b c; ls -i1 c/b
                74163295 a
                74163295 b
 
-    `context'
+     ‘context’
           Preserve SELinux security context of the file, or fail with
           full diagnostics.
-
-    `xattr'
+     ‘xattr’
           Preserve extended attributes of the file, or fail with full
-          diagnostics.  If `cp' is built without xattr support, ignore
+          diagnostics.  If ‘cp’ is built without xattr support, ignore
           this option.  If SELinux context, ACLs or Capabilities are
           implemented using xattrs, they are preserved implicitly by
           this option as well, i.e., even without specifying
-          `--preserve=mode' or `--preserve=context'.
-
-    `all'
-          Preserve all file attributes.  Equivalent to specifying all
-          of the above, but with the difference that failure to
-          preserve SELinux security context or extended attributes does
-          not change `cp''s exit status.  In contrast to `-a', all but
-          `Operation not supported' warnings are output.
-
-     Using `--preserve' with no ATTRIBUTE_LIST is equivalent to
-     `--preserve=mode,ownership,timestamps'.
-
-     In the absence of this option, each destination file is created
-     with the mode bits of the corresponding source file, minus the
-     bits set in the umask and minus the set-user-ID and set-group-ID
-     bits.  *Note File permissions::.
+          ‘--preserve=mode’ or ‘--preserve=context’.
+     ‘all’
+          Preserve all file attributes.  Equivalent to specifying all of
+          the above, but with the difference that failure to preserve
+          SELinux security context or extended attributes does not
+          change ‘cp’’s exit status.  In contrast to ‘-a’, all but
+          ‘Operation not supported’ warnings are output.
+
+     Using ‘--preserve’ with no ATTRIBUTE_LIST is equivalent to
+     ‘--preserve=mode,ownership,timestamps’.
+
+     In the absence of this option, the permissions of existing
+     destination files are unchanged, while each new file is created
+     with the mode bits of the corresponding source file, minus the bits
+     set in the umask and minus the set-user-ID and set-group-ID bits.
+     *Note File permissions::.
 
-`--no-preserve=ATTRIBUTE_LIST'
+‘--no-preserve=ATTRIBUTE_LIST’
      Do not preserve the specified attributes.  The ATTRIBUTE_LIST has
-     the same form as for `--preserve'.
+     the same form as for ‘--preserve’.
 
-`--parents'
+‘--parents’
      Form the name of each destination file by appending to the target
      directory a slash and the specified name of the source file.  The
-     last argument given to `cp' must be the name of an existing
+     last argument given to ‘cp’ must be the name of an existing
      directory.  For example, the command:
 
           cp --parents a/b/c existing_dir
 
-     copies the file `a/b/c' to `existing_dir/a/b/c', creating any
+     copies the file ‘a/b/c’ to ‘existing_dir/a/b/c’, creating any
      missing intermediate directories.
 
-`-R'
-`-r'
-`--recursive'
+‘-R’
+‘-r’
+‘--recursive’
      Copy directories recursively.  By default, do not follow symbolic
-     links in the source; see the `--archive' (`-a'), `-d',
-     `--dereference' (`-L'), `--no-dereference' (`-P'), and `-H'
-     options.  Special files are copied by creating a destination file
-     of the same type as the source; see the `--copy-contents' option.
-     It is not portable to use `-r' to copy symbolic links or special
-     files.  On some non-GNU systems, `-r' implies the equivalent of
-     `-L' and `--copy-contents' for historical reasons.  Also, it is
-     not portable to use `-R' to copy symbolic links unless you also
-     specify `-P', as POSIX allows implementations that dereference
-     symbolic links by default.
-
-`--reflink[=WHEN]'
+     links in the source unless used together with the ‘--link’ (‘-l’)
+     option; see the ‘--archive’ (‘-a’), ‘-d’, ‘--dereference’ (‘-L’),
+     ‘--no-dereference’ (‘-P’), and ‘-H’ options.  Special files are
+     copied by creating a destination file of the same type as the
+     source; see the ‘--copy-contents’ option.  It is not portable to
+     use ‘-r’ to copy symbolic links or special files.  On some non-GNU
+     systems, ‘-r’ implies the equivalent of ‘-L’ and ‘--copy-contents’
+     for historical reasons.  Also, it is not portable to use ‘-R’ to
+     copy symbolic links unless you also specify ‘-P’, as POSIX allows
+     implementations that dereference symbolic links by default.
+
+‘--reflink[=WHEN]’
      Perform a lightweight, copy-on-write (COW) copy, if supported by
-     the file system.  Once it has succeeded, beware that the source
-     and destination files share the same disk data blocks as long as
-     they remain unmodified.  Thus, if a disk I/O error affects data
-     blocks of one of the files, the other suffers the same fate.
+     the file system.  Once it has succeeded, beware that the source and
+     destination files share the same disk data blocks as long as they
+     remain unmodified.  Thus, if a disk I/O error affects data blocks
+     of one of the files, the other suffers the same fate.
 
      The WHEN value can be one of the following:
 
-    `always'
+     ‘always’
           The default behavior: if the copy-on-write operation is not
           supported then report the failure for each file and exit with
           a failure status.
 
-    `auto'
+     ‘auto’
           If the copy-on-write operation is not supported then fall back
           to the standard copy behaviour.
 
-     This option is overridden by the `--link', `--symbolic-link' and
-     `--attributes-only' options, thus allowing it to be used to
-     configure the default data copying behavior for `cp'.  For
-     example, with the following alias, `cp' will use the minimum
-     amount of space supported by the file system.
+     This option is overridden by the ‘--link’, ‘--symbolic-link’ and
+     ‘--attributes-only’ options, thus allowing it to be used to
+     configure the default data copying behavior for ‘cp’.  For example,
+     with the following alias, ‘cp’ will use the minimum amount of space
+     supported by the file system.
 
           alias cp='cp --reflink=auto --sparse=always'
 
-`--remove-destination'
+‘--remove-destination’
      Remove each existing destination file before attempting to open it
-     (contrast with `-f' above).
+     (contrast with ‘-f’ above).
 
-`--sparse=WHEN'
-     A "sparse file" contains "holes"--a sequence of zero bytes that
-     does not occupy any physical disk blocks; the `read' system call
-     reads these as zeros.  This can both save considerable disk space
-     and increase speed, since many binary files contain lots of
-     consecutive zero bytes.  By default, `cp' detects holes in input
-     source files via a crude heuristic and makes the corresponding
-     output file sparse as well.  Only regular files may be sparse.
+‘--sparse=WHEN’
+     A "sparse file" contains "holes"—a sequence of zero bytes that does
+     not occupy any physical disk blocks; the ‘read’ system call reads
+     these as zeros.  This can both save considerable disk space and
+     increase speed, since many binary files contain lots of consecutive
+     zero bytes.  By default, ‘cp’ detects holes in input source files
+     via a crude heuristic and makes the corresponding output file
+     sparse as well.  Only regular files may be sparse.
 
      The WHEN value can be one of the following:
 
-    `auto'
+     ‘auto’
           The default behavior: if the input file is sparse, attempt to
           make the output file sparse, too.  However, if an output file
           exists but refers to a non-regular file, then do not attempt
           to make it sparse.
 
-    `always'
-          For each sufficiently long sequence of zero bytes in the
-          input file, attempt to create a corresponding hole in the
-          output file, even if the input file does not appear to be
-          sparse.  This is useful when the input file resides on a file
-          system that does not support sparse files (for example,
-          `efs' file systems in SGI IRIX 5.3 and earlier), but the
-          output file is on a type of file system that does support
-          them.  Holes may be created only in regular files, so if the
-          destination file is of some other type, `cp' does not even
-          try to make it sparse.
-
-    `never'
-          Never make the output file sparse.  This is useful in
-          creating a file for use with the `mkswap' command, since such
-          a file must not have any holes.
-
-`--strip-trailing-slashes'
+     ‘always’
+          For each sufficiently long sequence of zero bytes in the input
+          file, attempt to create a corresponding hole in the output
+          file, even if the input file does not appear to be sparse.
+          This is useful when the input file resides on a file system
+          that does not support sparse files (for example, ‘efs’ file
+          systems in SGI IRIX 5.3 and earlier), but the output file is
+          on a type of file system that does support them.  Holes may be
+          created only in regular files, so if the destination file is
+          of some other type, ‘cp’ does not even try to make it sparse.
+
+     ‘never’
+          Never make the output file sparse.  This is useful in creating
+          a file for use with the ‘mkswap’ command, since such a file
+          must not have any holes.
+
+‘--strip-trailing-slashes’
      Remove any trailing slashes from each SOURCE argument.  *Note
      Trailing slashes::.
 
-`-s'
-`--symbolic-link'
+‘-s’
+‘--symbolic-link’
      Make symbolic links instead of copies of non-directories.  All
-     source file names must be absolute (starting with `/') unless the
+     source file names must be absolute (starting with ‘/’) unless the
      destination files are in the current directory.  This option merely
-     results in an error message on systems that do not support
-     symbolic links.
+     results in an error message on systems that do not support symbolic
+     links.
 
-`-S SUFFIX'
-`--suffix=SUFFIX'
-     Append SUFFIX to each backup file made with `-b'.  *Note Backup
+‘-S SUFFIX’
+‘--suffix=SUFFIX’
+     Append SUFFIX to each backup file made with ‘-b’.  *Note Backup
      options::.
 
-`-t DIRECTORY'
-`--target-directory=DIRECTORY'
+‘-t DIRECTORY’
+‘--target-directory=DIRECTORY’
      Specify the destination DIRECTORY.  *Note Target directory::.
 
-`-T'
-`--no-target-directory'
+‘-T’
+‘--no-target-directory’
      Do not treat the last operand specially when it is a directory or a
      symbolic link to a directory.  *Note Target directory::.
 
-`-u'
-`--update'
+‘-u’
+‘--update’
      Do not copy a non-directory that has an existing destination with
      the same or newer modification time.  If time stamps are being
      preserved, the comparison is to the source time stamp truncated to
      the resolutions of the destination file system and of the system
      calls used to update time stamps; this avoids duplicate work if
-     several `cp -pu' commands are executed with the same source and
-     destination.  If `--preserve=links' is also specified (like with
-     `cp -au' for example), that will take precedence.  Consequently,
+     several ‘cp -pu’ commands are executed with the same source and
+     destination.  If ‘--preserve=links’ is also specified (like with
+     ‘cp -au’ for example), that will take precedence.  Consequently,
      depending on the order that files are processed from the source,
      newer files in the destination may be replaced, to mirror hard
      links in the source.
 
-`-v'
-`--verbose'
+‘-v’
+‘--verbose’
      Print the name of each file before copying it.
 
-`-x'
-`--one-file-system'
-     Skip subdirectories that are on different file systems from the
-     one that the copy started on.  However, mount point directories
-     _are_ copied.
-
+‘-x’
+‘--one-file-system’
+     Skip subdirectories that are on different file systems from the one
+     that the copy started on.  However, mount point directories _are_
+     copied.
+
+‘-Z’
+‘--context[=CONTEXT]’
+     Without a specified CONTEXT, adjust the SELinux security context
+     according to the system default type for destination files,
+     similarly to the ‘restorecon’ command.  The long form of this
+     option with a specific context specified, will set the context for
+     newly created files only.  With a specified context, if both
+     SELinux and SMACK are disabled, a warning is issued.  This option
+     is mutually exclusive with the ‘--preserve=context’ option, and
+     overrides the ‘--preserve=all’ and ‘-a’ options.
 
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
@@ -6871,231 +6829,232 @@ indicates failure.
 
 File: coreutils.info,  Node: dd invocation,  Next: install invocation,  Prev: cp invocation,  Up: Basic operations
 
-11.2 `dd': Convert and copy a file
+11.2 ‘dd’: Convert and copy a file
 ==================================
 
-`dd' copies a file (from standard input to standard output, by default)
+‘dd’ copies a file (from standard input to standard output, by default)
 with a changeable I/O block size, while optionally performing
 conversions on it.  Synopses:
 
-     dd [OPERAND]...
+     dd [OPERAND]…
      dd OPTION
 
-   The only options are `--help' and `--version'.  *Note Common
-options::.  `dd' accepts the following operands, whose syntax was
+   The only options are ‘--help’ and ‘--version’.  *Note Common
+options::.  ‘dd’ accepts the following operands, whose syntax was
 inspired by the DD (data definition) statement of OS/360 JCL.
 
-`if=FILE'
+‘if=FILE’
      Read from FILE instead of standard input.
 
-`of=FILE'
-     Write to FILE instead of standard output.  Unless `conv=notrunc'
-     is given, `dd' truncates FILE to zero bytes (or the size specified
-     with `seek=').
+‘of=FILE’
+     Write to FILE instead of standard output.  Unless ‘conv=notrunc’ is
+     given, ‘dd’ truncates FILE to zero bytes (or the size specified
+     with ‘seek=’).
 
-`ibs=BYTES'
-     Set the input block size to BYTES.  This makes `dd' read BYTES per
+‘ibs=BYTES’
+     Set the input block size to BYTES.  This makes ‘dd’ read BYTES per
      block.  The default is 512 bytes.
 
-`obs=BYTES'
-     Set the output block size to BYTES.  This makes `dd' write BYTES
+‘obs=BYTES’
+     Set the output block size to BYTES.  This makes ‘dd’ write BYTES
      per block.  The default is 512 bytes.
 
-`bs=BYTES'
-     Set both input and output block sizes to BYTES.  This makes `dd'
-     read and write BYTES per block, overriding any `ibs' and `obs'
-     settings.  In addition, if no data-transforming `conv' option is
-     specified, input is copied to the output as soon as it's read,
-     even if it is smaller than the block size.
+‘bs=BYTES’
+     Set both input and output block sizes to BYTES.  This makes ‘dd’
+     read and write BYTES per block, overriding any ‘ibs’ and ‘obs’
+     settings.  In addition, if no data-transforming ‘conv’ option is
+     specified, input is copied to the output as soon as it’s read, even
+     if it is smaller than the block size.
 
-`cbs=BYTES'
+‘cbs=BYTES’
      Set the conversion block size to BYTES.  When converting
-     variable-length records to fixed-length ones (`conv=block') or the
-     reverse (`conv=unblock'), use BYTES as the fixed record length.
+     variable-length records to fixed-length ones (‘conv=block’) or the
+     reverse (‘conv=unblock’), use BYTES as the fixed record length.
 
-`skip=N'
-     Skip N `ibs'-byte blocks in the input file before copying.  If
-     `iflag=skip_bytes' is specified, N is interpreted as a byte count
+‘skip=N’
+     Skip N ‘ibs’-byte blocks in the input file before copying.  If
+     ‘iflag=skip_bytes’ is specified, N is interpreted as a byte count
      rather than a block count.
 
-`seek=N'
-     Skip N `obs'-byte blocks in the output file before copying.  if
-     `oflag=seek_bytes' is specified, N is interpreted as a byte count
+‘seek=N’
+     Skip N ‘obs’-byte blocks in the output file before copying.  if
+     ‘oflag=seek_bytes’ is specified, N is interpreted as a byte count
      rather than a block count.
 
-`count=N'
-     Copy N `ibs'-byte blocks from the input file, instead of
-     everything until the end of the file.  if `iflag=count_bytes' is
-     specified, N is interpreted as a byte count rather than a block
-     count.  Note if the input may return short reads as could be the
-     case when reading from a pipe for example, `iflag=fullblock' will
-     ensure that `count=' corresponds to complete input blocks rather
-     than the traditional POSIX specified behavior of counting input
-     read operations.
-
-`status=WHICH'
+‘count=N’
+     Copy N ‘ibs’-byte blocks from the input file, instead of everything
+     until the end of the file.  if ‘iflag=count_bytes’ is specified, N
+     is interpreted as a byte count rather than a block count.  Note if
+     the input may return short reads as could be the case when reading
+     from a pipe for example, ‘iflag=fullblock’ will ensure that
+     ‘count=’ corresponds to complete input blocks rather than the
+     traditional POSIX specified behavior of counting input read
+     operations.
+
+‘status=WHICH’
      Transfer information is normally output to stderr upon receipt of
-     the `INFO' signal or when `dd' exits.  Specifying WHICH will
+     the ‘INFO’ signal or when ‘dd’ exits.  Specifying WHICH will
      identify which information to suppress.
 
-    `noxfer'
+     ‘noxfer’
           Do not print the transfer rate and volume statistics that
           normally make up the last status line.
 
-    `none'
-          Do not print any informational messages to stderr.  Error
-          messages are output as normal.
-
+     ‘none’
+          Do not print any informational or warning messages to stderr.
+          Error messages are output as normal.
 
-`conv=CONVERSION[,CONVERSION]...'
+‘conv=CONVERSION[,CONVERSION]…’
      Convert the file as specified by the CONVERSION argument(s).  (No
      spaces around any comma(s).)
 
      Conversions:
 
-    `ascii'
+     ‘ascii’
           Convert EBCDIC to ASCII, using the conversion table specified
           by POSIX.  This provides a 1:1 translation for all 256 bytes.
+          This option implies ‘conv=unblock’; input is converted to
+          ASCII before trailing spaces are deleted.
 
-    `ebcdic'
-          Convert ASCII to EBCDIC.  This is the inverse of the `ascii'
-          conversion.
+     ‘ebcdic’
+          Convert ASCII to EBCDIC.  This is the inverse of the ‘ascii’
+          conversion.  This option implies ‘conv=block’; trailing spaces
+          are added before being converted to EBCDIC.
 
-    `ibm'
-          Convert ASCII to alternate EBCDIC, using the alternate
+     ‘ibm’
+          This acts like ‘conv=ebcdic’, except it uses the alternate
           conversion table specified by POSIX.  This is not a 1:1
-          translation, but reflects common historical practice for `~',
-          `[', and `]'.
+          translation, but reflects common historical practice for ‘~’,
+          ‘[’, and ‘]’.
 
-          The `ascii', `ebcdic', and `ibm' conversions are mutually
-          exclusive.
+          The ‘ascii’, ‘ebcdic’, and ‘ibm’ conversions are mutually
+          exclusive.  If you use any of these options, you should also
+          use the ‘cbs=’ option.
 
-    `block'
-          For each line in the input, output `cbs' bytes, replacing the
+     ‘block’
+          For each line in the input, output ‘cbs’ bytes, replacing the
           input newline with a space and padding with spaces as
           necessary.
 
-    `unblock'
-          Remove any trailing spaces in each `cbs'-sized input block,
+     ‘unblock’
+          Remove any trailing spaces in each ‘cbs’-sized input block,
           and append a newline.
 
-          The `block' and `unblock' conversions are mutually exclusive.
+          The ‘block’ and ‘unblock’ conversions are mutually exclusive.
 
-    `lcase'
+     ‘lcase’
           Change uppercase letters to lowercase.
 
-    `ucase'
+     ‘ucase’
           Change lowercase letters to uppercase.
 
-          The `lcase' and `ucase' conversions are mutually exclusive.
+          The ‘lcase’ and ‘ucase’ conversions are mutually exclusive.
 
-    `sparse'
+     ‘sparse’
           Try to seek rather than write NUL output blocks.  On a file
           system that supports sparse files, this will create sparse
           output when extending the output file.  Be careful when using
-          this option in conjunction with `conv=notrunc' or
-          `oflag=append'.  With `conv=notrunc', existing data in the
+          this option in conjunction with ‘conv=notrunc’ or
+          ‘oflag=append’.  With ‘conv=notrunc’, existing data in the
           output file corresponding to NUL blocks from the input, will
-          be untouched.  With `oflag=append' the seeks performed will
-          be ineffective.  Similarly, when the output is a device
-          rather than a file, NUL input blocks are not copied, and
-          therefore this option is most useful with virtual or pre
-          zeroed devices.
-
-    `swab'
-          Swap every pair of input bytes.  GNU `dd', unlike others,
-          works when an odd number of bytes are read--the last byte is
+          be untouched.  With ‘oflag=append’ the seeks performed will be
+          ineffective.  Similarly, when the output is a device rather
+          than a file, NUL input blocks are not copied, and therefore
+          this option is most useful with virtual or pre zeroed devices.
+
+     ‘swab’
+          Swap every pair of input bytes.  GNU ‘dd’, unlike others,
+          works when an odd number of bytes are read—the last byte is
           simply copied (since there is nothing to swap it with).
 
-    `sync'
-          Pad every input block to size of `ibs' with trailing zero
-          bytes.  When used with `block' or `unblock', pad with spaces
+     ‘sync’
+          Pad every input block to size of ‘ibs’ with trailing zero
+          bytes.  When used with ‘block’ or ‘unblock’, pad with spaces
           instead of zero bytes.
 
-
-     The following "conversions" are really file flags and don't affect
+     The following “conversions� are really file flags and don’t affect
      internal processing:
 
-    `excl'
-          Fail if the output file already exists; `dd' must create the
+     ‘excl’
+          Fail if the output file already exists; ‘dd’ must create the
           output file itself.
 
-    `nocreat'
+     ‘nocreat’
           Do not create the output file; the output file must already
           exist.
 
-          The `excl' and `nocreat' conversions are mutually exclusive.
+          The ‘excl’ and ‘nocreat’ conversions are mutually exclusive.
 
-    `notrunc'
+     ‘notrunc’
           Do not truncate the output file.
 
-    `noerror'
+     ‘noerror’
           Continue after read errors.
 
-    `fdatasync'
+     ‘fdatasync’
           Synchronize output data just before finishing.  This forces a
           physical write of output data.
 
-    `fsync'
+     ‘fsync’
           Synchronize output data and metadata just before finishing.
           This forces a physical write of output data and metadata.
 
-
-`iflag=FLAG[,FLAG]...'
+‘iflag=FLAG[,FLAG]…’
      Access the input file using the flags specified by the FLAG
      argument(s).  (No spaces around any comma(s).)
 
-`oflag=FLAG[,FLAG]...'
+‘oflag=FLAG[,FLAG]…’
      Access the output file using the flags specified by the FLAG
      argument(s).  (No spaces around any comma(s).)
 
      Here are the flags.  Not every flag is supported on every operating
      system.
 
-    `append'
+     ‘append’
           Write in append mode, so that even if some other process is
-          writing to this file, every `dd' write will append to the
+          writing to this file, every ‘dd’ write will append to the
           current contents of the file.  This flag makes sense only for
-          output.  If you combine this flag with the `of=FILE' operand,
-          you should also specify `conv=notrunc' unless you want the
+          output.  If you combine this flag with the ‘of=FILE’ operand,
+          you should also specify ‘conv=notrunc’ unless you want the
           output file to be truncated before being appended to.
 
-    `cio'
+     ‘cio’
           Use concurrent I/O mode for data.  This mode performs direct
           I/O and drops the POSIX requirement to serialize all I/O to
-          the same file.  A file cannot be opened in CIO mode and with
-          a standard open at the same time.
-
-    `direct'
-          Use direct I/O for data, avoiding the buffer cache.  Note
-          that the kernel may impose restrictions on read or write
-          buffer sizes.  For example, with an ext4 destination file
-          system and a linux-based kernel, using `oflag=direct' will
-          cause writes to fail with `EINVAL' if the output buffer size
-          is not a multiple of 512.
-
-    `directory'
+          the same file.  A file cannot be opened in CIO mode and with a
+          standard open at the same time.
+
+     ‘direct’
+          Use direct I/O for data, avoiding the buffer cache.  Note that
+          the kernel may impose restrictions on read or write buffer
+          sizes.  For example, with an ext4 destination file system and
+          a linux-based kernel, using ‘oflag=direct’ will cause writes
+          to fail with ‘EINVAL’ if the output buffer size is not a
+          multiple of 512.
+
+     ‘directory’
+
           Fail unless the file is a directory.  Most operating systems
           do not allow I/O to a directory, so this flag has limited
           utility.
 
-    `dsync'
+     ‘dsync’
           Use synchronized I/O for data.  For the output file, this
-          forces a physical write of output data on each write.  For
-          the input file, this flag can matter when reading from a
-          remote file that has been written to synchronously by some
-          other process.  Metadata (e.g., last-access and last-modified
-          time) is not necessarily synchronized.
+          forces a physical write of output data on each write.  For the
+          input file, this flag can matter when reading from a remote
+          file that has been written to synchronously by some other
+          process.  Metadata (e.g., last-access and last-modified time)
+          is not necessarily synchronized.
 
-    `sync'
+     ‘sync’
           Use synchronized I/O for both data and metadata.
 
-    `nocache'
+     ‘nocache’
           Discard the data cache for a file.  When count=0 all cache is
           discarded, otherwise the cache is dropped for the processed
-          portion of the file.  Also when count=0 failure to discard
-          the cache is diagnosed and reflected in the exit status.
-          Here as some usage examples:
+          portion of the file.  Also when count=0 failure to discard the
+          cache is diagnosed and reflected in the exit status.  Here as
+          some usage examples:
 
                # Advise to drop cache for whole file
                dd if=ifile iflag=nocache count=0
@@ -7109,86 +7068,84 @@ inspired by the DD (data definition) statement of OS/360 JCL.
                # Stream data using just the read-ahead cache
                dd if=ifile of=ofile iflag=nocache oflag=nocache
 
-    `nonblock'
+     ‘nonblock’
           Use non-blocking I/O.
 
-    `noatime'
-          Do not update the file's access time.  Some older file
-          systems silently ignore this flag, so it is a good idea to
-          test it on your files before relying on it.
+     ‘noatime’
+          Do not update the file’s access time.  Some older file systems
+          silently ignore this flag, so it is a good idea to test it on
+          your files before relying on it.
 
-    `noctty'
-          Do not assign the file to be a controlling terminal for `dd'.
+     ‘noctty’
+          Do not assign the file to be a controlling terminal for ‘dd’.
           This has no effect when the file is not a terminal.  On many
           hosts (e.g., GNU/Linux hosts), this option has no effect at
           all.
 
-    `nofollow'
+     ‘nofollow’
           Do not follow symbolic links.
 
-    `nolinks'
+     ‘nolinks’
           Fail if the file has multiple hard links.
 
-    `binary'
+     ‘binary’
           Use binary I/O.  This option has an effect only on nonstandard
           platforms that distinguish binary from text I/O.
 
-    `text'
-          Use text I/O.  Like `binary', this option has no effect on
+     ‘text’
+          Use text I/O.  Like ‘binary’, this option has no effect on
           standard platforms.
 
-    `fullblock'
-          Accumulate full blocks from input.  The `read' system call
-          may return early if a full block is not available.  When that
-          happens, continue calling `read' to fill the remainder of the
-          block.  This flag can be used only with `iflag'.  This flag
-          is useful with pipes for example as they may return short
-          reads. In that case, this flag is needed to ensure that a
-          `count=' argument is interpreted as a block count rather than
-          a count of read operations.
-
-    `count_bytes'
-          Interpret the `count=' operand as a byte count, rather than a
+     ‘fullblock’
+          Accumulate full blocks from input.  The ‘read’ system call may
+          return early if a full block is not available.  When that
+          happens, continue calling ‘read’ to fill the remainder of the
+          block.  This flag can be used only with ‘iflag’.  This flag is
+          useful with pipes for example as they may return short reads.
+          In that case, this flag is needed to ensure that a ‘count=’
+          argument is interpreted as a block count rather than a count
+          of read operations.
+
+     ‘count_bytes’
+          Interpret the ‘count=’ operand as a byte count, rather than a
           block count, which allows specifying a length that is not a
           multiple of the I/O block size.  This flag can be used only
-          with `iflag'.
+          with ‘iflag’.
 
-    `skip_bytes'
-          Interpret the `skip=' operand as a byte count, rather than a
+     ‘skip_bytes’
+          Interpret the ‘skip=’ operand as a byte count, rather than a
           block count, which allows specifying an offset that is not a
           multiple of the I/O block size.  This flag can be used only
-          with `iflag'.
+          with ‘iflag’.
 
-    `seek_bytes'
-          Interpret the `seek=' operand as a byte count, rather than a
+     ‘seek_bytes’
+          Interpret the ‘seek=’ operand as a byte count, rather than a
           block count, which allows specifying an offset that is not a
           multiple of the I/O block size.  This flag can be used only
-          with `oflag'.
-
+          with ‘oflag’.
 
-     These flags are not supported on all systems, and `dd' rejects
+     These flags are not supported on all systems, and ‘dd’ rejects
      attempts to use them when they are not supported.  When reading
-     from standard input or writing to standard output, the `nofollow'
-     and `noctty' flags should not be specified, and the other flags
-     (e.g., `nonblock') can affect how other processes behave with the
-     affected file descriptors, even after `dd' exits.
-
+     from standard input or writing to standard output, the ‘nofollow’
+     and ‘noctty’ flags should not be specified, and the other flags
+     (e.g., ‘nonblock’) can affect how other processes behave with the
+     affected file descriptors, even after ‘dd’ exits.
 
    The numeric-valued strings above (N and BYTES) can be followed by a
-multiplier: `b'=512, `c'=1, `w'=2, `xM'=M, or any of the standard block
-size suffixes like `k'=1024 (*note Block size::).
+multiplier: ‘b’=512, ‘c’=1, ‘w’=2, ‘xM’=M, or any of the standard block
+size suffixes like ‘k’=1024 (*note Block size::).
 
-   Any block size you specify via `bs=', `ibs=', `obs=', `cbs=' should
-not be too large--values larger than a few megabytes are generally
+   Any block size you specify via ‘bs=’, ‘ibs=’, ‘obs=’, ‘cbs=’ should
+not be too large—values larger than a few megabytes are generally
 wasteful or (as in the gigabyte..exabyte case) downright
 counterproductive or error-inducing.
 
    To process data that is at an offset or size that is not a multiple
-of the I/O block size, you can use the `skip_bytes', `seek_bytes' and
-`count_bytes' flags.  Alternatively the traditional method of separate
-`dd' invocations can be used.  For example, the following shell
-commands copy data in 512 KiB blocks between a disk and a tape, but do
-not save or restore a 4 KiB label at the start of the disk:
+of the I/O block size, you can use the ‘skip_bytes’, ‘seek_bytes’ and
+‘count_bytes’ flags.  Alternatively the traditional method of separate
+‘dd’ invocations can be used.  For example, the following shell commands
+copy data in 512 KiB blocks between a disk and a tape, but do not save
+or restore a 4 KiB label at the start of the disk:
 
      disk=/dev/rdsk/c0t1d0s2
      tape=/dev/rmt/0
@@ -7199,12 +7156,26 @@ not save or restore a 4 KiB label at the start of the disk:
      # Copy from tape back to disk, but leave the disk label alone.
      (dd bs=4k seek=1 count=0 && dd bs=512k) <$tape >$disk
 
-   Sending an `INFO' signal to a running `dd' process makes it print
-I/O statistics to standard error and then resume copying.  In the
-example below, `dd' is run in the background to copy 10 million blocks.
-The `kill' command makes it output intermediate I/O statistics, and
-when `dd' completes normally or is killed by the `SIGINT' signal, it
-outputs the final statistics.
+   For failing disks, other tools come with a great variety of extra
+functionality to ease the saving of as much data as possible before the
+disk finally dies, e.g.  GNU ‘ddrescue’
+(http://www.gnu.org/software/ddrescue/).  However, in some cases such a
+tool is not available or the administrator feels more comfortable with
+the handling of ‘dd’.  As a simple rescue method, call ‘dd’ as shown in
+the following example: the options ‘conv=noerror,sync’ are used to
+continue after read errors and to pad out bad reads with NULs, while
+‘iflag=fullblock’ caters for short reads (which traditionally never
+occur on disk based devices):
+
+     # Rescue data from an (unmounted!) partition of a failing disk.
+     dd conv=noerror,sync iflag=fullblock </dev/sda1 > /mnt/rescue.img
+
+   Sending an ‘INFO’ signal to a running ‘dd’ process makes it print I/O
+statistics to standard error and then resume copying.  In the example
+below, ‘dd’ is run in the background to copy 10 million blocks.  The
+‘kill’ command makes it output intermediate I/O statistics, and when
+‘dd’ completes normally or is killed by the ‘SIGINT’ signal, it outputs
+the final statistics.
 
      $ dd if=/dev/zero of=/dev/null count=10MB & pid=$!
      $ kill -s INFO $pid; wait $pid
@@ -7215,8 +7186,8 @@ outputs the final statistics.
      10000000+0 records out
      5120000000 bytes (5.1 GB) copied, 18.913 seconds, 271 MB/s
 
-   On systems lacking the `INFO' signal `dd' responds to the `USR1'
-signal instead, unless the `POSIXLY_CORRECT' environment variable is
+   On systems lacking the ‘INFO’ signal ‘dd’ responds to the ‘USR1’
+signal instead, unless the ‘POSIXLY_CORRECT’ environment variable is
 set.
 
    An exit status of zero indicates success, and a nonzero value
@@ -7225,101 +7196,106 @@ indicates failure.
 
 File: coreutils.info,  Node: install invocation,  Next: mv invocation,  Prev: dd invocation,  Up: Basic operations
 
-11.3 `install': Copy files and set attributes
+11.3 ‘install’: Copy files and set attributes
 =============================================
 
-`install' copies files while setting their file mode bits and, if
+‘install’ copies files while setting their file mode bits and, if
 possible, their owner and group.  Synopses:
 
-     install [OPTION]... [-T] SOURCE DEST
-     install [OPTION]... SOURCE... DIRECTORY
-     install [OPTION]... -t DIRECTORY SOURCE...
-     install [OPTION]... -d DIRECTORY...
+     install [OPTION]… [-T] SOURCE DEST
+     install [OPTION]… SOURCE… DIRECTORY
+     install [OPTION]… -t DIRECTORY SOURCE…
+     install [OPTION]… -d DIRECTORY…
 
-   * If two file names are given, `install' copies the first file to the
+   • If two file names are given, ‘install’ copies the first file to the
      second.
 
-   * If the `--target-directory' (`-t') option is given, or failing
-     that if the last file is a directory and the
-     `--no-target-directory' (`-T') option is not given, `install'
-     copies each SOURCE file to the specified directory, using the
-     SOURCEs' names.
+   • If the ‘--target-directory’ (‘-t’) option is given, or failing that
+     if the last file is a directory and the ‘--no-target-directory’
+     (‘-T’) option is not given, ‘install’ copies each SOURCE file to
+     the specified directory, using the SOURCEs’ names.
 
-   * If the `--directory' (`-d') option is given, `install' creates
-     each DIRECTORY and any missing parent directories.  Parent
-     directories are created with mode `u=rwx,go=rx' (755), regardless
-     of the `-m' option or the current umask.  *Note Directory Setuid
-     and Setgid::, for how the set-user-ID and set-group-ID bits of
-     parent directories are inherited.
+   • If the ‘--directory’ (‘-d’) option is given, ‘install’ creates each
+     DIRECTORY and any missing parent directories.  Parent directories
+     are created with mode ‘u=rwx,go=rx’ (755), regardless of the ‘-m’
+     option or the current umask.  *Note Directory Setuid and Setgid::,
+     for how the set-user-ID and set-group-ID bits of parent directories
+     are inherited.
 
-   `install' is similar to `cp', but allows you to control the
+   ‘install’ is similar to ‘cp’, but allows you to control the
 attributes of destination files.  It is typically used in Makefiles to
 copy programs into their destination directories.  It refuses to copy
 files onto themselves.
 
-   `install' never preserves extended attributes (xattr).
+   ‘install’ never preserves extended attributes (xattr).
 
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-b'
-`--backup[=METHOD]'
+‘-b’
+‘--backup[=METHOD]’
      *Note Backup options::.  Make a backup of each file that would
      otherwise be overwritten or removed.
 
-`-C'
-`--compare'
+‘-C’
+‘--compare’
      Compare each pair of source and destination files, and if the
      destination has identical content and any specified owner, group,
      permissions, and possibly SELinux context, then do not modify the
-     destination at all.
+     destination at all.  Note this option is best used in conjunction
+     with ‘--user’, ‘--group’ and ‘--mode’ options, lest ‘install’
+     incorrectly determines the default attributes that installed files
+     would have (as it doesn’t consider setgid directories and POSIX
+     default ACLs for example).  This could result in redundant copies
+     or attributes that are not reset to the correct defaults.
 
-`-c'
-     Ignored; for compatibility with old Unix versions of `install'.
+‘-c’
+     Ignored; for compatibility with old Unix versions of ‘install’.
 
-`-D'
+‘-D’
      Create any missing parent directories of DEST, then copy SOURCE to
-     DEST.  This option is ignored if a destination directory is
-     specified via `--target-directory=DIR'.
+     DEST.  Explicitly specifying the ‘--target-directory=DIR’ will
+     similarly ensure the presence of that hierarchy before copying
+     SOURCE arguments.
 
-`-d'
-`--directory'
+‘-d’
+‘--directory’
      Create any missing parent directories, giving them the default
      attributes.  Then create each given directory, setting their owner,
      group and mode as given on the command line or to the defaults.
 
-`-g GROUP'
-`--group=GROUP'
-     Set the group ownership of installed files or directories to
-     GROUP.  The default is the process's current group.  GROUP may be
-     either a group name or a numeric group ID.
+‘-g GROUP’
+‘--group=GROUP’
+     Set the group ownership of installed files or directories to GROUP.
+     The default is the process’s current group.  GROUP may be either a
+     group name or a numeric group ID.
 
-`-m MODE'
-`--mode=MODE'
+‘-m MODE’
+‘--mode=MODE’
      Set the file mode bits for the installed file or directory to MODE,
      which can be either an octal number, or a symbolic mode as in
-     `chmod', with `a=' (no access allowed to anyone) as the point of
+     ‘chmod’, with ‘a=’ (no access allowed to anyone) as the point of
      departure (*note File permissions::).  The default mode is
-     `u=rwx,go=rx,a-s'--read, write, and execute for the owner, read
-     and execute for group and other, and with set-user-ID and
-     set-group-ID disabled.  This default is not quite the same as
-     `755', since it disables instead of preserving set-user-ID and
-     set-group-ID on directories.  *Note Directory Setuid and Setgid::.
-
-`-o OWNER'
-`--owner=OWNER'
-     If `install' has appropriate privileges (is run as root), set the
+     ‘u=rwx,go=rx,a-s’—read, write, and execute for the owner, read and
+     execute for group and other, and with set-user-ID and set-group-ID
+     disabled.  This default is not quite the same as ‘755’, since it
+     disables instead of preserving set-user-ID and set-group-ID on
+     directories.  *Note Directory Setuid and Setgid::.
+
+‘-o OWNER’
+‘--owner=OWNER’
+     If ‘install’ has appropriate privileges (is run as root), set the
      ownership of installed files or directories to OWNER.  The default
-     is `root'.  OWNER may be either a user name or a numeric user ID.
+     is ‘root’.  OWNER may be either a user name or a numeric user ID.
 
-`--preserve-context'
+‘--preserve-context’
      Preserve the SELinux security context of files and directories.
      Failure to preserve the context in all of the files or directories
      will result in an exit status of 1.  If SELinux is disabled then
      print a warning and ignore the option.
 
-`-p'
-`--preserve-timestamps'
+‘-p’
+‘--preserve-timestamps’
      Set the time of last access and the time of last modification of
      each installed file to match those of each corresponding original
      file.  When a file is installed without this option, its last
@@ -7328,37 +7304,40 @@ options::.
      modification times of installed files to keep track of when they
      were last built as opposed to when they were last installed.
 
-`-s'
-`--strip'
+‘-s’
+‘--strip’
      Strip the symbol tables from installed binary executables.
 
-`--strip-program=PROGRAM'
+‘--strip-program=PROGRAM’
      Program used to strip binaries.
 
-`-S SUFFIX'
-`--suffix=SUFFIX'
-     Append SUFFIX to each backup file made with `-b'.  *Note Backup
+‘-S SUFFIX’
+‘--suffix=SUFFIX’
+     Append SUFFIX to each backup file made with ‘-b’.  *Note Backup
      options::.
 
-`-t DIRECTORY'
-`--target-directory=DIRECTORY'
+‘-t DIRECTORY’
+‘--target-directory=DIRECTORY’
      Specify the destination DIRECTORY.  *Note Target directory::.
 
-`-T'
-`--no-target-directory'
+‘-T’
+‘--no-target-directory’
      Do not treat the last operand specially when it is a directory or a
      symbolic link to a directory.  *Note Target directory::.
 
-`-v'
-`--verbose'
+‘-v’
+‘--verbose’
      Print the name of each file before copying it.
 
-`-Z CONTEXT'
-`--context=CONTEXT'
-     Set the default SELinux security context to be used for any
-     created files and directories.  If SELinux is disabled then print
-     a warning and ignore the option.
-
+‘-Z’
+‘--context[=CONTEXT]’
+     Without a specified CONTEXT, adjust the SELinux security context
+     according to the system default type for destination files,
+     similarly to the ‘restorecon’ command.  The long form of this
+     option with a specific context specified, will set the context for
+     newly created files only.  With a specified context, if both
+     SELinux and SMACK are disabled, a warning is issued.  This option
+     is mutually exclusive with the ‘--preserve-context’ option.
 
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
@@ -7366,115 +7345,118 @@ indicates failure.
 
 File: coreutils.info,  Node: mv invocation,  Next: rm invocation,  Prev: install invocation,  Up: Basic operations
 
-11.4 `mv': Move (rename) files
+11.4 ‘mv’: Move (rename) files
 ==============================
 
-`mv' moves or renames files (or directories).  Synopses:
+‘mv’ moves or renames files (or directories).  Synopses:
 
-     mv [OPTION]... [-T] SOURCE DEST
-     mv [OPTION]... SOURCE... DIRECTORY
-     mv [OPTION]... -t DIRECTORY SOURCE...
+     mv [OPTION]… [-T] SOURCE DEST
+     mv [OPTION]… SOURCE… DIRECTORY
+     mv [OPTION]… -t DIRECTORY SOURCE…
 
-   * If two file names are given, `mv' moves the first file to the
+   • If two file names are given, ‘mv’ moves the first file to the
      second.
 
-   * If the `--target-directory' (`-t') option is given, or failing
-     that if the last file is a directory and the
-     `--no-target-directory' (`-T') option is not given, `mv' moves
-     each SOURCE file to the specified directory, using the SOURCEs'
-     names.
-
-   `mv' can move any type of file from one file system to another.
-Prior to version `4.0' of the fileutils, `mv' could move only regular
-files between file systems.  For example, now `mv' can move an entire
-directory hierarchy including special device files from one partition
-to another.  It first uses some of the same code that's used by `cp -a'
-to copy the requested directories and files, then (assuming the copy
+   • If the ‘--target-directory’ (‘-t’) option is given, or failing that
+     if the last file is a directory and the ‘--no-target-directory’
+     (‘-T’) option is not given, ‘mv’ moves each SOURCE file to the
+     specified directory, using the SOURCEs’ names.
+
+   ‘mv’ can move any type of file from one file system to another.
+Prior to version ‘4.0’ of the fileutils, ‘mv’ could move only regular
+files between file systems.  For example, now ‘mv’ can move an entire
+directory hierarchy including special device files from one partition to
+another.  It first uses some of the same code that’s used by ‘cp -a’ to
+copy the requested directories and files, then (assuming the copy
 succeeded) it removes the originals.  If the copy fails, then the part
-that was copied to the destination partition is removed.  If you were
-to copy three directories from one partition to another and the copy of
-the first directory succeeded, but the second didn't, the first would
-be left on the destination partition and the second and third would be
-left on the original partition.
+that was copied to the destination partition is removed.  If you were to
+copy three directories from one partition to another and the copy of the
+first directory succeeded, but the second didn’t, the first would be
+left on the destination partition and the second and third would be left
+on the original partition.
 
-   `mv' always tries to copy extended attributes (xattr), which may
+   ‘mv’ always tries to copy extended attributes (xattr), which may
 include SELinux context, ACLs or Capabilities.  Upon failure all but
-`Operation not supported' warnings are output.
+‘Operation not supported’ warnings are output.
 
    If a destination file exists but is normally unwritable, standard
-input is a terminal, and the `-f' or `--force' option is not given,
-`mv' prompts the user for whether to replace the file.  (You might own
-the file, or have write permission on its directory.)  If the response
-is not affirmative, the file is skipped.
-
-   _Warning_: Avoid specifying a source name with a trailing slash,
-when it might be a symlink to a directory.  Otherwise, `mv' may do
-something very surprising, since its behavior depends on the underlying
-rename system call.  On a system with a modern Linux-based kernel, it
-fails with `errno=ENOTDIR'.  However, on other systems (at least
-FreeBSD 6.1 and Solaris 10) it silently renames not the symlink but
-rather the directory referenced by the symlink.  *Note Trailing
-slashes::.
+input is a terminal, and the ‘-f’ or ‘--force’ option is not given, ‘mv’
+prompts the user for whether to replace the file.  (You might own the
+file, or have write permission on its directory.)  If the response is
+not affirmative, the file is skipped.
+
+   _Warning_: Avoid specifying a source name with a trailing slash, when
+it might be a symlink to a directory.  Otherwise, ‘mv’ may do something
+very surprising, since its behavior depends on the underlying rename
+system call.  On a system with a modern Linux-based kernel, it fails
+with ‘errno=ENOTDIR’.  However, on other systems (at least FreeBSD 6.1
+and Solaris 10) it silently renames not the symlink but rather the
+directory referenced by the symlink.  *Note Trailing slashes::.
 
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-b'
-`--backup[=METHOD]'
+‘-b’
+‘--backup[=METHOD]’
      *Note Backup options::.  Make a backup of each file that would
      otherwise be overwritten or removed.
 
-`-f'
-`--force'
+‘-f’
+‘--force’
      Do not prompt the user before removing a destination file.  If you
-     specify more than one of the `-i', `-f', `-n' options, only the
+     specify more than one of the ‘-i’, ‘-f’, ‘-n’ options, only the
      final one takes effect.
 
-`-i'
-`--interactive'
+‘-i’
+‘--interactive’
      Prompt whether to overwrite each existing destination file,
-     regardless of its permissions.  If the response is not
-     affirmative, the file is skipped.  If you specify more than one of
-     the `-i', `-f', `-n' options, only the final one takes effect.
-
-`-n'
-`--no-clobber'
-     Do not overwrite an existing file.  If you specify more than one
-     of the `-i', `-f', `-n' options, only the final one takes effect.
-     This option is mutually exclusive with `-b' or `--backup' option.
-
-`-u'
-`--update'
+     regardless of its permissions.  If the response is not affirmative,
+     the file is skipped.  If you specify more than one of the ‘-i’,
+     ‘-f’, ‘-n’ options, only the final one takes effect.
+
+‘-n’
+‘--no-clobber’
+     Do not overwrite an existing file.  If you specify more than one of
+     the ‘-i’, ‘-f’, ‘-n’ options, only the final one takes effect.
+     This option is mutually exclusive with ‘-b’ or ‘--backup’ option.
+
+‘-u’
+‘--update’
      Do not move a non-directory that has an existing destination with
      the same or newer modification time.  If the move is across file
      system boundaries, the comparison is to the source time stamp
      truncated to the resolutions of the destination file system and of
      the system calls used to update time stamps; this avoids duplicate
-     work if several `mv -u' commands are executed with the same source
+     work if several ‘mv -u’ commands are executed with the same source
      and destination.
 
-`-v'
-`--verbose'
+‘-v’
+‘--verbose’
      Print the name of each file before moving it.
 
-`--strip-trailing-slashes'
+‘--strip-trailing-slashes’
      Remove any trailing slashes from each SOURCE argument.  *Note
      Trailing slashes::.
 
-`-S SUFFIX'
-`--suffix=SUFFIX'
-     Append SUFFIX to each backup file made with `-b'.  *Note Backup
+‘-S SUFFIX’
+‘--suffix=SUFFIX’
+     Append SUFFIX to each backup file made with ‘-b’.  *Note Backup
      options::.
 
-`-t DIRECTORY'
-`--target-directory=DIRECTORY'
+‘-t DIRECTORY’
+‘--target-directory=DIRECTORY’
      Specify the destination DIRECTORY.  *Note Target directory::.
 
-`-T'
-`--no-target-directory'
+‘-T’
+‘--no-target-directory’
      Do not treat the last operand specially when it is a directory or a
      symbolic link to a directory.  *Note Target directory::.
 
+‘-Z’
+‘--context’
+     This option functions similarly to the ‘restorecon’ command, by
+     adjusting the SELinux security context according to the system
+     default type for destination files.
 
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
@@ -7482,109 +7464,106 @@ indicates failure.
 
 File: coreutils.info,  Node: rm invocation,  Next: shred invocation,  Prev: mv invocation,  Up: Basic operations
 
-11.5 `rm': Remove files or directories
+11.5 ‘rm’: Remove files or directories
 ======================================
 
-`rm' removes each given FILE.  By default, it does not remove
+‘rm’ removes each given FILE.  By default, it does not remove
 directories.  Synopsis:
 
-     rm [OPTION]... [FILE]...
+     rm [OPTION]… [FILE]…
 
-   If the `-I' or `--interactive=once' option is given, and there are
-more than three files or the `-r', `-R', or `--recursive' are given,
-then `rm' prompts the user for whether to proceed with the entire
+   If the ‘-I’ or ‘--interactive=once’ option is given, and there are
+more than three files or the ‘-r’, ‘-R’, or ‘--recursive’ are given,
+then ‘rm’ prompts the user for whether to proceed with the entire
 operation.  If the response is not affirmative, the entire command is
 aborted.
 
    Otherwise, if a file is unwritable, standard input is a terminal, and
-the `-f' or `--force' option is not given, or the `-i' or
-`--interactive=always' option _is_ given, `rm' prompts the user for
+the ‘-f’ or ‘--force’ option is not given, or the ‘-i’ or
+‘--interactive=always’ option _is_ given, ‘rm’ prompts the user for
 whether to remove the file.  If the response is not affirmative, the
 file is skipped.
 
-   Any attempt to remove a file whose last file name component is `.'
-or `..' is rejected without any prompting.
+   Any attempt to remove a file whose last file name component is ‘.’ or
+‘..’ is rejected without any prompting, as mandated by POSIX.
 
-   _Warning_: If you use `rm' to remove a file, it is usually possible
+   _Warning_: If you use ‘rm’ to remove a file, it is usually possible
 to recover the contents of that file.  If you want more assurance that
-the contents are truly unrecoverable, consider using `shred'.
+the contents are truly unrecoverable, consider using ‘shred’.
 
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-d'
-`--dir'
+‘-d’
+‘--dir’
      Remove the listed directories if they are empty.
 
-`-f'
-`--force'
-     Ignore nonexistent files and missing operands, and never prompt
-     the user.  Ignore any previous `--interactive' (`-i') option.
+‘-f’
+‘--force’
+     Ignore nonexistent files and missing operands, and never prompt the
+     user.  Ignore any previous ‘--interactive’ (‘-i’) option.
 
-`-i'
+‘-i’
      Prompt whether to remove each file.  If the response is not
-     affirmative, the file is skipped.  Ignore any previous `--force'
-     (`-f') option.  Equivalent to `--interactive=always'.
+     affirmative, the file is skipped.  Ignore any previous ‘--force’
+     (‘-f’) option.  Equivalent to ‘--interactive=always’.
 
-`-I'
+‘-I’
      Prompt once whether to proceed with the command, if more than three
      files are named or if a recursive removal is requested.  Ignore any
-     previous `--force' (`-f') option.  Equivalent to
-     `--interactive=once'.
+     previous ‘--force’ (‘-f’) option.  Equivalent to
+     ‘--interactive=once’.
 
-`--interactive [=WHEN]'
+‘--interactive [=WHEN]’
      Specify when to issue an interactive prompt.  WHEN may be omitted,
      or one of:
-        * never - Do not prompt at all.
-
-        * once - Prompt once if more than three files are named or if a
-          recursive removal is requested.  Equivalent to `-I'.
-
-        * always - Prompt for every file being removed.  Equivalent to
-          `-i'.
-     `--interactive' with no WHEN is equivalent to
-     `--interactive=always'.
-
-`--one-file-system'
+        • never - Do not prompt at all.
+        • once - Prompt once if more than three files are named or if a
+          recursive removal is requested.  Equivalent to ‘-I’.
+        • always - Prompt for every file being removed.  Equivalent to
+          ‘-i’.
+     ‘--interactive’ with no WHEN is equivalent to
+     ‘--interactive=always’.
+
+‘--one-file-system’
      When removing a hierarchy recursively, skip any directory that is
      on a file system different from that of the corresponding command
      line argument.
 
-     This option is useful when removing a build "chroot" hierarchy,
+     This option is useful when removing a build “chroot� hierarchy,
      which normally contains no valuable data.  However, it is not
-     uncommon to bind-mount `/home' into such a hierarchy, to make it
-     easier to use one's start-up file.  The catch is that it's easy to
-     forget to unmount `/home'.  Then, when you use `rm -rf' to remove
+     uncommon to bind-mount ‘/home’ into such a hierarchy, to make it
+     easier to use one’s start-up file.  The catch is that it’s easy to
+     forget to unmount ‘/home’.  Then, when you use ‘rm -rf’ to remove
      your normally throw-away chroot, that command will remove
-     everything under `/home', too.  Use the `--one-file-system'
-     option, and it will warn about and skip directories on other file
-     systems.  Of course, this will not save your `/home' if it and your
-     chroot happen to be on the same file system.
-
-`--preserve-root'
-     Fail upon any attempt to remove the root directory, `/', when used
-     with the `--recursive' option.  This is the default behavior.
+     everything under ‘/home’, too.  Use the ‘--one-file-system’ option,
+     and it will warn about and skip directories on other file systems.
+     Of course, this will not save your ‘/home’ if it and your chroot
+     happen to be on the same file system.
+
+‘--preserve-root’
+     Fail upon any attempt to remove the root directory, ‘/’, when used
+     with the ‘--recursive’ option.  This is the default behavior.
      *Note Treating / specially::.
 
-`--no-preserve-root'
-     Do not treat `/' specially when removing recursively.  This option
+‘--no-preserve-root’
+     Do not treat ‘/’ specially when removing recursively.  This option
      is not recommended unless you really want to remove all the files
      on your computer.  *Note Treating / specially::.
 
-`-r'
-`-R'
-`--recursive'
+‘-r’
+‘-R’
+‘--recursive’
      Remove the listed directories and their contents recursively.
 
-`-v'
-`--verbose'
+‘-v’
+‘--verbose’
      Print the name of each file before removing it.
 
-
    One common question is how to remove files whose names begin with a
-`-'.  GNU `rm', like every program that uses the `getopt' function to
-parse its arguments, lets you use the `--' option to indicate that all
-following arguments are non-options.  To remove a file called `-f' in
+‘-’.  GNU ‘rm’, like every program that uses the ‘getopt’ function to
+parse its arguments, lets you use the ‘--’ option to indicate that all
+following arguments are non-options.  To remove a file called ‘-f’ in
 the current directory, you could type either:
 
      rm -- -f
@@ -7593,8 +7572,8 @@ or:
 
      rm ./-f
 
-   The Unix `rm' program's use of a single `-' for this purpose
-predates the development of the getopt standard syntax.
+   The Unix ‘rm’ program’s use of a single ‘-’ for this purpose predates
+the development of the getopt standard syntax.
 
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
@@ -7602,73 +7581,73 @@ indicates failure.
 
 File: coreutils.info,  Node: shred invocation,  Prev: rm invocation,  Up: Basic operations
 
-11.6 `shred': Remove files more securely
+11.6 ‘shred’: Remove files more securely
 ========================================
 
-`shred' overwrites devices or files, to help prevent even very
-expensive hardware from recovering the data.
+‘shred’ overwrites devices or files, to help prevent even very expensive
+hardware from recovering the data.
 
    Ordinarily when you remove a file (*note rm invocation::), the data
 is not actually destroyed.  Only the index listing where the file is
-stored is destroyed, and the storage is made available for reuse.
-There are undelete utilities that will attempt to reconstruct the index
-and can bring the file back if the parts were not reused.
+stored is destroyed, and the storage is made available for reuse.  There
+are undelete utilities that will attempt to reconstruct the index and
+can bring the file back if the parts were not reused.
 
    On a busy system with a nearly-full drive, space can get reused in a
 few seconds.  But there is no way to know for sure.  If you have
-sensitive data, you may want to be sure that recovery is not possible
-by actually overwriting the file with non-sensitive data.
+sensitive data, you may want to be sure that recovery is not possible by
+actually overwriting the file with non-sensitive data.
 
    However, even after doing that, it is possible to take the disk back
 to a laboratory and use a lot of sensitive (and expensive) equipment to
-look for the faint "echoes" of the original data underneath the
-overwritten data.  If the data has only been overwritten once, it's not
+look for the faint “echoes� of the original data underneath the
+overwritten data.  If the data has only been overwritten once, it’s not
 even that hard.
 
    The best way to remove something irretrievably is to destroy the
-media it's on with acid, melt it down, or the like.  For cheap
-removable media like floppy disks, this is the preferred method.
-However, hard drives are expensive and hard to melt, so the `shred'
-utility tries to achieve a similar effect non-destructively.
+media it’s on with acid, melt it down, or the like.  For cheap removable
+media like floppy disks, this is the preferred method.  However, hard
+drives are expensive and hard to melt, so the ‘shred’ utility tries to
+achieve a similar effect non-destructively.
 
    This uses many overwrite passes, with the data patterns chosen to
 maximize the damage they do to the old data.  While this will work on
-floppies, the patterns are designed for best effect on hard drives.
-For more details, see the source code and Peter Gutmann's paper `Secure
-Deletion of Data from Magnetic and Solid-State Memory'
+floppies, the patterns are designed for best effect on hard drives.  For
+more details, see the source code and Peter Gutmann’s paper ‘Secure
+Deletion of Data from Magnetic and Solid-State Memory’
 (http://www.cs.auckland.ac.nz/~pgut001/pubs/secure_del.html), from the
 proceedings of the Sixth USENIX Security Symposium (San Jose,
-California, July 22-25, 1996).
+California, July 22–25, 1996).
 
-   *Please note* that `shred' relies on a very important assumption:
+   *Please note* that ‘shred’ relies on a very important assumption:
 that the file system overwrites data in place.  This is the traditional
 way to do things, but many modern file system designs do not satisfy
 this assumption.  Exceptions include:
 
-   * Log-structured or journaled file systems, such as those supplied
+   • Log-structured or journaled file systems, such as those supplied
      with AIX and Solaris, and JFS, ReiserFS, XFS, Ext3 (in
-     `data=journal' mode), BFS, NTFS, etc., when they are configured to
+     ‘data=journal’ mode), BFS, NTFS, etc., when they are configured to
      journal _data_.
 
-   * File systems that write redundant data and carry on even if some
+   • File systems that write redundant data and carry on even if some
      writes fail, such as RAID-based file systems.
 
-   * File systems that make snapshots, such as Network Appliance's NFS
+   • File systems that make snapshots, such as Network Appliance’s NFS
      server.
 
-   * File systems that cache in temporary locations, such as NFS
-     version 3 clients.
+   • File systems that cache in temporary locations, such as NFS version
+     3 clients.
 
-   * Compressed file systems.
+   • Compressed file systems.
 
    In the particular case of ext3 file systems, the above disclaimer
-applies (and `shred' is thus of limited effectiveness) only in
-`data=journal' mode, which journals file data in addition to just
-metadata.  In both the `data=ordered' (default) and `data=writeback'
-modes, `shred' works as usual.  Ext3 journaling modes can be changed by
-adding the `data=something' option to the mount options for a
-particular file system in the `/etc/fstab' file, as documented in the
-mount man page (man mount).
+applies (and ‘shred’ is thus of limited effectiveness) only in
+‘data=journal’ mode, which journals file data in addition to just
+metadata.  In both the ‘data=ordered’ (default) and ‘data=writeback’
+modes, ‘shred’ works as usual.  Ext3 journaling modes can be changed by
+adding the ‘data=something’ option to the mount options for a particular
+file system in the ‘/etc/fstab’ file, as documented in the mount man
+page (man mount).
 
    If you are not sure how your file system operates, then you should
 assume that it does not overwrite data in place, which means that shred
@@ -7678,82 +7657,91 @@ cannot reliably operate on regular files in your file system.
 file, since this bypasses the problem of file system design mentioned
 above.  However, even shredding devices is not always completely
 reliable.  For example, most disks map out bad sectors invisibly to the
-application; if the bad sectors contain sensitive data, `shred' won't
-be able to destroy it.
+application; if the bad sectors contain sensitive data, ‘shred’ won’t be
+able to destroy it.
 
-   `shred' makes no attempt to detect or report this problem, just as
-it makes no attempt to do anything about backups.  However, since it is
-more reliable to shred devices than files, `shred' by default does not
+   ‘shred’ makes no attempt to detect or report this problem, just as it
+makes no attempt to do anything about backups.  However, since it is
+more reliable to shred devices than files, ‘shred’ by default does not
 truncate or remove the output file.  This default is more suitable for
 devices, which typically cannot be truncated and should not be removed.
 
    Finally, consider the risk of backups and mirrors.  File system
-backups and remote mirrors may contain copies of the file that cannot
-be removed, and that will allow a shredded file to be recovered later.
-So if you keep any data you may later want to destroy using `shred', be
+backups and remote mirrors may contain copies of the file that cannot be
+removed, and that will allow a shredded file to be recovered later.  So
+if you keep any data you may later want to destroy using ‘shred’, be
 sure that it is not backed up or mirrored.
 
-     shred [OPTION]... FILE[...]
+     shred [OPTION]… FILE[…]
 
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-f'
-`--force'
+‘-f’
+‘--force’
      Override file permissions if necessary to allow overwriting.
 
-`-NUMBER'
-`-n NUMBER'
-`--iterations=NUMBER'
-     By default, `shred' uses 3 passes of overwrite.  You can reduce
-     this to save time, or increase it if you think it's appropriate.
+‘-NUMBER’
+‘-n NUMBER’
+‘--iterations=NUMBER’
+     By default, ‘shred’ uses 3 passes of overwrite.  You can reduce
+     this to save time, or increase it if you think it’s appropriate.
      After 25 passes all of the internal overwrite patterns will have
      been used at least once.
 
-`--random-source=FILE'
-     Use FILE as a source of random data used to overwrite and to
-     choose pass ordering.  *Note Random sources::.
+‘--random-source=FILE’
+     Use FILE as a source of random data used to overwrite and to choose
+     pass ordering.  *Note Random sources::.
 
-`-s BYTES'
-`--size=BYTES'
+‘-s BYTES’
+‘--size=BYTES’
      Shred the first BYTES bytes of the file.  The default is to shred
      the whole file.  BYTES can be followed by a size specification like
-     `K', `M', or `G' to specify a multiple.  *Note Block size::.
+     ‘K’, ‘M’, or ‘G’ to specify a multiple.  *Note Block size::.
 
-`-u'
-`--remove'
+‘-u’
+‘--remove[=HOW]’
      After shredding a file, truncate it (if possible) and then remove
      it.  If a file has multiple links, only the named links will be
-     removed.
-
-`-v'
-`--verbose'
+     removed.  Often the file name is less sensitive than the file data,
+     in which case the optional HOW parameter gives control of how to
+     more efficiently remove each directory entry.  The ‘unlink’
+     parameter will just use a standard unlink call, ‘wipe’ will also
+     first obfuscate bytes in the name, and ‘wipesync’ will also sync
+     each obfuscated byte in the name to disk.  Note ‘wipesync’ is the
+     default method, but can be expensive, requiring a sync for every
+     character in every file.  This can become significant with many
+     files, or is redundant if your file system provides synchronous
+     metadata updates.
+
+‘-v’
+‘--verbose’
      Display to standard error all status updates as sterilization
      proceeds.
 
-`-x'
-`--exact'
-     By default, `shred' rounds the size of a regular file up to the
+‘-x’
+‘--exact’
+     By default, ‘shred’ rounds the size of a regular file up to the
      next multiple of the file system block size to fully erase the
-     last block of the file.  Use `--exact' to suppress that behavior.
-     Thus, by default if you shred a 10-byte regular file on a system
-     with 512-byte blocks, the resulting file will be 512 bytes long.
-     With this option, shred does not increase the apparent size of the
-     file.
-
-`-z'
-`--zero'
-     Normally, the last pass that `shred' writes is made up of random
+     slack space in the last block of the file.  This space may contain
+     portions of the current system memory on some systems for example.
+     Use ‘--exact’ to suppress that behavior.  Thus, by default if you
+     shred a 10-byte regular file on a system with 512-byte blocks, the
+     resulting file will be 512 bytes long.  With this option, shred
+     does not increase the apparent size of the file.
+
+‘-z’
+‘--zero’
+     Normally, the last pass that ‘shred’ writes is made up of random
      data.  If this would be conspicuous on your hard drive (for
      example, because it looks like encrypted data), or you just think
-     it's tidier, the `--zero' option adds an additional overwrite pass
+     it’s tidier, the ‘--zero’ option adds an additional overwrite pass
      with all zero bits.  This is in addition to the number of passes
-     specified by the `--iterations' option.
-
+     specified by the ‘--iterations’ option.
 
    You might use the following command to erase all trace of the file
-system you'd created on the floppy disk in your first drive.  That
-command takes about 20 minutes to erase a "1.44MB" (actually 1440 KiB)
+system you’d created on the floppy disk in your first drive.  That
+command takes about 20 minutes to erase a “1.44MB� (actually 1440 KiB)
 floppy.
 
      shred --verbose /dev/fd0
@@ -7770,12 +7758,12 @@ one third the time of the default three-pass approach.
      shred --verbose -n1 /dev/sda5
 
    To be on the safe side, use at least one pass that overwrites using
-pseudo-random data.  I.e., don't be tempted to use `-n0 --zero', in
-case some disk controller optimizes the process of writing blocks of
-all zeros, and thereby does not clear all bytes in a block.  Some SSDs
-may do just that.
+pseudo-random data.  I.e., don’t be tempted to use ‘-n0 --zero’, in case
+some disk controller optimizes the process of writing blocks of all
+zeros, and thereby does not clear all bytes in a block.  Some SSDs may
+do just that.
 
-   A FILE of `-' denotes standard output.  The intended use of this is
+   A FILE of ‘-’ denotes standard output.  The intended use of this is
 to shred a removed temporary file.  For example:
 
      i=$(mktemp)
@@ -7785,10 +7773,10 @@ to shred a removed temporary file.  For example:
      shred - >&3
      exec 3>-
 
-   However, the command `shred - >file' does not shred the contents of
-FILE, since the shell truncates FILE before invoking `shred'.  Use the
-command `shred file' or (if using a Bourne-compatible shell) the
-command `shred - 1<>file' instead.
+   However, the command ‘shred - >file’ does not shred the contents of
+FILE, since the shell truncates FILE before invoking ‘shred’.  Use the
+command ‘shred file’ or (if using a Bourne-compatible shell) the command
+‘shred - 1<>file’ instead.
 
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
@@ -7800,16 +7788,16 @@ File: coreutils.info,  Node: Special file types,  Next: Changing file attributes
 *********************
 
 This chapter describes commands which create special types of files (and
-`rmdir', which removes directories, one special file type).
+‘rmdir’, which removes directories, one special file type).
 
    Although Unix-like operating systems have markedly fewer special file
 types than others, not _everything_ can be treated only as the
 undifferentiated byte stream of "normal files".  For example, when a
 file is created or removed, the system must record this information,
-which it does in a "directory"--a special type of file.  Although you
-can read directories as normal files, if you're curious, in order for
-the system to do its job it must impose a structure, a certain order,
-on the bytes of the file.  Thus it is a "special" type of file.
+which it does in a "directory"—a special type of file.  Although you can
+read directories as normal files, if you’re curious, in order for the
+system to do its job it must impose a structure, a certain order, on the
+bytes of the file.  Thus it is a “special� type of file.
 
    Besides directories, other special file types include named pipes
 (FIFOs), symbolic links, sockets, and so-called "special files".
@@ -7828,28 +7816,28 @@ on the bytes of the file.  Thus it is a "special" type of file.
 
 File: coreutils.info,  Node: link invocation,  Next: ln invocation,  Up: Special file types
 
-12.1 `link': Make a hard link via the link syscall
+12.1 ‘link’: Make a hard link via the link syscall
 ==================================================
 
-`link' creates a single hard link at a time.  It is a minimalist
-interface to the system-provided `link' function.  *Note Hard Links:
-(libc)Hard Links.  It avoids the bells and whistles of the more
-commonly-used `ln' command (*note ln invocation::).  Synopsis:
+‘link’ creates a single hard link at a time.  It is a minimalist
+interface to the system-provided ‘link’ function.  *Note (libc)Hard
+Links::.  It avoids the bells and whistles of the more commonly-used
+‘ln’ command (*note ln invocation::).  Synopsis:
 
      link FILENAME LINKNAME
 
    FILENAME must specify an existing file, and LINKNAME must specify a
-nonexistent entry in an existing directory.  `link' simply calls `link
-(FILENAME, LINKNAME)' to create the link.
+nonexistent entry in an existing directory.  ‘link’ simply calls ‘link
+(FILENAME, LINKNAME)’ to create the link.
 
-   On a GNU system, this command acts like `ln --directory
---no-target-directory FILENAME LINKNAME'.  However, the `--directory'
-and `--no-target-directory' options are not specified by POSIX, and the
-`link' command is more portable in practice.
+   On a GNU system, this command acts like ‘ln --directory
+--no-target-directory FILENAME LINKNAME’.  However, the ‘--directory’
+and ‘--no-target-directory’ options are not specified by POSIX, and the
+‘link’ command is more portable in practice.
 
    If FILENAME is a symbolic link, it is unspecified whether LINKNAME
 will be a hard link to the symbolic link or to the target of the
-symbolic link.  Use `ln -P' or `ln -L' to specify which behavior is
+symbolic link.  Use ‘ln -P’ or ‘ln -L’ to specify which behavior is
 desired.
 
    An exit status of zero indicates success, and a nonzero value
@@ -7858,39 +7846,37 @@ indicates failure.
 
 File: coreutils.info,  Node: ln invocation,  Next: mkdir invocation,  Prev: link invocation,  Up: Special file types
 
-12.2 `ln': Make links between files
+12.2 ‘ln’: Make links between files
 ===================================
 
-`ln' makes links between files.  By default, it makes hard links; with
-the `-s' option, it makes symbolic (or "soft") links.  Synopses:
+‘ln’ makes links between files.  By default, it makes hard links; with
+the ‘-s’ option, it makes symbolic (or "soft") links.  Synopses:
 
-     ln [OPTION]... [-T] TARGET LINKNAME
-     ln [OPTION]... TARGET
-     ln [OPTION]... TARGET... DIRECTORY
-     ln [OPTION]... -t DIRECTORY TARGET...
+     ln [OPTION]… [-T] TARGET LINKNAME
+     ln [OPTION]… TARGET
+     ln [OPTION]… TARGET… DIRECTORY
+     ln [OPTION]… -t DIRECTORY TARGET…
 
-   * If two file names are given, `ln' creates a link to the first file
+   • If two file names are given, ‘ln’ creates a link to the first file
      from the second.
 
-   * If one TARGET is given, `ln' creates a link to that file in the
+   • If one TARGET is given, ‘ln’ creates a link to that file in the
      current directory.
 
-   * If the `--target-directory' (`-t') option is given, or failing
-     that if the last file is a directory and the
-     `--no-target-directory' (`-T') option is not given, `ln' creates a
-     link to each TARGET file in the specified directory, using the
-     TARGETs' names.
-
+   • If the ‘--target-directory’ (‘-t’) option is given, or failing that
+     if the last file is a directory and the ‘--no-target-directory’
+     (‘-T’) option is not given, ‘ln’ creates a link to each TARGET file
+     in the specified directory, using the TARGETs’ names.
 
-   Normally `ln' does not remove existing files.  Use the `--force'
-(`-f') option to remove them unconditionally, the `--interactive'
-(`-i') option to remove them conditionally, and the `--backup' (`-b')
-option to rename them.
+   Normally ‘ln’ does not remove existing files.  Use the ‘--force’
+(‘-f’) option to remove them unconditionally, the ‘--interactive’ (‘-i’)
+option to remove them conditionally, and the ‘--backup’ (‘-b’) option to
+rename them.
 
    A "hard link" is another name for an existing file; the link and the
 original are indistinguishable.  Technically speaking, they share the
 same inode, and the inode contains all the information about a
-file--indeed, it is not incorrect to say that the inode _is_ the file.
+file—indeed, it is not incorrect to say that the inode _is_ the file.
 Most systems prohibit making a hard link to a directory; on those where
 it is allowed, only the super-user can do so (and with caution, since
 creating a cycle will cause problems to many other utilities).  Hard
@@ -7903,96 +7889,94 @@ special file type (which not all kernels support: System V release 3
 refers to a different file, by name.  When most operations (opening,
 reading, writing, and so on) are passed the symbolic link file, the
 kernel automatically "dereferences" the link and operates on the target
-of the link.  But some operations (e.g., removing) work on the link
-file itself, rather than on its target.  The owner and group of a
-symlink are not significant to file access performed through the link,
-but do have implications on deleting a symbolic link from a directory
-with the restricted deletion bit set.  On the GNU system, the mode of a
-symlink has no significance and cannot be changed, but on some BSD
-systems, the mode can be changed and will affect whether the symlink
-will be traversed in file name resolution.  *Note Symbolic Links:
-(libc)Symbolic Links.
+of the link.  But some operations (e.g., removing) work on the link file
+itself, rather than on its target.  The owner and group of a symlink are
+not significant to file access performed through the link, but do have
+implications on deleting a symbolic link from a directory with the
+restricted deletion bit set.  On the GNU system, the mode of a symlink
+has no significance and cannot be changed, but on some BSD systems, the
+mode can be changed and will affect whether the symlink will be
+traversed in file name resolution.  *Note (libc)Symbolic Links::.
 
    Symbolic links can contain arbitrary strings; a "dangling symlink"
-occurs when the string in the symlink does not resolve to a file.
-There are no restrictions against creating dangling symbolic links.
-There are trade-offs to using absolute or relative symlinks.  An
-absolute symlink always points to the same file, even if the directory
-containing the link is moved.  However, if the symlink is visible from
-more than one machine (such as on a networked file system), the file
-pointed to might not always be the same.  A relative symbolic link is
-resolved in relation to the directory that contains the link, and is
-often useful in referring to files on the same device without regards
-to what name that device is mounted on when accessed via networked
-machines.
+occurs when the string in the symlink does not resolve to a file.  There
+are no restrictions against creating dangling symbolic links.  There are
+trade-offs to using absolute or relative symlinks.  An absolute symlink
+always points to the same file, even if the directory containing the
+link is moved.  However, if the symlink is visible from more than one
+machine (such as on a networked file system), the file pointed to might
+not always be the same.  A relative symbolic link is resolved in
+relation to the directory that contains the link, and is often useful in
+referring to files on the same device without regards to what name that
+device is mounted on when accessed via networked machines.
 
    When creating a relative symlink in a different location than the
 current directory, the resolution of the symlink will be different than
 the resolution of the same string from the current directory.
-Therefore, many users prefer to first change directories to the
-location where the relative symlink will be created, so that
-tab-completion or other file resolution will find the same target as
-what will be placed in the symlink.
+Therefore, many users prefer to first change directories to the location
+where the relative symlink will be created, so that tab-completion or
+other file resolution will find the same target as what will be placed
+in the symlink.
 
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-b'
-`--backup[=METHOD]'
+‘-b’
+‘--backup[=METHOD]’
      *Note Backup options::.  Make a backup of each file that would
      otherwise be overwritten or removed.
 
-`-d'
-`-F'
-`--directory'
+‘-d’
+‘-F’
+‘--directory’
      Allow users with appropriate privileges to attempt to make hard
      links to directories.  However, note that this will probably fail
      due to system restrictions, even for the super-user.
 
-`-f'
-`--force'
+‘-f’
+‘--force’
      Remove existing destination files.
 
-`-i'
-`--interactive'
+‘-i’
+‘--interactive’
      Prompt whether to remove existing destination files.
 
-`-L'
-`--logical'
-     If `-s' is not in effect, and the source file is a symbolic link,
+‘-L’
+‘--logical’
+     If ‘-s’ is not in effect, and the source file is a symbolic link,
      create the hard link to the file referred to by the symbolic link,
      rather than the symbolic link itself.
 
-`-n'
-`--no-dereference'
+‘-n’
+‘--no-dereference’
      Do not treat the last operand specially when it is a symbolic link
      to a directory.  Instead, treat it as if it were a normal file.
 
      When the destination is an actual directory (not a symlink to one),
-     there is no ambiguity.  The link is created in that directory.
-     But when the specified destination is a symlink to a directory,
-     there are two ways to treat the user's request.  `ln' can treat
-     the destination just as it would a normal directory and create the
-     link in it.  On the other hand, the destination can be viewed as a
-     non-directory--as the symlink itself.  In that case, `ln' must
+     there is no ambiguity.  The link is created in that directory.  But
+     when the specified destination is a symlink to a directory, there
+     are two ways to treat the user’s request.  ‘ln’ can treat the
+     destination just as it would a normal directory and create the link
+     in it.  On the other hand, the destination can be viewed as a
+     non-directory—as the symlink itself.  In that case, ‘ln’ must
      delete or backup that symlink before creating the new link.  The
      default is to treat a destination that is a symlink to a directory
      just like a directory.
 
-     This option is weaker than the `--no-target-directory' (`-T')
+     This option is weaker than the ‘--no-target-directory’ (‘-T’)
      option, so it has no effect if both options are given.
 
-`-P'
-`--physical'
-     If `-s' is not in effect, and the source file is a symbolic link,
+‘-P’
+‘--physical’
+     If ‘-s’ is not in effect, and the source file is a symbolic link,
      create the hard link to the symbolic link itself.  On platforms
      where this is not supported by the kernel, this option creates a
      symbolic link with identical contents; since symbolic link contents
      cannot be edited, any file name resolution performed through either
      link will be the same as if a hard link had been created.
 
-`-r'
-`--relative'
+‘-r’
+‘--relative’
      Make symbolic links relative to the link location.
 
      Example:
@@ -8000,39 +7984,50 @@ options::.
           ln -srv /a/file /tmp
           '/tmp/file' -> '../a/file'
 
-     *Note realpath invocation::, which gives greater control over
-     relative file name generation.
-
-`-s'
-`--symbolic'
+     Relative symbolic links are generated based on their canonicalized
+     containing directory, and canonicalized targets.  I.E. all symbolic
+     links in these file names will be resolved.  *Note realpath
+     invocation::, which gives greater control over relative file name
+     generation, as demonstrated in the following example:
+
+          ln--relative() {
+            test "$1" = --no-symlinks && { nosym=$1; shift; }
+            target="$1";
+            test -d "$2" && link="$2/." || link="$2"
+            rtarget="$(realpath $nosym -m "$target" \
+                        --relative-to "$(dirname "$link")")"
+            ln -s -v "$rtarget" "$link"
+          }
+
+‘-s’
+‘--symbolic’
      Make symbolic links instead of hard links.  This option merely
      produces an error message on systems that do not support symbolic
      links.
 
-`-S SUFFIX'
-`--suffix=SUFFIX'
-     Append SUFFIX to each backup file made with `-b'.  *Note Backup
+‘-S SUFFIX’
+‘--suffix=SUFFIX’
+     Append SUFFIX to each backup file made with ‘-b’.  *Note Backup
      options::.
 
-`-t DIRECTORY'
-`--target-directory=DIRECTORY'
+‘-t DIRECTORY’
+‘--target-directory=DIRECTORY’
      Specify the destination DIRECTORY.  *Note Target directory::.
 
-`-T'
-`--no-target-directory'
+‘-T’
+‘--no-target-directory’
      Do not treat the last operand specially when it is a directory or a
      symbolic link to a directory.  *Note Target directory::.
 
-`-v'
-`--verbose'
+‘-v’
+‘--verbose’
      Print the name of each file after linking it successfully.
 
-
-   If `-L' and `-P' are both given, the last one takes precedence.  If
-`-s' is also given, `-L' and `-P' are silently ignored.  If neither
-option is given, then this implementation defaults to `-P' if the
-system `link' supports hard links to symbolic links (such as the GNU
-system), and `-L' if `link' follows symbolic links (such as on BSD).
+   If ‘-L’ and ‘-P’ are both given, the last one takes precedence.  If
+‘-s’ is also given, ‘-L’ and ‘-P’ are silently ignored.  If neither
+option is given, then this implementation defaults to ‘-P’ if the system
+‘link’ supports hard links to symbolic links (such as the GNU system),
+and ‘-L’ if ‘link’ follows symbolic links (such as on BSD).
 
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
@@ -8066,62 +8061,65 @@ indicates failure.
 
 File: coreutils.info,  Node: mkdir invocation,  Next: mkfifo invocation,  Prev: ln invocation,  Up: Special file types
 
-12.3 `mkdir': Make directories
+12.3 ‘mkdir’: Make directories
 ==============================
 
-`mkdir' creates directories with the specified names.  Synopsis:
+‘mkdir’ creates directories with the specified names.  Synopsis:
 
-     mkdir [OPTION]... NAME...
+     mkdir [OPTION]… NAME…
 
-   `mkdir' creates each directory NAME in the order given.  It reports
-an error if NAME already exists, unless the `-p' option is given and
+   ‘mkdir’ creates each directory NAME in the order given.  It reports
+an error if NAME already exists, unless the ‘-p’ option is given and
 NAME is a directory.
 
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-m MODE'
-`--mode=MODE'
+‘-m MODE’
+‘--mode=MODE’
      Set the file permission bits of created directories to MODE, which
-     uses the same syntax as in `chmod' and uses `a=rwx' (read, write
+     uses the same syntax as in ‘chmod’ and uses ‘a=rwx’ (read, write
      and execute allowed for everyone) for the point of the departure.
      *Note File permissions::.
 
-     Normally the directory has the desired file mode bits at the
-     moment it is created.  As a GNU extension, MODE may also mention
-     special mode bits, but in this case there may be a temporary window
-     during which the directory exists but its special mode bits are
-     incorrect.  *Note Directory Setuid and Setgid::, for how the
-     set-user-ID and set-group-ID bits of directories are inherited
-     unless overridden in this way.
+     Normally the directory has the desired file mode bits at the moment
+     it is created.  As a GNU extension, MODE may also mention special
+     mode bits, but in this case there may be a temporary window during
+     which the directory exists but its special mode bits are incorrect.
+     *Note Directory Setuid and Setgid::, for how the set-user-ID and
+     set-group-ID bits of directories are inherited unless overridden in
+     this way.
 
-`-p'
-`--parents'
+‘-p’
+‘--parents’
      Make any missing parent directories for each argument, setting
-     their file permission bits to the umask modified by `u+wx'.  Ignore
+     their file permission bits to the umask modified by ‘u+wx’.  Ignore
      existing parent directories, and do not change their file
      permission bits.
 
      To set the file permission bits of any newly-created parent
-     directories to a value that includes `u+wx', you can set the umask
-     before invoking `mkdir'.  For example, if the shell command
-     `(umask u=rwx,go=rx; mkdir -p P/Q)' creates the parent `P' it sets
-     the parent's permission bits to `u=rwx,go=rx'.  To set a parent's
-     special mode bits as well, you can invoke `chmod' after `mkdir'.
+     directories to a value that includes ‘u+wx’, you can set the umask
+     before invoking ‘mkdir’.  For example, if the shell command ‘(umask
+     u=rwx,go=rx; mkdir -p P/Q)’ creates the parent ‘P’ it sets the
+     parent’s permission bits to ‘u=rwx,go=rx’.  To set a parent’s
+     special mode bits as well, you can invoke ‘chmod’ after ‘mkdir’.
      *Note Directory Setuid and Setgid::, for how the set-user-ID and
      set-group-ID bits of newly-created parent directories are
      inherited.
 
-`-v'
-`--verbose'
+‘-v’
+‘--verbose’
      Print a message for each created directory.  This is most useful
-     with `--parents'.
-
-`-Z CONTEXT'
-`--context=CONTEXT'
-     Set the default SELinux security context to be used for created
-     directories.
+     with ‘--parents’.
 
+‘-Z’
+‘--context[=CONTEXT]’
+     Without a specified CONTEXT, adjust the SELinux security context
+     according to the system default type for destination files,
+     similarly to the ‘restorecon’ command.  The long form of this
+     option with a specific context specified, will set the context for
+     newly created files only.  With a specified context, if both
+     SELinux and SMACK are disabled, a warning is issued.
 
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
@@ -8129,34 +8127,37 @@ indicates failure.
 
 File: coreutils.info,  Node: mkfifo invocation,  Next: mknod invocation,  Prev: mkdir invocation,  Up: Special file types
 
-12.4 `mkfifo': Make FIFOs (named pipes)
+12.4 ‘mkfifo’: Make FIFOs (named pipes)
 =======================================
 
-`mkfifo' creates FIFOs (also called "named pipes") with the specified
+‘mkfifo’ creates FIFOs (also called "named pipes") with the specified
 names.  Synopsis:
 
-     mkfifo [OPTION] NAME...
+     mkfifo [OPTION] NAME…
 
-   A "FIFO" is a special file type that permits independent processes
-to communicate.  One process opens the FIFO file for writing, and
-another for reading, after which data can flow as with the usual
-anonymous pipe in shells or elsewhere.
+   A "FIFO" is a special file type that permits independent processes to
+communicate.  One process opens the FIFO file for writing, and another
+for reading, after which data can flow as with the usual anonymous pipe
+in shells or elsewhere.
 
    The program accepts the following option.  Also see *note Common
 options::.
 
-`-m MODE'
-`--mode=MODE'
+‘-m MODE’
+‘--mode=MODE’
      Set the mode of created FIFOs to MODE, which is symbolic as in
-     `chmod' and uses `a=rw' (read and write allowed for everyone) for
+     ‘chmod’ and uses ‘a=rw’ (read and write allowed for everyone) for
      the point of departure.  MODE should specify only file permission
      bits.  *Note File permissions::.
 
-`-Z CONTEXT'
-`--context=CONTEXT'
-     Set the default SELinux security context to be used for created
-     FIFOs.
-
+‘-Z’
+‘--context[=CONTEXT]’
+     Without a specified CONTEXT, adjust the SELinux security context
+     according to the system default type for destination files,
+     similarly to the ‘restorecon’ command.  The long form of this
+     option with a specific context specified, will set the context for
+     newly created files only.  With a specified context, if both
+     SELinux and SMACK are disabled, a warning is issued.
 
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
@@ -8164,60 +8165,62 @@ indicates failure.
 
 File: coreutils.info,  Node: mknod invocation,  Next: readlink invocation,  Prev: mkfifo invocation,  Up: Special file types
 
-12.5 `mknod': Make block or character special files
+12.5 ‘mknod’: Make block or character special files
 ===================================================
 
-`mknod' creates a FIFO, character special file, or block special file
+‘mknod’ creates a FIFO, character special file, or block special file
 with the specified name.  Synopsis:
 
-     mknod [OPTION]... NAME TYPE [MAJOR MINOR]
+     mknod [OPTION]… NAME TYPE [MAJOR MINOR]
 
-   Unlike the phrase "special file type" above, the term "special file"
+   Unlike the phrase “special file type� above, the term "special file"
 has a technical meaning on Unix: something that can generate or receive
-data.  Usually this corresponds to a physical piece of hardware, e.g.,
-a printer or a disk.  (These files are typically created at
-system-configuration time.)  The `mknod' command is what creates files
+data.  Usually this corresponds to a physical piece of hardware, e.g., a
+printer or a disk.  (These files are typically created at
+system-configuration time.)  The ‘mknod’ command is what creates files
 of this type.  Such devices can be read either a character at a time or
-a "block" (many characters) at a time, hence we say there are "block
+a “block� (many characters) at a time, hence we say there are "block
 special" files and "character special" files.
 
-   Due to shell aliases and built-in `mknod' functions, using an
-unadorned `mknod' interactively or in a script may get you different
-functionality than that described here.  Invoke it via `env' (i.e.,
-`env mknod ...') to avoid interference from the shell.
+   Due to shell aliases and built-in ‘mknod’ functions, using an
+unadorned ‘mknod’ interactively or in a script may get you different
+functionality than that described here.  Invoke it via ‘env’ (i.e., ‘env
+mknod …’) to avoid interference from the shell.
 
    The arguments after NAME specify the type of file to make:
 
-`p'
+‘p’
      for a FIFO
 
-`b'
+‘b’
      for a block special file
 
-`c'
+‘c’
      for a character special file
 
-
    When making a block or character special file, the major and minor
 device numbers must be given after the file type.  If a major or minor
-device number begins with `0x' or `0X', it is interpreted as
-hexadecimal; otherwise, if it begins with `0', as octal; otherwise, as
+device number begins with ‘0x’ or ‘0X’, it is interpreted as
+hexadecimal; otherwise, if it begins with ‘0’, as octal; otherwise, as
 decimal.
 
    The program accepts the following option.  Also see *note Common
 options::.
 
-`-m MODE'
-`--mode=MODE'
+‘-m MODE’
+‘--mode=MODE’
      Set the mode of created files to MODE, which is symbolic as in
-     `chmod' and uses `a=rw' as the point of departure.  MODE should
+     ‘chmod’ and uses ‘a=rw’ as the point of departure.  MODE should
      specify only file permission bits.  *Note File permissions::.
 
-`-Z CONTEXT'
-`--context=CONTEXT'
-     Set the default SELinux security context to be used for created
-     files.
-
+‘-Z’
+‘--context[=CONTEXT]’
+     Without a specified CONTEXT, adjust the SELinux security context
+     according to the system default type for destination files,
+     similarly to the ‘restorecon’ command.  The long form of this
+     option with a specific context specified, will set the context for
+     newly created files only.  With a specified context, if both
+     SELinux and SMACK are disabled, a warning is issued.
 
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
@@ -8225,72 +8228,74 @@ indicates failure.
 
 File: coreutils.info,  Node: readlink invocation,  Next: rmdir invocation,  Prev: mknod invocation,  Up: Special file types
 
-12.6 `readlink': Print value of a symlink or canonical file name
+12.6 ‘readlink’: Print value of a symlink or canonical file name
 ================================================================
 
-`readlink' may work in one of two supported modes:
+‘readlink’ may work in one of two supported modes:
+
+‘Readlink mode’
 
-`Readlink mode'
-     `readlink' outputs the value of the given symbolic links.  If
-     `readlink' is invoked with an argument other than the name of a
+     ‘readlink’ outputs the value of the given symbolic links.  If
+     ‘readlink’ is invoked with an argument other than the name of a
      symbolic link, it produces no output and exits with a nonzero exit
      code.
 
-`Canonicalize mode'
-     `readlink' outputs the absolute name of the given files which
-     contain no `.', `..' components nor any repeated separators (`/')
-     or symbolic links.
+‘Canonicalize mode’
 
+     ‘readlink’ outputs the absolute name of the given files which
+     contain no ‘.’, ‘..’ components nor any repeated separators (‘/’)
+     or symbolic links.
 
-     readlink [OPTION]... FILE...
+     readlink [OPTION]… FILE…
 
-   By default, `readlink' operates in readlink mode.
+   By default, ‘readlink’ operates in readlink mode.
 
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-f'
-`--canonicalize'
+‘-f’
+‘--canonicalize’
      Activate canonicalize mode.  If any component of the file name
-     except the last one is missing or unavailable, `readlink' produces
+     except the last one is missing or unavailable, ‘readlink’ produces
      no output and exits with a nonzero exit code.  A trailing slash is
      ignored.
 
-`-e'
-`--canonicalize-existing'
+‘-e’
+‘--canonicalize-existing’
      Activate canonicalize mode.  If any component is missing or
-     unavailable, `readlink' produces no output and exits with a
-     nonzero exit code.  A trailing slash requires that the name
-     resolve to a directory.
+     unavailable, ‘readlink’ produces no output and exits with a nonzero
+     exit code.  A trailing slash requires that the name resolve to a
+     directory.
 
-`-m'
-`--canonicalize-missing'
+‘-m’
+‘--canonicalize-missing’
      Activate canonicalize mode.  If any component is missing or
-     unavailable, `readlink' treats it as a directory.
+     unavailable, ‘readlink’ treats it as a directory.
 
-`-n'
-`--no-newline'
+‘-n’
+‘--no-newline’
      Do not print the output delimiter, when a single FILE is specified.
      Print a warning if specified along with multiple FILEs.
 
-`-s'
-`-q'
-`--silent'
-`--quiet'
+‘-s’
+‘-q’
+‘--silent’
+‘--quiet’
      Suppress most error messages.
 
-`-v'
-`--verbose'
+‘-v’
+‘--verbose’
      Report error messages.
 
-`-z'
-`--zero'
-     Separate output items with NUL characters.
+‘-z’
+‘--zero’
+     Output a zero byte (ASCII NUL) at the end of each line, rather than
+     a newline.  This option enables other programs to parse the output
+     even when that output would contain data with embedded newlines.
 
+   The ‘readlink’ utility first appeared in OpenBSD 2.1.
 
-   The `readlink' utility first appeared in OpenBSD 2.1.
-
-   The `realpath' command without options, operates like `readlink' in
+   The ‘realpath’ command without options, operates like ‘readlink’ in
 canonicalize mode.
 
    An exit status of zero indicates success, and a nonzero value
@@ -8299,12 +8304,12 @@ indicates failure.
 
 File: coreutils.info,  Node: rmdir invocation,  Next: unlink invocation,  Prev: readlink invocation,  Up: Special file types
 
-12.7 `rmdir': Remove empty directories
+12.7 ‘rmdir’: Remove empty directories
 ======================================
 
-`rmdir' removes empty directories.  Synopsis:
+‘rmdir’ removes empty directories.  Synopsis:
 
-     rmdir [OPTION]... DIRECTORY...
+     rmdir [OPTION]… DIRECTORY…
 
    If any DIRECTORY argument does not refer to an existing empty
 directory, it is an error.
@@ -8312,25 +8317,24 @@ directory, it is an error.
    The program accepts the following options.  Also see *note Common
 options::.
 
-`--ignore-fail-on-non-empty'
+‘--ignore-fail-on-non-empty’
      Ignore each failure to remove a directory that is solely because
      the directory is non-empty.
 
-`-p'
-`--parents'
+‘-p’
+‘--parents’
      Remove DIRECTORY, then try to remove each component of DIRECTORY.
-     So, for example, `rmdir -p a/b/c' is similar to `rmdir a/b/c a/b
-     a'.  As such, it fails if any of those directories turns out not
-     to be empty.  Use the `--ignore-fail-on-non-empty' option to make
-     it so such a failure does not evoke a diagnostic and does not
-     cause `rmdir' to exit unsuccessfully.
-
-`-v'
-`--verbose'
+     So, for example, ‘rmdir -p a/b/c’ is similar to ‘rmdir a/b/c a/b
+     a’.  As such, it fails if any of those directories turns out not to
+     be empty.  Use the ‘--ignore-fail-on-non-empty’ option to make it
+     so such a failure does not evoke a diagnostic and does not cause
+     ‘rmdir’ to exit unsuccessfully.
+
+‘-v’
+‘--verbose’
      Give a diagnostic for each successful removal.  DIRECTORY is
      removed.
 
-
    *Note rm invocation::, for how to remove non-empty directories
 (recursively).
 
@@ -8340,24 +8344,24 @@ indicates failure.
 
 File: coreutils.info,  Node: unlink invocation,  Prev: rmdir invocation,  Up: Special file types
 
-12.8 `unlink': Remove files via the unlink syscall
+12.8 ‘unlink’: Remove files via the unlink syscall
 ==================================================
 
-`unlink' deletes a single specified file name.  It is a minimalist
-interface to the system-provided `unlink' function.  *Note Deleting
-Files: (libc)Deleting Files.  Synopsis: It avoids the bells and
-whistles of the more commonly-used `rm' command (*note rm invocation::).
+‘unlink’ deletes a single specified file name.  It is a minimalist
+interface to the system-provided ‘unlink’ function.  *Note
+(libc)Deleting Files::.  Synopsis: It avoids the bells and whistles of
+the more commonly-used ‘rm’ command (*note rm invocation::).
 
      unlink FILENAME
 
-   On some systems `unlink' can be used to delete the name of a
+   On some systems ‘unlink’ can be used to delete the name of a
 directory.  On others, it can be used that way only by a privileged
-user.  In the GNU system `unlink' can never delete the name of a
+user.  In the GNU system ‘unlink’ can never delete the name of a
 directory.
 
-   The `unlink' command honors the `--help' and `--version' options.
-To remove a file whose name begins with `-', prefix the name with `./',
-e.g., `unlink ./--help'.
+   The ‘unlink’ command honors the ‘--help’ and ‘--version’ options.  To
+remove a file whose name begins with ‘-’, prefix the name with ‘./’,
+e.g., ‘unlink ./--help’.
 
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
@@ -8369,10 +8373,10 @@ File: coreutils.info,  Node: Changing file attributes,  Next: Disk usage,  Prev:
 ***************************
 
 A file is not merely its contents, a name, and a file type (*note
-Special file types::).  A file also has an owner (a user ID), a group
-(a group ID), permissions (what the owner can do with the file, what
-people in the group can do, and what everyone else can do), various
-timestamps, and other information.  Collectively, we call these a file's
+Special file types::).  A file also has an owner (a user ID), a group (a
+group ID), permissions (what the owner can do with the file, what people
+in the group can do, and what everyone else can do), various timestamps,
+and other information.  Collectively, we call these a file’s
 "attributes".
 
    These commands change file attributes.
@@ -8387,14 +8391,14 @@ timestamps, and other information.  Collectively, we call these a file's
 
 File: coreutils.info,  Node: chown invocation,  Next: chgrp invocation,  Up: Changing file attributes
 
-13.1 `chown': Change file owner and group
+13.1 ‘chown’: Change file owner and group
 =========================================
 
-`chown' changes the user and/or group ownership of each given FILE to
+‘chown’ changes the user and/or group ownership of each given FILE to
 NEW-OWNER or to the user and group of an existing reference file.
 Synopsis:
 
-     chown [OPTION]... {NEW-OWNER | --reference=REF_FILE} FILE...
+     chown [OPTION]… {NEW-OWNER | --reference=REF_FILE} FILE…
 
    If used, NEW-OWNER specifies the new owner and/or group as follows
 (with no embedded white space):
@@ -8405,76 +8409,79 @@ Synopsis:
 
 OWNER
      If only an OWNER (a user name or numeric user ID) is given, that
-     user is made the owner of each given file, and the files' group is
+     user is made the owner of each given file, and the files’ group is
      not changed.
 
-OWNER`:'GROUP
+OWNER‘:’GROUP
      If the OWNER is followed by a colon and a GROUP (a group name or
-     numeric group ID), with no spaces between them, the group
-     ownership of the files is changed as well (to GROUP).
+     numeric group ID), with no spaces between them, the group ownership
+     of the files is changed as well (to GROUP).
 
-OWNER`:'
+OWNER‘:’
      If a colon but no group name follows OWNER, that user is made the
-     owner of the files and the group of the files is changed to
-     OWNER's login group.
+     owner of the files and the group of the files is changed to OWNER’s
+     login group.
 
-`:'GROUP
+‘:’GROUP
      If the colon and following GROUP are given, but the owner is
      omitted, only the group of the files is changed; in this case,
-     `chown' performs the same function as `chgrp'.
+     ‘chown’ performs the same function as ‘chgrp’.
 
-`:'
+‘:’
      If only a colon is given, or if NEW-OWNER is empty, neither the
      owner nor the group is changed.
 
-
    If OWNER or GROUP is intended to represent a numeric user or group
-ID, then you may specify it with a leading `+'.  *Note Disambiguating
+ID, then you may specify it with a leading ‘+’.  *Note Disambiguating
 names and IDs::.
 
-   Some older scripts may still use `.' in place of the `:' separator.
+   Some older scripts may still use ‘.’ in place of the ‘:’ separator.
 POSIX 1003.1-2001 (*note Standards conformance::) does not require
-support for that, but for backward compatibility GNU `chown' supports
-`.' so long as no ambiguity results.  New scripts should avoid the use
-of `.' because it is not portable, and because it has undesirable
-results if the entire OWNER`.'GROUP happens to identify a user whose
-name contains `.'.
+support for that, but for backward compatibility GNU ‘chown’ supports
+‘.’ so long as no ambiguity results.  New scripts should avoid the use
+of ‘.’ because it is not portable, and because it has undesirable
+results if the entire OWNER‘.’GROUP happens to identify a user whose
+name contains ‘.’.
 
-   The `chown' command sometimes clears the set-user-ID or set-group-ID
+   It is system dependent whether a user can change the group to an
+arbitrary one, or the more portable behavior of being restricted to
+setting a group of which the user is a member.
+
+   The ‘chown’ command sometimes clears the set-user-ID or set-group-ID
 permission bits.  This behavior depends on the policy and functionality
-of the underlying `chown' system call, which may make system-dependent
-file mode modifications outside the control of the `chown' command.
-For example, the `chown' command might not affect those bits when
-invoked by a user with appropriate privileges, or when the bits signify
-some function other than executable permission (e.g., mandatory
-locking).  When in doubt, check the underlying system behavior.
+of the underlying ‘chown’ system call, which may make system-dependent
+file mode modifications outside the control of the ‘chown’ command.  For
+example, the ‘chown’ command might not affect those bits when invoked by
+a user with appropriate privileges, or when the bits signify some
+function other than executable permission (e.g., mandatory locking).
+When in doubt, check the underlying system behavior.
 
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-c'
-`--changes'
+‘-c’
+‘--changes’
      Verbosely describe the action for each FILE whose ownership
      actually changes.
 
-`-f'
-`--silent'
-`--quiet'
+‘-f’
+‘--silent’
+‘--quiet’
      Do not print error messages about files whose ownership cannot be
      changed.
 
-`--from=OLD-OWNER'
-     Change a FILE's ownership only if it has current attributes
+‘--from=OLD-OWNER’
+     Change a FILE’s ownership only if it has current attributes
      specified by OLD-OWNER.  OLD-OWNER has the same form as NEW-OWNER
      described above.  This option is useful primarily from a security
      standpoint in that it narrows considerably the window of potential
      abuse.  For example, to reflect a user ID numbering change for one
-     user's files without an option like this, `root' might run
+     user’s files without an option like this, ‘root’ might run
 
           find / -owner OLDUSER -print0 | xargs -0 chown -h NEWUSER
 
-     But that is dangerous because the interval between when the `find'
-     tests the existing file's owner and when the `chown' is actually
+     But that is dangerous because the interval between when the ‘find’
+     tests the existing file’s owner and when the ‘chown’ is actually
      run may be quite large.  One way to narrow the gap would be to
      invoke chown for each file as it is found:
 
@@ -8486,59 +8493,58 @@ options::.
 
           chown -h -R --from=OLDUSER NEWUSER /
 
-`--dereference'
+‘--dereference’
      Do not act on symbolic links themselves but rather on what they
      point to.  This is the default.
 
-`-h'
-`--no-dereference'
+‘-h’
+‘--no-dereference’
      Act on symbolic links themselves instead of what they point to.
-     This mode relies on the `lchown' system call.  On systems that do
-     not provide the `lchown' system call, `chown' fails when a file
+     This mode relies on the ‘lchown’ system call.  On systems that do
+     not provide the ‘lchown’ system call, ‘chown’ fails when a file
      specified on the command line is a symbolic link.  By default, no
      diagnostic is issued for symbolic links encountered during a
-     recursive traversal, but see `--verbose'.
+     recursive traversal, but see ‘--verbose’.
 
-`--preserve-root'
+‘--preserve-root’
      Fail upon any attempt to recursively change the root directory,
-     `/'.  Without `--recursive', this option has no effect.  *Note
+     ‘/’.  Without ‘--recursive’, this option has no effect.  *Note
      Treating / specially::.
 
-`--no-preserve-root'
-     Cancel the effect of any preceding `--preserve-root' option.
-     *Note Treating / specially::.
+‘--no-preserve-root’
+     Cancel the effect of any preceding ‘--preserve-root’ option.  *Note
+     Treating / specially::.
 
-`--reference=REF_FILE'
+‘--reference=REF_FILE’
      Change the user and group of each FILE to be the same as those of
      REF_FILE.  If REF_FILE is a symbolic link, do not use the user and
      group of the symbolic link, but rather those of the file it refers
      to.
 
-`-v'
-`--verbose'
+‘-v’
+‘--verbose’
      Output a diagnostic for every file processed.  If a symbolic link
-     is encountered during a recursive traversal on a system without
-     the `lchown' system call, and `--no-dereference' is in effect,
-     then issue a diagnostic saying neither the symbolic link nor its
+     is encountered during a recursive traversal on a system without the
+     ‘lchown’ system call, and ‘--no-dereference’ is in effect, then
+     issue a diagnostic saying neither the symbolic link nor its
      referent is being changed.
 
-`-R'
-`--recursive'
+‘-R’
+‘--recursive’
      Recursively change ownership of directories and their contents.
 
-`-H'
-     If `--recursive' (`-R') is specified and a command line argument
-     is a symbolic link to a directory, traverse it.  *Note Traversing
+‘-H’
+     If ‘--recursive’ (‘-R’) is specified and a command line argument is
+     a symbolic link to a directory, traverse it.  *Note Traversing
      symlinks::.
 
-`-L'
+‘-L’
      In a recursive traversal, traverse every symbolic link to a
      directory that is encountered.  *Note Traversing symlinks::.
 
-`-P'
-     Do not traverse any symbolic links.  This is the default if none
-     of `-H', `-L', or `-P' is specified.  *Note Traversing symlinks::.
-
+‘-P’
+     Do not traverse any symbolic links.  This is the default if none of
+     ‘-H’, ‘-L’, or ‘-P’ is specified.  *Note Traversing symlinks::.
 
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
@@ -8557,85 +8563,88 @@ indicates failure.
 
 File: coreutils.info,  Node: chgrp invocation,  Next: chmod invocation,  Prev: chown invocation,  Up: Changing file attributes
 
-13.2 `chgrp': Change group ownership
+13.2 ‘chgrp’: Change group ownership
 ====================================
 
-`chgrp' changes the group ownership of each given FILE to GROUP (which
+‘chgrp’ changes the group ownership of each given FILE to GROUP (which
 can be either a group name or a numeric group ID) or to the group of an
-existing reference file.  Synopsis:
+existing reference file.  *Note chown invocation::.  Synopsis:
 
-     chgrp [OPTION]... {GROUP | --reference=REF_FILE} FILE...
+     chgrp [OPTION]… {GROUP | --reference=REF_FILE} FILE…
 
    If GROUP is intended to represent a numeric group ID, then you may
-specify it with a leading `+'.  *Note Disambiguating names and IDs::.
+specify it with a leading ‘+’.  *Note Disambiguating names and IDs::.
+
+   It is system dependent whether a user can change the group to an
+arbitrary one, or the more portable behavior of being restricted to
+setting a group of which the user is a member.
 
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-c'
-`--changes'
+‘-c’
+‘--changes’
      Verbosely describe the action for each FILE whose group actually
      changes.
 
-`-f'
-`--silent'
-`--quiet'
+‘-f’
+‘--silent’
+‘--quiet’
      Do not print error messages about files whose group cannot be
      changed.
 
-`--dereference'
+‘--dereference’
      Do not act on symbolic links themselves but rather on what they
      point to.  This is the default.
 
-`-h'
-`--no-dereference'
+‘-h’
+‘--no-dereference’
      Act on symbolic links themselves instead of what they point to.
-     This mode relies on the `lchown' system call.  On systems that do
-     not provide the `lchown' system call, `chgrp' fails when a file
+     This mode relies on the ‘lchown’ system call.  On systems that do
+     not provide the ‘lchown’ system call, ‘chgrp’ fails when a file
      specified on the command line is a symbolic link.  By default, no
      diagnostic is issued for symbolic links encountered during a
-     recursive traversal, but see `--verbose'.
+     recursive traversal, but see ‘--verbose’.
 
-`--preserve-root'
+‘--preserve-root’
      Fail upon any attempt to recursively change the root directory,
-     `/'.  Without `--recursive', this option has no effect.  *Note
+     ‘/’.  Without ‘--recursive’, this option has no effect.  *Note
      Treating / specially::.
 
-`--no-preserve-root'
-     Cancel the effect of any preceding `--preserve-root' option.
-     *Note Treating / specially::.
+‘--no-preserve-root’
+     Cancel the effect of any preceding ‘--preserve-root’ option.  *Note
+     Treating / specially::.
 
-`--reference=REF_FILE'
+‘--reference=REF_FILE’
      Change the group of each FILE to be the same as that of REF_FILE.
      If REF_FILE is a symbolic link, do not use the group of the
      symbolic link, but rather that of the file it refers to.
 
-`-v'
-`--verbose'
+‘-v’
+‘--verbose’
      Output a diagnostic for every file processed.  If a symbolic link
-     is encountered during a recursive traversal on a system without
-     the `lchown' system call, and `--no-dereference' is in effect,
-     then issue a diagnostic saying neither the symbolic link nor its
+     is encountered during a recursive traversal on a system without the
+     ‘lchown’ system call, and ‘--no-dereference’ is in effect, then
+     issue a diagnostic saying neither the symbolic link nor its
      referent is being changed.
 
-`-R'
-`--recursive'
+‘-R’
+‘--recursive’
      Recursively change the group ownership of directories and their
      contents.
 
-`-H'
-     If `--recursive' (`-R') is specified and a command line argument
-     is a symbolic link to a directory, traverse it.  *Note Traversing
+‘-H’
+     If ‘--recursive’ (‘-R’) is specified and a command line argument is
+     a symbolic link to a directory, traverse it.  *Note Traversing
      symlinks::.
 
-`-L'
+‘-L’
      In a recursive traversal, traverse every symbolic link to a
      directory that is encountered.  *Note Traversing symlinks::.
 
-`-P'
-     Do not traverse any symbolic links.  This is the default if none
-     of `-H', `-L', or `-P' is specified.  *Note Traversing symlinks::.
-
+‘-P’
+     Do not traverse any symbolic links.  This is the default if none of
+     ‘-H’, ‘-L’, or ‘-P’ is specified.  *Note Traversing symlinks::.
 
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
@@ -8651,105 +8660,104 @@ indicates failure.
 
 File: coreutils.info,  Node: chmod invocation,  Next: touch invocation,  Prev: chgrp invocation,  Up: Changing file attributes
 
-13.3 `chmod': Change access permissions
+13.3 ‘chmod’: Change access permissions
 =======================================
 
-`chmod' changes the access permissions of the named files.  Synopsis:
+‘chmod’ changes the access permissions of the named files.  Synopsis:
 
-     chmod [OPTION]... {MODE | --reference=REF_FILE} FILE...
+     chmod [OPTION]… {MODE | --reference=REF_FILE} FILE…
 
-   `chmod' never changes the permissions of symbolic links, since the
-`chmod' system call cannot change their permissions.  This is not a
+   ‘chmod’ never changes the permissions of symbolic links, since the
+‘chmod’ system call cannot change their permissions.  This is not a
 problem since the permissions of symbolic links are never used.
-However, for each symbolic link listed on the command line, `chmod'
-changes the permissions of the pointed-to file.  In contrast, `chmod'
+However, for each symbolic link listed on the command line, ‘chmod’
+changes the permissions of the pointed-to file.  In contrast, ‘chmod’
 ignores symbolic links encountered during recursive directory
 traversals.
 
-   A successful use of `chmod' clears the set-group-ID bit of a regular
-file if the file's group ID does not match the user's effective group
-ID or one of the user's supplementary group IDs, unless the user has
+   A successful use of ‘chmod’ clears the set-group-ID bit of a regular
+file if the file’s group ID does not match the user’s effective group ID
+or one of the user’s supplementary group IDs, unless the user has
 appropriate privileges.  Additional restrictions may cause the
 set-user-ID and set-group-ID bits of MODE or REF_FILE to be ignored.
 This behavior depends on the policy and functionality of the underlying
-`chmod' system call.  When in doubt, check the underlying system
+‘chmod’ system call.  When in doubt, check the underlying system
 behavior.
 
-   If used, MODE specifies the new file mode bits.  For details, see
-the section on *note File permissions::.  If you really want MODE to
-have a leading `-', you should use `--' first, e.g., `chmod -- -w
-file'.  Typically, though, `chmod a-w file' is preferable, and `chmod -w
-file' (without the `--') complains if it behaves differently from what
-`chmod a-w file' would do.
+   If used, MODE specifies the new file mode bits.  For details, see the
+section on *note File permissions::.  If you really want MODE to have a
+leading ‘-’, you should use ‘--’ first, e.g., ‘chmod -- -w file’.
+Typically, though, ‘chmod a-w file’ is preferable, and ‘chmod -w file’
+(without the ‘--’) complains if it behaves differently from what ‘chmod
+a-w file’ would do.
 
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-c'
-`--changes'
+‘-c’
+‘--changes’
      Verbosely describe the action for each FILE whose permissions
      actually changes.
 
-`-f'
-`--silent'
-`--quiet'
+‘-f’
+‘--silent’
+‘--quiet’
      Do not print error messages about files whose permissions cannot be
      changed.
 
-`--preserve-root'
+‘--preserve-root’
      Fail upon any attempt to recursively change the root directory,
-     `/'.  Without `--recursive', this option has no effect.  *Note
+     ‘/’.  Without ‘--recursive’, this option has no effect.  *Note
      Treating / specially::.
 
-`--no-preserve-root'
-     Cancel the effect of any preceding `--preserve-root' option.
-     *Note Treating / specially::.
+‘--no-preserve-root’
+     Cancel the effect of any preceding ‘--preserve-root’ option.  *Note
+     Treating / specially::.
 
-`-v'
-`--verbose'
+‘-v’
+‘--verbose’
      Verbosely describe the action or non-action taken for every FILE.
 
-`--reference=REF_FILE'
+‘--reference=REF_FILE’
      Change the mode of each FILE to be the same as that of REF_FILE.
      *Note File permissions::.  If REF_FILE is a symbolic link, do not
      use the mode of the symbolic link, but rather that of the file it
      refers to.
 
-`-R'
-`--recursive'
+‘-R’
+‘--recursive’
      Recursively change permissions of directories and their contents.
 
-
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
 
 
 File: coreutils.info,  Node: touch invocation,  Prev: chmod invocation,  Up: Changing file attributes
 
-13.4 `touch': Change file timestamps
+13.4 ‘touch’: Change file timestamps
 ====================================
 
-`touch' changes the access and/or modification times of the specified
+‘touch’ changes the access and/or modification times of the specified
 files.  Synopsis:
 
-     touch [OPTION]... FILE...
+     touch [OPTION]… FILE…
 
-   Any FILE argument that does not exist is created empty, unless
-option `--no-create' (`-c') or `--no-dereference' (`-h') was in effect.
+   Any FILE argument that does not exist is created empty, unless option
+‘--no-create’ (‘-c’) or ‘--no-dereference’ (‘-h’) was in effect.
 
-   A FILE argument string of `-' is handled specially and causes
-`touch' to change the times of the file associated with standard output.
+   A FILE argument string of ‘-’ is handled specially and causes ‘touch’
+to change the times of the file associated with standard output.
 
-   By default, `touch' sets file timestamps to the current time.
-Because `touch' acts on its operands left to right, the resulting
+   By default, ‘touch’ sets file timestamps to the current time.
+Because ‘touch’ acts on its operands left to right, the resulting
 timestamps of earlier and later operands may disagree.  Also, the
-determination of what time is "current" depends on the platform.
+determination of what time is “current� depends on the platform.
 Platforms with network file systems often use different clocks for the
-operating system and for file systems; because `touch' typically uses
-file systems' clocks by default, clock skew can cause the resulting
-file timestamps to appear to be in a program's "future" or "past".
+operating system and for file systems; because ‘touch’ typically uses
+file systems’ clocks by default, clock skew can cause the resulting file
+timestamps to appear to be in a program’s “future� or “past�.
 
-   The `touch' command sets the file's timestamp to the greatest
+   The ‘touch’ command sets the file’s timestamp to the greatest
 representable value that is not greater than the requested time.  This
 can differ from the requested time for several reasons.  First, the
 requested time may have a higher resolution than supported.  Second, a
@@ -8760,119 +8768,118 @@ update timestamps may employ yet a different resolution.  For example,
 in theory a file system might use 10-microsecond resolution for access
 time and 100-nanosecond resolution for modification time, and the
 operating system might use nanosecond resolution for the current time
-and microsecond resolution for the primitive that `touch' uses to set a
-file's timestamp to an arbitrary value.
+and microsecond resolution for the primitive that ‘touch’ uses to set a
+file’s timestamp to an arbitrary value.
 
-   When setting file timestamps to the current time, `touch' can change
+   When setting file timestamps to the current time, ‘touch’ can change
 the timestamps for files that the user does not own but has write
 permission for.  Otherwise, the user must own the files.  Some older
 systems have a further restriction: the user must own the files unless
 both the access and modification times are being set to the current
 time.
 
-   Although `touch' provides options for changing two of the times--the
-times of last access and modification--of a file, there is actually a
+   Although ‘touch’ provides options for changing two of the times—the
+times of last access and modification—of a file, there is actually a
 standard third one as well: the inode change time.  This is often
-referred to as a file's `ctime'.  The inode change time represents the
-time when the file's meta-information last changed.  One common example
+referred to as a file’s ‘ctime’.  The inode change time represents the
+time when the file’s meta-information last changed.  One common example
 of this is when the permissions of a file change.  Changing the
-permissions doesn't access the file, so the atime doesn't change, nor
-does it modify the file, so the mtime doesn't change.  Yet, something
+permissions doesn’t access the file, so the atime doesn’t change, nor
+does it modify the file, so the mtime doesn’t change.  Yet, something
 about the file itself has changed, and this must be noted somewhere.
 This is the job of the ctime field.  This is necessary, so that, for
 example, a backup program can make a fresh copy of the file, including
-the new permissions value.  Another operation that modifies a file's
+the new permissions value.  Another operation that modifies a file’s
 ctime without affecting the others is renaming.  In any case, it is not
 possible, in normal operations, for a user to change the ctime field to
-a user-specified value.  Some operating systems and file systems
-support a fourth time: the birth time, when the file was first created;
-by definition, this timestamp never changes.
+a user-specified value.  Some operating systems and file systems support
+a fourth time: the birth time, when the file was first created; by
+definition, this timestamp never changes.
 
-   Time stamps assume the time zone rules specified by the `TZ'
-environment variable, or by the system default rules if `TZ' is not
-set.  *Note Specifying the Time Zone with `TZ': (libc)TZ Variable.  You
-can avoid ambiguities during daylight saving transitions by using UTC
-time stamps.
+   Time stamps assume the time zone rules specified by the ‘TZ’
+environment variable, or by the system default rules if ‘TZ’ is not set.
+*Note Specifying the Time Zone with ‘TZ’: (libc)TZ Variable.  You can
+avoid ambiguities during daylight saving transitions by using UTC time
+stamps.
 
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-a'
-`--time=atime'
-`--time=access'
-`--time=use'
+‘-a’
+‘--time=atime’
+‘--time=access’
+‘--time=use’
      Change the access time only.
 
-`-c'
-`--no-create'
+‘-c’
+‘--no-create’
      Do not warn about or create files that do not exist.
 
-`-d'
-`--date=TIME'
+‘-d’
+‘--date=TIME’
      Use TIME instead of the current time.  It can contain month names,
-     time zones, `am' and `pm', `yesterday', etc.  For example,
-     `--date="2004-02-27 14:19:13.489392193 +0530"' specifies the
+     time zones, ‘am’ and ‘pm’, ‘yesterday’, etc.  For example,
+     ‘--date="2004-02-27 14:19:13.489392193 +0530"’ specifies the
      instant of time that is 489,392,193 nanoseconds after February 27,
      2004 at 2:19:13 PM in a time zone that is 5 hours and 30 minutes
-     east of UTC.  *Note Date input formats::.  File systems that do
-     not support high-resolution time stamps silently ignore any excess
+     east of UTC.  *Note Date input formats::.  File systems that do not
+     support high-resolution time stamps silently ignore any excess
      precision here.
 
-`-f'
-     Ignored; for compatibility with BSD versions of `touch'.
+‘-f’
+     Ignored; for compatibility with BSD versions of ‘touch’.
 
-`-h'
-`--no-dereference'
+‘-h’
+‘--no-dereference’
      Attempt to change the timestamps of a symbolic link, rather than
      what the link refers to.  When using this option, empty files are
-     not created, but option `-c' must also be used to avoid warning
+     not created, but option ‘-c’ must also be used to avoid warning
      about files that do not exist.  Not all systems support changing
      the timestamps of symlinks, since underlying system support for
      this action was not required until POSIX 2008.  Also, on some
      systems, the mere act of examining a symbolic link changes the
      access time, such that only changes to the modification time will
      persist long enough to be observable.  When coupled with option
-     `-r', a reference timestamp is taken from a symbolic link rather
+     ‘-r’, a reference timestamp is taken from a symbolic link rather
      than the file it refers to.
 
-`-m'
-`--time=mtime'
-`--time=modify'
+‘-m’
+‘--time=mtime’
+‘--time=modify’
      Change the modification time only.
 
-`-r FILE'
-`--reference=FILE'
+‘-r FILE’
+‘--reference=FILE’
      Use the times of the reference FILE instead of the current time.
-     If this option is combined with the `--date=TIME' (`-d TIME')
-     option, the reference FILE's time is the origin for any relative
-     TIMEs given, but is otherwise ignored.  For example, `-r foo -d
-     '-5 seconds'' specifies a time stamp equal to five seconds before
-     the corresponding time stamp for `foo'.  If FILE is a symbolic
-     link, the reference timestamp is taken from the target of the
-     symlink, unless `-h' was also in effect.
-
-`-t [[CC]YY]MMDDHHMM[.SS]'
+     If this option is combined with the ‘--date=TIME’ (‘-d TIME’)
+     option, the reference FILE’s time is the origin for any relative
+     TIMEs given, but is otherwise ignored.  For example, ‘-r foo -d '-5
+     seconds'’ specifies a time stamp equal to five seconds before the
+     corresponding time stamp for ‘foo’.  If FILE is a symbolic link,
+     the reference timestamp is taken from the target of the symlink,
+     unless ‘-h’ was also in effect.
+
+‘-t [[CC]YY]MMDDHHMM[.SS]’
      Use the argument (optional four-digit or two-digit years, months,
      days, hours, minutes, optional seconds) instead of the current
-     time.  If the year is specified with only two digits, then CC is
-     20 for years in the range 0 ... 68, and 19 for years in 69 ... 99.
-     If no digits of the year are specified, the argument is
-     interpreted as a date in the current year.  On the atypical
-     systems that support leap seconds, SS may be `60'.
-
-
-   On older systems, `touch' supports an obsolete syntax, as follows.
-If no timestamp is given with any of the `-d', `-r', or `-t' options,
+     time.  If the year is specified with only two digits, then CC is 20
+     for years in the range 0 … 68, and 19 for years in 69 … 99.  If no
+     digits of the year are specified, the argument is interpreted as a
+     date in the current year.  On the atypical systems that support
+     leap seconds, SS may be ‘60’.
+
+   On older systems, ‘touch’ supports an obsolete syntax, as follows.
+If no timestamp is given with any of the ‘-d’, ‘-r’, or ‘-t’ options,
 and if there are two or more FILEs and the first FILE is of the form
-`MMDDHHMM[YY]' and this would be a valid argument to the `-t' option
-(if the YY, if any, were moved to the front), and if the represented
-year is in the range 1969-1999, that argument is interpreted as the time
-for the other files instead of as a file name.  This obsolete behavior
-can be enabled or disabled with the `_POSIX2_VERSION' environment
-variable (*note Standards conformance::), but portable scripts should
-avoid commands whose behavior depends on this variable.  For example,
-use `touch ./12312359 main.c' or `touch -t 12312359 main.c' rather than
-the ambiguous `touch 12312359 main.c'.
+‘MMDDHHMM[YY]’ and this would be a valid argument to the ‘-t’ option (if
+the YY, if any, were moved to the front), and if the represented year is
+in the range 1969–1999, that argument is interpreted as the time for the
+other files instead of as a file name.  This obsolete behavior can be
+enabled or disabled with the ‘_POSIX2_VERSION’ environment variable
+(*note Standards conformance::), but portable scripts should avoid
+commands whose behavior depends on this variable.  For example, use
+‘touch ./12312359 main.c’ or ‘touch -t 12312359 main.c’ rather than the
+ambiguous ‘touch 12312359 main.c’.
 
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
@@ -8898,150 +8905,144 @@ status information, and write buffers to disk.
 
 File: coreutils.info,  Node: df invocation,  Next: du invocation,  Up: Disk usage
 
-14.1 `df': Report file system disk space usage
+14.1 ‘df’: Report file system disk space usage
 ==============================================
 
-`df' reports the amount of disk space used and available on file
+‘df’ reports the amount of disk space used and available on file
 systems.  Synopsis:
 
-     df [OPTION]... [FILE]...
+     df [OPTION]… [FILE]…
 
-   With no arguments, `df' reports the space used and available on all
-currently mounted file systems (of all types).  Otherwise, `df' reports
+   With no arguments, ‘df’ reports the space used and available on all
+currently mounted file systems (of all types).  Otherwise, ‘df’ reports
 on the file system containing each argument FILE.
 
    Normally the disk space is printed in units of 1024 bytes, but this
 can be overridden (*note Block size::).  Non-integer quantities are
 rounded up to the next higher unit.
 
-   For bind mounts and without arguments, `df' only outputs the
+   For bind mounts and without arguments, ‘df’ only outputs the
 statistics for that device with the shortest mount point name in the
 list of file systems (MTAB), i.e., it hides duplicate entries, unless
-the `-a' option is specified.
+the ‘-a’ option is specified.
 
-   With the same logic, `df' elides a mount entry of a dummy pseude
+   With the same logic, ‘df’ elides a mount entry of a dummy pseudo
 device if there is another mount entry of a real block device for that
-mount point with the same device number, e.g. the early-boot pseudo
-file system `rootfs' is not shown per default when already the real
-root device has been mounted.
-
-   If an argument FILE is a disk device file containing a mounted file
-system, `df' shows the space available on that file system rather than
-on the file system containing the device node (i.e., the root file
-system).  GNU `df' does not attempt to determine the disk usage on
-unmounted file systems, because on most kinds of systems doing so
-requires extremely nonportable intimate knowledge of file system
-structures.
+mount point with the same device number, e.g.  the early-boot pseudo
+file system ‘rootfs’ is not shown per default when already the real root
+device has been mounted.
+
+   If an argument FILE resolves to a special file containing a mounted
+file system, ‘df’ shows the space available on that file system rather
+than on the file system containing the device node.  GNU ‘df’ does not
+attempt to determine the disk usage on unmounted file systems, because
+on most kinds of systems doing so requires extremely nonportable
+intimate knowledge of file system structures.
 
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-a'
-`--all'
+‘-a’
+‘--all’
      Include in the listing dummy file systems, which are omitted by
      default.  Such file systems are typically special-purpose
      pseudo-file-systems, such as automounter entries.
 
-`-B SIZE'
-`--block-size=SIZE'
-     Scale sizes by SIZE before printing them (*note Block size::).
-     For example, `-BG' prints sizes in units of 1,073,741,824 bytes.
+‘-B SIZE’
+‘--block-size=SIZE’
+     Scale sizes by SIZE before printing them (*note Block size::).  For
+     example, ‘-BG’ prints sizes in units of 1,073,741,824 bytes.
 
-`--total'
+‘--total’
      Print a grand total of all arguments after all arguments have been
      processed.  This can be used to find out the total disk size, usage
      and available space of all listed devices.
 
-     For the grand total line, `df' prints `"total"' into the SOURCE
-     column, and `"-"' into the TARGET column.  If there is no SOURCE
-     column (see `--output'), then `df' prints `"total"' into the
-     TARGET column, if present.
+     For the grand total line, ‘df’ prints ‘"total"’ into the SOURCE
+     column, and ‘"-"’ into the TARGET column.  If there is no SOURCE
+     column (see ‘--output’), then ‘df’ prints ‘"total"’ into the TARGET
+     column, if present.
 
-`-h'
-`--human-readable'
-     Append a size letter to each size, such as `M' for mebibytes.
-     Powers of 1024 are used, not 1000; `M' stands for 1,048,576 bytes.
-     This option is equivalent to `--block-size=human-readable'.  Use
-     the `--si' option if you prefer powers of 1000.
+‘-h’
+‘--human-readable’
+     Append a size letter to each size, such as ‘M’ for mebibytes.
+     Powers of 1024 are used, not 1000; ‘M’ stands for 1,048,576 bytes.
+     This option is equivalent to ‘--block-size=human-readable’.  Use
+     the ‘--si’ option if you prefer powers of 1000.
 
-`-H'
-     Equivalent to `--si'.
+‘-H’
+     Equivalent to ‘--si’.
 
-`-i'
-`--inodes'
+‘-i’
+‘--inodes’
      List inode usage information instead of block usage.  An inode
      (short for index node) contains information about a file such as
      its owner, permissions, timestamps, and location on the disk.
 
-`-k'
+‘-k’
      Print sizes in 1024-byte blocks, overriding the default block size
      (*note Block size::).  This option is equivalent to
-     `--block-size=1K'.
+     ‘--block-size=1K’.
 
-`-l'
-`--local'
+‘-l’
+‘--local’
      Limit the listing to local file systems.  By default, remote file
      systems are also listed.
 
-`--no-sync'
-     Do not invoke the `sync' system call before getting any usage data.
-     This may make `df' run significantly faster on systems with many
+‘--no-sync’
+     Do not invoke the ‘sync’ system call before getting any usage data.
+     This may make ‘df’ run significantly faster on systems with many
      disks, but on some systems (notably SunOS) the results may be
      slightly out of date.  This is the default.
 
-`--output'
-`--output[=FIELD_LIST]'
+‘--output’
+‘--output[=FIELD_LIST]’
      Use the output format defined by FIELD_LIST, or print all fields if
      FIELD_LIST is omitted.  In the latter case, the order of the
      columns conforms to the order of the field descriptions below.
 
-     The use of the `--output' together with each of the options `-i',
-     `-P', and `-T' is mutually exclusive.
+     The use of the ‘--output’ together with each of the options ‘-i’,
+     ‘-P’, and ‘-T’ is mutually exclusive.
 
      FIELD_LIST is a comma-separated list of columns to be included in
-     `df''s output and therefore effectively controls the order of
+     ‘df’’s output and therefore effectively controls the order of
      output columns.  Each field can thus be used at the place of
      choice, but yet must only be used once.
 
      Valid field names in the FIELD_LIST are:
-    `source'
+     ‘source’
           The source of the mount point, usually a device.
-
-    `fstype'
+     ‘fstype’
           File system type.
 
-    `itotal'
+     ‘itotal’
           Total number of inodes.
-
-    `iused'
+     ‘iused’
           Number of used inodes.
-
-    `iavail'
+     ‘iavail’
           Number of available inodes.
-
-    `ipcent'
+     ‘ipcent’
           Percentage of IUSED divided by ITOTAL.
 
-    `size'
+     ‘size’
           Total number of blocks.
-
-    `used'
+     ‘used’
           Number of used blocks.
-
-    `avail'
+     ‘avail’
           Number of available blocks.
-
-    `pcent'
+     ‘pcent’
           Percentage of USED divided by SIZE.
 
-    `target'
+     ‘file’
+          The file name if specified on the command line.
+     ‘target’
           The mount point.
 
      The fields for block and inodes statistics are affected by the
-     scaling options like `-h' as usual.
+     scaling options like ‘-h’ as usual.
 
      The definition of the FIELD_LIST can even be splitted among several
-     `--output' uses.
+     ‘--output’ uses.
 
           #!/bin/sh
           # Print the TARGET (i.e., the mount point) along with their percentage
@@ -9051,342 +9052,357 @@ options::.
           # Print all available fields.
           df --o
 
-`-P'
-`--portability'
+‘-P’
+‘--portability’
      Use the POSIX output format.  This is like the default format
      except for the following:
 
        1. The information about each file system is always printed on
           exactly one line; a mount device is never put on a line by
-          itself.  This means that if the mount device name is more
-          than 20 characters long (e.g., for some network mounts), the
+          itself.  This means that if the mount device name is more than
+          20 characters long (e.g., for some network mounts), the
           columns are misaligned.
 
-       2. The labels in the header output line are changed to conform
-          to POSIX.
+       2. The labels in the header output line are changed to conform to
+          POSIX.
 
        3. The default block size and output format are unaffected by the
-          `DF_BLOCK_SIZE', `BLOCK_SIZE' and `BLOCKSIZE' environment
+          ‘DF_BLOCK_SIZE’, ‘BLOCK_SIZE’ and ‘BLOCKSIZE’ environment
           variables.  However, the default block size is still affected
-          by `POSIXLY_CORRECT': it is 512 if `POSIXLY_CORRECT' is set,
+          by ‘POSIXLY_CORRECT’: it is 512 if ‘POSIXLY_CORRECT’ is set,
           1024 otherwise.  *Note Block size::.
 
-`--si'
-     Append an SI-style abbreviation to each size, such as `M' for
-     megabytes.  Powers of 1000 are used, not 1024; `M' stands for
-     1,000,000 bytes.  This option is equivalent to `--block-size=si'.
-     Use the `-h' or `--human-readable' option if you prefer powers of
+‘--si’
+     Append an SI-style abbreviation to each size, such as ‘M’ for
+     megabytes.  Powers of 1000 are used, not 1024; ‘M’ stands for
+     1,000,000 bytes.  This option is equivalent to ‘--block-size=si’.
+     Use the ‘-h’ or ‘--human-readable’ option if you prefer powers of
      1024.
 
-`--sync'
-     Invoke the `sync' system call before getting any usage data.  On
+‘--sync’
+     Invoke the ‘sync’ system call before getting any usage data.  On
      some systems (notably SunOS), doing this yields more up to date
-     results, but in general this option makes `df' much slower,
+     results, but in general this option makes ‘df’ much slower,
      especially when there are many or very busy file systems.
 
-`-t FSTYPE'
-`--type=FSTYPE'
+‘-t FSTYPE’
+‘--type=FSTYPE’
      Limit the listing to file systems of type FSTYPE.  Multiple file
-     system types can be specified by giving multiple `-t' options.  By
+     system types can be specified by giving multiple ‘-t’ options.  By
      default, nothing is omitted.
 
-`-T'
-`--print-type'
-     Print each file system's type.  The types printed here are the
-     same ones you can include or exclude with `-t' and `-x'.  The
-     particular types printed are whatever is supported by the system.
-     Here are some of the common names (this list is certainly not
-     exhaustive):
+‘-T’
+‘--print-type’
+     Print each file system’s type.  The types printed here are the same
+     ones you can include or exclude with ‘-t’ and ‘-x’.  The particular
+     types printed are whatever is supported by the system.  Here are
+     some of the common names (this list is certainly not exhaustive):
 
-    `nfs'
+     ‘nfs’
           An NFS file system, i.e., one mounted over a network from
           another machine.  This is the one type name which seems to be
           used uniformly by all systems.
 
-    `4.2, ufs, efs...'
+     ‘ext2, ext3, ext4, xfs, btrfs…’
           A file system on a locally-mounted hard disk.  (The system
           might even support more than one type here; Linux does.)
 
-    `hsfs, cdfs'
-          A file system on a CD-ROM drive.  HP-UX uses `cdfs', most
-          other systems use `hsfs' (`hs' for "High Sierra").
-
-    `pcfs'
-          An MS-DOS file system, usually on a diskette.
+     ‘iso9660, cdfs’
+          A file system on a CD or DVD drive.  HP-UX uses ‘cdfs’, most
+          other systems use ‘iso9660’.
 
+     ‘ntfs,fat’
+          File systems used by MS-Windows / MS-DOS.
 
-`-x FSTYPE'
-`--exclude-type=FSTYPE'
+‘-x FSTYPE’
+‘--exclude-type=FSTYPE’
      Limit the listing to file systems not of type FSTYPE.  Multiple
-     file system types can be eliminated by giving multiple `-x'
+     file system types can be eliminated by giving multiple ‘-x’
      options.  By default, no file system types are omitted.
 
-`-v'
-     Ignored; for compatibility with System V versions of `df'.
-
+‘-v’
+     Ignored; for compatibility with System V versions of ‘df’.
 
    An exit status of zero indicates success, and a nonzero value
 indicates failure.  Failure includes the case where no output is
-generated, so you can inspect the exit status of a command like `df -t
-ext3 -t reiserfs DIR' to test whether DIR is on a file system of type
-`ext3' or `reiserfs'.
+generated, so you can inspect the exit status of a command like ‘df -t
+ext3 -t reiserfs DIR’ to test whether DIR is on a file system of type
+‘ext3’ or ‘reiserfs’.
 
-   Since the list of file systems (MTAB) is needed to determine the
-file system type, failure includes the cases when that list cannot be
-read and one or more of the options `-a', `-l', `-t' or `-x' is used
-together with a file name argument.
+   Since the list of file systems (MTAB) is needed to determine the file
+system type, failure includes the cases when that list cannot be read
+and one or more of the options ‘-a’, ‘-l’, ‘-t’ or ‘-x’ is used together
+with a file name argument.
 
 
 File: coreutils.info,  Node: du invocation,  Next: stat invocation,  Prev: df invocation,  Up: Disk usage
 
-14.2 `du': Estimate file space usage
+14.2 ‘du’: Estimate file space usage
 ====================================
 
-`du' reports the amount of disk space used by the specified files and
+‘du’ reports the amount of disk space used by the specified files and
 for each subdirectory (of directory arguments).  Synopsis:
 
-     du [OPTION]... [FILE]...
+     du [OPTION]… [FILE]…
 
-   With no arguments, `du' reports the disk space for the current
+   With no arguments, ‘du’ reports the disk space for the current
 directory.  Normally the disk space is printed in units of 1024 bytes,
-but this can be overridden (*note Block size::).  Non-integer
-quantities are rounded up to the next higher unit.
+but this can be overridden (*note Block size::).  Non-integer quantities
+are rounded up to the next higher unit.
 
    If two or more hard links point to the same file, only one of the
 hard links is counted.  The FILE argument order affects which links are
 counted, and changing the argument order may change the numbers that
-`du' outputs.
+‘du’ outputs.
 
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-0'
-`--null'
-     Output a zero byte (ASCII NUL) at the end of each line, rather
-     than a newline.  This option enables other programs to parse the
-     output of `du' even when that output would contain data with
-     embedded newlines.
+‘-0’
+‘--null’
+     Output a zero byte (ASCII NUL) at the end of each line, rather than
+     a newline.  This option enables other programs to parse the output
+     even when that output would contain data with embedded newlines.
 
-`-a'
-`--all'
+‘-a’
+‘--all’
      Show counts for all files, not just directories.
 
-`--apparent-size'
-     Print apparent sizes, rather than disk usage.  The apparent size
-     of a file is the number of bytes reported by `wc -c' on regular
-     files, or more generally, `ls -l --block-size=1' or `stat
-     --format=%s'.  For example, a file containing the word `zoo' with
-     no newline would, of course, have an apparent size of 3.  Such a
-     small file may require anywhere from 0 to 16 KiB or more of disk
-     space, depending on the type and configuration of the file system
-     on which the file resides.  However, a sparse file created with
-     this command:
+‘--apparent-size’
+     Print apparent sizes, rather than disk usage.  The apparent size of
+     a file is the number of bytes reported by ‘wc -c’ on regular files,
+     or more generally, ‘ls -l --block-size=1’ or ‘stat --format=%s’.
+     For example, a file containing the word ‘zoo’ with no newline
+     would, of course, have an apparent size of 3.  Such a small file
+     may require anywhere from 0 to 16 KiB or more of disk space,
+     depending on the type and configuration of the file system on which
+     the file resides.  However, a sparse file created with this
+     command:
 
           dd bs=1 seek=2GiB if=/dev/null of=big
 
      has an apparent size of 2 GiB, yet on most modern systems, it
      actually uses almost no disk space.
 
-`-B SIZE'
-`--block-size=SIZE'
-     Scale sizes by SIZE before printing them (*note Block size::).
-     For example, `-BG' prints sizes in units of 1,073,741,824 bytes.
+‘-B SIZE’
+‘--block-size=SIZE’
+     Scale sizes by SIZE before printing them (*note Block size::).  For
+     example, ‘-BG’ prints sizes in units of 1,073,741,824 bytes.
 
-`-b'
-`--bytes'
-     Equivalent to `--apparent-size --block-size=1'.
+‘-b’
+‘--bytes’
+     Equivalent to ‘--apparent-size --block-size=1’.
 
-`-c'
-`--total'
+‘-c’
+‘--total’
      Print a grand total of all arguments after all arguments have been
      processed.  This can be used to find out the total disk usage of a
      given set of files or directories.
 
-`-D'
-`--dereference-args'
+‘-D’
+‘--dereference-args’
      Dereference symbolic links that are command line arguments.  Does
      not affect other symbolic links.  This is helpful for finding out
-     the disk usage of directories, such as `/usr/tmp', which are often
+     the disk usage of directories, such as ‘/usr/tmp’, which are often
      symbolic links.
 
-`-d DEPTH'
-`--max-depth=DEPTH'
-     Show the total for each directory (and file if -all) that is at
+‘-d DEPTH’
+‘--max-depth=DEPTH’
+     Show the total for each directory (and file if –all) that is at
      most MAX_DEPTH levels down from the root of the hierarchy.  The
-     root is at level 0, so `du --max-depth=0' is equivalent to `du -s'.
+     root is at level 0, so ‘du --max-depth=0’ is equivalent to ‘du -s’.
 
-`--files0-from=FILE'
+‘--files0-from=FILE’
      Disallow processing files named on the command line, and instead
      process those named in file FILE; each name being terminated by a
-     zero byte (ASCII NUL).  This is useful when the list of file names
-     is so long that it may exceed a command line length limitation.
-     In such cases, running `du' via `xargs' is undesirable because it
-     splits the list into pieces and makes `du' print with the
-     `--total' (`-c') option for each sublist rather than for the
-     entire list.  One way to produce a list of ASCII NUL terminated
-     file names is with GNU `find', using its `-print0' predicate.  If
-     FILE is `-' then the ASCII NUL terminated file names are read from
-     standard input.
-
-`-H'
-     Equivalent to `--dereference-args' (`-D').
-
-`-h'
-`--human-readable'
-     Append a size letter to each size, such as `M' for mebibytes.
-     Powers of 1024 are used, not 1000; `M' stands for 1,048,576 bytes.
-     This option is equivalent to `--block-size=human-readable'.  Use
-     the `--si' option if you prefer powers of 1000.
+     zero byte (ASCII NUL). This is useful when the list of file names
+     is so long that it may exceed a command line length limitation.  In
+     such cases, running ‘du’ via ‘xargs’ is undesirable because it
+     splits the list into pieces and makes ‘du’ print with the ‘--total’
+     (‘-c’) option for each sublist rather than for the entire list.
+     One way to produce a list of ASCII NUL terminated file names is
+     with GNU ‘find’, using its ‘-print0’ predicate.  If FILE is ‘-’
+     then the ASCII NUL terminated file names are read from standard
+     input.
 
-`-k'
+‘-H’
+     Equivalent to ‘--dereference-args’ (‘-D’).
+
+‘-h’
+‘--human-readable’
+     Append a size letter to each size, such as ‘M’ for mebibytes.
+     Powers of 1024 are used, not 1000; ‘M’ stands for 1,048,576 bytes.
+     This option is equivalent to ‘--block-size=human-readable’.  Use
+     the ‘--si’ option if you prefer powers of 1000.
+
+‘--inodes’
+     List inode usage information instead of block usage.  This option
+     is useful for finding directories which contain many files, and
+     therefore eat up most of the inodes space of a file system (see
+     ‘df’, option ‘--inodes’).  It can well be combined with the options
+     ‘-a’, ‘-c’, ‘-h’, ‘-l’, ‘-s’, ‘-S’, ‘-t’ and ‘-x’; however, passing
+     other options regarding the block size, for example ‘-b’, ‘-m’ and
+     ‘--apparent-size’, is ignored.
+
+‘-k’
      Print sizes in 1024-byte blocks, overriding the default block size
      (*note Block size::).  This option is equivalent to
-     `--block-size=1K'.
+     ‘--block-size=1K’.
 
-`-L'
-`--dereference'
-     Dereference symbolic links (show the disk space used by the file
-     or directory that the link points to instead of the space used by
-     the link).
+‘-L’
+‘--dereference’
+     Dereference symbolic links (show the disk space used by the file or
+     directory that the link points to instead of the space used by the
+     link).
 
-`-l'
-`--count-links'
-     Count the size of all files, even if they have appeared already
-     (as a hard link).
+‘-l’
+‘--count-links’
+     Count the size of all files, even if they have appeared already (as
+     a hard link).
 
-`-m'
+‘-m’
      Print sizes in 1,048,576-byte blocks, overriding the default block
      size (*note Block size::).  This option is equivalent to
-     `--block-size=1M'.
+     ‘--block-size=1M’.
 
-`-P'
-`--no-dereference'
-     For each symbolic links encountered by `du', consider the disk
+‘-P’
+‘--no-dereference’
+     For each symbolic links encountered by ‘du’, consider the disk
      space used by the symbolic link.
 
-`-S'
-`--separate-dirs'
-     Normally, in the output of `du' (when not using `--summarize'),
-     the size listed next to a directory name, D, represents the sum of
+‘-S’
+‘--separate-dirs’
+     Normally, in the output of ‘du’ (when not using ‘--summarize’), the
+     size listed next to a directory name, D, represents the sum of
      sizes of all entries beneath D as well as the size of D itself.
-     With `--separate-dirs', the size reported for a directory name, D,
-     is merely the `stat.st_size'-derived size of the directory entry,
-     D.
-
-`--si'
-     Append an SI-style abbreviation to each size, such as `M' for
-     megabytes.  Powers of 1000 are used, not 1024; `M' stands for
-     1,000,000 bytes.  This option is equivalent to `--block-size=si'.
-     Use the `-h' or `--human-readable' option if you prefer powers of
+     With ‘--separate-dirs’, the size reported for a directory name, D,
+     will exclude the size of any subdirectories.
+
+‘--si’
+     Append an SI-style abbreviation to each size, such as ‘M’ for
+     megabytes.  Powers of 1000 are used, not 1024; ‘M’ stands for
+     1,000,000 bytes.  This option is equivalent to ‘--block-size=si’.
+     Use the ‘-h’ or ‘--human-readable’ option if you prefer powers of
      1024.
 
-`-s'
-`--summarize'
+‘-s’
+‘--summarize’
      Display only a total for each argument.
 
-`-t SIZE'
-`--threshold=SIZE'
-     Exclude entries based on a given SIZE (*note Block size::).
+‘-t SIZE’
+‘--threshold=SIZE’
+     Exclude entries based on a given SIZE.  The SIZE refers to used
+     blocks in normal mode (*note Block size::), or inodes count in
+     conjunction with the ‘--inodes’ option.
 
-     If SIZE is positive, then `du' will only print entries with a size
+     If SIZE is positive, then ‘du’ will only print entries with a size
      greater than or equal to that.
 
-     If SIZE is negative, then `du' will only print entries with a size
+     If SIZE is negative, then ‘du’ will only print entries with a size
      smaller than or equal to that.
 
-     Although GNU `find' can be used to find files of a certain size,
-     `du''s `--threshold' option can be used to also filter directories
+     Although GNU ‘find’ can be used to find files of a certain size,
+     ‘du’’s ‘--threshold’ option can be used to also filter directories
      based on a given size.
 
-     Please note that the `--threshold' option can be combined with the
-     `--apparent-size' option, and in this case would elide entries
+     Please note that the ‘--threshold’ option can be combined with the
+     ‘--apparent-size’ option, and in this case would elide entries
      based on its apparent size.
 
-     Here's how you would use `--threshold' to find directories with a
+     Please note that the ‘--threshold’ option can be combined with the
+     ‘--inodes’ option, and in this case would elide entries based on
+     its inodes count.
+
+     Here’s how you would use ‘--threshold’ to find directories with a
      size greater than or equal to 200 megabytes:
 
           du --threshold=200MB
 
-     Here's how you would use `--threshold' to find directories and
-     files - note the `-a' - with an apparent size smaller than or
-     equal to 500 bytes:
+     Here’s how you would use ‘--threshold’ to find directories and
+     files - note the ‘-a’ - with an apparent size smaller than or equal
+     to 500 bytes:
 
           du -a -t -500 --apparent-size
 
-`--time'
+     Here’s how you would use ‘--threshold’ to find directories on the
+     root file system with more than 20000 inodes used in the directory
+     tree below:
+
+          du --inodes -x --threshold=20000 /
+
+‘--time’
      Show time of the most recent modification of any file in the
      directory, or any of its subdirectories.
 
-`--time=ctime'
-`--time=status'
-`--time=use'
-     Show the most recent status change time (the `ctime' in the inode)
+‘--time=ctime’
+‘--time=status’
+‘--time=use’
+     Show the most recent status change time (the ‘ctime’ in the inode)
      of any file in the directory, instead of the modification time.
 
-`--time=atime'
-`--time=access'
-     Show the most recent access time (the `atime' in the inode) of any
+‘--time=atime’
+‘--time=access’
+     Show the most recent access time (the ‘atime’ in the inode) of any
      file in the directory, instead of the modification time.
 
-`--time-style=STYLE'
+‘--time-style=STYLE’
      List timestamps in style STYLE.  This option has an effect only if
-     the `--time' option is also specified.  The STYLE should be one of
+     the ‘--time’ option is also specified.  The STYLE should be one of
      the following:
 
-    `+FORMAT'
-          List timestamps using FORMAT, where FORMAT is interpreted
-          like the format argument of `date' (*note date invocation::).
-          For example, `--time-style="+%Y-%m-%d %H:%M:%S"' causes `du'
-          to list timestamps like `2002-03-30 23:45:56'.  As with
-          `date', FORMAT's interpretation is affected by the `LC_TIME'
-          locale category.
+     ‘+FORMAT’
+          List timestamps using FORMAT, where FORMAT is interpreted like
+          the format argument of ‘date’ (*note date invocation::).  For
+          example, ‘--time-style="+%Y-%m-%d %H:%M:%S"’ causes ‘du’ to
+          list timestamps like ‘2002-03-30 23:45:56’.  As with ‘date’,
+          FORMAT’s interpretation is affected by the ‘LC_TIME’ locale
+          category.
 
-    `full-iso'
+     ‘full-iso’
           List timestamps in full using ISO 8601 date, time, and time
-          zone format with nanosecond precision, e.g., `2002-03-30
-          23:45:56.477817180 -0700'.  This style is equivalent to
-          `+%Y-%m-%d %H:%M:%S.%N %z'.
+          zone format with nanosecond precision, e.g., ‘2002-03-30
+          23:45:56.477817180 -0700’.  This style is equivalent to
+          ‘+%Y-%m-%d %H:%M:%S.%N %z’.
 
-    `long-iso'
-          List ISO 8601 date and time in minutes, e.g., `2002-03-30
-          23:45'.  These timestamps are shorter than `full-iso'
+     ‘long-iso’
+          List ISO 8601 date and time in minutes, e.g., ‘2002-03-30
+          23:45’.  These timestamps are shorter than ‘full-iso’
           timestamps, and are usually good enough for everyday work.
-          This style is equivalent to `+%Y-%m-%d %H:%M'.
-
-    `iso'
-          List ISO 8601 dates for timestamps, e.g., `2002-03-30'.  This
-          style is equivalent to `+%Y-%m-%d'.
-
-     You can specify the default value of the `--time-style' option
-     with the environment variable `TIME_STYLE'; if `TIME_STYLE' is not
-     set the default style is `long-iso'.  For compatibility with `ls',
-     if `TIME_STYLE' begins with `+' and contains a newline, the
-     newline and any later characters are ignored; if `TIME_STYLE'
-     begins with `posix-' the `posix-' is ignored; and if `TIME_STYLE'
-     is `locale' it is ignored.
-
-`-X FILE'
-`--exclude-from=FILE'
-     Like `--exclude', except take the patterns to exclude from FILE,
-     one per line.  If FILE is `-', take the patterns from standard
+          This style is equivalent to ‘+%Y-%m-%d %H:%M’.
+
+     ‘iso’
+          List ISO 8601 dates for timestamps, e.g., ‘2002-03-30’.  This
+          style is equivalent to ‘+%Y-%m-%d’.
+
+     You can specify the default value of the ‘--time-style’ option with
+     the environment variable ‘TIME_STYLE’; if ‘TIME_STYLE’ is not set
+     the default style is ‘long-iso’.  For compatibility with ‘ls’, if
+     ‘TIME_STYLE’ begins with ‘+’ and contains a newline, the newline
+     and any later characters are ignored; if ‘TIME_STYLE’ begins with
+     ‘posix-’ the ‘posix-’ is ignored; and if ‘TIME_STYLE’ is ‘locale’
+     it is ignored.
+
+‘-X FILE’
+‘--exclude-from=FILE’
+     Like ‘--exclude’, except take the patterns to exclude from FILE,
+     one per line.  If FILE is ‘-’, take the patterns from standard
      input.
 
-`--exclude=PATTERN'
-     When recursing, skip subdirectories or files matching PATTERN.
-     For example, `du --exclude='*.o'' excludes files whose names end
-     in `.o'.
+‘--exclude=PATTERN’
+     When recursing, skip subdirectories or files matching PATTERN.  For
+     example, ‘du --exclude='*.o'’ excludes files whose names end in
+     ‘.o’.
 
-`-x'
-`--one-file-system'
+‘-x’
+‘--one-file-system’
      Skip directories that are on different file systems from the one
      that the argument being processed is on.
 
-
-   On BSD systems, `du' reports sizes that are half the correct values
-for files that are NFS-mounted from HP-UX systems.  On HP-UX systems,
-it reports sizes that are twice the correct values for files that are
+   On BSD systems, ‘du’ reports sizes that are half the correct values
+for files that are NFS-mounted from HP-UX systems.  On HP-UX systems, it
+reports sizes that are twice the correct values for files that are
 NFS-mounted from BSD systems.  This is due to a flaw in HP-UX; it also
-affects the HP-UX `du' program.
+affects the HP-UX ‘du’ program.
 
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
@@ -9394,130 +9410,105 @@ indicates failure.
 
 File: coreutils.info,  Node: stat invocation,  Next: sync invocation,  Prev: du invocation,  Up: Disk usage
 
-14.3 `stat': Report file or file system status
+14.3 ‘stat’: Report file or file system status
 ==============================================
 
-`stat' displays information about the specified file(s).  Synopsis:
+‘stat’ displays information about the specified file(s).  Synopsis:
 
-     stat [OPTION]... [FILE]...
+     stat [OPTION]… [FILE]…
 
-   With no option, `stat' reports all information about the given files.
+   With no option, ‘stat’ reports all information about the given files.
 But it also can be used to report the information of the file systems
-the given files are located on.  If the files are links, `stat' can
-also give information about the files the links point to.
+the given files are located on.  If the files are links, ‘stat’ can also
+give information about the files the links point to.
 
-   Due to shell aliases and built-in `stat' functions, using an
-unadorned `stat' interactively or in a script may get you different
-functionality than that described here.  Invoke it via `env' (i.e.,
-`env stat ...') to avoid interference from the shell.
+   Due to shell aliases and built-in ‘stat’ functions, using an
+unadorned ‘stat’ interactively or in a script may get you different
+functionality than that described here.  Invoke it via ‘env’ (i.e., ‘env
+stat …’) to avoid interference from the shell.
 
-`-L'
-`--dereference'
-     Change how `stat' treats symbolic links.  With this option, `stat'
+‘-L’
+‘--dereference’
+     Change how ‘stat’ treats symbolic links.  With this option, ‘stat’
      acts on the file referenced by each symbolic link argument.
-     Without it, `stat' acts on any symbolic link argument directly.
-
-`-f'
-`--file-system'
-     Report information about the file systems where the given files
-     are located instead of information about the files themselves.
-     This option implies the `-L' option.
-
-`-c'
-`--format=FORMAT'
-     Use FORMAT rather than the default format.  FORMAT is
-     automatically newline-terminated, so running a command like the
-     following with two or more FILE operands produces a line of output
-     for each operand:
+     Without it, ‘stat’ acts on any symbolic link argument directly.
+
+‘-f’
+‘--file-system’
+     Report information about the file systems where the given files are
+     located instead of information about the files themselves.  This
+     option implies the ‘-L’ option.
+
+‘-c’
+‘--format=FORMAT’
+     Use FORMAT rather than the default format.  FORMAT is automatically
+     newline-terminated, so running a command like the following with
+     two or more FILE operands produces a line of output for each
+     operand:
           $ stat --format=%d:%i / /usr
           2050:2
           2057:2
 
-`--printf=FORMAT'
-     Use FORMAT rather than the default format.  Like `--format', but
-     interpret backslash escapes, and do not output a mandatory
-     trailing newline.  If you want a newline, include `\n' in the
-     FORMAT.  Here's how you would use `--printf' to print the device
-     and inode numbers of `/' and `/usr':
+‘--printf=FORMAT’
+     Use FORMAT rather than the default format.  Like ‘--format’, but
+     interpret backslash escapes, and do not output a mandatory trailing
+     newline.  If you want a newline, include ‘\n’ in the FORMAT.
+     Here’s how you would use ‘--printf’ to print the device and inode
+     numbers of ‘/’ and ‘/usr’:
           $ stat --printf='%d:%i\n' / /usr
           2050:2
           2057:2
 
-`-t'
-`--terse'
+‘-t’
+‘--terse’
      Print the information in terse form, suitable for parsing by other
      programs.
 
-
-   The valid FORMAT directives for files with `--format' and `--printf'
+   The valid FORMAT directives for files with ‘--format’ and ‘--printf’
 are:
 
-   * %a - Access rights in octal
-
-   * %A - Access rights in human readable form
-
-   * %b - Number of blocks allocated (see `%B')
-
-   * %B - The size in bytes of each block reported by `%b'
-
-   * %C - The SELinux security context of a file, if available
-
-   * %d - Device number in decimal
-
-   * %D - Device number in hex
-
-   * %f - Raw mode in hex
-
-   * %F - File type
-
-   * %g - Group ID of owner
-
-   * %G - Group name of owner
-
-   * %h - Number of hard links
-
-   * %i - Inode number
-
-   * %m - Mount point (See note below)
-
-   * %n - File name
-
-   * %N - Quoted file name with dereference if symbolic link
-
-   * %o - Optimal I/O transfer size hint
-
-   * %s - Total size, in bytes
-
-   * %t - Major device type in hex
-
-   * %T - Minor device type in hex
-
-   * %u - User ID of owner
-
-   * %U - User name of owner
-
-   * %w - Time of file birth, or `-' if unknown
-
-   * %W - Time of file birth as seconds since Epoch, or `0'
-
-   * %x - Time of last access
-
-   * %X - Time of last access as seconds since Epoch
-
-   * %y - Time of last modification
-
-   * %Y - Time of last modification as seconds since Epoch
-
-   * %z - Time of last change
-
-   * %Z - Time of last change as seconds since Epoch
-
-   The `%W', `%X', `%Y', and `%Z' formats accept a precision preceded
-by a period to specify the number of digits to print after the decimal
-point.  For example, `%.3X' outputs the last access time to millisecond
-precision.  If a period is given but no precision, `stat' uses 9
-digits, so `%.X' is equivalent to `%.9X'.  When discarding excess
-precision, time stamps are truncated toward minus infinity.
+   • %a - Access rights in octal
+   • %A - Access rights in human readable form
+   • %b - Number of blocks allocated (see ‘%B’)
+   • %B - The size in bytes of each block reported by ‘%b’
+   • %C - The SELinux security context of a file, if available
+   • %d - Device number in decimal
+   • %D - Device number in hex
+   • %f - Raw mode in hex
+   • %F - File type
+   • %g - Group ID of owner
+   • %G - Group name of owner
+   • %h - Number of hard links
+   • %i - Inode number
+   • %m - Mount point (See note below)
+   • %n - File name
+   • %N - Quoted file name with dereference if symbolic link
+   • %o - Optimal I/O transfer size hint
+   • %s - Total size, in bytes
+   • %t - Major device type in hex (see below)
+   • %T - Minor device type in hex (see below)
+   • %u - User ID of owner
+   • %U - User name of owner
+   • %w - Time of file birth, or ‘-’ if unknown
+   • %W - Time of file birth as seconds since Epoch, or ‘0’
+   • %x - Time of last access
+   • %X - Time of last access as seconds since Epoch
+   • %y - Time of last data modification
+   • %Y - Time of last data modification as seconds since Epoch
+   • %z - Time of last status change
+   • %Z - Time of last status change as seconds since Epoch
+
+   The ‘%t’ and ‘%T’ formats operate on the st_rdev member of the
+stat(2) structure, and are only defined for character and block special
+files.  On some systems or file types, st_rdev may be used to represent
+other quantities.
+
+   The ‘%W’, ‘%X’, ‘%Y’, and ‘%Z’ formats accept a precision preceded by
+a period to specify the number of digits to print after the decimal
+point.  For example, ‘%.3X’ outputs the last access time to millisecond
+precision.  If a period is given but no precision, ‘stat’ uses 9 digits,
+so ‘%.X’ is equivalent to ‘%.9X’.  When discarding excess precision,
+time stamps are truncated toward minus infinity.
 
      zero pad:
        $ stat -c '[%015Y]' /usr
@@ -9533,50 +9524,36 @@ precision, time stamps are truncated toward minus infinity.
        $ stat -c '[%.Y]' /usr
        [1288929712.114951834]
 
-   The mount point printed by `%m' is similar to that output by `df',
+   The mount point printed by ‘%m’ is similar to that output by ‘df’,
 except that:
-   * stat does not dereference symlinks by default (unless `-L' is
+   • stat does not dereference symlinks by default (unless ‘-L’ is
      specified)
-
-   * stat does not search for specified device nodes in the file system
+   • stat does not search for specified device nodes in the file system
      list, instead operating on them directly
-
-   * stat outputs the alias for a bind mounted file, rather than the
+   • stat outputs the alias for a bind mounted file, rather than the
      initial mount point of its backing device.  One can recursively
      call stat until there is no change in output, to get the current
      base mount point
 
-   When listing file system information (`--file-system' (`-f')), you
+   When listing file system information (‘--file-system’ (‘-f’)), you
 must use a different set of FORMAT directives:
 
-   * %a - Free blocks available to non-super-user
-
-   * %b - Total data blocks in file system
-
-   * %c - Total file nodes in file system
-
-   * %d - Free file nodes in file system
-
-   * %f - Free blocks in file system
-
-   * %i - File System ID in hex
-
-   * %l - Maximum length of file names
-
-   * %n - File name
-
-   * %s - Block size (for faster transfers)
-
-   * %S - Fundamental block size (for block counts)
-
-   * %t - Type in hex
-
-   * %T - Type in human readable form
+   • %a - Free blocks available to non-super-user
+   • %b - Total data blocks in file system
+   • %c - Total file nodes in file system
+   • %d - Free file nodes in file system
+   • %f - Free blocks in file system
+   • %i - File System ID in hex
+   • %l - Maximum length of file names
+   • %n - File name
+   • %s - Block size (for faster transfers)
+   • %S - Fundamental block size (for block counts)
+   • %t - Type in hex
+   • %T - Type in human readable form
 
    Time stamps are listed according to the time zone rules specified by
-the `TZ' environment variable, or by the system default rules if `TZ'
-is not set.  *Note Specifying the Time Zone with `TZ': (libc)TZ
-Variable.
+the ‘TZ’ environment variable, or by the system default rules if ‘TZ’ is
+not set.  *Note Specifying the Time Zone with ‘TZ’: (libc)TZ Variable.
 
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
@@ -9584,20 +9561,20 @@ indicates failure.
 
 File: coreutils.info,  Node: sync invocation,  Next: truncate invocation,  Prev: stat invocation,  Up: Disk usage
 
-14.4 `sync': Synchronize data on disk with memory
+14.4 ‘sync’: Synchronize data on disk with memory
 =================================================
 
-`sync' writes any data buffered in memory out to disk.  This can
-include (but is not limited to) modified superblocks, modified inodes,
-and delayed reads and writes.  This must be implemented by the kernel;
-The `sync' program does nothing but exercise the `sync' system call.
+‘sync’ writes any data buffered in memory out to disk.  This can include
+(but is not limited to) modified superblocks, modified inodes, and
+delayed reads and writes.  This must be implemented by the kernel; The
+‘sync’ program does nothing but exercise the ‘sync’ system call.
 
    The kernel keeps data in memory to avoid doing (relatively slow) disk
 reads and writes.  This improves performance, but if the computer
-crashes, data may be lost or the file system corrupted as a result.
-The `sync' command ensures everything in memory is written to disk.
+crashes, data may be lost or the file system corrupted as a result.  The
+‘sync’ command ensures everything in memory is written to disk.
 
-   Any arguments are ignored, except for a lone `--help' or `--version'
+   Any arguments are ignored, except for a lone ‘--help’ or ‘--version’
 (*note Common options::).
 
    An exit status of zero indicates success, and a nonzero value
@@ -9606,13 +9583,13 @@ indicates failure.
 
 File: coreutils.info,  Node: truncate invocation,  Prev: sync invocation,  Up: Disk usage
 
-14.5 `truncate': Shrink or extend the size of a file
+14.5 ‘truncate’: Shrink or extend the size of a file
 ====================================================
 
-`truncate' shrinks or extends the size of each FILE to the specified
+‘truncate’ shrinks or extends the size of each FILE to the specified
 size.  Synopsis:
 
-     truncate OPTION... FILE...
+     truncate OPTION… FILE…
 
    Any FILE that does not exist is created.
 
@@ -9623,40 +9600,40 @@ reads as zero bytes.
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-c'
-`--no-create'
+‘-c’
+‘--no-create’
      Do not create files that do not exist.
 
-`-o'
-`--io-blocks'
+‘-o’
+‘--io-blocks’
      Treat SIZE as number of I/O blocks of the FILE rather than bytes.
 
-`-r RFILE'
-`--reference=RFILE'
+‘-r RFILE’
+‘--reference=RFILE’
      Base the size of each FILE on the size of RFILE.
 
-`-s SIZE'
-`--size=SIZE'
-     Set or adjust the size of each FILE according to SIZE.  SIZE may
-     be, or may be an integer optionally followed by, one of the
-     following multiplicative suffixes:
-          `KB' =>           1000 (KiloBytes)
-          `K'  =>           1024 (KibiBytes)
-          `MB' =>      1000*1000 (MegaBytes)
-          `M'  =>      1024*1024 (MebiBytes)
-          `GB' => 1000*1000*1000 (GigaBytes)
-          `G'  => 1024*1024*1024 (GibiBytes)
-     and so on for `T', `P', `E', `Z', and `Y'.
+‘-s SIZE’
+‘--size=SIZE’
+     Set or adjust the size of each FILE according to SIZE.  SIZE is in
+     bytes unless ‘--io-blocks’ is specified.  SIZE may be, or may be an
+     integer optionally followed by, one of the following multiplicative
+     suffixes:
+          ‘KB’ =>           1000 (KiloBytes)
+          ‘K’  =>           1024 (KibiBytes)
+          ‘MB’ =>      1000*1000 (MegaBytes)
+          ‘M’  =>      1024*1024 (MebiBytes)
+          ‘GB’ => 1000*1000*1000 (GigaBytes)
+          ‘G’  => 1024*1024*1024 (GibiBytes)
+     and so on for ‘T’, ‘P’, ‘E’, ‘Z’, and ‘Y’.
 
      SIZE may also be prefixed by one of the following to adjust the
      size of each FILE based on their current size:
-          `+'  => extend by
-          `-'  => reduce by
-          `<'  => at most
-          `>'  => at least
-          `/'  => round down to multiple of
-          `%'  => round up to multiple of
-
+          ‘+’  => extend by
+          ‘-’  => reduce by
+          ‘<’  => at most
+          ‘>’  => at least
+          ‘/’  => round down to multiple of
+          ‘%’  => round up to multiple of
 
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
@@ -9678,90 +9655,77 @@ This section describes commands that display text strings.
 
 File: coreutils.info,  Node: echo invocation,  Next: printf invocation,  Up: Printing text
 
-15.1 `echo': Print a line of text
+15.1 ‘echo’: Print a line of text
 =================================
 
-`echo' writes each given STRING to standard output, with a space
-between each and a newline after the last one.  Synopsis:
+‘echo’ writes each given STRING to standard output, with a space between
+each and a newline after the last one.  Synopsis:
 
-     echo [OPTION]... [STRING]...
+     echo [OPTION]… [STRING]…
 
-   Due to shell aliases and built-in `echo' functions, using an
-unadorned `echo' interactively or in a script may get you different
-functionality than that described here.  Invoke it via `env' (i.e.,
-`env echo ...') to avoid interference from the shell.
+   Due to shell aliases and built-in ‘echo’ functions, using an
+unadorned ‘echo’ interactively or in a script may get you different
+functionality than that described here.  Invoke it via ‘env’ (i.e., ‘env
+echo …’) to avoid interference from the shell.
 
    The program accepts the following options.  Also see *note Common
 options::.  Options must precede operands, and the normally-special
-argument `--' has no special meaning and is treated like any other
+argument ‘--’ has no special meaning and is treated like any other
 STRING.
 
-`-n'
+‘-n’
      Do not output the trailing newline.
 
-`-e'
-     Enable interpretation of the following backslash-escaped
-     characters in each STRING:
+‘-e’
+     Enable interpretation of the following backslash-escaped characters
+     in each STRING:
 
-    `\a'
+     ‘\a’
           alert (bell)
-
-    `\b'
+     ‘\b’
           backspace
-
-    `\c'
+     ‘\c’
           produce no further output
-
-    `\e'
+     ‘\e’
           escape
-
-    `\f'
+     ‘\f’
           form feed
-
-    `\n'
+     ‘\n’
           newline
-
-    `\r'
+     ‘\r’
           carriage return
-
-    `\t'
+     ‘\t’
           horizontal tab
-
-    `\v'
+     ‘\v’
           vertical tab
-
-    `\\'
+     ‘\\’
           backslash
-
-    `\0NNN'
+     ‘\0NNN’
           the eight-bit value that is the octal number NNN (zero to
-          three octal digits), if NNN is a nine-bit value, the ninth
-          bit is ignored
-
-    `\NNN'
-          the eight-bit value that is the octal number NNN (one to
-          three octal digits), if NNN is a nine-bit value, the ninth
-          bit is ignored
-
-    `\xHH'
+          three octal digits), if NNN is a nine-bit value, the ninth bit
+          is ignored
+     ‘\NNN’
+          the eight-bit value that is the octal number NNN (one to three
+          octal digits), if NNN is a nine-bit value, the ninth bit is
+          ignored
+     ‘\xHH’
           the eight-bit value that is the hexadecimal number HH (one or
           two hexadecimal digits)
 
-`-E'
+‘-E’
      Disable interpretation of backslash escapes in each STRING.  This
-     is the default.  If `-e' and `-E' are both specified, the last one
+     is the default.  If ‘-e’ and ‘-E’ are both specified, the last one
      given takes effect.
 
-
-   If the `POSIXLY_CORRECT' environment variable is set, then when
-`echo''s first argument is not `-n' it outputs option-like arguments
-instead of treating them as options.  For example, `echo -ne hello'
-outputs `-ne hello' instead of plain `hello'.
+   If the ‘POSIXLY_CORRECT’ environment variable is set, then when
+‘echo’’s first argument is not ‘-n’ it outputs option-like arguments
+instead of treating them as options.  For example, ‘echo -ne hello’
+outputs ‘-ne hello’ instead of plain ‘hello’.
 
    POSIX does not require support for any options, and says that the
-behavior of `echo' is implementation-defined if any STRING contains a
-backslash or if the first argument is `-n'.  Portable programs can use
-the `printf' command if they need to omit trailing newlines or output
+behavior of ‘echo’ is implementation-defined if any STRING contains a
+backslash or if the first argument is ‘-n’.  Portable programs can use
+the ‘printf’ command if they need to omit trailing newlines or output
 control characters or backslashes.  *Note printf invocation::.
 
    An exit status of zero indicates success, and a nonzero value
@@ -9770,88 +9734,86 @@ indicates failure.
 
 File: coreutils.info,  Node: printf invocation,  Next: yes invocation,  Prev: echo invocation,  Up: Printing text
 
-15.2 `printf': Format and print data
+15.2 ‘printf’: Format and print data
 ====================================
 
-`printf' does formatted printing of text.  Synopsis:
+‘printf’ does formatted printing of text.  Synopsis:
 
-     printf FORMAT [ARGUMENT]...
+     printf FORMAT [ARGUMENT]…
 
-   `printf' prints the FORMAT string, interpreting `%' directives and
-`\' escapes to format numeric and string arguments in a way that is
-mostly similar to the C `printf' function.  *Note `printf' format
+   ‘printf’ prints the FORMAT string, interpreting ‘%’ directives and
+‘\’ escapes to format numeric and string arguments in a way that is
+mostly similar to the C ‘printf’ function.  *Note ‘printf’ format
 directives: (libc)Output Conversion Syntax, for details.  The
 differences are listed below.
 
-   Due to shell aliases and built-in `printf' functions, using an
-unadorned `printf' interactively or in a script may get you different
-functionality than that described here.  Invoke it via `env' (i.e.,
-`env printf ...') to avoid interference from the shell.
+   Due to shell aliases and built-in ‘printf’ functions, using an
+unadorned ‘printf’ interactively or in a script may get you different
+functionality than that described here.  Invoke it via ‘env’ (i.e., ‘env
+printf …’) to avoid interference from the shell.
 
-   * The FORMAT argument is reused as necessary to convert all the
-     given ARGUMENTs.  For example, the command `printf %s a b' outputs
-     `ab'.
+   • The FORMAT argument is reused as necessary to convert all the given
+     ARGUMENTs.  For example, the command ‘printf %s a b’ outputs ‘ab’.
 
-   * Missing ARGUMENTs are treated as null strings or as zeros,
+   • Missing ARGUMENTs are treated as null strings or as zeros,
      depending on whether the context expects a string or a number.  For
-     example, the command `printf %sx%d' prints `x0'.
+     example, the command ‘printf %sx%d’ prints ‘x0’.
 
-   * An additional escape, `\c', causes `printf' to produce no further
-     output.  For example, the command `printf 'A%sC\cD%sF' B E' prints
-     `ABC'.
+   • An additional escape, ‘\c’, causes ‘printf’ to produce no further
+     output.  For example, the command ‘printf 'A%sC\cD%sF' B E’ prints
+     ‘ABC’.
 
-   * The hexadecimal escape sequence `\xHH' has at most two digits, as
+   • The hexadecimal escape sequence ‘\xHH’ has at most two digits, as
      opposed to C where it can have an unlimited number of digits.  For
-     example, the command `printf '\x07e'' prints two bytes, whereas
-     the C statement `printf ("\x07e")' prints just one.
+     example, the command ‘printf '\x07e'’ prints two bytes, whereas the
+     C statement ‘printf ("\x07e")’ prints just one.
 
-   * `printf' has an additional directive, `%b', which prints its
-     argument string with `\' escapes interpreted in the same way as in
+   • ‘printf’ has an additional directive, ‘%b’, which prints its
+     argument string with ‘\’ escapes interpreted in the same way as in
      the FORMAT string, except that octal escapes are of the form
-     `\0OOO' where OOO is 0 to 3 octal digits.  If `\OOO' is nine-bit
+     ‘\0OOO’ where OOO is 0 to 3 octal digits.  If ‘\OOO’ is nine-bit
      value, ignore the ninth bit.  If a precision is also given, it
      limits the number of bytes printed from the converted string.
 
-   * Numeric arguments must be single C constants, possibly with leading
-     `+' or `-'.  For example, `printf %.4d -3' outputs `-0003'.
+   • Numeric arguments must be single C constants, possibly with leading
+     ‘+’ or ‘-’.  For example, ‘printf %.4d -3’ outputs ‘-0003’.
 
-   * If the leading character of a numeric argument is `"' or `'' then
+   • If the leading character of a numeric argument is ‘"’ or ‘'’ then
      its value is the numeric value of the immediately following
      character.  Any remaining characters are silently ignored if the
-     `POSIXLY_CORRECT' environment variable is set; otherwise, a
-     warning is printed.  For example, `printf "%d" "'a"' outputs `97'
-     on hosts that use the ASCII character set, since `a' has the
-     numeric value 97 in ASCII.
-
+     ‘POSIXLY_CORRECT’ environment variable is set; otherwise, a warning
+     is printed.  For example, ‘printf "%d" "'a"’ outputs ‘97’ on hosts
+     that use the ASCII character set, since ‘a’ has the numeric value
+     97 in ASCII.
 
    A floating-point argument must use a period before any fractional
-digits, but is printed according to the `LC_NUMERIC' category of the
+digits, but is printed according to the ‘LC_NUMERIC’ category of the
 current locale.  For example, in a locale whose radix character is a
-comma, the command `printf %g 3.14' outputs `3,14' whereas the command
-`printf %g 3,14' is an error.  *Note Floating point::.
+comma, the command ‘printf %g 3.14’ outputs ‘3,14’ whereas the command
+‘printf %g 3,14’ is an error.  *Note Floating point::.
 
-   `printf' interprets `\OOO' in FORMAT as an octal number (if OOO is 1
-to 3 octal digits) specifying a byte to print, and `\xHH' as a
+   ‘printf’ interprets ‘\OOO’ in FORMAT as an octal number (if OOO is 1
+to 3 octal digits) specifying a byte to print, and ‘\xHH’ as a
 hexadecimal number (if HH is 1 to 2 hex digits) specifying a character
-to print.  Note however that when `\OOO' specifies a number larger than
-255, `printf' ignores the ninth bit.  For example, `printf '\400'' is
-equivalent to `printf '\0''.
-
-   `printf' interprets two character syntaxes introduced in ISO C 99:
-`\u' for 16-bit Unicode (ISO/IEC 10646) characters, specified as four
-hexadecimal digits HHHH, and `\U' for 32-bit Unicode characters,
-specified as eight hexadecimal digits HHHHHHHH.  `printf' outputs the
-Unicode characters according to the `LC_CTYPE' locale.  Unicode
-characters in the ranges U+0000...U+009F, U+D800...U+DFFF cannot be
+to print.  Note however that when ‘\OOO’ specifies a number larger than
+255, ‘printf’ ignores the ninth bit.  For example, ‘printf '\400'’ is
+equivalent to ‘printf '\0'’.
+
+   ‘printf’ interprets two character syntaxes introduced in ISO C 99:
+‘\u’ for 16-bit Unicode (ISO/IEC 10646) characters, specified as four
+hexadecimal digits HHHH, and ‘\U’ for 32-bit Unicode characters,
+specified as eight hexadecimal digits HHHHHHHH.  ‘printf’ outputs the
+Unicode characters according to the ‘LC_CTYPE’ locale.  Unicode
+characters in the ranges U+0000…U+009F, U+D800…U+DFFF cannot be
 specified by this syntax, except for U+0024 ($), U+0040 (@), and U+0060
-()`.
+()Ì€.
 
-   The processing of `\u' and `\U' requires a full-featured `iconv'
-facility.  It is activated on systems with glibc 2.2 (or newer), or
-when `libiconv' is installed prior to this package.  Otherwise `\u' and
-`\U' will print as-is.
+   The processing of ‘\u’ and ‘\U’ requires a full-featured ‘iconv’
+facility.  It is activated on systems with glibc 2.2 (or newer), or when
+‘libiconv’ is installed prior to this package.  Otherwise ‘\u’ and ‘\U’
+will print as-is.
 
-   The only options are a lone `--help' or `--version'.  *Note Common
+   The only options are a lone ‘--help’ or ‘--version’.  *Note Common
 options::.  Options must precede operands.
 
    The Unicode character syntaxes are useful for writing strings in a
@@ -9868,11 +9830,11 @@ will be output correctly in all locales supporting the Euro symbol
 will be output correctly in all Chinese locales (GB2312, BIG5, UTF-8,
 etc).
 
-   Note that in these examples, the `printf' command has been invoked
-via `env' to ensure that we run the program found via your shell's
+   Note that in these examples, the ‘printf’ command has been invoked
+via ‘env’ to ensure that we run the program found via your shell’s
 search path, and not a shell alias or a built-in function.
 
-   For larger strings, you don't need to look up the hexadecimal code
+   For larger strings, you don’t need to look up the hexadecimal code
 values of each character one by one.  ASCII characters mixed with \u
 escape sequences is also known as the JAVA source file encoding.  You
 can use GNU recode 3.5c (or newer) to convert strings to this encoding.
@@ -9891,18 +9853,18 @@ indicates failure.
 
 File: coreutils.info,  Node: yes invocation,  Prev: printf invocation,  Up: Printing text
 
-15.3 `yes': Print a string until interrupted
+15.3 ‘yes’: Print a string until interrupted
 ============================================
 
-`yes' prints the command line arguments, separated by spaces and
+‘yes’ prints the command line arguments, separated by spaces and
 followed by a newline, forever until it is killed.  If no arguments are
-given, it prints `y' followed by a newline forever until killed.
+given, it prints ‘y’ followed by a newline forever until killed.
 
-   Upon a write error, `yes' exits with status `1'.
+   Upon a write error, ‘yes’ exits with status ‘1’.
 
-   The only options are a lone `--help' or `--version'.  To output an
-argument that begins with `-', precede it with `--', e.g., `yes --
---help'.  *Note Common options::.
+   The only options are a lone ‘--help’ or ‘--version’.  To output an
+argument that begins with ‘-’, precede it with ‘--’, e.g., ‘yes --
+--help’.  *Note Common options::.
 
 
 File: coreutils.info,  Node: Conditions,  Next: Redirection,  Prev: Printing text,  Up: Top
@@ -9912,7 +9874,7 @@ File: coreutils.info,  Node: Conditions,  Next: Redirection,  Prev: Printing tex
 
 This section describes commands that are primarily useful for their exit
 status, rather than their output.  Thus, they are often used as the
-condition of shell `if' statements, or as the last command in a
+condition of shell ‘if’ statements, or as the last command in a
 pipeline.
 
 * Menu:
@@ -9925,44 +9887,44 @@ pipeline.
 
 File: coreutils.info,  Node: false invocation,  Next: true invocation,  Up: Conditions
 
-16.1 `false': Do nothing, unsuccessfully
+16.1 ‘false’: Do nothing, unsuccessfully
 ========================================
 
-`false' does nothing except return an exit status of 1, meaning
+‘false’ does nothing except return an exit status of 1, meaning
 "failure".  It can be used as a place holder in shell scripts where an
-unsuccessful command is needed.  In most modern shells, `false' is a
-built-in command, so when you use `false' in a script, you're probably
+unsuccessful command is needed.  In most modern shells, ‘false’ is a
+built-in command, so when you use ‘false’ in a script, you’re probably
 using the built-in command, not the one documented here.
 
-   `false' honors the `--help' and `--version' options.
+   ‘false’ honors the ‘--help’ and ‘--version’ options.
 
-   This version of `false' is implemented as a C program, and is thus
+   This version of ‘false’ is implemented as a C program, and is thus
 more secure and faster than a shell script implementation, and may
 safely be used as a dummy shell for the purpose of disabling accounts.
 
-   Note that `false' (unlike all other programs documented herein)
-exits unsuccessfully, even when invoked with `--help' or `--version'.
+   Note that ‘false’ (unlike all other programs documented herein) exits
+unsuccessfully, even when invoked with ‘--help’ or ‘--version’.
 
-   Portable programs should not assume that the exit status of `false'
+   Portable programs should not assume that the exit status of ‘false’
 is 1, as it is greater than 1 on some non-GNU hosts.
 
 
 File: coreutils.info,  Node: true invocation,  Next: test invocation,  Prev: false invocation,  Up: Conditions
 
-16.2 `true': Do nothing, successfully
+16.2 ‘true’: Do nothing, successfully
 =====================================
 
-`true' does nothing except return an exit status of 0, meaning
+‘true’ does nothing except return an exit status of 0, meaning
 "success".  It can be used as a place holder in shell scripts where a
-successful command is needed, although the shell built-in command `:'
-(colon) may do the same thing faster.  In most modern shells, `true' is
-a built-in command, so when you use `true' in a script, you're probably
+successful command is needed, although the shell built-in command ‘:’
+(colon) may do the same thing faster.  In most modern shells, ‘true’ is
+a built-in command, so when you use ‘true’ in a script, you’re probably
 using the built-in command, not the one documented here.
 
-   `true' honors the `--help' and `--version' options.
+   ‘true’ honors the ‘--help’ and ‘--version’ options.
 
-   Note, however, that it is possible to cause `true' to exit with
-nonzero status: with the `--help' or `--version' option, and with
+   Note, however, that it is possible to cause ‘true’ to exit with
+nonzero status: with the ‘--help’ or ‘--version’ option, and with
 standard output already closed or redirected to a file that evokes an
 I/O error.  For example, using a Bourne-compatible shell:
 
@@ -9971,28 +9933,28 @@ I/O error.  For example, using a Bourne-compatible shell:
      $ ./true --version > /dev/full
      ./true: write error: No space left on device
 
-   This version of `true' is implemented as a C program, and is thus
+   This version of ‘true’ is implemented as a C program, and is thus
 more secure and faster than a shell script implementation, and may
 safely be used as a dummy shell for the purpose of disabling accounts.
 
 
 File: coreutils.info,  Node: test invocation,  Next: expr invocation,  Prev: true invocation,  Up: Conditions
 
-16.3 `test': Check file types and compare values
+16.3 ‘test’: Check file types and compare values
 ================================================
 
-`test' returns a status of 0 (true) or 1 (false) depending on the
+‘test’ returns a status of 0 (true) or 1 (false) depending on the
 evaluation of the conditional expression EXPR.  Each part of the
 expression must be a separate argument.
 
-   `test' has file status checks, string operators, and numeric
+   ‘test’ has file status checks, string operators, and numeric
 comparison operators.
 
-   `test' has an alternate form that uses opening and closing square
-brackets instead a leading `test'.  For example, instead of `test -d
-/', you can write `[ -d / ]'.  The square brackets must be separate
-arguments; for example, `[-d /]' does not have the desired effect.
-Since `test EXPR' and `[ EXPR ]' have the same meaning, only the former
+   ‘test’ has an alternate form that uses opening and closing square
+brackets instead a leading ‘test’.  For example, instead of ‘test -d /’,
+you can write ‘[ -d / ]’.  The square brackets must be separate
+arguments; for example, ‘[-d /]’ does not have the desired effect.
+Since ‘test EXPR’ and ‘[ EXPR ]’ have the same meaning, only the former
 form is discussed below.
 
    Synopses:
@@ -10003,17 +9965,17 @@ form is discussed below.
      [ ]
      [ OPTION
 
-   Due to shell aliases and built-in `test' functions, using an
-unadorned `test' interactively or in a script may get you different
-functionality than that described here.  Invoke it via `env' (i.e.,
-`env test ...') to avoid interference from the shell.
-
-   If EXPRESSION is omitted, `test' returns false.  If EXPRESSION is a
-single argument, `test' returns false if the argument is null and true
-otherwise.  The argument can be any string, including strings like
-`-d', `-1', `--', `--help', and `--version' that most other programs
-would treat as options.  To get help and version information, invoke
-the commands `[ --help' and `[ --version', without the usual closing
+   Due to shell aliases and built-in ‘test’ functions, using an
+unadorned ‘test’ interactively or in a script may get you different
+functionality than that described here.  Invoke it via ‘env’ (i.e., ‘env
+test …’) to avoid interference from the shell.
+
+   If EXPRESSION is omitted, ‘test’ returns false.  If EXPRESSION is a
+single argument, ‘test’ returns false if the argument is null and true
+otherwise.  The argument can be any string, including strings like ‘-d’,
+‘-1’, ‘--’, ‘--help’, and ‘--version’ that most other programs would
+treat as options.  To get help and version information, invoke the
+commands ‘[ --help’ and ‘[ --version’, without the usual closing
 brackets.  *Note Common options::.
 
    Exit status:
@@ -10037,37 +9999,36 @@ File: coreutils.info,  Node: File type tests,  Next: Access permission tests,  U
 16.3.1 File type tests
 ----------------------
 
-These options test for particular types of files.  (Everything's a file,
+These options test for particular types of files.  (Everything’s a file,
 but not all files are the same!)
 
-`-b FILE'
+‘-b FILE’
      True if FILE exists and is a block special device.
 
-`-c FILE'
+‘-c FILE’
      True if FILE exists and is a character special device.
 
-`-d FILE'
+‘-d FILE’
      True if FILE exists and is a directory.
 
-`-f FILE'
+‘-f FILE’
      True if FILE exists and is a regular file.
 
-`-h FILE'
-`-L FILE'
+‘-h FILE’
+‘-L FILE’
      True if FILE exists and is a symbolic link.  Unlike all other
      file-related tests, this test does not dereference FILE if it is a
      symbolic link.
 
-`-p FILE'
+‘-p FILE’
      True if FILE exists and is a named pipe.
 
-`-S FILE'
+‘-S FILE’
      True if FILE exists and is a socket.
 
-`-t FD'
+‘-t FD’
      True if FD is a file descriptor that is associated with a terminal.
 
-
 
 File: coreutils.info,  Node: Access permission tests,  Next: File characteristic tests,  Prev: File type tests,  Up: test invocation
 
@@ -10076,32 +10037,31 @@ File: coreutils.info,  Node: Access permission tests,  Next: File characteristic
 
 These options test for particular access permissions.
 
-`-g FILE'
+‘-g FILE’
      True if FILE exists and has its set-group-ID bit set.
 
-`-k FILE'
+‘-k FILE’
      True if FILE exists and has its "sticky" bit set.
 
-`-r FILE'
+‘-r FILE’
      True if FILE exists and read permission is granted.
 
-`-u FILE'
+‘-u FILE’
      True if FILE exists and has its set-user-ID bit set.
 
-`-w FILE'
+‘-w FILE’
      True if FILE exists and write permission is granted.
 
-`-x FILE'
+‘-x FILE’
      True if FILE exists and execute permission is granted (or search
      permission, if it is a directory).
 
-`-O FILE'
+‘-O FILE’
      True if FILE exists and is owned by the current effective user ID.
 
-`-G FILE'
+‘-G FILE’
      True if FILE exists and is owned by the current effective group ID.
 
-
 
 File: coreutils.info,  Node: File characteristic tests,  Next: String tests,  Prev: Access permission tests,  Up: test invocation
 
@@ -10110,56 +10070,54 @@ File: coreutils.info,  Node: File characteristic tests,  Next: String tests,  Pr
 
 These options test other file characteristics.
 
-`-e FILE'
+‘-e FILE’
      True if FILE exists.
 
-`-s FILE'
+‘-s FILE’
      True if FILE exists and has a size greater than zero.
 
-`FILE1 -nt FILE2'
-     True if FILE1 is newer (according to modification date) than
-     FILE2, or if FILE1 exists and FILE2 does not.
+‘FILE1 -nt FILE2’
+     True if FILE1 is newer (according to modification date) than FILE2,
+     or if FILE1 exists and FILE2 does not.
 
-`FILE1 -ot FILE2'
-     True if FILE1 is older (according to modification date) than
-     FILE2, or if FILE2 exists and FILE1 does not.
+‘FILE1 -ot FILE2’
+     True if FILE1 is older (according to modification date) than FILE2,
+     or if FILE2 exists and FILE1 does not.
 
-`FILE1 -ef FILE2'
+‘FILE1 -ef FILE2’
      True if FILE1 and FILE2 have the same device and inode numbers,
      i.e., if they are hard links to each other.
 
-
 
 File: coreutils.info,  Node: String tests,  Next: Numeric tests,  Prev: File characteristic tests,  Up: test invocation
 
 16.3.4 String tests
 -------------------
 
-These options test string characteristics.  You may need to quote
-STRING arguments for the shell.  For example:
+These options test string characteristics.  You may need to quote STRING
+arguments for the shell.  For example:
 
      test -n "$V"
 
    The quotes here prevent the wrong arguments from being passed to
-`test' if `$V' is empty or contains special characters.
+‘test’ if ‘$V’ is empty or contains special characters.
 
-`-z STRING'
+‘-z STRING’
      True if the length of STRING is zero.
 
-`-n STRING'
-`STRING'
+‘-n STRING’
+‘STRING’
      True if the length of STRING is nonzero.
 
-`STRING1 = STRING2'
+‘STRING1 = STRING2’
      True if the strings are equal.
 
-`STRING1 == STRING2'
+‘STRING1 == STRING2’
      True if the strings are equal (synonym for =).
 
-`STRING1 != STRING2'
+‘STRING1 != STRING2’
      True if the strings are not equal.
 
-
 
 File: coreutils.info,  Node: Numeric tests,  Next: Connectives for test,  Prev: String tests,  Up: test invocation
 
@@ -10167,73 +10125,71 @@ File: coreutils.info,  Node: Numeric tests,  Next: Connectives for test,  Prev:
 --------------------
 
 Numeric relational operators.  The arguments must be entirely numeric
-(possibly negative), or the special expression `-l STRING', which
+(possibly negative), or the special expression ‘-l STRING’, which
 evaluates to the length of STRING.
 
-`ARG1 -eq ARG2'
-`ARG1 -ne ARG2'
-`ARG1 -lt ARG2'
-`ARG1 -le ARG2'
-`ARG1 -gt ARG2'
-`ARG1 -ge ARG2'
+‘ARG1 -eq ARG2’
+‘ARG1 -ne ARG2’
+‘ARG1 -lt ARG2’
+‘ARG1 -le ARG2’
+‘ARG1 -gt ARG2’
+‘ARG1 -ge ARG2’
      These arithmetic binary operators return true if ARG1 is equal,
      not-equal, less-than, less-than-or-equal, greater-than, or
      greater-than-or-equal than ARG2, respectively.
 
-
    For example:
 
      test -1 -gt -2 && echo yes
-     => yes
+     ⇒ yes
      test -l abc -gt 1 && echo yes
-     => yes
+     ⇒ yes
      test 0x100 -eq 1
-     error--> test: integer expression expected before -eq
+     error→ test: integer expression expected before -eq
 
 
 File: coreutils.info,  Node: Connectives for test,  Prev: Numeric tests,  Up: test invocation
 
-16.3.6 Connectives for `test'
+16.3.6 Connectives for ‘test’
 -----------------------------
 
 The usual logical connectives.
 
-`! EXPR'
+‘! EXPR’
      True if EXPR is false.
 
-`EXPR1 -a EXPR2'
+‘EXPR1 -a EXPR2’
      True if both EXPR1 and EXPR2 are true.
 
-`EXPR1 -o EXPR2'
+‘EXPR1 -o EXPR2’
      True if either EXPR1 or EXPR2 is true.
 
-
 
 File: coreutils.info,  Node: expr invocation,  Prev: test invocation,  Up: Conditions
 
-16.4 `expr': Evaluate expressions
+16.4 ‘expr’: Evaluate expressions
 =================================
 
-`expr' evaluates an expression and writes the result on standard
-output.  Each token of the expression must be a separate argument.
+‘expr’ evaluates an expression and writes the result on standard output.
+Each token of the expression must be a separate argument.
 
    Operands are either integers or strings.  Integers consist of one or
-more decimal digits, with an optional leading `-'.  `expr' converts
+more decimal digits, with an optional leading ‘-’.  ‘expr’ converts
 anything appearing in an operand position to an integer or a string
 depending on the operation being applied to it.
 
-   Strings are not quoted for `expr' itself, though you may need to
+   Strings are not quoted for ‘expr’ itself, though you may need to
 quote them to protect characters with special meaning to the shell,
 e.g., spaces.  However, regardless of whether it is quoted, a string
-operand should not be a parenthesis or any of `expr''s operators like
-`+', so you cannot safely pass an arbitrary string `$str' to expr
-merely by quoting it to the shell.  One way to work around this is to
-use the GNU extension `+', (e.g., `+ "$str" = foo'); a more portable
-way is to use `" $str"' and to adjust the rest of the expression to take
-the leading space into account (e.g., `" $str" = " foo"').
-
-   You should not pass a negative integer or a string with leading `-'
-as `expr''s first argument, as it might be misinterpreted as an option;
+operand should not be a parenthesis or any of ‘expr’’s operators like
+‘+’, so you cannot safely pass an arbitrary string ‘$str’ to expr merely
+by quoting it to the shell.  One way to work around this is to use the
+GNU extension ‘+’, (e.g., ‘+ "$str" = foo’); a more portable way is to
+use ‘" $str"’ and to adjust the rest of the expression to take the
+leading space into account (e.g., ‘" $str" = " foo"’).
+
+   You should not pass a negative integer or a string with leading ‘-’
+as ‘expr’’s first argument, as it might be misinterpreted as an option;
 this can be avoided by parenthesization.  Also, portable scripts should
 not use a string operand that happens to take the form of an integer;
 this can be worked around by inserting leading spaces as mentioned
@@ -10244,11 +10200,11 @@ Parentheses may be used for grouping in the usual manner.  You must
 quote parentheses and many operators to avoid the shell evaluating them,
 however.
 
-   When built with support for the GNU MP library, `expr' uses
+   When built with support for the GNU MP library, ‘expr’ uses
 arbitrary-precision arithmetic; otherwise, it uses native arithmetic
 types and may fail due to arithmetic overflow.
 
-   The only options are `--help' and `--version'.  *Note Common
+   The only options are ‘--help’ and ‘--version’.  *Note Common
 options::.  Options must precede operands.
 
    Exit status:
@@ -10271,63 +10227,62 @@ File: coreutils.info,  Node: String expressions,  Next: Numeric expressions,  Up
 16.4.1 String expressions
 -------------------------
 
-`expr' supports pattern matching and other string operators.  These
-have higher precedence than both the numeric and relational operators
-(in the next sections).
+‘expr’ supports pattern matching and other string operators.  These have
+higher precedence than both the numeric and relational operators (in the
+next sections).
 
-`STRING : REGEX'
+‘STRING : REGEX’
      Perform pattern matching.  The arguments are converted to strings
-     and the second is considered to be a (basic, a la GNU `grep')
-     regular expression, with a `^' implicitly prepended.  The first
+     and the second is considered to be a (basic, a la GNU ‘grep’)
+     regular expression, with a ‘^’ implicitly prepended.  The first
      argument is then matched against this regular expression.
 
-     If the match succeeds and REGEX uses `\(' and `\)', the `:'
+     If the match succeeds and REGEX uses ‘\(’ and ‘\)’, the ‘:’
      expression returns the part of STRING that matched the
      subexpression; otherwise, it returns the number of characters
      matched.
 
-     If the match fails, the `:' operator returns the null string if
-     `\(' and `\)' are used in REGEX, otherwise 0.
+     If the match fails, the ‘:’ operator returns the null string if
+     ‘\(’ and ‘\)’ are used in REGEX, otherwise 0.
 
-     Only the first `\( ... \)' pair is relevant to the return value;
+     Only the first ‘\( … \)’ pair is relevant to the return value;
      additional pairs are meaningful only for grouping the regular
      expression operators.
 
-     In the regular expression, `\+', `\?', and `\|' are operators
-     which respectively match one or more, zero or one, or separate
-     alternatives.  SunOS and other `expr''s treat these as regular
+     In the regular expression, ‘\+’, ‘\?’, and ‘\|’ are operators which
+     respectively match one or more, zero or one, or separate
+     alternatives.  SunOS and other ‘expr’’s treat these as regular
      characters.  (POSIX allows either behavior.)  *Note Regular
      Expression Library: (regex)Top, for details of regular expression
      syntax.  Some examples are in *note Examples of expr::.
 
-`match STRING REGEX'
+‘match STRING REGEX’
      An alternative way to do pattern matching.  This is the same as
-     `STRING : REGEX'.
+     ‘STRING : REGEX’.
 
-`substr STRING POSITION LENGTH'
+‘substr STRING POSITION LENGTH’
      Returns the substring of STRING beginning at POSITION with length
-     at most LENGTH.  If either POSITION or LENGTH is negative, zero,
-     or non-numeric, returns the null string.
+     at most LENGTH.  If either POSITION or LENGTH is negative, zero, or
+     non-numeric, returns the null string.
 
-`index STRING CHARSET'
+‘index STRING CHARSET’
      Returns the first position in STRING where the first character in
      CHARSET was found.  If no character in CHARSET is found in STRING,
      return 0.
 
-`length STRING'
+‘length STRING’
      Returns the length of STRING.
 
-`+ TOKEN'
+‘+ TOKEN’
      Interpret TOKEN as a string, even if it is a keyword like MATCH or
-     an operator like `/'.  This makes it possible to test `expr length
-     + "$x"' or `expr + "$x" : '.*/\(.\)'' and have it do the right
-     thing even if the value of $X happens to be (for example) `/' or
-     `index'.  This operator is a GNU extension.  Portable shell
-     scripts should use `" $token" : ' \(.*\)'' instead of `+ "$token"'.
-
+     an operator like ‘/’.  This makes it possible to test ‘expr length
+     + "$x"’ or ‘expr + "$x" : '.*/\(.\)'’ and have it do the right
+     thing even if the value of $X happens to be (for example) ‘/’ or
+     ‘index’.  This operator is a GNU extension.  Portable shell scripts
+     should use ‘" $token" : ' \(.*\)'’ instead of ‘+ "$token"’.
 
-   To make `expr' interpret keywords as strings, you must use the
-`quote' operator.
+   To make ‘expr’ interpret keywords as strings, you must use the
+‘quote’ operator.
 
 
 File: coreutils.info,  Node: Numeric expressions,  Next: Relations for expr,  Prev: String expressions,  Up: expr invocation
@@ -10335,80 +10290,78 @@ File: coreutils.info,  Node: Numeric expressions,  Next: Relations for expr,  Pr
 16.4.2 Numeric expressions
 --------------------------
 
-`expr' supports the usual numeric operators, in order of increasing
+‘expr’ supports the usual numeric operators, in order of increasing
 precedence.  These numeric operators have lower precedence than the
 string operators described in the previous section, and higher
 precedence than the connectives (next section).
 
-`+ -'
+‘+ -’
      Addition and subtraction.  Both arguments are converted to
      integers; an error occurs if this cannot be done.
 
-`* / %'
+‘* / %’
      Multiplication, division, remainder.  Both arguments are converted
      to integers; an error occurs if this cannot be done.
 
-
 
 File: coreutils.info,  Node: Relations for expr,  Next: Examples of expr,  Prev: Numeric expressions,  Up: expr invocation
 
-16.4.3 Relations for `expr'
+16.4.3 Relations for ‘expr’
 ---------------------------
 
-`expr' supports the usual logical connectives and relations.  These
-have lower precedence than the string and numeric operators (previous
+‘expr’ supports the usual logical connectives and relations.  These have
+lower precedence than the string and numeric operators (previous
 sections).  Here is the list, lowest-precedence operator first.
 
-`|'
+‘|’
      Returns its first argument if that is neither null nor zero,
      otherwise its second argument if it is neither null nor zero,
-     otherwise 0.  It does not evaluate its second argument if its
-     first argument is neither null nor zero.
+     otherwise 0.  It does not evaluate its second argument if its first
+     argument is neither null nor zero.
 
-`&'
+‘&’
      Return its first argument if neither argument is null or zero,
-     otherwise 0.  It does not evaluate its second argument if its
-     first argument is null or zero.
+     otherwise 0.  It does not evaluate its second argument if its first
+     argument is null or zero.
 
-`< <= = == != >= >'
+‘< <= = == != >= >’
      Compare the arguments and return 1 if the relation is true, 0
-     otherwise.  `==' is a synonym for `='.  `expr' first tries to
+     otherwise.  ‘==’ is a synonym for ‘=’.  ‘expr’ first tries to
      convert both arguments to integers and do a numeric comparison; if
      either conversion fails, it does a lexicographic comparison using
-     the character collating sequence specified by the `LC_COLLATE'
+     the character collating sequence specified by the ‘LC_COLLATE’
      locale.
 
-
 
 File: coreutils.info,  Node: Examples of expr,  Prev: Relations for expr,  Up: expr invocation
 
-16.4.4 Examples of using `expr'
+16.4.4 Examples of using ‘expr’
 -------------------------------
 
 Here are a few examples, including quoting for shell metacharacters.
 
-   To add 1 to the shell variable `foo', in Bourne-compatible shells:
+   To add 1 to the shell variable ‘foo’, in Bourne-compatible shells:
 
      foo=$(expr $foo + 1)
 
-   To print the non-directory part of the file name stored in `$fname',
-which need not contain a `/':
+   To print the non-directory part of the file name stored in ‘$fname’,
+which need not contain a ‘/’:
 
      expr $fname : '.*/\(.*\)' '|' $fname
 
-   An example showing that `\+' is an operator:
+   An example showing that ‘\+’ is an operator:
 
      expr aaa : 'a\+'
-     => 3
+     ⇒ 3
 
      expr abc : 'a\(.\)c'
-     => b
+     ⇒ b
      expr index abcdef cz
-     => 3
+     ⇒ 3
      expr index index a
-     error--> expr: syntax error
+     error→ expr: syntax error
      expr index + index a
-     => 0
+     ⇒ 0
 
 
 File: coreutils.info,  Node: Redirection,  Next: File name manipulation,  Prev: Conditions,  Up: Top
@@ -10416,10 +10369,10 @@ File: coreutils.info,  Node: Redirection,  Next: File name manipulation,  Prev:
 17 Redirection
 **************
 
-Unix shells commonly provide several forms of "redirection"--ways to
+Unix shells commonly provide several forms of "redirection"—ways to
 change the input source or output destination of a command.  But one
 useful redirection is performed by a separate command, not by the shell;
-it's described here.
+it’s described here.
 
 * Menu:
 
@@ -10428,37 +10381,36 @@ it's described here.
 
 File: coreutils.info,  Node: tee invocation,  Up: Redirection
 
-17.1 `tee': Redirect output to multiple files or processes
+17.1 ‘tee’: Redirect output to multiple files or processes
 ==========================================================
 
-The `tee' command copies standard input to standard output and also to
+The ‘tee’ command copies standard input to standard output and also to
 any files given as arguments.  This is useful when you want not only to
 send some data down a pipe, but also to save a copy.  Synopsis:
 
-     tee [OPTION]... [FILE]...
+     tee [OPTION]… [FILE]…
 
-   If a file being written to does not already exist, it is created.
-If a file being written to already exists, the data it previously
-contained is overwritten unless the `-a' option is used.
+   If a file being written to does not already exist, it is created.  If
+a file being written to already exists, the data it previously contained
+is overwritten unless the ‘-a’ option is used.
 
-   A FILE of `-' causes `tee' to send another copy of input to standard
+   A FILE of ‘-’ causes ‘tee’ to send another copy of input to standard
 output, but this is typically not that useful as the copies are
 interleaved.
 
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-a'
-`--append'
+‘-a’
+‘--append’
      Append standard input to the given files rather than overwriting
      them.
 
-`-i'
-`--ignore-interrupts'
+‘-i’
+‘--ignore-interrupts’
      Ignore interrupt signals.
 
-
-   The `tee' command is useful when you happen to be transferring a
+   The ‘tee’ command is useful when you happen to be transferring a
 large amount of data and also want to summarize that data without
 reading it a second time.  For example, when you are downloading a DVD
 image, you often want to verify its signature or checksum right away.
@@ -10466,37 +10418,37 @@ The inefficient way to do it is simply:
 
      wget http://example.com/some.iso && sha1sum some.iso
 
-   One problem with the above is that it makes you wait for the
-download to complete before starting the time-consuming SHA1
-computation.  Perhaps even more importantly, the above requires reading
-the DVD image a second time (the first was from the network).
+   One problem with the above is that it makes you wait for the download
+to complete before starting the time-consuming SHA1 computation.
+Perhaps even more importantly, the above requires reading the DVD image
+a second time (the first was from the network).
 
    The efficient way to do it is to interleave the download and SHA1
-computation.  Then, you'll get the checksum for free, because the
-entire process parallelizes so well:
+computation.  Then, you’ll get the checksum for free, because the entire
+process parallelizes so well:
 
      # slightly contrived, to demonstrate process substitution
      wget -O - http://example.com/dvd.iso \
        | tee >(sha1sum > dvd.sha1) > dvd.iso
 
-   That makes `tee' write not just to the expected output file, but
-also to a pipe running `sha1sum' and saving the final checksum in a
-file named `dvd.sha1'.
+   That makes ‘tee’ write not just to the expected output file, but also
+to a pipe running ‘sha1sum’ and saving the final checksum in a file
+named ‘dvd.sha1’.
 
    Note, however, that this example relies on a feature of modern shells
-called "process substitution" (the `>(command)' syntax, above; *Note
+called "process substitution" (the ‘>(command)’ syntax, above; *Note
 Process Substitution: (bash)Process Substitution.), so it works with
-`zsh', `bash', and `ksh', but not with `/bin/sh'.  So if you write code
+‘zsh’, ‘bash’, and ‘ksh’, but not with ‘/bin/sh’.  So if you write code
 like this in a shell script, be sure to start the script with
-`#!/bin/bash'.
+‘#!/bin/bash’.
 
    Since the above example writes to one file and one process, a more
-conventional and portable use of `tee' is even better:
+conventional and portable use of ‘tee’ is even better:
 
      wget -O - http://example.com/dvd.iso \
        | tee dvd.iso | sha1sum > dvd.sha1
 
-   You can extend this example to make `tee' write to two processes,
+   You can extend this example to make ‘tee’ write to two processes,
 computing MD5 and SHA1 checksums in parallel.  In this case, process
 substitution is required:
 
@@ -10507,28 +10459,28 @@ substitution is required:
 
    This technique is also useful when you want to make a _compressed_
 copy of the contents of a pipe.  Consider a tool to graphically
-summarize disk usage data from `du -ak'.  For a large hierarchy, `du
--ak' can run for a long time, and can easily produce terabytes of data,
-so you won't want to rerun the command unnecessarily.  Nor will you
-want to save the uncompressed output.
+summarize disk usage data from ‘du -ak’.  For a large hierarchy, ‘du
+-ak’ can run for a long time, and can easily produce terabytes of data,
+so you won’t want to rerun the command unnecessarily.  Nor will you want
+to save the uncompressed output.
 
-   Doing it the inefficient way, you can't even start the GUI until
-after you've compressed all of the `du' output:
+   Doing it the inefficient way, you can’t even start the GUI until
+after you’ve compressed all of the ‘du’ output:
 
      du -ak | gzip -9 > /tmp/du.gz
      gzip -d /tmp/du.gz | xdiskusage -a
 
-   With `tee' and process substitution, you start the GUI right away
-and eliminate the decompression completely:
+   With ‘tee’ and process substitution, you start the GUI right away and
+eliminate the decompression completely:
 
      du -ak | tee >(gzip -9 > /tmp/du.gz) | xdiskusage -a
 
    Finally, if you regularly create more than one type of compressed
-tarball at once, for example when `make dist' creates both
-`gzip'-compressed and `bzip2'-compressed tarballs, there may be a
-better way.  Typical `automake'-generated `Makefile' rules create the
-two compressed tar archives with commands in sequence, like this
-(slightly simplified):
+tarball at once, for example when ‘make dist’ creates both
+‘gzip’-compressed and ‘bzip2’-compressed tarballs, there may be a better
+way.  Typical ‘automake’-generated ‘Makefile’ rules create the two
+compressed tar archives with commands in sequence, like this (slightly
+simplified):
 
      tardir=your-pkg-M.N
      tar chof - "$tardir" | gzip  -9 -c > your-pkg-M.N.tar.gz
@@ -10567,47 +10519,48 @@ This section describes commands that manipulate file names.
 
 File: coreutils.info,  Node: basename invocation,  Next: dirname invocation,  Up: File name manipulation
 
-18.1 `basename': Strip directory and suffix from a file name
+18.1 ‘basename’: Strip directory and suffix from a file name
 ============================================================
 
-`basename' removes any leading directory components from NAME.
+‘basename’ removes any leading directory components from NAME.
 Synopsis:
 
      basename NAME [SUFFIX]
-     basename OPTION... NAME...
+     basename OPTION… NAME…
 
    If SUFFIX is specified and is identical to the end of NAME, it is
-removed from NAME as well.  Note that since trailing slashes are
-removed prior to suffix matching, SUFFIX will do nothing if it contains
-slashes.  `basename' prints the result on standard output.
+removed from NAME as well.  Note that since trailing slashes are removed
+prior to suffix matching, SUFFIX will do nothing if it contains slashes.
+‘basename’ prints the result on standard output.
 
-   Together, `basename' and `dirname' are designed such that if `ls
-"$name"' succeeds, then the command sequence `cd "$(dirname "$name")";
-ls "$(basename "$name")"' will, too.  This works for everything except
+   Together, ‘basename’ and ‘dirname’ are designed such that if ‘ls
+"$name"’ succeeds, then the command sequence ‘cd "$(dirname "$name")";
+ls "$(basename "$name")"’ will, too.  This works for everything except
 file names containing a trailing newline.
 
    POSIX allows the implementation to define the results if NAME is
-empty or `//'.  In the former case, GNU `basename' returns the empty
-string.  In the latter case, the result is `//' on platforms where //
-is distinct from /, and `/' on platforms where there is no difference.
+empty or ‘//’.  In the former case, GNU ‘basename’ returns the empty
+string.  In the latter case, the result is ‘//’ on platforms where // is
+distinct from /, and ‘/’ on platforms where there is no difference.
 
    The program accepts the following options.  Also see *note Common
 options::.  Options must precede operands.
 
-`-a'
-`--multiple'
+‘-a’
+‘--multiple’
      Support more than one argument.  Treat every argument as a NAME.
-     With this, an optional SUFFIX must be specified using the `-s'
+     With this, an optional SUFFIX must be specified using the ‘-s’
      option.
 
-`-s SUFFIX'
-`--suffix=SUFFIX'
-     Remove a trailing SUFFIX.  This option implies the `-a' option.
-
-`-z'
-`--zero'
-     Separate output items with NUL characters.
+‘-s SUFFIX’
+‘--suffix=SUFFIX’
+     Remove a trailing SUFFIX.  This option implies the ‘-a’ option.
 
+‘-z’
+‘--zero’
+     Output a zero byte (ASCII NUL) at the end of each line, rather than
+     a newline.  This option enables other programs to parse the output
+     even when that output would contain data with embedded newlines.
 
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
@@ -10629,36 +10582,37 @@ indicates failure.
 
 File: coreutils.info,  Node: dirname invocation,  Next: pathchk invocation,  Prev: basename invocation,  Up: File name manipulation
 
-18.2 `dirname': Strip last file name component
+18.2 ‘dirname’: Strip last file name component
 ==============================================
 
-`dirname' prints all but the final slash-delimited component of each
+‘dirname’ prints all but the final slash-delimited component of each
 NAME.  Slashes on either side of the final component are also removed.
-If the string contains no slash, `dirname' prints `.' (meaning the
+If the string contains no slash, ‘dirname’ prints ‘.’ (meaning the
 current directory).  Synopsis:
 
-     dirname [OPTION] NAME...
+     dirname [OPTION] NAME…
 
    NAME need not be a file name, but if it is, this operation
 effectively lists the directory that contains the final component,
 including the case when the final component is itself a directory.
 
-   Together, `basename' and `dirname' are designed such that if `ls
-"$name"' succeeds, then the command sequence `cd "$(dirname "$name")";
-ls "$(basename "$name")"' will, too.  This works for everything except
+   Together, ‘basename’ and ‘dirname’ are designed such that if ‘ls
+"$name"’ succeeds, then the command sequence ‘cd "$(dirname "$name")";
+ls "$(basename "$name")"’ will, too.  This works for everything except
 file names containing a trailing newline.
 
    POSIX allows the implementation to define the results if NAME is
-`//'.  With GNU `dirname', the result is `//' on platforms where // is
-distinct from /, and `/' on platforms where there is no difference.
+‘//’.  With GNU ‘dirname’, the result is ‘//’ on platforms where // is
+distinct from /, and ‘/’ on platforms where there is no difference.
 
    The program accepts the following option.  Also see *note Common
 options::.
 
-`-z'
-`--zero'
-     Separate output items with NUL characters.
-
+‘-z’
+‘--zero’
+     Output a zero byte (ASCII NUL) at the end of each line, rather than
+     a newline.  This option enables other programs to parse the output
+     even when that output would contain data with embedded newlines.
 
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
@@ -10678,24 +10632,22 @@ indicates failure.
 
 File: coreutils.info,  Node: pathchk invocation,  Next: mktemp invocation,  Prev: dirname invocation,  Up: File name manipulation
 
-18.3 `pathchk': Check file name validity and portability
+18.3 ‘pathchk’: Check file name validity and portability
 ========================================================
 
-`pathchk' checks validity and portability of file names.  Synopsis:
+‘pathchk’ checks validity and portability of file names.  Synopsis:
 
-     pathchk [OPTION]... NAME...
+     pathchk [OPTION]… NAME…
 
-   For each NAME, `pathchk' prints an error message if any of these
+   For each NAME, ‘pathchk’ prints an error message if any of these
 conditions is true:
 
   1. One of the existing directories in NAME does not have search
      (execute) permission,
-
   2. The length of NAME is larger than the maximum supported by the
      operating system.
-
   3. The length of one component of NAME is longer than its file
-     system's maximum.
+     system’s maximum.
 
    A nonexistent NAME is not an error, so long a file with that name
 could be created under the above conditions.
@@ -10703,27 +10655,26 @@ could be created under the above conditions.
    The program accepts the following options.  Also see *note Common
 options::.  Options must precede operands.
 
-`-p'
+‘-p’
      Instead of performing checks based on the underlying file system,
      print an error message if any of these conditions is true:
 
        1. A file name is empty.
 
        2. A file name contains a character outside the POSIX portable
-          file name character set, namely, the ASCII letters and
-          digits, `.', `_', `-', and `/'.
+          file name character set, namely, the ASCII letters and digits,
+          ‘.’, ‘_’, ‘-’, and ‘/’.
 
        3. The length of a file name or one of its components exceeds the
           POSIX minimum limits for portability.
 
-`-P'
-     Print an error message if a file name is empty, or if it contains
-     a component that begins with `-'.
+‘-P’
+     Print an error message if a file name is empty, or if it contains a
+     component that begins with ‘-’.
 
-`--portability'
+‘--portability’
      Print an error message if a file name is not portable to all POSIX
-     hosts.  This option is equivalent to `-p -P'.
-
+     hosts.  This option is equivalent to ‘-p -P’.
 
    Exit status:
 
@@ -10733,36 +10684,36 @@ options::.  Options must precede operands.
 
 File: coreutils.info,  Node: mktemp invocation,  Next: realpath invocation,  Prev: pathchk invocation,  Up: File name manipulation
 
-18.4 `mktemp': Create temporary file or directory
+18.4 ‘mktemp’: Create temporary file or directory
 =================================================
 
-`mktemp' manages the creation of temporary files and directories.
+‘mktemp’ manages the creation of temporary files and directories.
 Synopsis:
 
-     mktemp [OPTION]... [TEMPLATE]
+     mktemp [OPTION]… [TEMPLATE]
 
    Safely create a temporary file or directory based on TEMPLATE, and
 print its name.  If given, TEMPLATE must include at least three
-consecutive `X's in the last component.  If omitted, the template
-`tmp.XXXXXXXXXX' is used, and option `--tmpdir' is implied.  The final
-run of `X's in the TEMPLATE will be replaced by alpha-numeric
+consecutive ‘X’s in the last component.  If omitted, the template
+‘tmp.XXXXXXXXXX’ is used, and option ‘--tmpdir’ is implied.  The final
+run of ‘X’s in the TEMPLATE will be replaced by alpha-numeric
 characters; thus, on a case-sensitive file system, and with a TEMPLATE
-including a run of N instances of `X', there are `62**N' potential file
+including a run of N instances of ‘X’, there are ‘62**N’ potential file
 names.
 
    Older scripts used to create temporary files by simply joining the
-name of the program with the process id (`$$') as a suffix.  However,
+name of the program with the process id (‘$$’) as a suffix.  However,
 that naming scheme is easily predictable, and suffers from a race
 condition where the attacker can create an appropriately named symbolic
 link, such that when the script then opens a handle to what it thought
-was an unused file, it is instead modifying an existing file.  Using
-the same scheme to create a directory is slightly safer, since the
-`mkdir' will fail if the target already exists, but it is still
-inferior because it allows for denial of service attacks.  Therefore,
-modern scripts should use the `mktemp' command to guarantee that the
-generated name will be unpredictable, and that knowledge of the
-temporary file name implies that the file was created by the current
-script and cannot be modified by other users.
+was an unused file, it is instead modifying an existing file.  Using the
+same scheme to create a directory is slightly safer, since the ‘mkdir’
+will fail if the target already exists, but it is still inferior because
+it allows for denial of service attacks.  Therefore, modern scripts
+should use the ‘mktemp’ command to guarantee that the generated name
+will be unpredictable, and that knowledge of the temporary file name
+implies that the file was created by the current script and cannot be
+modified by other users.
 
    When creating a file, the resulting file has read and write
 permissions for the current user, but no permissions for the group or
@@ -10772,28 +10723,28 @@ restrictive.
    Here are some examples (although note that if you repeat them, you
 will most likely get different file names):
 
-   * Create a temporary file in the current directory.
+   • Create a temporary file in the current directory.
           $ mktemp file.XXXX
           file.H47c
 
-   * Create a temporary file with a known suffix.
+   • Create a temporary file with a known suffix.
           $ mktemp --suffix=.txt file-XXXX
           file-H08W.txt
           $ mktemp file-XXXX-XXXX.txt
           file-XXXX-eI9L.txt
 
-   * Create a secure fifo relative to the user's choice of `TMPDIR',
-     but falling back to the current directory rather than `/tmp'.
-     Note that `mktemp' does not create fifos, but can create a secure
+   • Create a secure fifo relative to the user’s choice of ‘TMPDIR’, but
+     falling back to the current directory rather than ‘/tmp’.  Note
+     that ‘mktemp’ does not create fifos, but can create a secure
      directory in which the fifo can live.  Exit the shell if the
      directory or fifo could not be created.
           $ dir=$(mktemp -p "${TMPDIR:-.}" -d dir-XXXX) || exit 1
           $ fifo=$dir/fifo
           $ mkfifo "$fifo" || { rmdir "$dir"; exit 1; }
 
-   * Create and use a temporary file if possible, but ignore failure.
-     The file will reside in the directory named by `TMPDIR', if
-     specified, or else in `/tmp'.
+   • Create and use a temporary file if possible, but ignore failure.
+     The file will reside in the directory named by ‘TMPDIR’, if
+     specified, or else in ‘/tmp’.
           $ file=$(mktemp -q) && {
           >   # Safe to use $file only within this block.  Use quotes,
           >   # since $TMPDIR, and thus $file, may contain whitespace.
@@ -10801,7 +10752,7 @@ will most likely get different file names):
           >   rm "$file"
           > }
 
-   * Act as a semi-random character generator (it is not fully random,
+   • Act as a semi-random character generator (it is not fully random,
      since it is impacted by the contents of the current directory).  To
      avoid security holes, do not use the resulting names to create a
      file.
@@ -10810,55 +10761,53 @@ will most likely get different file names):
           $ mktemp -u XXX
           nzC
 
-
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-d'
-`--directory'
+‘-d’
+‘--directory’
      Create a directory rather than a file.  The directory will have
      read, write, and search permissions for the current user, but no
      permissions for the group or others; these permissions are reduced
      if the current umask is more restrictive.
 
-`-q'
-`--quiet'
+‘-q’
+‘--quiet’
      Suppress diagnostics about failure to create a file or directory.
      The exit status will still reflect whether a file was created.
 
-`-u'
-`--dry-run'
+‘-u’
+‘--dry-run’
      Generate a temporary name that does not name an existing file,
      without changing the file system contents.  Using the output of
-     this command to create a new file is inherently unsafe, as there
-     is a window of time between generating the name and using it where
+     this command to create a new file is inherently unsafe, as there is
+     a window of time between generating the name and using it where
      another process can create an object by the same name.
 
-`-p DIR'
-`--tmpdir[=DIR]'
+‘-p DIR’
+‘--tmpdir[=DIR]’
      Treat TEMPLATE relative to the directory DIR.  If DIR is not
-     specified (only possible with the long option `--tmpdir') or is
-     the empty string, use the value of `TMPDIR' if available,
-     otherwise use `/tmp'.  If this is specified, TEMPLATE must not be
-     absolute.  However, TEMPLATE can still contain slashes, although
-     intermediate directories must already exist.
+     specified (only possible with the long option ‘--tmpdir’) or is the
+     empty string, use the value of ‘TMPDIR’ if available, otherwise use
+     ‘/tmp’.  If this is specified, TEMPLATE must not be absolute.
+     However, TEMPLATE can still contain slashes, although intermediate
+     directories must already exist.
 
-`--suffix=SUFFIX'
+‘--suffix=SUFFIX’
      Append SUFFIX to the TEMPLATE.  SUFFIX must not contain slash.  If
-     `--suffix' is specified, TEMPLATE must end in `X'; if it is not
-     specified, then an appropriate `--suffix' is inferred by finding
-     the last `X' in TEMPLATE.  This option exists for use with the
+     ‘--suffix’ is specified, TEMPLATE must end in ‘X’; if it is not
+     specified, then an appropriate ‘--suffix’ is inferred by finding
+     the last ‘X’ in TEMPLATE.  This option exists for use with the
      default TEMPLATE and for the creation of a SUFFIX that starts with
-     `X'.
-
-`-t'
-     Treat TEMPLATE as a single file relative to the value of `TMPDIR'
-     if available, or to the directory specified by `-p', otherwise to
-     `/tmp'.  TEMPLATE must not contain slashes.  This option is
-     deprecated; the use of `-p' without `-t' offers better defaults
-     (by favoring the command line over `TMPDIR') and more flexibility
-     (by allowing intermediate directories).
+     ‘X’.
 
+‘-t’
+     Treat TEMPLATE as a single file relative to the value of ‘TMPDIR’
+     if available, or to the directory specified by ‘-p’, otherwise to
+     ‘/tmp’.  TEMPLATE must not contain slashes.  This option is
+     deprecated; the use of ‘-p’ without ‘-t’ offers better defaults (by
+     favoring the command line over ‘TMPDIR’) and more flexibility (by
+     allowing intermediate directories).
 
    Exit status:
 
@@ -10868,81 +10817,82 @@ options::.
 
 File: coreutils.info,  Node: realpath invocation,  Prev: mktemp invocation,  Up: File name manipulation
 
-18.5 `realpath': Print the resolved file name.
+18.5 ‘realpath’: Print the resolved file name.
 ==============================================
 
-`realpath' expands all symbolic links and resolves references to `/./',
-`/../' and extra `/' characters.  By default, all but the last
-component of the specified files must exist.  Synopsis:
+‘realpath’ expands all symbolic links and resolves references to ‘/./’,
+‘/../’ and extra ‘/’ characters.  By default, all but the last component
+of the specified files must exist.  Synopsis:
 
-     realpath [OPTION]... FILE...
+     realpath [OPTION]… FILE…
 
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-e'
-`--canonicalize-existing'
+‘-e’
+‘--canonicalize-existing’
      Ensure that all components of the specified file names exist.  If
-     any component is missing or unavailable, `realpath' will output a
-     diagnostic unless the `-q' option is specified, and exit with a
-     nonzero exit code.  A trailing slash requires that the name
-     resolve to a directory.
+     any component is missing or unavailable, ‘realpath’ will output a
+     diagnostic unless the ‘-q’ option is specified, and exit with a
+     nonzero exit code.  A trailing slash requires that the name resolve
+     to a directory.
 
-`-m'
-`--canonicalize-missing'
+‘-m’
+‘--canonicalize-missing’
      If any component of a specified file name is missing or
      unavailable, treat it as a directory.
 
-`-L'
-`--logical'
+‘-L’
+‘--logical’
      Symbolic links are resolved in the specified file names, but they
-     are resolved after any subsequent `..' components are processed.
+     are resolved after any subsequent ‘..’ components are processed.
 
-`-P'
-`--physical'
+‘-P’
+‘--physical’
      Symbolic links are resolved in the specified file names, and they
-     are resolved before any subsequent `..' components are processed.
+     are resolved before any subsequent ‘..’ components are processed.
      This is the default mode of operation.
 
-`-q'
-`--quiet'
+‘-q’
+‘--quiet’
      Suppress diagnostic messages for specified file names.
 
-`-s'
-`--strip'
-`--no-symlinks'
-     Do not resolve symbolic links.  Only resolve references to `/./',
-     `/../' and remove extra `/' characters.  When combined with the
-     `-m' option, realpath operates only on the file name, and does not
-     touch any actual file.
-
-`-z'
-`--zero'
-     Separate output items with NUL characters.
+‘--relative-to=FILE’
+     Print the resolved file names relative to the specified file.  Note
+     this option honors the ‘-m’ and ‘-e’ options pertaining to file
+     existence.
 
-`--relative-to=FILE'
-     Print the resolved file names relative to the specified file.
-     Note this option honors the `-m' and `-e' options pertaining to
-     file existence.
-
-`--relative-base=BASE'
-     This option is valid when used with `--relative-to', and will
-     restrict the output of `--relative-to' so that relative names are
+‘--relative-base=BASE’
+     This option is valid when used with ‘--relative-to’, and will
+     restrict the output of ‘--relative-to’ so that relative names are
      output, only when FILEs are descendants of BASE.  Otherwise output
-     the absolute file name.  If `--relative-to' was not specified, then
+     the absolute file name.  If ‘--relative-to’ was not specified, then
      the descendants of BASE are printed relative to BASE.  If
-     `--relative-to' is specified, then that directory must be a
+     ‘--relative-to’ is specified, then that directory must be a
      descendant of BASE for this option to have an effect.  Note: this
-     option honors the `-m' and `-e' options pertaining to file
+     option honors the ‘-m’ and ‘-e’ options pertaining to file
      existence.  For example:
 
           realpath --relative-to=/usr /tmp /usr/bin
-          => ../tmp
-          => bin
+          ⇒ ../tmp
+          ⇒ bin
           realpath --relative-base=/usr /tmp /usr/bin
-          => /tmp
-          => bin
+          ⇒ /tmp
+          ⇒ bin
+
+‘-s’
+‘--strip’
+‘--no-symlinks’
+     Do not resolve symbolic links.  Only resolve references to ‘/./’,
+     ‘/../’ and remove extra ‘/’ characters.  When combined with the
+     ‘-m’ option, realpath operates only on the file name, and does not
+     touch any actual file.
 
+‘-z’
+‘--zero’
+     Output a zero byte (ASCII NUL) at the end of each line, rather than
+     a newline.  This option enables other programs to parse the output
+     even when that output would contain data with embedded newlines.
 
    Exit status:
 
@@ -10969,37 +10919,37 @@ so forth.  See also the user-related commands in the next section.
 
 File: coreutils.info,  Node: pwd invocation,  Next: stty invocation,  Up: Working context
 
-19.1 `pwd': Print working directory
+19.1 ‘pwd’: Print working directory
 ===================================
 
-`pwd' prints the name of the current directory.  Synopsis:
+‘pwd’ prints the name of the current directory.  Synopsis:
 
-     pwd [OPTION]...
+     pwd [OPTION]…
 
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-L'
-`--logical'
-     If the contents of the environment variable `PWD' provide an
-     absolute name of the current directory with no `.' or `..'
+‘-L’
+‘--logical’
+     If the contents of the environment variable ‘PWD’ provide an
+     absolute name of the current directory with no ‘.’ or ‘..’
      components, but possibly with symbolic links, then output those
-     contents.  Otherwise, fall back to default `-P' handling.
+     contents.  Otherwise, fall back to default ‘-P’ handling.
 
-`-P'
-`--physical'
+‘-P’
+‘--physical’
      Print a fully resolved name for the current directory.  That is,
      all components of the printed name will be actual directory
-     names--none will be symbolic links.
+     names—none will be symbolic links.
 
-   If `-L' and `-P' are both given, the last one takes precedence.  If
-neither option is given, then this implementation uses `-P' as the
-default unless the `POSIXLY_CORRECT' environment variable is set.
+   If ‘-L’ and ‘-P’ are both given, the last one takes precedence.  If
+neither option is given, then this implementation uses ‘-P’ as the
+default unless the ‘POSIXLY_CORRECT’ environment variable is set.
 
-   Due to shell aliases and built-in `pwd' functions, using an
-unadorned `pwd' interactively or in a script may get you different
-functionality than that described here.  Invoke it via `env' (i.e.,
-`env pwd ...') to avoid interference from the shell.
+   Due to shell aliases and built-in ‘pwd’ functions, using an unadorned
+‘pwd’ interactively or in a script may get you different functionality
+than that described here.  Invoke it via ‘env’ (i.e., ‘env pwd …’) to
+avoid interference from the shell.
 
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
@@ -11007,59 +10957,57 @@ indicates failure.
 
 File: coreutils.info,  Node: stty invocation,  Next: printenv invocation,  Prev: pwd invocation,  Up: Working context
 
-19.2 `stty': Print or change terminal characteristics
+19.2 ‘stty’: Print or change terminal characteristics
 =====================================================
 
-`stty' prints or changes terminal characteristics, such as baud rate.
+‘stty’ prints or changes terminal characteristics, such as baud rate.
 Synopses:
 
-     stty [OPTION] [SETTING]...
+     stty [OPTION] [SETTING]…
      stty [OPTION]
 
-   If given no line settings, `stty' prints the baud rate, line
+   If given no line settings, ‘stty’ prints the baud rate, line
 discipline number (on systems that support it), and line settings that
-have been changed from the values set by `stty sane'.  By default, mode
+have been changed from the values set by ‘stty sane’.  By default, mode
 reading and setting are performed on the tty line connected to standard
-input, although this can be modified by the `--file' option.
+input, although this can be modified by the ‘--file’ option.
 
-   `stty' accepts many non-option arguments that change aspects of the
+   ‘stty’ accepts many non-option arguments that change aspects of the
 terminal line operation, as described below.
 
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-a'
-`--all'
-     Print all current settings in human-readable form.  This option
-     may not be used in combination with any line settings.
+‘-a’
+‘--all’
+     Print all current settings in human-readable form.  This option may
+     not be used in combination with any line settings.
 
-`-F DEVICE'
-`--file=DEVICE'
+‘-F DEVICE’
+‘--file=DEVICE’
      Set the line opened by the file name specified in DEVICE instead of
      the tty line connected to standard input.  This option is necessary
-     because opening a POSIX tty requires use of the `O_NONDELAY' flag
+     because opening a POSIX tty requires use of the ‘O_NONDELAY’ flag
      to prevent a POSIX tty from blocking until the carrier detect line
-     is high if the `clocal' flag is not set.  Hence, it is not always
+     is high if the ‘clocal’ flag is not set.  Hence, it is not always
      possible to allow the shell to open the device in the traditional
      manner.
 
-`-g'
-`--save'
+‘-g’
+‘--save’
      Print all current settings in a form that can be used as an
-     argument to another `stty' command to restore the current
-     settings.  This option may not be used in combination with any
-     line settings.
+     argument to another ‘stty’ command to restore the current settings.
+     This option may not be used in combination with any line settings.
 
-
-   Many settings can be turned off by preceding them with a `-'.  Such
-arguments are marked below with "May be negated" in their description.
+   Many settings can be turned off by preceding them with a ‘-’.  Such
+arguments are marked below with “May be negated� in their description.
 The descriptions themselves refer to the positive case, that is, when
 _not_ negated (unless stated otherwise, of course).
 
    Some settings are not available on all POSIX systems, since they use
-extensions.  Such arguments are marked below with "Non-POSIX" in their
+extensions.  Such arguments are marked below with “Non-POSIX� in their
 description.  On non-POSIX systems, those or other settings also may not
-be available, but it's not feasible to document all the variations: just
+be available, but it’s not feasible to document all the variations: just
 try it and see.
 
    An exit status of zero indicates success, and a nonzero value
@@ -11083,38 +11031,43 @@ File: coreutils.info,  Node: Control,  Next: Input,  Up: stty invocation
 
 Control settings:
 
-`parenb'
+‘parenb’
      Generate parity bit in output and expect parity bit in input.  May
      be negated.
 
-`parodd'
+‘parodd’
      Set odd parity (even if negated).  May be negated.
 
-`cs5'
-`cs6'
-`cs7'
-`cs8'
+‘cmspar’
+     Use "stick" (mark/space) parity.  If parodd is set, the parity bit
+     is always 1; if parodd is not set, the parity bit is always zero.
+     Non-POSIX.  May be negated.
+
+‘cs5’
+‘cs6’
+‘cs7’
+‘cs8’
      Set character size to 5, 6, 7, or 8 bits.
 
-`hup'
-`hupcl'
+‘hup’
+‘hupcl’
      Send a hangup signal when the last process closes the tty.  May be
      negated.
 
-`cstopb'
+‘cstopb’
      Use two stop bits per character (one if negated).  May be negated.
 
-`cread'
+‘cread’
      Allow input to be received.  May be negated.
 
-`clocal'
+‘clocal’
      Disable modem control signals.  May be negated.
 
-`crtscts'
+‘crtscts’
      Enable RTS/CTS flow control.  Non-POSIX.  May be negated.
 
-`cdtrdsr'
-     Enable DTR/DSR flow control. Non-POSIX.  May be negated.
+‘cdtrdsr’
+     Enable DTR/DSR flow control.  Non-POSIX.  May be negated.
 
 
 File: coreutils.info,  Node: Input,  Next: Output,  Prev: Control,  Up: stty invocation
@@ -11124,57 +11077,57 @@ File: coreutils.info,  Node: Input,  Next: Output,  Prev: Control,  Up: stty inv
 
 These settings control operations on data received from the terminal.
 
-`ignbrk'
+‘ignbrk’
      Ignore break characters.  May be negated.
 
-`brkint'
+‘brkint’
      Make breaks cause an interrupt signal.  May be negated.
 
-`ignpar'
+‘ignpar’
      Ignore characters with parity errors.  May be negated.
 
-`parmrk'
+‘parmrk’
      Mark parity errors (with a 255-0-character sequence).  May be
      negated.
 
-`inpck'
+‘inpck’
      Enable input parity checking.  May be negated.
 
-`istrip'
+‘istrip’
      Clear high (8th) bit of input characters.  May be negated.
 
-`inlcr'
+‘inlcr’
      Translate newline to carriage return.  May be negated.
 
-`igncr'
+‘igncr’
      Ignore carriage return.  May be negated.
 
-`icrnl'
+‘icrnl’
      Translate carriage return to newline.  May be negated.
 
-`iutf8'
+‘iutf8’
      Assume input characters are UTF-8 encoded.  May be negated.
 
-`ixon'
-     Enable XON/XOFF flow control (that is, `CTRL-S'/`CTRL-Q').  May be
+‘ixon’
+     Enable XON/XOFF flow control (that is, ‘Ctrl-S’/‘Ctrl-Q’).  May be
      negated.
 
-`ixoff'
-`tandem'
-     Enable sending of `stop' character when the system input buffer is
-     almost full, and `start' character when it becomes almost empty
+‘ixoff’
+‘tandem’
+     Enable sending of ‘stop’ character when the system input buffer is
+     almost full, and ‘start’ character when it becomes almost empty
      again.  May be negated.
 
-`iuclc'
+‘iuclc’
      Translate uppercase characters to lowercase.  Non-POSIX.  May be
      negated.  Note ilcuc is not implemented, as one would not be able
      to issue almost any (lowercase) Unix command, after invoking it.
 
-`ixany'
+‘ixany’
      Allow any character to restart output (only the start character if
      negated).  Non-POSIX.  May be negated.
 
-`imaxbel'
+‘imaxbel’
      Enable beeping and not flushing input buffer if a character arrives
      when the input buffer is full.  Non-POSIX.  May be negated.
 
@@ -11186,61 +11139,61 @@ File: coreutils.info,  Node: Output,  Next: Local,  Prev: Input,  Up: stty invoc
 
 These settings control operations on data sent to the terminal.
 
-`opost'
+‘opost’
      Postprocess output.  May be negated.
 
-`olcuc'
+‘olcuc’
      Translate lowercase characters to uppercase.  Non-POSIX.  May be
      negated.  (Note ouclc is not currently implemented.)
 
-`ocrnl'
+‘ocrnl’
      Translate carriage return to newline.  Non-POSIX.  May be negated.
 
-`onlcr'
+‘onlcr’
      Translate newline to carriage return-newline.  Non-POSIX.  May be
      negated.
 
-`onocr'
-     Do not print carriage returns in the first column.  Non-POSIX.
-     May be negated.
+‘onocr’
+     Do not print carriage returns in the first column.  Non-POSIX.  May
+     be negated.
 
-`onlret'
+‘onlret’
      Newline performs a carriage return.  Non-POSIX.  May be negated.
 
-`ofill'
+‘ofill’
      Use fill (padding) characters instead of timing for delays.
      Non-POSIX.  May be negated.
 
-`ofdel'
+‘ofdel’
      Use ASCII DEL characters for fill instead of ASCII NUL characters.
      Non-POSIX.  May be negated.
 
-`nl1'
-`nl0'
+‘nl1’
+‘nl0’
      Newline delay style.  Non-POSIX.
 
-`cr3'
-`cr2'
-`cr1'
-`cr0'
+‘cr3’
+‘cr2’
+‘cr1’
+‘cr0’
      Carriage return delay style.  Non-POSIX.
 
-`tab3'
-`tab2'
-`tab1'
-`tab0'
+‘tab3’
+‘tab2’
+‘tab1’
+‘tab0’
      Horizontal tab delay style.  Non-POSIX.
 
-`bs1'
-`bs0'
+‘bs1’
+‘bs0’
      Backspace delay style.  Non-POSIX.
 
-`vt1'
-`vt0'
+‘vt1’
+‘vt0’
      Vertical tab delay style.  Non-POSIX.
 
-`ff1'
-`ff0'
+‘ff1’
+‘ff0’
      Form feed delay style.  Non-POSIX.
 
 
@@ -11249,60 +11202,59 @@ File: coreutils.info,  Node: Local,  Next: Combination,  Prev: Output,  Up: stty
 19.2.4 Local settings
 ---------------------
 
-`isig'
-     Enable `interrupt', `quit', and `suspend' special characters.  May
+‘isig’
+     Enable ‘interrupt’, ‘quit’, and ‘suspend’ special characters.  May
      be negated.
 
-`icanon'
-     Enable `erase', `kill', `werase', and `rprnt' special characters.
+‘icanon’
+     Enable ‘erase’, ‘kill’, ‘werase’, and ‘rprnt’ special characters.
      May be negated.
 
-`iexten'
+‘iexten’
      Enable non-POSIX special characters.  May be negated.
 
-`echo'
+‘echo’
      Echo input characters.  May be negated.
 
-`echoe'
-`crterase'
-     Echo `erase' characters as backspace-space-backspace.  May be
+‘echoe’
+‘crterase’
+     Echo ‘erase’ characters as backspace-space-backspace.  May be
      negated.
 
-`echok'
-     Echo a newline after a `kill' character.  May be negated.
+‘echok’
+     Echo a newline after a ‘kill’ character.  May be negated.
 
-`echonl'
+‘echonl’
      Echo newline even if not echoing other characters.  May be negated.
 
-`noflsh'
-     Disable flushing after `interrupt' and `quit' special characters.
+‘noflsh’
+     Disable flushing after ‘interrupt’ and ‘quit’ special characters.
      May be negated.
 
-`xcase'
+‘xcase’
      Enable input and output of uppercase characters by preceding their
-     lowercase equivalents with `\', when `icanon' is set.  Non-POSIX.
+     lowercase equivalents with ‘\’, when ‘icanon’ is set.  Non-POSIX.
      May be negated.
 
-`tostop'
+‘tostop’
      Stop background jobs that try to write to the terminal.  Non-POSIX.
      May be negated.
 
-`echoprt'
-`prterase'
-     Echo erased characters backward, between `\' and `/'.  Non-POSIX.
+‘echoprt’
+‘prterase’
+     Echo erased characters backward, between ‘\’ and ‘/’.  Non-POSIX.
      May be negated.
 
-`echoctl'
-`ctlecho'
-     Echo control characters in hat notation (`^C') instead of
+‘echoctl’
+‘ctlecho’
+     Echo control characters in hat notation (‘^C’) instead of
      literally.  Non-POSIX.  May be negated.
 
-`echoke'
-`crtkill'
-     Echo the `kill' special character by erasing each character on the
-     line as indicated by the `echoprt' and `echoe' settings, instead
-     of by the `echoctl' and `echok' settings.  Non-POSIX.  May be
-     negated.
+‘echoke’
+‘crtkill’
+     Echo the ‘kill’ special character by erasing each character on the
+     line as indicated by the ‘echoprt’ and ‘echoe’ settings, instead of
+     by the ‘echoctl’ and ‘echok’ settings.  Non-POSIX.  May be negated.
 
 
 File: coreutils.info,  Node: Combination,  Next: Characters,  Prev: Local,  Up: stty invocation
@@ -11312,24 +11264,24 @@ File: coreutils.info,  Node: Combination,  Next: Characters,  Prev: Local,  Up:
 
 Combination settings:
 
-`evenp'
-`parity'
-     Same as `parenb -parodd cs7'.  May be negated.  If negated, same
-     as `-parenb cs8'.
+‘evenp’
+‘parity’
+     Same as ‘parenb -parodd cs7’.  May be negated.  If negated, same as
+     ‘-parenb cs8’.
 
-`oddp'
-     Same as `parenb parodd cs7'.  May be negated.  If negated, same as
-     `-parenb cs8'.
+‘oddp’
+     Same as ‘parenb parodd cs7’.  May be negated.  If negated, same as
+     ‘-parenb cs8’.
 
-`nl'
-     Same as `-icrnl -onlcr'.  May be negated.  If negated, same as
-     `icrnl -inlcr -igncr onlcr -ocrnl -onlret'.
+‘nl’
+     Same as ‘-icrnl -onlcr’.  May be negated.  If negated, same as
+     ‘icrnl -inlcr -igncr onlcr -ocrnl -onlret’.
 
-`ek'
-     Reset the `erase' and `kill' special characters to their default
+‘ek’
+     Reset the ‘erase’ and ‘kill’ special characters to their default
      values.
 
-`sane'
+‘sane’
      Same as:
 
           cread -ignbrk brkint -inlcr -igncr icrnl -ixoff
@@ -11340,49 +11292,49 @@ Combination settings:
 
      and also sets all special characters to their default values.
 
-`cooked'
-     Same as `brkint ignpar istrip icrnl ixon opost isig icanon', plus
-     sets the `eof' and `eol' characters to their default values if
-     they are the same as the `min' and `time' characters.  May be
-     negated.  If negated, same as `raw'.
+‘cooked’
+     Same as ‘brkint ignpar istrip icrnl ixon opost isig icanon’, plus
+     sets the ‘eof’ and ‘eol’ characters to their default values if they
+     are the same as the ‘min’ and ‘time’ characters.  May be negated.
+     If negated, same as ‘raw’.
 
-`raw'
+‘raw’
      Same as:
 
           -ignbrk -brkint -ignpar -parmrk -inpck -istrip
           -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany
           -imaxbel -opost -isig -icanon -xcase min 1 time 0
 
-     May be negated.  If negated, same as `cooked'.
+     May be negated.  If negated, same as ‘cooked’.
 
-`cbreak'
-     Same as `-icanon'.  May be negated.  If negated, same as `icanon'.
+‘cbreak’
+     Same as ‘-icanon’.  May be negated.  If negated, same as ‘icanon’.
 
-`pass8'
-     Same as `-parenb -istrip cs8'.  May be negated.  If negated, same
-     as `parenb istrip cs7'.
+‘pass8’
+     Same as ‘-parenb -istrip cs8’.  May be negated.  If negated, same
+     as ‘parenb istrip cs7’.
 
-`litout'
-     Same as `-parenb -istrip -opost cs8'.  May be negated.  If
-     negated, same as `parenb istrip opost cs7'.
+‘litout’
+     Same as ‘-parenb -istrip -opost cs8’.  May be negated.  If negated,
+     same as ‘parenb istrip opost cs7’.
 
-`decctlq'
-     Same as `-ixany'.  Non-POSIX.  May be negated.
+‘decctlq’
+     Same as ‘-ixany’.  Non-POSIX.  May be negated.
 
-`tabs'
-     Same as `tab0'.  Non-POSIX.  May be negated.  If negated, same as
-     `tab3'.
+‘tabs’
+     Same as ‘tab0’.  Non-POSIX.  May be negated.  If negated, same as
+     ‘tab3’.
 
-`lcase'
-`LCASE'
-     Same as `xcase iuclc olcuc'.  Non-POSIX.  May be negated.  (Used
+‘lcase’
+‘LCASE’
+     Same as ‘xcase iuclc olcuc’.  Non-POSIX.  May be negated.  (Used
      for terminals with uppercase characters only.)
 
-`crt'
-     Same as `echoe echoctl echoke'.
+‘crt’
+     Same as ‘echoe echoctl echoke’.
 
-`dec'
-     Same as `echoe echoctl echoke -ixany intr ^C erase ^? kill C-u'.
+‘dec’
+     Same as ‘echoe echoctl echoke -ixany intr ^C erase ^? kill C-u’.
 
 
 File: coreutils.info,  Node: Characters,  Next: Special,  Prev: Combination,  Up: stty invocation
@@ -11390,62 +11342,60 @@ File: coreutils.info,  Node: Characters,  Next: Special,  Prev: Combination,  Up
 19.2.6 Special characters
 -------------------------
 
-The special characters' default values vary from system to system.
-They are set with the syntax `name value', where the names are listed
-below and the value can be given either literally, in hat notation
-(`^C'), or as an integer which may start with `0x' to indicate
-hexadecimal, `0' to indicate octal, or any other digit to indicate
-decimal.
+The special characters’ default values vary from system to system.  They
+are set with the syntax ‘name value’, where the names are listed below
+and the value can be given either literally, in hat notation (‘^C’), or
+as an integer which may start with ‘0x’ to indicate hexadecimal, ‘0’ to
+indicate octal, or any other digit to indicate decimal.
 
-   For GNU stty, giving a value of `^-' or `undef' disables that
-special character.  (This is incompatible with Ultrix `stty', which
-uses  a value of `u' to disable a special character.  GNU `stty' treats
-a value `u' like any other, namely to set that special character to
-<U>.)
+   For GNU stty, giving a value of ‘^-’ or ‘undef’ disables that special
+character.  (This is incompatible with Ultrix ‘stty’, which uses a value
+of ‘u’ to disable a special character.  GNU ‘stty’ treats a value ‘u’
+like any other, namely to set that special character to <U>.)
 
-`intr'
+‘intr’
      Send an interrupt signal.
 
-`quit'
+‘quit’
      Send a quit signal.
 
-`erase'
+‘erase’
      Erase the last character typed.
 
-`kill'
+‘kill’
      Erase the current line.
 
-`eof'
+‘eof’
      Send an end of file (terminate the input).
 
-`eol'
+‘eol’
      End the line.
 
-`eol2'
+‘eol2’
      Alternate character to end the line.  Non-POSIX.
 
-`swtch'
+‘swtch’
      Switch to a different shell layer.  Non-POSIX.
 
-`start'
+‘start’
      Restart the output after stopping it.
 
-`stop'
+‘stop’
      Stop the output.
 
-`susp'
+‘susp’
      Send a terminal stop signal.
 
-`dsusp'
+‘dsusp’
      Send a terminal stop signal after flushing the input.  Non-POSIX.
 
-`rprnt'
+‘rprnt’
      Redraw the current line.  Non-POSIX.
 
-`werase'
+‘werase’
      Erase the last word typed.  Non-POSIX.
 
-`lnext'
+‘lnext’
      Enter the next character typed literally, even if it is a special
      character.  Non-POSIX.
 
@@ -11455,76 +11405,74 @@ File: coreutils.info,  Node: Special,  Prev: Characters,  Up: stty invocation
 19.2.7 Special settings
 -----------------------
 
-`min N'
+‘min N’
      Set the minimum number of characters that will satisfy a read until
-     the time value has expired, when `-icanon' is set.
+     the time value has expired, when ‘-icanon’ is set.
 
-`time N'
+‘time N’
      Set the number of tenths of a second before reads time out if the
-     minimum number of characters have not been read, when `-icanon' is
+     minimum number of characters have not been read, when ‘-icanon’ is
      set.
 
-`ispeed N'
+‘ispeed N’
      Set the input speed to N.
 
-`ospeed N'
+‘ospeed N’
      Set the output speed to N.
 
-`rows N'
+‘rows N’
      Tell the tty kernel driver that the terminal has N rows.
      Non-POSIX.
 
-`cols N'
-`columns N'
+‘cols N’
+‘columns N’
      Tell the kernel that the terminal has N columns.  Non-POSIX.
 
-`size'
+‘size’
      Print the number of rows and columns that the kernel thinks the
-     terminal has.  (Systems that don't support rows and columns in the
-     kernel typically use the environment variables `LINES' and
-     `COLUMNS' instead; however, GNU `stty' does not know anything
-     about them.)  Non-POSIX.
+     terminal has.  (Systems that don’t support rows and columns in the
+     kernel typically use the environment variables ‘LINES’ and
+     ‘COLUMNS’ instead; however, GNU ‘stty’ does not know anything about
+     them.)  Non-POSIX.
 
-`line N'
+‘line N’
      Use line discipline N.  Non-POSIX.
 
-`speed'
+‘speed’
      Print the terminal speed.
 
-`N'
-     Set the input and output speeds to N.  N can be one of: 0 50 75
-     110 134 134.5 150 200 300 600 1200 1800 2400 4800 9600 19200 38400
-     `exta' `extb'.  `exta' is the same as 19200; `extb' is the same as
+‘N’
+     Set the input and output speeds to N.  N can be one of: 0 50 75 110
+     134 134.5 150 200 300 600 1200 1800 2400 4800 9600 19200 38400
+     ‘exta’ ‘extb’.  ‘exta’ is the same as 19200; ‘extb’ is the same as
      38400.  Many systems, including GNU/Linux, support higher speeds.
-     The `stty' command includes support for speeds of 57600, 115200,
+     The ‘stty’ command includes support for speeds of 57600, 115200,
      230400, 460800, 500000, 576000, 921600, 1000000, 1152000, 1500000,
      2000000, 2500000, 3000000, 3500000, or 4000000 where the system
-     supports these.  0 hangs up the line if `-clocal' is set.
+     supports these.  0 hangs up the line if ‘-clocal’ is set.
 
 
 File: coreutils.info,  Node: printenv invocation,  Next: tty invocation,  Prev: stty invocation,  Up: Working context
 
-19.3 `printenv': Print all or some environment variables
+19.3 ‘printenv’: Print all or some environment variables
 ========================================================
 
-`printenv' prints environment variable values.  Synopsis:
+‘printenv’ prints environment variable values.  Synopsis:
 
-     printenv [OPTION] [VARIABLE]...
+     printenv [OPTION] [VARIABLE]…
 
-   If no VARIABLEs are specified, `printenv' prints the value of every
+   If no VARIABLEs are specified, ‘printenv’ prints the value of every
 environment variable.  Otherwise, it prints the value of each VARIABLE
 that is set, and nothing for those that are not set.
 
    The program accepts the following option.  Also see *note Common
 options::.
 
-`-0'
-`--null'
-     Output a zero byte (ASCII NUL) at the end of each line, rather
-     than a newline.  This option enables other programs to parse the
-     output of `printenv' even when that output would contain data with
-     embedded newlines.
-
+‘-0’
+‘--null’
+     Output a zero byte (ASCII NUL) at the end of each line, rather than
+     a newline.  This option enables other programs to parse the output
+     even when that output would contain data with embedded newlines.
 
    Exit status:
 
@@ -11535,24 +11483,23 @@ options::.
 
 File: coreutils.info,  Node: tty invocation,  Prev: printenv invocation,  Up: Working context
 
-19.4 `tty': Print file name of terminal on standard input
+19.4 ‘tty’: Print file name of terminal on standard input
 =========================================================
 
-`tty' prints the file name of the terminal connected to its standard
-input.  It prints `not a tty' if standard input is not a terminal.
+‘tty’ prints the file name of the terminal connected to its standard
+input.  It prints ‘not a tty’ if standard input is not a terminal.
 Synopsis:
 
-     tty [OPTION]...
+     tty [OPTION]…
 
    The program accepts the following option.  Also see *note Common
 options::.
 
-`-s'
-`--silent'
-`--quiet'
+‘-s’
+‘--silent’
+‘--quiet’
      Print nothing; only return an exit status.
 
-
    Exit status:
 
      0 if standard input is a terminal
@@ -11581,77 +11528,90 @@ logins, groups, and so forth.
 
 File: coreutils.info,  Node: id invocation,  Next: logname invocation,  Up: User information
 
-20.1 `id': Print user identity
+20.1 ‘id’: Print user identity
 ==============================
 
-`id' prints information about the given user, or the process running it
+‘id’ prints information about the given user, or the process running it
 if no user is specified.  Synopsis:
 
-     id [OPTION]... [USERNAME]
+     id [OPTION]… [USER]
+
+   USER can be either a user ID or a name, with name look-up taking
+precedence unless the ID is specified with a leading ‘+’.  *Note
+Disambiguating names and IDs::.
 
-   By default, it prints the real user ID, real group ID, effective
-user ID if different from the real user ID, effective group ID if
-different from the real group ID, and supplemental group IDs.  In
-addition, if SELinux is enabled and the `POSIXLY_CORRECT' environment
-variable is not set, then print `context=C', where C is the security
-context.
+   By default, it prints the real user ID, real group ID, effective user
+ID if different from the real user ID, effective group ID if different
+from the real group ID, and supplemental group IDs.  In addition, if
+SELinux is enabled and the ‘POSIXLY_CORRECT’ environment variable is not
+set, then print ‘context=C’, where C is the security context.
 
    Each of these numeric values is preceded by an identifying string and
 followed by the corresponding user or group name in parentheses.
 
-   The options cause `id' to print only part of the above information.
+   The options cause ‘id’ to print only part of the above information.
 Also see *note Common options::.
 
-`-g'
-`--group'
+‘-g’
+‘--group’
      Print only the group ID.
 
-`-G'
-`--groups'
+‘-G’
+‘--groups’
      Print only the group ID and the supplementary groups.
 
-`-n'
-`--name'
+‘-n’
+‘--name’
      Print the user or group name instead of the ID number.  Requires
-     `-u', `-g', or `-G'.
+     ‘-u’, ‘-g’, or ‘-G’.
 
-`-r'
-`--real'
+‘-r’
+‘--real’
      Print the real, instead of effective, user or group ID.  Requires
-     `-u', `-g', or `-G'.
+     ‘-u’, ‘-g’, or ‘-G’.
 
-`-u'
-`--user'
+‘-u’
+‘--user’
      Print only the user ID.
 
-`-Z'
-`--context'
-     Print only the security context of the current user.  If SELinux
-     is disabled then print a warning and set the exit status to 1.
+‘-Z’
+‘--context’
+     Print only the security context of the process, which is generally
+     the user’s security context inherited from the parent process.  If
+     neither SELinux or SMACK is enabled then print a warning and set
+     the exit status to 1.
 
+‘-z’
+‘--zero’
+     Delimit output items with NUL characters.  This option is not
+     permitted when using the default format.
 
-   An exit status of zero indicates success, and a nonzero value
-indicates failure.
+     Example:
+          $ id -Gn --zero
+          users <NUL> devs <NUL>
 
    Primary and supplementary groups for a process are normally inherited
 from its parent and are usually unchanged since login.  This means that
-if you change the group database after logging in, `id' will not
-reflect your changes within your existing login session.  Running `id'
-with a user argument causes the user and group database to be consulted
-afresh, and so will give a different result.
+if you change the group database after logging in, ‘id’ will not reflect
+your changes within your existing login session.  Running ‘id’ with a
+user argument causes the user and group database to be consulted afresh,
+and so will give a different result.
+
+   An exit status of zero indicates success, and a nonzero value
+indicates failure.
 
 
 File: coreutils.info,  Node: logname invocation,  Next: whoami invocation,  Prev: id invocation,  Up: User information
 
-20.2 `logname': Print current login name
+20.2 ‘logname’: Print current login name
 ========================================
 
-`logname' prints the calling user's name, as found in a
-system-maintained file (often `/var/run/utmp' or `/etc/utmp'), and
-exits with a status of 0.  If there is no entry for the calling
-process, `logname' prints an error message and exits with a status of 1.
+‘logname’ prints the calling user’s name, as found in a
+system-maintained file (often ‘/var/run/utmp’ or ‘/etc/utmp’), and exits
+with a status of 0.  If there is no entry for the calling process,
+‘logname’ prints an error message and exits with a status of 1.
 
-   The only options are `--help' and `--version'.  *Note Common
+   The only options are ‘--help’ and ‘--version’.  *Note Common
 options::.
 
    An exit status of zero indicates success, and a nonzero value
@@ -11660,13 +11620,13 @@ indicates failure.
 
 File: coreutils.info,  Node: whoami invocation,  Next: groups invocation,  Prev: logname invocation,  Up: User information
 
-20.3 `whoami': Print effective user ID
+20.3 ‘whoami’: Print effective user ID
 ======================================
 
-`whoami' prints the user name associated with the current effective
-user ID.  It is equivalent to the command `id -un'.
+‘whoami’ prints the user name associated with the current effective user
+ID.  It is equivalent to the command ‘id -un’.
 
-   The only options are `--help' and `--version'.  *Note Common
+   The only options are ‘--help’ and ‘--version’.  *Note Common
 options::.
 
    An exit status of zero indicates success, and a nonzero value
@@ -11675,52 +11635,52 @@ indicates failure.
 
 File: coreutils.info,  Node: groups invocation,  Next: users invocation,  Prev: whoami invocation,  Up: User information
 
-20.4 `groups': Print group names a user is in
+20.4 ‘groups’: Print group names a user is in
 =============================================
 
-`groups' prints the names of the primary and any supplementary groups
+‘groups’ prints the names of the primary and any supplementary groups
 for each given USERNAME, or the current process if no names are given.
 If more than one name is given, the name of each user is printed before
-the list of that user's groups and the user name is separated from the
+the list of that user’s groups and the user name is separated from the
 group list by a colon.  Synopsis:
 
-     groups [USERNAME]...
+     groups [USERNAME]…
 
-   The group lists are equivalent to the output of the command `id -Gn'.
+   The group lists are equivalent to the output of the command ‘id -Gn’.
+
+   The only options are ‘--help’ and ‘--version’.  *Note Common
+options::.
 
    Primary and supplementary groups for a process are normally inherited
 from its parent and are usually unchanged since login.  This means that
-if you change the group database after logging in, `groups' will not
+if you change the group database after logging in, ‘groups’ will not
 reflect your changes within your existing login session.  Running
-`groups' with a list of users causes the user and group database to be
+‘groups’ with a list of users causes the user and group database to be
 consulted afresh, and so will give a different result.
 
-   The only options are `--help' and `--version'.  *Note Common
-options::.
-
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
 
 
 File: coreutils.info,  Node: users invocation,  Next: who invocation,  Prev: groups invocation,  Up: User information
 
-20.5 `users': Print login names of users currently logged in
+20.5 ‘users’: Print login names of users currently logged in
 ============================================================
 
-`users' prints on a single line a blank-separated list of user names of
+‘users’ prints on a single line a blank-separated list of user names of
 users currently logged in to the current host.  Each user name
 corresponds to a login session, so if a user has more than one login
-session, that user's name will appear the same number of times in the
+session, that user’s name will appear the same number of times in the
 output.  Synopsis:
 
      users [FILE]
 
-   With no FILE argument, `users' extracts its information from a
-system-maintained file (often `/var/run/utmp' or `/etc/utmp').  If a
-file argument is given, `users' uses that file instead.  A common
-choice is `/var/log/wtmp'.
+   With no FILE argument, ‘users’ extracts its information from a
+system-maintained file (often ‘/var/run/utmp’ or ‘/etc/utmp’).  If a
+file argument is given, ‘users’ uses that file instead.  A common choice
+is ‘/var/log/wtmp’.
 
-   The only options are `--help' and `--version'.  *Note Common
+   The only options are ‘--help’ and ‘--version’.  *Note Common
 options::.
 
    An exit status of zero indicates success, and a nonzero value
@@ -11729,105 +11689,103 @@ indicates failure.
 
 File: coreutils.info,  Node: who invocation,  Prev: users invocation,  Up: User information
 
-20.6 `who': Print who is currently logged in
+20.6 ‘who’: Print who is currently logged in
 ============================================
 
-`who' prints information about users who are currently logged on.
+‘who’ prints information about users who are currently logged on.
 Synopsis:
 
-     `who' [OPTION] [FILE] [am i]
+     who [OPTION] [FILE] [am i]
 
-   If given no non-option arguments, `who' prints the following
+   If given no non-option arguments, ‘who’ prints the following
 information for each user currently logged on: login name, terminal
 line, login time, and remote hostname or X display.
 
-   If given one non-option argument, `who' uses that instead of a
-default system-maintained file (often `/var/run/utmp' or `/etc/utmp')
-as the name of the file containing the record of users logged on.
-`/var/log/wtmp' is commonly given as an argument to `who' to look at
-who has previously logged on.
+   If given one non-option argument, ‘who’ uses that instead of a
+default system-maintained file (often ‘/var/run/utmp’ or ‘/etc/utmp’) as
+the name of the file containing the record of users logged on.
+‘/var/log/wtmp’ is commonly given as an argument to ‘who’ to look at who
+has previously logged on.
 
-   If given two non-option arguments, `who' prints only the entry for
+   If given two non-option arguments, ‘who’ prints only the entry for
 the user running it (determined from its standard input), preceded by
-the hostname.  Traditionally, the two arguments given are `am i', as in
-`who am i'.
+the hostname.  Traditionally, the two arguments given are ‘am i’, as in
+‘who am i’.
 
    Time stamps are listed according to the time zone rules specified by
-the `TZ' environment variable, or by the system default rules if `TZ'
-is not set.  *Note Specifying the Time Zone with `TZ': (libc)TZ
-Variable.
+the ‘TZ’ environment variable, or by the system default rules if ‘TZ’ is
+not set.  *Note Specifying the Time Zone with ‘TZ’: (libc)TZ Variable.
 
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-a'
-`--all'
-     Same as `-b -d --login -p -r -t -T -u'.
+‘-a’
+‘--all’
+     Same as ‘-b -d --login -p -r -t -T -u’.
 
-`-b'
-`--boot'
+‘-b’
+‘--boot’
      Print the date and time of last system boot.
 
-`-d'
-`--dead'
+‘-d’
+‘--dead’
      Print information corresponding to dead processes.
 
-`-H'
-`--heading'
+‘-H’
+‘--heading’
      Print a line of column headings.
 
-`-l'
-`--login'
+‘-l’
+‘--login’
      List only the entries that correspond to processes via which the
      system is waiting for a user to login.  The user name is always
-     `LOGIN'.
+     ‘LOGIN’.
 
-`--lookup'
+‘--lookup’
      Attempt to canonicalize hostnames found in utmp through a DNS
      lookup.  This is not the default because it can cause significant
      delays on systems with automatic dial-up internet access.
 
-`-m'
-     Same as `who am i'.
+‘-m’
+     Same as ‘who am i’.
 
-`-p'
-`--process'
+‘-p’
+‘--process’
      List active processes spawned by init.
 
-`-q'
-`--count'
+‘-q’
+‘--count’
      Print only the login names and the number of users logged on.
      Overrides all other options.
 
-`-r'
-`--runlevel'
+‘-r’
+‘--runlevel’
      Print the current (and maybe previous) run-level of the init
      process.
 
-`-s'
-     Ignored; for compatibility with other versions of `who'.
+‘-s’
+     Ignored; for compatibility with other versions of ‘who’.
 
-`-t'
-`--time'
+‘-t’
+‘--time’
      Print last system clock change.
 
-`-u'
+‘-u’
      After the login time, print the number of hours and minutes that
-     the user has been idle.  `.' means the user was active in the last
-     minute.  `old' means the user has been idle for more than 24 hours.
-
-`-w'
-`-T'
-`--mesg'
-`--message'
-`--writable'
-     After each login name print a character indicating the user's
+     the user has been idle.  ‘.’ means the user was active in the last
+     minute.  ‘old’ means the user has been idle for more than 24 hours.
+
+‘-w’
+‘-T’
+‘--mesg’
+‘--message’
+‘--writable’
+     After each login name print a character indicating the user’s
      message status:
 
-          `+' allowing `write' messages
-          `-' disallowing `write' messages
-          `?' cannot find terminal device
-
+          ‘+’ allowing ‘write’ messages
+          ‘-’ disallowing ‘write’ messages
+          ‘?’ cannot find terminal device
 
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
@@ -11854,28 +11812,28 @@ information.
 
 File: coreutils.info,  Node: date invocation,  Next: arch invocation,  Up: System context
 
-21.1 `date': Print or set system date and time
+21.1 ‘date’: Print or set system date and time
 ==============================================
 
 Synopses:
 
-     date [OPTION]... [+FORMAT]
+     date [OPTION]… [+FORMAT]
      date [-u|--utc|--universal] [ MMDDhhmm[[CC]YY][.ss] ]
 
-   Invoking `date' with no FORMAT argument is equivalent to invoking it
-with a default format that depends on the `LC_TIME' locale category.
-In the default C locale, this format is `'+%a %b %e %H:%M:%S %Z %Y'',
-so the output looks like `Thu Mar  3 13:47:51 PST 2005'.
+   Invoking ‘date’ with no FORMAT argument is equivalent to invoking it
+with a default format that depends on the ‘LC_TIME’ locale category.  In
+the default C locale, this format is ‘'+%a %b %e %H:%M:%S %Z %Y'’, so
+the output looks like ‘Thu Mar  3 13:47:51 PST 2005’.
 
-   Normally, `date' uses the time zone rules indicated by the `TZ'
-environment variable, or the system default rules if `TZ' is not set.
-*Note Specifying the Time Zone with `TZ': (libc)TZ Variable.
+   Normally, ‘date’ uses the time zone rules indicated by the ‘TZ’
+environment variable, or the system default rules if ‘TZ’ is not set.
+*Note Specifying the Time Zone with ‘TZ’: (libc)TZ Variable.
 
-   If given an argument that starts with a `+', `date' prints the
-current date and time (or the date and time specified by the `--date'
+   If given an argument that starts with a ‘+’, ‘date’ prints the
+current date and time (or the date and time specified by the ‘--date’
 option, see below) in the format defined by that argument, which is
-similar to that of the `strftime' function.  Except for conversion
-specifiers, which start with `%', characters in the format string are
+similar to that of the ‘strftime’ function.  Except for conversion
+specifiers, which start with ‘%’, characters in the format string are
 printed unchanged.  The conversion specifiers are described below.
 
    An exit status of zero indicates success, and a nonzero value
@@ -11898,83 +11856,64 @@ File: coreutils.info,  Node: Time conversion specifiers,  Next: Date conversion
 21.1.1 Time conversion specifiers
 ---------------------------------
 
-`date' conversion specifiers related to times.
-
-`%H'
-     hour (`00'...`23')
-
-`%I'
-     hour (`01'...`12')
-
-`%k'
-     hour, space padded (` 0'...`23'); equivalent to `%_H'.  This is a
-     GNU extension.
-
-`%l'
-     hour, space padded (` 1'...`12'); equivalent to `%_I'.  This is a
-     GNU extension.
-
-`%M'
-     minute (`00'...`59')
-
-`%N'
-     nanoseconds (`000000000'...`999999999').  This is a GNU extension.
-
-`%p'
-     locale's equivalent of either `AM' or `PM'; blank in many locales.
-     Noon is treated as `PM' and midnight as `AM'.
+‘date’ conversion specifiers related to times.
 
-`%P'
-     like `%p', except lower case.  This is a GNU extension.
-
-`%r'
-     locale's 12-hour clock time (e.g., `11:11:04 PM')
-
-`%R'
-     24-hour hour and minute.  Same as `%H:%M'.
-
-`%s'
-     seconds since the epoch, i.e., since 1970-01-01 00:00:00 UTC.
-     Leap seconds are not counted unless leap second support is
-     available.  *Note %s-examples::, for examples.  This is a GNU
+‘%H’
+     hour (‘00’…‘23’)
+‘%I’
+     hour (‘01’…‘12’)
+‘%k’
+     hour, space padded (‘ 0’…‘23’); equivalent to ‘%_H’.  This is a GNU
      extension.
-
-`%S'
-     second (`00'...`60').  This may be `60' if leap seconds are
+‘%l’
+     hour, space padded (‘ 1’…‘12’); equivalent to ‘%_I’.  This is a GNU
+     extension.
+‘%M’
+     minute (‘00’…‘59’)
+‘%N’
+     nanoseconds (‘000000000’…‘999999999’).  This is a GNU extension.
+‘%p’
+     locale’s equivalent of either ‘AM’ or ‘PM’; blank in many locales.
+     Noon is treated as ‘PM’ and midnight as ‘AM’.
+‘%P’
+     like ‘%p’, except lower case.  This is a GNU extension.
+‘%r’
+     locale’s 12-hour clock time (e.g., ‘11:11:04 PM’)
+‘%R’
+     24-hour hour and minute.  Same as ‘%H:%M’.
+‘%s’
+     seconds since the epoch, i.e., since 1970-01-01 00:00:00 UTC.  Leap
+     seconds are not counted unless leap second support is available.
+     *Note %s-examples::, for examples.  This is a GNU extension.
+‘%S’
+     second (‘00’…‘60’).  This may be ‘60’ if leap seconds are
      supported.
-
-`%T'
-     24-hour hour, minute, and second.  Same as `%H:%M:%S'.
-
-`%X'
-     locale's time representation (e.g., `23:13:48')
-
-`%z'
-     RFC 2822/ISO 8601 style numeric time zone (e.g., `-0600' or
-     `+0530'), or nothing if no time zone is determinable.  This value
+‘%T’
+     24-hour hour, minute, and second.  Same as ‘%H:%M:%S’.
+‘%X’
+     locale’s time representation (e.g., ‘23:13:48’)
+‘%z’
+     RFC 2822/ISO 8601 style numeric time zone (e.g., ‘-0600’ or
+     ‘+0530’), or nothing if no time zone is determinable.  This value
      reflects the numeric time zone appropriate for the current time,
-     using the time zone rules specified by the `TZ' environment
+     using the time zone rules specified by the ‘TZ’ environment
      variable.  The time (and optionally, the time zone rules) can be
-     overridden by the `--date' option.
-
-`%:z'
-     RFC 3339/ISO 8601 style numeric time zone with `:' (e.g., `-06:00'
-     or `+05:30'), or nothing if no time zone is determinable.  This is
+     overridden by the ‘--date’ option.
+‘%:z’
+     RFC 3339/ISO 8601 style numeric time zone with ‘:’ (e.g., ‘-06:00’
+     or ‘+05:30’), or nothing if no time zone is determinable.  This is
      a GNU extension.
-
-`%::z'
-     Numeric time zone to the nearest second with `:' (e.g.,
-     `-06:00:00' or `+05:30:00'), or nothing if no time zone is
-     determinable.  This is a GNU extension.
-
-`%:::z'
-     Numeric time zone with `:' using the minimum necessary precision
-     (e.g., `-06', `+05:30', or `-04:56:02'), or nothing if no time
-     zone is determinable.  This is a GNU extension.
-
-`%Z'
-     alphabetic time zone abbreviation (e.g., `EDT'), or nothing if no
-     time zone is determinable.  See `%z' for how it is determined.
+‘%::z’
+     Numeric time zone to the nearest second with ‘:’ (e.g., ‘-06:00:00’
+     or ‘+05:30:00’), or nothing if no time zone is determinable.  This
+     is a GNU extension.
+‘%:::z’
+     Numeric time zone with ‘:’ using the minimum necessary precision
+     (e.g., ‘-06’, ‘+05:30’, or ‘-04:56:02’), or nothing if no time zone
+     is determinable.  This is a GNU extension.
+‘%Z’
+     alphabetic time zone abbreviation (e.g., ‘EDT’), or nothing if no
+     time zone is determinable.  See ‘%z’ for how it is determined.
 
 
 File: coreutils.info,  Node: Date conversion specifiers,  Next: Literal conversion specifiers,  Prev: Time conversion specifiers,  Up: date invocation
@@ -11982,100 +11921,77 @@ File: coreutils.info,  Node: Date conversion specifiers,  Next: Literal conversi
 21.1.2 Date conversion specifiers
 ---------------------------------
 
-`date' conversion specifiers related to dates.
-
-`%a'
-     locale's abbreviated weekday name (e.g., `Sun')
-
-`%A'
-     locale's full weekday name, variable length (e.g., `Sunday')
-
-`%b'
-     locale's abbreviated month name (e.g., `Jan')
-
-`%B'
-     locale's full month name, variable length (e.g., `January')
-
-`%c'
-     locale's date and time (e.g., `Thu Mar  3 23:05:25 2005')
-
-`%C'
-     century.  This is like `%Y', except the last two digits are
-     omitted.  For example, it is `20' if `%Y' is `2000', and is `-0'
-     if `%Y' is `-001'.  It is normally at least two characters, but it
-     may be more.
-
-`%d'
-     day of month (e.g., `01')
-
-`%D'
-     date; same as `%m/%d/%y'
-
-`%e'
-     day of month, space padded; same as `%_d'
-
-`%F'
-     full date in ISO 8601 format; same as `%Y-%m-%d'.  This is a good
+‘date’ conversion specifiers related to dates.
+
+‘%a’
+     locale’s abbreviated weekday name (e.g., ‘Sun’)
+‘%A’
+     locale’s full weekday name, variable length (e.g., ‘Sunday’)
+‘%b’
+     locale’s abbreviated month name (e.g., ‘Jan’)
+‘%B’
+     locale’s full month name, variable length (e.g., ‘January’)
+‘%c’
+     locale’s date and time (e.g., ‘Thu Mar  3 23:05:25 2005’)
+‘%C’
+     century.  This is like ‘%Y’, except the last two digits are
+     omitted.  For example, it is ‘20’ if ‘%Y’ is ‘2000’, and is ‘-0’ if
+     ‘%Y’ is ‘-001’.  It is normally at least two characters, but it may
+     be more.
+‘%d’
+     day of month (e.g., ‘01’)
+‘%D’
+     date; same as ‘%m/%d/%y’
+‘%e’
+     day of month, space padded; same as ‘%_d’
+‘%F’
+     full date in ISO 8601 format; same as ‘%Y-%m-%d’.  This is a good
      choice for a date format, as it is standard and is easy to sort in
-     the usual case where years are in the range 0000...9999.
-
-`%g'
+     the usual case where years are in the range 0000…9999.
+‘%g’
      year corresponding to the ISO week number, but without the century
-     (range `00' through `99').  This has the same format and value as
-     `%y', except that if the ISO week number (see `%V') belongs to the
+     (range ‘00’ through ‘99’).  This has the same format and value as
+     ‘%y’, except that if the ISO week number (see ‘%V’) belongs to the
      previous or next year, that year is used instead.
-
-`%G'
+‘%G’
      year corresponding to the ISO week number.  This has the same
-     format and value as `%Y', except that if the ISO week number (see
-     `%V') belongs to the previous or next year, that year is used
-     instead.  It is normally useful only if `%V' is also used; for
-     example, the format `%G-%m-%d' is probably a mistake, since it
+     format and value as ‘%Y’, except that if the ISO week number (see
+     ‘%V’) belongs to the previous or next year, that year is used
+     instead.  It is normally useful only if ‘%V’ is also used; for
+     example, the format ‘%G-%m-%d’ is probably a mistake, since it
      combines the ISO week number year with the conventional month and
      day.
-
-`%h'
-     same as `%b'
-
-`%j'
-     day of year (`001'...`366')
-
-`%m'
-     month (`01'...`12')
-
-`%u'
-     day of week (`1'...`7') with `1' corresponding to Monday
-
-`%U'
+‘%h’
+     same as ‘%b’
+‘%j’
+     day of year (‘001’…‘366’)
+‘%m’
+     month (‘01’…‘12’)
+‘%u’
+     day of week (‘1’…‘7’) with ‘1’ corresponding to Monday
+‘%U’
      week number of year, with Sunday as the first day of the week
-     (`00'...`53').  Days in a new year preceding the first Sunday are
-     in week zero.
-
-`%V'
+     (‘00’…‘53’).  Days in a new year preceding the first Sunday are in
+     week zero.
+‘%V’
      ISO week number, that is, the week number of year, with Monday as
-     the first day of the week (`01'...`53').  If the week containing
+     the first day of the week (‘01’…‘53’).  If the week containing
      January 1 has four or more days in the new year, then it is
      considered week 1; otherwise, it is week 53 of the previous year,
      and the next week is week 1.  (See the ISO 8601 standard.)
-
-`%w'
-     day of week (`0'...`6') with 0 corresponding to Sunday
-
-`%W'
-     week number of year, with Monday as first day of week
-     (`00'...`53').  Days in a new year preceding the first Monday are
-     in week zero.
-
-`%x'
-     locale's date representation (e.g., `12/31/99')
-
-`%y'
-     last two digits of year (`00'...`99')
-
-`%Y'
+‘%w’
+     day of week (‘0’…‘6’) with 0 corresponding to Sunday
+‘%W’
+     week number of year, with Monday as first day of week (‘00’…‘53’).
+     Days in a new year preceding the first Monday are in week zero.
+‘%x’
+     locale’s date representation (e.g., ‘12/31/99’)
+‘%y’
+     last two digits of year (‘00’…‘99’)
+‘%Y’
      year.  This is normally at least four characters, but it may be
-     more.  Year `0000' precedes year `0001', and year `-001' precedes
-     year `0000'.
+     more.  Year ‘0000’ precedes year ‘0001’, and year ‘-001’ precedes
+     year ‘0000’.
 
 
 File: coreutils.info,  Node: Literal conversion specifiers,  Next: Padding and other flags,  Prev: Date conversion specifiers,  Up: date invocation
@@ -12083,15 +11999,13 @@ File: coreutils.info,  Node: Literal conversion specifiers,  Next: Padding and o
 21.1.3 Literal conversion specifiers
 ------------------------------------
 
-`date' conversion specifiers that produce literal strings.
+‘date’ conversion specifiers that produce literal strings.
 
-`%%'
+‘%%’
      a literal %
-
-`%n'
+‘%n’
      a newline
-
-`%t'
+‘%t’
      a horizontal tab
 
 
@@ -12100,59 +12014,55 @@ File: coreutils.info,  Node: Padding and other flags,  Next: Setting the time,
 21.1.4 Padding and other flags
 ------------------------------
 
-Unless otherwise specified, `date' normally pads numeric fields with
+Unless otherwise specified, ‘date’ normally pads numeric fields with
 zeros, so that, for example, numeric months are always output as two
 digits.  Seconds since the epoch are not padded, though, since there is
 no natural width for them.
 
-   As a GNU extension, `date' recognizes any of the following optional
-flags after the `%':
+   As a GNU extension, ‘date’ recognizes any of the following optional
+flags after the ‘%’:
 
-`-'
+‘-’
      (hyphen) Do not pad the field; useful if the output is intended for
      human consumption.
-
-`_'
+‘_’
      (underscore) Pad with spaces; useful if you need a fixed number of
      characters in the output, but zeros are too distracting.
-
-`0'
+‘0’
      (zero) Pad with zeros even if the conversion specifier would
      normally pad with spaces.
-
-`^'
+‘^’
      Use upper case characters if possible.
-
-`#'
-     Use opposite case characters if possible.  A field that is
-     normally upper case becomes lower case, and vice versa.
+‘#’
+     Use opposite case characters if possible.  A field that is normally
+     upper case becomes lower case, and vice versa.
 
 Here are some examples of padding:
 
      date +%d/%m -d "Feb 1"
-     => 01/02
+     ⇒ 01/02
      date +%-d/%-m -d "Feb 1"
-     => 1/2
+     ⇒ 1/2
      date +%_d/%_m -d "Feb 1"
-     =>  1/ 2
+     ⇒  1/ 2
 
    As a GNU extension, you can specify the field width (after any flag,
 if present) as a decimal number.  If the natural size of the output of
 the field has less than the specified number of characters, the result
 is written right adjusted and padded to the given size.  For example,
-`%9B' prints the right adjusted month name in a field of width 9.
+‘%9B’ prints the right adjusted month name in a field of width 9.
 
    An optional modifier can follow the optional flag and width
 specification.  The modifiers are:
 
-`E'
-     Use the locale's alternate representation for date and time.  This
-     modifier applies to the `%c', `%C', `%x', `%X', `%y' and `%Y'
-     conversion specifiers.  In a Japanese locale, for example, `%Ex'
-     might yield a date format based on the Japanese Emperors' reigns.
+‘E’
+     Use the locale’s alternate representation for date and time.  This
+     modifier applies to the ‘%c’, ‘%C’, ‘%x’, ‘%X’, ‘%y’ and ‘%Y’
+     conversion specifiers.  In a Japanese locale, for example, ‘%Ex’
+     might yield a date format based on the Japanese Emperors’ reigns.
 
-`O'
-     Use the locale's alternate numeric symbols for numbers.  This
+‘O’
+     Use the locale’s alternate numeric symbols for numbers.  This
      modifier applies only to numeric conversion specifiers.
 
    If the format supports the modifier but no alternate representation
@@ -12164,110 +12074,104 @@ File: coreutils.info,  Node: Setting the time,  Next: Options for date,  Prev: P
 21.1.5 Setting the time
 -----------------------
 
-If given an argument that does not start with `+', `date' sets the
+If given an argument that does not start with ‘+’, ‘date’ sets the
 system clock to the date and time specified by that argument (as
 described below).  You must have appropriate privileges to set the
-system clock.  Note for changes to persist across a reboot, the
-hardware clock may need to be updated from the system clock, which
-might not happen automatically on your system.
+system clock.  Note for changes to persist across a reboot, the hardware
+clock may need to be updated from the system clock, which might not
+happen automatically on your system.
 
    The argument must consist entirely of digits, which have the
 following meaning:
 
-`MM'
+‘MM’
      month
-
-`DD'
+‘DD’
      day within month
-
-`hh'
+‘hh’
      hour
-
-`mm'
+‘mm’
      minute
-
-`CC'
+‘CC’
      first two digits of year (optional)
-
-`YY'
+‘YY’
      last two digits of year (optional)
-
-`ss'
+‘ss’
      second (optional)
 
-   Note, the `--date' and `--set' options may not be used with an
-argument in the above format.  The `--universal' option may be used
-with such an argument to indicate that the specified date and time are
+   Note, the ‘--date’ and ‘--set’ options may not be used with an
+argument in the above format.  The ‘--universal’ option may be used with
+such an argument to indicate that the specified date and time are
 relative to Coordinated Universal Time rather than to the local time
 zone.
 
 
-File: coreutils.info,  Node: Options for date,  Prev: Setting the time,  Up: date invocation
+File: coreutils.info,  Node: Options for date,  Next: Examples of date,  Prev: Setting the time,  Up: date invocation
 
-21.1.6 Options for `date'
+21.1.6 Options for ‘date’
 -------------------------
 
 The program accepts the following options.  Also see *note Common
 options::.
 
-`-d DATESTR'
-`--date=DATESTR'
+‘-d DATESTR’
+‘--date=DATESTR’
      Display the date and time specified in DATESTR instead of the
-     current date and time.  DATESTR can be in almost any common
-     format.  It can contain month names, time zones, `am' and `pm',
-     `yesterday', etc.  For example, `--date="2004-02-27
-     14:19:13.489392193 +0530"' specifies the instant of time that is
-     489,392,193 nanoseconds after February 27, 2004 at 2:19:13 PM in a
-     time zone that is 5 hours and 30 minutes east of UTC.
+     current date and time.  DATESTR can be in almost any common format.
+     It can contain month names, time zones, ‘am’ and ‘pm’, ‘yesterday’,
+     etc.  For example, ‘--date="2004-02-27 14:19:13.489392193 +0530"’
+     specifies the instant of time that is 489,392,193 nanoseconds after
+     February 27, 2004 at 2:19:13 PM in a time zone that is 5 hours and
+     30 minutes east of UTC.
      Note: input currently must be in locale independent format.  E.g.,
      the LC_TIME=C below is needed to print back the correct date in
      many locales:
           date -d "$(LC_TIME=C date)"
      *Note Date input formats::.
 
-`-f DATEFILE'
-`--file=DATEFILE'
-     Parse each line in DATEFILE as with `-d' and display the resulting
-     date and time.  If DATEFILE is `-', use standard input.  This is
+‘-f DATEFILE’
+‘--file=DATEFILE’
+     Parse each line in DATEFILE as with ‘-d’ and display the resulting
+     date and time.  If DATEFILE is ‘-’, use standard input.  This is
      useful when you have many dates to process, because the system
-     overhead of starting up the `date' executable many times can be
+     overhead of starting up the ‘date’ executable many times can be
      considerable.
 
-`-I[TIMESPEC]'
-`--iso-8601[=TIMESPEC]'
-     Display the date using the ISO 8601 format, `%Y-%m-%d'.
+‘-I[TIMESPEC]’
+‘--iso-8601[=TIMESPEC]’
+     Display the date using the ISO 8601 format, ‘%Y-%m-%d’.
 
      The argument TIMESPEC specifies the number of additional terms of
      the time to include.  It can be one of the following:
-    `auto'
+     ‘auto’
           Print just the date.  This is the default if TIMESPEC is
           omitted.
 
-    `hours'
+     ‘hours’
           Append the hour of the day to the date.
 
-    `minutes'
+     ‘minutes’
           Append the hours and minutes.
 
-    `seconds'
+     ‘seconds’
           Append the hours, minutes and seconds.
 
-    `ns'
+     ‘ns’
           Append the hours, minutes, seconds and nanoseconds.
 
      If showing any time terms, then include the time zone using the
-     format `%z'.
-
-`-r FILE'
-`--reference=FILE'
-     Display the date and time of the last modification of FILE,
-     instead of the current date and time.
-
-`-R'
-`--rfc-822'
-`--rfc-2822'
-     Display the date and time using the format `%a, %d %b %Y %H:%M:%S
-     %z', evaluated in the C locale so abbreviations are always in
+     format ‘%z’.
+
+‘-r FILE’
+‘--reference=FILE’
+     Display the date and time of the last modification of FILE, instead
+     of the current date and time.
+
+‘-R’
+‘--rfc-822’
+‘--rfc-2822’
+     Display the date and time using the format ‘%a, %d %b %Y %H:%M:%S
+     %z’, evaluated in the C locale so abbreviations are always in
      English.  For example:
 
           Fri, 09 Sep 2005 13:51:39 -0700
@@ -12277,101 +12181,100 @@ options::.
      (ftp://ftp.rfc-editor.org/in-notes/rfc822.txt), the current and
      previous standards for Internet email.
 
-`--rfc-3339=TIMESPEC'
+‘--rfc-3339=TIMESPEC’
      Display the date using a format specified by Internet RFC 3339
      (ftp://ftp.rfc-editor.org/in-notes/rfc3339.txt).  This is a subset
-     of the ISO 8601 format, except that it also permits applications
-     to use a space rather than a `T' to separate dates from times.
-     Unlike the other standard formats, RFC 3339 format is always
-     suitable as input for the `--date' (`-d') and `--file' (`-f')
-     options, regardless of the current locale.
+     of the ISO 8601 format, except that it also permits applications to
+     use a space rather than a ‘T’ to separate dates from times.  Unlike
+     the other standard formats, RFC 3339 format is always suitable as
+     input for the ‘--date’ (‘-d’) and ‘--file’ (‘-f’) options,
+     regardless of the current locale.
 
      The argument TIMESPEC specifies how much of the time to include.
      It can be one of the following:
 
-    `date'
-          Print just the full-date, e.g., `2005-09-14'.  This is
-          equivalent to the format `%Y-%m-%d'.
+     ‘date’
+          Print just the full-date, e.g., ‘2005-09-14’.  This is
+          equivalent to the format ‘%Y-%m-%d’.
 
-    `seconds'
+     ‘seconds’
           Print the full-date and full-time separated by a space, e.g.,
-          `2005-09-14 00:56:06+05:30'.  The output ends with a numeric
-          time-offset; here the `+05:30' means that local time is five
+          ‘2005-09-14 00:56:06+05:30’.  The output ends with a numeric
+          time-offset; here the ‘+05:30’ means that local time is five
           hours and thirty minutes east of UTC.  This is equivalent to
-          the format `%Y-%m-%d %H:%M:%S%:z'.
-
-    `ns'
-          Like `seconds', but also print nanoseconds, e.g., `2005-09-14
-          00:56:06.998458565+05:30'.  This is equivalent to the format
-          `%Y-%m-%d %H:%M:%S.%N%:z'.
+          the format ‘%Y-%m-%d %H:%M:%S%:z’.
 
+     ‘ns’
+          Like ‘seconds’, but also print nanoseconds, e.g., ‘2005-09-14
+          00:56:06.998458565+05:30’.  This is equivalent to the format
+          ‘%Y-%m-%d %H:%M:%S.%N%:z’.
 
-`-s DATESTR'
-`--set=DATESTR'
-     Set the date and time to DATESTR.  See `-d' above.  See also *note
+‘-s DATESTR’
+‘--set=DATESTR’
+     Set the date and time to DATESTR.  See ‘-d’ above.  See also *note
      Setting the time::.
 
-`-u'
-`--utc'
-`--universal'
-     Use Coordinated Universal Time (UTC) by operating as if the `TZ'
-     environment variable were set to the string `UTC0'.  Coordinated
-     Universal Time is often called "Greenwich Mean Time" (GMT) for
+‘-u’
+‘--utc’
+‘--universal’
+     Use Coordinated Universal Time (UTC) by operating as if the ‘TZ’
+     environment variable were set to the string ‘UTC0’.  Coordinated
+     Universal Time is often called “Greenwich Mean Time� (GMT) for
      historical reasons.  Typically, systems ignore leap seconds and
      thus implement an approximation to UTC rather than true UTC.
 
 
-File: coreutils.info,  Node: Examples of date,  Up: date invocation
+File: coreutils.info,  Node: Examples of date,  Prev: Options for date,  Up: date invocation
 
-21.1.7 Examples of `date'
+21.1.7 Examples of ‘date’
 -------------------------
 
-Here are a few examples.  Also see the documentation for the `-d'
-option in the previous section.
+Here are a few examples.  Also see the documentation for the ‘-d’ option
+in the previous section.
 
-   * To print the date of the day before yesterday:
+   • To print the date of the day before yesterday:
 
           date --date='2 days ago'
 
-   * To print the date of the day three months and one day hence:
+   • To print the date of the day three months and one day hence:
 
           date --date='3 months 1 day'
 
-   * To print the day of year of Christmas in the current year:
+   • To print the day of year of Christmas in the current year:
 
           date --date='25 Dec' +%j
 
-   * To print the current full month name and the day of the month:
+   • To print the current full month name and the day of the month:
 
           date '+%B %d'
 
      But this may not be what you want because for the first nine days
-     of the month, the `%d' expands to a zero-padded two-digit field,
-     for example `date -d 1may '+%B %d'' will print `May 01'.
+     of the month, the ‘%d’ expands to a zero-padded two-digit field,
+     for example ‘date -d 1may '+%B %d'’ will print ‘May 01’.
 
-   * To print a date without the leading zero for one-digit days of the
-     month, you can use the (GNU extension) `-' flag to suppress the
+   • To print a date without the leading zero for one-digit days of the
+     month, you can use the (GNU extension) ‘-’ flag to suppress the
      padding altogether:
 
           date -d 1may '+%B %-d
 
-   * To print the current date and time in the format required by many
-     non-GNU versions of `date' when setting the system clock:
+   • To print the current date and time in the format required by many
+     non-GNU versions of ‘date’ when setting the system clock:
 
           date +%m%d%H%M%Y.%S
 
-   * To set the system clock forward by two minutes:
+   • To set the system clock forward by two minutes:
 
           date --set='+2 minutes'
 
-   * To print the date in RFC 2822 format, use `date --rfc-2822'.  Here
+   • To print the date in RFC 2822 format, use ‘date --rfc-2822’.  Here
      is some example output:
 
           Fri, 09 Sep 2005 13:51:39 -0700
 
-   * To convert a date string to the number of seconds since the epoch
-     (which is 1970-01-01 00:00:00 UTC), use the `--date' option with
-     the `%s' format.  That can be useful in sorting and/or graphing
+   • To convert a date string to the number of seconds since the epoch
+     (which is 1970-01-01 00:00:00 UTC), use the ‘--date’ option with
+     the ‘%s’ format.  That can be useful in sorting and/or graphing
      and/or comparing data by date.  The following command outputs the
      number of the seconds since the epoch for the time two minutes
      after the epoch:
@@ -12380,28 +12283,28 @@ option in the previous section.
           120
 
      If you do not specify time zone information in the date string,
-     `date' uses your computer's idea of the time zone when
-     interpreting the string.  For example, if your computer's time
-     zone is that of Cambridge, Massachusetts, which was then 5 hours
-     (i.e., 18,000 seconds) behind UTC:
+     ‘date’ uses your computer’s idea of the time zone when interpreting
+     the string.  For example, if your computer’s time zone is that of
+     Cambridge, Massachusetts, which was then 5 hours (i.e., 18,000
+     seconds) behind UTC:
 
           # local time zone used
           date --date='1970-01-01 00:02:00' +%s
           18120
 
-   * If you're sorting or graphing dated data, your raw date values may
-     be represented as seconds since the epoch.  But few people can
-     look at the date `946684800' and casually note "Oh, that's the
-     first second of the year 2000 in Greenwich, England."
+   • If you’re sorting or graphing dated data, your raw date values may
+     be represented as seconds since the epoch.  But few people can look
+     at the date ‘946684800’ and casually note “Oh, that’s the first
+     second of the year 2000 in Greenwich, England.�
 
           date --date='2000-01-01 UTC' +%s
           946684800
 
-     An alternative is to use the `--utc' (`-u') option.  Then you may
-     omit `UTC' from the date string.  Although this produces the same
-     result for `%s' and many other format sequences, with a time zone
+     An alternative is to use the ‘--utc’ (‘-u’) option.  Then you may
+     omit ‘UTC’ from the date string.  Although this produces the same
+     result for ‘%s’ and many other format sequences, with a time zone
      offset different from zero, it would give a different result for
-     zone-dependent formats like `%z'.
+     zone-dependent formats like ‘%z’.
 
           date -u --date=2000-01-01 +%s
           946684800
@@ -12413,7 +12316,7 @@ option in the previous section.
           date -d '1970-01-01 UTC 946684800 seconds' +"%Y-%m-%d %T %z"
           1999-12-31 19:00:00 -0500
 
-     Or if you do not mind depending on the `@' feature present since
+     Or if you do not mind depending on the ‘@’ feature present since
      coreutils 5.3.0, you could shorten this to:
 
           date -d @946684800 +"%F %T %z"
@@ -12424,11 +12327,11 @@ option in the previous section.
           date -u -d '1970-01-01 946684800 seconds' +"%Y-%m-%d %T %z"
           2000-01-01 00:00:00 +0000
 
-   * Typically the seconds count omits leap seconds, but some systems
+   • Typically the seconds count omits leap seconds, but some systems
      are exceptions.  Because leap seconds are not predictable, the
      mapping between the seconds count and a future timestamp is not
-     reliable on the atypical systems that include leap seconds in
-     their counts.
+     reliable on the atypical systems that include leap seconds in their
+     counts.
 
      Here is how the two kinds of systems handle the leap second at
      2012-06-30 23:59:60 UTC:
@@ -12449,15 +12352,14 @@ option in the previous section.
           date --date='2012-07-01 00:00:00 +0000' +%s
           1341100825
 
-
 
 File: coreutils.info,  Node: arch invocation,  Next: nproc invocation,  Prev: date invocation,  Up: System context
 
-21.2 `arch': Print machine hardware name
+21.2 ‘arch’: Print machine hardware name
 ========================================
 
-`arch' prints the machine hardware name, and is equivalent to `uname
--m'.  Synopsis:
+‘arch’ prints the machine hardware name, and is equivalent to ‘uname
+-m’.  Synopsis:
 
      arch [OPTION]
 
@@ -12469,13 +12371,13 @@ indicates failure.
 
 File: coreutils.info,  Node: nproc invocation,  Next: uname invocation,  Prev: arch invocation,  Up: System context
 
-21.3 `nproc': Print the number of available processors
+21.3 ‘nproc’: Print the number of available processors
 ======================================================
 
 Print the number of processing units available to the current process,
 which may be less than the number of online processors.  If this
 information is not accessible, then print the number of processors
-installed.  If the `OMP_NUM_THREADS' environment variable is set, then
+installed.  If the ‘OMP_NUM_THREADS’ environment variable is set, then
 it will determine the returned value.  The result is guaranteed to be
 greater than zero.  Synopsis:
 
@@ -12484,32 +12386,31 @@ greater than zero.  Synopsis:
    The program accepts the following options.  Also see *note Common
 options::.
 
-`--all'
+‘--all’
      Print the number of installed processors on the system, which may
      be greater than the number online or available to the current
-     process.  The `OMP_NUM_THREADS' environment variable is not
-     honored in this case.
+     process.  The ‘OMP_NUM_THREADS’ environment variable is not honored
+     in this case.
 
-`--ignore=NUMBER'
+‘--ignore=NUMBER’
      If possible, exclude this NUMBER of processing units.
 
-
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
 
 
 File: coreutils.info,  Node: uname invocation,  Next: hostname invocation,  Prev: nproc invocation,  Up: System context
 
-21.4 `uname': Print system information
+21.4 ‘uname’: Print system information
 ======================================
 
-`uname' prints information about the machine and operating system it is
-run on.  If no options are given, `uname' acts as if the `-s' option
+‘uname’ prints information about the machine and operating system it is
+run on.  If no options are given, ‘uname’ acts as if the ‘-s’ option
 were given.  Synopsis:
 
-     uname [OPTION]...
+     uname [OPTION]…
 
-   If multiple options or `-a' are given, the selected information is
+   If multiple options or ‘-a’ are given, the selected information is
 printed in this order:
 
      KERNEL-NAME NODENAME KERNEL-RELEASE KERNEL-VERSION
@@ -12517,82 +12418,81 @@ printed in this order:
 
    The information may contain internal spaces, so such output cannot be
 parsed reliably.  In the following example, RELEASE is
-`2.2.18ss.e820-bda652a #4 SMP Tue Jun 5 11:24:08 PDT 2001':
+‘2.2.18ss.e820-bda652a #4 SMP Tue Jun 5 11:24:08 PDT 2001’:
 
      uname -a
-     => Linux dumdum 2.2.18 #4 SMP Tue Jun 5 11:24:08 PDT 2001 i686 unknown unknown GNU/Linux
+     ⇒ Linux dumdum 2.2.18 #4 SMP Tue Jun 5 11:24:08 PDT 2001 i686 unknown unknown GNU/Linux
 
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-a'
-`--all'
+‘-a’
+‘--all’
      Print all of the below information, except omit the processor type
      and the hardware platform name if they are unknown.
 
-`-i'
-`--hardware-platform'
+‘-i’
+‘--hardware-platform’
      Print the hardware platform name (sometimes called the hardware
-     implementation).  Print `unknown' if the kernel does not make this
+     implementation).  Print ‘unknown’ if the kernel does not make this
      information easily available, as is the case with Linux kernels.
 
-`-m'
-`--machine'
+‘-m’
+‘--machine’
      Print the machine hardware name (sometimes called the hardware
      class or hardware type).
 
-`-n'
-`--nodename'
+‘-n’
+‘--nodename’
      Print the network node hostname.
 
-`-p'
-`--processor'
+‘-p’
+‘--processor’
      Print the processor type (sometimes called the instruction set
-     architecture or ISA).  Print `unknown' if the kernel does not make
+     architecture or ISA). Print ‘unknown’ if the kernel does not make
      this information easily available, as is the case with Linux
      kernels.
 
-`-o'
-`--operating-system'
+‘-o’
+‘--operating-system’
      Print the name of the operating system.
 
-`-r'
-`--kernel-release'
+‘-r’
+‘--kernel-release’
      Print the kernel release.
 
-`-s'
-`--kernel-name'
+‘-s’
+‘--kernel-name’
      Print the kernel name.  POSIX 1003.1-2001 (*note Standards
-     conformance::) calls this "the implementation of the operating
-     system", because the POSIX specification itself has no notion of
-     "kernel".  The kernel name might be the same as the operating
-     system name printed by the `-o' or `--operating-system' option,
-     but it might differ.  Some operating systems (e.g., FreeBSD,
-     HP-UX) have the same name as their underlying kernels; others
-     (e.g., GNU/Linux, Solaris) do not.
-
-`-v'
-`--kernel-version'
+     conformance::) calls this “the implementation of the operating
+     system�, because the POSIX specification itself has no notion of
+     “kernel�.  The kernel name might be the same as the operating
+     system name printed by the ‘-o’ or ‘--operating-system’ option, but
+     it might differ.  Some operating systems (e.g., FreeBSD, HP-UX)
+     have the same name as their underlying kernels; others (e.g.,
+     GNU/Linux, Solaris) do not.
+
+‘-v’
+‘--kernel-version’
      Print the kernel version.
 
-
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
 
 
 File: coreutils.info,  Node: hostname invocation,  Next: hostid invocation,  Prev: uname invocation,  Up: System context
 
-21.5 `hostname': Print or set system name
+21.5 ‘hostname’: Print or set system name
 =========================================
 
-With no arguments, `hostname' prints the name of the current host
+With no arguments, ‘hostname’ prints the name of the current host
 system.  With one argument, it sets the current host name to the
 specified string.  You must have appropriate privileges to set the host
 name.  Synopsis:
 
      hostname [NAME]
 
-   The only options are `--help' and `--version'.  *Note Common
+   The only options are ‘--help’ and ‘--version’.  *Note Common
 options::.
 
    An exit status of zero indicates success, and a nonzero value
@@ -12601,20 +12501,20 @@ indicates failure.
 
 File: coreutils.info,  Node: hostid invocation,  Next: uptime invocation,  Prev: hostname invocation,  Up: System context
 
-21.6 `hostid': Print numeric host identifier
+21.6 ‘hostid’: Print numeric host identifier
 ============================================
 
-`hostid' prints the numeric identifier of the current host in
+‘hostid’ prints the numeric identifier of the current host in
 hexadecimal.  This command accepts no arguments.  The only options are
-`--help' and `--version'.  *Note Common options::.
+‘--help’ and ‘--version’.  *Note Common options::.
 
-   For example, here's what it prints on one system I use:
+   For example, here’s what it prints on one system I use:
 
      $ hostid
      1bac013d
 
    On that system, the 32-bit quantity happens to be closely related to
-the system's Internet address, but that isn't always the case.
+the system’s Internet address, but that isn’t always the case.
 
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
@@ -12622,20 +12522,20 @@ indicates failure.
 
 File: coreutils.info,  Node: uptime invocation,  Prev: hostid invocation,  Up: System context
 
-21.7 `uptime': Print system uptime and load
+21.7 ‘uptime’: Print system uptime and load
 ===========================================
 
-`uptime' prints the current time, the system's uptime, the number of
+‘uptime’ prints the current time, the system’s uptime, the number of
 logged-in users and the current load average.
 
    If an argument is specified, it is used as the file to be read to
 discover how many users are logged in.  If no argument is specified, a
-system default is used (`uptime --help' indicates the default setting).
+system default is used (‘uptime --help’ indicates the default setting).
 
-   The only options are `--help' and `--version'.  *Note Common
+   The only options are ‘--help’ and ‘--version’.  *Note Common
 options::.
 
-   For example, here's what it prints right now on one system I use:
+   For example, here’s what it prints right now on one system I use:
 
      $ uptime
       14:07  up   3:35,  3 users,  load average: 1.39, 1.15, 1.04
@@ -12644,7 +12544,7 @@ options::.
 between systems.  Some systems calculate it as the average number of
 runnable processes over the last 1, 5 and 15 minutes, but some systems
 also include processes in the uninterruptible sleep state (that is,
-those processes which are waiting for disk I/O).  The Linux kernel
+those processes which are waiting for disk I/O). The Linux kernel
 includes uninterruptible processes.
 
 
@@ -12663,93 +12563,92 @@ This section describes commands for operations with SELinux contexts.
 
 File: coreutils.info,  Node: chcon invocation,  Next: runcon invocation,  Up: SELinux context
 
-22.1 `chcon': Change SELinux context of file
+22.1 ‘chcon’: Change SELinux context of file
 ============================================
 
-`chcon' changes the SELinux security context of the selected files.
+‘chcon’ changes the SELinux security context of the selected files.
 Synopses:
 
-     chcon [OPTION]... CONTEXT FILE...
-     chcon [OPTION]... [-u USER] [-r ROLE] [-l RANGE] [-t TYPE] FILE...
-     chcon [OPTION]... --reference=RFILE FILE...
+     chcon [OPTION]… CONTEXT FILE…
+     chcon [OPTION]… [-u USER] [-r ROLE] [-l RANGE] [-t TYPE] FILE…
+     chcon [OPTION]… --reference=RFILE FILE…
 
    Change the SELinux security context of each FILE to CONTEXT.  With
-`--reference', change the security context of each FILE to that of
+‘--reference’, change the security context of each FILE to that of
 RFILE.
 
    The program accepts the following options.  Also see *note Common
 options::.
 
-`--dereference'
+‘--dereference’
      Do not affect symbolic links but what they refer to; this is the
      default.
 
-`-h'
-`--no-dereference'
+‘-h’
+‘--no-dereference’
      Affect the symbolic links themselves instead of any referenced
      file.
 
-`--reference=RFILE'
-     Use RFILE's security context rather than specifying a CONTEXT
+‘--reference=RFILE’
+     Use RFILE’s security context rather than specifying a CONTEXT
      value.
 
-`-R'
-`--recursive'
+‘-R’
+‘--recursive’
      Operate on files and directories recursively.
 
-`--preserve-root'
-     Refuse to operate recursively on the root directory, `/', when
-     used together with the `--recursive' option.  *Note Treating /
+‘--preserve-root’
+     Refuse to operate recursively on the root directory, ‘/’, when used
+     together with the ‘--recursive’ option.  *Note Treating /
      specially::.
 
-`--no-preserve-root'
-     Do not treat the root directory, `/', specially when operating
+‘--no-preserve-root’
+     Do not treat the root directory, ‘/’, specially when operating
      recursively; this is the default.  *Note Treating / specially::.
 
-`-H'
-     If `--recursive' (`-R') is specified and a command line argument
-     is a symbolic link to a directory, traverse it.  *Note Traversing
+‘-H’
+     If ‘--recursive’ (‘-R’) is specified and a command line argument is
+     a symbolic link to a directory, traverse it.  *Note Traversing
      symlinks::.
 
-`-L'
+‘-L’
      In a recursive traversal, traverse every symbolic link to a
      directory that is encountered.  *Note Traversing symlinks::.
 
-`-P'
-     Do not traverse any symbolic links.  This is the default if none
-     of `-H', `-L', or `-P' is specified.  *Note Traversing symlinks::.
+‘-P’
+     Do not traverse any symbolic links.  This is the default if none of
+     ‘-H’, ‘-L’, or ‘-P’ is specified.  *Note Traversing symlinks::.
 
-`-v'
-`--verbose'
+‘-v’
+‘--verbose’
      Output a diagnostic for every file processed.
 
-`-u USER'
-`--user=USER'
+‘-u USER’
+‘--user=USER’
      Set user USER in the target security context.
 
-`-r ROLE'
-`--role=ROLE'
+‘-r ROLE’
+‘--role=ROLE’
      Set role ROLE in the target security context.
 
-`-t TYPE'
-`--type=TYPE'
+‘-t TYPE’
+‘--type=TYPE’
      Set type TYPE in the target security context.
 
-`-l RANGE'
-`--range=RANGE'
+‘-l RANGE’
+‘--range=RANGE’
      Set range RANGE in the target security context.
 
-
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
 
 
 File: coreutils.info,  Node: runcon invocation,  Prev: chcon invocation,  Up: SELinux context
 
-22.2 `runcon': Run a command in specified SELinux context
+22.2 ‘runcon’: Run a command in specified SELinux context
 =========================================================
 
-`runcon' runs file in specified SELinux security context.
+‘runcon’ runs file in specified SELinux security context.
 
    Synopses:
      runcon CONTEXT COMMAND [ARGS]
@@ -12759,7 +12658,7 @@ File: coreutils.info,  Node: runcon invocation,  Prev: chcon invocation,  Up: SE
 transitioned security context modified by one or more of LEVEL, ROLE,
 TYPE and USER.
 
-   If none of `-c', `-t', `-u', `-r', or `-l' is specified, the first
+   If none of ‘-c’, ‘-t’, ‘-u’, ‘-r’, or ‘-l’ is specified, the first
 argument is used as the complete context.  Any additional arguments
 after COMMAND are interpreted as arguments to the command.
 
@@ -12768,31 +12667,30 @@ after COMMAND are interpreted as arguments to the command.
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-c'
-`--compute'
+‘-c’
+‘--compute’
      Compute process transition context before modifying.
 
-`-u USER'
-`--user=USER'
+‘-u USER’
+‘--user=USER’
      Set user USER in the target security context.
 
-`-r ROLE'
-`--role=ROLE'
+‘-r ROLE’
+‘--role=ROLE’
      Set role ROLE in the target security context.
 
-`-t TYPE'
-`--type=TYPE'
+‘-t TYPE’
+‘--type=TYPE’
      Set type TYPE in the target security context.
 
-`-l RANGE'
-`--range=RANGE'
+‘-l RANGE’
+‘--range=RANGE’
      Set range RANGE in the target security context.
 
-
    Exit status:
 
      126 if COMMAND is found but cannot be invoked
-     127 if `runcon' itself fails or if COMMAND cannot be found
+     127 if ‘runcon’ itself fails or if COMMAND cannot be found
      the exit status of COMMAND otherwise
 
 
@@ -12817,64 +12715,73 @@ user, etc.
 
 File: coreutils.info,  Node: chroot invocation,  Next: env invocation,  Up: Modified command invocation
 
-23.1 `chroot': Run a command with a different root directory
+23.1 ‘chroot’: Run a command with a different root directory
 ============================================================
 
-`chroot' runs a command with a specified root directory.  On many
-systems, only the super-user can do this.(1) Synopses:
+‘chroot’ runs a command with a specified root directory.  On many
+systems, only the super-user can do this.(1)  Synopses:
 
-     chroot OPTION NEWROOT [COMMAND [ARGS]...]
+     chroot OPTION NEWROOT [COMMAND [ARGS]…]
      chroot OPTION
 
    Ordinarily, file names are looked up starting at the root of the
-directory structure, i.e., `/'.  `chroot' changes the root to the
-directory NEWROOT (which must exist) and then runs COMMAND with
-optional ARGS.  If COMMAND is not specified, the default is the value
-of the `SHELL' environment variable or `/bin/sh' if not set, invoked
-with the `-i' option.  COMMAND must not be a special built-in utility
-(*note Special built-in utilities::).
+directory structure, i.e., ‘/’.  ‘chroot’ changes the root to the
+directory NEWROOT (which must exist) and then runs COMMAND with optional
+ARGS.  If COMMAND is not specified, the default is the value of the
+‘SHELL’ environment variable or ‘/bin/sh’ if not set, invoked with the
+‘-i’ option.  COMMAND must not be a special built-in utility (*note
+Special built-in utilities::).
 
    The program accepts the following options.  Also see *note Common
 options::.  Options must precede operands.
 
-`--userspec=USER[:GROUP]'
+‘--userspec=USER[:GROUP]’
      By default, COMMAND is run with the same credentials as the
      invoking process.  Use this option to run it as a different USER
-     and/or with a different primary GROUP.
-
-`--groups=GROUPS'
-     Use this option to specify the supplementary GROUPS to be used by
-     the new process.  The items in the list (names or numeric IDs)
-     must be separated by commas.
-
+     and/or with a different primary GROUP.  If a USER is specified then
+     the supplementary groups are set according to the system defined
+     list for that user, unless overridden with the ‘--groups’ option.
+
+‘--groups=GROUPS’
+     Use this option to override the supplementary GROUPS to be used by
+     the new process.  The items in the list (names or numeric IDs) must
+     be separated by commas.  Use ‘--groups=''’ to disable the
+     supplementary group look-up implicit in the ‘--userspec’ option.
+
+   The user and group name look-up performed by the ‘--userspec’ and
+‘--groups’ options, is done both outside and inside the chroot, with
+successful look-ups inside the chroot taking precedence.  If the
+specified user or group items are intended to represent a numeric ID,
+then a name to ID resolving step is avoided by specifying a leading ‘+’.
+*Note Disambiguating names and IDs::.
 
    Here are a few tips to help avoid common problems in using chroot.
 To start with a simple example, make COMMAND refer to a statically
 linked binary.  If you were to use a dynamically linked executable, then
-you'd have to arrange to have the shared libraries in the right place
+you’d have to arrange to have the shared libraries in the right place
 under your new root directory.
 
-   For example, if you create a statically linked `ls' executable, and
-put it in `/tmp/empty', you can run this command as root:
+   For example, if you create a statically linked ‘ls’ executable, and
+put it in ‘/tmp/empty’, you can run this command as root:
 
      $ chroot /tmp/empty /ls -Rl /
 
-   Then you'll see output like this:
+   Then you’ll see output like this:
 
      /:
      total 1023
      -rwxr-xr-x 1 0 0 1041745 Aug 16 11:17 ls
 
-   If you want to use a dynamically linked executable, say `bash', then
-first run `ldd bash' to see what shared objects it needs.  Then, in
-addition to copying the actual binary, also copy the listed files to
-the required positions under your intended new root directory.
-Finally, if the executable requires any other files (e.g., data, state,
-device files), copy them into place, too.
+   If you want to use a dynamically linked executable, say ‘bash’, then
+first run ‘ldd bash’ to see what shared objects it needs.  Then, in
+addition to copying the actual binary, also copy the listed files to the
+required positions under your intended new root directory.  Finally, if
+the executable requires any other files (e.g., data, state, device
+files), copy them into place, too.
 
    Exit status:
 
-     125 if `chroot' itself fails
+     125 if ‘chroot’ itself fails
      126 if COMMAND is found but cannot be invoked
      127 if COMMAND cannot be found
      the exit status of COMMAND otherwise
@@ -12882,49 +12789,49 @@ device files), copy them into place, too.
    ---------- Footnotes ----------
 
    (1) However, some systems (e.g., FreeBSD) can be configured to allow
-certain regular users to use the `chroot' system call, and hence to run
-this program.  Also, on Cygwin, anyone can run the `chroot' command,
-because the underlying function is non-privileged due to lack of
-support in MS-Windows.
+certain regular users to use the ‘chroot’ system call, and hence to run
+this program.  Also, on Cygwin, anyone can run the ‘chroot’ command,
+because the underlying function is non-privileged due to lack of support
+in MS-Windows.
 
 
 File: coreutils.info,  Node: env invocation,  Next: nice invocation,  Prev: chroot invocation,  Up: Modified command invocation
 
-23.2 `env': Run a command in a modified environment
+23.2 ‘env’: Run a command in a modified environment
 ===================================================
 
-`env' runs a command with a modified environment.  Synopses:
+‘env’ runs a command with a modified environment.  Synopses:
 
-     env [OPTION]... [NAME=VALUE]... [COMMAND [ARGS]...]
+     env [OPTION]… [NAME=VALUE]… [COMMAND [ARGS]…]
      env
 
-   Operands of the form `VARIABLE=VALUE' set the environment variable
-VARIABLE to value VALUE.  VALUE may be empty (`VARIABLE=').  Setting a
+   Operands of the form ‘VARIABLE=VALUE’ set the environment variable
+VARIABLE to value VALUE.  VALUE may be empty (‘VARIABLE=’).  Setting a
 variable to an empty value is different from unsetting it.  These
 operands are evaluated left-to-right, so if two operands mention the
 same variable the earlier is ignored.
 
    Environment variable names can be empty, and can contain any
-characters other than `=' and ASCII NUL.  However, it is wise to limit
+characters other than ‘=’ and ASCII NUL. However, it is wise to limit
 yourself to names that consist solely of underscores, digits, and ASCII
-letters, and that begin with a non-digit, as applications like the
-shell do not work well with other names.
+letters, and that begin with a non-digit, as applications like the shell
+do not work well with other names.
 
-   The first operand that does not contain the character `=' specifies
-the program to invoke; it is searched for according to the `PATH'
+   The first operand that does not contain the character ‘=’ specifies
+the program to invoke; it is searched for according to the ‘PATH’
 environment variable.  Any remaining arguments are passed as arguments
 to that program.  The program should not be a special built-in utility
 (*note Special built-in utilities::).
 
-   Modifications to `PATH' take effect prior to searching for COMMAND.
-Use caution when reducing `PATH'; behavior is not portable when `PATH'
-is undefined or omits key directories such as `/bin'.
+   Modifications to ‘PATH’ take effect prior to searching for COMMAND.
+Use caution when reducing ‘PATH’; behavior is not portable when ‘PATH’
+is undefined or omits key directories such as ‘/bin’.
 
-   In the rare case that a utility contains a `=' in the name, the only
+   In the rare case that a utility contains a ‘=’ in the name, the only
 way to disambiguate it from a variable assignment is to use an
 intermediate command for COMMAND, and pass the problematic program name
-via ARGS.  For example, if `./prog=' is an executable in the current
-`PATH':
+via ARGS.  For example, if ‘./prog=’ is an executable in the current
+‘PATH’:
 
      env prog= true # runs 'true', with prog= in environment
      env ./prog= true # runs 'true', with ./prog= in environment
@@ -12934,63 +12841,60 @@ via ARGS.  For example, if `./prog=' is an executable in the current
 
    If no command name is specified following the environment
 specifications, the resulting environment is printed.  This is like
-specifying the `printenv' program.
+specifying the ‘printenv’ program.
 
-   For some examples, suppose the environment passed to `env' contains
-`LOGNAME=rms', `EDITOR=emacs', and `PATH=.:/gnubin:/hacks':
+   For some examples, suppose the environment passed to ‘env’ contains
+‘LOGNAME=rms’, ‘EDITOR=emacs’, and ‘PATH=.:/gnubin:/hacks’:
 
-   * Output the current environment.
+   • Output the current environment.
           $ env | LC_ALL=C sort
           EDITOR=emacs
           LOGNAME=rms
           PATH=.:/gnubin:/hacks
 
-   * Run `foo' with a reduced environment, preserving only the original
-     `PATH' to avoid problems in locating `foo'.
+   • Run ‘foo’ with a reduced environment, preserving only the original
+     ‘PATH’ to avoid problems in locating ‘foo’.
           env - PATH="$PATH" foo
 
-   * Run `foo' with the environment containing `LOGNAME=rms',
-     `EDITOR=emacs', and `PATH=.:/gnubin:/hacks', and guarantees that
-     `foo' was found in the file system rather than as a shell built-in.
+   • Run ‘foo’ with the environment containing ‘LOGNAME=rms’,
+     ‘EDITOR=emacs’, and ‘PATH=.:/gnubin:/hacks’, and guarantees that
+     ‘foo’ was found in the file system rather than as a shell built-in.
           env foo
 
-   * Run `nemacs' with the environment containing `LOGNAME=foo',
-     `EDITOR=emacs', `PATH=.:/gnubin:/hacks', and `DISPLAY=gnu:0'.
+   • Run ‘nemacs’ with the environment containing ‘LOGNAME=foo’,
+     ‘EDITOR=emacs’, ‘PATH=.:/gnubin:/hacks’, and ‘DISPLAY=gnu:0’.
           env DISPLAY=gnu:0 LOGNAME=foo nemacs
 
-   * Attempt to run the program `/energy/--' (as that is the only
+   • Attempt to run the program ‘/energy/--’ (as that is the only
      possible path search result); if the command exists, the
-     environment will contain `LOGNAME=rms' and `PATH=/energy', and the
-     arguments will be `e=mc2', `bar', and `baz'.
+     environment will contain ‘LOGNAME=rms’ and ‘PATH=/energy’, and the
+     arguments will be ‘e=mc2’, ‘bar’, and ‘baz’.
           env -u EDITOR PATH=/energy -- e=mc2 bar baz
 
-
    The program accepts the following options.  Also see *note Common
 options::.  Options must precede operands.
 
-`-0'
-`--null'
-     Output a zero byte (ASCII NUL) at the end of each line, rather
-     than a newline.  This option enables other programs to parse the
-     output of `env' even when that output would contain data with
-     embedded newlines.
+‘-0’
+‘--null’
+     Output a zero byte (ASCII NUL) at the end of each line, rather than
+     a newline.  This option enables other programs to parse the output
+     even when that output would contain data with embedded newlines.
 
-`-u NAME'
-`--unset=NAME'
+‘-u NAME’
+‘--unset=NAME’
      Remove variable NAME from the environment, if it was in the
      environment.
 
-`-'
-`-i'
-`--ignore-environment'
+‘-’
+‘-i’
+‘--ignore-environment’
      Start with an empty environment, ignoring the inherited
      environment.
 
-
    Exit status:
 
      0   if no COMMAND is specified and the environment is output
-     125 if `env' itself fails
+     125 if ‘env’ itself fails
      126 if COMMAND is found but cannot be invoked
      127 if COMMAND cannot be found
      the exit status of COMMAND otherwise
@@ -12998,67 +12902,66 @@ options::.  Options must precede operands.
 
 File: coreutils.info,  Node: nice invocation,  Next: nohup invocation,  Prev: env invocation,  Up: Modified command invocation
 
-23.3 `nice': Run a command with modified niceness
+23.3 ‘nice’: Run a command with modified niceness
 =================================================
 
-`nice' prints a process's "niceness", or runs a command with modified
+‘nice’ prints a process’s "niceness", or runs a command with modified
 niceness.  "niceness" affects how favorably the process is scheduled in
 the system.  Synopsis:
 
-     nice [OPTION]... [COMMAND [ARG]...]
+     nice [OPTION]… [COMMAND [ARG]…]
 
-   If no arguments are given, `nice' prints the current niceness.
-Otherwise, `nice' runs the given COMMAND with its niceness adjusted.
-By default, its niceness is incremented by 10.
+   If no arguments are given, ‘nice’ prints the current niceness.
+Otherwise, ‘nice’ runs the given COMMAND with its niceness adjusted.  By
+default, its niceness is incremented by 10.
 
-   Niceness values range at least from -20 (process has high priority
+   Niceness values range at least from −20 (process has high priority
 and gets more resources, thus slowing down other processes) through 19
 (process has lower priority and runs slowly itself, but has less impact
-on the speed of other running processes).  Some systems may have a
-wider range of niceness values; conversely, other systems may enforce
-more restrictive limits.  An attempt to set the niceness outside the
+on the speed of other running processes).  Some systems may have a wider
+range of niceness values; conversely, other systems may enforce more
+restrictive limits.  An attempt to set the niceness outside the
 supported range is treated as an attempt to use the minimum or maximum
 supported value.
 
    A niceness should not be confused with a scheduling priority, which
 lets applications determine the order in which threads are scheduled to
 run.  Unlike a priority, a niceness is merely advice to the scheduler,
-which the scheduler is free to ignore.  Also, as a point of
-terminology, POSIX defines the behavior of `nice' in terms of a "nice
-value", which is the nonnegative difference between a niceness and the
-minimum niceness.  Though `nice' conforms to POSIX, its documentation
-and diagnostics use the term "niceness" for compatibility with
-historical practice.
+which the scheduler is free to ignore.  Also, as a point of terminology,
+POSIX defines the behavior of ‘nice’ in terms of a "nice value", which
+is the nonnegative difference between a niceness and the minimum
+niceness.  Though ‘nice’ conforms to POSIX, its documentation and
+diagnostics use the term “niceness� for compatibility with historical
+practice.
 
    COMMAND must not be a special built-in utility (*note Special
 built-in utilities::).
 
-   Due to shell aliases and built-in `nice' functions, using an
-unadorned `nice' interactively or in a script may get you different
-functionality than that described here.  Invoke it via `env' (i.e.,
-`env nice ...') to avoid interference from the shell.
+   Due to shell aliases and built-in ‘nice’ functions, using an
+unadorned ‘nice’ interactively or in a script may get you different
+functionality than that described here.  Invoke it via ‘env’ (i.e., ‘env
+nice …’) to avoid interference from the shell.
 
    Note to change the "niceness" of an existing process, one needs to
-use the `renice' command.
+use the ‘renice’ command.
 
    The program accepts the following option.  Also see *note Common
 options::.  Options must precede operands.
 
-`-n ADJUSTMENT'
-`--adjustment=ADJUSTMENT'
-     Add ADJUSTMENT instead of 10 to the command's niceness.  If
-     ADJUSTMENT is negative and you lack appropriate privileges, `nice'
+‘-n ADJUSTMENT’
+‘--adjustment=ADJUSTMENT’
+     Add ADJUSTMENT instead of 10 to the command’s niceness.  If
+     ADJUSTMENT is negative and you lack appropriate privileges, ‘nice’
      issues a warning but otherwise acts as if you specified a zero
      adjustment.
 
-     For compatibility `nice' also supports an obsolete option syntax
-     `-ADJUSTMENT'.  New scripts should use `-n ADJUSTMENT' instead.
-
+     For compatibility ‘nice’ also supports an obsolete option syntax
+     ‘-ADJUSTMENT’.  New scripts should use ‘-n ADJUSTMENT’ instead.
 
    Exit status:
 
      0   if no COMMAND is specified and the niceness is output
-     125 if `nice' itself fails
+     125 if ‘nice’ itself fails
      126 if COMMAND is found but cannot be invoked
      127 if COMMAND cannot be found
      the exit status of COMMAND otherwise
@@ -13068,10 +12971,10 @@ niceness.
 
      $ nice factor 4611686018427387903
 
-   Since `nice' prints the current niceness, you can invoke it through
+   Since ‘nice’ prints the current niceness, you can invoke it through
 itself to demonstrate how it works.
 
-   The default behavior is to increase the niceness by `10':
+   The default behavior is to increase the niceness by ‘10’:
 
      $ nice
      0
@@ -13081,7 +12984,7 @@ itself to demonstrate how it works.
      10
 
    The ADJUSTMENT is relative to the current niceness.  In the next
-example, the first `nice' invocation runs the second one with niceness
+example, the first ‘nice’ invocation runs the second one with niceness
 10, and it in turn runs the final one with a niceness that is 3 more:
 
      $ nice nice -n 3 nice
@@ -13104,77 +13007,76 @@ specifying the maximum supported value:
 
 File: coreutils.info,  Node: nohup invocation,  Next: stdbuf invocation,  Prev: nice invocation,  Up: Modified command invocation
 
-23.4 `nohup': Run a command immune to hangups
+23.4 ‘nohup’: Run a command immune to hangups
 =============================================
 
-`nohup' runs the given COMMAND with hangup signals ignored, so that the
+‘nohup’ runs the given COMMAND with hangup signals ignored, so that the
 command can continue running in the background after you log out.
 Synopsis:
 
-     nohup COMMAND [ARG]...
+     nohup COMMAND [ARG]…
 
-   If standard input is a terminal, it is redirected from `/dev/null'
-so that terminal sessions do not mistakenly consider the terminal to be
+   If standard input is a terminal, it is redirected from ‘/dev/null’ so
+that terminal sessions do not mistakenly consider the terminal to be
 used by the command.  This is a GNU extension; programs intended to be
-portable to non-GNU hosts should use `nohup COMMAND [ARG]... </dev/null'
+portable to non-GNU hosts should use ‘nohup COMMAND [ARG]… </dev/null’
 instead.
 
-   If standard output is a terminal, the command's standard output is
-appended to the file `nohup.out'; if that cannot be written to, it is
-appended to the file `$HOME/nohup.out'; and if that cannot be written
-to, the command is not run.  Any `nohup.out' or `$HOME/nohup.out' file
-created by `nohup' is made readable and writable only to the user,
+   If standard output is a terminal, the command’s standard output is
+appended to the file ‘nohup.out’; if that cannot be written to, it is
+appended to the file ‘$HOME/nohup.out’; and if that cannot be written
+to, the command is not run.  Any ‘nohup.out’ or ‘$HOME/nohup.out’ file
+created by ‘nohup’ is made readable and writable only to the user,
 regardless of the current umask settings.
 
    If standard error is a terminal, it is normally redirected to the
 same file descriptor as the (possibly-redirected) standard output.
-However, if standard output is closed, standard error terminal output
-is instead appended to the file `nohup.out' or `$HOME/nohup.out' as
-above.
+However, if standard output is closed, standard error terminal output is
+instead appended to the file ‘nohup.out’ or ‘$HOME/nohup.out’ as above.
 
-   To capture the command's output to a file other than `nohup.out' you
-can redirect it.  For example, to capture the output of `make':
+   To capture the command’s output to a file other than ‘nohup.out’ you
+can redirect it.  For example, to capture the output of ‘make’:
 
      nohup make > make.log
 
-   `nohup' does not automatically put the command it runs in the
-background; you must do that explicitly, by ending the command line
-with an `&'.  Also, `nohup' does not alter the niceness of COMMAND; use
-`nice' for that, e.g., `nohup nice COMMAND'.
+   ‘nohup’ does not automatically put the command it runs in the
+background; you must do that explicitly, by ending the command line with
+an ‘&’.  Also, ‘nohup’ does not alter the niceness of COMMAND; use
+‘nice’ for that, e.g., ‘nohup nice COMMAND’.
 
    COMMAND must not be a special built-in utility (*note Special
 built-in utilities::).
 
-   The only options are `--help' and `--version'.  *Note Common
+   The only options are ‘--help’ and ‘--version’.  *Note Common
 options::.  Options must precede operands.
 
    Exit status:
 
-     125 if `nohup' itself fails, and `POSIXLY_CORRECT' is not set
+     125 if ‘nohup’ itself fails, and ‘POSIXLY_CORRECT’ is not set
      126 if COMMAND is found but cannot be invoked
      127 if COMMAND cannot be found
      the exit status of COMMAND otherwise
 
-   If `POSIXLY_CORRECT' is set, internal failures give status 127
+   If ‘POSIXLY_CORRECT’ is set, internal failures give status 127
 instead of 125.
 
 
 File: coreutils.info,  Node: stdbuf invocation,  Next: timeout invocation,  Prev: nohup invocation,  Up: Modified command invocation
 
-23.5 `stdbuf': Run a command with modified I/O stream buffering
+23.5 ‘stdbuf’: Run a command with modified I/O stream buffering
 ===============================================================
 
-`stdbuf' allows one to modify the buffering operations of the three
+‘stdbuf’ allows one to modify the buffering operations of the three
 standard I/O streams associated with a program.  Synopsis:
 
-     stdbuf OPTION... COMMAND
+     stdbuf OPTION… COMMAND
 
    COMMAND must start with the name of a program that
-  1. uses the ISO C `FILE' streams for input/output (note the programs
-     `dd' and `cat' don't do that),
+  1. uses the ISO C ‘FILE’ streams for input/output (note the programs
+     ‘dd’ and ‘cat’ don’t do that),
 
   2. does not adjust the buffering of its standard streams (note the
-     program `tee' is not in this category).
+     program ‘tee’ is not in this category).
 
    Any additional ARGs are passed as additional arguments to the
 COMMAND.
@@ -13182,52 +13084,50 @@ COMMAND.
    The program accepts the following options.  Also see *note Common
 options::.
 
-`-i MODE'
-`--input=MODE'
+‘-i MODE’
+‘--input=MODE’
      Adjust the standard input stream buffering.
 
-`-o MODE'
-`--output=MODE'
+‘-o MODE’
+‘--output=MODE’
      Adjust the standard output stream buffering.
 
-`-e MODE'
-`--error=MODE'
+‘-e MODE’
+‘--error=MODE’
      Adjust the standard error stream buffering.
 
-
    The MODE can be specified as follows:
 
-`L'
+‘L’
      Set the stream to line buffered mode.  In this mode data is
      coalesced until a newline is output or input is read from any
      stream attached to a terminal device.  This option is invalid with
      standard input.
 
-`0'
+‘0’
      Disable buffering of the selected stream.  In this mode, data is
      output immediately and only the amount of data requested is read
      from input.  Note the difference in function for input and output.
      Disabling buffering for input will not influence the responsiveness
      or blocking behavior of the stream input functions.  For example
-     `fread' will still block until `EOF' or error, even if the
-     underlying `read' returns less data than requested.
-
-`SIZE'
-     Specify the size of the buffer to use in fully buffered mode.
-     SIZE may be, or may be an integer optionally followed by, one of
-     the following multiplicative suffixes:
-          `KB' =>           1000 (KiloBytes)
-          `K'  =>           1024 (KibiBytes)
-          `MB' =>      1000*1000 (MegaBytes)
-          `M'  =>      1024*1024 (MebiBytes)
-          `GB' => 1000*1000*1000 (GigaBytes)
-          `G'  => 1024*1024*1024 (GibiBytes)
-     and so on for `T', `P', `E', `Z', and `Y'.
+     ‘fread’ will still block until ‘EOF’ or error, even if the
+     underlying ‘read’ returns less data than requested.
 
+‘SIZE’
+     Specify the size of the buffer to use in fully buffered mode.  SIZE
+     may be, or may be an integer optionally followed by, one of the
+     following multiplicative suffixes:
+          ‘KB’ =>           1000 (KiloBytes)
+          ‘K’  =>           1024 (KibiBytes)
+          ‘MB’ =>      1000*1000 (MegaBytes)
+          ‘M’  =>      1024*1024 (MebiBytes)
+          ‘GB’ => 1000*1000*1000 (GigaBytes)
+          ‘G’  => 1024*1024*1024 (GibiBytes)
+     and so on for ‘T’, ‘P’, ‘E’, ‘Z’, and ‘Y’.
 
    Exit status:
 
-     125 if `stdbuf' itself fails
+     125 if ‘stdbuf’ itself fails
      126 if COMMAND is found but cannot be invoked
      127 if COMMAND cannot be found
      the exit status of COMMAND otherwise
@@ -13235,13 +13135,13 @@ options::.
 
 File: coreutils.info,  Node: timeout invocation,  Prev: stdbuf invocation,  Up: Modified command invocation
 
-23.6 `timeout': Run a command with a time limit
+23.6 ‘timeout’: Run a command with a time limit
 ===============================================
 
-`timeout' runs the given COMMAND and kills it if it is still running
+‘timeout’ runs the given COMMAND and kills it if it is still running
 after the specified time interval.  Synopsis:
 
-     timeout [OPTION] DURATION COMMAND [ARG]...
+     timeout [OPTION] DURATION COMMAND [ARG]…
 
    COMMAND must not be a special built-in utility (*note Special
 built-in utilities::).
@@ -13249,44 +13149,43 @@ built-in utilities::).
    The program accepts the following options.  Also see *note Common
 options::.  Options must precede operands.
 
-`--preserve-status'
+‘--preserve-status’
      Return the exit status of the managed COMMAND on timeout, rather
      than a specific exit status indicating a timeout.  This is useful
-     if the managed COMMAND supports running for an indeterminite
-     amount of time.
+     if the managed COMMAND supports running for an indeterminite amount
+     of time.
 
-`--foreground'
-     Don't create a separate background program group, so that the
+‘--foreground’
+     Don’t create a separate background program group, so that the
      managed COMMAND can use the foreground TTY normally.  This is
      needed to support timing out commands not started directly from an
      interactive shell, in two situations.
-       1. COMMAND is interactive and needs to read from the terminal
-          for example
-
+       1. COMMAND is interactive and needs to read from the terminal for
+          example
        2. the user wants to support sending signals directly to COMMAND
           from the terminal (like Ctrl-C for example)
 
-     Note in this mode of operation, any children of COMMAND will not
-     be timed out.
+     Note in this mode of operation, any children of COMMAND will not be
+     timed out.
 
-`-k DURATION'
-`--kill-after=DURATION'
-     Ensure the monitored COMMAND is killed by also sending a `KILL'
+‘-k DURATION’
+‘--kill-after=DURATION’
+     Ensure the monitored COMMAND is killed by also sending a ‘KILL’
      signal, after the specified DURATION.  Without this option, if the
-     selected signal proves not to be fatal, `timeout' does not kill
-     the COMMAND.
+     selected signal proves not to be fatal, ‘timeout’ does not kill the
+     COMMAND.
 
-`-s SIGNAL'
-`--signal=SIGNAL'
+‘-s SIGNAL’
+‘--signal=SIGNAL’
      Send this SIGNAL to COMMAND on timeout, rather than the default
-     `TERM' signal.  SIGNAL may be a name like `HUP' or a number.
-     *Note Signal specifications::.
+     ‘TERM’ signal.  SIGNAL may be a name like ‘HUP’ or a number.  *Note
+     Signal specifications::.
 
    DURATION is a floating point number followed by an optional unit:
-     `s' for seconds (the default)
-     `m' for minutes
-     `h' for hours
-     `d' for days
+     ‘s’ for seconds (the default)
+     ‘m’ for minutes
+     ‘h’ for hours
+     ‘d’ for days
    A duration of 0 disables the associated timeout.  Note that the
 actual timeout duration is dependent on system conditions, which should
 be especially considered when specifying sub-second timeouts.
@@ -13294,7 +13193,7 @@ be especially considered when specifying sub-second timeouts.
    Exit status:
 
      124 if COMMAND times out
-     125 if `timeout' itself fails
+     125 if ‘timeout’ itself fails
      126 if COMMAND is found but cannot be invoked
      127 if COMMAND cannot be found
      137 if COMMAND is sent the KILL(9) signal (128+9)
@@ -13313,40 +13212,40 @@ File: coreutils.info,  Node: Process control,  Next: Delaying,  Prev: Modified c
 
 File: coreutils.info,  Node: kill invocation,  Up: Process control
 
-24.1 `kill': Send a signal to processes
+24.1 ‘kill’: Send a signal to processes
 =======================================
 
-The `kill' command sends a signal to processes, causing them to
+The ‘kill’ command sends a signal to processes, causing them to
 terminate or otherwise act upon receiving the signal in some way.
 Alternatively, it lists information about signals.  Synopses:
 
-     kill [-s SIGNAL | --signal SIGNAL | -SIGNAL] PID...
-     kill [-l | --list | -t | --table] [SIGNAL]...
+     kill [-s SIGNAL | --signal SIGNAL | -SIGNAL] PID…
+     kill [-l | --list | -t | --table] [SIGNAL]…
 
-   Due to shell aliases and built-in `kill' functions, using an
-unadorned `kill' interactively or in a script may get you different
-functionality than that described here.  Invoke it via `env' (i.e.,
-`env kill ...') to avoid interference from the shell.
+   Due to shell aliases and built-in ‘kill’ functions, using an
+unadorned ‘kill’ interactively or in a script may get you different
+functionality than that described here.  Invoke it via ‘env’ (i.e., ‘env
+kill …’) to avoid interference from the shell.
 
-   The first form of the `kill' command sends a signal to all PID
-arguments.  The default signal to send if none is specified is `TERM'.
-The special signal number `0' does not denote a valid signal, but can
-be used to test whether the PID arguments specify processes to which a
+   The first form of the ‘kill’ command sends a signal to all PID
+arguments.  The default signal to send if none is specified is ‘TERM’.
+The special signal number ‘0’ does not denote a valid signal, but can be
+used to test whether the PID arguments specify processes to which a
 signal could be sent.
 
    If PID is positive, the signal is sent to the process with the
 process ID PID.  If PID is zero, the signal is sent to all processes in
-the process group of the current process.  If PID is -1, the signal is
+the process group of the current process.  If PID is −1, the signal is
 sent to all processes for which the user has permission to send a
-signal.  If PID is less than -1, the signal is sent to all processes in
+signal.  If PID is less than −1, the signal is sent to all processes in
 the process group that equals the absolute value of PID.
 
-   If PID is not positive, a system-dependent set of system processes
-is excluded from the list of processes to which the signal is sent.
+   If PID is not positive, a system-dependent set of system processes is
+excluded from the list of processes to which the signal is sent.
 
    If a negative PID argument is desired as the first one, it should be
-preceded by `--'.  However, as a common extension to POSIX, `--' is not
-required with `kill -SIGNAL -PID'.  The following commands are
+preceded by ‘--’.  However, as a common extension to POSIX, ‘--’ is not
+required with ‘kill -SIGNAL -PID’.  The following commands are
 equivalent:
 
      kill -15 -1
@@ -13354,26 +13253,25 @@ equivalent:
      kill -s TERM -- -1
      kill -- -1
 
-   The first form of the `kill' command succeeds if every PID argument
+   The first form of the ‘kill’ command succeeds if every PID argument
 specifies at least one process that the signal was sent to.
 
-   The second form of the `kill' command lists signal information.
-Either the `-l' or `--list' option, or the `-t' or `--table' option
-must be specified.  Without any SIGNAL argument, all supported signals
-are listed.  The output of `-l' or `--list' is a list of the signal
-names, one per line; if SIGNAL is already a name, the signal number is
-printed instead.  The output of `-t' or `--table' is a table of signal
-numbers, names, and descriptions.  This form of the `kill' command
-succeeds if all SIGNAL arguments are valid and if there is no output
-error.
-
-   The `kill' command also supports the `--help' and `--version'
+   The second form of the ‘kill’ command lists signal information.
+Either the ‘-l’ or ‘--list’ option, or the ‘-t’ or ‘--table’ option must
+be specified.  Without any SIGNAL argument, all supported signals are
+listed.  The output of ‘-l’ or ‘--list’ is a list of the signal names,
+one per line; if SIGNAL is already a name, the signal number is printed
+instead.  The output of ‘-t’ or ‘--table’ is a table of signal numbers,
+names, and descriptions.  This form of the ‘kill’ command succeeds if
+all SIGNAL arguments are valid and if there is no output error.
+
+   The ‘kill’ command also supports the ‘--help’ and ‘--version’
 options.  *Note Common options::.
 
-   A SIGNAL may be a signal name like `HUP', or a signal number like
-`1', or an exit status of a process terminated by the signal.  A signal
-name can be given in canonical form or prefixed by `SIG'.  The case of
-the letters is ignored, except for the `-SIGNAL' option which must use
+   A SIGNAL may be a signal name like ‘HUP’, or a signal number like
+‘1’, or an exit status of a process terminated by the signal.  A signal
+name can be given in canonical form or prefixed by ‘SIG’.  The case of
+the letters is ignored, except for the ‘-SIGNAL’ option which must use
 upper case to avoid ambiguity with lower case option letters.  *Note
 Signal specifications::, for a list of supported signal names and
 numbers.
@@ -13391,41 +13289,38 @@ File: coreutils.info,  Node: Delaying,  Next: Numeric operations,  Prev: Process
 
 File: coreutils.info,  Node: sleep invocation,  Up: Delaying
 
-25.1 `sleep': Delay for a specified time
+25.1 ‘sleep’: Delay for a specified time
 ========================================
 
-`sleep' pauses for an amount of time specified by the sum of the values
+‘sleep’ pauses for an amount of time specified by the sum of the values
 of the command line arguments.  Synopsis:
 
-     sleep NUMBER[smhd]...
+     sleep NUMBER[smhd]…
 
    Each argument is a number followed by an optional unit; the default
 is seconds.  The units are:
 
-`s'
+‘s’
      seconds
-
-`m'
+‘m’
      minutes
-
-`h'
+‘h’
      hours
-
-`d'
+‘d’
      days
 
-   Historical implementations of `sleep' have required that NUMBER be
-an integer, and only accepted a single argument without a suffix.
-However, GNU `sleep' accepts arbitrary floating point numbers.  *Note
-Floating point::.
+   Historical implementations of ‘sleep’ have required that NUMBER be an
+integer, and only accepted a single argument without a suffix.  However,
+GNU ‘sleep’ accepts arbitrary floating point numbers.  *Note Floating
+point::.
 
-   The only options are `--help' and `--version'.  *Note Common
+   The only options are ‘--help’ and ‘--version’.  *Note Common
 options::.
 
-   Due to shell aliases and built-in `sleep' functions, using an
-unadorned `sleep' interactively or in a script may get you different
-functionality than that described here.  Invoke it via `env' (i.e.,
-`env sleep ...') to avoid interference from the shell.
+   Due to shell aliases and built-in ‘sleep’ functions, using an
+unadorned ‘sleep’ interactively or in a script may get you different
+functionality than that described here.  Invoke it via ‘env’ (i.e., ‘env
+sleep …’) to avoid interference from the shell.
 
    An exit status of zero indicates success, and a nonzero value
 indicates failure.
@@ -13446,24 +13341,24 @@ These programs do numerically-related operations.
 
 File: coreutils.info,  Node: factor invocation,  Next: seq invocation,  Up: Numeric operations
 
-26.1 `factor': Print prime factors
+26.1 ‘factor’: Print prime factors
 ==================================
 
-`factor' prints prime factors.  Synopses:
+‘factor’ prints prime factors.  Synopses:
 
-     factor [NUMBER]...
+     factor [NUMBER]…
      factor OPTION
 
-   If no NUMBER is specified on the command line, `factor' reads
-numbers from standard input, delimited by newlines, tabs, or spaces.
+   If no NUMBER is specified on the command line, ‘factor’ reads numbers
+from standard input, delimited by newlines, tabs, or spaces.
 
-   The `factor' command supports only a small number of options:
+   The ‘factor’ command supports only a small number of options:
 
-`--help'
+‘--help’
      Print a short help on standard output, then exit without further
      processing.
 
-`--version'
+‘--version’
      Print the program version on standard output, then exit without
      further processing.
 
@@ -13477,17 +13372,17 @@ about 30 milliseconds of CPU time on a 2.2 GHz Athlon.
      4951760154835678088235319297: 2147483647 2305843009213693951
      0.03
 
-   Similarly, factoring the eighth Fermat number 2^256+1 takes about 20
-seconds on the same machine.
+   Similarly, factoring the eighth Fermat number 2^{256}+1 takes about
+20 seconds on the same machine.
 
    Factoring large numbers is, in general, hard.  The Pollard Rho
-algorithm used by `factor' is particularly effective for numbers with
+algorithm used by ‘factor’ is particularly effective for numbers with
 relatively small factors.  If you wish to factor large numbers which do
 not have small factors (for example, numbers which are the product of
 two large primes), other methods are far better.
 
-   If `factor' is built without using GNU MP, only single-precision
-arithmetic is available, and so large numbers (typically 2^64 and
+   If ‘factor’ is built without using GNU MP, only single-precision
+arithmetic is available, and so large numbers (typically 2^{64} and
 above) will not be supported.  The single-precision code uses an
 algorithm which is designed for factoring smaller numbers.
 
@@ -13497,63 +13392,62 @@ indicates failure.
 
 File: coreutils.info,  Node: seq invocation,  Prev: factor invocation,  Up: Numeric operations
 
-26.2 `seq': Print numeric sequences
+26.2 ‘seq’: Print numeric sequences
 ===================================
 
-`seq' prints a sequence of numbers to standard output.  Synopses:
+‘seq’ prints a sequence of numbers to standard output.  Synopses:
 
-     seq [OPTION]... LAST
-     seq [OPTION]... FIRST LAST
-     seq [OPTION]... FIRST INCREMENT LAST
+     seq [OPTION]… LAST
+     seq [OPTION]… FIRST LAST
+     seq [OPTION]… FIRST INCREMENT LAST
 
-   `seq' prints the numbers from FIRST to LAST by INCREMENT.  By
+   ‘seq’ prints the numbers from FIRST to LAST by INCREMENT.  By
 default, each number is printed on a separate line.  When INCREMENT is
-not specified, it defaults to `1', even when FIRST is larger than LAST.
-FIRST also defaults to `1'.  So `seq 1' prints `1', but `seq 0' and
-`seq 10 5' produce no output.  Floating-point numbers may be specified.
+not specified, it defaults to ‘1’, even when FIRST is larger than LAST.
+FIRST also defaults to ‘1’.  So ‘seq 1’ prints ‘1’, but ‘seq 0’ and ‘seq
+10 5’ produce no output.  The sequence of numbers ends when the sum of
+the current number and INCREMENT would become greater than LAST, so ‘seq
+1 10 10’ only produces ‘1’.  Floating-point numbers may be specified.
 *Note Floating point::.
 
    The program accepts the following options.  Also see *note Common
 options::.  Options must precede operands.
 
-`-f FORMAT'
-`--format=FORMAT'
-     Print all numbers using FORMAT.  FORMAT must contain exactly one
-     of the `printf'-style floating point conversion specifications
-     `%a', `%e', `%f', `%g', `%A', `%E', `%F', `%G'.  The `%' may be
-     followed by zero or more flags taken from the set `-+#0 '', then
-     an optional width containing one or more digits, then an optional
-     precision consisting of a `.' followed by zero or more digits.
-     FORMAT may also contain any number of `%%' conversion
-     specifications.  All conversion specifications have the same
-     meaning as with `printf'.
-
-     The default format is derived from FIRST, STEP, and LAST.  If
-     these all use a fixed point decimal representation, the default
-     format is `%.Pf', where P is the minimum precision that can
-     represent the output numbers exactly.  Otherwise, the default
-     format is `%g'.
-
-`-s STRING'
-`--separator=STRING'
+‘-f FORMAT’
+‘--format=FORMAT’
+     Print all numbers using FORMAT.  FORMAT must contain exactly one of
+     the ‘printf’-style floating point conversion specifications ‘%a’,
+     ‘%e’, ‘%f’, ‘%g’, ‘%A’, ‘%E’, ‘%F’, ‘%G’.  The ‘%’ may be followed
+     by zero or more flags taken from the set ‘-+#0 '’, then an optional
+     width containing one or more digits, then an optional precision
+     consisting of a ‘.’ followed by zero or more digits.  FORMAT may
+     also contain any number of ‘%%’ conversion specifications.  All
+     conversion specifications have the same meaning as with ‘printf’.
+
+     The default format is derived from FIRST, STEP, and LAST.  If these
+     all use a fixed point decimal representation, the default format is
+     ‘%.Pf’, where P is the minimum precision that can represent the
+     output numbers exactly.  Otherwise, the default format is ‘%g’.
+
+‘-s STRING’
+‘--separator=STRING’
      Separate numbers with STRING; default is a newline.  The output
      always terminates with a newline.
 
-`-w'
-`--equal-width'
+‘-w’
+‘--equal-width’
      Print all numbers with the same width, by padding with leading
      zeros.  FIRST, STEP, and LAST should all use a fixed point decimal
-     representation.  (To have other kinds of padding, use `--format').
-
+     representation.  (To have other kinds of padding, use ‘--format’).
 
-   You can get finer-grained control over output with `-f':
+   You can get finer-grained control over output with ‘-f’:
 
      $ seq -f '(%9.2E)' -9e5 1.1e6 1.3e6
      (-9.00E+05)
      ( 2.00E+05)
      ( 1.30E+06)
 
-   If you want hexadecimal integer output, you can use `printf' to
+   If you want hexadecimal integer output, you can use ‘printf’ to
 perform the conversion:
 
      $ printf '%x\n' $(seq 1048575 1024 1050623)
@@ -13561,21 +13455,21 @@ perform the conversion:
      1003ff
      1007ff
 
-   For very long lists of numbers, use xargs to avoid system
-limitations on the length of an argument list:
+   For very long lists of numbers, use xargs to avoid system limitations
+on the length of an argument list:
 
      $ seq 1000000 | xargs printf '%x\n' | tail -n 3
      f423e
      f423f
      f4240
 
-   To generate octal output, use the printf `%o' format instead of `%x'.
+   To generate octal output, use the printf ‘%o’ format instead of ‘%x’.
 
    On most systems, seq can produce whole-number output for values up to
-at least 2^53.  Larger integers are approximated.  The details differ
+at least 2^{53}.  Larger integers are approximated.  The details differ
 depending on your floating-point implementation.  *Note Floating
-point::.  A common case is that `seq' works with integers through 2^64,
-and larger integers may not be numerically correct:
+point::.  A common case is that ‘seq’ works with integers through
+2^{64}, and larger integers may not be numerically correct:
 
      $ seq 50000000000000000000 2 50000000000000000004
      50000000000000000000
@@ -13586,10 +13480,10 @@ and larger integers may not be numerically correct:
 increment of 1 and no format-specifying option, seq can print
 arbitrarily large numbers.
 
-   Be careful when using `seq' with outlandish values: otherwise you
-may see surprising results, as `seq' uses floating point internally.
-For example, on the x86 platform, where the internal representation
-uses a 64-bit fraction, the command:
+   Be careful when using ‘seq’ with outlandish values: otherwise you may
+see surprising results, as ‘seq’ uses floating point internally.  For
+example, on the x86 platform, where the internal representation uses a
+64-bit fraction, the command:
 
      seq 1 0.0000000000000000001 1.0000000000000000009
 
@@ -13604,8 +13498,8 @@ File: coreutils.info,  Node: File permissions,  Next: Date input formats,  Prev:
 27 File permissions
 *******************
 
-Each file has a set of "file mode bits" that control the kinds of
-access that users have to that file.  They can be represented either in
+Each file has a set of "file mode bits" that control the kinds of access
+that users have to that file.  They can be represented either in
 symbolic form or as an octal number.
 
 * Menu:
@@ -13630,10 +13524,8 @@ affect only some files.
 
   1. permission to read the file.  For directories, this means
      permission to list the contents of the directory.
-
   2. permission to write to (change) the file.  For directories, this
      means permission to create and remove files in the directory.
-
   3. permission to execute the file (run it as a program).  For
      directories, this means permission to access files in the
      directory.
@@ -13641,70 +13533,65 @@ affect only some files.
    There are three categories of users who may have different
 permissions to perform any of the above operations on a file:
 
-  1. the file's owner;
-
-  2. other users who are in the file's group;
-
+  1. the file’s owner;
+  2. other users who are in the file’s group;
   3. everyone else.
 
    Files are given an owner and group when they are created.  Usually
 the owner is the current user and the group is the group of the
 directory the file is in, but this varies with the operating system, the
 file system the file is created on, and the way the file is created.
-You can change the owner and group of a file by using the `chown' and
-`chgrp' commands.
+You can change the owner and group of a file by using the ‘chown’ and
+‘chgrp’ commands.
 
    In addition to the three sets of three permissions listed above, the
 file mode bits have three special components, which affect only
 executable files (programs) and, on most systems, directories:
 
-  1. Set the process's effective user ID to that of the file upon
+  1. Set the process’s effective user ID to that of the file upon
      execution (called the "set-user-ID bit", or sometimes the "setuid
-     bit").  For directories on a few systems, give files created in
-     the directory the same owner as the directory, no matter who
-     creates them, and set the set-user-ID bit of newly-created
-     subdirectories.
-
-  2. Set the process's effective group ID to that of the file upon
+     bit").  For directories on a few systems, give files created in the
+     directory the same owner as the directory, no matter who creates
+     them, and set the set-user-ID bit of newly-created subdirectories.
+  2. Set the process’s effective group ID to that of the file upon
      execution (called the "set-group-ID bit", or sometimes the "setgid
      bit").  For directories on most systems, give files created in the
-     directory the same group as the directory, no matter what group
-     the user who creates them is in, and set the set-group-ID bit of
+     directory the same group as the directory, no matter what group the
+     user who creates them is in, and set the set-group-ID bit of
      newly-created subdirectories.
-
   3. Prevent unprivileged users from removing or renaming a file in a
-     directory unless they own the file or the directory; this is
-     called the "restricted deletion flag" for the directory, and is
-     commonly found on world-writable directories like `/tmp'.
+     directory unless they own the file or the directory; this is called
+     the "restricted deletion flag" for the directory, and is commonly
+     found on world-writable directories like ‘/tmp’.
 
-     For regular files on some older systems, save the program's text
+     For regular files on some older systems, save the program’s text
      image on the swap device so it will load more quickly when run;
      this is called the "sticky bit".
 
    In addition to the file mode bits listed above, there may be file
 attributes specific to the file system, e.g., access control lists
 (ACLs), whether a file is compressed, whether a file can be modified
-(immutability), and whether a file can be dumped.  These are usually
-set using programs specific to the file system.  For example:
+(immutability), and whether a file can be dumped.  These are usually set
+using programs specific to the file system.  For example:
 
 ext2
      On GNU and GNU/Linux the file attributes specific to the ext2 file
-     system are set using `chattr'.
+     system are set using ‘chattr’.
 
 FFS
      On FreeBSD the file flags specific to the FFS file system are set
-     using `chflags'.
+     using ‘chflags’.
 
-   Even if a file's mode bits allow an operation on that file, that
+   Even if a file’s mode bits allow an operation on that file, that
 operation may still fail, because:
 
-   * the file-system-specific attributes or flags do not permit it; or
+   • the file-system-specific attributes or flags do not permit it; or
 
-   * the file system is mounted as read-only.
+   • the file system is mounted as read-only.
 
    For example, if the immutable attribute is set on a file, it cannot
-be modified, regardless of the fact that you may have just run `chmod
-a+w FILE'.
+be modified, regardless of the fact that you may have just run ‘chmod
+a+w FILE’.
 
 
 File: coreutils.info,  Node: Symbolic Modes,  Next: Numeric Modes,  Prev: Mode Structure,  Up: File permissions
@@ -13712,18 +13599,18 @@ File: coreutils.info,  Node: Symbolic Modes,  Next: Numeric Modes,  Prev: Mode S
 27.2 Symbolic Modes
 ===================
 
-"Symbolic modes" represent changes to files' mode bits as operations on
+"Symbolic modes" represent changes to files’ mode bits as operations on
 single-character symbols.  They allow you to modify either all or
-selected parts of files' mode bits, optionally based on their previous
-values, and perhaps on the current `umask' as well (*note Umask and
+selected parts of files’ mode bits, optionally based on their previous
+values, and perhaps on the current ‘umask’ as well (*note Umask and
 Protection::).
 
    The format of symbolic modes is:
 
-     [ugoa...][+-=]PERMS...[,...]
+     [ugoa…][-+=]PERMS…[,…]
 
-where PERMS is either zero or more letters from the set `rwxXst', or a
-single letter from the set `ugo'.
+where PERMS is either zero or more letters from the set ‘rwxXst’, or a
+single letter from the set ‘ugo’.
 
    The following sections describe the operators and other details of
 symbolic modes.
@@ -13743,7 +13630,7 @@ File: coreutils.info,  Node: Setting Permissions,  Next: Copying Permissions,  U
 27.2.1 Setting Permissions
 --------------------------
 
-The basic symbolic operations on a file's permissions are adding,
+The basic symbolic operations on a file’s permissions are adding,
 removing, and setting the permission that certain users have to read,
 write, and execute or search the file.  These operations have the
 following format:
@@ -13753,53 +13640,46 @@ following format:
 The spaces between the three parts above are shown for readability only;
 symbolic modes cannot contain spaces.
 
-   The USERS part tells which users' access to the file is changed.  It
+   The USERS part tells which users’ access to the file is changed.  It
 consists of one or more of the following letters (or it can be empty;
 *note Umask and Protection::, for a description of what happens then).
-When more than one of these letters is given, the order that they are
-in does not matter.
+When more than one of these letters is given, the order that they are in
+does not matter.
 
-`u'
+‘u’
      the user who owns the file;
-
-`g'
-     other users who are in the file's group;
-
-`o'
+‘g’
+     other users who are in the file’s group;
+‘o’
      all other users;
+‘a’
+     all users; the same as ‘ugo’.
 
-`a'
-     all users; the same as `ugo'.
-
-   The OPERATION part tells how to change the affected users' access to
+   The OPERATION part tells how to change the affected users’ access to
 the file, and is one of the following symbols:
 
-`+'
+‘+’
      to add the PERMISSIONS to whatever permissions the USERS already
      have for the file;
-
-`-'
+‘-’
      to remove the PERMISSIONS from whatever permissions the USERS
      already have for the file;
-
-`='
+‘=’
      to make the PERMISSIONS the only permissions that the USERS have
      for the file.
 
    The PERMISSIONS part tells what kind of access to the file should be
 changed; it is normally zero or more of the following letters.  As with
 the USERS part, the order does not matter when more than one letter is
-given.  Omitting the PERMISSIONS part is useful only with the `='
+given.  Omitting the PERMISSIONS part is useful only with the ‘=’
 operation, where it gives the specified USERS no access at all to the
 file.
 
-`r'
+‘r’
      the permission the USERS have to read the file;
-
-`w'
+‘w’
      the permission the USERS have to write to the file;
-
-`x'
+‘x’
      the permission the USERS have to execute the file, or search it if
      it is a directory.
 
@@ -13808,8 +13688,8 @@ file, but not to execute it, use:
 
      a=rw
 
-   To remove write permission for all users other than the file's
-owner, use:
+   To remove write permission for all users other than the file’s owner,
+use:
 
      go-w
 
@@ -13817,7 +13697,7 @@ The above command does not affect the access that the owner of the file
 has to it, nor does it affect whether other users can read or execute
 the file.
 
-   To give everyone except a file's owner no permission to do anything
+   To give everyone except a file’s owner no permission to do anything
 with that file, use the mode below.  Other users could still remove the
 file, if they have write permission on the directory it is in.
 
@@ -13833,18 +13713,18 @@ File: coreutils.info,  Node: Copying Permissions,  Next: Changing Special Mode B
 27.2.2 Copying Existing Permissions
 -----------------------------------
 
-You can base a file's permissions on its existing permissions.  To do
-this, instead of using a series of `r', `w', or `x' letters after the
-operator, you use the letter `u', `g', or `o'.  For example, the mode
+You can base a file’s permissions on its existing permissions.  To do
+this, instead of using a series of ‘r’, ‘w’, or ‘x’ letters after the
+operator, you use the letter ‘u’, ‘g’, or ‘o’.  For example, the mode
 
      o+g
 
-adds the permissions for users who are in a file's group to the
+adds the permissions for users who are in a file’s group to the
 permissions that other users have for the file.  Thus, if the file
-started out as mode 664 (`rw-rw-r--'), the above mode would change it
-to mode 666 (`rw-rw-rw-').  If the file had started out as mode 741
-(`rwxr----x'), the above mode would change it to mode 745
-(`rwxr--r-x').  The `-' and `=' operations work analogously.
+started out as mode 664 (‘rw-rw-r--’), the above mode would change it to
+mode 666 (‘rw-rw-rw-’).  If the file had started out as mode 741
+(‘rwxr----x’), the above mode would change it to mode 745 (‘rwxr--r-x’).
+The ‘-’ and ‘=’ operations work analogously.
 
 
 File: coreutils.info,  Node: Changing Special Mode Bits,  Next: Conditional Executability,  Prev: Copying Permissions,  Up: Symbolic Modes
@@ -13852,24 +13732,23 @@ File: coreutils.info,  Node: Changing Special Mode Bits,  Next: Conditional Exec
 27.2.3 Changing Special Mode Bits
 ---------------------------------
 
-In addition to changing a file's read, write, and execute/search
+In addition to changing a file’s read, write, and execute/search
 permissions, you can change its special mode bits.  *Note Mode
 Structure::, for a summary of these special mode bits.
 
-   To change the file mode bits to set the user ID on execution, use
-`u' in the USERS part of the symbolic mode and `s' in the PERMISSIONS
-part.
+   To change the file mode bits to set the user ID on execution, use ‘u’
+in the USERS part of the symbolic mode and ‘s’ in the PERMISSIONS part.
 
    To change the file mode bits to set the group ID on execution, use
-`g' in the USERS part of the symbolic mode and `s' in the PERMISSIONS
+‘g’ in the USERS part of the symbolic mode and ‘s’ in the PERMISSIONS
 part.
 
    To set both user and group ID on execution, omit the USERS part of
-the symbolic mode (or use `a') and use `s' in the PERMISSIONS part.
+the symbolic mode (or use ‘a’) and use ‘s’ in the PERMISSIONS part.
 
    To change the file mode bits to set the restricted deletion flag or
-sticky bit, omit the USERS part of the symbolic mode (or use `a') and
-use `t' in the PERMISSIONS part.
+sticky bit, omit the USERS part of the symbolic mode (or use ‘a’) and
+use ‘t’ in the PERMISSIONS part.
 
    For example, to set the set-user-ID mode bit of a program, you can
 use the mode:
@@ -13886,18 +13765,17 @@ mode:
 
      +t
 
-   The combination `o+s' has no effect.  On GNU systems the
-combinations `u+t' and `g+t' have no effect, and `o+t' acts like plain
-`+t'.
+   The combination ‘o+s’ has no effect.  On GNU systems the combinations
+‘u+t’ and ‘g+t’ have no effect, and ‘o+t’ acts like plain ‘+t’.
 
-   The `=' operator is not very useful with special mode bits.  For
+   The ‘=’ operator is not very useful with special mode bits.  For
 example, the mode:
 
      o=t
 
-does set the restricted deletion flag or sticky bit, but it also
-removes all read, write, and execute/search permissions that users not
-in the file's group might have had for it.
+does set the restricted deletion flag or sticky bit, but it also removes
+all read, write, and execute/search permissions that users not in the
+file’s group might have had for it.
 
    *Note Directory Setuid and Setgid::, for additional rules concerning
 set-user-ID and set-group-ID bits and directories.
@@ -13908,8 +13786,8 @@ File: coreutils.info,  Node: Conditional Executability,  Next: Multiple Changes,
 27.2.4 Conditional Executability
 --------------------------------
 
-There is one more special type of symbolic permission: if you use `X'
-instead of `x', execute/search permission is affected only if the file
+There is one more special type of symbolic permission: if you use ‘X’
+instead of ‘x’, execute/search permission is affected only if the file
 is a directory or already had execute permission.
 
    For example, this mode:
@@ -13927,7 +13805,7 @@ File: coreutils.info,  Node: Multiple Changes,  Next: Umask and Protection,  Pre
 
 The format of symbolic modes is actually more complex than described
 above (*note Setting Permissions::).  It provides two ways to make
-multiple changes to files' mode bits.
+multiple changes to files’ mode bits.
 
    The first way is to specify multiple OPERATION and PERMISSIONS parts
 after a USERS part in the symbolic mode.
@@ -13937,11 +13815,10 @@ after a USERS part in the symbolic mode.
      og+rX-w
 
 gives users other than the owner of the file read permission and, if it
-is a directory or if someone already had execute permission to it,
-gives them execute/search permission; and it also denies them write
-permission to the file.  It does not affect the permission that the
-owner of the file has for it.  The above mode is equivalent to the two
-modes:
+is a directory or if someone already had execute permission to it, gives
+them execute/search permission; and it also denies them write permission
+to the file.  It does not affect the permission that the owner of the
+file has for it.  The above mode is equivalent to the two modes:
 
      og+rX
      og-w
@@ -13957,14 +13834,14 @@ on it for all users except its owner.  Another example:
      u=rwx,g=rx,o=
 
 sets all of the permission bits for the file explicitly.  (It gives
-users who are not in the file's group no permission at all for it.)
+users who are not in the file’s group no permission at all for it.)
 
    The two methods can be combined.  The mode:
 
      a+r,g+x-w
 
 gives all users permission to read the file, and gives users who are in
-the file's group permission to execute/search it as well, but not
+the file’s group permission to execute/search it as well, but not
 permission to write to it.  The above mode could be written in several
 different ways; another is:
 
@@ -13976,29 +13853,29 @@ File: coreutils.info,  Node: Umask and Protection,  Prev: Multiple Changes,  Up:
 27.2.6 The Umask and Protection
 -------------------------------
 
-If the USERS part of a symbolic mode is omitted, it defaults to `a'
+If the USERS part of a symbolic mode is omitted, it defaults to ‘a’
 (affect all users), except that any permissions that are _set_ in the
-system variable `umask' are _not affected_.  The value of `umask' can
-be set using the `umask' command.  Its default value varies from system
-to system.
+system variable ‘umask’ are _not affected_.  The value of ‘umask’ can be
+set using the ‘umask’ command.  Its default value varies from system to
+system.
 
    Omitting the USERS part of a symbolic mode is generally not useful
-with operations other than `+'.  It is useful with `+' because it
-allows you to use `umask' as an easily customizable protection against
-giving away more permission to files than you intended to.
+with operations other than ‘+’.  It is useful with ‘+’ because it allows
+you to use ‘umask’ as an easily customizable protection against giving
+away more permission to files than you intended to.
 
-   As an example, if `umask' has the value 2, which removes write
-permission for users who are not in the file's group, then the mode:
+   As an example, if ‘umask’ has the value 2, which removes write
+permission for users who are not in the file’s group, then the mode:
 
      +w
 
 adds permission to write to the file to its owner and to other users who
-are in the file's group, but _not_ to other users.  In contrast, the
+are in the file’s group, but _not_ to other users.  In contrast, the
 mode:
 
      a+w
 
-ignores `umask', and _does_ give write permission for the file to all
+ignores ‘umask’, and _does_ give write permission for the file to all
 users.
 
 
@@ -14007,12 +13884,12 @@ File: coreutils.info,  Node: Numeric Modes,  Next: Operator Numeric Modes,  Prev
 27.3 Numeric Modes
 ==================
 
-As an alternative to giving a symbolic mode, you can give an octal
-(base 8) number that represents the mode.  This number is always
-interpreted in octal; you do not have to add a leading `0', as you do
-in C.  Mode `0055' is the same as mode `55'.  (However, modes of five
-digits or more, such as `00055', are sometimes special.  *Note
-Directory Setuid and Setgid::.)
+As an alternative to giving a symbolic mode, you can give an octal (base
+8) number that represents the mode.  This number is always interpreted
+in octal; you do not have to add a leading ‘0’, as you do in C. Mode
+‘0055’ is the same as mode ‘55’.  (However, modes of five digits or
+more, such as ‘00055’, are sometimes special.  *Note Directory Setuid
+and Setgid::.)
 
    A numeric mode is usually shorter than the corresponding symbolic
 mode, but it is limited in that normally it cannot take into account the
@@ -14022,8 +13899,8 @@ this general limitation.  *Note Directory Setuid and Setgid::.  Also,
 operator numeric modes can take previous file mode bits into account.
 *Note Operator Numeric Modes::.
 
-   The permissions granted to the user, to other users in the file's
-group, and to other users not in the file's group each require three
+   The permissions granted to the user, to other users in the file’s
+group, and to other users not in the file’s group each require three
 bits, which are represented as one octal digit.  The three special mode
 bits also require one bit each, and they are as a group represented as
 another octal digit.  Here is how the bits are arranged, starting with
@@ -14052,9 +13929,9 @@ the lowest valued bit:
      2000      Set group ID on execution
      4000      Set user ID on execution
 
-   For example, numeric mode `4755' corresponds to symbolic mode
-`u=rwxs,go=rx', and numeric mode `664' corresponds to symbolic mode
-`ug=rw,o=r'.  Numeric mode `0' corresponds to symbolic mode `a='.
+   For example, numeric mode ‘4755’ corresponds to symbolic mode
+‘u=rwxs,go=rx’, and numeric mode ‘664’ corresponds to symbolic mode
+‘ug=rw,o=r’.  Numeric mode ‘0’ corresponds to symbolic mode ‘a=’.
 
 
 File: coreutils.info,  Node: Operator Numeric Modes,  Next: Directory Setuid and Setgid,  Prev: Numeric Modes,  Up: File permissions
@@ -14062,18 +13939,17 @@ File: coreutils.info,  Node: Operator Numeric Modes,  Next: Directory Setuid and
 27.4 Operator Numeric Modes
 ===========================
 
-An operator numeric mode is a numeric mode that is prefixed by a `-',
-`+', or `=' operator, which has the same interpretation as in symbolic
-modes.  For example, `+440' enables read permission for the file's
-owner and group, `-1' disables execute permission for other users, and
-`=600' clears all permissions except for enabling read-write
-permissions for the file's owner.  Operator numeric modes can be
-combined with symbolic modes by separating them with a comma; for
-example, `=0,u+r' clears all permissions except for enabling read
-permission for the file's owner.
-
-   The commands `chmod =755 DIR' and `chmod 755 DIR' differ in that the
-former clears the directory DIR's setuid and setgid bits, whereas the
+An operator numeric mode is a numeric mode that is prefixed by a ‘-’,
+‘+’, or ‘=’ operator, which has the same interpretation as in symbolic
+modes.  For example, ‘+440’ enables read permission for the file’s owner
+and group, ‘-1’ disables execute permission for other users, and ‘=600’
+clears all permissions except for enabling read-write permissions for
+the file’s owner.  Operator numeric modes can be combined with symbolic
+modes by separating them with a comma; for example, ‘=0,u+r’ clears all
+permissions except for enabling read permission for the file’s owner.
+
+   The commands ‘chmod =755 DIR’ and ‘chmod 755 DIR’ differ in that the
+former clears the directory DIR’s setuid and setgid bits, whereas the
 latter preserves them.  *Note Directory Setuid and Setgid::.
 
    Operator numeric modes are a GNU extension.
@@ -14084,23 +13960,22 @@ File: coreutils.info,  Node: Directory Setuid and Setgid,  Prev: Operator Numeri
 27.5 Directories and the Set-User-ID and Set-Group-ID Bits
 ==========================================================
 
-On most systems, if a directory's set-group-ID bit is set, newly
-created subfiles inherit the same group as the directory, and newly
-created subdirectories inherit the set-group-ID bit of the parent
-directory.  On a few systems, a directory's set-user-ID bit has a
-similar effect on the ownership of new subfiles and the set-user-ID
-bits of new subdirectories.  These mechanisms let users share files
-more easily, by lessening the need to use `chmod' or `chown' to share
-new files.
+On most systems, if a directory’s set-group-ID bit is set, newly created
+subfiles inherit the same group as the directory, and newly created
+subdirectories inherit the set-group-ID bit of the parent directory.  On
+a few systems, a directory’s set-user-ID bit has a similar effect on the
+ownership of new subfiles and the set-user-ID bits of new
+subdirectories.  These mechanisms let users share files more easily, by
+lessening the need to use ‘chmod’ or ‘chown’ to share new files.
 
    These convenience mechanisms rely on the set-user-ID and set-group-ID
-bits of directories.  If commands like `chmod' and `mkdir' routinely
+bits of directories.  If commands like ‘chmod’ and ‘mkdir’ routinely
 cleared these bits on directories, the mechanisms would be less
 convenient and it would be harder to share files.  Therefore, a command
-like `chmod' does not affect the set-user-ID or set-group-ID bits of a
-directory unless the user specifically mentions them in a symbolic
-mode, or uses an operator numeric mode such as `=755', or sets them in
-a numeric mode, or clears them in a numeric mode that has five or more
+like ‘chmod’ does not affect the set-user-ID or set-group-ID bits of a
+directory unless the user specifically mentions them in a symbolic mode,
+or uses an operator numeric mode such as ‘=755’, or sets them in a
+numeric mode, or clears them in a numeric mode that has five or more
 octal digits.  For example, on systems that support set-group-ID
 inheritance:
 
@@ -14141,9 +14016,9 @@ specify a numeric mode with five or more octal digits, e.g.:
 
    This behavior is a GNU extension.  Portable scripts should not rely
 on requests to set or clear these bits on directories, as POSIX allows
-implementations to ignore these requests.  The GNU behavior with
-numeric modes of four or fewer digits is intended for scripts portable
-to systems that preserve these bits; the behavior with numeric modes of
+implementations to ignore these requests.  The GNU behavior with numeric
+modes of four or fewer digits is intended for scripts portable to
+systems that preserve these bits; the behavior with numeric modes of
 five or more digits is for scripts portable to systems that do not
 preserve the bits.
 
@@ -14158,10 +14033,10 @@ First, a quote:
      Our units of temporal measurement, from seconds on up to months,
      are so complicated, asymmetrical and disjunctive so as to make
      coherent mental reckoning in time all but impossible.  Indeed, had
-     some tyrannical god contrived to enslave our minds to time, to
-     make it all but impossible for us to escape subjection to sodden
-     routines and unpleasant surprises, he could hardly have done
-     better than handing down our present system.  It is like a set of
+     some tyrannical god contrived to enslave our minds to time, to make
+     it all but impossible for us to escape subjection to sodden
+     routines and unpleasant surprises, he could hardly have done better
+     than handing down our present system.  It is like a set of
      trapezoidal building blocks, with no vertical or horizontal
      surfaces, like a language in which the simplest thought demands
      ornate constructions, useless particles and lengthy
@@ -14170,26 +14045,26 @@ First, a quote:
      level-headedly, our system of temporal calculation silently and
      persistently encourages our terror of time.
 
-     ...  It is as though architects had to measure length in feet,
-     width in meters and height in ells; as though basic instruction
-     manuals demanded a knowledge of five different languages.  It is
-     no wonder then that we often look into our own immediate past or
-     future, last Tuesday or a week from Sunday, with feelings of
-     helpless confusion.  ...
+     … It is as though architects had to measure length in feet, width
+     in meters and height in ells; as though basic instruction manuals
+     demanded a knowledge of five different languages.  It is no wonder
+     then that we often look into our own immediate past or future, last
+     Tuesday or a week from Sunday, with feelings of helpless confusion.
+     …
 
-     --Robert Grudin, `Time and the Art of Living'.
+     —Robert Grudin, ‘Time and the Art of Living’.
 
    This section describes the textual date representations that GNU
 programs accept.  These are the strings you, as a user, can supply as
 arguments to the various programs.  The C interface (via the
-`parse_datetime' function) is not described here.
+‘parse_datetime’ function) is not described here.
 
 * Menu:
 
 * General date syntax::            Common rules.
 * Calendar date items::            19 Dec 1994.
 * Time of day items::              9:20pm.
-* Time zone items::                EST, PDT, UTC, ...
+* Time zone items::                EST, PDT, UTC, …
 * Combined date and time of day items:: 1972-09-24T20:02:00,000000-0500.
 * Day of week items::              Monday and others.
 * Relative items in date strings:: next tuesday, 2 years ago.
@@ -14204,52 +14079,46 @@ File: coreutils.info,  Node: General date syntax,  Next: Calendar date items,  U
 28.1 General date syntax
 ========================
 
-A "date" is a string, possibly empty, containing many items separated
-by whitespace.  The whitespace may be omitted when no ambiguity arises.
+A "date" is a string, possibly empty, containing many items separated by
+whitespace.  The whitespace may be omitted when no ambiguity arises.
 The empty string means the beginning of today (i.e., midnight).  Order
 of the items is immaterial.  A date string may contain many flavors of
 items:
 
-   * calendar date items
-
-   * time of day items
-
-   * time zone items
-
-   * combined date and time of day items
-
-   * day of the week items
-
-   * relative items
-
-   * pure numbers.
+   • calendar date items
+   • time of day items
+   • time zone items
+   • combined date and time of day items
+   • day of the week items
+   • relative items
+   • pure numbers.
 
 We describe each of these item types in turn, below.
 
    A few ordinal numbers may be written out in words in some contexts.
 This is most useful for specifying day of the week items or relative
 items (see below).  Among the most commonly used ordinal numbers, the
-word `last' stands for -1, `this' stands for 0, and `first' and `next'
-both stand for 1.  Because the word `second' stands for the unit of
-time there is no way to write the ordinal number 2, but for convenience
-`third' stands for 3, `fourth' for 4, `fifth' for 5, `sixth' for 6,
-`seventh' for 7, `eighth' for 8, `ninth' for 9, `tenth' for 10,
-`eleventh' for 11 and `twelfth' for 12.
+word ‘last’ stands for -1, ‘this’ stands for 0, and ‘first’ and ‘next’
+both stand for 1.  Because the word ‘second’ stands for the unit of time
+there is no way to write the ordinal number 2, but for convenience
+‘third’ stands for 3, ‘fourth’ for 4, ‘fifth’ for 5, ‘sixth’ for 6,
+‘seventh’ for 7, ‘eighth’ for 8, ‘ninth’ for 9, ‘tenth’ for 10,
+‘eleventh’ for 11 and ‘twelfth’ for 12.
 
    When a month is written this way, it is still considered to be
-written numerically, instead of being "spelled in full"; this changes
+written numerically, instead of being “spelled in full�; this changes
 the allowed strings.
 
    In the current implementation, only English is supported for words
-and abbreviations like `AM', `DST', `EST', `first', `January',
-`Sunday', `tomorrow', and `year'.
+and abbreviations like ‘AM’, ‘DST’, ‘EST’, ‘first’, ‘January’, ‘Sunday’,
+‘tomorrow’, and ‘year’.
 
-   The output of the `date' command is not always acceptable as a date
-string, not only because of the language problem, but also because
-there is no standard meaning for time zone items like `IST'.  When using
-`date' to generate a date string intended to be parsed later, specify a
+   The output of the ‘date’ command is not always acceptable as a date
+string, not only because of the language problem, but also because there
+is no standard meaning for time zone items like ‘IST’.  When using
+‘date’ to generate a date string intended to be parsed later, specify a
 date format that is independent of language and that does not use time
-zone items other than `UTC' and `Z'.  Here are some ways to do this:
+zone items other than ‘UTC’ and ‘Z’.  Here are some ways to do this:
 
      $ LC_ALL=C TZ=UTC0 date
      Mon Mar  1 00:21:42 UTC 2004
@@ -14269,9 +14138,9 @@ introduced between round parentheses, as long as included parentheses
 are properly nested.  Hyphens not followed by a digit are currently
 ignored.  Leading zeros on numbers are ignored.
 
-   Invalid dates like `2005-02-29' or times like `24:00' are rejected.
-In the typical case of a host that does not support leap seconds, a
-time like `23:59:60' is rejected even if it corresponds to a valid leap
+   Invalid dates like ‘2005-02-29’ or times like ‘24:00’ are rejected.
+In the typical case of a host that does not support leap seconds, a time
+like ‘23:59:60’ is rejected even if it corresponds to a valid leap
 second.
 
 
@@ -14304,19 +14173,19 @@ is used, or the current year if none.  For example:
 
    Here are the rules.
 
-   For numeric months, the ISO 8601 format `YEAR-MONTH-DAY' is allowed,
+   For numeric months, the ISO 8601 format ‘YEAR-MONTH-DAY’ is allowed,
 where YEAR is any positive number, MONTH is a number between 01 and 12,
 and DAY is a number between 01 and 31.  A leading zero must be present
 if a number is less than ten.  If YEAR is 68 or smaller, then 2000 is
 added to it; otherwise, if YEAR is less than 100, then 1900 is added to
-it.  The construct `MONTH/DAY/YEAR', popular in the United States, is
-accepted.  Also `MONTH/DAY', omitting the year.
+it.  The construct ‘MONTH/DAY/YEAR’, popular in the United States, is
+accepted.  Also ‘MONTH/DAY’, omitting the year.
 
-   Literal months may be spelled out in full: `January', `February',
-`March', `April', `May', `June', `July', `August', `September',
-`October', `November' or `December'.  Literal months may be abbreviated
+   Literal months may be spelled out in full: ‘January’, ‘February’,
+‘March’, ‘April’, ‘May’, ‘June’, ‘July’, ‘August’, ‘September’,
+‘October’, ‘November’ or ‘December’.  Literal months may be abbreviated
 to their first three letters, possibly followed by an abbreviating dot.
-It is also permitted to write `Sept' instead of `September'.
+It is also permitted to write ‘Sept’ instead of ‘September’.
 
    When months are written literally, the calendar date may be given as
 any of the following:
@@ -14344,36 +14213,35 @@ Here are some examples, all of which represent the same time:
      8:02pm
      20:02-0500      # In EST (U.S. Eastern Standard Time).
 
-   More generally, the time of day may be given as
-`HOUR:MINUTE:SECOND', where HOUR is a number between 0 and 23, MINUTE
-is a number between 0 and 59, and SECOND is a number between 0 and 59
-possibly followed by `.' or `,' and a fraction containing one or more
-digits.  Alternatively, `:SECOND' can be omitted, in which case it is
-taken to be zero.  On the rare hosts that support leap seconds, SECOND
-may be 60.
-
-   If the time is followed by `am' or `pm' (or `a.m.' or `p.m.'), HOUR
-is restricted to run from 1 to 12, and `:MINUTE' may be omitted (taken
-to be zero).  `am' indicates the first half of the day, `pm' indicates
+   More generally, the time of day may be given as ‘HOUR:MINUTE:SECOND’,
+where HOUR is a number between 0 and 23, MINUTE is a number between 0
+and 59, and SECOND is a number between 0 and 59 possibly followed by ‘.’
+or ‘,’ and a fraction containing one or more digits.  Alternatively,
+‘:SECOND’ can be omitted, in which case it is taken to be zero.  On the
+rare hosts that support leap seconds, SECOND may be 60.
+
+   If the time is followed by ‘am’ or ‘pm’ (or ‘a.m.’ or ‘p.m.’), HOUR
+is restricted to run from 1 to 12, and ‘:MINUTE’ may be omitted (taken
+to be zero).  ‘am’ indicates the first half of the day, ‘pm’ indicates
 the second half of the day.  In this notation, 12 is the predecessor of
-1: midnight is `12am' while noon is `12pm'.  (This is the zero-oriented
-interpretation of `12am' and `12pm', as opposed to the old tradition
-derived from Latin which uses `12m' for noon and `12pm' for midnight.)
+1: midnight is ‘12am’ while noon is ‘12pm’.  (This is the zero-oriented
+interpretation of ‘12am’ and ‘12pm’, as opposed to the old tradition
+derived from Latin which uses ‘12m’ for noon and ‘12pm’ for midnight.)
 
    The time may alternatively be followed by a time zone correction,
-expressed as `SHHMM', where S is `+' or `-', HH is a number of zone
+expressed as ‘SHHMM’, where S is ‘+’ or ‘-’, HH is a number of zone
 hours and MM is a number of zone minutes.  The zone minutes term, MM,
 may be omitted, in which case the one- or two-digit correction is
-interpreted as a number of hours.  You can also separate HH from MM
-with a colon.  When a time zone correction is given this way, it forces
-interpretation of the time relative to Coordinated Universal Time
-(UTC), overriding any previous specification for the time zone or the
-local time zone.  For example, `+0530' and `+05:30' both stand for the
-time zone 5.5 hours ahead of UTC (e.g., India).  This is the best way to
+interpreted as a number of hours.  You can also separate HH from MM with
+a colon.  When a time zone correction is given this way, it forces
+interpretation of the time relative to Coordinated Universal Time (UTC),
+overriding any previous specification for the time zone or the local
+time zone.  For example, ‘+0530’ and ‘+05:30’ both stand for the time
+zone 5.5 hours ahead of UTC (e.g., India).  This is the best way to
 specify a time zone correction by fractional parts of an hour.  The
 maximum zone correction is 24 hours.
 
-   Either `am'/`pm' or a time zone correction may be specified, but not
+   Either ‘am’/‘pm’ or a time zone correction may be specified, but not
 both.
 
 
@@ -14383,20 +14251,20 @@ File: coreutils.info,  Node: Time zone items,  Next: Combined date and time of d
 ====================
 
 A "time zone item" specifies an international time zone, indicated by a
-small set of letters, e.g., `UTC' or `Z' for Coordinated Universal
-Time.  Any included periods are ignored.  By following a
-non-daylight-saving time zone by the string `DST' in a separate word
-(that is, separated by some white space), the corresponding daylight
-saving time zone may be specified.  Alternatively, a
-non-daylight-saving time zone can be followed by a time zone
-correction, to add the two values.  This is normally done only for
-`UTC'; for example, `UTC+05:30' is equivalent to `+05:30'.
-
-   Time zone items other than `UTC' and `Z' are obsolescent and are not
-recommended, because they are ambiguous; for example, `EST' has a
-different meaning in Australia than in the United States.  Instead,
-it's better to use unambiguous numeric time zone corrections like
-`-0500', as described in the previous section.
+small set of letters, e.g., ‘UTC’ or ‘Z’ for Coordinated Universal Time.
+Any included periods are ignored.  By following a non-daylight-saving
+time zone by the string ‘DST’ in a separate word (that is, separated by
+some white space), the corresponding daylight saving time zone may be
+specified.  Alternatively, a non-daylight-saving time zone can be
+followed by a time zone correction, to add the two values.  This is
+normally done only for ‘UTC’; for example, ‘UTC+05:30’ is equivalent to
+‘+05:30’.
+
+   Time zone items other than ‘UTC’ and ‘Z’ are obsolescent and are not
+recommended, because they are ambiguous; for example, ‘EST’ has a
+different meaning in Australia than in the United States.  Instead, it’s
+better to use unambiguous numeric time zone corrections like ‘-0500’, as
+described in the previous section.
 
    If neither a time zone item nor a time zone correction is supplied,
 time stamps are interpreted using the rules of the default time zone
@@ -14409,8 +14277,8 @@ File: coreutils.info,  Node: Combined date and time of day items,  Next: Day of
 ========================================
 
 The ISO 8601 date and time of day extended format consists of an ISO
-8601 date, a `T' character separator, and an ISO 8601 time of day.
-This format is also recognized if the `T' is replaced by a space.
+8601 date, a ‘T’ character separator, and an ISO 8601 time of day.  This
+format is also recognized if the ‘T’ is replaced by a space.
 
    In this format, the time of day should use 24-hour notation.
 Fractional seconds are allowed, with either comma or period preceding
@@ -14430,20 +14298,19 @@ File: coreutils.info,  Node: Day of week items,  Next: Relative items in date st
 28.6 Day of week items
 ======================
 
-The explicit mention of a day of the week will forward the date (only
-if necessary) to reach that day of the week in the future.
+The explicit mention of a day of the week will forward the date (only if
+necessary) to reach that day of the week in the future.
 
-   Days of the week may be spelled out in full: `Sunday', `Monday',
-`Tuesday', `Wednesday', `Thursday', `Friday' or `Saturday'.  Days may
-be abbreviated to their first three letters, optionally followed by a
-period.  The special abbreviations `Tues' for `Tuesday', `Wednes' for
-`Wednesday' and `Thur' or `Thurs' for `Thursday' are also allowed.
+   Days of the week may be spelled out in full: ‘Sunday’, ‘Monday’,
+‘Tuesday’, ‘Wednesday’, ‘Thursday’, ‘Friday’ or ‘Saturday’.  Days may be
+abbreviated to their first three letters, optionally followed by a
+period.  The special abbreviations ‘Tues’ for ‘Tuesday’, ‘Wednes’ for
+‘Wednesday’ and ‘Thur’ or ‘Thurs’ for ‘Thursday’ are also allowed.
 
    A number may precede a day of the week item to move forward
-supplementary weeks.  It is best used in expression like `third
-monday'.  In this context, `last DAY' or `next DAY' is also acceptable;
-they move one week before or after the day that DAY by itself would
-represent.
+supplementary weeks.  It is best used in expression like ‘third monday’.
+In this context, ‘last DAY’ or ‘next DAY’ is also acceptable; they move
+one week before or after the day that DAY by itself would represent.
 
    A comma following a day of the week item is ignored.
 
@@ -14462,38 +14329,38 @@ examples:
      3 years
      2 days
 
-   The unit of time displacement may be selected by the string `year'
-or `month' for moving by whole years or months.  These are fuzzy units,
-as years and months are not all of equal duration.  More precise units
-are `fortnight' which is worth 14 days, `week' worth 7 days, `day'
-worth 24 hours, `hour' worth 60 minutes, `minute' or `min' worth 60
-seconds, and `second' or `sec' worth one second.  An `s' suffix on
-these units is accepted and ignored.
+   The unit of time displacement may be selected by the string ‘year’ or
+‘month’ for moving by whole years or months.  These are fuzzy units, as
+years and months are not all of equal duration.  More precise units are
+‘fortnight’ which is worth 14 days, ‘week’ worth 7 days, ‘day’ worth 24
+hours, ‘hour’ worth 60 minutes, ‘minute’ or ‘min’ worth 60 seconds, and
+‘second’ or ‘sec’ worth one second.  An ‘s’ suffix on these units is
+accepted and ignored.
 
    The unit of time may be preceded by a multiplier, given as an
 optionally signed number.  Unsigned numbers are taken as positively
 signed.  No number at all implies 1 for a multiplier.  Following a
-relative item by the string `ago' is equivalent to preceding the unit
-by a multiplier with value -1.
+relative item by the string ‘ago’ is equivalent to preceding the unit by
+a multiplier with value -1.
 
-   The string `tomorrow' is worth one day in the future (equivalent to
-`day'), the string `yesterday' is worth one day in the past (equivalent
-to `day ago').
+   The string ‘tomorrow’ is worth one day in the future (equivalent to
+‘day’), the string ‘yesterday’ is worth one day in the past (equivalent
+to ‘day ago’).
 
-   The strings `now' or `today' are relative items corresponding to
+   The strings ‘now’ or ‘today’ are relative items corresponding to
 zero-valued time displacement, these strings come from the fact a
 zero-valued time displacement represents the current time when not
 otherwise changed by previous items.  They may be used to stress other
-items, like in `12:00 today'.  The string `this' also has the meaning
-of a zero-valued time displacement, but is preferred in date strings
-like `this thursday'.
+items, like in ‘12:00 today’.  The string ‘this’ also has the meaning of
+a zero-valued time displacement, but is preferred in date strings like
+‘this thursday’.
 
    When a relative item causes the resulting date to cross a boundary
 where the clocks were adjusted, typically for daylight saving time, the
 resulting date and time are adjusted accordingly.
 
    The fuzz in units can cause problems with relative items.  For
-example, `2003-07-31 -1 month' might evaluate to 2003-07-01, because
+example, ‘2003-07-31 -1 month’ might evaluate to 2003-07-01, because
 2003-06-31 is an invalid date.  To determine the previous month more
 reliably, you can ask for the month before the 15th of the current
 month.  For example:
@@ -14506,10 +14373,10 @@ month.  For example:
      Last month was June!
 
    Also, take care when manipulating dates around clock changes such as
-daylight saving leaps.  In a few cases these have added or subtracted
-as much as 24 hours from the clock, so it is often wise to adopt
-universal time by setting the `TZ' environment variable to `UTC0'
-before embarking on calendrical calculations.
+daylight saving leaps.  In a few cases these have added or subtracted as
+much as 24 hours from the clock, so it is often wise to adopt universal
+time by setting the ‘TZ’ environment variable to ‘UTC0’ before embarking
+on calendrical calculations.
 
 
 File: coreutils.info,  Node: Pure numbers in date strings,  Next: Seconds since the Epoch,  Prev: Relative items in date strings,  Up: Date input formats
@@ -14540,31 +14407,30 @@ File: coreutils.info,  Node: Seconds since the Epoch,  Next: Specifying time zon
 28.9 Seconds since the Epoch
 ============================
 
-If you precede a number with `@', it represents an internal time stamp
-as a count of seconds.  The number can contain an internal decimal
-point (either `.' or `,'); any excess precision not supported by the
-internal representation is truncated toward minus infinity.  Such a
-number cannot be combined with any other date item, as it specifies a
-complete time stamp.
+If you precede a number with ‘@’, it represents an internal time stamp
+as a count of seconds.  The number can contain an internal decimal point
+(either ‘.’ or ‘,’); any excess precision not supported by the internal
+representation is truncated toward minus infinity.  Such a number cannot
+be combined with any other date item, as it specifies a complete time
+stamp.
 
    Internally, computer times are represented as a count of seconds
-since an epoch--a well-defined point of time.  On GNU and POSIX
-systems, the epoch is 1970-01-01 00:00:00 UTC, so `@0' represents this
-time, `@1' represents 1970-01-01 00:00:01 UTC, and so forth.  GNU and
-most other POSIX-compliant systems support such times as an extension
-to POSIX, using negative counts, so that `@-1' represents 1969-12-31
-23:59:59 UTC.
-
-   Traditional Unix systems count seconds with 32-bit two's-complement
+since an epoch—a well-defined point of time.  On GNU and POSIX systems,
+the epoch is 1970-01-01 00:00:00 UTC, so ‘@0’ represents this time, ‘@1’
+represents 1970-01-01 00:00:01 UTC, and so forth.  GNU and most other
+POSIX-compliant systems support such times as an extension to POSIX,
+using negative counts, so that ‘@-1’ represents 1969-12-31 23:59:59 UTC.
+
+   Traditional Unix systems count seconds with 32-bit two’s-complement
 integers and can represent times from 1901-12-13 20:45:52 through
 2038-01-19 03:14:07 UTC.  More modern systems use 64-bit counts of
 seconds with nanosecond subcounts, and can represent all the times in
 the known lifetime of the universe to a resolution of 1 nanosecond.
 
-   On most hosts, these counts ignore the presence of leap seconds.
-For example, on most hosts `@915148799' represents 1998-12-31 23:59:59
-UTC, `@915148800' represents 1999-01-01 00:00:00 UTC, and there is no
-way to represent the intervening leap second 1998-12-31 23:59:60 UTC.
+   On most hosts, these counts ignore the presence of leap seconds.  For
+example, on most hosts ‘@915148799’ represents 1998-12-31 23:59:59 UTC,
+‘@915148800’ represents 1999-01-01 00:00:00 UTC, and there is no way to
+represent the intervening leap second 1998-12-31 23:59:60 UTC.
 
 
 File: coreutils.info,  Node: Specifying time zone rules,  Next: Authors of parse_datetime,  Prev: Seconds since the Epoch,  Up: Date input formats
@@ -14573,69 +14439,68 @@ File: coreutils.info,  Node: Specifying time zone rules,  Next: Authors of parse
 ================================
 
 Normally, dates are interpreted using the rules of the current time
-zone, which in turn are specified by the `TZ' environment variable, or
-by a system default if `TZ' is not set.  To specify a different set of
-default time zone rules that apply just to one date, start the date
-with a string of the form `TZ="RULE"'.  The two quote characters (`"')
-must be present in the date, and any quotes or backslashes within RULE
-must be escaped by a backslash.
-
-   For example, with the GNU `date' command you can answer the question
-"What time is it in New York when a Paris clock shows 6:30am on October
-31, 2004?" by using a date beginning with `TZ="Europe/Paris"' as shown
+zone, which in turn are specified by the ‘TZ’ environment variable, or
+by a system default if ‘TZ’ is not set.  To specify a different set of
+default time zone rules that apply just to one date, start the date with
+a string of the form ‘TZ="RULE"’.  The two quote characters (‘"’) must
+be present in the date, and any quotes or backslashes within RULE must
+be escaped by a backslash.
+
+   For example, with the GNU ‘date’ command you can answer the question
+“What time is it in New York when a Paris clock shows 6:30am on October
+31, 2004?� by using a date beginning with ‘TZ="Europe/Paris"’ as shown
 in the following shell transcript:
 
      $ export TZ="America/New_York"
      $ date --date='TZ="Europe/Paris" 2004-10-31 06:30'
      Sun Oct 31 01:30:00 EDT 2004
 
-   In this example, the `--date' operand begins with its own `TZ'
+   In this example, the ‘--date’ operand begins with its own ‘TZ’
 setting, so the rest of that operand is processed according to
-`Europe/Paris' rules, treating the string `2004-10-31 06:30' as if it
-were in Paris.  However, since the output of the `date' command is
+‘Europe/Paris’ rules, treating the string ‘2004-10-31 06:30’ as if it
+were in Paris.  However, since the output of the ‘date’ command is
 processed according to the overall time zone rules, it uses New York
-time.  (Paris was normally six hours ahead of New York in 2004, but
-this example refers to a brief Halloween period when the gap was five
-hours.)
+time.  (Paris was normally six hours ahead of New York in 2004, but this
+example refers to a brief Halloween period when the gap was five hours.)
 
-   A `TZ' value is a rule that typically names a location in the `tz'
+   A ‘TZ’ value is a rule that typically names a location in the ‘tz’
 database (http://www.twinsun.com/tz/tz-link.htm).  A recent catalog of
 location names appears in the TWiki Date and Time Gateway
 (http://twiki.org/cgi-bin/xtra/tzdate).  A few non-GNU hosts require a
-colon before a location name in a `TZ' setting, e.g.,
-`TZ=":America/New_York"'.
+colon before a location name in a ‘TZ’ setting, e.g.,
+‘TZ=":America/New_York"’.
 
-   The `tz' database includes a wide variety of locations ranging from
-`Arctic/Longyearbyen' to `Antarctica/South_Pole', but if you are at sea
+   The ‘tz’ database includes a wide variety of locations ranging from
+‘Arctic/Longyearbyen’ to ‘Antarctica/South_Pole’, but if you are at sea
 and have your own private time zone, or if you are using a non-GNU host
-that does not support the `tz' database, you may need to use a POSIX
-rule instead.  Simple POSIX rules like `UTC0' specify a time zone
+that does not support the ‘tz’ database, you may need to use a POSIX
+rule instead.  Simple POSIX rules like ‘UTC0’ specify a time zone
 without daylight saving time; other rules can specify simple daylight
-saving regimes.  *Note Specifying the Time Zone with `TZ': (libc)TZ
+saving regimes.  *Note Specifying the Time Zone with ‘TZ’: (libc)TZ
 Variable.
 
 
 File: coreutils.info,  Node: Authors of parse_datetime,  Prev: Specifying time zone rules,  Up: Date input formats
 
-28.11 Authors of `parse_datetime'
+28.11 Authors of ‘parse_datetime’
 =================================
 
-`parse_datetime' started life as `getdate', as originally implemented
-by Steven M. Bellovin (<smb@research.att.com>) while at the University
-of North Carolina at Chapel Hill.  The code was later tweaked by a
-couple of people on Usenet, then completely overhauled by Rich $alz
+‘parse_datetime’ started life as ‘getdate’, as originally implemented by
+Steven M. Bellovin (<smb@research.att.com>) while at the University of
+North Carolina at Chapel Hill.  The code was later tweaked by a couple
+of people on Usenet, then completely overhauled by Rich $alz
 (<rsalz@bbn.com>) and Jim Berets (<jberets@bbn.com>) in August, 1990.
 Various revisions for the GNU system were made by David MacKenzie, Jim
-Meyering, Paul Eggert and others, including renaming it to `get_date' to
-avoid a conflict with the alternative Posix function `getdate', and a
-later rename to `parse_datetime'.  The Posix function `getdate' can
-parse more locale-specific dates using `strptime', but relies on an
+Meyering, Paul Eggert and others, including renaming it to ‘get_date’ to
+avoid a conflict with the alternative Posix function ‘getdate’, and a
+later rename to ‘parse_datetime’.  The Posix function ‘getdate’ can
+parse more locale-specific dates using ‘strptime’, but relies on an
 environment variable and external file, and lacks the thread-safety of
-`parse_datetime'.
+‘parse_datetime’.
 
-   This chapter was originally produced by Franc,ois Pinard
-(<pinard@iro.umontreal.ca>) from the `parse_datetime.y' source code,
-and then edited by K. Berry (<kb@cs.umb.edu>).
+   This chapter was originally produced by François Pinard
+(<pinard@iro.umontreal.ca>) from the ‘parse_datetime.y’ source code, and
+then edited by K. Berry (<kb@cs.umb.edu>).
 
 
 File: coreutils.info,  Node: Opening the software toolbox,  Next: GNU Free Documentation License,  Prev: Date input formats,  Up: Top
@@ -14643,8 +14508,8 @@ File: coreutils.info,  Node: Opening the software toolbox,  Next: GNU Free Docum
 29 Opening the Software Toolbox
 *******************************
 
-An earlier version of this chapter appeared in the `What's GNU?' column
-of the June 1994 `Linux Journal'
+An earlier version of this chapter appeared in the ‘What’s GNU?’  column
+of the June 1994 ‘Linux Journal’
 (http://www.linuxjournal.com/article.php?sid=2762).  It was written by
 Arnold Robbins.
 
@@ -14652,10 +14517,10 @@ Arnold Robbins.
 
 * Toolbox introduction::        Toolbox introduction
 * I/O redirection::             I/O redirection
-* The who command::             The `who' command
-* The cut command::             The `cut' command
-* The sort command::            The `sort' command
-* The uniq command::            The `uniq' command
+* The who command::             The ‘who’ command
+* The cut command::             The ‘cut’ command
+* The sort command::            The ‘sort’ command
+* The uniq command::            The ‘uniq’ command
 * Putting the tools together::  Putting the tools together
 
 
@@ -14664,34 +14529,34 @@ File: coreutils.info,  Node: Toolbox introduction,  Next: I/O redirection,  Up:
 Toolbox Introduction
 ====================
 
-This month's column is only peripherally related to the GNU Project, in
-that it describes a number of the GNU tools on your GNU/Linux system
-and how they might be used.  What it's really about is the "Software
-Tools" philosophy of program development and usage.
+This month’s column is only peripherally related to the GNU Project, in
+that it describes a number of the GNU tools on your GNU/Linux system and
+how they might be used.  What it’s really about is the “Software Tools�
+philosophy of program development and usage.
 
    The software tools philosophy was an important and integral concept
 in the initial design and development of Unix (of which Linux and GNU
 are essentially clones).  Unfortunately, in the modern day press of
-Internetworking and flashy GUIs, it seems to have fallen by the
-wayside.  This is a shame, since it provides a powerful mental model
-for solving many kinds of problems.
+Internetworking and flashy GUIs, it seems to have fallen by the wayside.
+This is a shame, since it provides a powerful mental model for solving
+many kinds of problems.
 
    Many people carry a Swiss Army knife around in their pants pockets
 (or purse).  A Swiss Army knife is a handy tool to have: it has several
 knife blades, a screwdriver, tweezers, toothpick, nail file, corkscrew,
 and perhaps a number of other things on it.  For the everyday, small
-miscellaneous jobs where you need a simple, general purpose tool, it's
+miscellaneous jobs where you need a simple, general purpose tool, it’s
 just the thing.
 
-   On the other hand, an experienced carpenter doesn't build a house
+   On the other hand, an experienced carpenter doesn’t build a house
 using a Swiss Army knife.  Instead, he has a toolbox chock full of
-specialized tools--a saw, a hammer, a screwdriver, a plane, and so on.
-And he knows exactly when and where to use each tool; you won't catch
+specialized tools—a saw, a hammer, a screwdriver, a plane, and so on.
+And he knows exactly when and where to use each tool; you won’t catch
 him hammering nails with the handle of his screwdriver.
 
    The Unix developers at Bell Labs were all professional programmers
 and trained computer scientists.  They had found that while a
-one-size-fits-all program might appeal to a user because there's only
+one-size-fits-all program might appeal to a user because there’s only
 one program to use, in practice such programs are
 
   a. difficult to write,
@@ -14701,19 +14566,19 @@ one program to use, in practice such programs are
   c. difficult to extend to meet new situations.
 
    Instead, they felt that programs should be specialized tools.  In
-short, each program "should do one thing well."  No more and no less.
-Such programs are simpler to design, write, and get right--they only do
+short, each program “should do one thing well.� No more and no less.
+Such programs are simpler to design, write, and get right—they only do
 one thing.
 
    Furthermore, they found that with the right machinery for hooking
-programs together, that the whole was greater than the sum of the
-parts.  By combining several special purpose programs, you could
-accomplish a specific task that none of the programs was designed for,
-and accomplish it much more quickly and easily than if you had to write
-a special purpose program.  We will see some (classic) examples of this
-further on in the column.  (An important additional point was that, if
-necessary, take a detour and build any software tools you may need
-first, if you don't already have something appropriate in the toolbox.)
+programs together, that the whole was greater than the sum of the parts.
+By combining several special purpose programs, you could accomplish a
+specific task that none of the programs was designed for, and accomplish
+it much more quickly and easily than if you had to write a special
+purpose program.  We will see some (classic) examples of this further on
+in the column.  (An important additional point was that, if necessary,
+take a detour and build any software tools you may need first, if you
+don’t already have something appropriate in the toolbox.)
 
 
 File: coreutils.info,  Node: I/O redirection,  Next: The who command,  Prev: Toolbox introduction,  Up: Opening the software toolbox
@@ -14722,29 +14587,29 @@ I/O Redirection
 ===============
 
 Hopefully, you are familiar with the basics of I/O redirection in the
-shell, in particular the concepts of "standard input," "standard
-output," and "standard error".  Briefly, "standard input" is a data
-source, where data comes from.  A program should not need to either
-know or care if the data source is a disk file, a keyboard, a magnetic
-tape, or even a punched card reader.  Similarly, "standard output" is a
-data sink, where data goes to.  The program should neither know nor
-care where this might be.  Programs that only read their standard
-input, do something to the data, and then send it on, are called
-"filters", by analogy to filters in a water pipeline.
-
-   With the Unix shell, it's very easy to set up data pipelines:
+shell, in particular the concepts of “standard input,� “standard
+output,� and “standard error�.  Briefly, “standard input� is a data
+source, where data comes from.  A program should not need to either know
+or care if the data source is a disk file, a keyboard, a magnetic tape,
+or even a punched card reader.  Similarly, “standard output� is a data
+sink, where data goes to.  The program should neither know nor care
+where this might be.  Programs that only read their standard input, do
+something to the data, and then send it on, are called "filters", by
+analogy to filters in a water pipeline.
+
+   With the Unix shell, it’s very easy to set up data pipelines:
 
      program_to_create_data | filter1 | ... | filterN > final.pretty.data
 
    We start out by creating the raw data; each filter applies some
-successive transformation to the data, until by the time it comes out
-of the pipeline, it is in the desired form.
+successive transformation to the data, until by the time it comes out of
+the pipeline, it is in the desired form.
 
    This is fine and good for standard input and standard output.  Where
-does the standard error come in to play?  Well, think about `filter1' in
+does the standard error come in to play?  Well, think about ‘filter1’ in
 the pipeline above.  What happens if it encounters an error in the data
 it sees?  If it writes an error message to standard output, it will just
-disappear down the pipeline into `filter2''s input, and the user will
+disappear down the pipeline into ‘filter2’’s input, and the user will
 probably never see it.  So programs need a place where they can send
 error messages so that the user will notice them.  This is standard
 error, and it is usually connected to your console or window, even if
@@ -14755,88 +14620,88 @@ screen.
 be agreed upon.  The most straightforward and easiest format to use is
 simply lines of text.  Unix data files are generally just streams of
 bytes, with lines delimited by the ASCII LF (Line Feed) character,
-conventionally called a "newline" in the Unix literature.  (This is
-`'\n'' if you're a C programmer.)  This is the format used by all the
+conventionally called a “newline� in the Unix literature.  (This is
+‘'\n'’ if you’re a C programmer.)  This is the format used by all the
 traditional filtering programs.  (Many earlier operating systems had
 elaborate facilities and special purpose programs for managing binary
-data.  Unix has always shied away from such things, under the
-philosophy that it's easiest to simply be able to view and edit your
-data with a text editor.)
+data.  Unix has always shied away from such things, under the philosophy
+that it’s easiest to simply be able to view and edit your data with a
+text editor.)
 
-   OK, enough introduction.  Let's take a look at some of the tools,
-and then we'll see how to hook them together in interesting ways.   In
-the following discussion, we will only present those command line
-options that interest us.  As you should always do, double check your
-system documentation for the full story.
+   OK, enough introduction.  Let’s take a look at some of the tools, and
+then we’ll see how to hook them together in interesting ways.  In the
+following discussion, we will only present those command line options
+that interest us.  As you should always do, double check your system
+documentation for the full story.
 
 
 File: coreutils.info,  Node: The who command,  Next: The cut command,  Prev: I/O redirection,  Up: Opening the software toolbox
 
-The `who' Command
+The ‘who’ Command
 =================
 
-The first program is the `who' command.  By itself, it generates a list
-of the users who are currently logged in.  Although I'm writing this on
-a single-user system, we'll pretend that several people are logged in:
+The first program is the ‘who’ command.  By itself, it generates a list
+of the users who are currently logged in.  Although I’m writing this on
+a single-user system, we’ll pretend that several people are logged in:
 
      $ who
-     -| arnold   console Jan 22 19:57
-     -| miriam   ttyp0   Jan 23 14:19(:0.0)
-     -| bill     ttyp1   Jan 21 09:32(:0.0)
-     -| arnold   ttyp2   Jan 23 20:48(:0.0)
+     ⊣ arnold   console Jan 22 19:57
+     ⊣ miriam   ttyp0   Jan 23 14:19(:0.0)
+     ⊣ bill     ttyp1   Jan 21 09:32(:0.0)
+     ⊣ arnold   ttyp2   Jan 23 20:48(:0.0)
 
-   Here, the `$' is the usual shell prompt, at which I typed `who'.
+   Here, the ‘$’ is the usual shell prompt, at which I typed ‘who’.
 There are three people logged in, and I am logged in twice.  On
 traditional Unix systems, user names are never more than eight
 characters long.  This little bit of trivia will be useful later.  The
-output of `who' is nice, but the data is not all that exciting.
+output of ‘who’ is nice, but the data is not all that exciting.
 
 
 File: coreutils.info,  Node: The cut command,  Next: The sort command,  Prev: The who command,  Up: Opening the software toolbox
 
-The `cut' Command
+The ‘cut’ Command
 =================
 
-The next program we'll look at is the `cut' command.  This program cuts
+The next program we’ll look at is the ‘cut’ command.  This program cuts
 out columns or fields of input data.  For example, we can tell it to
-print just the login name and full name from the `/etc/passwd' file.
-The `/etc/passwd' file has seven fields, separated by colons:
+print just the login name and full name from the ‘/etc/passwd’ file.
+The ‘/etc/passwd’ file has seven fields, separated by colons:
 
      arnold:xyzzy:2076:10:Arnold D. Robbins:/home/arnold:/bin/bash
 
-   To get the first and fifth fields, we would use `cut' like this:
+   To get the first and fifth fields, we would use ‘cut’ like this:
 
      $ cut -d: -f1,5 /etc/passwd
-     -| root:Operator
-     ...
-     -| arnold:Arnold D. Robbins
-     -| miriam:Miriam A. Robbins
-     ...
+     ⊣ root:Operator
+     …
+     ⊣ arnold:Arnold D. Robbins
+     ⊣ miriam:Miriam A. Robbins
+     …
 
-   With the `-c' option, `cut' will cut out specific characters (i.e.,
+   With the ‘-c’ option, ‘cut’ will cut out specific characters (i.e.,
 columns) in the input lines.  This is useful for input data that has
 fixed width fields, and does not have a field separator.  For example,
 list the Monday dates for the current month:
 
      $ cal | cut -c 3-5
-     -|Mo
-     -|
-     -|  6
-     -| 13
-     -| 20
-     -| 27
+     ⊣Mo
+     ⊣
+     ⊣  6
+     ⊣ 13
+     ⊣ 20
+     ⊣ 27
 
 
 File: coreutils.info,  Node: The sort command,  Next: The uniq command,  Prev: The cut command,  Up: Opening the software toolbox
 
-The `sort' Command
+The ‘sort’ Command
 ==================
 
-Next we'll look at the `sort' command.  This is one of the most
-powerful commands on a Unix-style system; one that you will often find
-yourself using when setting up fancy data plumbing.
+Next we’ll look at the ‘sort’ command.  This is one of the most powerful
+commands on a Unix-style system; one that you will often find yourself
+using when setting up fancy data plumbing.
 
-   The `sort' command reads and sorts each file named on the command
+   The ‘sort’ command reads and sorts each file named on the command
 line.  It then merges the sorted data and writes it to standard output.
 It will read standard input if no files are given on the command line
 (thus making it into a filter).  The sort is based on the character
@@ -14845,17 +14710,17 @@ collating sequence or based on user-supplied ordering criteria.
 
 File: coreutils.info,  Node: The uniq command,  Next: Putting the tools together,  Prev: The sort command,  Up: Opening the software toolbox
 
-The `uniq' Command
+The ‘uniq’ Command
 ==================
 
-Finally (at least for now), we'll look at the `uniq' program.  When
-sorting data, you will often end up with duplicate lines, lines that
-are identical.  Usually, all you need is one instance of each line.
-This is where `uniq' comes in.  The `uniq' program reads its standard
-input.  It prints only one copy of each repeated line.  It does have
-several options.  Later on, we'll use the `-c' option, which prints
-each unique line, preceded by a count of the number of times that line
-occurred in the input.
+Finally (at least for now), we’ll look at the ‘uniq’ program.  When
+sorting data, you will often end up with duplicate lines, lines that are
+identical.  Usually, all you need is one instance of each line.  This is
+where ‘uniq’ comes in.  The ‘uniq’ program reads its standard input.  It
+prints only one copy of each repeated line.  It does have several
+options.  Later on, we’ll use the ‘-c’ option, which prints each unique
+line, preceded by a count of the number of times that line occurred in
+the input.
 
 
 File: coreutils.info,  Node: Putting the tools together,  Prev: The uniq command,  Up: Opening the software toolbox
@@ -14863,11 +14728,11 @@ File: coreutils.info,  Node: Putting the tools together,  Prev: The uniq command
 Putting the Tools Together
 ==========================
 
-Now, let's suppose this is a large ISP server system with dozens of
-users logged in.  The management wants the system administrator to
-write a program that will generate a sorted list of logged in users.
-Furthermore, even if a user is logged in multiple times, his or her
-name should only show up in the output once.
+Now, let’s suppose this is a large ISP server system with dozens of
+users logged in.  The management wants the system administrator to write
+a program that will generate a sorted list of logged in users.
+Furthermore, even if a user is logged in multiple times, his or her name
+should only show up in the output once.
 
    The administrator could sit down with the system documentation and
 write a C program that did this.  It would take perhaps a couple of
@@ -14876,33 +14741,33 @@ debug it.  However, knowing the software toolbox, the administrator can
 instead start out by generating just a list of logged on users:
 
      $ who | cut -c1-8
-     -| arnold
-     -| miriam
-     -| bill
-     -| arnold
+     ⊣ arnold
+     ⊣ miriam
+     ⊣ bill
+     ⊣ arnold
 
    Next, sort the list:
 
      $ who | cut -c1-8 | sort
-     -| arnold
-     -| arnold
-     -| bill
-     -| miriam
+     ⊣ arnold
+     ⊣ arnold
+     ⊣ bill
+     ⊣ miriam
 
-   Finally, run the sorted list through `uniq', to weed out duplicates:
+   Finally, run the sorted list through ‘uniq’, to weed out duplicates:
 
      $ who | cut -c1-8 | sort | uniq
-     -| arnold
-     -| bill
-     -| miriam
+     ⊣ arnold
+     ⊣ bill
+     ⊣ miriam
 
-   The `sort' command actually has a `-u' option that does what `uniq'
-does.  However, `uniq' has other uses for which one cannot substitute
-`sort -u'.
+   The ‘sort’ command actually has a ‘-u’ option that does what ‘uniq’
+does.  However, ‘uniq’ has other uses for which one cannot substitute
+‘sort -u’.
 
    The administrator puts this pipeline into a shell script, and makes
-it available for all the users on the system (`#' is the system
-administrator, or `root', prompt):
+it available for all the users on the system (‘#’ is the system
+administrator, or ‘root’, prompt):
 
      # cat > /usr/local/bin/listusers
      who | cut -c1-8 | sort | uniq
@@ -14914,16 +14779,16 @@ programs, on one command line, the administrator was able to save about
 two hours worth of work.  Furthermore, the shell pipeline is just about
 as efficient as the C program would be, and it is much more efficient in
 terms of programmer time.  People time is much more expensive than
-computer time, and in our modern "there's never enough time to do
-everything" society, saving two hours of programmer time is no mean
+computer time, and in our modern “there’s never enough time to do
+everything� society, saving two hours of programmer time is no mean
 feat.
 
-   Second, it is also important to emphasize that with the
-_combination_ of the tools, it is possible to do a special purpose job
-never imagined by the authors of the individual programs.
+   Second, it is also important to emphasize that with the _combination_
+of the tools, it is possible to do a special purpose job never imagined
+by the authors of the individual programs.
 
-   Third, it is also valuable to build up your pipeline in stages, as
-we did here.  This allows you to view the data at each stage in the
+   Third, it is also valuable to build up your pipeline in stages, as we
+did here.  This allows you to view the data at each stage in the
 pipeline, which helps you acquire the confidence that you are indeed
 using these tools correctly.
 
@@ -14932,81 +14797,81 @@ use your command, without having to remember the fancy plumbing you set
 up for them.  In terms of how you run them, shell scripts and compiled
 programs are indistinguishable.
 
-   After the previous warm-up exercise, we'll look at two additional,
+   After the previous warm-up exercise, we’ll look at two additional,
 more complicated pipelines.  For them, we need to introduce two more
 tools.
 
-   The first is the `tr' command, which stands for "transliterate."
-The `tr' command works on a character-by-character basis, changing
+   The first is the ‘tr’ command, which stands for “transliterate.� The
+‘tr’ command works on a character-by-character basis, changing
 characters.  Normally it is used for things like mapping upper case to
 lower case:
 
      $ echo ThIs ExAmPlE HaS MIXED case! | tr '[:upper:]' '[:lower:]'
-     -| this example has mixed case!
+     ⊣ this example has mixed case!
 
    There are several options of interest:
 
-`-c'
+‘-c’
      work on the complement of the listed characters, i.e., operations
      apply to characters not in the given set
 
-`-d'
+‘-d’
      delete characters in the first set from the output
 
-`-s'
+‘-s’
      squeeze repeated characters in the output into just one character.
 
    We will be using all three options in a moment.
 
-   The other command we'll look at is `comm'.  The `comm' command takes
-two sorted input files as input data, and prints out the files' lines
-in three columns.  The output columns are the data lines unique to the
-first file, the data lines unique to the second file, and the data
-lines that are common to both.  The `-1', `-2', and `-3' command line
-options _omit_ the respective columns.  (This is non-intuitive and
-takes a little getting used to.)  For example:
+   The other command we’ll look at is ‘comm’.  The ‘comm’ command takes
+two sorted input files as input data, and prints out the files’ lines in
+three columns.  The output columns are the data lines unique to the
+first file, the data lines unique to the second file, and the data lines
+that are common to both.  The ‘-1’, ‘-2’, and ‘-3’ command line options
+_omit_ the respective columns.  (This is non-intuitive and takes a
+little getting used to.)  For example:
 
      $ cat f1
-     -| 11111
-     -| 22222
-     -| 33333
-     -| 44444
+     ⊣ 11111
+     ⊣ 22222
+     ⊣ 33333
+     ⊣ 44444
      $ cat f2
-     -| 00000
-     -| 22222
-     -| 33333
-     -| 55555
+     ⊣ 00000
+     ⊣ 22222
+     ⊣ 33333
+     ⊣ 55555
      $ comm f1 f2
-     -|         00000
-     -| 11111
-     -|                 22222
-     -|                 33333
-     -| 44444
-     -|         55555
-
-   The file name `-' tells `comm' to read standard input instead of a
+     ⊣         00000
+     ⊣ 11111
+     ⊣                 22222
+     ⊣                 33333
+     ⊣ 44444
+     ⊣         55555
+
+   The file name ‘-’ tells ‘comm’ to read standard input instead of a
 regular file.
 
-   Now we're ready to build a fancy pipeline.  The first application is
+   Now we’re ready to build a fancy pipeline.  The first application is
 a word frequency counter.  This helps an author determine if he or she
 is over-using certain words.
 
    The first step is to change the case of all the letters in our input
-file to one case.  "The" and "the" are the same word when doing
+file to one case.  “The� and “the� are the same word when doing
 counting.
 
      $ tr '[:upper:]' '[:lower:]' < whats.gnu | ...
 
    The next step is to get rid of punctuation.  Quoted words and
-unquoted words should be treated identically; it's easiest to just get
+unquoted words should be treated identically; it’s easiest to just get
 the punctuation out of the way.
 
      $ tr '[:upper:]' '[:lower:]' < whats.gnu | tr -cd '[:alnum:]_ \n' | ...
 
-   The second `tr' command operates on the complement of the listed
+   The second ‘tr’ command operates on the complement of the listed
 characters, which are all the letters, the digits, the underscore, and
-the blank.  The `\n' represents the newline character; it has to be
-left alone.  (The ASCII tab character should also be included for good
+the blank.  The ‘\n’ represents the newline character; it has to be left
+alone.  (The ASCII tab character should also be included for good
 measure in a production script.)
 
    At this point, we have data consisting of words separated by blank
@@ -15018,14 +14883,14 @@ will see shortly.
      $ tr '[:upper:]' '[:lower:]' < whats.gnu | tr -cd '[:alnum:]_ \n' |
      > tr -s ' ' '\n' | ...
 
-   This command turns blanks into newlines.  The `-s' option squeezes
+   This command turns blanks into newlines.  The ‘-s’ option squeezes
 multiple newline characters in the output into just one.  This helps us
-avoid blank lines.  (The `>' is the shell's "secondary prompt."  This
-is what the shell prints when it notices you haven't finished typing in
-all of a command.)
+avoid blank lines.  (The ‘>’ is the shell’s “secondary prompt.� This is
+what the shell prints when it notices you haven’t finished typing in all
+of a command.)
 
-   We now have data consisting of one word per line, no punctuation,
-all one case.  We're ready to count each word:
+   We now have data consisting of one word per line, no punctuation, all
+one case.  We’re ready to count each word:
 
      $ tr '[:upper:]' '[:lower:]' < whats.gnu | tr -cd '[:alnum:]_ \n' |
      > tr -s ' ' '\n' | sort | uniq -c | ...
@@ -15043,36 +14908,36 @@ all one case.  We're ready to count each word:
 
    The output is sorted by word, not by count!  What we want is the most
 frequently used words first.  Fortunately, this is easy to accomplish,
-with the help of two more `sort' options:
+with the help of two more ‘sort’ options:
 
-`-n'
+‘-n’
      do a numeric sort, not a textual one
 
-`-r'
+‘-r’
      reverse the order of the sort
 
    The final pipeline looks like this:
 
      $ tr '[:upper:]' '[:lower:]' < whats.gnu | tr -cd '[:alnum:]_ \n' |
      > tr -s ' ' '\n' | sort | uniq -c | sort -n -r
-     -|    156 the
-     -|     60 a
-     -|     58 to
-     -|     51 of
-     -|     51 and
-     ...
-
-   Whew!  That's a lot to digest.  Yet, the same principles apply.
-With six commands, on two lines (really one long one split for
-convenience), we've created a program that does something interesting
-and useful, in much less time than we could have written a C program to
-do the same thing.
+     ⊣    156 the
+     ⊣     60 a
+     ⊣     58 to
+     ⊣     51 of
+     ⊣     51 and
+     …
+
+   Whew!  That’s a lot to digest.  Yet, the same principles apply.  With
+six commands, on two lines (really one long one split for convenience),
+we’ve created a program that does something interesting and useful, in
+much less time than we could have written a C program to do the same
+thing.
 
    A minor modification to the above pipeline can give us a simple
-spelling checker!  To determine if you've spelled a word correctly, all
+spelling checker!  To determine if you’ve spelled a word correctly, all
 you have to do is look it up in a dictionary.  If it is not there, then
 chances are that your spelling is incorrect.  So, we need a dictionary.
-The conventional location for a dictionary is `/usr/dict/words'.  On my
+The conventional location for a dictionary is ‘/usr/dict/words’.  On my
 GNU/Linux system,(1) this is a sorted, 45,402 word dictionary.
 
    Now, how to compare our file with the dictionary?  As before, we
@@ -15081,14 +14946,14 @@ generate a sorted list of words, one per line:
      $ tr '[:upper:]' '[:lower:]' < whats.gnu | tr -cd '[:alnum:]_ \n' |
      > tr -s ' ' '\n' | sort -u | ...
 
-   Now, all we need is a list of words that are _not_ in the
-dictionary.  Here is where the `comm' command comes in.
+   Now, all we need is a list of words that are _not_ in the dictionary.
+Here is where the ‘comm’ command comes in.
 
      $ tr '[:upper:]' '[:lower:]' < whats.gnu | tr -cd '[:alnum:]_ \n' |
      > tr -s ' ' '\n' | sort -u |
      > comm -23 - /usr/dict/words
 
-   The `-2' and `-3' options eliminate lines that are only in the
+   The ‘-2’ and ‘-3’ options eliminate lines that are only in the
 dictionary (the second file), and lines that are in both files.  Lines
 only in the first file (standard input, our stream of words), are words
 that are not in the dictionary.  These are likely candidates for
@@ -15097,26 +14962,26 @@ spelling checker on Unix.
 
    There are some other tools that deserve brief mention.
 
-`grep'
+‘grep’
      search files for text that matches a regular expression
 
-`wc'
+‘wc’
      count lines, words, characters
 
-`tee'
+‘tee’
      a T-fitting for data pipes, copies data to files and to standard
      output
 
-`sed'
+‘sed’
      the stream editor, an advanced tool
 
-`awk'
+‘awk’
      a data manipulation language, another advanced tool
 
    The software tools philosophy also espoused the following bit of
-advice: "Let someone else do the hard part."  This means, take
-something that gives you most of what you need, and then massage it the
-rest of the way until it's in the form that you want.
+advice: “Let someone else do the hard part.� This means, take something
+that gives you most of what you need, and then massage it the rest of
+the way until it’s in the form that you want.
 
    To summarize:
 
@@ -15127,44 +14992,43 @@ rest of the way until it's in the form that you want.
      novel uses of programs that the authors might never have imagined.
 
   3. Programs should never print extraneous header or trailer data,
-     since these could get sent on down a pipeline.  (A point we didn't
+     since these could get sent on down a pipeline.  (A point we didn’t
      mention earlier.)
 
   4. Let someone else do the hard part.
 
-  5. Know your toolbox!  Use each program appropriately.  If you don't
+  5. Know your toolbox!  Use each program appropriately.  If you don’t
      have an appropriate tool, build one.
 
-   As of this writing, all the programs we've discussed are available
-via anonymous `ftp' from:
-`ftp://gnudist.gnu.org/textutils/textutils-1.22.tar.gz'.  (There may be
-more recent versions available now.)
+   As of this writing, all the programs discussed are available from
+<http://ftp.gnu.org/old-gnu/textutils/textutils-1.22.tar.gz>, with more
+recent versions available from <http://ftp.gnu.org/gnu/coreutils>.
 
    None of what I have presented in this column is new.  The Software
-Tools philosophy was first introduced in the book `Software Tools', by
+Tools philosophy was first introduced in the book ‘Software Tools’, by
 Brian Kernighan and P.J. Plauger (Addison-Wesley, ISBN 0-201-03669-X).
 This book showed how to write and use software tools.  It was written in
-1976, using a preprocessor for FORTRAN named `ratfor' (RATional
+1976, using a preprocessor for FORTRAN named ‘ratfor’ (RATional
 FORtran).  At the time, C was not as ubiquitous as it is now; FORTRAN
-was.  The last chapter presented a `ratfor' to FORTRAN processor,
-written in `ratfor'.  `ratfor' looks an awful lot like C; if you know
-C, you won't have any problem following the code.
+was.  The last chapter presented a ‘ratfor’ to FORTRAN processor,
+written in ‘ratfor’.  ‘ratfor’ looks an awful lot like C; if you know C,
+you won’t have any problem following the code.
 
-   In 1981, the book was updated and made available as `Software Tools
-in Pascal' (Addison-Wesley, ISBN 0-201-10342-7).  Both books are still
-in print and are well worth reading if you're a programmer.  They
+   In 1981, the book was updated and made available as ‘Software Tools
+in Pascal’ (Addison-Wesley, ISBN 0-201-10342-7).  Both books are still
+in print and are well worth reading if you’re a programmer.  They
 certainly made a major change in how I view programming.
 
-   The programs in both books are available from Brian Kernighan's home
+   The programs in both books are available from Brian Kernighan’s home
 page (http://cm.bell-labs.com/who/bwk).  For a number of years, there
 was an active Software Tools Users Group, whose members had ported the
-original `ratfor' programs to essentially every computer system with a
+original ‘ratfor’ programs to essentially every computer system with a
 FORTRAN compiler.  The popularity of the group waned in the middle 1980s
 as Unix began to spread beyond universities.
 
    With the current proliferation of GNU code and other clones of Unix
-programs, these programs now receive little attention; modern C
-versions are much more efficient and do more than these programs do.
+programs, these programs now receive little attention; modern C versions
+are much more efficient and do more than these programs do.
 Nevertheless, as exposition of good programming style, and evangelism
 for a still-valuable philosophy, these books are unparalleled, and I
 recommend them highly.
@@ -15185,8 +15049,8 @@ Appendix A GNU Free Documentation License
 
                      Version 1.3, 3 November 2008
 
-     Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
-     `http://fsf.org/'
+     Copyright © 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
+     <http://fsf.org/>
 
      Everyone is permitted to copy and distribute verbatim copies
      of this license document, but changing it is not allowed.
@@ -15201,7 +15065,7 @@ Appendix A GNU Free Documentation License
      author and publisher a way to get credit for their work, while not
      being considered responsible for modifications made by others.
 
-     This License is a kind of "copyleft", which means that derivative
+     This License is a kind of “copyleft�, which means that derivative
      works of the document must themselves be free in the same sense.
      It complements the GNU General Public License, which is a copyleft
      license designed for free software.
@@ -15211,29 +15075,29 @@ Appendix A GNU Free Documentation License
      free program should come with manuals providing the same freedoms
      that the software does.  But this License is not limited to
      software manuals; it can be used for any textual work, regardless
-     of subject matter or whether it is published as a printed book.
-     We recommend this License principally for works whose purpose is
+     of subject matter or whether it is published as a printed book.  We
+     recommend this License principally for works whose purpose is
      instruction or reference.
 
   1. APPLICABILITY AND DEFINITIONS
 
      This License applies to any manual or other work, in any medium,
-     that contains a notice placed by the copyright holder saying it
-     can be distributed under the terms of this License.  Such a notice
+     that contains a notice placed by the copyright holder saying it can
+     be distributed under the terms of this License.  Such a notice
      grants a world-wide, royalty-free license, unlimited in duration,
      to use that work under the conditions stated herein.  The
-     "Document", below, refers to any such manual or work.  Any member
-     of the public is a licensee, and is addressed as "you".  You
-     accept the license if you copy, modify or distribute the work in a
-     way requiring permission under copyright law.
+     “Document�, below, refers to any such manual or work.  Any member
+     of the public is a licensee, and is addressed as “you�.  You accept
+     the license if you copy, modify or distribute the work in a way
+     requiring permission under copyright law.
 
-     A "Modified Version" of the Document means any work containing the
+     A “Modified Version� of the Document means any work containing the
      Document or a portion of it, either copied verbatim, or with
      modifications and/or translated into another language.
 
-     A "Secondary Section" is a named appendix or a front-matter section
+     A “Secondary Section� is a named appendix or a front-matter section
      of the Document that deals exclusively with the relationship of the
-     publishers or authors of the Document to the Document's overall
+     publishers or authors of the Document to the Document’s overall
      subject (or to related matters) and contains nothing that could
      fall directly within that overall subject.  (Thus, if the Document
      is in part a textbook of mathematics, a Secondary Section may not
@@ -15242,62 +15106,62 @@ Appendix A GNU Free Documentation License
      of legal, commercial, philosophical, ethical or political position
      regarding them.
 
-     The "Invariant Sections" are certain Secondary Sections whose
-     titles are designated, as being those of Invariant Sections, in
-     the notice that says that the Document is released under this
-     License.  If a section does not fit the above definition of
-     Secondary then it is not allowed to be designated as Invariant.
-     The Document may contain zero Invariant Sections.  If the Document
-     does not identify any Invariant Sections then there are none.
+     The “Invariant Sections� are certain Secondary Sections whose
+     titles are designated, as being those of Invariant Sections, in the
+     notice that says that the Document is released under this License.
+     If a section does not fit the above definition of Secondary then it
+     is not allowed to be designated as Invariant.  The Document may
+     contain zero Invariant Sections.  If the Document does not identify
+     any Invariant Sections then there are none.
 
-     The "Cover Texts" are certain short passages of text that are
+     The “Cover Texts� are certain short passages of text that are
      listed, as Front-Cover Texts or Back-Cover Texts, in the notice
      that says that the Document is released under this License.  A
      Front-Cover Text may be at most 5 words, and a Back-Cover Text may
      be at most 25 words.
 
-     A "Transparent" copy of the Document means a machine-readable copy,
+     A “Transparent� copy of the Document means a machine-readable copy,
      represented in a format whose specification is available to the
      general public, that is suitable for revising the document
-     straightforwardly with generic text editors or (for images
-     composed of pixels) generic paint programs or (for drawings) some
-     widely available drawing editor, and that is suitable for input to
-     text formatters or for automatic translation to a variety of
-     formats suitable for input to text formatters.  A copy made in an
-     otherwise Transparent file format whose markup, or absence of
-     markup, has been arranged to thwart or discourage subsequent
-     modification by readers is not Transparent.  An image format is
-     not Transparent if used for any substantial amount of text.  A
-     copy that is not "Transparent" is called "Opaque".
+     straightforwardly with generic text editors or (for images composed
+     of pixels) generic paint programs or (for drawings) some widely
+     available drawing editor, and that is suitable for input to text
+     formatters or for automatic translation to a variety of formats
+     suitable for input to text formatters.  A copy made in an otherwise
+     Transparent file format whose markup, or absence of markup, has
+     been arranged to thwart or discourage subsequent modification by
+     readers is not Transparent.  An image format is not Transparent if
+     used for any substantial amount of text.  A copy that is not
+     “Transparent� is called “Opaque�.
 
      Examples of suitable formats for Transparent copies include plain
      ASCII without markup, Texinfo input format, LaTeX input format,
-     SGML or XML using a publicly available DTD, and
-     standard-conforming simple HTML, PostScript or PDF designed for
-     human modification.  Examples of transparent image formats include
-     PNG, XCF and JPG.  Opaque formats include proprietary formats that
-     can be read and edited only by proprietary word processors, SGML or
-     XML for which the DTD and/or processing tools are not generally
-     available, and the machine-generated HTML, PostScript or PDF
-     produced by some word processors for output purposes only.
-
-     The "Title Page" means, for a printed book, the title page itself,
+     SGML or XML using a publicly available DTD, and standard-conforming
+     simple HTML, PostScript or PDF designed for human modification.
+     Examples of transparent image formats include PNG, XCF and JPG.
+     Opaque formats include proprietary formats that can be read and
+     edited only by proprietary word processors, SGML or XML for which
+     the DTD and/or processing tools are not generally available, and
+     the machine-generated HTML, PostScript or PDF produced by some word
+     processors for output purposes only.
+
+     The “Title Page� means, for a printed book, the title page itself,
      plus such following pages as are needed to hold, legibly, the
      material this License requires to appear in the title page.  For
-     works in formats which do not have any title page as such, "Title
-     Page" means the text near the most prominent appearance of the
-     work's title, preceding the beginning of the body of the text.
+     works in formats which do not have any title page as such, “Title
+     Page� means the text near the most prominent appearance of the
+     work’s title, preceding the beginning of the body of the text.
 
-     The "publisher" means any person or entity that distributes copies
+     The “publisher� means any person or entity that distributes copies
      of the Document to the public.
 
-     A section "Entitled XYZ" means a named subunit of the Document
+     A section “Entitled XYZ� means a named subunit of the Document
      whose title either is precisely XYZ or contains XYZ in parentheses
      following text that translates XYZ in another language.  (Here XYZ
      stands for a specific section name mentioned below, such as
-     "Acknowledgements", "Dedications", "Endorsements", or "History".)
-     To "Preserve the Title" of such a section when you modify the
-     Document means that it remains a section "Entitled XYZ" according
+     “Acknowledgements�, “Dedications�, “Endorsements�, or “History�.)
+     To “Preserve the Title� of such a section when you modify the
+     Document means that it remains a section “Entitled XYZ� according
      to this definition.
 
      The Document may include Warranty Disclaimers next to the notice
@@ -15317,8 +15181,8 @@ Appendix A GNU Free Documentation License
      may not use technical measures to obstruct or control the reading
      or further copying of the copies you make or distribute.  However,
      you may accept compensation in exchange for copies.  If you
-     distribute a large enough number of copies you must also follow
-     the conditions in section 3.
+     distribute a large enough number of copies you must also follow the
+     conditions in section 3.
 
      You may also lend copies, under the same conditions stated above,
      and you may publicly display copies.
@@ -15327,17 +15191,16 @@ Appendix A GNU Free Documentation License
 
      If you publish printed copies (or copies in media that commonly
      have printed covers) of the Document, numbering more than 100, and
-     the Document's license notice requires Cover Texts, you must
+     the Document’s license notice requires Cover Texts, you must
      enclose the copies in covers that carry, clearly and legibly, all
      these Cover Texts: Front-Cover Texts on the front cover, and
      Back-Cover Texts on the back cover.  Both covers must also clearly
      and legibly identify you as the publisher of these copies.  The
-     front cover must present the full title with all words of the
-     title equally prominent and visible.  You may add other material
-     on the covers in addition.  Copying with changes limited to the
-     covers, as long as they preserve the title of the Document and
-     satisfy these conditions, can be treated as verbatim copying in
-     other respects.
+     front cover must present the full title with all words of the title
+     equally prominent and visible.  You may add other material on the
+     covers in addition.  Copying with changes limited to the covers, as
+     long as they preserve the title of the Document and satisfy these
+     conditions, can be treated as verbatim copying in other respects.
 
      If the required texts for either cover are too voluminous to fit
      legibly, you should put the first ones listed (as many as fit
@@ -15345,40 +15208,39 @@ Appendix A GNU Free Documentation License
      adjacent pages.
 
      If you publish or distribute Opaque copies of the Document
-     numbering more than 100, you must either include a
-     machine-readable Transparent copy along with each Opaque copy, or
-     state in or with each Opaque copy a computer-network location from
-     which the general network-using public has access to download
-     using public-standard network protocols a complete Transparent
-     copy of the Document, free of added material.  If you use the
-     latter option, you must take reasonably prudent steps, when you
-     begin distribution of Opaque copies in quantity, to ensure that
-     this Transparent copy will remain thus accessible at the stated
-     location until at least one year after the last time you
-     distribute an Opaque copy (directly or through your agents or
-     retailers) of that edition to the public.
+     numbering more than 100, you must either include a machine-readable
+     Transparent copy along with each Opaque copy, or state in or with
+     each Opaque copy a computer-network location from which the general
+     network-using public has access to download using public-standard
+     network protocols a complete Transparent copy of the Document, free
+     of added material.  If you use the latter option, you must take
+     reasonably prudent steps, when you begin distribution of Opaque
+     copies in quantity, to ensure that this Transparent copy will
+     remain thus accessible at the stated location until at least one
+     year after the last time you distribute an Opaque copy (directly or
+     through your agents or retailers) of that edition to the public.
 
      It is requested, but not required, that you contact the authors of
-     the Document well before redistributing any large number of
-     copies, to give them a chance to provide you with an updated
-     version of the Document.
+     the Document well before redistributing any large number of copies,
+     to give them a chance to provide you with an updated version of the
+     Document.
 
   4. MODIFICATIONS
 
      You may copy and distribute a Modified Version of the Document
      under the conditions of sections 2 and 3 above, provided that you
-     release the Modified Version under precisely this License, with
-     the Modified Version filling the role of the Document, thus
-     licensing distribution and modification of the Modified Version to
-     whoever possesses a copy of it.  In addition, you must do these
-     things in the Modified Version:
+     release the Modified Version under precisely this License, with the
+     Modified Version filling the role of the Document, thus licensing
+     distribution and modification of the Modified Version to whoever
+     possesses a copy of it.  In addition, you must do these things in
+     the Modified Version:
 
        A. Use in the Title Page (and on the covers, if any) a title
-          distinct from that of the Document, and from those of
-          previous versions (which should, if there were any, be listed
-          in the History section of the Document).  You may use the
-          same title as a previous version if the original publisher of
-          that version gives permission.
+          distinct from that of the Document, and from those of previous
+          versions (which should, if there were any, be listed in the
+          History section of the Document).  You may use the same title
+          as a previous version if the original publisher of that
+          version gives permission.
 
        B. List on the Title Page, as authors, one or more persons or
           entities responsible for authorship of the modifications in
@@ -15401,72 +15263,71 @@ Appendix A GNU Free Documentation License
           the Addendum below.
 
        G. Preserve in that license notice the full lists of Invariant
-          Sections and required Cover Texts given in the Document's
+          Sections and required Cover Texts given in the Document’s
           license notice.
 
        H. Include an unaltered copy of this License.
 
-       I. Preserve the section Entitled "History", Preserve its Title,
+       I. Preserve the section Entitled “History�, Preserve its Title,
           and add to it an item stating at least the title, year, new
-          authors, and publisher of the Modified Version as given on
-          the Title Page.  If there is no section Entitled "History" in
-          the Document, create one stating the title, year, authors,
-          and publisher of the Document as given on its Title Page,
-          then add an item describing the Modified Version as stated in
-          the previous sentence.
+          authors, and publisher of the Modified Version as given on the
+          Title Page.  If there is no section Entitled “History� in the
+          Document, create one stating the title, year, authors, and
+          publisher of the Document as given on its Title Page, then add
+          an item describing the Modified Version as stated in the
+          previous sentence.
 
        J. Preserve the network location, if any, given in the Document
           for public access to a Transparent copy of the Document, and
           likewise the network locations given in the Document for
-          previous versions it was based on.  These may be placed in
-          the "History" section.  You may omit a network location for a
-          work that was published at least four years before the
-          Document itself, or if the original publisher of the version
-          it refers to gives permission.
-
-       K. For any section Entitled "Acknowledgements" or "Dedications",
-          Preserve the Title of the section, and preserve in the
-          section all the substance and tone of each of the contributor
+          previous versions it was based on.  These may be placed in the
+          “History� section.  You may omit a network location for a work
+          that was published at least four years before the Document
+          itself, or if the original publisher of the version it refers
+          to gives permission.
+
+       K. For any section Entitled “Acknowledgements� or “Dedications�,
+          Preserve the Title of the section, and preserve in the section
+          all the substance and tone of each of the contributor
           acknowledgements and/or dedications given therein.
 
-       L. Preserve all the Invariant Sections of the Document,
-          unaltered in their text and in their titles.  Section numbers
-          or the equivalent are not considered part of the section
-          titles.
+       L. Preserve all the Invariant Sections of the Document, unaltered
+          in their text and in their titles.  Section numbers or the
+          equivalent are not considered part of the section titles.
 
-       M. Delete any section Entitled "Endorsements".  Such a section
+       M. Delete any section Entitled “Endorsements�.  Such a section
           may not be included in the Modified Version.
 
        N. Do not retitle any existing section to be Entitled
-          "Endorsements" or to conflict in title with any Invariant
+          “Endorsements� or to conflict in title with any Invariant
           Section.
 
        O. Preserve any Warranty Disclaimers.
 
      If the Modified Version includes new front-matter sections or
      appendices that qualify as Secondary Sections and contain no
-     material copied from the Document, you may at your option
-     designate some or all of these sections as invariant.  To do this,
-     add their titles to the list of Invariant Sections in the Modified
-     Version's license notice.  These titles must be distinct from any
-     other section titles.
+     material copied from the Document, you may at your option designate
+     some or all of these sections as invariant.  To do this, add their
+     titles to the list of Invariant Sections in the Modified Version’s
+     license notice.  These titles must be distinct from any other
+     section titles.
 
-     You may add a section Entitled "Endorsements", provided it contains
+     You may add a section Entitled “Endorsements�, provided it contains
      nothing but endorsements of your Modified Version by various
-     parties--for example, statements of peer review or that the text
-     has been approved by an organization as the authoritative
-     definition of a standard.
+     parties—for example, statements of peer review or that the text has
+     been approved by an organization as the authoritative definition of
+     a standard.
 
      You may add a passage of up to five words as a Front-Cover Text,
-     and a passage of up to 25 words as a Back-Cover Text, to the end
-     of the list of Cover Texts in the Modified Version.  Only one
-     passage of Front-Cover Text and one of Back-Cover Text may be
-     added by (or through arrangements made by) any one entity.  If the
-     Document already includes a cover text for the same cover,
-     previously added by you or by arrangement made by the same entity
-     you are acting on behalf of, you may not add another; but you may
-     replace the old one, on explicit permission from the previous
-     publisher that added the old one.
+     and a passage of up to 25 words as a Back-Cover Text, to the end of
+     the list of Cover Texts in the Modified Version.  Only one passage
+     of Front-Cover Text and one of Back-Cover Text may be added by (or
+     through arrangements made by) any one entity.  If the Document
+     already includes a cover text for the same cover, previously added
+     by you or by arrangement made by the same entity you are acting on
+     behalf of, you may not add another; but you may replace the old
+     one, on explicit permission from the previous publisher that added
+     the old one.
 
      The author(s) and publisher(s) of the Document do not by this
      License give permission to use their names for publicity for or to
@@ -15476,8 +15337,8 @@ Appendix A GNU Free Documentation License
 
      You may combine the Document with other documents released under
      this License, under the terms defined in section 4 above for
-     modified versions, provided that you include in the combination
-     all of the Invariant Sections of all of the original documents,
+     modified versions, provided that you include in the combination all
+     of the Invariant Sections of all of the original documents,
      unmodified, and list them all as Invariant Sections of your
      combined work in its license notice, and that you preserve all
      their Warranty Disclaimers.
@@ -15493,10 +15354,10 @@ Appendix A GNU Free Documentation License
      combined work.
 
      In the combination, you must combine any sections Entitled
-     "History" in the various original documents, forming one section
-     Entitled "History"; likewise combine any sections Entitled
-     "Acknowledgements", and any sections Entitled "Dedications".  You
-     must delete all sections Entitled "Endorsements."
+     “History� in the various original documents, forming one section
+     Entitled “History�; likewise combine any sections Entitled
+     “Acknowledgements�, and any sections Entitled “Dedications�.  You
+     must delete all sections Entitled “Endorsements.�
 
   6. COLLECTIONS OF DOCUMENTS
 
@@ -15504,29 +15365,29 @@ Appendix A GNU Free Documentation License
      documents released under this License, and replace the individual
      copies of this License in the various documents with a single copy
      that is included in the collection, provided that you follow the
-     rules of this License for verbatim copying of each of the
-     documents in all other respects.
+     rules of this License for verbatim copying of each of the documents
+     in all other respects.
 
      You may extract a single document from such a collection, and
      distribute it individually under this License, provided you insert
-     a copy of this License into the extracted document, and follow
-     this License in all other respects regarding verbatim copying of
-     that document.
+     a copy of this License into the extracted document, and follow this
+     License in all other respects regarding verbatim copying of that
+     document.
 
   7. AGGREGATION WITH INDEPENDENT WORKS
 
      A compilation of the Document or its derivatives with other
-     separate and independent documents or works, in or on a volume of
-     a storage or distribution medium, is called an "aggregate" if the
+     separate and independent documents or works, in or on a volume of a
+     storage or distribution medium, is called an “aggregate� if the
      copyright resulting from the compilation is not used to limit the
-     legal rights of the compilation's users beyond what the individual
+     legal rights of the compilation’s users beyond what the individual
      works permit.  When the Document is included in an aggregate, this
      License does not apply to the other works in the aggregate which
      are not themselves derivative works of the Document.
 
      If the Cover Text requirement of section 3 is applicable to these
      copies of the Document, then if the Document is less than one half
-     of the entire aggregate, the Document's Cover Texts may be placed
+     of the entire aggregate, the Document’s Cover Texts may be placed
      on covers that bracket the Document within the aggregate, or the
      electronic equivalent of covers if the Document is in electronic
      form.  Otherwise they must appear on printed covers that bracket
@@ -15548,8 +15409,8 @@ Appendix A GNU Free Documentation License
      this License or a notice or disclaimer, the original version will
      prevail.
 
-     If a section in the Document is Entitled "Acknowledgements",
-     "Dedications", or "History", the requirement (section 4) to
+     If a section in the Document is Entitled “Acknowledgements�,
+     “Dedications�, or “History�, the requirement (section 4) to
      Preserve its Title (section 1) will typically require changing the
      actual title.
 
@@ -15562,8 +15423,8 @@ Appendix A GNU Free Documentation License
 
      However, if you cease all violation of this License, then your
      license from a particular copyright holder is reinstated (a)
-     provisionally, unless and until the copyright holder explicitly
-     and finally terminates your license, and (b) permanently, if the
+     provisionally, unless and until the copyright holder explicitly and
+     finally terminates your license, and (b) permanently, if the
      copyright holder fails to notify you of the violation by some
      reasonable means prior to 60 days after the cessation.
 
@@ -15575,52 +15436,52 @@ Appendix A GNU Free Documentation License
      after your receipt of the notice.
 
      Termination of your rights under this section does not terminate
-     the licenses of parties who have received copies or rights from
-     you under this License.  If your rights have been terminated and
-     not permanently reinstated, receipt of a copy of some or all of
-     the same material does not give you any rights to use it.
+     the licenses of parties who have received copies or rights from you
+     under this License.  If your rights have been terminated and not
+     permanently reinstated, receipt of a copy of some or all of the
+     same material does not give you any rights to use it.
 
- 10. FUTURE REVISIONS OF THIS LICENSE
+  10. FUTURE REVISIONS OF THIS LICENSE
 
      The Free Software Foundation may publish new, revised versions of
      the GNU Free Documentation License from time to time.  Such new
      versions will be similar in spirit to the present version, but may
      differ in detail to address new problems or concerns.  See
-     `http://www.gnu.org/copyleft/'.
+     <http://www.gnu.org/copyleft/>.
 
      Each version of the License is given a distinguishing version
      number.  If the Document specifies that a particular numbered
-     version of this License "or any later version" applies to it, you
+     version of this License “or any later version� applies to it, you
      have the option of following the terms and conditions either of
      that specified version or of any later version that has been
-     published (not as a draft) by the Free Software Foundation.  If
-     the Document does not specify a version number of this License,
-     you may choose any version ever published (not as a draft) by the
-     Free Software Foundation.  If the Document specifies that a proxy
-     can decide which future versions of this License can be used, that
-     proxy's public statement of acceptance of a version permanently
+     published (not as a draft) by the Free Software Foundation.  If the
+     Document does not specify a version number of this License, you may
+     choose any version ever published (not as a draft) by the Free
+     Software Foundation.  If the Document specifies that a proxy can
+     decide which future versions of this License can be used, that
+     proxy’s public statement of acceptance of a version permanently
      authorizes you to choose that version for the Document.
 
- 11. RELICENSING
+  11. RELICENSING
 
-     "Massive Multiauthor Collaboration Site" (or "MMC Site") means any
+     “Massive Multiauthor Collaboration Site� (or “MMC Site�) means any
      World Wide Web server that publishes copyrightable works and also
      provides prominent facilities for anybody to edit those works.  A
      public wiki that anybody can edit is an example of such a server.
-     A "Massive Multiauthor Collaboration" (or "MMC") contained in the
+     A “Massive Multiauthor Collaboration� (or “MMC�) contained in the
      site means any set of copyrightable works thus published on the MMC
      site.
 
-     "CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0
+     “CC-BY-SA� means the Creative Commons Attribution-Share Alike 3.0
      license published by Creative Commons Corporation, a not-for-profit
      corporation with a principal place of business in San Francisco,
      California, as well as future copyleft versions of that license
      published by that same organization.
 
-     "Incorporate" means to publish or republish a Document, in whole or
+     “Incorporate� means to publish or republish a Document, in whole or
      in part, as part of another Document.
 
-     An MMC is "eligible for relicensing" if it is licensed under this
+     An MMC is “eligible for relicensing� if it is licensed under this
      License, and if all works that were first published under this
      License somewhere other than this MMC, and subsequently
      incorporated in whole or in part into the MMC, (1) had no cover
@@ -15631,7 +15492,6 @@ Appendix A GNU Free Documentation License
      site under CC-BY-SA on the same site at any time before August 1,
      2009, provided the MMC is eligible for relicensing.
 
-
 ADDENDUM: How to use this License for your documents
 ====================================================
 
@@ -15648,7 +15508,7 @@ notices just after the title page:
        Free Documentation License''.
 
    If you have Invariant Sections, Front-Cover Texts and Back-Cover
-Texts, replace the "with...Texts." line with this:
+Texts, replace the “with…Texts.� line with this:
 
          with the Invariant Sections being LIST THEIR TITLES, with
          the Front-Cover Texts being LIST, and with the Back-Cover Texts
@@ -15659,9 +15519,9 @@ combination of the three, merge those two alternatives to suit the
 situation.
 
    If your document contains nontrivial examples of program code, we
-recommend releasing these examples in parallel under your choice of
-free software license, such as the GNU General Public License, to
-permit their use in free software.
+recommend releasing these examples in parallel under your choice of free
+software license, such as the GNU General Public License, to permit
+their use in free software.
 
 
 File: coreutils.info,  Node: Concept index,  Prev: GNU Free Documentation License,  Up: Top
@@ -15676,1121 +15536,1170 @@ Index
                                                               (line   9)
 * !=:                                    String tests.        (line  28)
 * %:                                     Numeric expressions. (line  16)
-* %b:                                    printf invocation.   (line  38)
+* %b:                                    printf invocation.   (line  37)
 * &:                                     Relations for expr.  (line  17)
 * *:                                     Numeric expressions. (line  16)
-* + <1>:                                 Numeric expressions. (line  12)
 * +:                                     String expressions.  (line  53)
+* + <1>:                                 Numeric expressions. (line  12)
 * +PAGE_RANGE:                           pr invocation.       (line  39)
-* - <1>:                                 env invocation.      (line  96)
 * -:                                     Numeric expressions. (line  12)
-* - and Unix rm:                         rm invocation.       (line 114)
-* -, removing files beginning with:      rm invocation.       (line 102)
-* --:                                    Common options.      (line  44)
-* --across:                              pr invocation.       (line  63)
+* - <1>:                                 env invocation.      (line  94)
+* - and Unix ‘rm’:                       rm invocation.       (line 111)
+* ‘-’, removing files beginning with:    rm invocation.       (line  99)
+* --:                                    Common options.      (line  43)
+* --across:                              pr invocation.       (line  62)
 * --additional-suffix:                   split invocation.    (line 121)
 * --address-radix:                       od invocation.       (line  36)
 * --adjustment:                          nice invocation.     (line  51)
-* --all <1>:                             uname invocation.    (line  30)
-* --all <2>:                             nproc invocation.    (line  19)
-* --all <3>:                             who invocation.      (line  36)
-* --all <4>:                             stty invocation.     (line  26)
-* --all <5>:                             du invocation.       (line  33)
-* --all <6>:                             df invocation.       (line  43)
-* --all <7>:                             Which files are listed.
-                                                              (line  13)
 * --all:                                 unexpand invocation. (line  37)
+* --all <1>:                             Which files are listed.
+                                                              (line  13)
+* --all <2>:                             df invocation.       (line  42)
+* --all <3>:                             du invocation.       (line  32)
+* --all <4>:                             stty invocation.     (line  26)
+* --all <5>:                             who invocation.      (line  35)
+* --all <6>:                             nproc invocation.    (line  19)
+* --all <7>:                             uname invocation.    (line  30)
 * --all-repeated:                        uniq invocation.     (line  69)
 * --almost-all:                          Which files are listed.
                                                               (line  17)
-* --apparent-size:                       du invocation.       (line  36)
+* --apparent-size:                       du invocation.       (line  35)
 * --append:                              tee invocation.      (line  25)
-* --archive:                             cp invocation.       (line  65)
-* --attributes-only:                     cp invocation.       (line  74)
+* --archive:                             cp invocation.       (line  63)
+* --attributes-only:                     cp invocation.       (line  72)
 * --author:                              What information is listed.
                                                               (line  10)
-* --backup <1>:                          ln invocation.       (line  84)
-* --backup <2>:                          mv invocation.       (line  58)
-* --backup <3>:                          install invocation.  (line  42)
-* --backup <4>:                          cp invocation.       (line  81)
 * --backup:                              Backup options.      (line  13)
-* --batch-size:                          sort invocation.     (line 259)
+* --backup <1>:                          cp invocation.       (line  79)
+* --backup <2>:                          install invocation.  (line  41)
+* --backup <3>:                          mv invocation.       (line  56)
+* --backup <4>:                          ln invocation.       (line  80)
+* --batch-size:                          sort invocation.     (line 255)
 * --before:                              tac invocation.      (line  21)
 * --binary:                              md5sum invocation.   (line  37)
-* --block-size <1>:                      du invocation.       (line  53)
-* --block-size <2>:                      df invocation.       (line  49)
-* --block-size:                          Block size.          (line 137)
+* --block-size:                          Block size.          (line 121)
+* --block-size <1>:                      df invocation.       (line  48)
+* --block-size <2>:                      du invocation.       (line  52)
 * --block-size=SIZE:                     Block size.          (line  12)
-* --body-numbering:                      nl invocation.       (line  47)
-* --boot:                                who invocation.      (line  40)
+* --body-numbering:                      nl invocation.       (line  45)
+* --boot:                                who invocation.      (line  39)
 * --bourne-shell:                        dircolors invocation.
                                                               (line  34)
-* --buffer-size:                         sort invocation.     (line 309)
-* --bytes <1>:                           du invocation.       (line  58)
-* --bytes <2>:                           cut invocation.      (line  26)
-* --bytes <3>:                           wc invocation.       (line  43)
-* --bytes <4>:                           split invocation.    (line  40)
-* --bytes <5>:                           tail invocation.     (line  32)
-* --bytes <6>:                           head invocation.     (line  24)
+* --buffer-size:                         sort invocation.     (line 306)
 * --bytes:                               fold invocation.     (line  23)
+* --bytes <1>:                           head invocation.     (line  24)
+* --bytes <2>:                           tail invocation.     (line  32)
+* --bytes <3>:                           split invocation.    (line  40)
+* --bytes <4>:                           wc invocation.       (line  43)
+* --bytes <5>:                           cut invocation.      (line  26)
+* --bytes <6>:                           du invocation.       (line  57)
 * --c-shell:                             dircolors invocation.
                                                               (line  40)
-* --canonicalize:                        readlink invocation. (line  29)
+* --canonicalize:                        readlink invocation. (line  30)
+* --canonicalize-existing:               readlink invocation. (line  37)
 * --canonicalize-existing <1>:           realpath invocation. (line  17)
-* --canonicalize-existing:               readlink invocation. (line  36)
+* --canonicalize-missing:                readlink invocation. (line  44)
 * --canonicalize-missing <1>:            realpath invocation. (line  25)
-* --canonicalize-missing:                readlink invocation. (line  43)
-* --changes <1>:                         chmod invocation.    (line  39)
-* --changes <2>:                         chgrp invocation.    (line  20)
-* --changes:                             chown invocation.    (line  70)
+* --changes:                             chown invocation.    (line  73)
+* --changes <1>:                         chgrp invocation.    (line  24)
+* --changes <2>:                         chmod invocation.    (line  39)
 * --characters:                          cut invocation.      (line  34)
 * --chars:                               wc invocation.       (line  47)
 * --check:                               sort invocation.     (line  18)
-* --check-chars:                         uniq invocation.     (line 106)
+* --check <1>:                           sort invocation.     (line  26)
+* --check-chars:                         uniq invocation.     (line 135)
 * --classify:                            General output formatting.
-                                                              (line  48)
+                                                              (line  46)
 * --color:                               General output formatting.
                                                               (line  21)
 * --columns:                             pr invocation.       (line  49)
-* --compare:                             install invocation.  (line  47)
-* --complement:                          cut invocation.      (line  83)
+* --compare:                             install invocation.  (line  46)
+* --complement:                          cut invocation.      (line  82)
 * --compute:                             runcon invocation.   (line  27)
-* --context <1>:                         id invocation.       (line  48)
-* --context <2>:                         mknod invocation.    (line  54)
-* --context <3>:                         mkfifo invocation.   (line  28)
-* --context <4>:                         mkdir invocation.    (line  56)
-* --context <5>:                         install invocation.  (line 133)
 * --context:                             What information is listed.
-                                                              (line 268)
-* --count <1>:                           who invocation.      (line  70)
+                                                              (line 255)
+* --context <1>:                         cp invocation.       (line 376)
+* --context <2>:                         install invocation.  (line 138)
+* --context <3>:                         mv invocation.       (line 112)
+* --context <4>:                         mkdir invocation.    (line  56)
+* --context <5>:                         mkfifo invocation.   (line  28)
+* --context <6>:                         mknod invocation.    (line  53)
+* --context <7>:                         id invocation.       (line  51)
 * --count:                               uniq invocation.     (line  55)
-* --count-links:                         du invocation.       (line 115)
+* --count <1>:                           who invocation.      (line  69)
+* --count-links:                         du invocation.       (line 123)
 * --crown-margin:                        fmt invocation.      (line  34)
 * --csh:                                 dircolors invocation.
                                                               (line  40)
-* --date <1>:                            Options for date.    (line  11)
 * --date:                                touch invocation.    (line  86)
-* --dead:                                who invocation.      (line  44)
+* --date <1>:                            Options for date.    (line  11)
+* --dead:                                who invocation.      (line  43)
 * --debug:                               numfmt invocation.   (line  29)
 * --decode:                              base64 invocation.   (line  30)
-* --delimiter <1>:                       cut invocation.      (line  63)
 * --delimiter:                           numfmt invocation.   (line  34)
-* --delimiters:                          paste invocation.    (line  43)
-* --dereference <1>:                     chcon invocation.    (line  21)
-* --dereference <2>:                     stat invocation.     (line  22)
-* --dereference <3>:                     du invocation.       (line 109)
-* --dereference <4>:                     chgrp invocation.    (line  30)
-* --dereference <5>:                     chown invocation.    (line 103)
-* --dereference <6>:                     cp invocation.       (line 151)
+* --delimiter <1>:                       cut invocation.      (line  62)
+* --delimiters:                          paste invocation.    (line  61)
 * --dereference:                         Which files are listed.
-                                                              (line  84)
-* --dereference-args:                    du invocation.       (line  68)
+                                                              (line  83)
+* --dereference <1>:                     cp invocation.       (line 148)
+* --dereference <2>:                     chown invocation.    (line 106)
+* --dereference <3>:                     chgrp invocation.    (line  34)
+* --dereference <4>:                     du invocation.       (line 117)
+* --dereference <5>:                     stat invocation.     (line  22)
+* --dereference <6>:                     chcon invocation.    (line  21)
+* --dereference-args:                    du invocation.       (line  67)
 * --dereference-command-line:            Which files are listed.
                                                               (line  36)
 * --dereference-command-line-symlink-to-dir: Which files are listed.
                                                               (line  41)
-* --dictionary-order:                    sort invocation.     (line  87)
-* --digits:                              csplit invocation.   (line  81)
+* --dictionary-order:                    sort invocation.     (line  86)
+* --digits:                              csplit invocation.   (line  79)
 * --dir:                                 rm invocation.       (line  35)
-* --directory <1>:                       mktemp invocation.   (line  86)
-* --directory <2>:                       ln invocation.       (line  90)
-* --directory <3>:                       install invocation.  (line  62)
 * --directory:                           Which files are listed.
                                                               (line  28)
+* --directory <1>:                       install invocation.  (line  67)
+* --directory <2>:                       ln invocation.       (line  86)
+* --directory <3>:                       mktemp invocation.   (line  85)
 * --dired:                               What information is listed.
                                                               (line  16)
-* --double-space:                        pr invocation.       (line  75)
-* --dry-run:                             mktemp invocation.   (line  98)
+* --double-space:                        pr invocation.       (line  74)
+* --dry-run:                             mktemp invocation.   (line  97)
 * --echo:                                shuf invocation.     (line  19)
-* --elide-empty-files <1>:               csplit invocation.   (line  90)
 * --elide-empty-files:                   split invocation.    (line 126)
+* --elide-empty-files <1>:               csplit invocation.   (line  93)
+* --endian:                              od invocation.       (line  51)
 * --error:                               stdbuf invocation.   (line  34)
 * --escape:                              Formatting the file names.
                                                               (line  11)
-* --exact:                               shred invocation.    (line 134)
-* --exclude-from=FILE:                   du invocation.       (line 231)
-* --exclude-type:                        df invocation.       (line 222)
-* --exclude=PATTERN:                     du invocation.       (line 236)
-* --expand-tabs:                         pr invocation.       (line  99)
+* --exact:                               shred invocation.    (line 143)
+* --exclude-from=FILE:                   du invocation.       (line 250)
+* --exclude-type:                        df invocation.       (line 214)
+* --exclude=PATTERN:                     du invocation.       (line 255)
+* --expand-tabs:                         pr invocation.       (line  98)
 * --field:                               numfmt invocation.   (line  38)
-* --field-separator:                     sort invocation.     (line 325)
-* --fields:                              cut invocation.      (line  44)
-* --file <1>:                            Options for date.    (line  26)
+* --field-separator:                     sort invocation.     (line 322)
+* --fields:                              cut invocation.      (line  43)
 * --file:                                stty invocation.     (line  31)
+* --file <1>:                            Options for date.    (line  26)
 * --file-system:                         stat invocation.     (line  28)
 * --file-type:                           General output formatting.
-                                                              (line  59)
-* --files0-from=FILE <1>:                du invocation.       (line  80)
-* --files0-from=FILE <2>:                sort invocation.     (line 221)
+                                                              (line  57)
 * --files0-from=FILE:                    wc invocation.       (line  62)
+* --files0-from=FILE <1>:                sort invocation.     (line 217)
+* --files0-from=FILE <2>:                du invocation.       (line  79)
 * --filter:                              split invocation.    (line  60)
-* --first-line-number:                   pr invocation.       (line 175)
+* --first-line-number:                   pr invocation.       (line 174)
 * --follow:                              tail invocation.     (line  48)
-* --footer-numbering:                    nl invocation.       (line  75)
-* --force <1>:                           ln invocation.       (line  96)
-* --force <2>:                           shred invocation.    (line 101)
-* --force <3>:                           rm invocation.       (line  39)
-* --force <4>:                           mv invocation.       (line  63)
-* --force:                               cp invocation.       (line 118)
+* --footer-numbering:                    nl invocation.       (line  70)
+* --force:                               cp invocation.       (line 115)
+* --force <1>:                           mv invocation.       (line  61)
+* --force <2>:                           rm invocation.       (line  39)
+* --force <3>:                           shred invocation.    (line 101)
+* --force <4>:                           ln invocation.       (line  92)
 * --foreground:                          timeout invocation.  (line  24)
-* --form-feed:                           pr invocation.       (line 107)
-* --format <1>:                          General output formatting.
-                                                              (line  10)
+* --form-feed:                           pr invocation.       (line 106)
+* --format:                              od invocation.       (line  89)
+* --format <1>:                          numfmt invocation.   (line  41)
 * --format <2>:                          What information is listed.
                                                               (line 131)
-* --format <3>:                          numfmt invocation.   (line  41)
-* --format:                              od invocation.       (line  85)
-* --format=FORMAT <1>:                   seq invocation.      (line  24)
+* --format <3>:                          General output formatting.
+                                                              (line  10)
+* --format <4>:                          General output formatting.
+                                                              (line  15)
+* --format <5>:                          General output formatting.
+                                                              (line  92)
+* --format <6>:                          General output formatting.
+                                                              (line 102)
 * --format=FORMAT:                       stat invocation.     (line  34)
-* --from <1>:                            chown invocation.    (line  80)
-* --from:                                numfmt invocation.   (line  48)
-* --from-unit:                           numfmt invocation.   (line  53)
+* --format=FORMAT <1>:                   seq invocation.      (line  26)
+* --from:                                numfmt invocation.   (line  50)
+* --from <1>:                            chown invocation.    (line  83)
+* --from-unit:                           numfmt invocation.   (line  55)
 * --full-time:                           What information is listed.
                                                               (line 100)
-* --general-numeric-sort:                sort invocation.     (line 105)
+* --general-numeric-sort:                sort invocation.     (line 104)
 * --goal:                                fmt invocation.      (line  64)
-* --group <1>:                           id invocation.       (line  26)
-* --group:                               install invocation.  (line  68)
+* --group:                               uniq invocation.     (line 101)
+* --group <1>:                           install invocation.  (line  73)
+* --group <2>:                           id invocation.       (line  29)
 * --group-directories-first:             Which files are listed.
                                                               (line  50)
-* --grouping:                            numfmt invocation.   (line  59)
-* --groups <1>:                          chroot invocation.   (line  29)
-* --groups:                              id invocation.       (line  30)
+* --grouping:                            numfmt invocation.   (line  61)
+* --groups:                              id invocation.       (line  33)
+* --groups <1>:                          chroot invocation.   (line  31)
 * --hardware-platform:                   uname invocation.    (line  35)
-* --head-count:                          shuf invocation.     (line  32)
-* --header <1>:                          join invocation.     (line  90)
-* --header <2>:                          pr invocation.       (line 112)
-* --header:                              numfmt invocation.   (line  65)
-* --header-numbering:                    nl invocation.       (line  79)
-* --header=N:                            numfmt invocation.   (line  65)
-* --heading:                             who invocation.      (line  48)
-* --help:                                Common options.      (line  37)
+* --head-count:                          shuf invocation.     (line  31)
+* --header:                              numfmt invocation.   (line  67)
+* --header <1>:                          pr invocation.       (line 111)
+* --header <2>:                          join invocation.     (line  87)
+* --header-numbering:                    nl invocation.       (line  74)
+* --header=N:                            numfmt invocation.   (line  67)
+* --heading:                             who invocation.      (line  47)
+* --help:                                Common options.      (line  36)
 * --hide-control-chars:                  Formatting the file names.
                                                               (line  23)
 * --hide=PATTERN:                        Which files are listed.
                                                               (line  57)
-* --human-numeric-sort:                  sort invocation.     (line 130)
-* --human-readable <1>:                  du invocation.       (line  97)
-* --human-readable <2>:                  df invocation.       (line  64)
-* --human-readable <3>:                  What information is listed.
+* --human-numeric-sort:                  sort invocation.     (line 125)
+* --human-readable:                      Block size.          (line 121)
+* --human-readable <1>:                  What information is listed.
                                                               (line 116)
-* --human-readable:                      Block size.          (line 137)
+* --human-readable <2>:                  df invocation.       (line  63)
+* --human-readable <3>:                  du invocation.       (line  96)
 * --ignore:                              nproc invocation.    (line  25)
 * --ignore-backups:                      Which files are listed.
                                                               (line  23)
-* --ignore-case <1>:                     join invocation.     (line 100)
-* --ignore-case <2>:                     uniq invocation.     (line  59)
-* --ignore-case:                         sort invocation.     (line  94)
-* --ignore-environment:                  env invocation.      (line  96)
+* --ignore-case:                         sort invocation.     (line  93)
+* --ignore-case <1>:                     uniq invocation.     (line  59)
+* --ignore-case <2>:                     join invocation.     (line  97)
+* --ignore-environment:                  env invocation.      (line  94)
 * --ignore-fail-on-non-empty:            rmdir invocation.    (line  17)
 * --ignore-garbage:                      base64 invocation.   (line  36)
 * --ignore-interrupts:                   tee invocation.      (line  30)
-* --ignore-leading-blanks:               sort invocation.     (line  79)
-* --ignore-nonprinting:                  sort invocation.     (line 145)
+* --ignore-leading-blanks:               sort invocation.     (line  78)
+* --ignore-nonprinting:                  sort invocation.     (line 142)
 * --ignore=PATTERN:                      Which files are listed.
-                                                              (line  70)
-* --indent:                              pr invocation.       (line 181)
+                                                              (line  69)
+* --indent:                              pr invocation.       (line 180)
 * --indicator-style:                     General output formatting.
-                                                              (line  48)
-* --initial:                             expand invocation.   (line  34)
+                                                              (line  46)
+* --indicator-style <1>:                 General output formatting.
+                                                              (line  57)
+* --indicator-style <2>:                 General output formatting.
+                                                              (line  61)
+* --indicator-style <3>:                 General output formatting.
+                                                              (line  97)
+* --initial:                             expand invocation.   (line  33)
 * --inode:                               What information is listed.
                                                               (line 123)
-* --inodes:                              df invocation.       (line  74)
+* --inodes:                              df invocation.       (line  73)
+* --inodes <1>:                          du invocation.       (line 102)
 * --input:                               stdbuf invocation.   (line  26)
 * --input-range:                         shuf invocation.     (line  23)
-* --interactive <1>:                     ln invocation.       (line 100)
+* --interactive:                         cp invocation.       (line 138)
+* --interactive <1>:                     mv invocation.       (line  67)
 * --interactive <2>:                     rm invocation.       (line  54)
-* --interactive <3>:                     mv invocation.       (line  69)
-* --interactive:                         cp invocation.       (line 141)
-* --invalid:                             numfmt invocation.   (line  68)
+* --interactive <3>:                     ln invocation.       (line  96)
+* --invalid:                             numfmt invocation.   (line  70)
 * --io-blocks:                           truncate invocation. (line  26)
 * --iso-8601[=TIMESPEC]:                 Options for date.    (line  34)
 * --iterations=NUMBER:                   shred invocation.    (line 106)
-* --join-blank-lines:                    nl invocation.       (line  87)
-* --join-lines:                          pr invocation.       (line 125)
-* --keep-files:                          csplit invocation.   (line  86)
+* --join-blank-lines:                    nl invocation.       (line  82)
+* --join-lines:                          pr invocation.       (line 124)
+* --keep-files:                          csplit invocation.   (line  84)
 * --kernel-name:                         uname invocation.    (line  65)
 * --kernel-release:                      uname invocation.    (line  61)
 * --kernel-version:                      uname invocation.    (line  76)
-* --key:                                 sort invocation.     (line 234)
+* --key:                                 sort invocation.     (line 230)
 * --kibibytes:                           General output formatting.
-                                                              (line  85)
-* --kill-after:                          timeout invocation.  (line  39)
-* --length:                              pr invocation.       (line 134)
+                                                              (line  80)
+* --kill-after:                          timeout invocation.  (line  38)
+* --length:                              pr invocation.       (line 133)
 * --line-bytes:                          split invocation.    (line  54)
-* --line-increment:                      nl invocation.       (line  83)
-* --lines <1>:                           wc invocation.       (line  55)
-* --lines <2>:                           split invocation.    (line  33)
-* --lines <3>:                           tail invocation.     (line 152)
+* --line-increment:                      nl invocation.       (line  78)
 * --lines:                               head invocation.     (line  39)
-* --link:                                cp invocation.       (line 147)
+* --lines <1>:                           tail invocation.     (line 162)
+* --lines <2>:                           split invocation.    (line  33)
+* --lines <3>:                           wc invocation.       (line  55)
+* --link:                                cp invocation.       (line 144)
 * --literal:                             Formatting the file names.
                                                               (line  17)
-* --local:                               df invocation.       (line  85)
-* --logical <1>:                         pwd invocation.      (line  15)
-* --logical <2>:                         realpath invocation. (line  30)
-* --logical:                             ln invocation.       (line 104)
-* --login:                               who invocation.      (line  52)
-* --lookup:                              who invocation.      (line  57)
+* --local:                               df invocation.       (line  84)
+* --logical:                             ln invocation.       (line 100)
+* --logical <1>:                         realpath invocation. (line  30)
+* --logical <2>:                         pwd invocation.      (line  15)
+* --login:                               who invocation.      (line  51)
+* --lookup:                              who invocation.      (line  56)
 * --machine:                             uname invocation.    (line  41)
-* --max-depth=DEPTH:                     du invocation.       (line  75)
+* --max-depth=DEPTH:                     du invocation.       (line  74)
 * --max-line-length:                     wc invocation.       (line  59)
-* --max-unchanged-stats:                 tail invocation.     (line 140)
+* --max-unchanged-stats:                 tail invocation.     (line 150)
+* --merge:                               pr invocation.       (line 140)
 * --merge <1>:                           sort invocation.     (line  32)
-* --merge:                               pr invocation.       (line 141)
-* --mesg:                                who invocation.      (line  95)
-* --message:                             who invocation.      (line  95)
-* --mode <1>:                            mknod invocation.    (line  48)
+* --mesg:                                who invocation.      (line  94)
+* --message:                             who invocation.      (line  94)
+* --mode:                                install invocation.  (line  79)
+* --mode <1>:                            mkdir invocation.    (line  19)
 * --mode <2>:                            mkfifo invocation.   (line  21)
-* --mode <3>:                            mkdir invocation.    (line  19)
-* --mode:                                install invocation.  (line  74)
-* --month-sort:                          sort invocation.     (line 152)
+* --mode <3>:                            mknod invocation.    (line  47)
+* --month-sort:                          sort invocation.     (line 149)
 * --multiple:                            basename invocation. (line  32)
-* --name:                                id invocation.       (line  34)
-* --no-clobber <1>:                      mv invocation.       (line  76)
-* --no-clobber:                          cp invocation.       (line 158)
-* --no-create <1>:                       truncate invocation. (line  22)
+* --name:                                id invocation.       (line  37)
+* --no-clobber:                          cp invocation.       (line 155)
+* --no-clobber <1>:                      mv invocation.       (line  74)
 * --no-create:                           touch invocation.    (line  82)
-* --no-dereference <1>:                  chcon invocation.    (line  26)
-* --no-dereference <2>:                  du invocation.       (line 125)
-* --no-dereference <3>:                  touch invocation.    (line 100)
-* --no-dereference <4>:                  chgrp invocation.    (line  35)
-* --no-dereference <5>:                  chown invocation.    (line 108)
-* --no-dereference <6>:                  ln invocation.       (line 110)
-* --no-dereference:                      cp invocation.       (line 164)
-* --no-file-warnings:                    pr invocation.       (line 188)
+* --no-create <1>:                       truncate invocation. (line  22)
+* --no-dereference:                      cp invocation.       (line 161)
+* --no-dereference <1>:                  ln invocation.       (line 106)
+* --no-dereference <2>:                  chown invocation.    (line 111)
+* --no-dereference <3>:                  chgrp invocation.    (line  39)
+* --no-dereference <4>:                  touch invocation.    (line 100)
+* --no-dereference <5>:                  du invocation.       (line 133)
+* --no-dereference <6>:                  chcon invocation.    (line  26)
+* --no-file-warnings:                    pr invocation.       (line 187)
 * --no-group:                            What information is listed.
                                                               (line 110)
-* --no-newline:                          readlink invocation. (line  48)
-* --no-preserve-root <1>:                chcon invocation.    (line  43)
-* --no-preserve-root <2>:                chmod invocation.    (line  54)
-* --no-preserve-root <3>:                chgrp invocation.    (line  48)
-* --no-preserve-root <4>:                chown invocation.    (line 121)
-* --no-preserve-root:                    rm invocation.       (line  88)
-* --no-renumber:                         nl invocation.       (line 108)
-* --no-symlinks:                         realpath invocation. (line  46)
-* --no-sync:                             df invocation.       (line  89)
-* --no-target-directory <1>:             ln invocation.       (line 165)
-* --no-target-directory <2>:             mv invocation.       (line 109)
-* --no-target-directory <3>:             install invocation.  (line 124)
-* --no-target-directory <4>:             cp invocation.       (line 356)
+* --no-newline:                          readlink invocation. (line  49)
+* --no-preserve-root:                    rm invocation.       (line  86)
+* --no-preserve-root <1>:                chown invocation.    (line 124)
+* --no-preserve-root <2>:                chgrp invocation.    (line  52)
+* --no-preserve-root <3>:                chmod invocation.    (line  54)
+* --no-preserve-root <4>:                chcon invocation.    (line  43)
+* --no-renumber:                         nl invocation.       (line 101)
+* --no-symlinks:                         realpath invocation. (line  69)
+* --no-sync:                             df invocation.       (line  88)
 * --no-target-directory:                 Target directory.    (line  15)
+* --no-target-directory <1>:             cp invocation.       (line 347)
+* --no-target-directory <2>:             install invocation.  (line 129)
+* --no-target-directory <3>:             mv invocation.       (line 107)
+* --no-target-directory <4>:             ln invocation.       (line 173)
 * --nodename:                            uname invocation.    (line  46)
-* --null <1>:                            env invocation.      (line  83)
-* --null <2>:                            printenv invocation. (line  19)
 * --null:                                du invocation.       (line  26)
-* --number <1>:                          split invocation.    (line  77)
+* --null <1>:                            printenv invocation. (line  19)
+* --null <2>:                            env invocation.      (line  82)
 * --number:                              cat invocation.      (line  31)
-* --number-format:                       nl invocation.       (line  95)
-* --number-lines:                        pr invocation.       (line 154)
+* --number <1>:                          split invocation.    (line  76)
+* --number-format:                       nl invocation.       (line  90)
+* --number-lines:                        pr invocation.       (line 153)
 * --number-nonblank:                     cat invocation.      (line  20)
-* --number-separator:                    nl invocation.       (line 112)
-* --number-width:                        nl invocation.       (line 122)
-* --numeric-sort:                        sort invocation.     (line 162)
+* --number-separator:                    nl invocation.       (line 105)
+* --number-width:                        nl invocation.       (line 115)
+* --numeric-sort:                        sort invocation.     (line 159)
 * --numeric-suffixes:                    split invocation.    (line 114)
 * --numeric-uid-gid:                     What information is listed.
-                                                              (line 234)
-* --omit-header:                         pr invocation.       (line 211)
-* --omit-pagination:                     pr invocation.       (line 222)
-* --one-file-system <1>:                 du invocation.       (line 242)
-* --one-file-system <2>:                 rm invocation.       (line  67)
-* --one-file-system:                     cp invocation.       (line 379)
-* --only-delimited:                      cut invocation.      (line  71)
+                                                              (line 222)
+* --omit-header:                         pr invocation.       (line 210)
+* --omit-pagination:                     pr invocation.       (line 220)
+* --one-file-system:                     cp invocation.       (line 370)
+* --one-file-system <1>:                 rm invocation.       (line  65)
+* --one-file-system <2>:                 du invocation.       (line 261)
+* --only-delimited:                      cut invocation.      (line  70)
 * --operating-system:                    uname invocation.    (line  57)
-* --output <1>:                          stdbuf invocation.   (line  30)
-* --output <2>:                          df invocation.       (line  96)
-* --output <3>:                          shuf invocation.     (line  37)
-* --output:                              sort invocation.     (line 285)
-* --output-delimiter:                    cut invocation.      (line  76)
-* --output-duplicates:                   od invocation.       (line 155)
-* --output-tabs:                         pr invocation.       (line 118)
-* --owner:                               install invocation.  (line  86)
-* --padding:                             numfmt invocation.   (line  76)
-* --page_width:                          pr invocation.       (line 240)
+* --output:                              sort invocation.     (line 281)
+* --output <1>:                          shuf invocation.     (line  36)
+* --output <2>:                          df invocation.       (line  95)
+* --output <3>:                          stdbuf invocation.   (line  30)
+* --output-delimiter:                    cut invocation.      (line  75)
+* --output-duplicates:                   od invocation.       (line 149)
+* --output-tabs:                         pr invocation.       (line 117)
+* --owner:                               install invocation.  (line  91)
+* --padding:                             numfmt invocation.   (line  78)
 * --pages=PAGE_RANGE:                    pr invocation.       (line  39)
-* --parallel:                            sort invocation.     (line 353)
-* --parents <1>:                         rmdir invocation.    (line  22)
-* --parents <2>:                         mkdir invocation.    (line  34)
-* --parents:                             cp invocation.       (line 244)
-* --physical <1>:                        pwd invocation.      (line  22)
-* --physical <2>:                        realpath invocation. (line  35)
-* --physical:                            ln invocation.       (line 129)
-* --pid:                                 tail invocation.     (line 120)
-* --portability <1>:                     pathchk invocation.  (line  46)
-* --portability:                         df invocation.       (line 158)
-* --prefix:                              csplit invocation.   (line  62)
-* --preserve:                            cp invocation.       (line 171)
-* --preserve-context:                    install invocation.  (line  91)
-* --preserve-root <1>:                   chcon invocation.    (line  38)
-* --preserve-root <2>:                   chmod invocation.    (line  49)
-* --preserve-root <3>:                   chgrp invocation.    (line  43)
-* --preserve-root <4>:                   chown invocation.    (line 116)
-* --preserve-root:                       rm invocation.       (line  83)
+* --page_width:                          pr invocation.       (line 239)
+* --parallel:                            sort invocation.     (line 351)
+* --parents:                             cp invocation.       (line 236)
+* --parents <1>:                         mkdir invocation.    (line  34)
+* --parents <2>:                         rmdir invocation.    (line  22)
+* --physical:                            ln invocation.       (line 125)
+* --physical <1>:                        realpath invocation. (line  35)
+* --physical <2>:                        pwd invocation.      (line  22)
+* --pid:                                 tail invocation.     (line 130)
+* --portability:                         df invocation.       (line 152)
+* --portability <1>:                     pathchk invocation.  (line  44)
+* --prefix:                              csplit invocation.   (line  61)
+* --preserve:                            cp invocation.       (line 168)
+* --preserve-context:                    install invocation.  (line  96)
+* --preserve-root:                       rm invocation.       (line  81)
+* --preserve-root <1>:                   chown invocation.    (line 119)
+* --preserve-root <2>:                   chgrp invocation.    (line  47)
+* --preserve-root <3>:                   chmod invocation.    (line  49)
+* --preserve-root <4>:                   chcon invocation.    (line  38)
 * --preserve-status:                     timeout invocation.  (line  18)
-* --preserve-timestamps:                 install invocation.  (line  98)
+* --preserve-timestamps:                 install invocation.  (line 103)
 * --print-database:                      dircolors invocation.
                                                               (line  45)
-* --print-type:                          df invocation.       (line 197)
+* --print-type:                          df invocation.       (line 191)
 * --printf=FORMAT:                       stat invocation.     (line  43)
-* --process:                             who invocation.      (line  66)
+* --process:                             who invocation.      (line  65)
 * --processor:                           uname invocation.    (line  50)
-* --quiet <1>:                           tty invocation.      (line  18)
-* --quiet <2>:                           realpath invocation. (line  41)
-* --quiet <3>:                           mktemp invocation.   (line  93)
-* --quiet <4>:                           chmod invocation.    (line  45)
-* --quiet <5>:                           chgrp invocation.    (line  26)
-* --quiet <6>:                           chown invocation.    (line  76)
-* --quiet <7>:                           readlink invocation. (line  55)
-* --quiet <8>:                           md5sum invocation.   (line  68)
-* --quiet <9>:                           csplit invocation.   (line 101)
-* --quiet <10>:                          tail invocation.     (line 160)
 * --quiet:                               head invocation.     (line  46)
+* --quiet <1>:                           tail invocation.     (line 170)
+* --quiet <2>:                           csplit invocation.   (line 104)
+* --quiet <3>:                           md5sum invocation.   (line  68)
+* --quiet <4>:                           readlink invocation. (line  56)
+* --quiet <5>:                           chown invocation.    (line  79)
+* --quiet <6>:                           chgrp invocation.    (line  30)
+* --quiet <7>:                           chmod invocation.    (line  45)
+* --quiet <8>:                           mktemp invocation.   (line  92)
+* --quiet <9>:                           realpath invocation. (line  41)
+* --quiet <10>:                          tty invocation.      (line  18)
 * --quote-name:                          Formatting the file names.
                                                               (line  30)
 * --quoting-style:                       Formatting the file names.
                                                               (line  11)
-* --random-sort:                         sort invocation.     (line 191)
-* --random-source <1>:                   shred invocation.    (line 112)
-* --random-source <2>:                   shuf invocation.     (line  43)
-* --random-source:                       sort invocation.     (line 298)
-* --range <1>:                           runcon invocation.   (line  43)
+* --quoting-style <1>:                   Formatting the file names.
+                                                              (line  17)
+* --quoting-style <2>:                   Formatting the file names.
+                                                              (line  30)
+* --quoting-style <3>:                   Formatting the file names.
+                                                              (line  34)
+* --random-sort:                         sort invocation.     (line 188)
+* --random-source:                       sort invocation.     (line 294)
+* --random-source <1>:                   shuf invocation.     (line  42)
+* --random-source <2>:                   shred invocation.    (line 112)
 * --range:                               chcon invocation.    (line  77)
-* --read-bytes:                          od invocation.       (line  71)
-* --real:                                id invocation.       (line  39)
-* --recursive <1>:                       chcon invocation.    (line  35)
-* --recursive <2>:                       chmod invocation.    (line  69)
-* --recursive <3>:                       chgrp invocation.    (line  66)
-* --recursive <4>:                       chown invocation.    (line 140)
-* --recursive <5>:                       rm invocation.       (line  95)
-* --recursive <6>:                       cp invocation.       (line 257)
+* --range <1>:                           runcon invocation.   (line  43)
+* --read-bytes:                          od invocation.       (line  75)
+* --real:                                id invocation.       (line  42)
 * --recursive:                           Which files are listed.
-                                                              (line  91)
-* --reference <1>:                       chcon invocation.    (line  30)
-* --reference <2>:                       Options for date.    (line  59)
-* --reference <3>:                       truncate invocation. (line  30)
-* --reference <4>:                       touch invocation.    (line 119)
-* --reference <5>:                       chmod invocation.    (line  62)
-* --reference <6>:                       chgrp invocation.    (line  52)
-* --reference:                           chown invocation.    (line 125)
-* --reflink[=WHEN]:                      cp invocation.       (line 270)
+                                                              (line  90)
+* --recursive <1>:                       cp invocation.       (line 249)
+* --recursive <2>:                       rm invocation.       (line  93)
+* --recursive <3>:                       chown invocation.    (line 143)
+* --recursive <4>:                       chgrp invocation.    (line  70)
+* --recursive <5>:                       chmod invocation.    (line  69)
+* --recursive <6>:                       chcon invocation.    (line  35)
+* --reference:                           chown invocation.    (line 128)
+* --reference <1>:                       chgrp invocation.    (line  56)
+* --reference <2>:                       chmod invocation.    (line  62)
+* --reference <3>:                       touch invocation.    (line 119)
+* --reference <4>:                       truncate invocation. (line  30)
+* --reference <5>:                       Options for date.    (line  59)
+* --reference <6>:                       chcon invocation.    (line  30)
+* --reflink[=WHEN]:                      cp invocation.       (line 262)
 * --regex:                               tac invocation.      (line  26)
-* --relative:                            ln invocation.       (line 138)
-* --relative-base:                       realpath invocation. (line  61)
-* --relative-to:                         realpath invocation. (line  56)
+* --relative:                            ln invocation.       (line 134)
+* --relative-base:                       realpath invocation. (line  49)
+* --relative-to:                         realpath invocation. (line  44)
 * --remove:                              shred invocation.    (line 123)
-* --remove-destination:                  cp invocation.       (line 296)
+* --remove-destination:                  cp invocation.       (line 288)
+* --remove=unlink:                       shred invocation.    (line 123)
+* --remove=wipe:                         shred invocation.    (line 123)
+* --remove=wipesync:                     shred invocation.    (line 123)
+* --repeat:                              shuf invocation.     (line  47)
 * --repeated:                            uniq invocation.     (line  63)
 * --retry:                               tail invocation.     (line 104)
+* --reverse:                             sort invocation.     (line 182)
 * --reverse <1>:                         Sorting the output.  (line  27)
-* --reverse:                             sort invocation.     (line 185)
 * --rfc-2822:                            Options for date.    (line  65)
 * --rfc-3339=TIMESPEC:                   Options for date.    (line  77)
 * --rfc-822:                             Options for date.    (line  65)
-* --role <1>:                            runcon invocation.   (line  35)
 * --role:                                chcon invocation.    (line  69)
-* --round:                               numfmt invocation.   (line  83)
-* --round=down:                          numfmt invocation.   (line  83)
-* --round=from-zero:                     numfmt invocation.   (line  83)
-* --round=nearest:                       numfmt invocation.   (line  83)
-* --round=towards-zero:                  numfmt invocation.   (line  83)
-* --round=up:                            numfmt invocation.   (line  83)
-* --runlevel:                            who invocation.      (line  75)
+* --role <1>:                            runcon invocation.   (line  35)
+* --round:                               numfmt invocation.   (line  85)
+* --round=down:                          numfmt invocation.   (line  85)
+* --round=from-zero:                     numfmt invocation.   (line  85)
+* --round=nearest:                       numfmt invocation.   (line  85)
+* --round=towards-zero:                  numfmt invocation.   (line  85)
+* --round=up:                            numfmt invocation.   (line  85)
+* --runlevel:                            who invocation.      (line  74)
 * --save:                                stty invocation.     (line  41)
-* --section-delimiter:                   nl invocation.       (line  68)
-* --sep-string:                          pr invocation.       (line 202)
-* --separate-dirs:                       du invocation.       (line 130)
-* --separator <1>:                       pr invocation.       (line 193)
+* --section-delimiter:                   nl invocation.       (line  63)
+* --sep-string:                          pr invocation.       (line 201)
+* --separate-dirs:                       du invocation.       (line 138)
 * --separator:                           tac invocation.      (line  30)
-* --serial:                              paste invocation.    (line  34)
-* --set:                                 Options for date.    (line 107)
+* --separator <1>:                       pr invocation.       (line 192)
+* --serial:                              paste invocation.    (line  52)
+* --set:                                 Options for date.    (line 106)
 * --sh:                                  dircolors invocation.
                                                               (line  34)
 * --show-all:                            cat invocation.      (line  16)
+* --show-control-chars:                  pr invocation.       (line  68)
 * --show-control-chars <1>:              Formatting the file names.
-                                                              (line  78)
-* --show-control-chars:                  pr invocation.       (line  69)
+                                                              (line  72)
 * --show-ends:                           cat invocation.      (line  27)
-* --show-nonprinting <1>:                pr invocation.       (line 227)
 * --show-nonprinting:                    cat invocation.      (line  51)
+* --show-nonprinting <1>:                pr invocation.       (line 225)
 * --show-tabs:                           cat invocation.      (line  44)
-* --si <1>:                              du invocation.       (line 138)
-* --si <2>:                              df invocation.       (line 177)
-* --si <3>:                              What information is listed.
-                                                              (line 260)
-* --si:                                  Block size.          (line 137)
-* --signal:                              timeout invocation.  (line  46)
-* --silent <1>:                          tty invocation.      (line  18)
-* --silent <2>:                          chmod invocation.    (line  45)
-* --silent <3>:                          chgrp invocation.    (line  26)
-* --silent <4>:                          chown invocation.    (line  76)
-* --silent <5>:                          readlink invocation. (line  55)
-* --silent <6>:                          csplit invocation.   (line 101)
-* --silent <7>:                          tail invocation.     (line 160)
+* --si:                                  Block size.          (line 121)
+* --si <1>:                              What information is listed.
+                                                              (line 247)
+* --si <2>:                              df invocation.       (line 171)
+* --si <3>:                              du invocation.       (line 145)
+* --signal:                              timeout invocation.  (line  45)
 * --silent:                              head invocation.     (line  46)
-* --size <1>:                            truncate invocation. (line  34)
+* --silent <1>:                          tail invocation.     (line 170)
+* --silent <2>:                          csplit invocation.   (line 104)
+* --silent <3>:                          readlink invocation. (line  56)
+* --silent <4>:                          chown invocation.    (line  79)
+* --silent <5>:                          chgrp invocation.    (line  30)
+* --silent <6>:                          chmod invocation.    (line  45)
+* --silent <7>:                          tty invocation.      (line  18)
 * --size:                                What information is listed.
-                                                              (line 244)
+                                                              (line 232)
+* --size <1>:                            truncate invocation. (line  34)
 * --size=BYTES:                          shred invocation.    (line 117)
-* --skip-bytes:                          od invocation.       (line  55)
+* --skip-bytes:                          od invocation.       (line  59)
 * --skip-chars:                          uniq invocation.     (line  41)
 * --skip-fields:                         uniq invocation.     (line  31)
-* --sleep-interval:                      tail invocation.     (line 110)
-* --sort <1>:                            Sorting the output.  (line  32)
-* --sort:                                sort invocation.     (line 105)
+* --sleep-interval:                      tail invocation.     (line 120)
+* --sort:                                sort invocation.     (line 104)
+* --sort <1>:                            sort invocation.     (line 125)
+* --sort <2>:                            sort invocation.     (line 149)
+* --sort <3>:                            sort invocation.     (line 159)
+* --sort <4>:                            sort invocation.     (line 188)
+* --sort <5>:                            Sorting the output.  (line  32)
+* --sort <6>:                            Sorting the output.  (line  36)
+* --sort <7>:                            Sorting the output.  (line  49)
+* --sort <8>:                            Sorting the output.  (line  56)
+* --sort <9>:                            Sorting the output.  (line  63)
 * --spaces:                              fold invocation.     (line  29)
-* --sparse=WHEN:                         cp invocation.       (line 300)
+* --sparse=WHEN:                         cp invocation.       (line 292)
 * --split-only:                          fmt invocation.      (line  47)
 * --squeeze-blank:                       cat invocation.      (line  36)
-* --stable:                              sort invocation.     (line 303)
-* --starting-line-number:                nl invocation.       (line 117)
+* --stable:                              sort invocation.     (line 299)
+* --starting-line-number:                nl invocation.       (line 110)
 * --status:                              md5sum invocation.   (line  76)
 * --strict:                              md5sum invocation.   (line 109)
-* --strings:                             od invocation.       (line  76)
-* --strip <1>:                           realpath invocation. (line  46)
-* --strip:                               install invocation.  (line 108)
-* --strip-program:                       install invocation.  (line 111)
-* --strip-trailing-slashes <1>:          mv invocation.       (line  95)
-* --strip-trailing-slashes:              cp invocation.       (line 334)
-* --suffix <1>:                          mktemp invocation.   (line 114)
-* --suffix <2>:                          basename invocation. (line  38)
-* --suffix <3>:                          ln invocation.       (line 156)
-* --suffix <4>:                          mv invocation.       (line 100)
-* --suffix <5>:                          install invocation.  (line 115)
-* --suffix <6>:                          cp invocation.       (line 347)
-* --suffix <7>:                          csplit invocation.   (line  66)
-* --suffix <8>:                          numfmt invocation.   (line  88)
-* --suffix:                              Backup options.      (line  50)
+* --strings:                             od invocation.       (line  80)
+* --strip:                               install invocation.  (line 113)
+* --strip <1>:                           realpath invocation. (line  69)
+* --strip-program:                       install invocation.  (line 116)
+* --strip-trailing-slashes:              cp invocation.       (line 325)
+* --strip-trailing-slashes <1>:          mv invocation.       (line  93)
+* --suffix:                              Backup options.      (line  49)
+* --suffix <1>:                          numfmt invocation.   (line  90)
+* --suffix <2>:                          csplit invocation.   (line  65)
+* --suffix <3>:                          cp invocation.       (line 338)
+* --suffix <4>:                          install invocation.  (line 120)
+* --suffix <5>:                          mv invocation.       (line  98)
+* --suffix <6>:                          ln invocation.       (line 164)
+* --suffix <7>:                          basename invocation. (line  38)
+* --suffix <8>:                          mktemp invocation.   (line 113)
 * --suffix-length:                       split invocation.    (line 106)
-* --summarize:                           du invocation.       (line 146)
-* --symbolic:                            ln invocation.       (line 150)
-* --symbolic-link:                       cp invocation.       (line 339)
-* --sync:                                df invocation.       (line 184)
+* --summarize:                           du invocation.       (line 153)
+* --suppress-matched:                    csplit invocation.   (line  87)
+* --symbolic:                            ln invocation.       (line 158)
+* --symbolic-link:                       cp invocation.       (line 330)
+* --sync:                                df invocation.       (line 178)
 * --sysv:                                sum invocation.      (line  31)
-* --tabs <1>:                            unexpand invocation. (line  24)
 * --tabs:                                expand invocation.   (line  22)
+* --tabs <1>:                            unexpand invocation. (line  24)
 * --tabsize:                             General output formatting.
-                                                              (line 111)
+                                                              (line 106)
 * --tag:                                 md5sum invocation.   (line  85)
 * --tagged-paragraph:                    fmt invocation.      (line  40)
-* --target-directory <1>:                ln invocation.       (line 161)
-* --target-directory <2>:                mv invocation.       (line 105)
-* --target-directory <3>:                install invocation.  (line 120)
-* --target-directory <4>:                cp invocation.       (line 352)
 * --target-directory:                    Target directory.    (line  31)
-* --temporary-directory:                 sort invocation.     (line 345)
+* --target-directory <1>:                cp invocation.       (line 343)
+* --target-directory <2>:                install invocation.  (line 125)
+* --target-directory <3>:                mv invocation.       (line 103)
+* --target-directory <4>:                ln invocation.       (line 169)
+* --temporary-directory:                 sort invocation.     (line 343)
 * --terse:                               stat invocation.     (line  54)
 * --text:                                md5sum invocation.   (line  95)
-* --threshold:                           du invocation.       (line 150)
-* --time <1>:                            who invocation.      (line  83)
-* --time <2>:                            du invocation.       (line 178)
-* --time <3>:                            touch invocation.    (line  78)
+* --threshold:                           du invocation.       (line 157)
 * --time:                                Sorting the output.  (line  13)
-* --time-style <1>:                      du invocation.       (line 193)
+* --time <1>:                            Sorting the output.  (line  42)
+* --time <2>:                            touch invocation.    (line  78)
+* --time <3>:                            touch invocation.    (line 115)
+* --time <4>:                            du invocation.       (line 197)
+* --time <5>:                            du invocation.       (line 203)
+* --time <6>:                            du invocation.       (line 208)
+* --time <7>:                            who invocation.      (line  82)
 * --time-style:                          Formatting file timestamps.
-                                                              (line  26)
-* --tmpdir:                              mktemp invocation.   (line 106)
-* --to:                                  numfmt invocation.   (line  92)
-* --to-unit:                             numfmt invocation.   (line  97)
-* --total <1>:                           du invocation.       (line  62)
-* --total:                               df invocation.       (line  53)
-* --traditional:                         od invocation.       (line 206)
-* --type <1>:                            runcon invocation.   (line  39)
-* --type <2>:                            chcon invocation.    (line  73)
-* --type:                                df invocation.       (line 191)
+                                                              (line  24)
+* --time-style <1>:                      du invocation.       (line 212)
+* --tmpdir:                              mktemp invocation.   (line 105)
+* --to:                                  numfmt invocation.   (line  94)
+* --to-unit:                             numfmt invocation.   (line  99)
+* --total:                               df invocation.       (line  52)
+* --total <1>:                           du invocation.       (line  61)
+* --traditional:                         od invocation.       (line 199)
+* --type:                                df invocation.       (line 185)
+* --type <1>:                            chcon invocation.    (line  73)
+* --type <2>:                            runcon invocation.   (line  39)
 * --unbuffered:                          split invocation.    (line 134)
 * --uniform-spacing:                     fmt invocation.      (line  53)
-* --unique <1>:                          uniq invocation.     (line 101)
-* --unique:                              sort invocation.     (line 361)
-* --universal:                           Options for date.    (line 113)
-* --unset:                               env invocation.      (line  90)
-* --update <1>:                          mv invocation.       (line  82)
-* --update:                              cp invocation.       (line 361)
-* --user <1>:                            runcon invocation.   (line  31)
-* --user <2>:                            chcon invocation.    (line  65)
-* --user:                                id invocation.       (line  44)
+* --unique:                              sort invocation.     (line 359)
+* --unique <1>:                          uniq invocation.     (line 129)
+* --universal:                           Options for date.    (line 112)
+* --unset:                               env invocation.      (line  88)
+* --update:                              cp invocation.       (line 352)
+* --update <1>:                          mv invocation.       (line  80)
+* --user:                                id invocation.       (line  47)
+* --user <1>:                            chcon invocation.    (line  65)
+* --user <2>:                            runcon invocation.   (line  31)
 * --userspec:                            chroot invocation.   (line  24)
-* --utc:                                 Options for date.    (line 113)
-* --verbose <1>:                         chcon invocation.    (line  61)
-* --verbose <2>:                         chmod invocation.    (line  59)
-* --verbose <3>:                         chgrp invocation.    (line  58)
-* --verbose <4>:                         chown invocation.    (line 132)
-* --verbose <5>:                         rmdir invocation.    (line  31)
-* --verbose <6>:                         readlink invocation. (line  59)
-* --verbose <7>:                         mkdir invocation.    (line  51)
-* --verbose <8>:                         ln invocation.       (line 170)
-* --verbose <9>:                         shred invocation.    (line 129)
-* --verbose <10>:                        rm invocation.       (line  99)
-* --verbose <11>:                        mv invocation.       (line  92)
-* --verbose <12>:                        install invocation.  (line 129)
-* --verbose <13>:                        cp invocation.       (line 375)
-* --verbose <14>:                        split invocation.    (line 138)
-* --verbose <15>:                        tail invocation.     (line 164)
+* --utc:                                 Options for date.    (line 112)
 * --verbose:                             head invocation.     (line  50)
-* --version:                             Common options.      (line  41)
-* --version-sort:                        sort invocation.     (line 179)
+* --verbose <1>:                         tail invocation.     (line 174)
+* --verbose <2>:                         split invocation.    (line 138)
+* --verbose <3>:                         cp invocation.       (line 366)
+* --verbose <4>:                         install invocation.  (line 134)
+* --verbose <5>:                         mv invocation.       (line  90)
+* --verbose <6>:                         rm invocation.       (line  97)
+* --verbose <7>:                         shred invocation.    (line 138)
+* --verbose <8>:                         ln invocation.       (line 178)
+* --verbose <9>:                         mkdir invocation.    (line  51)
+* --verbose <10>:                        readlink invocation. (line  60)
+* --verbose <11>:                        rmdir invocation.    (line  31)
+* --verbose <12>:                        chown invocation.    (line 135)
+* --verbose <13>:                        chgrp invocation.    (line  62)
+* --verbose <14>:                        chmod invocation.    (line  59)
+* --verbose <15>:                        chcon invocation.    (line  61)
+* --version:                             Common options.      (line  40)
+* --version-sort:                        sort invocation.     (line 176)
 * --warn:                                md5sum invocation.   (line 104)
-* --width <1>:                           General output formatting.
-                                                              (line 123)
-* --width <2>:                           fold invocation.     (line  35)
-* --width <3>:                           pr invocation.       (line 231)
-* --width <4>:                           fmt invocation.      (line  59)
-* --width:                               od invocation.       (line 162)
+* --width:                               od invocation.       (line 156)
+* --width <1>:                           fmt invocation.      (line  59)
+* --width <2>:                           pr invocation.       (line 229)
+* --width <3>:                           fold invocation.     (line  35)
+* --width <4>:                           General output formatting.
+                                                              (line 117)
 * --words:                               wc invocation.       (line  51)
 * --wrap:                                base64 invocation.   (line  22)
-* --writable:                            who invocation.      (line  95)
-* --zero <1>:                            realpath invocation. (line  53)
-* --zero <2>:                            dirname invocation.  (line  31)
-* --zero <3>:                            basename invocation. (line  42)
-* --zero <4>:                            readlink invocation. (line  63)
-* --zero:                                shred invocation.    (line 144)
-* --zero-terminated <1>:                 uniq invocation.     (line 112)
-* --zero-terminated <2>:                 shuf invocation.     (line  48)
-* --zero-terminated:                     sort invocation.     (line 375)
-* -0 <1>:                                env invocation.      (line  82)
-* -0 <2>:                                printenv invocation. (line  18)
-* -0:                                    du invocation.       (line  25)
-* -1 <1>:                                General output formatting.
-                                                              (line  10)
-* -1 <2>:                                join invocation.     (line 105)
+* --writable:                            who invocation.      (line  94)
+* --zero:                                shred invocation.    (line 154)
+* --zero <1>:                            readlink invocation. (line  64)
+* --zero <2>:                            basename invocation. (line  42)
+* --zero <3>:                            dirname invocation.  (line  31)
+* --zero <4>:                            realpath invocation. (line  76)
+* --zero <5>:                            id invocation.       (line  58)
+* --zero-terminated:                     sort invocation.     (line 374)
+* --zero-terminated <1>:                 shuf invocation.     (line  55)
+* --zero-terminated <2>:                 uniq invocation.     (line 141)
+* --zero-terminated <3>:                 join invocation.     (line 155)
+* -0:                                    du invocation.       (line  26)
+* -0 <1>:                                printenv invocation. (line  19)
+* -0 <2>:                                env invocation.      (line  82)
 * -1:                                    comm invocation.     (line  23)
-* -2 <1>:                                join invocation.     (line 108)
+* -1 <1>:                                join invocation.     (line 102)
+* -1 <2>:                                General output formatting.
+                                                              (line  10)
 * -2:                                    comm invocation.     (line  23)
+* -2 <1>:                                join invocation.     (line 105)
 * -3:                                    comm invocation.     (line  23)
-* -a <1>:                                uname invocation.    (line  30)
-* -a <2>:                                who invocation.      (line  36)
-* -a <3>:                                stty invocation.     (line  26)
-* -a <4>:                                basename invocation. (line  32)
-* -a <5>:                                tee invocation.      (line  25)
-* -a <6>:                                Connectives for test.
-                                                              (line  12)
-* -a <7>:                                du invocation.       (line  33)
-* -a <8>:                                df invocation.       (line  43)
-* -a <9>:                                touch invocation.    (line  78)
-* -a:                                    cp invocation.       (line  65)
-* -A:                                    Which files are listed.
-                                                              (line  17)
-* -a <1>:                                Which files are listed.
-                                                              (line  13)
-* -a <2>:                                unexpand invocation. (line  37)
-* -a <3>:                                join invocation.     (line  75)
-* -a <4>:                                split invocation.    (line 106)
-* -a <5>:                                pr invocation.       (line  63)
-* -a:                                    od invocation.       (line 175)
-* -A <1>:                                od invocation.       (line  36)
 * -A:                                    cat invocation.      (line  16)
-* -b <1>:                                who invocation.      (line  40)
-* -b <2>:                                File type tests.     (line  10)
-* -b:                                    du invocation.       (line  58)
-* -B <1>:                                du invocation.       (line  53)
-* -B:                                    df invocation.       (line  49)
-* -b <1>:                                ln invocation.       (line  84)
-* -b <2>:                                mv invocation.       (line  58)
-* -b <3>:                                install invocation.  (line  42)
-* -b <4>:                                cp invocation.       (line  81)
-* -b <5>:                                dircolors invocation.
-                                                              (line  34)
-* -b:                                    Formatting the file names.
-                                                              (line  11)
+* -A <1>:                                od invocation.       (line  36)
+* -a:                                    od invocation.       (line 168)
+* -a <1>:                                pr invocation.       (line  62)
+* -a <2>:                                split invocation.    (line 106)
+* -a <3>:                                join invocation.     (line  72)
+* -a <4>:                                unexpand invocation. (line  37)
+* -a <5>:                                Which files are listed.
+                                                              (line  13)
+* -A <2>:                                Which files are listed.
+                                                              (line  17)
+* -a <6>:                                cp invocation.       (line  63)
+* -a <7>:                                touch invocation.    (line  78)
+* -a <8>:                                df invocation.       (line  42)
+* -a <9>:                                du invocation.       (line  32)
+* -a <10>:                               Connectives for test.
+                                                              (line  12)
+* -a <11>:                               tee invocation.      (line  25)
+* -a <12>:                               basename invocation. (line  32)
+* -a <13>:                               stty invocation.     (line  26)
+* -a <14>:                               who invocation.      (line  35)
+* -a <15>:                               uname invocation.    (line  30)
+* -b:                                    Backup options.      (line  13)
+* -b <1>:                                cat invocation.      (line  20)
+* -b <2>:                                tac invocation.      (line  21)
+* -b <3>:                                nl invocation.       (line  45)
+* -b <4>:                                od invocation.       (line 171)
+* -b <5>:                                fold invocation.     (line  23)
+* -b <6>:                                split invocation.    (line  40)
+* -b <7>:                                csplit invocation.   (line  65)
+* -b <8>:                                md5sum invocation.   (line  37)
+* -b <9>:                                sort invocation.     (line  78)
+* -b <10>:                               cut invocation.      (line  26)
 * -B:                                    Which files are listed.
                                                               (line  23)
-* -b <1>:                                cut invocation.      (line  26)
-* -b <2>:                                sort invocation.     (line  79)
-* -b <3>:                                md5sum invocation.   (line  37)
-* -b <4>:                                csplit invocation.   (line  66)
-* -b <5>:                                split invocation.    (line  40)
-* -b <6>:                                fold invocation.     (line  23)
-* -b <7>:                                od invocation.       (line 178)
-* -b <8>:                                nl invocation.       (line  47)
-* -b <9>:                                tac invocation.      (line  21)
-* -b <10>:                               cat invocation.      (line  20)
-* -b:                                    Backup options.      (line  13)
-* -c <1>:                                runcon invocation.   (line  27)
-* -c <2>:                                File type tests.     (line  13)
-* -c <3>:                                truncate invocation. (line  22)
-* -c <4>:                                stat invocation.     (line  34)
-* -c <5>:                                du invocation.       (line  62)
-* -c <6>:                                touch invocation.    (line  82)
-* -c <7>:                                chmod invocation.    (line  39)
-* -c <8>:                                chgrp invocation.    (line  20)
-* -c <9>:                                chown invocation.    (line  70)
-* -c:                                    install invocation.  (line  53)
-* -C:                                    install invocation.  (line  47)
-* -c:                                    dircolors invocation.
-                                                              (line  40)
-* -C:                                    General output formatting.
-                                                              (line  15)
-* -c <1>:                                Sorting the output.  (line  13)
-* -c <2>:                                cut invocation.      (line  34)
-* -c <3>:                                uniq invocation.     (line  55)
-* -c <4>:                                shuf invocation.     (line  19)
-* -c <5>:                                sort invocation.     (line  18)
-* -c:                                    wc invocation.       (line  43)
+* -b <11>:                               Formatting the file names.
+                                                              (line  11)
+* -b <12>:                               dircolors invocation.
+                                                              (line  34)
+* -b <13>:                               cp invocation.       (line  79)
+* -b <14>:                               install invocation.  (line  41)
+* -b <15>:                               mv invocation.       (line  56)
+* -b <16>:                               ln invocation.       (line  80)
+* -B <1>:                                df invocation.       (line  48)
+* -B <2>:                                du invocation.       (line  52)
+* -b <17>:                               du invocation.       (line  57)
+* -b <18>:                               File type tests.     (line  10)
+* -b <19>:                               who invocation.      (line  39)
+* -c:                                    od invocation.       (line 174)
+* -c <1>:                                fmt invocation.      (line  34)
+* -c <2>:                                pr invocation.       (line  68)
+* -c <3>:                                head invocation.     (line  24)
+* -c <4>:                                tail invocation.     (line  32)
 * -C:                                    split invocation.    (line  54)
-* -c <1>:                                tail invocation.     (line  32)
-* -c <2>:                                head invocation.     (line  24)
-* -c <3>:                                pr invocation.       (line  69)
-* -c <4>:                                fmt invocation.      (line  34)
-* -c:                                    od invocation.       (line 181)
+* -c <5>:                                wc invocation.       (line  43)
+* -c <6>:                                sort invocation.     (line  18)
+* -c <7>:                                sort invocation.     (line  26)
+* -c <8>:                                shuf invocation.     (line  19)
+* -c <9>:                                uniq invocation.     (line  55)
+* -c <10>:                               cut invocation.      (line  34)
+* -c <11>:                               Sorting the output.  (line  13)
+* -C <1>:                                General output formatting.
+                                                              (line  15)
+* -c <12>:                               dircolors invocation.
+                                                              (line  40)
+* -C <2>:                                install invocation.  (line  46)
+* -c <13>:                               install invocation.  (line  57)
+* -c <14>:                               chown invocation.    (line  73)
+* -c <15>:                               chgrp invocation.    (line  24)
+* -c <16>:                               chmod invocation.    (line  39)
+* -c <17>:                               touch invocation.    (line  82)
+* -c <18>:                               du invocation.       (line  61)
+* -c <19>:                               stat invocation.     (line  34)
+* -c <20>:                               truncate invocation. (line  22)
+* -c <21>:                               File type tests.     (line  13)
+* -c <22>:                               runcon invocation.   (line  27)
 * -COLUMN:                               pr invocation.       (line  49)
-* -d <1>:                                Options for date.    (line  11)
-* -d <2>:                                who invocation.      (line  44)
-* -d <3>:                                mktemp invocation.   (line  86)
-* -d:                                    File type tests.     (line  16)
-* -D:                                    du invocation.       (line  68)
-* -d <1>:                                touch invocation.    (line  86)
-* -d <2>:                                ln invocation.       (line  90)
-* -d <3>:                                rm invocation.       (line  35)
-* -d:                                    install invocation.  (line  62)
-* -D:                                    install invocation.  (line  56)
-* -d:                                    cp invocation.       (line 111)
-* -D:                                    What information is listed.
-                                                              (line  16)
-* -d <1>:                                Which files are listed.
-                                                              (line  28)
-* -d <2>:                                paste invocation.    (line  43)
-* -d:                                    cut invocation.      (line  63)
+* -d:                                    nl invocation.       (line  63)
+* -d <1>:                                od invocation.       (line 178)
+* -d <2>:                                base64 invocation.   (line  30)
+* -d <3>:                                numfmt invocation.   (line  34)
+* -d <4>:                                pr invocation.       (line  74)
+* -d <5>:                                split invocation.    (line 114)
+* -d <6>:                                sort invocation.     (line  86)
+* -d <7>:                                uniq invocation.     (line  63)
 * -D:                                    uniq invocation.     (line  69)
-* -d <1>:                                uniq invocation.     (line  63)
-* -d <2>:                                sort invocation.     (line  87)
-* -d <3>:                                split invocation.    (line 114)
-* -d <4>:                                pr invocation.       (line  75)
-* -d <5>:                                numfmt invocation.   (line  34)
-* -d <6>:                                base64 invocation.   (line  30)
-* -d <7>:                                od invocation.       (line 185)
-* -d:                                    nl invocation.       (line  68)
-* -d DEPTH:                              du invocation.       (line  75)
-* -e <1>:                                stdbuf invocation.   (line  34)
-* -e <2>:                                realpath invocation. (line  17)
-* -e:                                    File characteristic tests.
-                                                              (line   9)
-* -E:                                    echo invocation.     (line  73)
-* -e <1>:                                echo invocation.     (line  25)
-* -e <2>:                                readlink invocation. (line  36)
-* -e <3>:                                join invocation.     (line  86)
-* -e <4>:                                split invocation.    (line 126)
-* -e:                                    pr invocation.       (line  99)
-* -E:                                    cat invocation.      (line  27)
+* -d <8>:                                cut invocation.      (line  62)
+* -d <9>:                                paste invocation.    (line  61)
+* -d <10>:                               Which files are listed.
+                                                              (line  28)
+* -D <1>:                                What information is listed.
+                                                              (line  16)
+* -d <11>:                               cp invocation.       (line 109)
+* -D <2>:                                install invocation.  (line  60)
+* -d <12>:                               install invocation.  (line  67)
+* -d <13>:                               rm invocation.       (line  35)
+* -d <14>:                               ln invocation.       (line  86)
+* -d <15>:                               touch invocation.    (line  86)
+* -D <3>:                                du invocation.       (line  67)
+* -d <16>:                               File type tests.     (line  16)
+* -d <17>:                               mktemp invocation.   (line  85)
+* -d <18>:                               who invocation.      (line  43)
+* -d <19>:                               Options for date.    (line  11)
+* -d DEPTH:                              du invocation.       (line  74)
 * -e:                                    cat invocation.      (line  23)
+* -E:                                    cat invocation.      (line  27)
+* -e <1>:                                pr invocation.       (line  98)
+* -e <2>:                                split invocation.    (line 126)
+* -e <3>:                                join invocation.     (line  83)
+* -e <4>:                                readlink invocation. (line  37)
+* -e <5>:                                echo invocation.     (line  25)
+* -E <1>:                                echo invocation.     (line  61)
+* -e <6>:                                File characteristic tests.
+                                                              (line   9)
+* -e <7>:                                realpath invocation. (line  17)
+* -e <8>:                                stdbuf invocation.   (line  34)
 * -ef:                                   File characteristic tests.
                                                               (line  23)
-* -eq:                                   Numeric tests.       (line  16)
-* -f:                                    Options for date.    (line  26)
-* -F:                                    stty invocation.     (line  31)
-* -f <1>:                                File type tests.     (line  19)
-* -f <2>:                                stat invocation.     (line  28)
-* -f <3>:                                touch invocation.    (line  96)
-* -f <4>:                                chmod invocation.    (line  45)
-* -f <5>:                                chgrp invocation.    (line  26)
-* -f <6>:                                chown invocation.    (line  76)
-* -f <7>:                                readlink invocation. (line  29)
-* -f:                                    ln invocation.       (line  96)
-* -F:                                    ln invocation.       (line  90)
-* -f <1>:                                shred invocation.    (line 101)
-* -f <2>:                                rm invocation.       (line  39)
-* -f <3>:                                mv invocation.       (line  63)
-* -f:                                    cp invocation.       (line 118)
-* -F:                                    General output formatting.
-                                                              (line  48)
-* -f <1>:                                Sorting the output.  (line  20)
-* -f <2>:                                cut invocation.      (line  44)
-* -f <3>:                                uniq invocation.     (line  31)
-* -f <4>:                                sort invocation.     (line  94)
-* -f:                                    csplit invocation.   (line  62)
-* -F:                                    tail invocation.     (line  99)
-* -f <1>:                                tail invocation.     (line  48)
-* -f:                                    pr invocation.       (line 107)
-* -F:                                    pr invocation.       (line 107)
-* -f <1>:                                od invocation.       (line 188)
-* -f:                                    nl invocation.       (line  75)
-* -f FORMAT:                             seq invocation.      (line  24)
-* -G:                                    id invocation.       (line  30)
-* -g <1>:                                id invocation.       (line  26)
-* -g:                                    stty invocation.     (line  41)
-* -G:                                    Access permission tests.
-                                                              (line  31)
-* -g <1>:                                Access permission tests.
-                                                              (line   9)
-* -g:                                    install invocation.  (line  68)
+* -eq:                                   Numeric tests.       (line  17)
+* -f:                                    nl invocation.       (line  70)
+* -f <1>:                                od invocation.       (line 181)
+* -F:                                    pr invocation.       (line 106)
+* -f <2>:                                pr invocation.       (line 106)
+* -f <3>:                                tail invocation.     (line  48)
+* -F <1>:                                tail invocation.     (line  99)
+* -f <4>:                                csplit invocation.   (line  61)
+* -f <5>:                                sort invocation.     (line  93)
+* -f <6>:                                uniq invocation.     (line  31)
+* -f <7>:                                cut invocation.      (line  43)
+* -f <8>:                                Sorting the output.  (line  20)
+* -F <2>:                                General output formatting.
+                                                              (line  46)
+* -f <9>:                                cp invocation.       (line 115)
+* -f <10>:                               mv invocation.       (line  61)
+* -f <11>:                               rm invocation.       (line  39)
+* -f <12>:                               shred invocation.    (line 101)
+* -F <3>:                                ln invocation.       (line  86)
+* -f <13>:                               ln invocation.       (line  92)
+* -f <14>:                               readlink invocation. (line  30)
+* -f <15>:                               chown invocation.    (line  79)
+* -f <16>:                               chgrp invocation.    (line  30)
+* -f <17>:                               chmod invocation.    (line  45)
+* -f <18>:                               touch invocation.    (line  96)
+* -f <19>:                               stat invocation.     (line  28)
+* -f <20>:                               File type tests.     (line  19)
+* -F <4>:                                stty invocation.     (line  31)
+* -f <21>:                               Options for date.    (line  26)
+* -f FORMAT:                             seq invocation.      (line  26)
+* -g:                                    fmt invocation.      (line  64)
+* -g <1>:                                sort invocation.     (line 104)
+* -g <2>:                                What information is listed.
+                                                              (line 105)
 * -G:                                    What information is listed.
                                                               (line 110)
-* -g <1>:                                What information is listed.
-                                                              (line 105)
-* -g <2>:                                sort invocation.     (line 105)
-* -g:                                    fmt invocation.      (line  64)
-* -ge:                                   Numeric tests.       (line  16)
-* -gt:                                   Numeric tests.       (line  16)
-* -H:                                    chcon invocation.    (line  47)
-* -h:                                    chcon invocation.    (line  26)
-* -H:                                    who invocation.      (line  48)
-* -h <1>:                                File type tests.     (line  23)
-* -h:                                    du invocation.       (line  97)
-* -H <1>:                                du invocation.       (line  93)
-* -H:                                    df invocation.       (line  70)
-* -h <1>:                                df invocation.       (line  64)
-* -h:                                    touch invocation.    (line 100)
-* -H:                                    chgrp invocation.    (line  70)
-* -h:                                    chgrp invocation.    (line  35)
-* -H:                                    chown invocation.    (line 143)
-* -h:                                    chown invocation.    (line 108)
-* -H:                                    cp invocation.       (line 134)
-* -h:                                    What information is listed.
-                                                              (line 116)
-* -H:                                    Which files are listed.
-                                                              (line  36)
-* -h <1>:                                sort invocation.     (line 130)
-* -h <2>:                                pr invocation.       (line 112)
-* -h:                                    nl invocation.       (line  79)
+* -g <3>:                                install invocation.  (line  73)
+* -g <4>:                                Access permission tests.
+                                                              (line   9)
+* -G <1>:                                Access permission tests.
+                                                              (line  31)
+* -g <5>:                                stty invocation.     (line  41)
+* -g <6>:                                id invocation.       (line  29)
+* -G <2>:                                id invocation.       (line  33)
+* -ge:                                   Numeric tests.       (line  17)
+* -gt:                                   Numeric tests.       (line  17)
+* -h:                                    Block size.          (line 121)
 * -H:                                    Traversing symlinks. (line  18)
-* -h:                                    Block size.          (line 137)
-* -i <1>:                                stdbuf invocation.   (line  26)
-* -i <2>:                                env invocation.      (line  96)
-* -i <3>:                                uname invocation.    (line  35)
-* -i <4>:                                tee invocation.      (line  30)
-* -i <5>:                                df invocation.       (line  74)
-* -i:                                    ln invocation.       (line 100)
-* -I:                                    rm invocation.       (line  48)
-* -i <1>:                                rm invocation.       (line  43)
-* -i <2>:                                mv invocation.       (line  69)
-* -i <3>:                                cp invocation.       (line 141)
-* -i:                                    What information is listed.
-                                                              (line 123)
+* -h <1>:                                nl invocation.       (line  74)
+* -h <2>:                                pr invocation.       (line 111)
+* -h <3>:                                sort invocation.     (line 125)
+* -H <1>:                                Which files are listed.
+                                                              (line  36)
+* -h <4>:                                What information is listed.
+                                                              (line 116)
+* -H <2>:                                cp invocation.       (line 131)
+* -h <5>:                                chown invocation.    (line 111)
+* -H <3>:                                chown invocation.    (line 146)
+* -h <6>:                                chgrp invocation.    (line  39)
+* -H <4>:                                chgrp invocation.    (line  74)
+* -h <7>:                                touch invocation.    (line 100)
+* -h <8>:                                df invocation.       (line  63)
+* -H <5>:                                df invocation.       (line  69)
+* -H <6>:                                du invocation.       (line  92)
+* -h <9>:                                du invocation.       (line  96)
+* -h <10>:                               File type tests.     (line  23)
+* -H <7>:                                who invocation.      (line  47)
+* -h <11>:                               chcon invocation.    (line  26)
+* -H <8>:                                chcon invocation.    (line  47)
+* -i:                                    nl invocation.       (line  78)
+* -i <1>:                                od invocation.       (line 184)
+* -i <2>:                                base64 invocation.   (line  36)
+* -i <3>:                                pr invocation.       (line 117)
+* -i <4>:                                sort invocation.     (line 142)
+* -i <5>:                                shuf invocation.     (line  23)
+* -i <6>:                                uniq invocation.     (line  59)
+* -i <7>:                                join invocation.     (line  97)
+* -i <8>:                                expand invocation.   (line  33)
 * -I:                                    Which files are listed.
-                                                              (line  70)
-* -i <1>:                                expand invocation.   (line  34)
-* -i <2>:                                join invocation.     (line 100)
-* -i <3>:                                uniq invocation.     (line  59)
-* -i <4>:                                shuf invocation.     (line  23)
-* -i <5>:                                sort invocation.     (line 145)
-* -i <6>:                                pr invocation.       (line 118)
-* -i <7>:                                base64 invocation.   (line  36)
-* -i <8>:                                od invocation.       (line 191)
-* -i:                                    nl invocation.       (line  83)
+                                                              (line  69)
+* -i <9>:                                What information is listed.
+                                                              (line 123)
+* -i <10>:                               cp invocation.       (line 138)
+* -i <11>:                               mv invocation.       (line  67)
+* -i <12>:                               rm invocation.       (line  43)
+* -I <1>:                                rm invocation.       (line  48)
+* -i <13>:                               ln invocation.       (line  96)
+* -i <14>:                               df invocation.       (line  73)
+* -i <15>:                               tee invocation.      (line  30)
+* -i <16>:                               uname invocation.    (line  35)
+* -i <17>:                               env invocation.      (line  94)
+* -i <18>:                               stdbuf invocation.   (line  26)
 * -I[TIMESPEC]:                          Options for date.    (line  34)
-* -J:                                    pr invocation.       (line 125)
-* -j:                                    od invocation.       (line  55)
-* -k <1>:                                timeout invocation.  (line  39)
-* -k <2>:                                Access permission tests.
+* -j:                                    od invocation.       (line  59)
+* -J:                                    pr invocation.       (line 124)
+* -k:                                    Block size.          (line 121)
+* -k <1>:                                csplit invocation.   (line  84)
+* -k <2>:                                sort invocation.     (line 230)
+* -k <3>:                                General output formatting.
+                                                              (line  80)
+* -k <4>:                                df invocation.       (line  78)
+* -k <5>:                                du invocation.       (line 111)
+* -k <6>:                                Access permission tests.
                                                               (line  12)
-* -k <3>:                                du invocation.       (line 103)
-* -k <4>:                                df invocation.       (line  79)
-* -k <5>:                                General output formatting.
-                                                              (line  85)
-* -k <6>:                                sort invocation.     (line 234)
-* -k <7>:                                csplit invocation.   (line  86)
-* -k:                                    Block size.          (line 137)
-* -l <1>:                                runcon invocation.   (line  43)
-* -l:                                    chcon invocation.    (line  77)
-* -L:                                    chcon invocation.    (line  52)
-* -l:                                    who invocation.      (line  52)
-* -L <1>:                                pwd invocation.      (line  15)
-* -L <2>:                                realpath invocation. (line  30)
-* -L <3>:                                File type tests.     (line  23)
-* -L:                                    stat invocation.     (line  22)
-* -l:                                    du invocation.       (line 115)
-* -L:                                    du invocation.       (line 109)
-* -l:                                    df invocation.       (line  85)
-* -L <1>:                                chgrp invocation.    (line  75)
-* -L <2>:                                chown invocation.    (line 148)
-* -L <3>:                                ln invocation.       (line 104)
-* -L:                                    cp invocation.       (line 151)
-* -l <1>:                                cp invocation.       (line 147)
-* -l:                                    What information is listed.
-                                                              (line 131)
-* -L <1>:                                Which files are listed.
-                                                              (line  84)
-* -L:                                    wc invocation.       (line  59)
-* -l <1>:                                wc invocation.       (line  55)
-* -l <2>:                                split invocation.    (line  33)
-* -l <3>:                                pr invocation.       (line 134)
-* -l <4>:                                od invocation.       (line 194)
-* -l:                                    nl invocation.       (line  87)
+* -k <7>:                                timeout invocation.  (line  38)
 * -L:                                    Traversing symlinks. (line  22)
-* -le:                                   Numeric tests.       (line  16)
-* -lt:                                   Numeric tests.       (line  16)
-* -m <1>:                                uname invocation.    (line  41)
-* -m <2>:                                who invocation.      (line  62)
-* -m <3>:                                realpath invocation. (line  25)
-* -m <4>:                                du invocation.       (line 119)
-* -m <5>:                                touch invocation.    (line 115)
-* -m <6>:                                readlink invocation. (line  43)
-* -m <7>:                                mknod invocation.    (line  48)
-* -m <8>:                                mkfifo invocation.   (line  21)
-* -m <9>:                                mkdir invocation.    (line  19)
-* -m <10>:                               install invocation.  (line  74)
-* -m:                                    General output formatting.
-                                                              (line  97)
-* -M:                                    sort invocation.     (line 152)
-* -m <1>:                                sort invocation.     (line  32)
-* -m <2>:                                wc invocation.       (line  47)
-* -m:                                    pr invocation.       (line 141)
-* -n <1>:                                nice invocation.     (line  51)
-* -n <2>:                                uname invocation.    (line  46)
-* -n <3>:                                id invocation.       (line  34)
-* -n <4>:                                String tests.        (line  19)
-* -n <5>:                                echo invocation.     (line  22)
-* -n <6>:                                readlink invocation. (line  48)
-* -n <7>:                                ln invocation.       (line 110)
-* -n <8>:                                mv invocation.       (line  76)
-* -n:                                    cp invocation.       (line 158)
-* -N:                                    Formatting the file names.
-                                                              (line  17)
-* -n <1>:                                What information is listed.
-                                                              (line 234)
-* -n <2>:                                cut invocation.      (line  67)
-* -n <3>:                                shuf invocation.     (line  32)
-* -n <4>:                                sort invocation.     (line 162)
-* -n <5>:                                csplit invocation.   (line  81)
-* -n <6>:                                split invocation.    (line  77)
-* -n <7>:                                tail invocation.     (line 152)
-* -n:                                    head invocation.     (line  39)
-* -N:                                    pr invocation.       (line 175)
-* -n:                                    pr invocation.       (line 154)
-* -N:                                    od invocation.       (line  71)
-* -n <1>:                                nl invocation.       (line  95)
+* -l:                                    nl invocation.       (line  82)
+* -l <1>:                                od invocation.       (line 187)
+* -l <2>:                                pr invocation.       (line 133)
+* -l <3>:                                split invocation.    (line  33)
+* -l <4>:                                wc invocation.       (line  55)
+* -L <1>:                                wc invocation.       (line  59)
+* -L <2>:                                Which files are listed.
+                                                              (line  83)
+* -l <5>:                                What information is listed.
+                                                              (line 131)
+* -l <6>:                                cp invocation.       (line 144)
+* -L <3>:                                cp invocation.       (line 148)
+* -L <4>:                                ln invocation.       (line 100)
+* -L <5>:                                chown invocation.    (line 151)
+* -L <6>:                                chgrp invocation.    (line  79)
+* -l <7>:                                df invocation.       (line  84)
+* -L <7>:                                du invocation.       (line 117)
+* -l <8>:                                du invocation.       (line 123)
+* -L <8>:                                stat invocation.     (line  22)
+* -L <9>:                                File type tests.     (line  23)
+* -L <10>:                               realpath invocation. (line  30)
+* -L <11>:                               pwd invocation.      (line  15)
+* -l <9>:                                who invocation.      (line  51)
+* -L <12>:                               chcon invocation.    (line  52)
+* -l <10>:                               chcon invocation.    (line  77)
+* -l <11>:                               runcon invocation.   (line  43)
+* -le:                                   Numeric tests.       (line  17)
+* -lt:                                   Numeric tests.       (line  17)
+* -m:                                    pr invocation.       (line 140)
+* -m <1>:                                wc invocation.       (line  47)
+* -m <2>:                                sort invocation.     (line  32)
+* -M:                                    sort invocation.     (line 149)
+* -m <3>:                                General output formatting.
+                                                              (line  92)
+* -m <4>:                                install invocation.  (line  79)
+* -m <5>:                                mkdir invocation.    (line  19)
+* -m <6>:                                mkfifo invocation.   (line  21)
+* -m <7>:                                mknod invocation.    (line  47)
+* -m <8>:                                readlink invocation. (line  44)
+* -m <9>:                                touch invocation.    (line 115)
+* -m <10>:                               du invocation.       (line 127)
+* -m <11>:                               realpath invocation. (line  25)
+* -m <12>:                               who invocation.      (line  61)
+* -m <13>:                               uname invocation.    (line  41)
 * -n:                                    cat invocation.      (line  31)
+* -n <1>:                                nl invocation.       (line  90)
+* -N:                                    od invocation.       (line  75)
+* -n <2>:                                pr invocation.       (line 153)
+* -N <1>:                                pr invocation.       (line 174)
+* -n <3>:                                head invocation.     (line  39)
+* -n <4>:                                tail invocation.     (line 162)
+* -n <5>:                                split invocation.    (line  76)
+* -n <6>:                                csplit invocation.   (line  79)
+* -n <7>:                                sort invocation.     (line 159)
+* -n <8>:                                shuf invocation.     (line  31)
+* -n <9>:                                cut invocation.      (line  66)
+* -n <10>:                               What information is listed.
+                                                              (line 222)
+* -N <2>:                                Formatting the file names.
+                                                              (line  17)
+* -n <11>:                               cp invocation.       (line 155)
+* -n <12>:                               mv invocation.       (line  74)
+* -n <13>:                               ln invocation.       (line 106)
+* -n <14>:                               readlink invocation. (line  49)
+* -n <15>:                               echo invocation.     (line  22)
+* -n <16>:                               String tests.        (line  19)
+* -n <17>:                               id invocation.       (line  37)
+* -n <18>:                               uname invocation.    (line  46)
+* -n <19>:                               nice invocation.     (line  51)
 * -n NUMBER:                             shred invocation.    (line 106)
-* -ne:                                   Numeric tests.       (line  16)
+* -ne:                                   Numeric tests.       (line  17)
 * -nt:                                   File characteristic tests.
                                                               (line  15)
-* -o <1>:                                stdbuf invocation.   (line  30)
-* -o <2>:                                uname invocation.    (line  57)
-* -o:                                    Connectives for test.
-                                                              (line  15)
+* -o:                                    od invocation.       (line 190)
+* -o <1>:                                pr invocation.       (line 180)
+* -o <2>:                                sort invocation.     (line 281)
+* -o <3>:                                shuf invocation.     (line  36)
+* -o <4>:                                What information is listed.
+                                                              (line 226)
+* -o <5>:                                install invocation.  (line  91)
+* -o <6>:                                truncate invocation. (line  26)
 * -O:                                    Access permission tests.
                                                               (line  28)
-* -o <1>:                                truncate invocation. (line  26)
-* -o <2>:                                install invocation.  (line  86)
-* -o <3>:                                What information is listed.
-                                                              (line 238)
-* -o <4>:                                shuf invocation.     (line  37)
-* -o <5>:                                sort invocation.     (line 285)
-* -o <6>:                                pr invocation.       (line 181)
-* -o:                                    od invocation.       (line 197)
+* -o <7>:                                Connectives for test.
+                                                              (line  15)
+* -o <8>:                                uname invocation.    (line  57)
+* -o <9>:                                stdbuf invocation.   (line  30)
 * -ot:                                   File characteristic tests.
                                                               (line  19)
-* -P:                                    chcon invocation.    (line  56)
-* -p <1>:                                uname invocation.    (line  50)
-* -p:                                    who invocation.      (line  66)
-* -P <1>:                                pwd invocation.      (line  22)
-* -P:                                    realpath invocation. (line  35)
-* -p:                                    mktemp invocation.   (line 106)
-* -P:                                    pathchk invocation.  (line  42)
-* -p <1>:                                pathchk invocation.  (line  29)
-* -p:                                    File type tests.     (line  28)
-* -P <1>:                                du invocation.       (line 125)
-* -P <2>:                                df invocation.       (line 158)
-* -P <3>:                                chgrp invocation.    (line  79)
-* -P:                                    chown invocation.    (line 152)
-* -p <1>:                                rmdir invocation.    (line  22)
-* -p:                                    mkdir invocation.    (line  34)
-* -P:                                    ln invocation.       (line 129)
-* -p <1>:                                install invocation.  (line  98)
-* -p:                                    cp invocation.       (line 171)
-* -P:                                    cp invocation.       (line 164)
-* -p <1>:                                dircolors invocation.
-                                                              (line  45)
-* -p <2>:                                General output formatting.
-                                                              (line 102)
-* -p:                                    nl invocation.       (line 108)
 * -P:                                    Traversing symlinks. (line  26)
-* -q <1>:                                who invocation.      (line  70)
-* -q <2>:                                realpath invocation. (line  41)
-* -q <3>:                                mktemp invocation.   (line  93)
-* -q:                                    readlink invocation. (line  55)
+* -p:                                    nl invocation.       (line 101)
+* -p <1>:                                General output formatting.
+                                                              (line  97)
+* -p <2>:                                dircolors invocation.
+                                                              (line  45)
+* -P <1>:                                cp invocation.       (line 161)
+* -p <3>:                                cp invocation.       (line 168)
+* -p <4>:                                install invocation.  (line 103)
+* -P <2>:                                ln invocation.       (line 125)
+* -p <5>:                                mkdir invocation.    (line  34)
+* -p <6>:                                rmdir invocation.    (line  22)
+* -P <3>:                                chown invocation.    (line 155)
+* -P <4>:                                chgrp invocation.    (line  83)
+* -P <5>:                                df invocation.       (line 152)
+* -P <6>:                                du invocation.       (line 133)
+* -p <7>:                                File type tests.     (line  28)
+* -p <8>:                                pathchk invocation.  (line  27)
+* -P <7>:                                pathchk invocation.  (line  40)
+* -p <9>:                                mktemp invocation.   (line 105)
+* -P <8>:                                realpath invocation. (line  35)
+* -P <9>:                                pwd invocation.      (line  22)
+* -p <10>:                               who invocation.      (line  65)
+* -p <11>:                               uname invocation.    (line  50)
+* -P <10>:                               chcon invocation.    (line  56)
+* -q:                                    head invocation.     (line  46)
+* -q <1>:                                tail invocation.     (line 170)
+* -q <2>:                                csplit invocation.   (line 104)
+* -q <3>:                                Formatting the file names.
+                                                              (line  23)
 * -Q:                                    Formatting the file names.
                                                               (line  30)
-* -q <1>:                                Formatting the file names.
-                                                              (line  23)
-* -q <2>:                                csplit invocation.   (line 101)
-* -q <3>:                                tail invocation.     (line 160)
-* -q:                                    head invocation.     (line  46)
-* -r <1>:                                runcon invocation.   (line  35)
-* -r:                                    chcon invocation.    (line  69)
-* -R:                                    chcon invocation.    (line  35)
-* -r:                                    uname invocation.    (line  61)
-* -R:                                    Options for date.    (line  65)
-* -r <1>:                                Options for date.    (line  59)
-* -r <2>:                                who invocation.      (line  75)
-* -r <3>:                                id invocation.       (line  39)
-* -r <4>:                                Access permission tests.
-                                                              (line  15)
-* -r <5>:                                truncate invocation. (line  30)
-* -r:                                    touch invocation.    (line 119)
-* -R <1>:                                chmod invocation.    (line  69)
-* -R <2>:                                chgrp invocation.    (line  66)
-* -R:                                    chown invocation.    (line 140)
-* -r:                                    ln invocation.       (line 138)
-* -R:                                    rm invocation.       (line  95)
-* -r <1>:                                rm invocation.       (line  95)
-* -r:                                    cp invocation.       (line 257)
-* -R:                                    cp invocation.       (line 257)
-* -r:                                    Sorting the output.  (line  27)
-* -R <1>:                                Which files are listed.
-                                                              (line  91)
-* -R:                                    sort invocation.     (line 191)
-* -r <1>:                                sort invocation.     (line 185)
-* -r <2>:                                sum invocation.      (line  25)
-* -r <3>:                                pr invocation.       (line 188)
+* -q <4>:                                readlink invocation. (line  56)
+* -q <5>:                                mktemp invocation.   (line  92)
+* -q <6>:                                realpath invocation. (line  41)
+* -q <7>:                                who invocation.      (line  69)
 * -r:                                    tac invocation.      (line  26)
-* -s <1>:                                timeout invocation.  (line  46)
-* -s <2>:                                uname invocation.    (line  65)
-* -s <3>:                                Options for date.    (line 107)
-* -s <4>:                                who invocation.      (line  79)
-* -s <5>:                                tty invocation.      (line  18)
-* -s <6>:                                realpath invocation. (line  46)
-* -s <7>:                                basename invocation. (line  38)
-* -s:                                    File characteristic tests.
-                                                              (line  12)
-* -S:                                    File type tests.     (line  31)
-* -s <1>:                                truncate invocation. (line  34)
-* -s:                                    du invocation.       (line 146)
-* -S:                                    du invocation.       (line 130)
-* -s:                                    readlink invocation. (line  55)
-* -S:                                    ln invocation.       (line 156)
-* -s:                                    ln invocation.       (line 150)
-* -S <1>:                                mv invocation.       (line 100)
-* -S:                                    install invocation.  (line 115)
-* -s:                                    install invocation.  (line 108)
-* -S:                                    cp invocation.       (line 347)
-* -s:                                    cp invocation.       (line 339)
-* -S:                                    Sorting the output.  (line  32)
-* -s <1>:                                What information is listed.
-                                                              (line 244)
-* -s <2>:                                paste invocation.    (line  34)
-* -s <3>:                                cut invocation.      (line  71)
-* -s:                                    uniq invocation.     (line  41)
-* -S:                                    sort invocation.     (line 309)
-* -s <1>:                                sort invocation.     (line 303)
-* -s <2>:                                sum invocation.      (line  31)
-* -s <3>:                                csplit invocation.   (line 101)
-* -s:                                    fold invocation.     (line  29)
-* -S:                                    pr invocation.       (line 202)
-* -s <1>:                                pr invocation.       (line 193)
-* -s <2>:                                fmt invocation.      (line  47)
-* -s:                                    od invocation.       (line 200)
-* -S:                                    od invocation.       (line  76)
-* -s <1>:                                nl invocation.       (line 112)
-* -s <2>:                                tac invocation.      (line  30)
+* -r <1>:                                pr invocation.       (line 187)
+* -r <2>:                                sum invocation.      (line  25)
+* -r <3>:                                sort invocation.     (line 182)
+* -R:                                    sort invocation.     (line 188)
+* -r <4>:                                shuf invocation.     (line  47)
+* -R <1>:                                Which files are listed.
+                                                              (line  90)
+* -r <5>:                                Sorting the output.  (line  27)
+* -R <2>:                                cp invocation.       (line 249)
+* -r <6>:                                cp invocation.       (line 249)
+* -r <7>:                                rm invocation.       (line  93)
+* -R <3>:                                rm invocation.       (line  93)
+* -r <8>:                                ln invocation.       (line 134)
+* -R <4>:                                chown invocation.    (line 143)
+* -R <5>:                                chgrp invocation.    (line  70)
+* -R <6>:                                chmod invocation.    (line  69)
+* -r <9>:                                touch invocation.    (line 119)
+* -r <10>:                               truncate invocation. (line  30)
+* -r <11>:                               Access permission tests.
+                                                              (line  15)
+* -r <12>:                               id invocation.       (line  42)
+* -r <13>:                               who invocation.      (line  74)
+* -r <14>:                               Options for date.    (line  59)
+* -R <7>:                                Options for date.    (line  65)
+* -r <15>:                               uname invocation.    (line  61)
+* -R <8>:                                chcon invocation.    (line  35)
+* -r <16>:                               chcon invocation.    (line  69)
+* -r <17>:                               runcon invocation.   (line  35)
+* -S:                                    Backup options.      (line  49)
 * -s:                                    cat invocation.      (line  36)
-* -S:                                    Backup options.      (line  50)
+* -s <1>:                                tac invocation.      (line  30)
+* -s <2>:                                nl invocation.       (line 105)
+* -S <1>:                                od invocation.       (line  80)
+* -s <3>:                                od invocation.       (line 193)
+* -s <4>:                                fmt invocation.      (line  47)
+* -s <5>:                                pr invocation.       (line 192)
+* -S <2>:                                pr invocation.       (line 201)
+* -s <6>:                                fold invocation.     (line  29)
+* -s <7>:                                csplit invocation.   (line 104)
+* -s <8>:                                sum invocation.      (line  31)
+* -s <9>:                                sort invocation.     (line 299)
+* -S <3>:                                sort invocation.     (line 306)
+* -s <10>:                               uniq invocation.     (line  41)
+* -s <11>:                               cut invocation.      (line  70)
+* -s <12>:                               paste invocation.    (line  52)
+* -s <13>:                               What information is listed.
+                                                              (line 232)
+* -S <4>:                                Sorting the output.  (line  32)
+* -s <14>:                               cp invocation.       (line 330)
+* -S <5>:                                cp invocation.       (line 338)
+* -s <15>:                               install invocation.  (line 113)
+* -S <6>:                                install invocation.  (line 120)
+* -S <7>:                                mv invocation.       (line  98)
+* -s <16>:                               ln invocation.       (line 158)
+* -S <8>:                                ln invocation.       (line 164)
+* -s <17>:                               readlink invocation. (line  56)
+* -S <9>:                                du invocation.       (line 138)
+* -s <18>:                               du invocation.       (line 153)
+* -s <19>:                               truncate invocation. (line  34)
+* -S <10>:                               File type tests.     (line  31)
+* -s <20>:                               File characteristic tests.
+                                                              (line  12)
+* -s <21>:                               basename invocation. (line  38)
+* -s <22>:                               realpath invocation. (line  69)
+* -s <23>:                               tty invocation.      (line  18)
+* -s <24>:                               who invocation.      (line  78)
+* -s <25>:                               Options for date.    (line 106)
+* -s <26>:                               uname invocation.    (line  65)
+* -s <27>:                               timeout invocation.  (line  45)
 * -s BYTES:                              shred invocation.    (line 117)
-* -t <1>:                                runcon invocation.   (line  39)
-* -t:                                    chcon invocation.    (line  73)
-* -T:                                    who invocation.      (line  95)
-* -t <1>:                                who invocation.      (line  83)
-* -t <2>:                                mktemp invocation.   (line 122)
-* -t <3>:                                File type tests.     (line  34)
-* -t <4>:                                stat invocation.     (line  54)
-* -t:                                    du invocation.       (line 150)
-* -T:                                    df invocation.       (line 197)
-* -t:                                    df invocation.       (line 191)
-* -T:                                    ln invocation.       (line 165)
-* -t:                                    ln invocation.       (line 161)
-* -T:                                    mv invocation.       (line 109)
-* -t:                                    mv invocation.       (line 105)
-* -T:                                    install invocation.  (line 124)
-* -t:                                    install invocation.  (line 120)
-* -T:                                    cp invocation.       (line 356)
-* -t:                                    cp invocation.       (line 352)
-* -T:                                    General output formatting.
-                                                              (line 111)
-* -t <1>:                                Sorting the output.  (line  36)
-* -t <2>:                                unexpand invocation. (line  24)
-* -t:                                    expand invocation.   (line  22)
-* -T:                                    sort invocation.     (line 345)
-* -t <1>:                                sort invocation.     (line 325)
-* -t:                                    md5sum invocation.   (line  95)
-* -T:                                    pr invocation.       (line 222)
-* -t <1>:                                pr invocation.       (line 211)
-* -t <2>:                                fmt invocation.      (line  40)
-* -t:                                    od invocation.       (line  85)
-* -T:                                    cat invocation.      (line  44)
 * -t:                                    cat invocation.      (line  40)
-* -u <1>:                                env invocation.      (line  90)
-* -u <2>:                                runcon invocation.   (line  31)
-* -u <3>:                                chcon invocation.    (line  65)
-* -u <4>:                                Options for date.    (line 113)
-* -u <5>:                                who invocation.      (line  86)
-* -u <6>:                                id invocation.       (line  44)
-* -u <7>:                                mktemp invocation.   (line  98)
-* -u <8>:                                Access permission tests.
-                                                              (line  18)
-* -u <9>:                                shred invocation.    (line 123)
-* -u <10>:                               mv invocation.       (line  82)
-* -u:                                    cp invocation.       (line 361)
-* -U:                                    Sorting the output.  (line  49)
-* -u <1>:                                Sorting the output.  (line  42)
-* -u <2>:                                uniq invocation.     (line 101)
-* -u <3>:                                sort invocation.     (line 361)
-* -u <4>:                                split invocation.    (line 134)
-* -u <5>:                                fmt invocation.      (line  53)
+* -T:                                    cat invocation.      (line  44)
+* -t <1>:                                od invocation.       (line  89)
+* -t <2>:                                fmt invocation.      (line  40)
+* -t <3>:                                pr invocation.       (line 210)
+* -T <1>:                                pr invocation.       (line 220)
+* -t <4>:                                md5sum invocation.   (line  95)
+* -t <5>:                                sort invocation.     (line 322)
+* -T <2>:                                sort invocation.     (line 343)
+* -t <6>:                                expand invocation.   (line  22)
+* -t <7>:                                unexpand invocation. (line  24)
+* -t <8>:                                Sorting the output.  (line  36)
+* -T <3>:                                General output formatting.
+                                                              (line 106)
+* -t <9>:                                cp invocation.       (line 343)
+* -T <4>:                                cp invocation.       (line 347)
+* -t <10>:                               install invocation.  (line 125)
+* -T <5>:                                install invocation.  (line 129)
+* -t <11>:                               mv invocation.       (line 103)
+* -T <6>:                                mv invocation.       (line 107)
+* -t <12>:                               ln invocation.       (line 169)
+* -T <7>:                                ln invocation.       (line 173)
+* -t <13>:                               df invocation.       (line 185)
+* -T <8>:                                df invocation.       (line 191)
+* -t <14>:                               du invocation.       (line 157)
+* -t <15>:                               stat invocation.     (line  54)
+* -t <16>:                               File type tests.     (line  34)
+* -t <17>:                               mktemp invocation.   (line 121)
+* -t <18>:                               who invocation.      (line  82)
+* -T <9>:                                who invocation.      (line  94)
+* -t <19>:                               chcon invocation.    (line  73)
+* -t <20>:                               runcon invocation.   (line  39)
 * -u:                                    cat invocation.      (line  47)
-* -v <1>:                                chcon invocation.    (line  61)
-* -v <2>:                                uname invocation.    (line  76)
-* -v <3>:                                chmod invocation.    (line  59)
-* -v <4>:                                chgrp invocation.    (line  58)
-* -v <5>:                                chown invocation.    (line 132)
-* -v <6>:                                rmdir invocation.    (line  31)
-* -v <7>:                                readlink invocation. (line  59)
-* -v <8>:                                mkdir invocation.    (line  51)
-* -v <9>:                                ln invocation.       (line 170)
-* -v <10>:                               shred invocation.    (line 129)
-* -v <11>:                               rm invocation.       (line  99)
-* -v <12>:                               mv invocation.       (line  92)
-* -v <13>:                               install invocation.  (line 129)
-* -v <14>:                               cp invocation.       (line 375)
-* -v:                                    Sorting the output.  (line  56)
-* -V:                                    sort invocation.     (line 179)
-* -v <1>:                                tail invocation.     (line 164)
-* -v <2>:                                head invocation.     (line  50)
-* -v <3>:                                pr invocation.       (line 227)
-* -v <4>:                                od invocation.       (line 155)
-* -v <5>:                                nl invocation.       (line 117)
+* -u <1>:                                fmt invocation.      (line  53)
+* -u <2>:                                split invocation.    (line 134)
+* -u <3>:                                sort invocation.     (line 359)
+* -u <4>:                                uniq invocation.     (line 129)
+* -u <5>:                                Sorting the output.  (line  42)
+* -U:                                    Sorting the output.  (line  49)
+* -u <6>:                                cp invocation.       (line 352)
+* -u <7>:                                mv invocation.       (line  80)
+* -u <8>:                                shred invocation.    (line 123)
+* -u <9>:                                Access permission tests.
+                                                              (line  18)
+* -u <10>:                               mktemp invocation.   (line  97)
+* -u <11>:                               id invocation.       (line  47)
+* -u <12>:                               who invocation.      (line  85)
+* -u <13>:                               Options for date.    (line 112)
+* -u <14>:                               chcon invocation.    (line  65)
+* -u <15>:                               runcon invocation.   (line  31)
+* -u <16>:                               env invocation.      (line  88)
 * -v:                                    cat invocation.      (line  51)
-* -w <1>:                                who invocation.      (line  95)
-* -w <2>:                                Access permission tests.
-                                                              (line  21)
-* -w <3>:                                General output formatting.
-                                                              (line 123)
-* -w <4>:                                uniq invocation.     (line 106)
-* -w <5>:                                md5sum invocation.   (line 104)
+* -v <1>:                                nl invocation.       (line 110)
+* -v <2>:                                od invocation.       (line 149)
+* -v <3>:                                pr invocation.       (line 225)
+* -v <4>:                                head invocation.     (line  50)
+* -v <5>:                                tail invocation.     (line 174)
+* -V:                                    sort invocation.     (line 176)
+* -v <6>:                                Sorting the output.  (line  56)
+* -v <7>:                                cp invocation.       (line 366)
+* -v <8>:                                install invocation.  (line 134)
+* -v <9>:                                mv invocation.       (line  90)
+* -v <10>:                               rm invocation.       (line  97)
+* -v <11>:                               shred invocation.    (line 138)
+* -v <12>:                               ln invocation.       (line 178)
+* -v <13>:                               mkdir invocation.    (line  51)
+* -v <14>:                               readlink invocation. (line  60)
+* -v <15>:                               rmdir invocation.    (line  31)
+* -v <16>:                               chown invocation.    (line 135)
+* -v <17>:                               chgrp invocation.    (line  62)
+* -v <18>:                               chmod invocation.    (line  59)
+* -v <19>:                               uname invocation.    (line  76)
+* -v <20>:                               chcon invocation.    (line  61)
+* -w:                                    nl invocation.       (line 115)
+* -w <1>:                                od invocation.       (line 156)
+* -w <2>:                                base64 invocation.   (line  22)
+* -w <3>:                                fmt invocation.      (line  59)
+* -w <4>:                                pr invocation.       (line 229)
+* -W:                                    pr invocation.       (line 239)
+* -w <5>:                                fold invocation.     (line  35)
 * -w <6>:                                wc invocation.       (line  51)
-* -w:                                    fold invocation.     (line  35)
-* -W:                                    pr invocation.       (line 240)
-* -w <1>:                                pr invocation.       (line 231)
-* -w <2>:                                fmt invocation.      (line  59)
-* -w <3>:                                base64 invocation.   (line  22)
-* -w <4>:                                od invocation.       (line 162)
-* -w:                                    nl invocation.       (line 122)
+* -w <7>:                                md5sum invocation.   (line 104)
+* -w <8>:                                uniq invocation.     (line 135)
+* -w <9>:                                General output formatting.
+                                                              (line 117)
+* -w <10>:                               Access permission tests.
+                                                              (line  21)
+* -w <11>:                               who invocation.      (line  94)
 * -WIDTH:                                fmt invocation.      (line  59)
-* -x <1>:                                Access permission tests.
-                                                              (line  24)
-* -x <2>:                                du invocation.       (line 242)
-* -x <3>:                                df invocation.       (line 222)
-* -x <4>:                                shred invocation.    (line 134)
-* -x <5>:                                cp invocation.       (line 379)
-* -x:                                    General output formatting.
-                                                              (line 107)
+* -x:                                    od invocation.       (line 196)
 * -X:                                    Sorting the output.  (line  63)
-* -x:                                    od invocation.       (line 203)
-* -X FILE:                               du invocation.       (line 231)
-* -Z:                                    id invocation.       (line  48)
-* -z <1>:                                realpath invocation. (line  53)
-* -z <2>:                                dirname invocation.  (line  31)
-* -z <3>:                                basename invocation. (line  42)
-* -z <4>:                                String tests.        (line  15)
-* -z:                                    readlink invocation. (line  63)
-* -Z <1>:                                mknod invocation.    (line  54)
-* -Z <2>:                                mkfifo invocation.   (line  28)
-* -Z:                                    mkdir invocation.    (line  56)
-* -z:                                    shred invocation.    (line 144)
-* -Z <1>:                                install invocation.  (line 133)
+* -x <1>:                                General output formatting.
+                                                              (line 102)
+* -x <2>:                                cp invocation.       (line 370)
+* -x <3>:                                shred invocation.    (line 143)
+* -x <4>:                                df invocation.       (line 214)
+* -x <5>:                                du invocation.       (line 261)
+* -x <6>:                                Access permission tests.
+                                                              (line  24)
+* -X FILE:                               du invocation.       (line 250)
+* -z:                                    csplit invocation.   (line  93)
+* -z <1>:                                sort invocation.     (line 374)
+* -z <2>:                                shuf invocation.     (line  55)
+* -z <3>:                                uniq invocation.     (line 141)
+* -z <4>:                                join invocation.     (line 155)
 * -Z:                                    What information is listed.
-                                                              (line 268)
-* -z <1>:                                uniq invocation.     (line 112)
-* -z <2>:                                shuf invocation.     (line  48)
-* -z <3>:                                sort invocation.     (line 375)
-* -z:                                    csplit invocation.   (line  90)
+                                                              (line 255)
+* -Z <1>:                                cp invocation.       (line 376)
+* -Z <2>:                                install invocation.  (line 138)
+* -Z <3>:                                mv invocation.       (line 112)
+* -z <5>:                                shred invocation.    (line 154)
+* -Z <4>:                                mkdir invocation.    (line  56)
+* -Z <5>:                                mkfifo invocation.   (line  28)
+* -Z <6>:                                mknod invocation.    (line  53)
+* -z <6>:                                readlink invocation. (line  64)
+* -z <7>:                                String tests.        (line  15)
+* -z <8>:                                basename invocation. (line  42)
+* -z <9>:                                dirname invocation.  (line  31)
+* -z <10>:                               realpath invocation. (line  76)
+* -Z <7>:                                id invocation.       (line  51)
+* -z <11>:                               id invocation.       (line  58)
 * /:                                     Numeric expressions. (line  16)
 * 128-bit checksum:                      md5sum invocation.   (line   6)
 * 16-bit checksum:                       sum invocation.      (line   6)
@@ -16798,97 +16707,99 @@ Index
 * 224-bit checksum:                      sha2 utilities.      (line   6)
 * 256-bit checksum:                      sha2 utilities.      (line   6)
 * 384-bit checksum:                      sha2 utilities.      (line   6)
-* 4.2 file system type:                  df invocation.       (line 209)
 * 512-bit checksum:                      sha2 utilities.      (line   6)
 * <:                                     Relations for expr.  (line  22)
 * <=:                                    Relations for expr.  (line  22)
-* = <1>:                                 Relations for expr.  (line  22)
-* =:                                     String tests.        (line  22)
-* == <1>:                                Relations for expr.  (line  22)
-* ==:                                    String tests.        (line  25)
+* =:                                     Relations for expr.  (line  22)
+* = <1>:                                 String tests.        (line  22)
+* ==:                                    Relations for expr.  (line  22)
+* == <1>:                                String tests.        (line  25)
 * >:                                     Relations for expr.  (line  22)
 * >=:                                    Relations for expr.  (line  22)
 * \( regexp operator:                    String expressions.  (line  24)
 * \+ regexp operator:                    String expressions.  (line  28)
 * \? regexp operator:                    String expressions.  (line  28)
-* \c:                                    printf invocation.   (line  29)
-* \OOO:                                  printf invocation.   (line  63)
-* \uhhhh:                                printf invocation.   (line  70)
-* \Uhhhhhhhh:                            printf invocation.   (line  70)
-* \xHH:                                  printf invocation.   (line  63)
+* \c:                                    printf invocation.   (line  28)
+* \OOO:                                  printf invocation.   (line  61)
+* \uhhhh:                                printf invocation.   (line  68)
+* \Uhhhhhhhh:                            printf invocation.   (line  68)
+* \xHH:                                  printf invocation.   (line  61)
 * \| regexp operator:                    String expressions.  (line  28)
-* _POSIX2_VERSION <1>:                   touch invocation.    (line 138)
-* _POSIX2_VERSION <2>:                   uniq invocation.     (line  46)
-* _POSIX2_VERSION <3>:                   sort invocation.     (line 408)
-* _POSIX2_VERSION <4>:                   tail invocation.     (line 175)
 * _POSIX2_VERSION:                       Standards conformance.
-                                                              (line  19)
+                                                              (line  18)
+* _POSIX2_VERSION <1>:                   tail invocation.     (line 184)
+* _POSIX2_VERSION <2>:                   sort invocation.     (line 406)
+* _POSIX2_VERSION <3>:                   uniq invocation.     (line  46)
+* _POSIX2_VERSION <4>:                   touch invocation.    (line 137)
+* |:                                     Relations for expr.  (line  11)
 * abbreviations for months:              Calendar date items. (line  38)
 * access permission tests:               Access permission tests.
                                                               (line   6)
 * access permissions, changing:          chmod invocation.    (line   6)
-* access time:                           dd invocation.       (line 245)
+* access time:                           dd invocation.       (line 246)
 * access time, changing:                 touch invocation.    (line  78)
 * access time, printing or sorting files by: Sorting the output.
                                                               (line  42)
-* access time, show the most recent:     du invocation.       (line 189)
-* across columns:                        pr invocation.       (line  63)
+* access time, show the most recent:     du invocation.       (line 208)
+* across columns:                        pr invocation.       (line  62)
 * across, listing files:                 General output formatting.
-                                                              (line 107)
-* adding permissions:                    Setting Permissions. (line  38)
+                                                              (line 102)
+* adding permissions:                    Setting Permissions. (line  35)
 * addition:                              Numeric expressions. (line  12)
 * ago in date strings:                   Relative items in date strings.
                                                               (line  23)
+* all lines, grouping:                   uniq invocation.     (line 101)
 * all repeated lines, outputting:        uniq invocation.     (line  69)
-* alnum:                                 Character sets.      (line  92)
-* alpha:                                 Character sets.      (line  95)
-* alternate ebcdic, converting to:       dd invocation.       (line  94)
+* alnum:                                 Character sets.      (line  88)
+* alpha:                                 Character sets.      (line  90)
+* alternate ebcdic, converting to:       dd invocation.       (line  96)
 * always color option:                   General output formatting.
-                                                              (line  27)
-* always interactive option:             rm invocation.       (line  61)
+                                                              (line  25)
+* always interactive option:             rm invocation.       (line  59)
 * am i:                                  who invocation.      (line  21)
-* am in date strings:                    Time of day items.   (line  22)
-* and operator <1>:                      Relations for expr.  (line  17)
+* am in date strings:                    Time of day items.   (line  21)
 * and operator:                          Connectives for test.
                                                               (line  12)
+* and operator <1>:                      Relations for expr.  (line  17)
 * append:                                dd invocation.       (line 185)
 * appending to the output file:          dd invocation.       (line 185)
-* appropriate privileges <1>:            nice invocation.     (line   6)
+* appropriate privileges:                install invocation.  (line  91)
+* appropriate privileges <1>:            Setting the time.    (line   6)
 * appropriate privileges <2>:            hostname invocation. (line   6)
-* appropriate privileges <3>:            Setting the time.    (line   6)
-* appropriate privileges:                install invocation.  (line  86)
+* appropriate privileges <3>:            nice invocation.     (line   6)
 * arbitrary date strings, parsing:       Options for date.    (line  11)
 * arbitrary text, displaying:            echo invocation.     (line   6)
 * arch:                                  arch invocation.     (line   6)
 * arithmetic tests:                      Numeric tests.       (line   6)
 * ASCII dump of files:                   od invocation.       (line   6)
-* ascii, converting to:                  dd invocation.       (line  86)
+* ascii, converting to:                  dd invocation.       (line  85)
 * atime, changing:                       touch invocation.    (line  78)
 * atime, printing or sorting files by:   Sorting the output.  (line  42)
-* atime, show the most recent:           du invocation.       (line 189)
+* atime, show the most recent:           du invocation.       (line 208)
 * attributes, file:                      Changing file attributes.
                                                               (line   6)
-* authors of parse_datetime:             Authors of parse_datetime.
+* authors of ‘parse_datetime’:           Authors of parse_datetime.
                                                               (line   6)
 * auto color option:                     General output formatting.
-                                                              (line  25)
-* automounter file systems:              df invocation.       (line  43)
+                                                              (line  24)
+* automounter file systems:              df invocation.       (line  42)
 * b for block special file:              mknod invocation.    (line  31)
 * background jobs, stopping at terminal write: Local.         (line  41)
-* backslash escapes <1>:                 echo invocation.     (line  25)
 * backslash escapes:                     Character sets.      (line  14)
+* backslash escapes <1>:                 echo invocation.     (line  25)
+* backslash escapes <2>:                 echo invocation.     (line  61)
 * backslash sequences for file names:    Formatting the file names.
                                                               (line  11)
 * backup files, ignoring:                Which files are listed.
                                                               (line  23)
 * backup options:                        Backup options.      (line   6)
-* backup suffix:                         Backup options.      (line  50)
-* backups, making <1>:                   ln invocation.       (line  84)
-* backups, making <2>:                   mv invocation.       (line  58)
-* backups, making <3>:                   install invocation.  (line  42)
-* backups, making <4>:                   cp invocation.       (line  81)
+* backup suffix:                         Backup options.      (line  49)
 * backups, making:                       Backup options.      (line  13)
-* backups, making only:                  cp invocation.       (line  53)
+* backups, making <1>:                   cp invocation.       (line  79)
+* backups, making <2>:                   install invocation.  (line  41)
+* backups, making <3>:                   mv invocation.       (line  56)
+* backups, making <4>:                   ln invocation.       (line  80)
+* backups, making only:                  cp invocation.       (line  51)
 * base64:                                base64 invocation.   (line   6)
 * Base64 decoding:                       base64 invocation.   (line  30)
 * base64 encoding:                       base64 invocation.   (line   6)
@@ -16896,35 +16807,35 @@ Index
 * baud rate, setting:                    Special.             (line  43)
 * beeping at input buffer full:          Input.               (line  59)
 * beginning of time:                     Time conversion specifiers.
-                                                              (line  42)
+                                                              (line  32)
 * beginning of time, for POSIX:          Seconds since the Epoch.
                                                               (line  13)
 * Bellovin, Steven M.:                   Authors of parse_datetime.
                                                               (line   6)
 * Berets, Jim:                           Authors of parse_datetime.
                                                               (line   6)
+* Berry, K.:                             Introduction.        (line  19)
 * Berry, K. <1>:                         Authors of parse_datetime.
                                                               (line  19)
-* Berry, K.:                             Introduction.        (line  19)
-* binary:                                dd invocation.       (line 262)
-* binary I/O:                            dd invocation.       (line 262)
+* binary:                                dd invocation.       (line 263)
+* binary I/O:                            dd invocation.       (line 263)
 * binary input files:                    md5sum invocation.   (line  37)
-* bind mount <1>:                        stat invocation.     (line 150)
-* bind mount:                            rm invocation.       (line  71)
-* blank:                                 Character sets.      (line  98)
-* blank lines, numbering:                nl invocation.       (line  87)
-* blanks, ignoring leading:              sort invocation.     (line  79)
-* block (space-padding):                 dd invocation.       (line 103)
-* block size <1>:                        dd invocation.       (line  34)
+* bind mount:                            rm invocation.       (line  69)
+* bind mount <1>:                        stat invocation.     (line 123)
+* blank:                                 Character sets.      (line  92)
+* blank lines, numbering:                nl invocation.       (line  82)
+* blanks, ignoring leading:              sort invocation.     (line  78)
+* block (space-padding):                 dd invocation.       (line 106)
 * block size:                            Block size.          (line   6)
+* block size <1>:                        dd invocation.       (line  34)
 * block size of conversion:              dd invocation.       (line  41)
 * block size of input:                   dd invocation.       (line  26)
 * block size of output:                  dd invocation.       (line  30)
 * block special check:                   File type tests.     (line  10)
 * block special files:                   mknod invocation.    (line  11)
 * block special files, creating:         mknod invocation.    (line   6)
-* BLOCK_SIZE:                            Block size.          (line  12)
 * BLOCKSIZE:                             Block size.          (line  12)
+* BLOCK_SIZE:                            Block size.          (line  12)
 * body, numbering:                       nl invocation.       (line  17)
 * Bourne shell syntax for color setup:   dircolors invocation.
                                                               (line  34)
@@ -16933,65 +16844,69 @@ Index
 * brkint:                                Input.               (line  12)
 * bs:                                    dd invocation.       (line  34)
 * BSD output:                            md5sum invocation.   (line  85)
-* BSD sum:                               sum invocation.      (line  25)
-* BSD tail:                              tail invocation.     (line  19)
-* BSD touch compatibility:               touch invocation.    (line  96)
+* BSD ‘sum’:                             sum invocation.      (line  25)
+* BSD ‘tail’:                            tail invocation.     (line  19)
+* BSD ‘touch’ compatibility:             touch invocation.    (line  96)
 * bsN:                                   Output.              (line  55)
+* btrfs file system type:                df invocation.       (line 202)
 * bugs, reporting:                       Introduction.        (line  12)
-* built-in shell commands, conflicts with <1>: sleep invocation.
-                                                              (line  34)
-* built-in shell commands, conflicts with <2>: kill invocation.
-                                                              (line  13)
-* built-in shell commands, conflicts with <3>: nice invocation.
-                                                              (line  38)
-* built-in shell commands, conflicts with <4>: pwd invocation.
-                                                              (line  30)
-* built-in shell commands, conflicts with <5>: test invocation.
-                                                              (line  28)
-* built-in shell commands, conflicts with <6>: printf invocation.
-                                                              (line  16)
-* built-in shell commands, conflicts with <7>: echo invocation.
-                                                              (line  11)
-* built-in shell commands, conflicts with <8>: stat invocation.
-                                                              (line  15)
 * built-in shell commands, conflicts with: mknod invocation.  (line  20)
+* built-in shell commands, conflicts with <1>: stat invocation.
+                                                              (line  15)
+* built-in shell commands, conflicts with <2>: echo invocation.
+                                                              (line  11)
+* built-in shell commands, conflicts with <3>: printf invocation.
+                                                              (line  16)
+* built-in shell commands, conflicts with <4>: test invocation.
+                                                              (line  28)
+* built-in shell commands, conflicts with <5>: pwd invocation.
+                                                              (line  30)
+* built-in shell commands, conflicts with <6>: nice invocation.
+                                                              (line  38)
+* built-in shell commands, conflicts with <7>: kill invocation.
+                                                              (line  13)
+* built-in shell commands, conflicts with <8>: sleep invocation.
+                                                              (line  31)
 * byte count:                            wc invocation.       (line   6)
-* byte-swapping:                         dd invocation.       (line 135)
+* byte-swapping:                         od invocation.       (line  51)
+* byte-swapping <1>:                     dd invocation.       (line 137)
 * c for character special file:          mknod invocation.    (line  34)
 * C shell syntax for color setup:        dircolors invocation.
                                                               (line  40)
 * C-s/C-q flow control:                  Input.               (line  40)
 * calendar date item:                    Calendar date items. (line   6)
-* canonical file name <1>:               realpath invocation. (line   6)
+* calling combined multi-call binary:    coreutils invocation.
+                                                              (line   6)
 * canonical file name:                   readlink invocation. (line   6)
-* canonicalize a file name <1>:          realpath invocation. (line   6)
+* canonical file name <1>:               realpath invocation. (line   6)
 * canonicalize a file name:              readlink invocation. (line   6)
-* case folding:                          sort invocation.     (line  94)
+* canonicalize a file name <1>:          realpath invocation. (line   6)
+* case folding:                          sort invocation.     (line  93)
 * case translation:                      Local.               (line  36)
-* case, ignored in dates:                General date syntax. (line  66)
+* case, ignored in dates:                General date syntax. (line  60)
 * cat:                                   cat invocation.      (line   6)
 * cbreak:                                Combination.         (line  52)
 * cbs:                                   dd invocation.       (line  41)
-* CD-ROM file system type:               df invocation.       (line 213)
-* cdfs file system type:                 df invocation.       (line 213)
-* cdtrdsr:                               Control.             (line  39)
+* CD-ROM file system type:               df invocation.       (line 206)
+* cdfs file system type:                 df invocation.       (line 206)
+* cdtrdsr:                               Control.             (line  44)
 * change or print terminal settings:     stty invocation.     (line   6)
 * change SELinux context:                chcon invocation.    (line   6)
-* changed files, verbosely describing:   chgrp invocation.    (line  20)
-* changed owners, verbosely describing:  chown invocation.    (line  70)
+* changed files, verbosely describing:   chgrp invocation.    (line  24)
+* changed owners, verbosely describing:  chown invocation.    (line  73)
 * changing access permissions:           chmod invocation.    (line   6)
 * changing file attributes:              Changing file attributes.
                                                               (line   6)
 * changing file ownership:               chown invocation.    (line   6)
 * changing file timestamps:              touch invocation.    (line   6)
-* changing group ownership <1>:          chgrp invocation.    (line   6)
 * changing group ownership:              chown invocation.    (line   6)
+* changing group ownership <1>:          chgrp invocation.    (line   6)
 * changing security context:             chcon invocation.    (line   6)
 * changing special mode bits:            Changing Special Mode Bits.
                                                               (line   6)
-* character classes:                     Character sets.      (line  79)
+* character classes:                     Character sets.      (line  74)
 * character count:                       wc invocation.       (line   6)
-* character size:                        Control.             (line  19)
+* character size:                        Control.             (line  24)
 * character special check:               File type tests.     (line  13)
 * character special files:               mknod invocation.    (line  11)
 * character special files, creating:     mknod invocation.    (line   6)
@@ -16999,6 +16914,7 @@ Index
 * chcon:                                 chcon invocation.    (line   6)
 * check file types:                      test invocation.     (line   6)
 * checking for sortedness:               sort invocation.     (line  18)
+* checking for sortedness <1>:           sort invocation.     (line  26)
 * checksum, 128-bit:                     md5sum invocation.   (line   6)
 * checksum, 16-bit:                      sum invocation.      (line   6)
 * checksum, 160-bit:                     sha1sum invocation.  (line   6)
@@ -17012,12 +16928,13 @@ Index
 * chroot:                                chroot invocation.   (line   6)
 * cio:                                   dd invocation.       (line 193)
 * cksum:                                 cksum invocation.    (line   6)
-* clocal:                                Control.             (line  33)
-* clock skew <1>:                        touch invocation.    (line  17)
+* clocal:                                Control.             (line  38)
 * clock skew:                            Formatting file timestamps.
-                                                              (line  12)
-* clone:                                 cp invocation.       (line 270)
-* cntrl:                                 Character sets.      (line 101)
+                                                              (line  11)
+* clock skew <1>:                        touch invocation.    (line  17)
+* clone:                                 cp invocation.       (line 262)
+* cmspar:                                Control.             (line  16)
+* cntrl:                                 Character sets.      (line  94)
 * color database, printing:              dircolors invocation.
                                                               (line  45)
 * color setup:                           dircolors invocation.
@@ -17026,11 +16943,13 @@ Index
                                                               (line  21)
 * cols:                                  Special.             (line  27)
 * column to wrap data after:             base64 invocation.   (line  22)
-* COLUMNS:                               Special.             (line  30)
-* columns:                               Special.             (line  27)
 * COLUMNS:                               General output formatting.
-                                                              (line 123)
+                                                              (line 117)
+* COLUMNS <1>:                           Special.             (line  30)
+* columns:                               Special.             (line  27)
 * combination settings:                  Combination.         (line   6)
+* combined:                              coreutils invocation.
+                                                              (line   6)
 * combined date and time of day item:    Combined date and time of day items.
                                                               (line   6)
 * comm:                                  comm invocation.     (line   6)
@@ -17049,8 +16968,8 @@ Index
 * commands for SELinux context:          SELinux context.     (line   6)
 * commands for system context:           System context.      (line   6)
 * commas, outputting between files:      General output formatting.
-                                                              (line  97)
-* comments, in dates:                    General date syntax. (line  66)
+                                                              (line  92)
+* comments, in dates:                    General date syntax. (line  60)
 * common field, joining on:              join invocation.     (line   6)
 * common lines:                          comm invocation.     (line  18)
 * common options:                        Common options.      (line   6)
@@ -17062,24 +16981,25 @@ Index
 * conditional executability:             Conditional Executability.
                                                               (line   6)
 * conditions:                            Conditions.          (line   6)
-* conflicts with shell built-ins <1>:    sleep invocation.    (line  34)
-* conflicts with shell built-ins <2>:    kill invocation.     (line  13)
-* conflicts with shell built-ins <3>:    nice invocation.     (line  38)
-* conflicts with shell built-ins <4>:    pwd invocation.      (line  30)
-* conflicts with shell built-ins <5>:    test invocation.     (line  28)
-* conflicts with shell built-ins <6>:    printf invocation.   (line  16)
-* conflicts with shell built-ins <7>:    echo invocation.     (line  11)
-* conflicts with shell built-ins <8>:    stat invocation.     (line  15)
 * conflicts with shell built-ins:        mknod invocation.    (line  20)
-* connectives, logical <1>:              Relations for expr.  (line   6)
+* conflicts with shell built-ins <1>:    stat invocation.     (line  15)
+* conflicts with shell built-ins <2>:    echo invocation.     (line  11)
+* conflicts with shell built-ins <3>:    printf invocation.   (line  16)
+* conflicts with shell built-ins <4>:    test invocation.     (line  28)
+* conflicts with shell built-ins <5>:    pwd invocation.      (line  30)
+* conflicts with shell built-ins <6>:    nice invocation.     (line  38)
+* conflicts with shell built-ins <7>:    kill invocation.     (line  13)
+* conflicts with shell built-ins <8>:    sleep invocation.    (line  31)
 * connectives, logical:                  Connectives for test.
                                                               (line   6)
+* connectives, logical <1>:              Relations for expr.  (line   6)
+* constant parity:                       Control.             (line  16)
 * context splitting:                     csplit invocation.   (line   6)
 * context, system:                       System context.      (line   6)
-* control characters, using ^C:          Local.               (line  51)
+* control characters, using ‘^C’:        Local.               (line  51)
 * control settings:                      Control.             (line   6)
-* controlling terminal:                  dd invocation.       (line 250)
-* conv:                                  dd invocation.       (line  80)
+* controlling terminal:                  dd invocation.       (line 251)
+* conv:                                  dd invocation.       (line  79)
 * conversion block size:                 dd invocation.       (line  41)
 * conversion specifiers, date:           Date conversion specifiers.
                                                               (line   6)
@@ -17090,40 +17010,41 @@ Index
 * converting tabs to spaces:             expand invocation.   (line   6)
 * converting while copying a file:       dd invocation.       (line   6)
 * cooked:                                Combination.         (line  37)
-* Coordinated Universal Time:            Options for date.    (line 113)
-* copy on write:                         cp invocation.       (line 270)
-* copying directories recursively:       cp invocation.       (line  98)
+* Coordinated Universal Time:            Options for date.    (line 112)
+* copy on write:                         cp invocation.       (line 262)
+* copying directories recursively:       cp invocation.       (line  96)
+* copying directories recursively <1>:   cp invocation.       (line 249)
 * copying existing permissions:          Copying Permissions. (line   6)
 * copying files:                         cat invocation.      (line   6)
 * copying files and directories:         cp invocation.       (line   6)
 * copying files and setting attributes:  install invocation.  (line   6)
 * core utilities:                        Top.                 (line  18)
 * count:                                 dd invocation.       (line  56)
-* count_bytes:                           dd invocation.       (line 280)
-* COW:                                   cp invocation.       (line 270)
+* count_bytes:                           dd invocation.       (line 281)
+* COW:                                   cp invocation.       (line 262)
 * cp:                                    cp invocation.       (line   6)
 * crashes and corruption:                sync invocation.     (line  11)
 * CRC checksum:                          cksum invocation.    (line   6)
-* cread:                                 Control.             (line  30)
+* cread:                                 Control.             (line  35)
 * creating directories:                  mkdir invocation.    (line   6)
 * creating FIFOs (named pipes):          mkfifo invocation.   (line   6)
 * creating links (hard only):            link invocation.     (line   6)
 * creating links (hard or soft):         ln invocation.       (line   6)
-* creating output file, avoiding:        dd invocation.       (line 153)
-* creating output file, requiring:       dd invocation.       (line 149)
+* creating output file, avoiding:        dd invocation.       (line 154)
+* creating output file, requiring:       dd invocation.       (line 150)
 * crN:                                   Output.              (line  45)
 * crown margin:                          fmt invocation.      (line  34)
 * crt:                                   Combination.         (line  75)
 * crterase:                              Local.               (line  22)
 * crtkill:                               Local.               (line  56)
-* crtscts:                               Control.             (line  36)
-* csh syntax for color setup:            dircolors invocation.
+* crtscts:                               Control.             (line  41)
+* ‘csh’ syntax for color setup:          dircolors invocation.
                                                               (line  40)
-* csN:                                   Control.             (line  19)
+* csN:                                   Control.             (line  24)
 * csplit:                                csplit invocation.   (line   6)
-* cstopb:                                Control.             (line  27)
+* cstopb:                                Control.             (line  32)
 * ctime, printing or sorting by:         Sorting the output.  (line  13)
-* ctime, show the most recent:           du invocation.       (line 184)
+* ctime, show the most recent:           du invocation.       (line 203)
 * ctlecho:                               Local.               (line  51)
 * current working directory, printing:   pwd invocation.      (line   6)
 * cut:                                   cut invocation.      (line   6)
@@ -17138,45 +17059,54 @@ Index
                                                               (line   6)
 * date format, ISO 8601:                 Calendar date items. (line  30)
 * date input formats:                    Date input formats.  (line   6)
-* date options:                          Options for date.    (line   6)
+* ‘date’ options:                        Options for date.    (line   6)
 * date strings, parsing:                 Options for date.    (line  11)
 * day in date strings:                   Relative items in date strings.
                                                               (line  15)
+* day in date strings <1>:               Relative items in date strings.
+                                                              (line  29)
 * day of week item:                      Day of week items.   (line   6)
 * dd:                                    dd invocation.       (line   6)
+* ddrescue:                              dd invocation.       (line 330)
 * dec:                                   Combination.         (line  78)
 * decctlq:                               Combination.         (line  63)
 * Decode base64 data:                    base64 invocation.   (line  30)
 * delay for a specified time:            sleep invocation.    (line   6)
 * delaying commands:                     Delaying.            (line   6)
 * deleting characters:                   Squeezing.           (line   6)
-* dereferencing symbolic links:          ln invocation.       (line  42)
+* dereferencing symbolic links:          ln invocation.       (line  40)
 * descriptor follow option:              tail invocation.     (line  48)
-* destination directory <1>:             ln invocation.       (line 161)
-* destination directory <2>:             mv invocation.       (line 105)
-* destination directory <3>:             install invocation.  (line 120)
-* destination directory <4>:             cp invocation.       (line 352)
 * destination directory:                 Target directory.    (line  15)
+* destination directory <1>:             Target directory.    (line  31)
+* destination directory <2>:             cp invocation.       (line 343)
+* destination directory <3>:             cp invocation.       (line 347)
+* destination directory <4>:             install invocation.  (line 125)
+* destination directory <5>:             install invocation.  (line 129)
+* destination directory <6>:             mv invocation.       (line 103)
+* destination directory <7>:             mv invocation.       (line 107)
+* destination directory <8>:             ln invocation.       (line 169)
+* destination directory <9>:             ln invocation.       (line 173)
 * destinations, multiple output:         tee invocation.      (line   6)
 * device file, disk:                     df invocation.       (line  30)
 * df:                                    df invocation.       (line   6)
 * DF_BLOCK_SIZE:                         Block size.          (line  12)
 * diagnostic:                            chcon invocation.    (line  61)
-* dictionary order:                      sort invocation.     (line  87)
+* dictionary order:                      sort invocation.     (line  86)
 * differing lines:                       comm invocation.     (line  18)
-* digit:                                 Character sets.      (line 104)
+* digit:                                 Character sets.      (line  96)
 * dir:                                   dir invocation.      (line   6)
 * dircolors:                             dircolors invocation.
                                                               (line   6)
 * direct:                                dd invocation.       (line 199)
 * direct I/O:                            dd invocation.       (line 199)
 * directories, copying:                  cp invocation.       (line   6)
-* directories, copying recursively:      cp invocation.       (line  98)
+* directories, copying recursively:      cp invocation.       (line  96)
+* directories, copying recursively <1>:  cp invocation.       (line 249)
 * directories, creating:                 mkdir invocation.    (line   6)
 * directories, creating with given attributes: install invocation.
-                                                              (line  62)
+                                                              (line  67)
 * directories, removing:                 rm invocation.       (line  35)
-* directories, removing (recursively):   rm invocation.       (line  95)
+* directories, removing (recursively):   rm invocation.       (line  93)
 * directories, removing empty:           rmdir invocation.    (line   6)
 * directory:                             dd invocation.       (line 207)
 * directory check:                       File type tests.     (line  16)
@@ -17187,7 +17117,7 @@ Index
 * directory listing:                     ls invocation.       (line   6)
 * directory listing, brief:              dir invocation.      (line   6)
 * directory listing, recursive:          Which files are listed.
-                                                              (line  91)
+                                                              (line  90)
 * directory listing, verbose:            vdir invocation.     (line   6)
 * directory order, listing by:           Sorting the output.  (line  20)
 * directory, creating temporary:         mktemp invocation.   (line   6)
@@ -17195,17 +17125,17 @@ Index
 * dired Emacs mode support:              What information is listed.
                                                               (line  16)
 * dirname:                               dirname invocation.  (line   6)
-* disabling special characters:          Characters.          (line  13)
+* disabling special characters:          Characters.          (line  12)
 * disambiguating group names and IDs:    Disambiguating names and IDs.
                                                               (line   6)
-* discarding file cache:                 dd invocation.       (line 223)
+* discarding file cache:                 dd invocation.       (line 224)
 * disk allocation:                       What information is listed.
-                                                              (line 244)
+                                                              (line 232)
 * disk device file:                      df invocation.       (line  30)
 * disk usage:                            Disk usage.          (line   6)
 * disk usage by file system:             df invocation.       (line   6)
 * disk usage for files:                  du invocation.       (line   6)
-* diskette file system:                  df invocation.       (line 217)
+* disks, failing:                        dd invocation.       (line 330)
 * displacement of dates:                 Relative items in date strings.
                                                               (line   6)
 * displaying text:                       echo invocation.     (line   6)
@@ -17213,17 +17143,18 @@ Index
 * division:                              Numeric expressions. (line  16)
 * do nothing, successfully:              true invocation.     (line   6)
 * do nothing, unsuccessfully:            false invocation.    (line   6)
-* DOS file system:                       df invocation.       (line 217)
-* double spacing:                        pr invocation.       (line  75)
+* DOS file system:                       df invocation.       (line 210)
+* double spacing:                        pr invocation.       (line  74)
 * down columns:                          pr invocation.       (line  49)
-* dsusp:                                 Characters.          (line  53)
-* dsync:                                 dd invocation.       (line 212)
-* DTR/DSR flow control:                  Control.             (line  39)
+* dsusp:                                 Characters.          (line  51)
+* dsync:                                 dd invocation.       (line 213)
+* DTR/DSR flow control:                  Control.             (line  44)
 * du:                                    du invocation.       (line   6)
 * DU_BLOCK_SIZE:                         Block size.          (line  12)
-* ebcdic, converting to:                 dd invocation.       (line  90)
-* echo <1>:                              Local.               (line  18)
+* DVD file system type:                  df invocation.       (line 206)
+* ebcdic, converting to:                 dd invocation.       (line  91)
 * echo:                                  echo invocation.     (line   6)
+* echo <1>:                              Local.               (line  18)
 * echoctl:                               Local.               (line  51)
 * echoe:                                 Local.               (line  22)
 * echok:                                 Local.               (line  26)
@@ -17232,15 +17163,15 @@ Index
 * echoprt:                               Local.               (line  46)
 * effective user and group IDs, printing: id invocation.      (line   6)
 * effective user ID, printing:           whoami invocation.   (line   6)
-* efs file system type:                  df invocation.       (line 209)
 * Eggert, Paul:                          Authors of parse_datetime.
                                                               (line   6)
+* eight-bit characters:                  Control.             (line  24)
 * eight-bit characters <1>:              Combination.         (line  55)
-* eight-bit characters:                  Control.             (line  19)
 * eight-bit input:                       Input.               (line  25)
 * ek:                                    Combination.         (line  22)
 * empty files, creating:                 touch invocation.    (line  11)
-* empty lines, numbering:                nl invocation.       (line  87)
+* empty lines, numbering:                nl invocation.       (line  82)
+* endianness:                            od invocation.       (line  51)
 * entire files, output of:               Output of entire files.
                                                               (line   6)
 * env:                                   env invocation.      (line   6)
@@ -17248,72 +17179,78 @@ Index
 * environment, printing:                 env invocation.      (line  45)
 * environment, running a program in a modified: env invocation.
                                                               (line   6)
-* eof:                                   Characters.          (line  32)
-* eol:                                   Characters.          (line  35)
-* eol2:                                  Characters.          (line  38)
+* eof:                                   Characters.          (line  30)
+* eol:                                   Characters.          (line  33)
+* eol2:                                  Characters.          (line  36)
 * epoch, for POSIX:                      Seconds since the Epoch.
                                                               (line  13)
 * epoch, seconds since:                  Time conversion specifiers.
-                                                              (line  42)
+                                                              (line  32)
 * equal string check:                    String tests.        (line  22)
-* equivalence classes:                   Character sets.      (line 128)
-* erase:                                 Characters.          (line  26)
+* equal string check <1>:                String tests.        (line  25)
+* equivalence classes:                   Character sets.      (line 113)
+* erase:                                 Characters.          (line  24)
 * erasing data:                          shred invocation.    (line   6)
-* error messages, omitting <1>:          chmod invocation.    (line  45)
-* error messages, omitting <2>:          chgrp invocation.    (line  26)
-* error messages, omitting:              chown invocation.    (line  76)
+* error messages, omitting:              chown invocation.    (line  79)
+* error messages, omitting <1>:          chgrp invocation.    (line  30)
+* error messages, omitting <2>:          chmod invocation.    (line  45)
 * evaluation of expressions:             expr invocation.     (line   6)
 * even parity:                           Control.             (line  13)
 * evenp:                                 Combination.         (line   9)
-* exabyte, definition of:                Block size.          (line 117)
-* examples of date:                      Examples of date.    (line   6)
-* examples of expr:                      Examples of expr.    (line   6)
-* exbibyte, definition of:               Block size.          (line 121)
-* excl:                                  dd invocation.       (line 149)
-* excluding files from du:               du invocation.       (line 231)
+* exabyte, definition of:                Block size.          (line 106)
+* examples of ‘date’:                    Examples of date.    (line   6)
+* examples of ‘expr’:                    Examples of expr.    (line   6)
+* exbibyte, definition of:               Block size.          (line 109)
+* excl:                                  dd invocation.       (line 150)
+* excluding files from ‘du’:             du invocation.       (line 250)
+* excluding files from ‘du’ <1>:         du invocation.       (line 255)
 * executable file check:                 Access permission tests.
                                                               (line  24)
 * executables and file type, marking:    General output formatting.
-                                                              (line  48)
-* execute/search permission:             Mode Structure.      (line  18)
-* execute/search permission, symbolic:   Setting Permissions. (line  63)
+                                                              (line  46)
+* execute/search permission:             Mode Structure.      (line  16)
+* execute/search permission, symbolic:   Setting Permissions. (line  56)
 * existence-of-file check:               File characteristic tests.
                                                               (line   9)
 * existing backup method:                Backup options.      (line  39)
 * exit status commands:                  Conditions.          (line   6)
-* exit status of chroot:                 chroot invocation.   (line  58)
-* exit status of env:                    env invocation.      (line 100)
-* exit status of expr:                   expr invocation.     (line  43)
-* exit status of false:                  false invocation.    (line   6)
-* exit status of ls:                     ls invocation.       (line  29)
-* exit status of mktemp:                 mktemp invocation.   (line 130)
-* exit status of nice:                   nice invocation.     (line  60)
-* exit status of nohup:                  nohup invocation.    (line  47)
-* exit status of pathchk:                pathchk invocation.  (line  50)
-* exit status of printenv:               printenv invocation. (line  25)
-* exit status of realpath:               realpath invocation. (line  79)
-* exit status of runcon:                 runcon invocation.   (line  46)
-* exit status of sort:                   sort invocation.     (line  58)
-* exit status of stdbuf:                 stdbuf invocation.   (line  67)
-* exit status of test:                   test invocation.     (line  41)
-* exit status of timeout:                timeout invocation.  (line  59)
-* exit status of true:                   true invocation.     (line   6)
-* exit status of tty:                    tty invocation.      (line  21)
+* exit status of ‘chroot’:               chroot invocation.   (line  67)
+* exit status of ‘env’:                  env invocation.      (line  97)
+* exit status of ‘expr’:                 expr invocation.     (line  43)
+* exit status of ‘false’:                false invocation.    (line   6)
+* exit status of ‘ls’:                   ls invocation.       (line  29)
+* exit status of ‘mktemp’:               mktemp invocation.   (line 128)
+* exit status of ‘nice’:                 nice invocation.     (line  59)
+* exit status of ‘nohup’:                nohup invocation.    (line  46)
+* exit status of ‘pathchk’:              pathchk invocation.  (line  47)
+* exit status of ‘printenv’:             printenv invocation. (line  23)
+* exit status of ‘realpath’:             realpath invocation. (line  80)
+* exit status of ‘runcon’:               runcon invocation.   (line  45)
+* exit status of ‘sort’:                 sort invocation.     (line  57)
+* exit status of ‘stdbuf’:               stdbuf invocation.   (line  65)
+* exit status of ‘test’:                 test invocation.     (line  41)
+* exit status of ‘timeout’:              timeout invocation.  (line  58)
+* exit status of ‘true’:                 true invocation.     (line   6)
+* exit status of ‘tty’:                  tty invocation.      (line  20)
 * expand:                                expand invocation.   (line   6)
 * expr:                                  expr invocation.     (line   6)
-* expression evaluation <1>:             expr invocation.     (line   6)
 * expression evaluation:                 test invocation.     (line   6)
+* expression evaluation <1>:             expr invocation.     (line   6)
 * expressions, numeric:                  Numeric expressions. (line   6)
 * expressions, string:                   String expressions.  (line   6)
-* extended attributes, xattr <1>:        mv invocation.       (line  34)
-* extended attributes, xattr:            install invocation.  (line  35)
+* ext2 file system type:                 df invocation.       (line 202)
+* ext3 file system type:                 df invocation.       (line 202)
+* ext4 file system type:                 df invocation.       (line 202)
+* extended attributes, xattr:            install invocation.  (line  34)
+* extended attributes, xattr <1>:        mv invocation.       (line  33)
 * extension, sorting files by:           Sorting the output.  (line  63)
 * factor:                                factor invocation.   (line   6)
 * failure exit status:                   false invocation.    (line   6)
 * false:                                 false invocation.    (line   6)
-* fdatasync:                             dd invocation.       (line 165)
+* fat file system file:                  df invocation.       (line 210)
+* fdatasync:                             dd invocation.       (line 166)
 * ffN:                                   Output.              (line  63)
-* field separator character:             sort invocation.     (line 325)
+* field separator character:             sort invocation.     (line 322)
 * fields, padding numeric:               Padding and other flags.
                                                               (line   6)
 * FIFOs, creating:                       mkfifo invocation.   (line   6)
@@ -17322,9 +17259,9 @@ Index
 * file characteristic tests:             File characteristic tests.
                                                               (line   6)
 * file contents, dumping unambiguously:  od invocation.       (line   6)
-* file information, preserving:          cp invocation.       (line 240)
+* file information, preserving:          cp invocation.       (line 232)
 * file information, preserving, extended attributes, xattr: cp invocation.
-                                                              (line 171)
+                                                              (line 168)
 * file mode bits, numeric:               Numeric Modes.       (line   6)
 * file name manipulation:                File name manipulation.
                                                               (line   6)
@@ -17336,33 +17273,37 @@ Index
                                                               (line   6)
 * file offset radix:                     od invocation.       (line  36)
 * file ownership, changing:              chown invocation.    (line   6)
-* file sizes:                            du invocation.       (line  53)
+* file sizes:                            du invocation.       (line  52)
 * file space usage:                      du invocation.       (line   6)
 * file status:                           stat invocation.     (line   6)
 * file system disk usage:                df invocation.       (line   6)
-* file system sizes:                     df invocation.       (line  49)
+* file system sizes:                     df invocation.       (line  48)
 * file system space, retrieving current data more slowly: df invocation.
-                                                              (line 184)
+                                                              (line 178)
 * file system space, retrieving old data more quickly: df invocation.
-                                                              (line  89)
+                                                              (line  88)
 * file system status:                    stat invocation.     (line   6)
 * file system types, limiting output to certain: df invocation.
-                                                              (line  85)
-* file system types, printing:           df invocation.       (line 197)
+                                                              (line  84)
+* file system types, limiting output to certain <1>: df invocation.
+                                                              (line 185)
+* file system types, printing:           df invocation.       (line 191)
 * file systems:                          stat invocation.     (line  28)
 * file systems and hard links:           ln invocation.       (line   6)
-* file systems, omitting copying to different: cp invocation. (line 379)
+* file systems, omitting copying to different: cp invocation. (line 370)
 * file timestamp resolution:             touch invocation.    (line  26)
 * file timestamps, changing:             touch invocation.    (line   6)
 * file type and executables, marking:    General output formatting.
-                                                              (line  48)
+                                                              (line  46)
 * file type tests:                       File type tests.     (line   6)
 * file type, marking:                    General output formatting.
-                                                              (line  59)
+                                                              (line  57)
+* file type, marking <1>:                General output formatting.
+                                                              (line  97)
 * file types:                            Special file types.  (line   9)
 * file types, special:                   Special file types.  (line   6)
 * file utilities:                        Top.                 (line  18)
-* files beginning with -, removing:      rm invocation.       (line 102)
+* files beginning with ‘-’, removing:    rm invocation.       (line  99)
 * files, copying:                        cp invocation.       (line   6)
 * files, creating:                       truncate invocation. (line  11)
 * fingerprint, 128-bit:                  md5sum invocation.   (line   6)
@@ -17371,12 +17312,13 @@ Index
 * fingerprint, 256-bit:                  sha2 utilities.      (line   6)
 * fingerprint, 384-bit:                  sha2 utilities.      (line   6)
 * fingerprint, 512-bit:                  sha2 utilities.      (line   6)
-* first in date strings:                 General date syntax. (line  28)
+* first in date strings:                 General date syntax. (line  22)
 * first part of files, outputting:       head invocation.     (line   6)
 * fixed-length records, converting to variable-length: dd invocation.
                                                               (line  41)
 * floating point:                        Floating point.      (line   6)
-* flow control, hardware:                Control.             (line  36)
+* flow control, hardware:                Control.             (line  41)
+* flow control, hardware <1>:            Control.             (line  44)
 * flow control, software:                Input.               (line  45)
 * flushing, disabling:                   Local.               (line  32)
 * fmt:                                   fmt invocation.      (line   6)
@@ -17386,123 +17328,125 @@ Index
 * force deletion:                        shred invocation.    (line 101)
 * formatting file contents:              Formatting file contents.
                                                               (line   6)
-* formatting of numbers in seq:          seq invocation.      (line  24)
+* formatting of numbers in ‘seq’:        seq invocation.      (line  26)
+* formatting times:                      pr invocation.       (line  78)
 * formatting times <1>:                  date invocation.     (line  20)
-* formatting times:                      pr invocation.       (line  79)
 * fortnight in date strings:             Relative items in date strings.
                                                               (line  15)
-* fsync:                                 dd invocation.       (line 169)
-* fullblock:                             dd invocation.       (line 270)
+* fsync:                                 dd invocation.       (line 170)
+* fullblock:                             dd invocation.       (line 271)
 * general date syntax:                   General date syntax. (line   6)
-* general numeric sort:                  sort invocation.     (line 105)
-* gibibyte, definition of:               Block size.          (line 100)
-* gigabyte, definition of:               Block size.          (line  96)
+* general numeric sort:                  sort invocation.     (line 104)
+* gibibyte, definition of:               Block size.          (line  94)
+* gigabyte, definition of:               Block size.          (line  91)
 * giving away permissions:               Umask and Protection.
                                                               (line  12)
-* GMT:                                   Options for date.    (line 113)
+* GMT:                                   Options for date.    (line 112)
 * grand total of disk size, usage and available space: df invocation.
-                                                              (line  53)
-* grand total of disk space:             du invocation.       (line  62)
-* graph:                                 Character sets.      (line 107)
-* Greenwich Mean Time:                   Options for date.    (line 113)
+                                                              (line  52)
+* grand total of disk space:             du invocation.       (line  61)
+* graph:                                 Character sets.      (line  98)
+* Greenwich Mean Time:                   Options for date.    (line 112)
 * group IDs, disambiguating:             Disambiguating names and IDs.
                                                               (line   6)
 * group names, disambiguating:           Disambiguating names and IDs.
                                                               (line   6)
-* group owner, default:                  Mode Structure.      (line  31)
+* group owner, default:                  Mode Structure.      (line  27)
 * group ownership of installed files, setting: install invocation.
-                                                              (line  68)
-* group ownership, changing <1>:         chgrp invocation.    (line   6)
+                                                              (line  73)
 * group ownership, changing:             chown invocation.    (line   6)
-* group, permissions for:                Setting Permissions. (line  26)
+* group ownership, changing <1>:         chgrp invocation.    (line   6)
+* group, permissions for:                Setting Permissions. (line  25)
 * groups:                                groups invocation.   (line   6)
 * growing files:                         tail invocation.     (line  48)
 * hangups, immunity to:                  nohup invocation.    (line   6)
 * hard link check:                       File characteristic tests.
                                                               (line  23)
-* hard link, defined:                    ln invocation.       (line  32)
-* hard links:                            dd invocation.       (line 259)
-* hard links to directories:             ln invocation.       (line  90)
-* hard links to symbolic links:          ln invocation.       (line 173)
-* hard links, counting in du:            du invocation.       (line 115)
-* hard links, creating <1>:              ln invocation.       (line   6)
+* hard link, defined:                    ln invocation.       (line  30)
+* hard links:                            dd invocation.       (line 260)
+* hard links to directories:             ln invocation.       (line  86)
+* hard links to symbolic links:          ln invocation.       (line 180)
+* hard links, counting in ‘du’:          du invocation.       (line 123)
 * hard links, creating:                  link invocation.     (line   6)
-* hard links, preserving:                cp invocation.       (line 111)
+* hard links, creating <1>:              ln invocation.       (line   6)
+* hard links, preserving:                cp invocation.       (line 109)
 * hardware class:                        uname invocation.    (line  41)
-* hardware flow control:                 Control.             (line  36)
+* hardware flow control:                 Control.             (line  41)
+* hardware flow control <1>:             Control.             (line  44)
 * hardware platform:                     uname invocation.    (line  35)
 * hardware type:                         uname invocation.    (line  41)
 * hat notation for control characters:   Local.               (line  51)
 * head:                                  head invocation.     (line   6)
-* head of output:                        shuf invocation.     (line  32)
+* head of output:                        shuf invocation.     (line  31)
 * headers, numbering:                    nl invocation.       (line  17)
-* help, online:                          Common options.      (line  37)
+* help, online:                          Common options.      (line  36)
 * hex dump of files:                     od invocation.       (line   6)
-* High Sierra file system:               df invocation.       (line 213)
-* holes, copying files with:             cp invocation.       (line 300)
+* holes, copying files with:             cp invocation.       (line 292)
 * holes, creating files with:            truncate invocation. (line  13)
 * horizontal, listing files:             General output formatting.
-                                                              (line 107)
+                                                              (line 102)
 * host processor type:                   uname invocation.    (line  50)
 * hostid:                                hostid invocation.   (line   6)
-* hostname <1>:                          hostname invocation. (line   6)
-* hostname:                              uname invocation.    (line  46)
+* hostname:                              hostname invocation. (line   6)
+* hostname <1>:                          uname invocation.    (line  46)
 * hour in date strings:                  Relative items in date strings.
                                                               (line  15)
-* hsfs file system type:                 df invocation.       (line 213)
-* human numeric sort:                    sort invocation.     (line 130)
-* human-readable output <1>:             du invocation.       (line  97)
-* human-readable output <2>:             df invocation.       (line  64)
-* human-readable output <3>:             What information is listed.
+* human numeric sort:                    sort invocation.     (line 125)
+* human-readable output:                 Block size.          (line  42)
+* human-readable output <1>:             What information is listed.
                                                               (line 116)
-* human-readable output:                 Block size.          (line  43)
-* hup[cl]:                               Control.             (line  23)
+* human-readable output <2>:             df invocation.       (line  63)
+* human-readable output <3>:             du invocation.       (line  96)
+* hup[cl]:                               Control.             (line  28)
 * hurd, author, printing:                What information is listed.
                                                               (line  10)
 * ibs:                                   dd invocation.       (line  26)
 * icanon:                                Local.               (line  11)
 * icrnl:                                 Input.               (line  34)
 * id:                                    id invocation.       (line   6)
-* idle time:                             who invocation.      (line  86)
+* idle time:                             who invocation.      (line  85)
 * IEEE floating point:                   Floating point.      (line   6)
 * iexten:                                Local.               (line  15)
 * if:                                    dd invocation.       (line  18)
 * iflag:                                 dd invocation.       (line 174)
 * ignbrk:                                Input.               (line   9)
 * igncr:                                 Input.               (line  31)
-* ignore file systems:                   df invocation.       (line  43)
+* ignore file systems:                   df invocation.       (line  42)
 * Ignore garbage in base64 stream:       base64 invocation.   (line  36)
-* ignoring case:                         sort invocation.     (line  94)
+* ignoring case:                         sort invocation.     (line  93)
 * ignpar:                                Input.               (line  15)
 * imaxbel:                               Input.               (line  59)
 * immunity to hangups:                   nohup invocation.    (line   6)
 * implementation, hardware:              uname invocation.    (line  35)
-* indenting lines:                       pr invocation.       (line 181)
+* indenting lines:                       pr invocation.       (line 180)
 * index:                                 String expressions.  (line  45)
 * information, about current users:      who invocation.      (line   6)
 * initial part of files, outputting:     head invocation.     (line   6)
-* initial tabs, converting:              expand invocation.   (line  34)
+* initial tabs, converting:              expand invocation.   (line  33)
 * inlcr:                                 Input.               (line  28)
 * inode number, printing:                What information is listed.
                                                               (line 123)
-* inode usage:                           df invocation.       (line  74)
-* inode, and hard links:                 ln invocation.       (line  32)
+* inode usage:                           df invocation.       (line  73)
+* inode usage, dereferencing in ‘du’:    du invocation.       (line 102)
+* inode, and hard links:                 ln invocation.       (line  30)
 * inodes, written buffered:              sync invocation.     (line   6)
 * inpck:                                 Input.               (line  22)
 * input block size:                      dd invocation.       (line  26)
 * input encoding, UTF-8:                 Input.               (line  37)
 * input range to shuffle:                shuf invocation.     (line  23)
 * input settings:                        Input.               (line   6)
-* input tabs:                            pr invocation.       (line  99)
+* input tabs:                            pr invocation.       (line  98)
 * install:                               install invocation.  (line   6)
-* intr:                                  Characters.          (line  20)
+* intr:                                  Characters.          (line  18)
 * invocation of commands, modified:      Modified command invocation.
                                                               (line   6)
 * isig:                                  Local.               (line   7)
 * ISO 8601 date and time of day format:  Combined date and time of day items.
                                                               (line   6)
 * ISO 8601 date format:                  Calendar date items. (line  30)
-* ISO/IEC 10646:                         printf invocation.   (line  70)
+* ISO/IEC 10646:                         printf invocation.   (line  68)
+* ISO9660 file system type:              df invocation.       (line 206)
+* iso9660 file system type:              df invocation.       (line 206)
 * ispeed:                                Special.             (line  16)
 * istrip:                                Input.               (line  25)
 * items in date strings:                 General date syntax. (line   6)
@@ -17516,59 +17460,73 @@ Index
 * kernel name:                           uname invocation.    (line  65)
 * kernel release:                        uname invocation.    (line  61)
 * kernel version:                        uname invocation.    (line  76)
-* kibibyte, definition of:               Block size.          (line  84)
-* kibibytes for file sizes:              du invocation.       (line 103)
-* kibibytes for file system sizes:       df invocation.       (line  79)
-* kill <1>:                              kill invocation.     (line   6)
-* kill:                                  Characters.          (line  29)
-* kilobyte, definition of:               Block size.          (line  79)
+* kibibyte, definition of:               Block size.          (line  82)
+* kibibytes for file sizes:              du invocation.       (line 111)
+* kibibytes for file system sizes:       df invocation.       (line  78)
+* kill:                                  kill invocation.     (line   6)
+* kill <1>:                              Characters.          (line  27)
+* kilobyte, definition of:               Block size.          (line  78)
 * Knuth, Donald E.:                      fmt invocation.      (line  19)
-* language, in dates:                    General date syntax. (line  42)
-* last DAY <1>:                          Day of week items.   (line  15)
-* last DAY:                              Options for date.    (line  11)
-* last in date strings:                  General date syntax. (line  28)
-* last modified dates, displaying in du: du invocation.       (line 178)
+* language, in dates:                    General date syntax. (line  36)
+* language, in dates <1>:                General date syntax. (line  40)
+* last DAY:                              Day of week items.   (line  15)
+* last DAY <1>:                          Options for date.    (line  11)
+* last in date strings:                  General date syntax. (line  22)
+* last modified dates, displaying in ‘du’: du invocation.     (line 197)
 * last part of files, outputting:        tail invocation.     (line   6)
+* lcase:                                 Combination.         (line  71)
+* LCASE:                                 Combination.         (line  71)
+* lcase, converting to:                  dd invocation.       (line 117)
+* lchown:                                chown invocation.    (line 106)
+* lchown <1>:                            chown invocation.    (line 111)
+* lchown <2>:                            chgrp invocation.    (line  34)
+* lchown <3>:                            chgrp invocation.    (line  39)
+* LC_ALL:                                sort invocation.     (line  48)
 * LC_ALL <1>:                            ls invocation.       (line  17)
-* LC_ALL:                                sort invocation.     (line  49)
-* LC_COLLATE <1>:                        Relations for expr.  (line  22)
-* LC_COLLATE <2>:                        join invocation.     (line  14)
-* LC_COLLATE <3>:                        comm invocation.     (line  12)
-* LC_COLLATE <4>:                        uniq invocation.     (line  21)
-* LC_COLLATE:                            sort invocation.     (line  49)
-* LC_CTYPE <1>:                          printf invocation.   (line  70)
-* LC_CTYPE:                              sort invocation.     (line  79)
+* LC_COLLATE:                            sort invocation.     (line  48)
+* LC_COLLATE <1>:                        uniq invocation.     (line  21)
+* LC_COLLATE <2>:                        comm invocation.     (line  12)
+* LC_COLLATE <3>:                        join invocation.     (line  14)
+* LC_COLLATE <4>:                        Relations for expr.  (line  22)
+* LC_CTYPE:                              sort invocation.     (line  78)
+* LC_CTYPE <1>:                          sort invocation.     (line  86)
+* LC_CTYPE <2>:                          sort invocation.     (line  93)
+* LC_CTYPE <3>:                          sort invocation.     (line 142)
+* LC_CTYPE <4>:                          printf invocation.   (line  68)
 * LC_MESSAGES:                           pr invocation.       (line  13)
-* LC_NUMERIC <1>:                        printf invocation.   (line  57)
-* LC_NUMERIC <2>:                        sort invocation.     (line 105)
-* LC_NUMERIC <3>:                        Floating point.      (line  17)
-* LC_NUMERIC:                            Block size.          (line  58)
-* LC_TIME <1>:                           date invocation.     (line  11)
-* LC_TIME <2>:                           du invocation.       (line 198)
+* LC_NUMERIC:                            Block size.          (line  57)
+* LC_NUMERIC <1>:                        Floating point.      (line  17)
+* LC_NUMERIC <2>:                        sort invocation.     (line 104)
+* LC_NUMERIC <3>:                        sort invocation.     (line 125)
+* LC_NUMERIC <4>:                        sort invocation.     (line 159)
+* LC_NUMERIC <5>:                        printf invocation.   (line  55)
+* LC_TIME:                               pr invocation.       (line  85)
+* LC_TIME <1>:                           sort invocation.     (line 149)
+* LC_TIME <2>:                           Formatting file timestamps.
+                                                              (line  28)
 * LC_TIME <3>:                           Formatting file timestamps.
-                                                              (line  30)
-* LC_TIME <4>:                           sort invocation.     (line 152)
-* LC_TIME:                               pr invocation.       (line  86)
-* LCASE:                                 Combination.         (line  71)
-* lcase:                                 Combination.         (line  71)
-* lcase, converting to:                  dd invocation.       (line 114)
-* lchown <1>:                            chgrp invocation.    (line  30)
-* lchown:                                chown invocation.    (line 103)
-* leading directories, creating missing: install invocation.  (line  62)
+                                                              (line  73)
+* LC_TIME <4>:                           Formatting file timestamps.
+                                                              (line  97)
+* LC_TIME <5>:                           du invocation.       (line 217)
+* LC_TIME <6>:                           date invocation.     (line  11)
+* leading directories, creating missing: install invocation.  (line  67)
 * leading directory components, stripping: basename invocation.
                                                               (line   6)
-* leap seconds <1>:                      Seconds since the Epoch.
-                                                              (line  27)
-* leap seconds <2>:                      Time of day items.   (line  14)
-* leap seconds <3>:                      General date syntax. (line  71)
-* leap seconds <4>:                      Examples of date.    (line 104)
-* leap seconds <5>:                      Options for date.    (line 113)
-* leap seconds <6>:                      Time conversion specifiers.
-                                                              (line  42)
 * leap seconds:                          touch invocation.    (line 129)
-* left margin:                           pr invocation.       (line 181)
+* leap seconds <1>:                      Time conversion specifiers.
+                                                              (line  32)
+* leap seconds <2>:                      Time conversion specifiers.
+                                                              (line  36)
+* leap seconds <3>:                      Options for date.    (line 112)
+* leap seconds <4>:                      Examples of date.    (line 104)
+* leap seconds <5>:                      General date syntax. (line  65)
+* leap seconds <6>:                      Time of day items.   (line  14)
+* leap seconds <7>:                      Seconds since the Epoch.
+                                                              (line  26)
+* left margin:                           pr invocation.       (line 180)
 * length:                                String expressions.  (line  50)
-* limiting output of du:                 du invocation.       (line  75)
+* limiting output of ‘du’:               du invocation.       (line  74)
 * line:                                  Special.             (line  37)
 * line buffered:                         stdbuf invocation.   (line   6)
 * line count:                            wc invocation.       (line   6)
@@ -17578,27 +17536,27 @@ Index
 * line-by-line comparison:               comm invocation.     (line   6)
 * LINES:                                 Special.             (line  30)
 * link:                                  link invocation.     (line   6)
-* links, creating <1>:                   ln invocation.       (line   6)
 * links, creating:                       link invocation.     (line   6)
-* Linux file system types:               df invocation.       (line 209)
+* links, creating <1>:                   ln invocation.       (line   6)
+* Linux file system types:               df invocation.       (line 202)
 * literal conversion specifiers:         Literal conversion specifiers.
                                                               (line   6)
 * litout:                                Combination.         (line  59)
 * ln:                                    ln invocation.       (line   6)
-* ln format for nl:                      nl invocation.       (line  98)
-* lnext:                                 Characters.          (line  62)
-* local file system types:               df invocation.       (line 209)
+* ln format for ‘nl’:                    nl invocation.       (line  93)
+* lnext:                                 Characters.          (line  60)
+* local file system types:               df invocation.       (line 202)
 * local settings:                        Local.               (line   6)
 * logging out and continuing to run:     nohup invocation.    (line   6)
-* logical and operator <1>:              Relations for expr.  (line  17)
 * logical and operator:                  Connectives for test.
                                                               (line  12)
-* logical connectives <1>:               Relations for expr.  (line   6)
+* logical and operator <1>:              Relations for expr.  (line  17)
 * logical connectives:                   Connectives for test.
                                                               (line   6)
-* logical or operator <1>:               Relations for expr.  (line  11)
+* logical connectives <1>:               Relations for expr.  (line   6)
 * logical or operator:                   Connectives for test.
                                                               (line  15)
+* logical or operator <1>:               Relations for expr.  (line  11)
 * logical pages, numbering on:           nl invocation.       (line  12)
 * login name, printing:                  logname invocation.  (line   6)
 * login sessions, printing users with:   users invocation.    (line   6)
@@ -17606,35 +17564,36 @@ Index
 * logname:                               logname invocation.  (line   6)
 * long ls format:                        What information is listed.
                                                               (line 131)
-* lower:                                 Character sets.      (line 110)
+* lower:                                 Character sets.      (line 100)
 * lowercase, translating to output:      Output.              (line  12)
 * ls:                                    ls invocation.       (line   6)
 * LS_BLOCK_SIZE:                         Block size.          (line  12)
+* LS_COLORS:                             General output formatting.
+                                                              (line  31)
 * LS_COLORS <1>:                         dircolors invocation.
                                                               (line  23)
-* LS_COLORS:                             General output formatting.
-                                                              (line  33)
 * lutimes:                               touch invocation.    (line 100)
 * machine type:                          uname invocation.    (line  41)
-* machine-readable stty output:          stty invocation.     (line  41)
+* machine-readable ‘stty’ output:        stty invocation.     (line  41)
 * MacKenzie, D.:                         Introduction.        (line  19)
 * MacKenzie, David:                      Authors of parse_datetime.
                                                               (line   6)
-* Makefiles, installing programs in:     install invocation.  (line  30)
+* Makefiles, installing programs in:     install invocation.  (line  29)
 * manipulating files:                    Basic operations.    (line   6)
 * manipulation of file names:            File name manipulation.
                                                               (line   6)
+* mark parity:                           Control.             (line  16)
 * match:                                 String expressions.  (line  36)
 * matching patterns:                     String expressions.  (line  11)
 * MD5:                                   md5sum invocation.   (line   6)
 * md5sum:                                md5sum invocation.   (line   6)
-* mebibyte, definition of:               Block size.          (line  93)
-* mebibytes for file sizes:              du invocation.       (line 119)
-* megabyte, definition of:               Block size.          (line  89)
+* mebibyte, definition of:               Block size.          (line  89)
+* mebibytes for file sizes:              du invocation.       (line 127)
+* megabyte, definition of:               Block size.          (line  86)
 * merging files:                         paste invocation.    (line   6)
 * merging files in parallel:             pr invocation.       (line   6)
 * merging sorted files:                  sort invocation.     (line  32)
-* message status:                        who invocation.      (line  95)
+* message status:                        who invocation.      (line  94)
 * message-digest, 128-bit:               md5sum invocation.   (line   6)
 * message-digest, 160-bit:               sha1sum invocation.  (line   6)
 * message-digest, 224-bit:               sha2 utilities.      (line   6)
@@ -17644,16 +17603,16 @@ Index
 * Meyering, J.:                          Introduction.        (line  19)
 * Meyering, Jim:                         Authors of parse_datetime.
                                                               (line   6)
-* midnight in date strings:              Time of day items.   (line  22)
+* midnight in date strings:              Time of day items.   (line  21)
 * min:                                   Special.             (line   7)
 * minute in date strings:                Relative items in date strings.
                                                               (line  15)
-* minutes, time zone correction by:      Time of day items.   (line  30)
+* minutes, time zone correction by:      Time of day items.   (line  29)
 * mkdir:                                 mkdir invocation.    (line   6)
 * mkfifo:                                mkfifo invocation.   (line   6)
 * mknod:                                 mknod invocation.    (line   6)
 * mktemp:                                mktemp invocation.   (line   6)
-* modem control:                         Control.             (line  33)
+* modem control:                         Control.             (line  38)
 * modes and umask:                       Umask and Protection.
                                                               (line   6)
 * modes of created directories, setting: mkdir invocation.    (line  19)
@@ -17667,15 +17626,18 @@ Index
 * month in date strings:                 Relative items in date strings.
                                                               (line  15)
 * month names in date strings:           Calendar date items. (line  38)
-* months, sorting by:                    sort invocation.     (line 152)
-* months, written-out:                   General date syntax. (line  38)
-* MS-DOS file system:                    df invocation.       (line 217)
+* months, sorting by:                    sort invocation.     (line 149)
+* months, written-out:                   General date syntax. (line  32)
+* MS-DOS file system:                    df invocation.       (line 210)
+* MS-Windows file system:                df invocation.       (line 210)
 * mtime, changing:                       touch invocation.    (line 115)
+* multicall:                             coreutils invocation.
+                                                              (line   6)
 * multicolumn output, generating:        pr invocation.       (line   6)
 * multiple changes to permissions:       Multiple Changes.    (line   6)
 * multiplication:                        Numeric expressions. (line  16)
-* multipliers after numbers:             dd invocation.       (line 306)
-* multithreaded sort:                    sort invocation.     (line 353)
+* multipliers after numbers:             dd invocation.       (line 305)
+* multithreaded sort:                    sort invocation.     (line 351)
 * mv:                                    mv invocation.       (line   6)
 * name follow option:                    tail invocation.     (line  48)
 * name of kernel:                        uname invocation.    (line  65)
@@ -17683,75 +17645,80 @@ Index
 * named pipes, creating:                 mkfifo invocation.   (line   6)
 * network node name:                     uname invocation.    (line  46)
 * never interactive option:              rm invocation.       (line  56)
-* newer files, copying only:             cp invocation.       (line 361)
-* newer files, moving only:              mv invocation.       (line  82)
+* newer files, copying only:             cp invocation.       (line 352)
+* newer files, moving only:              mv invocation.       (line  80)
 * newer-than file check:                 File characteristic tests.
                                                               (line  15)
-* newline echoing after kill:            Local.               (line  26)
+* newline echoing after ‘kill’:          Local.               (line  26)
 * newline, echoing:                      Local.               (line  29)
 * newline, translating to crlf:          Output.              (line  19)
 * newline, translating to return:        Input.               (line  28)
-* next DAY <1>:                          Day of week items.   (line  15)
-* next DAY:                              Options for date.    (line  11)
-* next in date strings:                  General date syntax. (line  28)
-* NFS file system type:                  df invocation.       (line 204)
-* NFS mounts from BSD to HP-UX <1>:      du invocation.       (line 246)
+* next DAY:                              Day of week items.   (line  15)
+* next DAY <1>:                          Options for date.    (line  11)
+* next in date strings:                  General date syntax. (line  22)
+* NFS file system type:                  df invocation.       (line 197)
 * NFS mounts from BSD to HP-UX:          What information is listed.
-                                                              (line 252)
+                                                              (line 240)
+* NFS mounts from BSD to HP-UX <1>:      du invocation.       (line 264)
 * nice:                                  nice invocation.     (line   6)
 * niceness:                              nice invocation.     (line   6)
-* nl <1>:                                Combination.         (line  18)
 * nl:                                    nl invocation.       (line   6)
+* nl <1>:                                Combination.         (line  18)
 * nlN:                                   Output.              (line  39)
 * no dereference:                        chcon invocation.    (line  26)
 * no-op:                                 true invocation.     (line   6)
-* noatime:                               dd invocation.       (line 245)
-* nocache:                               dd invocation.       (line 223)
-* nocreat:                               dd invocation.       (line 153)
-* noctty:                                dd invocation.       (line 250)
+* noatime:                               dd invocation.       (line 246)
+* nocache:                               dd invocation.       (line 224)
+* nocreat:                               dd invocation.       (line 154)
+* noctty:                                dd invocation.       (line 251)
 * node name:                             uname invocation.    (line  46)
-* noerror:                               dd invocation.       (line 162)
+* noerror:                               dd invocation.       (line 163)
 * noflsh:                                Local.               (line  32)
-* nofollow:                              dd invocation.       (line 256)
+* nofollow:                              dd invocation.       (line 257)
 * nohup:                                 nohup invocation.    (line   6)
 * nohup.out:                             nohup invocation.    (line   6)
-* nolinks:                               dd invocation.       (line 259)
-* non-directories, copying as special files: cp invocation.   (line  98)
+* nohup.out <1>:                         nohup invocation.    (line  18)
+* nolinks:                               dd invocation.       (line 260)
+* non-directories, copying as special files: cp invocation.   (line  96)
+* non-directories, copying as special files <1>: cp invocation.
+                                                              (line 249)
 * non-directory suffix, stripping:       dirname invocation.  (line   6)
-* nonblock:                              dd invocation.       (line 242)
-* nonblocking I/O:                       dd invocation.       (line 242)
+* nonblock:                              dd invocation.       (line 243)
+* nonblocking I/O:                       dd invocation.       (line 243)
 * none backup method:                    Backup options.      (line  31)
 * none color option:                     General output formatting.
                                                               (line  23)
 * none dd status=:                       dd invocation.       (line  75)
-* none, sorting option for ls:           Sorting the output.  (line  49)
+* none, sorting option for ‘ls’:         Sorting the output.  (line  49)
 * nonempty file check:                   File characteristic tests.
                                                               (line  12)
-* nonprinting characters, ignoring:      sort invocation.     (line 145)
+* nonprinting characters, ignoring:      sort invocation.     (line 142)
 * nonzero-length string check:           String tests.        (line  19)
-* noon in date strings:                  Time of day items.   (line  22)
+* noon in date strings:                  Time of day items.   (line  21)
 * not-equal string check:                String tests.        (line  28)
-* notrunc:                               dd invocation.       (line 159)
+* notrunc:                               dd invocation.       (line 160)
 * now in date strings:                   Relative items in date strings.
                                                               (line  33)
 * noxfer dd status=:                     dd invocation.       (line  71)
 * nproc:                                 nproc invocation.    (line   6)
-* number of inputs to merge, nmerge:     sort invocation.     (line 259)
+* NTFS file system:                      df invocation.       (line 210)
+* ntfs file system file:                 df invocation.       (line 210)
+* number of inputs to merge, nmerge:     sort invocation.     (line 255)
 * numbered backup method:                Backup options.      (line  35)
 * numbering lines:                       nl invocation.       (line   6)
-* numbers, written-out:                  General date syntax. (line  28)
+* numbers, written-out:                  General date syntax. (line  22)
 * numeric expressions:                   Numeric expressions. (line   6)
 * numeric field padding:                 Padding and other flags.
                                                               (line   6)
 * numeric modes:                         Numeric Modes.       (line   6)
 * numeric operations:                    Numeric operations.  (line   6)
 * numeric sequences:                     seq invocation.      (line   6)
-* numeric sort:                          sort invocation.     (line 162)
+* numeric sort:                          sort invocation.     (line 159)
 * numeric tests:                         Numeric tests.       (line   6)
 * numeric uid and gid:                   What information is listed.
-                                                              (line 234)
+                                                              (line 222)
 * numeric user and group IDs:            What information is listed.
-                                                              (line 234)
+                                                              (line 222)
 * numfmt:                                numfmt invocation.   (line   6)
 * obs:                                   dd invocation.       (line  30)
 * ocrnl:                                 Output.              (line  16)
@@ -17767,10 +17734,10 @@ Index
 * olcuc:                                 Output.              (line  12)
 * older-than file check:                 File characteristic tests.
                                                               (line  19)
-* once interactive option:               rm invocation.       (line  58)
-* one file system, restricting du to:    du invocation.       (line 242)
-* one file system, restricting rm to:    rm invocation.       (line  67)
-* one-line output format:                df invocation.       (line 158)
+* once interactive option:               rm invocation.       (line  57)
+* one file system, restricting ‘du’ to:  du invocation.       (line 261)
+* one file system, restricting ‘rm’ to:  rm invocation.       (line  65)
+* one-line output format:                df invocation.       (line 152)
 * onlcr:                                 Output.              (line  19)
 * onlret:                                Output.              (line  27)
 * onocr:                                 Output.              (line  23)
@@ -17780,38 +17747,43 @@ Index
                                                               (line   6)
 * operating system name:                 uname invocation.    (line  57)
 * opost:                                 Output.              (line   9)
-* option delimiter:                      Common options.      (line  44)
-* options for date:                      Options for date.    (line   6)
-* or operator <1>:                       Relations for expr.  (line  11)
+* option delimiter:                      Common options.      (line  43)
+* options for ‘date’:                    Options for date.    (line   6)
 * or operator:                           Connectives for test.
                                                               (line  15)
-* ordinal numbers:                       General date syntax. (line  28)
+* or operator <1>:                       Relations for expr.  (line  11)
+* ordinal numbers:                       General date syntax. (line  22)
 * ospeed:                                Special.             (line  19)
-* other permissions:                     Setting Permissions. (line  29)
+* other permissions:                     Setting Permissions. (line  27)
 * output block size:                     dd invocation.       (line  30)
-* output file name prefix <1>:           csplit invocation.   (line  62)
 * output file name prefix:               split invocation.    (line  15)
-* output file name suffix:               csplit invocation.   (line  66)
+* output file name prefix <1>:           csplit invocation.   (line  61)
+* output file name suffix:               csplit invocation.   (line  65)
 * output format:                         stat invocation.     (line  34)
-* output format, portable:               df invocation.       (line 158)
-* output NUL-byte-terminated lines <1>:  env invocation.      (line  83)
-* output NUL-byte-terminated lines <2>:  printenv invocation. (line  19)
-* output NUL-byte-terminated lines:      du invocation.       (line  26)
+* output format <1>:                     stat invocation.     (line  43)
+* output format, portable:               df invocation.       (line 152)
+* output NUL-byte-terminated lines:      readlink invocation. (line  64)
+* output NUL-byte-terminated lines <1>:  du invocation.       (line  26)
+* output NUL-byte-terminated lines <2>:  basename invocation. (line  42)
+* output NUL-byte-terminated lines <3>:  dirname invocation.  (line  31)
+* output NUL-byte-terminated lines <4>:  realpath invocation. (line  76)
+* output NUL-byte-terminated lines <5>:  printenv invocation. (line  19)
+* output NUL-byte-terminated lines <6>:  env invocation.      (line  82)
 * output of entire files:                Output of entire files.
                                                               (line   6)
 * output of parts of files:              Output of parts of files.
                                                               (line   6)
 * output settings:                       Output.              (line   6)
-* output tabs:                           pr invocation.       (line 118)
-* overwriting of input, allowed <1>:     shuf invocation.     (line  37)
-* overwriting of input, allowed:         sort invocation.     (line 285)
+* output tabs:                           pr invocation.       (line 117)
+* overwriting of input, allowed:         sort invocation.     (line 281)
+* overwriting of input, allowed <1>:     shuf invocation.     (line  36)
 * owned by effective group ID check:     Access permission tests.
                                                               (line  31)
 * owned by effective user ID check:      Access permission tests.
                                                               (line  28)
 * owner of file, permissions for:        Setting Permissions. (line  23)
-* owner, default:                        Mode Structure.      (line  31)
-* ownership of installed files, setting: install invocation.  (line  86)
+* owner, default:                        Mode Structure.      (line  27)
+* ownership of installed files, setting: install invocation.  (line  91)
 * p for FIFO file:                       mknod invocation.    (line  28)
 * pad character:                         Output.              (line  34)
 * pad instead of timing for delaying:    Output.              (line  30)
@@ -17819,9 +17791,9 @@ Index
                                                               (line   6)
 * paragraphs, reformatting:              fmt invocation.      (line   6)
 * parenb:                                Control.             (line   9)
-* parent directories and cp:             cp invocation.       (line 244)
+* parent directories and ‘cp’:           cp invocation.       (line 236)
 * parent directories, creating:          mkdir invocation.    (line  34)
-* parent directories, creating missing:  install invocation.  (line  62)
+* parent directories, creating missing:  install invocation.  (line  67)
 * parent directories, removing:          rmdir invocation.    (line  22)
 * parentheses for grouping:              expr invocation.     (line  31)
 * parity:                                Combination.         (line  10)
@@ -17839,46 +17811,45 @@ Index
 * PATH:                                  env invocation.      (line  23)
 * pathchk:                               pathchk invocation.  (line   6)
 * pattern matching:                      String expressions.  (line  11)
-* PC file system:                        df invocation.       (line 217)
-* pcfs:                                  df invocation.       (line 217)
-* pebibyte, definition of:               Block size.          (line 114)
+* pebibyte, definition of:               Block size.          (line 104)
 * permission tests:                      Access permission tests.
                                                               (line   6)
 * permissions of installed files, setting: install invocation.
-                                                              (line  74)
+                                                              (line  79)
 * permissions, changing access:          chmod invocation.    (line   6)
 * permissions, copying existing:         Copying Permissions. (line   6)
 * permissions, for changing file timestamps: touch invocation.
                                                               (line  40)
-* permissions, output by ls:             What information is listed.
-                                                              (line 191)
-* petabyte, definition of:               Block size.          (line 110)
-* phone directory order:                 sort invocation.     (line  87)
+* permissions, output by ‘ls’:           What information is listed.
+                                                              (line 179)
+* petabyte, definition of:               Block size.          (line 101)
+* phone directory order:                 sort invocation.     (line  86)
 * pieces, splitting a file into:         split invocation.    (line   6)
+* Pinard, F.:                            Introduction.        (line  19)
 * Pinard, F. <1>:                        Authors of parse_datetime.
                                                               (line  19)
-* Pinard, F.:                            Introduction.        (line  19)
 * pipe fitting:                          tee invocation.      (line   6)
 * Plass, Michael F.:                     fmt invocation.      (line  19)
 * platform, hardware:                    uname invocation.    (line  35)
-* pm in date strings:                    Time of day items.   (line  22)
+* pm in date strings:                    Time of day items.   (line  21)
 * portable file names, checking for:     pathchk invocation.  (line   6)
-* portable output format:                df invocation.       (line 158)
+* portable output format:                df invocation.       (line 152)
 * POSIX:                                 Introduction.        (line  11)
-* POSIX output format:                   df invocation.       (line 158)
-* POSIXLY_CORRECT <1>:                   id invocation.       (line  11)
-* POSIXLY_CORRECT <2>:                   printf invocation.   (line  48)
-* POSIXLY_CORRECT <3>:                   echo invocation.     (line  78)
-* POSIXLY_CORRECT <4>:                   dd invocation.       (line 347)
-* POSIXLY_CORRECT <5>:                   sort invocation.     (line 293)
-* POSIXLY_CORRECT <6>:                   pr invocation.       (line  86)
-* POSIXLY_CORRECT <7>:                   Standards conformance.
-                                                              (line   6)
+* POSIX output format:                   df invocation.       (line 152)
 * POSIXLY_CORRECT:                       Common options.      (line  11)
+* POSIXLY_CORRECT <1>:                   Standards conformance.
+                                                              (line   6)
+* POSIXLY_CORRECT <2>:                   pr invocation.       (line  85)
+* POSIXLY_CORRECT <3>:                   sort invocation.     (line 289)
+* POSIXLY_CORRECT <4>:                   sort invocation.     (line 406)
+* POSIXLY_CORRECT <5>:                   dd invocation.       (line 360)
+* POSIXLY_CORRECT <6>:                   echo invocation.     (line  65)
+* POSIXLY_CORRECT <7>:                   printf invocation.   (line  47)
+* POSIXLY_CORRECT <8>:                   id invocation.       (line  15)
 * POSIXLY_CORRECT, and block size:       Block size.          (line  12)
 * pr:                                    pr invocation.       (line   6)
 * prime factors:                         factor invocation.   (line   6)
-* print:                                 Character sets.      (line 113)
+* print:                                 Character sets.      (line 102)
 * print machine hardware name:           arch invocation.     (line   6)
 * print name of current directory:       pwd invocation.      (line   6)
 * print system information:              uname invocation.    (line   6)
@@ -17902,52 +17873,57 @@ Index
 * printing the host identifier:          hostid invocation.   (line   6)
 * printing the hostname:                 hostname invocation. (line   6)
 * printing the system uptime and load:   uptime invocation.   (line   6)
-* printing user's login name:            logname invocation.  (line   6)
+* printing user’s login name:            logname invocation.  (line   6)
 * printing, preparing files for:         pr invocation.       (line   6)
-* process zero-terminated items <1>:     uniq invocation.     (line 112)
-* process zero-terminated items <2>:     shuf invocation.     (line  48)
-* process zero-terminated items:         sort invocation.     (line 375)
+* process zero-terminated items:         sort invocation.     (line 374)
+* process zero-terminated items <1>:     shuf invocation.     (line  55)
+* process zero-terminated items <2>:     uniq invocation.     (line 141)
+* process zero-terminated items <3>:     join invocation.     (line 155)
 * processes, commands for controlling:   Process control.     (line   6)
-* prompting, and ln:                     ln invocation.       (line 100)
-* prompting, and mv:                     mv invocation.       (line  38)
-* prompting, and rm:                     rm invocation.       (line  11)
-* prompts, forcing:                      mv invocation.       (line  69)
-* prompts, omitting:                     mv invocation.       (line  63)
+* prompting, and ‘ln’:                   ln invocation.       (line  96)
+* prompting, and ‘mv’:                   mv invocation.       (line  37)
+* prompting, and ‘rm’:                   rm invocation.       (line  11)
+* prompts, forcing:                      mv invocation.       (line  67)
+* prompts, omitting:                     mv invocation.       (line  61)
+* prompts, omitting <1>:                 mv invocation.       (line  74)
 * prterase:                              Local.               (line  46)
 * ptx:                                   ptx invocation.      (line   6)
-* punct:                                 Character sets.      (line 116)
+* punct:                                 Character sets.      (line 104)
 * pure numbers in date strings:          Pure numbers in date strings.
                                                               (line   6)
 * pwd:                                   pwd invocation.      (line   6)
-* quit:                                  Characters.          (line  23)
+* quit:                                  Characters.          (line  21)
 * quoting style:                         Formatting the file names.
                                                               (line  34)
 * radix for file offsets:                od invocation.       (line  36)
-* random sort:                           sort invocation.     (line 191)
+* random sort:                           sort invocation.     (line 188)
 * random source for shredding:           shred invocation.    (line 112)
-* random source for shuffling:           shuf invocation.     (line  43)
-* random source for sorting:             sort invocation.     (line 298)
+* random source for shuffling:           shuf invocation.     (line  42)
+* random source for sorting:             sort invocation.     (line 294)
 * random sources:                        Random sources.      (line   6)
-* ranges:                                Character sets.      (line  51)
+* ranges:                                Character sets.      (line  44)
 * raw:                                   Combination.         (line  43)
-* read errors, ignoring:                 dd invocation.       (line 162)
+* read errors, ignoring:                 dd invocation.       (line 163)
 * read from stdin and write to stdout and files: tee invocation.
                                                               (line   6)
 * read permission:                       Mode Structure.      (line  12)
-* read permission, symbolic:             Setting Permissions. (line  57)
-* read system call, and holes:           cp invocation.       (line 300)
+* read permission, symbolic:             Setting Permissions. (line  52)
+* read system call, and holes:           cp invocation.       (line 292)
 * readable file check:                   Access permission tests.
                                                               (line  15)
 * readlink:                              readlink invocation. (line   6)
 * real user and group IDs, printing:     id invocation.       (line   6)
-* realpath <1>:                          realpath invocation. (line   6)
 * realpath:                              readlink invocation. (line   6)
+* realpath <1>:                          realpath invocation. (line   6)
+* realpath <2>:                          realpath invocation. (line   6)
+* realpath <3>:                          realpath invocation. (line   6)
 * recursive directory listing:           Which files are listed.
-                                                              (line  91)
+                                                              (line  90)
 * recursively changing access permissions: chmod invocation.  (line  69)
-* recursively changing file ownership:   chown invocation.    (line 140)
-* recursively changing group ownership:  chgrp invocation.    (line  66)
-* recursively copying directories:       cp invocation.       (line  98)
+* recursively changing file ownership:   chown invocation.    (line 143)
+* recursively changing group ownership:  chgrp invocation.    (line  70)
+* recursively copying directories:       cp invocation.       (line  96)
+* recursively copying directories <1>:   cp invocation.       (line 249)
 * redirection:                           Redirection.         (line   6)
 * reference file:                        chcon invocation.    (line  30)
 * reformatting paragraph text:           fmt invocation.      (line   6)
@@ -17957,7 +17933,7 @@ Index
 * relative items in date strings:        Relative items in date strings.
                                                               (line   6)
 * release of kernel:                     uname invocation.    (line  61)
-* relpath:                               realpath invocation. (line  56)
+* relpath:                               realpath invocation. (line  44)
 * remainder:                             Numeric expressions. (line  16)
 * remote hostname:                       who invocation.      (line  11)
 * removing empty directories:            rmdir invocation.    (line   6)
@@ -17965,41 +17941,42 @@ Index
 * removing files or directories:         rm invocation.       (line   6)
 * removing files or directories (via the unlink syscall): unlink invocation.
                                                               (line   6)
-* removing permissions:                  Setting Permissions. (line  42)
-* repeated characters:                   Character sets.      (line  72)
+* removing permissions:                  Setting Permissions. (line  38)
+* repeat output values:                  shuf invocation.     (line  47)
+* repeated characters:                   Character sets.      (line  66)
 * repeated lines, outputting:            uniq invocation.     (line  63)
 * repeated output of a string:           yes invocation.      (line   6)
-* restricted deletion flag:              Mode Structure.      (line  56)
+* restricted deletion flag:              Mode Structure.      (line  49)
 * return, ignoring:                      Input.               (line  31)
-* return, translating to newline <1>:    Output.              (line  16)
 * return, translating to newline:        Input.               (line  34)
+* return, translating to newline <1>:    Output.              (line  16)
+* reverse sorting:                       sort invocation.     (line 182)
 * reverse sorting <1>:                   Sorting the output.  (line  27)
-* reverse sorting:                       sort invocation.     (line 185)
 * reversing files:                       tac invocation.      (line   6)
 * rm:                                    rm invocation.       (line   6)
 * rmdir:                                 rmdir invocation.    (line   6)
-* rn format for nl:                      nl invocation.       (line 101)
-* root as default owner:                 install invocation.  (line  86)
-* root directory, allow recursive destruction: rm invocation. (line  88)
-* root directory, allow recursive modification <1>: chmod invocation.
-                                                              (line  54)
-* root directory, allow recursive modification <2>: chgrp invocation.
-                                                              (line  48)
+* rn format for ‘nl’:                    nl invocation.       (line  95)
+* root as default owner:                 install invocation.  (line  91)
+* root directory, allow recursive destruction: rm invocation. (line  86)
 * root directory, allow recursive modification: chown invocation.
-                                                              (line 121)
+                                                              (line 124)
+* root directory, allow recursive modification <1>: chgrp invocation.
+                                                              (line  52)
+* root directory, allow recursive modification <2>: chmod invocation.
+                                                              (line  54)
 * root directory, disallow recursive destruction: rm invocation.
-                                                              (line  83)
-* root directory, disallow recursive modification <1>: chmod invocation.
-                                                              (line  49)
-* root directory, disallow recursive modification <2>: chgrp invocation.
-                                                              (line  43)
+                                                              (line  81)
 * root directory, disallow recursive modification: chown invocation.
-                                                              (line 116)
+                                                              (line 119)
+* root directory, disallow recursive modification <1>: chgrp invocation.
+                                                              (line  47)
+* root directory, disallow recursive modification <2>: chmod invocation.
+                                                              (line  49)
 * root directory, running a program in a specified: chroot invocation.
                                                               (line   6)
 * rows:                                  Special.             (line  22)
-* rprnt:                                 Characters.          (line  56)
-* RTS/CTS flow control:                  Control.             (line  36)
+* rprnt:                                 Characters.          (line  54)
+* RTS/CTS flow control:                  Control.             (line  41)
 * run commands with bounded time:        timeout invocation.  (line   6)
 * run with security context:             runcon invocation.   (line   6)
 * runcon:                                runcon invocation.   (line   6)
@@ -18007,7 +17984,7 @@ Index
                                                               (line   6)
 * running a program in a specified root directory: chroot invocation.
                                                               (line   6)
-* rz format for nl:                      nl invocation.       (line 104)
+* rz format for ‘nl’:                    nl invocation.       (line  97)
 * Salz, Rich:                            Authors of parse_datetime.
                                                               (line   6)
 * same file check:                       File characteristic tests.
@@ -18016,46 +17993,56 @@ Index
 * scheduling, affecting:                 nice invocation.     (line   6)
 * screen columns:                        fold invocation.     (line  14)
 * seconds since the epoch:               Time conversion specifiers.
-                                                              (line  42)
-* section delimiters of pages:           nl invocation.       (line  68)
-* security context <1>:                  id invocation.       (line  48)
-* security context <2>:                  mknod invocation.    (line  54)
-* security context <3>:                  mkfifo invocation.   (line  28)
-* security context <4>:                  mkdir invocation.    (line  56)
-* security context <5>:                  install invocation.  (line  91)
+                                                              (line  32)
+* section delimiters of pages:           nl invocation.       (line  63)
 * security context:                      What information is listed.
-                                                              (line 268)
+                                                              (line 255)
+* security context <1>:                  cp invocation.       (line 376)
+* security context <2>:                  install invocation.  (line  96)
+* security context <3>:                  install invocation.  (line 138)
+* security context <4>:                  mv invocation.       (line 112)
+* security context <5>:                  mkdir invocation.    (line  56)
+* security context <6>:                  mkfifo invocation.   (line  28)
+* security context <7>:                  mknod invocation.    (line  53)
+* security context <8>:                  id invocation.       (line  51)
 * seek:                                  dd invocation.       (line  51)
-* seek_bytes:                            dd invocation.       (line 292)
-* self-backups:                          cp invocation.       (line  53)
-* SELinux <1>:                           id invocation.       (line  48)
-* SELinux <2>:                           mknod invocation.    (line  54)
-* SELinux <3>:                           mkfifo invocation.   (line  28)
-* SELinux <4>:                           mkdir invocation.    (line  56)
-* SELinux <5>:                           install invocation.  (line  91)
+* seek_bytes:                            dd invocation.       (line 293)
+* self-backups:                          cp invocation.       (line  51)
 * SELinux:                               What information is listed.
-                                                              (line 268)
+                                                              (line 255)
+* SELinux <1>:                           install invocation.  (line  96)
+* SELinux <2>:                           id invocation.       (line  51)
 * SELinux context:                       SELinux context.     (line   6)
 * SELinux, context:                      SELinux context.     (line   6)
+* SELinux, restoring security context:   mv invocation.       (line 112)
+* SELinux, setting/restoring security context: cp invocation. (line 376)
+* SELinux, setting/restoring security context <1>: install invocation.
+                                                              (line 138)
+* SELinux, setting/restoring security context <2>: mkdir invocation.
+                                                              (line  56)
+* SELinux, setting/restoring security context <3>: mkfifo invocation.
+                                                              (line  28)
+* SELinux, setting/restoring security context <4>: mknod invocation.
+                                                              (line  53)
 * send a signal to processes:            kill invocation.     (line   6)
 * sentences and line-breaking:           fmt invocation.      (line  19)
-* separator for numbers in seq:          seq invocation.      (line  42)
+* separator for numbers in ‘seq’:        seq invocation.      (line  42)
 * seq:                                   seq invocation.      (line   6)
 * sequence of numbers:                   seq invocation.      (line   6)
-* set-group-ID:                          Mode Structure.      (line  49)
+* set-group-ID:                          Mode Structure.      (line  43)
 * set-group-ID check:                    Access permission tests.
                                                               (line   9)
-* set-user-ID:                           Mode Structure.      (line  42)
+* set-user-ID:                           Mode Structure.      (line  38)
 * set-user-ID check:                     Access permission tests.
                                                               (line  18)
-* setgid:                                Mode Structure.      (line  49)
-* setting permissions:                   Setting Permissions. (line  46)
+* setgid:                                Mode Structure.      (line  43)
+* setting permissions:                   Setting Permissions. (line  41)
 * setting the hostname:                  hostname invocation. (line   6)
 * setting the time:                      Setting the time.    (line   6)
-* setuid:                                Mode Structure.      (line  42)
+* setuid:                                Mode Structure.      (line  38)
 * setup for color:                       dircolors invocation.
                                                               (line   6)
-* sh syntax for color setup:             dircolors invocation.
+* ‘sh’ syntax for color setup:           dircolors invocation.
                                                               (line  34)
 * SHA-1:                                 sha1sum invocation.  (line   6)
 * SHA-2:                                 sha2 utilities.      (line   6)
@@ -18064,50 +18051,54 @@ Index
 * sha256sum:                             sha2 utilities.      (line   6)
 * sha384sum:                             sha2 utilities.      (line   6)
 * sha512sum:                             sha2 utilities.      (line   6)
+* SHELL environment variable, and color: General output formatting.
+                                                              (line  31)
 * SHELL environment variable, and color <1>: dircolors invocation.
                                                               (line  23)
-* SHELL environment variable, and color: General output formatting.
-                                                              (line  33)
 * shell utilities:                       Top.                 (line  18)
 * shred:                                 shred invocation.    (line   6)
 * shuf:                                  shuf invocation.     (line   6)
 * shuffling files:                       shuf invocation.     (line   6)
-* SI output <1>:                         du invocation.       (line 138)
-* SI output <2>:                         df invocation.       (line 177)
-* SI output <3>:                         What information is listed.
-                                                              (line 260)
-* SI output:                             Block size.          (line  43)
+* SI output:                             Block size.          (line  42)
+* SI output <1>:                         What information is listed.
+                                                              (line 247)
+* SI output <2>:                         df invocation.       (line 171)
+* SI output <3>:                         du invocation.       (line 145)
 * signals, specifying:                   Signal specifications.
                                                               (line   6)
 * simple backup method:                  Backup options.      (line  44)
-* SIMPLE_BACKUP_SUFFIX:                  Backup options.      (line  50)
+* SIMPLE_BACKUP_SUFFIX:                  Backup options.      (line  49)
 * single-column output of files:         General output formatting.
                                                               (line  10)
 * size:                                  Special.             (line  30)
-* size for main memory sorting:          sort invocation.     (line 309)
+* size for main memory sorting:          sort invocation.     (line 306)
 * size of file to shred:                 shred invocation.    (line 117)
 * size of files, reporting:              What information is listed.
-                                                              (line 244)
+                                                              (line 232)
 * size of files, sorting files by:       Sorting the output.  (line  32)
 * skip:                                  dd invocation.       (line  46)
-* skip_bytes:                            dd invocation.       (line 286)
+* skip_bytes:                            dd invocation.       (line 287)
 * sleep:                                 sleep invocation.    (line   6)
 * socket check:                          File type tests.     (line  31)
 * software flow control:                 Input.               (line  45)
 * sort:                                  sort invocation.     (line   6)
-* sort field:                            sort invocation.     (line 234)
-* sort stability:                        sort invocation.     (line  38)
-* sort's last-resort comparison:         sort invocation.     (line  38)
+* sort field:                            sort invocation.     (line 230)
+* sort stability:                        sort invocation.     (line  37)
+* sort stability <1>:                    sort invocation.     (line 299)
+* sort’s last-resort comparison:         sort invocation.     (line  37)
+* sort’s last-resort comparison <1>:     sort invocation.     (line 299)
 * sorted files, operations on:           Operating on sorted files.
                                                               (line   6)
 * sorting files:                         sort invocation.     (line   6)
-* sorting ls output:                     Sorting the output.  (line   6)
-* space:                                 Character sets.      (line 119)
-* sparse:                                dd invocation.       (line 122)
-* sparse files, copying:                 cp invocation.       (line 300)
+* sorting ‘ls’ output:                   Sorting the output.  (line   6)
+* space:                                 Character sets.      (line 106)
+* space parity:                          Control.             (line  16)
+* sparse:                                dd invocation.       (line 125)
+* sparse files, copying:                 cp invocation.       (line 292)
 * sparse files, creating:                truncate invocation. (line  13)
 * special characters:                    Characters.          (line   6)
 * special file types:                    Special file types.  (line   6)
+* special file types <1>:                Special file types.  (line   9)
 * special files:                         mknod invocation.    (line  11)
 * special settings:                      Special.             (line   6)
 * specifying sets of characters:         Character sets.      (line   6)
@@ -18118,33 +18109,34 @@ Index
 * squeezing empty lines:                 cat invocation.      (line  36)
 * squeezing repeat characters:           Squeezing.           (line   6)
 * Stallman, R.:                          Introduction.        (line  19)
-* standard input:                        Common options.      (line  49)
-* standard output:                       Common options.      (line  49)
+* standard input:                        Common options.      (line  47)
+* standard output:                       Common options.      (line  47)
 * standard streams, buffering:           stdbuf invocation.   (line   6)
-* start:                                 Characters.          (line  44)
+* start:                                 Characters.          (line  42)
 * stat:                                  stat invocation.     (line   6)
 * status:                                dd invocation.       (line  66)
 * status time, printing or sorting by:   Sorting the output.  (line  13)
-* status time, show the most recent:     du invocation.       (line 184)
+* status time, show the most recent:     du invocation.       (line 203)
 * stdbuf:                                stdbuf invocation.   (line   6)
-* sticky:                                Mode Structure.      (line  56)
+* stick parity:                          Control.             (line  16)
+* sticky:                                Mode Structure.      (line  49)
 * sticky bit check:                      Access permission tests.
                                                               (line  12)
-* stop:                                  Characters.          (line  47)
-* stop bits:                             Control.             (line  27)
-* strftime and date:                     date invocation.     (line  20)
-* string constants, outputting:          od invocation.       (line  76)
+* stop:                                  Characters.          (line  45)
+* stop bits:                             Control.             (line  32)
+* strftime and ‘date’:                   date invocation.     (line  20)
+* string constants, outputting:          od invocation.       (line  80)
 * string expressions:                    String expressions.  (line   6)
 * string tests:                          String tests.        (line   6)
 * strip directory and suffix from file names: basename invocation.
                                                               (line   6)
 * stripping non-directory suffix:        dirname invocation.  (line   6)
-* stripping symbol table information:    install invocation.  (line 108)
-* stripping trailing slashes <1>:        mv invocation.       (line  95)
-* stripping trailing slashes:            cp invocation.       (line 334)
+* stripping symbol table information:    install invocation.  (line 113)
+* stripping trailing slashes:            cp invocation.       (line 325)
+* stripping trailing slashes <1>:        mv invocation.       (line  93)
 * stty:                                  stty invocation.     (line   6)
 * substr:                                String expressions.  (line  40)
-* subtracting permissions:               Setting Permissions. (line  42)
+* subtracting permissions:               Setting Permissions. (line  38)
 * subtraction:                           Numeric expressions. (line  12)
 * successful exit:                       true invocation.     (line   6)
 * suffix, stripping from file names:     basename invocation. (line   6)
@@ -18152,73 +18144,81 @@ Index
 * summarizing files:                     Summarizing files.   (line   6)
 * superblock, writing:                   sync invocation.     (line   6)
 * supplementary groups, printing:        groups invocation.   (line   6)
-* susp:                                  Characters.          (line  50)
-* swab (byte-swapping):                  dd invocation.       (line 135)
-* swap space, saving text image in:      Mode Structure.      (line  56)
-* swtch:                                 Characters.          (line  41)
-* symbol table information, stripping:   install invocation.  (line 108)
+* susp:                                  Characters.          (line  48)
+* swab (byte-swapping):                  dd invocation.       (line 137)
+* swap space, saving text image in:      Mode Structure.      (line  49)
+* swtch:                                 Characters.          (line  39)
+* symbol table information, stripping:   install invocation.  (line 113)
 * symbol table information, stripping, program: install invocation.
-                                                              (line 111)
+                                                              (line 116)
 * symbolic (soft) links, creating:       ln invocation.       (line   6)
 * symbolic link check:                   File type tests.     (line  23)
 * symbolic link to directory, controlling traversal of: Traversing symlinks.
                                                               (line   6)
-* symbolic link to directory, never traverse <1>: chcon invocation.
-                                                              (line  56)
-* symbolic link to directory, never traverse <2>: chgrp invocation.
-                                                              (line  79)
-* symbolic link to directory, never traverse <3>: chown invocation.
-                                                              (line 152)
 * symbolic link to directory, never traverse: Traversing symlinks.
                                                               (line  26)
-* symbolic link to directory, traverse each that is encountered <1>: chcon invocation.
-                                                              (line  52)
-* symbolic link to directory, traverse each that is encountered <2>: chgrp invocation.
-                                                              (line  75)
-* symbolic link to directory, traverse each that is encountered <3>: chown invocation.
-                                                              (line 148)
+* symbolic link to directory, never traverse <1>: chown invocation.
+                                                              (line 155)
+* symbolic link to directory, never traverse <2>: chgrp invocation.
+                                                              (line  83)
+* symbolic link to directory, never traverse <3>: chcon invocation.
+                                                              (line  56)
 * symbolic link to directory, traverse each that is encountered: Traversing symlinks.
                                                               (line  22)
-* symbolic link to directory, traverse if on the command line <1>: chcon invocation.
-                                                              (line  47)
-* symbolic link to directory, traverse if on the command line <2>: chgrp invocation.
-                                                              (line  70)
-* symbolic link to directory, traverse if on the command line <3>: chown invocation.
-                                                              (line 143)
+* symbolic link to directory, traverse each that is encountered <1>: chown invocation.
+                                                              (line 151)
+* symbolic link to directory, traverse each that is encountered <2>: chgrp invocation.
+                                                              (line  79)
+* symbolic link to directory, traverse each that is encountered <3>: chcon invocation.
+                                                              (line  52)
 * symbolic link to directory, traverse if on the command line: Traversing symlinks.
                                                               (line  18)
-* symbolic link, defined:                ln invocation.       (line  42)
-* symbolic links and ln:                 ln invocation.       (line 173)
-* symbolic links and pwd:                pwd invocation.      (line  26)
-* symbolic links, changing group:        chgrp invocation.    (line  35)
-* symbolic links, changing owner <1>:    chgrp invocation.    (line  30)
-* symbolic links, changing owner:        chown invocation.    (line  80)
+* symbolic link to directory, traverse if on the command line <1>: chown invocation.
+                                                              (line 146)
+* symbolic link to directory, traverse if on the command line <2>: chgrp invocation.
+                                                              (line  74)
+* symbolic link to directory, traverse if on the command line <3>: chcon invocation.
+                                                              (line  47)
+* symbolic link, defined:                ln invocation.       (line  40)
+* symbolic links and ‘ln’:               ln invocation.       (line 180)
+* symbolic links and ‘pwd’:              pwd invocation.      (line  26)
+* symbolic links, changing group:        chgrp invocation.    (line  39)
+* symbolic links, changing owner:        chown invocation.    (line  83)
+* symbolic links, changing owner <1>:    chown invocation.    (line 106)
+* symbolic links, changing owner <2>:    chown invocation.    (line 111)
+* symbolic links, changing owner <3>:    chgrp invocation.    (line  34)
 * symbolic links, changing time:         touch invocation.    (line 100)
-* symbolic links, copying:               cp invocation.       (line 111)
-* symbolic links, copying with:          cp invocation.       (line 339)
+* symbolic links, copying:               cp invocation.       (line 109)
+* symbolic links, copying <1>:           cp invocation.       (line 161)
+* symbolic links, copying with:          cp invocation.       (line 330)
 * symbolic links, dereferencing:         Which files are listed.
                                                               (line  36)
-* symbolic links, dereferencing in du:   du invocation.       (line 109)
-* symbolic links, dereferencing in stat: stat invocation.     (line  22)
-* symbolic links, following:             dd invocation.       (line 256)
+* symbolic links, dereferencing <1>:     Which files are listed.
+                                                              (line  41)
+* symbolic links, dereferencing <2>:     Which files are listed.
+                                                              (line  83)
+* symbolic links, dereferencing in ‘du’: du invocation.       (line 117)
+* symbolic links, dereferencing in ‘du’ <1>: du invocation.   (line 133)
+* symbolic links, dereferencing in ‘stat’: stat invocation.   (line  22)
+* symbolic links, following:             dd invocation.       (line 257)
 * symbolic links, permissions of:        chmod invocation.    (line  10)
 * symbolic modes:                        Symbolic Modes.      (line   6)
 * symlinks, resolution:                  realpath invocation. (line   6)
-* sync <1>:                              sync invocation.     (line   6)
-* sync:                                  dd invocation.       (line 220)
-* sync (padding with ASCII NULs):        dd invocation.       (line 140)
+* sync:                                  sync invocation.     (line   6)
+* sync <1>:                              dd invocation.       (line 221)
+* sync (padding with ASCII NULs):        dd invocation.       (line 142)
 * synchronize disk and memory:           sync invocation.     (line   6)
-* synchronized data and metadata I/O:    dd invocation.       (line 220)
+* synchronized data and metadata I/O:    dd invocation.       (line 221)
 * synchronized data and metadata writes, before finishing: dd invocation.
-                                                              (line 169)
-* synchronized data reads:               dd invocation.       (line 212)
-* synchronized data writes, before finishing: dd invocation.  (line 165)
+                                                              (line 170)
+* synchronized data reads:               dd invocation.       (line 213)
+* synchronized data writes, before finishing: dd invocation.  (line 166)
 * system context:                        System context.      (line   6)
-* system information, printing <1>:      uname invocation.    (line   6)
-* system information, printing <2>:      nproc invocation.    (line   6)
 * system information, printing:          arch invocation.     (line   6)
+* system information, printing <1>:      nproc invocation.    (line   6)
+* system information, printing <2>:      uname invocation.    (line   6)
 * system name, printing:                 hostname invocation. (line   6)
-* System V sum:                          sum invocation.      (line  31)
+* System V ‘sum’:                        sum invocation.      (line  31)
 * tab stops, setting:                    expand invocation.   (line  22)
 * tabN:                                  Output.              (line  51)
 * tabs:                                  Combination.         (line  66)
@@ -18227,60 +18227,67 @@ Index
 * tagged paragraphs:                     fmt invocation.      (line  40)
 * tail:                                  tail invocation.     (line   6)
 * tandem:                                Input.               (line  45)
-* target directory <1>:                  ln invocation.       (line 161)
-* target directory <2>:                  mv invocation.       (line 105)
-* target directory <3>:                  install invocation.  (line 120)
-* target directory <4>:                  cp invocation.       (line 352)
 * target directory:                      Target directory.    (line   6)
-* tebibyte, definition of:               Block size.          (line 107)
+* target directory <1>:                  Target directory.    (line  15)
+* target directory <2>:                  Target directory.    (line  31)
+* target directory <3>:                  cp invocation.       (line 343)
+* target directory <4>:                  cp invocation.       (line 347)
+* target directory <5>:                  install invocation.  (line 125)
+* target directory <6>:                  install invocation.  (line 129)
+* target directory <7>:                  mv invocation.       (line 103)
+* target directory <8>:                  mv invocation.       (line 107)
+* target directory <9>:                  ln invocation.       (line 169)
+* target directory <10>:                 ln invocation.       (line 173)
+* tebibyte, definition of:               Block size.          (line  99)
 * tee:                                   tee invocation.      (line   6)
-* telephone directory order:             sort invocation.     (line  87)
-* temporary directory:                   sort invocation.     (line 345)
+* telephone directory order:             sort invocation.     (line  86)
+* temporary directory:                   sort invocation.     (line 343)
 * temporary files and directories:       mktemp invocation.   (line   6)
-* terabyte, definition of:               Block size.          (line 103)
+* terabyte, definition of:               Block size.          (line  96)
 * terminal check:                        File type tests.     (line  34)
 * terminal file name, printing:          tty invocation.      (line   6)
 * terminal lines, currently used:        who invocation.      (line  11)
 * terminal settings:                     stty invocation.     (line   6)
 * terminal, using color iff:             General output formatting.
-                                                              (line  25)
+                                                              (line  24)
 * terse output:                          stat invocation.     (line  54)
 * test:                                  test invocation.     (line   6)
-* text:                                  dd invocation.       (line 266)
-* text I/O:                              dd invocation.       (line 266)
-* text image, saving in swap space:      Mode Structure.      (line  56)
+* text:                                  dd invocation.       (line 267)
+* text I/O:                              dd invocation.       (line 267)
+* text image, saving in swap space:      Mode Structure.      (line  49)
 * text input files:                      md5sum invocation.   (line  95)
 * text utilities:                        Top.                 (line  18)
 * text, displaying:                      echo invocation.     (line   6)
 * text, reformatting:                    fmt invocation.      (line   6)
 * this in date strings:                  Relative items in date strings.
                                                               (line  33)
-* time <1>:                              Special.             (line  11)
 * time:                                  touch invocation.    (line  86)
+* time <1>:                              Special.             (line  11)
 * time conversion specifiers:            Time conversion specifiers.
                                                               (line   6)
+* time formats:                          pr invocation.       (line  78)
 * time formats <1>:                      date invocation.     (line  20)
-* time formats:                          pr invocation.       (line  79)
 * time limit:                            timeout invocation.  (line   6)
 * time of day item:                      Time of day items.   (line   6)
 * time setting:                          Setting the time.    (line   6)
-* time style <1>:                        du invocation.       (line 193)
 * time style:                            Formatting file timestamps.
-                                                              (line  26)
+                                                              (line  24)
+* time style <1>:                        du invocation.       (line 212)
+* time units:                            timeout invocation.  (line  49)
 * time units <1>:                        sleep invocation.    (line  11)
-* time units:                            timeout invocation.  (line  50)
-* time zone correction:                  Time of day items.   (line  30)
+* time zone correction:                  Time of day items.   (line  29)
+* time zone item:                        General date syntax. (line  40)
 * time zone item <1>:                    Time zone items.     (line   6)
-* time zone item:                        General date syntax. (line  46)
 * time, printing or setting:             date invocation.     (line   6)
-* TIME_STYLE <1>:                        du invocation.       (line 221)
-* TIME_STYLE:                            Formatting file timestamps.
-                                                              (line 106)
 * timeout:                               timeout invocation.  (line   6)
 * timestamps of installed files, preserving: install invocation.
-                                                              (line  98)
+                                                              (line 103)
 * timestamps, changing file:             touch invocation.    (line   6)
-* TMPDIR:                                sort invocation.     (line  64)
+* TIME_STYLE:                            Formatting file timestamps.
+                                                              (line 103)
+* TIME_STYLE <1>:                        du invocation.       (line 240)
+* TMPDIR:                                sort invocation.     (line  63)
+* TMPDIR <1>:                            sort invocation.     (line 343)
 * today in date strings:                 Relative items in date strings.
                                                               (line  33)
 * tomorrow:                              Options for date.    (line  11)
@@ -18295,44 +18302,45 @@ Index
 * translating characters:                Translating.         (line   6)
 * true:                                  true invocation.     (line   6)
 * truncate:                              truncate invocation. (line   6)
-* truncating output file, avoiding:      dd invocation.       (line 159)
+* truncating output file, avoiding:      dd invocation.       (line 160)
 * truncating, file sizes:                truncate invocation. (line   6)
 * tsort:                                 tsort invocation.    (line   6)
 * tty:                                   tty invocation.      (line   6)
 * two-way parity:                        Control.             (line   9)
-* type size:                             od invocation.       (line 122)
-* TZ <1>:                                Specifying time zone rules.
-                                                              (line   6)
-* TZ <2>:                                Options for date.    (line 113)
-* TZ <3>:                                date invocation.     (line  16)
+* type size:                             od invocation.       (line 121)
+* TZ:                                    pr invocation.       (line  91)
+* TZ <1>:                                Formatting file timestamps.
+                                                              (line  17)
+* TZ <2>:                                touch invocation.    (line  65)
+* TZ <3>:                                stat invocation.     (line 144)
 * TZ <4>:                                who invocation.      (line  26)
-* TZ <5>:                                stat invocation.     (line 182)
-* TZ <6>:                                touch invocation.    (line  65)
-* TZ <7>:                                Formatting file timestamps.
-                                                              (line  18)
-* TZ:                                    pr invocation.       (line  92)
-* u, and disabling special characters:   Characters.          (line  13)
-* ucase, converting to:                  dd invocation.       (line 117)
-* ufs file system type:                  df invocation.       (line 209)
+* TZ <5>:                                date invocation.     (line  16)
+* TZ <6>:                                Options for date.    (line 112)
+* TZ <7>:                                Specifying time zone rules.
+                                                              (line   6)
+* u, and disabling special characters:   Characters.          (line  12)
+* ucase, converting to:                  dd invocation.       (line 120)
 * umask and modes:                       Umask and Protection.
                                                               (line   6)
 * uname:                                 uname invocation.    (line   6)
-* unblock:                               dd invocation.       (line 108)
+* unblock:                               dd invocation.       (line 111)
 * unexpand:                              unexpand invocation. (line   6)
-* Unicode:                               printf invocation.   (line  70)
+* Unicode:                               printf invocation.   (line  68)
 * uniq:                                  uniq invocation.     (line   6)
-* unique lines, outputting:              uniq invocation.     (line 101)
+* unique lines, outputting:              uniq invocation.     (line 129)
 * uniquify files:                        uniq invocation.     (line   6)
-* uniquifying output:                    sort invocation.     (line 361)
+* uniquifying output:                    sort invocation.     (line 359)
 * unlink:                                unlink invocation.   (line   6)
-* unprintable characters, ignoring:      sort invocation.     (line 145)
+* unprintable characters, ignoring:      sort invocation.     (line 142)
 * unsorted directory listing:            Sorting the output.  (line  20)
-* upper:                                 Character sets.      (line 122)
+* upper:                                 Character sets.      (line 108)
 * uppercase, translating to lowercase:   Input.               (line  50)
 * uptime:                                uptime invocation.   (line   6)
 * use time, changing:                    touch invocation.    (line  78)
 * use time, printing or sorting files by: Sorting the output. (line  13)
-* use time, show the most recent:        du invocation.       (line 184)
+* use time, printing or sorting files by <1>: Sorting the output.
+                                                              (line  42)
+* use time, show the most recent:        du invocation.       (line 203)
 * user IDs, disambiguating:              Disambiguating names and IDs.
                                                               (line   6)
 * user information, commands for:        User information.    (line   6)
@@ -18341,10 +18349,10 @@ Index
                                                               (line   6)
 * usernames, printing current:           users invocation.    (line   6)
 * users:                                 users invocation.    (line   6)
-* UTC:                                   Options for date.    (line 113)
-* utmp <1>:                              who invocation.      (line  15)
-* utmp <2>:                              users invocation.    (line  14)
+* UTC:                                   Options for date.    (line 112)
 * utmp:                                  logname invocation.  (line   6)
+* utmp <1>:                              users invocation.    (line  14)
+* utmp <2>:                              who invocation.      (line  15)
 * valid file names, checking for:        pathchk invocation.  (line   6)
 * variable-length records, converting to fixed-length: dd invocation.
                                                               (line  41)
@@ -18352,23 +18360,26 @@ Index
 * verbose ls format:                     What information is listed.
                                                               (line 131)
 * verifying MD5 checksums:               md5sum invocation.   (line  68)
-* version number sort:                   sort invocation.     (line 179)
-* version number, finding:               Common options.      (line  41)
+* verifying MD5 checksums <1>:           md5sum invocation.   (line  76)
+* verifying MD5 checksums <2>:           md5sum invocation.   (line 104)
+* verifying MD5 checksums <3>:           md5sum invocation.   (line 109)
+* version number sort:                   sort invocation.     (line 176)
+* version number, finding:               Common options.      (line  40)
 * version of kernel:                     uname invocation.    (line  76)
-* version, sorting option for ls:        Sorting the output.  (line  56)
+* version, sorting option for ‘ls’:      Sorting the output.  (line  56)
 * version-control Emacs variable:        Backup options.      (line  24)
-* VERSION_CONTROL <1>:                   ln invocation.       (line  84)
-* VERSION_CONTROL <2>:                   mv invocation.       (line  58)
-* VERSION_CONTROL <3>:                   install invocation.  (line  42)
-* VERSION_CONTROL <4>:                   cp invocation.       (line  81)
 * VERSION_CONTROL:                       Backup options.      (line  13)
+* VERSION_CONTROL <1>:                   cp invocation.       (line  79)
+* VERSION_CONTROL <2>:                   install invocation.  (line  41)
+* VERSION_CONTROL <3>:                   mv invocation.       (line  56)
+* VERSION_CONTROL <4>:                   ln invocation.       (line  80)
 * vertical sorted files in columns:      General output formatting.
                                                               (line  15)
 * vtN:                                   Output.              (line  59)
 * wc:                                    wc invocation.       (line   6)
 * week in date strings:                  Relative items in date strings.
                                                               (line  15)
-* werase:                                Characters.          (line  59)
+* werase:                                Characters.          (line  57)
 * who:                                   who invocation.      (line   6)
 * who am i:                              who invocation.      (line  21)
 * whoami:                                whoami invocation.   (line   6)
@@ -18379,13 +18390,14 @@ Index
 * wrapping long input lines:             fold invocation.     (line   6)
 * writable file check:                   Access permission tests.
                                                               (line  21)
-* write permission:                      Mode Structure.      (line  15)
-* write permission, symbolic:            Setting Permissions. (line  60)
-* write, allowed:                        who invocation.      (line  95)
-* wtmp <1>:                              who invocation.      (line  15)
+* write permission:                      Mode Structure.      (line  14)
+* write permission, symbolic:            Setting Permissions. (line  54)
+* write, allowed:                        who invocation.      (line  94)
 * wtmp:                                  users invocation.    (line  14)
+* wtmp <1>:                              who invocation.      (line  15)
 * xcase:                                 Local.               (line  36)
-* xdigit:                                Character sets.      (line 125)
+* xdigit:                                Character sets.      (line 110)
+* xfs file system type:                  df invocation.       (line 202)
 * XON/XOFF flow control:                 Input.               (line  40)
 * year in date strings:                  Relative items in date strings.
                                                               (line  15)
@@ -18393,235 +18405,240 @@ Index
 * yesterday:                             Options for date.    (line  11)
 * yesterday in date strings:             Relative items in date strings.
                                                               (line  29)
-* yottabyte, definition of:              Block size.          (line 131)
+* yottabyte, definition of:              Block size.          (line 116)
 * Youmans, B.:                           Introduction.        (line  19)
 * zero-length string check:              String tests.        (line  15)
-* zettabyte, definition of:              Block size.          (line 124)
-* |:                                     Relations for expr.  (line  11)
+* zettabyte, definition of:              Block size.          (line 111)
 
 
 
 Tag Table:
-Node: Top8400
-Node: Introduction22373
-Node: Common options23932
-Node: Exit status27208
-Node: Backup options27963
-Node: Block size29887
-Node: Floating point34741
-Node: Signal specifications36151
-Node: Disambiguating names and IDs38206
-Ref: Disambiguating names and IDs-Footnote-139775
-Node: Random sources39845
-Node: Target directory41462
-Node: Trailing slashes44947
-Node: Traversing symlinks45968
-Node: Treating / specially47041
-Node: Special built-in utilities48593
-Node: Standards conformance49728
-Node: Output of entire files51284
-Node: cat invocation51885
-Node: tac invocation53692
-Node: nl invocation54960
-Node: od invocation58839
-Node: base64 invocation65714
-Node: Formatting file contents67093
-Node: fmt invocation67594
-Node: numfmt invocation70474
-Node: pr invocation80479
-Node: fold invocation91978
-Node: Output of parts of files93438
-Node: head invocation93935
-Node: tail invocation96120
-Node: split invocation105420
-Node: csplit invocation112341
-Node: Summarizing files117146
-Node: wc invocation117794
-Node: sum invocation120868
-Node: cksum invocation122273
-Node: md5sum invocation123413
-Node: sha1sum invocation129032
-Node: sha2 utilities129812
-Node: Operating on sorted files130436
-Node: sort invocation131023
-Ref: sort invocation-Footnote-1154952
-Node: shuf invocation155504
-Node: uniq invocation158084
-Node: comm invocation162777
-Node: ptx invocation165198
-Node: General options in ptx167998
-Node: Charset selection in ptx168579
-Node: Input processing in ptx169481
-Node: Output formatting in ptx174897
-Node: Compatibility in ptx181463
-Node: tsort invocation184697
-Node: tsort background187856
-Node: Operating on fields189504
-Node: cut invocation189866
-Node: paste invocation193823
-Node: join invocation195137
-Node: Operating on characters201490
-Node: tr invocation201912
-Node: Character sets203630
-Node: Translating208148
-Node: Squeezing210239
-Node: expand invocation213306
-Node: unexpand invocation214788
-Node: Directory listing216606
-Node: ls invocation217092
-Ref: ls invocation-Footnote-1219188
-Node: Which files are listed219410
-Node: What information is listed223150
-Node: Sorting the output232397
-Node: Details about version sort234707
-Node: General output formatting236475
-Node: Formatting file timestamps241465
-Node: Formatting the file names246791
-Node: dir invocation249707
-Node: vdir invocation250118
-Node: dircolors invocation250496
-Node: Basic operations252195
-Node: cp invocation252815
-Node: dd invocation269136
-Node: install invocation282850
-Node: mv invocation288125
-Node: rm invocation292687
-Node: shred invocation297081
-Node: Special file types305117
-Node: link invocation306623
-Node: ln invocation307842
-Node: mkdir invocation315897
-Node: mkfifo invocation318268
-Node: mknod invocation319388
-Node: readlink invocation321520
-Node: rmdir invocation323642
-Node: unlink invocation324916
-Node: Changing file attributes325875
-Node: chown invocation326689
-Node: chgrp invocation332850
-Node: chmod invocation335925
-Node: touch invocation338680
-Node: Disk usage346084
-Node: df invocation346745
-Node: du invocation355402
-Node: stat invocation364948
-Node: sync invocation370461
-Node: truncate invocation371416
-Node: Printing text373187
-Node: echo invocation373561
-Node: printf invocation376147
-Node: yes invocation381618
-Node: Conditions382230
-Node: false invocation382821
-Node: true invocation383856
-Node: test invocation385135
-Node: File type tests387180
-Node: Access permission tests388062
-Node: File characteristic tests388947
-Node: String tests389712
-Node: Numeric tests390451
-Node: Connectives for test391257
-Node: expr invocation391610
-Node: String expressions394051
-Node: Numeric expressions396635
-Node: Relations for expr397332
-Node: Examples of expr398526
-Node: Redirection399251
-Node: tee invocation399709
-Node: File name manipulation404496
-Node: basename invocation405071
-Node: dirname invocation407049
-Node: pathchk invocation408644
-Node: mktemp invocation410408
-Node: realpath invocation416056
-Node: Working context418861
-Node: pwd invocation419505
-Node: stty invocation420851
-Node: Control423611
-Node: Input424444
-Node: Output426118
-Node: Local427439
-Node: Combination429021
-Node: Characters431242
-Node: Special432796
-Node: printenv invocation434453
-Node: tty invocation435464
-Node: User information436170
-Node: id invocation436805
-Node: logname invocation438728
-Node: whoami invocation439355
-Node: groups invocation439842
-Node: users invocation441047
-Node: who invocation441994
-Node: System context444930
-Node: date invocation445595
-Node: Time conversion specifiers447312
-Node: Date conversion specifiers449735
-Node: Literal conversion specifiers452771
-Node: Padding and other flags453129
-Node: Setting the time455320
-Node: Options for date456441
-Node: Examples of date460740
-Ref: %s-examples462158
-Node: arch invocation465322
-Node: nproc invocation465771
-Node: uname invocation466881
-Node: hostname invocation469458
-Node: hostid invocation470071
-Node: uptime invocation470782
-Node: SELinux context471905
-Node: chcon invocation472280
-Node: runcon invocation474556
-Node: Modified command invocation476022
-Node: chroot invocation476714
-Ref: chroot invocation-Footnote-1479282
-Node: env invocation479584
-Node: nice invocation483829
-Node: nohup invocation487682
-Node: stdbuf invocation489965
-Node: timeout invocation492492
-Node: Process control494989
-Node: kill invocation495212
-Node: Delaying498282
-Node: sleep invocation498479
-Node: Numeric operations499580
-Node: factor invocation499912
-Node: seq invocation501670
-Node: File permissions505450
-Node: Mode Structure506142
-Node: Symbolic Modes509837
-Node: Setting Permissions510935
-Node: Copying Permissions513548
-Node: Changing Special Mode Bits514367
-Node: Conditional Executability516189
-Node: Multiple Changes516733
-Node: Umask and Protection518400
-Node: Numeric Modes519505
-Node: Operator Numeric Modes521631
-Node: Directory Setuid and Setgid522647
-Node: Date input formats525474
-Node: General date syntax527909
-Node: Calendar date items530900
-Node: Time of day items532905
-Node: Time zone items535109
-Node: Combined date and time of day items536369
-Node: Day of week items537229
-Node: Relative items in date strings538246
-Node: Pure numbers in date strings541056
-Node: Seconds since the Epoch542045
-Node: Specifying time zone rules543674
-Node: Authors of parse_datetime546054
-Ref: Authors of get_date546241
-Node: Opening the software toolbox547204
-Node: Toolbox introduction547971
-Node: I/O redirection550694
-Node: The who command553528
-Node: The cut command554425
-Node: The sort command555488
-Node: The uniq command556192
-Node: Putting the tools together556882
-Ref: Putting the tools together-Footnote-1568834
-Node: GNU Free Documentation License568908
-Node: Concept index594101
+Node: Top8459
+Node: Introduction22529
+Node: Common options24088
+Node: Exit status27550
+Node: Backup options28366
+Node: Block size30412
+Node: Floating point35747
+Node: Signal specifications37170
+Node: Disambiguating names and IDs39340
+Ref: Disambiguating names and IDs-Footnote-140957
+Node: Random sources41027
+Node: Target directory42681
+Node: Trailing slashes46331
+Node: Traversing symlinks47370
+Node: Treating / specially48502
+Node: Special built-in utilities50136
+Node: Standards conformance51331
+Node: coreutils invocation52971
+Node: Output of entire files53404
+Node: cat invocation54005
+Node: tac invocation55947
+Node: nl invocation57254
+Node: od invocation61316
+Node: base64 invocation69045
+Node: Formatting file contents70455
+Node: fmt invocation70956
+Node: numfmt invocation73942
+Node: pr invocation84605
+Node: fold invocation96885
+Node: Output of parts of files98400
+Node: head invocation98897
+Node: tail invocation101245
+Node: split invocation111356
+Node: csplit invocation118533
+Node: Summarizing files123763
+Node: wc invocation124411
+Node: sum invocation127596
+Node: cksum invocation129062
+Node: md5sum invocation130242
+Node: sha1sum invocation136010
+Node: sha2 utilities136802
+Node: Operating on sorted files137447
+Node: sort invocation138034
+Ref: sort invocation-Footnote-1163176
+Node: shuf invocation163786
+Node: uniq invocation166987
+Node: comm invocation173050
+Node: ptx invocation175553
+Node: General options in ptx178387
+Node: Charset selection in ptx178987
+Node: Input processing in ptx179900
+Node: Output formatting in ptx185433
+Node: Compatibility in ptx192269
+Node: tsort invocation195652
+Node: tsort background198856
+Node: Operating on fields200564
+Node: cut invocation200926
+Node: paste invocation205025
+Node: join invocation206738
+Node: Operating on characters213794
+Node: tr invocation214217
+Node: Character sets215984
+Node: Translating220732
+Node: Squeezing222890
+Node: expand invocation226096
+Node: unexpand invocation227620
+Node: Directory listing229493
+Node: ls invocation229991
+Ref: ls invocation-Footnote-1232126
+Node: Which files are listed232370
+Node: What information is listed236380
+Node: Sorting the output246006
+Node: Details about version sort248473
+Node: General output formatting250282
+Node: Formatting file timestamps255551
+Node: Formatting the file names261090
+Node: dir invocation264150
+Node: vdir invocation264577
+Node: dircolors invocation264967
+Node: Basic operations266773
+Node: cp invocation267393
+Node: dd invocation285251
+Node: install invocation300707
+Node: mv invocation306965
+Node: rm invocation311947
+Node: shred invocation316615
+Node: Special file types325658
+Node: link invocation327175
+Node: ln invocation328432
+Node: mkdir invocation337293
+Node: mkfifo invocation340067
+Node: mknod invocation341533
+Node: readlink invocation344062
+Node: rmdir invocation346483
+Node: unlink invocation347800
+Node: Changing file attributes348794
+Node: chown invocation349610
+Node: chgrp invocation356188
+Node: chmod invocation359614
+Node: touch invocation362494
+Node: Disk usage370171
+Node: df invocation370832
+Node: du invocation379946
+Node: stat invocation391031
+Node: sync invocation397070
+Node: truncate invocation398054
+Node: Printing text399994
+Node: echo invocation400368
+Node: printf invocation403092
+Node: yes invocation408828
+Node: Conditions409480
+Node: false invocation410075
+Node: true invocation411160
+Node: test invocation412489
+Node: File type tests414626
+Node: Access permission tests415545
+Node: File characteristic tests416461
+Node: String tests417245
+Node: Numeric tests418015
+Node: Connectives for test418850
+Node: expr invocation419218
+Node: String expressions421730
+Node: Numeric expressions424435
+Node: Relations for expr425143
+Node: Examples of expr426372
+Node: Redirection427121
+Node: tee invocation427582
+Node: File name manipulation432496
+Node: basename invocation433071
+Node: dirname invocation435290
+Node: pathchk invocation437107
+Node: mktemp invocation438918
+Node: realpath invocation444736
+Node: Working context447864
+Node: pwd invocation448508
+Node: stty invocation449927
+Node: Control452754
+Node: Input453830
+Node: Output455584
+Node: Local457002
+Node: Combination458731
+Node: Characters461127
+Node: Special462783
+Node: printenv invocation464530
+Node: tty invocation465541
+Node: User information466270
+Node: id invocation466905
+Node: logname invocation469408
+Node: whoami invocation470065
+Node: groups invocation470572
+Node: users invocation471807
+Node: who invocation472792
+Node: System context475935
+Node: date invocation476600
+Node: Time conversion specifiers478374
+Node: Date conversion specifiers481028
+Node: Literal conversion specifiers484332
+Node: Padding and other flags484704
+Node: Setting the time486972
+Node: Options for date488135
+Node: Examples of date492678
+Ref: %s-examples494169
+Node: arch invocation497390
+Node: nproc invocation497851
+Node: uname invocation498980
+Node: hostname invocation501676
+Node: hostid invocation502305
+Node: uptime invocation503038
+Node: SELinux context504184
+Node: chcon invocation504559
+Node: runcon invocation506964
+Node: Modified command invocation508501
+Node: chroot invocation509193
+Ref: chroot invocation-Footnote-1512506
+Node: env invocation512816
+Node: nice invocation517238
+Node: nohup invocation521185
+Node: stdbuf invocation523564
+Node: timeout invocation526212
+Node: Process control528779
+Node: kill invocation529002
+Node: Delaying532196
+Node: sleep invocation532393
+Node: Numeric operations533548
+Node: factor invocation533880
+Node: seq invocation535674
+Node: File permissions539760
+Node: Mode Structure540452
+Node: Symbolic Modes544176
+Node: Setting Permissions545290
+Node: Copying Permissions547956
+Node: Changing Special Mode Bits548826
+Node: Conditional Executability550708
+Node: Multiple Changes551260
+Node: Umask and Protection552933
+Node: Numeric Modes554078
+Node: Operator Numeric Modes556247
+Node: Directory Setuid and Setgid557307
+Node: Date input formats560162
+Node: General date syntax562604
+Node: Calendar date items565731
+Node: Time of day items567804
+Node: Time zone items570104
+Node: Combined date and time of day items571405
+Node: Day of week items572274
+Node: Relative items in date strings573358
+Node: Pure numbers in date strings576264
+Node: Seconds since the Epoch577253
+Node: Specifying time zone rules578918
+Node: Authors of parse_datetime581386
+Ref: Authors of get_date581577
+Node: Opening the software toolbox582576
+Node: Toolbox introduction583370
+Node: I/O redirection586114
+Node: The who command588995
+Node: The cut command589920
+Node: The sort command591022
+Node: The uniq command591740
+Node: Putting the tools together592455
+Ref: Putting the tools together-Footnote-1604673
+Node: GNU Free Documentation License604747
+Node: Concept index630119
 
 End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index 2c16dc48..19a523d8 100644
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -2,6 +2,8 @@
 @c %**start of header
 @setfilename coreutils.info
 @settitle GNU Coreutils
+@documentencoding UTF-8
+@allowcodebreaks false
 
 @c %**end of header
 
@@ -45,6 +47,7 @@
 * chroot: (coreutils)chroot invocation.         Specify the root directory.
 * cksum: (coreutils)cksum invocation.           Print POSIX CRC checksum.
 * comm: (coreutils)comm invocation.             Compare sorted files by line.
+* coreutils: (coreutils)coreutils invocation.   Multi-call program.
 * cp: (coreutils)cp invocation.                 Copy files.
 * csplit: (coreutils)csplit invocation.         Split by context.
 * cut: (coreutils)cut invocation.               Print selected parts of lines.
@@ -68,7 +71,7 @@
 * hostid: (coreutils)hostid invocation.         Print numeric host identifier.
 * hostname: (coreutils)hostname invocation.     Print or set system name.
 * id: (coreutils)id invocation.                 Print user identity.
-* install: (coreutils)install invocation.       Copy and change attributes.
+* install: (coreutils)install invocation.       Copy files and set attributes.
 * join: (coreutils)join invocation.             Join lines on a common field.
 * kill: (coreutils)kill invocation.             Send a signal to processes.
 * link: (coreutils)link invocation.             Make hard links between files.
@@ -95,7 +98,7 @@
 * ptx: (coreutils)ptx invocation.               Produce permuted indexes.
 * pwd: (coreutils)pwd invocation.               Print working directory.
 * readlink: (coreutils)readlink invocation.     Print referent of a symlink.
-* realpath: (coreutils)readpath invocation.     Print resolved file names.
+* realpath: (coreutils)realpath invocation.     Print resolved file names.
 * rm: (coreutils)rm invocation.                 Remove files.
 * rmdir: (coreutils)rmdir invocation.           Remove empty directories.
 * runcon: (coreutils)runcon invocation.         Run in specified SELinux CTX.
@@ -140,7 +143,7 @@
 This manual documents version @value{VERSION} of the GNU core
 utilities, including the standard programs for text and file manipulation.
 
-Copyright @copyright{} 1994-2013 Free Software Foundation, Inc.
+Copyright @copyright{} 1994-2014 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -220,13 +223,14 @@ Common Options
 * Block size::                   Block size
 * Floating point::               Floating point number representation
 * Signal specifications::        Specifying signals
-* Disambiguating names and IDs:: chgrp and chown owner and group syntax
+* Disambiguating names and IDs:: chgrp, chown, chroot, id: user and group syntax
 * Random sources::               Sources of random data
 * Target directory::             Target directory
 * Trailing slashes::             Trailing slashes
 * Traversing symlinks::          Traversing symlinks to directories
 * Treating / specially::         Treating / specially
 * Standards conformance::        Standards conformance
+* coreutils invocation::         Multi-call binary invocation
 
 Output of entire files
 
@@ -243,8 +247,6 @@ Formatting file contents
 * pr invocation::                Paginate or columnate files for printing
 * fold invocation::              Wrap input lines to fit in specified width
 
-@command{numfmt}: General Options, Units
-
 Output of parts of files
 
 * head invocation::              Output the first part of files
@@ -543,7 +545,7 @@ insights to the overall process.
 
 @macro optBackup
 @item -b
-@itemx @w{@kbd{--backup}[=@var{method}]}
+@itemx --backup[=@var{method}]
 @opindex -b
 @opindex --backup
 @vindex VERSION_CONTROL
@@ -563,7 +565,7 @@ Append @var{suffix} to each backup file made with @option{-b}.
 
 @macro optTargetDirectory
 @item -t @var{directory}
-@itemx @w{@kbd{--target-directory}=@var{directory}}
+@itemx --target-directory=@var{directory}
 @opindex -t
 @opindex --target-directory
 @cindex target directory
@@ -583,16 +585,42 @@ Do not treat the last operand specially when it is a directory or a
 symbolic link to a directory.  @xref{Target directory}.
 @end macro
 
-@macro optNull{cmd}
-@item -0
-@opindex -0
-@itemx --null
-@opindex --null
+@macro outputNUL
 @cindex output NUL-byte-terminated lines
 Output a zero byte (ASCII NUL) at the end of each line,
 rather than a newline.  This option enables other programs to parse the
-output of @command{\cmd\} even when that output would contain data
-with embedded newlines.
+output even when that output would contain data with embedded newlines.
+@end macro
+
+@macro optNull
+@item -0
+@itemx --null
+@opindex -0
+@opindex --null
+@outputNUL
+@end macro
+
+@macro optZero
+@item -z
+@itemx --zero
+@opindex -z
+@opindex --zero
+@outputNUL
+@end macro
+
+@macro optZeroTerminated
+@item -z
+@itemx --zero-terminated
+@opindex -z
+@opindex --zero-terminated
+@cindex process zero-terminated items
+Delimit items with a zero byte rather than a newline (ASCII LF).
+I.e., treat input as items separated by ASCII NUL
+and terminate output items with ASCII NUL.
+This option can be useful in conjunction with @samp{perl -0} or
+@samp{find -print0} and @samp{xargs -0} which do the same in order to
+reliably handle arbitrary file names (even those containing blanks
+or other special characters).
 @end macro
 
 @macro optSi
@@ -620,7 +648,7 @@ Use the @option{--si} option if you prefer powers of 1000.
 @end macro
 
 @macro optStripTrailingSlashes
-@item @w{@kbd{--strip-trailing-slashes}}
+@item --strip-trailing-slashes
 @opindex --strip-trailing-slashes
 @cindex stripping trailing slashes
 Remove any trailing slashes from each @var{source} argument.
@@ -737,7 +765,7 @@ name.
 * Block size::                  BLOCK_SIZE and --block-size, in some programs.
 * Floating point::              Floating point number representation.
 * Signal specifications::       Specifying signals using the --signal option.
-* Disambiguating names and IDs:: chgrp and chown owner and group syntax
+* Disambiguating names and IDs:: chgrp, chown, chroot, id: user and group syntax
 * Random sources::              --random-source, in some programs.
 * Target directory::            Specifying a target directory, in some programs.
 * Trailing slashes::            --strip-trailing-slashes, in some programs.
@@ -745,6 +773,7 @@ name.
 * Treating / specially::        --preserve-root and --no-preserve-root.
 * Special built-in utilities::  @command{break}, @command{:}, @dots{}
 * Standards conformance::       Conformance to the POSIX standard.
+* coreutils invocation::        Multi-call binary invocation.
 @end menu
 
 
@@ -786,7 +815,7 @@ briefly mentioned in the descriptions of the particular programs.
 @table @samp
 
 @item -b
-@itemx @w{@kbd{--backup}[=@var{method}]}
+@itemx --backup[=@var{method}]
 @opindex -b
 @opindex --backup
 @vindex VERSION_CONTROL
@@ -1014,7 +1043,9 @@ option is equivalent to @option{--block-size=1K}, which
 is the default unless the @env{POSIXLY_CORRECT} environment variable is
 set.  The @option{-h} or @option{--human-readable} option is equivalent to
 @option{--block-size=human-readable}.  The @option{--si} option is
-equivalent to @option{--block-size=si}.
+equivalent to @option{--block-size=si}.  Note for @command{ls}
+the @option{-k} option does not control the display of the
+apparent file sizes, whereas the @option{--block-size} option does.
 
 @node Floating point
 @section Floating point numbers
@@ -1134,20 +1165,20 @@ also support at least eight real-time signals called @samp{RTMIN},
 @samp{RTMIN+1}, @dots{}, @samp{RTMAX-1}, @samp{RTMAX}.
 
 @node Disambiguating names and IDs
-@section chown and chgrp: Disambiguating user names and IDs
+@section chown, chgrp, chroot, id: Disambiguating user names and IDs
 @cindex user names, disambiguating
 @cindex user IDs, disambiguating
 @cindex group names, disambiguating
 @cindex group IDs, disambiguating
 @cindex disambiguating group names and IDs
 
-Since the @var{owner} and @var{group} arguments to @command{chown} and
-@command{chgrp} may be specified as names or numeric IDs, there is an
+Since the @var{user} and @var{group} arguments to these commands
+may be specified as names or numeric IDs, there is an
 apparent ambiguity.
 What if a user or group @emph{name} is a string of digits?
 @footnote{Using a number as a user name is common in some environments.}
 Should the command interpret it as a user name or as an ID@?
-POSIX requires that @command{chown} and @command{chgrp}
+POSIX requires that these commands
 first attempt to resolve the specified string as a name, and
 only once that fails, then try to interpret it as an ID@.
 This is troublesome when you want to specify a numeric ID, say 42,
@@ -1156,9 +1187,9 @@ and it must work even in a pathological situation where
 Simply invoking @code{chown 42 F}, will set @file{F}s owner ID to
 1000---not what you intended.
 
-GNU @command{chown} and @command{chgrp} provide a way to work around this,
-that at the same time may result in a significant performance improvement
-by eliminating a database look-up.
+GNU @command{chown}, @command{chgrp}, @command{chroot}, and @command{id}
+provide a way to work around this, that at the same time may result in a
+significant performance improvement by eliminating a database look-up.
 Simply precede each numeric user ID and/or group ID with a @samp{+},
 in order to force its interpretation as an integer:
 
@@ -1168,8 +1199,7 @@ chgrp +$numeric_group_id another-file
 chown +0:+0 /
 @end example
 
-GNU @command{chown} and @command{chgrp}
-skip the name look-up process for each @samp{+}-prefixed string,
+The name look-up process is skipped for each @samp{+}-prefixed string,
 because a string containing @samp{+} is never a valid user or group name.
 This syntax is accepted on most common Unix systems, but not on Solaris 10.
 
@@ -1242,7 +1272,7 @@ treated as a directory and want a diagnostic otherwise, you can use
 the @option{--target-directory} (@option{-t}) option.
 
 @item -t @var{directory}
-@itemx @w{@kbd{--target-directory}=@var{directory}}
+@itemx --target-directory=@var{directory}
 @opindex --target-directory
 @cindex target directory
 @cindex destination directory
@@ -1265,7 +1295,7 @@ invocation of the subject command.  (It can be done by going through a
 shell command, but that requires more human labor and brain power than
 it should.)
 
-The @w{@kbd{--target-directory}} (@option{-t}) option allows the @command{cp},
+The @option{--target-directory} (@option{-t}) option allows the @command{cp},
 @command{install}, @command{ln}, and @command{mv} programs to be used
 conveniently with @command{xargs}.  For example, you can move the files
 from the current directory to a sibling directory, @code{d} like this:
@@ -1309,7 +1339,7 @@ options cannot be combined.
 
 Some GNU programs (at least @command{cp} and @command{mv}) allow you to
 remove any trailing slashes from each @var{source} argument before
-operating on it.  The @w{@kbd{--strip-trailing-slashes}} option enables
+operating on it.  The @option{--strip-trailing-slashes} option enables
 this behavior.
 
 This is useful when a @var{source} argument may have a trailing slash and
@@ -1467,6 +1497,22 @@ that assumes an older version of POSIX and uses @samp{sort +1}
 or @samp{tail +10}, you can work around any compatibility problems by setting
 @samp{_POSIX2_VERSION=199209} in your environment.
 
+@node coreutils invocation
+@section @command{coreutils}: Multi-call binary
+
+@pindex multicall
+@cindex combined
+@cindex calling combined multi-call binary
+
+@command{coreutils} invokes an individual utility, either
+implicitly selected by the last component of @samp{argv[0]},
+or by explicitly calling @command{coreutils} with the
+@option{--coreutils-prog} option.  Synopsis:
+
+@example
+coreutils @option{--coreutils-prog=PROGRAM} @dots{}
+@end example
+
 @node Output of entire files
 @chapter Output of entire files
 
@@ -1868,6 +1914,16 @@ none (do not print offsets).
 
 The default is octal.
 
+@item --endian=@var{order}
+@opindex --endian
+@cindex byte-swapping
+@cindex endianness
+Reorder input bytes, to handle inputs with differing byte orders,
+or to provide consistent output independent of the endian convention
+of the current system.  Swapping is performed according to the
+specified @option{--type} size and endian @var{order}, which can be
+@samp{little} or @samp{big}.
+
 @item -j @var{bytes}
 @itemx --skip-bytes=@var{bytes}
 @opindex -j
@@ -1910,14 +1966,15 @@ of each output line using each of the data types that you specified,
 in the order that you specified.
 
 Adding a trailing ``z'' to any type specification appends a display
-of the ASCII character representation of the printable characters
+of the single byte character representation of the printable characters
 to the output line generated by the type specification.
 
 @table @samp
 @item a
 named character, ignoring high-order bit
 @item c
-ASCII character or backslash escape,
+printable single byte character, C backslash escape
+or a 3 digit octal sequence
 @item d
 signed decimal
 @item f
@@ -2005,8 +2062,8 @@ Output as octal bytes.  Equivalent to @samp{-t o1}.
 
 @item -c
 @opindex -c
-Output as ASCII characters or backslash escapes.  Equivalent to
-@samp{-t c}.
+Output as printable single byte characters, C backslash escapes
+or 3 digit octal sequences.  Equivalent to @samp{-t c}.
 
 @item -d
 @opindex -d
@@ -2282,10 +2339,12 @@ Convert the number in input field @var{n} (default: 1).
 @item --format=@var{format}
 @opindex --format
 Use printf-style floating FORMAT string.  The @var{format} string must contain
-one @samp{%f} directive, optionally with @samp{'}, @samp{-}, or width
+one @samp{%f} directive, optionally with @samp{'}, @samp{-}, @samp{0}, or width
 modifiers.  The @samp{'} modifier will enable @option{--grouping}, the @samp{-}
 modifier will enable left-aligned @option{--padding} and the width modifier will
-enable right-aligned @option{--padding}.
+enable right-aligned @option{--padding}.  The @samp{0} width modifier
+(without the @samp{-} modifier) will generate leading zeros on the number,
+up to the specified width.
 
 @item --from=@var{unit}
 @opindex --from
@@ -2443,7 +2502,7 @@ are interpreted as @emph{IEC} values.
 
 Converting a single number from/to @emph{human} representation:
 @example
-$ nunfmt --to=si 500000
+$ numfmt --to=si 500000
 500K
 
 $ numfmt --to=iec 500000
@@ -2867,8 +2926,10 @@ Print nonprinting characters in octal backslash notation.
 @opindex -w
 @opindex --width
 Set page width to @var{page_width} characters for multiple text-column
-output only (default for @var{page_width} is 72).  @option{-s[CHAR]} turns
-off the default page width and any line truncation and column alignment.
+output only (default for @var{page_width} is 72).  The specified
+@var{page_width} is rounded down so that columns have equal width.
+@option{-s[CHAR]} turns off the default page width and any line truncation
+and column alignment.
 Lines of full length are merged, regardless of the column options
 set.  No @var{page_width} setting is possible with single column output.
 A POSIX-compliant formulation.
@@ -2877,12 +2938,13 @@ A POSIX-compliant formulation.
 @itemx --page_width=@var{page_width}
 @opindex -W
 @opindex --page_width
-Set the page width to @var{page_width} characters.  That's valid with and
-without a column option.  Text lines are truncated, unless @option{-J}
-is used.  Together with one of the three column options
+Set the page width to @var{page_width} characters, honored with and
+without a column option.  With a column option, the specified @var{page_width}
+is rounded down so that columns have equal width.  Text lines are truncated,
+unless @option{-J} is used. Together with one of the three column options
 (@option{-@var{column}}, @option{-a -@var{column}} or @option{-m}) column
 alignment is always used.  The separator options @option{-S} or @option{-s}
-don't affect the @option{-W} option.  Default is 72 characters.  Without
+don't disable the @option{-W} option.  Default is 72 characters.  Without
 @option{-W @var{page_width}} and without any of the column options NO line
 truncation is used (defined to keep downward compatibility and to meet
 most frequent tasks).  That's equivalent to @option{-W 72 -J}@.  The header
@@ -3156,9 +3218,17 @@ will keep trying until it becomes accessible again.
 
 @item --retry
 @opindex --retry
-This option is useful mainly when following by name (i.e., with
-@option{--follow=name}).
-Without this option, when tail encounters a file that doesn't
+Indefinitely try to open the specified file.
+This option is useful mainly when following (and otherwise issues a warning).
+
+When following by file descriptor (i.e., with @option{--follow=descriptor}),
+this option only affects the initial open of the file, as after a successful
+open, @command{tail} will start following the file descriptor.
+
+When following by name (i.e., with @option{--follow=name}), @command{tail}
+infinitely retries to re-open the given files until killed.
+
+Without this option, when @command{tail} encounters a file that doesn't
 exist or is otherwise inaccessible, it reports that fact and
 never checks it again.
 
@@ -3608,6 +3678,12 @@ long instead of the default 2.
 @opindex --keep-files
 Do not remove output files when errors are encountered.
 
+@item --suppress-matched
+@opindex --suppress-matched
+Do not output lines matching the specified @var{pattern}.
+I.E. suppress the boundary line from the start of the second
+and subsequent splits.
+
 @item -z
 @itemx --elide-empty-files
 @opindex -z
@@ -3684,6 +3760,25 @@ $ head xx*
 14
 @end example
 
+Example of splitting input by empty lines:
+
+@example
+$ csplit --suppress-matched @var{input.txt} '/^$/' '@{*@}'
+@end example
+
+@c
+@c TODO: "uniq" already supports "--group".
+@c        when it gets the "--key" option, uncomment this example.
+@c
+@c Example of splitting input file, based on the value of column 2:
+@c
+@c @example
+@c $ cat @var{input.txt} |
+@c       sort -k2,2 |
+@c       uniq --group -k2,2 |
+@c       csplit -m '/^$/' '@{*@}'
+@c @end example
+
 @node Summarizing files
 @chapter Summarizing files
 
@@ -4334,6 +4429,9 @@ the @command{df}, @command{du}, or @command{ls} commands that are
 invoked with their @option{--human-readable} or @option{--si} options.
 The syntax for numbers is the same as for the @option{--numeric-sort}
 option; the SI suffix must immediately follow the number.
+Note also the @command{numfmt} command, which can be used to reformat
+numbers to human format @emph{after} the sort, thus often allowing
+sort to operate on more accurate numbers.
 
 @item -i
 @itemx --ignore-nonprinting
@@ -4621,21 +4719,7 @@ For example, @code{sort -n -u} inspects only the value of the initial
 numeric string when checking for uniqueness, whereas @code{sort -n |
 uniq} inspects the entire line.  @xref{uniq invocation}.
 
-@macro zeroTerminatedOption
-@item -z
-@itemx --zero-terminated
-@opindex -z
-@opindex --zero-terminated
-@cindex process zero-terminated items
-Delimit items with a zero byte rather than a newline (ASCII LF).
-I.e., treat input as items separated by ASCII NUL
-and terminate output items with ASCII NUL.
-This option can be useful in conjunction with @samp{perl -0} or
-@samp{find -print0} and @samp{xargs -0} which do the same in order to
-reliably handle arbitrary file names (even those containing blanks
-or other special characters).
-@end macro
-@zeroTerminatedOption
+@optZeroTerminated
 
 @end table
 
@@ -4910,7 +4994,19 @@ commands like @code{shuf -o F <F} and @code{cat F | shuf -o F}.
 Use @var{file} as a source of random data used to determine which
 permutation to generate.  @xref{Random sources}.
 
-@zeroTerminatedOption
+@item -r
+@itemx --repeat
+@opindex -r
+@opindex --repeat
+@cindex repeat output values
+Repeat output values, that is, select with replacement.  With this
+option the output is not a permutation of the input; instead, each
+output line is randomly chosen from all the inputs.  This option is
+typically combined with @option{--head-count}; if
+@option{--head-count} is not given, @command{shuf} repeats
+indefinitely.
+
+@optZeroTerminated
 
 @end table
 
@@ -4963,12 +5059,26 @@ and the command @samp{shuf -i 1-4} might output:
 @end example
 
 @noindent
-These examples all have four input lines, so @command{shuf} might
+The above examples all have four input lines, so @command{shuf} might
 produce any of the twenty-four possible permutations of the input.  In
 general, if there are @var{n} input lines, there are @var{n}! (i.e.,
 @var{n} factorial, or @var{n} * (@var{n} - 1) * @dots{} * 1) possible
 output permutations.
 
+@noindent
+To output 50 random numbers each in the range 0 through 9, use:
+
+@example
+shuf -r -n 50 -i 0-9
+@end example
+
+@noindent
+To simulate 100 coin flips, use:
+
+@example
+shuf -r -n 100 -e Head Tail
+@end example
+
 @exitstatus
 
 
@@ -5067,7 +5177,7 @@ Do not discard the second and subsequent repeated input lines,
 but discard lines that are not repeated.
 This option is useful mainly in conjunction with other options e.g.,
 to ignore case or to compare only selected fields.
-The optional @var{delimit-method} tells how to delimit
+The optional @var{delimit-method} specifies how to delimit
 groups of repeated lines, and must be one of the following:
 
 @table @samp
@@ -5078,33 +5188,68 @@ This is equivalent to @option{--all-repeated} (@option{-D}).
 
 @item prepend
 Output a newline before each group of repeated lines.
+@macro nulOutputNote
 With @option{--zero-terminated} (@option{-z}), use a zero
-byte (ASCII NUL) instead of a newline.
+byte (ASCII NUL) instead of a newline as the delimiter.
+@end macro
+@nulOutputNote
 
 @item separate
 Separate groups of repeated lines with a single newline.
-With @option{--zero-terminated} (@option{-z}), use a zero
-byte (ASCII NUL) instead of a newline.
 This is the same as using @samp{prepend}, except that
 no delimiter is inserted before the first group, and hence
 may be better suited for output direct to users.
+@nulOutputNote
 @end table
 
+@macro ambiguousGroupNote
 Note that when groups are delimited and the input stream contains
 two or more consecutive blank lines, then the output is ambiguous.
-To avoid that, filter the input through @samp{tr -s '\n'} to replace
+To avoid that, filter the input through @samp{tr -s '\\n'} to replace
 each sequence of consecutive newlines with a single newline.
+@end macro
+@ambiguousGroupNote
 
 This is a GNU extension.
 @c FIXME: give an example showing *how* it's useful
 
+@item --group[=@var{delimit-method}]
+@opindex --group
+@cindex all lines, grouping
+Output all lines, and delimit each unique group.
+@nulOutputNote
+The optional @var{delimit-method} specifies how to delimit
+groups, and must be one of the following:
+
+@table @samp
+
+@item separate
+Separate unique groups with a single delimiter.
+This is the default delimiting method if none is specified,
+and better suited for output direct to users.
+
+@item prepend
+Output a delimiter before each group of unique items.
+
+@item append
+Output a delimiter after each group of unique items.
+
+@item both
+Output a delimiter around each group of unique items.
+@end table
+
+@ambiguousGroupNote
+
+This is a GNU extension.
+
 @item -u
 @itemx --unique
 @opindex -u
 @opindex --unique
 @cindex unique lines, outputting
-Discard the first repeated line.  When used by itself, this option
-causes @command{uniq} to print unique lines, and nothing else.
+Discard the last line that would be output for a repeated input group.
+When used by itself, this option causes @command{uniq} to print unique
+lines, and nothing else.
 
 @item -w @var{n}
 @itemx --check-chars=@var{n}
@@ -5114,7 +5259,7 @@ Compare at most @var{n} characters on each line (after skipping any specified
 fields and characters).  By default the entire rest of the lines are
 compared.
 
-@zeroTerminatedOption
+@optZeroTerminated
 
 @end table
 
@@ -5249,7 +5394,7 @@ compatibility; GNU Standards normally discourage output parameters not
 introduced by an option.
 
 Note that for @emph{any} file named as the value of an option or as an
-input text file, a single dash @kbd{-} may be used, in which case
+input text file, a single dash @samp{-} may be used, in which case
 standard input is assumed.  However, it would not make sense to use this
 convention more than once per program invocation.
 
@@ -5547,7 +5692,7 @@ extensions are disabled.  Option @option{-M} can be used to change
 
 In this output format, each non-graphical character, like newline and
 tab, is merely changed to exactly one space, with no special attempt to
-compress consecutive spaces.  Each quote character: @kbd{"} is doubled
+compress consecutive spaces.  Each quote character @samp{"} is doubled
 so it will be correctly processed by @command{nroff} or @command{troff}.
 
 @item -T
@@ -5569,9 +5714,9 @@ selected, the last parameter of each @code{\xx} call is inhibited.
 Option @option{-M} can be used to change @samp{xx} to another macro
 name.
 
-In this output format, some special characters, like @kbd{$}, @kbd{%},
-@kbd{&}, @kbd{#} and @kbd{_} are automatically protected with a
-backslash.  Curly brackets @kbd{@{}, @kbd{@}} are protected with a
+In this output format, some special characters, like @samp{$}, @samp{%},
+@samp{&}, @samp{#} and @samp{_} are automatically protected with a
+backslash.  Curly brackets @samp{@{}, @samp{@}} are protected with a
 backslash and a pair of dollar signs (to force mathematical mode).  The
 backslash itself produces the sequence @code{\backslash@{@}}.
 Circumflex and tilde diacritical marks produce the sequence @code{^\@{ @}} and
@@ -5636,7 +5781,7 @@ All 256 bytes, even ASCII NUL bytes, are always read and
 processed from input file with no adverse effect, even if GNU extensions
 are disabled.  However, System V @command{ptx} does not accept 8-bit
 characters, a few control characters are rejected, and the tilde
-@kbd{~} is also rejected.
+@samp{~} is also rejected.
 
 @item
 Input line length is only limited by available memory, even if GNU
@@ -5961,9 +6106,14 @@ corresponding lines of each given file, separated by a TAB character.
 Standard input is used for a file name of @samp{-} or if no input files
 are given.
 
-For example:
+Synopsis:
 
 @example
+paste [@var{option}]@dots{} [@var{file}]@dots{}
+@end example
+
+For example, with:
+@example
 $ cat num2
 1
 2
@@ -5971,16 +6121,37 @@ $ cat let3
 a
 b
 c
+@end example
+
+Take lines sequentially from each file:
+@example
 $ paste num2 let3
 1       a
 2       b
        @ c
 @end example
 
-Synopsis:
+Duplicate lines from a file:
+@example
+$ paste num2 let3 num2
+1       a      1
+2       b      2
+       @ c
+@end example
 
+Intermix lines from stdin:
 @example
-paste [@var{option}]@dots{} [@var{file}]@dots{}
+$ paste - let3 - < num2
+1       a      2
+       @ b
+       @ c
+@end example
+
+Join consecutive lines with a space:
+@example
+$ seq 4 | paste -d ' ' - -
+1 2
+3 4
 @end example
 
 The program accepts the following options.  Also see @ref{Common options}.
@@ -6181,6 +6352,8 @@ character is used to delimit the fields.
 Print a line for each unpairable line in file @var{file-number}
 (either @samp{1} or @samp{2}), instead of the normal output.
 
+@optZeroTerminated
+
 @end table
 
 @exitstatus
@@ -6191,7 +6364,7 @@ Print a line for each unpairable line in file @var{file-number}
 
 @cindex operating on characters
 
-This commands operate on individual characters.
+These commands operate on individual characters.
 
 @menu
 * tr invocation::               Translate, squeeze, and/or delete characters.
@@ -7143,7 +7316,7 @@ space, there is no alternate access method.  When it is a printing
 character, then there is such a method.
 
 GNU @command{ls} uses a @samp{.} character to indicate a file
-with an SELinux security context, but no other alternate access method.
+with a security context, but no other alternate access method.
 
 A file with any other combination of alternate access methods
 is marked with a @samp{+} character.
@@ -7512,11 +7685,9 @@ Assume that each tab stop is @var{cols} columns wide.  The default is 8.
 @command{ls} uses tabs where possible in the output, for efficiency.  If
 @var{cols} is zero, do not use tabs at all.
 
-@c FIXME: remove in 2009, if Apple Terminal has been fixed for long enough.
-Some terminal emulators (at least Apple Terminal 1.5 (133) from Mac OS X 10.4.8)
-do not properly align columns to the right of a TAB following a
-non-ASCII byte.  If you use such a terminal emulator, use the
-@option{-T0} option or put @code{TABSIZE=0} in your environment to tell
+Some terminal emulators might not properly align columns to the right of a
+TAB following a non-ASCII byte.  You can avoid that issue by using the
+@option{-T0} option or put @code{TABSIZE=0} in your environment, to tell
 @command{ls} to align using spaces, not tabs.
 
 @item -w
@@ -7918,8 +8089,8 @@ copy recursively by descending into source directories and copying files
 to corresponding destination directories.
 
 When copying from a symbolic link, @command{cp} normally follows the
-link only when not copying
-recursively.  This default can be overridden with the
+link only when not copying recursively or when @option{--link}
+(@option{-l}) is used.  This default can be overridden with the
 @option{--archive} (@option{-a}), @option{-d}, @option{--dereference}
 (@option{-L}), @option{--no-dereference} (@option{-P}), and
 @option{-H} options.  If more than one of these options is specified,
@@ -7973,7 +8144,7 @@ If the destination already exists, do not alter its contents.
 See the @option{--preserve} option for controlling which attributes to copy.
 
 @item -b
-@itemx @w{@kbd{--backup}[=@var{method}]}
+@itemx --backup[=@var{method}]
 @opindex -b
 @opindex --backup
 @vindex VERSION_CONTROL
@@ -8087,7 +8258,7 @@ they point to.  This option affects only symbolic links in the source;
 symbolic links in the destination are always followed if possible.
 
 @item -p
-@itemx @w{@kbd{--preserve}[=@var{attribute_list}]}
+@itemx --preserve[=@var{attribute_list}]
 @opindex -p
 @opindex --preserve
 @cindex file information, preserving, extended attributes, xattr
@@ -8123,9 +8294,11 @@ $ mkdir c; : > a; ln -s a b; cp -aH a b c; ls -i1 c
 @noindent
 Note the inputs: @file{b} is a symlink to regular file @file{a},
 yet the files in destination directory, @file{c/}, are hard-linked.
-Since @option{-a} implies @option{--preserve=links}, and since @option{-H}
-tells @command{cp} to dereference command line arguments, it sees two files
-with the same inode number, and preserves the perceived hard link.
+Since @option{-a} implies @option{--no-dereference} it would copy the symlink,
+but the later @option{-H} tells @command{cp} to dereference the command line
+arguments where it then sees two files with the same inode number.
+Then the @option{--preserve=links} option also implied by @option{-a}
+will preserve the perceived hard link.
 
 Here is a similar example that exercises @command{cp}'s @option{-L} option:
 @smallexample
@@ -8153,12 +8326,13 @@ all but @samp{Operation not supported} warnings are output.
 Using @option{--preserve} with no @var{attribute_list} is equivalent
 to @option{--preserve=mode,ownership,timestamps}.
 
-In the absence of this option, each destination file is created with the
+In the absence of this option, the permissions of existing destination
+files are unchanged, while each new file is created with the
 mode bits of the corresponding source file, minus the bits set in the
 umask and minus the set-user-ID and set-group-ID bits.
 @xref{File permissions}.
 
-@item @w{@kbd{--no-preserve}=@var{attribute_list}}
+@item --no-preserve=@var{attribute_list}
 @cindex file information, preserving
 Do not preserve the specified attributes.  The @var{attribute_list}
 has the same form as for @option{--preserve}.
@@ -8190,7 +8364,8 @@ any missing intermediate directories.
 @cindex recursively copying directories
 @cindex non-directories, copying as special files
 Copy directories recursively.  By default, do not follow symbolic
-links in the source; see the @option{--archive} (@option{-a}), @option{-d},
+links in the source unless used together with the @option{--link}
+(@option{-l}) option; see the @option{--archive} (@option{-a}), @option{-d},
 @option{--dereference} (@option{-L}), @option{--no-dereference}
 (@option{-P}), and @option{-H} options.  Special files are copied by
 creating a destination file of the same type as the source; see the
@@ -8327,6 +8502,25 @@ Skip subdirectories that are on different file systems from the one that
 the copy started on.
 However, mount point directories @emph{are} copied.
 
+@macro optContext
+@item -Z
+@itemx --context[=@var{context}]
+@opindex -Z
+@opindex --context
+@cindex SELinux, setting/restoring security context
+@cindex security context
+Without a specified @var{context}, adjust the SELinux security context according
+to the system default type for destination files, similarly to the
+@command{restorecon} command.
+The long form of this option with a specific context specified,
+will set the context for newly created files only.
+With a specified context, if both SELinux and SMACK are disabled, a warning is
+issued.
+@end macro
+@optContext
+This option is mutually exclusive with the @option{--preserve=context}
+option, and overrides the @option{--preserve=all} and @option{-a} options.
+
 @end table
 
 @exitstatus
@@ -8440,7 +8634,7 @@ that normally make up the last status line.
 
 @item none
 @opindex none @r{dd status=}
-Do not print any informational messages to stderr.
+Do not print any informational or warning messages to stderr.
 Error messages are output as normal.
 
 @end table
@@ -8459,21 +8653,26 @@ Conversions:
 Convert EBCDIC to ASCII,
 using the conversion table specified by POSIX@.
 This provides a 1:1 translation for all 256 bytes.
+This option implies @samp{conv=unblock}; input is converted to
+ASCII before trailing spaces are deleted.
 
 @item ebcdic
 @opindex ebcdic@r{, converting to}
 Convert ASCII to EBCDIC@.
 This is the inverse of the @samp{ascii} conversion.
+This option implies @samp{conv=block}; trailing spaces are added
+before being converted to EBCDIC@.
 
 @item ibm
 @opindex alternate ebcdic@r{, converting to}
-Convert ASCII to alternate EBCDIC,
-using the alternate conversion table specified by POSIX@.
+This acts like @samp{conv=ebcdic}, except it
+uses the alternate conversion table specified by POSIX@.
 This is not a 1:1 translation, but reflects common historical practice
 for @samp{~}, @samp{[}, and @samp{]}.
 
 The @samp{ascii}, @samp{ebcdic}, and @samp{ibm} conversions are
-mutually exclusive.
+mutually exclusive.  If you use any of these options, you should also
+use the @samp{cbs=} option.
 
 @item block
 @opindex block @r{(space-padding)}
@@ -8771,6 +8970,25 @@ tape=/dev/rmt/0
 (dd bs=4k seek=1 count=0 && dd bs=512k) <$tape >$disk
 @end example
 
+@cindex ddrescue
+@cindex disks, failing
+For failing disks, other tools come with a great variety of extra
+functionality to ease the saving of as much data as possible before the
+disk finally dies, e.g.
+@uref{http://www.gnu.org/software/ddrescue/, GNU @command{ddrescue}}.
+However, in some cases such a tool is not available or the administrator
+feels more comfortable with the handling of @command{dd}.
+As a simple rescue method, call @command{dd} as shown in the following
+example: the options @samp{conv=noerror,sync} are used to continue
+after read errors and to pad out bad reads with NULs, while
+@samp{iflag=fullblock} caters for short reads (which traditionally never
+occur on disk based devices):
+
+@example
+# Rescue data from an (unmounted!) partition of a failing disk.
+dd conv=noerror,sync iflag=fullblock </dev/sda1 > /mnt/rescue.img
+@end example
+
 Sending an @samp{INFO} signal to a running @command{dd}
 process makes it print I/O statistics to standard error
 and then resume copying.  In the example below,
@@ -8857,6 +9075,12 @@ The program accepts the following options.  Also see @ref{Common options}.
 Compare each pair of source and destination files, and if the destination has
 identical content and any specified owner, group, permissions, and possibly
 SELinux context, then do not modify the destination at all.
+Note this option is best used in conjunction with @option{--user},
+@option{--group} and @option{--mode} options, lest @command{install}
+incorrectly determines the default attributes that installed files would have
+(as it doesn't consider setgid directories and POSIX default ACLs for example).
+This could result in redundant copies or attributes that are not reset to the
+correct defaults.
 
 @item -c
 @opindex -c
@@ -8866,8 +9090,8 @@ Ignored; for compatibility with old Unix versions of @command{install}.
 @opindex -D
 Create any missing parent directories of @var{dest},
 then copy @var{source} to @var{dest}.
-This option is ignored if a destination directory is specified
-via @option{--target-directory=DIR}.
+Explicitly specifying the @option{--target-directory=@var{dir}} will similarly
+ensure the presence of that hierarchy before copying @var{source} arguments.
 
 @item -d
 @itemx --directory
@@ -8964,15 +9188,9 @@ Program used to strip binaries.
 @opindex --verbose
 Print the name of each file before copying it.
 
-@item -Z @var{context}
-@itemx --context=@var{context}
-@opindex -Z
-@opindex --context
-@cindex SELinux
-@cindex security context
-Set the default SELinux security context to be used for any
-created files and directories.  If SELinux is disabled then
-print a warning and ignore the option.
+@optContext
+This option is mutually exclusive with the @option{--preserve-context} option.
+
 
 @end table
 
@@ -9105,6 +9323,16 @@ Print the name of each file before moving it.
 
 @optNoTargetDirectory
 
+@item -Z
+@itemx --context
+@opindex -Z
+@opindex --context
+@cindex SELinux, restoring security context
+@cindex security context
+This option functions similarly to the @command{restorecon} command,
+by adjusting the SELinux security context according
+to the system default type for destination files.
+
 @end table
 
 @exitstatus
@@ -9137,7 +9365,8 @@ the @option{-f} or @option{--force} option is not given, or the
 If the response is not affirmative, the file is skipped.
 
 Any attempt to remove a file whose last file name component is
-@file{.} or @file{..} is rejected without any prompting.
+@file{.} or @file{..} is rejected without any prompting, as mandated
+by POSIX.
 
 @emph{Warning}: If you use @command{rm} to remove a file, it is usually
 possible to recover the contents of that file.  If you want more assurance
@@ -9416,12 +9645,25 @@ the whole file.  @var{bytes} can be followed by a size specification like
 @samp{K}, @samp{M}, or @samp{G} to specify a multiple.  @xref{Block size}.
 
 @item -u
-@itemx --remove
+@itemx --remove[=@var{how}]
 @opindex -u
 @opindex --remove
+@opindex --remove=unlink
+@opindex --remove=wipe
+@opindex --remove=wipesync
 @cindex removing files after shredding
 After shredding a file, truncate it (if possible) and then remove it.
 If a file has multiple links, only the named links will be removed.
+Often the file name is less sensitive than the file data, in which case
+the optional @var{how} parameter gives control of how to more efficiently
+remove each directory entry.
+The @samp{unlink} parameter will just use a standard unlink call,
+@samp{wipe} will also first obfuscate bytes in the name, and
+@samp{wipesync} will also sync each obfuscated byte in the name to disk.
+Note @samp{wipesync} is the default method, but can be expensive,
+requiring a sync for every character in every file.  This can become
+significant with many files, or is redundant if your file system provides
+synchronous metadata updates.
 
 @item -v
 @itemx --verbose
@@ -9434,8 +9676,9 @@ Display to standard error all status updates as sterilization proceeds.
 @opindex -x
 @opindex --exact
 By default, @command{shred} rounds the size of a regular file up to the next
-multiple of the file system block size to fully erase the last block
-of the file.
+multiple of the file system block size to fully erase the slack space in
+the last block of the file.  This space may contain portions of the current
+system memory on some systems for example.
 Use @option{--exact} to suppress that behavior.
 Thus, by default if you shred a 10-byte regular file on a system with 512-byte
 blocks, the resulting file will be 512 bytes long.  With this option,
@@ -9760,8 +10003,24 @@ ln -srv /a/file /tmp
 '/tmp/file' -> '../a/file'
 @end smallexample
 
+Relative symbolic links are generated based on their canonicalized
+containing directory, and canonicalized targets.  I.E. all symbolic
+links in these file names will be resolved.
 @xref{realpath invocation}, which gives greater control
-over relative file name generation.
+over relative file name generation, as demonstrated in the following example:
+
+@example
+@verbatim
+ln--relative() {
+  test "$1" = --no-symlinks && { nosym=$1; shift; }
+  target="$1";
+  test -d "$2" && link="$2/." || link="$2"
+  rtarget="$(realpath $nosym -m "$target" \
+              --relative-to "$(dirname "$link")")"
+  ln -s -v "$rtarget" "$link"
+}
+@end verbatim
+@end example
 
 @item -s
 @itemx --symbolic
@@ -9890,13 +10149,7 @@ newly-created parent directories are inherited.
 Print a message for each created directory.  This is most useful with
 @option{--parents}.
 
-@item -Z @var{context}
-@itemx --context=@var{context}
-@opindex -Z
-@opindex --context
-@cindex SELinux
-@cindex security context
-Set the default SELinux security context to be used for created directories.
+@optContext
 
 @end table
 
@@ -9937,13 +10190,7 @@ Set the mode of created FIFOs to @var{mode}, which is symbolic as in
 for the point of departure.  @var{mode} should specify only file
 permission bits.  @xref{File permissions}.
 
-@item -Z @var{context}
-@itemx --context=@var{context}
-@opindex -Z
-@opindex --context
-@cindex SELinux
-@cindex security context
-Set the default SELinux security context to be used for created FIFOs.
+@optContext
 
 @end table
 
@@ -10020,13 +10267,7 @@ Set the mode of created files to @var{mode}, which is symbolic as in
 @var{mode} should specify only file permission bits.
 @xref{File permissions}.
 
-@item -Z @var{context}
-@itemx --context=@var{context}
-@opindex -Z
-@opindex --context
-@cindex SELinux
-@cindex security context
-Set the default SELinux security context to be used for created files.
+@optContext
 
 @end table
 
@@ -10119,11 +10360,7 @@ Suppress most error messages.
 @opindex --verbose
 Report error messages.
 
-@item -z
-@itemx --zero
-@opindex -z
-@opindex --zero
-Separate output items with NUL characters.
+@optZero
 
 @end table
 
@@ -10307,6 +10544,13 @@ portable, and because it has undesirable results if the entire
 @var{owner@samp{.}group} happens to identify a user whose name
 contains @samp{.}.
 
+@macro chownGroupRestrictions
+It is system dependent whether a user can change the group to an arbitrary one,
+or the more portable behavior of being restricted to setting a group of
+which the user is a member.
+@end macro
+@chownGroupRestrictions
+
 The @command{chown} command sometimes clears the set-user-ID or
 set-group-ID permission bits.  This behavior depends on the policy and
 functionality of the underlying @code{chown} system call, which may
@@ -10340,7 +10584,7 @@ actually changes.
 Do not print error messages about files whose ownership cannot be
 changed.
 
-@item @w{@kbd{--from}=@var{old-owner}}
+@item --from=@var{old-owner}
 @opindex --from
 @cindex symbolic links, changing owner
 Change a @var{file}'s ownership only if it has current attributes specified
@@ -10467,7 +10711,8 @@ chown -hR root /u
 
 @command{chgrp} changes the group ownership of each given @var{file}
 to @var{group} (which can be either a group name or a numeric group ID)
-or to the group of an existing reference file.  Synopsis:
+or to the group of an existing reference file.  @xref{chown invocation}.
+Synopsis:
 
 @example
 chgrp [@var{option}]@dots{} @{@var{group} | --reference=@var{ref_file}@}@c
@@ -10478,6 +10723,8 @@ If @var{group} is intended to represent a
 numeric group ID, then you may specify it with a leading @samp{+}.
 @xref{Disambiguating names and IDs}.
 
+@chownGroupRestrictions
+
 The program accepts the following options.  Also see @ref{Common options}.
 
 @table @samp
@@ -10923,21 +11170,19 @@ for that device with the shortest mount point name in the list of file systems
 (@var{mtab}), i.e., it hides duplicate entries, unless the @option{-a} option is
 specified.
 
-With the same logic, @command{df} elides a mount entry of a dummy pseude device
+With the same logic, @command{df} elides a mount entry of a dummy pseudo device
 if there is another mount entry of a real block device for that mount point with
 the same device number, e.g. the early-boot pseudo file system @samp{rootfs} is
 not shown per default when already the real root device has been mounted.
 
 @cindex disk device file
 @cindex device file, disk
-If an argument @var{file} is a disk device file containing a mounted
-file system, @command{df} shows the space available on that file system
-rather than on the file system containing the device node (i.e., the root
-file system).  GNU @command{df} does not attempt to determine the
-disk usage
+If an argument @var{file} resolves to a special file containing
+a mounted file system, @command{df} shows the space available on that
+file system rather than on the file system containing the device node.
+GNU @command{df} does not attempt to determine the disk usage
 on unmounted file systems, because on most kinds of systems doing so
-requires extremely nonportable intimate knowledge of file system
-structures.
+requires extremely nonportable intimate knowledge of file system structures.
 
 The program accepts the following options.  Also see @ref{Common options}.
 
@@ -11013,7 +11258,7 @@ disks, but on some systems (notably SunOS) the results may be slightly
 out of date.  This is the default.
 
 @item --output
-@itemx @w{@kbd{--output}[=@var{field_list}]}
+@itemx --output[=@var{field_list}]
 @opindex --output
 Use the output format defined by @var{field_list}, or print all fields if
 @var{field_list} is omitted.  In the latter case, the order of the columns
@@ -11052,6 +11297,8 @@ Number of available blocks.
 @item pcent
 Percentage of @var{used} divided by @var{size}.
 
+@item file
+The file name if specified on the command line.
 @item target
 The mount point.
 @end table
@@ -11139,30 +11386,34 @@ An NFS file system, i.e., one mounted over a network from another
 machine.  This is the one type name which seems to be used uniformly by
 all systems.
 
-@item 4.2@r{, }ufs@r{, }efs@dots{}
+@item ext2@r{, }ext3@r{, }ext4@r{, }xfs@r{, }btrfs@dots{}
 @cindex Linux file system types
 @cindex local file system types
-@opindex 4.2 @r{file system type}
-@opindex ufs @r{file system type}
-@opindex efs @r{file system type}
+@opindex ext2 @r{file system type}
+@opindex ext3 @r{file system type}
+@opindex ext4 @r{file system type}
+@opindex xfs @r{file system type}
+@opindex btrfs @r{file system type}
 A file system on a locally-mounted hard disk.  (The system might even
 support more than one type here; Linux does.)
 
-@item hsfs@r{, }cdfs
+@item iso9660@r{, }cdfs
 @cindex CD-ROM file system type
-@cindex High Sierra file system
-@opindex hsfs @r{file system type}
+@cindex DVD file system type
+@cindex ISO9660 file system type
+@opindex iso9660 @r{file system type}
 @opindex cdfs @r{file system type}
-A file system on a CD-ROM drive.  HP-UX uses @samp{cdfs}, most other
-systems use @samp{hsfs} (@samp{hs} for ``High Sierra'').
+A file system on a CD or DVD drive.  HP-UX uses @samp{cdfs}, most other
+systems use @samp{iso9660}.
 
-@item pcfs
-@cindex PC file system
+@item ntfs@r{,}fat
+@cindex NTFS file system
 @cindex DOS file system
 @cindex MS-DOS file system
-@cindex diskette file system
-@opindex pcfs
-An MS-DOS file system, usually on a diskette.
+@cindex MS-Windows file system
+@opindex ntfs @r{file system file}
+@opindex fat @r{file system file}
+File systems used by MS-Windows / MS-DOS.
 
 @end table
 
@@ -11219,7 +11470,7 @@ The program accepts the following options.  Also see @ref{Common options}.
 
 @table @samp
 
-@optNull{du}
+@optNull
 
 @item -a
 @itemx --all
@@ -11296,6 +11547,18 @@ Equivalent to @option{--dereference-args} (@option{-D}).
 
 @optHumanReadable
 
+@item --inodes
+@opindex --inodes
+@cindex inode usage, dereferencing in @command{du}
+List inode usage information instead of block usage.
+This option is useful for finding directories which contain many files, and
+therefore eat up most of the inodes space of a file system (see @command{df},
+option @option{--inodes}).
+It can well be combined with the options @option{-a}, @option{-c},
+@option{-h}, @option{-l}, @option{-s}, @option{-S}, @option{-t} and
+@option{-x}; however, passing other options regarding the block size, for
+example @option{-b}, @option{-m} and @option{--apparent-size}, is ignored.
+
 @item -k
 @opindex -k
 @cindex kibibytes for file sizes
@@ -11343,8 +11606,7 @@ Normally, in the output of @command{du} (when not using @option{--summarize}),
 the size listed next to a directory name, @var{d}, represents the sum
 of sizes of all entries beneath @var{d} as well as the size of @var{d} itself.
 With @option{--separate-dirs}, the size reported for a directory name,
-@var{d}, is merely the @code{stat.st_size}-derived size of the directory
-entry, @var{d}.
+@var{d}, will exclude the size of any subdirectories.
 
 @optSi
 
@@ -11358,7 +11620,9 @@ Display only a total for each argument.
 @itemx --threshold=@var{size}
 @opindex -t
 @opindex --threshold
-Exclude entries based on a given @var{size} (@pxref{Block size}).
+Exclude entries based on a given @var{size}.  The @var{size} refers to used
+blocks in normal mode (@pxref{Block size}), or inodes count in conjunction
+with the @option{--inodes} option.
 
 If @var{size} is positive, then @command{du} will only print entries with a size
 greater than or equal to that.
@@ -11374,6 +11638,10 @@ Please note that the @option{--threshold} option can be combined with the
 @option{--apparent-size} option, and in this case would elide entries based on
 its apparent size.
 
+Please note that the @option{--threshold} option can be combined with the
+@option{--inodes} option, and in this case would elide entries based on
+its inodes count.
+
 Here's how you would use @option{--threshold} to find directories with a size
 greater than or equal to 200 megabytes:
 
@@ -11388,6 +11656,13 @@ note the @option{-a} - with an apparent size smaller than or equal to 500 bytes:
 du -a -t -500 --apparent-size
 @end example
 
+Here's how you would use @option{--threshold} to find directories on the root
+file system with more than 20000 inodes used in the directory tree below:
+
+@example
+du --inodes -x --threshold=20000 /
+@end example
+
 
 @item --time
 @opindex --time
@@ -11594,20 +11869,25 @@ The valid @var{format} directives for files with @option{--format} and
 @item %N - Quoted file name with dereference if symbolic link
 @item %o - Optimal I/O transfer size hint
 @item %s - Total size, in bytes
-@item %t - Major device type in hex
-@item %T - Minor device type in hex
+@item %t - Major device type in hex (see below)
+@item %T - Minor device type in hex (see below)
 @item %u - User ID of owner
 @item %U - User name of owner
 @item %w - Time of file birth, or @samp{-} if unknown
 @item %W - Time of file birth as seconds since Epoch, or @samp{0}
 @item %x - Time of last access
 @item %X - Time of last access as seconds since Epoch
-@item %y - Time of last modification
-@item %Y - Time of last modification as seconds since Epoch
-@item %z - Time of last change
-@item %Z - Time of last change as seconds since Epoch
+@item %y - Time of last data modification
+@item %Y - Time of last data modification as seconds since Epoch
+@item %z - Time of last status change
+@item %Z - Time of last status change as seconds since Epoch
 @end itemize
 
+The @samp{%t} and @samp{%T} formats operate on the st_rdev member of
+the stat(2) structure, and are only defined for character and block
+special files.  On some systems or file types, st_rdev may be used to
+represent other quantities.
+
 The @samp{%W}, @samp{%X}, @samp{%Y}, and @samp{%Z} formats accept a
 precision preceded by a period to specify the number of digits to
 print after the decimal point.  For example, @samp{%.3X} outputs the
@@ -11752,6 +12032,7 @@ Base the size of each @var{file} on the size of @var{rfile}.
 @opindex -s
 @opindex --size
 Set or adjust the size of each @var{file} according to @var{size}.
+@var{size} is in bytes unless @option{--io-blocks} is specified.
 @multiplierSuffixesNoBlocks{size}
 
 @var{size} may also be prefixed by one of the following to adjust
@@ -12979,11 +13260,7 @@ With this, an optional @var{suffix} must be specified using the
 Remove a trailing @var{suffix}.
 This option implies the @option{-a} option.
 
-@item -z
-@itemx --zero
-@opindex -z
-@opindex --zero
-Separate output items with NUL characters.
+@optZero
 
 @end table
 
@@ -13038,11 +13315,7 @@ The program accepts the following option.  Also see @ref{Common options}.
 
 @table @samp
 
-@item -z
-@itemx --zero
-@opindex -z
-@opindex --zero
-Separate output items with NUL characters.
+@optZero
 
 @end table
 
@@ -13375,23 +13648,6 @@ This is the default mode of operation.
 @opindex --quiet
 Suppress diagnostic messages for specified file names.
 
-@item -s
-@itemx --strip
-@itemx --no-symlinks
-@opindex -s
-@opindex --strip
-@opindex --no-symlinks
-Do not resolve symbolic links.  Only resolve references to
-@samp{/./}, @samp{/../} and remove extra @samp{/} characters.
-When combined with the @option{-m} option, realpath operates
-only on the file name, and does not touch any actual file.
-
-@item -z
-@itemx --zero
-@opindex -z
-@opindex --zero
-Separate output items with NUL characters.
-
 @item --relative-to=@var{file}
 @opindex --relative-to
 @cindex relpath
@@ -13420,6 +13676,19 @@ realpath --relative-base=/usr /tmp /usr/bin
 @result{} bin
 @end example
 
+@item -s
+@itemx --strip
+@itemx --no-symlinks
+@opindex -s
+@opindex --strip
+@opindex --no-symlinks
+Do not resolve symbolic links.  Only resolve references to
+@samp{/./}, @samp{/../} and remove extra @samp{/} characters.
+When combined with the @option{-m} option, realpath operates
+only on the file name, and does not touch any actual file.
+
+@optZero
+
 @end table
 
 @cindex exit status of @command{realpath}
@@ -13600,6 +13869,16 @@ May be negated.
 @cindex even parity
 Set odd parity (even if negated).  May be negated.
 
+@item cmspar
+@opindex cmspar
+@cindex constant parity
+@cindex stick parity
+@cindex mark parity
+@cindex space parity
+Use "stick" (mark/space) parity.  If parodd is set, the parity bit is
+always 1; if parodd is not set, the parity bit is always zero.
+Non-POSIX@.  May be negated.
+
 @item cs5
 @itemx cs6
 @itemx cs7
@@ -13705,7 +13984,7 @@ Assume input characters are UTF-8 encoded.  May be negated.
 @opindex ixon
 @kindex C-s/C-q flow control
 @cindex XON/XOFF flow control
-Enable XON/XOFF flow control (that is, @kbd{CTRL-S}/@kbd{CTRL-Q}).  May
+Enable XON/XOFF flow control (that is, @kbd{Ctrl-S}/@kbd{Ctrl-Q}).  May
 be negated.
 
 @item ixoff
@@ -14208,7 +14487,7 @@ The program accepts the following option.  Also see @ref{Common options}.
 
 @table @samp
 
-@optNull{printenv}
+@optNull
 
 @end table
 
@@ -14293,9 +14572,13 @@ logins, groups, and so forth.
 running it if no user is specified.  Synopsis:
 
 @example
-id [@var{option}]@dots{} [@var{username}]
+id [@var{option}]@dots{} [@var{user}]
 @end example
 
+@var{user} can be either a user ID or a name, with name look-up
+taking precedence unless the ID is specified with a leading @samp{+}.
+@xref{Disambiguating names and IDs}.
+
 @vindex POSIXLY_CORRECT
 By default, it prints the real user ID, real group ID, effective user ID
 if different from the real user ID, effective group ID if different from
@@ -14349,13 +14632,25 @@ Print only the user ID.
 @opindex --context
 @cindex SELinux
 @cindex security context
-Print only the security context of the current user.
-If SELinux is disabled then print a warning and
+Print only the security context of the process, which is generally
+the user's security context inherited from the parent process.
+If neither SELinux or SMACK is enabled then print a warning and
 set the exit status to 1.
 
-@end table
+@item -z
+@itemx --zero
+@opindex -z
+@opindex --zero
+Delimit output items with NUL characters.
+This option is not permitted when using the default format.
 
-@exitstatus
+Example:
+@example
+$ id -Gn --zero
+users <NUL> devs <NUL>
+@end example
+
+@end table
 
 @macro primaryAndSupplementaryGroups{cmd,arg}
 Primary and supplementary groups for a process are normally inherited
@@ -14367,6 +14662,8 @@ database to be consulted afresh, and so will give a different result.
 @end macro
 @primaryAndSupplementaryGroups{id,user argument}
 
+@exitstatus
+
 @node logname invocation
 @section @command{logname}: Print current login name
 
@@ -14424,13 +14721,12 @@ groups [@var{username}]@dots{}
 
 The group lists are equivalent to the output of the command @samp{id -Gn}.
 
-@primaryAndSupplementaryGroups{groups,list of users}
-
 The only options are @option{--help} and @option{--version}.  @xref{Common
 options}.
 
-@exitstatus
+@primaryAndSupplementaryGroups{groups,list of users}
 
+@exitstatus
 
 @node users invocation
 @section @command{users}: Print login names of users currently logged in
@@ -15842,15 +16138,27 @@ By default, @var{command} is run with the same credentials
 as the invoking process.
 Use this option to run it as a different @var{user} and/or with a
 different primary @var{group}.
+If a @var{user} is specified then the supplementary groups
+are set according to the system defined list for that user,
+unless overridden with the @option{--groups} option.
 
 @item --groups=@var{groups}
 @opindex --groups
-Use this option to specify the supplementary @var{groups} to be
+Use this option to override the supplementary @var{groups} to be
 used by the new process.
 The items in the list (names or numeric IDs) must be separated by commas.
+Use @samp{--groups=''} to disable the supplementary group look-up
+implicit in the @option{--userspec} option.
 
 @end table
 
+The user and group name look-up performed by the @option{--userspec}
+and @option{--groups} options, is done both outside and inside
+the chroot, with successful look-ups inside the chroot taking precedence.
+If the specified user or group items are intended to represent a numeric ID,
+then a name to ID resolving step is avoided by specifying a leading @samp{+}.
+@xref{Disambiguating names and IDs}.
+
 Here are a few tips to help avoid common problems in using chroot.
 To start with a simple example, make @var{command} refer to a statically
 linked binary.  If you were to use a dynamically linked executable, then
@@ -16009,7 +16317,7 @@ Options must precede operands.
 
 @table @samp
 
-@optNull{env}
+@optNull
 
 @item -u @var{name}
 @itemx --unset=@var{name}
@@ -16647,6 +16955,9 @@ When @var{increment} is not specified, it defaults to @samp{1},
 even when @var{first} is larger than @var{last}.
 @var{first} also defaults to @samp{1}.  So @code{seq 1} prints
 @samp{1}, but @code{seq 0} and @code{seq 10 5} produce no output.
+The sequence of numbers ends when the sum of the current number and
+@var{increment} would become greater than @var{last},
+so @code{seq 1 10 10} only produces @samp{1}.
 Floating-point numbers may be specified.  @xref{Floating point}.
 
 The program accepts the following options.  Also see @ref{Common options}.
@@ -17295,10 +17606,10 @@ Know your toolbox!  Use each program appropriately.  If you don't have an
 appropriate tool, build one.
 @end enumerate
 
-As of this writing, all the programs we've discussed are available via
-anonymous @command{ftp} from: @*
-@uref{ftp://gnudist.gnu.org/textutils/textutils-1.22.tar.gz}.  (There may
-be more recent versions available now.)
+As of this writing, all the programs discussed are available from
+@uref{http://ftp.gnu.org/old-gnu/textutils/textutils-1.22.tar.gz},
+with more recent versions available from
+@uref{http://ftp.gnu.org/gnu/coreutils}.
 
 None of what I have presented in this column is new.  The Software Tools
 philosophy was first introduced in the book @cite{Software Tools}, by
diff --git a/doc/fdl.texi b/doc/fdl.texi
index cb71f05a..9c3bbe56 100644
--- a/doc/fdl.texi
+++ b/doc/fdl.texi
@@ -97,7 +97,7 @@ format, SGML or XML using a publicly available
 DTD, and standard-conforming simple HTML,
 PostScript or PDF designed for human modification.  Examples
 of transparent image formats include PNG, XCF and
-JPG.  Opaque formats include proprietary formats that can be
+JPG@.  Opaque formats include proprietary formats that can be
 read and edited only by proprietary word processors, SGML or
 XML for which the DTD and/or processing tools are
 not generally available, and the machine-generated HTML,
diff --git a/doc/local.mk b/doc/local.mk
index 3941a1f1..7f8553dc 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -1,7 +1,7 @@
 # Make coreutils documentation.				-*-Makefile-*-
 # This is included by the top-level Makefile.am.
 
-# Copyright (C) 1995-2013 Free Software Foundation, Inc.
+# Copyright (C) 1995-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/doc/parse-datetime.texi b/doc/parse-datetime.texi
index 6b3e973e..7fa3c9ec 100644
--- a/doc/parse-datetime.texi
+++ b/doc/parse-datetime.texi
@@ -1,6 +1,6 @@
 @c GNU date syntax documentation
 
-@c Copyright (C) 1994-2006, 2009-2013 Free Software Foundation, Inc.
+@c Copyright (C) 1994-2006, 2009-2014 Free Software Foundation, Inc.
 
 @c Permission is granted to copy, distribute and/or modify this document
 @c under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/doc/perm.texi b/doc/perm.texi
index 3a2f8d4e..0bccc639 100644
--- a/doc/perm.texi
+++ b/doc/perm.texi
@@ -1,6 +1,6 @@
 @c File mode bits
 
-@c Copyright (C) 1994-2013 Free Software Foundation, Inc.
+@c Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 @c Permission is granted to copy, distribute and/or modify this document
 @c under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -148,7 +148,7 @@ their previous values, and perhaps on the current @code{umask} as well
 The format of symbolic modes is:
 
 @example
-@r{[}ugoa@dots{}@r{][}+-=@r{]}@var{perms}@dots{}@r{[},@dots{}@r{]}
+@r{[}ugoa@dots{}@r{][}-+=@r{]}@var{perms}@dots{}@r{[},@dots{}@r{]}
 @end example
 
 @noindent
diff --git a/doc/stamp-vti b/doc/stamp-vti
index 1d9a98c8..c8d95f1e 100644
--- a/doc/stamp-vti
+++ b/doc/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 11 February 2013
-@set UPDATED-MONTH February 2013
-@set EDITION 8.21
-@set VERSION 8.21
+@set UPDATED 13 July 2014
+@set UPDATED-MONTH July 2014
+@set EDITION 8.23
+@set VERSION 8.23
diff --git a/doc/version.texi b/doc/version.texi
index 1d9a98c8..c8d95f1e 100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 11 February 2013
-@set UPDATED-MONTH February 2013
-@set EDITION 8.21
-@set VERSION 8.21
+@set UPDATED 13 July 2014
+@set UPDATED-MONTH July 2014
+@set EDITION 8.23
+@set VERSION 8.23
diff --git a/gnulib-tests/Makefile.in b/gnulib-tests/Makefile.in
index 1e3f9e99..1047bc75 100644
--- a/gnulib-tests/Makefile.in
+++ b/gnulib-tests/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,7 +14,7 @@
 
 @SET_MAKE@
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 #
 # 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
@@ -40,23 +39,51 @@
 
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -74,8 +101,9 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/gnulib.mk
+DIST_COMMON = $(srcdir)/gnulib.mk $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/build-aux/depcomp \
+	$(noinst_HEADERS) $(top_srcdir)/build-aux/test-driver
 TESTS = test-accept$(EXEEXT) test-file-has-acl.sh \
 	test-file-has-acl-1.sh test-file-has-acl-2.sh \
 	test-set-mode-acl.sh test-set-mode-acl-1.sh \
@@ -154,30 +182,25 @@ TESTS = test-accept$(EXEEXT) test-file-has-acl.sh \
 	test-openat-safer$(EXEEXT) test-openat$(EXEEXT) \
 	test-parse-datetime$(EXEEXT) test-pathmax$(EXEEXT) \
 	test-perror.sh test-perror2$(EXEEXT) test-pipe$(EXEEXT) \
-	test-pipe2$(EXEEXT) \
-	test-posix_spawn_file_actions_addclose$(EXEEXT) \
-	test-posix_spawn_file_actions_adddup2$(EXEEXT) \
-	test-posix_spawn_file_actions_addopen$(EXEEXT) $(am__EXEEXT_1) \
 	test-posixtm$(EXEEXT) test-printf-frexp$(EXEEXT) \
 	test-printf-frexpl$(EXEEXT) test-priv-set$(EXEEXT) \
 	test-quotearg-simple$(EXEEXT) test-raise$(EXEEXT) \
-	test-rand-isaac$(EXEEXT) test-rawmemchr$(EXEEXT) \
-	test-read-file$(EXEEXT) test-read$(EXEEXT) \
-	test-readlink$(EXEEXT) test-readlinkat$(EXEEXT) \
-	test-readtokens.sh test-realloc-gnu$(EXEEXT) \
-	test-regex$(EXEEXT) test-remove$(EXEEXT) test-rename$(EXEEXT) \
-	test-rmdir$(EXEEXT) test-sched$(EXEEXT) test-select$(EXEEXT) \
-	test-select-in.sh test-select-out.sh test-setenv$(EXEEXT) \
-	test-setlocale1.sh test-setlocale2.sh test-setsockopt$(EXEEXT) \
+	test-rand-isaac$(EXEEXT) test-read-file$(EXEEXT) \
+	test-read$(EXEEXT) test-readlink$(EXEEXT) \
+	test-readlinkat$(EXEEXT) test-readtokens.sh \
+	test-realloc-gnu$(EXEEXT) test-regex$(EXEEXT) \
+	test-remove$(EXEEXT) test-rename$(EXEEXT) test-rmdir$(EXEEXT) \
+	test-sched$(EXEEXT) test-select$(EXEEXT) test-select-in.sh \
+	test-select-out.sh test-setenv$(EXEEXT) test-setlocale1.sh \
+	test-setlocale2.sh test-setsockopt$(EXEEXT) \
 	test-sigaction$(EXEEXT) test-signal-h$(EXEEXT) \
 	test-signbit$(EXEEXT) test-sigprocmask$(EXEEXT) \
 	test-sleep$(EXEEXT) test-snprintf$(EXEEXT) \
-	test-sockets$(EXEEXT) test-spawn-pipe.sh test-spawn$(EXEEXT) \
-	test-stat$(EXEEXT) test-stat-time$(EXEEXT) \
-	test-statat$(EXEEXT) test-stdalign$(EXEEXT) \
-	test-stdbool$(EXEEXT) test-stddef$(EXEEXT) \
-	test-stdint$(EXEEXT) test-stdio$(EXEEXT) test-stdlib$(EXEEXT) \
-	test-strchrnul$(EXEEXT) test-strerror$(EXEEXT) \
+	test-sockets$(EXEEXT) test-stat$(EXEEXT) \
+	test-stat-time$(EXEEXT) test-statat$(EXEEXT) \
+	test-stdalign$(EXEEXT) test-stdbool$(EXEEXT) \
+	test-stddef$(EXEEXT) test-stdint$(EXEEXT) test-stdio$(EXEEXT) \
+	test-stdlib$(EXEEXT) test-strerror$(EXEEXT) \
 	test-strerror_r$(EXEEXT) test-strftime$(EXEEXT) \
 	test-striconv$(EXEEXT) test-string$(EXEEXT) \
 	test-strncat$(EXEEXT) test-strnlen$(EXEEXT) \
@@ -198,19 +221,19 @@ TESTS = test-accept$(EXEEXT) test-file-has-acl.sh \
 	test-uc_width$(EXEEXT) uniwidth/test-uc_width2.sh \
 	test-unlink$(EXEEXT) test-unlinkat$(EXEEXT) \
 	test-unsetenv$(EXEEXT) test-update-copyright.sh \
-	test-userspec$(EXEEXT) test-usleep$(EXEEXT) \
-	test-utimens$(EXEEXT) test-utimensat$(EXEEXT) \
-	test-vasnprintf$(EXEEXT) test-vasprintf-posix$(EXEEXT) \
-	test-vasprintf$(EXEEXT) test-vc-list-files-git.sh \
-	test-vc-list-files-cvs.sh test-verify$(EXEEXT) test-verify.sh \
-	test-version-etc.sh test-vfprintf-posix.sh \
-	test-vprintf-posix.sh test-wchar$(EXEEXT) test-wcrtomb.sh \
-	test-wcrtomb-w32-1.sh test-wcrtomb-w32-2.sh \
-	test-wcrtomb-w32-3.sh test-wcrtomb-w32-4.sh \
-	test-wcrtomb-w32-5.sh test-wctype-h$(EXEEXT) \
-	test-wcwidth$(EXEEXT) test-write$(EXEEXT) test-xalloc-die.sh \
-	test-xprintf-posix.sh test-xstrtoimax.sh test-xstrtol.sh \
-	test-xstrtoumax.sh test-xvasprintf$(EXEEXT) test-yesno.sh
+	test-userspec$(EXEEXT) test-utimens$(EXEEXT) \
+	test-utimensat$(EXEEXT) test-vasnprintf$(EXEEXT) \
+	test-vasprintf-posix$(EXEEXT) test-vasprintf$(EXEEXT) \
+	test-vc-list-files-git.sh test-vc-list-files-cvs.sh \
+	test-verify$(EXEEXT) test-verify.sh test-version-etc.sh \
+	test-vfprintf-posix.sh test-vprintf-posix.sh \
+	test-wchar$(EXEEXT) test-wcrtomb.sh test-wcrtomb-w32-1.sh \
+	test-wcrtomb-w32-2.sh test-wcrtomb-w32-3.sh \
+	test-wcrtomb-w32-4.sh test-wcrtomb-w32-5.sh \
+	test-wctype-h$(EXEEXT) test-wcwidth$(EXEEXT) \
+	test-write$(EXEEXT) test-xalloc-die.sh test-xprintf-posix.sh \
+	test-xstrtoimax.sh test-xstrtol.sh test-xstrtoumax.sh \
+	test-xvasprintf$(EXEEXT) test-yesno.sh
 XFAIL_TESTS =
 noinst_PROGRAMS =
 check_PROGRAMS = test-accept$(EXEEXT) test-file-has-acl$(EXEEXT) \
@@ -289,32 +312,26 @@ check_PROGRAMS = test-accept$(EXEEXT) test-file-has-acl$(EXEEXT) \
 	test-openat-safer$(EXEEXT) test-openat$(EXEEXT) \
 	test-parse-datetime$(EXEEXT) test-pathmax$(EXEEXT) \
 	test-perror$(EXEEXT) test-perror2$(EXEEXT) test-pipe$(EXEEXT) \
-	test-pipe2$(EXEEXT) \
-	test-posix_spawn_file_actions_addclose$(EXEEXT) \
-	test-posix_spawn_file_actions_adddup2$(EXEEXT) \
-	test-posix_spawn_file_actions_addopen$(EXEEXT) $(am__EXEEXT_1) \
 	test-posixtm$(EXEEXT) test-printf-frexp$(EXEEXT) \
 	test-printf-frexpl$(EXEEXT) test-priv-set$(EXEEXT) \
 	test-quotearg-simple$(EXEEXT) test-raise$(EXEEXT) \
-	test-rand-isaac$(EXEEXT) test-rawmemchr$(EXEEXT) \
-	test-read-file$(EXEEXT) test-read$(EXEEXT) \
-	test-readlink$(EXEEXT) test-readlinkat$(EXEEXT) \
-	test-readtokens$(EXEEXT) test-realloc-gnu$(EXEEXT) \
-	test-regex$(EXEEXT) test-remove$(EXEEXT) test-rename$(EXEEXT) \
-	test-rmdir$(EXEEXT) test-sched$(EXEEXT) test-select$(EXEEXT) \
+	test-rand-isaac$(EXEEXT) test-read-file$(EXEEXT) \
+	test-read$(EXEEXT) test-readlink$(EXEEXT) \
+	test-readlinkat$(EXEEXT) test-readtokens$(EXEEXT) \
+	test-realloc-gnu$(EXEEXT) test-regex$(EXEEXT) \
+	test-remove$(EXEEXT) test-rename$(EXEEXT) test-rmdir$(EXEEXT) \
+	test-sched$(EXEEXT) test-select$(EXEEXT) \
 	test-select-fd$(EXEEXT) test-select-stdin$(EXEEXT) \
 	test-setenv$(EXEEXT) test-setlocale1$(EXEEXT) \
 	test-setlocale2$(EXEEXT) test-setsockopt$(EXEEXT) \
 	test-sigaction$(EXEEXT) test-signal-h$(EXEEXT) \
 	test-signbit$(EXEEXT) test-sigprocmask$(EXEEXT) \
 	test-sleep$(EXEEXT) test-snprintf$(EXEEXT) \
-	test-sockets$(EXEEXT) test-spawn-pipe-main$(EXEEXT) \
-	test-spawn-pipe-child$(EXEEXT) test-spawn$(EXEEXT) \
-	test-stat$(EXEEXT) test-stat-time$(EXEEXT) \
-	test-statat$(EXEEXT) test-stdalign$(EXEEXT) \
-	test-stdbool$(EXEEXT) test-stddef$(EXEEXT) \
-	test-stdint$(EXEEXT) test-stdio$(EXEEXT) test-stdlib$(EXEEXT) \
-	test-strchrnul$(EXEEXT) test-strerror$(EXEEXT) \
+	test-sockets$(EXEEXT) test-stat$(EXEEXT) \
+	test-stat-time$(EXEEXT) test-statat$(EXEEXT) \
+	test-stdalign$(EXEEXT) test-stdbool$(EXEEXT) \
+	test-stddef$(EXEEXT) test-stdint$(EXEEXT) test-stdio$(EXEEXT) \
+	test-stdlib$(EXEEXT) test-strerror$(EXEEXT) \
 	test-strerror_r$(EXEEXT) test-strftime$(EXEEXT) \
 	test-striconv$(EXEEXT) test-string$(EXEEXT) \
 	test-strncat$(EXEEXT) test-strnlen$(EXEEXT) \
@@ -335,37 +352,28 @@ check_PROGRAMS = test-accept$(EXEEXT) test-file-has-acl$(EXEEXT) \
 	test-uc_width$(EXEEXT) test-uc_width2$(EXEEXT) \
 	test-unlink$(EXEEXT) test-unlinkat$(EXEEXT) \
 	test-unsetenv$(EXEEXT) test-userspec$(EXEEXT) \
-	test-usleep$(EXEEXT) test-utimens$(EXEEXT) \
-	test-utimensat$(EXEEXT) test-vasnprintf$(EXEEXT) \
-	test-vasprintf-posix$(EXEEXT) test-vasprintf$(EXEEXT) \
-	test-verify$(EXEEXT) test-version-etc$(EXEEXT) \
-	test-vfprintf-posix$(EXEEXT) test-vprintf-posix$(EXEEXT) \
-	test-wchar$(EXEEXT) test-wcrtomb$(EXEEXT) \
-	test-wcrtomb-w32$(EXEEXT) test-wctype-h$(EXEEXT) \
-	test-wcwidth$(EXEEXT) test-write$(EXEEXT) \
-	test-xalloc-die$(EXEEXT) test-xfprintf-posix$(EXEEXT) \
-	test-xprintf-posix$(EXEEXT) test-xstrtoimax$(EXEEXT) \
-	test-xstrtol$(EXEEXT) test-xstrtoul$(EXEEXT) \
-	test-xstrtoumax$(EXEEXT) test-xvasprintf$(EXEEXT) \
-	test-yesno$(EXEEXT)
-@POSIX_SPAWN_PORTED_TRUE@am__append_1 = test-posix_spawn1 test-posix_spawn2
-@POSIX_SPAWN_PORTED_TRUE@am__append_2 = test-posix_spawn1 test-posix_spawn2
-@POSIX_SPAWN_PORTED_TRUE@am__append_3 = test-posix_spawn1.sh \
-@POSIX_SPAWN_PORTED_TRUE@	test-posix_spawn2.sh
-@POSIX_SPAWN_PORTED_TRUE@am__append_4 = test-posix_spawn1.sh \
-@POSIX_SPAWN_PORTED_TRUE@	test-posix_spawn1.sh-t \
-@POSIX_SPAWN_PORTED_TRUE@	test-posix_spawn2.sh \
-@POSIX_SPAWN_PORTED_TRUE@	test-posix_spawn2.sh-t
+	test-utimens$(EXEEXT) test-utimensat$(EXEEXT) \
+	test-vasnprintf$(EXEEXT) test-vasprintf-posix$(EXEEXT) \
+	test-vasprintf$(EXEEXT) test-verify$(EXEEXT) \
+	test-version-etc$(EXEEXT) test-vfprintf-posix$(EXEEXT) \
+	test-vprintf-posix$(EXEEXT) test-wchar$(EXEEXT) \
+	test-wcrtomb$(EXEEXT) test-wcrtomb-w32$(EXEEXT) \
+	test-wctype-h$(EXEEXT) test-wcwidth$(EXEEXT) \
+	test-write$(EXEEXT) test-xalloc-die$(EXEEXT) \
+	test-xfprintf-posix$(EXEEXT) test-xprintf-posix$(EXEEXT) \
+	test-xstrtoimax$(EXEEXT) test-xstrtol$(EXEEXT) \
+	test-xstrtoul$(EXEEXT) test-xstrtoumax$(EXEEXT) \
+	test-xvasprintf$(EXEEXT) test-yesno$(EXEEXT)
 subdir = gnulib-tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
-	$(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/alloca.m4 \
-	$(top_srcdir)/m4/arpa_inet_h.m4 $(top_srcdir)/m4/assert.m4 \
-	$(top_srcdir)/m4/autobuild.m4 $(top_srcdir)/m4/backupfile.m4 \
-	$(top_srcdir)/m4/base64.m4 $(top_srcdir)/m4/bison.m4 \
-	$(top_srcdir)/m4/boottime.m4 $(top_srcdir)/m4/btowc.m4 \
-	$(top_srcdir)/m4/c-strtod.m4 $(top_srcdir)/m4/calloc.m4 \
-	$(top_srcdir)/m4/canon-host.m4 \
+	$(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/acl.m4 \
+	$(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/arpa_inet_h.m4 \
+	$(top_srcdir)/m4/assert.m4 $(top_srcdir)/m4/autobuild.m4 \
+	$(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/base64.m4 \
+	$(top_srcdir)/m4/bison.m4 $(top_srcdir)/m4/boottime.m4 \
+	$(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/c-strtod.m4 \
+	$(top_srcdir)/m4/calloc.m4 $(top_srcdir)/m4/canon-host.m4 \
 	$(top_srcdir)/m4/canonicalize.m4 \
 	$(top_srcdir)/m4/chdir-long.m4 $(top_srcdir)/m4/check-decl.m4 \
 	$(top_srcdir)/m4/chown.m4 $(top_srcdir)/m4/clock_time.m4 \
@@ -384,29 +392,28 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
 	$(top_srcdir)/m4/exponentd.m4 $(top_srcdir)/m4/exponentf.m4 \
 	$(top_srcdir)/m4/exponentl.m4 $(top_srcdir)/m4/extensions.m4 \
 	$(top_srcdir)/m4/extern-inline.m4 \
-	$(top_srcdir)/m4/faccessat.m4 $(top_srcdir)/m4/fatal-signal.m4 \
-	$(top_srcdir)/m4/fchdir.m4 $(top_srcdir)/m4/fchmodat.m4 \
-	$(top_srcdir)/m4/fchownat.m4 $(top_srcdir)/m4/fclose.m4 \
-	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/fcntl-safer.m4 \
-	$(top_srcdir)/m4/fcntl.m4 $(top_srcdir)/m4/fcntl_h.m4 \
-	$(top_srcdir)/m4/fdatasync.m4 $(top_srcdir)/m4/fdopen.m4 \
-	$(top_srcdir)/m4/fdopendir.m4 $(top_srcdir)/m4/fflush.m4 \
-	$(top_srcdir)/m4/fileblocks.m4 $(top_srcdir)/m4/filemode.m4 \
-	$(top_srcdir)/m4/filenamecat.m4 $(top_srcdir)/m4/flexmember.m4 \
-	$(top_srcdir)/m4/float_h.m4 $(top_srcdir)/m4/fnmatch.m4 \
-	$(top_srcdir)/m4/fopen.m4 $(top_srcdir)/m4/fpending.m4 \
-	$(top_srcdir)/m4/fpieee.m4 $(top_srcdir)/m4/fpurge.m4 \
-	$(top_srcdir)/m4/freadahead.m4 $(top_srcdir)/m4/freading.m4 \
-	$(top_srcdir)/m4/freadptr.m4 $(top_srcdir)/m4/freadseek.m4 \
-	$(top_srcdir)/m4/freopen.m4 $(top_srcdir)/m4/frexp.m4 \
-	$(top_srcdir)/m4/frexpl.m4 $(top_srcdir)/m4/fseek.m4 \
-	$(top_srcdir)/m4/fseeko.m4 $(top_srcdir)/m4/fseterr.m4 \
-	$(top_srcdir)/m4/fstat.m4 $(top_srcdir)/m4/fstatat.m4 \
-	$(top_srcdir)/m4/fstypename.m4 $(top_srcdir)/m4/fsusage.m4 \
-	$(top_srcdir)/m4/fsync.m4 $(top_srcdir)/m4/ftell.m4 \
-	$(top_srcdir)/m4/ftello.m4 $(top_srcdir)/m4/ftruncate.m4 \
-	$(top_srcdir)/m4/fts.m4 $(top_srcdir)/m4/futimens.m4 \
-	$(top_srcdir)/m4/getaddrinfo.m4 \
+	$(top_srcdir)/m4/faccessat.m4 $(top_srcdir)/m4/fchdir.m4 \
+	$(top_srcdir)/m4/fchmodat.m4 $(top_srcdir)/m4/fchownat.m4 \
+	$(top_srcdir)/m4/fclose.m4 $(top_srcdir)/m4/fcntl-o.m4 \
+	$(top_srcdir)/m4/fcntl-safer.m4 $(top_srcdir)/m4/fcntl.m4 \
+	$(top_srcdir)/m4/fcntl_h.m4 $(top_srcdir)/m4/fdatasync.m4 \
+	$(top_srcdir)/m4/fdopen.m4 $(top_srcdir)/m4/fdopendir.m4 \
+	$(top_srcdir)/m4/fflush.m4 $(top_srcdir)/m4/fileblocks.m4 \
+	$(top_srcdir)/m4/filemode.m4 $(top_srcdir)/m4/filenamecat.m4 \
+	$(top_srcdir)/m4/flexmember.m4 $(top_srcdir)/m4/float_h.m4 \
+	$(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/fopen.m4 \
+	$(top_srcdir)/m4/fpending.m4 $(top_srcdir)/m4/fpieee.m4 \
+	$(top_srcdir)/m4/fpurge.m4 $(top_srcdir)/m4/freadahead.m4 \
+	$(top_srcdir)/m4/freading.m4 $(top_srcdir)/m4/freadptr.m4 \
+	$(top_srcdir)/m4/freadseek.m4 $(top_srcdir)/m4/freopen.m4 \
+	$(top_srcdir)/m4/frexp.m4 $(top_srcdir)/m4/frexpl.m4 \
+	$(top_srcdir)/m4/fseek.m4 $(top_srcdir)/m4/fseeko.m4 \
+	$(top_srcdir)/m4/fseterr.m4 $(top_srcdir)/m4/fstat.m4 \
+	$(top_srcdir)/m4/fstatat.m4 $(top_srcdir)/m4/fstypename.m4 \
+	$(top_srcdir)/m4/fsusage.m4 $(top_srcdir)/m4/fsync.m4 \
+	$(top_srcdir)/m4/ftell.m4 $(top_srcdir)/m4/ftello.m4 \
+	$(top_srcdir)/m4/ftruncate.m4 $(top_srcdir)/m4/fts.m4 \
+	$(top_srcdir)/m4/futimens.m4 $(top_srcdir)/m4/getaddrinfo.m4 \
 	$(top_srcdir)/m4/getcwd-abort-bug.m4 \
 	$(top_srcdir)/m4/getcwd-path-max.m4 $(top_srcdir)/m4/getcwd.m4 \
 	$(top_srcdir)/m4/getdelim.m4 $(top_srcdir)/m4/getdtablesize.m4 \
@@ -418,7 +425,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
 	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettime.m4 \
 	$(top_srcdir)/m4/gettimeofday.m4 \
 	$(top_srcdir)/m4/getugroups.m4 \
-	$(top_srcdir)/m4/getusershell.m4 $(top_srcdir)/m4/glibc21.m4 \
+	$(top_srcdir)/m4/getusershell.m4 \
+	$(top_srcdir)/m4/gl-openssl.m4 $(top_srcdir)/m4/glibc21.m4 \
 	$(top_srcdir)/m4/gmp.m4 $(top_srcdir)/m4/gnu-make.m4 \
 	$(top_srcdir)/m4/gnulib-common.m4 \
 	$(top_srcdir)/m4/gnulib-comp.m4 \
@@ -482,41 +490,38 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
 	$(top_srcdir)/m4/opendir.m4 $(top_srcdir)/m4/parse-datetime.m4 \
 	$(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/perl.m4 \
 	$(top_srcdir)/m4/perror.m4 $(top_srcdir)/m4/physmem.m4 \
-	$(top_srcdir)/m4/pipe.m4 $(top_srcdir)/m4/pipe2.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/posix-shell.m4 \
-	$(top_srcdir)/m4/posix_spawn.m4 $(top_srcdir)/m4/posixtm.m4 \
+	$(top_srcdir)/m4/pipe.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/posix-shell.m4 $(top_srcdir)/m4/posixtm.m4 \
 	$(top_srcdir)/m4/posixver.m4 $(top_srcdir)/m4/prereq.m4 \
 	$(top_srcdir)/m4/printf-frexp.m4 \
 	$(top_srcdir)/m4/printf-frexpl.m4 $(top_srcdir)/m4/printf.m4 \
 	$(top_srcdir)/m4/priv-set.m4 $(top_srcdir)/m4/progtest.m4 \
 	$(top_srcdir)/m4/pthread.m4 $(top_srcdir)/m4/putenv.m4 \
 	$(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \
-	$(top_srcdir)/m4/raise.m4 $(top_srcdir)/m4/rawmemchr.m4 \
-	$(top_srcdir)/m4/read-file.m4 $(top_srcdir)/m4/read.m4 \
-	$(top_srcdir)/m4/readdir.m4 $(top_srcdir)/m4/readlink.m4 \
-	$(top_srcdir)/m4/readlinkat.m4 $(top_srcdir)/m4/readtokens.m4 \
-	$(top_srcdir)/m4/readutmp.m4 $(top_srcdir)/m4/realloc.m4 \
-	$(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/remove.m4 \
-	$(top_srcdir)/m4/rename.m4 $(top_srcdir)/m4/rewinddir.m4 \
-	$(top_srcdir)/m4/rmdir.m4 $(top_srcdir)/m4/rpmatch.m4 \
-	$(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/safe-write.m4 \
-	$(top_srcdir)/m4/same.m4 $(top_srcdir)/m4/save-cwd.m4 \
-	$(top_srcdir)/m4/savedir.m4 $(top_srcdir)/m4/savewd.m4 \
-	$(top_srcdir)/m4/sched_h.m4 $(top_srcdir)/m4/select.m4 \
+	$(top_srcdir)/m4/raise.m4 $(top_srcdir)/m4/read-file.m4 \
+	$(top_srcdir)/m4/read.m4 $(top_srcdir)/m4/readdir.m4 \
+	$(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/readlinkat.m4 \
+	$(top_srcdir)/m4/readtokens.m4 $(top_srcdir)/m4/readutmp.m4 \
+	$(top_srcdir)/m4/realloc.m4 $(top_srcdir)/m4/regex.m4 \
+	$(top_srcdir)/m4/remove.m4 $(top_srcdir)/m4/rename.m4 \
+	$(top_srcdir)/m4/rewinddir.m4 $(top_srcdir)/m4/rmdir.m4 \
+	$(top_srcdir)/m4/rpmatch.m4 $(top_srcdir)/m4/safe-read.m4 \
+	$(top_srcdir)/m4/safe-write.m4 $(top_srcdir)/m4/same.m4 \
+	$(top_srcdir)/m4/save-cwd.m4 $(top_srcdir)/m4/savedir.m4 \
+	$(top_srcdir)/m4/savewd.m4 $(top_srcdir)/m4/sched_h.m4 \
+	$(top_srcdir)/m4/secure_getenv.m4 $(top_srcdir)/m4/select.m4 \
 	$(top_srcdir)/m4/selinux-context-h.m4 \
 	$(top_srcdir)/m4/selinux-selinux-h.m4 \
 	$(top_srcdir)/m4/servent.m4 $(top_srcdir)/m4/setenv.m4 \
 	$(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/settime.m4 \
 	$(top_srcdir)/m4/sha1.m4 $(top_srcdir)/m4/sha256.m4 \
 	$(top_srcdir)/m4/sha512.m4 $(top_srcdir)/m4/sig2str.m4 \
-	$(top_srcdir)/m4/sig_atomic_t.m4 $(top_srcdir)/m4/sigaction.m4 \
-	$(top_srcdir)/m4/signal_h.m4 \
+	$(top_srcdir)/m4/sigaction.m4 $(top_srcdir)/m4/signal_h.m4 \
 	$(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/signbit.m4 \
 	$(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/sleep.m4 \
 	$(top_srcdir)/m4/snprintf.m4 $(top_srcdir)/m4/socketlib.m4 \
 	$(top_srcdir)/m4/sockets.m4 $(top_srcdir)/m4/socklen.m4 \
-	$(top_srcdir)/m4/sockpfaf.m4 $(top_srcdir)/m4/spawn-pipe.m4 \
-	$(top_srcdir)/m4/spawn_h.m4 $(top_srcdir)/m4/ssize_t.m4 \
+	$(top_srcdir)/m4/sockpfaf.m4 $(top_srcdir)/m4/ssize_t.m4 \
 	$(top_srcdir)/m4/st_dm_mode.m4 $(top_srcdir)/m4/stat-prog.m4 \
 	$(top_srcdir)/m4/stat-size.m4 $(top_srcdir)/m4/stat-time.m4 \
 	$(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdalign.m4 \
@@ -524,17 +529,16 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
 	$(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \
 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio_h.m4 \
 	$(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/stpcpy.m4 \
-	$(top_srcdir)/m4/stpncpy.m4 $(top_srcdir)/m4/strchrnul.m4 \
-	$(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \
-	$(top_srcdir)/m4/strerror_r.m4 $(top_srcdir)/m4/strftime.m4 \
-	$(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strncat.m4 \
-	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strsignal.m4 \
-	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
-	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
-	$(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/symlinkat.m4 \
-	$(top_srcdir)/m4/sys_ioctl_h.m4 \
+	$(top_srcdir)/m4/stpncpy.m4 $(top_srcdir)/m4/strdup.m4 \
+	$(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/strerror_r.m4 \
+	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/string_h.m4 \
+	$(top_srcdir)/m4/strncat.m4 $(top_srcdir)/m4/strndup.m4 \
+	$(top_srcdir)/m4/strnlen.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strsignal.m4 $(top_srcdir)/m4/strstr.m4 \
+	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoull.m4 \
+	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/symlink.m4 \
+	$(top_srcdir)/m4/symlinkat.m4 $(top_srcdir)/m4/sys_ioctl_h.m4 \
 	$(top_srcdir)/m4/sys_resource_h.m4 \
 	$(top_srcdir)/m4/sys_select_h.m4 \
 	$(top_srcdir)/m4/sys_socket_h.m4 \
@@ -553,28 +557,25 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
 	$(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlinkat.m4 \
 	$(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/unlocked-io.m4 \
 	$(top_srcdir)/m4/uptime.m4 $(top_srcdir)/m4/userspec.m4 \
-	$(top_srcdir)/m4/usleep.m4 $(top_srcdir)/m4/utimbuf.m4 \
-	$(top_srcdir)/m4/utimecmp.m4 $(top_srcdir)/m4/utimens.m4 \
-	$(top_srcdir)/m4/utimensat.m4 $(top_srcdir)/m4/utimes.m4 \
-	$(top_srcdir)/m4/vasnprintf.m4 \
+	$(top_srcdir)/m4/utimbuf.m4 $(top_srcdir)/m4/utimecmp.m4 \
+	$(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimensat.m4 \
+	$(top_srcdir)/m4/utimes.m4 $(top_srcdir)/m4/vasnprintf.m4 \
 	$(top_srcdir)/m4/vasprintf-posix.m4 \
 	$(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/version-etc.m4 \
 	$(top_srcdir)/m4/vfprintf-posix.m4 \
-	$(top_srcdir)/m4/vprintf-posix.m4 \
-	$(top_srcdir)/m4/wait-process.m4 $(top_srcdir)/m4/waitpid.m4 \
-	$(top_srcdir)/m4/warnings.m4 $(top_srcdir)/m4/wchar_h.m4 \
-	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \
-	$(top_srcdir)/m4/wcswidth.m4 $(top_srcdir)/m4/wctob.m4 \
-	$(top_srcdir)/m4/wctomb.m4 $(top_srcdir)/m4/wctype_h.m4 \
-	$(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wint_t.m4 \
-	$(top_srcdir)/m4/write-any-file.m4 $(top_srcdir)/m4/write.m4 \
-	$(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xattr.m4 \
-	$(top_srcdir)/m4/xgetcwd.m4 $(top_srcdir)/m4/xnanosleep.m4 \
-	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/xstrndup.m4 \
-	$(top_srcdir)/m4/xstrtod.m4 $(top_srcdir)/m4/xstrtol.m4 \
-	$(top_srcdir)/m4/xvasprintf.m4 $(top_srcdir)/m4/yesno.m4 \
-	$(top_srcdir)/m4/yield.m4 $(top_srcdir)/m4/cu-progs.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/vprintf-posix.m4 $(top_srcdir)/m4/warnings.m4 \
+	$(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \
+	$(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wcswidth.m4 \
+	$(top_srcdir)/m4/wctob.m4 $(top_srcdir)/m4/wctomb.m4 \
+	$(top_srcdir)/m4/wctype_h.m4 $(top_srcdir)/m4/wcwidth.m4 \
+	$(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/write-any-file.m4 \
+	$(top_srcdir)/m4/write.m4 $(top_srcdir)/m4/xalloc.m4 \
+	$(top_srcdir)/m4/xattr.m4 $(top_srcdir)/m4/xgetcwd.m4 \
+	$(top_srcdir)/m4/xnanosleep.m4 $(top_srcdir)/m4/xsize.m4 \
+	$(top_srcdir)/m4/xstrndup.m4 $(top_srcdir)/m4/xstrtod.m4 \
+	$(top_srcdir)/m4/xstrtol.m4 $(top_srcdir)/m4/xvasprintf.m4 \
+	$(top_srcdir)/m4/yesno.m4 $(top_srcdir)/m4/yield.m4 \
+	$(top_srcdir)/m4/cu-progs.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -584,20 +585,16 @@ CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 AM_V_AR = $(am__v_AR_@AM_V@)
 am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
-am__v_AR_0 = @echo "  AR    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
 libtests_a_AR = $(AR) $(ARFLAGS)
 am__DEPENDENCIES_1 =
 am__dirstamp = $(am__leading_dot)dirstamp
-am_libtests_a_OBJECTS = localename.$(OBJEXT) glthread/thread.$(OBJEXT) \
-	unlinkdir.$(OBJEXT)
+am_libtests_a_OBJECTS = binary-io.$(OBJEXT) localename.$(OBJEXT) \
+	glthread/thread.$(OBJEXT) unlinkdir.$(OBJEXT)
 libtests_a_OBJECTS = $(am_libtests_a_OBJECTS)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)" \
 	"$(DESTDIR)$(man1dir)"
-@POSIX_SPAWN_PORTED_TRUE@am__EXEEXT_1 = test-posix_spawn1$(EXEEXT) \
-@POSIX_SPAWN_PORTED_TRUE@	test-posix_spawn2$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(pkglibexec_PROGRAMS)
 test_accept_SOURCES = test-accept.c
 test_accept_OBJECTS = test-accept.$(OBJEXT)
@@ -693,9 +690,7 @@ test_chdir_DEPENDENCIES = libtests.a ../lib/libcoreutils.a libtests.a \
 	$(am__DEPENDENCIES_1)
 test_chown_SOURCES = test-chown.c
 test_chown_OBJECTS = test-chown.$(OBJEXT)
-test_chown_LDADD = $(LDADD)
-test_chown_DEPENDENCIES = libtests.a ../lib/libcoreutils.a libtests.a \
-	$(am__DEPENDENCIES_1)
+test_chown_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
 test_cloexec_SOURCES = test-cloexec.c
 test_cloexec_OBJECTS = test-cloexec.$(OBJEXT)
 test_cloexec_LDADD = $(LDADD)
@@ -766,7 +761,8 @@ test_errno_DEPENDENCIES = libtests.a ../lib/libcoreutils.a libtests.a \
 	$(am__DEPENDENCIES_1)
 test_exclude_SOURCES = test-exclude.c
 test_exclude_OBJECTS = test-exclude.$(OBJEXT)
-test_exclude_DEPENDENCIES = $(am__DEPENDENCIES_2)
+test_exclude_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+	$(am__DEPENDENCIES_1)
 test_faccessat_SOURCES = test-faccessat.c
 test_faccessat_OBJECTS = test-faccessat.$(OBJEXT)
 test_faccessat_DEPENDENCIES = $(am__DEPENDENCIES_2) \
@@ -784,7 +780,8 @@ test_fchmodat_OBJECTS = test-fchmodat.$(OBJEXT)
 test_fchmodat_DEPENDENCIES = $(am__DEPENDENCIES_2)
 test_fchownat_SOURCES = test-fchownat.c
 test_fchownat_OBJECTS = test-fchownat.$(OBJEXT)
-test_fchownat_DEPENDENCIES = $(am__DEPENDENCIES_2)
+test_fchownat_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+	$(am__DEPENDENCIES_1)
 test_fclose_SOURCES = test-fclose.c
 test_fclose_OBJECTS = test-fclose.$(OBJEXT)
 test_fclose_LDADD = $(LDADD)
@@ -820,7 +817,7 @@ test_fdopendir_DEPENDENCIES = $(am__DEPENDENCIES_2)
 test_fdutimensat_SOURCES = test-fdutimensat.c
 test_fdutimensat_OBJECTS = test-fdutimensat.$(OBJEXT)
 test_fdutimensat_DEPENDENCIES = $(am__DEPENDENCIES_2) \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 test_fflush_SOURCES = test-fflush.c
 test_fflush_OBJECTS = test-fflush.$(OBJEXT)
 test_fflush_LDADD = $(LDADD)
@@ -1005,7 +1002,7 @@ test_ftruncate_DEPENDENCIES = libtests.a ../lib/libcoreutils.a \
 test_futimens_SOURCES = test-futimens.c
 test_futimens_OBJECTS = test-futimens.$(OBJEXT)
 test_futimens_DEPENDENCIES = $(am__DEPENDENCIES_2) \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 test_fwrite_SOURCES = test-fwrite.c
 test_fwrite_OBJECTS = test-fwrite.$(OBJEXT)
 test_fwrite_LDADD = $(LDADD)
@@ -1156,9 +1153,7 @@ test_langinfo_DEPENDENCIES = libtests.a ../lib/libcoreutils.a \
 	libtests.a $(am__DEPENDENCIES_1)
 test_lchown_SOURCES = test-lchown.c
 test_lchown_OBJECTS = test-lchown.$(OBJEXT)
-test_lchown_LDADD = $(LDADD)
-test_lchown_DEPENDENCIES = libtests.a ../lib/libcoreutils.a libtests.a \
-	$(am__DEPENDENCIES_1)
+test_lchown_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
 test_link_SOURCES = test-link.c
 test_link_OBJECTS = test-link.$(OBJEXT)
 test_link_DEPENDENCIES = $(am__DEPENDENCIES_2)
@@ -1259,9 +1254,7 @@ test_mbsstr3_DEPENDENCIES = libtests.a ../lib/libcoreutils.a \
 	libtests.a $(am__DEPENDENCIES_1)
 test_md5_SOURCES = test-md5.c
 test_md5_OBJECTS = test-md5.$(OBJEXT)
-test_md5_LDADD = $(LDADD)
-test_md5_DEPENDENCIES = libtests.a ../lib/libcoreutils.a libtests.a \
-	$(am__DEPENDENCIES_1)
+test_md5_DEPENDENCIES = $(am__DEPENDENCIES_2)
 test_memcasecmp_SOURCES = test-memcasecmp.c
 test_memcasecmp_OBJECTS = test-memcasecmp.$(OBJEXT)
 test_memcasecmp_LDADD = $(LDADD)
@@ -1356,40 +1349,6 @@ test_pipe_OBJECTS = test-pipe.$(OBJEXT)
 test_pipe_LDADD = $(LDADD)
 test_pipe_DEPENDENCIES = libtests.a ../lib/libcoreutils.a libtests.a \
 	$(am__DEPENDENCIES_1)
-test_pipe2_SOURCES = test-pipe2.c
-test_pipe2_OBJECTS = test-pipe2.$(OBJEXT)
-test_pipe2_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
-test_posix_spawn1_SOURCES = test-posix_spawn1.c
-test_posix_spawn1_OBJECTS = test-posix_spawn1.$(OBJEXT)
-test_posix_spawn1_LDADD = $(LDADD)
-test_posix_spawn1_DEPENDENCIES = libtests.a ../lib/libcoreutils.a \
-	libtests.a $(am__DEPENDENCIES_1)
-test_posix_spawn2_SOURCES = test-posix_spawn2.c
-test_posix_spawn2_OBJECTS = test-posix_spawn2.$(OBJEXT)
-test_posix_spawn2_LDADD = $(LDADD)
-test_posix_spawn2_DEPENDENCIES = libtests.a ../lib/libcoreutils.a \
-	libtests.a $(am__DEPENDENCIES_1)
-test_posix_spawn_file_actions_addclose_SOURCES =  \
-	test-posix_spawn_file_actions_addclose.c
-test_posix_spawn_file_actions_addclose_OBJECTS =  \
-	test-posix_spawn_file_actions_addclose.$(OBJEXT)
-test_posix_spawn_file_actions_addclose_LDADD = $(LDADD)
-test_posix_spawn_file_actions_addclose_DEPENDENCIES = libtests.a \
-	../lib/libcoreutils.a libtests.a $(am__DEPENDENCIES_1)
-test_posix_spawn_file_actions_adddup2_SOURCES =  \
-	test-posix_spawn_file_actions_adddup2.c
-test_posix_spawn_file_actions_adddup2_OBJECTS =  \
-	test-posix_spawn_file_actions_adddup2.$(OBJEXT)
-test_posix_spawn_file_actions_adddup2_LDADD = $(LDADD)
-test_posix_spawn_file_actions_adddup2_DEPENDENCIES = libtests.a \
-	../lib/libcoreutils.a libtests.a $(am__DEPENDENCIES_1)
-test_posix_spawn_file_actions_addopen_SOURCES =  \
-	test-posix_spawn_file_actions_addopen.c
-test_posix_spawn_file_actions_addopen_OBJECTS =  \
-	test-posix_spawn_file_actions_addopen.$(OBJEXT)
-test_posix_spawn_file_actions_addopen_LDADD = $(LDADD)
-test_posix_spawn_file_actions_addopen_DEPENDENCIES = libtests.a \
-	../lib/libcoreutils.a libtests.a $(am__DEPENDENCIES_1)
 test_posixtm_SOURCES = test-posixtm.c
 test_posixtm_OBJECTS = test-posixtm.$(OBJEXT)
 test_posixtm_LDADD = $(LDADD)
@@ -1423,11 +1382,6 @@ test_rand_isaac_OBJECTS = test-rand-isaac.$(OBJEXT)
 test_rand_isaac_LDADD = $(LDADD)
 test_rand_isaac_DEPENDENCIES = libtests.a ../lib/libcoreutils.a \
 	libtests.a $(am__DEPENDENCIES_1)
-test_rawmemchr_SOURCES = test-rawmemchr.c
-test_rawmemchr_OBJECTS = test-rawmemchr.$(OBJEXT)
-test_rawmemchr_LDADD = $(LDADD)
-test_rawmemchr_DEPENDENCIES = libtests.a ../lib/libcoreutils.a \
-	libtests.a $(am__DEPENDENCIES_1)
 test_read_SOURCES = test-read.c
 test_read_OBJECTS = test-read.$(OBJEXT)
 test_read_LDADD = $(LDADD)
@@ -1456,7 +1410,8 @@ test_realloc_gnu_DEPENDENCIES = libtests.a ../lib/libcoreutils.a \
 	libtests.a $(am__DEPENDENCIES_1)
 test_regex_SOURCES = test-regex.c
 test_regex_OBJECTS = test-regex.$(OBJEXT)
-test_regex_DEPENDENCIES = $(am__DEPENDENCIES_2)
+test_regex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 test_remove_SOURCES = test-remove.c
 test_remove_OBJECTS = test-remove.$(OBJEXT)
 test_remove_LDADD = $(LDADD)
@@ -1512,9 +1467,7 @@ test_setsockopt_OBJECTS = test-setsockopt.$(OBJEXT)
 test_setsockopt_DEPENDENCIES = $(am__DEPENDENCIES_2)
 test_sha1_SOURCES = test-sha1.c
 test_sha1_OBJECTS = test-sha1.$(OBJEXT)
-test_sha1_LDADD = $(LDADD)
-test_sha1_DEPENDENCIES = libtests.a ../lib/libcoreutils.a libtests.a \
-	$(am__DEPENDENCIES_1)
+test_sha1_DEPENDENCIES = $(am__DEPENDENCIES_2)
 test_sigaction_SOURCES = test-sigaction.c
 test_sigaction_OBJECTS = test-sigaction.$(OBJEXT)
 test_sigaction_LDADD = $(LDADD)
@@ -1548,25 +1501,13 @@ test_snprintf_DEPENDENCIES = libtests.a ../lib/libcoreutils.a \
 test_sockets_SOURCES = test-sockets.c
 test_sockets_OBJECTS = test-sockets.$(OBJEXT)
 test_sockets_DEPENDENCIES = $(am__DEPENDENCIES_2)
-test_spawn_SOURCES = test-spawn.c
-test_spawn_OBJECTS = test-spawn.$(OBJEXT)
-test_spawn_LDADD = $(LDADD)
-test_spawn_DEPENDENCIES = libtests.a ../lib/libcoreutils.a libtests.a \
-	$(am__DEPENDENCIES_1)
-test_spawn_pipe_child_SOURCES = test-spawn-pipe-child.c
-test_spawn_pipe_child_OBJECTS = test-spawn-pipe-child.$(OBJEXT)
-test_spawn_pipe_child_DEPENDENCIES =
-test_spawn_pipe_main_SOURCES = test-spawn-pipe-main.c
-test_spawn_pipe_main_OBJECTS = test-spawn-pipe-main.$(OBJEXT)
-test_spawn_pipe_main_DEPENDENCIES = $(am__DEPENDENCIES_2)
 test_stat_SOURCES = test-stat.c
 test_stat_OBJECTS = test-stat.$(OBJEXT)
 test_stat_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
 test_stat_time_SOURCES = test-stat-time.c
 test_stat_time_OBJECTS = test-stat-time.$(OBJEXT)
-test_stat_time_LDADD = $(LDADD)
-test_stat_time_DEPENDENCIES = libtests.a ../lib/libcoreutils.a \
-	libtests.a $(am__DEPENDENCIES_1)
+test_stat_time_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+	$(am__DEPENDENCIES_1)
 test_statat_SOURCES = test-statat.c
 test_statat_OBJECTS = test-statat.$(OBJEXT)
 test_statat_DEPENDENCIES = $(am__DEPENDENCIES_2)
@@ -1600,11 +1541,6 @@ test_stdlib_OBJECTS = test-stdlib.$(OBJEXT)
 test_stdlib_LDADD = $(LDADD)
 test_stdlib_DEPENDENCIES = libtests.a ../lib/libcoreutils.a libtests.a \
 	$(am__DEPENDENCIES_1)
-test_strchrnul_SOURCES = test-strchrnul.c
-test_strchrnul_OBJECTS = test-strchrnul.$(OBJEXT)
-test_strchrnul_LDADD = $(LDADD)
-test_strchrnul_DEPENDENCIES = libtests.a ../lib/libcoreutils.a \
-	libtests.a $(am__DEPENDENCIES_1)
 test_strerror_SOURCES = test-strerror.c
 test_strerror_OBJECTS = test-strerror.$(OBJEXT)
 test_strerror_LDADD = $(LDADD)
@@ -1787,19 +1723,14 @@ test_unsetenv_DEPENDENCIES = libtests.a ../lib/libcoreutils.a \
 test_userspec_SOURCES = test-userspec.c
 test_userspec_OBJECTS = test-userspec.$(OBJEXT)
 test_userspec_DEPENDENCIES = $(am__DEPENDENCIES_2)
-test_usleep_SOURCES = test-usleep.c
-test_usleep_OBJECTS = test-usleep.$(OBJEXT)
-test_usleep_LDADD = $(LDADD)
-test_usleep_DEPENDENCIES = libtests.a ../lib/libcoreutils.a libtests.a \
-	$(am__DEPENDENCIES_1)
 test_utimens_SOURCES = test-utimens.c
 test_utimens_OBJECTS = test-utimens.$(OBJEXT)
 test_utimens_DEPENDENCIES = $(am__DEPENDENCIES_2) \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 test_utimensat_SOURCES = test-utimensat.c
 test_utimensat_OBJECTS = test-utimensat.$(OBJEXT)
 test_utimensat_DEPENDENCIES = $(am__DEPENDENCIES_2) \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 test_vasnprintf_SOURCES = test-vasnprintf.c
 test_vasnprintf_OBJECTS = test-vasnprintf.$(OBJEXT)
 test_vasnprintf_LDADD = $(LDADD)
@@ -1892,6 +1823,18 @@ test_xvasprintf_LINK = $(CCLD) $(test_xvasprintf_CFLAGS) $(CFLAGS) \
 test_yesno_SOURCES = test-yesno.c
 test_yesno_OBJECTS = test-yesno.$(OBJEXT)
 test_yesno_DEPENDENCIES = $(am__DEPENDENCIES_2)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/lib
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -1899,19 +1842,19 @@ am__mv = mv -f
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	test-accept.c test-alignof.c test-alloca-opt.c \
 	test-areadlink.c test-areadlink-with-size.c test-areadlinkat.c \
@@ -1959,42 +1902,36 @@ SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	test-mkfifo.c test-mknod.c test-nanosleep.c test-netdb.c \
 	test-netinet_in.c test-nl_langinfo.c test-open.c test-openat.c \
 	test-openat-safer.c test-parse-datetime.c test-pathmax.c \
-	test-perror.c test-perror2.c test-pipe.c test-pipe2.c \
-	test-posix_spawn1.c test-posix_spawn2.c \
-	test-posix_spawn_file_actions_addclose.c \
-	test-posix_spawn_file_actions_adddup2.c \
-	test-posix_spawn_file_actions_addopen.c test-posixtm.c \
+	test-perror.c test-perror2.c test-pipe.c test-posixtm.c \
 	test-printf-frexp.c test-printf-frexpl.c test-priv-set.c \
 	test-quotearg-simple.c test-raise.c test-rand-isaac.c \
-	test-rawmemchr.c test-read.c test-read-file.c test-readlink.c \
-	test-readlinkat.c test-readtokens.c test-realloc-gnu.c \
-	test-regex.c test-remove.c test-rename.c test-rmdir.c \
-	test-sameacls.c test-sched.c test-select.c test-select-fd.c \
+	test-read.c test-read-file.c test-readlink.c test-readlinkat.c \
+	test-readtokens.c test-realloc-gnu.c test-regex.c \
+	test-remove.c test-rename.c test-rmdir.c test-sameacls.c \
+	test-sched.c test-select.c test-select-fd.c \
 	test-select-stdin.c test-set-mode-acl.c test-setenv.c \
 	test-setlocale1.c test-setlocale2.c test-setsockopt.c \
 	test-sha1.c test-sigaction.c test-signal-h.c test-signbit.c \
 	test-sigprocmask.c test-sleep.c test-snprintf.c test-sockets.c \
-	test-spawn.c test-spawn-pipe-child.c test-spawn-pipe-main.c \
 	test-stat.c test-stat-time.c test-statat.c test-stdalign.c \
 	test-stdbool.c test-stddef.c test-stdint.c test-stdio.c \
-	test-stdlib.c test-strchrnul.c test-strerror.c \
-	test-strerror_r.c test-strftime.c test-striconv.c \
-	test-string.c test-strncat.c test-strnlen.c test-strsignal.c \
-	test-strtod.c test-strtoimax.c test-strtoll.c test-strtoull.c \
-	test-strtoumax.c test-symlink.c test-symlinkat.c \
-	test-sys_ioctl.c test-sys_resource.c test-sys_select.c \
-	test-sys_socket.c test-sys_stat.c test-sys_time.c \
-	test-sys_types.c test-sys_uio.c test-sys_utsname.c \
-	test-sys_wait.c test-termios.c test-thread_create.c \
-	test-thread_self.c test-time.c test-tls.c test-u64.c \
-	$(test_u8_mbtoucr_SOURCES) $(test_u8_uctomb_SOURCES) \
-	$(test_uc_width_SOURCES) $(test_uc_width2_SOURCES) \
-	test-uname.c test-unistd.c test-unlink.c test-unlinkat.c \
-	test-unsetenv.c test-userspec.c test-usleep.c test-utimens.c \
-	test-utimensat.c test-vasnprintf.c test-vasprintf.c \
-	test-vasprintf-posix.c test-verify.c test-version-etc.c \
-	test-vfprintf-posix.c test-vprintf-posix.c test-wchar.c \
-	test-wcrtomb.c test-wcrtomb-w32.c test-wctype-h.c \
+	test-stdlib.c test-strerror.c test-strerror_r.c \
+	test-strftime.c test-striconv.c test-string.c test-strncat.c \
+	test-strnlen.c test-strsignal.c test-strtod.c test-strtoimax.c \
+	test-strtoll.c test-strtoull.c test-strtoumax.c test-symlink.c \
+	test-symlinkat.c test-sys_ioctl.c test-sys_resource.c \
+	test-sys_select.c test-sys_socket.c test-sys_stat.c \
+	test-sys_time.c test-sys_types.c test-sys_uio.c \
+	test-sys_utsname.c test-sys_wait.c test-termios.c \
+	test-thread_create.c test-thread_self.c test-time.c test-tls.c \
+	test-u64.c $(test_u8_mbtoucr_SOURCES) \
+	$(test_u8_uctomb_SOURCES) $(test_uc_width_SOURCES) \
+	$(test_uc_width2_SOURCES) test-uname.c test-unistd.c \
+	test-unlink.c test-unlinkat.c test-unsetenv.c test-userspec.c \
+	test-utimens.c test-utimensat.c test-vasnprintf.c \
+	test-vasprintf.c test-vasprintf-posix.c test-verify.c \
+	test-version-etc.c test-vfprintf-posix.c test-vprintf-posix.c \
+	test-wchar.c test-wcrtomb.c test-wcrtomb-w32.c test-wctype-h.c \
 	test-wcwidth.c test-write.c test-xalloc-die.c \
 	test-xfprintf-posix.c test-xprintf-posix.c test-xstrtoimax.c \
 	test-xstrtol.c test-xstrtoul.c test-xstrtoumax.c \
@@ -2046,53 +1983,48 @@ DIST_SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	test-mkfifo.c test-mknod.c test-nanosleep.c test-netdb.c \
 	test-netinet_in.c test-nl_langinfo.c test-open.c test-openat.c \
 	test-openat-safer.c test-parse-datetime.c test-pathmax.c \
-	test-perror.c test-perror2.c test-pipe.c test-pipe2.c \
-	test-posix_spawn1.c test-posix_spawn2.c \
-	test-posix_spawn_file_actions_addclose.c \
-	test-posix_spawn_file_actions_adddup2.c \
-	test-posix_spawn_file_actions_addopen.c test-posixtm.c \
+	test-perror.c test-perror2.c test-pipe.c test-posixtm.c \
 	test-printf-frexp.c test-printf-frexpl.c test-priv-set.c \
 	test-quotearg-simple.c test-raise.c test-rand-isaac.c \
-	test-rawmemchr.c test-read.c test-read-file.c test-readlink.c \
-	test-readlinkat.c test-readtokens.c test-realloc-gnu.c \
-	test-regex.c test-remove.c test-rename.c test-rmdir.c \
-	test-sameacls.c test-sched.c test-select.c test-select-fd.c \
+	test-read.c test-read-file.c test-readlink.c test-readlinkat.c \
+	test-readtokens.c test-realloc-gnu.c test-regex.c \
+	test-remove.c test-rename.c test-rmdir.c test-sameacls.c \
+	test-sched.c test-select.c test-select-fd.c \
 	test-select-stdin.c test-set-mode-acl.c test-setenv.c \
 	test-setlocale1.c test-setlocale2.c test-setsockopt.c \
 	test-sha1.c test-sigaction.c test-signal-h.c test-signbit.c \
 	test-sigprocmask.c test-sleep.c test-snprintf.c test-sockets.c \
-	test-spawn.c test-spawn-pipe-child.c test-spawn-pipe-main.c \
 	test-stat.c test-stat-time.c test-statat.c test-stdalign.c \
 	test-stdbool.c test-stddef.c test-stdint.c test-stdio.c \
-	test-stdlib.c test-strchrnul.c test-strerror.c \
-	test-strerror_r.c test-strftime.c test-striconv.c \
-	test-string.c test-strncat.c test-strnlen.c test-strsignal.c \
-	test-strtod.c test-strtoimax.c test-strtoll.c test-strtoull.c \
-	test-strtoumax.c test-symlink.c test-symlinkat.c \
-	test-sys_ioctl.c test-sys_resource.c test-sys_select.c \
-	test-sys_socket.c test-sys_stat.c test-sys_time.c \
-	test-sys_types.c test-sys_uio.c test-sys_utsname.c \
-	test-sys_wait.c test-termios.c test-thread_create.c \
-	test-thread_self.c test-time.c test-tls.c test-u64.c \
-	$(test_u8_mbtoucr_SOURCES) $(test_u8_uctomb_SOURCES) \
-	$(test_uc_width_SOURCES) $(test_uc_width2_SOURCES) \
-	test-uname.c test-unistd.c test-unlink.c test-unlinkat.c \
-	test-unsetenv.c test-userspec.c test-usleep.c test-utimens.c \
-	test-utimensat.c test-vasnprintf.c test-vasprintf.c \
-	test-vasprintf-posix.c test-verify.c test-version-etc.c \
-	test-vfprintf-posix.c test-vprintf-posix.c test-wchar.c \
-	test-wcrtomb.c test-wcrtomb-w32.c test-wctype-h.c \
+	test-stdlib.c test-strerror.c test-strerror_r.c \
+	test-strftime.c test-striconv.c test-string.c test-strncat.c \
+	test-strnlen.c test-strsignal.c test-strtod.c test-strtoimax.c \
+	test-strtoll.c test-strtoull.c test-strtoumax.c test-symlink.c \
+	test-symlinkat.c test-sys_ioctl.c test-sys_resource.c \
+	test-sys_select.c test-sys_socket.c test-sys_stat.c \
+	test-sys_time.c test-sys_types.c test-sys_uio.c \
+	test-sys_utsname.c test-sys_wait.c test-termios.c \
+	test-thread_create.c test-thread_self.c test-time.c test-tls.c \
+	test-u64.c $(test_u8_mbtoucr_SOURCES) \
+	$(test_u8_uctomb_SOURCES) $(test_uc_width_SOURCES) \
+	$(test_uc_width2_SOURCES) test-uname.c test-unistd.c \
+	test-unlink.c test-unlinkat.c test-unsetenv.c test-userspec.c \
+	test-utimens.c test-utimensat.c test-vasnprintf.c \
+	test-vasprintf.c test-vasprintf-posix.c test-verify.c \
+	test-version-etc.c test-vfprintf-posix.c test-vprintf-posix.c \
+	test-wchar.c test-wcrtomb.c test-wcrtomb-w32.c test-wctype-h.c \
 	test-wcwidth.c test-write.c test-xalloc-die.c \
 	test-xfprintf-posix.c test-xprintf-posix.c test-xstrtoimax.c \
 	test-xstrtol.c test-xstrtoul.c test-xstrtoumax.c \
 	test-xvasprintf.c test-yesno.c
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -2131,110 +2063,207 @@ MANS = $(man1_MANS)
 HEADERS = $(noinst_HEADERS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	check recheck check-html recheck-html distdir
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	check recheck distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-# If stdout is a non-dumb tty, use colors.  If test -t is not supported,
-# then this fails; a conservative approach.  Of course do not redirect
-# stdout here, just stderr.
-am__tty_colors = \
-red=; grn=; lgn=; blu=; std=; \
-test "X$(AM_COLOR_TESTS)" != Xno \
-&& test "X$$TERM" != Xdumb \
-&& { test "X$(AM_COLOR_TESTS)" = Xalways || test -t 1 2>/dev/null; } \
-&& { \
-  red=''; \
-  grn=''; \
-  lgn=''; \
-  blu=''; \
-  std=''; \
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red=''; \
+    grn=''; \
+    lgn=''; \
+    blu=''; \
+    mgn=''; \
+    brg=''; \
+    std=''; \
+  fi; \
 }
-# Restructured Text title and section.
-am__rst_title = sed 's/.*/   &   /;h;s/./=/g;p;x;p;g;p;s/.*//'
-am__rst_section = sed 'p;s/./=/g;p;g'
-# Put stdin (possibly several lines separated by ".  ") in a box.
-# Prefix each line by 'col' and terminate each with 'std', for coloring.
-# Multi line coloring is problematic with "less -R", so we really need
-# to color each line individually.
-am__text_box = $(AWK) '{			\
-  n = split($$0, lines, "\\.  "); max = 0;	\
-  for (i = 1; i <= n; ++i)			\
-    if (max < length(lines[i]))			\
-      max = length(lines[i]);			\
-  for (i = 0; i < max; ++i)			\
-    line = line "=";				\
-  print col line std;				\
-  for (i = 1; i <= n; ++i)			\
-    if (lines[i])				\
-      print col lines[i] std;			\
-  print col line std;				\
+am__recheck_rx = ^[ 	]*:recheck:[ 	]*
+am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
+am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+  recheck = 1; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+        { \
+          if ((getline line2 < ($$0 ".log")) < 0) \
+	    recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+        { \
+          recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+        { \
+          break; \
+        } \
+    }; \
+  if (recheck) \
+    print $$0; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
 }'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+  print "fatal: making $@: " msg | "cat >&2"; \
+  exit 1; \
+} \
+function rst_section(header) \
+{ \
+  print header; \
+  len = length(header); \
+  for (i = 1; i <= len; i = i + 1) \
+    printf "="; \
+  printf "\n\n"; \
+} \
+{ \
+  copy_in_global_log = 1; \
+  global_test_result = "RUN"; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+         fatal("failed to read from " $$0 ".trs"); \
+      if (line ~ /$(am__global_test_result_rx)/) \
+        { \
+          sub("$(am__global_test_result_rx)", "", line); \
+          sub("[ 	]*$$", "", line); \
+          global_test_result = line; \
+        } \
+      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+        copy_in_global_log = 0; \
+    }; \
+  if (copy_in_global_log) \
+    { \
+      rst_section(global_test_result ": " $$0); \
+      while ((rc = (getline line < ($$0 ".log"))) != 0) \
+      { \
+        if (rc < 0) \
+          fatal("failed to read from " $$0 ".log"); \
+        print line; \
+      }; \
+      printf "\n"; \
+    }; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
 # Solaris 10 'make', and several other traditional 'make' implementations,
 # pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
 # by disabling -e (using the XSI extension "set +e") if it's set.
 am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
 # To be inserted before the command running the test.  Creates the
 # directory for the log if needed.  Stores in $dir the directory
-# containing $f, in $tst the test, in $log the log, and passes
-# TESTS_ENVIRONMENT.  Save and restore TERM around use of
-# TESTS_ENVIRONMENT, in case that unsets it.
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
 am__check_pre = \
 $(am__sh_e_setup);					\
 $(am__vpath_adj_setup) $(am__vpath_adj)			\
+$(am__tty_colors);					\
 srcdir=$(srcdir); export srcdir;			\
-rm -f $@-t;						\
-am__trap='rm -f '\''$(abs_builddir)/$@-t'\''; (exit $$st); exit $$st'; \
-trap "st=129; $$am__trap" 1; trap "st=130; $$am__trap" 2;	\
-trap "st=141; $$am__trap" 13; trap "st=143; $$am__trap" 15; \
-am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;		\
-test "x$$am__odir" = x. || $(MKDIR_P) "$$am__odir" || exit $$?;	\
+case "$@" in						\
+  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
+    *) am__odir=.;; 					\
+esac;							\
+test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
+  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
 if test -f "./$$f"; then dir=./;			\
 elif test -f "$$f"; then dir=;				\
 else dir="$(srcdir)/"; fi;				\
-tst=$$dir$$f; log='$@'; __SAVED_TERM=$$TERM;		\
-$(TESTS_ENVIRONMENT)
-# To be appended to the command running the test.  Handle the stdout
-# and stderr redirection, and catch the exit status.
-am__check_post = \
->$@-t 2>&1;						\
-estatus=$$?;						\
-if test -n '$(DISABLE_HARD_ERRORS)'			\
-   && test $$estatus -eq 99; then			\
-  estatus=1;						\
-fi;							\
-TERM=$$__SAVED_TERM; export TERM;			\
-$(am__tty_colors);					\
-xfailed=PASS;						\
+tst=$$dir$$f; log='$@'; 				\
+if test -n '$(DISABLE_HARD_ERRORS)'; then		\
+  am__enable_hard_errors=no; 				\
+else							\
+  am__enable_hard_errors=yes; 				\
+fi; 							\
 case " $(XFAIL_TESTS) " in				\
   *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
-    xfailed=XFAIL;;					\
-esac;							\
-case $$estatus.$$xfailed in				\
-    0.XFAIL) col=$$red; res=XPASS;;			\
-    0.*)     col=$$grn; res=PASS ;;			\
-    77.*)    col=$$blu; res=SKIP ;;			\
-    99.*)    col=$$red; res=FAIL ;;			\
-    *.XFAIL) col=$$lgn; res=XFAIL;;			\
-    *.*)     col=$$red; res=FAIL ;;			\
-esac;							\
-echo "$${col}$$res$${std}: $$f";			\
-echo "$$res: $$f (exit: $$estatus)" |			\
-  $(am__rst_section) >$@;				\
-cat $@-t >>$@;						\
-rm -f $@-t
+    am__expect_failure=yes;;				\
+  *)							\
+    am__expect_failure=no;;				\
+esac; 							\
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+  bases=`echo $$bases`
 RECHECK_LOGS = $(TEST_LOGS)
-TEST_SUITE_HTML = $(TEST_SUITE_LOG:.log=.html)
 TEST_SUITE_LOG = test-suite.log
 TEST_EXTENSIONS = @EXEEXT@ .test
+LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver
 LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
 am__test_logs1 = $(TESTS:=.log)
 am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
 TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver
 TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
 	$(TEST_LOG_FLAGS)
-TEST_LOGS_TMP = $(TEST_LOGS:.log=.log-t)
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
@@ -2531,27 +2560,6 @@ GNULIB_PIPE = @GNULIB_PIPE@
 GNULIB_PIPE2 = @GNULIB_PIPE2@
 GNULIB_POPEN = @GNULIB_POPEN@
 GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@
-GNULIB_POSIX_SPAWN = @GNULIB_POSIX_SPAWN@
-GNULIB_POSIX_SPAWNATTR_DESTROY = @GNULIB_POSIX_SPAWNATTR_DESTROY@
-GNULIB_POSIX_SPAWNATTR_GETFLAGS = @GNULIB_POSIX_SPAWNATTR_GETFLAGS@
-GNULIB_POSIX_SPAWNATTR_GETPGROUP = @GNULIB_POSIX_SPAWNATTR_GETPGROUP@
-GNULIB_POSIX_SPAWNATTR_GETSCHEDPARAM = @GNULIB_POSIX_SPAWNATTR_GETSCHEDPARAM@
-GNULIB_POSIX_SPAWNATTR_GETSCHEDPOLICY = @GNULIB_POSIX_SPAWNATTR_GETSCHEDPOLICY@
-GNULIB_POSIX_SPAWNATTR_GETSIGDEFAULT = @GNULIB_POSIX_SPAWNATTR_GETSIGDEFAULT@
-GNULIB_POSIX_SPAWNATTR_GETSIGMASK = @GNULIB_POSIX_SPAWNATTR_GETSIGMASK@
-GNULIB_POSIX_SPAWNATTR_INIT = @GNULIB_POSIX_SPAWNATTR_INIT@
-GNULIB_POSIX_SPAWNATTR_SETFLAGS = @GNULIB_POSIX_SPAWNATTR_SETFLAGS@
-GNULIB_POSIX_SPAWNATTR_SETPGROUP = @GNULIB_POSIX_SPAWNATTR_SETPGROUP@
-GNULIB_POSIX_SPAWNATTR_SETSCHEDPARAM = @GNULIB_POSIX_SPAWNATTR_SETSCHEDPARAM@
-GNULIB_POSIX_SPAWNATTR_SETSCHEDPOLICY = @GNULIB_POSIX_SPAWNATTR_SETSCHEDPOLICY@
-GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT = @GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT@
-GNULIB_POSIX_SPAWNATTR_SETSIGMASK = @GNULIB_POSIX_SPAWNATTR_SETSIGMASK@
-GNULIB_POSIX_SPAWNP = @GNULIB_POSIX_SPAWNP@
-GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE@
-GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2@
-GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN@
-GNULIB_POSIX_SPAWN_FILE_ACTIONS_DESTROY = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_DESTROY@
-GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT@
 GNULIB_POWF = @GNULIB_POWF@
 GNULIB_PREAD = @GNULIB_PREAD@
 GNULIB_PRINTF = @GNULIB_PRINTF@
@@ -2594,6 +2602,7 @@ GNULIB_ROUNDL = @GNULIB_ROUNDL@
 GNULIB_RPMATCH = @GNULIB_RPMATCH@
 GNULIB_SCANDIR = @GNULIB_SCANDIR@
 GNULIB_SCANF = @GNULIB_SCANF@
+GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@
 GNULIB_SELECT = @GNULIB_SELECT@
 GNULIB_SEND = @GNULIB_SEND@
 GNULIB_SENDTO = @GNULIB_SENDTO@
@@ -2931,9 +2940,6 @@ HAVE_PIPE2 = @HAVE_PIPE2@
 HAVE_POPEN = @HAVE_POPEN@
 HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@
 HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@
-HAVE_POSIX_SPAWN = @HAVE_POSIX_SPAWN@
-HAVE_POSIX_SPAWNATTR_T = @HAVE_POSIX_SPAWNATTR_T@
-HAVE_POSIX_SPAWN_FILE_ACTIONS_T = @HAVE_POSIX_SPAWN_FILE_ACTIONS_T@
 HAVE_POWF = @HAVE_POWF@
 HAVE_PREAD = @HAVE_PREAD@
 HAVE_PSELECT = @HAVE_PSELECT@
@@ -2964,6 +2970,7 @@ HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = @HAVE_SAME_LONG_DOUBLE_AS_DOUBLE@
 HAVE_SA_FAMILY_T = @HAVE_SA_FAMILY_T@
 HAVE_SCANDIR = @HAVE_SCANDIR@
 HAVE_SCHED_H = @HAVE_SCHED_H@
+HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
 HAVE_SETENV = @HAVE_SETENV@
 HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
 HAVE_SIGACTION = @HAVE_SIGACTION@
@@ -2977,7 +2984,6 @@ HAVE_SINF = @HAVE_SINF@
 HAVE_SINHF = @HAVE_SINHF@
 HAVE_SINL = @HAVE_SINL@
 HAVE_SLEEP = @HAVE_SLEEP@
-HAVE_SPAWN_H = @HAVE_SPAWN_H@
 HAVE_SQRTF = @HAVE_SQRTF@
 HAVE_SQRTL = @HAVE_SQRTL@
 HAVE_STDINT_H = @HAVE_STDINT_H@
@@ -3108,14 +3114,17 @@ LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@
 LIB_ACL = @LIB_ACL@
 LIB_CAP = @LIB_CAP@
 LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@
+LIB_CRYPTO = @LIB_CRYPTO@
 LIB_EACCESS = @LIB_EACCESS@
 LIB_FDATASYNC = @LIB_FDATASYNC@
 LIB_GETHRXTIME = @LIB_GETHRXTIME@
 LIB_GMP = @LIB_GMP@
 LIB_NANOSLEEP = @LIB_NANOSLEEP@
+LIB_NVPAIR = @LIB_NVPAIR@
 LIB_PTHREAD = @LIB_PTHREAD@
 LIB_SELECT = @LIB_SELECT@
 LIB_SELINUX = @LIB_SELINUX@
+LIB_SMACK = @LIB_SMACK@
 LIB_TIMER_TIME = @LIB_TIMER_TIME@
 LIB_XATTR = @LIB_XATTR@
 LN_S = @LN_S@
@@ -3157,7 +3166,6 @@ NEXT_AS_FIRST_DIRECTIVE_PTHREAD_H = @NEXT_AS_FIRST_DIRECTIVE_PTHREAD_H@
 NEXT_AS_FIRST_DIRECTIVE_SCHED_H = @NEXT_AS_FIRST_DIRECTIVE_SCHED_H@
 NEXT_AS_FIRST_DIRECTIVE_SELINUX_SELINUX_H = @NEXT_AS_FIRST_DIRECTIVE_SELINUX_SELINUX_H@
 NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H = @NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H@
-NEXT_AS_FIRST_DIRECTIVE_SPAWN_H = @NEXT_AS_FIRST_DIRECTIVE_SPAWN_H@
 NEXT_AS_FIRST_DIRECTIVE_STDARG_H = @NEXT_AS_FIRST_DIRECTIVE_STDARG_H@
 NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
 NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@
@@ -3196,7 +3204,6 @@ NEXT_PTHREAD_H = @NEXT_PTHREAD_H@
 NEXT_SCHED_H = @NEXT_SCHED_H@
 NEXT_SELINUX_SELINUX_H = @NEXT_SELINUX_SELINUX_H@
 NEXT_SIGNAL_H = @NEXT_SIGNAL_H@
-NEXT_SPAWN_H = @NEXT_SPAWN_H@
 NEXT_STDARG_H = @NEXT_STDARG_H@
 NEXT_STDDEF_H = @NEXT_STDDEF_H@
 NEXT_STDINT_H = @NEXT_STDINT_H@
@@ -3294,11 +3301,13 @@ REPLACE_GAI_STRERROR = @REPLACE_GAI_STRERROR@
 REPLACE_GETCWD = @REPLACE_GETCWD@
 REPLACE_GETDELIM = @REPLACE_GETDELIM@
 REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
+REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
 REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
 REPLACE_GETLINE = @REPLACE_GETLINE@
 REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
 REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
+REPLACE_GMTIME = @REPLACE_GMTIME@
 REPLACE_HUGE_VAL = @REPLACE_HUGE_VAL@
 REPLACE_HYPOT = @REPLACE_HYPOT@
 REPLACE_HYPOTF = @REPLACE_HYPOTF@
@@ -3323,6 +3332,7 @@ REPLACE_LDEXPL = @REPLACE_LDEXPL@
 REPLACE_LINK = @REPLACE_LINK@
 REPLACE_LINKAT = @REPLACE_LINKAT@
 REPLACE_LOCALECONV = @REPLACE_LOCALECONV@
+REPLACE_LOCALTIME = @REPLACE_LOCALTIME@
 REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
 REPLACE_LOG = @REPLACE_LOG@
 REPLACE_LOG10 = @REPLACE_LOG10@
@@ -3369,10 +3379,6 @@ REPLACE_OPENAT = @REPLACE_OPENAT@
 REPLACE_OPENDIR = @REPLACE_OPENDIR@
 REPLACE_PERROR = @REPLACE_PERROR@
 REPLACE_POPEN = @REPLACE_POPEN@
-REPLACE_POSIX_SPAWN = @REPLACE_POSIX_SPAWN@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2@
-REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN@
 REPLACE_PREAD = @REPLACE_PREAD@
 REPLACE_PRINTF = @REPLACE_PRINTF@
 REPLACE_PSELECT = @REPLACE_PSELECT@
@@ -3423,6 +3429,7 @@ REPLACE_STRSTR = @REPLACE_STRSTR@
 REPLACE_STRTOD = @REPLACE_STRTOD@
 REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@
 REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
+REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@
 REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
 REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@
 REPLACE_SYMLINK = @REPLACE_SYMLINK@
@@ -3453,6 +3460,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
 REPLACE_WRITE = @REPLACE_WRITE@
 SCHED_H = @SCHED_H@
+SED = @SED@
 SELINUX_CONTEXT_H = @SELINUX_CONTEXT_H@
 SEQ_LIBM = @SEQ_LIBM@
 SERVENT_LIB = @SERVENT_LIB@
@@ -3540,15 +3548,20 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+single_binary_deps = @single_binary_deps@
+single_binary_install_type = @single_binary_install_type@
+single_binary_libs = @single_binary_libs@
+single_binary_progs = @single_binary_progs@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AUTOMAKE_OPTIONS = 1.5 foreign subdir-objects
+AUTOMAKE_OPTIONS = 1.9.6 foreign subdir-objects
 SUBDIRS = .
 TESTS_ENVIRONMENT = EXEEXT='@EXEEXT@' srcdir='$(srcdir)' \
 	USE_ACL=$(USE_ACL) LOCALE_FR='@LOCALE_FR@' \
@@ -3571,6 +3584,17 @@ TESTS_ENVIRONMENT = EXEEXT='@EXEEXT@' srcdir='$(srcdir)' \
 noinst_HEADERS = 
 noinst_LIBRARIES = 
 check_LIBRARIES = libtests.a
+
+# If your project uses "gettextize --intl" to put a source-code
+# copy of libintl into the package, every Makefile.am needs
+# -I$(top_builddir)/intl, so that <libintl.h> can be found in this directory.
+# Here's one way to do this:
+#AM_CPPFLAGS += -I$(top_builddir)/intl
+# This option has no effect when the user disables NLS (because then
+# the intl directory contains no libintl.h file).  This option is not
+# enabled by default because the intl directory might not exist if
+# your project does not use "gettext --intl", and some compilers
+# complain about -I options applied to nonexistent directories.
 EXTRA_DIST = accept.c w32sock.h test-accept.c signature.h macros.h \
 	test-file-has-acl.sh test-file-has-acl-1.sh \
 	test-file-has-acl-2.sh test-set-mode-acl.sh \
@@ -3687,18 +3711,11 @@ EXTRA_DIST = accept.c w32sock.h test-accept.c signature.h macros.h \
 	test-openat.c test-open.h signature.h macros.h \
 	test-parse-datetime.c macros.h test-pathmax.c perror.c \
 	macros.h signature.h test-perror.c test-perror2.c \
-	test-perror.sh pipe.c test-pipe.c signature.h macros.h \
-	test-pipe2.c signature.h macros.h \
-	test-posix_spawn_file_actions_addclose.c signature.h macros.h \
-	test-posix_spawn_file_actions_adddup2.c signature.h macros.h \
-	test-posix_spawn_file_actions_addopen.c signature.h macros.h \
-	test-posix_spawn1.c test-posix_spawn1.in.sh \
-	test-posix_spawn2.c test-posix_spawn2.in.sh signature.h \
-	test-posixtm.c macros.h test-printf-frexp.c macros.h \
-	test-printf-frexpl.c macros.h test-priv-set.c macros.h \
-	test-quotearg-simple.c test-quotearg.h macros.h test-raise.c \
+	test-perror.sh test-pipe.c signature.h macros.h test-posixtm.c \
+	macros.h test-printf-frexp.c macros.h test-printf-frexpl.c \
+	macros.h test-priv-set.c macros.h test-quotearg-simple.c \
+	test-quotearg.h macros.h zerosize-ptr.h test-raise.c \
 	signature.h macros.h test-rand-isaac.c macros.h \
-	test-rawmemchr.c zerosize-ptr.h signature.h macros.h \
 	test-read-file.c test-read.c signature.h macros.h \
 	test-readlink.h test-readlink.c signature.h macros.h \
 	test-readlink.h test-readlinkat.c signature.h macros.h \
@@ -3722,41 +3739,37 @@ EXTRA_DIST = accept.c w32sock.h test-accept.c signature.h macros.h \
 	$(top_srcdir)/build-aux/snippet/unused-parameter.h \
 	$(top_srcdir)/build-aux/snippet/warn-on-use.h test-snprintf.c \
 	signature.h macros.h socket.c w32sock.h test-sockets.c \
-	test-spawn-pipe.sh test-spawn-pipe-main.c \
-	test-spawn-pipe-child.c macros.h test-spawn.c test-stat.h \
-	test-stat.c signature.h macros.h test-stat-time.c macros.h \
-	test-statat.c test-stdalign.c macros.h test-stdbool.c \
-	test-stddef.c test-stdint.c test-stdio.c test-stdlib.c \
-	test-sys_wait.h test-strchrnul.c signature.h macros.h \
-	test-strerror.c signature.h macros.h strerror_r.c \
-	test-strerror_r.c signature.h macros.h test-strftime.c \
-	macros.h test-striconv.c macros.h test-string.c test-strncat.c \
-	unistr/test-strncat.h zerosize-ptr.h signature.h macros.h \
-	test-strnlen.c zerosize-ptr.h signature.h macros.h \
-	test-strsignal.c signature.h macros.h test-strtod.c \
-	signature.h minus-zero.h macros.h test-strtoimax.c signature.h \
-	macros.h test-strtoll.c signature.h macros.h test-strtoull.c \
-	signature.h macros.h test-strtoumax.c signature.h macros.h \
-	test-symlink.h test-symlink.c signature.h macros.h at-func.c \
-	symlinkat.c test-symlink.h test-symlinkat.c signature.h \
-	macros.h test-sys_ioctl.c test-sys_resource.c \
-	test-sys_select.c signature.h test-sys_socket.c \
-	test-sys_stat.c test-sys_time.c test-sys_types.c \
-	test-sys_uio.c test-sys_utsname.c test-sys_wait.c \
-	test-sys_wait.h test-termios.c init.sh test-init.sh \
-	test-thread_self.c test-thread_create.c macros.h test-time.c \
-	test-tls.c test-u64.c test-uname.c signature.h macros.h \
-	test-dup-safer.c macros.h test-unistd.c \
+	test-stat.h test-stat.c signature.h macros.h test-stat-time.c \
+	macros.h nap.h test-statat.c test-stdalign.c macros.h \
+	test-stdbool.c test-stddef.c test-stdint.c test-stdio.c \
+	test-stdlib.c test-sys_wait.h test-strerror.c signature.h \
+	macros.h strerror_r.c test-strerror_r.c signature.h macros.h \
+	test-strftime.c macros.h test-striconv.c macros.h \
+	test-string.c test-strncat.c unistr/test-strncat.h \
+	zerosize-ptr.h signature.h macros.h test-strnlen.c \
+	zerosize-ptr.h signature.h macros.h test-strsignal.c \
+	signature.h macros.h test-strtod.c signature.h minus-zero.h \
+	macros.h test-strtoimax.c signature.h macros.h test-strtoll.c \
+	signature.h macros.h test-strtoull.c signature.h macros.h \
+	test-strtoumax.c signature.h macros.h test-symlink.h \
+	test-symlink.c signature.h macros.h at-func.c symlinkat.c \
+	test-symlink.h test-symlinkat.c signature.h macros.h \
+	test-sys_ioctl.c test-sys_resource.c test-sys_select.c \
+	signature.h test-sys_socket.c test-sys_stat.c test-sys_time.c \
+	test-sys_types.c test-sys_uio.c test-sys_utsname.c \
+	test-sys_wait.c test-sys_wait.h test-termios.c init.sh \
+	test-init.sh test-thread_self.c test-thread_create.c macros.h \
+	test-time.c test-tls.c test-u64.c test-uname.c signature.h \
+	macros.h test-dup-safer.c macros.h test-unistd.c \
 	unistr/test-u8-mbtoucr.c macros.h unistr/test-u8-uctomb.c \
 	macros.h uniwidth/test-uc_width.c uniwidth/test-uc_width2.c \
 	uniwidth/test-uc_width2.sh macros.h test-unlink.h \
 	test-unlink.c signature.h macros.h test-unlinkat.c \
 	test-rmdir.h test-unlink.h signature.h macros.h unlinkdir.h \
 	test-unsetenv.c signature.h macros.h test-update-copyright.sh \
-	test-userspec.c usleep.c test-usleep.c signature.h macros.h \
-	nap.h test-futimens.h test-lutimens.h test-utimens.h \
-	test-utimens-common.h test-utimens.c macros.h nap.h \
-	test-lutimens.h test-utimens.h test-utimens-common.h \
+	test-userspec.c nap.h test-futimens.h test-lutimens.h \
+	test-utimens.h test-utimens-common.h test-utimens.c macros.h \
+	nap.h test-lutimens.h test-utimens.h test-utimens-common.h \
 	test-utimensat.c signature.h macros.h test-vasnprintf.c \
 	macros.h test-vasprintf-posix.c minus-zero.h infinity.h nan.h \
 	macros.h test-vasprintf.c signature.h macros.h \
@@ -3795,40 +3808,34 @@ EXTRA_DIST = accept.c w32sock.h test-accept.c signature.h macros.h \
 # statements but through direct file reference. Therefore this snippet must be
 # present in all Makefile.am that need it. This is ensured by the applicability
 # 'all' defined above.
-BUILT_SOURCES = $(am__append_3) arg-nonnull.h c++defs.h \
-	unused-parameter.h warn-on-use.h
+BUILT_SOURCES = arg-nonnull.h c++defs.h unused-parameter.h \
+	warn-on-use.h
 SUFFIXES = 
 MOSTLYCLEANFILES = core *.stackdump test-fflush.txt test-fpending.t \
 	t-fpurge.tmp t-freading.tmp t-ftell3.tmp t-ftello3.tmp \
 	test-getdelim.txt test-getline.txt test-getndelim2.txt \
-	$(am__append_4) arg-nonnull.h arg-nonnull.h-t c++defs.h \
-	c++defs.h-t unused-parameter.h unused-parameter.h-t \
-	warn-on-use.h warn-on-use.h-t
+	arg-nonnull.h arg-nonnull.h-t c++defs.h c++defs.h-t \
+	unused-parameter.h unused-parameter.h-t warn-on-use.h \
+	warn-on-use.h-t
 MOSTLYCLEANDIRS = 
 CLEANFILES = 
 DISTCLEANFILES = 
 MAINTAINERCLEANFILES = 
+AM_CPPFLAGS = \
+  -D@gltests_WITNESS@=1 \
+  -I. -I$(srcdir) \
+  -I.. -I$(srcdir)/.. \
+  -I../lib -I$(srcdir)/../lib
 
-# This is for those projects which use "gettextize --intl" to put a source-code
-# copy of libintl into their package. In such projects, every Makefile.am needs
-# -I$(top_builddir)/intl, so that <libintl.h> can be found in this directory.
-# For the Makefile.ams in other directories it is the maintainer's
-# responsibility; for the one from gnulib we do it here.
-# This option has no effect when the user disables NLS (because then the intl
-# directory contains no libintl.h file) or when the project does not use
-# "gettextize --intl".
-AM_CPPFLAGS = -D@gltests_WITNESS@=1 -I. -I$(srcdir) -I.. \
-	-I$(srcdir)/.. -I../lib -I$(srcdir)/../lib \
-	-I$(top_builddir)/intl
 LDADD = libtests.a ../lib/libcoreutils.a libtests.a $(LIBTESTS_LIBDEPS)
-libtests_a_SOURCES = localename.c glthread/thread.h glthread/thread.c \
-	unlinkdir.c glthread/yield.h
+libtests_a_SOURCES = binary-io.h binary-io.c localename.c \
+	glthread/thread.h glthread/thread.c unlinkdir.c \
+	glthread/yield.h
 libtests_a_LIBADD = $(gltests_LIBOBJS)
 libtests_a_DEPENDENCIES = $(gltests_LIBOBJS)
 EXTRA_libtests_a_SOURCES = accept.c bind.c connect.c inet_pton.c \
-	ioctl.c listen.c perror.c pipe.c setlocale.c setsockopt.c \
-	sleep.c socket.c strerror_r.c at-func.c symlinkat.c usleep.c \
-	wctob.c wctomb.c
+	ioctl.c listen.c perror.c setlocale.c setsockopt.c sleep.c \
+	socket.c strerror_r.c at-func.c symlinkat.c wctob.c wctomb.c
 AM_LIBTOOLFLAGS = --preserve-dup-deps
 test_accept_LDADD = $(LDADD) @LIBSOCKET@
 test_file_has_acl_LDADD = $(LDADD) $(LIB_ACL)
@@ -3839,25 +3846,30 @@ test_areadlinkat_LDADD = $(LDADD) @LIBINTL@
 test_argmatch_LDADD = $(LDADD) @LIBINTL@
 test_bind_LDADD = $(LDADD) @LIBSOCKET@ $(INET_PTON_LIB)
 test_canonicalize_LDADD = $(LDADD) @LIBINTL@
+test_chown_LDADD = $(LDADD) $(LIB_NANOSLEEP)
 test_closein_LDADD = $(LDADD) @LIBINTL@
 test_connect_LDADD = $(LDADD) @LIBSOCKET@ $(INET_PTON_LIB)
+test_md5_LDADD = $(LDADD) @LIB_CRYPTO@
+test_sha1_LDADD = $(LDADD) @LIB_CRYPTO@
 # Link with libintl when needed. dirent-safer uses fdopendir if it is present,
 # and fdopendir indirectly depends on openat-die -> gettext-h.
 test_dirent_safer_LDADD = $(LDADD) $(LIBINTL)
 test_dirname_LDADD = $(LDADD) @LIBINTL@
-test_exclude_LDADD = $(LDADD) @LIBINTL@
+test_exclude_LDADD = $(LDADD) @LIBINTL@ $(LIBTHREAD)
 test_faccessat_LDADD = $(LDADD) $(LIB_EACCESS) @LIBINTL@
 test_fchdir_LDADD = $(LDADD) $(LIBINTL)
 test_fchmodat_LDADD = $(LDADD) @LIBINTL@
-test_fchownat_LDADD = $(LDADD) @LIBINTL@
+test_fchownat_LDADD = $(LDADD) $(LIB_NANOSLEEP) @LIBINTL@
 test_fdatasync_LDADD = $(LDADD) $(LIB_FDATASYNC)
 test_fdopendir_LDADD = $(LDADD) @LIBINTL@
-test_fdutimensat_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) @LIBINTL@
+test_fdutimensat_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) \
+  $(LIB_NANOSLEEP) @LIBINTL@
+
 test_filenamecat_LDADD = $(LDADD) @LIBINTL@
 test_frexp_nolibm_SOURCES = test-frexp.c randomd.c
 test_frexpl_nolibm_SOURCES = test-frexpl.c randoml.c
 test_fstatat_LDADD = $(LDADD) @LIBINTL@
-test_futimens_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) @LIBINTL@
+test_futimens_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_NANOSLEEP) @LIBINTL@
 test_getaddrinfo_LDADD = $(LDADD) @GETADDRINFO_LIB@ @LIBINTL@
 test_getcwd_lgpl_LDADD = $(LDADD) $(LIBINTL)
 test_getcwd_LDADD = $(LDADD) @LIBINTL@
@@ -3867,6 +3879,7 @@ test_getopt_LDADD = $(LDADD) $(LIBINTL)
 test_iconv_LDADD = $(LDADD) @LIBICONV@
 test_inet_ntop_LDADD = $(LDADD) @INET_NTOP_LIB@
 test_inet_pton_LDADD = $(LDADD) @INET_PTON_LIB@
+test_lchown_LDADD = $(LDADD) $(LIB_NANOSLEEP)
 test_link_LDADD = $(LDADD) @LIBINTL@
 test_linkat_LDADD = $(LDADD) @LIBINTL@
 test_listen_LDADD = $(LDADD) @LIBSOCKET@
@@ -3876,11 +3889,10 @@ test_nanosleep_LDADD = $(LDADD) $(LIB_NANOSLEEP)
 test_openat_safer_LDADD = $(LDADD) @LIBINTL@
 test_openat_LDADD = $(LDADD) @LIBINTL@
 test_parse_datetime_LDADD = $(LDADD) @LIBINTL@ $(LIB_CLOCK_GETTIME)
-test_pipe2_LDADD = $(LDADD) $(LIBSOCKET)
 test_quotearg_simple_LDADD = $(LDADD) @LIBINTL@
 test_readlinkat_LDADD = $(LDADD) @LIBINTL@
 test_readtokens_LDADD = $(LDADD) @LIBINTL@
-test_regex_LDADD = $(LDADD) @LIBINTL@
+test_regex_LDADD = $(LDADD) @LIBINTL@ $(LIBTHREAD) $(LIB_PTHREAD)
 test_rename_LDADD = $(LDADD) @LIBINTL@
 test_select_LDADD = $(LDADD) @LIB_SELECT@ @LIBSOCKET@ $(INET_PTON_LIB)
 test_select_fd_LDADD = $(LDADD) @LIB_SELECT@
@@ -3896,12 +3908,8 @@ CXXDEFS_H = c++defs.h
 UNUSED_PARAMETER_H = unused-parameter.h
 WARN_ON_USE_H = warn-on-use.h
 test_sockets_LDADD = $(LDADD) @LIBSOCKET@
-test_spawn_pipe_main_LDADD = $(LDADD) @LIBINTL@
-# The test-spawn-pipe-child program must be a real executable, not a libtool
-# wrapper script, and should link against as few libraries as possible.
-# Therefore don't link it against any libraries other than -lc.
-test_spawn_pipe_child_LDADD = 
 test_stat_LDADD = $(LDADD) $(LIBINTL)
+test_stat_time_LDADD = $(LDADD) $(LIB_NANOSLEEP)
 test_statat_LDADD = $(LDADD) @LIBINTL@
 test_striconv_LDADD = $(LDADD) @LIBICONV@
 test_strsignal_LDADD = $(LDADD) @LIBINTL@ $(LIBTHREAD)
@@ -3920,8 +3928,8 @@ test_uc_width2_SOURCES = uniwidth/test-uc_width2.c
 test_uc_width2_LDADD = $(LDADD) $(LIBUNISTRING)
 test_unlinkat_LDADD = $(LDADD) @LIBINTL@
 test_userspec_LDADD = $(LDADD) @LIBINTL@
-test_utimens_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) @LIBINTL@
-test_utimensat_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) @LIBINTL@
+test_utimens_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_NANOSLEEP) @LIBINTL@
+test_utimensat_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_NANOSLEEP) @LIBINTL@
 test_version_etc_LDADD = $(LDADD) @LIBINTL@
 test_xalloc_die_LDADD = $(LDADD) @LIBINTL@
 test_xfprintf_posix_LDADD = $(LDADD) @LIBINTL@
@@ -3957,7 +3965,7 @@ all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-.SUFFIXES: .c .html .log .o .obj .test .test$(EXEEXT)
+.SUFFIXES: .c .log .o .obj .test .test$(EXEEXT) .trs
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/gnulib.mk $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -4003,6 +4011,7 @@ glthread/$(DEPDIR)/$(am__dirstamp):
 	@: > glthread/$(DEPDIR)/$(am__dirstamp)
 glthread/thread.$(OBJEXT): glthread/$(am__dirstamp) \
 	glthread/$(DEPDIR)/$(am__dirstamp)
+
 libtests.a: $(libtests_a_OBJECTS) $(libtests_a_DEPENDENCIES) $(EXTRA_libtests_a_DEPENDENCIES) 
 	$(AM_V_at)-rm -f libtests.a
 	$(AM_V_AR)$(libtests_a_AR) libtests.a $(libtests_a_OBJECTS) $(libtests_a_LIBADD)
@@ -4016,10 +4025,11 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -4040,7 +4050,8 @@ uninstall-binPROGRAMS:
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@ -4062,10 +4073,11 @@ install-pkglibexecPROGRAMS: $(pkglibexec_PROGRAMS)
 	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -4086,760 +4098,967 @@ uninstall-pkglibexecPROGRAMS:
 	@list='$(pkglibexec_PROGRAMS)'; test -n "$(pkglibexecdir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(pkglibexecdir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(pkglibexecdir)" && rm -f $$files
 
 clean-pkglibexecPROGRAMS:
 	-test -z "$(pkglibexec_PROGRAMS)" || rm -f $(pkglibexec_PROGRAMS)
+
 test-accept$(EXEEXT): $(test_accept_OBJECTS) $(test_accept_DEPENDENCIES) $(EXTRA_test_accept_DEPENDENCIES) 
 	@rm -f test-accept$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_accept_OBJECTS) $(test_accept_LDADD) $(LIBS)
+
 test-alignof$(EXEEXT): $(test_alignof_OBJECTS) $(test_alignof_DEPENDENCIES) $(EXTRA_test_alignof_DEPENDENCIES) 
 	@rm -f test-alignof$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_alignof_OBJECTS) $(test_alignof_LDADD) $(LIBS)
+
 test-alloca-opt$(EXEEXT): $(test_alloca_opt_OBJECTS) $(test_alloca_opt_DEPENDENCIES) $(EXTRA_test_alloca_opt_DEPENDENCIES) 
 	@rm -f test-alloca-opt$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_alloca_opt_OBJECTS) $(test_alloca_opt_LDADD) $(LIBS)
+
 test-areadlink$(EXEEXT): $(test_areadlink_OBJECTS) $(test_areadlink_DEPENDENCIES) $(EXTRA_test_areadlink_DEPENDENCIES) 
 	@rm -f test-areadlink$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_areadlink_OBJECTS) $(test_areadlink_LDADD) $(LIBS)
+
 test-areadlink-with-size$(EXEEXT): $(test_areadlink_with_size_OBJECTS) $(test_areadlink_with_size_DEPENDENCIES) $(EXTRA_test_areadlink_with_size_DEPENDENCIES) 
 	@rm -f test-areadlink-with-size$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_areadlink_with_size_OBJECTS) $(test_areadlink_with_size_LDADD) $(LIBS)
+
 test-areadlinkat$(EXEEXT): $(test_areadlinkat_OBJECTS) $(test_areadlinkat_DEPENDENCIES) $(EXTRA_test_areadlinkat_DEPENDENCIES) 
 	@rm -f test-areadlinkat$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_areadlinkat_OBJECTS) $(test_areadlinkat_LDADD) $(LIBS)
+
 test-argmatch$(EXEEXT): $(test_argmatch_OBJECTS) $(test_argmatch_DEPENDENCIES) $(EXTRA_test_argmatch_DEPENDENCIES) 
 	@rm -f test-argmatch$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_argmatch_OBJECTS) $(test_argmatch_LDADD) $(LIBS)
+
 test-argv-iter$(EXEEXT): $(test_argv_iter_OBJECTS) $(test_argv_iter_DEPENDENCIES) $(EXTRA_test_argv_iter_DEPENDENCIES) 
 	@rm -f test-argv-iter$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_argv_iter_OBJECTS) $(test_argv_iter_LDADD) $(LIBS)
+
 test-arpa_inet$(EXEEXT): $(test_arpa_inet_OBJECTS) $(test_arpa_inet_DEPENDENCIES) $(EXTRA_test_arpa_inet_DEPENDENCIES) 
 	@rm -f test-arpa_inet$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_arpa_inet_OBJECTS) $(test_arpa_inet_LDADD) $(LIBS)
+
 test-base64$(EXEEXT): $(test_base64_OBJECTS) $(test_base64_DEPENDENCIES) $(EXTRA_test_base64_DEPENDENCIES) 
 	@rm -f test-base64$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_base64_OBJECTS) $(test_base64_LDADD) $(LIBS)
+
 test-binary-io$(EXEEXT): $(test_binary_io_OBJECTS) $(test_binary_io_DEPENDENCIES) $(EXTRA_test_binary_io_DEPENDENCIES) 
 	@rm -f test-binary-io$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_binary_io_OBJECTS) $(test_binary_io_LDADD) $(LIBS)
+
 test-bind$(EXEEXT): $(test_bind_OBJECTS) $(test_bind_DEPENDENCIES) $(EXTRA_test_bind_DEPENDENCIES) 
 	@rm -f test-bind$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_bind_OBJECTS) $(test_bind_LDADD) $(LIBS)
+
 test-bitrotate$(EXEEXT): $(test_bitrotate_OBJECTS) $(test_bitrotate_DEPENDENCIES) $(EXTRA_test_bitrotate_DEPENDENCIES) 
 	@rm -f test-bitrotate$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_bitrotate_OBJECTS) $(test_bitrotate_LDADD) $(LIBS)
+
 test-btowc$(EXEEXT): $(test_btowc_OBJECTS) $(test_btowc_DEPENDENCIES) $(EXTRA_test_btowc_DEPENDENCIES) 
 	@rm -f test-btowc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_btowc_OBJECTS) $(test_btowc_LDADD) $(LIBS)
+
 test-c-ctype$(EXEEXT): $(test_c_ctype_OBJECTS) $(test_c_ctype_DEPENDENCIES) $(EXTRA_test_c_ctype_DEPENDENCIES) 
 	@rm -f test-c-ctype$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_c_ctype_OBJECTS) $(test_c_ctype_LDADD) $(LIBS)
+
 test-c-strcasecmp$(EXEEXT): $(test_c_strcasecmp_OBJECTS) $(test_c_strcasecmp_DEPENDENCIES) $(EXTRA_test_c_strcasecmp_DEPENDENCIES) 
 	@rm -f test-c-strcasecmp$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_c_strcasecmp_OBJECTS) $(test_c_strcasecmp_LDADD) $(LIBS)
+
 test-c-strncasecmp$(EXEEXT): $(test_c_strncasecmp_OBJECTS) $(test_c_strncasecmp_DEPENDENCIES) $(EXTRA_test_c_strncasecmp_DEPENDENCIES) 
 	@rm -f test-c-strncasecmp$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_c_strncasecmp_OBJECTS) $(test_c_strncasecmp_LDADD) $(LIBS)
+
 test-calloc-gnu$(EXEEXT): $(test_calloc_gnu_OBJECTS) $(test_calloc_gnu_DEPENDENCIES) $(EXTRA_test_calloc_gnu_DEPENDENCIES) 
 	@rm -f test-calloc-gnu$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_calloc_gnu_OBJECTS) $(test_calloc_gnu_LDADD) $(LIBS)
+
 test-canonicalize$(EXEEXT): $(test_canonicalize_OBJECTS) $(test_canonicalize_DEPENDENCIES) $(EXTRA_test_canonicalize_DEPENDENCIES) 
 	@rm -f test-canonicalize$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_canonicalize_OBJECTS) $(test_canonicalize_LDADD) $(LIBS)
+
 test-chdir$(EXEEXT): $(test_chdir_OBJECTS) $(test_chdir_DEPENDENCIES) $(EXTRA_test_chdir_DEPENDENCIES) 
 	@rm -f test-chdir$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_chdir_OBJECTS) $(test_chdir_LDADD) $(LIBS)
+
 test-chown$(EXEEXT): $(test_chown_OBJECTS) $(test_chown_DEPENDENCIES) $(EXTRA_test_chown_DEPENDENCIES) 
 	@rm -f test-chown$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_chown_OBJECTS) $(test_chown_LDADD) $(LIBS)
+
 test-cloexec$(EXEEXT): $(test_cloexec_OBJECTS) $(test_cloexec_DEPENDENCIES) $(EXTRA_test_cloexec_DEPENDENCIES) 
 	@rm -f test-cloexec$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_cloexec_OBJECTS) $(test_cloexec_LDADD) $(LIBS)
+
 test-close$(EXEEXT): $(test_close_OBJECTS) $(test_close_DEPENDENCIES) $(EXTRA_test_close_DEPENDENCIES) 
 	@rm -f test-close$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_close_OBJECTS) $(test_close_LDADD) $(LIBS)
+
 test-closein$(EXEEXT): $(test_closein_OBJECTS) $(test_closein_DEPENDENCIES) $(EXTRA_test_closein_DEPENDENCIES) 
 	@rm -f test-closein$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_closein_OBJECTS) $(test_closein_LDADD) $(LIBS)
+
 test-connect$(EXEEXT): $(test_connect_OBJECTS) $(test_connect_DEPENDENCIES) $(EXTRA_test_connect_DEPENDENCIES) 
 	@rm -f test-connect$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_connect_OBJECTS) $(test_connect_LDADD) $(LIBS)
+
 test-copy-acl$(EXEEXT): $(test_copy_acl_OBJECTS) $(test_copy_acl_DEPENDENCIES) $(EXTRA_test_copy_acl_DEPENDENCIES) 
 	@rm -f test-copy-acl$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_copy_acl_OBJECTS) $(test_copy_acl_LDADD) $(LIBS)
+
 test-ctype$(EXEEXT): $(test_ctype_OBJECTS) $(test_ctype_DEPENDENCIES) $(EXTRA_test_ctype_DEPENDENCIES) 
 	@rm -f test-ctype$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_ctype_OBJECTS) $(test_ctype_LDADD) $(LIBS)
+
 test-di-set$(EXEEXT): $(test_di_set_OBJECTS) $(test_di_set_DEPENDENCIES) $(EXTRA_test_di_set_DEPENDENCIES) 
 	@rm -f test-di-set$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_di_set_OBJECTS) $(test_di_set_LDADD) $(LIBS)
+
 test-dirent$(EXEEXT): $(test_dirent_OBJECTS) $(test_dirent_DEPENDENCIES) $(EXTRA_test_dirent_DEPENDENCIES) 
 	@rm -f test-dirent$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_dirent_OBJECTS) $(test_dirent_LDADD) $(LIBS)
+
 test-dirent-safer$(EXEEXT): $(test_dirent_safer_OBJECTS) $(test_dirent_safer_DEPENDENCIES) $(EXTRA_test_dirent_safer_DEPENDENCIES) 
 	@rm -f test-dirent-safer$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_dirent_safer_OBJECTS) $(test_dirent_safer_LDADD) $(LIBS)
+
 test-dirname$(EXEEXT): $(test_dirname_OBJECTS) $(test_dirname_DEPENDENCIES) $(EXTRA_test_dirname_DEPENDENCIES) 
 	@rm -f test-dirname$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_dirname_OBJECTS) $(test_dirname_LDADD) $(LIBS)
+
 test-dup$(EXEEXT): $(test_dup_OBJECTS) $(test_dup_DEPENDENCIES) $(EXTRA_test_dup_DEPENDENCIES) 
 	@rm -f test-dup$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_dup_OBJECTS) $(test_dup_LDADD) $(LIBS)
+
 test-dup-safer$(EXEEXT): $(test_dup_safer_OBJECTS) $(test_dup_safer_DEPENDENCIES) $(EXTRA_test_dup_safer_DEPENDENCIES) 
 	@rm -f test-dup-safer$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_dup_safer_OBJECTS) $(test_dup_safer_LDADD) $(LIBS)
+
 test-dup2$(EXEEXT): $(test_dup2_OBJECTS) $(test_dup2_DEPENDENCIES) $(EXTRA_test_dup2_DEPENDENCIES) 
 	@rm -f test-dup2$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_dup2_OBJECTS) $(test_dup2_LDADD) $(LIBS)
+
 test-environ$(EXEEXT): $(test_environ_OBJECTS) $(test_environ_DEPENDENCIES) $(EXTRA_test_environ_DEPENDENCIES) 
 	@rm -f test-environ$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_environ_OBJECTS) $(test_environ_LDADD) $(LIBS)
+
 test-errno$(EXEEXT): $(test_errno_OBJECTS) $(test_errno_DEPENDENCIES) $(EXTRA_test_errno_DEPENDENCIES) 
 	@rm -f test-errno$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_errno_OBJECTS) $(test_errno_LDADD) $(LIBS)
+
 test-exclude$(EXEEXT): $(test_exclude_OBJECTS) $(test_exclude_DEPENDENCIES) $(EXTRA_test_exclude_DEPENDENCIES) 
 	@rm -f test-exclude$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_exclude_OBJECTS) $(test_exclude_LDADD) $(LIBS)
+
 test-faccessat$(EXEEXT): $(test_faccessat_OBJECTS) $(test_faccessat_DEPENDENCIES) $(EXTRA_test_faccessat_DEPENDENCIES) 
 	@rm -f test-faccessat$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_faccessat_OBJECTS) $(test_faccessat_LDADD) $(LIBS)
+
 test-fadvise$(EXEEXT): $(test_fadvise_OBJECTS) $(test_fadvise_DEPENDENCIES) $(EXTRA_test_fadvise_DEPENDENCIES) 
 	@rm -f test-fadvise$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_fadvise_OBJECTS) $(test_fadvise_LDADD) $(LIBS)
+
 test-fchdir$(EXEEXT): $(test_fchdir_OBJECTS) $(test_fchdir_DEPENDENCIES) $(EXTRA_test_fchdir_DEPENDENCIES) 
 	@rm -f test-fchdir$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_fchdir_OBJECTS) $(test_fchdir_LDADD) $(LIBS)
+
 test-fchmodat$(EXEEXT): $(test_fchmodat_OBJECTS) $(test_fchmodat_DEPENDENCIES) $(EXTRA_test_fchmodat_DEPENDENCIES) 
 	@rm -f test-fchmodat$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_fchmodat_OBJECTS) $(test_fchmodat_LDADD) $(LIBS)
+
 test-fchownat$(EXEEXT): $(test_fchownat_OBJECTS) $(test_fchownat_DEPENDENCIES) $(EXTRA_test_fchownat_DEPENDENCIES) 
 	@rm -f test-fchownat$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_fchownat_OBJECTS) $(test_fchownat_LDADD) $(LIBS)
+
 test-fclose$(EXEEXT): $(test_fclose_OBJECTS) $(test_fclose_DEPENDENCIES) $(EXTRA_test_fclose_DEPENDENCIES) 
 	@rm -f test-fclose$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_fclose_OBJECTS) $(test_fclose_LDADD) $(LIBS)
+
 test-fcntl$(EXEEXT): $(test_fcntl_OBJECTS) $(test_fcntl_DEPENDENCIES) $(EXTRA_test_fcntl_DEPENDENCIES) 
 	@rm -f test-fcntl$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_fcntl_OBJECTS) $(test_fcntl_LDADD) $(LIBS)
+
 test-fcntl-h$(EXEEXT): $(test_fcntl_h_OBJECTS) $(test_fcntl_h_DEPENDENCIES) $(EXTRA_test_fcntl_h_DEPENDENCIES) 
 	@rm -f test-fcntl-h$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_fcntl_h_OBJECTS) $(test_fcntl_h_LDADD) $(LIBS)
+
 test-fcntl-safer$(EXEEXT): $(test_fcntl_safer_OBJECTS) $(test_fcntl_safer_DEPENDENCIES) $(EXTRA_test_fcntl_safer_DEPENDENCIES) 
 	@rm -f test-fcntl-safer$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_fcntl_safer_OBJECTS) $(test_fcntl_safer_LDADD) $(LIBS)
+
 test-fdatasync$(EXEEXT): $(test_fdatasync_OBJECTS) $(test_fdatasync_DEPENDENCIES) $(EXTRA_test_fdatasync_DEPENDENCIES) 
 	@rm -f test-fdatasync$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_fdatasync_OBJECTS) $(test_fdatasync_LDADD) $(LIBS)
+
 test-fdopen$(EXEEXT): $(test_fdopen_OBJECTS) $(test_fdopen_DEPENDENCIES) $(EXTRA_test_fdopen_DEPENDENCIES) 
 	@rm -f test-fdopen$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_fdopen_OBJECTS) $(test_fdopen_LDADD) $(LIBS)
+
 test-fdopendir$(EXEEXT): $(test_fdopendir_OBJECTS) $(test_fdopendir_DEPENDENCIES) $(EXTRA_test_fdopendir_DEPENDENCIES) 
 	@rm -f test-fdopendir$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_fdopendir_OBJECTS) $(test_fdopendir_LDADD) $(LIBS)
+
 test-fdutimensat$(EXEEXT): $(test_fdutimensat_OBJECTS) $(test_fdutimensat_DEPENDENCIES) $(EXTRA_test_fdutimensat_DEPENDENCIES) 
 	@rm -f test-fdutimensat$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_fdutimensat_OBJECTS) $(test_fdutimensat_LDADD) $(LIBS)
+
 test-fflush$(EXEEXT): $(test_fflush_OBJECTS) $(test_fflush_DEPENDENCIES) $(EXTRA_test_fflush_DEPENDENCIES) 
 	@rm -f test-fflush$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_fflush_OBJECTS) $(test_fflush_LDADD) $(LIBS)
+
 test-fflush2$(EXEEXT): $(test_fflush2_OBJECTS) $(test_fflush2_DEPENDENCIES) $(EXTRA_test_fflush2_DEPENDENCIES) 
 	@rm -f test-fflush2$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_fflush2_OBJECTS) $(test_fflush2_LDADD) $(LIBS)
+
 test-fgetc$(EXEEXT): $(test_fgetc_OBJECTS) $(test_fgetc_DEPENDENCIES) $(EXTRA_test_fgetc_DEPENDENCIES) 
 	@rm -f test-fgetc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_fgetc_OBJECTS) $(test_fgetc_LDADD) $(LIBS)
+
 test-file-has-acl$(EXEEXT): $(test_file_has_acl_OBJECTS) $(test_file_has_acl_DEPENDENCIES) $(EXTRA_test_file_has_acl_DEPENDENCIES) 
 	@rm -f test-file-has-acl$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_file_has_acl_OBJECTS) $(test_file_has_acl_LDADD) $(LIBS)
+
 test-filenamecat$(EXEEXT): $(test_filenamecat_OBJECTS) $(test_filenamecat_DEPENDENCIES) $(EXTRA_test_filenamecat_DEPENDENCIES) 
 	@rm -f test-filenamecat$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_filenamecat_OBJECTS) $(test_filenamecat_LDADD) $(LIBS)
+
 test-filevercmp$(EXEEXT): $(test_filevercmp_OBJECTS) $(test_filevercmp_DEPENDENCIES) $(EXTRA_test_filevercmp_DEPENDENCIES) 
 	@rm -f test-filevercmp$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_filevercmp_OBJECTS) $(test_filevercmp_LDADD) $(LIBS)
+
 test-float$(EXEEXT): $(test_float_OBJECTS) $(test_float_DEPENDENCIES) $(EXTRA_test_float_DEPENDENCIES) 
 	@rm -f test-float$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_float_OBJECTS) $(test_float_LDADD) $(LIBS)
+
 test-fnmatch$(EXEEXT): $(test_fnmatch_OBJECTS) $(test_fnmatch_DEPENDENCIES) $(EXTRA_test_fnmatch_DEPENDENCIES) 
 	@rm -f test-fnmatch$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_fnmatch_OBJECTS) $(test_fnmatch_LDADD) $(LIBS)
+
 test-fopen$(EXEEXT): $(test_fopen_OBJECTS) $(test_fopen_DEPENDENCIES) $(EXTRA_test_fopen_DEPENDENCIES) 
 	@rm -f test-fopen$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_fopen_OBJECTS) $(test_fopen_LDADD) $(LIBS)
+
 test-fopen-safer$(EXEEXT): $(test_fopen_safer_OBJECTS) $(test_fopen_safer_DEPENDENCIES) $(EXTRA_test_fopen_safer_DEPENDENCIES) 
 	@rm -f test-fopen-safer$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_fopen_safer_OBJECTS) $(test_fopen_safer_LDADD) $(LIBS)
+
 test-fpending$(EXEEXT): $(test_fpending_OBJECTS) $(test_fpending_DEPENDENCIES) $(EXTRA_test_fpending_DEPENDENCIES) 
 	@rm -f test-fpending$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_fpending_OBJECTS) $(test_fpending_LDADD) $(LIBS)
+
 test-fpurge$(EXEEXT): $(test_fpurge_OBJECTS) $(test_fpurge_DEPENDENCIES) $(EXTRA_test_fpurge_DEPENDENCIES) 
 	@rm -f test-fpurge$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_fpurge_OBJECTS) $(test_fpurge_LDADD) $(LIBS)
+
 test-fputc$(EXEEXT): $(test_fputc_OBJECTS) $(test_fputc_DEPENDENCIES) $(EXTRA_test_fputc_DEPENDENCIES) 
 	@rm -f test-fputc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_fputc_OBJECTS) $(test_fputc_LDADD) $(LIBS)
+
 test-fread$(EXEEXT): $(test_fread_OBJECTS) $(test_fread_DEPENDENCIES) $(EXTRA_test_fread_DEPENDENCIES) 
 	@rm -f test-fread$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_fread_OBJECTS) $(test_fread_LDADD) $(LIBS)
+
 test-freadahead$(EXEEXT): $(test_freadahead_OBJECTS) $(test_freadahead_DEPENDENCIES) $(EXTRA_test_freadahead_DEPENDENCIES) 
 	@rm -f test-freadahead$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_freadahead_OBJECTS) $(test_freadahead_LDADD) $(LIBS)
+
 test-freading$(EXEEXT): $(test_freading_OBJECTS) $(test_freading_DEPENDENCIES) $(EXTRA_test_freading_DEPENDENCIES) 
 	@rm -f test-freading$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_freading_OBJECTS) $(test_freading_LDADD) $(LIBS)
+
 test-freadptr$(EXEEXT): $(test_freadptr_OBJECTS) $(test_freadptr_DEPENDENCIES) $(EXTRA_test_freadptr_DEPENDENCIES) 
 	@rm -f test-freadptr$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_freadptr_OBJECTS) $(test_freadptr_LDADD) $(LIBS)
+
 test-freadptr2$(EXEEXT): $(test_freadptr2_OBJECTS) $(test_freadptr2_DEPENDENCIES) $(EXTRA_test_freadptr2_DEPENDENCIES) 
 	@rm -f test-freadptr2$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_freadptr2_OBJECTS) $(test_freadptr2_LDADD) $(LIBS)
+
 test-freadseek$(EXEEXT): $(test_freadseek_OBJECTS) $(test_freadseek_DEPENDENCIES) $(EXTRA_test_freadseek_DEPENDENCIES) 
 	@rm -f test-freadseek$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_freadseek_OBJECTS) $(test_freadseek_LDADD) $(LIBS)
+
 test-freopen$(EXEEXT): $(test_freopen_OBJECTS) $(test_freopen_DEPENDENCIES) $(EXTRA_test_freopen_DEPENDENCIES) 
 	@rm -f test-freopen$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_freopen_OBJECTS) $(test_freopen_LDADD) $(LIBS)
+
 test-freopen-safer$(EXEEXT): $(test_freopen_safer_OBJECTS) $(test_freopen_safer_DEPENDENCIES) $(EXTRA_test_freopen_safer_DEPENDENCIES) 
 	@rm -f test-freopen-safer$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_freopen_safer_OBJECTS) $(test_freopen_safer_LDADD) $(LIBS)
+
 test-frexp-nolibm$(EXEEXT): $(test_frexp_nolibm_OBJECTS) $(test_frexp_nolibm_DEPENDENCIES) $(EXTRA_test_frexp_nolibm_DEPENDENCIES) 
 	@rm -f test-frexp-nolibm$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_frexp_nolibm_OBJECTS) $(test_frexp_nolibm_LDADD) $(LIBS)
+
 test-frexpl-nolibm$(EXEEXT): $(test_frexpl_nolibm_OBJECTS) $(test_frexpl_nolibm_DEPENDENCIES) $(EXTRA_test_frexpl_nolibm_DEPENDENCIES) 
 	@rm -f test-frexpl-nolibm$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_frexpl_nolibm_OBJECTS) $(test_frexpl_nolibm_LDADD) $(LIBS)
+
 test-fseek$(EXEEXT): $(test_fseek_OBJECTS) $(test_fseek_DEPENDENCIES) $(EXTRA_test_fseek_DEPENDENCIES) 
 	@rm -f test-fseek$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_fseek_OBJECTS) $(test_fseek_LDADD) $(LIBS)
+
 test-fseeko$(EXEEXT): $(test_fseeko_OBJECTS) $(test_fseeko_DEPENDENCIES) $(EXTRA_test_fseeko_DEPENDENCIES) 
 	@rm -f test-fseeko$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_fseeko_OBJECTS) $(test_fseeko_LDADD) $(LIBS)
+
 test-fseeko3$(EXEEXT): $(test_fseeko3_OBJECTS) $(test_fseeko3_DEPENDENCIES) $(EXTRA_test_fseeko3_DEPENDENCIES) 
 	@rm -f test-fseeko3$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_fseeko3_OBJECTS) $(test_fseeko3_LDADD) $(LIBS)
+
 test-fseeko4$(EXEEXT): $(test_fseeko4_OBJECTS) $(test_fseeko4_DEPENDENCIES) $(EXTRA_test_fseeko4_DEPENDENCIES) 
 	@rm -f test-fseeko4$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_fseeko4_OBJECTS) $(test_fseeko4_LDADD) $(LIBS)
+
 test-fseterr$(EXEEXT): $(test_fseterr_OBJECTS) $(test_fseterr_DEPENDENCIES) $(EXTRA_test_fseterr_DEPENDENCIES) 
 	@rm -f test-fseterr$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_fseterr_OBJECTS) $(test_fseterr_LDADD) $(LIBS)
+
 test-fstat$(EXEEXT): $(test_fstat_OBJECTS) $(test_fstat_DEPENDENCIES) $(EXTRA_test_fstat_DEPENDENCIES) 
 	@rm -f test-fstat$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_fstat_OBJECTS) $(test_fstat_LDADD) $(LIBS)
+
 test-fstatat$(EXEEXT): $(test_fstatat_OBJECTS) $(test_fstatat_DEPENDENCIES) $(EXTRA_test_fstatat_DEPENDENCIES) 
 	@rm -f test-fstatat$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_fstatat_OBJECTS) $(test_fstatat_LDADD) $(LIBS)
+
 test-fsync$(EXEEXT): $(test_fsync_OBJECTS) $(test_fsync_DEPENDENCIES) $(EXTRA_test_fsync_DEPENDENCIES) 
 	@rm -f test-fsync$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_fsync_OBJECTS) $(test_fsync_LDADD) $(LIBS)
+
 test-ftell$(EXEEXT): $(test_ftell_OBJECTS) $(test_ftell_DEPENDENCIES) $(EXTRA_test_ftell_DEPENDENCIES) 
 	@rm -f test-ftell$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_ftell_OBJECTS) $(test_ftell_LDADD) $(LIBS)
+
 test-ftell3$(EXEEXT): $(test_ftell3_OBJECTS) $(test_ftell3_DEPENDENCIES) $(EXTRA_test_ftell3_DEPENDENCIES) 
 	@rm -f test-ftell3$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_ftell3_OBJECTS) $(test_ftell3_LDADD) $(LIBS)
+
 test-ftello$(EXEEXT): $(test_ftello_OBJECTS) $(test_ftello_DEPENDENCIES) $(EXTRA_test_ftello_DEPENDENCIES) 
 	@rm -f test-ftello$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_ftello_OBJECTS) $(test_ftello_LDADD) $(LIBS)
+
 test-ftello3$(EXEEXT): $(test_ftello3_OBJECTS) $(test_ftello3_DEPENDENCIES) $(EXTRA_test_ftello3_DEPENDENCIES) 
 	@rm -f test-ftello3$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_ftello3_OBJECTS) $(test_ftello3_LDADD) $(LIBS)
+
 test-ftello4$(EXEEXT): $(test_ftello4_OBJECTS) $(test_ftello4_DEPENDENCIES) $(EXTRA_test_ftello4_DEPENDENCIES) 
 	@rm -f test-ftello4$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_ftello4_OBJECTS) $(test_ftello4_LDADD) $(LIBS)
+
 test-ftruncate$(EXEEXT): $(test_ftruncate_OBJECTS) $(test_ftruncate_DEPENDENCIES) $(EXTRA_test_ftruncate_DEPENDENCIES) 
 	@rm -f test-ftruncate$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_ftruncate_OBJECTS) $(test_ftruncate_LDADD) $(LIBS)
+
 test-futimens$(EXEEXT): $(test_futimens_OBJECTS) $(test_futimens_DEPENDENCIES) $(EXTRA_test_futimens_DEPENDENCIES) 
 	@rm -f test-futimens$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_futimens_OBJECTS) $(test_futimens_LDADD) $(LIBS)
+
 test-fwrite$(EXEEXT): $(test_fwrite_OBJECTS) $(test_fwrite_DEPENDENCIES) $(EXTRA_test_fwrite_DEPENDENCIES) 
 	@rm -f test-fwrite$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_fwrite_OBJECTS) $(test_fwrite_LDADD) $(LIBS)
+
 test-getaddrinfo$(EXEEXT): $(test_getaddrinfo_OBJECTS) $(test_getaddrinfo_DEPENDENCIES) $(EXTRA_test_getaddrinfo_DEPENDENCIES) 
 	@rm -f test-getaddrinfo$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_getaddrinfo_OBJECTS) $(test_getaddrinfo_LDADD) $(LIBS)
+
 test-getcwd$(EXEEXT): $(test_getcwd_OBJECTS) $(test_getcwd_DEPENDENCIES) $(EXTRA_test_getcwd_DEPENDENCIES) 
 	@rm -f test-getcwd$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_getcwd_OBJECTS) $(test_getcwd_LDADD) $(LIBS)
+
 test-getcwd-lgpl$(EXEEXT): $(test_getcwd_lgpl_OBJECTS) $(test_getcwd_lgpl_DEPENDENCIES) $(EXTRA_test_getcwd_lgpl_DEPENDENCIES) 
 	@rm -f test-getcwd-lgpl$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_getcwd_lgpl_OBJECTS) $(test_getcwd_lgpl_LDADD) $(LIBS)
+
 test-getdelim$(EXEEXT): $(test_getdelim_OBJECTS) $(test_getdelim_DEPENDENCIES) $(EXTRA_test_getdelim_DEPENDENCIES) 
 	@rm -f test-getdelim$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_getdelim_OBJECTS) $(test_getdelim_LDADD) $(LIBS)
+
 test-getdtablesize$(EXEEXT): $(test_getdtablesize_OBJECTS) $(test_getdtablesize_DEPENDENCIES) $(EXTRA_test_getdtablesize_DEPENDENCIES) 
 	@rm -f test-getdtablesize$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_getdtablesize_OBJECTS) $(test_getdtablesize_LDADD) $(LIBS)
+
 test-getgroups$(EXEEXT): $(test_getgroups_OBJECTS) $(test_getgroups_DEPENDENCIES) $(EXTRA_test_getgroups_DEPENDENCIES) 
 	@rm -f test-getgroups$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_getgroups_OBJECTS) $(test_getgroups_LDADD) $(LIBS)
+
 test-gethostname$(EXEEXT): $(test_gethostname_OBJECTS) $(test_gethostname_DEPENDENCIES) $(EXTRA_test_gethostname_DEPENDENCIES) 
 	@rm -f test-gethostname$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_gethostname_OBJECTS) $(test_gethostname_LDADD) $(LIBS)
+
 test-getline$(EXEEXT): $(test_getline_OBJECTS) $(test_getline_DEPENDENCIES) $(EXTRA_test_getline_DEPENDENCIES) 
 	@rm -f test-getline$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_getline_OBJECTS) $(test_getline_LDADD) $(LIBS)
+
 test-getloadavg$(EXEEXT): $(test_getloadavg_OBJECTS) $(test_getloadavg_DEPENDENCIES) $(EXTRA_test_getloadavg_DEPENDENCIES) 
 	@rm -f test-getloadavg$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_getloadavg_OBJECTS) $(test_getloadavg_LDADD) $(LIBS)
+
 test-getlogin$(EXEEXT): $(test_getlogin_OBJECTS) $(test_getlogin_DEPENDENCIES) $(EXTRA_test_getlogin_DEPENDENCIES) 
 	@rm -f test-getlogin$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_getlogin_OBJECTS) $(test_getlogin_LDADD) $(LIBS)
+
 test-getndelim2$(EXEEXT): $(test_getndelim2_OBJECTS) $(test_getndelim2_DEPENDENCIES) $(EXTRA_test_getndelim2_DEPENDENCIES) 
 	@rm -f test-getndelim2$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_getndelim2_OBJECTS) $(test_getndelim2_LDADD) $(LIBS)
+
 test-getopt$(EXEEXT): $(test_getopt_OBJECTS) $(test_getopt_DEPENDENCIES) $(EXTRA_test_getopt_DEPENDENCIES) 
 	@rm -f test-getopt$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_getopt_OBJECTS) $(test_getopt_LDADD) $(LIBS)
+
 test-gettimeofday$(EXEEXT): $(test_gettimeofday_OBJECTS) $(test_gettimeofday_DEPENDENCIES) $(EXTRA_test_gettimeofday_DEPENDENCIES) 
 	@rm -f test-gettimeofday$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_gettimeofday_OBJECTS) $(test_gettimeofday_LDADD) $(LIBS)
+
 test-hash$(EXEEXT): $(test_hash_OBJECTS) $(test_hash_DEPENDENCIES) $(EXTRA_test_hash_DEPENDENCIES) 
 	@rm -f test-hash$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_hash_OBJECTS) $(test_hash_LDADD) $(LIBS)
+
 test-i-ring$(EXEEXT): $(test_i_ring_OBJECTS) $(test_i_ring_DEPENDENCIES) $(EXTRA_test_i_ring_DEPENDENCIES) 
 	@rm -f test-i-ring$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_i_ring_OBJECTS) $(test_i_ring_LDADD) $(LIBS)
+
 test-iconv$(EXEEXT): $(test_iconv_OBJECTS) $(test_iconv_DEPENDENCIES) $(EXTRA_test_iconv_DEPENDENCIES) 
 	@rm -f test-iconv$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_iconv_OBJECTS) $(test_iconv_LDADD) $(LIBS)
+
 test-iconv-h$(EXEEXT): $(test_iconv_h_OBJECTS) $(test_iconv_h_DEPENDENCIES) $(EXTRA_test_iconv_h_DEPENDENCIES) 
 	@rm -f test-iconv-h$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_iconv_h_OBJECTS) $(test_iconv_h_LDADD) $(LIBS)
+
 test-ignore-value$(EXEEXT): $(test_ignore_value_OBJECTS) $(test_ignore_value_DEPENDENCIES) $(EXTRA_test_ignore_value_DEPENDENCIES) 
 	@rm -f test-ignore-value$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_ignore_value_OBJECTS) $(test_ignore_value_LDADD) $(LIBS)
+
 test-inet_ntop$(EXEEXT): $(test_inet_ntop_OBJECTS) $(test_inet_ntop_DEPENDENCIES) $(EXTRA_test_inet_ntop_DEPENDENCIES) 
 	@rm -f test-inet_ntop$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_inet_ntop_OBJECTS) $(test_inet_ntop_LDADD) $(LIBS)
+
 test-inet_pton$(EXEEXT): $(test_inet_pton_OBJECTS) $(test_inet_pton_DEPENDENCIES) $(EXTRA_test_inet_pton_DEPENDENCIES) 
 	@rm -f test-inet_pton$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_inet_pton_OBJECTS) $(test_inet_pton_LDADD) $(LIBS)
+
 test-ino-map$(EXEEXT): $(test_ino_map_OBJECTS) $(test_ino_map_DEPENDENCIES) $(EXTRA_test_ino_map_DEPENDENCIES) 
 	@rm -f test-ino-map$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_ino_map_OBJECTS) $(test_ino_map_LDADD) $(LIBS)
+
 test-intprops$(EXEEXT): $(test_intprops_OBJECTS) $(test_intprops_DEPENDENCIES) $(EXTRA_test_intprops_DEPENDENCIES) 
 	@rm -f test-intprops$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_intprops_OBJECTS) $(test_intprops_LDADD) $(LIBS)
+
 test-inttostr$(EXEEXT): $(test_inttostr_OBJECTS) $(test_inttostr_DEPENDENCIES) $(EXTRA_test_inttostr_DEPENDENCIES) 
 	@rm -f test-inttostr$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_inttostr_OBJECTS) $(test_inttostr_LDADD) $(LIBS)
+
 test-inttypes$(EXEEXT): $(test_inttypes_OBJECTS) $(test_inttypes_DEPENDENCIES) $(EXTRA_test_inttypes_DEPENDENCIES) 
 	@rm -f test-inttypes$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_inttypes_OBJECTS) $(test_inttypes_LDADD) $(LIBS)
+
 test-ioctl$(EXEEXT): $(test_ioctl_OBJECTS) $(test_ioctl_DEPENDENCIES) $(EXTRA_test_ioctl_DEPENDENCIES) 
 	@rm -f test-ioctl$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_ioctl_OBJECTS) $(test_ioctl_LDADD) $(LIBS)
+
 test-isatty$(EXEEXT): $(test_isatty_OBJECTS) $(test_isatty_DEPENDENCIES) $(EXTRA_test_isatty_DEPENDENCIES) 
 	@rm -f test-isatty$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_isatty_OBJECTS) $(test_isatty_LDADD) $(LIBS)
+
 test-isblank$(EXEEXT): $(test_isblank_OBJECTS) $(test_isblank_DEPENDENCIES) $(EXTRA_test_isblank_DEPENDENCIES) 
 	@rm -f test-isblank$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_isblank_OBJECTS) $(test_isblank_LDADD) $(LIBS)
+
 test-isnand-nolibm$(EXEEXT): $(test_isnand_nolibm_OBJECTS) $(test_isnand_nolibm_DEPENDENCIES) $(EXTRA_test_isnand_nolibm_DEPENDENCIES) 
 	@rm -f test-isnand-nolibm$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_isnand_nolibm_OBJECTS) $(test_isnand_nolibm_LDADD) $(LIBS)
+
 test-isnanf-nolibm$(EXEEXT): $(test_isnanf_nolibm_OBJECTS) $(test_isnanf_nolibm_DEPENDENCIES) $(EXTRA_test_isnanf_nolibm_DEPENDENCIES) 
 	@rm -f test-isnanf-nolibm$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_isnanf_nolibm_OBJECTS) $(test_isnanf_nolibm_LDADD) $(LIBS)
+
 test-isnanl-nolibm$(EXEEXT): $(test_isnanl_nolibm_OBJECTS) $(test_isnanl_nolibm_DEPENDENCIES) $(EXTRA_test_isnanl_nolibm_DEPENDENCIES) 
 	@rm -f test-isnanl-nolibm$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_isnanl_nolibm_OBJECTS) $(test_isnanl_nolibm_LDADD) $(LIBS)
+
 test-iswblank$(EXEEXT): $(test_iswblank_OBJECTS) $(test_iswblank_DEPENDENCIES) $(EXTRA_test_iswblank_DEPENDENCIES) 
 	@rm -f test-iswblank$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_iswblank_OBJECTS) $(test_iswblank_LDADD) $(LIBS)
+
 test-langinfo$(EXEEXT): $(test_langinfo_OBJECTS) $(test_langinfo_DEPENDENCIES) $(EXTRA_test_langinfo_DEPENDENCIES) 
 	@rm -f test-langinfo$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_langinfo_OBJECTS) $(test_langinfo_LDADD) $(LIBS)
+
 test-lchown$(EXEEXT): $(test_lchown_OBJECTS) $(test_lchown_DEPENDENCIES) $(EXTRA_test_lchown_DEPENDENCIES) 
 	@rm -f test-lchown$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_lchown_OBJECTS) $(test_lchown_LDADD) $(LIBS)
+
 test-link$(EXEEXT): $(test_link_OBJECTS) $(test_link_DEPENDENCIES) $(EXTRA_test_link_DEPENDENCIES) 
 	@rm -f test-link$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_link_OBJECTS) $(test_link_LDADD) $(LIBS)
+
 test-linkat$(EXEEXT): $(test_linkat_OBJECTS) $(test_linkat_DEPENDENCIES) $(EXTRA_test_linkat_DEPENDENCIES) 
 	@rm -f test-linkat$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_linkat_OBJECTS) $(test_linkat_LDADD) $(LIBS)
+
 test-listen$(EXEEXT): $(test_listen_OBJECTS) $(test_listen_DEPENDENCIES) $(EXTRA_test_listen_DEPENDENCIES) 
 	@rm -f test-listen$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_listen_OBJECTS) $(test_listen_LDADD) $(LIBS)
+
 test-locale$(EXEEXT): $(test_locale_OBJECTS) $(test_locale_DEPENDENCIES) $(EXTRA_test_locale_DEPENDENCIES) 
 	@rm -f test-locale$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_locale_OBJECTS) $(test_locale_LDADD) $(LIBS)
+
 test-localeconv$(EXEEXT): $(test_localeconv_OBJECTS) $(test_localeconv_DEPENDENCIES) $(EXTRA_test_localeconv_DEPENDENCIES) 
 	@rm -f test-localeconv$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_localeconv_OBJECTS) $(test_localeconv_LDADD) $(LIBS)
+
 test-localename$(EXEEXT): $(test_localename_OBJECTS) $(test_localename_DEPENDENCIES) $(EXTRA_test_localename_DEPENDENCIES) 
 	@rm -f test-localename$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_localename_OBJECTS) $(test_localename_LDADD) $(LIBS)
+
 test-lock$(EXEEXT): $(test_lock_OBJECTS) $(test_lock_DEPENDENCIES) $(EXTRA_test_lock_DEPENDENCIES) 
 	@rm -f test-lock$(EXEEXT)
 	$(AM_V_CCLD)$(test_lock_LINK) $(test_lock_OBJECTS) $(test_lock_LDADD) $(LIBS)
+
 test-lseek$(EXEEXT): $(test_lseek_OBJECTS) $(test_lseek_DEPENDENCIES) $(EXTRA_test_lseek_DEPENDENCIES) 
 	@rm -f test-lseek$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_lseek_OBJECTS) $(test_lseek_LDADD) $(LIBS)
+
 test-lstat$(EXEEXT): $(test_lstat_OBJECTS) $(test_lstat_DEPENDENCIES) $(EXTRA_test_lstat_DEPENDENCIES) 
 	@rm -f test-lstat$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_lstat_OBJECTS) $(test_lstat_LDADD) $(LIBS)
+
 test-malloc-gnu$(EXEEXT): $(test_malloc_gnu_OBJECTS) $(test_malloc_gnu_DEPENDENCIES) $(EXTRA_test_malloc_gnu_DEPENDENCIES) 
 	@rm -f test-malloc-gnu$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_malloc_gnu_OBJECTS) $(test_malloc_gnu_LDADD) $(LIBS)
+
 test-malloca$(EXEEXT): $(test_malloca_OBJECTS) $(test_malloca_DEPENDENCIES) $(EXTRA_test_malloca_DEPENDENCIES) 
 	@rm -f test-malloca$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_malloca_OBJECTS) $(test_malloca_LDADD) $(LIBS)
+
 test-math$(EXEEXT): $(test_math_OBJECTS) $(test_math_DEPENDENCIES) $(EXTRA_test_math_DEPENDENCIES) 
 	@rm -f test-math$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_math_OBJECTS) $(test_math_LDADD) $(LIBS)
+
 test-mbrtowc$(EXEEXT): $(test_mbrtowc_OBJECTS) $(test_mbrtowc_DEPENDENCIES) $(EXTRA_test_mbrtowc_DEPENDENCIES) 
 	@rm -f test-mbrtowc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_mbrtowc_OBJECTS) $(test_mbrtowc_LDADD) $(LIBS)
+
 test-mbrtowc-w32$(EXEEXT): $(test_mbrtowc_w32_OBJECTS) $(test_mbrtowc_w32_DEPENDENCIES) $(EXTRA_test_mbrtowc_w32_DEPENDENCIES) 
 	@rm -f test-mbrtowc-w32$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_mbrtowc_w32_OBJECTS) $(test_mbrtowc_w32_LDADD) $(LIBS)
+
 test-mbsalign$(EXEEXT): $(test_mbsalign_OBJECTS) $(test_mbsalign_DEPENDENCIES) $(EXTRA_test_mbsalign_DEPENDENCIES) 
 	@rm -f test-mbsalign$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_mbsalign_OBJECTS) $(test_mbsalign_LDADD) $(LIBS)
+
 test-mbscasecmp$(EXEEXT): $(test_mbscasecmp_OBJECTS) $(test_mbscasecmp_DEPENDENCIES) $(EXTRA_test_mbscasecmp_DEPENDENCIES) 
 	@rm -f test-mbscasecmp$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_mbscasecmp_OBJECTS) $(test_mbscasecmp_LDADD) $(LIBS)
+
 test-mbsinit$(EXEEXT): $(test_mbsinit_OBJECTS) $(test_mbsinit_DEPENDENCIES) $(EXTRA_test_mbsinit_DEPENDENCIES) 
 	@rm -f test-mbsinit$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_mbsinit_OBJECTS) $(test_mbsinit_LDADD) $(LIBS)
+
 test-mbsrtowcs$(EXEEXT): $(test_mbsrtowcs_OBJECTS) $(test_mbsrtowcs_DEPENDENCIES) $(EXTRA_test_mbsrtowcs_DEPENDENCIES) 
 	@rm -f test-mbsrtowcs$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_mbsrtowcs_OBJECTS) $(test_mbsrtowcs_LDADD) $(LIBS)
+
 test-mbsstr1$(EXEEXT): $(test_mbsstr1_OBJECTS) $(test_mbsstr1_DEPENDENCIES) $(EXTRA_test_mbsstr1_DEPENDENCIES) 
 	@rm -f test-mbsstr1$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_mbsstr1_OBJECTS) $(test_mbsstr1_LDADD) $(LIBS)
+
 test-mbsstr2$(EXEEXT): $(test_mbsstr2_OBJECTS) $(test_mbsstr2_DEPENDENCIES) $(EXTRA_test_mbsstr2_DEPENDENCIES) 
 	@rm -f test-mbsstr2$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_mbsstr2_OBJECTS) $(test_mbsstr2_LDADD) $(LIBS)
+
 test-mbsstr3$(EXEEXT): $(test_mbsstr3_OBJECTS) $(test_mbsstr3_DEPENDENCIES) $(EXTRA_test_mbsstr3_DEPENDENCIES) 
 	@rm -f test-mbsstr3$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_mbsstr3_OBJECTS) $(test_mbsstr3_LDADD) $(LIBS)
+
 test-md5$(EXEEXT): $(test_md5_OBJECTS) $(test_md5_DEPENDENCIES) $(EXTRA_test_md5_DEPENDENCIES) 
 	@rm -f test-md5$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_md5_OBJECTS) $(test_md5_LDADD) $(LIBS)
+
 test-memcasecmp$(EXEEXT): $(test_memcasecmp_OBJECTS) $(test_memcasecmp_DEPENDENCIES) $(EXTRA_test_memcasecmp_DEPENDENCIES) 
 	@rm -f test-memcasecmp$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_memcasecmp_OBJECTS) $(test_memcasecmp_LDADD) $(LIBS)
+
 test-memchr$(EXEEXT): $(test_memchr_OBJECTS) $(test_memchr_DEPENDENCIES) $(EXTRA_test_memchr_DEPENDENCIES) 
 	@rm -f test-memchr$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_memchr_OBJECTS) $(test_memchr_LDADD) $(LIBS)
+
 test-memchr2$(EXEEXT): $(test_memchr2_OBJECTS) $(test_memchr2_DEPENDENCIES) $(EXTRA_test_memchr2_DEPENDENCIES) 
 	@rm -f test-memchr2$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_memchr2_OBJECTS) $(test_memchr2_LDADD) $(LIBS)
+
 test-memcoll$(EXEEXT): $(test_memcoll_OBJECTS) $(test_memcoll_DEPENDENCIES) $(EXTRA_test_memcoll_DEPENDENCIES) 
 	@rm -f test-memcoll$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_memcoll_OBJECTS) $(test_memcoll_LDADD) $(LIBS)
+
 test-memrchr$(EXEEXT): $(test_memrchr_OBJECTS) $(test_memrchr_DEPENDENCIES) $(EXTRA_test_memrchr_DEPENDENCIES) 
 	@rm -f test-memrchr$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_memrchr_OBJECTS) $(test_memrchr_LDADD) $(LIBS)
+
 test-mkdir$(EXEEXT): $(test_mkdir_OBJECTS) $(test_mkdir_DEPENDENCIES) $(EXTRA_test_mkdir_DEPENDENCIES) 
 	@rm -f test-mkdir$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_mkdir_OBJECTS) $(test_mkdir_LDADD) $(LIBS)
+
 test-mkfifo$(EXEEXT): $(test_mkfifo_OBJECTS) $(test_mkfifo_DEPENDENCIES) $(EXTRA_test_mkfifo_DEPENDENCIES) 
 	@rm -f test-mkfifo$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_mkfifo_OBJECTS) $(test_mkfifo_LDADD) $(LIBS)
+
 test-mknod$(EXEEXT): $(test_mknod_OBJECTS) $(test_mknod_DEPENDENCIES) $(EXTRA_test_mknod_DEPENDENCIES) 
 	@rm -f test-mknod$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_mknod_OBJECTS) $(test_mknod_LDADD) $(LIBS)
+
 test-nanosleep$(EXEEXT): $(test_nanosleep_OBJECTS) $(test_nanosleep_DEPENDENCIES) $(EXTRA_test_nanosleep_DEPENDENCIES) 
 	@rm -f test-nanosleep$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_nanosleep_OBJECTS) $(test_nanosleep_LDADD) $(LIBS)
+
 test-netdb$(EXEEXT): $(test_netdb_OBJECTS) $(test_netdb_DEPENDENCIES) $(EXTRA_test_netdb_DEPENDENCIES) 
 	@rm -f test-netdb$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_netdb_OBJECTS) $(test_netdb_LDADD) $(LIBS)
+
 test-netinet_in$(EXEEXT): $(test_netinet_in_OBJECTS) $(test_netinet_in_DEPENDENCIES) $(EXTRA_test_netinet_in_DEPENDENCIES) 
 	@rm -f test-netinet_in$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_netinet_in_OBJECTS) $(test_netinet_in_LDADD) $(LIBS)
+
 test-nl_langinfo$(EXEEXT): $(test_nl_langinfo_OBJECTS) $(test_nl_langinfo_DEPENDENCIES) $(EXTRA_test_nl_langinfo_DEPENDENCIES) 
 	@rm -f test-nl_langinfo$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_nl_langinfo_OBJECTS) $(test_nl_langinfo_LDADD) $(LIBS)
+
 test-open$(EXEEXT): $(test_open_OBJECTS) $(test_open_DEPENDENCIES) $(EXTRA_test_open_DEPENDENCIES) 
 	@rm -f test-open$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_open_OBJECTS) $(test_open_LDADD) $(LIBS)
+
 test-openat$(EXEEXT): $(test_openat_OBJECTS) $(test_openat_DEPENDENCIES) $(EXTRA_test_openat_DEPENDENCIES) 
 	@rm -f test-openat$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_openat_OBJECTS) $(test_openat_LDADD) $(LIBS)
+
 test-openat-safer$(EXEEXT): $(test_openat_safer_OBJECTS) $(test_openat_safer_DEPENDENCIES) $(EXTRA_test_openat_safer_DEPENDENCIES) 
 	@rm -f test-openat-safer$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_openat_safer_OBJECTS) $(test_openat_safer_LDADD) $(LIBS)
+
 test-parse-datetime$(EXEEXT): $(test_parse_datetime_OBJECTS) $(test_parse_datetime_DEPENDENCIES) $(EXTRA_test_parse_datetime_DEPENDENCIES) 
 	@rm -f test-parse-datetime$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_parse_datetime_OBJECTS) $(test_parse_datetime_LDADD) $(LIBS)
+
 test-pathmax$(EXEEXT): $(test_pathmax_OBJECTS) $(test_pathmax_DEPENDENCIES) $(EXTRA_test_pathmax_DEPENDENCIES) 
 	@rm -f test-pathmax$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pathmax_OBJECTS) $(test_pathmax_LDADD) $(LIBS)
+
 test-perror$(EXEEXT): $(test_perror_OBJECTS) $(test_perror_DEPENDENCIES) $(EXTRA_test_perror_DEPENDENCIES) 
 	@rm -f test-perror$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_perror_OBJECTS) $(test_perror_LDADD) $(LIBS)
+
 test-perror2$(EXEEXT): $(test_perror2_OBJECTS) $(test_perror2_DEPENDENCIES) $(EXTRA_test_perror2_DEPENDENCIES) 
 	@rm -f test-perror2$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_perror2_OBJECTS) $(test_perror2_LDADD) $(LIBS)
+
 test-pipe$(EXEEXT): $(test_pipe_OBJECTS) $(test_pipe_DEPENDENCIES) $(EXTRA_test_pipe_DEPENDENCIES) 
 	@rm -f test-pipe$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pipe_OBJECTS) $(test_pipe_LDADD) $(LIBS)
-test-pipe2$(EXEEXT): $(test_pipe2_OBJECTS) $(test_pipe2_DEPENDENCIES) $(EXTRA_test_pipe2_DEPENDENCIES) 
-	@rm -f test-pipe2$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_pipe2_OBJECTS) $(test_pipe2_LDADD) $(LIBS)
-test-posix_spawn1$(EXEEXT): $(test_posix_spawn1_OBJECTS) $(test_posix_spawn1_DEPENDENCIES) $(EXTRA_test_posix_spawn1_DEPENDENCIES) 
-	@rm -f test-posix_spawn1$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_posix_spawn1_OBJECTS) $(test_posix_spawn1_LDADD) $(LIBS)
-test-posix_spawn2$(EXEEXT): $(test_posix_spawn2_OBJECTS) $(test_posix_spawn2_DEPENDENCIES) $(EXTRA_test_posix_spawn2_DEPENDENCIES) 
-	@rm -f test-posix_spawn2$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_posix_spawn2_OBJECTS) $(test_posix_spawn2_LDADD) $(LIBS)
-test-posix_spawn_file_actions_addclose$(EXEEXT): $(test_posix_spawn_file_actions_addclose_OBJECTS) $(test_posix_spawn_file_actions_addclose_DEPENDENCIES) $(EXTRA_test_posix_spawn_file_actions_addclose_DEPENDENCIES) 
-	@rm -f test-posix_spawn_file_actions_addclose$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_posix_spawn_file_actions_addclose_OBJECTS) $(test_posix_spawn_file_actions_addclose_LDADD) $(LIBS)
-test-posix_spawn_file_actions_adddup2$(EXEEXT): $(test_posix_spawn_file_actions_adddup2_OBJECTS) $(test_posix_spawn_file_actions_adddup2_DEPENDENCIES) $(EXTRA_test_posix_spawn_file_actions_adddup2_DEPENDENCIES) 
-	@rm -f test-posix_spawn_file_actions_adddup2$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_posix_spawn_file_actions_adddup2_OBJECTS) $(test_posix_spawn_file_actions_adddup2_LDADD) $(LIBS)
-test-posix_spawn_file_actions_addopen$(EXEEXT): $(test_posix_spawn_file_actions_addopen_OBJECTS) $(test_posix_spawn_file_actions_addopen_DEPENDENCIES) $(EXTRA_test_posix_spawn_file_actions_addopen_DEPENDENCIES) 
-	@rm -f test-posix_spawn_file_actions_addopen$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_posix_spawn_file_actions_addopen_OBJECTS) $(test_posix_spawn_file_actions_addopen_LDADD) $(LIBS)
+
 test-posixtm$(EXEEXT): $(test_posixtm_OBJECTS) $(test_posixtm_DEPENDENCIES) $(EXTRA_test_posixtm_DEPENDENCIES) 
 	@rm -f test-posixtm$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_posixtm_OBJECTS) $(test_posixtm_LDADD) $(LIBS)
+
 test-printf-frexp$(EXEEXT): $(test_printf_frexp_OBJECTS) $(test_printf_frexp_DEPENDENCIES) $(EXTRA_test_printf_frexp_DEPENDENCIES) 
 	@rm -f test-printf-frexp$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_printf_frexp_OBJECTS) $(test_printf_frexp_LDADD) $(LIBS)
+
 test-printf-frexpl$(EXEEXT): $(test_printf_frexpl_OBJECTS) $(test_printf_frexpl_DEPENDENCIES) $(EXTRA_test_printf_frexpl_DEPENDENCIES) 
 	@rm -f test-printf-frexpl$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_printf_frexpl_OBJECTS) $(test_printf_frexpl_LDADD) $(LIBS)
+
 test-priv-set$(EXEEXT): $(test_priv_set_OBJECTS) $(test_priv_set_DEPENDENCIES) $(EXTRA_test_priv_set_DEPENDENCIES) 
 	@rm -f test-priv-set$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_priv_set_OBJECTS) $(test_priv_set_LDADD) $(LIBS)
+
 test-quotearg-simple$(EXEEXT): $(test_quotearg_simple_OBJECTS) $(test_quotearg_simple_DEPENDENCIES) $(EXTRA_test_quotearg_simple_DEPENDENCIES) 
 	@rm -f test-quotearg-simple$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_quotearg_simple_OBJECTS) $(test_quotearg_simple_LDADD) $(LIBS)
+
 test-raise$(EXEEXT): $(test_raise_OBJECTS) $(test_raise_DEPENDENCIES) $(EXTRA_test_raise_DEPENDENCIES) 
 	@rm -f test-raise$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_raise_OBJECTS) $(test_raise_LDADD) $(LIBS)
+
 test-rand-isaac$(EXEEXT): $(test_rand_isaac_OBJECTS) $(test_rand_isaac_DEPENDENCIES) $(EXTRA_test_rand_isaac_DEPENDENCIES) 
 	@rm -f test-rand-isaac$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_rand_isaac_OBJECTS) $(test_rand_isaac_LDADD) $(LIBS)
-test-rawmemchr$(EXEEXT): $(test_rawmemchr_OBJECTS) $(test_rawmemchr_DEPENDENCIES) $(EXTRA_test_rawmemchr_DEPENDENCIES) 
-	@rm -f test-rawmemchr$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_rawmemchr_OBJECTS) $(test_rawmemchr_LDADD) $(LIBS)
+
 test-read$(EXEEXT): $(test_read_OBJECTS) $(test_read_DEPENDENCIES) $(EXTRA_test_read_DEPENDENCIES) 
 	@rm -f test-read$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_read_OBJECTS) $(test_read_LDADD) $(LIBS)
+
 test-read-file$(EXEEXT): $(test_read_file_OBJECTS) $(test_read_file_DEPENDENCIES) $(EXTRA_test_read_file_DEPENDENCIES) 
 	@rm -f test-read-file$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_read_file_OBJECTS) $(test_read_file_LDADD) $(LIBS)
+
 test-readlink$(EXEEXT): $(test_readlink_OBJECTS) $(test_readlink_DEPENDENCIES) $(EXTRA_test_readlink_DEPENDENCIES) 
 	@rm -f test-readlink$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_readlink_OBJECTS) $(test_readlink_LDADD) $(LIBS)
+
 test-readlinkat$(EXEEXT): $(test_readlinkat_OBJECTS) $(test_readlinkat_DEPENDENCIES) $(EXTRA_test_readlinkat_DEPENDENCIES) 
 	@rm -f test-readlinkat$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_readlinkat_OBJECTS) $(test_readlinkat_LDADD) $(LIBS)
+
 test-readtokens$(EXEEXT): $(test_readtokens_OBJECTS) $(test_readtokens_DEPENDENCIES) $(EXTRA_test_readtokens_DEPENDENCIES) 
 	@rm -f test-readtokens$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_readtokens_OBJECTS) $(test_readtokens_LDADD) $(LIBS)
+
 test-realloc-gnu$(EXEEXT): $(test_realloc_gnu_OBJECTS) $(test_realloc_gnu_DEPENDENCIES) $(EXTRA_test_realloc_gnu_DEPENDENCIES) 
 	@rm -f test-realloc-gnu$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_realloc_gnu_OBJECTS) $(test_realloc_gnu_LDADD) $(LIBS)
+
 test-regex$(EXEEXT): $(test_regex_OBJECTS) $(test_regex_DEPENDENCIES) $(EXTRA_test_regex_DEPENDENCIES) 
 	@rm -f test-regex$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_regex_OBJECTS) $(test_regex_LDADD) $(LIBS)
+
 test-remove$(EXEEXT): $(test_remove_OBJECTS) $(test_remove_DEPENDENCIES) $(EXTRA_test_remove_DEPENDENCIES) 
 	@rm -f test-remove$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_remove_OBJECTS) $(test_remove_LDADD) $(LIBS)
+
 test-rename$(EXEEXT): $(test_rename_OBJECTS) $(test_rename_DEPENDENCIES) $(EXTRA_test_rename_DEPENDENCIES) 
 	@rm -f test-rename$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_rename_OBJECTS) $(test_rename_LDADD) $(LIBS)
+
 test-rmdir$(EXEEXT): $(test_rmdir_OBJECTS) $(test_rmdir_DEPENDENCIES) $(EXTRA_test_rmdir_DEPENDENCIES) 
 	@rm -f test-rmdir$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_rmdir_OBJECTS) $(test_rmdir_LDADD) $(LIBS)
+
 test-sameacls$(EXEEXT): $(test_sameacls_OBJECTS) $(test_sameacls_DEPENDENCIES) $(EXTRA_test_sameacls_DEPENDENCIES) 
 	@rm -f test-sameacls$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_sameacls_OBJECTS) $(test_sameacls_LDADD) $(LIBS)
+
 test-sched$(EXEEXT): $(test_sched_OBJECTS) $(test_sched_DEPENDENCIES) $(EXTRA_test_sched_DEPENDENCIES) 
 	@rm -f test-sched$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_sched_OBJECTS) $(test_sched_LDADD) $(LIBS)
+
 test-select$(EXEEXT): $(test_select_OBJECTS) $(test_select_DEPENDENCIES) $(EXTRA_test_select_DEPENDENCIES) 
 	@rm -f test-select$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_select_OBJECTS) $(test_select_LDADD) $(LIBS)
+
 test-select-fd$(EXEEXT): $(test_select_fd_OBJECTS) $(test_select_fd_DEPENDENCIES) $(EXTRA_test_select_fd_DEPENDENCIES) 
 	@rm -f test-select-fd$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_select_fd_OBJECTS) $(test_select_fd_LDADD) $(LIBS)
+
 test-select-stdin$(EXEEXT): $(test_select_stdin_OBJECTS) $(test_select_stdin_DEPENDENCIES) $(EXTRA_test_select_stdin_DEPENDENCIES) 
 	@rm -f test-select-stdin$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_select_stdin_OBJECTS) $(test_select_stdin_LDADD) $(LIBS)
+
 test-set-mode-acl$(EXEEXT): $(test_set_mode_acl_OBJECTS) $(test_set_mode_acl_DEPENDENCIES) $(EXTRA_test_set_mode_acl_DEPENDENCIES) 
 	@rm -f test-set-mode-acl$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_set_mode_acl_OBJECTS) $(test_set_mode_acl_LDADD) $(LIBS)
+
 test-setenv$(EXEEXT): $(test_setenv_OBJECTS) $(test_setenv_DEPENDENCIES) $(EXTRA_test_setenv_DEPENDENCIES) 
 	@rm -f test-setenv$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_setenv_OBJECTS) $(test_setenv_LDADD) $(LIBS)
+
 test-setlocale1$(EXEEXT): $(test_setlocale1_OBJECTS) $(test_setlocale1_DEPENDENCIES) $(EXTRA_test_setlocale1_DEPENDENCIES) 
 	@rm -f test-setlocale1$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_setlocale1_OBJECTS) $(test_setlocale1_LDADD) $(LIBS)
+
 test-setlocale2$(EXEEXT): $(test_setlocale2_OBJECTS) $(test_setlocale2_DEPENDENCIES) $(EXTRA_test_setlocale2_DEPENDENCIES) 
 	@rm -f test-setlocale2$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_setlocale2_OBJECTS) $(test_setlocale2_LDADD) $(LIBS)
+
 test-setsockopt$(EXEEXT): $(test_setsockopt_OBJECTS) $(test_setsockopt_DEPENDENCIES) $(EXTRA_test_setsockopt_DEPENDENCIES) 
 	@rm -f test-setsockopt$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_setsockopt_OBJECTS) $(test_setsockopt_LDADD) $(LIBS)
+
 test-sha1$(EXEEXT): $(test_sha1_OBJECTS) $(test_sha1_DEPENDENCIES) $(EXTRA_test_sha1_DEPENDENCIES) 
 	@rm -f test-sha1$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_sha1_OBJECTS) $(test_sha1_LDADD) $(LIBS)
+
 test-sigaction$(EXEEXT): $(test_sigaction_OBJECTS) $(test_sigaction_DEPENDENCIES) $(EXTRA_test_sigaction_DEPENDENCIES) 
 	@rm -f test-sigaction$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_sigaction_OBJECTS) $(test_sigaction_LDADD) $(LIBS)
+
 test-signal-h$(EXEEXT): $(test_signal_h_OBJECTS) $(test_signal_h_DEPENDENCIES) $(EXTRA_test_signal_h_DEPENDENCIES) 
 	@rm -f test-signal-h$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_signal_h_OBJECTS) $(test_signal_h_LDADD) $(LIBS)
+
 test-signbit$(EXEEXT): $(test_signbit_OBJECTS) $(test_signbit_DEPENDENCIES) $(EXTRA_test_signbit_DEPENDENCIES) 
 	@rm -f test-signbit$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_signbit_OBJECTS) $(test_signbit_LDADD) $(LIBS)
+
 test-sigprocmask$(EXEEXT): $(test_sigprocmask_OBJECTS) $(test_sigprocmask_DEPENDENCIES) $(EXTRA_test_sigprocmask_DEPENDENCIES) 
 	@rm -f test-sigprocmask$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_sigprocmask_OBJECTS) $(test_sigprocmask_LDADD) $(LIBS)
+
 test-sleep$(EXEEXT): $(test_sleep_OBJECTS) $(test_sleep_DEPENDENCIES) $(EXTRA_test_sleep_DEPENDENCIES) 
 	@rm -f test-sleep$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_sleep_OBJECTS) $(test_sleep_LDADD) $(LIBS)
+
 test-snprintf$(EXEEXT): $(test_snprintf_OBJECTS) $(test_snprintf_DEPENDENCIES) $(EXTRA_test_snprintf_DEPENDENCIES) 
 	@rm -f test-snprintf$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_snprintf_OBJECTS) $(test_snprintf_LDADD) $(LIBS)
+
 test-sockets$(EXEEXT): $(test_sockets_OBJECTS) $(test_sockets_DEPENDENCIES) $(EXTRA_test_sockets_DEPENDENCIES) 
 	@rm -f test-sockets$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_sockets_OBJECTS) $(test_sockets_LDADD) $(LIBS)
-test-spawn$(EXEEXT): $(test_spawn_OBJECTS) $(test_spawn_DEPENDENCIES) $(EXTRA_test_spawn_DEPENDENCIES) 
-	@rm -f test-spawn$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_spawn_OBJECTS) $(test_spawn_LDADD) $(LIBS)
-test-spawn-pipe-child$(EXEEXT): $(test_spawn_pipe_child_OBJECTS) $(test_spawn_pipe_child_DEPENDENCIES) $(EXTRA_test_spawn_pipe_child_DEPENDENCIES) 
-	@rm -f test-spawn-pipe-child$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_spawn_pipe_child_OBJECTS) $(test_spawn_pipe_child_LDADD) $(LIBS)
-test-spawn-pipe-main$(EXEEXT): $(test_spawn_pipe_main_OBJECTS) $(test_spawn_pipe_main_DEPENDENCIES) $(EXTRA_test_spawn_pipe_main_DEPENDENCIES) 
-	@rm -f test-spawn-pipe-main$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_spawn_pipe_main_OBJECTS) $(test_spawn_pipe_main_LDADD) $(LIBS)
+
 test-stat$(EXEEXT): $(test_stat_OBJECTS) $(test_stat_DEPENDENCIES) $(EXTRA_test_stat_DEPENDENCIES) 
 	@rm -f test-stat$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_stat_OBJECTS) $(test_stat_LDADD) $(LIBS)
+
 test-stat-time$(EXEEXT): $(test_stat_time_OBJECTS) $(test_stat_time_DEPENDENCIES) $(EXTRA_test_stat_time_DEPENDENCIES) 
 	@rm -f test-stat-time$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_stat_time_OBJECTS) $(test_stat_time_LDADD) $(LIBS)
+
 test-statat$(EXEEXT): $(test_statat_OBJECTS) $(test_statat_DEPENDENCIES) $(EXTRA_test_statat_DEPENDENCIES) 
 	@rm -f test-statat$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_statat_OBJECTS) $(test_statat_LDADD) $(LIBS)
+
 test-stdalign$(EXEEXT): $(test_stdalign_OBJECTS) $(test_stdalign_DEPENDENCIES) $(EXTRA_test_stdalign_DEPENDENCIES) 
 	@rm -f test-stdalign$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_stdalign_OBJECTS) $(test_stdalign_LDADD) $(LIBS)
+
 test-stdbool$(EXEEXT): $(test_stdbool_OBJECTS) $(test_stdbool_DEPENDENCIES) $(EXTRA_test_stdbool_DEPENDENCIES) 
 	@rm -f test-stdbool$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_stdbool_OBJECTS) $(test_stdbool_LDADD) $(LIBS)
+
 test-stddef$(EXEEXT): $(test_stddef_OBJECTS) $(test_stddef_DEPENDENCIES) $(EXTRA_test_stddef_DEPENDENCIES) 
 	@rm -f test-stddef$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_stddef_OBJECTS) $(test_stddef_LDADD) $(LIBS)
+
 test-stdint$(EXEEXT): $(test_stdint_OBJECTS) $(test_stdint_DEPENDENCIES) $(EXTRA_test_stdint_DEPENDENCIES) 
 	@rm -f test-stdint$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_stdint_OBJECTS) $(test_stdint_LDADD) $(LIBS)
+
 test-stdio$(EXEEXT): $(test_stdio_OBJECTS) $(test_stdio_DEPENDENCIES) $(EXTRA_test_stdio_DEPENDENCIES) 
 	@rm -f test-stdio$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_stdio_OBJECTS) $(test_stdio_LDADD) $(LIBS)
+
 test-stdlib$(EXEEXT): $(test_stdlib_OBJECTS) $(test_stdlib_DEPENDENCIES) $(EXTRA_test_stdlib_DEPENDENCIES) 
 	@rm -f test-stdlib$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_stdlib_OBJECTS) $(test_stdlib_LDADD) $(LIBS)
-test-strchrnul$(EXEEXT): $(test_strchrnul_OBJECTS) $(test_strchrnul_DEPENDENCIES) $(EXTRA_test_strchrnul_DEPENDENCIES) 
-	@rm -f test-strchrnul$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_strchrnul_OBJECTS) $(test_strchrnul_LDADD) $(LIBS)
+
 test-strerror$(EXEEXT): $(test_strerror_OBJECTS) $(test_strerror_DEPENDENCIES) $(EXTRA_test_strerror_DEPENDENCIES) 
 	@rm -f test-strerror$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_strerror_OBJECTS) $(test_strerror_LDADD) $(LIBS)
+
 test-strerror_r$(EXEEXT): $(test_strerror_r_OBJECTS) $(test_strerror_r_DEPENDENCIES) $(EXTRA_test_strerror_r_DEPENDENCIES) 
 	@rm -f test-strerror_r$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_strerror_r_OBJECTS) $(test_strerror_r_LDADD) $(LIBS)
+
 test-strftime$(EXEEXT): $(test_strftime_OBJECTS) $(test_strftime_DEPENDENCIES) $(EXTRA_test_strftime_DEPENDENCIES) 
 	@rm -f test-strftime$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_strftime_OBJECTS) $(test_strftime_LDADD) $(LIBS)
+
 test-striconv$(EXEEXT): $(test_striconv_OBJECTS) $(test_striconv_DEPENDENCIES) $(EXTRA_test_striconv_DEPENDENCIES) 
 	@rm -f test-striconv$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_striconv_OBJECTS) $(test_striconv_LDADD) $(LIBS)
+
 test-string$(EXEEXT): $(test_string_OBJECTS) $(test_string_DEPENDENCIES) $(EXTRA_test_string_DEPENDENCIES) 
 	@rm -f test-string$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_string_OBJECTS) $(test_string_LDADD) $(LIBS)
+
 test-strncat$(EXEEXT): $(test_strncat_OBJECTS) $(test_strncat_DEPENDENCIES) $(EXTRA_test_strncat_DEPENDENCIES) 
 	@rm -f test-strncat$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_strncat_OBJECTS) $(test_strncat_LDADD) $(LIBS)
+
 test-strnlen$(EXEEXT): $(test_strnlen_OBJECTS) $(test_strnlen_DEPENDENCIES) $(EXTRA_test_strnlen_DEPENDENCIES) 
 	@rm -f test-strnlen$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_strnlen_OBJECTS) $(test_strnlen_LDADD) $(LIBS)
+
 test-strsignal$(EXEEXT): $(test_strsignal_OBJECTS) $(test_strsignal_DEPENDENCIES) $(EXTRA_test_strsignal_DEPENDENCIES) 
 	@rm -f test-strsignal$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_strsignal_OBJECTS) $(test_strsignal_LDADD) $(LIBS)
+
 test-strtod$(EXEEXT): $(test_strtod_OBJECTS) $(test_strtod_DEPENDENCIES) $(EXTRA_test_strtod_DEPENDENCIES) 
 	@rm -f test-strtod$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_strtod_OBJECTS) $(test_strtod_LDADD) $(LIBS)
+
 test-strtoimax$(EXEEXT): $(test_strtoimax_OBJECTS) $(test_strtoimax_DEPENDENCIES) $(EXTRA_test_strtoimax_DEPENDENCIES) 
 	@rm -f test-strtoimax$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_strtoimax_OBJECTS) $(test_strtoimax_LDADD) $(LIBS)
+
 test-strtoll$(EXEEXT): $(test_strtoll_OBJECTS) $(test_strtoll_DEPENDENCIES) $(EXTRA_test_strtoll_DEPENDENCIES) 
 	@rm -f test-strtoll$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_strtoll_OBJECTS) $(test_strtoll_LDADD) $(LIBS)
+
 test-strtoull$(EXEEXT): $(test_strtoull_OBJECTS) $(test_strtoull_DEPENDENCIES) $(EXTRA_test_strtoull_DEPENDENCIES) 
 	@rm -f test-strtoull$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_strtoull_OBJECTS) $(test_strtoull_LDADD) $(LIBS)
+
 test-strtoumax$(EXEEXT): $(test_strtoumax_OBJECTS) $(test_strtoumax_DEPENDENCIES) $(EXTRA_test_strtoumax_DEPENDENCIES) 
 	@rm -f test-strtoumax$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_strtoumax_OBJECTS) $(test_strtoumax_LDADD) $(LIBS)
+
 test-symlink$(EXEEXT): $(test_symlink_OBJECTS) $(test_symlink_DEPENDENCIES) $(EXTRA_test_symlink_DEPENDENCIES) 
 	@rm -f test-symlink$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_symlink_OBJECTS) $(test_symlink_LDADD) $(LIBS)
+
 test-symlinkat$(EXEEXT): $(test_symlinkat_OBJECTS) $(test_symlinkat_DEPENDENCIES) $(EXTRA_test_symlinkat_DEPENDENCIES) 
 	@rm -f test-symlinkat$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_symlinkat_OBJECTS) $(test_symlinkat_LDADD) $(LIBS)
+
 test-sys_ioctl$(EXEEXT): $(test_sys_ioctl_OBJECTS) $(test_sys_ioctl_DEPENDENCIES) $(EXTRA_test_sys_ioctl_DEPENDENCIES) 
 	@rm -f test-sys_ioctl$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_sys_ioctl_OBJECTS) $(test_sys_ioctl_LDADD) $(LIBS)
+
 test-sys_resource$(EXEEXT): $(test_sys_resource_OBJECTS) $(test_sys_resource_DEPENDENCIES) $(EXTRA_test_sys_resource_DEPENDENCIES) 
 	@rm -f test-sys_resource$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_sys_resource_OBJECTS) $(test_sys_resource_LDADD) $(LIBS)
+
 test-sys_select$(EXEEXT): $(test_sys_select_OBJECTS) $(test_sys_select_DEPENDENCIES) $(EXTRA_test_sys_select_DEPENDENCIES) 
 	@rm -f test-sys_select$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_sys_select_OBJECTS) $(test_sys_select_LDADD) $(LIBS)
+
 test-sys_socket$(EXEEXT): $(test_sys_socket_OBJECTS) $(test_sys_socket_DEPENDENCIES) $(EXTRA_test_sys_socket_DEPENDENCIES) 
 	@rm -f test-sys_socket$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_sys_socket_OBJECTS) $(test_sys_socket_LDADD) $(LIBS)
+
 test-sys_stat$(EXEEXT): $(test_sys_stat_OBJECTS) $(test_sys_stat_DEPENDENCIES) $(EXTRA_test_sys_stat_DEPENDENCIES) 
 	@rm -f test-sys_stat$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_sys_stat_OBJECTS) $(test_sys_stat_LDADD) $(LIBS)
+
 test-sys_time$(EXEEXT): $(test_sys_time_OBJECTS) $(test_sys_time_DEPENDENCIES) $(EXTRA_test_sys_time_DEPENDENCIES) 
 	@rm -f test-sys_time$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_sys_time_OBJECTS) $(test_sys_time_LDADD) $(LIBS)
+
 test-sys_types$(EXEEXT): $(test_sys_types_OBJECTS) $(test_sys_types_DEPENDENCIES) $(EXTRA_test_sys_types_DEPENDENCIES) 
 	@rm -f test-sys_types$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_sys_types_OBJECTS) $(test_sys_types_LDADD) $(LIBS)
+
 test-sys_uio$(EXEEXT): $(test_sys_uio_OBJECTS) $(test_sys_uio_DEPENDENCIES) $(EXTRA_test_sys_uio_DEPENDENCIES) 
 	@rm -f test-sys_uio$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_sys_uio_OBJECTS) $(test_sys_uio_LDADD) $(LIBS)
+
 test-sys_utsname$(EXEEXT): $(test_sys_utsname_OBJECTS) $(test_sys_utsname_DEPENDENCIES) $(EXTRA_test_sys_utsname_DEPENDENCIES) 
 	@rm -f test-sys_utsname$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_sys_utsname_OBJECTS) $(test_sys_utsname_LDADD) $(LIBS)
+
 test-sys_wait$(EXEEXT): $(test_sys_wait_OBJECTS) $(test_sys_wait_DEPENDENCIES) $(EXTRA_test_sys_wait_DEPENDENCIES) 
 	@rm -f test-sys_wait$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_sys_wait_OBJECTS) $(test_sys_wait_LDADD) $(LIBS)
+
 test-termios$(EXEEXT): $(test_termios_OBJECTS) $(test_termios_DEPENDENCIES) $(EXTRA_test_termios_DEPENDENCIES) 
 	@rm -f test-termios$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_termios_OBJECTS) $(test_termios_LDADD) $(LIBS)
+
 test-thread_create$(EXEEXT): $(test_thread_create_OBJECTS) $(test_thread_create_DEPENDENCIES) $(EXTRA_test_thread_create_DEPENDENCIES) 
 	@rm -f test-thread_create$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_thread_create_OBJECTS) $(test_thread_create_LDADD) $(LIBS)
+
 test-thread_self$(EXEEXT): $(test_thread_self_OBJECTS) $(test_thread_self_DEPENDENCIES) $(EXTRA_test_thread_self_DEPENDENCIES) 
 	@rm -f test-thread_self$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_thread_self_OBJECTS) $(test_thread_self_LDADD) $(LIBS)
+
 test-time$(EXEEXT): $(test_time_OBJECTS) $(test_time_DEPENDENCIES) $(EXTRA_test_time_DEPENDENCIES) 
 	@rm -f test-time$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_time_OBJECTS) $(test_time_LDADD) $(LIBS)
+
 test-tls$(EXEEXT): $(test_tls_OBJECTS) $(test_tls_DEPENDENCIES) $(EXTRA_test_tls_DEPENDENCIES) 
 	@rm -f test-tls$(EXEEXT)
 	$(AM_V_CCLD)$(test_tls_LINK) $(test_tls_OBJECTS) $(test_tls_LDADD) $(LIBS)
+
 test-u64$(EXEEXT): $(test_u64_OBJECTS) $(test_u64_DEPENDENCIES) $(EXTRA_test_u64_DEPENDENCIES) 
 	@rm -f test-u64$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u64_OBJECTS) $(test_u64_LDADD) $(LIBS)
@@ -4851,11 +5070,13 @@ unistr/$(DEPDIR)/$(am__dirstamp):
 	@: > unistr/$(DEPDIR)/$(am__dirstamp)
 unistr/test-u8-mbtoucr.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
+
 test-u8-mbtoucr$(EXEEXT): $(test_u8_mbtoucr_OBJECTS) $(test_u8_mbtoucr_DEPENDENCIES) $(EXTRA_test_u8_mbtoucr_DEPENDENCIES) 
 	@rm -f test-u8-mbtoucr$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_mbtoucr_OBJECTS) $(test_u8_mbtoucr_LDADD) $(LIBS)
 unistr/test-u8-uctomb.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
+
 test-u8-uctomb$(EXEEXT): $(test_u8_uctomb_OBJECTS) $(test_u8_uctomb_DEPENDENCIES) $(EXTRA_test_u8_uctomb_DEPENDENCIES) 
 	@rm -f test-u8-uctomb$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_uctomb_OBJECTS) $(test_u8_uctomb_LDADD) $(LIBS)
@@ -4867,121 +5088,149 @@ uniwidth/$(DEPDIR)/$(am__dirstamp):
 	@: > uniwidth/$(DEPDIR)/$(am__dirstamp)
 uniwidth/test-uc_width.$(OBJEXT): uniwidth/$(am__dirstamp) \
 	uniwidth/$(DEPDIR)/$(am__dirstamp)
+
 test-uc_width$(EXEEXT): $(test_uc_width_OBJECTS) $(test_uc_width_DEPENDENCIES) $(EXTRA_test_uc_width_DEPENDENCIES) 
 	@rm -f test-uc_width$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_uc_width_OBJECTS) $(test_uc_width_LDADD) $(LIBS)
 uniwidth/test-uc_width2.$(OBJEXT): uniwidth/$(am__dirstamp) \
 	uniwidth/$(DEPDIR)/$(am__dirstamp)
+
 test-uc_width2$(EXEEXT): $(test_uc_width2_OBJECTS) $(test_uc_width2_DEPENDENCIES) $(EXTRA_test_uc_width2_DEPENDENCIES) 
 	@rm -f test-uc_width2$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_uc_width2_OBJECTS) $(test_uc_width2_LDADD) $(LIBS)
+
 test-uname$(EXEEXT): $(test_uname_OBJECTS) $(test_uname_DEPENDENCIES) $(EXTRA_test_uname_DEPENDENCIES) 
 	@rm -f test-uname$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_uname_OBJECTS) $(test_uname_LDADD) $(LIBS)
+
 test-unistd$(EXEEXT): $(test_unistd_OBJECTS) $(test_unistd_DEPENDENCIES) $(EXTRA_test_unistd_DEPENDENCIES) 
 	@rm -f test-unistd$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_unistd_OBJECTS) $(test_unistd_LDADD) $(LIBS)
+
 test-unlink$(EXEEXT): $(test_unlink_OBJECTS) $(test_unlink_DEPENDENCIES) $(EXTRA_test_unlink_DEPENDENCIES) 
 	@rm -f test-unlink$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_unlink_OBJECTS) $(test_unlink_LDADD) $(LIBS)
+
 test-unlinkat$(EXEEXT): $(test_unlinkat_OBJECTS) $(test_unlinkat_DEPENDENCIES) $(EXTRA_test_unlinkat_DEPENDENCIES) 
 	@rm -f test-unlinkat$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_unlinkat_OBJECTS) $(test_unlinkat_LDADD) $(LIBS)
+
 test-unsetenv$(EXEEXT): $(test_unsetenv_OBJECTS) $(test_unsetenv_DEPENDENCIES) $(EXTRA_test_unsetenv_DEPENDENCIES) 
 	@rm -f test-unsetenv$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_unsetenv_OBJECTS) $(test_unsetenv_LDADD) $(LIBS)
+
 test-userspec$(EXEEXT): $(test_userspec_OBJECTS) $(test_userspec_DEPENDENCIES) $(EXTRA_test_userspec_DEPENDENCIES) 
 	@rm -f test-userspec$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_userspec_OBJECTS) $(test_userspec_LDADD) $(LIBS)
-test-usleep$(EXEEXT): $(test_usleep_OBJECTS) $(test_usleep_DEPENDENCIES) $(EXTRA_test_usleep_DEPENDENCIES) 
-	@rm -f test-usleep$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_usleep_OBJECTS) $(test_usleep_LDADD) $(LIBS)
+
 test-utimens$(EXEEXT): $(test_utimens_OBJECTS) $(test_utimens_DEPENDENCIES) $(EXTRA_test_utimens_DEPENDENCIES) 
 	@rm -f test-utimens$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_utimens_OBJECTS) $(test_utimens_LDADD) $(LIBS)
+
 test-utimensat$(EXEEXT): $(test_utimensat_OBJECTS) $(test_utimensat_DEPENDENCIES) $(EXTRA_test_utimensat_DEPENDENCIES) 
 	@rm -f test-utimensat$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_utimensat_OBJECTS) $(test_utimensat_LDADD) $(LIBS)
+
 test-vasnprintf$(EXEEXT): $(test_vasnprintf_OBJECTS) $(test_vasnprintf_DEPENDENCIES) $(EXTRA_test_vasnprintf_DEPENDENCIES) 
 	@rm -f test-vasnprintf$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_vasnprintf_OBJECTS) $(test_vasnprintf_LDADD) $(LIBS)
+
 test-vasprintf$(EXEEXT): $(test_vasprintf_OBJECTS) $(test_vasprintf_DEPENDENCIES) $(EXTRA_test_vasprintf_DEPENDENCIES) 
 	@rm -f test-vasprintf$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_vasprintf_OBJECTS) $(test_vasprintf_LDADD) $(LIBS)
+
 test-vasprintf-posix$(EXEEXT): $(test_vasprintf_posix_OBJECTS) $(test_vasprintf_posix_DEPENDENCIES) $(EXTRA_test_vasprintf_posix_DEPENDENCIES) 
 	@rm -f test-vasprintf-posix$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_vasprintf_posix_OBJECTS) $(test_vasprintf_posix_LDADD) $(LIBS)
+
 test-verify$(EXEEXT): $(test_verify_OBJECTS) $(test_verify_DEPENDENCIES) $(EXTRA_test_verify_DEPENDENCIES) 
 	@rm -f test-verify$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_verify_OBJECTS) $(test_verify_LDADD) $(LIBS)
+
 test-version-etc$(EXEEXT): $(test_version_etc_OBJECTS) $(test_version_etc_DEPENDENCIES) $(EXTRA_test_version_etc_DEPENDENCIES) 
 	@rm -f test-version-etc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_version_etc_OBJECTS) $(test_version_etc_LDADD) $(LIBS)
+
 test-vfprintf-posix$(EXEEXT): $(test_vfprintf_posix_OBJECTS) $(test_vfprintf_posix_DEPENDENCIES) $(EXTRA_test_vfprintf_posix_DEPENDENCIES) 
 	@rm -f test-vfprintf-posix$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_vfprintf_posix_OBJECTS) $(test_vfprintf_posix_LDADD) $(LIBS)
+
 test-vprintf-posix$(EXEEXT): $(test_vprintf_posix_OBJECTS) $(test_vprintf_posix_DEPENDENCIES) $(EXTRA_test_vprintf_posix_DEPENDENCIES) 
 	@rm -f test-vprintf-posix$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_vprintf_posix_OBJECTS) $(test_vprintf_posix_LDADD) $(LIBS)
+
 test-wchar$(EXEEXT): $(test_wchar_OBJECTS) $(test_wchar_DEPENDENCIES) $(EXTRA_test_wchar_DEPENDENCIES) 
 	@rm -f test-wchar$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_wchar_OBJECTS) $(test_wchar_LDADD) $(LIBS)
+
 test-wcrtomb$(EXEEXT): $(test_wcrtomb_OBJECTS) $(test_wcrtomb_DEPENDENCIES) $(EXTRA_test_wcrtomb_DEPENDENCIES) 
 	@rm -f test-wcrtomb$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_wcrtomb_OBJECTS) $(test_wcrtomb_LDADD) $(LIBS)
+
 test-wcrtomb-w32$(EXEEXT): $(test_wcrtomb_w32_OBJECTS) $(test_wcrtomb_w32_DEPENDENCIES) $(EXTRA_test_wcrtomb_w32_DEPENDENCIES) 
 	@rm -f test-wcrtomb-w32$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_wcrtomb_w32_OBJECTS) $(test_wcrtomb_w32_LDADD) $(LIBS)
+
 test-wctype-h$(EXEEXT): $(test_wctype_h_OBJECTS) $(test_wctype_h_DEPENDENCIES) $(EXTRA_test_wctype_h_DEPENDENCIES) 
 	@rm -f test-wctype-h$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_wctype_h_OBJECTS) $(test_wctype_h_LDADD) $(LIBS)
+
 test-wcwidth$(EXEEXT): $(test_wcwidth_OBJECTS) $(test_wcwidth_DEPENDENCIES) $(EXTRA_test_wcwidth_DEPENDENCIES) 
 	@rm -f test-wcwidth$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_wcwidth_OBJECTS) $(test_wcwidth_LDADD) $(LIBS)
+
 test-write$(EXEEXT): $(test_write_OBJECTS) $(test_write_DEPENDENCIES) $(EXTRA_test_write_DEPENDENCIES) 
 	@rm -f test-write$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_write_OBJECTS) $(test_write_LDADD) $(LIBS)
+
 test-xalloc-die$(EXEEXT): $(test_xalloc_die_OBJECTS) $(test_xalloc_die_DEPENDENCIES) $(EXTRA_test_xalloc_die_DEPENDENCIES) 
 	@rm -f test-xalloc-die$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_xalloc_die_OBJECTS) $(test_xalloc_die_LDADD) $(LIBS)
+
 test-xfprintf-posix$(EXEEXT): $(test_xfprintf_posix_OBJECTS) $(test_xfprintf_posix_DEPENDENCIES) $(EXTRA_test_xfprintf_posix_DEPENDENCIES) 
 	@rm -f test-xfprintf-posix$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_xfprintf_posix_OBJECTS) $(test_xfprintf_posix_LDADD) $(LIBS)
+
 test-xprintf-posix$(EXEEXT): $(test_xprintf_posix_OBJECTS) $(test_xprintf_posix_DEPENDENCIES) $(EXTRA_test_xprintf_posix_DEPENDENCIES) 
 	@rm -f test-xprintf-posix$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_xprintf_posix_OBJECTS) $(test_xprintf_posix_LDADD) $(LIBS)
+
 test-xstrtoimax$(EXEEXT): $(test_xstrtoimax_OBJECTS) $(test_xstrtoimax_DEPENDENCIES) $(EXTRA_test_xstrtoimax_DEPENDENCIES) 
 	@rm -f test-xstrtoimax$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_xstrtoimax_OBJECTS) $(test_xstrtoimax_LDADD) $(LIBS)
+
 test-xstrtol$(EXEEXT): $(test_xstrtol_OBJECTS) $(test_xstrtol_DEPENDENCIES) $(EXTRA_test_xstrtol_DEPENDENCIES) 
 	@rm -f test-xstrtol$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_xstrtol_OBJECTS) $(test_xstrtol_LDADD) $(LIBS)
+
 test-xstrtoul$(EXEEXT): $(test_xstrtoul_OBJECTS) $(test_xstrtoul_DEPENDENCIES) $(EXTRA_test_xstrtoul_DEPENDENCIES) 
 	@rm -f test-xstrtoul$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_xstrtoul_OBJECTS) $(test_xstrtoul_LDADD) $(LIBS)
+
 test-xstrtoumax$(EXEEXT): $(test_xstrtoumax_OBJECTS) $(test_xstrtoumax_DEPENDENCIES) $(EXTRA_test_xstrtoumax_DEPENDENCIES) 
 	@rm -f test-xstrtoumax$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_xstrtoumax_OBJECTS) $(test_xstrtoumax_LDADD) $(LIBS)
+
 test-xvasprintf$(EXEEXT): $(test_xvasprintf_OBJECTS) $(test_xvasprintf_DEPENDENCIES) $(EXTRA_test_xvasprintf_DEPENDENCIES) 
 	@rm -f test-xvasprintf$(EXEEXT)
 	$(AM_V_CCLD)$(test_xvasprintf_LINK) $(test_xvasprintf_OBJECTS) $(test_xvasprintf_LDADD) $(LIBS)
+
 test-yesno$(EXEEXT): $(test_yesno_OBJECTS) $(test_yesno_DEPENDENCIES) $(EXTRA_test_yesno_DEPENDENCIES) 
 	@rm -f test-yesno$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_yesno_OBJECTS) $(test_yesno_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
-	-rm -f glthread/thread.$(OBJEXT)
-	-rm -f unistr/test-u8-mbtoucr.$(OBJEXT)
-	-rm -f unistr/test-u8-uctomb.$(OBJEXT)
-	-rm -f uniwidth/test-uc_width.$(OBJEXT)
-	-rm -f uniwidth/test-uc_width2.$(OBJEXT)
+	-rm -f glthread/*.$(OBJEXT)
+	-rm -f unistr/*.$(OBJEXT)
+	-rm -f uniwidth/*.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/accept.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/at-func.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/binary-io.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bind.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/connect.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inet_pton.Po@am__quote@
@@ -4989,7 +5238,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/listen.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localename.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/perror.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pipe.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/randomd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/randoml.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setlocale.Po@am__quote@
@@ -5161,12 +5409,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-perror.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-perror2.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-pipe.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-pipe2.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-posix_spawn1.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-posix_spawn2.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-posix_spawn_file_actions_addclose.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-posix_spawn_file_actions_adddup2.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-posix_spawn_file_actions_addopen.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-posixtm.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-printf-frexp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-printf-frexpl.Po@am__quote@
@@ -5174,7 +5416,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-quotearg-simple.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-raise.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-rand-isaac.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-rawmemchr.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-read-file.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-read.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-readlink.Po@am__quote@
@@ -5203,9 +5444,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-sleep.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-snprintf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-sockets.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-spawn-pipe-child.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-spawn-pipe-main.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-spawn.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-stat-time.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-stat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-statat.Po@am__quote@
@@ -5215,7 +5453,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-stdint.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-stdio.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-stdlib.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-strchrnul.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-strerror.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-strerror_r.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-strftime.Po@am__quote@
@@ -5252,7 +5489,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-unlinkat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-unsetenv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-userspec.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-usleep.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-utimens.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-utimensat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-vasnprintf.Po@am__quote@
@@ -5280,7 +5516,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_tls-test-tls.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_xvasprintf-test-xvasprintf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unlinkdir.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usleep.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wctob.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wctomb.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@glthread/$(DEPDIR)/thread.Po@am__quote@
@@ -5389,22 +5624,25 @@ uninstall-man1:
 	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -5419,57 +5657,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -5485,12 +5678,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -5502,15 +5690,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -5519,789 +5703,2324 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+	rm -f $< $@
+	$(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+	@:
+
 $(TEST_SUITE_LOG): $(TEST_LOGS)
-	@$(am__sh_e_setup);						\
-	list='$(TEST_LOGS)';						\
-	results=`for f in $$list; do					\
-		   test -r $$f && read line < $$f && echo "$$line"	\
-		     || echo FAIL;					\
-		 done`;							\
-	all=`echo "$$results" | sed '/^$$/d' | wc -l | sed -e 's/^[	 ]*//'`; \
-	fail=`echo "$$results" | grep -c '^FAIL'`;			\
-	pass=`echo "$$results" | grep -c '^PASS'`;			\
-	skip=`echo "$$results" | grep -c '^SKIP'`;			\
-	xfail=`echo "$$results" | grep -c '^XFAIL'`;			\
-	xpass=`echo "$$results" | grep -c '^XPASS'`;			\
-	failures=`expr $$fail + $$xpass`;				\
-	all=`expr $$all - $$skip`;					\
-	if test "$$all" -eq 1; then tests=test; All=;			\
-	else tests=tests; All="All "; fi;				\
-	case fail=$$fail:xpass=$$xpass:xfail=$$xfail in			\
-	  fail=0:xpass=0:xfail=0)					\
-	    msg="$$All$$all $$tests passed.  ";				\
-	    exit=true;;							\
-	  fail=0:xpass=0:xfail=*)					\
-	    msg="$$All$$all $$tests behaved as expected";		\
-	    if test "$$xfail" -eq 1; then xfailures=failure;		\
-	    else xfailures=failures; fi;				\
-	    msg="$$msg ($$xfail expected $$xfailures).  ";		\
-	    exit=true;;							\
-	  fail=*:xpass=0:xfail=*)					\
-	    msg="$$fail of $$all $$tests failed.  ";			\
-	    exit=false;;						\
-	  fail=*:xpass=*:xfail=*)					\
-	    msg="$$failures of $$all $$tests did not behave as expected"; \
-	    if test "$$xpass" -eq 1; then xpasses=pass;			\
-	    else xpasses=passes; fi;					\
-	    msg="$$msg ($$xpass unexpected $$xpasses).  ";		\
-	    exit=false;;						\
-	  *)								\
-	    echo >&2 "incorrect case"; exit 4;;				\
-	esac;								\
-	if test "$$skip" -ne 0; then					\
-	  if test "$$skip" -eq 1; then					\
-	    msg="$$msg($$skip test was not run).  ";			\
-	  else								\
-	    msg="$$msg($$skip tests were not run).  ";			\
-	  fi;								\
-	fi;								\
+	@$(am__set_TESTS_bases); \
+	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+	redo_bases=`for i in $$bases; do \
+	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+	            done`; \
+	if test -n "$$redo_bases"; then \
+	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+	  if $(am__make_dryrun); then :; else \
+	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
+	  fi; \
+	fi; \
+	if test -n "$$am__remaking_logs"; then \
+	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+	       "recursion detected" >&2; \
+	else \
+	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+	fi; \
+	if $(am__make_dryrun); then :; else \
+	  st=0;  \
+	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+	  for i in $$redo_bases; do \
+	    test -f $$i.trs && test -r $$i.trs \
+	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+	    test -f $$i.log && test -r $$i.log \
+	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+	  done; \
+	  test $$st -eq 0 || exit 1; \
+	fi
+	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+	ws='[ 	]'; \
+	results=`for b in $$bases; do echo $$b.trs; done`; \
+	test -n "$$results" || results=/dev/null; \
+	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
+	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
+	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
+	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
+	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+	  success=true; \
+	else \
+	  success=false; \
+	fi; \
+	br='==================='; br=$$br$$br$$br$$br; \
+	result_count () \
+	{ \
+	    if test x"$$1" = x"--maybe-color"; then \
+	      maybe_colorize=yes; \
+	    elif test x"$$1" = x"--no-color"; then \
+	      maybe_colorize=no; \
+	    else \
+	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
+	    fi; \
+	    shift; \
+	    desc=$$1 count=$$2; \
+	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
+	      color_start=$$3 color_end=$$std; \
+	    else \
+	      color_start= color_end=; \
+	    fi; \
+	    echo "$${color_start}# $$desc $$count$${color_end}"; \
+	}; \
+	create_testsuite_report () \
+	{ \
+	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
+	  result_count $$1 "PASS: " $$pass  "$$grn"; \
+	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
+	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+	  result_count $$1 "FAIL: " $$fail  "$$red"; \
+	  result_count $$1 "XPASS:" $$xpass "$$red"; \
+	  result_count $$1 "ERROR:" $$error "$$mgn"; \
+	}; \
 	{								\
 	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
 	    $(am__rst_title);						\
-	  echo "$$msg";							\
+	  create_testsuite_report --no-color;				\
 	  echo;								\
 	  echo ".. contents:: :depth: 2";				\
 	  echo;								\
-	  for f in $$list; do						\
-	    test -r $$f && read line < $$f || line=;			\
-	    case $$line in						\
-	      PASS:*|XFAIL:*);;						\
-	      *) echo; cat $$f;;					\
-	    esac;							\
-	  done;								\
-	} >$(TEST_SUITE_LOG).tmp;					\
+	  for b in $$bases; do echo $$b; done				\
+	    | $(am__create_global_log);					\
+	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
 	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
-	if test "$$failures" -ne 0; then				\
-	  msg="$${msg}See $(subdir)/$(TEST_SUITE_LOG).  ";		\
-	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
-	    msg="$${msg}Please report to $(PACKAGE_BUGREPORT).  ";	\
-	  fi;								\
-	fi;								\
-	test x"$$VERBOSE" = x || $$exit || cat $(TEST_SUITE_LOG);	\
-	$(am__tty_colors);						\
-	if $$exit; then							\
+	if $$success; then						\
 	  col="$$grn";							\
 	 else								\
 	  col="$$red";							\
+	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
 	fi;								\
-	echo "$$msg" | $(am__text_box) "col=$$col" "std=$$std";		\
-	$$exit || exit 1
-
-check-TESTS recheck:
-	@if test $@ != recheck; then \
-	   list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list; \
-	 fi
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-	@list='' list2='$(TEST_LOGS)'; for f in $$list2; do \
-	  test .log = $$f && continue; \
-	  if test $@ = recheck; then \
-	    test -f $$f || continue; \
-	    if test -r $$f && read line < $$f; then \
-	      case $$line in FAIL*|XPASS*) : ;; *) continue;; esac; \
-	    fi; \
-	  fi; \
-	  if test -z "$$list"; then list=$$f; else list="$$list $$f"; fi; \
-	done; \
-	if test $@ = recheck && test -n "$$list"; then \
-	  $(am__make_dryrun) || rm -f $$list || exit 1; \
-	fi; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$list"
-recheck: $(check_LIBRARIES) $(check_PROGRAMS)
-
-am--mostlyclean-test-html:
-	list='$(TEST_LOGS:.log=.html)'; test -z "$$list" || rm -f $$list
-	rm -f $(TEST_SUITE_HTML)
-
-.log.html:
-	@list='$(RST2HTML) $$RST2HTML rst2html rst2html.py';		\
-	for r2h in $$list; do						\
-	  if ($$r2h --version) >/dev/null 2>&1; then			\
-	    R2H=$$r2h;							\
+	echo "$${col}$$br$${std}"; 					\
+	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}$$br$${std}"; 					\
+	create_testsuite_report --maybe-color;				\
+	echo "$$col$$br$$std";						\
+	if $$success; then :; else					\
+	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
+	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
+	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
 	  fi;								\
-	done;								\
-	if test -z "$$R2H"; then					\
-	  echo >&2 "cannot find rst2html, cannot create $@";		\
-	  exit 2;							\
+	  echo "$$col$$br$$std";					\
 	fi;								\
-	$$R2H $< >$@.tmp
-	@mv $@.tmp $@
-
-# Be sure to run check first, and then to convert the result.
-# Beware of concurrent executions.  Run "check" not "check-TESTS", as
-# check-SCRIPTS and other dependencies are rebuilt by the former only.
-# And expect check to fail.
-check-html recheck-html:
-	@target=`echo $@ | sed 's/-html$$//'`; \
-	rv=0; $(MAKE) $(AM_MAKEFLAGS) $$target || rv=$$?; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_HTML) TEST_LOGS= || exit 4; \
-	exit $$rv
+	$$success || exit 1
+
+check-TESTS:
+	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+	exit $$?;
+recheck: all $(check_LIBRARIES) $(check_PROGRAMS)
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	bases=`for i in $$bases; do echo $$i; done \
+	         | $(am__list_recheck_tests)` || exit 1; \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	log_list=`echo $$log_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+	        am__force_recheck=am--force-recheck \
+	        TEST_LOGS="$$log_list"; \
+	exit $$?
 test-accept.log: test-accept$(EXEEXT)
-	@p='test-accept$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-accept$(EXEEXT)'; \
+	b='test-accept'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-file-has-acl.sh.log: test-file-has-acl.sh
-	@p='test-file-has-acl.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-file-has-acl.sh'; \
+	b='test-file-has-acl.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-file-has-acl-1.sh.log: test-file-has-acl-1.sh
-	@p='test-file-has-acl-1.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-file-has-acl-1.sh'; \
+	b='test-file-has-acl-1.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-file-has-acl-2.sh.log: test-file-has-acl-2.sh
-	@p='test-file-has-acl-2.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-file-has-acl-2.sh'; \
+	b='test-file-has-acl-2.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-set-mode-acl.sh.log: test-set-mode-acl.sh
-	@p='test-set-mode-acl.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-set-mode-acl.sh'; \
+	b='test-set-mode-acl.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-set-mode-acl-1.sh.log: test-set-mode-acl-1.sh
-	@p='test-set-mode-acl-1.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-set-mode-acl-1.sh'; \
+	b='test-set-mode-acl-1.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-set-mode-acl-2.sh.log: test-set-mode-acl-2.sh
-	@p='test-set-mode-acl-2.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-set-mode-acl-2.sh'; \
+	b='test-set-mode-acl-2.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-copy-acl.sh.log: test-copy-acl.sh
-	@p='test-copy-acl.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-copy-acl.sh'; \
+	b='test-copy-acl.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-copy-acl-1.sh.log: test-copy-acl-1.sh
-	@p='test-copy-acl-1.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-copy-acl-1.sh'; \
+	b='test-copy-acl-1.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-copy-acl-2.sh.log: test-copy-acl-2.sh
-	@p='test-copy-acl-2.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-copy-acl-2.sh'; \
+	b='test-copy-acl-2.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-alignof.log: test-alignof$(EXEEXT)
-	@p='test-alignof$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-alignof$(EXEEXT)'; \
+	b='test-alignof'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-alloca-opt.log: test-alloca-opt$(EXEEXT)
-	@p='test-alloca-opt$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-alloca-opt$(EXEEXT)'; \
+	b='test-alloca-opt'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-areadlink.log: test-areadlink$(EXEEXT)
-	@p='test-areadlink$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-areadlink$(EXEEXT)'; \
+	b='test-areadlink'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-areadlink-with-size.log: test-areadlink-with-size$(EXEEXT)
-	@p='test-areadlink-with-size$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-areadlink-with-size$(EXEEXT)'; \
+	b='test-areadlink-with-size'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-areadlinkat.log: test-areadlinkat$(EXEEXT)
-	@p='test-areadlinkat$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-areadlinkat$(EXEEXT)'; \
+	b='test-areadlinkat'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-argmatch.log: test-argmatch$(EXEEXT)
-	@p='test-argmatch$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-argmatch$(EXEEXT)'; \
+	b='test-argmatch'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-argv-iter.log: test-argv-iter$(EXEEXT)
-	@p='test-argv-iter$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-argv-iter$(EXEEXT)'; \
+	b='test-argv-iter'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-arpa_inet.log: test-arpa_inet$(EXEEXT)
-	@p='test-arpa_inet$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-arpa_inet$(EXEEXT)'; \
+	b='test-arpa_inet'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-base64.log: test-base64$(EXEEXT)
-	@p='test-base64$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-base64$(EXEEXT)'; \
+	b='test-base64'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-binary-io.sh.log: test-binary-io.sh
-	@p='test-binary-io.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-binary-io.sh'; \
+	b='test-binary-io.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-bind.log: test-bind$(EXEEXT)
-	@p='test-bind$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-bind$(EXEEXT)'; \
+	b='test-bind'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-bitrotate.log: test-bitrotate$(EXEEXT)
-	@p='test-bitrotate$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-bitrotate$(EXEEXT)'; \
+	b='test-bitrotate'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-btowc1.sh.log: test-btowc1.sh
-	@p='test-btowc1.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-btowc1.sh'; \
+	b='test-btowc1.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-btowc2.sh.log: test-btowc2.sh
-	@p='test-btowc2.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-btowc2.sh'; \
+	b='test-btowc2.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-c-ctype.log: test-c-ctype$(EXEEXT)
-	@p='test-c-ctype$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-c-ctype$(EXEEXT)'; \
+	b='test-c-ctype'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-c-strcase.sh.log: test-c-strcase.sh
-	@p='test-c-strcase.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-c-strcase.sh'; \
+	b='test-c-strcase.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-calloc-gnu.log: test-calloc-gnu$(EXEEXT)
-	@p='test-calloc-gnu$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-calloc-gnu$(EXEEXT)'; \
+	b='test-calloc-gnu'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-canonicalize.log: test-canonicalize$(EXEEXT)
-	@p='test-canonicalize$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-canonicalize$(EXEEXT)'; \
+	b='test-canonicalize'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-chdir.log: test-chdir$(EXEEXT)
-	@p='test-chdir$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-chdir$(EXEEXT)'; \
+	b='test-chdir'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-chown.log: test-chown$(EXEEXT)
-	@p='test-chown$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-chown$(EXEEXT)'; \
+	b='test-chown'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-cloexec.log: test-cloexec$(EXEEXT)
-	@p='test-cloexec$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-cloexec$(EXEEXT)'; \
+	b='test-cloexec'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-close.log: test-close$(EXEEXT)
-	@p='test-close$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-close$(EXEEXT)'; \
+	b='test-close'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-closein.sh.log: test-closein.sh
-	@p='test-closein.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-closein.sh'; \
+	b='test-closein.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-connect.log: test-connect$(EXEEXT)
-	@p='test-connect$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-connect$(EXEEXT)'; \
+	b='test-connect'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-md5.log: test-md5$(EXEEXT)
-	@p='test-md5$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-md5$(EXEEXT)'; \
+	b='test-md5'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-sha1.log: test-sha1$(EXEEXT)
-	@p='test-sha1$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-sha1$(EXEEXT)'; \
+	b='test-sha1'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-ctype.log: test-ctype$(EXEEXT)
-	@p='test-ctype$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-ctype$(EXEEXT)'; \
+	b='test-ctype'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-di-set.log: test-di-set$(EXEEXT)
-	@p='test-di-set$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-di-set$(EXEEXT)'; \
+	b='test-di-set'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-dirent-safer.log: test-dirent-safer$(EXEEXT)
-	@p='test-dirent-safer$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-dirent-safer$(EXEEXT)'; \
+	b='test-dirent-safer'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-dirent.log: test-dirent$(EXEEXT)
-	@p='test-dirent$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-dirent$(EXEEXT)'; \
+	b='test-dirent'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-dirname.log: test-dirname$(EXEEXT)
-	@p='test-dirname$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-dirname$(EXEEXT)'; \
+	b='test-dirname'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-dup.log: test-dup$(EXEEXT)
-	@p='test-dup$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-dup$(EXEEXT)'; \
+	b='test-dup'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-dup2.log: test-dup2$(EXEEXT)
-	@p='test-dup2$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-dup2$(EXEEXT)'; \
+	b='test-dup2'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-environ.log: test-environ$(EXEEXT)
-	@p='test-environ$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-environ$(EXEEXT)'; \
+	b='test-environ'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-errno.log: test-errno$(EXEEXT)
-	@p='test-errno$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-errno$(EXEEXT)'; \
+	b='test-errno'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-exclude1.sh.log: test-exclude1.sh
-	@p='test-exclude1.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-exclude1.sh'; \
+	b='test-exclude1.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-exclude2.sh.log: test-exclude2.sh
-	@p='test-exclude2.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-exclude2.sh'; \
+	b='test-exclude2.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-exclude3.sh.log: test-exclude3.sh
-	@p='test-exclude3.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-exclude3.sh'; \
+	b='test-exclude3.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-exclude4.sh.log: test-exclude4.sh
-	@p='test-exclude4.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-exclude4.sh'; \
+	b='test-exclude4.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-exclude5.sh.log: test-exclude5.sh
-	@p='test-exclude5.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-exclude5.sh'; \
+	b='test-exclude5.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-exclude6.sh.log: test-exclude6.sh
-	@p='test-exclude6.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-exclude6.sh'; \
+	b='test-exclude6.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-exclude7.sh.log: test-exclude7.sh
-	@p='test-exclude7.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-exclude7.sh'; \
+	b='test-exclude7.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-exclude8.sh.log: test-exclude8.sh
-	@p='test-exclude8.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-exclude8.sh'; \
+	b='test-exclude8.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-faccessat.log: test-faccessat$(EXEEXT)
-	@p='test-faccessat$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-faccessat$(EXEEXT)'; \
+	b='test-faccessat'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-fadvise.log: test-fadvise$(EXEEXT)
-	@p='test-fadvise$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-fadvise$(EXEEXT)'; \
+	b='test-fadvise'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-fchdir.log: test-fchdir$(EXEEXT)
-	@p='test-fchdir$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-fchdir$(EXEEXT)'; \
+	b='test-fchdir'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-fchmodat.log: test-fchmodat$(EXEEXT)
-	@p='test-fchmodat$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-fchmodat$(EXEEXT)'; \
+	b='test-fchmodat'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-fchownat.log: test-fchownat$(EXEEXT)
-	@p='test-fchownat$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-fchownat$(EXEEXT)'; \
+	b='test-fchownat'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-fclose.log: test-fclose$(EXEEXT)
-	@p='test-fclose$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-fclose$(EXEEXT)'; \
+	b='test-fclose'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-fcntl-h.log: test-fcntl-h$(EXEEXT)
-	@p='test-fcntl-h$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-fcntl-h$(EXEEXT)'; \
+	b='test-fcntl-h'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-fcntl-safer.log: test-fcntl-safer$(EXEEXT)
-	@p='test-fcntl-safer$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-fcntl-safer$(EXEEXT)'; \
+	b='test-fcntl-safer'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-fcntl.log: test-fcntl$(EXEEXT)
-	@p='test-fcntl$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-fcntl$(EXEEXT)'; \
+	b='test-fcntl'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-fdatasync.log: test-fdatasync$(EXEEXT)
-	@p='test-fdatasync$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-fdatasync$(EXEEXT)'; \
+	b='test-fdatasync'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-fdopen.log: test-fdopen$(EXEEXT)
-	@p='test-fdopen$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-fdopen$(EXEEXT)'; \
+	b='test-fdopen'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-fdopendir.log: test-fdopendir$(EXEEXT)
-	@p='test-fdopendir$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-fdopendir$(EXEEXT)'; \
+	b='test-fdopendir'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-fdutimensat.log: test-fdutimensat$(EXEEXT)
-	@p='test-fdutimensat$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-fdutimensat$(EXEEXT)'; \
+	b='test-fdutimensat'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-fflush.log: test-fflush$(EXEEXT)
-	@p='test-fflush$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-fflush$(EXEEXT)'; \
+	b='test-fflush'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-fflush2.sh.log: test-fflush2.sh
-	@p='test-fflush2.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-fflush2.sh'; \
+	b='test-fflush2.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-fgetc.log: test-fgetc$(EXEEXT)
-	@p='test-fgetc$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-fgetc$(EXEEXT)'; \
+	b='test-fgetc'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-filenamecat.log: test-filenamecat$(EXEEXT)
-	@p='test-filenamecat$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-filenamecat$(EXEEXT)'; \
+	b='test-filenamecat'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-filevercmp.log: test-filevercmp$(EXEEXT)
-	@p='test-filevercmp$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-filevercmp$(EXEEXT)'; \
+	b='test-filevercmp'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-float.log: test-float$(EXEEXT)
-	@p='test-float$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-float$(EXEEXT)'; \
+	b='test-float'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-fnmatch.log: test-fnmatch$(EXEEXT)
-	@p='test-fnmatch$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-fnmatch$(EXEEXT)'; \
+	b='test-fnmatch'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-fopen-safer.log: test-fopen-safer$(EXEEXT)
-	@p='test-fopen-safer$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-fopen-safer$(EXEEXT)'; \
+	b='test-fopen-safer'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-fopen.log: test-fopen$(EXEEXT)
-	@p='test-fopen$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-fopen$(EXEEXT)'; \
+	b='test-fopen'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-fpending.sh.log: test-fpending.sh
-	@p='test-fpending.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-fpending.sh'; \
+	b='test-fpending.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-fpurge.log: test-fpurge$(EXEEXT)
-	@p='test-fpurge$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-fpurge$(EXEEXT)'; \
+	b='test-fpurge'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-fputc.log: test-fputc$(EXEEXT)
-	@p='test-fputc$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-fputc$(EXEEXT)'; \
+	b='test-fputc'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-fread.log: test-fread$(EXEEXT)
-	@p='test-fread$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-fread$(EXEEXT)'; \
+	b='test-fread'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-freadahead.sh.log: test-freadahead.sh
-	@p='test-freadahead.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-freadahead.sh'; \
+	b='test-freadahead.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-freading.log: test-freading$(EXEEXT)
-	@p='test-freading$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-freading$(EXEEXT)'; \
+	b='test-freading'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-freadptr.sh.log: test-freadptr.sh
-	@p='test-freadptr.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-freadptr.sh'; \
+	b='test-freadptr.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-freadptr2.sh.log: test-freadptr2.sh
-	@p='test-freadptr2.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-freadptr2.sh'; \
+	b='test-freadptr2.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-freadseek.sh.log: test-freadseek.sh
-	@p='test-freadseek.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-freadseek.sh'; \
+	b='test-freadseek.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-freopen-safer.log: test-freopen-safer$(EXEEXT)
-	@p='test-freopen-safer$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-freopen-safer$(EXEEXT)'; \
+	b='test-freopen-safer'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-freopen.log: test-freopen$(EXEEXT)
-	@p='test-freopen$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-freopen$(EXEEXT)'; \
+	b='test-freopen'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-frexp-nolibm.log: test-frexp-nolibm$(EXEEXT)
-	@p='test-frexp-nolibm$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-frexp-nolibm$(EXEEXT)'; \
+	b='test-frexp-nolibm'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-frexpl-nolibm.log: test-frexpl-nolibm$(EXEEXT)
-	@p='test-frexpl-nolibm$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-frexpl-nolibm$(EXEEXT)'; \
+	b='test-frexpl-nolibm'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-fseek.sh.log: test-fseek.sh
-	@p='test-fseek.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-fseek.sh'; \
+	b='test-fseek.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-fseek2.sh.log: test-fseek2.sh
-	@p='test-fseek2.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-fseek2.sh'; \
+	b='test-fseek2.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-fseeko.sh.log: test-fseeko.sh
-	@p='test-fseeko.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-fseeko.sh'; \
+	b='test-fseeko.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-fseeko2.sh.log: test-fseeko2.sh
-	@p='test-fseeko2.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-fseeko2.sh'; \
+	b='test-fseeko2.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-fseeko3.sh.log: test-fseeko3.sh
-	@p='test-fseeko3.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-fseeko3.sh'; \
+	b='test-fseeko3.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-fseeko4.sh.log: test-fseeko4.sh
-	@p='test-fseeko4.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-fseeko4.sh'; \
+	b='test-fseeko4.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-fseterr.log: test-fseterr$(EXEEXT)
-	@p='test-fseterr$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-fseterr$(EXEEXT)'; \
+	b='test-fseterr'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-fstat.log: test-fstat$(EXEEXT)
-	@p='test-fstat$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-fstat$(EXEEXT)'; \
+	b='test-fstat'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-fstatat.log: test-fstatat$(EXEEXT)
-	@p='test-fstatat$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-fstatat$(EXEEXT)'; \
+	b='test-fstatat'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-fsync.log: test-fsync$(EXEEXT)
-	@p='test-fsync$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-fsync$(EXEEXT)'; \
+	b='test-fsync'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-ftell.sh.log: test-ftell.sh
-	@p='test-ftell.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-ftell.sh'; \
+	b='test-ftell.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-ftell2.sh.log: test-ftell2.sh
-	@p='test-ftell2.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-ftell2.sh'; \
+	b='test-ftell2.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-ftell3.log: test-ftell3$(EXEEXT)
-	@p='test-ftell3$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-ftell3$(EXEEXT)'; \
+	b='test-ftell3'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-ftello.sh.log: test-ftello.sh
-	@p='test-ftello.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-ftello.sh'; \
+	b='test-ftello.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-ftello2.sh.log: test-ftello2.sh
-	@p='test-ftello2.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-ftello2.sh'; \
+	b='test-ftello2.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-ftello3.log: test-ftello3$(EXEEXT)
-	@p='test-ftello3$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-ftello3$(EXEEXT)'; \
+	b='test-ftello3'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-ftello4.sh.log: test-ftello4.sh
-	@p='test-ftello4.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-ftello4.sh'; \
+	b='test-ftello4.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-ftruncate.sh.log: test-ftruncate.sh
-	@p='test-ftruncate.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-ftruncate.sh'; \
+	b='test-ftruncate.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-futimens.log: test-futimens$(EXEEXT)
-	@p='test-futimens$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-futimens$(EXEEXT)'; \
+	b='test-futimens'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-fwrite.log: test-fwrite$(EXEEXT)
-	@p='test-fwrite$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-fwrite$(EXEEXT)'; \
+	b='test-fwrite'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-getaddrinfo.log: test-getaddrinfo$(EXEEXT)
-	@p='test-getaddrinfo$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-getaddrinfo$(EXEEXT)'; \
+	b='test-getaddrinfo'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-getcwd-lgpl.log: test-getcwd-lgpl$(EXEEXT)
-	@p='test-getcwd-lgpl$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-getcwd-lgpl$(EXEEXT)'; \
+	b='test-getcwd-lgpl'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-getcwd.sh.log: test-getcwd.sh
-	@p='test-getcwd.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-getcwd.sh'; \
+	b='test-getcwd.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-getdelim.log: test-getdelim$(EXEEXT)
-	@p='test-getdelim$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-getdelim$(EXEEXT)'; \
+	b='test-getdelim'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-getdtablesize.log: test-getdtablesize$(EXEEXT)
-	@p='test-getdtablesize$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-getdtablesize$(EXEEXT)'; \
+	b='test-getdtablesize'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-getgroups.log: test-getgroups$(EXEEXT)
-	@p='test-getgroups$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-getgroups$(EXEEXT)'; \
+	b='test-getgroups'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-gethostname.log: test-gethostname$(EXEEXT)
-	@p='test-gethostname$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-gethostname$(EXEEXT)'; \
+	b='test-gethostname'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-getline.log: test-getline$(EXEEXT)
-	@p='test-getline$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-getline$(EXEEXT)'; \
+	b='test-getline'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-getloadavg.log: test-getloadavg$(EXEEXT)
-	@p='test-getloadavg$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-getloadavg$(EXEEXT)'; \
+	b='test-getloadavg'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-getlogin.log: test-getlogin$(EXEEXT)
-	@p='test-getlogin$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-getlogin$(EXEEXT)'; \
+	b='test-getlogin'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-getndelim2.log: test-getndelim2$(EXEEXT)
-	@p='test-getndelim2$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-getndelim2$(EXEEXT)'; \
+	b='test-getndelim2'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-getopt.log: test-getopt$(EXEEXT)
-	@p='test-getopt$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-getopt$(EXEEXT)'; \
+	b='test-getopt'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-gettimeofday.log: test-gettimeofday$(EXEEXT)
-	@p='test-gettimeofday$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-gettimeofday$(EXEEXT)'; \
+	b='test-gettimeofday'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-hash.log: test-hash$(EXEEXT)
-	@p='test-hash$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-hash$(EXEEXT)'; \
+	b='test-hash'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-i-ring.log: test-i-ring$(EXEEXT)
-	@p='test-i-ring$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-i-ring$(EXEEXT)'; \
+	b='test-i-ring'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-iconv-h.log: test-iconv-h$(EXEEXT)
-	@p='test-iconv-h$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-iconv-h$(EXEEXT)'; \
+	b='test-iconv-h'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-iconv.log: test-iconv$(EXEEXT)
-	@p='test-iconv$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-iconv$(EXEEXT)'; \
+	b='test-iconv'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-ignore-value.log: test-ignore-value$(EXEEXT)
-	@p='test-ignore-value$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-ignore-value$(EXEEXT)'; \
+	b='test-ignore-value'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-inet_ntop.log: test-inet_ntop$(EXEEXT)
-	@p='test-inet_ntop$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-inet_ntop$(EXEEXT)'; \
+	b='test-inet_ntop'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-inet_pton.log: test-inet_pton$(EXEEXT)
-	@p='test-inet_pton$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-inet_pton$(EXEEXT)'; \
+	b='test-inet_pton'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-ino-map.log: test-ino-map$(EXEEXT)
-	@p='test-ino-map$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-ino-map$(EXEEXT)'; \
+	b='test-ino-map'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-intprops.log: test-intprops$(EXEEXT)
-	@p='test-intprops$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-intprops$(EXEEXT)'; \
+	b='test-intprops'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-inttostr.log: test-inttostr$(EXEEXT)
-	@p='test-inttostr$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-inttostr$(EXEEXT)'; \
+	b='test-inttostr'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-inttypes.log: test-inttypes$(EXEEXT)
-	@p='test-inttypes$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-inttypes$(EXEEXT)'; \
+	b='test-inttypes'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-ioctl.log: test-ioctl$(EXEEXT)
-	@p='test-ioctl$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-ioctl$(EXEEXT)'; \
+	b='test-ioctl'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-isatty.log: test-isatty$(EXEEXT)
-	@p='test-isatty$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-isatty$(EXEEXT)'; \
+	b='test-isatty'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-isblank.log: test-isblank$(EXEEXT)
-	@p='test-isblank$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-isblank$(EXEEXT)'; \
+	b='test-isblank'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-isnand-nolibm.log: test-isnand-nolibm$(EXEEXT)
-	@p='test-isnand-nolibm$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-isnand-nolibm$(EXEEXT)'; \
+	b='test-isnand-nolibm'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-isnanf-nolibm.log: test-isnanf-nolibm$(EXEEXT)
-	@p='test-isnanf-nolibm$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-isnanf-nolibm$(EXEEXT)'; \
+	b='test-isnanf-nolibm'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-isnanl-nolibm.log: test-isnanl-nolibm$(EXEEXT)
-	@p='test-isnanl-nolibm$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-isnanl-nolibm$(EXEEXT)'; \
+	b='test-isnanl-nolibm'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-iswblank.log: test-iswblank$(EXEEXT)
-	@p='test-iswblank$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-iswblank$(EXEEXT)'; \
+	b='test-iswblank'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-langinfo.log: test-langinfo$(EXEEXT)
-	@p='test-langinfo$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-langinfo$(EXEEXT)'; \
+	b='test-langinfo'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-lchown.log: test-lchown$(EXEEXT)
-	@p='test-lchown$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-lchown$(EXEEXT)'; \
+	b='test-lchown'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-link.log: test-link$(EXEEXT)
-	@p='test-link$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-link$(EXEEXT)'; \
+	b='test-link'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-linkat.log: test-linkat$(EXEEXT)
-	@p='test-linkat$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-linkat$(EXEEXT)'; \
+	b='test-linkat'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-listen.log: test-listen$(EXEEXT)
-	@p='test-listen$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-listen$(EXEEXT)'; \
+	b='test-listen'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-locale.log: test-locale$(EXEEXT)
-	@p='test-locale$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-locale$(EXEEXT)'; \
+	b='test-locale'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-localeconv.log: test-localeconv$(EXEEXT)
-	@p='test-localeconv$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-localeconv$(EXEEXT)'; \
+	b='test-localeconv'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-localename.log: test-localename$(EXEEXT)
-	@p='test-localename$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-localename$(EXEEXT)'; \
+	b='test-localename'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-lock.log: test-lock$(EXEEXT)
-	@p='test-lock$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-lock$(EXEEXT)'; \
+	b='test-lock'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-lseek.sh.log: test-lseek.sh
-	@p='test-lseek.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-lseek.sh'; \
+	b='test-lseek.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-lstat.log: test-lstat$(EXEEXT)
-	@p='test-lstat$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-lstat$(EXEEXT)'; \
+	b='test-lstat'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-malloc-gnu.log: test-malloc-gnu$(EXEEXT)
-	@p='test-malloc-gnu$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-malloc-gnu$(EXEEXT)'; \
+	b='test-malloc-gnu'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-malloca.log: test-malloca$(EXEEXT)
-	@p='test-malloca$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-malloca$(EXEEXT)'; \
+	b='test-malloca'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-math.log: test-math$(EXEEXT)
-	@p='test-math$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-math$(EXEEXT)'; \
+	b='test-math'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-mbrtowc1.sh.log: test-mbrtowc1.sh
-	@p='test-mbrtowc1.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-mbrtowc1.sh'; \
+	b='test-mbrtowc1.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-mbrtowc2.sh.log: test-mbrtowc2.sh
-	@p='test-mbrtowc2.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-mbrtowc2.sh'; \
+	b='test-mbrtowc2.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-mbrtowc3.sh.log: test-mbrtowc3.sh
-	@p='test-mbrtowc3.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-mbrtowc3.sh'; \
+	b='test-mbrtowc3.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-mbrtowc4.sh.log: test-mbrtowc4.sh
-	@p='test-mbrtowc4.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-mbrtowc4.sh'; \
+	b='test-mbrtowc4.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-mbrtowc-w32-1.sh.log: test-mbrtowc-w32-1.sh
-	@p='test-mbrtowc-w32-1.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-mbrtowc-w32-1.sh'; \
+	b='test-mbrtowc-w32-1.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-mbrtowc-w32-2.sh.log: test-mbrtowc-w32-2.sh
-	@p='test-mbrtowc-w32-2.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-mbrtowc-w32-2.sh'; \
+	b='test-mbrtowc-w32-2.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-mbrtowc-w32-3.sh.log: test-mbrtowc-w32-3.sh
-	@p='test-mbrtowc-w32-3.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-mbrtowc-w32-3.sh'; \
+	b='test-mbrtowc-w32-3.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-mbrtowc-w32-4.sh.log: test-mbrtowc-w32-4.sh
-	@p='test-mbrtowc-w32-4.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-mbrtowc-w32-4.sh'; \
+	b='test-mbrtowc-w32-4.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-mbrtowc-w32-5.sh.log: test-mbrtowc-w32-5.sh
-	@p='test-mbrtowc-w32-5.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-mbrtowc-w32-5.sh'; \
+	b='test-mbrtowc-w32-5.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-mbsalign.log: test-mbsalign$(EXEEXT)
-	@p='test-mbsalign$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-mbsalign$(EXEEXT)'; \
+	b='test-mbsalign'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-mbscasecmp.sh.log: test-mbscasecmp.sh
-	@p='test-mbscasecmp.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-mbscasecmp.sh'; \
+	b='test-mbscasecmp.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-mbsinit.sh.log: test-mbsinit.sh
-	@p='test-mbsinit.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-mbsinit.sh'; \
+	b='test-mbsinit.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-mbsrtowcs1.sh.log: test-mbsrtowcs1.sh
-	@p='test-mbsrtowcs1.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-mbsrtowcs1.sh'; \
+	b='test-mbsrtowcs1.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-mbsrtowcs2.sh.log: test-mbsrtowcs2.sh
-	@p='test-mbsrtowcs2.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-mbsrtowcs2.sh'; \
+	b='test-mbsrtowcs2.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-mbsrtowcs3.sh.log: test-mbsrtowcs3.sh
-	@p='test-mbsrtowcs3.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-mbsrtowcs3.sh'; \
+	b='test-mbsrtowcs3.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-mbsrtowcs4.sh.log: test-mbsrtowcs4.sh
-	@p='test-mbsrtowcs4.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-mbsrtowcs4.sh'; \
+	b='test-mbsrtowcs4.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-mbsstr1.log: test-mbsstr1$(EXEEXT)
-	@p='test-mbsstr1$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-mbsstr1$(EXEEXT)'; \
+	b='test-mbsstr1'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-mbsstr2.sh.log: test-mbsstr2.sh
-	@p='test-mbsstr2.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-mbsstr2.sh'; \
+	b='test-mbsstr2.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-mbsstr3.sh.log: test-mbsstr3.sh
-	@p='test-mbsstr3.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-mbsstr3.sh'; \
+	b='test-mbsstr3.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-memcasecmp.log: test-memcasecmp$(EXEEXT)
-	@p='test-memcasecmp$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-memcasecmp$(EXEEXT)'; \
+	b='test-memcasecmp'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-memchr.log: test-memchr$(EXEEXT)
-	@p='test-memchr$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-memchr$(EXEEXT)'; \
+	b='test-memchr'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-memchr2.log: test-memchr2$(EXEEXT)
-	@p='test-memchr2$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-memchr2$(EXEEXT)'; \
+	b='test-memchr2'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-memcoll.log: test-memcoll$(EXEEXT)
-	@p='test-memcoll$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-memcoll$(EXEEXT)'; \
+	b='test-memcoll'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-memrchr.log: test-memrchr$(EXEEXT)
-	@p='test-memrchr$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-memrchr$(EXEEXT)'; \
+	b='test-memrchr'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-mkdir.log: test-mkdir$(EXEEXT)
-	@p='test-mkdir$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-mkdir$(EXEEXT)'; \
+	b='test-mkdir'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-mkfifo.log: test-mkfifo$(EXEEXT)
-	@p='test-mkfifo$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-mkfifo$(EXEEXT)'; \
+	b='test-mkfifo'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-mknod.log: test-mknod$(EXEEXT)
-	@p='test-mknod$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-mknod$(EXEEXT)'; \
+	b='test-mknod'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-nanosleep.log: test-nanosleep$(EXEEXT)
-	@p='test-nanosleep$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-nanosleep$(EXEEXT)'; \
+	b='test-nanosleep'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-netdb.log: test-netdb$(EXEEXT)
-	@p='test-netdb$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-netdb$(EXEEXT)'; \
+	b='test-netdb'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-netinet_in.log: test-netinet_in$(EXEEXT)
-	@p='test-netinet_in$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-netinet_in$(EXEEXT)'; \
+	b='test-netinet_in'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-nl_langinfo.sh.log: test-nl_langinfo.sh
-	@p='test-nl_langinfo.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-nl_langinfo.sh'; \
+	b='test-nl_langinfo.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-open.log: test-open$(EXEEXT)
-	@p='test-open$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-open$(EXEEXT)'; \
+	b='test-open'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-openat-safer.log: test-openat-safer$(EXEEXT)
-	@p='test-openat-safer$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-openat-safer$(EXEEXT)'; \
+	b='test-openat-safer'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-openat.log: test-openat$(EXEEXT)
-	@p='test-openat$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-openat$(EXEEXT)'; \
+	b='test-openat'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-parse-datetime.log: test-parse-datetime$(EXEEXT)
-	@p='test-parse-datetime$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-parse-datetime$(EXEEXT)'; \
+	b='test-parse-datetime'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-pathmax.log: test-pathmax$(EXEEXT)
-	@p='test-pathmax$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-pathmax$(EXEEXT)'; \
+	b='test-pathmax'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-perror.sh.log: test-perror.sh
-	@p='test-perror.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-perror.sh'; \
+	b='test-perror.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-perror2.log: test-perror2$(EXEEXT)
-	@p='test-perror2$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-perror2$(EXEEXT)'; \
+	b='test-perror2'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-pipe.log: test-pipe$(EXEEXT)
-	@p='test-pipe$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
-test-pipe2.log: test-pipe2$(EXEEXT)
-	@p='test-pipe2$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
-test-posix_spawn_file_actions_addclose.log: test-posix_spawn_file_actions_addclose$(EXEEXT)
-	@p='test-posix_spawn_file_actions_addclose$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
-test-posix_spawn_file_actions_adddup2.log: test-posix_spawn_file_actions_adddup2$(EXEEXT)
-	@p='test-posix_spawn_file_actions_adddup2$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
-test-posix_spawn_file_actions_addopen.log: test-posix_spawn_file_actions_addopen$(EXEEXT)
-	@p='test-posix_spawn_file_actions_addopen$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
-test-posix_spawn1.log: test-posix_spawn1$(EXEEXT)
-	@p='test-posix_spawn1$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
-test-posix_spawn2.log: test-posix_spawn2$(EXEEXT)
-	@p='test-posix_spawn2$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-pipe$(EXEEXT)'; \
+	b='test-pipe'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-posixtm.log: test-posixtm$(EXEEXT)
-	@p='test-posixtm$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-posixtm$(EXEEXT)'; \
+	b='test-posixtm'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-printf-frexp.log: test-printf-frexp$(EXEEXT)
-	@p='test-printf-frexp$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-printf-frexp$(EXEEXT)'; \
+	b='test-printf-frexp'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-printf-frexpl.log: test-printf-frexpl$(EXEEXT)
-	@p='test-printf-frexpl$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-printf-frexpl$(EXEEXT)'; \
+	b='test-printf-frexpl'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-priv-set.log: test-priv-set$(EXEEXT)
-	@p='test-priv-set$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-priv-set$(EXEEXT)'; \
+	b='test-priv-set'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-quotearg-simple.log: test-quotearg-simple$(EXEEXT)
-	@p='test-quotearg-simple$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-quotearg-simple$(EXEEXT)'; \
+	b='test-quotearg-simple'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-raise.log: test-raise$(EXEEXT)
-	@p='test-raise$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-raise$(EXEEXT)'; \
+	b='test-raise'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-rand-isaac.log: test-rand-isaac$(EXEEXT)
-	@p='test-rand-isaac$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
-test-rawmemchr.log: test-rawmemchr$(EXEEXT)
-	@p='test-rawmemchr$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-rand-isaac$(EXEEXT)'; \
+	b='test-rand-isaac'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-read-file.log: test-read-file$(EXEEXT)
-	@p='test-read-file$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-read-file$(EXEEXT)'; \
+	b='test-read-file'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-read.log: test-read$(EXEEXT)
-	@p='test-read$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-read$(EXEEXT)'; \
+	b='test-read'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-readlink.log: test-readlink$(EXEEXT)
-	@p='test-readlink$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-readlink$(EXEEXT)'; \
+	b='test-readlink'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-readlinkat.log: test-readlinkat$(EXEEXT)
-	@p='test-readlinkat$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-readlinkat$(EXEEXT)'; \
+	b='test-readlinkat'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-readtokens.sh.log: test-readtokens.sh
-	@p='test-readtokens.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-readtokens.sh'; \
+	b='test-readtokens.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-realloc-gnu.log: test-realloc-gnu$(EXEEXT)
-	@p='test-realloc-gnu$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-realloc-gnu$(EXEEXT)'; \
+	b='test-realloc-gnu'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-regex.log: test-regex$(EXEEXT)
-	@p='test-regex$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-regex$(EXEEXT)'; \
+	b='test-regex'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-remove.log: test-remove$(EXEEXT)
-	@p='test-remove$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-remove$(EXEEXT)'; \
+	b='test-remove'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-rename.log: test-rename$(EXEEXT)
-	@p='test-rename$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-rename$(EXEEXT)'; \
+	b='test-rename'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-rmdir.log: test-rmdir$(EXEEXT)
-	@p='test-rmdir$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-rmdir$(EXEEXT)'; \
+	b='test-rmdir'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-sched.log: test-sched$(EXEEXT)
-	@p='test-sched$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-sched$(EXEEXT)'; \
+	b='test-sched'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-select.log: test-select$(EXEEXT)
-	@p='test-select$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-select$(EXEEXT)'; \
+	b='test-select'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-select-in.sh.log: test-select-in.sh
-	@p='test-select-in.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-select-in.sh'; \
+	b='test-select-in.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-select-out.sh.log: test-select-out.sh
-	@p='test-select-out.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-select-out.sh'; \
+	b='test-select-out.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-setenv.log: test-setenv$(EXEEXT)
-	@p='test-setenv$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-setenv$(EXEEXT)'; \
+	b='test-setenv'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-setlocale1.sh.log: test-setlocale1.sh
-	@p='test-setlocale1.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-setlocale1.sh'; \
+	b='test-setlocale1.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-setlocale2.sh.log: test-setlocale2.sh
-	@p='test-setlocale2.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-setlocale2.sh'; \
+	b='test-setlocale2.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-setsockopt.log: test-setsockopt$(EXEEXT)
-	@p='test-setsockopt$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-setsockopt$(EXEEXT)'; \
+	b='test-setsockopt'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-sigaction.log: test-sigaction$(EXEEXT)
-	@p='test-sigaction$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-sigaction$(EXEEXT)'; \
+	b='test-sigaction'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-signal-h.log: test-signal-h$(EXEEXT)
-	@p='test-signal-h$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-signal-h$(EXEEXT)'; \
+	b='test-signal-h'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-signbit.log: test-signbit$(EXEEXT)
-	@p='test-signbit$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-signbit$(EXEEXT)'; \
+	b='test-signbit'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-sigprocmask.log: test-sigprocmask$(EXEEXT)
-	@p='test-sigprocmask$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-sigprocmask$(EXEEXT)'; \
+	b='test-sigprocmask'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-sleep.log: test-sleep$(EXEEXT)
-	@p='test-sleep$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-sleep$(EXEEXT)'; \
+	b='test-sleep'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-snprintf.log: test-snprintf$(EXEEXT)
-	@p='test-snprintf$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-snprintf$(EXEEXT)'; \
+	b='test-snprintf'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-sockets.log: test-sockets$(EXEEXT)
-	@p='test-sockets$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
-test-spawn-pipe.sh.log: test-spawn-pipe.sh
-	@p='test-spawn-pipe.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
-test-spawn.log: test-spawn$(EXEEXT)
-	@p='test-spawn$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-sockets$(EXEEXT)'; \
+	b='test-sockets'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-stat.log: test-stat$(EXEEXT)
-	@p='test-stat$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-stat$(EXEEXT)'; \
+	b='test-stat'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-stat-time.log: test-stat-time$(EXEEXT)
-	@p='test-stat-time$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-stat-time$(EXEEXT)'; \
+	b='test-stat-time'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-statat.log: test-statat$(EXEEXT)
-	@p='test-statat$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-statat$(EXEEXT)'; \
+	b='test-statat'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-stdalign.log: test-stdalign$(EXEEXT)
-	@p='test-stdalign$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-stdalign$(EXEEXT)'; \
+	b='test-stdalign'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-stdbool.log: test-stdbool$(EXEEXT)
-	@p='test-stdbool$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-stdbool$(EXEEXT)'; \
+	b='test-stdbool'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-stddef.log: test-stddef$(EXEEXT)
-	@p='test-stddef$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-stddef$(EXEEXT)'; \
+	b='test-stddef'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-stdint.log: test-stdint$(EXEEXT)
-	@p='test-stdint$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-stdint$(EXEEXT)'; \
+	b='test-stdint'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-stdio.log: test-stdio$(EXEEXT)
-	@p='test-stdio$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-stdio$(EXEEXT)'; \
+	b='test-stdio'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-stdlib.log: test-stdlib$(EXEEXT)
-	@p='test-stdlib$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
-test-strchrnul.log: test-strchrnul$(EXEEXT)
-	@p='test-strchrnul$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-stdlib$(EXEEXT)'; \
+	b='test-stdlib'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-strerror.log: test-strerror$(EXEEXT)
-	@p='test-strerror$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-strerror$(EXEEXT)'; \
+	b='test-strerror'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-strerror_r.log: test-strerror_r$(EXEEXT)
-	@p='test-strerror_r$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-strerror_r$(EXEEXT)'; \
+	b='test-strerror_r'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-strftime.log: test-strftime$(EXEEXT)
-	@p='test-strftime$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-strftime$(EXEEXT)'; \
+	b='test-strftime'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-striconv.log: test-striconv$(EXEEXT)
-	@p='test-striconv$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-striconv$(EXEEXT)'; \
+	b='test-striconv'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-string.log: test-string$(EXEEXT)
-	@p='test-string$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-string$(EXEEXT)'; \
+	b='test-string'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-strncat.log: test-strncat$(EXEEXT)
-	@p='test-strncat$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-strncat$(EXEEXT)'; \
+	b='test-strncat'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-strnlen.log: test-strnlen$(EXEEXT)
-	@p='test-strnlen$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-strnlen$(EXEEXT)'; \
+	b='test-strnlen'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-strsignal.log: test-strsignal$(EXEEXT)
-	@p='test-strsignal$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-strsignal$(EXEEXT)'; \
+	b='test-strsignal'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-strtod.log: test-strtod$(EXEEXT)
-	@p='test-strtod$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-strtod$(EXEEXT)'; \
+	b='test-strtod'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-strtoimax.log: test-strtoimax$(EXEEXT)
-	@p='test-strtoimax$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-strtoimax$(EXEEXT)'; \
+	b='test-strtoimax'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-strtoll.log: test-strtoll$(EXEEXT)
-	@p='test-strtoll$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-strtoll$(EXEEXT)'; \
+	b='test-strtoll'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-strtoull.log: test-strtoull$(EXEEXT)
-	@p='test-strtoull$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-strtoull$(EXEEXT)'; \
+	b='test-strtoull'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-strtoumax.log: test-strtoumax$(EXEEXT)
-	@p='test-strtoumax$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-strtoumax$(EXEEXT)'; \
+	b='test-strtoumax'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-symlink.log: test-symlink$(EXEEXT)
-	@p='test-symlink$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-symlink$(EXEEXT)'; \
+	b='test-symlink'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-symlinkat.log: test-symlinkat$(EXEEXT)
-	@p='test-symlinkat$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-symlinkat$(EXEEXT)'; \
+	b='test-symlinkat'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-sys_ioctl.log: test-sys_ioctl$(EXEEXT)
-	@p='test-sys_ioctl$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-sys_ioctl$(EXEEXT)'; \
+	b='test-sys_ioctl'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-sys_resource.log: test-sys_resource$(EXEEXT)
-	@p='test-sys_resource$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-sys_resource$(EXEEXT)'; \
+	b='test-sys_resource'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-sys_select.log: test-sys_select$(EXEEXT)
-	@p='test-sys_select$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-sys_select$(EXEEXT)'; \
+	b='test-sys_select'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-sys_socket.log: test-sys_socket$(EXEEXT)
-	@p='test-sys_socket$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-sys_socket$(EXEEXT)'; \
+	b='test-sys_socket'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-sys_stat.log: test-sys_stat$(EXEEXT)
-	@p='test-sys_stat$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-sys_stat$(EXEEXT)'; \
+	b='test-sys_stat'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-sys_time.log: test-sys_time$(EXEEXT)
-	@p='test-sys_time$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-sys_time$(EXEEXT)'; \
+	b='test-sys_time'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-sys_types.log: test-sys_types$(EXEEXT)
-	@p='test-sys_types$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-sys_types$(EXEEXT)'; \
+	b='test-sys_types'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-sys_uio.log: test-sys_uio$(EXEEXT)
-	@p='test-sys_uio$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-sys_uio$(EXEEXT)'; \
+	b='test-sys_uio'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-sys_utsname.log: test-sys_utsname$(EXEEXT)
-	@p='test-sys_utsname$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-sys_utsname$(EXEEXT)'; \
+	b='test-sys_utsname'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-sys_wait.log: test-sys_wait$(EXEEXT)
-	@p='test-sys_wait$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-sys_wait$(EXEEXT)'; \
+	b='test-sys_wait'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-termios.log: test-termios$(EXEEXT)
-	@p='test-termios$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-termios$(EXEEXT)'; \
+	b='test-termios'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-init.sh.log: test-init.sh
-	@p='test-init.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-init.sh'; \
+	b='test-init.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-thread_self.log: test-thread_self$(EXEEXT)
-	@p='test-thread_self$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-thread_self$(EXEEXT)'; \
+	b='test-thread_self'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-thread_create.log: test-thread_create$(EXEEXT)
-	@p='test-thread_create$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-thread_create$(EXEEXT)'; \
+	b='test-thread_create'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-time.log: test-time$(EXEEXT)
-	@p='test-time$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-time$(EXEEXT)'; \
+	b='test-time'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-tls.log: test-tls$(EXEEXT)
-	@p='test-tls$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-tls$(EXEEXT)'; \
+	b='test-tls'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-u64.log: test-u64$(EXEEXT)
-	@p='test-u64$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-u64$(EXEEXT)'; \
+	b='test-u64'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-uname.log: test-uname$(EXEEXT)
-	@p='test-uname$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-uname$(EXEEXT)'; \
+	b='test-uname'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-dup-safer.log: test-dup-safer$(EXEEXT)
-	@p='test-dup-safer$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-dup-safer$(EXEEXT)'; \
+	b='test-dup-safer'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-unistd.log: test-unistd$(EXEEXT)
-	@p='test-unistd$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-unistd$(EXEEXT)'; \
+	b='test-unistd'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-u8-mbtoucr.log: test-u8-mbtoucr$(EXEEXT)
-	@p='test-u8-mbtoucr$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-u8-mbtoucr$(EXEEXT)'; \
+	b='test-u8-mbtoucr'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-u8-uctomb.log: test-u8-uctomb$(EXEEXT)
-	@p='test-u8-uctomb$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-u8-uctomb$(EXEEXT)'; \
+	b='test-u8-uctomb'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-uc_width.log: test-uc_width$(EXEEXT)
-	@p='test-uc_width$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-uc_width$(EXEEXT)'; \
+	b='test-uc_width'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 uniwidth/test-uc_width2.sh.log: uniwidth/test-uc_width2.sh
-	@p='uniwidth/test-uc_width2.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='uniwidth/test-uc_width2.sh'; \
+	b='uniwidth/test-uc_width2.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-unlink.log: test-unlink$(EXEEXT)
-	@p='test-unlink$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-unlink$(EXEEXT)'; \
+	b='test-unlink'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-unlinkat.log: test-unlinkat$(EXEEXT)
-	@p='test-unlinkat$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-unlinkat$(EXEEXT)'; \
+	b='test-unlinkat'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-unsetenv.log: test-unsetenv$(EXEEXT)
-	@p='test-unsetenv$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-unsetenv$(EXEEXT)'; \
+	b='test-unsetenv'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-update-copyright.sh.log: test-update-copyright.sh
-	@p='test-update-copyright.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-update-copyright.sh'; \
+	b='test-update-copyright.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-userspec.log: test-userspec$(EXEEXT)
-	@p='test-userspec$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
-test-usleep.log: test-usleep$(EXEEXT)
-	@p='test-usleep$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-userspec$(EXEEXT)'; \
+	b='test-userspec'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-utimens.log: test-utimens$(EXEEXT)
-	@p='test-utimens$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-utimens$(EXEEXT)'; \
+	b='test-utimens'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-utimensat.log: test-utimensat$(EXEEXT)
-	@p='test-utimensat$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-utimensat$(EXEEXT)'; \
+	b='test-utimensat'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-vasnprintf.log: test-vasnprintf$(EXEEXT)
-	@p='test-vasnprintf$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-vasnprintf$(EXEEXT)'; \
+	b='test-vasnprintf'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-vasprintf-posix.log: test-vasprintf-posix$(EXEEXT)
-	@p='test-vasprintf-posix$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-vasprintf-posix$(EXEEXT)'; \
+	b='test-vasprintf-posix'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-vasprintf.log: test-vasprintf$(EXEEXT)
-	@p='test-vasprintf$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-vasprintf$(EXEEXT)'; \
+	b='test-vasprintf'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-vc-list-files-git.sh.log: test-vc-list-files-git.sh
-	@p='test-vc-list-files-git.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-vc-list-files-git.sh'; \
+	b='test-vc-list-files-git.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-vc-list-files-cvs.sh.log: test-vc-list-files-cvs.sh
-	@p='test-vc-list-files-cvs.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-vc-list-files-cvs.sh'; \
+	b='test-vc-list-files-cvs.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-verify.log: test-verify$(EXEEXT)
-	@p='test-verify$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-verify$(EXEEXT)'; \
+	b='test-verify'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-verify.sh.log: test-verify.sh
-	@p='test-verify.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-verify.sh'; \
+	b='test-verify.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-version-etc.sh.log: test-version-etc.sh
-	@p='test-version-etc.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-version-etc.sh'; \
+	b='test-version-etc.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-vfprintf-posix.sh.log: test-vfprintf-posix.sh
-	@p='test-vfprintf-posix.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-vfprintf-posix.sh'; \
+	b='test-vfprintf-posix.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-vprintf-posix.sh.log: test-vprintf-posix.sh
-	@p='test-vprintf-posix.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-vprintf-posix.sh'; \
+	b='test-vprintf-posix.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-wchar.log: test-wchar$(EXEEXT)
-	@p='test-wchar$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-wchar$(EXEEXT)'; \
+	b='test-wchar'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-wcrtomb.sh.log: test-wcrtomb.sh
-	@p='test-wcrtomb.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-wcrtomb.sh'; \
+	b='test-wcrtomb.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-wcrtomb-w32-1.sh.log: test-wcrtomb-w32-1.sh
-	@p='test-wcrtomb-w32-1.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-wcrtomb-w32-1.sh'; \
+	b='test-wcrtomb-w32-1.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-wcrtomb-w32-2.sh.log: test-wcrtomb-w32-2.sh
-	@p='test-wcrtomb-w32-2.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-wcrtomb-w32-2.sh'; \
+	b='test-wcrtomb-w32-2.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-wcrtomb-w32-3.sh.log: test-wcrtomb-w32-3.sh
-	@p='test-wcrtomb-w32-3.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-wcrtomb-w32-3.sh'; \
+	b='test-wcrtomb-w32-3.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-wcrtomb-w32-4.sh.log: test-wcrtomb-w32-4.sh
-	@p='test-wcrtomb-w32-4.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-wcrtomb-w32-4.sh'; \
+	b='test-wcrtomb-w32-4.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-wcrtomb-w32-5.sh.log: test-wcrtomb-w32-5.sh
-	@p='test-wcrtomb-w32-5.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-wcrtomb-w32-5.sh'; \
+	b='test-wcrtomb-w32-5.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-wctype-h.log: test-wctype-h$(EXEEXT)
-	@p='test-wctype-h$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-wctype-h$(EXEEXT)'; \
+	b='test-wctype-h'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-wcwidth.log: test-wcwidth$(EXEEXT)
-	@p='test-wcwidth$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-wcwidth$(EXEEXT)'; \
+	b='test-wcwidth'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-write.log: test-write$(EXEEXT)
-	@p='test-write$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-write$(EXEEXT)'; \
+	b='test-write'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-xalloc-die.sh.log: test-xalloc-die.sh
-	@p='test-xalloc-die.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-xalloc-die.sh'; \
+	b='test-xalloc-die.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-xprintf-posix.sh.log: test-xprintf-posix.sh
-	@p='test-xprintf-posix.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-xprintf-posix.sh'; \
+	b='test-xprintf-posix.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-xstrtoimax.sh.log: test-xstrtoimax.sh
-	@p='test-xstrtoimax.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-xstrtoimax.sh'; \
+	b='test-xstrtoimax.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-xstrtol.sh.log: test-xstrtol.sh
-	@p='test-xstrtol.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-xstrtol.sh'; \
+	b='test-xstrtol.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-xstrtoumax.sh.log: test-xstrtoumax.sh
-	@p='test-xstrtoumax.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-xstrtoumax.sh'; \
+	b='test-xstrtoumax.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-xvasprintf.log: test-xvasprintf$(EXEEXT)
-	@p='test-xvasprintf$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-xvasprintf$(EXEEXT)'; \
+	b='test-xvasprintf'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-yesno.sh.log: test-yesno.sh
-	@p='test-yesno.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='test-yesno.sh'; \
+	b='test-yesno.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 .test.log:
-	@p='$<'; $(am__check_pre) $(TEST_LOG_COMPILE) "$$tst" $(am__check_post)
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 @am__EXEEXT_TRUE@.test$(EXEEXT).log:
-@am__EXEEXT_TRUE@	@p='$<'; $(am__check_pre) $(TEST_LOG_COMPILE) "$$tst" $(am__check_post)
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 
 distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -6390,7 +8109,7 @@ install-strip:
 mostlyclean-generic:
 	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
-	-test -z "$(TEST_LOGS_TMP)" || rm -f $(TEST_LOGS_TMP)
+	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
 	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 
 clean-generic:
@@ -6471,8 +8190,8 @@ maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-recursive
 
-mostlyclean-am: am--mostlyclean-test-html mostlyclean-compile \
-	mostlyclean-generic mostlyclean-local
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-local
 
 pdf: pdf-recursive
 
@@ -6487,39 +8206,28 @@ uninstall-am: uninstall-binPROGRAMS uninstall-man \
 
 uninstall-man: uninstall-man1
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
-	check-am check-html ctags-recursive install install-am \
-	install-strip recheck-html tags-recursive
+.MAKE: $(am__recursive_targets) all check check-am install install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am am--mostlyclean-test-html check check-TESTS \
-	check-am check-html clean clean-binPROGRAMS \
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-TESTS check-am clean clean-binPROGRAMS \
 	clean-checkLIBRARIES clean-checkPROGRAMS clean-generic \
 	clean-local clean-noinstLIBRARIES clean-noinstPROGRAMS \
-	clean-pkglibexecPROGRAMS ctags ctags-recursive distclean \
-	distclean-compile distclean-generic distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-man1 install-pdf install-pdf-am \
+	clean-pkglibexecPROGRAMS cscopelist-am ctags ctags-am \
+	distclean distclean-compile distclean-generic distclean-tags \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-binPROGRAMS install-data install-data-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-man1 install-pdf install-pdf-am \
 	install-pkglibexecPROGRAMS install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-local pdf pdf-am ps ps-am recheck recheck-html \
-	tags tags-recursive uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-man uninstall-man1 \
-	uninstall-pkglibexecPROGRAMS
+	mostlyclean-local pdf pdf-am ps ps-am recheck tags tags-am \
+	uninstall uninstall-am uninstall-binPROGRAMS uninstall-man \
+	uninstall-man1 uninstall-pkglibexecPROGRAMS
 
-@POSIX_SPAWN_PORTED_TRUE@test-posix_spawn1.sh: test-posix_spawn1.in.sh
-@POSIX_SPAWN_PORTED_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
-@POSIX_SPAWN_PORTED_TRUE@	cp $(srcdir)/test-posix_spawn1.in.sh $@-t && \
-@POSIX_SPAWN_PORTED_TRUE@	mv $@-t $@
-@POSIX_SPAWN_PORTED_TRUE@test-posix_spawn2.sh: test-posix_spawn2.in.sh
-@POSIX_SPAWN_PORTED_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
-@POSIX_SPAWN_PORTED_TRUE@	cp $(srcdir)/test-posix_spawn2.in.sh $@-t && \
-@POSIX_SPAWN_PORTED_TRUE@	mv $@-t $@
 # The arg-nonnull.h that gets inserted into generated .h files is the same as
 # build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut
 # off.
diff --git a/gnulib-tests/accept.c b/gnulib-tests/accept.c
index bf27403d..38ef59dc 100644
--- a/gnulib-tests/accept.c
+++ b/gnulib-tests/accept.c
@@ -1,6 +1,6 @@
 /* accept.c --- wrappers for Windows accept function
 
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/at-func.c b/gnulib-tests/at-func.c
index 03c56788..c8ee073d 100644
--- a/gnulib-tests/at-func.c
+++ b/gnulib-tests/at-func.c
@@ -1,5 +1,5 @@
 /* Define at-style functions like fstatat, unlinkat, fchownat, etc.
-   Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/binary-io.c b/gnulib-tests/binary-io.c
index 8bbdb44d..8bbdb44d 100644
--- a/lib/binary-io.c
+++ b/gnulib-tests/binary-io.c
diff --git a/lib/binary-io.h b/gnulib-tests/binary-io.h
index 317fe3d3..7928f8c1 100644
--- a/lib/binary-io.h
+++ b/gnulib-tests/binary-io.h
@@ -1,5 +1,5 @@
 /* Binary mode I/O.
-   Copyright (C) 2001, 2003, 2005, 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003, 2005, 2008-2014 Free Software Foundation, Inc.
 
    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
@@ -25,6 +25,9 @@
    so we include it here first.  */
 #include <stdio.h>
 
+#ifndef _GL_INLINE_HEADER_BEGIN
+ #error "Please include config.h first."
+#endif
 _GL_INLINE_HEADER_BEGIN
 #ifndef BINARY_IO_INLINE
 # define BINARY_IO_INLINE _GL_INLINE
diff --git a/gnulib-tests/bind.c b/gnulib-tests/bind.c
index e6edb855..aa5d344a 100644
--- a/gnulib-tests/bind.c
+++ b/gnulib-tests/bind.c
@@ -1,6 +1,6 @@
 /* bind.c --- wrappers for Windows bind function
 
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/connect.c b/gnulib-tests/connect.c
index 04cd5a26..86712783 100644
--- a/gnulib-tests/connect.c
+++ b/gnulib-tests/connect.c
@@ -1,6 +1,6 @@
 /* connect.c --- wrappers for Windows connect function
 
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/glthread/thread.c b/gnulib-tests/glthread/thread.c
index fdec8697..cec0b7c8 100644
--- a/gnulib-tests/glthread/thread.c
+++ b/gnulib-tests/glthread/thread.c
@@ -1,5 +1,5 @@
 /* Creating and controlling threads.
-   Copyright (C) 2005-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/glthread/thread.h b/gnulib-tests/glthread/thread.h
index 0d661096..509db6b3 100644
--- a/gnulib-tests/glthread/thread.h
+++ b/gnulib-tests/glthread/thread.h
@@ -1,5 +1,5 @@
 /* Creating and controlling threads.
-   Copyright (C) 2005-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
    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
@@ -74,6 +74,9 @@
 #include <errno.h>
 #include <stdlib.h>
 
+#ifndef _GL_INLINE_HEADER_BEGIN
+ #error "Please include config.h first."
+#endif
 _GL_INLINE_HEADER_BEGIN
 #ifndef _GLTHREAD_THREAD_INLINE
 # define _GLTHREAD_THREAD_INLINE _GL_INLINE
@@ -120,7 +123,13 @@ extern int glthread_in_use (void);
    address of a function in libpthread that we don't use.  */
 
 #  pragma weak pthread_create
+
+#  ifdef __clang__
+  /* Without this, clang complains that pthread_sigmask is never declared.  */
+#   include <signal.h>
+#  endif
 #  pragma weak pthread_sigmask
+
 #  pragma weak pthread_join
 #  ifndef pthread_self
 #   pragma weak pthread_self
diff --git a/gnulib-tests/glthread/yield.h b/gnulib-tests/glthread/yield.h
index 12cb03b0..b9292247 100644
--- a/gnulib-tests/glthread/yield.h
+++ b/gnulib-tests/glthread/yield.h
@@ -1,5 +1,5 @@
 /* Yielding the processor to other threads and processes.
-   Copyright (C) 2005-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/gnulib.mk b/gnulib-tests/gnulib.mk
index 457772ff..7f8ac240 100644
--- a/gnulib-tests/gnulib.mk
+++ b/gnulib-tests/gnulib.mk
@@ -1,6 +1,6 @@
 ## DO NOT EDIT! GENERATED AUTOMATICALLY!
 ## Process this file with automake to produce Makefile.in.
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 #
 # 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
@@ -22,7 +22,7 @@
 #
 # Generated by gnulib-tool.
 
-AUTOMAKE_OPTIONS = 1.5 foreign subdir-objects
+AUTOMAKE_OPTIONS = 1.9.6 foreign subdir-objects
 
 SUBDIRS = .
 TESTS =
@@ -169,6 +169,12 @@ EXTRA_DIST += test-base64.c macros.h
 
 ## end   gnulib module base64-tests
 
+## begin gnulib module binary-io
+
+libtests_a_SOURCES += binary-io.h binary-io.c
+
+## end   gnulib module binary-io
+
 ## begin gnulib module binary-io-tests
 
 TESTS += test-binary-io.sh
@@ -261,6 +267,7 @@ EXTRA_DIST += test-chdir.c signature.h macros.h
 
 TESTS += test-chown
 check_PROGRAMS += test-chown
+test_chown_LDADD = $(LDADD) $(LIB_NANOSLEEP)
 EXTRA_DIST += nap.h test-chown.h test-chown.c signature.h macros.h
 
 ## end   gnulib module chown-tests
@@ -312,6 +319,7 @@ EXTRA_DIST += test-connect.c signature.h macros.h
 
 TESTS += test-md5
 check_PROGRAMS += test-md5
+test_md5_LDADD = $(LDADD) @LIB_CRYPTO@
 EXTRA_DIST += test-md5.c
 
 ## end   gnulib module crypto/md5-tests
@@ -320,6 +328,7 @@ EXTRA_DIST += test-md5.c
 
 TESTS += test-sha1
 check_PROGRAMS += test-sha1
+test_sha1_LDADD = $(LDADD) @LIB_CRYPTO@
 EXTRA_DIST += test-sha1.c
 
 ## end   gnulib module crypto/sha1-tests
@@ -415,7 +424,7 @@ TESTS += \
  test-exclude8.sh
 
 check_PROGRAMS += test-exclude
-test_exclude_LDADD = $(LDADD) @LIBINTL@
+test_exclude_LDADD = $(LDADD) @LIBINTL@ $(LIBTHREAD)
 EXTRA_DIST += test-exclude.c test-exclude1.sh test-exclude2.sh test-exclude3.sh test-exclude4.sh test-exclude5.sh test-exclude6.sh test-exclude7.sh test-exclude8.sh
 
 ## end   gnulib module exclude-tests
@@ -459,7 +468,7 @@ EXTRA_DIST += test-fchmodat.c signature.h macros.h
 
 TESTS += test-fchownat
 check_PROGRAMS += test-fchownat
-test_fchownat_LDADD = $(LDADD) @LIBINTL@
+test_fchownat_LDADD = $(LDADD) $(LIB_NANOSLEEP) @LIBINTL@
 EXTRA_DIST += nap.h test-chown.h test-lchown.h test-fchownat.c signature.h macros.h
 
 ## end   gnulib module fchownat-tests
@@ -526,7 +535,8 @@ EXTRA_DIST += test-fdopendir.c signature.h macros.h
 
 TESTS += test-fdutimensat
 check_PROGRAMS += test-fdutimensat
-test_fdutimensat_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) @LIBINTL@
+test_fdutimensat_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) \
+  $(LIB_NANOSLEEP) @LIBINTL@
 EXTRA_DIST += nap.h test-futimens.h test-lutimens.h test-utimens.h test-utimens-common.h test-fdutimensat.c macros.h
 
 ## end   gnulib module fdutimensat-tests
@@ -780,7 +790,7 @@ EXTRA_DIST += test-ftruncate.c test-ftruncate.sh signature.h macros.h
 
 TESTS += test-futimens
 check_PROGRAMS += test-futimens
-test_futimens_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) @LIBINTL@
+test_futimens_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_NANOSLEEP) @LIBINTL@
 EXTRA_DIST += nap.h test-futimens.h test-utimens-common.h test-futimens.c signature.h macros.h
 
 ## end   gnulib module futimens-tests
@@ -900,15 +910,16 @@ EXTRA_DIST += macros.h signature.h test-getopt.c test-getopt.h test-getopt_long.
 
 ## begin gnulib module gettext
 
-# This is for those projects which use "gettextize --intl" to put a source-code
-# copy of libintl into their package. In such projects, every Makefile.am needs
+# If your project uses "gettextize --intl" to put a source-code
+# copy of libintl into the package, every Makefile.am needs
 # -I$(top_builddir)/intl, so that <libintl.h> can be found in this directory.
-# For the Makefile.ams in other directories it is the maintainer's
-# responsibility; for the one from gnulib we do it here.
-# This option has no effect when the user disables NLS (because then the intl
-# directory contains no libintl.h file) or when the project does not use
-# "gettextize --intl".
-AM_CPPFLAGS += -I$(top_builddir)/intl
+# Here's one way to do this:
+#AM_CPPFLAGS += -I$(top_builddir)/intl
+# This option has no effect when the user disables NLS (because then
+# the intl directory contains no libintl.h file).  This option is not
+# enabled by default because the intl directory might not exist if
+# your project does not use "gettext --intl", and some compilers
+# complain about -I options applied to nonexistent directories.
 
 EXTRA_DIST += $(top_srcdir)/build-aux/config.rpath
 
@@ -1104,6 +1115,7 @@ EXTRA_DIST += test-langinfo.c
 
 TESTS += test-lchown
 check_PROGRAMS += test-lchown
+test_lchown_LDADD = $(LDADD) $(LIB_NANOSLEEP)
 EXTRA_DIST += nap.h test-lchown.h test-lchown.c signature.h macros.h
 
 ## end   gnulib module lchown-tests
@@ -1455,15 +1467,6 @@ EXTRA_DIST += macros.h signature.h test-perror.c test-perror2.c test-perror.sh
 
 ## end   gnulib module perror-tests
 
-## begin gnulib module pipe-posix
-
-
-EXTRA_DIST += pipe.c
-
-EXTRA_libtests_a_SOURCES += pipe.c
-
-## end   gnulib module pipe-posix
-
 ## begin gnulib module pipe-posix-tests
 
 TESTS += test-pipe
@@ -1472,63 +1475,6 @@ EXTRA_DIST += test-pipe.c signature.h macros.h
 
 ## end   gnulib module pipe-posix-tests
 
-## begin gnulib module pipe2-tests
-
-TESTS += test-pipe2
-check_PROGRAMS += test-pipe2
-test_pipe2_LDADD = $(LDADD) $(LIBSOCKET)
-EXTRA_DIST += test-pipe2.c signature.h macros.h
-
-## end   gnulib module pipe2-tests
-
-## begin gnulib module posix_spawn_file_actions_addclose-tests
-
-TESTS += test-posix_spawn_file_actions_addclose
-check_PROGRAMS += test-posix_spawn_file_actions_addclose
-EXTRA_DIST += test-posix_spawn_file_actions_addclose.c signature.h macros.h
-
-## end   gnulib module posix_spawn_file_actions_addclose-tests
-
-## begin gnulib module posix_spawn_file_actions_adddup2-tests
-
-TESTS += test-posix_spawn_file_actions_adddup2
-check_PROGRAMS += test-posix_spawn_file_actions_adddup2
-EXTRA_DIST += test-posix_spawn_file_actions_adddup2.c signature.h macros.h
-
-## end   gnulib module posix_spawn_file_actions_adddup2-tests
-
-## begin gnulib module posix_spawn_file_actions_addopen-tests
-
-TESTS += test-posix_spawn_file_actions_addopen
-check_PROGRAMS += test-posix_spawn_file_actions_addopen
-EXTRA_DIST += test-posix_spawn_file_actions_addopen.c signature.h macros.h
-
-## end   gnulib module posix_spawn_file_actions_addopen-tests
-
-## begin gnulib module posix_spawnp-tests
-
-if POSIX_SPAWN_PORTED
-TESTS += test-posix_spawn1 test-posix_spawn2
-check_PROGRAMS += test-posix_spawn1 test-posix_spawn2
-
-BUILT_SOURCES += test-posix_spawn1.sh
-test-posix_spawn1.sh: test-posix_spawn1.in.sh
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	cp $(srcdir)/test-posix_spawn1.in.sh $@-t && \
-	mv $@-t $@
-MOSTLYCLEANFILES += test-posix_spawn1.sh test-posix_spawn1.sh-t
-
-BUILT_SOURCES += test-posix_spawn2.sh
-test-posix_spawn2.sh: test-posix_spawn2.in.sh
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	cp $(srcdir)/test-posix_spawn2.in.sh $@-t && \
-	mv $@-t $@
-MOSTLYCLEANFILES += test-posix_spawn2.sh test-posix_spawn2.sh-t
-endif
-EXTRA_DIST += test-posix_spawn1.c test-posix_spawn1.in.sh test-posix_spawn2.c test-posix_spawn2.in.sh signature.h
-
-## end   gnulib module posix_spawnp-tests
-
 ## begin gnulib module posixtm-tests
 
 TESTS += test-posixtm
@@ -1566,7 +1512,7 @@ EXTRA_DIST += test-priv-set.c macros.h
 TESTS += test-quotearg-simple
 check_PROGRAMS += test-quotearg-simple
 test_quotearg_simple_LDADD = $(LDADD) @LIBINTL@
-EXTRA_DIST += test-quotearg-simple.c test-quotearg.h macros.h
+EXTRA_DIST += test-quotearg-simple.c test-quotearg.h macros.h zerosize-ptr.h
 
 ## end   gnulib module quotearg-simple-tests
 
@@ -1586,14 +1532,6 @@ EXTRA_DIST += test-rand-isaac.c macros.h
 
 ## end   gnulib module randread-tests
 
-## begin gnulib module rawmemchr-tests
-
-TESTS += test-rawmemchr
-check_PROGRAMS += test-rawmemchr
-EXTRA_DIST += test-rawmemchr.c zerosize-ptr.h signature.h macros.h
-
-## end   gnulib module rawmemchr-tests
-
 ## begin gnulib module read-file-tests
 
 TESTS += test-read-file
@@ -1648,7 +1586,7 @@ EXTRA_DIST += test-realloc-gnu.c
 
 TESTS += test-regex
 check_PROGRAMS += test-regex
-test_regex_LDADD = $(LDADD) @LIBINTL@
+test_regex_LDADD = $(LDADD) @LIBINTL@ $(LIBTHREAD) $(LIB_PTHREAD)
 EXTRA_DIST += test-regex.c macros.h
 
 ## end   gnulib module regex-tests
@@ -1929,27 +1867,6 @@ EXTRA_DIST += test-sockets.c
 
 ## end   gnulib module sockets-tests
 
-## begin gnulib module spawn-pipe-tests
-
-TESTS += test-spawn-pipe.sh
-check_PROGRAMS += test-spawn-pipe-main test-spawn-pipe-child
-test_spawn_pipe_main_LDADD = $(LDADD) @LIBINTL@
-# The test-spawn-pipe-child program must be a real executable, not a libtool
-# wrapper script, and should link against as few libraries as possible.
-# Therefore don't link it against any libraries other than -lc.
-test_spawn_pipe_child_LDADD =
-EXTRA_DIST += test-spawn-pipe.sh test-spawn-pipe-main.c test-spawn-pipe-child.c macros.h
-
-## end   gnulib module spawn-pipe-tests
-
-## begin gnulib module spawn-tests
-
-TESTS += test-spawn
-check_PROGRAMS += test-spawn
-EXTRA_DIST += test-spawn.c
-
-## end   gnulib module spawn-tests
-
 ## begin gnulib module stat-tests
 
 TESTS += test-stat
@@ -1963,7 +1880,8 @@ EXTRA_DIST += test-stat.h test-stat.c signature.h macros.h
 
 TESTS += test-stat-time
 check_PROGRAMS += test-stat-time
-EXTRA_DIST += test-stat-time.c macros.h
+test_stat_time_LDADD = $(LDADD) $(LIB_NANOSLEEP)
+EXTRA_DIST += test-stat-time.c macros.h nap.h
 
 ## end   gnulib module stat-time-tests
 
@@ -2024,14 +1942,6 @@ EXTRA_DIST += test-stdlib.c test-sys_wait.h
 
 ## end   gnulib module stdlib-tests
 
-## begin gnulib module strchrnul-tests
-
-TESTS += test-strchrnul
-check_PROGRAMS += test-strchrnul
-EXTRA_DIST += test-strchrnul.c signature.h macros.h
-
-## end   gnulib module strchrnul-tests
-
 ## begin gnulib module strerror-tests
 
 TESTS += test-strerror
@@ -2419,28 +2329,11 @@ EXTRA_DIST += test-userspec.c
 
 ## end   gnulib module userspec-tests
 
-## begin gnulib module usleep
-
-
-EXTRA_DIST += usleep.c
-
-EXTRA_libtests_a_SOURCES += usleep.c
-
-## end   gnulib module usleep
-
-## begin gnulib module usleep-tests
-
-TESTS += test-usleep
-check_PROGRAMS += test-usleep
-EXTRA_DIST += test-usleep.c signature.h macros.h
-
-## end   gnulib module usleep-tests
-
 ## begin gnulib module utimens-tests
 
 TESTS += test-utimens
 check_PROGRAMS += test-utimens
-test_utimens_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) @LIBINTL@
+test_utimens_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_NANOSLEEP) @LIBINTL@
 EXTRA_DIST += nap.h test-futimens.h test-lutimens.h test-utimens.h test-utimens-common.h test-utimens.c macros.h
 
 ## end   gnulib module utimens-tests
@@ -2449,7 +2342,7 @@ EXTRA_DIST += nap.h test-futimens.h test-lutimens.h test-utimens.h test-utimens-
 
 TESTS += test-utimensat
 check_PROGRAMS += test-utimensat
-test_utimensat_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) @LIBINTL@
+test_utimensat_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_NANOSLEEP) @LIBINTL@
 EXTRA_DIST += nap.h test-lutimens.h test-utimens.h test-utimens-common.h test-utimensat.c signature.h macros.h
 
 ## end   gnulib module utimensat-tests
diff --git a/gnulib-tests/inet_pton.c b/gnulib-tests/inet_pton.c
index 78ebf1a1..e9703a79 100644
--- a/gnulib-tests/inet_pton.c
+++ b/gnulib-tests/inet_pton.c
@@ -1,6 +1,6 @@
 /* inet_pton.c -- convert IPv4 and IPv6 addresses from text to binary form
 
-   Copyright (C) 2006, 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/infinity.h b/gnulib-tests/infinity.h
index 91112899..ec9dba45 100644
--- a/gnulib-tests/infinity.h
+++ b/gnulib-tests/infinity.h
@@ -1,5 +1,5 @@
 /* Macros for infinity.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/init.sh b/gnulib-tests/init.sh
index bd2048e2..fbd293d6 100644
--- a/gnulib-tests/init.sh
+++ b/gnulib-tests/init.sh
@@ -1,6 +1,6 @@
 # source this file; set up for tests
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
@@ -201,6 +201,8 @@ else
       *x*) opts_=-x ;;
       *) opts_= ;;
     esac
+    re_shell=$re_shell_
+    export re_shell
     exec "$re_shell_" $opts_ "$0" --no-reexec "$@"
     echo "$ME_: exec failed" 1>&2
     exit 127
diff --git a/gnulib-tests/ioctl.c b/gnulib-tests/ioctl.c
index cd259112..89afb4ea 100644
--- a/gnulib-tests/ioctl.c
+++ b/gnulib-tests/ioctl.c
@@ -1,6 +1,6 @@
 /* ioctl.c --- wrappers for Windows ioctl function
 
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/listen.c b/gnulib-tests/listen.c
index 0ca83462..40b6b50c 100644
--- a/gnulib-tests/listen.c
+++ b/gnulib-tests/listen.c
@@ -1,6 +1,6 @@
 /* listen.c --- wrappers for Windows listen function
 
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/localename.c b/gnulib-tests/localename.c
index 47cb7cae..52d545a0 100644
--- a/gnulib-tests/localename.c
+++ b/gnulib-tests/localename.c
@@ -1,5 +1,5 @@
 /* Determine name of the currently selected locale.
-   Copyright (C) 1995-2013 Free Software Foundation, Inc.
+   Copyright (C) 1995-2014 Free Software Foundation, Inc.
 
    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
@@ -2515,7 +2515,7 @@ gl_locale_name_from_win32_LCID (LCID lcid)
 /* A hash function for NUL-terminated char* strings using
    the method described by Bruno Haible.
    See http://www.haible.de/bruno/hashfunc.html.  */
-static size_t
+static size_t _GL_ATTRIBUTE_PURE
 string_hash (const void *x)
 {
   const char *s = (const char *) x;
diff --git a/gnulib-tests/localename.h b/gnulib-tests/localename.h
index e70eee60..861e6e9e 100644
--- a/gnulib-tests/localename.h
+++ b/gnulib-tests/localename.h
@@ -1,5 +1,5 @@
 /* Determine name of the currently selected locale.
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -85,8 +85,12 @@ extern const char * gl_locale_name_environ (int category, const char *categoryna
       not require such a facility."
 
    The result must not be freed; it is statically allocated.  */
-extern const char * gl_locale_name_default (void);
-
+extern const char * gl_locale_name_default (void)
+#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE \
+      || defined _WIN32 || defined __WIN32__ || defined __CYGWIN__)
+  _GL_ATTRIBUTE_CONST
+#endif
+  ;
 
 #ifdef __cplusplus
 }
diff --git a/gnulib-tests/macros.h b/gnulib-tests/macros.h
index 60ba894d..0d7e3780 100644
--- a/gnulib-tests/macros.h
+++ b/gnulib-tests/macros.h
@@ -1,5 +1,5 @@
 /* Common macros used by gnulib tests.
-   Copyright (C) 2006-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
    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
@@ -48,8 +48,8 @@
     {                                                                        \
       if (!(expr))                                                           \
         {                                                                    \
-          fprintf (ASSERT_STREAM, "%s:%d: assertion failed\n",               \
-                   __FILE__, __LINE__);                                      \
+          fprintf (ASSERT_STREAM, "%s:%d: assertion '%s' failed\n",     \
+                   __FILE__, __LINE__, #expr);                          \
           fflush (ASSERT_STREAM);                                            \
           abort ();                                                          \
         }                                                                    \
diff --git a/gnulib-tests/minus-zero.h b/gnulib-tests/minus-zero.h
index 5882cbf7..be65edc8 100644
--- a/gnulib-tests/minus-zero.h
+++ b/gnulib-tests/minus-zero.h
@@ -1,5 +1,5 @@
 /* Macros for floating-point negative zero.
-   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/nan.h b/gnulib-tests/nan.h
index e95ceb96..9da3684e 100644
--- a/gnulib-tests/nan.h
+++ b/gnulib-tests/nan.h
@@ -1,5 +1,5 @@
 /* Macros for not-a-number.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/nap.h b/gnulib-tests/nap.h
index 342a70ce..cc596d0d 100644
--- a/gnulib-tests/nap.h
+++ b/gnulib-tests/nap.h
@@ -1,5 +1,5 @@
 /* Assist in file system timestamp tests.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -19,19 +19,37 @@
 #ifndef GLTEST_NAP_H
 # define GLTEST_NAP_H
 
+# include <limits.h>
+# include <stdbool.h>
+
+/* File descriptor used for the witness file.  */
+static int nap_fd = -1;
+
+/* Return A - B, in ns.
+   Return 0 if the true result would be negative.
+   Return INT_MAX if the true result would be greater than INT_MAX.  */
 static int
-lt_mtime (struct stat const *a, struct stat const *b)
+diff_timespec (struct timespec a, struct timespec b)
 {
-  time_t as = a->st_mtime;
-  time_t bs = b->st_mtime;
-  int ans = get_stat_mtime_ns (a);
-  int bns = get_stat_mtime_ns (b);
+  time_t as = a.tv_sec;
+  time_t bs = b.tv_sec;
+  int ans = a.tv_nsec;
+  int bns = b.tv_nsec;
 
-  return as < bs || (as == bs && ans < bns);
+  if (! (bs < as || (bs == as && bns < ans)))
+    return 0;
+  if (as - bs <= INT_MAX / 1000000000)
+    {
+      int sdiff = (as - bs) * 1000000000;
+      int usdiff = ans - bns;
+      if (usdiff < INT_MAX - sdiff)
+        return sdiff + usdiff;
+    }
+  return INT_MAX;
 }
 
 static void
-get_mtime (int fd, struct stat *st, int do_write)
+get_stat (int fd, struct stat *st, int do_write)
 {
   if (do_write)
     ASSERT (write (fd, "\n", 1) == 1);
@@ -39,65 +57,72 @@ get_mtime (int fd, struct stat *st, int do_write)
 }
 
 /* Given a file whose descriptor is FD, see whether delaying by DELAY
-   microseconds causes a change in a file's time stamp.  If the time
-   stamps differ, repeat the test one more time, in case we crossed a
-   quantization boundary on a file system with lower resolution.  *ST
-   is the file's status, recently gotten.  Update *ST to reflect the
-   latest status gotten.  */
-static int
-nap_works (int fd, int delay, struct stat *st)
+   nanoseconds causes a change in a file's ctime and mtime.
+   OLD_ST is the file's status, recently gotten.  */
+static bool
+nap_works (int fd, int delay, struct stat old_st)
 {
-  struct stat old_st;
-  old_st = *st;
-  usleep (delay);
-  get_mtime (fd, st, 1);
-  if (! lt_mtime (&old_st, st))
-    return 0;
-  old_st = *st;
-  usleep (delay);
-  get_mtime (fd, st, 1);
-  return lt_mtime (&old_st, st);
+  struct stat st;
+  struct timespec delay_spec;
+  delay_spec.tv_sec = delay / 1000000000;
+  delay_spec.tv_nsec = delay % 1000000000;
+  ASSERT (nanosleep (&delay_spec, 0) == 0);
+  get_stat (fd, &st, 1);
+
+  if (   diff_timespec (get_stat_ctime (&st), get_stat_ctime (&old_st))
+      && diff_timespec (get_stat_mtime (&st), get_stat_mtime (&old_st)))
+    return true;
+
+  return false;
 }
 
-static int
-guess_delay (void)
+#define TEMPFILE BASE "nap.tmp"
+
+static void
+clear_temp_file (void)
 {
-  /* Try a 1-microsecond sleep first, for speed.  If that doesn't
-     work, try a 1 ms sleep; that should work with ext.  If it doesn't
-     work, try a 20 ms sleep.  xfs has a quantization of about 10
-     milliseconds, even though it has a granularity of 1 nanosecond,
-     and NTFS has a default quantization of 15.25 milliseconds, even
-     though it has a granularity of 100 nanoseconds, so 20 ms is a
-     good quantization to try.  If that doesn't work, try 1 second.
-     The worst case is 2 seconds, needed for FAT.  */
-  static int const delaytab[] = {1, 1000, 20000, 1000000 };
-  int fd = creat (BASE "tmp", 0600);
-  int i;
-  int delay = 2000000;
-  struct stat st;
-  ASSERT (0 <= fd);
-  get_mtime (fd, &st, 0);
-  for (i = 0; i < sizeof delaytab / sizeof delaytab[0]; i++)
-    if (nap_works (fd, delaytab[i], &st))
-      {
-        delay = delaytab[i];
-        break;
-      }
-  ASSERT (close (fd) == 0);
-  ASSERT (unlink (BASE "tmp") == 0);
-  return delay;
+  if (0 <= nap_fd)
+    {
+      ASSERT (close (nap_fd) != -1);
+      ASSERT (unlink (TEMPFILE) != -1);
+    }
 }
 
 /* Sleep long enough to notice a timestamp difference on the file
-   system in the current directory.  Assumes that BASE is defined,
-   and requires that the test module depends on usleep.  */
+   system in the current directory.  Use an adaptive approach, trying
+   to find the smallest delay which works on the current file system
+   to make the timestamp difference appear.  Assert a maximum delay of
+   ~2 seconds, more precisely sum(2^n) from 0 to 30 = 2^31 - 1 = 2.1s.
+   Assumes that BASE is defined, and requires that the test module
+   depends on nanosleep.  */
 static void
 nap (void)
 {
-  static int delay;
-  if (!delay)
-    delay = guess_delay ();
-  usleep (delay);
+  struct stat old_st;
+  static int delay = 1;
+
+  if (-1 == nap_fd)
+    {
+      atexit (clear_temp_file);
+      ASSERT ((nap_fd = creat (TEMPFILE, 0600)) != -1);
+      get_stat (nap_fd, &old_st, 0);
+    }
+  else
+    {
+      ASSERT (0 <= nap_fd);
+      get_stat (nap_fd, &old_st, 1);
+    }
+
+  if (1 < delay)
+    delay = delay / 2;  /* Try half of the previous delay.  */
+  ASSERT (0 < delay);
+
+  for ( ; delay <= 2147483647; delay = delay * 2)
+    if (nap_works (nap_fd, delay, old_st))
+      return;
+
+  /* Bummer: even the highest nap delay didn't work. */
+  ASSERT (0);
 }
 
 #endif /* GLTEST_NAP_H */
diff --git a/gnulib-tests/perror.c b/gnulib-tests/perror.c
index ae532018..c0548c93 100644
--- a/gnulib-tests/perror.c
+++ b/gnulib-tests/perror.c
@@ -1,5 +1,5 @@
 /* Print a message describing error code.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
    Written by Bruno Haible and Simon Josefsson.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-tests/randomd.c b/gnulib-tests/randomd.c
index a3097efb..85cd981a 100644
--- a/gnulib-tests/randomd.c
+++ b/gnulib-tests/randomd.c
@@ -1,5 +1,5 @@
 /* Some random 'double' numbers used by gnulib tests.
-   Copyright (C) 2012-2013 Free Software Foundation, Inc.
+   Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/randoml.c b/gnulib-tests/randoml.c
index 4e854dda..42f51e26 100644
--- a/gnulib-tests/randoml.c
+++ b/gnulib-tests/randoml.c
@@ -1,5 +1,5 @@
 /* Some random 'long double' numbers used by gnulib tests.
-   Copyright (C) 2012-2013 Free Software Foundation, Inc.
+   Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/setlocale.c b/gnulib-tests/setlocale.c
index c729fa6f..3009d2cb 100644
--- a/gnulib-tests/setlocale.c
+++ b/gnulib-tests/setlocale.c
@@ -1,5 +1,5 @@
 /* Set the current locale.
-   Copyright (C) 2009, 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/setsockopt.c b/gnulib-tests/setsockopt.c
index 7865aaff..08afdae2 100644
--- a/gnulib-tests/setsockopt.c
+++ b/gnulib-tests/setsockopt.c
@@ -1,6 +1,6 @@
 /* setsockopt.c --- wrappers for Windows setsockopt function
 
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/signature.h b/gnulib-tests/signature.h
index 45a8e02b..0ae64e7e 100644
--- a/gnulib-tests/signature.h
+++ b/gnulib-tests/signature.h
@@ -1,5 +1,5 @@
 /* Macro for checking that a function declaration is compliant.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/sleep.c b/gnulib-tests/sleep.c
index 4c97d7df..2d86b7e0 100644
--- a/gnulib-tests/sleep.c
+++ b/gnulib-tests/sleep.c
@@ -1,5 +1,5 @@
 /* Pausing execution of the current thread.
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-tests/socket.c b/gnulib-tests/socket.c
index dcbd07af..5707e7f8 100644
--- a/gnulib-tests/socket.c
+++ b/gnulib-tests/socket.c
@@ -1,6 +1,6 @@
 /* socket.c --- wrappers for Windows socket function
 
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/strerror_r.c b/gnulib-tests/strerror_r.c
index e86d272a..4aa96cbb 100644
--- a/gnulib-tests/strerror_r.c
+++ b/gnulib-tests/strerror_r.c
@@ -1,6 +1,6 @@
 /* strerror_r.c --- POSIX compatible system error routine
 
-   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/symlinkat.c b/gnulib-tests/symlinkat.c
index 336b0a2a..26a88f9d 100644
--- a/gnulib-tests/symlinkat.c
+++ b/gnulib-tests/symlinkat.c
@@ -1,5 +1,5 @@
 /* Create a symlink relative to an open directory.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-accept.c b/gnulib-tests/test-accept.c
index 2af98afa..58d796a9 100644
--- a/gnulib-tests/test-accept.c
+++ b/gnulib-tests/test-accept.c
@@ -1,5 +1,5 @@
 /* Test accepting a connection to a server socket.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-alignof.c b/gnulib-tests/test-alignof.c
index d988881b..c2d2a8df 100644
--- a/gnulib-tests/test-alignof.c
+++ b/gnulib-tests/test-alignof.c
@@ -1,5 +1,5 @@
 /* Test of <alignof.h>.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-alloca-opt.c b/gnulib-tests/test-alloca-opt.c
index d94e1d1d..3d8acc45 100644
--- a/gnulib-tests/test-alloca-opt.c
+++ b/gnulib-tests/test-alloca-opt.c
@@ -1,5 +1,5 @@
 /* Test of optional automatic memory allocation.
-   Copyright (C) 2005, 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-areadlink-with-size.c b/gnulib-tests/test-areadlink-with-size.c
index 60b67415..6aaff67a 100644
--- a/gnulib-tests/test-areadlink-with-size.c
+++ b/gnulib-tests/test-areadlink-with-size.c
@@ -1,5 +1,5 @@
 /* Tests of areadlink_with_size.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-areadlink.c b/gnulib-tests/test-areadlink.c
index 23576802..b487d447 100644
--- a/gnulib-tests/test-areadlink.c
+++ b/gnulib-tests/test-areadlink.c
@@ -1,5 +1,5 @@
 /* Tests of areadlink.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-areadlink.h b/gnulib-tests/test-areadlink.h
index ccc7187e..61bce294 100644
--- a/gnulib-tests/test-areadlink.h
+++ b/gnulib-tests/test-areadlink.h
@@ -1,5 +1,5 @@
 /* Tests of areadlink and friends.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-areadlinkat.c b/gnulib-tests/test-areadlinkat.c
index 47bbae53..b1c8b263 100644
--- a/gnulib-tests/test-areadlinkat.c
+++ b/gnulib-tests/test-areadlinkat.c
@@ -1,5 +1,5 @@
 /* Tests of areadlinkat.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-argmatch.c b/gnulib-tests/test-argmatch.c
index 9e24dc19..735cb767 100644
--- a/gnulib-tests/test-argmatch.c
+++ b/gnulib-tests/test-argmatch.c
@@ -1,5 +1,5 @@
 /* Test of exact or abbreviated match search.
-   Copyright (C) 1990, 1998-1999, 2001-2013 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1998-1999, 2001-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-argv-iter.c b/gnulib-tests/test-argv-iter.c
index 19680cf4..203fb1ae 100644
--- a/gnulib-tests/test-argv-iter.c
+++ b/gnulib-tests/test-argv-iter.c
@@ -1,5 +1,5 @@
 /* Test argv iterator
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-arpa_inet.c b/gnulib-tests/test-arpa_inet.c
index 37f2ec3f..df67608b 100644
--- a/gnulib-tests/test-arpa_inet.c
+++ b/gnulib-tests/test-arpa_inet.c
@@ -1,5 +1,5 @@
 /* Test of <arpa/inet.h> substitute.
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-base64.c b/gnulib-tests/test-base64.c
index 9debff06..1f730133 100644
--- a/gnulib-tests/test-base64.c
+++ b/gnulib-tests/test-base64.c
@@ -1,5 +1,5 @@
 /* Self tests for base64.
-   Copyright (C) 2004, 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2008-2014 Free Software Foundation, Inc.
    Written by Simon Josefsson.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-tests/test-binary-io.c b/gnulib-tests/test-binary-io.c
index b258d51a..1b29fbd5 100644
--- a/gnulib-tests/test-binary-io.c
+++ b/gnulib-tests/test-binary-io.c
@@ -1,5 +1,5 @@
 /* Test of binary mode I/O.
-   Copyright (C) 2005, 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-bind.c b/gnulib-tests/test-bind.c
index fe854104..4eeb59e2 100644
--- a/gnulib-tests/test-bind.c
+++ b/gnulib-tests/test-bind.c
@@ -1,5 +1,5 @@
 /* Test binding a server socket to a port.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-bitrotate.c b/gnulib-tests/test-bitrotate.c
index 380f08d8..c8545a21 100644
--- a/gnulib-tests/test-bitrotate.c
+++ b/gnulib-tests/test-bitrotate.c
@@ -1,5 +1,5 @@
 /* Test of <bitrotate.h> substitute.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-btowc.c b/gnulib-tests/test-btowc.c
index 7779469e..b9df2f0c 100644
--- a/gnulib-tests/test-btowc.c
+++ b/gnulib-tests/test-btowc.c
@@ -1,5 +1,5 @@
 /* Test of conversion of unibyte character to wide character.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-c-ctype.c b/gnulib-tests/test-c-ctype.c
index c0aa662f..80bf7033 100644
--- a/gnulib-tests/test-c-ctype.c
+++ b/gnulib-tests/test-c-ctype.c
@@ -1,5 +1,5 @@
 /* Test of character handling in C locale.
-   Copyright (C) 2005, 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-c-strcasecmp.c b/gnulib-tests/test-c-strcasecmp.c
index 26d9ca45..03088ffd 100644
--- a/gnulib-tests/test-c-strcasecmp.c
+++ b/gnulib-tests/test-c-strcasecmp.c
@@ -1,5 +1,5 @@
 /* Test of case-insensitive string comparison function.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-c-strncasecmp.c b/gnulib-tests/test-c-strncasecmp.c
index 075f15e7..0fba0e5c 100644
--- a/gnulib-tests/test-c-strncasecmp.c
+++ b/gnulib-tests/test-c-strncasecmp.c
@@ -1,5 +1,5 @@
 /* Test of case-insensitive string comparison function.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-calloc-gnu.c b/gnulib-tests/test-calloc-gnu.c
index ccd956c8..c8dc9312 100644
--- a/gnulib-tests/test-calloc-gnu.c
+++ b/gnulib-tests/test-calloc-gnu.c
@@ -1,5 +1,5 @@
 /* Test of calloc function.
-   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-canonicalize.c b/gnulib-tests/test-canonicalize.c
index 6794cf51..6da94e62 100644
--- a/gnulib-tests/test-canonicalize.c
+++ b/gnulib-tests/test-canonicalize.c
@@ -1,5 +1,5 @@
 /* Test of execution of file name canonicalization.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-chdir.c b/gnulib-tests/test-chdir.c
index 40fd31ff..e17b6606 100644
--- a/gnulib-tests/test-chdir.c
+++ b/gnulib-tests/test-chdir.c
@@ -1,5 +1,5 @@
 /* Test changing to a directory.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-chown.c b/gnulib-tests/test-chown.c
index d7962460..00891e0d 100644
--- a/gnulib-tests/test-chown.c
+++ b/gnulib-tests/test-chown.c
@@ -1,5 +1,5 @@
 /* Tests of chown.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-chown.h b/gnulib-tests/test-chown.h
index 1f66d4cf..7f703ebb 100644
--- a/gnulib-tests/test-chown.h
+++ b/gnulib-tests/test-chown.h
@@ -1,5 +1,5 @@
 /* Tests of chown.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -57,9 +57,9 @@ test_chown (int (*func) (char const *, uid_t, gid_t), bool print)
   ASSERT (mkdir (BASE "dir", 0700) == 0);
   ASSERT (stat (BASE "dir", &st1) == 0);
 
-  /* Filter out mingw, which has no concept of groups.  */
+  /* Filter out mingw and file systems which have no concept of groups.  */
   result = func (BASE "dir", st1.st_uid, getegid ());
-  if (result == -1 && errno == ENOSYS)
+  if (result == -1 && (errno == ENOSYS || errno == EPERM))
     {
       ASSERT (rmdir (BASE "dir") == 0);
       if (print)
diff --git a/gnulib-tests/test-cloexec.c b/gnulib-tests/test-cloexec.c
index 504a95b9..116953dc 100644
--- a/gnulib-tests/test-cloexec.c
+++ b/gnulib-tests/test-cloexec.c
@@ -1,5 +1,5 @@
 /* Test duplicating non-inheritable file descriptors.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -78,6 +78,7 @@ main (void)
   const char *file = "test-cloexec.tmp";
   int fd = creat (file, 0600);
   int fd2;
+  int bad_fd = getdtablesize ();
 
   /* Assume std descriptors were provided by invoker.  */
   ASSERT (STDERR_FILENO < fd);
@@ -120,7 +121,7 @@ main (void)
   ASSERT (set_cloexec_flag (-1, false) == -1);
   ASSERT (errno == EBADF);
   errno = 0;
-  ASSERT (set_cloexec_flag (10000000, false) == -1);
+  ASSERT (set_cloexec_flag (bad_fd, false) == -1);
   ASSERT (errno == EBADF);
   errno = 0;
   ASSERT (set_cloexec_flag (fd2, false) == -1);
@@ -129,7 +130,7 @@ main (void)
   ASSERT (dup_cloexec (-1) == -1);
   ASSERT (errno == EBADF);
   errno = 0;
-  ASSERT (dup_cloexec (10000000) == -1);
+  ASSERT (dup_cloexec (bad_fd) == -1);
   ASSERT (errno == EBADF);
   errno = 0;
   ASSERT (dup_cloexec (fd2) == -1);
diff --git a/gnulib-tests/test-close.c b/gnulib-tests/test-close.c
index 974ed1b6..44bce54a 100644
--- a/gnulib-tests/test-close.c
+++ b/gnulib-tests/test-close.c
@@ -1,5 +1,5 @@
 /* Test closing a file or socket.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-closein.c b/gnulib-tests/test-closein.c
index 5f9d8ef4..b177cf00 100644
--- a/gnulib-tests/test-closein.c
+++ b/gnulib-tests/test-closein.c
@@ -1,5 +1,5 @@
 /* Test of closein module.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-connect.c b/gnulib-tests/test-connect.c
index a1cd5f17..6142429a 100644
--- a/gnulib-tests/test-connect.c
+++ b/gnulib-tests/test-connect.c
@@ -1,5 +1,5 @@
 /* Test connecting a client socket.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-copy-acl.c b/gnulib-tests/test-copy-acl.c
index f7e29993..82b5abf9 100644
--- a/gnulib-tests/test-copy-acl.c
+++ b/gnulib-tests/test-copy-acl.c
@@ -1,5 +1,5 @@
 /* Test of copying of files.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-ctype.c b/gnulib-tests/test-ctype.c
index a41449c1..8c79cd26 100644
--- a/gnulib-tests/test-ctype.c
+++ b/gnulib-tests/test-ctype.c
@@ -1,5 +1,5 @@
 /* Test of <ctype.h> substitute.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-di-set.c b/gnulib-tests/test-di-set.c
index b064978d..f2e7a00b 100644
--- a/gnulib-tests/test-di-set.c
+++ b/gnulib-tests/test-di-set.c
@@ -1,5 +1,5 @@
 /* Test the di-set module.
-   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-dirent-safer.c b/gnulib-tests/test-dirent-safer.c
index 7d5f4f51..859194c5 100644
--- a/gnulib-tests/test-dirent-safer.c
+++ b/gnulib-tests/test-dirent-safer.c
@@ -1,5 +1,5 @@
 /* Test that directory streams leave standard fds alone.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-dirent.c b/gnulib-tests/test-dirent.c
index 34ef5d94..7905a2ab 100644
--- a/gnulib-tests/test-dirent.c
+++ b/gnulib-tests/test-dirent.c
@@ -1,5 +1,5 @@
 /* Test of <dirent.h> substitute.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-dirname.c b/gnulib-tests/test-dirname.c
index a017bce9..1c6ee574 100644
--- a/gnulib-tests/test-dirname.c
+++ b/gnulib-tests/test-dirname.c
@@ -1,5 +1,5 @@
 /* Test the gnulib dirname module.
-   Copyright (C) 2005-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-dup-safer.c b/gnulib-tests/test-dup-safer.c
index d7567e01..d11891e7 100644
--- a/gnulib-tests/test-dup-safer.c
+++ b/gnulib-tests/test-dup-safer.c
@@ -1,5 +1,5 @@
 /* Test that dup_safer leaves standard fds alone.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -24,6 +24,7 @@
 #include <errno.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <unistd.h>
 
 #include "binary-io.h"
 #include "cloexec.h"
@@ -107,6 +108,7 @@ main (void)
 {
   int i;
   int fd;
+  int bad_fd = getdtablesize ();
 
   /* We close fd 2 later, so save it in fd 10.  */
   if (dup2 (STDERR_FILENO, BACKUP_STDERR_FILENO) != BACKUP_STDERR_FILENO
@@ -129,7 +131,7 @@ main (void)
       ASSERT (dup (-1) == -1);
       ASSERT (errno == EBADF);
       errno = 0;
-      ASSERT (dup (10000000) == -1);
+      ASSERT (dup (bad_fd) == -1);
       ASSERT (errno == EBADF);
       close (fd + 1);
       errno = 0;
diff --git a/gnulib-tests/test-dup.c b/gnulib-tests/test-dup.c
index b2cf9357..905275c8 100644
--- a/gnulib-tests/test-dup.c
+++ b/gnulib-tests/test-dup.c
@@ -1,5 +1,5 @@
 /* Test duplicating a file descriptor.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-dup2.c b/gnulib-tests/test-dup2.c
index 9600c850..c7cb9656 100644
--- a/gnulib-tests/test-dup2.c
+++ b/gnulib-tests/test-dup2.c
@@ -1,5 +1,5 @@
 /* Test duplicating file descriptors.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -26,6 +26,10 @@ SIGNATURE_CHECK (dup2, int, (int, int));
 #include <errno.h>
 #include <fcntl.h>
 
+#if HAVE_SYS_RESOURCE_H
+# include <sys/resource.h>
+#endif
+
 #include "binary-io.h"
 
 #if GNULIB_TEST_CLOEXEC
@@ -103,6 +107,7 @@ main (void)
 {
   const char *file = "test-dup2.tmp";
   char buffer[1];
+  int bad_fd = getdtablesize ();
   int fd = open (file, O_CREAT | O_TRUNC | O_RDWR, 0600);
 
   /* Assume std descriptors were provided by invoker.  */
@@ -145,8 +150,17 @@ main (void)
   errno = 0;
   ASSERT (dup2 (fd, -2) == -1);
   ASSERT (errno == EBADF);
+  if (bad_fd > 256)
+    {
+      ASSERT (dup2 (fd, 255) == 255);
+      ASSERT (dup2 (fd, 256) == 256);
+      ASSERT (close (255) == 0);
+      ASSERT (close (256) == 0);
+    }
+  ASSERT (dup2 (fd, bad_fd - 1) == bad_fd - 1);
+  ASSERT (close (bad_fd - 1) == 0);
   errno = 0;
-  ASSERT (dup2 (fd, 10000000) == -1);
+  ASSERT (dup2 (fd, bad_fd) == -1);
   ASSERT (errno == EBADF);
 
   /* Using dup2 can skip fds.  */
diff --git a/gnulib-tests/test-environ.c b/gnulib-tests/test-environ.c
index cb3d9f60..46a2eab1 100644
--- a/gnulib-tests/test-environ.c
+++ b/gnulib-tests/test-environ.c
@@ -1,5 +1,5 @@
 /* Test of environ variable.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-errno.c b/gnulib-tests/test-errno.c
index 29eb510d..495242ba 100644
--- a/gnulib-tests/test-errno.c
+++ b/gnulib-tests/test-errno.c
@@ -1,5 +1,5 @@
 /* Test of <errno.h> substitute.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-exclude.c b/gnulib-tests/test-exclude.c
index bad28373..277f05db 100644
--- a/gnulib-tests/test-exclude.c
+++ b/gnulib-tests/test-exclude.c
@@ -1,5 +1,5 @@
 /* Test suite for exclude.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
    This file is part of the GNUlib Library.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-tests/test-exclude1.sh b/gnulib-tests/test-exclude1.sh
index df626990..41fa46e2 100755
--- a/gnulib-tests/test-exclude1.sh
+++ b/gnulib-tests/test-exclude1.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Test suite for exclude.
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 # This file is part of the GNUlib Library.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-tests/test-exclude2.sh b/gnulib-tests/test-exclude2.sh
index bc35be83..349a7051 100755
--- a/gnulib-tests/test-exclude2.sh
+++ b/gnulib-tests/test-exclude2.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Test suite for exclude.
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 # This file is part of the GNUlib Library.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-tests/test-exclude3.sh b/gnulib-tests/test-exclude3.sh
index 497c58fe..35f0ded3 100755
--- a/gnulib-tests/test-exclude3.sh
+++ b/gnulib-tests/test-exclude3.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Test suite for exclude.
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 # This file is part of the GNUlib Library.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-tests/test-exclude4.sh b/gnulib-tests/test-exclude4.sh
index f450dbb1..22f4d324 100755
--- a/gnulib-tests/test-exclude4.sh
+++ b/gnulib-tests/test-exclude4.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Test suite for exclude.
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 # This file is part of the GNUlib Library.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-tests/test-exclude5.sh b/gnulib-tests/test-exclude5.sh
index 1dac96b7..5bcf28d2 100755
--- a/gnulib-tests/test-exclude5.sh
+++ b/gnulib-tests/test-exclude5.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Test suite for exclude.
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 # This file is part of the GNUlib Library.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-tests/test-exclude6.sh b/gnulib-tests/test-exclude6.sh
index c0b1cbad..0c0db9f6 100755
--- a/gnulib-tests/test-exclude6.sh
+++ b/gnulib-tests/test-exclude6.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Test suite for exclude.
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 # This file is part of the GNUlib Library.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-tests/test-exclude7.sh b/gnulib-tests/test-exclude7.sh
index cb1e0cb7..67efb8ac 100755
--- a/gnulib-tests/test-exclude7.sh
+++ b/gnulib-tests/test-exclude7.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Test suite for exclude.
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 # This file is part of the GNUlib Library.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-tests/test-exclude8.sh b/gnulib-tests/test-exclude8.sh
index 9cbdbac7..c88f6ad7 100755
--- a/gnulib-tests/test-exclude8.sh
+++ b/gnulib-tests/test-exclude8.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Test suite for exclude.
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
 # This file is part of the GNUlib Library.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-tests/test-faccessat.c b/gnulib-tests/test-faccessat.c
index 6a4641fa..400d4481 100644
--- a/gnulib-tests/test-faccessat.c
+++ b/gnulib-tests/test-faccessat.c
@@ -1,5 +1,5 @@
 /* Test checking user's permissions for a file.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-fadvise.c b/gnulib-tests/test-fadvise.c
index 05860b0a..0ccacefc 100644
--- a/gnulib-tests/test-fadvise.c
+++ b/gnulib-tests/test-fadvise.c
@@ -1,5 +1,5 @@
 /* Test that fadvise works as advertised.
-   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-fchdir.c b/gnulib-tests/test-fchdir.c
index 7ffc71ba..b771223e 100644
--- a/gnulib-tests/test-fchdir.c
+++ b/gnulib-tests/test-fchdir.c
@@ -1,5 +1,5 @@
 /* Test changing to a directory named by a file descriptor.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -70,7 +70,7 @@ main (void)
   /* Repeat test twice, once in '.' and once in '..'.  */
   for (i = 0; i < 2; i++)
     {
-      ASSERT (chdir (".." + 1 - i) == 0);
+      ASSERT (chdir (&".."[1 - i]) == 0);
       ASSERT (fchdir (fd) == 0);
       {
         size_t len = strlen (cwd) + 1;
diff --git a/gnulib-tests/test-fchmodat.c b/gnulib-tests/test-fchmodat.c
index 082f2b48..a63b7644 100644
--- a/gnulib-tests/test-fchmodat.c
+++ b/gnulib-tests/test-fchmodat.c
@@ -1,5 +1,5 @@
 /* Test changing the protections of a file relative to an open directory.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-fchownat.c b/gnulib-tests/test-fchownat.c
index c10651be..f64180d1 100644
--- a/gnulib-tests/test-fchownat.c
+++ b/gnulib-tests/test-fchownat.c
@@ -1,5 +1,5 @@
 /* Tests of fchownat.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-fclose.c b/gnulib-tests/test-fclose.c
index 3fbecf12..cebfcebb 100644
--- a/gnulib-tests/test-fclose.c
+++ b/gnulib-tests/test-fclose.c
@@ -1,5 +1,5 @@
 /* Test of fclose module.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-fcntl-h.c b/gnulib-tests/test-fcntl-h.c
index e30ff19b..a86214ee 100644
--- a/gnulib-tests/test-fcntl-h.c
+++ b/gnulib-tests/test-fcntl-h.c
@@ -1,5 +1,5 @@
 /* Test of <fcntl.h> substitute.
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-fcntl-safer.c b/gnulib-tests/test-fcntl-safer.c
index c5f48f1e..f58f5b8d 100644
--- a/gnulib-tests/test-fcntl-safer.c
+++ b/gnulib-tests/test-fcntl-safer.c
@@ -1,5 +1,5 @@
 /* Test of opening a file descriptor.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-fcntl.c b/gnulib-tests/test-fcntl.c
index 67d1b41d..23d74d84 100644
--- a/gnulib-tests/test-fcntl.c
+++ b/gnulib-tests/test-fcntl.c
@@ -1,5 +1,5 @@
 /* Test of fcntl(2).
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -211,6 +211,7 @@ main (void)
 {
   const char *file = "test-fcntl.tmp";
   int fd;
+  int bad_fd = getdtablesize ();
 
   /* Sanity check that rpl_fcntl is likely to work.  */
   ASSERT (func2 (1, 2) == 2);
@@ -237,7 +238,7 @@ main (void)
   ASSERT (fcntl (fd + 1, F_DUPFD, 0) == -1);
   ASSERT (errno == EBADF);
   errno = 0;
-  ASSERT (fcntl (10000000, F_DUPFD, 0) == -1);
+  ASSERT (fcntl (bad_fd, F_DUPFD, 0) == -1);
   ASSERT (errno == EBADF);
   errno = 0;
   ASSERT (fcntl (-1, F_DUPFD_CLOEXEC, 0) == -1);
@@ -246,23 +247,21 @@ main (void)
   ASSERT (fcntl (fd + 1, F_DUPFD_CLOEXEC, 0) == -1);
   ASSERT (errno == EBADF);
   errno = 0;
-  ASSERT (fcntl (10000000, F_DUPFD_CLOEXEC, 0) == -1);
+  ASSERT (fcntl (bad_fd, F_DUPFD_CLOEXEC, 0) == -1);
   ASSERT (errno == EBADF);
 
   /* For F_DUPFD*, the destination must be valid.  */
-  ASSERT (getdtablesize () < 10000000);
   errno = 0;
   ASSERT (fcntl (fd, F_DUPFD, -1) == -1);
   ASSERT (errno == EINVAL);
   errno = 0;
-  ASSERT (fcntl (fd, F_DUPFD, 10000000) == -1);
+  ASSERT (fcntl (fd, F_DUPFD, bad_fd) == -1);
   ASSERT (errno == EINVAL);
-  ASSERT (getdtablesize () < 10000000);
   errno = 0;
   ASSERT (fcntl (fd, F_DUPFD_CLOEXEC, -1) == -1);
   ASSERT (errno == EINVAL);
   errno = 0;
-  ASSERT (fcntl (fd, F_DUPFD_CLOEXEC, 10000000) == -1);
+  ASSERT (fcntl (fd, F_DUPFD_CLOEXEC, bad_fd) == -1);
   ASSERT (errno == EINVAL);
 
   /* For F_DUPFD*, check for correct inheritance, as well as
@@ -322,7 +321,7 @@ main (void)
   ASSERT (fcntl (fd + 1, F_GETFD) == -1);
   ASSERT (errno == EBADF);
   errno = 0;
-  ASSERT (fcntl (10000000, F_GETFD) == -1);
+  ASSERT (fcntl (bad_fd, F_GETFD) == -1);
   ASSERT (errno == EBADF);
 
   /* Test F_GETFD, the FD_CLOEXEC bit.  */
@@ -346,7 +345,7 @@ main (void)
   ASSERT (fcntl (fd + 1, F_SETFD, 0) == -1);
   ASSERT (errno == EBADF);
   errno = 0;
-  ASSERT (fcntl (10000000, F_SETFD, 0) == -1);
+  ASSERT (fcntl (bad_fd, F_SETFD, 0) == -1);
   ASSERT (errno == EBADF);
 #endif
 
@@ -359,7 +358,7 @@ main (void)
   ASSERT (fcntl (fd + 1, F_GETFL) == -1);
   ASSERT (errno == EBADF);
   errno = 0;
-  ASSERT (fcntl (10000000, F_GETFL) == -1);
+  ASSERT (fcntl (bad_fd, F_GETFL) == -1);
   ASSERT (errno == EBADF);
 #endif
 
@@ -372,7 +371,7 @@ main (void)
   ASSERT (fcntl (fd + 1, F_SETFL, 0) == -1);
   ASSERT (errno == EBADF);
   errno = 0;
-  ASSERT (fcntl (10000000, F_SETFL, 0) == -1);
+  ASSERT (fcntl (bad_fd, F_SETFL, 0) == -1);
   ASSERT (errno == EBADF);
 #endif
 
@@ -385,7 +384,7 @@ main (void)
   ASSERT (fcntl (fd + 1, F_GETOWN) == -1);
   ASSERT (errno == EBADF);
   errno = 0;
-  ASSERT (fcntl (10000000, F_GETOWN) == -1);
+  ASSERT (fcntl (bad_fd, F_GETOWN) == -1);
   ASSERT (errno == EBADF);
 #endif
 
@@ -398,7 +397,7 @@ main (void)
   ASSERT (fcntl (fd + 1, F_SETOWN, 0) == -1);
   ASSERT (errno == EBADF);
   errno = 0;
-  ASSERT (fcntl (10000000, F_SETOWN, 0) == -1);
+  ASSERT (fcntl (bad_fd, F_SETOWN, 0) == -1);
   ASSERT (errno == EBADF);
 #endif
 
diff --git a/gnulib-tests/test-fdatasync.c b/gnulib-tests/test-fdatasync.c
index 697701a2..5d5a6b9a 100644
--- a/gnulib-tests/test-fdatasync.c
+++ b/gnulib-tests/test-fdatasync.c
@@ -1,5 +1,5 @@
 /* Test of fdatasync() function.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-fdopen.c b/gnulib-tests/test-fdopen.c
index 671c5e3d..743511ec 100644
--- a/gnulib-tests/test-fdopen.c
+++ b/gnulib-tests/test-fdopen.c
@@ -1,5 +1,5 @@
 /* Test opening a stream with a file descriptor.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
@@ -29,28 +29,21 @@ SIGNATURE_CHECK (fdopen, FILE *, (int, const char *));
 int
 main (void)
 {
-  /* Test behaviour for invalid file descriptors.  */
-  {
-    FILE *fp;
-
-    errno = 0;
-    fp = fdopen (-1, "r");
-    if (fp == NULL)
-      ASSERT (errno == EBADF);
-    else
-      fclose (fp);
-  }
-  {
-    FILE *fp;
-
-    close (99);
-    errno = 0;
-    fp = fdopen (99, "r");
-    if (fp == NULL)
-      ASSERT (errno == EBADF);
-    else
-      fclose (fp);
-  }
+  /* Test behavior on failure.  POSIX makes it hard to check for
+     failure, since the behavior is not well-defined on invalid file
+     descriptors, so try fdopen 1000 times and if that's not enough to
+     fail due to EMFILE, so be it.  */
+
+  int i;
+  for (i = 0; i < 1000; i++)
+    {
+      errno = 0;
+      if (! fdopen (STDOUT_FILENO, "w"))
+        {
+          ASSERT (errno != 0);
+          break;
+        }
+    }
 
   return 0;
 }
diff --git a/gnulib-tests/test-fdopendir.c b/gnulib-tests/test-fdopendir.c
index a9e2a931..d780b621 100644
--- a/gnulib-tests/test-fdopendir.c
+++ b/gnulib-tests/test-fdopendir.c
@@ -1,5 +1,5 @@
 /* Test opening a directory stream from a file descriptor.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-fdutimensat.c b/gnulib-tests/test-fdutimensat.c
index a50954d4..81ce3f5d 100644
--- a/gnulib-tests/test-fdutimensat.c
+++ b/gnulib-tests/test-fdutimensat.c
@@ -1,5 +1,5 @@
 /* Tests of fdutimensat.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-fflush.c b/gnulib-tests/test-fflush.c
index 1c61140b..6af23635 100644
--- a/gnulib-tests/test-fflush.c
+++ b/gnulib-tests/test-fflush.c
@@ -1,5 +1,5 @@
 /* Test of POSIX compatible fflush() function.
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-fflush2.c b/gnulib-tests/test-fflush2.c
index 90684b20..d73309d4 100644
--- a/gnulib-tests/test-fflush2.c
+++ b/gnulib-tests/test-fflush2.c
@@ -1,5 +1,5 @@
 /* Test of POSIX compatible fflush() function.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-fgetc.c b/gnulib-tests/test-fgetc.c
index b4a617aa..2534d4bf 100644
--- a/gnulib-tests/test-fgetc.c
+++ b/gnulib-tests/test-fgetc.c
@@ -1,5 +1,5 @@
 /* Test of fgetc() function.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-file-has-acl.c b/gnulib-tests/test-file-has-acl.c
index a9bfd50c..f0de2ceb 100644
--- a/gnulib-tests/test-file-has-acl.c
+++ b/gnulib-tests/test-file-has-acl.c
@@ -1,5 +1,5 @@
 /* Test for presence of ACL.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
@@ -49,8 +49,11 @@ main (int argc, char *argv[])
 #if HAVE_DECL_ALARM
   /* Declare failure if test takes too long, by using default abort
      caused by SIGALRM.  */
-  signal (SIGALRM, SIG_DFL);
-  alarm (5);
+  {
+    int alarm_value = 5;
+    signal (SIGALRM, SIG_DFL);
+    alarm (alarm_value);
+  }
 #endif
 
 #if USE_ACL
diff --git a/gnulib-tests/test-filenamecat.c b/gnulib-tests/test-filenamecat.c
index 2d29cd43..1485c0b2 100644
--- a/gnulib-tests/test-filenamecat.c
+++ b/gnulib-tests/test-filenamecat.c
@@ -1,6 +1,6 @@
 /* Test of concatenation of two arbitrary file names.
 
-   Copyright (C) 1996-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 1996-2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-filevercmp.c b/gnulib-tests/test-filevercmp.c
index 0b348765..c207cdc2 100644
--- a/gnulib-tests/test-filevercmp.c
+++ b/gnulib-tests/test-filevercmp.c
@@ -1,5 +1,5 @@
 /* Test of filevercmp() function.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-float.c b/gnulib-tests/test-float.c
index 7d3142fb..28a67bb8 100644
--- a/gnulib-tests/test-float.c
+++ b/gnulib-tests/test-float.c
@@ -1,5 +1,5 @@
 /* Test of <float.h> substitute.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-fnmatch.c b/gnulib-tests/test-fnmatch.c
index 71304a49..de94559c 100644
--- a/gnulib-tests/test-fnmatch.c
+++ b/gnulib-tests/test-fnmatch.c
@@ -1,5 +1,5 @@
 /* Test of fnmatch string matching function.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-fopen-safer.c b/gnulib-tests/test-fopen-safer.c
index 4174ed08..36f865a6 100644
--- a/gnulib-tests/test-fopen-safer.c
+++ b/gnulib-tests/test-fopen-safer.c
@@ -1,5 +1,5 @@
 /* Test of opening a file stream.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-fopen.c b/gnulib-tests/test-fopen.c
index 6488e85e..e1cb1231 100644
--- a/gnulib-tests/test-fopen.c
+++ b/gnulib-tests/test-fopen.c
@@ -1,5 +1,5 @@
 /* Test of opening a file stream.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-fopen.h b/gnulib-tests/test-fopen.h
index e1e7e17c..f87bb2ea 100644
--- a/gnulib-tests/test-fopen.h
+++ b/gnulib-tests/test-fopen.h
@@ -1,5 +1,5 @@
 /* Test of opening a file stream.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-fpending.c b/gnulib-tests/test-fpending.c
index ca835d2f..fc16be47 100644
--- a/gnulib-tests/test-fpending.c
+++ b/gnulib-tests/test-fpending.c
@@ -1,6 +1,6 @@
 /* Ensure that __fpending works.
 
-   Copyright (C) 2004, 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-fprintf-posix.h b/gnulib-tests/test-fprintf-posix.h
index a5b72c78..d5d0e724 100644
--- a/gnulib-tests/test-fprintf-posix.h
+++ b/gnulib-tests/test-fprintf-posix.h
@@ -1,5 +1,5 @@
 /* Test of POSIX compatible vsprintf() and sprintf() functions.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-fpurge.c b/gnulib-tests/test-fpurge.c
index da8ddf09..3f5d15b9 100644
--- a/gnulib-tests/test-fpurge.c
+++ b/gnulib-tests/test-fpurge.c
@@ -1,5 +1,5 @@
 /* Test of fpurge() function.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-fputc.c b/gnulib-tests/test-fputc.c
index e05f641e..befb5825 100644
--- a/gnulib-tests/test-fputc.c
+++ b/gnulib-tests/test-fputc.c
@@ -1,5 +1,5 @@
 /* Test of fputc() function.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-fread.c b/gnulib-tests/test-fread.c
index a807e0a8..72b93a9b 100644
--- a/gnulib-tests/test-fread.c
+++ b/gnulib-tests/test-fread.c
@@ -1,5 +1,5 @@
 /* Test of fread() function.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-freadahead.c b/gnulib-tests/test-freadahead.c
index 121990db..f50c54e4 100644
--- a/gnulib-tests/test-freadahead.c
+++ b/gnulib-tests/test-freadahead.c
@@ -1,5 +1,5 @@
 /* Test of freadahead() function.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-freading.c b/gnulib-tests/test-freading.c
index ee1556cc..7ca26ed6 100644
--- a/gnulib-tests/test-freading.c
+++ b/gnulib-tests/test-freading.c
@@ -1,5 +1,5 @@
 /* Test of freading() function.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-freadptr.c b/gnulib-tests/test-freadptr.c
index 8d496bce..e639d289 100644
--- a/gnulib-tests/test-freadptr.c
+++ b/gnulib-tests/test-freadptr.c
@@ -1,5 +1,5 @@
 /* Test of freadptr() function.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-freadptr2.c b/gnulib-tests/test-freadptr2.c
index 0b0e2384..2868248b 100644
--- a/gnulib-tests/test-freadptr2.c
+++ b/gnulib-tests/test-freadptr2.c
@@ -1,5 +1,5 @@
 /* Test of freadptr() function.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-freadseek.c b/gnulib-tests/test-freadseek.c
index 92fd32ca..3903f577 100644
--- a/gnulib-tests/test-freadseek.c
+++ b/gnulib-tests/test-freadseek.c
@@ -1,5 +1,5 @@
 /* Test of freadseek() function.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-freopen-safer.c b/gnulib-tests/test-freopen-safer.c
index 5d658f78..941dd559 100644
--- a/gnulib-tests/test-freopen-safer.c
+++ b/gnulib-tests/test-freopen-safer.c
@@ -1,5 +1,5 @@
 /* Test of reopening a stream.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-freopen.c b/gnulib-tests/test-freopen.c
index 4b54d8d5..a98530c9 100644
--- a/gnulib-tests/test-freopen.c
+++ b/gnulib-tests/test-freopen.c
@@ -1,5 +1,5 @@
 /* Test of opening a file stream.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-frexp.c b/gnulib-tests/test-frexp.c
index 6e3e0009..f7a10f5b 100644
--- a/gnulib-tests/test-frexp.c
+++ b/gnulib-tests/test-frexp.c
@@ -1,5 +1,5 @@
 /* Test of splitting a double into fraction and mantissa.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-frexp.h b/gnulib-tests/test-frexp.h
index e50be148..1cdc6de2 100644
--- a/gnulib-tests/test-frexp.h
+++ b/gnulib-tests/test-frexp.h
@@ -1,5 +1,5 @@
 /* Test of splitting a double into fraction and mantissa.
-   Copyright (C) 2012-2013 Free Software Foundation, Inc.
+   Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-frexpl.c b/gnulib-tests/test-frexpl.c
index 5a5eae52..b897e669 100644
--- a/gnulib-tests/test-frexpl.c
+++ b/gnulib-tests/test-frexpl.c
@@ -1,5 +1,5 @@
 /* Test of splitting a 'long double' into fraction and mantissa.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-fseek.c b/gnulib-tests/test-fseek.c
index 1b47a8f7..81ebb1cc 100644
--- a/gnulib-tests/test-fseek.c
+++ b/gnulib-tests/test-fseek.c
@@ -1,5 +1,5 @@
 /* Test of fseek() function.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-fseeko.c b/gnulib-tests/test-fseeko.c
index cadbc65f..ae9ccef5 100644
--- a/gnulib-tests/test-fseeko.c
+++ b/gnulib-tests/test-fseeko.c
@@ -1,5 +1,5 @@
 /* Test of fseeko() function.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-fseeko3.c b/gnulib-tests/test-fseeko3.c
index bd0b13a8..e92c9a12 100644
--- a/gnulib-tests/test-fseeko3.c
+++ b/gnulib-tests/test-fseeko3.c
@@ -1,5 +1,5 @@
 /* Test of fseeko() function.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-fseeko4.c b/gnulib-tests/test-fseeko4.c
index 8d6d58a4..6559ad96 100644
--- a/gnulib-tests/test-fseeko4.c
+++ b/gnulib-tests/test-fseeko4.c
@@ -1,5 +1,5 @@
 /* Test of fseeko() function.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-fseterr.c b/gnulib-tests/test-fseterr.c
index 7390b466..7ea9fcb9 100644
--- a/gnulib-tests/test-fseterr.c
+++ b/gnulib-tests/test-fseterr.c
@@ -1,5 +1,5 @@
 /* Test setting the error indicator of a stream.
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-fstat.c b/gnulib-tests/test-fstat.c
index 8ce15277..9b793c96 100644
--- a/gnulib-tests/test-fstat.c
+++ b/gnulib-tests/test-fstat.c
@@ -1,5 +1,5 @@
 /* Tests of fstat() function.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-fstatat.c b/gnulib-tests/test-fstatat.c
index 9fdbe2e6..2b1acb7d 100644
--- a/gnulib-tests/test-fstatat.c
+++ b/gnulib-tests/test-fstatat.c
@@ -1,5 +1,5 @@
 /* Tests of fstatat.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-fsync.c b/gnulib-tests/test-fsync.c
index d21d3615..44f92bbe 100644
--- a/gnulib-tests/test-fsync.c
+++ b/gnulib-tests/test-fsync.c
@@ -1,5 +1,5 @@
 /* Test of fsync() function.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-ftell.c b/gnulib-tests/test-ftell.c
index d30c4920..2b7120d8 100644
--- a/gnulib-tests/test-ftell.c
+++ b/gnulib-tests/test-ftell.c
@@ -1,5 +1,5 @@
 /* Test of ftell() function.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-ftell3.c b/gnulib-tests/test-ftell3.c
index 17968e35..918c9e44 100644
--- a/gnulib-tests/test-ftell3.c
+++ b/gnulib-tests/test-ftell3.c
@@ -1,5 +1,5 @@
 /* Test of ftell() function.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-ftello.c b/gnulib-tests/test-ftello.c
index e5a2b25a..6f3597bf 100644
--- a/gnulib-tests/test-ftello.c
+++ b/gnulib-tests/test-ftello.c
@@ -1,5 +1,5 @@
 /* Test of ftello() function.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-ftello3.c b/gnulib-tests/test-ftello3.c
index a7714300..6918432b 100644
--- a/gnulib-tests/test-ftello3.c
+++ b/gnulib-tests/test-ftello3.c
@@ -1,5 +1,5 @@
 /* Test of ftello() function.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-ftello4.c b/gnulib-tests/test-ftello4.c
index b8cd679a..ef9e74b2 100644
--- a/gnulib-tests/test-ftello4.c
+++ b/gnulib-tests/test-ftello4.c
@@ -1,5 +1,5 @@
 /* Test of ftello() function.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-ftruncate.c b/gnulib-tests/test-ftruncate.c
index 8b795a87..ae15411f 100644
--- a/gnulib-tests/test-ftruncate.c
+++ b/gnulib-tests/test-ftruncate.c
@@ -1,5 +1,5 @@
 /* Test truncating a file.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-futimens.c b/gnulib-tests/test-futimens.c
index adaaa083..0ae781a7 100644
--- a/gnulib-tests/test-futimens.c
+++ b/gnulib-tests/test-futimens.c
@@ -1,5 +1,5 @@
 /* Tests of futimens.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-futimens.h b/gnulib-tests/test-futimens.h
index 96eca517..ffb0e552 100644
--- a/gnulib-tests/test-futimens.h
+++ b/gnulib-tests/test-futimens.h
@@ -1,5 +1,5 @@
 /* Test of file timestamp modification functions.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-fwrite.c b/gnulib-tests/test-fwrite.c
index ef72338d..e51b2ab0 100644
--- a/gnulib-tests/test-fwrite.c
+++ b/gnulib-tests/test-fwrite.c
@@ -1,5 +1,5 @@
 /* Test of fwrite() function.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-getaddrinfo.c b/gnulib-tests/test-getaddrinfo.c
index 1b9892f4..acf9cd66 100644
--- a/gnulib-tests/test-getaddrinfo.c
+++ b/gnulib-tests/test-getaddrinfo.c
@@ -1,6 +1,6 @@
 /* Test the getaddrinfo module.
 
-   Copyright (C) 2006-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
    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
@@ -114,6 +114,8 @@ simple (char const *host, char const *service)
 
   for (ai = ai0; ai; ai = ai->ai_next)
     {
+      void *ai_addr = ai->ai_addr;
+      struct sockaddr_in *sock_addr = ai_addr;
       dbgprintf ("\tflags %x\n", ai->ai_flags);
       dbgprintf ("\tfamily %x\n", ai->ai_family);
       dbgprintf ("\tsocktype %x\n", ai->ai_socktype);
@@ -121,8 +123,7 @@ simple (char const *host, char const *service)
       dbgprintf ("\taddrlen %ld: ", (unsigned long) ai->ai_addrlen);
       dbgprintf ("\tFound %s\n",
                  inet_ntop (ai->ai_family,
-                            &((struct sockaddr_in *)
-                              ai->ai_addr)->sin_addr,
+                            &sock_addr->sin_addr,
                             buf, sizeof (buf) - 1));
       if (ai->ai_canonname)
         dbgprintf ("\tFound %s...\n", ai->ai_canonname);
diff --git a/gnulib-tests/test-getcwd-lgpl.c b/gnulib-tests/test-getcwd-lgpl.c
index e3e7b7a7..371c8df6 100644
--- a/gnulib-tests/test-getcwd-lgpl.c
+++ b/gnulib-tests/test-getcwd-lgpl.c
@@ -1,5 +1,5 @@
 /* Test of getcwd() function.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-getcwd.c b/gnulib-tests/test-getcwd.c
index 810b4766..2ddcd206 100644
--- a/gnulib-tests/test-getcwd.c
+++ b/gnulib-tests/test-getcwd.c
@@ -1,5 +1,5 @@
 /* Test of getcwd() function.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-getdelim.c b/gnulib-tests/test-getdelim.c
index 6e959186..76aba827 100644
--- a/gnulib-tests/test-getdelim.c
+++ b/gnulib-tests/test-getdelim.c
@@ -1,5 +1,5 @@
 /* Test of getdelim() function.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-getdtablesize.c b/gnulib-tests/test-getdtablesize.c
index 7046481b..86a0b4f0 100644
--- a/gnulib-tests/test-getdtablesize.c
+++ b/gnulib-tests/test-getdtablesize.c
@@ -1,5 +1,5 @@
 /* Test of getdtablesize() function.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
@@ -29,6 +29,8 @@ int
 main (int argc, char *argv[])
 {
   ASSERT (getdtablesize () >= 3);
+  ASSERT (dup2 (0, getdtablesize() - 1) == getdtablesize () - 1);
+  ASSERT (dup2 (0, getdtablesize()) == -1);
 
   return 0;
 }
diff --git a/gnulib-tests/test-getgroups.c b/gnulib-tests/test-getgroups.c
index f197cd90..0608b608 100644
--- a/gnulib-tests/test-getgroups.c
+++ b/gnulib-tests/test-getgroups.c
@@ -1,5 +1,5 @@
 /* Tests of getgroups.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-gethostname.c b/gnulib-tests/test-gethostname.c
index b4b3bf08..a6f3fdad 100644
--- a/gnulib-tests/test-gethostname.c
+++ b/gnulib-tests/test-gethostname.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2013 Free Software Foundation, Inc.
+ * Copyright (C) 2008-2014 Free Software Foundation, Inc.
  * Written by Simon Josefsson.
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-tests/test-getline.c b/gnulib-tests/test-getline.c
index 134e320a..4dbc485e 100644
--- a/gnulib-tests/test-getline.c
+++ b/gnulib-tests/test-getline.c
@@ -1,5 +1,5 @@
 /* Test of getline() function.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-getloadavg.c b/gnulib-tests/test-getloadavg.c
index c27eb2d7..37661c26 100644
--- a/gnulib-tests/test-getloadavg.c
+++ b/gnulib-tests/test-getloadavg.c
@@ -1,5 +1,5 @@
 /* Test of getting load average.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-getlogin.c b/gnulib-tests/test-getlogin.c
index 54e48e9d..e18469e8 100644
--- a/gnulib-tests/test-getlogin.c
+++ b/gnulib-tests/test-getlogin.c
@@ -1,5 +1,5 @@
 /* Test of getting user name.
-   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
    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
@@ -27,6 +27,11 @@ SIGNATURE_CHECK (getlogin, char *, (void));
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
+#include <pwd.h>
+
+#include <sys/stat.h>
+#include <sys/types.h>
 
 #include "macros.h"
 
@@ -62,11 +67,30 @@ main (void)
 #if !((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__)
   /* Unix platform */
   {
-    const char *name = getenv ("LOGNAME");
-    if (name == NULL || name[0] == '\0')
-      name = getenv ("USER");
-    if (name != NULL && name[0] != '\0')
-      ASSERT (strcmp (buf, name) == 0);
+# if HAVE_TTYNAME
+    const char *tty;
+    struct stat stat_buf;
+    struct passwd *pwd;
+
+    tty = ttyname (STDIN_FILENO);
+    if (tty == NULL)
+      {
+         fprintf (stderr, "Skipping test: stdin is not a tty.\n");
+         return 77;
+      }
+
+    ASSERT (stat (tty, &stat_buf) == 0);
+
+    pwd = getpwuid (stat_buf.st_uid);
+    if (! pwd)
+      {
+         fprintf (stderr, "Skipping test: no name found for uid %d\n",
+                  stat_buf.st_uid);
+         return 77;
+      }
+
+    ASSERT (strcmp (pwd->pw_name, buf) == 0);
+# endif
   }
 #endif
 #if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
diff --git a/gnulib-tests/test-getndelim2.c b/gnulib-tests/test-getndelim2.c
index 8baf1ae5..4b46efc9 100644
--- a/gnulib-tests/test-getndelim2.c
+++ b/gnulib-tests/test-getndelim2.c
@@ -1,5 +1,5 @@
 /* Test of getndelim2() function.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-getopt.c b/gnulib-tests/test-getopt.c
index 7caf0273..152efeab 100644
--- a/gnulib-tests/test-getopt.c
+++ b/gnulib-tests/test-getopt.c
@@ -1,5 +1,5 @@
 /* Test of command line argument processing.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-getopt.h b/gnulib-tests/test-getopt.h
index 450cf0d3..c982d570 100644
--- a/gnulib-tests/test-getopt.h
+++ b/gnulib-tests/test-getopt.h
@@ -1,5 +1,5 @@
 /* Test of command line argument processing.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-getopt_long.h b/gnulib-tests/test-getopt_long.h
index 345a796a..07ea4a28 100644
--- a/gnulib-tests/test-getopt_long.h
+++ b/gnulib-tests/test-getopt_long.h
@@ -1,5 +1,5 @@
 /* Test of command line argument processing.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-gettimeofday.c b/gnulib-tests/test-gettimeofday.c
index 2c608769..5abb872a 100644
--- a/gnulib-tests/test-gettimeofday.c
+++ b/gnulib-tests/test-gettimeofday.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2007, 2009-2013 Free Software Foundation, Inc.
+ * Copyright (C) 2005, 2007, 2009-2014 Free Software Foundation, Inc.
  * Written by Jim Meyering.
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-tests/test-hash.c b/gnulib-tests/test-hash.c
index 57c094cc..dc80924d 100644
--- a/gnulib-tests/test-hash.c
+++ b/gnulib-tests/test-hash.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2013 Free Software Foundation, Inc.
+ * Copyright (C) 2009-2014 Free Software Foundation, Inc.
  * Written by Jim Meyering
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-tests/test-i-ring.c b/gnulib-tests/test-i-ring.c
index a971e550..fe64991a 100644
--- a/gnulib-tests/test-i-ring.c
+++ b/gnulib-tests/test-i-ring.c
@@ -1,5 +1,5 @@
 /* Test the simple ring buffer.
-   Copyright (C) 2006-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-iconv-h.c b/gnulib-tests/test-iconv-h.c
index 7132b330..e72e3739 100644
--- a/gnulib-tests/test-iconv-h.c
+++ b/gnulib-tests/test-iconv-h.c
@@ -1,5 +1,5 @@
 /* Test of <iconv.h> substitute.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-iconv.c b/gnulib-tests/test-iconv.c
index a39ca588..3c1b1933 100644
--- a/gnulib-tests/test-iconv.c
+++ b/gnulib-tests/test-iconv.c
@@ -1,5 +1,5 @@
 /* Test of character set conversion.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-ignore-value.c b/gnulib-tests/test-ignore-value.c
index cb4cf145..3533d7ca 100644
--- a/gnulib-tests/test-ignore-value.c
+++ b/gnulib-tests/test-ignore-value.c
@@ -1,6 +1,6 @@
 /* Test the "ignore-value" module.
 
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-inet_ntop.c b/gnulib-tests/test-inet_ntop.c
index 1a916e5e..eca86e72 100644
--- a/gnulib-tests/test-inet_ntop.c
+++ b/gnulib-tests/test-inet_ntop.c
@@ -1,5 +1,5 @@
 /* Test of inet_ntop function.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-inet_pton.c b/gnulib-tests/test-inet_pton.c
index e8e1fb26..e85da225 100644
--- a/gnulib-tests/test-inet_pton.c
+++ b/gnulib-tests/test-inet_pton.c
@@ -1,5 +1,5 @@
 /* Test of inet_pton function.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-init.sh b/gnulib-tests/test-init.sh
index 6eb6b439..be447b33 100755
--- a/gnulib-tests/test-init.sh
+++ b/gnulib-tests/test-init.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Unit tests for init.sh
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
 # This file is part of the GNUlib Library.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-tests/test-ino-map.c b/gnulib-tests/test-ino-map.c
index 7fea57fb..83020cb7 100644
--- a/gnulib-tests/test-ino-map.c
+++ b/gnulib-tests/test-ino-map.c
@@ -1,5 +1,5 @@
 /* Test the ino-map module.
-   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-intprops.c b/gnulib-tests/test-intprops.c
index 8b91a790..97553e76 100644
--- a/gnulib-tests/test-intprops.c
+++ b/gnulib-tests/test-intprops.c
@@ -1,5 +1,5 @@
 /* Test intprops.h.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-inttostr.c b/gnulib-tests/test-inttostr.c
index 8f21a1c3..ea5b2956 100644
--- a/gnulib-tests/test-inttostr.c
+++ b/gnulib-tests/test-inttostr.c
@@ -1,5 +1,5 @@
 /* Test inttostr functions, and incidentally, INT_BUFSIZE_BOUND
-   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-inttypes.c b/gnulib-tests/test-inttypes.c
index db1a97e4..35deeab5 100644
--- a/gnulib-tests/test-inttypes.c
+++ b/gnulib-tests/test-inttypes.c
@@ -1,5 +1,5 @@
 /* Test of <inttypes.h> substitute.
-   Copyright (C) 2006-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-ioctl.c b/gnulib-tests/test-ioctl.c
index 489bccc3..8f31b68c 100644
--- a/gnulib-tests/test-ioctl.c
+++ b/gnulib-tests/test-ioctl.c
@@ -1,5 +1,5 @@
 /* Test of ioctl() function.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-isatty.c b/gnulib-tests/test-isatty.c
index 8441ff8a..de7be60b 100644
--- a/gnulib-tests/test-isatty.c
+++ b/gnulib-tests/test-isatty.c
@@ -1,5 +1,5 @@
 /* Test isatty() function.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-isblank.c b/gnulib-tests/test-isblank.c
index 21c9a43a..3f4a0413 100644
--- a/gnulib-tests/test-isblank.c
+++ b/gnulib-tests/test-isblank.c
@@ -1,5 +1,5 @@
 /* Test of isblank() function.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-isnand-nolibm.c b/gnulib-tests/test-isnand-nolibm.c
index 2d57d079..d7b6405b 100644
--- a/gnulib-tests/test-isnand-nolibm.c
+++ b/gnulib-tests/test-isnand-nolibm.c
@@ -1,5 +1,5 @@
 /* Test of isnand() substitute.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-isnand.h b/gnulib-tests/test-isnand.h
index 7ea72e98..c6d216ef 100644
--- a/gnulib-tests/test-isnand.h
+++ b/gnulib-tests/test-isnand.h
@@ -1,5 +1,5 @@
 /* Test of isnand() substitute.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-isnanf-nolibm.c b/gnulib-tests/test-isnanf-nolibm.c
index 924dccb3..222bde75 100644
--- a/gnulib-tests/test-isnanf-nolibm.c
+++ b/gnulib-tests/test-isnanf-nolibm.c
@@ -1,5 +1,5 @@
 /* Test of isnanf() substitute.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-isnanf.h b/gnulib-tests/test-isnanf.h
index 60499b57..463ac7e4 100644
--- a/gnulib-tests/test-isnanf.h
+++ b/gnulib-tests/test-isnanf.h
@@ -1,5 +1,5 @@
 /* Test of isnanf() substitute.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-isnanl-nolibm.c b/gnulib-tests/test-isnanl-nolibm.c
index 8f44de2f..15a32c58 100644
--- a/gnulib-tests/test-isnanl-nolibm.c
+++ b/gnulib-tests/test-isnanl-nolibm.c
@@ -1,5 +1,5 @@
 /* Test of isnanl() substitute.
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-isnanl.h b/gnulib-tests/test-isnanl.h
index 06e6a7ce..015b0864 100644
--- a/gnulib-tests/test-isnanl.h
+++ b/gnulib-tests/test-isnanl.h
@@ -1,5 +1,5 @@
 /* Test of isnanl() substitute.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
@@ -51,6 +51,15 @@ main ()
   /* A bit pattern that is different from a Quiet NaN.  With a bit of luck,
      it's a Signalling NaN.  */
   {
+#if defined __powerpc__ && LDBL_MANT_DIG == 106
+    /* This is PowerPC "double double", a pair of two doubles.  Inf and Nan are
+       represented as the corresponding 64-bit IEEE values in the first double;
+       the second is ignored.  Manipulate only the first double.  */
+    #undef NWORDS
+    #define NWORDS \
+      ((sizeof (double) + sizeof (unsigned int) - 1) / sizeof (unsigned int))
+#endif
+
     memory_long_double m;
     m.value = NaNl ();
 # if LDBL_EXPBIT0_BIT > 0
diff --git a/gnulib-tests/test-iswblank.c b/gnulib-tests/test-iswblank.c
index 58054257..68ede5c7 100644
--- a/gnulib-tests/test-iswblank.c
+++ b/gnulib-tests/test-iswblank.c
@@ -1,5 +1,5 @@
 /* Test of iswblank() function.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-langinfo.c b/gnulib-tests/test-langinfo.c
index 44e931ec..f4aa5b8c 100644
--- a/gnulib-tests/test-langinfo.c
+++ b/gnulib-tests/test-langinfo.c
@@ -1,5 +1,5 @@
 /* Test of <langinfo.h> substitute.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-lchown.c b/gnulib-tests/test-lchown.c
index 416edeb3..13c2f4da 100644
--- a/gnulib-tests/test-lchown.c
+++ b/gnulib-tests/test-lchown.c
@@ -1,5 +1,5 @@
 /* Tests of lchown.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-lchown.h b/gnulib-tests/test-lchown.h
index d4e66e7a..329b6dee 100644
--- a/gnulib-tests/test-lchown.h
+++ b/gnulib-tests/test-lchown.h
@@ -1,5 +1,5 @@
 /* Tests of lchown.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -65,9 +65,9 @@ test_lchown (int (*func) (char const *, uid_t, gid_t), bool print)
   ASSERT (mkdir (BASE "dir", 0700) == 0);
   ASSERT (stat (BASE "dir", &st1) == 0);
 
-  /* Filter out mingw, which has no concept of groups.  */
+  /* Filter out mingw and file systems which have no concept of groups.  */
   result = func (BASE "dir", st1.st_uid, getegid ());
-  if (result == -1 && errno == ENOSYS)
+  if (result == -1 && (errno == ENOSYS || errno == EPERM))
     {
       ASSERT (rmdir (BASE "dir") == 0);
       if (print)
diff --git a/gnulib-tests/test-link.c b/gnulib-tests/test-link.c
index 934dddb4..42749eb7 100644
--- a/gnulib-tests/test-link.c
+++ b/gnulib-tests/test-link.c
@@ -1,5 +1,5 @@
 /* Test of link() function.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-link.h b/gnulib-tests/test-link.h
index d546d564..7540e619 100644
--- a/gnulib-tests/test-link.h
+++ b/gnulib-tests/test-link.h
@@ -1,5 +1,5 @@
 /* Test of link() function.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-linkat.c b/gnulib-tests/test-linkat.c
index 6d55f103..e17434e4 100644
--- a/gnulib-tests/test-linkat.c
+++ b/gnulib-tests/test-linkat.c
@@ -1,5 +1,5 @@
 /* Tests of linkat.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-listen.c b/gnulib-tests/test-listen.c
index 206923fa..f2e6c06a 100644
--- a/gnulib-tests/test-listen.c
+++ b/gnulib-tests/test-listen.c
@@ -1,5 +1,5 @@
 /* Test listen() function.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-locale.c b/gnulib-tests/test-locale.c
index 3fb7b851..cf4e6e81 100644
--- a/gnulib-tests/test-locale.c
+++ b/gnulib-tests/test-locale.c
@@ -1,5 +1,5 @@
 /* Test of <locale.h> substitute.
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-localeconv.c b/gnulib-tests/test-localeconv.c
index da3344f2..9cd22af8 100644
--- a/gnulib-tests/test-localeconv.c
+++ b/gnulib-tests/test-localeconv.c
@@ -1,5 +1,5 @@
 /* Test of localeconv() function.
-   Copyright (C) 2012-2013 Free Software Foundation, Inc.
+   Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-localename.c b/gnulib-tests/test-localename.c
index deb59b13..df6c1d66 100644
--- a/gnulib-tests/test-localename.c
+++ b/gnulib-tests/test-localename.c
@@ -1,5 +1,5 @@
 /* Test of gl_locale_name function and its variants.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-lock.c b/gnulib-tests/test-lock.c
index 57392dbb..fd2ed266 100644
--- a/gnulib-tests/test-lock.c
+++ b/gnulib-tests/test-lock.c
@@ -1,5 +1,5 @@
 /* Test of locking in multithreaded situations.
-   Copyright (C) 2005, 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-lseek.c b/gnulib-tests/test-lseek.c
index 67d33413..fc37ec2d 100644
--- a/gnulib-tests/test-lseek.c
+++ b/gnulib-tests/test-lseek.c
@@ -1,5 +1,5 @@
 /* Test of lseek() function.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-lstat.c b/gnulib-tests/test-lstat.c
index d520193f..eab2ad4d 100644
--- a/gnulib-tests/test-lstat.c
+++ b/gnulib-tests/test-lstat.c
@@ -1,5 +1,5 @@
 /* Test of lstat() function.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-lstat.h b/gnulib-tests/test-lstat.h
index b8f1767a..45ca3bfa 100644
--- a/gnulib-tests/test-lstat.h
+++ b/gnulib-tests/test-lstat.h
@@ -1,5 +1,5 @@
 /* Test of lstat() function.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-lutimens.h b/gnulib-tests/test-lutimens.h
index 9e597b6b..89734975 100644
--- a/gnulib-tests/test-lutimens.h
+++ b/gnulib-tests/test-lutimens.h
@@ -1,5 +1,5 @@
 /* Test of file timestamp modification functions.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-malloc-gnu.c b/gnulib-tests/test-malloc-gnu.c
index ca0eafa4..773dee51 100644
--- a/gnulib-tests/test-malloc-gnu.c
+++ b/gnulib-tests/test-malloc-gnu.c
@@ -1,5 +1,5 @@
 /* Test of malloc function.
-   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-malloca.c b/gnulib-tests/test-malloca.c
index 7d5e62e8..6f94d0d0 100644
--- a/gnulib-tests/test-malloca.c
+++ b/gnulib-tests/test-malloca.c
@@ -1,5 +1,5 @@
 /* Test of safe automatic memory allocation.
-   Copyright (C) 2005, 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-math.c b/gnulib-tests/test-math.c
index f7d944cb..f3975eed 100644
--- a/gnulib-tests/test-math.c
+++ b/gnulib-tests/test-math.c
@@ -1,5 +1,5 @@
 /* Test of <math.h> substitute.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-mbrtowc-w32.c b/gnulib-tests/test-mbrtowc-w32.c
index 2125bdf5..06f07aa2 100644
--- a/gnulib-tests/test-mbrtowc-w32.c
+++ b/gnulib-tests/test-mbrtowc-w32.c
@@ -1,5 +1,5 @@
 /* Test of conversion of multibyte character to wide character.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-mbrtowc.c b/gnulib-tests/test-mbrtowc.c
index 4d2d5cb1..e8cdea07 100644
--- a/gnulib-tests/test-mbrtowc.c
+++ b/gnulib-tests/test-mbrtowc.c
@@ -1,5 +1,5 @@
 /* Test of conversion of multibyte character to wide character.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
@@ -46,10 +46,7 @@ main (int argc, char *argv[])
     memset (&state, '\0', sizeof (mbstate_t));
     wc = (wchar_t) 0xBADFACE;
     ret = mbrtowc (&wc, "x", 0, &state);
-    /* gnulib's implementation returns (size_t)(-2).
-       The AIX 5.1 implementation returns (size_t)(-1).
-       glibc's implementation returns 0.  */
-    ASSERT (ret == (size_t)(-2) || ret == (size_t)(-1) || ret == 0);
+    ASSERT (ret == (size_t)(-2));
     ASSERT (mbsinit (&state));
   }
 
diff --git a/gnulib-tests/test-mbsalign.c b/gnulib-tests/test-mbsalign.c
index d3e92daa..80d34596 100644
--- a/gnulib-tests/test-mbsalign.c
+++ b/gnulib-tests/test-mbsalign.c
@@ -1,5 +1,5 @@
 /* Test that mbsalign works as advertised.
-   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-mbscasecmp.c b/gnulib-tests/test-mbscasecmp.c
index d2d65d95..278265be 100644
--- a/gnulib-tests/test-mbscasecmp.c
+++ b/gnulib-tests/test-mbscasecmp.c
@@ -1,5 +1,5 @@
 /* Test of case-insensitive string comparison function.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-mbsinit.c b/gnulib-tests/test-mbsinit.c
index 931f059a..56548db5 100644
--- a/gnulib-tests/test-mbsinit.c
+++ b/gnulib-tests/test-mbsinit.c
@@ -1,5 +1,5 @@
 /* Test of test for initial conversion state.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-mbsrtowcs.c b/gnulib-tests/test-mbsrtowcs.c
index d48a30bc..079fa4c1 100644
--- a/gnulib-tests/test-mbsrtowcs.c
+++ b/gnulib-tests/test-mbsrtowcs.c
@@ -1,5 +1,5 @@
 /* Test of conversion of string to wide string.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-mbsstr1.c b/gnulib-tests/test-mbsstr1.c
index 61d00327..1e6f7e01 100644
--- a/gnulib-tests/test-mbsstr1.c
+++ b/gnulib-tests/test-mbsstr1.c
@@ -1,5 +1,5 @@
 /* Test of searching in a string.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-mbsstr2.c b/gnulib-tests/test-mbsstr2.c
index caccb422..2565128c 100644
--- a/gnulib-tests/test-mbsstr2.c
+++ b/gnulib-tests/test-mbsstr2.c
@@ -1,5 +1,5 @@
 /* Test of searching in a string.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-mbsstr3.c b/gnulib-tests/test-mbsstr3.c
index f5cfdde0..e4d9a6d0 100644
--- a/gnulib-tests/test-mbsstr3.c
+++ b/gnulib-tests/test-mbsstr3.c
@@ -1,5 +1,5 @@
 /* Test of searching in a string.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-md5.c b/gnulib-tests/test-md5.c
index 970af0cf..b86cca85 100644
--- a/gnulib-tests/test-md5.c
+++ b/gnulib-tests/test-md5.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2009-2013 Free Software Foundation, Inc.
+ * Copyright (C) 2005, 2009-2014 Free Software Foundation, Inc.
  * Written by Simon Josefsson
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-tests/test-memcasecmp.c b/gnulib-tests/test-memcasecmp.c
index 90ecb0b8..0aa204cc 100644
--- a/gnulib-tests/test-memcasecmp.c
+++ b/gnulib-tests/test-memcasecmp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2013 Free Software Foundation, Inc.
+ * Copyright (C) 2008-2014 Free Software Foundation, Inc.
  * Written by Simon Josefsson and Bruno Haible
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-tests/test-memchr.c b/gnulib-tests/test-memchr.c
index 0ca45895..223c8e77 100644
--- a/gnulib-tests/test-memchr.c
+++ b/gnulib-tests/test-memchr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2013 Free Software Foundation, Inc.
+ * Copyright (C) 2008-2014 Free Software Foundation, Inc.
  * Written by Eric Blake and Bruno Haible
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-tests/test-memchr2.c b/gnulib-tests/test-memchr2.c
index d0f8125c..dc131c30 100644
--- a/gnulib-tests/test-memchr2.c
+++ b/gnulib-tests/test-memchr2.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2013 Free Software Foundation, Inc.
+ * Copyright (C) 2008-2014 Free Software Foundation, Inc.
  * Written by Eric Blake
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-tests/test-memcoll.c b/gnulib-tests/test-memcoll.c
index 9ec2bf4e..31f3e1cc 100644
--- a/gnulib-tests/test-memcoll.c
+++ b/gnulib-tests/test-memcoll.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2013 Free Software Foundation, Inc.
+ * Copyright (C) 2008-2014 Free Software Foundation, Inc.
  * Written by Simon Josefsson and Bruno Haible
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-tests/test-memrchr.c b/gnulib-tests/test-memrchr.c
index 426228e0..16f0f805 100644
--- a/gnulib-tests/test-memrchr.c
+++ b/gnulib-tests/test-memrchr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2013 Free Software Foundation, Inc.
+ * Copyright (C) 2008-2014 Free Software Foundation, Inc.
  * Written by Eric Blake and Bruno Haible
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-tests/test-mkdir.c b/gnulib-tests/test-mkdir.c
index ea97aa0a..c7ffef19 100644
--- a/gnulib-tests/test-mkdir.c
+++ b/gnulib-tests/test-mkdir.c
@@ -1,5 +1,5 @@
 /* Tests of mkdir.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-mkdir.h b/gnulib-tests/test-mkdir.h
index 1c5ba7de..e6660b0f 100644
--- a/gnulib-tests/test-mkdir.h
+++ b/gnulib-tests/test-mkdir.h
@@ -1,5 +1,5 @@
 /* Test of mkdir() function.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-mkfifo.c b/gnulib-tests/test-mkfifo.c
index d101b95d..ee5565b4 100644
--- a/gnulib-tests/test-mkfifo.c
+++ b/gnulib-tests/test-mkfifo.c
@@ -1,5 +1,5 @@
 /* Tests of mkfifo.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-mkfifo.h b/gnulib-tests/test-mkfifo.h
index 5adbf08f..792160f0 100644
--- a/gnulib-tests/test-mkfifo.h
+++ b/gnulib-tests/test-mkfifo.h
@@ -1,5 +1,5 @@
 /* Tests of mkfifo and friends.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -43,7 +43,10 @@ test_mkfifo (int (*func) (char const *, mode_t), bool print)
   ASSERT (errno == ENOENT);
   errno = 0;
   ASSERT (func (".", 0600) == -1);
-  ASSERT (errno == EEXIST || errno == EINVAL);
+  /* Allow HP-UX 11.11's EISDIR, even though POSIX says it's wrong,
+     since it doesn't really hurt anything and we lack the energy to
+     fix it.  */
+  ASSERT (errno == EEXIST || errno == EINVAL || errno == EISDIR);
   errno = 0;
   ASSERT (func (BASE "fifo", 0600) == -1);
   ASSERT (errno == EEXIST);
diff --git a/gnulib-tests/test-mknod.c b/gnulib-tests/test-mknod.c
index 24ffae98..187a17c4 100644
--- a/gnulib-tests/test-mknod.c
+++ b/gnulib-tests/test-mknod.c
@@ -1,5 +1,5 @@
 /* Tests of mknod.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-nanosleep.c b/gnulib-tests/test-nanosleep.c
index 0b62ae6b..b775b85d 100644
--- a/gnulib-tests/test-nanosleep.c
+++ b/gnulib-tests/test-nanosleep.c
@@ -1,5 +1,5 @@
 /* Test of nanosleep() function.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-netdb.c b/gnulib-tests/test-netdb.c
index ce5bbd06..574abbe6 100644
--- a/gnulib-tests/test-netdb.c
+++ b/gnulib-tests/test-netdb.c
@@ -1,5 +1,5 @@
 /* Test of <netdb.h> substitute.
-   Copyright (C) 2007-2008, 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2008, 2010-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-netinet_in.c b/gnulib-tests/test-netinet_in.c
index 65fbf23c..5a9754a3 100644
--- a/gnulib-tests/test-netinet_in.c
+++ b/gnulib-tests/test-netinet_in.c
@@ -1,5 +1,5 @@
 /* Test of <netinet/in.h> substitute.
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-nl_langinfo.c b/gnulib-tests/test-nl_langinfo.c
index d31e54f9..06a4c9d0 100644
--- a/gnulib-tests/test-nl_langinfo.c
+++ b/gnulib-tests/test-nl_langinfo.c
@@ -1,5 +1,5 @@
 /* Test of nl_langinfo replacement.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-open.c b/gnulib-tests/test-open.c
index f04144f5..985d9015 100644
--- a/gnulib-tests/test-open.c
+++ b/gnulib-tests/test-open.c
@@ -1,5 +1,5 @@
 /* Test of opening a file descriptor.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-open.h b/gnulib-tests/test-open.h
index babb2390..d7bd5afc 100644
--- a/gnulib-tests/test-open.h
+++ b/gnulib-tests/test-open.h
@@ -1,5 +1,5 @@
 /* Test of opening a file descriptor.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
@@ -16,13 +16,22 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
+/* Make test_open always inline if we're using Fortify, which defines
+   __always_inline to do that.  Do nothing otherwise.  This works
+   around a glibc bug whereby 'open' cannot be used as a function
+   pointer when _FORTIFY_SOURCE is positive.  */
+
+#ifndef __always_inline
+#define __always_inline
+#endif
+
 /* This file is designed to test both open(n,buf[,mode]) and
    openat(AT_FDCWD,n,buf[,mode]).  FUNC is the function to test.
    Assumes that BASE and ASSERT are already defined, and that
    appropriate headers are already included.  If PRINT, warn before
    skipping symlink tests with status 77.  */
 
-static int
+static __always_inline int
 test_open (int (*func) (char const *, int, ...), bool print)
 {
   int fd;
diff --git a/gnulib-tests/test-openat-safer.c b/gnulib-tests/test-openat-safer.c
index 86edcfd0..9544b8b1 100644
--- a/gnulib-tests/test-openat-safer.c
+++ b/gnulib-tests/test-openat-safer.c
@@ -1,5 +1,5 @@
 /* Test that openat_safer leave standard fds alone.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-openat.c b/gnulib-tests/test-openat.c
index 1ef07b5b..ed505079 100644
--- a/gnulib-tests/test-openat.c
+++ b/gnulib-tests/test-openat.c
@@ -1,5 +1,5 @@
 /* Test that openat works.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-parse-datetime.c b/gnulib-tests/test-parse-datetime.c
index 7eba9ad7..25385ca7 100644
--- a/gnulib-tests/test-parse-datetime.c
+++ b/gnulib-tests/test-parse-datetime.c
@@ -1,5 +1,5 @@
 /* Test of parse_datetime() function.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
@@ -419,5 +419,21 @@ main (int argc _GL_UNUSED, char **argv)
      starting with a high-bit-set byte would be treated like "0".  */
   ASSERT ( ! parse_datetime (&result, "\xb0", &now));
 
+  /* Exercise TZ="" parsing code.  */
+  /* These two would infloop or segfault before Feb 2014.  */
+  ASSERT ( ! parse_datetime (&result, "TZ=\"\"\"", &now));
+  ASSERT ( ! parse_datetime (&result, "TZ=\"\" \"", &now));
+  /* Exercise invalid patterns.  */
+  ASSERT ( ! parse_datetime (&result, "TZ=\"", &now));
+  ASSERT ( ! parse_datetime (&result, "TZ=\"\\\"", &now));
+  ASSERT ( ! parse_datetime (&result, "TZ=\"\\n", &now));
+  ASSERT ( ! parse_datetime (&result, "TZ=\"\\n\"", &now));
+  /* Exercise valid patterns.  */
+  ASSERT (   parse_datetime (&result, "TZ=\"\"", &now));
+  ASSERT (   parse_datetime (&result, "TZ=\"\" ", &now));
+  ASSERT (   parse_datetime (&result, " TZ=\"\"", &now));
+  ASSERT (   parse_datetime (&result, "TZ=\"\\\\\"", &now));
+  ASSERT (   parse_datetime (&result, "TZ=\"\\\"\"", &now));
+
   return 0;
 }
diff --git a/gnulib-tests/test-pathmax.c b/gnulib-tests/test-pathmax.c
index 81a03502..8bc7dbcc 100644
--- a/gnulib-tests/test-pathmax.c
+++ b/gnulib-tests/test-pathmax.c
@@ -1,5 +1,5 @@
 /* Test of "pathmax.h".
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-perror.c b/gnulib-tests/test-perror.c
index ec262995..c003faad 100644
--- a/gnulib-tests/test-perror.c
+++ b/gnulib-tests/test-perror.c
@@ -1,5 +1,5 @@
 /* Test of perror() function.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-perror2.c b/gnulib-tests/test-perror2.c
index 197870d4..7e981264 100644
--- a/gnulib-tests/test-perror2.c
+++ b/gnulib-tests/test-perror2.c
@@ -1,5 +1,5 @@
 /* Test of perror() function.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-pipe.c b/gnulib-tests/test-pipe.c
index 93b4866e..c951d1d0 100644
--- a/gnulib-tests/test-pipe.c
+++ b/gnulib-tests/test-pipe.c
@@ -1,5 +1,5 @@
 /* Test of pipe.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-pipe2.c b/gnulib-tests/test-pipe2.c
deleted file mode 100644
index fd164c6e..00000000
--- a/gnulib-tests/test-pipe2.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/* Test of pipe2.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
-
-   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 3, 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/>.  */
-
-#include <config.h>
-
-#include <unistd.h>
-
-#include "signature.h"
-SIGNATURE_CHECK (pipe2, int, (int[2], int));
-
-#include <fcntl.h>
-#include <stdbool.h>
-
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Get declarations of the native Windows API functions.  */
-# define WIN32_LEAN_AND_MEAN
-# include <windows.h>
-/* Get _get_osfhandle.  */
-# include "msvc-nothrow.h"
-#endif
-
-#include "binary-io.h"
-#include "macros.h"
-#if GNULIB_NONBLOCKING
-# include "nonblocking.h"
-#endif
-
-/* Return true if FD is open.  */
-static bool
-is_open (int fd)
-{
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-  /* On native Windows, the initial state of unassigned standard file
-     descriptors is that they are open but point to an
-     INVALID_HANDLE_VALUE, and there is no fcntl.  */
-  return (HANDLE) _get_osfhandle (fd) != INVALID_HANDLE_VALUE;
-#else
-# ifndef F_GETFL
-#  error Please port fcntl to your platform
-# endif
-  return 0 <= fcntl (fd, F_GETFL);
-#endif
-}
-
-/* Return true if FD is not inherited to child processes.  */
-static bool
-is_cloexec (int fd)
-{
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-  HANDLE h = (HANDLE) _get_osfhandle (fd);
-  DWORD flags;
-  ASSERT (GetHandleInformation (h, &flags));
-  return (flags & HANDLE_FLAG_INHERIT) == 0;
-#else
-  int flags;
-  ASSERT ((flags = fcntl (fd, F_GETFD)) >= 0);
-  return (flags & FD_CLOEXEC) != 0;
-#endif
-}
-
-#if ! GNULIB_NONBLOCKING
-static int
-get_nonblocking_flag (int fd)
-{
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-  return 0;
-# else
-#  ifndef F_GETFL
-#   error Please port fcntl to your platform
-#  endif
-  int flags;
-  ASSERT ((flags = fcntl (fd, F_GETFL)) >= 0);
-  return (flags & O_NONBLOCK) != 0;
-# endif
-}
-#endif
-
-int
-main ()
-{
-  int use_nonblocking;
-  int use_cloexec;
-
-  for (use_nonblocking = 0; use_nonblocking <= !!O_NONBLOCK; use_nonblocking++)
-    for (use_cloexec = 0; use_cloexec <= !!O_CLOEXEC; use_cloexec++)
-      {
-        int o_flags;
-        int fd[2];
-
-        o_flags = 0;
-        if (use_nonblocking)
-          o_flags |= O_NONBLOCK;
-        if (use_cloexec)
-          o_flags |= O_CLOEXEC;
-
-        fd[0] = -1;
-        fd[1] = -1;
-        ASSERT (pipe2 (fd, o_flags) >= 0);
-        ASSERT (fd[0] >= 0);
-        ASSERT (fd[1] >= 0);
-        ASSERT (fd[0] != fd[1]);
-        ASSERT (is_open (fd[0]));
-        ASSERT (is_open (fd[1]));
-        if (use_cloexec)
-          {
-            ASSERT (is_cloexec (fd[0]));
-            ASSERT (is_cloexec (fd[1]));
-          }
-        else
-          {
-            ASSERT (!is_cloexec (fd[0]));
-            ASSERT (!is_cloexec (fd[1]));
-          }
-        if (use_nonblocking)
-          {
-            ASSERT (get_nonblocking_flag (fd[0]) == 1);
-            ASSERT (get_nonblocking_flag (fd[1]) == 1);
-          }
-        else
-          {
-            ASSERT (get_nonblocking_flag (fd[0]) == 0);
-            ASSERT (get_nonblocking_flag (fd[1]) == 0);
-          }
-
-        ASSERT (close (fd[0]) == 0);
-        ASSERT (close (fd[1]) == 0);
-      }
-
-  return 0;
-}
diff --git a/gnulib-tests/test-posix_spawn1.c b/gnulib-tests/test-posix_spawn1.c
deleted file mode 100644
index b944e14f..00000000
--- a/gnulib-tests/test-posix_spawn1.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/* Test of posix_spawn() function.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
-
-   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 3 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/>.  */
-
-/* Written by Bruno Haible <bruno@clisp.org>, 2008.  */
-
-#include <config.h>
-
-#include <spawn.h>
-
-#include "signature.h"
-SIGNATURE_CHECK (posix_spawnp, int, (pid_t *, char const *,
-                                     posix_spawn_file_actions_t const *,
-                                     posix_spawnattr_t const *,
-                                     char *const[], char *const[]));
-SIGNATURE_CHECK (posix_spawnattr_init, int, (posix_spawnattr_t *));
-SIGNATURE_CHECK (posix_spawnattr_destroy, int, (posix_spawnattr_t *));
-SIGNATURE_CHECK (posix_spawnattr_setsigmask, int, (posix_spawnattr_t *,
-                                                   sigset_t const *));
-SIGNATURE_CHECK (posix_spawnattr_setflags, int, (posix_spawnattr_t *, short));
-SIGNATURE_CHECK (posix_spawn_file_actions_init, int,
-                 (posix_spawn_file_actions_t *));
-SIGNATURE_CHECK (posix_spawn_file_actions_destroy, int,
-                 (posix_spawn_file_actions_t *));
-SIGNATURE_CHECK (posix_spawn_file_actions_addclose, int,
-                 (posix_spawn_file_actions_t *, int));
-SIGNATURE_CHECK (posix_spawn_file_actions_addopen, int,
-                 (posix_spawn_file_actions_t *, int, char const *, int,
-                  mode_t));
-SIGNATURE_CHECK (posix_spawn_file_actions_adddup2, int,
-                 (posix_spawn_file_actions_t *, int, int));
-
-#include <errno.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-
-extern char **environ;
-
-#define CHILD_PROGRAM_FILENAME "test-posix_spawn1.sh"
-
-static int
-fd_safer (int fd)
-{
-  if (0 <= fd && fd <= 2)
-    {
-      int f = fd_safer (dup (fd));
-      int e = errno;
-      close (fd);
-      errno = e;
-      fd = f;
-    }
-
-  return fd;
-}
-
-int
-main ()
-{
-  char *argv[3] = { (char *) "/bin/sh", (char *) CHILD_PROGRAM_FILENAME, NULL };
-  int ifd[2];
-  sigset_t blocked_signals;
-  sigset_t fatal_signal_set;
-  posix_spawn_file_actions_t actions;
-  bool actions_allocated;
-  posix_spawnattr_t attrs;
-  bool attrs_allocated;
-  int err;
-  pid_t child;
-  int fd;
-  FILE *fp;
-  char line[80];
-  int status;
-  int exitstatus;
-
-  if (pipe (ifd) < 0 || (ifd[0] = fd_safer (ifd[0])) < 0)
-    {
-      perror ("cannot create pipe");
-      exit (1);
-    }
-  sigprocmask (SIG_SETMASK, NULL, &blocked_signals);
-  sigemptyset (&fatal_signal_set);
-  sigaddset (&fatal_signal_set, SIGINT);
-  sigaddset (&fatal_signal_set, SIGTERM);
-  sigaddset (&fatal_signal_set, SIGHUP);
-  sigaddset (&fatal_signal_set, SIGPIPE);
-  sigprocmask (SIG_BLOCK, &fatal_signal_set, NULL);
-  actions_allocated = false;
-  attrs_allocated = false;
-  if ((err = posix_spawn_file_actions_init (&actions)) != 0
-      || (actions_allocated = true,
-          (err = posix_spawn_file_actions_adddup2 (&actions, ifd[1], STDOUT_FILENO)) != 0
-          || (err = posix_spawn_file_actions_addclose (&actions, ifd[1])) != 0
-          || (err = posix_spawn_file_actions_addclose (&actions, ifd[0])) != 0
-          || (err = posix_spawn_file_actions_addopen (&actions, STDIN_FILENO, "/dev/null", O_RDONLY, 0)) != 0
-          || (err = posix_spawnattr_init (&attrs)) != 0
-          || (attrs_allocated = true,
-              (err = posix_spawnattr_setsigmask (&attrs, &blocked_signals)) != 0
-              || (err = posix_spawnattr_setflags (&attrs, POSIX_SPAWN_SETSIGMASK)) != 0)
-          || (err = posix_spawnp (&child, "/bin/sh", &actions, &attrs, argv, environ)) != 0))
-    {
-      if (actions_allocated)
-        posix_spawn_file_actions_destroy (&actions);
-      if (attrs_allocated)
-        posix_spawnattr_destroy (&attrs);
-      sigprocmask (SIG_UNBLOCK, &fatal_signal_set, NULL);
-      errno = err;
-      perror ("subprocess failed");
-      exit (1);
-    }
-  posix_spawn_file_actions_destroy (&actions);
-  posix_spawnattr_destroy (&attrs);
-  sigprocmask (SIG_UNBLOCK, &fatal_signal_set, NULL);
-  close (ifd[1]);
-  fd = ifd[0];
-  fp = fdopen (fd, "r");
-  if (fp == NULL)
-    {
-      fprintf (stderr, "fdopen() failed\n");
-      exit (1);
-    }
-  if (fread (line, 1, 80, fp) < 12)
-    {
-      fprintf (stderr, "could not read expected output\n");
-      exit (1);
-    }
-  if (memcmp (line, "Halle Potta", 11) != 0)
-    {
-      fprintf (stderr, "read output is not the expected output");
-      exit (1);
-    }
-  fclose (fp);
-  status = 0;
-  while (waitpid (child, &status, 0) != child)
-    ;
-  if (!WIFEXITED (status))
-    {
-      fprintf (stderr, "subprocess terminated with unexpected wait status %d\n", status);
-      exit (1);
-    }
-  exitstatus = WEXITSTATUS (status);
-  if (exitstatus != 0)
-    {
-      fprintf (stderr, "subprocess terminated with unexpected exit status %d\n", exitstatus);
-      exit (1);
-    }
-  return 0;
-}
diff --git a/gnulib-tests/test-posix_spawn1.in.sh b/gnulib-tests/test-posix_spawn1.in.sh
deleted file mode 100644
index b370856d..00000000
--- a/gnulib-tests/test-posix_spawn1.in.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-echo "Halle Potta"
diff --git a/gnulib-tests/test-posix_spawn2.c b/gnulib-tests/test-posix_spawn2.c
deleted file mode 100644
index ce61c1c0..00000000
--- a/gnulib-tests/test-posix_spawn2.c
+++ /dev/null
@@ -1,139 +0,0 @@
-/* Test of posix_spawn() function.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
-
-   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 3 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/>.  */
-
-/* Written by Bruno Haible <bruno@clisp.org>, 2008.  */
-
-#include <config.h>
-
-#include <spawn.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-
-extern char **environ;
-
-#define CHILD_PROGRAM_FILENAME "test-posix_spawn2.sh"
-
-static int
-fd_safer (int fd)
-{
-  if (0 <= fd && fd <= 2)
-    {
-      int f = fd_safer (dup (fd));
-      int e = errno;
-      close (fd);
-      errno = e;
-      fd = f;
-    }
-
-  return fd;
-}
-
-int
-main ()
-{
-  char *argv[3] = { (char *) "/bin/sh", (char *) CHILD_PROGRAM_FILENAME, NULL };
-  int ofd[2];
-  sigset_t blocked_signals;
-  sigset_t fatal_signal_set;
-  posix_spawn_file_actions_t actions;
-  bool actions_allocated;
-  posix_spawnattr_t attrs;
-  bool attrs_allocated;
-  int err;
-  pid_t child;
-  int fd;
-  FILE *fp;
-  int written;
-  int status;
-  int exitstatus;
-
-  if (pipe (ofd) < 0 || (ofd[1] = fd_safer (ofd[1])) < 0)
-    {
-      perror ("cannot create pipe");
-      exit (1);
-    }
-  sigprocmask (SIG_SETMASK, NULL, &blocked_signals);
-  sigemptyset (&fatal_signal_set);
-  sigaddset (&fatal_signal_set, SIGINT);
-  sigaddset (&fatal_signal_set, SIGTERM);
-  sigaddset (&fatal_signal_set, SIGHUP);
-  sigaddset (&fatal_signal_set, SIGPIPE);
-  sigprocmask (SIG_BLOCK, &fatal_signal_set, NULL);
-  actions_allocated = false;
-  attrs_allocated = false;
-  if ((err = posix_spawn_file_actions_init (&actions)) != 0
-      || (actions_allocated = true,
-          (err = posix_spawn_file_actions_adddup2 (&actions, ofd[0], STDIN_FILENO)) != 0
-          || (err = posix_spawn_file_actions_addclose (&actions, ofd[0])) != 0
-          || (err = posix_spawn_file_actions_addclose (&actions, ofd[1])) != 0
-          || (err = posix_spawnattr_init (&attrs)) != 0
-          || (attrs_allocated = true,
-              (err = posix_spawnattr_setsigmask (&attrs, &blocked_signals)) != 0
-              || (err = posix_spawnattr_setflags (&attrs, POSIX_SPAWN_SETSIGMASK)) != 0)
-          || (err = posix_spawnp (&child, "/bin/sh", &actions, &attrs, argv, environ)) != 0))
-    {
-      if (actions_allocated)
-        posix_spawn_file_actions_destroy (&actions);
-      if (attrs_allocated)
-        posix_spawnattr_destroy (&attrs);
-      sigprocmask (SIG_UNBLOCK, &fatal_signal_set, NULL);
-      errno = err;
-      perror ("subprocess failed");
-      exit (1);
-    }
-  posix_spawn_file_actions_destroy (&actions);
-  posix_spawnattr_destroy (&attrs);
-  sigprocmask (SIG_UNBLOCK, &fatal_signal_set, NULL);
-  close (ofd[0]);
-  fd = ofd[1];
-  fp = fdopen (fd, "w");
-  if (fp == NULL)
-    {
-      fprintf (stderr, "fdopen() failed\n");
-      exit (1);
-    }
-  written = fwrite ("Halle Potta\n", 1, 12, fp);
-  if (written < 12)
-    {
-      fprintf (stderr, "could not write input\n");
-      exit (1);
-    }
-  fclose (fp);
-  status = 0;
-  while (waitpid (child, &status, 0) != child)
-    ;
-  if (!WIFEXITED (status))
-    {
-      fprintf (stderr, "subprocess terminated with unexpected wait status %d\n", status);
-      exit (1);
-    }
-  exitstatus = WEXITSTATUS (status);
-  if (exitstatus != 0)
-    {
-      fprintf (stderr, "subprocess terminated with unexpected exit status %d\n", exitstatus);
-      exit (1);
-    }
-  return 0;
-}
diff --git a/gnulib-tests/test-posix_spawn2.in.sh b/gnulib-tests/test-posix_spawn2.in.sh
deleted file mode 100644
index 29a9b28f..00000000
--- a/gnulib-tests/test-posix_spawn2.in.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-read line
-test "$line" = "Halle Potta"
diff --git a/gnulib-tests/test-posix_spawn_file_actions_addclose.c b/gnulib-tests/test-posix_spawn_file_actions_addclose.c
deleted file mode 100644
index ae149246..00000000
--- a/gnulib-tests/test-posix_spawn_file_actions_addclose.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Test posix_spawn_file_actions_addclose() function.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
-
-   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 3 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/>.  */
-
-#include <config.h>
-
-#include <spawn.h>
-
-#include "signature.h"
-SIGNATURE_CHECK (posix_spawn_file_actions_addclose, int,
-                 (posix_spawn_file_actions_t *, int));
-
-#include <errno.h>
-
-#include "macros.h"
-
-int
-main (void)
-{
-  posix_spawn_file_actions_t actions;
-
-  ASSERT (posix_spawn_file_actions_init (&actions) == 0);
-
-  /* Test behaviour for invalid file descriptors.  */
-  {
-    errno = 0;
-    ASSERT (posix_spawn_file_actions_addclose (&actions, -1) == EBADF);
-  }
-  {
-    errno = 0;
-    ASSERT (posix_spawn_file_actions_addclose (&actions, 10000000) == EBADF);
-  }
-
-  return 0;
-}
diff --git a/gnulib-tests/test-posix_spawn_file_actions_adddup2.c b/gnulib-tests/test-posix_spawn_file_actions_adddup2.c
deleted file mode 100644
index f6173043..00000000
--- a/gnulib-tests/test-posix_spawn_file_actions_adddup2.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Test posix_spawn_file_actions_adddup2() function.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
-
-   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 3 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/>.  */
-
-#include <config.h>
-
-#include <spawn.h>
-
-#include "signature.h"
-SIGNATURE_CHECK (posix_spawn_file_actions_adddup2, int,
-                 (posix_spawn_file_actions_t *, int, int));
-
-#include <errno.h>
-
-#include "macros.h"
-
-int
-main (void)
-{
-  posix_spawn_file_actions_t actions;
-
-  ASSERT (posix_spawn_file_actions_init (&actions) == 0);
-
-  /* Test behaviour for invalid file descriptors.  */
-  {
-    errno = 0;
-    ASSERT (posix_spawn_file_actions_adddup2 (&actions, -1, 2) == EBADF);
-  }
-  {
-    errno = 0;
-    ASSERT (posix_spawn_file_actions_adddup2 (&actions, 10000000, 2) == EBADF);
-  }
-  {
-    errno = 0;
-    ASSERT (posix_spawn_file_actions_adddup2 (&actions, 2, -1) == EBADF);
-  }
-  {
-    errno = 0;
-    ASSERT (posix_spawn_file_actions_adddup2 (&actions, 2, 10000000) == EBADF);
-  }
-
-  return 0;
-}
diff --git a/gnulib-tests/test-posix_spawn_file_actions_addopen.c b/gnulib-tests/test-posix_spawn_file_actions_addopen.c
deleted file mode 100644
index d2920f13..00000000
--- a/gnulib-tests/test-posix_spawn_file_actions_addopen.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Test posix_spawn_file_actions_addopen() function.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
-
-   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 3 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/>.  */
-
-#include <config.h>
-
-#include <spawn.h>
-
-#include "signature.h"
-SIGNATURE_CHECK (posix_spawn_file_actions_addopen, int,
-                 (posix_spawn_file_actions_t *, int,
-                  const char *, int, mode_t));
-
-#include <errno.h>
-#include <fcntl.h>
-
-#include "macros.h"
-
-int
-main (void)
-{
-  posix_spawn_file_actions_t actions;
-
-  ASSERT (posix_spawn_file_actions_init (&actions) == 0);
-
-  /* Test behaviour for invalid file descriptors.  */
-  {
-    errno = 0;
-    ASSERT (posix_spawn_file_actions_addopen (&actions, -1,
-                                              "foo", 0, O_RDONLY)
-            == EBADF);
-  }
-  {
-    errno = 0;
-    ASSERT (posix_spawn_file_actions_addopen (&actions, 10000000,
-                                              "foo", 0, O_RDONLY)
-            == EBADF);
-  }
-
-  return 0;
-}
diff --git a/gnulib-tests/test-posixtm.c b/gnulib-tests/test-posixtm.c
index 8b1eae7f..0f9c8bc6 100644
--- a/gnulib-tests/test-posixtm.c
+++ b/gnulib-tests/test-posixtm.c
@@ -1,5 +1,5 @@
 /* Test that posixtime works as required.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-printf-frexp.c b/gnulib-tests/test-printf-frexp.c
index 5ecf1985..57d57b73 100644
--- a/gnulib-tests/test-printf-frexp.c
+++ b/gnulib-tests/test-printf-frexp.c
@@ -1,5 +1,5 @@
 /* Test of splitting a double into fraction and mantissa.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-printf-frexpl.c b/gnulib-tests/test-printf-frexpl.c
index 0aa3d18b..95801dae 100644
--- a/gnulib-tests/test-printf-frexpl.c
+++ b/gnulib-tests/test-printf-frexpl.c
@@ -1,5 +1,5 @@
 /* Test of splitting a 'long double' into fraction and mantissa.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-printf-posix.h b/gnulib-tests/test-printf-posix.h
index eca40051..b6446368 100644
--- a/gnulib-tests/test-printf-posix.h
+++ b/gnulib-tests/test-printf-posix.h
@@ -1,5 +1,5 @@
 /* Test of POSIX compatible vsprintf() and sprintf() functions.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-priv-set.c b/gnulib-tests/test-priv-set.c
index b474878e..bcbc84ab 100644
--- a/gnulib-tests/test-priv-set.c
+++ b/gnulib-tests/test-priv-set.c
@@ -1,5 +1,5 @@
 /* Test the priv-set module.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-quotearg-simple.c b/gnulib-tests/test-quotearg-simple.c
index e7aa8fb6..08aadc1f 100644
--- a/gnulib-tests/test-quotearg-simple.c
+++ b/gnulib-tests/test-quotearg-simple.c
@@ -1,5 +1,5 @@
 /* Test of quotearg family of functions.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
@@ -29,6 +29,7 @@
 #include "localcharset.h"
 #include "progname.h"
 #include "macros.h"
+#include "zerosize-ptr.h"
 
 #include "test-quotearg.h"
 
@@ -297,6 +298,40 @@ main (int argc _GL_UNUSED, char *argv[])
                        ascii_only);
     }
 
+  {
+    /* Trigger the bug whereby quotearg_buffer would read beyond the NUL
+       that defines the end of the string being quoted.  Use an input
+       string whose NUL is the last byte before an unreadable page.  */
+    char *z = zerosize_ptr ();
+
+    if (z)
+      {
+        size_t q_len = 1024;
+        char *q = malloc (q_len + 1);
+        char buf[10];
+        memset (q, 'Q', q_len);
+        q[q_len] = 0;
+
+        /* Z points to the boundary between a readable/writable page
+           and one that is neither readable nor writable.  Position
+           our string so its NUL is at the end of the writable one.  */
+        char const *str = "____";
+        size_t s_len = strlen (str);
+        z -= s_len + 1;
+        memcpy (z, str, s_len + 1);
+
+        set_custom_quoting (NULL, q, q);
+        /* Whether this actually triggers a SEGV depends on the
+           implementation of memcmp: whether it compares only byte-at-
+           a-time, and from left to right (no SEGV) or some other way.  */
+        size_t n = quotearg_buffer (buf, sizeof buf, z, SIZE_MAX, NULL);
+        ASSERT (n == s_len + 2 * q_len);
+        ASSERT (memcmp (buf, q, sizeof buf) == 0);
+        free (q);
+      }
+  }
+
   quotearg_free ();
+
   return 0;
 }
diff --git a/gnulib-tests/test-quotearg.h b/gnulib-tests/test-quotearg.h
index 02e0c133..5fa7233c 100644
--- a/gnulib-tests/test-quotearg.h
+++ b/gnulib-tests/test-quotearg.h
@@ -1,5 +1,5 @@
 /* Test of quotearg family of functions.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-raise.c b/gnulib-tests/test-raise.c
index 3c58b6b1..bfe4352e 100644
--- a/gnulib-tests/test-raise.c
+++ b/gnulib-tests/test-raise.c
@@ -1,5 +1,5 @@
 /* Test raising a signal.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-rand-isaac.c b/gnulib-tests/test-rand-isaac.c
index a2788bc2..beead718 100644
--- a/gnulib-tests/test-rand-isaac.c
+++ b/gnulib-tests/test-rand-isaac.c
@@ -1,6 +1,6 @@
 /* Test the ISAAC or ISAAC64 pseudorandom number generator.
 
-   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-rawmemchr.c b/gnulib-tests/test-rawmemchr.c
deleted file mode 100644
index e31104a9..00000000
--- a/gnulib-tests/test-rawmemchr.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (C) 2008-2013 Free Software Foundation, Inc.
- * Written by Eric Blake and Bruno Haible
- *
- * 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 3 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/>.  */
-
-#include <config.h>
-
-#include <string.h>
-
-#include "signature.h"
-SIGNATURE_CHECK (rawmemchr, void *, (void const *, int));
-
-#include <stdlib.h>
-
-#include "zerosize-ptr.h"
-#include "macros.h"
-
-/* Calculating void * + int is not portable, so this wrapper converts
-   to char * to make the tests easier to write.  */
-#define RAWMEMCHR (char *) rawmemchr
-
-int
-main (void)
-{
-  size_t n = 0x100000;
-  char *input = malloc (n + 1);
-  ASSERT (input);
-
-  input[0] = 'a';
-  input[1] = 'b';
-  memset (input + 2, 'c', 1024);
-  memset (input + 1026, 'd', n - 1028);
-  input[n - 2] = 'e';
-  input[n - 1] = 'a';
-  input[n] = '\0';
-
-  /* Basic behavior tests.  */
-  ASSERT (RAWMEMCHR (input, 'a') == input);
-  ASSERT (RAWMEMCHR (input, 'b') == input + 1);
-  ASSERT (RAWMEMCHR (input, 'c') == input + 2);
-  ASSERT (RAWMEMCHR (input, 'd') == input + 1026);
-
-  ASSERT (RAWMEMCHR (input + 1, 'a') == input + n - 1);
-  ASSERT (RAWMEMCHR (input + 1, 'e') == input + n - 2);
-  ASSERT (RAWMEMCHR (input + 1, 0x789abc00 | 'e') == input + n - 2);
-
-  ASSERT (RAWMEMCHR (input, '\0') == input + n);
-
-  /* Alignment tests.  */
-  {
-    int i, j;
-    for (i = 0; i < 32; i++)
-      {
-        for (j = 0; j < 256; j++)
-          input[i + j] = j;
-        for (j = 0; j < 256; j++)
-          {
-            ASSERT (RAWMEMCHR (input + i, j) == input + i + j);
-          }
-      }
-  }
-
-  /* Ensure that no unaligned oversized reads occur.  */
-  {
-    char *page_boundary = (char *) zerosize_ptr ();
-    size_t i;
-
-    if (!page_boundary)
-      page_boundary = input + 4096;
-    memset (page_boundary - 512, '1', 511);
-    page_boundary[-1] = '2';
-    for (i = 1; i <= 512; i++)
-      ASSERT (RAWMEMCHR (page_boundary - i, (i * 0x01010100) | '2')
-              == page_boundary - 1);
-  }
-
-  free (input);
-
-  return 0;
-}
diff --git a/gnulib-tests/test-read-file.c b/gnulib-tests/test-read-file.c
index 63cd89eb..fff96ecd 100644
--- a/gnulib-tests/test-read-file.c
+++ b/gnulib-tests/test-read-file.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2007, 2010-2013 Free Software Foundation, Inc.
+ * Copyright (C) 2006-2007, 2010-2014 Free Software Foundation, Inc.
  * Written by Simon Josefsson
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-tests/test-read.c b/gnulib-tests/test-read.c
index 74b5b4df..541e4b9d 100644
--- a/gnulib-tests/test-read.c
+++ b/gnulib-tests/test-read.c
@@ -1,5 +1,5 @@
 /* Test the read() function.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-readlink.c b/gnulib-tests/test-readlink.c
index e59ebe40..e6adbe5d 100644
--- a/gnulib-tests/test-readlink.c
+++ b/gnulib-tests/test-readlink.c
@@ -1,5 +1,5 @@
 /* Tests of readlink.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-readlink.h b/gnulib-tests/test-readlink.h
index d19f9b33..33039de4 100644
--- a/gnulib-tests/test-readlink.h
+++ b/gnulib-tests/test-readlink.h
@@ -1,5 +1,5 @@
 /* Tests of readlink.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-readlinkat.c b/gnulib-tests/test-readlinkat.c
index c2ce6ef7..c1d3753a 100644
--- a/gnulib-tests/test-readlinkat.c
+++ b/gnulib-tests/test-readlinkat.c
@@ -1,5 +1,5 @@
 /* Tests of readlinkat.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-readtokens.c b/gnulib-tests/test-readtokens.c
index 44193d59..e7068f75 100644
--- a/gnulib-tests/test-readtokens.c
+++ b/gnulib-tests/test-readtokens.c
@@ -1,5 +1,5 @@
 /* Test the readtokens module.
-   Copyright (C) 2012-2013 Free Software Foundation, Inc.
+   Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-realloc-gnu.c b/gnulib-tests/test-realloc-gnu.c
index b8597bec..1969ce25 100644
--- a/gnulib-tests/test-realloc-gnu.c
+++ b/gnulib-tests/test-realloc-gnu.c
@@ -1,5 +1,5 @@
 /* Test of realloc function.
-   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-regex.c b/gnulib-tests/test-regex.c
index 2488cee2..cac028b8 100644
--- a/gnulib-tests/test-regex.c
+++ b/gnulib-tests/test-regex.c
@@ -1,5 +1,5 @@
 /* Test regular expressions
-   Copyright 1996-2001, 2003-2013 Free Software Foundation, Inc.
+   Copyright 1996-2001, 2003-2014 Free Software Foundation, Inc.
 
    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
@@ -21,11 +21,13 @@
 #include <locale.h>
 #include <limits.h>
 #include <string.h>
-#if HAVE_ALARM
+#if HAVE_DECL_ALARM
 # include <unistd.h>
 # include <signal.h>
 #endif
 
+#include "localcharset.h"
+
 int
 main (void)
 {
@@ -36,7 +38,7 @@ main (void)
   const char *s;
   struct re_registers regs;
 
-#if HAVE_ALARM
+#if HAVE_DECL_ALARM
   /* Some builds of glibc go into an infinite loop on this test.  */
   int alarm_value = 2;
   signal (SIGALRM, SIG_DFL);
@@ -65,25 +67,41 @@ main (void)
           result |= 1;
       }
 
-      {
-        /* This test is from glibc bug 15078.
-           The test case is from Andreas Schwab in
-           <http://www.sourceware.org/ml/libc-alpha/2013-01/msg00967.html>.
-           */
-        static char const pat[] = "[^x]x";
-        static char const data[] =
-          "\xe1\x80\x80\xe1\x80\xbb\xe1\x80\xbd\xe1\x80\x94\xe1\x80"
-          "\xba\xe1\x80\xaf\xe1\x80\x95\xe1\x80\xbax";
-        re_set_syntax (0);
-        memset (&regex, 0, sizeof regex);
-        s = re_compile_pattern (pat, sizeof pat - 1, &regex);
-        if (s)
-          result |= 1;
-        else if (re_search (&regex, data, sizeof data - 1,
-                            0, sizeof data - 1, 0)
-                 != 21)
-          result |= 1;
-      }
+      /* Check whether it's really a UTF-8 locale.
+         On mingw, the setlocale call succeeds but returns
+         "English_United States.1252", with locale_charset() returning
+         "CP1252".  */
+      if (strcmp (locale_charset (), "UTF-8") == 0)
+        {
+          /* This test is from glibc bug 15078.
+             The test case is from Andreas Schwab in
+             <http://www.sourceware.org/ml/libc-alpha/2013-01/msg00967.html>.
+          */
+          static char const pat[] = "[^x]x";
+          static char const data[] =
+            /* <U1000><U103B><U103D><U1014><U103A><U102F><U1015><U103A> */
+            "\xe1\x80\x80"
+            "\xe1\x80\xbb"
+            "\xe1\x80\xbd"
+            "\xe1\x80\x94"
+            "\xe1\x80\xba"
+            "\xe1\x80\xaf"
+            "\xe1\x80\x95"
+            "\xe1\x80\xba"
+            "x";
+          re_set_syntax (0);
+          memset (&regex, 0, sizeof regex);
+          s = re_compile_pattern (pat, sizeof pat - 1, &regex);
+          if (s)
+            result |= 1;
+          else
+            {
+              i = re_search (&regex, data, sizeof data - 1,
+                             0, sizeof data - 1, 0);
+              if (i != 0 && i != 21)
+                result |= 1;
+            }
+        }
 
       if (! setlocale (LC_ALL, "C"))
         return 1;
diff --git a/gnulib-tests/test-remove.c b/gnulib-tests/test-remove.c
index 48641321..53c9be08 100644
--- a/gnulib-tests/test-remove.c
+++ b/gnulib-tests/test-remove.c
@@ -1,5 +1,5 @@
 /* Tests of remove.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-rename.c b/gnulib-tests/test-rename.c
index 132c788d..b2608299 100644
--- a/gnulib-tests/test-rename.c
+++ b/gnulib-tests/test-rename.c
@@ -1,5 +1,5 @@
 /* Test of rename() function.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-rename.h b/gnulib-tests/test-rename.h
index 7e024e0a..2bc610fc 100644
--- a/gnulib-tests/test-rename.h
+++ b/gnulib-tests/test-rename.h
@@ -1,5 +1,5 @@
 /* Test of rename() function.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-rmdir.c b/gnulib-tests/test-rmdir.c
index 8a24a688..4903a57d 100644
--- a/gnulib-tests/test-rmdir.c
+++ b/gnulib-tests/test-rmdir.c
@@ -1,5 +1,5 @@
 /* Tests of rmdir.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-rmdir.h b/gnulib-tests/test-rmdir.h
index f2987801..daaa4150 100644
--- a/gnulib-tests/test-rmdir.h
+++ b/gnulib-tests/test-rmdir.h
@@ -1,5 +1,5 @@
 /* Tests of rmdir.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-sameacls.c b/gnulib-tests/test-sameacls.c
index cb187fb7..70e15c2d 100644
--- a/gnulib-tests/test-sameacls.c
+++ b/gnulib-tests/test-sameacls.c
@@ -1,5 +1,5 @@
 /* Test whether two files have the same ACLs.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-sched.c b/gnulib-tests/test-sched.c
index 5a64120d..f4429096 100644
--- a/gnulib-tests/test-sched.c
+++ b/gnulib-tests/test-sched.c
@@ -1,5 +1,5 @@
 /* Test of <sched.h> substitute.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-select-fd.c b/gnulib-tests/test-select-fd.c
index fffc1268..ae9e83cc 100644
--- a/gnulib-tests/test-select-fd.c
+++ b/gnulib-tests/test-select-fd.c
@@ -1,5 +1,5 @@
 /* Test of select() substitute, reading or writing from a given file descriptor.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-select-stdin.c b/gnulib-tests/test-select-stdin.c
index 77c20ccd..8b242a21 100644
--- a/gnulib-tests/test-select-stdin.c
+++ b/gnulib-tests/test-select-stdin.c
@@ -1,5 +1,5 @@
 /* Test of select() substitute, reading from stdin.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-select.c b/gnulib-tests/test-select.c
index ccf95d54..ef7389a8 100644
--- a/gnulib-tests/test-select.c
+++ b/gnulib-tests/test-select.c
@@ -1,5 +1,5 @@
 /* Test of select() substitute.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-select.h b/gnulib-tests/test-select.h
index 75c8fb1a..adf1dd4e 100644
--- a/gnulib-tests/test-select.h
+++ b/gnulib-tests/test-select.h
@@ -1,5 +1,5 @@
 /* Test of select() substitute.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-set-mode-acl.c b/gnulib-tests/test-set-mode-acl.c
index 49a93b26..61f1975e 100644
--- a/gnulib-tests/test-set-mode-acl.c
+++ b/gnulib-tests/test-set-mode-acl.c
@@ -1,5 +1,5 @@
 /* Test of setting an ACL equivalent to a mode.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-setenv.c b/gnulib-tests/test-setenv.c
index 0a53ac46..548e4fba 100644
--- a/gnulib-tests/test-setenv.c
+++ b/gnulib-tests/test-setenv.c
@@ -1,5 +1,5 @@
 /* Tests of setenv.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-setlocale1.c b/gnulib-tests/test-setlocale1.c
index b20c037f..0434d7bb 100644
--- a/gnulib-tests/test-setlocale1.c
+++ b/gnulib-tests/test-setlocale1.c
@@ -1,5 +1,5 @@
 /* Test of setting the current locale.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-setlocale2.c b/gnulib-tests/test-setlocale2.c
index cad9e2fe..2f52fe0b 100644
--- a/gnulib-tests/test-setlocale2.c
+++ b/gnulib-tests/test-setlocale2.c
@@ -1,5 +1,5 @@
 /* Test of setting the current locale.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-setsockopt.c b/gnulib-tests/test-setsockopt.c
index 323b8e78..ebf50a50 100644
--- a/gnulib-tests/test-setsockopt.c
+++ b/gnulib-tests/test-setsockopt.c
@@ -1,5 +1,5 @@
 /* Test setsockopt() function.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-sha1.c b/gnulib-tests/test-sha1.c
index dd8b8d95..9a3e3cbe 100644
--- a/gnulib-tests/test-sha1.c
+++ b/gnulib-tests/test-sha1.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2008-2013 Free Software Foundation, Inc.
+ * Copyright (C) 2005, 2008-2014 Free Software Foundation, Inc.
  * Written by Simon Josefsson
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-tests/test-sigaction.c b/gnulib-tests/test-sigaction.c
index 2b5ba531..0fa1c262 100644
--- a/gnulib-tests/test-sigaction.c
+++ b/gnulib-tests/test-sigaction.c
@@ -1,5 +1,5 @@
 /* Test of sigaction() function.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-signal-h.c b/gnulib-tests/test-signal-h.c
index 93c0b716..3bc94821 100644
--- a/gnulib-tests/test-signal-h.c
+++ b/gnulib-tests/test-signal-h.c
@@ -1,5 +1,5 @@
 /* Test of <signal.h> substitute.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-signbit.c b/gnulib-tests/test-signbit.c
index e8ea097c..584bf4f9 100644
--- a/gnulib-tests/test-signbit.c
+++ b/gnulib-tests/test-signbit.c
@@ -1,5 +1,5 @@
 /* Test of signbit() substitute.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
@@ -151,6 +151,16 @@ test_signbitl ()
     #define NWORDS \
       ((sizeof (long double) + sizeof (unsigned int) - 1) / sizeof (unsigned int))
     typedef union { long double value; unsigned int word[NWORDS]; } memory_long_double;
+
+#if defined __powerpc__ && LDBL_MANT_DIG == 106
+    /* This is PowerPC "double double", a pair of two doubles.  Inf and Nan are
+       represented as the corresponding 64-bit IEEE values in the first double;
+       the second is ignored.  Manipulate only the first double.  */
+    #undef NWORDS
+    #define NWORDS \
+      ((sizeof (double) + sizeof (unsigned int) - 1) / sizeof (unsigned int))
+#endif
+
     memory_long_double m;
     m.value = zerol / zerol;
 # if LDBL_EXPBIT0_BIT > 0
diff --git a/gnulib-tests/test-sigprocmask.c b/gnulib-tests/test-sigprocmask.c
index 6aaf74da..c6c771ea 100644
--- a/gnulib-tests/test-sigprocmask.c
+++ b/gnulib-tests/test-sigprocmask.c
@@ -1,5 +1,5 @@
 /* Test of sigprocmask.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-sleep.c b/gnulib-tests/test-sleep.c
index d232cd0a..9b93fef3 100644
--- a/gnulib-tests/test-sleep.c
+++ b/gnulib-tests/test-sleep.c
@@ -1,5 +1,5 @@
 /* Test of sleep() function.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-snprintf.c b/gnulib-tests/test-snprintf.c
index 80573576..38d9935c 100644
--- a/gnulib-tests/test-snprintf.c
+++ b/gnulib-tests/test-snprintf.c
@@ -1,5 +1,5 @@
 /* Test of snprintf() function.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
@@ -52,7 +52,7 @@ main (int argc, char *argv[])
 #if !CHECK_SNPRINTF_POSIX
           if (size > 0)
 #endif
-            ASSERT (memcmp (buf + size, "DEADBEEF" + size, 8 - size) == 0);
+            ASSERT (memcmp (buf + size, &"DEADBEEF"[size], 8 - size) == 0);
         }
       else
         {
diff --git a/gnulib-tests/test-sockets.c b/gnulib-tests/test-sockets.c
index 4e26f068..35f1bf28 100644
--- a/gnulib-tests/test-sockets.c
+++ b/gnulib-tests/test-sockets.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2013 Free Software Foundation, Inc.
+ * Copyright (C) 2008-2014 Free Software Foundation, Inc.
  * Written by Simon Josefsson.
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-tests/test-spawn-pipe-child.c b/gnulib-tests/test-spawn-pipe-child.c
deleted file mode 100644
index 25314595..00000000
--- a/gnulib-tests/test-spawn-pipe-child.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/* Child program invoked by test-spawn-pipe-main.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
-
-   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 3, 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/>.  */
-
-#include <config.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Get declarations of the native Windows API functions.  */
-# define WIN32_LEAN_AND_MEAN
-# include <windows.h>
-#endif
-
-/* Depending on arguments, this test intentionally closes stderr or
-   starts life with stderr closed.  So, we arrange to have fd 10
-   (outside the range of interesting fd's during the test) set up to
-   duplicate the original stderr.  */
-
-#define BACKUP_STDERR_FILENO 10
-#define ASSERT_STREAM myerr
-#include "macros.h"
-
-static FILE *myerr;
-
-/* In this file, we use only system functions, no overrides from gnulib.  */
-#undef atoi
-#undef close
-#undef fcntl
-#undef fdopen
-#undef fflush
-#undef fprintf
-#undef read
-#undef write
-
-/* Return non-zero if FD is open.  */
-static int
-is_open (int fd)
-{
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-  /* On native Windows, the initial state of unassigned standard file
-     descriptors is that they are open but point to an
-     INVALID_HANDLE_VALUE, and there is no fcntl.  */
-  return (HANDLE) _get_osfhandle (fd) != INVALID_HANDLE_VALUE;
-#else
-# ifndef F_GETFL
-#  error Please port fcntl to your platform
-# endif
-  return 0 <= fcntl (fd, F_GETFL);
-#endif
-}
-
-int
-main (int argc, char *argv[])
-{
-  char buffer[2] = { 's', 't' };
-  int fd;
-
-  /* fd 2 might be closed, but fd BACKUP_STDERR_FILENO is the original
-     stderr.  */
-  myerr = fdopen (BACKUP_STDERR_FILENO, "w");
-  if (!myerr)
-    return 2;
-
-  ASSERT (argc == 2);
-
-  /* Read one byte from fd 0, and write its value plus one to fd 1.
-     fd 2 should be closed iff the argument is 1.  Check that no other file
-     descriptors leaked.  */
-
-  ASSERT (read (STDIN_FILENO, buffer, 2) == 1);
-
-  buffer[0]++;
-  ASSERT (write (STDOUT_FILENO, buffer, 1) == 1);
-
-  switch (atoi (argv[1]))
-    {
-    case 0:
-      /* Expect fd 2 is open.  */
-      ASSERT (is_open (STDERR_FILENO));
-      break;
-    case 1:
-      /* Expect fd 2 is closed.
-         But on HP-UX 11, fd 2 gets automatically re-opened to /dev/null if it
-         was closed. Future POSIX will allow this, see
-         <http://austingroupbugs.net/view.php?id=173>.  */
-#if !defined __hpux
-      ASSERT (! is_open (STDERR_FILENO));
-#endif
-      break;
-    default:
-      ASSERT (0);
-    }
-
-  for (fd = 3; fd < 7; fd++)
-    {
-      errno = 0;
-      ASSERT (close (fd) == -1);
-      ASSERT (errno == EBADF);
-    }
-
-  return 0;
-}
diff --git a/gnulib-tests/test-spawn-pipe-main.c b/gnulib-tests/test-spawn-pipe-main.c
deleted file mode 100644
index c07c3d29..00000000
--- a/gnulib-tests/test-spawn-pipe-main.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/* Test of create_pipe_bidi/wait_subprocess.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
-
-   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 3, 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/>.  */
-
-#include <config.h>
-
-#include "spawn-pipe.h"
-#include "wait-process.h"
-#include "progname.h"
-
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-/* Depending on arguments, this test intentionally closes stderr or
-   starts life with stderr closed.  So, we arrange to have fd 10
-   (outside the range of interesting fd's during the test) set up to
-   duplicate the original stderr.  */
-
-#define BACKUP_STDERR_FILENO 10
-#define ASSERT_STREAM myerr
-#include "macros.h"
-
-static FILE *myerr;
-
-/* Create a bi-directional pipe to a test child, and validate that the
-   child program returns the expected output.
-   PROG is the program to run in the child process.
-   STDERR_CLOSED is true if we have already closed fd 2.  */
-static void
-test_pipe (const char *prog, bool stderr_closed)
-{
-  int fd[2];
-  char *argv[3];
-  pid_t pid;
-  char buffer[2] = { 'a', 't' };
-
-  /* Set up child.  */
-  argv[0] = (char *) prog;
-  argv[1] = (char *) (stderr_closed ? "1" : "0");
-  argv[2] = NULL;
-  pid = create_pipe_bidi (prog, prog, argv, false, true, true, fd);
-  ASSERT (0 <= pid);
-  ASSERT (STDERR_FILENO < fd[0]);
-  ASSERT (STDERR_FILENO < fd[1]);
-
-  /* Push child's input.  */
-  ASSERT (write (fd[1], buffer, 1) == 1);
-  ASSERT (close (fd[1]) == 0);
-
-  /* Get child's output.  */
-  ASSERT (read (fd[0], buffer, 2) == 1);
-
-  /* Wait for child.  */
-  ASSERT (wait_subprocess (pid, prog, true, false, true, true, NULL) == 0);
-  ASSERT (close (fd[0]) == 0);
-
-  /* Check the result.  */
-  ASSERT (buffer[0] == 'b');
-  ASSERT (buffer[1] == 't');
-}
-
-int
-main (int argc, char *argv[])
-{
-  int test;
-  int fd;
-
-  set_program_name (argv[0]);
-
-  if (argc != 3)
-    {
-      fprintf (stderr, "%s: need 2 arguments\n", argv[0]);
-      return 2;
-    }
-  /* We might close fd 2 later, so save it in fd 10.  */
-  if (dup2 (STDERR_FILENO, BACKUP_STDERR_FILENO) != BACKUP_STDERR_FILENO
-      || (myerr = fdopen (BACKUP_STDERR_FILENO, "w")) == NULL)
-    return 2;
-
-  /* Selectively close various standard fds, to verify the child process is
-     not impacted by this.  */
-  test = atoi (argv[2]);
-  switch (test)
-    {
-    case 0:
-      break;
-    case 1:
-      close (0);
-      break;
-    case 2:
-      close (1);
-      break;
-    case 3:
-      close (0);
-      close (1);
-      break;
-    case 4:
-      close (2);
-      break;
-    case 5:
-      close (0);
-      close (2);
-      break;
-    case 6:
-      close (1);
-      close (2);
-      break;
-    case 7:
-      close (0);
-      close (1);
-      close (2);
-      break;
-    default:
-      ASSERT (false);
-    }
-
-  /* Plug any file descriptor leaks inherited from outside world before
-     starting, so that child has a clean slate (at least for the fds that we
-     might be manipulating).  */
-  for (fd = 3; fd < 7; fd++)
-    close (fd);
-
-  test_pipe (argv[1], test >= 4);
-
-  return 0;
-}
diff --git a/gnulib-tests/test-spawn-pipe.sh b/gnulib-tests/test-spawn-pipe.sh
deleted file mode 100755
index 676026c8..00000000
--- a/gnulib-tests/test-spawn-pipe.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-st=0
-for i in 0 1 2 3 4 5 6 7 ; do
-  ./test-spawn-pipe-main${EXEEXT} ./test-spawn-pipe-child${EXEEXT} $i \
-    || { echo test-spawn-pipe.sh: iteration $i failed >&2; st=1; }
-done
-exit $st
diff --git a/gnulib-tests/test-spawn.c b/gnulib-tests/test-spawn.c
deleted file mode 100644
index cfa9dc62..00000000
--- a/gnulib-tests/test-spawn.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Test of <spawn.h> substitute.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
-
-   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 3 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/>.  */
-
-/* Written by Eric Blake <ebb9@byu.net>, 2009.  */
-
-#include <config.h>
-
-#include <spawn.h>
-
-/* Check for existence of required types.  */
-struct check
-{
-  posix_spawnattr_t a;
-  posix_spawn_file_actions_t b;
-  mode_t c;
-  pid_t d;
-  sigset_t e;
-} s;
-
-/* struct sched_param is allowed to be an incomplete type without
-   <sched.h>, but must have a forward declaration to avoid a
-   compilation error in the following usage.  */
-extern void f (struct sched_param *g);
-#include <sched.h>
-extern void f (struct sched_param *g);
-
-int
-main (void)
-{
-  switch (0)
-    {
-    case POSIX_SPAWN_RESETIDS:
-    case POSIX_SPAWN_SETPGROUP:
-    case POSIX_SPAWN_SETSIGDEF:
-    case POSIX_SPAWN_SETSIGMASK:
-    case (POSIX_SPAWN_SETSCHEDPARAM != 0 ? POSIX_SPAWN_SETSCHEDPARAM : -1):
-    case (POSIX_SPAWN_SETSCHEDULER != 0 ? POSIX_SPAWN_SETSCHEDULER : -2):
-      ;
-    }
-  return s.c + s.d;
-}
diff --git a/gnulib-tests/test-stat-time.c b/gnulib-tests/test-stat-time.c
index 2b4f0f13..c39aa00e 100644
--- a/gnulib-tests/test-stat-time.c
+++ b/gnulib-tests/test-stat-time.c
@@ -1,5 +1,5 @@
 /* Test of <stat-time.h>.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
@@ -27,6 +27,9 @@
 
 #include "macros.h"
 
+#define BASE "test-stat-time.t"
+#include "nap.h"
+
 enum { NFILES = 4 };
 
 static int
@@ -79,48 +82,6 @@ do_stat (const char *filename, struct stat *p)
   ASSERT (stat (filename, p) == 0);
 }
 
-/* Sleep long enough to notice a timestamp difference on the file
-   system in the current directory.  */
-static void
-nap (void)
-{
-  static long delay;
-  if (!delay)
-    {
-      /* Initialize only once, by sleeping for 20 milliseconds (needed
-         since xfs has a quantization of about 10 milliseconds, even
-         though it has a granularity of 1 nanosecond, and since NTFS
-         has a default quantization of 15.25 milliseconds, even though
-         it has a granularity of 100 nanoseconds).  If the seconds
-         differ, repeat the test one more time (in case we crossed a
-         quantization boundary on a file system with 1 second
-         resolution).  If we can't observe a difference in only the
-         nanoseconds, then fall back to 1 second if the time is odd,
-         and 2 seconds (needed for FAT) if time is even.  */
-      struct stat st1;
-      struct stat st2;
-      ASSERT (stat ("t-stt-stamp1", &st1) == 0);
-      ASSERT (force_unlink ("t-stt-stamp1") == 0);
-      delay = 20000;
-      usleep (delay);
-      create_file ("t-stt-stamp1");
-      ASSERT (stat ("t-stt-stamp1", &st2) == 0);
-      if (st1.st_mtime != st2.st_mtime)
-        {
-          /* Seconds differ, give it one more shot.  */
-          st1 = st2;
-          ASSERT (force_unlink ("t-stt-stamp1") == 0);
-          usleep (delay);
-          create_file ("t-stt-stamp1");
-          ASSERT (stat ("t-stt-stamp1", &st2) == 0);
-        }
-      if (! (st1.st_mtime == st2.st_mtime
-             && get_stat_mtime_ns (&st1) < get_stat_mtime_ns (&st2)))
-        delay = (st1.st_mtime & 1) ? 1000000 : 2000000;
-    }
-  usleep (delay);
-}
-
 static void
 prepare_test (struct stat *statinfo, struct timespec *modtimes)
 {
diff --git a/gnulib-tests/test-stat.c b/gnulib-tests/test-stat.c
index b59dbf44..9ed462a3 100644
--- a/gnulib-tests/test-stat.c
+++ b/gnulib-tests/test-stat.c
@@ -1,5 +1,5 @@
 /* Tests of stat.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-stat.h b/gnulib-tests/test-stat.h
index 5409e058..6cfc958d 100644
--- a/gnulib-tests/test-stat.h
+++ b/gnulib-tests/test-stat.h
@@ -1,5 +1,5 @@
 /* Tests of stat.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-statat.c b/gnulib-tests/test-statat.c
index 4adb3ab7..e7b04be7 100644
--- a/gnulib-tests/test-statat.c
+++ b/gnulib-tests/test-statat.c
@@ -1,5 +1,5 @@
 /* Tests of statat and lstatat.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-stdalign.c b/gnulib-tests/test-stdalign.c
index 373bf984..81efd540 100644
--- a/gnulib-tests/test-stdalign.c
+++ b/gnulib-tests/test-stdalign.c
@@ -1,5 +1,5 @@
 /* Test of <stdalign.h>.
-   Copyright 2009-2013 Free Software Foundation, Inc.
+   Copyright 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-stdbool.c b/gnulib-tests/test-stdbool.c
index 3c13ca2c..efa83246 100644
--- a/gnulib-tests/test-stdbool.c
+++ b/gnulib-tests/test-stdbool.c
@@ -1,5 +1,5 @@
 /* Test of <stdbool.h> substitute.
-   Copyright (C) 2002-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002-2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-stddef.c b/gnulib-tests/test-stddef.c
index f42b4e05..d5d887eb 100644
--- a/gnulib-tests/test-stddef.c
+++ b/gnulib-tests/test-stddef.c
@@ -1,5 +1,5 @@
 /* Test of <stddef.h> substitute.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-stdint.c b/gnulib-tests/test-stdint.c
index 1c559b05..008b517d 100644
--- a/gnulib-tests/test-stdint.c
+++ b/gnulib-tests/test-stdint.c
@@ -1,5 +1,5 @@
 /* Test of <stdint.h> substitute.
-   Copyright (C) 2006-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-stdio.c b/gnulib-tests/test-stdio.c
index 89c65489..d3f0e6b1 100644
--- a/gnulib-tests/test-stdio.c
+++ b/gnulib-tests/test-stdio.c
@@ -1,5 +1,5 @@
 /* Test of <stdio.h> substitute.
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-stdlib.c b/gnulib-tests/test-stdlib.c
index 6d38156c..a2743e46 100644
--- a/gnulib-tests/test-stdlib.c
+++ b/gnulib-tests/test-stdlib.c
@@ -1,5 +1,5 @@
 /* Test of <stdlib.h> substitute.
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-strchrnul.c b/gnulib-tests/test-strchrnul.c
deleted file mode 100644
index ac3b3dd8..00000000
--- a/gnulib-tests/test-strchrnul.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2008-2013 Free Software Foundation, Inc.
- * Written by Eric Blake and Bruno Haible
- *
- * 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 3 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/>.  */
-
-#include <config.h>
-
-#include <string.h>
-
-#include "signature.h"
-SIGNATURE_CHECK (strchrnul, char *, (char const *, int));
-
-#include <stdlib.h>
-
-#include "macros.h"
-
-int
-main (void)
-{
-  size_t n = 0x100000;
-  char *input = malloc (n + 1);
-  ASSERT (input);
-
-  input[0] = 'a';
-  input[1] = 'b';
-  memset (input + 2, 'c', 1024);
-  memset (input + 1026, 'd', n - 1028);
-  input[n - 2] = 'e';
-  input[n - 1] = 'a';
-  input[n] = '\0';
-
-  /* Basic behavior tests.  */
-  ASSERT (strchrnul (input, 'a') == input);
-  ASSERT (strchrnul (input, 'b') == input + 1);
-  ASSERT (strchrnul (input, 'c') == input + 2);
-  ASSERT (strchrnul (input, 'd') == input + 1026);
-
-  ASSERT (strchrnul (input + 1, 'a') == input + n - 1);
-  ASSERT (strchrnul (input + 1, 'e') == input + n - 2);
-
-  ASSERT (strchrnul (input, 'f') == input + n);
-  ASSERT (strchrnul (input, '\0') == input + n);
-
-  /* Check that a very long haystack is handled quickly if the byte is
-     found near the beginning.  */
-  {
-    size_t repeat = 10000;
-    for (; repeat > 0; repeat--)
-      {
-        ASSERT (strchrnul (input, 'c') == input + 2);
-      }
-  }
-
-  /* Alignment tests.  */
-  {
-    int i, j;
-    for (i = 0; i < 32; i++)
-      {
-        for (j = 0; j < 256; j++)
-          input[i + j] = (j + 1) & 0xff;
-        for (j = 1; j < 256; j++)
-          {
-            ASSERT (strchrnul (input + i, j) == input + i + j - 1);
-            input[i + j - 1] = (j == 1 ? 2 : 1);
-            ASSERT (strchrnul (input + i, j) == input + i + 255);
-            input[i + j - 1] = j;
-          }
-      }
-  }
-
-  free (input);
-
-  return 0;
-}
diff --git a/gnulib-tests/test-strerror.c b/gnulib-tests/test-strerror.c
index 6d5db0f5..8e2ed7c2 100644
--- a/gnulib-tests/test-strerror.c
+++ b/gnulib-tests/test-strerror.c
@@ -1,5 +1,5 @@
 /* Test of strerror() function.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-strerror_r.c b/gnulib-tests/test-strerror_r.c
index ec43aef9..9e1f0bef 100644
--- a/gnulib-tests/test-strerror_r.c
+++ b/gnulib-tests/test-strerror_r.c
@@ -1,5 +1,5 @@
 /* Test of strerror_r() function.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-strftime.c b/gnulib-tests/test-strftime.c
index 28bdaa96..9a558d8f 100644
--- a/gnulib-tests/test-strftime.c
+++ b/gnulib-tests/test-strftime.c
@@ -1,5 +1,5 @@
 /* Test that posixtime works as required.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-striconv.c b/gnulib-tests/test-striconv.c
index c77dc6c3..fd29a091 100644
--- a/gnulib-tests/test-striconv.c
+++ b/gnulib-tests/test-striconv.c
@@ -1,5 +1,5 @@
 /* Test of character set conversion.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-string.c b/gnulib-tests/test-string.c
index 76922d16..d890c8b5 100644
--- a/gnulib-tests/test-string.c
+++ b/gnulib-tests/test-string.c
@@ -1,5 +1,5 @@
 /* Test of <string.h> substitute.
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-strncat.c b/gnulib-tests/test-strncat.c
index efa9c4f3..1262b989 100644
--- a/gnulib-tests/test-strncat.c
+++ b/gnulib-tests/test-strncat.c
@@ -1,5 +1,5 @@
 /* Test of strncat() function.
-   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-strnlen.c b/gnulib-tests/test-strnlen.c
index 33de9355..8a2089ec 100644
--- a/gnulib-tests/test-strnlen.c
+++ b/gnulib-tests/test-strnlen.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2013 Free Software Foundation, Inc.
+ * Copyright (C) 2010-2014 Free Software Foundation, Inc.
  * Written by Eric Blake
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-tests/test-strsignal.c b/gnulib-tests/test-strsignal.c
index 8d68228d..4194c3db 100644
--- a/gnulib-tests/test-strsignal.c
+++ b/gnulib-tests/test-strsignal.c
@@ -1,5 +1,5 @@
 /* Test of strsignal() function.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-strtod.c b/gnulib-tests/test-strtod.c
index f23bf6b8..07794b4d 100644
--- a/gnulib-tests/test-strtod.c
+++ b/gnulib-tests/test-strtod.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2013 Free Software Foundation, Inc.
+ * Copyright (C) 2008-2014 Free Software Foundation, Inc.
  * Written by Eric Blake
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-tests/test-strtoimax.c b/gnulib-tests/test-strtoimax.c
index 6a05352e..1ff5711d 100644
--- a/gnulib-tests/test-strtoimax.c
+++ b/gnulib-tests/test-strtoimax.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2013 Free Software Foundation, Inc.
+ * Copyright (C) 2011-2014 Free Software Foundation, Inc.
  *
  * 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
diff --git a/gnulib-tests/test-strtoll.c b/gnulib-tests/test-strtoll.c
index b4809201..a4043ce8 100644
--- a/gnulib-tests/test-strtoll.c
+++ b/gnulib-tests/test-strtoll.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2013 Free Software Foundation, Inc.
+ * Copyright (C) 2011-2014 Free Software Foundation, Inc.
  *
  * 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
diff --git a/gnulib-tests/test-strtoull.c b/gnulib-tests/test-strtoull.c
index e69be3d5..53729b13 100644
--- a/gnulib-tests/test-strtoull.c
+++ b/gnulib-tests/test-strtoull.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2013 Free Software Foundation, Inc.
+ * Copyright (C) 2011-2014 Free Software Foundation, Inc.
  *
  * 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
diff --git a/gnulib-tests/test-strtoumax.c b/gnulib-tests/test-strtoumax.c
index fbacb728..77f490fd 100644
--- a/gnulib-tests/test-strtoumax.c
+++ b/gnulib-tests/test-strtoumax.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2013 Free Software Foundation, Inc.
+ * Copyright (C) 2011-2014 Free Software Foundation, Inc.
  *
  * 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
diff --git a/gnulib-tests/test-symlink.c b/gnulib-tests/test-symlink.c
index 9966516e..78d46c23 100644
--- a/gnulib-tests/test-symlink.c
+++ b/gnulib-tests/test-symlink.c
@@ -1,5 +1,5 @@
 /* Tests of symlink.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-symlink.h b/gnulib-tests/test-symlink.h
index 56cdc840..eb11cf69 100644
--- a/gnulib-tests/test-symlink.h
+++ b/gnulib-tests/test-symlink.h
@@ -1,5 +1,5 @@
 /* Tests of symlink.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-symlinkat.c b/gnulib-tests/test-symlinkat.c
index 11d38351..75181ce9 100644
--- a/gnulib-tests/test-symlinkat.c
+++ b/gnulib-tests/test-symlinkat.c
@@ -1,5 +1,5 @@
 /* Tests of symlinkat.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-sys_ioctl.c b/gnulib-tests/test-sys_ioctl.c
index 605ebb09..bd2a5af3 100644
--- a/gnulib-tests/test-sys_ioctl.c
+++ b/gnulib-tests/test-sys_ioctl.c
@@ -1,5 +1,5 @@
 /* Test of <sys/ioctl.h> substitute.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-sys_resource.c b/gnulib-tests/test-sys_resource.c
index 890d6371..531ff803 100644
--- a/gnulib-tests/test-sys_resource.c
+++ b/gnulib-tests/test-sys_resource.c
@@ -1,5 +1,5 @@
 /* Test of <sys/resource.h> substitute.
-   Copyright (C) 2012-2013 Free Software Foundation, Inc.
+   Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-sys_select.c b/gnulib-tests/test-sys_select.c
index cd84c010..2e4f7c10 100644
--- a/gnulib-tests/test-sys_select.c
+++ b/gnulib-tests/test-sys_select.c
@@ -1,5 +1,5 @@
 /* Test of <sys/select.h> substitute.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
@@ -40,8 +40,9 @@ SIGNATURE_CHECK (FD_ZERO, void, (fd_set *));
 /* Check that the 'struct timeval' type is defined.  */
 struct timeval a;
 
-/* Check that &a.tv_sec is a 'time_t *', ignoring signedness issues.  */
-typedef int verify_tv_sec_type[sizeof (a.tv_sec) == sizeof (time_t) ? 1 : -1];
+/* Check that a.tv_sec is wide enough to hold a time_t, ignoring
+   signedness issues.  */
+typedef int verify_tv_sec_type[sizeof (time_t) <= sizeof (a.tv_sec) ? 1 : -1];
 
 /* Check that sigset_t is defined.  */
 sigset_t t2;
diff --git a/gnulib-tests/test-sys_socket.c b/gnulib-tests/test-sys_socket.c
index 0ac8a332..8316f9ae 100644
--- a/gnulib-tests/test-sys_socket.c
+++ b/gnulib-tests/test-sys_socket.c
@@ -1,5 +1,5 @@
 /* Test of <sys/socket.h> substitute.
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -47,7 +47,7 @@ main (void)
   sa_family_t i;
 
   /* Check some errno values.  */
-  switch (0)
+  switch (ENOTSOCK)
     {
     case ENOTSOCK:
     case EADDRINUSE:
diff --git a/gnulib-tests/test-sys_stat.c b/gnulib-tests/test-sys_stat.c
index 1ce35817..c6a67f7f 100644
--- a/gnulib-tests/test-sys_stat.c
+++ b/gnulib-tests/test-sys_stat.c
@@ -1,5 +1,5 @@
 /* Test of <sys/stat.h> substitute.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-sys_time.c b/gnulib-tests/test-sys_time.c
index 1389b520..ea12c63d 100644
--- a/gnulib-tests/test-sys_time.c
+++ b/gnulib-tests/test-sys_time.c
@@ -1,5 +1,5 @@
 /* Test of <sys/time.h> substitute.
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -23,8 +23,9 @@
 /* Check that the 'struct timeval' type is defined.  */
 struct timeval a;
 
-/* Check that &a.tv_sec is a 'time_t *', ignoring signedness issues.  */
-typedef int verify_tv_sec_type[sizeof (a.tv_sec) == sizeof (time_t) ? 1 : -1];
+/* Check that a.tv_sec is wide enough to hold a time_t, ignoring
+   signedness issues.  */
+typedef int verify_tv_sec_type[sizeof (time_t) <= sizeof (a.tv_sec) ? 1 : -1];
 
 int
 main (void)
diff --git a/gnulib-tests/test-sys_types.c b/gnulib-tests/test-sys_types.c
index 1045de7c..ddcb6d29 100644
--- a/gnulib-tests/test-sys_types.c
+++ b/gnulib-tests/test-sys_types.c
@@ -1,5 +1,5 @@
 /* Test of <sys/types.h> substitute.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-sys_uio.c b/gnulib-tests/test-sys_uio.c
index df36faf1..4f53cae9 100644
--- a/gnulib-tests/test-sys_uio.c
+++ b/gnulib-tests/test-sys_uio.c
@@ -1,5 +1,5 @@
 /* Test of <sys/uio.h> substitute.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-sys_utsname.c b/gnulib-tests/test-sys_utsname.c
index 835029dd..10221bc4 100644
--- a/gnulib-tests/test-sys_utsname.c
+++ b/gnulib-tests/test-sys_utsname.c
@@ -1,5 +1,5 @@
 /* Test of <sys/utsname.h> substitute.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-sys_wait.c b/gnulib-tests/test-sys_wait.c
index 4dd21305..daf6f282 100644
--- a/gnulib-tests/test-sys_wait.c
+++ b/gnulib-tests/test-sys_wait.c
@@ -1,5 +1,5 @@
 /* Test of <sys/wait.h> substitute.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -31,17 +31,17 @@ main (void)
   if (test_sys_wait_macros ())
     return 1;
 
-  switch (0)
-    {
 #if 0
+  switch (WCONTINUED)
+    {
   /* Gnulib doesn't guarantee these, yet.  */
     case WCONTINUED:
     case WEXITED:
     case WNOWAIT:
     case WSTOPPED:
-#endif
       break;
     }
+#endif
 
   return a ? 1 : 0;
 }
diff --git a/gnulib-tests/test-sys_wait.h b/gnulib-tests/test-sys_wait.h
index d78b19e0..ed20219f 100644
--- a/gnulib-tests/test-sys_wait.h
+++ b/gnulib-tests/test-sys_wait.h
@@ -1,5 +1,5 @@
 /* Test of macros shared between <sys/wait.h> and <stdlib.h>.
-   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-termios.c b/gnulib-tests/test-termios.c
index b2a74ee9..a6b38120 100644
--- a/gnulib-tests/test-termios.c
+++ b/gnulib-tests/test-termios.c
@@ -1,5 +1,5 @@
 /* Test of <termios.h> substitute.
-   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-thread_create.c b/gnulib-tests/test-thread_create.c
index b47bb1b8..12ba79d9 100644
--- a/gnulib-tests/test-thread_create.c
+++ b/gnulib-tests/test-thread_create.c
@@ -1,5 +1,5 @@
 /* Test of gl_thread_create () macro.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-thread_self.c b/gnulib-tests/test-thread_self.c
index 27db4b2f..3629a82c 100644
--- a/gnulib-tests/test-thread_self.c
+++ b/gnulib-tests/test-thread_self.c
@@ -1,5 +1,5 @@
 /* Test of gl_thread_self () macro.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-time.c b/gnulib-tests/test-time.c
index c0601367..cb39c3bb 100644
--- a/gnulib-tests/test-time.c
+++ b/gnulib-tests/test-time.c
@@ -1,5 +1,5 @@
 /* Test of <time.h> substitute.
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-tls.c b/gnulib-tests/test-tls.c
index 8f7d516a..9eb0b139 100644
--- a/gnulib-tests/test-tls.c
+++ b/gnulib-tests/test-tls.c
@@ -1,5 +1,5 @@
 /* Test of thread-local storage in multithreaded situations.
-   Copyright (C) 2005, 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-u64.c b/gnulib-tests/test-u64.c
index 7e425cb0..b70bef67 100644
--- a/gnulib-tests/test-u64.c
+++ b/gnulib-tests/test-u64.c
@@ -1,5 +1,5 @@
 /* Test of <u64.h>
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-uname.c b/gnulib-tests/test-uname.c
index 0aa02f03..c474754d 100644
--- a/gnulib-tests/test-uname.c
+++ b/gnulib-tests/test-uname.c
@@ -1,5 +1,5 @@
 /* Test of system information.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-unistd.c b/gnulib-tests/test-unistd.c
index 5470985a..6d3fa00f 100644
--- a/gnulib-tests/test-unistd.c
+++ b/gnulib-tests/test-unistd.c
@@ -1,5 +1,5 @@
 /* Test of <unistd.h> substitute.
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-unlink.c b/gnulib-tests/test-unlink.c
index 90de10cf..05c93ca4 100644
--- a/gnulib-tests/test-unlink.c
+++ b/gnulib-tests/test-unlink.c
@@ -1,5 +1,5 @@
 /* Tests of unlink.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-unlink.h b/gnulib-tests/test-unlink.h
index 31288db4..3b5adff0 100644
--- a/gnulib-tests/test-unlink.h
+++ b/gnulib-tests/test-unlink.h
@@ -1,5 +1,5 @@
 /* Tests of unlink.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-unlinkat.c b/gnulib-tests/test-unlinkat.c
index 430d1891..1cfa0340 100644
--- a/gnulib-tests/test-unlinkat.c
+++ b/gnulib-tests/test-unlinkat.c
@@ -1,5 +1,5 @@
 /* Tests of unlinkat.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-unsetenv.c b/gnulib-tests/test-unsetenv.c
index c369e2af..50600a90 100644
--- a/gnulib-tests/test-unsetenv.c
+++ b/gnulib-tests/test-unsetenv.c
@@ -1,5 +1,5 @@
 /* Tests of unsetenv.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-update-copyright.sh b/gnulib-tests/test-update-copyright.sh
index 60cb3726..759a9372 100755
--- a/gnulib-tests/test-update-copyright.sh
+++ b/gnulib-tests/test-update-copyright.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Test suite for update-copyright.
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 # This file is part of the GNUlib Library.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-tests/test-userspec.c b/gnulib-tests/test-userspec.c
index 5b026648..437049c4 100644
--- a/gnulib-tests/test-userspec.c
+++ b/gnulib-tests/test-userspec.c
@@ -1,5 +1,5 @@
 /* Test userspec.c
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -181,6 +181,17 @@ main (void)
         }
     }
 
+  /* Ensure NULL parameters are ignored.  */
+  {
+    uid_t uid = (uid_t) -1;
+    char const *diag = parse_user_spec ("", &uid, NULL, NULL, NULL);
+    if (diag)
+      {
+        printf ("unexpected error: %s\n", diag);
+        fail = 1;
+      }
+  }
+
   return fail;
 }
 
diff --git a/gnulib-tests/test-usleep.c b/gnulib-tests/test-usleep.c
deleted file mode 100644
index 097c1725..00000000
--- a/gnulib-tests/test-usleep.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Test of usleep() function.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
-
-   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 3 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/>.  */
-
-/* Written by Eric Blake <ebb9@byu.net>, 2009.  */
-
-#include <config.h>
-
-#include <unistd.h>
-
-#include "signature.h"
-SIGNATURE_CHECK (usleep, int, (useconds_t));
-
-#include <time.h>
-
-#include "macros.h"
-
-int
-main (void)
-{
-  time_t start = time (NULL);
-  ASSERT (usleep (1000000) == 0);
-  ASSERT (start < time (NULL));
-
-  ASSERT (usleep (0) == 0);
-
-  return 0;
-}
diff --git a/gnulib-tests/test-utimens-common.h b/gnulib-tests/test-utimens-common.h
index 5bd46796..ff1b92b7 100644
--- a/gnulib-tests/test-utimens-common.h
+++ b/gnulib-tests/test-utimens-common.h
@@ -1,5 +1,5 @@
 /* Test of file timestamp modification functions.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-utimens.c b/gnulib-tests/test-utimens.c
index 9120ec98..04ffe72c 100644
--- a/gnulib-tests/test-utimens.c
+++ b/gnulib-tests/test-utimens.c
@@ -1,5 +1,5 @@
 /* Tests of utimens.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-utimens.h b/gnulib-tests/test-utimens.h
index ad898757..fd696a0d 100644
--- a/gnulib-tests/test-utimens.h
+++ b/gnulib-tests/test-utimens.h
@@ -1,5 +1,5 @@
 /* Test of file timestamp modification functions.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-utimensat.c b/gnulib-tests/test-utimensat.c
index 439bf250..cdc18b95 100644
--- a/gnulib-tests/test-utimensat.c
+++ b/gnulib-tests/test-utimensat.c
@@ -1,5 +1,5 @@
 /* Tests of utimensat.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-vasnprintf.c b/gnulib-tests/test-vasnprintf.c
index f29b05ae..2cbad5dc 100644
--- a/gnulib-tests/test-vasnprintf.c
+++ b/gnulib-tests/test-vasnprintf.c
@@ -1,5 +1,5 @@
 /* Test of vasnprintf() and asnprintf() functions.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
@@ -55,7 +55,7 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
       ASSERT (length == 5);
       if (size < 6)
         ASSERT (result != buf);
-      ASSERT (memcmp (buf + size, "DEADBEEF" + size, 8 - size) == 0);
+      ASSERT (memcmp (buf + size, &"DEADBEEF"[size], 8 - size) == 0);
       if (result != buf)
         free (result);
     }
diff --git a/gnulib-tests/test-vasprintf-posix.c b/gnulib-tests/test-vasprintf-posix.c
index 503d3269..6a28cffb 100644
--- a/gnulib-tests/test-vasprintf-posix.c
+++ b/gnulib-tests/test-vasprintf-posix.c
@@ -1,5 +1,5 @@
 /* Test of POSIX compatible vasprintf() and asprintf() functions.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
@@ -232,7 +232,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
     int retval =
       my_asprintf (&result, "%.0a %d", 1.5, 33, 44, 55);
     ASSERT (result != NULL);
-    ASSERT (strcmp (result, "0x2p+0 33") == 0
+    ASSERT (strcmp (result, "0x1p+0 33") == 0
+            || strcmp (result, "0x2p+0 33") == 0
             || strcmp (result, "0x3p-1 33") == 0
             || strcmp (result, "0x6p-2 33") == 0
             || strcmp (result, "0xcp-3 33") == 0);
@@ -245,7 +246,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
     int retval =
       my_asprintf (&result, "%.0a %d", 1.51, 33, 44, 55);
     ASSERT (result != NULL);
-    ASSERT (strcmp (result, "0x2p+0 33") == 0
+    ASSERT (strcmp (result, "0x1p+0 33") == 0
+            || strcmp (result, "0x2p+0 33") == 0
             || strcmp (result, "0x3p-1 33") == 0
             || strcmp (result, "0x6p-2 33") == 0
             || strcmp (result, "0xcp-3 33") == 0);
diff --git a/gnulib-tests/test-vasprintf.c b/gnulib-tests/test-vasprintf.c
index 459b92d2..9bfffbdc 100644
--- a/gnulib-tests/test-vasprintf.c
+++ b/gnulib-tests/test-vasprintf.c
@@ -1,5 +1,5 @@
 /* Test of vasprintf() and asprintf() functions.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-vc-list-files-cvs.sh b/gnulib-tests/test-vc-list-files-cvs.sh
index 1dbc532a..51d35604 100755
--- a/gnulib-tests/test-vc-list-files-cvs.sh
+++ b/gnulib-tests/test-vc-list-files-cvs.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Unit tests for vc-list-files
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 # This file is part of the GNUlib Library.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-tests/test-vc-list-files-git.sh b/gnulib-tests/test-vc-list-files-git.sh
index 8cbd00b6..b31f99a5 100755
--- a/gnulib-tests/test-vc-list-files-git.sh
+++ b/gnulib-tests/test-vc-list-files-git.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Unit tests for vc-list-files
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 # This file is part of the GNUlib Library.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-tests/test-verify.c b/gnulib-tests/test-verify.c
index 1056b4e4..2a41eb11 100644
--- a/gnulib-tests/test-verify.c
+++ b/gnulib-tests/test-verify.c
@@ -1,6 +1,6 @@
 /* Test the "verify" module.
 
-   Copyright (C) 2005, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-version-etc.c b/gnulib-tests/test-version-etc.c
index 66027f31..d94f63f8 100644
--- a/gnulib-tests/test-version-etc.c
+++ b/gnulib-tests/test-version-etc.c
@@ -1,5 +1,5 @@
 /* Test suite for version-etc.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
    This file is part of the GNUlib Library.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-tests/test-version-etc.sh b/gnulib-tests/test-version-etc.sh
index 466c9592..c41f7ac5 100755
--- a/gnulib-tests/test-version-etc.sh
+++ b/gnulib-tests/test-version-etc.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Test suite for version-etc.
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 # This file is part of the GNUlib Library.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-tests/test-vfprintf-posix.c b/gnulib-tests/test-vfprintf-posix.c
index 53f951c0..c55c6eda 100644
--- a/gnulib-tests/test-vfprintf-posix.c
+++ b/gnulib-tests/test-vfprintf-posix.c
@@ -1,5 +1,5 @@
 /* Test of POSIX compatible vfprintf() function.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-vprintf-posix.c b/gnulib-tests/test-vprintf-posix.c
index 3593b1db..78f3cf7c 100644
--- a/gnulib-tests/test-vprintf-posix.c
+++ b/gnulib-tests/test-vprintf-posix.c
@@ -1,5 +1,5 @@
 /* Test of POSIX compatible vfprintf() function.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-wchar.c b/gnulib-tests/test-wchar.c
index 92ae8f22..d9807ec7 100644
--- a/gnulib-tests/test-wchar.c
+++ b/gnulib-tests/test-wchar.c
@@ -1,5 +1,5 @@
 /* Test of <wchar.h> substitute.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-wcrtomb-w32.c b/gnulib-tests/test-wcrtomb-w32.c
index 494bbd13..793bbce9 100644
--- a/gnulib-tests/test-wcrtomb-w32.c
+++ b/gnulib-tests/test-wcrtomb-w32.c
@@ -1,5 +1,5 @@
 /* Test of conversion of wide character to multibyte character.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-wcrtomb.c b/gnulib-tests/test-wcrtomb.c
index c0769735..5b14050c 100644
--- a/gnulib-tests/test-wcrtomb.c
+++ b/gnulib-tests/test-wcrtomb.c
@@ -1,5 +1,5 @@
 /* Test of conversion of wide character to multibyte character.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-wctype-h.c b/gnulib-tests/test-wctype-h.c
index 5ab5d0c2..904a1851 100644
--- a/gnulib-tests/test-wctype-h.c
+++ b/gnulib-tests/test-wctype-h.c
@@ -1,5 +1,5 @@
 /* Test of <wctype.h> substitute.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-wcwidth.c b/gnulib-tests/test-wcwidth.c
index 6d85665e..d571a791 100644
--- a/gnulib-tests/test-wcwidth.c
+++ b/gnulib-tests/test-wcwidth.c
@@ -1,5 +1,5 @@
 /* Test of wcwidth() function.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-write.c b/gnulib-tests/test-write.c
index 90e9a222..a722429d 100644
--- a/gnulib-tests/test-write.c
+++ b/gnulib-tests/test-write.c
@@ -1,5 +1,5 @@
 /* Test the write() function.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-xalloc-die.c b/gnulib-tests/test-xalloc-die.c
index e6376f85..baf79242 100644
--- a/gnulib-tests/test-xalloc-die.c
+++ b/gnulib-tests/test-xalloc-die.c
@@ -1,5 +1,5 @@
 /* Test of xalloc_die() function.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-xalloc-die.sh b/gnulib-tests/test-xalloc-die.sh
index 920d222f..cf2ad40a 100755
--- a/gnulib-tests/test-xalloc-die.sh
+++ b/gnulib-tests/test-xalloc-die.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Test suite for xalloc_die.
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 # This file is part of the GNUlib Library.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-tests/test-xfprintf-posix.c b/gnulib-tests/test-xfprintf-posix.c
index dcf8a92a..e9e56972 100644
--- a/gnulib-tests/test-xfprintf-posix.c
+++ b/gnulib-tests/test-xfprintf-posix.c
@@ -1,5 +1,5 @@
 /* Test of error-checking xfprintf() function with POSIX compatible formatting.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-xprintf-posix.c b/gnulib-tests/test-xprintf-posix.c
index 594b7794..87dfbf64 100644
--- a/gnulib-tests/test-xprintf-posix.c
+++ b/gnulib-tests/test-xprintf-posix.c
@@ -1,5 +1,5 @@
 /* Test of error-checking xprintf() function with POSIX compatible formatting.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-xstrtol.c b/gnulib-tests/test-xstrtol.c
index c07e2952..c3670cc7 100644
--- a/gnulib-tests/test-xstrtol.c
+++ b/gnulib-tests/test-xstrtol.c
@@ -1,5 +1,5 @@
 /* Test of xstrtol module.
-   Copyright (C) 1995-1996, 1998-2001, 2003-2013 Free Software Foundation, Inc.
+   Copyright (C) 1995-1996, 1998-2001, 2003-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/test-xvasprintf.c b/gnulib-tests/test-xvasprintf.c
index 0a2f1b82..45da3e48 100644
--- a/gnulib-tests/test-xvasprintf.c
+++ b/gnulib-tests/test-xvasprintf.c
@@ -1,5 +1,5 @@
 /* Test of xvasprintf() and xasprintf() functions.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
@@ -16,6 +16,13 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
+/* Tell GCC not to warn about the specific edge cases tested here.  */
+#if (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) || 4 < __GNUC__
+# pragma GCC diagnostic ignored "-Wformat-zero-length"
+# pragma GCC diagnostic ignored "-Wformat-nonliteral"
+# pragma GCC diagnostic ignored "-Wformat-security"
+#endif
+
 #include <config.h>
 
 #include "xvasprintf.h"
@@ -93,9 +100,11 @@ test_xasprintf (void)
     }
 
   {
-    /* Silence gcc warning about zero-length format string.  */
+    /* Silence gcc warning about zero-length format string,
+       and about "format not a string literal and no format"
+       (whatever that means) .  */
     const char *empty = "";
-    result = xasprintf (empty);
+    result = xasprintf (empty, empty);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "") == 0);
     free (result);
diff --git a/gnulib-tests/test-yesno.c b/gnulib-tests/test-yesno.c
index f77d6333..22c45f2f 100644
--- a/gnulib-tests/test-yesno.c
+++ b/gnulib-tests/test-yesno.c
@@ -1,5 +1,5 @@
 /* Test of yesno module.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/unistr/test-strncat.h b/gnulib-tests/unistr/test-strncat.h
index 3d28436c..30935b3f 100644
--- a/gnulib-tests/unistr/test-strncat.h
+++ b/gnulib-tests/unistr/test-strncat.h
@@ -1,5 +1,5 @@
 /* Test of uN_strncat() functions.
-   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/unistr/test-u8-mbtoucr.c b/gnulib-tests/unistr/test-u8-mbtoucr.c
index 763d9319..a5511301 100644
--- a/gnulib-tests/unistr/test-u8-mbtoucr.c
+++ b/gnulib-tests/unistr/test-u8-mbtoucr.c
@@ -1,5 +1,5 @@
 /* Test of u8_mbtoucr() function.
-   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/unistr/test-u8-uctomb.c b/gnulib-tests/unistr/test-u8-uctomb.c
index b0ecb30e..cec9216e 100644
--- a/gnulib-tests/unistr/test-u8-uctomb.c
+++ b/gnulib-tests/unistr/test-u8-uctomb.c
@@ -1,5 +1,5 @@
 /* Test of u8_uctomb() function.
-   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/uniwidth/test-uc_width.c b/gnulib-tests/uniwidth/test-uc_width.c
index 43d9d10b..21e0db67 100644
--- a/gnulib-tests/uniwidth/test-uc_width.c
+++ b/gnulib-tests/uniwidth/test-uc_width.c
@@ -1,5 +1,5 @@
 /* Test of uc_width() function.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/uniwidth/test-uc_width2.c b/gnulib-tests/uniwidth/test-uc_width2.c
index 623f32ca..9e9cea22 100644
--- a/gnulib-tests/uniwidth/test-uc_width2.c
+++ b/gnulib-tests/uniwidth/test-uc_width2.c
@@ -1,5 +1,5 @@
 /* Test of uc_width() function.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/unlinkdir.c b/gnulib-tests/unlinkdir.c
index dc1937a0..157b3c4a 100644
--- a/gnulib-tests/unlinkdir.c
+++ b/gnulib-tests/unlinkdir.c
@@ -1,6 +1,6 @@
 /* unlinkdir.c - determine whether we can unlink directories
 
-   Copyright (C) 2005-2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/unlinkdir.h b/gnulib-tests/unlinkdir.h
index 9f461e97..5563131b 100644
--- a/gnulib-tests/unlinkdir.h
+++ b/gnulib-tests/unlinkdir.h
@@ -1,6 +1,6 @@
 /* unlinkdir.h - determine (and maybe change) whether we can unlink directories
 
-   Copyright (C) 2005, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/usleep.c b/gnulib-tests/usleep.c
deleted file mode 100644
index 008cc1f0..00000000
--- a/gnulib-tests/usleep.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Pausing execution of the current thread.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
-   Written by Eric Blake <ebb9@byu.net>, 2009.
-
-   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 3 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/>.  */
-
-/* This file is _intentionally_ light-weight.  Rather than using
-   select or nanosleep, both of which drag in external libraries on
-   some platforms, this merely rounds up to the nearest second if
-   usleep() does not exist.  If sub-second resolution is important,
-   then use a more powerful interface to begin with.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include <unistd.h>
-
-#include <errno.h>
-
-#ifndef HAVE_USLEEP
-# define HAVE_USLEEP 0
-#endif
-
-/* Sleep for MICRO microseconds, which can be greater than 1 second.
-   Return -1 and set errno to EINVAL on range error (about 4295
-   seconds), or 0 on success.  Interaction with SIGALARM is
-   unspecified.  */
-
-int
-usleep (useconds_t micro)
-{
-  unsigned int seconds = micro / 1000000;
-  if (sizeof seconds < sizeof micro && micro / 1000000 != seconds)
-    {
-      errno = EINVAL;
-      return -1;
-    }
-  if (!HAVE_USLEEP && micro % 1000000)
-    seconds++;
-  while ((seconds = sleep (seconds)) != 0);
-
-#undef usleep
-#if !HAVE_USLEEP
-# define usleep(x) 0
-#endif
-  return usleep (micro % 1000000);
-}
diff --git a/gnulib-tests/w32sock.h b/gnulib-tests/w32sock.h
index 44f3a1a0..b921b1bc 100644
--- a/gnulib-tests/w32sock.h
+++ b/gnulib-tests/w32sock.h
@@ -1,6 +1,6 @@
 /* w32sock.h --- internal auxiliary functions for Windows socket functions
 
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/wctob.c b/gnulib-tests/wctob.c
index 508f896b..d87d1804 100644
--- a/gnulib-tests/wctob.c
+++ b/gnulib-tests/wctob.c
@@ -1,5 +1,5 @@
 /* Convert wide character to unibyte character.
-   Copyright (C) 2008, 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2010-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-tests/wctomb-impl.h b/gnulib-tests/wctomb-impl.h
index 60dc3b90..0fa170eb 100644
--- a/gnulib-tests/wctomb-impl.h
+++ b/gnulib-tests/wctomb-impl.h
@@ -1,5 +1,5 @@
 /* Convert wide character to multibyte character.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-tests/wctomb.c b/gnulib-tests/wctomb.c
index 37611084..b3595a4d 100644
--- a/gnulib-tests/wctomb.c
+++ b/gnulib-tests/wctomb.c
@@ -1,5 +1,5 @@
 /* Convert wide character to multibyte character.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-tests/zerosize-ptr.h b/gnulib-tests/zerosize-ptr.h
index f0e61556..db30f4b1 100644
--- a/gnulib-tests/zerosize-ptr.h
+++ b/gnulib-tests/zerosize-ptr.h
@@ -1,5 +1,5 @@
 /* Return a pointer to a zero-size object in memory.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/init.cfg b/init.cfg
index afee9307..725ee121 100644
--- a/init.cfg
+++ b/init.cfg
@@ -1,6 +1,6 @@
 # This file is sourced by init.sh, *before* its initialization.
 
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
 # 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
@@ -90,19 +90,51 @@ require_local_dir_()
     skip_ "This test must be run on a local file system."
 }
 
+require_selinux_()
+{
+  # When in a chroot of an SELinux-enabled system, but with a mock-simulated
+  # SELinux-*disabled* system, recognize that SELinux is disabled system wide:
+  grep 'selinuxfs$' /proc/filesystems > /dev/null \
+    || skip_ "this system lacks SELinux support"
+
+  # Independent of whether SELinux is enabled system-wide,
+  # the current file system may lack SELinux support.
+  # Also the current build may have SELinux support disabled.
+  case $(ls -Zd .) in
+    '? .'|'unlabeled .')
+      test -z "$CONFIG_HEADER" \
+        && framework_failure_ 'CONFIG_HEADER not defined'
+      grep '^#define HAVE_SELINUX_SELINUX_H 1' "$CONFIG_HEADER" > /dev/null \
+        && selinux_missing_="(file) system" || selinux_missing_="build"
+      skip_ "this $selinux_missing_ lacks SELinux support"
+    ;;
+  esac
+}
+
 # Skip this test if we're not in SELinux "enforcing" mode.
 require_selinux_enforcing_()
 {
+  require_selinux_
   test "$(getenforce)" = Enforcing \
     || skip_ "This test is useful only with SELinux in Enforcing mode."
 }
 
+require_smack_()
+{
+  grep 'smackfs$' /proc/filesystems > /dev/null \
+    || skip_ "this system lacks SMACK support"
+
+  test "$(ls -Zd .)" != '? .' \
+    || skip_ "this file system lacks SMACK support"
+}
+
 require_openat_support_()
 {
   # Skip this test if your system has neither the openat-style functions
   # nor /proc/self/fd support with which to emulate them.
+
   test -z "$CONFIG_HEADER" \
-    && skip_ 'internal error: CONFIG_HEADER not defined'
+    && framework_failure_ 'CONFIG_HEADER not defined'
 
   _skip=yes
   grep '^#define HAVE_OPENAT' "$CONFIG_HEADER" > /dev/null && _skip=no
@@ -112,7 +144,7 @@ require_openat_support_()
   fi
 }
 
-require_ulimit_()
+require_ulimit_v_()
 {
   local ulimit_works=yes
   # Expect to be able to exec a program in 10MiB of virtual memory,
@@ -169,9 +201,37 @@ require_valgrind_()
     skip_ "requires a working valgrind"
 }
 
+# Skip the current test if setfacl doesn't work on the current file system,
+# which could happen if not installed, or if ACLs are not supported by the
+# kernel or the file system, or are turned off via mount options.
+#
+# Work around the following two issues:
+#
+# 1) setfacl maps ACLs into file permission bits if on "noacl" file systems.
+#
+# On file systems which do not support ACLs (e.g. ext4 mounted with -o noacl),
+# setfacl operates on the regular file permission bits, and only fails if the
+# given ACL spec does not fit into there.  Thus, to test if ACLs really work
+# on the current file system, pass an ACL spec which can't be mapped that way.
+# "Default" ACLs (-d) seem to fulfill this requirement.
+#
+# 2) setfacl only invokes the underlying system call if the ACL would change.
+#
+# If the given ACL spec would not change the ACLs on the file, then setfacl
+# does not invoke the underlying system call - setxattr().  Therefore, to test
+# if setting ACLs really works on the current file system, call setfacl twice
+# with conflictive ACL specs.
 require_setfacl_()
 {
-  setfacl -m user::rwx . \
+  local d='acltestdir_'
+  mkdir $d || framework_failure_
+  local f=0
+
+  setfacl -d -m user::r-x $d \
+    && setfacl -d -m user::rwx $d \
+    || f=1
+  rm -rf $d || framework_failure_
+  test $f = 0 \
     || skip_ "setfacl does not work on the current file system"
 }
 
@@ -299,23 +359,6 @@ skip_if_()
   esac
 }
 
-require_selinux_()
-{
-  # When in a chroot of an SELinux-enabled system, but with a mock-simulated
-  # SELinux-*disabled* system, recognize that SELinux is disabled system wide:
-  grep 'selinuxfs$' /proc/filesystems > /dev/null \
-    || skip_ "this system lacks SELinux support"
-
-  # Independent of whether SELinux is enabled system-wide,
-  # the current file system may lack SELinux support.
-  case $(ls -Zd .) in
-    '? .'|'unlabeled .')
-      skip_ "this system (or maybe just" \
-        "the current file system) lacks SELinux support"
-    ;;
-  esac
-}
-
 very_expensive_()
 {
   if test "$RUN_VERY_EXPENSIVE_TESTS" != yes; then
@@ -350,12 +393,14 @@ or use the shortcut target of the toplevel Makefile,
   fi
 }
 
-# Test whether we can run our just-built rm setuidgid-to-root,
+# Test whether we can run our just-built root owned rm,
 # i.e., that $NON_ROOT_USERNAME has access to the build directory.
-setuidgid_has_perm_()
+nonroot_has_perm_()
 {
+  require_built_ chroot
+
   local rm_version=$(
-    setuidgid $NON_ROOT_USERNAME env PATH="$PATH" rm --version |
+    chroot --user=$NON_ROOT_USERNAME / env PATH="$PATH" rm --version |
     sed -n '1s/.* //p'
   )
   case ":$rm_version:" in
@@ -368,12 +413,12 @@ require_root_()
 {
   uid_is_privileged_ || skip_ "must be run as root"
   NON_ROOT_USERNAME=${NON_ROOT_USERNAME=nobody}
-  NON_ROOT_GROUP=${NON_ROOT_GROUP=$(id -g $NON_ROOT_USERNAME)}
+  NON_ROOT_GID=${NON_ROOT_GID=$(id -g $NON_ROOT_USERNAME)}
 
-  # When the current test invokes setuidgid, call setuidgid_has_perm_
+  # When the current test invokes chroot, call nonroot_has_perm_
   # to check for a common problem.
-  grep '^[ ]*setuidgid' "../$0" \
-    && { setuidgid_has_perm_ \
+  grep '^[ ]*chroot' "../$0" \
+    && { nonroot_has_perm_ \
            || skip_ "user $NON_ROOT_USERNAME lacks execute permissions"; }
 }
 
@@ -466,6 +511,28 @@ require_sparse_support_()
   fi
 }
 
+# Compile a shared lib using the GCC options for doing so.
+# Pass input and output file as parameters respectively.
+# Any other optional parmeters are passed to $CC.
+gcc_shared_()
+{
+  local in=$1
+  local out=$2
+  shift 2 || return 1
+
+  $CC -Wall -shared --std=gnu99 -fPIC -ldl -O2 $* "$in" -o "$out"
+}
+
+# There are a myriad of ways to build shared libs,
+# so we only consider running tests requiring shared libs,
+# on platforms that support building them as follows.
+require_gcc_shared_()
+{
+  gcc_shared_ '-' 'd.so' -xc < /dev/null 2>&1 \
+    || skip_ '$CC -shared ... failed to build a shared lib'
+  rm -f d.so
+}
+
 mkfifo_or_skip_()
 {
   test $# = 1 || framework_failure_
@@ -493,6 +560,19 @@ skip_if_setgid_()
   esac
 }
 
+# Skip if files are created with a different group to the current user
+# This can happen due to a setgid dir, or by some other mechanism on OS X:
+# http://unix.stackexchange.com/q/63865
+# http://bugs.gnu.org/14024#41
+skip_if_nondefault_group_()
+{
+  touch grp.$$
+  gen_ug=$(stat -c '%u:%g' grp.$$)
+  rm grp.$$
+  test "$gen_ug" = "$(id -ru):$(id -rg)" ||
+    skip_ 'Files are created with a different gid'
+}
+
 skip_if_mcstransd_is_running_()
 {
   test $# = 0 || framework_failure_
@@ -534,11 +614,13 @@ working_umask_or_skip_()
 # Note ensure you do _not_ quote the parameter to GNU sleep in
 # your function, as it may contain separate values that sleep
 # needs to accumulate.
+# Further function arguments will be forwarded to the test function.
 retry_delay_()
 {
   local test_func=$1
   local init_delay=$2
   local max_n_tries=$3
+  shift 3 || return 1
 
   local attempt=1
   local num_sleeps=$attempt
@@ -546,7 +628,7 @@ retry_delay_()
   while test $attempt -le $max_n_tries; do
     local delay=$($AWK -v n=$num_sleeps -v s="$init_delay" \
                   'BEGIN { print s * n }')
-    "$test_func" "$delay" && { time_fail=0; break; } || time_fail=1
+    "$test_func" "$delay" "$@" && { time_fail=0; break; } || time_fail=1
     attempt=$(expr $attempt + 1)
     num_sleeps=$(expr $num_sleeps '*' 2)
   done
diff --git a/lib/ChangeLog-2007 b/lib/ChangeLog-2007
index b872b2a0..f9bd37ff 100644
--- a/lib/ChangeLog-2007
+++ b/lib/ChangeLog-2007
@@ -8746,7 +8746,7 @@
 
 	-----
 
-	Copyright (C) 2000-2013 Free Software Foundation, Inc.
+	Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
diff --git a/lib/acl-errno-valid.c b/lib/acl-errno-valid.c
new file mode 100644
index 00000000..3287382e
--- /dev/null
+++ b/lib/acl-errno-valid.c
@@ -0,0 +1,52 @@
+/* Test whether ACLs are well supported on this system.
+
+   Copyright 2013-2014 Free Software Foundation, Inc.
+
+   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 3 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/>.
+
+   Written by Paul Eggert.  */
+
+#include <config.h>
+
+#include <acl.h>
+
+#include <errno.h>
+
+/* Return true if errno value ERRNUM indicates that ACLs are well
+   supported on this system.  ERRNUM should be an errno value obtained
+   after an ACL-related system call fails.  */
+bool
+acl_errno_valid (int errnum)
+{
+  /* Recognize some common errors such as from an NFS mount that does
+     not support ACLs, even when local drives do.  */
+  switch (errnum)
+    {
+    case EBUSY: return false;
+    case EINVAL: return false;
+#if defined __APPLE__ && defined __MACH__
+    case ENOENT: return false;
+#endif
+    case ENOSYS: return false;
+
+#if defined ENOTSUP && ENOTSUP != EOPNOTSUPP
+# if ENOTSUP != ENOSYS /* Needed for the MS-Windows port of GNU Emacs.  */
+    case ENOTSUP: return false;
+# endif
+#endif
+
+    case EOPNOTSUPP: return false;
+    default: return true;
+    }
+}
diff --git a/lib/acl-internal.h b/lib/acl-internal.h
index 37c6ebfd..b2380068 100644
--- a/lib/acl-internal.h
+++ b/lib/acl-internal.h
@@ -1,6 +1,6 @@
 /* Internal implementation of access control lists.
 
-   Copyright (C) 2002-2003, 2005-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2014 Free Software Foundation, Inc.
 
    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
@@ -44,16 +44,7 @@ extern int acl (char *, int, int, struct acl *);
 extern int aclsort (int, int, struct acl *);
 #endif
 
-#include "error.h"
-#include "quote.h"
-
 #include <errno.h>
-#ifndef ENOSYS
-# define ENOSYS (-1)
-#endif
-#ifndef ENOTSUP
-# define ENOTSUP (-1)
-#endif
 
 #include <limits.h>
 #ifndef MIN
@@ -69,19 +60,9 @@ extern int aclsort (int, int, struct acl *);
 # define fchmod(fd, mode) (-1)
 #endif
 
-/* Recognize some common errors such as from an NFS mount that does
-   not support ACLs, even when local drives do.  */
-#if defined __APPLE__ && defined __MACH__ /* Mac OS X */
-# define ACL_NOT_WELL_SUPPORTED(Err) \
-     ((Err) == ENOTSUP || (Err) == ENOSYS || (Err) == EINVAL || (Err) == EBUSY || (Err) == ENOENT)
-#elif defined EOPNOTSUPP /* Tru64 NFS */
-# define ACL_NOT_WELL_SUPPORTED(Err) \
-     ((Err) == ENOTSUP || (Err) == ENOSYS || (Err) == EINVAL || (Err) == EBUSY || (Err) == EOPNOTSUPP)
-#else
-# define ACL_NOT_WELL_SUPPORTED(Err) \
-     ((Err) == ENOTSUP || (Err) == ENOSYS || (Err) == EINVAL || (Err) == EBUSY)
+#ifndef _GL_INLINE_HEADER_BEGIN
+ #error "Please include config.h first."
 #endif
-
 _GL_INLINE_HEADER_BEGIN
 #ifndef ACL_INTERNAL_INLINE
 # define ACL_INTERNAL_INLINE _GL_INLINE
@@ -193,14 +174,14 @@ extern int acl_access_nontrivial (acl_t);
 
 /* Return 1 if the given ACL is non-trivial.
    Return 0 if it is trivial, i.e. equivalent to a simple stat() mode.  */
-extern int acl_nontrivial (int count, aclent_t *entries);
+extern int acl_nontrivial (int count, aclent_t *entries) _GL_ATTRIBUTE_PURE;
 
 #  ifdef ACE_GETACL /* Solaris 10 */
 
 /* Test an ACL retrieved with ACE_GETACL.
    Return 1 if the given ACL, consisting of COUNT entries, is non-trivial.
    Return 0 if it is trivial, i.e. equivalent to a simple stat() mode.  */
-extern int acl_ace_nontrivial (int count, ace_t *entries);
+extern int acl_ace_nontrivial (int count, ace_t *entries) _GL_ATTRIBUTE_PURE;
 
 /* Definitions for when the built executable is executed on Solaris 10
    (newer version) or Solaris 11.  */
diff --git a/lib/acl.h b/lib/acl.h
index 9471f994..f67e350d 100644
--- a/lib/acl.h
+++ b/lib/acl.h
@@ -1,6 +1,6 @@
 /* acl.c - access control lists
 
-   Copyright (C) 2002, 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2008-2014 Free Software Foundation, Inc.
 
    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
@@ -17,12 +17,19 @@
 
    Written by Paul Eggert.  */
 
+#ifndef _GL_ACL_H
+#define _GL_ACL_H 1
+
+#include <stdbool.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
+bool acl_errno_valid (int) _GL_ATTRIBUTE_CONST;
 int file_has_acl (char const *, struct stat const *);
 int qset_acl (char const *, int, mode_t);
 int set_acl (char const *, int, mode_t);
 int qcopy_acl (char const *, int, char const *, int, mode_t);
 int copy_acl (char const *, int, char const *, int, mode_t);
 int chmod_or_fchmod (char const *, int, mode_t);
+
+#endif
diff --git a/lib/acl_entries.c b/lib/acl_entries.c
index 7ca7b9d5..39d6b28f 100644
--- a/lib/acl_entries.c
+++ b/lib/acl_entries.c
@@ -1,6 +1,6 @@
 /* Return the number of entries in an ACL.
 
-   Copyright (C) 2002-2003, 2005-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/alignof.h b/lib/alignof.h
index 013d5141..9d161dfb 100644
--- a/lib/alignof.h
+++ b/lib/alignof.h
@@ -1,5 +1,5 @@
 /* Determine alignment of types.
-   Copyright (C) 2003-2004, 2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2003-2004, 2006, 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -41,7 +41,7 @@
    - when -malign-double is specified:      alignof_slot(double) = 8.
    Note: The result cannot be used as a value for an 'enum' constant,
    due to bugs in HP-UX 10.20 cc and AIX 3.2.5 xlc.  */
-#if defined __GNUC__
+#if defined __GNUC__ || defined __IBM__ALIGNOF__
 # define alignof_type __alignof__
 #else
 # define alignof_type alignof_slot
diff --git a/lib/alloca.in.h b/lib/alloca.in.h
index 72d28ee3..5de9aaab 100644
--- a/lib/alloca.in.h
+++ b/lib/alloca.in.h
@@ -1,6 +1,6 @@
 /* Memory allocation on the stack.
 
-   Copyright (C) 1995, 1999, 2001-2004, 2006-2013 Free Software Foundation,
+   Copyright (C) 1995, 1999, 2001-2004, 2006-2014 Free Software Foundation,
    Inc.
 
    This program is free software; you can redistribute it and/or modify it
diff --git a/lib/allocator.h b/lib/allocator.h
index b71fbbbb..0904b321 100644
--- a/lib/allocator.h
+++ b/lib/allocator.h
@@ -1,6 +1,6 @@
 /* Memory allocators such as malloc+free.
 
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/anytostr.c b/lib/anytostr.c
index 1d2fca49..011a31fa 100644
--- a/lib/anytostr.c
+++ b/lib/anytostr.c
@@ -1,6 +1,6 @@
 /* anytostr.c -- convert integers to printable strings
 
-   Copyright (C) 2001, 2006, 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2006, 2008-2014 Free Software Foundation, Inc.
 
    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
@@ -20,6 +20,8 @@
 /* Tell gcc not to warn about the (i < 0) test, below.  */
 #if (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) || 4 < __GNUC__
 # pragma GCC diagnostic ignored "-Wtype-limits"
+#elif defined __clang__
+# pragma clang diagnostic ignored "-Wtautological-compare"
 #endif
 
 #include <config.h>
diff --git a/lib/areadlink-with-size.c b/lib/areadlink-with-size.c
index 29e0ef7a..161d4743 100644
--- a/lib/areadlink-with-size.c
+++ b/lib/areadlink-with-size.c
@@ -1,7 +1,7 @@
 /* readlink wrapper to return the link name in malloc'd storage.
    Unlike xreadlink and xreadlink_with_size, don't ever call exit.
 
-   Copyright (C) 2001, 2003-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003-2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/areadlink.c b/lib/areadlink.c
index fe65cc67..b4b856c5 100644
--- a/lib/areadlink.c
+++ b/lib/areadlink.c
@@ -1,7 +1,7 @@
 /* areadlink.c -- readlink wrapper to return the link name in malloc'd storage
    Unlike xreadlink and xreadlink_with_size, don't ever call exit.
 
-   Copyright (C) 2001, 2003-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003-2007, 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -26,6 +26,23 @@
 
 #include "careadlinkat.h"
 
+#include <stdlib.h>
+#include <unistd.h>
+
+/* Get the symbolic link value of FILENAME and put it into BUFFER, with
+   size BUFFER_SIZE.  This function acts like readlink but has
+   readlinkat's signature.  */
+static ssize_t
+careadlinkatcwd (int fd, char const *filename, char *buffer,
+                 size_t buffer_size)
+{
+  /* FD must be AT_FDCWD here, otherwise the caller is using this
+     function in contexts it was not meant for.  */
+  if (fd != AT_FDCWD)
+    abort ();
+  return readlink (filename, buffer, buffer_size);
+}
+
 /* Call readlink to get the symbolic link value of FILENAME.
    Return a pointer to that NUL-terminated string in malloc'd storage.
    If readlink fails, return NULL and set errno.
diff --git a/lib/areadlink.h b/lib/areadlink.h
index 5870ce59..59abb37c 100644
--- a/lib/areadlink.h
+++ b/lib/areadlink.h
@@ -1,6 +1,6 @@
 /* Read symbolic links without size limitation.
 
-   Copyright (C) 2001, 2003-2004, 2007, 2009-2013 Free Software Foundation,
+   Copyright (C) 2001, 2003-2004, 2007, 2009-2014 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/areadlinkat.c b/lib/areadlinkat.c
index 7676831b..9e1a9597 100644
--- a/lib/areadlinkat.c
+++ b/lib/areadlinkat.c
@@ -1,7 +1,7 @@
 /* areadlinkat.c -- readlinkat wrapper to return malloc'd link name
    Unlike xreadlinkat, only call exit on failure to change directory.
 
-   Copyright (C) 2001, 2003-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003-2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/argmatch.c b/lib/argmatch.c
index 9125e2af..f56ab55f 100644
--- a/lib/argmatch.c
+++ b/lib/argmatch.c
@@ -1,6 +1,6 @@
 /* argmatch.c -- find a match for a string in an array
 
-   Copyright (C) 1990, 1998-1999, 2001-2007, 2009-2013 Free Software
+   Copyright (C) 1990, 1998-1999, 2001-2007, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/argmatch.h b/lib/argmatch.h
index 2e0275cf..09645db6 100644
--- a/lib/argmatch.h
+++ b/lib/argmatch.h
@@ -1,6 +1,6 @@
 /* argmatch.h -- definitions and prototypes for argmatch.c
 
-   Copyright (C) 1990, 1998-1999, 2001-2002, 2004-2005, 2009-2013 Free Software
+   Copyright (C) 1990, 1998-1999, 2001-2002, 2004-2005, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -26,6 +26,10 @@
 
 # include "verify.h"
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 # define ARRAY_CARDINALITY(Array) (sizeof (Array) / sizeof *(Array))
 
 /* Assert there are as many real arguments as there are values
@@ -100,4 +104,8 @@ char const *argmatch_to_argument (char const *value,
   argmatch_to_argument (Value, Arglist,                                 \
                         (char const *) (Vallist), sizeof *(Vallist))
 
+#ifdef  __cplusplus
+}
+#endif
+
 #endif /* ARGMATCH_H_ */
diff --git a/lib/argv-iter.c b/lib/argv-iter.c
index a17d8689..f0704a47 100644
--- a/lib/argv-iter.c
+++ b/lib/argv-iter.c
@@ -1,5 +1,5 @@
 /* Iterate over arguments from argv or --files0-from=FILE
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/argv-iter.h b/lib/argv-iter.h
index 82237f54..f2cf77d3 100644
--- a/lib/argv-iter.h
+++ b/lib/argv-iter.h
@@ -1,5 +1,5 @@
 /* Iterate over arguments from argv or --files0-from=FILE
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/arpa_inet.in.h b/lib/arpa_inet.in.h
index ba89e977..b8c2e18b 100644
--- a/lib/arpa_inet.in.h
+++ b/lib/arpa_inet.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <arpa/inet.h>.
 
-   Copyright (C) 2005-2006, 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/asnprintf.c b/lib/asnprintf.c
index 76e228d8..0c62197f 100644
--- a/lib/asnprintf.c
+++ b/lib/asnprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/asprintf.c b/lib/asprintf.c
index 713dae13..9a69ac48 100644
--- a/lib/asprintf.c
+++ b/lib/asprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2007, 2009-2013 Free Software Foundation,
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2014 Free Software Foundation,
    Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib/at-func.c b/lib/at-func.c
index 03c56788..c8ee073d 100644
--- a/lib/at-func.c
+++ b/lib/at-func.c
@@ -1,5 +1,5 @@
 /* Define at-style functions like fstatat, unlinkat, fchownat, etc.
-   Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/at-func2.c b/lib/at-func2.c
index bbbddc0b..b4d6067a 100644
--- a/lib/at-func2.c
+++ b/lib/at-func2.c
@@ -1,5 +1,5 @@
 /* Define 2-FD at-style functions like linkat or renameat.
-   Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/backupfile.c b/lib/backupfile.c
index 83e0649f..2ad030f8 100644
--- a/lib/backupfile.c
+++ b/lib/backupfile.c
@@ -1,6 +1,6 @@
 /* backupfile.c -- make Emacs style backup file names
 
-   Copyright (C) 1990-2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 1990-2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/backupfile.h b/lib/backupfile.h
index 43b51d42..e2034c77 100644
--- a/lib/backupfile.h
+++ b/lib/backupfile.h
@@ -1,6 +1,6 @@
 /* backupfile.h -- declarations for making Emacs style backup file names
 
-   Copyright (C) 1990-1992, 1997-1999, 2003-2004, 2009-2013 Free Software
+   Copyright (C) 1990-1992, 1997-1999, 2003-2004, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/base64.c b/lib/base64.c
index 8da969c0..c7f7ac58 100644
--- a/lib/base64.c
+++ b/lib/base64.c
@@ -1,5 +1,5 @@
 /* base64.c -- Encode binary data using printable characters.
-   Copyright (C) 1999-2001, 2004-2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 1999-2001, 2004-2006, 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -59,6 +59,27 @@ to_uchar (char ch)
   return ch;
 }
 
+static const char b64c[64] =
+  "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+/* Base64 encode IN array of size INLEN into OUT array. OUT needs
+   to be of length >= BASE64_LENGTH(INLEN), and INLEN needs to be
+   a multiple of 3.  */
+static void
+base64_encode_fast (const char *restrict in, size_t inlen, char *restrict out)
+{
+  while (inlen)
+    {
+      *out++ = b64c[to_uchar (in[0]) >> 2];
+      *out++ = b64c[((to_uchar (in[0]) << 4) + (to_uchar (in[1]) >> 4)) & 0x3f];
+      *out++ = b64c[((to_uchar (in[1]) << 2) + (to_uchar (in[2]) >> 6)) & 0x3f];
+      *out++ = b64c[to_uchar (in[2]) & 0x3f];
+
+      inlen -= 3;
+      in += 3;
+    }
+}
+
 /* Base64 encode IN array of size INLEN into OUT array of size OUTLEN.
    If OUTLEN is less than BASE64_LENGTH(INLEN), write as many bytes as
    possible.  If OUTLEN is larger than BASE64_LENGTH(INLEN), also zero
@@ -67,28 +88,38 @@ void
 base64_encode (const char *restrict in, size_t inlen,
                char *restrict out, size_t outlen)
 {
-  static const char b64str[64] =
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+  /* Note this outlen constraint can be enforced at compile time.
+     I.E. that the output buffer is exactly large enough to hold
+     the encoded inlen bytes.  The inlen constraints (of corresponding
+     to outlen, and being a multiple of 3) can change at runtime
+     at the end of input.  However the common case when reading
+     large inputs is to have both constraints satisfied, so we depend
+     on both in base_encode_fast().  */
+  if (outlen % 4 == 0 && inlen == outlen / 4 * 3)
+    {
+      base64_encode_fast (in, inlen, out);
+      return;
+    }
 
   while (inlen && outlen)
     {
-      *out++ = b64str[(to_uchar (in[0]) >> 2) & 0x3f];
+      *out++ = b64c[to_uchar (in[0]) >> 2];
       if (!--outlen)
         break;
-      *out++ = b64str[((to_uchar (in[0]) << 4)
+      *out++ = b64c[((to_uchar (in[0]) << 4)
                        + (--inlen ? to_uchar (in[1]) >> 4 : 0))
                       & 0x3f];
       if (!--outlen)
         break;
       *out++ =
         (inlen
-         ? b64str[((to_uchar (in[1]) << 2)
+         ? b64c[((to_uchar (in[1]) << 2)
                    + (--inlen ? to_uchar (in[2]) >> 6 : 0))
                   & 0x3f]
          : '=');
       if (!--outlen)
         break;
-      *out++ = inlen ? b64str[to_uchar (in[2]) & 0x3f] : '=';
+      *out++ = inlen ? b64c[to_uchar (in[2]) & 0x3f] : '=';
       if (!--outlen)
         break;
       if (inlen)
diff --git a/lib/base64.h b/lib/base64.h
index 343150cb..f550cccf 100644
--- a/lib/base64.h
+++ b/lib/base64.h
@@ -1,5 +1,5 @@
 /* base64.h -- Encode binary data using printable characters.
-   Copyright (C) 2004-2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2004-2006, 2009-2014 Free Software Foundation, Inc.
    Written by Simon Josefsson.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib/basename-lgpl.c b/lib/basename-lgpl.c
index 9307e831..cec50e93 100644
--- a/lib/basename-lgpl.c
+++ b/lib/basename-lgpl.c
@@ -1,6 +1,6 @@
 /* basename.c -- return the last element in a file name
 
-   Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2013 Free Software
+   Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/basename.c b/lib/basename.c
index d73fd41a..67d9420a 100644
--- a/lib/basename.c
+++ b/lib/basename.c
@@ -1,6 +1,6 @@
 /* basename.c -- return the last element in a file name
 
-   Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2013 Free Software
+   Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/bitrotate.h b/lib/bitrotate.h
index 9e10a45f..9ec0b47b 100644
--- a/lib/bitrotate.h
+++ b/lib/bitrotate.h
@@ -1,5 +1,5 @@
 /* bitrotate.h - Rotate bits in integers
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
@@ -23,6 +23,9 @@
 #include <stdint.h>
 #include <sys/types.h>
 
+#ifndef _GL_INLINE_HEADER_BEGIN
+ #error "Please include config.h first."
+#endif
 _GL_INLINE_HEADER_BEGIN
 #ifndef BITROTATE_INLINE
 # define BITROTATE_INLINE _GL_INLINE
diff --git a/lib/btowc.c b/lib/btowc.c
index 6c7cbec9..b06ca2e4 100644
--- a/lib/btowc.c
+++ b/lib/btowc.c
@@ -1,5 +1,5 @@
 /* Convert unibyte character to wide character.
-   Copyright (C) 2008, 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2010-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/buffer-lcm.c b/lib/buffer-lcm.c
index 5843452a..d27e1564 100644
--- a/lib/buffer-lcm.c
+++ b/lib/buffer-lcm.c
@@ -1,6 +1,6 @@
 /* buffer-lcm.c - compute a good buffer size for dealing with two files
 
-   Copyright (C) 2002-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/c-ctype.c b/lib/c-ctype.c
index 752d2e32..48c64783 100644
--- a/lib/c-ctype.c
+++ b/lib/c-ctype.c
@@ -1,6 +1,6 @@
 /* Character handling in C locale.
 
-   Copyright 2000-2003, 2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright 2000-2003, 2006, 2009-2014 Free Software Foundation, Inc.
 
 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
diff --git a/lib/c-ctype.h b/lib/c-ctype.h
index 3a66440a..b4652776 100644
--- a/lib/c-ctype.h
+++ b/lib/c-ctype.h
@@ -5,7 +5,7 @@
    <ctype.h> functions' behaviour depends on the current locale set via
    setlocale.
 
-   Copyright (C) 2000-2003, 2006, 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2006, 2008-2014 Free Software Foundation, Inc.
 
 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
@@ -136,7 +136,8 @@ extern int c_tolower (int c) _GL_ATTRIBUTE_CONST;
 extern int c_toupper (int c) _GL_ATTRIBUTE_CONST;
 
 
-#if defined __GNUC__ && defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__ && !defined NO_C_CTYPE_MACROS
+#if (defined __GNUC__ && !defined __STRICT_ANSI__ && defined __OPTIMIZE__ \
+     && !defined __OPTIMIZE_SIZE__ && !defined NO_C_CTYPE_MACROS)
 
 /* ASCII optimizations. */
 
diff --git a/lib/c-strcase.h b/lib/c-strcase.h
index 49e1bb03..8e660441 100644
--- a/lib/c-strcase.h
+++ b/lib/c-strcase.h
@@ -1,5 +1,5 @@
 /* Case-insensitive string comparison functions in C locale.
-   Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2013 Free Software
+   Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib/c-strcasecmp.c b/lib/c-strcasecmp.c
index ef85f0e6..b9b26a4c 100644
--- a/lib/c-strcasecmp.c
+++ b/lib/c-strcasecmp.c
@@ -1,5 +1,5 @@
 /* c-strcasecmp.c -- case insensitive string comparator in C locale
-   Copyright (C) 1998-1999, 2005-2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 2005-2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/c-strcaseeq.h b/lib/c-strcaseeq.h
index afdea26b..5139a30b 100644
--- a/lib/c-strcaseeq.h
+++ b/lib/c-strcaseeq.h
@@ -1,5 +1,5 @@
 /* Optimized case-insensitive string comparison in C locale.
-   Copyright (C) 2001-2002, 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2007, 2009-2014 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
diff --git a/lib/c-strncasecmp.c b/lib/c-strncasecmp.c
index 04404b00..972eb800 100644
--- a/lib/c-strncasecmp.c
+++ b/lib/c-strncasecmp.c
@@ -1,5 +1,5 @@
 /* c-strncasecmp.c -- case insensitive string comparator in C locale
-   Copyright (C) 1998-1999, 2005-2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 2005-2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/c-strtod.c b/lib/c-strtod.c
index 2705a2b5..c1c771c5 100644
--- a/lib/c-strtod.c
+++ b/lib/c-strtod.c
@@ -1,6 +1,6 @@
 /* Convert string to double, using the C locale.
 
-   Copyright (C) 2003-2004, 2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2003-2004, 2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/c-strtod.h b/lib/c-strtod.h
index 140f3469..2460668b 100644
--- a/lib/c-strtod.h
+++ b/lib/c-strtod.h
@@ -1,6 +1,6 @@
 /* Convert string to double, using the C locale.
 
-   Copyright (C) 2003-2004, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2003-2004, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/calloc.c b/lib/calloc.c
index 475d0aea..6fbca8b9 100644
--- a/lib/calloc.c
+++ b/lib/calloc.c
@@ -1,6 +1,6 @@
 /* calloc() function that is glibc compatible.
    This wrapper function is required at least on Tru64 UNIX 5.1 and mingw.
-   Copyright (C) 2004-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2004-2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/canon-host.c b/lib/canon-host.c
index d6106890..862a7010 100644
--- a/lib/canon-host.c
+++ b/lib/canon-host.c
@@ -1,6 +1,6 @@
 /* Host name canonicalization
 
-   Copyright (C) 2005-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
    Written by Derek Price <derek@ximbiot.com>.
 
diff --git a/lib/canon-host.h b/lib/canon-host.h
index c26db6bf..5f564817 100644
--- a/lib/canon-host.h
+++ b/lib/canon-host.h
@@ -1,6 +1,6 @@
 /* Host name canonicalization
 
-   Copyright (C) 2005, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2009-2014 Free Software Foundation, Inc.
 
    Written by Derek Price <derek@ximbiot.com>
 
diff --git a/lib/canonicalize.c b/lib/canonicalize.c
index 6a39a022..2b94ebc0 100644
--- a/lib/canonicalize.c
+++ b/lib/canonicalize.c
@@ -1,5 +1,5 @@
 /* Return the canonical absolute name of a given file.
-   Copyright (C) 1996-2013 Free Software Foundation, Inc.
+   Copyright (C) 1996-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/canonicalize.h b/lib/canonicalize.h
index 41ff311d..5fac1191 100644
--- a/lib/canonicalize.h
+++ b/lib/canonicalize.h
@@ -1,5 +1,5 @@
 /* Return the canonical absolute name of a given file.
-   Copyright (C) 1996-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 1996-2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/careadlinkat.c b/lib/careadlinkat.c
index 1a759be7..b36fea28 100644
--- a/lib/careadlinkat.c
+++ b/lib/careadlinkat.c
@@ -1,6 +1,6 @@
 /* Read symbolic links into a buffer without size limitation, relative to fd.
 
-   Copyright (C) 2001, 2003-2004, 2007, 2009-2013 Free Software Foundation,
+   Copyright (C) 2001, 2003-2004, 2007, 2009-2014 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -24,7 +24,6 @@
 
 #include <errno.h>
 #include <limits.h>
-#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
@@ -39,20 +38,6 @@
 
 #include "allocator.h"
 
-/* Get the symbolic link value of FILENAME and put it into BUFFER, with
-   size BUFFER_SIZE.  This function acts like readlink  but has
-   readlinkat's signature.  */
-ssize_t
-careadlinkatcwd (int fd, char const *filename, char *buffer,
-                 size_t buffer_size)
-{
-  /* FD must be AT_FDCWD here, otherwise the caller is using this
-     function in contexts for which it was not meant for.  */
-  if (fd != AT_FDCWD)
-    abort ();
-  return readlink (filename, buffer, buffer_size);
-}
-
 /* Assuming the current directory is FD, get the symbolic link value
    of FILENAME as a null-terminated string and put it into a buffer.
    If FD is AT_FDCWD, FILENAME is interpreted relative to the current
diff --git a/lib/careadlinkat.h b/lib/careadlinkat.h
index 5cdb813f..704f8159 100644
--- a/lib/careadlinkat.h
+++ b/lib/careadlinkat.h
@@ -1,6 +1,6 @@
 /* Read symbolic links into a buffer without size limitation, relative to fd.
 
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
@@ -52,21 +52,16 @@ char *careadlinkat (int fd, char const *filename,
                     ssize_t (*preadlinkat) (int, char const *,
                                             char *, size_t));
 
-/* Suitable values for careadlinkat's FD and PREADLINKAT arguments,
-   when doing a plain readlink:
-   Pass FD = AT_FDCWD and PREADLINKAT = careadlinkatcwd.  */
+/* Suitable value for careadlinkat's FD argument.  */
 #if HAVE_READLINKAT
 /* AT_FDCWD is declared in <fcntl.h>.  */
 #else
 /* Define AT_FDCWD independently, so that the careadlinkat module does
-   not depend on the fcntl-h module.  The value does not matter, since
-   careadlinkatcwd ignores it, but we might as well use the same value
+   not depend on the fcntl-h module.  We might as well use the same value
    as fcntl-h.  */
 # ifndef AT_FDCWD
 #  define AT_FDCWD (-3041965)
 # endif
 #endif
-ssize_t careadlinkatcwd (int fd, char const *filename,
-                         char *buffer, size_t buffer_size);
 
 #endif /* _GL_CAREADLINKAT_H */
diff --git a/lib/chdir-long.c b/lib/chdir-long.c
index 9c018250..5b1b18fc 100644
--- a/lib/chdir-long.c
+++ b/lib/chdir-long.c
@@ -1,5 +1,5 @@
 /* provide a chdir function that tries not to fail due to ENAMETOOLONG
-   Copyright (C) 2004-2013 Free Software Foundation, Inc.
+   Copyright (C) 2004-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/chdir-long.h b/lib/chdir-long.h
index 26f7706a..4b5b9404 100644
--- a/lib/chdir-long.h
+++ b/lib/chdir-long.h
@@ -1,5 +1,5 @@
 /* provide a chdir function that tries not to fail due to ENAMETOOLONG
-   Copyright (C) 2004-2005, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2004-2005, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/chown.c b/lib/chown.c
index b2121985..691cebe4 100644
--- a/lib/chown.c
+++ b/lib/chown.c
@@ -1,7 +1,7 @@
 /* provide consistent interface to chown for systems that don't interpret
    an ID of -1 as meaning "don't change the corresponding ID".
 
-   Copyright (C) 1997, 2004-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2004-2007, 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -45,11 +45,6 @@ chown (const char *file _GL_UNUSED, uid_t uid _GL_UNUSED,
 /* Below we refer to the system's chown().  */
 # undef chown
 
-/* The results of open() in this file are not used with fchdir,
-   therefore save some unnecessary work in fchdir.c.  */
-# undef open
-# undef close
-
 /* Provide a more-closely POSIX-conforming version of chown on
    systems with one or both of the following problems:
    - chown doesn't treat an ID of -1 as meaning
diff --git a/lib/cloexec.c b/lib/cloexec.c
index e3e42d28..48a0c973 100644
--- a/lib/cloexec.c
+++ b/lib/cloexec.c
@@ -1,6 +1,6 @@
 /* closexec.c - set or clear the close-on-exec descriptor flag
 
-   Copyright (C) 1991, 2004-2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 1991, 2004-2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/cloexec.h b/lib/cloexec.h
index 0c5935ba..6c442dca 100644
--- a/lib/cloexec.h
+++ b/lib/cloexec.h
@@ -1,6 +1,6 @@
 /* closexec.c - set or clear the close-on-exec descriptor flag
 
-   Copyright (C) 2004, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/close-stream.c b/lib/close-stream.c
index d6a86928..87921d42 100644
--- a/lib/close-stream.c
+++ b/lib/close-stream.c
@@ -1,6 +1,6 @@
 /* Close a stream, with nicer error checking than fclose's.
 
-   Copyright (C) 1998-2002, 2004, 2006-2013 Free Software Foundation, Inc.
+   Copyright (C) 1998-2002, 2004, 2006-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/close.c b/lib/close.c
index f620e54b..d7dcb3f1 100644
--- a/lib/close.c
+++ b/lib/close.c
@@ -1,5 +1,5 @@
 /* close replacement.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/closedir.c b/lib/closedir.c
index fa8e2106..940c6f9f 100644
--- a/lib/closedir.c
+++ b/lib/closedir.c
@@ -1,5 +1,5 @@
 /* Stop reading the entries of a directory.
-   Copyright (C) 2006-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/closein.c b/lib/closein.c
index 20d5035e..5b2c9150 100644
--- a/lib/closein.c
+++ b/lib/closein.c
@@ -1,6 +1,6 @@
 /* Close standard input, rewinding seekable stdin if necessary.
 
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/closein.h b/lib/closein.h
index 84bbeefc..1c01156f 100644
--- a/lib/closein.h
+++ b/lib/closein.h
@@ -1,6 +1,6 @@
 /* Close standard input, rewinding seekable stdin if necessary.
 
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/closeout.c b/lib/closeout.c
index d4d3edca..674db787 100644
--- a/lib/closeout.c
+++ b/lib/closeout.c
@@ -1,6 +1,6 @@
 /* Close standard output and standard error, exiting with a diagnostic on error.
 
-   Copyright (C) 1998-2002, 2004, 2006, 2008-2013 Free Software Foundation,
+   Copyright (C) 1998-2002, 2004, 2006, 2008-2014 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/closeout.h b/lib/closeout.h
index 131fe864..28d80ea5 100644
--- a/lib/closeout.h
+++ b/lib/closeout.h
@@ -1,6 +1,6 @@
 /* Close standard output and standard error.
 
-   Copyright (C) 1998, 2000, 2003-2004, 2006, 2008-2013 Free Software
+   Copyright (C) 1998, 2000, 2003-2004, 2006, 2008-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/config.charset b/lib/config.charset
index a991419c..289bc44e 100644
--- a/lib/config.charset
+++ b/lib/config.charset
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Output a system dependent table of character encoding aliases.
 #
-#   Copyright (C) 2000-2004, 2006-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2000-2004, 2006-2014 Free Software Foundation, Inc.
 #
 #   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
diff --git a/lib/config.hin b/lib/config.hin
index e59c4149..ce408318 100644
--- a/lib/config.hin
+++ b/lib/config.hin
@@ -41,12 +41,12 @@
 /* Define to 1 if chown mishandles trailing slash. */
 #undef CHOWN_TRAILING_SLASH_BUG
 
-/* Define to one of '_getb67', 'GETB67', 'getb67' for Cray-2 and Cray-YMP
-   systems. This function is required for 'alloca.c' support on those systems.
+/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
+   systems. This function is required for `alloca.c' support on those systems.
    */
 #undef CRAY_STACKSEG_END
 
-/* Define to 1 if using 'alloca.c'. */
+/* Define to 1 if using `alloca.c'. */
 #undef C_ALLOCA
 
 /* Define as the bit index in the word where to find bit 0 of the exponent of
@@ -143,6 +143,10 @@
 /* Define to 1 if the system's ftello function has the Solaris bug. */
 #undef FTELLO_BROKEN_AFTER_SWITCHING_FROM_READ_TO_WRITE
 
+/* Define to 1 if fflush is known to work on stdin as per POSIX.1-2008, 0 if
+   fflush is known to not work, -1 if unknown. */
+#undef FUNC_FFLUSH_STDIN
+
 /* Define to 1 if mkdir mistakenly creates a directory given with a trailing
    dot component. */
 #undef FUNC_MKDIR_DOT_BUG
@@ -252,6 +256,10 @@
 #undef GNULIB_GETCWD
 
 /* Define to a C preprocessor expression that evaluates to 1 or 0, depending
+   whether the gnulib module lock shall be considered present. */
+#undef GNULIB_LOCK
+
+/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
    whether the gnulib module malloc-gnu shall be considered present. */
 #undef GNULIB_MALLOC_GNU
 
@@ -263,14 +271,14 @@
    whether the gnulib module openat-safer shall be considered present. */
 #undef GNULIB_OPENAT_SAFER
 
-/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
-   whether the gnulib module pipe2-safer shall be considered present. */
-#undef GNULIB_PIPE2_SAFER
-
 /* enable some gnulib portability checks */
 #undef GNULIB_PORTCHECK
 
 /* Define to a C preprocessor expression that evaluates to 1 or 0, depending
+   whether the gnulib module pthread shall be considered present. */
+#undef GNULIB_PTHREAD
+
+/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
    whether the gnulib module realloc-gnu shall be considered present. */
 #undef GNULIB_REALLOC_GNU
 
@@ -558,57 +566,12 @@
 /* Define to 1 when the gnulib module pipe should be tested. */
 #undef GNULIB_TEST_PIPE
 
-/* Define to 1 when the gnulib module pipe2 should be tested. */
-#undef GNULIB_TEST_PIPE2
-
-/* Define to 1 when the gnulib module posix_spawnattr_destroy should be
-   tested. */
-#undef GNULIB_TEST_POSIX_SPAWNATTR_DESTROY
-
-/* Define to 1 when the gnulib module posix_spawnattr_init should be tested.
-   */
-#undef GNULIB_TEST_POSIX_SPAWNATTR_INIT
-
-/* Define to 1 when the gnulib module posix_spawnattr_setflags should be
-   tested. */
-#undef GNULIB_TEST_POSIX_SPAWNATTR_SETFLAGS
-
-/* Define to 1 when the gnulib module posix_spawnattr_setsigmask should be
-   tested. */
-#undef GNULIB_TEST_POSIX_SPAWNATTR_SETSIGMASK
-
-/* Define to 1 when the gnulib module posix_spawnp should be tested. */
-#undef GNULIB_TEST_POSIX_SPAWNP
-
-/* Define to 1 when the gnulib module posix_spawn_file_actions_addclose should
-   be tested. */
-#undef GNULIB_TEST_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE
-
-/* Define to 1 when the gnulib module posix_spawn_file_actions_adddup2 should
-   be tested. */
-#undef GNULIB_TEST_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2
-
-/* Define to 1 when the gnulib module posix_spawn_file_actions_addopen should
-   be tested. */
-#undef GNULIB_TEST_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN
-
-/* Define to 1 when the gnulib module posix_spawn_file_actions_destroy should
-   be tested. */
-#undef GNULIB_TEST_POSIX_SPAWN_FILE_ACTIONS_DESTROY
-
-/* Define to 1 when the gnulib module posix_spawn_file_actions_init should be
-   tested. */
-#undef GNULIB_TEST_POSIX_SPAWN_FILE_ACTIONS_INIT
-
 /* Define to 1 when the gnulib module putenv should be tested. */
 #undef GNULIB_TEST_PUTENV
 
 /* Define to 1 when the gnulib module raise should be tested. */
 #undef GNULIB_TEST_RAISE
 
-/* Define to 1 when the gnulib module rawmemchr should be tested. */
-#undef GNULIB_TEST_RAWMEMCHR
-
 /* Define to 1 when the gnulib module read should be tested. */
 #undef GNULIB_TEST_READ
 
@@ -639,6 +602,9 @@
 /* Define to 1 when the gnulib module rpmatch should be tested. */
 #undef GNULIB_TEST_RPMATCH
 
+/* Define to 1 when the gnulib module secure_getenv should be tested. */
+#undef GNULIB_TEST_SECURE_GETENV
+
 /* Define to 1 when the gnulib module select should be tested. */
 #undef GNULIB_TEST_SELECT
 
@@ -678,9 +644,6 @@
 /* Define to 1 when the gnulib module stpncpy should be tested. */
 #undef GNULIB_TEST_STPNCPY
 
-/* Define to 1 when the gnulib module strchrnul should be tested. */
-#undef GNULIB_TEST_STRCHRNUL
-
 /* Define to 1 when the gnulib module strdup should be tested. */
 #undef GNULIB_TEST_STRDUP
 
@@ -735,9 +698,6 @@
 /* Define to 1 when the gnulib module unsetenv should be tested. */
 #undef GNULIB_TEST_UNSETENV
 
-/* Define to 1 when the gnulib module usleep should be tested. */
-#undef GNULIB_TEST_USLEEP
-
 /* Define to 1 when the gnulib module utimensat should be tested. */
 #undef GNULIB_TEST_UTIMENSAT
 
@@ -750,9 +710,6 @@
 /* Define to 1 when the gnulib module vprintf-posix should be tested. */
 #undef GNULIB_TEST_VPRINTF_POSIX
 
-/* Define to 1 when the gnulib module waitpid should be tested. */
-#undef GNULIB_TEST_WAITPID
-
 /* Define to 1 when the gnulib module wcrtomb should be tested. */
 #undef GNULIB_TEST_WCRTOMB
 
@@ -861,9 +818,6 @@
 /* Define to 1 if the ACL type ACL_TYPE_EXTENDED exists. */
 #undef HAVE_ACL_TYPE_EXTENDED
 
-/* Define to 1 if you have the `alarm' function. */
-#undef HAVE_ALARM
-
 /* Define to 1 if you have 'alloca' after including <alloca.h>, a header that
    may be supplied by this distribution. */
 #undef HAVE_ALLOCA
@@ -944,9 +898,6 @@
 /* Define if you have compound literals. */
 #undef HAVE_COMPOUND_LITERALS
 
-/* Define to 1 if you have the `confstr' function. */
-#undef HAVE_CONFSTR
-
 /* Define if the copysignf function is declared in <math.h> and available in
    libc. */
 #undef HAVE_COPYSIGNF_IN_LIBC
@@ -1290,6 +1241,10 @@
    don't. */
 #undef HAVE_DECL_WCWIDTH
 
+/* Define to 1 if you have the declaration of `_putenv', and to 0 if you
+   don't. */
+#undef HAVE_DECL__PUTENV
+
 /* Define to 1 if you have the declaration of `_snprintf', and to 0 if you
    don't. */
 #undef HAVE_DECL__SNPRINTF
@@ -1425,6 +1380,9 @@
 /* Define to 1 if you have the `getacl' function. */
 #undef HAVE_GETACL
 
+/* Define to 1 if you have the `getattrat' function. */
+#undef HAVE_GETATTRAT
+
 /* Define to 1 if you have the `getdelim' function. */
 #undef HAVE_GETDELIM
 
@@ -1497,6 +1455,9 @@
 /* Define if you have GNU libgmp (or replacement) */
 #undef HAVE_GMP
 
+/* Define to 1 if you have the <gmp.h> header file. */
+#undef HAVE_GMP_H
+
 /* Define to 1 if you have the <grp.h> header file. */
 #undef HAVE_GRP_H
 
@@ -1569,6 +1530,9 @@
 /* Define if the isnan(long double) function is available in libc. */
 #undef HAVE_ISNANL_IN_LIBC
 
+/* Define to 1 if you have the `issetugid' function. */
+#undef HAVE_ISSETUGID
+
 /* Define to 1 if you have the `iswblank' function. */
 #undef HAVE_ISWBLANK
 
@@ -1657,6 +1621,9 @@
    to 0 otherwise. */
 #undef HAVE_MALLOC_GNU
 
+/* Define to 1 if you have the <malloc.h> header file. */
+#undef HAVE_MALLOC_H
+
 /* Define if the 'malloc' function is POSIX compliant. */
 #undef HAVE_MALLOC_POSIX
 
@@ -1716,6 +1683,9 @@
 /* Define to 1 if you have the <mntent.h> header file. */
 #undef HAVE_MNTENT_H
 
+/* Define to 1 if you have the `mode_to_security_class' function. */
+#undef HAVE_MODE_TO_SECURITY_CLASS
+
 /* Define to 1 if you have the `mprotect' function. */
 #undef HAVE_MPROTECT
 
@@ -1765,6 +1735,18 @@
 /* Define to 1 if you have the `opendir' function. */
 #undef HAVE_OPENDIR
 
+/* Define to 1 if libcrypto is used for MD5. */
+#undef HAVE_OPENSSL_MD5
+
+/* Define to 1 if libcrypto is used for SHA1. */
+#undef HAVE_OPENSSL_SHA1
+
+/* Define to 1 if libcrypto is used for SHA256. */
+#undef HAVE_OPENSSL_SHA256
+
+/* Define to 1 if libcrypto is used for SHA512. */
+#undef HAVE_OPENSSL_SHA512
+
 /* Define to 1 if you have the <OS.h> header file. */
 #undef HAVE_OS_H
 
@@ -1781,21 +1763,9 @@
 /* Define to 1 if you have the `pipe' function. */
 #undef HAVE_PIPE
 
-/* Define to 1 if you have the `pipe2' function. */
-#undef HAVE_PIPE2
-
 /* Define to 1 if you have the `posix_fadvise' function. */
 #undef HAVE_POSIX_FADVISE
 
-/* Define to 1 if you have the `posix_spawn' function. */
-#undef HAVE_POSIX_SPAWN
-
-/* Define to 1 if the system has the type `posix_spawnattr_t'. */
-#undef HAVE_POSIX_SPAWNATTR_T
-
-/* Define to 1 if the system has the type `posix_spawn_file_actions_t'. */
-#undef HAVE_POSIX_SPAWN_FILE_ACTIONS_T
-
 /* Define to 1 if you have the `prctl' function. */
 #undef HAVE_PRCTL
 
@@ -1835,9 +1805,6 @@
 /* Define to 1 if you have the `raise' function. */
 #undef HAVE_RAISE
 
-/* Define to 1 if you have the `rawmemchr' function. */
-#undef HAVE_RAWMEMCHR
-
 /* Define to 1 if you have the `readdir' function. */
 #undef HAVE_READDIR
 
@@ -1884,15 +1851,12 @@
 /* Define to 1 if you have the <sched.h> header file. */
 #undef HAVE_SCHED_H
 
-/* Define to 1 if you have the `sched_setparam' function. */
-#undef HAVE_SCHED_SETPARAM
-
-/* Define to 1 if you have the `sched_setscheduler' function. */
-#undef HAVE_SCHED_SETSCHEDULER
-
 /* Define to 1 if you have the <search.h> header file. */
 #undef HAVE_SEARCH_H
 
+/* Define to 1 if you have the `secure_getenv' function. */
+#undef HAVE_SECURE_GETENV
+
 /* Define to 1 if you have the <selinux/context.h> header file. */
 #undef HAVE_SELINUX_CONTEXT_H
 
@@ -1902,15 +1866,12 @@
 /* Define to 1 if you have the <selinux/selinux.h> header file. */
 #undef HAVE_SELINUX_SELINUX_H
 
-/* Define to 1 if you have the `setegid' function. */
-#undef HAVE_SETEGID
+/* Define to 1 if you have the `setdtablesize' function. */
+#undef HAVE_SETDTABLESIZE
 
 /* Define to 1 if you have the `setenv' function. */
 #undef HAVE_SETENV
 
-/* Define to 1 if you have the `seteuid' function. */
-#undef HAVE_SETEUID
-
 /* Define to 1 if you have the `setgroups' function. */
 #undef HAVE_SETGROUPS
 
@@ -1956,12 +1917,12 @@
 /* Define to 1 if the system has the type `sigset_t'. */
 #undef HAVE_SIGSET_T
 
-/* Define to 1 if the system has the type `sig_atomic_t'. */
-#undef HAVE_SIG_ATOMIC_T
-
 /* Define to 1 if you have the `sleep' function. */
 #undef HAVE_SLEEP
 
+/* libsmack usability */
+#undef HAVE_SMACK
+
 /* Define to 1 if you have the `snprintf' function. */
 #undef HAVE_SNPRINTF
 
@@ -1970,9 +1931,6 @@
    buffer had been large enough. */
 #undef HAVE_SNPRINTF_RETVAL_C99
 
-/* Define to 1 if you have the <spawn.h> header file. */
-#undef HAVE_SPAWN_H
-
 /* Define to 1 if you have the `statacl' function. */
 #undef HAVE_STATACL
 
@@ -2001,9 +1959,6 @@
 /* Define if you have the stpncpy() function and it works. */
 #undef HAVE_STPNCPY
 
-/* Define to 1 if you have the `strchrnul' function. */
-#undef HAVE_STRCHRNUL
-
 /* Define to 1 if you have the `strdup' function. */
 #undef HAVE_STRDUP
 
@@ -2131,6 +2086,9 @@
 /* Define to 1 if `st_blocks' is a member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BLOCKS
 
+/* Define to 1 if `mem_unit' is a member of `struct sysinfo'. */
+#undef HAVE_STRUCT_SYSINFO_MEM_UNIT
+
 /* Define to 1 if `tm_zone' is a member of `struct tm'. */
 #undef HAVE_STRUCT_TM_TM_ZONE
 
@@ -2362,6 +2320,9 @@
 /* Define to 1 if you have the `tsearch' function. */
 #undef HAVE_TSEARCH
 
+/* Define to 1 if you have the `ttyname' function. */
+#undef HAVE_TTYNAME
+
 /* Define to 1 if you don't have `tm_zone' but do have the external array
    `tzname'. */
 #undef HAVE_TZNAME
@@ -2387,9 +2348,6 @@
 /* Define to 1 if you have the `uselocale' function. */
 #undef HAVE_USELOCALE
 
-/* Define to 1 if you have the `usleep' function. */
-#undef HAVE_USLEEP
-
 /* Define to 1 if you have the `utimensat' function. */
 #undef HAVE_UTIMENSAT
 
@@ -2423,9 +2381,6 @@
 /* Define to 1 if you have the <vfork.h> header file. */
 #undef HAVE_VFORK_H
 
-/* Define to 1 if you have the `waitid' function. */
-#undef HAVE_WAITID
-
 /* Define to 1 if you have the <wchar.h> header file. */
 #undef HAVE_WCHAR_H
 
@@ -2435,9 +2390,6 @@
 /* Define to 1 if you have the `wcrtomb' function. */
 #undef HAVE_WCRTOMB
 
-/* Define to 1 if you have the `wcscoll' function. */
-#undef HAVE_WCSCOLL
-
 /* Define to 1 if you have the `wcslen' function. */
 #undef HAVE_WCSLEN
 
@@ -2484,10 +2436,6 @@
 /* Define to 1 if O_NOFOLLOW works. */
 #undef HAVE_WORKING_O_NOFOLLOW
 
-/* Define if you have the posix_spawn and posix_spawnp functions and they
-   work. */
-#undef HAVE_WORKING_POSIX_SPAWN
-
 /* Define if utimes works properly. */
 #undef HAVE_WORKING_UTIMES
 
@@ -2519,9 +2467,6 @@
    member named physmem. */
 #undef HAVE__SYSTEM_CONFIGURATION
 
-/* Define to 1 if you have the `__fpending' function. */
-#undef HAVE___FPENDING
-
 /* Define to 1 if you have the `__fpurge' function. */
 #undef HAVE___FPURGE
 
@@ -2543,6 +2488,9 @@
 /* Define to 1 if you have the `__fsetlocking' function. */
 #undef HAVE___FSETLOCKING
 
+/* Define to 1 if you have the `__secure_getenv' function. */
+#undef HAVE___SECURE_GETENV
+
 /* Define to 1 if you have the `__xpg_strerror_r' function. */
 #undef HAVE___XPG_STRERROR_R
 
@@ -2605,6 +2553,10 @@
 /* Define to a substitute value for mmap()'s MAP_ANONYMOUS flag. */
 #undef MAP_ANONYMOUS
 
+/* Define if the mbrtowc function does not return (size_t) -2 for empty input.
+   */
+#undef MBRTOWC_EMPTY_INPUT_BUG
+
 /* Define if the mbrtowc function has the NULL pwc argument bug. */
 #undef MBRTOWC_NULL_ARG1_BUG
 
@@ -2727,9 +2679,6 @@
    large precisions without arbitrary bounds. */
 #undef NEED_PRINTF_UNBOUNDED_PRECISION
 
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
 /* Define to 1 if the nlist n_name member is a pointer */
 #undef N_NAME_POINTER
 
@@ -2861,9 +2810,9 @@
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
    automatically deduced at runtime.
-        STACK_DIRECTION > 0 => grows toward higher addresses
-        STACK_DIRECTION < 0 => grows toward lower addresses
-        STACK_DIRECTION = 0 => direction of growth unknown */
+	STACK_DIRECTION > 0 => grows toward higher addresses
+	STACK_DIRECTION < 0 => grows toward lower addresses
+	STACK_DIRECTION = 0 => direction of growth unknown */
 #undef STACK_DIRECTION
 
 /* Define if the block counts reported by statfs may be truncated to 2GB and
@@ -2981,6 +2930,38 @@
    made weak. */
 #undef USE_SOLARIS_THREADS_WEAK
 
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable general extensions on OS X.  */
+#ifndef _DARWIN_C_SOURCE
+# undef _DARWIN_C_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable X/Open extensions if necessary.  HP-UX 11.11 defines
+   mbstate_t only if _XOPEN_SOURCE is defined to 500, regardless of
+   whether compiling with -Ae or -D_HPUX_SOURCE=1.  */
+#ifndef _XOPEN_SOURCE
+# undef _XOPEN_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
 /* Define to 1 if you want getc etc. to use unlocked I/O if available.
    Unlocked I/O can improve performance in unithreaded apps, but it is not
    safe for multithreaded apps. */
@@ -3046,6 +3027,9 @@
 /* Define to 1 if on MINIX. */
 #undef _MINIX
 
+/* Define to 1 to make NetBSD features available. MINIX 3 needs this. */
+#undef _NETBSD_SOURCE
+
 /* The _Noreturn keyword of C11.  */
 #if ! (defined _Noreturn \
        || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__))
@@ -3071,6 +3055,9 @@
 /* Define to 1 if you need to in order for 'stat' and other things to work. */
 #undef _POSIX_SOURCE
 
+/* For thread-safety on OSF/1, Solaris. */
+#undef _REENTRANT
+
 /* Define if you want <regex.h> to include <limits.h>, so that it consistently
    overrides <limits.h>'s RE_DUP_MAX. */
 #undef _REGEX_INCLUDE_LIMITS_H
@@ -3078,67 +3065,59 @@
 /* Define if you want regoff_t to be at least as wide POSIX requires. */
 #undef _REGEX_LARGE_OFFSETS
 
-/* Define to 500 only on HP-UX. */
-#undef _XOPEN_SOURCE
-
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-/* Enable general extensions on Mac OS X.  */
-#ifndef _DARWIN_C_SOURCE
-# undef _DARWIN_C_SOURCE
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-
+/* For thread-safety on AIX, FreeBSD. */
+#undef _THREAD_SAFE
 
 /* Define to rpl_ if the getopt replacement functions and variables should be
    used. */
 #undef __GETOPT_PREFIX
 
-/* _GL_INLINE is a portable alternative to ISO C99 plain 'inline'.
-   _GL_EXTERN_INLINE is a portable alternative to 'extern inline'.
-   _GL_INLINE_HEADER_BEGIN contains useful stuff to put
-     in an include file, before uses of _GL_INLINE.
-     It suppresses GCC's bogus "no previous prototype for 'FOO'" diagnostic,
-     when FOO is an inline function in the header; see
-     <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113>.
-   _GL_INLINE_HEADER_END contains useful stuff to put
-     in the same include file, after uses of _GL_INLINE.
+/* Please see the Gnulib manual for how to use these macros.
 
-   Suppress the use of extern inline on Apple's platforms,
-   as Libc-825.25 (2012-09-19) is incompatible with it; see
+   Suppress extern inline with HP-UX cc, as it appears to be broken; see
+   <http://lists.gnu.org/archive/html/bug-texinfo/2013-02/msg00030.html>.
+
+   Suppress extern inline with Sun C in standards-conformance mode, as it
+   mishandles inline functions that call each other.  E.g., for 'inline void f
+   (void) { } inline void g (void) { f (); }', c99 incorrectly complains
+   'reference to static identifier "f" in extern inline function'.
+   This bug was observed with Sun C 5.12 SunOS_i386 2011/11/16.
+
+   Suppress the use of extern inline on problematic Apple configurations.
+   OS X 10.8 and earlier mishandle it; see, e.g.,
    <http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html>.
+   OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and
+   for clang but remains for g++; see <http://trac.macports.org/ticket/41033>.
    Perhaps Apple will fix this some day.  */
+#if (defined __APPLE__ \
+     && (defined __header_inline \
+         ? (defined __cplusplus && defined __GNUC_STDC_INLINE__ \
+            && ! defined __clang__) \
+         : ((! defined _DONT_USE_CTYPE_INLINE_ \
+             && (defined __GNUC__ || defined __cplusplus)) \
+            || (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \
+                && defined __GNUC__ && ! defined __cplusplus))))
+# define _GL_EXTERN_INLINE_APPLE_BUG
+#endif
 #if ((__GNUC__ \
       ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
-      : 199901L <= __STDC_VERSION__) \
-     && !defined __APPLE__)
+      : (199901L <= __STDC_VERSION__ \
+         && !defined __HP_cc \
+         && !(defined __SUNPRO_C && __STDC__))) \
+     && !defined _GL_EXTERN_INLINE_APPLE_BUG)
 # define _GL_INLINE inline
 # define _GL_EXTERN_INLINE extern inline
-#elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __APPLE__
-# if __GNUC_GNU_INLINE__
+# define _GL_EXTERN_INLINE_IN_USE
+#elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \
+       && !defined _GL_EXTERN_INLINE_APPLE_BUG)
+# if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__
    /* __gnu_inline__ suppresses a GCC 4.2 diagnostic.  */
 #  define _GL_INLINE extern inline __attribute__ ((__gnu_inline__))
 # else
 #  define _GL_INLINE extern inline
 # endif
 # define _GL_EXTERN_INLINE extern
+# define _GL_EXTERN_INLINE_IN_USE
 #else
 # define _GL_INLINE static _GL_UNUSED
 # define _GL_EXTERN_INLINE static _GL_UNUSED
@@ -3151,6 +3130,10 @@
 #  define _GL_INLINE_HEADER_CONST_PRAGMA \
      _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"")
 # endif
+  /* Suppress GCC's bogus "no previous prototype for 'FOO'"
+     and "no previous declaration for 'FOO'"  diagnostics,
+     when FOO is an inline function in the header; see
+     <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113>.  */
 # define _GL_INLINE_HEADER_BEGIN \
     _Pragma ("GCC diagnostic push") \
     _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \
@@ -3181,9 +3164,6 @@
 /* A replacement for va_copy, if needed.  */
 #define gl_va_copy(a,b) ((a) = (b))
 
-/* Define to rpl_gmtime if the replacement function should be used. */
-#undef gmtime
-
 /* Define to `__inline__' or `__inline' if that's what the C compiler
    calls it, or to nothing if 'inline' is not supported under any name.  */
 #ifndef __cplusplus
@@ -3212,9 +3192,6 @@
 /* Define to 1 if the compiler is checking for lint. */
 #undef lint
 
-/* Define to rpl_localtime if the replacement function should be used. */
-#undef localtime
-
 /* Define to `unsigned int' if <sys/types.h> does not define. */
 #undef major_t
 
@@ -3302,10 +3279,6 @@
 # define __restrict__
 #endif
 
-/* Define as an integer type suitable for memory locations that can be
-   accessed atomically even in the presence of asynchronous signals. */
-#undef sig_atomic_t
-
 /* Define to `unsigned int' if <sys/types.h> does not define. */
 #undef size_t
 
@@ -3333,6 +3306,16 @@
    is a misnomer outside of parameter lists.  */
 #define _UNUSED_PARAMETER_ _GL_UNUSED
 
+/* gcc supports the "unused" attribute on possibly unused labels, and
+   g++ has since version 4.5.  Note to support C++ as well as C,
+   _GL_UNUSED_LABEL should be used with a trailing ;  */
+#if !defined __cplusplus || __GNUC__ > 4 \
+    || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
+# define _GL_UNUSED_LABEL _GL_UNUSED
+#else
+# define _GL_UNUSED_LABEL
+#endif
+
 /* The __pure__ attribute was added in gcc 2.96.  */
 #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
 # define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
@@ -3348,9 +3331,6 @@
 #endif
 
 
-/* Define to an unsigned 32-bit type if <sys/types.h> lacks this type. */
-#undef useconds_t
-
 /* Define as a macro for copying va_list variables. */
 #undef va_copy
 
diff --git a/lib/copy-acl.c b/lib/copy-acl.c
index 58ff54ae..eebb359b 100644
--- a/lib/copy-acl.c
+++ b/lib/copy-acl.c
@@ -1,6 +1,6 @@
 /* copy-acl.c - copy access control list from one file to another file
 
-   Copyright (C) 2002-2003, 2005-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2014 Free Software Foundation, Inc.
 
    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
@@ -21,8 +21,10 @@
 
 #include "acl.h"
 
-#include "acl-internal.h"
+#include <errno.h>
 
+#include "quote.h"
+#include "error.h"
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
@@ -34,565 +36,6 @@
    If access control lists are not available, fchmod the target file to
    MODE.  Also sets the non-permission bits of the destination file
    (S_ISUID, S_ISGID, S_ISVTX) to those from MODE if any are set.
-   Return 0 if successful.
-   Return -2 and set errno for an error relating to the source file.
-   Return -1 and set errno for an error relating to the destination file.  */
-
-int
-qcopy_acl (const char *src_name, int source_desc, const char *dst_name,
-           int dest_desc, mode_t mode)
-{
-#if USE_ACL && HAVE_ACL_GET_FILE
-  /* POSIX 1003.1e (draft 17 -- abandoned) specific version.  */
-  /* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */
-# if !HAVE_ACL_TYPE_EXTENDED
-  /* Linux, FreeBSD, IRIX, Tru64 */
-
-  acl_t acl;
-  int ret;
-
-  if (HAVE_ACL_GET_FD && source_desc != -1)
-    acl = acl_get_fd (source_desc);
-  else
-    acl = acl_get_file (src_name, ACL_TYPE_ACCESS);
-  if (acl == NULL)
-    {
-      if (ACL_NOT_WELL_SUPPORTED (errno))
-        return qset_acl (dst_name, dest_desc, mode);
-      else
-        return -2;
-    }
-
-  if (HAVE_ACL_SET_FD && dest_desc != -1)
-    ret = acl_set_fd (dest_desc, acl);
-  else
-    ret = acl_set_file (dst_name, ACL_TYPE_ACCESS, acl);
-  if (ret != 0)
-    {
-      int saved_errno = errno;
-
-      if (ACL_NOT_WELL_SUPPORTED (errno) && !acl_access_nontrivial (acl))
-        {
-          acl_free (acl);
-          return chmod_or_fchmod (dst_name, dest_desc, mode);
-        }
-      else
-        {
-          acl_free (acl);
-          chmod_or_fchmod (dst_name, dest_desc, mode);
-          errno = saved_errno;
-          return -1;
-        }
-    }
-  else
-    acl_free (acl);
-
-  if (!MODE_INSIDE_ACL || (mode & (S_ISUID | S_ISGID | S_ISVTX)))
-    {
-      /* We did not call chmod so far, and either the mode and the ACL are
-         separate or special bits are to be set which don't fit into ACLs.  */
-
-      if (chmod_or_fchmod (dst_name, dest_desc, mode) != 0)
-        return -1;
-    }
-
-  if (S_ISDIR (mode))
-    {
-      acl = acl_get_file (src_name, ACL_TYPE_DEFAULT);
-      if (acl == NULL)
-        return -2;
-
-      if (acl_set_file (dst_name, ACL_TYPE_DEFAULT, acl))
-        {
-          int saved_errno = errno;
-
-          acl_free (acl);
-          errno = saved_errno;
-          return -1;
-        }
-      else
-        acl_free (acl);
-    }
-  return 0;
-
-# else /* HAVE_ACL_TYPE_EXTENDED */
-  /* Mac OS X */
-
-  /* On Mac OS X,  acl_get_file (name, ACL_TYPE_ACCESS)
-     and           acl_get_file (name, ACL_TYPE_DEFAULT)
-     always return NULL / EINVAL.  You have to use
-                   acl_get_file (name, ACL_TYPE_EXTENDED)
-     or            acl_get_fd (open (name, ...))
-     to retrieve an ACL.
-     On the other hand,
-                   acl_set_file (name, ACL_TYPE_ACCESS, acl)
-     and           acl_set_file (name, ACL_TYPE_DEFAULT, acl)
-     have the same effect as
-                   acl_set_file (name, ACL_TYPE_EXTENDED, acl):
-     Each of these calls sets the file's ACL.  */
-
-  acl_t acl;
-  int ret;
-
-  if (HAVE_ACL_GET_FD && source_desc != -1)
-    acl = acl_get_fd (source_desc);
-  else
-    acl = acl_get_file (src_name, ACL_TYPE_EXTENDED);
-  if (acl == NULL)
-    {
-      if (ACL_NOT_WELL_SUPPORTED (errno))
-        return qset_acl (dst_name, dest_desc, mode);
-      else
-        return -2;
-    }
-
-  if (HAVE_ACL_SET_FD && dest_desc != -1)
-    ret = acl_set_fd (dest_desc, acl);
-  else
-    ret = acl_set_file (dst_name, ACL_TYPE_EXTENDED, acl);
-  if (ret != 0)
-    {
-      int saved_errno = errno;
-
-      if (ACL_NOT_WELL_SUPPORTED (errno) && !acl_extended_nontrivial (acl))
-        {
-          acl_free (acl);
-          return chmod_or_fchmod (dst_name, dest_desc, mode);
-        }
-      else
-        {
-          acl_free (acl);
-          chmod_or_fchmod (dst_name, dest_desc, mode);
-          errno = saved_errno;
-          return -1;
-        }
-    }
-  else
-    acl_free (acl);
-
-  /* Since !MODE_INSIDE_ACL, we have to call chmod explicitly.  */
-  return chmod_or_fchmod (dst_name, dest_desc, mode);
-
-# endif
-
-#elif USE_ACL && defined GETACL /* Solaris, Cygwin, not HP-UX */
-
-  /* Solaris 2.5 through Solaris 10, Cygwin, and contemporaneous versions
-     of Unixware.  The acl() call returns the access and default ACL both
-     at once.  */
-# ifdef ACE_GETACL
-  int ace_count;
-  ace_t *ace_entries;
-# endif
-  int count;
-  aclent_t *entries;
-  int did_chmod;
-  int saved_errno;
-  int ret;
-
-# ifdef ACE_GETACL
-  /* Solaris also has a different variant of ACLs, used in ZFS and NFSv4
-     file systems (whereas the other ones are used in UFS file systems).
-     There is an API
-       pathconf (name, _PC_ACL_ENABLED)
-       fpathconf (desc, _PC_ACL_ENABLED)
-     that allows to determine which of the two kinds of ACLs is supported
-     for the given file.  But some file systems may implement this call
-     incorrectly, so better not use it.
-     When fetching the source ACL, we simply fetch both ACL types.
-     When setting the destination ACL, we try either ACL types, assuming
-     that the kernel will translate the ACL from one form to the other.
-     (See in <http://docs.sun.com/app/docs/doc/819-2241/6n4huc7ia?l=en&a=view>
-     the description of ENOTSUP.)  */
-  for (;;)
-    {
-      ace_count = (source_desc != -1
-                   ? facl (source_desc, ACE_GETACLCNT, 0, NULL)
-                   : acl (src_name, ACE_GETACLCNT, 0, NULL));
-
-      if (ace_count < 0)
-        {
-          if (errno == ENOSYS || errno == EINVAL)
-            {
-              ace_count = 0;
-              ace_entries = NULL;
-              break;
-            }
-          else
-            return -2;
-        }
-
-      if (ace_count == 0)
-        {
-          ace_entries = NULL;
-          break;
-        }
-
-      ace_entries = (ace_t *) malloc (ace_count * sizeof (ace_t));
-      if (ace_entries == NULL)
-        {
-          errno = ENOMEM;
-          return -2;
-        }
-
-      ret = (source_desc != -1
-             ? facl (source_desc, ACE_GETACL, ace_count, ace_entries)
-             : acl (src_name, ACE_GETACL, ace_count, ace_entries));
-      if (ret < 0)
-        {
-          free (ace_entries);
-          if (errno == ENOSYS || errno == EINVAL)
-            {
-              ace_count = 0;
-              ace_entries = NULL;
-              break;
-            }
-          else
-            return -2;
-        }
-      if (ret == ace_count)
-        break;
-      /* Huh? The number of ACL entries changed since the last call.
-         Repeat.  */
-    }
-# endif
-
-  for (;;)
-    {
-      count = (source_desc != -1
-               ? facl (source_desc, GETACLCNT, 0, NULL)
-               : acl (src_name, GETACLCNT, 0, NULL));
-
-      if (count < 0)
-        {
-          if (errno == ENOSYS || errno == ENOTSUP || errno == EOPNOTSUPP)
-            {
-              count = 0;
-              entries = NULL;
-              break;
-            }
-          else
-            return -2;
-        }
-
-      if (count == 0)
-        {
-          entries = NULL;
-          break;
-        }
-
-      entries = (aclent_t *) malloc (count * sizeof (aclent_t));
-      if (entries == NULL)
-        {
-          errno = ENOMEM;
-          return -2;
-        }
-
-      if ((source_desc != -1
-           ? facl (source_desc, GETACL, count, entries)
-           : acl (src_name, GETACL, count, entries))
-          == count)
-        break;
-      /* Huh? The number of ACL entries changed since the last call.
-         Repeat.  */
-    }
-
-  /* Is there an ACL of either kind?  */
-# ifdef ACE_GETACL
-  if (ace_count == 0)
-# endif
-    if (count == 0)
-      return qset_acl (dst_name, dest_desc, mode);
-
-  did_chmod = 0; /* set to 1 once the mode bits in 0777 have been set */
-  saved_errno = 0; /* the first non-ignorable error code */
-
-  if (!MODE_INSIDE_ACL)
-    {
-      /* On Cygwin, it is necessary to call chmod before acl, because
-         chmod can change the contents of the ACL (in ways that don't
-         change the allowed accesses, but still visible).  */
-      if (chmod_or_fchmod (dst_name, dest_desc, mode) != 0)
-        saved_errno = errno;
-      did_chmod = 1;
-    }
-
-  /* If both ace_entries and entries are available, try SETACL before
-     ACE_SETACL, because SETACL cannot fail with ENOTSUP whereas ACE_SETACL
-     can.  */
-
-  if (count > 0)
-    {
-      ret = (dest_desc != -1
-             ? facl (dest_desc, SETACL, count, entries)
-             : acl (dst_name, SETACL, count, entries));
-      if (ret < 0 && saved_errno == 0)
-        {
-          saved_errno = errno;
-          if ((errno == ENOSYS || errno == EOPNOTSUPP || errno == EINVAL)
-              && !acl_nontrivial (count, entries))
-            saved_errno = 0;
-        }
-      else
-        did_chmod = 1;
-    }
-  free (entries);
-
-# ifdef ACE_GETACL
-  if (ace_count > 0)
-    {
-      ret = (dest_desc != -1
-             ? facl (dest_desc, ACE_SETACL, ace_count, ace_entries)
-             : acl (dst_name, ACE_SETACL, ace_count, ace_entries));
-      if (ret < 0 && saved_errno == 0)
-        {
-          saved_errno = errno;
-          if ((errno == ENOSYS || errno == EINVAL || errno == ENOTSUP)
-              && !acl_ace_nontrivial (ace_count, ace_entries))
-            saved_errno = 0;
-        }
-    }
-  free (ace_entries);
-# endif
-
-  if (MODE_INSIDE_ACL
-      && did_chmod <= ((mode & (S_ISUID | S_ISGID | S_ISVTX)) ? 1 : 0))
-    {
-      /* We did not call chmod so far, and either the mode and the ACL are
-         separate or special bits are to be set which don't fit into ACLs.  */
-
-      if (chmod_or_fchmod (dst_name, dest_desc, mode) != 0)
-        {
-          if (saved_errno == 0)
-            saved_errno = errno;
-        }
-    }
-
-  if (saved_errno)
-    {
-      errno = saved_errno;
-      return -1;
-    }
-  return 0;
-
-#elif USE_ACL && HAVE_GETACL /* HP-UX */
-
-  struct acl_entry entries[NACLENTRIES];
-  int count;
-# if HAVE_ACLV_H
-  struct acl aclv_entries[NACLVENTRIES];
-  int aclv_count;
-# endif
-  int did_chmod;
-  int saved_errno;
-  int ret;
-
-  count = (source_desc != -1
-           ? fgetacl (source_desc, NACLENTRIES, entries)
-           : getacl (src_name, NACLENTRIES, entries));
-
-  if (count < 0)
-    {
-      if (errno == ENOSYS || errno == EOPNOTSUPP || errno == ENOTSUP)
-        count = 0;
-      else
-        return -2;
-    }
-  else if (count > 0)
-    {
-      if (count > NACLENTRIES)
-        /* If NACLENTRIES cannot be trusted, use dynamic memory allocation.  */
-        abort ();
-    }
-
-# if HAVE_ACLV_H
-  aclv_count = acl ((char *) src_name, ACL_GET, NACLVENTRIES, aclv_entries);
-
-  if (aclv_count < 0)
-    {
-      if (errno == ENOSYS || errno == EOPNOTSUPP || errno == EINVAL)
-        count = 0;
-      else
-        return -2;
-    }
-  else if (aclv_count > 0)
-    {
-      if (aclv_count > NACLVENTRIES)
-        /* If NACLVENTRIES cannot be trusted, use dynamic memory allocation.  */
-        abort ();
-    }
-# endif
-
-  if (count == 0)
-# if HAVE_ACLV_H
-    if (aclv_count == 0)
-# endif
-      return qset_acl (dst_name, dest_desc, mode);
-
-  did_chmod = 0; /* set to 1 once the mode bits in 0777 have been set */
-  saved_errno = 0; /* the first non-ignorable error code */
-
-  if (count > 0)
-    {
-      ret = (dest_desc != -1
-             ? fsetacl (dest_desc, count, entries)
-             : setacl (dst_name, count, entries));
-      if (ret < 0 && saved_errno == 0)
-        {
-          saved_errno = errno;
-          if (errno == ENOSYS || errno == EOPNOTSUPP || errno == ENOTSUP)
-            {
-              struct stat source_statbuf;
-
-              if ((source_desc != -1
-                   ? fstat (source_desc, &source_statbuf)
-                   : stat (src_name, &source_statbuf)) == 0)
-                {
-                  if (!acl_nontrivial (count, entries, &source_statbuf))
-                    saved_errno = 0;
-                }
-              else
-                saved_errno = errno;
-            }
-        }
-      else
-        did_chmod = 1;
-    }
-
-# if HAVE_ACLV_H
-  if (aclv_count > 0)
-    {
-      ret = acl ((char *) dst_name, ACL_SET, aclv_count, aclv_entries);
-      if (ret < 0 && saved_errno == 0)
-        {
-          saved_errno = errno;
-          if (errno == ENOSYS || errno == EOPNOTSUPP || errno == EINVAL)
-            {
-              if (!aclv_nontrivial (aclv_count, aclv_entries))
-                saved_errno = 0;
-            }
-        }
-      else
-        did_chmod = 1;
-    }
-# endif
-
-  if (did_chmod <= ((mode & (S_ISUID | S_ISGID | S_ISVTX)) ? 1 : 0))
-    {
-      /* We did not call chmod so far, and special bits are to be set which
-         don't fit into ACLs.  */
-
-      if (chmod_or_fchmod (dst_name, dest_desc, mode) != 0)
-        {
-          if (saved_errno == 0)
-            saved_errno = errno;
-        }
-    }
-
-  if (saved_errno)
-    {
-      errno = saved_errno;
-      return -1;
-    }
-  return 0;
-
-#elif USE_ACL && HAVE_ACLX_GET && 0 /* AIX */
-
-  /* TODO */
-
-#elif USE_ACL && HAVE_STATACL /* older AIX */
-
-  union { struct acl a; char room[4096]; } u;
-  int ret;
-
-  if ((source_desc != -1
-       ? fstatacl (source_desc, STX_NORMAL, &u.a, sizeof (u))
-       : statacl (src_name, STX_NORMAL, &u.a, sizeof (u)))
-      < 0)
-    return -2;
-
-  ret = (dest_desc != -1
-         ? fchacl (dest_desc, &u.a, u.a.acl_len)
-         : chacl (dst_name, &u.a, u.a.acl_len));
-  if (ret < 0)
-    {
-      int saved_errno = errno;
-
-      chmod_or_fchmod (dst_name, dest_desc, mode);
-      errno = saved_errno;
-      return -1;
-    }
-
-  /* No need to call chmod_or_fchmod at this point, since the mode bits
-     S_ISUID, S_ISGID, S_ISVTX are also stored in the ACL.  */
-
-  return 0;
-
-#elif USE_ACL && HAVE_ACLSORT /* NonStop Kernel */
-
-  struct acl entries[NACLENTRIES];
-  int count;
-  int ret;
-
-  count = acl ((char *) src_name, ACL_GET, NACLENTRIES, entries);
-
-  if (count < 0)
-    {
-      if (0)
-        count = 0;
-      else
-        return -2;
-    }
-  else if (count > 0)
-    {
-      if (count > NACLENTRIES)
-        /* If NACLENTRIES cannot be trusted, use dynamic memory allocation.  */
-        abort ();
-    }
-
-  if (count == 0)
-    return qset_acl (dst_name, dest_desc, mode);
-
-  ret = acl ((char *) dst_name, ACL_SET, count, entries);
-  if (ret < 0)
-    {
-      int saved_errno = errno;
-
-      if (0)
-        {
-          if (!acl_nontrivial (count, entries))
-            return chmod_or_fchmod (dst_name, dest_desc, mode);
-        }
-
-      chmod_or_fchmod (dst_name, dest_desc, mode);
-      errno = saved_errno;
-      return -1;
-    }
-
-  if (mode & (S_ISUID | S_ISGID | S_ISVTX))
-    {
-      /* We did not call chmod so far, and either the mode and the ACL are
-         separate or special bits are to be set which don't fit into ACLs.  */
-
-      return chmod_or_fchmod (dst_name, dest_desc, mode);
-    }
-  return 0;
-
-#else
-
-  return qset_acl (dst_name, dest_desc, mode);
-
-#endif
-}
-
-
-/* Copy access control lists from one file to another. If SOURCE_DESC is
-   a valid file descriptor, use file descriptor operations, else use
-   filename based operations on SRC_NAME. Likewise for DEST_DESC and
-   DST_NAME.
-   If access control lists are not available, fchmod the target file to
-   MODE.  Also sets the non-permission bits of the destination file
-   (S_ISUID, S_ISGID, S_ISVTX) to those from MODE if any are set.
    Return 0 if successful, otherwise output a diagnostic and return a
    negative error code.  */
 
diff --git a/lib/creat-safer.c b/lib/creat-safer.c
index 93f794dd..984857b8 100644
--- a/lib/creat-safer.c
+++ b/lib/creat-safer.c
@@ -1,6 +1,6 @@
 /* Invoke creat, but avoid some glitches.
 
-   Copyright (C) 2005-2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/ctype.in.h b/lib/ctype.in.h
index 21eeac61..6d292d85 100644
--- a/lib/ctype.in.h
+++ b/lib/ctype.in.h
@@ -1,6 +1,6 @@
 /* A substitute for ISO C99 <ctype.h>, for platforms on which it is incomplete.
 
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/cycle-check.c b/lib/cycle-check.c
index d475225c..f7b3d078 100644
--- a/lib/cycle-check.c
+++ b/lib/cycle-check.c
@@ -1,6 +1,6 @@
 /* help detect directory cycles efficiently
 
-   Copyright (C) 2003-2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2003-2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/cycle-check.h b/lib/cycle-check.h
index 46a1a442..7649606a 100644
--- a/lib/cycle-check.h
+++ b/lib/cycle-check.h
@@ -1,6 +1,6 @@
 /* help detect directory cycles efficiently
 
-   Copyright (C) 2003-2004, 2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2003-2004, 2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/di-set.c b/lib/di-set.c
index b757d49e..fa21d2dd 100644
--- a/lib/di-set.c
+++ b/lib/di-set.c
@@ -1,6 +1,6 @@
 /* Set operations for device-inode pairs stored in a space-efficient manner.
 
-   Copyright 2009-2013 Free Software Foundation, Inc.
+   Copyright 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/diacrit.c b/lib/diacrit.c
index 8b7672b1..f3b6c1dd 100644
--- a/lib/diacrit.c
+++ b/lib/diacrit.c
@@ -1,6 +1,6 @@
 /* Diacritics processing for a few character codes.
 
-   Copyright (C) 1990-1993, 2000, 2006, 2009-2013 Free Software Foundation,
+   Copyright (C) 1990-1993, 2000, 2006, 2009-2014 Free Software Foundation,
    Inc.
 
    François Pinard <pinard@iro.umontreal.ca>, 1988.
diff --git a/lib/diacrit.h b/lib/diacrit.h
index 995514a2..3002c434 100644
--- a/lib/diacrit.h
+++ b/lib/diacrit.h
@@ -1,5 +1,5 @@
 /* Diacritics processing for a few character codes.
-   Copyright (C) 1990-1993, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 1990-1993, 2009-2014 Free Software Foundation, Inc.
    François Pinard <pinard@iro.umontreal.ca>, 1988.
 
    All this file is a temporary hack, waiting for locales in GNU.
diff --git a/lib/dirchownmod.c b/lib/dirchownmod.c
index 2de182bc..45cb2d2d 100644
--- a/lib/dirchownmod.c
+++ b/lib/dirchownmod.c
@@ -1,6 +1,6 @@
 /* Change the ownership and mode bits of a directory.
 
-   Copyright (C) 2006-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/dirent--.h b/lib/dirent--.h
index 91067363..d7c51bac 100644
--- a/lib/dirent--.h
+++ b/lib/dirent--.h
@@ -1,6 +1,6 @@
 /* Like dirent.h, but redefine some names to avoid glitches.
 
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/dirent-private.h b/lib/dirent-private.h
index 441071ca..83531a16 100644
--- a/lib/dirent-private.h
+++ b/lib/dirent-private.h
@@ -1,5 +1,5 @@
 /* Private details of the DIR type.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/dirent-safer.h b/lib/dirent-safer.h
index 853ea5dd..8cc75d8d 100644
--- a/lib/dirent-safer.h
+++ b/lib/dirent-safer.h
@@ -1,6 +1,6 @@
 /* Invoke dirent-like functions, but avoid some glitches.
 
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/dirent.in.h b/lib/dirent.in.h
index fad3797b..4822d6b2 100644
--- a/lib/dirent.in.h
+++ b/lib/dirent.in.h
@@ -1,5 +1,5 @@
 /* A GNU-like <dirent.h>.
-   Copyright (C) 2006-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/dirfd.c b/lib/dirfd.c
index 8272e132..4d37928c 100644
--- a/lib/dirfd.c
+++ b/lib/dirfd.c
@@ -1,6 +1,6 @@
 /* dirfd.c -- return the file descriptor associated with an open DIR*
 
-   Copyright (C) 2001, 2006, 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2006, 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/dirname-lgpl.c b/lib/dirname-lgpl.c
index 82f66301..d4a69730 100644
--- a/lib/dirname-lgpl.c
+++ b/lib/dirname-lgpl.c
@@ -1,6 +1,6 @@
 /* dirname.c -- return all but the last element in a file name
 
-   Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2013 Free Software
+   Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/dirname.c b/lib/dirname.c
index 1fb65888..94f1a36a 100644
--- a/lib/dirname.c
+++ b/lib/dirname.c
@@ -1,6 +1,6 @@
 /* dirname.c -- return all but the last element in a file name
 
-   Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2013 Free Software
+   Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/dirname.h b/lib/dirname.h
index 4ad03120..a1b70093 100644
--- a/lib/dirname.h
+++ b/lib/dirname.h
@@ -1,6 +1,6 @@
 /*  Take file names apart into directory and base names.
 
-    Copyright (C) 1998, 2001, 2003-2006, 2009-2013 Free Software Foundation,
+    Copyright (C) 1998, 2001, 2003-2006, 2009-2014 Free Software Foundation,
     Inc.
 
     This program is free software: you can redistribute it and/or modify
diff --git a/lib/dosname.h b/lib/dosname.h
index ba63ce4b..b92adfac 100644
--- a/lib/dosname.h
+++ b/lib/dosname.h
@@ -1,6 +1,6 @@
 /* File names on MS-DOS/Windows systems.
 
-   Copyright (C) 2000-2001, 2004-2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2000-2001, 2004-2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/dtotimespec.c b/lib/dtotimespec.c
index ecce2e5b..57a0cee2 100644
--- a/lib/dtotimespec.c
+++ b/lib/dtotimespec.c
@@ -1,6 +1,6 @@
 /* Convert double to timespec.
 
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
@@ -29,41 +29,31 @@
 struct timespec
 dtotimespec (double sec)
 {
-  enum { BILLION = 1000 * 1000 * 1000 };
   double min_representable = TYPE_MINIMUM (time_t);
   double max_representable =
-    ((TYPE_MAXIMUM (time_t) * (double) BILLION + (BILLION - 1))
-     / BILLION);
-  struct timespec r;
+    ((TYPE_MAXIMUM (time_t) * (double) TIMESPEC_RESOLUTION
+      + (TIMESPEC_RESOLUTION - 1))
+     / TIMESPEC_RESOLUTION);
 
   if (! (min_representable < sec))
-    {
-      r.tv_sec = TYPE_MINIMUM (time_t);
-      r.tv_nsec = 0;
-    }
+    return make_timespec (TYPE_MINIMUM (time_t), 0);
   else if (! (sec < max_representable))
-    {
-      r.tv_sec = TYPE_MAXIMUM (time_t);
-      r.tv_nsec = BILLION - 1;
-    }
+    return make_timespec (TYPE_MAXIMUM (time_t), TIMESPEC_RESOLUTION - 1);
   else
     {
       time_t s = sec;
-      double frac = BILLION * (sec - s);
+      double frac = TIMESPEC_RESOLUTION * (sec - s);
       long ns = frac;
       ns += ns < frac;
-      s += ns / BILLION;
-      ns %= BILLION;
+      s += ns / TIMESPEC_RESOLUTION;
+      ns %= TIMESPEC_RESOLUTION;
 
       if (ns < 0)
         {
           s--;
-          ns += BILLION;
+          ns += TIMESPEC_RESOLUTION;
         }
 
-      r.tv_sec = s;
-      r.tv_nsec = ns;
+      return make_timespec (s, ns);
     }
-
-  return r;
 }
diff --git a/lib/dup-safer-flag.c b/lib/dup-safer-flag.c
index 8a09821d..2d860fbc 100644
--- a/lib/dup-safer-flag.c
+++ b/lib/dup-safer-flag.c
@@ -1,7 +1,7 @@
 /* Duplicate a file descriptor result, avoiding clobbering
    STD{IN,OUT,ERR}_FILENO, with specific flags.
 
-   Copyright (C) 2001, 2004-2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004-2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/dup-safer.c b/lib/dup-safer.c
index c2031078..8df3cdab 100644
--- a/lib/dup-safer.c
+++ b/lib/dup-safer.c
@@ -1,6 +1,6 @@
 /* Invoke dup, but avoid some glitches.
 
-   Copyright (C) 2001, 2004-2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004-2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/dup.c b/lib/dup.c
index 564d93ce..c813df62 100644
--- a/lib/dup.c
+++ b/lib/dup.c
@@ -1,6 +1,6 @@
 /* Duplicate an open file descriptor.
 
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/dup2.c b/lib/dup2.c
index 9219eb38..7de68054 100644
--- a/lib/dup2.c
+++ b/lib/dup2.c
@@ -1,6 +1,6 @@
 /* Duplicate an open file descriptor to a specified file descriptor.
 
-   Copyright (C) 1999, 2004-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2004-2007, 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -96,7 +96,11 @@ rpl_dup2 (int fd, int desired_fd)
   /* On Linux kernels 2.6.26-2.6.29, dup2 (fd, fd) returns -EBADF.
      On Cygwin 1.5.x, dup2 (1, 1) returns 0.
      On Cygwin 1.7.17, dup2 (1, -1) dumps core.
+     On Cygwin 1.7.25, dup2 (1, 256) can dump core.
      On Haiku, dup2 (fd, fd) mistakenly clears FD_CLOEXEC.  */
+#  if HAVE_SETDTABLESIZE
+  setdtablesize (desired_fd + 1);
+#  endif
   if (desired_fd < 0)
     fd = desired_fd;
   if (fd == desired_fd)
diff --git a/lib/errno.in.h b/lib/errno.in.h
index 49b35464..832afc8f 100644
--- a/lib/errno.in.h
+++ b/lib/errno.in.h
@@ -1,6 +1,6 @@
 /* A POSIX-like <errno.h>.
 
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/error.c b/lib/error.c
index 865b2934..7b99cd73 100644
--- a/lib/error.c
+++ b/lib/error.c
@@ -1,5 +1,5 @@
 /* Error handler for noninteractive utilities
-   Copyright (C) 1990-1998, 2000-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 1990-1998, 2000-2007, 2009-2014 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
@@ -39,6 +39,9 @@
 # include <stdint.h>
 # include <wchar.h>
 # define mbsrtowcs __mbsrtowcs
+# define USE_UNLOCKED_IO 0
+# define _GL_ATTRIBUTE_FORMAT_PRINTF(a, b)
+# define _GL_ARG_NONNULL(a)
 #endif
 
 #if USE_UNLOCKED_IO
@@ -77,9 +80,9 @@ extern void __error_at_line (int status, int errnum, const char *file_name,
 # define error_at_line __error_at_line
 
 # include <libio/iolibio.h>
-# define fflush(s) INTUSE(_IO_fflush) (s)
+# define fflush(s) _IO_fflush (s)
 # undef putc
-# define putc(c, fp) INTUSE(_IO_putc) (c, fp)
+# define putc(c, fp) _IO_putc (c, fp)
 
 # include <bits/libc-lock.h>
 
@@ -171,7 +174,7 @@ print_errno_message (int errnum)
 
 #if defined HAVE_STRERROR_R || _LIBC
   char errbuf[1024];
-# if STRERROR_R_CHAR_P || _LIBC
+# if _LIBC || STRERROR_R_CHAR_P
   s = __strerror_r (errnum, errbuf, sizeof errbuf);
 # else
   if (__strerror_r (errnum, errbuf, sizeof errbuf) == 0)
@@ -195,13 +198,12 @@ print_errno_message (int errnum)
 #endif
 }
 
-static void
+static void _GL_ATTRIBUTE_FORMAT_PRINTF (3, 0) _GL_ARG_NONNULL ((3))
 error_tail (int status, int errnum, const char *message, va_list args)
 {
 #if _LIBC
   if (_IO_fwide (stderr, 0) > 0)
     {
-# define ALLOCA_LIMIT 2000
       size_t len = strlen (message) + 1;
       wchar_t *wmessage = NULL;
       mbstate_t st;
@@ -237,7 +239,7 @@ error_tail (int status, int errnum, const char *message, va_list args)
           if (res != len)
             break;
 
-          if (__builtin_expect (len >= SIZE_MAX / 2, 0))
+          if (__builtin_expect (len >= SIZE_MAX / sizeof (wchar_t) / 2, 0))
             {
               /* This really should not happen if everything is fine.  */
               res = (size_t) -1;
@@ -342,7 +344,10 @@ error_at_line (int status, int errnum, const char *file_name,
 
       if (old_line_number == line_number
           && (file_name == old_file_name
-              || strcmp (old_file_name, file_name) == 0))
+              || (old_file_name != NULL
+                  && file_name != NULL
+                  && strcmp (old_file_name, file_name) == 0)))
+
         /* Simply return and print nothing.  */
         return;
 
diff --git a/lib/error.h b/lib/error.h
index afcb0e10..4aaafb36 100644
--- a/lib/error.h
+++ b/lib/error.h
@@ -1,5 +1,5 @@
 /* Declaration for error-reporting function
-   Copyright (C) 1995-1997, 2003, 2006, 2008-2013 Free Software Foundation,
+   Copyright (C) 1995-1997, 2003, 2006, 2008-2014 Free Software Foundation,
    Inc.
    This file is part of the GNU C Library.
 
diff --git a/lib/euidaccess.c b/lib/euidaccess.c
index f73438e6..363e6fe2 100644
--- a/lib/euidaccess.c
+++ b/lib/euidaccess.c
@@ -1,6 +1,6 @@
 /* euidaccess -- check if effective user id can access file
 
-   Copyright (C) 1990-1991, 1995, 1998, 2000, 2003-2006, 2008-2013 Free
+   Copyright (C) 1990-1991, 1995, 1998, 2000, 2003-2006, 2008-2014 Free
    Software Foundation, Inc.
 
    This file is part of the GNU C Library.
diff --git a/lib/exclude.c b/lib/exclude.c
index a7dd9b36..14b59b70 100644
--- a/lib/exclude.c
+++ b/lib/exclude.c
@@ -1,6 +1,6 @@
 /* exclude.c -- exclude file names
 
-   Copyright (C) 1992-1994, 1997, 1999-2007, 2009-2013 Free Software
+   Copyright (C) 1992-1994, 1997, 1999-2007, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -32,6 +32,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wctype.h>
+#include <regex.h>
 
 #include "exclude.h"
 #include "hash.h"
@@ -39,6 +40,7 @@
 #include "fnmatch.h"
 #include "xalloc.h"
 #include "verify.h"
+#include "filename.h"
 
 #if USE_UNLOCKED_IO
 # include "unlocked-io.h"
@@ -73,8 +75,12 @@ verify (((EXCLUDE_ANCHORED | EXCLUDE_INCLUDE | EXCLUDE_WILDCARDS)
 
 struct patopts
   {
-    char const *pattern;
     int options;
+    union
+    {
+      char const *pattern;
+      regex_t re;
+    } v;
   };
 
 /* An array of pattern-options pairs.  */
@@ -104,13 +110,33 @@ struct exclude_segment
     } v;
   };
 
+struct pattern_buffer
+  {
+    struct pattern_buffer *next;
+    char *base;
+  };
+
 /* The exclude structure keeps a singly-linked list of exclude segments,
    maintained in reverse order.  */
 struct exclude
   {
     struct exclude_segment *head;
+    struct pattern_buffer *patbuf;
   };
 
+/* Register BUF in the pattern buffer list of EX.  ADD_FUNC (see
+   add_exclude_file and add_exclude_fp below) can use this function
+   if it modifies the pattern, to ensure the allocated memory will be
+   properly reclaimed upon calling free_exclude. */
+void
+exclude_add_pattern_buffer (struct exclude *ex, char *buf)
+{
+  struct pattern_buffer *pbuf = xmalloc (sizeof *pbuf);
+  pbuf->base = buf;
+  pbuf->next = ex->patbuf;
+  ex->patbuf = pbuf;
+}
+
 /* Return true if STR has or may have wildcards, when matched with OPTIONS.
    Return false if STR definitely does not have wildcards.  */
 bool
@@ -120,8 +146,20 @@ fnmatch_pattern_has_wildcards (const char *str, int options)
     {
       switch (*str++)
         {
+	case '.':
+	case '{':
+	case '}':
+	case '(':
+	case ')':
+	  if (options & EXCLUDE_REGEX)
+	    return true;
+	  break;
+
         case '\\':
-          str += ! (options & FNM_NOESCAPE) && *str;
+	  if (options & EXCLUDE_REGEX)
+	    continue;
+	  else
+	    str += ! (options & FNM_NOESCAPE) && *str;
           break;
 
         case '+': case '@': case '!':
@@ -243,9 +281,16 @@ new_exclude_segment (struct exclude *ex, enum exclude_type type, int options)
 static void
 free_exclude_segment (struct exclude_segment *seg)
 {
+  size_t i;
+
   switch (seg->type)
     {
     case exclude_pattern:
+      for (i = 0; i < seg->v.pat.exclude_count; i++)
+	{
+	  if (seg->v.pat.exclude[i].options & EXCLUDE_REGEX)
+	    regfree (&seg->v.pat.exclude[i].v.re);
+	}
       free (seg->v.pat.exclude);
       break;
 
@@ -261,12 +306,23 @@ void
 free_exclude (struct exclude *ex)
 {
   struct exclude_segment *seg;
+  struct pattern_buffer *pbuf;
+
   for (seg = ex->head; seg; )
     {
       struct exclude_segment *next = seg->next;
       free_exclude_segment (seg);
       seg = next;
     }
+
+  for (pbuf = ex->patbuf; pbuf; )
+    {
+      struct pattern_buffer *next = pbuf->next;
+      free (pbuf->base);
+      free (pbuf);
+      pbuf = next;
+    }
+
   free (ex);
 }
 
@@ -331,11 +387,21 @@ exclude_fnmatch (char const *pattern, char const *f, int options)
   if (! (options & EXCLUDE_ANCHORED))
     for (p = f; *p && ! matched; p++)
       if (*p == '/' && p[1] != '/')
-        matched = ((*matcher) (pattern, p + 1, options) == 0);
+	matched = ((*matcher) (pattern, p + 1, options) == 0);
 
   return matched;
 }
 
+bool
+exclude_patopts (struct patopts const *opts, char const *f)
+{
+  int options = opts->options;
+
+  return (options & EXCLUDE_REGEX)
+          ? regexec (&opts->v.re, f, 0, NULL, 0) == 0
+          : exclude_fnmatch (opts->v.pattern, f, options);
+}
+
 /* Return true if the exclude_pattern segment SEG matches F.  */
 
 static bool
@@ -347,9 +413,7 @@ file_pattern_matches (struct exclude_segment const *seg, char const *f)
 
   for (i = 0; i < exclude_count; i++)
     {
-      char const *pattern = exclude[i].pattern;
-      int options = exclude[i].options;
-      if (exclude_fnmatch (pattern, f, options))
+      if (exclude_patopts (exclude + i, f))
         return true;
     }
   return false;
@@ -454,17 +518,17 @@ void
 add_exclude (struct exclude *ex, char const *pattern, int options)
 {
   struct exclude_segment *seg;
+  struct exclude_pattern *pat;
+  struct patopts *patopts;
 
-  if ((options & EXCLUDE_WILDCARDS)
+  if ((options & (EXCLUDE_REGEX|EXCLUDE_WILDCARDS))
       && fnmatch_pattern_has_wildcards (pattern, options))
     {
-      struct exclude_pattern *pat;
-      struct patopts *patopts;
-
       if (! (ex->head && ex->head->type == exclude_pattern
-             && ((ex->head->options & EXCLUDE_INCLUDE)
-                 == (options & EXCLUDE_INCLUDE))))
-        new_exclude_segment (ex, exclude_pattern, options);
+	     && ((ex->head->options & EXCLUDE_INCLUDE)
+		 == (options & EXCLUDE_INCLUDE))))
+	new_exclude_segment (ex, exclude_pattern, options);
+
       seg = ex->head;
 
       pat = &seg->v.pat;
@@ -472,8 +536,51 @@ add_exclude (struct exclude *ex, char const *pattern, int options)
         pat->exclude = x2nrealloc (pat->exclude, &pat->exclude_alloc,
                                    sizeof *pat->exclude);
       patopts = &pat->exclude[pat->exclude_count++];
-      patopts->pattern = pattern;
+
       patopts->options = options;
+      if (options & EXCLUDE_REGEX)
+	{
+	  int rc;
+	  int cflags = REG_NOSUB|REG_EXTENDED|
+	               ((options & FNM_CASEFOLD) ? REG_ICASE : 0);
+
+	  if (options & FNM_LEADING_DIR)
+	    {
+	      char *tmp;
+	      size_t len = strlen (pattern);
+
+	      while (len > 0 && ISSLASH (pattern[len-1]))
+		--len;
+
+	      if (len == 0)
+		rc = 1;
+	      else
+		{
+		  tmp = xmalloc (len + 7);
+		  memcpy (tmp, pattern, len);
+		  strcpy (tmp + len, "(/.*)?");
+		  rc = regcomp (&patopts->v.re, tmp, cflags);
+		  free (tmp);
+		}
+	    }
+	  else
+	    rc = regcomp (&patopts->v.re, pattern, cflags);
+
+	  if (rc)
+	    {
+	      pat->exclude_count--;
+	      return;
+	    }
+	}
+      else
+	{
+	  if (options & EXCLUDE_ALLOC)
+	    {
+	      pattern = xstrdup (pattern);
+	      exclude_add_pattern_buffer (ex, (char*) pattern);
+	    }
+	  patopts->v.pattern = pattern;
+	}
     }
   else
     {
@@ -498,45 +605,39 @@ add_exclude (struct exclude *ex, char const *pattern, int options)
 /* Use ADD_FUNC to append to EX the patterns in FILE_NAME, each with
    OPTIONS.  LINE_END terminates each pattern in the file.  If
    LINE_END is a space character, ignore trailing spaces and empty
-   lines in FILE.  Return -1 on failure, 0 on success.  */
+   lines in FP.  Return -1 on failure, 0 on success.  */
 
 int
-add_exclude_file (void (*add_func) (struct exclude *, char const *, int),
-                  struct exclude *ex, char const *file_name, int options,
-                  char line_end)
+add_exclude_fp (void (*add_func) (struct exclude *, char const *, int, void *),
+		struct exclude *ex, FILE *fp, int options,
+		char line_end,
+		void *data)
 {
-  bool use_stdin = file_name[0] == '-' && !file_name[1];
-  FILE *in;
   char *buf = NULL;
   char *p;
-  char const *pattern;
+  char *pattern;
   char const *lim;
   size_t buf_alloc = 0;
   size_t buf_count = 0;
   int c;
   int e = 0;
 
-  if (use_stdin)
-    in = stdin;
-  else if (! (in = fopen (file_name, "r")))
-    return -1;
-
-  while ((c = getc (in)) != EOF)
+  while ((c = getc (fp)) != EOF)
     {
       if (buf_count == buf_alloc)
         buf = x2realloc (buf, &buf_alloc);
       buf[buf_count++] = c;
     }
 
-  if (ferror (in))
-    e = errno;
-
-  if (!use_stdin && fclose (in) != 0)
+  if (ferror (fp))
     e = errno;
 
   buf = xrealloc (buf, buf_count + 1);
   buf[buf_count] = line_end;
   lim = buf + buf_count + ! (buf_count == 0 || buf[buf_count - 1] == line_end);
+
+  exclude_add_pattern_buffer (ex, buf);
+
   pattern = buf;
 
   for (p = buf; p < lim; p++)
@@ -554,7 +655,7 @@ add_exclude_file (void (*add_func) (struct exclude *, char const *, int),
           }
 
         *pattern_end = '\0';
-        (*add_func) (ex, pattern, options);
+        (*add_func) (ex, pattern, options, data);
 
       next_pattern:
         pattern = p + 1;
@@ -563,3 +664,32 @@ add_exclude_file (void (*add_func) (struct exclude *, char const *, int),
   errno = e;
   return e ? -1 : 0;
 }
+
+static void
+call_addfn (struct exclude *ex, char const *pattern, int options, void *data)
+{
+  void (**addfnptr) (struct exclude *, char const *, int) = data;
+  (*addfnptr) (ex, pattern, options);
+}
+
+int
+add_exclude_file (void (*add_func) (struct exclude *, char const *, int),
+		  struct exclude *ex, char const *file_name, int options,
+		  char line_end)
+{
+  bool use_stdin = file_name[0] == '-' && !file_name[1];
+  FILE *in;
+  int rc = 0;
+
+  if (use_stdin)
+    in = stdin;
+  else if (! (in = fopen (file_name, "r")))
+    return -1;
+
+  rc = add_exclude_fp (call_addfn, ex, in, options, line_end, &add_func);
+
+  if (!use_stdin && fclose (in) != 0)
+    rc = -1;
+
+  return rc;
+}
diff --git a/lib/exclude.h b/lib/exclude.h
index f76b1539..95552186 100644
--- a/lib/exclude.h
+++ b/lib/exclude.h
@@ -1,6 +1,6 @@
 /* exclude.h -- declarations for excluding file names
 
-   Copyright (C) 1992-1994, 1997, 1999, 2001-2003, 2005-2006, 2009-2013 Free
+   Copyright (C) 1992-1994, 1997, 1999, 2001-2003, 2005-2006, 2009-2014 Free
    Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -20,6 +20,7 @@
 #define _GL_EXCLUDE_H 1
 
 #include <stdbool.h>
+#include <stdio.h>
 
 /* Written by Paul Eggert <eggert@twinsun.com>
    and Sergey Poznyakoff <gray@gnu.org> */
@@ -37,6 +38,12 @@
    option, these characters are ordinary and fnmatch is not used.  */
 #define EXCLUDE_WILDCARDS (1 << 28)
 
+/* Patterns are POSIX extended regular expressions */
+#define EXCLUDE_REGEX     (1 << 27)
+
+/* Allocate storage for the pattern */
+#define EXCLUDE_ALLOC     (1 << 26)
+
 struct exclude;
 
 bool fnmatch_pattern_has_wildcards (const char *, int) _GL_ATTRIBUTE_PURE;
@@ -46,7 +53,10 @@ void free_exclude (struct exclude *);
 void add_exclude (struct exclude *, char const *, int);
 int add_exclude_file (void (*) (struct exclude *, char const *, int),
                       struct exclude *, char const *, int, char);
+int add_exclude_fp (void (*) (struct exclude *, char const *, int, void *),
+		    struct exclude *, FILE *, int, char, void *);
 bool excluded_file_name (struct exclude const *, char const *);
-bool exclude_fnmatch (char const *pattern, char const *f, int options);
+void exclude_add_pattern_buffer (struct exclude *ex, char *buf);
+bool exclude_fnmatch (char const *, char const *, int);
 
 #endif /* _GL_EXCLUDE_H */
diff --git a/lib/exitfail.c b/lib/exitfail.c
index b0b4ebe4..609afc5a 100644
--- a/lib/exitfail.c
+++ b/lib/exitfail.c
@@ -1,6 +1,6 @@
 /* Failure exit status
 
-   Copyright (C) 2002-2003, 2005-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/exitfail.h b/lib/exitfail.h
index e54333bd..66807d51 100644
--- a/lib/exitfail.h
+++ b/lib/exitfail.h
@@ -1,6 +1,6 @@
 /* Failure exit status
 
-   Copyright (C) 2002, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/faccessat.c b/lib/faccessat.c
index f3c3f673..44a38ae6 100644
--- a/lib/faccessat.c
+++ b/lib/faccessat.c
@@ -1,5 +1,5 @@
 /* Check the access rights of a file relative to an open directory.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/fadvise.c b/lib/fadvise.c
index 8d3af995..a4bc96f4 100644
--- a/lib/fadvise.c
+++ b/lib/fadvise.c
@@ -1,5 +1,5 @@
 /* Declare an access pattern hint for files.
-   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
    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
@@ -14,6 +14,12 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+/* Without this pragma, gcc suggests that (given !HAVE_POSIX_FADVISE)
+   the fdadvise function might be a candidate for attribute 'const'.  */
+#if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__
+# pragma GCC diagnostic ignored "-Wsuggest-attribute=const"
+#endif
+
 #include <config.h>
 #include "fadvise.h"
 
diff --git a/lib/fadvise.h b/lib/fadvise.h
index cd5046b3..11ecd8f0 100644
--- a/lib/fadvise.h
+++ b/lib/fadvise.h
@@ -1,5 +1,5 @@
 /* Declare an access pattern hint for files.
-   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
    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
@@ -48,7 +48,7 @@ typedef enum {
   FADVISE_NOREUSE =    POSIX_FADV_NOREUSE,
   FADVISE_DONTNEED =   POSIX_FADV_DONTNEED,
   FADVISE_WILLNEED =   POSIX_FADV_WILLNEED,
-  FADVISE_RANDOM =     POSIX_FADV_RANDOM,
+  FADVISE_RANDOM =     POSIX_FADV_RANDOM
 } fadvice_t;
 #else
 typedef enum {
@@ -57,7 +57,7 @@ typedef enum {
   FADVISE_NOREUSE,
   FADVISE_DONTNEED,
   FADVISE_WILLNEED,
-  FADVISE_RANDOM,
+  FADVISE_RANDOM
 } fadvice_t;
 #endif
 
diff --git a/lib/fatal-signal.c b/lib/fatal-signal.c
deleted file mode 100644
index 8f7cb8ea..00000000
--- a/lib/fatal-signal.c
+++ /dev/null
@@ -1,286 +0,0 @@
-/* Emergency actions in case of a fatal signal.
-   Copyright (C) 2003-2004, 2006-2013 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2003.
-
-   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 3 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/>.  */
-
-
-#include <config.h>
-
-/* Specification.  */
-#include "fatal-signal.h"
-
-#include <stdbool.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <unistd.h>
-
-#include "sig-handler.h"
-#include "xalloc.h"
-
-#define SIZEOF(a) (sizeof(a) / sizeof(a[0]))
-
-/* ========================================================================= */
-
-
-/* The list of fatal signals.
-   These are those signals whose default action is to terminate the process
-   without a core dump, except
-     SIGKILL - because it cannot be caught,
-     SIGALRM SIGUSR1 SIGUSR2 SIGPOLL SIGIO SIGLOST - because applications
-       often use them for their own purpose,
-     SIGPROF SIGVTALRM - because they are used for profiling,
-     SIGSTKFLT - because it is more similar to SIGFPE, SIGSEGV, SIGBUS,
-     SIGSYS - because it is more similar to SIGABRT, SIGSEGV,
-     SIGPWR - because it of too special use,
-     SIGRTMIN...SIGRTMAX - because they are reserved for application use.
-   plus
-     SIGXCPU, SIGXFSZ - because they are quite similar to SIGTERM.  */
-
-static int fatal_signals[] =
-  {
-    /* ISO C 99 signals.  */
-#ifdef SIGINT
-    SIGINT,
-#endif
-#ifdef SIGTERM
-    SIGTERM,
-#endif
-    /* POSIX:2001 signals.  */
-#ifdef SIGHUP
-    SIGHUP,
-#endif
-#ifdef SIGPIPE
-    SIGPIPE,
-#endif
-    /* BSD signals.  */
-#ifdef SIGXCPU
-    SIGXCPU,
-#endif
-#ifdef SIGXFSZ
-    SIGXFSZ,
-#endif
-    /* Native Windows signals.  */
-#ifdef SIGBREAK
-    SIGBREAK,
-#endif
-    0
-  };
-
-#define num_fatal_signals (SIZEOF (fatal_signals) - 1)
-
-/* Eliminate signals whose signal handler is SIG_IGN.  */
-
-static void
-init_fatal_signals (void)
-{
-  static bool fatal_signals_initialized = false;
-  if (!fatal_signals_initialized)
-    {
-      size_t i;
-
-      for (i = 0; i < num_fatal_signals; i++)
-        {
-          struct sigaction action;
-
-          if (sigaction (fatal_signals[i], NULL, &action) >= 0
-              && get_handler (&action) == SIG_IGN)
-            fatal_signals[i] = -1;
-        }
-
-      fatal_signals_initialized = true;
-    }
-}
-
-
-/* ========================================================================= */
-
-
-typedef void (*action_t) (void);
-
-/* Type of an entry in the actions array.
-   The 'action' field is accessed from within the fatal_signal_handler(),
-   therefore we mark it as 'volatile'.  */
-typedef struct
-{
-  volatile action_t action;
-}
-actions_entry_t;
-
-/* The registered cleanup actions.  */
-static actions_entry_t static_actions[32];
-static actions_entry_t * volatile actions = static_actions;
-static sig_atomic_t volatile actions_count = 0;
-static size_t actions_allocated = SIZEOF (static_actions);
-
-
-/* The saved signal handlers.
-   Size 32 would not be sufficient: On HP-UX, SIGXCPU = 33, SIGXFSZ = 34.  */
-static struct sigaction saved_sigactions[64];
-
-
-/* Uninstall the handlers.  */
-static void
-uninstall_handlers (void)
-{
-  size_t i;
-
-  for (i = 0; i < num_fatal_signals; i++)
-    if (fatal_signals[i] >= 0)
-      {
-        int sig = fatal_signals[i];
-        if (saved_sigactions[sig].sa_handler == SIG_IGN)
-          saved_sigactions[sig].sa_handler = SIG_DFL;
-        sigaction (sig, &saved_sigactions[sig], NULL);
-      }
-}
-
-
-/* The signal handler.  It gets called asynchronously.  */
-static void
-fatal_signal_handler (int sig)
-{
-  for (;;)
-    {
-      /* Get the last registered cleanup action, in a reentrant way.  */
-      action_t action;
-      size_t n = actions_count;
-      if (n == 0)
-        break;
-      n--;
-      actions_count = n;
-      action = actions[n].action;
-      /* Execute the action.  */
-      action ();
-    }
-
-  /* Now execute the signal's default action.
-     If the signal being delivered was blocked, the re-raised signal would be
-     delivered when this handler returns.  But the way we install this handler,
-     no signal is blocked, and the re-raised signal is delivered already
-     during raise().  */
-  uninstall_handlers ();
-  raise (sig);
-}
-
-
-/* Install the handlers.  */
-static void
-install_handlers (void)
-{
-  size_t i;
-  struct sigaction action;
-
-  action.sa_handler = &fatal_signal_handler;
-  /* If we get a fatal signal while executing fatal_signal_handler, enter
-     fatal_signal_handler recursively, since it is reentrant.  Hence no
-     SA_RESETHAND.  */
-  action.sa_flags = SA_NODEFER;
-  sigemptyset (&action.sa_mask);
-  for (i = 0; i < num_fatal_signals; i++)
-    if (fatal_signals[i] >= 0)
-      {
-        int sig = fatal_signals[i];
-
-        if (!(sig < sizeof (saved_sigactions) / sizeof (saved_sigactions[0])))
-          abort ();
-        sigaction (sig, &action, &saved_sigactions[sig]);
-      }
-}
-
-
-/* Register a cleanup function to be executed when a catchable fatal signal
-   occurs.  */
-void
-at_fatal_signal (action_t action)
-{
-  static bool cleanup_initialized = false;
-  if (!cleanup_initialized)
-    {
-      init_fatal_signals ();
-      install_handlers ();
-      cleanup_initialized = true;
-    }
-
-  if (actions_count == actions_allocated)
-    {
-      /* Extend the actions array.  Note that we cannot use xrealloc(),
-         because then the cleanup() function could access an already
-         deallocated array.  */
-      actions_entry_t *old_actions = actions;
-      size_t old_actions_allocated = actions_allocated;
-      size_t new_actions_allocated = 2 * actions_allocated;
-      actions_entry_t *new_actions =
-        XNMALLOC (new_actions_allocated, actions_entry_t);
-      size_t k;
-
-      /* Don't use memcpy() here, because memcpy takes non-volatile arguments
-         and is therefore not guaranteed to complete all memory stores before
-         the next statement.  */
-      for (k = 0; k < old_actions_allocated; k++)
-        new_actions[k] = old_actions[k];
-      actions = new_actions;
-      actions_allocated = new_actions_allocated;
-      /* Now we can free the old actions array.  */
-      if (old_actions != static_actions)
-        free (old_actions);
-    }
-  /* The two uses of 'volatile' in the types above (and ISO C 99 section
-     5.1.2.3.(5)) ensure that we increment the actions_count only after
-     the new action has been written to the memory location
-     actions[actions_count].  */
-  actions[actions_count].action = action;
-  actions_count++;
-}
-
-
-/* ========================================================================= */
-
-
-static sigset_t fatal_signal_set;
-
-static void
-init_fatal_signal_set (void)
-{
-  static bool fatal_signal_set_initialized = false;
-  if (!fatal_signal_set_initialized)
-    {
-      size_t i;
-
-      init_fatal_signals ();
-
-      sigemptyset (&fatal_signal_set);
-      for (i = 0; i < num_fatal_signals; i++)
-        if (fatal_signals[i] >= 0)
-          sigaddset (&fatal_signal_set, fatal_signals[i]);
-
-      fatal_signal_set_initialized = true;
-    }
-}
-
-/* Temporarily delay the catchable fatal signals.  */
-void
-block_fatal_signals (void)
-{
-  init_fatal_signal_set ();
-  sigprocmask (SIG_BLOCK, &fatal_signal_set, NULL);
-}
-
-/* Stop delaying the catchable fatal signals.  */
-void
-unblock_fatal_signals (void)
-{
-  init_fatal_signal_set ();
-  sigprocmask (SIG_UNBLOCK, &fatal_signal_set, NULL);
-}
diff --git a/lib/fatal-signal.h b/lib/fatal-signal.h
deleted file mode 100644
index f5df78a0..00000000
--- a/lib/fatal-signal.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Emergency actions in case of a fatal signal.
-   Copyright (C) 2003-2004, 2009-2013 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2003.
-
-   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 3 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/>.  */
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* It is often useful to do some cleanup action when a usually fatal signal
-   terminates the process, like removing a temporary file or killing a
-   subprocess that may be stuck waiting for a device, pipe or network input.
-   Such signals are SIGHUP, SIGINT, SIGPIPE, SIGTERM, and possibly others.
-   The limitation of this facility is that it cannot work for SIGKILL.
-
-   Signals with a SIG_IGN handler are considered to be non-fatal.  The
-   functions in this file assume that when a SIG_IGN handler is installed
-   for a signal, it was installed before any functions in this file were
-   called and it stays so for the whole lifetime of the process.  */
-
-/* Register a cleanup function to be executed when a catchable fatal signal
-   occurs.
-
-   Restrictions for the cleanup function:
-     - The cleanup function can do all kinds of system calls.
-     - It can also access application dependent memory locations and data
-       structures provided they are in a consistent state. One way to ensure
-       this is through block_fatal_signals()/unblock_fatal_signals(), see
-       below.  Another - more tricky - way to ensure this is the careful use
-       of 'volatile'.
-   However,
-     - malloc() and similarly complex facilities are not safe to be called
-       because they are not guaranteed to be in a consistent state.
-     - Also, the cleanup function must not block the catchable fatal signals
-       and leave them blocked upon return.
-
-   The cleanup function is executed asynchronously.  It is unspecified
-   whether during its execution the catchable fatal signals are blocked
-   or not.  */
-extern void at_fatal_signal (void (*function) (void));
-
-
-/* Sometimes it is necessary to block the usually fatal signals while the
-   data structures being accessed by the cleanup action are being built or
-   reorganized.  This is the case, for example, when a temporary file or
-   directory is created through mkstemp() or mkdtemp(), because these
-   functions create the temporary file or directory _before_ returning its
-   name to the application.  */
-
-/* Temporarily delay the catchable fatal signals.
-   The signals will be blocked (= delayed) until the next call to
-   unblock_fatal_signals().  If the signals are already blocked, a further
-   call to block_fatal_signals() has no effect.  */
-extern void block_fatal_signals (void);
-
-/* Stop delaying the catchable fatal signals.  */
-extern void unblock_fatal_signals (void);
-
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/lib/fchdir.c b/lib/fchdir.c
index 36a8e358..5d713773 100644
--- a/lib/fchdir.c
+++ b/lib/fchdir.c
@@ -1,5 +1,5 @@
 /* fchdir replacement.
-   Copyright (C) 2006-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/fchmodat.c b/lib/fchmodat.c
index 34e956cc..8b0bbb32 100644
--- a/lib/fchmodat.c
+++ b/lib/fchmodat.c
@@ -1,5 +1,5 @@
 /* Change the protections of file relative to an open directory.
-   Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/fchownat.c b/lib/fchownat.c
index 3e355792..65ced30b 100644
--- a/lib/fchownat.c
+++ b/lib/fchownat.c
@@ -4,7 +4,7 @@
    when the buggy fchownat-with-AT_SYMLINK_NOFOLLOW operates on a symlink, it
    mistakenly affects the symlink referent, rather than the symlink itself.
 
-   Copyright (C) 2006-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/fclose.c b/lib/fclose.c
index 90ed653a..d238ab18 100644
--- a/lib/fclose.c
+++ b/lib/fclose.c
@@ -1,5 +1,5 @@
 /* fclose replacement.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/fcntl--.h b/lib/fcntl--.h
index 3fcd5fec..37be26c3 100644
--- a/lib/fcntl--.h
+++ b/lib/fcntl--.h
@@ -1,6 +1,6 @@
 /* Like fcntl.h, but redefine some names to avoid glitches.
 
-   Copyright (C) 2005, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/fcntl-safer.h b/lib/fcntl-safer.h
index a98a6330..73b7ad78 100644
--- a/lib/fcntl-safer.h
+++ b/lib/fcntl-safer.h
@@ -1,6 +1,6 @@
 /* Invoke fcntl-like functions, but avoid some glitches.
 
-   Copyright (C) 2005, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/fcntl.c b/lib/fcntl.c
index 735fa66f..54f74860 100644
--- a/lib/fcntl.c
+++ b/lib/fcntl.c
@@ -1,6 +1,6 @@
 /* Provide file descriptor control.
 
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/fcntl.in.h b/lib/fcntl.in.h
index 1e45a65a..e23b4b2b 100644
--- a/lib/fcntl.in.h
+++ b/lib/fcntl.in.h
@@ -1,6 +1,6 @@
 /* Like <fcntl.h>, but with non-working flags defined to 0.
 
-   Copyright (C) 2006-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
    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
@@ -186,6 +186,22 @@ _GL_WARN_ON_USE (openat, "openat is not portable - "
 
 /* Fix up the O_* macros.  */
 
+/* AIX 7.1 with XL C 12.1 defines O_CLOEXEC, O_NOFOLLOW, and O_TTY_INIT
+   to values outside 'int' range, so omit these misdefinitions.
+   But avoid namespace pollution on non-AIX systems.  */
+#ifdef _AIX
+# include <limits.h>
+# if defined O_CLOEXEC && ! (INT_MIN <= O_CLOEXEC && O_CLOEXEC <= INT_MAX)
+#  undef O_CLOEXEC
+# endif
+# if defined O_NOFOLLOW && ! (INT_MIN <= O_NOFOLLOW && O_NOFOLLOW <= INT_MAX)
+#  undef O_NOFOLLOW
+# endif
+# if defined O_TTY_INIT && ! (INT_MIN <= O_TTY_INIT && O_TTY_INIT <= INT_MAX)
+#  undef O_TTY_INIT
+# endif
+#endif
+
 #if !defined O_DIRECT && defined O_DIRECTIO
 /* Tru64 spells it 'O_DIRECTIO'.  */
 # define O_DIRECT O_DIRECTIO
diff --git a/lib/fd-hook.c b/lib/fd-hook.c
index e158a52a..0171cc60 100644
--- a/lib/fd-hook.c
+++ b/lib/fd-hook.c
@@ -1,5 +1,5 @@
 /* Hook for making making file descriptor functions close(), ioctl() extensible.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/lib/fd-hook.h b/lib/fd-hook.h
index d15b5771..1aa264eb 100644
--- a/lib/fd-hook.h
+++ b/lib/fd-hook.h
@@ -1,5 +1,5 @@
 /* Hook for making making file descriptor functions close(), ioctl() extensible.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
diff --git a/lib/fd-reopen.c b/lib/fd-reopen.c
index d18827c5..1fba807b 100644
--- a/lib/fd-reopen.c
+++ b/lib/fd-reopen.c
@@ -1,6 +1,6 @@
 /* Invoke open, but return either a desired file descriptor or -1.
 
-   Copyright (C) 2005-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/fd-reopen.h b/lib/fd-reopen.h
index 28db198e..7245a32d 100644
--- a/lib/fd-reopen.h
+++ b/lib/fd-reopen.h
@@ -1,6 +1,6 @@
 /* Invoke open, but return either a desired file descriptor or -1.
 
-   Copyright (C) 2005-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/fd-safer-flag.c b/lib/fd-safer-flag.c
index 8bc14bda..17011000 100644
--- a/lib/fd-safer-flag.c
+++ b/lib/fd-safer-flag.c
@@ -1,7 +1,7 @@
 /* Adjust a file descriptor result so that it avoids clobbering
    STD{IN,OUT,ERR}_FILENO, with specific flags.
 
-   Copyright (C) 2005-2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/fd-safer.c b/lib/fd-safer.c
index 8ded8886..148f735d 100644
--- a/lib/fd-safer.c
+++ b/lib/fd-safer.c
@@ -1,6 +1,6 @@
 /* Return a safer copy of a file descriptor.
 
-   Copyright (C) 2005-2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/fdatasync.c b/lib/fdatasync.c
index 8f9bf15a..688543f8 100644
--- a/lib/fdatasync.c
+++ b/lib/fdatasync.c
@@ -1,6 +1,6 @@
 /* Emulate fdatasync on platforms that lack it.
 
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public
diff --git a/lib/fdopen.c b/lib/fdopen.c
index c717f713..eded1a67 100644
--- a/lib/fdopen.c
+++ b/lib/fdopen.c
@@ -1,5 +1,5 @@
 /* Open a stream with a given file descriptor.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/fdopendir.c b/lib/fdopendir.c
index 63e06b92..b6c94a09 100644
--- a/lib/fdopendir.c
+++ b/lib/fdopendir.c
@@ -1,5 +1,5 @@
 /* provide a replacement fdopendir function
-   Copyright (C) 2004-2013 Free Software Foundation, Inc.
+   Copyright (C) 2004-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/fdutimensat.c b/lib/fdutimensat.c
index 63c79e9e..fafa0a4d 100644
--- a/lib/fdutimensat.c
+++ b/lib/fdutimensat.c
@@ -1,6 +1,6 @@
 /* Set file access and modification times.
 
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/fflush.c b/lib/fflush.c
index 8ac5dea3..dc9fbcd4 100644
--- a/lib/fflush.c
+++ b/lib/fflush.c
@@ -1,5 +1,5 @@
 /* fflush.c -- allow flushing input streams
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/file-has-acl.c b/lib/file-has-acl.c
index 2fedcc63..5104a41e 100644
--- a/lib/file-has-acl.c
+++ b/lib/file-has-acl.c
@@ -1,6 +1,6 @@
 /* Test whether a file has a nontrivial access control list.
 
-   Copyright (C) 2002-2003, 2005-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2014 Free Software Foundation, Inc.
 
    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
@@ -75,8 +75,7 @@ acl_access_nontrivial (acl_t acl)
     }
   return got_one;
 
-#  else /* IRIX, Tru64 */
-#   if HAVE_ACL_TO_SHORT_TEXT /* IRIX */
+#  elif HAVE_ACL_TO_SHORT_TEXT /* IRIX */
   /* Don't use acl_get_entry: it is undocumented.  */
 
   int count = acl->acl_cnt;
@@ -93,8 +92,7 @@ acl_access_nontrivial (acl_t acl)
     }
   return 0;
 
-#   endif
-#   if HAVE_ACL_FREE_TEXT /* Tru64 */
+#  elif HAVE_ACL_FREE_TEXT /* Tru64 */
   /* Don't use acl_get_entry: it takes only one argument and does not work.  */
 
   int count = acl->acl_num;
@@ -117,7 +115,10 @@ acl_access_nontrivial (acl_t acl)
     }
   return 0;
 
-#   endif
+#  else
+
+  errno = ENOSYS;
+  return -1;
 #  endif
 }
 
@@ -553,7 +554,7 @@ file_has_acl (char const *name, struct stat const *sb)
 #  endif
         }
       if (ret < 0)
-        return ACL_NOT_WELL_SUPPORTED (errno) ? 0 : -1;
+        return - acl_errno_valid (errno);
       return ret;
 
 # elif HAVE_FACL && defined GETACL /* Solaris, Cygwin, not HP-UX */
diff --git a/lib/file-set.c b/lib/file-set.c
index 4103e67f..c3130d98 100644
--- a/lib/file-set.c
+++ b/lib/file-set.c
@@ -1,5 +1,5 @@
 /* Specialized functions to manipulate a set of files.
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/file-type.c b/lib/file-type.c
index 0d542692..bf3026f3 100644
--- a/lib/file-type.c
+++ b/lib/file-type.c
@@ -1,6 +1,6 @@
 /* Return a string describing the type of a file.
 
-   Copyright (C) 1993-1994, 2001-2002, 2004-2006, 2009-2013 Free Software
+   Copyright (C) 1993-1994, 2001-2002, 2004-2006, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -34,26 +34,19 @@ file_type (struct stat const *st)
      To keep diagnostics grammatical in English, the returned string
      must start with a consonant.  */
 
+  /* Do these three first, as they're the most common.  */
+
   if (S_ISREG (st->st_mode))
     return st->st_size == 0 ? _("regular empty file") : _("regular file");
 
   if (S_ISDIR (st->st_mode))
     return _("directory");
 
-  if (S_ISBLK (st->st_mode))
-    return _("block special file");
-
-  if (S_ISCHR (st->st_mode))
-    return _("character special file");
-
-  if (S_ISFIFO (st->st_mode))
-    return _("fifo");
-
   if (S_ISLNK (st->st_mode))
     return _("symbolic link");
 
-  if (S_ISSOCK (st->st_mode))
-    return _("socket");
+  /* Do the S_TYPEIS* macros next, as they may be implemented in terms
+     of S_ISNAM, and we want the more-specialized interpretation.  */
 
   if (S_TYPEISMQ (st))
     return _("message queue");
@@ -67,5 +60,52 @@ file_type (struct stat const *st)
   if (S_TYPEISTMO (st))
     return _("typed memory object");
 
+  /* The remaining are in alphabetical order.  */
+
+  if (S_ISBLK (st->st_mode))
+    return _("block special file");
+
+  if (S_ISCHR (st->st_mode))
+    return _("character special file");
+
+  if (S_ISCTG (st->st_mode))
+    return _("contiguous data");
+
+  if (S_ISFIFO (st->st_mode))
+    return _("fifo");
+
+  if (S_ISDOOR (st->st_mode))
+    return _("door");
+
+  if (S_ISMPB (st->st_mode))
+    return _("multiplexed block special file");
+
+  if (S_ISMPC (st->st_mode))
+    return _("multiplexed character special file");
+
+  if (S_ISMPX (st->st_mode))
+    return _("multiplexed file");
+
+  if (S_ISNAM (st->st_mode))
+    return _("named file");
+
+  if (S_ISNWK (st->st_mode))
+    return _("network special file");
+
+  if (S_ISOFD (st->st_mode))
+    return _("migrated file with data");
+
+  if (S_ISOFL (st->st_mode))
+    return _("migrated file without data");
+
+  if (S_ISPORT (st->st_mode))
+    return _("port");
+
+  if (S_ISSOCK (st->st_mode))
+    return _("socket");
+
+  if (S_ISWHT (st->st_mode))
+    return _("whiteout");
+
   return _("weird file");
 }
diff --git a/lib/file-type.h b/lib/file-type.h
index 9c6ac264..ff99a9d7 100644
--- a/lib/file-type.h
+++ b/lib/file-type.h
@@ -1,6 +1,6 @@
 /* Return a string describing the type of a file.
 
-   Copyright (C) 1993-1994, 2001-2002, 2004-2005, 2009-2013 Free Software
+   Copyright (C) 1993-1994, 2001-2002, 2004-2005, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/fileblocks.c b/lib/fileblocks.c
index 53c66803..6de113b2 100644
--- a/lib/fileblocks.c
+++ b/lib/fileblocks.c
@@ -1,6 +1,6 @@
 /* Convert file size to number of blocks on System V-like machines.
 
-   Copyright (C) 1990, 1997-1999, 2004-2006, 2009-2013 Free Software
+   Copyright (C) 1990, 1997-1999, 2004-2006, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/filemode.c b/lib/filemode.c
index 9e8735a5..3e2f8c03 100644
--- a/lib/filemode.c
+++ b/lib/filemode.c
@@ -1,6 +1,6 @@
 /* filemode.c -- make a string describing file modes
 
-   Copyright (C) 1985, 1990, 1993, 1998-2000, 2004, 2006, 2009-2013 Free
+   Copyright (C) 1985, 1990, 1993, 1998-2000, 2004, 2006, 2009-2014 Free
    Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/filemode.h b/lib/filemode.h
index a235cb0c..c51e6a3a 100644
--- a/lib/filemode.h
+++ b/lib/filemode.h
@@ -1,6 +1,6 @@
 /* Make a string describing file modes.
 
-   Copyright (C) 1998-1999, 2003, 2006, 2009-2013 Free Software Foundation,
+   Copyright (C) 1998-1999, 2003, 2006, 2009-2014 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/filename.h b/lib/filename.h
index b82a0ac3..96dbaaa7 100644
--- a/lib/filename.h
+++ b/lib/filename.h
@@ -1,5 +1,5 @@
 /* Basic filename support macros.
-   Copyright (C) 2001-2004, 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/filenamecat-lgpl.c b/lib/filenamecat-lgpl.c
index 60c4988b..e817f97c 100644
--- a/lib/filenamecat-lgpl.c
+++ b/lib/filenamecat-lgpl.c
@@ -1,6 +1,6 @@
 /* Concatenate two arbitrary file names.
 
-   Copyright (C) 1996-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 1996-2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/filenamecat.c b/lib/filenamecat.c
index 8809b571..64c27f20 100644
--- a/lib/filenamecat.c
+++ b/lib/filenamecat.c
@@ -1,6 +1,6 @@
 /* Concatenate two arbitrary file names.
 
-   Copyright (C) 1996-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 1996-2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/filenamecat.h b/lib/filenamecat.h
index 1476e14c..b33dce84 100644
--- a/lib/filenamecat.h
+++ b/lib/filenamecat.h
@@ -1,6 +1,6 @@
 /* Concatenate two arbitrary file names.
 
-   Copyright (C) 1996-1997, 2003, 2005, 2007, 2009-2013 Free Software
+   Copyright (C) 1996-1997, 2003, 2005, 2007, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/filevercmp.c b/lib/filevercmp.c
index 7dcff8f9..f09205ac 100644
--- a/lib/filevercmp.c
+++ b/lib/filevercmp.c
@@ -1,7 +1,7 @@
 /*
    Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
    Copyright (C) 2001 Anthony Towns <aj@azure.humbug.org.au>
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/filevercmp.h b/lib/filevercmp.h
index 34f73ab8..72785cd6 100644
--- a/lib/filevercmp.h
+++ b/lib/filevercmp.h
@@ -1,7 +1,7 @@
 /*
    Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
    Copyright (C) 2001 Anthony Towns <aj@azure.humbug.org.au>
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/float+.h b/lib/float+.h
index 32fb790b..5ff15110 100644
--- a/lib/float+.h
+++ b/lib/float+.h
@@ -1,5 +1,5 @@
 /* Supplemental information about the floating-point formats.
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib/float.c b/lib/float.c
index 366945fa..b7c321dd 100644
--- a/lib/float.c
+++ b/lib/float.c
@@ -1,5 +1,5 @@
 /* Auxiliary definitions for <float.h>.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/float.in.h b/lib/float.in.h
index 84e1950f..db809f8f 100644
--- a/lib/float.in.h
+++ b/lib/float.in.h
@@ -1,6 +1,6 @@
 /* A correct <float.h>.
 
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/fnmatch.c b/lib/fnmatch.c
index 6a09e1a9..4246d822 100644
--- a/lib/fnmatch.c
+++ b/lib/fnmatch.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1993, 1996-2007, 2009-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1993, 1996-2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/fnmatch.in.h b/lib/fnmatch.in.h
index d39ce2f1..d4cea656 100644
--- a/lib/fnmatch.in.h
+++ b/lib/fnmatch.in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1993, 1996-1999, 2001-2003, 2005, 2007, 2009-2013 Free
+/* Copyright (C) 1991-1993, 1996-1999, 2001-2003, 2005, 2007, 2009-2014 Free
    Software Foundation, Inc.
 
    This file is part of the GNU C Library.
diff --git a/lib/fnmatch_loop.c b/lib/fnmatch_loop.c
index f57cd63f..4c6000fa 100644
--- a/lib/fnmatch_loop.c
+++ b/lib/fnmatch_loop.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1993, 1996-2006, 2009-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1993, 1996-2006, 2009-2014 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
@@ -227,6 +227,8 @@ FCT (const CHAR *pattern, const CHAR *string, const CHAR *string_end,
             c = *p++;
             for (;;)
               {
+		bool is_range = false;
+
                 if (!(flags & FNM_NOESCAPE) && c == L_('\\'))
                   {
                     if (*p == L_('\0'))
@@ -420,8 +422,6 @@ FCT (const CHAR *pattern, const CHAR *string, const CHAR *string_end,
                   }
                 else
                   {
-                    bool is_range = false;
-
 #ifdef _LIBC
                     bool is_seqval = false;
 
diff --git a/lib/fopen-safer.c b/lib/fopen-safer.c
index 917920d9..3c9e286a 100644
--- a/lib/fopen-safer.c
+++ b/lib/fopen-safer.c
@@ -1,6 +1,6 @@
 /* Invoke fopen, but avoid some glitches.
 
-   Copyright (C) 2001, 2004-2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004-2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/fopen.c b/lib/fopen.c
index f9d6763d..8fead5a8 100644
--- a/lib/fopen.c
+++ b/lib/fopen.c
@@ -1,5 +1,5 @@
 /* Open a stream to a file.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/fpending.c b/lib/fpending.c
index e917f4f1..31aba1ad 100644
--- a/lib/fpending.c
+++ b/lib/fpending.c
@@ -1,5 +1,5 @@
 /* fpending.c -- return the number of pending output bytes on a stream
-   Copyright (C) 2000, 2004, 2006-2007, 2009-2013 Free Software Foundation,
+   Copyright (C) 2000, 2004, 2006-2007, 2009-2014 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/fpending.h b/lib/fpending.h
index bf40d373..dd607fe2 100644
--- a/lib/fpending.h
+++ b/lib/fpending.h
@@ -1,6 +1,6 @@
 /* Declare __fpending.
 
-   Copyright (C) 2000, 2003, 2005-2006, 2009-2013 Free Software Foundation,
+   Copyright (C) 2000, 2003, 2005-2006, 2009-2014 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -20,11 +20,10 @@
 
 #include <stddef.h>
 #include <stdio.h>
+#if HAVE_STDIO_EXT_H
+# include <stdio_ext.h>
+#endif
 
-#if HAVE_DECL___FPENDING
-# if HAVE_STDIO_EXT_H
-#  include <stdio_ext.h>
-# endif
-#else
-size_t __fpending (FILE *);
+#if !HAVE_DECL___FPENDING
+size_t __fpending (FILE *) _GL_ATTRIBUTE_PURE;
 #endif
diff --git a/lib/fprintftime.h b/lib/fprintftime.h
index 56b7c4a1..9b367cd6 100644
--- a/lib/fprintftime.h
+++ b/lib/fprintftime.h
@@ -1,6 +1,6 @@
 /* Generate time strings directly to the output.  */
 
-/* Copyright (C) 2005, 2009-2013 Free Software Foundation, Inc.
+/* Copyright (C) 2005, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/fpucw.h b/lib/fpucw.h
index 0b7f5284..9170c27f 100644
--- a/lib/fpucw.h
+++ b/lib/fpucw.h
@@ -1,5 +1,5 @@
 /* Manipulating the FPU control word.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/fpurge.c b/lib/fpurge.c
index e00187dd..54a27225 100644
--- a/lib/fpurge.c
+++ b/lib/fpurge.c
@@ -1,5 +1,5 @@
 /* Flushing buffers of a FILE stream.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/freadahead.c b/lib/freadahead.c
index f2dae46b..01b08108 100644
--- a/lib/freadahead.c
+++ b/lib/freadahead.c
@@ -1,5 +1,5 @@
 /* Retrieve information about a FILE stream.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/freadahead.h b/lib/freadahead.h
index c691f89c..85c16b99 100644
--- a/lib/freadahead.h
+++ b/lib/freadahead.h
@@ -1,5 +1,5 @@
 /* Retrieve information about a FILE stream.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/freading.c b/lib/freading.c
index 8012a7a3..dee43256 100644
--- a/lib/freading.c
+++ b/lib/freading.c
@@ -1,5 +1,5 @@
 /* Retrieve information about a FILE stream.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/freading.h b/lib/freading.h
index 88ea789e..3d1c7b2c 100644
--- a/lib/freading.h
+++ b/lib/freading.h
@@ -1,5 +1,5 @@
 /* Retrieve information about a FILE stream.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
@@ -44,7 +44,7 @@
 extern "C" {
 # endif
 
-extern bool freading (FILE *stream);
+extern bool freading (FILE *stream) _GL_ATTRIBUTE_PURE;
 
 # ifdef __cplusplus
 }
diff --git a/lib/freadptr.c b/lib/freadptr.c
index 9f11f965..26c66ede 100644
--- a/lib/freadptr.c
+++ b/lib/freadptr.c
@@ -1,5 +1,5 @@
 /* Retrieve information about a FILE stream.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/freadptr.h b/lib/freadptr.h
index 785ec99b..45fb93fd 100644
--- a/lib/freadptr.h
+++ b/lib/freadptr.h
@@ -1,5 +1,5 @@
 /* Retrieve information about a FILE stream.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/freadseek.c b/lib/freadseek.c
index ea28d878..5301794b 100644
--- a/lib/freadseek.c
+++ b/lib/freadseek.c
@@ -1,5 +1,5 @@
 /* Skipping input from a FILE stream.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/freadseek.h b/lib/freadseek.h
index 8e6a5a38..84ce3508 100644
--- a/lib/freadseek.h
+++ b/lib/freadseek.h
@@ -1,5 +1,5 @@
 /* Skipping input from a FILE stream.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/freopen-safer.c b/lib/freopen-safer.c
index 9fe403bd..714dc1df 100644
--- a/lib/freopen-safer.c
+++ b/lib/freopen-safer.c
@@ -1,6 +1,6 @@
 /* Invoke freopen, but avoid some glitches.
 
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/freopen.c b/lib/freopen.c
index b5812611..384eba64 100644
--- a/lib/freopen.c
+++ b/lib/freopen.c
@@ -1,5 +1,5 @@
 /* Open a stream to a file.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/frexp.c b/lib/frexp.c
index d847fa38..17ddcef8 100644
--- a/lib/frexp.c
+++ b/lib/frexp.c
@@ -1,5 +1,5 @@
 /* Split a double into fraction and mantissa.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/frexpl.c b/lib/frexpl.c
index 5ec2780e..78e1c704 100644
--- a/lib/frexpl.c
+++ b/lib/frexpl.c
@@ -1,5 +1,5 @@
 /* Split a 'long double' into fraction and mantissa.
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/fseek.c b/lib/fseek.c
index 4708287c..f778145c 100644
--- a/lib/fseek.c
+++ b/lib/fseek.c
@@ -1,5 +1,5 @@
 /* An fseek() function that, together with fflush(), is POSIX compliant.
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/fseeko.c b/lib/fseeko.c
index 42cd6428..e56ad0bc 100644
--- a/lib/fseeko.c
+++ b/lib/fseeko.c
@@ -1,5 +1,5 @@
 /* An fseeko() function that, together with fflush(), is POSIX compliant.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
@@ -19,7 +19,7 @@
 /* Specification.  */
 #include <stdio.h>
 
-/* Get off_t and lseek.  */
+/* Get off_t, lseek, _POSIX_VERSION.  */
 #include <unistd.h>
 
 #include "stdio-impl.h"
@@ -99,8 +99,14 @@ fseeko (FILE *fp, off_t offset, int whence)
 #elif defined EPLAN9                /* Plan9 */
   if (fp->rp == fp->buf
       && fp->wp == fp->buf)
+#elif FUNC_FFLUSH_STDIN < 0 && 200809 <= _POSIX_VERSION
+  /* Cross-compiling to some other system advertising conformance to
+     POSIX.1-2008 or later.  Assume fseeko and fflush work as advertised.
+     If this assumption is incorrect, please report the bug to
+     bug-gnulib.  */
+  if (0)
 #else
-  #error "Please port gnulib fseeko.c to your platform! Look at the code in fpurge.c, then report this to bug-gnulib."
+  #error "Please port gnulib fseeko.c to your platform! Look at the code in fseeko.c, then report this to bug-gnulib."
 #endif
     {
       /* We get here when an fflush() call immediately preceded this one (or
diff --git a/lib/fseterr.c b/lib/fseterr.c
index 0fca65f5..1e212e42 100644
--- a/lib/fseterr.c
+++ b/lib/fseterr.c
@@ -1,5 +1,5 @@
 /* Set the error indicator of a stream.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/fseterr.h b/lib/fseterr.h
index 630fa864..81672fb9 100644
--- a/lib/fseterr.h
+++ b/lib/fseterr.h
@@ -1,5 +1,5 @@
 /* Set the error indicator of a stream.
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/fstat.c b/lib/fstat.c
index dc802f50..ffcda9f5 100644
--- a/lib/fstat.c
+++ b/lib/fstat.c
@@ -1,5 +1,5 @@
 /* fstat() replacement.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/fstatat.c b/lib/fstatat.c
index 845c171f..44e32668 100644
--- a/lib/fstatat.c
+++ b/lib/fstatat.c
@@ -1,6 +1,6 @@
 /* Work around an fstatat bug on Solaris 9.
 
-   Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/fsusage.c b/lib/fsusage.c
index 0657555f..5bfc9cd0 100644
--- a/lib/fsusage.c
+++ b/lib/fsusage.c
@@ -1,6 +1,6 @@
 /* fsusage.c -- return space usage of mounted file systems
 
-   Copyright (C) 1991-1992, 1996, 1998-1999, 2002-2006, 2009-2013 Free Software
+   Copyright (C) 1991-1992, 1996, 1998-1999, 2002-2006, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -55,11 +55,6 @@
 # include "full-read.h"
 #endif
 
-/* The results of open() in this file are not used with fchdir,
-   therefore save some unnecessary work in fchdir.c.  */
-#undef open
-#undef close
-
 /* Many space usage primitives use all 1 bits to denote a value that is
    not applicable or unknown.  Propagate this information by returning
    a uintmax_t value that is all 1 bits if X is all 1 bits, even if X
diff --git a/lib/fsusage.h b/lib/fsusage.h
index 7810fc01..c1ce2811 100644
--- a/lib/fsusage.h
+++ b/lib/fsusage.h
@@ -1,6 +1,6 @@
 /* fsusage.h -- declarations for file system space usage info
 
-   Copyright (C) 1991-1992, 1997, 2003-2006, 2009-2013 Free Software
+   Copyright (C) 1991-1992, 1997, 2003-2006, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/fsync.c b/lib/fsync.c
index 8a1a9750..b09a8e64 100644
--- a/lib/fsync.c
+++ b/lib/fsync.c
@@ -7,7 +7,7 @@
 
    Written by Richard W.M. Jones <rjones.at.redhat.com>
 
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public
diff --git a/lib/ftell.c b/lib/ftell.c
index 4ad13c9f..d5cbccd7 100644
--- a/lib/ftell.c
+++ b/lib/ftell.c
@@ -1,5 +1,5 @@
 /* An ftell() function that works around platform bugs.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/ftello.c b/lib/ftello.c
index 3a2a0f20..ee4f7dc0 100644
--- a/lib/ftello.c
+++ b/lib/ftello.c
@@ -1,5 +1,5 @@
 /* An ftello() function that works around platform bugs.
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/ftoastr.c b/lib/ftoastr.c
index 518074f8..7780d008 100644
--- a/lib/ftoastr.c
+++ b/lib/ftoastr.c
@@ -1,6 +1,6 @@
 /* floating point to accurate string
 
-   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/ftoastr.h b/lib/ftoastr.h
index 5aa0930d..26cad736 100644
--- a/lib/ftoastr.h
+++ b/lib/ftoastr.h
@@ -1,6 +1,6 @@
 /* floating point to accurate string
 
-   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
    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
@@ -72,12 +72,13 @@ enum
 
 /* _GL_FLT_PREC_BOUND is an upper bound on the precision needed to
    represent a float value without losing information.  Likewise for
-   _GL_DBL_PREC_BOUND and double, and _GL_LDBL_PREC_BOUND and long double.  */
+   _GL_DBL_PREC_BOUND and double, and _GL_LDBL_PREC_BOUND and long double.
+   These are macros, not enums, to work around a bug in IBM xlc 12.1.  */
 
 #if FLT_RADIX == 10 /* decimal floating point */
- enum {  _GL_FLT_PREC_BOUND =  FLT_MANT_DIG };
- enum {  _GL_DBL_PREC_BOUND =  DBL_MANT_DIG };
- enum { _GL_LDBL_PREC_BOUND = LDBL_MANT_DIG };
+# define  _GL_FLT_PREC_BOUND  FLT_MANT_DIG
+# define  _GL_DBL_PREC_BOUND  DBL_MANT_DIG
+# define _GL_LDBL_PREC_BOUND LDBL_MANT_DIG
 #else
 
 /* An upper bound on the number of bits needed to represent a single
@@ -95,13 +96,13 @@ enum
    DIG digits.  For why the "+ 1" is needed, see "Binary to Decimal
    Conversion" in David Goldberg's paper "What Every Computer
    Scientist Should Know About Floating-Point Arithmetic"
-   <http://docs.sun.com/source/806-3568/ncg_goldberg.html>.  */
+   <http://docs.oracle.com/cd/E19957-01/806-3568/ncg_goldberg.html>.  */
 # define _GL_FLOAT_PREC_BOUND(dig) \
    (INT_BITS_STRLEN_BOUND ((dig) * _GL_FLOAT_DIG_BITS_BOUND) + 1)
 
- enum {  _GL_FLT_PREC_BOUND = _GL_FLOAT_PREC_BOUND ( FLT_MANT_DIG) };
- enum {  _GL_DBL_PREC_BOUND = _GL_FLOAT_PREC_BOUND ( DBL_MANT_DIG) };
- enum { _GL_LDBL_PREC_BOUND = _GL_FLOAT_PREC_BOUND (LDBL_MANT_DIG) };
+# define  _GL_FLT_PREC_BOUND _GL_FLOAT_PREC_BOUND ( FLT_MANT_DIG)
+# define  _GL_DBL_PREC_BOUND _GL_FLOAT_PREC_BOUND ( DBL_MANT_DIG)
+# define _GL_LDBL_PREC_BOUND _GL_FLOAT_PREC_BOUND (LDBL_MANT_DIG)
 #endif
 
 
diff --git a/lib/ftruncate.c b/lib/ftruncate.c
index db7f7ddf..d7a5f203 100644
--- a/lib/ftruncate.c
+++ b/lib/ftruncate.c
@@ -1,5 +1,5 @@
 /* ftruncate emulations for native Windows.
-   Copyright (C) 1992-2013 Free Software Foundation, Inc.
+   Copyright (C) 1992-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/fts-cycle.c b/lib/fts-cycle.c
index b07266a7..95da56e2 100644
--- a/lib/fts-cycle.c
+++ b/lib/fts-cycle.c
@@ -1,6 +1,6 @@
 /* Detect cycles in file tree walks.
 
-   Copyright (C) 2003-2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2003-2006, 2009-2014 Free Software Foundation, Inc.
 
    Written by Jim Meyering.
 
diff --git a/lib/fts.c b/lib/fts.c
index 74968b36..500e92c6 100644
--- a/lib/fts.c
+++ b/lib/fts.c
@@ -1,6 +1,6 @@
 /* Traverse a file hierarchy.
 
-   Copyright (C) 2004-2013 Free Software Foundation, Inc.
+   Copyright (C) 2004-2014 Free Software Foundation, Inc.
 
    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
@@ -1447,19 +1447,21 @@ fts_build (register FTS *sp, int type)
         nitems = 0;
         while (cur->fts_dirp) {
                 bool is_dir;
+                size_t d_namelen;
                 struct dirent *dp = readdir(cur->fts_dirp);
                 if (dp == NULL)
                         break;
                 if (!ISSET(FTS_SEEDOT) && ISDOT(dp->d_name))
                         continue;
 
-                if ((p = fts_alloc (sp, dp->d_name,
-                                    _D_EXACT_NAMLEN (dp))) == NULL)
+                d_namelen = _D_EXACT_NAMLEN (dp);
+                p = fts_alloc (sp, dp->d_name, d_namelen);
+                if (!p)
                         goto mem1;
-                if (_D_EXACT_NAMLEN (dp) >= maxlen) {
+                if (d_namelen >= maxlen) {
                         /* include space for NUL */
                         oldaddr = sp->fts_path;
-                        if (! fts_palloc(sp, _D_EXACT_NAMLEN (dp) + len + 1)) {
+                        if (! fts_palloc(sp, d_namelen + len + 1)) {
                                 /*
                                  * No more memory.  Save
                                  * errno, free up the current structure and the
@@ -1483,7 +1485,7 @@ mem1:                           saved_errno = errno;
                         maxlen = sp->fts_pathlen - len;
                 }
 
-                new_len = len + _D_EXACT_NAMLEN (dp);
+                new_len = len + d_namelen;
                 if (new_len < len) {
                         /*
                          * In the unlikely event that we would end up
diff --git a/lib/fts_.h b/lib/fts_.h
index e217c73f..63d4b742 100644
--- a/lib/fts_.h
+++ b/lib/fts_.h
@@ -1,6 +1,6 @@
 /* Traverse a file hierarchy.
 
-   Copyright (C) 2004-2013 Free Software Foundation, Inc.
+   Copyright (C) 2004-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/full-read.c b/lib/full-read.c
index a0dc82c2..31b600bb 100644
--- a/lib/full-read.c
+++ b/lib/full-read.c
@@ -1,5 +1,5 @@
 /* An interface to read that retries after partial reads and interrupts.
-   Copyright (C) 2002-2003, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/full-read.h b/lib/full-read.h
index 66c8c5c1..5eadd158 100644
--- a/lib/full-read.h
+++ b/lib/full-read.h
@@ -1,6 +1,6 @@
 /* An interface to read() that reads all it is asked to read.
 
-   Copyright (C) 2002, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/full-write.c b/lib/full-write.c
index beb5bf95..b8036772 100644
--- a/lib/full-write.c
+++ b/lib/full-write.c
@@ -1,6 +1,6 @@
 /* An interface to read and write that retries (if necessary) until complete.
 
-   Copyright (C) 1993-1994, 1997-2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 1993-1994, 1997-2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/full-write.h b/lib/full-write.h
index 67462b14..589f6e1b 100644
--- a/lib/full-write.h
+++ b/lib/full-write.h
@@ -1,6 +1,6 @@
 /* An interface to write() that writes all it is asked to write.
 
-   Copyright (C) 2002-2003, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/futimens.c b/lib/futimens.c
index 4ea05f70..96c0b73e 100644
--- a/lib/futimens.c
+++ b/lib/futimens.c
@@ -1,5 +1,5 @@
 /* Set the access and modification time of an open fd.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/gai_strerror.c b/lib/gai_strerror.c
index 1e371d27..9c393880 100644
--- a/lib/gai_strerror.c
+++ b/lib/gai_strerror.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 2001-2002, 2004-2006, 2008-2013 Free Software
+/* Copyright (C) 1997, 2001-2002, 2004-2006, 2008-2014 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Philip Blundell <pjb27@cam.ac.uk>, 1997.
diff --git a/lib/getaddrinfo.c b/lib/getaddrinfo.c
index 4d4d4c55..eef7a0c4 100644
--- a/lib/getaddrinfo.c
+++ b/lib/getaddrinfo.c
@@ -1,5 +1,5 @@
 /* Get address information (partial implementation).
-   Copyright (C) 1997, 2001-2002, 2004-2013 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2001-2002, 2004-2014 Free Software Foundation, Inc.
    Contributed by Simon Josefsson <simon@josefsson.org>.
 
    This program is free software; you can redistribute it and/or modify
@@ -15,12 +15,12 @@
    You should have received a copy of the GNU General Public License
    along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
-
 /* Don't use __attribute__ __nonnull__ in this compilation unit.  Otherwise gcc
    optimizes away the sa == NULL test below.  */
 #define _GL_ARG_NONNULL(params)
 
+#include <config.h>
+
 #include <netdb.h>
 
 #if HAVE_NETINET_IN_H
diff --git a/lib/getcwd-lgpl.c b/lib/getcwd-lgpl.c
index d550f35c..044c0000 100644
--- a/lib/getcwd-lgpl.c
+++ b/lib/getcwd-lgpl.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011-2013 Free Software Foundation, Inc.
+/* Copyright (C) 2011-2014 Free Software Foundation, Inc.
    This file is part of gnulib.
 
    This program is free software: you can redistribute it and/or modify
@@ -20,6 +20,7 @@
 #include <unistd.h>
 
 #include <errno.h>
+#include <stdlib.h>
 #include <string.h>
 
 #if GNULIB_GETCWD
diff --git a/lib/getcwd.c b/lib/getcwd.c
index 4b781389..1a013f47 100644
--- a/lib/getcwd.c
+++ b/lib/getcwd.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1999, 2004-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1999, 2004-2014 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
@@ -135,7 +135,7 @@ __getcwd (char *buf, size_t size)
   size_t allocated = size;
   size_t used;
 
-#if HAVE_RAW_DECL_GETCWD && HAVE_MINIMALLY_WORKING_GETCWD
+#if HAVE_MINIMALLY_WORKING_GETCWD
   /* If AT_FDCWD is not defined, the algorithm below is O(N**2) and
      this is much slower than the system getcwd (at least on
      GNU/Linux).  So trust the system getcwd's results unless they
diff --git a/lib/getdelim.c b/lib/getdelim.c
index 966bf764..e5714baf 100644
--- a/lib/getdelim.c
+++ b/lib/getdelim.c
@@ -1,5 +1,5 @@
 /* getdelim.c --- Implementation of replacement getdelim function.
-   Copyright (C) 1994, 1996-1998, 2001, 2003, 2005-2013 Free Software
+   Copyright (C) 1994, 1996-1998, 2001, 2003, 2005-2014 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
@@ -17,12 +17,12 @@
 
 /* Ported from glibc by Simon Josefsson. */
 
-#include <config.h>
-
 /* Don't use __attribute__ __nonnull__ in this compilation unit.  Otherwise gcc
    optimizes away the lineptr == NULL || n == NULL || fp == NULL tests below.  */
 #define _GL_ARG_NONNULL(params)
 
+#include <config.h>
+
 #include <stdio.h>
 
 #include <limits.h>
diff --git a/lib/getdtablesize.c b/lib/getdtablesize.c
index 9947405a..946738cd 100644
--- a/lib/getdtablesize.c
+++ b/lib/getdtablesize.c
@@ -1,5 +1,5 @@
 /* getdtablesize() function for platforms that don't have it.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
@@ -22,11 +22,11 @@
 
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 
-#include <stdio.h>
+# include <stdio.h>
 
-#include "msvc-inval.h"
+# include "msvc-inval.h"
 
-#if HAVE_MSVC_INVALID_PARAMETER_HANDLER
+# if HAVE_MSVC_INVALID_PARAMETER_HANDLER
 static int
 _setmaxstdio_nothrow (int newmax)
 {
@@ -44,10 +44,11 @@ _setmaxstdio_nothrow (int newmax)
 
   return result;
 }
-# define _setmaxstdio _setmaxstdio_nothrow
-#endif
+#  define _setmaxstdio _setmaxstdio_nothrow
+# endif
 
-/* Cache for the previous getdtablesize () result.  */
+/* Cache for the previous getdtablesize () result.  Safe to cache because
+   Windows also lacks setrlimit.  */
 static int dtablesize;
 
 int
@@ -83,4 +84,24 @@ getdtablesize (void)
   return dtablesize;
 }
 
+#elif HAVE_GETDTABLESIZE
+
+# include <sys/resource.h>
+# undef getdtablesize
+
+int
+rpl_getdtablesize(void)
+{
+  /* To date, this replacement is only compiled for Cygwin 1.7.25,
+     which auto-increased the RLIMIT_NOFILE soft limit until it
+     hits the compile-time constant hard limit of 3200.  Although
+     that version of cygwin supported a child process inheriting
+     a smaller soft limit, the smaller limit is not enforced, so
+     we might as well just report the hard limit.  */
+  struct rlimit lim;
+  if (!getrlimit (RLIMIT_NOFILE, &lim) && lim.rlim_max != RLIM_INFINITY)
+    return lim.rlim_max;
+  return getdtablesize ();
+}
+
 #endif
diff --git a/lib/getfilecon.c b/lib/getfilecon.c
index 29e16ec9..2aa489e5 100644
--- a/lib/getfilecon.c
+++ b/lib/getfilecon.c
@@ -1,5 +1,5 @@
 /* wrap getfilecon, lgetfilecon, and fgetfilecon
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/getgroups.c b/lib/getgroups.c
index 9856adc1..91a340f3 100644
--- a/lib/getgroups.c
+++ b/lib/getgroups.c
@@ -1,6 +1,6 @@
 /* provide consistent interface to getgroups for systems that don't allow N==0
 
-   Copyright (C) 1996, 1999, 2003, 2006-2013 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1999, 2003, 2006-2014 Free Software Foundation, Inc.
 
    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
@@ -43,6 +43,21 @@ getgroups (int n _GL_UNUSED, GETGROUPS_T *groups _GL_UNUSED)
 #  define GETGROUPS_ZERO_BUG 0
 # endif
 
+/* On OS X 10.6 and later, use the usual getgroups, not the one
+   supplied when _DARWIN_C_SOURCE is defined.  _DARWIN_C_SOURCE is
+   normally defined, since it means "conform to POSIX, but add
+   non-POSIX extensions even if that violates the POSIX namespace
+   rules", which is what we normally want.  But with getgroups there
+   is an inconsistency, and _DARWIN_C_SOURCE means "change getgroups()
+   so that it no longer works right".  The BUGS section of compat(5)
+   says that the behavior is dubious if you compile different sections
+   of a program with different _DARWIN_C_SOURCE settings, so fix only
+   the offending symbol.  */
+# ifdef __APPLE__
+int posix_getgroups (int, gid_t []) __asm ("_getgroups");
+#  define getgroups posix_getgroups
+# endif
+
 /* On at least Ultrix 4.3 and NextStep 3.2, getgroups (0, NULL) always
    fails.  On other systems, it returns the number of supplemental
    groups for the process.  This function handles that special case
@@ -86,7 +101,7 @@ rpl_getgroups (int n, gid_t *group)
         }
       saved_errno = errno;
       free (gbuf);
-      errno == saved_errno;
+      errno = saved_errno;
       return result;
     }
 
diff --git a/lib/gethostname.c b/lib/gethostname.c
index 22015732..785fd715 100644
--- a/lib/gethostname.c
+++ b/lib/gethostname.c
@@ -1,6 +1,6 @@
 /* gethostname emulation for SysV and POSIX.1.
 
-   Copyright (C) 1992, 2003, 2006, 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 1992, 2003, 2006, 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/gethrxtime.c b/lib/gethrxtime.c
index 10d2ab98..788ef56e 100644
--- a/lib/gethrxtime.c
+++ b/lib/gethrxtime.c
@@ -1,6 +1,6 @@
 /* gethrxtime -- get high resolution real time
 
-   Copyright (C) 2005-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/gethrxtime.h b/lib/gethrxtime.h
index 10df6712..87dcdcf8 100644
--- a/lib/gethrxtime.h
+++ b/lib/gethrxtime.h
@@ -1,6 +1,6 @@
 /* gethrxtime -- get high resolution real time
 
-   Copyright (C) 2005, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -22,6 +22,9 @@
 
 #include "xtime.h"
 
+#ifndef _GL_INLINE_HEADER_BEGIN
+ #error "Please include config.h first."
+#endif
 _GL_INLINE_HEADER_BEGIN
 #ifndef GETHRXTIME_INLINE
 # define GETHRXTIME_INLINE _GL_INLINE
diff --git a/lib/getline.c b/lib/getline.c
index 1aa07b9c..5282e80f 100644
--- a/lib/getline.c
+++ b/lib/getline.c
@@ -1,5 +1,5 @@
 /* getline.c --- Implementation of replacement getline function.
-   Copyright (C) 2005-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2007, 2009-2014 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/lib/getloadavg.c b/lib/getloadavg.c
index 6e228191..cdba5259 100644
--- a/lib/getloadavg.c
+++ b/lib/getloadavg.c
@@ -1,6 +1,6 @@
 /* Get the system load averages.
 
-   Copyright (C) 1985-1989, 1991-1995, 1997, 1999-2000, 2003-2013 Free Software
+   Copyright (C) 1985-1989, 1991-1995, 1997, 1999-2000, 2003-2014 Free Software
    Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with gnulib.
diff --git a/lib/getlogin.c b/lib/getlogin.c
index c02b0b9c..3737d36c 100644
--- a/lib/getlogin.c
+++ b/lib/getlogin.c
@@ -1,6 +1,6 @@
 /* Provide a working getlogin for systems which lack it.
 
-   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/getndelim2.c b/lib/getndelim2.c
index a5e8a666..d19e55c8 100644
--- a/lib/getndelim2.c
+++ b/lib/getndelim2.c
@@ -1,7 +1,7 @@
 /* getndelim2 - Read a line from a stream, stopping at one of 2 delimiters,
    with bounded memory allocation.
 
-   Copyright (C) 1993, 1996-1998, 2000, 2003-2004, 2006, 2008-2013 Free
+   Copyright (C) 1993, 1996-1998, 2000, 2003-2004, 2006, 2008-2014 Free
    Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/getndelim2.h b/lib/getndelim2.h
index 774fc90c..badf7836 100644
--- a/lib/getndelim2.h
+++ b/lib/getndelim2.h
@@ -1,7 +1,7 @@
 /* getndelim2 - Read a line from a stream, stopping at one of 2 delimiters,
    with bounded memory allocation.
 
-   Copyright (C) 2003-2004, 2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2003-2004, 2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/getopt.c b/lib/getopt.c
index ef0f4cee..7d950af1 100644
--- a/lib/getopt.c
+++ b/lib/getopt.c
@@ -2,7 +2,7 @@
    NOTE: getopt is part of the C library, so if you don't know what
    "Keep this file name-space clean" means, talk to drepper@gnu.org
    before changing it!
-   Copyright (C) 1987-1996, 1998-2004, 2006, 2008-2013 Free Software
+   Copyright (C) 1987-1996, 1998-2004, 2006, 2008-2014 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
diff --git a/lib/getopt.in.h b/lib/getopt.in.h
index d9c7d814..7ab99fb8 100644
--- a/lib/getopt.in.h
+++ b/lib/getopt.in.h
@@ -1,5 +1,5 @@
 /* Declarations for getopt.
-   Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2013 Free Software
+   Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2014 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
diff --git a/lib/getopt1.c b/lib/getopt1.c
index 55a6b4ea..a184865e 100644
--- a/lib/getopt1.c
+++ b/lib/getopt1.c
@@ -1,5 +1,5 @@
 /* getopt_long and getopt_long_only entry points for GNU getopt.
-   Copyright (C) 1987-1994, 1996-1998, 2004, 2006, 2009-2013 Free Software
+   Copyright (C) 1987-1994, 1996-1998, 2004, 2006, 2009-2014 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
diff --git a/lib/getopt_int.h b/lib/getopt_int.h
index a6e4b9ea..24ed672e 100644
--- a/lib/getopt_int.h
+++ b/lib/getopt_int.h
@@ -1,5 +1,5 @@
 /* Internal declarations for getopt.
-   Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2004, 2009-2013 Free Software
+   Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2004, 2009-2014 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
diff --git a/lib/getpagesize.c b/lib/getpagesize.c
index 274c591a..86e12710 100644
--- a/lib/getpagesize.c
+++ b/lib/getpagesize.c
@@ -1,6 +1,6 @@
 /* getpagesize emulation for systems where it cannot be done in a C macro.
 
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/getpass.c b/lib/getpass.c
index 3c9c4d8a..1fee36ba 100644
--- a/lib/getpass.c
+++ b/lib/getpass.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992-2001, 2003-2007, 2009-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1992-2001, 2003-2007, 2009-2014 Free Software Foundation, Inc.
 
    This file is part of the GNU C Library.
 
diff --git a/lib/getpass.h b/lib/getpass.h
index 9b59abb1..1e03cbd7 100644
--- a/lib/getpass.h
+++ b/lib/getpass.h
@@ -1,5 +1,5 @@
 /* getpass.h -- Read a password of arbitrary length from /dev/tty or stdin.
-   Copyright (C) 2004, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2009-2014 Free Software Foundation, Inc.
    Contributed by Simon Josefsson <jas@extundo.com>, 2004.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib/gettext.h b/lib/gettext.h
index d0215715..c7d6fd34 100644
--- a/lib/gettext.h
+++ b/lib/gettext.h
@@ -1,5 +1,5 @@
 /* Convenience header for conditional use of GNU <libintl.h>.
-   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2013 Free Software
+   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib/gettime.c b/lib/gettime.c
index 0a642dd2..1b4ca8d2 100644
--- a/lib/gettime.c
+++ b/lib/gettime.c
@@ -1,6 +1,6 @@
 /* gettime -- get the system clock
 
-   Copyright (C) 2002, 2004-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004-2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/gettimeofday.c b/lib/gettimeofday.c
index ad65c6da..8b2058e8 100644
--- a/lib/gettimeofday.c
+++ b/lib/gettimeofday.c
@@ -1,6 +1,6 @@
 /* Provide gettimeofday for systems that don't have it or for which it's broken.
 
-   Copyright (C) 2001-2003, 2005-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/getugroups.c b/lib/getugroups.c
index 725f0246..d6634baf 100644
--- a/lib/getugroups.c
+++ b/lib/getugroups.c
@@ -1,6 +1,6 @@
 /* getugroups.c -- return a list of the groups a user is in
 
-   Copyright (C) 1990-1991, 1998-2000, 2003-2013 Free Software Foundation, Inc.
+   Copyright (C) 1990-1991, 1998-2000, 2003-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/getugroups.h b/lib/getugroups.h
index 90cc55fe..4a5a5e86 100644
--- a/lib/getugroups.h
+++ b/lib/getugroups.h
@@ -1,5 +1,5 @@
 /* Get a list of group IDs associated with a specified user ID.
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/getusershell.c b/lib/getusershell.c
index f938dcaa..ba5c5484 100644
--- a/lib/getusershell.c
+++ b/lib/getusershell.c
@@ -1,6 +1,6 @@
 /* getusershell.c -- Return names of valid user shells.
 
-   Copyright (C) 1991, 1997, 2000-2001, 2003-2006, 2008-2013 Free Software
+   Copyright (C) 1991, 1997, 2000-2001, 2003-2006, 2008-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/gl_openssl.h b/lib/gl_openssl.h
new file mode 100644
index 00000000..24144215
--- /dev/null
+++ b/lib/gl_openssl.h
@@ -0,0 +1,116 @@
+/* gl_openssl.h -- wrap openssl crypto hash routines in gnulib interface
+
+   Copyright (C) 2013-2014 Free Software Foundation, Inc.
+
+   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 3 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/>.  */
+
+/* Written by Pádraig Brady */
+
+#ifndef GL_OPENSSL_NAME
+# error "Please define GL_OPENSSL_NAME to 1,5,256 etc."
+#endif
+
+#ifndef _GL_INLINE_HEADER_BEGIN
+# error "Please include config.h first."
+#endif
+_GL_INLINE_HEADER_BEGIN
+#ifndef GL_OPENSSL_INLINE
+# define GL_OPENSSL_INLINE _GL_INLINE
+#endif
+
+/* Concatenate two preprocessor tokens.  */
+#define _GLCRYPTO_CONCAT_(prefix, suffix) prefix##suffix
+#define _GLCRYPTO_CONCAT(prefix, suffix) _GLCRYPTO_CONCAT_ (prefix, suffix)
+
+#if GL_OPENSSL_NAME == 5
+# define OPENSSL_ALG md5
+#else
+# define OPENSSL_ALG _GLCRYPTO_CONCAT (sha, GL_OPENSSL_NAME)
+#endif
+
+/* Context type mappings.  */
+#if BASE_OPENSSL_TYPE != GL_OPENSSL_NAME
+# undef BASE_OPENSSL_TYPE
+# if GL_OPENSSL_NAME == 224
+#  define BASE_OPENSSL_TYPE 256
+# elif GL_OPENSSL_NAME == 384
+#  define BASE_OPENSSL_TYPE 512
+# endif
+# define md5_CTX MD5_CTX
+# define sha1_CTX SHA_CTX
+# define sha224_CTX SHA256_CTX
+# define sha224_ctx sha256_ctx
+# define sha256_CTX SHA256_CTX
+# define sha384_CTX SHA512_CTX
+# define sha384_ctx sha512_ctx
+# define sha512_CTX SHA512_CTX
+# undef _gl_CTX
+# undef _gl_ctx
+# define _gl_CTX _GLCRYPTO_CONCAT (OPENSSL_ALG, _CTX) /* openssl type.  */
+# define _gl_ctx _GLCRYPTO_CONCAT (OPENSSL_ALG, _ctx) /* gnulib type.  */
+
+struct _gl_ctx { _gl_CTX CTX; };
+#endif
+
+/* Function name mappings.  */
+#define md5_prefix MD5
+#define sha1_prefix SHA1
+#define sha224_prefix SHA224
+#define sha256_prefix SHA256
+#define sha384_prefix SHA384
+#define sha512_prefix SHA512
+#define _GLCRYPTO_PREFIX _GLCRYPTO_CONCAT (OPENSSL_ALG, _prefix)
+#define OPENSSL_FN(suffix) _GLCRYPTO_CONCAT (_GLCRYPTO_PREFIX, suffix)
+#define GL_CRYPTO_FN(suffix) _GLCRYPTO_CONCAT (OPENSSL_ALG, suffix)
+
+GL_OPENSSL_INLINE void
+GL_CRYPTO_FN (_init_ctx) (struct _gl_ctx *ctx)
+{ (void) OPENSSL_FN (_Init) ((_gl_CTX *) ctx); }
+
+/* These were never exposed by gnulib.  */
+#if ! (GL_OPENSSL_NAME == 224 || GL_OPENSSL_NAME == 384)
+GL_OPENSSL_INLINE void
+GL_CRYPTO_FN (_process_bytes) (const void *buf, size_t len, struct _gl_ctx *ctx)
+{ OPENSSL_FN (_Update) ((_gl_CTX *) ctx, buf, len); }
+
+GL_OPENSSL_INLINE void
+GL_CRYPTO_FN (_process_block) (const void *buf, size_t len, struct _gl_ctx *ctx)
+{ GL_CRYPTO_FN (_process_bytes) (buf, len, ctx); }
+#endif
+
+GL_OPENSSL_INLINE void *
+GL_CRYPTO_FN (_finish_ctx) (struct _gl_ctx *ctx, void *res)
+{ OPENSSL_FN (_Final) ((unsigned char *) res, (_gl_CTX *) ctx); return res; }
+
+GL_OPENSSL_INLINE void *
+GL_CRYPTO_FN (_buffer) (const char *buf, size_t len, void *res)
+{ return OPENSSL_FN () ((const unsigned char *) buf, len, (unsigned char *) res); }
+
+GL_OPENSSL_INLINE void *
+GL_CRYPTO_FN (_read_ctx) (const struct _gl_ctx *ctx, void *res)
+{
+  /* Assume any unprocessed bytes in ctx are not to be ignored.  */
+  _gl_CTX tmp_ctx = *(_gl_CTX *) ctx;
+  OPENSSL_FN (_Final) ((unsigned char *) res, &tmp_ctx);
+  return res;
+}
+
+/* Undef so we can include multiple times.  */
+#undef GL_CRYPTO_FN
+#undef OPENSSL_FN
+#undef _GLCRYPTO_PREFIX
+#undef OPENSSL_ALG
+#undef GL_OPENSSL_NAME
+
+_GL_INLINE_HEADER_END
diff --git a/lib/glthread/lock.c b/lib/glthread/lock.c
index f62aa301..33c15a0d 100644
--- a/lib/glthread/lock.c
+++ b/lib/glthread/lock.c
@@ -1,5 +1,5 @@
 /* Locking in multithreaded situations.
-   Copyright (C) 2005-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/glthread/lock.h b/lib/glthread/lock.h
index d20bbdef..36096c4b 100644
--- a/lib/glthread/lock.h
+++ b/lib/glthread/lock.h
@@ -1,5 +1,5 @@
 /* Locking in multithreaded situations.
-   Copyright (C) 2005-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/glthread/threadlib.c b/lib/glthread/threadlib.c
index b4476573..26870de2 100644
--- a/lib/glthread/threadlib.c
+++ b/lib/glthread/threadlib.c
@@ -1,5 +1,5 @@
 /* Multithreading primitives.
-   Copyright (C) 2005-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/glthread/tls.c b/lib/glthread/tls.c
index bcd285c2..971c72ab 100644
--- a/lib/glthread/tls.c
+++ b/lib/glthread/tls.c
@@ -1,5 +1,5 @@
 /* Thread-local storage in multithreaded situations.
-   Copyright (C) 2005-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/glthread/tls.h b/lib/glthread/tls.h
index 2afe0b43..c0a56e49 100644
--- a/lib/glthread/tls.h
+++ b/lib/glthread/tls.h
@@ -1,5 +1,5 @@
 /* Thread-local storage in multithreaded situations.
-   Copyright (C) 2005, 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/gnulib.mk b/lib/gnulib.mk
index 6d6a0d72..e1d74db7 100644
--- a/lib/gnulib.mk
+++ b/lib/gnulib.mk
@@ -1,6 +1,6 @@
 ## DO NOT EDIT! GENERATED AUTOMATICALLY!
 ## Process this file with automake to produce Makefile.in.
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 #
 # 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
@@ -21,7 +21,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl --lib=libcoreutils --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=gnulib-tests --aux-dir=build-aux --with-tests --avoid=canonicalize-lgpl --avoid=dummy --makefile-name=gnulib.mk --no-conditional-dependencies --no-libtool --macro-prefix=gl acl alignof alloca announce-gen areadlink-with-size argmatch argv-iter assert autobuild backupfile base64 buffer-lcm c-strcase c-strtod c-strtold calloc-gnu canon-host canonicalize chown cloexec closein closeout config-h configmake crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 cycle-check d-ino d-type di-set diacrit dirfd dirname do-release-commit-and-tag dtoastr dup2 environ error euidaccess exclude exitfail faccessat fadvise fchdir fchmodat fchownat fclose fcntl fcntl-safer fd-reopen fdatasync fdl fdopen fdutimensat file-type fileblocks filemode filenamecat filevercmp fnmatch-gnu fopen-safer fprintftime freopen freopen-safer fseeko fstatat fsusage fsync ftello ftoastr ftruncate fts full-read full-write getgroups gethrxtime getline getloadavg getlogin getndelim2 getopt-gnu getpagesize getpass-gnu gettext-h gettime gettimeofday getugroups getusershell git-version-gen gitlog-to-changelog gnu-make gnu-web-doc-update gnumakefile gnupload group-member hard-locale hash hash-pjw heap host-os human idcache ignore-value inttostr inttypes isapipe isatty isblank largefile lchmod lchown ldtoastr lib-ignore linebuffer link link-follow linkat long-options lstat maintainer-makefile malloc-gnu manywarnings mbrlen mbrtowc mbsalign mbswidth memcasecmp memchr memcmp2 mempcpy memrchr mgetgroups mkancesdirs mkdir mkdir-p mkfifo mknod mkstemp mktime modechange mountlist mpsort netinet_in non-recursive-gnulib-prefix-hack nproc obstack parse-datetime pathmax perl physmem pipe posix-shell posixtm posixver priv-set progname propername pthread putenv quote quotearg randint randperm read-file readlink readtokens readtokens0 readutmp realloc-gnu regex remove rename rmdir root-dev-ino rpmatch safe-read same save-cwd savedir savewd selinux-at settime sig2str sigaction ssize_t stat-macros stat-size stat-time statat stdbool stdlib-safer stpcpy stpncpy strdup-posix strftime strncat strnumcmp strpbrk strsignal strtod strtoimax strtoumax symlink sys_ioctl sys_resource sys_stat sys_wait termios timer-time timespec tzset uname unicodeio unistd-safer unlink-busy unlinkat unlocked-io unsetenv update-copyright uptime useless-if-before-free userspec utimecmp utimens vasprintf-posix vc-list-files verify verror version-etc-fsf wcswidth wcwidth winsz-ioctl winsz-termios write-any-file xalloc xfreopen xfts xgetcwd xgetgroups xgethostname xmemcoll xnanosleep xprintf xprintf-posix xreadlink xstrtod xstrtoimax xstrtol xstrtold xstrtoumax yesno
+# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl --lib=libcoreutils --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=gnulib-tests --aux-dir=build-aux --with-tests --avoid=canonicalize-lgpl --avoid=dummy --makefile-name=gnulib.mk --no-conditional-dependencies --no-libtool --macro-prefix=gl acl alignof alloca announce-gen areadlink-with-size argmatch argv-iter assert autobuild backupfile base64 buffer-lcm c-strcase c-strtod c-strtold calloc-gnu canon-host canonicalize chown cloexec closein closeout config-h configmake crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 cycle-check d-ino d-type di-set diacrit dirfd dirname do-release-commit-and-tag dtoastr dup2 environ error euidaccess exclude exitfail faccessat fadvise fchdir fchmodat fchownat fclose fcntl fcntl-safer fd-reopen fdatasync fdl fdopen fdutimensat file-type fileblocks filemode filenamecat filevercmp fnmatch-gnu fopen-safer fprintftime freopen freopen-safer fseeko fstatat fsusage fsync ftello ftoastr ftruncate fts full-read full-write getgroups gethrxtime getline getloadavg getlogin getndelim2 getopt-gnu getpagesize getpass-gnu gettext-h gettime gettimeofday getugroups getusershell git-version-gen gitlog-to-changelog gnu-make gnu-web-doc-update gnumakefile gnupload group-member hard-locale hash hash-pjw heap host-os human idcache ignore-value inttostr inttypes isapipe isatty isblank largefile lchmod lchown ldtoastr lib-ignore linebuffer link link-follow linkat long-options lstat maintainer-makefile malloc-gnu manywarnings mbrlen mbrtowc mbsalign mbswidth memcasecmp memchr memcmp2 mempcpy memrchr mgetgroups mkancesdirs mkdir mkdir-p mkfifo mknod mkstemp mktime modechange mountlist mpsort netinet_in non-recursive-gnulib-prefix-hack nproc obstack parse-datetime pathmax perl physmem pipe-posix posix-shell posixtm posixver priv-set progname propername pthread putenv quote quotearg randint randperm read-file readlink readtokens readtokens0 readutmp realloc-gnu regex remove rename rmdir root-dev-ino rpmatch safe-read same save-cwd savedir savewd selinux-at settime sig2str sigaction smack ssize_t stat-macros stat-size stat-time statat stdbool stdlib-safer stpcpy stpncpy strdup-posix strftime strncat strnumcmp strpbrk strsignal strtod strtoimax strtoumax symlink sys_ioctl sys_resource sys_stat sys_wait termios timer-time timespec tzset uname unicodeio unistd-safer unlink-busy unlinkat unlocked-io unsetenv update-copyright uptime useless-if-before-free userspec utimecmp utimens vasprintf-posix vc-list-files verify verror version-etc-fsf wcswidth wcwidth winsz-ioctl winsz-termios write-any-file xalloc xfreopen xfts xgetcwd xgetgroups xgethostname xmemcoll xnanosleep xprintf xprintf-posix xreadlink xstrtod xstrtoimax xstrtol xstrtold xstrtoumax yesno
 
 
 MOSTLYCLEANFILES += lib/core lib/*.stackdump
@@ -33,13 +33,18 @@ lib_libcoreutils_a_LIBADD = $(gl_LIBOBJS)
 lib_libcoreutils_a_DEPENDENCIES = $(gl_LIBOBJS)
 EXTRA_lib_libcoreutils_a_SOURCES =
 
-## begin gnulib module acl
+## begin gnulib module absolute-header
 
-lib_libcoreutils_a_SOURCES += lib/set-mode-acl.c lib/copy-acl.c lib/file-has-acl.c
+# Use this preprocessor expression to decide whether #include_next works.
+# Do not rely on a 'configure'-time test for this, since the expression
+# might appear in an installed header, which is used by some other compiler.
+HAVE_INCLUDE_NEXT = lib/(__GNUC__ lib/|| lib/60000000 lib/<= lib/__DECC_VER)
 
-EXTRA_DIST += lib/acl-internal.h lib/acl.h lib/acl_entries.c
+## end   gnulib module absolute-header
 
-EXTRA_lib_libcoreutils_a_SOURCES += lib/acl_entries.c
+## begin gnulib module acl
+
+lib_libcoreutils_a_SOURCES += lib/copy-acl.c lib/set-acl.c
 
 ## end   gnulib module acl
 
@@ -198,12 +203,6 @@ lib_libcoreutils_a_SOURCES += lib/base64.h lib/base64.c
 
 ## end   gnulib module base64
 
-## begin gnulib module binary-io
-
-lib_libcoreutils_a_SOURCES += lib/binary-io.h lib/binary-io.c
-
-## end   gnulib module binary-io
-
 ## begin gnulib module bitrotate
 
 lib_libcoreutils_a_SOURCES += lib/bitrotate.h lib/bitrotate.c
@@ -375,7 +374,7 @@ EXTRA_DIST += lib/closeout.h
 ## begin gnulib module configmake
 
 # Listed in the same order as the GNU makefile conventions, and
-# provided by autoconf 2.59c+.
+# provided by autoconf 2.59c+ or 2.70.
 # The Automake-defined pkg* macros are appended, in the order
 # listed in the Automake 1.10a+ documentation.
 lib/configmake.h: Makefile
@@ -391,6 +390,7 @@ lib/configmake.h: Makefile
 	  echo '#define SYSCONFDIR "$(sysconfdir)"'; \
 	  echo '#define SHAREDSTATEDIR "$(sharedstatedir)"'; \
 	  echo '#define LOCALSTATEDIR "$(localstatedir)"'; \
+	  echo '#define RUNSTATEDIR "$(runstatedir)"'; \
 	  echo '#define INCLUDEDIR "$(includedir)"'; \
 	  echo '#define OLDINCLUDEDIR "$(oldincludedir)"'; \
 	  echo '#define DOCDIR "$(docdir)"'; \
@@ -420,7 +420,7 @@ CLEANFILES += lib/configmake.h lib/configmake.h-t
 
 lib_libcoreutils_a_SOURCES += lib/md5.c
 
-EXTRA_DIST += lib/md5.h
+EXTRA_DIST += lib/gl_openssl.h lib/md5.h
 
 ## end   gnulib module crypto/md5
 
@@ -428,7 +428,7 @@ EXTRA_DIST += lib/md5.h
 
 lib_libcoreutils_a_SOURCES += lib/sha1.c
 
-EXTRA_DIST += lib/sha1.h
+EXTRA_DIST += lib/gl_openssl.h lib/sha1.h
 
 ## end   gnulib module crypto/sha1
 
@@ -436,7 +436,7 @@ EXTRA_DIST += lib/sha1.h
 
 lib_libcoreutils_a_SOURCES += lib/sha256.c
 
-EXTRA_DIST += lib/sha256.h
+EXTRA_DIST += lib/gl_openssl.h lib/sha256.h
 
 ## end   gnulib module crypto/sha256
 
@@ -444,7 +444,7 @@ EXTRA_DIST += lib/sha256.h
 
 lib_libcoreutils_a_SOURCES += lib/sha512.c
 
-EXTRA_DIST += lib/sha512.h
+EXTRA_DIST += lib/gl_openssl.h lib/sha512.h
 
 ## end   gnulib module crypto/sha512
 
@@ -716,12 +716,6 @@ lib_libcoreutils_a_SOURCES += lib/fadvise.c lib/fadvise.h
 
 ## end   gnulib module fadvise
 
-## begin gnulib module fatal-signal
-
-lib_libcoreutils_a_SOURCES += lib/fatal-signal.h lib/fatal-signal.c
-
-## end   gnulib module fatal-signal
-
 ## begin gnulib module fchdir
 
 
@@ -1711,6 +1705,7 @@ lib/inttypes.h: lib/inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(W
 	      -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \
 	      -e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \
 	      -e 's/@''REPLACE_STRTOIMAX''@/$(REPLACE_STRTOIMAX)/g' \
+	      -e 's/@''REPLACE_STRTOUMAX''@/$(REPLACE_STRTOUMAX)/g' \
 	      -e 's/@''INT32_MAX_LT_INTMAX_MAX''@/$(INT32_MAX_LT_INTMAX_MAX)/g' \
 	      -e 's/@''INT64_MAX_EQ_LONG_MAX''@/$(INT64_MAX_EQ_LONG_MAX)/g' \
 	      -e 's/@''UINT32_MAX_LT_UINTMAX_MAX''@/$(UINT32_MAX_LT_UINTMAX_MAX)/g' \
@@ -2793,24 +2788,14 @@ EXTRA_DIST += lib/physmem.h
 
 ## end   gnulib module physmem
 
-## begin gnulib module pipe
-
-
-EXTRA_DIST += lib/pipe.h
-
-## end   gnulib module pipe
-
-## begin gnulib module pipe2
-
-lib_libcoreutils_a_SOURCES += lib/pipe2.c
+## begin gnulib module pipe-posix
 
-## end   gnulib module pipe2
 
-## begin gnulib module pipe2-safer
+EXTRA_DIST += lib/pipe.c
 
-lib_libcoreutils_a_SOURCES += lib/pipe2-safer.c
+EXTRA_lib_libcoreutils_a_SOURCES += lib/pipe.c
 
-## end   gnulib module pipe2-safer
+## end   gnulib module pipe-posix
 
 ## begin gnulib module posix-shell
 
@@ -2827,105 +2812,6 @@ lib_libcoreutils_a_SOURCES += lib/pipe2-safer.c
 
 ## end   gnulib module posix-shell
 
-## begin gnulib module posix_spawn-internal
-
-
-EXTRA_DIST += lib/spawn_int.h lib/spawni.c
-
-EXTRA_lib_libcoreutils_a_SOURCES += lib/spawni.c
-
-## end   gnulib module posix_spawn-internal
-
-## begin gnulib module posix_spawn_file_actions_addclose
-
-
-EXTRA_DIST += lib/spawn_faction_addclose.c lib/spawn_int.h
-
-EXTRA_lib_libcoreutils_a_SOURCES += lib/spawn_faction_addclose.c
-
-## end   gnulib module posix_spawn_file_actions_addclose
-
-## begin gnulib module posix_spawn_file_actions_adddup2
-
-
-EXTRA_DIST += lib/spawn_faction_adddup2.c lib/spawn_int.h
-
-EXTRA_lib_libcoreutils_a_SOURCES += lib/spawn_faction_adddup2.c
-
-## end   gnulib module posix_spawn_file_actions_adddup2
-
-## begin gnulib module posix_spawn_file_actions_addopen
-
-
-EXTRA_DIST += lib/spawn_faction_addopen.c lib/spawn_int.h
-
-EXTRA_lib_libcoreutils_a_SOURCES += lib/spawn_faction_addopen.c
-
-## end   gnulib module posix_spawn_file_actions_addopen
-
-## begin gnulib module posix_spawn_file_actions_destroy
-
-
-EXTRA_DIST += lib/spawn_faction_destroy.c
-
-EXTRA_lib_libcoreutils_a_SOURCES += lib/spawn_faction_destroy.c
-
-## end   gnulib module posix_spawn_file_actions_destroy
-
-## begin gnulib module posix_spawn_file_actions_init
-
-
-EXTRA_DIST += lib/spawn_faction_init.c lib/spawn_int.h
-
-EXTRA_lib_libcoreutils_a_SOURCES += lib/spawn_faction_init.c
-
-## end   gnulib module posix_spawn_file_actions_init
-
-## begin gnulib module posix_spawnattr_destroy
-
-
-EXTRA_DIST += lib/spawnattr_destroy.c
-
-EXTRA_lib_libcoreutils_a_SOURCES += lib/spawnattr_destroy.c
-
-## end   gnulib module posix_spawnattr_destroy
-
-## begin gnulib module posix_spawnattr_init
-
-
-EXTRA_DIST += lib/spawnattr_init.c
-
-EXTRA_lib_libcoreutils_a_SOURCES += lib/spawnattr_init.c
-
-## end   gnulib module posix_spawnattr_init
-
-## begin gnulib module posix_spawnattr_setflags
-
-
-EXTRA_DIST += lib/spawnattr_setflags.c
-
-EXTRA_lib_libcoreutils_a_SOURCES += lib/spawnattr_setflags.c
-
-## end   gnulib module posix_spawnattr_setflags
-
-## begin gnulib module posix_spawnattr_setsigmask
-
-
-EXTRA_DIST += lib/spawnattr_setsigmask.c
-
-EXTRA_lib_libcoreutils_a_SOURCES += lib/spawnattr_setsigmask.c
-
-## end   gnulib module posix_spawnattr_setsigmask
-
-## begin gnulib module posix_spawnp
-
-
-EXTRA_DIST += lib/spawnp.c
-
-EXTRA_lib_libcoreutils_a_SOURCES += lib/spawnp.c
-
-## end   gnulib module posix_spawnp
-
 ## begin gnulib module posixtm
 
 lib_libcoreutils_a_SOURCES += lib/posixtm.c
@@ -3022,6 +2908,16 @@ EXTRA_lib_libcoreutils_a_SOURCES += lib/putenv.c
 
 ## end   gnulib module putenv
 
+## begin gnulib module qacl
+
+lib_libcoreutils_a_SOURCES += lib/acl-errno-valid.c lib/file-has-acl.c lib/qcopy-acl.c lib/qset-acl.c
+
+EXTRA_DIST += lib/acl-internal.h lib/acl.h lib/acl_entries.c
+
+EXTRA_lib_libcoreutils_a_SOURCES += lib/acl_entries.c
+
+## end   gnulib module qacl
+
 ## begin gnulib module quote
 
 
@@ -3064,15 +2960,6 @@ lib_libcoreutils_a_SOURCES += lib/randread.c lib/randread.h lib/rand-isaac.c lib
 
 ## end   gnulib module randread
 
-## begin gnulib module rawmemchr
-
-
-EXTRA_DIST += lib/rawmemchr.c lib/rawmemchr.valgrind
-
-EXTRA_lib_libcoreutils_a_SOURCES += lib/rawmemchr.c
-
-## end   gnulib module rawmemchr
-
 ## begin gnulib module read
 
 
@@ -3310,6 +3197,15 @@ EXTRA_DIST += lib/sched.in.h
 
 ## end   gnulib module sched
 
+## begin gnulib module secure_getenv
+
+
+EXTRA_DIST += lib/secure_getenv.c
+
+EXTRA_lib_libcoreutils_a_SOURCES += lib/secure_getenv.c
+
+## end   gnulib module secure_getenv
+
 ## begin gnulib module select
 
 
@@ -3473,6 +3369,12 @@ lib_libcoreutils_a_SOURCES += lib/size_max.h
 
 ## end   gnulib module size_max
 
+## begin gnulib module smack
+
+lib_libcoreutils_a_SOURCES += lib/smack.h
+
+## end   gnulib module smack
+
 ## begin gnulib module snippet/_Noreturn
 
 # Because this Makefile snippet defines a variable used by other
@@ -3596,67 +3498,6 @@ EXTRA_DIST += lib/w32sock.h
 
 ## end   gnulib module sockets
 
-## begin gnulib module spawn
-
-BUILT_SOURCES += lib/spawn.h
-
-# We need the following in order to create a replacement for <spawn.h> when
-# the system doesn't have one.
-lib/spawn.h: lib/spawn.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-	      -e 's|@''HAVE_SPAWN_H''@|$(HAVE_SPAWN_H)|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-	      -e 's|@''NEXT_SPAWN_H''@|$(NEXT_SPAWN_H)|g' \
-	      -e 's/@''GNULIB_POSIX_SPAWN''@/$(GNULIB_POSIX_SPAWN)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNP''@/$(GNULIB_POSIX_SPAWNP)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_DESTROY''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_DESTROY)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_INIT''@/$(GNULIB_POSIX_SPAWNATTR_INIT)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_GETFLAGS''@/$(GNULIB_POSIX_SPAWNATTR_GETFLAGS)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_SETFLAGS''@/$(GNULIB_POSIX_SPAWNATTR_SETFLAGS)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_GETPGROUP''@/$(GNULIB_POSIX_SPAWNATTR_GETPGROUP)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_SETPGROUP''@/$(GNULIB_POSIX_SPAWNATTR_SETPGROUP)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_GETSCHEDPARAM''@/$(GNULIB_POSIX_SPAWNATTR_GETSCHEDPARAM)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_SETSCHEDPARAM''@/$(GNULIB_POSIX_SPAWNATTR_SETSCHEDPARAM)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_GETSCHEDPOLICY''@/$(GNULIB_POSIX_SPAWNATTR_GETSCHEDPOLICY)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_SETSCHEDPOLICY''@/$(GNULIB_POSIX_SPAWNATTR_SETSCHEDPOLICY)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_GETSIGDEFAULT''@/$(GNULIB_POSIX_SPAWNATTR_GETSIGDEFAULT)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT''@/$(GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_GETSIGMASK''@/$(GNULIB_POSIX_SPAWNATTR_GETSIGMASK)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_SETSIGMASK''@/$(GNULIB_POSIX_SPAWNATTR_SETSIGMASK)/g' \
-	      -e 's/@''GNULIB_POSIX_SPAWNATTR_DESTROY''@/$(GNULIB_POSIX_SPAWNATTR_DESTROY)/g' \
-	      -e 's|@''HAVE_POSIX_SPAWN''@|$(HAVE_POSIX_SPAWN)|g' \
-	      -e 's|@''HAVE_POSIX_SPAWNATTR_T''@|$(HAVE_POSIX_SPAWNATTR_T)|g' \
-	      -e 's|@''HAVE_POSIX_SPAWN_FILE_ACTIONS_T''@|$(HAVE_POSIX_SPAWN_FILE_ACTIONS_T)|g' \
-	      -e 's|@''REPLACE_POSIX_SPAWN''@|$(REPLACE_POSIX_SPAWN)|g' \
-	      -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE)|g' \
-	      -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2)|g' \
-	      -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN)|g' \
-	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-	      < $(top_srcdir)/lib/spawn.in.h; \
-	} > $@-t && \
-	mv $@-t $@
-MOSTLYCLEANFILES += lib/spawn.h lib/spawn.h-t
-
-EXTRA_DIST += lib/spawn.in.h
-
-## end   gnulib module spawn
-
-## begin gnulib module spawn-pipe
-
-lib_libcoreutils_a_SOURCES += lib/spawn-pipe.h lib/spawn-pipe.c lib/w32spawn.h
-
-## end   gnulib module spawn-pipe
-
 ## begin gnulib module stat
 
 
@@ -4014,6 +3855,7 @@ lib/stdlib.h: lib/stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
 	      -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \
 	      -e 's/@''GNULIB_REALPATH''@/$(GNULIB_REALPATH)/g' \
 	      -e 's/@''GNULIB_RPMATCH''@/$(GNULIB_RPMATCH)/g' \
+	      -e 's/@''GNULIB_SECURE_GETENV''@/$(GNULIB_SECURE_GETENV)/g' \
 	      -e 's/@''GNULIB_SETENV''@/$(GNULIB_SETENV)/g' \
 	      -e 's/@''GNULIB_STRTOD''@/$(GNULIB_STRTOD)/g' \
 	      -e 's/@''GNULIB_STRTOLL''@/$(GNULIB_STRTOLL)/g' \
@@ -4042,6 +3884,7 @@ lib/stdlib.h: lib/stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
 	      -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \
 	      -e 's|@''HAVE_REALPATH''@|$(HAVE_REALPATH)|g' \
 	      -e 's|@''HAVE_RPMATCH''@|$(HAVE_RPMATCH)|g' \
+	      -e 's|@''HAVE_SECURE_GETENV''@|$(HAVE_SECURE_GETENV)|g' \
 	      -e 's|@''HAVE_DECL_SETENV''@|$(HAVE_DECL_SETENV)|g' \
 	      -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \
 	      -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \
@@ -4103,15 +3946,6 @@ EXTRA_lib_libcoreutils_a_SOURCES += lib/stpncpy.c
 
 ## end   gnulib module stpncpy
 
-## begin gnulib module strchrnul
-
-
-EXTRA_DIST += lib/strchrnul.c lib/strchrnul.valgrind
-
-EXTRA_lib_libcoreutils_a_SOURCES += lib/strchrnul.c
-
-## end   gnulib module strchrnul
-
 ## begin gnulib module strdup-posix
 
 
@@ -4797,6 +4631,7 @@ lib/time.h: lib/time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
 	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \
+	      -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \
 	      -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \
 	      -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \
 	      -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \
@@ -4806,6 +4641,8 @@ lib/time.h: lib/time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU
 	      -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \
 	      -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \
 	      -e 's|@''HAVE_TIMEGM''@|$(HAVE_TIMEGM)|g' \
+	      -e 's|@''REPLACE_GMTIME''@|$(REPLACE_GMTIME)|g' \
+	      -e 's|@''REPLACE_LOCALTIME''@|$(REPLACE_LOCALTIME)|g' \
 	      -e 's|@''REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \
 	      -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \
 	      -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \
@@ -4997,6 +4834,7 @@ lib/unistd.h: lib/unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_N
 	      -e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \
 	      -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \
 	      -e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \
+	      -e 's|@''REPLACE_GETDTABLESIZE''@|$(REPLACE_GETDTABLESIZE)|g' \
 	      -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \
 	      -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \
 	      -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \
@@ -5261,21 +5099,6 @@ EXTRA_lib_libcoreutils_a_SOURCES += lib/vprintf.c
 
 ## end   gnulib module vprintf-posix
 
-## begin gnulib module wait-process
-
-lib_libcoreutils_a_SOURCES += lib/wait-process.h lib/wait-process.c
-
-## end   gnulib module wait-process
-
-## begin gnulib module waitpid
-
-
-EXTRA_DIST += lib/waitpid.c
-
-EXTRA_lib_libcoreutils_a_SOURCES += lib/waitpid.c
-
-## end   gnulib module waitpid
-
 ## begin gnulib module wchar
 
 BUILT_SOURCES += lib/wchar.h
diff --git a/lib/group-member.c b/lib/group-member.c
index da015842..e869dca9 100644
--- a/lib/group-member.c
+++ b/lib/group-member.c
@@ -1,6 +1,6 @@
 /* group-member.c -- determine whether group id is in calling user's group list
 
-   Copyright (C) 1994, 1997-1998, 2003, 2005-2006, 2009-2013 Free Software
+   Copyright (C) 1994, 1997-1998, 2003, 2005-2006, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/hard-locale.c b/lib/hard-locale.c
index d55658df..93c53866 100644
--- a/lib/hard-locale.c
+++ b/lib/hard-locale.c
@@ -1,6 +1,6 @@
 /* hard-locale.c -- Determine whether a locale is hard.
 
-   Copyright (C) 1997-1999, 2002-2004, 2006-2007, 2009-2013 Free Software
+   Copyright (C) 1997-1999, 2002-2004, 2006-2007, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/hard-locale.h b/lib/hard-locale.h
index 1d43607f..ee9dd43a 100644
--- a/lib/hard-locale.h
+++ b/lib/hard-locale.h
@@ -1,6 +1,6 @@
 /* Determine whether a locale is hard.
 
-   Copyright (C) 1999, 2003-2004, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2003-2004, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/hash-pjw.c b/lib/hash-pjw.c
index e967a762..18f9f01b 100644
--- a/lib/hash-pjw.c
+++ b/lib/hash-pjw.c
@@ -1,6 +1,6 @@
 /* hash-pjw.c -- compute a hash value from a NUL-terminated string.
 
-   Copyright (C) 2001, 2003, 2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003, 2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/hash-pjw.h b/lib/hash-pjw.h
index f6dcab85..e6456134 100644
--- a/lib/hash-pjw.h
+++ b/lib/hash-pjw.h
@@ -1,5 +1,5 @@
 /* hash-pjw.h -- declaration for a simple hash function
-   Copyright (C) 2001, 2003, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/hash-triple.c b/lib/hash-triple.c
index 12359347..d305fbf5 100644
--- a/lib/hash-triple.c
+++ b/lib/hash-triple.c
@@ -1,5 +1,5 @@
 /* Hash functions for file-related triples: name, device, inode.
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/hash.c b/lib/hash.c
index 685928ec..d312a264 100644
--- a/lib/hash.c
+++ b/lib/hash.c
@@ -1,6 +1,6 @@
 /* hash - hashing table processing.
 
-   Copyright (C) 1998-2004, 2006-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 1998-2004, 2006-2007, 2009-2014 Free Software Foundation, Inc.
 
    Written by Jim Meyering, 1992.
 
diff --git a/lib/hash.h b/lib/hash.h
index bcd0d1d9..9994f5f6 100644
--- a/lib/hash.h
+++ b/lib/hash.h
@@ -1,5 +1,5 @@
 /* hash - hashing table processing.
-   Copyright (C) 1998-1999, 2001, 2003, 2009-2013 Free Software Foundation,
+   Copyright (C) 1998-1999, 2001, 2003, 2009-2014 Free Software Foundation,
    Inc.
    Written by Jim Meyering <meyering@ascend.com>, 1998.
 
diff --git a/lib/heap.c b/lib/heap.c
index af9ca1e7..75bd071a 100644
--- a/lib/heap.c
+++ b/lib/heap.c
@@ -1,6 +1,6 @@
 /* Barebones heap implementation supporting only insert and pop.
 
-   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/heap.h b/lib/heap.h
index f59a1e42..02dc2ac6 100644
--- a/lib/heap.h
+++ b/lib/heap.h
@@ -1,6 +1,6 @@
 /* Barebones heap implementation supporting only insert and pop.
 
-   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/human.c b/lib/human.c
index 613dc656..ab6b30d2 100644
--- a/lib/human.c
+++ b/lib/human.c
@@ -1,6 +1,6 @@
 /* human.c -- print human readable file size
 
-   Copyright (C) 1996-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 1996-2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/human.h b/lib/human.h
index 7ac30d55..2cb1c9e7 100644
--- a/lib/human.h
+++ b/lib/human.h
@@ -1,6 +1,6 @@
 /* human.h -- print human readable file size
 
-   Copyright (C) 1996-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 1996-2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/i-ring.c b/lib/i-ring.c
index ccab71a0..4173a03f 100644
--- a/lib/i-ring.c
+++ b/lib/i-ring.c
@@ -1,5 +1,5 @@
 /* a simple ring buffer
-   Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/i-ring.h b/lib/i-ring.h
index 1aac214b..7d993fa4 100644
--- a/lib/i-ring.h
+++ b/lib/i-ring.h
@@ -1,5 +1,5 @@
 /* definitions for a simple ring buffer
-   Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/iconv.c b/lib/iconv.c
index 6fb2f243..b5a427be 100644
--- a/lib/iconv.c
+++ b/lib/iconv.c
@@ -1,5 +1,5 @@
 /* Character set conversion.
-   Copyright (C) 1999-2001, 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 1999-2001, 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/iconv.in.h b/lib/iconv.in.h
index a88173d1..d0e98360 100644
--- a/lib/iconv.in.h
+++ b/lib/iconv.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <iconv.h>.
 
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/iconv_close.c b/lib/iconv_close.c
index 6f019a0b..d66c1155 100644
--- a/lib/iconv_close.c
+++ b/lib/iconv_close.c
@@ -1,5 +1,5 @@
 /* Character set conversion.
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/iconv_open.c b/lib/iconv_open.c
index 9a38e7e8..37ce9ce2 100644
--- a/lib/iconv_open.c
+++ b/lib/iconv_open.c
@@ -1,5 +1,5 @@
 /* Character set conversion.
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/idcache.c b/lib/idcache.c
index 8b9db5ee..8c921bfe 100644
--- a/lib/idcache.c
+++ b/lib/idcache.c
@@ -1,6 +1,6 @@
 /* idcache.c -- map user and group IDs, cached for speed
 
-   Copyright (C) 1985, 1988-1990, 1997-1998, 2003, 2005-2007, 2009-2013 Free
+   Copyright (C) 1985, 1988-1990, 1997-1998, 2003, 2005-2007, 2009-2014 Free
    Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/ignore-value.h b/lib/ignore-value.h
index 63ecde85..4dd0946d 100644
--- a/lib/ignore-value.h
+++ b/lib/ignore-value.h
@@ -1,6 +1,6 @@
 /* ignore a function return without a compiler warning
 
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
@@ -33,15 +33,18 @@
    declared with attribute warn_unused_result".  */
 
 #ifndef _GL_IGNORE_VALUE_H
-# define _GL_IGNORE_VALUE_H
-
-/* The __attribute__((__warn_unused_result__)) feature
-   is available in gcc versions 3.4 and newer,
-   while the typeof feature has been available since 2.7 at least.  */
-# if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 4)
-#  define ignore_value(x) ((void) (x))
-# else
-#  define ignore_value(x) (({ __typeof__ (x) __x = (x); (void) __x; }))
-# endif
+#define _GL_IGNORE_VALUE_H
+
+/* Normally casting an expression to void discards its value, but GCC
+   versions 3.4 and newer have __attribute__ ((__warn_unused_result__))
+   which may cause unwanted diagnostics in that case.  Use __typeof__
+   and __extension__ to work around the problem, if the workaround is
+   known to be needed.  */
+#if 3 < __GNUC__ + (4 <= __GNUC_MINOR__)
+# define ignore_value(x) \
+    (__extension__ ({ __typeof__ (x) __x = (x); (void) __x; }))
+#else
+# define ignore_value(x) ((void) (x))
+#endif
 
 #endif
diff --git a/lib/inet_ntop.c b/lib/inet_ntop.c
index fdfd21dc..c0258687 100644
--- a/lib/inet_ntop.c
+++ b/lib/inet_ntop.c
@@ -1,6 +1,6 @@
 /* inet_ntop.c -- convert IPv4 and IPv6 addresses from binary to text form
 
-   Copyright (C) 2005-2006, 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/ino-map.c b/lib/ino-map.c
index a6271607..2171279f 100644
--- a/lib/ino-map.c
+++ b/lib/ino-map.c
@@ -1,6 +1,6 @@
 /* Map an ino_t inode number to a small integer.
 
-   Copyright 2009-2013 Free Software Foundation, Inc.
+   Copyright 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/intprops.h b/lib/intprops.h
index b473052d..d0bb7a6f 100644
--- a/lib/intprops.h
+++ b/lib/intprops.h
@@ -1,6 +1,6 @@
 /* intprops.h -- properties of integer types
 
-   Copyright (C) 2001-2005, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001-2005, 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -89,7 +89,8 @@
 
 /* Return 1 if the __typeof__ keyword works.  This could be done by
    'configure', but for now it's easier to do it by hand.  */
-#if 2 <= __GNUC__ || 0x5110 <= __SUNPRO_C
+#if (2 <= __GNUC__ || defined __IBM__TYPEOF__ \
+     || (0x5110 <= __SUNPRO_C && !__STDC__))
 # define _GL_HAVE___TYPEOF__ 1
 #else
 # define _GL_HAVE___TYPEOF__ 0
diff --git a/lib/inttostr.h b/lib/inttostr.h
index 4605145a..ff58c2b6 100644
--- a/lib/inttostr.h
+++ b/lib/inttostr.h
@@ -1,6 +1,6 @@
 /* inttostr.h -- convert integers to printable strings
 
-   Copyright (C) 2001-2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001-2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/inttypes.in.h b/lib/inttypes.in.h
index 1893f556..4b2a13be 100644
--- a/lib/inttypes.in.h
+++ b/lib/inttypes.in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006-2013 Free Software Foundation, Inc.
+/* Copyright (C) 2006-2014 Free Software Foundation, Inc.
    Written by Paul Eggert, Bruno Haible, Derek Price.
    This file is part of gnulib.
 
@@ -1105,12 +1105,22 @@ _GL_WARN_ON_USE (strtoimax, "strtoimax is unportable - "
 #endif
 
 #if @GNULIB_STRTOUMAX@
-# if !@HAVE_DECL_STRTOUMAX@
-#  undef strtoumax
+# if @REPLACE_STRTOUMAX@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef strtoumax
+#   define strtoumax rpl_strtoumax
+#  endif
+_GL_FUNCDECL_RPL (strtoumax, uintmax_t,
+                  (const char *, char **, int) _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (strtoumax, uintmax_t, (const char *, char **, int));
+# else
+#  if !@HAVE_DECL_STRTOUMAX@
+#   undef strtoumax
 _GL_FUNCDECL_SYS (strtoumax, uintmax_t,
                   (const char *, char **, int) _GL_ARG_NONNULL ((1)));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (strtoumax, uintmax_t, (const char *, char **, int));
+# endif
 _GL_CXXALIASWARN (strtoumax);
 #elif defined GNULIB_POSIXCHECK
 # undef strtoumax
diff --git a/lib/isapipe.c b/lib/isapipe.c
index 8b2d09e5..b59e2359 100644
--- a/lib/isapipe.c
+++ b/lib/isapipe.c
@@ -1,6 +1,6 @@
 /* Test whether a file descriptor is a pipe.
 
-   Copyright (C) 2006, 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/isatty.c b/lib/isatty.c
index 36fbc36e..7180eadd 100644
--- a/lib/isatty.c
+++ b/lib/isatty.c
@@ -1,5 +1,5 @@
 /* isatty() replacement.
-   Copyright (C) 2012-2013 Free Software Foundation, Inc.
+   Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
    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
@@ -32,9 +32,11 @@
 /* Get _get_osfhandle().  */
 #include "msvc-nothrow.h"
 
-/* Optimized test whether a HANDLE refers to a console.
-   See <http://lists.gnu.org/archive/html/bug-gnulib/2009-08/msg00065.html>.  */
-#define IsConsoleHandle(h) (((intptr_t) (h) & 3) == 3)
+static BOOL IsConsoleHandle (HANDLE h)
+{
+  DWORD mode;
+  return GetConsoleMode (h, &mode) != 0;
+}
 
 #if HAVE_MSVC_INVALID_PARAMETER_HANDLER
 static int
diff --git a/lib/isblank.c b/lib/isblank.c
index c130af40..4e0aed1d 100644
--- a/lib/isblank.c
+++ b/lib/isblank.c
@@ -1,6 +1,6 @@
 /* Test whether a character is a blank.
 
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/isnan.c b/lib/isnan.c
index d95e4bac..878c1804 100644
--- a/lib/isnan.c
+++ b/lib/isnan.c
@@ -1,5 +1,5 @@
 /* Test for NaN that does not need libm.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
@@ -79,10 +79,21 @@ extern int rpl_isnanf (float x);
   ((sizeof (DOUBLE) + sizeof (unsigned int) - 1) / sizeof (unsigned int))
 typedef union { DOUBLE value; unsigned int word[NWORDS]; } memory_double;
 
+/* Most hosts nowadays use IEEE floating point, so they use IEC 60559
+   representations, have infinities and NaNs, and do not trap on
+   exceptions.  Define IEEE_FLOATING_POINT if this host is one of the
+   typical ones.  The C11 macro __STDC_IEC_559__ is close to what is
+   wanted here, but is not quite right because this file does not require
+   all the features of C11 Annex F (and does not require C11 at all,
+   for that matter).  */
+
+#define IEEE_FLOATING_POINT (FLT_RADIX == 2 && FLT_MANT_DIG == 24 \
+                             && FLT_MIN_EXP == -125 && FLT_MAX_EXP == 128)
+
 int
 FUNC (DOUBLE x)
 {
-#ifdef KNOWN_EXPBIT0_LOCATION
+#if defined KNOWN_EXPBIT0_LOCATION && IEEE_FLOATING_POINT
 # if defined USE_LONG_DOUBLE && ((defined __ia64 && LDBL_MANT_DIG == 64) || (defined __x86_64__ || defined __amd64__) || (defined __i386 || defined __i386__ || defined _I386 || defined _M_IX86 || defined _X86_)) && !HAVE_SAME_LONG_DOUBLE_AS_DOUBLE
   /* Special CPU dependent code is needed to treat bit patterns outside the
      IEEE 754 specification (such as Pseudo-NaNs, Pseudo-Infinities,
@@ -153,8 +164,9 @@ FUNC (DOUBLE x)
   }
 # endif
 #else
-  /* The configuration did not find sufficient information.  Give up about
-     the signaling NaNs, handle only the quiet NaNs.  */
+  /* The configuration did not find sufficient information, or does
+     not use IEEE floating point.  Give up about the signaling NaNs;
+     handle only the quiet NaNs.  */
   if (x == x)
     {
 # if defined USE_LONG_DOUBLE && ((defined __ia64 && LDBL_MANT_DIG == 64) || (defined __x86_64__ || defined __amd64__) || (defined __i386 || defined __i386__ || defined _I386 || defined _M_IX86 || defined _X86_)) && !HAVE_SAME_LONG_DOUBLE_AS_DOUBLE
diff --git a/lib/isnand-nolibm.h b/lib/isnand-nolibm.h
index 8a84ff81..cee7eec0 100644
--- a/lib/isnand-nolibm.h
+++ b/lib/isnand-nolibm.h
@@ -1,5 +1,5 @@
 /* Test for NaN that does not need libm.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/isnand.c b/lib/isnand.c
index cbad17b5..318c3595 100644
--- a/lib/isnand.c
+++ b/lib/isnand.c
@@ -1,5 +1,5 @@
 /* Test for NaN that does not need libm.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/isnanf-nolibm.h b/lib/isnanf-nolibm.h
index dc43863a..41c2ef30 100644
--- a/lib/isnanf-nolibm.h
+++ b/lib/isnanf-nolibm.h
@@ -1,5 +1,5 @@
 /* Test for NaN that does not need libm.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/isnanf.c b/lib/isnanf.c
index 946cb69c..583a607e 100644
--- a/lib/isnanf.c
+++ b/lib/isnanf.c
@@ -1,5 +1,5 @@
 /* Test for NaN that does not need libm.
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/isnanl-nolibm.h b/lib/isnanl-nolibm.h
index 18eb8037..371de004 100644
--- a/lib/isnanl-nolibm.h
+++ b/lib/isnanl-nolibm.h
@@ -1,5 +1,5 @@
 /* Test for NaN that does not need libm.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/isnanl.c b/lib/isnanl.c
index 9d9d84b9..4575e4c3 100644
--- a/lib/isnanl.c
+++ b/lib/isnanl.c
@@ -1,5 +1,5 @@
 /* Test for NaN that does not need libm.
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/iswblank.c b/lib/iswblank.c
index 613ef638..9c1672fb 100644
--- a/lib/iswblank.c
+++ b/lib/iswblank.c
@@ -1,5 +1,5 @@
 /* Test wide character for being blank.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/itold.c b/lib/itold.c
index 9aabc7e4..937f4805 100644
--- a/lib/itold.c
+++ b/lib/itold.c
@@ -1,5 +1,5 @@
 /* Replacement for 'int' to 'long double' conversion routine.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/langinfo.in.h b/lib/langinfo.in.h
index 5388ce62..338ffb6a 100644
--- a/lib/langinfo.in.h
+++ b/lib/langinfo.in.h
@@ -1,5 +1,5 @@
 /* Substitute for and wrapper around <langinfo.h>.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -49,7 +49,10 @@ typedef int nl_item;
 # define CODESET     10000
 /* nl_langinfo items of the LC_NUMERIC category */
 # define RADIXCHAR   10001
+# define DECIMAL_POINT RADIXCHAR
 # define THOUSEP     10002
+# define THOUSANDS_SEP THOUSEP
+# define GROUPING    10114
 /* nl_langinfo items of the LC_TIME category */
 # define D_T_FMT     10003
 # define D_FMT       10004
@@ -102,6 +105,21 @@ typedef int nl_item;
 # define ALT_DIGITS  10051
 /* nl_langinfo items of the LC_MONETARY category */
 # define CRNCYSTR    10052
+# define CURRENCY_SYMBOL   CRNCYSTR
+# define INT_CURR_SYMBOL   10100
+# define MON_DECIMAL_POINT 10101
+# define MON_THOUSANDS_SEP 10102
+# define MON_GROUPING      10103
+# define POSITIVE_SIGN     10104
+# define NEGATIVE_SIGN     10105
+# define FRAC_DIGITS       10106
+# define INT_FRAC_DIGITS   10107
+# define P_CS_PRECEDES     10108
+# define N_CS_PRECEDES     10109
+# define P_SEP_BY_SPACE    10110
+# define N_SEP_BY_SPACE    10111
+# define P_SIGN_POSN       10112
+# define N_SIGN_POSN       10113
 /* nl_langinfo items of the LC_MESSAGES category */
 # define YESEXPR     10053
 # define NOEXPR      10054
diff --git a/lib/lchown.c b/lib/lchown.c
index ff48c183..647b0a8a 100644
--- a/lib/lchown.c
+++ b/lib/lchown.c
@@ -1,6 +1,6 @@
 /* Provide a stub lchown function for systems that lack it.
 
-   Copyright (C) 1998-1999, 2002, 2004, 2006-2007, 2009-2013 Free Software
+   Copyright (C) 1998-1999, 2002, 2004, 2006-2007, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/linebuffer.c b/lib/linebuffer.c
index c725b8ce..d1582fe3 100644
--- a/lib/linebuffer.c
+++ b/lib/linebuffer.c
@@ -1,6 +1,6 @@
 /* linebuffer.c -- read arbitrarily long lines
 
-   Copyright (C) 1986, 1991, 1998-1999, 2001, 2003-2004, 2006-2007, 2009-2013
+   Copyright (C) 1986, 1991, 1998-1999, 2001, 2003-2004, 2006-2007, 2009-2014
    Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/linebuffer.h b/lib/linebuffer.h
index 12030b50..740d5c41 100644
--- a/lib/linebuffer.h
+++ b/lib/linebuffer.h
@@ -1,6 +1,6 @@
 /* linebuffer.h -- declarations for reading arbitrarily long lines
 
-   Copyright (C) 1986, 1991, 1998-1999, 2002-2003, 2007, 2009-2013 Free
+   Copyright (C) 1986, 1991, 1998-1999, 2002-2003, 2007, 2009-2014 Free
    Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/link.c b/lib/link.c
index ce3cc449..80f4f097 100644
--- a/lib/link.c
+++ b/lib/link.c
@@ -1,6 +1,6 @@
 /* Emulate link on platforms that lack it, namely native Windows platforms.
 
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/linkat.c b/lib/linkat.c
index f358b2db..6ee30fb4 100644
--- a/lib/linkat.c
+++ b/lib/linkat.c
@@ -1,5 +1,5 @@
 /* Create a hard link relative to open directories.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/localcharset.c b/lib/localcharset.c
index 953cc1e7..a9288673 100644
--- a/lib/localcharset.c
+++ b/lib/localcharset.c
@@ -1,6 +1,6 @@
 /* Determine a canonical name for the current locale's character encoding.
 
-   Copyright (C) 2000-2006, 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2000-2006, 2008-2014 Free Software Foundation, Inc.
 
    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
@@ -65,6 +65,11 @@
 # include <os2.h>
 #endif
 
+/* For MB_CUR_MAX_L */
+#if defined DARWIN7
+# include <xlocale.h>
+#endif
+
 #if ENABLE_RELOCATABLE
 # include "relocatable.h"
 #else
@@ -545,7 +550,7 @@ locale_charset (void)
 #ifdef DARWIN7
   /* Mac OS X sets MB_CUR_MAX to 1 when LC_ALL=C, and "UTF-8"
      (the default codeset) does not work when MB_CUR_MAX is 1.  */
-  if (strcmp (codeset, "UTF-8") == 0 && MB_CUR_MAX <= 1)
+  if (strcmp (codeset, "UTF-8") == 0 && MB_CUR_MAX_L (uselocale (NULL)) <= 1)
     codeset = "ASCII";
 #endif
 
diff --git a/lib/localcharset.h b/lib/localcharset.h
index c2098298..9011d580 100644
--- a/lib/localcharset.h
+++ b/lib/localcharset.h
@@ -1,5 +1,5 @@
 /* Determine a canonical name for the current locale's character encoding.
-   Copyright (C) 2000-2003, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2009-2014 Free Software Foundation, Inc.
    This file is part of the GNU CHARSET Library.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib/locale.in.h b/lib/locale.in.h
index 264161a6..10cc44b1 100644
--- a/lib/locale.in.h
+++ b/lib/locale.in.h
@@ -1,5 +1,5 @@
 /* A POSIX <locale.h>.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/localeconv.c b/lib/localeconv.c
index 7c7c77cf..014e739c 100644
--- a/lib/localeconv.c
+++ b/lib/localeconv.c
@@ -1,5 +1,5 @@
 /* Query locale dependent information for formatting numbers.
-   Copyright (C) 2012-2013 Free Software Foundation, Inc.
+   Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/long-options.c b/lib/long-options.c
index 723cad5d..fa7d1cd7 100644
--- a/lib/long-options.c
+++ b/lib/long-options.c
@@ -1,6 +1,6 @@
 /* Utility to accept --help and --version options as unobtrusively as possible.
 
-   Copyright (C) 1993-1994, 1998-2000, 2002-2006, 2009-2013 Free Software
+   Copyright (C) 1993-1994, 1998-2000, 2002-2006, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/long-options.h b/lib/long-options.h
index e0e70853..a44ae2e8 100644
--- a/lib/long-options.h
+++ b/lib/long-options.h
@@ -1,5 +1,5 @@
 /* long-options.h -- declaration for --help- and --version-handling function.
-   Copyright (C) 1993-1994, 1998-1999, 2003, 2009-2013 Free Software
+   Copyright (C) 1993-1994, 1998-1999, 2003, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/lseek.c b/lib/lseek.c
index fa7440d1..f19b41b1 100644
--- a/lib/lseek.c
+++ b/lib/lseek.c
@@ -1,5 +1,5 @@
 /* An lseek() function that detects pipes.
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/lstat.c b/lib/lstat.c
index 1a613a89..f70fd435 100644
--- a/lib/lstat.c
+++ b/lib/lstat.c
@@ -1,6 +1,6 @@
 /* Work around a bug of lstat on some systems
 
-   Copyright (C) 1997-2006, 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 1997-2006, 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/malloc.c b/lib/malloc.c
index 908735d2..bc81c54d 100644
--- a/lib/malloc.c
+++ b/lib/malloc.c
@@ -1,6 +1,6 @@
 /* malloc() function that is glibc compatible.
 
-   Copyright (C) 1997-1998, 2006-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 1997-1998, 2006-2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/malloca.c b/lib/malloca.c
index 3cd2f6d9..370551c5 100644
--- a/lib/malloca.c
+++ b/lib/malloca.c
@@ -1,5 +1,5 @@
 /* Safe automatic memory allocation.
-   Copyright (C) 2003, 2006-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006-2007, 2009-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software; you can redistribute it and/or modify
@@ -49,12 +49,18 @@
 #define MAGIC_SIZE sizeof (int)
 /* This is how the header info would look like without any alignment
    considerations.  */
-struct preliminary_header { void *next; char room[MAGIC_SIZE]; };
+struct preliminary_header { void *next; int magic; };
 /* But the header's size must be a multiple of sa_alignment_max.  */
 #define HEADER_SIZE \
   (((sizeof (struct preliminary_header) + sa_alignment_max - 1) / sa_alignment_max) * sa_alignment_max)
-struct header { void *next; char room[HEADER_SIZE - sizeof (struct preliminary_header) + MAGIC_SIZE]; };
-verify (HEADER_SIZE == sizeof (struct header));
+union header {
+  void *next;
+  struct {
+    char room[HEADER_SIZE - MAGIC_SIZE];
+    int word;
+  } magic;
+};
+verify (HEADER_SIZE == sizeof (union header));
 /* We make the hash table quite big, so that during lookups the probability
    of empty hash buckets is quite high.  There is no need to make the hash
    table resizable, because when the hash table gets filled so much that the
@@ -74,20 +80,21 @@ mmalloca (size_t n)
 
   if (nplus >= n)
     {
-      char *p = (char *) malloc (nplus);
+      void *p = malloc (nplus);
 
       if (p != NULL)
         {
           size_t slot;
+          union header *h = p;
 
-          p += HEADER_SIZE;
+          p = h + 1;
 
           /* Put a magic number into the indicator word.  */
-          ((int *) p)[-1] = MAGIC_NUMBER;
+          h->magic.word = MAGIC_NUMBER;
 
           /* Enter p into the hash table.  */
           slot = (uintptr_t) p % HASH_TABLE_SIZE;
-          ((struct header *) (p - HEADER_SIZE))->next = mmalloca_results[slot];
+          h->next = mmalloca_results[slot];
           mmalloca_results[slot] = p;
 
           return p;
@@ -123,15 +130,17 @@ freea (void *p)
           void **chain = &mmalloca_results[slot];
           for (; *chain != NULL;)
             {
+              union header *h = p;
               if (*chain == p)
                 {
                   /* Found it.  Remove it from the hash table and free it.  */
-                  char *p_begin = (char *) p - HEADER_SIZE;
-                  *chain = ((struct header *) p_begin)->next;
+                  union header *p_begin = h - 1;
+                  *chain = p_begin->next;
                   free (p_begin);
                   return;
                 }
-              chain = &((struct header *) ((char *) *chain - HEADER_SIZE))->next;
+              h = *chain;
+              chain = &h[-1].next;
             }
         }
       /* At this point, we know it was not a mmalloca() result.  */
diff --git a/lib/malloca.h b/lib/malloca.h
index 906d47a2..5071e46f 100644
--- a/lib/malloca.h
+++ b/lib/malloca.h
@@ -1,5 +1,5 @@
 /* Safe automatic memory allocation.
-   Copyright (C) 2003-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2003-2007, 2009-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software; you can redistribute it and/or modify
@@ -92,7 +92,7 @@ extern void * nmalloca (size_t n, size_t s);
 /* ------------------- Auxiliary, non-public definitions ------------------- */
 
 /* Determine the alignment of a type at compile time.  */
-#if defined __GNUC__
+#if defined __GNUC__ || defined __IBM__ALIGNOF__
 # define sa_alignof __alignof__
 #elif defined __cplusplus
   template <class type> struct sa_alignof_helper { char __slot1; type __slot2; };
diff --git a/lib/math.in.h b/lib/math.in.h
index 7189819b..9d73c5e5 100644
--- a/lib/math.in.h
+++ b/lib/math.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <math.h>.
 
-   Copyright (C) 2002-2003, 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2007-2014 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -28,6 +28,9 @@
 #ifndef _@GUARD_PREFIX@_MATH_H
 #define _@GUARD_PREFIX@_MATH_H
 
+#ifndef _GL_INLINE_HEADER_BEGIN
+ #error "Please include config.h first."
+#endif
 _GL_INLINE_HEADER_BEGIN
 #ifndef _GL_MATH_INLINE
 # define _GL_MATH_INLINE _GL_INLINE
diff --git a/lib/mbchar.c b/lib/mbchar.c
index 7482c31f..7d5bfcc1 100644
--- a/lib/mbchar.c
+++ b/lib/mbchar.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2006, 2009-2013 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/mbchar.h b/lib/mbchar.h
index 327c9575..700174c5 100644
--- a/lib/mbchar.h
+++ b/lib/mbchar.h
@@ -1,5 +1,5 @@
 /* Multibyte character data type.
-   Copyright (C) 2001, 2005-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2005-2007, 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -156,6 +156,9 @@
 #include <wchar.h>
 #include <wctype.h>
 
+#ifndef _GL_INLINE_HEADER_BEGIN
+ #error "Please include config.h first."
+#endif
 _GL_INLINE_HEADER_BEGIN
 #ifndef MBCHAR_INLINE
 # define MBCHAR_INLINE _GL_INLINE
diff --git a/lib/mbiter.h b/lib/mbiter.h
index 24504c3f..32fff8cf 100644
--- a/lib/mbiter.h
+++ b/lib/mbiter.h
@@ -1,5 +1,5 @@
 /* Iterating through multibyte strings: macros for multi-byte encodings.
-   Copyright (C) 2001, 2005, 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2005, 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -97,6 +97,9 @@
 
 #include "mbchar.h"
 
+#ifndef _GL_INLINE_HEADER_BEGIN
+ #error "Please include config.h first."
+#endif
 _GL_INLINE_HEADER_BEGIN
 #ifndef MBITER_INLINE
 # define MBITER_INLINE _GL_INLINE
diff --git a/lib/mbrlen.c b/lib/mbrlen.c
index 7b124242..5f180ba2 100644
--- a/lib/mbrlen.c
+++ b/lib/mbrlen.c
@@ -1,5 +1,5 @@
 /* Recognize multibyte character.
-   Copyright (C) 1999-2000, 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 1999-2000, 2008-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/mbrtowc.c b/lib/mbrtowc.c
index 5ee44aea..5743f437 100644
--- a/lib/mbrtowc.c
+++ b/lib/mbrtowc.c
@@ -1,5 +1,5 @@
 /* Convert multibyte character to wide character.
-   Copyright (C) 1999-2002, 2005-2013 Free Software Foundation, Inc.
+   Copyright (C) 1999-2002, 2005-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
@@ -328,7 +328,7 @@ mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
 size_t
 rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
 {
-# if MBRTOWC_NULL_ARG2_BUG || MBRTOWC_RETVAL_BUG
+# if MBRTOWC_NULL_ARG2_BUG || MBRTOWC_RETVAL_BUG || MBRTOWC_EMPTY_INPUT_BUG
   if (s == NULL)
     {
       pwc = NULL;
@@ -337,6 +337,11 @@ rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
     }
 # endif
 
+# if MBRTOWC_EMPTY_INPUT_BUG
+  if (n == 0)
+    return (size_t) -2;
+# endif
+
 # if MBRTOWC_RETVAL_BUG
   {
     static mbstate_t internal_state;
diff --git a/lib/mbsalign.c b/lib/mbsalign.c
index 816ada0a..fe0e6408 100644
--- a/lib/mbsalign.c
+++ b/lib/mbsalign.c
@@ -1,5 +1,5 @@
 /* Align/Truncate a string in a given screen width
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/mbsalign.h b/lib/mbsalign.h
index 72a6d69a..b3aa0fbf 100644
--- a/lib/mbsalign.h
+++ b/lib/mbsalign.h
@@ -1,5 +1,5 @@
 /* Align/Truncate a string in a given screen width
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/mbscasecmp.c b/lib/mbscasecmp.c
index 97ef1dab..d52448fe 100644
--- a/lib/mbscasecmp.c
+++ b/lib/mbscasecmp.c
@@ -1,5 +1,5 @@
 /* Case-insensitive string comparison function.
-   Copyright (C) 1998-1999, 2005-2013 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 2005-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2005,
    based on earlier glibc code.
 
diff --git a/lib/mbsinit.c b/lib/mbsinit.c
index 26fbb7fa..df4bcd18 100644
--- a/lib/mbsinit.c
+++ b/lib/mbsinit.c
@@ -1,5 +1,5 @@
 /* Test for initial conversion state.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/mbslen.c b/lib/mbslen.c
index 85e938bc..74c6ec12 100644
--- a/lib/mbslen.c
+++ b/lib/mbslen.c
@@ -1,5 +1,5 @@
 /* Counting the multibyte characters in a string.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/mbsrtowcs-impl.h b/lib/mbsrtowcs-impl.h
index b50e9739..d42af012 100644
--- a/lib/mbsrtowcs-impl.h
+++ b/lib/mbsrtowcs-impl.h
@@ -1,5 +1,5 @@
 /* Convert string to wide string.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/mbsrtowcs-state.c b/lib/mbsrtowcs-state.c
index 5a0b8882..2a7019aa 100644
--- a/lib/mbsrtowcs-state.c
+++ b/lib/mbsrtowcs-state.c
@@ -1,5 +1,5 @@
 /* Convert string to wide string.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/mbsrtowcs.c b/lib/mbsrtowcs.c
index 116ff493..136ec343 100644
--- a/lib/mbsrtowcs.c
+++ b/lib/mbsrtowcs.c
@@ -1,5 +1,5 @@
 /* Convert string to wide string.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/mbsstr.c b/lib/mbsstr.c
index f84e689e..1ae9fe42 100644
--- a/lib/mbsstr.c
+++ b/lib/mbsstr.c
@@ -1,5 +1,5 @@
 /* Searching in a string.
-   Copyright (C) 2005-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2005.
 
    This program is free software: you can redistribute it and/or modify
@@ -45,11 +45,13 @@ knuth_morris_pratt_multibyte (const char *haystack, const char *needle,
   size_t *table;
 
   /* Allocate room for needle_mbchars and the table.  */
-  char *memory = (char *) nmalloca (m, sizeof (mbchar_t) + sizeof (size_t));
+  void *memory = nmalloca (m, sizeof (mbchar_t) + sizeof (size_t));
+  void *table_memory;
   if (memory == NULL)
     return false;
-  needle_mbchars = (mbchar_t *) memory;
-  table = (size_t *) (memory + m * sizeof (mbchar_t));
+  needle_mbchars = memory;
+  table_memory = needle_mbchars + m;
+  table = table_memory;
 
   /* Fill needle_mbchars.  */
   {
diff --git a/lib/mbswidth.c b/lib/mbswidth.c
index 7c2dfce8..d39067a4 100644
--- a/lib/mbswidth.c
+++ b/lib/mbswidth.c
@@ -1,5 +1,5 @@
 /* Determine the number of screen columns needed for a string.
-   Copyright (C) 2000-2013 Free Software Foundation, Inc.
+   Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/mbswidth.h b/lib/mbswidth.h
index e9c0b039..ab7c1503 100644
--- a/lib/mbswidth.h
+++ b/lib/mbswidth.h
@@ -1,5 +1,5 @@
 /* Determine the number of screen columns needed for a string.
-   Copyright (C) 2000-2004, 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2000-2004, 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/mbtowc-impl.h b/lib/mbtowc-impl.h
index 767ab397..3cc70b0e 100644
--- a/lib/mbtowc-impl.h
+++ b/lib/mbtowc-impl.h
@@ -1,5 +1,5 @@
 /* Convert multibyte character to wide character.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/mbtowc.c b/lib/mbtowc.c
index 632f2e1d..93a74454 100644
--- a/lib/mbtowc.c
+++ b/lib/mbtowc.c
@@ -1,5 +1,5 @@
 /* Convert multibyte character to wide character.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/mbuiter.h b/lib/mbuiter.h
index c5f5fcee..1702f14c 100644
--- a/lib/mbuiter.h
+++ b/lib/mbuiter.h
@@ -1,5 +1,5 @@
 /* Iterating through multibyte strings: macros for multi-byte encodings.
-   Copyright (C) 2001, 2005, 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2005, 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -106,6 +106,9 @@
 #include "mbchar.h"
 #include "strnlen1.h"
 
+#ifndef _GL_INLINE_HEADER_BEGIN
+ #error "Please include config.h first."
+#endif
 _GL_INLINE_HEADER_BEGIN
 #ifndef MBUITER_INLINE
 # define MBUITER_INLINE _GL_INLINE
diff --git a/lib/md5.c b/lib/md5.c
index f41b5beb..ece24ac9 100644
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -1,6 +1,6 @@
 /* Functions to compute MD5 message digest of files or memory blocks.
    according to the definition of MD5 in RFC 1321 from April 1992.
-   Copyright (C) 1995-1997, 1999-2001, 2005-2006, 2008-2013 Free Software
+   Copyright (C) 1995-1997, 1999-2001, 2005-2006, 2008-2014 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -21,6 +21,9 @@
 
 #include <config.h>
 
+#if HAVE_OPENSSL_MD5
+# define GL_OPENSSL_INLINE _GL_EXTERN_INLINE
+#endif
 #include "md5.h"
 
 #include <stdalign.h>
@@ -61,6 +64,7 @@
 # error "invalid BLOCKSIZE"
 #endif
 
+#if ! HAVE_OPENSSL_MD5
 /* This array contains the bytes used to pad the buffer to the next
    64-byte boundary.  (RFC 1321, 3.1: Step 1)  */
 static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ...  */ };
@@ -128,6 +132,7 @@ md5_finish_ctx (struct md5_ctx *ctx, void *resbuf)
 
   return md5_read_ctx (ctx, resbuf);
 }
+#endif
 
 /* Compute MD5 message digest for bytes read from STREAM.  The
    resulting message digest number will be written into the 16 bytes
@@ -202,6 +207,7 @@ process_partial_block:
   return 0;
 }
 
+#if ! HAVE_OPENSSL_MD5
 /* Compute MD5 message digest for LEN bytes beginning at BUFFER.  The
    result is always in little endian byte order, so that a byte-wise
    output yields to the wanted ASCII representation of the message
@@ -459,3 +465,4 @@ md5_process_block (const void *buffer, size_t len, struct md5_ctx *ctx)
   ctx->C = C;
   ctx->D = D;
 }
+#endif
diff --git a/lib/md5.h b/lib/md5.h
index 634a7470..1d6974ae 100644
--- a/lib/md5.h
+++ b/lib/md5.h
@@ -1,6 +1,6 @@
 /* Declaration of functions and data types used for MD5 sum computing
    library functions.
-   Copyright (C) 1995-1997, 1999-2001, 2004-2006, 2008-2013 Free Software
+   Copyright (C) 1995-1997, 1999-2001, 2004-2006, 2008-2014 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -23,6 +23,10 @@
 #include <stdio.h>
 #include <stdint.h>
 
+# if HAVE_OPENSSL_MD5
+#  include <openssl/md5.h>
+# endif
+
 #define MD5_DIGEST_SIZE 16
 #define MD5_BLOCK_SIZE 64
 
@@ -57,6 +61,10 @@
 extern "C" {
 # endif
 
+# if HAVE_OPENSSL_MD5
+#  define GL_OPENSSL_NAME 5
+#  include "gl_openssl.h"
+# else
 /* Structure to save state of computation between the single steps.  */
 struct md5_ctx
 {
@@ -106,11 +114,6 @@ extern void *__md5_finish_ctx (struct md5_ctx *ctx, void *resbuf) __THROW;
 extern void *__md5_read_ctx (const struct md5_ctx *ctx, void *resbuf) __THROW;
 
 
-/* Compute MD5 message digest for bytes read from STREAM.  The
-   resulting message digest number will be written into the 16 bytes
-   beginning at RESBLOCK.  */
-extern int __md5_stream (FILE *stream, void *resblock) __THROW;
-
 /* Compute MD5 message digest for LEN bytes beginning at BUFFER.  The
    result is always in little endian byte order, so that a byte-wise
    output yields to the wanted ASCII representation of the message
@@ -118,6 +121,13 @@ extern int __md5_stream (FILE *stream, void *resblock) __THROW;
 extern void *__md5_buffer (const char *buffer, size_t len,
                            void *resblock) __THROW;
 
+# endif
+/* Compute MD5 message digest for bytes read from STREAM.  The
+   resulting message digest number will be written into the 16 bytes
+   beginning at RESBLOCK.  */
+extern int __md5_stream (FILE *stream, void *resblock) __THROW;
+
+
 # ifdef __cplusplus
 }
 # endif
diff --git a/lib/memcasecmp.c b/lib/memcasecmp.c
index e85add4e..c24039a4 100644
--- a/lib/memcasecmp.c
+++ b/lib/memcasecmp.c
@@ -1,5 +1,5 @@
 /* Case-insensitive buffer comparator.
-   Copyright (C) 1996-1997, 2000, 2003, 2006, 2009-2013 Free Software
+   Copyright (C) 1996-1997, 2000, 2003, 2006, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/memcasecmp.h b/lib/memcasecmp.h
index 27ae3f7e..8b53c302 100644
--- a/lib/memcasecmp.h
+++ b/lib/memcasecmp.h
@@ -1,6 +1,6 @@
 /* Case-insensitive buffer comparator.
 
-   Copyright (C) 1996, 1998, 2003, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1998, 2003, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/memchr.c b/lib/memchr.c
index 3db38a94..6709f6ea 100644
--- a/lib/memchr.c
+++ b/lib/memchr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2013
+/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2014
    Free Software Foundation, Inc.
 
    Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
diff --git a/lib/memchr2.c b/lib/memchr2.c
index 3912e027..3d79f2a2 100644
--- a/lib/memchr2.c
+++ b/lib/memchr2.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2013
+/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2014
    Free Software Foundation, Inc.
 
    Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
@@ -43,6 +43,7 @@ memchr2 (void const *s, int c1_in, int c2_in, size_t n)
   typedef unsigned long int longword;
 
   const unsigned char *char_ptr;
+  void const *void_ptr;
   const longword *longword_ptr;
   longword repeated_one;
   longword repeated_c1;
@@ -57,14 +58,18 @@ memchr2 (void const *s, int c1_in, int c2_in, size_t n)
     return memchr (s, c1, n);
 
   /* Handle the first few bytes by reading one byte at a time.
-     Do this until CHAR_PTR is aligned on a longword boundary.  */
-  for (char_ptr = (const unsigned char *) s;
-       n > 0 && (size_t) char_ptr % sizeof (longword) != 0;
-       --n, ++char_ptr)
-    if (*char_ptr == c1 || *char_ptr == c2)
-      return (void *) char_ptr;
-
-  longword_ptr = (const longword *) char_ptr;
+     Do this until VOID_PTR is aligned on a longword boundary.  */
+  for (void_ptr = s;
+       n > 0 && (uintptr_t) void_ptr % sizeof (longword) != 0;
+       --n)
+    {
+      char_ptr = void_ptr;
+      if (*char_ptr == c1 || *char_ptr == c2)
+        return (void *) void_ptr;
+      void_ptr = char_ptr + 1;
+    }
+
+  longword_ptr = void_ptr;
 
   /* All these elucidatory comments refer to 4-byte longwords,
      but the theory applies equally well to any size longwords.  */
diff --git a/lib/memchr2.h b/lib/memchr2.h
index cc04889f..220c2b54 100644
--- a/lib/memchr2.h
+++ b/lib/memchr2.h
@@ -1,5 +1,5 @@
 /* Scan memory for the first of two bytes.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/memcmp2.c b/lib/memcmp2.c
index 8afb3199..a31ed5b5 100644
--- a/lib/memcmp2.c
+++ b/lib/memcmp2.c
@@ -1,5 +1,5 @@
 /* Compare two memory areas with possibly different lengths.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
diff --git a/lib/memcmp2.h b/lib/memcmp2.h
index 619c7425..e346b389 100644
--- a/lib/memcmp2.h
+++ b/lib/memcmp2.h
@@ -1,5 +1,5 @@
 /* Compare two memory areas with possibly different lengths.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
diff --git a/lib/memcoll.c b/lib/memcoll.c
index 1f5c2e3a..51321048 100644
--- a/lib/memcoll.c
+++ b/lib/memcoll.c
@@ -1,6 +1,6 @@
 /* Locale-specific memory comparison.
 
-   Copyright (C) 1999, 2002-2004, 2006, 2009-2013 Free Software Foundation,
+   Copyright (C) 1999, 2002-2004, 2006, 2009-2014 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/memcoll.h b/lib/memcoll.h
index 1aaca474..7f193b85 100644
--- a/lib/memcoll.h
+++ b/lib/memcoll.h
@@ -1,6 +1,6 @@
 /* Locale-specific memory comparison.
 
-   Copyright (C) 1999, 2003, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2003, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/mempcpy.c b/lib/mempcpy.c
index 5582368e..ff83ee11 100644
--- a/lib/mempcpy.c
+++ b/lib/mempcpy.c
@@ -1,5 +1,5 @@
 /* Copy memory area and return pointer after last written byte.
-   Copyright (C) 2003, 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/memrchr.c b/lib/memrchr.c
index 5a023e06..742a0c9b 100644
--- a/lib/memrchr.c
+++ b/lib/memrchr.c
@@ -1,6 +1,6 @@
 /* memrchr -- find the last occurrence of a byte in a memory block
 
-   Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2013 Free Software
+   Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2014 Free Software
    Foundation, Inc.
 
    Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
diff --git a/lib/mgetgroups.c b/lib/mgetgroups.c
index 2d82f45c..9d302e74 100644
--- a/lib/mgetgroups.c
+++ b/lib/mgetgroups.c
@@ -1,6 +1,6 @@
 /* mgetgroups.c -- return a list of the groups a user or current process is in
 
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
@@ -133,7 +133,7 @@ mgetgroups (char const *username, gid_t gid, gid_t **groups)
       return -1;
     }
 
-  if (!username && gid != (gid_t) -1)
+  if (max_n_groups == 0 || (!username && gid != (gid_t) -1))
     max_n_groups++;
   g = realloc_groupbuf (NULL, max_n_groups);
   if (g == NULL)
diff --git a/lib/mgetgroups.h b/lib/mgetgroups.h
index b8a99c6a..8ccac074 100644
--- a/lib/mgetgroups.h
+++ b/lib/mgetgroups.h
@@ -1,5 +1,5 @@
 /* Get a list of all group IDs associated with a specified user ID.
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/mkancesdirs.c b/lib/mkancesdirs.c
index 0c60a93c..0638b194 100644
--- a/lib/mkancesdirs.c
+++ b/lib/mkancesdirs.c
@@ -1,6 +1,6 @@
 /* Make a file's ancestor directories.
 
-   Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/mkdir-p.c b/lib/mkdir-p.c
index a66f7964..188fa3a4 100644
--- a/lib/mkdir-p.c
+++ b/lib/mkdir-p.c
@@ -1,6 +1,6 @@
 /* mkdir-p.c -- Ensure that a directory and its parents exist.
 
-   Copyright (C) 1990, 1997-2000, 2002-2007, 2009-2013 Free Software
+   Copyright (C) 1990, 1997-2000, 2002-2007, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -52,9 +52,9 @@
    is retained on return if the ancestor directories could not be
    created.
 
-   Create DIR as a new directory with using mkdir with permissions
-   MODE.  It is also OK if MAKE_ANCESTOR is not null and a
-   directory DIR already exists.
+   Create DIR as a new directory, using mkdir with permissions MODE;
+   here, MODE is affected by the umask in the usual way.  It is also
+   OK if MAKE_ANCESTOR is not null and a directory DIR already exists.
 
    Call ANNOUNCE (DIR, OPTIONS) just after successfully making DIR,
    even if some of the following actions fail.
@@ -65,16 +65,15 @@
    Set DIR's mode bits to MODE, except preserve any of the bits that
    correspond to zero bits in MODE_BITS.  In other words, MODE_BITS is
    a mask that specifies which of DIR's mode bits should be set or
-   cleared.  MODE should be a subset of MODE_BITS, which in turn
-   should be a subset of CHMOD_MODE_BITS.  Changing the mode in this
-   way is necessary if DIR already existed or if MODE and MODE_BITS
-   specify non-permissions bits like S_ISUID.
+   cleared.  Changing the mode in this way is necessary if DIR already
+   existed, if MODE and MODE_BITS specify non-permissions bits like
+   S_ISUID, or if MODE and MODE_BITS specify permissions bits that are
+   masked out by the umask.  MODE_BITS should be a subset of
+   CHMOD_MODE_BITS.
 
    However, if PRESERVE_EXISTING is true and DIR already exists,
    do not attempt to set DIR's ownership and file mode bits.
 
-   This implementation assumes the current umask is zero.
-
    Return true if DIR exists as a directory with the proper ownership
    and file mode bits when done, or if a child process has been
    dispatched to do the real work (though the child process may not
@@ -130,8 +129,13 @@ make_dir_parents (char *dir,
 
           if (mkdir (dir + prefix_len, mkdir_mode) == 0)
             {
+              /* True if the caller does not care about the umask's
+                 effect on the permissions.  */
+              bool umask_must_be_ok = (mode & mode_bits & S_IRWXUGO) == 0;
+
               announce (dir, options);
-              preserve_existing = keep_owner & keep_special_mode_bits;
+              preserve_existing = (keep_owner & keep_special_mode_bits
+                                   & umask_must_be_ok);
               savewd_chdir_options |=
                 (SAVEWD_CHDIR_NOFOLLOW
                  | (mode & S_IRUSR ? SAVEWD_CHDIR_READABLE : 0));
@@ -162,36 +166,17 @@ make_dir_parents (char *dir,
               else
                 {
                   bool chdir_ok = (chdir_result == 0);
-                  int chdir_errno = errno;
-                  int fd = open_result[0];
-                  bool chdir_failed_unexpectedly =
-                    (mkdir_errno == 0
-                     && ((! chdir_ok && (mode & S_IXUSR))
-                         || (fd < 0 && (mode & S_IRUSR))));
-
-                  if (chdir_failed_unexpectedly)
-                    {
-                      /* No need to save errno here; it's irrelevant.  */
-                      if (0 <= fd)
-                        close (fd);
-                    }
-                  else
-                    {
-                      char const *subdir = (chdir_ok ? "." : dir + prefix_len);
-                      if (dirchownmod (fd, subdir, mkdir_mode, owner, group,
-                                       mode, mode_bits)
-                          == 0)
-                        return true;
-                    }
+                  char const *subdir = (chdir_ok ? "." : dir + prefix_len);
+                  if (dirchownmod (open_result[0], subdir, mkdir_mode,
+                                   owner, group, mode, mode_bits)
+                      == 0)
+                    return true;
 
                   if (mkdir_errno == 0
                       || (mkdir_errno != ENOENT && make_ancestor
                           && errno != ENOTDIR))
                     {
-                      error (0,
-                             (! chdir_failed_unexpectedly ? errno
-                              : ! chdir_ok && (mode & S_IXUSR) ? chdir_errno
-                              : open_result[1]),
+                      error (0, errno,
                              _(keep_owner
                                ? "cannot change permissions of %s"
                                : "cannot change owner and permissions of %s"),
diff --git a/lib/mkdir-p.h b/lib/mkdir-p.h
index 6e83a63d..c6d37aa9 100644
--- a/lib/mkdir-p.h
+++ b/lib/mkdir-p.h
@@ -1,6 +1,6 @@
 /* mkdir-p.h -- Ensure that a directory and its parents exist.
 
-   Copyright (C) 1994-1997, 2000, 2003-2006, 2009-2013 Free Software
+   Copyright (C) 1994-1997, 2000, 2003-2006, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/mkdir.c b/lib/mkdir.c
index 67f29d45..481bbf37 100644
--- a/lib/mkdir.c
+++ b/lib/mkdir.c
@@ -1,7 +1,7 @@
 /* On some systems, mkdir ("foo/", 0700) fails because of the trailing
    slash.  On those systems, this wrapper removes the trailing slash.
 
-   Copyright (C) 2001, 2003, 2006, 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003, 2006, 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/mkfifo.c b/lib/mkfifo.c
index 45d16cd4..a04b2252 100644
--- a/lib/mkfifo.c
+++ b/lib/mkfifo.c
@@ -1,5 +1,5 @@
 /* Create a named fifo.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/mknod.c b/lib/mknod.c
index 71e9d345..c738e591 100644
--- a/lib/mknod.c
+++ b/lib/mknod.c
@@ -1,5 +1,5 @@
 /* Create a device inode.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/mkstemp-safer.c b/lib/mkstemp-safer.c
index 6431f824..03a205f3 100644
--- a/lib/mkstemp-safer.c
+++ b/lib/mkstemp-safer.c
@@ -1,6 +1,6 @@
 /* Invoke mkstemp, but avoid some glitches.
 
-   Copyright (C) 2005-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/mkstemp.c b/lib/mkstemp.c
index 7a9af6c8..ce9c6db8 100644
--- a/lib/mkstemp.c
+++ b/lib/mkstemp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998-1999, 2001, 2005-2007, 2009-2013 Free Software
+/* Copyright (C) 1998-1999, 2001, 2005-2007, 2009-2014 Free Software
    Foundation, Inc.
    This file is derived from the one in the GNU C Library.
 
diff --git a/lib/mktime.c b/lib/mktime.c
index e660a23c..48b3a40f 100644
--- a/lib/mktime.c
+++ b/lib/mktime.c
@@ -1,5 +1,5 @@
 /* Convert a 'struct tm' to a time_t value.
-   Copyright (C) 1993-2013 Free Software Foundation, Inc.
+   Copyright (C) 1993-2014 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Paul Eggert <eggert@twinsun.com>.
 
@@ -38,7 +38,7 @@
 
 #include <string.h>		/* For the real memcpy prototype.  */
 
-#if DEBUG
+#if defined DEBUG && DEBUG
 # include <stdio.h>
 # include <stdlib.h>
 /* Make it work even if the system's libc has its own mktime routine.  */
@@ -600,7 +600,7 @@ libc_hidden_def (mktime)
 libc_hidden_weak (timelocal)
 #endif
 
-#if DEBUG
+#if defined DEBUG && DEBUG
 
 static int
 not_equal_tm (const struct tm *a, const struct tm *b)
diff --git a/lib/modechange.c b/lib/modechange.c
index 7cca3d1b..412fe1d2 100644
--- a/lib/modechange.c
+++ b/lib/modechange.c
@@ -1,6 +1,6 @@
 /* modechange.c -- file mode manipulation
 
-   Copyright (C) 1989-1990, 1997-1999, 2001, 2003-2006, 2009-2013 Free Software
+   Copyright (C) 1989-1990, 1997-1999, 2001, 2003-2006, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -220,12 +220,12 @@ mode_compile (char const *mode_string)
                   {
                     octal_mode = 8 * octal_mode + *p++ - '0';
                     if (ALLM < octal_mode)
-                      return NULL;
+                      goto invalid;
                   }
                 while ('0' <= *p && *p < '8');
 
                 if (affected || (*p && *p != ','))
-                  return NULL;
+                  goto invalid;
                 affected = mentioned = CHMOD_MODE_BITS;
                 value = octal_to_mode (octal_mode);
                 flag = MODE_ORDINARY_CHANGE;
diff --git a/lib/modechange.h b/lib/modechange.h
index fc4c944c..e969ba97 100644
--- a/lib/modechange.h
+++ b/lib/modechange.h
@@ -1,6 +1,6 @@
 /* modechange.h -- definitions for file mode manipulation
 
-   Copyright (C) 1989-1990, 1997, 2003-2006, 2009-2013 Free Software
+   Copyright (C) 1989-1990, 1997, 2003-2006, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/mountlist.c b/lib/mountlist.c
index 8fb7e9ab..b3be011a 100644
--- a/lib/mountlist.c
+++ b/lib/mountlist.c
@@ -1,6 +1,6 @@
 /* mountlist.c -- return a list of mounted file systems
 
-   Copyright (C) 1991-1992, 1997-2013 Free Software Foundation, Inc.
+   Copyright (C) 1991-1992, 1997-2014 Free Software Foundation, Inc.
 
    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
@@ -128,9 +128,19 @@
 # include <sys/mntent.h>
 #endif
 
+#ifndef HAVE_HASMNTOPT
+# define hasmntopt(mnt, opt) ((char *) 0)
+#endif
+
 #undef MNT_IGNORE
-#if defined MNTOPT_IGNORE && defined HAVE_HASMNTOPT
-# define MNT_IGNORE(M) hasmntopt (M, MNTOPT_IGNORE)
+#ifdef MNTOPT_IGNORE
+# if defined __sun && defined __SVR4
+/* Solaris defines hasmntopt(struct mnttab *, char *)
+   while it is otherwise hasmntopt(struct mnttab *, const char *).  */
+#  define MNT_IGNORE(M) hasmntopt (M, (char *) MNTOPT_IGNORE)
+# else
+#  define MNT_IGNORE(M) hasmntopt (M, MNTOPT_IGNORE)
+# endif
 #else
 # define MNT_IGNORE(M) 0
 #endif
@@ -139,11 +149,6 @@
 # include "unlocked-io.h"
 #endif
 
-/* The results of open() in this file are not used with fchdir,
-   therefore save some unnecessary work in fchdir.c.  */
-#undef open
-#undef close
-
 /* The results of opendir() in this file are not used with dirfd and fchdir,
    therefore save some unnecessary work in fchdir.c.  */
 #undef opendir
@@ -942,6 +947,7 @@ read_file_system_list (bool need_fs_type)
             mtail = &me->me_next;
           }
       }
+    closedir (dirp);
   }
 #endif /* MOUNTED_INTERIX_STATVFS */
 
@@ -957,11 +963,7 @@ read_file_system_list (bool need_fs_type)
     while (mount_list)
       {
         me = mount_list->me_next;
-        free (mount_list->me_devname);
-        free (mount_list->me_mountdir);
-        if (mount_list->me_type_malloced)
-          free (mount_list->me_type);
-        free (mount_list);
+        free_mount_entry (mount_list);
         mount_list = me;
       }
 
@@ -969,3 +971,14 @@ read_file_system_list (bool need_fs_type)
     return NULL;
   }
 }
+
+/* Free a mount entry as returned from read_file_system_list ().  */
+
+void free_mount_entry (struct mount_entry *me)
+{
+  free (me->me_devname);
+  free (me->me_mountdir);
+  if (me->me_type_malloced)
+    free (me->me_type);
+  free (me);
+}
diff --git a/lib/mountlist.h b/lib/mountlist.h
index ffdcc02b..1e4dfae8 100644
--- a/lib/mountlist.h
+++ b/lib/mountlist.h
@@ -1,6 +1,6 @@
 /* mountlist.h -- declarations for list of mounted file systems
 
-   Copyright (C) 1991-1992, 1998, 2000-2005, 2009-2013 Free Software
+   Copyright (C) 1991-1992, 1998, 2000-2005, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -36,5 +36,6 @@ struct mount_entry
 };
 
 struct mount_entry *read_file_system_list (bool need_fs_type);
+void free_mount_entry (struct mount_entry *entry);
 
 #endif
diff --git a/lib/mpsort.c b/lib/mpsort.c
index 8300fb39..08a8b3da 100644
--- a/lib/mpsort.c
+++ b/lib/mpsort.c
@@ -1,6 +1,6 @@
 /* Sort a vector of pointers to data.
 
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/msvc-inval.c b/lib/msvc-inval.c
index 72a6b6ee..f83827fb 100644
--- a/lib/msvc-inval.c
+++ b/lib/msvc-inval.c
@@ -1,5 +1,5 @@
 /* Invalid parameter handler for MSVC runtime libraries.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
 
 # if MSVC_INVALID_PARAMETER_HANDLING == DEFAULT_HANDLING
 
-static void cdecl
+static void __cdecl
 gl_msvc_invalid_parameter_handler (const wchar_t *expression,
                                    const wchar_t *function,
                                    const wchar_t *file,
@@ -45,7 +45,7 @@ gl_msvc_invalid_parameter_handler (const wchar_t *expression,
 
 #  if defined _MSC_VER
 
-static void cdecl
+static void __cdecl
 gl_msvc_invalid_parameter_handler (const wchar_t *expression,
                                    const wchar_t *function,
                                    const wchar_t *file,
@@ -94,7 +94,7 @@ gl_msvc_inval_current (void)
     }
 }
 
-static void cdecl
+static void __cdecl
 gl_msvc_invalid_parameter_handler (const wchar_t *expression,
                                    const wchar_t *function,
                                    const wchar_t *file,
diff --git a/lib/msvc-inval.h b/lib/msvc-inval.h
index dcb0353d..a0ef540f 100644
--- a/lib/msvc-inval.h
+++ b/lib/msvc-inval.h
@@ -1,5 +1,5 @@
 /* Invalid parameter handler for MSVC runtime libraries.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/msvc-nothrow.c b/lib/msvc-nothrow.c
index 8d65472a..b1e5f0c9 100644
--- a/lib/msvc-nothrow.c
+++ b/lib/msvc-nothrow.c
@@ -1,6 +1,6 @@
 /* Wrappers that don't throw invalid parameter notifications
    with MSVC runtime libraries.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/msvc-nothrow.h b/lib/msvc-nothrow.h
index 5f521813..0d4dea58 100644
--- a/lib/msvc-nothrow.h
+++ b/lib/msvc-nothrow.h
@@ -1,6 +1,6 @@
 /* Wrappers that don't throw invalid parameter notifications
    with MSVC runtime libraries.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/nanosleep.c b/lib/nanosleep.c
index 9b5b3c11..d0b12e7a 100644
--- a/lib/nanosleep.c
+++ b/lib/nanosleep.c
@@ -1,6 +1,6 @@
 /* Provide a replacement for the POSIX nanosleep function.
 
-   Copyright (C) 1999-2000, 2002, 2004-2013 Free Software Foundation, Inc.
+   Copyright (C) 1999-2000, 2002, 2004-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/netdb.in.h b/lib/netdb.in.h
index 0da1800a..bb9d34ab 100644
--- a/lib/netdb.in.h
+++ b/lib/netdb.in.h
@@ -1,5 +1,5 @@
 /* Provide a netdb.h header file for systems lacking it (read: MinGW).
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
    Written by Simon Josefsson.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib/netinet_in.in.h b/lib/netinet_in.in.h
index b456c4f9..f0129dfe 100644
--- a/lib/netinet_in.in.h
+++ b/lib/netinet_in.in.h
@@ -1,5 +1,5 @@
 /* Substitute for <netinet/in.h>.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/nl_langinfo.c b/lib/nl_langinfo.c
index 771c9533..1ab551d0 100644
--- a/lib/nl_langinfo.c
+++ b/lib/nl_langinfo.c
@@ -1,6 +1,6 @@
 /* nl_langinfo() replacement: query locale dependent information.
 
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
@@ -20,13 +20,72 @@
 /* Specification.  */
 #include <langinfo.h>
 
+#include <locale.h>
+#include <string.h>
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# define WIN32_LEAN_AND_MEAN  /* avoid including junk */
+# include <windows.h>
+# include <stdio.h>
+#endif
+
+/* Return the codeset of the current locale, if this is easily deducible.
+   Otherwise, return "".  */
+static char *
+ctype_codeset (void)
+{
+  static char buf[2 + 10 + 1];
+  size_t buflen = 0;
+  char const *locale = setlocale (LC_CTYPE, NULL);
+  char *codeset = buf;
+  size_t codesetlen;
+  codeset[0] = '\0';
+
+  if (locale && locale[0])
+    {
+      /* If the locale name contains an encoding after the dot, return it.  */
+      char *dot = strchr (locale, '.');
+
+      if (dot)
+        {
+          /* Look for the possible @... trailer and remove it, if any.  */
+          char *codeset_start = dot + 1;
+          char const *modifier = strchr (codeset_start, '@');
+
+          if (! modifier)
+            codeset = codeset_start;
+          else
+            {
+              codesetlen = modifier - codeset_start;
+              if (codesetlen < sizeof buf)
+                {
+                  codeset = memcpy (buf, codeset_start, codesetlen);
+                  codeset[codesetlen] = '\0';
+                }
+            }
+        }
+    }
+
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+  /* If setlocale is successful, it returns the number of the
+     codepage, as a string.  Otherwise, fall back on Windows API
+     GetACP, which returns the locale's codepage as a number (although
+     this doesn't change according to what the 'setlocale' call specified).
+     Either way, prepend "CP" to make it a valid codeset name.  */
+  codesetlen = strlen (codeset);
+  if (0 < codesetlen && codesetlen < sizeof buf - 2)
+    memmove (buf + 2, codeset, codesetlen + 1);
+  else
+    sprintf (buf + 2, "%u", GetACP ());
+  codeset = memcpy (buf, "CP", 2);
+#endif
+  return codeset;
+}
+
+
 #if REPLACE_NL_LANGINFO
 
 /* Override nl_langinfo with support for added nl_item values.  */
 
-# include <locale.h>
-# include <string.h>
-
 # undef nl_langinfo
 
 char *
@@ -36,36 +95,7 @@ rpl_nl_langinfo (nl_item item)
     {
 # if GNULIB_defined_CODESET
     case CODESET:
-      {
-        const char *locale;
-        static char buf[2 + 10 + 1];
-
-        locale = setlocale (LC_CTYPE, NULL);
-        if (locale != NULL && locale[0] != '\0')
-          {
-            /* If the locale name contains an encoding after the dot, return
-               it.  */
-            const char *dot = strchr (locale, '.');
-
-            if (dot != NULL)
-              {
-                const char *modifier;
-
-                dot++;
-                /* Look for the possible @... trailer and remove it, if any.  */
-                modifier = strchr (dot, '@');
-                if (modifier == NULL)
-                  return dot;
-                if (modifier - dot < sizeof (buf))
-                  {
-                    memcpy (buf, dot, modifier - dot);
-                    buf [modifier - dot] = '\0';
-                    return buf;
-                  }
-              }
-          }
-        return "";
-      }
+      return ctype_codeset ();
 # endif
 # if GNULIB_defined_T_FMT_AMPM
     case T_FMT_AMPM:
@@ -111,42 +141,28 @@ rpl_nl_langinfo (nl_item item)
 
 #else
 
-/* Provide nl_langinfo from scratch.  */
-
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+/* Provide nl_langinfo from scratch, either for native MS-Windows, or
+   for old Unix platforms without locales, such as Linux libc5 or
+   BeOS.  */
 
-/* Native Windows platforms.  */
-
-#  define WIN32_LEAN_AND_MEAN  /* avoid including junk */
-#  include <windows.h>
-
-#  include <stdio.h>
-
-# else
-
-/* An old Unix platform without locales, such as Linux libc5 or BeOS.  */
-
-# endif
-
-# include <locale.h>
+# include <time.h>
 
 char *
 nl_langinfo (nl_item item)
 {
+  static char nlbuf[100];
+  struct tm tmm = { 0 };
+
   switch (item)
     {
     /* nl_langinfo items of the LC_CTYPE category */
     case CODESET:
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
       {
-        static char buf[2 + 10 + 1];
-
-        /* The Windows API has a function returning the locale's codepage as
-           a number.  */
-        sprintf (buf, "CP%u", GetACP ());
-        return buf;
+        char *codeset = ctype_codeset ();
+        if (*codeset)
+          return codeset;
       }
-# elif defined __BEOS__
+# ifdef __BEOS__
       return "UTF-8";
 # else
       return "ISO-8859-1";
@@ -156,6 +172,8 @@ nl_langinfo (nl_item item)
       return localeconv () ->decimal_point;
     case THOUSEP:
       return localeconv () ->thousands_sep;
+    case GROUPING:
+      return localeconv () ->grouping;
     /* nl_langinfo items of the LC_TIME category.
        TODO: Really use the locale.  */
     case D_T_FMT:
@@ -170,93 +188,126 @@ nl_langinfo (nl_item item)
     case T_FMT_AMPM:
       return "%I:%M:%S %p";
     case AM_STR:
-      return "AM";
+      if (!strftime (nlbuf, sizeof nlbuf, "%p", &tmm))
+        return "AM";
+      return nlbuf;
     case PM_STR:
-      return "PM";
+      tmm.tm_hour = 12;
+      if (!strftime (nlbuf, sizeof nlbuf, "%p", &tmm))
+        return "PM";
+      return nlbuf;
     case DAY_1:
-      return "Sunday";
     case DAY_2:
-      return "Monday";
     case DAY_3:
-      return "Tuesday";
     case DAY_4:
-      return "Wednesday";
     case DAY_5:
-      return "Thursday";
     case DAY_6:
-      return "Friday";
     case DAY_7:
-      return "Saturday";
+      {
+        static char const days[][sizeof "Wednesday"] = {
+          "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday",
+          "Friday", "Saturday"
+        };
+        tmm.tm_wday = item - DAY_1;
+        if (!strftime (nlbuf, sizeof nlbuf, "%A", &tmm))
+          return (char *) days[item - DAY_1];
+        return nlbuf;
+      }
     case ABDAY_1:
-      return "Sun";
     case ABDAY_2:
-      return "Mon";
     case ABDAY_3:
-      return "Tue";
     case ABDAY_4:
-      return "Wed";
     case ABDAY_5:
-      return "Thu";
     case ABDAY_6:
-      return "Fri";
     case ABDAY_7:
-      return "Sat";
+      {
+        static char const abdays[][sizeof "Sun"] = {
+          "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
+        };
+        tmm.tm_wday = item - ABDAY_1;
+        if (!strftime (nlbuf, sizeof nlbuf, "%a", &tmm))
+          return (char *) abdays[item - ABDAY_1];
+        return nlbuf;
+      }
     case MON_1:
-      return "January";
     case MON_2:
-      return "February";
     case MON_3:
-      return "March";
     case MON_4:
-      return "April";
     case MON_5:
-      return "May";
     case MON_6:
-      return "June";
     case MON_7:
-      return "July";
     case MON_8:
-      return "August";
     case MON_9:
-      return "September";
     case MON_10:
-      return "October";
     case MON_11:
-      return "November";
     case MON_12:
-      return "December";
+      {
+        static char const months[][sizeof "September"] = {
+          "January", "February", "March", "April", "May", "June", "July",
+          "September", "October", "November", "December"
+        };
+        tmm.tm_mon = item - MON_1;
+        if (!strftime (nlbuf, sizeof nlbuf, "%B", &tmm))
+          return (char *) months[item - MON_1];
+        return nlbuf;
+      }
     case ABMON_1:
-      return "Jan";
     case ABMON_2:
-      return "Feb";
     case ABMON_3:
-      return "Mar";
     case ABMON_4:
-      return "Apr";
     case ABMON_5:
-      return "May";
     case ABMON_6:
-      return "Jun";
     case ABMON_7:
-      return "Jul";
     case ABMON_8:
-      return "Aug";
     case ABMON_9:
-      return "Sep";
     case ABMON_10:
-      return "Oct";
     case ABMON_11:
-      return "Nov";
     case ABMON_12:
-      return "Dec";
+      {
+        static char const abmonths[][sizeof "Jan"] = {
+          "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul",
+          "Sep", "Oct", "Nov", "Dec"
+        };
+        tmm.tm_mon = item - ABMON_1;
+        if (!strftime (nlbuf, sizeof nlbuf, "%b", &tmm))
+          return (char *) abmonths[item - ABMON_1];
+        return nlbuf;
+      }
     case ERA:
       return "";
     case ALT_DIGITS:
       return "\0\0\0\0\0\0\0\0\0\0";
-    /* nl_langinfo items of the LC_MONETARY category
-       TODO: Really use the locale. */
+    /* nl_langinfo items of the LC_MONETARY category.  */
     case CRNCYSTR:
-      return "-";
+      return localeconv () ->currency_symbol;
+    case INT_CURR_SYMBOL:
+      return localeconv () ->int_curr_symbol;
+    case MON_DECIMAL_POINT:
+      return localeconv () ->mon_decimal_point;
+    case MON_THOUSANDS_SEP:
+      return localeconv () ->mon_thousands_sep;
+    case MON_GROUPING:
+      return localeconv () ->mon_grouping;
+    case POSITIVE_SIGN:
+      return localeconv () ->positive_sign;
+    case NEGATIVE_SIGN:
+      return localeconv () ->negative_sign;
+    case FRAC_DIGITS:
+      return & localeconv () ->frac_digits;
+    case INT_FRAC_DIGITS:
+      return & localeconv () ->int_frac_digits;
+    case P_CS_PRECEDES:
+      return & localeconv () ->p_cs_precedes;
+    case N_CS_PRECEDES:
+      return & localeconv () ->n_cs_precedes;
+    case P_SEP_BY_SPACE:
+      return & localeconv () ->p_sep_by_space;
+    case N_SEP_BY_SPACE:
+      return & localeconv () ->n_sep_by_space;
+    case P_SIGN_POSN:
+      return & localeconv () ->p_sign_posn;
+    case N_SIGN_POSN:
+      return & localeconv () ->n_sign_posn;
     /* nl_langinfo items of the LC_MESSAGES category
        TODO: Really use the locale. */
     case YESEXPR:
diff --git a/lib/nproc.c b/lib/nproc.c
index edede216..cadf959b 100644
--- a/lib/nproc.c
+++ b/lib/nproc.c
@@ -1,6 +1,6 @@
 /* Detect the number of processors.
 
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/nproc.h b/lib/nproc.h
index a612ca47..0cf65839 100644
--- a/lib/nproc.h
+++ b/lib/nproc.h
@@ -1,6 +1,6 @@
 /* Detect the number of processors.
 
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/obstack.c b/lib/obstack.c
index d915449d..2db87b35 100644
--- a/lib/obstack.c
+++ b/lib/obstack.c
@@ -1,19 +1,21 @@
 /* obstack.c - subroutines used implicitly by object stack macros
+   Copyright (C) 1988-2014 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
 
-   Copyright (C) 1988-1994, 1996-2006, 2009-2013 Free Software Foundation, Inc.
+   The GNU C Library 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 3 of the License, or (at your option) any later version.
 
-   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 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
+   The GNU C Library 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.
+   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 the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifdef _LIBC
 # include <obstack.h>
@@ -49,6 +51,7 @@
 
 #ifndef ELIDE_CODE
 
+
 # include <stdint.h>
 
 /* Determine default alignment.  */
@@ -67,10 +70,10 @@ struct fooalign
    But in fact it might be less smart and round addresses to as much as
    DEFAULT_ROUNDING.  So we prepare for it to do that.  */
 enum
-  {
-    DEFAULT_ALIGNMENT = offsetof (struct fooalign, u),
-    DEFAULT_ROUNDING = sizeof (union fooround)
-  };
+{
+  DEFAULT_ALIGNMENT = offsetof (struct fooalign, u),
+  DEFAULT_ROUNDING = sizeof (union fooround)
+};
 
 /* When we copy a long block of data, this is the unit to do it with.
    On some machines, copying successive ints does not work;
@@ -104,7 +107,7 @@ int obstack_exit_failure = EXIT_FAILURE;
 /* A looong time ago (before 1994, anyway; we're not sure) this global variable
    was used by non-GNU-C macros to avoid multiple evaluation.  The GNU C
    library still exports it because somebody might use it.  */
-struct obstack *_obstack_compat;
+struct obstack *_obstack_compat = 0;
 compat_symbol (libc, _obstack_compat, _obstack, GLIBC_2_0);
 #  endif
 # endif
@@ -116,19 +119,19 @@ compat_symbol (libc, _obstack_compat, _obstack, GLIBC_2_0);
    do not allow (expr) ? void : void.  */
 
 # define CALL_CHUNKFUN(h, size) \
-  (((h) -> use_extra_arg) \
-   ? (*(h)->chunkfun) ((h)->extra_arg, (size)) \
-   : (*(struct _obstack_chunk *(*) (long)) (h)->chunkfun) ((size)))
+  (((h)->use_extra_arg)							      \
+   ? (*(h)->chunkfun)((h)->extra_arg, (size))				      \
+   : (*(struct _obstack_chunk *(*)(long))(h)->chunkfun)((size)))
 
 # define CALL_FREEFUN(h, old_chunk) \
   do { \
-    if ((h) -> use_extra_arg) \
-      (*(h)->freefun) ((h)->extra_arg, (old_chunk)); \
-    else \
-      (*(void (*) (void *)) (h)->freefun) ((old_chunk)); \
-  } while (0)
+      if ((h)->use_extra_arg)						      \
+        (*(h)->freefun)((h)->extra_arg, (old_chunk));			      \
+      else								      \
+        (*(void (*)(void *))(h)->freefun)((old_chunk));			      \
+    } while (0)
+
 
-
 /* Initialize an obstack H for use.  Specify chunk size SIZE (0 means default).
    Objects start on multiples of ALIGNMENT (0 means use default).
    CHUNKFUN is the function to use to allocate chunks,
@@ -143,7 +146,7 @@ _obstack_begin (struct obstack *h,
                 void *(*chunkfun) (long),
                 void (*freefun) (void *))
 {
-  register struct _obstack_chunk *chunk; /* points to new chunk */
+  struct _obstack_chunk *chunk; /* points to new chunk */
 
   if (alignment == 0)
     alignment = DEFAULT_ALIGNMENT;
@@ -164,19 +167,19 @@ _obstack_begin (struct obstack *h,
       size = 4096 - extra;
     }
 
-  h->chunkfun = (struct _obstack_chunk * (*)(void *, long)) chunkfun;
+  h->chunkfun = (struct _obstack_chunk * (*) (void *, long)) chunkfun;
   h->freefun = (void (*) (void *, struct _obstack_chunk *)) freefun;
   h->chunk_size = size;
   h->alignment_mask = alignment - 1;
   h->use_extra_arg = 0;
 
-  chunk = h->chunk = CALL_CHUNKFUN (h, h -> chunk_size);
+  chunk = h->chunk = CALL_CHUNKFUN (h, h->chunk_size);
   if (!chunk)
     (*obstack_alloc_failed_handler) ();
   h->next_free = h->object_base = __PTR_ALIGN ((char *) chunk, chunk->contents,
                                                alignment - 1);
   h->chunk_limit = chunk->limit
-    = (char *) chunk + h->chunk_size;
+                     = (char *) chunk + h->chunk_size;
   chunk->prev = 0;
   /* The initial chunk now contains no empty object.  */
   h->maybe_empty_object = 0;
@@ -190,7 +193,7 @@ _obstack_begin_1 (struct obstack *h, int size, int alignment,
                   void (*freefun) (void *, void *),
                   void *arg)
 {
-  register struct _obstack_chunk *chunk; /* points to new chunk */
+  struct _obstack_chunk *chunk; /* points to new chunk */
 
   if (alignment == 0)
     alignment = DEFAULT_ALIGNMENT;
@@ -218,13 +221,13 @@ _obstack_begin_1 (struct obstack *h, int size, int alignment,
   h->extra_arg = arg;
   h->use_extra_arg = 1;
 
-  chunk = h->chunk = CALL_CHUNKFUN (h, h -> chunk_size);
+  chunk = h->chunk = CALL_CHUNKFUN (h, h->chunk_size);
   if (!chunk)
     (*obstack_alloc_failed_handler) ();
   h->next_free = h->object_base = __PTR_ALIGN ((char *) chunk, chunk->contents,
                                                alignment - 1);
   h->chunk_limit = chunk->limit
-    = (char *) chunk + h->chunk_size;
+                     = (char *) chunk + h->chunk_size;
   chunk->prev = 0;
   /* The initial chunk now contains no empty object.  */
   h->maybe_empty_object = 0;
@@ -241,11 +244,11 @@ _obstack_begin_1 (struct obstack *h, int size, int alignment,
 void
 _obstack_newchunk (struct obstack *h, int length)
 {
-  register struct _obstack_chunk *old_chunk = h->chunk;
-  register struct _obstack_chunk *new_chunk;
-  register long new_size;
-  register long obj_size = h->next_free - h->object_base;
-  register long i;
+  struct _obstack_chunk *old_chunk = h->chunk;
+  struct _obstack_chunk *new_chunk;
+  long new_size;
+  long obj_size = h->next_free - h->object_base;
+  long i;
   long already;
   char *object_base;
 
@@ -257,7 +260,7 @@ _obstack_newchunk (struct obstack *h, int length)
   /* Allocate and initialize the new chunk.  */
   new_chunk = CALL_CHUNKFUN (h, new_size);
   if (!new_chunk)
-    (*obstack_alloc_failed_handler) ();
+    (*obstack_alloc_failed_handler)();
   h->chunk = new_chunk;
   new_chunk->prev = old_chunk;
   new_chunk->limit = h->chunk_limit = (char *) new_chunk + new_size;
@@ -273,8 +276,8 @@ _obstack_newchunk (struct obstack *h, int length)
     {
       for (i = obj_size / sizeof (COPYING_UNIT) - 1;
            i >= 0; i--)
-        ((COPYING_UNIT *)object_base)[i]
-          = ((COPYING_UNIT *)h->object_base)[i];
+        ((COPYING_UNIT *) object_base)[i]
+          = ((COPYING_UNIT *) h->object_base)[i];
       /* We used to copy the odd few remaining bytes as one extra COPYING_UNIT,
          but that can cross a page boundary on a machine
          which does not do strict alignment for COPYING_UNITS.  */
@@ -289,7 +292,7 @@ _obstack_newchunk (struct obstack *h, int length)
   /* If the object just copied was the only data in OLD_CHUNK,
      free that chunk and remove it from the chain.
      But not if that chunk might contain an empty object.  */
-  if (! h->maybe_empty_object
+  if (!h->maybe_empty_object
       && (h->object_base
           == __PTR_ALIGN ((char *) old_chunk, old_chunk->contents,
                           h->alignment_mask)))
@@ -313,13 +316,13 @@ libc_hidden_def (_obstack_newchunk)
 
 /* Suppress -Wmissing-prototypes warning.  We don't want to declare this in
    obstack.h because it is just for debugging.  */
-int _obstack_allocated_p (struct obstack *h, void *obj);
+int _obstack_allocated_p (struct obstack *h, void *obj) __attribute_pure__;
 
 int
 _obstack_allocated_p (struct obstack *h, void *obj)
 {
-  register struct _obstack_chunk *lp;   /* below addr of any objects in this chunk */
-  register struct _obstack_chunk *plp;  /* point to previous chunk if any */
+  struct _obstack_chunk *lp;    /* below addr of any objects in this chunk */
+  struct _obstack_chunk *plp;   /* point to previous chunk if any */
 
   lp = (h)->chunk;
   /* We use >= rather than > since the object cannot be exactly at
@@ -332,7 +335,7 @@ _obstack_allocated_p (struct obstack *h, void *obj)
     }
   return lp != 0;
 }
-
+
 /* Free objects in obstack H, including OBJ and everything allocate
    more recently than OBJ.  If OBJ is zero, free everything in H.  */
 
@@ -341,8 +344,8 @@ _obstack_allocated_p (struct obstack *h, void *obj)
 void
 __obstack_free (struct obstack *h, void *obj)
 {
-  register struct _obstack_chunk *lp;   /* below addr of any objects in this chunk */
-  register struct _obstack_chunk *plp;  /* point to previous chunk if any */
+  struct _obstack_chunk *lp;    /* below addr of any objects in this chunk */
+  struct _obstack_chunk *plp;   /* point to previous chunk if any */
 
   lp = h->chunk;
   /* We use >= because there cannot be an object at the beginning of a chunk.
@@ -373,12 +376,12 @@ __obstack_free (struct obstack *h, void *obj)
    called by non-GCC compilers.  */
 strong_alias (obstack_free, _obstack_free)
 # endif
-
+
 int
 _obstack_memory_used (struct obstack *h)
 {
-  register struct _obstack_chunk* lp;
-  register int nbytes = 0;
+  struct _obstack_chunk *lp;
+  int nbytes = 0;
 
   for (lp = h->chunk; lp != 0; lp = lp->prev)
     {
@@ -386,7 +389,7 @@ _obstack_memory_used (struct obstack *h)
     }
   return nbytes;
 }
-
+
 /* Define the error handler.  */
 # ifdef _LIBC
 #  include <libintl.h>
diff --git a/lib/obstack.h b/lib/obstack.h
index 159cfa2e..ebaa622f 100644
--- a/lib/obstack.h
+++ b/lib/obstack.h
@@ -1,90 +1,90 @@
 /* obstack.h - object stack macros
-   Copyright (C) 1988-1994, 1996-1999, 2003-2006, 2009-2013 Free Software
-   Foundation, Inc.
+   Copyright (C) 1988-2014 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
-   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 3 of the License, or
-   (at your option) any later version.
+   The GNU C Library 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 3 of the License, or (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful,
+   The GNU C Library 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.
+   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/>.  */
+   You should have received a copy of the GNU General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 /* Summary:
 
-All the apparent functions defined here are macros. The idea
-is that you would use these pre-tested macros to solve a
-very specific set of problems, and they would run fast.
-Caution: no side-effects in arguments please!! They may be
-evaluated MANY times!!
-
-These macros operate a stack of objects.  Each object starts life
-small, and may grow to maturity.  (Consider building a word syllable
-by syllable.)  An object can move while it is growing.  Once it has
-been "finished" it never changes address again.  So the "top of the
-stack" is typically an immature growing object, while the rest of the
-stack is of mature, fixed size and fixed address objects.
-
-These routines grab large chunks of memory, using a function you
-supply, called 'obstack_chunk_alloc'.  On occasion, they free chunks,
-by calling 'obstack_chunk_free'.  You must define them and declare
-them before using any obstack macros.
-
-Each independent stack is represented by a 'struct obstack'.
-Each of the obstack macros expects a pointer to such a structure
-as the first argument.
-
-One motivation for this package is the problem of growing char strings
-in symbol tables.  Unless you are "fascist pig with a read-only mind"
---Gosper's immortal quote from HAKMEM item 154, out of context--you
-would not like to put any arbitrary upper limit on the length of your
-symbols.
-
-In practice this often means you will build many short symbols and a
-few long symbols.  At the time you are reading a symbol you don't know
-how long it is.  One traditional method is to read a symbol into a
-buffer, realloc()ating the buffer every time you try to read a symbol
-that is longer than the buffer.  This is beaut, but you still will
-want to copy the symbol from the buffer to a more permanent
-symbol-table entry say about half the time.
-
-With obstacks, you can work differently.  Use one obstack for all symbol
-names.  As you read a symbol, grow the name in the obstack gradually.
-When the name is complete, finalize it.  Then, if the symbol exists already,
-free the newly read name.
-
-The way we do this is to take a large chunk, allocating memory from
-low addresses.  When you want to build a symbol in the chunk you just
-add chars above the current "high water mark" in the chunk.  When you
-have finished adding chars, because you got to the end of the symbol,
-you know how long the chars are, and you can create a new object.
-Mostly the chars will not burst over the highest address of the chunk,
-because you would typically expect a chunk to be (say) 100 times as
-long as an average object.
-
-In case that isn't clear, when we have enough chars to make up
-the object, THEY ARE ALREADY CONTIGUOUS IN THE CHUNK (guaranteed)
-so we just point to it where it lies.  No moving of chars is
-needed and this is the second win: potentially long strings need
-never be explicitly shuffled. Once an object is formed, it does not
-change its address during its lifetime.
-
-When the chars burst over a chunk boundary, we allocate a larger
-chunk, and then copy the partly formed object from the end of the old
-chunk to the beginning of the new larger chunk.  We then carry on
-accreting characters to the end of the object as we normally would.
-
-A special macro is provided to add a single char at a time to a
-growing object.  This allows the use of register variables, which
-break the ordinary 'growth' macro.
-
-Summary:
+   All the apparent functions defined here are macros. The idea
+   is that you would use these pre-tested macros to solve a
+   very specific set of problems, and they would run fast.
+   Caution: no side-effects in arguments please!! They may be
+   evaluated MANY times!!
+
+   These macros operate a stack of objects.  Each object starts life
+   small, and may grow to maturity.  (Consider building a word syllable
+   by syllable.)  An object can move while it is growing.  Once it has
+   been "finished" it never changes address again.  So the "top of the
+   stack" is typically an immature growing object, while the rest of the
+   stack is of mature, fixed size and fixed address objects.
+
+   These routines grab large chunks of memory, using a function you
+   supply, called 'obstack_chunk_alloc'.  On occasion, they free chunks,
+   by calling 'obstack_chunk_free'.  You must define them and declare
+   them before using any obstack macros.
+
+   Each independent stack is represented by a 'struct obstack'.
+   Each of the obstack macros expects a pointer to such a structure
+   as the first argument.
+
+   One motivation for this package is the problem of growing char strings
+   in symbol tables.  Unless you are "fascist pig with a read-only mind"
+   --Gosper's immortal quote from HAKMEM item 154, out of context--you
+   would not like to put any arbitrary upper limit on the length of your
+   symbols.
+
+   In practice this often means you will build many short symbols and a
+   few long symbols.  At the time you are reading a symbol you don't know
+   how long it is.  One traditional method is to read a symbol into a
+   buffer, realloc()ating the buffer every time you try to read a symbol
+   that is longer than the buffer.  This is beaut, but you still will
+   want to copy the symbol from the buffer to a more permanent
+   symbol-table entry say about half the time.
+
+   With obstacks, you can work differently.  Use one obstack for all symbol
+   names.  As you read a symbol, grow the name in the obstack gradually.
+   When the name is complete, finalize it.  Then, if the symbol exists already,
+   free the newly read name.
+
+   The way we do this is to take a large chunk, allocating memory from
+   low addresses.  When you want to build a symbol in the chunk you just
+   add chars above the current "high water mark" in the chunk.  When you
+   have finished adding chars, because you got to the end of the symbol,
+   you know how long the chars are, and you can create a new object.
+   Mostly the chars will not burst over the highest address of the chunk,
+   because you would typically expect a chunk to be (say) 100 times as
+   long as an average object.
+
+   In case that isn't clear, when we have enough chars to make up
+   the object, THEY ARE ALREADY CONTIGUOUS IN THE CHUNK (guaranteed)
+   so we just point to it where it lies.  No moving of chars is
+   needed and this is the second win: potentially long strings need
+   never be explicitly shuffled. Once an object is formed, it does not
+   change its address during its lifetime.
+
+   When the chars burst over a chunk boundary, we allocate a larger
+   chunk, and then copy the partly formed object from the end of the old
+   chunk to the beginning of the new larger chunk.  We then carry on
+   accreting characters to the end of the object as we normally would.
+
+   A special macro is provided to add a single char at a time to a
+   growing object.  This allows the use of register variables, which
+   break the ordinary 'growth' macro.
+
+   Summary:
         We allocate large chunks.
         We carve out one object at a time from the current chunk.
         Once carved, an object never moves.
@@ -96,14 +96,14 @@ Summary:
         Because of the way we do it, you can "unwind" an obstack
           back to a previous state. (You may remove objects much
           as you would with a stack.)
-*/
+ */
 
 
 /* Don't do the contents of this file more than once.  */
 
 #ifndef _OBSTACK_H
 #define _OBSTACK_H 1
-
+
 /* We need the type of a pointer subtraction.  If __PTRDIFF_TYPE__ is
    defined, as with GNU C, use that; that way we don't pollute the
    namespace with <stddef.h>'s symbols.  Otherwise, include <stddef.h>
@@ -129,70 +129,74 @@ Summary:
    relative to B.  Otherwise, use the faster strategy of computing the
    alignment relative to 0.  */
 
-#define __PTR_ALIGN(B, P, A)                                                \
+#define __PTR_ALIGN(B, P, A)						      \
   __BPTR_ALIGN (sizeof (PTR_INT_TYPE) < sizeof (void *) ? (B) : (char *) 0, \
                 P, A)
 
 #include <string.h>
 
+#ifndef __attribute_pure__
+# define __attribute_pure__ _GL_ATTRIBUTE_PURE
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 struct _obstack_chunk           /* Lives at front of each chunk. */
 {
-  char  *limit;                 /* 1 past end of this chunk */
+  char *limit;                  /* 1 past end of this chunk */
   struct _obstack_chunk *prev;  /* address of prior chunk or NULL */
-  char  contents[4];            /* objects begin here */
+  char contents[4];             /* objects begin here */
 };
 
 struct obstack          /* control current object in current chunk */
 {
-  long  chunk_size;             /* preferred size to allocate chunks in */
+  long chunk_size;              /* preferred size to allocate chunks in */
   struct _obstack_chunk *chunk; /* address of current struct obstack_chunk */
-  char  *object_base;           /* address of object we are building */
-  char  *next_free;             /* where to add next char to current object */
-  char  *chunk_limit;           /* address of char after current chunk */
+  char *object_base;            /* address of object we are building */
+  char *next_free;              /* where to add next char to current object */
+  char *chunk_limit;            /* address of char after current chunk */
   union
   {
     PTR_INT_TYPE tempint;
     void *tempptr;
   } temp;                       /* Temporary for some macros.  */
-  int   alignment_mask;         /* Mask of alignment for each object. */
+  int alignment_mask;           /* Mask of alignment for each object. */
   /* These prototypes vary based on 'use_extra_arg', and we use
      casts to the prototypeless function type in all assignments,
      but having prototypes here quiets -Wstrict-prototypes.  */
   struct _obstack_chunk *(*chunkfun) (void *, long);
   void (*freefun) (void *, struct _obstack_chunk *);
   void *extra_arg;              /* first arg for chunk alloc/dealloc funcs */
-  unsigned use_extra_arg:1;     /* chunk alloc/dealloc funcs take extra arg */
-  unsigned maybe_empty_object:1;/* There is a possibility that the current
-                                   chunk contains a zero-length object.  This
-                                   prevents freeing the chunk if we allocate
-                                   a bigger chunk to replace it. */
-  unsigned alloc_failed:1;      /* No longer used, as we now call the failed
-                                   handler on error, but retained for binary
-                                   compatibility.  */
+  unsigned use_extra_arg : 1;     /* chunk alloc/dealloc funcs take extra arg */
+  unsigned maybe_empty_object : 1; /* There is a possibility that the current
+                                      chunk contains a zero-length object.  This
+                                      prevents freeing the chunk if we allocate
+                                      a bigger chunk to replace it. */
+  unsigned alloc_failed : 1;      /* No longer used, as we now call the failed
+                                     handler on error, but retained for binary
+                                     compatibility.  */
 };
 
 /* Declare the external functions we use; they are in obstack.c.  */
 
 extern void _obstack_newchunk (struct obstack *, int);
 extern int _obstack_begin (struct obstack *, int, int,
-                            void *(*) (long), void (*) (void *));
+                           void *(*)(long), void (*)(void *));
 extern int _obstack_begin_1 (struct obstack *, int, int,
-                             void *(*) (void *, long),
-                             void (*) (void *, void *), void *);
-extern int _obstack_memory_used (struct obstack *);
+                             void *(*)(void *, long),
+                             void (*)(void *, void *), void *);
+extern int _obstack_memory_used (struct obstack *) __attribute_pure__;
 
 /* The default name of the function for freeing a chunk is 'obstack_free',
    but gnulib users can override this by defining '__obstack_free'.  */
 #ifndef __obstack_free
 # define __obstack_free obstack_free
 #endif
-extern void __obstack_free (struct obstack *obstack, void *block);
+extern void __obstack_free (struct obstack *, void *);
+
 
-
 /* Error handler called when 'obstack_chunk_alloc' failed to allocate
    more memory.  This can be set to a user defined function which
    should either abort gracefully or use longjump - but shouldn't
@@ -201,7 +205,7 @@ extern void (*obstack_alloc_failed_handler) (void);
 
 /* Exit value used when 'print_and_abort' is used.  */
 extern int obstack_exit_failure;
-
+
 /* Pointer to beginning of object being allocated or to be allocated next.
    Note that this might not be the final address of the object
    because a new chunk might be needed to hold the final size.  */
@@ -221,43 +225,40 @@ extern int obstack_exit_failure;
 #define obstack_alignment_mask(h) ((h)->alignment_mask)
 
 /* To prevent prototype warnings provide complete argument list.  */
-#define obstack_init(h)                                         \
-  _obstack_begin ((h), 0, 0,                                    \
-                  (void *(*) (long)) obstack_chunk_alloc,       \
-                  (void (*) (void *)) obstack_chunk_free)
+#define obstack_init(h)							      \
+  _obstack_begin ((h), 0, 0,						      \
+                  (void *(*)(long))obstack_chunk_alloc,			      \
+                  (void (*)(void *))obstack_chunk_free)
 
-#define obstack_begin(h, size)                                  \
-  _obstack_begin ((h), (size), 0,                               \
-                  (void *(*) (long)) obstack_chunk_alloc,       \
-                  (void (*) (void *)) obstack_chunk_free)
+#define obstack_begin(h, size)						      \
+  _obstack_begin ((h), (size), 0,					      \
+                  (void *(*)(long))obstack_chunk_alloc,			      \
+                  (void (*)(void *))obstack_chunk_free)
 
 #define obstack_specify_allocation(h, size, alignment, chunkfun, freefun)  \
-  _obstack_begin ((h), (size), (alignment),                                \
-                  (void *(*) (long)) (chunkfun),                           \
-                  (void (*) (void *)) (freefun))
+  _obstack_begin ((h), (size), (alignment),				      \
+                  (void *(*)(long))(chunkfun),				      \
+                  (void (*)(void *))(freefun))
 
 #define obstack_specify_allocation_with_arg(h, size, alignment, chunkfun, freefun, arg) \
-  _obstack_begin_1 ((h), (size), (alignment),                           \
-                    (void *(*) (void *, long)) (chunkfun),              \
-                    (void (*) (void *, void *)) (freefun), (arg))
+  _obstack_begin_1 ((h), (size), (alignment),				      \
+                    (void *(*)(void *, long))(chunkfun),		      \
+                    (void (*)(void *, void *))(freefun), (arg))
 
 #define obstack_chunkfun(h, newchunkfun) \
-  ((h) -> chunkfun = (struct _obstack_chunk *(*)(void *, long)) (newchunkfun))
+  ((h)->chunkfun = (struct _obstack_chunk *(*)(void *, long))(newchunkfun))
 
 #define obstack_freefun(h, newfreefun) \
-  ((h) -> freefun = (void (*)(void *, struct _obstack_chunk *)) (newfreefun))
+  ((h)->freefun = (void (*)(void *, struct _obstack_chunk *))(newfreefun))
 
-#define obstack_1grow_fast(h,achar) (*((h)->next_free)++ = (achar))
+#define obstack_1grow_fast(h, achar) (*((h)->next_free)++ = (achar))
 
-#define obstack_blank_fast(h,n) ((h)->next_free += (n))
+#define obstack_blank_fast(h, n) ((h)->next_free += (n))
 
 #define obstack_memory_used(h) _obstack_memory_used (h)
-
+
 #if defined __GNUC__
-/* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and
-   does not implement __extension__.  But that compiler doesn't define
-   __GNUC_MINOR__.  */
-# if __GNUC__ < 2 || (__NeXT__ && !__GNUC_MINOR__)
+# if ! (2 < __GNUC__ + (8 <= __GNUC_MINOR__))
 #  define __extension__
 # endif
 
@@ -266,158 +267,160 @@ extern int obstack_exit_failure;
    without using a global variable.
    Also, we can avoid using the 'temp' slot, to make faster code.  */
 
-# define obstack_object_size(OBSTACK)                                   \
-  __extension__                                                         \
-  ({ struct obstack const *__o = (OBSTACK);                             \
-     (unsigned) (__o->next_free - __o->object_base); })
-
-# define obstack_room(OBSTACK)                                          \
-  __extension__                                                         \
-  ({ struct obstack const *__o = (OBSTACK);                             \
-     (unsigned) (__o->chunk_limit - __o->next_free); })
-
-# define obstack_make_room(OBSTACK,length)                              \
-__extension__                                                           \
-({ struct obstack *__o = (OBSTACK);                                     \
-   int __len = (length);                                                \
-   if (__o->chunk_limit - __o->next_free < __len)                       \
-     _obstack_newchunk (__o, __len);                                    \
-   (void) 0; })
-
-# define obstack_empty_p(OBSTACK)                                       \
-  __extension__                                                         \
-  ({ struct obstack const *__o = (OBSTACK);                             \
-     (__o->chunk->prev == 0                                             \
-      && __o->next_free == __PTR_ALIGN ((char *) __o->chunk,            \
-                                        __o->chunk->contents,           \
-                                        __o->alignment_mask)); })
-
-# define obstack_grow(OBSTACK,where,length)                             \
-__extension__                                                           \
-({ struct obstack *__o = (OBSTACK);                                     \
-   int __len = (length);                                                \
-   if (__o->next_free + __len > __o->chunk_limit)                       \
-     _obstack_newchunk (__o, __len);                                    \
-   memcpy (__o->next_free, where, __len);                               \
-   __o->next_free += __len;                                             \
-   (void) 0; })
-
-# define obstack_grow0(OBSTACK,where,length)                            \
-__extension__                                                           \
-({ struct obstack *__o = (OBSTACK);                                     \
-   int __len = (length);                                                \
-   if (__o->next_free + __len + 1 > __o->chunk_limit)                   \
-     _obstack_newchunk (__o, __len + 1);                                \
-   memcpy (__o->next_free, where, __len);                               \
-   __o->next_free += __len;                                             \
-   *(__o->next_free)++ = 0;                                             \
-   (void) 0; })
-
-# define obstack_1grow(OBSTACK,datum)                                   \
-__extension__                                                           \
-({ struct obstack *__o = (OBSTACK);                                     \
-   if (__o->next_free + 1 > __o->chunk_limit)                           \
-     _obstack_newchunk (__o, 1);                                        \
-   obstack_1grow_fast (__o, datum);                                     \
-   (void) 0; })
+# define obstack_object_size(OBSTACK)					      \
+  __extension__								      \
+    ({ struct obstack const *__o = (OBSTACK);				      \
+       (unsigned) (__o->next_free - __o->object_base); })
+
+# define obstack_room(OBSTACK)						      \
+  __extension__								      \
+    ({ struct obstack const *__o = (OBSTACK);				      \
+       (unsigned) (__o->chunk_limit - __o->next_free); })
+
+# define obstack_make_room(OBSTACK, length)				      \
+  __extension__								      \
+    ({ struct obstack *__o = (OBSTACK);					      \
+       int __len = (length);						      \
+       if (__o->chunk_limit - __o->next_free < __len)			      \
+         _obstack_newchunk (__o, __len);				      \
+       (void) 0; })
+
+# define obstack_empty_p(OBSTACK)					      \
+  __extension__								      \
+    ({ struct obstack const *__o = (OBSTACK);				      \
+       (__o->chunk->prev == 0						      \
+        && __o->next_free == __PTR_ALIGN ((char *) __o->chunk,		      \
+                                          __o->chunk->contents,		      \
+                                          __o->alignment_mask)); })
+
+# define obstack_grow(OBSTACK, where, length)				      \
+  __extension__								      \
+    ({ struct obstack *__o = (OBSTACK);					      \
+       int __len = (length);						      \
+       if (__o->next_free + __len > __o->chunk_limit)			      \
+         _obstack_newchunk (__o, __len);				      \
+       memcpy (__o->next_free, where, __len);				      \
+       __o->next_free += __len;						      \
+       (void) 0; })
+
+# define obstack_grow0(OBSTACK, where, length)				      \
+  __extension__								      \
+    ({ struct obstack *__o = (OBSTACK);					      \
+       int __len = (length);						      \
+       if (__o->next_free + __len + 1 > __o->chunk_limit)		      \
+         _obstack_newchunk (__o, __len + 1);				      \
+       memcpy (__o->next_free, where, __len);				      \
+       __o->next_free += __len;						      \
+       *(__o->next_free)++ = 0;						      \
+       (void) 0; })
+
+# define obstack_1grow(OBSTACK, datum)					      \
+  __extension__								      \
+    ({ struct obstack *__o = (OBSTACK);					      \
+       if (__o->next_free + 1 > __o->chunk_limit)			      \
+         _obstack_newchunk (__o, 1);					      \
+       obstack_1grow_fast (__o, datum);					      \
+       (void) 0; })
 
 /* These assume that the obstack alignment is good enough for pointers
    or ints, and that the data added so far to the current object
    shares that much alignment.  */
 
-# define obstack_ptr_grow(OBSTACK,datum)                                \
-__extension__                                                           \
-({ struct obstack *__o = (OBSTACK);                                     \
-   if (__o->next_free + sizeof (void *) > __o->chunk_limit)             \
-     _obstack_newchunk (__o, sizeof (void *));                          \
-   obstack_ptr_grow_fast (__o, datum); })                               \
-
-# define obstack_int_grow(OBSTACK,datum)                                \
-__extension__                                                           \
-({ struct obstack *__o = (OBSTACK);                                     \
-   if (__o->next_free + sizeof (int) > __o->chunk_limit)                \
-     _obstack_newchunk (__o, sizeof (int));                             \
-   obstack_int_grow_fast (__o, datum); })
-
-# define obstack_ptr_grow_fast(OBSTACK,aptr)                            \
-__extension__                                                           \
-({ struct obstack *__o1 = (OBSTACK);                                    \
-   *(const void **) __o1->next_free = (aptr);                           \
-   __o1->next_free += sizeof (const void *);                            \
-   (void) 0; })
-
-# define obstack_int_grow_fast(OBSTACK,aint)                            \
-__extension__                                                           \
-({ struct obstack *__o1 = (OBSTACK);                                    \
-   *(int *) __o1->next_free = (aint);                                   \
-   __o1->next_free += sizeof (int);                                     \
-   (void) 0; })
-
-# define obstack_blank(OBSTACK,length)                                  \
-__extension__                                                           \
-({ struct obstack *__o = (OBSTACK);                                     \
-   int __len = (length);                                                \
-   if (__o->chunk_limit - __o->next_free < __len)                       \
-     _obstack_newchunk (__o, __len);                                    \
-   obstack_blank_fast (__o, __len);                                     \
-   (void) 0; })
-
-# define obstack_alloc(OBSTACK,length)                                  \
-__extension__                                                           \
-({ struct obstack *__h = (OBSTACK);                                     \
-   obstack_blank (__h, (length));                                       \
-   obstack_finish (__h); })
-
-# define obstack_copy(OBSTACK,where,length)                             \
-__extension__                                                           \
-({ struct obstack *__h = (OBSTACK);                                     \
-   obstack_grow (__h, (where), (length));                               \
-   obstack_finish (__h); })
-
-# define obstack_copy0(OBSTACK,where,length)                            \
-__extension__                                                           \
-({ struct obstack *__h = (OBSTACK);                                     \
-   obstack_grow0 (__h, (where), (length));                              \
-   obstack_finish (__h); })
+# define obstack_ptr_grow(OBSTACK, datum)				      \
+  __extension__								      \
+    ({ struct obstack *__o = (OBSTACK);					      \
+       if (__o->next_free + sizeof (void *) > __o->chunk_limit)		      \
+         _obstack_newchunk (__o, sizeof (void *));			      \
+       obstack_ptr_grow_fast (__o, datum); })				      \
+
+# define obstack_int_grow(OBSTACK, datum)				      \
+  __extension__								      \
+    ({ struct obstack *__o = (OBSTACK);					      \
+       if (__o->next_free + sizeof (int) > __o->chunk_limit)		      \
+         _obstack_newchunk (__o, sizeof (int));				      \
+       obstack_int_grow_fast (__o, datum); })
+
+# define obstack_ptr_grow_fast(OBSTACK, aptr)				      \
+  __extension__								      \
+    ({ struct obstack *__o1 = (OBSTACK);				      \
+       void *__p1 = __o1->next_free;					      \
+       *(const void **) __p1 = (aptr);					      \
+       __o1->next_free += sizeof (const void *);			      \
+       (void) 0; })
+
+# define obstack_int_grow_fast(OBSTACK, aint)				      \
+  __extension__								      \
+    ({ struct obstack *__o1 = (OBSTACK);				      \
+       void *__p1 = __o1->next_free;					      \
+       *(int *) __p1 = (aint);						      \
+       __o1->next_free += sizeof (int);					      \
+       (void) 0; })
+
+# define obstack_blank(OBSTACK, length)					      \
+  __extension__								      \
+    ({ struct obstack *__o = (OBSTACK);					      \
+       int __len = (length);						      \
+       if (__o->chunk_limit - __o->next_free < __len)			      \
+         _obstack_newchunk (__o, __len);				      \
+       obstack_blank_fast (__o, __len);					      \
+       (void) 0; })
+
+# define obstack_alloc(OBSTACK, length)					      \
+  __extension__								      \
+    ({ struct obstack *__h = (OBSTACK);					      \
+       obstack_blank (__h, (length));					      \
+       obstack_finish (__h); })
+
+# define obstack_copy(OBSTACK, where, length)				      \
+  __extension__								      \
+    ({ struct obstack *__h = (OBSTACK);					      \
+       obstack_grow (__h, (where), (length));				      \
+       obstack_finish (__h); })
+
+# define obstack_copy0(OBSTACK, where, length)				      \
+  __extension__								      \
+    ({ struct obstack *__h = (OBSTACK);					      \
+       obstack_grow0 (__h, (where), (length));				      \
+       obstack_finish (__h); })
 
 /* The local variable is named __o1 to avoid a name conflict
    when obstack_blank is called.  */
-# define obstack_finish(OBSTACK)                                        \
-__extension__                                                           \
-({ struct obstack *__o1 = (OBSTACK);                                    \
-   void *__value = (void *) __o1->object_base;                          \
-   if (__o1->next_free == __value)                                      \
-     __o1->maybe_empty_object = 1;                                      \
-   __o1->next_free                                                      \
-     = __PTR_ALIGN (__o1->object_base, __o1->next_free,                 \
-                    __o1->alignment_mask);                              \
-   if (__o1->next_free - (char *)__o1->chunk                            \
-       > __o1->chunk_limit - (char *)__o1->chunk)                       \
-     __o1->next_free = __o1->chunk_limit;                               \
-   __o1->object_base = __o1->next_free;                                 \
-   __value; })
-
-# define obstack_free(OBSTACK, OBJ)                                     \
-__extension__                                                           \
-({ struct obstack *__o = (OBSTACK);                                     \
-   void *__obj = (OBJ);                                                 \
-   if (__obj > (void *)__o->chunk && __obj < (void *)__o->chunk_limit)  \
-     __o->next_free = __o->object_base = (char *)__obj;                 \
-   else (__obstack_free) (__o, __obj); })
-
+# define obstack_finish(OBSTACK)					      \
+  __extension__								      \
+    ({ struct obstack *__o1 = (OBSTACK);				      \
+       void *__value = (void *) __o1->object_base;			      \
+       if (__o1->next_free == __value)					      \
+         __o1->maybe_empty_object = 1;					      \
+       __o1->next_free							      \
+         = __PTR_ALIGN (__o1->object_base, __o1->next_free,		      \
+                        __o1->alignment_mask);				      \
+       if (__o1->next_free - (char *) __o1->chunk			      \
+           > __o1->chunk_limit - (char *) __o1->chunk)			      \
+         __o1->next_free = __o1->chunk_limit;				      \
+       __o1->object_base = __o1->next_free;				      \
+       __value; })
+
+# define obstack_free(OBSTACK, OBJ)					      \
+  __extension__								      \
+    ({ struct obstack *__o = (OBSTACK);					      \
+       void *__obj = (OBJ);						      \
+       if (__obj > (void *) __o->chunk && __obj < (void *) __o->chunk_limit)  \
+         __o->next_free = __o->object_base = (char *) __obj;		      \
+       else (__obstack_free) (__o, __obj); })
+
 #else /* not __GNUC__ */
 
 # define obstack_object_size(h) \
- (unsigned) ((h)->next_free - (h)->object_base)
+  (unsigned) ((h)->next_free - (h)->object_base)
 
-# define obstack_room(h)                \
- (unsigned) ((h)->chunk_limit - (h)->next_free)
+# define obstack_room(h)						      \
+  (unsigned) ((h)->chunk_limit - (h)->next_free)
 
 # define obstack_empty_p(h) \
- ((h)->chunk->prev == 0                                                 \
-  && (h)->next_free == __PTR_ALIGN ((char *) (h)->chunk,                \
-                                    (h)->chunk->contents,               \
-                                    (h)->alignment_mask))
+  ((h)->chunk->prev == 0						      \
+   && (h)->next_free == __PTR_ALIGN ((char *) (h)->chunk,		      \
+                                     (h)->chunk->contents,		      \
+                                     (h)->alignment_mask))
 
 /* Note that the call to _obstack_newchunk is enclosed in (..., 0)
    so that we can avoid having void expressions
@@ -425,83 +428,83 @@ __extension__                                                           \
    Casting the third operand to void was tried before,
    but some compilers won't accept it.  */
 
-# define obstack_make_room(h,length)                                    \
-( (h)->temp.tempint = (length),                                         \
-  (((h)->next_free + (h)->temp.tempint > (h)->chunk_limit)              \
+# define obstack_make_room(h, length)					      \
+  ((h)->temp.tempint = (length),					      \
+   (((h)->next_free + (h)->temp.tempint > (h)->chunk_limit)		      \
    ? (_obstack_newchunk ((h), (h)->temp.tempint), 0) : 0))
 
-# define obstack_grow(h,where,length)                                   \
-( (h)->temp.tempint = (length),                                         \
-  (((h)->next_free + (h)->temp.tempint > (h)->chunk_limit)              \
-   ? (_obstack_newchunk ((h), (h)->temp.tempint), 0) : 0),              \
-  memcpy ((h)->next_free, where, (h)->temp.tempint),                    \
-  (h)->next_free += (h)->temp.tempint)
-
-# define obstack_grow0(h,where,length)                                  \
-( (h)->temp.tempint = (length),                                         \
-  (((h)->next_free + (h)->temp.tempint + 1 > (h)->chunk_limit)          \
-   ? (_obstack_newchunk ((h), (h)->temp.tempint + 1), 0) : 0),          \
-  memcpy ((h)->next_free, where, (h)->temp.tempint),                    \
-  (h)->next_free += (h)->temp.tempint,                                  \
-  *((h)->next_free)++ = 0)
-
-# define obstack_1grow(h,datum)                                         \
-( (((h)->next_free + 1 > (h)->chunk_limit)                              \
-   ? (_obstack_newchunk ((h), 1), 0) : 0),                              \
-  obstack_1grow_fast (h, datum))
-
-# define obstack_ptr_grow(h,datum)                                      \
-( (((h)->next_free + sizeof (char *) > (h)->chunk_limit)                \
-   ? (_obstack_newchunk ((h), sizeof (char *)), 0) : 0),                \
-  obstack_ptr_grow_fast (h, datum))
-
-# define obstack_int_grow(h,datum)                                      \
-( (((h)->next_free + sizeof (int) > (h)->chunk_limit)                   \
-   ? (_obstack_newchunk ((h), sizeof (int)), 0) : 0),                   \
-  obstack_int_grow_fast (h, datum))
-
-# define obstack_ptr_grow_fast(h,aptr)                                  \
+# define obstack_grow(h, where, length)					      \
+  ((h)->temp.tempint = (length),					      \
+   (((h)->next_free + (h)->temp.tempint > (h)->chunk_limit)		      \
+   ? (_obstack_newchunk ((h), (h)->temp.tempint), 0) : 0),		      \
+   memcpy ((h)->next_free, where, (h)->temp.tempint),			      \
+   (h)->next_free += (h)->temp.tempint)
+
+# define obstack_grow0(h, where, length)				      \
+  ((h)->temp.tempint = (length),					      \
+   (((h)->next_free + (h)->temp.tempint + 1 > (h)->chunk_limit)		      \
+   ? (_obstack_newchunk ((h), (h)->temp.tempint + 1), 0) : 0),		      \
+   memcpy ((h)->next_free, where, (h)->temp.tempint),			      \
+   (h)->next_free += (h)->temp.tempint,					      \
+   *((h)->next_free)++ = 0)
+
+# define obstack_1grow(h, datum)					      \
+  ((((h)->next_free + 1 > (h)->chunk_limit)				      \
+    ? (_obstack_newchunk ((h), 1), 0) : 0),				      \
+   obstack_1grow_fast (h, datum))
+
+# define obstack_ptr_grow(h, datum)					      \
+  ((((h)->next_free + sizeof (char *) > (h)->chunk_limit)		      \
+    ? (_obstack_newchunk ((h), sizeof (char *)), 0) : 0),		      \
+   obstack_ptr_grow_fast (h, datum))
+
+# define obstack_int_grow(h, datum)					      \
+  ((((h)->next_free + sizeof (int) > (h)->chunk_limit)			      \
+    ? (_obstack_newchunk ((h), sizeof (int)), 0) : 0),			      \
+   obstack_int_grow_fast (h, datum))
+
+# define obstack_ptr_grow_fast(h, aptr)					      \
   (((const void **) ((h)->next_free += sizeof (void *)))[-1] = (aptr))
 
-# define obstack_int_grow_fast(h,aint)                                  \
+# define obstack_int_grow_fast(h, aint)					      \
   (((int *) ((h)->next_free += sizeof (int)))[-1] = (aint))
 
-# define obstack_blank(h,length)                                        \
-( (h)->temp.tempint = (length),                                         \
-  (((h)->chunk_limit - (h)->next_free < (h)->temp.tempint)              \
-   ? (_obstack_newchunk ((h), (h)->temp.tempint), 0) : 0),              \
-  obstack_blank_fast (h, (h)->temp.tempint))
-
-# define obstack_alloc(h,length)                                        \
- (obstack_blank ((h), (length)), obstack_finish ((h)))
-
-# define obstack_copy(h,where,length)                                   \
- (obstack_grow ((h), (where), (length)), obstack_finish ((h)))
-
-# define obstack_copy0(h,where,length)                                  \
- (obstack_grow0 ((h), (where), (length)), obstack_finish ((h)))
-
-# define obstack_finish(h)                                              \
-( ((h)->next_free == (h)->object_base                                   \
-   ? (((h)->maybe_empty_object = 1), 0)                                 \
-   : 0),                                                                \
-  (h)->temp.tempptr = (h)->object_base,                                 \
-  (h)->next_free                                                        \
-    = __PTR_ALIGN ((h)->object_base, (h)->next_free,                    \
-                   (h)->alignment_mask),                                \
-  (((h)->next_free - (char *) (h)->chunk                                \
-    > (h)->chunk_limit - (char *) (h)->chunk)                           \
-   ? ((h)->next_free = (h)->chunk_limit) : 0),                          \
-  (h)->object_base = (h)->next_free,                                    \
-  (h)->temp.tempptr)
-
-# define obstack_free(h,obj)                                            \
-( (h)->temp.tempint = (char *) (obj) - (char *) (h)->chunk,             \
-  ((((h)->temp.tempint > 0                                              \
-    && (h)->temp.tempint < (h)->chunk_limit - (char *) (h)->chunk))     \
-   ? (int) ((h)->next_free = (h)->object_base                           \
-            = (h)->temp.tempint + (char *) (h)->chunk)                  \
-   : (((__obstack_free) ((h), (h)->temp.tempint + (char *) (h)->chunk), 0), 0)))
+# define obstack_blank(h, length)					      \
+  ((h)->temp.tempint = (length),					      \
+   (((h)->chunk_limit - (h)->next_free < (h)->temp.tempint)		      \
+   ? (_obstack_newchunk ((h), (h)->temp.tempint), 0) : 0),		      \
+   obstack_blank_fast (h, (h)->temp.tempint))
+
+# define obstack_alloc(h, length)					      \
+  (obstack_blank ((h), (length)), obstack_finish ((h)))
+
+# define obstack_copy(h, where, length)					      \
+  (obstack_grow ((h), (where), (length)), obstack_finish ((h)))
+
+# define obstack_copy0(h, where, length)				      \
+  (obstack_grow0 ((h), (where), (length)), obstack_finish ((h)))
+
+# define obstack_finish(h)						      \
+  (((h)->next_free == (h)->object_base					      \
+    ? (((h)->maybe_empty_object = 1), 0)				      \
+    : 0),								      \
+   (h)->temp.tempptr = (h)->object_base,				      \
+   (h)->next_free							      \
+     = __PTR_ALIGN ((h)->object_base, (h)->next_free,			      \
+                    (h)->alignment_mask),				      \
+   (((h)->next_free - (char *) (h)->chunk				      \
+     > (h)->chunk_limit - (char *) (h)->chunk)				      \
+   ? ((h)->next_free = (h)->chunk_limit) : 0),				      \
+   (h)->object_base = (h)->next_free,					      \
+   (h)->temp.tempptr)
+
+# define obstack_free(h, obj)						      \
+  ((h)->temp.tempint = (char *) (obj) - (char *) (h)->chunk,		      \
+   ((((h)->temp.tempint > 0						      \
+      && (h)->temp.tempint < (h)->chunk_limit - (char *) (h)->chunk))	      \
+    ? (void) ((h)->next_free = (h)->object_base				      \
+                          = (h)->temp.tempint + (char *) (h)->chunk)	      \
+    : (__obstack_free) (h, (h)->temp.tempint + (char *) (h)->chunk)))
 
 #endif /* not __GNUC__ */
 
diff --git a/lib/open-safer.c b/lib/open-safer.c
index badeffad..91d69230 100644
--- a/lib/open-safer.c
+++ b/lib/open-safer.c
@@ -1,6 +1,6 @@
 /* Invoke open, but avoid some glitches.
 
-   Copyright (C) 2005-2006, 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/open.c b/lib/open.c
index a0c43ead..d6f8e0df 100644
--- a/lib/open.c
+++ b/lib/open.c
@@ -1,5 +1,5 @@
 /* Open a descriptor to a file.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/openat-die.c b/lib/openat-die.c
index 4f18d51f..02f1fd7d 100644
--- a/lib/openat-die.c
+++ b/lib/openat-die.c
@@ -1,6 +1,6 @@
 /* Report a save- or restore-cwd failure in our openat replacement and then exit.
 
-   Copyright (C) 2005-2006, 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/openat-priv.h b/lib/openat-priv.h
index 829cf7d0..326c739e 100644
--- a/lib/openat-priv.h
+++ b/lib/openat-priv.h
@@ -1,6 +1,6 @@
 /* Internals for openat-like functions.
 
-   Copyright (C) 2005-2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/openat-proc.c b/lib/openat-proc.c
index d7a68e26..7b40bb8f 100644
--- a/lib/openat-proc.c
+++ b/lib/openat-proc.c
@@ -1,6 +1,6 @@
 /* Create /proc/self/fd-related names for subfiles of open directories.
 
-   Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -32,14 +32,6 @@
 
 #include "intprops.h"
 
-/* The results of open() in this file are not used with fchdir,
-   and we do not leak fds to any single-threaded code that could use stdio,
-   therefore save some unnecessary work in fchdir.c.
-   FIXME - if the kernel ever adds support for multi-thread safety for
-   avoiding standard fds, then we should use open_safer.  */
-#undef open
-#undef close
-
 #define PROC_SELF_FD_FORMAT "/proc/self/fd/%d/%s"
 
 #define PROC_SELF_FD_NAME_SIZE_BOUND(len) \
diff --git a/lib/openat-safer.c b/lib/openat-safer.c
index a95600ed..d0dc2d70 100644
--- a/lib/openat-safer.c
+++ b/lib/openat-safer.c
@@ -1,6 +1,6 @@
 /* Invoke openat, but avoid some glitches.
 
-   Copyright (C) 2005-2006, 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/openat.c b/lib/openat.c
index fd1ff911..9d2f7d49 100644
--- a/lib/openat.c
+++ b/lib/openat.c
@@ -1,5 +1,5 @@
 /* provide a replacement openat function
-   Copyright (C) 2004-2013 Free Software Foundation, Inc.
+   Copyright (C) 2004-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/openat.h b/lib/openat.h
index eb90990d..29e23a54 100644
--- a/lib/openat.h
+++ b/lib/openat.h
@@ -1,5 +1,5 @@
 /* provide a replacement openat function
-   Copyright (C) 2004-2006, 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2004-2006, 2008-2014 Free Software Foundation, Inc.
 
    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
@@ -26,6 +26,9 @@
 #include <unistd.h>
 #include <stdbool.h>
 
+#ifndef _GL_INLINE_HEADER_BEGIN
+ #error "Please include config.h first."
+#endif
 _GL_INLINE_HEADER_BEGIN
 
 #if !HAVE_OPENAT
diff --git a/lib/opendir-safer.c b/lib/opendir-safer.c
index 0052ce1d..e31da884 100644
--- a/lib/opendir-safer.c
+++ b/lib/opendir-safer.c
@@ -1,6 +1,6 @@
 /* Invoke opendir, but avoid some glitches.
 
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/opendir.c b/lib/opendir.c
index de0ea5a2..c67f2e5a 100644
--- a/lib/opendir.c
+++ b/lib/opendir.c
@@ -1,5 +1,5 @@
 /* Start reading the entries of a directory.
-   Copyright (C) 2006-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/parse-datetime.c b/lib/parse-datetime.c
index 5c21d0ba..009b204b 100644
--- a/lib/parse-datetime.c
+++ b/lib/parse-datetime.c
@@ -1,9 +1,8 @@
-/* A Bison parser, made by GNU Bison 2.4.3.  */
+/* A Bison parser, made by GNU Bison 2.7.  */
 
-/* Skeleton implementation for Bison's Yacc-like parsers in C
+/* Bison implementation for Yacc-like parsers in C
    
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2009, 2010 Free Software Foundation, Inc.
+      Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
    
    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
@@ -45,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.4.3"
+#define YYBISON_VERSION "2.7"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -59,19 +58,16 @@
 /* Pull parsers.  */
 #define YYPULL 1
 
-/* Using locations.  */
-#define YYLSP_NEEDED 0
 
 
 
 /* Copy the first part of user declarations.  */
-
-/* Line 189 of yacc.c  */
-#line 1 "parse-datetime.y"
+/* Line 371 of yacc.c  */
+#line 1 "./lib/parse-datetime.y"
 
 /* Parse a string into an internal time stamp.
 
-   Copyright (C) 1999-2000, 2002-2013 Free Software Foundation, Inc.
+   Copyright (C) 1999-2000, 2002-2014 Free Software Foundation, Inc.
 
    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
@@ -353,14 +349,16 @@ set_hhmmss (parser_control *pc, long int hour, long int minutes,
 }
 
 
+/* Line 371 of yacc.c  */
+#line 354 "parse-datetime.c"
 
-/* Line 189 of yacc.c  */
-#line 359 "parse-datetime.c"
-
-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
+# ifndef YY_NULL
+#  if defined __cplusplus && 201103L <= __cplusplus
+#   define YY_NULL nullptr
+#  else
+#   define YY_NULL 0
+#  endif
+# endif
 
 /* Enabling verbose error messages.  */
 #ifdef YYERROR_VERBOSE
@@ -370,11 +368,14 @@ set_hhmmss (parser_control *pc, long int hour, long int minutes,
 # define YYERROR_VERBOSE 0
 #endif
 
-/* Enabling the token table.  */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
-#endif
 
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG
+extern int yydebug;
+#endif
 
 /* Tokens.  */
 #ifndef YYTOKENTYPE
@@ -428,13 +429,11 @@ set_hhmmss (parser_control *pc, long int hour, long int minutes,
 
 
 
-
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {
-
-/* Line 214 of yacc.c  */
-#line 297 "parse-datetime.y"
+/* Line 387 of yacc.c  */
+#line 297 "./lib/parse-datetime.y"
 
   long int intval;
   textint textintval;
@@ -442,9 +441,8 @@ typedef union YYSTYPE
   relative_time rel;
 
 
-
-/* Line 214 of yacc.c  */
-#line 448 "parse-datetime.c"
+/* Line 387 of yacc.c  */
+#line 446 "parse-datetime.c"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -452,11 +450,26 @@ typedef union YYSTYPE
 #endif
 
 
-/* Copy the second part of user declarations.  */
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void *YYPARSE_PARAM);
+#else
+int yyparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int yyparse (parser_control *pc);
+#else
+int yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
+
+
 
+/* Copy the second part of user declarations.  */
 
-/* Line 264 of yacc.c  */
-#line 460 "parse-datetime.c"
+/* Line 390 of yacc.c  */
+#line 473 "parse-datetime.c"
 
 #ifdef short
 # undef short
@@ -509,24 +522,24 @@ typedef short int yytype_int16;
 # if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
 #  endif
 # endif
 # ifndef YY_
-#  define YY_(msgid) msgid
+#  define YY_(Msgid) Msgid
 # endif
 #endif
 
 /* Suppress unused-variable warnings by "using" E.  */
 #if ! defined lint || defined __GNUC__
-# define YYUSE(e) ((void) (e))
+# define YYUSE(E) ((void) (E))
 #else
-# define YYUSE(e) /* empty */
+# define YYUSE(E) /* empty */
 #endif
 
 /* Identity function, used to suppress warnings about constant conditions.  */
 #ifndef lint
-# define YYID(n) (n)
+# define YYID(N) (N)
 #else
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
@@ -559,11 +572,12 @@ YYID (yyi)
 #    define alloca _alloca
 #   else
 #    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#     ifndef _STDLIB_H
-#      define _STDLIB_H 1
+      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
+#     ifndef EXIT_SUCCESS
+#      define EXIT_SUCCESS 0
 #     endif
 #    endif
 #   endif
@@ -586,24 +600,24 @@ YYID (yyi)
 #  ifndef YYSTACK_ALLOC_MAXIMUM
 #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
 #  endif
-#  if (defined __cplusplus && ! defined _STDLIB_H \
+#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
        && ! ((defined YYMALLOC || defined malloc) \
 	     && (defined YYFREE || defined free)))
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   ifndef _STDLIB_H
-#    define _STDLIB_H 1
+#   ifndef EXIT_SUCCESS
+#    define EXIT_SUCCESS 0
 #   endif
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
-#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+#   if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 #  ifndef YYFREE
 #   define YYFREE free
-#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+#   if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
@@ -632,23 +646,7 @@ union yyalloc
      ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
       + YYSTACK_GAP_MAXIMUM)
 
-/* Copy COUNT objects from FROM to TO.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if defined __GNUC__ && 1 < __GNUC__
-#   define YYCOPY(To, From, Count) \
-      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-#  else
-#   define YYCOPY(To, From, Count)		\
-      do					\
-	{					\
-	  YYSIZE_T yyi;				\
-	  for (yyi = 0; yyi < (Count); yyi++)	\
-	    (To)[yyi] = (From)[yyi];		\
-	}					\
-      while (YYID (0))
-#  endif
-# endif
+# define YYCOPY_NEEDED 1
 
 /* Relocate STACK from its old location to the new one.  The
    local variables YYSIZE and YYSTACKSIZE give the old and new number of
@@ -668,6 +666,26 @@ union yyalloc
 
 #endif
 
+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
+/* Copy COUNT objects from SRC to DST.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(Dst, Src, Count) \
+      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
+#  else
+#   define YYCOPY(Dst, Src, Count)              \
+      do                                        \
+        {                                       \
+          YYSIZE_T yyi;                         \
+          for (yyi = 0; yyi < (Count); yyi++)   \
+            (Dst)[yyi] = (Src)[yyi];            \
+        }                                       \
+      while (YYID (0))
+#  endif
+# endif
+#endif /* !YYCOPY_NEEDED */
+
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  12
 /* YYLAST -- Last index in YYTABLE.  */
@@ -786,7 +804,7 @@ static const yytype_uint16 yyrline[] =
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+#if YYDEBUG || YYERROR_VERBOSE || 0
 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
    First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
 static const char *const yytname[] =
@@ -800,7 +818,7 @@ static const char *const yytname[] =
   "iso_8601_time", "o_zone_offset", "zone_offset", "local_zone", "zone",
   "day", "date", "iso_8601_date", "rel", "relunit", "relunit_snumber",
   "dayshift", "seconds", "signed_seconds", "unsigned_seconds", "number",
-  "hybrid", "o_colon_minutes", 0
+  "hybrid", "o_colon_minutes", YY_NULL
 };
 #endif
 
@@ -845,8 +863,8 @@ static const yytype_uint8 yyr2[] =
        0,     2
 };
 
-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
-   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
+/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
+   Performed when YYTABLE doesn't specify something else to do.  Zero
    means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
@@ -901,8 +919,7 @@ static const yytype_int8 yypgoto[] =
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If zero, do what YYDEFACT says.
-   If YYTABLE_NINF, syntax error.  */
+   number is the opposite.  If YYTABLE_NINF, syntax error.  */
 #define YYTABLE_NINF -1
 static const yytype_uint8 yytable[] =
 {
@@ -920,6 +937,12 @@ static const yytype_uint8 yytable[] =
      101,     0,    88
 };
 
+#define yypact_value_is_default(Yystate) \
+  (!!((Yystate) == (-93)))
+
+#define yytable_value_is_error(Yytable_value) \
+  YYID (0)
+
 static const yytype_int8 yycheck[] =
 {
       27,     5,     6,     7,     8,     9,    10,     4,    12,    15,
@@ -981,72 +1004,35 @@ static const yytype_uint8 yystos[] =
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
-#define YYBACKUP(Token, Value)					\
-do								\
-  if (yychar == YYEMPTY && yylen == 1)				\
-    {								\
-      yychar = (Token);						\
-      yylval = (Value);						\
-      yytoken = YYTRANSLATE (yychar);				\
-      YYPOPSTACK (1);						\
-      goto yybackup;						\
-    }								\
-  else								\
-    {								\
+#define YYBACKUP(Token, Value)                                  \
+do                                                              \
+  if (yychar == YYEMPTY)                                        \
+    {                                                           \
+      yychar = (Token);                                         \
+      yylval = (Value);                                         \
+      YYPOPSTACK (yylen);                                       \
+      yystate = *yyssp;                                         \
+      goto yybackup;                                            \
+    }                                                           \
+  else                                                          \
+    {                                                           \
       yyerror (pc, YY_("syntax error: cannot back up")); \
       YYERROR;							\
     }								\
 while (YYID (0))
 
-
+/* Error token number */
 #define YYTERROR	1
 #define YYERRCODE	256
 
 
-/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
-   If N is 0, then set CURRENT to the empty location which ends
-   the previous symbol: RHS[0] (always defined).  */
-
-#define YYRHSLOC(Rhs, K) ((Rhs)[K])
-#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)				\
-    do									\
-      if (YYID (N))                                                    \
-	{								\
-	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
-	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
-	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
-	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
-	}								\
-      else								\
-	{								\
-	  (Current).first_line   = (Current).last_line   =		\
-	    YYRHSLOC (Rhs, 0).last_line;				\
-	  (Current).first_column = (Current).last_column =		\
-	    YYRHSLOC (Rhs, 0).last_column;				\
-	}								\
-    while (YYID (0))
-#endif
-
-
-/* YY_LOCATION_PRINT -- Print the location on the stream.
-   This macro was not mandated originally: define only if we know
-   we won't break user code: when these are the locations we know.  */
-
+/* This macro is provided for backward compatibility. */
 #ifndef YY_LOCATION_PRINT
-# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
-#  define YY_LOCATION_PRINT(File, Loc)			\
-     fprintf (File, "%d.%d-%d.%d",			\
-	      (Loc).first_line, (Loc).first_column,	\
-	      (Loc).last_line,  (Loc).last_column)
-# else
-#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-# endif
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
 #endif
 
 
 /* YYLEX -- calling `yylex' with the right arguments.  */
-
 #ifdef YYLEX_PARAM
 # define YYLEX yylex (&yylval, YYLEX_PARAM)
 #else
@@ -1097,6 +1083,8 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, pc)
     parser_control *pc;
 #endif
 {
+  FILE *yyo = yyoutput;
+  YYUSE (yyo);
   if (!yyvaluep)
     return;
   YYUSE (pc);
@@ -1109,7 +1097,7 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, pc)
   switch (yytype)
     {
       default:
-	break;
+        break;
     }
 }
 
@@ -1237,7 +1225,6 @@ int yydebug;
 # define YYMAXDEPTH 10000
 #endif
 
-
 
 #if YYERROR_VERBOSE
 
@@ -1340,115 +1327,145 @@ yytnamerr (char *yyres, const char *yystr)
 }
 # endif
 
-/* Copy into YYRESULT an error message about the unexpected token
-   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
-   including the terminating null byte.  If YYRESULT is null, do not
-   copy anything; just return the number of bytes that would be
-   copied.  As a special case, return 0 if an ordinary "syntax error"
-   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
-   size calculation.  */
-static YYSIZE_T
-yysyntax_error (char *yyresult, int yystate, int yychar)
-{
-  int yyn = yypact[yystate];
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
+   about the unexpected token YYTOKEN for the state stack whose top is
+   YYSSP.
 
-  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
-    return 0;
-  else
+   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
+   not large enough to hold the message.  In that case, also set
+   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
+   required number of bytes is too large to store.  */
+static int
+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
+                yytype_int16 *yyssp, int yytoken)
+{
+  YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]);
+  YYSIZE_T yysize = yysize0;
+  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+  /* Internationalized format string. */
+  const char *yyformat = YY_NULL;
+  /* Arguments of yyformat. */
+  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+  /* Number of reported tokens (one for the "unexpected", one per
+     "expected"). */
+  int yycount = 0;
+
+  /* There are many possibilities here to consider:
+     - Assume YYFAIL is not used.  It's too flawed to consider.  See
+       <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
+       for details.  YYERROR is fine as it does not invoke this
+       function.
+     - If this state is a consistent state with a default action, then
+       the only way this function was invoked is if the default action
+       is an error action.  In that case, don't check for expected
+       tokens because there are none.
+     - The only way there can be no lookahead present (in yychar) is if
+       this state is a consistent state with a default action.  Thus,
+       detecting the absence of a lookahead is sufficient to determine
+       that there is no unexpected or expected token to report.  In that
+       case, just report a simple "syntax error".
+     - Don't assume there isn't a lookahead just because this state is a
+       consistent state with a default action.  There might have been a
+       previous inconsistent state, consistent state with a non-default
+       action, or user semantic action that manipulated yychar.
+     - Of course, the expected token list depends on states to have
+       correct lookahead information, and it depends on the parser not
+       to perform extra reductions after fetching a lookahead from the
+       scanner and before detecting a syntax error.  Thus, state merging
+       (from LALR or IELR) and default reductions corrupt the expected
+       token list.  However, the list is correct for canonical LR with
+       one exception: it will still contain any token that will not be
+       accepted due to an error action in a later state.
+  */
+  if (yytoken != YYEMPTY)
     {
-      int yytype = YYTRANSLATE (yychar);
-      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
-      YYSIZE_T yysize = yysize0;
-      YYSIZE_T yysize1;
-      int yysize_overflow = 0;
-      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-      int yyx;
-
-# if 0
-      /* This is so xgettext sees the translatable formats that are
-	 constructed on the fly.  */
-      YY_("syntax error, unexpected %s");
-      YY_("syntax error, unexpected %s, expecting %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
-# endif
-      char *yyfmt;
-      char const *yyf;
-      static char const yyunexpected[] = "syntax error, unexpected %s";
-      static char const yyexpecting[] = ", expecting %s";
-      static char const yyor[] = " or %s";
-      char yyformat[sizeof yyunexpected
-		    + sizeof yyexpecting - 1
-		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
-		       * (sizeof yyor - 1))];
-      char const *yyprefix = yyexpecting;
-
-      /* Start YYX at -YYN if negative to avoid negative indexes in
-	 YYCHECK.  */
-      int yyxbegin = yyn < 0 ? -yyn : 0;
-
-      /* Stay within bounds of both yycheck and yytname.  */
-      int yychecklim = YYLAST - yyn + 1;
-      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-      int yycount = 1;
-
-      yyarg[0] = yytname[yytype];
-      yyfmt = yystpcpy (yyformat, yyunexpected);
-
-      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-	  {
-	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-	      {
-		yycount = 1;
-		yysize = yysize0;
-		yyformat[sizeof yyunexpected - 1] = '\0';
-		break;
-	      }
-	    yyarg[yycount++] = yytname[yyx];
-	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
-	    yysize_overflow |= (yysize1 < yysize);
-	    yysize = yysize1;
-	    yyfmt = yystpcpy (yyfmt, yyprefix);
-	    yyprefix = yyor;
-	  }
+      int yyn = yypact[*yyssp];
+      yyarg[yycount++] = yytname[yytoken];
+      if (!yypact_value_is_default (yyn))
+        {
+          /* Start YYX at -YYN if negative to avoid negative indexes in
+             YYCHECK.  In other words, skip the first -YYN actions for
+             this state because they are default actions.  */
+          int yyxbegin = yyn < 0 ? -yyn : 0;
+          /* Stay within bounds of both yycheck and yytname.  */
+          int yychecklim = YYLAST - yyn + 1;
+          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+          int yyx;
+
+          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
+                && !yytable_value_is_error (yytable[yyx + yyn]))
+              {
+                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+                  {
+                    yycount = 1;
+                    yysize = yysize0;
+                    break;
+                  }
+                yyarg[yycount++] = yytname[yyx];
+                {
+                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]);
+                  if (! (yysize <= yysize1
+                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+                    return 2;
+                  yysize = yysize1;
+                }
+              }
+        }
+    }
 
-      yyf = YY_(yyformat);
-      yysize1 = yysize + yystrlen (yyf);
-      yysize_overflow |= (yysize1 < yysize);
-      yysize = yysize1;
+  switch (yycount)
+    {
+# define YYCASE_(N, S)                      \
+      case N:                               \
+        yyformat = S;                       \
+      break
+      YYCASE_(0, YY_("syntax error"));
+      YYCASE_(1, YY_("syntax error, unexpected %s"));
+      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+# undef YYCASE_
+    }
 
-      if (yysize_overflow)
-	return YYSIZE_MAXIMUM;
+  {
+    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
+    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+      return 2;
+    yysize = yysize1;
+  }
 
-      if (yyresult)
-	{
-	  /* Avoid sprintf, as that infringes on the user's name space.
-	     Don't have undefined behavior even if the translation
-	     produced a string with the wrong number of "%s"s.  */
-	  char *yyp = yyresult;
-	  int yyi = 0;
-	  while ((*yyp = *yyf) != '\0')
-	    {
-	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
-		{
-		  yyp += yytnamerr (yyp, yyarg[yyi++]);
-		  yyf += 2;
-		}
-	      else
-		{
-		  yyp++;
-		  yyf++;
-		}
-	    }
-	}
-      return yysize;
+  if (*yymsg_alloc < yysize)
+    {
+      *yymsg_alloc = 2 * yysize;
+      if (! (yysize <= *yymsg_alloc
+             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+      return 1;
     }
+
+  /* Avoid sprintf, as that infringes on the user's name space.
+     Don't have undefined behavior even if the translation
+     produced a string with the wrong number of "%s"s.  */
+  {
+    char *yyp = *yymsg;
+    int yyi = 0;
+    while ((*yyp = *yyformat) != '\0')
+      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
+        {
+          yyp += yytnamerr (yyp, yyarg[yyi++]);
+          yyformat += 2;
+        }
+      else
+        {
+          yyp++;
+          yyformat++;
+        }
+  }
+  return 0;
 }
 #endif /* YYERROR_VERBOSE */
-
 
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
@@ -1479,32 +1496,16 @@ yydestruct (yymsg, yytype, yyvaluep, pc)
     {
 
       default:
-	break;
+        break;
     }
 }
 
-/* Prevent warnings from -Wmissing-prototypes.  */
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void *YYPARSE_PARAM);
-#else
-int yyparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int yyparse (parser_control *pc);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
-
-
 
 
 
-/*-------------------------.
-| yyparse or yypush_parse.  |
-`-------------------------*/
+/*----------.
+| yyparse.  |
+`----------*/
 
 #ifdef YYPARSE_PARAM
 #if (defined __STDC__ || defined __C99__FUNC__ \
@@ -1531,8 +1532,31 @@ yyparse (pc)
 /* The lookahead symbol.  */
 int yychar;
 
+
+#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+    _Pragma ("GCC diagnostic push") \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
+    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
+    _Pragma ("GCC diagnostic pop")
+#else
+/* Default value used for initialization, for pacifying older GCCs
+   or non-GCC compilers.  */
+static YYSTYPE yyval_default;
+# define YY_INITIAL_VALUE(Value) = Value
+#endif
+#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
+#endif
+#ifndef YY_INITIAL_VALUE
+# define YY_INITIAL_VALUE(Value) /* Nothing. */
+#endif
+
 /* The semantic value of the lookahead symbol.  */
-YYSTYPE yylval;
+YYSTYPE yylval YY_INITIAL_VALUE(yyval_default);
 
     /* Number of syntax errors so far.  */
     int yynerrs;
@@ -1545,7 +1569,7 @@ YYSTYPE yylval;
        `yyss': related to states.
        `yyvs': related to semantic values.
 
-       Refer to the stacks thru separate pointers, to allow yyoverflow
+       Refer to the stacks through separate pointers, to allow yyoverflow
        to reallocate them elsewhere.  */
 
     /* The state stack.  */
@@ -1563,7 +1587,7 @@ YYSTYPE yylval;
   int yyn;
   int yyresult;
   /* Lookahead token as an internal (translated) token number.  */
-  int yytoken;
+  int yytoken = 0;
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
@@ -1581,9 +1605,8 @@ YYSTYPE yylval;
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
-  yytoken = 0;
-  yyss = yyssa;
-  yyvs = yyvsa;
+  yyssp = yyss = yyssa;
+  yyvsp = yyvs = yyvsa;
   yystacksize = YYINITDEPTH;
 
   YYDPRINTF ((stderr, "Starting parse\n"));
@@ -1592,14 +1615,6 @@ YYSTYPE yylval;
   yyerrstatus = 0;
   yynerrs = 0;
   yychar = YYEMPTY; /* Cause a token to be read.  */
-
-  /* Initialize stack pointers.
-     Waste one element of value and location stack
-     so that they stay on the same level as the state stack.
-     The wasted elements are never initialized.  */
-  yyssp = yyss;
-  yyvsp = yyvs;
-
   goto yysetstate;
 
 /*------------------------------------------------------------.
@@ -1691,7 +1706,7 @@ yybackup:
 
   /* First try to decide what to do without reference to lookahead token.  */
   yyn = yypact[yystate];
-  if (yyn == YYPACT_NINF)
+  if (yypact_value_is_default (yyn))
     goto yydefault;
 
   /* Not known => get a lookahead token if don't already have one.  */
@@ -1722,8 +1737,8 @@ yybackup:
   yyn = yytable[yyn];
   if (yyn <= 0)
     {
-      if (yyn == 0 || yyn == YYTABLE_NINF)
-	goto yyerrlab;
+      if (yytable_value_is_error (yyn))
+        goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
@@ -1740,7 +1755,9 @@ yybackup:
   yychar = YYEMPTY;
 
   yystate = yyn;
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
   goto yynewstate;
 
@@ -1777,9 +1794,8 @@ yyreduce:
   switch (yyn)
     {
         case 4:
-
-/* Line 1464 of yacc.c  */
-#line 330 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 330 "./lib/parse-datetime.y"
     {
         pc->seconds = (yyvsp[(2) - (2)].timespec);
         pc->timespec_seen = true;
@@ -1787,51 +1803,44 @@ yyreduce:
     break;
 
   case 7:
-
-/* Line 1464 of yacc.c  */
-#line 343 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 343 "./lib/parse-datetime.y"
     { pc->times_seen++; pc->dates_seen++; }
     break;
 
   case 8:
-
-/* Line 1464 of yacc.c  */
-#line 345 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 345 "./lib/parse-datetime.y"
     { pc->times_seen++; }
     break;
 
   case 9:
-
-/* Line 1464 of yacc.c  */
-#line 347 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 347 "./lib/parse-datetime.y"
     { pc->local_zones_seen++; }
     break;
 
   case 10:
-
-/* Line 1464 of yacc.c  */
-#line 349 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 349 "./lib/parse-datetime.y"
     { pc->zones_seen++; }
     break;
 
   case 11:
-
-/* Line 1464 of yacc.c  */
-#line 351 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 351 "./lib/parse-datetime.y"
     { pc->dates_seen++; }
     break;
 
   case 12:
-
-/* Line 1464 of yacc.c  */
-#line 353 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 353 "./lib/parse-datetime.y"
     { pc->days_seen++; }
     break;
 
   case 18:
-
-/* Line 1464 of yacc.c  */
-#line 369 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 369 "./lib/parse-datetime.y"
     {
         set_hhmmss (pc, (yyvsp[(1) - (2)].textintval).value, 0, 0, 0);
         pc->meridian = (yyvsp[(2) - (2)].intval);
@@ -1839,9 +1848,8 @@ yyreduce:
     break;
 
   case 19:
-
-/* Line 1464 of yacc.c  */
-#line 374 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 374 "./lib/parse-datetime.y"
     {
         set_hhmmss (pc, (yyvsp[(1) - (4)].textintval).value, (yyvsp[(3) - (4)].textintval).value, 0, 0);
         pc->meridian = (yyvsp[(4) - (4)].intval);
@@ -1849,9 +1857,8 @@ yyreduce:
     break;
 
   case 20:
-
-/* Line 1464 of yacc.c  */
-#line 379 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 379 "./lib/parse-datetime.y"
     {
         set_hhmmss (pc, (yyvsp[(1) - (6)].textintval).value, (yyvsp[(3) - (6)].textintval).value, (yyvsp[(5) - (6)].timespec).tv_sec, (yyvsp[(5) - (6)].timespec).tv_nsec);
         pc->meridian = (yyvsp[(6) - (6)].intval);
@@ -1859,9 +1866,8 @@ yyreduce:
     break;
 
   case 22:
-
-/* Line 1464 of yacc.c  */
-#line 388 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 388 "./lib/parse-datetime.y"
     {
         set_hhmmss (pc, (yyvsp[(1) - (2)].textintval).value, 0, 0, 0);
         pc->meridian = MER24;
@@ -1869,9 +1875,8 @@ yyreduce:
     break;
 
   case 23:
-
-/* Line 1464 of yacc.c  */
-#line 393 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 393 "./lib/parse-datetime.y"
     {
         set_hhmmss (pc, (yyvsp[(1) - (4)].textintval).value, (yyvsp[(3) - (4)].textintval).value, 0, 0);
         pc->meridian = MER24;
@@ -1879,9 +1884,8 @@ yyreduce:
     break;
 
   case 24:
-
-/* Line 1464 of yacc.c  */
-#line 398 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 398 "./lib/parse-datetime.y"
     {
         set_hhmmss (pc, (yyvsp[(1) - (6)].textintval).value, (yyvsp[(3) - (6)].textintval).value, (yyvsp[(5) - (6)].timespec).tv_sec, (yyvsp[(5) - (6)].timespec).tv_nsec);
         pc->meridian = MER24;
@@ -1889,9 +1893,8 @@ yyreduce:
     break;
 
   case 27:
-
-/* Line 1464 of yacc.c  */
-#line 411 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 411 "./lib/parse-datetime.y"
     {
         pc->zones_seen++;
         pc->time_zone = time_zone_hhmm (pc, (yyvsp[(1) - (2)].textintval), (yyvsp[(2) - (2)].intval));
@@ -1899,9 +1902,8 @@ yyreduce:
     break;
 
   case 28:
-
-/* Line 1464 of yacc.c  */
-#line 419 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 419 "./lib/parse-datetime.y"
     {
         pc->local_isdst = (yyvsp[(1) - (1)].intval);
         pc->dsts_seen += (0 < (yyvsp[(1) - (1)].intval));
@@ -1909,9 +1911,8 @@ yyreduce:
     break;
 
   case 29:
-
-/* Line 1464 of yacc.c  */
-#line 424 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 424 "./lib/parse-datetime.y"
     {
         pc->local_isdst = 1;
         pc->dsts_seen += (0 < (yyvsp[(1) - (2)].intval)) + 1;
@@ -1919,60 +1920,52 @@ yyreduce:
     break;
 
   case 30:
-
-/* Line 1464 of yacc.c  */
-#line 434 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 434 "./lib/parse-datetime.y"
     { pc->time_zone = (yyvsp[(1) - (1)].intval); }
     break;
 
   case 31:
-
-/* Line 1464 of yacc.c  */
-#line 436 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 436 "./lib/parse-datetime.y"
     { pc->time_zone = HOUR(7); }
     break;
 
   case 32:
-
-/* Line 1464 of yacc.c  */
-#line 438 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 438 "./lib/parse-datetime.y"
     { pc->time_zone = (yyvsp[(1) - (2)].intval);
         apply_relative_time (pc, (yyvsp[(2) - (2)].rel), 1); }
     break;
 
   case 33:
-
-/* Line 1464 of yacc.c  */
-#line 441 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 441 "./lib/parse-datetime.y"
     { pc->time_zone = HOUR(7);
         apply_relative_time (pc, (yyvsp[(2) - (2)].rel), 1); }
     break;
 
   case 34:
-
-/* Line 1464 of yacc.c  */
-#line 444 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 444 "./lib/parse-datetime.y"
     { pc->time_zone = (yyvsp[(1) - (3)].intval) + time_zone_hhmm (pc, (yyvsp[(2) - (3)].textintval), (yyvsp[(3) - (3)].intval)); }
     break;
 
   case 35:
-
-/* Line 1464 of yacc.c  */
-#line 446 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 446 "./lib/parse-datetime.y"
     { pc->time_zone = (yyvsp[(1) - (1)].intval) + 60; }
     break;
 
   case 36:
-
-/* Line 1464 of yacc.c  */
-#line 448 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 448 "./lib/parse-datetime.y"
     { pc->time_zone = (yyvsp[(1) - (2)].intval) + 60; }
     break;
 
   case 37:
-
-/* Line 1464 of yacc.c  */
-#line 453 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 453 "./lib/parse-datetime.y"
     {
         pc->day_ordinal = 0;
         pc->day_number = (yyvsp[(1) - (1)].intval);
@@ -1980,9 +1973,8 @@ yyreduce:
     break;
 
   case 38:
-
-/* Line 1464 of yacc.c  */
-#line 458 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 458 "./lib/parse-datetime.y"
     {
         pc->day_ordinal = 0;
         pc->day_number = (yyvsp[(1) - (2)].intval);
@@ -1990,9 +1982,8 @@ yyreduce:
     break;
 
   case 39:
-
-/* Line 1464 of yacc.c  */
-#line 463 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 463 "./lib/parse-datetime.y"
     {
         pc->day_ordinal = (yyvsp[(1) - (2)].intval);
         pc->day_number = (yyvsp[(2) - (2)].intval);
@@ -2000,9 +1991,8 @@ yyreduce:
     break;
 
   case 40:
-
-/* Line 1464 of yacc.c  */
-#line 468 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 468 "./lib/parse-datetime.y"
     {
         pc->day_ordinal = (yyvsp[(1) - (2)].textintval).value;
         pc->day_number = (yyvsp[(2) - (2)].intval);
@@ -2010,9 +2000,8 @@ yyreduce:
     break;
 
   case 41:
-
-/* Line 1464 of yacc.c  */
-#line 476 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 476 "./lib/parse-datetime.y"
     {
         pc->month = (yyvsp[(1) - (3)].textintval).value;
         pc->day = (yyvsp[(3) - (3)].textintval).value;
@@ -2020,9 +2009,8 @@ yyreduce:
     break;
 
   case 42:
-
-/* Line 1464 of yacc.c  */
-#line 481 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 481 "./lib/parse-datetime.y"
     {
         /* Interpret as YYYY/MM/DD if the first value has 4 or more digits,
            otherwise as MM/DD/YY.
@@ -2045,9 +2033,8 @@ yyreduce:
     break;
 
   case 43:
-
-/* Line 1464 of yacc.c  */
-#line 501 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 501 "./lib/parse-datetime.y"
     {
         /* e.g. 17-JUN-1992.  */
         pc->day = (yyvsp[(1) - (3)].textintval).value;
@@ -2058,9 +2045,8 @@ yyreduce:
     break;
 
   case 44:
-
-/* Line 1464 of yacc.c  */
-#line 509 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 509 "./lib/parse-datetime.y"
     {
         /* e.g. JUN-17-1992.  */
         pc->month = (yyvsp[(1) - (3)].intval);
@@ -2071,9 +2057,8 @@ yyreduce:
     break;
 
   case 45:
-
-/* Line 1464 of yacc.c  */
-#line 517 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 517 "./lib/parse-datetime.y"
     {
         pc->month = (yyvsp[(1) - (2)].intval);
         pc->day = (yyvsp[(2) - (2)].textintval).value;
@@ -2081,9 +2066,8 @@ yyreduce:
     break;
 
   case 46:
-
-/* Line 1464 of yacc.c  */
-#line 522 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 522 "./lib/parse-datetime.y"
     {
         pc->month = (yyvsp[(1) - (4)].intval);
         pc->day = (yyvsp[(2) - (4)].textintval).value;
@@ -2092,9 +2076,8 @@ yyreduce:
     break;
 
   case 47:
-
-/* Line 1464 of yacc.c  */
-#line 528 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 528 "./lib/parse-datetime.y"
     {
         pc->day = (yyvsp[(1) - (2)].textintval).value;
         pc->month = (yyvsp[(2) - (2)].intval);
@@ -2102,9 +2085,8 @@ yyreduce:
     break;
 
   case 48:
-
-/* Line 1464 of yacc.c  */
-#line 533 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 533 "./lib/parse-datetime.y"
     {
         pc->day = (yyvsp[(1) - (3)].textintval).value;
         pc->month = (yyvsp[(2) - (3)].intval);
@@ -2113,9 +2095,8 @@ yyreduce:
     break;
 
   case 50:
-
-/* Line 1464 of yacc.c  */
-#line 543 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 543 "./lib/parse-datetime.y"
     {
         /* ISO 8601 format.  YYYY-MM-DD.  */
         pc->year = (yyvsp[(1) - (3)].textintval);
@@ -2125,240 +2106,206 @@ yyreduce:
     break;
 
   case 51:
-
-/* Line 1464 of yacc.c  */
-#line 553 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 553 "./lib/parse-datetime.y"
     { apply_relative_time (pc, (yyvsp[(1) - (2)].rel), (yyvsp[(2) - (2)].intval)); }
     break;
 
   case 52:
-
-/* Line 1464 of yacc.c  */
-#line 555 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 555 "./lib/parse-datetime.y"
     { apply_relative_time (pc, (yyvsp[(1) - (1)].rel), 1); }
     break;
 
   case 53:
-
-/* Line 1464 of yacc.c  */
-#line 557 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 557 "./lib/parse-datetime.y"
     { apply_relative_time (pc, (yyvsp[(1) - (1)].rel), 1); }
     break;
 
   case 54:
-
-/* Line 1464 of yacc.c  */
-#line 562 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 562 "./lib/parse-datetime.y"
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = (yyvsp[(1) - (2)].intval); }
     break;
 
   case 55:
-
-/* Line 1464 of yacc.c  */
-#line 564 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 564 "./lib/parse-datetime.y"
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = (yyvsp[(1) - (2)].textintval).value; }
     break;
 
   case 56:
-
-/* Line 1464 of yacc.c  */
-#line 566 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 566 "./lib/parse-datetime.y"
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = 1; }
     break;
 
   case 57:
-
-/* Line 1464 of yacc.c  */
-#line 568 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 568 "./lib/parse-datetime.y"
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = (yyvsp[(1) - (2)].intval); }
     break;
 
   case 58:
-
-/* Line 1464 of yacc.c  */
-#line 570 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 570 "./lib/parse-datetime.y"
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = (yyvsp[(1) - (2)].textintval).value; }
     break;
 
   case 59:
-
-/* Line 1464 of yacc.c  */
-#line 572 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 572 "./lib/parse-datetime.y"
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = 1; }
     break;
 
   case 60:
-
-/* Line 1464 of yacc.c  */
-#line 574 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 574 "./lib/parse-datetime.y"
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[(1) - (2)].intval) * (yyvsp[(2) - (2)].intval); }
     break;
 
   case 61:
-
-/* Line 1464 of yacc.c  */
-#line 576 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 576 "./lib/parse-datetime.y"
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[(1) - (2)].textintval).value * (yyvsp[(2) - (2)].intval); }
     break;
 
   case 62:
-
-/* Line 1464 of yacc.c  */
-#line 578 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 578 "./lib/parse-datetime.y"
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[(1) - (1)].intval); }
     break;
 
   case 63:
-
-/* Line 1464 of yacc.c  */
-#line 580 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 580 "./lib/parse-datetime.y"
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = (yyvsp[(1) - (2)].intval); }
     break;
 
   case 64:
-
-/* Line 1464 of yacc.c  */
-#line 582 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 582 "./lib/parse-datetime.y"
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = (yyvsp[(1) - (2)].textintval).value; }
     break;
 
   case 65:
-
-/* Line 1464 of yacc.c  */
-#line 584 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 584 "./lib/parse-datetime.y"
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = 1; }
     break;
 
   case 66:
-
-/* Line 1464 of yacc.c  */
-#line 586 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 586 "./lib/parse-datetime.y"
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = (yyvsp[(1) - (2)].intval); }
     break;
 
   case 67:
-
-/* Line 1464 of yacc.c  */
-#line 588 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 588 "./lib/parse-datetime.y"
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = (yyvsp[(1) - (2)].textintval).value; }
     break;
 
   case 68:
-
-/* Line 1464 of yacc.c  */
-#line 590 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 590 "./lib/parse-datetime.y"
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = 1; }
     break;
 
   case 69:
-
-/* Line 1464 of yacc.c  */
-#line 592 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 592 "./lib/parse-datetime.y"
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[(1) - (2)].intval); }
     break;
 
   case 70:
-
-/* Line 1464 of yacc.c  */
-#line 594 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 594 "./lib/parse-datetime.y"
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[(1) - (2)].textintval).value; }
     break;
 
   case 71:
-
-/* Line 1464 of yacc.c  */
-#line 596 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 596 "./lib/parse-datetime.y"
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[(1) - (2)].timespec).tv_sec; (yyval.rel).ns = (yyvsp[(1) - (2)].timespec).tv_nsec; }
     break;
 
   case 72:
-
-/* Line 1464 of yacc.c  */
-#line 598 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 598 "./lib/parse-datetime.y"
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[(1) - (2)].timespec).tv_sec; (yyval.rel).ns = (yyvsp[(1) - (2)].timespec).tv_nsec; }
     break;
 
   case 73:
-
-/* Line 1464 of yacc.c  */
-#line 600 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 600 "./lib/parse-datetime.y"
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = 1; }
     break;
 
   case 75:
-
-/* Line 1464 of yacc.c  */
-#line 606 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 606 "./lib/parse-datetime.y"
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = (yyvsp[(1) - (2)].textintval).value; }
     break;
 
   case 76:
-
-/* Line 1464 of yacc.c  */
-#line 608 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 608 "./lib/parse-datetime.y"
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = (yyvsp[(1) - (2)].textintval).value; }
     break;
 
   case 77:
-
-/* Line 1464 of yacc.c  */
-#line 610 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 610 "./lib/parse-datetime.y"
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[(1) - (2)].textintval).value * (yyvsp[(2) - (2)].intval); }
     break;
 
   case 78:
-
-/* Line 1464 of yacc.c  */
-#line 612 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 612 "./lib/parse-datetime.y"
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = (yyvsp[(1) - (2)].textintval).value; }
     break;
 
   case 79:
-
-/* Line 1464 of yacc.c  */
-#line 614 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 614 "./lib/parse-datetime.y"
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = (yyvsp[(1) - (2)].textintval).value; }
     break;
 
   case 80:
-
-/* Line 1464 of yacc.c  */
-#line 616 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 616 "./lib/parse-datetime.y"
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[(1) - (2)].textintval).value; }
     break;
 
   case 81:
-
-/* Line 1464 of yacc.c  */
-#line 621 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 621 "./lib/parse-datetime.y"
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[(1) - (1)].intval); }
     break;
 
   case 85:
-
-/* Line 1464 of yacc.c  */
-#line 629 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 629 "./lib/parse-datetime.y"
     { (yyval.timespec).tv_sec = (yyvsp[(1) - (1)].textintval).value; (yyval.timespec).tv_nsec = 0; }
     break;
 
   case 87:
-
-/* Line 1464 of yacc.c  */
-#line 635 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 635 "./lib/parse-datetime.y"
     { (yyval.timespec).tv_sec = (yyvsp[(1) - (1)].textintval).value; (yyval.timespec).tv_nsec = 0; }
     break;
 
   case 88:
-
-/* Line 1464 of yacc.c  */
-#line 640 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 640 "./lib/parse-datetime.y"
     { digits_to_date_time (pc, (yyvsp[(1) - (1)].textintval)); }
     break;
 
   case 89:
-
-/* Line 1464 of yacc.c  */
-#line 645 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 645 "./lib/parse-datetime.y"
     {
         /* Hybrid all-digit and relative offset, so that we accept e.g.,
            "YYYYMMDD +N days" as well as "YYYYMMDD N days".  */
@@ -2368,25 +2315,33 @@ yyreduce:
     break;
 
   case 90:
-
-/* Line 1464 of yacc.c  */
-#line 655 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 655 "./lib/parse-datetime.y"
     { (yyval.intval) = -1; }
     break;
 
   case 91:
-
-/* Line 1464 of yacc.c  */
-#line 657 "parse-datetime.y"
+/* Line 1792 of yacc.c  */
+#line 657 "./lib/parse-datetime.y"
     { (yyval.intval) = (yyvsp[(2) - (2)].textintval).value; }
     break;
 
 
-
-/* Line 1464 of yacc.c  */
-#line 2388 "parse-datetime.c"
+/* Line 1792 of yacc.c  */
+#line 2332 "parse-datetime.c"
       default: break;
     }
+  /* User semantic actions sometimes alter yychar, and that requires
+     that yytoken be updated with the new translation.  We take the
+     approach of translating immediately before every use of yytoken.
+     One alternative is translating here after every semantic action,
+     but that translation would be missed if the semantic action invokes
+     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
+     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
+     incorrect destructor might then be invoked immediately.  In the
+     case of YYERROR or YYBACKUP, subsequent parser actions might lead
+     to an incorrect destructor call or verbose syntax error message
+     before the lookahead is translated.  */
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
 
   YYPOPSTACK (yylen);
@@ -2414,6 +2369,10 @@ yyreduce:
 | yyerrlab -- here on detecting error |
 `------------------------------------*/
 yyerrlab:
+  /* Make sure we have latest lookahead translation.  See comments at
+     user semantic actions for why this is necessary.  */
+  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
+
   /* If not already recovering from an error, report this error.  */
   if (!yyerrstatus)
     {
@@ -2421,37 +2380,36 @@ yyerrlab:
 #if ! YYERROR_VERBOSE
       yyerror (pc, YY_("syntax error"));
 #else
+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
+                                        yyssp, yytoken)
       {
-	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
-	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
-	  {
-	    YYSIZE_T yyalloc = 2 * yysize;
-	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
-	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
-	    if (yymsg != yymsgbuf)
-	      YYSTACK_FREE (yymsg);
-	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
-	    if (yymsg)
-	      yymsg_alloc = yyalloc;
-	    else
-	      {
-		yymsg = yymsgbuf;
-		yymsg_alloc = sizeof yymsgbuf;
-	      }
-	  }
-
-	if (0 < yysize && yysize <= yymsg_alloc)
-	  {
-	    (void) yysyntax_error (yymsg, yystate, yychar);
-	    yyerror (pc, yymsg);
-	  }
-	else
-	  {
-	    yyerror (pc, YY_("syntax error"));
-	    if (yysize != 0)
-	      goto yyexhaustedlab;
-	  }
+        char const *yymsgp = YY_("syntax error");
+        int yysyntax_error_status;
+        yysyntax_error_status = YYSYNTAX_ERROR;
+        if (yysyntax_error_status == 0)
+          yymsgp = yymsg;
+        else if (yysyntax_error_status == 1)
+          {
+            if (yymsg != yymsgbuf)
+              YYSTACK_FREE (yymsg);
+            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
+            if (!yymsg)
+              {
+                yymsg = yymsgbuf;
+                yymsg_alloc = sizeof yymsgbuf;
+                yysyntax_error_status = 2;
+              }
+            else
+              {
+                yysyntax_error_status = YYSYNTAX_ERROR;
+                yymsgp = yymsg;
+              }
+          }
+        yyerror (pc, yymsgp);
+        if (yysyntax_error_status == 2)
+          goto yyexhaustedlab;
       }
+# undef YYSYNTAX_ERROR
 #endif
     }
 
@@ -2510,7 +2468,7 @@ yyerrlab1:
   for (;;)
     {
       yyn = yypact[yystate];
-      if (yyn != YYPACT_NINF)
+      if (!yypact_value_is_default (yyn))
 	{
 	  yyn += YYTERROR;
 	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
@@ -2533,7 +2491,9 @@ yyerrlab1:
       YY_STACK_PRINT (yyss, yyssp);
     }
 
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
 
   /* Shift the error token.  */
@@ -2557,7 +2517,7 @@ yyabortlab:
   yyresult = 1;
   goto yyreturn;
 
-#if !defined(yyoverflow) || YYERROR_VERBOSE
+#if !defined yyoverflow || YYERROR_VERBOSE
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
@@ -2569,8 +2529,13 @@ yyexhaustedlab:
 
 yyreturn:
   if (yychar != YYEMPTY)
-     yydestruct ("Cleanup: discarding lookahead",
-		 yytoken, &yylval, pc);
+    {
+      /* Make sure we have latest lookahead translation.  See comments at
+         user semantic actions for why this is necessary.  */
+      yytoken = YYTRANSLATE (yychar);
+      yydestruct ("Cleanup: discarding lookahead",
+                  yytoken, &yylval, pc);
+    }
   /* Do not reclaim the symbols of the rule which action triggered
      this YYABORT or YYACCEPT.  */
   YYPOPSTACK (yylen);
@@ -2594,9 +2559,8 @@ yyreturn:
 }
 
 
-
-/* Line 1684 of yacc.c  */
-#line 660 "parse-datetime.y"
+/* Line 2055 of yacc.c  */
+#line 660 "./lib/parse-datetime.y"
 
 
 static table const meridian_table[] =
@@ -3243,8 +3207,6 @@ parse_datetime (struct timespec *result, char const *p,
             char tz1buf[TZBUFSIZE];
             bool large_tz = TZBUFSIZE < tzsize;
             bool setenv_ok;
-            /* Free tz0, in case this is the 2nd or subsequent time through. */
-            free (tz0);
             tz0 = get_tz (tz0buf);
             z = tz1 = large_tz ? xmalloc (tzsize) : tz1buf;
             for (s = tzbase; *s != '"'; s++)
@@ -3256,7 +3218,12 @@ parse_datetime (struct timespec *result, char const *p,
             if (!setenv_ok)
               goto fail;
             tz_was_altered = true;
+
             p = s + 1;
+            while (c = *p, c_isspace (c))
+              p++;
+
+            break;
           }
     }
 
@@ -3412,7 +3379,7 @@ parse_datetime (struct timespec *result, char const *p,
                           + sizeof pc.time_zone * CHAR_BIT / 3];
               if (!tz_was_altered)
                 tz0 = get_tz (tz0buf);
-              sprintf (tz1buf, "XXX%s%ld:%02d", "-" + (time_zone < 0),
+              sprintf (tz1buf, "XXX%s%ld:%02d", &"-"[time_zone < 0],
                        abs_time_zone_hour, abs_time_zone_min);
               if (setenv ("TZ", tz1buf, 1) != 0)
                 goto fail;
@@ -3561,4 +3528,3 @@ main (int ac, char **av)
   return 0;
 }
 #endif /* TEST */
-
diff --git a/lib/parse-datetime.h b/lib/parse-datetime.h
index 80e35919..9c9bb93f 100644
--- a/lib/parse-datetime.h
+++ b/lib/parse-datetime.h
@@ -1,6 +1,6 @@
 /* Parse a string into an internal time stamp.
 
-   Copyright (C) 1995, 1997-1998, 2003-2004, 2007, 2009-2013 Free Software
+   Copyright (C) 1995, 1997-1998, 2003-2004, 2007, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/parse-datetime.y b/lib/parse-datetime.y
index 77d95b70..0ba0a525 100644
--- a/lib/parse-datetime.y
+++ b/lib/parse-datetime.y
@@ -1,7 +1,7 @@
 %{
 /* Parse a string into an internal time stamp.
 
-   Copyright (C) 1999-2000, 2002-2013 Free Software Foundation, Inc.
+   Copyright (C) 1999-2000, 2002-2014 Free Software Foundation, Inc.
 
    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
@@ -1303,8 +1303,6 @@ parse_datetime (struct timespec *result, char const *p,
             char tz1buf[TZBUFSIZE];
             bool large_tz = TZBUFSIZE < tzsize;
             bool setenv_ok;
-            /* Free tz0, in case this is the 2nd or subsequent time through. */
-            free (tz0);
             tz0 = get_tz (tz0buf);
             z = tz1 = large_tz ? xmalloc (tzsize) : tz1buf;
             for (s = tzbase; *s != '"'; s++)
@@ -1316,7 +1314,12 @@ parse_datetime (struct timespec *result, char const *p,
             if (!setenv_ok)
               goto fail;
             tz_was_altered = true;
+
             p = s + 1;
+            while (c = *p, c_isspace (c))
+              p++;
+
+            break;
           }
     }
 
@@ -1472,7 +1475,7 @@ parse_datetime (struct timespec *result, char const *p,
                           + sizeof pc.time_zone * CHAR_BIT / 3];
               if (!tz_was_altered)
                 tz0 = get_tz (tz0buf);
-              sprintf (tz1buf, "XXX%s%ld:%02d", "-" + (time_zone < 0),
+              sprintf (tz1buf, "XXX%s%ld:%02d", &"-"[time_zone < 0],
                        abs_time_zone_hour, abs_time_zone_min);
               if (setenv ("TZ", tz1buf, 1) != 0)
                 goto fail;
diff --git a/lib/pathmax.h b/lib/pathmax.h
index a9ddc33d..33fc3553 100644
--- a/lib/pathmax.h
+++ b/lib/pathmax.h
@@ -1,5 +1,5 @@
 /* Define PATH_MAX somehow.  Requires sys/types.h.
-   Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2013 Free Software
+   Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib/physmem.c b/lib/physmem.c
index 26299361..d0989aa8 100644
--- a/lib/physmem.c
+++ b/lib/physmem.c
@@ -1,6 +1,6 @@
 /* Calculate the size of physical memory.
 
-   Copyright (C) 2000-2001, 2003, 2005-2006, 2009-2013 Free Software
+   Copyright (C) 2000-2001, 2003, 2005-2006, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -32,8 +32,11 @@
 # include <sys/sysmp.h>
 #endif
 
-#if HAVE_SYS_SYSINFO_H && HAVE_MACHINE_HAL_SYSINFO_H
+#if HAVE_SYS_SYSINFO_H
 # include <sys/sysinfo.h>
+#endif
+
+#if HAVE_MACHINE_HAL_SYSINFO_H
 # include <machine/hal_sysinfo.h>
 #endif
 
@@ -90,6 +93,14 @@ physmem_total (void)
   }
 #endif
 
+#if HAVE_SYSINFO && HAVE_STRUCT_SYSINFO_MEM_UNIT
+  { /* This works on linux.  */
+    struct sysinfo si;
+    if (sysinfo(&si) == 0)
+      return (double) si.totalram * si.mem_unit;
+  }
+#endif
+
 #if HAVE_PSTAT_GETSTATIC
   { /* This works on hpux11.  */
     struct pst_static pss;
@@ -194,6 +205,14 @@ physmem_available (void)
   }
 #endif
 
+#if HAVE_SYSINFO && HAVE_STRUCT_SYSINFO_MEM_UNIT
+  { /* This works on linux.  */
+    struct sysinfo si;
+    if (sysinfo(&si) == 0)
+      return ((double) si.freeram + si.bufferram) * si.mem_unit;
+  }
+#endif
+
 #if HAVE_PSTAT_GETSTATIC && HAVE_PSTAT_GETDYNAMIC
   { /* This works on hpux11.  */
     struct pst_static pss;
diff --git a/lib/physmem.h b/lib/physmem.h
index 1b2706dd..ab67e0ca 100644
--- a/lib/physmem.h
+++ b/lib/physmem.h
@@ -1,6 +1,6 @@
 /* Calculate the size of physical memory.
 
-   Copyright (C) 2000, 2003, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2003, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/pipe-safer.c b/lib/pipe-safer.c
index f2e0ad6f..70fb40f8 100644
--- a/lib/pipe-safer.c
+++ b/lib/pipe-safer.c
@@ -1,5 +1,5 @@
 /* Invoke pipe, but avoid some glitches.
-   Copyright (C) 2005-2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/gnulib-tests/pipe.c b/lib/pipe.c
index a67cd3fd..4db9041c 100644
--- a/gnulib-tests/pipe.c
+++ b/lib/pipe.c
@@ -1,5 +1,5 @@
 /* Create a pipe.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/pipe.h b/lib/pipe.h
deleted file mode 100644
index 3c1b4b8f..00000000
--- a/lib/pipe.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Obsolete; consider using spawn-pipe.h instead.  */
-#include "spawn-pipe.h"
diff --git a/lib/pipe2-safer.c b/lib/pipe2-safer.c
deleted file mode 100644
index e831d0c6..00000000
--- a/lib/pipe2-safer.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Invoke pipe2, but avoid some glitches.
-   Copyright (C) 2005-2006, 2009-2013 Free Software Foundation, Inc.
-
-   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 3 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/>.  */
-
-/* Written by Eric Blake.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include "unistd-safer.h"
-
-#include <unistd.h>
-#include <errno.h>
-
-/* Like pipe2, but ensure that neither of the file descriptors is
-   STDIN_FILENO, STDOUT_FILENO, or STDERR_FILENO.  */
-
-int
-pipe2_safer (int fd[2], int flags)
-{
-  /* This is a generalization of the pipe_safer implementation.  */
-  if (pipe2 (fd, flags) == 0)
-    {
-      int i;
-      for (i = 0; i < 2; i++)
-        {
-          fd[i] = fd_safer_flag (fd[i], flags);
-          if (fd[i] < 0)
-            {
-              int e = errno;
-              close (fd[1 - i]);
-              errno = e;
-              return -1;
-            }
-        }
-
-      return 0;
-    }
-  return -1;
-}
diff --git a/lib/pipe2.c b/lib/pipe2.c
deleted file mode 100644
index 5925cf9e..00000000
--- a/lib/pipe2.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/* Create a pipe, with specific opening flags.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
-
-   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 3, 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/>.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include <unistd.h>
-
-#include <errno.h>
-#include <fcntl.h>
-
-#include "binary-io.h"
-#include "verify.h"
-
-#if GNULIB_defined_O_NONBLOCK
-# include "nonblocking.h"
-#endif
-
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Native Windows API.  */
-
-# include <io.h>
-
-#endif
-
-int
-pipe2 (int fd[2], int flags)
-{
-  /* Mingw _pipe() corrupts fd on failure; also, if we succeed at
-     creating the pipe but later fail at changing fcntl, we want
-     to leave fd unchanged: http://austingroupbugs.net/view.php?id=467  */
-  int tmp[2];
-  tmp[0] = fd[0];
-  tmp[1] = fd[1];
-
-#if HAVE_PIPE2
-# undef pipe2
-  /* Try the system call first, if it exists.  (We may be running with a glibc
-     that has the function but with an older kernel that lacks it.)  */
-  {
-    /* Cache the information whether the system call really exists.  */
-    static int have_pipe2_really; /* 0 = unknown, 1 = yes, -1 = no */
-    if (have_pipe2_really >= 0)
-      {
-        int result = pipe2 (fd, flags);
-        if (!(result < 0 && errno == ENOSYS))
-          {
-            have_pipe2_really = 1;
-            return result;
-          }
-        have_pipe2_really = -1;
-      }
-  }
-#endif
-
-  /* Check the supported flags.  */
-  if ((flags & ~(O_CLOEXEC | O_NONBLOCK | O_BINARY | O_TEXT)) != 0)
-    {
-      errno = EINVAL;
-      return -1;
-    }
-
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Native Windows API.  */
-
-  if (_pipe (fd, 4096, flags & ~O_NONBLOCK) < 0)
-    {
-      fd[0] = tmp[0];
-      fd[1] = tmp[1];
-      return -1;
-    }
-
-  /* O_NONBLOCK handling.
-     On native Windows platforms, O_NONBLOCK is defined by gnulib.  Use the
-     functions defined by the gnulib module 'nonblocking'.  */
-# if GNULIB_defined_O_NONBLOCK
-  if (flags & O_NONBLOCK)
-    {
-      if (set_nonblocking_flag (fd[0], true) != 0
-          || set_nonblocking_flag (fd[1], true) != 0)
-        goto fail;
-    }
-# else
-  {
-    verify (O_NONBLOCK == 0);
-  }
-# endif
-
-  return 0;
-
-#else
-/* Unix API.  */
-
-  if (pipe (fd) < 0)
-    return -1;
-
-  /* POSIX <http://www.opengroup.org/onlinepubs/9699919799/functions/pipe.html>
-     says that initially, the O_NONBLOCK and FD_CLOEXEC flags are cleared on
-     both fd[0] and fd[1].  */
-
-  /* O_NONBLOCK handling.
-     On Unix platforms, O_NONBLOCK is defined by the system.  Use fcntl().  */
-  if (flags & O_NONBLOCK)
-    {
-      int fcntl_flags;
-
-      if ((fcntl_flags = fcntl (fd[1], F_GETFL, 0)) < 0
-          || fcntl (fd[1], F_SETFL, fcntl_flags | O_NONBLOCK) == -1
-          || (fcntl_flags = fcntl (fd[0], F_GETFL, 0)) < 0
-          || fcntl (fd[0], F_SETFL, fcntl_flags | O_NONBLOCK) == -1)
-        goto fail;
-    }
-
-  if (flags & O_CLOEXEC)
-    {
-      int fcntl_flags;
-
-      if ((fcntl_flags = fcntl (fd[1], F_GETFD, 0)) < 0
-          || fcntl (fd[1], F_SETFD, fcntl_flags | FD_CLOEXEC) == -1
-          || (fcntl_flags = fcntl (fd[0], F_GETFD, 0)) < 0
-          || fcntl (fd[0], F_SETFD, fcntl_flags | FD_CLOEXEC) == -1)
-        goto fail;
-    }
-
-# if O_BINARY
-  if (flags & O_BINARY)
-    {
-      setmode (fd[1], O_BINARY);
-      setmode (fd[0], O_BINARY);
-    }
-  else if (flags & O_TEXT)
-    {
-      setmode (fd[1], O_TEXT);
-      setmode (fd[0], O_TEXT);
-    }
-# endif
-
-  return 0;
-
-#endif
-
-#if GNULIB_defined_O_NONBLOCK || \
-  !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
- fail:
-  {
-    int saved_errno = errno;
-    close (fd[0]);
-    close (fd[1]);
-    fd[0] = tmp[0];
-    fd[1] = tmp[1];
-    errno = saved_errno;
-    return -1;
-  }
-#endif
-}
diff --git a/lib/posixtm.c b/lib/posixtm.c
index 31b5563a..2fe81ab6 100644
--- a/lib/posixtm.c
+++ b/lib/posixtm.c
@@ -1,6 +1,6 @@
 /* Parse dates for touch and date.
 
-   Copyright (C) 1989-1991, 1998, 2000-2013 Free Software Foundation, Inc.
+   Copyright (C) 1989-1991, 1998, 2000-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/posixtm.h b/lib/posixtm.h
index 8a4383bb..56680ec4 100644
--- a/lib/posixtm.h
+++ b/lib/posixtm.h
@@ -1,6 +1,6 @@
 /* Parse dates for touch and date.
 
-   Copyright (C) 1998, 2003, 2005, 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2003, 2005, 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/posixver.c b/lib/posixver.c
index f3193e07..a3bff114 100644
--- a/lib/posixver.c
+++ b/lib/posixver.c
@@ -1,6 +1,6 @@
 /* Which POSIX version to conform to, for utilities.
 
-   Copyright (C) 2002-2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/printf-args.c b/lib/printf-args.c
index c27e6bc6..39cd0a4f 100644
--- a/lib/printf-args.c
+++ b/lib/printf-args.c
@@ -1,5 +1,5 @@
 /* Decomposed printf argument list.
-   Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2013 Free Software
+   Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib/printf-args.h b/lib/printf-args.h
index 2a9c2a3f..9364eed5 100644
--- a/lib/printf-args.h
+++ b/lib/printf-args.h
@@ -1,5 +1,5 @@
 /* Decomposed printf argument list.
-   Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2013 Free Software
+   Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2014 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib/printf-frexp.c b/lib/printf-frexp.c
index 1a7b0c43..39ec0938 100644
--- a/lib/printf-frexp.c
+++ b/lib/printf-frexp.c
@@ -1,5 +1,5 @@
 /* Split a double into fraction and mantissa, for hexadecimal printf.
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/printf-frexp.h b/lib/printf-frexp.h
index 3976b736..2c46eca2 100644
--- a/lib/printf-frexp.h
+++ b/lib/printf-frexp.h
@@ -1,5 +1,5 @@
 /* Split a double into fraction and mantissa, for hexadecimal printf.
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/printf-frexpl.c b/lib/printf-frexpl.c
index 26987a7b..00e7a67d 100644
--- a/lib/printf-frexpl.c
+++ b/lib/printf-frexpl.c
@@ -1,5 +1,5 @@
 /* Split a 'long double' into fraction and mantissa, for hexadecimal printf.
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/printf-frexpl.h b/lib/printf-frexpl.h
index 3768b091..29825e86 100644
--- a/lib/printf-frexpl.h
+++ b/lib/printf-frexpl.h
@@ -1,5 +1,5 @@
 /* Split a 'long double' into fraction and mantissa, for hexadecimal printf.
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/printf-parse.c b/lib/printf-parse.c
index 23cacc1d..131d0f00 100644
--- a/lib/printf-parse.c
+++ b/lib/printf-parse.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999-2000, 2002-2003, 2006-2013 Free Software Foundation, Inc.
+   Copyright (C) 1999-2000, 2002-2003, 2006-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/printf-parse.h b/lib/printf-parse.h
index d8474bee..2651195f 100644
--- a/lib/printf-parse.h
+++ b/lib/printf-parse.h
@@ -1,5 +1,5 @@
 /* Parse printf format string.
-   Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2013 Free Software
+   Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2014 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib/priv-set.c b/lib/priv-set.c
index ad78b92d..08843606 100644
--- a/lib/priv-set.c
+++ b/lib/priv-set.c
@@ -1,6 +1,6 @@
 /* Query, remove, or restore a Solaris privilege.
 
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/priv-set.h b/lib/priv-set.h
index 6f62cce0..ff5877c1 100644
--- a/lib/priv-set.h
+++ b/lib/priv-set.h
@@ -1,6 +1,6 @@
 /* Query, remove, or restore a Solaris privilege.
 
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -17,6 +17,9 @@
 
    Written by David Bartley.  */
 
+#ifndef _GL_INLINE_HEADER_BEGIN
+ #error "Please include config.h first."
+#endif
 _GL_INLINE_HEADER_BEGIN
 #ifndef PRIV_SET_INLINE
 # define PRIV_SET_INLINE _GL_INLINE
diff --git a/lib/progname.c b/lib/progname.c
index 0c195e52..2919be99 100644
--- a/lib/progname.c
+++ b/lib/progname.c
@@ -1,5 +1,5 @@
 /* Program name management.
-   Copyright (C) 2001-2003, 2005-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/progname.h b/lib/progname.h
index b4f3c277..fa15871d 100644
--- a/lib/progname.h
+++ b/lib/progname.h
@@ -1,5 +1,5 @@
 /* Program name management.
-   Copyright (C) 2001-2004, 2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006, 2009-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/propername.c b/lib/propername.c
index 8cc83080..54a6adaf 100644
--- a/lib/propername.c
+++ b/lib/propername.c
@@ -1,5 +1,5 @@
 /* Localization of proper names.
-   Copyright (C) 2006-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/propername.h b/lib/propername.h
index 59dfade4..7e3de0fc 100644
--- a/lib/propername.h
+++ b/lib/propername.h
@@ -1,5 +1,5 @@
 /* Localization of proper names.
-   Copyright (C) 2006, 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2008-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/pthread.in.h b/lib/pthread.in.h
index aea5e60f..9d263953 100644
--- a/lib/pthread.in.h
+++ b/lib/pthread.in.h
@@ -1,6 +1,6 @@
 /* Implement a trivial subset of POSIX 1003.1-2008 pthread.h.
 
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -36,11 +36,23 @@
 #include <stdlib.h>
 #undef __need_system_stdlib_h
 
+
+/* The pthreads-win32 <pthread.h> defines a couple of broken macros.  */
+#undef asctime_r
+#undef ctime_r
+#undef gmtime_r
+#undef localtime_r
+#undef rand_r
+#undef strtok_r
+
 #include <errno.h>
 #include <sched.h>
 #include <sys/types.h>
 #include <time.h>
 
+#ifndef _GL_INLINE_HEADER_BEGIN
+ #error "Please include config.h first."
+#endif
 _GL_INLINE_HEADER_BEGIN
 #ifndef _GL_PTHREAD_INLINE
 # define _GL_PTHREAD_INLINE _GL_INLINE
diff --git a/lib/putenv.c b/lib/putenv.c
index 5f0fedaf..b9f50792 100644
--- a/lib/putenv.c
+++ b/lib/putenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1994, 1997-1998, 2000, 2003-2013 Free Software
+/* Copyright (C) 1991, 1994, 1997-1998, 2000, 2003-2014 Free Software
    Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C
@@ -34,6 +34,11 @@
 #include <string.h>
 #include <unistd.h>
 
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# define WIN32_LEAN_AND_MEAN
+# include <windows.h>
+#endif
+
 #if _LIBC
 # if HAVE_GNU_LD
 #  define environ __environ
@@ -57,7 +62,9 @@ static int
 _unsetenv (const char *name)
 {
   size_t len;
+#if !HAVE_DECL__PUTENV
   char **ep;
+#endif
 
   if (name == NULL || *name == '\0' || strchr (name, '=') != NULL)
     {
@@ -67,6 +74,21 @@ _unsetenv (const char *name)
 
   len = strlen (name);
 
+#if HAVE_DECL__PUTENV
+  {
+    int putenv_result, putenv_errno;
+    char *name_ = malloc (len + 2);
+    memcpy (name_, name, len);
+    name_[len] = '=';
+    name_[len + 1] = 0;
+    putenv_result = _putenv (name_);
+    putenv_errno = errno;
+    free (name_);
+    __set_errno (putenv_errno);
+    return putenv_result;
+  }
+#else
+
   LOCK;
 
   ep = environ;
@@ -87,6 +109,7 @@ _unsetenv (const char *name)
   UNLOCK;
 
   return 0;
+#endif
 }
 
 
@@ -95,9 +118,8 @@ _unsetenv (const char *name)
 int
 putenv (char *string)
 {
-  const char *const name_end = strchr (string, '=');
-  register size_t size;
-  register char **ep;
+  const char *name_end = strchr (string, '=');
+  char **ep;
 
   if (name_end == NULL)
     {
@@ -105,30 +127,68 @@ putenv (char *string)
       return _unsetenv (string);
     }
 
-  size = 0;
-  for (ep = environ; *ep != NULL; ++ep)
-    if (!strncmp (*ep, string, name_end - string) &&
-        (*ep)[name_end - string] == '=')
+#if HAVE_DECL__PUTENV
+  /* Rely on _putenv to allocate the new environment.  If other
+     parts of the application use _putenv, the !HAVE_DECL__PUTENV code
+     would fight over who owns the environ vector, causing a crash.  */
+  if (name_end[1])
+    return _putenv (string);
+  else
+    {
+      /* _putenv ("NAME=") unsets NAME, so invoke _putenv ("NAME= ")
+         to allocate the environ vector and then replace the new
+         entry with "NAME=".  */
+      int putenv_result, putenv_errno;
+      char *name_x = malloc (name_end - string + sizeof "= ");
+      if (!name_x)
+        return -1;
+      memcpy (name_x, string, name_end - string + 1);
+      name_x[name_end - string + 1] = ' ';
+      name_x[name_end - string + 2] = 0;
+      putenv_result = _putenv (name_x);
+      putenv_errno = errno;
+      for (ep = environ; *ep; ep++)
+        if (strcmp (*ep, name_x) == 0)
+          {
+            *ep = string;
+            break;
+          }
+# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+      if (putenv_result == 0)
+        {
+          /* _putenv propagated "NAME= " into the subprocess environment;
+             fix that by calling SetEnvironmentVariable directly.  */
+          name_x[name_end - string] = 0;
+          putenv_result = SetEnvironmentVariable (name_x, "") ? 0 : -1;
+          putenv_errno = ENOMEM; /* ENOMEM is the only way to fail.  */
+        }
+# endif
+      free (name_x);
+      __set_errno (putenv_errno);
+      return putenv_result;
+    }
+#else
+  for (ep = environ; *ep; ep++)
+    if (strncmp (*ep, string, name_end - string) == 0
+        && (*ep)[name_end - string] == '=')
       break;
-    else
-      ++size;
 
-  if (*ep == NULL)
+  if (*ep)
+    *ep = string;
+  else
     {
       static char **last_environ = NULL;
-      char **new_environ = (char **) malloc ((size + 2) * sizeof (char *));
-      if (new_environ == NULL)
+      size_t size = ep - environ;
+      char **new_environ = malloc ((size + 2) * sizeof *new_environ);
+      if (! new_environ)
         return -1;
-      (void) memcpy ((void *) new_environ, (void *) environ,
-                     size * sizeof (char *));
-      new_environ[size] = (char *) string;
-      new_environ[size + 1] = NULL;
+      new_environ[0] = string;
+      memcpy (new_environ + 1, environ, (size + 1) * sizeof *new_environ);
       free (last_environ);
       last_environ = new_environ;
       environ = new_environ;
     }
-  else
-    *ep = string;
 
   return 0;
+#endif
 }
diff --git a/lib/qcopy-acl.c b/lib/qcopy-acl.c
new file mode 100644
index 00000000..4e53b633
--- /dev/null
+++ b/lib/qcopy-acl.c
@@ -0,0 +1,583 @@
+/* copy-acl.c - copy access control list from one file to another file
+
+   Copyright (C) 2002-2003, 2005-2014 Free Software Foundation, Inc.
+
+   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 3 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/>.
+
+   Written by Paul Eggert, Andreas Grünbacher, and Bruno Haible.  */
+
+#include <config.h>
+
+#include "acl.h"
+
+#include "acl-internal.h"
+
+
+/* Copy access control lists from one file to another. If SOURCE_DESC is
+   a valid file descriptor, use file descriptor operations, else use
+   filename based operations on SRC_NAME. Likewise for DEST_DESC and
+   DST_NAME.
+   If access control lists are not available, fchmod the target file to
+   MODE.  Also sets the non-permission bits of the destination file
+   (S_ISUID, S_ISGID, S_ISVTX) to those from MODE if any are set.
+   Return 0 if successful.
+   Return -2 and set errno for an error relating to the source file.
+   Return -1 and set errno for an error relating to the destination file.  */
+
+int
+qcopy_acl (const char *src_name, int source_desc, const char *dst_name,
+           int dest_desc, mode_t mode)
+{
+#if USE_ACL && HAVE_ACL_GET_FILE
+  /* POSIX 1003.1e (draft 17 -- abandoned) specific version.  */
+  /* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */
+# if !HAVE_ACL_TYPE_EXTENDED
+  /* Linux, FreeBSD, IRIX, Tru64 */
+
+  acl_t acl;
+  int ret;
+
+  if (HAVE_ACL_GET_FD && source_desc != -1)
+    acl = acl_get_fd (source_desc);
+  else
+    acl = acl_get_file (src_name, ACL_TYPE_ACCESS);
+  if (acl == NULL)
+    {
+      if (! acl_errno_valid (errno))
+        return qset_acl (dst_name, dest_desc, mode);
+      else
+        return -2;
+    }
+
+  if (HAVE_ACL_SET_FD && dest_desc != -1)
+    ret = acl_set_fd (dest_desc, acl);
+  else
+    ret = acl_set_file (dst_name, ACL_TYPE_ACCESS, acl);
+  if (ret != 0)
+    {
+      int saved_errno = errno;
+
+      if (! acl_errno_valid (errno) && !acl_access_nontrivial (acl))
+        {
+          acl_free (acl);
+          return chmod_or_fchmod (dst_name, dest_desc, mode);
+        }
+      else
+        {
+          acl_free (acl);
+          chmod_or_fchmod (dst_name, dest_desc, mode);
+          errno = saved_errno;
+          return -1;
+        }
+    }
+  else
+    acl_free (acl);
+
+  if (!MODE_INSIDE_ACL || (mode & (S_ISUID | S_ISGID | S_ISVTX)))
+    {
+      /* We did not call chmod so far, and either the mode and the ACL are
+         separate or special bits are to be set which don't fit into ACLs.  */
+
+      if (chmod_or_fchmod (dst_name, dest_desc, mode) != 0)
+        return -1;
+    }
+
+  if (S_ISDIR (mode))
+    {
+      acl = acl_get_file (src_name, ACL_TYPE_DEFAULT);
+      if (acl == NULL)
+        return -2;
+
+      if (acl_set_file (dst_name, ACL_TYPE_DEFAULT, acl))
+        {
+          int saved_errno = errno;
+
+          acl_free (acl);
+          errno = saved_errno;
+          return -1;
+        }
+      else
+        acl_free (acl);
+    }
+  return 0;
+
+# else /* HAVE_ACL_TYPE_EXTENDED */
+  /* Mac OS X */
+
+  /* On Mac OS X,  acl_get_file (name, ACL_TYPE_ACCESS)
+     and           acl_get_file (name, ACL_TYPE_DEFAULT)
+     always return NULL / EINVAL.  You have to use
+                   acl_get_file (name, ACL_TYPE_EXTENDED)
+     or            acl_get_fd (open (name, ...))
+     to retrieve an ACL.
+     On the other hand,
+                   acl_set_file (name, ACL_TYPE_ACCESS, acl)
+     and           acl_set_file (name, ACL_TYPE_DEFAULT, acl)
+     have the same effect as
+                   acl_set_file (name, ACL_TYPE_EXTENDED, acl):
+     Each of these calls sets the file's ACL.  */
+
+  acl_t acl;
+  int ret;
+
+  if (HAVE_ACL_GET_FD && source_desc != -1)
+    acl = acl_get_fd (source_desc);
+  else
+    acl = acl_get_file (src_name, ACL_TYPE_EXTENDED);
+  if (acl == NULL)
+    {
+      if (!acl_errno_valid (errno))
+        return qset_acl (dst_name, dest_desc, mode);
+      else
+        return -2;
+    }
+
+  if (HAVE_ACL_SET_FD && dest_desc != -1)
+    ret = acl_set_fd (dest_desc, acl);
+  else
+    ret = acl_set_file (dst_name, ACL_TYPE_EXTENDED, acl);
+  if (ret != 0)
+    {
+      int saved_errno = errno;
+
+      if (!acl_errno_valid (saved_errno) && !acl_extended_nontrivial (acl))
+        {
+          acl_free (acl);
+          return chmod_or_fchmod (dst_name, dest_desc, mode);
+        }
+      else
+        {
+          acl_free (acl);
+          chmod_or_fchmod (dst_name, dest_desc, mode);
+          errno = saved_errno;
+          return -1;
+        }
+    }
+  else
+    acl_free (acl);
+
+  /* Since !MODE_INSIDE_ACL, we have to call chmod explicitly.  */
+  return chmod_or_fchmod (dst_name, dest_desc, mode);
+
+# endif
+
+#elif USE_ACL && defined GETACL /* Solaris, Cygwin, not HP-UX */
+
+  /* Solaris 2.5 through Solaris 10, Cygwin, and contemporaneous versions
+     of Unixware.  The acl() call returns the access and default ACL both
+     at once.  */
+# ifdef ACE_GETACL
+  int ace_count;
+  ace_t *ace_entries;
+# endif
+  int count;
+  aclent_t *entries;
+  int did_chmod;
+  int saved_errno;
+  int ret;
+
+# ifdef ACE_GETACL
+  /* Solaris also has a different variant of ACLs, used in ZFS and NFSv4
+     file systems (whereas the other ones are used in UFS file systems).
+     There is an API
+       pathconf (name, _PC_ACL_ENABLED)
+       fpathconf (desc, _PC_ACL_ENABLED)
+     that allows to determine which of the two kinds of ACLs is supported
+     for the given file.  But some file systems may implement this call
+     incorrectly, so better not use it.
+     When fetching the source ACL, we simply fetch both ACL types.
+     When setting the destination ACL, we try either ACL types, assuming
+     that the kernel will translate the ACL from one form to the other.
+     (See in <http://docs.sun.com/app/docs/doc/819-2241/6n4huc7ia?l=en&a=view>
+     the description of ENOTSUP.)  */
+  for (;;)
+    {
+      ace_count = (source_desc != -1
+                   ? facl (source_desc, ACE_GETACLCNT, 0, NULL)
+                   : acl (src_name, ACE_GETACLCNT, 0, NULL));
+
+      if (ace_count < 0)
+        {
+          if (errno == ENOSYS || errno == EINVAL)
+            {
+              ace_count = 0;
+              ace_entries = NULL;
+              break;
+            }
+          else
+            return -2;
+        }
+
+      if (ace_count == 0)
+        {
+          ace_entries = NULL;
+          break;
+        }
+
+      ace_entries = (ace_t *) malloc (ace_count * sizeof (ace_t));
+      if (ace_entries == NULL)
+        {
+          errno = ENOMEM;
+          return -2;
+        }
+
+      ret = (source_desc != -1
+             ? facl (source_desc, ACE_GETACL, ace_count, ace_entries)
+             : acl (src_name, ACE_GETACL, ace_count, ace_entries));
+      if (ret < 0)
+        {
+          free (ace_entries);
+          if (errno == ENOSYS || errno == EINVAL)
+            {
+              ace_count = 0;
+              ace_entries = NULL;
+              break;
+            }
+          else
+            return -2;
+        }
+      if (ret == ace_count)
+        break;
+      /* Huh? The number of ACL entries changed since the last call.
+         Repeat.  */
+    }
+# endif
+
+  for (;;)
+    {
+      count = (source_desc != -1
+               ? facl (source_desc, GETACLCNT, 0, NULL)
+               : acl (src_name, GETACLCNT, 0, NULL));
+
+      if (count < 0)
+        {
+          if (errno == ENOSYS || errno == ENOTSUP || errno == EOPNOTSUPP)
+            {
+              count = 0;
+              entries = NULL;
+              break;
+            }
+          else
+            return -2;
+        }
+
+      if (count == 0)
+        {
+          entries = NULL;
+          break;
+        }
+
+      entries = (aclent_t *) malloc (count * sizeof (aclent_t));
+      if (entries == NULL)
+        {
+          errno = ENOMEM;
+          return -2;
+        }
+
+      if ((source_desc != -1
+           ? facl (source_desc, GETACL, count, entries)
+           : acl (src_name, GETACL, count, entries))
+          == count)
+        break;
+      /* Huh? The number of ACL entries changed since the last call.
+         Repeat.  */
+    }
+
+  /* Is there an ACL of either kind?  */
+# ifdef ACE_GETACL
+  if (ace_count == 0)
+# endif
+    if (count == 0)
+      return qset_acl (dst_name, dest_desc, mode);
+
+  did_chmod = 0; /* set to 1 once the mode bits in 0777 have been set */
+  saved_errno = 0; /* the first non-ignorable error code */
+
+  if (!MODE_INSIDE_ACL)
+    {
+      /* On Cygwin, it is necessary to call chmod before acl, because
+         chmod can change the contents of the ACL (in ways that don't
+         change the allowed accesses, but still visible).  */
+      if (chmod_or_fchmod (dst_name, dest_desc, mode) != 0)
+        saved_errno = errno;
+      did_chmod = 1;
+    }
+
+  /* If both ace_entries and entries are available, try SETACL before
+     ACE_SETACL, because SETACL cannot fail with ENOTSUP whereas ACE_SETACL
+     can.  */
+
+  if (count > 0)
+    {
+      ret = (dest_desc != -1
+             ? facl (dest_desc, SETACL, count, entries)
+             : acl (dst_name, SETACL, count, entries));
+      if (ret < 0 && saved_errno == 0)
+        {
+          saved_errno = errno;
+          if ((errno == ENOSYS || errno == EOPNOTSUPP || errno == EINVAL)
+              && !acl_nontrivial (count, entries))
+            saved_errno = 0;
+        }
+      else
+        did_chmod = 1;
+    }
+  free (entries);
+
+# ifdef ACE_GETACL
+  if (ace_count > 0)
+    {
+      ret = (dest_desc != -1
+             ? facl (dest_desc, ACE_SETACL, ace_count, ace_entries)
+             : acl (dst_name, ACE_SETACL, ace_count, ace_entries));
+      if (ret < 0 && saved_errno == 0)
+        {
+          saved_errno = errno;
+          if ((errno == ENOSYS || errno == EINVAL || errno == ENOTSUP)
+              && !acl_ace_nontrivial (ace_count, ace_entries))
+            saved_errno = 0;
+        }
+    }
+  free (ace_entries);
+# endif
+
+  if (MODE_INSIDE_ACL
+      && did_chmod <= ((mode & (S_ISUID | S_ISGID | S_ISVTX)) ? 1 : 0))
+    {
+      /* We did not call chmod so far, and either the mode and the ACL are
+         separate or special bits are to be set which don't fit into ACLs.  */
+
+      if (chmod_or_fchmod (dst_name, dest_desc, mode) != 0)
+        {
+          if (saved_errno == 0)
+            saved_errno = errno;
+        }
+    }
+
+  if (saved_errno)
+    {
+      errno = saved_errno;
+      return -1;
+    }
+  return 0;
+
+#elif USE_ACL && HAVE_GETACL /* HP-UX */
+
+  struct acl_entry entries[NACLENTRIES];
+  int count;
+# if HAVE_ACLV_H
+  struct acl aclv_entries[NACLVENTRIES];
+  int aclv_count;
+# endif
+  int did_chmod;
+  int saved_errno;
+  int ret;
+
+  count = (source_desc != -1
+           ? fgetacl (source_desc, NACLENTRIES, entries)
+           : getacl (src_name, NACLENTRIES, entries));
+
+  if (count < 0)
+    {
+      if (errno == ENOSYS || errno == EOPNOTSUPP || errno == ENOTSUP)
+        count = 0;
+      else
+        return -2;
+    }
+  else if (count > 0)
+    {
+      if (count > NACLENTRIES)
+        /* If NACLENTRIES cannot be trusted, use dynamic memory allocation.  */
+        abort ();
+    }
+
+# if HAVE_ACLV_H
+  aclv_count = acl ((char *) src_name, ACL_GET, NACLVENTRIES, aclv_entries);
+
+  if (aclv_count < 0)
+    {
+      if (errno == ENOSYS || errno == EOPNOTSUPP || errno == EINVAL)
+        count = 0;
+      else
+        return -2;
+    }
+  else if (aclv_count > 0)
+    {
+      if (aclv_count > NACLVENTRIES)
+        /* If NACLVENTRIES cannot be trusted, use dynamic memory allocation.  */
+        abort ();
+    }
+# endif
+
+  if (count == 0)
+# if HAVE_ACLV_H
+    if (aclv_count == 0)
+# endif
+      return qset_acl (dst_name, dest_desc, mode);
+
+  did_chmod = 0; /* set to 1 once the mode bits in 0777 have been set */
+  saved_errno = 0; /* the first non-ignorable error code */
+
+  if (count > 0)
+    {
+      ret = (dest_desc != -1
+             ? fsetacl (dest_desc, count, entries)
+             : setacl (dst_name, count, entries));
+      if (ret < 0 && saved_errno == 0)
+        {
+          saved_errno = errno;
+          if (errno == ENOSYS || errno == EOPNOTSUPP || errno == ENOTSUP)
+            {
+              struct stat source_statbuf;
+
+              if ((source_desc != -1
+                   ? fstat (source_desc, &source_statbuf)
+                   : stat (src_name, &source_statbuf)) == 0)
+                {
+                  if (!acl_nontrivial (count, entries, &source_statbuf))
+                    saved_errno = 0;
+                }
+              else
+                saved_errno = errno;
+            }
+        }
+      else
+        did_chmod = 1;
+    }
+
+# if HAVE_ACLV_H
+  if (aclv_count > 0)
+    {
+      ret = acl ((char *) dst_name, ACL_SET, aclv_count, aclv_entries);
+      if (ret < 0 && saved_errno == 0)
+        {
+          saved_errno = errno;
+          if (errno == ENOSYS || errno == EOPNOTSUPP || errno == EINVAL)
+            {
+              if (!aclv_nontrivial (aclv_count, aclv_entries))
+                saved_errno = 0;
+            }
+        }
+      else
+        did_chmod = 1;
+    }
+# endif
+
+  if (did_chmod <= ((mode & (S_ISUID | S_ISGID | S_ISVTX)) ? 1 : 0))
+    {
+      /* We did not call chmod so far, and special bits are to be set which
+         don't fit into ACLs.  */
+
+      if (chmod_or_fchmod (dst_name, dest_desc, mode) != 0)
+        {
+          if (saved_errno == 0)
+            saved_errno = errno;
+        }
+    }
+
+  if (saved_errno)
+    {
+      errno = saved_errno;
+      return -1;
+    }
+  return 0;
+
+#elif USE_ACL && HAVE_ACLX_GET && 0 /* AIX */
+
+  /* TODO */
+
+#elif USE_ACL && HAVE_STATACL /* older AIX */
+
+  union { struct acl a; char room[4096]; } u;
+  int ret;
+
+  if ((source_desc != -1
+       ? fstatacl (source_desc, STX_NORMAL, &u.a, sizeof (u))
+       : statacl (src_name, STX_NORMAL, &u.a, sizeof (u)))
+      < 0)
+    return -2;
+
+  ret = (dest_desc != -1
+         ? fchacl (dest_desc, &u.a, u.a.acl_len)
+         : chacl (dst_name, &u.a, u.a.acl_len));
+  if (ret < 0)
+    {
+      int saved_errno = errno;
+
+      chmod_or_fchmod (dst_name, dest_desc, mode);
+      errno = saved_errno;
+      return -1;
+    }
+
+  /* No need to call chmod_or_fchmod at this point, since the mode bits
+     S_ISUID, S_ISGID, S_ISVTX are also stored in the ACL.  */
+
+  return 0;
+
+#elif USE_ACL && HAVE_ACLSORT /* NonStop Kernel */
+
+  struct acl entries[NACLENTRIES];
+  int count;
+  int ret;
+
+  count = acl ((char *) src_name, ACL_GET, NACLENTRIES, entries);
+
+  if (count < 0)
+    {
+      if (0)
+        count = 0;
+      else
+        return -2;
+    }
+  else if (count > 0)
+    {
+      if (count > NACLENTRIES)
+        /* If NACLENTRIES cannot be trusted, use dynamic memory allocation.  */
+        abort ();
+    }
+
+  if (count == 0)
+    return qset_acl (dst_name, dest_desc, mode);
+
+  ret = acl ((char *) dst_name, ACL_SET, count, entries);
+  if (ret < 0)
+    {
+      int saved_errno = errno;
+
+      if (0)
+        {
+          if (!acl_nontrivial (count, entries))
+            return chmod_or_fchmod (dst_name, dest_desc, mode);
+        }
+
+      chmod_or_fchmod (dst_name, dest_desc, mode);
+      errno = saved_errno;
+      return -1;
+    }
+
+  if (mode & (S_ISUID | S_ISGID | S_ISVTX))
+    {
+      /* We did not call chmod so far, and either the mode and the ACL are
+         separate or special bits are to be set which don't fit into ACLs.  */
+
+      return chmod_or_fchmod (dst_name, dest_desc, mode);
+    }
+  return 0;
+
+#else
+
+  return qset_acl (dst_name, dest_desc, mode);
+
+#endif
+}
diff --git a/lib/set-mode-acl.c b/lib/qset-acl.c
index 35fe2a81..7d9af573 100644
--- a/lib/set-mode-acl.c
+++ b/lib/qset-acl.c
@@ -1,6 +1,6 @@
-/* set-mode-acl.c - set access control list equivalent to a mode
+/* qset-acl.c - set access control list equivalent to a mode
 
-   Copyright (C) 2002-2003, 2005-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2014 Free Software Foundation, Inc.
 
    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
@@ -25,13 +25,10 @@
 
 #include "acl-internal.h"
 
-#include "gettext.h"
-#define _(msgid) gettext (msgid)
-
 
 /* If DESC is a valid file descriptor use fchmod to change the
-   file's mode to MODE on systems that have fchown. On systems
-   that don't have fchown and if DESC is invalid, use chown on
+   file's mode to MODE on systems that have fchmod. On systems
+   that don't have fchmod and if DESC is invalid, use chmod on
    NAME instead.
    Return 0 if successful.  Return -1 and set errno upon failure.  */
 
@@ -119,14 +116,10 @@ qset_acl (char const *name, int desc, mode_t mode)
     {
       int saved_errno = errno;
       acl_free (acl);
-
-      if (ACL_NOT_WELL_SUPPORTED (errno))
+      if (! acl_errno_valid (errno))
         return chmod_or_fchmod (name, desc, mode);
-      else
-        {
-          errno = saved_errno;
-          return -1;
-        }
+      errno = saved_errno;
+      return -1;
     }
   else
     acl_free (acl);
@@ -180,16 +173,11 @@ qset_acl (char const *name, int desc, mode_t mode)
           if (ret != 0)
             {
               int saved_errno = errno;
-
               acl_free (acl);
-
-              if (ACL_NOT_WELL_SUPPORTED (saved_errno))
+              if (! acl_errno_valid (saved_errno))
                 return chmod_or_fchmod (name, desc, mode);
-              else
-                {
-                  errno = saved_errno;
-                  return -1;
-                }
+              errno = saved_errno;
+              return -1;
             }
           acl_free (acl);
         }
@@ -686,14 +674,3 @@ qset_acl (char const *name, int desc, mode_t mode)
   return chmod_or_fchmod (name, desc, mode);
 #endif
 }
-
-/* As with qset_acl, but also output a diagnostic on failure.  */
-
-int
-set_acl (char const *name, int desc, mode_t mode)
-{
-  int ret = qset_acl (name, desc, mode);
-  if (ret != 0)
-    error (0, errno, _("setting permissions for %s"), quote (name));
-  return ret;
-}
diff --git a/lib/quote.h b/lib/quote.h
index 16797967..fb338a77 100644
--- a/lib/quote.h
+++ b/lib/quote.h
@@ -1,6 +1,6 @@
 /* quote.h - prototypes for quote.c
 
-   Copyright (C) 1998-2001, 2003, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 1998-2001, 2003, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/quotearg.c b/lib/quotearg.c
index 57a83822..bef7b98b 100644
--- a/lib/quotearg.c
+++ b/lib/quotearg.c
@@ -1,6 +1,6 @@
 /* quotearg.c - quote arguments for output
 
-   Copyright (C) 1998-2002, 2004-2013 Free Software Foundation, Inc.
+   Copyright (C) 1998-2002, 2004-2014 Free Software Foundation, Inc.
 
    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
@@ -178,7 +178,7 @@ set_custom_quoting (struct quoting_options *o,
 static struct quoting_options /* NOT PURE!! */
 quoting_options_from_style (enum quoting_style style)
 {
-  struct quoting_options o = { 0, 0, { 0 }, NULL, NULL };
+  struct quoting_options o = { literal_quoting_style, 0, { 0 }, NULL, NULL };
   if (style == custom_quoting_style)
     abort ();
   o.style = style;
@@ -348,7 +348,12 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize,
 
       if (backslash_escapes
           && quote_string_len
-          && i + quote_string_len <= argsize
+          && (i + quote_string_len
+              <= (argsize == SIZE_MAX && 1 < quote_string_len
+                  /* Use strlen only if we must: when argsize is SIZE_MAX,
+                     and when the quote string is more than 1 byte long.
+                     If we do call strlen, save the result.  */
+                  ? (argsize = strlen (arg)) : argsize))
           && memcmp (arg + i, quote_string, quote_string_len) == 0)
         {
           if (elide_outer_quotes)
@@ -621,7 +626,7 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize,
 
       if (! ((backslash_escapes || elide_outer_quotes)
              && quote_these_too
-             && quote_these_too[c / INT_BITS] & (1 << (c % INT_BITS)))
+             && quote_these_too[c / INT_BITS] >> (c % INT_BITS) & 1)
           && !is_right_quote)
         goto store_c;
 
diff --git a/lib/quotearg.h b/lib/quotearg.h
index 58ee3f60..da29d7b5 100644
--- a/lib/quotearg.h
+++ b/lib/quotearg.h
@@ -1,6 +1,6 @@
 /* quotearg.h - quote arguments for output
 
-   Copyright (C) 1998-2002, 2004, 2006, 2008-2013 Free Software Foundation,
+   Copyright (C) 1998-2002, 2004, 2006, 2008-2014 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/raise.c b/lib/raise.c
index 5b546d2b..cf58a7e9 100644
--- a/lib/raise.c
+++ b/lib/raise.c
@@ -1,6 +1,6 @@
 /* Provide a non-threads replacement for the POSIX raise function.
 
-   Copyright (C) 2002-2003, 2005-2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/rand-isaac.c b/lib/rand-isaac.c
index defd2177..c03242f6 100644
--- a/lib/rand-isaac.c
+++ b/lib/rand-isaac.c
@@ -1,6 +1,6 @@
 /* Bob Jenkins's cryptographic random number generators, ISAAC and ISAAC64.
 
-   Copyright (C) 1999-2013 Free Software Foundation, Inc.
+   Copyright (C) 1999-2014 Free Software Foundation, Inc.
    Copyright (C) 1997, 1998, 1999 Colin Plumb.
 
    This program is free software: you can redistribute it and/or modify
@@ -58,16 +58,26 @@ just (isaac_word a)
   return a & desired_bits;
 }
 
-/* The index operation.  On typical machines whose words are exactly
-   the right size, this is optimized to a mask, an addition, and an
-   indirect load.  Atypical machines need more work.  */
+/* The index operation.  */
 static inline isaac_word
 ind (isaac_word const *m, isaac_word x)
 {
-  return (sizeof *m * CHAR_BIT == ISAAC_BITS
-          ? (* (isaac_word *) ((char *) m
-                               + (x & ((ISAAC_WORDS - 1) * sizeof *m))))
-          : m[(x / (ISAAC_BITS / CHAR_BIT)) & (ISAAC_WORDS - 1)]);
+  if (sizeof *m * CHAR_BIT == ISAAC_BITS)
+    {
+      /* The typical case, where words are exactly the right size.
+         Optimize this to a mask, an addition, and an indirect
+         load.  */
+      void const *void_m = m;
+      char const *base_p = void_m;
+      void const *word_p = base_p + (x & ((ISAAC_WORDS - 1) * sizeof *m));
+      isaac_word const *p = word_p;
+      return *p;
+    }
+  else
+    {
+      /* Atypical machines need more work.  */
+      return m[(x / (ISAAC_BITS / CHAR_BIT)) & (ISAAC_WORDS - 1)];
+    }
 }
 
 /* Use and update *S to generate random data to fill RESULT.  */
diff --git a/lib/rand-isaac.h b/lib/rand-isaac.h
index 8e45c703..a34a0a73 100644
--- a/lib/rand-isaac.h
+++ b/lib/rand-isaac.h
@@ -1,6 +1,6 @@
 /* Bob Jenkins's cryptographic random number generators, ISAAC and ISAAC64.
 
-   Copyright (C) 1999-2013 Free Software Foundation, Inc.
+   Copyright (C) 1999-2014 Free Software Foundation, Inc.
    Copyright (C) 1997, 1998, 1999 Colin Plumb.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/randint.c b/lib/randint.c
index 2ae76584..1e5e0a0c 100644
--- a/lib/randint.c
+++ b/lib/randint.c
@@ -1,6 +1,6 @@
 /* Generate random integers.
 
-   Copyright (C) 2006-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/randint.h b/lib/randint.h
index fc13270b..151edfdc 100644
--- a/lib/randint.h
+++ b/lib/randint.h
@@ -1,6 +1,6 @@
 /* Generate random integers.
 
-   Copyright (C) 2006-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/randperm.c b/lib/randperm.c
index ffa8faa1..1be13511 100644
--- a/lib/randperm.c
+++ b/lib/randperm.c
@@ -1,6 +1,6 @@
 /* Generate random permutations.
 
-   Copyright (C) 2006-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/randread.c b/lib/randread.c
index dfba6118..a073cab2 100644
--- a/lib/randread.c
+++ b/lib/randread.c
@@ -1,6 +1,6 @@
 /* Generate buffers of random data.
 
-   Copyright (C) 2006-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
    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
@@ -275,12 +275,14 @@ readsource (struct randread_source *s, unsigned char *p, size_t size)
    the buffered ISAAC generator in ISAAC.  */
 
 static void
-readisaac (struct isaac *isaac, unsigned char *p, size_t size)
+readisaac (struct isaac *isaac, void *p, size_t size)
 {
   size_t inbytes = isaac->buffered;
 
   while (true)
     {
+      char *char_p = p;
+
       if (size <= inbytes)
         {
           memcpy (p, isaac->data.b + ISAAC_BYTES - inbytes, size);
@@ -289,14 +291,14 @@ readisaac (struct isaac *isaac, unsigned char *p, size_t size)
         }
 
       memcpy (p, isaac->data.b + ISAAC_BYTES - inbytes, inbytes);
-      p += inbytes;
+      p = char_p + inbytes;
       size -= inbytes;
 
       /* If P is aligned, write to *P directly to avoid the overhead
          of copying from the buffer.  */
       if (ALIGNED_POINTER (p, isaac_word))
         {
-          isaac_word *wp = (isaac_word *) p;
+          isaac_word *wp = p;
           while (ISAAC_BYTES <= size)
             {
               isaac_refill (&isaac->state, wp);
@@ -308,7 +310,7 @@ readisaac (struct isaac *isaac, unsigned char *p, size_t size)
                   return;
                 }
             }
-          p = (unsigned char *) wp;
+          p = wp;
         }
 
       isaac_refill (&isaac->state, isaac->data.w);
diff --git a/lib/randread.h b/lib/randread.h
index 72ce8581..7223c9d2 100644
--- a/lib/randread.h
+++ b/lib/randread.h
@@ -1,6 +1,6 @@
 /* Generate buffers of random data.
 
-   Copyright (C) 2006-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/rawmemchr.c b/lib/rawmemchr.c
deleted file mode 100644
index a0298ce6..00000000
--- a/lib/rawmemchr.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/* Searching in a string.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
-
-   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 3 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/>.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include <string.h>
-
-/* Find the first occurrence of C in S.  */
-void *
-rawmemchr (const void *s, int c_in)
-{
-  /* On 32-bit hardware, choosing longword to be a 32-bit unsigned
-     long instead of a 64-bit uintmax_t tends to give better
-     performance.  On 64-bit hardware, unsigned long is generally 64
-     bits already.  Change this typedef to experiment with
-     performance.  */
-  typedef unsigned long int longword;
-
-  const unsigned char *char_ptr;
-  const longword *longword_ptr;
-  longword repeated_one;
-  longword repeated_c;
-  unsigned char c;
-
-  c = (unsigned char) c_in;
-
-  /* Handle the first few bytes by reading one byte at a time.
-     Do this until CHAR_PTR is aligned on a longword boundary.  */
-  for (char_ptr = (const unsigned char *) s;
-       (size_t) char_ptr % sizeof (longword) != 0;
-       ++char_ptr)
-    if (*char_ptr == c)
-      return (void *) char_ptr;
-
-  longword_ptr = (const longword *) char_ptr;
-
-  /* All these elucidatory comments refer to 4-byte longwords,
-     but the theory applies equally well to any size longwords.  */
-
-  /* Compute auxiliary longword values:
-     repeated_one is a value which has a 1 in every byte.
-     repeated_c has c in every byte.  */
-  repeated_one = 0x01010101;
-  repeated_c = c | (c << 8);
-  repeated_c |= repeated_c << 16;
-  if (0xffffffffU < (longword) -1)
-    {
-      repeated_one |= repeated_one << 31 << 1;
-      repeated_c |= repeated_c << 31 << 1;
-      if (8 < sizeof (longword))
-        {
-          size_t i;
-
-          for (i = 64; i < sizeof (longword) * 8; i *= 2)
-            {
-              repeated_one |= repeated_one << i;
-              repeated_c |= repeated_c << i;
-            }
-        }
-    }
-
-  /* Instead of the traditional loop which tests each byte, we will
-     test a longword at a time.  The tricky part is testing if *any of
-     the four* bytes in the longword in question are equal to NUL or
-     c.  We first use an xor with repeated_c.  This reduces the task
-     to testing whether *any of the four* bytes in longword1 is zero.
-
-     We compute tmp =
-       ((longword1 - repeated_one) & ~longword1) & (repeated_one << 7).
-     That is, we perform the following operations:
-       1. Subtract repeated_one.
-       2. & ~longword1.
-       3. & a mask consisting of 0x80 in every byte.
-     Consider what happens in each byte:
-       - If a byte of longword1 is zero, step 1 and 2 transform it into 0xff,
-         and step 3 transforms it into 0x80.  A carry can also be propagated
-         to more significant bytes.
-       - If a byte of longword1 is nonzero, let its lowest 1 bit be at
-         position k (0 <= k <= 7); so the lowest k bits are 0.  After step 1,
-         the byte ends in a single bit of value 0 and k bits of value 1.
-         After step 2, the result is just k bits of value 1: 2^k - 1.  After
-         step 3, the result is 0.  And no carry is produced.
-     So, if longword1 has only non-zero bytes, tmp is zero.
-     Whereas if longword1 has a zero byte, call j the position of the least
-     significant zero byte.  Then the result has a zero at positions 0, ...,
-     j-1 and a 0x80 at position j.  We cannot predict the result at the more
-     significant bytes (positions j+1..3), but it does not matter since we
-     already have a non-zero bit at position 8*j+7.
-
-     The test whether any byte in longword1 is zero is equivalent
-     to testing whether tmp is nonzero.
-
-     This test can read beyond the end of a string, depending on where
-     C_IN is encountered.  However, this is considered safe since the
-     initialization phase ensured that the read will be aligned,
-     therefore, the read will not cross page boundaries and will not
-     cause a fault.  */
-
-  while (1)
-    {
-      longword longword1 = *longword_ptr ^ repeated_c;
-
-      if ((((longword1 - repeated_one) & ~longword1)
-           & (repeated_one << 7)) != 0)
-        break;
-      longword_ptr++;
-    }
-
-  char_ptr = (const unsigned char *) longword_ptr;
-
-  /* At this point, we know that one of the sizeof (longword) bytes
-     starting at char_ptr is == c.  On little-endian machines, we
-     could determine the first such byte without any further memory
-     accesses, just by looking at the tmp result from the last loop
-     iteration.  But this does not work on big-endian machines.
-     Choose code that works in both cases.  */
-
-  char_ptr = (unsigned char *) longword_ptr;
-  while (*char_ptr != c)
-    char_ptr++;
-  return (void *) char_ptr;
-}
diff --git a/lib/rawmemchr.valgrind b/lib/rawmemchr.valgrind
deleted file mode 100644
index 63639236..00000000
--- a/lib/rawmemchr.valgrind
+++ /dev/null
@@ -1,12 +0,0 @@
-# Suppress a valgrind message about use of uninitialized memory in rawmemchr().
-# This use is OK because it provides only a speedup.
-{
-    rawmemchr-value4
-    Memcheck:Value4
-    fun:rawmemchr
-}
-{
-    rawmemchr-value8
-    Memcheck:Value8
-    fun:rawmemchr
-}
diff --git a/lib/read-file.c b/lib/read-file.c
index bcc5a92f..45f66900 100644
--- a/lib/read-file.c
+++ b/lib/read-file.c
@@ -1,5 +1,5 @@
 /* read-file.c -- read file contents into a string
-   Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
    Written by Simon Josefsson and Bruno Haible.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib/read-file.h b/lib/read-file.h
index 507135f2..f458b482 100644
--- a/lib/read-file.h
+++ b/lib/read-file.h
@@ -1,5 +1,5 @@
 /* read-file.h -- read file contents into a string
-   Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
    Written by Simon Josefsson.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib/read.c b/lib/read.c
index 0fe0306f..d125b51a 100644
--- a/lib/read.c
+++ b/lib/read.c
@@ -1,5 +1,5 @@
 /* POSIX compatible read() function.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/readdir.c b/lib/readdir.c
index 3db00806..b74aebe0 100644
--- a/lib/readdir.c
+++ b/lib/readdir.c
@@ -1,5 +1,5 @@
 /* Read the next entry of a directory.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/readlink.c b/lib/readlink.c
index f83a1e01..4c496395 100644
--- a/lib/readlink.c
+++ b/lib/readlink.c
@@ -1,5 +1,5 @@
 /* Stub for readlink().
-   Copyright (C) 2003-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2003-2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/readlinkat.c b/lib/readlinkat.c
index 504e6ebb..c8a60500 100644
--- a/lib/readlinkat.c
+++ b/lib/readlinkat.c
@@ -1,5 +1,5 @@
 /* Read a symlink relative to an open directory.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/readtokens.c b/lib/readtokens.c
index b2464bfa..fbed2ca7 100644
--- a/lib/readtokens.c
+++ b/lib/readtokens.c
@@ -1,6 +1,6 @@
 /* readtokens.c  -- Functions for reading tokens from an input stream.
 
-   Copyright (C) 1990-1991, 1999-2004, 2006, 2009-2013 Free Software
+   Copyright (C) 1990-1991, 1999-2004, 2006, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/readtokens.h b/lib/readtokens.h
index 4f5048b1..e03d3311 100644
--- a/lib/readtokens.h
+++ b/lib/readtokens.h
@@ -1,6 +1,6 @@
 /* readtokens.h -- Functions for reading tokens from an input stream.
 
-   Copyright (C) 1990-1991, 1999, 2001-2004, 2009-2013 Free Software
+   Copyright (C) 1990-1991, 1999, 2001-2004, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/readtokens0.c b/lib/readtokens0.c
index b20cb39f..3ced091e 100644
--- a/lib/readtokens0.c
+++ b/lib/readtokens0.c
@@ -1,6 +1,6 @@
 /* readtokens0.c -- Read NUL-separated tokens from an input stream.
 
-   Copyright (C) 2004, 2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/readtokens0.h b/lib/readtokens0.h
index d8852618..cb51f9f9 100644
--- a/lib/readtokens0.h
+++ b/lib/readtokens0.h
@@ -1,6 +1,6 @@
 /* readtokens0.h -- read NUL-separated tokens from an input stream.
 
-   Copyright (C) 2004, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/readutmp.c b/lib/readutmp.c
index ec6e2759..a90290b6 100644
--- a/lib/readutmp.c
+++ b/lib/readutmp.c
@@ -1,6 +1,6 @@
 /* GNU's read utmp module.
 
-   Copyright (C) 1992-2001, 2003-2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 1992-2001, 2003-2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/readutmp.h b/lib/readutmp.h
index bfbcca1b..0c5623c2 100644
--- a/lib/readutmp.h
+++ b/lib/readutmp.h
@@ -1,6 +1,6 @@
 /* Declarations for GNU's read utmp module.
 
-   Copyright (C) 1992-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 1992-2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/realloc.c b/lib/realloc.c
index b51010a6..8dfcfbe5 100644
--- a/lib/realloc.c
+++ b/lib/realloc.c
@@ -1,6 +1,6 @@
 /* realloc() function that is glibc compatible.
 
-   Copyright (C) 1997, 2003-2004, 2006-2007, 2009-2013 Free Software
+   Copyright (C) 1997, 2003-2004, 2006-2007, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/ref-add.sin b/lib/ref-add.sin
index 112bcdc6..0e140229 100644
--- a/lib/ref-add.sin
+++ b/lib/ref-add.sin
@@ -1,6 +1,6 @@
 # Add this package to a list of references stored in a text file.
 #
-#   Copyright (C) 2000, 2009-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2000, 2009-2014 Free Software Foundation, Inc.
 #
 #   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
diff --git a/lib/ref-del.sin b/lib/ref-del.sin
index 6f738684..2dbcf7b2 100644
--- a/lib/ref-del.sin
+++ b/lib/ref-del.sin
@@ -1,6 +1,6 @@
 # Remove this package from a list of references stored in a text file.
 #
-#   Copyright (C) 2000, 2009-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2000, 2009-2014 Free Software Foundation, Inc.
 #
 #   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
diff --git a/lib/regcomp.c b/lib/regcomp.c
index 62dcbed7..a9640922 100644
--- a/lib/regcomp.c
+++ b/lib/regcomp.c
@@ -1,5 +1,5 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002-2014 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
@@ -292,7 +292,7 @@ weak_alias (__re_compile_fastmap, re_compile_fastmap)
 #endif
 
 static inline void
-__attribute ((always_inline))
+__attribute__ ((always_inline))
 re_set_fastmap (char *fastmap, bool icase, int ch)
 {
   fastmap[ch] = 1;
@@ -586,7 +586,7 @@ weak_alias (__regerror, regerror)
 static const bitset_t utf8_sb_map =
 {
   /* Set the first 128 bits.  */
-# ifdef __GNUC__
+# if defined __GNUC__ && !defined __STRICT_ANSI__
   [0 ... 0x80 / BITSET_WORD_BITS - 1] = BITSET_WORD_MAX
 # else
 #  if 4 * BITSET_WORD_BITS < ASCII_CHARS
@@ -663,7 +663,10 @@ regfree (preg)
 {
   re_dfa_t *dfa = preg->buffer;
   if (BE (dfa != NULL, 1))
-    free_dfa_content (dfa);
+    {
+      lock_fini (dfa->lock);
+      free_dfa_content (dfa);
+    }
   preg->buffer = NULL;
   preg->allocated = 0;
 
@@ -784,6 +787,8 @@ re_compile_internal (regex_t *preg, const char * pattern, size_t length,
   preg->used = sizeof (re_dfa_t);
 
   err = init_dfa (dfa, length);
+  if (BE (err == REG_NOERROR && lock_init (dfa->lock) != 0, 0))
+    err = REG_ESPACE;
   if (BE (err != REG_NOERROR, 0))
     {
       free_dfa_content (dfa);
@@ -797,8 +802,6 @@ re_compile_internal (regex_t *preg, const char * pattern, size_t length,
   strncpy (dfa->re_str, pattern, length + 1);
 #endif
 
-  __libc_lock_init (dfa->lock);
-
   err = re_string_construct (&regexp, pattern, length, preg->translate,
 			     (syntax & RE_ICASE) != 0, dfa);
   if (BE (err != REG_NOERROR, 0))
@@ -806,6 +809,7 @@ re_compile_internal (regex_t *preg, const char * pattern, size_t length,
     re_compile_internal_free_return:
       free_workarea_compile (preg);
       re_string_destruct (&regexp);
+      lock_fini (dfa->lock);
       free_dfa_content (dfa);
       preg->buffer = NULL;
       preg->allocated = 0;
@@ -838,6 +842,7 @@ re_compile_internal (regex_t *preg, const char * pattern, size_t length,
 
   if (BE (err != REG_NOERROR, 0))
     {
+      lock_fini (dfa->lock);
       free_dfa_content (dfa);
       preg->buffer = NULL;
       preg->allocated = 0;
@@ -2194,7 +2199,11 @@ parse_reg_exp (re_string_t *regexp, regex_t *preg, re_token_t *token,
 	{
 	  branch = parse_branch (regexp, preg, token, syntax, nest, err);
 	  if (BE (*err != REG_NOERROR && branch == NULL, 0))
-	    return NULL;
+	    {
+	      if (tree != NULL)
+		postorder (tree, free_tree, NULL);
+	      return NULL;
+	    }
 	}
       else
 	branch = NULL;
@@ -2455,14 +2464,22 @@ parse_expression (re_string_t *regexp, regex_t *preg, re_token_t *token,
   while (token->type == OP_DUP_ASTERISK || token->type == OP_DUP_PLUS
 	 || token->type == OP_DUP_QUESTION || token->type == OP_OPEN_DUP_NUM)
     {
-      tree = parse_dup_op (tree, regexp, dfa, token, syntax, err);
-      if (BE (*err != REG_NOERROR && tree == NULL, 0))
-	return NULL;
+      bin_tree_t *dup_tree = parse_dup_op (tree, regexp, dfa, token,
+					   syntax, err);
+      if (BE (*err != REG_NOERROR && dup_tree == NULL, 0))
+	{
+	  if (tree != NULL)
+	    postorder (tree, free_tree, NULL);
+	  return NULL;
+	}
+      tree = dup_tree;
       /* In BRE consecutive duplications are not allowed.  */
       if ((syntax & RE_CONTEXT_INVALID_DUP)
 	  && (token->type == OP_DUP_ASTERISK
 	      || token->type == OP_OPEN_DUP_NUM))
 	{
+	  if (tree != NULL)
+	    postorder (tree, free_tree, NULL);
 	  *err = REG_BADRPT;
 	  return NULL;
 	}
@@ -2618,6 +2635,8 @@ parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa,
 
       /* Duplicate ELEM before it is marked optional.  */
       elem = duplicate_tree (elem, dfa);
+      if (BE (elem == NULL, 0))
+        goto parse_dup_op_espace;
       old_tree = tree;
     }
   else
@@ -2837,40 +2856,29 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
 
   /* Local function for parse_bracket_exp used in _LIBC environment.
      Seek the collating symbol entry corresponding to NAME.
-     Return the index of the symbol in the SYMB_TABLE.  */
+     Return the index of the symbol in the SYMB_TABLE,
+     or -1 if not found.  */
 
   auto inline int32_t
-  __attribute ((always_inline))
-  seek_collating_symbol_entry (name, name_len)
-	 const unsigned char *name;
-	 size_t name_len;
+  __attribute__ ((always_inline))
+  seek_collating_symbol_entry (const unsigned char *name, size_t name_len)
     {
-      int32_t hash = elem_hash ((const char *) name, name_len);
-      int32_t elem = hash % table_size;
-      if (symb_table[2 * elem] != 0)
-	{
-	  int32_t second = hash % (table_size - 2) + 1;
-
-	  do
-	    {
-	      /* First compare the hashing value.  */
-	      if (symb_table[2 * elem] == hash
-		  /* Compare the length of the name.  */
-		  && name_len == extra[symb_table[2 * elem + 1]]
-		  /* Compare the name.  */
-		  && memcmp (name, &extra[symb_table[2 * elem + 1] + 1],
-			     name_len) == 0)
-		{
-		  /* Yep, this is the entry.  */
-		  break;
-		}
+      int32_t elem;
 
-	      /* Next entry.  */
-	      elem += second;
-	    }
-	  while (symb_table[2 * elem] != 0);
-	}
-      return elem;
+      for (elem = 0; elem < table_size; elem++)
+	if (symb_table[2 * elem] != 0)
+	  {
+	    int32_t idx = symb_table[2 * elem + 1];
+	    /* Skip the name of collating element name.  */
+	    idx += 1 + extra[idx];
+	    if (/* Compare the length of the name.  */
+		name_len == extra[idx]
+		/* Compare the name.  */
+		&& memcmp (name, &extra[idx + 1], name_len) == 0)
+	      /* Yep, this is the entry.  */
+	      return elem;
+	  }
+      return -1;
     }
 
   /* Local function for parse_bracket_exp used in _LIBC environment.
@@ -2878,9 +2886,8 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
      Return the value if succeeded, UINT_MAX otherwise.  */
 
   auto inline unsigned int
-  __attribute ((always_inline))
-  lookup_collation_sequence_value (br_elem)
-	 bracket_elem_t *br_elem;
+  __attribute__ ((always_inline))
+  lookup_collation_sequence_value (bracket_elem_t *br_elem)
     {
       if (br_elem->type == SB_CHAR)
 	{
@@ -2908,7 +2915,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
 	      int32_t elem, idx;
 	      elem = seek_collating_symbol_entry (br_elem->opr.name,
 						  sym_name_len);
-	      if (symb_table[2 * elem] != 0)
+	      if (elem != -1)
 		{
 		  /* We found the entry.  */
 		  idx = symb_table[2 * elem + 1];
@@ -2926,7 +2933,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
 		  /* Return the collation sequence value.  */
 		  return *(unsigned int *) (extra + idx);
 		}
-	      else if (symb_table[2 * elem] == 0 && sym_name_len == 1)
+	      else if (sym_name_len == 1)
 		{
 		  /* No valid character.  Match it as a single byte
 		     character.  */
@@ -2947,12 +2954,9 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
      update it.  */
 
   auto inline reg_errcode_t
-  __attribute ((always_inline))
-  build_range_exp (sbcset, mbcset, range_alloc, start_elem, end_elem)
-	 re_charset_t *mbcset;
-	 Idx *range_alloc;
-	 bitset_t sbcset;
-	 bracket_elem_t *start_elem, *end_elem;
+  __attribute__ ((always_inline))
+  build_range_exp (bitset_t sbcset, re_charset_t *mbcset, int *range_alloc,
+		   bracket_elem_t *start_elem, bracket_elem_t *end_elem)
     {
       unsigned int ch;
       uint32_t start_collseq;
@@ -3031,26 +3035,23 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
      pointer argument since we may update it.  */
 
   auto inline reg_errcode_t
-  __attribute ((always_inline))
-  build_collating_symbol (sbcset, mbcset, coll_sym_alloc, name)
-	 re_charset_t *mbcset;
-	 Idx *coll_sym_alloc;
-	 bitset_t sbcset;
-	 const unsigned char *name;
+  __attribute__ ((always_inline))
+  build_collating_symbol (bitset_t sbcset, re_charset_t *mbcset,
+			  Idx *coll_sym_alloc, const unsigned char *name)
     {
       int32_t elem, idx;
       size_t name_len = strlen ((const char *) name);
       if (nrules != 0)
 	{
 	  elem = seek_collating_symbol_entry (name, name_len);
-	  if (symb_table[2 * elem] != 0)
+	  if (elem != -1)
 	    {
 	      /* We found the entry.  */
 	      idx = symb_table[2 * elem + 1];
 	      /* Skip the name of collating element name.  */
 	      idx += 1 + extra[idx];
 	    }
-	  else if (symb_table[2 * elem] == 0 && name_len == 1)
+	  else if (name_len == 1)
 	    {
 	      /* No valid character, treat it as a normal
 		 character.  */
diff --git a/lib/regex.c b/lib/regex.c
index df90e10d..95beb6fb 100644
--- a/lib/regex.c
+++ b/lib/regex.c
@@ -1,5 +1,5 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002-2014 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
@@ -24,6 +24,7 @@
 #  pragma GCC diagnostic ignored "-Wsuggest-attribute=pure"
 # endif
 # if (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) || 4 < __GNUC__
+#  pragma GCC diagnostic ignored "-Wold-style-definition"
 #  pragma GCC diagnostic ignored "-Wtype-limits"
 # endif
 #endif
diff --git a/lib/regex.h b/lib/regex.h
index 854c6eda..70f2126c 100644
--- a/lib/regex.h
+++ b/lib/regex.h
@@ -1,6 +1,6 @@
 /* Definitions for data structures and routines for the regular
    expression library.
-   Copyright (C) 1985, 1989-1993, 1995-1998, 2000-2003, 2005-2013 Free Software
+   Copyright (C) 1985, 1989-1993, 1995-1998, 2000-2003, 2005-2014 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -608,7 +608,7 @@ extern void re_set_registers (struct re_pattern_buffer *__buffer,
 			      regoff_t *__starts, regoff_t *__ends);
 #endif	/* Use GNU */
 
-#if defined _REGEX_RE_COMP || (defined _LIBC && defined __USE_BSD)
+#if defined _REGEX_RE_COMP || (defined _LIBC && defined __USE_MISC)
 # ifndef _CRAY
 /* 4.2 bsd compatibility.  */
 extern char *re_comp (const char *);
diff --git a/lib/regex_internal.c b/lib/regex_internal.c
index d8bdbd3f..3186b793 100644
--- a/lib/regex_internal.c
+++ b/lib/regex_internal.c
@@ -1,5 +1,5 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002-2014 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
@@ -313,12 +313,11 @@ build_wcs_upper_buffer (re_string_t *pstr)
 			       + byte_idx), remain_len, &pstr->cur_state);
 	  if (BE (mbclen < (size_t) -2, 1))
 	    {
-	      wchar_t wcu = wc;
-	      if (iswlower (wc))
+	      wchar_t wcu = towupper (wc);
+	      if (wcu != wc)
 		{
 		  size_t mbcdlen;
 
-		  wcu = towupper (wc);
 		  mbcdlen = wcrtomb (buf, wcu, &prev_st);
 		  if (BE (mbclen == mbcdlen, 1))
 		    memcpy (pstr->mbs + byte_idx, buf, mbclen);
@@ -383,12 +382,11 @@ build_wcs_upper_buffer (re_string_t *pstr)
 	mbclen = __mbrtowc (&wc, p, remain_len, &pstr->cur_state);
 	if (BE (mbclen < (size_t) -2, 1))
 	  {
-	    wchar_t wcu = wc;
-	    if (iswlower (wc))
+	    wchar_t wcu = towupper (wc);
+	    if (wcu != wc)
 	      {
 		size_t mbcdlen;
 
-		wcu = towupper (wc);
 		mbcdlen = wcrtomb ((char *) buf, wcu, &prev_st);
 		if (BE (mbclen == mbcdlen, 1))
 		  memcpy (pstr->mbs + byte_idx, buf, mbclen);
@@ -540,10 +538,7 @@ build_upper_buffer (re_string_t *pstr)
       int ch = pstr->raw_mbs[pstr->raw_mbs_idx + char_idx];
       if (BE (pstr->trans != NULL, 0))
 	ch = pstr->trans[ch];
-      if (islower (ch))
-	pstr->mbs[char_idx] = toupper (ch);
-      else
-	pstr->mbs[char_idx] = ch;
+      pstr->mbs[char_idx] = toupper (ch);
     }
   pstr->valid_len = char_idx;
   pstr->valid_raw_len = char_idx;
@@ -836,7 +831,7 @@ re_string_reconstruct (re_string_t *pstr, Idx idx, int eflags)
 }
 
 static unsigned char
-internal_function __attribute ((pure))
+internal_function __attribute__ ((pure))
 re_string_peek_byte_case (const re_string_t *pstr, Idx idx)
 {
   int ch;
@@ -1356,7 +1351,7 @@ re_node_set_insert_last (re_node_set *set, Idx elem)
    Return true if SET1 and SET2 are equivalent.  */
 
 static bool
-internal_function __attribute ((pure))
+internal_function __attribute__ ((pure))
 re_node_set_compare (const re_node_set *set1, const re_node_set *set2)
 {
   Idx i;
@@ -1371,7 +1366,7 @@ re_node_set_compare (const re_node_set *set1, const re_node_set *set2)
 /* Return (idx + 1) if SET contains the element ELEM, return 0 otherwise.  */
 
 static Idx
-internal_function __attribute ((pure))
+internal_function __attribute__ ((pure))
 re_node_set_contains (const re_node_set *set, Idx elem)
 {
   __re_size_t idx, right, mid;
diff --git a/lib/regex_internal.h b/lib/regex_internal.h
index 8e720218..a35ccb72 100644
--- a/lib/regex_internal.h
+++ b/lib/regex_internal.h
@@ -1,5 +1,5 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002-2014 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
@@ -32,12 +32,50 @@
 #include <wctype.h>
 #include <stdbool.h>
 #include <stdint.h>
-#if defined _LIBC
+
+#ifdef _LIBC
 # include <bits/libc-lock.h>
+# define lock_define(name) __libc_lock_define (, name)
+# define lock_init(lock) (__libc_lock_init (lock), 0)
+# define lock_fini(lock) 0
+# define lock_lock(lock) __libc_lock_lock (lock)
+# define lock_unlock(lock) __libc_lock_unlock (lock)
+#elif defined GNULIB_LOCK && !defined USE_UNLOCKED_IO
+# include "glthread/lock.h"
+  /* Use gl_lock_define if empty macro arguments are known to work.
+     Otherwise, fall back on less-portable substitutes.  */
+# if ((defined __GNUC__ && !defined __STRICT_ANSI__) \
+      || (defined __STDC_VERSION__ && 199901L <= __STDC_VERSION__))
+#  define lock_define(name) gl_lock_define (, name)
+# elif USE_POSIX_THREADS
+#  define lock_define(name) pthread_mutex_t name;
+# elif USE_PTH_THREADS
+#  define lock_define(name) pth_mutex_t name;
+# elif USE_SOLARIS_THREADS
+#  define lock_define(name) mutex_t name;
+# elif USE_WINDOWS_THREADS
+#  define lock_define(name) gl_lock_t name;
+# else
+#  define lock_define(name)
+# endif
+# define lock_init(lock) glthread_lock_init (&(lock))
+# define lock_fini(lock) glthread_lock_destroy (&(lock))
+# define lock_lock(lock) glthread_lock_lock (&(lock))
+# define lock_unlock(lock) glthread_lock_unlock (&(lock))
+#elif defined GNULIB_PTHREAD && !defined USE_UNLOCKED_IO
+# include <pthread.h>
+# define lock_define(name) pthread_mutex_t name;
+# define lock_init(lock) pthread_mutex_init (&(lock), 0)
+# define lock_fini(lock) pthread_mutex_destroy (&(lock))
+# define lock_lock(lock) pthread_mutex_lock (&(lock))
+# define lock_unlock(lock) pthread_mutex_unlock (&(lock))
 #else
-# define __libc_lock_init(NAME) do { } while (0)
-# define __libc_lock_lock(NAME) do { } while (0)
-# define __libc_lock_unlock(NAME) do { } while (0)
+# define lock_define(name)
+# define lock_init(lock) 0
+# define lock_fini(lock) ((void) 0)
+  /* The 'dfa' avoids an "unused variable 'dfa'" warning from GCC.  */
+# define lock_lock(lock) ((void) dfa)
+# define lock_unlock(lock) ((void) 0)
 #endif
 
 /* In case that the system doesn't have isblank().  */
@@ -72,7 +110,7 @@
 # define gettext_noop(String) String
 #endif
 
-#if (defined MB_CUR_MAX && HAVE_WCTYPE_H && HAVE_ISWCTYPE && HAVE_WCSCOLL) || _LIBC
+#if (defined MB_CUR_MAX && HAVE_WCTYPE_H && HAVE_ISWCTYPE) || _LIBC
 # define RE_ENABLE_I18N
 #endif
 
@@ -107,10 +145,8 @@
 # define attribute_hidden
 #endif /* not _LIBC */
 
-#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
-# define __attribute(arg) __attribute__ (arg)
-#else
-# define __attribute(arg)
+#if __GNUC__ < 3 + (__GNUC_MINOR__ < 1)
+# define __attribute__(arg)
 #endif
 
 typedef __re_idx_t Idx;
@@ -426,7 +462,7 @@ static void build_upper_buffer (re_string_t *pstr) internal_function;
 static void re_string_translate_buffer (re_string_t *pstr) internal_function;
 static unsigned int re_string_context_at (const re_string_t *input, Idx idx,
 					  int eflags)
-     internal_function __attribute ((pure));
+     internal_function __attribute__ ((pure));
 #endif
 #define re_string_peek_byte(pstr, offset) \
   ((pstr)->mbs[(pstr)->cur_idx + offset])
@@ -700,9 +736,7 @@ struct re_dfa_t
 #ifdef DEBUG
   char* re_str;
 #endif
-#ifdef _LIBC
-  __libc_lock_define (, lock)
-#endif
+  lock_define (lock)
 };
 
 #define re_node_set_init_empty(set) memset (set, '\0', sizeof (re_node_set))
@@ -774,7 +808,7 @@ bitset_copy (bitset_t dest, const bitset_t src)
   memcpy (dest, src, sizeof (bitset_t));
 }
 
-static void
+static void __attribute__ ((unused))
 bitset_not (bitset_t set)
 {
   int bitset_i;
@@ -786,7 +820,7 @@ bitset_not (bitset_t set)
        & ~set[BITSET_WORDS - 1]);
 }
 
-static void
+static void __attribute__ ((unused))
 bitset_merge (bitset_t dest, const bitset_t src)
 {
   int bitset_i;
@@ -794,7 +828,7 @@ bitset_merge (bitset_t dest, const bitset_t src)
     dest[bitset_i] |= src[bitset_i];
 }
 
-static void
+static void __attribute__ ((unused))
 bitset_mask (bitset_t dest, const bitset_t src)
 {
   int bitset_i;
@@ -805,7 +839,7 @@ bitset_mask (bitset_t dest, const bitset_t src)
 #ifdef RE_ENABLE_I18N
 /* Functions for re_string.  */
 static int
-internal_function __attribute ((pure))
+internal_function __attribute__ ((pure, unused))
 re_string_char_size_at (const re_string_t *pstr, Idx idx)
 {
   int byte_idx;
@@ -818,7 +852,7 @@ re_string_char_size_at (const re_string_t *pstr, Idx idx)
 }
 
 static wint_t
-internal_function __attribute ((pure))
+internal_function __attribute__ ((pure, unused))
 re_string_wchar_at (const re_string_t *pstr, Idx idx)
 {
   if (pstr->mb_cur_max == 1)
@@ -828,7 +862,7 @@ re_string_wchar_at (const re_string_t *pstr, Idx idx)
 
 # ifndef NOT_IN_libc
 static int
-internal_function __attribute ((pure))
+internal_function __attribute__ ((pure, unused))
 re_string_elem_size_at (const re_string_t *pstr _UNUSED_PARAMETER_,
 			Idx idx _UNUSED_PARAMETER_)
 {
diff --git a/lib/regexec.c b/lib/regexec.c
index 6be6d7e4..fc05e925 100644
--- a/lib/regexec.c
+++ b/lib/regexec.c
@@ -1,5 +1,5 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002-2014 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
@@ -230,9 +230,7 @@ regexec (preg, string, nmatch, pmatch, eflags)
 {
   reg_errcode_t err;
   Idx start, length;
-#ifdef _LIBC
   re_dfa_t *dfa = preg->buffer;
-#endif
 
   if (eflags & ~(REG_NOTBOL | REG_NOTEOL | REG_STARTEND))
     return REG_BADPAT;
@@ -248,14 +246,14 @@ regexec (preg, string, nmatch, pmatch, eflags)
       length = strlen (string);
     }
 
-  __libc_lock_lock (dfa->lock);
+  lock_lock (dfa->lock);
   if (preg->no_sub)
     err = re_search_internal (preg, string, length, start, length,
 			      length, 0, NULL, eflags);
   else
     err = re_search_internal (preg, string, length, start, length,
 			      length, nmatch, pmatch, eflags);
-  __libc_lock_unlock (dfa->lock);
+  lock_unlock (dfa->lock);
   return err != REG_NOERROR;
 }
 
@@ -426,9 +424,7 @@ re_search_stub (struct re_pattern_buffer *bufp,
   Idx nregs;
   regoff_t rval;
   int eflags = 0;
-#ifdef _LIBC
   re_dfa_t *dfa = bufp->buffer;
-#endif
   Idx last_start = start + range;
 
   /* Check for out-of-range.  */
@@ -442,7 +438,7 @@ re_search_stub (struct re_pattern_buffer *bufp,
   else if (BE (/* last_start < 0 || */ (range < 0 && start <= last_start), 0))
     last_start = 0;
 
-  __libc_lock_lock (dfa->lock);
+  lock_lock (dfa->lock);
 
   eflags |= (bufp->not_bol) ? REG_NOTBOL : 0;
   eflags |= (bufp->not_eol) ? REG_NOTEOL : 0;
@@ -506,7 +502,7 @@ re_search_stub (struct re_pattern_buffer *bufp,
     }
   re_free (pmatch);
  out:
-  __libc_lock_unlock (dfa->lock);
+  lock_unlock (dfa->lock);
   return rval;
 }
 
@@ -1072,7 +1068,7 @@ prune_impossible_nodes (re_match_context_t *mctx)
    since initial states may have constraints like "\<", "^", etc..  */
 
 static inline re_dfastate_t *
-__attribute ((always_inline)) internal_function
+__attribute__ ((always_inline)) internal_function
 acquire_init_state_context (reg_errcode_t *err, const re_match_context_t *mctx,
 			    Idx idx)
 {
diff --git a/lib/remove.c b/lib/remove.c
index 020fdab8..15d762dd 100644
--- a/lib/remove.c
+++ b/lib/remove.c
@@ -1,5 +1,5 @@
 /* Remove a file or directory.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/rename.c b/lib/rename.c
index 3e463ea8..608f8387 100644
--- a/lib/rename.c
+++ b/lib/rename.c
@@ -1,6 +1,6 @@
 /* Work around rename bugs in some systems.
 
-   Copyright (C) 2001-2003, 2005-2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2006, 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -285,7 +285,7 @@ rpl_rename (char const *src, char const *dst)
   char *dst_temp = (char *) dst;
   bool src_slash;
   bool dst_slash;
-  bool dst_exists;
+  bool dst_exists _GL_UNUSED;
   int ret_val = -1;
   int rename_errno = ENOTDIR;
   struct stat src_st;
@@ -462,7 +462,9 @@ rpl_rename (char const *src, char const *dst)
 
   ret_val = rename (src_temp, dst_temp);
   rename_errno = errno;
- out:
+
+ out: _GL_UNUSED_LABEL;
+
   if (src_temp != src)
     free (src_temp);
   if (dst_temp != dst)
diff --git a/lib/rewinddir.c b/lib/rewinddir.c
index d842f8ce..d201ffa0 100644
--- a/lib/rewinddir.c
+++ b/lib/rewinddir.c
@@ -1,5 +1,5 @@
 /* Restart reading the entries of a directory from the beginning.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/rmdir.c b/lib/rmdir.c
index a8d907eb..ec7a586f 100644
--- a/lib/rmdir.c
+++ b/lib/rmdir.c
@@ -1,6 +1,6 @@
 /* Work around rmdir bugs.
 
-   Copyright (C) 1988, 1990, 1999, 2003-2006, 2009-2013 Free Software
+   Copyright (C) 1988, 1990, 1999, 2003-2006, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/root-dev-ino.c b/lib/root-dev-ino.c
index 96e3a624..3a4ec67c 100644
--- a/lib/root-dev-ino.c
+++ b/lib/root-dev-ino.c
@@ -1,5 +1,5 @@
 /* root-dev-ino.c -- get the device and inode numbers for '/'.
-   Copyright (C) 2003-2013 Free Software Foundation, Inc.
+   Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/root-dev-ino.h b/lib/root-dev-ino.h
index 1a0f8ff4..60232083 100644
--- a/lib/root-dev-ino.h
+++ b/lib/root-dev-ino.h
@@ -1,6 +1,6 @@
 /* Root device and inode number checking.
 
-   Copyright (C) 2003-2013 Free Software Foundation, Inc.
+   Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/root-uid.h b/lib/root-uid.h
index c75d8889..39e3c995 100644
--- a/lib/root-uid.h
+++ b/lib/root-uid.h
@@ -1,6 +1,6 @@
 /* The user ID that always has appropriate privileges in the POSIX sense.
 
-   Copyright 2012-2013 Free Software Foundation, Inc.
+   Copyright 2012-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/rpmatch.c b/lib/rpmatch.c
index cf125238..44810820 100644
--- a/lib/rpmatch.c
+++ b/lib/rpmatch.c
@@ -1,7 +1,7 @@
 /* Determine whether string value is affirmation or negative response
    according to current locale's data.
 
-   Copyright (C) 1996, 1998, 2000, 2002-2003, 2006-2013 Free Software
+   Copyright (C) 1996, 1998, 2000, 2002-2003, 2006-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -110,7 +110,10 @@ try (const char *response, const char *pattern, char **lastp, regex_t *re)
         return -1;
       /* Compile the pattern and cache it for future runs.  */
       if (regcomp (re, safe_pattern, REG_EXTENDED) != 0)
-        return -1;
+        {
+          free (safe_pattern);
+          return -1;
+        }
       *lastp = safe_pattern;
     }
 
diff --git a/lib/safe-read.c b/lib/safe-read.c
index 6a48c0cc..c9b8828a 100644
--- a/lib/safe-read.c
+++ b/lib/safe-read.c
@@ -1,6 +1,6 @@
 /* An interface to read and write that retries after interrupts.
 
-   Copyright (C) 1993-1994, 1998, 2002-2006, 2009-2013 Free Software
+   Copyright (C) 1993-1994, 1998, 2002-2006, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/safe-read.h b/lib/safe-read.h
index 992b7a6a..aba8bdb3 100644
--- a/lib/safe-read.h
+++ b/lib/safe-read.h
@@ -1,5 +1,5 @@
 /* An interface to read() that retries after interrupts.
-   Copyright (C) 2002, 2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/safe-write.c b/lib/safe-write.c
index fed363ce..bf72dd4d 100644
--- a/lib/safe-write.c
+++ b/lib/safe-write.c
@@ -1,5 +1,5 @@
 /* An interface to write that retries after interrupts.
-   Copyright (C) 2002, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/safe-write.h b/lib/safe-write.h
index 30f6e799..ae186572 100644
--- a/lib/safe-write.h
+++ b/lib/safe-write.h
@@ -1,5 +1,5 @@
 /* An interface to write() that retries after interrupts.
-   Copyright (C) 2002, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/same-inode.h b/lib/same-inode.h
index 3843b070..584f6065 100644
--- a/lib/same-inode.h
+++ b/lib/same-inode.h
@@ -1,6 +1,6 @@
 /* Determine whether two stat buffers refer to the same file.
 
-   Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/same.c b/lib/same.c
index 5457f218..5c00e8a3 100644
--- a/lib/same.c
+++ b/lib/same.c
@@ -1,6 +1,6 @@
 /* Determine whether two file names refer to the same file.
 
-   Copyright (C) 1997-2000, 2002-2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 1997-2000, 2002-2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/same.h b/lib/same.h
index 9a686060..5f5c0059 100644
--- a/lib/same.h
+++ b/lib/same.h
@@ -1,6 +1,6 @@
 /* Determine whether two file names refer to the same file.
 
-   Copyright (C) 1997-2000, 2003-2004, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 1997-2000, 2003-2004, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/save-cwd.c b/lib/save-cwd.c
index 9ae37b08..7aafacd4 100644
--- a/lib/save-cwd.c
+++ b/lib/save-cwd.c
@@ -1,6 +1,6 @@
 /* save-cwd.c -- Save and restore current working directory.
 
-   Copyright (C) 1995, 1997-1998, 2003-2006, 2009-2013 Free Software
+   Copyright (C) 1995, 1997-1998, 2003-2006, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/save-cwd.h b/lib/save-cwd.h
index 614b035e..6b84e460 100644
--- a/lib/save-cwd.h
+++ b/lib/save-cwd.h
@@ -1,6 +1,6 @@
 /* Save and restore current working directory.
 
-   Copyright (C) 1995, 1997-1998, 2003, 2009-2013 Free Software Foundation,
+   Copyright (C) 1995, 1997-1998, 2003, 2009-2014 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/savedir.c b/lib/savedir.c
index 6d5ed7f4..111d84be 100644
--- a/lib/savedir.c
+++ b/lib/savedir.c
@@ -1,6 +1,6 @@
 /* savedir.c -- save the list of files in a directory in a string
 
-   Copyright (C) 1990, 1997-2001, 2003-2006, 2009-2013 Free Software
+   Copyright (C) 1990, 1997-2001, 2003-2006, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -37,29 +37,71 @@
 
 #include "xalloc.h"
 
-#ifndef NAME_SIZE_DEFAULT
-# define NAME_SIZE_DEFAULT 512
+typedef struct
+{
+  char *name;
+#if D_INO_IN_DIRENT
+  ino_t ino;
+#endif
+} direntry_t;
+
+/* Compare the names of two directory entries */
+
+static int
+direntry_cmp_name (void const *a, void const *b)
+{
+  direntry_t const *dea = a;
+  direntry_t const *deb = b;
+
+  return strcmp (dea->name, deb->name);
+}
+
+#if D_INO_IN_DIRENT
+/* Compare the inode numbers of two directory entries */
+
+static int
+direntry_cmp_inode (void const *a, void const *b)
+{
+  direntry_t const *dea = a;
+  direntry_t const *deb = b;
+
+  return dea->ino < deb->ino ? -1 : dea->ino > deb->ino;
+}
 #endif
 
+typedef int (*comparison_function) (void const *, void const *);
+
+static comparison_function const comparison_function_table[] =
+  {
+    0,
+    direntry_cmp_name
+#if D_INO_IN_DIRENT
+    , direntry_cmp_inode
+#endif
+  };
+
 /* Return a freshly allocated string containing the file names
    in directory DIRP, separated by '\0' characters;
    the end is marked by two '\0' characters in a row.
+   Returned values are sorted according to OPTION.
    Return NULL (setting errno) if DIRP cannot be read.
    If DIRP is NULL, return NULL without affecting errno.  */
 
 char *
-streamsavedir (DIR *dirp)
+streamsavedir (DIR *dirp, enum savedir_option option)
 {
-  char *name_space;
-  size_t allocated = NAME_SIZE_DEFAULT;
+  char *name_space = NULL;
+  size_t allocated = 0;
+  direntry_t *entries = NULL;
+  size_t entries_allocated = 0;
+  size_t entries_used = 0;
   size_t used = 0;
-  int save_errno;
+  int readdir_errno;
+  comparison_function cmp = comparison_function_table[option];
 
   if (dirp == NULL)
     return NULL;
 
-  name_space = xmalloc (allocated);
-
   for (;;)
     {
       struct dirent const *dp;
@@ -76,48 +118,64 @@ streamsavedir (DIR *dirp)
       if (entry[entry[0] != '.' ? 0 : entry[1] != '.' ? 1 : 2] != '\0')
         {
           size_t entry_size = _D_EXACT_NAMLEN (dp) + 1;
-          if (used + entry_size < used)
-            xalloc_die ();
-          if (allocated <= used + entry_size)
+          if (cmp)
+            {
+              if (entries_allocated == entries_used)
+                {
+                  size_t n = entries_allocated;
+                  entries = x2nrealloc (entries, &n, sizeof *entries);
+                  entries_allocated = n;
+                }
+              entries[entries_used].name = xstrdup (entry);
+#if D_INO_IN_DIRENT
+              entries[entries_used].ino = dp->d_ino;
+#endif
+              entries_used++;
+            }
+          else
             {
-              do
+              if (allocated - used <= entry_size)
                 {
-                  if (2 * allocated < allocated)
+                  size_t n = used + entry_size;
+                  if (n < used)
                     xalloc_die ();
-                  allocated *= 2;
+                  name_space = x2nrealloc (name_space, &n, 1);
+                  allocated = n;
                 }
-              while (allocated <= used + entry_size);
-
-              name_space = xrealloc (name_space, allocated);
+              memcpy (name_space + used, entry, entry_size);
             }
-          memcpy (name_space + used, entry, entry_size);
           used += entry_size;
         }
     }
-  name_space[used] = '\0';
-  save_errno = errno;
-  if (save_errno != 0)
+
+  readdir_errno = errno;
+  if (readdir_errno != 0)
     {
+      free (entries);
       free (name_space);
-      errno = save_errno;
+      errno = readdir_errno;
       return NULL;
     }
-  return name_space;
-}
-
-/* Like streamsavedir (DIRP), except also close DIRP.  */
 
-static char *
-savedirstream (DIR *dirp)
-{
-  char *name_space = streamsavedir (dirp);
-  if (dirp && closedir (dirp) != 0)
+  if (cmp)
     {
-      int save_errno = errno;
-      free (name_space);
-      errno = save_errno;
-      return NULL;
+      size_t i;
+
+      qsort (entries, entries_used, sizeof *entries, cmp);
+      name_space = xmalloc (used + 1);
+      used = 0;
+      for (i = 0; i < entries_used; i++)
+        {
+          char *dest = name_space + used;
+          used += stpcpy (dest, entries[i].name) - dest + 1;
+          free (entries[i].name);
+        }
+      free (entries);
     }
+  else if (used == allocated)
+    name_space = xrealloc (name_space, used + 1);
+
+  name_space[used] = '\0';
   return name_space;
 }
 
@@ -127,19 +185,21 @@ savedirstream (DIR *dirp)
    Return NULL (setting errno) if DIR cannot be opened, read, or closed.  */
 
 char *
-savedir (char const *dir)
+savedir (char const *dir, enum savedir_option option)
 {
-  return savedirstream (opendir (dir));
-}
-
-/* Return a freshly allocated string containing the file names
-   in directory FD, separated by '\0' characters;
-   the end is marked by two '\0' characters in a row.
-   Return NULL (setting errno) if FD cannot be read or closed.  */
-
-/* deprecated */
-char *
-fdsavedir (int fd)
-{
-  return savedirstream (fdopendir (fd));
+  DIR *dirp = opendir (dir);
+  if (! dirp)
+    return NULL;
+  else
+    {
+      char *name_space = streamsavedir (dirp, option);
+      if (closedir (dirp) != 0)
+        {
+          int closedir_errno = errno;
+          free (name_space);
+          errno = closedir_errno;
+          return NULL;
+        }
+      return name_space;
+    }
 }
diff --git a/lib/savedir.h b/lib/savedir.h
index eedb0c45..aff4ad99 100644
--- a/lib/savedir.h
+++ b/lib/savedir.h
@@ -1,6 +1,6 @@
 /* Save the list of files in a directory in a string.
 
-   Copyright (C) 1997, 1999, 2001, 2003, 2005, 2009-2013 Free Software
+   Copyright (C) 1997, 1999, 2001, 2003, 2005, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -22,8 +22,20 @@
 #define _GL_SAVEDIR_H
 
 #include <dirent.h>
-char *streamsavedir (DIR *dirp);
-char *savedir (char const *dir);
-char *fdsavedir (int fd); /* deprecated */
+
+enum savedir_option
+  {
+    SAVEDIR_SORT_NONE,
+    SAVEDIR_SORT_NAME,
+#if D_INO_IN_DIRENT
+    SAVEDIR_SORT_INODE,
+    SAVEDIR_SORT_FASTREAD = SAVEDIR_SORT_INODE
+#else
+    SAVEDIR_SORT_FASTREAD = SAVEDIR_SORT_NONE
+#endif
+  };
+
+char *streamsavedir (DIR *, enum savedir_option);
+char *savedir (char const *, enum savedir_option);
 
 #endif
diff --git a/lib/savewd.c b/lib/savewd.c
index 728bc8a7..88c5feff 100644
--- a/lib/savewd.c
+++ b/lib/savewd.c
@@ -1,6 +1,6 @@
 /* Save and restore the working directory, possibly using a child process.
 
-   Copyright (C) 2006-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/savewd.h b/lib/savewd.h
index 61912bc9..cd0817b7 100644
--- a/lib/savewd.h
+++ b/lib/savewd.h
@@ -1,6 +1,6 @@
 /* Save and restore the working directory, possibly using a subprocess.
 
-   Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -23,6 +23,9 @@
 #include <stdbool.h>
 #include <sys/types.h>
 
+#ifndef _GL_INLINE_HEADER_BEGIN
+ #error "Please include config.h first."
+#endif
 _GL_INLINE_HEADER_BEGIN
 #ifndef SAVEWD_INLINE
 # define SAVEWD_INLINE _GL_INLINE
diff --git a/lib/sched.in.h b/lib/sched.in.h
index 731e800f..edebf810 100644
--- a/lib/sched.in.h
+++ b/lib/sched.in.h
@@ -1,5 +1,5 @@
 /* Replacement <sched.h> for platforms that lack it.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/se-context.in.h b/lib/se-context.in.h
index a692f5a0..c3890a2b 100644
--- a/lib/se-context.in.h
+++ b/lib/se-context.in.h
@@ -3,6 +3,9 @@
 
 # include <errno.h>
 
+#ifndef _GL_INLINE_HEADER_BEGIN
+ #error "Please include config.h first."
+#endif
 _GL_INLINE_HEADER_BEGIN
 #ifndef SE_CONTEXT_INLINE
 # define SE_CONTEXT_INLINE _GL_INLINE
@@ -29,6 +32,14 @@ SE_CONTEXT_INLINE int context_range_set (context_t sc _GL_UNUSED_PARAMETER,
 SE_CONTEXT_INLINE int context_type_set (context_t sc _GL_UNUSED_PARAMETER,
                                         char const *s _GL_UNUSED_PARAMETER)
   { errno = ENOTSUP; return -1; }
+SE_CONTEXT_INLINE char *context_type_get (context_t sc _GL_UNUSED_PARAMETER)
+  { errno = ENOTSUP; return (void *) 0; }
+SE_CONTEXT_INLINE char *context_range_get (context_t sc _GL_UNUSED_PARAMETER)
+  { errno = ENOTSUP; return (void *) 0; }
+SE_CONTEXT_INLINE char *context_role_get (context_t sc _GL_UNUSED_PARAMETER)
+  { errno = ENOTSUP; return (void *) 0; }
+SE_CONTEXT_INLINE char *context_user_get (context_t sc _GL_UNUSED_PARAMETER)
+  { errno = ENOTSUP; return (void *) 0; }
 
 _GL_INLINE_HEADER_END
 
diff --git a/lib/se-selinux.in.h b/lib/se-selinux.in.h
index 7f54f1e9..5eb92a20 100644
--- a/lib/se-selinux.in.h
+++ b/lib/se-selinux.in.h
@@ -1,5 +1,5 @@
 /* Replacement <selinux/selinux.h> for platforms that lack it.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
@@ -31,6 +31,9 @@
 #  include <sys/types.h>
 #  include <errno.h>
 
+#ifndef _GL_INLINE_HEADER_BEGIN
+ #error "Please include config.h first."
+#endif
 _GL_INLINE_HEADER_BEGIN
 #  ifndef SE_SELINUX_INLINE
 #   define SE_SELINUX_INLINE _GL_INLINE
@@ -41,7 +44,7 @@ _GL_INLINE_HEADER_BEGIN
 #  if !GNULIB_defined_security_types
 
 typedef unsigned short security_class_t;
-#   define security_context_t char*
+typedef char *security_context_t;
 #   define is_selinux_enabled() 0
 
 SE_SELINUX_INLINE int
@@ -100,6 +103,9 @@ security_compute_create (security_context_t scon _GL_UNUSED_PARAMETER,
                          security_class_t tclass _GL_UNUSED_PARAMETER,
                          security_context_t *newcon _GL_UNUSED_PARAMETER)
   { errno = ENOTSUP; return -1; }
+SE_SELINUX_INLINE security_class_t
+string_to_security_class (char const *name)
+  { errno = ENOTSUP; return 0; }
 SE_SELINUX_INLINE int
 matchpathcon_init_prefix (char const *path _GL_UNUSED_PARAMETER,
                           char const *prefix _GL_UNUSED_PARAMETER)
@@ -108,6 +114,9 @@ matchpathcon_init_prefix (char const *path _GL_UNUSED_PARAMETER,
 #   define GNULIB_defined_security_types 1
 #  endif
 
+#ifndef _GL_INLINE_HEADER_BEGIN
+ #error "Please include config.h first."
+#endif
 _GL_INLINE_HEADER_BEGIN
 
 # endif
diff --git a/lib/secure_getenv.c b/lib/secure_getenv.c
new file mode 100644
index 00000000..32819e6d
--- /dev/null
+++ b/lib/secure_getenv.c
@@ -0,0 +1,41 @@
+/* Look up an environment variable more securely.
+
+   Copyright 2013-2014 Free Software Foundation, Inc.
+
+   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 3 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/>.  */
+
+#include <config.h>
+
+#include <stdlib.h>
+
+#if !HAVE___SECURE_GETENV
+# if HAVE_ISSETUGID
+#  include <unistd.h>
+# else
+#  undef issetugid
+#  define issetugid() 1
+# endif
+#endif
+
+char *
+secure_getenv (char const *name)
+{
+#if HAVE___SECURE_GETENV
+  return __secure_getenv (name);
+#else
+  if (issetugid ())
+    return 0;
+  return getenv (name);
+#endif
+}
diff --git a/lib/select.c b/lib/select.c
index c02558e1..81af82cd 100644
--- a/lib/select.c
+++ b/lib/select.c
@@ -1,7 +1,7 @@
 /* Emulation for select(2)
    Contributed by Paolo Bonzini.
 
-   Copyright 2008-2013 Free Software Foundation, Inc.
+   Copyright 2008-2014 Free Software Foundation, Inc.
 
    This file is part of gnulib.
 
@@ -82,9 +82,11 @@ typedef DWORD (WINAPI *PNtQueryInformationFile)
 #define PIPE_BUF        512
 #endif
 
-/* Optimized test whether a HANDLE refers to a console.
-   See <http://lists.gnu.org/archive/html/bug-gnulib/2009-08/msg00065.html>.  */
-#define IsConsoleHandle(h) (((intptr_t) (h) & 3) == 3)
+static BOOL IsConsoleHandle (HANDLE h)
+{
+  DWORD mode;
+  return GetConsoleMode (h, &mode) != 0;
+}
 
 static BOOL
 IsSocketHandle (HANDLE h)
@@ -252,6 +254,7 @@ rpl_select (int nfds, fd_set *rfds, fd_set *wfds, fd_set *xfds,
   DWORD ret, wait_timeout, nhandles, nsock, nbuffer;
   MSG msg;
   int i, fd, rc;
+  clock_t tend;
 
   if (nfds > FD_SETSIZE)
     nfds = FD_SETSIZE;
@@ -388,6 +391,10 @@ rpl_select (int nfds, fd_set *rfds, fd_set *wfds, fd_set *xfds,
   /* Place a sentinel at the end of the array.  */
   handle_array[nhandles] = NULL;
 
+  /* When will the waiting period expire?  */
+  if (wait_timeout != INFINITE)
+    tend = clock () + wait_timeout;
+
 restart:
   if (wait_timeout == 0 || nsock == 0)
     rc = 0;
@@ -408,6 +415,16 @@ restart:
         wait_timeout = 0;
     }
 
+  /* How much is left to wait?  */
+  if (wait_timeout != INFINITE)
+    {
+      clock_t tnow = clock ();
+      if (tend >= tnow)
+        wait_timeout = tend - tnow;
+      else
+        wait_timeout = 0;
+    }
+
   for (;;)
     {
       ret = MsgWaitForMultipleObjects (nhandles, handle_array, FALSE,
@@ -453,7 +470,16 @@ restart:
             }
         }
 
-      if (rc == 0 && wait_timeout == INFINITE)
+      if (rc == 0
+          && (wait_timeout == INFINITE
+              /* If NHANDLES > 1, but no bits are set, it means we've
+                 been told incorrectly that some handle was signaled.
+                 This happens with anonymous pipes, which always cause
+                 MsgWaitForMultipleObjects to exit immediately, but no
+                 data is found ready to be read by windows_poll_handle.
+                 To avoid a total failure (whereby we return zero and
+                 don't wait at all), let's poll in a more busy loop.  */
+              || (wait_timeout != 0 && nhandles > 1)))
         {
           /* Sleep 1 millisecond to avoid busy wait and retry with the
              original fd_sets.  */
@@ -463,6 +489,8 @@ restart:
           SleepEx (1, TRUE);
           goto restart;
         }
+      if (timeout && wait_timeout == 0 && rc == 0)
+        timeout->tv_sec = timeout->tv_usec = 0;
     }
 
   /* Now fill in the results.  */
diff --git a/lib/selinux-at.c b/lib/selinux-at.c
index 386763f7..d2032c07 100644
--- a/lib/selinux-at.c
+++ b/lib/selinux-at.c
@@ -1,5 +1,5 @@
 /* openat-style fd-relative functions for SE Linux
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -26,7 +26,6 @@
 #include <errno.h>
 #include <fcntl.h>
 
-#include "dirname.h" /* solely for definition of IS_ABSOLUTE_FILE_NAME */
 #include "save-cwd.h"
 
 #include "openat-priv.h"
diff --git a/lib/selinux-at.h b/lib/selinux-at.h
index a01ffeb6..e65687e8 100644
--- a/lib/selinux-at.h
+++ b/lib/selinux-at.h
@@ -1,5 +1,5 @@
 /* Prototypes for openat-style fd-relative SELinux functions
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/set-acl.c b/lib/set-acl.c
new file mode 100644
index 00000000..9807f107
--- /dev/null
+++ b/lib/set-acl.c
@@ -0,0 +1,48 @@
+/* set-acl.c - set access control list equivalent to a mode
+
+   Copyright (C) 2002-2003, 2005-2014 Free Software Foundation, Inc.
+
+   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 3 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/>.
+
+   Written by Paul Eggert and Andreas Gruenbacher, and Bruno Haible.  */
+
+#include <config.h>
+
+#include "acl.h"
+
+#include <errno.h>
+
+#include "quote.h"
+#include "error.h"
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
+
+/* Set the access control lists of a file. If DESC is a valid file
+   descriptor, use file descriptor operations where available, else use
+   filename based operations on NAME.  If access control lists are not
+   available, fchmod the target file to MODE.  Also sets the
+   non-permission bits of the destination file (S_ISUID, S_ISGID, S_ISVTX)
+   to those from MODE if any are set.
+   Return 0 if successful.  On failure, output a diagnostic, set errno and
+   return -1.  */
+
+int
+set_acl (char const *name, int desc, mode_t mode)
+{
+  int ret = qset_acl (name, desc, mode);
+  if (ret != 0)
+    error (0, errno, _("setting permissions for %s"), quote (name));
+  return ret;
+}
diff --git a/lib/setenv.c b/lib/setenv.c
index d7851a8b..06791a90 100644
--- a/lib/setenv.c
+++ b/lib/setenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1995-2003, 2005-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995-2003, 2005-2014 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
@@ -15,14 +15,14 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #if !_LIBC
+/* Don't use __attribute__ __nonnull__ in this compilation unit.  Otherwise gcc
+   optimizes away the name == NULL test below.  */
+# define _GL_ARG_NONNULL(params)
+
 # define _GL_USE_STDLIB_ALLOC 1
 # include <config.h>
 #endif
 
-/* Don't use __attribute__ __nonnull__ in this compilation unit.  Otherwise gcc
-   optimizes away the name == NULL test below.  */
-#define _GL_ARG_NONNULL(params)
-
 #include <alloca.h>
 
 /* Specification.  */
diff --git a/lib/settime.c b/lib/settime.c
index a61333f2..135c9a38 100644
--- a/lib/settime.c
+++ b/lib/settime.c
@@ -1,6 +1,6 @@
 /* settime -- set the system clock
 
-   Copyright (C) 2002, 2004-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004-2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/sha1.c b/lib/sha1.c
index 778389af..0ea35b08 100644
--- a/lib/sha1.c
+++ b/lib/sha1.c
@@ -1,7 +1,7 @@
 /* sha1.c - Functions to compute SHA1 message digest of files or
    memory blocks according to the NIST specification FIPS-180-1.
 
-   Copyright (C) 2000-2001, 2003-2006, 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2000-2001, 2003-2006, 2008-2014 Free Software Foundation, Inc.
 
    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
@@ -23,6 +23,9 @@
 
 #include <config.h>
 
+#if HAVE_OPENSSL_SHA1
+# define GL_OPENSSL_INLINE _GL_EXTERN_INLINE
+#endif
 #include "sha1.h"
 
 #include <stdalign.h>
@@ -46,6 +49,7 @@
 # error "invalid BLOCKSIZE"
 #endif
 
+#if ! HAVE_OPENSSL_SHA1
 /* This array contains the bytes used to pad the buffer to the next
    64-byte boundary.  (RFC 1321, 3.1: Step 1)  */
 static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ...  */ };
@@ -116,6 +120,7 @@ sha1_finish_ctx (struct sha1_ctx *ctx, void *resbuf)
 
   return sha1_read_ctx (ctx, resbuf);
 }
+#endif
 
 /* Compute SHA1 message digest for bytes read from STREAM.  The
    resulting message digest number will be written into the 16 bytes
@@ -190,6 +195,7 @@ sha1_stream (FILE *stream, void *resblock)
   return 0;
 }
 
+#if ! HAVE_OPENSSL_SHA1
 /* Compute SHA1 message digest for LEN bytes beginning at BUFFER.  The
    result is always in little endian byte order, so that a byte-wise
    output yields to the wanted ASCII representation of the message
@@ -424,3 +430,4 @@ sha1_process_block (const void *buffer, size_t len, struct sha1_ctx *ctx)
       e = ctx->E += e;
     }
 }
+#endif
diff --git a/lib/sha1.h b/lib/sha1.h
index ddd386f9..4fd7d668 100644
--- a/lib/sha1.h
+++ b/lib/sha1.h
@@ -1,6 +1,6 @@
 /* Declarations of functions and data types used for SHA1 sum
    library functions.
-   Copyright (C) 2000-2001, 2003, 2005-2006, 2008-2013 Free Software
+   Copyright (C) 2000-2001, 2003, 2005-2006, 2008-2014 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
@@ -22,12 +22,20 @@
 # include <stdio.h>
 # include <stdint.h>
 
+# if HAVE_OPENSSL_SHA1
+#  include <openssl/sha.h>
+# endif
+
 # ifdef __cplusplus
 extern "C" {
 # endif
 
 #define SHA1_DIGEST_SIZE 20
 
+# if HAVE_OPENSSL_SHA1
+#  define GL_OPENSSL_NAME 1
+#  include "gl_openssl.h"
+# else
 /* Structure to save state of computation between the single steps.  */
 struct sha1_ctx
 {
@@ -42,7 +50,6 @@ struct sha1_ctx
   uint32_t buffer[32];
 };
 
-
 /* Initialize structure containing state of computation. */
 extern void sha1_init_ctx (struct sha1_ctx *ctx);
 
@@ -73,17 +80,19 @@ extern void *sha1_finish_ctx (struct sha1_ctx *ctx, void *resbuf);
 extern void *sha1_read_ctx (const struct sha1_ctx *ctx, void *resbuf);
 
 
-/* Compute SHA1 message digest for bytes read from STREAM.  The
-   resulting message digest number will be written into the 20 bytes
-   beginning at RESBLOCK.  */
-extern int sha1_stream (FILE *stream, void *resblock);
-
 /* Compute SHA1 message digest for LEN bytes beginning at BUFFER.  The
    result is always in little endian byte order, so that a byte-wise
    output yields to the wanted ASCII representation of the message
    digest.  */
 extern void *sha1_buffer (const char *buffer, size_t len, void *resblock);
 
+# endif
+/* Compute SHA1 message digest for bytes read from STREAM.  The
+   resulting message digest number will be written into the 20 bytes
+   beginning at RESBLOCK.  */
+extern int sha1_stream (FILE *stream, void *resblock);
+
+
 # ifdef __cplusplus
 }
 # endif
diff --git a/lib/sha256.c b/lib/sha256.c
index 4b2cee37..a07e4f9f 100644
--- a/lib/sha256.c
+++ b/lib/sha256.c
@@ -1,7 +1,7 @@
 /* sha256.c - Functions to compute SHA256 and SHA224 message digest of files or
    memory blocks according to the NIST specification FIPS-180-2.
 
-   Copyright (C) 2005-2006, 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2008-2014 Free Software Foundation, Inc.
 
    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
@@ -22,6 +22,9 @@
 
 #include <config.h>
 
+#if HAVE_OPENSSL_SHA256
+# define GL_OPENSSL_INLINE _GL_EXTERN_INLINE
+#endif
 #include "sha256.h"
 
 #include <stdalign.h>
@@ -45,6 +48,7 @@
 # error "invalid BLOCKSIZE"
 #endif
 
+#if ! HAVE_OPENSSL_SHA256
 /* This array contains the bytes used to pad the buffer to the next
    64-byte boundary.  */
 static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ...  */ };
@@ -163,6 +167,7 @@ sha224_finish_ctx (struct sha256_ctx *ctx, void *resbuf)
   sha256_conclude_ctx (ctx);
   return sha224_read_ctx (ctx, resbuf);
 }
+#endif
 
 /* Compute SHA256 message digest for bytes read from STREAM.  The
    resulting message digest number will be written into the 32 bytes
@@ -308,6 +313,7 @@ sha224_stream (FILE *stream, void *resblock)
   return 0;
 }
 
+#if ! HAVE_OPENSSL_SHA256
 /* Compute SHA512 message digest for LEN bytes beginning at BUFFER.  The
    result is always in little endian byte order, so that a byte-wise
    output yields to the wanted ASCII representation of the message
@@ -567,3 +573,4 @@ sha256_process_block (const void *buffer, size_t len, struct sha256_ctx *ctx)
       h = ctx->state[7] += h;
     }
 }
+#endif
diff --git a/lib/sha256.h b/lib/sha256.h
index 7e625228..92c0b955 100644
--- a/lib/sha256.h
+++ b/lib/sha256.h
@@ -1,6 +1,6 @@
 /* Declarations of functions and data types used for SHA256 and SHA224 sum
    library functions.
-   Copyright (C) 2005-2006, 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2008-2014 Free Software Foundation, Inc.
 
    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
@@ -21,10 +21,23 @@
 # include <stdio.h>
 # include <stdint.h>
 
+# if HAVE_OPENSSL_SHA256
+#  include <openssl/sha.h>
+# endif
+
 # ifdef __cplusplus
 extern "C" {
 # endif
 
+enum { SHA224_DIGEST_SIZE = 224 / 8 };
+enum { SHA256_DIGEST_SIZE = 256 / 8 };
+
+# if HAVE_OPENSSL_SHA256
+#  define GL_OPENSSL_NAME 224
+#  include "gl_openssl.h"
+#  define GL_OPENSSL_NAME 256
+#  include "gl_openssl.h"
+# else
 /* Structure to save state of computation between the single steps.  */
 struct sha256_ctx
 {
@@ -35,9 +48,6 @@ struct sha256_ctx
   uint32_t buffer[32];
 };
 
-enum { SHA224_DIGEST_SIZE = 224 / 8 };
-enum { SHA256_DIGEST_SIZE = 256 / 8 };
-
 /* Initialize structure containing state of computation. */
 extern void sha256_init_ctx (struct sha256_ctx *ctx);
 extern void sha224_init_ctx (struct sha256_ctx *ctx);
@@ -71,12 +81,6 @@ extern void *sha256_read_ctx (const struct sha256_ctx *ctx, void *resbuf);
 extern void *sha224_read_ctx (const struct sha256_ctx *ctx, void *resbuf);
 
 
-/* Compute SHA256 (SHA224) message digest for bytes read from STREAM.  The
-   resulting message digest number will be written into the 32 (28) bytes
-   beginning at RESBLOCK.  */
-extern int sha256_stream (FILE *stream, void *resblock);
-extern int sha224_stream (FILE *stream, void *resblock);
-
 /* Compute SHA256 (SHA224) message digest for LEN bytes beginning at BUFFER.  The
    result is always in little endian byte order, so that a byte-wise
    output yields to the wanted ASCII representation of the message
@@ -84,6 +88,14 @@ extern int sha224_stream (FILE *stream, void *resblock);
 extern void *sha256_buffer (const char *buffer, size_t len, void *resblock);
 extern void *sha224_buffer (const char *buffer, size_t len, void *resblock);
 
+# endif
+/* Compute SHA256 (SHA224) message digest for bytes read from STREAM.  The
+   resulting message digest number will be written into the 32 (28) bytes
+   beginning at RESBLOCK.  */
+extern int sha256_stream (FILE *stream, void *resblock);
+extern int sha224_stream (FILE *stream, void *resblock);
+
+
 # ifdef __cplusplus
 }
 # endif
diff --git a/lib/sha512.c b/lib/sha512.c
index 79f11257..5d3a1725 100644
--- a/lib/sha512.c
+++ b/lib/sha512.c
@@ -1,7 +1,7 @@
 /* sha512.c - Functions to compute SHA512 and SHA384 message digest of files or
    memory blocks according to the NIST specification FIPS-180-2.
 
-   Copyright (C) 2005-2006, 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2008-2014 Free Software Foundation, Inc.
 
    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
@@ -22,6 +22,9 @@
 
 #include <config.h>
 
+#if HAVE_OPENSSL_SHA512
+# define GL_OPENSSL_INLINE _GL_EXTERN_INLINE
+#endif
 #include "sha512.h"
 
 #include <stdalign.h>
@@ -52,6 +55,7 @@
 # error "invalid BLOCKSIZE"
 #endif
 
+#if ! HAVE_OPENSSL_SHA512
 /* This array contains the bytes used to pad the buffer to the next
    128-byte boundary.  */
 static const unsigned char fillbuf[128] = { 0x80, 0 /* , 0, 0, ...  */ };
@@ -171,6 +175,7 @@ sha384_finish_ctx (struct sha512_ctx *ctx, void *resbuf)
   sha512_conclude_ctx (ctx);
   return sha384_read_ctx (ctx, resbuf);
 }
+#endif
 
 /* Compute SHA512 message digest for bytes read from STREAM.  The
    resulting message digest number will be written into the 64 bytes
@@ -316,6 +321,7 @@ sha384_stream (FILE *stream, void *resblock)
   return 0;
 }
 
+#if ! HAVE_OPENSSL_SHA512
 /* Compute SHA512 message digest for LEN bytes beginning at BUFFER.  The
    result is always in little endian byte order, so that a byte-wise
    output yields to the wanted ASCII representation of the message
@@ -619,3 +625,4 @@ sha512_process_block (const void *buffer, size_t len, struct sha512_ctx *ctx)
       h = ctx->state[7] = u64plus (ctx->state[7], h);
     }
 }
+#endif
diff --git a/lib/sha512.h b/lib/sha512.h
index 2e78a5f9..17aeea6c 100644
--- a/lib/sha512.h
+++ b/lib/sha512.h
@@ -1,6 +1,6 @@
 /* Declarations of functions and data types used for SHA512 and SHA384 sum
    library functions.
-   Copyright (C) 2005-2006, 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2008-2014 Free Software Foundation, Inc.
 
    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
@@ -19,13 +19,25 @@
 # define SHA512_H 1
 
 # include <stdio.h>
-
 # include "u64.h"
 
+# if HAVE_OPENSSL_SHA512
+#  include <openssl/sha.h>
+# endif
+
 # ifdef __cplusplus
 extern "C" {
 # endif
 
+enum { SHA384_DIGEST_SIZE = 384 / 8 };
+enum { SHA512_DIGEST_SIZE = 512 / 8 };
+
+# if HAVE_OPENSSL_SHA512
+#  define GL_OPENSSL_NAME 384
+#  include "gl_openssl.h"
+#  define GL_OPENSSL_NAME 512
+#  include "gl_openssl.h"
+# else
 /* Structure to save state of computation between the single steps.  */
 struct sha512_ctx
 {
@@ -36,9 +48,6 @@ struct sha512_ctx
   u64 buffer[32];
 };
 
-enum { SHA384_DIGEST_SIZE = 384 / 8 };
-enum { SHA512_DIGEST_SIZE = 512 / 8 };
-
 /* Initialize structure containing state of computation. */
 extern void sha512_init_ctx (struct sha512_ctx *ctx);
 extern void sha384_init_ctx (struct sha512_ctx *ctx);
@@ -75,12 +84,6 @@ extern void *sha512_read_ctx (const struct sha512_ctx *ctx, void *resbuf);
 extern void *sha384_read_ctx (const struct sha512_ctx *ctx, void *resbuf);
 
 
-/* Compute SHA512 (SHA384) message digest for bytes read from STREAM.  The
-   resulting message digest number will be written into the 64 (48) bytes
-   beginning at RESBLOCK.  */
-extern int sha512_stream (FILE *stream, void *resblock);
-extern int sha384_stream (FILE *stream, void *resblock);
-
 /* Compute SHA512 (SHA384) message digest for LEN bytes beginning at BUFFER.  The
    result is always in little endian byte order, so that a byte-wise
    output yields to the wanted ASCII representation of the message
@@ -88,6 +91,14 @@ extern int sha384_stream (FILE *stream, void *resblock);
 extern void *sha512_buffer (const char *buffer, size_t len, void *resblock);
 extern void *sha384_buffer (const char *buffer, size_t len, void *resblock);
 
+# endif
+/* Compute SHA512 (SHA384) message digest for bytes read from STREAM.  The
+   resulting message digest number will be written into the 64 (48) bytes
+   beginning at RESBLOCK.  */
+extern int sha512_stream (FILE *stream, void *resblock);
+extern int sha384_stream (FILE *stream, void *resblock);
+
+
 # ifdef __cplusplus
 }
 # endif
diff --git a/lib/sig-handler.h b/lib/sig-handler.h
index ca9f979c..f4fe7eca 100644
--- a/lib/sig-handler.h
+++ b/lib/sig-handler.h
@@ -1,6 +1,6 @@
 /* Convenience declarations when working with <signal.h>.
 
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
@@ -20,6 +20,9 @@
 
 #include <signal.h>
 
+#ifndef _GL_INLINE_HEADER_BEGIN
+ #error "Please include config.h first."
+#endif
 _GL_INLINE_HEADER_BEGIN
 #ifndef SIG_HANDLER_INLINE
 # define SIG_HANDLER_INLINE _GL_INLINE
diff --git a/lib/sig2str.c b/lib/sig2str.c
index 8b36e2fa..119006af 100644
--- a/lib/sig2str.c
+++ b/lib/sig2str.c
@@ -1,6 +1,6 @@
 /* sig2str.c -- convert between signal names and numbers
 
-   Copyright (C) 2002, 2004, 2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2006, 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -325,21 +325,25 @@ sig2str (int signum, char *signame)
   {
     int rtmin = SIGRTMIN;
     int rtmax = SIGRTMAX;
+    int base, delta;
 
     if (! (rtmin <= signum && signum <= rtmax))
       return -1;
 
     if (signum <= rtmin + (rtmax - rtmin) / 2)
       {
-        int delta = signum - rtmin;
-        sprintf (signame, delta ? "RTMIN+%d" : "RTMIN", delta);
+        strcpy (signame, "RTMIN");
+        base = rtmin;
       }
     else
       {
-        int delta = rtmax - signum;
-        sprintf (signame, delta ? "RTMAX-%d" : "RTMAX", delta);
+        strcpy (signame, "RTMAX");
+        base = rtmax;
       }
 
+    delta = signum - base;
+    if (delta != 0)
+      sprintf (signame + 5, "%+d", delta);
     return 0;
   }
 }
diff --git a/lib/sig2str.h b/lib/sig2str.h
index d16be98c..fc90b720 100644
--- a/lib/sig2str.h
+++ b/lib/sig2str.h
@@ -1,6 +1,6 @@
 /* sig2str.h -- convert between signal names and numbers
 
-   Copyright (C) 2002, 2005, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005, 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -27,9 +27,17 @@
 /* Size of a buffer needed to hold a signal name like "HUP".  */
 # define SIG2STR_MAX (sizeof "SIGRTMAX" + INT_STRLEN_BOUND (int) - 1)
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 int sig2str (int, char *);
 int str2sig (char const *, int *);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 
 /* An upper bound on signal numbers allowed by the system.  */
diff --git a/lib/sigaction.c b/lib/sigaction.c
index 97eb76d9..c56ca460 100644
--- a/lib/sigaction.c
+++ b/lib/sigaction.c
@@ -1,5 +1,5 @@
 /* POSIX compatible signal blocking.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
    Written by Eric Blake <ebb9@byu.net>, 2008.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/siglist.h b/lib/siglist.h
index 7817c95b..7b682ff3 100644
--- a/lib/siglist.h
+++ b/lib/siglist.h
@@ -1,5 +1,5 @@
 /* Canonical list of all signal names.
-   Copyright (C) 1996-1999, 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 1996-1999, 2008-2014 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/signal.in.h b/lib/signal.in.h
index 54849504..925e16f2 100644
--- a/lib/signal.in.h
+++ b/lib/signal.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <signal.h>.
 
-   Copyright (C) 2006-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
    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
@@ -195,6 +195,20 @@ typedef int verify_NSIG_constraint[NSIG <= 32 ? 1 : -1];
 
 # endif
 
+/* When also using extern inline, suppress the use of static inline in
+   standard headers of problematic Apple configurations, as Libc at
+   least through Libc-825.26 (2013-04-09) mishandles it; see, e.g.,
+   <http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html>.
+   Perhaps Apple will fix this some day.  */
+#if (defined _GL_EXTERN_INLINE_IN_USE && defined __APPLE__ \
+     && (defined __i386__ || defined __x86_64__))
+# undef sigaddset
+# undef sigdelset
+# undef sigemptyset
+# undef sigfillset
+# undef sigismember
+#endif
+
 /* Test whether a given signal is contained in a signal set.  */
 # if @HAVE_POSIX_SIGNALBLOCKING@
 /* This function is defined as a macro on Mac OS X.  */
diff --git a/lib/signbitd.c b/lib/signbitd.c
index 7a434f8e..26f30d59 100644
--- a/lib/signbitd.c
+++ b/lib/signbitd.c
@@ -1,5 +1,5 @@
 /* signbit() macro: Determine the sign bit of a floating-point number.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/signbitf.c b/lib/signbitf.c
index f133be57..191deb91 100644
--- a/lib/signbitf.c
+++ b/lib/signbitf.c
@@ -1,5 +1,5 @@
 /* signbit() macro: Determine the sign bit of a floating-point number.
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/signbitl.c b/lib/signbitl.c
index 9e1e900e..9da26c6c 100644
--- a/lib/signbitl.c
+++ b/lib/signbitl.c
@@ -1,5 +1,5 @@
 /* signbit() macro: Determine the sign bit of a floating-point number.
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/sigprocmask.c b/lib/sigprocmask.c
index 8de3777d..506a51fe 100644
--- a/lib/sigprocmask.c
+++ b/lib/sigprocmask.c
@@ -1,5 +1,5 @@
 /* POSIX compatible signal blocking.
-   Copyright (C) 2006-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/size_max.h b/lib/size_max.h
index 5f331240..461ff1ca 100644
--- a/lib/size_max.h
+++ b/lib/size_max.h
@@ -1,5 +1,5 @@
 /* size_max.h -- declare SIZE_MAX through system headers
-   Copyright (C) 2005-2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc.
    Written by Simon Josefsson.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib/smack.h b/lib/smack.h
new file mode 100644
index 00000000..e1e8a842
--- /dev/null
+++ b/lib/smack.h
@@ -0,0 +1,46 @@
+/* Include and determine availability of smack routines
+   Copyright (C) 2013-2014 Free Software Foundation, Inc.
+
+   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 3 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/>.  */
+
+/* Here we replace or wrap the most common smack functions used by coreutils.
+   Others will need to be protected by HAVE_SMACK.  */
+
+#include <config.h>
+
+#ifdef HAVE_SMACK
+# include <sys/smack.h>
+#else
+static inline ssize_t
+smack_new_label_from_self (char **label)
+{
+  return -1;
+}
+
+static inline int
+smack_set_label_for_self (const char *label)
+{
+  return -1;
+}
+#endif
+
+static inline bool
+is_smack_enabled (void)
+{
+#ifdef HAVE_SMACK
+  return smack_smackfs_path () != NULL;
+#else
+  return false;
+#endif
+}
diff --git a/lib/snprintf.c b/lib/snprintf.c
index 9c4ab3f2..ea1321c4 100644
--- a/lib/snprintf.c
+++ b/lib/snprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 2004, 2006-2013 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006-2014 Free Software Foundation, Inc.
    Written by Simon Josefsson and Paul Eggert.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib/sockets.c b/lib/sockets.c
index ae961482..962c5785 100644
--- a/lib/sockets.c
+++ b/lib/sockets.c
@@ -1,6 +1,6 @@
 /* sockets.c --- wrappers for Windows socket functions
 
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/sockets.h b/lib/sockets.h
index 1570ad84..0bee1ddf 100644
--- a/lib/sockets.h
+++ b/lib/sockets.h
@@ -1,6 +1,6 @@
 /* sockets.h - wrappers for Windows socket functions
 
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/spawn-pipe.c b/lib/spawn-pipe.c
deleted file mode 100644
index 35567d4d..00000000
--- a/lib/spawn-pipe.c
+++ /dev/null
@@ -1,452 +0,0 @@
-/* Creation of subprocesses, communicating via pipes.
-   Copyright (C) 2001-2004, 2006-2013 Free Software Foundation, Inc.
-   Written by Bruno Haible <haible@clisp.cons.org>, 2001.
-
-   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 3 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/>.  */
-
-
-#include <config.h>
-
-/* Specification.  */
-#include "spawn-pipe.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <unistd.h>
-
-#include "error.h"
-#include "fatal-signal.h"
-#include "unistd-safer.h"
-#include "wait-process.h"
-#include "gettext.h"
-
-#define _(str) gettext (str)
-
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-
-/* Native Windows API.  */
-# include <process.h>
-# include "w32spawn.h"
-
-#else
-
-/* Unix API.  */
-# include <spawn.h>
-
-#endif
-
-/* The results of open() in this file are not used with fchdir,
-   therefore save some unnecessary work in fchdir.c.  */
-#undef open
-#undef close
-
-
-#ifdef EINTR
-
-/* EINTR handling for close().
-   These functions can return -1/EINTR even though we don't have any
-   signal handlers set up, namely when we get interrupted via SIGSTOP.  */
-
-static int
-nonintr_close (int fd)
-{
-  int retval;
-
-  do
-    retval = close (fd);
-  while (retval < 0 && errno == EINTR);
-
-  return retval;
-}
-#define close nonintr_close
-
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-static int
-nonintr_open (const char *pathname, int oflag, mode_t mode)
-{
-  int retval;
-
-  do
-    retval = open (pathname, oflag, mode);
-  while (retval < 0 && errno == EINTR);
-
-  return retval;
-}
-# undef open /* avoid warning on VMS */
-# define open nonintr_open
-#endif
-
-#endif
-
-
-/* Open a pipe connected to a child process.
- *
- *           write       system                read
- *    parent  ->   fd[1]   ->   STDIN_FILENO    ->   child       if pipe_stdin
- *    parent  <-   fd[0]   <-   STDOUT_FILENO   <-   child       if pipe_stdout
- *           read        system                write
- *
- * At least one of pipe_stdin, pipe_stdout must be true.
- * pipe_stdin and prog_stdin together determine the child's standard input.
- * pipe_stdout and prog_stdout together determine the child's standard output.
- * If pipe_stdin is true, prog_stdin is ignored.
- * If pipe_stdout is true, prog_stdout is ignored.
- */
-static pid_t
-create_pipe (const char *progname,
-             const char *prog_path, char **prog_argv,
-             bool pipe_stdin, bool pipe_stdout,
-             const char *prog_stdin, const char *prog_stdout,
-             bool null_stderr,
-             bool slave_process, bool exit_on_error,
-             int fd[2])
-{
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-
-  /* Native Windows API.
-     This uses _pipe(), dup2(), and spawnv().  It could also be implemented
-     using the low-level functions CreatePipe(), DuplicateHandle(),
-     CreateProcess() and _open_osfhandle(); see the GNU make and GNU clisp
-     and cvs source code.  */
-  int ifd[2];
-  int ofd[2];
-  int orig_stdin;
-  int orig_stdout;
-  int orig_stderr;
-  int child;
-  int nulloutfd;
-  int stdinfd;
-  int stdoutfd;
-  int saved_errno;
-
-  /* FIXME: Need to free memory allocated by prepare_spawn.  */
-  prog_argv = prepare_spawn (prog_argv);
-
-  if (pipe_stdout)
-    if (pipe2_safer (ifd, O_BINARY | O_CLOEXEC) < 0)
-      error (EXIT_FAILURE, errno, _("cannot create pipe"));
-  if (pipe_stdin)
-    if (pipe2_safer (ofd, O_BINARY | O_CLOEXEC) < 0)
-      error (EXIT_FAILURE, errno, _("cannot create pipe"));
-/* Data flow diagram:
- *
- *           write        system         read
- *    parent  ->   ofd[1]   ->   ofd[0]   ->   child       if pipe_stdin
- *    parent  <-   ifd[0]   <-   ifd[1]   <-   child       if pipe_stdout
- *           read         system         write
- *
- */
-
-  /* Save standard file handles of parent process.  */
-  if (pipe_stdin || prog_stdin != NULL)
-    orig_stdin = dup_safer_noinherit (STDIN_FILENO);
-  if (pipe_stdout || prog_stdout != NULL)
-    orig_stdout = dup_safer_noinherit (STDOUT_FILENO);
-  if (null_stderr)
-    orig_stderr = dup_safer_noinherit (STDERR_FILENO);
-  child = -1;
-
-  /* Create standard file handles of child process.  */
-  nulloutfd = -1;
-  stdinfd = -1;
-  stdoutfd = -1;
-  if ((!pipe_stdin || dup2 (ofd[0], STDIN_FILENO) >= 0)
-      && (!pipe_stdout || dup2 (ifd[1], STDOUT_FILENO) >= 0)
-      && (!null_stderr
-          || ((nulloutfd = open ("NUL", O_RDWR, 0)) >= 0
-              && (nulloutfd == STDERR_FILENO
-                  || (dup2 (nulloutfd, STDERR_FILENO) >= 0
-                      && close (nulloutfd) >= 0))))
-      && (pipe_stdin
-          || prog_stdin == NULL
-          || ((stdinfd = open (prog_stdin, O_RDONLY, 0)) >= 0
-              && (stdinfd == STDIN_FILENO
-                  || (dup2 (stdinfd, STDIN_FILENO) >= 0
-                      && close (stdinfd) >= 0))))
-      && (pipe_stdout
-          || prog_stdout == NULL
-          || ((stdoutfd = open (prog_stdout, O_WRONLY, 0)) >= 0
-              && (stdoutfd == STDOUT_FILENO
-                  || (dup2 (stdoutfd, STDOUT_FILENO) >= 0
-                      && close (stdoutfd) >= 0)))))
-    /* The child process doesn't inherit ifd[0], ifd[1], ofd[0], ofd[1],
-       but it inherits all open()ed or dup2()ed file handles (which is what
-       we want in the case of STD*_FILENO).  */
-    /* Use spawnvpe and pass the environment explicitly.  This is needed if
-       the program has modified the environment using putenv() or [un]setenv().
-       On Windows, programs have two environments, one in the "environment
-       block" of the process and managed through SetEnvironmentVariable(), and
-       one inside the process, in the location retrieved by the 'environ'
-       macro.  When using spawnvp() without 'e', the child process inherits a
-       copy of the environment block - ignoring the effects of putenv() and
-       [un]setenv().  */
-    {
-      child = spawnvpe (P_NOWAIT, prog_path, (const char **) prog_argv,
-                        (const char **) environ);
-      if (child < 0 && errno == ENOEXEC)
-        {
-          /* prog is not a native executable.  Try to execute it as a
-             shell script.  Note that prepare_spawn() has already prepended
-             a hidden element "sh.exe" to prog_argv.  */
-          --prog_argv;
-          child = spawnvpe (P_NOWAIT, prog_argv[0], (const char **) prog_argv,
-                            (const char **) environ);
-        }
-    }
-  if (child == -1)
-    saved_errno = errno;
-  if (stdinfd >= 0)
-    close (stdinfd);
-  if (stdoutfd >= 0)
-    close (stdoutfd);
-  if (nulloutfd >= 0)
-    close (nulloutfd);
-
-  /* Restore standard file handles of parent process.  */
-  if (null_stderr)
-    undup_safer_noinherit (orig_stderr, STDERR_FILENO);
-  if (pipe_stdout || prog_stdout != NULL)
-    undup_safer_noinherit (orig_stdout, STDOUT_FILENO);
-  if (pipe_stdin || prog_stdin != NULL)
-    undup_safer_noinherit (orig_stdin, STDIN_FILENO);
-
-  if (pipe_stdin)
-    close (ofd[0]);
-  if (pipe_stdout)
-    close (ifd[1]);
-  if (child == -1)
-    {
-      if (exit_on_error || !null_stderr)
-        error (exit_on_error ? EXIT_FAILURE : 0, saved_errno,
-               _("%s subprocess failed"), progname);
-      if (pipe_stdout)
-        close (ifd[0]);
-      if (pipe_stdin)
-        close (ofd[1]);
-      errno = saved_errno;
-      return -1;
-    }
-
-  if (pipe_stdout)
-    fd[0] = ifd[0];
-  if (pipe_stdin)
-    fd[1] = ofd[1];
-  return child;
-
-#else
-
-  /* Unix API.  */
-  int ifd[2];
-  int ofd[2];
-  sigset_t blocked_signals;
-  posix_spawn_file_actions_t actions;
-  bool actions_allocated;
-  posix_spawnattr_t attrs;
-  bool attrs_allocated;
-  int err;
-  pid_t child;
-
-  if (pipe_stdout)
-    if (pipe_safer (ifd) < 0)
-      error (EXIT_FAILURE, errno, _("cannot create pipe"));
-  if (pipe_stdin)
-    if (pipe_safer (ofd) < 0)
-      error (EXIT_FAILURE, errno, _("cannot create pipe"));
-/* Data flow diagram:
- *
- *           write        system         read
- *    parent  ->   ofd[1]   ->   ofd[0]   ->   child       if pipe_stdin
- *    parent  <-   ifd[0]   <-   ifd[1]   <-   child       if pipe_stdout
- *           read         system         write
- *
- */
-
-  if (slave_process)
-    {
-      sigprocmask (SIG_SETMASK, NULL, &blocked_signals);
-      block_fatal_signals ();
-    }
-  actions_allocated = false;
-  attrs_allocated = false;
-  if ((err = posix_spawn_file_actions_init (&actions)) != 0
-      || (actions_allocated = true,
-          (pipe_stdin
-           && (err = posix_spawn_file_actions_adddup2 (&actions,
-                                                       ofd[0], STDIN_FILENO))
-              != 0)
-          || (pipe_stdout
-              && (err = posix_spawn_file_actions_adddup2 (&actions,
-                                                          ifd[1], STDOUT_FILENO))
-                 != 0)
-          || (pipe_stdin
-              && (err = posix_spawn_file_actions_addclose (&actions, ofd[0]))
-                 != 0)
-          || (pipe_stdout
-              && (err = posix_spawn_file_actions_addclose (&actions, ifd[1]))
-                 != 0)
-          || (pipe_stdin
-              && (err = posix_spawn_file_actions_addclose (&actions, ofd[1]))
-                 != 0)
-          || (pipe_stdout
-              && (err = posix_spawn_file_actions_addclose (&actions, ifd[0]))
-                 != 0)
-          || (null_stderr
-              && (err = posix_spawn_file_actions_addopen (&actions,
-                                                          STDERR_FILENO,
-                                                          "/dev/null", O_RDWR,
-                                                          0))
-                 != 0)
-          || (!pipe_stdin
-              && prog_stdin != NULL
-              && (err = posix_spawn_file_actions_addopen (&actions,
-                                                          STDIN_FILENO,
-                                                          prog_stdin, O_RDONLY,
-                                                          0))
-                 != 0)
-          || (!pipe_stdout
-              && prog_stdout != NULL
-              && (err = posix_spawn_file_actions_addopen (&actions,
-                                                          STDOUT_FILENO,
-                                                          prog_stdout, O_WRONLY,
-                                                          0))
-                 != 0)
-          || (slave_process
-              && ((err = posix_spawnattr_init (&attrs)) != 0
-                  || (attrs_allocated = true,
-                      (err = posix_spawnattr_setsigmask (&attrs,
-                                                         &blocked_signals))
-                      != 0
-                      || (err = posix_spawnattr_setflags (&attrs,
-                                                        POSIX_SPAWN_SETSIGMASK))
-                         != 0)))
-          || (err = posix_spawnp (&child, prog_path, &actions,
-                                  attrs_allocated ? &attrs : NULL, prog_argv,
-                                  environ))
-             != 0))
-    {
-      if (actions_allocated)
-        posix_spawn_file_actions_destroy (&actions);
-      if (attrs_allocated)
-        posix_spawnattr_destroy (&attrs);
-      if (slave_process)
-        unblock_fatal_signals ();
-      if (exit_on_error || !null_stderr)
-        error (exit_on_error ? EXIT_FAILURE : 0, err,
-               _("%s subprocess failed"), progname);
-      if (pipe_stdout)
-        {
-          close (ifd[0]);
-          close (ifd[1]);
-        }
-      if (pipe_stdin)
-        {
-          close (ofd[0]);
-          close (ofd[1]);
-        }
-      errno = err;
-      return -1;
-    }
-  posix_spawn_file_actions_destroy (&actions);
-  if (attrs_allocated)
-    posix_spawnattr_destroy (&attrs);
-  if (slave_process)
-    {
-      register_slave_subprocess (child);
-      unblock_fatal_signals ();
-    }
-  if (pipe_stdin)
-    close (ofd[0]);
-  if (pipe_stdout)
-    close (ifd[1]);
-
-  if (pipe_stdout)
-    fd[0] = ifd[0];
-  if (pipe_stdin)
-    fd[1] = ofd[1];
-  return child;
-
-#endif
-}
-
-/* Open a bidirectional pipe.
- *
- *           write       system                read
- *    parent  ->   fd[1]   ->   STDIN_FILENO    ->   child
- *    parent  <-   fd[0]   <-   STDOUT_FILENO   <-   child
- *           read        system                write
- *
- */
-pid_t
-create_pipe_bidi (const char *progname,
-                  const char *prog_path, char **prog_argv,
-                  bool null_stderr,
-                  bool slave_process, bool exit_on_error,
-                  int fd[2])
-{
-  pid_t result = create_pipe (progname, prog_path, prog_argv,
-                              true, true, NULL, NULL,
-                              null_stderr, slave_process, exit_on_error,
-                              fd);
-  return result;
-}
-
-/* Open a pipe for input from a child process.
- * The child's stdin comes from a file.
- *
- *           read        system                write
- *    parent  <-   fd[0]   <-   STDOUT_FILENO   <-   child
- *
- */
-pid_t
-create_pipe_in (const char *progname,
-                const char *prog_path, char **prog_argv,
-                const char *prog_stdin, bool null_stderr,
-                bool slave_process, bool exit_on_error,
-                int fd[1])
-{
-  int iofd[2];
-  pid_t result = create_pipe (progname, prog_path, prog_argv,
-                              false, true, prog_stdin, NULL,
-                              null_stderr, slave_process, exit_on_error,
-                              iofd);
-  if (result != -1)
-    fd[0] = iofd[0];
-  return result;
-}
-
-/* Open a pipe for output to a child process.
- * The child's stdout goes to a file.
- *
- *           write       system                read
- *    parent  ->   fd[0]   ->   STDIN_FILENO    ->   child
- *
- */
-pid_t
-create_pipe_out (const char *progname,
-                 const char *prog_path, char **prog_argv,
-                 const char *prog_stdout, bool null_stderr,
-                 bool slave_process, bool exit_on_error,
-                 int fd[1])
-{
-  int iofd[2];
-  pid_t result = create_pipe (progname, prog_path, prog_argv,
-                              true, false, NULL, prog_stdout,
-                              null_stderr, slave_process, exit_on_error,
-                              iofd);
-  if (result != -1)
-    fd[0] = iofd[1];
-  return result;
-}
diff --git a/lib/spawn-pipe.h b/lib/spawn-pipe.h
deleted file mode 100644
index ea8284f2..00000000
--- a/lib/spawn-pipe.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/* Creation of subprocesses, communicating via pipes.
-   Copyright (C) 2001-2003, 2006, 2008-2013 Free Software Foundation, Inc.
-   Written by Bruno Haible <haible@clisp.cons.org>, 2001.
-
-   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 3 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/>.  */
-
-#ifndef _SPAWN_PIPE_H
-#define _SPAWN_PIPE_H
-
-/* Get pid_t.  */
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-
-#include <stdbool.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* All these functions create a subprocess and don't wait for its termination.
-   They return the process id of the subprocess.  They also return in fd[]
-   one or two file descriptors for communication with the subprocess.
-   If the subprocess creation fails: if exit_on_error is true, the main
-   process exits with an error message; otherwise, an error message is given
-   if null_stderr is false, then -1 is returned, with errno set, and fd[]
-   remain uninitialized.
-
-   After finishing communication, the caller should call wait_subprocess()
-   to get rid of the subprocess in the process table.
-
-   If slave_process is true, the child process will be terminated when its
-   creator receives a catchable fatal signal or exits normally.  If
-   slave_process is false, the child process will continue running in this
-   case, until it is lucky enough to attempt to communicate with its creator
-   and thus get a SIGPIPE signal.
-
-   If exit_on_error is false, a child process id of -1 should be treated the
-   same way as a subprocess which accepts no input, produces no output and
-   terminates with exit code 127.  Why?  Some errors during posix_spawnp()
-   cause the function posix_spawnp() to return an error code; some other
-   errors cause the subprocess to exit with return code 127.  It is
-   implementation dependent which error is reported which way.  The caller
-   must treat both cases as equivalent.
-
-   It is recommended that no signal is blocked or ignored (i.e. have a
-   signal handler with value SIG_IGN) while any of these functions is called.
-   The reason is that child processes inherit the mask of blocked signals
-   from their parent (both through posix_spawn() and fork()/exec());
-   likewise, signals ignored in the parent are also ignored in the child
-   (except possibly for SIGCHLD).  And POSIX:2001 says [in the description
-   of exec()]:
-       "it should be noted that many existing applications wrongly
-        assume that they start with certain signals set to the default
-        action and/or unblocked. In particular, applications written
-        with a simpler signal model that does not include blocking of
-        signals, such as the one in the ISO C standard, may not behave
-        properly if invoked with some signals blocked. Therefore, it is
-        best not to block or ignore signals across execs without explicit
-        reason to do so, and especially not to block signals across execs
-        of arbitrary (not closely co-operating) programs."  */
-
-/* Open a pipe for output to a child process.
- * The child's stdout goes to a file.
- *
- *           write       system                read
- *    parent  ->   fd[0]   ->   STDIN_FILENO    ->   child
- *
- * Note: When writing to a child process, it is useful to ignore the SIGPIPE
- * signal and the EPIPE error code.
- */
-extern pid_t create_pipe_out (const char *progname,
-                              const char *prog_path, char **prog_argv,
-                              const char *prog_stdout, bool null_stderr,
-                              bool slave_process, bool exit_on_error,
-                              int fd[1]);
-
-/* Open a pipe for input from a child process.
- * The child's stdin comes from a file.
- *
- *           read        system                write
- *    parent  <-   fd[0]   <-   STDOUT_FILENO   <-   child
- *
- */
-extern pid_t create_pipe_in (const char *progname,
-                             const char *prog_path, char **prog_argv,
-                             const char *prog_stdin, bool null_stderr,
-                             bool slave_process, bool exit_on_error,
-                             int fd[1]);
-
-/* Open a bidirectional pipe.
- *
- *           write       system                read
- *    parent  ->   fd[1]   ->   STDIN_FILENO    ->   child
- *    parent  <-   fd[0]   <-   STDOUT_FILENO   <-   child
- *           read        system                write
- *
- * Note: When writing to a child process, it is useful to ignore the SIGPIPE
- * signal and the EPIPE error code.
- *
- * Note: The parent process must be careful to avoid deadlock.
- * 1) If you write more than PIPE_MAX bytes or, more generally, if you write
- *    more bytes than the subprocess can handle at once, the subprocess
- *    may write its data and wait on you to read it, but you are currently
- *    busy writing.
- * 2) When you don't know ahead of time how many bytes the subprocess
- *    will produce, the usual technique of calling read (fd, buf, BUFSIZ)
- *    with a fixed BUFSIZ will, on Linux 2.2.17 and on BSD systems, cause
- *    the read() call to block until *all* of the buffer has been filled.
- *    But the subprocess cannot produce more data until you gave it more
- *    input.  But you are currently busy reading from it.
- */
-extern pid_t create_pipe_bidi (const char *progname,
-                               const char *prog_path, char **prog_argv,
-                               bool null_stderr,
-                               bool slave_process, bool exit_on_error,
-                               int fd[2]);
-
-/* The name of the "always silent" device.  */
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Native Windows API.  */
-# define DEV_NULL "NUL"
-#else
-/* Unix API.  */
-# define DEV_NULL "/dev/null"
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /* _SPAWN_PIPE_H */
diff --git a/lib/spawn.in.h b/lib/spawn.in.h
deleted file mode 100644
index bca29981..00000000
--- a/lib/spawn.in.h
+++ /dev/null
@@ -1,881 +0,0 @@
-/* Definitions for POSIX spawn interface.
-   Copyright (C) 2000, 2003-2004, 2008-2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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 3 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/>.  */
-
-#ifndef _@GUARD_PREFIX@_SPAWN_H
-
-#if __GNUC__ >= 3
-@PRAGMA_SYSTEM_HEADER@
-#endif
-@PRAGMA_COLUMNS@
-
-/* The include_next requires a split double-inclusion guard.  */
-#if @HAVE_SPAWN_H@
-# @INCLUDE_NEXT@ @NEXT_SPAWN_H@
-#endif
-
-#ifndef _@GUARD_PREFIX@_SPAWN_H
-#define _@GUARD_PREFIX@_SPAWN_H
-
-/* Get definitions of 'struct sched_param' and 'sigset_t'.
-   But avoid namespace pollution on glibc systems.  */
-#if !(defined __GLIBC__ && !defined __UCLIBC__)
-# include <sched.h>
-# include <signal.h>
-#endif
-
-#include <sys/types.h>
-
-#ifndef __THROW
-# define __THROW
-#endif
-
-/* GCC 2.95 and later have "__restrict"; C99 compilers have
-   "restrict", and "configure" may have defined "restrict".
-   Other compilers use __restrict, __restrict__, and _Restrict, and
-   'configure' might #define 'restrict' to those words, so pick a
-   different name.  */
-#ifndef _Restrict_
-# if 199901L <= __STDC_VERSION__
-#  define _Restrict_ restrict
-# elif 2 < __GNUC__ || (2 == __GNUC__ && 95 <= __GNUC_MINOR__)
-#  define _Restrict_ __restrict
-# else
-#  define _Restrict_
-# endif
-#endif
-/* gcc 3.1 and up support the [restrict] syntax.  Don't trust
-   sys/cdefs.h's definition of __restrict_arr, though, as it
-   mishandles gcc -ansi -pedantic.  */
-#ifndef _Restrict_arr_
-# if ((199901L <= __STDC_VERSION__                                      \
-       || ((3 < __GNUC__ || (3 == __GNUC__ && 1 <= __GNUC_MINOR__))     \
-           && !defined __STRICT_ANSI__))                                        \
-      && !defined __GNUG__)
-#  define _Restrict_arr_ _Restrict_
-# else
-#  define _Restrict_arr_
-# endif
-#endif
-
-/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
-
-/* The definition of _GL_ARG_NONNULL is copied here.  */
-
-/* The definition of _GL_WARN_ON_USE is copied here.  */
-
-
-/* Data structure to contain attributes for thread creation.  */
-#if @REPLACE_POSIX_SPAWN@
-# define posix_spawnattr_t rpl_posix_spawnattr_t
-#endif
-#if @REPLACE_POSIX_SPAWN@ || !@HAVE_POSIX_SPAWNATTR_T@
-# if !GNULIB_defined_posix_spawnattr_t
-typedef struct
-{
-  short int _flags;
-  pid_t _pgrp;
-  sigset_t _sd;
-  sigset_t _ss;
-  struct sched_param _sp;
-  int _policy;
-  int __pad[16];
-} posix_spawnattr_t;
-#  define GNULIB_defined_posix_spawnattr_t 1
-# endif
-#endif
-
-
-/* Data structure to contain information about the actions to be
-   performed in the new process with respect to file descriptors.  */
-#if @REPLACE_POSIX_SPAWN@
-# define posix_spawn_file_actions_t rpl_posix_spawn_file_actions_t
-#endif
-#if @REPLACE_POSIX_SPAWN@ || !@HAVE_POSIX_SPAWN_FILE_ACTIONS_T@
-# if !GNULIB_defined_posix_spawn_file_actions_t
-typedef struct
-{
-  int _allocated;
-  int _used;
-  struct __spawn_action *_actions;
-  int __pad[16];
-} posix_spawn_file_actions_t;
-#  define GNULIB_defined_posix_spawn_file_actions_t 1
-# endif
-#endif
-
-
-/* Flags to be set in the 'posix_spawnattr_t'.  */
-#if @HAVE_POSIX_SPAWN@
-/* Use the values from the system, but provide the missing ones.  */
-# ifndef POSIX_SPAWN_SETSCHEDPARAM
-#  define POSIX_SPAWN_SETSCHEDPARAM 0
-# endif
-# ifndef POSIX_SPAWN_SETSCHEDULER
-#  define POSIX_SPAWN_SETSCHEDULER 0
-# endif
-#else
-# if @REPLACE_POSIX_SPAWN@
-/* Use the values from the system, for better compatibility.  */
-/* But this implementation does not support AIX extensions.  */
-#  undef POSIX_SPAWN_FORK_HANDLERS
-# else
-#  define POSIX_SPAWN_RESETIDS           0x01
-#  define POSIX_SPAWN_SETPGROUP          0x02
-#  define POSIX_SPAWN_SETSIGDEF          0x04
-#  define POSIX_SPAWN_SETSIGMASK         0x08
-#  define POSIX_SPAWN_SETSCHEDPARAM      0x10
-#  define POSIX_SPAWN_SETSCHEDULER       0x20
-# endif
-#endif
-/* A GNU extension.  Use the next free bit position.  */
-#define POSIX_SPAWN_USEVFORK \
-  ((POSIX_SPAWN_RESETIDS | (POSIX_SPAWN_RESETIDS - 1)                     \
-    | POSIX_SPAWN_SETPGROUP | (POSIX_SPAWN_SETPGROUP - 1)                 \
-    | POSIX_SPAWN_SETSIGDEF | (POSIX_SPAWN_SETSIGDEF - 1)                 \
-    | POSIX_SPAWN_SETSIGMASK | (POSIX_SPAWN_SETSIGMASK - 1)               \
-    | POSIX_SPAWN_SETSCHEDPARAM                                           \
-    | (POSIX_SPAWN_SETSCHEDPARAM > 0 ? POSIX_SPAWN_SETSCHEDPARAM - 1 : 0) \
-    | POSIX_SPAWN_SETSCHEDULER                                            \
-    | (POSIX_SPAWN_SETSCHEDULER > 0 ? POSIX_SPAWN_SETSCHEDULER - 1 : 0))  \
-   + 1)
-#if !GNULIB_defined_verify_POSIX_SPAWN_USEVFORK_no_overlap
-typedef int verify_POSIX_SPAWN_USEVFORK_no_overlap
-            [(((POSIX_SPAWN_RESETIDS | POSIX_SPAWN_SETPGROUP
-                | POSIX_SPAWN_SETSIGDEF | POSIX_SPAWN_SETSIGMASK
-                | POSIX_SPAWN_SETSCHEDPARAM | POSIX_SPAWN_SETSCHEDULER)
-               & POSIX_SPAWN_USEVFORK)
-              == 0)
-             ? 1 : -1];
-# define GNULIB_defined_verify_POSIX_SPAWN_USEVFORK_no_overlap 1
-#endif
-
-
-#if @GNULIB_POSIX_SPAWN@
-/* Spawn a new process executing PATH with the attributes describes in *ATTRP.
-   Before running the process perform the actions described in FILE-ACTIONS.
-
-   This function is a possible cancellation points and therefore not
-   marked with __THROW. */
-# if @REPLACE_POSIX_SPAWN@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define posix_spawn rpl_posix_spawn
-#  endif
-_GL_FUNCDECL_RPL (posix_spawn, int,
-                  (pid_t *_Restrict_ __pid,
-                   const char *_Restrict_ __path,
-                   const posix_spawn_file_actions_t *_Restrict_ __file_actions,
-                   const posix_spawnattr_t *_Restrict_ __attrp,
-                   char *const argv[_Restrict_arr_],
-                   char *const envp[_Restrict_arr_])
-                  _GL_ARG_NONNULL ((2, 5, 6)));
-_GL_CXXALIAS_RPL (posix_spawn, int,
-                  (pid_t *_Restrict_ __pid,
-                   const char *_Restrict_ __path,
-                   const posix_spawn_file_actions_t *_Restrict_ __file_actions,
-                   const posix_spawnattr_t *_Restrict_ __attrp,
-                   char *const argv[_Restrict_arr_],
-                   char *const envp[_Restrict_arr_]));
-# else
-#  if !@HAVE_POSIX_SPAWN@
-_GL_FUNCDECL_SYS (posix_spawn, int,
-                  (pid_t *_Restrict_ __pid,
-                   const char *_Restrict_ __path,
-                   const posix_spawn_file_actions_t *_Restrict_ __file_actions,
-                   const posix_spawnattr_t *_Restrict_ __attrp,
-                   char *const argv[_Restrict_arr_],
-                   char *const envp[_Restrict_arr_])
-                  _GL_ARG_NONNULL ((2, 5, 6)));
-#  endif
-_GL_CXXALIAS_SYS (posix_spawn, int,
-                  (pid_t *_Restrict_ __pid,
-                   const char *_Restrict_ __path,
-                   const posix_spawn_file_actions_t *_Restrict_ __file_actions,
-                   const posix_spawnattr_t *_Restrict_ __attrp,
-                   char *const argv[_Restrict_arr_],
-                   char *const envp[_Restrict_arr_]));
-# endif
-_GL_CXXALIASWARN (posix_spawn);
-#elif defined GNULIB_POSIXCHECK
-# undef posix_spawn
-# if HAVE_RAW_DECL_POSIX_SPAWN
-_GL_WARN_ON_USE (posix_spawn, "posix_spawn is unportable - "
-                 "use gnulib module posix_spawn for portability");
-# endif
-#endif
-
-#if @GNULIB_POSIX_SPAWNP@
-/* Similar to 'posix_spawn' but search for FILE in the PATH.
-
-   This function is a possible cancellation points and therefore not
-   marked with __THROW.  */
-# if @REPLACE_POSIX_SPAWN@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define posix_spawnp rpl_posix_spawnp
-#  endif
-_GL_FUNCDECL_RPL (posix_spawnp, int,
-                  (pid_t *__pid, const char *__file,
-                   const posix_spawn_file_actions_t *__file_actions,
-                   const posix_spawnattr_t *__attrp,
-                   char *const argv[], char *const envp[])
-                  _GL_ARG_NONNULL ((2, 5, 6)));
-_GL_CXXALIAS_RPL (posix_spawnp, int,
-                  (pid_t *__pid, const char *__file,
-                   const posix_spawn_file_actions_t *__file_actions,
-                   const posix_spawnattr_t *__attrp,
-                   char *const argv[], char *const envp[]));
-# else
-#  if !@HAVE_POSIX_SPAWN@
-_GL_FUNCDECL_SYS (posix_spawnp, int,
-                  (pid_t *__pid, const char *__file,
-                   const posix_spawn_file_actions_t *__file_actions,
-                   const posix_spawnattr_t *__attrp,
-                   char *const argv[], char *const envp[])
-                  _GL_ARG_NONNULL ((2, 5, 6)));
-#  endif
-_GL_CXXALIAS_SYS (posix_spawnp, int,
-                  (pid_t *__pid, const char *__file,
-                   const posix_spawn_file_actions_t *__file_actions,
-                   const posix_spawnattr_t *__attrp,
-                   char *const argv[], char *const envp[]));
-# endif
-_GL_CXXALIASWARN (posix_spawnp);
-#elif defined GNULIB_POSIXCHECK
-# undef posix_spawnp
-# if HAVE_RAW_DECL_POSIX_SPAWNP
-_GL_WARN_ON_USE (posix_spawnp, "posix_spawnp is unportable - "
-                 "use gnulib module posix_spawnp for portability");
-# endif
-#endif
-
-
-#if @GNULIB_POSIX_SPAWNATTR_INIT@
-/* Initialize data structure with attributes for 'spawn' to default values.  */
-# if @REPLACE_POSIX_SPAWN@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define posix_spawnattr_init rpl_posix_spawnattr_init
-#  endif
-_GL_FUNCDECL_RPL (posix_spawnattr_init, int, (posix_spawnattr_t *__attr)
-                                             __THROW _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (posix_spawnattr_init, int, (posix_spawnattr_t *__attr));
-# else
-#  if !@HAVE_POSIX_SPAWN@
-_GL_FUNCDECL_SYS (posix_spawnattr_init, int, (posix_spawnattr_t *__attr)
-                                             __THROW _GL_ARG_NONNULL ((1)));
-#  endif
-_GL_CXXALIAS_SYS (posix_spawnattr_init, int, (posix_spawnattr_t *__attr));
-# endif
-_GL_CXXALIASWARN (posix_spawnattr_init);
-#elif defined GNULIB_POSIXCHECK
-# undef posix_spawnattr_init
-# if HAVE_RAW_DECL_POSIX_SPAWNATTR_INIT
-_GL_WARN_ON_USE (posix_spawnattr_init, "posix_spawnattr_init is unportable - "
-                 "use gnulib module posix_spawnattr_init for portability");
-# endif
-#endif
-
-#if @GNULIB_POSIX_SPAWNATTR_DESTROY@
-/* Free resources associated with ATTR.  */
-# if @REPLACE_POSIX_SPAWN@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define posix_spawnattr_destroy rpl_posix_spawnattr_destroy
-#  endif
-_GL_FUNCDECL_RPL (posix_spawnattr_destroy, int, (posix_spawnattr_t *__attr)
-                                                __THROW _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (posix_spawnattr_destroy, int, (posix_spawnattr_t *__attr));
-# else
-#  if !@HAVE_POSIX_SPAWN@
-_GL_FUNCDECL_SYS (posix_spawnattr_destroy, int, (posix_spawnattr_t *__attr)
-                                                __THROW _GL_ARG_NONNULL ((1)));
-#  endif
-_GL_CXXALIAS_SYS (posix_spawnattr_destroy, int, (posix_spawnattr_t *__attr));
-# endif
-_GL_CXXALIASWARN (posix_spawnattr_destroy);
-#elif defined GNULIB_POSIXCHECK
-# undef posix_spawnattr_destroy
-# if HAVE_RAW_DECL_POSIX_SPAWNATTR_DESTROY
-_GL_WARN_ON_USE (posix_spawnattr_destroy,
-                 "posix_spawnattr_destroy is unportable - "
-                 "use gnulib module posix_spawnattr_destroy for portability");
-# endif
-#endif
-
-#if @GNULIB_POSIX_SPAWNATTR_GETSIGDEFAULT@
-/* Store signal mask for signals with default handling from ATTR in
-   SIGDEFAULT.  */
-# if @REPLACE_POSIX_SPAWN@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define posix_spawnattr_getsigdefault rpl_posix_spawnattr_getsigdefault
-#  endif
-_GL_FUNCDECL_RPL (posix_spawnattr_getsigdefault, int,
-                  (const posix_spawnattr_t *_Restrict_ __attr,
-                   sigset_t *_Restrict_ __sigdefault)
-                  __THROW _GL_ARG_NONNULL ((1, 2)));
-_GL_CXXALIAS_RPL (posix_spawnattr_getsigdefault, int,
-                  (const posix_spawnattr_t *_Restrict_ __attr,
-                   sigset_t *_Restrict_ __sigdefault));
-# else
-#  if !@HAVE_POSIX_SPAWN@
-_GL_FUNCDECL_SYS (posix_spawnattr_getsigdefault, int,
-                  (const posix_spawnattr_t *_Restrict_ __attr,
-                   sigset_t *_Restrict_ __sigdefault)
-                  __THROW _GL_ARG_NONNULL ((1, 2)));
-#  endif
-_GL_CXXALIAS_SYS (posix_spawnattr_getsigdefault, int,
-                  (const posix_spawnattr_t *_Restrict_ __attr,
-                   sigset_t *_Restrict_ __sigdefault));
-# endif
-_GL_CXXALIASWARN (posix_spawnattr_getsigdefault);
-#elif defined GNULIB_POSIXCHECK
-# undef posix_spawnattr_getsigdefault
-# if HAVE_RAW_DECL_POSIX_SPAWNATTR_GETSIGDEFAULT
-_GL_WARN_ON_USE (posix_spawnattr_getsigdefault,
-                 "posix_spawnattr_getsigdefault is unportable - "
-                 "use gnulib module posix_spawnattr_getsigdefault for portability");
-# endif
-#endif
-
-#if @GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT@
-/* Set signal mask for signals with default handling in ATTR to SIGDEFAULT.  */
-# if @REPLACE_POSIX_SPAWN@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define posix_spawnattr_setsigdefault rpl_posix_spawnattr_setsigdefault
-#  endif
-_GL_FUNCDECL_RPL (posix_spawnattr_setsigdefault, int,
-                  (posix_spawnattr_t *_Restrict_ __attr,
-                   const sigset_t *_Restrict_ __sigdefault)
-                  __THROW _GL_ARG_NONNULL ((1, 2)));
-_GL_CXXALIAS_RPL (posix_spawnattr_setsigdefault, int,
-                  (posix_spawnattr_t *_Restrict_ __attr,
-                   const sigset_t *_Restrict_ __sigdefault));
-# else
-#  if !@HAVE_POSIX_SPAWN@
-_GL_FUNCDECL_SYS (posix_spawnattr_setsigdefault, int,
-                  (posix_spawnattr_t *_Restrict_ __attr,
-                   const sigset_t *_Restrict_ __sigdefault)
-                  __THROW _GL_ARG_NONNULL ((1, 2)));
-#  endif
-_GL_CXXALIAS_SYS (posix_spawnattr_setsigdefault, int,
-                  (posix_spawnattr_t *_Restrict_ __attr,
-                   const sigset_t *_Restrict_ __sigdefault));
-# endif
-_GL_CXXALIASWARN (posix_spawnattr_setsigdefault);
-#elif defined GNULIB_POSIXCHECK
-# undef posix_spawnattr_setsigdefault
-# if HAVE_RAW_DECL_POSIX_SPAWNATTR_SETSIGDEFAULT
-_GL_WARN_ON_USE (posix_spawnattr_setsigdefault,
-                 "posix_spawnattr_setsigdefault is unportable - "
-                 "use gnulib module posix_spawnattr_setsigdefault for portability");
-# endif
-#endif
-
-#if @GNULIB_POSIX_SPAWNATTR_GETSIGMASK@
-/* Store signal mask for the new process from ATTR in SIGMASK.  */
-# if @REPLACE_POSIX_SPAWN@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define posix_spawnattr_getsigmask rpl_posix_spawnattr_getsigmask
-#  endif
-_GL_FUNCDECL_RPL (posix_spawnattr_getsigmask, int,
-                  (const posix_spawnattr_t *_Restrict_ __attr,
-                   sigset_t *_Restrict_ __sigmask)
-                  __THROW _GL_ARG_NONNULL ((1, 2)));
-_GL_CXXALIAS_RPL (posix_spawnattr_getsigmask, int,
-                  (const posix_spawnattr_t *_Restrict_ __attr,
-                   sigset_t *_Restrict_ __sigmask));
-# else
-#  if !@HAVE_POSIX_SPAWN@
-_GL_FUNCDECL_SYS (posix_spawnattr_getsigmask, int,
-                  (const posix_spawnattr_t *_Restrict_ __attr,
-                   sigset_t *_Restrict_ __sigmask)
-                  __THROW _GL_ARG_NONNULL ((1, 2)));
-#  endif
-_GL_CXXALIAS_SYS (posix_spawnattr_getsigmask, int,
-                  (const posix_spawnattr_t *_Restrict_ __attr,
-                   sigset_t *_Restrict_ __sigmask));
-# endif
-_GL_CXXALIASWARN (posix_spawnattr_getsigmask);
-#elif defined GNULIB_POSIXCHECK
-# undef posix_spawnattr_getsigmask
-# if HAVE_RAW_DECL_POSIX_SPAWNATTR_GETSIGMASK
-_GL_WARN_ON_USE (posix_spawnattr_getsigmask,
-                 "posix_spawnattr_getsigmask is unportable - "
-                 "use gnulib module posix_spawnattr_getsigmask for portability");
-# endif
-#endif
-
-#if @GNULIB_POSIX_SPAWNATTR_SETSIGMASK@
-/* Set signal mask for the new process in ATTR to SIGMASK.  */
-# if @REPLACE_POSIX_SPAWN@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define posix_spawnattr_setsigmask rpl_posix_spawnattr_setsigmask
-#  endif
-_GL_FUNCDECL_RPL (posix_spawnattr_setsigmask, int,
-                  (posix_spawnattr_t *_Restrict_ __attr,
-                   const sigset_t *_Restrict_ __sigmask)
-                  __THROW _GL_ARG_NONNULL ((1, 2)));
-_GL_CXXALIAS_RPL (posix_spawnattr_setsigmask, int,
-                  (posix_spawnattr_t *_Restrict_ __attr,
-                   const sigset_t *_Restrict_ __sigmask));
-# else
-#  if !@HAVE_POSIX_SPAWN@
-_GL_FUNCDECL_SYS (posix_spawnattr_setsigmask, int,
-                  (posix_spawnattr_t *_Restrict_ __attr,
-                   const sigset_t *_Restrict_ __sigmask)
-                  __THROW _GL_ARG_NONNULL ((1, 2)));
-#  endif
-_GL_CXXALIAS_SYS (posix_spawnattr_setsigmask, int,
-                  (posix_spawnattr_t *_Restrict_ __attr,
-                   const sigset_t *_Restrict_ __sigmask));
-# endif
-_GL_CXXALIASWARN (posix_spawnattr_setsigmask);
-#elif defined GNULIB_POSIXCHECK
-# undef posix_spawnattr_setsigmask
-# if HAVE_RAW_DECL_POSIX_SPAWNATTR_SETSIGMASK
-_GL_WARN_ON_USE (posix_spawnattr_setsigmask,
-                 "posix_spawnattr_setsigmask is unportable - "
-                 "use gnulib module posix_spawnattr_setsigmask for portability");
-# endif
-#endif
-
-#if @GNULIB_POSIX_SPAWNATTR_GETFLAGS@
-/* Get flag word from the attribute structure.  */
-# if @REPLACE_POSIX_SPAWN@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define posix_spawnattr_getflags rpl_posix_spawnattr_getflags
-#  endif
-_GL_FUNCDECL_RPL (posix_spawnattr_getflags, int,
-                  (const posix_spawnattr_t *_Restrict_ __attr,
-                   short int *_Restrict_ __flags)
-                  __THROW _GL_ARG_NONNULL ((1, 2)));
-_GL_CXXALIAS_RPL (posix_spawnattr_getflags, int,
-                  (const posix_spawnattr_t *_Restrict_ __attr,
-                   short int *_Restrict_ __flags));
-# else
-#  if !@HAVE_POSIX_SPAWN@
-_GL_FUNCDECL_SYS (posix_spawnattr_getflags, int,
-                  (const posix_spawnattr_t *_Restrict_ __attr,
-                   short int *_Restrict_ __flags)
-                  __THROW _GL_ARG_NONNULL ((1, 2)));
-#  endif
-_GL_CXXALIAS_SYS (posix_spawnattr_getflags, int,
-                  (const posix_spawnattr_t *_Restrict_ __attr,
-                   short int *_Restrict_ __flags));
-# endif
-_GL_CXXALIASWARN (posix_spawnattr_getflags);
-#elif defined GNULIB_POSIXCHECK
-# undef posix_spawnattr_getflags
-# if HAVE_RAW_DECL_POSIX_SPAWNATTR_GETFLAGS
-_GL_WARN_ON_USE (posix_spawnattr_getflags,
-                 "posix_spawnattr_getflags is unportable - "
-                 "use gnulib module posix_spawnattr_getflags for portability");
-# endif
-#endif
-
-#if @GNULIB_POSIX_SPAWNATTR_SETFLAGS@
-/* Store flags in the attribute structure.  */
-# if @REPLACE_POSIX_SPAWN@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define posix_spawnattr_setflags rpl_posix_spawnattr_setflags
-#  endif
-_GL_FUNCDECL_RPL (posix_spawnattr_setflags, int,
-                  (posix_spawnattr_t *__attr, short int __flags)
-                  __THROW _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (posix_spawnattr_setflags, int,
-                  (posix_spawnattr_t *__attr, short int __flags));
-# else
-#  if !@HAVE_POSIX_SPAWN@
-_GL_FUNCDECL_SYS (posix_spawnattr_setflags, int,
-                  (posix_spawnattr_t *__attr, short int __flags)
-                  __THROW _GL_ARG_NONNULL ((1)));
-#  endif
-_GL_CXXALIAS_SYS (posix_spawnattr_setflags, int,
-                  (posix_spawnattr_t *__attr, short int __flags));
-# endif
-_GL_CXXALIASWARN (posix_spawnattr_setflags);
-#elif defined GNULIB_POSIXCHECK
-# undef posix_spawnattr_setflags
-# if HAVE_RAW_DECL_POSIX_SPAWNATTR_SETFLAGS
-_GL_WARN_ON_USE (posix_spawnattr_setflags,
-                 "posix_spawnattr_setflags is unportable - "
-                 "use gnulib module posix_spawnattr_setflags for portability");
-# endif
-#endif
-
-#if @GNULIB_POSIX_SPAWNATTR_GETPGROUP@
-/* Get process group ID from the attribute structure.  */
-# if @REPLACE_POSIX_SPAWN@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define posix_spawnattr_getpgroup rpl_posix_spawnattr_getpgroup
-#  endif
-_GL_FUNCDECL_RPL (posix_spawnattr_getpgroup, int,
-                  (const posix_spawnattr_t *_Restrict_ __attr,
-                   pid_t *_Restrict_ __pgroup)
-                  __THROW _GL_ARG_NONNULL ((1, 2)));
-_GL_CXXALIAS_RPL (posix_spawnattr_getpgroup, int,
-                  (const posix_spawnattr_t *_Restrict_ __attr,
-                   pid_t *_Restrict_ __pgroup));
-# else
-#  if !@HAVE_POSIX_SPAWN@
-_GL_FUNCDECL_SYS (posix_spawnattr_getpgroup, int,
-                  (const posix_spawnattr_t *_Restrict_ __attr,
-                   pid_t *_Restrict_ __pgroup)
-                  __THROW _GL_ARG_NONNULL ((1, 2)));
-#  endif
-_GL_CXXALIAS_SYS (posix_spawnattr_getpgroup, int,
-                  (const posix_spawnattr_t *_Restrict_ __attr,
-                   pid_t *_Restrict_ __pgroup));
-# endif
-_GL_CXXALIASWARN (posix_spawnattr_getpgroup);
-#elif defined GNULIB_POSIXCHECK
-# undef posix_spawnattr_getpgroup
-# if HAVE_RAW_DECL_POSIX_SPAWNATTR_GETPGROUP
-_GL_WARN_ON_USE (posix_spawnattr_getpgroup,
-                 "posix_spawnattr_getpgroup is unportable - "
-                 "use gnulib module posix_spawnattr_getpgroup for portability");
-# endif
-#endif
-
-#if @GNULIB_POSIX_SPAWNATTR_SETPGROUP@
-/* Store process group ID in the attribute structure.  */
-# if @REPLACE_POSIX_SPAWN@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define posix_spawnattr_setpgroup rpl_posix_spawnattr_setpgroup
-#  endif
-_GL_FUNCDECL_RPL (posix_spawnattr_setpgroup, int,
-                  (posix_spawnattr_t *__attr, pid_t __pgroup)
-                  __THROW _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (posix_spawnattr_setpgroup, int,
-                  (posix_spawnattr_t *__attr, pid_t __pgroup));
-# else
-#  if !@HAVE_POSIX_SPAWN@
-_GL_FUNCDECL_SYS (posix_spawnattr_setpgroup, int,
-                  (posix_spawnattr_t *__attr, pid_t __pgroup)
-                  __THROW _GL_ARG_NONNULL ((1)));
-#  endif
-_GL_CXXALIAS_SYS (posix_spawnattr_setpgroup, int,
-                  (posix_spawnattr_t *__attr, pid_t __pgroup));
-# endif
-_GL_CXXALIASWARN (posix_spawnattr_setpgroup);
-#elif defined GNULIB_POSIXCHECK
-# undef posix_spawnattr_setpgroup
-# if HAVE_RAW_DECL_POSIX_SPAWNATTR_SETPGROUP
-_GL_WARN_ON_USE (posix_spawnattr_setpgroup,
-                 "posix_spawnattr_setpgroup is unportable - "
-                 "use gnulib module posix_spawnattr_setpgroup for portability");
-# endif
-#endif
-
-#if @GNULIB_POSIX_SPAWNATTR_GETSCHEDPOLICY@
-/* Get scheduling policy from the attribute structure.  */
-# if @REPLACE_POSIX_SPAWN@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define posix_spawnattr_getschedpolicy rpl_posix_spawnattr_getschedpolicy
-#  endif
-_GL_FUNCDECL_RPL (posix_spawnattr_getschedpolicy, int,
-                  (const posix_spawnattr_t *_Restrict_ __attr,
-                   int *_Restrict_ __schedpolicy)
-                  __THROW _GL_ARG_NONNULL ((1, 2)));
-_GL_CXXALIAS_RPL (posix_spawnattr_getschedpolicy, int,
-                  (const posix_spawnattr_t *_Restrict_ __attr,
-                   int *_Restrict_ __schedpolicy));
-# else
-#  if !@HAVE_POSIX_SPAWN@ || POSIX_SPAWN_SETSCHEDULER == 0
-_GL_FUNCDECL_SYS (posix_spawnattr_getschedpolicy, int,
-                  (const posix_spawnattr_t *_Restrict_ __attr,
-                   int *_Restrict_ __schedpolicy)
-                  __THROW _GL_ARG_NONNULL ((1, 2)));
-#  endif
-_GL_CXXALIAS_SYS (posix_spawnattr_getschedpolicy, int,
-                  (const posix_spawnattr_t *_Restrict_ __attr,
-                   int *_Restrict_ __schedpolicy));
-# endif
-_GL_CXXALIASWARN (posix_spawnattr_getschedpolicy);
-#elif defined GNULIB_POSIXCHECK
-# undef posix_spawnattr_getschedpolicy
-# if HAVE_RAW_DECL_POSIX_SPAWNATTR_GETSCHEDPOLICY
-_GL_WARN_ON_USE (posix_spawnattr_getschedpolicy,
-                 "posix_spawnattr_getschedpolicy is unportable - "
-                 "use gnulib module posix_spawnattr_getschedpolicy for portability");
-# endif
-#endif
-
-#if @GNULIB_POSIX_SPAWNATTR_SETSCHEDPOLICY@
-/* Store scheduling policy in the attribute structure.  */
-# if @REPLACE_POSIX_SPAWN@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define posix_spawnattr_setschedpolicy rpl_posix_spawnattr_setschedpolicy
-#  endif
-_GL_FUNCDECL_RPL (posix_spawnattr_setschedpolicy, int,
-                  (posix_spawnattr_t *__attr, int __schedpolicy)
-                  __THROW _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (posix_spawnattr_setschedpolicy, int,
-                  (posix_spawnattr_t *__attr, int __schedpolicy));
-# else
-#  if !@HAVE_POSIX_SPAWN@ || POSIX_SPAWN_SETSCHEDULER == 0
-_GL_FUNCDECL_SYS (posix_spawnattr_setschedpolicy, int,
-                  (posix_spawnattr_t *__attr, int __schedpolicy)
-                  __THROW _GL_ARG_NONNULL ((1)));
-#  endif
-_GL_CXXALIAS_SYS (posix_spawnattr_setschedpolicy, int,
-                  (posix_spawnattr_t *__attr, int __schedpolicy));
-# endif
-_GL_CXXALIASWARN (posix_spawnattr_setschedpolicy);
-#elif defined GNULIB_POSIXCHECK
-# undef posix_spawnattr_setschedpolicy
-# if HAVE_RAW_DECL_POSIX_SPAWNATTR_SETSCHEDPOLICY
-_GL_WARN_ON_USE (posix_spawnattr_setschedpolicy,
-                 "posix_spawnattr_setschedpolicy is unportable - "
-                 "use gnulib module posix_spawnattr_setschedpolicy for portability");
-# endif
-#endif
-
-#if @GNULIB_POSIX_SPAWNATTR_GETSCHEDPARAM@
-/* Get scheduling parameters from the attribute structure.  */
-# if @REPLACE_POSIX_SPAWN@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define posix_spawnattr_getschedparam rpl_posix_spawnattr_getschedparam
-#  endif
-_GL_FUNCDECL_RPL (posix_spawnattr_getschedparam, int,
-                  (const posix_spawnattr_t *_Restrict_ __attr,
-                   struct sched_param *_Restrict_ __schedparam)
-                  __THROW _GL_ARG_NONNULL ((1, 2)));
-_GL_CXXALIAS_RPL (posix_spawnattr_getschedparam, int,
-                  (const posix_spawnattr_t *_Restrict_ __attr,
-                   struct sched_param *_Restrict_ __schedparam));
-# else
-#  if !@HAVE_POSIX_SPAWN@ || POSIX_SPAWN_SETSCHEDPARAM == 0
-_GL_FUNCDECL_SYS (posix_spawnattr_getschedparam, int,
-                  (const posix_spawnattr_t *_Restrict_ __attr,
-                   struct sched_param *_Restrict_ __schedparam)
-                  __THROW _GL_ARG_NONNULL ((1, 2)));
-#  endif
-_GL_CXXALIAS_SYS (posix_spawnattr_getschedparam, int,
-                  (const posix_spawnattr_t *_Restrict_ __attr,
-                   struct sched_param *_Restrict_ __schedparam));
-# endif
-_GL_CXXALIASWARN (posix_spawnattr_getschedparam);
-#elif defined GNULIB_POSIXCHECK
-# undef posix_spawnattr_getschedparam
-# if HAVE_RAW_DECL_POSIX_SPAWNATTR_GETSCHEDPARAM
-_GL_WARN_ON_USE (posix_spawnattr_getschedparam,
-                 "posix_spawnattr_getschedparam is unportable - "
-                 "use gnulib module posix_spawnattr_getschedparam for portability");
-# endif
-#endif
-
-#if @GNULIB_POSIX_SPAWNATTR_SETSCHEDPARAM@
-/* Store scheduling parameters in the attribute structure.  */
-# if @REPLACE_POSIX_SPAWN@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define posix_spawnattr_setschedparam rpl_posix_spawnattr_setschedparam
-#  endif
-_GL_FUNCDECL_RPL (posix_spawnattr_setschedparam, int,
-                  (posix_spawnattr_t *_Restrict_ __attr,
-                   const struct sched_param *_Restrict_ __schedparam)
-                  __THROW _GL_ARG_NONNULL ((1, 2)));
-_GL_CXXALIAS_RPL (posix_spawnattr_setschedparam, int,
-                  (posix_spawnattr_t *_Restrict_ __attr,
-                   const struct sched_param *_Restrict_ __schedparam));
-# else
-#  if !@HAVE_POSIX_SPAWN@ || POSIX_SPAWN_SETSCHEDPARAM == 0
-_GL_FUNCDECL_SYS (posix_spawnattr_setschedparam, int,
-                  (posix_spawnattr_t *_Restrict_ __attr,
-                   const struct sched_param *_Restrict_ __schedparam)
-                  __THROW _GL_ARG_NONNULL ((1, 2)));
-#  endif
-_GL_CXXALIAS_SYS (posix_spawnattr_setschedparam, int,
-                  (posix_spawnattr_t *_Restrict_ __attr,
-                   const struct sched_param *_Restrict_ __schedparam));
-# endif
-_GL_CXXALIASWARN (posix_spawnattr_setschedparam);
-#elif defined GNULIB_POSIXCHECK
-# undef posix_spawnattr_setschedparam
-# if HAVE_RAW_DECL_POSIX_SPAWNATTR_SETSCHEDPARAM
-_GL_WARN_ON_USE (posix_spawnattr_setschedparam,
-                 "posix_spawnattr_setschedparam is unportable - "
-                 "use gnulib module posix_spawnattr_setschedparam for portability");
-# endif
-#endif
-
-
-#if @GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT@
-/* Initialize data structure for file attribute for 'spawn' call.  */
-# if @REPLACE_POSIX_SPAWN@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define posix_spawn_file_actions_init rpl_posix_spawn_file_actions_init
-#  endif
-_GL_FUNCDECL_RPL (posix_spawn_file_actions_init, int,
-                  (posix_spawn_file_actions_t *__file_actions)
-                  __THROW _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (posix_spawn_file_actions_init, int,
-                  (posix_spawn_file_actions_t *__file_actions));
-# else
-#  if !@HAVE_POSIX_SPAWN@
-_GL_FUNCDECL_SYS (posix_spawn_file_actions_init, int,
-                  (posix_spawn_file_actions_t *__file_actions)
-                  __THROW _GL_ARG_NONNULL ((1)));
-#  endif
-_GL_CXXALIAS_SYS (posix_spawn_file_actions_init, int,
-                  (posix_spawn_file_actions_t *__file_actions));
-# endif
-_GL_CXXALIASWARN (posix_spawn_file_actions_init);
-#elif defined GNULIB_POSIXCHECK
-# undef posix_spawn_file_actions_init
-# if HAVE_RAW_DECL_POSIX_SPAWN_FILE_ACTIONS_INIT
-_GL_WARN_ON_USE (posix_spawn_file_actions_init,
-                 "posix_spawn_file_actions_init is unportable - "
-                 "use gnulib module posix_spawn_file_actions_init for portability");
-# endif
-#endif
-
-#if @GNULIB_POSIX_SPAWN_FILE_ACTIONS_DESTROY@
-/* Free resources associated with FILE-ACTIONS.  */
-# if @REPLACE_POSIX_SPAWN@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define posix_spawn_file_actions_destroy rpl_posix_spawn_file_actions_destroy
-#  endif
-_GL_FUNCDECL_RPL (posix_spawn_file_actions_destroy, int,
-                  (posix_spawn_file_actions_t *__file_actions)
-                  __THROW _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (posix_spawn_file_actions_destroy, int,
-                  (posix_spawn_file_actions_t *__file_actions));
-# else
-#  if !@HAVE_POSIX_SPAWN@
-_GL_FUNCDECL_SYS (posix_spawn_file_actions_destroy, int,
-                  (posix_spawn_file_actions_t *__file_actions)
-                  __THROW _GL_ARG_NONNULL ((1)));
-#  endif
-_GL_CXXALIAS_SYS (posix_spawn_file_actions_destroy, int,
-                  (posix_spawn_file_actions_t *__file_actions));
-# endif
-_GL_CXXALIASWARN (posix_spawn_file_actions_destroy);
-#elif defined GNULIB_POSIXCHECK
-# undef posix_spawn_file_actions_destroy
-# if HAVE_RAW_DECL_POSIX_SPAWN_FILE_ACTIONS_DESTROY
-_GL_WARN_ON_USE (posix_spawn_file_actions_destroy,
-                 "posix_spawn_file_actions_destroy is unportable - "
-                 "use gnulib module posix_spawn_file_actions_destroy for portability");
-# endif
-#endif
-
-#if @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN@
-/* Add an action to FILE-ACTIONS which tells the implementation to call
-   'open' for the given file during the 'spawn' call.  */
-# if @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define posix_spawn_file_actions_addopen rpl_posix_spawn_file_actions_addopen
-#  endif
-_GL_FUNCDECL_RPL (posix_spawn_file_actions_addopen, int,
-                  (posix_spawn_file_actions_t *_Restrict_ __file_actions,
-                   int __fd,
-                   const char *_Restrict_ __path, int __oflag, mode_t __mode)
-                  __THROW _GL_ARG_NONNULL ((1, 3)));
-_GL_CXXALIAS_RPL (posix_spawn_file_actions_addopen, int,
-                  (posix_spawn_file_actions_t *_Restrict_ __file_actions,
-                   int __fd,
-                   const char *_Restrict_ __path, int __oflag, mode_t __mode));
-# else
-#  if !@HAVE_POSIX_SPAWN@
-_GL_FUNCDECL_SYS (posix_spawn_file_actions_addopen, int,
-                  (posix_spawn_file_actions_t *_Restrict_ __file_actions,
-                   int __fd,
-                   const char *_Restrict_ __path, int __oflag, mode_t __mode)
-                  __THROW _GL_ARG_NONNULL ((1, 3)));
-#  endif
-_GL_CXXALIAS_SYS (posix_spawn_file_actions_addopen, int,
-                  (posix_spawn_file_actions_t *_Restrict_ __file_actions,
-                   int __fd,
-                   const char *_Restrict_ __path, int __oflag, mode_t __mode));
-# endif
-_GL_CXXALIASWARN (posix_spawn_file_actions_addopen);
-#elif defined GNULIB_POSIXCHECK
-# undef posix_spawn_file_actions_addopen
-# if HAVE_RAW_DECL_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN
-_GL_WARN_ON_USE (posix_spawn_file_actions_addopen,
-                 "posix_spawn_file_actions_addopen is unportable - "
-                 "use gnulib module posix_spawn_file_actions_addopen for portability");
-# endif
-#endif
-
-#if @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE@
-/* Add an action to FILE-ACTIONS which tells the implementation to call
-   'close' for the given file descriptor during the 'spawn' call.  */
-# if @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define posix_spawn_file_actions_addclose rpl_posix_spawn_file_actions_addclose
-#  endif
-_GL_FUNCDECL_RPL (posix_spawn_file_actions_addclose, int,
-                  (posix_spawn_file_actions_t *__file_actions, int __fd)
-                  __THROW _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (posix_spawn_file_actions_addclose, int,
-                  (posix_spawn_file_actions_t *__file_actions, int __fd));
-# else
-#  if !@HAVE_POSIX_SPAWN@
-_GL_FUNCDECL_SYS (posix_spawn_file_actions_addclose, int,
-                  (posix_spawn_file_actions_t *__file_actions, int __fd)
-                  __THROW _GL_ARG_NONNULL ((1)));
-#  endif
-_GL_CXXALIAS_SYS (posix_spawn_file_actions_addclose, int,
-                  (posix_spawn_file_actions_t *__file_actions, int __fd));
-# endif
-_GL_CXXALIASWARN (posix_spawn_file_actions_addclose);
-#elif defined GNULIB_POSIXCHECK
-# undef posix_spawn_file_actions_addclose
-# if HAVE_RAW_DECL_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE
-_GL_WARN_ON_USE (posix_spawn_file_actions_addclose,
-                 "posix_spawn_file_actions_addclose is unportable - "
-                 "use gnulib module posix_spawn_file_actions_addclose for portability");
-# endif
-#endif
-
-#if @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2@
-/* Add an action to FILE-ACTIONS which tells the implementation to call
-   'dup2' for the given file descriptors during the 'spawn' call.  */
-# if @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   define posix_spawn_file_actions_adddup2 rpl_posix_spawn_file_actions_adddup2
-#  endif
-_GL_FUNCDECL_RPL (posix_spawn_file_actions_adddup2, int,
-                  (posix_spawn_file_actions_t *__file_actions,
-                   int __fd, int __newfd)
-                  __THROW _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (posix_spawn_file_actions_adddup2, int,
-                  (posix_spawn_file_actions_t *__file_actions,
-                   int __fd, int __newfd));
-# else
-#  if !@HAVE_POSIX_SPAWN@
-_GL_FUNCDECL_SYS (posix_spawn_file_actions_adddup2, int,
-                  (posix_spawn_file_actions_t *__file_actions,
-                   int __fd, int __newfd)
-                  __THROW _GL_ARG_NONNULL ((1)));
-#  endif
-_GL_CXXALIAS_SYS (posix_spawn_file_actions_adddup2, int,
-                  (posix_spawn_file_actions_t *__file_actions,
-                   int __fd, int __newfd));
-# endif
-_GL_CXXALIASWARN (posix_spawn_file_actions_adddup2);
-#elif defined GNULIB_POSIXCHECK
-# undef posix_spawn_file_actions_adddup2
-# if HAVE_RAW_DECL_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2
-_GL_WARN_ON_USE (posix_spawn_file_actions_adddup2,
-                 "posix_spawn_file_actions_adddup2 is unportable - "
-                 "use gnulib module posix_spawn_file_actions_adddup2 for portability");
-# endif
-#endif
-
-
-#endif /* _@GUARD_PREFIX@_SPAWN_H */
-#endif /* _@GUARD_PREFIX@_SPAWN_H */
diff --git a/lib/spawn_faction_addclose.c b/lib/spawn_faction_addclose.c
deleted file mode 100644
index 86a9aba2..00000000
--- a/lib/spawn_faction_addclose.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Copyright (C) 2000, 2009-2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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 3 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/>.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include <spawn.h>
-
-#include <errno.h>
-#include <unistd.h>
-
-#if !_LIBC
-# define __sysconf(open_max) getdtablesize ()
-#endif
-
-#if !HAVE_WORKING_POSIX_SPAWN
-# include "spawn_int.h"
-#endif
-
-/* Add an action to FILE-ACTIONS which tells the implementation to call
-   'close' for the given file descriptor during the 'spawn' call.  */
-int
-posix_spawn_file_actions_addclose (posix_spawn_file_actions_t *file_actions,
-                                   int fd)
-#undef posix_spawn_file_actions_addclose
-{
-  int maxfd = __sysconf (_SC_OPEN_MAX);
-
-  /* Test for the validity of the file descriptor.  */
-  if (fd < 0 || fd >= maxfd)
-    return EBADF;
-
-#if HAVE_WORKING_POSIX_SPAWN
-  return posix_spawn_file_actions_addclose (file_actions, fd);
-#else
-  /* Allocate more memory if needed.  */
-  if (file_actions->_used == file_actions->_allocated
-      && __posix_spawn_file_actions_realloc (file_actions) != 0)
-    /* This can only mean we ran out of memory.  */
-    return ENOMEM;
-
-  {
-    struct __spawn_action *rec;
-
-    /* Add the new value.  */
-    rec = &file_actions->_actions[file_actions->_used];
-    rec->tag = spawn_do_close;
-    rec->action.open_action.fd = fd;
-
-    /* Account for the new entry.  */
-    ++file_actions->_used;
-
-    return 0;
-  }
-#endif
-}
diff --git a/lib/spawn_faction_adddup2.c b/lib/spawn_faction_adddup2.c
deleted file mode 100644
index 56ff1ecc..00000000
--- a/lib/spawn_faction_adddup2.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Copyright (C) 2000, 2009-2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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 3 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/>.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include <spawn.h>
-
-#include <errno.h>
-#include <unistd.h>
-
-#if !_LIBC
-# define __sysconf(open_max) getdtablesize ()
-#endif
-
-#if !HAVE_WORKING_POSIX_SPAWN
-# include "spawn_int.h"
-#endif
-
-/* Add an action to FILE-ACTIONS which tells the implementation to call
-   'dup2' for the given file descriptors during the 'spawn' call.  */
-int
-posix_spawn_file_actions_adddup2 (posix_spawn_file_actions_t *file_actions,
-                                  int fd, int newfd)
-#undef posix_spawn_file_actions_adddup2
-{
-  int maxfd = __sysconf (_SC_OPEN_MAX);
-
-  /* Test for the validity of the file descriptor.  */
-  if (fd < 0 || newfd < 0 || fd >= maxfd || newfd >= maxfd)
-    return EBADF;
-
-#if HAVE_WORKING_POSIX_SPAWN
-  return posix_spawn_file_actions_adddup2 (file_actions, fd, newfd);
-#else
-  /* Allocate more memory if needed.  */
-  if (file_actions->_used == file_actions->_allocated
-      && __posix_spawn_file_actions_realloc (file_actions) != 0)
-    /* This can only mean we ran out of memory.  */
-    return ENOMEM;
-
-  {
-    struct __spawn_action *rec;
-
-    /* Add the new value.  */
-    rec = &file_actions->_actions[file_actions->_used];
-    rec->tag = spawn_do_dup2;
-    rec->action.dup2_action.fd = fd;
-    rec->action.dup2_action.newfd = newfd;
-
-    /* Account for the new entry.  */
-    ++file_actions->_used;
-
-    return 0;
-  }
-#endif
-}
diff --git a/lib/spawn_faction_addopen.c b/lib/spawn_faction_addopen.c
deleted file mode 100644
index 8aaeca6a..00000000
--- a/lib/spawn_faction_addopen.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Copyright (C) 2000, 2009-2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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 3 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/>.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include <spawn.h>
-
-#include <errno.h>
-#include <unistd.h>
-
-#if !_LIBC
-# define __sysconf(open_max) getdtablesize ()
-#endif
-
-#if !HAVE_WORKING_POSIX_SPAWN
-# include "spawn_int.h"
-#endif
-
-/* Add an action to FILE-ACTIONS which tells the implementation to call
-   'open' for the given file during the 'spawn' call.  */
-int
-posix_spawn_file_actions_addopen (posix_spawn_file_actions_t *file_actions,
-                                  int fd, const char *path, int oflag,
-                                  mode_t mode)
-#undef posix_spawn_file_actions_addopen
-{
-  int maxfd = __sysconf (_SC_OPEN_MAX);
-
-  /* Test for the validity of the file descriptor.  */
-  if (fd < 0 || fd >= maxfd)
-    return EBADF;
-
-#if HAVE_WORKING_POSIX_SPAWN
-  return posix_spawn_file_actions_addopen (file_actions, fd, path, oflag, mode);
-#else
-  /* Allocate more memory if needed.  */
-  if (file_actions->_used == file_actions->_allocated
-      && __posix_spawn_file_actions_realloc (file_actions) != 0)
-    /* This can only mean we ran out of memory.  */
-    return ENOMEM;
-
-  {
-    struct __spawn_action *rec;
-
-    /* Add the new value.  */
-    rec = &file_actions->_actions[file_actions->_used];
-    rec->tag = spawn_do_open;
-    rec->action.open_action.fd = fd;
-    rec->action.open_action.path = path;
-    rec->action.open_action.oflag = oflag;
-    rec->action.open_action.mode = mode;
-
-    /* Account for the new entry.  */
-    ++file_actions->_used;
-
-    return 0;
-  }
-#endif
-}
diff --git a/lib/spawn_faction_destroy.c b/lib/spawn_faction_destroy.c
deleted file mode 100644
index 942733dc..00000000
--- a/lib/spawn_faction_destroy.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright (C) 2000, 2009-2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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 3 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/>.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include <spawn.h>
-
-#include <stdlib.h>
-
-/* Initialize data structure for file attribute for 'spawn' call.  */
-int
-posix_spawn_file_actions_destroy (posix_spawn_file_actions_t *file_actions)
-{
-  /* Free the memory allocated.  */
-  free (file_actions->_actions);
-  return 0;
-}
diff --git a/lib/spawn_faction_init.c b/lib/spawn_faction_init.c
deleted file mode 100644
index cf1d0a6a..00000000
--- a/lib/spawn_faction_init.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright (C) 2000, 2009-2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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 3 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/>.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include <spawn.h>
-
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "spawn_int.h"
-
-
-/* Function used to increase the size of the allocated array.  This
-   function is called from the 'add'-functions.  */
-int
-__posix_spawn_file_actions_realloc (posix_spawn_file_actions_t *file_actions)
-{
-  int newalloc = file_actions->_allocated + 8;
-  void *newmem = realloc (file_actions->_actions,
-                          newalloc * sizeof (struct __spawn_action));
-
-  if (newmem == NULL)
-    /* Not enough memory.  */
-    return ENOMEM;
-
-  file_actions->_actions = (struct __spawn_action *) newmem;
-  file_actions->_allocated = newalloc;
-
-  return 0;
-}
-
-
-/* Initialize data structure for file attribute for 'spawn' call.  */
-int
-posix_spawn_file_actions_init (posix_spawn_file_actions_t *file_actions)
-{
-  /* Simply clear all the elements.  */
-  memset (file_actions, '\0', sizeof (*file_actions));
-  return 0;
-}
diff --git a/lib/spawn_int.h b/lib/spawn_int.h
deleted file mode 100644
index f22a659f..00000000
--- a/lib/spawn_int.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Copyright (C) 2000, 2008-2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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 3 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/>.  */
-
-#include <sys/types.h>
-
-/* Data structure to contain the action information.  */
-struct __spawn_action
-{
-  enum
-  {
-    spawn_do_close,
-    spawn_do_dup2,
-    spawn_do_open
-  } tag;
-
-  union
-  {
-    struct
-    {
-      int fd;
-    } close_action;
-    struct
-    {
-      int fd;
-      int newfd;
-    } dup2_action;
-    struct
-    {
-      int fd;
-      const char *path;
-      int oflag;
-      mode_t mode;
-    } open_action;
-  } action;
-};
-
-#if !_LIBC
-# define __posix_spawn_file_actions_realloc gl_posix_spawn_file_actions_realloc
-#endif
-extern int __posix_spawn_file_actions_realloc (posix_spawn_file_actions_t *
-                                               file_actions);
-
-#if !_LIBC
-# define __spawni gl_posix_spawn_internal
-#endif
-extern int __spawni (pid_t *pid, const char *path,
-                     const posix_spawn_file_actions_t *file_actions,
-                     const posix_spawnattr_t *attrp, char *const argv[],
-                     char *const envp[], int use_path);
diff --git a/lib/spawnattr_destroy.c b/lib/spawnattr_destroy.c
deleted file mode 100644
index ec6c7cf0..00000000
--- a/lib/spawnattr_destroy.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright (C) 2000, 2009-2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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 3 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/>.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include <spawn.h>
-
-/* Initialize data structure for file attribute for 'spawn' call.  */
-int
-posix_spawnattr_destroy (posix_spawnattr_t *attr)
-{
-  /* Nothing to do in the moment.  */
-  return 0;
-}
diff --git a/lib/spawnattr_init.c b/lib/spawnattr_init.c
deleted file mode 100644
index b050fb4a..00000000
--- a/lib/spawnattr_init.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright (C) 2000, 2009-2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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 3 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/>.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include <spawn.h>
-
-#include <string.h>
-
-/* Initialize data structure for file attribute for 'spawn' call.  */
-int
-posix_spawnattr_init (posix_spawnattr_t *attr)
-{
-  /* All elements have to be initialized to the default values which
-     is generally zero.  */
-  memset (attr, '\0', sizeof (*attr));
-
-  return 0;
-}
diff --git a/lib/spawnattr_setflags.c b/lib/spawnattr_setflags.c
deleted file mode 100644
index babbb195..00000000
--- a/lib/spawnattr_setflags.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright (C) 2000, 2004, 2009-2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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 3 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/>.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include <spawn.h>
-
-#include <errno.h>
-#include <string.h>
-
-#define ALL_FLAGS (POSIX_SPAWN_RESETIDS                                       \
-                   | POSIX_SPAWN_SETPGROUP                                    \
-                   | POSIX_SPAWN_SETSIGDEF                                    \
-                   | POSIX_SPAWN_SETSIGMASK                                   \
-                   | POSIX_SPAWN_SETSCHEDPARAM                                \
-                   | POSIX_SPAWN_SETSCHEDULER                                 \
-                   | POSIX_SPAWN_USEVFORK)
-
-/* Store flags in the attribute structure.  */
-int
-posix_spawnattr_setflags (posix_spawnattr_t *attr, short int flags)
-{
-  /* Check no invalid bits are set.  */
-  if (flags & ~ALL_FLAGS)
-    return EINVAL;
-
-  /* Store the flag word.  */
-  attr->_flags = flags;
-
-  return 0;
-}
diff --git a/lib/spawnattr_setsigmask.c b/lib/spawnattr_setsigmask.c
deleted file mode 100644
index 8aa6da94..00000000
--- a/lib/spawnattr_setsigmask.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright (C) 2000, 2009-2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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 3 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/>.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include <spawn.h>
-
-#include <string.h>
-
-/* Set signal mask for the new process in ATTR to SIGMASK.  */
-int
-posix_spawnattr_setsigmask (posix_spawnattr_t *attr,
-                            const sigset_t *sigmask)
-{
-  /* Copy the sigset_t data to the user buffer.  */
-  memcpy (&attr->_ss, sigmask, sizeof (sigset_t));
-
-  return 0;
-}
diff --git a/lib/spawni.c b/lib/spawni.c
deleted file mode 100644
index 17b903f3..00000000
--- a/lib/spawni.c
+++ /dev/null
@@ -1,374 +0,0 @@
-/* Guts of POSIX spawn interface.  Generic POSIX.1 version.
-   Copyright (C) 2000-2006, 2008-2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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 3 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/>.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include <spawn.h>
-#include "spawn_int.h"
-
-#include <alloca.h>
-#include <errno.h>
-
-#include <fcntl.h>
-#ifndef O_LARGEFILE
-# define O_LARGEFILE 0
-#endif
-
-#if _LIBC || HAVE_PATHS_H
-# include <paths.h>
-#else
-# define _PATH_BSHELL "/bin/sh"
-#endif
-
-#include <signal.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#if _LIBC
-# include <not-cancel.h>
-#else
-# define close_not_cancel close
-# define open_not_cancel open
-#endif
-
-#if _LIBC
-# include <local-setxid.h>
-#else
-# if !HAVE_SETEUID
-#  define seteuid(id) setresuid (-1, id, -1)
-# endif
-# if !HAVE_SETEGID
-#  define setegid(id) setresgid (-1, id, -1)
-# endif
-# define local_seteuid(id) seteuid (id)
-# define local_setegid(id) setegid (id)
-#endif
-
-#if _LIBC
-# define alloca __alloca
-# define execve __execve
-# define dup2 __dup2
-# define fork __fork
-# define getgid __getgid
-# define getuid __getuid
-# define sched_setparam __sched_setparam
-# define sched_setscheduler __sched_setscheduler
-# define setpgid __setpgid
-# define sigaction __sigaction
-# define sigismember __sigismember
-# define sigprocmask __sigprocmask
-# define strchrnul __strchrnul
-# define vfork __vfork
-#else
-# undef internal_function
-# define internal_function /* empty */
-#endif
-
-
-/* The Unix standard contains a long explanation of the way to signal
-   an error after the fork() was successful.  Since no new wait status
-   was wanted there is no way to signal an error using one of the
-   available methods.  The committee chose to signal an error by a
-   normal program exit with the exit code 127.  */
-#define SPAWN_ERROR     127
-
-
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-
-/* Native Windows API.  */
-int
-__spawni (pid_t *pid, const char *file,
-          const posix_spawn_file_actions_t *file_actions,
-          const posix_spawnattr_t *attrp, char *const argv[],
-          char *const envp[], int use_path)
-{
-  /* Not yet implemented.  */
-  return ENOSYS;
-}
-
-#else
-
-
-/* The file is accessible but it is not an executable file.  Invoke
-   the shell to interpret it as a script.  */
-static void
-internal_function
-script_execute (const char *file, char *const argv[], char *const envp[])
-{
-  /* Count the arguments.  */
-  int argc = 0;
-  while (argv[argc++])
-    ;
-
-  /* Construct an argument list for the shell.  */
-  {
-    char **new_argv = (char **) alloca ((argc + 1) * sizeof (char *));
-    new_argv[0] = (char *) _PATH_BSHELL;
-    new_argv[1] = (char *) file;
-    while (argc > 1)
-      {
-        new_argv[argc] = argv[argc - 1];
-        --argc;
-      }
-
-    /* Execute the shell.  */
-    execve (new_argv[0], new_argv, envp);
-  }
-}
-
-
-/* Spawn a new process executing PATH with the attributes describes in *ATTRP.
-   Before running the process perform the actions described in FILE-ACTIONS. */
-int
-__spawni (pid_t *pid, const char *file,
-          const posix_spawn_file_actions_t *file_actions,
-          const posix_spawnattr_t *attrp, char *const argv[],
-          char *const envp[], int use_path)
-{
-  pid_t new_pid;
-  char *path, *p, *name;
-  size_t len;
-  size_t pathlen;
-
-  /* Do this once.  */
-  short int flags = attrp == NULL ? 0 : attrp->_flags;
-
-  /* Avoid gcc warning
-       "variable 'flags' might be clobbered by 'longjmp' or 'vfork'"  */
-  (void) &flags;
-
-  /* Generate the new process.  */
-#if HAVE_VFORK
-  if ((flags & POSIX_SPAWN_USEVFORK) != 0
-      /* If no major work is done, allow using vfork.  Note that we
-         might perform the path searching.  But this would be done by
-         a call to execvp(), too, and such a call must be OK according
-         to POSIX.  */
-      || ((flags & (POSIX_SPAWN_SETSIGMASK | POSIX_SPAWN_SETSIGDEF
-                    | POSIX_SPAWN_SETSCHEDPARAM | POSIX_SPAWN_SETSCHEDULER
-                    | POSIX_SPAWN_SETPGROUP | POSIX_SPAWN_RESETIDS)) == 0
-          && file_actions == NULL))
-    new_pid = vfork ();
-  else
-#endif
-    new_pid = fork ();
-
-  if (new_pid != 0)
-    {
-      if (new_pid < 0)
-        return errno;
-
-      /* The call was successful.  Store the PID if necessary.  */
-      if (pid != NULL)
-        *pid = new_pid;
-
-      return 0;
-    }
-
-  /* Set signal mask.  */
-  if ((flags & POSIX_SPAWN_SETSIGMASK) != 0
-      && sigprocmask (SIG_SETMASK, &attrp->_ss, NULL) != 0)
-    _exit (SPAWN_ERROR);
-
-  /* Set signal default action.  */
-  if ((flags & POSIX_SPAWN_SETSIGDEF) != 0)
-    {
-      /* We have to iterate over all signals.  This could possibly be
-         done better but it requires system specific solutions since
-         the sigset_t data type can be very different on different
-         architectures.  */
-      int sig;
-      struct sigaction sa;
-
-      memset (&sa, '\0', sizeof (sa));
-      sa.sa_handler = SIG_DFL;
-
-      for (sig = 1; sig <= NSIG; ++sig)
-        if (sigismember (&attrp->_sd, sig) != 0
-            && sigaction (sig, &sa, NULL) != 0)
-          _exit (SPAWN_ERROR);
-
-    }
-
-#if (_LIBC ? defined _POSIX_PRIORITY_SCHEDULING : HAVE_SCHED_SETPARAM && HAVE_SCHED_SETSCHEDULER)
-  /* Set the scheduling algorithm and parameters.  */
-  if ((flags & (POSIX_SPAWN_SETSCHEDPARAM | POSIX_SPAWN_SETSCHEDULER))
-      == POSIX_SPAWN_SETSCHEDPARAM)
-    {
-      if (sched_setparam (0, &attrp->_sp) == -1)
-        _exit (SPAWN_ERROR);
-    }
-  else if ((flags & POSIX_SPAWN_SETSCHEDULER) != 0)
-    {
-      if (sched_setscheduler (0, attrp->_policy,
-                              (flags & POSIX_SPAWN_SETSCHEDPARAM) != 0
-                              ? &attrp->_sp : NULL) == -1)
-        _exit (SPAWN_ERROR);
-    }
-#endif
-
-  /* Set the process group ID.  */
-  if ((flags & POSIX_SPAWN_SETPGROUP) != 0
-      && setpgid (0, attrp->_pgrp) != 0)
-    _exit (SPAWN_ERROR);
-
-  /* Set the effective user and group IDs.  */
-  if ((flags & POSIX_SPAWN_RESETIDS) != 0
-      && (local_seteuid (getuid ()) != 0
-          || local_setegid (getgid ()) != 0))
-    _exit (SPAWN_ERROR);
-
-  /* Execute the file actions.  */
-  if (file_actions != NULL)
-    {
-      int cnt;
-
-      for (cnt = 0; cnt < file_actions->_used; ++cnt)
-        {
-          struct __spawn_action *action = &file_actions->_actions[cnt];
-
-          switch (action->tag)
-            {
-            case spawn_do_close:
-              if (close_not_cancel (action->action.close_action.fd) != 0)
-                /* Signal the error.  */
-                _exit (SPAWN_ERROR);
-              break;
-
-            case spawn_do_open:
-              {
-                int new_fd = open_not_cancel (action->action.open_action.path,
-                                              action->action.open_action.oflag
-                                              | O_LARGEFILE,
-                                              action->action.open_action.mode);
-
-                if (new_fd == -1)
-                  /* The 'open' call failed.  */
-                  _exit (SPAWN_ERROR);
-
-                /* Make sure the desired file descriptor is used.  */
-                if (new_fd != action->action.open_action.fd)
-                  {
-                    if (dup2 (new_fd, action->action.open_action.fd)
-                        != action->action.open_action.fd)
-                      /* The 'dup2' call failed.  */
-                      _exit (SPAWN_ERROR);
-
-                    if (close_not_cancel (new_fd) != 0)
-                      /* The 'close' call failed.  */
-                      _exit (SPAWN_ERROR);
-                  }
-              }
-              break;
-
-            case spawn_do_dup2:
-              if (dup2 (action->action.dup2_action.fd,
-                        action->action.dup2_action.newfd)
-                  != action->action.dup2_action.newfd)
-                /* The 'dup2' call failed.  */
-                _exit (SPAWN_ERROR);
-              break;
-            }
-        }
-    }
-
-  if (! use_path || strchr (file, '/') != NULL)
-    {
-      /* The FILE parameter is actually a path.  */
-      execve (file, argv, envp);
-
-      if (errno == ENOEXEC)
-        script_execute (file, argv, envp);
-
-      /* Oh, oh.  'execve' returns.  This is bad.  */
-      _exit (SPAWN_ERROR);
-    }
-
-  /* We have to search for FILE on the path.  */
-  path = getenv ("PATH");
-  if (path == NULL)
-    {
-#if HAVE_CONFSTR
-      /* There is no 'PATH' in the environment.
-         The default search path is the current directory
-         followed by the path 'confstr' returns for '_CS_PATH'.  */
-      len = confstr (_CS_PATH, (char *) NULL, 0);
-      path = (char *) alloca (1 + len);
-      path[0] = ':';
-      (void) confstr (_CS_PATH, path + 1, len);
-#else
-      /* Pretend that the PATH contains only the current directory.  */
-      path = "";
-#endif
-    }
-
-  len = strlen (file) + 1;
-  pathlen = strlen (path);
-  name = alloca (pathlen + len + 1);
-  /* Copy the file name at the top.  */
-  name = (char *) memcpy (name + pathlen + 1, file, len);
-  /* And add the slash.  */
-  *--name = '/';
-
-  p = path;
-  do
-    {
-      char *startp;
-
-      path = p;
-      p = strchrnul (path, ':');
-
-      if (p == path)
-        /* Two adjacent colons, or a colon at the beginning or the end
-           of 'PATH' means to search the current directory.  */
-        startp = name + 1;
-      else
-        startp = (char *) memcpy (name - (p - path), path, p - path);
-
-      /* Try to execute this name.  If it works, execv will not return.  */
-      execve (startp, argv, envp);
-
-      if (errno == ENOEXEC)
-        script_execute (startp, argv, envp);
-
-      switch (errno)
-        {
-        case EACCES:
-        case ENOENT:
-        case ESTALE:
-        case ENOTDIR:
-          /* Those errors indicate the file is missing or not executable
-             by us, in which case we want to just try the next path
-             directory.  */
-          break;
-
-        default:
-          /* Some other error means we found an executable file, but
-             something went wrong executing it; return the error to our
-             caller.  */
-          _exit (SPAWN_ERROR);
-        }
-    }
-  while (*p++ != '\0');
-
-  /* Return with an error.  */
-  _exit (SPAWN_ERROR);
-}
-
-#endif
diff --git a/lib/spawnp.c b/lib/spawnp.c
deleted file mode 100644
index 8bc5f99a..00000000
--- a/lib/spawnp.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright (C) 2000, 2009-2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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 3 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/>.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include <spawn.h>
-
-#include "spawn_int.h"
-
-/* Spawn a new process executing FILE with the attributes describes in *ATTRP.
-   Before running the process perform the actions described in FILE-ACTIONS. */
-int
-posix_spawnp (pid_t *pid, const char *file,
-              const posix_spawn_file_actions_t *file_actions,
-              const posix_spawnattr_t *attrp, char *const argv[],
-              char *const envp[])
-{
-  return __spawni (pid, file, file_actions, attrp, argv, envp, 1);
-}
diff --git a/lib/stat-size.h b/lib/stat-size.h
index 049b8b91..42482fa6 100644
--- a/lib/stat-size.h
+++ b/lib/stat-size.h
@@ -1,5 +1,5 @@
 /* macros useful in interpreting size-related values in struct stat.
-   Copyright (C) 1989, 1991-2013 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1991-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/stat-time.h b/lib/stat-time.h
index 2d3b5cd6..b3df6eb8 100644
--- a/lib/stat-time.h
+++ b/lib/stat-time.h
@@ -1,6 +1,6 @@
 /* stat-related time functions.
 
-   Copyright (C) 2005, 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -23,6 +23,9 @@
 #include <sys/stat.h>
 #include <time.h>
 
+#ifndef _GL_INLINE_HEADER_BEGIN
+ #error "Please include config.h first."
+#endif
 _GL_INLINE_HEADER_BEGIN
 #ifndef _GL_STAT_TIME_INLINE
 # define _GL_STAT_TIME_INLINE _GL_INLINE
diff --git a/lib/stat.c b/lib/stat.c
index f888130d..35f4b0b1 100644
--- a/lib/stat.c
+++ b/lib/stat.c
@@ -1,5 +1,5 @@
 /* Work around platform bugs in stat.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/stdalign.in.h b/lib/stdalign.in.h
index c3a67321..dcaab55b 100644
--- a/lib/stdalign.in.h
+++ b/lib/stdalign.in.h
@@ -1,6 +1,6 @@
 /* A substitute for ISO C11 <stdalign.h>.
 
-   Copyright 2011-2013 Free Software Foundation, Inc.
+   Copyright 2011-2014 Free Software Foundation, Inc.
 
    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
@@ -41,13 +41,28 @@
    are 4 unless the option '-malign-double' is used.
 
    The result cannot be used as a value for an 'enum' constant, if you
-   want to be portable to HP-UX 10.20 cc and AIX 3.2.5 xlc.  */
+   want to be portable to HP-UX 10.20 cc and AIX 3.2.5 xlc.
+
+   Include <stddef.h> for offsetof.  */
 #include <stddef.h>
-#if defined __cplusplus
+
+/* FreeBSD 9.1 <sys/cdefs.h>, included by <stddef.h> and lots of other
+   standard headers, defines conflicting implementations of _Alignas
+   and _Alignof that are no better than ours; override them.  */
+#undef _Alignas
+#undef _Alignof
+
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112
+# ifdef __cplusplus
+#  if 201103 <= __cplusplus
+#   define _Alignof(type) alignof (type)
+#  else
    template <class __t> struct __alignof_helper { char __a; __t __b; };
-# define _Alignof(type) offsetof (__alignof_helper<type>, __b)
-#else
-# define _Alignof(type) offsetof (struct { char __a; type __b; }, __b)
+#   define _Alignof(type) offsetof (__alignof_helper<type>, __b)
+#  endif
+# else
+#  define _Alignof(type) offsetof (struct { char __a; type __b; }, __b)
+# endif
 #endif
 #define alignof _Alignof
 #define __alignof_is_defined 1
@@ -77,12 +92,17 @@
 
    */
 
-#if __GNUC__ || __IBMC__ || __IBMCPP__ || 0x5110 <= __SUNPRO_C
-# define _Alignas(a) __attribute__ ((__aligned__ (a)))
-#elif 1300 <= _MSC_VER
-# define _Alignas(a) __declspec (align (a))
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112
+# if defined __cplusplus && 201103 <= __cplusplus
+#  define _Alignas(a) alignas (a)
+# elif (__GNUC__ || __HP_cc || __HP_aCC || __IBMC__ || __IBMCPP__ \
+        || __ICC || 0x5110 <= __SUNPRO_C)
+#  define _Alignas(a) __attribute__ ((__aligned__ (a)))
+# elif 1300 <= _MSC_VER
+#  define _Alignas(a) __declspec (align (a))
+# endif
 #endif
-#ifdef _Alignas
+#if defined _Alignas || (defined __STDC_VERSION && 201112 <= __STDC_VERSION__)
 # define alignas _Alignas
 # define __alignas_is_defined 1
 #endif
diff --git a/lib/stdarg.in.h b/lib/stdarg.in.h
index 7484842d..5b37dd36 100644
--- a/lib/stdarg.in.h
+++ b/lib/stdarg.in.h
@@ -1,5 +1,5 @@
 /* Substitute for and wrapper around <stdarg.h>.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/stdbool.in.h b/lib/stdbool.in.h
index 7c157727..651e8dff 100644
--- a/lib/stdbool.in.h
+++ b/lib/stdbool.in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2003, 2006-2013 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2003, 2006-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib/stddef.in.h b/lib/stddef.in.h
index 40f0536a..f5c0e056 100644
--- a/lib/stddef.in.h
+++ b/lib/stddef.in.h
@@ -1,6 +1,6 @@
 /* A substitute for POSIX 2008 <stddef.h>, for platforms that have issues.
 
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/stdint.in.h b/lib/stdint.in.h
index 2db8b2e3..247f0d89 100644
--- a/lib/stdint.in.h
+++ b/lib/stdint.in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2002, 2004-2013 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2002, 2004-2014 Free Software Foundation, Inc.
    Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood.
    This file is part of gnulib.
 
@@ -38,8 +38,7 @@
    other system header files; just include the system's <stdint.h>.
    Ideally we should test __BIONIC__ here, but it is only defined after
    <sys/cdefs.h> has been included; hence test __ANDROID__ instead.  */
-#if defined __ANDROID__ \
-    && defined _SYS_TYPES_H_ && !defined __need_size_t
+#if defined __ANDROID__ && defined _GL_INCLUDING_SYS_TYPES_H
 # @INCLUDE_NEXT@ @NEXT_STDINT_H@
 #else
 
diff --git a/lib/stdio--.h b/lib/stdio--.h
index fe6d83ed..83ddf5aa 100644
--- a/lib/stdio--.h
+++ b/lib/stdio--.h
@@ -1,6 +1,6 @@
 /* Like stdio.h, but redefine some names to avoid glitches.
 
-   Copyright (C) 2005-2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h
index e00600a1..299fe475 100644
--- a/lib/stdio-impl.h
+++ b/lib/stdio-impl.h
@@ -1,5 +1,5 @@
 /* Implementation details of FILE streams.
-   Copyright (C) 2007-2008, 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2008, 2010-2014 Free Software Foundation, Inc.
 
    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
@@ -57,7 +57,7 @@
 #  define fp_ fp
 # endif
 
-# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ /* NetBSD >= 1.5ZA, OpenBSD */
+# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __ANDROID__ /* NetBSD >= 1.5ZA, OpenBSD, Android */
   /* See <http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup>
      and <http://www.openbsd.org/cgi-bin/cvsweb/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup> */
   struct __sfileext
diff --git a/lib/stdio-safer.h b/lib/stdio-safer.h
index 7b67ae05..96c861fe 100644
--- a/lib/stdio-safer.h
+++ b/lib/stdio-safer.h
@@ -1,6 +1,6 @@
 /* Invoke stdio functions, but avoid some glitches.
 
-   Copyright (C) 2001, 2003, 2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003, 2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/stdio.in.h b/lib/stdio.in.h
index d6af99ca..1e1fe84c 100644
--- a/lib/stdio.in.h
+++ b/lib/stdio.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <stdio.h>.
 
-   Copyright (C) 2004, 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2007-2014 Free Software Foundation, Inc.
 
    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
@@ -124,6 +124,15 @@
 #define _GL_STDIO_STRINGIZE(token) #token
 #define _GL_STDIO_MACROEXPAND_AND_STRINGIZE(token) _GL_STDIO_STRINGIZE(token)
 
+/* When also using extern inline, suppress the use of static inline in
+   standard headers of problematic Apple configurations, as Libc at
+   least through Libc-825.26 (2013-04-09) mishandles it; see, e.g.,
+   <http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html>.
+   Perhaps Apple will fix this some day.  */
+#if (defined _GL_EXTERN_INLINE_IN_USE && defined __APPLE__ \
+     && defined __GNUC__ && defined __STDC__)
+# undef putc_unlocked
+#endif
 
 #if @GNULIB_DPRINTF@
 # if @REPLACE_DPRINTF@
@@ -579,13 +588,23 @@ _GL_CXXALIAS_SYS (fwrite, size_t,
    <http://sources.redhat.com/bugzilla/show_bug.cgi?id=11959>,
    which sometimes causes an unwanted diagnostic for fwrite calls.
    This affects only function declaration attributes under certain
-   versions of gcc, and is not needed for C++.  */
+   versions of gcc and clang, and is not needed for C++.  */
 #  if (0 < __USE_FORTIFY_LEVEL                                          \
        && __GLIBC__ == 2 && 4 <= __GLIBC_MINOR__ && __GLIBC_MINOR__ <= 15 \
        && 3 < __GNUC__ + (4 <= __GNUC_MINOR__)                          \
        && !defined __cplusplus)
 #   undef fwrite
-#   define fwrite(a, b, c, d) ({size_t __r = fwrite (a, b, c, d); __r; })
+#   undef fwrite_unlocked
+extern size_t __REDIRECT (rpl_fwrite,
+                          (const void *__restrict, size_t, size_t,
+                           FILE *__restrict),
+                          fwrite);
+extern size_t __REDIRECT (rpl_fwrite_unlocked,
+                          (const void *__restrict, size_t, size_t,
+                           FILE *__restrict),
+                          fwrite_unlocked);
+#   define fwrite rpl_fwrite
+#   define fwrite_unlocked rpl_fwrite_unlocked
 #  endif
 # endif
 _GL_CXXALIASWARN (fwrite);
diff --git a/lib/stdlib--.h b/lib/stdlib--.h
index ac02ece9..29be0654 100644
--- a/lib/stdlib--.h
+++ b/lib/stdlib--.h
@@ -1,6 +1,6 @@
 /* Like stdlib.h, but redefine some names to avoid glitches.
 
-   Copyright (C) 2005-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/stdlib-safer.h b/lib/stdlib-safer.h
index 1e314937..6816a366 100644
--- a/lib/stdlib-safer.h
+++ b/lib/stdlib-safer.h
@@ -1,6 +1,6 @@
 /* Invoke stdlib.h functions, but avoid some glitches.
 
-   Copyright (C) 2005, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h
index 422ad714..46e10dba 100644
--- a/lib/stdlib.in.h
+++ b/lib/stdlib.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <stdlib.h>.
 
-   Copyright (C) 1995, 2001-2004, 2006-2013 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001-2004, 2006-2014 Free Software Foundation, Inc.
 
    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
@@ -767,6 +767,22 @@ _GL_WARN_ON_USE (rpmatch, "rpmatch is unportable - "
 # endif
 #endif
 
+#if @GNULIB_SECURE_GETENV@
+/* Look up NAME in the environment, returning 0 in insecure situations.  */
+# if !@HAVE_SECURE_GETENV@
+_GL_FUNCDECL_SYS (secure_getenv, char *,
+                  (char const *name) _GL_ARG_NONNULL ((1)));
+# endif
+_GL_CXXALIAS_SYS (secure_getenv, char *, (char const *name));
+_GL_CXXALIASWARN (secure_getenv);
+#elif defined GNULIB_POSIXCHECK
+# undef secure_getenv
+# if HAVE_RAW_DECL_SECURE_GETENV
+_GL_WARN_ON_USE (secure_getenv, "secure_getenv is unportable - "
+                 "use gnulib module secure_getenv for portability");
+# endif
+#endif
+
 #if @GNULIB_SETENV@
 /* Set NAME to VALUE in the environment.
    If REPLACE is nonzero, overwrite an existing value.  */
diff --git a/lib/stpcpy.c b/lib/stpcpy.c
index 8d7dfb07..880a7061 100644
--- a/lib/stpcpy.c
+++ b/lib/stpcpy.c
@@ -1,5 +1,5 @@
 /* stpcpy.c -- copy a string and return pointer to end of new string
-   Copyright (C) 1992, 1995, 1997-1998, 2006, 2009-2013 Free Software
+   Copyright (C) 1992, 1995, 1997-1998, 2006, 2009-2014 Free Software
    Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
diff --git a/lib/stpncpy.c b/lib/stpncpy.c
index 8b14fb95..37018e8b 100644
--- a/lib/stpncpy.c
+++ b/lib/stpncpy.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1995-1997, 2002-2003, 2005-2007, 2009-2013 Free Software
+/* Copyright (C) 1993, 1995-1997, 2002-2003, 2005-2007, 2009-2014 Free Software
  * Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
diff --git a/lib/str-kmp.h b/lib/str-kmp.h
index 16d83a14..b25d07f8 100644
--- a/lib/str-kmp.h
+++ b/lib/str-kmp.h
@@ -1,6 +1,6 @@
 /* Substring search in a NUL terminated string of UNIT elements,
    using the Knuth-Morris-Pratt algorithm.
-   Copyright (C) 2005-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2005.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib/str-two-way.h b/lib/str-two-way.h
index 707145db..49ee7469 100644
--- a/lib/str-two-way.h
+++ b/lib/str-two-way.h
@@ -1,5 +1,5 @@
 /* Byte-wise substring search, using the Two-Way algorithm.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Eric Blake <ebb9@byu.net>, 2008.
 
diff --git a/lib/strchrnul.c b/lib/strchrnul.c
deleted file mode 100644
index f6b07227..00000000
--- a/lib/strchrnul.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/* Searching in a string.
-   Copyright (C) 2003, 2007-2013 Free Software Foundation, Inc.
-
-   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 3 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/>.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include <string.h>
-
-/* Find the first occurrence of C in S or the final NUL byte.  */
-char *
-strchrnul (const char *s, int c_in)
-{
-  /* On 32-bit hardware, choosing longword to be a 32-bit unsigned
-     long instead of a 64-bit uintmax_t tends to give better
-     performance.  On 64-bit hardware, unsigned long is generally 64
-     bits already.  Change this typedef to experiment with
-     performance.  */
-  typedef unsigned long int longword;
-
-  const unsigned char *char_ptr;
-  const longword *longword_ptr;
-  longword repeated_one;
-  longword repeated_c;
-  unsigned char c;
-
-  c = (unsigned char) c_in;
-  if (!c)
-    return rawmemchr (s, 0);
-
-  /* Handle the first few bytes by reading one byte at a time.
-     Do this until CHAR_PTR is aligned on a longword boundary.  */
-  for (char_ptr = (const unsigned char *) s;
-       (size_t) char_ptr % sizeof (longword) != 0;
-       ++char_ptr)
-    if (!*char_ptr || *char_ptr == c)
-      return (char *) char_ptr;
-
-  longword_ptr = (const longword *) char_ptr;
-
-  /* All these elucidatory comments refer to 4-byte longwords,
-     but the theory applies equally well to any size longwords.  */
-
-  /* Compute auxiliary longword values:
-     repeated_one is a value which has a 1 in every byte.
-     repeated_c has c in every byte.  */
-  repeated_one = 0x01010101;
-  repeated_c = c | (c << 8);
-  repeated_c |= repeated_c << 16;
-  if (0xffffffffU < (longword) -1)
-    {
-      repeated_one |= repeated_one << 31 << 1;
-      repeated_c |= repeated_c << 31 << 1;
-      if (8 < sizeof (longword))
-        {
-          size_t i;
-
-          for (i = 64; i < sizeof (longword) * 8; i *= 2)
-            {
-              repeated_one |= repeated_one << i;
-              repeated_c |= repeated_c << i;
-            }
-        }
-    }
-
-  /* Instead of the traditional loop which tests each byte, we will
-     test a longword at a time.  The tricky part is testing if *any of
-     the four* bytes in the longword in question are equal to NUL or
-     c.  We first use an xor with repeated_c.  This reduces the task
-     to testing whether *any of the four* bytes in longword1 or
-     longword2 is zero.
-
-     Let's consider longword1.  We compute tmp =
-       ((longword1 - repeated_one) & ~longword1) & (repeated_one << 7).
-     That is, we perform the following operations:
-       1. Subtract repeated_one.
-       2. & ~longword1.
-       3. & a mask consisting of 0x80 in every byte.
-     Consider what happens in each byte:
-       - If a byte of longword1 is zero, step 1 and 2 transform it into 0xff,
-         and step 3 transforms it into 0x80.  A carry can also be propagated
-         to more significant bytes.
-       - If a byte of longword1 is nonzero, let its lowest 1 bit be at
-         position k (0 <= k <= 7); so the lowest k bits are 0.  After step 1,
-         the byte ends in a single bit of value 0 and k bits of value 1.
-         After step 2, the result is just k bits of value 1: 2^k - 1.  After
-         step 3, the result is 0.  And no carry is produced.
-     So, if longword1 has only non-zero bytes, tmp is zero.
-     Whereas if longword1 has a zero byte, call j the position of the least
-     significant zero byte.  Then the result has a zero at positions 0, ...,
-     j-1 and a 0x80 at position j.  We cannot predict the result at the more
-     significant bytes (positions j+1..3), but it does not matter since we
-     already have a non-zero bit at position 8*j+7.
-
-     The test whether any byte in longword1 or longword2 is zero is equivalent
-     to testing whether tmp1 is nonzero or tmp2 is nonzero.  We can combine
-     this into a single test, whether (tmp1 | tmp2) is nonzero.
-
-     This test can read more than one byte beyond the end of a string,
-     depending on where the terminating NUL is encountered.  However,
-     this is considered safe since the initialization phase ensured
-     that the read will be aligned, therefore, the read will not cross
-     page boundaries and will not cause a fault.  */
-
-  while (1)
-    {
-      longword longword1 = *longword_ptr ^ repeated_c;
-      longword longword2 = *longword_ptr;
-
-      if (((((longword1 - repeated_one) & ~longword1)
-            | ((longword2 - repeated_one) & ~longword2))
-           & (repeated_one << 7)) != 0)
-        break;
-      longword_ptr++;
-    }
-
-  char_ptr = (const unsigned char *) longword_ptr;
-
-  /* At this point, we know that one of the sizeof (longword) bytes
-     starting at char_ptr is == 0 or == c.  On little-endian machines,
-     we could determine the first such byte without any further memory
-     accesses, just by looking at the tmp result from the last loop
-     iteration.  But this does not work on big-endian machines.
-     Choose code that works in both cases.  */
-
-  char_ptr = (unsigned char *) longword_ptr;
-  while (*char_ptr && (*char_ptr != c))
-    char_ptr++;
-  return (char *) char_ptr;
-}
diff --git a/lib/strchrnul.valgrind b/lib/strchrnul.valgrind
deleted file mode 100644
index b14fa130..00000000
--- a/lib/strchrnul.valgrind
+++ /dev/null
@@ -1,12 +0,0 @@
-# Suppress a valgrind message about use of uninitialized memory in strchrnul().
-# This use is OK because it provides only a speedup.
-{
-    strchrnul-value4
-    Memcheck:Value4
-    fun:strchrnul
-}
-{
-    strchrnul-value8
-    Memcheck:Value8
-    fun:strchrnul
-}
diff --git a/lib/strdup.c b/lib/strdup.c
index 5826ab02..14cb1266 100644
--- a/lib/strdup.c
+++ b/lib/strdup.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1996-1998, 2002-2004, 2006-2007, 2009-2013 Free Software
+/* Copyright (C) 1991, 1996-1998, 2002-2004, 2006-2007, 2009-2014 Free Software
    Foundation, Inc.
 
    This file is part of the GNU C Library.
diff --git a/lib/streq.h b/lib/streq.h
index 12c1867c..0e62fb93 100644
--- a/lib/streq.h
+++ b/lib/streq.h
@@ -1,5 +1,5 @@
 /* Optimized string comparison.
-   Copyright (C) 2001-2002, 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2007, 2009-2014 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
diff --git a/lib/strerror-override.c b/lib/strerror-override.c
index d0ed2fb8..255d9333 100644
--- a/lib/strerror-override.c
+++ b/lib/strerror-override.c
@@ -1,6 +1,6 @@
 /* strerror-override.c --- POSIX compatible system error routine
 
-   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/strerror-override.h b/lib/strerror-override.h
index 3b8f24b9..e98c1c16 100644
--- a/lib/strerror-override.h
+++ b/lib/strerror-override.h
@@ -1,6 +1,6 @@
 /* strerror-override.h --- POSIX compatible system error routine
 
-   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
    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
@@ -48,7 +48,7 @@
      || GNULIB_defined_EOWNERDEAD \
      || GNULIB_defined_ENOTRECOVERABLE \
      || GNULIB_defined_EILSEQ
-extern const char *strerror_override (int errnum);
+extern const char *strerror_override (int errnum) _GL_ATTRIBUTE_CONST;
 # else
 #  define strerror_override(ignored) NULL
 # endif
diff --git a/lib/strerror.c b/lib/strerror.c
index 80a2f2ee..e54f0cc9 100644
--- a/lib/strerror.c
+++ b/lib/strerror.c
@@ -1,6 +1,6 @@
 /* strerror.c --- POSIX compatible system error routine
 
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/strftime.c b/lib/strftime.c
index 91d5d85c..857cca56 100644
--- a/lib/strftime.c
+++ b/lib/strftime.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2001, 2003-2007, 2009-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2001, 2003-2007, 2009-2014 Free Software Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
    Bugs can be reported to bug-glibc@prep.ai.mit.edu.
@@ -681,24 +681,44 @@ strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s,
       switch (format_char)
         {
 #define DO_NUMBER(d, v) \
-          digits = d;                                                         \
-          number_value = v; goto do_number
+          do                                                                  \
+            {                                                                 \
+              digits = d;                                                     \
+              number_value = v;                                               \
+              goto do_number;                                                 \
+            }                                                                 \
+          while (0)
 #define DO_SIGNED_NUMBER(d, negative, v) \
-          digits = d;                                                         \
-          negative_number = negative;                                         \
-          u_number_value = v; goto do_signed_number
+          do                                                                  \
+            {                                                                 \
+              digits = d;                                                     \
+              negative_number = negative;                                     \
+              u_number_value = v;                                             \
+              goto do_signed_number;                                          \
+            }                                                                 \
+          while (0)
 
           /* The mask is not what you might think.
              When the ordinal i'th bit is set, insert a colon
              before the i'th digit of the time zone representation.  */
 #define DO_TZ_OFFSET(d, negative, mask, v) \
-          digits = d;                                                         \
-          negative_number = negative;                                         \
-          tz_colon_mask = mask;                                               \
-          u_number_value = v; goto do_tz_offset
+          do                                                                  \
+            {                                                                 \
+              digits = d;                                                     \
+              negative_number = negative;                                     \
+              tz_colon_mask = mask;                                           \
+              u_number_value = v;                                             \
+              goto do_tz_offset;                                              \
+            }                                                                 \
+          while (0)
 #define DO_NUMBER_SPACEPAD(d, v) \
-          digits = d;                                                         \
-          number_value = v; goto do_number_spacepad
+          do                                                                  \
+            {                                                                 \
+              digits = d;                                                     \
+              number_value = v;                                               \
+              goto do_number_spacepad;                                        \
+            }                                                                 \
+          while (0)
 
         case L_('%'):
           if (modifier != 0)
@@ -1265,9 +1285,9 @@ strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s,
             }
           if (modifier == L_('O'))
             goto bad_format;
-          else
-            DO_SIGNED_NUMBER (4, tp->tm_year < -TM_YEAR_BASE,
-                              tp->tm_year + (unsigned int) TM_YEAR_BASE);
+
+          DO_SIGNED_NUMBER (4, tp->tm_year < -TM_YEAR_BASE,
+                            tp->tm_year + (unsigned int) TM_YEAR_BASE);
 
         case L_('y'):
           if (modifier == L_('E'))
diff --git a/lib/strftime.h b/lib/strftime.h
index a47e6d1e..be016ea8 100644
--- a/lib/strftime.h
+++ b/lib/strftime.h
@@ -1,6 +1,6 @@
 /* declarations for strftime.c
 
-   Copyright (C) 2002, 2004, 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/striconv.c b/lib/striconv.c
index ba90eddb..2495d81c 100644
--- a/lib/striconv.c
+++ b/lib/striconv.c
@@ -1,5 +1,5 @@
 /* Charset conversion.
-   Copyright (C) 2001-2007, 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2010-2014 Free Software Foundation, Inc.
    Written by Bruno Haible and Simon Josefsson.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib/striconv.h b/lib/striconv.h
index 88eaf9dd..5747731e 100644
--- a/lib/striconv.h
+++ b/lib/striconv.h
@@ -1,5 +1,5 @@
 /* Charset conversion.
-   Copyright (C) 2001-2004, 2006-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2007, 2009-2014 Free Software Foundation, Inc.
    Written by Bruno Haible and Simon Josefsson.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib/string.in.h b/lib/string.in.h
index d7a6c9c9..90621420 100644
--- a/lib/string.in.h
+++ b/lib/string.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <string.h>.
 
-   Copyright (C) 1995-1996, 2001-2013 Free Software Foundation, Inc.
+   Copyright (C) 1995-1996, 2001-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/strintcmp.c b/lib/strintcmp.c
index 23398c3e..98665017 100644
--- a/lib/strintcmp.c
+++ b/lib/strintcmp.c
@@ -1,6 +1,6 @@
 /* Compare integer strings.
 
-   Copyright (C) 2005-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/stripslash.c b/lib/stripslash.c
index 0e452a95..6f802d4c 100644
--- a/lib/stripslash.c
+++ b/lib/stripslash.c
@@ -1,6 +1,6 @@
 /* stripslash.c -- remove redundant trailing slashes from a file name
 
-   Copyright (C) 1990, 2001, 2003-2006, 2009-2013 Free Software Foundation,
+   Copyright (C) 1990, 2001, 2003-2006, 2009-2014 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/strncat.c b/lib/strncat.c
index 7fb9f25f..71be4d65 100644
--- a/lib/strncat.c
+++ b/lib/strncat.c
@@ -1,5 +1,5 @@
 /* Concatenate strings.
-   Copyright (C) 1999, 2002, 2006, 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006, 2010-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/lib/strndup.c b/lib/strndup.c
index e60268b8..cc1a4843 100644
--- a/lib/strndup.c
+++ b/lib/strndup.c
@@ -1,6 +1,6 @@
 /* A replacement function, for systems that lack strndup.
 
-   Copyright (C) 1996-1998, 2001-2003, 2005-2007, 2009-2013 Free Software
+   Copyright (C) 1996-1998, 2001-2003, 2005-2007, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
diff --git a/lib/strnlen.c b/lib/strnlen.c
index 57fdfe77..ddccebc6 100644
--- a/lib/strnlen.c
+++ b/lib/strnlen.c
@@ -1,5 +1,5 @@
 /* Find the length of STRING, but scan at most MAXLEN characters.
-   Copyright (C) 2005-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2007, 2009-2014 Free Software Foundation, Inc.
    Written by Simon Josefsson.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib/strnlen1.c b/lib/strnlen1.c
index 0c22d21e..363776a9 100644
--- a/lib/strnlen1.c
+++ b/lib/strnlen1.c
@@ -1,5 +1,5 @@
 /* Find the length of STRING + 1, but scan at most MAXLEN bytes.
-   Copyright (C) 2005-2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/strnlen1.h b/lib/strnlen1.h
index 7c65e316..b2f956f5 100644
--- a/lib/strnlen1.h
+++ b/lib/strnlen1.h
@@ -1,5 +1,5 @@
 /* Find the length of STRING + 1, but scan at most MAXLEN bytes.
-   Copyright (C) 2005, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/strnumcmp-in.h b/lib/strnumcmp-in.h
index 37580332..436f0a6c 100644
--- a/lib/strnumcmp-in.h
+++ b/lib/strnumcmp-in.h
@@ -1,6 +1,6 @@
 /* Compare numeric strings.  This is an internal include file.
 
-   Copyright (C) 1988-2013 Free Software Foundation, Inc.
+   Copyright (C) 1988-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/strnumcmp.c b/lib/strnumcmp.c
index 314eef79..1a9bccfe 100644
--- a/lib/strnumcmp.c
+++ b/lib/strnumcmp.c
@@ -1,6 +1,6 @@
 /* Compare numeric strings.
 
-   Copyright (C) 2005-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/strpbrk.c b/lib/strpbrk.c
index 0f77bcdc..46e58d3b 100644
--- a/lib/strpbrk.c
+++ b/lib/strpbrk.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1994, 2000, 2002-2003, 2006, 2009-2013 Free Software
+/* Copyright (C) 1991, 1994, 2000, 2002-2003, 2006, 2009-2014 Free Software
    Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
diff --git a/lib/strsignal.c b/lib/strsignal.c
index 12cd881f..77ba0630 100644
--- a/lib/strsignal.c
+++ b/lib/strsignal.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1994-2002, 2005, 2008-2013 Free Software Foundation,
+/* Copyright (C) 1991, 1994-2002, 2005, 2008-2014 Free Software Foundation,
    Inc.
    This file is part of the GNU C Library.
 
diff --git a/lib/strstr.c b/lib/strstr.c
index b91acec7..d5b9d784 100644
--- a/lib/strstr.c
+++ b/lib/strstr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1994, 1996-1998, 2000, 2004, 2007-2013 Free Software
+/* Copyright (C) 1991-1994, 1996-1998, 2000, 2004, 2007-2014 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
diff --git a/lib/strtod.c b/lib/strtod.c
index 5c43b4f5..e554a84f 100644
--- a/lib/strtod.c
+++ b/lib/strtod.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1992, 1997, 1999, 2003, 2006, 2008-2013 Free Software
+/* Copyright (C) 1991-1992, 1997, 1999, 2003, 2006, 2008-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -31,9 +31,6 @@
 #ifndef HAVE_LDEXP_IN_LIBC
 #define HAVE_LDEXP_IN_LIBC 0
 #endif
-#ifndef HAVE_RAW_DECL_STRTOD
-#define HAVE_RAW_DECL_STRTOD 0
-#endif
 
 /* Return true if C is a space in the current locale, avoiding
    problems with signed char and isspace.  */
@@ -344,24 +341,11 @@ strtod (const char *nptr, char **endptr)
   return negative ? -num : num;
 }
 
-/* The "underlying" strtod implementation.  This must be defined
+/* The underlying strtod implementation.  This must be defined
    after strtod because it #undefs strtod.  */
 static double
 underlying_strtod (const char *nptr, char **endptr)
 {
-  if (HAVE_RAW_DECL_STRTOD)
-    {
-      /* Prefer the native strtod if available.  Usually it should
-         work and it should give more-accurate results than our
-         approximation.  */
-      #undef strtod
-      return strtod (nptr, endptr);
-    }
-  else
-    {
-      /* Approximate strtod well enough for this module.  There's no
-         need to handle anything but finite unsigned decimal
-         numbers with nonnull ENDPTR.  */
-      return parse_number (nptr, 10, 10, 1, 'e', endptr);
-    }
+#undef strtod
+  return strtod (nptr, endptr);
 }
diff --git a/lib/strtoimax.c b/lib/strtoimax.c
index c9bd2ad3..2c33d585 100644
--- a/lib/strtoimax.c
+++ b/lib/strtoimax.c
@@ -1,6 +1,6 @@
 /* Convert string representation of a number into an intmax_t value.
 
-   Copyright (C) 1999, 2001-2004, 2006, 2009-2013 Free Software Foundation,
+   Copyright (C) 1999, 2001-2004, 2006, 2009-2014 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -28,48 +28,55 @@
 #include "verify.h"
 
 #ifdef UNSIGNED
-# ifndef HAVE_DECL_STRTOULL
+# if HAVE_UNSIGNED_LONG_LONG_INT
+#  ifndef HAVE_DECL_STRTOULL
 "this configure-time declaration test was not run"
-# endif
-# if !HAVE_DECL_STRTOULL && HAVE_UNSIGNED_LONG_LONG_INT
+#  endif
+#  if !HAVE_DECL_STRTOULL
 unsigned long long int strtoull (char const *, char **, int);
+#  endif
 # endif
 
 #else
 
-# ifndef HAVE_DECL_STRTOLL
+# if HAVE_LONG_LONG_INT
+#  ifndef HAVE_DECL_STRTOLL
 "this configure-time declaration test was not run"
-# endif
-# if !HAVE_DECL_STRTOLL && HAVE_LONG_LONG_INT
+#  endif
+#  if !HAVE_DECL_STRTOLL
 long long int strtoll (char const *, char **, int);
+#  endif
 # endif
 #endif
 
 #ifdef UNSIGNED
 # define Have_long_long HAVE_UNSIGNED_LONG_LONG_INT
 # define Int uintmax_t
+# define Strtoimax strtoumax
+# define Strtol strtoul
+# define Strtoll strtoull
 # define Unsigned unsigned
-# define strtoimax strtoumax
-# define strtol strtoul
-# define strtoll strtoull
 #else
 # define Have_long_long HAVE_LONG_LONG_INT
 # define Int intmax_t
+# define Strtoimax strtoimax
+# define Strtol strtol
+# define Strtoll strtoll
 # define Unsigned
 #endif
 
 Int
-strtoimax (char const *ptr, char **endptr, int base)
+Strtoimax (char const *ptr, char **endptr, int base)
 {
 #if Have_long_long
   verify (sizeof (Int) == sizeof (Unsigned long int)
           || sizeof (Int) == sizeof (Unsigned long long int));
 
   if (sizeof (Int) != sizeof (Unsigned long int))
-    return strtoll (ptr, endptr, base);
+    return Strtoll (ptr, endptr, base);
 #else
   verify (sizeof (Int) == sizeof (Unsigned long int));
 #endif
 
-  return strtol (ptr, endptr, base);
+  return Strtol (ptr, endptr, base);
 }
diff --git a/lib/strtol.c b/lib/strtol.c
index 379eda8c..2e015dc5 100644
--- a/lib/strtol.c
+++ b/lib/strtol.c
@@ -1,6 +1,6 @@
 /* Convert string representation of a number into an integer value.
 
-   Copyright (C) 1991-1992, 1994-1999, 2003, 2005-2007, 2009-2013 Free Software
+   Copyright (C) 1991-1992, 1994-1999, 2003, 2005-2007, 2009-2014 Free Software
    Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C
diff --git a/lib/strtoll.c b/lib/strtoll.c
index bb424002..47dfaa06 100644
--- a/lib/strtoll.c
+++ b/lib/strtoll.c
@@ -1,5 +1,5 @@
 /* Function to parse a 'long long int' from text.
-   Copyright (C) 1995-1997, 1999, 2001, 2009-2013 Free Software Foundation,
+   Copyright (C) 1995-1997, 1999, 2001, 2009-2014 Free Software Foundation,
    Inc.
    This file is part of the GNU C Library.
 
diff --git a/lib/strtoul.c b/lib/strtoul.c
index a0ca376c..4c5ceaff 100644
--- a/lib/strtoul.c
+++ b/lib/strtoul.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1997, 2009-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1997, 2009-2014 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/strtoull.c b/lib/strtoull.c
index 494cc2f2..30e6e027 100644
--- a/lib/strtoull.c
+++ b/lib/strtoull.c
@@ -1,5 +1,5 @@
 /* Function to parse an 'unsigned long long int' from text.
-   Copyright (C) 1995-1997, 1999, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 1995-1997, 1999, 2009-2014 Free Software Foundation, Inc.
    NOTE: The canonical source of this file is maintained with the GNU C
    Library.  Bugs can be reported to bug-glibc@gnu.org.
 
diff --git a/lib/symlink.c b/lib/symlink.c
index d3c9f21b..0e3fae25 100644
--- a/lib/symlink.c
+++ b/lib/symlink.c
@@ -1,5 +1,5 @@
 /* Stub for symlink().
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/sys_ioctl.in.h b/lib/sys_ioctl.in.h
index 62024ab0..c13e3172 100644
--- a/lib/sys_ioctl.in.h
+++ b/lib/sys_ioctl.in.h
@@ -1,5 +1,5 @@
 /* Substitute for and wrapper around <sys/ioctl.h>.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/sys_resource.in.h b/lib/sys_resource.in.h
index af546fb4..7a17e32d 100644
--- a/lib/sys_resource.in.h
+++ b/lib/sys_resource.in.h
@@ -1,5 +1,5 @@
 /* Substitute for <sys/resource.h>.
-   Copyright (C) 2012-2013 Free Software Foundation, Inc.
+   Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/sys_select.in.h b/lib/sys_select.in.h
index 521ccef3..a876b9ca 100644
--- a/lib/sys_select.in.h
+++ b/lib/sys_select.in.h
@@ -1,5 +1,5 @@
 /* Substitute for <sys/select.h>.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
@@ -21,23 +21,27 @@
 
 /* On OSF/1 and Solaris 2.6, <sys/types.h> and <sys/time.h>
    both include <sys/select.h>.
+   On Cygwin, <sys/time.h> includes <sys/select.h>.
    Simply delegate to the system's header in this case.  */
 #if (@HAVE_SYS_SELECT_H@                                                \
-     && ((defined __osf__ && defined _SYS_TYPES_H_ && defined _OSF_SOURCE) \
+     && ((defined __osf__ && defined _SYS_TYPES_H_                      \
+          && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H         \
+          && defined _OSF_SOURCE)                                       \
          || (defined __sun && defined _SYS_TYPES_H                      \
              && (! (defined _XOPEN_SOURCE || defined _POSIX_C_SOURCE)   \
-                 || defined __EXTENSIONS__)))                           \
-     && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TYPES_H)
+                 || defined __EXTENSIONS__))))
 
 # define _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TYPES_H
 # @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@
 
 #elif (@HAVE_SYS_SELECT_H@                                              \
-       && ((defined __osf__ && defined _SYS_TIME_H_ && defined _OSF_SOURCE) \
+       && (defined _CYGWIN_SYS_TIME_H                                   \
+           || (defined __osf__ && defined _SYS_TIME_H_                  \
+               && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H    \
+               && defined _OSF_SOURCE)                                  \
            || (defined __sun && defined _SYS_TIME_H                     \
                && (! (defined _XOPEN_SOURCE || defined _POSIX_C_SOURCE) \
-                   || defined __EXTENSIONS__)))                         \
-       && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H)
+                   || defined __EXTENSIONS__))))
 
 # define _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H
 # @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@
diff --git a/lib/sys_socket.in.h b/lib/sys_socket.in.h
index b4cf0c39..3cdc0d11 100644
--- a/lib/sys_socket.in.h
+++ b/lib/sys_socket.in.h
@@ -1,6 +1,6 @@
 /* Provide a sys/socket header file for systems lacking it (read: MinGW)
    and for systems where it is incomplete.
-   Copyright (C) 2005-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2014 Free Software Foundation, Inc.
    Written by Simon Josefsson.
 
    This program is free software; you can redistribute it and/or modify
@@ -63,6 +63,9 @@
 #ifndef _@GUARD_PREFIX@_SYS_SOCKET_H
 #define _@GUARD_PREFIX@_SYS_SOCKET_H
 
+#ifndef _GL_INLINE_HEADER_BEGIN
+ #error "Please include config.h first."
+#endif
 _GL_INLINE_HEADER_BEGIN
 #ifndef _GL_SYS_SOCKET_INLINE
 # define _GL_SYS_SOCKET_INLINE _GL_INLINE
diff --git a/lib/sys_stat.in.h b/lib/sys_stat.in.h
index acc36947..b47a7ff0 100644
--- a/lib/sys_stat.in.h
+++ b/lib/sys_stat.in.h
@@ -1,5 +1,5 @@
 /* Provide a more complete sys/stat header file.
-   Copyright (C) 2005-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/sys_time.in.h b/lib/sys_time.in.h
index 656c3f13..30057ad4 100644
--- a/lib/sys_time.in.h
+++ b/lib/sys_time.in.h
@@ -1,6 +1,6 @@
 /* Provide a more complete sys/time.h.
 
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
@@ -24,6 +24,15 @@
 #endif
 @PRAGMA_COLUMNS@
 
+/* On Cygwin and on many BSDish systems, <sys/time.h> includes itself
+   recursively via <sys/select.h>.
+   Simply delegate to the system's header in this case; it is a no-op.
+   Without this extra ifdef, the C++ gettimeofday declaration below
+   would be a forward declaration in gnulib's nested <sys/time.h>.  */
+#if defined _CYGWIN_SYS_TIME_H || defined _SYS_TIME_H || defined _SYS_TIME_H_
+# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
+#else
+
 /* The include_next requires a split double-inclusion guard.  */
 #if @HAVE_SYS_TIME_H@
 # @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
@@ -200,4 +209,5 @@ _GL_WARN_ON_USE (gettimeofday, "gettimeofday is unportable - "
 #endif
 
 #endif /* _@GUARD_PREFIX@_SYS_TIME_H */
+#endif /* _CYGWIN_SYS_TIME_H */
 #endif /* _@GUARD_PREFIX@_SYS_TIME_H */
diff --git a/lib/sys_types.in.h b/lib/sys_types.in.h
index d7da3562..deb5d67d 100644
--- a/lib/sys_types.in.h
+++ b/lib/sys_types.in.h
@@ -1,6 +1,6 @@
 /* Provide a more complete sys/types.h.
 
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
@@ -23,7 +23,9 @@
 #ifndef _@GUARD_PREFIX@_SYS_TYPES_H
 
 /* The include_next requires a split double-inclusion guard.  */
+# define _GL_INCLUDING_SYS_TYPES_H
 #@INCLUDE_NEXT@ @NEXT_SYS_TYPES_H@
+# undef _GL_INCLUDING_SYS_TYPES_H
 
 #ifndef _@GUARD_PREFIX@_SYS_TYPES_H
 #define _@GUARD_PREFIX@_SYS_TYPES_H
diff --git a/lib/sys_uio.in.h b/lib/sys_uio.in.h
index fef19dc3..0b403bc1 100644
--- a/lib/sys_uio.in.h
+++ b/lib/sys_uio.in.h
@@ -1,5 +1,5 @@
 /* Substitute for <sys/uio.h>.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/sys_utsname.in.h b/lib/sys_utsname.in.h
index d468ba9c..f9e9d9d9 100644
--- a/lib/sys_utsname.in.h
+++ b/lib/sys_utsname.in.h
@@ -1,5 +1,5 @@
 /* Substitute for <sys/utsname.h>.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/sys_wait.in.h b/lib/sys_wait.in.h
index bd97d61f..6412af4d 100644
--- a/lib/sys_wait.in.h
+++ b/lib/sys_wait.in.h
@@ -1,5 +1,5 @@
 /* A POSIX-like <sys/wait.h>.
-   Copyright (C) 2001-2003, 2005-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/tempname.c b/lib/tempname.c
index bdb4f21a..183dae8c 100644
--- a/lib/tempname.c
+++ b/lib/tempname.c
@@ -1,6 +1,6 @@
 /* tempname.c - generate the name of a temporary file.
 
-   Copyright (C) 1991-2003, 2005-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 1991-2003, 2005-2007, 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -70,10 +70,7 @@
 # define __mkdir mkdir
 # define __open open
 # define __lxstat64(version, file, buf) lstat (file, buf)
-#endif
-
-#if ! (HAVE___SECURE_GETENV || _LIBC)
-# define __secure_getenv getenv
+# define __secure_getenv secure_getenv
 #endif
 
 #ifdef _LIBC
diff --git a/lib/tempname.h b/lib/tempname.h
index 1709e99d..696aff25 100644
--- a/lib/tempname.h
+++ b/lib/tempname.h
@@ -1,6 +1,6 @@
 /* Create a temporary file or directory.
 
-   Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/termios.in.h b/lib/termios.in.h
index 1a5d7e52..1299bb73 100644
--- a/lib/termios.in.h
+++ b/lib/termios.in.h
@@ -1,5 +1,5 @@
 /* Substitute for and wrapper around <termios.h>.
-   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/time.in.h b/lib/time.in.h
index 8ced7947..81abdf46 100644
--- a/lib/time.in.h
+++ b/lib/time.in.h
@@ -1,6 +1,6 @@
 /* A more-standard <time.h>.
 
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
@@ -48,20 +48,13 @@
 
 /* Some systems don't define struct timespec (e.g., AIX 4.1, Ultrix 4.3).
    Or they define it with the wrong member names or define it in <sys/time.h>
-   (e.g., FreeBSD circa 1997).  Stock Mingw does not define it, but the
-   pthreads-win32 library defines it in <pthread.h>.  */
+   (e.g., FreeBSD circa 1997).  Stock Mingw prior to 3.0 does not define it,
+   but the pthreads-win32 library defines it in <pthread.h>.  */
 # if ! @TIME_H_DEFINES_STRUCT_TIMESPEC@
 #  if @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@
 #   include <sys/time.h>
 #  elif @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
 #   include <pthread.h>
-/* The pthreads-win32 <pthread.h> also defines a couple of broken macros.  */
-#   undef asctime_r
-#   undef ctime_r
-#   undef gmtime_r
-#   undef localtime_r
-#   undef rand_r
-#   undef strtok_r
 #  else
 
 #   ifdef __cplusplus
@@ -187,6 +180,39 @@ _GL_CXXALIASWARN (gmtime_r);
 #  endif
 # endif
 
+/* Convert TIMER to RESULT, assuming local time and UTC respectively.  See
+   <http://www.opengroup.org/susv3xsh/localtime.html> and
+   <http://www.opengroup.org/susv3xsh/gmtime.html>.  */
+# if @GNULIB_GETTIMEOFDAY@
+#  if @REPLACE_LOCALTIME@
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    undef localtime
+#    define localtime rpl_localtime
+#   endif
+_GL_FUNCDECL_RPL (localtime, struct tm *, (time_t const *__timer)
+		                          _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (localtime, struct tm *, (time_t const *__timer));
+#  else
+_GL_CXXALIAS_SYS (localtime, struct tm *, (time_t const *__timer));
+#  endif
+_GL_CXXALIASWARN (localtime);
+# endif
+
+# if @GNULIB_GETTIMEOFDAY@
+#  if @REPLACE_GMTIME@
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    undef gmtime
+#    define gmtime rpl_gmtime
+#   endif
+_GL_FUNCDECL_RPL (gmtime, struct tm *, (time_t const *__timer)
+                                       _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (gmtime, struct tm *, (time_t const *__timer));
+#  else
+_GL_CXXALIAS_SYS (gmtime, struct tm *, (time_t const *__timer));
+#  endif
+_GL_CXXALIASWARN (gmtime);
+# endif
+
 /* Parse BUF as a time stamp, assuming FORMAT specifies its layout, and store
    the resulting broken-down time into TM.  See
    <http://www.opengroup.org/susv3xsh/strptime.html>.  */
diff --git a/lib/time_r.c b/lib/time_r.c
index 98662998..a848d544 100644
--- a/lib/time_r.c
+++ b/lib/time_r.c
@@ -1,6 +1,6 @@
 /* Reentrant time functions like localtime_r.
 
-   Copyright (C) 2003, 2006-2007, 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006-2007, 2010-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/timespec.h b/lib/timespec.h
index d665e6cc..872cbb76 100644
--- a/lib/timespec.h
+++ b/lib/timespec.h
@@ -1,6 +1,6 @@
 /* timespec -- System time interface
 
-   Copyright (C) 2000, 2002, 2004-2005, 2007, 2009-2013 Free Software
+   Copyright (C) 2000, 2002, 2004-2005, 2007, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -21,11 +21,31 @@
 
 # include <time.h>
 
+#ifndef _GL_INLINE_HEADER_BEGIN
+ #error "Please include config.h first."
+#endif
 _GL_INLINE_HEADER_BEGIN
 #ifndef _GL_TIMESPEC_INLINE
 # define _GL_TIMESPEC_INLINE _GL_INLINE
 #endif
 
+/* Resolution of timespec time stamps (in units per second), and log
+   base 10 of the resolution.  */
+
+enum { TIMESPEC_RESOLUTION = 1000000000 };
+enum { LOG10_TIMESPEC_RESOLUTION = 9 };
+
+/* Return a timespec with seconds S and nanoseconds NS.  */
+
+_GL_TIMESPEC_INLINE struct timespec
+make_timespec (time_t s, long int ns)
+{
+  struct timespec r;
+  r.tv_sec = s;
+  r.tv_nsec = ns;
+  return r;
+}
+
 /* Return negative, zero, positive if A < B, A == B, A > B, respectively.
 
    For each time stamp T, this code assumes that either:
diff --git a/lib/trim.c b/lib/trim.c
index 9581f511..742de9be 100644
--- a/lib/trim.c
+++ b/lib/trim.c
@@ -1,5 +1,5 @@
 /* Removes leading and/or trailing whitespaces
-   Copyright (C) 2006-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/trim.h b/lib/trim.h
index ab0caa1b..e4dc938b 100644
--- a/lib/trim.h
+++ b/lib/trim.h
@@ -1,5 +1,5 @@
 /* Removes leading and/or trailing whitespaces
-   Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/u64.h b/lib/u64.h
index d8009ad3..ee3bfcd8 100644
--- a/lib/u64.h
+++ b/lib/u64.h
@@ -1,6 +1,6 @@
 /* uint64_t-like operations that work even on hosts lacking uint64_t
 
-   Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -19,6 +19,9 @@
 
 #include <stdint.h>
 
+#ifndef _GL_INLINE_HEADER_BEGIN
+ #error "Please include config.h first."
+#endif
 _GL_INLINE_HEADER_BEGIN
 #ifndef _GL_U64_INLINE
 # define _GL_U64_INLINE _GL_INLINE
diff --git a/lib/uname.c b/lib/uname.c
index e6b29a47..c1d85196 100644
--- a/lib/uname.c
+++ b/lib/uname.c
@@ -1,5 +1,5 @@
 /* uname replacement.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/unicodeio.c b/lib/unicodeio.c
index 62aee248..9df8b79f 100644
--- a/lib/unicodeio.c
+++ b/lib/unicodeio.c
@@ -1,6 +1,6 @@
 /* Unicode character output to streams with locale dependent encoding.
 
-   Copyright (C) 2000-2003, 2006, 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2006, 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/unicodeio.h b/lib/unicodeio.h
index eee7e284..1706cf64 100644
--- a/lib/unicodeio.h
+++ b/lib/unicodeio.h
@@ -1,6 +1,6 @@
 /* Unicode character output to streams with locale dependent encoding.
 
-   Copyright (C) 2000-2003, 2005, 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2005, 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/unistd--.h b/lib/unistd--.h
index ac2de1cf..9d0e54d1 100644
--- a/lib/unistd--.h
+++ b/lib/unistd--.h
@@ -1,6 +1,6 @@
 /* Like unistd.h, but redefine some names to avoid glitches.
 
-   Copyright (C) 2005, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/unistd-safer.h b/lib/unistd-safer.h
index 5c2b55ae..4b0ca6ab 100644
--- a/lib/unistd-safer.h
+++ b/lib/unistd-safer.h
@@ -1,6 +1,6 @@
 /* Invoke unistd-like functions, but avoid some glitches.
 
-   Copyright (C) 2001, 2003, 2005, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003, 2005, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/unistd.in.h b/lib/unistd.in.h
index a870fe7b..622b2287 100644
--- a/lib/unistd.in.h
+++ b/lib/unistd.in.h
@@ -1,5 +1,5 @@
 /* Substitute for and wrapper around <unistd.h>.
-   Copyright (C) 2003-2013 Free Software Foundation, Inc.
+   Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
    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
@@ -21,9 +21,23 @@
 #endif
 @PRAGMA_COLUMNS@
 
+#ifdef _GL_INCLUDING_UNISTD_H
+/* Special invocation convention:
+   - On Mac OS X 10.3.9 we have a sequence of nested includes
+     <unistd.h> -> <signal.h> -> <pthread.h> -> <unistd.h>
+     In this situation, the functions are not yet declared, therefore we cannot
+     provide the C++ aliases.  */
+
+#@INCLUDE_NEXT@ @NEXT_UNISTD_H@
+
+#else
+/* Normal invocation convention.  */
+
 /* The include_next requires a split double-inclusion guard.  */
 #if @HAVE_UNISTD_H@
+# define _GL_INCLUDING_UNISTD_H
 # @INCLUDE_NEXT@ @NEXT_UNISTD_H@
+# undef _GL_INCLUDING_UNISTD_H
 #endif
 
 /* Get all possible declarations of gethostname().  */
@@ -61,8 +75,10 @@
 /* mingw, MSVC, BeOS, Haiku declare environ in <stdlib.h>, not in
    <unistd.h>.  */
 /* Solaris declares getcwd not only in <unistd.h> but also in <stdlib.h>.  */
+/* OSF Tru64 Unix cannot see gnulib rpl_strtod when system <stdlib.h> is
+   included here.  */
 /* But avoid namespace pollution on glibc systems.  */
-#ifndef __GLIBC__
+#if !defined __GLIBC__ && !defined __osf__
 # define __need_system_stdlib_h
 # include <stdlib.h>
 # undef __need_system_stdlib_h
@@ -110,9 +126,13 @@
 /* Get getopt(), optarg, optind, opterr, optopt.
    But avoid namespace pollution on glibc systems.  */
 #if @GNULIB_UNISTD_H_GETOPT@ && !defined __GLIBC__ && !defined _GL_SYSTEM_GETOPT
+# define __need_getopt
 # include <getopt.h>
 #endif
 
+#ifndef _GL_INLINE_HEADER_BEGIN
+ #error "Please include config.h first."
+#endif
 _GL_INLINE_HEADER_BEGIN
 #ifndef _GL_UNISTD_INLINE
 # define _GL_UNISTD_INLINE _GL_INLINE
@@ -648,10 +668,19 @@ _GL_WARN_ON_USE (getdomainname, "getdomainname is unportable - "
 #if @GNULIB_GETDTABLESIZE@
 /* Return the maximum number of file descriptors in the current process.
    In POSIX, this is same as sysconf (_SC_OPEN_MAX).  */
-# if !@HAVE_GETDTABLESIZE@
+# if @REPLACE_GETDTABLESIZE@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef getdtablesize
+#   define getdtablesize rpl_getdtablesize
+#  endif
+_GL_FUNCDECL_RPL (getdtablesize, int, (void));
+_GL_CXXALIAS_RPL (getdtablesize, int, (void));
+# else
+#  if !@HAVE_GETDTABLESIZE@
 _GL_FUNCDECL_SYS (getdtablesize, int, (void));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (getdtablesize, int, (void));
+# endif
 _GL_CXXALIASWARN (getdtablesize);
 #elif defined GNULIB_POSIXCHECK
 # undef getdtablesize
@@ -1524,4 +1553,5 @@ _GL_CXXALIASWARN (write);
 _GL_INLINE_HEADER_END
 
 #endif /* _@GUARD_PREFIX@_UNISTD_H */
+#endif /* _GL_INCLUDING_UNISTD_H */
 #endif /* _@GUARD_PREFIX@_UNISTD_H */
diff --git a/lib/unistr.in.h b/lib/unistr.in.h
index 980b4bbf..222c9595 100644
--- a/lib/unistr.in.h
+++ b/lib/unistr.in.h
@@ -1,5 +1,5 @@
 /* Elementary Unicode string functions.
-   Copyright (C) 2001-2002, 2005-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2005-2014 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
diff --git a/lib/unistr/u8-mbtoucr.c b/lib/unistr/u8-mbtoucr.c
index 72cab8dc..b11543a5 100644
--- a/lib/unistr/u8-mbtoucr.c
+++ b/lib/unistr/u8-mbtoucr.c
@@ -1,5 +1,5 @@
 /* Look at first character in UTF-8 string, returning an error code.
-   Copyright (C) 1999-2002, 2006-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 1999-2002, 2006-2007, 2009-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/lib/unistr/u8-uctomb-aux.c b/lib/unistr/u8-uctomb-aux.c
index 47c2e882..8fdd88b5 100644
--- a/lib/unistr/u8-uctomb-aux.c
+++ b/lib/unistr/u8-uctomb-aux.c
@@ -1,5 +1,5 @@
 /* Conversion UCS-4 to UTF-8.
-   Copyright (C) 2002, 2006-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/lib/unistr/u8-uctomb.c b/lib/unistr/u8-uctomb.c
index 1932a2b4..df9b227e 100644
--- a/lib/unistr/u8-uctomb.c
+++ b/lib/unistr/u8-uctomb.c
@@ -1,5 +1,5 @@
 /* Store a character in UTF-8 string.
-   Copyright (C) 2002, 2005-2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005-2006, 2009-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/lib/unitypes.in.h b/lib/unitypes.in.h
index 06eef05c..bc302c24 100644
--- a/lib/unitypes.in.h
+++ b/lib/unitypes.in.h
@@ -1,5 +1,5 @@
 /* Elementary types and macros for the GNU UniString library.
-   Copyright (C) 2002, 2005-2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005-2006, 2009-2014 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
diff --git a/lib/uniwidth.in.h b/lib/uniwidth.in.h
index 8931cc9b..b2fd218e 100644
--- a/lib/uniwidth.in.h
+++ b/lib/uniwidth.in.h
@@ -1,5 +1,5 @@
 /* Display width functions.
-   Copyright (C) 2001-2002, 2005, 2007, 2009-2013 Free Software Foundation,
+   Copyright (C) 2001-2002, 2005, 2007, 2009-2014 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/lib/uniwidth/cjk.h b/lib/uniwidth/cjk.h
index 11b14dfe..71ea0cb7 100644
--- a/lib/uniwidth/cjk.h
+++ b/lib/uniwidth/cjk.h
@@ -1,5 +1,5 @@
 /* Test for CJK encoding.
-   Copyright (C) 2001-2002, 2005-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2005-2007, 2009-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/lib/uniwidth/width.c b/lib/uniwidth/width.c
index 173d0872..2c070c3e 100644
--- a/lib/uniwidth/width.c
+++ b/lib/uniwidth/width.c
@@ -1,5 +1,5 @@
 /* Determine display width of Unicode character.
-   Copyright (C) 2001-2002, 2006-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2006-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/lib/unlink.c b/lib/unlink.c
index fdd5565f..a234be4a 100644
--- a/lib/unlink.c
+++ b/lib/unlink.c
@@ -1,6 +1,6 @@
 /* Work around unlink bugs.
 
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/unlinkat.c b/lib/unlinkat.c
index 67263721..fff8310e 100644
--- a/lib/unlinkat.c
+++ b/lib/unlinkat.c
@@ -1,6 +1,6 @@
 /* Work around unlinkat bugs on Solaris 9 and Hurd.
 
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/unlocked-io.h b/lib/unlocked-io.h
index df3e1391..4b0f3ff0 100644
--- a/lib/unlocked-io.h
+++ b/lib/unlocked-io.h
@@ -1,6 +1,6 @@
 /* Prefer faster, non-thread-safe stdio functions if available.
 
-   Copyright (C) 2001-2004, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/unsetenv.c b/lib/unsetenv.c
index eea21129..53721fc4 100644
--- a/lib/unsetenv.c
+++ b/lib/unsetenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1995-2002, 2005-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995-2002, 2005-2014 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
@@ -14,12 +14,12 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
-
 /* Don't use __attribute__ __nonnull__ in this compilation unit.  Otherwise gcc
    optimizes away the name == NULL test below.  */
 #define _GL_ARG_NONNULL(params)
 
+#include <config.h>
+
 /* Specification.  */
 #include <stdlib.h>
 
diff --git a/lib/userspec.c b/lib/userspec.c
index d760996c..1be9266e 100644
--- a/lib/userspec.c
+++ b/lib/userspec.c
@@ -1,5 +1,5 @@
 /* userspec.c -- Parse a user and group string.
-   Copyright (C) 1989-1992, 1997-1998, 2000, 2002-2013 Free Software
+   Copyright (C) 1989-1992, 1997-1998, 2000, 2002-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -114,10 +114,13 @@ parse_with_separator (char const *spec, char const *separator,
   char const *g;
   char *gname = NULL;
   uid_t unum = *uid;
-  gid_t gnum = *gid;
+  gid_t gnum = gid ? *gid : -1;
 
   error_msg = NULL;
-  *username = *groupname = NULL;
+  if (username)
+    *username = NULL;
+  if (groupname)
+    *groupname = NULL;
 
   /* Set U and G to nonzero length strings corresponding to user and
      group specifiers or to NULL.  If U is not NULL, it is a newly
@@ -215,20 +218,29 @@ parse_with_separator (char const *spec, char const *separator,
   if (error_msg == NULL)
     {
       *uid = unum;
-      *gid = gnum;
-      *username = u;
-      *groupname = gname;
-      u = NULL;
+      if (gid)
+        *gid = gnum;
+      if (username)
+        {
+          *username = u;
+          u = NULL;
+        }
+      if (groupname)
+        {
+          *groupname = gname;
+          gname = NULL;
+        }
     }
-  else
-    free (gname);
 
   free (u);
+  free (gname);
   return _(error_msg);
 }
 
 /* Extract from SPEC, which has the form "[user][:.][group]",
    a USERNAME, UID U, GROUPNAME, and GID G.
+   If the GID parameter is NULL the entire SPEC is treated as a user.
+   If the USERNAME and GROUPNAME parameters are NULL they're ignored.
    Either user or group, or both, must be present.
    If the group is omitted but the separator is given,
    use the given user's login group.
@@ -247,11 +259,11 @@ char const *
 parse_user_spec (char const *spec, uid_t *uid, gid_t *gid,
                  char **username, char **groupname)
 {
-  char const *colon = strchr (spec, ':');
+  char const *colon = gid ? strchr (spec, ':') : NULL;
   char const *error_msg =
     parse_with_separator (spec, colon, uid, gid, username, groupname);
 
-  if (!colon && error_msg)
+  if (gid && !colon && error_msg)
     {
       /* If there's no colon but there is a dot, and if looking up the
          whole spec failed (i.e., the spec is not an owner name that
diff --git a/lib/utimecmp.c b/lib/utimecmp.c
index dc622ad1..49ea5f86 100644
--- a/lib/utimecmp.c
+++ b/lib/utimecmp.c
@@ -1,6 +1,6 @@
 /* utimecmp.c -- compare file time stamps
 
-   Copyright (C) 2004-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2004-2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/utimecmp.h b/lib/utimecmp.h
index 1bc90186..81c16e27 100644
--- a/lib/utimecmp.h
+++ b/lib/utimecmp.h
@@ -1,6 +1,6 @@
 /* utimecmp.h -- compare file time stamps
 
-   Copyright (C) 2004, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/utimens.c b/lib/utimens.c
index 87123605..dd3ec668 100644
--- a/lib/utimens.c
+++ b/lib/utimens.c
@@ -1,6 +1,6 @@
 /* Set file access and modification times.
 
-   Copyright (C) 2003-2013 Free Software Foundation, Inc.
+   Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
    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
@@ -90,10 +90,12 @@ validate_timespec (struct timespec timespec[2])
   assert (timespec);
   if ((timespec[0].tv_nsec != UTIME_NOW
        && timespec[0].tv_nsec != UTIME_OMIT
-       && (timespec[0].tv_nsec < 0 || 1000000000 <= timespec[0].tv_nsec))
+       && ! (0 <= timespec[0].tv_nsec
+             && timespec[0].tv_nsec < TIMESPEC_RESOLUTION))
       || (timespec[1].tv_nsec != UTIME_NOW
           && timespec[1].tv_nsec != UTIME_OMIT
-          && (timespec[1].tv_nsec < 0 || 1000000000 <= timespec[1].tv_nsec)))
+          && ! (0 <= timespec[1].tv_nsec
+                && timespec[1].tv_nsec < TIMESPEC_RESOLUTION)))
     {
       errno = EINVAL;
       return -1;
@@ -216,15 +218,19 @@ fdutimens (int fd, char const *file, struct timespec const timespec[2])
   if (0 <= utimensat_works_really)
     {
       int result;
-# if __linux__
+# if __linux__ || __sun
       /* As recently as Linux kernel 2.6.32 (Dec 2009), several file
          systems (xfs, ntfs-3g) have bugs with a single UTIME_OMIT,
          but work if both times are either explicitly specified or
          UTIME_NOW.  Work around it with a preparatory [f]stat prior
          to calling futimens/utimensat; fortunately, there is not much
          timing impact due to the extra syscall even on file systems
-         where UTIME_OMIT would have worked.  FIXME: Simplify this in
-         2012, when file system bugs are no longer common.  */
+         where UTIME_OMIT would have worked.
+
+         The same bug occurs in Solaris 11.1 (Apr 2013).
+
+         FIXME: Simplify this for Linux in 2016 and for Solaris in
+         2024, when file system bugs are no longer common.  */
       if (adjustment_needed == 2)
         {
           if (fd < 0 ? stat (file, &st) : fstat (fd, &st))
@@ -236,7 +242,7 @@ fdutimens (int fd, char const *file, struct timespec const timespec[2])
           /* Note that st is good, in case utimensat gives ENOSYS.  */
           adjustment_needed++;
         }
-# endif /* __linux__ */
+# endif
 # if HAVE_UTIMENSAT
       if (fd < 0)
         {
@@ -445,15 +451,19 @@ lutimens (char const *file, struct timespec const timespec[2])
   if (0 <= lutimensat_works_really)
     {
       int result;
-# if __linux__
+# if __linux__ || __sun
       /* As recently as Linux kernel 2.6.32 (Dec 2009), several file
          systems (xfs, ntfs-3g) have bugs with a single UTIME_OMIT,
          but work if both times are either explicitly specified or
          UTIME_NOW.  Work around it with a preparatory lstat prior to
          calling utimensat; fortunately, there is not much timing
          impact due to the extra syscall even on file systems where
-         UTIME_OMIT would have worked.  FIXME: Simplify this in 2012,
-         when file system bugs are no longer common.  */
+         UTIME_OMIT would have worked.
+
+         The same bug occurs in Solaris 11.1 (Apr 2013).
+
+         FIXME: Simplify this for Linux in 2016 and for Solaris in
+         2024, when file system bugs are no longer common.  */
       if (adjustment_needed == 2)
         {
           if (lstat (file, &st))
@@ -465,7 +475,7 @@ lutimens (char const *file, struct timespec const timespec[2])
           /* Note that st is good, in case utimensat gives ENOSYS.  */
           adjustment_needed++;
         }
-# endif /* __linux__ */
+# endif
       result = utimensat (AT_FDCWD, file, ts, AT_SYMLINK_NOFOLLOW);
 # ifdef __linux__
       /* Work around a kernel bug:
diff --git a/lib/utimens.h b/lib/utimens.h
index 82a72a7a..faaf3c70 100644
--- a/lib/utimens.h
+++ b/lib/utimens.h
@@ -1,6 +1,6 @@
 /* Set file access and modification times.
 
-   Copyright 2012-2013 Free Software Foundation, Inc.
+   Copyright 2012-2014 Free Software Foundation, Inc.
 
    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
@@ -26,6 +26,9 @@ int lutimens (char const *, struct timespec const [2]);
 # include <fcntl.h>
 # include <sys/stat.h>
 
+#ifndef _GL_INLINE_HEADER_BEGIN
+ #error "Please include config.h first."
+#endif
 _GL_INLINE_HEADER_BEGIN
 #ifndef _GL_UTIMENS_INLINE
 # define _GL_UTIMENS_INLINE _GL_INLINE
diff --git a/lib/utimensat.c b/lib/utimensat.c
index 01104002..185cb14c 100644
--- a/lib/utimensat.c
+++ b/lib/utimensat.c
@@ -1,5 +1,5 @@
 /* Set the access and modification time of a file relative to directory fd.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -48,7 +48,7 @@ int
 rpl_utimensat (int fd, char const *file, struct timespec const times[2],
                int flag)
 {
-# ifdef __linux__
+# if defined __linux__ || defined __sun
   struct timespec ts[2];
 # endif
 
@@ -57,7 +57,7 @@ rpl_utimensat (int fd, char const *file, struct timespec const times[2],
   if (0 <= utimensat_works_really)
     {
       int result;
-# ifdef __linux__
+# if defined __linux__ || defined __sun
       struct stat st;
       /* As recently as Linux kernel 2.6.32 (Dec 2009), several file
          systems (xfs, ntfs-3g) have bugs with a single UTIME_OMIT,
@@ -65,8 +65,12 @@ rpl_utimensat (int fd, char const *file, struct timespec const times[2],
          UTIME_NOW.  Work around it with a preparatory [l]stat prior
          to calling utimensat; fortunately, there is not much timing
          impact due to the extra syscall even on file systems where
-         UTIME_OMIT would have worked.  FIXME: Simplify this in 2012,
-         when file system bugs are no longer common.  */
+         UTIME_OMIT would have worked.
+
+         The same bug occurs in Solaris 11.1 (Apr 2013).
+
+         FIXME: Simplify this for Linux in 2016 and for Solaris in
+         2024, when file system bugs are no longer common.  */
       if (times && (times[0].tv_nsec == UTIME_OMIT
                     || times[1].tv_nsec == UTIME_OMIT))
         {
@@ -89,17 +93,17 @@ rpl_utimensat (int fd, char const *file, struct timespec const times[2],
          values.  */
       else if (times
                && ((times[0].tv_nsec != UTIME_NOW
-                    && (times[0].tv_nsec < 0
-                        || times[0].tv_nsec >= 1000000000))
+                    && ! (0 <= times[0].tv_nsec
+                          && times[0].tv_nsec < TIMESPEC_RESOLUTION))
                    || (times[1].tv_nsec != UTIME_NOW
-                       && (times[1].tv_nsec < 0
-                           || times[1].tv_nsec >= 1000000000))))
+                       && ! (0 <= times[1].tv_nsec
+                             && times[1].tv_nsec < TIMESPEC_RESOLUTION))))
         {
           errno = EINVAL;
           return -1;
         }
 #  endif
-# endif /* __linux__ */
+# endif
       result = utimensat (fd, file, times, flag);
       /* Linux kernel 2.6.25 has a bug where it returns EINVAL for
          UTIME_NOW or UTIME_OMIT with non-zero tv_sec, which
diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
index 8fdab32e..b7c8709e 100644
--- a/lib/vasnprintf.c
+++ b/lib/vasnprintf.c
@@ -1,5 +1,5 @@
 /* vsprintf with automatic memory allocation.
-   Copyright (C) 1999, 2002-2013 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002-2014 Free Software Foundation, Inc.
 
    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
@@ -5153,7 +5153,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                                 size_t tmp_length =
                                   MAX_ROOM_NEEDED (&a, dp->arg_index,
                                                    dp->conversion, type, flags,
-                                                   width, has_precision,
+                                                   has_width ? width : 0,
+                                                   has_precision,
                                                    precision, pad_ourselves);
 
                                 if (maxlen < tmp_length)
diff --git a/lib/vasnprintf.h b/lib/vasnprintf.h
index 7658f505..daa946dc 100644
--- a/lib/vasnprintf.h
+++ b/lib/vasnprintf.h
@@ -1,5 +1,5 @@
 /* vsprintf with automatic memory allocation.
-   Copyright (C) 2002-2004, 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002-2004, 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/vasprintf.c b/lib/vasprintf.c
index d0d4a11b..eed90374 100644
--- a/lib/vasprintf.c
+++ b/lib/vasprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2013 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/verify.h b/lib/verify.h
index cb8e90b5..a25e5146 100644
--- a/lib/verify.h
+++ b/lib/verify.h
@@ -1,6 +1,6 @@
 /* Compile-time assert-like macros.
 
-   Copyright (C) 2005-2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 /* Written by Paul Eggert, Bruno Haible, and Jim Meyering.  */
 
 #ifndef _GL_VERIFY_H
-# define _GL_VERIFY_H
+#define _GL_VERIFY_H
 
 
 /* Define _GL_HAVE__STATIC_ASSERT to 1 if _Static_assert works as per C11.
@@ -31,14 +31,24 @@
    Use this only with GCC.  If we were willing to slow 'configure'
    down we could also use it with other compilers, but since this
    affects only the quality of diagnostics, why bother?  */
-# if (4 < __GNUC__ || (__GNUC__ == 4 && 6 <= __GNUC_MINOR__)) && !defined __cplusplus
-#  define _GL_HAVE__STATIC_ASSERT 1
-# endif
+#if (4 < __GNUC__ + (6 <= __GNUC_MINOR__) \
+     && (201112L <= __STDC_VERSION__  || !defined __STRICT_ANSI__) \
+     && !defined __cplusplus)
+# define _GL_HAVE__STATIC_ASSERT 1
+#endif
 /* The condition (99 < __GNUC__) is temporary, until we know about the
    first G++ release that supports static_assert.  */
-# if (99 < __GNUC__) && defined __cplusplus
-#  define _GL_HAVE_STATIC_ASSERT 1
-# endif
+#if (99 < __GNUC__) && defined __cplusplus
+# define _GL_HAVE_STATIC_ASSERT 1
+#endif
+
+/* FreeBSD 9.1 <sys/cdefs.h>, included by <stddef.h> and lots of other
+   system headers, defines a conflicting _Static_assert that is no
+   better than ours; override it.  */
+#ifndef _GL_HAVE_STATIC_ASSERT
+# include <stddef.h>
+# undef _Static_assert
+#endif
 
 /* Each of these macros verifies that its argument R is nonzero.  To
    be portable, R should be an integer constant expression.  Unlike
@@ -141,50 +151,50 @@
      Use a template type to work around the problem.  */
 
 /* Concatenate two preprocessor tokens.  */
-# define _GL_CONCAT(x, y) _GL_CONCAT0 (x, y)
-# define _GL_CONCAT0(x, y) x##y
+#define _GL_CONCAT(x, y) _GL_CONCAT0 (x, y)
+#define _GL_CONCAT0(x, y) x##y
 
 /* _GL_COUNTER is an integer, preferably one that changes each time we
    use it.  Use __COUNTER__ if it works, falling back on __LINE__
    otherwise.  __LINE__ isn't perfect, but it's better than a
    constant.  */
-# if defined __COUNTER__ && __COUNTER__ != __COUNTER__
-#  define _GL_COUNTER __COUNTER__
-# else
-#  define _GL_COUNTER __LINE__
-# endif
+#if defined __COUNTER__ && __COUNTER__ != __COUNTER__
+# define _GL_COUNTER __COUNTER__
+#else
+# define _GL_COUNTER __LINE__
+#endif
 
 /* Generate a symbol with the given prefix, making it unique if
    possible.  */
-# define _GL_GENSYM(prefix) _GL_CONCAT (prefix, _GL_COUNTER)
+#define _GL_GENSYM(prefix) _GL_CONCAT (prefix, _GL_COUNTER)
 
 /* Verify requirement R at compile-time, as an integer constant expression
    that returns 1.  If R is false, fail at compile-time, preferably
    with a diagnostic that includes the string-literal DIAGNOSTIC.  */
 
-# define _GL_VERIFY_TRUE(R, DIAGNOSTIC) \
-    (!!sizeof (_GL_VERIFY_TYPE (R, DIAGNOSTIC)))
+#define _GL_VERIFY_TRUE(R, DIAGNOSTIC) \
+   (!!sizeof (_GL_VERIFY_TYPE (R, DIAGNOSTIC)))
 
-# ifdef __cplusplus
-#  if !GNULIB_defined_struct__gl_verify_type
+#ifdef __cplusplus
+# if !GNULIB_defined_struct__gl_verify_type
 template <int w>
   struct _gl_verify_type {
     unsigned int _gl_verify_error_if_negative: w;
   };
-#   define GNULIB_defined_struct__gl_verify_type 1
-#  endif
-#  define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \
-    _gl_verify_type<(R) ? 1 : -1>
-# elif defined _GL_HAVE__STATIC_ASSERT
-#  define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \
-     struct {                                   \
-       _Static_assert (R, DIAGNOSTIC);          \
-       int _gl_dummy;                          \
-     }
-# else
-#  define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \
-     struct { unsigned int _gl_verify_error_if_negative: (R) ? 1 : -1; }
+#  define GNULIB_defined_struct__gl_verify_type 1
 # endif
+# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \
+    _gl_verify_type<(R) ? 1 : -1>
+#elif defined _GL_HAVE__STATIC_ASSERT
+# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \
+    struct {                                   \
+      _Static_assert (R, DIAGNOSTIC);          \
+      int _gl_dummy;                          \
+    }
+#else
+# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \
+    struct { unsigned int _gl_verify_error_if_negative: (R) ? 1 : -1; }
+#endif
 
 /* Verify requirement R at compile-time, as a declaration without a
    trailing ';'.  If R is false, fail at compile-time, preferably
@@ -193,23 +203,23 @@ template <int w>
    Unfortunately, unlike C11, this implementation must appear as an
    ordinary declaration, and cannot appear inside struct { ... }.  */
 
-# ifdef _GL_HAVE__STATIC_ASSERT
-#  define _GL_VERIFY _Static_assert
-# else
-#  define _GL_VERIFY(R, DIAGNOSTIC)				       \
-     extern int (*_GL_GENSYM (_gl_verify_function) (void))	       \
-       [_GL_VERIFY_TRUE (R, DIAGNOSTIC)]
-# endif
+#ifdef _GL_HAVE__STATIC_ASSERT
+# define _GL_VERIFY _Static_assert
+#else
+# define _GL_VERIFY(R, DIAGNOSTIC)				       \
+    extern int (*_GL_GENSYM (_gl_verify_function) (void))	       \
+      [_GL_VERIFY_TRUE (R, DIAGNOSTIC)]
+#endif
 
 /* _GL_STATIC_ASSERT_H is defined if this code is copied into assert.h.  */
-# ifdef _GL_STATIC_ASSERT_H
-#  if !defined _GL_HAVE__STATIC_ASSERT && !defined _Static_assert
-#   define _Static_assert(R, DIAGNOSTIC) _GL_VERIFY (R, DIAGNOSTIC)
-#  endif
-#  if !defined _GL_HAVE_STATIC_ASSERT && !defined static_assert
-#   define static_assert _Static_assert /* C11 requires this #define.  */
-#  endif
+#ifdef _GL_STATIC_ASSERT_H
+# if !defined _GL_HAVE__STATIC_ASSERT && !defined _Static_assert
+#  define _Static_assert(R, DIAGNOSTIC) _GL_VERIFY (R, DIAGNOSTIC)
 # endif
+# if !defined _GL_HAVE_STATIC_ASSERT && !defined static_assert
+#  define static_assert _Static_assert /* C11 requires this #define.  */
+# endif
+#endif
 
 /* @assert.h omit start@  */
 
@@ -227,18 +237,42 @@ template <int w>
 
    verify_true is obsolescent; please use verify_expr instead.  */
 
-# define verify_true(R) _GL_VERIFY_TRUE (R, "verify_true (" #R ")")
+#define verify_true(R) _GL_VERIFY_TRUE (R, "verify_true (" #R ")")
 
 /* Verify requirement R at compile-time.  Return the value of the
    expression E.  */
 
-# define verify_expr(R, E) \
-    (_GL_VERIFY_TRUE (R, "verify_expr (" #R ", " #E ")") ? (E) : (E))
+#define verify_expr(R, E) \
+   (_GL_VERIFY_TRUE (R, "verify_expr (" #R ", " #E ")") ? (E) : (E))
 
 /* Verify requirement R at compile-time, as a declaration without a
    trailing ';'.  */
 
-# define verify(R) _GL_VERIFY (R, "verify (" #R ")")
+#define verify(R) _GL_VERIFY (R, "verify (" #R ")")
+
+#ifndef __has_builtin
+# define __has_builtin(x) 0
+#endif
+
+/* Assume that R always holds.  This lets the compiler optimize
+   accordingly.  R should not have side-effects; it may or may not be
+   evaluated.  Behavior is undefined if R is false.  */
+
+#if (__has_builtin (__builtin_unreachable) \
+     || 4 < __GNUC__ + (5 <= __GNUC_MINOR__))
+# define assume(R) ((R) ? (void) 0 : __builtin_unreachable ())
+#elif 1200 <= _MSC_VER
+# define assume(R) __assume (R)
+#elif (defined lint \
+       && (__has_builtin (__builtin_trap) \
+           || 3 < __GNUC__ + (3 < __GNUC_MINOR__ + (4 <= __GNUC_PATCHLEVEL__))))
+  /* Doing it this way helps various packages when configured with
+     --enable-gcc-warnings, which compiles with -Dlint.  It's nicer
+     when 'assume' silences warnings even with older GCCs.  */
+# define assume(R) ((R) ? (void) 0 : __builtin_trap ())
+#else
+# define assume(R) ((void) (0 && (R)))
+#endif
 
 /* @assert.h omit end@  */
 
diff --git a/lib/verror.c b/lib/verror.c
index 5f899c1b..9388f622 100644
--- a/lib/verror.c
+++ b/lib/verror.c
@@ -1,5 +1,5 @@
 /* va_list error handler for noninteractive utilities
-   Copyright (C) 2006-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/verror.h b/lib/verror.h
index 7e7284ad..c6292bc6 100644
--- a/lib/verror.h
+++ b/lib/verror.h
@@ -1,5 +1,5 @@
 /* Declaration for va_list error-reporting function
-   Copyright (C) 2006-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/version-etc-fsf.c b/lib/version-etc-fsf.c
index e1c69da9..b37dd605 100644
--- a/lib/version-etc-fsf.c
+++ b/lib/version-etc-fsf.c
@@ -1,5 +1,5 @@
 /* Variable with FSF copyright information, for version-etc.
-   Copyright (C) 1999-2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 1999-2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/version-etc.c b/lib/version-etc.c
index b7d23ab5..04f5b620 100644
--- a/lib/version-etc.c
+++ b/lib/version-etc.c
@@ -1,5 +1,5 @@
 /* Print --version and bug-reporting information in a consistent format.
-   Copyright (C) 1999-2013 Free Software Foundation, Inc.
+   Copyright (C) 1999-2014 Free Software Foundation, Inc.
 
    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
@@ -38,7 +38,7 @@
 # define PACKAGE PACKAGE_TARNAME
 #endif
 
-enum { COPYRIGHT_YEAR = 2013 };
+enum { COPYRIGHT_YEAR = 2014 };
 
 /* The three functions below display the --version information the
    standard way.
diff --git a/lib/version-etc.h b/lib/version-etc.h
index 6c3d0843..8e1b2ccf 100644
--- a/lib/version-etc.h
+++ b/lib/version-etc.h
@@ -1,5 +1,5 @@
 /* Print --version and bug-reporting information in a consistent format.
-   Copyright (C) 1999, 2003, 2005, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2003, 2005, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/vfprintf.c b/lib/vfprintf.c
index 635e36eb..b49caaee 100644
--- a/lib/vfprintf.c
+++ b/lib/vfprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to a stream.
-   Copyright (C) 2004, 2006-2013 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/vprintf.c b/lib/vprintf.c
index 0c507582..d97f5c8a 100644
--- a/lib/vprintf.c
+++ b/lib/vprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to a stream.
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/w32sock.h b/lib/w32sock.h
index 44f3a1a0..b921b1bc 100644
--- a/lib/w32sock.h
+++ b/lib/w32sock.h
@@ -1,6 +1,6 @@
 /* w32sock.h --- internal auxiliary functions for Windows socket functions
 
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/w32spawn.h b/lib/w32spawn.h
deleted file mode 100644
index 3b5c08af..00000000
--- a/lib/w32spawn.h
+++ /dev/null
@@ -1,222 +0,0 @@
-/* Auxiliary functions for the creation of subprocesses.  Native Windows API.
-   Copyright (C) 2001, 2003-2013 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2003.
-
-   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 3 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/>.  */
-
-/* Get declarations of the native Windows API functions.  */
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-/* Get _open_osfhandle().  */
-#include <io.h>
-
-#include <stdbool.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-
-/* Get _get_osfhandle().  */
-#include "msvc-nothrow.h"
-
-#include "cloexec.h"
-#include "xalloc.h"
-
-/* Duplicates a file handle, making the copy uninheritable.
-   Returns -1 for a file handle that is equivalent to closed.  */
-static int
-dup_noinherit (int fd)
-{
-  fd = dup_cloexec (fd);
-  if (fd < 0 && errno == EMFILE)
-    error (EXIT_FAILURE, errno, _("_open_osfhandle failed"));
-
-  return fd;
-}
-
-/* Returns a file descriptor equivalent to FD, except that the resulting file
-   descriptor is none of STDIN_FILENO, STDOUT_FILENO, STDERR_FILENO.
-   FD must be open and non-inheritable.  The result will be non-inheritable as
-   well.
-   If FD < 0, FD itself is returned.  */
-static int
-fd_safer_noinherit (int fd)
-{
-  if (STDIN_FILENO <= fd && fd <= STDERR_FILENO)
-    {
-      /* The recursion depth is at most 3.  */
-      int nfd = fd_safer_noinherit (dup_noinherit (fd));
-      int saved_errno = errno;
-      close (fd);
-      errno = saved_errno;
-      return nfd;
-    }
-  return fd;
-}
-
-/* Duplicates a file handle, making the copy uninheritable and ensuring the
-   result is none of STDIN_FILENO, STDOUT_FILENO, STDERR_FILENO.
-   Returns -1 for a file handle that is equivalent to closed.  */
-static int
-dup_safer_noinherit (int fd)
-{
-  return fd_safer_noinherit (dup_noinherit (fd));
-}
-
-/* Undoes the effect of TEMPFD = dup_safer_noinherit (ORIGFD);  */
-static void
-undup_safer_noinherit (int tempfd, int origfd)
-{
-  if (tempfd >= 0)
-    {
-      if (dup2 (tempfd, origfd) < 0)
-        error (EXIT_FAILURE, errno, _("cannot restore fd %d: dup2 failed"),
-               origfd);
-      close (tempfd);
-    }
-  else
-    {
-      /* origfd was closed or open to no handle at all.  Set it to a closed
-         state.  This is (nearly) equivalent to the original state.  */
-      close (origfd);
-    }
-}
-
-/* Prepares an argument vector before calling spawn().
-   Note that spawn() does not by itself call the command interpreter
-     (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
-      ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-         GetVersionEx(&v);
-         v.dwPlatformId == VER_PLATFORM_WIN32_NT;
-      }) ? "cmd.exe" : "command.com").
-   Instead it simply concatenates the arguments, separated by ' ', and calls
-   CreateProcess().  We must quote the arguments since Windows CreateProcess()
-   interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
-   special way:
-   - Space and tab are interpreted as delimiters. They are not treated as
-     delimiters if they are surrounded by double quotes: "...".
-   - Unescaped double quotes are removed from the input. Their only effect is
-     that within double quotes, space and tab are treated like normal
-     characters.
-   - Backslashes not followed by double quotes are not special.
-   - But 2*n+1 backslashes followed by a double quote become
-     n backslashes followed by a double quote (n >= 0):
-       \" -> "
-       \\\" -> \"
-       \\\\\" -> \\"
-   - '*', '?' characters may get expanded through wildcard expansion in the
-     callee: By default, in the callee, the initialization code before main()
-     takes the result of GetCommandLine(), wildcard-expands it, and passes it
-     to main(). The exceptions to this rule are:
-       - programs that inspect GetCommandLine() and ignore argv,
-       - mingw programs that have a global variable 'int _CRT_glob = 0;',
-       - Cygwin programs, when invoked from a Cygwin program.
- */
-#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037*?"
-#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
-static char **
-prepare_spawn (char **argv)
-{
-  size_t argc;
-  char **new_argv;
-  size_t i;
-
-  /* Count number of arguments.  */
-  for (argc = 0; argv[argc] != NULL; argc++)
-    ;
-
-  /* Allocate new argument vector.  */
-  new_argv = XNMALLOC (1 + argc + 1, char *);
-
-  /* Add an element upfront that can be used when argv[0] turns out to be a
-     script, not a program.
-     On Unix, this would be "/bin/sh". On native Windows, "sh" is actually
-     "sh.exe".  We have to omit the directory part and rely on the search in
-     PATH, because the mingw "mount points" are not visible inside Windows
-     CreateProcess().  */
-  *new_argv++ = "sh.exe";
-
-  /* Put quoted arguments into the new argument vector.  */
-  for (i = 0; i < argc; i++)
-    {
-      const char *string = argv[i];
-
-      if (string[0] == '\0')
-        new_argv[i] = xstrdup ("\"\"");
-      else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
-        {
-          bool quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
-          size_t length;
-          unsigned int backslashes;
-          const char *s;
-          char *quoted_string;
-          char *p;
-
-          length = 0;
-          backslashes = 0;
-          if (quote_around)
-            length++;
-          for (s = string; *s != '\0'; s++)
-            {
-              char c = *s;
-              if (c == '"')
-                length += backslashes + 1;
-              length++;
-              if (c == '\\')
-                backslashes++;
-              else
-                backslashes = 0;
-            }
-          if (quote_around)
-            length += backslashes + 1;
-
-          quoted_string = (char *) xmalloc (length + 1);
-
-          p = quoted_string;
-          backslashes = 0;
-          if (quote_around)
-            *p++ = '"';
-          for (s = string; *s != '\0'; s++)
-            {
-              char c = *s;
-              if (c == '"')
-                {
-                  unsigned int j;
-                  for (j = backslashes + 1; j > 0; j--)
-                    *p++ = '\\';
-                }
-              *p++ = c;
-              if (c == '\\')
-                backslashes++;
-              else
-                backslashes = 0;
-            }
-          if (quote_around)
-            {
-              unsigned int j;
-              for (j = backslashes; j > 0; j--)
-                *p++ = '\\';
-              *p++ = '"';
-            }
-          *p = '\0';
-
-          new_argv[i] = quoted_string;
-        }
-      else
-        new_argv[i] = (char *) string;
-    }
-  new_argv[argc] = NULL;
-
-  return new_argv;
-}
diff --git a/lib/wait-process.c b/lib/wait-process.c
deleted file mode 100644
index 17a2430f..00000000
--- a/lib/wait-process.c
+++ /dev/null
@@ -1,361 +0,0 @@
-/* Waiting for a subprocess to finish.
-   Copyright (C) 2001-2003, 2005-2013 Free Software Foundation, Inc.
-   Written by Bruno Haible <haible@clisp.cons.org>, 2001.
-
-   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 3 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/>.  */
-
-
-#include <config.h>
-
-/* Specification.  */
-#include "wait-process.h"
-
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-
-#include <sys/types.h>
-#include <sys/wait.h>
-
-#include "error.h"
-#include "fatal-signal.h"
-#include "xalloc.h"
-#include "gettext.h"
-
-#define _(str) gettext (str)
-
-#define SIZEOF(a) (sizeof(a) / sizeof(a[0]))
-
-
-#if defined _MSC_VER || defined __MINGW32__
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-/* The return value of spawnvp() is really a process handle as returned
-   by CreateProcess().  Therefore we can kill it using TerminateProcess.  */
-#define kill(pid,sig) TerminateProcess ((HANDLE) (pid), sig)
-
-#endif
-
-
-/* Type of an entry in the slaves array.
-   The 'used' bit determines whether this entry is currently in use.
-   (If pid_t was an atomic type like sig_atomic_t, we could just set the
-   'child' field to 0 when unregistering a slave process, and wouldn't need
-   the 'used' field.)
-   The 'used' and 'child' fields are accessed from within the cleanup_slaves()
-   action, therefore we mark them as 'volatile'.  */
-typedef struct
-{
-  volatile sig_atomic_t used;
-  volatile pid_t child;
-}
-slaves_entry_t;
-
-/* The registered slave subprocesses.  */
-static slaves_entry_t static_slaves[32];
-static slaves_entry_t * volatile slaves = static_slaves;
-static sig_atomic_t volatile slaves_count = 0;
-static size_t slaves_allocated = SIZEOF (static_slaves);
-
-/* The termination signal for slave subprocesses.
-   2003-10-07:  Terminator becomes Governator.  */
-#ifdef SIGHUP
-# define TERMINATOR SIGHUP
-#else
-# define TERMINATOR SIGTERM
-#endif
-
-/* The cleanup action.  It gets called asynchronously.  */
-static void
-cleanup_slaves (void)
-{
-  for (;;)
-    {
-      /* Get the last registered slave.  */
-      size_t n = slaves_count;
-      if (n == 0)
-        break;
-      n--;
-      slaves_count = n;
-      /* Skip unused entries in the slaves array.  */
-      if (slaves[n].used)
-        {
-          pid_t slave = slaves[n].child;
-
-          /* Kill the slave.  */
-          kill (slave, TERMINATOR);
-        }
-    }
-}
-
-/* Register a subprocess as being a slave process.  This means that the
-   subprocess will be terminated when its creator receives a catchable fatal
-   signal or exits normally.  Registration ends when wait_subprocess()
-   notices that the subprocess has exited.  */
-void
-register_slave_subprocess (pid_t child)
-{
-  static bool cleanup_slaves_registered = false;
-  if (!cleanup_slaves_registered)
-    {
-      atexit (cleanup_slaves);
-      at_fatal_signal (cleanup_slaves);
-      cleanup_slaves_registered = true;
-    }
-
-  /* Try to store the new slave in an unused entry of the slaves array.  */
-  {
-    slaves_entry_t *s = slaves;
-    slaves_entry_t *s_end = s + slaves_count;
-
-    for (; s < s_end; s++)
-      if (!s->used)
-        {
-          /* The two uses of 'volatile' in the slaves_entry_t type above
-             (and ISO C 99 section 5.1.2.3.(5)) ensure that we mark the
-             entry as used only after the child pid has been written to the
-             memory location s->child.  */
-          s->child = child;
-          s->used = 1;
-          return;
-        }
-  }
-
-  if (slaves_count == slaves_allocated)
-    {
-      /* Extend the slaves array.  Note that we cannot use xrealloc(),
-         because then the cleanup_slaves() function could access an already
-         deallocated array.  */
-      slaves_entry_t *old_slaves = slaves;
-      size_t new_slaves_allocated = 2 * slaves_allocated;
-      slaves_entry_t *new_slaves =
-        (slaves_entry_t *)
-        malloc (new_slaves_allocated * sizeof (slaves_entry_t));
-      if (new_slaves == NULL)
-        {
-          /* xalloc_die() will call exit() which will invoke cleanup_slaves().
-             Additionally we need to kill child, because it's not yet among
-             the slaves list.  */
-          kill (child, TERMINATOR);
-          xalloc_die ();
-        }
-      memcpy (new_slaves, old_slaves,
-              slaves_allocated * sizeof (slaves_entry_t));
-      slaves = new_slaves;
-      slaves_allocated = new_slaves_allocated;
-      /* Now we can free the old slaves array.  */
-      if (old_slaves != static_slaves)
-        free (old_slaves);
-    }
-  /* The three uses of 'volatile' in the types above (and ISO C 99 section
-     5.1.2.3.(5)) ensure that we increment the slaves_count only after the
-     new slave and its 'used' bit have been written to the memory locations
-     that make up slaves[slaves_count].  */
-  slaves[slaves_count].child = child;
-  slaves[slaves_count].used = 1;
-  slaves_count++;
-}
-
-/* Unregister a child from the list of slave subprocesses.  */
-static void
-unregister_slave_subprocess (pid_t child)
-{
-  /* The easiest way to remove an entry from a list that can be used by
-     an asynchronous signal handler is just to mark it as unused.  For this,
-     we rely on sig_atomic_t.  */
-  slaves_entry_t *s = slaves;
-  slaves_entry_t *s_end = s + slaves_count;
-
-  for (; s < s_end; s++)
-    if (s->used && s->child == child)
-      s->used = 0;
-}
-
-
-/* Wait for a subprocess to finish.  Return its exit code.
-   If it didn't terminate correctly, exit if exit_on_error is true, otherwise
-   return 127.  */
-int
-wait_subprocess (pid_t child, const char *progname,
-                 bool ignore_sigpipe, bool null_stderr,
-                 bool slave_process, bool exit_on_error,
-                 int *termsigp)
-{
-#if HAVE_WAITID && defined WNOWAIT && 0
-  /* Commented out because waitid() without WEXITED and with WNOWAIT doesn't
-     work: On Solaris 7 and OSF/1 4.0, it returns -1 and sets errno = ECHILD,
-     and on HP-UX 10.20 it just hangs.  */
-  /* Use of waitid() with WNOWAIT avoids a race condition: If slave_process is
-     true, and this process sleeps a very long time between the return from
-     waitpid() and the execution of unregister_slave_subprocess(), and
-     meanwhile another process acquires the same PID as child, and then - still
-     before unregister_slave_subprocess() - this process gets a fatal signal,
-     it would kill the other totally unrelated process.  */
-  siginfo_t info;
-
-  if (termsigp != NULL)
-    *termsigp = 0;
-  for (;;)
-    {
-      if (waitid (P_PID, child, &info, WEXITED | (slave_process ? WNOWAIT : 0))
-          < 0)
-        {
-# ifdef EINTR
-          if (errno == EINTR)
-            continue;
-# endif
-          if (exit_on_error || !null_stderr)
-            error (exit_on_error ? EXIT_FAILURE : 0, errno,
-                   _("%s subprocess"), progname);
-          return 127;
-        }
-
-      /* info.si_code is set to one of CLD_EXITED, CLD_KILLED, CLD_DUMPED,
-         CLD_TRAPPED, CLD_STOPPED, CLD_CONTINUED.  Loop until the program
-         terminates.  */
-      if (info.si_code == CLD_EXITED
-          || info.si_code == CLD_KILLED || info.si_code == CLD_DUMPED)
-        break;
-    }
-
-  /* The child process has exited or was signalled.  */
-
-  if (slave_process)
-    {
-      /* Unregister the child from the list of slave subprocesses, so that
-         later, when we exit, we don't kill a totally unrelated process which
-         may have acquired the same pid.  */
-      unregister_slave_subprocess (child);
-
-      /* Now remove the zombie from the process list.  */
-      for (;;)
-        {
-          if (waitid (P_PID, child, &info, WEXITED) < 0)
-            {
-# ifdef EINTR
-              if (errno == EINTR)
-                continue;
-# endif
-              if (exit_on_error || !null_stderr)
-                error (exit_on_error ? EXIT_FAILURE : 0, errno,
-                       _("%s subprocess"), progname);
-              return 127;
-            }
-          break;
-        }
-    }
-
-  switch (info.si_code)
-    {
-    case CLD_KILLED:
-    case CLD_DUMPED:
-      if (termsigp != NULL)
-        *termsigp = info.si_status; /* TODO: or info.si_signo? */
-# ifdef SIGPIPE
-      if (info.si_status == SIGPIPE && ignore_sigpipe)
-        return 0;
-# endif
-      if (exit_on_error || (!null_stderr && termsigp == NULL))
-        error (exit_on_error ? EXIT_FAILURE : 0, 0,
-               _("%s subprocess got fatal signal %d"),
-               progname, info.si_status);
-      return 127;
-    case CLD_EXITED:
-      if (info.si_status == 127)
-        {
-          if (exit_on_error || !null_stderr)
-            error (exit_on_error ? EXIT_FAILURE : 0, 0,
-                   _("%s subprocess failed"), progname);
-          return 127;
-        }
-      return info.si_status;
-    default:
-      abort ();
-    }
-#else
-  /* waitpid() is just as portable as wait() nowadays.  */
-  int status;
-
-  if (termsigp != NULL)
-    *termsigp = 0;
-  status = 0;
-  for (;;)
-    {
-      int result = waitpid (child, &status, 0);
-
-      if (result != child)
-        {
-# ifdef EINTR
-          if (errno == EINTR)
-            continue;
-# endif
-# if 0 /* defined ECHILD */
-          if (errno == ECHILD)
-            {
-              /* Child process nonexistent?! Assume it terminated
-                 successfully.  */
-              status = 0;
-              break;
-            }
-# endif
-          if (exit_on_error || !null_stderr)
-            error (exit_on_error ? EXIT_FAILURE : 0, errno,
-                   _("%s subprocess"), progname);
-          return 127;
-        }
-
-      /* One of WIFSIGNALED (status), WIFEXITED (status), WIFSTOPPED (status)
-         must always be true, since we did not specify WCONTINUED in the
-         waitpid() call.  Loop until the program terminates.  */
-      if (!WIFSTOPPED (status))
-        break;
-    }
-
-  /* The child process has exited or was signalled.  */
-
-  if (slave_process)
-    /* Unregister the child from the list of slave subprocesses, so that
-       later, when we exit, we don't kill a totally unrelated process which
-       may have acquired the same pid.  */
-    unregister_slave_subprocess (child);
-
-  if (WIFSIGNALED (status))
-    {
-      if (termsigp != NULL)
-        *termsigp = WTERMSIG (status);
-# ifdef SIGPIPE
-      if (WTERMSIG (status) == SIGPIPE && ignore_sigpipe)
-        return 0;
-# endif
-      if (exit_on_error || (!null_stderr && termsigp == NULL))
-        error (exit_on_error ? EXIT_FAILURE : 0, 0,
-               _("%s subprocess got fatal signal %d"),
-               progname, (int) WTERMSIG (status));
-      return 127;
-    }
-  if (!WIFEXITED (status))
-    abort ();
-  if (WEXITSTATUS (status) == 127)
-    {
-      if (exit_on_error || !null_stderr)
-        error (exit_on_error ? EXIT_FAILURE : 0, 0,
-               _("%s subprocess failed"), progname);
-      return 127;
-    }
-  return WEXITSTATUS (status);
-#endif
-}
diff --git a/lib/wait-process.h b/lib/wait-process.h
deleted file mode 100644
index 6d8f0d2b..00000000
--- a/lib/wait-process.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Waiting for a subprocess to finish.
-   Copyright (C) 2001-2003, 2006, 2008-2013 Free Software Foundation, Inc.
-   Written by Bruno Haible <haible@clisp.cons.org>, 2001.
-
-   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 3 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/>.  */
-
-#ifndef _WAIT_PROCESS_H
-#define _WAIT_PROCESS_H
-
-/* Get pid_t.  */
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-
-#include <stdbool.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Wait for a subprocess to finish.  Return its exit code.
-   If it didn't terminate correctly, exit if exit_on_error is true, otherwise
-   return 127.
-   Arguments:
-   - child is the pid of the subprocess.
-   - progname is the name of the program executed by the subprocess, used for
-     error messages.
-   - If ignore_sigpipe is true, consider a subprocess termination due to
-     SIGPIPE as equivalent to a success.  This is suitable for processes whose
-     only purpose is to write to standard output.  This flag can be safely set
-     to false when the process' standard output is known to go to DEV_NULL.
-   - If null_stderr is true, the usual error message to stderr will be omitted.
-     This is suitable when the subprocess does not fulfill an important task.
-   - slave_process should be set to true if the process has been launched as a
-     slave process.
-   - If exit_on_error is true, any error will cause the main process to exit
-     with an error status.
-   - If termsigp is not NULL: *termsig will be set to the signal that
-     terminated the subprocess (if supported by the platform: not on native
-     Windows platforms), otherwise 0, and the error message about the signal
-     that terminated the subprocess will be omitted.
-   Prerequisites: The signal handler for SIGCHLD should not be set to SIG_IGN,
-   otherwise this function will not work.  */
-extern int wait_subprocess (pid_t child, const char *progname,
-                            bool ignore_sigpipe, bool null_stderr,
-                            bool slave_process, bool exit_on_error,
-                            int *termsigp);
-
-/* Register a subprocess as being a slave process.  This means that the
-   subprocess will be terminated when its creator receives a catchable fatal
-   signal or exits normally.  Registration ends when wait_subprocess()
-   notices that the subprocess has exited.  */
-extern void register_slave_subprocess (pid_t child);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /* _WAIT_PROCESS_H */
diff --git a/lib/waitpid.c b/lib/waitpid.c
deleted file mode 100644
index d28a70b3..00000000
--- a/lib/waitpid.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Wait for process state change.
-   Copyright (C) 2001-2003, 2005-2013 Free Software Foundation, Inc.
-
-   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 3, 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/>.  */
-
-#include <config.h>
-
-/* Specification.  */
-#include <sys/wait.h>
-
-/* Implementation for native Windows systems.  */
-
-#include <process.h> /* for _cwait, WAIT_CHILD */
-
-pid_t
-waitpid (pid_t pid, int *statusp, int options)
-{
-  return _cwait (statusp, pid, WAIT_CHILD);
-}
diff --git a/lib/wchar.in.h b/lib/wchar.in.h
index b6e43627..473285fb 100644
--- a/lib/wchar.in.h
+++ b/lib/wchar.in.h
@@ -1,6 +1,6 @@
 /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
 
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/wcrtomb.c b/lib/wcrtomb.c
index da42809b..1d340cd9 100644
--- a/lib/wcrtomb.c
+++ b/lib/wcrtomb.c
@@ -1,5 +1,5 @@
 /* Convert wide character to multibyte character.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/wcswidth-impl.h b/lib/wcswidth-impl.h
index 63476342..b71f9976 100644
--- a/lib/wcswidth-impl.h
+++ b/lib/wcswidth-impl.h
@@ -1,5 +1,5 @@
 /* Determine number of screen columns needed for a size-bounded wide string.
-   Copyright (C) 1999, 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2011-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 1999.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/wcswidth.c b/lib/wcswidth.c
index 383d5e1f..656dc6c4 100644
--- a/lib/wcswidth.c
+++ b/lib/wcswidth.c
@@ -1,5 +1,5 @@
 /* Determine number of screen columns needed for a size-bounded wide string.
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/wctype.in.h b/lib/wctype.in.h
index 0cd02d5a..ab066539 100644
--- a/lib/wctype.in.h
+++ b/lib/wctype.in.h
@@ -1,6 +1,6 @@
 /* A substitute for ISO C99 <wctype.h>, for platforms that lack it.
 
-   Copyright (C) 2006-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
    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
@@ -44,6 +44,13 @@
 # include <wchar.h>
 #endif
 
+/* mingw has declarations of towupper and towlower in <ctype.h> as
+   well <wctype.h>.  Include <ctype.h> in advance to avoid rpl_ prefix
+   being added to the declarations.  */
+#ifdef __MINGW32__
+# include <ctype.h>
+#endif
+
 /* Include the original <wctype.h> if it exists.
    BeOS 5 has the functions but no <wctype.h>.  */
 /* The include_next requires a split double-inclusion guard.  */
@@ -54,6 +61,9 @@
 #ifndef _@GUARD_PREFIX@_WCTYPE_H
 #define _@GUARD_PREFIX@_WCTYPE_H
 
+#ifndef _GL_INLINE_HEADER_BEGIN
+ #error "Please include config.h first."
+#endif
 _GL_INLINE_HEADER_BEGIN
 #ifndef _GL_WCTYPE_INLINE
 # define _GL_WCTYPE_INLINE _GL_INLINE
diff --git a/lib/wcwidth.c b/lib/wcwidth.c
index 253fcaa6..d7837bb1 100644
--- a/lib/wcwidth.c
+++ b/lib/wcwidth.c
@@ -1,5 +1,5 @@
 /* Determine the number of screen columns needed for a character.
-   Copyright (C) 2006-2007, 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2010-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/write-any-file.c b/lib/write-any-file.c
index f6d2747c..1cd0b791 100644
--- a/lib/write-any-file.c
+++ b/lib/write-any-file.c
@@ -1,6 +1,6 @@
 /* Determine whether we can write any file.
 
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/write.c b/lib/write.c
index 2d204219..ff31dbb6 100644
--- a/lib/write.c
+++ b/lib/write.c
@@ -1,5 +1,5 @@
 /* POSIX compatible write() function.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/xalloc-die.c b/lib/xalloc-die.c
index daa403b9..7bdd2a31 100644
--- a/lib/xalloc-die.c
+++ b/lib/xalloc-die.c
@@ -1,6 +1,6 @@
 /* Report a memory allocation failure and exit.
 
-   Copyright (C) 1997-2000, 2002-2004, 2006, 2009-2013 Free Software
+   Copyright (C) 1997-2000, 2002-2004, 2006, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/xalloc-oversized.h b/lib/xalloc-oversized.h
index a971c78a..f3329228 100644
--- a/lib/xalloc-oversized.h
+++ b/lib/xalloc-oversized.h
@@ -1,6 +1,6 @@
 /* xalloc-oversized.h -- memory allocation size checking
 
-   Copyright (C) 1990-2000, 2003-2004, 2006-2013 Free Software Foundation, Inc.
+   Copyright (C) 1990-2000, 2003-2004, 2006-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/xalloc.h b/lib/xalloc.h
index da7c4b6b..3f6b5b80 100644
--- a/lib/xalloc.h
+++ b/lib/xalloc.h
@@ -1,6 +1,6 @@
 /* xalloc.h -- malloc with out-of-memory checking
 
-   Copyright (C) 1990-2000, 2003-2004, 2006-2013 Free Software Foundation, Inc.
+   Copyright (C) 1990-2000, 2003-2004, 2006-2014 Free Software Foundation, Inc.
 
    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
@@ -22,6 +22,9 @@
 
 #include "xalloc-oversized.h"
 
+#ifndef _GL_INLINE_HEADER_BEGIN
+ #error "Please include config.h first."
+#endif
 _GL_INLINE_HEADER_BEGIN
 #ifndef XALLOC_INLINE
 # define XALLOC_INLINE _GL_INLINE
@@ -61,7 +64,7 @@ void *xrealloc (void *p, size_t s)
       _GL_ATTRIBUTE_ALLOC_SIZE ((2));
 void *x2realloc (void *p, size_t *pn);
 void *xmemdup (void const *p, size_t s)
-      _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((2));
+      _GL_ATTRIBUTE_ALLOC_SIZE ((2));
 char *xstrdup (char const *str)
       _GL_ATTRIBUTE_MALLOC;
 
@@ -119,10 +122,9 @@ xnrealloc (void *p, size_t n, size_t s)
 
 /* If P is null, allocate a block of at least *PN such objects;
    otherwise, reallocate P so that it contains more than *PN objects
-   each of S bytes.  *PN must be nonzero unless P is null, and S must
-   be nonzero.  Set *PN to the new number of objects, and return the
-   pointer to the new block.  *PN is never set to zero, and the
-   returned pointer is never null.
+   each of S bytes.  S must be nonzero.  Set *PN to the new number of
+   objects, and return the pointer to the new block.  *PN is never set
+   to zero, and the returned pointer is never null.
 
    Repeated reallocations are guaranteed to make progress, either by
    allocating an initial block with a nonzero size, or by allocating a
@@ -193,13 +195,13 @@ x2nrealloc (void *p, size_t *pn, size_t s)
     }
   else
     {
-      /* Set N = ceil (1.5 * N) so that progress is made if N == 1.
+      /* Set N = floor (1.5 * N) + 1 so that progress is made even if N == 0.
          Check for overflow, so that N * S stays in size_t range.
-         The check is slightly conservative, but an exact check isn't
+         The check may be slightly conservative, but an exact check isn't
          worth the trouble.  */
       if ((size_t) -1 / 3 * 2 / s <= n)
         xalloc_die ();
-      n += (n + 1) / 2;
+      n += n / 2 + 1;
     }
 
   *pn = n;
diff --git a/lib/xasprintf.c b/lib/xasprintf.c
index 1808b701..4e0b5b16 100644
--- a/lib/xasprintf.c
+++ b/lib/xasprintf.c
@@ -1,5 +1,5 @@
 /* vasprintf and asprintf with out-of-memory checking.
-   Copyright (C) 1999, 2002-2004, 2006, 2009-2013 Free Software Foundation,
+   Copyright (C) 1999, 2002-2004, 2006, 2009-2014 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/xfreopen.c b/lib/xfreopen.c
index c7acbd17..abc8221b 100644
--- a/lib/xfreopen.c
+++ b/lib/xfreopen.c
@@ -1,5 +1,5 @@
-/* a wrapper for frepoen
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+/* a wrapper for freopen
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/xfts.c b/lib/xfts.c
index e982cc08..bcc82d05 100644
--- a/lib/xfts.c
+++ b/lib/xfts.c
@@ -1,6 +1,6 @@
 /* xfts.c -- a wrapper for fts_open
 
-   Copyright (C) 2003-2013 Free Software Foundation, Inc.
+   Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/xgetcwd.c b/lib/xgetcwd.c
index d4e7a783..e91e8e55 100644
--- a/lib/xgetcwd.c
+++ b/lib/xgetcwd.c
@@ -1,6 +1,6 @@
 /* xgetcwd.c -- return current directory with unlimited length
 
-   Copyright (C) 2001, 2003-2004, 2006-2007, 2009-2013 Free Software
+   Copyright (C) 2001, 2003-2004, 2006-2007, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/xgetcwd.h b/lib/xgetcwd.h
index fa15bc60..9630d6c7 100644
--- a/lib/xgetcwd.h
+++ b/lib/xgetcwd.h
@@ -1,5 +1,5 @@
 /* prototype for xgetcwd
-   Copyright (C) 1995, 2001, 2003, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001, 2003, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/xgetgroups.c b/lib/xgetgroups.c
index 98080db0..7f9d86a4 100644
--- a/lib/xgetgroups.c
+++ b/lib/xgetgroups.c
@@ -1,6 +1,6 @@
 /* xgetgroups.c -- return a list of the groups a user or current process is in
 
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/xgethostname.c b/lib/xgethostname.c
index 5d5a07c7..0f7b178f 100644
--- a/lib/xgethostname.c
+++ b/lib/xgethostname.c
@@ -1,6 +1,6 @@
 /* xgethostname.c -- return current hostname with unlimited length
 
-   Copyright (C) 1992, 1996, 2000-2001, 2003-2006, 2009-2013 Free Software
+   Copyright (C) 1992, 1996, 2000-2001, 2003-2006, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/xmalloc.c b/lib/xmalloc.c
index 57e34b7c..264d44af 100644
--- a/lib/xmalloc.c
+++ b/lib/xmalloc.c
@@ -1,6 +1,6 @@
 /* xmalloc.c -- malloc with out of memory checking
 
-   Copyright (C) 1990-2000, 2002-2006, 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 1990-2000, 2002-2006, 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/xmemcoll.c b/lib/xmemcoll.c
index 59d9555b..39b8ce8e 100644
--- a/lib/xmemcoll.c
+++ b/lib/xmemcoll.c
@@ -1,6 +1,6 @@
 /* Locale-specific memory comparison.
 
-   Copyright (C) 2002-2004, 2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002-2004, 2006, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/xnanosleep.c b/lib/xnanosleep.c
index d9b97a18..3b2b43ba 100644
--- a/lib/xnanosleep.c
+++ b/lib/xnanosleep.c
@@ -1,6 +1,6 @@
 /* xnanosleep.c -- a more convenient interface to nanosleep
 
-   Copyright (C) 2002-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002-2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/xprintf.c b/lib/xprintf.c
index e24b4f18..52f8d5cd 100644
--- a/lib/xprintf.c
+++ b/lib/xprintf.c
@@ -1,5 +1,5 @@
 /* printf wrappers that fail immediately for non-file-related errors
-   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/xprintf.h b/lib/xprintf.h
index 62986a8c..96fbcfa1 100644
--- a/lib/xprintf.h
+++ b/lib/xprintf.h
@@ -1,5 +1,5 @@
 /* printf wrappers that fail immediately for non-file-related errors
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/xreadlink.c b/lib/xreadlink.c
index cdf9f632..2f3b8a10 100644
--- a/lib/xreadlink.c
+++ b/lib/xreadlink.c
@@ -1,6 +1,6 @@
 /* xreadlink.c -- readlink wrapper to return the link name in malloc'd storage
 
-   Copyright (C) 2001, 2003-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003-2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/xreadlink.h b/lib/xreadlink.h
index da62be61..af80ca43 100644
--- a/lib/xreadlink.h
+++ b/lib/xreadlink.h
@@ -1,6 +1,6 @@
 /* Reading symbolic links without size limitation.
 
-   Copyright (C) 2001, 2003-2004, 2007, 2009-2013 Free Software Foundation,
+   Copyright (C) 2001, 2003-2004, 2007, 2009-2014 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/xsize.h b/lib/xsize.h
index 2922f353..fd12c670 100644
--- a/lib/xsize.h
+++ b/lib/xsize.h
@@ -1,6 +1,6 @@
 /* xsize.h -- Checked size_t computations.
 
-   Copyright (C) 2003, 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2008-2014 Free Software Foundation, Inc.
 
    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
@@ -27,6 +27,9 @@
 # include <stdint.h>
 #endif
 
+#ifndef _GL_INLINE_HEADER_BEGIN
+ #error "Please include config.h first."
+#endif
 _GL_INLINE_HEADER_BEGIN
 #ifndef XSIZE_INLINE
 # define XSIZE_INLINE _GL_INLINE
diff --git a/lib/xstriconv.c b/lib/xstriconv.c
index fb8aad24..be1ef2df 100644
--- a/lib/xstriconv.c
+++ b/lib/xstriconv.c
@@ -1,5 +1,5 @@
 /* Charset conversion with out-of-memory checking.
-   Copyright (C) 2001-2004, 2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006, 2009-2014 Free Software Foundation, Inc.
    Written by Bruno Haible.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/xstriconv.h b/lib/xstriconv.h
index 2b239e74..75f8f832 100644
--- a/lib/xstriconv.h
+++ b/lib/xstriconv.h
@@ -1,5 +1,5 @@
 /* Charset conversion with out-of-memory checking.
-   Copyright (C) 2001-2004, 2006-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2007, 2009-2014 Free Software Foundation, Inc.
    Written by Bruno Haible and Simon Josefsson.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/xstrndup.c b/lib/xstrndup.c
index eae92d03..d2259c82 100644
--- a/lib/xstrndup.c
+++ b/lib/xstrndup.c
@@ -1,6 +1,6 @@
 /* Duplicate a bounded initial segment of a string, with out-of-memory
    checking.
-   Copyright (C) 2003, 2006-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006-2007, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/xstrndup.h b/lib/xstrndup.h
index 59673b04..6a409f7a 100644
--- a/lib/xstrndup.h
+++ b/lib/xstrndup.h
@@ -1,6 +1,6 @@
 /* Duplicate a bounded initial segment of a string, with out-of-memory
    checking.
-   Copyright (C) 2003, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/xstrtod.c b/lib/xstrtod.c
index a36a6135..7caa615d 100644
--- a/lib/xstrtod.c
+++ b/lib/xstrtod.c
@@ -1,6 +1,6 @@
 /* error-checking interface to strtod-like functions
 
-   Copyright (C) 1996, 1999-2000, 2003-2006, 2009-2013 Free Software
+   Copyright (C) 1996, 1999-2000, 2003-2006, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/xstrtod.h b/lib/xstrtod.h
index 8a4543d0..1fb8d7b7 100644
--- a/lib/xstrtod.h
+++ b/lib/xstrtod.h
@@ -1,6 +1,6 @@
 /* Error-checking interface to strtod-like functions.
 
-   Copyright (C) 1996, 1998, 2003-2004, 2006, 2009-2013 Free Software
+   Copyright (C) 1996, 1998, 2003-2004, 2006, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/xstrtol-error.c b/lib/xstrtol-error.c
index 688cef72..9629dabb 100644
--- a/lib/xstrtol-error.c
+++ b/lib/xstrtol-error.c
@@ -1,6 +1,6 @@
 /* A more useful interface to strtol.
 
-   Copyright (C) 1995-1996, 1998-1999, 2001-2004, 2006-2013 Free Software
+   Copyright (C) 1995-1996, 1998-1999, 2001-2004, 2006-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/xstrtol.c b/lib/xstrtol.c
index 6f78572a..f6d535a7 100644
--- a/lib/xstrtol.c
+++ b/lib/xstrtol.c
@@ -1,6 +1,6 @@
 /* A more useful interface to strtol.
 
-   Copyright (C) 1995-1996, 1998-2001, 2003-2007, 2009-2013 Free Software
+   Copyright (C) 1995-1996, 1998-2001, 2003-2007, 2009-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -182,7 +182,7 @@ __xstrtol (const char *s, char **ptr, int strtol_base,
           break;
 
         case 'c':
-          overflow = 0;
+          overflow = LONGINT_OK;
           break;
 
         case 'E': /* exa or exbi */
diff --git a/lib/xstrtol.h b/lib/xstrtol.h
index 5354c872..fe54f6af 100644
--- a/lib/xstrtol.h
+++ b/lib/xstrtol.h
@@ -1,6 +1,6 @@
 /* A more useful interface to strtol.
 
-   Copyright (C) 1995-1996, 1998-1999, 2001-2004, 2006-2013 Free Software
+   Copyright (C) 1995-1996, 1998-1999, 2001-2004, 2006-2014 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/xtime.h b/lib/xtime.h
index c38e9dc3..574e0dbf 100644
--- a/lib/xtime.h
+++ b/lib/xtime.h
@@ -1,6 +1,6 @@
 /* xtime -- extended-resolution integer time stamps
 
-   Copyright (C) 2005-2006, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -20,6 +20,9 @@
 #ifndef XTIME_H_
 #define XTIME_H_ 1
 
+#ifndef _GL_INLINE_HEADER_BEGIN
+ #error "Please include config.h first."
+#endif
 _GL_INLINE_HEADER_BEGIN
 #ifndef XTIME_INLINE
 # define XTIME_INLINE _GL_INLINE
diff --git a/lib/xvasprintf.c b/lib/xvasprintf.c
index 702b5e6b..7a4029e7 100644
--- a/lib/xvasprintf.c
+++ b/lib/xvasprintf.c
@@ -1,5 +1,5 @@
 /* vasprintf and asprintf with out-of-memory checking.
-   Copyright (C) 1999, 2002-2004, 2006-2013 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002-2004, 2006-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/xvasprintf.h b/lib/xvasprintf.h
index 1208fa19..407a5e0d 100644
--- a/lib/xvasprintf.h
+++ b/lib/xvasprintf.h
@@ -1,5 +1,5 @@
 /* vasprintf and asprintf with out-of-memory checking.
-   Copyright (C) 2002-2004, 2006-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002-2004, 2006-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/yesno.c b/lib/yesno.c
index 37976791..ddb34454 100644
--- a/lib/yesno.c
+++ b/lib/yesno.c
@@ -1,6 +1,6 @@
 /* yesno.c -- read a yes/no response from stdin
 
-   Copyright (C) 1990, 1998, 2001, 2003-2013 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1998, 2001, 2003-2014 Free Software Foundation, Inc.
 
    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
diff --git a/lib/yesno.h b/lib/yesno.h
index 470b9db6..3a6d8c9f 100644
--- a/lib/yesno.h
+++ b/lib/yesno.h
@@ -1,5 +1,5 @@
 /* declare yesno
-   Copyright (C) 2004, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/m4/00gnulib.m4 b/m4/00gnulib.m4
index d4ad759f..8eca5518 100644
--- a/m4/00gnulib.m4
+++ b/m4/00gnulib.m4
@@ -1,12 +1,28 @@
-# 00gnulib.m4 serial 2
-dnl Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# 00gnulib.m4 serial 3
+dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 dnl This file must be named something that sorts before all other
 dnl gnulib-provided .m4 files.  It is needed until such time as we can
-dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE semantics.
+dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE and
+dnl m4_divert semantics.
+
+# Until autoconf 2.63, handling of the diversion stack required m4_init
+# to be called first; but this does not happen with aclocal.  Wrapping
+# the entire execution in another layer of the diversion stack fixes this.
+# Worse, prior to autoconf 2.62, m4_wrap depended on the underlying m4
+# for whether it was FIFO or LIFO; in order to properly balance with
+# m4_init, we need to undo our push just before anything wrapped within
+# the m4_init body.  The way to ensure this is to wrap both sides of
+# m4_init with a one-shot macro that does the pop at the right time.
+m4_ifndef([_m4_divert_diversion],
+[m4_divert_push([KILL])
+m4_define([gl_divert_fixup], [m4_divert_pop()m4_define([$0])])
+m4_define([m4_init],
+  [gl_divert_fixup()]m4_defn([m4_init])[gl_divert_fixup()])])
+
 
 # AC_DEFUN_ONCE([NAME], VALUE)
 # ----------------------------
diff --git a/m4/ChangeLog-2007 b/m4/ChangeLog-2007
index 821f1626..ba53ff00 100644
--- a/m4/ChangeLog-2007
+++ b/m4/ChangeLog-2007
@@ -5004,7 +5004,7 @@
 
 	-----
 
-	Copyright (C) 1997-2013 Free Software Foundation, Inc.
+	Copyright (C) 1997-2014 Free Software Foundation, Inc.
 
 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
diff --git a/m4/absolute-header.m4 b/m4/absolute-header.m4
new file mode 100644
index 00000000..ce3e39e9
--- /dev/null
+++ b/m4/absolute-header.m4
@@ -0,0 +1,102 @@
+# absolute-header.m4 serial 16
+dnl Copyright (C) 2006-2014 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Derek Price.
+
+# gl_ABSOLUTE_HEADER(HEADER1 HEADER2 ...)
+# ---------------------------------------
+# Find the absolute name of a header file, testing first if the header exists.
+# If the header were sys/inttypes.h, this macro would define
+# ABSOLUTE_SYS_INTTYPES_H to the '""' quoted absolute name of sys/inttypes.h
+# in config.h
+# (e.g. '#define ABSOLUTE_SYS_INTTYPES_H "///usr/include/sys/inttypes.h"').
+# The three "///" are to pacify Sun C 5.8, which otherwise would say
+# "warning: #include of /usr/include/... may be non-portable".
+# Use '""', not '<>', so that the /// cannot be confused with a C99 comment.
+# Note: This macro assumes that the header file is not empty after
+# preprocessing, i.e. it does not only define preprocessor macros but also
+# provides some type/enum definitions or function/variable declarations.
+AC_DEFUN([gl_ABSOLUTE_HEADER],
+[AC_REQUIRE([AC_CANONICAL_HOST])
+AC_LANG_PREPROC_REQUIRE()dnl
+dnl FIXME: gl_absolute_header and ac_header_exists must be used unquoted
+dnl until we can assume autoconf 2.64 or newer.
+m4_foreach_w([gl_HEADER_NAME], [$1],
+  [AS_VAR_PUSHDEF([gl_absolute_header],
+                  [gl_cv_absolute_]m4_defn([gl_HEADER_NAME]))dnl
+  AC_CACHE_CHECK([absolute name of <]m4_defn([gl_HEADER_NAME])[>],
+    m4_defn([gl_absolute_header]),
+    [AS_VAR_PUSHDEF([ac_header_exists],
+                    [ac_cv_header_]m4_defn([gl_HEADER_NAME]))dnl
+    AC_CHECK_HEADERS_ONCE(m4_defn([gl_HEADER_NAME]))dnl
+    if test AS_VAR_GET(ac_header_exists) = yes; then
+      gl_ABSOLUTE_HEADER_ONE(m4_defn([gl_HEADER_NAME]))
+    fi
+    AS_VAR_POPDEF([ac_header_exists])dnl
+    ])dnl
+  AC_DEFINE_UNQUOTED(AS_TR_CPP([ABSOLUTE_]m4_defn([gl_HEADER_NAME])),
+                     ["AS_VAR_GET(gl_absolute_header)"],
+                     [Define this to an absolute name of <]m4_defn([gl_HEADER_NAME])[>.])
+  AS_VAR_POPDEF([gl_absolute_header])dnl
+])dnl
+])# gl_ABSOLUTE_HEADER
+
+# gl_ABSOLUTE_HEADER_ONE(HEADER)
+# ------------------------------
+# Like gl_ABSOLUTE_HEADER, except that:
+#   - it assumes that the header exists,
+#   - it uses the current CPPFLAGS,
+#   - it does not cache the result,
+#   - it is silent.
+AC_DEFUN([gl_ABSOLUTE_HEADER_ONE],
+[
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_LANG_CONFTEST([AC_LANG_SOURCE([[#include <]]m4_dquote([$1])[[>]])])
+  dnl AIX "xlc -E" and "cc -E" omit #line directives for header files
+  dnl that contain only a #include of other header files and no
+  dnl non-comment tokens of their own. This leads to a failure to
+  dnl detect the absolute name of <dirent.h>, <signal.h>, <poll.h>
+  dnl and others. The workaround is to force preservation of comments
+  dnl through option -C. This ensures all necessary #line directives
+  dnl are present. GCC supports option -C as well.
+  case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
+changequote(,)
+  case "$host_os" in
+    mingw*)
+      dnl For the sake of native Windows compilers (excluding gcc),
+      dnl treat backslash as a directory separator, like /.
+      dnl Actually, these compilers use a double-backslash as
+      dnl directory separator, inside the
+      dnl   # line "filename"
+      dnl directives.
+      gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+  dnl A sed expression that turns a string into a basic regular
+  dnl expression, for use within "/.../".
+  gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo '$1' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+changequote([,])
+  dnl eval is necessary to expand gl_absname_cpp.
+  dnl Ultrix and Pyramid sh refuse to redirect output of eval,
+  dnl so use subshell.
+  AS_VAR_SET([gl_cv_absolute_]AS_TR_SH([[$1]]),
+[`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
+  sed -n "$gl_absolute_header_sed"`])
+])
diff --git a/m4/acl.m4 b/m4/acl.m4
index 5b1fb65e..f02f69d2 100644
--- a/m4/acl.m4
+++ b/m4/acl.m4
@@ -1,7 +1,7 @@
 # acl.m4 - check for access control list (ACL) primitives
-# serial 15
+# serial 17
 
-# Copyright (C) 2002, 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004-2014 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,6 +14,7 @@ AC_DEFUN([gl_FUNC_ACL],
     AS_HELP_STRING([--disable-acl], [do not support ACLs]),
     , [enable_acl=auto])
 
+  AC_CHECK_FUNCS_ONCE([fchmod])
   LIB_ACL=
   use_acl=0
   if test "x$enable_acl" != "xno"; then
@@ -141,12 +142,14 @@ int type = ACL_TYPE_EXTENDED;]])],
 # -------------------------------------
 # If 'acl_get_file' works (does not have a particular bug),
 # run IF-WORKS, otherwise, IF-NOT.
-# This tests for a Darwin 8.7.0 bug, whereby acl_get_file returns NULL,
-# but sets errno = ENOENT for an existing file or directory.
+# When building natively, test for a Darwin 8.7.0 bug, whereby acl_get_file
+# returns NULL, but sets errno = ENOENT for an existing file or directory.
+# When cross-compiling, assume that this old bug no longer applies.
 AC_DEFUN([gl_ACL_GET_FILE],
 [
   AC_CACHE_CHECK([for working acl_get_file], [gl_cv_func_working_acl_get_file],
-    [AC_RUN_IFELSE(
+    [gl_cv_func_working_acl_get_file=no
+     AC_LINK_IFELSE(
        [AC_LANG_PROGRAM(
           [[#include <sys/types.h>
            #include <sys/acl.h>
@@ -156,9 +159,10 @@ AC_DEFUN([gl_ACL_GET_FILE],
               return 1;
             return 0;
           ]])],
-       [gl_cv_func_working_acl_get_file=yes],
-       [gl_cv_func_working_acl_get_file=no],
-       [gl_cv_func_working_acl_get_file=cross-compiling])])
-
-  AS_IF([test $gl_cv_func_working_acl_get_file = yes], [$1], [$2])
+       [if test $cross_compiling = yes; then
+          gl_cv_func_working_acl_get_file="guessing yes"
+        elif ./conftest$ac_exeext; then
+          gl_cv_func_working_acl_get_file=yes
+        fi])])
+  AS_IF([test "$gl_cv_func_working_acl_get_file" != no], [$1], [$2])
 ])
diff --git a/m4/alloca.m4 b/m4/alloca.m4
index 270abd0c..d7bdea63 100644
--- a/m4/alloca.m4
+++ b/m4/alloca.m4
@@ -1,5 +1,5 @@
 # alloca.m4 serial 14
-dnl Copyright (C) 2002-2004, 2006-2007, 2009-2013 Free Software Foundation,
+dnl Copyright (C) 2002-2004, 2006-2007, 2009-2014 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/arpa_inet_h.m4 b/m4/arpa_inet_h.m4
index ea69af57..f01699a9 100644
--- a/m4/arpa_inet_h.m4
+++ b/m4/arpa_inet_h.m4
@@ -1,5 +1,5 @@
 # arpa_inet_h.m4 serial 13
-dnl Copyright (C) 2006, 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/assert.m4 b/m4/assert.m4
index 013fade0..b9bb634e 100644
--- a/m4/assert.m4
+++ b/m4/assert.m4
@@ -1,6 +1,6 @@
 #serial 7
 
-# Copyright (C) 1998-1999, 2001, 2004, 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 1998-1999, 2001, 2004, 2008-2014 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/m4/autobuild.m4 b/m4/autobuild.m4
index 3147b5b0..00d87093 100644
--- a/m4/autobuild.m4
+++ b/m4/autobuild.m4
@@ -1,5 +1,5 @@
 # autobuild.m4 serial 7
-dnl Copyright (C) 2004, 2006-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2004, 2006-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/backupfile.m4 b/m4/backupfile.m4
index 019665a6..69249449 100644
--- a/m4/backupfile.m4
+++ b/m4/backupfile.m4
@@ -1,5 +1,5 @@
 # backupfile.m4 serial 14
-dnl Copyright (C) 2002-2006, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/base64.m4 b/m4/base64.m4
index fc19893e..9559e30b 100644
--- a/m4/base64.m4
+++ b/m4/base64.m4
@@ -1,5 +1,5 @@
 # base64.m4 serial 4
-dnl Copyright (C) 2004, 2006, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2004, 2006, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/bison.m4 b/m4/bison.m4
index 3b1297ab..c003367b 100644
--- a/m4/bison.m4
+++ b/m4/bison.m4
@@ -1,6 +1,6 @@
 # serial 7
 
-# Copyright (C) 2002, 2005, 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2005, 2009-2014 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/m4/boottime.m4 b/m4/boottime.m4
index fc0e6c3c..450cc99c 100644
--- a/m4/boottime.m4
+++ b/m4/boottime.m4
@@ -1,7 +1,7 @@
 # boottime.m4 serial 4
 # Determine whether this system has infrastructure for obtaining the boot time.
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/m4/btowc.m4 b/m4/btowc.m4
index 978a06e9..99889445 100644
--- a/m4/btowc.m4
+++ b/m4/btowc.m4
@@ -1,5 +1,5 @@
 # btowc.m4 serial 10
-dnl Copyright (C) 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/c-strtod.m4 b/m4/c-strtod.m4
index 318487f3..69e964e2 100644
--- a/m4/c-strtod.m4
+++ b/m4/c-strtod.m4
@@ -1,6 +1,6 @@
 # c-strtod.m4 serial 15
 
-# Copyright (C) 2004-2006, 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2006, 2009-2014 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/m4/calloc.m4 b/m4/calloc.m4
index c1ede8db..a63daf82 100644
--- a/m4/calloc.m4
+++ b/m4/calloc.m4
@@ -1,6 +1,6 @@
 # calloc.m4 serial 15
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/m4/canon-host.m4 b/m4/canon-host.m4
index 7e7c6fc1..76cded04 100644
--- a/m4/canon-host.m4
+++ b/m4/canon-host.m4
@@ -1,5 +1,5 @@
 # canon-host.m4 serial 10
-dnl Copyright (C) 2002-2007, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2007, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/canonicalize.m4 b/m4/canonicalize.m4
index cef31244..ace45566 100644
--- a/m4/canonicalize.m4
+++ b/m4/canonicalize.m4
@@ -1,6 +1,6 @@
 # canonicalize.m4 serial 26
 
-dnl Copyright (C) 2003-2007, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2007, 2009-2014 Free Software Foundation, Inc.
 
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/chdir-long.m4 b/m4/chdir-long.m4
index 9c498a62..8ed436de 100644
--- a/m4/chdir-long.m4
+++ b/m4/chdir-long.m4
@@ -6,7 +6,7 @@
 # never fails with ENAMETOOLONG.
 # Arrange to compile chdir-long.c only on systems that define PATH_MAX.
 
-dnl Copyright (C) 2004-2007, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2007, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/check-decl.m4 b/m4/check-decl.m4
index 79f63b50..56dea37f 100644
--- a/m4/check-decl.m4
+++ b/m4/check-decl.m4
@@ -1,7 +1,7 @@
 #serial 26
 # Check declarations for this package.
 
-dnl Copyright (C) 1997-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 1997-2014 Free Software Foundation, Inc.
 
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/chown.m4 b/m4/chown.m4
index e5c084db..2f7b6d7f 100644
--- a/m4/chown.m4
+++ b/m4/chown.m4
@@ -1,7 +1,7 @@
 # serial 27
 # Determine whether we need the chown wrapper.
 
-dnl Copyright (C) 1997-2001, 2003-2005, 2007, 2009-2013 Free Software
+dnl Copyright (C) 1997-2001, 2003-2005, 2007, 2009-2014 Free Software
 dnl Foundation, Inc.
 
 dnl This file is free software; the Free Software Foundation
diff --git a/m4/clock_time.m4 b/m4/clock_time.m4
index 6597fb63..6c4a637d 100644
--- a/m4/clock_time.m4
+++ b/m4/clock_time.m4
@@ -1,5 +1,5 @@
 # clock_time.m4 serial 10
-dnl Copyright (C) 2002-2006, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/close-stream.m4 b/m4/close-stream.m4
index 0a80c37a..80cde85a 100644
--- a/m4/close-stream.m4
+++ b/m4/close-stream.m4
@@ -1,5 +1,5 @@
 #serial 4
-dnl Copyright (C) 2006-2007, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2007, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/close.m4 b/m4/close.m4
index bccd9819..68510c5c 100644
--- a/m4/close.m4
+++ b/m4/close.m4
@@ -1,5 +1,5 @@
 # close.m4 serial 8
-dnl Copyright (C) 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/closedir.m4 b/m4/closedir.m4
index bb8708b6..d234a522 100644
--- a/m4/closedir.m4
+++ b/m4/closedir.m4
@@ -1,5 +1,5 @@
 # closedir.m4 serial 2
-dnl Copyright (C) 2011-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/closein.m4 b/m4/closein.m4
index ca03c76b..db7fb5a9 100644
--- a/m4/closein.m4
+++ b/m4/closein.m4
@@ -1,5 +1,5 @@
 # closein.m4 serial 2
-dnl Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/closeout.m4 b/m4/closeout.m4
index 759feaae..2f0c87e8 100644
--- a/m4/closeout.m4
+++ b/m4/closeout.m4
@@ -1,5 +1,5 @@
 # closeout.m4 serial 6
-dnl Copyright (C) 2002-2003, 2005-2006, 2009-2013 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2006, 2009-2014 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/codeset.m4 b/m4/codeset.m4
index c2761be2..d7de8d67 100644
--- a/m4/codeset.m4
+++ b/m4/codeset.m4
@@ -1,5 +1,5 @@
 # codeset.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2000-2002, 2006, 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2000-2002, 2006, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/config-h.m4 b/m4/config-h.m4
index 9158d669..52629960 100644
--- a/m4/config-h.m4
+++ b/m4/config-h.m4
@@ -1,6 +1,6 @@
 # Say that -DHAVE_CONFIG_H is not needed.
 
-dnl Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/configmake.m4 b/m4/configmake.m4
index 823ffc0d..0cd86cf9 100644
--- a/m4/configmake.m4
+++ b/m4/configmake.m4
@@ -1,5 +1,5 @@
-# configmake.m4 serial 1
-dnl Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# configmake.m4 serial 2
+dnl Copyright (C) 2010-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -7,8 +7,9 @@ dnl with or without modifications, as long as this notice is preserved.
 # gl_CONFIGMAKE_PREP
 # ------------------
 # Guarantee all of the standard directory variables, even when used with
-# autoconf 2.59 (datarootdir wasn't supported until 2.59c) or automake
-# 1.9.6 (pkglibexecdir wasn't supported until 1.10b.).
+# autoconf 2.59 (datarootdir wasn't supported until 2.59c, and runstatedir
+# in 2.70) or automake 1.9.6 (pkglibexecdir wasn't supported until 1.10b,
+# and runstatedir in 1.14.1).
 AC_DEFUN([gl_CONFIGMAKE_PREP],
 [
   dnl Technically, datadir should default to datarootdir.  But if
@@ -43,6 +44,10 @@ AC_DEFUN([gl_CONFIGMAKE_PREP],
   if test "x$localedir" = x; then
     AC_SUBST([localedir], ['${datarootdir}/locale'])
   fi
+  dnl Added in autoconf 2.70
+  if test "x$runstatedir" = x; then
+    AC_SUBST([runstatedir], ['${localstatedir}/run'])
+  fi
 
   dnl Automake 1.9.6 only lacks pkglibexecdir; and since 1.11 merely
   dnl provides it without AC_SUBST, this blind use of AC_SUBST is safe.
diff --git a/m4/ctype.m4 b/m4/ctype.m4
index 100bd3a7..150383b7 100644
--- a/m4/ctype.m4
+++ b/m4/ctype.m4
@@ -1,5 +1,5 @@
 # ctype_h.m4 serial 6
-dnl Copyright (C) 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/cu-progs.m4 b/m4/cu-progs.m4
index 404996d7..fa0fbbc2 100644
--- a/m4/cu-progs.m4
+++ b/m4/cu-progs.m4
@@ -92,7 +92,7 @@ gl_ADD_PROG([optional_bin_progs], [vdir])
 gl_ADD_PROG([optional_bin_progs], [wc])
 gl_ADD_PROG([optional_bin_progs], [whoami])
 gl_ADD_PROG([optional_bin_progs], [yes])
-no_install_progs_default='arch hostname'
+no_install_progs_default='arch coreutils hostname'
 # Given the name of a variable containing a space-separated
 # list of install-by-default programs and the actual list of
 # do-not-install-by-default programs, modify the former variable
@@ -103,4 +103,4 @@ no_install_progs_default='arch hostname'
 # separators.  That is required due to the way the macro works,
 # and since the corresponding ./configure option argument is
 # comma-separated on input.
-gl_INCLUDE_EXCLUDE_PROG([optional_bin_progs], [arch,hostname])
+gl_INCLUDE_EXCLUDE_PROG([optional_bin_progs], [arch,coreutils,hostname])
diff --git a/m4/cycle-check.m4 b/m4/cycle-check.m4
index 04ed9be3..62d08ee3 100644
--- a/m4/cycle-check.m4
+++ b/m4/cycle-check.m4
@@ -1,5 +1,5 @@
 #serial 7
-dnl Copyright (C) 2005-2007, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2007, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/d-ino.m4 b/m4/d-ino.m4
index aab82c2d..5ccb733c 100644
--- a/m4/d-ino.m4
+++ b/m4/d-ino.m4
@@ -1,11 +1,11 @@
-# serial 13
+# serial 14
 
 dnl From Jim Meyering.
 dnl
 dnl Check whether struct dirent has a member named d_ino.
 dnl
 
-# Copyright (C) 1997, 1999-2001, 2003-2004, 2006-2007, 2009-2013 Free Software
+# Copyright (C) 1997, 1999-2001, 2003-2004, 2006-2007, 2009-2014 Free Software
 # Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
@@ -30,7 +30,7 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_INO],
              e = readdir (dp);
              if (! e)
                return 2;
-             if (stat (e->d_name, &st) != 0)
+             if (lstat (e->d_name, &st) != 0)
                return 3;
              if (e->d_ino != st.st_ino)
                return 4;
diff --git a/m4/d-type.m4 b/m4/d-type.m4
index ee399c26..0190d73b 100644
--- a/m4/d-type.m4
+++ b/m4/d-type.m4
@@ -5,7 +5,7 @@ dnl
 dnl Check whether struct dirent has a member named d_type.
 dnl
 
-# Copyright (C) 1997, 1999-2004, 2006, 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997, 1999-2004, 2006, 2009-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/m4/dirent-safer.m4 b/m4/dirent-safer.m4
index 708d7b19..0a197fbc 100644
--- a/m4/dirent-safer.m4
+++ b/m4/dirent-safer.m4
@@ -1,5 +1,5 @@
 #serial 2
-dnl Copyright (C) 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/dirent_h.m4 b/m4/dirent_h.m4
index 54c16634..3f2b16b1 100644
--- a/m4/dirent_h.m4
+++ b/m4/dirent_h.m4
@@ -1,5 +1,5 @@
 # dirent_h.m4 serial 16
-dnl Copyright (C) 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/dirfd.m4 b/m4/dirfd.m4
index 39bc7897..b4227694 100644
--- a/m4/dirfd.m4
+++ b/m4/dirfd.m4
@@ -2,7 +2,7 @@
 
 dnl Find out how to get the file descriptor associated with an open DIR*.
 
-# Copyright (C) 2001-2006, 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2006, 2008-2014 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/m4/dirname.m4 b/m4/dirname.m4
index 5897a2a8..d2627b8a 100644
--- a/m4/dirname.m4
+++ b/m4/dirname.m4
@@ -1,5 +1,5 @@
 #serial 10   -*- autoconf -*-
-dnl Copyright (C) 2002-2006, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/double-slash-root.m4 b/m4/double-slash-root.m4
index bd6f8671..937f4bca 100644
--- a/m4/double-slash-root.m4
+++ b/m4/double-slash-root.m4
@@ -1,5 +1,5 @@
 # double-slash-root.m4 serial 4   -*- Autoconf -*-
-dnl Copyright (C) 2006, 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/dup.m4 b/m4/dup.m4
index 5105b6e4..9393bc52 100644
--- a/m4/dup.m4
+++ b/m4/dup.m4
@@ -1,5 +1,5 @@
 # dup.m4 serial 3
-dnl Copyright (C) 2011-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/dup2.m4 b/m4/dup2.m4
index 269cfdc1..6498fc20 100644
--- a/m4/dup2.m4
+++ b/m4/dup2.m4
@@ -1,5 +1,5 @@
-#serial 19
-dnl Copyright (C) 2002, 2005, 2007, 2009-2013 Free Software Foundation, Inc.
+#serial 20
+dnl Copyright (C) 2002, 2005, 2007, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -8,6 +8,7 @@ AC_DEFUN([gl_FUNC_DUP2],
 [
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
   AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_CHECK_FUNCS_ONCE([getdtablesize])
   m4_ifdef([gl_FUNC_DUP2_OBSOLETE], [
     AC_CHECK_FUNCS_ONCE([dup2])
     if test $ac_cv_func_dup2 = no; then
@@ -23,6 +24,11 @@ AC_DEFUN([gl_FUNC_DUP2],
 #include <fcntl.h>
 #include <errno.h>]],
            [int result = 0;
+#ifdef HAVE_GETDTABLESIZE
+            int bad_fd = getdtablesize ();
+#else
+            int bad_fd = 1000000;
+#endif
 #ifdef FD_CLOEXEC
             if (fcntl (1, F_SETFD, FD_CLOEXEC) == -1)
               result |= 1;
@@ -37,11 +43,13 @@ AC_DEFUN([gl_FUNC_DUP2],
             if (dup2 (0, 0) != -1)
               result |= 8;
             /* Many gnulib modules require POSIX conformance of EBADF.  */
-            if (dup2 (2, 1000000) == -1 && errno != EBADF)
+            if (dup2 (2, bad_fd) == -1 && errno != EBADF)
               result |= 16;
-            /* Flush out a cygwin core dump.  */
+            /* Flush out some cygwin core dumps.  */
             if (dup2 (2, -1) != -1 || errno != EBADF)
               result |= 32;
+            dup2 (2, 255);
+            dup2 (2, 256);
             return result;
            ])
         ],
@@ -54,7 +62,9 @@ AC_DEFUN([gl_FUNC_DUP2],
            linux*) # On linux between 2008-07-27 and 2009-05-11, dup2 of a
                    # closed fd may yield -EBADF instead of -1 / errno=EBADF.
              gl_cv_func_dup2_works="guessing no" ;;
-           freebsd*) # on FreeBSD 6.1, dup2(1,1000000) gives EMFILE, not EBADF.
+           aix* | freebsd*)
+                   # on AIX 7.1 and FreeBSD 6.1, dup2 (1,toobig) gives EMFILE,
+                   # not EBADF.
              gl_cv_func_dup2_works="guessing no" ;;
            haiku*) # on Haiku alpha 2, dup2(1, 1) resets FD_CLOEXEC.
              gl_cv_func_dup2_works="guessing no" ;;
@@ -65,6 +75,7 @@ AC_DEFUN([gl_FUNC_DUP2],
       *yes) ;;
       *)
         REPLACE_DUP2=1
+        AC_CHECK_FUNCS([setdtablesize])
         ;;
     esac
   fi
diff --git a/m4/eealloc.m4 b/m4/eealloc.m4
index c640ec12..8a51fe7c 100644
--- a/m4/eealloc.m4
+++ b/m4/eealloc.m4
@@ -1,5 +1,5 @@
 # eealloc.m4 serial 3
-dnl Copyright (C) 2003, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/environ.m4 b/m4/environ.m4
index 593a33ed..cfabe46f 100644
--- a/m4/environ.m4
+++ b/m4/environ.m4
@@ -1,5 +1,5 @@
 # environ.m4 serial 6
-dnl Copyright (C) 2001-2004, 2006-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2004, 2006-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/errno_h.m4 b/m4/errno_h.m4
index c813ea58..4ee9e6a1 100644
--- a/m4/errno_h.m4
+++ b/m4/errno_h.m4
@@ -1,5 +1,5 @@
 # errno_h.m4 serial 12
-dnl Copyright (C) 2004, 2006, 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2004, 2006, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/error.m4 b/m4/error.m4
index 29e6fdc9..f08ae50f 100644
--- a/m4/error.m4
+++ b/m4/error.m4
@@ -1,6 +1,6 @@
 #serial 14
 
-# Copyright (C) 1996-1998, 2001-2004, 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-1998, 2001-2004, 2009-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/m4/euidaccess.m4 b/m4/euidaccess.m4
index 12e5efcb..55393a45 100644
--- a/m4/euidaccess.m4
+++ b/m4/euidaccess.m4
@@ -1,5 +1,5 @@
 # euidaccess.m4 serial 15
-dnl Copyright (C) 2002-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/exponentd.m4 b/m4/exponentd.m4
index 09df468c..7bee6357 100644
--- a/m4/exponentd.m4
+++ b/m4/exponentd.m4
@@ -1,5 +1,5 @@
 # exponentd.m4 serial 3
-dnl Copyright (C) 2007-2008, 2010-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2008, 2010-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/exponentf.m4 b/m4/exponentf.m4
index 55a04e63..b2dfeef9 100644
--- a/m4/exponentf.m4
+++ b/m4/exponentf.m4
@@ -1,5 +1,5 @@
 # exponentf.m4 serial 2
-dnl Copyright (C) 2007-2008, 2010-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2008, 2010-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/exponentl.m4 b/m4/exponentl.m4
index f877cf14..d6f4ba7f 100644
--- a/m4/exponentl.m4
+++ b/m4/exponentl.m4
@@ -1,5 +1,5 @@
 # exponentl.m4 serial 3
-dnl Copyright (C) 2007-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/extensions.m4 b/m4/extensions.m4
index 617323b2..37f55ca3 100644
--- a/m4/extensions.m4
+++ b/m4/extensions.m4
@@ -1,14 +1,14 @@
-# serial 12  -*- Autoconf -*-
+# serial 13  -*- Autoconf -*-
 # Enable extensions on systems that normally disable them.
 
-# Copyright (C) 2003, 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006-2014 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# This definition of AC_USE_SYSTEM_EXTENSIONS is stolen from CVS
+# This definition of AC_USE_SYSTEM_EXTENSIONS is stolen from git
 # Autoconf.  Perhaps we can remove this once we can assume Autoconf
-# 2.62 or later everywhere, but since CVS Autoconf mutates rapidly
+# 2.70 or later everywhere, but since Autoconf mutates rapidly
 # enough in this area it's likely we'll need to redefine
 # AC_USE_SYSTEM_EXTENSIONS for quite some time.
 
@@ -30,6 +30,7 @@
 # ------------------------
 # Enable extensions on systems that normally disable them,
 # typically due to standards-conformance issues.
+#
 # Remember that #undef in AH_VERBATIM gets replaced with #define by
 # AC_DEFINE.  The goal here is to define all known feature-enabling
 # macros, then, if reports of conflicts are made, disable macros that
@@ -38,8 +39,6 @@ AC_DEFUN_ONCE([AC_USE_SYSTEM_EXTENSIONS],
 [AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl
 AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
 
-  AC_REQUIRE([AC_CANONICAL_HOST])
-
   AC_CHECK_HEADER([minix/config.h], [MINIX=yes], [MINIX=])
   if test "$MINIX" = yes; then
     AC_DEFINE([_POSIX_SOURCE], [1],
@@ -50,24 +49,18 @@ AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
        except with this defined.])
     AC_DEFINE([_MINIX], [1],
       [Define to 1 if on MINIX.])
+    AC_DEFINE([_NETBSD_SOURCE], [1],
+      [Define to 1 to make NetBSD features available.  MINIX 3 needs this.])
   fi
 
-  dnl HP-UX 11.11 defines mbstate_t only if _XOPEN_SOURCE is defined to 500,
-  dnl regardless of whether the flags -Ae or _D_HPUX_SOURCE=1 are already
-  dnl provided.
-  case "$host_os" in
-    hpux*)
-      AC_DEFINE([_XOPEN_SOURCE], [500],
-        [Define to 500 only on HP-UX.])
-      ;;
-  esac
-
-  AH_VERBATIM([__EXTENSIONS__],
+dnl Use a different key than __EXTENSIONS__, as that name broke existing
+dnl configure.ac when using autoheader 2.62.
+  AH_VERBATIM([USE_SYSTEM_EXTENSIONS],
 [/* Enable extensions on AIX 3, Interix.  */
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
 #endif
-/* Enable general extensions on Mac OS X.  */
+/* Enable general extensions on OS X.  */
 #ifndef _DARWIN_C_SOURCE
 # undef _DARWIN_C_SOURCE
 #endif
@@ -83,6 +76,12 @@ AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
 #ifndef _TANDEM_SOURCE
 # undef _TANDEM_SOURCE
 #endif
+/* Enable X/Open extensions if necessary.  HP-UX 11.11 defines
+   mbstate_t only if _XOPEN_SOURCE is defined to 500, regardless of
+   whether compiling with -Ae or -D_HPUX_SOURCE=1.  */
+#ifndef _XOPEN_SOURCE
+# undef _XOPEN_SOURCE
+#endif
 /* Enable general extensions on Solaris.  */
 #ifndef __EXTENSIONS__
 # undef __EXTENSIONS__
@@ -103,6 +102,22 @@ AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
   AC_DEFINE([_GNU_SOURCE])
   AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
   AC_DEFINE([_TANDEM_SOURCE])
+  AC_CACHE_CHECK([whether _XOPEN_SOURCE should be defined],
+    [ac_cv_should_define__xopen_source],
+    [ac_cv_should_define__xopen_source=no
+     AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM([[
+          #include <wchar.h>
+          mbstate_t x;]])],
+       [],
+       [AC_COMPILE_IFELSE(
+          [AC_LANG_PROGRAM([[
+             #define _XOPEN_SOURCE 500
+             #include <wchar.h>
+             mbstate_t x;]])],
+          [ac_cv_should_define__xopen_source=yes])])])
+  test $ac_cv_should_define__xopen_source = yes &&
+    AC_DEFINE([_XOPEN_SOURCE], [500])
 ])# AC_USE_SYSTEM_EXTENSIONS
 
 # gl_USE_SYSTEM_EXTENSIONS
diff --git a/m4/extern-inline.m4 b/m4/extern-inline.m4
index 5880d4f4..240150ef 100644
--- a/m4/extern-inline.m4
+++ b/m4/extern-inline.m4
@@ -1,6 +1,6 @@
 dnl 'extern inline' a la ISO C99.
 
-dnl Copyright 2012-2013 Free Software Foundation, Inc.
+dnl Copyright 2012-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -8,34 +8,52 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_EXTERN_INLINE],
 [
   AH_VERBATIM([extern_inline],
-[/* _GL_INLINE is a portable alternative to ISO C99 plain 'inline'.
-   _GL_EXTERN_INLINE is a portable alternative to 'extern inline'.
-   _GL_INLINE_HEADER_BEGIN contains useful stuff to put
-     in an include file, before uses of _GL_INLINE.
-     It suppresses GCC's bogus "no previous prototype for 'FOO'" diagnostic,
-     when FOO is an inline function in the header; see
-     <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113>.
-   _GL_INLINE_HEADER_END contains useful stuff to put
-     in the same include file, after uses of _GL_INLINE.
+[/* Please see the Gnulib manual for how to use these macros.
+
+   Suppress extern inline with HP-UX cc, as it appears to be broken; see
+   <http://lists.gnu.org/archive/html/bug-texinfo/2013-02/msg00030.html>.
+
+   Suppress extern inline with Sun C in standards-conformance mode, as it
+   mishandles inline functions that call each other.  E.g., for 'inline void f
+   (void) { } inline void g (void) { f (); }', c99 incorrectly complains
+   'reference to static identifier "f" in extern inline function'.
+   This bug was observed with Sun C 5.12 SunOS_i386 2011/11/16.
 
-   Suppress the use of extern inline on Apple's platforms,
-   as Libc-825.25 (2012-09-19) is incompatible with it; see
+   Suppress the use of extern inline on problematic Apple configurations.
+   OS X 10.8 and earlier mishandle it; see, e.g.,
    <http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html>.
+   OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and
+   for clang but remains for g++; see <http://trac.macports.org/ticket/41033>.
    Perhaps Apple will fix this some day.  */
+#if (defined __APPLE__ \
+     && (defined __header_inline \
+         ? (defined __cplusplus && defined __GNUC_STDC_INLINE__ \
+            && ! defined __clang__) \
+         : ((! defined _DONT_USE_CTYPE_INLINE_ \
+             && (defined __GNUC__ || defined __cplusplus)) \
+            || (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \
+                && defined __GNUC__ && ! defined __cplusplus))))
+# define _GL_EXTERN_INLINE_APPLE_BUG
+#endif
 #if ((__GNUC__ \
       ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
-      : 199901L <= __STDC_VERSION__) \
-     && !defined __APPLE__)
+      : (199901L <= __STDC_VERSION__ \
+         && !defined __HP_cc \
+         && !(defined __SUNPRO_C && __STDC__))) \
+     && !defined _GL_EXTERN_INLINE_APPLE_BUG)
 # define _GL_INLINE inline
 # define _GL_EXTERN_INLINE extern inline
-#elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __APPLE__
-# if __GNUC_GNU_INLINE__
+# define _GL_EXTERN_INLINE_IN_USE
+#elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \
+       && !defined _GL_EXTERN_INLINE_APPLE_BUG)
+# if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__
    /* __gnu_inline__ suppresses a GCC 4.2 diagnostic.  */
 #  define _GL_INLINE extern inline __attribute__ ((__gnu_inline__))
 # else
 #  define _GL_INLINE extern inline
 # endif
 # define _GL_EXTERN_INLINE extern
+# define _GL_EXTERN_INLINE_IN_USE
 #else
 # define _GL_INLINE static _GL_UNUSED
 # define _GL_EXTERN_INLINE static _GL_UNUSED
@@ -48,6 +66,10 @@ AC_DEFUN([gl_EXTERN_INLINE],
 #  define _GL_INLINE_HEADER_CONST_PRAGMA \
      _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"")
 # endif
+  /* Suppress GCC's bogus "no previous prototype for 'FOO'"
+     and "no previous declaration for 'FOO'"  diagnostics,
+     when FOO is an inline function in the header; see
+     <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113>.  */
 # define _GL_INLINE_HEADER_BEGIN \
     _Pragma ("GCC diagnostic push") \
     _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \
diff --git a/m4/faccessat.m4 b/m4/faccessat.m4
index fb28bffa..d9016bdf 100644
--- a/m4/faccessat.m4
+++ b/m4/faccessat.m4
@@ -1,7 +1,7 @@
 # serial 6
 # See if we need to provide faccessat replacement.
 
-dnl Copyright (C) 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/fatal-signal.m4 b/m4/fatal-signal.m4
deleted file mode 100644
index ae8b65c5..00000000
--- a/m4/fatal-signal.m4
+++ /dev/null
@@ -1,12 +0,0 @@
-# fatal-signal.m4 serial 9
-dnl Copyright (C) 2003-2004, 2006, 2008-2013 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_FATAL_SIGNAL],
-[
-  AC_REQUIRE([gt_TYPE_SIG_ATOMIC_T])
-  AC_CHECK_HEADERS_ONCE([unistd.h])
-  gl_PREREQ_SIG_HANDLER_H
-])
diff --git a/m4/fchdir.m4 b/m4/fchdir.m4
index c248fdce..9da16b03 100644
--- a/m4/fchdir.m4
+++ b/m4/fchdir.m4
@@ -1,5 +1,5 @@
 # fchdir.m4 serial 21
-dnl Copyright (C) 2006-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/fchmodat.m4 b/m4/fchmodat.m4
index dc9c4e79..28954c4e 100644
--- a/m4/fchmodat.m4
+++ b/m4/fchmodat.m4
@@ -1,5 +1,5 @@
 # fchmodat.m4 serial 1
-dnl Copyright (C) 2004-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/fchownat.m4 b/m4/fchownat.m4
index 9c862d35..479b277a 100644
--- a/m4/fchownat.m4
+++ b/m4/fchownat.m4
@@ -1,5 +1,5 @@
 # fchownat.m4 serial 1
-dnl Copyright (C) 2004-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/fclose.m4 b/m4/fclose.m4
index 2cc2e129..10260183 100644
--- a/m4/fclose.m4
+++ b/m4/fclose.m4
@@ -1,5 +1,5 @@
-# fclose.m4 serial 5
-dnl Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# fclose.m4 serial 6
+dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -9,7 +9,7 @@ AC_DEFUN([gl_FUNC_FCLOSE],
   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
 
   gl_FUNC_FFLUSH_STDIN
-  if test $gl_cv_func_fflush_stdin = no; then
+  if test $gl_cv_func_fflush_stdin != yes; then
     REPLACE_FCLOSE=1
   fi
 
diff --git a/m4/fcntl-o.m4 b/m4/fcntl-o.m4
index 87cc4bd2..43c93124 100644
--- a/m4/fcntl-o.m4
+++ b/m4/fcntl-o.m4
@@ -1,5 +1,5 @@
 # fcntl-o.m4 serial 4
-dnl Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/fcntl-safer.m4 b/m4/fcntl-safer.m4
index ecc7e46d..2179ddea 100644
--- a/m4/fcntl-safer.m4
+++ b/m4/fcntl-safer.m4
@@ -1,5 +1,5 @@
 #serial 9
-dnl Copyright (C) 2005-2007, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2007, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/fcntl.m4 b/m4/fcntl.m4
index 5481cae4..f824beb6 100644
--- a/m4/fcntl.m4
+++ b/m4/fcntl.m4
@@ -1,5 +1,5 @@
 # fcntl.m4 serial 5
-dnl Copyright (C) 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -19,7 +19,7 @@ AC_DEFUN([gl_FUNC_FCNTL],
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
   AC_REQUIRE([gl_FCNTL_H_DEFAULTS])
   AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_CHECK_FUNCS_ONCE([fcntl])
+  AC_CHECK_FUNCS_ONCE([fcntl getdtablesize])
   if test $ac_cv_func_fcntl = no; then
     gl_REPLACE_FCNTL
   else
@@ -28,11 +28,21 @@ AC_DEFUN([gl_FUNC_FCNTL],
     AC_CACHE_CHECK([whether fcntl handles F_DUPFD correctly],
       [gl_cv_func_fcntl_f_dupfd_works],
       [AC_RUN_IFELSE([AC_LANG_PROGRAM([[
+#ifdef HAVE_GETDTABLESIZE
+# include <unistd.h>
+#endif
 #include <fcntl.h>
 #include <errno.h>
 ]], [[int result = 0;
+#ifdef HAVE_GETDTABLESIZE
+      int bad_fd = getdtablesize ();
+#else
+      int bad_fd = 1000000;
+#endif
       if (fcntl (0, F_DUPFD, -1) != -1) result |= 1;
       if (errno != EINVAL) result |= 2;
+      if (fcntl (0, F_DUPFD, bad_fd) != -1) result |= 4;
+      if (errno != EINVAL) result |= 8;
       return result;
          ]])],
          [gl_cv_func_fcntl_f_dupfd_works=yes],
diff --git a/m4/fcntl_h.m4 b/m4/fcntl_h.m4
index 3cff1fd6..fb2556d3 100644
--- a/m4/fcntl_h.m4
+++ b/m4/fcntl_h.m4
@@ -1,6 +1,6 @@
 # serial 15
 # Configure fcntl.h.
-dnl Copyright (C) 2006-2007, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2007, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/fdatasync.m4 b/m4/fdatasync.m4
index 551c0d9f..4fea09f0 100644
--- a/m4/fdatasync.m4
+++ b/m4/fdatasync.m4
@@ -1,5 +1,5 @@
 # fdatasync.m4 serial 4
-dnl Copyright (C) 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/fdopen.m4 b/m4/fdopen.m4
index 74d1649f..4cf8f359 100644
--- a/m4/fdopen.m4
+++ b/m4/fdopen.m4
@@ -1,5 +1,5 @@
 # fdopen.m4 serial 3
-dnl Copyright (C) 2011-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/fdopendir.m4 b/m4/fdopendir.m4
index b7be7832..a3e7849b 100644
--- a/m4/fdopendir.m4
+++ b/m4/fdopendir.m4
@@ -1,7 +1,7 @@
 # serial 10
 # See if we need to provide fdopendir.
 
-dnl Copyright (C) 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/fflush.m4 b/m4/fflush.m4
index 6df51736..d8069c91 100644
--- a/m4/fflush.m4
+++ b/m4/fflush.m4
@@ -1,6 +1,6 @@
-# fflush.m4 serial 14
+# fflush.m4 serial 15
 
-# Copyright (C) 2007-2013 Free Software Foundation, Inc.
+# Copyright (C) 2007-2014 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,7 +14,7 @@ AC_DEFUN([gl_FUNC_FFLUSH],
 [
   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
   gl_FUNC_FFLUSH_STDIN
-  if test $gl_cv_func_fflush_stdin = no; then
+  if test $gl_cv_func_fflush_stdin != yes; then
     REPLACE_FFLUSH=1
   fi
 ])
@@ -72,10 +72,17 @@ AC_DEFUN([gl_FUNC_FFLUSH_STDIN],
            return 7;
          return 0;
        ]])], [gl_cv_func_fflush_stdin=yes], [gl_cv_func_fflush_stdin=no],
-     [dnl Pessimistically assume fflush is broken.
-      gl_cv_func_fflush_stdin=no])
+     [gl_cv_func_fflush_stdin=cross])
      rm conftest.txt
     ])
+  case $gl_cv_func_fflush_stdin in
+    yes) gl_func_fflush_stdin=1 ;;
+    no)  gl_func_fflush_stdin=0 ;;
+    *)   gl_func_fflush_stdin='(-1)' ;;
+  esac
+  AC_DEFINE_UNQUOTED([FUNC_FFLUSH_STDIN], [$gl_func_fflush_stdin],
+    [Define to 1 if fflush is known to work on stdin as per POSIX.1-2008,
+     0 if fflush is known to not work, -1 if unknown.])
 ])
 
 # Prerequisites of lib/fflush.c.
diff --git a/m4/fileblocks.m4 b/m4/fileblocks.m4
index d1abd30a..2ec23e7d 100644
--- a/m4/fileblocks.m4
+++ b/m4/fileblocks.m4
@@ -1,5 +1,5 @@
 # fileblocks.m4 serial 6
-dnl Copyright (C) 2002, 2005-2006, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2005-2006, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/filemode.m4 b/m4/filemode.m4
index d7a0104c..0b9e3566 100644
--- a/m4/filemode.m4
+++ b/m4/filemode.m4
@@ -1,5 +1,5 @@
 # filemode.m4 serial 8
-dnl Copyright (C) 2002, 2005-2006, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2005-2006, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/filenamecat.m4 b/m4/filenamecat.m4
index 40946e82..6c6656aa 100644
--- a/m4/filenamecat.m4
+++ b/m4/filenamecat.m4
@@ -1,5 +1,5 @@
 # filenamecat.m4 serial 11
-dnl Copyright (C) 2002-2006, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/flexmember.m4 b/m4/flexmember.m4
index 155b8484..b1385504 100644
--- a/m4/flexmember.m4
+++ b/m4/flexmember.m4
@@ -1,7 +1,7 @@
 # serial 3
 # Check for flexible array member support.
 
-# Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/m4/float_h.m4 b/m4/float_h.m4
index 397f2d1f..a27ef7f9 100644
--- a/m4/float_h.m4
+++ b/m4/float_h.m4
@@ -1,5 +1,5 @@
 # float_h.m4 serial 9
-dnl Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/fnmatch.m4 b/m4/fnmatch.m4
index fa0ba4d2..9db4144b 100644
--- a/m4/fnmatch.m4
+++ b/m4/fnmatch.m4
@@ -1,6 +1,6 @@
 # Check for fnmatch - serial 9.
 
-# Copyright (C) 2000-2007, 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2007, 2009-2014 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/m4/fopen.m4 b/m4/fopen.m4
index 3337cc99..7b26c783 100644
--- a/m4/fopen.m4
+++ b/m4/fopen.m4
@@ -1,5 +1,5 @@
 # fopen.m4 serial 9
-dnl Copyright (C) 2007-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/fpending.m4 b/m4/fpending.m4
index 8f585624..c2d01ef0 100644
--- a/m4/fpending.m4
+++ b/m4/fpending.m4
@@ -1,6 +1,6 @@
-# serial 19
+# serial 21
 
-# Copyright (C) 2000-2001, 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2001, 2004-2014 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,14 +16,23 @@ dnl we have to grub around in the FILE struct.
 AC_DEFUN([gl_FUNC_FPENDING],
 [
   AC_CHECK_HEADERS_ONCE([stdio_ext.h])
-  AC_CHECK_FUNCS_ONCE([__fpending])
   fp_headers='
-#     include <stdio.h>
-#     if HAVE_STDIO_EXT_H
-#      include <stdio_ext.h>
-#     endif
-'
-  AC_CHECK_DECLS([__fpending], , , $fp_headers)
+    #include <stdio.h>
+    #if HAVE_STDIO_EXT_H
+    # include <stdio_ext.h>
+    #endif
+  '
+  AC_CACHE_CHECK([for __fpending], [gl_cv_func___fpending],
+    [
+      AC_LINK_IFELSE(
+        [AC_LANG_PROGRAM([$fp_headers],
+           [[return ! __fpending (stdin);]])],
+        [gl_cv_func___fpending=yes],
+        [gl_cv_func___fpending=no])
+    ])
+  if test $gl_cv_func___fpending = yes; then
+    AC_CHECK_DECLS([__fpending], [], [], [$fp_headers])
+  fi
 ])
 
 AC_DEFUN([gl_PREREQ_FPENDING],
diff --git a/m4/fpieee.m4 b/m4/fpieee.m4
index 97941bb4..729afe85 100644
--- a/m4/fpieee.m4
+++ b/m4/fpieee.m4
@@ -1,5 +1,5 @@
 # fpieee.m4 serial 2
-dnl Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/fpurge.m4 b/m4/fpurge.m4
index 2059a56e..ee017d20 100644
--- a/m4/fpurge.m4
+++ b/m4/fpurge.m4
@@ -1,5 +1,5 @@
 # fpurge.m4 serial 7
-dnl Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/freadahead.m4 b/m4/freadahead.m4
index 0f2d47c4..95b41412 100644
--- a/m4/freadahead.m4
+++ b/m4/freadahead.m4
@@ -1,5 +1,5 @@
 # freadahead.m4 serial 1
-dnl Copyright (C) 2012-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2012-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/freading.m4 b/m4/freading.m4
index 1e1f6f24..836f4d73 100644
--- a/m4/freading.m4
+++ b/m4/freading.m4
@@ -1,5 +1,5 @@
 # freading.m4 serial 1
-dnl Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/freadptr.m4 b/m4/freadptr.m4
index 13c3a9c7..f1f4619d 100644
--- a/m4/freadptr.m4
+++ b/m4/freadptr.m4
@@ -1,5 +1,5 @@
 # freadptr.m4 serial 1
-dnl Copyright (C) 2012-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2012-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/freadseek.m4 b/m4/freadseek.m4
index d5a728cf..83a0a415 100644
--- a/m4/freadseek.m4
+++ b/m4/freadseek.m4
@@ -1,5 +1,5 @@
 # freadseek.m4 serial 2
-dnl Copyright (C) 2012-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2012-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/freopen.m4 b/m4/freopen.m4
index 46171560..69e4523c 100644
--- a/m4/freopen.m4
+++ b/m4/freopen.m4
@@ -1,5 +1,5 @@
 # freopen.m4 serial 4
-dnl Copyright (C) 2007-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/frexp.m4 b/m4/frexp.m4
index 39097923..57982621 100644
--- a/m4/frexp.m4
+++ b/m4/frexp.m4
@@ -1,5 +1,5 @@
-# frexp.m4 serial 14
-dnl Copyright (C) 2007-2013 Free Software Foundation, Inc.
+# frexp.m4 serial 15
+dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -93,7 +93,7 @@ AC_DEFUN([gl_FUNC_FREXP_WORKS],
 [
   AC_REQUIRE([AC_PROG_CC])
   AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-  AC_CHECK_FUNCS_ONCE([alarm])
+  AC_CHECK_DECLS_ONCE([alarm])
   AC_CACHE_CHECK([whether frexp works], [gl_cv_func_frexp_works],
     [
       AC_RUN_IFELSE(
@@ -101,7 +101,8 @@ AC_DEFUN([gl_FUNC_FREXP_WORKS],
 #include <float.h>
 #include <math.h>
 #include <string.h>
-#if HAVE_ALARM
+#if HAVE_DECL_ALARM
+# include <signal.h>
 # include <unistd.h>
 #endif
 /* HP cc on HP-UX 10.20 has a bug with the constant expression -0.0.
@@ -124,9 +125,10 @@ int main()
   int i;
   volatile double x;
   double zero = 0.0;
-#if HAVE_ALARM
+#if HAVE_DECL_ALARM
   /* NeXTstep 3.3 frexp() runs into an endless loop when called on an infinite
      number.  Let the test fail in this case.  */
+  signal (SIGALRM, SIG_DFL);
   alarm (5);
 #endif
   /* Test on denormalized numbers.  */
diff --git a/m4/frexpl.m4 b/m4/frexpl.m4
index 3b64c522..e2722910 100644
--- a/m4/frexpl.m4
+++ b/m4/frexpl.m4
@@ -1,5 +1,5 @@
 # frexpl.m4 serial 20
-dnl Copyright (C) 2007-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/fseek.m4 b/m4/fseek.m4
index 74f66564..a5ea41d0 100644
--- a/m4/fseek.m4
+++ b/m4/fseek.m4
@@ -1,5 +1,5 @@
 # fseek.m4 serial 4
-dnl Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/fseeko.m4 b/m4/fseeko.m4
index e0f2dfbe..4ccb57d0 100644
--- a/m4/fseeko.m4
+++ b/m4/fseeko.m4
@@ -1,5 +1,5 @@
-# fseeko.m4 serial 16
-dnl Copyright (C) 2007-2013 Free Software Foundation, Inc.
+# fseeko.m4 serial 17
+dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -37,7 +37,7 @@ AC_DEFUN([gl_FUNC_FSEEKO],
     fi
     m4_ifdef([gl_FUNC_FFLUSH_STDIN], [
       gl_FUNC_FFLUSH_STDIN
-      if test $gl_cv_func_fflush_stdin = no; then
+      if test $gl_cv_func_fflush_stdin != yes; then
         REPLACE_FSEEKO=1
       fi
     ])
diff --git a/m4/fseterr.m4 b/m4/fseterr.m4
index b8e044b5..b676fe0b 100644
--- a/m4/fseterr.m4
+++ b/m4/fseterr.m4
@@ -1,5 +1,5 @@
 # fseterr.m4 serial 1
-dnl Copyright (C) 2012-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2012-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/fstat.m4 b/m4/fstat.m4
index b2cf2ad2..ddd3fb97 100644
--- a/m4/fstat.m4
+++ b/m4/fstat.m4
@@ -1,5 +1,5 @@
 # fstat.m4 serial 4
-dnl Copyright (C) 2011-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/fstatat.m4 b/m4/fstatat.m4
index adbc7e57..548eb7b8 100644
--- a/m4/fstatat.m4
+++ b/m4/fstatat.m4
@@ -1,5 +1,5 @@
 # fstatat.m4 serial 3
-dnl Copyright (C) 2004-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/fstypename.m4 b/m4/fstypename.m4
index c72ecb80..d90e0069 100644
--- a/m4/fstypename.m4
+++ b/m4/fstypename.m4
@@ -6,7 +6,7 @@ dnl See if struct statfs has the f_fstypename member.
 dnl If so, define HAVE_STRUCT_STATFS_F_FSTYPENAME.
 dnl
 
-# Copyright (C) 1998-1999, 2001, 2004, 2006, 2009-2013 Free Software
+# Copyright (C) 1998-1999, 2001, 2004, 2006, 2009-2014 Free Software
 # Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/m4/fsusage.m4 b/m4/fsusage.m4
index 6277bfa5..5203bbc6 100644
--- a/m4/fsusage.m4
+++ b/m4/fsusage.m4
@@ -1,7 +1,7 @@
 # serial 30
 # Obtaining file system usage information.
 
-# Copyright (C) 1997-1998, 2000-2001, 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-1998, 2000-2001, 2003-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/m4/fsync.m4 b/m4/fsync.m4
index 43f51528..888a65de 100644
--- a/m4/fsync.m4
+++ b/m4/fsync.m4
@@ -1,5 +1,5 @@
 # fsync.m4 serial 2
-dnl Copyright (C) 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/ftell.m4 b/m4/ftell.m4
index 5acd7529..b99e76d9 100644
--- a/m4/ftell.m4
+++ b/m4/ftell.m4
@@ -1,5 +1,5 @@
 # ftell.m4 serial 3
-dnl Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/ftello.m4 b/m4/ftello.m4
index 678039ed..14a9beee 100644
--- a/m4/ftello.m4
+++ b/m4/ftello.m4
@@ -1,5 +1,5 @@
 # ftello.m4 serial 11
-dnl Copyright (C) 2007-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/ftruncate.m4 b/m4/ftruncate.m4
index 4f2dafba..29c76ccf 100644
--- a/m4/ftruncate.m4
+++ b/m4/ftruncate.m4
@@ -2,7 +2,7 @@
 
 # See if we need to emulate a missing ftruncate function using chsize.
 
-# Copyright (C) 2000-2001, 2003-2007, 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2001, 2003-2007, 2009-2014 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/m4/fts.m4 b/m4/fts.m4
index 582697b6..80acc2cf 100644
--- a/m4/fts.m4
+++ b/m4/fts.m4
@@ -1,5 +1,5 @@
 #serial 20
-dnl Copyright (C) 2005-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/futimens.m4 b/m4/futimens.m4
index a159207a..39798137 100644
--- a/m4/futimens.m4
+++ b/m4/futimens.m4
@@ -1,7 +1,7 @@
 # serial 6
 # See if we need to provide futimens replacement.
 
-dnl Copyright (C) 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/getaddrinfo.m4 b/m4/getaddrinfo.m4
index 1d631f8c..2e665848 100644
--- a/m4/getaddrinfo.m4
+++ b/m4/getaddrinfo.m4
@@ -1,5 +1,5 @@
 # getaddrinfo.m4 serial 30
-dnl Copyright (C) 2004-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/getcwd-abort-bug.m4 b/m4/getcwd-abort-bug.m4
index 9b3b5636..de69622f 100644
--- a/m4/getcwd-abort-bug.m4
+++ b/m4/getcwd-abort-bug.m4
@@ -3,7 +3,7 @@
 # name is unusually large.  Any length between 4k and 16k trigger the bug
 # when using glibc-2.4.90-9 or older.
 
-# Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -27,6 +27,7 @@ AC_DEFUN([gl_FUNC_GETCWD_ABORT_BUG],
      AC_RUN_IFELSE(
        [AC_LANG_SOURCE(
           [[
+#include <errno.h>
 #include <stdlib.h>
 #if HAVE_UNISTD_H
 # include <unistd.h>
diff --git a/m4/getcwd-path-max.m4 b/m4/getcwd-path-max.m4
index d30e1b32..6b49f1ab 100644
--- a/m4/getcwd-path-max.m4
+++ b/m4/getcwd-path-max.m4
@@ -6,7 +6,7 @@
 # I've heard that this is due to a Linux kernel bug, and that it has
 # been fixed between 2.4.21-pre3 and 2.4.21-pre4.
 
-# Copyright (C) 2003-2007, 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2007, 2009-2014 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -52,6 +52,9 @@ AC_DEFUN([gl_FUNC_GETCWD_PATH_MAX],
 # define is_ENAMETOOLONG(x) 0
 #endif
 
+/* Use the getcwd function, not any macro.  */
+#undef getcwd
+
 /* Don't get link errors because mkdir is redefined to rpl_mkdir.  */
 #undef mkdir
 
diff --git a/m4/getcwd.m4 b/m4/getcwd.m4
index 93b3b86b..fc986cda 100644
--- a/m4/getcwd.m4
+++ b/m4/getcwd.m4
@@ -1,6 +1,6 @@
 # getcwd.m4 - check for working getcwd that is compatible with glibc
 
-# Copyright (C) 2001, 2003-2007, 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003-2007, 2009-2014 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -123,7 +123,7 @@ AC_DEFUN([gl_FUNC_GETCWD],
   dnl Define HAVE_MINIMALLY_WORKING_GETCWD and HAVE_PARTLY_WORKING_GETCWD
   dnl if appropriate.
   case "$gl_cv_func_getcwd_path_max" in
-    "no, it has the AIX bug") ;;
+    "no"|"no, it has the AIX bug") ;;
     *)
       AC_DEFINE([HAVE_MINIMALLY_WORKING_GETCWD], [1],
         [Define to 1 if getcwd minimally works, that is, its result can be
diff --git a/m4/getdelim.m4 b/m4/getdelim.m4
index 36f66a10..c7639941 100644
--- a/m4/getdelim.m4
+++ b/m4/getdelim.m4
@@ -1,6 +1,6 @@
 # getdelim.m4 serial 10
 
-dnl Copyright (C) 2005-2007, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2007, 2009-2014 Free Software Foundation, Inc.
 dnl
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/getdtablesize.m4 b/m4/getdtablesize.m4
index 8f04b3b8..aa523b63 100644
--- a/m4/getdtablesize.m4
+++ b/m4/getdtablesize.m4
@@ -1,5 +1,5 @@
-# getdtablesize.m4 serial 4
-dnl Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# getdtablesize.m4 serial 5
+dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -7,8 +7,35 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_FUNC_GETDTABLESIZE],
 [
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
+  AC_REQUIRE([AC_CANONICAL_HOST])
   AC_CHECK_FUNCS_ONCE([getdtablesize])
-  if test $ac_cv_func_getdtablesize != yes; then
+  if test $ac_cv_func_getdtablesize = yes; then
+    # Cygwin 1.7.25 automatically increases the RLIMIT_NOFILE soft limit
+    # up to an unchangeable hard limit; all other platforms correctly
+    # require setrlimit before getdtablesize() can report a larger value.
+    AC_CACHE_CHECK([whether getdtablesize works],
+      [gl_cv_func_getdtablesize_works],
+      [AC_RUN_IFELSE([
+        AC_LANG_PROGRAM([[#include <unistd.h>]],
+          [int size = getdtablesize();
+           if (dup2 (0, getdtablesize()) != -1)
+             return 1;
+           if (size != getdtablesize())
+             return 2;
+          ])],
+        [gl_cv_func_getdtablesize_works=yes],
+        [gl_cv_func_getdtablesize_works=no],
+        [case "$host_os" in
+          cygwin*) # on cygwin 1.5.25, getdtablesize() automatically grows
+            gl_cv_func_getdtablesize_works="guessing no" ;;
+          *) gl_cv_func_getdtablesize_works="guessing yes" ;;
+         esac])
+      ])
+    case "$gl_cv_func_getdtablesize_works" in
+      *yes) ;;
+      *) REPLACE_GETDTABLESIZE=1 ;;
+    esac
+  else
     HAVE_GETDTABLESIZE=0
   fi
 ])
diff --git a/m4/getgroups.m4 b/m4/getgroups.m4
index 01b9b280..f05357d5 100644
--- a/m4/getgroups.m4
+++ b/m4/getgroups.m4
@@ -3,7 +3,7 @@
 dnl From Jim Meyering.
 dnl A wrapper around AC_FUNC_GETGROUPS.
 
-# Copyright (C) 1996-1997, 1999-2004, 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-1997, 1999-2004, 2008-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/m4/gethostname.m4 b/m4/gethostname.m4
index 7413f9e3..d759ab13 100644
--- a/m4/gethostname.m4
+++ b/m4/gethostname.m4
@@ -1,5 +1,5 @@
 # gethostname.m4 serial 13
-dnl Copyright (C) 2002, 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/gethrxtime.m4 b/m4/gethrxtime.m4
index 25230e77..5ce9a912 100644
--- a/m4/gethrxtime.m4
+++ b/m4/gethrxtime.m4
@@ -1,5 +1,5 @@
 # gethrxtime.m4 serial 12
-dnl Copyright (C) 2005-2006, 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2006, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/getline.m4 b/m4/getline.m4
index 342bc990..0330666b 100644
--- a/m4/getline.m4
+++ b/m4/getline.m4
@@ -1,6 +1,6 @@
 # getline.m4 serial 26
 
-dnl Copyright (C) 1998-2003, 2005-2007, 2009-2013 Free Software Foundation,
+dnl Copyright (C) 1998-2003, 2005-2007, 2009-2014 Free Software Foundation,
 dnl Inc.
 dnl
 dnl This file is free software; the Free Software Foundation
diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4
index 611372aa..d7448048 100644
--- a/m4/getloadavg.m4
+++ b/m4/getloadavg.m4
@@ -1,6 +1,6 @@
 # Check for getloadavg.
 
-# Copyright (C) 1992-1996, 1999-2000, 2002-2003, 2006, 2008-2013 Free Software
+# Copyright (C) 1992-1996, 1999-2000, 2002-2003, 2006, 2008-2014 Free Software
 # Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
diff --git a/m4/getlogin.m4 b/m4/getlogin.m4
index 9b3f3cda..47b8f089 100644
--- a/m4/getlogin.m4
+++ b/m4/getlogin.m4
@@ -1,5 +1,5 @@
 # getlogin.m4 serial 3
-dnl Copyright (C) 2010-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2010-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/getndelim2.m4 b/m4/getndelim2.m4
index 910cfaab..2358ca62 100644
--- a/m4/getndelim2.m4
+++ b/m4/getndelim2.m4
@@ -1,5 +1,5 @@
 # getndelim2.m4 serial 8
-dnl Copyright (C) 2003, 2006, 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2006, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/getopt.m4 b/m4/getopt.m4
index 50f45091..f127028f 100644
--- a/m4/getopt.m4
+++ b/m4/getopt.m4
@@ -1,5 +1,5 @@
 # getopt.m4 serial 44
-dnl Copyright (C) 2002-2006, 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/getpagesize.m4 b/m4/getpagesize.m4
index 06e893d7..ce506952 100644
--- a/m4/getpagesize.m4
+++ b/m4/getpagesize.m4
@@ -1,5 +1,5 @@
 # getpagesize.m4 serial 9
-dnl Copyright (C) 2002, 2004-2005, 2007, 2009-2013 Free Software Foundation,
+dnl Copyright (C) 2002, 2004-2005, 2007, 2009-2014 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/getpass.m4 b/m4/getpass.m4
index e35dea4d..cf545a6d 100644
--- a/m4/getpass.m4
+++ b/m4/getpass.m4
@@ -1,5 +1,5 @@
 # getpass.m4 serial 14
-dnl Copyright (C) 2002-2003, 2005-2006, 2009-2013 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2006, 2009-2014 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/gettext.m4 b/m4/gettext.m4
index 8d1f0665..be247bf7 100644
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -1,5 +1,5 @@
 # gettext.m4 serial 66 (gettext-0.18.2)
-dnl Copyright (C) 1995-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/gettime.m4 b/m4/gettime.m4
index dc100de5..c5ec2643 100644
--- a/m4/gettime.m4
+++ b/m4/gettime.m4
@@ -1,5 +1,5 @@
 # gettime.m4 serial 8
-dnl Copyright (C) 2002, 2004-2006, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2004-2006, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4
index 3c05e59f..1c2d66ee 100644
--- a/m4/gettimeofday.m4
+++ b/m4/gettimeofday.m4
@@ -1,6 +1,6 @@
-# serial 20
+# serial 21
 
-# Copyright (C) 2001-2003, 2005, 2007, 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2003, 2005, 2007, 2009-2014 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -127,10 +127,8 @@ AC_DEFUN([gl_FUNC_GETTIMEOFDAY_CLOBBER],
 ])
 
 AC_DEFUN([gl_GETTIMEOFDAY_REPLACE_LOCALTIME], [
-  AC_DEFINE([gmtime], [rpl_gmtime],
-    [Define to rpl_gmtime if the replacement function should be used.])
-  AC_DEFINE([localtime], [rpl_localtime],
-    [Define to rpl_localtime if the replacement function should be used.])
+  REPLACE_GMTIME=1
+  REPLACE_LOCALTIME=1
 ])
 
 # Prerequisites of lib/gettimeofday.c.
diff --git a/m4/getugroups.m4 b/m4/getugroups.m4
index edd7b91d..8dff39ad 100644
--- a/m4/getugroups.m4
+++ b/m4/getugroups.m4
@@ -1,5 +1,5 @@
 # getugroups.m4 serial 9
-dnl Copyright (C) 2002-2003, 2005-2006, 2009-2013 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2006, 2009-2014 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/getusershell.m4 b/m4/getusershell.m4
index 8aee912b..e5197c8d 100644
--- a/m4/getusershell.m4
+++ b/m4/getusershell.m4
@@ -1,5 +1,5 @@
 # getusershell.m4 serial 7
-dnl Copyright (C) 2002-2003, 2006, 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2003, 2006, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/gl-openssl.m4 b/m4/gl-openssl.m4
new file mode 100644
index 00000000..6d664121
--- /dev/null
+++ b/m4/gl-openssl.m4
@@ -0,0 +1,51 @@
+# gl-openssl.m4 serial 3
+dnl Copyright (C) 2013-2014 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_SET_CRYPTO_CHECK_DEFAULT],
+[
+  m4_define([gl_CRYPTO_CHECK_DEFAULT], [$1])
+])
+gl_SET_CRYPTO_CHECK_DEFAULT([no])
+
+AC_DEFUN([gl_CRYPTO_CHECK],
+[
+  dnl gnulib users set this before gl_INIT with gl_SET_CRYPTO_CHECK_DEFAULT()
+  m4_divert_once([DEFAULTS], [with_openssl_default='gl_CRYPTO_CHECK_DEFAULT'])
+
+  dnl Only clear once, so crypto routines can be checked for individually
+  m4_divert_once([DEFAULTS], [LIB_CRYPTO=])
+
+  AC_ARG_WITH([openssl],
+    [AS_HELP_STRING([--with-openssl],
+      [use libcrypto hash routines. Valid ARGs are:
+       'yes', 'no', 'auto' => use if available,
+       'optional' => use if available and warn if not available;
+       default is ']gl_CRYPTO_CHECK_DEFAULT['])],
+    [],
+    [with_openssl=$with_openssl_default])
+
+  if test "x$1" = xMD5; then
+    ALG_header=md5.h
+  else
+    ALG_header=sha.h
+  fi
+
+  AC_SUBST([LIB_CRYPTO])
+  if test "x$with_openssl" != xno; then
+    AC_CHECK_LIB([crypto], [$1],
+      [AC_CHECK_HEADERS([openssl/$ALG_header],
+         [LIB_CRYPTO=-lcrypto
+          AC_DEFINE([HAVE_OPENSSL_$1], [1],
+            [Define to 1 if libcrypto is used for $1.])])])
+    if test "x$LIB_CRYPTO" = x; then
+      if test "x$with_openssl" = xyes; then
+        AC_MSG_ERROR([openssl development library not found for $1])
+      elif test "x$with_openssl" = xoptional; then
+        AC_MSG_WARN([openssl development library not found for $1])
+      fi
+    fi
+  fi
+])
diff --git a/m4/glibc21.m4 b/m4/glibc21.m4
index 613fb2a4..ab58b712 100644
--- a/m4/glibc21.m4
+++ b/m4/glibc21.m4
@@ -1,5 +1,5 @@
 # glibc21.m4 serial 5
-dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2013 Free Software Foundation,
+dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2014 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/gmp.m4 b/m4/gmp.m4
index 25920903..5a9ce3f9 100644
--- a/m4/gmp.m4
+++ b/m4/gmp.m4
@@ -1,6 +1,6 @@
 # Tests for GNU GMP (or any compatible replacement).
 
-dnl Copyright (C) 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -23,18 +23,26 @@ AC_DEFUN([cu_GMP],
     [cu_use_gmp=auto])
 
   if test $cu_use_gmp != no; then
-    cu_saved_libs=$LIBS
-    AC_SEARCH_LIBS([__gmpz_init], [gmp],
-      [test "$ac_cv_search___gmpz_init" = "none required" ||
-       {
-        LIB_GMP=$ac_cv_search___gmpz_init
-        AC_DEFINE([HAVE_GMP], [1],
-          [Define if you have GNU libgmp (or replacement)])
-        # This only available in GMP >= 5
-        AC_CHECK_DECLS([mpz_inits], [], [], [[#include <gmp.h>]])
-       }],
-      [AC_MSG_WARN([libgmp development library was not found or not usable.])
-       AC_MSG_WARN([AC_PACKAGE_NAME will be built without GMP support.])])
-    LIBS=$cu_saved_libs
+    dnl It was noticed on one MacOS X 10.5.8 system at least
+    dnl that the libs were available but the header wasn't
+    HAVE_GMP=0
+    AC_CHECK_HEADERS_ONCE([gmp.h])
+    if test $ac_cv_header_gmp_h = yes; then
+      cu_saved_libs=$LIBS
+      AC_SEARCH_LIBS([__gmpz_init], [gmp],
+        [test "$ac_cv_search___gmpz_init" = "none required" ||
+           LIB_GMP=$ac_cv_search___gmpz_init
+         AC_DEFINE([HAVE_GMP], [1],
+           [Define if you have GNU libgmp (or replacement)])
+         HAVE_GMP=1
+         # This only available in GMP >= 5
+         AC_CHECK_DECLS([mpz_inits], [], [], [[#include <gmp.h>]])
+        ])
+      LIBS=$cu_saved_libs
+    fi
+    if test $HAVE_GMP != 1; then
+     AC_MSG_WARN([libgmp development library was not found or not usable.])
+     AC_MSG_WARN([AC_PACKAGE_NAME will be built without GMP support.])
+    fi
   fi
 ])
diff --git a/m4/gnu-make.m4 b/m4/gnu-make.m4
index 68d15bc8..6e4b1433 100644
--- a/m4/gnu-make.m4
+++ b/m4/gnu-make.m4
@@ -1,6 +1,6 @@
 # Determine whether recent-enough GNU Make is being used.
 
-# Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4
index 0ae5a9ec..35f61952 100644
--- a/m4/gnulib-common.m4
+++ b/m4/gnulib-common.m4
@@ -1,5 +1,5 @@
-# gnulib-common.m4 serial 33
-dnl Copyright (C) 2007-2013 Free Software Foundation, Inc.
+# gnulib-common.m4 serial 35
+dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -49,6 +49,16 @@ AC_DEFUN([gl_COMMON_BODY], [
    is a misnomer outside of parameter lists.  */
 #define _UNUSED_PARAMETER_ _GL_UNUSED
 
+/* gcc supports the "unused" attribute on possibly unused labels, and
+   g++ has since version 4.5.  Note to support C++ as well as C,
+   _GL_UNUSED_LABEL should be used with a trailing ;  */
+#if !defined __cplusplus || __GNUC__ > 4 \
+    || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
+# define _GL_UNUSED_LABEL _GL_UNUSED
+#else
+# define _GL_UNUSED_LABEL
+#endif
+
 /* The __pure__ attribute was added in gcc 2.96.  */
 #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
 # define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
@@ -375,3 +385,63 @@ AC_DEFUN([gl_CACHE_VAL_SILENT],
   AC_CACHE_VAL([$1], [$2])
   as_echo_n="$saved_as_echo_n"
 ])
+
+# AS_VAR_COPY was added in autoconf 2.63b
+m4_define_default([AS_VAR_COPY],
+[AS_LITERAL_IF([$1[]$2], [$1=$$2], [eval $1=\$$2])])
+
+# AC_PROG_SED was added in autoconf 2.59b
+m4_ifndef([AC_PROG_SED],
+[AC_DEFUN([AC_PROG_SED],
+[AC_CACHE_CHECK([for a sed that does not truncate output], ac_cv_path_SED,
+    [dnl ac_script should not contain more than 99 commands (for HP-UX sed),
+     dnl but more than about 7000 bytes, to catch a limit in Solaris 8 /usr/ucb/sed.
+     ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     AS_UNSET([ac_script])
+     if test -z "$SED"; then
+       ac_path_SED_found=false
+       _AS_PATH_WALK([], [
+         for ac_prog in sed gsed; do
+           for ac_exec_ext in '' $ac_executable_extensions; do
+             ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+             AS_EXECUTABLE_P(["$ac_path_SED"]) || continue
+             case `"$ac_path_SED" --version 2>&1` in
+               *GNU*) ac_cv_path_SED=$ac_path_SED ac_path_SED_found=:;;
+               *)
+                 ac_count=0
+                 _AS_ECHO_N([0123456789]) >conftest.in
+                 while :
+                 do
+                   cat conftest.in conftest.in >conftest.tmp
+                   mv conftest.tmp conftest.in
+                   cp conftest.in conftest.nl
+                   echo >> conftest.nl
+                   "$ac_path_SED" -f conftest.sed <conftest.nl >conftest.out 2>/dev/null || break
+                   diff conftest.out conftest.nl >/dev/null 2>&1 || break
+                   ac_count=`expr $ac_count + 1`
+                   if test $ac_count -gt ${ac_path_SED_max-0}; then
+                     # Best so far, but keep looking for better
+                     ac_cv_path_SED=$ac_path_SED
+                     ac_path_SED_max=$ac_count
+                   fi
+                   test $ac_count -gt 10 && break
+                 done
+                 rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+             esac
+             $ac_path_SED_found && break 3
+           done
+         done])
+       if test -z "$ac_cv_path_SED"; then
+         AC_ERROR([no acceptable sed could be found in \$PATH])
+       fi
+     else
+       ac_cv_path_SED=$SED
+     fi
+ SED="$ac_cv_path_SED"
+ AC_SUBST([SED])dnl
+ rm -f conftest.sed
+])])])
diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4
index ea3cea15..1989f9f6 100644
--- a/m4/gnulib-comp.m4
+++ b/m4/gnulib-comp.m4
@@ -1,5 +1,5 @@
 # DO NOT EDIT! GENERATED AUTOMATICALLY!
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 #
 # 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
@@ -39,6 +39,7 @@ AC_DEFUN([gl_EARLY],
   m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable
   AC_REQUIRE([gl_PROG_AR_RANLIB])
   AC_REQUIRE([AM_PROG_CC_C_O])
+  # Code from module absolute-header:
   # Code from module accept:
   # Code from module accept-tests:
   # Code from module acl:
@@ -159,7 +160,6 @@ AC_DEFUN([gl_EARLY],
   # Code from module faccessat-tests:
   # Code from module fadvise:
   # Code from module fadvise-tests:
-  # Code from module fatal-signal:
   # Code from module fchdir:
   # Code from module fchdir-tests:
   # Code from module fchmodat:
@@ -475,28 +475,9 @@ AC_DEFUN([gl_EARLY],
   # Code from module perror:
   # Code from module perror-tests:
   # Code from module physmem:
-  # Code from module pipe:
   # Code from module pipe-posix:
   # Code from module pipe-posix-tests:
-  # Code from module pipe2:
-  # Code from module pipe2-safer:
-  # Code from module pipe2-tests:
   # Code from module posix-shell:
-  # Code from module posix_spawn-internal:
-  # Code from module posix_spawn_file_actions_addclose:
-  # Code from module posix_spawn_file_actions_addclose-tests:
-  # Code from module posix_spawn_file_actions_adddup2:
-  # Code from module posix_spawn_file_actions_adddup2-tests:
-  # Code from module posix_spawn_file_actions_addopen:
-  # Code from module posix_spawn_file_actions_addopen-tests:
-  # Code from module posix_spawn_file_actions_destroy:
-  # Code from module posix_spawn_file_actions_init:
-  # Code from module posix_spawnattr_destroy:
-  # Code from module posix_spawnattr_init:
-  # Code from module posix_spawnattr_setflags:
-  # Code from module posix_spawnattr_setsigmask:
-  # Code from module posix_spawnp:
-  # Code from module posix_spawnp-tests:
   # Code from module posixtm:
   # Code from module posixtm-tests:
   # Code from module posixver:
@@ -510,7 +491,10 @@ AC_DEFUN([gl_EARLY],
   # Code from module progname:
   # Code from module propername:
   # Code from module pthread:
+  AC_DEFINE([_REENTRANT], 1, [For thread-safety on OSF/1, Solaris.])
+  AC_DEFINE([_THREAD_SAFE], 1, [For thread-safety on AIX, FreeBSD.])
   # Code from module putenv:
+  # Code from module qacl:
   # Code from module quote:
   # Code from module quotearg:
   # Code from module quotearg-simple:
@@ -521,8 +505,6 @@ AC_DEFUN([gl_EARLY],
   # Code from module randperm:
   # Code from module randread:
   # Code from module randread-tests:
-  # Code from module rawmemchr:
-  # Code from module rawmemchr-tests:
   # Code from module read:
   # Code from module read-file:
   # Code from module read-file-tests:
@@ -560,6 +542,7 @@ AC_DEFUN([gl_EARLY],
   # Code from module savewd:
   # Code from module sched:
   # Code from module sched-tests:
+  # Code from module secure_getenv:
   # Code from module select:
   # Code from module select-tests:
   # Code from module selinux-at:
@@ -584,6 +567,7 @@ AC_DEFUN([gl_EARLY],
   # Code from module size_max:
   # Code from module sleep:
   # Code from module sleep-tests:
+  # Code from module smack:
   # Code from module snippet/_Noreturn:
   # Code from module snippet/arg-nonnull:
   # Code from module snippet/c++defs:
@@ -596,10 +580,6 @@ AC_DEFUN([gl_EARLY],
   # Code from module sockets:
   # Code from module sockets-tests:
   # Code from module socklen:
-  # Code from module spawn:
-  # Code from module spawn-pipe:
-  # Code from module spawn-pipe-tests:
-  # Code from module spawn-tests:
   # Code from module ssize_t:
   # Code from module stat:
   # Code from module stat-macros:
@@ -630,8 +610,6 @@ AC_DEFUN([gl_EARLY],
   # Code from module stdlib-tests:
   # Code from module stpcpy:
   # Code from module stpncpy:
-  # Code from module strchrnul:
-  # Code from module strchrnul-tests:
   # Code from module strdup-posix:
   # Code from module streq:
   # Code from module strerror:
@@ -741,8 +719,6 @@ AC_DEFUN([gl_EARLY],
   # Code from module useless-if-before-free:
   # Code from module userspec:
   # Code from module userspec-tests:
-  # Code from module usleep:
-  # Code from module usleep-tests:
   # Code from module utimecmp:
   # Code from module utimens:
   # Code from module utimens-tests:
@@ -766,8 +742,6 @@ AC_DEFUN([gl_EARLY],
   # Code from module vfprintf-posix-tests:
   # Code from module vprintf-posix:
   # Code from module vprintf-posix-tests:
-  # Code from module wait-process:
-  # Code from module waitpid:
   # Code from module warnings:
   # Code from module wchar:
   # Code from module wchar-tests:
@@ -834,7 +808,6 @@ AC_DEFUN([gl_INIT],
   m4_pushdef([gl_LIBSOURCES_DIR], [])
   gl_COMMON
   gl_source_base='lib'
-  gl_FUNC_ACL
   gl_FUNC_ALLOCA
   gl_MODULE_INDICATOR([areadlinkat])
   gl_HEADER_ARPA_INET
@@ -959,7 +932,6 @@ AC_DEFUN([gl_INIT],
   gl_MODULE_INDICATOR([faccessat])
   gl_UNISTD_MODULE_INDICATOR([faccessat])
   AC_CHECK_FUNCS_ONCE([posix_fadvise])
-  gl_FATAL_SIGNAL
   gl_FUNC_FCHDIR
   gl_UNISTD_MODULE_INDICATOR([fchdir])
   gl_FUNC_FCHMODAT
@@ -1048,7 +1020,7 @@ AC_DEFUN([gl_INIT],
   gl_STDIO_MODULE_INDICATOR([fopen])
   gl_MODULE_INDICATOR([fopen-safer])
   gl_FUNC_FPENDING
-  if test $ac_cv_func___fpending = no; then
+  if test $gl_cv_func___fpending = no; then
     AC_LIBOBJ([fpending])
     gl_PREREQ_FPENDING
   fi
@@ -1176,7 +1148,7 @@ AC_DEFUN([gl_INIT],
   fi
   gl_STDIO_MODULE_INDICATOR([getdelim])
   gl_FUNC_GETDTABLESIZE
-  if test $HAVE_GETDTABLESIZE = 0; then
+  if test $HAVE_GETDTABLESIZE = 0 || test $REPLACE_GETDTABLESIZE = 1; then
     AC_LIBOBJ([getdtablesize])
     gl_PREREQ_GETDTABLESIZE
   fi
@@ -1376,6 +1348,7 @@ AC_DEFUN([gl_INIT],
   fi
   gl_LOCALE_MODULE_INDICATOR([localeconv])
   gl_LOCK
+  gl_MODULE_INDICATOR([lock])
   gl_FUNC_LSEEK
   if test $REPLACE_LSEEK = 1; then
     AC_LIBOBJ([lseek])
@@ -1389,6 +1362,7 @@ AC_DEFUN([gl_INIT],
   gl_SYS_STAT_MODULE_INDICATOR([lstat])
   AC_CONFIG_COMMANDS_PRE([m4_ifdef([AH_HEADER],
     [AC_SUBST([CONFIG_INCLUDE], m4_defn([AH_HEADER]))])])
+  AC_REQUIRE([AC_PROG_SED])
   gl_FUNC_MALLOC_GNU
   if test $REPLACE_MALLOC = 1; then
     AC_LIBOBJ([malloc])
@@ -1551,62 +1525,12 @@ AC_DEFUN([gl_INIT],
   gl_PATHMAX
   gl_PERL
   gl_PHYSMEM
-  gl_FUNC_PIPE2
-  gl_UNISTD_MODULE_INDICATOR([pipe2])
-  gl_MODULE_INDICATOR([pipe2-safer])
+  gl_FUNC_PIPE
+  if test $HAVE_PIPE = 0; then
+    AC_LIBOBJ([pipe])
+  fi
+  gl_UNISTD_MODULE_INDICATOR([pipe])
   gl_POSIX_SHELL
-  gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE
-  if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = 1; then
-    AC_LIBOBJ([spawn_faction_addclose])
-  fi
-  gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_addclose])
-  gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2
-  if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = 1; then
-    AC_LIBOBJ([spawn_faction_adddup2])
-  fi
-  gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_adddup2])
-  gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN
-  if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = 1; then
-    AC_LIBOBJ([spawn_faction_addopen])
-  fi
-  gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_addopen])
-  gl_POSIX_SPAWN
-  if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
-    AC_LIBOBJ([spawn_faction_destroy])
-  fi
-  gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_destroy])
-  gl_POSIX_SPAWN
-  if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
-    AC_LIBOBJ([spawn_faction_init])
-  fi
-  gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_init])
-  gl_POSIX_SPAWN
-  if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
-    AC_LIBOBJ([spawnattr_destroy])
-  fi
-  gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_destroy])
-  gl_POSIX_SPAWN
-  if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
-    AC_LIBOBJ([spawnattr_init])
-  fi
-  gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_init])
-  gl_POSIX_SPAWN
-  if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
-    AC_LIBOBJ([spawnattr_setflags])
-  fi
-  gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_setflags])
-  gl_POSIX_SPAWN
-  if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
-    AC_LIBOBJ([spawnattr_setsigmask])
-  fi
-  gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_setsigmask])
-  gl_POSIX_SPAWN
-  if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
-    AC_LIBOBJ([spawnp])
-    AC_LIBOBJ([spawni])
-    gl_PREREQ_POSIX_SPAWN_INTERNAL
-  fi
-  gl_SPAWN_MODULE_INDICATOR([posix_spawnp])
   gl_POSIXTM
   gl_POSIXVER
   gl_FUNC_PRINTF_FREXP
@@ -1619,11 +1543,14 @@ AC_DEFUN([gl_INIT],
     [AM_][XGETTEXT_OPTION([--keyword='proper_name:1,\"This is a proper name. See the gettext manual, section Names.\"'])
      AM_][XGETTEXT_OPTION([--keyword='proper_name_utf8:1,\"This is a proper name. See the gettext manual, section Names.\"'])])
   gl_PTHREAD_CHECK
+  gl_MODULE_INDICATOR([pthread])
   gl_FUNC_PUTENV
   if test $REPLACE_PUTENV = 1; then
     AC_LIBOBJ([putenv])
+    gl_PREREQ_PUTENV
   fi
   gl_STDLIB_MODULE_INDICATOR([putenv])
+  gl_FUNC_ACL
   gl_QUOTE
   gl_QUOTEARG
   gl_FUNC_RAISE
@@ -1632,12 +1559,6 @@ AC_DEFUN([gl_INIT],
     gl_PREREQ_RAISE
   fi
   gl_SIGNAL_MODULE_INDICATOR([raise])
-  gl_FUNC_RAWMEMCHR
-  if test $HAVE_RAWMEMCHR = 0; then
-    AC_LIBOBJ([rawmemchr])
-    gl_PREREQ_RAWMEMCHR
-  fi
-  gl_STRING_MODULE_INDICATOR([rawmemchr])
   gl_FUNC_READ
   if test $REPLACE_READ = 1; then
     AC_LIBOBJ([read])
@@ -1714,6 +1635,12 @@ AC_DEFUN([gl_INIT],
   gl_SAVEDIR
   gl_SAVEWD
   gl_SCHED_H
+  gl_FUNC_SECURE_GETENV
+  if test $HAVE_SECURE_GETENV = 0; then
+    AC_LIBOBJ([secure_getenv])
+    gl_PREREQ_SECURE_GETENV
+  fi
+  gl_STDLIB_MODULE_INDICATOR([secure_getenv])
   gl_FUNC_SELECT
   if test $REPLACE_SELECT = 1; then
     AC_LIBOBJ([select])
@@ -1759,14 +1686,32 @@ AC_DEFUN([gl_INIT],
   fi
   gl_SIGNAL_MODULE_INDICATOR([sigprocmask])
   gl_SIZE_MAX
+  # Check whether libsmack is available
+  LIB_SMACK=
+  AC_ARG_ENABLE([libsmack],
+    AC_HELP_STRING([--disable-libsmack], [disable libsmack support]))
+  if test "X$enable_libsmack" != "Xno"; then
+    AC_CHECK_LIB([smack], [smack_new_label_from_self],
+      [AC_CHECK_LIB([smack], [smack_new_label_from_path],
+        [AC_CHECK_HEADER([sys/smack.h],
+          [LIB_SMACK=-lsmack
+           AC_DEFINE([HAVE_SMACK], [1], [libsmack usability])]
+        )])])
+    if test "X$LIB_SMACK" = "X"; then
+      if test "X$enable_libsmack" = "Xyes"; then
+        AC_MSG_ERROR([libsmack library was not found or not usable])
+      fi
+    fi
+  else
+    AC_MSG_WARN([libsmack support disabled by user])
+  fi
+  AC_SUBST([LIB_SMACK])
   gl_FUNC_SNPRINTF
   gl_STDIO_MODULE_INDICATOR([snprintf])
   gl_MODULE_INDICATOR([snprintf])
   gl_SOCKETLIB
   gl_SOCKETS
   gl_TYPE_SOCKLEN_T
-  gl_SPAWN_H
-  gl_SPAWN_PIPE
   gt_TYPE_SSIZE_T
   gl_FUNC_STAT
   if test $REPLACE_STAT = 1; then
@@ -1797,12 +1742,6 @@ AC_DEFUN([gl_INIT],
     gl_PREREQ_STPNCPY
   fi
   gl_STRING_MODULE_INDICATOR([stpncpy])
-  gl_FUNC_STRCHRNUL
-  if test $HAVE_STRCHRNUL = 0 || test $REPLACE_STRCHRNUL = 1; then
-    AC_LIBOBJ([strchrnul])
-    gl_PREREQ_STRCHRNUL
-  fi
-  gl_STRING_MODULE_INDICATOR([strchrnul])
   gl_FUNC_STRDUP_POSIX
   if test $ac_cv_func_strdup = no || test $REPLACE_STRDUP = 1; then
     AC_LIBOBJ([strdup])
@@ -1868,7 +1807,7 @@ AC_DEFUN([gl_INIT],
   fi
   gl_STDLIB_MODULE_INDICATOR([strtod])
   gl_FUNC_STRTOIMAX
-  if test $HAVE_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; then
+  if test $HAVE_DECL_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; then
     AC_LIBOBJ([strtoimax])
     gl_PREREQ_STRTOIMAX
   fi
@@ -1886,7 +1825,7 @@ AC_DEFUN([gl_INIT],
   fi
   gl_STDLIB_MODULE_INDICATOR([strtoull])
   gl_FUNC_STRTOUMAX
-  if test $ac_cv_func_strtoumax = no; then
+  if test $HAVE_DECL_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1; then
     AC_LIBOBJ([strtoumax])
     gl_PREREQ_STRTOUMAX
   fi
@@ -1989,12 +1928,6 @@ AC_DEFUN([gl_INIT],
   gl_STDIO_MODULE_INDICATOR([vfprintf-posix])
   gl_FUNC_VPRINTF_POSIX
   gl_STDIO_MODULE_INDICATOR([vprintf-posix])
-  gl_WAIT_PROCESS
-  gl_FUNC_WAITPID
-  if test $HAVE_WAITPID = 0; then
-    AC_LIBOBJ([waitpid])
-  fi
-  gl_SYS_WAIT_MODULE_INDICATOR([waitpid])
   gl_WCHAR_H
   gl_FUNC_WCRTOMB
   if test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1; then
@@ -2113,6 +2046,7 @@ changequote([, ])dnl
   gl_FUNC_UNGETC_WORKS
   gl_FUNC_UNGETC_WORKS
   gl_FUNC_UNGETC_WORKS
+  AC_CHECK_FUNCS_ONCE([ttyname])
   dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac.
   AM_GNU_GETTEXT_VERSION([0.18.1])
   AC_C_BIGENDIAN
@@ -2174,20 +2108,8 @@ changequote([, ])dnl
     AC_LIBOBJ([perror])
   fi
   gl_STRING_MODULE_INDICATOR([perror])
-  gl_FUNC_PIPE
-  if test $HAVE_PIPE = 0; then
-    AC_LIBOBJ([pipe])
-  fi
-  gl_UNISTD_MODULE_INDICATOR([pipe])
-  AC_EGREP_CPP([notposix], [[
-  #if defined _MSC_VER || defined __MINGW32__
-    notposix
-  #endif
-    ]],
-    [posix_spawn_ported=no],
-    [posix_spawn_ported=yes])
-  AM_CONDITIONAL([POSIX_SPAWN_PORTED], [test $posix_spawn_ported = yes])
   dnl Check for prerequisites for memory fence checks.
+  dnl FIXME: zerosize-ptr.h requires these: make a module for it
   gl_FUNC_MMAP_ANON
   AC_CHECK_HEADERS_ONCE([sys/mman.h])
   AC_CHECK_FUNCS_ONCE([mprotect])
@@ -2255,11 +2177,6 @@ changequote([, ])dnl
   gl_UNLINKDIR
   abs_aux_dir=`cd "$ac_aux_dir"; pwd`
   AC_SUBST([abs_aux_dir])
-  gl_FUNC_USLEEP
-  if test $HAVE_USLEEP = 0 || test $REPLACE_USLEEP = 1; then
-    AC_LIBOBJ([usleep])
-  fi
-  gl_UNISTD_MODULE_INDICATOR([usleep])
   AC_REQUIRE([gl_LONG_DOUBLE_VS_DOUBLE])
   abs_aux_dir=`cd "$ac_aux_dir"; pwd`
   AC_SUBST([abs_aux_dir])
@@ -2396,6 +2313,7 @@ AC_DEFUN([gl_FILE_LIST], [
   doc/fdl.texi
   doc/gendocs_template
   doc/parse-datetime.texi
+  lib/acl-errno-valid.c
   lib/acl-internal.h
   lib/acl.h
   lib/acl_entries.c
@@ -2424,8 +2342,6 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/base64.h
   lib/basename-lgpl.c
   lib/basename.c
-  lib/binary-io.c
-  lib/binary-io.h
   lib/bitrotate.c
   lib/bitrotate.h
   lib/btowc.c
@@ -2501,8 +2417,6 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/faccessat.c
   lib/fadvise.c
   lib/fadvise.h
-  lib/fatal-signal.c
-  lib/fatal-signal.h
   lib/fchdir.c
   lib/fchmodat.c
   lib/fchown-stub.c
@@ -2614,6 +2528,7 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/getugroups.c
   lib/getugroups.h
   lib/getusershell.c
+  lib/gl_openssl.h
   lib/glthread/lock.c
   lib/glthread/lock.h
   lib/glthread/threadlib.c
@@ -2772,9 +2687,7 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/physmem.c
   lib/physmem.h
   lib/pipe-safer.c
-  lib/pipe.h
-  lib/pipe2-safer.c
-  lib/pipe2.c
+  lib/pipe.c
   lib/posixtm.c
   lib/posixtm.h
   lib/posixver.c
@@ -2796,6 +2709,8 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/pthread.c
   lib/pthread.in.h
   lib/putenv.c
+  lib/qcopy-acl.c
+  lib/qset-acl.c
   lib/quote.h
   lib/quotearg.c
   lib/quotearg.h
@@ -2808,8 +2723,6 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/randperm.h
   lib/randread.c
   lib/randread.h
-  lib/rawmemchr.c
-  lib/rawmemchr.valgrind
   lib/read-file.c
   lib/read-file.h
   lib/read.c
@@ -2857,10 +2770,11 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/se-context.in.h
   lib/se-selinux.c
   lib/se-selinux.in.h
+  lib/secure_getenv.c
   lib/select.c
   lib/selinux-at.c
   lib/selinux-at.h
-  lib/set-mode-acl.c
+  lib/set-acl.c
   lib/setenv.c
   lib/settime.c
   lib/sha1.c
@@ -2881,24 +2795,10 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/signbitl.c
   lib/sigprocmask.c
   lib/size_max.h
+  lib/smack.h
   lib/snprintf.c
   lib/sockets.c
   lib/sockets.h
-  lib/spawn-pipe.c
-  lib/spawn-pipe.h
-  lib/spawn.in.h
-  lib/spawn_faction_addclose.c
-  lib/spawn_faction_adddup2.c
-  lib/spawn_faction_addopen.c
-  lib/spawn_faction_destroy.c
-  lib/spawn_faction_init.c
-  lib/spawn_int.h
-  lib/spawnattr_destroy.c
-  lib/spawnattr_init.c
-  lib/spawnattr_setflags.c
-  lib/spawnattr_setsigmask.c
-  lib/spawni.c
-  lib/spawnp.c
   lib/stat-macros.h
   lib/stat-size.h
   lib/stat-time.c
@@ -2921,8 +2821,6 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/stpncpy.c
   lib/str-kmp.h
   lib/str-two-way.h
-  lib/strchrnul.c
-  lib/strchrnul.valgrind
   lib/strdup.c
   lib/streq.h
   lib/strerror-override.c
@@ -3016,10 +2914,6 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/vfprintf.c
   lib/vprintf.c
   lib/w32sock.h
-  lib/w32spawn.h
-  lib/wait-process.c
-  lib/wait-process.h
-  lib/waitpid.c
   lib/wchar.in.h
   lib/wcrtomb.c
   lib/wcswidth-impl.h
@@ -3074,6 +2968,7 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/yesno.c
   lib/yesno.h
   m4/00gnulib.m4
+  m4/absolute-header.m4
   m4/acl.m4
   m4/alloca.m4
   m4/arpa_inet_h.m4
@@ -3120,7 +3015,6 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/extensions.m4
   m4/extern-inline.m4
   m4/faccessat.m4
-  m4/fatal-signal.m4
   m4/fchdir.m4
   m4/fchmodat.m4
   m4/fchownat.m4
@@ -3184,6 +3078,7 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/gettimeofday.m4
   m4/getugroups.m4
   m4/getusershell.m4
+  m4/gl-openssl.m4
   m4/glibc2.m4
   m4/glibc21.m4
   m4/gnu-make.m4
@@ -3304,10 +3199,8 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/perror.m4
   m4/physmem.m4
   m4/pipe.m4
-  m4/pipe2.m4
   m4/po.m4
   m4/posix-shell.m4
-  m4/posix_spawn.m4
   m4/posixtm.m4
   m4/posixver.m4
   m4/printf-frexp.m4
@@ -3321,7 +3214,6 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/quote.m4
   m4/quotearg.m4
   m4/raise.m4
-  m4/rawmemchr.m4
   m4/read-file.m4
   m4/read.m4
   m4/readdir.m4
@@ -3343,6 +3235,7 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/savedir.m4
   m4/savewd.m4
   m4/sched_h.m4
+  m4/secure_getenv.m4
   m4/select.m4
   m4/selinux-context-h.m4
   m4/selinux-selinux-h.m4
@@ -3354,7 +3247,6 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/sha256.m4
   m4/sha512.m4
   m4/sig2str.m4
-  m4/sig_atomic_t.m4
   m4/sigaction.m4
   m4/signal_h.m4
   m4/signalblocking.m4
@@ -3366,8 +3258,6 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/sockets.m4
   m4/socklen.m4
   m4/sockpfaf.m4
-  m4/spawn-pipe.m4
-  m4/spawn_h.m4
   m4/ssize_t.m4
   m4/st_dm_mode.m4
   m4/stat-size.m4
@@ -3383,7 +3273,6 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/stdlib_h.m4
   m4/stpcpy.m4
   m4/stpncpy.m4
-  m4/strchrnul.m4
   m4/strdup.m4
   m4/strerror.m4
   m4/strerror_r.m4
@@ -3436,7 +3325,6 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/unlocked-io.m4
   m4/uptime.m4
   m4/userspec.m4
-  m4/usleep.m4
   m4/utimbuf.m4
   m4/utimecmp.m4
   m4/utimens.m4
@@ -3449,8 +3337,6 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/vfprintf-posix.m4
   m4/visibility.m4
   m4/vprintf-posix.m4
-  m4/wait-process.m4
-  m4/waitpid.m4
   m4/warn-on-use.m4
   m4/warnings.m4
   m4/wchar_h.m4
@@ -3724,14 +3610,6 @@ AC_DEFUN([gl_FILE_LIST], [
   tests/test-perror.sh
   tests/test-perror2.c
   tests/test-pipe.c
-  tests/test-pipe2.c
-  tests/test-posix_spawn1.c
-  tests/test-posix_spawn1.in.sh
-  tests/test-posix_spawn2.c
-  tests/test-posix_spawn2.in.sh
-  tests/test-posix_spawn_file_actions_addclose.c
-  tests/test-posix_spawn_file_actions_adddup2.c
-  tests/test-posix_spawn_file_actions_addopen.c
   tests/test-posixtm.c
   tests/test-printf-frexp.c
   tests/test-printf-frexpl.c
@@ -3742,7 +3620,6 @@ AC_DEFUN([gl_FILE_LIST], [
   tests/test-quotearg.h
   tests/test-raise.c
   tests/test-rand-isaac.c
-  tests/test-rawmemchr.c
   tests/test-read-file.c
   tests/test-read.c
   tests/test-readlink.c
@@ -3783,10 +3660,6 @@ AC_DEFUN([gl_FILE_LIST], [
   tests/test-sleep.c
   tests/test-snprintf.c
   tests/test-sockets.c
-  tests/test-spawn-pipe-child.c
-  tests/test-spawn-pipe-main.c
-  tests/test-spawn-pipe.sh
-  tests/test-spawn.c
   tests/test-stat-time.c
   tests/test-stat.c
   tests/test-stat.h
@@ -3797,7 +3670,6 @@ AC_DEFUN([gl_FILE_LIST], [
   tests/test-stdint.c
   tests/test-stdio.c
   tests/test-stdlib.c
-  tests/test-strchrnul.c
   tests/test-strerror.c
   tests/test-strerror_r.c
   tests/test-strftime.c
@@ -3839,7 +3711,6 @@ AC_DEFUN([gl_FILE_LIST], [
   tests/test-unsetenv.c
   tests/test-update-copyright.sh
   tests/test-userspec.c
-  tests/test-usleep.c
   tests/test-utimens-common.h
   tests/test-utimens.c
   tests/test-utimens.h
@@ -3893,6 +3764,8 @@ AC_DEFUN([gl_FILE_LIST], [
   tests/zerosize-ptr.h
   tests=lib/accept.c
   tests=lib/at-func.c
+  tests=lib/binary-io.c
+  tests=lib/binary-io.h
   tests=lib/bind.c
   tests=lib/connect.c
   tests=lib/glthread/thread.c
@@ -3904,7 +3777,6 @@ AC_DEFUN([gl_FILE_LIST], [
   tests=lib/localename.c
   tests=lib/localename.h
   tests=lib/perror.c
-  tests=lib/pipe.c
   tests=lib/setlocale.c
   tests=lib/setsockopt.c
   tests=lib/sleep.c
@@ -3913,7 +3785,6 @@ AC_DEFUN([gl_FILE_LIST], [
   tests=lib/symlinkat.c
   tests=lib/unlinkdir.c
   tests=lib/unlinkdir.h
-  tests=lib/usleep.c
   tests=lib/w32sock.h
   tests=lib/wctob.c
   tests=lib/wctomb-impl.h
diff --git a/m4/group-member.m4 b/m4/group-member.m4
index eb8dc62c..11d55d6c 100644
--- a/m4/group-member.m4
+++ b/m4/group-member.m4
@@ -1,6 +1,6 @@
 # serial 14
 
-# Copyright (C) 1999-2001, 2003-2007, 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2001, 2003-2007, 2009-2014 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/m4/hard-locale.m4 b/m4/hard-locale.m4
index 6dac16bb..7aa90e03 100644
--- a/m4/hard-locale.m4
+++ b/m4/hard-locale.m4
@@ -1,5 +1,5 @@
 # hard-locale.m4 serial 8
-dnl Copyright (C) 2002-2006, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/host-os.m4 b/m4/host-os.m4
index 771a0967..86318971 100644
--- a/m4/host-os.m4
+++ b/m4/host-os.m4
@@ -1,6 +1,6 @@
 # serial 9
 
-# Copyright (C) 2001, 2003-2004, 2006, 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003-2004, 2006, 2009-2014 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/m4/hostent.m4 b/m4/hostent.m4
index 72be876b..dd8fc070 100644
--- a/m4/hostent.m4
+++ b/m4/hostent.m4
@@ -1,5 +1,5 @@
 # hostent.m4 serial 2
-dnl Copyright (C) 2008, 2010-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2008, 2010-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/human.m4 b/m4/human.m4
index f1529057..840b0d4f 100644
--- a/m4/human.m4
+++ b/m4/human.m4
@@ -1,5 +1,5 @@
 #serial 11
-dnl Copyright (C) 2002-2006, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/i-ring.m4 b/m4/i-ring.m4
index 9f7b3463..ac468411 100644
--- a/m4/i-ring.m4
+++ b/m4/i-ring.m4
@@ -1,5 +1,5 @@
 # serial 2
-dnl Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/iconv.m4 b/m4/iconv.m4
index a5036465..4b29c5f2 100644
--- a/m4/iconv.m4
+++ b/m4/iconv.m4
@@ -1,5 +1,5 @@
 # iconv.m4 serial 18 (gettext-0.18.2)
-dnl Copyright (C) 2000-2002, 2007-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2000-2002, 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/iconv_h.m4 b/m4/iconv_h.m4
index f0519d9c..e992fa39 100644
--- a/m4/iconv_h.m4
+++ b/m4/iconv_h.m4
@@ -1,5 +1,5 @@
 # iconv_h.m4 serial 8
-dnl Copyright (C) 2007-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/iconv_open.m4 b/m4/iconv_open.m4
index 1dcf4149..e0bfd720 100644
--- a/m4/iconv_open.m4
+++ b/m4/iconv_open.m4
@@ -1,5 +1,5 @@
 # iconv_open.m4 serial 14
-dnl Copyright (C) 2007-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/idcache.m4 b/m4/idcache.m4
index 90e71bce..e168fdee 100644
--- a/m4/idcache.m4
+++ b/m4/idcache.m4
@@ -1,5 +1,5 @@
 # idcache.m4 serial 7
-dnl Copyright (C) 2002-2003, 2005-2006, 2009-2013 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2006, 2009-2014 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/include-exclude-prog.m4 b/m4/include-exclude-prog.m4
index 52a8acd8..cb185db0 100644
--- a/m4/include-exclude-prog.m4
+++ b/m4/include-exclude-prog.m4
@@ -1,5 +1,5 @@
 #serial 2
-dnl Copyright (C) 2007-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/include_next.m4 b/m4/include_next.m4
index 108d9456..69ad3dbb 100644
--- a/m4/include_next.m4
+++ b/m4/include_next.m4
@@ -1,5 +1,5 @@
 # include_next.m4 serial 23
-dnl Copyright (C) 2006-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -192,56 +192,9 @@ dnl until we can assume autoconf 2.64 or newer.
              if test AS_VAR_GET(gl_header_exists) = yes; then
              AS_VAR_POPDEF([gl_header_exists])
             ])
-               AC_LANG_CONFTEST(
-                 [AC_LANG_SOURCE(
-                    [[#include <]]m4_dquote(m4_defn([gl_HEADER_NAME]))[[>]]
-                  )])
-               dnl AIX "xlc -E" and "cc -E" omit #line directives for header
-               dnl files that contain only a #include of other header files and
-               dnl no non-comment tokens of their own. This leads to a failure
-               dnl to detect the absolute name of <dirent.h>, <signal.h>,
-               dnl <poll.h> and others. The workaround is to force preservation
-               dnl of comments through option -C. This ensures all necessary
-               dnl #line directives are present. GCC supports option -C as well.
-               case "$host_os" in
-                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
-                 *)    gl_absname_cpp="$ac_cpp" ;;
-               esac
-changequote(,)
-               case "$host_os" in
-                 mingw*)
-                   dnl For the sake of native Windows compilers (excluding gcc),
-                   dnl treat backslash as a directory separator, like /.
-                   dnl Actually, these compilers use a double-backslash as
-                   dnl directory separator, inside the
-                   dnl   # line "filename"
-                   dnl directives.
-                   gl_dirsep_regex='[/\\]'
-                   ;;
-                 *)
-                   gl_dirsep_regex='\/'
-                   ;;
-               esac
-               dnl A sed expression that turns a string into a basic regular
-               dnl expression, for use within "/.../".
-               gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-changequote([,])
-               gl_header_literal_regex=`echo ']m4_defn([gl_HEADER_NAME])[' \
-                                        | sed -e "$gl_make_literal_regex_sed"`
-               gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-                   s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-changequote(,)dnl
-                   s|^/[^/]|//&|
-changequote([,])dnl
-                   p
-                   q
-                 }'
-               dnl eval is necessary to expand gl_absname_cpp.
-               dnl Ultrix and Pyramid sh refuse to redirect output of eval,
-               dnl so use subshell.
-               AS_VAR_SET(gl_next_header,
-                 ['"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
-                      sed -n "$gl_absolute_header_sed"`'"'])
+           gl_ABSOLUTE_HEADER_ONE(gl_HEADER_NAME)
+           AS_VAR_COPY([gl_header], [gl_cv_absolute_]AS_TR_SH(gl_HEADER_NAME))
+           AS_VAR_SET(gl_next_header, ['"'$gl_header'"'])
           m4_if([$2], [check],
             [else
                AS_VAR_SET(gl_next_header, ['<'gl_HEADER_NAME'>'])
diff --git a/m4/inet_ntop.m4 b/m4/inet_ntop.m4
index 476f063f..5b27759c 100644
--- a/m4/inet_ntop.m4
+++ b/m4/inet_ntop.m4
@@ -1,5 +1,5 @@
 # inet_ntop.m4 serial 19
-dnl Copyright (C) 2005-2006, 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2006, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/inet_pton.m4 b/m4/inet_pton.m4
index e86db827..136ed24d 100644
--- a/m4/inet_pton.m4
+++ b/m4/inet_pton.m4
@@ -1,5 +1,5 @@
 # inet_pton.m4 serial 17
-dnl Copyright (C) 2006, 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/inline.m4 b/m4/inline.m4
index 3a50621e..c49957f8 100644
--- a/m4/inline.m4
+++ b/m4/inline.m4
@@ -1,5 +1,5 @@
 # inline.m4 serial 4
-dnl Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/intlmacosx.m4 b/m4/intlmacosx.m4
index ab97d39f..8a045f6a 100644
--- a/m4/intlmacosx.m4
+++ b/m4/intlmacosx.m4
@@ -1,5 +1,5 @@
 # intlmacosx.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2004-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/intmax_t.m4 b/m4/intmax_t.m4
index 6ea70531..af5561e5 100644
--- a/m4/intmax_t.m4
+++ b/m4/intmax_t.m4
@@ -1,5 +1,5 @@
 # intmax_t.m4 serial 8
-dnl Copyright (C) 1997-2004, 2006-2007, 2009-2013 Free Software Foundation,
+dnl Copyright (C) 1997-2004, 2006-2007, 2009-2014 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/inttostr.m4 b/m4/inttostr.m4
index 1a0ce74d..c48e9deb 100644
--- a/m4/inttostr.m4
+++ b/m4/inttostr.m4
@@ -1,5 +1,5 @@
 #serial 8
-dnl Copyright (C) 2004-2006, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2006, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/inttypes-pri.m4 b/m4/inttypes-pri.m4
index e5a1e057..00251e1d 100644
--- a/m4/inttypes-pri.m4
+++ b/m4/inttypes-pri.m4
@@ -1,5 +1,5 @@
 # inttypes-pri.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1997-2002, 2006, 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 1997-2002, 2006, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/inttypes.m4 b/m4/inttypes.m4
index 3b483d39..2f9317d9 100644
--- a/m4/inttypes.m4
+++ b/m4/inttypes.m4
@@ -1,5 +1,5 @@
 # inttypes.m4 serial 26
-dnl Copyright (C) 2006-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -148,6 +148,7 @@ AC_DEFUN([gl_INTTYPES_H_DEFAULTS],
   HAVE_DECL_STRTOIMAX=1; AC_SUBST([HAVE_DECL_STRTOIMAX])
   HAVE_DECL_STRTOUMAX=1; AC_SUBST([HAVE_DECL_STRTOUMAX])
   REPLACE_STRTOIMAX=0;   AC_SUBST([REPLACE_STRTOIMAX])
+  REPLACE_STRTOUMAX=0;   AC_SUBST([REPLACE_STRTOUMAX])
   INT32_MAX_LT_INTMAX_MAX=1;  AC_SUBST([INT32_MAX_LT_INTMAX_MAX])
   INT64_MAX_EQ_LONG_MAX='defined _LP64';  AC_SUBST([INT64_MAX_EQ_LONG_MAX])
   PRI_MACROS_BROKEN=0;   AC_SUBST([PRI_MACROS_BROKEN])
diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4
index 5f05ac58..87be9cfb 100644
--- a/m4/inttypes_h.m4
+++ b/m4/inttypes_h.m4
@@ -1,5 +1,5 @@
 # inttypes_h.m4 serial 10
-dnl Copyright (C) 1997-2004, 2006, 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 1997-2004, 2006, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/ioctl.m4 b/m4/ioctl.m4
index 1463af42..5a31a396 100644
--- a/m4/ioctl.m4
+++ b/m4/ioctl.m4
@@ -1,5 +1,5 @@
 # ioctl.m4 serial 4
-dnl Copyright (C) 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/isapipe.m4 b/m4/isapipe.m4
index 2c94aef9..97295a37 100644
--- a/m4/isapipe.m4
+++ b/m4/isapipe.m4
@@ -1,6 +1,6 @@
 # Test whether a file descriptor is a pipe.
 
-dnl Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
 
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/isatty.m4 b/m4/isatty.m4
index cac82311..6fcf9317 100644
--- a/m4/isatty.m4
+++ b/m4/isatty.m4
@@ -1,5 +1,5 @@
 # isatty.m4 serial 3
-dnl Copyright (C) 2012-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2012-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/isblank.m4 b/m4/isblank.m4
index 9d98cf34..7aa858c9 100644
--- a/m4/isblank.m4
+++ b/m4/isblank.m4
@@ -1,5 +1,5 @@
 # isblank.m4 serial 3
-dnl Copyright (C) 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/isnand.m4 b/m4/isnand.m4
index ee05e0f9..36e4ea30 100644
--- a/m4/isnand.m4
+++ b/m4/isnand.m4
@@ -1,5 +1,5 @@
 # isnand.m4 serial 11
-dnl Copyright (C) 2007-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/isnanf.m4 b/m4/isnanf.m4
index f01886a6..1f2717d5 100644
--- a/m4/isnanf.m4
+++ b/m4/isnanf.m4
@@ -1,5 +1,5 @@
 # isnanf.m4 serial 14
-dnl Copyright (C) 2007-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/isnanl.m4 b/m4/isnanl.m4
index ed5bbf8b..98b2b69f 100644
--- a/m4/isnanl.m4
+++ b/m4/isnanl.m4
@@ -1,5 +1,5 @@
 # isnanl.m4 serial 17
-dnl Copyright (C) 2007-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/iswblank.m4 b/m4/iswblank.m4
index b7364970..a9ce0a3b 100644
--- a/m4/iswblank.m4
+++ b/m4/iswblank.m4
@@ -1,5 +1,5 @@
 # iswblank.m4 serial 4
-dnl Copyright (C) 2011-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4
index 3f95def8..a96ecabb 100644
--- a/m4/jm-macros.m4
+++ b/m4/jm-macros.m4
@@ -2,7 +2,7 @@
 
 dnl Misc type-related macros for coreutils.
 
-# Copyright (C) 1998-2013 Free Software Foundation, Inc.
+# Copyright (C) 1998-2014 Free Software Foundation, Inc.
 
 # 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
@@ -44,20 +44,24 @@ AC_DEFUN([coreutils_MACROS],
   # used by shred
   AC_CHECK_FUNCS_ONCE([directio])
 
-  # Used by install.c.
   coreutils_saved_libs=$LIBS
     LIBS="$LIBS $LIB_SELINUX"
+    # Used by selinux.c.
+    AC_CHECK_FUNCS([mode_to_security_class], [], [])
+    # Used by install.c.
     AC_CHECK_FUNCS([matchpathcon_init_prefix], [],
     [
-      case "$ac_cv_search_setfilecon:$ac_cv_header_selinux_selinux_h" in
-        no:*) # SELinux disabled
-          ;;
-        *:no) # SELinux disabled
-          ;;
-        *)
-        AC_MSG_WARN([SELinux enabled, but matchpathcon_init_prefix not found])
-        AC_MSG_WARN([The install utility may run slowly])
-      esac
+      if test "$with_selinux" != no; then
+        case "$ac_cv_search_setfilecon:$ac_cv_header_selinux_selinux_h" in
+          no:*) # SELinux disabled
+            ;;
+          *:no) # SELinux disabled
+            ;;
+          *)
+          AC_MSG_WARN([SELinux enabled, but matchpathcon_init_prefix not found])
+          AC_MSG_WARN([The install utility may run slowly])
+        esac
+      fi
     ])
   LIBS=$coreutils_saved_libs
 
diff --git a/m4/jm-winsz1.m4 b/m4/jm-winsz1.m4
index 2d99cab3..84ecf28e 100644
--- a/m4/jm-winsz1.m4
+++ b/m4/jm-winsz1.m4
@@ -1,6 +1,6 @@
 # serial 11
 
-# Copyright (C) 1996, 1999, 2001-2002, 2004, 2006, 2009-2013 Free Software
+# Copyright (C) 1996, 1999, 2001-2002, 2004, 2006, 2009-2014 Free Software
 # Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/m4/jm-winsz2.m4 b/m4/jm-winsz2.m4
index 626ab133..97aafc0e 100644
--- a/m4/jm-winsz2.m4
+++ b/m4/jm-winsz2.m4
@@ -1,6 +1,6 @@
 # serial 7
 
-# Copyright (C) 1996, 1999, 2001, 2004, 2009-2013 Free Software Foundation,
+# Copyright (C) 1996, 1999, 2001, 2004, 2009-2014 Free Software Foundation,
 # Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/m4/langinfo_h.m4 b/m4/langinfo_h.m4
index 73bef8bc..e8d78f9d 100644
--- a/m4/langinfo_h.m4
+++ b/m4/langinfo_h.m4
@@ -1,5 +1,5 @@
 # langinfo_h.m4 serial 7
-dnl Copyright (C) 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/largefile.m4 b/m4/largefile.m4
index 1e605e3d..a1b564ad 100644
--- a/m4/largefile.m4
+++ b/m4/largefile.m4
@@ -1,6 +1,6 @@
 # Enable large files on systems where this is not the default.
 
-# Copyright 1992-1996, 1998-2013 Free Software Foundation, Inc.
+# Copyright 1992-1996, 1998-2014 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/m4/lchmod.m4 b/m4/lchmod.m4
index d2603708..f227e787 100644
--- a/m4/lchmod.m4
+++ b/m4/lchmod.m4
@@ -1,6 +1,6 @@
 #serial 3
 
-dnl Copyright (C) 2005-2006, 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2006, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/lchown.m4 b/m4/lchown.m4
index 9401d9f4..743ed5b0 100644
--- a/m4/lchown.m4
+++ b/m4/lchown.m4
@@ -1,7 +1,7 @@
 # serial 17
 # Determine whether we need the lchown wrapper.
 
-dnl Copyright (C) 1998, 2001, 2003-2007, 2009-2013 Free Software Foundation,
+dnl Copyright (C) 1998, 2001, 2003-2007, 2009-2014 Free Software Foundation,
 dnl Inc.
 
 dnl This file is free software; the Free Software Foundation
diff --git a/m4/lcmessage.m4 b/m4/lcmessage.m4
index d62a175f..7470ec59 100644
--- a/m4/lcmessage.m4
+++ b/m4/lcmessage.m4
@@ -1,5 +1,5 @@
 # lcmessage.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1995-2002, 2004-2005, 2008-2013 Free Software Foundation,
+dnl Copyright (C) 1995-2002, 2004-2005, 2008-2014 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/ldexp.m4 b/m4/ldexp.m4
index 7a75b1be..9c4f0663 100644
--- a/m4/ldexp.m4
+++ b/m4/ldexp.m4
@@ -1,5 +1,5 @@
 # ldexp.m4 serial 1
-dnl Copyright (C) 2010-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2010-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/ldexpl.m4 b/m4/ldexpl.m4
index 12237114..6959f426 100644
--- a/m4/ldexpl.m4
+++ b/m4/ldexpl.m4
@@ -1,5 +1,5 @@
 # ldexpl.m4 serial 16
-dnl Copyright (C) 2007-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/lib-ignore.m4 b/m4/lib-ignore.m4
index 0a642da6..7baa5283 100644
--- a/m4/lib-ignore.m4
+++ b/m4/lib-ignore.m4
@@ -1,6 +1,6 @@
 # If possible, ignore libraries that are not depended on.
 
-dnl Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4
index c145e478..ddc569f7 100644
--- a/m4/lib-ld.m4
+++ b/m4/lib-ld.m4
@@ -1,5 +1,5 @@
 # lib-ld.m4 serial 6
-dnl Copyright (C) 1996-2003, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2003, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/lib-link.m4 b/m4/lib-link.m4
index 073f0405..3522d994 100644
--- a/m4/lib-link.m4
+++ b/m4/lib-link.m4
@@ -1,5 +1,5 @@
 # lib-link.m4 serial 26 (gettext-0.18.2)
-dnl Copyright (C) 2001-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4
index 60908e8f..31f49e40 100644
--- a/m4/lib-prefix.m4
+++ b/m4/lib-prefix.m4
@@ -1,5 +1,5 @@
 # lib-prefix.m4 serial 7 (gettext-0.18)
-dnl Copyright (C) 2001-2005, 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2005, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/libunistring-base.m4 b/m4/libunistring-base.m4
index d105c721..d0032671 100644
--- a/m4/libunistring-base.m4
+++ b/m4/libunistring-base.m4
@@ -1,5 +1,5 @@
 # libunistring-base.m4 serial 5
-dnl Copyright (C) 2010-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2010-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/link-follow.m4 b/m4/link-follow.m4
index 35c4fced..8b15585e 100644
--- a/m4/link-follow.m4
+++ b/m4/link-follow.m4
@@ -2,7 +2,7 @@
 dnl Run a program to determine whether link(2) follows symlinks.
 dnl Set LINK_FOLLOWS_SYMLINKS accordingly.
 
-# Copyright (C) 1999-2001, 2004-2006, 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2001, 2004-2006, 2009-2014 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/m4/link.m4 b/m4/link.m4
index 7cc0ceb9..e923d0d0 100644
--- a/m4/link.m4
+++ b/m4/link.m4
@@ -1,5 +1,5 @@
 # link.m4 serial 8
-dnl Copyright (C) 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/linkat.m4 b/m4/linkat.m4
index b561ddad..2da0e30c 100644
--- a/m4/linkat.m4
+++ b/m4/linkat.m4
@@ -1,7 +1,7 @@
 # serial 6
 # See if we need to provide linkat replacement.
 
-dnl Copyright (C) 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/localcharset.m4 b/m4/localcharset.m4
index 2e93e581..ada2f01f 100644
--- a/m4/localcharset.m4
+++ b/m4/localcharset.m4
@@ -1,5 +1,5 @@
 # localcharset.m4 serial 7
-dnl Copyright (C) 2002, 2004, 2006, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2004, 2006, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/locale-fr.m4 b/m4/locale-fr.m4
index ef199e39..27db5ab8 100644
--- a/m4/locale-fr.m4
+++ b/m4/locale-fr.m4
@@ -1,5 +1,5 @@
 # locale-fr.m4 serial 17
-dnl Copyright (C) 2003, 2005-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/locale-ja.m4 b/m4/locale-ja.m4
index 132a3e77..c88fe8b4 100644
--- a/m4/locale-ja.m4
+++ b/m4/locale-ja.m4
@@ -1,5 +1,5 @@
 # locale-ja.m4 serial 12
-dnl Copyright (C) 2003, 2005-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/locale-tr.m4 b/m4/locale-tr.m4
index aeb56156..535b2566 100644
--- a/m4/locale-tr.m4
+++ b/m4/locale-tr.m4
@@ -1,5 +1,5 @@
 # locale-tr.m4 serial 10
-dnl Copyright (C) 2003, 2005-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/locale-zh.m4 b/m4/locale-zh.m4
index 4eed73f4..d3b23474 100644
--- a/m4/locale-zh.m4
+++ b/m4/locale-zh.m4
@@ -1,5 +1,5 @@
 # locale-zh.m4 serial 12
-dnl Copyright (C) 2003, 2005-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/locale_h.m4 b/m4/locale_h.m4
index 8bd12e80..28385884 100644
--- a/m4/locale_h.m4
+++ b/m4/locale_h.m4
@@ -1,5 +1,5 @@
 # locale_h.m4 serial 19
-dnl Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/localeconv.m4 b/m4/localeconv.m4
index b8bb5964..1fd29195 100644
--- a/m4/localeconv.m4
+++ b/m4/localeconv.m4
@@ -1,5 +1,5 @@
 # localeconv.m4 serial 1
-dnl Copyright (C) 2012-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2012-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/localename.m4 b/m4/localename.m4
index 361ed73e..d865c66d 100644
--- a/m4/localename.m4
+++ b/m4/localename.m4
@@ -1,5 +1,5 @@
 # localename.m4 serial 2
-dnl Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/lock.m4 b/m4/lock.m4
index d3fc1eff..73a3c54c 100644
--- a/m4/lock.m4
+++ b/m4/lock.m4
@@ -1,5 +1,5 @@
 # lock.m4 serial 13 (gettext-0.18.2)
-dnl Copyright (C) 2005-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -24,6 +24,9 @@ AC_DEFUN([gl_LOCK],
         [[
 #if __FreeBSD__ == 4
 error "No, in FreeBSD 4.0 recursive mutexes actually don't work."
+#elif (defined __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ \
+       && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070)
+error "No, in Mac OS X < 10.7 recursive mutexes actually don't work."
 #else
 int x = (int)PTHREAD_MUTEX_RECURSIVE;
 return !x;
diff --git a/m4/longlong.m4 b/m4/longlong.m4
index 3af6ab5a..eefb37c4 100644
--- a/m4/longlong.m4
+++ b/m4/longlong.m4
@@ -1,5 +1,5 @@
 # longlong.m4 serial 17
-dnl Copyright (C) 1999-2007, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 1999-2007, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/ls-mntd-fs.m4 b/m4/ls-mntd-fs.m4
index fb116c8b..563ed71c 100644
--- a/m4/ls-mntd-fs.m4
+++ b/m4/ls-mntd-fs.m4
@@ -1,7 +1,7 @@
 # serial 30
 # How to list mounted file systems.
 
-# Copyright (C) 1998-2004, 2006, 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 1998-2004, 2006, 2009-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -151,6 +151,7 @@ if test $ac_cv_func_getmntent = yes; then
         [Define if there is a function named getmntent for reading the list
          of mounted file systems, and that function takes a single argument.
          (4.3BSD, SunOS, HP-UX, Dynix, Irix)])
+      AC_CHECK_FUNCS([hasmntopt])
     fi
   fi
 
diff --git a/m4/lseek.m4 b/m4/lseek.m4
index df9302af..0904d02d 100644
--- a/m4/lseek.m4
+++ b/m4/lseek.m4
@@ -1,5 +1,5 @@
 # lseek.m4 serial 10
-dnl Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/lstat.m4 b/m4/lstat.m4
index 5f4db64a..c5e72b81 100644
--- a/m4/lstat.m4
+++ b/m4/lstat.m4
@@ -1,6 +1,6 @@
 # serial 26
 
-# Copyright (C) 1997-2001, 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2001, 2003-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/m4/malloc.m4 b/m4/malloc.m4
index 4b24a0b1..322ad6ef 100644
--- a/m4/malloc.m4
+++ b/m4/malloc.m4
@@ -1,5 +1,5 @@
 # malloc.m4 serial 14
-dnl Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/malloca.m4 b/m4/malloca.m4
index 791ce10d..dcc1a084 100644
--- a/m4/malloca.m4
+++ b/m4/malloca.m4
@@ -1,5 +1,5 @@
 # malloca.m4 serial 1
-dnl Copyright (C) 2003-2004, 2006-2007, 2009-2013 Free Software Foundation,
+dnl Copyright (C) 2003-2004, 2006-2007, 2009-2014 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/manywarnings.m4 b/m4/manywarnings.m4
index 45a30afd..e1cee6cf 100644
--- a/m4/manywarnings.m4
+++ b/m4/manywarnings.m4
@@ -1,5 +1,5 @@
-# manywarnings.m4 serial 5
-dnl Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# manywarnings.m4 serial 6
+dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -98,6 +98,7 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC],
     -W \
     -Wabi \
     -Waddress \
+    -Waggressive-loop-optimizations \
     -Wall \
     -Warray-bounds \
     -Wattributes \
@@ -125,7 +126,6 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC],
     -Wformat-security \
     -Wformat-y2k \
     -Wformat-zero-length \
-    -Wformat=2 \
     -Wfree-nonheap-object \
     -Wignored-qualifiers \
     -Wimplicit \
@@ -143,12 +143,9 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC],
     -Wmissing-braces \
     -Wmissing-declarations \
     -Wmissing-field-initializers \
-    -Wmissing-format-attribute \
     -Wmissing-include-dirs \
-    -Wmissing-noreturn \
     -Wmissing-parameter-type \
     -Wmissing-prototypes \
-    -Wmudflap \
     -Wmultichar \
     -Wnarrowing \
     -Wnested-externs \
@@ -166,6 +163,7 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC],
     -Wpointer-sign \
     -Wpointer-to-int-cast \
     -Wpragmas \
+    -Wreturn-local-addr \
     -Wreturn-type \
     -Wsequence-point \
     -Wshadow \
@@ -187,7 +185,6 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC],
     -Wtype-limits \
     -Wuninitialized \
     -Wunknown-pragmas \
-    -Wunreachable-code \
     -Wunsafe-loop-optimizations \
     -Wunused \
     -Wunused-but-set-parameter \
@@ -206,6 +203,8 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC],
     -Wvla \
     -Wvolatile-register-var \
     -Wwrite-strings \
+    -fdiagnostics-show-option \
+    -funit-at-a-time \
     \
     ; do
     gl_manywarn_set="$gl_manywarn_set $gl_manywarn_item"
diff --git a/m4/math_h.m4 b/m4/math_h.m4
index bf0845fd..9e2adfba 100644
--- a/m4/math_h.m4
+++ b/m4/math_h.m4
@@ -1,5 +1,5 @@
 # math_h.m4 serial 114
-dnl Copyright (C) 2007-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/mbchar.m4 b/m4/mbchar.m4
index b18ecef1..e250ca83 100644
--- a/m4/mbchar.m4
+++ b/m4/mbchar.m4
@@ -1,5 +1,5 @@
 # mbchar.m4 serial 9
-dnl Copyright (C) 2005-2007, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2007, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/mbiter.m4 b/m4/mbiter.m4
index 9b5fceda..648bf45c 100644
--- a/m4/mbiter.m4
+++ b/m4/mbiter.m4
@@ -1,5 +1,5 @@
 # mbiter.m4 serial 7
-dnl Copyright (C) 2005, 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/mbrlen.m4 b/m4/mbrlen.m4
index 5e7a8b03..10df9b36 100644
--- a/m4/mbrlen.m4
+++ b/m4/mbrlen.m4
@@ -1,5 +1,5 @@
-# mbrlen.m4 serial 8
-dnl Copyright (C) 2008, 2010-2013 Free Software Foundation, Inc.
+# mbrlen.m4 serial 9
+dnl Copyright (C) 2008, 2010-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -227,6 +227,40 @@ int main ()
     ])
 ])
 
+dnl Test whether mbrlen returns the correct value on empty input.
+
+AC_DEFUN([gl_MBRLEN_EMPTY_INPUT],
+[
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  AC_CACHE_CHECK([whether mbrlen works on empty input],
+    [gl_cv_func_mbrlen_empty_input],
+    [
+      dnl Initial guess, used when cross-compiling or when no suitable locale
+      dnl is present.
+changequote(,)dnl
+      case "$host_os" in
+                     # Guess no on AIX and glibc systems.
+        aix* | *-gnu*)
+                    gl_cv_func_mbrlen_empty_input="guessing no" ;;
+        *)          gl_cv_func_mbrlen_empty_input="guessing yes" ;;
+      esac
+changequote([,])dnl
+      AC_RUN_IFELSE(
+        [AC_LANG_SOURCE([[
+           #include <wchar.h>
+           static mbstate_t mbs;
+           int
+           main (void)
+           {
+             return mbrlen ("", 0, &mbs) == (size_t) -2;
+           }]])],
+        [gl_cv_func_mbrlen_empty_input=no],
+        [gl_cv_func_mbrlen_empty_input=yes],
+        [:])
+    ])
+])
+
 # Prerequisites of lib/mbrlen.c.
 AC_DEFUN([gl_PREREQ_MBRLEN], [
   :
diff --git a/m4/mbrtowc.m4 b/m4/mbrtowc.m4
index 4c9f3886..45696f54 100644
--- a/m4/mbrtowc.m4
+++ b/m4/mbrtowc.m4
@@ -1,5 +1,5 @@
-# mbrtowc.m4 serial 25
-dnl Copyright (C) 2001-2002, 2004-2005, 2008-2013 Free Software Foundation,
+# mbrtowc.m4 serial 26
+dnl Copyright (C) 2001-2002, 2004-2005, 2008-2014 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -39,6 +39,7 @@ AC_DEFUN([gl_FUNC_MBRTOWC],
       gl_MBRTOWC_NULL_ARG2
       gl_MBRTOWC_RETVAL
       gl_MBRTOWC_NUL_RETVAL
+      gl_MBRTOWC_EMPTY_INPUT
       case "$gl_cv_func_mbrtowc_null_arg1" in
         *yes) ;;
         *) AC_DEFINE([MBRTOWC_NULL_ARG1_BUG], [1],
@@ -67,6 +68,14 @@ AC_DEFUN([gl_FUNC_MBRTOWC],
            REPLACE_MBRTOWC=1
            ;;
       esac
+      case "$gl_cv_func_mbrtowc_empty_input" in
+        *yes) ;;
+        *) AC_DEFINE([MBRTOWC_EMPTY_INPUT_BUG], [1],
+             [Define if the mbrtowc function does not return (size_t) -2
+              for empty input.])
+           REPLACE_MBRTOWC=1
+           ;;
+      esac
     fi
   fi
 ])
@@ -533,6 +542,41 @@ int main ()
     ])
 ])
 
+dnl Test whether mbrtowc returns the correct value on empty input.
+
+AC_DEFUN([gl_MBRTOWC_EMPTY_INPUT],
+[
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  AC_CACHE_CHECK([whether mbrtowc works on empty input],
+    [gl_cv_func_mbrtowc_empty_input],
+    [
+      dnl Initial guess, used when cross-compiling or when no suitable locale
+      dnl is present.
+changequote(,)dnl
+      case "$host_os" in
+                     # Guess no on AIX and glibc systems.
+        aix* | *-gnu*)
+                    gl_cv_func_mbrtowc_empty_input="guessing no" ;;
+        *)          gl_cv_func_mbrtowc_empty_input="guessing yes" ;;
+      esac
+changequote([,])dnl
+      AC_RUN_IFELSE(
+        [AC_LANG_SOURCE([[
+           #include <wchar.h>
+           static wchar_t wc;
+           static mbstate_t mbs;
+           int
+           main (void)
+           {
+             return mbrtowc (&wc, "", 0, &mbs) == (size_t) -2;
+           }]])],
+        [gl_cv_func_mbrtowc_empty_input=no],
+        [gl_cv_func_mbrtowc_empty_input=yes],
+        [:])
+    ])
+])
+
 # Prerequisites of lib/mbrtowc.c.
 AC_DEFUN([gl_PREREQ_MBRTOWC], [
   :
diff --git a/m4/mbsinit.m4 b/m4/mbsinit.m4
index 2e6d0921..e1598a1d 100644
--- a/m4/mbsinit.m4
+++ b/m4/mbsinit.m4
@@ -1,5 +1,5 @@
 # mbsinit.m4 serial 8
-dnl Copyright (C) 2008, 2010-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2008, 2010-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/mbslen.m4 b/m4/mbslen.m4
index b51b39f2..1dc1940d 100644
--- a/m4/mbslen.m4
+++ b/m4/mbslen.m4
@@ -1,5 +1,5 @@
 # mbslen.m4 serial 2
-dnl Copyright (C) 2010-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2010-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/mbsrtowcs.m4 b/m4/mbsrtowcs.m4
index c4934c28..6967f356 100644
--- a/m4/mbsrtowcs.m4
+++ b/m4/mbsrtowcs.m4
@@ -1,5 +1,5 @@
 # mbsrtowcs.m4 serial 13
-dnl Copyright (C) 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/mbstate_t.m4 b/m4/mbstate_t.m4
index ed001179..068155a5 100644
--- a/m4/mbstate_t.m4
+++ b/m4/mbstate_t.m4
@@ -1,5 +1,5 @@
 # mbstate_t.m4 serial 13
-dnl Copyright (C) 2000-2002, 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2000-2002, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/mbswidth.m4 b/m4/mbswidth.m4
index 39760fcd..eaa2ff32 100644
--- a/m4/mbswidth.m4
+++ b/m4/mbswidth.m4
@@ -1,5 +1,5 @@
 # mbswidth.m4 serial 18
-dnl Copyright (C) 2000-2002, 2004, 2006-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2000-2002, 2004, 2006-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/mbtowc.m4 b/m4/mbtowc.m4
index e4794619..cacfe161 100644
--- a/m4/mbtowc.m4
+++ b/m4/mbtowc.m4
@@ -1,5 +1,5 @@
 # mbtowc.m4 serial 2
-dnl Copyright (C) 2011-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/md5.m4 b/m4/md5.m4
index 0ad6f504..f0249d9e 100644
--- a/m4/md5.m4
+++ b/m4/md5.m4
@@ -1,5 +1,5 @@
-# md5.m4 serial 13
-dnl Copyright (C) 2002-2006, 2008-2013 Free Software Foundation, Inc.
+# md5.m4 serial 14
+dnl Copyright (C) 2002-2006, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -8,5 +8,7 @@ AC_DEFUN([gl_MD5],
 [
   dnl Prerequisites of lib/md5.c.
   AC_REQUIRE([gl_BIGENDIAN])
-  :
+
+  dnl Determine HAVE_OPENSSL_MD5 and LIB_CRYPTO
+  gl_CRYPTO_CHECK([MD5])
 ])
diff --git a/m4/memcasecmp.m4 b/m4/memcasecmp.m4
index d1118ea7..d907c1aa 100644
--- a/m4/memcasecmp.m4
+++ b/m4/memcasecmp.m4
@@ -1,5 +1,5 @@
 #serial 6
-dnl Copyright (C) 2005-2006, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/memchr.m4 b/m4/memchr.m4
index 2d8abe75..b9f126cf 100644
--- a/m4/memchr.m4
+++ b/m4/memchr.m4
@@ -1,5 +1,5 @@
 # memchr.m4 serial 12
-dnl Copyright (C) 2002-2004, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2004, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/memcoll.m4 b/m4/memcoll.m4
index ae6ce464..db54a568 100644
--- a/m4/memcoll.m4
+++ b/m4/memcoll.m4
@@ -1,5 +1,5 @@
 # memcoll.m4 serial 10
-dnl Copyright (C) 2002-2003, 2005-2006, 2009-2013 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2006, 2009-2014 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/mempcpy.m4 b/m4/mempcpy.m4
index a48f2d10..b6d0b141 100644
--- a/m4/mempcpy.m4
+++ b/m4/mempcpy.m4
@@ -1,5 +1,5 @@
 # mempcpy.m4 serial 11
-dnl Copyright (C) 2003-2004, 2006-2007, 2009-2013 Free Software Foundation,
+dnl Copyright (C) 2003-2004, 2006-2007, 2009-2014 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/memrchr.m4 b/m4/memrchr.m4
index 5920f574..5dbe4d1e 100644
--- a/m4/memrchr.m4
+++ b/m4/memrchr.m4
@@ -1,5 +1,5 @@
 # memrchr.m4 serial 10
-dnl Copyright (C) 2002-2003, 2005-2007, 2009-2013 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2007, 2009-2014 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/mgetgroups.m4 b/m4/mgetgroups.m4
index f6e4c402..a9672c07 100644
--- a/m4/mgetgroups.m4
+++ b/m4/mgetgroups.m4
@@ -1,5 +1,5 @@
 #serial 5
-dnl Copyright (C) 2007-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/mkancesdirs.m4 b/m4/mkancesdirs.m4
index cfcc3d9d..f815358e 100644
--- a/m4/mkancesdirs.m4
+++ b/m4/mkancesdirs.m4
@@ -1,5 +1,5 @@
 # Make a file's ancestor directories.
-dnl Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/mkdir-p.m4 b/m4/mkdir-p.m4
index 80f5fcee..0bc5001f 100644
--- a/m4/mkdir-p.m4
+++ b/m4/mkdir-p.m4
@@ -1,5 +1,5 @@
 # mkdir-p.m4 serial 15
-dnl Copyright (C) 2002-2006, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/mkdir.m4 b/m4/mkdir.m4
index bcbce18d..51e78c13 100644
--- a/m4/mkdir.m4
+++ b/m4/mkdir.m4
@@ -1,6 +1,6 @@
 # serial 11
 
-# Copyright (C) 2001, 2003-2004, 2006, 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003-2004, 2006, 2008-2014 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/m4/mkfifo.m4 b/m4/mkfifo.m4
index e571c64e..4328d8f6 100644
--- a/m4/mkfifo.m4
+++ b/m4/mkfifo.m4
@@ -1,7 +1,7 @@
 # serial 4
 # See if we need to provide mkfifo replacement.
 
-dnl Copyright (C) 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/mknod.m4 b/m4/mknod.m4
index 478ee559..8475bc38 100644
--- a/m4/mknod.m4
+++ b/m4/mknod.m4
@@ -1,7 +1,7 @@
 # serial 5
 # See if we need to provide mknod replacement.
 
-dnl Copyright (C) 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/mkstemp.m4 b/m4/mkstemp.m4
index ac6c7cdd..9033a4e6 100644
--- a/m4/mkstemp.m4
+++ b/m4/mkstemp.m4
@@ -1,6 +1,6 @@
 #serial 23
 
-# Copyright (C) 2001, 2003-2007, 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003-2007, 2009-2014 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/m4/mktime.m4 b/m4/mktime.m4
index d3d376a4..e8d340ac 100644
--- a/m4/mktime.m4
+++ b/m4/mktime.m4
@@ -1,5 +1,5 @@
-# serial 24
-dnl Copyright (C) 2002-2003, 2005-2007, 2009-2013 Free Software Foundation,
+# serial 25
+dnl Copyright (C) 2002-2003, 2005-2007, 2009-2014 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,7 @@ AC_DEFUN([gl_FUNC_MKTIME],
   dnl We don't use AC_FUNC_MKTIME any more, because it is no longer maintained
   dnl in Autoconf and because it invokes AC_LIBOBJ.
   AC_CHECK_HEADERS_ONCE([unistd.h])
-  AC_CHECK_FUNCS_ONCE([alarm])
+  AC_CHECK_DECLS_ONCE([alarm])
   AC_REQUIRE([gl_MULTIARCH])
   if test $APPLE_UNIVERSAL_BUILD = 1; then
     # A universal build on Apple Mac OS X platforms.
@@ -34,8 +34,8 @@ AC_DEFUN([gl_FUNC_MKTIME],
 # include <unistd.h>
 #endif
 
-#ifndef HAVE_ALARM
-# define alarm(X) /* empty */
+#if HAVE_DECL_ALARM
+# include <signal.h>
 #endif
 
 /* Work around redefinition to rpl_putenv by other config tests.  */
@@ -171,10 +171,13 @@ main ()
   int time_t_signed_magnitude = (time_t) ~ (time_t) 0 < (time_t) -1;
   int time_t_signed = ! ((time_t) 0 < (time_t) -1);
 
+#if HAVE_DECL_ALARM
   /* This test makes some buggy mktime implementations loop.
      Give up after 60 seconds; a mktime slower than that
      isn't worth using anyway.  */
+  signal (SIGALRM, SIG_DFL);
   alarm (60);
+#endif
 
   time_t_max = (! time_t_signed
                 ? (time_t) -1
diff --git a/m4/mmap-anon.m4 b/m4/mmap-anon.m4
index 9b60ddfa..94ae2e2f 100644
--- a/m4/mmap-anon.m4
+++ b/m4/mmap-anon.m4
@@ -1,5 +1,5 @@
 # mmap-anon.m4 serial 10
-dnl Copyright (C) 2005, 2007, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2007, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/mode_t.m4 b/m4/mode_t.m4
index d5b66d45..db6e192b 100644
--- a/m4/mode_t.m4
+++ b/m4/mode_t.m4
@@ -1,5 +1,5 @@
 # mode_t.m4 serial 2
-dnl Copyright (C) 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/modechange.m4 b/m4/modechange.m4
index 949afb3d..b89101e8 100644
--- a/m4/modechange.m4
+++ b/m4/modechange.m4
@@ -1,5 +1,5 @@
 # modechange.m4 serial 7
-dnl Copyright (C) 2002-2003, 2005-2006, 2009-2013 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2006, 2009-2014 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/mountlist.m4 b/m4/mountlist.m4
index cd137c91..f5c60bcc 100644
--- a/m4/mountlist.m4
+++ b/m4/mountlist.m4
@@ -1,5 +1,5 @@
 # serial 11
-dnl Copyright (C) 2002-2006, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/mpsort.m4 b/m4/mpsort.m4
index 554c2e2a..cc37be15 100644
--- a/m4/mpsort.m4
+++ b/m4/mpsort.m4
@@ -1,6 +1,6 @@
 # Sort a vector of pointers to data.
 
-# Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/m4/msvc-inval.m4 b/m4/msvc-inval.m4
index 9a6a47a7..7f26087e 100644
--- a/m4/msvc-inval.m4
+++ b/m4/msvc-inval.m4
@@ -1,5 +1,5 @@
 # msvc-inval.m4 serial 1
-dnl Copyright (C) 2011-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/msvc-nothrow.m4 b/m4/msvc-nothrow.m4
index a39618a4..9e32c171 100644
--- a/m4/msvc-nothrow.m4
+++ b/m4/msvc-nothrow.m4
@@ -1,5 +1,5 @@
 # msvc-nothrow.m4 serial 1
-dnl Copyright (C) 2011-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/multiarch.m4 b/m4/multiarch.m4
index 552ec7e7..2cb956de 100644
--- a/m4/multiarch.m4
+++ b/m4/multiarch.m4
@@ -1,5 +1,5 @@
 # multiarch.m4 serial 7
-dnl Copyright (C) 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/nanosleep.m4 b/m4/nanosleep.m4
index 9bdd2727..d1d6111d 100644
--- a/m4/nanosleep.m4
+++ b/m4/nanosleep.m4
@@ -5,7 +5,7 @@ dnl Check for the nanosleep function.
 dnl If not found, use the supplied replacement.
 dnl
 
-# Copyright (C) 1999-2001, 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2001, 2003-2014 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/m4/netdb_h.m4 b/m4/netdb_h.m4
index 2c69f999..cd7d4829 100644
--- a/m4/netdb_h.m4
+++ b/m4/netdb_h.m4
@@ -1,5 +1,5 @@
 # netdb_h.m4 serial 11
-dnl Copyright (C) 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/netinet_in_h.m4 b/m4/netinet_in_h.m4
index 21971b29..1d447d6f 100644
--- a/m4/netinet_in_h.m4
+++ b/m4/netinet_in_h.m4
@@ -1,5 +1,5 @@
 # netinet_in_h.m4 serial 5
-dnl Copyright (C) 2006-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/nl_langinfo.m4 b/m4/nl_langinfo.m4
index 25e21015..6976e776 100644
--- a/m4/nl_langinfo.m4
+++ b/m4/nl_langinfo.m4
@@ -1,5 +1,5 @@
 # nl_langinfo.m4 serial 5
-dnl Copyright (C) 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/nls.m4 b/m4/nls.m4
index 8f8a147b..53cdc8be 100644
--- a/m4/nls.m4
+++ b/m4/nls.m4
@@ -1,5 +1,5 @@
 # nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation,
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/nocrash.m4 b/m4/nocrash.m4
index 105b884f..5a5d77d6 100644
--- a/m4/nocrash.m4
+++ b/m4/nocrash.m4
@@ -1,5 +1,5 @@
 # nocrash.m4 serial 4
-dnl Copyright (C) 2005, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/non-recursive-gnulib-prefix-hack.m4 b/m4/non-recursive-gnulib-prefix-hack.m4
index 3153e0f5..967b6c0b 100644
--- a/m4/non-recursive-gnulib-prefix-hack.m4
+++ b/m4/non-recursive-gnulib-prefix-hack.m4
@@ -1,4 +1,4 @@
-dnl Copyright (C) 2012-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2012-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -29,7 +29,4 @@ AC_DEFUN([gl_NON_RECURSIVE_GNULIB_PREFIX_HACK],
       (*_H:*.h) eval "$ac_var=$1/\$$ac_var";;
     esac
   done
-
-  # If $ALLOCA is not empty, prefix its value with "lib/".
-  test -n "$ALLOCA" && ALLOCA="lib/$ALLOCA"
 ])
diff --git a/m4/nproc.m4 b/m4/nproc.m4
index 0261938d..937c4a92 100644
--- a/m4/nproc.m4
+++ b/m4/nproc.m4
@@ -1,5 +1,5 @@
 # nproc.m4 serial 4
-dnl Copyright (C) 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/off_t.m4 b/m4/off_t.m4
index d355d013..f5885b34 100644
--- a/m4/off_t.m4
+++ b/m4/off_t.m4
@@ -1,5 +1,5 @@
 # off_t.m4 serial 1
-dnl Copyright (C) 2012-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2012-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/open.m4 b/m4/open.m4
index a6cb1019..68f116f0 100644
--- a/m4/open.m4
+++ b/m4/open.m4
@@ -1,5 +1,5 @@
 # open.m4 serial 14
-dnl Copyright (C) 2007-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/openat.m4 b/m4/openat.m4
index 3bf96174..ad1d9d38 100644
--- a/m4/openat.m4
+++ b/m4/openat.m4
@@ -1,7 +1,7 @@
 # serial 45
 # See if we need to use our replacement for Solaris' openat et al functions.
 
-dnl Copyright (C) 2004-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/opendir.m4 b/m4/opendir.m4
index d4116805..fa29c643 100644
--- a/m4/opendir.m4
+++ b/m4/opendir.m4
@@ -1,5 +1,5 @@
 # opendir.m4 serial 2
-dnl Copyright (C) 2011-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/parse-datetime.m4 b/m4/parse-datetime.m4
index 62ce16a5..78730096 100644
--- a/m4/parse-datetime.m4
+++ b/m4/parse-datetime.m4
@@ -1,5 +1,5 @@
 # parse-datetime.m4 serial 21
-dnl Copyright (C) 2002-2006, 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/pathmax.m4 b/m4/pathmax.m4
index e11bf57a..114f91f0 100644
--- a/m4/pathmax.m4
+++ b/m4/pathmax.m4
@@ -1,5 +1,5 @@
 # pathmax.m4 serial 10
-dnl Copyright (C) 2002-2003, 2005-2006, 2009-2013 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2006, 2009-2014 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/perl.m4 b/m4/perl.m4
index fdb5a1fd..4c12829b 100644
--- a/m4/perl.m4
+++ b/m4/perl.m4
@@ -3,7 +3,7 @@
 dnl From Jim Meyering.
 dnl Find a new-enough version of Perl.
 
-# Copyright (C) 1998-2001, 2003-2004, 2007, 2009-2013 Free Software Foundation,
+# Copyright (C) 1998-2001, 2003-2004, 2007, 2009-2014 Free Software Foundation,
 # Inc.
 #
 # This file is free software; the Free Software Foundation
diff --git a/m4/perror.m4 b/m4/perror.m4
index 42549ba2..ff9c08f9 100644
--- a/m4/perror.m4
+++ b/m4/perror.m4
@@ -1,5 +1,5 @@
 # perror.m4 serial 6
-dnl Copyright (C) 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/physmem.m4 b/m4/physmem.m4
index 445a007b..a1179eb3 100644
--- a/m4/physmem.m4
+++ b/m4/physmem.m4
@@ -1,5 +1,5 @@
 # physmem.m4 serial 11
-dnl Copyright (C) 2002-2003, 2005-2006, 2008-2013 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2006, 2008-2014 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -40,6 +40,7 @@ AC_DEFUN([gl_PHYSMEM],
      #endif
     ])
 
-  AC_CHECK_FUNCS([pstat_getstatic pstat_getdynamic sysmp getsysinfo sysctl table])
+  AC_CHECK_FUNCS([pstat_getstatic pstat_getdynamic sysmp getsysinfo sysctl table sysinfo])
+  AC_CHECK_MEMBERS([struct sysinfo.mem_unit],,, [[#include <sys/sysinfo.h>]])
   AC_REQUIRE([gl_SYS__SYSTEM_CONFIGURATION])
 ])
diff --git a/m4/pipe.m4 b/m4/pipe.m4
index 58312833..d3532d5d 100644
--- a/m4/pipe.m4
+++ b/m4/pipe.m4
@@ -1,5 +1,5 @@
 # pipe.m4 serial 2
-dnl Copyright (C) 2010-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2010-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/pipe2.m4 b/m4/pipe2.m4
deleted file mode 100644
index 6ccee105..00000000
--- a/m4/pipe2.m4
+++ /dev/null
@@ -1,18 +0,0 @@
-# pipe2.m4 serial 2
-dnl Copyright (C) 2009-2013 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_FUNC_PIPE2],
-[
-  AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
-
-  dnl Persuade glibc <unistd.h> to declare pipe2().
-  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
-
-  AC_CHECK_FUNCS_ONCE([pipe2])
-  if test $ac_cv_func_pipe2 != yes; then
-    HAVE_PIPE2=0
-  fi
-])
diff --git a/m4/po.m4 b/m4/po.m4
index 5fde6f29..c7378784 100644
--- a/m4/po.m4
+++ b/m4/po.m4
@@ -1,5 +1,5 @@
-# po.m4 serial 17c
-dnl Copyright (C) 1995-2013 Free Software Foundation, Inc.
+# po.m4 serial 23 (gettext-0.18.3)
+dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -17,7 +17,7 @@ dnl Authors:
 dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
 dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
 
-AC_PREREQ([2.50])
+AC_PREREQ([2.60])
 
 dnl Checks for all prerequisites of the po subdirectory.
 AC_DEFUN([AM_PO_SUBDIRS],
@@ -25,6 +25,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
   AC_REQUIRE([AC_PROG_MAKE_SET])dnl
   AC_REQUIRE([AC_PROG_INSTALL])dnl
   AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+  AC_REQUIRE([AC_PROG_SED])dnl
   AC_REQUIRE([AM_NLS])dnl
 
   dnl Release version of the gettext macros. This is used to ensure that
@@ -102,7 +103,7 @@ changequote([,])dnl
       case "$ac_file" in */Makefile.in)
         # Adjust a relative srcdir.
         ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+        ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
         ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
         # In autoconf-2.13 it is called $ac_given_srcdir.
         # In autoconf-2.50 it is called $srcdir.
@@ -227,7 +228,7 @@ AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
 changequote(,)dnl
   # Adjust a relative srcdir.
   ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-  ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+  ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
   ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
   # In autoconf-2.13 it is called $ac_given_srcdir.
   # In autoconf-2.50 it is called $srcdir.
diff --git a/m4/posix-shell.m4 b/m4/posix-shell.m4
index 5992e6f8..20e2fb4f 100644
--- a/m4/posix-shell.m4
+++ b/m4/posix-shell.m4
@@ -1,6 +1,6 @@
 # Find a POSIX-conforming shell.
 
-# Copyright (C) 2007-2013 Free Software Foundation, Inc.
+# Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/m4/posix_spawn.m4 b/m4/posix_spawn.m4
deleted file mode 100644
index 69eaf633..00000000
--- a/m4/posix_spawn.m4
+++ /dev/null
@@ -1,527 +0,0 @@
-# posix_spawn.m4 serial 11
-dnl Copyright (C) 2008-2013 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl Tests whether the entire posix_spawn facility is available.
-AC_DEFUN([gl_POSIX_SPAWN],
-[
-  AC_REQUIRE([gl_POSIX_SPAWN_BODY])
-])
-
-AC_DEFUN([gl_POSIX_SPAWN_BODY],
-[
-  AC_REQUIRE([gl_SPAWN_H_DEFAULTS])
-  AC_REQUIRE([gl_HAVE_POSIX_SPAWN])
-  dnl Assume that when the main function exists, all the others,
-  dnl except posix_spawnattr_{get,set}sched*, are available as well.
-  dnl AC_CHECK_FUNCS_ONCE([posix_spawnp])
-  dnl AC_CHECK_FUNCS_ONCE([posix_spawn_file_actions_init])
-  dnl AC_CHECK_FUNCS_ONCE([posix_spawn_file_actions_addclose])
-  dnl AC_CHECK_FUNCS_ONCE([posix_spawn_file_actions_adddup2])
-  dnl AC_CHECK_FUNCS_ONCE([posix_spawn_file_actions_addopen])
-  dnl AC_CHECK_FUNCS_ONCE([posix_spawn_file_actions_destroy])
-  dnl AC_CHECK_FUNCS_ONCE([posix_spawnattr_init])
-  dnl AC_CHECK_FUNCS_ONCE([posix_spawnattr_getflags])
-  dnl AC_CHECK_FUNCS_ONCE([posix_spawnattr_setflags])
-  dnl AC_CHECK_FUNCS_ONCE([posix_spawnattr_getpgroup])
-  dnl AC_CHECK_FUNCS_ONCE([posix_spawnattr_setpgroup])
-  dnl AC_CHECK_FUNCS_ONCE([posix_spawnattr_getsigdefault])
-  dnl AC_CHECK_FUNCS_ONCE([posix_spawnattr_setsigdefault])
-  dnl AC_CHECK_FUNCS_ONCE([posix_spawnattr_getsigmask])
-  dnl AC_CHECK_FUNCS_ONCE([posix_spawnattr_setsigmask])
-  dnl AC_CHECK_FUNCS_ONCE([posix_spawnattr_destroy])
-  if test $ac_cv_func_posix_spawn = yes; then
-    gl_POSIX_SPAWN_WORKS
-    case "$gl_cv_func_posix_spawn_works" in
-      *yes)
-        AC_DEFINE([HAVE_WORKING_POSIX_SPAWN], [1],
-          [Define if you have the posix_spawn and posix_spawnp functions and
-           they work.])
-        dnl Assume that these functions are available if POSIX_SPAWN_SETSCHEDULER
-        dnl evaluates to nonzero.
-        dnl AC_CHECK_FUNCS_ONCE([posix_spawnattr_getschedpolicy])
-        dnl AC_CHECK_FUNCS_ONCE([posix_spawnattr_setschedpolicy])
-        AC_CACHE_CHECK([whether posix_spawnattr_setschedpolicy is supported],
-          [gl_cv_func_spawnattr_setschedpolicy],
-          [AC_EGREP_CPP([POSIX scheduling supported], [
-#include <spawn.h>
-#if POSIX_SPAWN_SETSCHEDULER
- POSIX scheduling supported
-#endif
-],
-             [gl_cv_func_spawnattr_setschedpolicy=yes],
-             [gl_cv_func_spawnattr_setschedpolicy=no])
-          ])
-        dnl Assume that these functions are available if POSIX_SPAWN_SETSCHEDPARAM
-        dnl evaluates to nonzero.
-        dnl AC_CHECK_FUNCS_ONCE([posix_spawnattr_getschedparam])
-        dnl AC_CHECK_FUNCS_ONCE([posix_spawnattr_setschedparam])
-        AC_CACHE_CHECK([whether posix_spawnattr_setschedparam is supported],
-          [gl_cv_func_spawnattr_setschedparam],
-          [AC_EGREP_CPP([POSIX scheduling supported], [
-#include <spawn.h>
-#if POSIX_SPAWN_SETSCHEDPARAM
- POSIX scheduling supported
-#endif
-],
-             [gl_cv_func_spawnattr_setschedparam=yes],
-             [gl_cv_func_spawnattr_setschedparam=no])
-          ])
-        ;;
-      *) REPLACE_POSIX_SPAWN=1 ;;
-    esac
-  fi
-])
-
-dnl Test whether posix_spawn actually works.
-dnl posix_spawn on AIX 5.3..6.1 has two bugs:
-dnl 1) When it fails to execute the program, the child process exits with
-dnl    exit() rather than _exit(), which causes the stdio buffers to be
-dnl    flushed. Reported by Rainer Tammer.
-dnl 2) The posix_spawn_file_actions_addopen function does not support file
-dnl    names that contain a '*'.
-dnl posix_spawn on AIX 5.3..6.1 has also a third bug: It does not work
-dnl when POSIX threads are used. But we don't test against this bug here.
-AC_DEFUN([gl_POSIX_SPAWN_WORKS],
-[
-  AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-  AC_CACHE_CHECK([whether posix_spawn works], [gl_cv_func_posix_spawn_works],
-    [if test $cross_compiling = no; then
-       AC_LINK_IFELSE([AC_LANG_SOURCE([[
-#include <errno.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <spawn.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-
-extern char **environ;
-
-#ifndef STDIN_FILENO
-# define STDIN_FILENO 0
-#endif
-#ifndef STDOUT_FILENO
-# define STDOUT_FILENO 1
-#endif
-#ifndef STDERR_FILENO
-# define STDERR_FILENO 2
-#endif
-
-#ifndef WTERMSIG
-# define WTERMSIG(x) ((x) & 0x7f)
-#endif
-#ifndef WIFEXITED
-# define WIFEXITED(x) (WTERMSIG (x) == 0)
-#endif
-#ifndef WEXITSTATUS
-# define WEXITSTATUS(x) (((x) >> 8) & 0xff)
-#endif
-
-#define CHILD_PROGRAM_FILENAME "/non/exist/ent"
-
-static int
-fd_safer (int fd)
-{
-  if (0 <= fd && fd <= 2)
-    {
-      int f = fd_safer (dup (fd));
-      int e = errno;
-      close (fd);
-      errno = e;
-      fd = f;
-    }
-
-  return fd;
-}
-
-int
-main ()
-{
-  char *argv[2] = { CHILD_PROGRAM_FILENAME, NULL };
-  int ofd[2];
-  sigset_t blocked_signals;
-  sigset_t fatal_signal_set;
-  posix_spawn_file_actions_t actions;
-  bool actions_allocated;
-  posix_spawnattr_t attrs;
-  bool attrs_allocated;
-  int err;
-  pid_t child;
-  int status;
-  int exitstatus;
-
-  setvbuf (stdout, NULL, _IOFBF, 0);
-  puts ("This should be seen only once.");
-  if (pipe (ofd) < 0 || (ofd[1] = fd_safer (ofd[1])) < 0)
-    {
-      perror ("cannot create pipe");
-      exit (1);
-    }
-  sigprocmask (SIG_SETMASK, NULL, &blocked_signals);
-  sigemptyset (&fatal_signal_set);
-  sigaddset (&fatal_signal_set, SIGINT);
-  sigaddset (&fatal_signal_set, SIGTERM);
-  sigaddset (&fatal_signal_set, SIGHUP);
-  sigaddset (&fatal_signal_set, SIGPIPE);
-  sigprocmask (SIG_BLOCK, &fatal_signal_set, NULL);
-  actions_allocated = false;
-  attrs_allocated = false;
-  if ((err = posix_spawn_file_actions_init (&actions)) != 0
-      || (actions_allocated = true,
-          (err = posix_spawn_file_actions_adddup2 (&actions, ofd[0], STDIN_FILENO)) != 0
-          || (err = posix_spawn_file_actions_addclose (&actions, ofd[0])) != 0
-          || (err = posix_spawn_file_actions_addclose (&actions, ofd[1])) != 0
-          || (err = posix_spawnattr_init (&attrs)) != 0
-          || (attrs_allocated = true,
-              (err = posix_spawnattr_setsigmask (&attrs, &blocked_signals)) != 0
-              || (err = posix_spawnattr_setflags (&attrs, POSIX_SPAWN_SETSIGMASK)) != 0)
-          || (err = posix_spawnp (&child, CHILD_PROGRAM_FILENAME, &actions, &attrs, argv, environ)) != 0))
-    {
-      if (actions_allocated)
-        posix_spawn_file_actions_destroy (&actions);
-      if (attrs_allocated)
-        posix_spawnattr_destroy (&attrs);
-      sigprocmask (SIG_UNBLOCK, &fatal_signal_set, NULL);
-      if (err == ENOENT)
-        return 0;
-      else
-        {
-          errno = err;
-          perror ("subprocess failed");
-          exit (1);
-        }
-    }
-  posix_spawn_file_actions_destroy (&actions);
-  posix_spawnattr_destroy (&attrs);
-  sigprocmask (SIG_UNBLOCK, &fatal_signal_set, NULL);
-  close (ofd[0]);
-  close (ofd[1]);
-  status = 0;
-  while (waitpid (child, &status, 0) != child)
-    ;
-  if (!WIFEXITED (status))
-    {
-      fprintf (stderr, "subprocess terminated with unexpected wait status %d\n", status);
-      exit (1);
-    }
-  exitstatus = WEXITSTATUS (status);
-  if (exitstatus != 127)
-    {
-      fprintf (stderr, "subprocess terminated with unexpected exit status %d\n", exitstatus);
-      exit (1);
-    }
-  return 0;
-}
-]])],
-         [if test -s conftest$ac_exeext \
-             && ./conftest$ac_exeext > conftest.out \
-             && echo 'This should be seen only once.' > conftest.ok \
-             && cmp conftest.out conftest.ok > /dev/null; then
-            gl_cv_func_posix_spawn_works=yes
-          else
-            gl_cv_func_posix_spawn_works=no
-          fi],
-         [gl_cv_func_posix_spawn_works=no])
-       if test $gl_cv_func_posix_spawn_works = yes; then
-         AC_RUN_IFELSE([AC_LANG_SOURCE([[
-/* Test whether posix_spawn_file_actions_addopen supports filename arguments
-   that contain special characters such as '*'.  */
-
-#include <errno.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <spawn.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-
-extern char **environ;
-
-#ifndef STDIN_FILENO
-# define STDIN_FILENO 0
-#endif
-#ifndef STDOUT_FILENO
-# define STDOUT_FILENO 1
-#endif
-#ifndef STDERR_FILENO
-# define STDERR_FILENO 2
-#endif
-
-#ifndef WTERMSIG
-# define WTERMSIG(x) ((x) & 0x7f)
-#endif
-#ifndef WIFEXITED
-# define WIFEXITED(x) (WTERMSIG (x) == 0)
-#endif
-#ifndef WEXITSTATUS
-# define WEXITSTATUS(x) (((x) >> 8) & 0xff)
-#endif
-
-#define CHILD_PROGRAM_FILENAME "conftest"
-#define DATA_FILENAME "conftest%=*#?"
-
-static int
-parent_main (void)
-{
-  FILE *fp;
-  char *argv[3] = { CHILD_PROGRAM_FILENAME, "-child", NULL };
-  posix_spawn_file_actions_t actions;
-  bool actions_allocated;
-  int err;
-  pid_t child;
-  int status;
-  int exitstatus;
-
-  /* Create a data file with specific contents.  */
-  fp = fopen (DATA_FILENAME, "wb");
-  if (fp == NULL)
-    {
-      perror ("cannot create data file");
-      return 1;
-    }
-  fwrite ("Halle Potta", 1, 11, fp);
-  if (fflush (fp) || fclose (fp))
-    {
-      perror ("cannot prepare data file");
-      return 2;
-    }
-
-  /* Avoid reading from our stdin, as it could block.  */
-  freopen ("/dev/null", "rb", stdin);
-
-  /* Test whether posix_spawn_file_actions_addopen with this file name
-     actually works, but spawning a child that reads from this file.  */
-  actions_allocated = false;
-  if ((err = posix_spawn_file_actions_init (&actions)) != 0
-      || (actions_allocated = true,
-          (err = posix_spawn_file_actions_addopen (&actions, STDIN_FILENO, DATA_FILENAME, O_RDONLY, 0600)) != 0
-          || (err = posix_spawn (&child, CHILD_PROGRAM_FILENAME, &actions, NULL, argv, environ)) != 0))
-    {
-      if (actions_allocated)
-        posix_spawn_file_actions_destroy (&actions);
-      errno = err;
-      perror ("subprocess failed");
-      return 3;
-    }
-  posix_spawn_file_actions_destroy (&actions);
-  status = 0;
-  while (waitpid (child, &status, 0) != child)
-    ;
-  if (!WIFEXITED (status))
-    {
-      fprintf (stderr, "subprocess terminated with unexpected wait status %d\n", status);
-      return 4;
-    }
-  exitstatus = WEXITSTATUS (status);
-  if (exitstatus != 0)
-    {
-      fprintf (stderr, "subprocess terminated with unexpected exit status %d\n", exitstatus);
-      return 5;
-    }
-  return 0;
-}
-
-static int
-child_main (void)
-{
-  char buf[1024];
-
-  /* See if reading from STDIN_FILENO yields the expected contents.  */
-  if (fread (buf, 1, sizeof (buf), stdin) == 11
-      && memcmp (buf, "Halle Potta", 11) == 0)
-    return 0;
-  else
-    return 8;
-}
-
-static void
-cleanup_then_die (int sig)
-{
-  /* Clean up data file.  */
-  unlink (DATA_FILENAME);
-
-  /* Re-raise the signal and die from it.  */
-  signal (sig, SIG_DFL);
-  raise (sig);
-}
-
-int
-main (int argc, char *argv[])
-{
-  int exitstatus;
-
-  if (!(argc > 1 && strcmp (argv[1], "-child") == 0))
-    {
-      /* This is the parent process.  */
-      signal (SIGINT, cleanup_then_die);
-      signal (SIGTERM, cleanup_then_die);
-      #ifdef SIGHUP
-      signal (SIGHUP, cleanup_then_die);
-      #endif
-
-      exitstatus = parent_main ();
-    }
-  else
-    {
-      /* This is the child process.  */
-
-      exitstatus = child_main ();
-    }
-  unlink (DATA_FILENAME);
-  return exitstatus;
-}
-]])],
-           [],
-           [gl_cv_func_posix_spawn_works=no])
-       fi
-     else
-       case "$host_os" in
-         aix*) gl_cv_func_posix_spawn_works="guessing no";;
-         *)    gl_cv_func_posix_spawn_works="guessing yes";;
-       esac
-     fi
-    ])
-])
-
-# Prerequisites of lib/spawni.c.
-AC_DEFUN([gl_PREREQ_POSIX_SPAWN_INTERNAL],
-[
-  AC_CHECK_HEADERS([paths.h])
-  AC_CHECK_FUNCS([confstr sched_setparam sched_setscheduler setegid seteuid vfork])
-])
-
-AC_DEFUN([gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE],
-[
-  AC_REQUIRE([gl_SPAWN_H_DEFAULTS])
-  AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-  gl_POSIX_SPAWN
-  if test $REPLACE_POSIX_SPAWN = 1; then
-    REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE=1
-  else
-    dnl On Solaris 11 2011-11, posix_spawn_file_actions_addclose succeeds even
-    dnl if the fd argument is out of range.
-    AC_CACHE_CHECK([whether posix_spawn_file_actions_addclose works],
-      [gl_cv_func_posix_spawn_file_actions_addclose_works],
-      [AC_RUN_IFELSE(
-         [AC_LANG_SOURCE([[
-#include <spawn.h>
-int main ()
-{
-  posix_spawn_file_actions_t actions;
-  if (posix_spawn_file_actions_init (&actions) != 0)
-    return 1;
-  if (posix_spawn_file_actions_addclose (&actions, 10000000) == 0)
-    return 2;
-  return 0;
-}]])],
-         [gl_cv_func_posix_spawn_file_actions_addclose_works=yes],
-         [gl_cv_func_posix_spawn_file_actions_addclose_works=no],
-         [# Guess no on Solaris, yes otherwise.
-          case "$host_os" in
-            solaris*) gl_cv_func_posix_spawn_file_actions_addclose_works="guessing no";;
-            *)        gl_cv_func_posix_spawn_file_actions_addclose_works="guessing yes";;
-          esac
-         ])
-      ])
-    case "$gl_cv_func_posix_spawn_file_actions_addclose_works" in
-      *yes) ;;
-      *) REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE=1 ;;
-    esac
-  fi
-])
-
-AC_DEFUN([gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2],
-[
-  AC_REQUIRE([gl_SPAWN_H_DEFAULTS])
-  AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-  gl_POSIX_SPAWN
-  if test $REPLACE_POSIX_SPAWN = 1; then
-    REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2=1
-  else
-    dnl On Solaris 11 2011-11, posix_spawn_file_actions_adddup2 succeeds even
-    dnl if the fd argument is out of range.
-    AC_CACHE_CHECK([whether posix_spawn_file_actions_adddup2 works],
-      [gl_cv_func_posix_spawn_file_actions_adddup2_works],
-      [AC_RUN_IFELSE(
-         [AC_LANG_SOURCE([[
-#include <spawn.h>
-int main ()
-{
-  posix_spawn_file_actions_t actions;
-  if (posix_spawn_file_actions_init (&actions) != 0)
-    return 1;
-  if (posix_spawn_file_actions_adddup2 (&actions, 10000000, 2) == 0)
-    return 2;
-  return 0;
-}]])],
-         [gl_cv_func_posix_spawn_file_actions_adddup2_works=yes],
-         [gl_cv_func_posix_spawn_file_actions_adddup2_works=no],
-         [# Guess no on Solaris, yes otherwise.
-          case "$host_os" in
-            solaris*) gl_cv_func_posix_spawn_file_actions_adddup2_works="guessing no";;
-            *)        gl_cv_func_posix_spawn_file_actions_adddup2_works="guessing yes";;
-          esac
-         ])
-      ])
-    case "$gl_cv_func_posix_spawn_file_actions_adddup2_works" in
-      *yes) ;;
-      *) REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2=1 ;;
-    esac
-  fi
-])
-
-AC_DEFUN([gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN],
-[
-  AC_REQUIRE([gl_SPAWN_H_DEFAULTS])
-  AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-  gl_POSIX_SPAWN
-  if test $REPLACE_POSIX_SPAWN = 1; then
-    REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN=1
-  else
-    dnl On Solaris 11 2011-11, posix_spawn_file_actions_addopen succeeds even
-    dnl if the fd argument is out of range.
-    AC_CACHE_CHECK([whether posix_spawn_file_actions_addopen works],
-      [gl_cv_func_posix_spawn_file_actions_addopen_works],
-      [AC_RUN_IFELSE(
-         [AC_LANG_SOURCE([[
-#include <spawn.h>
-#include <fcntl.h>
-int main ()
-{
-  posix_spawn_file_actions_t actions;
-  if (posix_spawn_file_actions_init (&actions) != 0)
-    return 1;
-  if (posix_spawn_file_actions_addopen (&actions, 10000000, "foo", 0, O_RDONLY)
-      == 0)
-    return 2;
-  return 0;
-}]])],
-         [gl_cv_func_posix_spawn_file_actions_addopen_works=yes],
-         [gl_cv_func_posix_spawn_file_actions_addopen_works=no],
-         [# Guess no on Solaris, yes otherwise.
-          case "$host_os" in
-            solaris*) gl_cv_func_posix_spawn_file_actions_addopen_works="guessing no";;
-            *)        gl_cv_func_posix_spawn_file_actions_addopen_works="guessing yes";;
-          esac
-         ])
-      ])
-    case "$gl_cv_func_posix_spawn_file_actions_addopen_works" in
-      *yes) ;;
-      *) REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN=1 ;;
-    esac
-  fi
-])
diff --git a/m4/posixtm.m4 b/m4/posixtm.m4
index 9dac1382..b27b9c79 100644
--- a/m4/posixtm.m4
+++ b/m4/posixtm.m4
@@ -1,5 +1,5 @@
 # posixtm.m4 serial 8
-dnl Copyright (C) 2002-2003, 2005-2007, 2009-2013 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2007, 2009-2014 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/posixver.m4 b/m4/posixver.m4
index d3e0ca0b..5f6e1f6a 100644
--- a/m4/posixver.m4
+++ b/m4/posixver.m4
@@ -1,5 +1,5 @@
 # posixver.m4 serial 12
-dnl Copyright (C) 2002-2006, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/prereq.m4 b/m4/prereq.m4
index eca2bd65..f219e897 100644
--- a/m4/prereq.m4
+++ b/m4/prereq.m4
@@ -7,7 +7,7 @@ m4_pattern_forbid([^gl_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl
 # directory of the coreutils package.
 
 
-# Copyright (C) 1998-2013 Free Software Foundation, Inc.
+# Copyright (C) 1998-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/m4/printf-frexp.m4 b/m4/printf-frexp.m4
index 8b373b19..88a4f5c3 100644
--- a/m4/printf-frexp.m4
+++ b/m4/printf-frexp.m4
@@ -1,5 +1,5 @@
 # printf-frexp.m4 serial 5
-dnl Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/printf-frexpl.m4 b/m4/printf-frexpl.m4
index f1ce4c8a..ad0dfe66 100644
--- a/m4/printf-frexpl.m4
+++ b/m4/printf-frexpl.m4
@@ -1,5 +1,5 @@
 # printf-frexpl.m4 serial 10
-dnl Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/printf.m4 b/m4/printf.m4
index ef44f785..3d7b381e 100644
--- a/m4/printf.m4
+++ b/m4/printf.m4
@@ -1,5 +1,5 @@
-# printf.m4 serial 50
-dnl Copyright (C) 2003, 2007-2013 Free Software Foundation, Inc.
+# printf.m4 serial 51
+dnl Copyright (C) 2003, 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -61,7 +61,7 @@ changequote(,)dnl
                                  # Guess yes on glibc systems.
            *-gnu*)               gl_cv_func_printf_sizes_c99="guessing yes";;
                                  # Guess yes on FreeBSD >= 5.
-           freebsd[1-4]*)        gl_cv_func_printf_sizes_c99="guessing no";;
+           freebsd[1-4].*)       gl_cv_func_printf_sizes_c99="guessing no";;
            freebsd* | kfreebsd*) gl_cv_func_printf_sizes_c99="guessing yes";;
                                  # Guess yes on Mac OS X >= 10.3.
            darwin[1-6].*)        gl_cv_func_printf_sizes_c99="guessing no";;
@@ -220,7 +220,7 @@ changequote(,)dnl
                                  # Guess yes on glibc systems.
            *-gnu*)               gl_cv_func_printf_infinite="guessing yes";;
                                  # Guess yes on FreeBSD >= 6.
-           freebsd[1-5]*)        gl_cv_func_printf_infinite="guessing no";;
+           freebsd[1-5].*)       gl_cv_func_printf_infinite="guessing no";;
            freebsd* | kfreebsd*) gl_cv_func_printf_infinite="guessing yes";;
                                  # Guess yes on Mac OS X >= 10.3.
            darwin[1-6].*)        gl_cv_func_printf_infinite="guessing no";;
@@ -442,7 +442,7 @@ changequote(,)dnl
                                          # Guess yes on glibc systems.
                    *-gnu*)               gl_cv_func_printf_infinite_long_double="guessing yes";;
                                          # Guess yes on FreeBSD >= 6.
-                   freebsd[1-5]*)        gl_cv_func_printf_infinite_long_double="guessing no";;
+                   freebsd[1-5].*)       gl_cv_func_printf_infinite_long_double="guessing no";;
                    freebsd* | kfreebsd*) gl_cv_func_printf_infinite_long_double="guessing yes";;
                                          # Guess yes on HP-UX >= 11.
                    hpux[7-9]* | hpux10*) gl_cv_func_printf_infinite_long_double="guessing no";;
@@ -588,7 +588,7 @@ changequote(,)dnl
                                  # Guess yes on glibc systems.
            *-gnu*)               gl_cv_func_printf_directive_f="guessing yes";;
                                  # Guess yes on FreeBSD >= 6.
-           freebsd[1-5]*)        gl_cv_func_printf_directive_f="guessing no";;
+           freebsd[1-5].*)       gl_cv_func_printf_directive_f="guessing no";;
            freebsd* | kfreebsd*) gl_cv_func_printf_directive_f="guessing yes";;
                                  # Guess yes on Mac OS X >= 10.3.
            darwin[1-6].*)        gl_cv_func_printf_directive_f="guessing no";;
@@ -1136,7 +1136,7 @@ changequote(,)dnl
                                  # Guess yes on glibc systems.
            *-gnu*)               gl_cv_func_snprintf_truncation_c99="guessing yes";;
                                  # Guess yes on FreeBSD >= 5.
-           freebsd[1-4]*)        gl_cv_func_snprintf_truncation_c99="guessing no";;
+           freebsd[1-4].*)       gl_cv_func_snprintf_truncation_c99="guessing no";;
            freebsd* | kfreebsd*) gl_cv_func_snprintf_truncation_c99="guessing yes";;
                                  # Guess yes on Mac OS X >= 10.3.
            darwin[1-6].*)        gl_cv_func_snprintf_truncation_c99="guessing no";;
@@ -1235,7 +1235,7 @@ changequote(,)dnl
                                  # Guess yes on glibc systems.
            *-gnu*)               gl_cv_func_snprintf_retval_c99="guessing yes";;
                                  # Guess yes on FreeBSD >= 5.
-           freebsd[1-4]*)        gl_cv_func_snprintf_retval_c99="guessing no";;
+           freebsd[1-4].*)       gl_cv_func_snprintf_retval_c99="guessing no";;
            freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing yes";;
                                  # Guess yes on Mac OS X >= 10.3.
            darwin[1-6].*)        gl_cv_func_snprintf_retval_c99="guessing no";;
@@ -1316,7 +1316,7 @@ changequote(,)dnl
                                  # Guess yes on glibc systems.
            *-gnu*)               gl_cv_func_snprintf_directive_n="guessing yes";;
                                  # Guess yes on FreeBSD >= 5.
-           freebsd[1-4]*)        gl_cv_func_snprintf_directive_n="guessing no";;
+           freebsd[1-4].*)       gl_cv_func_snprintf_directive_n="guessing no";;
            freebsd* | kfreebsd*) gl_cv_func_snprintf_directive_n="guessing yes";;
                                  # Guess yes on Mac OS X >= 10.3.
            darwin[1-6].*)        gl_cv_func_snprintf_directive_n="guessing no";;
@@ -1458,7 +1458,7 @@ changequote(,)dnl
                                  # Guess yes on glibc systems.
            *-gnu*)               gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
                                  # Guess yes on FreeBSD >= 5.
-           freebsd[1-4]*)        gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
+           freebsd[1-4].*)       gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
            freebsd* | kfreebsd*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
                                  # Guess yes on Mac OS X >= 10.3.
            darwin[1-6].*)        gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
diff --git a/m4/priv-set.m4 b/m4/priv-set.m4
index 41a0aaf4..6a1ed240 100644
--- a/m4/priv-set.m4
+++ b/m4/priv-set.m4
@@ -1,6 +1,6 @@
 # serial 8
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/m4/progtest.m4 b/m4/progtest.m4
index 7b391232..b499f79c 100644
--- a/m4/progtest.m4
+++ b/m4/progtest.m4
@@ -1,5 +1,5 @@
 # progtest.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1996-2003, 2005, 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2003, 2005, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/pthread.m4 b/m4/pthread.m4
index 4e5aac59..1ed0dd33 100644
--- a/m4/pthread.m4
+++ b/m4/pthread.m4
@@ -1,5 +1,5 @@
-# pthread.m4 serial 7
-dnl Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# pthread.m4 serial 8
+dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -10,6 +10,19 @@ AC_DEFUN([gl_PTHREAD_CHECK],
    gl_CHECK_NEXT_HEADERS([pthread.h])
    if test $ac_cv_header_pthread_h = yes; then
      HAVE_PTHREAD_H=1
+     # mingw 3.0 uses winpthreads which installs broken macros via <pthread.h>
+     AC_CACHE_CHECK([whether <pthread.h> pollutes the namespace],
+      [gl_cv_header_pthread_h_pollution],
+      [AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM(
+          [[#include <pthread.h>
+            #ifdef strtok_r
+            #error
+             break me
+            #endif
+          ]])],
+        [gl_cv_header_pthread_h_pollution=no],
+        [gl_cv_header_pthread_h_pollution=yes])])
    else
      HAVE_PTHREAD_H=0
    fi
@@ -31,6 +44,8 @@ AC_DEFUN([gl_PTHREAD_CHECK],
       test $ac_cv_type_pthread_spinlock_t != yes; then
      PTHREAD_H='pthread.h'
      AC_LIBOBJ([pthread])
+   elif test $gl_cv_header_pthread_h_pollution = yes; then
+     PTHREAD_H=pthread.h
    else
      PTHREAD_H=
    fi
diff --git a/m4/putenv.m4 b/m4/putenv.m4
index 9de53527..d79321be 100644
--- a/m4/putenv.m4
+++ b/m4/putenv.m4
@@ -1,5 +1,5 @@
-# putenv.m4 serial 19
-dnl Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# putenv.m4 serial 20
+dnl Copyright (C) 2002-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -48,3 +48,9 @@ AC_DEFUN([gl_FUNC_PUTENV],
       ;;
   esac
 ])
+
+# Prerequisites of lib/putenv.c.
+AC_DEFUN([gl_PREREQ_PUTENV],
+[
+  AC_CHECK_DECLS([_putenv])
+])
diff --git a/m4/quote.m4 b/m4/quote.m4
index ac49236e..95b3e71b 100644
--- a/m4/quote.m4
+++ b/m4/quote.m4
@@ -1,5 +1,5 @@
 # quote.m4 serial 6
-dnl Copyright (C) 2002-2003, 2005-2006, 2009-2013 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2006, 2009-2014 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/quotearg.m4 b/m4/quotearg.m4
index bc0ef0c9..eaebbf63 100644
--- a/m4/quotearg.m4
+++ b/m4/quotearg.m4
@@ -1,5 +1,5 @@
 # quotearg.m4 serial 9
-dnl Copyright (C) 2002, 2004-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2004-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/raise.m4 b/m4/raise.m4
index 7df3317d..8656578e 100644
--- a/m4/raise.m4
+++ b/m4/raise.m4
@@ -1,5 +1,5 @@
 # raise.m4 serial 3
-dnl Copyright (C) 2011-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/rawmemchr.m4 b/m4/rawmemchr.m4
deleted file mode 100644
index 8c500547..00000000
--- a/m4/rawmemchr.m4
+++ /dev/null
@@ -1,20 +0,0 @@
-# rawmemchr.m4 serial 2
-dnl Copyright (C) 2003, 2007-2013 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_FUNC_RAWMEMCHR],
-[
-  dnl Persuade glibc <string.h> to declare rawmemchr().
-  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
-
-  AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
-  AC_CHECK_FUNCS([rawmemchr])
-  if test $ac_cv_func_rawmemchr = no; then
-    HAVE_RAWMEMCHR=0
-  fi
-])
-
-# Prerequisites of lib/strchrnul.c.
-AC_DEFUN([gl_PREREQ_RAWMEMCHR], [:])
diff --git a/m4/read-file.m4 b/m4/read-file.m4
index 491bba8e..a2beacc6 100644
--- a/m4/read-file.m4
+++ b/m4/read-file.m4
@@ -1,5 +1,5 @@
 # read-file.m4 serial 3
-dnl Copyright (C) 2002-2006, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/read.m4 b/m4/read.m4
index 81f0f3a9..176b0b04 100644
--- a/m4/read.m4
+++ b/m4/read.m4
@@ -1,5 +1,5 @@
 # read.m4 serial 4
-dnl Copyright (C) 2011-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/readdir.m4 b/m4/readdir.m4
index 4269bb48..bd7be5c3 100644
--- a/m4/readdir.m4
+++ b/m4/readdir.m4
@@ -1,5 +1,5 @@
 # readdir.m4 serial 1
-dnl Copyright (C) 2011-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/readlink.m4 b/m4/readlink.m4
index 96e50425..f9ce868c 100644
--- a/m4/readlink.m4
+++ b/m4/readlink.m4
@@ -1,5 +1,5 @@
 # readlink.m4 serial 12
-dnl Copyright (C) 2003, 2007, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2007, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/readlinkat.m4 b/m4/readlinkat.m4
index b2ff40dc..65c0689c 100644
--- a/m4/readlinkat.m4
+++ b/m4/readlinkat.m4
@@ -1,7 +1,7 @@
 # serial 3
 # See if we need to provide readlinkat replacement.
 
-dnl Copyright (C) 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/readtokens.m4 b/m4/readtokens.m4
index aaa8212e..0eaba552 100644
--- a/m4/readtokens.m4
+++ b/m4/readtokens.m4
@@ -1,5 +1,5 @@
 # readtokens.m4 serial 6
-dnl Copyright (C) 2002-2003, 2005-2006, 2009-2013 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2006, 2009-2014 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/readutmp.m4 b/m4/readutmp.m4
index a22efcef..0e614b68 100644
--- a/m4/readutmp.m4
+++ b/m4/readutmp.m4
@@ -1,5 +1,5 @@
 # readutmp.m4 serial 20
-dnl Copyright (C) 2002-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/realloc.m4 b/m4/realloc.m4
index d477fb47..f96537ba 100644
--- a/m4/realloc.m4
+++ b/m4/realloc.m4
@@ -1,5 +1,5 @@
 # realloc.m4 serial 13
-dnl Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/regex.m4 b/m4/regex.m4
index ae89e311..08bd46a9 100644
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -1,6 +1,6 @@
-# serial 63
+# serial 65
 
-# Copyright (C) 1996-2001, 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2001, 2003-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -27,7 +27,8 @@ AC_DEFUN([gl_REGEX],
     # following run test, then default to *not* using the included regex.c.
     # If cross compiling, assume the test would fail and use the included
     # regex.c.
-    AC_CHECK_FUNCS_ONCE([alarm])
+    AC_CHECK_DECLS_ONCE([alarm])
+    AC_CHECK_HEADERS_ONCE([malloc.h])
     AC_CACHE_CHECK([for working re_compile_pattern],
                    [gl_cv_func_re_compile_pattern_working],
       [AC_RUN_IFELSE(
@@ -37,9 +38,19 @@ AC_DEFUN([gl_REGEX],
             #include <locale.h>
             #include <limits.h>
             #include <string.h>
-            #if HAVE_ALARM
-            # include <unistd.h>
+
+            #if defined M_CHECK_ACTION || HAVE_DECL_ALARM
             # include <signal.h>
+            # include <unistd.h>
+            #endif
+
+            #if HAVE_MALLOC_H
+            # include <malloc.h>
+            #endif
+
+            #ifdef M_CHECK_ACTION
+            /* Exit with distinguishable exit code.  */
+            static void sigabrt_no_core (int sig) { raise (SIGTERM); }
             #endif
           ]],
           [[int result = 0;
@@ -49,11 +60,18 @@ AC_DEFUN([gl_REGEX],
             const char *s;
             struct re_registers regs;
 
-#if HAVE_ALARM
-            /* Some builds of glibc go into an infinite loop on this test.  */
+            /* Some builds of glibc go into an infinite loop on this
+               test.  Use alarm to force death, and mallopt to avoid
+               malloc recursion in diagnosing the corrupted heap. */
+#if HAVE_DECL_ALARM
             signal (SIGALRM, SIG_DFL);
             alarm (2);
 #endif
+#ifdef M_CHECK_ACTION
+            signal (SIGABRT, sigabrt_no_core);
+            mallopt (M_CHECK_ACTION, 2);
+#endif
+
             if (setlocale (LC_ALL, "en_US.UTF-8"))
               {
                 {
@@ -84,17 +102,28 @@ AC_DEFUN([gl_REGEX],
                      */
                   static char const pat[] = "[^x]x";
                   static char const data[] =
-                    "\xe1\x80\x80\xe1\x80\xbb\xe1\x80\xbd\xe1\x80\x94\xe1\x80"
-                    "\xba\xe1\x80\xaf\xe1\x80\x95\xe1\x80\xbax";
+                    /* <U1000><U103B><U103D><U1014><U103A><U102F><U1015><U103A> */
+                    "\xe1\x80\x80"
+                    "\xe1\x80\xbb"
+                    "\xe1\x80\xbd"
+                    "\xe1\x80\x94"
+                    "\xe1\x80\xba"
+                    "\xe1\x80\xaf"
+                    "\xe1\x80\x95"
+                    "\xe1\x80\xba"
+                    "x";
                   re_set_syntax (0);
                   memset (&regex, 0, sizeof regex);
                   s = re_compile_pattern (pat, sizeof pat - 1, &regex);
                   if (s)
                     result |= 1;
-                  else if (re_search (&regex, data, sizeof data - 1,
-                                      0, sizeof data - 1, 0)
-                           != 21)
-                    result |= 1;
+                  else
+                    {
+                      i = re_search (&regex, data, sizeof data - 1,
+                                     0, sizeof data - 1, 0);
+                      if (i != 0 && i != 21)
+                        result |= 1;
+                    }
                 }
 
                 if (! setlocale (LC_ALL, "C"))
@@ -255,7 +284,8 @@ AC_DEFUN([gl_PREREQ_REGEX],
   AC_REQUIRE([AC_C_RESTRICT])
   AC_REQUIRE([AC_TYPE_MBSTATE_T])
   AC_REQUIRE([gl_EEMALLOC])
+  AC_REQUIRE([gl_GLIBC21])
   AC_CHECK_HEADERS([libintl.h])
-  AC_CHECK_FUNCS_ONCE([isblank iswctype wcscoll])
+  AC_CHECK_FUNCS_ONCE([isblank iswctype])
   AC_CHECK_DECLS([isblank], [], [], [[#include <ctype.h>]])
 ])
diff --git a/m4/remove.m4 b/m4/remove.m4
index e693f640..7eb8f7e0 100644
--- a/m4/remove.m4
+++ b/m4/remove.m4
@@ -1,5 +1,5 @@
 # remove.m4 serial 5
-dnl Copyright (C) 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/rename.m4 b/m4/rename.m4
index 66430aa8..ea577949 100644
--- a/m4/rename.m4
+++ b/m4/rename.m4
@@ -1,6 +1,6 @@
 # serial 26
 
-# Copyright (C) 2001, 2003, 2005-2006, 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005-2006, 2009-2014 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/m4/rewinddir.m4 b/m4/rewinddir.m4
index ee9d9b9b..06f54142 100644
--- a/m4/rewinddir.m4
+++ b/m4/rewinddir.m4
@@ -1,5 +1,5 @@
 # rewinddir.m4 serial 1
-dnl Copyright (C) 2011-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/rmdir.m4 b/m4/rmdir.m4
index f6a02dd2..db6a9399 100644
--- a/m4/rmdir.m4
+++ b/m4/rmdir.m4
@@ -1,5 +1,5 @@
 # rmdir.m4 serial 13
-dnl Copyright (C) 2002, 2005, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2005, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/rpmatch.m4 b/m4/rpmatch.m4
index 4edc4665..6fd0f5df 100644
--- a/m4/rpmatch.m4
+++ b/m4/rpmatch.m4
@@ -1,5 +1,5 @@
 # rpmatch.m4 serial 10
-dnl Copyright (C) 2002-2003, 2007-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2003, 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/safe-read.m4 b/m4/safe-read.m4
index be5207a5..f0c42e08 100644
--- a/m4/safe-read.m4
+++ b/m4/safe-read.m4
@@ -1,5 +1,5 @@
 # safe-read.m4 serial 6
-dnl Copyright (C) 2002-2003, 2005-2006, 2009-2013 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2006, 2009-2014 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/safe-write.m4 b/m4/safe-write.m4
index bc2a33f8..66648bbb 100644
--- a/m4/safe-write.m4
+++ b/m4/safe-write.m4
@@ -1,5 +1,5 @@
 # safe-write.m4 serial 4
-dnl Copyright (C) 2002, 2005-2006, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2005-2006, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/same.m4 b/m4/same.m4
index cdc5025b..cb63894a 100644
--- a/m4/same.m4
+++ b/m4/same.m4
@@ -1,5 +1,5 @@
 #serial 9
-dnl Copyright (C) 2002-2003, 2005-2006, 2009-2013 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2006, 2009-2014 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/save-cwd.m4 b/m4/save-cwd.m4
index 74e1f562..68dd1c5c 100644
--- a/m4/save-cwd.m4
+++ b/m4/save-cwd.m4
@@ -1,5 +1,5 @@
 # serial 10
-dnl Copyright (C) 2002-2006, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/savedir.m4 b/m4/savedir.m4
index 96fe9285..8f617db0 100644
--- a/m4/savedir.m4
+++ b/m4/savedir.m4
@@ -1,5 +1,5 @@
 # savedir.m4 serial 10
-dnl Copyright (C) 2002-2003, 2005-2006, 2009-2013 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2006, 2009-2014 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/savewd.m4 b/m4/savewd.m4
index 9ea30051..68a3e8c1 100644
--- a/m4/savewd.m4
+++ b/m4/savewd.m4
@@ -1,6 +1,6 @@
 # Save and restore the working directory, possibly using a child process.
 
-dnl Copyright (C) 2004, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2004, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/sched_h.m4 b/m4/sched_h.m4
index 931358fd..329af351 100644
--- a/m4/sched_h.m4
+++ b/m4/sched_h.m4
@@ -1,5 +1,5 @@
 # sched_h.m4 serial 6
-dnl Copyright (C) 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/secure_getenv.m4 b/m4/secure_getenv.m4
new file mode 100644
index 00000000..149888df
--- /dev/null
+++ b/m4/secure_getenv.m4
@@ -0,0 +1,25 @@
+# Look up an environment variable more securely.
+dnl Copyright 2013-2014 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_FUNC_SECURE_GETENV],
+[
+  dnl Persuade glibc <stdlib.h> to declare secure_getenv().
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+
+  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
+  AC_CHECK_FUNCS_ONCE([secure_getenv])
+  if test $ac_cv_func_secure_getenv = no; then
+    HAVE_SECURE_GETENV=0
+  fi
+])
+
+# Prerequisites of lib/secure_getenv.c.
+AC_DEFUN([gl_PREREQ_SECURE_GETENV], [
+  AC_CHECK_FUNCS([__secure_getenv])
+  if test $ac_cv_func___secure_getenv = no; then
+    AC_CHECK_FUNCS([issetugid])
+  fi
+])
diff --git a/m4/select.m4 b/m4/select.m4
index d025355f..1d2fcb37 100644
--- a/m4/select.m4
+++ b/m4/select.m4
@@ -1,5 +1,5 @@
 # select.m4 serial 7
-dnl Copyright (C) 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/selinux-context-h.m4 b/m4/selinux-context-h.m4
index c85255b7..1e4bcfee 100644
--- a/m4/selinux-context-h.m4
+++ b/m4/selinux-context-h.m4
@@ -1,5 +1,5 @@
 # serial 3   -*- Autoconf -*-
-# Copyright (C) 2006-2007, 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2007, 2009-2014 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/m4/selinux-selinux-h.m4 b/m4/selinux-selinux-h.m4
index 17cccffb..af0696cc 100644
--- a/m4/selinux-selinux-h.m4
+++ b/m4/selinux-selinux-h.m4
@@ -1,5 +1,5 @@
 # serial 5   -*- Autoconf -*-
-# Copyright (C) 2006-2007, 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2007, 2009-2014 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -61,9 +61,11 @@ AC_DEFUN([gl_LIBSELINUX],
   AC_SUBST([LIB_SELINUX])
 
   # Warn if SELinux is found but libselinux is absent;
-  if test "$ac_cv_search_setfilecon" = no &&
-     test "$host" = "$build" && test -d /selinux; then
-    AC_MSG_WARN([This system supports SELinux but libselinux is missing.])
-    AC_MSG_WARN([AC_PACKAGE_NAME will be compiled without SELinux support.])
+  if test "$ac_cv_search_setfilecon" = no; then
+    if test "$host" = "$build" && test -d /selinux; then
+      AC_MSG_WARN([This system supports SELinux but libselinux is missing.])
+      AC_MSG_WARN([AC_PACKAGE_NAME will be compiled without SELinux support.])
+    fi
+    with_selinux=no
   fi
 ])
diff --git a/m4/servent.m4 b/m4/servent.m4
index 01c037a8..4dc7a9f7 100644
--- a/m4/servent.m4
+++ b/m4/servent.m4
@@ -1,5 +1,5 @@
 # servent.m4 serial 2
-dnl Copyright (C) 2008, 2010-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2008, 2010-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/setenv.m4 b/m4/setenv.m4
index cb5351a0..0f46a7be 100644
--- a/m4/setenv.m4
+++ b/m4/setenv.m4
@@ -1,5 +1,5 @@
 # setenv.m4 serial 26
-dnl Copyright (C) 2001-2004, 2006-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2004, 2006-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/setlocale.m4 b/m4/setlocale.m4
index 1133e65c..fe83aab3 100644
--- a/m4/setlocale.m4
+++ b/m4/setlocale.m4
@@ -1,5 +1,5 @@
 # setlocale.m4 serial 4
-dnl Copyright (C) 2011-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/settime.m4 b/m4/settime.m4
index 0c80c35d..7ca6e8bc 100644
--- a/m4/settime.m4
+++ b/m4/settime.m4
@@ -1,5 +1,5 @@
 # settime.m4 serial 7
-dnl Copyright (C) 2002, 2004-2006, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2004-2006, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/sha1.m4 b/m4/sha1.m4
index 21c775e3..bf51b1b6 100644
--- a/m4/sha1.m4
+++ b/m4/sha1.m4
@@ -1,5 +1,5 @@
-# sha1.m4 serial 11
-dnl Copyright (C) 2002-2006, 2008-2013 Free Software Foundation, Inc.
+# sha1.m4 serial 12
+dnl Copyright (C) 2002-2006, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -8,5 +8,7 @@ AC_DEFUN([gl_SHA1],
 [
   dnl Prerequisites of lib/sha1.c.
   AC_REQUIRE([gl_BIGENDIAN])
-  :
+
+  dnl Determine HAVE_OPENSSL_SHA1 and LIB_CRYPTO
+  gl_CRYPTO_CHECK([SHA1])
 ])
diff --git a/m4/sha256.m4 b/m4/sha256.m4
index 7eede32f..6dc63032 100644
--- a/m4/sha256.m4
+++ b/m4/sha256.m4
@@ -1,5 +1,5 @@
-# sha256.m4 serial 6
-dnl Copyright (C) 2005, 2008-2013 Free Software Foundation, Inc.
+# sha256.m4 serial 8
+dnl Copyright (C) 2005, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -8,4 +8,7 @@ AC_DEFUN([gl_SHA256],
 [
   dnl Prerequisites of lib/sha256.c.
   AC_REQUIRE([gl_BIGENDIAN])
+
+  dnl Determine HAVE_OPENSSL_SHA256 and LIB_CRYPTO
+  gl_CRYPTO_CHECK([SHA256])
 ])
diff --git a/m4/sha512.m4 b/m4/sha512.m4
index 46c08958..5ef5d404 100644
--- a/m4/sha512.m4
+++ b/m4/sha512.m4
@@ -1,5 +1,5 @@
-# sha512.m4 serial 7
-dnl Copyright (C) 2005-2006, 2008-2013 Free Software Foundation, Inc.
+# sha512.m4 serial 9
+dnl Copyright (C) 2005-2006, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -8,4 +8,7 @@ AC_DEFUN([gl_SHA512],
 [
   dnl Prerequisites of lib/sha512.c.
   AC_REQUIRE([gl_BIGENDIAN])
+
+  dnl Determine HAVE_OPENSSL_SHA512 and LIB_CRYPTO
+  gl_CRYPTO_CHECK([SHA512])
 ])
diff --git a/m4/sig2str.m4 b/m4/sig2str.m4
index de738437..69ec37ff 100644
--- a/m4/sig2str.m4
+++ b/m4/sig2str.m4
@@ -1,5 +1,5 @@
 # serial 7
-dnl Copyright (C) 2002, 2005-2006, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2005-2006, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/sig_atomic_t.m4 b/m4/sig_atomic_t.m4
deleted file mode 100644
index f2dfd591..00000000
--- a/m4/sig_atomic_t.m4
+++ /dev/null
@@ -1,14 +0,0 @@
-# sig_atomic_t.m4 serial 3
-dnl Copyright (C) 2003, 2009-2013 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gt_TYPE_SIG_ATOMIC_T],
-[
-  AC_CHECK_TYPES([sig_atomic_t], ,
-    [AC_DEFINE([sig_atomic_t], [int],
-       [Define as an integer type suitable for memory locations that can be
-        accessed atomically even in the presence of asynchronous signals.])],
-    [#include <signal.h>])
-])
diff --git a/m4/sigaction.m4 b/m4/sigaction.m4
index 116b0688..d0609860 100644
--- a/m4/sigaction.m4
+++ b/m4/sigaction.m4
@@ -1,5 +1,5 @@
 # sigaction.m4 serial 7
-dnl Copyright (C) 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/signal_h.m4 b/m4/signal_h.m4
index 3de9f27a..c8f664fb 100644
--- a/m4/signal_h.m4
+++ b/m4/signal_h.m4
@@ -1,5 +1,5 @@
 # signal_h.m4 serial 18
-dnl Copyright (C) 2007-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/signalblocking.m4 b/m4/signalblocking.m4
index a00e704f..a2ad9e8e 100644
--- a/m4/signalblocking.m4
+++ b/m4/signalblocking.m4
@@ -1,5 +1,5 @@
 # signalblocking.m4 serial 14
-dnl Copyright (C) 2001-2002, 2006-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2002, 2006-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/signbit.m4 b/m4/signbit.m4
index d58caaf0..9ed48c78 100644
--- a/m4/signbit.m4
+++ b/m4/signbit.m4
@@ -1,5 +1,5 @@
 # signbit.m4 serial 13
-dnl Copyright (C) 2007-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/size_max.m4 b/m4/size_max.m4
index 4b247abc..7e192d5e 100644
--- a/m4/size_max.m4
+++ b/m4/size_max.m4
@@ -1,5 +1,5 @@
 # size_max.m4 serial 10
-dnl Copyright (C) 2003, 2005-2006, 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2006, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/sleep.m4 b/m4/sleep.m4
index a27baa6d..2f84da57 100644
--- a/m4/sleep.m4
+++ b/m4/sleep.m4
@@ -1,5 +1,5 @@
 # sleep.m4 serial 7
-dnl Copyright (C) 2007-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/snprintf.m4 b/m4/snprintf.m4
index 3698e844..888db35c 100644
--- a/m4/snprintf.m4
+++ b/m4/snprintf.m4
@@ -1,5 +1,5 @@
 # snprintf.m4 serial 6
-dnl Copyright (C) 2002-2004, 2007-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2004, 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/socketlib.m4 b/m4/socketlib.m4
index b08a72f6..041498ba 100644
--- a/m4/socketlib.m4
+++ b/m4/socketlib.m4
@@ -1,5 +1,5 @@
 # socketlib.m4 serial 1
-dnl Copyright (C) 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/sockets.m4 b/m4/sockets.m4
index b407391c..da6ff742 100644
--- a/m4/sockets.m4
+++ b/m4/sockets.m4
@@ -1,5 +1,5 @@
 # sockets.m4 serial 7
-dnl Copyright (C) 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/socklen.m4 b/m4/socklen.m4
index e3efd6ef..4c07f864 100644
--- a/m4/socklen.m4
+++ b/m4/socklen.m4
@@ -1,5 +1,5 @@
 # socklen.m4 serial 10
-dnl Copyright (C) 2005-2007, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2007, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/sockpfaf.m4 b/m4/sockpfaf.m4
index 89557b18..31d436f0 100644
--- a/m4/sockpfaf.m4
+++ b/m4/sockpfaf.m4
@@ -1,5 +1,5 @@
 # sockpfaf.m4 serial 8
-dnl Copyright (C) 2004, 2006, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2004, 2006, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/spawn-pipe.m4 b/m4/spawn-pipe.m4
deleted file mode 100644
index d2729358..00000000
--- a/m4/spawn-pipe.m4
+++ /dev/null
@@ -1,11 +0,0 @@
-# spawn-pipe.m4 serial 2
-dnl Copyright (C) 2004, 2008-2013 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_SPAWN_PIPE],
-[
-  dnl Prerequisites of lib/spawn-pipe.c.
-  AC_REQUIRE([AC_TYPE_MODE_T])
-])
diff --git a/m4/spawn_h.m4 b/m4/spawn_h.m4
deleted file mode 100644
index ba08c5d8..00000000
--- a/m4/spawn_h.m4
+++ /dev/null
@@ -1,117 +0,0 @@
-# spawn_h.m4 serial 16
-dnl Copyright (C) 2008-2013 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl Written by Bruno Haible.
-
-AC_DEFUN([gl_SPAWN_H],
-[
-  dnl Use AC_REQUIRE here, so that the default behavior below is expanded
-  dnl once only, before all statements that occur in other macros.
-  AC_REQUIRE([gl_SPAWN_H_DEFAULTS])
-
-  dnl <spawn.h> is always overridden, because of GNULIB_POSIXCHECK.
-  gl_CHECK_NEXT_HEADERS([spawn.h])
-
-  if test $ac_cv_header_spawn_h = yes; then
-    HAVE_SPAWN_H=1
-    AC_CHECK_TYPES([posix_spawnattr_t], [], [HAVE_POSIX_SPAWNATTR_T=0], [[
-#include <spawn.h>
-      ]])
-    AC_CHECK_TYPES([posix_spawn_file_actions_t], [],
-      [HAVE_POSIX_SPAWN_FILE_ACTIONS_T=0], [[
-#include <spawn.h>
-      ]])
-  else
-    HAVE_SPAWN_H=0
-    HAVE_POSIX_SPAWNATTR_T=0
-    HAVE_POSIX_SPAWN_FILE_ACTIONS_T=0
-  fi
-  AC_SUBST([HAVE_SPAWN_H])
-
-  dnl Ensure the type pid_t gets defined.
-  AC_REQUIRE([AC_TYPE_PID_T])
-
-  dnl Ensure the type mode_t gets defined.
-  AC_REQUIRE([AC_TYPE_MODE_T])
-
-  AC_REQUIRE([gl_HAVE_POSIX_SPAWN])
-
-  AC_REQUIRE([AC_C_RESTRICT])
-
-  dnl Check for declarations of anything we want to poison if the
-  dnl corresponding gnulib module is not in use.
-  gl_WARN_ON_USE_PREPARE([[#include <spawn.h>
-    ]], [posix_spawn posix_spawnp posix_spawnattr_init posix_spawnattr_destroy
-    posix_spawnattr_getsigdefault posix_spawnattr_setsigdefault
-    posix_spawnattr_getsigmask posix_spawnattr_setsigmask
-    posix_spawnattr_getflags posix_spawnattr_setflags
-    posix_spawnattr_getpgroup posix_spawnattr_setpgroup
-    posix_spawnattr_getschedpolicy posix_spawnattr_setschedpolicy
-    posix_spawnattr_getschedparam posix_spawnattr_setschedparam
-    posix_spawn_file_actions_init posix_spawn_file_actions_destroy
-    posix_spawn_file_actions_addopen posix_spawn_file_actions_addclose
-    posix_spawn_file_actions_adddup2])
-])
-
-dnl Checks whether the system has the functions posix_spawn.
-dnl Sets ac_cv_func_posix_spawn and HAVE_POSIX_SPAWN.
-AC_DEFUN([gl_HAVE_POSIX_SPAWN],
-[
-  dnl Use AC_REQUIRE here, so that the default behavior below is expanded
-  dnl once only, before all statements that occur in other macros.
-  AC_REQUIRE([gl_SPAWN_H_DEFAULTS])
-
-  AC_CHECK_FUNCS_ONCE([posix_spawn])
-  if test $ac_cv_func_posix_spawn != yes; then
-    HAVE_POSIX_SPAWN=0
-  fi
-])
-
-AC_DEFUN([gl_SPAWN_MODULE_INDICATOR],
-[
-  dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
-  AC_REQUIRE([gl_SPAWN_H_DEFAULTS])
-  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
-  dnl Define it also as a C macro, for the benefit of the unit tests.
-  gl_MODULE_INDICATOR_FOR_TESTS([$1])
-])
-
-AC_DEFUN([gl_SPAWN_H_DEFAULTS],
-[
-  GNULIB_POSIX_SPAWN=0;                       AC_SUBST([GNULIB_POSIX_SPAWN])
-  GNULIB_POSIX_SPAWNP=0;                      AC_SUBST([GNULIB_POSIX_SPAWNP])
-  GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT=0;     AC_SUBST([GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT])
-  GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE=0; AC_SUBST([GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE])
-  GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2=0;  AC_SUBST([GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2])
-  GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN=0;  AC_SUBST([GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN])
-  GNULIB_POSIX_SPAWN_FILE_ACTIONS_DESTROY=0;  AC_SUBST([GNULIB_POSIX_SPAWN_FILE_ACTIONS_DESTROY])
-  GNULIB_POSIX_SPAWNATTR_INIT=0;              AC_SUBST([GNULIB_POSIX_SPAWNATTR_INIT])
-  GNULIB_POSIX_SPAWNATTR_GETFLAGS=0;          AC_SUBST([GNULIB_POSIX_SPAWNATTR_GETFLAGS])
-  GNULIB_POSIX_SPAWNATTR_SETFLAGS=0;          AC_SUBST([GNULIB_POSIX_SPAWNATTR_SETFLAGS])
-  GNULIB_POSIX_SPAWNATTR_GETPGROUP=0;         AC_SUBST([GNULIB_POSIX_SPAWNATTR_GETPGROUP])
-  GNULIB_POSIX_SPAWNATTR_SETPGROUP=0;         AC_SUBST([GNULIB_POSIX_SPAWNATTR_SETPGROUP])
-  GNULIB_POSIX_SPAWNATTR_GETSCHEDPARAM=0;     AC_SUBST([GNULIB_POSIX_SPAWNATTR_GETSCHEDPARAM])
-  GNULIB_POSIX_SPAWNATTR_SETSCHEDPARAM=0;     AC_SUBST([GNULIB_POSIX_SPAWNATTR_SETSCHEDPARAM])
-  GNULIB_POSIX_SPAWNATTR_GETSCHEDPOLICY=0;    AC_SUBST([GNULIB_POSIX_SPAWNATTR_GETSCHEDPOLICY])
-  GNULIB_POSIX_SPAWNATTR_SETSCHEDPOLICY=0;    AC_SUBST([GNULIB_POSIX_SPAWNATTR_SETSCHEDPOLICY])
-  GNULIB_POSIX_SPAWNATTR_GETSIGDEFAULT=0;     AC_SUBST([GNULIB_POSIX_SPAWNATTR_GETSIGDEFAULT])
-  GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT=0;     AC_SUBST([GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT])
-  GNULIB_POSIX_SPAWNATTR_GETSIGMASK=0;        AC_SUBST([GNULIB_POSIX_SPAWNATTR_GETSIGMASK])
-  GNULIB_POSIX_SPAWNATTR_SETSIGMASK=0;        AC_SUBST([GNULIB_POSIX_SPAWNATTR_SETSIGMASK])
-  GNULIB_POSIX_SPAWNATTR_DESTROY=0;           AC_SUBST([GNULIB_POSIX_SPAWNATTR_DESTROY])
-  dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_POSIX_SPAWN=1;        AC_SUBST([HAVE_POSIX_SPAWN])
-  HAVE_POSIX_SPAWNATTR_T=1;  AC_SUBST([HAVE_POSIX_SPAWNATTR_T])
-  HAVE_POSIX_SPAWN_FILE_ACTIONS_T=1;
-                             AC_SUBST([HAVE_POSIX_SPAWN_FILE_ACTIONS_T])
-  REPLACE_POSIX_SPAWN=0;     AC_SUBST([REPLACE_POSIX_SPAWN])
-  REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE=0;
-                             AC_SUBST([REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE])
-  REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2=0;
-                             AC_SUBST([REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2])
-  REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN=0;
-                             AC_SUBST([REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN])
-])
diff --git a/m4/ssize_t.m4 b/m4/ssize_t.m4
index 63381343..fbe1d068 100644
--- a/m4/ssize_t.m4
+++ b/m4/ssize_t.m4
@@ -1,5 +1,5 @@
 # ssize_t.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2001-2003, 2006, 2010-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2003, 2006, 2010-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/st_dm_mode.m4 b/m4/st_dm_mode.m4
index d47159f1..3c9b52e2 100644
--- a/m4/st_dm_mode.m4
+++ b/m4/st_dm_mode.m4
@@ -1,6 +1,6 @@
 # serial 6
 
-# Copyright (C) 1998-1999, 2001, 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 1998-1999, 2001, 2009-2014 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/m4/stat-prog.m4 b/m4/stat-prog.m4
index a12d9a01..f0065368 100644
--- a/m4/stat-prog.m4
+++ b/m4/stat-prog.m4
@@ -1,7 +1,7 @@
 # stat-prog.m4 serial 7
 # Record the prerequisites of src/stat.c from the coreutils package.
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/m4/stat-size.m4 b/m4/stat-size.m4
index d5b550cf..71acd35d 100644
--- a/m4/stat-size.m4
+++ b/m4/stat-size.m4
@@ -1,6 +1,6 @@
 #serial 1
 
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/m4/stat-time.m4 b/m4/stat-time.m4
index d777f742..ea5c4fc5 100644
--- a/m4/stat-time.m4
+++ b/m4/stat-time.m4
@@ -1,6 +1,6 @@
 # Checks for stat-related time functions.
 
-# Copyright (C) 1998-1999, 2001, 2003, 2005-2007, 2009-2013 Free Software
+# Copyright (C) 1998-1999, 2001, 2003, 2005-2007, 2009-2014 Free Software
 # Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
diff --git a/m4/stat.m4 b/m4/stat.m4
index 2456297a..1ae327b3 100644
--- a/m4/stat.m4
+++ b/m4/stat.m4
@@ -1,6 +1,6 @@
 # serial 11
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/m4/stdalign.m4 b/m4/stdalign.m4
index 3d7993db..9efafe5c 100644
--- a/m4/stdalign.m4
+++ b/m4/stdalign.m4
@@ -1,6 +1,6 @@
 # Check for stdalign.h that conforms to C11.
 
-dnl Copyright 2011-2013 Free Software Foundation, Inc.
+dnl Copyright 2011-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -31,10 +31,12 @@ AC_DEFUN([gl_STDALIGN_H],
 
             /* Test _Alignas only on platforms where gnulib can help.  */
             #if \
-                (__GNUC__ || __IBMC__ || __IBMCPP__ \
+                ((defined __cplusplus && 201103 <= __cplusplus) \
+                 || __GNUC__ || __IBMC__ || __IBMCPP__ || __ICC \
                  || 0x5110 <= __SUNPRO_C || 1300 <= _MSC_VER)
-              int alignas (8) alignas_int = 1;
-              char test_alignas[_Alignof (alignas_int) == 8 ? 1 : -1];
+              struct alignas_test { char c; char alignas (8) alignas_8; };
+              char test_alignas[offsetof (struct alignas_test, alignas_8) == 8
+                                ? 1 : -1];
             #endif
           ]])],
        [gl_cv_header_working_stdalign_h=yes],
diff --git a/m4/stdarg.m4 b/m4/stdarg.m4
index c087f61e..732aa313 100644
--- a/m4/stdarg.m4
+++ b/m4/stdarg.m4
@@ -1,5 +1,5 @@
 # stdarg.m4 serial 6
-dnl Copyright (C) 2006, 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/stdbool.m4 b/m4/stdbool.m4
index 80d5559a..006ed52d 100644
--- a/m4/stdbool.m4
+++ b/m4/stdbool.m4
@@ -1,6 +1,6 @@
 # Check for stdbool.h that conforms to C99.
 
-dnl Copyright (C) 2002-2006, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/stddef_h.m4 b/m4/stddef_h.m4
index 5da8ab1e..c555e295 100644
--- a/m4/stddef_h.m4
+++ b/m4/stddef_h.m4
@@ -1,6 +1,6 @@
 dnl A placeholder for POSIX 2008 <stddef.h>, for platforms that have issues.
 # stddef_h.m4 serial 4
-dnl Copyright (C) 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/stdint.m4 b/m4/stdint.m4
index 27cdcdb9..1981d9db 100644
--- a/m4/stdint.m4
+++ b/m4/stdint.m4
@@ -1,5 +1,5 @@
 # stdint.m4 serial 43
-dnl Copyright (C) 2001-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/stdint_h.m4 b/m4/stdint_h.m4
index 511ab4e9..7fc2ce9a 100644
--- a/m4/stdint_h.m4
+++ b/m4/stdint_h.m4
@@ -1,5 +1,5 @@
 # stdint_h.m4 serial 9
-dnl Copyright (C) 1997-2004, 2006, 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 1997-2004, 2006, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4
index ebade067..d15913a3 100644
--- a/m4/stdio_h.m4
+++ b/m4/stdio_h.m4
@@ -1,5 +1,5 @@
 # stdio_h.m4 serial 43
-dnl Copyright (C) 2007-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4
index 79103bc7..03b448b9 100644
--- a/m4/stdlib_h.m4
+++ b/m4/stdlib_h.m4
@@ -1,5 +1,5 @@
-# stdlib_h.m4 serial 41
-dnl Copyright (C) 2007-2013 Free Software Foundation, Inc.
+# stdlib_h.m4 serial 42
+dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -22,7 +22,7 @@ AC_DEFUN([gl_STDLIB_H],
     ]], [_Exit atoll canonicalize_file_name getloadavg getsubopt grantpt
     initstate initstate_r mkdtemp mkostemp mkostemps mkstemp mkstemps
     posix_openpt ptsname ptsname_r random random_r realpath rpmatch
-    setenv setstate setstate_r srandom srandom_r
+    secure_getenv setenv setstate setstate_r srandom srandom_r
     strtod strtoll strtoull unlockpt unsetenv])
 ])
 
@@ -60,6 +60,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
   GNULIB_REALLOC_POSIX=0; AC_SUBST([GNULIB_REALLOC_POSIX])
   GNULIB_REALPATH=0;      AC_SUBST([GNULIB_REALPATH])
   GNULIB_RPMATCH=0;       AC_SUBST([GNULIB_RPMATCH])
+  GNULIB_SECURE_GETENV=0; AC_SUBST([GNULIB_SECURE_GETENV])
   GNULIB_SETENV=0;        AC_SUBST([GNULIB_SETENV])
   GNULIB_STRTOD=0;        AC_SUBST([GNULIB_STRTOD])
   GNULIB_STRTOLL=0;       AC_SUBST([GNULIB_STRTOLL])
@@ -88,6 +89,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
   HAVE_RANDOM_R=1;           AC_SUBST([HAVE_RANDOM_R])
   HAVE_REALPATH=1;           AC_SUBST([HAVE_REALPATH])
   HAVE_RPMATCH=1;            AC_SUBST([HAVE_RPMATCH])
+  HAVE_SECURE_GETENV=1;      AC_SUBST([HAVE_SECURE_GETENV])
   HAVE_SETENV=1;             AC_SUBST([HAVE_SETENV])
   HAVE_DECL_SETENV=1;        AC_SUBST([HAVE_DECL_SETENV])
   HAVE_STRTOD=1;             AC_SUBST([HAVE_STRTOD])
diff --git a/m4/stpcpy.m4 b/m4/stpcpy.m4
index 41fcb0e5..966ba951 100644
--- a/m4/stpcpy.m4
+++ b/m4/stpcpy.m4
@@ -1,5 +1,5 @@
 # stpcpy.m4 serial 8
-dnl Copyright (C) 2002, 2007, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2007, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/stpncpy.m4 b/m4/stpncpy.m4
index 09f09f64..7f1222c9 100644
--- a/m4/stpncpy.m4
+++ b/m4/stpncpy.m4
@@ -1,5 +1,5 @@
 # stpncpy.m4 serial 16
-dnl Copyright (C) 2002-2003, 2005-2007, 2009-2013 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2007, 2009-2014 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/strchrnul.m4 b/m4/strchrnul.m4
deleted file mode 100644
index b59eda9d..00000000
--- a/m4/strchrnul.m4
+++ /dev/null
@@ -1,50 +0,0 @@
-# strchrnul.m4 serial 9
-dnl Copyright (C) 2003, 2007, 2009-2013 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_FUNC_STRCHRNUL],
-[
-  dnl Persuade glibc <string.h> to declare strchrnul().
-  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
-
-  AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
-  AC_CHECK_FUNCS([strchrnul])
-  if test $ac_cv_func_strchrnul = no; then
-    HAVE_STRCHRNUL=0
-  else
-    AC_CACHE_CHECK([whether strchrnul works],
-      [gl_cv_func_strchrnul_works],
-      [AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-#include <string.h> /* for strchrnul */
-]], [[const char *buf = "a";
-      return strchrnul (buf, 'b') != buf + 1;
-    ]])],
-        [gl_cv_func_strchrnul_works=yes],
-        [gl_cv_func_strchrnul_works=no],
-        [dnl Cygwin 1.7.9 introduced strchrnul, but it was broken until 1.7.10
-         AC_EGREP_CPP([Lucky user],
-           [
-#if defined __CYGWIN__
- #include <cygwin/version.h>
- #if CYGWIN_VERSION_DLL_COMBINED > CYGWIN_VERSION_DLL_MAKE_COMBINED (1007, 9)
-  Lucky user
- #endif
-#else
-  Lucky user
-#endif
-           ],
-           [gl_cv_func_strchrnul_works="guessing yes"],
-           [gl_cv_func_strchrnul_works="guessing no"])
-        ])
-      ])
-    case "$gl_cv_func_strchrnul_works" in
-      *yes) ;;
-      *) REPLACE_STRCHRNUL=1 ;;
-    esac
-  fi
-])
-
-# Prerequisites of lib/strchrnul.c.
-AC_DEFUN([gl_PREREQ_STRCHRNUL], [:])
diff --git a/m4/strdup.m4 b/m4/strdup.m4
index efe2d571..1681a30e 100644
--- a/m4/strdup.m4
+++ b/m4/strdup.m4
@@ -1,6 +1,6 @@
 # strdup.m4 serial 13
 
-dnl Copyright (C) 2002-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/strerror.m4 b/m4/strerror.m4
index 3989844b..0763fe3b 100644
--- a/m4/strerror.m4
+++ b/m4/strerror.m4
@@ -1,5 +1,5 @@
 # strerror.m4 serial 17
-dnl Copyright (C) 2002, 2007-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/strerror_r.m4 b/m4/strerror_r.m4
index 341f9836..e13a369b 100644
--- a/m4/strerror_r.m4
+++ b/m4/strerror_r.m4
@@ -1,5 +1,5 @@
 # strerror_r.m4 serial 15
-dnl Copyright (C) 2002, 2007-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/strftime.m4 b/m4/strftime.m4
index b31f4956..0ba3dd07 100644
--- a/m4/strftime.m4
+++ b/m4/strftime.m4
@@ -1,6 +1,6 @@
 # serial 33
 
-# Copyright (C) 1996-1997, 1999-2007, 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-1997, 1999-2007, 2009-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/m4/string_h.m4 b/m4/string_h.m4
index cc5fbbb3..64e683f9 100644
--- a/m4/string_h.m4
+++ b/m4/string_h.m4
@@ -1,6 +1,6 @@
 # Configure a GNU-like replacement for <string.h>.
 
-# Copyright (C) 2007-2013 Free Software Foundation, Inc.
+# Copyright (C) 2007-2014 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/m4/strncat.m4 b/m4/strncat.m4
index 8198b4cc..8ea522ed 100644
--- a/m4/strncat.m4
+++ b/m4/strncat.m4
@@ -1,5 +1,5 @@
 # strncat.m4 serial 2
-dnl Copyright (C) 2002-2004, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2004, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/strndup.m4 b/m4/strndup.m4
index a1f82743..55df0399 100644
--- a/m4/strndup.m4
+++ b/m4/strndup.m4
@@ -1,5 +1,5 @@
 # strndup.m4 serial 21
-dnl Copyright (C) 2002-2003, 2005-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2003, 2005-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/strnlen.m4 b/m4/strnlen.m4
index eae82b77..94317f8a 100644
--- a/m4/strnlen.m4
+++ b/m4/strnlen.m4
@@ -1,5 +1,5 @@
 # strnlen.m4 serial 13
-dnl Copyright (C) 2002-2003, 2005-2007, 2009-2013 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2007, 2009-2014 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/strpbrk.m4 b/m4/strpbrk.m4
index 85488bab..f2fc15e4 100644
--- a/m4/strpbrk.m4
+++ b/m4/strpbrk.m4
@@ -1,5 +1,5 @@
 # strpbrk.m4 serial 6
-dnl Copyright (C) 2002-2003, 2007, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2003, 2007, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/strsignal.m4 b/m4/strsignal.m4
index 8f6ea2e9..b9dfeca2 100644
--- a/m4/strsignal.m4
+++ b/m4/strsignal.m4
@@ -1,5 +1,5 @@
 # strsignal.m4 serial 8
-dnl Copyright (C) 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/strstr.m4 b/m4/strstr.m4
index c486bdb0..33cd7a32 100644
--- a/m4/strstr.m4
+++ b/m4/strstr.m4
@@ -1,5 +1,5 @@
 # strstr.m4 serial 16
-dnl Copyright (C) 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/strtod.m4 b/m4/strtod.m4
index 06ba60f9..bbe99bc7 100644
--- a/m4/strtod.m4
+++ b/m4/strtod.m4
@@ -1,5 +1,5 @@
 # strtod.m4 serial 22
-dnl Copyright (C) 2002-2003, 2006-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2003, 2006-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/strtoimax.m4 b/m4/strtoimax.m4
index bee93b21..71137816 100644
--- a/m4/strtoimax.m4
+++ b/m4/strtoimax.m4
@@ -1,5 +1,5 @@
-# strtoimax.m4 serial 13
-dnl Copyright (C) 2002-2004, 2006, 2009-2013 Free Software Foundation, Inc.
+# strtoimax.m4 serial 14
+dnl Copyright (C) 2002-2004, 2006, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -15,7 +15,7 @@ AC_DEFUN([gl_FUNC_STRTOIMAX],
     HAVE_DECL_STRTOIMAX=0
   fi
 
-  if test $ac_cv_func_strtoimax = yes; then
+  if test "$ac_cv_func_strtoimax" = yes; then
     HAVE_STRTOIMAX=1
     dnl On AIX 5.1, strtoimax() fails for values outside the 'int' range.
     AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
@@ -72,6 +72,10 @@ int main ()
       *no) REPLACE_STRTOIMAX=1 ;;
     esac
   else
+    if test "$ac_cv_have_decl_strtoimax" = yes; then
+      # HP-UX 11.11 has "#define strtoimax(...) ..." but no function.
+      REPLACE_STRTOIMAX=1
+    fi
     HAVE_STRTOIMAX=0
   fi
 ])
diff --git a/m4/strtoll.m4 b/m4/strtoll.m4
index 0cf4eb50..9f2a1777 100644
--- a/m4/strtoll.m4
+++ b/m4/strtoll.m4
@@ -1,5 +1,5 @@
 # strtoll.m4 serial 7
-dnl Copyright (C) 2002, 2004, 2006, 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2004, 2006, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/strtoull.m4 b/m4/strtoull.m4
index ad386da6..f4d5f616 100644
--- a/m4/strtoull.m4
+++ b/m4/strtoull.m4
@@ -1,5 +1,5 @@
 # strtoull.m4 serial 7
-dnl Copyright (C) 2002, 2004, 2006, 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2004, 2006, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/strtoumax.m4 b/m4/strtoumax.m4
index 6a6aeb5d..fc582fcf 100644
--- a/m4/strtoumax.m4
+++ b/m4/strtoumax.m4
@@ -1,5 +1,5 @@
-# strtoumax.m4 serial 11
-dnl Copyright (C) 2002-2004, 2006, 2009-2013 Free Software Foundation, Inc.
+# strtoumax.m4 serial 12
+dnl Copyright (C) 2002-2004, 2006, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -11,7 +11,12 @@ AC_DEFUN([gl_FUNC_STRTOUMAX],
   dnl On OSF/1 5.1 with cc, this function is declared but not defined.
   AC_CHECK_FUNCS_ONCE([strtoumax])
   AC_CHECK_DECLS_ONCE([strtoumax])
-  if test "$ac_cv_have_decl_strtoumax" != yes; then
+  if test "$ac_cv_have_decl_strtoumax" = yes; then
+    if test "$ac_cv_func_strtoumax" != yes; then
+      # HP-UX 11.11 has "#define strtoimax(...) ..." but no function.
+      REPLACE_STRTOUMAX=1
+    fi
+  else
     HAVE_DECL_STRTOUMAX=0
   fi
 ])
diff --git a/m4/symlink.m4 b/m4/symlink.m4
index 82ede2a4..de4924b4 100644
--- a/m4/symlink.m4
+++ b/m4/symlink.m4
@@ -1,7 +1,7 @@
 # serial 6
 # See if we need to provide symlink replacement.
 
-dnl Copyright (C) 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/symlinkat.m4 b/m4/symlinkat.m4
index 779295ff..db7ad487 100644
--- a/m4/symlinkat.m4
+++ b/m4/symlinkat.m4
@@ -1,7 +1,7 @@
 # serial 5
 # See if we need to provide symlinkat replacement.
 
-dnl Copyright (C) 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/sys_ioctl_h.m4 b/m4/sys_ioctl_h.m4
index 8705a4cd..16542319 100644
--- a/m4/sys_ioctl_h.m4
+++ b/m4/sys_ioctl_h.m4
@@ -1,5 +1,5 @@
 # sys_ioctl_h.m4 serial 10
-dnl Copyright (C) 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/sys_resource_h.m4 b/m4/sys_resource_h.m4
index 7bb5b61f..f0650991 100644
--- a/m4/sys_resource_h.m4
+++ b/m4/sys_resource_h.m4
@@ -1,5 +1,5 @@
 # sys_resource_h.m4 serial 2
-dnl Copyright (C) 2012-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2012-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/sys_select_h.m4 b/m4/sys_select_h.m4
index 49623285..1a502b4e 100644
--- a/m4/sys_select_h.m4
+++ b/m4/sys_select_h.m4
@@ -1,5 +1,5 @@
 # sys_select_h.m4 serial 20
-dnl Copyright (C) 2006-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/sys_socket_h.m4 b/m4/sys_socket_h.m4
index 94863776..114d8281 100644
--- a/m4/sys_socket_h.m4
+++ b/m4/sys_socket_h.m4
@@ -1,5 +1,5 @@
 # sys_socket_h.m4 serial 23
-dnl Copyright (C) 2005-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/sys_stat_h.m4 b/m4/sys_stat_h.m4
index 6dd3d99b..eaa7642b 100644
--- a/m4/sys_stat_h.m4
+++ b/m4/sys_stat_h.m4
@@ -1,5 +1,5 @@
 # sys_stat_h.m4 serial 28   -*- Autoconf -*-
-dnl Copyright (C) 2006-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/sys_time_h.m4 b/m4/sys_time_h.m4
index 0ac71ac5..5c79300f 100644
--- a/m4/sys_time_h.m4
+++ b/m4/sys_time_h.m4
@@ -1,7 +1,7 @@
 # Configure a replacement for <sys/time.h>.
 # serial 8
 
-# Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/m4/sys_types_h.m4 b/m4/sys_types_h.m4
index 6132727f..9748905b 100644
--- a/m4/sys_types_h.m4
+++ b/m4/sys_types_h.m4
@@ -1,10 +1,10 @@
-# sys_types_h.m4 serial 4
-dnl Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# sys_types_h.m4 serial 5
+dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
-AC_DEFUN([gl_SYS_TYPES_H],
+AC_DEFUN_ONCE([gl_SYS_TYPES_H],
 [
   AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS])
   gl_NEXT_HEADERS([sys/types.h])
diff --git a/m4/sys_uio_h.m4 b/m4/sys_uio_h.m4
index c75cbbd0..ba6b4b5e 100644
--- a/m4/sys_uio_h.m4
+++ b/m4/sys_uio_h.m4
@@ -1,5 +1,5 @@
 # sys_uio_h.m4 serial 1
-dnl Copyright (C) 2011-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/sys_utsname_h.m4 b/m4/sys_utsname_h.m4
index 1ad7a435..5e75e2d4 100644
--- a/m4/sys_utsname_h.m4
+++ b/m4/sys_utsname_h.m4
@@ -1,5 +1,5 @@
 # sys_utsname_h.m4 serial 8
-dnl Copyright (C) 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/sys_wait_h.m4 b/m4/sys_wait_h.m4
index a6c59d6f..a9676c29 100644
--- a/m4/sys_wait_h.m4
+++ b/m4/sys_wait_h.m4
@@ -1,5 +1,5 @@
 # sys_wait_h.m4 serial 6
-dnl Copyright (C) 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/tempname.m4 b/m4/tempname.m4
index a6e42dce..1594e1f5 100644
--- a/m4/tempname.m4
+++ b/m4/tempname.m4
@@ -1,6 +1,6 @@
 #serial 5
 
-# Copyright (C) 2006-2007, 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2007, 2009-2014 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/m4/termios_h.m4 b/m4/termios_h.m4
index d712be3c..f8e44589 100644
--- a/m4/termios_h.m4
+++ b/m4/termios_h.m4
@@ -1,5 +1,5 @@
 # termios_h.m4 serial 4
-dnl Copyright (C) 2010-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2010-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/thread.m4 b/m4/thread.m4
index 86da5c57..b6d602a6 100644
--- a/m4/thread.m4
+++ b/m4/thread.m4
@@ -1,5 +1,5 @@
 # thread.m4 serial 3
-dnl Copyright (C) 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/threadlib.m4 b/m4/threadlib.m4
index 26bdeb58..a8817026 100644
--- a/m4/threadlib.m4
+++ b/m4/threadlib.m4
@@ -1,5 +1,5 @@
 # threadlib.m4 serial 10 (gettext-0.18.2)
-dnl Copyright (C) 2005-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/time_h.m4 b/m4/time_h.m4
index 3b839005..9852778f 100644
--- a/m4/time_h.m4
+++ b/m4/time_h.m4
@@ -1,8 +1,8 @@
 # Configure a more-standard replacement for <time.h>.
 
-# Copyright (C) 2000-2001, 2003-2007, 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2001, 2003-2007, 2009-2014 Free Software Foundation, Inc.
 
-# serial 7
+# serial 8
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -106,4 +106,13 @@ AC_DEFUN([gl_HEADER_TIME_H_DEFAULTS],
   REPLACE_MKTIME=GNULIB_PORTCHECK;       AC_SUBST([REPLACE_MKTIME])
   REPLACE_NANOSLEEP=GNULIB_PORTCHECK;    AC_SUBST([REPLACE_NANOSLEEP])
   REPLACE_TIMEGM=GNULIB_PORTCHECK;       AC_SUBST([REPLACE_TIMEGM])
+
+  dnl Hack so that the time module doesn't depend on the sys_time module.
+  dnl First, default GNULIB_GETTIMEOFDAY to 0 if sys_time is absent.
+  : ${GNULIB_GETTIMEOFDAY=0};            AC_SUBST([GNULIB_GETTIMEOFDAY])
+  dnl Second, it's OK to not use GNULIB_PORTCHECK for REPLACE_GMTIME
+  dnl and REPLACE_LOCALTIME, as portability to Solaris 2.6 and earlier
+  dnl is no longer a big deal.
+  REPLACE_GMTIME=0;                      AC_SUBST([REPLACE_GMTIME])
+  REPLACE_LOCALTIME=0;                   AC_SUBST([REPLACE_LOCALTIME])
 ])
diff --git a/m4/time_r.m4 b/m4/time_r.m4
index c388a831..7e15600f 100644
--- a/m4/time_r.m4
+++ b/m4/time_r.m4
@@ -1,6 +1,6 @@
 dnl Reentrant time functions: localtime_r, gmtime_r.
 
-dnl Copyright (C) 2003, 2006-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2006-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/timer_time.m4 b/m4/timer_time.m4
index ea018f9a..578ebe08 100644
--- a/m4/timer_time.m4
+++ b/m4/timer_time.m4
@@ -1,5 +1,5 @@
-# timer_time.m4 serial 2
-dnl Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# timer_time.m4 serial 3
+dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -11,7 +11,12 @@ AC_DEFUN([gl_TIMER_TIME],
   dnl Based on clock_time.m4. See details there.
 
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
-  AC_REQUIRE([gl_THREADLIB])
+
+  dnl Test whether the gnulib module 'threadlib' is in use.
+  dnl Some packages like Emacs use --avoid=threadlib.
+  dnl Write the symbol in such a way that it does not cause 'aclocal' to pick
+  dnl the threadlib.m4 file that is installed in $PREFIX/share/aclocal/.
+  m4_ifdef([gl_][THREADLIB], [AC_REQUIRE([gl_][THREADLIB])])
 
   LIB_TIMER_TIME=
   AC_SUBST([LIB_TIMER_TIME])
@@ -19,21 +24,21 @@ AC_DEFUN([gl_TIMER_TIME],
     AC_SEARCH_LIBS([timer_settime], [rt posix4],
                    [test "$ac_cv_search_timer_settime" = "none required" ||
                     LIB_TIMER_TIME=$ac_cv_search_timer_settime])
-    dnl GLIBC uses threads to emulate posix timers when kernel support
-    dnl is not available (like Linux < 2.6 or when used with kFreeBSD)
-    dnl Now the pthread lib is linked automatically in the normal case,
-    dnl but when linking statically, it needs to be explicitly specified.
-    AC_EGREP_CPP([Thread],
-      [
-#include <features.h>
-#ifdef __GNU_LIBRARY__
- #if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || (__GLIBC__ > 2)) \
-     && !defined __UCLIBC__
-  Thread emulation available
- #endif
-#endif
-      ],
-      [LIB_TIMER_TIME="$LIB_TIMER_TIME $LIBMULTITHREAD"])
+    m4_ifdef([gl_][THREADLIB],
+      [dnl GLIBC uses threads to emulate posix timers when kernel support
+       dnl is not available (like Linux < 2.6 or when used with kFreeBSD)
+       dnl Now the pthread lib is linked automatically in the normal case,
+       dnl but when linking statically, it needs to be explicitly specified.
+       AC_EGREP_CPP([Thread],
+         [#include <features.h>
+          #ifdef __GNU_LIBRARY__
+           #if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || (__GLIBC__ > 2)) \
+               && !(__UCLIBC__ && __HAS_NO_THREADS__)
+            Thread emulation available
+           #endif
+          #endif
+         ],
+         [LIB_TIMER_TIME="$LIB_TIMER_TIME $LIBMULTITHREAD"])])
     AC_CHECK_FUNCS([timer_settime])
   LIBS=$gl_saved_libs
 ])
diff --git a/m4/timespec.m4 b/m4/timespec.m4
index 399404b5..2ce654fe 100644
--- a/m4/timespec.m4
+++ b/m4/timespec.m4
@@ -1,6 +1,6 @@
 #serial 15
 
-# Copyright (C) 2000-2001, 2003-2007, 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2001, 2003-2007, 2009-2014 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/m4/tls.m4 b/m4/tls.m4
index 8ef1913b..ebd86ec9 100644
--- a/m4/tls.m4
+++ b/m4/tls.m4
@@ -1,5 +1,5 @@
 # tls.m4 serial 2 (gettext-0.18)
-dnl Copyright (C) 2005, 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/tm_gmtoff.m4 b/m4/tm_gmtoff.m4
index 55e7ea32..486351b4 100644
--- a/m4/tm_gmtoff.m4
+++ b/m4/tm_gmtoff.m4
@@ -1,5 +1,5 @@
 # tm_gmtoff.m4 serial 3
-dnl Copyright (C) 2002, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/tzset.m4 b/m4/tzset.m4
index 54af5e06..cef0d02e 100644
--- a/m4/tzset.m4
+++ b/m4/tzset.m4
@@ -1,6 +1,6 @@
 # serial 7
 
-# Copyright (C) 2003, 2007, 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2007, 2009-2014 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/m4/uname.m4 b/m4/uname.m4
index e8f1c817..0136f2e6 100644
--- a/m4/uname.m4
+++ b/m4/uname.m4
@@ -1,5 +1,5 @@
 # uname.m4 serial 11
-dnl Copyright (C) 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/ungetc.m4 b/m4/ungetc.m4
index 4e3577a8..6cdf625d 100644
--- a/m4/ungetc.m4
+++ b/m4/ungetc.m4
@@ -1,5 +1,5 @@
 # ungetc.m4 serial 3
-dnl Copyright (C) 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/unicodeio.m4 b/m4/unicodeio.m4
index b71770af..5257745a 100644
--- a/m4/unicodeio.m4
+++ b/m4/unicodeio.m4
@@ -1,5 +1,5 @@
 # unicodeio.m4 serial 2
-dnl Copyright (C) 2002-2003, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2003, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/unistd-safer.m4 b/m4/unistd-safer.m4
index e65c3c92..96cb7df7 100644
--- a/m4/unistd-safer.m4
+++ b/m4/unistd-safer.m4
@@ -1,5 +1,5 @@
 #serial 9
-dnl Copyright (C) 2002, 2005-2006, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2005-2006, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/unistd_h.m4 b/m4/unistd_h.m4
index 32dcfa58..1fa197e6 100644
--- a/m4/unistd_h.m4
+++ b/m4/unistd_h.m4
@@ -1,5 +1,5 @@
-# unistd_h.m4 serial 66
-dnl Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# unistd_h.m4 serial 67
+dnl Copyright (C) 2006-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -160,6 +160,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
   REPLACE_FTRUNCATE=0;    AC_SUBST([REPLACE_FTRUNCATE])
   REPLACE_GETCWD=0;       AC_SUBST([REPLACE_GETCWD])
   REPLACE_GETDOMAINNAME=0; AC_SUBST([REPLACE_GETDOMAINNAME])
+  REPLACE_GETDTABLESIZE=0; AC_SUBST([REPLACE_GETDTABLESIZE])
   REPLACE_GETLOGIN_R=0;   AC_SUBST([REPLACE_GETLOGIN_R])
   REPLACE_GETGROUPS=0;    AC_SUBST([REPLACE_GETGROUPS])
   REPLACE_GETPAGESIZE=0;  AC_SUBST([REPLACE_GETPAGESIZE])
diff --git a/m4/unlink-busy.m4 b/m4/unlink-busy.m4
index 72fe72ff..c45648d2 100644
--- a/m4/unlink-busy.m4
+++ b/m4/unlink-busy.m4
@@ -4,7 +4,7 @@ dnl From J. David Anglin.
 
 dnl HPUX and other systems can't unlink shared text that is being executed.
 
-# Copyright (C) 2000-2001, 2004, 2007, 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2001, 2004, 2007, 2009-2014 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/m4/unlink.m4 b/m4/unlink.m4
index b6b99d17..03cf8ae0 100644
--- a/m4/unlink.m4
+++ b/m4/unlink.m4
@@ -1,5 +1,5 @@
 # unlink.m4 serial 11
-dnl Copyright (C) 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/unlinkat.m4 b/m4/unlinkat.m4
index 32cfbc11..f5110aaa 100644
--- a/m4/unlinkat.m4
+++ b/m4/unlinkat.m4
@@ -1,5 +1,5 @@
 # unlinkat.m4 serial 2
-dnl Copyright (C) 2004-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/unlinkdir.m4 b/m4/unlinkdir.m4
index b555fc96..99797af5 100644
--- a/m4/unlinkdir.m4
+++ b/m4/unlinkdir.m4
@@ -1,6 +1,6 @@
 # serial 7
 
-# Copyright (C) 2005-2007, 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2005-2007, 2009-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/m4/unlocked-io.m4 b/m4/unlocked-io.m4
index f1462068..6a1dec27 100644
--- a/m4/unlocked-io.m4
+++ b/m4/unlocked-io.m4
@@ -1,6 +1,6 @@
 # unlocked-io.m4 serial 15
 
-# Copyright (C) 1998-2006, 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 1998-2006, 2009-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/m4/uptime.m4 b/m4/uptime.m4
index 0b125c63..47a90a14 100644
--- a/m4/uptime.m4
+++ b/m4/uptime.m4
@@ -1,6 +1,6 @@
 # serial 8
 
-# Copyright (C) 1996, 1999-2001, 2004, 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1999-2001, 2004, 2009-2014 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/m4/userspec.m4 b/m4/userspec.m4
index abf6bad0..99ffd0bd 100644
--- a/m4/userspec.m4
+++ b/m4/userspec.m4
@@ -1,5 +1,5 @@
 # serial 11
-dnl Copyright (C) 2002-2006, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/usleep.m4 b/m4/usleep.m4
deleted file mode 100644
index e430672d..00000000
--- a/m4/usleep.m4
+++ /dev/null
@@ -1,45 +0,0 @@
-# usleep.m4 serial 3
-dnl Copyright (C) 2009-2013 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This macro intentionally does not check for select or nanosleep;
-dnl both of those modules can require external libraries.
-AC_DEFUN([gl_FUNC_USLEEP],
-[
-  AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
-  dnl usleep was required in POSIX 2001, but dropped as obsolete in
-  dnl POSIX 2008; therefore, it is not always exposed in headers.
-  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-  AC_CHECK_FUNCS_ONCE([usleep])
-  AC_CHECK_TYPE([useconds_t], [],
-    [AC_DEFINE([useconds_t], [unsigned int], [Define to an unsigned 32-bit
-      type if <sys/types.h> lacks this type.])])
-  if test $ac_cv_func_usleep = no; then
-    HAVE_USLEEP=0
-  else
-    dnl POSIX allows implementations to reject arguments larger than
-    dnl 999999, but GNU guarantees it will work.
-    AC_CACHE_CHECK([whether usleep allows large arguments],
-      [gl_cv_func_usleep_works],
-      [AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-#include <unistd.h>
-]], [[return !!usleep (1000000);]])],
-        [gl_cv_func_usleep_works=yes], [gl_cv_func_usleep_works=no],
-        [case "$host_os" in
-                   # Guess yes on glibc systems.
-           *-gnu*) gl_cv_func_usleep_works="guessing yes" ;;
-                   # If we don't know, assume the worst.
-           *)      gl_cv_func_usleep_works="guessing no" ;;
-         esac
-        ])])
-    case "$gl_cv_func_usleep_works" in
-      *yes) ;;
-      *)
-        REPLACE_USLEEP=1
-        ;;
-    esac
-  fi
-])
diff --git a/m4/utimbuf.m4 b/m4/utimbuf.m4
index 3c9df414..822a063c 100644
--- a/m4/utimbuf.m4
+++ b/m4/utimbuf.m4
@@ -1,6 +1,6 @@
 # serial 9
 
-# Copyright (C) 1998-2001, 2003-2004, 2007, 2009-2013 Free Software Foundation,
+# Copyright (C) 1998-2001, 2003-2004, 2007, 2009-2014 Free Software Foundation,
 # Inc.
 #
 # This file is free software; the Free Software Foundation
diff --git a/m4/utimecmp.m4 b/m4/utimecmp.m4
index 4a85e01f..112add39 100644
--- a/m4/utimecmp.m4
+++ b/m4/utimecmp.m4
@@ -1,5 +1,5 @@
 #serial 4
-dnl Copyright (C) 2004-2007, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2007, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/utimens.m4 b/m4/utimens.m4
index 10fe2a68..c9c44cf2 100644
--- a/m4/utimens.m4
+++ b/m4/utimens.m4
@@ -1,4 +1,4 @@
-dnl Copyright (C) 2003-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/utimensat.m4 b/m4/utimensat.m4
index 396b8357..9cb97c98 100644
--- a/m4/utimensat.m4
+++ b/m4/utimensat.m4
@@ -1,7 +1,7 @@
 # serial 5
 # See if we need to provide utimensat replacement.
 
-dnl Copyright (C) 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/utimes.m4 b/m4/utimes.m4
index f8b19285..c3613578 100644
--- a/m4/utimes.m4
+++ b/m4/utimes.m4
@@ -1,7 +1,7 @@
 # Detect some bugs in glibc's implementation of utimes.
 # serial 3
 
-dnl Copyright (C) 2003-2005, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2005, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/vasnprintf.m4 b/m4/vasnprintf.m4
index d730e435..106192ea 100644
--- a/m4/vasnprintf.m4
+++ b/m4/vasnprintf.m4
@@ -1,5 +1,5 @@
 # vasnprintf.m4 serial 36
-dnl Copyright (C) 2002-2004, 2006-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2004, 2006-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/vasprintf-posix.m4 b/m4/vasprintf-posix.m4
index c2b0901b..b1935d74 100644
--- a/m4/vasprintf-posix.m4
+++ b/m4/vasprintf-posix.m4
@@ -1,5 +1,5 @@
 # vasprintf-posix.m4 serial 13
-dnl Copyright (C) 2007-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/vasprintf.m4 b/m4/vasprintf.m4
index c214ff11..c76c99c3 100644
--- a/m4/vasprintf.m4
+++ b/m4/vasprintf.m4
@@ -1,5 +1,5 @@
 # vasprintf.m4 serial 6
-dnl Copyright (C) 2002-2003, 2006-2007, 2009-2013 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2006-2007, 2009-2014 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/version-etc.m4 b/m4/version-etc.m4
index 5dbef8e5..667f9f82 100644
--- a/m4/version-etc.m4
+++ b/m4/version-etc.m4
@@ -1,5 +1,5 @@
 # version-etc.m4 serial 1
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/m4/vfprintf-posix.m4 b/m4/vfprintf-posix.m4
index 47a4645b..b89ecfdd 100644
--- a/m4/vfprintf-posix.m4
+++ b/m4/vfprintf-posix.m4
@@ -1,5 +1,5 @@
 # vfprintf-posix.m4 serial 14
-dnl Copyright (C) 2007-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/vprintf-posix.m4 b/m4/vprintf-posix.m4
index 8a4eb19c..f707afa1 100644
--- a/m4/vprintf-posix.m4
+++ b/m4/vprintf-posix.m4
@@ -1,5 +1,5 @@
 # vprintf-posix.m4 serial 3
-dnl Copyright (C) 2007-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/wait-process.m4 b/m4/wait-process.m4
deleted file mode 100644
index 693bebf8..00000000
--- a/m4/wait-process.m4
+++ /dev/null
@@ -1,12 +0,0 @@
-# wait-process.m4 serial 6
-dnl Copyright (C) 2003, 2008-2013 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_WAIT_PROCESS],
-[
-  dnl Prerequisites of lib/wait-process.c.
-  AC_REQUIRE([gt_TYPE_SIG_ATOMIC_T])
-  AC_CHECK_FUNCS([waitid])
-])
diff --git a/m4/waitpid.m4 b/m4/waitpid.m4
deleted file mode 100644
index 26ce890e..00000000
--- a/m4/waitpid.m4
+++ /dev/null
@@ -1,14 +0,0 @@
-# waitpid.m4 serial 2
-dnl Copyright (C) 2010-2013 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_FUNC_WAITPID],
-[
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  HAVE_WAITPID=1
-  case $host_os in
-    mingw*) HAVE_WAITPID=0 ;;
-  esac
-])
diff --git a/m4/warnings.m4 b/m4/warnings.m4
index 4b2ac385..43156f45 100644
--- a/m4/warnings.m4
+++ b/m4/warnings.m4
@@ -1,5 +1,5 @@
-# warnings.m4 serial 7
-dnl Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# warnings.m4 serial 11
+dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -25,19 +25,36 @@ m4_ifdef([AS_VAR_APPEND],
 AC_DEFUN([gl_COMPILER_OPTION_IF],
 [AS_VAR_PUSHDEF([gl_Warn], [gl_cv_warn_[]_AC_LANG_ABBREV[]_$1])dnl
 AS_VAR_PUSHDEF([gl_Flags], [_AC_LANG_PREFIX[]FLAGS])dnl
+AS_LITERAL_IF([$1],
+  [m4_pushdef([gl_Positive], m4_bpatsubst([$1], [^-Wno-], [-W]))],
+  [gl_positive="$1"
+case $gl_positive in
+  -Wno-*) gl_positive=-W`expr "X$gl_positive" : 'X-Wno-\(.*\)'` ;;
+esac
+m4_pushdef([gl_Positive], [$gl_positive])])dnl
 AC_CACHE_CHECK([whether _AC_LANG compiler handles $1], m4_defn([gl_Warn]), [
   gl_save_compiler_FLAGS="$gl_Flags"
-  gl_AS_VAR_APPEND(m4_defn([gl_Flags]), [" $1"])
-  AC_COMPILE_IFELSE([m4_default([$4], [AC_LANG_PROGRAM([])])],
-                    [AS_VAR_SET(gl_Warn, [yes])],
-                    [AS_VAR_SET(gl_Warn, [no])])
+  gl_AS_VAR_APPEND(m4_defn([gl_Flags]),
+    [" $gl_unknown_warnings_are_errors ]m4_defn([gl_Positive])["])
+  AC_LINK_IFELSE([m4_default([$4], [AC_LANG_PROGRAM([])])],
+                 [AS_VAR_SET(gl_Warn, [yes])],
+                 [AS_VAR_SET(gl_Warn, [no])])
   gl_Flags="$gl_save_compiler_FLAGS"
 ])
 AS_VAR_IF(gl_Warn, [yes], [$2], [$3])
+m4_popdef([gl_Positive])dnl
 AS_VAR_POPDEF([gl_Flags])dnl
 AS_VAR_POPDEF([gl_Warn])dnl
 ])
 
+# gl_UNKNOWN_WARNINGS_ARE_ERRORS
+# ------------------------------
+# Clang doesn't complain about unknown warning options unless one also
+# specifies -Wunknown-warning-option -Werror.  Detect this.
+AC_DEFUN([gl_UNKNOWN_WARNINGS_ARE_ERRORS],
+[gl_COMPILER_OPTION_IF([-Werror -Wunknown-warning-option],
+   [gl_unknown_warnings_are_errors='-Wunknown-warning-option -Werror'],
+   [gl_unknown_warnings_are_errors=])])
 
 # gl_WARN_ADD(OPTION, [VARIABLE = WARN_CFLAGS],
 #             [PROGRAM = AC_LANG_PROGRAM()])
@@ -47,7 +64,8 @@ AS_VAR_POPDEF([gl_Warn])dnl
 #
 # If VARIABLE is a variable name, AC_SUBST it.
 AC_DEFUN([gl_WARN_ADD],
-[gl_COMPILER_OPTION_IF([$1],
+[AC_REQUIRE([gl_UNKNOWN_WARNINGS_ARE_ERRORS])
+gl_COMPILER_OPTION_IF([$1],
   [gl_AS_VAR_APPEND(m4_if([$2], [], [[WARN_CFLAGS]], [[$2]]), [" $1"])],
   [],
   [$3])
diff --git a/m4/wchar_h.m4 b/m4/wchar_h.m4
index bedb15a4..85db9528 100644
--- a/m4/wchar_h.m4
+++ b/m4/wchar_h.m4
@@ -1,6 +1,6 @@
 dnl A placeholder for ISO C99 <wchar.h>, for platforms that have issues.
 
-dnl Copyright (C) 2007-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/wchar_t.m4 b/m4/wchar_t.m4
index e1e1e699..839a04c1 100644
--- a/m4/wchar_t.m4
+++ b/m4/wchar_t.m4
@@ -1,5 +1,5 @@
 # wchar_t.m4 serial 4 (gettext-0.18.2)
-dnl Copyright (C) 2002-2003, 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2003, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/wcrtomb.m4 b/m4/wcrtomb.m4
index f56b5bae..844ef6a8 100644
--- a/m4/wcrtomb.m4
+++ b/m4/wcrtomb.m4
@@ -1,5 +1,5 @@
 # wcrtomb.m4 serial 11
-dnl Copyright (C) 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/wcswidth.m4 b/m4/wcswidth.m4
index c61e5e3b..0e4b1c2e 100644
--- a/m4/wcswidth.m4
+++ b/m4/wcswidth.m4
@@ -1,5 +1,5 @@
 # wcswidth.m4 serial 2
-dnl Copyright (C) 2011-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/wctob.m4 b/m4/wctob.m4
index edc0d79f..41f57afc 100644
--- a/m4/wctob.m4
+++ b/m4/wctob.m4
@@ -1,5 +1,5 @@
 # wctob.m4 serial 10
-dnl Copyright (C) 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/wctomb.m4 b/m4/wctomb.m4
index 7deba922..3b4ff797 100644
--- a/m4/wctomb.m4
+++ b/m4/wctomb.m4
@@ -1,5 +1,5 @@
 # wctomb.m4 serial 2
-dnl Copyright (C) 2011-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/wctype_h.m4 b/m4/wctype_h.m4
index 82ada0ee..3fac0ee0 100644
--- a/m4/wctype_h.m4
+++ b/m4/wctype_h.m4
@@ -2,7 +2,7 @@
 
 dnl A placeholder for ISO C99 <wctype.h>, for platforms that lack it.
 
-dnl Copyright (C) 2006-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/wcwidth.m4 b/m4/wcwidth.m4
index 740f81ee..f00a6cca 100644
--- a/m4/wcwidth.m4
+++ b/m4/wcwidth.m4
@@ -1,5 +1,5 @@
 # wcwidth.m4 serial 23
-dnl Copyright (C) 2006-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/wint_t.m4 b/m4/wint_t.m4
index d7cd3db9..9b07b070 100644
--- a/m4/wint_t.m4
+++ b/m4/wint_t.m4
@@ -1,5 +1,5 @@
 # wint_t.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2003, 2007-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/write-any-file.m4 b/m4/write-any-file.m4
index 7327d404..5b2baff6 100644
--- a/m4/write-any-file.m4
+++ b/m4/write-any-file.m4
@@ -1,6 +1,6 @@
 # Determine whether we can write any file.
 
-# Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/m4/write.m4 b/m4/write.m4
index a79b2cc9..820dd4f7 100644
--- a/m4/write.m4
+++ b/m4/write.m4
@@ -1,5 +1,5 @@
 # write.m4 serial 5
-dnl Copyright (C) 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/xalloc.m4 b/m4/xalloc.m4
index 64ca7014..b6a2257b 100644
--- a/m4/xalloc.m4
+++ b/m4/xalloc.m4
@@ -1,5 +1,5 @@
 # xalloc.m4 serial 18
-dnl Copyright (C) 2002-2006, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/xattr.m4 b/m4/xattr.m4
index a40e4512..9fc1b134 100644
--- a/m4/xattr.m4
+++ b/m4/xattr.m4
@@ -1,7 +1,7 @@
 # xattr.m4 - check for Extended Attributes (Linux)
 # serial 3
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/m4/xgetcwd.m4 b/m4/xgetcwd.m4
index c972029d..c6057fdc 100644
--- a/m4/xgetcwd.m4
+++ b/m4/xgetcwd.m4
@@ -1,5 +1,5 @@
 #serial 8
-dnl Copyright (C) 2002-2006, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/xnanosleep.m4 b/m4/xnanosleep.m4
index 7a706d97..c23d9ada 100644
--- a/m4/xnanosleep.m4
+++ b/m4/xnanosleep.m4
@@ -1,5 +1,5 @@
 #serial 5
-dnl Copyright (C) 2005-2006, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/xsize.m4 b/m4/xsize.m4
index 8ea9f2cd..3af23ec7 100644
--- a/m4/xsize.m4
+++ b/m4/xsize.m4
@@ -1,5 +1,5 @@
 # xsize.m4 serial 5
-dnl Copyright (C) 2003-2004, 2008-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2004, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/xstrndup.m4 b/m4/xstrndup.m4
index 4a9330bb..8521f0ed 100644
--- a/m4/xstrndup.m4
+++ b/m4/xstrndup.m4
@@ -1,5 +1,5 @@
 # xstrndup.m4 serial 2
-dnl Copyright (C) 2003, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/xstrtod.m4 b/m4/xstrtod.m4
index b7267da5..94d1c45f 100644
--- a/m4/xstrtod.m4
+++ b/m4/xstrtod.m4
@@ -1,5 +1,5 @@
 #serial 8
-dnl Copyright (C) 2002-2003, 2005-2006, 2009-2013 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2006, 2009-2014 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/xstrtol.m4 b/m4/xstrtol.m4
index d52ee112..03419d81 100644
--- a/m4/xstrtol.m4
+++ b/m4/xstrtol.m4
@@ -1,5 +1,5 @@
 #serial 11
-dnl Copyright (C) 2002-2007, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2007, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/xvasprintf.m4 b/m4/xvasprintf.m4
index 772dcc86..c2d3ec7f 100644
--- a/m4/xvasprintf.m4
+++ b/m4/xvasprintf.m4
@@ -1,5 +1,5 @@
 # xvasprintf.m4 serial 2
-dnl Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/yesno.m4 b/m4/yesno.m4
index e89584a5..89fdbf2c 100644
--- a/m4/yesno.m4
+++ b/m4/yesno.m4
@@ -1,5 +1,5 @@
 # yesno.m4 serial 6
-dnl Copyright (C) 2002-2003, 2005-2006, 2009-2013 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2006, 2009-2014 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/yield.m4 b/m4/yield.m4
index 8197766d..e9442a62 100644
--- a/m4/yield.m4
+++ b/m4/yield.m4
@@ -1,5 +1,5 @@
 # yield.m4 serial 2
-dnl Copyright (C) 2005-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/maint.mk b/maint.mk
index 2b454a15..e5a37829 100644
--- a/maint.mk
+++ b/maint.mk
@@ -2,7 +2,7 @@
 # This Makefile fragment tries to be general-purpose enough to be
 # used by many projects via the gnulib maintainer-makefile module.
 
-## Copyright (C) 2001-2013 Free Software Foundation, Inc.
+## Copyright (C) 2001-2014 Free Software Foundation, Inc.
 ##
 ## 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
@@ -21,13 +21,6 @@
 # ME := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
 ME := maint.mk
 
-# Diagnostic for continued use of deprecated variable.
-# Remove in 2013
-ifneq ($(build_aux),)
- $(error "$(ME): \
-set $$(_build-aux) relative to $$(srcdir) instead of $$(build_aux)")
-endif
-
 # Helper variables.
 _empty =
 _sp = $(_empty) $(_empty)
@@ -76,7 +69,7 @@ _dot_escaped_srcdir = $(subst .,\.,$(srcdir))
 ifeq ($(srcdir),.)
   _prepend_srcdir_prefix =
 else
-  _prepend_srcdir_prefix = | sed 's|^|$(srcdir)/|'
+  _prepend_srcdir_prefix = | $(SED) 's|^|$(srcdir)/|'
 endif
 
 # In order to be able to consistently filter "."-relative names,
@@ -85,7 +78,7 @@ endif
 _sc_excl = \
   $(or $(exclude_file_name_regexp--$@),^$$)
 VC_LIST_EXCEPT = \
-  $(VC_LIST) | sed 's|^$(_dot_escaped_srcdir)/||' \
+  $(VC_LIST) | $(SED) 's|^$(_dot_escaped_srcdir)/||' \
 	| if test -f $(srcdir)/.x-$@; then grep -vEf $(srcdir)/.x-$@; \
 	  else grep -Ev -e "$${VC_LIST_EXCEPT_DEFAULT-ChangeLog}"; fi \
 	| grep -Ev -e '($(VC_LIST_ALWAYS_EXCLUDE_REGEX)|$(_sc_excl))' \
@@ -155,11 +148,12 @@ export LC_ALL = C
 ## Sanity checks.  ##
 ## --------------- ##
 
+ifneq ($(_gl-Makefile),)
 _cfg_mk := $(wildcard $(srcdir)/cfg.mk)
 
 # Collect the names of rules starting with 'sc_'.
-syntax-check-rules := $(sort $(shell sed -n 's/^\(sc_[a-zA-Z0-9_-]*\):.*/\1/p' \
-			$(srcdir)/$(ME) $(_cfg_mk)))
+syntax-check-rules := $(sort $(shell $(SED) -n \
+   's/^\(sc_[a-zA-Z0-9_-]*\):.*/\1/p' $(srcdir)/$(ME) $(_cfg_mk)))
 .PHONY: $(syntax-check-rules)
 
 ifeq ($(shell $(VC_LIST) >/dev/null 2>&1; echo $$?),0)
@@ -196,6 +190,7 @@ local-check :=								\
     $(filter-out $(local-checks-to-skip), $(local-checks-available)))
 
 syntax-check: $(local-check)
+endif
 
 # _sc_search_regexp
 #
@@ -445,10 +440,10 @@ sc_require_config_h:
 # You must include <config.h> before including any other header file.
 # This can possibly be via a package-specific header, if given by cfg.mk.
 sc_require_config_h_first:
-	@if $(VC_LIST_EXCEPT) | grep -l '\.c$$' > /dev/null; then	\
+	@if $(VC_LIST_EXCEPT) | grep '\.c$$' > /dev/null; then		\
 	  fail=0;							\
 	  for i in $$($(VC_LIST_EXCEPT) | grep '\.c$$'); do		\
-	    grep '^# *include\>' $$i | sed 1q				\
+	    grep '^# *include\>' $$i | $(SED) 1q			\
 		| grep -E '^# *include $(config_h_header)' > /dev/null	\
 	      || { echo $$i; fail=1; };					\
 	  done;								\
@@ -468,8 +463,8 @@ sc_prohibit_HAVE_MBRTOWC:
 # re: a regular expression that matches IFF something provided by $h is used.
 define _sc_header_without_use
   dummy=; : so we do not need a semicolon before each use;		\
-  h_esc=`echo '[<"]'"$$h"'[">]'|sed 's/\./\\\\./g'`;			\
-  if $(VC_LIST_EXCEPT) | grep -l '\.c$$' > /dev/null; then		\
+  h_esc=`echo '[<"]'"$$h"'[">]'|$(SED) 's/\./\\\\./g'`;			\
+  if $(VC_LIST_EXCEPT) | grep '\.c$$' > /dev/null; then			\
     files=$$(grep -l '^# *include '"$$h_esc"				\
 	     $$($(VC_LIST_EXCEPT) | grep '\.c$$')) &&			\
     grep -LE "$$re" $$files | grep . &&					\
@@ -591,7 +586,7 @@ sc_prohibit_root_dev_ino_without_use:
 
 sc_prohibit_openat_without_use:
 	@h='openat.h' \
-	re='\<(openat_(permissive|needs_fchdir|(save|restore)_fail)|l?(stat|ch(own|mod))at|(euid)?accessat)\>' \
+	re='\<(openat_(permissive|needs_fchdir|(save|restore)_fail)|l?(stat|ch(own|mod))at|(euid)?accessat|(FCHMOD|FCHOWN|STAT)AT_INLINE)\>' \
 	  $(_sc_header_without_use)
 
 # Prohibit the inclusion of c-ctype.h without an actual use.
@@ -716,7 +711,7 @@ sc_changelog:
 # Ensure that each .c file containing a "main" function also
 # calls set_program_name.
 sc_program_name:
-	@require='set_program_name *\(m?argv\[0\]\);'			\
+	@require='set_program_name *\(.*\);'				\
 	in_vc_files='\.c$$'						\
 	containing='\<main *('						\
 	halt='the above files do not call set_program_name'		\
@@ -789,7 +784,7 @@ sc_useless_cpp_parens:
 # #if HAVE_HEADER_H that you remove, be sure that your project explicitly
 # requires the gnulib module that guarantees the usability of that header.
 gl_assured_headers_ = \
-  cd $(gnulib_dir)/lib && echo *.in.h|sed 's/\.in\.h//g'
+  cd $(gnulib_dir)/lib && echo *.in.h|$(SED) 's/\.in\.h//g'
 
 # Convert the list of names to upper case, and replace each space with "|".
 az_ = abcdefghijklmnopqrstuvwxyz
@@ -809,7 +804,7 @@ sc_prohibit_always_true_header_tests:
 	  $(_sc_search_regexp)
 
 sc_prohibit_defined_have_decl_tests:
-	@prohibit='#[	 ]*if(n?def|.*\<defined)\>[	 (]+HAVE_DECL_'	\
+	@prohibit='(#[	 ]*ifn?def|\<defined)\>[	 (]+HAVE_DECL_'	\
 	halt='HAVE_DECL macros are always defined'			\
 	  $(_sc_search_regexp)
 
@@ -840,7 +835,7 @@ define def_sym_regex
 	      && perl -lne '$(gl_extract_significant_defines_)' $$f;	\
 	  done;								\
 	) | sort -u							\
-	  | sed 's/^/^ *# *(define|undef)  */;s/$$/\\>/'
+	  | $(SED) 's/^/^ *# *(define|undef)  */;s/$$/\\>/'
 endef
 
 # Don't define macros that we already get from gnulib header files.
@@ -1054,12 +1049,12 @@ sc_const_long_option:
 	  $(_sc_search_regexp)
 
 NEWS_hash =								\
-  $$(sed -n '/^\*.* $(PREV_VERSION_REGEXP) ([0-9-]*)/,$$p'		\
+  $$($(SED) -n '/^\*.* $(PREV_VERSION_REGEXP) ([0-9-]*)/,$$p'		\
        $(srcdir)/NEWS							\
      | perl -0777 -pe							\
 	's/^Copyright.+?Free\sSoftware\sFoundation,\sInc\.\n//ms'	\
      | md5sum -								\
-     | sed 's/ .*//')
+     | $(SED) 's/ .*//')
 
 # Ensure that we don't accidentally insert an entry into an old NEWS block.
 sc_immutable_NEWS:
@@ -1097,7 +1092,7 @@ sc_makefile_at_at_check:
 	  && { echo '$(ME): use $$(...), not @...@' 1>&2; exit 1; } || :
 
 news-check: NEWS
-	$(AM_V_GEN)if sed -n $(news-check-lines-spec)p $<		\
+	$(AM_V_GEN)if $(SED) -n $(news-check-lines-spec)p $<		\
 	    | grep -E $(news-check-regexp) >/dev/null; then		\
 	  :;								\
 	else								\
@@ -1146,7 +1141,7 @@ sc_po_check:
 	    files="$$files $$file";					\
 	  done;								\
 	  grep -E -l '$(_gl_translatable_string_re)' $$files		\
-	    | sed 's|^$(_dot_escaped_srcdir)/||' | sort -u > $@-2;	\
+	    | $(SED) 's|^$(_dot_escaped_srcdir)/||' | sort -u > $@-2;	\
 	  diff -u -L $(po_file) -L $(po_file) $@-1 $@-2			\
 	    || { printf '$(ME): '$(fix_po_file_diag) 1>&2; exit 1; };	\
 	  rm -f $@-1 $@-2;						\
@@ -1192,7 +1187,7 @@ sc_copyright_check:
 	in_vc_files=$(sample-test)					\
 	halt='out of date copyright in $(sample-test); update it'	\
 	  $(_sc_search_regexp)
-	@require='Copyright @copyright\{\} .*'$$(date +%Y)' Free'	\
+	@require='Copyright @copyright\{\} .*'$$(date +%Y)		\
 	in_vc_files=$(texi)						\
 	halt='out of date copyright in $(texi); update it'		\
 	  $(_sc_search_regexp)
@@ -1283,15 +1278,17 @@ vc-diff-check:
 rel-files = $(DIST_ARCHIVES)
 
 gnulib_dir ?= $(srcdir)/gnulib
-gnulib-version = $$(cd $(gnulib_dir) && git describe)
+gnulib-version = $$(cd $(gnulib_dir)				\
+                    && { git describe || git rev-parse --short=10 HEAD; } )
 bootstrap-tools ?= autoconf,automake,gnulib
 
+gpgv = $$(gpgv2 --version >/dev/null && echo gpgv2 || echo gpgv)
 # If it's not already specified, derive the GPG key ID from
 # the signed tag we've just applied to mark this release.
 gpg_key_ID ?=								\
   $$(cd $(srcdir)							\
      && git cat-file tag v$(VERSION)					\
-        | gpgv --status-fd 1 --keyring /dev/null - - 2>/dev/null	\
+        | $(gpgv) --status-fd 1 --keyring /dev/null - - 2>/dev/null	\
         | awk '/^\[GNUPG:\] ERRSIG / {print $$3; exit}')
 
 translation_project_ ?= coordinator@translationproject.org
@@ -1393,8 +1390,8 @@ public-submodule-commit:
 		&& git --version >/dev/null 2>&1; then			\
 	  cd $(srcdir) &&						\
 	  git submodule --quiet foreach					\
-	      test '"$$(git rev-parse "$$sha1")"'			\
-	      = '"$$(git merge-base origin "$$sha1")"'			\
+	      'test "$$(git rev-parse "$$sha1")"			\
+		  = "$$(git merge-base origin "$$sha1")"'		\
 	    || { echo '$(ME): found non-public submodule commit' >&2;	\
 		 exit 1; };						\
 	else								\
@@ -1424,6 +1421,7 @@ alpha beta stable: $(local-check) writable-files $(submodule-checks)
 	$(AM_V_at)$(MAKE) -s emit_upload_commands RELEASE_TYPE=$@
 
 release:
+	$(AM_V_GEN)$(MAKE) _version
 	$(AM_V_GEN)$(MAKE) $(release-type)
 
 # Override this in cfg.mk if you follow different procedures.
@@ -1508,7 +1506,7 @@ refresh-gnulib-patches:
 	  test -n "$$t" && gl=$$t;					\
 	fi;								\
 	for diff in $$(cd $$gl; git ls-files | grep '\.diff$$'); do	\
-	  b=$$(printf %s "$$diff"|sed 's/\.diff$$//');			\
+	  b=$$(printf %s "$$diff"|$(SED) 's/\.diff$$//');		\
 	  VERSION_CONTROL=none						\
 	    patch "$(gnulib_dir)/$$b" "$$gl/$$diff" || exit 1;		\
 	  ( cd $(gnulib_dir) || exit 1;					\
@@ -1527,7 +1525,8 @@ refresh-po:
 	wget --no-verbose --directory-prefix $(PODIR) --no-directories --recursive --level 1 --accept .po --accept .po.1 $(POURL) && \
 	echo 'en@boldquot' > $(PODIR)/LINGUAS && \
 	echo 'en@quot' >> $(PODIR)/LINGUAS && \
-	ls $(PODIR)/*.po | sed 's/\.po//;s,$(PODIR)/,,' | sort >> $(PODIR)/LINGUAS
+	ls $(PODIR)/*.po | $(SED) 's/\.po//;s,$(PODIR)/,,' | \
+	  sort >> $(PODIR)/LINGUAS
 
  # Running indent once is not idempotent, but running it twice is.
 INDENT_SOURCES ?= $(C_SOURCES)
@@ -1637,18 +1636,18 @@ _gl_tight_scope: $(bin_PROGRAMS)
 	       test -f $$f && d= || d=$(srcdir)/; echo $$d$$f; done`;	\
 	( printf '^%s$$\n' '__.*' $(_gl_TS_unmarked_extern_functions);	\
 	  grep -h -A1 '^extern .*[^;]$$' $$src				\
-	    | grep -vE '^(extern |--)' | sed 's/ .*//';			\
+	    | grep -vE '^(extern |--)' | $(SED) 's/ .*//';		\
 	  perl -lne							\
 	     '$(_gl_TS_function_match) and print "^$$1\$$"' $$hdr;	\
 	) | sort -u > $$t;						\
-	nm -e $(_gl_TS_obj_files) | sed -n 's/.* T //p'|grep -Ev -f $$t	\
+	nm -e $(_gl_TS_obj_files)|$(SED) -n 's/.* T //p'|grep -Ev -f $$t \
 	  && { echo the above functions should have static scope >&2;	\
 	       exit 1; } || : ;						\
 	( printf '^%s$$\n' '__.*' $(_gl_TS_unmarked_extern_vars);	\
 	  perl -lne '$(_gl_TS_var_match) and print "^$$1\$$"'		\
 		$$hdr $(_gl_TS_other_headers)				\
 	) | sort -u > $$t;						\
-	nm -e $(_gl_TS_obj_files) | sed -n 's/.* [BCDGRS] //p'		\
+	nm -e $(_gl_TS_obj_files) | $(SED) -n 's/.* [BCDGRS] //p'	\
             | sort -u | grep -Ev -f $$t					\
 	  && { echo the above variables should have static scope >&2;	\
 	       exit 1; } || :
diff --git a/man/chgrp.x b/man/chgrp.x
index 1ceeafc3..a61f3089 100644
--- a/man/chgrp.x
+++ b/man/chgrp.x
@@ -2,3 +2,5 @@
 chgrp \- change group ownership
 [DESCRIPTION]
 .\" Add any additional description here
+[SEE ALSO]
+chown(1), chown(2)
diff --git a/man/chmod.x b/man/chmod.x
index d9147a44..f26d7631 100644
--- a/man/chmod.x
+++ b/man/chmod.x
@@ -1,4 +1,4 @@
-'\" Copyright (C) 1998-2013 Free Software Foundation, Inc.
+'\" Copyright (C) 1998-2014 Free Software Foundation, Inc.
 '\"
 '\" This is free software.  You may redistribute copies of it under the terms
 '\" of the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
@@ -16,7 +16,7 @@ which can be either a symbolic representation of changes to make, or
 an octal number representing the bit pattern for the new mode bits.
 .PP
 The format of a symbolic mode is [\c
-\fBugoa\fP.\|.\|.][[\fB+-=\fP][\fIperms\fP.\|.\|.].\|.\|.],
+\fBugoa\fP.\|.\|.][[\fB-+=\fP][\fIperms\fP.\|.\|.].\|.\|.],
 where
 .I "perms"
 is either zero or more letters from the set
@@ -28,7 +28,7 @@ A combination of the letters \fBugoa\fP controls which users' access
 to the file will be changed: the user who owns it (\fBu\fP), other
 users in the file's group (\fBg\fP), other users not in the file's
 group (\fBo\fP), or all users (\fBa\fP).  If none of these are given,
-the effect is as if \fBa\fP were
+the effect is as if (\fBa\fP) were
 given, but bits that are set in the umask are not affected.
 .PP
 The operator \fB+\fP causes the selected file mode bits to be added to
diff --git a/man/chown.x b/man/chown.x
index 7ad591d4..96b0c237 100644
--- a/man/chown.x
+++ b/man/chown.x
@@ -1,4 +1,4 @@
-'\" Copyright (C) 1998-2013 Free Software Foundation, Inc.
+'\" Copyright (C) 1998-2014 Free Software Foundation, Inc.
 '\"
 '\" This is free software.  You may redistribute copies of it under the terms
 '\" of the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
diff --git a/man/coreutils.x b/man/coreutils.x
new file mode 100644
index 00000000..a7a48799
--- /dev/null
+++ b/man/coreutils.x
@@ -0,0 +1,4 @@
+[NAME]
+coreutils \- single binary for coreutils programs
+[DESCRIPTION]
+.\" Add any additional description here
diff --git a/man/df.x b/man/df.x
index 7e908ae0..6fd040ac 100644
--- a/man/df.x
+++ b/man/df.x
@@ -1,4 +1,4 @@
-'\" Copyright (C) 1998-2013 Free Software Foundation, Inc.
+'\" Copyright (C) 1998-2014 Free Software Foundation, Inc.
 '\"
 '\" This is free software.  You may redistribute copies of it under the terms
 '\" of the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
@@ -21,8 +21,7 @@ If an argument is the absolute file name of a disk device node containing a
 mounted file system,
 .B df
 shows the space available on that file system rather than on the
-file system containing the device node (which is always the root
-file system).  This version of
+file system containing the device node.  This version of
 .B df
 cannot show the space available on unmounted file systems, because on
 most kinds of systems doing so requires very nonportable intimate
diff --git a/man/du.x b/man/du.x
index 6e578c0c..7c302718 100644
--- a/man/du.x
+++ b/man/du.x
@@ -1,4 +1,4 @@
-'\" Copyright (C) 1998-2013 Free Software Foundation, Inc.
+'\" Copyright (C) 1998-2014 Free Software Foundation, Inc.
 '\"
 '\" This is free software.  You may redistribute copies of it under the terms
 '\" of the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
diff --git a/man/dummy-man b/man/dummy-man
index 30693762..dca2b678 100755
--- a/man/dummy-man
+++ b/man/dummy-man
@@ -30,6 +30,7 @@ while test $# -gt 0; do
     # in the makefile.
     --include=*);;
     --include) shift;;
+    --info-page=*);;
     -*) fatal_ "invalid or unrecognized help2man option '$1'";;
     --) shift; break;;
      *) break;;
diff --git a/man/help2man b/man/help2man
index 8e83f355..bfeb9897 100755
--- a/man/help2man
+++ b/man/help2man
@@ -1,12 +1,13 @@
 #!/usr/bin/perl -w
 
 # Generate a short man page from --help and --version output.
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009,
+# 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
-# This program is free software: you can redistribute it and/or modify
+# 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 3 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 3, 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
@@ -14,65 +15,51 @@
 # 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/>.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 # Written by Brendan O'Dea <bod@debian.org>
 # Available from ftp://ftp.gnu.org/gnu/help2man/
 
-use 5.005;
+use 5.008;
 use strict;
 use Getopt::Long;
 use Text::Tabs qw(expand);
 use POSIX qw(strftime setlocale LC_ALL);
-use locale;
 
 my $this_program = 'help2man';
-my $this_version = '1.35';
+my $this_version = '1.43.3';
 
-my $have_gettext;
-BEGIN {
-    eval {
-	require Locale::gettext;
-	Locale::gettext->import (qw(gettext textdomain));
-	$have_gettext = 1;
-    };
-
-    unless ($have_gettext)
-    {
-	*gettext = sub { $_[0] };
-	*textdomain = sub {};
-    }
+sub _ { $_[0] }
+sub configure_locale
+{
+    my $locale = shift;
+    die "$this_program: no locale support (Locale::gettext required)\n"
+	unless $locale eq 'C';
 }
 
-sub _ { gettext @_ }
+sub dec { $_[0] }
+sub enc { $_[0] }
+sub enc_user { $_[0] }
+sub kark { die +(sprintf shift, @_), "\n" }
 sub N_ { $_[0] }
 
-textdomain $this_program;
-{
-    my ($user_locale) = grep defined && length,
-	(map $ENV{$_}, qw(LANGUAGE LC_ALL LC_MESSAGES LANG)), 'C';
-
-    sub kark # die with message formatted in the invoking user's locale
-    {
-	setlocale LC_ALL, $user_locale;
-	my $fmt = gettext shift;
-	die +(sprintf $fmt, @_), "\n";
-    }
-}
+sub program_basename;
+sub get_option_value;
+sub convert_option;
 
-my $version_info = sprintf _(<<'EOT'), $this_program, $this_version;
+my $version_info = enc_user sprintf _(<<'EOT'), $this_program, $this_version;
 GNU %s %s
 
-Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
-Foundation, Inc.
+Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010,
+2011, 2012, 2013 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 Written by Brendan O'Dea <bod@debian.org>
 EOT
 
-my $help_info = sprintf _(<<'EOT'), $this_program, $this_program;
-'%s' generates a man page out of '--help' and '--version' output.
+my $help_info = enc_user sprintf _(<<'EOT'), $this_program, $this_program;
+`%s' generates a man page out of `--help' and `--version' output.
 
 Usage: %s [OPTION]... EXECUTABLE
 
@@ -81,19 +68,22 @@ Usage: %s [OPTION]... EXECUTABLE
  -m, --manual=TEXT       name of manual (User Commands, ...)
  -S, --source=TEXT       source of program (FSF, Debian, ...)
  -L, --locale=STRING     select locale (default "C")
- -i, --include=FILE      include material from 'FILE'
- -I, --opt-include=FILE  include material from 'FILE' if it exists
- -o, --output=FILE       send output to 'FILE'
+ -i, --include=FILE      include material from `FILE'
+ -I, --opt-include=FILE  include material from `FILE' if it exists
+ -o, --output=FILE       send output to `FILE'
  -p, --info-page=TEXT    name of Texinfo manual
  -N, --no-info           suppress pointer to Texinfo manual
+ -l, --libtool           exclude the `lt-' from the program name
      --help              print this help, then exit
      --version           print version number, then exit
 
-EXECUTABLE should accept '--help' and '--version' options although
-alternatives may be specified using:
+EXECUTABLE should accept `--help' and `--version' options and produce output on
+stdout although alternatives may be specified using:
 
  -h, --help-option=STRING     help option string
  -v, --version-option=STRING  version option string
+ --version-string=STRING      version string
+ --no-discard-stderr          include stderr when parsing option output
 
 Report bugs to <bug-help2man@gnu.org>.
 EOT
@@ -101,55 +91,63 @@ EOT
 my $section = 1;
 my $manual = '';
 my $source = '';
-my $locale = 'C';
 my $help_option = '--help';
 my $version_option = '--version';
-my ($opt_name, @opt_include, $opt_output, $opt_info, $opt_no_info);
+my $discard_stderr = 1;
+my ($opt_name, @opt_include, $opt_output, $opt_info, $opt_no_info, $opt_libtool,
+    $version_text);
 
 my %opt_def = (
     'n|name=s'		 => \$opt_name,
     's|section=s'	 => \$section,
     'm|manual=s'	 => \$manual,
     'S|source=s'	 => \$source,
-    'L|locale=s'	 => \$locale,
+    'L|locale=s'	 => sub { configure_locale pop },
     'i|include=s'	 => sub { push @opt_include, [ pop, 1 ] },
     'I|opt-include=s'	 => sub { push @opt_include, [ pop, 0 ] },
     'o|output=s'	 => \$opt_output,
     'p|info-page=s'	 => \$opt_info,
     'N|no-info'		 => \$opt_no_info,
+    'l|libtool'		 => \$opt_libtool,
+    'help'		 => sub { print $help_info; exit },
+    'version'		 => sub { print $version_info; exit },
     'h|help-option=s'	 => \$help_option,
     'v|version-option=s' => \$version_option,
+    'version-string=s'	 => \$version_text,
+    'discard-stderr!'	 => \$discard_stderr,
 );
 
 # Parse options.
 Getopt::Long::config('bundling');
-GetOptions (%opt_def,
-    help    => sub { print $help_info; exit },
-    version => sub { print $version_info; exit },
-) or die $help_info;
-
-die $help_info unless @ARGV == 1;
-
-die "$this_program: no locale support (Locale::gettext required)\n"
-    unless $locale eq 'C' or $have_gettext;
-
-# Set localization of date and executable's output.
-delete @ENV{qw(LANGUAGE LC_MESSAGES LANG)};
-setlocale LC_ALL, $ENV{LC_ALL} = $locale;
+die $help_info unless GetOptions %opt_def and @ARGV == 1;
 
 my %include = ();
+my %replace = ();
 my %append = ();
+my %append_match = ();
 my @include = (); # retain order given in include file
 
 # Process include file (if given).  Format is:
 #
-#   [section name]
-#   verbatim text
+#   Optional initial text, ignored.  May include lines starting with `-'
+#   which are processed as options.
+#
+#   [section]
+#   Verbatim text to be included in the named section.  By default at
+#   the start, but in the case of `name' and `synopsis' the content
+#   will replace the autogenerated contents.
+#
+#   [<section]
+#   Verbatim text to be inserted at the start of the named section.
 #
-# or
+#   [=section]
+#   Verbatim text to replace the named section.
+#
+#   [>section]
+#   Verbatim text to be appended to the end of the named section.
 #
 #   /pattern/
-#   verbatim text
+#   Verbatim text for inclusion below a paragraph matching `pattern'.
 #
 
 while (@opt_include)
@@ -157,27 +155,49 @@ while (@opt_include)
     my ($inc, $required) = @{shift @opt_include};
 
     next unless -f $inc or $required;
-    kark N_("%s: can't open '%s' (%s)"), $this_program, $inc, $!
+    kark N_("%s: can't open `%s' (%s)"), $this_program, $inc, $!
 	unless open INC, $inc;
 
     my $key;
-    my $hash = \%include;
+    my $hash;
 
     while (<INC>)
     {
+	# Convert input to internal Perl format, so that multibyte
+	# sequences are treated as single characters.
+	$_ = dec $_;
+
 	# [section]
-	if (/^\[([^]]+)\]/)
+	if (/^\[([^]]+)\]\s*$/)
 	{
 	    $key = uc $1;
 	    $key =~ s/^\s+//;
 	    $key =~ s/\s+$//;
 	    $hash = \%include;
-	    push @include, $key unless $include{$key};
+	    # Handle explicit [<section], [=section] and [>section]
+	    if ($key =~ s/^([<>=])\s*//)
+	    {
+		if    ($1 eq '>') { $hash = \%append; }
+		elsif ($1 eq '=') { $hash = \%replace; }
+	    }
+	    # NAME/SYNOPSIS replace by default
+	    elsif ($key eq _('NAME') or $key eq _('SYNOPSIS'))
+	    {
+		$hash = \%replace;
+	    }
+	    else
+	    {
+		$hash = \%include;
+	    }
+
+	    push @include, $key
+		unless $include{$key} or $replace{$key} or $append{$key};
+
 	    next;
 	}
 
 	# /pattern/
-	if (m!^/(.*)/([ims]*)!)
+	if (m!^/(.*)/([ims]*)\s*$!)
 	{
 	    my $pat = $2 ? "(?$2)$1" : $1;
 
@@ -189,7 +209,7 @@ while (@opt_include)
 		die "$inc:$.:$@";
 	    }
 
-	    $hash = \%append;
+	    $hash = \%append_match;
 	    next;
 	}
 
@@ -208,31 +228,31 @@ while (@opt_include)
 	    next;
 	}
 
-	$hash->{$key} ||= '';
 	$hash->{$key} .= $_;
     }
 
     close INC;
 
-    kark N_("%s: no valid information found in '%s'"), $this_program, $inc
+    kark N_("%s: no valid information found in `%s'"), $this_program, $inc
 	unless $key;
 }
 
 # Compress trailing blank lines.
-for my $hash (\(%include, %append))
+for my $hash (\(%include, %replace, %append, %append_match))
 {
     for (keys %$hash) { $hash->{$_} =~ s/\n+$/\n/ }
 }
 
 # Grab help and version info from executable.
-my ($help_text, $version_text) = map {
-    join '', map { s/ +$//; expand $_ } `$ARGV[0] $_ 2>/dev/null`
-	or kark N_("%s: can't get '%s' info from %s"), $this_program,
-	    $_, $ARGV[0]
-} $help_option, $version_option;
-
-my $date = strftime "%B %Y", localtime;
-(my $program = $ARGV[0]) =~ s!.*/!!;
+my $help_text   = get_option_value $ARGV[0], $help_option;
+$version_text ||= get_option_value $ARGV[0], $version_option;
+
+# Translators: the following message is a strftime(3) format string, which in
+# the English version expands to the month as a word and the full year.  It
+# is used on the footer of the generated manual pages.  If in doubt, you may
+# just use %x as the value (which should be the full locale-specific date).
+my $date = enc strftime _("%B %Y"), localtime;
+my $program = program_basename $ARGV[0];
 my $package = $program;
 my $version;
 
@@ -256,19 +276,19 @@ if ($opt_output)
 #
 # and separated from any copyright/author details by a blank line.
 
-($_, $version_text) = split /\n+/, $version_text, 2;
+($_, $version_text) = ((split /\n+/, $version_text, 2), '');
 
 if (/^(\S+) +\(((?:GNU|Free) +[^)]+)\) +(.*)/ or
     /^(\S+) +- *((?:GNU|Free) +\S+) +(.*)/)
 {
-    $program = $1;
+    $program = program_basename $1;
     $package = $2;
     $version = $3;
 }
 elsif (/^((?:GNU|Free) +)?(\S+) +(.*)/)
 {
-    $program = $2;
-    $package = $1 ? "$1$2" : $2;
+    $program = program_basename $2;
+    $package = $1 ? "$1$program" : $program;
     $version = $3;
 }
 else
@@ -276,18 +296,21 @@ else
     $version = $_;
 }
 
-$program =~ s!.*/!!;
-
-# No info for 'info' itself.
+# No info for `info' itself.
 $opt_no_info = 1 if $program eq 'info';
 
-for ($include{_('NAME')})
+if ($opt_name)
 {
-    if ($opt_name) # --name overrides --include contents.
-    {
-	$_ = "$program \\- $opt_name\n";
-    }
-    elsif ($_) # Use first name given as $program
+    # --name overrides --include contents.
+    $replace{_('NAME')} = "$program \\- $opt_name\n";
+}
+
+# Translators: "NAME", "SYNOPSIS" and other one or two word strings in all
+# upper case are manual page section headings.  The man(1) manual page in your
+# language, if available should provide the conventional translations.
+for ($replace{_('NAME')} || ($include{_('NAME')} ||= ''))
+{
+    if ($_) # Use first name given as $program
     {
 	$program = $1 if /^([^\s,]+)(?:,?\s*[^\s,\\-]+)*\s+\\?-/;
     }
@@ -307,19 +330,22 @@ unless ($manual)
 {
     for ($section)
     {
-	if (/^(1[Mm]|8)/) { $manual = _('System Administration Utilities') }
-	elsif (/^6/)	  { $manual = _('Games') }
-	else		  { $manual = _('User Commands') }
+	if (/^(1[Mm]|8)/) { $manual = enc _('System Administration Utilities') }
+	elsif (/^6/)	  { $manual = enc _('Games') }
+	else		  { $manual = enc _('User Commands') }
     }
 }
 
 # Extract usage clause(s) [if any] for SYNOPSIS.
+# Translators: "Usage" and "or" here are patterns (regular expressions) which
+# are used to match the usage synopsis in program output.  An example from cp
+# (GNU coreutils) which contains both strings:
+#  Usage: cp [OPTION]... [-T] SOURCE DEST
+#    or:  cp [OPTION]... SOURCE... DIRECTORY
+#    or:  cp [OPTION]... -t DIRECTORY SOURCE...
 my $PAT_USAGE = _('Usage');
 my $PAT_USAGE_CONT = _('or');
-if ($help_text =~ s/^($PAT_USAGE):
-                     ([ ]+(\S+))
-                     (.*)
-                     ((?:\n(?:[ ]{6}\1|[ ]*($PAT_USAGE_CONT):[ ]+\S).*)*)//omx)
+if ($help_text =~ s/^($PAT_USAGE):( +(\S+))(.*)((?:\n(?: {6}\1| *($PAT_USAGE_CONT): +\S).*)*)//om)
 {
     my @syn = $3 . $4;
 
@@ -334,6 +360,7 @@ if ($help_text =~ s/^($PAT_USAGE):
     {
 	$synopsis .= ".br\n" if $synopsis;
 	s!^\S*/!!;
+	s/^lt-// if $opt_libtool;
 	s/^(\S+) *//;
 	$synopsis .= ".B $1\n";
 	s/\s+$//;
@@ -349,7 +376,7 @@ if ($help_text =~ s/^($PAT_USAGE):
 	$synopsis .= "$_\n";
     }
 
-    $include{_('SYNOPSIS')} ||= $synopsis;
+    $include{_('SYNOPSIS')} .= $synopsis;
 }
 
 # Process text, initial section is DESCRIPTION.
@@ -370,17 +397,28 @@ s/^\./\x80/mg;
 s/^'/\x81/mg;
 s/\\/\x82/g;
 
-my $PAT_BUGS		= _('Report +(?:\w+ +)?bugs|Email +bug +reports +to');
-my $PAT_AUTHOR		= _('Written +by');
-my $PAT_OPTIONS		= _('Options');
-my $PAT_EXAMPLES	= _('Examples');
-my $PAT_FREE_SOFTWARE	= _('This +is +free +software');
-my $PAT_INFO		= _('For +complete +documentation');
+# Translators: patterns are used to match common program output. In the source
+# these strings are all of the form of "my $PAT_something = _('...');" and are
+# regular expressions.  If there is more than one commonly used string, you
+# may separate alternatives with "|".  Spaces in these expressions are written
+# as " +" to indicate that more than one space may be matched.  The string
+# "(?:[\\w-]+ +)?" in the bug reporting pattern is used to indicate an
+# optional word, so that either "Report bugs" or "Report _program_ bugs" will
+# be matched.
+my $PAT_BUGS          = _('Report +(?:[\w-]+ +)?bugs|Email +bug +reports +to');
+my $PAT_AUTHOR        = _('Written +by');
+my $PAT_OPTIONS       = _('Options');
+my $PAT_ENVIRONMENT   = _('Environment');
+my $PAT_FILES         = _('Files');
+my $PAT_EXAMPLES      = _('Examples');
+my $PAT_FREE_SOFTWARE = _('This +is +free +software');
 
 # Start a new paragraph (if required) for these.
-s/([^\n])\n($PAT_BUGS|$PAT_AUTHOR)/$1\n\n$2/og;
+s/([^\n])\n($PAT_BUGS|$PAT_AUTHOR) /$1\n\n$2 /og;
 
-sub convert_option;
+# Convert iso-8859-1 copyright symbol or (c) to nroff
+# character.
+s/^Copyright +(?:\xa9|\([Cc]\))/Copyright \\(co/mg;
 
 while (length)
 {
@@ -390,48 +428,30 @@ while (length)
 	$sect = _('OPTIONS');
 	next;
     }
-    elsif (s/^($PAT_EXAMPLES): *\n//o)
+    if (s/^($PAT_ENVIRONMENT): *\n//o)
     {
-	$sect = _('EXAMPLES');
+	$sect = _('ENVIRONMENT');
 	next;
     }
-    # Skip any texinfo reference as that's handled separately
-    if (s/($PAT_INFO).*\n//o)
+    if (s/^($PAT_FILES): *\n//o)
+    {
+	$sect = _('FILES');
+	next;
+    }
+    elsif (s/^($PAT_EXAMPLES): *\n//o)
     {
+	$sect = _('EXAMPLES');
 	next;
     }
 
     # Copyright section
-    if (/^Copyright +[(\xa9]/)
+    if (/^Copyright /)
     {
 	$sect = _('COPYRIGHT');
-	$include{$sect} ||= '';
-	$include{$sect} .= ".PP\n" if $include{$sect};
-
-	my $copy;
-	($copy, $_) = split /\n\n/, $_, 2;
-
-	for ($copy)
-	{
-	    # Add back newline
-	    s/\n*$/\n/;
-
-	    # Convert iso9959-1 copyright symbol or (c) to nroff
-	    # character.
-	    s/^Copyright +(?:\xa9|\([Cc]\))/Copyright \\(co/mg;
-
-	    # Insert line breaks before additional copyright messages
-	    # and the disclaimer.
-	    s/(.)\n(Copyright |$PAT_FREE_SOFTWARE)/$1\n.br\n$2/og;
-	}
-
-	$include{$sect} .= $copy;
-	$_ ||= '';
-	next;
     }
 
-    # Catch bug report text.
-    if (/^($PAT_BUGS) /o)
+    # Bug reporting section.
+    elsif (/^($PAT_BUGS) /o)
     {
 	$sect = _('REPORTING BUGS');
     }
@@ -449,7 +469,6 @@ while (length)
 	my $indent = $1;
 	my $prefix = $2;
 	my $break = '.IP';
-	$include{$sect} ||= '';
 	while (s/^$indent\Q$prefix\E(\S.*)\n*//)
 	{
 	    $include{$sect} .= "$break\n\\f(CW$prefix$1\\fR\n";
@@ -460,12 +479,11 @@ while (length)
     }
 
     my $matched = '';
-    $include{$sect} ||= '';
 
     # Sub-sections have a trailing colon and the second line indented.
     if (s/^(\S.*:) *\n / /)
     {
-	$matched .= $& if %append;
+	$matched .= $& if %append_match;
 	$include{$sect} .= qq(.SS "$1"\n);
     }
 
@@ -475,7 +493,7 @@ while (length)
     # Option with description.
     if (s/^( {1,10}([+-]\S.*?))(?:(  +(?!-))|\n( {20,}))(\S.*)\n//)
     {
-	$matched .= $& if %append;
+	$matched .= $& if %append_match;
 	$indent = length ($4 || "$1$3");
 	$content = ".TP\n\x84$2\n\x84$5\n";
 	unless ($4)
@@ -488,7 +506,7 @@ while (length)
     # Option without description.
     elsif (s/^ {1,10}([+-]\S.*)\n//)
     {
-	$matched .= $& if %append;
+	$matched .= $& if %append_match;
 	$content = ".HP\n\x84$1\n";
 	$indent = 80; # not continued
     }
@@ -496,7 +514,7 @@ while (length)
     # Indented paragraph with tag.
     elsif (s/^( +(\S.*?)  +)(\S.*)\n//)
     {
-	$matched .= $& if %append;
+	$matched .= $& if %append_match;
 	$indent = length $1;
 	$content = ".TP\n\x84$2\n\x84$3\n";
     }
@@ -504,7 +522,7 @@ while (length)
     # Indented paragraph.
     elsif (s/^( +)(\S.*)\n//)
     {
-	$matched .= $& if %append;
+	$matched .= $& if %append_match;
 	$indent = length $1;
 	$content = ".IP\n\x84$2\n";
     }
@@ -513,7 +531,7 @@ while (length)
     else
     {
 	s/(.*)\n//;
-	$matched .= $& if %append;
+	$matched .= $& if %append_match;
 	$content = ".PP\n" if $include{$sect};
 	$content .= "$1\n";
     }
@@ -521,8 +539,8 @@ while (length)
     # Append continuations.
     while ($indent ? s/^ {$indent}(\S.*)\n// : s/^(\S.*)\n//)
     {
-	$matched .= $& if %append;
-	$content .= "\x84$1\n"
+	$matched .= $& if %append_match;
+	$content .= "\x84$1\n";
     }
 
     # Move to next paragraph.
@@ -535,22 +553,52 @@ while (length)
 	s/\x84'/\x81/g;
 	s/\x84//g;
 
-	# Convert options.
-	s/(^| |\()(-[][\w=-]+)/$1 . convert_option $2/mge;
+	# Examples should be verbatim.
+	unless ($sect eq _('EXAMPLES'))
+	{
+	    # Convert options.
+	    s/(^|[ (])(-[][\w=-]+)/$1 . convert_option $2/mge;
+
+	    # Italicise filenames: /a/b, $VAR/c/d, ~/e/f
+	    s!
+		(^|[ (])			# space/punctuation before
+		(
+		    (?:\$\w+|~)?		# leading variable, or tilde
+		    (?:/\w(?:[\w.-]*\w)?)+	# path components
+		)
+		($|[ ,;.)])			# space/punctuation after
+	    !$1\\fI$2\\fP$3!xmg;
+	}
 
-	# Escape remaining hyphens
+	# Escape remaining hyphens.
 	s/-/\x83/g;
+
+	if ($sect eq _('COPYRIGHT'))
+	{
+	    # Insert line breaks before additional copyright messages
+	    # and the disclaimer.
+	    s/\n(Copyright |$PAT_FREE_SOFTWARE)/\n.br\n$1/og;
+	}
+	elsif ($sect eq _('REPORTING BUGS'))
+	{
+	    # Handle multi-line bug reporting sections of the form:
+	    #
+	    #   Report <program> bugs to <addr>
+	    #   GNU <package> home page: <url>
+	    #   ...
+	    s/\n([[:upper:]])/\n.br\n$1/g;
+	}
     }
 
     # Check if matched paragraph contains /pat/.
-    if (%append)
+    if (%append_match)
     {
-	for my $pat (keys %append)
+	for my $pat (keys %append_match)
 	{
 	    if ($matched =~ $pat)
 	    {
-		$content .= ".PP\n" unless $append{$pat} =~ /^\./;
-		$content .= $append{$pat};
+		$content .= ".PP\n" unless $append_match{$pat} =~ /^\./;
+		$content .= $append_match{$pat};
 	    }
 	}
     }
@@ -564,7 +612,6 @@ unless ($opt_no_info)
     my $info_page = $opt_info || $program;
 
     $sect = _('SEE ALSO');
-    $include{$sect} ||= '';
     $include{$sect} .= ".PP\n" if $include{$sect};
     $include{$sect} .= sprintf _(<<'EOT'), $program, $program, $info_page;
 The full documentation for
@@ -575,12 +622,24 @@ and
 .B %s
 programs are properly installed at your site, the command
 .IP
-.B info coreutils \(aq%s invocation\(aq
+.B info %s
 .PP
 should give you access to the complete manual.
 EOT
 }
 
+# Append additional text.
+while (my ($sect, $text) = each %append)
+{
+    $include{$sect} .= $append{$sect};
+}
+
+# Replace sections.
+while (my ($sect, $text) = each %replace)
+{
+    $include{$sect} = $replace{$sect};
+}
+
 # Output header.
 print <<EOT;
 .\\" DO NOT MODIFY THIS FILE!  It was generated by $this_program $this_version.
@@ -589,7 +648,7 @@ EOT
 
 # Section ordering.
 my @pre = (_('NAME'), _('SYNOPSIS'), _('DESCRIPTION'), _('OPTIONS'),
-    _('EXAMPLES'));
+    _('ENVIRONMENT'), _('FILES'), _('EXAMPLES'));
 
 my @post = (_('AUTHOR'), _('REPORTING BUGS'), _('COPYRIGHT'), _('SEE ALSO'));
 my $filter = join '|', @pre, @post;
@@ -599,9 +658,8 @@ for my $sect (@pre, (grep ! /^($filter)$/o, @include), @post)
 {
     if ($include{$sect})
     {
-	my $lsect = gettext $sect;
-	my $quote = $lsect =~ /\W/ ? '"' : '';
-	print ".SH $quote$lsect$quote\n";
+	my $quote = $sect =~ /\W/ ? '"' : '';
+	print enc ".SH $quote$sect$quote\n";
 
 	for ($include{$sect})
 	{
@@ -615,10 +673,7 @@ for my $sect (@pre, (grep ! /^($filter)$/o, @include), @post)
 	    # Convert some latin1 chars to troff equivalents
 	    s/\xa0/\\ /g; # non-breaking space
 
-	    $sect eq 'REPORTING BUGS'
-		and s/\n(.)/\n.br\n$1/g;
-
-	    print;
+	    print enc $_;
 	}
     }
 }
@@ -628,6 +683,38 @@ close STDOUT or kark N_("%s: error writing to %s (%s)"), $this_program,
 
 exit;
 
+# Get program basename, and strip libtool "lt-" prefix if required.
+sub program_basename
+{
+    local $_ = shift;
+    s!.*/!!;
+    s/^lt-// if $opt_libtool;
+    $_;
+}
+
+# Call program with given option and return results.
+sub get_option_value
+{
+    my ($prog, $opt) = @_;
+    my $stderr = $discard_stderr ? '/dev/null' : '&1';
+    my $value = join '',
+	map { s/ +$//; expand $_ }
+	map { dec $_ }
+	`$prog $opt 2>$stderr`;
+
+    unless ($value)
+    {
+	my $err = N_("%s: can't get `%s' info from %s%s");
+	my $extra = $discard_stderr
+	    ? "\n" . N_("Try `--no-discard-stderr' if option outputs to stderr")
+	    : '';
+
+	kark $err, $this_program, $opt, $prog, $extra;
+    }
+
+    $value;
+}
+
 # Convert option dashes to \- to stop nroff from hyphenating 'em, and
 # embolden.  Option arguments get italicised.
 sub convert_option
diff --git a/man/local.mk b/man/local.mk
index b5e6e21d..f4b213f7 100644
--- a/man/local.mk
+++ b/man/local.mk
@@ -1,7 +1,7 @@
 # Make coreutils man pages.				-*-Makefile-*-
 # This is included by the top-level Makefile.am.
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 # 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
@@ -35,13 +35,6 @@ ALL_MANS = $(man1_MANS) $(EXTRA_MANS)
 
 CLEANFILES += $(ALL_MANS)
 
-# This is required because we have subtle inter-directory dependencies:
-# in order to generate all man pages, even those for which we don't
-# install a binary, require that all programs be built at distribution
-# time.  We can't use 'dist-hook' for this, since it would run too late:
-# the manpages must be generated before the distdir is created and filled.
-$(EXTRA_MANS): $(all_programs)
-
 # This is a kludge to remove generated 'man/*.1' from a non-srcdir build.
 # Without this, "make distcheck" might fail.
 distclean-local:
@@ -59,114 +52,33 @@ mandeps += $(top_srcdir)/src/system.h
 
 $(ALL_MANS): $(mandeps)
 
-# Most prog.1 man pages depend on src/prog.  List the exceptions:
-# Note that dir and vdir are exceptions only if you consider the name
-# of the .c file upon which they depend: ls.c.
-man/arch.1:      src/uname
-man/dir.1:       src/dir
-man/install.1:   src/ginstall
-man/vdir.1:      src/vdir
-
-man/base64.1:    src/base64
-man/basename.1:  src/basename
-man/cat.1:       src/cat
-man/chcon.1:     src/chcon
-man/chgrp.1:     src/chgrp
-man/chmod.1:     src/chmod
-man/chown.1:     src/chown
-man/chroot.1:    src/chroot
-man/cksum.1:     src/cksum
-man/comm.1:      src/comm
-man/cp.1:        src/cp
-man/csplit.1:    src/csplit
-man/cut.1:       src/cut
-man/date.1:      src/date
-man/dd.1:        src/dd
-man/df.1:        src/df
-man/dircolors.1: src/dircolors
-man/dirname.1:   src/dirname
-man/du.1:        src/du
-man/echo.1:      src/echo
-man/env.1:       src/env
-man/expand.1:    src/expand
-man/expr.1:      src/expr
-man/factor.1:    src/factor
-man/false.1:     src/false
-man/fmt.1:       src/fmt
-man/fold.1:      src/fold
-man/groups.1:    src/groups
-man/head.1:      src/head
-man/hostid.1:    src/hostid
-man/hostname.1:  src/hostname
-man/id.1:        src/id
-man/join.1:      src/join
-man/kill.1:      src/kill
-man/link.1:      src/link
-man/ln.1:        src/ln
-man/logname.1:   src/logname
-man/ls.1:        src/ls
-man/md5sum.1:    src/md5sum
-man/mkdir.1:     src/mkdir
-man/mkfifo.1:    src/mkfifo
-man/mknod.1:     src/mknod
-man/mktemp.1:    src/mktemp
-man/mv.1:        src/mv
-man/nice.1:      src/nice
-man/nl.1:        src/nl
-man/nohup.1:     src/nohup
-man/nproc.1:     src/nproc
-man/numfmt.1:    src/numfmt
-man/od.1:        src/od
-man/paste.1:     src/paste
-man/pathchk.1:   src/pathchk
-man/pinky.1:     src/pinky
-man/pr.1:        src/pr
-man/printenv.1:  src/printenv
-man/printf.1:    src/printf
-man/ptx.1:       src/ptx
-man/pwd.1:       src/pwd
-man/readlink.1:  src/readlink
-man/realpath.1:  src/realpath
-man/rm.1:        src/rm
-man/rmdir.1:     src/rmdir
-man/runcon.1:    src/runcon
-man/seq.1:       src/seq
-man/sha1sum.1:   src/md5sum
-man/sha224sum.1: src/md5sum
-man/sha256sum.1: src/md5sum
-man/sha384sum.1: src/md5sum
-man/sha512sum.1: src/md5sum
-man/shred.1:     src/shred
-man/shuf.1:      src/shuf
-man/sleep.1:     src/sleep
-man/sort.1:      src/sort
-man/split.1:     src/split
-man/stat.1:      src/stat
-man/stdbuf.1:    src/stdbuf
-man/stty.1:      src/stty
-man/sum.1:       src/sum
-man/sync.1:      src/sync
-man/tac.1:       src/tac
-man/tail.1:      src/tail
-man/tee.1:       src/tee
-man/test.1:      src/test
-man/timeout.1:   src/timeout
-man/touch.1:     src/touch
-man/tr.1:        src/tr
-man/true.1:      src/true
-man/truncate.1:  src/truncate
-man/tsort.1:     src/tsort
-man/tty.1:       src/tty
-man/uname.1:     src/uname
-man/unexpand.1:  src/unexpand
-man/uniq.1:      src/uniq
-man/unlink.1:    src/unlink
-man/uptime.1:    src/uptime
-man/users.1:     src/users
-man/wc.1:        src/wc
-man/who.1:       src/who
-man/whoami.1:    src/whoami
-man/yes.1:       src/yes
+# Most prog.1 man pages depend on src/$prog, except when they are part of a
+# single binary, in which case they depend on src/coreutils. The exceptions
+# are handled by converting $name to $prog on the following code.
+# $(ALL_MANS) includes the $(EXTRA_MANS) so even the programs that are not
+# being installed will have the right dependency for the manpages.
+DISTCLEANFILES += man/dynamic-deps.mk
+man/dynamic-deps.mk: Makefile
+	$(AM_V_GEN)rm -f $@ $@-t
+	$(AM_V_at)for man in $(ALL_MANS); do				\
+		name=`echo "$$man"|sed 's|.*/||; s|\.1$$||'` || exit 1;	\
+		case $$name in						\
+		     arch) prog='uname';;				\
+		  install) prog='ginstall';;				\
+		     test) prog='[';;					\
+			*) prog=$$name;;				\
+		esac;							\
+		case " $(single_binary_progs) " in			\
+			*" $$prog "*)					\
+				echo $$man: src/coreutils$(EXEEXT);;	\
+			*)						\
+				echo $$man: src/$$prog$(EXEEXT);;	\
+		esac							\
+	done > $@-t							\
+	&& mv $@-t $@
+
+# Include the generated man dependencies.
+@AMDEP_TRUE@@am__include@ man/dynamic-deps.mk
 
 .x.1:
 	$(AM_V_GEN)name=`echo $@ | sed 's|.*/||; s|\.1$$||'` || exit 1;	\
@@ -174,9 +86,9 @@ man/yes.1:       src/yes
 ## creating 'install.1'.  Similarly, ensure that it uses the 'src/[' binary
 ## to create 'test.1'.
 	case $$name in							\
-	  install) prog='ginstall';;					\
-	     test) prog='[';;						\
-		*) prog=$$name;;					\
+	  install) prog='ginstall'; argv=$$name;;			\
+	     test) prog='['; argv='[';;					\
+		*) prog=$$name; argv=$$prog;;				\
 	esac;								\
 ## Note the use of $$t/$*, rather than just '$*' as in other packages.
 ## That is necessary to avoid failures for programs that are also shell
@@ -185,12 +97,16 @@ man/yes.1:       src/yes
 	  && t=$*.td							\
 	  && rm -rf $$t							\
 	  && $(MKDIR_P) $$t						\
-	  && (cd $$t && $(LN_S) '$(abs_top_builddir)/src/'$$prog $$name) \
+	  && (cd $$t && $(LN_S) '$(abs_top_builddir)/src/'$$prog $$argv) \
 	  && $(run_help2man)						\
 		     --source='$(PACKAGE_STRING)'			\
 		     --include=$(srcdir)/man/$$name.x			\
-		     --output=$$t/$$name.1 $$t/$$name			\
-	  && sed 's|$*\.td/||g' $$t/$$name.1 > $@-t			\
+		     --output=$$t/$$name.1 $$t/$$argv			\
+		     --info-page='coreutils \(aq'$$name' invocation\(aq' \
+	  && sed \
+	       -e 's|$*\.td/||g' \
+	       -e '/For complete documentation/d' \
+	       $$t/$$name.1 > $@-t			\
 	  && rm -rf $$t							\
-	  && chmod -w $@-t						\
+	  && chmod a-w $@-t						\
 	  && mv $@-t $@
diff --git a/man/rm.x b/man/rm.x
index 3eeb6c8d..6da82c42 100644
--- a/man/rm.x
+++ b/man/rm.x
@@ -1,4 +1,4 @@
-'\" Copyright (C) 1998-2013 Free Software Foundation, Inc.
+'\" Copyright (C) 1998-2014 Free Software Foundation, Inc.
 '\"
 '\" This is free software.  You may redistribute copies of it under the terms
 '\" of the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
diff --git a/man/stdbuf.x b/man/stdbuf.x
index 8a770413..0f50219b 100644
--- a/man/stdbuf.x
+++ b/man/stdbuf.x
@@ -1,4 +1,4 @@
-'\" Copyright (C) 2009-2013 Free Software Foundation, Inc.
+'\" Copyright (C) 2009-2014 Free Software Foundation, Inc.
 '\"
 '\" This is free software.  You may redistribute copies of it under the terms
 '\" of the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
diff --git a/old/fileutils/ChangeLog b/old/fileutils/ChangeLog
index a49fcbc2..410774b4 100644
--- a/old/fileutils/ChangeLog
+++ b/old/fileutils/ChangeLog
@@ -8390,7 +8390,7 @@
 
 	-----
 
-	Copyright (C) 1998-2013 Free Software Foundation, Inc.
+	Copyright (C) 1998-2014 Free Software Foundation, Inc.
 
 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
diff --git a/old/fileutils/ChangeLog-1997 b/old/fileutils/ChangeLog-1997
index 6c02d063..ccfd13d8 100644
--- a/old/fileutils/ChangeLog-1997
+++ b/old/fileutils/ChangeLog-1997
@@ -6158,7 +6158,7 @@ Mon Feb  5 17:29:20 1990  David J. MacKenzie  (djm at albert.ai.mit.edu)
 
 	-----
 
-	Copyright (C) 1990-2013 Free Software Foundation, Inc.
+	Copyright (C) 1990-2014 Free Software Foundation, Inc.
 
 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
diff --git a/old/fileutils/NEWS b/old/fileutils/NEWS
index 6d58c0fa..5ae36d97 100644
--- a/old/fileutils/NEWS
+++ b/old/fileutils/NEWS
@@ -749,7 +749,7 @@ Major changes in release 3.3:
 
 ========================================================================
 
-Copyright (C) 1992-2013 Free Software Foundation, Inc.
+Copyright (C) 1992-2014 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/old/sh-utils/ChangeLog b/old/sh-utils/ChangeLog
index 11579771..bb203b1e 100644
--- a/old/sh-utils/ChangeLog
+++ b/old/sh-utils/ChangeLog
@@ -4858,7 +4858,7 @@ Thu Nov 17 23:47:26 1994  Jim Meyering  (meyering@comco.com)
 
 	-----
 
-	Copyright (C) 1994-2013 Free Software Foundation, Inc.
+	Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
diff --git a/old/sh-utils/ChangeLog.0 b/old/sh-utils/ChangeLog.0
index 7b33d195..3e9261f6 100644
--- a/old/sh-utils/ChangeLog.0
+++ b/old/sh-utils/ChangeLog.0
@@ -1706,7 +1706,7 @@ Sat Oct 28 13:20:43 1989  David J. MacKenzie  (djm at spiff)
 
 	-----
 
-	Copyright (C) 1989-2013 Free Software Foundation, Inc.
+	Copyright (C) 1989-2014 Free Software Foundation, Inc.
 
 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
diff --git a/old/sh-utils/NEWS b/old/sh-utils/NEWS
index c4181d64..35895ef9 100644
--- a/old/sh-utils/NEWS
+++ b/old/sh-utils/NEWS
@@ -273,7 +273,7 @@ Major changes in release 1.7:
 
 ========================================================================
 
-Copyright (C) 1992-2013 Free Software Foundation, Inc.
+Copyright (C) 1992-2014 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/old/textutils/ChangeLog b/old/textutils/ChangeLog
index f389fdec..b2231a2f 100644
--- a/old/textutils/ChangeLog
+++ b/old/textutils/ChangeLog
@@ -8745,7 +8745,7 @@ Sat Dec 16 15:15:50 1989  David J. MacKenzie  (djm at hobbes.ai.mit.edu)
 
 	-----
 
-	Copyright (C) 1998-2013 Free Software Foundation, Inc.
+	Copyright (C) 1998-2014 Free Software Foundation, Inc.
 
 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
diff --git a/old/textutils/NEWS b/old/textutils/NEWS
index 44b0f172..26e7c700 100644
--- a/old/textutils/NEWS
+++ b/old/textutils/NEWS
@@ -461,7 +461,7 @@ Major changes in release 1.4:
 
 ========================================================================
 
-Copyright (C) 1992-2013 Free Software Foundation, Inc.
+Copyright (C) 1992-2014 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/po/ChangeLog-2007 b/po/ChangeLog-2007
index 33e1bdf9..1304763a 100644
--- a/po/ChangeLog-2007
+++ b/po/ChangeLog-2007
@@ -246,7 +246,7 @@
 
 	-----
 
-	Copyright (C) 2002-2013 Free Software Foundation, Inc.
+	Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 21617cc7..d380deed 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,5 @@
 # List of files which contain translatable strings.
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 
 # These are nominally temporary...
 lib/argmatch.c
@@ -18,16 +18,13 @@ lib/randread.c
 lib/regcomp.c
 lib/root-dev-ino.h
 lib/rpmatch.c
-lib/set-mode-acl.c
+lib/set-acl.c
 lib/siglist.h
-lib/spawn-pipe.c
 lib/strsignal.c
 lib/unicodeio.c
 lib/userspec.c
 lib/verror.c
 lib/version-etc.c
-lib/w32spawn.h
-lib/wait-process.c
 lib/xalloc-die.c
 lib/xfreopen.c
 lib/xmemcoll.c
@@ -48,6 +45,7 @@ src/chroot.c
 src/cksum.c
 src/comm.c
 src/copy.c
+src/coreutils.c
 src/cp.c
 src/csplit.c
 src/cut.c
@@ -109,8 +107,8 @@ src/remove.c
 src/rm.c
 src/rmdir.c
 src/runcon.c
+src/selinux.c
 src/seq.c
-src/setuidgid.c
 src/shred.c
 src/shuf.c
 src/sleep.c
diff --git a/po/af.gmo b/po/af.gmo
index d852563e..18647b81 100644
--- a/po/af.gmo
+++ b/po/af.gmo
diff --git a/po/af.po b/po/af.po
index 594215e1..5964bea2 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: coreutils 5.2.1\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
 "PO-Revision-Date: 2004-03-17 11:58+0200\n"
 "Last-Translator: Petri Jooste <rkwjpj@puk.ac.za>\n"
 "Language-Team: Afrikaans <i18n@af.org.za>\n"
@@ -35,77 +35,124 @@ msgstr "Geldige parameters is soos volg:"
 msgid "error closing file"
 msgstr "toevoerlêer %s word toegemaak"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "skryffout"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, fuzzy, c-format
 msgid "preserving permissions for %s"
 msgstr "toegangsregte vir %s word gestel"
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "Onbekende stelselfout"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "gewone leë lêer"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "gewone lêer"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "lêergids"
 
-#: lib/file-type.c:44
-msgid "block special file"
-msgstr "spesiale bloklêer"
-
-#: lib/file-type.c:47
-msgid "character special file"
-msgstr "spesiale karakterlêer"
-
-#: lib/file-type.c:50
-msgid "fifo"
-msgstr "fifo"
-
-#: lib/file-type.c:53
+#: lib/file-type.c:46
 msgid "symbolic link"
 msgstr "simboliese skakel"
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "sok"
-
-#: lib/file-type.c:59
+#: lib/file-type.c:52
 msgid "message queue"
 msgstr "boodskapwagtou"
 
-#: lib/file-type.c:62
+#: lib/file-type.c:55
 msgid "semaphore"
 msgstr "semafoor"
 
-#: lib/file-type.c:65
+#: lib/file-type.c:58
 msgid "shared memory object"
 msgstr "gedeeldegeheue-objek"
 
-#: lib/file-type.c:68
+#: lib/file-type.c:61
 #, fuzzy
 msgid "typed memory object"
 msgstr "gedeeldegeheue-objek"
 
-#: lib/file-type.c:70
+#: lib/file-type.c:66
+msgid "block special file"
+msgstr "spesiale bloklêer"
+
+#: lib/file-type.c:69
+msgid "character special file"
+msgstr "spesiale karakterlêer"
+
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr ""
+
+#: lib/file-type.c:75
+msgid "fifo"
+msgstr "fifo"
+
+#: lib/file-type.c:78
+msgid "door"
+msgstr ""
+
+#: lib/file-type.c:81
+#, fuzzy
+msgid "multiplexed block special file"
+msgstr "spesiale bloklêer"
+
+#: lib/file-type.c:84
+#, fuzzy
+msgid "multiplexed character special file"
+msgstr "spesiale karakterlêer"
+
+#: lib/file-type.c:87
+msgid "multiplexed file"
+msgstr ""
+
+#: lib/file-type.c:90
+#, fuzzy
+msgid "named file"
+msgstr "vreemde lêer"
+
+#: lib/file-type.c:93
+#, fuzzy
+msgid "network special file"
+msgstr "spesiale bloklêer"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr ""
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr ""
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr ""
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "sok"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr ""
+
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "vreemde lêer"
 
@@ -245,18 +292,18 @@ msgstr "%s: opsie `-W %s' laat nie 'n parameter toe nie\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: opsie `%s' benodig 'n parameter\n"
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr "kan nie toegangsregte van %s verander nie"
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "Kan nie lêergids %s skep nie."
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr "geheue uitgeput"
@@ -379,7 +426,7 @@ msgstr "fout in soektog met reëlmatige uitdrukking"
 msgid "Unmatched ) or \\)"
 msgstr ""
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 #, fuzzy
 msgid "No previous regular expression"
 msgstr "fout in soektog met reëlmatige uitdrukking"
@@ -405,7 +452,7 @@ msgstr "gebruik --no-preserve-root om hierdie veiligheidsnet ter syde te stel"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[jJ]"
 
@@ -415,11 +462,11 @@ msgstr "^[jJ]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, c-format
 msgid "setting permissions for %s"
 msgstr "toegangsregte vir %s word gestel"
@@ -566,18 +613,6 @@ msgstr "'open' het gefaal"
 msgid "Resource lost"
 msgstr ""
 
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, fuzzy, c-format
-msgid "cannot create pipe"
-msgstr "kan nie die pyp %s skep nie"
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, fuzzy, c-format
-msgid "%s subprocess failed"
-msgstr "%s: seek het misluk"
-
 #: lib/strsignal.c:114
 #, c-format
 msgid "Real-time signal %d"
@@ -791,7 +826,7 @@ msgstr ""
 "\n"
 "Rapporteer foute aan <%s>.\n"
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr ""
@@ -801,30 +836,10 @@ msgstr ""
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr ""
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr ""
 
-#: lib/w32spawn.h:43
-#, fuzzy, c-format
-msgid "_open_osfhandle failed"
-msgstr "'open' het gefaal"
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr ""
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr ""
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr ""
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr ""
@@ -847,7 +862,7 @@ msgstr "Onbekende stelselfout"
 msgid "failed to reopen %s with mode %s"
 msgstr "kon nie %s oopmaak nie"
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr "stringvergelyking het gefaal"
@@ -888,15 +903,11 @@ msgid "Simon Josefsson"
 msgstr ""
 
 #: src/base64.c:60
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
 "Base64 encode or decode FILE, or standard input, to standard output.\n"
 msgstr ""
-"Verander spasies in elke LÊER na keepkarakters, terwyl dit op "
-"standaardafvoer geskryf word.\n"
-"Met geen LÊER, of as LÊER gegee is as -, lees vanaf standaardtoevoer.\n"
-"\n"
 
 #: src/base64.c:67
 msgid ""
@@ -908,7 +919,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -925,48 +936,47 @@ msgid ""
 "from any other non-alphabet bytes in the encoded stream.\n"
 msgstr ""
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "leesfout"
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, fuzzy, c-format
 msgid "invalid input"
 msgstr "ongeldige gebruiker"
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, fuzzy, c-format
 msgid "invalid wrap size: %s"
 msgstr "ongeldige keepgrootte: %s"
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, fuzzy, c-format
 msgid "extra operand %s"
 msgstr "ekstra operand `%s'"
 
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, c-format
 msgid "closing standard input"
 msgstr "standaard-toevoer word nou toegemaak"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -997,8 +1007,8 @@ msgstr ""
 #: src/basename.c:60
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/basename.c:67
@@ -1012,32 +1022,31 @@ msgid ""
 "  %s -a any/str1 any/str2   -> \"str1\" followed by \"str2\"\n"
 msgstr ""
 
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, fuzzy, c-format
 msgid "missing operand"
 msgstr "lêerparameter ontbreek"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 msgid "Richard M. Stallman"
 msgstr ""
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1091,7 +1100,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr "kan nie ioctl uitvoer op `%s' nie"
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr "standaard-afvoer"
@@ -1108,14 +1117,14 @@ msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 msgid "Jim Meyering"
 msgstr ""
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, fuzzy, c-format
 msgid "failed to create security context: %s"
 msgstr "kon nie attribute van %s verkry nie"
@@ -1125,8 +1134,8 @@ msgstr "kon nie attribute van %s verkry nie"
 msgid "failed to set %s security context component to %s"
 msgstr ""
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, fuzzy, c-format
 msgid "failed to get security context of %s"
 msgstr "kon nie attribute van %s verkry nie"
@@ -1136,18 +1145,18 @@ msgstr "kon nie attribute van %s verkry nie"
 msgid "can't apply partial context to unlabeled file %s"
 msgstr ""
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, fuzzy, c-format
 msgid "failed to change context of %s to %s"
 msgstr "groep kon nie eienaarskap van %s na %s verander nie\n"
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
 msgstr "kan nie toegang verkry na %s nie"
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, c-format
 msgid "cannot read directory %s"
 msgstr "kan nie gids %s lees nie"
@@ -1157,13 +1166,14 @@ msgstr "kan nie gids %s lees nie"
 msgid "changing security context of %s\n"
 msgstr "toegangsregte van %s word verander"
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, c-format
 msgid "fts_read failed"
 msgstr "fts_read het misluk"
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, fuzzy, c-format
 msgid "fts_close failed"
 msgstr "'close' het gefaal"
@@ -1181,7 +1191,7 @@ msgstr ""
 
 #: src/chcon.c:357
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
@@ -1202,7 +1212,7 @@ msgid ""
 "  -l, --range=RANGE      set range RANGE in the target security context\n"
 msgstr ""
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 #, fuzzy
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
@@ -1242,36 +1252,37 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr ""
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr ""
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, fuzzy, c-format
 msgid "missing operand after %s"
 msgstr "parameter vir `%s' ontbreek"
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, fuzzy, c-format
 msgid "invalid context: %s"
 msgstr "ongeldige omskakeling: %s"
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr ""
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, c-format
 msgid "failed to get attributes of %s"
 msgstr "kon nie attribute van %s verkry nie"
@@ -1297,7 +1308,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
@@ -1325,47 +1336,47 @@ msgid ""
 "  %s -hR staff /u  Change the group of /u and subfiles to \"staff\".\n"
 msgstr ""
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
 msgstr "nuwe attribute van %s word verkry"
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr ""
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, fuzzy, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr "modus %s is verander na %04lo (%s)\n"
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, fuzzy, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr "modus %s kon nie na  %04lo (%s) verander word nie\n"
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr "modus van %s is behou as %04lo (%s)\n"
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, fuzzy, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr "kon nie simboliese skakel %s skep nie"
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, c-format
 msgid "changing permissions of %s"
 msgstr "toegangsregte van %s word verander"
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, fuzzy, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr "toegangsregte vir %s word gestel"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1373,33 +1384,33 @@ msgid ""
 "  or:  %s [OPTION]... --reference=RFILE FILE...\n"
 msgstr ""
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 msgid ""
 "Change the mode of each FILE to MODE.\n"
 "With --reference, change the mode of each FILE to that of RFILE.\n"
 "\n"
 msgstr ""
 
-#: src/chmod.c:391
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr ""
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 msgid ""
 "\n"
 "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n"
 msgstr ""
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr ""
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, fuzzy, c-format
 msgid "invalid mode: %s"
 msgstr "ongeldige modus %s"
@@ -1527,26 +1538,21 @@ msgid ""
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr ""
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr "ongeldige groep  %s"
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, fuzzy, c-format
 msgid "invalid group list %s"
 msgstr "ongeldige groep  %s"
 
-#: src/chroot.c:117
-#, fuzzy, c-format
-msgid "failed to set additional groups"
-msgstr "kon nie attribute van %s verkry nie"
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
@@ -1555,7 +1561,7 @@ msgstr ""
 "Gebruik so: %s NUWEBEGINPUNT [BEVEL...]\n"
 "  of:  %s OPSIE\n"
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
@@ -1563,13 +1569,13 @@ msgstr ""
 "Loop BEVEL met wortelgids gestel volgens NUWEBEGINPUNT.\n"
 "\n"
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
 msgstr ""
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 #, fuzzy
 msgid ""
 "\n"
@@ -1578,28 +1584,42 @@ msgstr ""
 "\n"
 "As geen bevel gegee is nie, loop ``${SHELL} -i'' (verstek: /bin/sh).\n"
 
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, c-format
 msgid "cannot change root directory to %s"
 msgstr "kan nie wortelgids verander na %s toe nie"
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, c-format
 msgid "cannot chdir to root directory"
 msgstr "kan nie chdir uitvoer na wortelgids toe nie"
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr ""
+
+#: src/chroot.c:383
+#, fuzzy, c-format
+msgid "failed to get supplemental groups"
+msgstr "kan nie aanvullende groeplys verkry nie"
+
+#: src/chroot.c:395
+#, fuzzy, c-format
+msgid "failed to %s supplemental groups"
+msgstr "kan nie die aanvullende groep stel nie"
+
+#: src/chroot.c:402
 #, fuzzy, c-format
 msgid "failed to set group-ID"
 msgstr "kan nie groep-ID na %ld verander nie"
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, fuzzy, c-format
 msgid "failed to set user-ID"
 msgstr "kon nie %s oopmaak nie"
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, fuzzy, c-format
 msgid "failed to run command %s"
 msgstr "kan nie bevel %s uitvoer nie"
@@ -1631,7 +1651,7 @@ msgstr ""
 "Druk CRC-toetssom en greeptellings van elke LÊER.\n"
 "\n"
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr "Gebruik so: %s [OPSIE]... LÊER1 LÊER2 \n"
@@ -1698,299 +1718,332 @@ msgstr "veelvuldige afvoerlêers is gespesifiseer"
 msgid "empty %s not allowed"
 msgstr ""
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr "fout met die les van %s"
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, c-format
 msgid "cannot lseek %s"
 msgstr "kan nie lseek op %s doen nie"
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr "fout met die skryf na %s"
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, fuzzy, c-format
 msgid "%s: failed to get extents info"
 msgstr "kon nie attribute van %s verkry nie"
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, fuzzy, c-format
 msgid "%s: write failed"
 msgstr "'write' het gefaal"
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, fuzzy, c-format
 msgid "failed to extend %s"
 msgstr "kon nie %s oopmaak nie"
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, fuzzy, c-format
 msgid "clearing permissions for %s"
 msgstr "toegangsregte vir %s word gestel"
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "eienaarskap van %s kon nie behou word nie"
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
 msgstr "kon nie lêer %s opspoor nie"
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, c-format
 msgid "failed to preserve authorship for %s"
 msgstr "outeurskap van %s kon nie behou word nie"
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
+#, fuzzy, c-format
+msgid "failed to set default file creation context to %s"
+msgstr "kon nie attribute van %s verkry nie"
+
+#: src/copy.c:820
+#, fuzzy, c-format
+msgid "failed to set default file creation context for %s"
+msgstr "kon nie attribute van %s verkry nie"
+
+#: src/copy.c:846
+#, fuzzy, c-format
+msgid "failed to set the security context of %s"
+msgstr "kon nie attribute van %s verkry nie"
+
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
 msgid "cannot open %s for reading"
 msgstr "kan nie %s oopmaak om te lees nie"
 
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, c-format
 msgid "cannot fstat %s"
 msgstr "kan nie fstat op %s uitvoer nie"
 
-#: src/copy.c:820
+#: src/copy.c:935
 #, c-format
 msgid "skipping file %s, as it was replaced while being copied"
 msgstr "lêer %s word oorgeslaan, want dit is vervang tydens kopieëring"
 
-#: src/copy.c:850
-#, c-format
-msgid "failed to get file system create context"
-msgstr ""
-
-#: src/copy.c:864
-#, fuzzy, c-format
-msgid "failed to set the security context of %s to %s"
-msgstr "groep kon nie van %s na %s verander word nie\n"
-
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
 msgid "cannot remove %s"
 msgstr "kan nie %s verwyder nie"
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
 msgstr "%s is verwyder.\n"
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr ""
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, c-format
 msgid "cannot create regular file %s"
 msgstr "kan nie 'n gewone lêer %s skep nie"
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, fuzzy, c-format
 msgid "failed to clone %s from %s"
 msgstr "kon nie %s oopmaak nie"
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr "lêertye van %s word behou"
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
 #, fuzzy, c-format
 msgid "failed to close %s"
 msgstr "kon nie %s oopmaak nie"
 
-#: src/copy.c:1471
+#: src/copy.c:1580
 #, fuzzy, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
 msgstr "%s: oorskryf %s, moet modus %04lo ter syde gestel word? "
 
-#: src/copy.c:1478
+#: src/copy.c:1581
+#, c-format
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr ""
+
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
 msgstr "%s: oorskryf %s?"
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr "(rugsteun: %s)"
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr ""
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, c-format
 msgid "cannot create hard link %s to %s"
 msgstr "kon nie vaste skakel %s na %s skep nie"
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, c-format
 msgid "cannot stat %s"
 msgstr "kan nie stat %s uitvoer nie"
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, c-format
 msgid "omitting directory %s"
 msgstr "lêergids %s word oorgeslaan"
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr "waarskuwing: bronlêer %s is meer as een keer gespesifiseer"
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
 msgstr "%s en %s is dieselfde lêer"
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr "die nie-gids %s kan nie met gids %s oorskryf word nie"
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr "die pasgeskepte %s sal nie met %s oorskryf word nie"
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr "gids %s kan nie oorskryf word met 'n nie-gids nie"
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr "'n gids kan nie geskuif word bo-oor 'n nie-gids nie: %s -> %s"
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr ""
 "om rugsteun te neem van %s sal die bron vernietig; %s is nie verskuif nie"
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr ""
 "om rugsteun te neem van %s sal die bron vernietig; %s is nie gekopieer nie"
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
 msgstr "kan nie rugsteun neem van %s nie"
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, fuzzy, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr "die pasgeskepte %s sal nie met %s oorskryf word nie"
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr "kan nie 'n lêergids, %s, na homself kopieer nie, %s"
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr "sal nie 'n vaste skakel %s skep na gids %s nie"
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr "kan nie 'n gids %s skuif na 'n kind van dieselfde gids nie, %s"
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, c-format
 msgid "cannot move %s to %s"
 msgstr "kan nie %s skuif na %s nie"
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr ""
 "inter-toestel verskuiwing het misluk: %s na %s; die bestemming kan nie "
 "verwyder word nie"
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, fuzzy, c-format
-msgid "failed to set default file creation context to %s"
-msgstr "kon nie attribute van %s verkry nie"
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr "sikliese simboliese skakel %s kan nie gekopieer word nie"
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr ""
 "%s: relatiewe simboliese skakels kan slegs in die huidige gids gemaak word"
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr "kon nie simboliese skakel %s na %s skep nie"
 
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, c-format
 msgid "cannot create fifo %s"
 msgstr "kan nie die pyp %s skep nie"
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, c-format
 msgid "cannot create special file %s"
 msgstr "kan nie spesiale lêer %s skep nie"
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, c-format
 msgid "cannot read symbolic link %s"
 msgstr "simboliese skakel %s kan nie gelees word nie"
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, c-format
 msgid "cannot create symbolic link %s"
 msgstr "kon nie simboliese skakel %s skep nie"
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
 msgstr "%s het 'n onbekende lêertipe"
 
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, c-format
 msgid "cannot un-backup %s"
 msgstr "kan nie %s ont-rugsteun nie"
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr "%s -> %s (ont-rugsteun)\n"
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr ""
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr ""
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, fuzzy, c-format
+msgid "unknown program %s"
+msgstr "onbekende gebruiker-id: %s"
+
+#: src/cp.c:157 src/mv.c:288
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -2001,11 +2054,11 @@ msgstr ""
 "  or:  %s [OPSIE]... :GROEP LÊER...\n"
 "  or:  %s [OPSIE]... --reference=RLÊER LÊER...\n"
 
-#: src/cp.c:162
+#: src/cp.c:163
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 
-#: src/cp.c:168
+#: src/cp.c:169
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
 "      --attributes-only        don't copy the file data, just the "
@@ -2019,7 +2072,7 @@ msgid ""
 "  -d                           same as --no-dereference --preserve=links\n"
 msgstr ""
 
-#: src/cp.c:177
+#: src/cp.c:178
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
 "                                 opened, remove it and try again (this "
@@ -2032,20 +2085,20 @@ msgid ""
 "  -H                           follow command-line symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:186
+#: src/cp.c:187
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
 "  -L, --dereference            always follow symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:190
+#: src/cp.c:191
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
 "                                 a previous -i option)\n"
 "  -P, --no-dereference         never follow symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:195
+#: src/cp.c:196
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
 "      --preserve[=ATTR_LIST]   preserve the specified attributes (default:\n"
@@ -2055,13 +2108,13 @@ msgid ""
 "                                 all\n"
 msgstr ""
 
-#: src/cp.c:203
+#: src/cp.c:204
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                use full source file name under DIRECTORY\n"
 msgstr ""
 
-#: src/cp.c:207
+#: src/cp.c:208
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
 "      --reflink[=WHEN]         control clone/CoW copies. See below\n"
@@ -2070,7 +2123,7 @@ msgid ""
 "force)\n"
 msgstr ""
 
-#: src/cp.c:213
+#: src/cp.c:214
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
 "      --strip-trailing-slashes  remove any trailing slashes from each "
@@ -2078,7 +2131,7 @@ msgid ""
 "                                 argument\n"
 msgstr ""
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -2087,7 +2140,7 @@ msgid ""
 "  -T, --no-target-directory    treat DEST as a normal file\n"
 msgstr ""
 
-#: src/cp.c:224
+#: src/cp.c:225
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
 "                                 than the destination file or when the\n"
@@ -2096,7 +2149,15 @@ msgid ""
 "  -x, --one-file-system        stay on this file system\n"
 msgstr ""
 
-#: src/cp.c:233
+#: src/cp.c:232
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/cp.c:240
 msgid ""
 "\n"
 "By default, sparse SOURCE files are detected by a crude heuristic and the\n"
@@ -2112,7 +2173,7 @@ msgid ""
 "fails, or if --reflink=auto is specified, fall back to a standard copy.\n"
 msgstr ""
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 msgid ""
 "\n"
 "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n"
@@ -2122,7 +2183,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2130,7 +2191,7 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2138,227 +2199,237 @@ msgid ""
 "regular file.\n"
 msgstr ""
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, c-format
 msgid "failed to preserve times for %s"
 msgstr "lêertye van %s kon nie behou word nie"
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, c-format
 msgid "failed to preserve permissions for %s"
 msgstr "magtigings vir %s kon nie behou word nie"
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, c-format
 msgid "cannot make directory %s"
 msgstr "kan nie gids %s maak nie"
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr "%s bestaan maar is nie 'n lêergids nie"
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
 #, fuzzy, c-format
 msgid "failed to access %s"
 msgstr "kon nie %s oopmaak nie"
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, fuzzy, c-format
 msgid "missing file operand"
 msgstr "lêerparameter ontbreek"
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, fuzzy, c-format
 msgid "missing destination file operand after %s"
 msgstr "spesifikasie lêer ontbreek"
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, fuzzy, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr "'n gids kan nie geskuif word bo-oor 'n nie-gids nie: %s -> %s"
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, fuzzy, c-format
 msgid "target %s is not a directory"
 msgstr "%s: hierdie bestemming is nie 'n lêergids nie"
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, fuzzy, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr "wanneer paaie behou word, moet die bestemming 'n gids wees"
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, fuzzy, c-format
 msgid "multiple target directories specified"
 msgstr "veelvuldige afvoerlêers is gespesifiseer"
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr ""
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr "kan nie sowel vaste skakels as simboliese skakels maak nie"
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, fuzzy, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr "die --string en --check opsies is onderling uitsluitend"
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr ""
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr "rugsteuntipe"
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, c-format
+msgid "cannot set target context and preserve it"
+msgstr ""
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr ""
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr ""
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr "toevoer het verdwyn"
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr "%s: reëlnommer buite bereik"
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, fuzzy, c-format
 msgid "%s: %s: line number out of range"
 msgstr "%s: `%s': reëlnommer buite bereik"
 
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, c-format
 msgid " on repetition %s\n"
 msgstr "by herhaling %s\n"
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, fuzzy, c-format
 msgid "%s: %s: match not found"
 msgstr "%s: `%s': patroon nie gevind nie"
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr "fout in soektog met reëlmatige uitdrukking"
 
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, fuzzy, c-format
 msgid "write error for %s"
 msgstr "skryffout vir `%s'"
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, c-format
 msgid "%s: integer expected after delimiter"
 msgstr "%s: 'n heelgetal is verwag na die skeisimbool"
 
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, fuzzy, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr "%s: `}' word benodig in herhaaltelling"
 
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, fuzzy, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr "%s}: tussen `{' en `}' moet 'n heelgetal wees"
 
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, fuzzy, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr "%s: afsluit-skeisimbool `%c' ontbreek"
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr "%s: ongeldige reëlmatige uitdrukking: %s"
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr "%s: ongeldige patroon"
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr "%s: reëlnommer moet groter as nul wees"
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, fuzzy, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr "reëlnommer `%s' is kleiner as die voorafgaande reëlnommer, %s"
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, fuzzy, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr ""
 "waarskuwing: reëlnommer `%s' is dieselfde as die voorafgaande reëlnommer"
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr "ontbrekende omskakelingaanduider in suffiks"
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr "ontbrekende omskakelingaanduider in suffiks: %c"
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr "ontbrekende omskakelingaanduider in suffiks: \\%.3o"
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, fuzzy, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr "ontbrekende omskakelingaanduider in suffiks: %c"
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr "te veel %% omskakelingaanduiders in suffiks"
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr "ontbrekende %% omskakelingaanduider in suffiks"
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr "%s: ongeldige getal"
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr "Gebruik so: %s [OPSIE]... LÊER PATROON...\n"
 
-#: src/csplit.c:1455
+#: src/csplit.c:1483
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
 "and output byte counts of each piece to standard output.\n"
 msgstr ""
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2366,14 +2437,18 @@ msgid ""
 "  -k, --keep-files           do not remove output files on errors\n"
 msgstr ""
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr ""
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
 "  -z, --elide-empty-files    remove empty output files\n"
 msgstr ""
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
@@ -2381,7 +2456,7 @@ msgstr ""
 "\n"
 "Lees vanaf standaardtoevoer as LÊER gegee is as -.  Elke PATROON kan wees:\n"
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 msgid ""
 "\n"
 "  INTEGER            copy up to but not including specified line number\n"
@@ -2398,30 +2473,26 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr ""
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr ""
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, fuzzy, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr "Gebruik so:  %s [OPSIE]... [LÊER]...\n"
 
-#: src/cut.c:193
+#: src/cut.c:176
 #, fuzzy
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr ""
 "Druk die geselekteerde dele van reëls uit elke LÊER na standaardafvoer.\n"
 "\n"
 
-#: src/cut.c:199
+#: src/cut.c:182
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
 "  -c, --characters=LIST   select only these characters\n"
 "  -d, --delimiter=DELIM   use DELIM instead of TAB for field delimiter\n"
 msgstr ""
 
-#: src/cut.c:204
+#: src/cut.c:187
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
 "                            that contains no delimiter character, unless\n"
@@ -2429,7 +2500,7 @@ msgid ""
 "  -n                      (ignored)\n"
 msgstr ""
 
-#: src/cut.c:210
+#: src/cut.c:193
 #, fuzzy
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
@@ -2438,14 +2509,14 @@ msgstr ""
 "      --verbose           druk 'n diagnostiese boodskap op standaardafvoer\n"
 "                            direk voor elke afvoerlêer oopgemaak word\n"
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
 "                            the default is to use the input delimiter\n"
 msgstr ""
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2453,7 +2524,7 @@ msgid ""
 "in the same order that it is read, and is written exactly once.\n"
 msgstr ""
 
-#: src/cut.c:227
+#: src/cut.c:210
 msgid ""
 "Each range is one of:\n"
 "\n"
@@ -2465,51 +2536,55 @@ msgid ""
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
 
-#: src/cut.c:367 src/cut.c:493
+#: src/cut.c:300 src/cut.c:394
 #, fuzzy
 msgid "invalid byte, character or field list"
 msgstr "ongeldige greep of veldlys"
 
-#: src/cut.c:387
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr ""
+
+#: src/cut.c:320
 #, fuzzy
 msgid "invalid range with no endpoint: -"
 msgstr "ongeldige opsie %s vir wydte"
 
-#: src/cut.c:403
+#: src/cut.c:334
 #, fuzzy
 msgid "invalid decreasing range"
 msgstr "ongeldige modusstring: %s"
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, c-format
 msgid "byte offset %s is too large"
 msgstr "greepuitwyking %s is te groot"
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, c-format
 msgid "field number %s is too large"
 msgstr "veldnommer %s is te groot"
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr "slegs een soort lys mag gespesifiseer word"
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr "die verdeler mag net een karakter wees"
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr "u moet 'n lys van grepe, karakters of velde spesifiseer"
 
-#: src/cut.c:850
+#: src/cut.c:790
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr ""
 "slegs wanneer velde gebruik word mag 'n toevoer-skeikarakter gespesifiseer "
 "word"
 
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
@@ -2517,11 +2592,11 @@ msgstr ""
 "om nie-afgeslote reëls te onderdruk, maak slegs sin\n"
 "\twanneer dit op velde van toepassing gemaak word"
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr "ontbrekende lys van velde"
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr "ontbrekende lys van posisies"
 
@@ -2561,7 +2636,7 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 
 #: src/date.c:158
@@ -2693,10 +2768,10 @@ msgid ""
 "  $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n"
 msgstr ""
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr "standaardtoevoer"
@@ -2735,7 +2810,7 @@ msgstr ""
 msgid "cannot set date"
 msgstr "kon nie die datum stel nie"
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, c-format
 msgid "time %s is out of range"
 msgstr "tyd %s is buite bereik"
@@ -2746,7 +2821,7 @@ msgstr "tyd %s is buite bereik"
 msgid "Paul Rubin"
 msgstr ""
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
@@ -2755,7 +2830,7 @@ msgstr ""
 "Gebruik so: %s [GETAL]... \n"
 "   of:  %s OPSIE\n"
 
-#: src/dd.c:526
+#: src/dd.c:532
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
 "\n"
@@ -2766,7 +2841,7 @@ msgid ""
 "  ibs=BYTES       read up to BYTES bytes at a time (default: 512)\n"
 msgstr ""
 
-#: src/dd.c:535
+#: src/dd.c:541
 #, fuzzy
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
@@ -2787,7 +2862,7 @@ msgstr ""
 "  skip=BLOKKE     slaan BLOKKE(aantal) ibs-grootte blokke oor aan die begin "
 "van toevoer\n"
 
-#: src/dd.c:546
+#: src/dd.c:552
 msgid ""
 "\n"
 "N and BYTES may be followed by the following multiplicative suffixes:\n"
@@ -2798,7 +2873,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dd.c:555
+#: src/dd.c:561
 #, fuzzy
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
@@ -2826,7 +2901,7 @@ msgstr ""
 "  sync      pad every input block with NULs to ibs-size; when used\n"
 "            with block or unblock, pad with spaces rather than NULs\n"
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -2836,7 +2911,7 @@ msgid ""
 "  fsync     likewise, but also write metadata\n"
 msgstr ""
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -2845,76 +2920,76 @@ msgid ""
 "suggested)\n"
 msgstr ""
 
-#: src/dd.c:583
+#: src/dd.c:589
 msgid "  cio       use concurrent I/O for data\n"
 msgstr ""
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr ""
 
-#: src/dd.c:587
+#: src/dd.c:593
 #, fuzzy
 msgid "  directory  fail unless a directory\n"
 msgstr "%s: hierdie bestemming is nie 'n lêergids nie"
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr ""
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr ""
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr ""
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr ""
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr ""
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr ""
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr ""
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr ""
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr ""
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr ""
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr ""
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, c-format
 msgid ""
 "\n"
@@ -2931,28 +3006,38 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
 "%<PRIuMAX>+%<PRIuMAX> records out\n"
 msgstr ""
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, fuzzy, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
 msgstr[0] "afgekapte rekord"
 msgstr[1] "afgekapte rekord"
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr ""
 
@@ -2966,273 +3051,273 @@ msgstr ""
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
 msgstr ""
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, c-format
 msgid "closing input file %s"
 msgstr "toevoerlêer %s word toegemaak"
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr "afvoerlêer %s word toegemaak"
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr ""
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, c-format
 msgid "writing to %s"
 msgstr "besig om te skryf na %s"
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, fuzzy, c-format
 msgid "unrecognized operand %s"
 msgstr "onbekende opsie %s"
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 #, fuzzy
 msgid "invalid conversion"
 msgstr "ongeldige omskakeling: %s"
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 #, fuzzy
 msgid "invalid input flag"
 msgstr "ongeldige nommer by begin van veld"
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 #, fuzzy
 msgid "invalid output flag"
 msgstr "ongeldige groep "
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 #, fuzzy
 msgid "invalid status flag"
 msgstr "ongeldige gebruiker %s"
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, c-format
 msgid "invalid number %s"
 msgstr "ongeldige nommer %s"
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr ""
 
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, fuzzy, c-format
 msgid "cannot combine block and unblock"
 msgstr "die gebruikernaam en groepnaam mag nie albei ontbreek nie"
 
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, fuzzy, c-format
 msgid "cannot combine lcase and ucase"
 msgstr "die gebruikernaam en groepnaam mag nie albei ontbreek nie"
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, c-format
 msgid "cannot combine excl and nocreat"
 msgstr ""
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, c-format
 msgid "cannot combine direct and nocache"
 msgstr ""
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
 "  of mt_type=0x%0lx -- see <sys/mtio.h> for the list of types"
 msgstr ""
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, fuzzy, c-format
 msgid "%s: cannot skip"
 msgstr "%s: kan nie teruggaan nie"
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, fuzzy, c-format
 msgid "%s: cannot seek"
 msgstr "%s: kan nie verwyder nie"
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr ""
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr ""
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr ""
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, fuzzy, c-format
 msgid "setting flags for %s"
 msgstr "die tyd van %s is verstel"
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, fuzzy, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr "%s: kan nie skuif tot by uitwyking %s nie"
 
-#: src/dd.c:2133
+#: src/dd.c:2172
 #, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
 msgstr ""
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr ""
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, fuzzy, c-format
 msgid "fsync failed for %s"
 msgstr "kon nie %s oopmaak nie"
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, c-format
 msgid "failed to open %s"
 msgstr "kon nie %s oopmaak nie"
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
 "blocks"
 msgstr ""
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr ""
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, fuzzy, c-format
 msgid "failed to discard cache for: %s"
 msgstr "lêertye van %s kon nie behou word nie"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr ""
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr "Lêerstelsel"
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr "Tipe"
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr "blok"
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr "InGebruik"
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr "Beskikbaar"
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr "Gebruik%"
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr ""
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr ""
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr ""
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr ""
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr "Geheg aan"
 
-#: src/df.c:383
-#, c-format
-msgid "option --output: field '%s' unknown"
+#: src/df.c:207
+msgid "File"
 msgstr ""
 
-#: src/df.c:390
+#: src/df.c:387
+#, fuzzy, c-format
+msgid "option --output: field %s unknown"
+msgstr "afvoerlêer %s word toegemaak"
+
+#: src/df.c:394
 #, fuzzy, c-format
-msgid "option --output: field '%s' used more than once"
+msgid "option --output: field %s used more than once"
 msgstr "waarskuwing: bronlêer %s is meer as een keer gespesifiseer"
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr "Grootte"
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr "Beskikbaar"
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr ""
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
 msgstr ""
 
-#: src/df.c:1210
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr ""
+
+#: src/df.c:1384
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
 "or all file systems by default.\n"
 msgstr ""
 
-#: src/df.c:1217
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
 
-#: src/df.c:1227
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -3241,7 +3326,7 @@ msgid ""
 "(default)\n"
 msgstr ""
 
-#: src/df.c:1234
+#: src/df.c:1409
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
 "                               or print all fields if FIELD_LIST is "
@@ -3254,43 +3339,34 @@ msgid ""
 "  -v                    (ignored)\n"
 msgstr ""
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
 
-#: src/df.c:1285
+#: src/df.c:1460
 #, fuzzy, c-format
 msgid "options %s and %s are mutually exclusive"
-msgstr "die opsies om drukdatums te spesifiseer is onderling uitsluitend"
-
-#: src/df.c:1335
-#, fuzzy
-msgid "warning: "
-msgstr "Waarskuwing: "
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr ""
+msgstr "die --string en --check opsies is onderling uitsluitend"
 
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr ""
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr "Waarskuwing: "
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 #, fuzzy
 msgid "cannot read table of mounted file systems"
 msgstr "%s kan nie die tabel met gemonteerde lêerstelsels lees nie"
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr ""
@@ -3300,7 +3376,7 @@ msgstr ""
 msgid "H. Peter Anvin"
 msgstr ""
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr "Gebruik so:  %s [OPSIE]... [ LÊER ]\n"
@@ -3368,7 +3444,7 @@ msgstr ""
 
 #: src/dirname.c:59
 #, fuzzy
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
 msgstr ""
 "  -z, --zero-terminated     beëindig reëls met 'n 0-greep, i.p.v. 'n "
 "nuwereëlkarakter\n"
@@ -3383,7 +3459,7 @@ msgid ""
 "  %s stdio.h            -> \".\"\n"
 msgstr ""
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -3392,14 +3468,13 @@ msgstr ""
 "Gebruik so: %s [OPSIE]... GROEP LÊER...\n"
 "  of:  %s [OPSIE]... --reference=RLÊER LÊER...\n"
 
-#: src/du.c:274
+#: src/du.c:285
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr ""
 
-#: src/du.c:280
+#: src/du.c:291
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3408,11 +3483,11 @@ msgid ""
 "                          fragmentation, indirect blocks, and the like\n"
 msgstr ""
 
-#: src/du.c:289
+#: src/du.c:300
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3424,17 +3499,18 @@ msgid ""
 "                          --summarize\n"
 msgstr ""
 
-#: src/du.c:302
+#: src/du.c:313
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
 
-#: src/du.c:310
+#: src/du.c:322
 msgid ""
 "  -k                    like --block-size=1K\n"
 "  -L, --dereference     dereference all symbolic links\n"
@@ -3442,16 +3518,17 @@ msgid ""
 "  -m                    like --block-size=1M\n"
 msgstr ""
 
-#: src/du.c:316
+#: src/du.c:328
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
 
-#: src/du.c:322
+#: src/du.c:334
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
 "                          or entries greater than SIZE if negative\n"
@@ -3460,78 +3537,78 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
 msgstr ""
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
 "  -x, --one-file-system    skip directories on different file systems\n"
 msgstr ""
 
-#: src/du.c:386
+#: src/du.c:398
 msgid "Infinity"
 msgstr ""
 
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr ""
-
-#: src/du.c:624
+#: src/du.c:636
 #, fuzzy, c-format
 msgid "fts_read failed: %s"
 msgstr "fts_read het misluk"
 
-#: src/du.c:780
+#: src/du.c:787
 #, c-format
 msgid "invalid maximum depth %s"
 msgstr "ongeldige maksimum diepte %s"
 
-#: src/du.c:809
+#: src/du.c:816
 #, fuzzy, c-format
 msgid "invalid --threshold argument '-0'"
-msgstr "ongeldige parameter: %s"
+msgstr "ongeldige heelgetalparameter `%s'"
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr ""
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr ""
 
-#: src/du.c:900
+#: src/du.c:911
 #, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr ""
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 msgid "file operands cannot be combined with --files0-from"
 msgstr ""
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr "%s: leesfout"
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr ""
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 #, fuzzy
 msgid "invalid zero-length file name"
 msgstr "ongeldige groepnaam %s"
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr "totaal"
 
@@ -3617,7 +3694,7 @@ msgstr ""
 #: src/env.c:61
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
 
@@ -3690,16 +3767,16 @@ msgid "input line is too long"
 msgstr "groepnaam te lank"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr ""
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
@@ -3708,7 +3785,7 @@ msgstr ""
 "Gebruik so: %s UITDRUKKING \n"
 "   of:  %s OPSIE\n"
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -3719,7 +3796,7 @@ msgid ""
 "  ARG1 & ARG2       ARG1 if neither argument is null or 0, otherwise 0\n"
 msgstr ""
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -3730,14 +3807,14 @@ msgid ""
 "  ARG1 > ARG2       ARG1 is greater than ARG2\n"
 msgstr ""
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
 "  ARG1 - ARG2       arithmetic difference of ARG1 and ARG2\n"
 msgstr ""
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -3746,7 +3823,7 @@ msgid ""
 "  ARG1 % ARG2       arithmetic remainder of ARG1 divided by ARG2\n"
 msgstr ""
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -3757,7 +3834,7 @@ msgid ""
 "  length STRING              length of STRING\n"
 msgstr ""
 
-#: src/expr.c:251
+#: src/expr.c:250
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
 "                               keyword like 'match' or an operator like '/'\n"
@@ -3765,7 +3842,7 @@ msgid ""
 "  ( EXPRESSION )             value of EXPRESSION\n"
 msgstr ""
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -3775,7 +3852,7 @@ msgid ""
 "0.\n"
 msgstr ""
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -3783,32 +3860,32 @@ msgid ""
 "or 0, 2 if EXPRESSION is syntactically invalid, and 3 if an error occurred.\n"
 msgstr ""
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, c-format
 msgid "syntax error"
 msgstr "sintaksfout"
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, fuzzy, c-format
 msgid "error in regular expression matcher"
 msgstr "fout in soektog met reëlmatige uitdrukking"
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, fuzzy, c-format
 msgid "non-integer argument"
 msgstr "nie-numeriese parameter"
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr "deling deur nul"
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, fuzzy, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr "Stel  LC_ALL='C' om die probleem te systap"
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, fuzzy, c-format
 msgid "the strings compared were %s and %s"
 msgstr "Die stringe wat vergelyk is, is %s en %s."
@@ -3818,27 +3895,27 @@ msgstr "Die stringe wat vergelyk is, is %s en %s."
 msgid "Niels Moller"
 msgstr ""
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
 msgstr ""
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
 msgstr ""
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, fuzzy, c-format
 msgid "%s is not a valid positive integer"
 msgstr "`%s' is nie 'n geldige positiewe heelgetal nie"
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr "%s is te groot"
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
@@ -3847,7 +3924,7 @@ msgstr ""
 "Gebruik so: %s [GETAL]... \n"
 "   of:  %s OPSIE\n"
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
 "are specified on the command line, read them from standard input.\n"
@@ -3934,28 +4011,28 @@ msgid "invalid number of columns: %s"
 msgstr "ongeldige aantal kolomme: `%s'"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr ""
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, fuzzy, c-format
 msgid "Usage: %s\n"
 msgstr "Gebruik so:  %s [OPSIE]\n"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
 msgstr ""
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, fuzzy, c-format
 msgid "failed to get groups for user %s"
 msgstr "groep kon nie van %s na %s verander word nie\n"
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, fuzzy, c-format
 msgid "failed to get groups for the current process"
 msgstr "groep kon nie van %s na %s verander word nie\n"
@@ -3977,22 +4054,22 @@ msgid ""
 "the current process (which may differ if the groups database has changed).\n"
 msgstr ""
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, fuzzy, c-format
 msgid "cannot get real UID"
 msgstr "kan nie gebruiker-id stel nie"
 
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, fuzzy, c-format
 msgid "cannot get effective GID"
-msgstr "kan nie %s verwyder nie"
+msgstr "kon nie die tyd van die dag vasstel nie"
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, fuzzy, c-format
 msgid "cannot get real GID"
 msgstr "kan nie gebruiker-id stel nie"
 
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, fuzzy, c-format
 msgid "%s: no such user"
 msgstr "%s: gebruiker bestaan nie"
@@ -4033,58 +4110,48 @@ msgid ""
 "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n"
 msgstr ""
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr ""
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, c-format
 msgid "%s: number of bytes is too large"
 msgstr "%s: aantal grepe is te veel"
 
-#: src/head.c:440
-#, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr ""
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr "%s: kan nie skuif tot by uitwyking %s nie"
 
-#: src/head.c:673
-#, fuzzy, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "%s: lêer te groot"
-
-#: src/head.c:798
+#: src/head.c:423 src/tail.c:457
 #, c-format
-msgid "cannot reposition file pointer for %s"
-msgstr "kan nie die lêerwyser herposisioneer vir %s nie"
+msgid "%s: cannot seek to relative offset %s"
+msgstr ""
 
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr ""
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr "aantal reëls"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr "aantal grepe"
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr "ongeldige aantal reëls"
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr "ongeldige aantal grepe"
 
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, fuzzy, c-format
 msgid "invalid trailing option -- %c"
 msgstr "ongeldige opsie -- %c"
@@ -4122,145 +4189,161 @@ msgid "cannot determine hostname"
 msgstr "kan die masjiennaam nie vasstel nie"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr ""
 
-#: src/id.c:81
-#, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
-msgstr "Gebruik so:  %s [OPSIE]... [ LÊER ]\n"
+#: src/id.c:84
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]... [USER]\n"
+msgstr "Gebruik so:  %s [OPSIE]... [GEBRUIKER]...\n"
 
-#: src/id.c:82
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
 msgstr ""
 
-#: src/id.c:96
+#: src/id.c:90
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
+msgstr ""
+
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
 msgstr ""
 
-#: src/id.c:140
+#: src/id.c:151
+#, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr ""
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr ""
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr ""
 
-#: src/id.c:178
+#: src/id.c:198
 #, fuzzy, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr "kan nie verdeel op meer as een manier nie"
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr ""
 
-#: src/id.c:199
+#: src/id.c:209
+#, c-format
+msgid "option --zero not permitted in default format"
+msgstr ""
+
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
 msgstr ""
 
-#: src/id.c:224
+#: src/id.c:265
 #, fuzzy, c-format
 msgid "cannot get effective UID"
-msgstr "kan nie %s verwyder nie"
+msgstr "kon nie die tyd van die dag vasstel nie"
 
-#: src/id.c:311
+#: src/id.c:354
 #, fuzzy, c-format
 msgid "cannot find name for user ID %s"
 msgstr "%s: kan nie die gebruikersnaam vir UID %u opspoor nie\n"
 
-#: src/id.c:329
+#: src/id.c:372
 #, c-format
 msgid "uid=%s"
 msgstr ""
 
-#: src/id.c:334
+#: src/id.c:377
 #, c-format
 msgid " gid=%s"
 msgstr ""
 
-#: src/id.c:341
+#: src/id.c:384
 #, c-format
 msgid " euid=%s"
 msgstr ""
 
-#: src/id.c:349
+#: src/id.c:392
 #, c-format
 msgid " egid=%s"
 msgstr ""
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr "groepe="
 
-#: src/id.c:393
+#: src/id.c:437
 #, c-format
 msgid " context=%s"
 msgstr ""
 
-#: src/install.c:373
+#: src/install.c:376
 #, fuzzy, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr "waarskuwing: kan nie chdir uitvoer na gids %s toe nie"
 
-#: src/install.c:414
+#: src/install.c:417
 #, c-format
 msgid "creating directory %s"
 msgstr "gids %s word geskep"
 
-#: src/install.c:482
+#: src/install.c:485
 #, c-format
 msgid "cannot change ownership of %s"
 msgstr "kan nie eienaarskap van %s verander nie"
 
-#: src/install.c:506
+#: src/install.c:509
 #, c-format
 msgid "cannot set time stamps for %s"
 msgstr ""
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, c-format
 msgid "fork system call failed"
 msgstr "fork-stelselroep het gefaal"
 
-#: src/install.c:531
+#: src/install.c:535
 #, fuzzy, c-format
 msgid "cannot run %s"
 msgstr "kan nie strip-bevel uitvoer nie"
 
-#: src/install.c:535
+#: src/install.c:539
 #, fuzzy, c-format
 msgid "waiting for strip"
 msgstr "besig om te skryf na %s"
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr ""
 
-#: src/install.c:558
+#: src/install.c:565
 #, c-format
 msgid "invalid user %s"
 msgstr "ongeldige gebruiker %s"
 
-#: src/install.c:594
+#: src/install.c:601
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -4272,7 +4355,7 @@ msgstr ""
 "  or:  %s [OPSIE]... :GROEP LÊER...\n"
 "  or:  %s [OPSIE]... --reference=RLÊER LÊER...\n"
 
-#: src/install.c:601
+#: src/install.c:608
 msgid ""
 "\n"
 "This install program copies files (often just compiled) into destination\n"
@@ -4286,7 +4369,7 @@ msgid ""
 "In the 4th form, create all components of the given DIRECTORY(ies).\n"
 msgstr ""
 
-#: src/install.c:615
+#: src/install.c:622
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
 "  -b                  like --backup but does not accept an argument\n"
@@ -4298,7 +4381,7 @@ msgid ""
 "                        components of the specified directories\n"
 msgstr ""
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -4310,7 +4393,7 @@ msgid ""
 "  -o, --owner=OWNER   set ownership (super-user only)\n"
 msgstr ""
 
-#: src/install.c:631
+#: src/install.c:638
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
 "files\n"
@@ -4324,60 +4407,57 @@ msgid ""
 "  -v, --verbose       print the name of each directory as it is created\n"
 msgstr ""
 
-#: src/install.c:641
+#: src/install.c:648
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
 
-#: src/install.c:859
+#: src/install.c:696 src/unlink.c:86
 #, c-format
-msgid ""
-"WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
-msgstr ""
+msgid "cannot unlink %s"
+msgstr "kan nie %s ontkoppel nie"
 
-#: src/install.c:869
+#: src/install.c:877
 #, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
+msgid ""
+"WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
 msgstr ""
 
-#: src/install.c:886
+#: src/install.c:917
 #, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr ""
 
-#: src/install.c:889
+#: src/install.c:920
 #, fuzzy, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr "%s: hierdie bestemming is nie 'n lêergids nie"
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr ""
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, c-format
 msgid "invalid mode %s"
 msgstr "ongeldige modus %s"
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr ""
 
-#: src/install.c:959
+#: src/install.c:1001
 #, fuzzy, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr "die --string en --check opsies is onderling uitsluitend"
 
-#: src/install.c:966
+#: src/install.c:1008
 #, fuzzy, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr "die opsies om drukdatums te spesifiseer is onderling uitsluitend"
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -4389,7 +4469,7 @@ msgstr ""
 msgid "Mike Haertel"
 msgstr ""
 
-#: src/join.c:191
+#: src/join.c:195
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
 "standard output.  The default join field is the first, delimited\n"
@@ -4400,7 +4480,7 @@ msgid ""
 "  -e EMPTY          replace missing input fields with EMPTY\n"
 msgstr ""
 
-#: src/join.c:200
+#: src/join.c:204
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
 "  -j FIELD          equivalent to '-1 FIELD -2 FIELD'\n"
@@ -4408,7 +4488,7 @@ msgid ""
 "  -t CHAR           use CHAR as input and output field separator\n"
 msgstr ""
 
-#: src/join.c:206
+#: src/join.c:210
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
 "  -1 FIELD          join on this FIELD of file 1\n"
@@ -4420,7 +4500,14 @@ msgid ""
 "                      print them without trying to pair them\n"
 msgstr ""
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+#, fuzzy
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr ""
+"  -z, --zero-terminated     beëindig reëls met 'n 0-greep, i.p.v. 'n "
+"nuwereëlkarakter\n"
+
+#: src/join.c:225
 msgid ""
 "\n"
 "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n"
@@ -4439,47 +4526,47 @@ msgid ""
 "warning message will be given.\n"
 msgstr ""
 
-#: src/join.c:403
+#: src/join.c:410
 #, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
 msgstr ""
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, c-format
 msgid "invalid field number: %s"
 msgstr "ongeldige veldnommer: %s"
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, fuzzy, c-format
 msgid "invalid field specifier: %s"
 msgstr "ongeldige veld-aanduider: `%s'"
 
-#: src/join.c:877
+#: src/join.c:884
 #, fuzzy, c-format
 msgid "invalid file number in field spec: %s"
 msgstr "ongeldige wydte vir reëlnommer veld: %s"
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr ""
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr ""
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, fuzzy, c-format
 msgid "multi-character tab %s"
 msgstr "saamgestelde keepkarakter `%s'"
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr "onversoenbare keepkarakters"
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr ""
@@ -4586,47 +4673,47 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr "kon nie skakel %s na %s skep nie"
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr "%s: 'n vaste skakel word nie toegelaat vir 'n gids nie"
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, c-format
 msgid "%s: cannot overwrite directory"
 msgstr "%s: kan nie die gids oorskryf nie"
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
 msgstr "%s: vervang %s?"
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, fuzzy, c-format
 msgid "failed to create symbolic link %s"
 msgstr "kon nie simboliese skakel %s skep nie"
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, fuzzy, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr "kon nie simboliese skakel %s na %s skep nie"
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, fuzzy, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr "kon nie vaste skakel %s na %s skep nie"
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, fuzzy, c-format
 msgid "failed to create hard link %s"
 msgstr "kon nie vaste skakel %s na %s skep nie"
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, fuzzy, c-format
 msgid "failed to create hard link %s => %s"
 msgstr "kon nie vaste skakel %s na %s skep nie"
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -4635,7 +4722,7 @@ msgid ""
 "  or:  %s [OPTION]... -t DIRECTORY TARGET...  (4th form)\n"
 msgstr ""
 
-#: src/ln.c:381
+#: src/ln.c:398
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
 "In the 2nd form, create a link to TARGET in the current directory.\n"
@@ -4647,7 +4734,7 @@ msgid ""
 "interpreted in relation to its parent directory.\n"
 msgstr ""
 
-#: src/ln.c:394
+#: src/ln.c:411
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
 "file\n"
@@ -4660,7 +4747,7 @@ msgid ""
 "  -f, --force                 remove existing destination files\n"
 msgstr ""
 
-#: src/ln.c:402
+#: src/ln.c:419
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
 "  -L, --logical               dereference TARGETs that are symbolic links\n"
@@ -4672,7 +4759,7 @@ msgid ""
 "  -s, --symbolic              make symbolic links instead of hard links\n"
 msgstr ""
 
-#: src/ln.c:411
+#: src/ln.c:428
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
 "  -t, --target-directory=DIRECTORY  specify the DIRECTORY in which to "
@@ -4682,7 +4769,7 @@ msgid ""
 "  -v, --verbose               print name of each linked file\n"
 msgstr ""
 
-#: src/ln.c:433
+#: src/ln.c:450
 #, c-format
 msgid ""
 "\n"
@@ -4690,12 +4777,12 @@ msgid ""
 "behavior when a TARGET is a symbolic link, defaulting to %s.\n"
 msgstr ""
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, fuzzy, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr "%s: hierdie bestemming is nie 'n lêergids nie"
 
-#: src/ln.c:588
+#: src/ln.c:605
 #, fuzzy, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr "kon nie simboliese skakel %s skep nie"
@@ -4728,7 +4815,7 @@ msgstr "geen gebruikersnaam"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
@@ -4737,101 +4824,101 @@ msgstr "%b %e  %Y"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 msgid "%b %e %H:%M"
 msgstr "%b %e %H:%M"
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr ""
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr ""
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr ""
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, c-format
 msgid "invalid line width: %s"
 msgstr "ongeldige reëlwydte: %s"
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, c-format
 msgid "invalid tab size: %s"
 msgstr "ongeldige keepgrootte: %s"
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, c-format
 msgid "invalid time style format %s"
 msgstr "ongeldige tydformaatstring: %s"
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 #, fuzzy
 msgid "Valid arguments are:\n"
 msgstr "Geldige parameters is soos volg:"
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr ""
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr ""
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, c-format
 msgid "unrecognized prefix: %s"
 msgstr "onbekende voorvoegsel: %s"
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr ""
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, c-format
 msgid "cannot open directory %s"
 msgstr "Kan nie lêergids %s oopmaak nie."
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, c-format
 msgid "cannot determine device and inode of %s"
 msgstr ""
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, fuzzy, c-format
 msgid "%s: not listing already-listed directory"
 msgstr "%s: kan nie die gids oorskryf nie"
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, c-format
 msgid "reading directory %s"
 msgstr "lêergids %s word gelees"
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, fuzzy, c-format
 msgid "closing directory %s"
 msgstr "lêergids %s word oorgeslaan"
 
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, c-format
 msgid "cannot compare file names %s and %s"
 msgstr ""
 
-#: src/ls.c:4721
+#: src/ls.c:4781
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
 "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n"
 msgstr ""
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
 "  -A, --almost-all           do not list implied . and ..\n"
@@ -4840,33 +4927,32 @@ msgid ""
 "characters\n"
 msgstr ""
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
 "  -F, --classify             append indicator (one of */=>@|) to entries\n"
@@ -4876,40 +4962,41 @@ msgid ""
 "      --full-time            like -l --time-style=full-iso\n"
 msgstr ""
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr ""
 
-#: src/ls.c:4763
+#: src/ls.c:4823
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 
-#: src/ls.c:4769
+#: src/ls.c:4829
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
 
-#: src/ls.c:4775
+#: src/ls.c:4835
 msgid ""
 "  -H, --dereference-command-line\n"
 "                             follow symbolic links listed on the command "
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
 msgstr ""
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
 "names:\n"
@@ -4918,10 +5005,10 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -4931,7 +5018,7 @@ msgid ""
 "entries\n"
 msgstr ""
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -4942,11 +5029,11 @@ msgid ""
 "                             append / indicator to directories\n"
 msgstr ""
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -4954,7 +5041,7 @@ msgid ""
 "escape\n"
 msgstr ""
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
 "  -R, --recursive            list subdirectories recursively\n"
@@ -4962,56 +5049,59 @@ msgid ""
 "blocks\n"
 msgstr ""
 
-#: src/ls.c:4825
+#: src/ls.c:4886
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 
-#: src/ls.c:4835
+#: src/ls.c:4896
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
 msgstr ""
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 msgid ""
 "  -t                         sort by modification time, newest first\n"
 "  -T, --tabsize=COLS         assume tab stops at each COLS instead of 8\n"
 msgstr ""
 
-#: src/ls.c:4848
+#: src/ls.c:4912
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
 msgstr ""
 
-#: src/ls.c:4855
+#: src/ls.c:4919
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -5020,7 +5110,7 @@ msgid ""
 "variable can change the settings.  Use the dircolors command to set it.\n"
 msgstr ""
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -5092,19 +5182,16 @@ msgstr ""
 #: src/md5sum.c:195
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, c-format
 msgid ""
 "\n"
@@ -5114,160 +5201,186 @@ msgid ""
 "space for text), and name for each FILE.\n"
 msgstr ""
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, c-format
 msgid "%s: too many checksum lines"
 msgstr ""
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr ""
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr "%s: MISLUKTE open of lees\n"
 
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr "GEFAAL"
 
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr "OK"
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr ""
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, fuzzy, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
 msgstr[0] "WAARSKUWING: %d van %d gelyste %s kon nie gelees word nie"
 msgstr[1] "WAARSKUWING: %d van %d gelyste %s kon nie gelees word nie"
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
 msgstr ""
 
-#: src/md5sum.c:766
+#: src/md5sum.c:770
 #, fuzzy, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr "die --status opsie is slegs sinvol by die nagaan van toetssomme"
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
 msgstr ""
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr "die --status opsie is slegs sinvol by die nagaan van toetssomme"
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr "die --warn opsie is slegs sinvol by die nagaan van toetssomme"
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, fuzzy, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr "die --status opsie is slegs sinvol by die nagaan van toetssomme"
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, fuzzy, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr "die --status opsie is slegs sinvol by die nagaan van toetssomme"
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr "Gebruik so:  %s [OPSIE]...  GIDS...\n"
 
-#: src/mkdir.c:57
+#: src/mkdir.c:59
 #, fuzzy
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
 msgstr ""
 "Skep die LÊERGIDS(e), as hulle nie reeds bestaan nie.\n"
 "\n"
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 
-#: src/mkdir.c:168
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/mkdir.c:127 src/mkdir.c:172
+#, fuzzy, c-format
+msgid "failed to set default creation context for %s"
+msgstr "kon nie attribute van %s verkry nie"
+
+#: src/mkdir.c:191
+#, fuzzy, c-format
+msgid "failed to restore context for %s"
+msgstr "lêertye van %s kon nie behou word nie"
+
+#: src/mkdir.c:231
 #, c-format
 msgid "created directory %s"
 msgstr "gids %s is geskep"
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr ""
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr "Gebruik so:  %s [OPSIE]...  NAAM...\n"
 
-#: src/mkfifo.c:52
+#: src/mkfifo.c:54
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
 msgstr ""
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
 msgstr ""
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, c-format
 msgid "invalid mode"
 msgstr "ongeldige modus"
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr ""
 
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
 #, c-format
-msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
-msgstr ""
+msgid "cannot set permissions of %s"
+msgstr "kan nie  toegangsregte van %s verander nie"
 
 #: src/mknod.c:54
-msgid "Create the special file NAME of the given TYPE.\n"
+#, c-format
+msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr ""
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
+#: src/mknod.c:56
+msgid "Create the special file NAME of the given TYPE.\n"
 msgstr ""
 
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -5276,7 +5389,7 @@ msgid ""
 "otherwise, as decimal.  TYPE may be:\n"
 msgstr ""
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 msgid ""
 "\n"
 "  b      create a block (buffered) special file\n"
@@ -5284,150 +5397,144 @@ msgid ""
 "  p      create a FIFO\n"
 msgstr ""
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 #, fuzzy
 msgid "Special files require major and minor device numbers."
 msgstr "ongeldige subtoestelnommer %s"
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 #, fuzzy
 msgid "Fifos do not have major and minor device numbers."
 msgstr "ongeldige subtoestelnommer %s"
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, c-format
 msgid "block special files not supported"
 msgstr "spesiale bloklêers word nie ondersteun nie"
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, c-format
 msgid "character special files not supported"
 msgstr "spesiale karakterlêers word nie ondersteun nie"
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, c-format
 msgid "invalid major device number %s"
 msgstr "ongeldige hooftoestelnommer %s"
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, c-format
 msgid "invalid minor device number %s"
 msgstr "ongeldige subtoestelnommer %s"
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, c-format
 msgid "invalid device %s %s"
 msgstr "ongeldige toestel %s %s"
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, c-format
 msgid "invalid device type %s"
 msgstr "ongeldige toesteltipe %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr ""
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr "Gebruik so:  %s [OPSIE]... [ LÊER ]\n"
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
 "TEMPLATE must contain at least 3 consecutive 'X's in last component.\n"
 "If TEMPLATE is not specified, use tmp.XXXXXXXXXX, and --tmpdir is implied.\n"
 msgstr ""
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
 "  -q, --quiet         suppress diagnostics about file/dir-creation failure\n"
 msgstr ""
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
 msgstr ""
 
-#: src/mktemp.c:223
-#, fuzzy, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr "kon nie standaardfoutafvoer herlei nie"
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, fuzzy, c-format
 msgid "too many templates"
 msgstr "te veel parameters"
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr ""
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr ""
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr ""
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr ""
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr ""
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, fuzzy, c-format
 msgid "failed to create directory via template %s"
 msgstr "Kan nie lêergids %s skep nie."
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, fuzzy, c-format
 msgid "failed to create file via template %s"
 msgstr "lêertye van %s kon nie behou word nie"
 
-#: src/mv.c:292
+#: src/mv.c:294
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 
-#: src/mv.c:298
+#: src/mv.c:300
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
 "file\n"
@@ -5440,7 +5547,7 @@ msgid ""
 "effect.\n"
 msgstr ""
 
-#: src/mv.c:307
+#: src/mv.c:309
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
@@ -5448,7 +5555,7 @@ msgid ""
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
 msgstr ""
 
-#: src/mv.c:312
+#: src/mv.c:314
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
 "DIRECTORY\n"
@@ -5457,6 +5564,8 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
 
 #: src/nice.c:72
@@ -5702,95 +5811,90 @@ msgid "%s: invalid number to ignore"
 msgstr "%s: ongeldige aantal reëls"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
 msgstr ""
 
-#: src/numfmt.c:676
+#: src/numfmt.c:659
 #, fuzzy, c-format
-msgid "value too large to be converted: '%s'"
+msgid "value too large to be converted: %s"
 msgstr "%s: waarde is nie volledig omgeskakel nie"
 
-#: src/numfmt.c:680
+#: src/numfmt.c:663
 #, fuzzy, c-format
-msgid "invalid number: '%s'"
+msgid "invalid number: %s"
 msgstr "ongeldige nommer %s"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
+msgid "rejecting suffix in input: %s (consider using --from)"
 msgstr ""
 
-#: src/numfmt.c:688
+#: src/numfmt.c:671
 #, fuzzy, c-format
-msgid "invalid suffix in input: '%s'"
-msgstr "ongeldige heelgetalparameter `%s'"
+msgid "invalid suffix in input: %s"
+msgstr "ongeldige reëlwydte: %s"
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
 msgstr ""
 
-#: src/numfmt.c:723
+#: src/numfmt.c:722 src/numfmt.c:768
 #, fuzzy, c-format
 msgid "failed to prepare value '%Lf' for printing"
-msgstr "%s: lêer te lank"
+msgstr "lêertye van %s kon nie behou word nie"
 
-#: src/numfmt.c:787
+#: src/numfmt.c:791
 #, fuzzy, c-format
-msgid "invalid unit size: '%s'"
+msgid "invalid unit size: %s"
 msgstr "ongeldige keepgrootte: %s"
 
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
-#, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr ""
-
-#: src/numfmt.c:813
+#: src/numfmt.c:814
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
 msgstr "Gebruik so:  %s [OPSIE]... [GEBRUIKER]...\n"
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
 msgstr ""
 
-#: src/numfmt.c:820
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
 msgstr ""
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
 msgstr ""
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
 "                         see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr ""
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
@@ -5798,19 +5902,19 @@ msgid ""
 "locale)\n"
 msgstr ""
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
 msgstr ""
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
 msgstr ""
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -5820,40 +5924,40 @@ msgid ""
 "                         is found\n"
 msgstr ""
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
 "nearest\n"
 msgstr ""
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
 msgstr ""
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr ""
 
-#: src/numfmt.c:877
+#: src/numfmt.c:878
 msgid ""
 "\n"
 "UNIT options:\n"
 msgstr ""
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr ""
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -5862,7 +5966,7 @@ msgid ""
 "               1Mi = 1048576,\n"
 msgstr ""
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
@@ -5870,7 +5974,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
@@ -5878,7 +5982,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
@@ -5886,18 +5990,18 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:905
+#: src/numfmt.c:906
 #, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -5909,7 +6013,7 @@ msgid ""
 "errors are not diagnosed and the exit status is 0.\n"
 msgstr ""
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -5930,112 +6034,112 @@ msgid ""
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 msgstr ""
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, c-format
 msgid "format %s has no %% directive"
 msgstr ""
 
-#: src/numfmt.c:990
+#: src/numfmt.c:1003
 #, fuzzy, c-format
 msgid "invalid format %s (width overflow)"
 msgstr "ongeldige wydte vir formaat"
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr ""
+
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr ""
 
-#: src/numfmt.c:1010
+#: src/numfmt.c:1030
 #, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
 msgstr ""
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr ""
 
-#: src/numfmt.c:1070
+#: src/numfmt.c:1081
 #, fuzzy, c-format
-msgid "invalid suffix in input '%s': '%s'"
-msgstr "ongeldige heelgetalparameter `%s'"
+msgid "invalid suffix in input %s: %s"
+msgstr "ongeldige reëlwydte: %s"
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
 msgstr ""
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
 msgstr ""
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
+msgid "large input value %s: possible precision loss"
 msgstr ""
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
 
-#: src/numfmt.c:1388
+#: src/numfmt.c:1403
 #, fuzzy, c-format
-msgid "invalid padding value '%s'"
-msgstr "ongeldige tipe-string `%s'"
+msgid "invalid padding value %s"
+msgstr "ongeldige datum `%s'"
 
-#: src/numfmt.c:1401
+#: src/numfmt.c:1417
 #, fuzzy, c-format
-msgid "invalid field value '%s'"
-msgstr "ongeldige veldnommer: `%s'"
+msgid "invalid field value %s"
+msgstr "ongeldige veldnommer: %s"
 
-#: src/numfmt.c:1430
+#: src/numfmt.c:1447
 #, fuzzy, c-format
-msgid "invalid header value '%s'"
-msgstr "ongeldige datum `%s'"
+msgid "invalid header value %s"
+msgstr "ongeldige styl vir kopnommering: %s"
 
-#: src/numfmt.c:1456
+#: src/numfmt.c:1473
 #, c-format
 msgid "--grouping cannot be combined with --format"
 msgstr ""
 
-#: src/numfmt.c:1458
-#, c-format
-msgid "--padding cannot be combined with --format"
-msgstr ""
-
-#: src/numfmt.c:1463
+#: src/numfmt.c:1478
 #, fuzzy, c-format
 msgid "no conversion option specified"
-msgstr "veelvuldige -l of -t opsies is gespesifiseer"
+msgstr "geen proses-id is gespesifiseer"
 
-#: src/numfmt.c:1471
+#: src/numfmt.c:1486
 #, c-format
 msgid "grouping cannot be combined with --to"
 msgstr ""
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
 msgstr ""
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
 msgstr ""
 
-#: src/numfmt.c:1511
+#: src/numfmt.c:1526
 #, fuzzy, c-format
 msgid "error reading input"
 msgstr "fout met die les van %s"
 
-#: src/numfmt.c:1520
-#, fuzzy, c-format
+#: src/numfmt.c:1535
+#, c-format
 msgid "failed to convert some of the input numbers"
-msgstr "herleiding van standaardafvoer het misluk"
+msgstr ""
 
-#: src/od.c:294
+#: src/od.c:320
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -6044,7 +6148,7 @@ msgid ""
 "[b]]\n"
 msgstr ""
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -6054,7 +6158,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/od.c:307
+#: src/od.c:333
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
 "if the last operand begins with + or (if there are 2 operands) a digit.\n"
@@ -6064,38 +6168,40 @@ msgid ""
 "suffixes may be . for octal and b for multiply by 512.\n"
 msgstr ""
 
-#: src/od.c:318
+#: src/od.c:344
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
 
-#: src/od.c:323
+#: src/od.c:350
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
 
-#: src/od.c:336
+#: src/od.c:363
 msgid ""
 "\n"
 "\n"
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 
-#: src/od.c:345
+#: src/od.c:372
 msgid ""
 "  -f   same as -t fF, select floats\n"
 "  -i   same as -t dI, select decimal ints\n"
@@ -6105,16 +6211,16 @@ msgid ""
 "  -x   same as -t x2, select hexadecimal 2-byte units\n"
 msgstr ""
 
-#: src/od.c:353
+#: src/od.c:380
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -6123,7 +6229,7 @@ msgid ""
 "  x[SIZE]    hexadecimal, SIZE bytes per integer\n"
 msgstr ""
 
-#: src/od.c:367
+#: src/od.c:394
 msgid ""
 "\n"
 "SIZE is a number.  For TYPE in [doux], SIZE may also be C for\n"
@@ -6132,14 +6238,14 @@ msgid ""
 "for sizeof(double) or L for sizeof(long double).\n"
 msgstr ""
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
 "each output line.\n"
 msgstr ""
 
-#: src/od.c:379
+#: src/od.c:406
 msgid ""
 "\n"
 "\n"
@@ -6152,55 +6258,55 @@ msgid ""
 "and so on for G, T, P, E, Z, Y.\n"
 msgstr ""
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, fuzzy, c-format
 msgid "invalid type string %s"
 msgstr "ongeldige tipe-string `%s'"
 
-#: src/od.c:649
+#: src/od.c:690
 #, c-format
 msgid ""
 "invalid type string %s;\n"
 "this system doesn't provide a %lu-byte integral type"
 msgstr ""
 
-#: src/od.c:770
+#: src/od.c:811
 #, c-format
 msgid ""
 "invalid type string %s;\n"
 "this system doesn't provide a %lu-byte floating point type"
 msgstr ""
 
-#: src/od.c:828
+#: src/od.c:869
 #, fuzzy, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr "ongeldige karakter `%c' in tipe-string `%s'"
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr ""
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr ""
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr ""
 
-#: src/od.c:1810
+#: src/od.c:1863
 msgid "compatibility mode supports at most one file"
 msgstr ""
 
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr ""
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr ""
@@ -6356,12 +6462,12 @@ msgstr "Wanneer"
 msgid "Where"
 msgstr "Waar"
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr "Gebruik so:  %s [OPSIE]... [GEBRUIKER]...\n"
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -6371,7 +6477,7 @@ msgid ""
 "  -s              do short format output, this is the default\n"
 msgstr ""
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -6380,7 +6486,7 @@ msgid ""
 "                  in short format\n"
 msgstr ""
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, c-format
 msgid ""
 "\n"
@@ -6388,7 +6494,7 @@ msgid ""
 "The utmp file will be %s.\n"
 msgstr ""
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr ""
@@ -6555,12 +6661,13 @@ msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
 
-#: src/pr.c:2827
+#: src/pr.c:2828
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
 "                    separate columns by STRING,\n"
@@ -6570,7 +6677,7 @@ msgid ""
 "  -t, --omit-header  omit page headers and trailers\n"
 msgstr ""
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 msgid ""
 "  -T, --omit-pagination\n"
 "                    omit page headers and trailers, eliminate any "
@@ -6584,7 +6691,7 @@ msgid ""
 "(72)\n"
 msgstr ""
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
 "                    set page width to PAGE_WIDTH (72) characters always,\n"
@@ -6593,7 +6700,7 @@ msgid ""
 "                    with -S or -s\n"
 msgstr ""
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 #, fuzzy
 msgid ""
 "\n"
@@ -6614,7 +6721,7 @@ msgstr ""
 
 #: src/printenv.c:69
 #, fuzzy
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr ""
 "  -z, --zero-terminated     beëindig reëls met 'n 0-greep, i.p.v. 'n "
 "nuwereëlkarakter\n"
@@ -6714,32 +6821,32 @@ msgstr "waarskuwing: oortollige parameters geïgnoreer; begin by `%s'"
 msgid "F. Pinard"
 msgstr "F. Pinard"
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, fuzzy, c-format
 msgid "%s (for regexp %s)"
 msgstr "%s (vir regexp `%s')"
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
 "  or:  %s -G [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr ""
 
-#: src/ptx.c:1821
+#: src/ptx.c:1824
 msgid ""
 "Output a permuted index, including context, of the words in the input "
 "files.\n"
 msgstr ""
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
 "  -G, --traditional              behave more like System V 'ptx'\n"
 "  -F, --flag-truncation=STRING   use STRING for flagging line truncations\n"
 msgstr ""
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
 "  -O, --format=roff              generate output as roff directives\n"
@@ -6748,7 +6855,7 @@ msgid ""
 "  -T, --format=tex               generate output as TeX directives\n"
 msgstr ""
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -6758,7 +6865,7 @@ msgid ""
 "  -o, --only-file=FILE           read only word list from this FILE\n"
 msgstr ""
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -6766,16 +6873,16 @@ msgid ""
 "excluded\n"
 msgstr ""
 
-#: src/ptx.c:1854
+#: src/ptx.c:1857
 #, fuzzy
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
 "\n"
 "Met geen LÊER, of wanneer die LÊER - is, lees standaardtoevoer.\n"
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, fuzzy, c-format
 msgid "invalid gap width: %s"
 msgstr "ongeldige wydte: %s"
@@ -6792,22 +6899,28 @@ msgid ""
 "  -P, --physical  avoid all symlinks\n"
 msgstr ""
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+
+#: src/pwd.c:169
 #, fuzzy, c-format
 msgid "failed to chdir to %s"
 msgstr "kon nie %s oopmaak nie"
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, fuzzy, c-format
 msgid "failed to stat %s"
 msgstr "kon nie %s oopmaak nie"
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr ""
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, c-format
 msgid "ignoring non-option arguments"
 msgstr "parameters wat nie opsies is nie word geïgnoreer"
@@ -6817,8 +6930,8 @@ msgstr "parameters wat nie opsies is nie word geïgnoreer"
 msgid "Dmitry V. Levin"
 msgstr ""
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Gebruik so:  %s [OPSIE]...  LÊER...\n"
@@ -6852,8 +6965,7 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/readlink.c:152
@@ -6878,7 +6990,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 
@@ -6896,41 +7008,42 @@ msgstr ""
 msgid "%s: descend into directory %s? "
 msgstr "%s: wil jy ingaan in lêergids %s?"
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr "%s: verwyder lees-alleen %s %s? "
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, c-format
 msgid "%s: remove %s %s? "
 msgstr "%s: verwyder %s %s? "
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, c-format
 msgid "removed directory: %s\n"
 msgstr "lêergids is verwyder: %s\n"
 
-#: src/remove.c:444
-#, fuzzy, c-format
-msgid "cannot remove directory: %s"
-msgstr "kan nie gids %s verwyder nie"
+#: src/remove.c:447
+#, c-format
+msgid "refusing to remove %s or %s directory: skipping %s"
+msgstr ""
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr ""
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, fuzzy, c-format
 msgid "traversal failed: %s"
 msgstr "'read' het gefaal"
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -6955,12 +7068,12 @@ msgstr ""
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 
 #: src/rm.c:149
@@ -7008,13 +7121,17 @@ msgstr ""
 
 #: src/rm.c:342
 #, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr ""
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/rm.c:343
+#: src/rm.c:345
 #, fuzzy, c-format
-msgid "%s: remove all arguments? "
-msgstr "%s: verwyder %s %s? "
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] "%s: verwyder %s %s? "
+msgstr[1] "%s: verwyder %s %s? "
 
 #: src/rmdir.c:134 src/rmdir.c:233
 #, c-format
@@ -7057,7 +7174,7 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
 
@@ -7107,41 +7224,46 @@ msgstr ""
 msgid "no command specified"
 msgstr "geen proses-id is gespesifiseer"
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr ""
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, fuzzy, c-format
 msgid "failed to compute a new context"
 msgstr "kon nie %s oopmaak nie"
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, fuzzy, c-format
 msgid "failed to set new user %s"
 msgstr "kon nie %s oopmaak nie"
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, fuzzy, c-format
 msgid "failed to set new type %s"
 msgstr "kon nie %s oopmaak nie"
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, fuzzy, c-format
 msgid "failed to set new range %s"
 msgstr "kon nie %s oopmaak nie"
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, fuzzy, c-format
 msgid "failed to set new role %s"
 msgstr "kon nie %s oopmaak nie"
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, c-format
 msgid "unable to set security context %s"
 msgstr ""
 
+#: src/selinux.c:127 src/selinux.c:300
+#, fuzzy, c-format
+msgid "error canonicalizing %s"
+msgstr "fout met die les van %s"
+
 #: src/seq.c:68
 #, c-format
 msgid ""
@@ -7166,97 +7288,47 @@ msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
 msgstr ""
 
-#: src/seq.c:94
+#: src/seq.c:96
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
 "it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n"
 "decimal numbers with maximum precision PREC, and to %g otherwise.\n"
 msgstr ""
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, c-format
 msgid "invalid floating point argument: %s"
 msgstr "ongeldige wisselpunt parameter: %s"
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, fuzzy, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr "%s het 'n onbekende lêertipe"
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr ""
 
-#: src/setuidgid.c:49
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-"Gebruik so: %s FORMAAT [ARGUMENT]...\n"
-"  of:  %s OPSIE\n"
-
-#: src/setuidgid.c:55
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr "onbekende gebruiker-id: %s"
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr ""
-
-#: src/setuidgid.c:190
-#, fuzzy, c-format
-msgid "failed to set supplemental group(s)"
-msgstr "kan nie die aanvullende groep stel nie"
-
-#: src/setuidgid.c:200
-#, fuzzy, c-format
-msgid "cannot set group-ID to %lu"
-msgstr "kan nie groep-ID na %ld verander nie"
-
-#: src/setuidgid.c:204
-#, fuzzy, c-format
-msgid "cannot set user-ID to %lu"
-msgstr "kan nie gebruiker-ID na %ld verander nie"
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr ""
 
-#: src/shred.c:148
+#: src/shred.c:170
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
 "for even very expensive hardware probing to recover the data.\n"
 msgstr ""
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -7265,28 +7337,32 @@ msgid ""
 "  -s, --size=N   shred this many bytes (suffixes like K, M, G accepted)\n"
 msgstr ""
 
-#: src/shred.c:161
+#: src/shred.c:183
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
 "  -z, --zero     add a final overwrite with zeros to hide shredding\n"
 msgstr ""
 
-#: src/shred.c:170
+#: src/shred.c:192
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -7297,7 +7373,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -7309,7 +7385,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -7318,7 +7394,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -7330,134 +7406,134 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:215
+#: src/shred.c:241
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
 "of the file that cannot be removed, and that will allow a shredded file\n"
 "to be recovered later.\n"
 msgstr ""
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, fuzzy, c-format
 msgid "%s: fdatasync failed"
 msgstr "%s: seek het misluk"
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, fuzzy, c-format
 msgid "%s: fsync failed"
 msgstr "%s: seek het misluk"
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr "%s: kan nie teruggaan nie"
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr "%s: pass %lu/%lu (%s)..."
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, c-format
 msgid "%s: error writing at offset %s"
 msgstr "%s: fout tydens skryfbewerking by uitwyking %s"
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, fuzzy, c-format
 msgid "%s: lseek failed"
 msgstr "%s: seek het misluk"
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, c-format
 msgid "%s: file too large"
 msgstr "%s: lêer te groot"
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr "%s: pass %lu/%lu (%s)...%s"
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, fuzzy, c-format
 msgid "%s: fstat failed"
 msgstr "'stat' het gefaal"
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, c-format
 msgid "%s: invalid file type"
 msgstr "%s: ongeldige lêertipe:"
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr "%s: lêer het negatiewe grootte"
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, c-format
 msgid "%s: error truncating"
 msgstr "%s: fout tydens afeindiging"
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, fuzzy, c-format
 msgid "%s: fcntl failed"
 msgstr "%s: seek het misluk"
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr ""
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr "%s: besig om te verwyder"
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, c-format
 msgid "%s: renamed to %s"
 msgstr "%s: hernoem as %s"
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, fuzzy, c-format
 msgid "%s: failed to remove"
 msgstr "%s: lêer te groot"
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr "%s: is verwyder"
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, fuzzy, c-format
 msgid "%s: failed to close"
 msgstr "%s: lêer te lank"
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, fuzzy, c-format
 msgid "%s: failed to open for writing"
 msgstr "%s: lêer te lank"
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, c-format
 msgid "%s: invalid number of passes"
 msgstr "%s: ongeldige aantal lopies"
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, fuzzy, c-format
 msgid "multiple random sources specified"
 msgstr "veelvuldige afvoerlêers is gespesifiseer"
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, c-format
 msgid "%s: invalid file size"
 msgstr "%s: ongeldige lêergrootte."
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -7468,14 +7544,11 @@ msgstr ""
 "  or:  %s [OPSIE]... :GROEP LÊER...\n"
 "  or:  %s [OPSIE]... --reference=RLÊER LÊER...\n"
 
-#: src/shuf.c:54
-#, fuzzy
+#: src/shuf.c:67
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr ""
-"Druk die geselekteerde dele van reëls uit elke LÊER na standaardafvoer.\n"
-"\n"
 
-#: src/shuf.c:60
+#: src/shuf.c:73
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
 "  -i, --input-range=LO-HI   treat each number LO through HI as an input "
@@ -7483,34 +7556,44 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
 msgstr ""
 
-#: src/shuf.c:244
+#: src/shuf.c:228
+#, fuzzy, c-format
+msgid "too many input lines"
+msgstr "te veel nie-opsie parameters"
+
+#: src/shuf.c:431
 #, fuzzy, c-format
 msgid "multiple -i options specified"
 msgstr "veelvuldige -l of -t opsies is gespesifiseer"
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, fuzzy, c-format
 msgid "invalid input range %s"
 msgstr "ongeldige nommer %s"
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, fuzzy, c-format
 msgid "invalid line count %s"
 msgstr "ongeldige reëlwydte: %s"
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, c-format
 msgid "multiple output files specified"
 msgstr "veelvuldige afvoerlêers is gespesifiseer"
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, fuzzy, c-format
 msgid "cannot combine -e and -i options"
 msgstr "die gebruikernaam en groepnaam mag nie albei ontbreek nie"
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr ""
+
 #: src/sleep.c:44
 #, c-format
 msgid ""
@@ -7525,30 +7608,30 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, fuzzy, c-format
 msgid "invalid time interval %s"
 msgstr "ongeldige tydinterval `%s'"
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr "kan nie die reëletyd-horlosie lees nie"
 
-#: src/sort.c:399
+#: src/sort.c:427
 #, fuzzy
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr ""
 "Druk die geselekteerde dele van reëls uit elke LÊER na standaardafvoer.\n"
 "\n"
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
 msgstr ""
 
-#: src/sort.c:409
+#: src/sort.c:437
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
 "  -d, --dictionary-order      consider only blanks and alphanumeric "
@@ -7556,19 +7639,19 @@ msgid ""
 "  -f, --ignore-case           fold lower case to upper case characters\n"
 msgstr ""
 
-#: src/sort.c:415
+#: src/sort.c:443
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
 "  -i, --ignore-nonprinting    consider only printable characters\n"
 "  -M, --month-sort            compare (unknown) < 'JAN' < ... < 'DEC'\n"
 msgstr ""
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 
-#: src/sort.c:423
+#: src/sort.c:451
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
 "  -R, --random-sort           sort by random hash of keys\n"
@@ -7576,7 +7659,7 @@ msgid ""
 "  -r, --reverse               reverse the result of comparisons\n"
 msgstr ""
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -7586,19 +7669,19 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/sort.c:437
+#: src/sort.c:465
 msgid ""
 "Other options:\n"
 "\n"
 msgstr ""
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
 msgstr ""
 
-#: src/sort.c:445
+#: src/sort.c:473
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
 "  -C, --check=quiet, --check=silent  like -c, but do not report first bad "
@@ -7607,7 +7690,7 @@ msgid ""
 "                              decompress them with PROG -d\n"
 msgstr ""
 
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -7616,13 +7699,13 @@ msgid ""
 "                            If F is - then read names from standard input\n"
 msgstr ""
 
-#: src/sort.c:459
+#: src/sort.c:487
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
 "  -m, --merge               merge already sorted files; do not sort\n"
 msgstr ""
 
-#: src/sort.c:463
+#: src/sort.c:491
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "  -s, --stable              stabilize sort by disabling last-resort "
@@ -7630,7 +7713,7 @@ msgid ""
 "  -S, --buffer-size=SIZE    use SIZE for main memory buffer\n"
 msgstr ""
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -7645,13 +7728,7 @@ msgid ""
 "run\n"
 msgstr ""
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr ""
-"  -z, --zero-terminated     beëindig reëls met 'n 0-greep, i.p.v. 'n "
-"nuwereëlkarakter\n"
-
-#: src/sort.c:483
+#: src/sort.c:511
 msgid ""
 "\n"
 "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is "
@@ -7670,7 +7747,7 @@ msgid ""
 "SIZE may be followed by the following multiplicative suffixes:\n"
 msgstr ""
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -7682,260 +7759,245 @@ msgid ""
 "native byte values.\n"
 msgstr ""
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, fuzzy, c-format
 msgid "waiting for %s [-d]"
 msgstr "besig om te skryf na %s"
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr ""
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, fuzzy, c-format
 msgid "cannot create temporary file in %s"
 msgstr "kan nie 'n tydelike lêer skep nie"
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr "'open' het gefaal"
 
-#: src/sort.c:970
+#: src/sort.c:998
 #, fuzzy
 msgid "fflush failed"
 msgstr "'close' het gefaal"
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr "'close' het gefaal"
 
-#: src/sort.c:986
-#, fuzzy, c-format
-msgid "dup2 failed"
-msgstr "'open' het gefaal"
-
-#: src/sort.c:1103
-#, c-format
-msgid "couldn't execute %s"
-msgstr ""
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 #, fuzzy
 msgid "couldn't create temporary file"
 msgstr "kan nie 'n tydelike lêer skep nie"
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, fuzzy, c-format
 msgid "couldn't create process for %s -d"
 msgstr "Kan nie lêergids %s skep nie."
 
-#: src/sort.c:1161
-#, c-format
-msgid "couldn't execute %s -d"
-msgstr ""
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, fuzzy, c-format
 msgid "warning: cannot remove: %s"
 msgstr "kan nie %s verwyder nie"
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, fuzzy, c-format
 msgid "invalid --%s argument %s"
 msgstr "ongeldige parameter: %s"
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, fuzzy, c-format
 msgid "minimum --%s argument is %s"
 msgstr "dubbelsinnige parameter %s vir %s"
 
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, fuzzy, c-format
 msgid "--%s argument %s too large"
 msgstr "%s: telling `%.*s' is te groot"
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr ""
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr ""
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr "'stat' het gefaal"
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr "'read' het gefaal"
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, fuzzy, c-format
 msgid "string transformation failed"
 msgstr "stringvergelyking het gefaal"
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, c-format
 msgid "the untransformed string was %s"
 msgstr ""
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr ""
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr ""
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr ""
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr ""
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr ""
 
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, fuzzy, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
-msgstr[0] "%s: opsie `%s' is dubbelsinnig\n"
-msgstr[1] "%s: opsie `%s' is dubbelsinnig\n"
+msgstr[0] "%s: opsie `-W %s' is dubbelsinnig\n"
+msgstr[1] "%s: opsie `-W %s' is dubbelsinnig\n"
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr ""
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr "'write' het gefaal"
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr ""
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr "standaardfout-afvoer"
 
-#: src/sort.c:3698
+#: src/sort.c:3738
 #, fuzzy
 msgid "cannot read"
 msgstr "%s: kan nie teruggaan nie"
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, fuzzy, c-format
 msgid "%s: invalid field specification %s"
 msgstr "%s: ongeldige veldspesifikasie `%s'"
 
-#: src/sort.c:3987
-#, fuzzy, c-format
+#: src/sort.c:4028
+#, c-format
 msgid "options '-%s' are incompatible"
-msgstr "%s: opsie `%s' is dubbelsinnig\n"
+msgstr ""
 
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, fuzzy, c-format
 msgid "%s: invalid count at start of %s"
 msgstr "%s: ongeldige telling by begin van `%s'"
 
-#: src/sort.c:4295
+#: src/sort.c:4336
 #, fuzzy
 msgid "invalid number after '-'"
 msgstr "ongeldige getal na `-'"
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 #, fuzzy
 msgid "invalid number after '.'"
 msgstr "ongeldige getal na `.'"
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr "verdwaalde karakter in veldspesifikasie"
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, fuzzy, c-format
 msgid "multiple compress programs specified"
 msgstr "veelvuldige -l of -t opsies is gespesifiseer"
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
 msgstr "ongeldige nommer by begin van veld"
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
 msgstr "veldnommer is nul"
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr "karakteruitwyking is nul"
 
-#: src/sort.c:4407
+#: src/sort.c:4448
 #, fuzzy
 msgid "invalid number after ','"
 msgstr "ongeldige getal na `,'"
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr "leë keepkarakter"
 
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, fuzzy, c-format
 msgid "cannot read file names from %s"
 msgstr "kan nie die pyp %s skep nie"
 
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, fuzzy, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr "%s: ongeldige lêertipe:"
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, fuzzy, c-format
 msgid "no input from %s"
 msgstr "toevoerlêer %s word toegemaak"
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr ""
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr ""
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr ""
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr ""
 
-#: src/split.c:204
+#: src/split.c:203
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr "Gebruik so: %s [OPSIE] [TOEVOER [PREFIKS]]\n"
 
-#: src/split.c:208
+#: src/split.c:207
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
 "size is 1000 lines, and default PREFIX is 'x'.  With no INPUT, or when "
@@ -7943,26 +8005,25 @@ msgid ""
 "is -, read standard input.\n"
 msgstr ""
 
-#: src/split.c:216
+#: src/split.c:215
 #, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
 
-#: src/split.c:229
+#: src/split.c:228
 #, fuzzy
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
@@ -7971,7 +8032,7 @@ msgstr ""
 "      --verbose           druk 'n diagnostiese boodskap op standaardafvoer\n"
 "                            direk voor elke afvoerlêer oopgemaak word\n"
 
-#: src/split.c:236
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -7983,189 +8044,189 @@ msgid ""
 "r/K/N   likewise but only output Kth of N to stdout\n"
 msgstr ""
 
-#: src/split.c:354
+#: src/split.c:353
 #, fuzzy, c-format
 msgid "output file suffixes exhausted"
 msgstr "uitgange vir afvoerlêers is uitgeput"
 
-#: src/split.c:366
+#: src/split.c:365
 #, fuzzy, c-format
 msgid "creating file %s\n"
 msgstr "besig om nuwe lêer `%s' te skep\n"
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr ""
 
-#: src/split.c:391
+#: src/split.c:390
 #, c-format
 msgid "failed to set FILE environment variable"
 msgstr ""
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr ""
 
-#: src/split.c:395
+#: src/split.c:394
 #, fuzzy, c-format
 msgid "failed to create pipe"
 msgstr "kon nie %s oopmaak nie"
 
-#: src/split.c:409
+#: src/split.c:408
 #, fuzzy, c-format
 msgid "closing prior pipe"
 msgstr "toevoerlêer %s word toegemaak"
 
-#: src/split.c:411
+#: src/split.c:410
 #, fuzzy, c-format
 msgid "closing output pipe"
 msgstr "afvoerlêer %s word toegemaak"
 
-#: src/split.c:415
+#: src/split.c:414
 #, fuzzy, c-format
 msgid "moving input pipe"
 msgstr "toevoerlêer %s word toegemaak"
 
-#: src/split.c:417
+#: src/split.c:416
 #, fuzzy, c-format
 msgid "closing input pipe"
 msgstr "toevoerlêer %s word toegemaak"
 
-#: src/split.c:422
+#: src/split.c:421
 #, fuzzy, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr "kan nie bevel %s uitvoer nie"
 
-#: src/split.c:428
+#: src/split.c:427
 #, fuzzy, c-format
 msgid "failed to close input pipe"
 msgstr "kon nie %s oopmaak nie"
 
-#: src/split.c:464
+#: src/split.c:463
 #, c-format
 msgid "waiting for child process"
 msgstr ""
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr ""
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr ""
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr ""
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr "kan nie verdeel op meer as een manier nie"
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, fuzzy, c-format
 msgid "%s: invalid number of chunks"
 msgstr "%s: ongeldige aantal sekondes"
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, fuzzy, c-format
 msgid "%s: invalid chunk number"
 msgstr "%s: ongeldige getal"
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr "%s: ongeldige suffikslengte"
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr "%s: ongeldige aantal grepe"
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr "%s: ongeldige aantal reëls"
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, c-format
 msgid "line count option -%s%c... is too large"
 msgstr "opsie om reëls te tel -%s%c... is te groot"
 
-#: src/split.c:1248
+#: src/split.c:1298
 #, fuzzy, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr "ongeldige beginreëlnommer: %s"
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, fuzzy, c-format
 msgid "%s: invalid IO block size"
 msgstr "%s: ongeldige lêergrootte."
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr ""
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr ""
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, fuzzy, c-format
 msgid "%s: cannot determine file size"
 msgstr "kan die masjiennaam nie vasstel nie"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr ""
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, fuzzy, c-format
 msgid "failed to canonicalize %s"
 msgstr "kon nie %s oopmaak nie"
 
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, fuzzy, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr "%s: onbekende opsie `%c%s'\n"
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, fuzzy, c-format
 msgid "%s: invalid directive"
 msgstr "%%%c: ongeldige direktief"
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, c-format
 msgid "warning: backslash at end of format"
 msgstr ""
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr ""
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, c-format
 msgid "cannot read file system information for %s"
 msgstr ""
 
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, fuzzy, c-format
 msgid "cannot stat standard input"
 msgstr "standaard-toevoer word nou toegemaak"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -8176,7 +8237,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -8184,30 +8245,30 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, c-format
 msgid "Context: %C\n"
 msgstr ""
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -8215,27 +8276,27 @@ msgid ""
 " Birth: %w\n"
 msgstr ""
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
 msgstr ""
 
-#: src/stat.c:1356
+#: src/stat.c:1418
 msgid ""
 "  -L, --dereference     follow links\n"
 "  -f, --file-system     display file system status instead of file status\n"
 msgstr ""
 
-#: src/stat.c:1360
+#: src/stat.c:1422
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 msgid ""
 "\n"
 "The valid format sequences for files (without --file-system):\n"
@@ -8247,7 +8308,7 @@ msgid ""
 "  %C   SELinux security context string\n"
 msgstr ""
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 msgid ""
 "  %d   device number in decimal\n"
 "  %D   device number in hex\n"
@@ -8257,7 +8318,7 @@ msgid ""
 "  %G   group name of owner\n"
 msgstr ""
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 msgid ""
 "  %h   number of hard links\n"
 "  %i   inode number\n"
@@ -8266,11 +8327,11 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 
-#: src/stat.c:1399
+#: src/stat.c:1461
 msgid ""
 "  %u   user ID of owner\n"
 "  %U   user name of owner\n"
@@ -8278,14 +8339,14 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 msgid ""
 "Valid format sequences for file systems:\n"
 "\n"
@@ -8296,7 +8357,7 @@ msgid ""
 "  %f   free blocks in file system\n"
 msgstr ""
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 msgid ""
 "  %i   file system ID in hex\n"
 "  %l   maximum length of filenames\n"
@@ -8357,22 +8418,27 @@ msgid ""
 "and are thus unaffected by 'stdbuf' settings.\n"
 msgstr ""
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, fuzzy, c-format
 msgid "failed to find %s"
 msgstr "kon nie %s oopmaak nie"
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, c-format
 msgid "failed to update the environment with %s"
 msgstr ""
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr ""
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, c-format
+msgid "you must specify a buffering mode option"
+msgstr ""
+
+#: src/stty.c:516
 #, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -8380,25 +8446,25 @@ msgid ""
 "  or:  %s [-F DEVICE | --file=DEVICE] [-g|--save]\n"
 msgstr ""
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
 msgstr ""
 
-#: src/stty.c:525
+#: src/stty.c:528
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
 "  -g, --save         print all current settings in a stty-readable form\n"
 "  -F, --file=DEVICE  open and use the specified DEVICE instead of stdin\n"
 msgstr ""
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
 "settings.  The underlying system defines which settings are available.\n"
 msgstr ""
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -8407,7 +8473,7 @@ msgid ""
 "   eol CHAR      CHAR will end the line\n"
 msgstr ""
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -8415,7 +8481,7 @@ msgid ""
 "   kill CHAR     CHAR will erase the current line\n"
 msgstr ""
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -8423,7 +8489,7 @@ msgid ""
 "   start CHAR    CHAR will restart the output after stopping it\n"
 msgstr ""
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -8431,7 +8497,7 @@ msgid ""
 " * werase CHAR   CHAR will erase the last word typed\n"
 msgstr ""
 
-#: src/stty.c:562
+#: src/stty.c:565
 msgid ""
 "\n"
 "Special settings:\n"
@@ -8440,7 +8506,7 @@ msgid ""
 " * columns N     same as cols N\n"
 msgstr ""
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -8449,7 +8515,7 @@ msgid ""
 "   ospeed N      set the output speed to N\n"
 msgstr ""
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -8458,7 +8524,7 @@ msgid ""
 "   time N        with -icanon, set read timeout of N tenths of a second\n"
 msgstr ""
 
-#: src/stty.c:581
+#: src/stty.c:584
 msgid ""
 "\n"
 "Control settings:\n"
@@ -8469,7 +8535,7 @@ msgid ""
 "   csN           set character size to N bits, N in [5..8]\n"
 msgstr ""
 
-#: src/stty.c:590
+#: src/stty.c:593
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
 "   [-]hup        send a hangup signal when the last process closes the tty\n"
@@ -8477,9 +8543,10 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -8489,7 +8556,7 @@ msgid ""
 "   [-]igncr      ignore carriage return\n"
 msgstr ""
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -8498,11 +8565,11 @@ msgid ""
 "   [-]istrip     clear high (8th) bit of input characters\n"
 msgstr ""
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr ""
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -8512,7 +8579,7 @@ msgid ""
 "   [-]tandem     same as [-]ixoff\n"
 msgstr ""
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -8522,17 +8589,17 @@ msgid ""
 " * nlN           newline delay style, N in [0..1]\n"
 msgstr ""
 
-#: src/stty.c:631
+#: src/stty.c:635
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
 " * [-]onlret     newline performs a carriage return\n"
 msgstr ""
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -8542,7 +8609,7 @@ msgid ""
 " * vtN           vertical tab delay style, N in [0..1]\n"
 msgstr ""
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -8551,7 +8618,7 @@ msgid ""
 " * -crtkill      kill all line by obeying the echoctl and echok settings\n"
 msgstr ""
 
-#: src/stty.c:654
+#: src/stty.c:658
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
 "   [-]echo       echo input characters\n"
@@ -8560,7 +8627,7 @@ msgid ""
 "   [-]echok      echo a newline after a kill character\n"
 msgstr ""
 
-#: src/stty.c:661
+#: src/stty.c:665
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
 "   [-]echonl     echo newline even if not echoing other characters\n"
@@ -8569,7 +8636,7 @@ msgid ""
 "   [-]iexten     enable non-POSIX special characters\n"
 msgstr ""
 
-#: src/stty.c:668
+#: src/stty.c:672
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
 "   [-]noflsh     disable flushing after interrupt and quit special "
@@ -8579,7 +8646,7 @@ msgid ""
 " * [-]xcase      with icanon, escape with '\\' for uppercase characters\n"
 msgstr ""
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -8588,7 +8655,7 @@ msgid ""
 "   -cbreak       same as icanon\n"
 msgstr ""
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -8596,7 +8663,7 @@ msgid ""
 "   crt           same as echoe echoctl echoke\n"
 msgstr ""
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -8605,7 +8672,7 @@ msgid ""
 "   evenp         same as parenb -parodd cs7\n"
 msgstr ""
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -8615,7 +8682,7 @@ msgid ""
 "   -nl           same as icrnl -inlcr -igncr onlcr -ocrnl -onlret\n"
 msgstr ""
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -8624,7 +8691,7 @@ msgid ""
 "   -pass8        same as parenb istrip cs7\n"
 msgstr ""
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -8632,7 +8699,7 @@ msgid ""
 "   -raw          same as cooked\n"
 msgstr ""
 
-#: src/stty.c:716
+#: src/stty.c:720
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
 "                 -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n"
@@ -8642,7 +8709,7 @@ msgid ""
 "                 characters to their default values\n"
 msgstr ""
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -8651,55 +8718,55 @@ msgid ""
 "127; special values ^- or undef used to disable special characters.\n"
 msgstr ""
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, c-format
 msgid "only one device may be specified"
 msgstr "slegs een toestel mag gespesifiseer word"
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
 "mutually exclusive"
 msgstr ""
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr ""
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr ""
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, fuzzy, c-format
 msgid "invalid argument %s"
 msgstr "ongeldige parameter: %s"
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, fuzzy, c-format
 msgid "missing argument to %s"
 msgstr "parameter vir `%s' ontbreek"
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, fuzzy, c-format
 msgid "invalid line discipline %s"
 msgstr "ongeldige reëlwydte: %s"
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr ""
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr "%s: geen grootte-inligting is beskikbaar vir hierdie toestel nie"
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, fuzzy, c-format
 msgid "invalid integer argument %s"
 msgstr "ongeldige heelgetalparameter `%s'"
@@ -8745,7 +8812,7 @@ msgstr "      --help     wys hierdie teks en stop\n"
 msgid "      --version  output version information and exit\n"
 msgstr "      --version  wys weergawe-inligting en stop\n"
 
-#: src/system.h:544
+#: src/system.h:543
 #, fuzzy
 msgid ""
 "\n"
@@ -8754,15 +8821,15 @@ msgstr ""
 "Verpligte parameters vir langformaat opsies is ook verpligtend vir "
 "kortformaat opsies.\n"
 
-#: src/system.h:552
+#: src/system.h:551
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -8771,35 +8838,33 @@ msgid ""
 "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n"
 msgstr ""
 
-#: src/system.h:571
-#, fuzzy, c-format
+#: src/system.h:570
+#, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
+"%s online help: <%s>\n"
 msgstr ""
-"\n"
-"Rapporteer foute aan <%s>.\n"
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr ""
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr ""
 
-#: src/system.h:596
+#: src/system.h:591
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Probeer `%s --help' vir meer inligting.\n"
 
-#: src/system.h:628
+#: src/system.h:633
 #, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -8850,7 +8915,7 @@ msgstr "kan nie 'n tydelike lêer skep nie"
 #: src/tac.c:458
 #, fuzzy, c-format
 msgid "failed to open %s for writing"
-msgstr "%s: lêer te lank"
+msgstr "kon nie %s oopmaak nie"
 
 #: src/tac.c:475
 #, fuzzy, c-format
@@ -8891,54 +8956,48 @@ msgstr ""
 
 #: src/tail.c:270
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
 
 #: src/tail.c:274
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 
-#: src/tail.c:281
+#: src/tail.c:280
 #, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
 
-#: src/tail.c:294
+#: src/tail.c:293
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 
-#: src/tail.c:301
+#: src/tail.c:298
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 
-#: src/tail.c:310
+#: src/tail.c:307
 msgid ""
 "\n"
 "If the first character of K (the number of bytes or lines) is a '+',\n"
@@ -8949,7 +9008,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/tail.c:319
+#: src/tail.c:316
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
 "means that even if a tail'ed file is renamed, tail will continue to track\n"
@@ -8959,159 +9018,164 @@ msgid ""
 "named file in a way that accommodates renaming, removal and creation.\n"
 msgstr ""
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr "lêer word toegemaak: %s (fd=%d)"
 
-#: src/tail.c:453
-#, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr ""
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr ""
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr ""
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
 "reverting to polling"
 msgstr ""
 
-#: src/tail.c:963
+#: src/tail.c:965
+#, c-format
+msgid "%s has been replaced with a symbolic link. giving up on this name"
+msgstr ""
+
+#: src/tail.c:980
 #, fuzzy, c-format
 msgid "%s has become inaccessible"
 msgstr "`%s' het ontoeganklik geword"
 
-#: src/tail.c:980
+#: src/tail.c:997
 #, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr ""
 
-#: src/tail.c:989
+#: src/tail.c:1006
 #, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr ""
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, fuzzy, c-format
 msgid "%s has become accessible"
 msgstr "`%s' het toeganklik geword"
 
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr ""
 
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr ""
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, fuzzy, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr "kan nie verander na die null-groep nie"
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr "%s: lêer is afgekap"
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr "geen oorblywende lêers"
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, fuzzy, c-format
 msgid "cannot watch parent directory of %s"
 msgstr "Kan nie lêergids %s skep nie."
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, fuzzy, c-format
 msgid "inotify resources exhausted"
 msgstr "geheue uitgeput"
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, fuzzy, c-format
 msgid "cannot watch %s"
 msgstr "kan nie %s aanraak nie"
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr ""
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, fuzzy, c-format
 msgid "error reading inotify event"
 msgstr "fout met die les van %s"
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr ""
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, fuzzy, c-format
 msgid "number in %s is too large"
 msgstr "veldnommer %s is te groot"
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr ""
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr "%s: ongeldige PID"
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr "%s: ongeldige aantal sekondes"
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr ""
 
-#: src/tail.c:2034
+#: src/tail.c:2096
 #, c-format
-msgid "warning: --retry is useful mainly when following by name"
+msgid "warning: --retry ignored; --retry is useful only when following"
 msgstr ""
 
-#: src/tail.c:2038
+#: src/tail.c:2100
+#, c-format
+msgid "warning: --retry only effective for the initial open"
+msgstr ""
+
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
 msgstr ""
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr ""
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, c-format
 msgid "cannot follow %s by name"
 msgstr "kan nie %s per naam volg nie"
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr ""
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr ""
@@ -9324,17 +9388,17 @@ msgstr "ongeldige parameter: %s"
 msgid "warning: sigprocmask"
 msgstr ""
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr ""
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr ""
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
@@ -9343,33 +9407,29 @@ msgstr ""
 "Gebruik so: %s BEVEL [ARG]...\n"
 "  of:  %s OPSIE\n"
 
-#: src/timeout.c:229
-#, fuzzy
+#: src/timeout.c:232
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
 msgstr ""
-"Verpligte parameters vir langformaat opsies is ook verpligtend vir "
-"kortformaat opsies.\n"
 
-#: src/timeout.c:235
+#: src/timeout.c:238
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 msgid ""
 "\n"
 "DURATION is a floating point number with an optional suffix:\n"
@@ -9377,7 +9437,7 @@ msgid ""
 "days.\n"
 msgstr ""
 
-#: src/timeout.c:259
+#: src/timeout.c:262
 msgid ""
 "\n"
 "If the command times out, and --preserve-status is not set, then exit with\n"
@@ -9388,17 +9448,17 @@ msgid ""
 "case the exit status is 128+9 rather than 124.\n"
 msgstr ""
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr ""
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, fuzzy, c-format
 msgid "error waiting for command"
 msgstr "fout met die skryf na %s"
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr ""
@@ -9712,7 +9772,7 @@ msgstr ""
 #: src/truncate.c:115
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 
 #: src/truncate.c:121
@@ -9792,12 +9852,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr ""
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr "%s: toevoer bevat 'n lus"
@@ -9873,12 +9933,12 @@ msgstr ""
 msgid "tab stop value is too large"
 msgstr "inkeping is te groot %s"
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr "Gebruik so: %s [OPSIE]... [TOEVOER [AFVOER]]\n"
 
-#: src/uniq.c:138
+#: src/uniq.c:174
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
 "writing to OUTPUT (or standard output).\n"
@@ -9886,36 +9946,49 @@ msgid ""
 "With no options, matching lines are merged to the first occurrence.\n"
 msgstr ""
 
-#: src/uniq.c:147
+#: src/uniq.c:183
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
+msgstr ""
+
+#: src/uniq.c:187
+msgid ""
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
 msgstr ""
 
-#: src/uniq.c:151
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr ""
+
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
+msgstr ""
+
+#: src/uniq.c:199
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
 "  -i, --ignore-case     ignore differences in case when comparing\n"
 "  -s, --skip-chars=N    avoid comparing the first N characters\n"
 "  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
 msgstr ""
 
-#: src/uniq.c:161
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr ""
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 msgid ""
 "\n"
 "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n"
 "characters.  Fields are skipped before chars.\n"
 msgstr ""
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 msgid ""
 "\n"
 "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n"
@@ -9923,24 +9996,34 @@ msgid ""
 "Also, comparisons honor the rules specified by 'LC_COLLATE'.\n"
 msgstr ""
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, fuzzy, c-format
 msgid "too many repeated lines"
 msgstr "te veel parameters"
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
 msgstr "ongeldige aantal velde om oor te slaan"
 
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
 msgstr "ongeldige aantal grepe om oor te slaan"
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
 msgstr "ongeldige aantal grepe om te vergelyk"
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr ""
+
+#: src/uniq.c:652
+#, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr ""
+
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr ""
@@ -9962,11 +10045,6 @@ msgstr ""
 "Roep die unlink-funksie om die gespesifiseerde LÊER te verwyder.\n"
 "\n"
 
-#: src/unlink.c:86
-#, c-format
-msgid "cannot unlink %s"
-msgstr "kan nie %s ontkoppel nie"
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -10011,7 +10089,7 @@ msgstr[1] "ongeldige gebruiker"
 msgid ",  load average: %.2f"
 msgstr ",  ladinggemiddeld: %.2f"
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -10019,19 +10097,19 @@ msgid ""
 "in the run queue over the last 1, 5 and 15 minutes."
 msgstr ""
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
 "an uninterruptible sleep state also contribute to the load average.\n"
 msgstr ""
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr ""
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, fuzzy, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
@@ -10239,91 +10317,6 @@ msgstr ""
 "Skryf voortdurend 'n reël met al die gespesifiseerde STRING(e), of `y'.\n"
 "\n"
 
-#, fuzzy
-#~ msgid "  returning value: '%s'\n"
-#~ msgstr "besig om nuwe lêer `%s' te skep\n"
-
-#, fuzzy
-#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n"
-#~ msgstr "Gebruik so:  %s [OPSIE] NAAM...\n"
-
-#, fuzzy
-#~ msgid "no valid suffix found\n"
-#~ msgstr "%s: ongeldige suffikslengte"
-
-#~ msgid "reading %s"
-#~ msgstr "besig om %s te lees"
-
-#~ msgid "writing %s"
-#~ msgstr "besig om %s te skryf"
-
-#~ msgid "closing %s"
-#~ msgstr "besig om %s toe te maak"
-
-#~ msgid "accessing %s"
-#~ msgstr "verkry toegang na %s"
-
-#~ msgid "opening %s"
-#~ msgstr "%s word oopgemaak"
-
-#~ msgid ""
-#~ "Usage: %s NAME\n"
-#~ "  or:  %s OPTION\n"
-#~ msgstr ""
-#~ "Gebruik so: %s NAAM\n"
-#~ "  of:  %s OPSIE\n"
-
-#~ msgid "Usage: %s [OPTION]... FILE\n"
-#~ msgstr "Gebruik so:  %s [OPSIE]...  LÊER \n"
-
-#~ msgid "Password:"
-#~ msgstr "Wagwoord:"
-
-#~ msgid "getpass: cannot open /dev/tty"
-#~ msgstr "getpass: kan nie /dev/tty oopmaak nie"
-
-#~ msgid "cannot set groups"
-#~ msgstr "kan nie groepe stel nie"
-
-#~ msgid "cannot set group id"
-#~ msgstr "kan nie die groep-id stel nie"
-
-#~ msgid "cannot set user id"
-#~ msgstr "kan nie gebruiker-id stel nie"
-
-#~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n"
-#~ msgstr "Gebruik so: %s [OPSIE]... [-] [GEBRUIKER [ARG]...]\n"
-
-#~ msgid "user %s does not exist"
-#~ msgstr "gebruiker %s bestaan nie"
-
-#~ msgid "incorrect password"
-#~ msgstr "verkeerde wagwoord"
-
-#~ msgid "using restricted shell %s"
-#~ msgstr "gebruik tans beperkte dop %s"
-
-#~ msgid "warning: cannot change directory to %s"
-#~ msgstr "waarskuwing: kan nie chdir uitvoer na gids %s toe nie"
-
-#~ msgid ""
-#~ "      --no-preserve-root  do not treat `/' specially (the default)\n"
-#~ "      --preserve-root     fail to operate recursively on `/'\n"
-#~ msgstr ""
-#~ "      --no-preserve-root  moenie  `/' spesiaal anders hanteer nie (by "
-#~ "verstek)\n"
-#~ "      --preserve-root    moenie rekursief te werk gaan met `/' nie\n"
-
-#~ msgid ""
-#~ "Change the mode of each FILE to MODE.\n"
-#~ "\n"
-#~ "  -c, --changes           like verbose but report only when a change is "
-#~ "made\n"
-#~ msgstr ""
-#~ "Verander die modus vir elke LÊER na MODUS.\n"
-#~ "\n"
-#~ "  -c, --changes           soos verbose maar meld slegs veranderinge\n"
-
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: onwettige opsie -- %c\n"
 
@@ -10376,12 +10369,34 @@ msgstr ""
 #~ msgid "%s"
 #~ msgstr "%s"
 
+#~ msgid ""
+#~ "Change the mode of each FILE to MODE.\n"
+#~ "\n"
+#~ "  -c, --changes           like verbose but report only when a change is "
+#~ "made\n"
+#~ msgstr ""
+#~ "Verander die modus vir elke LÊER na MODUS.\n"
+#~ "\n"
+#~ "  -c, --changes           soos verbose maar meld slegs veranderinge\n"
+
+#~ msgid "reading %s"
+#~ msgstr "besig om %s te lees"
+
+#~ msgid "writing %s"
+#~ msgstr "besig om %s te skryf"
+
+#~ msgid "closing %s"
+#~ msgstr "besig om %s toe te maak"
+
 #~ msgid "cannot overwrite directory %s"
 #~ msgstr "kan nie die gids %s oorskryf nie"
 
 #~ msgid "cannot create link %s"
 #~ msgstr "kan nie die skakel %s skep nie"
 
+#~ msgid "accessing %s"
+#~ msgstr "verkry toegang na %s"
+
 #~ msgid "%s: specified destination directory does not exist"
 #~ msgstr "%s: die gespesifiseerde doelgids bestaan nie"
 
@@ -10430,6 +10445,9 @@ msgstr ""
 #~ msgid "unrecognized option %s=%s"
 #~ msgstr "onbekende opsie %s=%s"
 
+#~ msgid "opening %s"
+#~ msgstr "%s word oopgemaak"
+
 #~ msgid "file offset out of range"
 #~ msgstr "lêeruitwyking buite bereik"
 
@@ -10448,6 +10466,9 @@ msgstr ""
 #~ msgid "%s: number of bytes is large"
 #~ msgstr "%s: aantal grepe is groot"
 
+#~ msgid "cannot reposition file pointer for %s"
+#~ msgstr "kan nie die lêerwyser herposisioneer vir %s nie"
+
 #~ msgid "unrecognized option `-%c'"
 #~ msgstr "onherkenbare opsie `-%c'"
 
@@ -10457,17 +10478,14 @@ msgstr ""
 #~ msgid "cannot print only user and only group"
 #~ msgstr "kan nie slegs gebruikernaam of slegs groepnaam druk nie"
 
-#~ msgid "cannot get supplemental group list"
-#~ msgstr "kan nie aanvullende groeplys verkry nie"
-
 #~ msgid "%s is a directory"
 #~ msgstr "%s is 'n gids"
 
 #~ msgid "strip failed"
 #~ msgstr "strip het misluk"
 
-#~ msgid "too many non-option arguments"
-#~ msgstr "te veel nie-opsie parameters"
+#~ msgid "invalid field number: `%s'"
+#~ msgstr "ongeldige veldnommer: `%s'"
 
 #~ msgid "invalid field number for file 1: `%s'"
 #~ msgstr "ongeldige veldnommer vir lêer 1: `%s'"
@@ -10526,9 +10544,6 @@ msgstr ""
 #~ msgid "wrong number of arguments"
 #~ msgstr "verkeerde aantal parameters"
 
-#~ msgid "cannot set permissions of %s"
-#~ msgstr "kan nie  toegangsregte van %s verander nie"
-
 #~ msgid "invalid option `%s'"
 #~ msgstr "ongeldige opsie `%s'"
 
@@ -10592,6 +10607,9 @@ msgstr ""
 #~ msgid "Usage: %s format [argument...]\n"
 #~ msgstr "Gebruik so: %s formaat [parameter]...\n"
 
+#~ msgid "Usage: %s [OPTION]... FILE\n"
+#~ msgstr "Gebruik so:  %s [OPSIE]...  LÊER \n"
+
 #~ msgid "cannot chdir from %s to .."
 #~ msgstr "kan nie chdir doen vanaf gids %s na ... nie"
 
@@ -10613,6 +10631,9 @@ msgstr ""
 #~ msgid "invalid format string: `%s'"
 #~ msgstr "ongeldige formaatstring: `%s'"
 
+#~ msgid "cannot set user-ID to %ld"
+#~ msgstr "kan nie gebruiker-ID na %ld verander nie"
+
 #~ msgid "Usage: %s [OPTIONS] FILE [...]\n"
 #~ msgstr "Gebruik so:  %s [OPSIES]  LÊER [...]\n"
 
@@ -10634,6 +10655,30 @@ msgstr ""
 #~ msgid "new_mode: mode\n"
 #~ msgstr "nuwe_modus: modus\n"
 
+#~ msgid "Password:"
+#~ msgstr "Wagwoord:"
+
+#~ msgid "getpass: cannot open /dev/tty"
+#~ msgstr "getpass: kan nie /dev/tty oopmaak nie"
+
+#~ msgid "cannot set groups"
+#~ msgstr "kan nie groepe stel nie"
+
+#~ msgid "cannot set group id"
+#~ msgstr "kan nie die groep-id stel nie"
+
+#~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n"
+#~ msgstr "Gebruik so: %s [OPSIE]... [-] [GEBRUIKER [ARG]...]\n"
+
+#~ msgid "user %s does not exist"
+#~ msgstr "gebruiker %s bestaan nie"
+
+#~ msgid "incorrect password"
+#~ msgstr "verkeerde wagwoord"
+
+#~ msgid "using restricted shell %s"
+#~ msgstr "gebruik tans beperkte dop %s"
+
 #~ msgid "stdin: read error"
 #~ msgstr "stdin: leesfout"
 
diff --git a/po/be.gmo b/po/be.gmo
index c138bed7..2fa5c7f2 100644
--- a/po/be.gmo
+++ b/po/be.gmo
diff --git a/po/be.po b/po/be.po
index 87c20e19..c9a662b3 100644
--- a/po/be.po
+++ b/po/be.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: coreutils 5.97\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
 "PO-Revision-Date: 2006-08-16 03:27+0300\n"
 "Last-Translator: Alexander Nyakhaychyk <nyakhaychyk@gmail.com>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -39,76 +39,123 @@ msgstr "Р�чаі�ны� довады:"
 msgid "error closing file"
 msgstr "зачын�ецца файл уводу %s"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "памылка запі�у"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, fuzzy, c-format
 msgid "preserving permissions for %s"
 msgstr "у�тал�ваньне правоў дл� %s"
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "�ев�дома� �і�т�мна� памылка"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "звычайны парожні файл"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "звычайны файл"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "т�чка"
 
-#: lib/file-type.c:44
-msgid "block special file"
-msgstr "а�аблівы кавалкавы файл"
-
-#: lib/file-type.c:47
-msgid "character special file"
-msgstr "а�аблівы знакавы файл"
-
-#: lib/file-type.c:50
-msgid "fifo"
-msgstr "fifo"
-
-#: lib/file-type.c:53
+#: lib/file-type.c:46
 msgid "symbolic link"
 msgstr "знакавае лучыва"
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "socket"
-
-#: lib/file-type.c:59
+#: lib/file-type.c:52
 msgid "message queue"
 msgstr "чарга паведамленьн�ў"
 
-#: lib/file-type.c:62
+#: lib/file-type.c:55
 msgid "semaphore"
 msgstr "��мафор"
 
-#: lib/file-type.c:65
+#: lib/file-type.c:58
 msgid "shared memory object"
 msgstr "абьект з агульнай пам�цьцю"
 
-#: lib/file-type.c:68
+#: lib/file-type.c:61
 msgid "typed memory object"
 msgstr "тыпізаваны аб'ект пам�ці"
 
-#: lib/file-type.c:70
+#: lib/file-type.c:66
+msgid "block special file"
+msgstr "а�аблівы кавалкавы файл"
+
+#: lib/file-type.c:69
+msgid "character special file"
+msgstr "а�аблівы знакавы файл"
+
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr ""
+
+#: lib/file-type.c:75
+msgid "fifo"
+msgstr "fifo"
+
+#: lib/file-type.c:78
+msgid "door"
+msgstr ""
+
+#: lib/file-type.c:81
+#, fuzzy
+msgid "multiplexed block special file"
+msgstr "а�аблівы кавалкавы файл"
+
+#: lib/file-type.c:84
+#, fuzzy
+msgid "multiplexed character special file"
+msgstr "а�аблівы знакавы файл"
+
+#: lib/file-type.c:87
+msgid "multiplexed file"
+msgstr ""
+
+#: lib/file-type.c:90
+#, fuzzy
+msgid "named file"
+msgstr "лё�авы файл"
+
+#: lib/file-type.c:93
+#, fuzzy
+msgid "network special file"
+msgstr "а�аблівы кавалкавы файл"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr ""
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr ""
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr ""
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "socket"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr ""
+
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "лё�авы файл"
 
@@ -243,18 +290,18 @@ msgstr "%s: выбар `-W %s' не дазвал�е довад\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: выбар `%s' патрабуе довад\n"
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr "немагчыма зьм�ніць правы %s"
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "немагчыма �тварыць т�чку %s"
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr "пам�ць вычарпана"
@@ -380,7 +427,7 @@ msgstr "памылка ў �упа�таўл�льніку �талых выра
 msgid "Unmatched ) or \\)"
 msgstr ""
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 #, fuzzy
 msgid "No previous regular expression"
 msgstr "памылка ў пошуку звычайнага выразу"
@@ -406,7 +453,7 @@ msgstr ""
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[тТ]"
 
@@ -416,11 +463,11 @@ msgstr "^[тТ]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[н�]"
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, c-format
 msgid "setting permissions for %s"
 msgstr "у�тал�ваньне правоў дл� %s"
@@ -566,18 +613,6 @@ msgstr "памылка адкрыцьц�"
 msgid "Resource lost"
 msgstr ""
 
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, fuzzy, c-format
-msgid "cannot create pipe"
-msgstr "немагчыма �тварыць fifo %s"
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, fuzzy, c-format
-msgid "%s subprocess failed"
-msgstr "%s: збой seek"
-
 #: lib/strsignal.c:114
 #, fuzzy, c-format
 msgid "Real-time signal %d"
@@ -779,7 +814,7 @@ msgstr ""
 "\n"
 "Паведамл�йце пра памылкі на <%s>.\n"
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr ""
@@ -789,30 +824,10 @@ msgstr ""
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr ""
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr ""
 
-#: lib/w32spawn.h:43
-#, fuzzy, c-format
-msgid "_open_osfhandle failed"
-msgstr "памылка адкрыцьц�"
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr ""
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr ""
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr ""
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr ""
@@ -835,7 +850,7 @@ msgstr "�ев�дома� �і�т�мна� памылка"
 msgid "failed to reopen %s with mode %s"
 msgstr "немагчыма адчыніць %s"
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr "памылка параўнаньн� радку"
@@ -876,15 +891,11 @@ msgid "Simon Josefsson"
 msgstr ""
 
 #: src/base64.c:60
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
 "Base64 encode or decode FILE, or standard input, to standard output.\n"
 msgstr ""
-"Выкары�таньне: %s [ВЫБ�Р] [Ф�ЙЛ]...\n"
-"  ці:  %s [ВЫБ�Р] --check [Ф�ЙЛ]\n"
-"Друкуе ці прав�рае %s (%d-бітавую) праверчую �уму.\n"
-"Калі файл незаданы, ці калі заме�т �го прац�жнік, чытае �тандартны ўвод.\n"
 
 #: src/base64.c:67
 msgid ""
@@ -896,7 +907,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -913,48 +924,47 @@ msgid ""
 "from any other non-alphabet bytes in the encoded stream.\n"
 msgstr ""
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "памылка чытаньн�"
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, fuzzy, c-format
 msgid "invalid input"
 msgstr "нер�чаі�ны �ьц�г уводу: %s"
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, fuzzy, c-format
 msgid "invalid wrap size: %s"
 msgstr "незразумелы памер табул�цыі: %s"
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, c-format
 msgid "extra operand %s"
 msgstr "непатр�бны аргум�нт %s"
 
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, c-format
 msgid "closing standard input"
 msgstr "зачыненьне �тандартнага уводу"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -985,8 +995,8 @@ msgstr ""
 #: src/basename.c:60
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/basename.c:67
@@ -1000,32 +1010,31 @@ msgid ""
 "  %s -a any/str1 any/str2   -> \"str1\" followed by \"str2\"\n"
 msgstr ""
 
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, c-format
 msgid "missing operand"
 msgstr "прапушчаны аргумент"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 msgid "Richard M. Stallman"
 msgstr ""
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1084,7 +1093,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr "немагчыма выканаць ioctl на %s"
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr "�тандартны вывад"
@@ -1101,14 +1110,14 @@ msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 msgid "Jim Meyering"
 msgstr ""
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, fuzzy, c-format
 msgid "failed to create security context: %s"
 msgstr "немагчыма зьм�ніць уладальніка %s\n"
@@ -1118,8 +1127,8 @@ msgstr "немагчыма зьм�ніць уладальніка %s\n"
 msgid "failed to set %s security context component to %s"
 msgstr ""
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, fuzzy, c-format
 msgid "failed to get security context of %s"
 msgstr "немагчыма атрымаць атрыбуты %s"
@@ -1129,18 +1138,18 @@ msgstr "немагчыма атрымаць атрыбуты %s"
 msgid "can't apply partial context to unlabeled file %s"
 msgstr ""
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, fuzzy, c-format
 msgid "failed to change context of %s to %s"
 msgstr "немагчыма зьм�ніць уладальніка %s на %s\n"
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
 msgstr "немагчыма атрымаць до�туп да %s"
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, c-format
 msgid "cannot read directory %s"
 msgstr "немагчыма прачытаць т�чку %s"
@@ -1150,13 +1159,14 @@ msgstr "немагчыма прачытаць т�чку %s"
 msgid "changing security context of %s\n"
 msgstr "зьм�неньне правоў %s"
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, c-format
 msgid "fts_read failed"
 msgstr "збой fts_read"
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, fuzzy, c-format
 msgid "fts_close failed"
 msgstr "памылка закрыцьц�"
@@ -1174,7 +1184,7 @@ msgstr ""
 
 #: src/chcon.c:357
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
@@ -1195,25 +1205,18 @@ msgid ""
 "  -l, --range=RANGE      set range RANGE in the target security context\n"
 msgstr ""
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
 "      --preserve-root    fail to operate recursively on '/'\n"
 msgstr ""
 
 #: src/chcon.c:379
-#, fuzzy
 msgid ""
 "      --reference=RFILE  use RFILE's security context rather than "
 "specifying\n"
 "                         a CONTEXT value\n"
 msgstr ""
-"  -f, --silent, --quiet  не адлю�троўваць а�ноўны� паведамленьні аб "
-"памылках\n"
-"      --reference=RФ�ЙЛ  выкары�тоўвае ўладальніка й групу RФ�ЙЛу заме�т\n"
-"                          зададзеных знач�ньн�ў УЛ�Д�ЛЬ�ІК:ГРУП�\n"
-"  -R, --recursive        апрацоўвае файлы й т�чкі р�кур�ыўна\n"
-"  -v, --verbose          выводзіць праверку дл� кожнага апрацаванага файлу\n"
 
 #: src/chcon.c:383 src/chgrp.c:140 src/chown.c:118
 msgid "  -R, --recursive        operate on files and directories recursively\n"
@@ -1238,36 +1241,37 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr "-R --dereference патрабуе альо -H альбо -L"
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr "-R -h патрабуе -P"
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, c-format
 msgid "missing operand after %s"
 msgstr "прапушчаны аргумент па�л� %s"
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, fuzzy, c-format
 msgid "invalid context: %s"
 msgstr "нер�чаі�ны р�жым: %s"
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr ""
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, c-format
 msgid "failed to get attributes of %s"
 msgstr "немагчыма атрымаць атрыбуты %s"
@@ -1293,7 +1297,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
@@ -1321,48 +1325,48 @@ msgid ""
 "  %s -hR staff /u  Change the group of /u and subfiles to \"staff\".\n"
 msgstr ""
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
 msgstr "атрыманьне новых атрыбутаў %s"
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr ""
 "ні знакавае лучува %s ні файл, на �кі �но �па�ылаецца, не былі зьменены\n"
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, fuzzy, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr "р�жым %s зьменены на %04lo (%s)\n"
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, fuzzy, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr "немагчыма зьм�ніць р�жым %s на %04lo (%s)\n"
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr "р�жым %s утрыманы �к %04lo (%s)\n"
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, fuzzy, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr "немагчыма �тварыць знакавае лучыва %s"
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, c-format
 msgid "changing permissions of %s"
 msgstr "зьм�неньне правоў %s"
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr "%s: новы� правы: %s, заме�т %s"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1373,29 +1377,22 @@ msgstr ""
 "  ці:  %s [ВЫБ�Р]... В�СЬМЯРЫЧ�Ы_РЭЖЫМ Ф�ЙЛ...\n"
 "  ці:  %s [ВЫБ�Р]... --reference=RФ�ЙЛ Ф�ЙЛ...\n"
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 msgid ""
 "Change the mode of each FILE to MODE.\n"
 "With --reference, change the mode of each FILE to that of RFILE.\n"
 "\n"
 msgstr ""
 
-#: src/chmod.c:391
-#, fuzzy
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
-"  -f, --silent, --quiet  не адлю�троўваць а�ноўны� паведамленьні аб "
-"памылках\n"
-"      --reference=RФ�ЙЛ  выкары�тоўвае ўладальніка й групу RФ�ЙЛу заме�т\n"
-"                          зададзеных знач�ньн�ў УЛ�Д�ЛЬ�ІК:ГРУП�\n"
-"  -R, --recursive        апрацоўвае файлы й т�чкі р�кур�ыўна\n"
-"  -v, --verbose          выводзіць праверку дл� кожнага апрацаванага файлу\n"
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr ""
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 #, fuzzy
 msgid ""
 "\n"
@@ -1404,12 +1401,12 @@ msgstr ""
 "\n"
 "Кожны РЭЖЫМ �кладаецца з \"[ugoa]*([-+=]([rwxXst]*|[ugo]))+\".\n"
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr "немагчыма �ум��ьціць р�жым і парам�тры --reference"
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, c-format
 msgid "invalid mode: %s"
 msgstr "нер�чаі�ны р�жым: %s"
@@ -1560,26 +1557,21 @@ msgstr ""
 "  %s -hR root /u    Зьм�н�е ўладальніка /u і �убфайлаў на \"root\".\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr ""
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr "нер�чаі�на� група %s"
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, fuzzy, c-format
 msgid "invalid group list %s"
 msgstr "нер�чаі�на� група %s"
 
-#: src/chroot.c:117
-#, fuzzy, c-format
-msgid "failed to set additional groups"
-msgstr "збой stat %s"
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
@@ -1588,7 +1580,7 @@ msgstr ""
 "Выкары�таньне: %s �ОВЫ_ROOT [З�Г�Д...]\n"
 "  ці:  %s ВЫБ�Р\n"
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
@@ -1596,13 +1588,13 @@ msgstr ""
 "Запу�кае З�Г�Д з новай каранёвай т�чкай.\n"
 "\n"
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
 msgstr ""
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 #, fuzzy
 msgid ""
 "\n"
@@ -1611,28 +1603,42 @@ msgstr ""
 "\n"
 "Калі не атрыман загад, выконвае ``${SHELL} -i'' (дапомна: /bin/sh).\n"
 
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, c-format
 msgid "cannot change root directory to %s"
 msgstr "немагчыма зьм�ніць каранёвую т�чку на %s"
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, c-format
 msgid "cannot chdir to root directory"
 msgstr "немачыма перай�ьці да каранёвае т�чкі"
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr ""
+
+#: src/chroot.c:383
+#, fuzzy, c-format
+msgid "failed to get supplemental groups"
+msgstr "немагчыма атрымаць �ьпі� дадатковых групаў"
+
+#: src/chroot.c:395
+#, fuzzy, c-format
+msgid "failed to %s supplemental groups"
+msgstr "немагчыма ў�тал�ваць дадатковую групу"
+
+#: src/chroot.c:402
 #, fuzzy, c-format
 msgid "failed to set group-ID"
 msgstr "збой stat %s"
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, fuzzy, c-format
 msgid "failed to set user-ID"
 msgstr "збой stat %s"
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, fuzzy, c-format
 msgid "failed to run command %s"
 msgstr "немагчыма выканаць загад %s"
@@ -1664,7 +1670,7 @@ msgstr ""
 "Друкуе CRC падлік і колька�ьць байтаў кожнага Ф�ЙЛу.\n"
 "\n"
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr "Выкары�таньне: %s [П�Р�МЭТ�Р]... Ф�ЙЛ1 Ф�ЙЛ2\n"
@@ -1737,294 +1743,327 @@ msgstr "заданы� шматлікі� файлы вываду"
 msgid "empty %s not allowed"
 msgstr ""
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr "памылка чытаньн� %s"
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, c-format
 msgid "cannot lseek %s"
 msgstr "немагчыма зрабіць lseek %s"
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr "памылка запі�у %s"
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, fuzzy, c-format
 msgid "%s: failed to get extents info"
 msgstr "%s: немагчыма выдаліць"
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, fuzzy, c-format
 msgid "%s: write failed"
 msgstr "памылка запі�у"
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, fuzzy, c-format
 msgid "failed to extend %s"
 msgstr "немагчыма адчыніць %s"
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, fuzzy, c-format
 msgid "clearing permissions for %s"
 msgstr "у�тал�ваньне правоў дл� %s"
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "памылка пры захаваньні ўладальніку дл� %s"
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
 msgstr "немагчыма адшукаць файл %s"
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, c-format
 msgid "failed to preserve authorship for %s"
 msgstr "збой пры захаваньні аўтар�тва дл� %s"
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
+#, fuzzy, c-format
+msgid "failed to set default file creation context to %s"
+msgstr "немагчыма атрымаць атрыбуты %s"
+
+#: src/copy.c:820
+#, fuzzy, c-format
+msgid "failed to set default file creation context for %s"
+msgstr "немагчыма атрымаць атрыбуты %s"
+
+#: src/copy.c:846
+#, fuzzy, c-format
+msgid "failed to set the security context of %s"
+msgstr "немагчыма атрымаць атрыбуты %s"
+
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
 msgid "cannot open %s for reading"
 msgstr "немагыма адчыніць %s дл� чытаньн�"
 
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, c-format
 msgid "cannot fstat %s"
 msgstr "немагчыма выканаць fstat %s"
 
-#: src/copy.c:820
+#: src/copy.c:935
 #, c-format
 msgid "skipping file %s, as it was replaced while being copied"
 msgstr "файл %s мінаецца, таму што ён быў заменены пад ча� капі�ваньн�"
 
-#: src/copy.c:850
-#, c-format
-msgid "failed to get file system create context"
-msgstr ""
-
-#: src/copy.c:864
-#, fuzzy, c-format
-msgid "failed to set the security context of %s to %s"
-msgstr "немагчыма зьм�ніць групу %s на %s\n"
-
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
 msgid "cannot remove %s"
 msgstr "немагчыма выдаліць %s"
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
 msgstr "выдален %s\n"
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr ""
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, c-format
 msgid "cannot create regular file %s"
 msgstr "немагчыма �тварыць звычайны файл %s"
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, fuzzy, c-format
 msgid "failed to clone %s from %s"
 msgstr "немагчыма адчыніць %s"
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr "захоўвае ча� дл� %s"
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
 #, fuzzy, c-format
 msgid "failed to close %s"
 msgstr "немагчыма адчыніць %s"
 
-#: src/copy.c:1471
+#: src/copy.c:1580
 #, fuzzy, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
 msgstr "%s: перазапі�аць %s, р�жым перазапі�у %04lo? "
 
-#: src/copy.c:1478
+#: src/copy.c:1581
+#, c-format
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr ""
+
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
 msgstr "%s: перазапі�аць %s? "
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr " (запа�ны: %s)"
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr ""
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, c-format
 msgid "cannot create hard link %s to %s"
 msgstr "немагчыма �тварыць жор�ткае лучыва %s на %s"
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, c-format
 msgid "cannot stat %s"
 msgstr "немагчыма зрабіць stat %s"
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, c-format
 msgid "omitting directory %s"
 msgstr "мінаецца т�чка %s"
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr "увага: зыходны файл %s зададзены больш за адзін раз"
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
 msgstr "%s і %s адзін і той жа ж файл"
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr "немагчыма перазапі�аць н� т�чку %s т�чкай %s"
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr "толькі што �твораны %s з %s н� будзе перазапі�аны"
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr "немагчыма перазапі�аць т�чку %s н� т�чкай"
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr "немагчыма перам��ьціць т�чку ў н� т�чку: %s -> %s"
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr "�твар�ньне запа�ной копіі %s зьнішчыць крыніцу;  %s не перане�ен"
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr "�твар�ньне запа�ной копіі %s зьнішчыць крыніцу;  %s не �капі�ван"
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
 msgstr "немагчыма �тварыць запа�ную копію %s"
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, fuzzy, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr "толькі што �твораны %s з %s н� будзе перазапі�аны"
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr "немагчыма �капі�ваць т�чку, %s, �аму ў ��бе, %s"
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr "жор�ткае лучыва %s на т�чку %s н� будзе �творана"
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr "немагчыма перам��ьціць %s ва ўла�ную падт�чку, %s"
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, c-format
 msgid "cannot move %s to %s"
 msgstr "немагчыма перам��ьціць %s у %s"
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr "збой міжпрыладнага перам�шч�ньн�: %s у %s; немагчыма выдаліць м�ту"
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, fuzzy, c-format
-msgid "failed to set default file creation context to %s"
-msgstr "немагчыма атрымаць атрыбуты %s"
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr "немагчыма �капі�ваць цыклічнае знакавае лучыва %s"
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr "%s: можа �тварыць адно�нае знакавае лучыва толькі ў б�гучае т�чцы"
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr "немагчыма �тварыць знакавае лучыва %s на %s"
 
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, c-format
 msgid "cannot create fifo %s"
 msgstr "немагчыма �тварыць fifo %s"
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, c-format
 msgid "cannot create special file %s"
 msgstr "немагчыма �тварыць а�аблівы файл %s"
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, c-format
 msgid "cannot read symbolic link %s"
 msgstr "немагчыма прачытаць знакавае лучыва %s"
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, c-format
 msgid "cannot create symbolic link %s"
 msgstr "немагчыма �тварыць знакавае лучыва %s"
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
 msgstr "%s мае нев�домы від файлу"
 
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, c-format
 msgid "cannot un-backup %s"
 msgstr "немагчыма ва�танавіць %s з запа�ное копіі"
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr "%s -> %s (ва�танаўленьне)\n"
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr ""
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr ""
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, fuzzy, c-format
+msgid "unknown program %s"
+msgstr "нев�домы ID кары�тальніка: %s"
+
+#: src/cp.c:157 src/mv.c:288
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -2035,14 +2074,14 @@ msgstr ""
 "  ці:  %s [ВЫБ�Р]... �ДКУЛЬ... ТЭЧК�\n"
 "  ці:  %s [ВЫБ�Р]... --target-directory=ТЭЧК� �ДКУЛЬ...\n"
 
-#: src/cp.c:162
+#: src/cp.c:163
 #, fuzzy
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 "Капуе КРЫ�ІЦу ў ПРЫЗ��ЧЭ�Ь�Е; ці шматлікі� КРЫ�ІЦ(ы) у ТЭЧКу.\n"
 "\n"
 
-#: src/cp.c:168
+#: src/cp.c:169
 #, fuzzy
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
@@ -2066,7 +2105,7 @@ msgstr ""
 "  -d                           тое ж, што й --no-dereference --"
 "preserve=link\n"
 
-#: src/cp.c:177
+#: src/cp.c:178
 #, fuzzy
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
@@ -2087,13 +2126,13 @@ msgstr ""
 "  -i, --interactive            паведаміць перад перазапі�ам\n"
 "  -H                           і�ьці за знакавымі лучывамі ў загадным радку\n"
 
-#: src/cp.c:186
+#: src/cp.c:187
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
 "  -L, --dereference            always follow symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:190
+#: src/cp.c:191
 #, fuzzy
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
@@ -2108,7 +2147,7 @@ msgstr ""
 "  -i, --interactive            паведаміць перад перазапі�ам\n"
 "  -H                           і�ьці за знакавымі лучывамі ў загадным радку\n"
 
-#: src/cp.c:195
+#: src/cp.c:196
 #, fuzzy
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
@@ -2126,7 +2165,7 @@ msgstr ""
 "                                 mode,ownership,timestamps), калі магчыма,\n"
 "                                 дадатковы� атрыбуты: links, all\n"
 
-#: src/cp.c:203
+#: src/cp.c:204
 #, fuzzy
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
@@ -2137,7 +2176,7 @@ msgstr ""
 "      --parents                дадаць зыходны шл�х да ТЭЧКі\n"
 "  -P                           �к і `--no-dereference'\n"
 
-#: src/cp.c:207
+#: src/cp.c:208
 #, fuzzy
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
@@ -2151,7 +2190,7 @@ msgstr ""
 "                                 перад тым �к адчыніць �го (у разр�з з --"
 "force)\n"
 
-#: src/cp.c:213
+#: src/cp.c:214
 #, fuzzy
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
@@ -2166,7 +2205,7 @@ msgstr ""
 "доваду\n"
 "                                 КРЫ�ІЦы\n"
 
-#: src/cp.c:218
+#: src/cp.c:219
 #, fuzzy
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
@@ -2179,7 +2218,7 @@ msgstr ""
 "  -S, --suffix=К��Ч�Т�К        перазапі�вае звычайны канчатак запа�у\n"
 "      --target-directory=ТЭЧК� перам�шчае ў�е довады КРЫ�ІЦы ў ТЭЧКу\n"
 
-#: src/cp.c:224
+#: src/cp.c:225
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
 "                                 than the destination file or when the\n"
@@ -2194,7 +2233,15 @@ msgstr ""
 "  -v, --verbose                пведамл�е што ўжо зроблена\n"
 "  -x, --one-file-system        не пакідаць межы г�тае файлавае �ы�т�мы\n"
 
-#: src/cp.c:233
+#: src/cp.c:232
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/cp.c:240
 #, fuzzy
 msgid ""
 "\n"
@@ -2221,7 +2268,7 @@ msgstr ""
 "нул�вых байтаў. Выкары�тоўвайце--sparse=never дл� забароны �твар�ньн�\n"
 "\"sparse\" файлаў.\n"
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 #, fuzzy
 msgid ""
 "\n"
@@ -2237,7 +2284,7 @@ msgstr ""
 "пераменную а��родзьдз� VERSION_CONTROL.  Магчыма� знач�ньні:\n"
 "\n"
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2249,7 +2296,7 @@ msgstr ""
 "  existing, nil   нумараваць, калі й�нуе нумараваны, інакш не нумараваць\n"
 "  simple, never   заў�ёды �твараць ненумараваны�\n"
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2260,220 +2307,230 @@ msgstr ""
 "    Загад cp запа�іць КРЫ�ІЦы калі зададзены выбары -f і -b, і калі\n"
 "КРЫ�ІЦ� й ПРЫЗ��ЧЭ�Ь�Е адна й та� ж назва і�нуючага звычанага файлу.\n"
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, c-format
 msgid "failed to preserve times for %s"
 msgstr "збой пры захаваньні ча�у дл� %s"
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, c-format
 msgid "failed to preserve permissions for %s"
 msgstr "збой пры захаваньні правоў дл� %s"
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, c-format
 msgid "cannot make directory %s"
 msgstr "немагчыма �тварыць т�чку %s"
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr "%s і�нуе, але г�та н� т�чка"
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
 #, fuzzy, c-format
 msgid "failed to access %s"
 msgstr "немагчыма адчыніць %s"
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, c-format
 msgid "missing file operand"
 msgstr "прапушчаны файлавы довад"
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, c-format
 msgid "missing destination file operand after %s"
 msgstr "прапушчаны файл прызнач�ньн� па�ьл� %s"
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, fuzzy, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr "�емагчыма ўжыць разам --target-directory і --no-target-directory"
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, c-format
 msgid "target %s is not a directory"
 msgstr "згадана� м�та %s не з'�ўл�ецца т�чкай"
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr "калі зададзены --parents, прызнач�ньне му�іць быць дыр�кторы�й"
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, c-format
 msgid "multiple target directories specified"
 msgstr "зададзены некалькі дыр�кторы�ў прызнач�ньн�"
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr ""
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr "немагчыма �тварыць ні жор�ткае, ні знакавае лучыва"
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, fuzzy, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr "выбары, што вызначаюць дату дл� друку ўзаема выключны�"
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr ""
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr "від запа�ной копіі"
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, c-format
+msgid "cannot set target context and preserve it"
+msgstr ""
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr ""
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr ""
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr "увод неда�тупны"
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr "%s: нумар радку за дапушчальнымі межамі"
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, c-format
 msgid "%s: %s: line number out of range"
 msgstr "%s: %s: нумар радка па-за дазволенымі межамі"
 
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, c-format
 msgid " on repetition %s\n"
 msgstr " на паўтар�ньні %s\n"
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, c-format
 msgid "%s: %s: match not found"
 msgstr "%s: %s: �упадзеньне н� знойдзена"
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr "памылка ў пошуку звычайнага выразу"
 
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, c-format
 msgid "write error for %s"
 msgstr "памылка запі�у дл� %s"
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, c-format
 msgid "%s: integer expected after delimiter"
 msgstr "%s: па�ьл� падз�л�льніка чакаецца ц�лы лік"
 
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, fuzzy, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr "%s: `}' патрабуецца дл� падліку паўтораў"
 
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, fuzzy, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr "%s}: ц�лы патрабуецца паміж `{' і `}'"
 
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, fuzzy, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr "%s: прапушчаны падз�л�льнік зачыненьн� `%c'"
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr "%s: нер�чаі�ны �талы выраз: %s"
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr "%s: нер�чаі�ны прыклад"
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr "%s: нумар радку павінен быць большым за нуль."
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr "нумар радка %s меншы за нумар пап�р�дн�га радка, %s"
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr "Увага! �умар радка %s �упадае з нумарам пап�р�дн�га радка."
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr "прапушчан вызначальнік пераўтвар�ньн� ва ў�таўцы"
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr "нер�чаі�ны вызначальнік пераўтвар�ньн� ва ў�таўцы: %c"
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr "нер�чаі�ны вызначальнік пераўтвар�ньн� ва ў�таўцы: \\%.3o"
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, fuzzy, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr "%s: нер�чаі�на� �п�цыфікацы� пол� \"%s\""
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr "за шмат ва ў�таўцы %% вызначальнікаў пераўтвар�ньн�"
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr "ва ў�таўцы прапушчан %% вызначальнік пераўтвар�ньн�"
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr "%s: нер�чаі�ны нумар"
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr "Выкары�таньне: %s [ВЫБ�Р]... Ф�ЙЛ УЗОР..\n"
 
-#: src/csplit.c:1455
+#: src/csplit.c:1483
 #, fuzzy
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
@@ -2483,7 +2540,7 @@ msgstr ""
 "так�ама выводзіць на �тандартны вывад колька�ьць байтаў у кожным кавалку.\n"
 "\n"
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, fuzzy, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2494,7 +2551,11 @@ msgstr ""
 "  -f, --prefix=ПРЫСТ�ЎК�       Выкары�тоўваць ПРЫСТ�ЎКу заме�т `xx'\n"
 "  -k, --keep-files           �е выдал�ць файлы вываду пры памылках\n"
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr ""
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
@@ -2506,7 +2567,7 @@ msgstr ""
 "  -s, --quiet, --silent      �е друкаваць падлікі памераў файлаў вываду.\n"
 "  -z, --elide-empty-files    Выдал�ць парожні� файлы вываду.\n"
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
@@ -2514,7 +2575,7 @@ msgstr ""
 "\n"
 "Чытае �тандартны ўвод, калі заме�т Ф�ЙЛа -.  Кожны ЎЗОР можа быць:\n"
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 msgid ""
 "\n"
 "  INTEGER            copy up to but not including specified line number\n"
@@ -2531,23 +2592,19 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr ""
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr ""
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, fuzzy, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr "Выкары�таньне: %s [П�Р�МЭТ�Р]... [Ф�ЙЛ]...\n"
 
-#: src/cut.c:193
+#: src/cut.c:176
 #, fuzzy
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr ""
 "    Друкуе абраны� ча�кі радкоў з кожнага Ф�ЙЛу ў �тандартны вывад.\n"
 "\n"
 
-#: src/cut.c:199
+#: src/cut.c:182
 #, fuzzy
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
@@ -2560,7 +2617,7 @@ msgstr ""
 "                                 Выкары�тоўваць адмы�ловы падз�л�льнік дл�\n"
 "                                 размежаваньн� палёў, заме�т TAB.\n"
 
-#: src/cut.c:204
+#: src/cut.c:187
 #, fuzzy
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
@@ -2573,13 +2630,13 @@ msgstr ""
 "                            вын�ткам тых выпадкаў, калі заданы выбар -s.\n"
 "  -n                      (незаўважаецца)\n"
 
-#: src/cut.c:210
+#: src/cut.c:193
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
 "                            or fields\n"
 msgstr ""
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
@@ -2590,7 +2647,7 @@ msgstr ""
 "                               Выкары�тоўвае радок �к падз�л�льнік вываду;\n"
 "                               дапомна выкары�тоўваецца падз�л�льнік уводу.\n"
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2598,7 +2655,7 @@ msgid ""
 "in the same order that it is read, and is written exactly once.\n"
 msgstr ""
 
-#: src/cut.c:227
+#: src/cut.c:210
 msgid ""
 "Each range is one of:\n"
 "\n"
@@ -2610,49 +2667,53 @@ msgid ""
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
 
-#: src/cut.c:367 src/cut.c:493
+#: src/cut.c:300 src/cut.c:394
 #, fuzzy
 msgid "invalid byte, character or field list"
 msgstr "нер�чаі�ны байт ці �ьпі� пол�"
 
-#: src/cut.c:387
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr ""
+
+#: src/cut.c:320
 #, fuzzy
 msgid "invalid range with no endpoint: -"
 msgstr "незразумела� шырын� радка: %s"
 
-#: src/cut.c:403
+#: src/cut.c:334
 #, fuzzy
 msgid "invalid decreasing range"
 msgstr "�едзе�здольны прамежак �таронак %s"
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, c-format
 msgid "byte offset %s is too large"
 msgstr "байт зруху %s занадта в�лікі"
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, c-format
 msgid "field number %s is too large"
 msgstr "нумар пол� %s занадта в�лікі"
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr "толькі адзін від �ьпі�у можа быць зададзены"
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr "падз�л�льнік паінен быць адным знакам"
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr "вы павінны пазначыць �ьпі� байтаў, знакаў ці палёў"
 
-#: src/cut.c:850
+#: src/cut.c:790
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr "падз�л�льнік уводу можа быць зададзены толькі дл� дзе�ньн�ў над пал�мі"
 
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
@@ -2660,11 +2721,11 @@ msgstr ""
 "падаўленьне непадзеленых радкоў мае ��н� толькі дл�\n"
 "\tдзе�ньн�ў над пал�мі"
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr "прапушчан �ьпі� палёў"
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr "прапушчан �ьпі� �тановішчаў"
 
@@ -2707,7 +2768,7 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 "  -r, --reference=Ф�ЙЛ      �длю�троўвае ча� апошн�га зьм�неньн� файла.\n"
 "  -R, --rfc-2822            Выдае радок ча�у ўзгодна з RFC-2822.\n"
@@ -2886,10 +2947,10 @@ msgid ""
 "  $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n"
 msgstr ""
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr "�тандартны ўвод"
@@ -2927,7 +2988,7 @@ msgstr ""
 msgid "cannot set date"
 msgstr "немагчыма ў�тал�ваць дату"
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, c-format
 msgid "time %s is out of range"
 msgstr "ча� %s за дазволенымі межамі"
@@ -2938,7 +2999,7 @@ msgstr "ча� %s за дазволенымі межамі"
 msgid "Paul Rubin"
 msgstr ""
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
@@ -2947,7 +3008,7 @@ msgstr ""
 "Выкары�таньне: %s [�ПЭР��Д]...\n"
 "  або:  %s П�Р�МЭТ�Р\n"
 
-#: src/dd.c:526
+#: src/dd.c:532
 #, fuzzy
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
@@ -2968,7 +3029,7 @@ msgstr ""
 "  count=БЛ�К�Ў    Капі�ваць толькі заданую колька�ьць блёкаў уводу.\n"
 "  ibs=Б�ЙТ�Ў      Чатаць заданую колька�ьць байтаў за раз.\n"
 
-#: src/dd.c:535
+#: src/dd.c:541
 #, fuzzy
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
@@ -2989,7 +3050,7 @@ msgstr ""
 "  skip=БЛ�К�Ў     �бмінуць заданую колька�ьць блёкаў ад пачатку ў файле "
 "ўводу.\n"
 
-#: src/dd.c:546
+#: src/dd.c:552
 #, fuzzy
 msgid ""
 "\n"
@@ -3007,7 +3068,7 @@ msgstr ""
 "Кожнае ключавое �лова можа быць:\n"
 "\n"
 
-#: src/dd.c:555
+#: src/dd.c:561
 #, fuzzy
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
@@ -3034,7 +3095,7 @@ msgstr ""
 "              выкары�тоўваецца разам з block ці unblock, дадаваць прагалы,\n"
 "              заме�т нулёў.\n"
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -3050,7 +3111,7 @@ msgstr ""
 "  fdatasync  physically write output file data before finishing\n"
 "  fsync     likewise, but also write metadata\n"
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -3059,77 +3120,77 @@ msgid ""
 "suggested)\n"
 msgstr ""
 
-#: src/dd.c:583
+#: src/dd.c:589
 #, fuzzy
 msgid "  cio       use concurrent I/O for data\n"
 msgstr "  text      выкары�тоўваць т�к�тавы ўвод/вывад дл� даных\n"
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr ""
 
-#: src/dd.c:587
+#: src/dd.c:593
 #, fuzzy
 msgid "  directory  fail unless a directory\n"
 msgstr "%s: задана� т�чка м�ты не зь�ўл�ецца т�чкай"
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr ""
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr ""
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr ""
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr ""
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr ""
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr ""
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr ""
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr ""
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr ""
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr "  text      выкары�тоўваць т�к�тавы ўвод/вывад дл� даных\n"
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr ""
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, c-format
 msgid ""
 "\n"
@@ -3146,7 +3207,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
@@ -3155,7 +3226,7 @@ msgstr ""
 "%<PRIuMAX>+%<PRIuMAX> запі�аў уайшло\n"
 "%<PRIuMAX>+%<PRIuMAX> запі�аў выйшла\n"
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
@@ -3163,7 +3234,7 @@ msgstr[0] "%<PRIuMAX> абр�заны запі�\n"
 msgstr[1] "%<PRIuMAX> абр�заных запі�ы\n"
 msgstr[2] "%<PRIuMAX> абр�заных запі�аў\n"
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
@@ -3171,7 +3242,7 @@ msgstr[0] "%<PRIuMAX> байт (%s) �капі�ваны"
 msgstr[1] "%<PRIuMAX> байты (%s) �капі�вана"
 msgstr[2] "%<PRIuMAX> байтаў (%s) �капі�вана"
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr "Б��конца�ьць"
 
@@ -3185,255 +3256,254 @@ msgstr "Б��конца�ьць"
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, fuzzy, c-format
 msgid ", %g s, %s/s\n"
 msgstr ", %g ��кунда , %s/s\n"
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, c-format
 msgid "closing input file %s"
 msgstr "зачын�ецца файл уводу %s"
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr "закрываецца файл вываду %s"
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, fuzzy, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr "збой chdir у %s"
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, c-format
 msgid "writing to %s"
 msgstr "запі� у %s"
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, c-format
 msgid "unrecognized operand %s"
 msgstr "нера�пазнаны ап�ранд %s"
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 #, fuzzy
 msgid "invalid conversion"
 msgstr "нер�чаі�нае ператвар�ньне: %s"
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 #, fuzzy
 msgid "invalid input flag"
 msgstr "нер�чаі�ны �ьц�г уводу: %s"
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 #, fuzzy
 msgid "invalid output flag"
 msgstr "нер�чаі�ны �ьц�г вываду: %s"
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 #, fuzzy
 msgid "invalid status flag"
 msgstr "нер�чаі�ны �ьц�г �тату�у: %s"
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, c-format
 msgid "invalid number %s"
 msgstr "нер�чаі�ны нумар %s"
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr ""
 
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, fuzzy, c-format
 msgid "cannot combine block and unblock"
 msgstr "немагчыма абмінуць разам кары�тальніка й групу"
 
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, fuzzy, c-format
 msgid "cannot combine lcase and ucase"
 msgstr "немагчыма параўнаць назвы файлаў %s і %s"
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, c-format
 msgid "cannot combine excl and nocreat"
 msgstr ""
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, fuzzy, c-format
 msgid "cannot combine direct and nocache"
 msgstr "немагчыма параўнаць назвы файлаў %s і %s"
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
 "  of mt_type=0x%0lx -- see <sys/mtio.h> for the list of types"
 msgstr ""
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, fuzzy, c-format
 msgid "%s: cannot skip"
 msgstr "%s: немагчыма пера�унуць паказальнік"
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, c-format
 msgid "%s: cannot seek"
 msgstr "%s: немагчыма пера�унуць паказальнік"
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr "перапаўненьне зруху ц�гам чытаньн� файла %s"
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, fuzzy, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr "увага: зрух файла пашкоджаны па�ьл� памылкі чытаньн�"
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr "немагчыма абмінуць памылку �дра"
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, c-format
 msgid "setting flags for %s"
 msgstr "вы�таўленьне �ьц�гоў дл� %s"
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, fuzzy, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr "%s: немагчыма перам��ьціцца да адно�нага зруху %s"
 
-#: src/dd.c:2133
+#: src/dd.c:2172
 #, fuzzy, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
 msgstr "да��гнуты %s байтаў у файле вываду %s"
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr "збой fdatasync дл� %s"
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
 msgstr "збой fsync дл� %s"
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, c-format
 msgid "failed to open %s"
 msgstr "немагчыма адчыніць %s"
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
 "blocks"
 msgstr ""
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, fuzzy, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr "да��гнуты %s байтаў у файле вываду %s"
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, fuzzy, c-format
 msgid "failed to discard cache for: %s"
 msgstr "збой chdir у %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr ""
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr "Ф-� �ы�т�ма"
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr "Тып"
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr "блёкаў"
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr "Ужыта"
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr "Вольна"
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr "У-а%"
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr ""
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr ""
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr ""
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr ""
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr "Пункт мантаваньн�"
 
-#: src/df.c:383
-#, c-format
-msgid "option --output: field '%s' unknown"
+#: src/df.c:207
+msgid "File"
 msgstr ""
 
-#: src/df.c:390
+#: src/df.c:387
 #, fuzzy, c-format
-msgid "option --output: field '%s' used more than once"
+msgid "option --output: field %s unknown"
+msgstr "закрываецца файл вываду %s"
+
+#: src/df.c:394
+#, fuzzy, c-format
+msgid "option --output: field %s used more than once"
 msgstr "увага: зыходны файл %s зададзены больш за адзін раз"
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr "Памер"
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr "Вольна"
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr "�мі�т."
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
 msgstr ""
 
-#: src/df.c:1210
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr ""
+
+#: src/df.c:1384
 #, fuzzy
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
@@ -3444,26 +3514,20 @@ msgstr ""
 "дапомна, пра ў�е файлавы� �ы�т�мы.\n"
 "\n"
 
-#: src/df.c:1217
-#, fuzzy
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
-"  -a, --all             уключыць файлавы� �ы�т�мы �кі� маюць 0 блёкаў\n"
-"  -B, --block-size=N    выкары�тоўваць блёкі памерам N байтаў\n"
-"  -h, --human-readable  друкаваць памеры ў чалавека-чытальным фармаце\n"
-"                        (�к напрыклад, 1Кб, 234Мб, 2Гб)\n"
-"  -H, --si              гл. выш�й, але выкары�тоўваць �тупені 1000 заме�т "
-"1024\n"
 
-#: src/df.c:1227
+#: src/df.c:1402
 #, fuzzy
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
@@ -3479,7 +3543,7 @@ msgstr ""
 "      --no-sync         не выкл�каць sync перад атрыманьнем зьве�так "
 "(дапомна)\n"
 
-#: src/df.c:1234
+#: src/df.c:1409
 #, fuzzy
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
@@ -3500,43 +3564,34 @@ msgstr ""
 "                        абмежаваць вывад файлавымі �ы�т�мамі н� г�тага тыпу\n"
 "   -v                   (незаўважаецца)\n"
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
 
-#: src/df.c:1285
+#: src/df.c:1460
 #, fuzzy, c-format
 msgid "options %s and %s are mutually exclusive"
 msgstr "выбары, што вызначаюць дату дл� друку ўзаема выключны�"
 
-#: src/df.c:1335
-#, fuzzy
-msgid "warning: "
-msgstr "Увага: "
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr ""
-
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr "файлава� �ы�т�ма тыпу %s аднача�ова вылучана й выключана"
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr "Увага: "
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 #, fuzzy
 msgid "cannot read table of mounted file systems"
 msgstr "%s немагчыма прачытаць табліцу прымантаваных файлавых �ы�т�м"
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr ""
@@ -3546,7 +3601,7 @@ msgstr ""
 msgid "H. Peter Anvin"
 msgstr ""
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr "Выкары�таньне: %s [ВЫБ�Р]... [Ф�ЙЛ]\n"
@@ -3616,12 +3671,12 @@ msgstr ""
 
 #: src/dirname.c:59
 #, fuzzy
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
 msgstr ""
 "  -z, --zero-terminated        Зав�ршаць радкі байтам 0, а н� новым радком.\n"
 
 #: src/dirname.c:64
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Examples:\n"
@@ -3629,12 +3684,8 @@ msgid ""
 "  %s dir1/str dir2/str  -> \"dir1\" followed by \"dir2\"\n"
 "  %s stdio.h            -> \".\"\n"
 msgstr ""
-"\n"
-"Прыклады:\n"
-"  %s /usr/bin/sort  друкуе \"/usr/bin\".\n"
-"  %s stdio.h        друкуе \".\".\n"
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -3643,7 +3694,7 @@ msgstr ""
 "Выкары�таньне: %s [КЛЮЧ]... [Ф�ЙЛ]...\n"
 "  ці:  %s [КЛЮЧ]... --files0-from=F\n"
 
-#: src/du.c:274
+#: src/du.c:285
 #, fuzzy
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr ""
@@ -3651,11 +3702,10 @@ msgstr ""
 "р�кур�іўна дл� т�чак.\n"
 "\n"
 
-#: src/du.c:280
+#: src/du.c:291
 #, fuzzy
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3676,11 +3726,11 @@ msgstr ""
 "  -c, --total           падлічыць агульны вынік\n"
 "  -D, --dereference-args  разьв�зваць �ымбалічны� �па�ылкі\n"
 
-#: src/du.c:289
+#: src/du.c:300
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3692,17 +3742,18 @@ msgid ""
 "                          --summarize\n"
 msgstr ""
 
-#: src/du.c:302
+#: src/du.c:313
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
 
-#: src/du.c:310
+#: src/du.c:322
 msgid ""
 "  -k                    like --block-size=1K\n"
 "  -L, --dereference     dereference all symbolic links\n"
@@ -3710,16 +3761,17 @@ msgid ""
 "  -m                    like --block-size=1M\n"
 msgstr ""
 
-#: src/du.c:316
+#: src/du.c:328
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
 
-#: src/du.c:322
+#: src/du.c:334
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
 "                          or entries greater than SIZE if negative\n"
@@ -3728,79 +3780,79 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
 msgstr ""
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
 "  -x, --one-file-system    skip directories on different file systems\n"
 msgstr ""
 
-#: src/du.c:386
+#: src/du.c:398
 #, fuzzy
 msgid "Infinity"
 msgstr "Б��конца�ьць"
 
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr ""
-
-#: src/du.c:624
+#: src/du.c:636
 #, fuzzy, c-format
 msgid "fts_read failed: %s"
 msgstr "збой fts_read"
 
-#: src/du.c:780
+#: src/du.c:787
 #, c-format
 msgid "invalid maximum depth %s"
 msgstr "незразумела� найбольша� глыбін� %s"
 
-#: src/du.c:809
+#: src/du.c:816
 #, fuzzy, c-format
 msgid "invalid --threshold argument '-0'"
-msgstr "нер�чаі�ны довад %s"
+msgstr "кеп�кі ц�лы довад %s"
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr "немагчыма аднача�ова й падлічыць і паказаць у�е пункты"
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr ""
 
-#: src/du.c:900
+#: src/du.c:911
 #, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr ""
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 #, fuzzy
 msgid "file operands cannot be combined with --files0-from"
 msgstr "Файлавы� ап�ранбы н� могуць быць аб'�днаны з --print-database (-p)."
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr "%s: памылка чытаньн�"
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr ""
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 msgid "invalid zero-length file name"
 msgstr "назва файла нул�вой даўжыні"
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr "у��го"
 
@@ -3888,7 +3940,7 @@ msgstr ""
 #: src/env.c:61
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
 
@@ -3960,16 +4012,16 @@ msgid "input line is too long"
 msgstr "радок вываду задаўгі"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr ""
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
@@ -3978,7 +4030,7 @@ msgstr ""
 "Выкары�таньне: %s ВЫР�З\n"
 "  ці:  %s ВЫБ�Р\n"
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -3989,7 +4041,7 @@ msgid ""
 "  ARG1 & ARG2       ARG1 if neither argument is null or 0, otherwise 0\n"
 msgstr ""
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -4000,14 +4052,14 @@ msgid ""
 "  ARG1 > ARG2       ARG1 is greater than ARG2\n"
 msgstr ""
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
 "  ARG1 - ARG2       arithmetic difference of ARG1 and ARG2\n"
 msgstr ""
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -4016,7 +4068,7 @@ msgid ""
 "  ARG1 % ARG2       arithmetic remainder of ARG1 divided by ARG2\n"
 msgstr ""
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -4027,7 +4079,7 @@ msgid ""
 "  length STRING              length of STRING\n"
 msgstr ""
 
-#: src/expr.c:251
+#: src/expr.c:250
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
 "                               keyword like 'match' or an operator like '/'\n"
@@ -4035,7 +4087,7 @@ msgid ""
 "  ( EXPRESSION )             value of EXPRESSION\n"
 msgstr ""
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -4045,7 +4097,7 @@ msgid ""
 "0.\n"
 msgstr ""
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -4053,32 +4105,32 @@ msgid ""
 "or 0, 2 if EXPRESSION is syntactically invalid, and 3 if an error occurred.\n"
 msgstr ""
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, c-format
 msgid "syntax error"
 msgstr "�ынтак�ічна� памылка"
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, c-format
 msgid "error in regular expression matcher"
 msgstr "памылка ў �упа�таўл�льніку �талых выразаў"
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, fuzzy, c-format
 msgid "non-integer argument"
 msgstr "н� лічбавы довад"
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr "дз�леньне на нуль"
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, fuzzy, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr "У�талюйце LC_ALL='C' каб працаваць без пытаньн�ў."
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, fuzzy, c-format
 msgid "the strings compared were %s and %s"
 msgstr "Радкі былі параўнаны тут %s і тут %s."
@@ -4088,27 +4140,27 @@ msgstr "Радкі былі параўнаны тут %s і тут %s."
 msgid "Niels Moller"
 msgstr ""
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
 msgstr ""
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
 msgstr ""
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, c-format
 msgid "%s is not a valid positive integer"
 msgstr "%s  - г�та не �таноўчы ц�лы лік"
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr "%s занадта в�лікі"
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
@@ -4117,7 +4169,7 @@ msgstr ""
 "Выкары�таньне: %s [ЛІК]...\n"
 "  ці:  %s ВЫБ�Р\n"
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 #, fuzzy
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
@@ -4208,28 +4260,28 @@ msgid "invalid number of columns: %s"
 msgstr "незразумела� колька�ьць �лупкоў: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr ""
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, fuzzy, c-format
 msgid "Usage: %s\n"
 msgstr "Выкары�таньне: %s [П�Р�МЭТ�Р]\n"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
 msgstr ""
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, fuzzy, c-format
 msgid "failed to get groups for user %s"
 msgstr "немагчыма зьм�ніць групу %s на %s\n"
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, fuzzy, c-format
 msgid "failed to get groups for the current process"
 msgstr "немагчыма зьм�ніць групу %s на %s\n"
@@ -4251,22 +4303,22 @@ msgid ""
 "the current process (which may differ if the groups database has changed).\n"
 msgstr ""
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, fuzzy, c-format
 msgid "cannot get real UID"
 msgstr "немагчыма ў�тал�ваць id кары�тальніка"
 
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, fuzzy, c-format
 msgid "cannot get effective GID"
 msgstr "немагчыма знай�ьці аб'ект �па�ылкі %s"
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, fuzzy, c-format
 msgid "cannot get real GID"
 msgstr "немагчыма ў�тал�ваць id кары�тальніка"
 
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, fuzzy, c-format
 msgid "%s: no such user"
 msgstr "%s: такі кары�тальнік н� й�нуе"
@@ -4314,58 +4366,48 @@ msgstr ""
 "Кожнае ключавое �лова можа быць:\n"
 "\n"
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr ""
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, c-format
 msgid "%s: number of bytes is too large"
 msgstr "%s: колька�ьць байтаў занадта в�ліка�"
 
-#: src/head.c:440
-#, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr "%s: немагчыма перам��ьціцца назад да зыходнага �тановішча"
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr "%s: немагчыма перам��ьціцца да зруха %s"
 
-#: src/head.c:673
-#, fuzzy, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "%s: немагчыма выдаліць"
-
-#: src/head.c:798
+#: src/head.c:423 src/tail.c:457
 #, c-format
-msgid "cannot reposition file pointer for %s"
-msgstr ""
+msgid "%s: cannot seek to relative offset %s"
+msgstr "%s: немагчыма перам��ьціцца да адно�нага зруху %s"
 
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr "%s: %s такі в�лікі, што немагчыма паказаць"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr "колька�ьць радкоў"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr "колька�ьць байтаў"
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr "недзе�здольна� колька�ьць радкоў"
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr "недзе�здольна� колька�ьць байтаў"
 
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, fuzzy, c-format
 msgid "invalid trailing option -- %c"
 msgstr "нер�чаі�ны парам�тар -- %c"
@@ -4411,145 +4453,161 @@ msgid "cannot determine hostname"
 msgstr "немагчыма вызначыць назву вузла"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr ""
 
-#: src/id.c:81
-#, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
-msgstr "Выкары�таньне: %s [ВЫБ�Р]... [УЛІКОВ�Е_ЙМЯ]\n"
+#: src/id.c:84
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]... [USER]\n"
+msgstr "Выкары�таньне: %s [ВЫБ�Р]... [К�РЫСТ�ЛЬ�ІК]...\n"
 
-#: src/id.c:82
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
 msgstr ""
 
-#: src/id.c:96
+#: src/id.c:90
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
+msgstr ""
+
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
 msgstr ""
 
-#: src/id.c:140
+#: src/id.c:151
+#, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr ""
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr ""
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr ""
 
-#: src/id.c:178
+#: src/id.c:198
 #, fuzzy, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr "немагчыма вызначыць ча� больш чым з адной крыніцы"
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr ""
 
-#: src/id.c:199
+#: src/id.c:209
+#, c-format
+msgid "option --zero not permitted in default format"
+msgstr ""
+
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
 msgstr ""
 
-#: src/id.c:224
+#: src/id.c:265
 #, fuzzy, c-format
 msgid "cannot get effective UID"
 msgstr "немагчыма знай�ьці аб'ект �па�ылкі %s"
 
-#: src/id.c:311
+#: src/id.c:354
 #, fuzzy, c-format
 msgid "cannot find name for user ID %s"
 msgstr "немагчыма атрымаць ім� дл� ID кары�тальніка %u"
 
-#: src/id.c:329
+#: src/id.c:372
 #, c-format
 msgid "uid=%s"
 msgstr ""
 
-#: src/id.c:334
+#: src/id.c:377
 #, c-format
 msgid " gid=%s"
 msgstr ""
 
-#: src/id.c:341
+#: src/id.c:384
 #, c-format
 msgid " euid=%s"
 msgstr ""
 
-#: src/id.c:349
+#: src/id.c:392
 #, c-format
 msgid " egid=%s"
 msgstr ""
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr " групы="
 
-#: src/id.c:393
+#: src/id.c:437
 #, c-format
 msgid " context=%s"
 msgstr ""
 
-#: src/install.c:373
+#: src/install.c:376
 #, fuzzy, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr "Увага! �емагчыма перай�ьці да т�чкі %s"
 
-#: src/install.c:414
+#: src/install.c:417
 #, c-format
 msgid "creating directory %s"
 msgstr "�твараецца т�чка %s"
 
-#: src/install.c:482
+#: src/install.c:485
 #, c-format
 msgid "cannot change ownership of %s"
 msgstr "немагчыма зьм�ніць уладальніка %s"
 
-#: src/install.c:506
+#: src/install.c:509
 #, c-format
 msgid "cannot set time stamps for %s"
 msgstr "немагчыма ў�тал�ваць адбіткі ча�у дл� %s"
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, c-format
 msgid "fork system call failed"
 msgstr ""
 
-#: src/install.c:531
+#: src/install.c:535
 #, fuzzy, c-format
 msgid "cannot run %s"
 msgstr "немагчыма unlink %s"
 
-#: src/install.c:535
+#: src/install.c:539
 #, fuzzy, c-format
 msgid "waiting for strip"
 msgstr "запі� у %s"
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr ""
 
-#: src/install.c:558
+#: src/install.c:565
 #, c-format
 msgid "invalid user %s"
 msgstr "нер�чаі�ны кары�тальнік %s"
 
-#: src/install.c:594
+#: src/install.c:601
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -4561,7 +4619,7 @@ msgstr ""
 "  ці:  %s [ВЫБ�Р]... �ДКУЛЬ... ТЭЧК�\n"
 "  ці:  %s [ВЫБ�Р]... --target-directory=ТЭЧК� �ДКУЛЬ...\n"
 
-#: src/install.c:601
+#: src/install.c:608
 msgid ""
 "\n"
 "This install program copies files (often just compiled) into destination\n"
@@ -4575,7 +4633,7 @@ msgid ""
 "In the 4th form, create all components of the given DIRECTORY(ies).\n"
 msgstr ""
 
-#: src/install.c:615
+#: src/install.c:622
 #, fuzzy
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
@@ -4597,7 +4655,7 @@ msgstr ""
 "  -d                           тое ж, што й --no-dereference --"
 "preserve=link\n"
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -4609,7 +4667,7 @@ msgid ""
 "  -o, --owner=OWNER   set ownership (super-user only)\n"
 msgstr ""
 
-#: src/install.c:631
+#: src/install.c:638
 #, fuzzy
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
@@ -4627,60 +4685,57 @@ msgstr ""
 "  -S, --suffix=К��Ч�Т�К        перазапі�вае звычайны канчатак запа�у\n"
 "      --target-directory=ТЭЧК� перам�шчае ў�е довады КРЫ�ІЦы ў ТЭЧКу\n"
 
-#: src/install.c:641
+#: src/install.c:648
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
 
-#: src/install.c:859
+#: src/install.c:696 src/unlink.c:86
 #, c-format
-msgid ""
-"WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
-msgstr ""
+msgid "cannot unlink %s"
+msgstr "немагчыма unlink %s"
 
-#: src/install.c:869
+#: src/install.c:877
 #, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
+msgid ""
+"WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
 msgstr ""
 
-#: src/install.c:886
+#: src/install.c:917
 #, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr ""
 
-#: src/install.c:889
+#: src/install.c:920
 #, fuzzy, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr "%s: задана� т�чка м�ты не зь�ўл�ецца т�чкай"
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr ""
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, c-format
 msgid "invalid mode %s"
 msgstr "нер�чаі�ны р�жым %s"
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr ""
 
-#: src/install.c:959
+#: src/install.c:1001
 #, fuzzy, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr "выбары, што вызначаюць дату дл� друку ўзаема выключны�"
 
-#: src/install.c:966
+#: src/install.c:1008
 #, fuzzy, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr "выбары, што вызначаюць дату дл� друку ўзаема выключны�"
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -4692,7 +4747,7 @@ msgstr ""
 msgid "Mike Haertel"
 msgstr ""
 
-#: src/join.c:191
+#: src/join.c:195
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
 "standard output.  The default join field is the first, delimited\n"
@@ -4703,7 +4758,7 @@ msgid ""
 "  -e EMPTY          replace missing input fields with EMPTY\n"
 msgstr ""
 
-#: src/join.c:200
+#: src/join.c:204
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
 "  -j FIELD          equivalent to '-1 FIELD -2 FIELD'\n"
@@ -4711,7 +4766,7 @@ msgid ""
 "  -t CHAR           use CHAR as input and output field separator\n"
 msgstr ""
 
-#: src/join.c:206
+#: src/join.c:210
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
 "  -1 FIELD          join on this FIELD of file 1\n"
@@ -4723,7 +4778,13 @@ msgid ""
 "                      print them without trying to pair them\n"
 msgstr ""
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+#, fuzzy
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr ""
+"  -z, --zero-terminated        Зав�ршаць радкі байтам 0, а н� новым радком.\n"
+
+#: src/join.c:225
 msgid ""
 "\n"
 "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n"
@@ -4742,47 +4803,47 @@ msgid ""
 "warning message will be given.\n"
 msgstr ""
 
-#: src/join.c:403
+#: src/join.c:410
 #, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
 msgstr ""
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, c-format
 msgid "invalid field number: %s"
 msgstr "недзе�здольны нумар пол�: %s"
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, fuzzy, c-format
 msgid "invalid field specifier: %s"
 msgstr "%s: нер�чаі�на� �п�цыфікацы� пол� \"%s\""
 
-#: src/join.c:877
+#: src/join.c:884
 #, fuzzy, c-format
 msgid "invalid file number in field spec: %s"
 msgstr "недзе�здольна� шырын� пол� нумара радка: %s"
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr ""
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr ""
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, c-format
 msgid "multi-character tab %s"
 msgstr "шмат-байтавы знак табул�цыі %s"
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr ""
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr "абодва файлы н� могуць быць �тандартным уводам"
@@ -4892,47 +4953,47 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr "немагчыма �тварыць �па�ылку %s на %s"
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr "%s: жор�ткі� �па�ылкі дл� т�чак не дазволены"
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, c-format
 msgid "%s: cannot overwrite directory"
 msgstr "%s: немагчыма перазапі�аць т�чку"
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
 msgstr "%s: зам�ніць %s? "
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, fuzzy, c-format
 msgid "failed to create symbolic link %s"
 msgstr "немагчыма �тварыць знакавае лучыва %s"
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, fuzzy, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr "немагчыма �тварыць знакавае лучыва %s на %s"
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, fuzzy, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr "немагчыма �тварыць жор�ткае лучыва %s на %s"
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, fuzzy, c-format
 msgid "failed to create hard link %s"
 msgstr "немагчыма �тварыць жор�ткае лучыва %s на %s"
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, fuzzy, c-format
 msgid "failed to create hard link %s => %s"
 msgstr "немагчыма �тварыць жор�ткае лучыва %s на %s"
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -4941,7 +5002,7 @@ msgid ""
 "  or:  %s [OPTION]... -t DIRECTORY TARGET...  (4th form)\n"
 msgstr ""
 
-#: src/ln.c:381
+#: src/ln.c:398
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
 "In the 2nd form, create a link to TARGET in the current directory.\n"
@@ -4953,7 +5014,7 @@ msgid ""
 "interpreted in relation to its parent directory.\n"
 msgstr ""
 
-#: src/ln.c:394
+#: src/ln.c:411
 #, fuzzy
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
@@ -4976,7 +5037,7 @@ msgstr ""
 "  -d                           тое ж, што й --no-dereference --"
 "preserve=link\n"
 
-#: src/ln.c:402
+#: src/ln.c:419
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
 "  -L, --logical               dereference TARGETs that are symbolic links\n"
@@ -4988,7 +5049,7 @@ msgid ""
 "  -s, --symbolic              make symbolic links instead of hard links\n"
 msgstr ""
 
-#: src/ln.c:411
+#: src/ln.c:428
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
 "  -t, --target-directory=DIRECTORY  specify the DIRECTORY in which to "
@@ -4998,7 +5059,7 @@ msgid ""
 "  -v, --verbose               print name of each linked file\n"
 msgstr ""
 
-#: src/ln.c:433
+#: src/ln.c:450
 #, c-format
 msgid ""
 "\n"
@@ -5006,12 +5067,12 @@ msgid ""
 "behavior when a TARGET is a symbolic link, defaulting to %s.\n"
 msgstr ""
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, fuzzy, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr "�емагчыма ўжыць разам --target-directory і --no-target-directory"
 
-#: src/ln.c:588
+#: src/ln.c:605
 #, fuzzy, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr "немагчыма �тварыць знакавае лучыва %s"
@@ -5044,7 +5105,7 @@ msgstr "н�ма ўліковага йм�"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
@@ -5053,97 +5114,97 @@ msgstr "%b %e  %Y"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 msgid "%b %e %H:%M"
 msgstr "%b %e %H:%M"
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr ""
 "незаўважаецца нер�чаі�нае знач�ньне зьменнай а��родзьдз� QUOTING_STYLE: %s"
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr ""
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr ""
 "незаўважае незразумелы памер табул�цыі ў пераменнай а��родзьдз� TABSIZE: %s"
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, c-format
 msgid "invalid line width: %s"
 msgstr "незразумела� шырын� радка: %s"
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, c-format
 msgid "invalid tab size: %s"
 msgstr "незразумелы памер табул�цыі: %s"
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, c-format
 msgid "invalid time style format %s"
 msgstr "незразумелы фармат �тылю ча�у %s"
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 #, fuzzy
 msgid "Valid arguments are:\n"
 msgstr "Р�чаі�ны� довады:"
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr ""
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr ""
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, c-format
 msgid "unrecognized prefix: %s"
 msgstr "нера�пазнана� пры�таўка: %s"
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr ""
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, c-format
 msgid "cannot open directory %s"
 msgstr "немагчыма адчыніць т�чку %s"
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, c-format
 msgid "cannot determine device and inode of %s"
 msgstr ""
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, fuzzy, c-format
 msgid "%s: not listing already-listed directory"
 msgstr "%s: немагчыма перазапі�аць т�чку"
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, c-format
 msgid "reading directory %s"
 msgstr "чытаецца дыр�кторы� %s"
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, c-format
 msgid "closing directory %s"
 msgstr "зачын�ецца дыр�кторы� %s"
 
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, c-format
 msgid "cannot compare file names %s and %s"
 msgstr "немагчыма параўнаць назвы файлаў %s і %s"
 
-#: src/ls.c:4721
+#: src/ls.c:4781
 #, fuzzy
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
@@ -5154,7 +5215,7 @@ msgstr ""
 "Упарадкоўвае запі�ы па алфавіту, калі н�ма -cftuSUX ці --sort.\n"
 "\n"
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 #, fuzzy
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
@@ -5169,33 +5230,32 @@ msgstr ""
 "  -b, --escape               друкаваць ва�ьм�рычны� знач�ньні дл�\n"
 "                             �лужбовых/неграфічных знакаў\n"
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
 "  -F, --classify             append indicator (one of */=>@|) to entries\n"
@@ -5205,23 +5265,24 @@ msgid ""
 "      --full-time            like -l --time-style=full-iso\n"
 msgstr ""
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr ""
 
-#: src/ls.c:4763
+#: src/ls.c:4823
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 
-#: src/ls.c:4769
+#: src/ls.c:4829
 #, fuzzy
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
@@ -5232,20 +5293,20 @@ msgstr ""
 "  -H, --si              гл. выш�й, але выкары�тоўваць �тупені 1000 заме�т "
 "1024\n"
 
-#: src/ls.c:4775
+#: src/ls.c:4835
 msgid ""
 "  -H, --dereference-command-line\n"
 "                             follow symbolic links listed on the command "
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
 msgstr ""
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
 "names:\n"
@@ -5254,10 +5315,10 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -5267,7 +5328,7 @@ msgid ""
 "entries\n"
 msgstr ""
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -5278,11 +5339,11 @@ msgid ""
 "                             append / indicator to directories\n"
 msgstr ""
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -5290,7 +5351,7 @@ msgid ""
 "escape\n"
 msgstr ""
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 #, fuzzy
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
@@ -5302,53 +5363,56 @@ msgstr ""
 "  -R, --recursive       паказываць т�чкі р�кур�ыўна\n"
 "  -s, --size            друаваць памер кожнага файла ў блёках\n"
 
-#: src/ls.c:4825
+#: src/ls.c:4886
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 
-#: src/ls.c:4835
+#: src/ls.c:4896
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
 msgstr ""
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 msgid ""
 "  -t                         sort by modification time, newest first\n"
 "  -T, --tabsize=COLS         assume tab stops at each COLS instead of 8\n"
 msgstr ""
 
-#: src/ls.c:4848
+#: src/ls.c:4912
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
 msgstr ""
 
-#: src/ls.c:4855
+#: src/ls.c:4919
 #, fuzzy
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 "  -w, --width=ШЫРЫ�Я    задае шырыню �крану ў знаках\n"
@@ -5356,7 +5420,7 @@ msgstr ""
 "  -X                    упарадкаваць па аб�ц�дзе �уфік�аў файлаў\n"
 "  -1                    паказываць па файлу на радок\n"
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -5365,7 +5429,7 @@ msgid ""
 "variable can change the settings.  Use the dircolors command to set it.\n"
 msgstr ""
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -5446,9 +5510,11 @@ msgstr ""
 #, fuzzy
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
@@ -5459,12 +5525,7 @@ msgstr ""
 "�умамі\n"
 "\n"
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, c-format
 msgid ""
 "\n"
@@ -5474,35 +5535,35 @@ msgid ""
 "space for text), and name for each FILE.\n"
 msgstr ""
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, c-format
 msgid "%s: too many checksum lines"
 msgstr "%s: зашмат радкоў з кантрольнымі �умамі"
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr "%s: %<PRIuMAX>: н� правільна �кладзены радок з кантрольнай �умай %s"
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr "%s: немагчыма прачытаць файл\n"
 
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr "П�МЫЛК�"
 
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr "ДОБР�"
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr ""
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, fuzzy, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
@@ -5510,7 +5571,7 @@ msgstr[0] "%s: %<PRIuMAX>: н� правільна �кладзены радок
 msgstr[1] "%s: %<PRIuMAX>: н� правільна �кладзены радок з кантрольнай �умай %s"
 msgstr[2] "%s: %<PRIuMAX>: н� правільна �кладзены радок з кантрольнай �умай %s"
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, fuzzy, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
@@ -5521,7 +5582,7 @@ msgstr[1] ""
 msgstr[2] ""
 "УВ�Г�! %<PRIuMAX> з %<PRIuMAX> пералічаных файлаў немагчыма прачытаць"
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, fuzzy, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
@@ -5529,117 +5590,143 @@ msgstr[0] "УВ�Г�! %d з %d вылічаных %s �Е СУП�Д�Е"
 msgstr[1] "УВ�Г�! %d з %d вылічаных %s �Е СУП�Д�Е"
 msgstr[2] "УВ�Г�! %d з %d вылічаных %s �Е СУП�Д�Е"
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
 msgstr ""
 
-#: src/md5sum.c:766
+#: src/md5sum.c:770
 #, fuzzy, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr "выбар --warn мае ��н� толькі тады, калі параўноваюцца праверчы� �умы"
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
 msgstr ""
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr ""
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr "выбар --warn мае ��н� толькі тады, калі параўноваюцца праверчы� �умы"
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, fuzzy, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr "выбар --warn мае ��н� толькі тады, калі параўноваюцца праверчы� �умы"
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, fuzzy, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr "выбар --warn мае ��н� толькі тады, калі параўноваюцца праверчы� �умы"
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr "Выкары�таньне: %s [ВЫБ�Р]... ТЭЧК� ...\n"
 
-#: src/mkdir.c:57
+#: src/mkdir.c:59
 #, fuzzy
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
 msgstr ""
 "    Стварае т�чку(і), калі �ны шч� не й�нуюць.\n"
 "\n"
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 
-#: src/mkdir.c:168
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/mkdir.c:127 src/mkdir.c:172
+#, fuzzy, c-format
+msgid "failed to set default creation context for %s"
+msgstr "немагчыма атрымаць атрыбуты %s"
+
+#: src/mkdir.c:191
+#, fuzzy, c-format
+msgid "failed to restore context for %s"
+msgstr "збой пры захаваньні ча�у дл� %s"
+
+#: src/mkdir.c:231
 #, c-format
 msgid "created directory %s"
 msgstr "�творана т�чка %s"
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr ""
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr "Выкары�таньне: %s [ВЫБ�Р]... ��ЗВ�...\n"
 
-#: src/mkfifo.c:52
+#: src/mkfifo.c:54
 #, fuzzy
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
 msgstr ""
 "Стварае найменны канв�ер (fifo) з зададзенымі ��ЗВ�мі.\n"
 "\n"
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
 msgstr ""
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, c-format
 msgid "invalid mode"
 msgstr "нер�чаі�ны р�жым"
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr ""
 
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
+#, c-format
+msgid "cannot set permissions of %s"
+msgstr "немагчыма ў�тал�ваць правы %s"
+
+#: src/mknod.c:54
 #, c-format
 msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr "Выкары�таньне: %s [ВЫБ�Р]... ��ЗВ� ТЫП [М�ЖОР МІ�ОР]\n"
 
-#: src/mknod.c:54
+#: src/mknod.c:56
 #, fuzzy
 msgid "Create the special file NAME of the given TYPE.\n"
 msgstr ""
 "    Стварае адмы�ловы файз з заданымі назвай і відам.\n"
 "\n"
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr ""
-
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -5648,7 +5735,7 @@ msgid ""
 "otherwise, as decimal.  TYPE may be:\n"
 msgstr ""
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 msgid ""
 "\n"
 "  b      create a block (buffered) special file\n"
@@ -5656,155 +5743,149 @@ msgid ""
 "  p      create a FIFO\n"
 msgstr ""
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 #, fuzzy
 msgid "Special files require major and minor device numbers."
 msgstr ""
 "калі �твараюцца адмы�ловы� файлы, павінны быць заданы�\n"
 "мажорны й мінорны нумары прылады"
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 #, fuzzy
 msgid "Fifos do not have major and minor device numbers."
 msgstr "нер�чаі�ны мінорны нумар прылады %s"
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, c-format
 msgid "block special files not supported"
 msgstr "адмы�ловы� блёчны� файлы непадтрымліваюцца"
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, c-format
 msgid "character special files not supported"
 msgstr "адмы�ловы� знакавы� файлы непадтрымліваюцца"
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, c-format
 msgid "invalid major device number %s"
 msgstr "нер�чаі�ны мажорны нумар прылады %s"
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, c-format
 msgid "invalid minor device number %s"
 msgstr "нер�чаі�ны мінорны нумар прылады %s"
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, c-format
 msgid "invalid device %s %s"
 msgstr "нер�чаі�на� прылада %s %s"
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, c-format
 msgid "invalid device type %s"
 msgstr "нер�чаі�ны від прылады %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr ""
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr "Выкары�таньне: %s [ВЫБ�Р]... [Ф�ЙЛ]\n"
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
 "TEMPLATE must contain at least 3 consecutive 'X's in last component.\n"
 "If TEMPLATE is not specified, use tmp.XXXXXXXXXX, and --tmpdir is implied.\n"
 msgstr ""
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
 "  -q, --quiet         suppress diagnostics about file/dir-creation failure\n"
 msgstr ""
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
 msgstr ""
 
-#: src/mktemp.c:223
-#, fuzzy, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr "немагчыма перанакіраваць �тандартны вывад памылак"
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, fuzzy, c-format
 msgid "too many templates"
 msgstr "зашмат аднолькавых радкоў"
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr ""
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr ""
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr ""
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr ""
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr ""
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, fuzzy, c-format
 msgid "failed to create directory via template %s"
 msgstr "немагчыма �тварыць т�чку %s"
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, fuzzy, c-format
 msgid "failed to create file via template %s"
 msgstr "збой пры захаваньні ча�у дл� %s"
 
-#: src/mv.c:292
+#: src/mv.c:294
 #, fuzzy
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 "    Пераназывае крыніцу ў м�ту, ці перам�шчае крыніцу(ы) ў т�чку.\n"
 "\n"
 
-#: src/mv.c:298
+#: src/mv.c:300
 #, fuzzy
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
@@ -5827,7 +5908,7 @@ msgstr ""
 "  -d                           тое ж, што й --no-dereference --"
 "preserve=link\n"
 
-#: src/mv.c:307
+#: src/mv.c:309
 #, fuzzy
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
@@ -5842,7 +5923,7 @@ msgstr ""
 "доваду\n"
 "                                 КРЫ�ІЦы\n"
 
-#: src/mv.c:312
+#: src/mv.c:314
 #, fuzzy
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
@@ -5852,6 +5933,8 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
 "  -u, --update                   капуе толькі калі файл КРЫ�ІЦ� навешы за "
 "файл\n"
@@ -6111,95 +6194,90 @@ msgid "%s: invalid number to ignore"
 msgstr "%s: нер�чаі�на� колька�ьць радкоў"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
 msgstr ""
 
-#: src/numfmt.c:676
+#: src/numfmt.c:659
 #, fuzzy, c-format
-msgid "value too large to be converted: '%s'"
+msgid "value too large to be converted: %s"
 msgstr "%s: знач�ньне цалка не пераўтворана"
 
-#: src/numfmt.c:680
+#: src/numfmt.c:663
 #, fuzzy, c-format
-msgid "invalid number: '%s'"
+msgid "invalid number: %s"
 msgstr "нер�чаі�ны нумар %s"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
+msgid "rejecting suffix in input: %s (consider using --from)"
 msgstr ""
 
-#: src/numfmt.c:688
+#: src/numfmt.c:671
 #, fuzzy, c-format
-msgid "invalid suffix in input: '%s'"
-msgstr "кеп�кі ц�лы довад %s"
+msgid "invalid suffix in input: %s"
+msgstr "нер�чаі�ны �ьц�г уводу: %s"
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
 msgstr ""
 
-#: src/numfmt.c:723
+#: src/numfmt.c:722 src/numfmt.c:768
 #, fuzzy, c-format
 msgid "failed to prepare value '%Lf' for printing"
 msgstr "%s: немагчыма адчыніць дл� запі�у"
 
-#: src/numfmt.c:787
+#: src/numfmt.c:791
 #, fuzzy, c-format
-msgid "invalid unit size: '%s'"
+msgid "invalid unit size: %s"
 msgstr "незразумелы памер табул�цыі: %s"
 
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
-#, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr ""
-
-#: src/numfmt.c:813
+#: src/numfmt.c:814
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
 msgstr "Выкары�таньне: %s [ВЫБ�Р]... [К�РЫСТ�ЛЬ�ІК]...\n"
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
 msgstr ""
 
-#: src/numfmt.c:820
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
 msgstr ""
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
 msgstr ""
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
 "                         see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr ""
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
@@ -6207,19 +6285,19 @@ msgid ""
 "locale)\n"
 msgstr ""
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
 msgstr ""
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
 msgstr ""
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -6229,43 +6307,40 @@ msgid ""
 "                         is found\n"
 msgstr ""
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
 "nearest\n"
 msgstr ""
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
 msgstr ""
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr ""
 
-#: src/numfmt.c:877
-#, fuzzy
+#: src/numfmt.c:878
 msgid ""
 "\n"
 "UNIT options:\n"
 msgstr ""
-"Парам�тры ўпарадкаваньн�:\n"
-"\n"
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr ""
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -6274,7 +6349,7 @@ msgid ""
 "               1Mi = 1048576,\n"
 msgstr ""
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
@@ -6282,7 +6357,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
@@ -6290,7 +6365,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
@@ -6298,18 +6373,18 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:905
+#: src/numfmt.c:906
 #, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -6321,7 +6396,7 @@ msgid ""
 "errors are not diagnosed and the exit status is 0.\n"
 msgstr ""
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -6342,112 +6417,112 @@ msgid ""
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 msgstr ""
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, fuzzy, c-format
 msgid "format %s has no %% directive"
 msgstr "згадана� м�та %s не з'�ўл�ецца т�чкай"
 
-#: src/numfmt.c:990
+#: src/numfmt.c:1003
 #, fuzzy, c-format
 msgid "invalid format %s (width overflow)"
 msgstr "недзе�здольны фармат шырыні"
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr ""
+
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr ""
 
-#: src/numfmt.c:1010
+#: src/numfmt.c:1030
 #, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
 msgstr ""
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr ""
 
-#: src/numfmt.c:1070
+#: src/numfmt.c:1081
 #, fuzzy, c-format
-msgid "invalid suffix in input '%s': '%s'"
-msgstr "кеп�кі ц�лы довад %s"
+msgid "invalid suffix in input %s: %s"
+msgstr "нер�чаі�ны �ьц�г уводу: %s"
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
 msgstr ""
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
 msgstr ""
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
+msgid "large input value %s: possible precision loss"
 msgstr ""
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
 
-#: src/numfmt.c:1388
+#: src/numfmt.c:1403
 #, fuzzy, c-format
-msgid "invalid padding value '%s'"
-msgstr "�едзе�здольны прамежак �таронак %s"
+msgid "invalid padding value %s"
+msgstr "нер�чаі�на� дата %s"
 
-#: src/numfmt.c:1401
+#: src/numfmt.c:1417
 #, fuzzy, c-format
-msgid "invalid field value '%s'"
+msgid "invalid field value %s"
 msgstr "недзе�здольны нумар пол�: %s"
 
-#: src/numfmt.c:1430
+#: src/numfmt.c:1447
 #, fuzzy, c-format
-msgid "invalid header value '%s'"
+msgid "invalid header value %s"
 msgstr "нер�чаі�на� дата %s"
 
-#: src/numfmt.c:1456
+#: src/numfmt.c:1473
 #, fuzzy, c-format
 msgid "--grouping cannot be combined with --format"
 msgstr "Файлавы� ап�ранбы н� могуць быць аб'�днаны з --print-database (-p)."
 
-#: src/numfmt.c:1458
-#, fuzzy, c-format
-msgid "--padding cannot be combined with --format"
-msgstr "Файлавы� ап�ранбы н� могуць быць аб'�днаны з --print-database (-p)."
-
-#: src/numfmt.c:1463
+#: src/numfmt.c:1478
 #, fuzzy, c-format
 msgid "no conversion option specified"
-msgstr "заданы� шматлікі� файлы вываду"
+msgstr "незаданы ID прац��у"
 
-#: src/numfmt.c:1471
+#: src/numfmt.c:1486
 #, fuzzy, c-format
 msgid "grouping cannot be combined with --to"
 msgstr "Файлавы� ап�ранбы н� могуць быць аб'�днаны з --print-database (-p)."
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
 msgstr ""
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
 msgstr ""
 
-#: src/numfmt.c:1511
+#: src/numfmt.c:1526
 #, fuzzy, c-format
 msgid "error reading input"
 msgstr "памылка чытаньн� %s"
 
-#: src/numfmt.c:1520
-#, fuzzy, c-format
+#: src/numfmt.c:1535
+#, c-format
 msgid "failed to convert some of the input numbers"
-msgstr "немагчыма перанакіраваць �тандартны вывад памылак"
+msgstr ""
 
-#: src/od.c:294
+#: src/od.c:320
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -6458,7 +6533,7 @@ msgstr ""
 "Выкары�таньне: %s [ВЫБ�Р]... [Ф�ЙЛ]...\n"
 "  ці:  %s --traditional [Ф�ЙЛ] [[+]ВОДСТУП [[+]�ДМЕЦІ��]]\n"
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -6468,7 +6543,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/od.c:307
+#: src/od.c:333
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
 "if the last operand begins with + or (if there are 2 operands) a digit.\n"
@@ -6478,38 +6553,40 @@ msgid ""
 "suffixes may be . for octal and b for multiply by 512.\n"
 msgstr ""
 
-#: src/od.c:318
+#: src/od.c:344
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
 
-#: src/od.c:323
+#: src/od.c:350
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
 
-#: src/od.c:336
+#: src/od.c:363
 msgid ""
 "\n"
 "\n"
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 
-#: src/od.c:345
+#: src/od.c:372
 msgid ""
 "  -f   same as -t fF, select floats\n"
 "  -i   same as -t dI, select decimal ints\n"
@@ -6519,16 +6596,16 @@ msgid ""
 "  -x   same as -t x2, select hexadecimal 2-byte units\n"
 msgstr ""
 
-#: src/od.c:353
+#: src/od.c:380
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -6537,7 +6614,7 @@ msgid ""
 "  x[SIZE]    hexadecimal, SIZE bytes per integer\n"
 msgstr ""
 
-#: src/od.c:367
+#: src/od.c:394
 msgid ""
 "\n"
 "SIZE is a number.  For TYPE in [doux], SIZE may also be C for\n"
@@ -6546,14 +6623,14 @@ msgid ""
 "for sizeof(double) or L for sizeof(long double).\n"
 msgstr ""
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
 "each output line.\n"
 msgstr ""
 
-#: src/od.c:379
+#: src/od.c:406
 #, fuzzy
 msgid ""
 "\n"
@@ -6567,18 +6644,15 @@ msgid ""
 "and so on for G, T, P, E, Z, Y.\n"
 msgstr ""
 "\n"
-"Блёкі й байты могуць і�ьці з �уфік�амі множаньн�:\n"
-"xM M, c 1, w 2, b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
-"GB 1000*1000*1000, G 1024*1024*1024, і тое ж дл� T, P, E, Z, Y.\n"
-"Кожнае ключавое �лова можа быць:\n"
-"\n"
+"SIZE may be (or may be an integer optionally followed by) one of following:\n"
+"kB 1000, K 1024, MB 1000*1000, M 1024*1024, and so on for G, T, P, E, Z, Y.\n"
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, c-format
 msgid "invalid type string %s"
 msgstr "недзе�здольны радок тыпу %s"
 
-#: src/od.c:649
+#: src/od.c:690
 #, fuzzy, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -6587,7 +6661,7 @@ msgstr ""
 "нер�чаі�ны від радка \"%s\";\n"
 "�ы�т�ма не прада�таўл�е %lu-байтны ц�лы тып"
 
-#: src/od.c:770
+#: src/od.c:811
 #, fuzzy, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -6596,36 +6670,36 @@ msgstr ""
 "нер�чаі�ны від радка \"%s\";\n"
 "�ы�т�ма не прада�таўл�е %lu-байтны ц�лы тып"
 
-#: src/od.c:828
+#: src/od.c:869
 #, fuzzy, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr "нер�чаі�ны знак \"%c\" у радку тыпу \"%s\""
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr ""
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr ""
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr ""
 
-#: src/od.c:1810
+#: src/od.c:1863
 msgid "compatibility mode supports at most one file"
 msgstr ""
 
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr ""
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr "Увага! �ер�чаі�на� шырын� %lu; выкары�тоўвайце %d заме�т �е"
@@ -6780,12 +6854,12 @@ msgstr "Калі"
 msgid "Where"
 msgstr "Дзе"
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr "Выкары�таньне: %s [ВЫБ�Р]... [К�РЫСТ�ЛЬ�ІК]...\n"
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -6795,7 +6869,7 @@ msgid ""
 "  -s              do short format output, this is the default\n"
 msgstr ""
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -6804,7 +6878,7 @@ msgid ""
 "                  in short format\n"
 msgstr ""
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -6815,7 +6889,7 @@ msgstr ""
 "Спрошчана� праграма \"finger\"; друкуе зьве�ткі пра кары�тальніка.\n"
 "Файлам utmp будзе %s.\n"
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr ""
@@ -6985,12 +7059,13 @@ msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
 
-#: src/pr.c:2827
+#: src/pr.c:2828
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
 "                    separate columns by STRING,\n"
@@ -7000,7 +7075,7 @@ msgid ""
 "  -t, --omit-header  omit page headers and trailers\n"
 msgstr ""
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 msgid ""
 "  -T, --omit-pagination\n"
 "                    omit page headers and trailers, eliminate any "
@@ -7014,7 +7089,7 @@ msgid ""
 "(72)\n"
 msgstr ""
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
 "                    set page width to PAGE_WIDTH (72) characters always,\n"
@@ -7023,7 +7098,7 @@ msgid ""
 "                    with -S or -s\n"
 msgstr ""
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 #, fuzzy
 msgid ""
 "\n"
@@ -7048,7 +7123,7 @@ msgstr ""
 
 #: src/printenv.c:69
 #, fuzzy
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr ""
 "  -z, --zero-terminated        Зав�ршаць радкі байтам 0, а н� новым радком.\n"
 
@@ -7150,12 +7225,12 @@ msgstr "увага: ігнаруецца лішак довадаў пачынаÑ
 msgid "F. Pinard"
 msgstr ""
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, c-format
 msgid "%s (for regexp %s)"
 msgstr "%s (дл� �талага выразу %s)"
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
@@ -7164,20 +7239,20 @@ msgstr ""
 "Выкары�таньне: %s [ВЫБ�Р]... [УВОД]...   (без -G)\n"
 "  ці:  %s -G [ВЫБ�Р]... [УВОД [ВЫВ�Д]]\n"
 
-#: src/ptx.c:1821
+#: src/ptx.c:1824
 msgid ""
 "Output a permuted index, including context, of the words in the input "
 "files.\n"
 msgstr ""
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
 "  -G, --traditional              behave more like System V 'ptx'\n"
 "  -F, --flag-truncation=STRING   use STRING for flagging line truncations\n"
 msgstr ""
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
 "  -O, --format=roff              generate output as roff directives\n"
@@ -7186,7 +7261,7 @@ msgid ""
 "  -T, --format=tex               generate output as TeX directives\n"
 msgstr ""
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -7196,7 +7271,7 @@ msgid ""
 "  -o, --only-file=FILE           read only word list from this FILE\n"
 msgstr ""
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -7204,16 +7279,16 @@ msgid ""
 "excluded\n"
 msgstr ""
 
-#: src/ptx.c:1854
+#: src/ptx.c:1857
 #, fuzzy
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
 "\n"
 "Калі Ф�ЙЛ не зададзены альбо зададзены -, чытае �тандартны ўвод.\n"
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, c-format
 msgid "invalid gap width: %s"
 msgstr "нер�чаі�на� шырын� прамежку: %s"
@@ -7232,22 +7307,28 @@ msgid ""
 "  -P, --physical  avoid all symlinks\n"
 msgstr ""
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+
+#: src/pwd.c:169
 #, c-format
 msgid "failed to chdir to %s"
 msgstr "збой chdir у %s"
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, c-format
 msgid "failed to stat %s"
 msgstr "збой stat %s"
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr ""
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, c-format
 msgid "ignoring non-option arguments"
 msgstr "незаўважаюцца довады, �кі� не зьўл�юцца выбарамі"
@@ -7257,8 +7338,8 @@ msgstr "незаўважаюцца довады, Ñ�кіÑ� не зьўлÑ�юццÐ
 msgid "Dmitry V. Levin"
 msgstr ""
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Выкары�таньне: %s [ВЫБ�Р]... Ф�ЙЛ...\n"
@@ -7295,8 +7376,7 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/readlink.c:152
@@ -7321,7 +7401,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 
@@ -7339,41 +7419,42 @@ msgstr ""
 msgid "%s: descend into directory %s? "
 msgstr ""
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr "%s: выдаліць абаронены ад запі�у %s %s? "
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, c-format
 msgid "%s: remove %s %s? "
 msgstr "%s: выдаліць %s %s? "
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, c-format
 msgid "removed directory: %s\n"
 msgstr "т�чка выдалена: %s\n"
 
-#: src/remove.c:444
-#, fuzzy, c-format
-msgid "cannot remove directory: %s"
-msgstr "немагчыма выдаліць т�чку %s"
+#: src/remove.c:447
+#, c-format
+msgid "refusing to remove %s or %s directory: skipping %s"
+msgstr ""
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr ""
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, fuzzy, c-format
 msgid "traversal failed: %s"
 msgstr "памылка чытаньн�"
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -7398,12 +7479,12 @@ msgstr ""
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 
 #: src/rm.c:149
@@ -7463,13 +7544,19 @@ msgstr ""
 
 #: src/rm.c:342
 #, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr ""
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: src/rm.c:343
+#: src/rm.c:345
 #, fuzzy, c-format
-msgid "%s: remove all arguments? "
-msgstr "%s: выдаліць %s %s? "
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] "%s: выдаліць %s %s? "
+msgstr[1] "%s: выдаліць %s %s? "
+msgstr[2] "%s: выдаліць %s %s? "
 
 #: src/rmdir.c:134 src/rmdir.c:233
 #, c-format
@@ -7512,7 +7599,7 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
 
@@ -7562,41 +7649,46 @@ msgstr ""
 msgid "no command specified"
 msgstr "незаданы ID прац��у"
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr ""
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, fuzzy, c-format
 msgid "failed to compute a new context"
 msgstr "немагчыма адчыніць %s"
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, fuzzy, c-format
 msgid "failed to set new user %s"
 msgstr "збой stat %s"
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, fuzzy, c-format
 msgid "failed to set new type %s"
 msgstr "збой stat %s"
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, fuzzy, c-format
 msgid "failed to set new range %s"
 msgstr "збой stat %s"
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, fuzzy, c-format
 msgid "failed to set new role %s"
 msgstr "збой stat %s"
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, c-format
 msgid "unable to set security context %s"
 msgstr ""
 
+#: src/selinux.c:127 src/selinux.c:300
+#, fuzzy, c-format
+msgid "error canonicalizing %s"
+msgstr "памылка чытаньн� %s"
+
 #: src/seq.c:68
 #, c-format
 msgid ""
@@ -7624,97 +7716,47 @@ msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
 msgstr ""
 
-#: src/seq.c:94
+#: src/seq.c:96
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
 "it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n"
 "decimal numbers with maximum precision PREC, and to %g otherwise.\n"
 msgstr ""
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, c-format
 msgid "invalid floating point argument: %s"
 msgstr ""
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, fuzzy, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr "%s мае нев�домы від файлу"
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr ""
 
-#: src/setuidgid.c:49
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-"Выкары�таньне: %s УЛІКОВ�Е_ЙМЯ З�Г�Д [ДОВ�Д]...\n"
-"  ці:  %s ВЫБ�Р\n"
-
-#: src/setuidgid.c:55
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr "нев�домы ID кары�тальніка: %s"
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr ""
-
-#: src/setuidgid.c:190
-#, fuzzy, c-format
-msgid "failed to set supplemental group(s)"
-msgstr "немагчыма ў�тал�ваць дадатковую групу"
-
-#: src/setuidgid.c:200
-#, c-format
-msgid "cannot set group-ID to %lu"
-msgstr "немагчыма задаць ID групы дл� %lu"
-
-#: src/setuidgid.c:204
-#, c-format
-msgid "cannot set user-ID to %lu"
-msgstr "немагчыма вы�тавіць ID кары�тальніка ў %lu"
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr ""
 
-#: src/shred.c:148
+#: src/shred.c:170
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
 "for even very expensive hardware probing to recover the data.\n"
 msgstr ""
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -7723,28 +7765,32 @@ msgid ""
 "  -s, --size=N   shred this many bytes (suffixes like K, M, G accepted)\n"
 msgstr ""
 
-#: src/shred.c:161
+#: src/shred.c:183
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
 "  -z, --zero     add a final overwrite with zeros to hide shredding\n"
 msgstr ""
 
-#: src/shred.c:170
+#: src/shred.c:192
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -7755,7 +7801,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -7767,7 +7813,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -7776,7 +7822,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -7788,134 +7834,134 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:215
+#: src/shred.c:241
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
 "of the file that cannot be removed, and that will allow a shredded file\n"
 "to be recovered later.\n"
 msgstr ""
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, c-format
 msgid "%s: fdatasync failed"
 msgstr "%s: збой fdatasync"
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr "%s: збой fsync"
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr ""
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr "%s: праход %lu/%lu (%s)..."
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, c-format
 msgid "%s: error writing at offset %s"
 msgstr "%s: памылка запі�у л� вод�тупа %s"
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s: збой lseek"
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, c-format
 msgid "%s: file too large"
 msgstr "%s: файл занадта в�лікі"
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr "%s: праход %lu/%lu (%s)...%s"
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr ""
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, c-format
 msgid "%s: fstat failed"
 msgstr "%s: збой fstat"
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, c-format
 msgid "%s: invalid file type"
 msgstr "%s: нер�чаі�ны від файла"
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr "%s: файл мае адмоўны памер"
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, c-format
 msgid "%s: error truncating"
 msgstr "%s: памылка абр�заньн�"
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, c-format
 msgid "%s: fcntl failed"
 msgstr "%s: збой fcntl"
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr ""
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr "%s: выдаленьне"
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, c-format
 msgid "%s: renamed to %s"
 msgstr "%s: перайменаваны ў %s"
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, c-format
 msgid "%s: failed to remove"
 msgstr "%s: немагчыма выдаліць"
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr "%s: выдален"
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, c-format
 msgid "%s: failed to close"
 msgstr "%s: немагчыма зачыніць"
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, c-format
 msgid "%s: failed to open for writing"
 msgstr "%s: немагчыма адчыніць дл� запі�у"
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, c-format
 msgid "%s: invalid number of passes"
 msgstr "%s: незразумела� колька�ьць праходаў"
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, fuzzy, c-format
 msgid "multiple random sources specified"
 msgstr "зададзены некалькі фарматаў вываду"
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, c-format
 msgid "%s: invalid file size"
 msgstr "%s: нер�чаі�ны памер файла"
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -7926,14 +7972,14 @@ msgstr ""
 "  ці:  %s [ВЫБ�Р]... ПЕРШЫ �ПОШ�І\n"
 "  ці:  %s [ВЫБ�Р]... ПЕРШЫ ПРЫРОСТ �ПОШ�І\n"
 
-#: src/shuf.c:54
+#: src/shuf.c:67
 #, fuzzy
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr ""
 "Запі�вае зьв�з упарадкаваных Ф�ЙЛаў на �тандартны вывад.\n"
 "\n"
 
-#: src/shuf.c:60
+#: src/shuf.c:73
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
 "  -i, --input-range=LO-HI   treat each number LO through HI as an input "
@@ -7941,34 +7987,44 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
 msgstr ""
 
-#: src/shuf.c:244
+#: src/shuf.c:228
+#, fuzzy, c-format
+msgid "too many input lines"
+msgstr "зашмат аднолькавых радкоў"
+
+#: src/shuf.c:431
 #, fuzzy, c-format
 msgid "multiple -i options specified"
 msgstr "заданы� шматлікі� файлы вываду"
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, fuzzy, c-format
 msgid "invalid input range %s"
 msgstr "нер�чаі�ны �ьц�г уводу: %s"
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, fuzzy, c-format
 msgid "invalid line count %s"
 msgstr "незразумела� шырын� радка: %s"
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, c-format
 msgid "multiple output files specified"
 msgstr "заданы� шматлікі� файлы вываду"
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, fuzzy, c-format
 msgid "cannot combine -e and -i options"
 msgstr "немагчыма �ум��ьціць р�жым і парам�тры --reference"
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr ""
+
 #: src/sleep.c:44
 #, c-format
 msgid ""
@@ -7983,24 +8039,24 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, c-format
 msgid "invalid time interval %s"
 msgstr "нер�чаі�ны адр�зак ча�у %s"
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr "немагчыма прачытаць гадзіньнік р�альнага ча�у"
 
-#: src/sort.c:399
+#: src/sort.c:427
 #, fuzzy
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr ""
 "Запі�вае зьв�з упарадкаваных Ф�ЙЛаў на �тандартны вывад.\n"
 "\n"
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
@@ -8008,7 +8064,7 @@ msgstr ""
 "Парам�тры ўпарадкаваньн�:\n"
 "\n"
 
-#: src/sort.c:409
+#: src/sort.c:437
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
 "  -d, --dictionary-order      consider only blanks and alphanumeric "
@@ -8016,19 +8072,19 @@ msgid ""
 "  -f, --ignore-case           fold lower case to upper case characters\n"
 msgstr ""
 
-#: src/sort.c:415
+#: src/sort.c:443
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
 "  -i, --ignore-nonprinting    consider only printable characters\n"
 "  -M, --month-sort            compare (unknown) < 'JAN' < ... < 'DEC'\n"
 msgstr ""
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 
-#: src/sort.c:423
+#: src/sort.c:451
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
 "  -R, --random-sort           sort by random hash of keys\n"
@@ -8036,7 +8092,7 @@ msgid ""
 "  -r, --reverse               reverse the result of comparisons\n"
 msgstr ""
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -8046,7 +8102,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/sort.c:437
+#: src/sort.c:465
 #, fuzzy
 msgid ""
 "Other options:\n"
@@ -8055,13 +8111,13 @@ msgstr ""
 "Парам�тры ўпарадкаваньн�:\n"
 "\n"
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
 msgstr ""
 
-#: src/sort.c:445
+#: src/sort.c:473
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
 "  -C, --check=quiet, --check=silent  like -c, but do not report first bad "
@@ -8070,7 +8126,7 @@ msgid ""
 "                              decompress them with PROG -d\n"
 msgstr ""
 
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -8079,13 +8135,13 @@ msgid ""
 "                            If F is - then read names from standard input\n"
 msgstr ""
 
-#: src/sort.c:459
+#: src/sort.c:487
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
 "  -m, --merge               merge already sorted files; do not sort\n"
 msgstr ""
 
-#: src/sort.c:463
+#: src/sort.c:491
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "  -s, --stable              stabilize sort by disabling last-resort "
@@ -8093,7 +8149,7 @@ msgid ""
 "  -S, --buffer-size=SIZE    use SIZE for main memory buffer\n"
 msgstr ""
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -8108,12 +8164,7 @@ msgid ""
 "run\n"
 msgstr ""
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr ""
-"  -z, --zero-terminated        Зав�ршаць радкі байтам 0, а н� новым радком.\n"
-
-#: src/sort.c:483
+#: src/sort.c:511
 msgid ""
 "\n"
 "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is "
@@ -8132,7 +8183,7 @@ msgid ""
 "SIZE may be followed by the following multiplicative suffixes:\n"
 msgstr ""
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -8144,260 +8195,245 @@ msgid ""
 "native byte values.\n"
 msgstr ""
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, fuzzy, c-format
 msgid "waiting for %s [-d]"
 msgstr "запі� у %s"
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr ""
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, fuzzy, c-format
 msgid "cannot create temporary file in %s"
 msgstr "немагчыма �тварыць ча�овы файл %s"
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr "памылка адкрыцьц�"
 
-#: src/sort.c:970
+#: src/sort.c:998
 msgid "fflush failed"
 msgstr "збой fflush"
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr "памылка закрыцьц�"
 
-#: src/sort.c:986
-#, fuzzy, c-format
-msgid "dup2 failed"
-msgstr "памылка адкрыцьц�"
-
-#: src/sort.c:1103
-#, c-format
-msgid "couldn't execute %s"
-msgstr ""
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 #, fuzzy
 msgid "couldn't create temporary file"
 msgstr "немагчыма �тварыць ча�овы файл"
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, fuzzy, c-format
 msgid "couldn't create process for %s -d"
 msgstr "немагчыма �тварыць т�чку %s"
 
-#: src/sort.c:1161
-#, c-format
-msgid "couldn't execute %s -d"
-msgstr ""
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, c-format
 msgid "warning: cannot remove: %s"
 msgstr "увага: немагчыма выдаліць: %s"
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, fuzzy, c-format
 msgid "invalid --%s argument %s"
 msgstr "нер�чаі�ны довад %s"
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, fuzzy, c-format
 msgid "minimum --%s argument is %s"
 msgstr "неадназначны довад %s дл� %s"
 
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, fuzzy, c-format
 msgid "--%s argument %s too large"
 msgstr "%s занадта в�лікі"
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr ""
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr ""
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr "збой пачатку"
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr "памылка чытаньн�"
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, fuzzy, c-format
 msgid "string transformation failed"
 msgstr "памылка параўнаньн� радку"
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, c-format
 msgid "the untransformed string was %s"
 msgstr ""
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr ""
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr ""
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr ""
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr ""
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr ""
 
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, fuzzy, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
-msgstr[0] "%s: выбар `%s' неадназначны\n"
-msgstr[1] "%s: выбар `%s' неадназначны\n"
-msgstr[2] "%s: выбар `%s' неадназначны\n"
+msgstr[0] "%s: выбар `-W %s' неадназначыны\n"
+msgstr[1] "%s: выбар `-W %s' неадназначыны\n"
+msgstr[2] "%s: выбар `-W %s' неадназначыны\n"
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr ""
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr "памылка запі�у"
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr "%s: %s:%s: б�зладдзе: "
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr "�тандартны вывад памылак"
 
-#: src/sort.c:3698
+#: src/sort.c:3738
 #, fuzzy
 msgid "cannot read"
 msgstr "немагчыма ў�тал�ваць дату"
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, c-format
 msgid "%s: invalid field specification %s"
 msgstr "%s: нер�чаі�нае вызнач�ньне пол� %s"
 
-#: src/sort.c:3987
-#, fuzzy, c-format
+#: src/sort.c:4028
+#, c-format
 msgid "options '-%s' are incompatible"
-msgstr "%s: выбар `%s' неадназначны\n"
+msgstr ""
 
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, c-format
 msgid "%s: invalid count at start of %s"
 msgstr "%s: нер�чаі�ны падлік на пачатку %s"
 
-#: src/sort.c:4295
+#: src/sort.c:4336
 #, fuzzy
 msgid "invalid number after '-'"
 msgstr "нер�чаі�на� лічба па�ьл� \"-\""
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 #, fuzzy
 msgid "invalid number after '.'"
 msgstr "нер�чаі�на� лічба па�ьл� \".\""
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr ""
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, fuzzy, c-format
 msgid "multiple compress programs specified"
 msgstr "зададзены некалькі фарматаў вываду"
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
 msgstr ""
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
 msgstr ""
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr ""
 
-#: src/sort.c:4407
+#: src/sort.c:4448
 #, fuzzy
 msgid "invalid number after ','"
 msgstr "нер�чаі�на� лічба па�ьл� \",\""
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr "пу�та� табул�цы�"
 
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, c-format
 msgid "cannot read file names from %s"
 msgstr "немагчыма прачытаць назвы файлаў з %s"
 
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, fuzzy, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr "назва файла нул�вой даўжыні"
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, fuzzy, c-format
 msgid "no input from %s"
 msgstr "зачын�ецца файл уводу %s"
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr ""
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr ""
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, fuzzy, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr "непатр�бны аргум�нт %s"
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr ""
 
-#: src/split.c:204
+#: src/split.c:203
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr "Выкары�таньне: %s [ВЫБ�Р] [УВОД [ПРЫСТ�ЎК�]]\n"
 
-#: src/split.c:208
+#: src/split.c:207
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
 "size is 1000 lines, and default PREFIX is 'x'.  With no INPUT, or when "
@@ -8405,32 +8441,31 @@ msgid ""
 "is -, read standard input.\n"
 msgstr ""
 
-#: src/split.c:216
+#: src/split.c:215
 #, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
 
-#: src/split.c:229
+#: src/split.c:228
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
 "                            output file is opened\n"
 msgstr ""
 
-#: src/split.c:236
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -8442,190 +8477,190 @@ msgid ""
 "r/K/N   likewise but only output Kth of N to stdout\n"
 msgstr ""
 
-#: src/split.c:354
+#: src/split.c:353
 #, c-format
 msgid "output file suffixes exhausted"
 msgstr ""
 
-#: src/split.c:366
+#: src/split.c:365
 #, c-format
 msgid "creating file %s\n"
 msgstr "�твар�ньне файла %s\n"
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr ""
 
-#: src/split.c:391
+#: src/split.c:390
 #, fuzzy, c-format
 msgid "failed to set FILE environment variable"
 msgstr ""
 "незаўважае незразумелы памер табул�цыі ў пераменнай а��родзьдз� TABSIZE: %s"
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr ""
 
-#: src/split.c:395
+#: src/split.c:394
 #, fuzzy, c-format
 msgid "failed to create pipe"
 msgstr "збой stat %s"
 
-#: src/split.c:409
+#: src/split.c:408
 #, fuzzy, c-format
 msgid "closing prior pipe"
 msgstr "зачын�ецца дыр�кторы� %s"
 
-#: src/split.c:411
+#: src/split.c:410
 #, fuzzy, c-format
 msgid "closing output pipe"
 msgstr "закрываецца файл вываду %s"
 
-#: src/split.c:415
+#: src/split.c:414
 #, fuzzy, c-format
 msgid "moving input pipe"
 msgstr "зачын�ецца файл уводу %s"
 
-#: src/split.c:417
+#: src/split.c:416
 #, fuzzy, c-format
 msgid "closing input pipe"
 msgstr "зачын�ецца файл уводу %s"
 
-#: src/split.c:422
+#: src/split.c:421
 #, fuzzy, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr "немагчыма выканаць загад %s"
 
-#: src/split.c:428
+#: src/split.c:427
 #, fuzzy, c-format
 msgid "failed to close input pipe"
 msgstr "%s: немагчыма зачыніць"
 
-#: src/split.c:464
+#: src/split.c:463
 #, c-format
 msgid "waiting for child process"
 msgstr ""
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr ""
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr ""
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr ""
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr ""
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, fuzzy, c-format
 msgid "%s: invalid number of chunks"
 msgstr "%s: нер�чаі�на� колька�ьць ��кундаў"
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, fuzzy, c-format
 msgid "%s: invalid chunk number"
 msgstr "%s: нер�чаі�ны нумар"
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr ""
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr "%s: нер�чаі�на� колька�ьць байтаў"
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr "%s: нер�чаі�на� колька�ьць радкоў"
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, c-format
 msgid "line count option -%s%c... is too large"
 msgstr ""
 
-#: src/split.c:1248
+#: src/split.c:1298
 #, fuzzy, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr "нер�чаі�ны нумар пачатковага радка: %s"
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, fuzzy, c-format
 msgid "%s: invalid IO block size"
 msgstr "%s: нер�чаі�ны памер файла"
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr ""
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr ""
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, fuzzy, c-format
 msgid "%s: cannot determine file size"
 msgstr "немагчыма вызначыць назву вузла"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr ""
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, fuzzy, c-format
 msgid "failed to canonicalize %s"
 msgstr "немагчыма адчыніць %s"
 
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, fuzzy, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr "увага!: нера�пазнаны парам�тар \"\\%c\""
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, fuzzy, c-format
 msgid "%s: invalid directive"
 msgstr "%s%s: нер�чаі�на� дыр�ктыва"
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, c-format
 msgid "warning: backslash at end of format"
 msgstr ""
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr ""
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, c-format
 msgid "cannot read file system information for %s"
 msgstr "немагчыма прачытаць зьве�ткі файлавае �ы�т�мы дл� %s"
 
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, fuzzy, c-format
 msgid "cannot stat standard input"
 msgstr "зачыненьне �тандартнага уводу"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -8636,7 +8671,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -8644,30 +8679,30 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, c-format
 msgid "Context: %C\n"
 msgstr ""
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -8675,27 +8710,27 @@ msgid ""
 " Birth: %w\n"
 msgstr ""
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
 msgstr ""
 
-#: src/stat.c:1356
+#: src/stat.c:1418
 msgid ""
 "  -L, --dereference     follow links\n"
 "  -f, --file-system     display file system status instead of file status\n"
 msgstr ""
 
-#: src/stat.c:1360
+#: src/stat.c:1422
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 msgid ""
 "\n"
 "The valid format sequences for files (without --file-system):\n"
@@ -8707,7 +8742,7 @@ msgid ""
 "  %C   SELinux security context string\n"
 msgstr ""
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 msgid ""
 "  %d   device number in decimal\n"
 "  %D   device number in hex\n"
@@ -8717,7 +8752,7 @@ msgid ""
 "  %G   group name of owner\n"
 msgstr ""
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 msgid ""
 "  %h   number of hard links\n"
 "  %i   inode number\n"
@@ -8726,11 +8761,11 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 
-#: src/stat.c:1399
+#: src/stat.c:1461
 msgid ""
 "  %u   user ID of owner\n"
 "  %U   user name of owner\n"
@@ -8738,14 +8773,14 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 msgid ""
 "Valid format sequences for file systems:\n"
 "\n"
@@ -8756,7 +8791,7 @@ msgid ""
 "  %f   free blocks in file system\n"
 msgstr ""
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 msgid ""
 "  %i   file system ID in hex\n"
 "  %l   maximum length of filenames\n"
@@ -8817,22 +8852,27 @@ msgid ""
 "and are thus unaffected by 'stdbuf' settings.\n"
 msgstr ""
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, fuzzy, c-format
 msgid "failed to find %s"
 msgstr "немагчыма адчыніць %s"
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, c-format
 msgid "failed to update the environment with %s"
 msgstr ""
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr ""
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, c-format
+msgid "you must specify a buffering mode option"
+msgstr ""
+
+#: src/stty.c:516
 #, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -8840,25 +8880,25 @@ msgid ""
 "  or:  %s [-F DEVICE | --file=DEVICE] [-g|--save]\n"
 msgstr ""
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
 msgstr ""
 
-#: src/stty.c:525
+#: src/stty.c:528
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
 "  -g, --save         print all current settings in a stty-readable form\n"
 "  -F, --file=DEVICE  open and use the specified DEVICE instead of stdin\n"
 msgstr ""
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
 "settings.  The underlying system defines which settings are available.\n"
 msgstr ""
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -8867,7 +8907,7 @@ msgid ""
 "   eol CHAR      CHAR will end the line\n"
 msgstr ""
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -8875,7 +8915,7 @@ msgid ""
 "   kill CHAR     CHAR will erase the current line\n"
 msgstr ""
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -8883,7 +8923,7 @@ msgid ""
 "   start CHAR    CHAR will restart the output after stopping it\n"
 msgstr ""
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -8891,7 +8931,7 @@ msgid ""
 " * werase CHAR   CHAR will erase the last word typed\n"
 msgstr ""
 
-#: src/stty.c:562
+#: src/stty.c:565
 msgid ""
 "\n"
 "Special settings:\n"
@@ -8900,7 +8940,7 @@ msgid ""
 " * columns N     same as cols N\n"
 msgstr ""
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -8909,7 +8949,7 @@ msgid ""
 "   ospeed N      set the output speed to N\n"
 msgstr ""
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -8918,7 +8958,7 @@ msgid ""
 "   time N        with -icanon, set read timeout of N tenths of a second\n"
 msgstr ""
 
-#: src/stty.c:581
+#: src/stty.c:584
 msgid ""
 "\n"
 "Control settings:\n"
@@ -8929,7 +8969,7 @@ msgid ""
 "   csN           set character size to N bits, N in [5..8]\n"
 msgstr ""
 
-#: src/stty.c:590
+#: src/stty.c:593
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
 "   [-]hup        send a hangup signal when the last process closes the tty\n"
@@ -8937,9 +8977,10 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -8949,7 +8990,7 @@ msgid ""
 "   [-]igncr      ignore carriage return\n"
 msgstr ""
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -8958,11 +8999,11 @@ msgid ""
 "   [-]istrip     clear high (8th) bit of input characters\n"
 msgstr ""
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr ""
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -8972,7 +9013,7 @@ msgid ""
 "   [-]tandem     same as [-]ixoff\n"
 msgstr ""
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -8982,17 +9023,17 @@ msgid ""
 " * nlN           newline delay style, N in [0..1]\n"
 msgstr ""
 
-#: src/stty.c:631
+#: src/stty.c:635
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
 " * [-]onlret     newline performs a carriage return\n"
 msgstr ""
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -9002,7 +9043,7 @@ msgid ""
 " * vtN           vertical tab delay style, N in [0..1]\n"
 msgstr ""
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -9011,7 +9052,7 @@ msgid ""
 " * -crtkill      kill all line by obeying the echoctl and echok settings\n"
 msgstr ""
 
-#: src/stty.c:654
+#: src/stty.c:658
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
 "   [-]echo       echo input characters\n"
@@ -9020,7 +9061,7 @@ msgid ""
 "   [-]echok      echo a newline after a kill character\n"
 msgstr ""
 
-#: src/stty.c:661
+#: src/stty.c:665
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
 "   [-]echonl     echo newline even if not echoing other characters\n"
@@ -9029,7 +9070,7 @@ msgid ""
 "   [-]iexten     enable non-POSIX special characters\n"
 msgstr ""
 
-#: src/stty.c:668
+#: src/stty.c:672
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
 "   [-]noflsh     disable flushing after interrupt and quit special "
@@ -9039,7 +9080,7 @@ msgid ""
 " * [-]xcase      with icanon, escape with '\\' for uppercase characters\n"
 msgstr ""
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -9048,7 +9089,7 @@ msgid ""
 "   -cbreak       same as icanon\n"
 msgstr ""
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -9056,7 +9097,7 @@ msgid ""
 "   crt           same as echoe echoctl echoke\n"
 msgstr ""
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -9065,7 +9106,7 @@ msgid ""
 "   evenp         same as parenb -parodd cs7\n"
 msgstr ""
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -9075,7 +9116,7 @@ msgid ""
 "   -nl           same as icrnl -inlcr -igncr onlcr -ocrnl -onlret\n"
 msgstr ""
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -9084,7 +9125,7 @@ msgid ""
 "   -pass8        same as parenb istrip cs7\n"
 msgstr ""
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -9092,7 +9133,7 @@ msgid ""
 "   -raw          same as cooked\n"
 msgstr ""
 
-#: src/stty.c:716
+#: src/stty.c:720
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
 "                 -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n"
@@ -9102,7 +9143,7 @@ msgid ""
 "                 characters to their default values\n"
 msgstr ""
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -9111,55 +9152,55 @@ msgid ""
 "127; special values ^- or undef used to disable special characters.\n"
 msgstr ""
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, c-format
 msgid "only one device may be specified"
 msgstr "толькі адна прылада можа быць пазначана"
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
 "mutually exclusive"
 msgstr ""
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr ""
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr ""
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, c-format
 msgid "invalid argument %s"
 msgstr "нер�чаі�ны довад %s"
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, c-format
 msgid "missing argument to %s"
 msgstr "прапушчаны довад дл� %s"
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, c-format
 msgid "invalid line discipline %s"
 msgstr "нер�чаі�на� ды�цыпліна лініі %s"
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr ""
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr "%s: н�ма зьве�так пра памеры дл� г�тае прылады"
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, c-format
 msgid "invalid integer argument %s"
 msgstr "кеп�кі ц�лы довад %s"
@@ -9218,22 +9259,22 @@ msgstr "      --help     паказвае г�тую даведку\n"
 msgid "      --version  output version information and exit\n"
 msgstr "      --version  выводзіць зьве�ткі пра в�р�ію\n"
 
-#: src/system.h:544
+#: src/system.h:543
 #, fuzzy
 msgid ""
 "\n"
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "Довады, абав�зковы� дл� доўгіх выбараў, абав�зковы� й дл� кароткіх.\n"
 
-#: src/system.h:552
+#: src/system.h:551
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -9242,35 +9283,33 @@ msgid ""
 "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n"
 msgstr ""
 
-#: src/system.h:571
-#, fuzzy, c-format
+#: src/system.h:570
+#, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
+"%s online help: <%s>\n"
 msgstr ""
-"\n"
-"Паведамл�йце пра памылкі на <%s>.\n"
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr ""
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr ""
 
-#: src/system.h:596
+#: src/system.h:591
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Па�прабуйце \"%s --help\" дл� больш падраб�зных зьве�так.\n"
 
-#: src/system.h:628
+#: src/system.h:633
 #, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -9361,55 +9400,48 @@ msgstr ""
 
 #: src/tail.c:270
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
 
 #: src/tail.c:274
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 
-#: src/tail.c:281
+#: src/tail.c:280
 #, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
 
-#: src/tail.c:294
+#: src/tail.c:293
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 
-#: src/tail.c:301
+#: src/tail.c:298
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 
-#: src/tail.c:310
-#, fuzzy
+#: src/tail.c:307
 msgid ""
 "\n"
 "If the first character of K (the number of bytes or lines) is a '+',\n"
@@ -9419,14 +9451,8 @@ msgid ""
 "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n"
 "\n"
 msgstr ""
-"\n"
-"Блёкі й байты могуць і�ьці з �уфік�амі множаньн�:\n"
-"xM M, c 1, w 2, b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
-"GB 1000*1000*1000, G 1024*1024*1024, і тое ж дл� T, P, E, Z, Y.\n"
-"Кожнае ключавое �лова можа быць:\n"
-"\n"
 
-#: src/tail.c:319
+#: src/tail.c:316
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
 "means that even if a tail'ed file is renamed, tail will continue to track\n"
@@ -9436,159 +9462,164 @@ msgid ""
 "named file in a way that accommodates renaming, removal and creation.\n"
 msgstr ""
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr "зачын�ецца %s (fd=%d)"
 
-#: src/tail.c:453
-#, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr "%s: немагчыма перам��ьціцца да адно�нага зруху %s"
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr ""
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr ""
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
 "reverting to polling"
 msgstr ""
 
-#: src/tail.c:963
+#: src/tail.c:965
+#, fuzzy, c-format
+msgid "%s has been replaced with a symbolic link. giving up on this name"
+msgstr "%s быў заменены на неб��концы файл; апрацоўка г�тага файла �пынена"
+
+#: src/tail.c:980
 #, c-format
 msgid "%s has become inaccessible"
 msgstr "%s �таў неда�тупны"
 
-#: src/tail.c:980
+#: src/tail.c:997
 #, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr "%s быў заменены на неб��концы файл; апрацоўка г�тага файла �пынена"
 
-#: src/tail.c:989
+#: src/tail.c:1006
 #, fuzzy, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr "%s быў заменены на неб��концы файл; апрацоўка г�тага файла �пынена"
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, c-format
 msgid "%s has become accessible"
 msgstr "%s �таў да�тупны"
 
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr ""
 
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr ""
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr "%s: немагчыма зьм�ніць незабл�каваны р�жым"
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr "%s: файл абр�заны"
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr "не за�тало�� больш файла"
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, fuzzy, c-format
 msgid "cannot watch parent directory of %s"
 msgstr "немагчыма атрымаць �тан б�гучае т�чкі (зараз %s)"
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, fuzzy, c-format
 msgid "inotify resources exhausted"
 msgstr "пам�ць вычарпана"
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, fuzzy, c-format
 msgid "cannot watch %s"
 msgstr "немагчыма дакрануцца да %s"
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr ""
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, fuzzy, c-format
 msgid "error reading inotify event"
 msgstr "памылка чытаньн� %s"
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr ""
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, c-format
 msgid "number in %s is too large"
 msgstr "нумар у %s зав�лікі"
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr ""
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr "%s: нер�чаі�ны PID"
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr "%s: нер�чаі�на� колька�ьць ��кундаў"
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr ""
 
-#: src/tail.c:2034
+#: src/tail.c:2096
 #, c-format
-msgid "warning: --retry is useful mainly when following by name"
+msgid "warning: --retry ignored; --retry is useful only when following"
 msgstr ""
 
-#: src/tail.c:2038
+#: src/tail.c:2100
+#, c-format
+msgid "warning: --retry only effective for the initial open"
+msgstr ""
+
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
 msgstr ""
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr "увага: --pid=PID не падтрымліваецца на г�тае �ы�т�ме"
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, c-format
 msgid "cannot follow %s by name"
 msgstr "немагчыма крочыць за %s па назве"
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr ""
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr ""
@@ -9817,17 +9848,17 @@ msgstr "дадатковы довад %s"
 msgid "warning: sigprocmask"
 msgstr ""
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr ""
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr ""
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
@@ -9836,31 +9867,29 @@ msgstr ""
 "Выкары�таньне: %s З�Г�Д [ДОВ�Д]...\n"
 "  ці:  %s ВЫБ�Р\n"
 
-#: src/timeout.c:229
-#, fuzzy
+#: src/timeout.c:232
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
-msgstr "Довады, абав�зковы� дл� доўгіх выбараў, абав�зковы� й дл� кароткіх.\n"
+msgstr ""
 
-#: src/timeout.c:235
+#: src/timeout.c:238
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 msgid ""
 "\n"
 "DURATION is a floating point number with an optional suffix:\n"
@@ -9868,7 +9897,7 @@ msgid ""
 "days.\n"
 msgstr ""
 
-#: src/timeout.c:259
+#: src/timeout.c:262
 msgid ""
 "\n"
 "If the command times out, and --preserve-status is not set, then exit with\n"
@@ -9879,17 +9908,17 @@ msgid ""
 "case the exit status is 128+9 rather than 124.\n"
 msgstr ""
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr ""
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, fuzzy, c-format
 msgid "error waiting for command"
 msgstr "памылка запі�у %s"
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr ""
@@ -10214,7 +10243,7 @@ msgstr ""
 #: src/truncate.c:115
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 
 #: src/truncate.c:121
@@ -10294,12 +10323,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr "%s: увод утрымлівае н�цотную колька�ьць �лем�нтаў"
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr "%s: увод утрымлівае цыкал:"
@@ -10388,12 +10417,12 @@ msgstr ""
 msgid "tab stop value is too large"
 msgstr "крок табул�цыі зав�лікі"
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr "Выкары�таньне: %s [П�Р�МЭТ�Р]... [УВОД [ВЫВ�Д]]\n"
 
-#: src/uniq.c:138
+#: src/uniq.c:174
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
 "writing to OUTPUT (or standard output).\n"
@@ -10401,36 +10430,49 @@ msgid ""
 "With no options, matching lines are merged to the first occurrence.\n"
 msgstr ""
 
-#: src/uniq.c:147
+#: src/uniq.c:183
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
+msgstr ""
+
+#: src/uniq.c:187
+msgid ""
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
+msgstr ""
+
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr ""
+
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
 msgstr ""
 
-#: src/uniq.c:151
+#: src/uniq.c:199
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
 "  -i, --ignore-case     ignore differences in case when comparing\n"
 "  -s, --skip-chars=N    avoid comparing the first N characters\n"
 "  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
 msgstr ""
 
-#: src/uniq.c:161
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr ""
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 msgid ""
 "\n"
 "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n"
 "characters.  Fields are skipped before chars.\n"
 msgstr ""
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 msgid ""
 "\n"
 "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n"
@@ -10438,24 +10480,34 @@ msgid ""
 "Also, comparisons honor the rules specified by 'LC_COLLATE'.\n"
 msgstr ""
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, c-format
 msgid "too many repeated lines"
 msgstr "зашмат аднолькавых радкоў"
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
 msgstr ""
 
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
 msgstr ""
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
 msgstr "нер�чаі�на� колька�ьць байтаў дл� параўнаньн�"
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr ""
+
+#: src/uniq.c:652
+#, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr ""
+
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr ""
@@ -10477,11 +10529,6 @@ msgstr ""
 "Выклікае функцыю unlink дл� выдаленьн� пазначанага Ф�ЙЛа.\n"
 "\n"
 
-#: src/unlink.c:86
-#, c-format
-msgid "cannot unlink %s"
-msgstr "немагчыма unlink %s"
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -10528,7 +10575,7 @@ msgstr[2] "%lu кары�тальнікаў"
 msgid ",  load average: %.2f"
 msgstr ", ��р�дн�� нагрузка: %.2f"
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, fuzzy, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -10541,19 +10588,19 @@ msgstr ""
 "Калі Ф�ЙЛ не зададзены, выкары�тоўвае %s. %s - агульны Ф�ЙЛ.\n"
 "\n"
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
 "an uninterruptible sleep state also contribute to the load average.\n"
 msgstr ""
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr ""
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, fuzzy, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
@@ -10777,13 +10824,23 @@ msgstr ""
 "Бе�перапынна выводзіць Р�ДОК(і), ці літару \"y\".\n"
 "\n"
 
-#, fuzzy
-#~ msgid "  returning value: '%s'\n"
-#~ msgstr "�твар�ньне файла %s\n"
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: недапушчальны выраб -- %c\n"
 
-#, fuzzy
-#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n"
-#~ msgstr "Выкары�таньне: %s [ВЫБ�Р] ��ЗВ�...\n"
+#~ msgid "block size"
+#~ msgstr "памер кавалку"
+
+#~ msgid "cannot change owner and/or group of %s"
+#~ msgstr "немагчыма зьм�ніць уладальніка й/ці групу %s"
+
+#~ msgid "cannot chdir to directory %s"
+#~ msgstr "немагчыма перай�ьці да т�чкі %s"
+
+#~ msgid "cannot get the login group of a numeric UID"
+#~ msgstr "немагчыма атрымаць уліковую групу лічбавага UID"
+
+#~ msgid "invalid argument: %s"
+#~ msgstr "нер�чаі�ны довад: %s"
 
 #~ msgid ""
 #~ "\n"
@@ -10796,120 +10853,11 @@ msgstr ""
 #~ "  %s /usr/bin/sort       Выводзіць \"sort\".\n"
 #~ "  %s include/stdio.h .h  Выводзіць \"stdio\".\n"
 
-#~ msgid "reading %s"
-#~ msgstr "чытаецца %s"
-
-#~ msgid "writing %s"
-#~ msgstr "пішацца %s"
-
-#~ msgid "closing %s"
-#~ msgstr "зачын�ецца %s"
-
-#~ msgid "accessing %s"
-#~ msgstr "до�туп да %s"
-
-#~ msgid "opening %s"
-#~ msgstr "адчын�ецца %s"
-
-#~ msgid ""
-#~ "Usage: %s NAME\n"
-#~ "  or:  %s OPTION\n"
-#~ msgstr ""
-#~ "Выкары�таньне: %s ��ЗВ�\n"
-#~ "  ці:  %s ВЫБ�Р\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "  none, off       never make backups (even if --backup is given)\n"
-#~ "  numbered, t     make numbered backups\n"
-#~ "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
-#~ "  simple, never   always make simple backups\n"
-#~ "\n"
-#~ msgstr ""
-#~ "  none, off       ніколі не запа�іць (нават калі зададзены --backup)\n"
-#~ "  numbered, t     �твараць нумараваны� запа�ы\n"
-#~ "  existing, nil   нумараваць, калі й�нуе нумараваны, інакш не нумараваць\n"
-#~ "  simple, never   заў�ёды �твараць ненумараваны�\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "WARNING: --page-increment is deprecated; use --line-increment instead"
-#~ msgstr ""
-#~ "парам�тар \"--megabytes \" - а�уджаны; заме�т �го кары�тайце�� \"-m\""
-
-#~ msgid "All arguments to long options are mandatory for short options.\n"
-#~ msgstr "У�е довады дл� доўгіх выбараў абав�зковы й дл� кароткіх.\n"
-
-#~ msgid "Usage: %s [OPTION]... FILE\n"
-#~ msgstr "Выкары�таньне: %s [ВЫБ�Р]... Ф�ЙЛ\n"
-
-#~ msgid "Password:"
-#~ msgstr "Пароль:"
-
-#~ msgid "getpass: cannot open /dev/tty"
-#~ msgstr "getpass: немагчыма адчыніць /dev/tty"
-
-#~ msgid "cannot set groups"
-#~ msgstr "немагчыма ў�тал�ваць групы"
-
-#~ msgid "cannot set group id"
-#~ msgstr "немагчыма ў�тал�ваць id групы"
-
-#~ msgid "cannot set user id"
-#~ msgstr "немагчыма ў�тал�ваць id кары�тальніка"
-
-#~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n"
-#~ msgstr "Выкары�таньне: %s [П�Р�МЭТ�Р]... [-] [К�РЫСТ�ЛЬ�ІК [ДОВ�Д]...]\n"
-
-#~ msgid "user %s does not exist"
-#~ msgstr "кары�тальнік %s не і�нуе"
-
-#~ msgid "incorrect password"
-#~ msgstr "н��лушны пароль"
-
-#~ msgid "using restricted shell %s"
-#~ msgstr "выкары�тоўваецца абмежавана� абалонка %s"
-
-#~ msgid "warning: cannot change directory to %s"
-#~ msgstr "Увага! �емагчыма перай�ьці да т�чкі %s"
-
-#, fuzzy
-#~ msgid ""
-#~ "Change the group of each FILE to GROUP.\n"
-#~ "With --reference, change the group of each FILE to that of RFILE.\n"
-#~ "\n"
-#~ "  -c, --changes          like verbose but report only when a change is "
-#~ "made\n"
-#~ "  -f, --silent, --quiet  suppress most error messages\n"
-#~ "  -v, --verbose          output a diagnostic for every file processed\n"
-#~ msgstr ""
-#~ "Зьм�н�е ўладальніка й/альбо групу кожнага Ф�ЙЛа на ЎЛ�Д�ЛЬ�ІКа й/альбо "
-#~ "ГРУПУ.\n"
-#~ "Калі зададзены --reference, зьм�н�е ўладальніка й групу кожнага Ф�ЙЛа на\n"
-#~ "адпаведны� знач�ньні ў файла RFILE.\n"
-#~ "\n"
-#~ "  -c, --changes          �к і verbose, але друкуе толькі калі зьмены "
-#~ "адбылі��\n"
-#~ "      --dereference      узьдзейнічае на аб'ект �па�ылкі, заме�т �амой\n"
-#~ "                         �ымбалічнае �па�ылкі (г�та прадвызначаны� "
-#~ "паводзіны)\n"
+#~ msgid "Usage: %s [OPTION] [FILE]...\n"
+#~ msgstr "Выкары�таньне: %s [ВЫБ�Р] [Ф�ЙЛ]...\n"
 
-#, fuzzy
-#~ msgid ""
-#~ "  -f, --silent, --quiet  suppress most error messages\n"
-#~ "      --reference=RFILE  use RFILE's group rather than specifying a\n"
-#~ "                         GROUP value\n"
-#~ "  -R, --recursive        operate on files and directories recursively\n"
-#~ "  -v, --verbose          output a diagnostic for every file processed\n"
-#~ "\n"
-#~ msgstr ""
-#~ "  -f, --silent, --quiet  не адлю�троўваць а�ноўны� паведамленьні аб "
-#~ "памылках\n"
-#~ "      --reference=RФ�ЙЛ  выкары�тоўвае ўладальніка й групу RФ�ЙЛу заме�т\n"
-#~ "                          зададзеных знач�ньн�ў УЛ�Д�ЛЬ�ІК:ГРУП�\n"
-#~ "  -R, --recursive        апрацоўвае файлы й т�чкі р�кур�ыўна\n"
-#~ "  -v, --verbose          выводзіць праверку дл� кожнага апрацаванага "
-#~ "файлу\n"
+#~ msgid "%s"
+#~ msgstr "%s"
 
 #~ msgid ""
 #~ "  -f, --silent, --quiet   suppress most error messages\n"
@@ -10924,7 +10872,6 @@ msgstr ""
 #~ "      --reference=RFILE   выкары�тоўвае р�жым RFILE'а заме�т РЭЖЫМу\n"
 #~ "  -R, --recursive         апрацоўвае файлы й дыр�кторыі р�кур�іўна\n"
 
-#, fuzzy
 #~ msgid ""
 #~ "Change the owner and/or group of each FILE to OWNER and/or GROUP.\n"
 #~ "With --reference, change the owner and group of each FILE to those of "
@@ -10932,10 +10879,10 @@ msgstr ""
 #~ "\n"
 #~ "  -c, --changes          like verbose but report only when a change is "
 #~ "made\n"
-#~ "      --dereference      affect the referent of each symbolic link (this "
-#~ "is\n"
-#~ "                         the default), rather than the symbolic link "
-#~ "itself\n"
+#~ "      --dereference      affect the referent of each symbolic link, "
+#~ "rather\n"
+#~ "                         than the symbolic link itself (this is the "
+#~ "default)\n"
 #~ msgstr ""
 #~ "Зьм�н�е ўладальніка й/альбо групу кожнага Ф�ЙЛа на ЎЛ�Д�ЛЬ�ІКа й/альбо "
 #~ "ГРУПУ.\n"
@@ -10952,7 +10899,7 @@ msgstr ""
 #~ msgid ""
 #~ "  -f, --silent, --quiet  suppress most error messages\n"
 #~ "      --reference=RFILE  use RFILE's owner and group rather than\n"
-#~ "                         specifying OWNER:GROUP values\n"
+#~ "                         the specifying OWNER:GROUP values\n"
 #~ "  -R, --recursive        operate on files and directories recursively\n"
 #~ "  -v, --verbose          output a diagnostic for every file processed\n"
 #~ "\n"
@@ -10965,47 +10912,21 @@ msgstr ""
 #~ "  -v, --verbose          выводзіць праверку дл� кожнага апрацаванага "
 #~ "файлу\n"
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "SIZE may be (or may be an integer optionally followed by) one of "
-#~ "following:\n"
-#~ "KB 1000, K 1024, MB 1000*1000, M 1024*1024, and so on for G, T, P, E, Z, "
-#~ "Y.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "SIZE may be (or may be an integer optionally followed by) one of "
-#~ "following:\n"
-#~ "kB 1000, K 1024, MB 1000*1000, M 1024*1024, and so on for G, T, P, E, Z, "
-#~ "Y.\n"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: недапушчальны выраб -- %c\n"
-
-#~ msgid "block size"
-#~ msgstr "памер кавалку"
-
-#~ msgid "cannot change owner and/or group of %s"
-#~ msgstr "немагчыма зьм�ніць уладальніка й/ці групу %s"
-
-#~ msgid "cannot chdir to directory %s"
-#~ msgstr "немагчыма перай�ьці да т�чкі %s"
-
-#~ msgid "cannot get the login group of a numeric UID"
-#~ msgstr "немагчыма атрымаць уліковую групу лічбавага UID"
-
-#~ msgid "invalid argument: %s"
-#~ msgstr "нер�чаі�ны довад: %s"
+#~ msgid "reading %s"
+#~ msgstr "чытаецца %s"
 
-#~ msgid "Usage: %s [OPTION] [FILE]...\n"
-#~ msgstr "Выкары�таньне: %s [ВЫБ�Р] [Ф�ЙЛ]...\n"
+#~ msgid "writing %s"
+#~ msgstr "пішацца %s"
 
-#~ msgid "%s"
-#~ msgstr "%s"
+#~ msgid "closing %s"
+#~ msgstr "зачын�ецца %s"
 
 #~ msgid "cannot create link %s"
 #~ msgstr "немагчыма �тварыць лучыва %s"
 
+#~ msgid "accessing %s"
+#~ msgstr "до�туп да %s"
+
 #~ msgid "the --reply option is deprecated; use -i or -f instead"
 #~ msgstr "парам�тар --reply а�уджаны; выкары�тоўваеце заме�т �го -i альбо -f"
 
@@ -11018,9 +10939,34 @@ msgstr ""
 #~ msgid "unrecognized operand %s=%s"
 #~ msgstr "нера�пазнаны ап�ранд %s=%s"
 
+#~ msgid "opening %s"
+#~ msgstr "адчын�ецца %s"
+
 #~ msgid "the --kilobytes option is deprecated; use -k instead"
 #~ msgstr "аргумент --kilobytes а�уджаны; заме�т �го кары�тайце�� -k"
 
+#~ msgid ""
+#~ "Usage: %s NAME\n"
+#~ "  or:  %s OPTION\n"
+#~ msgstr ""
+#~ "Выкары�таньне: %s ��ЗВ�\n"
+#~ "  ці:  %s ВЫБ�Р\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Examples:\n"
+#~ "  %s /usr/bin/sort  Output \"/usr/bin\".\n"
+#~ "  %s stdio.h        Output \".\".\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Прыклады:\n"
+#~ "  %s /usr/bin/sort  друкуе \"/usr/bin\".\n"
+#~ "  %s stdio.h        друкуе \".\".\n"
+
+#~ msgid "the --megabytes option is deprecated; use -m instead"
+#~ msgstr ""
+#~ "парам�тар \"--megabytes \" - а�уджаны; заме�т �го кары�тайце�� \"-m\""
+
 #~ msgid "Usage: %s [OPTION]... [STRING]...\n"
 #~ msgstr "Выкары�таньне: %s [ВЫБ�Р]... [Р�ДОК]...\n"
 
@@ -11031,12 +10977,12 @@ msgstr ""
 #~ "Друкуе про�ты� множнікі кожнага ліка.\n"
 #~ "\n"
 
+#~ msgid "%s: cannot lseek back to original position"
+#~ msgstr "%s: немагчыма перам��ьціцца назад да зыходнага �тановішча"
+
 #~ msgid "unrecognized option `-%c'"
 #~ msgstr "нера�пазнаны выбар \"-%c\""
 
-#~ msgid "cannot get supplemental group list"
-#~ msgstr "немагчыма атрымаць �ьпі� дадатковых групаў"
-
 #, fuzzy
 #~ msgid "cannot return to working directory"
 #~ msgstr "немагчыма в�рнуцца ў пачатковую працоўную т�чку"
@@ -11073,6 +11019,9 @@ msgstr ""
 #~ msgid "cannot set permissions of fifo %s"
 #~ msgstr "немагчыма ў�тал�ваць правы fifo %s"
 
+#~ msgid "All arguments to long options are mandatory for short options.\n"
+#~ msgstr "У�е довады дл� доўгіх выбараў абав�зковы й дл� кароткіх.\n"
+
 #~ msgid "skip argument"
 #~ msgstr "абінуць довад"
 
@@ -11109,6 +11058,9 @@ msgstr ""
 #~ "Inc.,\n"
 #~ "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 
+#~ msgid "Usage: %s [OPTION]... FILE\n"
+#~ msgstr "Выкары�таньне: %s [ВЫБ�Р]... Ф�ЙЛ\n"
+
 #~ msgid "cannot chdir from %s to .."
 #~ msgstr "немагчыма зьм�ніць т�чку з %s на .."
 
@@ -11130,6 +11082,19 @@ msgstr ""
 #~ msgid "invalid format string: %s"
 #~ msgstr "нер�чаі�ны радок фармату: %s"
 
+#~ msgid ""
+#~ "Usage: %s USERNAME COMMAND [ARGUMENT]...\n"
+#~ "  or:  %s OPTION\n"
+#~ msgstr ""
+#~ "Выкары�таньне: %s УЛІКОВ�Е_ЙМЯ З�Г�Д [ДОВ�Д]...\n"
+#~ "  ці:  %s ВЫБ�Р\n"
+
+#~ msgid "cannot set group-ID to %lu"
+#~ msgstr "немагчыма задаць ID групы дл� %lu"
+
+#~ msgid "cannot set user-ID to %lu"
+#~ msgstr "немагчыма вы�тавіць ID кары�тальніка ў %lu"
+
 #~ msgid "Usage: %s [OPTIONS] FILE [...]\n"
 #~ msgstr "Выкары�таньне: %s [ВЫБ�РЫ] Ф�ЙЛ [...]\n"
 
@@ -11142,6 +11107,30 @@ msgstr ""
 #~ msgid "new_mode: mode\n"
 #~ msgstr "new_mode: р�жым\n"
 
+#~ msgid "Password:"
+#~ msgstr "Пароль:"
+
+#~ msgid "getpass: cannot open /dev/tty"
+#~ msgstr "getpass: немагчыма адчыніць /dev/tty"
+
+#~ msgid "cannot set groups"
+#~ msgstr "немагчыма ў�тал�ваць групы"
+
+#~ msgid "cannot set group id"
+#~ msgstr "немагчыма ў�тал�ваць id групы"
+
+#~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n"
+#~ msgstr "Выкары�таньне: %s [П�Р�МЭТ�Р]... [-] [К�РЫСТ�ЛЬ�ІК [ДОВ�Д]...]\n"
+
+#~ msgid "user %s does not exist"
+#~ msgstr "кары�тальнік %s не і�нуе"
+
+#~ msgid "incorrect password"
+#~ msgstr "н��лушны пароль"
+
+#~ msgid "using restricted shell %s"
+#~ msgstr "выкары�тоўваецца абмежавана� абалонка %s"
+
 #~ msgid "creating %s"
 #~ msgstr "�твараецца %s"
 
diff --git a/po/bg.gmo b/po/bg.gmo
index d7adf862..29ab006e 100644
--- a/po/bg.gmo
+++ b/po/bg.gmo
diff --git a/po/bg.po b/po/bg.po
index c706ce88..851d1f0e 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: coreutils 6.5\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
 "PO-Revision-Date: 2006-11-23 22:41+0200\n"
 "Last-Translator: Anton Zinoviev <zinoviev@debian.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -43,76 +43,123 @@ msgstr "Допу�тими аргументи �а:"
 msgid "error closing file"
 msgstr "затвар�не на входни� файл %s"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "грешка при запи�"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "режимът за до�тъп до %s е запазен"
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "�епозната �и�темна грешка"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "обикновен празен файл"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "обикновен файл"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "каталог"
 
-#: lib/file-type.c:44
-msgid "block special file"
-msgstr "�пециален блоков файл"
-
-#: lib/file-type.c:47
-msgid "character special file"
-msgstr "�пециален �имволен файл"
-
-#: lib/file-type.c:50
-msgid "fifo"
-msgstr "именуван канал"
-
-#: lib/file-type.c:53
+#: lib/file-type.c:46
 msgid "symbolic link"
 msgstr "�имволна връзка"
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "гнездо"
-
-#: lib/file-type.c:59
+#: lib/file-type.c:52
 msgid "message queue"
 msgstr "опашка �ъ� �ъобщени�"
 
-#: lib/file-type.c:62
+#: lib/file-type.c:55
 msgid "semaphore"
 msgstr "�емафор"
 
-#: lib/file-type.c:65
+#: lib/file-type.c:58
 msgid "shared memory object"
 msgstr "�поделен обект в паметта"
 
-#: lib/file-type.c:68
+#: lib/file-type.c:61
 msgid "typed memory object"
 msgstr "типизиран обект в паметта"
 
-#: lib/file-type.c:70
+#: lib/file-type.c:66
+msgid "block special file"
+msgstr "�пециален блоков файл"
+
+#: lib/file-type.c:69
+msgid "character special file"
+msgstr "�пециален �имволен файл"
+
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr ""
+
+#: lib/file-type.c:75
+msgid "fifo"
+msgstr "именуван канал"
+
+#: lib/file-type.c:78
+msgid "door"
+msgstr ""
+
+#: lib/file-type.c:81
+#, fuzzy
+msgid "multiplexed block special file"
+msgstr "�пециален блоков файл"
+
+#: lib/file-type.c:84
+#, fuzzy
+msgid "multiplexed character special file"
+msgstr "�пециален �имволен файл"
+
+#: lib/file-type.c:87
+msgid "multiplexed file"
+msgstr ""
+
+#: lib/file-type.c:90
+#, fuzzy
+msgid "named file"
+msgstr "непознат тип файл"
+
+#: lib/file-type.c:93
+#, fuzzy
+msgid "network special file"
+msgstr "�пециален блоков файл"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr ""
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr ""
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr ""
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "гнездо"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr ""
+
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "непознат тип файл"
 
@@ -248,18 +295,18 @@ msgstr "%s: опци�та „-W %s“ не допу�ка аргумент\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: опци�та „%s“ изи�ква аргумент\n"
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr "не може да �е �мен�т правата за до�тъп до %s"
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "не може да �е �ъздаде каталог %s"
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr "паметта е изчерпана"
@@ -376,7 +423,7 @@ msgstr "Регул�рни�т израз е твърде гол�м"
 msgid "Unmatched ) or \\)"
 msgstr "�еотворена ) или \\)"
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 msgid "No previous regular expression"
 msgstr "��ма предходен регул�рен израз"
 
@@ -402,7 +449,7 @@ msgstr "ползвайте --no-preserve-root, за да отмените таз
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[дДoOyY]"
 
@@ -413,11 +460,11 @@ msgstr "^[дДoOyY]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[н�kKnN]"
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, c-format
 msgid "setting permissions for %s"
 msgstr "у�танов�ва �е режимът за до�тъп до %s"
@@ -564,18 +611,6 @@ msgstr "неу�пешно отвар�не на файл"
 msgid "Resource lost"
 msgstr ""
 
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, fuzzy, c-format
-msgid "cannot create pipe"
-msgstr "не може да �е �ъздаде именуван канал %s"
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, fuzzy, c-format
-msgid "%s subprocess failed"
-msgstr "%s: неу�пешно позициониране (seek) във файл"
-
 #: lib/strsignal.c:114
 #, fuzzy, c-format
 msgid "Real-time signal %d"
@@ -782,7 +817,7 @@ msgstr ""
 "Съобщавайте за програмни грешки на <%s>.\n"
 "За грешки в българ�ки� превод на <dict@fsa-bg.org>\n"
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr ""
@@ -792,30 +827,10 @@ msgstr ""
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr ""
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr ""
 
-#: lib/w32spawn.h:43
-#, fuzzy, c-format
-msgid "_open_osfhandle failed"
-msgstr "неу�пешно отвар�не на файл"
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr ""
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr ""
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr ""
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr ""
@@ -838,7 +853,7 @@ msgstr "�епозната �и�темна грешка"
 msgid "failed to reopen %s with mode %s"
 msgstr "не може да �е отвори %s"
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr "�равнението на низове не у�п�"
@@ -866,7 +881,7 @@ msgstr "неправилен аргумент „%s“"
 #: lib/xstrtol-error.c:68
 #, fuzzy, c-format
 msgid "invalid suffix in %s%s argument '%s'"
-msgstr "неправилен аргумент „%s“"
+msgstr "неправилно чи�ло � плаваща запета� като аргумент: %s"
 
 #: lib/xstrtol-error.c:72
 #, fuzzy, c-format
@@ -899,7 +914,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -923,48 +938,47 @@ msgstr ""
 "ред)\n"
 "във входни� поток.\n"
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "грешка при четене"
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, c-format
 msgid "invalid input"
 msgstr "недопу�тим вход"
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, c-format
 msgid "invalid wrap size: %s"
 msgstr "неправилен размер за прена��не: %s"
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, c-format
 msgid "extra operand %s"
 msgstr "излишен операнд „%s“"
 
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, c-format
 msgid "closing standard input"
 msgstr "затвар�не на �тандартни� вход"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -996,8 +1010,8 @@ msgstr ""
 #: src/basename.c:60
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/basename.c:67
@@ -1011,33 +1025,32 @@ msgid ""
 "  %s -a any/str1 any/str2   -> \"str1\" followed by \"str2\"\n"
 msgstr ""
 
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, c-format
 msgid "missing operand"
 msgstr "лип�ващ операнд"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 #, fuzzy
 msgid "Richard M. Stallman"
 msgstr "Torbjorn Granlund и Richard M. Stallman"
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1097,7 +1110,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr "не може да �е изпълни ioctl за „%s“"
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr "�тандартни�т изход"
@@ -1114,15 +1127,15 @@ msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 #, fuzzy
 msgid "Jim Meyering"
 msgstr "Jim Meyering и Paul Eggert"
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, fuzzy, c-format
 msgid "failed to create security context: %s"
 msgstr "пром�ната на �об�твеника на %s не у�п�\n"
@@ -1132,8 +1145,8 @@ msgstr "пром�ната на �об�твеника на %s не у�п�\n"
 msgid "failed to set %s security context component to %s"
 msgstr ""
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, fuzzy, c-format
 msgid "failed to get security context of %s"
 msgstr "не могат да �е получат атрибутите на %s"
@@ -1143,18 +1156,18 @@ msgstr "не могат да �е получат атрибутите на %s"
 msgid "can't apply partial context to unlabeled file %s"
 msgstr ""
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, fuzzy, c-format
 msgid "failed to change context of %s to %s"
 msgstr "�об�твеник на %s не можа да �е промени на %s\n"
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
 msgstr "н�ма до�тъп до %s"
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, c-format
 msgid "cannot read directory %s"
 msgstr "каталогът %s не може да �е чете"
@@ -1164,13 +1177,14 @@ msgstr "каталогът %s не може да �е чете"
 msgid "changing security context of %s\n"
 msgstr "промен�т �е правата за до�тъп до %s"
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, c-format
 msgid "fts_read failed"
 msgstr "неу�пешен fts_read"
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, fuzzy, c-format
 msgid "fts_close failed"
 msgstr "неу�пешно затвар�не на файл"
@@ -1188,7 +1202,7 @@ msgstr ""
 
 #: src/chcon.c:357
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
@@ -1209,7 +1223,7 @@ msgid ""
 "  -l, --range=RANGE      set range RANGE in the target security context\n"
 msgstr ""
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 #, fuzzy
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
@@ -1220,17 +1234,11 @@ msgstr ""
 "      --preserve-root    да не �е дей�тва рекур�ивно от „/“\n"
 
 #: src/chcon.c:379
-#, fuzzy
 msgid ""
 "      --reference=RFILE  use RFILE's security context rather than "
 "specifying\n"
 "                         a CONTEXT value\n"
 msgstr ""
-"  -f, --silent, --quiet  поти�ка повечето �ъобщени� за грешки\n"
-"      --reference=ЕТФ�ЙЛ ползва групата на ЕТФ�ЙЛ вме�то по�очена ГРУП�\n"
-"  -R, --recursive        дей�тва рекур�ивно върху файловете и каталозите\n"
-"  -v, --verbose          извежда диагно�тично �ъобщение за в�еки обработен "
-"файл\n"
 
 #: src/chcon.c:383 src/chgrp.c:140 src/chown.c:118
 msgid "  -R, --recursive        operate on files and directories recursively\n"
@@ -1268,36 +1276,37 @@ msgstr ""
 "подразбиране)\n"
 "\n"
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr "-R --dereference изи�ква -H или -L"
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr "-R -h изи�ква -P"
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, c-format
 msgid "missing operand after %s"
 msgstr "лип�ващ операнд �лед %s"
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, fuzzy, c-format
 msgid "invalid context: %s"
 msgstr "неправилен режим за до�тъп %s"
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr ""
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, c-format
 msgid "failed to get attributes of %s"
 msgstr "не могат да �е получат атрибутите на %s"
@@ -1323,7 +1332,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
@@ -1360,47 +1369,47 @@ msgstr ""
 "  %s staff /u      прави групата на /u да бъде „staff“.\n"
 "  %s -hR staff /u  прави групата на /u и файловете в /u да бъде „staff“.\n"
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
 msgstr "получават �е новите атрибути на %s"
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr "нито �имволната връзка %s, нито �очени�т файл б�ха променени\n"
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, fuzzy, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr "режимът за до�тъп до %s е променен на %04lo (%s)\n"
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, fuzzy, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr "режимът за до�тъп до %s не може да �е �мени на %04lo (%s)\n"
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr "режимът за до�тъп до %s е запазен на %04lo (%s)\n"
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, fuzzy, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr "не може да �е �ъздаде �имволна връзка %s"
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, c-format
 msgid "changing permissions of %s"
 msgstr "промен�т �е правата за до�тъп до %s"
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr "%s: нови�т режим за до�тъп е %s, а не %s"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1411,28 +1420,22 @@ msgstr ""
 "    или:    %s [ОПЦИЯ]... ОСМИЧЕ�-РЕЖИМ Ф�ЙЛ...\n"
 "    или:    %s [ОПЦИЯ]... --reference=ЕТФ�ЙЛ Ф�ЙЛ...\n"
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 msgid ""
 "Change the mode of each FILE to MODE.\n"
 "With --reference, change the mode of each FILE to that of RFILE.\n"
 "\n"
 msgstr ""
 
-#: src/chmod.c:391
-#, fuzzy
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
-"  -f, --silent, --quiet  поти�ка повечето �ъобщени� за грешки\n"
-"      --reference=ЕТФ�ЙЛ ползва групата на ЕТФ�ЙЛ вме�то по�очена ГРУП�\n"
-"  -R, --recursive        дей�тва рекур�ивно върху файловете и каталозите\n"
-"  -v, --verbose          извежда диагно�тично �ъобщение за в�еки обработен "
-"файл\n"
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr ""
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 #, fuzzy
 msgid ""
 "\n"
@@ -1441,12 +1444,12 @@ msgstr ""
 "\n"
 "В�еки РЕЖИМ е от вида „[ugoa]*([-+=]([rwxXst]*|[ugo]))+“.\n"
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr "не може да �е комбинират опциите за режим и --reference"
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, c-format
 msgid "invalid mode: %s"
 msgstr "неправилен режим за до�тъп %s"
@@ -1596,26 +1599,21 @@ msgstr ""
 "  %s -hR root /u   прави �об�твеника на /u и файловете в /u да е „root“.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr ""
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr "неправилна група %s"
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, fuzzy, c-format
 msgid "invalid group list %s"
 msgstr "неправилна група %s"
 
-#: src/chroot.c:117
-#, fuzzy, c-format
-msgid "failed to set additional groups"
-msgstr "не може да �е изпълни stat за %s"
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
@@ -1624,7 +1622,7 @@ msgstr ""
 "Използване: %s �ОВКОРЕ�ОВ [КОМ��Д�...]\n"
 "    или:    %s ОПЦИЯ\n"
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
@@ -1632,13 +1630,13 @@ msgstr ""
 "Изпълн�ва КОМ��Д� � коренов каталог �ОВКОРЕ�ОВ.\n"
 "\n"
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
 msgstr ""
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 #, fuzzy
 msgid ""
 "\n"
@@ -1648,28 +1646,42 @@ msgstr ""
 "�ко не е по�очена команда, изпълн�ва „${SHELL} -i“ (по подразбиране: /bin/"
 "sh).\n"
 
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, c-format
 msgid "cannot change root directory to %s"
 msgstr "коренови�т каталог не може да �е �мени на %s"
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, c-format
 msgid "cannot chdir to root directory"
 msgstr "� chdir не може да �е влиза в главни� каталог"
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr ""
+
+#: src/chroot.c:383
+#, fuzzy, c-format
+msgid "failed to get supplemental groups"
+msgstr "не може да �е получи �пи�ъка от допълнителни групи"
+
+#: src/chroot.c:395
+#, fuzzy, c-format
+msgid "failed to %s supplemental groups"
+msgstr "не може да �е у�танови допълнителна група"
+
+#: src/chroot.c:402
 #, fuzzy, c-format
 msgid "failed to set group-ID"
 msgstr "не може да �е изпълни stat за %s"
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, fuzzy, c-format
 msgid "failed to set user-ID"
 msgstr "не може да �е изпълни stat за %s"
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, fuzzy, c-format
 msgid "failed to run command %s"
 msgstr "неу�пешно изпълнение на командата %s"
@@ -1701,7 +1713,7 @@ msgstr ""
 "Отпечатва контролна �ума CRC и бро� байтове на в�еки Ф�ЙЛ.\n"
 "\n"
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr "Използване: %s [ОПЦИЯ]... Ф�ЙЛ1 Ф�ЙЛ2\n"
@@ -1777,298 +1789,331 @@ msgstr "по�очени �а много опции -i"
 msgid "empty %s not allowed"
 msgstr "допълнителни�т операнд %s не е позволен � -c"
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr "грешка при четене на %s"
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, c-format
 msgid "cannot lseek %s"
 msgstr "не може да �е обработи непо�ледователно %s"
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr "грешка при запи� в %s"
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, fuzzy, c-format
 msgid "%s: failed to get extents info"
 msgstr "%s: не може да �е от�трани"
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, fuzzy, c-format
 msgid "%s: write failed"
 msgstr "неу�пешен запи�"
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, fuzzy, c-format
 msgid "failed to extend %s"
 msgstr "не може да �е отвори %s"
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, fuzzy, c-format
 msgid "clearing permissions for %s"
 msgstr "у�танов�ва �е режимът за до�тъп до %s"
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "�об�твено�тта на %s не можа да �е запази"
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
 msgstr "не може да �е тър�и файла %s"
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, c-format
 msgid "failed to preserve authorship for %s"
 msgstr "не можа да �е запази автор�твото на %s"
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
+#, fuzzy, c-format
+msgid "failed to set default file creation context to %s"
+msgstr "не могат да �е получат атрибутите на %s"
+
+#: src/copy.c:820
+#, fuzzy, c-format
+msgid "failed to set default file creation context for %s"
+msgstr "каталогът %s не може да �е затвори"
+
+#: src/copy.c:846
+#, fuzzy, c-format
+msgid "failed to set the security context of %s"
+msgstr "не могат да �е получат атрибутите на %s"
+
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
 msgid "cannot open %s for reading"
 msgstr "не може да �е отвори %s за четене"
 
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, c-format
 msgid "cannot fstat %s"
 msgstr "не може да �е получи режимът за до�тъп до %s"
 
-#: src/copy.c:820
+#: src/copy.c:935
 #, c-format
 msgid "skipping file %s, as it was replaced while being copied"
 msgstr "файлът %s �е пропу�ка, тъй като бе заме�тен по време на копирането"
 
-#: src/copy.c:850
-#, fuzzy, c-format
-msgid "failed to get file system create context"
-msgstr "не у�пешно затвар�не на �тандартната грешка"
-
-#: src/copy.c:864
-#, fuzzy, c-format
-msgid "failed to set the security context of %s to %s"
-msgstr "групата на %s не можа да �е промени на %s\n"
-
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
 msgid "cannot remove %s"
 msgstr "не може да �е изтрие %s"
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
 msgstr "%s е изтрит\n"
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr ""
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, c-format
 msgid "cannot create regular file %s"
 msgstr "не може да �е �ъздаде обикновен файл %s"
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, fuzzy, c-format
 msgid "failed to clone %s from %s"
 msgstr "каталогът %s не може да �е затвори"
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr "времената за %s �е запазват"
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
 #, fuzzy, c-format
 msgid "failed to close %s"
 msgstr "не може да �е отвори %s"
 
-#: src/copy.c:1471
+#: src/copy.c:1580
 #, fuzzy, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
 msgstr "%s: да �е заме�ти ли %s (режимът за до�тъп е %04lo)? "
 
-#: src/copy.c:1478
+#: src/copy.c:1581
+#, c-format
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr ""
+
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
 msgstr "%s: да �е заме�ти ли %s? "
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr " (резервно копие: %s)"
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr ""
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, c-format
 msgid "cannot create hard link %s to %s"
 msgstr "не може да �е направи твърда връзка %s към %s"
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, c-format
 msgid "cannot stat %s"
 msgstr "не могат да �е получат атрибутите на %s"
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, c-format
 msgid "omitting directory %s"
 msgstr "каталогът %s �е пропу�ка"
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr "внимание: изходни� файл %s е по�очен повече от веднъж"
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
 msgstr "%s и %s �а един и �ъщ файл"
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr "%s не е каталог и не може да �е заме�ти � каталога %s"
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr "току що �ъздадени�т %s н�ма да бъде заме�тен � %s"
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr "каталогът %s не може да �е заме�ти � файл, който не е каталог"
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr ""
 "каталог не може да �е преме�ти върху файл, който не е каталог: %s -> %s"
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr "резервното копиране на %s би разрушило източника;  %s не бе преме�тен"
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr "резервното копиране на %s би разрушило източника;  %s не бе копиран"
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
 msgstr "не може да �е направи резервно копие на %s"
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, fuzzy, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr "току що �ъздадени�т %s н�ма да бъде заме�тен � %s"
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr "не може да �е копира каталог (%s) в �ами� �ебе �и (%s)"
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr "н�ма да �е направи твърда връзка %s към каталога %s"
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr "не може да �е преме�ти %s в �во� подкаталог %s"
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, c-format
 msgid "cannot move %s to %s"
 msgstr "не може да �е преме�ти %s в %s"
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr ""
 "преме�тването между у�трой�тва не у�п� (от %s в %s); целеви�т файл не можа "
 "да �е изтрие"
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, fuzzy, c-format
-msgid "failed to set default file creation context to %s"
-msgstr "не могат да �е получат атрибутите на %s"
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr "не може да �е копира цикличната �имволна връзка %s"
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr ""
 "%s: отно�ителни �имволни връзки може да �е прав�т �амо в текущи� каталог"
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr "не може да �е �ъздаде �имволна връзка %s към %s"
 
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, c-format
 msgid "cannot create fifo %s"
 msgstr "не може да �е �ъздаде именуван канал %s"
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, c-format
 msgid "cannot create special file %s"
 msgstr "не може да �е �ъздаде �пециален файл %s"
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, c-format
 msgid "cannot read symbolic link %s"
 msgstr "не може да �е чете �имволната връзка %s"
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, c-format
 msgid "cannot create symbolic link %s"
 msgstr "не може да �е �ъздаде �имволна връзка %s"
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
 msgstr "%s има непознат файлов тип"
 
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, c-format
 msgid "cannot un-backup %s"
 msgstr "не може да �е въз�танови от резервно копие %s"
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr "%s -> %s (от резервно копие)\n"
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr ""
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr ""
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, fuzzy, c-format
+msgid "unknown program %s"
+msgstr "непознат потребител: %s"
+
+#: src/cp.c:157 src/mv.c:288
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -2079,14 +2124,14 @@ msgstr ""
 "     или:   %s [ОПЦИЯ]... ИЗТОЧ�ИК... К�Т�ЛОГ\n"
 "     или:   %s [ОПЦИЯ]... -t К�Т�ЛОГ ИЗТОЧ�ИК...\n"
 
-#: src/cp.c:162
+#: src/cp.c:163
 #, fuzzy
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 "Копира ИЗТОЧ�ИК в ЦЕЛ или много ИЗТОЧ�ИЦ(и) в К�Т�ЛОГ.\n"
 "\n"
 
-#: src/cp.c:168
+#: src/cp.c:169
 #, fuzzy
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
@@ -2109,7 +2154,7 @@ msgstr ""
 "рекур�.\n"
 "  -d                           като --no-dereference --preserve=link\n"
 
-#: src/cp.c:177
+#: src/cp.c:178
 #, fuzzy
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
@@ -2128,7 +2173,7 @@ msgstr ""
 "  -H                           копира файла от �имволна връзка на командни� "
 "ред\n"
 
-#: src/cp.c:186
+#: src/cp.c:187
 #, fuzzy
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
@@ -2137,7 +2182,7 @@ msgstr ""
 "  -l, --link                   не копира, а прави връзки (твърди)\n"
 "  -L, --dereference            винаги про�лед�ва �имволните връзки\n"
 
-#: src/cp.c:190
+#: src/cp.c:191
 #, fuzzy
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
@@ -2150,7 +2195,7 @@ msgstr ""
 "  -H                           копира файла от �имволна връзка на командни� "
 "ред\n"
 
-#: src/cp.c:195
+#: src/cp.c:196
 #, fuzzy
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
@@ -2168,7 +2213,7 @@ msgstr ""
 "възможно�т и\n"
 "                                 �ледните допълнителни атрибути: links, all\n"
 
-#: src/cp.c:203
+#: src/cp.c:204
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                use full source file name under DIRECTORY\n"
@@ -2176,7 +2221,7 @@ msgstr ""
 "      --no-preserve=СПИС_�ТРИБ да не �е запазват по�очените атрибути\n"
 "      --parents                допълва К�Т�ЛОГ � пътеката в ИЗТОЧ�ИК\n"
 
-#: src/cp.c:207
+#: src/cp.c:208
 #, fuzzy
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
@@ -2189,7 +2234,7 @@ msgstr ""
 "      --remove-destination     премахва в�еки �ъще�твуващ целеви файл преди\n"
 "                                 да �е опитва отвар�не (�равнете � --force)\n"
 
-#: src/cp.c:213
+#: src/cp.c:214
 #, fuzzy
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
@@ -2201,7 +2246,7 @@ msgstr ""
 "      --strip-trailing-slashes премахва крайните „/“ от в�еки аргумент "
 "ИЗТОЧ�ИК\n"
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -2215,7 +2260,7 @@ msgstr ""
 "К�Т�ЛОГ\n"
 "  -T, --no-target-directory    работи � ЦЕЛ като � нормален файл\n"
 
-#: src/cp.c:224
+#: src/cp.c:225
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
 "                                 than the destination file or when the\n"
@@ -2229,7 +2274,15 @@ msgstr ""
 "  -v, --verbose                �ъобщава какво �е прави\n"
 "  -x, --one-file-system        о�тава в текущата файлова �и�тема\n"
 
-#: src/cp.c:233
+#: src/cp.c:232
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/cp.c:240
 #, fuzzy
 msgid ""
 "\n"
@@ -2255,7 +2308,7 @@ msgstr ""
 "Ползвайте --sparse=never, за да забраните �ъздаването на разредени файлове.\n"
 "\n"
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 #, fuzzy
 msgid ""
 "\n"
@@ -2273,7 +2326,7 @@ msgstr ""
 "�е по�очва � --backup или � променливата VERSION_CONTROL. Ето �тойно�тите:\n"
 "\n"
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2287,7 +2340,7 @@ msgstr ""
 "иначе\n"
 "  simple, never   винаги да �е прав�т про�ти резервни копи�\n"
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2300,222 +2353,232 @@ msgstr ""
 "и �ъщо име на �ъще�твуващ обикновен файл, cp прави резервно копие на "
 "ИЗТОЧ�ИК.\n"
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, c-format
 msgid "failed to preserve times for %s"
 msgstr "времената на %s не можаха да �е запаз�т"
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, c-format
 msgid "failed to preserve permissions for %s"
 msgstr "правата за до�тъп до %s не можаха да �е запаз�т"
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, c-format
 msgid "cannot make directory %s"
 msgstr "не може да �е направи каталог %s"
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr "%s �ъще�твува, но не е каталог"
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
 #, fuzzy, c-format
 msgid "failed to access %s"
 msgstr "не може да �е отвори %s"
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, c-format
 msgid "missing file operand"
 msgstr "лип�ващ файлов операнд"
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, c-format
 msgid "missing destination file operand after %s"
 msgstr "лип�ващ операнд за целеви файл �лед %s"
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, fuzzy, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr ""
 "�е може да �е комбинират --target-directory (-t) и --no-target-directory (-T)"
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, c-format
 msgid "target %s is not a directory"
 msgstr "целта %s не е каталог"
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr "� --parents целта тр�бва да бъде каталог"
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, c-format
 msgid "multiple target directories specified"
 msgstr "по�очени �а много целеви каталози"
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr ""
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr "не може едновременно да �е прав�т твърди и �имволни връзки"
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, fuzzy, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr "опциите --string и --check не може да �е използват едновременно"
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr ""
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr "тип резервни копи�"
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, c-format
+msgid "cannot set target context and preserve it"
+msgstr ""
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr ""
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr ""
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr "входът изчезна"
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr "%s: номерът на ред е извън диапазона"
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, c-format
 msgid "%s: %s: line number out of range"
 msgstr "%s: %s: номерът на ред е извън диапазона"
 
 # �е е ��но за какво �лужи това.
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, c-format
 msgid " on repetition %s\n"
 msgstr " при повтар�не %s\n"
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, c-format
 msgid "%s: %s: match not found"
 msgstr "%s: %s: не е открито �ъответ�твие"
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr "грешка при тър�ене на регул�рен израз"
 
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, c-format
 msgid "write error for %s"
 msgstr "грешка при запи� за %s"
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, c-format
 msgid "%s: integer expected after delimiter"
 msgstr "%s: �лед разделител �е очаква ц�ло чи�ло"
 
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, fuzzy, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr "%s: при означаване брой повторени� е необходим „}“"
 
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, fuzzy, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr "%s}: между „{“ и „}“ е необходимо ц�ло чи�ло"
 
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, fuzzy, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr "%s: лип�ва затвар�щ ограничител „%c“"
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr "%s: неправилен регул�рен израз: %s"
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr "%s: неправилен образец"
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr "%s: номерът на ред тр�бва да бъде положителен"
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr "номерът на ред %s е по-малък от предходни� номер - %s"
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr "внимание: номерът на ред %s �ъвпада � предходни� номер на ред"
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr "в �уфик�а лип�ва означител за преобразуване"
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr "неправилен означител за преобразуване в �уфик�а: %c"
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr "неправилен означител за преобразуване в �уфик�а: \\%.3o"
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, fuzzy, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr "%.*s: неправилна �пецификаци� на преобразувание"
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr "твърде много означители за преобразуване %% в �уфик�а"
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr "лип�ва означител %% за преобразуване в �уфик�а"
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr "%s: недопу�тимо чи�ло"
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr "Използване: %s [ОПЦИЯ]... Ф�ЙЛ ОБР�ЗЕЦ...\n"
 
-#: src/csplit.c:1455
+#: src/csplit.c:1483
 #, fuzzy
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
@@ -2525,7 +2588,7 @@ msgstr ""
 "“xx01“, „xx02“,...  Дължината им в байтове �е извежда на �тандартни� изход.\n"
 "\n"
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, fuzzy, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2537,7 +2600,11 @@ msgstr ""
 "  -k, --keep-files           да не �е изтриват �ъздадените файлове при "
 "грешка\n"
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr ""
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
@@ -2548,7 +2615,7 @@ msgstr ""
 "файлове\n"
 "  -z, --elide-empty-files    да �е изтриват генерираните празни файлове\n"
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
@@ -2556,7 +2623,7 @@ msgstr ""
 "\n"
 "�ко Ф�ЙЛ е -, �е чете от �тандартни� вход.  В�еки ОБР�ЗЕЦ може да бъде:\n"
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 #, fuzzy
 msgid ""
 "\n"
@@ -2582,23 +2649,19 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr ""
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr ""
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, fuzzy, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr "Използване: %s [ОПЦИЯ]... [Ф�ЙЛ]...\n"
 
-#: src/cut.c:193
+#: src/cut.c:176
 #, fuzzy
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr ""
 "Отпечатва избраните ча�ти от редовете на в�еки Ф�ЙЛ на �тандартни� изход.\n"
 "\n"
 
-#: src/cut.c:199
+#: src/cut.c:182
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
 "  -c, --characters=LIST   select only these characters\n"
@@ -2609,7 +2672,7 @@ msgstr ""
 "  -d, --delimiter=Р�ЗДЕЛ  Р�ЗДЕЛ вме�то табулаци� като разделител между "
 "полетата\n"
 
-#: src/cut.c:204
+#: src/cut.c:187
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
 "                            that contains no delimiter character, unless\n"
@@ -2622,7 +2685,7 @@ msgstr ""
 "                            ако е по�очена и опци�та -s.\n"
 "  -n                      (пренебрегва �е)\n"
 
-#: src/cut.c:210
+#: src/cut.c:193
 #, fuzzy
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
@@ -2631,7 +2694,7 @@ msgstr ""
 "      --complement        извежда допълнението на �ъвкупно�тта от избрани\n"
 "                            байтове, знаци или полета.\n"
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
@@ -2642,7 +2705,7 @@ msgstr ""
 "      --output-delimiter=�ИЗ  да �е ползва �ИЗ като разделител на изхода\n"
 "                            по подразбиране �е използва входни�т разделител\n"
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2650,7 +2713,7 @@ msgid ""
 "in the same order that it is read, and is written exactly once.\n"
 msgstr ""
 
-#: src/cut.c:227
+#: src/cut.c:210
 #, fuzzy
 msgid ""
 "Each range is one of:\n"
@@ -2675,49 +2738,53 @@ msgstr ""
 "\n"
 "Без Ф�ЙЛ или ако Ф�ЙЛ е - �е чете от �тандартни� вход.\n"
 
-#: src/cut.c:367 src/cut.c:493
+#: src/cut.c:300 src/cut.c:394
 #, fuzzy
 msgid "invalid byte, character or field list"
 msgstr "неправилен �пи�ък байтове или полета"
 
-#: src/cut.c:387
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr ""
+
+#: src/cut.c:320
 #, fuzzy
 msgid "invalid range with no endpoint: -"
 msgstr "неправилна опци� за ширина: %s"
 
-#: src/cut.c:403
+#: src/cut.c:334
 #, fuzzy
 msgid "invalid decreasing range"
 msgstr "неправилен входен диапазон: %s"
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, c-format
 msgid "byte offset %s is too large"
 msgstr "байтовото отме�тване %s е твърде дълго"
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, c-format
 msgid "field number %s is too large"
 msgstr "номерът на поле %s е твърде гол�м"
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr "тр�бва да �е по�очи �амо един вид �пи�ък"
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr "разделител�т тр�бва да �е �ъ�тои от един знак"
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr "тр�бва да по�очите �пи�ък байтове, знаци или полета"
 
-#: src/cut.c:850
+#: src/cut.c:790
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr "входен разделител може да �е по�очва �амо ако �е работи � полета"
 
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
@@ -2725,11 +2792,11 @@ msgstr ""
 "поти�кането на редове, не�ъдържащи разделител, има �ми�ъл\n"
 "\t�амо ако �е работи � полета"
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr "лип�ва �пи�ък полета"
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr "лип�ва �пи�ък позиции"
 
@@ -2787,7 +2854,7 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 "  -r, --reference=Ф�ЙЛ      извежда времето на по�ледна пром�на на Ф�ЙЛ\n"
 "  -R, --rfc-2822            извежда датов низ �поред RFC-2822\n"
@@ -3005,10 +3072,10 @@ msgid ""
 "  $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n"
 msgstr ""
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr "�тандартни�т вход"
@@ -3052,7 +3119,7 @@ msgstr ""
 msgid "cannot set date"
 msgstr "не може да �е на�трои датата"
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, c-format
 msgid "time %s is out of range"
 msgstr "времето %s е извън допу�тими� диапазон"
@@ -3063,7 +3130,7 @@ msgstr "времето %s е извън допу�тими� диапазон"
 msgid "Paul Rubin"
 msgstr ""
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
@@ -3072,7 +3139,7 @@ msgstr ""
 "Използване: %s [ОПЕР��Д]...\n"
 "    или:    %s ОПЦИЯ\n"
 
-#: src/dd.c:526
+#: src/dd.c:532
 #, fuzzy
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
@@ -3091,7 +3158,7 @@ msgstr ""
 "  count=БЛОКОВЕ   копира �амо БЛОКОВЕ входни блока\n"
 "  ibs=Б�ЙТОВЕ     чете на парчета от по Б�ЙТОВЕ байта\n"
 
-#: src/dd.c:535
+#: src/dd.c:541
 #, fuzzy
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
@@ -3113,7 +3180,7 @@ msgstr ""
 "  skip=БЛОКОВЕ    пропу�ка БЛОКОВЕ входни блока � размер ibs в�еки\n"
 "  status=noxfer   без �тати�тика за тран�фера\n"
 
-#: src/dd.c:546
+#: src/dd.c:552
 #, fuzzy
 msgid ""
 "\n"
@@ -3131,7 +3198,7 @@ msgstr ""
 "В��ка КЛЮЧДУМ� може да бъде:\n"
 "\n"
 
-#: src/dd.c:555
+#: src/dd.c:561
 #, fuzzy
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
@@ -3161,7 +3228,7 @@ msgstr ""
 "              използване � block или unblock попълва � интервали вме�то � "
 "нули\n"
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -3177,7 +3244,7 @@ msgstr ""
 "  fdatasync запи�ва физиче�ки изходните данни още преди пълното приключване\n"
 "  fsync     подобно, но о�вен това запи�ва и метаданните\n"
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -3191,85 +3258,85 @@ msgstr ""
 "  append    режим добав�не (�ми�лено �амо за изхода, препоръчва �е "
 "conv=notrunc)\n"
 
-#: src/dd.c:583
+#: src/dd.c:589
 #, fuzzy
 msgid "  cio       use concurrent I/O for data\n"
 msgstr ""
 "  text      да �е използват тек�тови входно/изходни операции за данните\n"
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr ""
 "  direct    да �е използват директни входно/изходни операции за данните\n"
 
-#: src/dd.c:587
+#: src/dd.c:593
 #, fuzzy
 msgid "  directory  fail unless a directory\n"
 msgstr "  directory отказва да работи, о�вен при каталог\n"
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr ""
 "  dsync     да �е използват �инхронизирани входно/изходни операции за "
 "данните\n"
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr ""
 "  sync      подобно, но �ъщо и за метаданните (напр. на файловата �и�тема)\n"
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr "  nonblock  да �е използват неблокиращи входно/изходни операции\n"
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr "  noatime   да не �е обнов�ва времето за до�тъп\n"
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr ""
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr "  noctty    да не �е определ� управл�ващ терминал от файл\n"
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr "  nofollow  да не �е �ледват �имволните връзки\n"
 
 # TODO: наи�тина ли �е имат предвид твърди връзки?
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr "  nolinks   отказва да работи при множе�тво твърди връзки\n"
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr ""
 "  binary    да �е използват двоични входно/изходни операции за данните\n"
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr ""
 "  text      да �е използват тек�тови входно/изходни операции за данните\n"
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr ""
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3296,7 +3363,17 @@ msgstr ""
 "  18335302+0 запи�ани блока\n"
 "  изкопирани �а 9387674624 байта (9.4 GB) за 34,6279 �екунди � 271 MB/s\n"
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
@@ -3305,21 +3382,21 @@ msgstr ""
 "%<PRIuMAX>+%<PRIuMAX> прочетени блока\n"
 "%<PRIuMAX>+%<PRIuMAX> запи�ани блока\n"
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
 msgstr[0] "%<PRIuMAX> �ъкратен запи�\n"
 msgstr[1] "%<PRIuMAX> �ъкратени запи�а\n"
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
 msgstr[0] "изкопиран е %<PRIuMAX> байт (%s)"
 msgstr[1] "изкопирани �а %<PRIuMAX> байта (%s)"
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr "Безброй"
 
@@ -3333,88 +3410,88 @@ msgstr "Безброй"
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
 msgstr ", %g s, %s/s\n"
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, c-format
 msgid "closing input file %s"
 msgstr "затвар�не на входни� файл %s"
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr "затвар�не на изходни� файл %s"
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, fuzzy, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr "не може отвори каталогът %s"
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, c-format
 msgid "writing to %s"
 msgstr "запи� в %s"
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, c-format
 msgid "unrecognized operand %s"
 msgstr "непознат операнд %s"
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 #, fuzzy
 msgid "invalid conversion"
 msgstr "неправилно по�очено преобразуване: %s"
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 #, fuzzy
 msgid "invalid input flag"
 msgstr "непознат входен флаг: %s"
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 #, fuzzy
 msgid "invalid output flag"
 msgstr "непознат изходен флаг: %s"
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 #, fuzzy
 msgid "invalid status flag"
 msgstr "непознат флаг за �ъ�то�ние: %s"
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, c-format
 msgid "invalid number %s"
 msgstr "недопу�тимо чи�ло %s"
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr "не може да �е комбинират никои две от {ascii,ebcdic,ibm}"
 
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, c-format
 msgid "cannot combine block and unblock"
 msgstr "не може да �е комбинират block и unblock"
 
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, c-format
 msgid "cannot combine lcase and ucase"
 msgstr "не може да �е комбинират lcase и ucase"
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, c-format
 msgid "cannot combine excl and nocreat"
 msgstr "не може да �е комбинират excl и nocreat"
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, fuzzy, c-format
 msgid "cannot combine direct and nocache"
 msgstr "не може да �е комбинират excl и nocreat"
 
 # Това ме мързи да го превеждам.
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
@@ -3423,72 +3500,62 @@ msgstr ""
 "warning: working around lseek kernel bug for file (%s)\n"
 "  of mt_type=0x%0lx -- see <sys/mtio.h> for the list of types"
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, fuzzy, c-format
 msgid "%s: cannot skip"
 msgstr "%s: неу�пешно позициониране"
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, c-format
 msgid "%s: cannot seek"
 msgstr "%s: неу�пешно позициониране"
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr "препълване на отме�тването при четене на файла %s"
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, fuzzy, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr "внимание: �ъмнително отме�тване във файла �лед пропаднало четене"
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr "в крайна �метка не може да �е компен�ира грешката в �дрото"
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, c-format
 msgid "setting flags for %s"
 msgstr "задей�тват �е флаговете за %s"
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, fuzzy, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr "%s: не може да �е отиде на отно�ително отме�тване %s във файла"
 
-#: src/dd.c:2133
+#: src/dd.c:2172
 #, fuzzy, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
 msgstr "�ъкращаване до %<PRIuMAX> байта в изходни� файл %s"
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr "неу�пешно извикване на fdatasync за %s"
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
 msgstr "неу�пешнен запи� (fsync) за %s"
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, c-format
 msgid "failed to open %s"
 msgstr "не може да �е отвори %s"
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
@@ -3497,96 +3564,105 @@ msgstr ""
 "твърде гол�мо отме�тване: не може да �е отреже до дължината на seek="
 "%<PRIuMAX> (%lu-byte) блокове"
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, fuzzy, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr "�ъкращаване до %<PRIuMAX> байта в изходни� файл %s"
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, fuzzy, c-format
 msgid "failed to discard cache for: %s"
 msgstr "не може отвори каталогът %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr ""
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr "Файлова �-ма"
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr "Тип"
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr "блокове"
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr "Заети"
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr "Свободни"
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr "Изп%"
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr "I-възли"
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr "Заети"
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr "Свобод"
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr "Изп%"
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr "Монтирана на"
 
-#: src/df.c:383
-#, c-format
-msgid "option --output: field '%s' unknown"
+#: src/df.c:207
+msgid "File"
 msgstr ""
 
-#: src/df.c:390
+#: src/df.c:387
 #, fuzzy, c-format
-msgid "option --output: field '%s' used more than once"
+msgid "option --output: field %s unknown"
+msgstr "затвар�не на изходни� файл %s"
+
+#: src/df.c:394
+#, fuzzy, c-format
+msgid "option --output: field %s used more than once"
 msgstr "внимание: изходни� файл %s е по�очен повече от веднъж"
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr "Размер"
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr "Свобод"
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr "Обем"
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
 msgstr ""
 
-#: src/df.c:1210
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr ""
+
+#: src/df.c:1384
 #, fuzzy
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
@@ -3596,24 +3672,20 @@ msgstr ""
 "или за в�ички файлови �и�теми по подразбиране.\n"
 "\n"
 
-#: src/df.c:1217
-#, fuzzy
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
-"  -a, --all             включително празните файлови �и�теми (� 0 блокове)\n"
-"  -B, --block-size=Р�ЗМ да �е ползват блокове � размер Р�ЗМ байта\n"
-"  -h, --human-readable  извежда размерите като за хора (напр. 1K, 234M, 2G)\n"
-"  -H, --si              подобно, но � множител 1000 вме�то 1024\n"
 
-#: src/df.c:1227
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -3629,7 +3701,7 @@ msgstr ""
 "      --no-sync         без sync преди получаване на използването (по "
 "подразб.)\n"
 
-#: src/df.c:1234
+#: src/df.c:1409
 #, fuzzy
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
@@ -3651,43 +3723,34 @@ msgstr ""
 "ТИП\n"
 "  -v                    (пренебрегва �е)\n"
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
 
-#: src/df.c:1285
+#: src/df.c:1460
 #, fuzzy, c-format
 msgid "options %s and %s are mutually exclusive"
-msgstr "по�очените опции за дати за отпечатване �а взаимно изключващи �е"
-
-#: src/df.c:1335
-#, fuzzy
-msgid "warning: "
-msgstr "Внимание: "
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr ""
+msgstr "опциите --string и --check не може да �е използват едновременно"
 
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr "файловите �и�теми от тип %s �а едновременно избрани и изключени"
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr "Внимание: "
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 #, fuzzy
 msgid "cannot read table of mounted file systems"
 msgstr "%sне може да �е прочете таблицата на монтирани файлови �и�теми"
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr "нито една файлова �и�тема не бе обработена"
@@ -3697,7 +3760,7 @@ msgstr "нито една файлова �и�тема не бе обработ
 msgid "H. Peter Anvin"
 msgstr ""
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr "Използване: %s [ОПЦИЯ]... [Ф�ЙЛ]\n"
@@ -3786,12 +3849,12 @@ msgstr ""
 
 #: src/dirname.c:59
 #, fuzzy
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
 msgstr ""
 "  -z, --zero-terminated     завършва редовете � байт 0 вме�то � нов ред\n"
 
 #: src/dirname.c:64
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Examples:\n"
@@ -3799,12 +3862,8 @@ msgid ""
 "  %s dir1/str dir2/str  -> \"dir1\" followed by \"dir2\"\n"
 "  %s stdio.h            -> \".\"\n"
 msgstr ""
-"\n"
-"Примери:\n"
-"  %s /usr/bin/sort  извежда „/usr/bin“.\n"
-"  %s stdio.h        извежда „.“.\n"
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -3813,18 +3872,17 @@ msgstr ""
 "Използване: %s [ОПЦИЯ]... [Ф�ЙЛ]...\n"
 "    или:    %s [ОПЦИЯ]... --files0-from==Ф\n"
 
-#: src/du.c:274
+#: src/du.c:285
 #, fuzzy
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr ""
 "Резюмира използването на ди�ка от в�еки Ф�ЙЛ, рекур�ивно за каталозите.\n"
 "\n"
 
-#: src/du.c:280
+#: src/du.c:291
 #, fuzzy
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3847,12 +3905,12 @@ msgstr ""
 "  -D, --dereference-args  работи върху файловете, �очени от Ф�ЙЛ-�имволна "
 "връзка\n"
 
-#: src/du.c:289
+#: src/du.c:300
 #, fuzzy
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3876,15 +3934,16 @@ msgstr ""
 "на\n"
 "                          --summarize\n"
 
-#: src/du.c:302
+#: src/du.c:313
 #, fuzzy
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
 "      --files0-from=Ф   резюмира използваното ди�ково про�тран�тво от "
 "файловите\n"
@@ -3900,7 +3959,7 @@ msgstr ""
 "  -l, --count-links     брои размерите многократно при твърди връзки\n"
 "  -m                    �ъщо като --block-size=1M\n"
 
-#: src/du.c:310
+#: src/du.c:322
 msgid ""
 "  -k                    like --block-size=1K\n"
 "  -L, --dereference     dereference all symbolic links\n"
@@ -3908,12 +3967,13 @@ msgid ""
 "  -m                    like --block-size=1M\n"
 msgstr ""
 
-#: src/du.c:316
+#: src/du.c:328
 #, fuzzy
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
@@ -3925,7 +3985,7 @@ msgstr ""
 "  -s, --summarize       резюмира -- извежда �амо общата �ума за в�еки "
 "аргумент\n"
 
-#: src/du.c:322
+#: src/du.c:334
 #, fuzzy
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
@@ -3935,9 +3995,9 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
 msgstr ""
 "      --time            показва времето на по�ледна пром�на на в�еки файл "
 "от\n"
@@ -3949,75 +4009,75 @@ msgstr ""
 "                          full-iso, long-iso, iso или +ФОРМ�Т\n"
 "                          ФОРМ�Т �е интерпретира както от „date“\n"
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
 "  -x, --one-file-system    skip directories on different file systems\n"
 msgstr ""
 
-#: src/du.c:386
+#: src/du.c:398
 #, fuzzy
 msgid "Infinity"
 msgstr "Безброй"
 
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr ""
-
-#: src/du.c:624
+#: src/du.c:636
 #, fuzzy, c-format
 msgid "fts_read failed: %s"
 msgstr "неу�пешен fts_read"
 
-#: src/du.c:780
+#: src/du.c:787
 #, c-format
 msgid "invalid maximum depth %s"
 msgstr "неправилна мак�имална дълбочина %s"
 
-#: src/du.c:809
+#: src/du.c:816
 #, fuzzy, c-format
 msgid "invalid --threshold argument '-0'"
-msgstr "неправилен аргумент %s"
+msgstr "неправилен аргумент „%s“"
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr "не може едновременно да �е резюмира и да �е показват в�ички елементи"
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr "внимание: резюмирането е еквивалентно на --max-depth=0"
 
-#: src/du.c:900
+#: src/du.c:911
 #, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr "внимание: резюмирането влиза в конфликт � --max-depth=%lu"
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 #, fuzzy
 msgid "file operands cannot be combined with --files0-from"
 msgstr "�е може да �е комбинират файлови операнди � --files0-from."
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr "%s: грешка при четене"
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr ""
 "при четене на файлови имена от stdin, никое файлово име не може да бъде %s"
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 msgid "invalid zero-length file name"
 msgstr "неправилно файлово име � дължина нула"
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr "общо"
 
@@ -4121,7 +4181,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
 "При�во�ва СТОЙ�ОСТ на в��ка ПРОМЕ�ЛИВ� и изпълн�ва КОМ��Д� в новото "
@@ -4206,16 +4266,16 @@ msgid "input line is too long"
 msgstr "входни�т ред е твърде дълъг"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr ""
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
@@ -4224,7 +4284,7 @@ msgstr ""
 "Използване: %s ИЗР�З\n"
 "    или:    %s ОПЦИЯ\n"
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -4243,7 +4303,7 @@ msgstr ""
 "  ARG1 & ARG2       ARG1, ако никой от аргументите не е празен или 0, иначе "
 "0\n"
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -4261,7 +4321,7 @@ msgstr ""
 "  ARG1 >= ARG2      ARG1 е по-гол�м или равен на ARG2\n"
 "  ARG1 > ARG2       ARG1 е по-гол�м от ARG2\n"
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
@@ -4271,7 +4331,7 @@ msgstr ""
 "  ARG1 + ARG2       аритметична �ума на ARG1 и ARG2\n"
 "  ARG1 - ARG2       аритметична разлика на ARG1 и ARG2\n"
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -4284,7 +4344,7 @@ msgstr ""
 "  ARG1 / ARG2       аритметично ча�тно на ARG1 разделен на ARG2\n"
 "  ARG1 % ARG2       аритметичен о�татък на ARG1 разделен на ARG2\n"
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -4304,7 +4364,7 @@ msgstr ""
 "или 0\n"
 "  length �ИЗ                 дължината на �ИЗ\n"
 
-#: src/expr.c:251
+#: src/expr.c:250
 #, fuzzy
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
@@ -4318,7 +4378,7 @@ msgstr ""
 "\n"
 "  ( ИЗР�З )                  �тойно�тта на ИЗР�З\n"
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -4336,7 +4396,7 @@ msgstr ""
 "празен,\n"
 "а ако не �а използвани \\( и \\) връща бро� па�нали знаци или 0.\n"
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -4348,32 +4408,32 @@ msgstr ""
 "празен или 0; 2, ако ИЗР�З е �интактично неправилен и 3, ако е �танала "
 "грешка.\n"
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, c-format
 msgid "syntax error"
 msgstr "�интактична грешка"
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, c-format
 msgid "error in regular expression matcher"
 msgstr "грешка при па�ването на регул�рни� израз"
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, fuzzy, c-format
 msgid "non-integer argument"
 msgstr "нечи�лов аргумент"
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr "делене на нула"
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, fuzzy, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr "Използвайте LC_ALL='C', за да заобиколите този проблем."
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, fuzzy, c-format
 msgid "the strings compared were %s and %s"
 msgstr "Сравн�ваните низове б�ха %s и %s."
@@ -4383,27 +4443,27 @@ msgstr "Сравн�ваните низове б�ха %s и %s."
 msgid "Niels Moller"
 msgstr ""
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
 msgstr ""
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
 msgstr ""
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, c-format
 msgid "%s is not a valid positive integer"
 msgstr "%s не е правилно положително ц�ло чи�ло"
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr "%s е твърде дълго"
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
@@ -4412,7 +4472,7 @@ msgstr ""
 "Използване: %s [ЧИСЛО]...\n"
 "    или:    %s ОПЦИЯ\n"
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 #, fuzzy
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
@@ -4526,28 +4586,28 @@ msgid "invalid number of columns: %s"
 msgstr "неправилен номер �тълбове: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr ""
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, fuzzy, c-format
 msgid "Usage: %s\n"
 msgstr "Използване: %s [ОПЦИЯ]\n"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
 msgstr ""
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, fuzzy, c-format
 msgid "failed to get groups for user %s"
 msgstr "групата на %s не можа да �е промени на %s\n"
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, fuzzy, c-format
 msgid "failed to get groups for the current process"
 msgstr "групата на %s не можа да �е промени на %s\n"
@@ -4569,22 +4629,22 @@ msgid ""
 "the current process (which may differ if the groups database has changed).\n"
 msgstr ""
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, fuzzy, c-format
 msgid "cannot get real UID"
 msgstr "не може да �е зададе потребител�т"
 
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, fuzzy, c-format
 msgid "cannot get effective GID"
-msgstr "�имволната връзка %s не може да бъде по�ледвана"
+msgstr "не може да �е получи времето от ден�"
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, fuzzy, c-format
 msgid "cannot get real GID"
 msgstr "не може да �е зададе потребител�т"
 
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, fuzzy, c-format
 msgid "%s: no such user"
 msgstr "%s: ��ма такъв потребител"
@@ -4641,59 +4701,49 @@ msgstr ""
 "В��ка КЛЮЧДУМ� може да бъде:\n"
 "\n"
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr "%s: файлът �е е �вил твърде много"
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, c-format
 msgid "%s: number of bytes is too large"
 msgstr "%s: твърде гол�м брой байтове"
 
-#: src/head.c:440
-#, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr "%s: не може да �е отиде на първоначалното м��то във файла"
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr "%s: не може да �е отиде на отме�тване %s във файла"
 
-#: src/head.c:673
-#, fuzzy, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "%s: не може да �е от�трани"
-
-#: src/head.c:798
+#: src/head.c:423 src/tail.c:457
 #, c-format
-msgid "cannot reposition file pointer for %s"
-msgstr "не може да �е �мени м��тото на файлови� указател за %s"
+msgid "%s: cannot seek to relative offset %s"
+msgstr "%s: не може да �е отиде на отно�ително отме�тване %s във файла"
 
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr "%s: %s е толкова гол�м, че не е изводим"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr "брой на редовете"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr "количе�тво байтове"
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr "недопу�тим брой редове"
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr "недопу�тимо количе�тво байтове"
 
 # TODO: Как да �е праведе trailing?
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, c-format
 msgid "invalid trailing option -- %c"
 msgstr "неправилна опци� -- %c"
@@ -4740,28 +4790,34 @@ msgid "cannot determine hostname"
 msgstr "хо�т-името не може да бъде определено"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr ""
 
-#: src/id.c:81
-#, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
-msgstr "Използване: %s [ОПЦИЯ]... [ПОТРЕБИТЕЛ]\n"
+#: src/id.c:84
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]... [USER]\n"
+msgstr "Използване: %s [ОПЦИЯ]... [ПОТРЕБИТЕЛ]...\n"
 
-#: src/id.c:82
-#, fuzzy
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
+msgstr ""
+
+#: src/id.c:90
+#, fuzzy
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
 msgstr ""
 "Извежда информаци� за ПОТРЕБИТЕЛ или текущи� потребител.\n"
 "\n"
@@ -4772,7 +4828,7 @@ msgstr ""
 "  -r, --real      извежда реалните (real) вме�то дей�тващите номера, � -ugG\n"
 "  -u, --user      извежда �амо номера на дей�тващи� (effective) потребител\n"
 
-#: src/id.c:96
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
@@ -4780,117 +4836,128 @@ msgstr ""
 "\n"
 "Без никаква ОПЦИЯ про�то отпечатва полезна идентификационна информаци�.\n"
 
-#: src/id.c:140
+#: src/id.c:151
+#, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr ""
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr ""
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr ""
 
-#: src/id.c:178
+#: src/id.c:198
 #, fuzzy, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr "не може да �е цепи по повече от един начин"
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr ""
 "не може да �е извеждат �амо имена или номера във формата по подразбиране"
 
-#: src/id.c:199
+#: src/id.c:209
+#, fuzzy, c-format
+msgid "option --zero not permitted in default format"
+msgstr ""
+"не може да �е извеждат �амо имена или номера във формата по подразбиране"
+
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
 msgstr ""
 
-#: src/id.c:224
+#: src/id.c:265
 #, fuzzy, c-format
 msgid "cannot get effective UID"
-msgstr "�имволната връзка %s не може да бъде по�ледвана"
+msgstr "не може да �е получи времето от ден�"
 
-#: src/id.c:311
+#: src/id.c:354
 #, fuzzy, c-format
 msgid "cannot find name for user ID %s"
 msgstr "не може да �е намери името на потребител � номер %lu"
 
-#: src/id.c:329
+#: src/id.c:372
 #, c-format
 msgid "uid=%s"
 msgstr ""
 
-#: src/id.c:334
+#: src/id.c:377
 #, c-format
 msgid " gid=%s"
 msgstr ""
 
-#: src/id.c:341
+#: src/id.c:384
 #, c-format
 msgid " euid=%s"
 msgstr ""
 
-#: src/id.c:349
+#: src/id.c:392
 #, c-format
 msgid " egid=%s"
 msgstr ""
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr " групи="
 
-#: src/id.c:393
+#: src/id.c:437
 #, c-format
 msgid " context=%s"
 msgstr ""
 
-#: src/install.c:373
+#: src/install.c:376
 #, fuzzy, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr "внимание: каталогът не може да �е �мени на %s"
 
-#: src/install.c:414
+#: src/install.c:417
 #, c-format
 msgid "creating directory %s"
 msgstr "�ъздава �е каталог %s"
 
-#: src/install.c:482
+#: src/install.c:485
 #, c-format
 msgid "cannot change ownership of %s"
 msgstr "не може да �е �мени �об�твено�тта на %s"
 
-#: src/install.c:506
+#: src/install.c:509
 #, c-format
 msgid "cannot set time stamps for %s"
 msgstr "не може да �е зададе времето на %s"
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, c-format
 msgid "fork system call failed"
 msgstr "�и�темната функци� за нов проце� (fork) не у�п�"
 
-#: src/install.c:531
+#: src/install.c:535
 #, fuzzy, c-format
 msgid "cannot run %s"
 msgstr "не може да �е �тартира strip"
 
-#: src/install.c:535
+#: src/install.c:539
 #, fuzzy, c-format
 msgid "waiting for strip"
 msgstr "запи� в %s"
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr ""
 
-#: src/install.c:558
+#: src/install.c:565
 #, c-format
 msgid "invalid user %s"
 msgstr "неправилен потребител %s"
 
-#: src/install.c:594
+#: src/install.c:601
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -4903,7 +4970,7 @@ msgstr ""
 "     или:   %s [ОПЦИЯ]... -t К�Т�ЛОГ ЦЕЛ...\n"
 "     или:   %s [ОПЦИЯ]... -d К�Т�ЛОГ...\n"
 
-#: src/install.c:601
+#: src/install.c:608
 #, fuzzy
 msgid ""
 "\n"
@@ -4920,11 +4987,11 @@ msgstr ""
 "При първите три формата ИЗТОЧ�ИК �е копира в ЦЕЛ или н�колкото ИЗТОЧ�ИКа\n"
 "в �ъще�твуващ К�Т�ЛОГ, като �е у�танов�ват режим на до�тъп и �об�твеник/"
 "група.\n"
-"При четвърти� формат �е �ъздават в�ички компоненти на дадени�(ните) К�Т�ЛОГ"
-"(зи).\n"
+"При четвърти� формат �е �ъздават в�ички компоненти на дадени�(ните) "
+"К�Т�ЛОГ(зи).\n"
 "\n"
 
-#: src/install.c:615
+#: src/install.c:622
 #, fuzzy
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
@@ -4944,7 +5011,7 @@ msgstr ""
 "�ъздава\n"
 "                        в�ички компоненти на по�очените каталози\n"
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -4964,7 +5031,7 @@ msgstr ""
 "  -o, --owner=СОБСТВ  по�очва �об�твеник (�амо от привилегирован "
 "потребител)\n"
 
-#: src/install.c:631
+#: src/install.c:638
 #, fuzzy
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
@@ -4987,63 +5054,60 @@ msgstr ""
 "  -T, --no-target-directory  работи � ЦЕЛ като � обикновен файл\n"
 "  -v, --verbose       извежда името на в�еки каталог при �ъздаването му\n"
 
-#: src/install.c:641
+#: src/install.c:648
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
 
-#: src/install.c:859
+#: src/install.c:696 src/unlink.c:86
 #, c-format
-msgid ""
-"WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
-msgstr ""
+msgid "cannot unlink %s"
+msgstr "неу�пешно изпълнение на unlink за %s"
 
-#: src/install.c:869
+#: src/install.c:877
 #, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
+msgid ""
+"WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
 msgstr ""
 
-#: src/install.c:886
+#: src/install.c:917
 #, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr ""
 "опци�та махане на �имволните таблици не може да �е използва при ин�талиране "
 "на каталог"
 
-#: src/install.c:889
+#: src/install.c:920
 #, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr ""
 "при ин�талиране на каталог не �е позвол�ва по�очването на целеви каталог"
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr ""
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, c-format
 msgid "invalid mode %s"
 msgstr "неправилен режим %s"
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr ""
 
-#: src/install.c:959
+#: src/install.c:1001
 #, fuzzy, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr "опциите --string и --check не може да �е използват едновременно"
 
-#: src/install.c:966
+#: src/install.c:1008
 #, fuzzy, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr "по�очените опции за дати за отпечатване �а взаимно изключващи �е"
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -5056,7 +5120,7 @@ msgstr ""
 msgid "Mike Haertel"
 msgstr "Mike Haertel и Paul Eggert"
 
-#: src/join.c:191
+#: src/join.c:195
 #, fuzzy
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
@@ -5077,7 +5141,7 @@ msgstr ""
 "                      Ф�ЙЛ�ОМ е 1 или 2 �ъответно за Ф�ЙЛ1 и Ф�ЙЛ2\n"
 "  -e ПР�З�О         замен� лип�ващите входни полета � ПР�З�О\n"
 
-#: src/join.c:200
+#: src/join.c:204
 #, fuzzy
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
@@ -5092,7 +5156,7 @@ msgstr ""
 "  -t З��К           ползва З��К като разделител на входните и изходни "
 "полета\n"
 
-#: src/join.c:206
+#: src/join.c:210
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
 "  -1 FIELD          join on this FIELD of file 1\n"
@@ -5104,7 +5168,13 @@ msgid ""
 "                      print them without trying to pair them\n"
 msgstr ""
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+#, fuzzy
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr ""
+"  -z, --zero-terminated     завършва редовете � байт 0 вме�то � нов ред\n"
+
+#: src/join.c:225
 #, fuzzy
 msgid ""
 "\n"
@@ -5138,47 +5208,47 @@ msgstr ""
 "�апример\n"
 "ако на join не �а подадени опции, ползвайте „sort -k 1b,1“.\n"
 
-#: src/join.c:403
+#: src/join.c:410
 #, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
 msgstr ""
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, c-format
 msgid "invalid field number: %s"
 msgstr "неправилен номер на поле: %s"
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, c-format
 msgid "invalid field specifier: %s"
 msgstr "неправилен означител за поле: %s"
 
-#: src/join.c:877
+#: src/join.c:884
 #, c-format
 msgid "invalid file number in field spec: %s"
 msgstr "неправилен номер на файл при означител на поле: %s"
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr "неправилни �вързващи полета %lu, %lu"
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr "не�ъвме�тими замен�щи низове за празно поле"
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, c-format
 msgid "multi-character tab %s"
 msgstr "много�имволна табулаци� %s"
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr "не�ъвме�тими табулации"
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr "не може и двата файла да �а �тандартни�т вход"
@@ -5301,47 +5371,47 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr "не може да �е направи връзка %s към %s"
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr "%s: не �е позвол�ва твърда връзка към каталог"
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, c-format
 msgid "%s: cannot overwrite directory"
 msgstr "%s: каталогът не може да �е заме�ти"
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
 msgstr "%s: да �е замени ли %s? "
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, fuzzy, c-format
 msgid "failed to create symbolic link %s"
 msgstr "не може да �е �ъздаде �имволна връзка %s"
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, fuzzy, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr "не може да �е �ъздаде �имволна връзка %s към %s"
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, fuzzy, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr "�ъздава �е твърда връзка към %.0s%s"
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, fuzzy, c-format
 msgid "failed to create hard link %s"
 msgstr "не може да �е направи твърда връзка %s към %s"
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, fuzzy, c-format
 msgid "failed to create hard link %s => %s"
 msgstr "не може да �е направи твърда връзка %s към %s"
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -5354,7 +5424,7 @@ msgstr ""
 "     или:   %s [ОПЦИЯ]... ИЗТОЧ�ИК... К�Т�ЛОГ         (3-ти формат)\n"
 "     или:   %s [ОПЦИЯ]... -t К�Т�ЛОГ ЦЕЛ...           (4-ти формат)\n"
 
-#: src/ln.c:381
+#: src/ln.c:398
 #, fuzzy
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
@@ -5374,7 +5444,7 @@ msgstr ""
 "При правене на твърди връзки в��ка ЦЕЛ тр�бва да �ъще�твува.\n"
 "\n"
 
-#: src/ln.c:394
+#: src/ln.c:411
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
 "file\n"
@@ -5396,8 +5466,7 @@ msgstr ""
 "пропадне)\n"
 "  -f, --force                 изтрива �ъще�твуващи целеви файлове\n"
 
-#: src/ln.c:402
-#, fuzzy
+#: src/ln.c:419
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
 "  -L, --logical               dereference TARGETs that are symbolic links\n"
@@ -5408,15 +5477,8 @@ msgid ""
 "location\n"
 "  -s, --symbolic              make symbolic links instead of hard links\n"
 msgstr ""
-"  -n, --no-dereference        приема цел, ко�то е �имволна връзка към "
-"каталог,\n"
-"                                в�е едно че е нормален файл\n"
-"  -i, --interactive           да �е пита при заме�тване на �ъще�твуващи "
-"файлове\n"
-"  -s, --symbolic              да �е прав�т �имволни връзки вме�то твърди "
-"връзки\n"
 
-#: src/ln.c:411
+#: src/ln.c:428
 #, fuzzy
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
@@ -5432,7 +5494,7 @@ msgstr ""
 "  -T, --no-target-directory   работи � ИМЕ_��_ВРЪЗК� като � обикновен файл\n"
 "  -v, --verbose               извежда името на в�еки файл преди �вързване\n"
 
-#: src/ln.c:433
+#: src/ln.c:450
 #, c-format
 msgid ""
 "\n"
@@ -5440,14 +5502,14 @@ msgid ""
 "behavior when a TARGET is a symbolic link, defaulting to %s.\n"
 msgstr ""
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, fuzzy, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr ""
 "�е може да �е използват едновременно --target-directory и --no-target-"
 "directory"
 
-#: src/ln.c:588
+#: src/ln.c:605
 #, fuzzy, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr "не може да �е �ъздаде �имволна връзка %s"
@@ -5480,7 +5542,7 @@ msgstr "н�ма вход�що име"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 msgid "%b %e  %Y"
 msgstr "%e %b  %Y"
 
@@ -5489,100 +5551,100 @@ msgstr "%e %b  %Y"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 msgid "%b %e %H:%M"
 msgstr "%e %b %k,%M"
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr ""
 "пренебрегва �е неправилната �тойно�т на променливата от обкръжението "
 "QUOTING_STYLE: %s"
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr ""
 "пренебрегва �е неправилната ширина в променливата от обкръжението COLUMNS: %s"
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr ""
 "пренебрегва �е неправилни�т размер на табулациите в променливата от "
 "обкръжението TABSIZE: %s"
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, c-format
 msgid "invalid line width: %s"
 msgstr "неправилна дължина на реда: %s"
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, c-format
 msgid "invalid tab size: %s"
 msgstr "неправилен размер на табулациите: %s"
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, c-format
 msgid "invalid time style format %s"
 msgstr "неправилен формат за времето %s"
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 #, fuzzy
 msgid "Valid arguments are:\n"
 msgstr "Допу�тими аргументи �а:"
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr ""
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr ""
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, c-format
 msgid "unrecognized prefix: %s"
 msgstr "непознат префик�: %s"
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr "неразбираема �тойно�т на променливата от обкръжението LS_COLORS"
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, c-format
 msgid "cannot open directory %s"
 msgstr "не може да �е отвори каталогът %s"
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, c-format
 msgid "cannot determine device and inode of %s"
 msgstr "не може да �е у�танови у�трой�твото и i-възлите на %s"
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, c-format
 msgid "%s: not listing already-listed directory"
 msgstr "%s: вече изведени�т каталог не �е извежда"
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, c-format
 msgid "reading directory %s"
 msgstr "чете �е каталогът %s"
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, c-format
 msgid "closing directory %s"
 msgstr "затвар� �е каталогът %s"
 
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, c-format
 msgid "cannot compare file names %s and %s"
 msgstr "не може да �е �равн�т файловите имена %s и %s"
 
-#: src/ls.c:4721
+#: src/ls.c:4781
 #, fuzzy
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
@@ -5592,7 +5654,7 @@ msgstr ""
 "Сортира елементите азбучно, о�вен ако има опци� -cftuSUX или --sort.\n"
 "\n"
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 #, fuzzy
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
@@ -5606,18 +5668,18 @@ msgstr ""
 "      --author               � -l извежда автора на в�еки файл\n"
 "  -b, --escape               извежда о�мични чи�ла за неграфичните знаци\n"
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 #, fuzzy
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
 "      --block-size=Р�ЗМ      ползва блокове � размер Р�ЗМ байта\n"
@@ -5628,16 +5690,15 @@ msgstr ""
 "                               � -l: показва ctime и �ортира �поред името\n"
 "                               иначе: �ортира �поред ctime\n"
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 #, fuzzy
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 "  -C                         извежда елементите в колони\n"
@@ -5651,7 +5712,7 @@ msgstr ""
 "                               и �имволните връзки, вме�то �очените файлове\n"
 "  -D, --dired                генерира изход за режима „dired“ на Емак�\n"
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 #, fuzzy
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
@@ -5670,23 +5731,24 @@ msgstr ""
 "                               single-column -1, verbose -l, vertical -C\n"
 "      --full-time            като -l --time-style=full-iso\n"
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr "  -g                         като -l, но не извежда �об�твеника\n"
 
-#: src/ls.c:4763
+#: src/ls.c:4823
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 
-#: src/ls.c:4769
+#: src/ls.c:4829
 #, fuzzy
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
@@ -5695,7 +5757,7 @@ msgstr ""
 "  -h, --human-readable  извежда размерите като за хора (напр. 1K, 234M, 2G)\n"
 "  -H, --si              подобно, но � множител 1000 вме�то 1024\n"
 
-#: src/ls.c:4775
+#: src/ls.c:4835
 #, fuzzy
 msgid ""
 "  -H, --dereference-command-line\n"
@@ -5703,7 +5765,7 @@ msgid ""
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
@@ -5721,7 +5783,7 @@ msgstr ""
 "                               (пренебрегва �е, ако има -a или -A)\n"
 
 # TODO: превод на shell-ОБР�ЗЕЦ?
-#: src/ls.c:4785
+#: src/ls.c:4845
 #, fuzzy
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
@@ -5731,7 +5793,7 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 "      --indicator-style=ДУМ� добав� знак в �тил ДУМ� към файловете:\n"
 "                               none (�тандартно), slash (-p),\n"
@@ -5741,7 +5803,7 @@ msgstr ""
 "ОБР�ЗЕЦ\n"
 "  -k                         като --block-size=1K\n"
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -5758,7 +5820,7 @@ msgstr ""
 "  -m                         попълва в широчина � разделени �ъ� запета� "
 "елементи\n"
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -5779,12 +5841,12 @@ msgstr ""
 "  -p, --indicator-style=slash\n"
 "                             добав� знак / към каталозите\n"
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 #, fuzzy
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -5801,7 +5863,7 @@ msgstr ""
 "                               literal, locale, shell, shell-always, c, "
 "escape\n"
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 #, fuzzy
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
@@ -5813,16 +5875,19 @@ msgstr ""
 "  -R, --recursive            извежда подкаталозите рекур�ивно\n"
 "  -s, --size                 извежда размера в блокове на в�еки файл\n"
 
-#: src/ls.c:4825
+#: src/ls.c:4886
+#, fuzzy
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 "  -S                         �ортира �поред размера на файловете\n"
 "      --sort=ДУМ�            �ортира �поред ДУМ�: none -U, extension -X,\n"
@@ -5833,17 +5898,19 @@ msgstr ""
 "ctime,\n"
 "                               или status; по това време �е и �ортира\n"
 
-#: src/ls.c:4835
+#: src/ls.c:4896
 #, fuzzy
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
 msgstr ""
 "      --time-style=СТИЛ      � -l показва времената използвайки �тил СТИЛ:\n"
 "                               full-iso, long-iso, iso, locale, +FORMAT\n"
@@ -5858,17 +5925,17 @@ msgstr ""
 "  -T, --tabsize=КОЛО�И       приема, че табулациите �а през КОЛО�И вме�то "
 "през 8\n"
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 msgid ""
 "  -t                         sort by modification time, newest first\n"
 "  -T, --tabsize=COLS         assume tab stops at each COLS instead of 8\n"
 msgstr ""
 
-#: src/ls.c:4848
+#: src/ls.c:4912
 #, fuzzy
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
@@ -5882,14 +5949,13 @@ msgstr ""
 "каталога\n"
 "  -v                         �ортира �поред вер�и�та\n"
 
-#: src/ls.c:4855
+#: src/ls.c:4919
 #, fuzzy
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 "  -w, --width=КОЛО�И         приема, че екранът има ширина КОЛО�И\n"
@@ -5897,7 +5963,7 @@ msgstr ""
 "  -X                         �ортира в азбучен ред �поред разширението\n"
 "  -1                         извежда по един файл на ред\n"
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -5906,7 +5972,7 @@ msgid ""
 "variable can change the settings.  Use the dircolors command to set it.\n"
 msgstr ""
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -5984,9 +6050,11 @@ msgstr "  -t, --text              чете в тек�тов режим (по п
 #, fuzzy
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
@@ -5998,12 +6066,7 @@ msgstr ""
 "�уми\n"
 "\n"
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -6019,44 +6082,44 @@ msgstr ""
 "� контролна �ума, знак по�очващ типа (“*“ за двоичен, „ “ за тек�тов)\n"
 "и името на в�еки Ф�ЙЛ.\n"
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, c-format
 msgid "%s: too many checksum lines"
 msgstr "%s: твърде много редове � контролни �уми"
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr "%s: %<PRIuMAX>: неправилно форматиран ред � контролна �ума %s"
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr "%s: �Е УСПЯ �и�темна функци� open или read\n"
 
 # �е е ��но къде �е използва
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr "�ЕУСПЕШ�О"
 
 # �е е ��но къде �е използва
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr "ОК"
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr "%s: не �а открити правилно форматирани %s редове � контролни �уми"
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, fuzzy, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
 msgstr[0] "%s: %<PRIuMAX>: неправилно форматиран ред � контролна �ума %s"
 msgstr[1] "%s: %<PRIuMAX>: неправилно форматиран ред � контролна �ума %s"
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, fuzzy, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
@@ -6066,7 +6129,7 @@ msgstr[1] ""
 "В�ИМ��ИЕ: %<PRIuMAX> от общо %<PRIuMAX> изброени файла не могат да бъдат "
 "прочетени"
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, fuzzy, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
@@ -6075,87 +6138,109 @@ msgstr[0] ""
 msgstr[1] ""
 "В�ИМ��ИЕ: %<PRIuMAX> от %<PRIuMAX> пре�метнати контролни �уми �Е па�ват"
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
 msgstr ""
 
-#: src/md5sum.c:766
+#: src/md5sum.c:770
 #, fuzzy, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr "опци�та --status е �ми�лена �амо при провер�ване на контролни �уми"
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
 msgstr ""
 "опциите --binary и --text �а без�ми�лени при проверка на контролни �уми"
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr "опци�та --status е �ми�лена �амо при провер�ване на контролни �уми"
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr "опци�та --warn е �ми�лена �амо при провер�ване на контролни �уми"
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, fuzzy, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr "опци�та --status е �ми�лена �амо при провер�ване на контролни �уми"
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, fuzzy, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr "опци�та --status е �ми�лена �амо при провер�ване на контролни �уми"
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr "Използване: %s [ОПЦИЯ]... К�Т�ЛОГ...\n"
 
-#: src/mkdir.c:57
+#: src/mkdir.c:59
 #, fuzzy
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
 msgstr ""
 "Създава К�Т�ЛОГ(зи), ако вече не �а �ъздадени.\n"
 "\n"
 
-#: src/mkdir.c:63
-#, fuzzy
+#: src/mkdir.c:65
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 "  -m, --mode=РЕЖИМ  задава режим за до�тъп (като chmod), not a=rwx - umask\n"
 "  -p, --parents     �ъздава и родител�ките каталози, без грешка за "
 "�ъще�твуващи\n"
 "  -v, --verbose     извежда �ъобщение за в�еки �ъздаден каталог\n"
 
-#: src/mkdir.c:168
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/mkdir.c:127 src/mkdir.c:172
+#, fuzzy, c-format
+msgid "failed to set default creation context for %s"
+msgstr "не могат да �е получат атрибутите на %s"
+
+#: src/mkdir.c:191
+#, fuzzy, c-format
+msgid "failed to restore context for %s"
+msgstr "времената на %s не можаха да �е запаз�т"
+
+#: src/mkdir.c:231
 #, c-format
 msgid "created directory %s"
 msgstr "�ъздаден е каталог %s"
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr ""
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr "Използване: %s [ОПЦИЯ]... ИМЕ...\n"
 
-#: src/mkfifo.c:52
+#: src/mkfifo.c:54
 #, fuzzy
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
 msgstr ""
 "Създава именувани канали (FIFO) � по�очените ИМЕна.\n"
 "\n"
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 #, fuzzy
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
@@ -6163,38 +6248,41 @@ msgstr ""
 "  -m, --mode=РЕЖИМ  задава режим за до�тъп (като при chmod), not a=rw - "
 "umask\n"
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, c-format
 msgid "invalid mode"
 msgstr "неправилен режим за до�тъп"
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr "режимът тр�бва да определ� �амо битовете за до�тъп до файла"
 
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
+#, c-format
+msgid "cannot set permissions of %s"
+msgstr "не може да �е зададат правата за до�тъп до %s"
+
+#: src/mknod.c:54
 #, c-format
 msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr "Използване: %s [ОПЦИЯ]... ИМЕ ТИП [ГОЛЯМ М�ЛЪК]\n"
 
-#: src/mknod.c:54
+#: src/mknod.c:56
 #, fuzzy
 msgid "Create the special file NAME of the given TYPE.\n"
 msgstr ""
 "Създава �пециален файл ИМЕ от зададен ТИП.\n"
 "\n"
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr ""
-
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -6210,7 +6298,7 @@ msgstr ""
 "номерът �е интерпретира като ше�тнаде�етичен, иначе ако започва � 0, като\n"
 "о�мичен и иначе -- като де�етичен.  ТИП може да бъде:\n"
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 msgid ""
 "\n"
 "  b      create a block (buffered) special file\n"
@@ -6222,153 +6310,147 @@ msgstr ""
 "  c, u   �ъздава �имволен (небуфериран) �пециален файл\n"
 "  p      �ъздава именуван канал\n"
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 msgid "Special files require major and minor device numbers."
 msgstr ""
 "при �ъздаване на �пециални файлове тр�бва да �е по�очат\n"
 "гол�м и малък номер на у�трой�тво"
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 msgid "Fifos do not have major and minor device numbers."
 msgstr "Именуваните канали н�мат малък и гол�м номер на у�трой�тво."
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, c-format
 msgid "block special files not supported"
 msgstr "не �е поддържа работа � блокови �пециални файлове"
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, c-format
 msgid "character special files not supported"
 msgstr "не �е поддържа работа �ъ� �имволни �пециални файлове"
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, c-format
 msgid "invalid major device number %s"
 msgstr "погрешен гол�м номер на у�трой�тво %s"
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, c-format
 msgid "invalid minor device number %s"
 msgstr "погрешен малък номер на у�трой�тво %s"
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, c-format
 msgid "invalid device %s %s"
 msgstr "неправилно у�трой�тво %s %s"
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, c-format
 msgid "invalid device type %s"
 msgstr "неправилен тип на у�трой�тво %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr ""
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr "Използване: %s [ОПЦИЯ]... [Ф�ЙЛ]\n"
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
 "TEMPLATE must contain at least 3 consecutive 'X's in last component.\n"
 "If TEMPLATE is not specified, use tmp.XXXXXXXXXX, and --tmpdir is implied.\n"
 msgstr ""
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
 "  -q, --quiet         suppress diagnostics about file/dir-creation failure\n"
 msgstr ""
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
 msgstr ""
 
-#: src/mktemp.c:223
-#, fuzzy, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr "неу�пешно прена�очване на �тандартната грешка"
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, fuzzy, c-format
 msgid "too many templates"
 msgstr "твърде много повторени редове"
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr ""
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr ""
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr ""
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr ""
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr ""
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, fuzzy, c-format
 msgid "failed to create directory via template %s"
 msgstr "каталогът %s не може да �е затвори"
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, fuzzy, c-format
 msgid "failed to create file via template %s"
 msgstr "времената на %s не можаха да �е запаз�т"
 
-#: src/mv.c:292
+#: src/mv.c:294
 #, fuzzy
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 "Преименува ИЗТОЧ�ИК на ЦЕЛ или преме�тва ИЗТОЧ�ИК(ци) в К�Т�ЛОГ.\n"
 "\n"
 
-#: src/mv.c:298
+#: src/mv.c:300
 #, fuzzy
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
@@ -6387,7 +6469,7 @@ msgstr ""
 "  -f, --force                  да не �е пита преди заме�тване на файлове\n"
 "  -i, --interactive            да �е пита преди заме�тване на файлове\n"
 
-#: src/mv.c:307
+#: src/mv.c:309
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
@@ -6398,7 +6480,8 @@ msgstr ""
 "                                 аргумент ЦЕЛ\n"
 "  -S, --suffix=СУФИКС          вме�то обичайни� �уфик� за резервни копи�\n"
 
-#: src/mv.c:312
+#: src/mv.c:314
+#, fuzzy
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
 "DIRECTORY\n"
@@ -6407,6 +6490,8 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
 "      --target-directory=К�Т�ЛОГ  преме�тва в�ички аргументи ИЗТОЧ�ИК в "
 "К�Т�ЛОГ\n"
@@ -6715,95 +6800,90 @@ msgid "%s: invalid number to ignore"
 msgstr "%s: неправилен брой редове"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
 msgstr ""
 
-#: src/numfmt.c:676
+#: src/numfmt.c:659
 #, fuzzy, c-format
-msgid "value too large to be converted: '%s'"
+msgid "value too large to be converted: %s"
 msgstr "%s: �тойно�тта не е напълно преобразувана"
 
-#: src/numfmt.c:680
+#: src/numfmt.c:663
 #, fuzzy, c-format
-msgid "invalid number: '%s'"
+msgid "invalid number: %s"
 msgstr "недопу�тимо чи�ло %s"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
+msgid "rejecting suffix in input: %s (consider using --from)"
 msgstr ""
 
-#: src/numfmt.c:688
+#: src/numfmt.c:671
 #, fuzzy, c-format
-msgid "invalid suffix in input: '%s'"
-msgstr "неправилен аргумент „%s“"
+msgid "invalid suffix in input: %s"
+msgstr "непознат входен флаг: %s"
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
 msgstr ""
 
-#: src/numfmt.c:723
+#: src/numfmt.c:722 src/numfmt.c:768
 #, fuzzy, c-format
 msgid "failed to prepare value '%Lf' for printing"
 msgstr "%s: не може да �е отвори в режим за пи�ане"
 
-#: src/numfmt.c:787
+#: src/numfmt.c:791
 #, fuzzy, c-format
-msgid "invalid unit size: '%s'"
+msgid "invalid unit size: %s"
 msgstr "неправилен размер на табулациите: %s"
 
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
-#, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr ""
-
-#: src/numfmt.c:813
+#: src/numfmt.c:814
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
 msgstr "Използване: %s [ОПЦИЯ]... [ПОТРЕБИТЕЛ]...\n"
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
 msgstr ""
 
-#: src/numfmt.c:820
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
 msgstr ""
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
 msgstr ""
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
 "                         see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr ""
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
@@ -6811,19 +6891,19 @@ msgid ""
 "locale)\n"
 msgstr ""
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
 msgstr ""
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
 msgstr ""
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -6833,43 +6913,40 @@ msgid ""
 "                         is found\n"
 msgstr ""
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
 "nearest\n"
 msgstr ""
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
 msgstr ""
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr ""
 
-#: src/numfmt.c:877
-#, fuzzy
+#: src/numfmt.c:878
 msgid ""
 "\n"
 "UNIT options:\n"
 msgstr ""
-"Опции, определ�щи наредбата:\n"
-"\n"
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr ""
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -6878,7 +6955,7 @@ msgid ""
 "               1Mi = 1048576,\n"
 msgstr ""
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
@@ -6886,7 +6963,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
@@ -6894,7 +6971,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
@@ -6902,18 +6979,18 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:905
+#: src/numfmt.c:906
 #, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -6925,7 +7002,7 @@ msgid ""
 "errors are not diagnosed and the exit status is 0.\n"
 msgstr ""
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -6946,112 +7023,112 @@ msgid ""
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 msgstr ""
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, fuzzy, c-format
 msgid "format %s has no %% directive"
 msgstr "целта %s не е каталог"
 
-#: src/numfmt.c:990
+#: src/numfmt.c:1003
 #, fuzzy, c-format
 msgid "invalid format %s (width overflow)"
 msgstr "неправилна ширина на формат"
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr ""
+
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr ""
 
-#: src/numfmt.c:1010
+#: src/numfmt.c:1030
 #, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
 msgstr ""
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr ""
 
-#: src/numfmt.c:1070
+#: src/numfmt.c:1081
 #, fuzzy, c-format
-msgid "invalid suffix in input '%s': '%s'"
-msgstr "неправилен аргумент „%s“"
+msgid "invalid suffix in input %s: %s"
+msgstr "непознат входен флаг: %s"
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
 msgstr ""
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
 msgstr ""
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
+msgid "large input value %s: possible precision loss"
 msgstr ""
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
 
-#: src/numfmt.c:1388
+#: src/numfmt.c:1403
 #, fuzzy, c-format
-msgid "invalid padding value '%s'"
-msgstr "�еправилен диапазон от �траници %s"
+msgid "invalid padding value %s"
+msgstr "неправилна дата %s"
 
-#: src/numfmt.c:1401
+#: src/numfmt.c:1417
 #, fuzzy, c-format
-msgid "invalid field value '%s'"
-msgstr "неправилен номер на поле: „%s“"
+msgid "invalid field value %s"
+msgstr "неправилен номер на поле: %s"
 
-#: src/numfmt.c:1430
+#: src/numfmt.c:1447
 #, fuzzy, c-format
-msgid "invalid header value '%s'"
+msgid "invalid header value %s"
 msgstr "неправилна дата %s"
 
-#: src/numfmt.c:1456
+#: src/numfmt.c:1473
 #, fuzzy, c-format
 msgid "--grouping cannot be combined with --format"
 msgstr "�е може да �е комбинират файлови операнди � --files0-from."
 
-#: src/numfmt.c:1458
-#, fuzzy, c-format
-msgid "--padding cannot be combined with --format"
-msgstr "�е може да �е комбинират файлови операнди � --files0-from."
-
-#: src/numfmt.c:1463
+#: src/numfmt.c:1478
 #, fuzzy, c-format
 msgid "no conversion option specified"
 msgstr "по�очени �а много опции -i"
 
-#: src/numfmt.c:1471
+#: src/numfmt.c:1486
 #, fuzzy, c-format
 msgid "grouping cannot be combined with --to"
 msgstr "�е може да �е комбинират файлови операнди � --files0-from."
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
 msgstr ""
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
 msgstr ""
 
-#: src/numfmt.c:1511
+#: src/numfmt.c:1526
 #, fuzzy, c-format
 msgid "error reading input"
 msgstr "грешка при четене на %s"
 
-#: src/numfmt.c:1520
-#, fuzzy, c-format
+#: src/numfmt.c:1535
+#, c-format
 msgid "failed to convert some of the input numbers"
-msgstr "не може да �е прена�очи �тандартни� изход"
+msgstr ""
 
-#: src/od.c:294
+#: src/od.c:320
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -7063,7 +7140,7 @@ msgstr ""
 "    или:    %s [-abcdfilosx]... [Ф�ЙЛ] [[+]ОТМЕСТВ��Е[.][b]]\n"
 "    или:    %s --traditional [Ф�ЙЛ] [[+]ОТМЕСТВ��Е [[+]ЕТИКЕТ]]\n"
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -7079,7 +7156,7 @@ msgstr ""
 "Ф�ЙЛ или ако Ф�ЙЛ е - �е чете от �тандартни� вход.\n"
 "\n"
 
-#: src/od.c:307
+#: src/od.c:333
 #, fuzzy
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
@@ -7104,26 +7181,25 @@ msgstr ""
 "  a          именуван знак, �тарши�т бит �е пренебрегва\n"
 "  c          знак от ASCII или код, защитен � \\\n"
 
-#: src/od.c:318
-#, fuzzy
+#: src/od.c:344
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
-"  -A, --address-radix=Б�З�    как да �е извежда отме�тването\n"
-"  -j, --skip-bytes=Б�ЙТОВЕ    пропу�ка Б�ЙТОВЕ входни байта в началото\n"
 
-#: src/od.c:323
+#: src/od.c:350
 #, fuzzy
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
@@ -7136,7 +7212,7 @@ msgstr ""
 "  -w, --width[=Б�ЙТОВЕ]       извежда по Б�ЙТОВЕ входни байта на един ред\n"
 "      --traditional           да �е приемат аргументи в традиционни� формат\n"
 
-#: src/od.c:336
+#: src/od.c:363
 #, fuzzy
 msgid ""
 "\n"
@@ -7144,7 +7220,7 @@ msgid ""
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 "\n"
@@ -7156,7 +7232,7 @@ msgstr ""
 "  -d   е �ъщото като -t u2, извеждат �е беззнакови двубайтови де�етични "
 "чи�ла\n"
 
-#: src/od.c:345
+#: src/od.c:372
 msgid ""
 "  -f   same as -t fF, select floats\n"
 "  -i   same as -t dI, select decimal ints\n"
@@ -7172,16 +7248,16 @@ msgstr ""
 "  -s   е �ъщото като -t d2, извеждат �е двубайтови де�етични чи�ла\n"
 "  -x   е �ъщото като -t x2, извеждат �е двубайтови ше�тнаде�етични чи�ла\n"
 
-#: src/od.c:353
+#: src/od.c:380
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -7195,7 +7271,7 @@ msgstr ""
 "  u[Р�ЗМ]    беззнаково де�етично чи�ло от Р�ЗМ байта\n"
 "  x[Р�ЗМ]    ше�тнаде�етично чи�ло от Р�ЗМ байта\n"
 
-#: src/od.c:367
+#: src/od.c:394
 #, fuzzy
 msgid ""
 "\n"
@@ -7210,14 +7286,14 @@ msgstr ""
 "f, Р�ЗМ може да бъде и F за sizeof(float), D за sizeof(double) или L\n"
 "за sizeof(long double).\n"
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
 "each output line.\n"
 msgstr ""
 
-#: src/od.c:379
+#: src/od.c:406
 #, fuzzy
 msgid ""
 "\n"
@@ -7231,18 +7307,16 @@ msgid ""
 "and so on for G, T, P, E, Z, Y.\n"
 msgstr ""
 "\n"
-"БЛОКОВЕ и Б�ЙТОВЕ могат да бъдат �ледвани от �ледните �уфик�и-множители:\n"
-"xM=M, c=1, w=2, b=512, kB=1000, K=1024, MB=1000*1000, M=1024*1024,\n"
-"GB=1000*1000*1000, G=1024*1024*1024 и аналогично за T, P, E, Z и Y.\n"
-"В��ка КЛЮЧДУМ� може да бъде:\n"
-"\n"
+"Р�ЗМ �е �ъ�тои от незадължително ц�ло чи�ло, �ледвано от едно от:\n"
+"kB=1000, K=1024, MB=1000*1000, M=1024*1024 и аналогично за G, T, P, E, Z и "
+"Y.\n"
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, c-format
 msgid "invalid type string %s"
 msgstr "неправилен низ за тип %s"
 
-#: src/od.c:649
+#: src/od.c:690
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7251,7 +7325,7 @@ msgstr ""
 "неправилен низ за тип %s;\n"
 "тази �и�тема не поддържа %lu-байтови целочи�лени чи�ла"
 
-#: src/od.c:770
+#: src/od.c:811
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7260,38 +7334,38 @@ msgstr ""
 "неправилен низ за тип %s;\n"
 "тази �и�тема не поддържа %lu-байтови чи�ла � плаваща запета�"
 
-#: src/od.c:828
+#: src/od.c:869
 #, fuzzy, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr "неправилен знак „%c“ в низа за тип %s"
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr "не може да �е пропу�не �лед кра� на комбинирани� вход"
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, fuzzy, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr ""
 "неправилна база „%c“ на изходни� адре�; тр�бва да бъде знак измежду [doxn]"
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr "при извеждане на низове не може да �е по�очва тип"
 
-#: src/od.c:1810
+#: src/od.c:1863
 #, fuzzy
 msgid "compatibility mode supports at most one file"
 msgstr "При традиционни� формат �е поддържа най-много един файл."
 
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr "skip-bytes + read-bytes �а твърде много"
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr "внимание: неправилна ширина %lu; вме�то не� �е ползва %d"
@@ -7459,12 +7533,12 @@ msgstr "Кога"
 msgid "Where"
 msgstr "Къде"
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr "Използване: %s [ОПЦИЯ]... [ПОТРЕБИТЕЛ]...\n"
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -7481,7 +7555,7 @@ msgstr ""
 "  -p              изпу�ка потребител�ки� файл план в дълги� формат\n"
 "  -s              извежда в кратък формат; по подразбиране е така\n"
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -7496,7 +7570,7 @@ msgstr ""
 "  -q              изпу�ка пълните имена, отдалечените хо�тове и\n"
 "                  време на неактивно�т при къ�и� формат\n"
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -7507,7 +7581,7 @@ msgstr ""
 "Олекотена програма „finger“ -- извежда информаци� за потребител.\n"
 "Файлът utmp ще бъде %s.\n"
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr "при използване на -l тр�бва да �е по�очи поне едно потребител�ко име"
@@ -7738,7 +7812,8 @@ msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
@@ -7753,7 +7828,7 @@ msgstr ""
 "е\n"
 "                    зададено и -w\n"
 
-#: src/pr.c:2827
+#: src/pr.c:2828
 #, fuzzy
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
@@ -7769,7 +7844,7 @@ msgstr ""
 "опции.\n"
 "  -t, --omit-header пропу�ка горните и долните колонтитули\n"
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 #, fuzzy
 msgid ""
 "  -T, --omit-pagination\n"
@@ -7793,7 +7868,7 @@ msgstr ""
 "                    задава ширина на �траницата от СТР_ШИР (72) знака при\n"
 "                    многоколонен извод, -s[знак] отмен� (72)\n"
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 #, fuzzy
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
@@ -7809,7 +7884,7 @@ msgstr ""
 "�е\n"
 "                    вли�е от -S и -s\n"
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 #, fuzzy
 msgid ""
 "\n"
@@ -7834,7 +7909,7 @@ msgstr ""
 
 #: src/printenv.c:69
 #, fuzzy
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr ""
 "  -z, --zero-terminated     завършва редовете � байт 0 вме�то � нов ред\n"
 
@@ -7957,12 +8032,12 @@ msgstr "внимание: пренебрегват Ñ�е излишните арÐ
 msgid "F. Pinard"
 msgstr "Ф. Пинард"
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, c-format
 msgid "%s (for regexp %s)"
 msgstr "%s (за рег. израз %s)"
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
@@ -7971,7 +8046,7 @@ msgstr ""
 "Използване: %s [ОПЦИЯ]... [ВХОД]...   (без -G)\n"
 "    или:    %s -G [ОПЦИЯ]... [ВХОД [ИЗХОД]]\n"
 
-#: src/ptx.c:1821
+#: src/ptx.c:1824
 #, fuzzy
 msgid ""
 "Output a permuted index, including context, of the words in the input "
@@ -7981,7 +8056,7 @@ msgstr ""
 "файлове\n"
 "\n"
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 #, fuzzy
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
@@ -7994,7 +8069,7 @@ msgstr ""
 "  -F, --flag-truncation=�ИЗ      обозначава � �ИЗ при �ъкращаване на "
 "редовете\n"
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 #, fuzzy
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
@@ -8011,7 +8086,7 @@ msgstr ""
 "изречени�та\n"
 "  -T, --format=tex               извежда изход � команди за TeX\n"
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -8027,7 +8102,7 @@ msgstr ""
 "  -i, --ignore-file=Ф�ЙЛ         Ф�ЙЛ � думи, които да �е пренебрегват\n"
 "  -o, --only-file=Ф�ЙЛ           признават �е �амо думи от този Ф�ЙЛ\n"
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -8038,17 +8113,16 @@ msgstr ""
 "  -t, --typeset-mode               - не е реализирана -\n"
 "  -w, --width=БРОЙ               ширина на изхода, препратките не �е бро�т\n"
 
-#: src/ptx.c:1854
+#: src/ptx.c:1857
 #, fuzzy
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
 "\n"
-"Без Ф�ЙЛ или ако Ф�ЙЛ е -, �е чете от �тандартни� вход.  „-F /“ �е "
-"подразбира.\n"
+"�ко н�ма Ф�ЙЛ или ако Ф�ЙЛ е -, �е чете от �тандартни� вход.\n"
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, c-format
 msgid "invalid gap width: %s"
 msgstr "неправилна ширина на м��тото между полетата: %s"
@@ -8067,23 +8141,29 @@ msgid ""
 "  -P, --physical  avoid all symlinks\n"
 msgstr ""
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+
+#: src/pwd.c:169
 #, c-format
 msgid "failed to chdir to %s"
 msgstr "не може отвори каталогът %s"
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, c-format
 msgid "failed to stat %s"
 msgstr "не може да �е изпълни stat за %s"
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr ""
 "не може да �е намери елемента на каталога в %s �ъ� �ъответ�тващ i-възел"
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, c-format
 msgid "ignoring non-option arguments"
 msgstr "пренебрегват �е аргументи, които не �а опции"
@@ -8093,8 +8173,8 @@ msgstr "пренебрегват Ñ�е аргументи, които не Ñ�а Ð
 msgid "Dmitry V. Levin"
 msgstr ""
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Използване: %s [ОПЦИЯ]... Ф�ЙЛ...\n"
@@ -8154,8 +8234,7 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 "  -f, --canonicalize      нормализира, �ледвайки рекур�ивно в��ка �имволна\n"
 "                          връзка, ко�то е компонент на зададената пътека\n"
@@ -8186,7 +8265,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 
@@ -8204,41 +8283,42 @@ msgstr "%s: да Ñ�е навлезе ли в защитениÑ� Ñ�рещу заÐ
 msgid "%s: descend into directory %s? "
 msgstr "%s: да �е навлезе ли в каталога %s? "
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr "%s: да �е изтрие ли %s �ъ� защита �рещу запи� %s? "
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, c-format
 msgid "%s: remove %s %s? "
 msgstr "%s: да �е изтрие ли %s %s? "
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, c-format
 msgid "removed directory: %s\n"
 msgstr "каталогът %s е изтрит\n"
 
-#: src/remove.c:444
-#, fuzzy, c-format
-msgid "cannot remove directory: %s"
-msgstr "не може да �е изтрие каталогът %s"
+#: src/remove.c:447
+#, c-format
+msgid "refusing to remove %s or %s directory: skipping %s"
+msgstr ""
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr "пропу�ка �е %s тъй като е на друго у�трой�тво"
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, fuzzy, c-format
 msgid "traversal failed: %s"
 msgstr "не може да �е чете"
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -8265,15 +8345,16 @@ msgstr ""
 "  -i                    пита преди в��ко триене\n"
 
 #: src/rm.c:142
+#, fuzzy
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 "  -I                    пита веднъж преди изтриването на повече от три "
 "файла\n"
@@ -8356,14 +8437,18 @@ msgstr ""
 "shred.\n"
 
 #: src/rm.c:342
-#, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr "%s: да �е изтри�т ли рекур�ивно в�ички аргументи? "
+#, fuzzy, c-format
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] "%s: да �е изтри�т ли рекур�ивно в�ички аргументи? "
+msgstr[1] "%s: да �е изтри�т ли рекур�ивно в�ички аргументи? "
 
-#: src/rm.c:343
-#, c-format
-msgid "%s: remove all arguments? "
-msgstr "%s: да �е изтри�т ли в�ички аргументи"
+#: src/rm.c:345
+#, fuzzy, c-format
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] "%s: да �е изтри�т ли в�ички аргументи"
+msgstr[1] "%s: да �е изтри�т ли в�ички аргументи"
 
 #: src/rmdir.c:134 src/rmdir.c:233
 #, c-format
@@ -8420,7 +8505,7 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
 
@@ -8470,41 +8555,46 @@ msgstr ""
 msgid "no command specified"
 msgstr "не е по�очен номер на проце�"
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr ""
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, fuzzy, c-format
 msgid "failed to compute a new context"
 msgstr "не може да �е отвори %s"
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, fuzzy, c-format
 msgid "failed to set new user %s"
 msgstr "не може да �е изпълни stat за %s"
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, fuzzy, c-format
 msgid "failed to set new type %s"
 msgstr "не може да �е изпълни stat за %s"
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, fuzzy, c-format
 msgid "failed to set new range %s"
 msgstr "не може да �е изпълни stat за %s"
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, fuzzy, c-format
 msgid "failed to set new role %s"
 msgstr "не може да �е изпълни stat за %s"
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, fuzzy, c-format
 msgid "unable to set security context %s"
 msgstr "не може да �е въз�танов�т правата за до�тъп до %s"
 
+#: src/selinux.c:127 src/selinux.c:300
+#, fuzzy, c-format
+msgid "error canonicalizing %s"
+msgstr "грешка при четене на %s"
+
 #: src/seq.c:68
 #, c-format
 msgid ""
@@ -8541,6 +8631,8 @@ msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
@@ -8560,95 +8652,36 @@ msgstr ""
 "е\n"
 "чи�ло � плаваща запета� � мак�имална точно�т TOЧ�ОСТ и %g иначе.\n"
 
-#: src/seq.c:94
+#: src/seq.c:96
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
 "it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n"
 "decimal numbers with maximum precision PREC, and to %g otherwise.\n"
 msgstr ""
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, c-format
 msgid "invalid floating point argument: %s"
 msgstr "неправилно чи�ло � плаваща запета� като аргумент: %s"
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, fuzzy, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr "%s има непознат файлов тип"
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr ""
 "не може да �е използва форматен низ, когато �е извеждат низове � еднаква "
 "ширина"
 
-#: src/setuidgid.c:49
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-"Използване: %s ПОТРЕБ_ИМЕ КОМ��Д� [�РГУМЕ�Т]...\n"
-"    или:    %s ОПЦИЯ\n"
-
-#: src/setuidgid.c:55
-#, fuzzy
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-"Отказва �е от в�ички допълнителни групи, приема потребител� и групата на\n"
-"по�оченото ПОТРЕБ_ИМЕ и изпълн�ва КОМ��Д�та � в�ички по�очени �РГУМЕ�Ти.\n"
-"Приключва � код-�ъ�то�ние 111, ако не могат да �е приемат необходимите\n"
-"потребител и група.  В противен �лучай приключва � кода-�ъ�то�ние на\n"
-"КОМ��Д�та.  Тази програма е полезна �амо ако �е изпълн�ва от root.\n"
-"\n"
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr "непознат потребител: %s"
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr ""
-
-#: src/setuidgid.c:190
-#, fuzzy, c-format
-msgid "failed to set supplemental group(s)"
-msgstr "не може да �е у�танови допълнителна група"
-
-#: src/setuidgid.c:200
-#, c-format
-msgid "cannot set group-ID to %lu"
-msgstr "не може да �е приеме група %lu"
-
-#: src/setuidgid.c:204
-#, c-format
-msgid "cannot set user-ID to %lu"
-msgstr "не може да �е приеме потребител %lu"
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr ""
 
-#: src/shred.c:148
+#: src/shred.c:170
 #, fuzzy
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
@@ -8659,7 +8692,7 @@ msgstr ""
 "апаратура.\n"
 "\n"
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, fuzzy, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -8674,9 +8707,10 @@ msgstr ""
 "urandom)\n"
 "  -s, --size=N   заличава N байта (приемат �е �уфик�и като K, M, G)\n"
 
-#: src/shred.c:161
+#: src/shred.c:183
+#, fuzzy
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
@@ -8691,15 +8725,20 @@ msgstr ""
 "  -z, --zero     накра� заличава � нули, за да �е �крие използването на "
 "shred\n"
 
-#: src/shred.c:170
+#: src/shred.c:192
+#, fuzzy
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 "\n"
@@ -8713,7 +8752,7 @@ msgstr ""
 "дей�тва върху обикновени файлове, повечето хора използват опци�та --remove.\n"
 "\n"
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -8734,7 +8773,7 @@ msgstr ""
 "в�ички режими на работа на файловата �и�тема:\n"
 "\n"
 
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -8757,7 +8796,7 @@ msgstr ""
 "  Network Appliance\n"
 "\n"
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -8766,7 +8805,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:205
+#: src/shred.c:231
 #, fuzzy
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
@@ -8801,7 +8840,7 @@ msgstr ""
 "�ъщо могат да �ъдържат копи� на файла, които не могат да бъдат от�транени и\n"
 "дават възможно�т заличени�т �ъ� shred файл да бъде въз�тановен.\n"
 
-#: src/shred.c:215
+#: src/shred.c:241
 #, fuzzy
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
@@ -8819,127 +8858,127 @@ msgstr ""
 "изтрити�т\n"
 "файл да бъде въз�тановен.\n"
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, c-format
 msgid "%s: fdatasync failed"
 msgstr "%s: неу�пешно извикване на fdatasync"
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr "%s: неу�пешно извикване на fsync"
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr "%s: битовете не могат да �е обръщат"
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr "%s: итераци� %lu/%lu (%s)..."
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, c-format
 msgid "%s: error writing at offset %s"
 msgstr "%s: грешка при запи� на отме�тване %s"
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s: неу�пешно извикване на lseek"
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, c-format
 msgid "%s: file too large"
 msgstr "%s: файлът е твърде дълъг"
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr "%s: итераци� %lu/%lu (%s)...%s"
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr "%s: итераци� %lu/%lu (%s)...%s/%s %d%%"
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, c-format
 msgid "%s: fstat failed"
 msgstr "%s: неу�пешно извикване на fstat"
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, c-format
 msgid "%s: invalid file type"
 msgstr "%s: недопу�тим тип на файла"
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr "%s: файлът има отрицателен размер"
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, c-format
 msgid "%s: error truncating"
 msgstr "%s: грешка при �ъкращаване"
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, c-format
 msgid "%s: fcntl failed"
 msgstr "%s: неу�пешно извикване на fcntl"
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr "%s: не може да �е заличава файл � режим на до�тъп �амо за добав�не"
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr "%s: изтриване"
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, c-format
 msgid "%s: renamed to %s"
 msgstr "%s: преименуван на %s"
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, c-format
 msgid "%s: failed to remove"
 msgstr "%s: не може да �е от�трани"
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr "%s: изтрит"
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, c-format
 msgid "%s: failed to close"
 msgstr "%s: не може да �е затвори"
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, c-format
 msgid "%s: failed to open for writing"
 msgstr "%s: не може да �е отвори в режим за пи�ане"
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, c-format
 msgid "%s: invalid number of passes"
 msgstr "%s: неправилен брой итерации"
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, c-format
 msgid "multiple random sources specified"
 msgstr "по�очени �а много �лучайни източници"
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, c-format
 msgid "%s: invalid file size"
 msgstr "%s: неправилен размер на файла"
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -8950,14 +8989,14 @@ msgstr ""
 "    или:    %s -e [ОПЦИЯ]... [�РГУМЕ�Т]...\n"
 "    или:    %s -i ОТ-ДО [ОПЦИЯ]...\n"
 
-#: src/shuf.c:54
+#: src/shuf.c:67
 #, fuzzy
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr ""
 "Извежда на �тандартни� изход �лучайни пермутации на входните редове.\n"
 "\n"
 
-#: src/shuf.c:60
+#: src/shuf.c:73
 #, fuzzy
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
@@ -8966,7 +9005,7 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
 msgstr ""
 "  -e, --echo                работи � в�еки �РГУМЕ�Т като � входен ред\n"
 "  -i, --input-range=ОТ-ДО   работи � в��ко чи�ло от ОТ до ДО като � входен "
@@ -8978,31 +9017,41 @@ msgstr ""
 "urandom)\n"
 "  -z, --zero-terminated     завършва редовете � нулев байт вме�то � нов ред\n"
 
-#: src/shuf.c:244
+#: src/shuf.c:228
+#, fuzzy, c-format
+msgid "too many input lines"
+msgstr "твърде много повторени редове"
+
+#: src/shuf.c:431
 #, c-format
 msgid "multiple -i options specified"
 msgstr "по�очени �а много опции -i"
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, c-format
 msgid "invalid input range %s"
 msgstr "неправилен входен диапазон: %s"
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, c-format
 msgid "invalid line count %s"
 msgstr "неправилен брой редове: %s"
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, c-format
 msgid "multiple output files specified"
 msgstr "по�очени �а твърде много изходни файлове"
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, c-format
 msgid "cannot combine -e and -i options"
 msgstr "не може да �е комбинират опциите -e и -i"
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr ""
+
 #: src/sleep.c:44
 #, fuzzy, c-format
 msgid ""
@@ -9027,24 +9076,24 @@ msgstr ""
 "от по�очените времена.\n"
 "\n"
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, c-format
 msgid "invalid time interval %s"
 msgstr "неправилен интервал за време %s"
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr "не може да �е чете ча�овникът в реално време"
 
-#: src/sort.c:399
+#: src/sort.c:427
 #, fuzzy
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr ""
 "Извежда на �тандартни� изход �ортирана конкатенаци� на в�ички Ф�ЙЛ(ове).\n"
 "\n"
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
@@ -9052,7 +9101,7 @@ msgstr ""
 "Опции, определ�щи наредбата:\n"
 "\n"
 
-#: src/sort.c:409
+#: src/sort.c:437
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
 "  -d, --dictionary-order      consider only blanks and alphanumeric "
@@ -9064,30 +9113,19 @@ msgstr ""
 "знаци\n"
 "  -f, --ignore-case           приравн�ва малките � главните букви\n"
 
-#: src/sort.c:415
-#, fuzzy
+#: src/sort.c:443
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
 "  -i, --ignore-nonprinting    consider only printable characters\n"
 "  -M, --month-sort            compare (unknown) < 'JAN' < ... < 'DEC'\n"
 msgstr ""
-"  -g, --general-numeric-sort  �равн�ва �поред общата чи�лова �тойно�т\n"
-"  -i, --ignore-nonprinting    отчита �амо печатните знаци\n"
-"  -M, --month-sort            �равн�ва (неизве�тно) < `Я�У' < ... < `ДЕК'\n"
-"  -n, --numeric-sort          �равн�ва �поред чи�ловата �тойно�т на "
-"низовете\n"
-"  -R, --random-sort           �ортира �поред �лучаен хеш\n"
-"      --random-source=FILE   чете �лучайни байтове от Ф�ЙЛ (вме�то /dev/"
-"urandom)\n"
-"  -r, --reverse               �ортира в обратен ред\n"
-"\n"
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 
-#: src/sort.c:423
+#: src/sort.c:451
 #, fuzzy
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
@@ -9106,7 +9144,7 @@ msgstr ""
 "  -r, --reverse               �ортира в обратен ред\n"
 "\n"
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -9116,7 +9154,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/sort.c:437
+#: src/sort.c:465
 #, fuzzy
 msgid ""
 "Other options:\n"
@@ -9125,13 +9163,13 @@ msgstr ""
 "Опции, определ�щи наредбата:\n"
 "\n"
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
 msgstr ""
 
-#: src/sort.c:445
+#: src/sort.c:473
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
 "  -C, --check=quiet, --check=silent  like -c, but do not report first bad "
@@ -9140,7 +9178,7 @@ msgid ""
 "                              decompress them with PROG -d\n"
 msgstr ""
 
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -9149,13 +9187,13 @@ msgid ""
 "                            If F is - then read names from standard input\n"
 msgstr ""
 
-#: src/sort.c:459
+#: src/sort.c:487
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
 "  -m, --merge               merge already sorted files; do not sort\n"
 msgstr ""
 
-#: src/sort.c:463
+#: src/sort.c:491
 #, fuzzy
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
@@ -9174,7 +9212,7 @@ msgstr ""
 "comparison\n"
 "  -S, --buffer-size=Р�ЗМ    използва буфер в паметта � размер Р�ЗМ\n"
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, fuzzy, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -9197,12 +9235,7 @@ msgstr ""
 "                              извежда �амо първи� от група еквивалентни "
 "редове\n"
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr ""
-"  -z, --zero-terminated     завършва редовете � байт 0 вме�то � нов ред\n"
-
-#: src/sort.c:483
+#: src/sort.c:511
 #, fuzzy
 msgid ""
 "\n"
@@ -9231,7 +9264,7 @@ msgstr ""
 "\n"
 "Р�ЗМ може да бъде �ледван от н�кой от �ледните множители:\n"
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -9251,259 +9284,244 @@ msgstr ""
 "Използвайте LC_ALL=C, за да получите традиционната наредба,\n"
 "ко�то �равн�ва �поред кодовете на знаците.\n"
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, fuzzy, c-format
 msgid "waiting for %s [-d]"
 msgstr "запи� в %s"
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr ""
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, fuzzy, c-format
 msgid "cannot create temporary file in %s"
 msgstr "не може да �е направи временен файл %s"
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr "неу�пешно отвар�не на файл"
 
-#: src/sort.c:970
+#: src/sort.c:998
 msgid "fflush failed"
 msgstr "неу�пешно извикване на fflush"
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr "неу�пешно затвар�не на файл"
 
-#: src/sort.c:986
-#, fuzzy, c-format
-msgid "dup2 failed"
-msgstr "неу�пешно отвар�не на файл"
-
-#: src/sort.c:1103
-#, c-format
-msgid "couldn't execute %s"
-msgstr ""
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 #, fuzzy
 msgid "couldn't create temporary file"
 msgstr "не може да �е направи временен файл"
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, fuzzy, c-format
 msgid "couldn't create process for %s -d"
 msgstr "не може да �е �ъздаде каталог %s"
 
-#: src/sort.c:1161
-#, c-format
-msgid "couldn't execute %s -d"
-msgstr ""
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, c-format
 msgid "warning: cannot remove: %s"
 msgstr "внимание: не може да �е изтрие: %s"
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, fuzzy, c-format
 msgid "invalid --%s argument %s"
 msgstr "неправилен аргумент %s"
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, fuzzy, c-format
 msgid "minimum --%s argument is %s"
 msgstr "дву�ми�лен аргумент %s за %s"
 
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, fuzzy, c-format
 msgid "--%s argument %s too large"
 msgstr "%s: бро�т „%.*s“ е твърде гол�м"
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr ""
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr ""
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr "файл не може да бъде открит"
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr "не може да �е чете"
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, c-format
 msgid "string transformation failed"
 msgstr "неу�пешно преобразуване на низ"
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, fuzzy, c-format
 msgid "the untransformed string was %s"
 msgstr "�епреобразувани�т низ беше %s."
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr ""
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr ""
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr ""
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr ""
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr ""
 
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, fuzzy, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
-msgstr[0] "%s: опци�та „%s“ е дву�ми�лена\n"
-msgstr[1] "%s: опци�та „%s“ е дву�ми�лена\n"
+msgstr[0] "%s: опци�та „-W %s“ е дву�ми�лена\n"
+msgstr[1] "%s: опци�та „-W %s“ е дву�ми�лена\n"
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr ""
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr "неу�пешен запи�"
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr "%s: %s:%s: разбъркано�т: "
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr "�тандартната грешка"
 
-#: src/sort.c:3698
+#: src/sort.c:3738
 #, fuzzy
 msgid "cannot read"
 msgstr "%s: битовете не могат да �е обръщат"
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, c-format
 msgid "%s: invalid field specification %s"
 msgstr "%s: неправилна �пецификаци� на поле %s"
 
-#: src/sort.c:3987
+#: src/sort.c:4028
 #, fuzzy, c-format
 msgid "options '-%s' are incompatible"
 msgstr "опциите „-%s“ �а не�ъвме�тими"
 
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, c-format
 msgid "%s: invalid count at start of %s"
 msgstr "%s: неправилен брой в началото на %s"
 
-#: src/sort.c:4295
+#: src/sort.c:4336
 #, fuzzy
 msgid "invalid number after '-'"
 msgstr "неправилно чи�ло �лед „-“"
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 #, fuzzy
 msgid "invalid number after '.'"
 msgstr "неправилно чи�ло �лед „.“"
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr "неочакван знак в �пецификаци� на поле"
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, fuzzy, c-format
 msgid "multiple compress programs specified"
 msgstr "по�очени �а много формати за изхода"
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
 msgstr "неправилно чи�ло в началото на поле"
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
 msgstr "номерът на поле е нула"
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr "отме�тването в знаци е нула"
 
-#: src/sort.c:4407
+#: src/sort.c:4448
 #, fuzzy
 msgid "invalid number after ','"
 msgstr "неправилно чи�ло �лед „,“"
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr "празна табулаци�"
 
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, c-format
 msgid "cannot read file names from %s"
 msgstr "не може да �е четат файлови имена от %s"
 
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, fuzzy, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr "неправилно файлово име � дължина нула"
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, fuzzy, c-format
 msgid "no input from %s"
 msgstr "затвар�не на входни� файл %s"
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr ""
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr ""
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, fuzzy, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr "допълнителни�т операнд %s не е позволен � -c"
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr ""
 
-#: src/split.c:204
+#: src/split.c:203
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr "Използване: %s [ОПЦИЯ] [ВХОД [ПРЕФИКС]]\n"
 
-#: src/split.c:208
+#: src/split.c:207
 #, fuzzy
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
@@ -9517,31 +9535,25 @@ msgstr ""
 "чете от �тандартни� вход.\n"
 "\n"
 
-#: src/split.c:216
-#, fuzzy, c-format
+#: src/split.c:215
+#, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
-"  -a, --suffix-length=N   ползва �уфик�и � дължина N (по подразбиране %d)\n"
-"  -b, --bytes=Р�ЗМ        дели на парчета � размер Р�ЗМ байта\n"
-"  -C, --line-bytes=Р�ЗМ   раздел� по редове до Р�ЗМ байта на изходен файл\n"
-"  -d, --numeric-suffixes  ползва чи�лови �уфик�и вме�то буквени\n"
-"  -l, --lines=ЧИСЛО       дели на по ЧИСЛО редове на изходен файл\n"
 
-#: src/split.c:229
+#: src/split.c:228
 #, fuzzy
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
@@ -9550,7 +9562,7 @@ msgstr ""
 "      --verbose           �ъобщава на �тандартната грешка преди отвар�нето\n"
 "                            на в�еки изходен файл\n"
 
-#: src/split.c:236
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -9562,189 +9574,189 @@ msgid ""
 "r/K/N   likewise but only output Kth of N to stdout\n"
 msgstr ""
 
-#: src/split.c:354
+#: src/split.c:353
 #, fuzzy, c-format
 msgid "output file suffixes exhausted"
 msgstr "Изчерпаха �е �уфик�ите за изходни файлове"
 
-#: src/split.c:366
+#: src/split.c:365
 #, c-format
 msgid "creating file %s\n"
 msgstr "�ъздава �е файл %s\n"
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr ""
 
-#: src/split.c:391
+#: src/split.c:390
 #, fuzzy, c-format
 msgid "failed to set FILE environment variable"
 msgstr "неразбираема �тойно�т на променливата от обкръжението LS_COLORS"
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr ""
 
-#: src/split.c:395
+#: src/split.c:394
 #, fuzzy, c-format
 msgid "failed to create pipe"
 msgstr "не може да �е изпълни stat за %s"
 
-#: src/split.c:409
+#: src/split.c:408
 #, fuzzy, c-format
 msgid "closing prior pipe"
 msgstr "затвар� �е каталогът %s"
 
-#: src/split.c:411
+#: src/split.c:410
 #, fuzzy, c-format
 msgid "closing output pipe"
 msgstr "затвар�не на изходни� файл %s"
 
-#: src/split.c:415
+#: src/split.c:414
 #, fuzzy, c-format
 msgid "moving input pipe"
 msgstr "затвар�не на входни� файл %s"
 
-#: src/split.c:417
+#: src/split.c:416
 #, fuzzy, c-format
 msgid "closing input pipe"
 msgstr "затвар�не на входни� файл %s"
 
-#: src/split.c:422
+#: src/split.c:421
 #, fuzzy, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr "неу�пешно изпълнение на командата %s"
 
-#: src/split.c:428
+#: src/split.c:427
 #, fuzzy, c-format
 msgid "failed to close input pipe"
 msgstr "каталогът %s не може да �е затвори"
 
-#: src/split.c:464
+#: src/split.c:463
 #, c-format
 msgid "waiting for child process"
 msgstr ""
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr ""
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr ""
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr ""
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr "не може да �е цепи по повече от един начин"
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, fuzzy, c-format
 msgid "%s: invalid number of chunks"
 msgstr "%s: неправилен брой �екунди"
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, fuzzy, c-format
 msgid "%s: invalid chunk number"
 msgstr "%s: недопу�тимо чи�ло"
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr "%s: неправилна дължина на �уфик�"
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr "%s: неправилен брой байтове"
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr "%s: неправилен брой редове"
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, c-format
 msgid "line count option -%s%c... is too large"
 msgstr "опци�та за брой редове -%s%c... е твърде гол�мa"
 
-#: src/split.c:1248
+#: src/split.c:1298
 #, fuzzy, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr "неправилен начален номер на ред: %s"
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, fuzzy, c-format
 msgid "%s: invalid IO block size"
 msgstr "%s: неправилен размер на файла"
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr ""
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr ""
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, fuzzy, c-format
 msgid "%s: cannot determine file size"
 msgstr "хо�т-името не може да бъде определено"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr ""
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, fuzzy, c-format
 msgid "failed to canonicalize %s"
 msgstr "не може да �е отвори %s"
 
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, fuzzy, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr "внимание: неразпозната команда � обратна наклонена черта „\\%c“"
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, c-format
 msgid "%s: invalid directive"
 msgstr "%s: неправилна команда"
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, c-format
 msgid "warning: backslash at end of format"
 msgstr "внимание: обратна наклонена черта в кра� на форматен низ"
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr ""
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, c-format
 msgid "cannot read file system information for %s"
 msgstr "не може да �е прочете от файловата �и�тема информаци� за %s"
 
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, fuzzy, c-format
 msgid "cannot stat standard input"
 msgstr "затвар�не на �тандартни� вход"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -9755,7 +9767,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -9763,30 +9775,30 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, c-format
 msgid "Context: %C\n"
 msgstr ""
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -9794,11 +9806,11 @@ msgid ""
 " Birth: %w\n"
 msgstr ""
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
 msgstr ""
 
-#: src/stat.c:1356
+#: src/stat.c:1418
 #, fuzzy
 msgid ""
 "  -L, --dereference     follow links\n"
@@ -9810,14 +9822,14 @@ msgstr ""
 "  -f, --file-system     извежда �ъ�то�нието на файловата �и�тема, вме�то на "
 "файла\n"
 
-#: src/stat.c:1360
+#: src/stat.c:1422
 #, fuzzy
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 "  -c  --format=ФОРМ�Т   да �е използва по�очени�т ФОРМ�Т, вме�то "
@@ -9831,7 +9843,7 @@ msgstr ""
 "                          �ко и�кате нов ред, вмъкнете \\n във ФОРМ�Т.\n"
 "  -t, --terse           информаци�та да �е извежда в �бита форма\n"
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 #, fuzzy
 msgid ""
 "\n"
@@ -9851,7 +9863,7 @@ msgstr ""
 "  %b   Брой заделени блокове (вж. %B)\n"
 "  %B   Размерът в байтове на в�еки блок, �ъобщен от %b\n"
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 #, fuzzy
 msgid ""
 "  %d   device number in decimal\n"
@@ -9868,7 +9880,7 @@ msgstr ""
 "  %g   �омер на групата на �об�твеника\n"
 "  %G   Име на групата на �об�твеника\n"
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 #, fuzzy
 msgid ""
 "  %h   number of hard links\n"
@@ -9878,8 +9890,8 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 "  %h   Брой твърди връзки\n"
 "  %i   �омер на i-възел\n"
@@ -9890,7 +9902,7 @@ msgstr ""
 "  %t   Гол�м ше�тнаде�етичен номер на у�трой�тво\n"
 "  %T   Малък ше�тнаде�етичен номер на у�трой�тво\n"
 
-#: src/stat.c:1399
+#: src/stat.c:1461
 #, fuzzy
 msgid ""
 "  %u   user ID of owner\n"
@@ -9899,10 +9911,10 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 "  %u   Потребител�ки номер на �об�твеника\n"
@@ -9915,7 +9927,7 @@ msgstr ""
 "  %Z   Време на по�ледна пром�на в �екунди от Епохата\n"
 "\n"
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 #, fuzzy
 msgid ""
 "Valid format sequences for file systems:\n"
@@ -9934,7 +9946,7 @@ msgstr ""
 "  %d   Свободни файлови възли във файловата �и�тема\n"
 "  %f   Свободни блокове във файловата �и�тема\n"
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 #, fuzzy
 msgid ""
 "  %i   file system ID in hex\n"
@@ -10003,22 +10015,27 @@ msgid ""
 "and are thus unaffected by 'stdbuf' settings.\n"
 msgstr ""
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, fuzzy, c-format
 msgid "failed to find %s"
 msgstr "не може да �е отвори %s"
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, c-format
 msgid "failed to update the environment with %s"
 msgstr ""
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr ""
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, c-format
+msgid "you must specify a buffering mode option"
+msgstr ""
+
+#: src/stty.c:516
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -10029,11 +10046,11 @@ msgstr ""
 "    или:    %s [-F УСТРОЙСТВО] [--file=УСТРОЙСТВО] [-a|--all]\n"
 "    или:    %s [-F УСТРОЙСТВО] [--file=УСТРОЙСТВО] [-g|--save]\n"
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
 msgstr ""
 
-#: src/stty.c:525
+#: src/stty.c:528
 #, fuzzy
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
@@ -10048,7 +10065,7 @@ msgstr ""
 "  -F, --file=УСТРОЙСТВО отвар� и използва по�оченото УСТРОЙСТВО вме�то �тд."
 "вход\n"
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
@@ -10059,7 +10076,7 @@ msgstr ""
 "на�тройка.\n"
 "Кои на�тройки �а допу�тими зави�и от използваната �и�тема.\n"
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -10074,7 +10091,7 @@ msgstr ""
 "   eof З��К      З��К ще изпрати �игнал край на файл (ще прекрати входа)\n"
 "   eol З��К      З��К ще завърши реда\n"
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -10086,7 +10103,7 @@ msgstr ""
 "   intr З��К     З��К ще изпрати �игнал за прекъ�ване\n"
 "   kill З��К     З��К ще изтрие текущи� ред\n"
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -10099,7 +10116,7 @@ msgstr ""
 " * rprnt З��К    З��К ще пречертае текущи� ред\n"
 "   start З��К    З��К ще възобнови извеждането, �лед като е било прекъ�нато\n"
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -10111,7 +10128,7 @@ msgstr ""
 " * swtch З��К    З��К ще превключи на друг �лой на обвивката (shell layer)\n"
 " * werase З��К   З��К ще изтрие по�ледната въведена дума\n"
 
-#: src/stty.c:562
+#: src/stty.c:565
 #, fuzzy
 msgid ""
 "\n"
@@ -10126,7 +10143,7 @@ msgstr ""
 " * cols N        казва на �дрото, че терминалът има N �тълба\n"
 " * columns N     �ъщото като cols N\n"
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -10139,7 +10156,7 @@ msgstr ""
 "   min N         � -icanon по�очва поне N знака за завършено четене\n"
 "   ospeed N      по�очва �коро�т на изхода N бода\n"
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -10153,7 +10170,7 @@ msgstr ""
 "   time N       � -icanon по�очва прекъ�ване при четене до N де�ети от "
 "�екундата\n"
 
-#: src/stty.c:581
+#: src/stty.c:584
 #, fuzzy
 msgid ""
 "\n"
@@ -10171,7 +10188,7 @@ msgstr ""
 " * [-]crtscts    позвол�ва диалог (handshaking) RTS/CTS\n"
 "   csN           по�очва размер на знаците до N бита, N е от 5 до 8\n"
 
-#: src/stty.c:590
+#: src/stty.c:593
 #, fuzzy
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
@@ -10180,6 +10197,7 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 "   [-]cstopb     използва два �топ-бита на знак (един � „-“)\n"
 "   [-]hup        изпраща �игнал за уви�ване, ako в�ички проце�и затвор�т "
@@ -10188,7 +10206,7 @@ msgstr ""
 "   [-]parenb     генерира на изхода и очаква на входа бит за четно�т\n"
 "   [-]parodd     по�очва текова четно�т (четна � „-“)\n"
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -10205,7 +10223,7 @@ msgstr ""
 "   [-]ignbrk     пренебрегва знаците за прекъ�ване\n"
 "   [-]igncr      пренебрегва знаците за връщане на кур�ора\n"
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -10220,12 +10238,12 @@ msgstr ""
 "   [-]inpck      позвол�ва проверка за четно�тта на входа\n"
 "   [-]istrip     изчи�тва �тарши� (8-ми�) бит на входните знаци\n"
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr ""
 " * [-]iutf8      да �е предполага, че входните знаци �а кодирани в UTF-8\n"
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -10243,7 +10261,7 @@ msgstr ""
 "   [-]parmrk     маркира грешките по четно�т (� по�ледователно�т 255-0)\n"
 "   [-]tandem     �ъщото като [-]ixoff\n"
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -10259,10 +10277,11 @@ msgstr ""
 " * ffN           �тил за задържане на код за нова �траница, N е 0 или 1\n"
 " * nlN           �тил за задържане на код за нов ред, N е 0 или 1\n"
 
-#: src/stty.c:631
+#: src/stty.c:635
+#, fuzzy
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
@@ -10279,7 +10298,7 @@ msgstr ""
 "ред\n"
 " * [-]onlret     кодът за нов ред о�ъще�тв�ва връщане на кур�ора\n"
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -10297,7 +10316,7 @@ msgstr ""
 " * vtN           �тил за задържане на кодове за вертик. табулаци�, N е 0 или "
 "1\n"
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -10312,7 +10331,7 @@ msgstr ""
 " * crtkill       убива реда �поред на на�тройките echoprt и echoe\n"
 " * -crtkill      убива реда �поред на на�тройките echoctl и echok\n"
 
-#: src/stty.c:654
+#: src/stty.c:658
 #, fuzzy
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
@@ -10327,7 +10346,7 @@ msgstr ""
 "   [-]echoe      �ъщото като [-]crterase\n"
 "   [-]echok      ехо на нов ред �лед код за убиване\n"
 
-#: src/stty.c:661
+#: src/stty.c:665
 #, fuzzy
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
@@ -10344,7 +10363,7 @@ msgstr ""
 "   [-]iexten     позвол�ва управл�ващите кодове, които не отговар�т на "
 "POSIX\n"
 
-#: src/stty.c:668
+#: src/stty.c:672
 #, fuzzy
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
@@ -10364,7 +10383,7 @@ msgstr ""
 " * [-]xcase      � icanon извежда главните букви като предше�твани от „\\“ "
 "малки\n"
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -10378,7 +10397,7 @@ msgstr ""
 "   cbreak        �ъщото като -icanon\n"
 "   -cbreak       �ъщото като icanon\n"
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -10392,7 +10411,7 @@ msgstr ""
 "   -cooked       �ъщото като raw\n"
 "   crt           �ъщото като echoe echoctl echoke\n"
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -10407,7 +10426,7 @@ msgstr ""
 "�тойно�т\n"
 "   evenp         �ъщото като parenb -parodd cs7\n"
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -10423,7 +10442,7 @@ msgstr ""
 "   nl            �ъщото като -icrnl -onlcr\n"
 "   -nl           �ъщото като icrnl -inlcr -igncr onlcr -ocrnl -onlret\n"
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -10437,7 +10456,7 @@ msgstr ""
 "   pass8         �ъщото като -parenb -istrip cs8\n"
 "   -pass8        �ъщото като parenb istrip cs7\n"
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -10449,7 +10468,7 @@ msgstr ""
 "                 -imaxbel -opost -isig -icanon -xcase min 1 time 0\n"
 "   -raw          �ъщото като\n"
 
-#: src/stty.c:716
+#: src/stty.c:720
 #, fuzzy
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
@@ -10466,7 +10485,7 @@ msgstr ""
 "                 -xcase -tostop -echoprt echoctl echoke, в�ички управл�ващи\n"
 "                 знаци запазват �тандартната �и �тойно�т.\n"
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -10481,12 +10500,12 @@ msgstr ""
 "като ^c, 0x37, 0177 или 127; �пециалните �тойно�ти ^- и undef �е използват,\n"
 "за да �е забран�т �ъответните управл�ващи знаци.\n"
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, c-format
 msgid "only one device may be specified"
 msgstr "може да �е по�очва �амо едно у�трой�тво"
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
@@ -10495,43 +10514,43 @@ msgstr ""
 "опциите за подробен и stty-четим изходен �тил\n"
 "взаимно �е изключват"
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr "при по�очване на изходен �тил не може да �е на�тройват режими"
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr "%s: не може да �е презададе режимът non-blocking"
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, c-format
 msgid "invalid argument %s"
 msgstr "неправилен аргумент %s"
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, c-format
 msgid "missing argument to %s"
 msgstr "лип�ва аргумент за %s"
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, c-format
 msgid "invalid line discipline %s"
 msgstr "неправилна ди�циплина на редовете %s"
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr "%s: не може да �е о�ъще�тв�т в�ички пои�кани операции"
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr "%s: н�ма информаци� за размера на това у�трой�тво"
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, c-format
 msgid "invalid integer argument %s"
 msgstr "неправилен чи�лов аргумент %s"
@@ -10590,7 +10609,7 @@ msgstr "      --help     извежда тази Ñ�правка и завършÐ
 msgid "      --version  output version information and exit\n"
 msgstr "      --version  извежда информаци� за вер�и�та и завършва\n"
 
-#: src/system.h:544
+#: src/system.h:543
 #, fuzzy
 msgid ""
 "\n"
@@ -10598,15 +10617,15 @@ msgid ""
 msgstr ""
 "�ргументите, задължителни за дългите опции, �а задължителни и за къ�ите.\n"
 
-#: src/system.h:552
+#: src/system.h:551
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -10615,36 +10634,33 @@ msgid ""
 "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n"
 msgstr ""
 
-#: src/system.h:571
-#, fuzzy, c-format
+#: src/system.h:570
+#, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
+"%s online help: <%s>\n"
 msgstr ""
-"\n"
-"Съобщавайте за програмни грешки на <%s>.\n"
-"За грешки в българ�ки� превод на <dict@fsa-bg.org>\n"
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr ""
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr ""
 
-#: src/system.h:596
+#: src/system.h:591
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Използвайте „%s --help“ за повече информаци�.\n"
 
-#: src/system.h:628
+#: src/system.h:633
 #, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -10744,18 +10760,16 @@ msgstr ""
 
 #: src/tail.c:270
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
 
 #: src/tail.c:274
+#, fuzzy
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 "  -f, --follow[={name|descriptor}]\n"
@@ -10765,18 +10779,17 @@ msgstr ""
 "еквивалентни\n"
 "  -F                       �ъщото като --follow=name --retry\n"
 
-#: src/tail.c:281
+#: src/tail.c:280
 #, fuzzy, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
 "  -n, --lines=N            извежда по�ледните N реда вме�то по�ледните %d\n"
 "      --max-unchanged-stats=N\n"
@@ -10788,14 +10801,12 @@ msgstr ""
 "                           преименуван (което е обичайно при завъртане на\n"
 "                           журналните файлове)\n"
 
-#: src/tail.c:294
+#: src/tail.c:293
 #, fuzzy
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 "      --pid=PID            � -f завършва �лед като проце�ът � номер PID "
 "умре\n"
@@ -10805,16 +10816,16 @@ msgstr ""
 "                           (�тандартно 1.0)\n"
 "  -v, --verbose            винаги извежда заглави� � файловите имена\n"
 
-#: src/tail.c:301
+#: src/tail.c:298
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 
-#: src/tail.c:310
+#: src/tail.c:307
 #, fuzzy
 msgid ""
 "\n"
@@ -10832,7 +10843,7 @@ msgstr ""
 "�уфик�-множител: b за 512, k за 1024, m за 1024*1024.\n"
 "\n"
 
-#: src/tail.c:319
+#: src/tail.c:316
 #, fuzzy
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
@@ -10850,167 +10861,176 @@ msgstr ""
 "многократно файла, за да провери дали той не е бил от�транен или �ъздаден\n"
 "нов файл �ъ� �ъщото име от друга програма.\n"
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr "Затвар�не на %s (файлов де�криптор=%d)"
 
-#: src/tail.c:453
-#, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr "%s: не може да �е отиде на отно�ително отме�тване %s във файла"
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr "%s: не може да �е отиде на отме�тване %s отно�но кра� на файла"
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr ""
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
 "reverting to polling"
 msgstr ""
 
-#: src/tail.c:963
+#: src/tail.c:965
+#, fuzzy, c-format
+msgid "%s has been replaced with a symbolic link. giving up on this name"
+msgstr ""
+"%s е бил заменен � файл, който е недо�тъпен за tail; tail повече н�ма да го "
+"�леди"
+
+#: src/tail.c:980
 #, c-format
 msgid "%s has become inaccessible"
 msgstr "%s е �танал недо�тъпен"
 
-#: src/tail.c:980
+#: src/tail.c:997
 #, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr ""
 "%s е бил заменен � файл, който е недо�тъпен за tail; tail повече н�ма да го "
 "�леди"
 
-#: src/tail.c:989
+#: src/tail.c:1006
 #, fuzzy, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr ""
 "%s е бил заменен � файл, който е недо�тъпен за tail; tail повече н�ма да го "
 "�леди"
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, c-format
 msgid "%s has become accessible"
 msgstr "%s е �танал до�тъпен"
 
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr "%s �е е по�вил;  �ледва �е кра�т на нови� файл"
 
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr "%s е бил заменен; �ледва �е кра�т на нови� файл"
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr "%s: не може да �е �мени режимът non-blocking"
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr "%s: файлът е �ъкратен"
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr "н�ма повече файлове"
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, fuzzy, c-format
 msgid "cannot watch parent directory of %s"
 msgstr "не може да �е намери текущи�т каталог (�ега %s)"
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, fuzzy, c-format
 msgid "inotify resources exhausted"
 msgstr "паметта е изчерпана"
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, fuzzy, c-format
 msgid "cannot watch %s"
 msgstr "не може да �е въздей�тва на %s"
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr ""
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, fuzzy, c-format
 msgid "error reading inotify event"
 msgstr "грешка при четене на %s"
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr ""
 "%s: не може да �е �ледва кра� на този тип файлове; tail н�ма да �леди този "
 "файл"
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, c-format
 msgid "number in %s is too large"
 msgstr "номерът в %s е твърде гол�м"
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr "%s: неправилен мак�имален брой до�тъпи без пром�на между отвар�ни�та"
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr "%s: неправилен номер на проце�"
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr "%s: неправилен брой �екунди"
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr "опци�, използване в грешен контек�т -- %c"
 
-#: src/tail.c:2034
+#: src/tail.c:2096
+#, fuzzy, c-format
+msgid "warning: --retry ignored; --retry is useful only when following"
+msgstr ""
+"внимание: пренебрегва �е номера на проце�; --pid=PID е полезно �амо при "
+"�ледване"
+
+#: src/tail.c:2100
 #, c-format
-msgid "warning: --retry is useful mainly when following by name"
-msgstr "внимание: опци�та --retry обикновено е полезна �амо � --follow=name"
+msgid "warning: --retry only effective for the initial open"
+msgstr ""
 
-#: src/tail.c:2038
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
 msgstr ""
 "внимание: пренебрегва �е номера на проце�; --pid=PID е полезно �амо при "
 "�ледване"
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr "внимание: --pid=PID не �е поддържа на тази �и�тема"
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, c-format
 msgid "cannot follow %s by name"
 msgstr "не може да �е �ледва %s �поред името"
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr "внимание: безкрайното �ледване на �тандартни� вход е безполезно"
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr ""
@@ -11284,17 +11304,17 @@ msgstr "излишен аргумент %s"
 msgid "warning: sigprocmask"
 msgstr ""
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr ""
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr ""
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
@@ -11303,32 +11323,29 @@ msgstr ""
 "Използване: %s КОМ��Д� [�РГУМЕ�Т]...\n"
 "    или:    %s ОПЦИЯ\n"
 
-#: src/timeout.c:229
-#, fuzzy
+#: src/timeout.c:232
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
 msgstr ""
-"�ргументите, задължителни за дългите опции, �а задължителни и за къ�ите.\n"
 
-#: src/timeout.c:235
+#: src/timeout.c:238
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 msgid ""
 "\n"
 "DURATION is a floating point number with an optional suffix:\n"
@@ -11336,7 +11353,7 @@ msgid ""
 "days.\n"
 msgstr ""
 
-#: src/timeout.c:259
+#: src/timeout.c:262
 msgid ""
 "\n"
 "If the command times out, and --preserve-status is not set, then exit with\n"
@@ -11347,17 +11364,17 @@ msgid ""
 "case the exit status is 128+9 rather than 124.\n"
 msgstr ""
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr ""
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, fuzzy, c-format
 msgid "error waiting for command"
 msgstr "грешка при запи� в %s"
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr ""
@@ -11747,7 +11764,7 @@ msgstr ""
 #: src/truncate.c:115
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 
 #: src/truncate.c:121
@@ -11832,12 +11849,12 @@ msgstr ""
 "Без Ф�ЙЛ или ако Ф�ЙЛ е -, чете от �тандартни� вход.\n"
 "\n"
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr "%s: входните данни �ъдържат нечетен брой лек�еми"
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr "%s: входни�т файл �ъдържа цикъл:"
@@ -11936,12 +11953,12 @@ msgstr "табулациите �а твърде отдалечени"
 msgid "tab stop value is too large"
 msgstr "табулаци�та е твърде дълга"
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr "Използване: %s [ОПЦИЯ]... [ВХОД [ИЗХОД]]\n"
 
-#: src/uniq.c:138
+#: src/uniq.c:174
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
 "writing to OUTPUT (or standard output).\n"
@@ -11949,40 +11966,45 @@ msgid ""
 "With no options, matching lines are merged to the first occurrence.\n"
 msgstr ""
 
-#: src/uniq.c:147
+#: src/uniq.c:183
+#, fuzzy
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
 msgstr ""
 "  -c, --count           редовете да �е предхождат от брой �рещани�\n"
 "  -d, --repeated        извежда �амо повтар�щите �е редове\n"
 
-#: src/uniq.c:151
-#, fuzzy
+#: src/uniq.c:187
+msgid ""
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
+msgstr ""
+
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr ""
+
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
+msgstr ""
+
+#: src/uniq.c:199
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
 "  -i, --ignore-case     ignore differences in case when comparing\n"
 "  -s, --skip-chars=N    avoid comparing the first N characters\n"
 "  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
-msgstr ""
-"  -D, --all-repeated[=delimit-method] извежда в�ички повтар�щи �е редове\n"
-"                        delimit-method={none(по подразбиране),prepend,"
-"separate}\n"
-"                        Раздел�нето �е прави � празни редове.\n"
-"  -f, --skip-fields=N   не �равн�ва първите N полета\n"
-"  -i, --ignore-case     не различава големите от малките букви\n"
-"  -s, --skip-chars=N    не �равн�ва първите N знака\n"
-"  -u, --unique          извежда �амо редовете, които не �е повтар�т\n"
-
-#: src/uniq.c:161
+msgstr ""
+
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr "  -w, --check-chars=N   �равн�ва по не повече от N знака в редовете\n"
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 #, fuzzy
 msgid ""
 "\n"
@@ -11993,7 +12015,7 @@ msgstr ""
 "Полето �е �ъ�тои от б�ло поле, �ледвано от видими знаци.\n"
 "Fields are skipped before chars.\n"
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 msgid ""
 "\n"
 "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n"
@@ -12001,24 +12023,35 @@ msgid ""
 "Also, comparisons honor the rules specified by 'LC_COLLATE'.\n"
 msgstr ""
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, c-format
 msgid "too many repeated lines"
 msgstr "твърде много повторени редове"
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
 msgstr "неправилен брой полета за пропу�кане"
 
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
 msgstr "неправилен брой байтове за пропу�кане"
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
 msgstr "неправилен брой знаци за �равн�ване"
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr ""
+
+#: src/uniq.c:652
+#, fuzzy, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr ""
+"без�ми�лено е да �е извеждат в�ички повтар�щи �е редове и бро� �рещани�"
+
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr ""
@@ -12041,11 +12074,6 @@ msgstr ""
 "От�тран�ва по�очени� Ф�ЙЛ по�ред�твом �и�темната функци� „unlink“.\n"
 "\n"
 
-#: src/unlink.c:86
-#, c-format
-msgid "cannot unlink %s"
-msgstr "неу�пешно изпълнение на unlink за %s"
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -12090,7 +12118,7 @@ msgstr[1] "%lu потребител�"
 msgid ",  load average: %.2f"
 msgstr ",  �редно натоварване: %.2f"
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, fuzzy, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -12106,19 +12134,19 @@ msgstr ""
 "на файл.\n"
 "\n"
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
 "an uninterruptible sleep state also contribute to the load average.\n"
 msgstr ""
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr ""
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, fuzzy, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
@@ -12358,177 +12386,88 @@ msgstr ""
 "�епрекъ�нато извежда ред, �ъ�то�щ �е от по�очените �ИЗ(ове) или „y“.\n"
 "\n"
 
-#, fuzzy
-#~ msgid "  returning value: '%s'\n"
-#~ msgstr "�ъздава �е файл %s\n"
-
-#, fuzzy
-#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n"
-#~ msgstr "Използване: %s [ОПЦИЯ] ИМЕ...\n"
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: неправилна опци� -- %c\n"
 
-#, fuzzy
-#~ msgid "no valid suffix found\n"
-#~ msgstr "%s: неправилна дължина на �уфик�"
+#~ msgid "block size"
+#~ msgstr "блокови�т размер"
 
 #~ msgid ""
 #~ "\n"
-#~ "Examples:\n"
-#~ "  %s /usr/bin/sort       Output \"sort\".\n"
-#~ "  %s include/stdio.h .h  Output \"stdio\".\n"
+#~ "This is free software.  You may redistribute copies of it under the terms "
+#~ "of\n"
+#~ "the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n"
+#~ "There is NO WARRANTY, to the extent permitted by law.\n"
+#~ "\n"
 #~ msgstr ""
 #~ "\n"
-#~ "Примери:\n"
-#~ "  %s /usr/bin/sort       извежда „sort“.\n"
-#~ "  %s include/stdio.h .h  извежда „stdio“.\n"
-
-#~ msgid "reading %s"
-#~ msgstr "чете �е %s"
-
-#~ msgid "writing %s"
-#~ msgstr "запи�ва �е %s"
+#~ "Това е �вободен �офтуер.  Можете да разпро�тран�вате негови копи� "
+#~ "�ъгла�но\n"
+#~ "у�лови�та на О�новната общодо�тъпна лицензи� на Г�У\n"
+#~ "      <http://www.gnu.org/licenses/gpl.html>.\n"
+#~ "�е �е дават �ИК�КВИ Г�Р��ЦИИ до �тепента, позвол�вана от закона.\n"
 
-#~ msgid "closing %s"
-#~ msgstr "затвар� �е %s"
+#~ msgid "invalid argument: %s"
+#~ msgstr "неправилен аргумент: %s"
 
-#~ msgid "accessing %s"
-#~ msgstr "до�тъп до %s"
+#~ msgid "invalid %s `%s'"
+#~ msgstr "неправилен %s „%s“"
 
-#~ msgid "opening %s"
-#~ msgstr "отвар�не на %s"
+#~ msgid "invalid character following %s in `%s'"
+#~ msgstr "неправилен пи�мен знак, �ледващ  %s в „%s“"
 
-#~ msgid ""
-#~ "Usage: %s NAME\n"
-#~ "  or:  %s OPTION\n"
-#~ msgstr ""
-#~ "Използване: %s ИМЕ\n"
-#~ "    или:    %s ОПЦИЯ\n"
+#~ msgid "%s `%s' too large"
+#~ msgstr "%s „%s“ е твърде дълго"
 
-#, fuzzy
 #~ msgid ""
-#~ "  none, off       never make backups (even if --backup is given)\n"
-#~ "  numbered, t     make numbered backups\n"
-#~ "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
-#~ "  simple, never   always make simple backups\n"
+#~ "  -w, --wrap=COLS       Wrap encoded lines after COLS character (default "
+#~ "76).\n"
+#~ "                        Use 0 to disable line wrapping.\n"
 #~ "\n"
-#~ msgstr ""
-#~ "  none, off       никога да не �е прав�т резервни копи� (о�вен при --"
-#~ "backup)\n"
-#~ "  numbered, t     да �е прав�т номерирани резервни копи�\n"
-#~ "  existing, nil   номерирани, ако вече �а правени номерирани, а про�ти "
-#~ "иначе\n"
-#~ "  simple, never   винаги да �е прав�т про�ти резервни копи�\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "WARNING: --page-increment is deprecated; use --line-increment instead"
-#~ msgstr "опци�та --allow-missing е о�тар�ла; ползвайте --retry вме�то не�"
-
-#~ msgid "All arguments to long options are mandatory for short options.\n"
-#~ msgstr ""
-#~ "В�ички аргументи, задължителни за дългите опции, �а задължителни и за "
-#~ "къ�ите.\n"
-
-#, fuzzy
-#~ msgid ""
+#~ "  -d, --decode          Decode data.\n"
+#~ "  -i, --ignore-garbage  When decoding, ignore non-alphabet characters.\n"
 #~ "\n"
-#~ "RADIX is d for decimal, o for octal, x for hexadecimal or n for none.\n"
-#~ "BYTES is hexadecimal with 0x or 0X prefix, and may have a multiplier "
-#~ "suffix:\n"
-#~ "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
-#~ "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n"
-#~ "Adding a z suffix to any type displays printable characters at the end of "
-#~ "each\n"
-#~ "output line.\n"
 #~ msgstr ""
+#~ "  -w, --wrap=ШИРИ��     Прена�� кодираните редове �лед ШИРИ�� знаци "
+#~ "(подразбира\n"
+#~ "                        �е 76).  Използвайте 0, за да забраните "
+#~ "прена��нето.\n"
+#~ "\n"
+#~ "  -d, --decode          Декодира данните.\n"
+#~ "  -i, --ignore-garbage  При декодиране пренебрегва небуквените знаци.\n"
 #~ "\n"
-#~ "Б�З� е d за де�етична бройна �и�тема, o за о�мична, x за\n"
-#~ "ше�тнаде�етична или n за никаква.  Б�ЙТОВЕ е ше�тнаде�етично, ако има\n"
-#~ "префик� 0x или 0X и �е умножава по 512 при �уфик� b, по 1024 при k и\n"
-#~ "по 1048576 при m.  �ко �е добави �уфик� z, в кра� на в�еки изведен ред\n"
-#~ "�е добав� изображение на входните знаци.  "
-
-#, fuzzy
-#~ msgid ""
-#~ "Option --string without a number implies 3; option --width without a "
-#~ "number\n"
-#~ "implies 32.  By default, od uses -A o -t oS -w16.\n"
-#~ msgstr ""
-#~ "--string без чи�ло предполага 3.  --width без чи�ло предполага 32.\n"
-#~ "По подразбиране od ползва -A o -t d2 -w16. \n"
-
-#~ msgid "Usage: %s [OPTION]... FILE\n"
-#~ msgstr "Използване: %s [ОПЦИЯ]... Ф�ЙЛ\n"
-
-#~ msgid "Password:"
-#~ msgstr "Парола:"
-
-#~ msgid "getpass: cannot open /dev/tty"
-#~ msgstr "getpass: не може да �е отвори /dev/tty"
-
-#~ msgid "cannot set groups"
-#~ msgstr "не може да �е зададат групите"
-
-#~ msgid "cannot set group id"
-#~ msgstr "не може да �е зададе групата"
-
-#~ msgid "cannot set user id"
-#~ msgstr "не може да �е зададе потребител�т"
-
-#~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n"
-#~ msgstr "Използване: %s [ОПЦИЯ]... [-] [ПОТР [�РГ]...]\n"
 
 #~ msgid ""
-#~ "Change the effective user id and group id to that of USER.\n"
-#~ "\n"
-#~ "  -, -l, --login               make the shell a login shell\n"
-#~ "  -c, --command=COMMAND        pass a single COMMAND to the shell with -"
-#~ "c\n"
-#~ "  -f, --fast                   pass -f to the shell (for csh or tcsh)\n"
-#~ "  -m, --preserve-environment   do not reset environment variables\n"
-#~ "  -p                           same as -m\n"
-#~ "  -s, --shell=SHELL            run SHELL if /etc/shells allows it\n"
+#~ "      --help            Display this help and exit.\n"
+#~ "      --version         Output version information and exit.\n"
 #~ msgstr ""
-#~ "Прави дей�тващите (effective) номера на потребител и група да �а тези на "
-#~ "ПОТР.\n"
-#~ "\n"
-#~ "  -, -l, --login               прави обвивката да бъде вход�ща обвивка\n"
-#~ "  -c, --command=КОМ��Д�        подава � -c на обвивката не�ъ�тавна "
-#~ "КОМ��Д�\n"
-#~ "  -f, --fast                   подава -f на обвивката (за csh и tcsh)\n"
-#~ "  -m, --preserve-environment   не преу�танов�ва променливите от "
-#~ "обкръжението\n"
-#~ "  -p                           �ъщото като -m\n"
-#~ "  -s, --shell=ОБВИВК�          �тартира ОБВИВК�, ако /etc/shells "
-#~ "позвол�ва това\n"
+#~ "      --help            Извежда тази �правка и завършва.\n"
+#~ "      --version         Извежда информаци� за вер�и�та и завършва.\n"
 
 #~ msgid ""
 #~ "\n"
-#~ "A mere - implies -l.   If USER not given, assume root.\n"
+#~ "Examples:\n"
+#~ "  %s /usr/bin/sort       Output \"sort\".\n"
+#~ "  %s include/stdio.h .h  Output \"stdio\".\n"
 #~ msgstr ""
 #~ "\n"
-#~ "Само - влече -l.   �ко не е по�очен ПОТР, приема �е root.\n"
-
-#~ msgid "user %s does not exist"
-#~ msgstr "не �ъще�твува потребител %s"
-
-#~ msgid "incorrect password"
-#~ msgstr "неправилна парола"
-
-#~ msgid "using restricted shell %s"
-#~ msgstr "използва �е ограничената обвивка %s"
+#~ "Примери:\n"
+#~ "  %s /usr/bin/sort       извежда „sort“.\n"
+#~ "  %s include/stdio.h .h  извежда „stdio“.\n"
 
-#~ msgid "warning: cannot change directory to %s"
-#~ msgstr "внимание: каталогът не може да �е �мени на %s"
+#~ msgid "Usage: %s [OPTION] [FILE]...\n"
+#~ msgstr "Използване: %s [ОПЦИЯ] [Ф�ЙЛ]...\n"
 
-#, fuzzy
 #~ msgid ""
 #~ "Change the group of each FILE to GROUP.\n"
 #~ "With --reference, change the group of each FILE to that of RFILE.\n"
 #~ "\n"
 #~ "  -c, --changes          like verbose but report only when a change is "
 #~ "made\n"
-#~ "  -f, --silent, --quiet  suppress most error messages\n"
-#~ "  -v, --verbose          output a diagnostic for every file processed\n"
+#~ "      --dereference      affect the referent of each symbolic link (this "
+#~ "is\n"
+#~ "                         the default), rather than the symbolic link "
+#~ "itself\n"
 #~ msgstr ""
 #~ "Прави ГРУП� да бъде групата на в�еки Ф�ЙЛ.\n"
 #~ "При --reference прави групата на в�еки Ф�ЙЛ да бъде �ъщата като тази на "
@@ -12542,14 +12481,6 @@ msgstr ""
 #~ "връзки\n"
 
 #~ msgid ""
-#~ "      --no-preserve-root  do not treat `/' specially (the default)\n"
-#~ "      --preserve-root     fail to operate recursively on `/'\n"
-#~ msgstr ""
-#~ "      --no-preserve-root да не �е обработва „/“ по-о�обено (по "
-#~ "подразбиране)\n"
-#~ "      --preserve-root    да не �е дей�тва рекур�ивно от „/“\n"
-
-#~ msgid ""
 #~ "  -f, --silent, --quiet  suppress most error messages\n"
 #~ "      --reference=RFILE  use RFILE's group rather than specifying a\n"
 #~ "                         GROUP value\n"
@@ -12563,6 +12494,9 @@ msgstr ""
 #~ "  -v, --verbose          извежда диагно�тично �ъобщение за в�еки "
 #~ "обработен файл\n"
 
+#~ msgid "%s"
+#~ msgstr "%s"
+
 #~ msgid ""
 #~ "Change the mode of each FILE to MODE.\n"
 #~ "\n"
@@ -12575,6 +12509,14 @@ msgstr ""
 #~ "промени\n"
 
 #~ msgid ""
+#~ "      --no-preserve-root  do not treat `/' specially (the default)\n"
+#~ "      --preserve-root     fail to operate recursively on `/'\n"
+#~ msgstr ""
+#~ "      --no-preserve-root да не �е обработва „/“ по-о�обено (по "
+#~ "подразбиране)\n"
+#~ "      --preserve-root    да не �е дей�тва рекур�ивно от „/“\n"
+
+#~ msgid ""
 #~ "  -f, --silent, --quiet   suppress most error messages\n"
 #~ "  -v, --verbose           output a diagnostic for every file processed\n"
 #~ "      --reference=RFILE   use RFILE's mode instead of MODE values\n"
@@ -12625,96 +12567,14 @@ msgstr ""
 #~ "  -v, --verbose          извежда диагно�тично �ъобщение за в�еки "
 #~ "обработен файл\n"
 
-#~ msgid ""
-#~ "Display the current time in the given FORMAT, or set the system date.\n"
-#~ "\n"
-#~ "  -d, --date=STRING         display time described by STRING, not `now'\n"
-#~ "  -f, --file=DATEFILE       like --date once for each line of DATEFILE\n"
-#~ msgstr ""
-#~ "Извежда текущото време в по�очени� ФОРМ�Т или у�танов�ва датата на "
-#~ "�и�темата.\n"
-#~ "\n"
-#~ "  -d, --date=�ИЗ            извежда времето, по�очено от �ИЗ, вме�то "
-#~ "„now“\n"
-#~ "  -f, --file=Ф�ЙЛД�ТИ       като --date по веднъж за в�еки ред от "
-#~ "Ф�ЙЛД�ТИ\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "SIZE may be (or may be an integer optionally followed by) one of "
-#~ "following:\n"
-#~ "KB 1000, K 1024, MB 1000*1000, M 1024*1024, and so on for G, T, P, E, Z, "
-#~ "Y.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Р�ЗМ �е �ъ�тои от незадължително ц�ло чи�ло, �ледвано от едно от:\n"
-#~ "kB=1000, K=1024, MB=1000*1000, M=1024*1024 и аналогично за G, T, P, E, Z "
-#~ "и Y.\n"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: неправилна опци� -- %c\n"
-
-#~ msgid "block size"
-#~ msgstr "блокови�т размер"
-
-#~ msgid ""
-#~ "\n"
-#~ "This is free software.  You may redistribute copies of it under the terms "
-#~ "of\n"
-#~ "the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n"
-#~ "There is NO WARRANTY, to the extent permitted by law.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Това е �вободен �офтуер.  Можете да разпро�тран�вате негови копи� "
-#~ "�ъгла�но\n"
-#~ "у�лови�та на О�новната общодо�тъпна лицензи� на Г�У\n"
-#~ "      <http://www.gnu.org/licenses/gpl.html>.\n"
-#~ "�е �е дават �ИК�КВИ Г�Р��ЦИИ до �тепента, позвол�вана от закона.\n"
-
-#~ msgid "invalid argument: %s"
-#~ msgstr "неправилен аргумент: %s"
-
-#~ msgid "invalid %s `%s'"
-#~ msgstr "неправилен %s „%s“"
-
-#~ msgid "invalid character following %s in `%s'"
-#~ msgstr "неправилен пи�мен знак, �ледващ  %s в „%s“"
-
-#~ msgid "%s `%s' too large"
-#~ msgstr "%s „%s“ е твърде дълго"
-
-#~ msgid ""
-#~ "  -w, --wrap=COLS       Wrap encoded lines after COLS character (default "
-#~ "76).\n"
-#~ "                        Use 0 to disable line wrapping.\n"
-#~ "\n"
-#~ "  -d, --decode          Decode data.\n"
-#~ "  -i, --ignore-garbage  When decoding, ignore non-alphabet characters.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "  -w, --wrap=ШИРИ��     Прена�� кодираните редове �лед ШИРИ�� знаци "
-#~ "(подразбира\n"
-#~ "                        �е 76).  Използвайте 0, за да забраните "
-#~ "прена��нето.\n"
-#~ "\n"
-#~ "  -d, --decode          Декодира данните.\n"
-#~ "  -i, --ignore-garbage  При декодиране пренебрегва небуквените знаци.\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "      --help            Display this help and exit.\n"
-#~ "      --version         Output version information and exit.\n"
-#~ msgstr ""
-#~ "      --help            Извежда тази �правка и завършва.\n"
-#~ "      --version         Извежда информаци� за вер�и�та и завършва.\n"
+#~ msgid "reading %s"
+#~ msgstr "чете �е %s"
 
-#~ msgid "Usage: %s [OPTION] [FILE]...\n"
-#~ msgstr "Използване: %s [ОПЦИЯ] [Ф�ЙЛ]...\n"
+#~ msgid "writing %s"
+#~ msgstr "запи�ва �е %s"
 
-#~ msgid "%s"
-#~ msgstr "%s"
+#~ msgid "closing %s"
+#~ msgstr "затвар� �е %s"
 
 #~ msgid "cannot create link %s"
 #~ msgstr "не може да �е �ъздаде връзка %s"
@@ -12738,19 +12598,57 @@ msgstr ""
 #~ "�тойно�тите:\n"
 #~ "\n"
 
+#~ msgid "accessing %s"
+#~ msgstr "до�тъп до %s"
+
 #~ msgid "the --reply option is deprecated; use -i or -f instead"
 #~ msgstr "опци�та --reply е о�тар�ла; ползвайте -i или -f вме�то не�"
 
 #~ msgid "invalid format precision"
 #~ msgstr "неправилна точно�т на формат"
 
+#~ msgid ""
+#~ "Display the current time in the given FORMAT, or set the system date.\n"
+#~ "\n"
+#~ "  -d, --date=STRING         display time described by STRING, not `now'\n"
+#~ "  -f, --file=DATEFILE       like --date once for each line of DATEFILE\n"
+#~ msgstr ""
+#~ "Извежда текущото време в по�очени� ФОРМ�Т или у�танов�ва датата на "
+#~ "�и�темата.\n"
+#~ "\n"
+#~ "  -d, --date=�ИЗ            извежда времето, по�очено от �ИЗ, вме�то "
+#~ "„now“\n"
+#~ "  -f, --file=Ф�ЙЛД�ТИ       като --date по веднъж за в�еки ред от "
+#~ "Ф�ЙЛД�ТИ\n"
+
 #~ msgid "unrecognized operand %s=%s"
 #~ msgstr "непознат операнд %s=%s"
 
+#~ msgid "opening %s"
+#~ msgstr "отвар�не на %s"
+
 #~ msgid "the --kilobytes option is deprecated; use -k instead"
 #~ msgstr "опци�та --kilobytes е о�тар�ла; ползвайте -k вме�то не�"
 
 #~ msgid ""
+#~ "Usage: %s NAME\n"
+#~ "  or:  %s OPTION\n"
+#~ msgstr ""
+#~ "Използване: %s ИМЕ\n"
+#~ "    или:    %s ОПЦИЯ\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Examples:\n"
+#~ "  %s /usr/bin/sort  Output \"/usr/bin\".\n"
+#~ "  %s stdio.h        Output \".\".\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Примери:\n"
+#~ "  %s /usr/bin/sort  извежда „/usr/bin“.\n"
+#~ "  %s stdio.h        извежда „.“.\n"
+
+#~ msgid ""
 #~ "WARNING: use --si, not -H; the meaning of the -H option will soon\n"
 #~ "change to be the same as that of --dereference-args (-D)"
 #~ msgstr ""
@@ -12796,12 +12694,15 @@ msgstr ""
 #~ "\n"
 #~ "N може да има �уфик�-множител: b за 512, k за 1024, m за 1024*1024.\n"
 
+#~ msgid "%s: cannot lseek back to original position"
+#~ msgstr "%s: не може да �е отиде на първоначалното м��то във файла"
+
+#~ msgid "cannot reposition file pointer for %s"
+#~ msgstr "не може да �е �мени м��тото на файлови� указател за %s"
+
 #~ msgid "cannot print only user and only group"
 #~ msgstr "не може да �е извежда хем �амо потребител�т, хем �амо групата"
 
-#~ msgid "cannot get supplemental group list"
-#~ msgstr "не може да �е получи �пи�ъка от допълнителни групи"
-
 #~ msgid "strip failed"
 #~ msgstr "strip не у�п�"
 
@@ -12836,6 +12737,20 @@ msgstr ""
 #~ msgstr "�ъздава �е твърда връзка %s => %s"
 
 #~ msgid ""
+#~ "  -n, --no-dereference        treat destination that is a symlink to a\n"
+#~ "                                directory as if it were a normal file\n"
+#~ "  -i, --interactive           prompt whether to remove destinations\n"
+#~ "  -s, --symbolic              make symbolic links instead of hard links\n"
+#~ msgstr ""
+#~ "  -n, --no-dereference        приема цел, ко�то е �имволна връзка към "
+#~ "каталог,\n"
+#~ "                                в�е едно че е нормален файл\n"
+#~ "  -i, --interactive           да �е пита при заме�тване на �ъще�твуващи "
+#~ "файлове\n"
+#~ "  -s, --symbolic              да �е прав�т �имволни връзки вме�то твърди "
+#~ "връзки\n"
+
+#~ msgid ""
 #~ "      --group-directories-first\n"
 #~ "                             group directories before files\n"
 #~ msgstr ""
@@ -12877,6 +12792,41 @@ msgstr ""
 #~ msgid "Usage: %s [OPTION] DIRECTORY...\n"
 #~ msgstr "Използване: %s [ОПЦИЯ] К�Т�ЛОГ...\n"
 
+#~ msgid "All arguments to long options are mandatory for short options.\n"
+#~ msgstr ""
+#~ "В�ички аргументи, задължителни за дългите опции, �а задължителни и за "
+#~ "къ�ите.\n"
+
+#~ msgid ""
+#~ "  -A, --address-radix=RADIX   decide how file offsets are printed\n"
+#~ "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
+#~ msgstr ""
+#~ "  -A, --address-radix=Б�З�    как да �е извежда отме�тването\n"
+#~ "  -j, --skip-bytes=Б�ЙТОВЕ    пропу�ка Б�ЙТОВЕ входни байта в началото\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "RADIX is d for decimal, o for octal, x for hexadecimal or n for none.\n"
+#~ "BYTES is hexadecimal with 0x or 0X prefix, it is multiplied by 512\n"
+#~ "with b suffix, by 1024 with k and by 1048576 with m.  Adding a z suffix "
+#~ "to\n"
+#~ "any type adds a display of printable characters to the end of each line\n"
+#~ "of output.  "
+#~ msgstr ""
+#~ "\n"
+#~ "Б�З� е d за де�етична бройна �и�тема, o за о�мична, x за\n"
+#~ "ше�тнаде�етична или n за никаква.  Б�ЙТОВЕ е ше�тнаде�етично, ако има\n"
+#~ "префик� 0x или 0X и �е умножава по 512 при �уфик� b, по 1024 при k и\n"
+#~ "по 1048576 при m.  �ко �е добави �уфик� z, в кра� на в�еки изведен ред\n"
+#~ "�е добав� изображение на входните знаци.  "
+
+#~ msgid ""
+#~ "--string without a number implies 3.  --width without a number\n"
+#~ "implies 32.  By default, od uses -A o -t d2 -w16.\n"
+#~ msgstr ""
+#~ "--string без чи�ло предполага 3.  --width без чи�ло предполага 32.\n"
+#~ "По подразбиране od ползва -A o -t d2 -w16. \n"
+
 #~ msgid "skip argument"
 #~ msgstr "пропу�кане на аргумент"
 
@@ -12930,9 +12880,20 @@ msgstr ""
 #~ "  \\t      хоризонтална табулаци�\n"
 #~ "  \\v      вертикална табулаци�\n"
 
+#~ msgid ""
+#~ "\n"
+#~ "With no FILE or if FILE is -, read Standard Input.  `-F /' by default.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Без Ф�ЙЛ или ако Ф�ЙЛ е -, �е чете от �тандартни� вход.  „-F /“ �е "
+#~ "подразбира.\n"
+
 #~ msgid "the --copyright option is deprecated; use --version instead"
 #~ msgstr "опци�та --copyright е о�тар�ла; ползвайте --version вме�то не�"
 
+#~ msgid "Usage: %s [OPTION]... FILE\n"
+#~ msgstr "Използване: %s [ОПЦИЯ]... Ф�ЙЛ\n"
+
 #~ msgid "FATAL: failed to close directory %s"
 #~ msgstr "КРИТИЧ�� ГРЕШК�: каталогът %s не може да �е затвори"
 
@@ -12957,6 +12918,9 @@ msgstr ""
 #~ msgstr ""
 #~ "КРИТИЧ�� ГРЕШК�: каталогът %s, в който току що �е влезе, �и �мени dev/ino"
 
+#~ msgid "cannot remove directory %s"
+#~ msgstr "не може да �е изтрие каталогът %s"
+
 #~ msgid "cannot remove root directory %s"
 #~ msgstr "не може да �е изтрие коренови�т каталог %s"
 
@@ -12969,6 +12933,34 @@ msgstr ""
 #~ msgid "invalid format string: %s"
 #~ msgstr "неправилен низ за формат: %s"
 
+#~ msgid ""
+#~ "Usage: %s USERNAME COMMAND [ARGUMENT]...\n"
+#~ "  or:  %s OPTION\n"
+#~ msgstr ""
+#~ "Използване: %s ПОТРЕБ_ИМЕ КОМ��Д� [�РГУМЕ�Т]...\n"
+#~ "    или:    %s ОПЦИЯ\n"
+
+#~ msgid ""
+#~ "Drop any supplemental groups, assume the user-ID and group-ID of\n"
+#~ "the specified USERNAME, and run COMMAND with any specified ARGUMENTs.\n"
+#~ "Exit with status 111 if unable to assume the required user and group ID.\n"
+#~ "Otherwise, exit with the exit status of COMMAND.\n"
+#~ "This program is useful only when run by root (user ID zero).\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Отказва �е от в�ички допълнителни групи, приема потребител� и групата на\n"
+#~ "по�оченото ПОТРЕБ_ИМЕ и изпълн�ва КОМ��Д�та � в�ички по�очени �РГУМЕ�Ти.\n"
+#~ "Приключва � код-�ъ�то�ние 111, ако не могат да �е приемат необходимите\n"
+#~ "потребител и група.  В противен �лучай приключва � кода-�ъ�то�ние на\n"
+#~ "КОМ��Д�та.  Тази програма е полезна �амо ако �е изпълн�ва от root.\n"
+#~ "\n"
+
+#~ msgid "cannot set group-ID to %lu"
+#~ msgstr "не може да �е приеме група %lu"
+
+#~ msgid "cannot set user-ID to %lu"
+#~ msgstr "не може да �е приеме потребител %lu"
+
 #~ msgid "Usage: %s [OPTIONS] FILE [...]\n"
 #~ msgstr "Използване: %s [ОПЦИИ] Ф�ЙЛ [...]\n"
 
@@ -12979,6 +12971,22 @@ msgstr ""
 #~ msgstr "�ортировка размер"
 
 #~ msgid ""
+#~ "  -a, --suffix-length=N   use suffixes of length N (default %d)\n"
+#~ "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
+#~ "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output "
+#~ "file\n"
+#~ "  -d, --numeric-suffixes  use numeric suffixes instead of alphabetic\n"
+#~ "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
+#~ msgstr ""
+#~ "  -a, --suffix-length=N   ползва �уфик�и � дължина N (по подразбиране "
+#~ "%d)\n"
+#~ "  -b, --bytes=Р�ЗМ        дели на парчета � размер Р�ЗМ байта\n"
+#~ "  -C, --line-bytes=Р�ЗМ   раздел� по редове до Р�ЗМ байта на изходен "
+#~ "файл\n"
+#~ "  -d, --numeric-suffixes  ползва чи�лови �уфик�и вме�то буквени\n"
+#~ "  -l, --lines=ЧИСЛО       дели на по ЧИСЛО редове на изходен файл\n"
+
+#~ msgid ""
 #~ "\n"
 #~ "SIZE may have a multiplier suffix: b for 512, k for 1K, m for 1 Meg.\n"
 #~ msgstr ""
@@ -12994,6 +13002,61 @@ msgstr ""
 #~ msgid "new_mode: mode\n"
 #~ msgstr "new_mode: mode\n"
 
+#~ msgid "Password:"
+#~ msgstr "Парола:"
+
+#~ msgid "getpass: cannot open /dev/tty"
+#~ msgstr "getpass: не може да �е отвори /dev/tty"
+
+#~ msgid "cannot set groups"
+#~ msgstr "не може да �е зададат групите"
+
+#~ msgid "cannot set group id"
+#~ msgstr "не може да �е зададе групата"
+
+#~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n"
+#~ msgstr "Използване: %s [ОПЦИЯ]... [-] [ПОТР [�РГ]...]\n"
+
+#~ msgid ""
+#~ "Change the effective user id and group id to that of USER.\n"
+#~ "\n"
+#~ "  -, -l, --login               make the shell a login shell\n"
+#~ "  -c, --command=COMMAND        pass a single COMMAND to the shell with -"
+#~ "c\n"
+#~ "  -f, --fast                   pass -f to the shell (for csh or tcsh)\n"
+#~ "  -m, --preserve-environment   do not reset environment variables\n"
+#~ "  -p                           same as -m\n"
+#~ "  -s, --shell=SHELL            run SHELL if /etc/shells allows it\n"
+#~ msgstr ""
+#~ "Прави дей�тващите (effective) номера на потребител и група да �а тези на "
+#~ "ПОТР.\n"
+#~ "\n"
+#~ "  -, -l, --login               прави обвивката да бъде вход�ща обвивка\n"
+#~ "  -c, --command=КОМ��Д�        подава � -c на обвивката не�ъ�тавна "
+#~ "КОМ��Д�\n"
+#~ "  -f, --fast                   подава -f на обвивката (за csh и tcsh)\n"
+#~ "  -m, --preserve-environment   не преу�танов�ва променливите от "
+#~ "обкръжението\n"
+#~ "  -p                           �ъщото като -m\n"
+#~ "  -s, --shell=ОБВИВК�          �тартира ОБВИВК�, ако /etc/shells "
+#~ "позвол�ва това\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "A mere - implies -l.   If USER not given, assume root.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Само - влече -l.   �ко не е по�очен ПОТР, приема �е root.\n"
+
+#~ msgid "user %s does not exist"
+#~ msgstr "не �ъще�твува потребител %s"
+
+#~ msgid "incorrect password"
+#~ msgstr "неправилна парола"
+
+#~ msgid "using restricted shell %s"
+#~ msgstr "използва �е ограничената обвивка %s"
+
 #~ msgid ""
 #~ "      --retry              keep trying to open a file even if it is\n"
 #~ "                           inaccessible when tail starts or if it "
@@ -13022,6 +13085,9 @@ msgstr ""
 #~ "С --follow (-f) tail използва един и �ъщ файлов де�криптор, т.е. tail ще\n"
 #~ "продължи да �леди кра� на файл�, дори ако файлът бъде преименуван.  "
 
+#~ msgid "warning: --retry is useful mainly when following by name"
+#~ msgstr "внимание: опци�та --retry обикновено е полезна �амо � --follow=name"
+
 #~ msgid "creating %s"
 #~ msgstr "�ъздава �е %s"
 
@@ -13078,6 +13144,24 @@ msgstr ""
 #~ "(или �тандартни� вход); извежда в ИЗХОД (или �тандартни� изход).\n"
 #~ "\n"
 
+#~ msgid ""
+#~ "  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
+#~ "                        delimit-method={none(default),prepend,separate}\n"
+#~ "                        Delimiting is done with blank lines.\n"
+#~ "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+#~ "  -i, --ignore-case     ignore differences in case when comparing\n"
+#~ "  -s, --skip-chars=N    avoid comparing the first N characters\n"
+#~ "  -u, --unique          only print unique lines\n"
+#~ msgstr ""
+#~ "  -D, --all-repeated[=delimit-method] извежда в�ички повтар�щи �е редове\n"
+#~ "                        delimit-method={none(по подразбиране),prepend,"
+#~ "separate}\n"
+#~ "                        Раздел�нето �е прави � празни редове.\n"
+#~ "  -f, --skip-fields=N   не �равн�ва първите N полета\n"
+#~ "  -i, --ignore-case     не различава големите от малките букви\n"
+#~ "  -s, --skip-chars=N    не �равн�ва първите N знака\n"
+#~ "  -u, --unique          извежда �амо редовете, които не �е повтар�т\n"
+
 #~ msgid "am"
 #~ msgstr "пр.обед"
 
@@ -13151,9 +13235,6 @@ msgstr ""
 #~ msgid "cannot set permissions of fifo %s"
 #~ msgstr "не може да �е зададе режим за до�тъп до именуван канал %s"
 
-#~ msgid "cannot set permissions of %s"
-#~ msgstr "не може да �е зададат правата за до�тъп до %s"
-
 #~ msgid ""
 #~ "This program is free software; you can redistribute it and/or modify\n"
 #~ "it under the terms of the GNU General Public License as published by\n"
@@ -13247,6 +13328,9 @@ msgstr ""
 #~ msgid "Warning: `-l' is deprecated; use `-L' instead"
 #~ msgstr "Внимание: „-l“ е о�тар�ла опци�; вме�то не� ползвайте „-L“"
 
+#~ msgid "the --allow-missing option is deprecated; use --retry instead"
+#~ msgstr "опци�та --allow-missing е о�тар�ла; ползвайте --retry вме�то не�"
+
 #~ msgid ""
 #~ "  -i, --idle        add idle time as HOURS:MINUTES, . or old\n"
 #~ "                    (deprecated, use -u)\n"
@@ -13429,6 +13513,9 @@ msgstr ""
 #~ msgid "too many non-option arguments"
 #~ msgstr "твърде много аргументи, които не �а опции"
 
+#~ msgid "invalid field number: `%s'"
+#~ msgstr "неправилен номер на поле: „%s“"
+
 #~ msgid "invalid field number for file 1: `%s'"
 #~ msgstr "неправилен номер на поле за файл 1: „%s“"
 
diff --git a/po/ca.gmo b/po/ca.gmo
index 90388cfd..0d15e94a 100644
--- a/po/ca.gmo
+++ b/po/ca.gmo
diff --git a/po/ca.po b/po/ca.po
index f880583e..11a52828 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,56 +1,61 @@
 # Catalan messages for GNU coreutils.
-# Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 # This file is distributed under the same license as the coreutils package.
 # Ivan Vilata i Balaguer <ivan@selidor.net>, 1999.
 # Jordi Mallach <jordi@sindominio.net>, 2001, 2002.
 # Ernest Adrogué Calveras <eadrogue@gmx.net>, 2002.
-# Ivan Vilata i Balaguer <ivan@selidor.net>, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012.
+# Ivan Vilata i Balaguer <ivan@selidor.net>, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014.
 #
 # No em decideixo entre destí i destinació. jm
 # Destí és correcte i més curt, ho passe tot a destí.  ivb
 # Robert Millan indica: destí=allò que ha de succeir, destinació=el lloc cap al
 # quan ens estem desplaçant; torne a agafar la segona.  ivb
 #
-# Sóc Ivan, aquestes són les convencions que adopte per a la 4.5.1:
-#   * Sempre que es puga s’usaran els caràcters adequats per al text en català:
-#     l’apòstrof (’), ela geminada (ŀ, Ŀ), cometes («, », “, �, ‘, ’, en aquest
-#     ordre de d’aparició), guionet (�), guionet dur (‑), guió (—) i punts
-#     suspensius (…).  Compte, perquè *cap*, repetesc, *CAP* dels anteriors és
-#     el caràcter que s’obté teclejant directament; vegeu
-#     http://www.selidor.net/~ivan/blog/bits/20060304T0023-ortotipografia.html.
-#   * Use 2 espais després d'un punt.
-#   * Missatges d'ajuda:
-#       * Forma d'ús: ...
-#               o bé: ...
-#       * ARGUMENT_COMPOST, però ARGCOMP
-#       * FILE(s) -> cada FITXER (si és possible)
-#       * Cada línia de descripció d'una opció comença en la columna 24, i
-#         sempre es manté com a mínim a 4 espais del nom de l'opció.  Quan
-#         l'opció arriba a la columna 24, la descripció comença en la línia
-#         inferior.  Les descripcions que no caben en una línia es parteixen i
-#         continuen en la columna 24 de la línia següent.
-#       * Les descripcions d'ítems que no són opcions es mantenen alineades a
-#         4 espais de l'ítem més llarg del bloc.  Les que no caben en una línia
-#         es parteixen i continuen en la mateixa columna on comencen.
-#   * Errors i avisos:
-#       * no és igual «no es pot obrir» que «no s'ha pogut obrir»
-#       * no és igual «s'està obrint X» que «en obrir X» (error)
-#       * «avís:» comença amb minúscula, la cadena següent també
-#       * sempre van en una sola línia, a no ser que els retorns importen; en
-#         aquest cas, les noves línies comencen amb un caràcter de tabulació
-#   * VARIABLE_ENTORN, però «valor de variable»
-#   * Noms de funció: printf()
-#   * Noms de fitxer: «fitxer»
-#   * Noms d'opcions: «--opció=ARGUMENT»
-#   * El text com a molt arriba a la columna 78, amb el caràcter de nova línia
-#     en la 79.  Les línies es parteixen de forma automàtica (no per a que quede
-#     bonic, excepte quan quede realment horrend o porte a confusió).
-msgid ""
-msgstr ""
-"Project-Id-Version: coreutils 8.20-pre1\n"
+# Sóc Ivan, aquestes són les convencions que adopte per a la 8.22-pre4:
+#
+# - Sempre que es puga s’usaran els caràcters adequats per al text en català:
+#   l’apòstrof (’), ela geminada (l·l, L·L), cometes («, », “, �, ‘, ’, en
+#   aquest ordre de d’aparició), guionet (�), guionet dur (‑), guió (—) i punts
+#   suspensius (…).  Compte, perquè alguns dels caràcters anteriors no són els
+#   que s’obtenen teclejant directament; vegeu
+#   https://elvil.net/blog/ca/ortotipografia
+# - Use 2 espais després d’un punt.
+# - Missatges d’ajuda:
+#   - Forma d’ús: …
+#           o bé: …
+#   - ARGUMENT_COMPOST, però ARGCOMP
+#   - FILE(s) -> cada FITXER (si és possible)
+#   - Cada línia de descripció d’una opció comença en la columna 24, i sempre es
+#     manté com a mínim a 4 espais del nom de l’opció.  Quan l’opció arriba a la
+#     columna 24, la descripció comença en la línia inferior.  Les descripcions
+#     que no caben en una línia es parteixen i continuen en la columna 24 de la
+#     línia següent.
+#   - Les descripcions d’ítems que no són opcions es mantenen alineades a 4
+#     espais de l’ítem més llarg del bloc.  Les que no caben en una línia es
+#     parteixen i continuen en la mateixa columna on comencen.
+#     - Excepció: ajudes de «pr», quin format vos agrada més?
+# - Errors i avisos:
+#   - no és igual «no es pot obrir» que «no s’ha pogut obrir»
+#   - no és igual «s’està obrint X» que «en obrir X» (error)
+#   - «avís:» comença amb minúscula, la cadena següent també
+#   - sempre van en una sola línia, a no ser que els retorns importen; en
+#     aquest cas, les noves línies comencen amb un caràcter de tabulació
+# - VARIABLE_ENTORN, però «valor de variable»
+# - Noms de funció: printf()
+# - Noms de fitxer: «fitxer»
+# - Noms d’opcions: «--opció=ARGUMENT»
+# - El text com a molt arriba a la columna 78, amb el caràcter de nova línia en
+#   la 79.  Les línies es parteixen de forma automàtica (no per a que quede
+#   bonic, excepte quan quede realment horrend o porte a confusió).
+# - Els missatges marcats com a multilínia només arriben fins a la columna 70.
+#   A sovint contenen marques de format; en aquest cas s’hi inserta una nova
+#   línia perquè no hi ha forma de saber com serà de llarga la línia.
+msgid ""
+msgstr ""
+"Project-Id-Version: coreutils 8.22-pre4\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
-"PO-Revision-Date: 2012-10-21 20:29+0200\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
+"PO-Revision-Date: 2014-01-19 19:29+0100\n"
 "Last-Translator: Ivan Vilata i Balaguer <ivan@selidor.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
 "Language: ca\n"
@@ -80,13 +85,12 @@ msgstr "Els arguments vàlids són:"
 msgid "error closing file"
 msgstr "error en tancar el fitxer"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
@@ -94,65 +98,114 @@ msgstr "error d’escriptura"
 
 # Usa quote().  ivb
 # Indica condició d'error.  ivb
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "en preservar els permisos de %s"
 
 # Amb el mateix format que els errors de la libc.  ivb
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "Error desconegut del sistema"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "fitxer ordinari buit"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "fitxer ordinari"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "directori"
 
-#: lib/file-type.c:44
-msgid "block special file"
-msgstr "fitxer especial de blocs"
-
-#: lib/file-type.c:47
-msgid "character special file"
-msgstr "fitxer especial de caràcters"
-
-#: lib/file-type.c:50
-msgid "fifo"
-msgstr "cua FIFO"
-
-#: lib/file-type.c:53
+#: lib/file-type.c:46
 msgid "symbolic link"
 msgstr "enllaç simbòlic"
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "connector"
-
-#: lib/file-type.c:59
+#: lib/file-type.c:52
 msgid "message queue"
 msgstr "cua de missatges"
 
-#: lib/file-type.c:62
+#: lib/file-type.c:55
 msgid "semaphore"
 msgstr "semàfor"
 
-#: lib/file-type.c:65
+#: lib/file-type.c:58
 msgid "shared memory object"
 msgstr "objecte de memòria compartida"
 
-#: lib/file-type.c:68
+#: lib/file-type.c:61
 msgid "typed memory object"
 msgstr "objecte de memòria amb tipus"
 
-#: lib/file-type.c:70
+#: lib/file-type.c:66
+msgid "block special file"
+msgstr "fitxer especial de blocs"
+
+#: lib/file-type.c:69
+msgid "character special file"
+msgstr "fitxer especial de caràcters"
+
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr ""
+
+#: lib/file-type.c:75
+msgid "fifo"
+msgstr "cua FIFO"
+
+#: lib/file-type.c:78
+msgid "door"
+msgstr ""
+
+#: lib/file-type.c:81
+#, fuzzy
+msgid "multiplexed block special file"
+msgstr "fitxer especial de blocs"
+
+#: lib/file-type.c:84
+#, fuzzy
+msgid "multiplexed character special file"
+msgstr "fitxer especial de caràcters"
+
+#: lib/file-type.c:87
+#, fuzzy
+msgid "multiplexed file"
+msgstr "s’han especificat múltiples rols"
+
+#: lib/file-type.c:90
+#, fuzzy
+msgid "named file"
+msgstr "fitxer estrany"
+
+#: lib/file-type.c:93
+#, fuzzy
+msgid "network special file"
+msgstr "fitxer especial de blocs"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr ""
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr ""
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr ""
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "connector"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr ""
+
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "fitxer estrany"
 
@@ -210,11 +263,11 @@ msgstr "S’està processant la petició"
 
 #: lib/gai_strerror.c:71
 msgid "Request canceled"
-msgstr "La petició ha estat canceŀlada"
+msgstr "La petició ha estat cancel·lada"
 
 #: lib/gai_strerror.c:72
 msgid "Request not canceled"
-msgstr "La petició no ha estat canceŀlada"
+msgstr "La petició no ha estat cancel·lada"
 
 #: lib/gai_strerror.c:73
 msgid "All requests done"
@@ -288,19 +341,19 @@ msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: l’opció «-W %s» necessita un argument\n"
 
 # Els 2 usen quote().  ivb
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr "no s’han pogut canviar els permisos de %s"
 
 # Els 3 usen quote().  ivb
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "no s’ha pogut crear el directori %s"
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr "la memòria s’ha exhaurit"
@@ -422,7 +475,7 @@ msgstr "L’expressió regular és massa llarga"
 msgid "Unmatched ) or \\)"
 msgstr "«)» o «\\)» desaparellat"
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 msgid "No previous regular expression"
 msgstr "No hi ha expressió regular prèvia"
 
@@ -449,7 +502,7 @@ msgstr "empreu «--no-preserve-root» per a evitar aquesta comprovació"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[sS]"
 
@@ -459,13 +512,13 @@ msgstr "^[sS]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[nN]"
 
 # Usa quote().  ivb
 # Indica condició d'error.  ivb
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, c-format
 msgid "setting permissions for %s"
 msgstr "en establir els permisos de %s"
@@ -606,20 +659,6 @@ msgstr "Fallada d’alimentació"
 msgid "Resource lost"
 msgstr "S’ha perdut el recurs"
 
-# Condició d’error.  ivb
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, c-format
-msgid "cannot create pipe"
-msgstr "no s’ha pogut crear la canonada"
-
-# Cap empra quote().  ivb
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, c-format
-msgid "%s subprocess failed"
-msgstr "el subprocés «%s» ha fallat"
-
 #: lib/strsignal.c:114
 #, c-format
 msgid "Real-time signal %d"
@@ -833,7 +872,7 @@ msgstr "Informeu dels errors de «%s» a <%s>.\n"
 
 # Cap de les dues usa quote.  ivb
 # La primera és el nom del programa i la segona una adreça web.  ivb
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Pàgina principal de «%s»: %s\n"
@@ -844,36 +883,11 @@ msgstr "Pàgina principal de «%s»: %s\n"
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr "Pàgina inicial de «%s»: <http://www.gnu.org/software/%s/>\n"
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr ""
 "Ajuda general sobre l’ús de programari GNU: <http://www.gnu.org/gethelp/>\n"
 
-# És una funció.  ivb
-#: lib/w32spawn.h:43
-#, c-format
-msgid "_open_osfhandle failed"
-msgstr "ha fallat _open_osfhandle()"
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr "no s’ha pogut restaurar el descriptor de fitxer %d: ha fallat dup2()"
-
-# Condició d’error.  ivb
-# No empra quote().  ivb
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr "subprocés «%s»"
-
-# Condició d’error.  ivb
-# No empra quote().  ivb
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr "el subprocés «%s» ha rebut el senyal fatal %d"
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr "entrada estàndard"
@@ -898,7 +912,7 @@ msgstr "flux desconegut"
 msgid "failed to reopen %s with mode %s"
 msgstr "no s’ha pogut reobrir %s amb el mode %s"
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr "ha fallat la comparació de cadenes"
@@ -941,7 +955,7 @@ msgid "Simon Josefsson"
 msgstr "Simon Josefsson"
 
 #: src/base64.c:60
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
 "Base64 encode or decode FILE, or standard input, to standard output.\n"
@@ -949,7 +963,6 @@ msgstr ""
 "Forma d’ús: %s [OPCIÓ]… [FITXER]\n"
 "Codifica o descodifica el FITXER (o l’entrada estàndard) emprant base 64, i\n"
 "escriu el resultat en l’eixida estàndard.\n"
-"\n"
 
 #: src/base64.c:67
 msgid ""
@@ -968,7 +981,7 @@ msgstr ""
 "                       indicat (per defecte 76).  Empreu 0 per a no "
 "ajustar.\n"
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -991,50 +1004,49 @@ msgstr ""
 "de\n"
 "tolerar altres octets no alfabètics en el flux codificat.\n"
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "error de lectura"
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, c-format
 msgid "invalid input"
 msgstr "l’entrada no és vàlida"
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, c-format
 msgid "invalid wrap size: %s"
 msgstr "la longitud d’ajustament no és vàlida: %s"
 
 # Usa quote().  ivb
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, c-format
 msgid "extra operand %s"
 msgstr "sobra l’operand %s"
 
 # Indica la situació d'un missatge d'error.  ivb
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, c-format
 msgid "closing standard input"
 msgstr "en tancar l’entrada estàndard"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -1053,20 +1065,19 @@ msgstr ""
 "      o bé: %s OPCIÓ… NOM…\n"
 
 #: src/basename.c:53
-#, fuzzy
 msgid ""
 "Print NAME with any leading directory components removed.\n"
 "If specified, also remove a trailing SUFFIX.\n"
 msgstr ""
 "Mostra NOM eliminant qualsevol component directori que tinga al davant.  Si\n"
 "s’especifica, també s’elimina el SUFIX del darrere.\n"
-"\n"
 
 #: src/basename.c:60
+#, fuzzy
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
 "  -a, --multiple       Admet múltiples arguments i tracta cadascun d’ells "
 "com\n"
@@ -1093,32 +1104,31 @@ msgstr ""
 "  %s -s .h include/stdio.h    -> «stdio»\n"
 "  %s -a una/cad1 una/cad2     -> «cad1» seguit per «cad2»\n"
 
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, c-format
 msgid "missing operand"
 msgstr "manca un operand"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr "Torbjörn Granlund"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 msgid "Richard M. Stallman"
 msgstr "Richard M. Stallman"
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1184,7 +1194,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr "ha fallat ioctl() sobre %s"
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr "eixida estàndard"
@@ -1201,15 +1211,15 @@ msgstr "Russell Coker"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 msgid "Jim Meyering"
 msgstr "Jim Meyering"
 
 # Usa quote().  ivb
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, c-format
 msgid "failed to create security context: %s"
 msgstr "no s’ha pogut crear el context de seguretat: %s"
@@ -1221,8 +1231,8 @@ msgid "failed to set %s security context component to %s"
 msgstr "no s’ha pogut establir el component «%s» del context de seguretat a %s"
 
 # Els 5 usen quote().  ivb
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, c-format
 msgid "failed to get security context of %s"
 msgstr "no s’ha pogut obtenir el context de seguretat de %s"
@@ -1235,20 +1245,20 @@ msgid "can't apply partial context to unlabeled file %s"
 msgstr "no es pot aplicar un context parcial al fitxer sense context %s"
 
 # Usa quote() en els dos args.  ivb
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, c-format
 msgid "failed to change context of %s to %s"
 msgstr "no s’ha pogut canviar el context de %s a %s"
 
 # Usa quote().  ivb
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
 msgstr "no s’ha pogut accedir a %s"
 
 # Usa quote().  ivb
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, c-format
 msgid "cannot read directory %s"
 msgstr "no s’ha pogut llegir el directori %s"
@@ -1261,14 +1271,15 @@ msgid "changing security context of %s\n"
 msgstr "s’està canviant el context de seguretat de %s\n"
 
 # És una funció.  ivb
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, c-format
 msgid "fts_read failed"
 msgstr "ha fallat fts_read()"
 
 # És una funció.  ivb
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, c-format
 msgid "fts_close failed"
 msgstr "ha fallat fts_close()"
@@ -1285,16 +1296,14 @@ msgstr ""
 "      o bé: %s [OPCIÓ]… --reference=FITXREF FITXER…\n"
 
 #: src/chcon.c:357
-#, fuzzy
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
-"Canvia el context de seguretat de cada FITXER a CONTEXT.  Amb «--"
-"reference»,\n"
-"canvia el context de seguretat de cada FITXER a aquell de FITXREF.\n"
-"\n"
+"Canvia el context de seguretat de SELinux de cada FITXER a CONTEXT.  Amb\n"
+"«--reference», canvia el context de seguretat de cada FITXER a aquell de\n"
+"FITXREF.\n"
 
 #: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94
 msgid ""
@@ -1326,7 +1335,7 @@ msgstr ""
 "  -l, --range=RANG     Estableix el RANG del context de seguretat de la\n"
 "                       destinació.\n"
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
 "      --preserve-root    fail to operate recursively on '/'\n"
@@ -1383,38 +1392,39 @@ msgstr ""
 "\n"
 
 # -H i -L es reemplacen però no són incompatibles.  ivb
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr "«-R --dereference» necessita «-H» o «-L»"
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr "«-R -h» necessita «-P»"
 
 # Usa quote().  ivb
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, c-format
 msgid "missing operand after %s"
 msgstr "manca un operand després de %s"
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, c-format
 msgid "invalid context: %s"
 msgstr "el context no és vàlid: %s"
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr "s’han proporcionat diverses especificacions de context de seguretat"
 
 # Els 9 usen quote().  ivb
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, c-format
 msgid "failed to get attributes of %s"
 msgstr "no s’han pogut obtenir els atributs de %s"
@@ -1445,7 +1455,7 @@ msgstr ""
 "el grup de cada FITXER a aquell de FITXREF.\n"
 "\n"
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
@@ -1492,55 +1502,55 @@ msgstr ""
 
 # Usa quote().  ivb
 # Indica situació d'error.  ivb
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
 msgstr "en obtenir els nous atributs de %s"
 
 # Usa quote().  ivb
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr "no s’han canviat ni l’enllaç simbòlic %s ni el fitxer apuntat\n"
 
 # Usa quote() en el 1r arg. El 3r i 5é són modes «rwxrwxrwx».  ivb
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr "s’ha canviat el mode de %s de %04lo (%s) a %04lo (%s)\n"
 
 # Usa quote() en el 1r arg. El 3r i 5é són modes «rwxrwxrwx».  ivb
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr "no s’ha pogut canviar el mode de %s de %04lo (%s) a %04lo (%s)\n"
 
 # Usa quote() en el 1r arg. El 3r és un mode «rwxrwxrwx».  ivb
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr "el mode de %s es manté en %04lo (%s)\n"
 
 # Usa quote().  ivb
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr "no es pot emprar l’enllaç simbòlic trencat %s"
 
 # Usa quote().  ivb
 # Indica una condició d'error.  ivb
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, c-format
 msgid "changing permissions of %s"
 msgstr "en canviar els permisos de %s"
 
 # No usa quote(), però són números.  ivb
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr "%s: els nous permisos són %s, no %s"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1551,7 +1561,7 @@ msgstr ""
 "      o bé: %s [OPCIÓ]… MODE_OCTAL FITXER…\n"
 "      o bé: %s [OPCIÓ]… --reference=FITXREF FITXER…\n"
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 msgid ""
 "Change the mode of each FILE to MODE.\n"
 "With --reference, change the mode of each FILE to that of RFILE.\n"
@@ -1561,18 +1571,18 @@ msgstr ""
 "cada FITXER a aquell de FITXREF.\n"
 "\n"
 
-#: src/chmod.c:391
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
 "      --reference=FITXREF\n"
 "                       Empra el mode de FITXREF en lloc dels valors de "
 "MODE.\n"
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr "  -R, --recursive      Canvia recursivament fitxers i directoris.\n"
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 msgid ""
 "\n"
 "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n"
@@ -1580,12 +1590,12 @@ msgstr ""
 "\n"
 "Cada MODE té la forma «[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+».\n"
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr "no es poden combinar el mode i l’opció «--reference»"
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, c-format
 msgid "invalid mode: %s"
 msgstr "el mode no és vàlid: %s"
@@ -1759,28 +1769,23 @@ msgstr ""
 "«root».\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr "Roland McGrath"
 
 # Usa quote().  ivb
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr "el grup %s no és vàlid"
 
 # Usa quote().  ivb
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, c-format
 msgid "invalid group list %s"
 msgstr "la llista de grups %s no és vàlida"
 
-#: src/chroot.c:117
-#, c-format
-msgid "failed to set additional groups"
-msgstr "no s’han pogut establir els grups suplementaris"
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
@@ -1789,7 +1794,7 @@ msgstr ""
 "Forma d’ús: %s [OPCIÓ] NOU_ARREL [ORDRE [ARGUMENT]…]\n"
 "      o bé: %s OPCIÓ\n"
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
@@ -1797,7 +1802,7 @@ msgstr ""
 "Executa l’ORDRE establint�hi el directori arrel a NOU_ARREL.\n"
 "\n"
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
@@ -1806,7 +1811,7 @@ msgstr ""
 "                       Usuari i grup a emprar (identificadors o noms).\n"
 "  --groups=GRUPS       Llista de grups suplementaris, com «g1,g2,…,gN».\n"
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 msgid ""
 "\n"
 "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n"
@@ -1816,29 +1821,43 @@ msgstr ""
 "i»).\n"
 
 # No usa quote().  ivb
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, c-format
 msgid "cannot change root directory to %s"
 msgstr "no s’ha pogut canviar el directori arrel a «%s»"
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, c-format
 msgid "cannot chdir to root directory"
 msgstr "no s’ha pogut canviar al directori arrel"
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr ""
+
+#: src/chroot.c:383
+#, fuzzy, c-format
+msgid "failed to get supplemental groups"
+msgstr "no s’han pogut establir els grups suplementaris"
+
+#: src/chroot.c:395
+#, fuzzy, c-format
+msgid "failed to %s supplemental groups"
+msgstr "no s’han pogut establir els grups suplementaris"
+
+#: src/chroot.c:402
 #, c-format
 msgid "failed to set group-ID"
 msgstr "no s’ha pogut establir l’identificador de grup"
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, c-format
 msgid "failed to set user-ID"
 msgstr "no s’ha pogut establir l’identificador d’usuari"
 
 # Usa quote().  ivb
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, c-format
 msgid "failed to run command %s"
 msgstr "no s’ha pogut executar l’ordre %s"
@@ -1870,7 +1889,7 @@ msgstr ""
 "Mostra la suma CRC i la mida en octets de cada FITXER.\n"
 "\n"
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr "Forma d’ús: %s [OPCIÓ]… FITXER1 FITXER2\n"
@@ -1972,39 +1991,39 @@ msgid "empty %s not allowed"
 msgstr "no es permet un valor buit per a %s"
 
 # uniq no usa quote().  ivb
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr "error en llegir %s"
 
 # Usa quote().  ivb
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, c-format
 msgid "cannot lseek %s"
 msgstr "ha fallat lseek() sobre %s"
 
 # uniq no usa quote().  ivb
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr "error en escriure %s"
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, c-format
 msgid "%s: failed to get extents info"
 msgstr "%s: no s’ha pogut obtenir la informació sobre les extensions"
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, c-format
 msgid "%s: write failed"
 msgstr "%s: no s’ha pogut escriure"
 
 # Usa quote().  ivb
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, c-format
 msgid "failed to extend %s"
 msgstr "no s’ha pogut estendre %s"
@@ -2012,107 +2031,117 @@ msgstr "no s’ha pogut estendre %s"
 # Usa quote().  ivb
 # Indica condició d'error.  ivb
 # Fallada en establir permisos segurs abans de canviar propietari/grup.  ivb
-#: src/copy.c:662
+#: src/copy.c:687
 #, c-format
 msgid "clearing permissions for %s"
 msgstr "en assegurar els permisos de %s"
 
 # Els 3 usen quote().  ivb
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "no s’ha pogut preservar el propietari de %s"
 
 # Usa quote().  ivb
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
 msgstr "no s’ha pogut cercar el fitxer %s"
 
 # Usa quote().  ivb
-#: src/copy.c:728
+#: src/copy.c:753
 #, c-format
 msgid "failed to preserve authorship for %s"
 msgstr "no s’ha pogut preservar l’autoria de %s"
 
 # Usa quote().  ivb
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
+#, c-format
+msgid "failed to set default file creation context to %s"
+msgstr ""
+"no s’ha pogut establir el context per defecte de creació de fitxers a %s"
+
+# Usa quote().  ivb
+#: src/copy.c:820
+#, c-format
+msgid "failed to set default file creation context for %s"
+msgstr ""
+"no s’ha pogut establir el context per defecte de creació de fitxers de %s"
+
+# Usa quote().  ivb
+#: src/copy.c:846
+#, c-format
+msgid "failed to set the security context of %s"
+msgstr "no s’ha pogut establir el context de seguretat de %s"
+
+# Usa quote().  ivb
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
 msgid "cannot open %s for reading"
 msgstr "no s’ha pogut obrir %s per a llegir"
 
 # Els 4 usen quote().  ivb
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, c-format
 msgid "cannot fstat %s"
 msgstr "ha fallat fstat() sobre %s"
 
 # Usa quote().  ivb
-#: src/copy.c:820
+#: src/copy.c:935
 #, c-format
 msgid "skipping file %s, as it was replaced while being copied"
 msgstr "es salta el fitxer %s, que va ser reemplaçat en ser copiat"
 
-#: src/copy.c:850
-#, c-format
-msgid "failed to get file system create context"
-msgstr "no s’ha pogut obtenir el context de creació del sistema de fitxers"
-
-# Usa quote() en el ambdós args.  ivb
-#: src/copy.c:864
-#, c-format
-msgid "failed to set the security context of %s to %s"
-msgstr "no s’ha pogut establir el context de seguretat de %s a %s"
-
 # Els 6 usen quote().  ivb
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
 msgid "cannot remove %s"
 msgstr "no s’ha pogut eliminar %s"
 
 # Usa quote().  ivb
 # Missatge informatiu.  ivb
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
 msgstr "s’ha eliminat %s\n"
 
 # Usa quote.  ivb
 # Missatge d’error.  ivb
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr "no es copiarà a través de l’enllaç simbòlic trencat %s"
 
 # Usa quote().  ivb
-#: src/copy.c:964
+#: src/copy.c:1070
 #, c-format
 msgid "cannot create regular file %s"
 msgstr "no s’ha pogut crear el fitxer ordinari %s"
 
 # Els 2 usen quote().  ivb
-#: src/copy.c:985
+#: src/copy.c:1091
 #, c-format
 msgid "failed to clone %s from %s"
 msgstr "no s’ha pogut clonar %s des de %s"
 
 # Usa quote().  ivb
 # Indica condició d'error.  ivb
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr "en preservar les dates de %s"
 
-# Els 2 usen quote().  ivb
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+# Usa quote().  ivb
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
-#, fuzzy, c-format
+#, c-format
 msgid "failed to close %s"
-msgstr "no s’ha pogut obrir %s"
+msgstr "no s’ha pogut tancar %s"
 
 # Ací tinc un diff de la Debian 2.0 on insisteix bastant en posar «(s/n)»
 # al final d'aquestes qüestions (un diff d'es.po)  iv
@@ -2123,211 +2152,237 @@ msgstr "no s’ha pogut obrir %s"
 # Aiii senyor, com passa el temps, ja ni hi ha fileutils (2003-1).  ivb
 # Usa quote() en el 1r arg.  ivb
 # Entre parèntesi va una cadena estil «-rwxr-xr-x».  ivb
-#: src/copy.c:1471
-#, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
+#: src/copy.c:1580
+#, fuzzy, c-format
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
 msgstr "%s: voleu sobreescriure %s, reemplaçant el mode %04lo (%s)? "
 
+#: src/copy.c:1581
+#, c-format
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr ""
+
 # Usa quote().  ivb
-#: src/copy.c:1478
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
 msgstr "%s: voleu sobreescriure %s? "
 
 # Usa quote().  ivb
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr " (còpia de seguretat: %s)"
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr "no s’ha pogut restaurar el context per defecte de creació de fitxers"
 
 # Usa quote() en els 2 args.  ivb
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, c-format
 msgid "cannot create hard link %s to %s"
 msgstr "no s’ha pogut crear l’enllaç fort %s cap a %s"
 
 # Els 3 usen quote().  ivb
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, c-format
 msgid "cannot stat %s"
 msgstr "ha fallat stat() sobre %s"
 
 # Usa quote().  ivb
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, c-format
 msgid "omitting directory %s"
 msgstr "es descarta el directori %s"
 
 # Usa quote().  ivb
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr "avís: s’ha especificat el fitxer origen %s més d’una vegada"
 
 # Els 2 usen quote() en els 2 args.  ivb
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
 msgstr "%s i %s són el mateix fitxer"
 
 # Usa quote() en els 2 args.  ivb
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr "no es pot sobreescriure el no�directori %s amb el directori %s"
 
 # Usa quote() en els 2 args.  ivb
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr "no es sobreescriurà %s, tot just creat, amb %s"
 
 # Usa quote().  ivb
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr "no es pot sobreescriure el directori %s amb un no�directori"
 
 # Usa quote() en els 2 args.  ivb
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr "no es pot moure un directori sobre un no-directori: %s -> %s"
 
 # Usa quote() en els 2 args.  ivb
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr "una còpia de seguretat de %s destruiria el fitxer origen; no es mou %s"
 
 # Usa quote() en els 2 args.  ivb
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr ""
 "una còpia de seguretat de %s destruiria el fitxer origen; no es còpia %s"
 
 # Els 2 usen quote().  ivb
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
 msgstr "no sha pogut crear una còpia de seguretat de %s"
 
 # Usa quote() en els 2 args.  ivb
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr "no es copiarà %s a través de l’enllaç simbòlic tot just creat %s"
 
 # Usa quote() en els 2 args.  ivb
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr "no es pot copiar un directori, %s, dins d’ell mateix, %s"
 
 # Un quote() en els 2 args.  ivb
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr "no es crearà l’enllaç fort %s cap al directori %s"
 
 # Usa quote() en els 2 args.  ivb
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr "no es pot moure %s a un subdirectori d’ell mateix, %s"
 
 # Usa quote() en els dos args.  ivb
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, c-format
 msgid "cannot move %s to %s"
 msgstr "no s’ha pogut moure %s a %s"
 
 # Usa quote() en es 2 args.  ivb
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr ""
 "no s’ha pogut moure entre dispositius: %s a %s; no s’ha pogut eliminar la "
 "destinació"
 
-# Els 5 usen quote().  ivb
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, c-format
-msgid "failed to set default file creation context to %s"
-msgstr ""
-"no s’ha pogut establir el context per defecte de creació de fitxers a %s"
-
 # Usa quote().  ivb
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr "no es pot copiar l’enllaç simbòlic cíclic %s"
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr ""
 "%s: només es poden fer enllaços simbòlics relatius en el directori actual"
 
 # Usa quote() en els 2 arguments.  ivb
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr "no s’ha pogut crear l’enllaç simbòlic %s cap a %s"
 
 # Els 2 usen quote().  ivb
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, c-format
 msgid "cannot create fifo %s"
 msgstr "no s’ha pogut crear la cua FIFO %s"
 
 # Usa quote().  ivb
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, c-format
 msgid "cannot create special file %s"
 msgstr "no s’ha pogut crear el fitxer especial %s"
 
 # Els 3 usen quote().  ivb
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, c-format
 msgid "cannot read symbolic link %s"
 msgstr "no s’ha pogut llegir l’enllaç simbòlic %s"
 
 # Usa quote().  ivb
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, c-format
 msgid "cannot create symbolic link %s"
 msgstr "no s’ha pogut crear l’enllaç simbòlic %s"
 
 # Usa quote().  ivb
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
 msgstr "%s és d’un tipus de fitxer desconegut"
 
 # Els 2 usen quote().  ivb
 # L'argument és el nom original.  ivb
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, c-format
 msgid "cannot un-backup %s"
 msgstr "no s’ha pogut recuperar la còpia de seguretat de %s"
 
 # Usa quote() en els 2 args.  ivb
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr "%s -> %s (recuperació de la còpia de seguretat)\n"
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr ""
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr ""
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+
+# Un nom de flux com els anteriors.  ivb
+#: src/coreutils.c:178 src/coreutils.c:202
+#, fuzzy, c-format
+msgid "unknown program %s"
+msgstr "flux desconegut"
+
+#: src/cp.c:157 src/mv.c:288
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -2338,14 +2393,11 @@ msgstr ""
 "      o bé: %s [OPCIÓ]… ORIGEN… DIRECTORI\n"
 "      o bé: %s [OPCIÓ]… -t DIRECTORI ORIGEN…\n"
 
-#: src/cp.c:162
-#, fuzzy
+#: src/cp.c:163
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
-msgstr ""
-"Còpia ORIGEN a DESTINACIÓ, o múltiples ORIGENs a un DIRECTORI.\n"
-"\n"
+msgstr "Còpia ORIGEN a DESTINACIÓ, o múltiples ORIGENs a un DIRECTORI.\n"
 
-#: src/cp.c:168
+#: src/cp.c:169
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
 "      --attributes-only        don't copy the file data, just the "
@@ -2371,8 +2423,7 @@ msgstr ""
 "                       recursivament.\n"
 "  -d                   Equival a «--no-dereference --preserve=links».\n"
 
-#: src/cp.c:177
-#, fuzzy
+#: src/cp.c:178
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
 "                                 opened, remove it and try again (this "
@@ -2385,15 +2436,16 @@ msgid ""
 "  -H                           follow command-line symbolic links in SOURCE\n"
 msgstr ""
 "  -f, --force          Si no es pot obrir un fitxer destinació existent,\n"
-"                       l’elimina i torna a provar (redundant quan s’usa\n"
-"                       l’opció «-n»).\n"
+"                       l’elimina i torna a provar (aquesta opció no es té "
+"en\n"
+"                       compte quan també s’usa l’opció «-n»).\n"
 "  -i, --interactive    Pregunta abans de sobreescriure (inhabilita una "
 "opció\n"
 "                       «-n» anterior).\n"
 "  -H                   Segueix els enllaços simbòlics que es troben a "
 "l’ORIGEN.\n"
 
-#: src/cp.c:186
+#: src/cp.c:187
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
 "  -L, --dereference            always follow symbolic links in SOURCE\n"
@@ -2404,7 +2456,7 @@ msgstr ""
 "a\n"
 "                       l’ORIGEN.\n"
 
-#: src/cp.c:190
+#: src/cp.c:191
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
 "                                 a previous -i option)\n"
@@ -2416,7 +2468,7 @@ msgstr ""
 "troben a\n"
 "                       l’ORIGEN.\n"
 
-#: src/cp.c:195
+#: src/cp.c:196
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
 "      --preserve[=ATTR_LIST]   preserve the specified attributes (default:\n"
@@ -2433,7 +2485,7 @@ msgstr ""
 "                       (dates); atributs addicionals: «context», «links»\n"
 "                       (enllaços), «all» (tots).\n"
 
-#: src/cp.c:203
+#: src/cp.c:204
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                use full source file name under DIRECTORY\n"
@@ -2443,7 +2495,7 @@ msgstr ""
 "      --parents        Crea el camí complet del fitxer origen sota el\n"
 "                       directori destinació.\n"
 
-#: src/cp.c:207
+#: src/cp.c:208
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
 "      --reflink[=WHEN]         control clone/CoW copies. See below\n"
@@ -2454,25 +2506,26 @@ msgstr ""
 "  -R, -r, --recursive    Còpia recursivament els directoris.\n"
 "      --reflink[=QUAN]    Controla la realització de còpies en escriure "
 "(CoW)\n"
-"                       o clonacions (vegeu a sota).\n"
+"                       o clonacions.  Més detalls a sota.\n"
 "      --remove-destination\n"
 "                       Elimina cada fitxer destinació existent abans\n"
 "                       d’intentar obrir�lo (no després, com fa «--force»).\n"
 
-#: src/cp.c:213
+#: src/cp.c:214
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
 "                                 argument\n"
 msgstr ""
-"      --sparse=QUAN    Controla la creació de fitxers dispersos (vegeu a\n"
-"                       sota).\n"
+"      --sparse=QUAN    Controla la creació de fitxers dispersos.  Més "
+"detalls\n"
+"                       a sota.\n"
 "      --strip-trailing-slashes\n"
 "                       Elimina la barra final (si n’hi ha) de cada argument\n"
 "                       ORIGEN.\n"
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -2489,7 +2542,7 @@ msgstr ""
 "  -T, --no-target-directory\n"
 "                       Tracta la DESTINACIÓ com a un fitxer normal.\n"
 
-#: src/cp.c:224
+#: src/cp.c:225
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
 "                                 than the destination file or when the\n"
@@ -2502,11 +2555,25 @@ msgstr ""
 "  -v, --verbose        Explica què s’està fent.\n"
 "  -x, --one-file-system    Es manté dins d’aquest sistema de fitxers.\n"
 
+#: src/cp.c:232
+#, fuzzy
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+"  -Z, --context[=CONTEXT]\n"
+"                       Estableix el context de seguretat de SELinux del\n"
+"                       fitxer destinació al tipus per defecte, o al CONTEXT "
+"si\n"
+"                       s’especifica.\n"
+
 # ivb:
 #   «Sparse» són fitxers amb blocs seguits de caràcters nuls.  Com es pareix
 #   molt al concepte de «matriu dispersa» he aprofitat la traducció (que a més
 #   és la que dóna el diccionari).  Mireu «perforate(1)».
-#: src/cp.c:233
+#: src/cp.c:240
 msgid ""
 "\n"
 "By default, sparse SOURCE files are detected by a crude heuristic and the\n"
@@ -2539,7 +2606,7 @@ msgstr ""
 "es\n"
 "recorrerà a una còpia estàndard.\n"
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 msgid ""
 "\n"
 "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n"
@@ -2556,7 +2623,7 @@ msgstr ""
 "VERSION_CONTROL.  Es poden emprar aquests valors:\n"
 "\n"
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2570,7 +2637,7 @@ msgstr ""
 "                   simples en cas contrari.\n"
 "  simple, never    Fa còpies de seguretat simples sempre.\n"
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2584,236 +2651,245 @@ msgstr ""
 "d’un fitxer ordinari existent.\n"
 
 # Usa quote().  ivb
-#: src/cp.c:317
+#: src/cp.c:324
 #, c-format
 msgid "failed to preserve times for %s"
 msgstr "no s’han pogut preservar les dates de %s"
 
 # Usa quote().  ivb
-#: src/cp.c:348
+#: src/cp.c:355
 #, c-format
 msgid "failed to preserve permissions for %s"
 msgstr "no s’han pogut preservar els permisos de %s"
 
 # Usa quote().  ivb
-#: src/cp.c:475
+#: src/cp.c:482
 #, c-format
 msgid "cannot make directory %s"
 msgstr "no s’ha pogut crear el directori %s"
 
 # Els 4 usen quote().  ivb
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr "%s existeix però no és un directori"
 
-# Els 2 usen quote().  ivb
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
-#, fuzzy, c-format
+# Usa quote().  ivb
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
+#, c-format
 msgid "failed to access %s"
-msgstr "no s’ha pogut obrir %s"
+msgstr "no s’ha pogut accedir a %s"
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, c-format
 msgid "missing file operand"
 msgstr "manca un operand fitxer"
 
 # Usa quote().  ivb
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, c-format
 msgid "missing destination file operand after %s"
 msgstr "manca un operand fitxer destinació després de %s"
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr ""
 "no es poden combinar «--target-directory» (-t) i «--no-target-directory» (-T)"
 
 # Usa quote().  ivb
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, c-format
 msgid "target %s is not a directory"
 msgstr "la destinació %s no és un directori"
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr "en emprar «--parents», la destinació ha de ser un directori"
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, c-format
 msgid "multiple target directories specified"
 msgstr "s’han especificat múltiples directoris destinació"
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr "avís: es descarta «--context» perquè necessita un nucli amb SELinux"
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr "no es poden crear enllaços forts i simbòlics alhora"
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr "les opcions «--backup» i «--no-clobber» són mútuament excloents"
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr "«--reflink» només es pot emprar amb «--sparse=auto»"
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr "tipus de còpia de seguretat"
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, c-format
+msgid "cannot set target context and preserve it"
+msgstr "no es pot canviar el context de la destinació i preservar�lo alhora"
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr ""
 "no es poden preservar els contexts de seguretat sota un nucli sense SELinux"
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr ""
 "no es poden preservar els atributs estesos perquè la compatibilitat amb "
-"aquests no ha sigut compiŀlada en «cp»"
+"aquests no ha sigut compil·lada en «cp»"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr "Stuart Kemp"
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr "l’entrada ha desaparegut"
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr "%s: el número de línia està fora de rang"
 
 # Usa quote().  ivb
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, c-format
 msgid "%s: %s: line number out of range"
 msgstr "%s: %s: el número de línia està fora de rang"
 
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, c-format
 msgid " on repetition %s\n"
 msgstr " a la %sa repetició\n"
 
 # Usa quote().  ivb
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, c-format
 msgid "%s: %s: match not found"
 msgstr "%s: %s: no s’ha trobat cap coincidència"
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr "error a la cerca de l’expressió regular"
 
 # Usa quote().  ivb
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, c-format
 msgid "write error for %s"
 msgstr "error en escriure %s"
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, c-format
 msgid "%s: integer expected after delimiter"
 msgstr "%s: s’esperava un número enter després del delimitador"
 
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr "%s: cal «}» al nombre de repeticions"
 
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr "%s}: cal especificar un número enter entre «{» i «}»"
 
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr "%s: manca el delimitador «%c» de tancament"
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr "%s: l’expressió regular no és vàlida: %s"
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr "%s: el patró no és vàlid"
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr "%s: el número de línia ha de ser major que zero"
 
 # Usa quote() en ambdues.  ivb
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr "el número de línia %s és menor que el número anterior, %s"
 
 # Usa quote().  ivb
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr "avís: el número de línia %s és el mateix que el número anterior"
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr "manca l’especificació de conversió al sufix"
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr "l’especificació de conversió al sufix no és vàlida: %c"
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr "l’especificació de conversió al sufix no és vàlida: \\%.3o"
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr "l’especifiació de conversió conté opcions no vàlides: %%%c%c"
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr "sobren especificacions de conversió «%%» al sufix"
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr "manca l’especificació de conversió «%%» al sufix"
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr "%s: el número no és vàlid"
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr "Forma d’ús: %s [OPCIÓ]… FITXER PATRÓ…\n"
 
-#: src/csplit.c:1455
-#, fuzzy
+#: src/csplit.c:1483
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
 "and output byte counts of each piece to standard output.\n"
@@ -2823,9 +2899,8 @@ msgstr ""
 "els trossos en fitxers anomenats «xx00», «xx01»… indicant a l’eixida "
 "estàndard\n"
 "la mida en octets de cadascun d’ells.\n"
-"\n"
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2837,7 +2912,13 @@ msgstr ""
 "  -f, --prefix=PREFIX    Empra aquest PREFIX en lloc de «xx».\n"
 "  -k, --keep-files     No elimina els fitxer generats, en cas d’error.\n"
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr ""
+"  -m, --suppress-matched\n"
+"                       Elimina les línies que coincideixen amb el PATRÓ.\n"
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
@@ -2849,7 +2930,7 @@ msgstr ""
 "  -z, --elide-empty-files\n"
 "                       Elimina els fitxers resultants que estan buits.\n"
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
@@ -2857,7 +2938,7 @@ msgstr ""
 "\n"
 "Si FITXER és «-», llegeix l’entrada estàndard.  Cada PATRÓ pot ser:\n"
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 msgid ""
 "\n"
 "  INTEGER            copy up to but not including specified line number\n"
@@ -2888,24 +2969,18 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr "David M. Ihnat"
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr "els camps i les posicions compten des d’1"
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr "Forma d’ús: %s OPCIÓ… [FITXER]…\n"
 
-#: src/cut.c:193
-#, fuzzy
+#: src/cut.c:176
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr ""
 "Escriu parts seleccionades de les línies de cada FITXER a la sortida\n"
 "estàndard.\n"
-"\n"
 
-#: src/cut.c:199
+#: src/cut.c:182
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
 "  -c, --characters=LIST   select only these characters\n"
@@ -2917,7 +2992,7 @@ msgstr ""
 "  -d, --delimiter=DELIM    Empra DELIM en lloc de la tabulació com a\n"
 "                       delimitador de camp.\n"
 
-#: src/cut.c:204
+#: src/cut.c:187
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
 "                            that contains no delimiter character, unless\n"
@@ -2931,7 +3006,7 @@ msgstr ""
 "                       que s’especifique l’opció «-s».\n"
 "  -n                   (No es té en compte.)\n"
 
-#: src/cut.c:210
+#: src/cut.c:193
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
 "                            or fields\n"
@@ -2939,7 +3014,7 @@ msgstr ""
 "      --complement     Complementa el conjunt d’octets, caràcters o camps\n"
 "                       escollits.\n"
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
@@ -2952,7 +3027,7 @@ msgstr ""
 "                       Empra la CADENA com a delimitador de sortida; per\n"
 "                       defecte s’utilitza el delimitador d’entrada.\n"
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2967,7 +3042,7 @@ msgstr ""
 "una\n"
 "sola volta, exactament.\n"
 
-#: src/cut.c:227
+#: src/cut.c:210
 msgid ""
 "Each range is one of:\n"
 "\n"
@@ -2987,63 +3062,66 @@ msgstr ""
 "\n"
 "Sense FITXER, o quan FITXER és «-», llegeix l’entrada estàndard.\n"
 
-#: src/cut.c:367 src/cut.c:493
-#, fuzzy
+#: src/cut.c:300 src/cut.c:394
 msgid "invalid byte, character or field list"
-msgstr "la llista d’octets o camps no és vàlida"
+msgstr "la llista d’octets, caràcters o camps no és vàlida"
 
-#: src/cut.c:387
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr "els camps i les posicions compten des d’1"
+
+#: src/cut.c:320
 msgid "invalid range with no endpoint: -"
 msgstr "l’interval sense punt final no és vàlid: -"
 
-#: src/cut.c:403
+#: src/cut.c:334
 msgid "invalid decreasing range"
 msgstr "l’interval decreixent no és vàlid"
 
 # És un enter correcte però massa gran.  ivb
 # Usa quote().  ivb
-#: src/cut.c:482
+#: src/cut.c:383
 #, c-format
 msgid "byte offset %s is too large"
 msgstr "el desplaçament en octets %s és massa gran"
 
 # És un enter correcte però massa gran.  ivb
 # Usa quote().  ivb
-#: src/cut.c:485
+#: src/cut.c:386
 #, c-format
 msgid "field number %s is too large"
 msgstr "el número de camp %s és massa gran"
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr "només es pot especificar un únic tipus de llista"
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr "el delimitador ha de ser un únic caràcter"
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr "cal que especifiqueu una llista d’octets, caràcters o camps"
 
-#: src/cut.c:850
+#: src/cut.c:790
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr ""
 "només es pot especificar un delimitador d’entrada quan s’opera amb camps"
 
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
 msgstr ""
 "eliminar les línies no delimitades només té sentit quan s’opera amb camps"
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr "manca la llista de camps"
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr "manca la llista de posicions"
 
@@ -3061,13 +3139,14 @@ msgstr ""
 #: src/date.c:128
 msgid "Display the current time in the given FORMAT, or set the system date.\n"
 msgstr ""
+"Mostra la data actual en el FORMAT indicat, o estableix la data del "
+"sistema.\n"
 
 # Sembla que date no accepta «ara»...  No anirà al locale... iv
 # No, en efecte, és cosa de getdate.y, que no té i18  iv
 # Hm. Ivan, revisa -I. Cal traduir les coses entrecomillades? jm
 # No, són arguments literals de -I, i no tenen traducció.  ivb
 #: src/date.c:134
-#, fuzzy
 msgid ""
 "  -d, --date=STRING         display time described by STRING, not 'now'\n"
 "  -f, --file=DATEFILE       like --date once for each line of DATEFILE\n"
@@ -3076,9 +3155,6 @@ msgid ""
 "                            'hours', 'minutes', 'seconds', or 'ns' for date\n"
 "                            and time to the indicated precision.\n"
 msgstr ""
-"Mostra la data actual en el FORMAT indicat, o estableix la data del "
-"sistema.\n"
-"\n"
 "  -d, --date=CADENA    Mostra la data descrita a la CADENA en lloc de la "
 "data\n"
 "                       actual («now», ara).\n"
@@ -3113,7 +3189,7 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 "      --rfc-3339=PRECISIÓ\n"
 "                       Mostra la data en format RFC 3339 fins a la PRECISIÓ\n"
@@ -3124,7 +3200,8 @@ msgstr ""
 "                       un sol espai: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=CADENA     Estableix la data descrita a la CADENA.\n"
 "  -u, --utc, --universal\n"
-"                       Mostra o estableix el Temps Universal Coordinat.\n"
+"                       Mostra o estableix el Temps Universal Coordinat "
+"(UTC).\n"
 
 # Les descr. han de començar en la 12a. columna (per «%:::z»).  ivb
 #: src/date.c:158
@@ -3351,10 +3428,10 @@ msgstr ""
 "\n"
 "    $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n"
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr "entrada estàndard"
@@ -3398,7 +3475,7 @@ msgstr ""
 msgid "cannot set date"
 msgstr "no s’ha pogut establir la data"
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, c-format
 msgid "time %s is out of range"
 msgstr "la data %s està fora de rang"
@@ -3409,7 +3486,7 @@ msgstr "la data %s està fora de rang"
 msgid "Paul Rubin"
 msgstr "Paul Rubin"
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
@@ -3418,7 +3495,7 @@ msgstr ""
 "Forma d’ús: %s [OPERAND]…\n"
 "      o bé: %s OPCIÓ\n"
 
-#: src/dd.c:526
+#: src/dd.c:532
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
 "\n"
@@ -3439,7 +3516,7 @@ msgstr ""
 "  ibs=OCTETS          Llegeix com a molt aquest nombre d’OCTETS alhora (per\n"
 "                      defecte 512).\n"
 
-#: src/dd.c:535
+#: src/dd.c:541
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
 "  iflag=FLAGS     read as per the comma separated symbol list\n"
@@ -3467,7 +3544,7 @@ msgstr ""
 "                      d’errors: «noxfer» amaga l’estadística de la\n"
 "                      tranferència, «none» amaga tota la informació.\n"
 
-#: src/dd.c:546
+#: src/dd.c:552
 msgid ""
 "\n"
 "N and BYTES may be followed by the following multiplicative suffixes:\n"
@@ -3485,7 +3562,7 @@ msgstr ""
 "Cada símbol de CONVERSIONS pot ser:\n"
 "\n"
 
-#: src/dd.c:555
+#: src/dd.c:561
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
 "  ebcdic    from ASCII to EBCDIC\n"
@@ -3502,7 +3579,7 @@ msgstr ""
 "  ascii        D’EBCDIC a ASCII.\n"
 "  ebcdic       D’ASCII a EBCDIC.\n"
 "  ibm          D’ASCII a EBCDIC alternat.\n"
-"  block        Emplena amb espais cada registre acabat en nova línia fins "
+"  block        Reomple amb espais cada registre acabat en nova línia fins "
 "que\n"
 "               tinga la mida «cbs».\n"
 "  unblock      Substitueix els espais del final de cada registre de mida "
@@ -3513,13 +3590,13 @@ msgstr ""
 "  sparse       Prova de desplaçar l’eixida en lloc d’escriure per als blocs\n"
 "               d’entrada plens de NUL.\n"
 "  swab         Intercanvia cada parell d’octets de l’entrada.\n"
-"  sync         Emplena cada bloc d’entrada amb NUL fins a la mida «ibs»; "
+"  sync         Reomple cada bloc d’entrada amb NUL fins a la mida «ibs»; "
 "quan\n"
-"               s’empra amb «block» o «unblock», emplena els blocs amb "
+"               s’empra amb «block» o «unblock», reomple els blocs amb "
 "espais\n"
 "               en lloc de NUL.\n"
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -3537,7 +3614,7 @@ msgstr ""
 "  fsync        El mateix, però també n’escriu les metadades.\n"
 
 # El més llarg és «count_bytes».  ivb
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -3551,83 +3628,83 @@ msgstr ""
 "  append         Mode de només addició (només té sentit per a l’eixida, es\n"
 "                 suggereix emprar «conv=notrunc»).\n"
 
-#: src/dd.c:583
+#: src/dd.c:589
 msgid "  cio       use concurrent I/O for data\n"
 msgstr "  cio            Empra E/S concurrent per a les dades.\n"
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr "  direct         Empra E/S directa per a les dades.\n"
 
-#: src/dd.c:587
+#: src/dd.c:593
 msgid "  directory  fail unless a directory\n"
 msgstr "  directory      Falla si no és un directori.\n"
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr "  dsync          Empra E/S sincronitzada per a les dades.\n"
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr "  sync           El mateix, però també per a les metadades.\n"
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr ""
 "  fullblock      Acumula blocs d’entrada sencers (símbol per a «iflag»).\n"
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr "  nonblock       Empra E/S no blocadora.\n"
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr "  noatime        No actualitza la data d’accés.\n"
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr "  nocache        Descarta les dades de la memòria cau.\n"
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr "  noctty         No assigna el fitxer com a terminal de control.\n"
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr "  nofollow       No segueix els enllaços simbòlics.\n"
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr "  nolinks        Falla si el fitxer té més d’un enllaç.\n"
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr "  binary         Empra E/S binària per a les dades.\n"
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr "  text           Empra E/S textual per a les dades.\n"
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr ""
 "  count_bytes    tracta el valor de «count=N» com a una quantitat d’octets\n"
 "                 (només per a «iflag»)\n"
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr ""
 "  skip_bytes     tracta el valor de «skip=N» com a una quantitat d’octets\n"
 "                 (només per a «iflag»)\n"
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr ""
 "  seek_bytes     tracta el valor de «seek=N» com a una quantitat d’octets\n"
 "                 (només per a «oflag»)\n"
 
 # La substitució pot ser «USR1» o «INFO».  ivb
-#: src/dd.c:625
+#: src/dd.c:631
 #, c-format
 msgid ""
 "\n"
@@ -3657,7 +3734,19 @@ msgstr ""
 "Les opcions són:\n"
 "\n"
 
-#: src/dd.c:683
+# No és molt literal, però s’entén.  ivb
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr "no hi ha memòria suficient per al bloc d’entrada de %zu octets (%s)"
+
+# No és molt literal, però s’entén.  ivb
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr "no hi ha memòria suficient per al bloc d’eixida de %zu octets (%s)"
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
@@ -3666,14 +3755,14 @@ msgstr ""
 "%<PRIuMAX>+%<PRIuMAX> registres llegits\n"
 "%<PRIuMAX>+%<PRIuMAX> registres escrits\n"
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
 msgstr[0] "%<PRIuMAX> registre truncat\n"
 msgstr[1] "%<PRIuMAX> registres truncats\n"
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
@@ -3681,7 +3770,7 @@ msgstr[0] "%<PRIuMAX> octet (%s) copiat"
 msgstr[1] "%<PRIuMAX> octets (%s) copiats"
 
 # Es refereix a octets per segon.  ivb
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr "Infinits B"
 
@@ -3695,96 +3784,96 @@ msgstr "Infinits B"
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
 msgstr ", %g s, %s/s\n"
 
 # Usa quote().  ivb
 # Condició d'error.  ivb
-#: src/dd.c:812
+#: src/dd.c:877
 #, c-format
 msgid "closing input file %s"
 msgstr "en tancar el fitxer d’entrada %s"
 
 # Usa quote().  ivb
 # Condició d'error.  ivb
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr "en tancar el fitxer d’eixida %s"
 
 # Usa quote() i és un nom de fitxer.  ivb
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr "no s’ha pogut inhabilitar «O_DIRECT» sobre %s"
 
 # Usa quote().  ivb
 # Condició d'error.  ivb
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, c-format
 msgid "writing to %s"
 msgstr "en escriure %s"
 
 # Usa quote().  ivb
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, c-format
 msgid "unrecognized operand %s"
 msgstr "l’operand %s no és reconegut"
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 msgid "invalid conversion"
 msgstr "la conversió no és vàlida"
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 msgid "invalid input flag"
 msgstr "el senyalador d’entrada no és vàlid"
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 msgid "invalid output flag"
 msgstr "el senyalador d’eixida no és vàlid"
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 msgid "invalid status flag"
 msgstr "el senyalador d’estat no és vàlid"
 
 # Usa quote().  ivb
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, c-format
 msgid "invalid number %s"
 msgstr "el número %s no és vàlid"
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr "no es poden combinar «ascii», «ebcdic» o «ibm»"
 
 # Són noms de senyaladors.  ivb
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, c-format
 msgid "cannot combine block and unblock"
 msgstr "no es poden combinar «block» i «unblock»"
 
 # Són noms de senyaladors.  ivb
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, c-format
 msgid "cannot combine lcase and ucase"
 msgstr "no es poden combinar «lcase» i «ucase»"
 
 # Són noms de senyaladors.  ivb
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, c-format
 msgid "cannot combine excl and nocreat"
 msgstr "no es poden combinar «excl» i «nocreat»"
 
 # Són noms de senyaladors.  ivb
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, c-format
 msgid "cannot combine direct and nocache"
 msgstr "no es poden combinar «direct» i «nocache»"
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
@@ -3793,83 +3882,71 @@ msgstr ""
 "avís: s’evita un error del nucli en lseek() per al fitxer «%s» de tipus "
 "mt_type=0x%0lx —vegeu <sys/mtio.h> per a la llista de tipus"
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, c-format
 msgid "%s: cannot skip"
 msgstr "%s: no s’ha pogut saltar"
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, c-format
 msgid "%s: cannot seek"
 msgstr "%s: no s’ha pogut desplaçar"
 
 # Usa quote().  ivb
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr "s’ha desbordat el desplaçament en llegir el fitxer %s"
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr ""
 "avís: després de la lectura fallada el desplaçament de fitxer no és vàlid"
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr "al final no s’ha pogut evitar l’error del nucli"
 
 # Usa quote().  ivb
 # Condició d'error.  ivb
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, c-format
 msgid "setting flags for %s"
 msgstr "en establir els senyaladors de %s"
 
-# No és molt literal, però s’entén.  ivb
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr "no hi ha memòria suficient per al bloc d’entrada de %zu octets (%s)"
-
-# No és molt literal, però s’entén.  ivb
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr "no hi ha memòria suficient per al bloc d’eixida de %zu octets (%s)"
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr "%s: no s’ha pogut saltar fins al desplaçament indicat"
 
 # Usa quote().  ivb
 # Condició d'error.  ivb
-#: src/dd.c:2133
-#, fuzzy, c-format
+#: src/dd.c:2172
+#, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
-msgstr "no s’ha pogut truncar a %<PRIuMAX> octets al fitxer d’eixida %s"
+msgstr "no s’ha pogut truncar a %<PRIdMAX> octets al fitxer d’eixida %s"
 
 # Usa quote.  ivb
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr "ha fallat fdatasync() sobre %s"
 
 # Usa quote().  ivb
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
 msgstr "ha fallat fsync() sobre %s"
 
 # Els 2 usen quote().  ivb
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, c-format
 msgid "failed to open %s"
 msgstr "no s’ha pogut obrir %s"
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
@@ -3880,100 +3957,109 @@ msgstr ""
 
 # Usa quote().  ivb
 # Condició d'error.  ivb
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr "no s’ha pogut truncar a %<PRIuMAX> octets al fitxer d’eixida %s"
 
 # Usa quote().  ivb
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, c-format
 msgid "failed to discard cache for: %s"
 msgstr "no s’ha pogut descartar la memòria cau de %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr "Paul Eggert"
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr "S. fitxers"
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr "Tipus"
 
 # Per a les capçaleres va al davant, en majúscula.  ivb
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr "Blocs"
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr "En ús"
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
-msgstr "Lliures"
+msgstr "Disponibles"
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr "%Ús"
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr "Nodes-i"
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr "En ús"
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr "Lliures"
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr "%Ús"
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr "Muntat a"
 
-#: src/df.c:383
+#: src/df.c:207
+msgid "File"
+msgstr "Fitxer"
+
+# Usa quote().  ivb
+#: src/df.c:387
 #, c-format
-msgid "option --output: field '%s' unknown"
-msgstr ""
+msgid "option --output: field %s unknown"
+msgstr "opció «--output»: el camp %s no és conegut"
 
 # Usa quote().  ivb
-#: src/df.c:390
-#, fuzzy, c-format
-msgid "option --output: field '%s' used more than once"
-msgstr "avís: s’ha especificat el fitxer origen %s més d’una vegada"
+#: src/df.c:394
+#, c-format
+msgid "option --output: field %s used more than once"
+msgstr "opció «--output»: s’ha especificat el camp %s més d’una vegada"
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr "Mida"
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr "Lliure"
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr "Cabuda"
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
 msgstr "%2$s de %1$s"
 
-#: src/df.c:1210
-#, fuzzy
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr ""
+
+#: src/df.c:1384
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
 "or all file systems by default.\n"
@@ -3981,31 +4067,32 @@ msgstr ""
 "Mostra informació sobre el sistema de fitxers on resideix cada FITXER, o "
 "(per\n"
 "defecte) informació sobre tots els sistemes de fitxers.\n"
-"\n"
 
 # Crec que «virtual» capta millor el significat de «dummy».  ivb
-#: src/df.c:1217
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
+#, fuzzy
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
 "  -a, --all            Inclou els sistemes de fitxers virtuals.\n"
 "  -B, --block-size=MIDA    Escala les mides a la MIDA donada abans de\n"
 "                       mostrar�les.  Per exemple, «-BM» mostra les mides en\n"
-"                       unitats de 1.048.576 octets.  Vegeu el format de la\n"
-"                       MIDA a sota.\n"
+"                       unitats de 1.048.576 octets.  Més detalls sobre el\n"
+"                       format de la MIDA a sota.\n"
 "      --total          Produeix un recompte total.\n"
 "  -h, --human-readable    Mostra les mides en un format llegible per als\n"
 "                       humans (per exemple: 1K 234M 2G).\n"
 "  -H, --si             El mateix, però empra potències de 1000, no de 1024.\n"
 
-#: src/df.c:1227
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -4013,15 +4100,15 @@ msgid ""
 "      --no-sync         do not invoke sync before getting usage info "
 "(default)\n"
 msgstr ""
-"  -i, --inodes         Llista informació sobre els nodes índex en lloc de\n"
+"  -i, --inodes         Llista informació sobre l’ús de nodes índex en lloc "
+"de\n"
 "                       sobre l’ús de blocs.\n"
 "  -k                   Equival a «--block-size=1K».\n"
 "  -l, --local          Limita el llistat als sistemes de fitxers locals.\n"
 "      --no-sync        No invoca sync() abans d’obtenir la informació sobre\n"
 "                       l’ús (per defecte).\n"
 
-#: src/df.c:1234
-#, fuzzy
+#: src/df.c:1409
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
 "                               or print all fields if FIELD_LIST is "
@@ -4033,6 +4120,10 @@ msgid ""
 "  -x, --exclude-type=TYPE   limit listing to file systems not of type TYPE\n"
 "  -v                    (ignored)\n"
 msgstr ""
+"      --output[=LLISTA_DE_CAMPS]\n"
+"                       Empra el format d’eixida definit a la "
+"LLISTA_DE_CAMPS, o\n"
+"                       mostra tots els camps si s’omet aquesta.\n"
 "  -P, --portability    Empra el format d’eixida POSIX.\n"
 "      --sync           Invoca sync() abans d’obtenir la informació sobre "
 "l’ús.\n"
@@ -4045,42 +4136,42 @@ msgstr ""
 "                       del TIPUS especificat.\n"
 "  -v                   (No es té en compte.)\n"
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
+"\n"
+"La LLISTA_DE_CAMPS és una llista separada per comes de columnes a incloure.\n"
+"Els noms de camp vàlids són: «source», «fstype», «itotal», «iused», "
+"«iavail»,\n"
+"«ipcent», «size», «used», «avail», «pcent», «file» i «target» (vegeu la "
+"plana\n"
+"info).\n"
 
-#: src/df.c:1285
-#, fuzzy, c-format
+# No usa quote(), passa les opcions com a -X.
+#: src/df.c:1460
+#, c-format
 msgid "options %s and %s are mutually exclusive"
-msgstr "les opcions «--compare» (-C) i «--strip» són mútuament excloents"
-
-#: src/df.c:1335
-msgid "warning: "
-msgstr "avís: "
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr "l’opció llarga «--megabytes» està desaprovada i serà eliminada aviat"
+msgstr "les opcions «%s» i «%s» són mútuament excloents"
 
 # Usa quote().  ivb
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr "s’ha seleccionat i exclós alhora el tipus de sistema de fitxers %s"
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr "avís: "
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 msgid "cannot read table of mounted file systems"
 msgstr "no s’ha pogut llegir la taula de sistemes de fitxers muntats"
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr "no s’ha processat cap sistema de fitxers"
@@ -4090,7 +4181,7 @@ msgstr "no s’ha processat cap sistema de fitxers"
 msgid "H. Peter Anvin"
 msgstr "H. Peter Anvin"
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr "Foma d’ús: %s [OPCIÓ]… [FITXER]\n"
@@ -4107,6 +4198,7 @@ msgstr ""
 "Produeix ordres per a establir la variable d’entorn LS_COLORS.\n"
 "\n"
 "Opcions per a determinar el format de l’eixida:\n"
+"\n"
 "  -b, --sh, --bourne-shell\n"
 "                       Produeix codi destinat a l’intèrpret Bourne per\n"
 "                       establir LS_COLORS.\n"
@@ -4184,7 +4276,8 @@ msgstr ""
 "\n"
 
 #: src/dirname.c:59
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
+#, fuzzy
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
 msgstr ""
 "  -z, --zero           Escriu un octet 0 en lloc de cada caràcter de nova\n"
 "                       línia per a separar els resultats.\n"
@@ -4205,7 +4298,7 @@ msgstr ""
 "  %s dir1/str dir2/str    -> «dir1» seguit per «dir2»\n"
 "  %s stdio.h              -> «.»\n"
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -4214,19 +4307,16 @@ msgstr ""
 "Forma d’ús: %s [OPCIÓ]… [FITXER]…\n"
 "      o bé: %s [OPCIÓ]… --files0-from=FITXER\n"
 
-#: src/du.c:274
-#, fuzzy
+#: src/du.c:285
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr ""
 "Resumeix l’ús de disc de cada FITXER, de forma recursiva per als "
 "directoris.\n"
-"\n"
 
-#: src/du.c:280
+#: src/du.c:291
 #, fuzzy
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -4234,6 +4324,9 @@ msgid ""
 "                          larger due to holes in ('sparse') files, internal\n"
 "                          fragmentation, indirect blocks, and the like\n"
 msgstr ""
+"  -0, --null           Acaba cada línia d’eixida amb un octet 0 en lloc "
+"d’un\n"
+"                       caràcter de nova línia.\n"
 "  -a, --all            Mostra recomptes per a tots els fitxers, no només "
 "per\n"
 "                       als directoris.\n"
@@ -4243,12 +4336,11 @@ msgstr ""
 "                       pels forats dels fitxers dispersos, per fragmentació\n"
 "                       interna, blocs indirectes…\n"
 
-#: src/du.c:289
-#, fuzzy
+#: src/du.c:300
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -4261,24 +4353,28 @@ msgid ""
 msgstr ""
 "  -B, --block-size=MIDA    Escala les mides a la MIDA donada abans de\n"
 "                       mostrar�les.  Per exemple, «-BM» mostra les mides en\n"
-"                       unitats de 1.048.576 octets.  Vegeu el format de la\n"
-"                       MIDA a sota.\n"
+"                       unitats de 1.048.576 octets.  Més detalls sobre el\n"
+"                       format de la MIDA a sota.\n"
 "  -b, --bytes          Equival a «--apparent-size --block-size=1».\n"
 "  -c, --total          Produeix un recompte total.\n"
 "  -D, --dereference-args\n"
 "                       Segueix els enllaços simbòlics que es troben a la "
 "línia\n"
 "                       d’ordres.\n"
+"  -d, --max-depth=N    Només mostra el total d’un directori (o fitxer, amb\n"
+"                       «--all») si es troba N nivells o menys per sota de\n"
+"                       l’argument de la línia d’ordres; «--max-depth=0»\n"
+"                       equival a «--summarize».\n"
 
-#: src/du.c:302
-#, fuzzy
+#: src/du.c:313
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
 "      --files0-from=FITXER\n"
 "                       Resumeix l’ús de disc dels fitxers els noms dels "
@@ -4290,10 +4386,11 @@ msgstr ""
 "  -H                   Equival a «--dereference-args» (-D).\n"
 "  -h, --human-readable    Mostra les mides en un format llegible per als\n"
 "                       humans (per exemple: 1K 234M 2G).\n"
-"      --si             Com «-h», però empra potències de 1000, no de 1024.\n"
+"      --inodes         Llista informació sobre l’ús de nodes índex en lloc "
+"de\n"
+"                       sobre l’ús de blocs.\n"
 
-#: src/du.c:310
-#, fuzzy
+#: src/du.c:322
 msgid ""
 "  -k                    like --block-size=1K\n"
 "  -L, --dereference     dereference all symbolic links\n"
@@ -4301,31 +4398,29 @@ msgid ""
 "  -m                    like --block-size=1M\n"
 msgstr ""
 "  -k                   Equival a «--block-size=1K».\n"
+"  -L, --dereference    Segueix els enllaços simbòlics.\n"
 "  -l, --count-links    Compta les mides més d’una volta al cas d’enllaços\n"
 "                       forts.\n"
 "  -m                   Equival a «--block-size=1M».\n"
 
-#: src/du.c:316
-#, fuzzy
+#: src/du.c:328
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
-"  -L, --dereference    Segueix tots els enllaços simbòlics.\n"
 "  -P, --no-dereference    No segueix cap enllaç simbòlic (per defecte).\n"
-"  -0, --null           Acaba cada línia d’eixida amb un octet 0 en lloc "
-"d’un\n"
-"                       caràcter de nova línia.\n"
-"  -S, --separate-dirs    No inclou la mida dels subdirectoris.\n"
+"  -S, --separate-dirs    Per als directoris no inclou la mida dels\n"
+"                       subdirectoris.\n"
+"      --si             Com «-h», però empra potències de 1000, no de 1024.\n"
 "  -s, --summarize      Només mostra un total per cada argument.\n"
 
 # «du» significa «disc usage», què OO tenen a veure aquestes opcions?  ivb
 # More creeping featurism.  ivb
-#: src/du.c:322
-#, fuzzy
+#: src/du.c:334
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
 "                          or entries greater than SIZE if negative\n"
@@ -4334,10 +4429,15 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
 msgstr ""
+"  -t, --threshold=MIDA    Exclou les entrades menors que la MIDA si aquesta "
+"és\n"
+"                       positiva, o les entrades majors que la MIDA si "
+"aquesta\n"
+"                       és negativa.\n"
 "      --time           Mostra la data de modificació més recent de tots els\n"
 "                       fitxers del directori i subdirectoris.\n"
 "      --time=DATA      Mostra la DATA indicada en lloc de la de "
@@ -4346,87 +4446,96 @@ msgstr ""
 "d’estat\n"
 "                       (amb «ctime» o «status»).\n"
 "      --time-style=ESTIL\n"
-"                       Mostra les dates emprant l’ESTIL indicat: full-iso,\n"
-"                       long-iso, iso, +FORMAT; FORMAT s’interpreta com en\n"
-"                       «date».\n"
+"                       Mostra les dates emprant l’ESTIL indicat: «full-"
+"iso»,\n"
+"                       «long-iso«, «iso», «+FORMAT»; FORMAT s’interpreta "
+"com\n"
+"                       en «date».\n"
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
 "  -x, --one-file-system    skip directories on different file systems\n"
 msgstr ""
+"  -X, --exclude-from=FITXER\n"
+"                       Exclou aquells fitxers que coincideixen amb algun "
+"dels\n"
+"                       patrons continguts al FITXER.\n"
+"      --exclude=PATRÓ    Exclou aquells fitxers que coincideixen amb el "
+"PATRÓ.\n"
+"  -x, --one-file-system    Exclou els directoris que es troben en altres\n"
+"                       sistemes de fitxers diferents.\n"
 
 # Es refereix a octets per segon.  ivb
-#: src/du.c:386
+#: src/du.c:398
 msgid "Infinity"
 msgstr "Infinits"
 
-# Usa quote().  ivb
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr "el punt de muntatge %s ja ha estat recorregut"
-
 # És una funció.  ivb
-#: src/du.c:624
+#: src/du.c:636
 #, c-format
 msgid "fts_read failed: %s"
 msgstr "ha fallat fts_read(): %s"
 
 # Usa quote().  ivb
-#: src/du.c:780
+#: src/du.c:787
 #, c-format
 msgid "invalid maximum depth %s"
 msgstr "la profunditat màxima %s no és vàlida"
 
-# La segona usa quote().  ivb
-#: src/du.c:809
-#, fuzzy, c-format
+#: src/du.c:816
+#, c-format
 msgid "invalid --threshold argument '-0'"
-msgstr "l’argument %2$s de l’opció «--%1$s» no és vàlid"
+msgstr "l’argument «-0» de l’opció «--threshold» no és vàlid"
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr "no es pot resumir les entrades i mostrar�ne els continguts alhora"
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr "avís: resumir equival a utilitzar «--max-depth=0»"
 
 # conflicts -> no compatible? jm
-#: src/du.c:900
+#: src/du.c:911
 #, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr "avís: resumir no és compatible amb «--max-depth=%lu»"
 
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+"avís: les opcions «--apparent-size» i «-b» no tenen efecte amb «--inodes»"
+
 # Açò s'imprimeix després d'un missatge d'error.  ivb
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 msgid "file operands cannot be combined with --files0-from"
 msgstr "No es poden combinar els operands fitxer amb «--files0-from»."
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr "%s: error de lectura"
 
 # Usa quote().  ivb
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr ""
 "no es permet %s entre els noms de fitxer llegits per l’entrada estàndard"
 
 # Usa quote().  ivb
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 msgid "invalid zero-length file name"
 msgstr "el nom buit de fitxer no és vàlid"
 
 # Els 3 fan el mateix ús.  ivb
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr "total"
 
@@ -4537,17 +4646,15 @@ msgstr "Forma d’ús: %s [OPCIÓ]… [-] [NOM=VALOR]… [ORDRE [ARG]…]\n"
 
 #: src/env.c:55
 msgid "Set each NAME to VALUE in the environment and run COMMAND.\n"
-msgstr ""
+msgstr "Estableix cada NOM a VALOR a l’entorn i executa l’ORDRE.\n"
 
 #: src/env.c:61
 #, fuzzy
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
-"Estableix cada NOM a VALOR a l’entorn i executa l’ORDRE.\n"
-"\n"
 "  -i, --ignore-environment\n"
 "                       Parteix d’un entorn buit.\n"
 "  -0, --null           Acaba cada línia d’eixida amb un octet 0 en lloc "
@@ -4582,7 +4689,6 @@ msgid "cannot specify --null (-0) with command"
 msgstr "no es pot especificar «--null» (-0) en indicar una ordre"
 
 #: src/expand.c:107
-#, fuzzy
 msgid ""
 "Convert tabs in each FILE to spaces, writing to standard output.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -4591,7 +4697,6 @@ msgstr ""
 "resultat a la sortida estàndard.  Sense FITXER, o quan FITXER és «-», "
 "llegeix\n"
 "l’entrada estàndard.\n"
-"\n"
 
 # Hau!  ivb
 # L'explicació d'«--initial» vé de la plana info.  ivb
@@ -4642,16 +4747,16 @@ msgid "input line is too long"
 msgstr "la línia d’entrada és massa llarga"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr "Mike Parker"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr "James Youngman"
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
@@ -4661,7 +4766,7 @@ msgstr ""
 "      o bé: %s OPCIÓ\n"
 
 # El més llarg és «substr CADENA POS LONGITUD».  ivb
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -4681,7 +4786,7 @@ msgstr ""
 "altrament.\n"
 
 # El més llarg és «substr CADENA POS LONGITUD».  ivb
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -4700,7 +4805,7 @@ msgstr ""
 "  ARG1 > ARG2                   ARG1 és major que ARG2.\n"
 
 # El més llarg és «substr CADENA POS LONGITUD».  ivb
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
@@ -4711,7 +4816,7 @@ msgstr ""
 "  ARG1 - ARG2                   Resta aritmètica d’ARG1 i ARG2.\n"
 
 # El més llarg és «substr CADENA POS LONGITUD».  ivb
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -4725,7 +4830,7 @@ msgstr ""
 "  ARG1 % ARG2                   Residu aritmètic d’ARG1 entre ARG2.\n"
 
 # El més llarg és «substr CADENA POS LONGITUD».  ivb
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -4747,7 +4852,7 @@ msgstr ""
 "  length STRING                 Longitud de la CADENA.\n"
 
 # El més llarg és «substr CADENA POS LONGITUD».  ivb
-#: src/expr.c:251
+#: src/expr.c:250
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
 "                               keyword like 'match' or an operator like '/'\n"
@@ -4760,7 +4865,7 @@ msgstr ""
 "                                o un operador com «/».\n"
 "  ( EXPRESSIÓ )                 Valor de l’EXPRESSIÓ.\n"
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -4778,7 +4883,7 @@ msgstr ""
 "«\\)»,\n"
 "retornen el nombre de caràcters coincidents o 0.\n"
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -4786,39 +4891,39 @@ msgid ""
 "or 0, 2 if EXPRESSION is syntactically invalid, and 3 if an error occurred.\n"
 msgstr ""
 "\n"
-"L’estat d’eixida és 0 si l’expressió no és nuŀla ni 0; 1 si l’expressió és\n"
-"nuŀla o 0; 2 si l’EXPRESSIÓ no és vàlida sintàcticament; 3 si ocorre un "
+"El codi d’eixida és 0 si l’expressió no és nul·la ni 0; 1 si l’expressió és\n"
+"nul·la o 0; 2 si l’EXPRESSIÓ no és vàlida sintàcticament; 3 si ocorre un "
 "error.\n"
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, c-format
 msgid "syntax error"
 msgstr "error de sintaxi"
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, c-format
 msgid "error in regular expression matcher"
 msgstr "error al cercador d’expressions regulars"
 
 # És un missatge d'error.  ivb
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, c-format
 msgid "non-integer argument"
 msgstr "l’argument no és enter"
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr "divisió entre zero"
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr "establiu la variable LC_ALL a «C» per a evitar el problema"
 
 # Segueix un missatge d’error.  ivb
 # Usa quote() en les 2.  ivb
-#: src/expr.c:889
+#: src/expr.c:881
 #, c-format
 msgid "the strings compared were %s and %s"
 msgstr "Les cadenes comparades eren %s i %s."
@@ -4828,29 +4933,29 @@ msgstr "Les cadenes comparades eren %s i %s."
 msgid "Niels Moller"
 msgstr "Niels Möller"
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
 msgstr "Ha fallat el test de primalitat de Lucas.  Açò no hauria d’ocórrer. "
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
 msgstr "s’ha desbordat la cua d’SQUFOF"
 
 # Usa quote().  ivb
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, c-format
 msgid "%s is not a valid positive integer"
 msgstr "%s no és un número enter positiu vàlid"
 
 # És un enter correcte però massa gran.  ivb
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr "%s és massa gran"
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
@@ -4859,7 +4964,7 @@ msgstr ""
 "Forma d’ús: %s [NÚMERO]…\n"
 "      o bé: %s OPCIÓ\n"
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
 "are specified on the command line, read them from standard input.\n"
@@ -4898,14 +5003,12 @@ msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n"
 msgstr "Forma d’ús: %s [-AMPLADA] [OPCIÓ]… [FITXER]…\n"
 
 #: src/fmt.c:271
-#, fuzzy
 msgid ""
 "Reformat each paragraph in the FILE(s), writing to standard output.\n"
 "The option -WIDTH is an abbreviated form of --width=DIGITS.\n"
 msgstr ""
 "Reformata els paràgrafs de cada FITXER, i escriu a la sortida estàndard.\n"
 "L’opció «-AMPLADA» és la forma abreujada de «--width=AMPLADA».\n"
-"\n"
 
 # buscar una traducció per refill
 # Així queda prou clar, d'acord amb l'info.  ivb
@@ -4960,7 +5063,6 @@ msgid "invalid width: %s"
 msgstr "l’amplada no és vàlida: %s"
 
 #: src/fold.c:70
-#, fuzzy
 msgid ""
 "Wrap input lines in each FILE (standard input by default), writing to\n"
 "standard output.\n"
@@ -4968,7 +5070,6 @@ msgstr ""
 "Ajusta les línies de cada FITXER (per defecte l’entrada estàndard), i "
 "escriu\n"
 "a la sortida estàndard.\n"
-"\n"
 
 #: src/fold.c:77
 msgid ""
@@ -4987,17 +5088,17 @@ msgid "invalid number of columns: %s"
 msgstr "el nombre de columnes no és vàlid: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr "Padraig Brady"
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, c-format
 msgid "Usage: %s\n"
 msgstr "Forma d’ús: %s\n"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
@@ -5007,12 +5108,12 @@ msgstr ""
 "\n"
 
 # Usa quote().  ivb
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, c-format
 msgid "failed to get groups for user %s"
 msgstr "no s’han pogut obtenir els grups de l’usuari %s"
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, c-format
 msgid "failed to get groups for the current process"
 msgstr "no s’han pogut obtenir els grups del procés actual"
@@ -5038,29 +5139,28 @@ msgstr ""
 "procés actual (la informació pot diferir si la base de dades de grups ha\n"
 "canviat).\n"
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, c-format
 msgid "cannot get real UID"
 msgstr "no s’ha pogut obtenir l’UID real"
 
 # Usa quote().  ivb
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, c-format
 msgid "cannot get effective GID"
 msgstr "no s’ha pogut obtenir el GID efectiu"
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, c-format
 msgid "cannot get real GID"
 msgstr "no s’ha pogut obtenir el GID real"
 
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, c-format
 msgid "%s: no such user"
 msgstr "%s: l’usuari no existeix"
 
 #: src/head.c:109
-#, fuzzy
 msgid ""
 "Print the first 10 lines of each FILE to standard output.\n"
 "With more than one FILE, precede each with a header giving the file name.\n"
@@ -5071,7 +5171,6 @@ msgstr ""
 "d’un fitxer, els precedeix amb una capçalera amb el nom del fitxer.  Sense "
 "cap\n"
 "FITXER, o quan FITXER és «-», llegeix l’entrada estàndard.\n"
-"\n"
 
 #: src/head.c:117
 msgid ""
@@ -5112,60 +5211,49 @@ msgstr ""
 "M 1024*1024, GB 1000*1000*1000, G 1024*1024*1024, i així per a T, P, E, Z, "
 "Y.\n"
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr "%s: el fitxer ha minvat massa"
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, c-format
 msgid "%s: number of bytes is too large"
 msgstr "%s: el nombre d’octets és massa gran"
 
-#: src/head.c:440
-#, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr "%s: no s’ha pogut desplaçar fins a la posició original"
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr "%s: no s’ha pogut moure fins al desplaçament %s"
 
-#: src/head.c:673
-#, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "%s: no s’ha pogut reiniciar el punter del fitxer"
-
-# Usa quote().  ivb
-#: src/head.c:798
+#: src/head.c:423 src/tail.c:457
 #, c-format
-msgid "cannot reposition file pointer for %s"
-msgstr "no s’ha pogut recoŀlocar el punter del fitxer de %s"
+msgid "%s: cannot seek to relative offset %s"
+msgstr "%s: no s’ha pogut moure dins el desplaçament relatiu %s"
 
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr "%s: %s és tan gran que no es pot representar"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr "el nombre de línies"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr "el nombre d’octets"
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr "el nombre de línies no és vàlid"
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr "el nombre d’octets no és vàlid"
 
 # Per a invocacions com ``head -10x``.  ivb
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, c-format
 msgid "invalid trailing option -- %c"
 msgstr "l’opció final «%c» no és vàlida"
@@ -5211,33 +5299,39 @@ msgid "cannot determine hostname"
 msgstr "no s’ha pogut determinar el nom d’estació"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr "Arnold Robbins"
 
-# FIXME: groups seems to allow several USERNAMEs, should use [USERNAME...]  ivb
-#: src/id.c:81
+#: src/id.c:84
 #, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
-msgstr "Forma d’ús: %s [OPCIÓ]… [NOM_USUARI]\n"
+msgid "Usage: %s [OPTION]... [USER]\n"
+msgstr "Forma d’ús: %s [OPCIÓ]… [USUARI]\n"
 
-#: src/id.c:82
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
 msgstr ""
-"Mostra la informació d’usuari i grup per a l’usuari indicat, o per a "
+"Mostra la informació d’usuari i grup per a l’USUARI indicat, o per a "
 "l’usuari\n"
 "actual si no s’indica.\n"
 "\n"
+
+#: src/id.c:90
+#, fuzzy
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
+msgstr ""
 "  -a                   No es té en compte, s’accepta per compatibilitat amb\n"
 "                       altres versions.\n"
 "  -Z, --context        Només mostra el context de seguretat de l’usuari\n"
@@ -5249,8 +5343,10 @@ msgstr ""
 "a\n"
 "                       «-ugG».\n"
 "  -u, --user           Només mostra l’identificador efectiu d’usuari.\n"
+"  -z, --zero           Escriu octets 0 en lloc d’espais per a separar les\n"
+"                       entrades.  No es permet amb el format per defecte.\n"
 
-#: src/id.c:96
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
@@ -5258,127 +5354,137 @@ msgstr ""
 "\n"
 "Sense cap OPCIÓ, mostra un conjunt útil d’informació d’identificació.\n"
 
-#: src/id.c:140
+#: src/id.c:151
+#, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr "«--context» (-Z) només funciona sota un nucli amb SELinux o SMACK"
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr "«--context» (-Z) només funciona sota un nucli amb SELinux"
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr "no es pot mostrar el context de seguretat quan s’indica un usuari"
 
-#: src/id.c:178
+#: src/id.c:198
 #, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr "tan sols es pot emprar una de les opcions que només mostren un valor"
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr "no es pot mostrar només noms o ID reals al format per defecte"
 
-#: src/id.c:199
+#: src/id.c:209
+#, c-format
+msgid "option --zero not permitted in default format"
+msgstr "no es permet l’opció «--zero» al format per defecte"
+
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
 msgstr "no s’ha pogut obtenir el context del procés"
 
 # Usa quote().  ivb
-#: src/id.c:224
+#: src/id.c:265
 #, c-format
 msgid "cannot get effective UID"
 msgstr "no s’ha pogut obtenir l’UID efectiu"
 
-#: src/id.c:311
+#: src/id.c:354
 #, c-format
 msgid "cannot find name for user ID %s"
 msgstr "no s’ha pogut trobar el nom de l’ID d’usuari %s"
 
 # Crec que el millor és deixar les sigles tal qual.  ivb
-#: src/id.c:329
+#: src/id.c:372
 #, c-format
 msgid "uid=%s"
 msgstr "uid=%s"
 
-#: src/id.c:334
+#: src/id.c:377
 #, c-format
 msgid " gid=%s"
 msgstr " gid=%s"
 
-#: src/id.c:341
+#: src/id.c:384
 #, c-format
 msgid " euid=%s"
 msgstr " euid=%s"
 
-#: src/id.c:349
+#: src/id.c:392
 #, c-format
 msgid " egid=%s"
 msgstr " egid=%s"
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr " grups="
 
-#: src/id.c:393
+#: src/id.c:437
 #, c-format
 msgid " context=%s"
 msgstr " context=%s"
 
 # Usa quote() en el 1r. argument, però no en el 2n.  ivb
-#: src/install.c:373
+#: src/install.c:376
 #, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr "avís: %s: no s’ha pogut canviar el context a «%s»"
 
 # Els 2 usen quote().  ivb
 # És un missatge informatiu.  ivb
-#: src/install.c:414
+#: src/install.c:417
 #, c-format
 msgid "creating directory %s"
 msgstr "s’està creant el directori %s"
 
 # Usa quote().  ivb
-#: src/install.c:482
+#: src/install.c:485
 #, c-format
 msgid "cannot change ownership of %s"
 msgstr "no s’ha pogut canviar el propietari de %s"
 
 # Usa quote().  ivb
-#: src/install.c:506
+#: src/install.c:509
 #, c-format
 msgid "cannot set time stamps for %s"
 msgstr "no s’han pogut establir les dates de %s"
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, c-format
 msgid "fork system call failed"
 msgstr "ha fallat la crida al sistema fork()"
 
 # No usa quote().  ivb
-#: src/install.c:531
+#: src/install.c:535
 #, c-format
 msgid "cannot run %s"
 msgstr "no s’ha pogut executar «%s»"
 
 # Usa quote().  ivb
 # Condició d'error.  ivb
-#: src/install.c:535
+#: src/install.c:539
 #, c-format
 msgid "waiting for strip"
 msgstr "en esperar la finalització d’«strip»"
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr "el procés «strip» ha finalitzat de forma anormal"
 
 # Usa quote().  ivb
-#: src/install.c:558
+#: src/install.c:565
 #, c-format
 msgid "invalid user %s"
 msgstr "l’usuari %s no és vàlid"
 
-#: src/install.c:594
+#: src/install.c:601
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -5391,8 +5497,7 @@ msgstr ""
 "      o bé: %s [OPCIÓ]… -t DIRECTORI ORIGEN…\n"
 "      o bé: %s [OPCIÓ]… -d DIRECTORI…\n"
 
-#: src/install.c:601
-#, fuzzy
+#: src/install.c:608
 msgid ""
 "\n"
 "This install program copies files (often just compiled) into destination\n"
@@ -5406,10 +5511,10 @@ msgid ""
 "In the 4th form, create all components of the given DIRECTORY(ies).\n"
 msgstr ""
 "\n"
-"Aquest programa d’instaŀlació còpia fitxers (a sovint tot just compiŀlats) "
+"Aquest programa d’instal·lació còpia fitxers (a sovint tot just compil·lats) "
 "a\n"
 "les ubicacions de destinació que escolliu.  Si el que voleu és baixar i\n"
-"instaŀlar un paquet llest per al seu ús sota un sistema GNU/Linux, empreu "
+"instal·lar un paquet llest per al seu ús sota un sistema GNU/Linux, empreu "
 "un\n"
 "gestor de paquets com «yum(1)» o «apt-get(1)».\n"
 "\n"
@@ -5418,9 +5523,8 @@ msgstr ""
 "propietari\n"
 "o grup.  Al quart format es creen tots els components de cada DIRECTORI\n"
 "indicat.\n"
-"\n"
 
-#: src/install.c:615
+#: src/install.c:622
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
 "  -b                  like --backup but does not accept an argument\n"
@@ -5445,7 +5549,7 @@ msgstr ""
 "crea\n"
 "                       tots els components de cada directori especificat.\n"
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -5465,7 +5569,7 @@ msgstr ""
 "                       d’emprar «rwxr-xr-x».\n"
 "  -o, --owner=OWNER    Estableix el propietari (només per al superusuari).\n"
 
-#: src/install.c:631
+#: src/install.c:638
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
 "files\n"
@@ -5493,74 +5597,74 @@ msgstr ""
 "  -v, --verbose        Mostra el nom de cada directori segons es van "
 "creant.\n"
 
-#: src/install.c:641
+#: src/install.c:648
+#, fuzzy
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
 "      --preserve-context\n"
 "                       Preserva el context de seguretat de SELinux.\n"
-"  -Z, --context=CONTEXT    Estableix el context de seguretat de SELinux "
-"dels\n"
-"                       fitxers i directoris.\n"
+"  -Z, --context[=CONTEXT]\n"
+"                       Estableix el context de seguretat de SELinux del\n"
+"                       fitxer destinació al tipus per defecte, o al CONTEXT "
+"si\n"
+"                       s’especifica.\n"
 
-#: src/install.c:859
+# Usa quote().  ivb
+#: src/install.c:696 src/unlink.c:86
 #, c-format
-msgid ""
-"WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
-msgstr "avís: es descarta «--preserve-context» sota aquest nucli sense SELinux"
+msgid "cannot unlink %s"
+msgstr "no s’ha pogut deslligar %s"
 
-#: src/install.c:869
+#: src/install.c:877
 #, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
-msgstr "avís: es descarta «--context» (-Z) sota aquest nucli sense SELinux"
+msgid ""
+"WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
+msgstr ""
+"avís: es descarta «--preserve-context» perquè necessita un nucli amb SELinux"
 
-#: src/install.c:886
+#: src/install.c:917
 #, c-format
 msgid "the strip option may not be used when installing a directory"
-msgstr "no es pot emprar l’opció «--strip» en instaŀlar un directori"
+msgstr "no es pot emprar l’opció «--strip» en instal·lar un directori"
 
 # Es refereix a especificar l'opció «--target-directory».  ivb
-#: src/install.c:889
+#: src/install.c:920
 #, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr ""
-"no es pot especificar el directori destinació en instaŀlar un directori"
-
-# Usa quote().  ivb
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr ""
-"no es pot canviar a %s el context de la destinació i preservar�lo alhora"
+"no es pot especificar el directori destinació en instal·lar un directori"
 
 # Els 2 usen quote().  ivb
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, c-format
 msgid "invalid mode %s"
 msgstr "el mode %s no és vàlid"
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr ""
 "avís: es descarta l’opció «--strip-program» ja que no s’ha emprat l’opció «-"
 "s»"
 
-#: src/install.c:959
+#: src/install.c:1001
 #, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr ""
 "les opcions «--compare» (-C) i «--preserve-timestamps» són mútuament "
 "excloents"
 
-#: src/install.c:966
+#: src/install.c:1008
 #, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr "les opcions «--compare» (-C) i «--strip» són mútuament excloents"
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -5574,7 +5678,7 @@ msgstr ""
 msgid "Mike Haertel"
 msgstr "Mike Haertel"
 
-#: src/join.c:191
+#: src/join.c:195
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
 "standard output.  The default join field is the first, delimited\n"
@@ -5594,7 +5698,7 @@ msgstr ""
 "                       NUMFITXER, «1» per al FITXER1 o «2» per al FITXER2.\n"
 "  -e CADENA            Reemplaça els camps que manquen amb CADENA.\n"
 
-#: src/join.c:200
+#: src/join.c:204
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
 "  -j FIELD          equivalent to '-1 FIELD -2 FIELD'\n"
@@ -5610,7 +5714,7 @@ msgstr ""
 "d’entrada\n"
 "                       i de sortida.\n"
 
-#: src/join.c:206
+#: src/join.c:210
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
 "  -1 FIELD          join on this FIELD of file 1\n"
@@ -5636,7 +5740,15 @@ msgstr ""
 "                       de camp, i les imprimeix sense provar d’emparellar�"
 "les.\n"
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+#, fuzzy
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr ""
+"  -z, --zero-terminated    Escriu un octet 0 en lloc de cada caràcter de "
+"nova\n"
+"                       línia.\n"
+
+#: src/join.c:225
 msgid ""
 "\n"
 "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n"
@@ -5678,37 +5790,37 @@ msgstr ""
 "es\n"
 "poden emparellar algunes línies, es mostrarà un missatge d’avís.\n"
 
-#: src/join.c:403
-#, fuzzy, c-format
+#: src/join.c:410
+#, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
-msgstr "%s:%ju: no es troba ordenat: %.*s"
+msgstr "%s:%<PRIuMAX>: no es troba ordenat: %.*s"
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, c-format
 msgid "invalid field number: %s"
 msgstr "el número de camp «%s» no és vàlid"
 
 # Ambdues usen quote().  ivb
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, c-format
 msgid "invalid field specifier: %s"
 msgstr "l’especificació de camp %s no és vàlida"
 
 # Usa quote().  ivb
 # No ho pose al davant pq tb hi apareix el número de camp.  ivb
-#: src/join.c:877
+#: src/join.c:884
 #, c-format
 msgid "invalid file number in field spec: %s"
 msgstr "el número de fitxer a l’especificació de camp no és vàlid: %s"
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr "els camps d’unió %lu i %lu no són compatibles"
 
 # Hau!  ivb
 # I damunt no descriu bé l'error.  ivb
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr ""
@@ -5716,18 +5828,18 @@ msgstr ""
 
 # Ambdues usen quote().  ivb
 # No és necessàriament una tabulació, ho diu info.  ivb
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, c-format
 msgid "multi-character tab %s"
 msgstr "%s és un separador multicaràcter"
 
 # No és necessàriament una tabulació, ho diu info.  ivb
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr "els separadors no són compatibles"
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr "ambdós fitxers no poden ser l’entrada estàndard"
@@ -5744,11 +5856,8 @@ msgstr ""
 "      o bé: %s -t [SENYAL]…\n"
 
 #: src/kill.c:82
-#, fuzzy
 msgid "Send signals to processes, or list signals.\n"
-msgstr ""
-"Envia senyals als processos, o llista els senyals.\n"
-"\n"
+msgstr "Envia senyals als processos, o llista els senyals.\n"
 
 #: src/kill.c:88
 msgid ""
@@ -5774,7 +5883,7 @@ msgid ""
 msgstr ""
 "\n"
 "SENYAL pot ser un nom de senyal com «HUP», un número de senyal com «1», o\n"
-"l’estat d’eixida d’un procés finalitzat per un senyal.  PID és un número\n"
+"el codi d’eixida d’un procés finalitzat per un senyal.  PID és un número\n"
 "enter; si és negatiu identifica un grup de processos.\n"
 
 #: src/kill.c:205
@@ -5857,30 +5966,30 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr "no s’ha pogut crear l’enllaç %s cap a %s"
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr "%s: no es permet l’enllaç fort cap al directori"
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, c-format
 msgid "%s: cannot overwrite directory"
 msgstr "%s: no es pot sobreescriure un directori"
 
 # Usa quote().  ivb
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
 msgstr "%s: voleu reemplaçar %s? "
 
 # Usa quote().  ivb
-#: src/ln.c:345
+#: src/ln.c:362
 #, c-format
 msgid "failed to create symbolic link %s"
 msgstr "no s’ha pogut crear l’enllaç simbòlic %s"
 
 # Usa quote() en els 2 arguments.  ivb
-#: src/ln.c:346
+#: src/ln.c:363
 #, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr "no s’ha pogut crear l’enllaç simbòlic %s cap a %s"
@@ -5888,24 +5997,24 @@ msgstr "no s’ha pogut crear l’enllaç simbòlic %s cap a %s"
 # Usa quote() en els 2 args.  ivb
 # Indica condició d'error.  ivb
 # La primera substitució es «menja» la cadena.  ivb
-#: src/ln.c:348
+#: src/ln.c:365
 #, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr "no s’ha pogut crear l’enllaç fort cap a %.0s%s"
 
 # Usa quote() en els 2 args.  ivb
-#: src/ln.c:351
+#: src/ln.c:368
 #, c-format
 msgid "failed to create hard link %s"
 msgstr "no s’ha pogut crear l’enllaç fort %s"
 
 # Usa quote() en els 2 args.  ivb
-#: src/ln.c:352
+#: src/ln.c:369
 #, c-format
 msgid "failed to create hard link %s => %s"
 msgstr "no s’ha pogut crear l’enllaç fort %s cap a %s"
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -5918,8 +6027,7 @@ msgstr ""
 "      o bé: %s [OPCIÓ]… DESTINACIÓ… DIRECTORI         (3a forma)\n"
 "      o bé: %s [OPCIÓ]… -t DIRECTORI DESTINACIÓ…      (4a forma)\n"
 
-#: src/ln.c:381
-#, fuzzy
+#: src/ln.c:398
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
 "In the 2nd form, create a link to TARGET in the current directory.\n"
@@ -5941,9 +6049,8 @@ msgstr ""
 "DESTINACIÓ.\n"
 "Els enllaços simbòlics poden contenir qualsevol text, i a l’hora de ser\n"
 "resolt, un enllaç relatiu serà interpretat respecte al seu directori pare.\n"
-"\n"
 
-#: src/ln.c:394
+#: src/ln.c:411
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
 "file\n"
@@ -5969,7 +6076,7 @@ msgstr ""
 "                       sistema).\n"
 "  -f, --force          Elimina els fitxers destinació existents.\n"
 
-#: src/ln.c:402
+#: src/ln.c:419
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
 "  -L, --logical               dereference TARGETs that are symbolic links\n"
@@ -5991,7 +6098,7 @@ msgstr ""
 "                       ubicació.\n"
 "  -s, --symbolic       Crea enllaços simbòlics en lloc de forts.\n"
 
-#: src/ln.c:411
+#: src/ln.c:428
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
 "  -t, --target-directory=DIRECTORY  specify the DIRECTORY in which to "
@@ -6008,24 +6115,25 @@ msgstr ""
 "                       Sempre tracta NOM_ENLLAÇ com a un fitxer normal.\n"
 "  -v, --verbose        Mostra el nom de cada fitxer enllaçat.\n"
 
-#: src/ln.c:433
-#, fuzzy, c-format
+#: src/ln.c:450
+#, c-format
 msgid ""
 "\n"
 "Using -s ignores -L and -P.  Otherwise, the last option specified controls\n"
 "behavior when a TARGET is a symbolic link, defaulting to %s.\n"
 msgstr ""
+"\n"
 "En emprar l’opció «-s» es descarten «-L» i «-P».  Altrament, l’última opció\n"
 "indicada controla el comportament quan una DESTINACIÓ és un enllaç "
 "simbòlic,\n"
 "sent l’opció per defecte «%s».\n"
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr "no es poden combinar «--target-directory» i «--no-target-directory»"
 
-#: src/ln.c:588
+#: src/ln.c:605
 #, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr "«--relative» necessita «--symbolic»"
@@ -6059,7 +6167,7 @@ msgstr "no hi ha nom d’entrada"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 msgid "%b %e  %Y"
 msgstr "%e %b  %Y"
 
@@ -6069,101 +6177,101 @@ msgstr "%e %b  %Y"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 msgid "%b %e %H:%M"
 msgstr "%e %b %H:%M"
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr ""
 "es descarta el valor no vàlid de la variable d’entorn QUOTING_STYLE: %s"
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr "es descarta l’amplària no vàlida a la variable d’entorn COLUMNS: %s"
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr ""
 "es descarta l’amplària no vàlida de tabulació a la variable d’entorn "
 "TABSIZE: %s"
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, c-format
 msgid "invalid line width: %s"
 msgstr "l’amplària de línia no és vàlida: %s"
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, c-format
 msgid "invalid tab size: %s"
 msgstr "l’amplària de tabulació no és vàlida: %s"
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, c-format
 msgid "invalid time style format %s"
 msgstr "l’estil de data «%s» no és vàlid"
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 msgid "Valid arguments are:\n"
 msgstr "Els arguments vàlids són:\n"
 
 # No pose cometes al principi perquè abans apareix una altra línia sense.  ivb
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr "  - +FORMAT (p.ex. «+%H:%M») per al format a l’estil de «date»\n"
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr "error en iniciar les cadenes dels mesos"
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, c-format
 msgid "unrecognized prefix: %s"
 msgstr "el prefix no és reconegut: %s"
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr "el valor de la variable d’entorn LS_COLORS no és interpretable"
 
 # Usa quote().  ivb
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, c-format
 msgid "cannot open directory %s"
 msgstr "no s’ha pogut obrir el directori %s"
 
 # Usa quote().  ivb
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, c-format
 msgid "cannot determine device and inode of %s"
 msgstr "no es poden determinar el dispositiu i node índex de %s"
 
 # Usa quote().  ivb
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, c-format
 msgid "%s: not listing already-listed directory"
 msgstr "%s: no es llista el directori ja llistat"
 
 # Els 2 usen quote().  ivb
 # Indica condició d'error.  ivb
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, c-format
 msgid "reading directory %s"
 msgstr "en llegir el directori %s"
 
 # Usa quote().  ivb
 # És un missatge d'error.  ivb
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, c-format
 msgid "closing directory %s"
 msgstr "en tancar el directori %s"
 
 # Usa quote() en els 2 args.  ivb
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, c-format
 msgid "cannot compare file names %s and %s"
 msgstr "no es poden comparar els noms de fitxer %s i %s"
@@ -6173,8 +6281,7 @@ msgstr "no es poden comparar els noms de fitxer %s i %s"
 #   2.- Com és d'important el principi KISS
 #   3.- Com és de _vital_ el moviment cap enrere de la pantalla de text
 # (Déu els compila i ells s'enllacen!)  ivb
-#: src/ls.c:4721
-#, fuzzy
+#: src/ls.c:4781
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
 "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n"
@@ -6183,10 +6290,9 @@ msgstr ""
 "actual).\n"
 "Ordena les entrades alfabèticament si no s’indica cap de les opcions\n"
 "«-cftuvSUX» o «--sort».\n"
-"\n"
 
 # Amb «implied» vol dir que no han estat indicats explícitament com a args.  ivb
-#: src/ls.c:4728
+#: src/ls.c:4788
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
 "  -A, --almost-all           do not list implied . and ..\n"
@@ -6200,23 +6306,23 @@ msgstr ""
 "  -b, --escape         Mostra seqüències d’escapada a l’estil de C per als\n"
 "                       caràcters no gràfics.\n"
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
 "      --block-size=MIDA    Escala les mides a la MIDA donada abans de\n"
 "                       mostrar�les.  Per exemple, «-BM» mostra les mides en\n"
-"                       unitats de 1.048.576 octets.  Vegeu el format de la\n"
-"                       MIDA a sota.\n"
+"                       unitats de 1.048.576 octets.  Més detalls sobre el\n"
+"                       format de la MIDA a sota.\n"
 "  -B, --ignore-backups    No mostra les entrades implícites acabades en "
 "«~».\n"
 "  -c                   Amb «-lt», ordena per (i mostra) la data de canvi\n"
@@ -6227,26 +6333,26 @@ msgstr ""
 "més\n"
 "                       nou).\n"
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 "  -C                   Llista les entrades en columnes.\n"
-"      --color[=QUAN]    Empra colors en l’eixida.  QUAN pot ser «always»\n"
-"                       (sempre, per defecte), «never» (mai) o «auto»\n"
-"                       (automàtic).  Més informació a sota.\n"
-"  -d, --directory      Llista les entrades dels directoris en lloc de llurs\n"
-"                       continguts, i no segueix els enllaços simbòlics.\n"
+"      --color[=QUAN]    Empra colors en l’eixida.  QUAN pot ser "
+"«never» (mai),\n"
+"                       «auto» (automàtic) o «always» (sempre, per defecte).\n"
+"                       Més informació a sota.\n"
+"  -d, --directory      Llista els propis directoris en lloc de llurs\n"
+"                       continguts.\n"
 "  -D, --dired          Genera eixida preparada per al mode «dired» d’Emacs.\n"
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
 "  -F, --classify             append indicator (one of */=>@|) to entries\n"
@@ -6265,15 +6371,16 @@ msgstr ""
 "                       single-column (-1), verbose (-l), vertical (-C).\n"
 "      --full-time      Equival a «-l --time-style=full-iso».\n"
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr "  -g                   Com «-l», però no mostra el propietari.\n"
 
-#: src/ls.c:4763
+#: src/ls.c:4823
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 "      --group-directories-first\n"
@@ -6282,10 +6389,11 @@ msgstr ""
 "                       l’agrupament.\n"
 
 # Crec que «virtual» capta millor el significat de «dummy».  ivb
-#: src/ls.c:4769
+#: src/ls.c:4829
+#, fuzzy
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
@@ -6297,14 +6405,14 @@ msgstr ""
 
 # «--dereference-command-line-symlink-to-dir» /**/  ivb
 # «--hide», encara una altra opció! O_O  ivb
-#: src/ls.c:4775
+#: src/ls.c:4835
 msgid ""
 "  -H, --dereference-command-line\n"
 "                             follow symbolic links listed on the command "
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
@@ -6322,7 +6430,7 @@ msgstr ""
 "                       el PATRÓ d’intèrpret indicat (inhabilitada per les\n"
 "                       opcions «-a» i «A»).\n"
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
 "names:\n"
@@ -6331,7 +6439,7 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 "      --indicator-style=PARAULA\n"
 "                       Afegeix un indicador amb l’estil PARAULA als noms de\n"
@@ -6341,9 +6449,10 @@ msgstr ""
 "  -I, --ignore=PATRÓ    No llista les entrades implícites que coincideixen "
 "amb\n"
 "                       el PATRÓ d’intèrpret indicat.\n"
-"  -k, --kibibytes      Empra blocs de 1024 octets.\n"
+"  -k, --kibibytes      Empra blocs de 1024 octets per a mostrar l’ús de "
+"disc.\n"
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -6360,7 +6469,7 @@ msgstr ""
 "per\n"
 "                       comes.\n"
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -6380,11 +6489,11 @@ msgstr ""
 "  -p, --indicator-style=slash\n"
 "                       Afegeix l’indicador «/» als directoris.\n"
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -6404,7 +6513,7 @@ msgstr ""
 "                       Empra l’ESTIL indicat per a citar les paraules:\n"
 "                       literal, locale, shell, shell-always, c, escape.\n"
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
 "  -R, --recursive            list subdirectories recursively\n"
@@ -6415,23 +6524,24 @@ msgstr ""
 "  -R, --recursive      Llista recursivament els subdirectoris.\n"
 "  -s, --size           Mostra la mida en blocs de cada fitxer.\n"
 
-#: src/ls.c:4825
+#: src/ls.c:4886
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 "  -S                   Ordena les entrades per la seua mida.\n"
 "      --sort=CLAU      Ordena en base a la CLAU indicada en lloc d’emprar "
 "el\n"
-"                       nom: none (-U), extension (-X), size (-S), time (-"
-"t),\n"
-"                       version (-v).\n"
+"                       nom: none (-U), size (-S), time (-t), version (-v),\n"
+"                       extension (-X).\n"
 "      --time=DATA      Amb «-l», mostra la DATA indicada en lloc de la de\n"
 "                       modificació (equival a l’opció entre parèntesis): "
 "accés\n"
@@ -6442,16 +6552,18 @@ msgstr ""
 "                       aquesta data.\n"
 
 # ls, your next programming language for the shell...  ivb
-#: src/ls.c:4835
+#: src/ls.c:4896
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
 msgstr ""
 "      --time-style=ESTIL\n"
 "                       Amb «-l», mostra les dates emprant l’ESTIL indicat:\n"
@@ -6463,7 +6575,7 @@ msgstr ""
 "                       l’ESTIL amb «posix-», només s’empra l’ESTIL si el\n"
 "                       locale POSIX no es troba actiu.\n"
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 msgid ""
 "  -t                         sort by modification time, newest first\n"
 "  -T, --tabsize=COLS         assume tab stops at each COLS instead of 8\n"
@@ -6473,10 +6585,10 @@ msgstr ""
 "  -T, --tabsize=COLUMNES\n"
 "                       Indica les COLUMNES entre tabulacions, en lloc de 8.\n"
 
-#: src/ls.c:4848
+#: src/ls.c:4912
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
@@ -6488,13 +6600,13 @@ msgstr ""
 "                       troben al directori.\n"
 "  -v                   Ordena pel número (de versió) inclós al nom.\n"
 
-#: src/ls.c:4855
+#: src/ls.c:4919
+#, fuzzy
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 "  -w, --width=COLS     Assumeix un altre ample de pantalla en lloc del "
@@ -6507,7 +6619,7 @@ msgstr ""
 "                       fitxer.\n"
 "  -1                   Llista un fitxer per línia.\n"
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -6523,7 +6635,7 @@ msgstr ""
 "LS_COLORS permet canviar la configuració dels colors.  Empreu l’ordre\n"
 "«dircolors» per a establir la variable.\n"
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -6605,32 +6717,28 @@ msgstr "  -t, --text           Llegeix en mode text (per defecte).\n"
 #: src/md5sum.c:195
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
 "\n"
-"Les tres opcions següents només són útils per a la comprovació de sumes:\n"
+"Les quatre opcions següents només són útils per a la comprovació de sumes:\n"
+"\n"
 "      --quiet          No escriu «CORRECTE» per cadascun dels fitxers\n"
 "                       verificats amb èxit.\n"
-"      --status         No escriu res, el codi d’estat indica el resultat.\n"
+"      --status         No escriu res, el codi d’eixida indica el resultat.\n"
+"      --strict         Ix amb un codi diferent de zero si es troben línies "
+"de\n"
+"                       suma amb un format incorrecte.\n"
 "  -w, --warn           Avisa de les línies de suma amb un format "
 "incorrecte.\n"
 "\n"
 
-# FIXME: Can be confused with invalid checksums.  ivb
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-"      --strict         Amb «--check», ix amb un codi d’error diferent de "
-"zero\n"
-"                       si es troben línies d’entrada amb un format "
-"incorrecte.\n"
-
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, c-format
 msgid ""
 "\n"
@@ -6648,181 +6756,202 @@ msgstr ""
 "el\n"
 "nom de cada FITXER.\n"
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, c-format
 msgid "%s: too many checksum lines"
 msgstr "%s: hi ha massa línies de suma"
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr "%s: %<PRIuMAX>: la línia de suma %s està mal formatada"
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr "%s: no s’ha pogut obrir o llegir\n"
 
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr "INCORRECTE"
 
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr "CORRECTE"
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr "%s: no s’ha trobat cap línia de suma %s ben formatada"
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
 msgstr[0] "avís: %<PRIuMAX> línia està mal formatada"
 msgstr[1] "avís: %<PRIuMAX> línies estan mal formatades"
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
 msgstr[0] "avís: %<PRIuMAX> fitxer llistat no s’ha pogut llegir"
 msgstr[1] "avís: %<PRIuMAX> fitxers llistats no s’han pogut llegir"
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
 msgstr[0] "avís: %<PRIuMAX> suma calculada NO coincideix"
 msgstr[1] "avís: %<PRIuMAX> sumes calculades NO coincideixen"
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
 msgstr "l’opció «--tag» no admet el mode text"
 
-#: src/md5sum.c:766
+#: src/md5sum.c:770
 #, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr "l’opció «--tag» no té sentit a la comprovació de sumes"
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
 msgstr ""
 "les opcions «--binary» i «--text» no tenen sentit a la comprovació de sumes"
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr "l’opció «--status» només té sentit a la comprovació de sumes"
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr "l’opció «--warn» només té sentit a la comprovació de sumes"
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr "l’opció «--quiet» només té sentit a la comprovació de sumes"
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr "l’opció «--strict» només té sentit a la comprovació de sumes"
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr "Forma d’ús: %s [OPCIÓ]… DIRECTORI…\n"
 
-#: src/mkdir.c:57
-#, fuzzy
+#: src/mkdir.c:59
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
-msgstr ""
-"Crea cada DIRECTORI indicat, si no existeix ja.\n"
-"\n"
+msgstr "Crea cada DIRECTORI indicat, si no existeix ja.\n"
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
+#, fuzzy
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 "  -m, --mode=MODE      Estableix els permisos al MODE (com amb «chmod»), en\n"
 "                       lloc de «a=rwx» menys la umask.\n"
 "  -p, --parents        Crea els directoris pare necessaris, sense mostrar\n"
 "                       errors si aquests ja existeixen.\n"
 "      --verbose        Mostra un missatge per cada directori creat.\n"
-"  -Z, --context=CTX    Estableix el context de seguretat de SELinux de cada\n"
-"                       directori creat a CTX.\n"
+"  -Z, --context[=CONTEXT]\n"
+"                       Estableix el context de seguretat de SELinux de cada\n"
+"                       directori creat al tipus per defecte, o al CONTEXT "
+"si\n"
+"                       s’especifica.\n"
+
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
 
 # Usa quote().  ivb
-#: src/mkdir.c:168
+#: src/mkdir.c:127 src/mkdir.c:172
+#, c-format
+msgid "failed to set default creation context for %s"
+msgstr "no s’ha pogut establir el context per defecte de creació de %s"
+
+# Usa quote().  ivb
+#: src/mkdir.c:191
+#, c-format
+msgid "failed to restore context for %s"
+msgstr "no s’ha pogut restaurar el context de %s"
+
+# Usa quote().  ivb
+#: src/mkdir.c:231
 #, c-format
 msgid "created directory %s"
 msgstr "s’ha creat el directori %s"
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr ""
+"avís: es descarta «--context» perquè necessita un nucli amb SELinux o SMACK"
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr "Forma d’ús: %s [OPCIÓ]… NOM…\n"
 
-#: src/mkfifo.c:52
-#, fuzzy
+#: src/mkfifo.c:54
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
-msgstr ""
-"Crea les canonades amb nom (FIFO) indicades pels seus NOMs.\n"
-"\n"
+msgstr "Crea les canonades amb nom (FIFO) indicades pels seus NOMs.\n"
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
 msgstr ""
 "  -m, --mode=MODE      Estableix els permisos al MODE (com amb «chmod»), en\n"
 "                       lloc de «a=rw» menys la umask.\n"
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
-"  -Z, --context=CTX    Estableix el context de seguretat de SELinux de cada\n"
-"                       canonada NOM a CTX.\n"
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, c-format
 msgid "invalid mode"
 msgstr "el mode no és vàlid"
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr "el mode només ha d’especificar bits de permisos de fitxer"
 
-#: src/mknod.c:52
+# Usa quote().  ivb
+#: src/mkfifo.c:174 src/mknod.c:269
+#, c-format
+msgid "cannot set permissions of %s"
+msgstr "no s’han pogut establir els permisos de %s"
+
+#: src/mknod.c:54
 #, c-format
 msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr "Forma d’ús: %s [OPCIÓ]… NOM TIPUS [MAJOR MENOR]\n"
 
-#: src/mknod.c:54
-#, fuzzy
+#: src/mknod.c:56
 msgid "Create the special file NAME of the given TYPE.\n"
-msgstr ""
-"Crea el fitxer especial NOM, del TIPUS especificat.\n"
-"\n"
-
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr ""
-"  -Z, --context=CTX    Estableix el context de seguretat de SELinux de cada\n"
-"                       fitxer NOM a CTX.\n"
+msgstr "Crea el fitxer especial NOM, del TIPUS especificat.\n"
 
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -6836,7 +6965,7 @@ msgstr ""
 "s’interpreta com a hexadecimal; si comença per «0», com a octal; altrament\n"
 "s’interpreta com a decimal.  El TIPUS pot ser:\n"
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 msgid ""
 "\n"
 "  b      create a block (buffered) special file\n"
@@ -6849,60 +6978,60 @@ msgstr ""
 "  p       Crea una cua FIFO.\n"
 
 # Açò s'imprimeix després d'un missatge d'error.  ivb
-#: src/mknod.c:150
+#: src/mknod.c:175
 msgid "Special files require major and minor device numbers."
 msgstr "Els fitxers especials requereixen números major i menor de dispositiu."
 
 # Açò s'imprimeix després d'un missatge d'error.  ivb
-#: src/mknod.c:160
+#: src/mknod.c:185
 msgid "Fifos do not have major and minor device numbers."
 msgstr "Les cues FIFO no tenen números major i menor de dispositiu."
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, c-format
 msgid "block special files not supported"
 msgstr "aquest sistema no permet fitxers especials de blocs"
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, c-format
 msgid "character special files not supported"
 msgstr "aquest sistema no permet fitxers especials de caràcters"
 
 # Usa quote().  ivb
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, c-format
 msgid "invalid major device number %s"
 msgstr "el número major de dispositiu %s no és vàlid"
 
 # Usa quote().  ivb
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, c-format
 msgid "invalid minor device number %s"
 msgstr "el número menor de dispositiu %s no és vàlid"
 
 # No crec que calguen cometes.  ivb
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, c-format
 msgid "invalid device %s %s"
 msgstr "el dispositiu %s %s no és vàlid"
 
 # Usa quote().  ivb
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, c-format
 msgid "invalid device type %s"
 msgstr "el tipus de dispositiu %s no és vàlid"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr "Eric Blake"
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr "Foma d’ús: %s [OPCIÓ]… [PLANTILLA]\n"
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
 "TEMPLATE must contain at least 3 consecutive 'X's in last component.\n"
@@ -6914,7 +7043,7 @@ msgstr ""
 "no s’indica la PLANTILLA s’empra «tmp.XXXXXXXXXX», i implica «--tmpdir».\n"
 
 # FIXME: Should be merged with previous message or separated by newline.  ivb
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
@@ -6922,7 +7051,7 @@ msgstr ""
 "la\n"
 "umask en ambdós casos.\n"
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
@@ -6934,27 +7063,27 @@ msgstr ""
 "del\n"
 "                       fitxer o directori.\n"
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
 "      --suffix=SUFIX    Afegeix el SUFIX a la PLANTILLA.  El SUFIX no ha de\n"
 "                       contenir cap barra.  Aquesta opció és implícita si "
 "la\n"
 "                       PLANTILLA no acaba en «X».\n"
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
-"      --tmpdir[=DIRECTORI]\n"
+"  -p, --tmpdir[=DIRECTORI]\n"
 "                       Interpreta la PLANTILLA com a relativa al DIRECTORI.\n"
 "                       Si aquest no s’indica, empra $TMPDIR si està\n"
 "                       establerta, o «/tmp» altrament.  Si empreu aquesta\n"
@@ -6963,15 +7092,12 @@ msgstr ""
 "                       diferència de «-t» la PLANTILLA pot contenir barres,\n"
 "                       però «mktemp» només en crea el component final.\n"
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
 msgstr ""
-"  -p DIRECTORI         Empra el DIRECTORI com a prefix, implica «-t» (opció\n"
-"                       desaprovada).\n"
 "  -t                   Interpreta la PLANTILLA com a un únic component de "
 "nom\n"
 "                       de fitxer relatiu al directori $TMPDIR, si està\n"
@@ -6979,67 +7105,59 @@ msgstr ""
 "altrament\n"
 "                       a «/tmp» (opció desaprovada).\n"
 
-#: src/mktemp.c:223
-#, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr "no s’ha pogut redirigir l’eixida estàndard d’errors a «/dev/null»"
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, c-format
 msgid "too many templates"
 msgstr "s’han indicat massa plantilles"
 
 # Usa quote().  ivb
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr "en indicar «--suffix», cal que la plantilla %s acabe en «X»"
 
 # Usa quote().  ivb
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr "el sufix %s no és vàlid perquè conté un separador de directoris"
 
 # Usa quote().  ivb
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr "la plantilla %s conté massa pocs caràcters «X»"
 
 # Usa quote().  ivb
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr "la plantilla %s no és vàlida perquè conté un separador de directoris"
 
 # Usa quote(). ivb
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr ""
 "la plantilla %s no és vàlida perquè és absoluta i esteu emprant «--tmpdir»"
 
 # Usa quote().  ivb
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, c-format
 msgid "failed to create directory via template %s"
 msgstr "no s’ha pogut crear el directori emprant la plantilla %s"
 
 # Usa quote().  ivb
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, c-format
 msgid "failed to create file via template %s"
 msgstr "no s’ha pogut crear el fitxer emprant la plantilla %s"
 
-#: src/mv.c:292
-#, fuzzy
+#: src/mv.c:294
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
-msgstr ""
-"Canvia el nom d’ORIGEN a DESTINACIÓ, o mou cada ORIGEN al DIRECTORI.\n"
-"\n"
+msgstr "Canvia el nom d’ORIGEN a DESTINACIÓ, o mou cada ORIGEN al DIRECTORI.\n"
 
-#: src/mv.c:298
+#: src/mv.c:300
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
 "file\n"
@@ -7064,7 +7182,7 @@ msgstr ""
 "tindrà\n"
 "efecte.\n"
 
-#: src/mv.c:307
+#: src/mv.c:309
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
@@ -7077,7 +7195,7 @@ msgstr ""
 "  -S, --suffix=SUFIX    Reemplaça el sufix habitual de les còpies de\n"
 "                       seguretat.\n"
 
-#: src/mv.c:312
+#: src/mv.c:314
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
 "DIRECTORY\n"
@@ -7086,6 +7204,8 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
 "  -t, --target-directory=DIRECTORI\n"
 "                       Mou cada argument ORIGEN al DIRECTORI.\n"
@@ -7095,6 +7215,9 @@ msgstr ""
 "                       fitxer destinació o quan el fitxer destinació no hi "
 "és.\n"
 "  -v, --verbose        Explica què s’està fent.\n"
+"  -Z, --context        Estableix el context de seguretat de SELinux del "
+"fitxer\n"
+"                       destinació al tipus per defecte.\n"
 
 #: src/nice.c:72
 #, c-format
@@ -7102,7 +7225,7 @@ msgid "Usage: %s [OPTION] [COMMAND [ARG]...]\n"
 msgstr "Forma d’ús: %s [OPCIÓ] [ORDRE [ARG]…]\n"
 
 #: src/nice.c:73
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Run COMMAND with an adjusted niceness, which affects process scheduling.\n"
 "With no COMMAND, print the current niceness.  Niceness values range from\n"
@@ -7113,14 +7236,13 @@ msgstr ""
 "prioritat.\n"
 "Els valors de prioritat van des de %d (planificació més favorable per al\n"
 "procés) a %d (planificació menys favorable per al procés).\n"
-"\n"
-"  -n, --adjustment=N    Afegeix l’enter N al valor de prioritat (per "
-"defecte\n"
-"                       10).\n"
 
 #: src/nice.c:82
 msgid "  -n, --adjustment=N   add integer N to the niceness (default 10)\n"
 msgstr ""
+"  -n, --adjustment=N    Afegeix l’enter N al valor de prioritat (per "
+"defecte\n"
+"                       10).\n"
 
 # Usa quote().  ivb
 #: src/nice.c:172
@@ -7149,14 +7271,12 @@ msgid "Scott Bartram"
 msgstr "Scott Bartram"
 
 #: src/nl.c:179
-#, fuzzy
 msgid ""
 "Write each FILE to standard output, with line numbers added.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
 "Escriu cada FITXER a la sortida estàndard, amb les línies numerades.  Sense\n"
 "FITXER, o quan fitxer és «-», llegeix l’entrada estàndard.\n"
-"\n"
 
 #: src/nl.c:186
 msgid ""
@@ -7419,7 +7539,7 @@ msgid ""
 "     --all       print the number of installed processors\n"
 "     --ignore=N  if possible, exclude N processing units\n"
 msgstr ""
-"      --all            Mostra el nombre de processados instaŀlats al "
+"      --all            Mostra el nombre de processadors instal·lats al "
 "sistema.\n"
 "      --ignore=N       Exclou N unitats de processament si és possible.\n"
 
@@ -7429,123 +7549,138 @@ msgid "%s: invalid number to ignore"
 msgstr "%s: el nombre d’unitats de processament a excloure no és vàlid"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
-msgstr ""
-
-#: src/numfmt.c:676
-#, fuzzy, c-format
-msgid "value too large to be converted: '%s'"
-msgstr "%s: no s’ha convertit completament el valor"
+msgstr "Assaf Gordon"
 
 # Usa quote().  ivb
-#: src/numfmt.c:680
-#, fuzzy, c-format
-msgid "invalid number: '%s'"
-msgstr "el número %s no és vàlid"
+#: src/numfmt.c:659
+#, c-format
+msgid "value too large to be converted: %s"
+msgstr "el valor és massa gran per a ser convertit: «%s»"
 
-#: src/numfmt.c:684
+# Usa quote().  ivb
+#: src/numfmt.c:663
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
-msgstr ""
+msgid "invalid number: %s"
+msgstr "el número no és vàlid: %s"
 
-#: src/numfmt.c:688
-#, fuzzy, c-format
-msgid "invalid suffix in input: '%s'"
-msgstr "el sufix de l’argument «%3$s» de l’opció «%1$s%2$s» no és vàlid"
+# Usa quote().  ivb
+#: src/numfmt.c:667
+#, c-format
+msgid "rejecting suffix in input: %s (consider using --from)"
+msgstr "es rebutja el sufix a l’entrada: %s (considereu emprar «--from»)"
 
-#: src/numfmt.c:692
+# Usa quote().  ivb
+#: src/numfmt.c:671
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
-msgstr ""
+msgid "invalid suffix in input: %s"
+msgstr "s’ha trobat un sufix no vàlid a l’entrada: %s"
 
 # Usa quote().  ivb
-#: src/numfmt.c:723
-#, fuzzy, c-format
-msgid "failed to prepare value '%Lf' for printing"
-msgstr "no s’ha pogut obrir %s per a escriure"
+#: src/numfmt.c:675
+#, c-format
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
+msgstr "manca el sufix «i» a l’entrada: %s (p.ex. Ki/Mi/Gi)"
 
-#: src/numfmt.c:787
-#, fuzzy, c-format
-msgid "invalid unit size: '%s'"
-msgstr "l’amplària de tabulació no és vàlida: %s"
+#: src/numfmt.c:722 src/numfmt.c:768
+#, c-format
+msgid "failed to prepare value '%Lf' for printing"
+msgstr "no s’ha pogut preparar el valor «%Lf» per a escriure’l"
 
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
+# Usa quote().  ivb
+#: src/numfmt.c:791
 #, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr ""
+msgid "invalid unit size: %s"
+msgstr "la mida de la unitat no és vàlida: %s"
 
-#: src/numfmt.c:813
-#, fuzzy, c-format
+#: src/numfmt.c:814
+#, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
-msgstr "Forma d’ús: %s [OPCIÓ]… [USUARI]…\n"
+msgstr "Forma d’ús: %s [OPCIÓ]… [NÚMERO]…\n"
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
 msgstr ""
+"Reformata cada NÚMERO, o els números de l’entrada estàndard si no se\n"
+"n’especifica cap.\n"
 
-# FIXME: Can be confused with invalid checksums.  ivb
-#: src/numfmt.c:820
-#, fuzzy
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
-msgstr ""
-"      --strict         Amb «--check», ix amb un codi d’error diferent de "
-"zero\n"
-"                       si es troben línies d’entrada amb un format "
-"incorrecte.\n"
+msgstr "      --debug          Mostra avisos sobre les entrades no vàlides.\n"
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
+"  -d, --delimiter=DELIM    Empra DELIM en lloc d’espais en blanc com a\n"
+"                       delimitador de camp.\n"
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
+"      --field=N        Reemplaça el número que es troba al camp d’entrada "
+"amb\n"
+"                       posició N (per defecte 1).\n"
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
 msgstr ""
+"      --format=FORMAT    Empra el FORMAT indicat de coma flotat d’estil\n"
+"                       printf().  Més detalls sobre el FORMAT a sota.\n"
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
 "                         see UNIT below\n"
 msgstr ""
+"      --from=UNITAT    Escala automàticament els números de l’entrada a la\n"
+"                       UNITAT (per defecte «none»).  Més detalls sobre la\n"
+"                       UNITAT a sota.\n"
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr ""
+"      --from-unit=N    Especifica la mida de la unitat d’entrada (per\n"
+"                       defecte 1).\n"
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
 "                         (which means it has no effect in the C/POSIX "
 "locale)\n"
 msgstr ""
+"      --grouping       Empra l’agrupament de dígits definit pel locale, p."
+"ex.\n"
+"                       1,000,000 (no té cap efecte amb el locale C/POSIX).\n"
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
 msgstr ""
+"      --header[=N]     Imprimeix (sense convertir) les primeres N línies\n"
+"                       llegides (per defecte 1).\n"
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
 msgstr ""
+"      --invalid=MODE    Mode de fallada per als números no vàlids.  El MODE\n"
+"                        pot ser «abort» (per defecte), «fail», «warn» o\n"
+"                        «ignore».  Més detalls a sota.\n"
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -7554,44 +7689,64 @@ msgid ""
 "whitespace\n"
 "                         is found\n"
 msgstr ""
+"      --padding=N      Reomple l’eixida a N caràcters: un N positiu alinea\n"
+"                       a la dreta, un N negatiu alinea a l’esquerra.  El\n"
+"                       reomplit no es té en compte quan l’eixida té més d’N\n"
+"                       caràcters.  Per defecte s’alinea a dreta o esquerra\n"
+"                       automàticament si es troben espais en blanc.\n"
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
 "nearest\n"
 msgstr ""
+"      --round=MÈTODE    Empra el MÈTODE indicat per a arrodonir en escalar.\n"
+"                       El MÈTODE pot ser «up» (cap amunt), «down» (cap "
+"avall),\n"
+"                       «from-zero» (des de zero, per defecte), «towards-"
+"zero»\n"
+"                       (cap a zero), «nearest» (el més proper).\n"
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
 msgstr ""
+"      --suffix=SUFIX    Afegeix el SUFIX als números de l’eixida, i accepta "
+"el\n"
+"                       SUFIX opcional als números de l’entrada.\n"
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
+"      --to=UNITAT      Escala automàticament els números de l’eixida a la\n"
+"                       UNITAT.  Més detalls sobre la UNITAT a sota.\n"
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr ""
+"      --to-unit=N      Especifica la mida de la unitat d’eixida (per\n"
+"                       defecte 1).\n"
 
-#: src/numfmt.c:877
-#, fuzzy
+#: src/numfmt.c:878
 msgid ""
 "\n"
 "UNIT options:\n"
 msgstr ""
-"Altres opcions:\n"
+"\n"
+"Opcions UNITAT:\n"
 "\n"
 
-#: src/numfmt.c:880
+# El més llarg és «iec-i».  ivb
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
-msgstr ""
+msgstr "  none     No accepta cap escala: els sufixos provocaran un error.\n"
 
-#: src/numfmt.c:883
+# El més llarg és «iec-i».  ivb
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -7599,43 +7754,62 @@ msgid ""
 "               1M = 1000000,\n"
 "               1Mi = 1048576,\n"
 msgstr ""
+"  auto     Accepta sufixos opcionals d’una o dues lletres, així:\n"
+"           1K = 1000, 1Ki = 1024, 1M = 1000000, 1Mi = 1048576.\n"
 
-#: src/numfmt.c:889
+# El més llarg és «iec-i».  ivb
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
 "               1M = 1000000,\n"
 "               ...\n"
 msgstr ""
+"  si       Accepta sufixos opcionals d’una lletra, així:\n"
+"           1K = 1000, 1M = 1000000…\n"
 
-#: src/numfmt.c:894
+# El més llarg és «iec-i».  ivb
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
 "               1M = 1048576,\n"
 "               ...\n"
 msgstr ""
+"  iec      Accepta sufixos opcionals d’una lletra, així:\n"
+"           1K = 1024, 1M = 1048576…\n"
 
-#: src/numfmt.c:899
+# El més llarg és «iec-i».  ivb
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
 "               1Mi = 1048576,\n"
 "               ...\n"
 msgstr ""
+"  iec-i    Accepta sufixos opcionals de dues lletres, així:\n"
+"           1Ki = 1024, 1Mi = 1048576…\n"
 
-#: src/numfmt.c:905
-#, c-format
+#: src/numfmt.c:906
+#, fuzzy, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
+"\n"
+"El FORMAT ha de basar�se en «%f» i ser adequat per a imprimir un argument "
+"de\n"
+"coma flotant.  Una cometa opcional («%'f») habilita l’agrupament (com fa\n"
+"«--grouping») si el locale actual ho permet.  Una amplada opcional («%10f»)\n"
+"reomple l’eixida per l’esquerra.  Una amplada negativa («%-10f») reomple\n"
+"l’eixida per la dreta.\n"
 
-#: src/numfmt.c:912
+# És el nom del programa. No usa quote().  ivb
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -7646,8 +7820,19 @@ msgid ""
 "diagnosed, but the exit status is 0.  With --invalid='ignore' conversion\n"
 "errors are not diagnosed and the exit status is 0.\n"
 msgstr ""
+"\n"
+"El codi d’eixida és 0 si tots els números de l’entrada es poden convertir "
+"amb\n"
+"èxit.  Per defecte, «%s» es deté amb codi d’eixida 2 en el primer error de\n"
+"conversió.  Amb «--invalid=fail» es mostra un avís per cada error de "
+"conversió\n"
+"i el codi d’eixida és 2.  Amb «--invalid=warn» s’avisa de cada error de\n"
+"conversió, però el codi d’eixida és 0.  Amb «--invalid=ignore» no s’avisa "
+"dels\n"
+"errors de conversió i el codi d’eixida és 0.\n"
 
-#: src/numfmt.c:921
+# Són el nom del programa. No usa quote().  ivb
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -7667,122 +7852,150 @@ msgid ""
 "  $ ls -lh | %s --header --field 5 --from=iec --padding=10\n"
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 msgstr ""
+"\n"
+"Exemples:\n"
+"\n"
+"    $ %s --to=si 1000\n"
+"              -> «1,0K»\n"
+"    $ %s --to=iec 2048\n"
+"             -> «2,0K»\n"
+"    $ %s --to=iec-i 4096\n"
+"             -> «4,0Ki»\n"
+"    $ echo 1K | %s --from=si\n"
+"             -> «1000»\n"
+"    $ echo 1K | %s --from=iec\n"
+"             -> «1024»\n"
+"    $ df | %s --header --field 2 --to=si\n"
+"    $ ls -l | %s --header --field 5 --to=iec\n"
+"    $ ls -lh | %s --header --field 5 --from=iec --padding=10\n"
+"    $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 
 # Usa quote().  ivb
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, c-format
 msgid "format %s has no %% directive"
 msgstr "el format %s no té una directiva «%%»"
 
-#: src/numfmt.c:990
-#, fuzzy, c-format
+# Usa quote().  ivb
+#: src/numfmt.c:1003
+#, c-format
 msgid "invalid format %s (width overflow)"
-msgstr "el format de data «%s» no és vàlid"
+msgstr "el format %s no és vàlid (desbordament de l’amplada)"
+
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr ""
 
 # Usa quote().  ivb
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr "el format %s acaba en «%%»"
 
-#: src/numfmt.c:1010
-#, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
-msgstr ""
+# Usa quote().  ivb
+#: src/numfmt.c:1030
+#, fuzzy, c-format
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
+msgstr "el format %s no és vàlid, la directiva ha de ser «%%['][-][N]f»"
 
 # Usa quote().  ivb
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr "el format %s té massa directives «%%»"
 
-#: src/numfmt.c:1070
-#, fuzzy, c-format
-msgid "invalid suffix in input '%s': '%s'"
-msgstr "el sufix de l’argument «%3$s» de l’opció «%1$s%2$s» no és vàlid"
+# Usa quote en els 2 args.  ivb
+#: src/numfmt.c:1081
+#, c-format
+msgid "invalid suffix in input %s: %s"
+msgstr "s’ha trobat un sufix no vàlid a l’entrada %s: %s"
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
 msgstr ""
+"el valor és massa gran per a ser imprès: «%Lg» (considereu emprar «--to»)"
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
 msgstr ""
+"el valor és massa gran per a ser imprès: «%Lg» (no es poden tractar valors "
+"majors que 999Y)"
 
-#: src/numfmt.c:1184
+# Usa quote().  ivb
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
-msgstr ""
+msgid "large input value %s: possible precision loss"
+msgstr "el valor d’entrada %s és gran, pot haver perdut precisió"
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
+"la línia d’entrada és massa curta i no inclou un camp %ld amb un número a "
+"convertir"
 
 # Usa quote().  ivb
-#: src/numfmt.c:1388
-#, fuzzy, c-format
-msgid "invalid padding value '%s'"
-msgstr "el rang de pàgines no és vàlid: %s"
+# Açò queda més clar.  ivb
+#: src/numfmt.c:1403
+#, c-format
+msgid "invalid padding value %s"
+msgstr "l’amplada de reomplit %s no és vàlida"
 
-#: src/numfmt.c:1401
-#, fuzzy, c-format
-msgid "invalid field value '%s'"
-msgstr "el número de camp «%s» no és vàlid"
+# Usa quote().  ivb
+# Açò queda més clar.  ivb
+#: src/numfmt.c:1417
+#, c-format
+msgid "invalid field value %s"
+msgstr "el número de camp %s no és vàlid"
 
-# Ambdues usen quote().  ivb
-#: src/numfmt.c:1430
-#, fuzzy, c-format
-msgid "invalid header value '%s'"
-msgstr "la data %s no és vàlida"
+# Usa quote().  ivb
+# Açò queda més clar.  ivb
+#: src/numfmt.c:1447
+#, c-format
+msgid "invalid header value %s"
+msgstr "el número de capçaleres %s no és vàlid"
 
-# Açò s'imprimeix després d'un missatge d'error.  ivb
-#: src/numfmt.c:1456
-#, fuzzy, c-format
+#: src/numfmt.c:1473
+#, c-format
 msgid "--grouping cannot be combined with --format"
-msgstr "No es poden combinar els operands fitxer amb «--files0-from»."
-
-# Açò s'imprimeix després d'un missatge d'error.  ivb
-#: src/numfmt.c:1458
-#, fuzzy, c-format
-msgid "--padding cannot be combined with --format"
-msgstr "No es poden combinar els operands fitxer amb «--files0-from»."
+msgstr "no es poden combinar «--grouping» i «--format»"
 
-#: src/numfmt.c:1463
-#, fuzzy, c-format
+#: src/numfmt.c:1478
+#, c-format
 msgid "no conversion option specified"
-msgstr "s’han especificat múltiples opcions «-i»"
+msgstr "no s’ha especificat cap opció de conversió"
 
-# Açò s'imprimeix després d'un missatge d'error.  ivb
-#: src/numfmt.c:1471
-#, fuzzy, c-format
+#: src/numfmt.c:1486
+#, c-format
 msgid "grouping cannot be combined with --to"
-msgstr "No es poden combinar els operands fitxer amb «--files0-from»."
+msgstr "no es poden combinar «--grouping» i «--to»"
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
-msgstr ""
+msgstr "l’agrupament no té cap efecte en aquest locale"
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
-msgstr ""
+msgstr "«--header» no es té en compte en llegir l’entrada de la línia d’ordres"
 
-# uniq no usa quote().  ivb
-#: src/numfmt.c:1511
-#, fuzzy, c-format
+# Posaria «entrada estàndard» però en vista de l’existència de
+# l’opció «--header» preferisc no pillar�me els dits.  ivb
+#: src/numfmt.c:1526
+#, c-format
 msgid "error reading input"
-msgstr "error en llegir %s"
+msgstr "error en llegir l’entrada"
 
-#: src/numfmt.c:1520
-#, fuzzy, c-format
+#: src/numfmt.c:1535
+#, c-format
 msgid "failed to convert some of the input numbers"
-msgstr "no s’ha pogut inhabilitar l’entrada estàndard"
+msgstr "no s’han pogut convertir alguns dels números de l’entrada"
 
-#: src/od.c:294
+#: src/od.c:320
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -7794,7 +8007,7 @@ msgstr ""
 "      o bé: %s [-abcdfilosx]… [FITXER] [[+]DESPLAÇAMENT[.][b]]\n"
 "      o bé: %s --traditional [OPC]… [FITX] [[+]DESPL[.][b] [+][ETIQ][.][b]]\n"
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -7812,8 +8025,7 @@ msgstr ""
 "\n"
 
 # El més llarg és «x[MIDA]».  ivb
-#: src/od.c:307
-#, fuzzy
+#: src/od.c:333
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
 "if the last operand begins with + or (if there are 2 operands) a digit.\n"
@@ -7822,7 +8034,6 @@ msgid ""
 "For OFFSET and LABEL, a 0x or 0X prefix indicates hexadecimal;\n"
 "suffixes may be . for octal and b for multiply by 512.\n"
 msgstr ""
-"\n"
 "Si tant la primera com la segona formes d’ús són aplicables, s’assumeix la\n"
 "segona forma si el darrer operand comença per «+» o (si hi ha dos operands)\n"
 "per un dígit.  Un operand DESPLAÇAMENT significa «-j DESPLAÇAMENT».  "
@@ -7833,30 +8044,34 @@ msgstr ""
 "«0X» indica hexadecimal.  Els sufixs poden ser «.» per a octal i «b» com a\n"
 "multiplicació per 512.\n"
 
-#: src/od.c:318
+#: src/od.c:344
 #, fuzzy
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
 "  -A, --address-radix=BASE\n"
-"                       Indica la BASE amb què es mostraran els "
-"desplaçaments.\n"
+"                       Format d’eixida dels desplaçaments de fitxer.  La "
+"BASE\n"
+"                       pot ser «d» (decimal), «o» (octal), «h» (hexadecimal) "
+"o\n"
+"                       «n» (cap).\n"
 "  -j, --skip-bytes=OCTETS\n"
 "                       Salta aquest nombre d’OCTETS al principi de "
 "l’entrada.\n"
 
-#: src/od.c:323
-#, fuzzy
+#: src/od.c:350
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
@@ -7865,40 +8080,43 @@ msgstr ""
 "                       d’entrada.\n"
 "  -S, --strings[=OCTETS]\n"
 "                       Escriu cadenes d’almenys OCTETS caràcters gràfics.\n"
-"                       L’argument OCTETS és obligatori per a l’opció curta.\n"
+"                       S’assumeix 3 si no s’especifiquen els OCTETS.\n"
 "  -t, --format=TIPUS    Especifica el format (o formats) de sortida.\n"
 "  -v, --output-duplicates\n"
 "                       No empra «*» per a marcar la supressió de línies.\n"
-"  -w, --width[=OCTETS]    Escriu aquest nombre d’OCTETS per línia.\n"
+"  -w, --width[=OCTETS]    Escriu aquest nombre d’OCTETS per línia.  "
+"S’assumeix\n"
+"                       32 si no s’especifiquen els OCTETS.\n"
 "      --traditional    Accepta arguments en la forma tradicional.\n"
 
 # buscar una traducció per `named characters' i `shorts'
 # Crec que així va bé.  ivb
-#: src/od.c:336
-#, fuzzy
+#: src/od.c:363
 msgid ""
 "\n"
 "\n"
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 "\n"
+"\n"
 "Les especificacions en format tradicional poden estar mesclades, acumulant�"
 "se;\n"
 "són les següents:\n"
+"\n"
 "  -a    Equival a «-t a»,  nom dels caràcters, descartant el bit alt.\n"
 "  -b    Equival a «-t o1», octets en octal.\n"
-"  -c    Equival a «-t c»,  caràcters ASCII o seqüències d’escapada amb "
-"barra\n"
-"        invertida.\n"
+"  -c    Equival a «-t c»,  caràcters imprimibles o seqüències d’escapada "
+"amb\n"
+"        barra invertida.\n"
 "  -d    Equival a «-t u2», enters de 2 octets sense signe en decimal.\n"
 
 # buscar traduccions pels diferents tipus
 # Crec que així va bé.  ivb
-#: src/od.c:345
+#: src/od.c:372
 msgid ""
 "  -f   same as -t fF, select floats\n"
 "  -i   same as -t dI, select decimal ints\n"
@@ -7914,24 +8132,25 @@ msgstr ""
 "  -s    Equival a «-t d2», enters de 2 octets en decimal.\n"
 "  -x    Equival a «-t x2», enters de 2 octets en hexadecimal.\n"
 
-#: src/od.c:353
-#, fuzzy
+#: src/od.c:380
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 "\n"
+"\n"
 "TIPUS està format per una o diverses de les següents especificacions:\n"
 "\n"
 "  a          Nom del caràcter, sense tenir en compte el bit alt.\n"
-"  c          Caràcter ASCII o seqüència d’escapada amb barra invertida.\n"
+"  c          Caràcter imprimible o seqüència d’escapada amb barra "
+"invertida.\n"
 
 # El més llarg és «x[MIDA]».  ivb
 # «SIZE bytes per integer»->«tindira MIDA octets si fóra un enter», crec.  ivb
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -7945,8 +8164,7 @@ msgstr ""
 "  u[MIDA]    Decimal sense signe, de MIDA octets com a enter.\n"
 "  x[MIDA]    Hexadecimal, de MIDA bytes com a enter.\n"
 
-#: src/od.c:367
-#, fuzzy
+#: src/od.c:394
 msgid ""
 "\n"
 "SIZE is a number.  For TYPE in [doux], SIZE may also be C for\n"
@@ -7962,15 +8180,17 @@ msgstr ""
 "«sizeof(float)», «D» per a «sizeof(double)» o bé «L» per a\n"
 "«sizeof(long double)».\n"
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
 "each output line.\n"
 msgstr ""
+"\n"
+"En afegir «z» a qualsevol tipus es mostraran els caràcters imprimibles al\n"
+"final de cada línia d’eixida.\n"
 
-#: src/od.c:379
-#, fuzzy
+#: src/od.c:406
 msgid ""
 "\n"
 "\n"
@@ -7983,19 +8203,26 @@ msgid ""
 "and so on for G, T, P, E, Z, Y.\n"
 msgstr ""
 "\n"
-"Cada valor d’N pot estar seguit d’un dels sufixos multiplicatius següents\n"
-"(prefix valor): xM M, c 1, w 2, b 512, kB 1000, K 1024, MB 1000*1000,\n"
-"M 1024*1024, GB 1000*1000*1000, G 1024*1024*1024, i així per a T, P, E, Z, "
-"Y.\n"
+"\n"
+"OCTETS és hexadecimal si té el prefix «0x» o «0X», i pot portar un sufix\n"
+"multiplicador:\n"
+"\n"
+"  b     512\n"
+"  KB    1000\n"
+"  K     1024\n"
+"  MB    1000*1000\n"
+"  M     1024*1024\n"
+"\n"
+"i així per a G, T, P, E, Z, Y.\n"
 
 # Ambdues usen quote().  ivb
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, c-format
 msgid "invalid type string %s"
 msgstr "la cadena de tipus no és vàlida: %s"
 
 # Usa quote().  ivb
-#: src/od.c:649
+#: src/od.c:690
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -8005,7 +8232,7 @@ msgstr ""
 "enter de %lu octets"
 
 # Usa quote().  ivb
-#: src/od.c:770
+#: src/od.c:811
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -8015,39 +8242,39 @@ msgstr ""
 "de coma flotant de %lu octets"
 
 # Usa quote() en la segona.  ivb
-#: src/od.c:828
+#: src/od.c:869
 #, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr "el caràcter «%c» de la cadena de tipus %s no és vàlid"
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr "no es pot saltar més enllà del final de l’entrada combinada"
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr ""
 "la base «%c» del desplaçament no és vàlida; ha de ser un caràcter de [doxn]"
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr "no es pot especificar cap tipus quan es transcriuen cadenes"
 
 # Açò s'imprimeix després d'un missatge d'error.  ivb
-#: src/od.c:1810
+#: src/od.c:1863
 msgid "compatibility mode supports at most one file"
 msgstr "El mode de compatibilitat permet com a màxim un fitxer."
 
 # Són noms d'opcions.  ivb
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr "«skip-bytes» + «read-bytes» és massa gran"
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr "atenció: l’amplada %lu no és vàlida; s’emprarà %d"
@@ -8063,7 +8290,6 @@ msgid "standard input is closed"
 msgstr "l’entrada estàndard està tancada"
 
 #: src/paste.c:439
-#, fuzzy
 msgid ""
 "Write lines consisting of the sequentially corresponding lines from\n"
 "each FILE, separated by TABs, to standard output.\n"
@@ -8074,7 +8300,6 @@ msgstr ""
 "FITXER, separades per caràcters de tabulació, a la sortida estàndard.  "
 "Sense\n"
 "FITXER, o quan FITXER és «-», llegeix l’entrada estàndard.\n"
-"\n"
 
 #: src/paste.c:447
 msgid ""
@@ -8084,7 +8309,7 @@ msgstr ""
 "  -d, --delimiters=LLISTA\n"
 "                       Empra els caràcters de la LLISTA, en lloc de\n"
 "                       tabulacions.\n"
-"  -s, --serial         Processa cada fitxer de cop, i no en paraŀlel.\n"
+"  -s, --serial         Processa cada fitxer de cop, i no en paral·lel.\n"
 
 #: src/paste.c:508
 #, c-format
@@ -8228,12 +8453,12 @@ msgstr "Quan"
 msgid "Where"
 msgstr "On"
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr "Forma d’ús: %s [OPCIÓ]… [USUARI]…\n"
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -8252,7 +8477,7 @@ msgstr ""
 "  -p                   Omet el fitxer de pla de l’usuari al format llarg.\n"
 "  -s                   Genera una eixida amb format curt (per defecte).\n"
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -8270,7 +8495,7 @@ msgstr ""
 "                       d’inactivitat (ociós) al format curt.\n"
 
 # No usa quote().  ivb
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, c-format
 msgid ""
 "\n"
@@ -8281,7 +8506,7 @@ msgstr ""
 "Un programa de «finger» lleuger; mostra informació sobre els usuaris.  El\n"
 "fitxer «utmp» serà «%s».\n"
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr ""
@@ -8342,12 +8567,12 @@ msgstr "-W AMPLADA_PÀG: el nombre de caràcters no és vàlid: %s"
 #, c-format
 msgid "cannot specify number of columns when printing in parallel"
 msgstr ""
-"no es pot especificar el nombre de columnes quan s’imprimeix en paraŀlel"
+"no es pot especificar el nombre de columnes quan s’imprimeix en paral·lel"
 
 #: src/pr.c:1100
 #, c-format
 msgid "cannot specify both printing across and printing in parallel"
-msgstr "no es pot especificar impressió en paraŀlel i de través alhora"
+msgstr "no es pot especificar impressió en paral·lel i de través alhora"
 
 # Usa quote() en la segona.  ivb
 #: src/pr.c:1196
@@ -8379,11 +8604,8 @@ msgid "Page %<PRIuMAX>"
 msgstr "Pàgina %<PRIuMAX>"
 
 #: src/pr.c:2757
-#, fuzzy
 msgid "Paginate or columnate FILE(s) for printing.\n"
-msgstr ""
-"Arranja el(s) FITXER(s) en pàgines o columnes per a imprimir.\n"
-"\n"
+msgstr "Arranja el(s) FITXER(s) en pàgines o columnes per a imprimir.\n"
 
 #: src/pr.c:2763
 msgid ""
@@ -8485,7 +8707,7 @@ msgstr ""
 "                       Defineix la llargada de pàgina en LLARG_PÀG (66) "
 "línies\n"
 "                       (per defecte hi ha 56 línies de text, 63 amb «-F»).\n"
-"  -m, --merge          Escriu els fitxers en paraŀlel, un en cada columna,\n"
+"  -m, --merge          Escriu els fitxers en paral·lel, un en cada columna,\n"
 "                       amb truncament de línies, però ajuntant les que "
 "ocupen\n"
 "                       una línia sencera si s’empra l’opció «-J».\n"
@@ -8526,11 +8748,13 @@ msgstr ""
 
 # Aaalaaa, ni punts ni res!  ivb
 #: src/pr.c:2820
+#, fuzzy
 msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
@@ -8545,7 +8769,7 @@ msgstr ""
 "                       especifiqueu «-w».\n"
 
 # Eeeeinnn?? Beneït info!  ivb
-#: src/pr.c:2827
+#: src/pr.c:2828
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
 "                    separate columns by STRING,\n"
@@ -8568,7 +8792,7 @@ msgstr ""
 # FIXME: suggest using `just take a look at info, man!' for some option descriptions.  ivb
 # revisar l'opció -w
 # Hau!  ivb
-#: src/pr.c:2834
+#: src/pr.c:2835
 msgid ""
 "  -T, --omit-pagination\n"
 "                    omit page headers and trailers, eliminate any "
@@ -8595,7 +8819,7 @@ msgstr ""
 "inhabilita\n"
 "                       l’amplada de pàgina per defecte.\n"
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
 "                    set page width to PAGE_WIDTH (72) characters always,\n"
@@ -8611,7 +8835,7 @@ msgstr ""
 "                       amb les opcions «-S» o «-s».\n"
 
 # Acaba pr i encara estic viu!  Vaig a prendre una aspirina...   ivb
-#: src/pr.c:2852
+#: src/pr.c:2853
 msgid ""
 "\n"
 "-t is implied if PAGE_LENGTH <= 10.  With no FILE, or when FILE is -, read\n"
@@ -8635,7 +8859,8 @@ msgstr ""
 "\n"
 
 #: src/printenv.c:69
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+#, fuzzy
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr ""
 "  -0, --null           Acaba cada línia d’eixida amb un octet 0 en lloc "
 "d’un\n"
@@ -8767,12 +8992,12 @@ msgstr "F. Pinard"
 
 # La primera és un missatge d'error.  ivb
 # Usa quote() en la segona.  ivb
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, c-format
 msgid "%s (for regexp %s)"
 msgstr "%s (a l’expressió regular %s)"
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
@@ -8782,8 +9007,7 @@ msgstr ""
 "      o bé: %s -G [OPCIÓ]… [ENTRADA [SORTIDA]]\n"
 
 # Escriu les paraules del text seguides, començant cada colta per una.  ivb
-#: src/ptx.c:1821
-#, fuzzy
+#: src/ptx.c:1824
 msgid ""
 "Output a permuted index, including context, of the words in the input "
 "files.\n"
@@ -8791,9 +9015,8 @@ msgstr ""
 "Escriu un índex permutat, incloent el context, amb les paraules dels "
 "fitxers\n"
 "que formen l’entrada.\n"
-"\n"
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
 "  -G, --traditional              behave more like System V 'ptx'\n"
@@ -8805,7 +9028,7 @@ msgstr ""
 "                       Empra la CADENA per a senyalar els truncaments de\n"
 "                       línia.\n"
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
 "  -O, --format=roff              generate output as roff directives\n"
@@ -8825,7 +9048,7 @@ msgstr ""
 "                       l’expressió regular indicada.\n"
 "  -T, --format=tex     Genera la sortida com a directives de TeX.\n"
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -8852,7 +9075,7 @@ msgstr ""
 "que\n"
 "                       seran preses com a paraules clau.\n"
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -8865,18 +9088,17 @@ msgstr ""
 "  -w, --width=NÚMERO    Amplada (en columnes) de la sortida (excloent�ne la\n"
 "                       referència).\n"
 
-#: src/ptx.c:1854
+#: src/ptx.c:1857
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
 "\n"
-"Sense cap FITXER o si FITXER és «-», llegeix l’entrada estàndard.  Per "
-"defecte\n"
-"s’empra «-F /».\n"
+"Sense cap FITXER, o quan FITXER és «-», llegeix l’entrada estàndard.  Per\n"
+"defecte s’empra «-F /».\n"
 
 # Usa quote().  ivb
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, c-format
 msgid "invalid gap width: %s"
 msgstr "la mida de la separació no és vàlida: %s"
@@ -8898,27 +9120,33 @@ msgstr ""
 "                       enllaços simbòlics.\n"
 "  -P, --physical       Evita els enllaços simbòlics.\n"
 
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+
 # Usa quote().  ivb
-#: src/pwd.c:166
+#: src/pwd.c:169
 #, c-format
 msgid "failed to chdir to %s"
 msgstr "no s’ha pogut canviar al directori %s"
 
 # Usa quote().  ivb
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, c-format
 msgid "failed to stat %s"
 msgstr "ha fallat stat() sobre %s"
 
 # Usa quote().  ivb
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr ""
 "no s’ha pogut trobar una entrada de directori en %s amb un node índex "
 "coincident"
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, c-format
 msgid "ignoring non-option arguments"
 msgstr "es descarten els arguments no�opció"
@@ -8928,8 +9156,8 @@ msgstr "es descarten els arguments no�opció"
 msgid "Dmitry V. Levin"
 msgstr "Dmitry V. Levin"
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Forma d’ús: %s [OPCIÓ]… FITXER…\n"
@@ -8976,8 +9204,7 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 "  -m, --canonicalize-missing\n"
 "                       Prova de trobar el nom canònic seguint recursivament\n"
@@ -8988,11 +9215,13 @@ msgstr ""
 "  -q, --quiet,\n"
 "  -s, --silent         No mostra la majoria de missatges d’error.\n"
 "  -v, --verbose        Mostra els missatges d’error.\n"
+"  -z, --zero           Escriu un octet 0 en lloc de cada caràcter de nova\n"
+"                       línia per a separar els resultats.\n"
 
 #: src/readlink.c:152
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring --no-newline with multiple arguments"
-msgstr "es descarten els arguments no�opció"
+msgstr "es descarta l’opció «--no-newline» ja que hi ha múltiples arguments"
 
 #: src/realpath.c:72
 msgid ""
@@ -9006,6 +9235,7 @@ msgstr ""
 "\n"
 
 #: src/realpath.c:77
+#, fuzzy
 msgid ""
 "  -e, --canonicalize-existing  all components of the path must exist\n"
 "  -m, --canonicalize-missing   no components of the path need exist\n"
@@ -9015,7 +9245,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 "  -e, --canonicalize-existing\n"
@@ -9059,49 +9289,49 @@ msgstr "%s: voleu descendir al directori %s? "
 
 # FIXME: Language-dependent.  ivb
 # Usa quote() en els 2 args.  ivb
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr "%s: voleu eliminar el %s protegit contra escriptura %s? "
 
 # FIXME: Language-dependent.  ivb
 # Usa quote() en els 2 args.  ivb
-#: src/remove.c:291
+#: src/remove.c:292
 #, c-format
 msgid "%s: remove %s %s? "
 msgstr "%s: voleu eliminar el %s %s? "
 
 # Els 2 usen quote().  ivb
 # Missatge informatiu.  ivb
-#: src/remove.c:374
+#: src/remove.c:375
 #, c-format
 msgid "removed directory: %s\n"
 msgstr "s’ha eliminat el directori: %s\n"
 
-# Usa quote().  ivb
-# Es refereix a ``.`` i ``..``, que no es poden eliminar mail.  ivb
-#: src/remove.c:444
+# Usa quote() en els 3 arguments.  ivb
+#: src/remove.c:447
 #, c-format
-msgid "cannot remove directory: %s"
-msgstr "no es pot eliminar el directori %s"
+msgid "refusing to remove %s or %s directory: skipping %s"
+msgstr "no es poden eliminar els directoris %s o %s; es salta %s"
 
 # Usa quote().  ivb
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr "es salta %s perquè es troba en un altre dispositiu"
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, c-format
 msgid "traversal failed: %s"
 msgstr "no s’ha pogut recórrer: %s"
 
 # L’últim és una adreça de correu.  ivb
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -9135,12 +9365,12 @@ msgstr ""
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 "  -I                   Pregunta una volta abans d’eliminar més de tres\n"
 "                       fitxers, en eliminar recursivament.  No tan molesta "
@@ -9228,13 +9458,17 @@ msgstr ""
 
 #: src/rm.c:342
 #, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr "%s: voleu eliminar tots els arguments recursivament? "
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] "%s: voleu eliminar %zu argument recursivament? "
+msgstr[1] "%s: voleu eliminar %zu arguments recursivament? "
 
-#: src/rm.c:343
+#: src/rm.c:345
 #, c-format
-msgid "%s: remove all arguments? "
-msgstr "%s: voleu eliminar tots els arguments? "
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] "%s: voleu eliminar %zu argument? "
+msgstr[1] "%s: voleu eliminar %zu arguments? "
 
 # Cap dels 2 usa quote().  ivb
 # Missatge informatiu.  ivb
@@ -9293,13 +9527,14 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
+"Executa una ORDRE sota un context de seguretat de SELinux diferent.  Si no\n"
+"s’indica un CONTEXT ni una ORDRE, mostra el context de seguretat actual.\n"
 
 # (process transition) context  ivb
 #: src/runcon.c:94
-#, fuzzy
 msgid ""
 "  CONTEXT            Complete security context\n"
 "  -c, --compute      compute process transition context before modifying\n"
@@ -9309,9 +9544,6 @@ msgid ""
 "  -l, --range=RANGE  levelrange\n"
 "\n"
 msgstr ""
-"Executa una ORDRE sota un context de seguretat diferent.  Si no s’indica un\n"
-"CONTEXT ni una ORDRE, mostra el context de seguretat actual.\n"
-"\n"
 "  CONTEXT              El nou context de seguritat complet.\n"
 "  -c, --compute        Calcula el context de transició entre processos "
 "abans\n"
@@ -9320,6 +9552,7 @@ msgstr ""
 "  -u, --user=USUARI    Nova identitat d’USUARI.\n"
 "  -r, --role=ROL       Nou ROL.\n"
 "  -l, --range=RANG     Nou RANG de nivells.\n"
+"\n"
 
 #: src/runcon.c:144
 #, c-format
@@ -9359,46 +9592,52 @@ msgid "no command specified"
 msgstr "no s’ha especificat cap ordre"
 
 # No usa quote().  ivb
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr "només podeu executar «%s» sota un nucli amb SELinux"
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, c-format
 msgid "failed to compute a new context"
 msgstr "no s’ha pogut calcular un nou context"
 
 # No usa quote().  ivb
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, c-format
 msgid "failed to set new user %s"
 msgstr "no s’ha pogut establir el nou usuari «%s»"
 
 # No usa quote().  ivb
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, c-format
 msgid "failed to set new type %s"
 msgstr "no s’ha pogut establir el nou tipus «%s»"
 
 # No usa quote().  ivb
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, c-format
 msgid "failed to set new range %s"
 msgstr "no s’ha pogut establir el nou rang «%s»"
 
 # No usa quote().  ivb
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, c-format
 msgid "failed to set new role %s"
 msgstr "no s’ha pogut establir el nou rol «%s»"
 
 # No usa quote().  ivb
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, c-format
 msgid "unable to set security context %s"
 msgstr "no s’ha pogut establir el context de seguretat «%s»"
 
+# Usa quote().  ivb
+#: src/selinux.c:127 src/selinux.c:300
+#, c-format
+msgid "error canonicalizing %s"
+msgstr "error en trobar el nom canònic de %s"
+
 #: src/seq.c:68
 #, c-format
 msgid ""
@@ -9412,17 +9651,14 @@ msgstr ""
 
 #: src/seq.c:73
 msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n"
-msgstr ""
+msgstr "Mostra els números del PRIMER al DARRER, amb pas INCREMENT.\n"
 
 #: src/seq.c:79
-#, fuzzy
 msgid ""
 "  -f, --format=FORMAT      use printf style floating-point FORMAT\n"
 "  -s, --separator=STRING   use STRING to separate numbers (default: \\n)\n"
 "  -w, --equal-width        equalize width by padding with leading zeroes\n"
 msgstr ""
-"Mostra els números del PRIMER al DARRER, amb pas INCREMENT.\n"
-"\n"
 "  -f, --format=FORMAT    Empra el FORMAT indicat de coma flotat d’estil\n"
 "                       printf().\n"
 "  -s, --separator=CADENA    Empra aquesta CADENA per a separar els números\n"
@@ -9434,6 +9670,8 @@ msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
@@ -9442,13 +9680,14 @@ msgstr ""
 "Si s’omet PRIMER o INCREMENT, es pren 1 per defecte.  És a dir, un "
 "INCREMENT\n"
 "omés pren un valor per defecte d’1, fins i tot quan DARRER és menor que\n"
-"PRIMER.  PRIMER, INCREMENT i DARRER s’interpreten com a números reals en "
-"coma\n"
-"flotant.  INCREMENT sol ser positiu si PRIMER és menor que DARRER, i sol "
-"ser\n"
-"negatiu si PRIMER és major que DARRER.\n"
+"PRIMER.  La seqüència de números acaba quan la suma del número actual i\n"
+"l’INCREMENT supera el DARRER.  PRIMER, INCREMENT i DARRER s’interpreten com "
+"a\n"
+"números reals en coma flotant.  INCREMENT sol ser positiu si PRIMER és "
+"menor\n"
+"que DARRER, i sol ser negatiu si PRIMER és major que DARRER.\n"
 
-#: src/seq.c:94
+#: src/seq.c:96
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
 "it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n"
@@ -9460,97 +9699,29 @@ msgstr ""
 "números decimals de coma fixa amb una PRECISIÓ màxima, «%g» en cas "
 "contrari.\n"
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, c-format
 msgid "invalid floating point argument: %s"
 msgstr "l’argument de coma flotant no és vàlid: «%s»"
 
 # Usa quote() en la 1a.  ivb
-#: src/seq.c:232
+#: src/seq.c:234
 #, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr "el format %s té una directiva «%%%c» desconeguda"
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr ""
 "no s’ha d’indicar una cadena de format quan s’empren amplàries igualades"
 
-#: src/setuidgid.c:49
-#, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-"Forma d’ús: %s [OPCIÓ_CURTA]… USUARI ORDRE [ARGUMENT]…\n"
-"      o bé: %s OPCIÓ_LLARGA\n"
-
-#: src/setuidgid.c:55
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-"Abandona els grups suplementaris, assumeix els identificadors d’usuari i "
-"grup\n"
-"de l’USUARI indicat (per número o per nom), i executa l’ORDRE amb els\n"
-"ARGUMENTs especificats.  Ix amb codi 111 si no pot assumir els "
-"identificadors\n"
-"d’usuari o grup requerits.  En cas contrari ix amb el codi d’eixida de\n"
-"l’ORDRE.  Aquest programa només és d’utilitat quan l’executa root (que té\n"
-"identificador d’usuari 0).\n"
-"\n"
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-"  -g GID,[GID1,GID2…]    Estableix també el grup primari al GID numèric i, "
-"si\n"
-"                       s’indiquen, els grups suplementaris a GID1, GID2…\n"
-
-# Usa quote().  ivb
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr "l’identificador d’usuari no és conegut: %s"
-
-# Usa quote().  ivb
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr ""
-"per a emprar l’identificador d’usuari %s també heu d’emprar l’opció «-g»"
-
-#: src/setuidgid.c:190
-#, c-format
-msgid "failed to set supplemental group(s)"
-msgstr "no s’han pogut establir els grups suplementaris"
-
-#: src/setuidgid.c:200
-#, c-format
-msgid "cannot set group-ID to %lu"
-msgstr "no s’ha pogut establir l’identificador de grup a %lu"
-
-#: src/setuidgid.c:204
-#, c-format
-msgid "cannot set user-ID to %lu"
-msgstr "no s’ha pogut establir l’identificador d’usuari %lu"
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr "Colin Plumb"
 
-#: src/shred.c:148
-#, fuzzy
+#: src/shred.c:170
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
 "for even very expensive hardware probing to recover the data.\n"
@@ -9558,9 +9729,8 @@ msgstr ""
 "Sobreescriu cada FITER repetidament, per tal de fer més difícil recuperar "
 "les\n"
 "dades, fins i tot per sondejos de maquinari molt cars.\n"
-"\n"
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -9578,16 +9748,17 @@ msgstr ""
 "sufixos\n"
 "                       com «K», «M» i «G»).\n"
 
-#: src/shred.c:161
+#: src/shred.c:183
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
 "  -z, --zero     add a final overwrite with zeros to hide shredding\n"
 msgstr ""
-"  -u, --remove         Trunca i elimina el fitxer després de "
+"  -u, --remove[=COM]    Trunca i elimina el fitxer després de "
 "sobreescriure’l.\n"
+"                       Més detalls a sota.\n"
 "  -v, --verbose        Mostra com progressa el procés.\n"
 "  -x, --exact          No arrodoneix les mides de fitxer al següent bloc\n"
 "                       complet; aquest és el comportament per defecte per "
@@ -9597,28 +9768,36 @@ msgstr ""
 "zeros\n"
 "                       per amagar la destrucció de les dades.\n"
 
-#: src/shred.c:170
+#: src/shred.c:192
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 "\n"
 "Si el FITXER és «-», sobreescriu l’eixida estàndard.\n"
 "\n"
 "Si s’especifica «--remove» (-u) s’elimina cada FITXER.  Per defecte no\n"
-"s’eliminen aquests perquè és comú operar sobre fitxers dispositiu com\n"
-"«/dev/hda», i normalment aquests fitxers no s’haurien d’eliminar.  Quan\n"
-"s’opera sobre fitxers ordinaris la majoria de la gent empra l’opció\n"
-"«--remove».\n"
+"s’eliminen perquè és comú operar sobre fitxers dispositiu com «/dev/hda», i\n"
+"normalment aquests fitxers no s’haurien d’eliminar.  El paràmetre opcional\n"
+"indica COM esborrar l’entrada del directori: «unlink» empra la crida "
+"habitual\n"
+"unlink(), «wipe» també canvia abans els octets del nom, «wipesync» també\n"
+"sincronitza a disc cada octet canviat.  El mode per defecte és «wipesync», "
+"però\n"
+"teniu en compte que pot ser costós.\n"
 "\n"
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -9640,7 +9819,7 @@ msgstr ""
 "del sistema de fitxers:\n"
 "\n"
 
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -9664,7 +9843,7 @@ msgstr ""
 "  Appliances.\n"
 "\n"
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -9678,7 +9857,7 @@ msgstr ""
 "* Sistemes de fitxers amb compressió.\n"
 "\n"
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -9702,7 +9881,7 @@ msgstr ""
 "«/etc/fstab», com s’indica al manual de «mount» (executeu «man mount»).\n"
 "\n"
 
-#: src/shred.c:215
+#: src/shred.c:241
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
 "of the file that cannot be removed, and that will allow a shredded file\n"
@@ -9713,130 +9892,130 @@ msgstr ""
 "fitxers poden contenir còpies del fitxer que no poden ser eliminades, i que\n"
 "podrien permetre recuperar més endavant el fitxer destruït.\n"
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, c-format
 msgid "%s: fdatasync failed"
 msgstr "%s: ha fallat fdatasync()"
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr "%s: ha fallat fsync()"
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr "%s: no s’ha pogut rebobinar"
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr "%s: passada %lu/%lu (%s)…"
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, c-format
 msgid "%s: error writing at offset %s"
 msgstr "%s: error en escriure al desplaçament %s"
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s: ha fallat lseek()"
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, c-format
 msgid "%s: file too large"
 msgstr "%s: el fitxer és massa gran"
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr "%s: passada %lu/%lu (%s)…%s"
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr "%s: passada %lu/%lu (%s)…%s/%s %d%%"
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, c-format
 msgid "%s: fstat failed"
 msgstr "%s: ha fallat fstat()"
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, c-format
 msgid "%s: invalid file type"
 msgstr "%s: el tipus del fitxer no és vàlid"
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr "%s: el fitxer té una mida negativa"
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, c-format
 msgid "%s: error truncating"
 msgstr "%s: error en truncar"
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, c-format
 msgid "%s: fcntl failed"
 msgstr "%s: ha fallat fcntl()"
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr ""
 "%s: no es pot destruir el fitxer d’un descriptor obert només per afegir"
 
 # Missatge informatiu, es refereix al nom, no a les dades.  ivb
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr "%s: inici de l’eliminació"
 
 # No usa quote().  ivb
-#: src/shred.c:991
+#: src/shred.c:1102
 #, c-format
 msgid "%s: renamed to %s"
 msgstr "%s: s’ha reanomenat a «%s»"
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, c-format
 msgid "%s: failed to remove"
 msgstr "%s: no s’ha pogut eliminar"
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr "%s: ha estat eliminat"
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, c-format
 msgid "%s: failed to close"
 msgstr "%s: no s’ha pogut tancar"
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, c-format
 msgid "%s: failed to open for writing"
 msgstr "%s: no s’ha pogut obrir per a escriure"
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, c-format
 msgid "%s: invalid number of passes"
 msgstr "%s: el nombre de passades no és vàlid"
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, c-format
 msgid "multiple random sources specified"
 msgstr "s’han especificat múltiples fonts d’aleatorietat"
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, c-format
 msgid "%s: invalid file size"
 msgstr "%s: la mida del fitxer no és vàlida"
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -9847,15 +10026,15 @@ msgstr ""
 "      o bé: %s -e [OPCIÓ]… [ARGUMENT]…\n"
 "      o bé: %s -i INF-SUP [OPCIÓ]…\n"
 
-#: src/shuf.c:54
-#, fuzzy
+#: src/shuf.c:67
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr ""
 "Escriu una permutació aleatòria de les línies d’entrada a l’eixida "
 "estàndard.\n"
-"\n"
 
-#: src/shuf.c:60
+# So much for "do one thing and do it well".  ivb
+#: src/shuf.c:73
+#, fuzzy
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
 "  -i, --input-range=LO-HI   treat each number LO through HI as an input "
@@ -9863,7 +10042,7 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
 msgstr ""
 "  -e, --echo           Tracta cada argument com a una línia d’entrada.\n"
 "  -i, --input-range=INF-SUP\n"
@@ -9876,35 +10055,46 @@ msgstr ""
 "                       estàndard.\n"
 "      --random-source=FITXER\n"
 "                       Obté octets aleatoris del FITXER.\n"
+"  -r, --repeat         Permet línies d’eixida repetides.\n"
 "  -z, --zero-terminated    Escriu un octet 0 en lloc de cada caràcter de "
 "nova\n"
 "                       línia.\n"
 
-#: src/shuf.c:244
+#: src/shuf.c:228
+#, c-format
+msgid "too many input lines"
+msgstr "hi ha massa línies d’entrada"
+
+#: src/shuf.c:431
 #, c-format
 msgid "multiple -i options specified"
 msgstr "s’han especificat múltiples opcions «-i»"
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, c-format
 msgid "invalid input range %s"
 msgstr "el rang d’entrada no és vàlid: %s"
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, c-format
 msgid "invalid line count %s"
 msgstr "el nombre de línies no és vàlid: %s"
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, c-format
 msgid "multiple output files specified"
 msgstr "s’han especificat múltiples fitxers d’eixida"
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, c-format
 msgid "cannot combine -e and -i options"
 msgstr "no es poden combinar les opcions «-e» i «-i»"
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr ""
+
 #: src/sleep.c:44
 #, c-format
 msgid ""
@@ -9931,24 +10121,22 @@ msgstr ""
 "\n"
 
 # Usa quote().  ivb
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, c-format
 msgid "invalid time interval %s"
 msgstr "l’interval de temps %s no és vàlid"
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr "no s’ha pogut llegir el rellotge de temps real"
 
-#: src/sort.c:399
-#, fuzzy
+#: src/sort.c:427
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr ""
 "Escriu la concatenació ordenada de tots els FITXERs a la sortida estàndard.\n"
-"\n"
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
@@ -9956,7 +10144,7 @@ msgstr ""
 "Opcions d’ordenació:\n"
 "\n"
 
-#: src/sort.c:409
+#: src/sort.c:437
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
 "  -d, --dictionary-order      consider only blanks and alphanumeric "
@@ -9971,7 +10159,7 @@ msgstr ""
 "                       alfanumèrics.\n"
 "  -f, --ignore-case    Converteix a majúscules.\n"
 
-#: src/sort.c:415
+#: src/sort.c:443
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
 "  -i, --ignore-nonprinting    consider only printable characters\n"
@@ -9984,7 +10172,7 @@ msgstr ""
 "  -M, --month-sort     Ordena per mesos en anglés:\n"
 "                       (desconegut) < JAN < … < DEC.\n"
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
@@ -9992,7 +10180,7 @@ msgstr ""
 "                       Compara números en format llegible per als humans\n"
 "                       (p.ex. «2K» i «1G»).\n"
 
-#: src/sort.c:423
+#: src/sort.c:451
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
 "  -R, --random-sort           sort by random hash of keys\n"
@@ -10005,7 +10193,7 @@ msgstr ""
 "                       Obté octets aleatoris del FITXER.\n"
 "  -r, --reverse        Inverteix el resultat de l’ordenació.\n"
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -10023,7 +10211,7 @@ msgstr ""
 "                       «random» (-R).\n"
 "  -V, --version-sort    Ordena pel número (de versió) inclós al nom.\n"
 
-#: src/sort.c:437
+#: src/sort.c:465
 msgid ""
 "Other options:\n"
 "\n"
@@ -10031,7 +10219,7 @@ msgstr ""
 "Altres opcions:\n"
 "\n"
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
@@ -10040,7 +10228,7 @@ msgstr ""
 "a\n"
 "                          mesclar�ne més empra fitxers temporals.\n"
 
-#: src/sort.c:445
+#: src/sort.c:473
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
 "  -C, --check=quiet, --check=silent  like -c, but do not report first bad "
@@ -10057,7 +10245,7 @@ msgstr ""
 "                       Comprimeix els fitxers temporals amb el PROGRAMA,\n"
 "                       els descomprimeix amb «PROGRAMA -d».\n"
 
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -10075,7 +10263,7 @@ msgstr ""
 "                       Si el FITXER és «-», llegeix els noms de l’entrada\n"
 "                       estàndard.\n"
 
-#: src/sort.c:459
+#: src/sort.c:487
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
 "  -m, --merge               merge already sorted files; do not sort\n"
@@ -10084,7 +10272,7 @@ msgstr ""
 "                       ubicació i el tipus.\n"
 "  -m, --merge          Mescla fitxers prèviament ordenats; no ordena.\n"
 
-#: src/sort.c:463
+#: src/sort.c:491
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "  -s, --stable              stabilize sort by disabling last-resort "
@@ -10098,7 +10286,7 @@ msgstr ""
 "  -S, --buffer-size=MIDA\n"
 "                       Defineix la MIDA de la memòria intermèdia principal.\n"
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -10125,14 +10313,7 @@ msgstr ""
 "                       contrari només escriu la primera d’aquelles entrades\n"
 "                       que resulten iguals.\n"
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr ""
-"  -z, --zero-terminated    Escriu un octet 0 en lloc de cada caràcter de "
-"nova\n"
-"                       línia.\n"
-
-#: src/sort.c:483
+#: src/sort.c:511
 msgid ""
 "\n"
 "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is "
@@ -10165,7 +10346,7 @@ msgstr ""
 "\n"
 "La MIDA pot anar seguida pels següents sufixs multiplicadors:\n"
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -10188,282 +10369,264 @@ msgstr ""
 
 # No usa quote() (afortunadament).  ivb
 # Condició d'error.  ivb
-#: src/sort.c:697
+#: src/sort.c:725
 #, c-format
 msgid "waiting for %s [-d]"
 msgstr "en esperar la finalització de «%s [-d]»"
 
 # No usa quote() (afortunadament).  ivb
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr "«%s [-d]» ha finalitzat de forma anormal"
 
 # Usa quote().  ivb
-#: src/sort.c:856
+#: src/sort.c:884
 #, c-format
 msgid "cannot create temporary file in %s"
 msgstr "no s’ha pogut crear un fitxer temporal a %s"
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr "no s’ha pogut obrir"
 
-#: src/sort.c:970
+#: src/sort.c:998
 msgid "fflush failed"
 msgstr "ha fallat fflush()"
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr "no s’ha pogut tancar"
 
-#: src/sort.c:986
-#, c-format
-msgid "dup2 failed"
-msgstr "ha fallat dup2()"
-
-# No usa quote().  ivb
-#: src/sort.c:1103
-#, c-format
-msgid "couldn't execute %s"
-msgstr "no s’ha pogut executar «%s»"
-
 # Va seguit del nom del fitxer.  ivb
-#: src/sort.c:1110
+#: src/sort.c:1140
 msgid "couldn't create temporary file"
 msgstr "no s’ha pogut crear el fitxer temporal"
 
 # No usa quote() (afortunadament).  ivb
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, c-format
 msgid "couldn't create process for %s -d"
 msgstr "no s’ha pogut crear el procés «%s -d»"
 
 # No usa quote().  ivb
-#: src/sort.c:1161
-#, c-format
-msgid "couldn't execute %s -d"
-msgstr "no s’ha pogut executar «%s -d»"
-
-# No usa quote().  ivb
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, c-format
 msgid "warning: cannot remove: %s"
 msgstr "avís: no s’ha pogut eliminar: %s"
 
 # La segona usa quote().  ivb
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, c-format
 msgid "invalid --%s argument %s"
 msgstr "l’argument %2$s de l’opció «--%1$s» no és vàlid"
 
 # La segona usa quote().  ivb
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, c-format
 msgid "minimum --%s argument is %s"
 msgstr "l’argument mínim de l’opció «--%s» és %s"
 
 # La segona usa quote().  ivb
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, c-format
 msgid "--%s argument %s too large"
 msgstr "l’argument %2$s de l’opció «--%1$s» és massa gran"
 
 # Va darrere d’un error.  ivb
 # La segona no usa quote(), però es un número.  ivb
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr ""
 "l’argument màxim de l’opció «--%s» amb els límits actuals de recursos és %s"
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr "el nombre d’ordenacions concurrents ha de ser major que zero"
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr "ha fallat stat()"
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr "no s’ha pogut llegir"
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, c-format
 msgid "string transformation failed"
 msgstr "ha fallat la transformació de la cadena"
 
 # Usa quote().  ivb
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, c-format
 msgid "the untransformed string was %s"
 msgstr "la cadena sense transformar era %s"
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr "^ no s’ha trobat la clau\n"
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr "la clau «%s» és obsoleta; considereu emprar «%s» al seu lloc"
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr "es descarta la clau %lu de longitud zero"
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr ""
 "els blancs inicials són significatius a la clau %lu; considereu indicar «-b»"
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr "la clau %lu és numèrica i comprén diversos camps"
 
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
 msgstr[0] "es descarta l’opció «-%s»"
 msgstr[1] "es descarten les opcions «-%s»"
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr "l’opció «-r» només afecta la comparació emprada com a darrer recurs"
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr "no s’ha pogut escriure"
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr "%s: %s:%s: fora d’ordre: "
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr "eixida estàndard d’errors"
 
 # Condició d’error, però imprecisa.  ivb
-#: src/sort.c:3698
+#: src/sort.c:3738
 msgid "cannot read"
 msgstr "no es pot llegir"
 
 # Usa quote().  ivb
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, c-format
 msgid "%s: invalid field specification %s"
 msgstr "%s: l’especifiació de camp no és vàlida: %s"
 
-#: src/sort.c:3987
+#: src/sort.c:4028
 #, c-format
 msgid "options '-%s' are incompatible"
 msgstr "les opcions «%s» no són compatibles"
 
 # Usa quote().  ivb
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, c-format
 msgid "%s: invalid count at start of %s"
 msgstr "%s: el comptador a l’inici de %s no és vàlid"
 
-#: src/sort.c:4295
+#: src/sort.c:4336
 msgid "invalid number after '-'"
 msgstr "el número després de «-» no és vàlid"
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 msgid "invalid number after '.'"
 msgstr "el número després de «.» no és vàlid"
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr "l’especificació de camp conté un caràcter extraviat"
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, c-format
 msgid "multiple compress programs specified"
 msgstr "s’han especificat múltiples programes de compressió"
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
 msgstr "el número a l’inici del camp no és vàlid"
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
 msgstr "el número de camp és zero"
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr "el desplaçament de caràcter és zero"
 
-#: src/sort.c:4407
+#: src/sort.c:4448
 msgid "invalid number after ','"
 msgstr "el número després de «,» no és vàlid"
 
 # No és necessàriament una tabulació, ho diu info.  ivb
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr "el separador és buit"
 
 # Usa quote().  ivb
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, c-format
 msgid "cannot read file names from %s"
 msgstr "no s’han pogut llegir els noms de fitxer de %s"
 
 # Usa quote().  ivb
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr "%s:%lu: el nom buit de fitxer no és vàlid"
 
 # Usa quote().  ivb
 # Condició d'error.  ivb
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, c-format
 msgid "no input from %s"
 msgstr "el fitxer d’entrada %s no conté dades"
 
 # Missatge informatiu.  ivb
 # Usa quote().  ivb
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr "s’estan emprant les regles d’ordenació de %s"
 
 # Missatge informatiu.  ivb
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr "s’està emprant la comparació directa d’octets"
 
 # Usa quote().  ivb
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr "no es permet l’operand extra %s en emprar l’opció «-%c»"
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr "la longitud del sufix ha de ser almenys %zu"
 
-#: src/split.c:204
+#: src/split.c:203
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr "Forma d’ús: %s [OPCIÓ]… [ENTRADA [PREFIX]]\n"
 
-#: src/split.c:208
-#, fuzzy
+#: src/split.c:207
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
 "size is 1000 lines, and default PREFIX is 'x'.  With no INPUT, or when "
@@ -10474,26 +10637,24 @@ msgstr ""
 "La mida per defecte és de 1000 línies, i el PREFIX per defecte és «x».  "
 "Sense\n"
 "ENTRADA, o quan ENTRADA és «-», llegeix l’entrada estàndard.\n"
-"\n"
 
 # corregir l'opció -C
 # Ein?  ivb
-#: src/split.c:216
+#: src/split.c:215
 #, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
 "  -a, --suffix-length=N    Genera sufixs de longitud N (per defecte %d).\n"
@@ -10512,11 +10673,12 @@ msgstr ""
 "del\n"
 "                       fitxer es trobarà a $FILE.\n"
 "  -l, --lines=NOMBRE    Escriu aquest NOMBRE de línies per fitxer.\n"
-"  -n, --number=TROSSOS    Genera els TROSSOS com s’indica (vegeu a sota).\n"
+"  -n, --number=TROSSOS    Genera els TROSSOS com s’indica.  Més detalls a\n"
+"                       sota.\n"
 "  -u, --unbuffered     Còpia immediatament l’entrada a l’eixida en emprar\n"
 "                       «-n r/…».\n"
 
-#: src/split.c:229
+#: src/split.c:228
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
 "                            output file is opened\n"
@@ -10524,7 +10686,7 @@ msgstr ""
 "      --verbose        Mostra un missatge abans d’obrir cada fitxer de\n"
 "                       sortida.\n"
 
-#: src/split.c:236
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -10547,188 +10709,188 @@ msgstr ""
 "  r/K/N    El mateix, però només escriu el K�è tros (d’un total d’N) a\n"
 "           l’eixida estàndard.\n"
 
-#: src/split.c:354
+#: src/split.c:353
 #, c-format
 msgid "output file suffixes exhausted"
 msgstr "s’han esgotat els sufixs per als fitxers de sortida"
 
 # Usa quote().  ivb
 # Missatge informatiu.  ivb
-#: src/split.c:366
+#: src/split.c:365
 #, c-format
 msgid "creating file %s\n"
 msgstr "s’està creant el fitxer %s\n"
 
 # Usa quote().  ivb
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr "%s sobreescriuria l’entrada; s’avorta"
 
 # Usa quote().  ivb
-#: src/split.c:391
+#: src/split.c:390
 #, c-format
 msgid "failed to set FILE environment variable"
 msgstr "no s’ha pogut establir la variable d’entorn FILE"
 
 # Missatge informatiu.  ivb
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr "s’està executant amb «FILE=%s»\n"
 
-#: src/split.c:395
+#: src/split.c:394
 #, c-format
 msgid "failed to create pipe"
 msgstr "no s’ha pogut crear la canonada"
 
 # És un missatge d'error.  ivb
-#: src/split.c:409
+#: src/split.c:408
 #, c-format
 msgid "closing prior pipe"
 msgstr "en tancar la canonada anterior"
 
 # Condició d'error.  ivb
-#: src/split.c:411
+#: src/split.c:410
 #, c-format
 msgid "closing output pipe"
 msgstr "en tancar la canonada d’eixida"
 
 # Condició d'error.  ivb
-#: src/split.c:415
+#: src/split.c:414
 #, c-format
 msgid "moving input pipe"
 msgstr "en moure la canonada d’entrada"
 
 # Condició d'error.  ivb
-#: src/split.c:417
+#: src/split.c:416
 #, c-format
 msgid "closing input pipe"
 msgstr "en tancar la canonada d’entrada"
 
-#: src/split.c:422
+#: src/split.c:421
 #, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr "no s’ha pogut executar l’ordre «%s -c %s»"
 
-#: src/split.c:428
+#: src/split.c:427
 #, c-format
 msgid "failed to close input pipe"
 msgstr "no s’ha pogut tancar la canonada d’entrada"
 
 # Condició d'error.  ivb
-#: src/split.c:464
+#: src/split.c:463
 #, c-format
 msgid "waiting for child process"
 msgstr "en esperar la finalització del procés fill"
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr "amb «FILE=%1$s», l’ordre «%3$s» ha rebut el senyal %2$s"
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
-msgstr "amb «FILE=%1$s», l’ordre «%3$s» ha eixit amb l’estat %2$d"
+msgstr "amb «FILE=%1$s», l’ordre «%3$s» ha eixit amb el codi %2$d"
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
-msgstr "l’estat d’eixida de l’ordre és desconegut (0x%X)"
+msgstr "el codi d’eixida de l’ordre és desconegut (0x%X)"
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr "només es pot partir el fitxer d’una manera"
 
 # N de K/N.  ivb
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, c-format
 msgid "%s: invalid number of chunks"
 msgstr "%s: el nombre de trossos no és vàlid"
 
 # K de K/N.  ivb
-#: src/split.c:1069
+#: src/split.c:1119
 #, c-format
 msgid "%s: invalid chunk number"
 msgstr "%s: el número del tros no és vàlid"
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr "%s: la longitud del sufix no és vàlida"
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr "%s: el nombre d’octets no és vàlid"
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr "%s: el nombre de línies no és vàlid"
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, c-format
 msgid "line count option -%s%c... is too large"
 msgstr "l’opció de nombre de línies «-%s%c…» és massa gran"
 
-#: src/split.c:1248
+#: src/split.c:1298
 #, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr "%s: el valor d’inici per als sufixs numèrics no és vàlid"
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, c-format
 msgid "%s: invalid IO block size"
 msgstr "%s: la mida del bloc d’E/S no és vàlida"
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr "«--filter» no permet processar trossos escrits a l’eixida estàndard"
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr ""
 "el valor d’inici per als sufixs numèrics és massa gran per a la longitud del "
 "sufix"
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, c-format
 msgid "%s: cannot determine file size"
 msgstr "%s: no s’ha pogut determinar la mida del fitxer"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr "Michael Meskes"
 
 # Usa quote().  ivb
-#: src/stat.c:857
+#: src/stat.c:887
 #, c-format
 msgid "failed to canonicalize %s"
 msgstr "no s’ha pogut trobar el nom canònic de %s"
 
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr "avís: la seqüència d’escapada «\\%c» no és reconeguda"
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, c-format
 msgid "%s: invalid directive"
 msgstr "%s: la directiva no és vàlida"
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, c-format
 msgid "warning: backslash at end of format"
 msgstr "avís: hi ha una barra invertida al final de la línia"
 
 # Usa quote().  ivb
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr ""
@@ -10736,20 +10898,20 @@ msgstr ""
 "fitxers"
 
 # Usa quote().  ivb
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, c-format
 msgid "cannot read file system information for %s"
 msgstr "no s’ha pogut llegir la informació de sistema de fitxers de %s"
 
 # Indica la situació d'un missatge d'error.  ivb
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, c-format
 msgid "cannot stat standard input"
 msgstr "ha fallat stat() sobre l’entrada estàndard"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -10766,7 +10928,7 @@ msgstr ""
 # Alineat amb «Modificació:».  ivb
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -10777,34 +10939,34 @@ msgstr ""
 # Alineat amb «Modificació:».  ivb
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr "Dispositiu: %Dh/%dd\tNode�i: %-10i  Enllaços: %-5h Tipus: %t,%T\n"
 
 # Alineat amb «Modificació:».  ivb
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr " Dispositiu: %Dh/%dd\tNode�i: %-10i  Enllaços: %h\n"
 
 # Alineat amb «Modificació:».  ivb
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr "      Accés: (%04a/%10.10A)  UID: (%5u/%8U)   GID: (%5g/%8G)\n"
 
 # Alineat amb «Modificació:».  ivb
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, c-format
 msgid "Context: %C\n"
 msgstr "    Context: %C\n"
 
 # Alineat amb «Modificació:».  ivb
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -10816,29 +10978,26 @@ msgstr ""
 "      Canvi: %z\n"
 "  Naixement: %w\n"
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
-msgstr ""
+msgstr "Mostra l’estat d’un fitxer o sistema de fitxers.\n"
 
-#: src/stat.c:1356
-#, fuzzy
+#: src/stat.c:1418
 msgid ""
 "  -L, --dereference     follow links\n"
 "  -f, --file-system     display file system status instead of file status\n"
 msgstr ""
-"Mostra l’estat d’un fitxer o sistema de fitxers.\n"
-"\n"
 "  -L, --dereference    Segueix els enllaços simbòlics.\n"
 "  -f, --file-system    Mostra l’estat del sistema de fitxers en lloc de\n"
 "                       l’estat del fitxer.\n"
 
-#: src/stat.c:1360
+#: src/stat.c:1422
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 "  -c, --format=FORMAT    Empra el FORMAT especificat en lloc de l’emprat "
@@ -10852,7 +11011,7 @@ msgstr ""
 "                       incloeu «\\n» al FORMAT.\n"
 "  -t, --terse          Mostra la informació de forma pelada.\n"
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 msgid ""
 "\n"
 "The valid format sequences for files (without --file-system):\n"
@@ -10873,7 +11032,7 @@ msgstr ""
 "  %B    Mida en octets de cada bloc mostrat per «%b».\n"
 "  %C    Cadena de context de seguretat de SELinux.\n"
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 msgid ""
 "  %d   device number in decimal\n"
 "  %D   device number in hex\n"
@@ -10889,7 +11048,7 @@ msgstr ""
 "  %g    Identificador del grup del propietari.\n"
 "  %G    Nom del grup del propietari.\n"
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 msgid ""
 "  %h   number of hard links\n"
 "  %i   inode number\n"
@@ -10898,8 +11057,8 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 "  %h    Nombre d’enllaços forts.\n"
 "  %i    Número del node índex.\n"
@@ -10910,11 +11069,16 @@ msgstr ""
 "        simbòlic.\n"
 "  %o    Indicació de la mida òptima d’E/S.\n"
 "  %s    Mida total, en octets.\n"
-"  %t    Número major de dispositiu, en hexadecimal.\n"
-"  %T    Número menor de dispositiu, en hexadecimal.\n"
+"  %t    Número major de dispositiu en hexadecimal, per a fitxers especials "
+"de\n"
+"        caràcters o blocs.\n"
+"  %T    Número menor de dispositiu en hexadecimal, per a fitxers especials "
+"de\n"
+"        caràcters o blocs.\n"
 
 # Indique «de les dades» i «del node índex», queda més clar.  ivb
-#: src/stat.c:1399
+#: src/stat.c:1461
+#, fuzzy
 msgid ""
 "  %u   user ID of owner\n"
 "  %U   user name of owner\n"
@@ -10922,10 +11086,10 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 "  %u    Identificador d’usuari del propietari.\n"
@@ -10946,7 +11110,7 @@ msgstr ""
 "  %Z    Data del darrer canvi al node índex en segons des de l’Època.\n"
 "\n"
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 msgid ""
 "Valid format sequences for file systems:\n"
 "\n"
@@ -10964,7 +11128,7 @@ msgstr ""
 "  %d     Nombre de nodes índex lliures del sistema de fitxers.\n"
 "  %f     Nombre de blocs de dades lliures del sistema de fitxers.\n"
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 msgid ""
 "  %i   file system ID in hex\n"
 "  %l   maximum length of filenames\n"
@@ -10988,7 +11152,6 @@ msgid "Usage: %s OPTION... COMMAND\n"
 msgstr "Forma d’ús: %s OPCIÓ… ORDRE\n"
 
 #: src/stdbuf.c:91
-#, fuzzy
 msgid ""
 "Run COMMAND, with modified buffering operations for its standard streams.\n"
 msgstr ""
@@ -11062,24 +11225,29 @@ msgstr ""
 "«stdbuf».\n"
 
 # Usa quote().  ivb
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, c-format
 msgid "failed to find %s"
 msgstr "no s’ha trobat %s"
 
 # Usa quote().  ivb
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, c-format
 msgid "failed to update the environment with %s"
 msgstr "no s’ha pogut modificar l’entorn amb %s"
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr ""
 "la memòria intermèdia basada en línies no té sentit per a l’entrada estàndard"
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, c-format
+msgid "you must specify a buffering mode option"
+msgstr "cal que especifiqueu una opció de mode de memòria intermèdia"
+
+#: src/stty.c:516
 #, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -11090,19 +11258,16 @@ msgstr ""
 "      o bé: %s [-F DISPOSITIU | --file=DISPOSITIU] [-a|--all]\n"
 "      o bé: %s [-F DISPOSITIU | --file=DISPOSITIU] [-g|--save]\n"
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
-msgstr ""
+msgstr "Mostra o canvia les característiques del terminal.\n"
 
-#: src/stty.c:525
-#, fuzzy
+#: src/stty.c:528
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
 "  -g, --save         print all current settings in a stty-readable form\n"
 "  -F, --file=DEVICE  open and use the specified DEVICE instead of stdin\n"
 msgstr ""
-"Mostra o canvia les característiques del terminal.\n"
-"\n"
 "  -a, --all            Mostra totes les propietats actuals de forma "
 "llegible\n"
 "                       per als humans.\n"
@@ -11113,7 +11278,7 @@ msgstr ""
 "de\n"
 "                       l’entrada estàndard.\n"
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
@@ -11126,7 +11291,7 @@ msgstr ""
 "subjaent.\n"
 
 # El més llarg és «werase CAR».  ivb
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -11142,7 +11307,7 @@ msgstr ""
 "   eof CAR       CAR enviarà un final de fitxer (que acaba l’entrada).\n"
 "   eol CAR       CAR acabarà la línia.\n"
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -11154,7 +11319,7 @@ msgstr ""
 "   intr CAR      CAR enviarà un senyal d’interrupció.\n"
 "   kill CAR      CAR esborrarà la línia actual.\n"
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -11166,7 +11331,7 @@ msgstr ""
 " * rprnt CAR     CAR redibuixarà la línia actual.\n"
 "   start CAR     CAR reiniciarà l’eixida després d’haver�la aturat.\n"
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -11178,7 +11343,7 @@ msgstr ""
 " * swtch CAR     CAR canviarà a una capa d’intèrpret diferent.\n"
 " * werase CAR    CAR esborrarà la darrera paraula escrita.\n"
 
-#: src/stty.c:562
+#: src/stty.c:565
 msgid ""
 "\n"
 "Special settings:\n"
@@ -11192,7 +11357,7 @@ msgstr ""
 " * cols N        Anuncia al nucli que el terminal té N columnes.\n"
 " * columns N     Equival a «cols N».\n"
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -11206,7 +11371,7 @@ msgstr ""
 "                 lectura completa.\n"
 "   ospeed N      Estableix la velocitat d’eixida a N bauds.\n"
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -11221,8 +11386,7 @@ msgstr ""
 "dècimes\n"
 "                 de segon.\n"
 
-#: src/stty.c:581
-#, fuzzy
+#: src/stty.c:584
 msgid ""
 "\n"
 "Control settings:\n"
@@ -11237,9 +11401,11 @@ msgstr ""
 "   [-]clocal     Inhabilita els senyals de control del mòdem.\n"
 "   [-]cread      Permet rebre entrada.\n"
 " * [-]crtscts    Habilita l’establiment de connexió amb RTS/CTS.\n"
+" * [-]cdtrdsr    Habilita l’establiment de connexió amb DTR/DSR.\n"
 "   csN           Estableix la mida de caràcter a N bits [5..8].\n"
 
-#: src/stty.c:590
+# Stick parity: http://sebhcmaillist.heathkit.garlanger.com/sebhc/2004-July/001015.html  ivb
+#: src/stty.c:593
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
 "   [-]hup        send a hangup signal when the last process closes the tty\n"
@@ -11247,6 +11413,7 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 "   [-]cstopb     Empra dos bits d’aturada per caràcter (només un amb «-»).\n"
 "   [-]hup        S’envia un senyal de penjat quan el darrer procés tanque "
@@ -11256,8 +11423,9 @@ msgstr ""
 "   [-]parenb     Genera un bit de paritat a l’eixida i n’espera un a\n"
 "                 l’entrada.\n"
 "   [-]parodd     Empra paritat senar (parella amb «-»).\n"
+" * [-]cmspar     Empra paritat fixa (marca o espai).\n"
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -11274,7 +11442,7 @@ msgstr ""
 "   [-]ignbrk     Descarta els caràcters d’interrupció.\n"
 "   [-]igncr      Descarta els retorns de carro.\n"
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -11290,13 +11458,13 @@ msgstr ""
 "   [-]inpck      Habilita la comprovació de paritat de l’entrada.\n"
 "   [-]istrip     Posa a zero el bit alt (8é) dels caràcters d’entrada.\n"
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr ""
 " * [-]iutf8      Assumeix que els caràcters d’entrada estan codificats fent\n"
 "                 servir UTF‑8.\n"
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -11315,7 +11483,7 @@ msgstr ""
 "                 255�0�caràcter).\n"
 "   [-]tandem     Equival a «[-]ixoff»\n"
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -11331,10 +11499,11 @@ msgstr ""
 " * ffN           Estil del retard del salt de pàgina, N en [0..1].\n"
 " * nlN           Estil del retard de la nova línia, N en [0..1].\n"
 
-#: src/stty.c:631
+#: src/stty.c:635
+#, fuzzy
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
@@ -11348,7 +11517,7 @@ msgstr ""
 " * [-]onlcr      Tradueix les noves línies a retorn de carro i nova línia.\n"
 " * [-]onlret     Fa que la nova línia provoque un retorn de carro.\n"
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -11364,7 +11533,7 @@ msgstr ""
 " * -tabs         Equival a «tab3».\n"
 " * vtN           Estil del retard de la tabulació vertical, N en [0..1].\n"
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -11379,7 +11548,7 @@ msgstr ""
 " * crtkill       Esborra totes les línies d’acord amb «echoprt» i «echoe».\n"
 " * -crtkill      Esborra totes les línies d’acord amb «echoctl» i «echok».\n"
 
-#: src/stty.c:654
+#: src/stty.c:658
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
 "   [-]echo       echo input characters\n"
@@ -11395,7 +11564,7 @@ msgstr ""
 "   [-]echok      Mostra una nova línia després del caràcter d’esborrar "
 "línia.\n"
 
-#: src/stty.c:661
+#: src/stty.c:665
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
 "   [-]echonl     echo newline even if not echoing other characters\n"
@@ -11413,7 +11582,7 @@ msgstr ""
 "                 esborrar paraula i redibuixar.\n"
 "   [-]iexten     Habilita els caràcters especials no�POSIX.\n"
 
-#: src/stty.c:668
+#: src/stty.c:672
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
 "   [-]noflsh     disable flushing after interrupt and quit special "
@@ -11431,7 +11600,7 @@ msgstr ""
 "terminal.\n"
 " * [-]xcase      Amb «icanon», escapa amb «\\\\» les majúscules.\n"
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -11445,7 +11614,7 @@ msgstr ""
 "   cbreak        Equival a «-icanon».\n"
 "   -cbreak       Equival a «icanon».\n"
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -11458,7 +11627,7 @@ msgstr ""
 "   -cooked       Equival a «raw».\n"
 "   crt           Equival a «echoe echoctl echoke».\n"
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -11473,7 +11642,7 @@ msgstr ""
 "                 «erase».\n"
 "   evenp         Equival a «parenb -parodd cs7».\n"
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -11489,7 +11658,7 @@ msgstr ""
 "   nl            Equival a «-icrnl -onlcr».\n"
 "   -nl           Equival a «icrnl -inlcr -igncr onlcr -ocrnl -onlret».\n"
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -11503,7 +11672,7 @@ msgstr ""
 "   pass8         Equival a «-parenb -istrip cs8».\n"
 "   -pass8        Equival a «parenb istrip cs7».\n"
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -11515,7 +11684,7 @@ msgstr ""
 "                 -opost -isig -icanon -xcase min 1 time 0»\n"
 "   -raw          Equival a «cooked».\n"
 
-#: src/stty.c:716
+#: src/stty.c:720
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
 "                 -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n"
@@ -11533,7 +11702,7 @@ msgstr ""
 "especials\n"
 "                 a llurs valors per defecte.\n"
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -11548,12 +11717,12 @@ msgstr ""
 "codificat com «^c», «0x37», «0177» o «127»; els valors especials «^-» i\n"
 "«undef» s’empren per a inhabilitar caràcters especials.\n"
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, c-format
 msgid "only one device may be specified"
 msgstr "només es pot especificar un dispositiu"
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
@@ -11562,48 +11731,48 @@ msgstr ""
 "les opcions per a mostrar les propietats de forma llegible per humans i per "
 "«stty» són mútuament excloents"
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr "no es poden establir modes en especificar un estil d’eixida"
 
 # Realment el desactiva, no reinicia.  ivb
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr "%s: no s’ha pogut desactivar el mode no blocador"
 
 # Ambdues usen quote().  ivb
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, c-format
 msgid "invalid argument %s"
 msgstr "l’argument %s no és vàlid"
 
 # Totes sis usen quote().  ivb
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, c-format
 msgid "missing argument to %s"
 msgstr "manca un argument per a %s"
 
 # Usa quote().  ivb
-#: src/stty.c:983
+#: src/stty.c:987
 #, c-format
 msgid "invalid line discipline %s"
 msgstr "la disciplina de línia %s no és vàlida"
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr "%s: no s’han pogut realitzar totes les operacions requerides"
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr "%s: aquest dispositiu no té informació de mida"
 
 # Usa quote().  ivb
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, c-format
 msgid "invalid integer argument %s"
 msgstr "l’argument enter %s no és vàlid"
@@ -11663,21 +11832,22 @@ msgid "      --version  output version information and exit\n"
 msgstr "      --version        Mostra informació sobre la versió i surt.\n"
 
 # Agafat més o menys de libc.  ivb
-#: src/system.h:544
-#, fuzzy
+#: src/system.h:543
 msgid ""
 "\n"
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
+"\n"
 "Els arguments obligatoris per a les opcions llargues també ho són per a les\n"
 "opcions curtes corresponents.\n"
 
-#: src/system.h:552
+#: src/system.h:551
+#, fuzzy
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 "\n"
 "MIDA és un enter amb una unitat opcional (per exemple: 10M és "
@@ -11687,7 +11857,7 @@ msgstr ""
 "PB, EB, ZB, YB (potències de 1000).\n"
 
 # El paràmetre és un nom de programa, no serà molt llarg.  ivb
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -11703,39 +11873,39 @@ msgstr ""
 "disponible s’empraran unitats de 1024 octets (o 512 si la variable\n"
 "POSIXLY_CORRECT està establerta).\n"
 
-# Cap de les dues usa quote().  ivb
-# La primera és el nom del programa i la segona una adreça de correu.  ivb
-#: src/system.h:571
+# Cap de les dues usa quote.  ivb
+# La primera és el nom del programa i la segona una adreça web.  ivb
+#: src/system.h:570
 #, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
+"%s online help: <%s>\n"
 msgstr ""
 "\n"
-"Informeu dels errors de «%s» a %s.\n"
+"Ajuda en línia de «%s»: %s\n"
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr "Informeu dels errors de traducció de «%s» a <ca@dodds.net>.\n"
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr ""
 "Per a la documentació completa, executeu «info coreutils '%s invocation'».\n"
 
-#: src/system.h:596
+#: src/system.h:591
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Proveu «%s --help» per a obtenir més informació.\n"
 
 # Usa quote().  ivb
-#: src/system.h:628
+#: src/system.h:633
 #, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -11756,14 +11926,12 @@ msgid "Jay Lepreau"
 msgstr "Jay Lepreau"
 
 #: src/tac.c:137
-#, fuzzy
 msgid ""
 "Write each FILE to standard output, last line first.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
 "Escriu cada FITXER a la sortida estàndard, invertint l’ordre de les línies.\n"
 "Sense cap FITXER, o quan FITXER és «-», llegeix l’entrada estàndard.\n"
-"\n"
 
 #: src/tac.c:144
 msgid ""
@@ -11828,7 +11996,7 @@ msgid "Ian Lance Taylor"
 msgstr "Ian Lance Taylor"
 
 #: src/tail.c:262
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Print the last %d lines of each FILE to standard output.\n"
 "With more than one FILE, precede each with a header giving the file name.\n"
@@ -11839,16 +12007,13 @@ msgstr ""
 "d’un FITXER, les precedeix amb una capçalera amb el nom del fitxer.  Sense "
 "cap\n"
 "FITXER, o quan FITXER és «-», llegeix l’entrada estàndard.\n"
-"\n"
 
 #: src/tail.c:270
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
-"  -c, --bytes=N        Escriu els darrers N octets; també podeu emprar «-c "
+"  -c, --bytes=N        Escriu els darrers N octets.  També podeu emprar «-c "
 "+N»\n"
 "                       per a mostrar els octets a partir de l’octet N�èsim "
 "de\n"
@@ -11858,28 +12023,26 @@ msgstr ""
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 "  -f, --folow[={name|descriptor}]\n"
-"                       Escriu les dades a mesura que el fitxer creix; «-f»,\n"
-"                       «--follow», i «--follow=descriptor» són equivalents.\n"
+"                       Escriu les dades a mesura que el fitxer creix.\n"
+"                       L’argument per defecte és «descriptor».\n"
 "  -F                   Equival a «--follow=name --retry».\n"
 
 # «-n» cap pq per defecte és 10.  ivb
-#: src/tail.c:281
+#: src/tail.c:280
 #, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
 "  -n, --lines=N        Escriu les darreres N línies, i no les darreres %d;\n"
 "                       també podeu emprar «-n +N» per a mostrar les línies "
@@ -11896,30 +12059,25 @@ msgstr ""
 "Amb\n"
 "                       «inotify» aquesta opció no sol ser útil.\n"
 
-#: src/tail.c:294
+#: src/tail.c:293
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 "      --pid=PID        Amb «-f», finalitza després que el procés "
 "identificat\n"
 "                       per aquest PID mori.\n"
 "  -q, --quiet, --silent    Omet les capçaleres amb els noms dels fitxers.\n"
-"      --retry          Continua intentant obrir un fitxer fins i tot si és "
-"o\n"
-"                       esdevé inaccessible; només és útil en seguir la "
-"pista\n"
-"                       d’un nom, és a dir, amb «--follow=NOM».\n"
+"      --retry          Continua intentant obrir un fitxer si és "
+"inaccessible.\n"
 
-#: src/tail.c:301
+#: src/tail.c:298
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 "  -s, --sleep-interval=N\n"
@@ -11929,7 +12087,7 @@ msgstr ""
 "                       segons.\n"
 "  -v, --verbose        Sempre escriu els noms dels fitxers.\n"
 
-#: src/tail.c:310
+#: src/tail.c:307
 msgid ""
 "\n"
 "If the first character of K (the number of bytes or lines) is a '+',\n"
@@ -11948,7 +12106,7 @@ msgstr ""
 "Y.\n"
 "\n"
 
-#: src/tail.c:319
+#: src/tail.c:316
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
 "means that even if a tail'ed file is renamed, tail will continue to track\n"
@@ -11969,29 +12127,24 @@ msgstr ""
 
 # No usa quote().  ivb
 # Missatge d'error.  ivb
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr "en tancar «%s» (fd=%d)"
 
-#: src/tail.c:453
-#, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr "%s: no s’ha pogut moure dins el desplaçament relatiu %s"
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr "%s: no s’ha pogut moure fins al desplaçament relatiu al final %s"
 
 # Usa quote().  ivb
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr "no s’ha pogut determinar la ubicació de %s, es recorrerà a l’enquesta"
 
 # Usa quote.  ivb
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
@@ -12002,7 +12155,16 @@ msgstr ""
 
 # Usa quote().  ivb
 # FIXME: pretty_name() lacks i18n.  ivb
-#: src/tail.c:963
+#: src/tail.c:965
+#, c-format
+msgid "%s has been replaced with a symbolic link. giving up on this name"
+msgstr ""
+"%s ha estat substituït per un enllaç simbòlic; s’abandona la pista d’aquest "
+"nom"
+
+# Usa quote().  ivb
+# FIXME: pretty_name() lacks i18n.  ivb
+#: src/tail.c:980
 #, c-format
 msgid "%s has become inaccessible"
 msgstr "%s ha esdevingut inaccessible"
@@ -12010,7 +12172,7 @@ msgstr "%s ha esdevingut inaccessible"
 # tailable = cuable? ;)
 # Usa quote().  ivb
 # FIXME: pretty_name() lacks i18n.  ivb
-#: src/tail.c:980
+#: src/tail.c:997
 #, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr ""
@@ -12019,7 +12181,7 @@ msgstr ""
 
 # Usa quote().  ivb
 # FIXME: pretty_name() lacks i18n.  ivb
-#: src/tail.c:989
+#: src/tail.c:1006
 #, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr ""
@@ -12027,71 +12189,71 @@ msgstr ""
 
 # Usa quote().  ivb
 # FIXME: pretty_name() lacks i18n.  ivb
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, c-format
 msgid "%s has become accessible"
 msgstr "%s ha esdevingut accessible"
 
 # Usa quote().  ivb
 # FIXME: pretty_name() lacks i18n.  ivb
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr "%s ha aparegut; es segueix el final del nou fitxer"
 
 # Usa quote().  ivb
 # FIXME: pretty_name() lacks i18n.  ivb
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr "%s ha estat substituït; es segueix el final del nou fitxer"
 
 # Realment el desactiva, no reinicia.  ivb
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr "%s: no s’ha pogut desactivar el mode no blocador"
 
 # FIXME: pretty_name() lacks i18n.  ivb
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr "%s: el fitxer ha estat truncat"
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr "no resta cap fitxer"
 
 # Usa quote().  ivb
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, c-format
 msgid "cannot watch parent directory of %s"
 msgstr "no es pot fer un seguiment del directori pare de %s"
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, c-format
 msgid "inotify resources exhausted"
 msgstr "s’han esgotat els recursos d’«inotify»"
 
 # Usa quote().  ivb
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, c-format
 msgid "cannot watch %s"
 msgstr "no es pot fer un seguiment de %s"
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr "error en fer un seguiment de l’event d’«inotify»"
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, c-format
 msgid "error reading inotify event"
 msgstr "error en llegir l’event d’«inotify»"
 
 # FIXME: pretty_name() lacks i18n.  ivb
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr ""
@@ -12100,60 +12262,66 @@ msgstr ""
 
 # És un enter correcte però massa gran.  ivb
 # Usa quote().  ivb
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, c-format
 msgid "number in %s is too large"
 msgstr "el número %s és massa gran"
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr ""
 "%s: el nombre màxim d’iteracions sense alteracions entre obertures no és "
 "vàlid"
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr "%s: el PID no és vàlid"
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr "%s: el nombre de segons no és vàlid"
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr "l’opció «%c» no és vàlida en aquest context"
 
-#: src/tail.c:2034
+#: src/tail.c:2096
 #, c-format
-msgid "warning: --retry is useful mainly when following by name"
-msgstr "avís: «--retry» sol ser útil només quan es segueix la pista d’un nom"
+msgid "warning: --retry ignored; --retry is useful only when following"
+msgstr "avís: es descarta «--retry»; «--retry» només és útil en fer seguiments"
 
-#: src/tail.c:2038
+# Per a «--follow=descriptor» quan manca algun fitxer.  ivb
+#: src/tail.c:2100
+#, c-format
+msgid "warning: --retry only effective for the initial open"
+msgstr "avís: «--retry» només té efecte per a obrir per primera volta"
+
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
 msgstr "avís: es descarta el PID; «--pid=PID» només és útil en fer seguiments"
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr "avís: aquest sistema no permet l’opció «--pid=PID»"
 
 # Usa quote().  ivb
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, c-format
 msgid "cannot follow %s by name"
 msgstr "no es pot seguir %s pel nom"
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr "avís: seguir indefinidament l’entrada estàndard no és efectiu"
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr "no es pot emprar «inotify», es recorrerà a l’enquesta"
@@ -12246,7 +12414,7 @@ msgid ""
 "Exit with the status determined by EXPRESSION.\n"
 "\n"
 msgstr ""
-"Ix amb un estat determinat per l’EXPRESSIÓ.\n"
+"Ix amb un codi determinat per l’EXPRESSIÓ.\n"
 "\n"
 
 #: src/test.c:717
@@ -12258,7 +12426,7 @@ msgstr ""
 "\n"
 "Una EXPRESSIÓ omesa és per defecte falsa.  Altrament, l’EXPRESSIÓ és certa "
 "o\n"
-"falsa i estableix l’estat d’eixida.  És una de:\n"
+"falsa i estableix el codi d’eixida.  És una de:\n"
 
 # El més llarg és «EXPRESSIÓ1 -a EXPRESSIÓ2».  ivb
 #: src/test.c:722
@@ -12448,23 +12616,23 @@ msgstr "sobra l’argument %s"
 
 # Indica una fallada de la crida.  ivb
 #: src/timeout.c:112
-#, fuzzy, c-format
+#, c-format
 msgid "warning: sigprocmask"
-msgstr "avís: ha fallat timer_create()"
+msgstr "avís: ha fallat sigprocmask()"
 
 # Indica una fallada de la crida.  ivb
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr "avís: ha fallat timer_settime()"
 
 # Indica una fallada de la crida.  ivb
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr "avís: ha fallat timer_create()"
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
@@ -12474,36 +12642,33 @@ msgstr ""
 "      o bé: %s [OPCIÓ]\n"
 
 # Agafat més o menys de libc.  ivb
-#: src/timeout.c:229
-#, fuzzy
+#: src/timeout.c:232
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
 msgstr ""
 "Llança l’ORDRE i si encara està en marxa passat el temps indicat per la "
 "DURADA,\n"
 "la mata.\n"
-"\n"
-"Els arguments obligatoris per a les opcions llargues també ho són per a les\n"
-"opcions curtes corresponents.\n"
 
-#: src/timeout.c:235
-#, fuzzy
+#: src/timeout.c:238
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
+"      --preserve-status    Ix amb el mateix codi d’eixida que l’ORDRE, fins "
+"i\n"
+"                       tot si aquesta expira.\n"
 "      --foreground     Quan no s’executa «timeout» directament des de\n"
 "                       l’indicador de l’intèrpret d’ordres, permet a "
 "l’ORDRE\n"
@@ -12518,7 +12683,7 @@ msgstr ""
 "                       SENYAL pot ser un nom com «HUP» o un número.  Podeu\n"
 "                       obtenir una llista de senyals amb «kill -l».\n"
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 msgid ""
 "\n"
 "DURATION is a floating point number with an optional suffix:\n"
@@ -12530,8 +12695,7 @@ msgstr ""
 "a\n"
 "segons (per defecte), «m» per a minuts, «h» per a hores i «d» per a dies.\n"
 
-#: src/timeout.c:259
-#, fuzzy
+#: src/timeout.c:262
 msgid ""
 "\n"
 "If the command times out, and --preserve-status is not set, then exit with\n"
@@ -12542,29 +12706,28 @@ msgid ""
 "case the exit status is 128+9 rather than 124.\n"
 msgstr ""
 "\n"
-"Si l’ORDRE expira l’estat d’eixida serà 124, altrament serà aquell que "
-"retorne\n"
-"l’ORDRE.  Si no s’indica cap senyal s’enviarà un senyal «TERM» en expirar "
-"el\n"
-"temps, que matarà els processos que no bloquen o intercepten el senyal.  Per "
-"a\n"
-"uns altres processos és possible que calga emprar el senyal «KILL» (9), que "
+"Si l’ORDRE expira i no s’ha establert «--preserve-status», el codi d’eixida\n"
+"serà 124, altrament serà aquell que retorne l’ORDRE.  Si no s’indica cap "
+"senyal\n"
+"s’enviarà un senyal «TERM» en expirar el temps, que matarà els processos que "
 "no\n"
-"pot ser interceptat.  Si s’envia el senyal «KILL» (9), l’estat d’eixida "
-"serà\n"
-"128+9 en lloc de 124.\n"
+"bloquen o intercepten el senyal.  Per a uns altres processos és possible "
+"que\n"
+"calga emprar el senyal «KILL» (9), que no pot ser interceptat.  Si s’envia "
+"el\n"
+"senyal «KILL» (9), el codi d’eixida serà 128+9 en lloc de 124.\n"
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr "avís: no s’han pogut inhabilitar els bolcats de memòria"
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, c-format
 msgid "error waiting for command"
 msgstr "error en esperar l’ordre"
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr "l’ordre llançada ha bolcat la seua memòria"
@@ -12599,7 +12762,6 @@ msgid "setting times of %s"
 msgstr "en establir les dates de %s"
 
 #: src/touch.c:213
-#, fuzzy
 msgid ""
 "Update the access and modification times of each FILE to the current time.\n"
 "\n"
@@ -12616,7 +12778,6 @@ msgstr ""
 "Si el FITXER és «-», «touch» el tracta de forma especial, canviant les "
 "dates\n"
 "del fitxer associat amb l’entrada estàndard.\n"
-"\n"
 
 #: src/touch.c:225
 msgid ""
@@ -12914,7 +13075,7 @@ msgstr ""
 #: src/tr.c:1520
 #, c-format
 msgid "when not truncating set1, string2 must be non-empty"
-msgstr "si no es trunca el primer joc, la segona cadena no pot ser nuŀla"
+msgstr "si no es trunca el primer joc, la segona cadena no pot ser nul·la"
 
 #: src/tr.c:1529
 #, c-format
@@ -12961,11 +13122,11 @@ msgstr ""
 
 #: src/true.c:45
 msgid "Exit with a status code indicating success."
-msgstr "Ix amb un codi d’estat que indica èxit."
+msgstr "Ix amb un codi que indica èxit."
 
 #: src/true.c:46
 msgid "Exit with a status code indicating failure."
-msgstr "Ix amb un codi d’estat que indica fallada."
+msgstr "Ix amb un codi que indica fallada."
 
 #: src/truncate.c:96
 #, c-format
@@ -12973,7 +13134,6 @@ msgid "Usage: %s OPTION... FILE...\n"
 msgstr "Forma d’ús: %s OPCIÓ… FITXER…\n"
 
 #: src/truncate.c:97
-#, fuzzy
 msgid ""
 "Shrink or extend the size of each FILE to the specified size\n"
 "\n"
@@ -13006,12 +13166,12 @@ msgstr ""
 #: src/truncate.c:115
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 "  -r, --reference=FITXER\n"
 "                       Pren la mida del FITXER indicat.\n"
-"  -s, --size=MIDA      Estableix o ajusta la mida dels fitxers segons la "
-"MIDA.\n"
+"  -s, --size=MIDA      Estableix o ajusta la mida dels fitxers a MIDA "
+"octets.\n"
 
 #: src/truncate.c:121
 msgid ""
@@ -13114,12 +13274,12 @@ msgstr ""
 "estàndard.\n"
 "\n"
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr "%s: l’entrada conté un nombre senar de components"
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr "%s: l’entrada conté un cicle:"
@@ -13132,7 +13292,7 @@ msgid ""
 msgstr ""
 "Mostra el nom de fitxer del terminal connectat a l’entrada estàndard.\n"
 "\n"
-"  -s, --silent, --quiet    No mostra res, només retorna un estat d’eixida.\n"
+"  -s, --silent, --quiet    No mostra res, només retorna un codi d’eixida.\n"
 
 #: src/tty.c:120
 msgid "not a tty"
@@ -13192,7 +13352,6 @@ msgid "cannot get system name"
 msgstr "no s’ha pogut obtenir el nom del sistema"
 
 #: src/unexpand.c:117
-#, fuzzy
 msgid ""
 "Convert blanks in each FILE to tabs, writing to standard output.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -13200,7 +13359,6 @@ msgstr ""
 "Converteix els espais en blanc a tabulacions per cada FITXER, i escriu a la\n"
 "sortida estàndard.  Sense FITXER, o quan FITXER és «-», llegeix l’entrada\n"
 "estàndard.\n"
-"\n"
 
 # mirar la traducció del expand
 #: src/unexpand.c:124
@@ -13234,13 +13392,12 @@ msgstr "els tabuladors es troben massa separats"
 msgid "tab stop value is too large"
 msgstr "la distància de tabulació és massa gran"
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr "Forma d’ús: %s [OPCIÓ]… [ENTRADA [EIXIDA]]\n"
 
-#: src/uniq.c:138
-#, fuzzy
+#: src/uniq.c:174
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
 "writing to OUTPUT (or standard output).\n"
@@ -13252,34 +13409,53 @@ msgstr ""
 "seguides, i escriu el resultat a l’EIXIDA (o a l’eixida estàndard).\n"
 "\n"
 "Sense opcions, les línies repetides es redueixen a la primera ocurrència.\n"
-"\n"
 
-#: src/uniq.c:147
+#: src/uniq.c:183
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
 msgstr ""
 "  -c, --count          Prefixa cada línia amb el nombre d’ocurrències.\n"
-"  -d, --repeated       Només escriu les línies duplicades.\n"
+"  -d, --repeated       Només escriu les línies duplicades, una per cada "
+"grup.\n"
 
-#: src/uniq.c:151
+#: src/uniq.c:187
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
-"  -i, --ignore-case     ignore differences in case when comparing\n"
-"  -s, --skip-chars=N    avoid comparing the first N characters\n"
-"  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
 msgstr ""
-"  -D, --all-repeated[=MÈTODE_DELIMITACIÓ]\n"
+"  -D, --all-repeated[=MÈTODE]\n"
 "                       Escriu totes les línies duplicades, delimitant els\n"
 "                       grups segons el MÈTODE: «none» (per defecte) no els\n"
 "                       separa; «prepend» els prefixa i «separate» els "
 "separa\n"
 "                       amb una línia buida.\n"
-"  -f, --skip-fields=N    Evita la comparació dels primers N camps.\n"
+
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr "  -f, --skip-fields=N    Evita la comparació dels primers N camps.\n"
+
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
+msgstr ""
+"      --group[=MÈTODE]    Escriu totes les línies, delimitant els grups "
+"segons\n"
+"                       el MÈTODE: «separate» (per defecte) els separa\n"
+"                       amb una línia buida; «prepend» la posa al davant de "
+"cada\n"
+"                       grup, «append» al darrere i «both» fa ambdues coses.\n"
+
+#: src/uniq.c:199
+#, fuzzy
+msgid ""
+"  -i, --ignore-case     ignore differences in case when comparing\n"
+"  -s, --skip-chars=N    avoid comparing the first N characters\n"
+"  -u, --unique          only print unique lines\n"
+msgstr ""
 "  -i, --ignore-case    No té en compte les diferències entre majúscules i\n"
 "                       minúscules.\n"
 "  -s, --skip-chars=N    Evita la comparació dels primers N caràcters.\n"
@@ -13288,12 +13464,12 @@ msgstr ""
 "nova\n"
 "                       línia.\n"
 
-#: src/uniq.c:161
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr "  -w, --check-chars=N    No compara més d’N caràcters per línia.\n"
 
 # Hau!  ivb
-#: src/uniq.c:166
+#: src/uniq.c:212
 msgid ""
 "\n"
 "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n"
@@ -13305,7 +13481,7 @@ msgstr ""
 "tabulació) seguits de caràcters no en blanc.  En emprar «--skip-fields» o\n"
 "«--skip-chars», primer es salten els camps i després els caràcters.\n"
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 msgid ""
 "\n"
 "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n"
@@ -13317,24 +13493,34 @@ msgstr ""
 "Potser desitgeu ordenar primer l’entrada, o emprar «sort -u» sense «uniq».\n"
 "Les comparacions segueixen les regles especificades per LC_COLLATE.\n"
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, c-format
 msgid "too many repeated lines"
 msgstr "hi ha massa línies repetides"
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
 msgstr "el nombre de camps a saltar no és vàlid"
 
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
 msgstr "el nombre d’octets a saltar no és vàlid"
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
 msgstr "el nombre d’octets a comparar no és vàlid"
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr "les opcions «--group» i «-c/-d/-D/-u» són mútuament excloents"
+
+#: src/uniq.c:652
+#, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr "agrupar i escriure el nombre de repeticions és absurd"
+
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr ""
@@ -13357,12 +13543,6 @@ msgstr ""
 "Crida la funció unlink() per a eliminar el FITXER especificat.\n"
 "\n"
 
-# Usa quote().  ivb
-#: src/unlink.c:86
-#, c-format
-msgid "cannot unlink %s"
-msgstr "no s’ha pogut deslligar %s"
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -13394,9 +13574,9 @@ msgstr[0] "en marxa %ld dia %2d:%02d,  "
 msgstr[1] "en marxa %ld dies %2d:%02d,  "
 
 #: src/uptime.c:149
-#, fuzzy, c-format
+#, c-format
 msgid "up  %2d:%02d,  "
-msgstr "en marxa %ld dia %2d:%02d,  "
+msgstr "en marxa  %2d:%02d,  "
 
 #: src/uptime.c:151
 #, c-format
@@ -13413,7 +13593,7 @@ msgstr ",  càrrega mitjana: %.2f"
 # Dubte sobre lo de uptime. jm
 # Ein?  ivb
 # No usa quote() en cap dels 2 args.  ivb
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -13426,7 +13606,7 @@ msgstr ""
 "darrers 1, 5 i 15 minuts."
 
 # Aquesta va a continuació de l’anterior.  ivb
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
@@ -13435,13 +13615,13 @@ msgstr ""
 "  Els processos en estat de parada ininterrompible\n"
 "també contribueixen a la càrrega mitjana.\n"
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr "\n"
 
 # No usa quote() en cap dels dos args.  ivb
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
@@ -13716,137 +13896,122 @@ msgstr ""
 "Mostra repetidament una línia amb totes les cadenes indicades, o «y».\n"
 "\n"
 
-# És un missatge informatiu.  ivb
-#~ msgid "using single-precision arithmetic"
-#~ msgstr "s’està emprant l’aritmètica de precisió simple"
+# Condició d’error.  ivb
+#~ msgid "cannot create pipe"
+#~ msgstr "no s’ha pogut crear la canonada"
 
-# És un missatge informatiu.  ivb
-#~ msgid "using arbitrary-precision arithmetic"
-#~ msgstr "s’està emprant l’aritmètica de precisió arbitrària"
+# Cap empra quote().  ivb
+#~ msgid "%s subprocess failed"
+#~ msgstr "el subprocés «%s» ha fallat"
 
-# Usa quote().  ivb
-# Missatge informatiu.  ivb
-#, fuzzy
-#~ msgid "  returning value: '%s'\n"
-#~ msgstr "s’està creant el fitxer %s\n"
+# És una funció.  ivb
+#~ msgid "_open_osfhandle failed"
+#~ msgstr "ha fallat _open_osfhandle()"
 
-#, fuzzy
-#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n"
-#~ msgstr "Forma d’ús: %s [OPCIÓ] NOM…\n"
+#~ msgid "cannot restore fd %d: dup2 failed"
+#~ msgstr ""
+#~ "no s’ha pogut restaurar el descriptor de fitxer %d: ha fallat dup2()"
 
-#, fuzzy
-#~ msgid "no valid suffix found\n"
-#~ msgstr "%s: la longitud del sufix no és vàlida"
+# Condició d’error.  ivb
+# No empra quote().  ivb
+#~ msgid "%s subprocess"
+#~ msgstr "subprocés «%s»"
 
-# Els 3 usen quote().  ivb
-#~ msgid "reading %s"
-#~ msgstr "s’està llegint %s"
+# Condició d’error.  ivb
+# No empra quote().  ivb
+#~ msgid "%s subprocess got fatal signal %d"
+#~ msgstr "el subprocés «%s» ha rebut el senyal fatal %d"
 
-# Els 4 usen quote().  ivb
-# En els 4 indica condició d'error.  ivb
-#~ msgid "writing %s"
-#~ msgstr "en escriure %s"
+#~ msgid "failed to set additional groups"
+#~ msgstr "no s’han pogut establir els grups suplementaris"
 
-# Els 2 usen quote().  ivb
-# En els 2 indica condició d'error.  ivb
-#~ msgid "closing %s"
-#~ msgstr "en tancar %s"
+# Usa quote().  ivb
+#~ msgid "mount point %s already traversed"
+#~ msgstr "el punt de muntatge %s ja ha estat recorregut"
 
-# Els 5 usen quote().  ivb
-# Indica condició d'error.  ivb
-#~ msgid "accessing %s"
-#~ msgstr "en accedir a %s"
+#~ msgid "%s: cannot lseek back to original position"
+#~ msgstr "%s: no s’ha pogut desplaçar fins a la posició original"
+
+#~ msgid "%s: failed to reset file pointer"
+#~ msgstr "%s: no s’ha pogut reiniciar el punter del fitxer"
 
 # Usa quote().  ivb
-# Condició d'error.  ivb
-#~ msgid "opening %s"
-#~ msgstr "en obrir %s"
+#~ msgid "cannot reposition file pointer for %s"
+#~ msgstr "no s’ha pogut recol·locar el punter del fitxer de %s"
 
 #~ msgid ""
-#~ "  -x, --one-file-system    skip directories on different file systems\n"
-#~ "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
-#~ "      --exclude=PATTERN    exclude files that match PATTERN\n"
-#~ "  -d, --max-depth=N     print the total for a directory (or file, with --"
-#~ "all)\n"
-#~ "                          only if it is N or fewer levels below the "
-#~ "command\n"
-#~ "                          line argument;  --max-depth=0 is the same as\n"
-#~ "                          --summarize\n"
+#~ "  -Z, --context[=CTX]  set the SELinux security context of each NAME to\n"
+#~ "                         default type, or CTX if specified\n"
 #~ msgstr ""
-#~ "  -x, --one-file-system    Exclou els directoris que es troben en altres\n"
-#~ "                       sistemes de fitxers diferents.\n"
-#~ "  -X, --exclude-from=FITXER\n"
-#~ "                       Exclou aquells fitxers que coincideixen amb algun "
-#~ "dels\n"
-#~ "                       patrons continguts al FITXER.\n"
-#~ "      --exclude=PATRÓ    Exclou aquells fitxers que coincideixen amb el "
-#~ "PATRÓ.\n"
-#~ "  -d, --max-depth=N    Només mostra el total d’un directori (o fitxer, "
-#~ "amb\n"
-#~ "                       «--all») si es troba N nivells o menys per sota "
-#~ "de\n"
-#~ "                       l’argument de la línia d’ordres; «--max-depth=0»\n"
-#~ "                       equival a «--summarize».\n"
+#~ "  -Z, --context[=CONTEXT]\n"
+#~ "                       Estableix el context de seguretat de SELinux de "
+#~ "cada\n"
+#~ "                       NOM al tipus per defecte, o al CONTEXT si "
+#~ "s’especifica.\n"
 
 #~ msgid ""
-#~ "  none, off       never make backups (even if --backup is given)\n"
-#~ "  numbered, t     make numbered backups\n"
-#~ "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
-#~ "  simple, never   always make simple backups\n"
-#~ "\n"
+#~ "  -Z, --context[=CTX]  set the SELinux security context of NAME to\n"
+#~ "                         default type, or to CTX if specified\n"
 #~ msgstr ""
-#~ "  none, off        Mai fa còpies de seguretat (ni especificant «--"
-#~ "backup»).\n"
-#~ "  numbered, t      Fa còpies de seguretat numerades.\n"
-#~ "  existing, nil    Fa còpies de seguretat numerades si ja n’existeixen, "
-#~ "les fa\n"
-#~ "                   simples en cas contrari.\n"
-#~ "  simple, never    Fa còpies de seguretat simples sempre.\n"
-#~ "\n"
+#~ "  -Z, --context[=CONTEXT]\n"
+#~ "                       Estableix el context de seguretat de SELinux del "
+#~ "NOM al\n"
+#~ "                       tipus per defecte, o al CONTEXT si s’especifica.\n"
 
-#~ msgid ""
-#~ "WARNING: --page-increment is deprecated; use --line-increment instead"
-#~ msgstr ""
-#~ "avís: l’opció «--page-increment» està desaprovada; empreu «--line-"
-#~ "increment» al seu lloc"
+#~ msgid "out of memory (requested %zu bytes)"
+#~ msgstr "no resta memòria (s’han demanat %zu octets)"
+
+#~ msgid "--padding cannot be combined with --format"
+#~ msgstr "no es poden combinar «--padding» i «--format»"
 
-#~ msgid "All arguments to long options are mandatory for short options.\n"
+#~ msgid ""
+#~ "Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
+#~ "  or:  %s LONG-OPTION\n"
 #~ msgstr ""
-#~ "Els arguments obligatoris per a les opcions llargues també ho són per a "
-#~ "les\n"
-#~ "opcions curtes corresponents.\n"
+#~ "Forma d’ús: %s [OPCIÓ_CURTA]… USUARI ORDRE [ARGUMENT]…\n"
+#~ "      o bé: %s OPCIÓ_LLARGA\n"
 
 #~ msgid ""
+#~ "Drop any supplemental groups, assume the user-ID and group-ID of the "
+#~ "specified\n"
+#~ "USER (numeric ID or user name), and run COMMAND with any specified "
+#~ "ARGUMENTs.\n"
+#~ "Exit with status 111 if unable to assume the required user and group ID.\n"
+#~ "Otherwise, exit with the exit status of COMMAND.\n"
+#~ "This program is useful only when run by root (user ID zero).\n"
 #~ "\n"
-#~ "RADIX is d for decimal, o for octal, x for hexadecimal or n for none.\n"
-#~ "BYTES is hexadecimal with 0x or 0X prefix, and may have a multiplier "
-#~ "suffix:\n"
-#~ "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
-#~ "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n"
-#~ "Adding a z suffix to any type displays printable characters at the end of "
-#~ "each\n"
-#~ "output line.\n"
 #~ msgstr ""
+#~ "Abandona els grups suplementaris, assumeix els identificadors d’usuari i "
+#~ "grup\n"
+#~ "de l’USUARI indicat (per número o per nom), i executa l’ORDRE amb els\n"
+#~ "ARGUMENTs especificats.  Ix amb codi 111 si no pot assumir els "
+#~ "identificadors\n"
+#~ "d’usuari o grup requerits.  En cas contrari ix amb el codi d’eixida de\n"
+#~ "l’ORDRE.  Aquest programa només és d’utilitat quan l’executa root (que "
+#~ "té\n"
+#~ "identificador d’usuari 0).\n"
 #~ "\n"
-#~ "BASE és «d» per a decimal, «o» per a octal, «x» per a hexadecimal, o bé "
-#~ "«n»\n"
-#~ "per a cap.  OCTETS és hexadecimal si té el prefix «0x» o «0X», i pot "
-#~ "portar un\n"
-#~ "sufix multiplicador: b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
-#~ "GB 1000*1000*1000, G 1024*1024*1024, i així per a T, P, E, Z, Y.  Afegint "
-#~ "el\n"
-#~ "sufix «z» a qualsevol dels tipus, mostra també els caràcters imprimibles "
-#~ "al\n"
-#~ "final de cada línia d’eixida.\n"
 
 #~ msgid ""
-#~ "Option --string without a number implies 3; option --width without a "
-#~ "number\n"
-#~ "implies 32.  By default, od uses -A o -t oS -w16.\n"
+#~ "  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, "
+#~ "and\n"
+#~ "                      (if specified) supplemental group IDs to GID1, ...\n"
 #~ msgstr ""
-#~ "L’opció «--string» sense número implica 3; l’opció «--width» sense "
-#~ "número\n"
-#~ "implica 32.  Per defecte, s’utilitzen les opcions «-A o -t oS -w16».\n"
+#~ "  -g GID,[GID1…]       Estableix també el grup primari al GID numèric i, "
+#~ "si\n"
+#~ "                       s’indiquen, els grups suplementaris a GID1…\n"
+
+# Usa quote().  ivb
+#~ msgid "unknown user-ID: %s"
+#~ msgstr "l’identificador d’usuari no és conegut: %s"
+
+# Usa quote().  ivb
+#~ msgid "to use user-ID %s you need to use -g too"
+#~ msgstr ""
+#~ "per a emprar l’identificador d’usuari %s també heu d’emprar l’opció «-g»"
+
+#~ msgid "cannot set group-ID to %lu"
+#~ msgstr "no s’ha pogut establir l’identificador de grup a %lu"
 
-#~ msgid "Usage: %s [OPTION]... FILE\n"
-#~ msgstr "Foma d’ús: %s [OPCIÓ]… FITXER\n"
+#~ msgid "cannot set user-ID to %lu"
+#~ msgstr "no s’ha pogut establir l’identificador d’usuari %lu"
diff --git a/po/coreutils.pot b/po/coreutils.pot
index 88944bb5..e64a18ed 100644
--- a/po/coreutils.pot
+++ b/po/coreutils.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU coreutils 8.21\n"
+"Project-Id-Version: GNU coreutils 8.23\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\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"
@@ -36,76 +36,119 @@ msgstr ""
 msgid "error closing file"
 msgstr ""
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr ""
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, c-format
 msgid "preserving permissions for %s"
 msgstr ""
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr ""
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr ""
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr ""
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr ""
 
-#: lib/file-type.c:44
+#: lib/file-type.c:46
+msgid "symbolic link"
+msgstr ""
+
+#: lib/file-type.c:52
+msgid "message queue"
+msgstr ""
+
+#: lib/file-type.c:55
+msgid "semaphore"
+msgstr ""
+
+#: lib/file-type.c:58
+msgid "shared memory object"
+msgstr ""
+
+#: lib/file-type.c:61
+msgid "typed memory object"
+msgstr ""
+
+#: lib/file-type.c:66
 msgid "block special file"
 msgstr ""
 
-#: lib/file-type.c:47
+#: lib/file-type.c:69
 msgid "character special file"
 msgstr ""
 
-#: lib/file-type.c:50
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr ""
+
+#: lib/file-type.c:75
 msgid "fifo"
 msgstr ""
 
-#: lib/file-type.c:53
-msgid "symbolic link"
+#: lib/file-type.c:78
+msgid "door"
 msgstr ""
 
-#: lib/file-type.c:56
-msgid "socket"
+#: lib/file-type.c:81
+msgid "multiplexed block special file"
 msgstr ""
 
-#: lib/file-type.c:59
-msgid "message queue"
+#: lib/file-type.c:84
+msgid "multiplexed character special file"
 msgstr ""
 
-#: lib/file-type.c:62
-msgid "semaphore"
+#: lib/file-type.c:87
+msgid "multiplexed file"
 msgstr ""
 
-#: lib/file-type.c:65
-msgid "shared memory object"
+#: lib/file-type.c:90
+msgid "named file"
 msgstr ""
 
-#: lib/file-type.c:68
-msgid "typed memory object"
+#: lib/file-type.c:93
+msgid "network special file"
+msgstr ""
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr ""
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr ""
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr ""
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr ""
+
+#: lib/file-type.c:108
+msgid "whiteout"
 msgstr ""
 
-#: lib/file-type.c:70
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr ""
 
@@ -240,18 +283,18 @@ msgstr ""
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr ""
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr ""
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr ""
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr ""
@@ -368,7 +411,7 @@ msgstr ""
 msgid "Unmatched ) or \\)"
 msgstr ""
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 msgid "No previous regular expression"
 msgstr ""
 
@@ -393,7 +436,7 @@ msgstr ""
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr ""
 
@@ -403,11 +446,11 @@ msgstr ""
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr ""
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, c-format
 msgid "setting permissions for %s"
 msgstr ""
@@ -548,18 +591,6 @@ msgstr ""
 msgid "Resource lost"
 msgstr ""
 
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, c-format
-msgid "cannot create pipe"
-msgstr ""
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, c-format
-msgid "%s subprocess failed"
-msgstr ""
-
 #: lib/strsignal.c:114
 #, c-format
 msgid "Real-time signal %d"
@@ -743,7 +774,7 @@ msgstr ""
 msgid "Report %s bugs to: %s\n"
 msgstr ""
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr ""
@@ -753,30 +784,10 @@ msgstr ""
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr ""
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr ""
 
-#: lib/w32spawn.h:43
-#, c-format
-msgid "_open_osfhandle failed"
-msgstr ""
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr ""
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr ""
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr ""
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr ""
@@ -798,7 +809,7 @@ msgstr ""
 msgid "failed to reopen %s with mode %s"
 msgstr ""
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr ""
@@ -855,7 +866,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -870,48 +881,47 @@ msgid ""
 "from any other non-alphabet bytes in the encoded stream.\n"
 msgstr ""
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr ""
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, c-format
 msgid "invalid input"
 msgstr ""
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, c-format
 msgid "invalid wrap size: %s"
 msgstr ""
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, c-format
 msgid "extra operand %s"
 msgstr ""
 
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, c-format
 msgid "closing standard input"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -936,8 +946,8 @@ msgstr ""
 #: src/basename.c:60
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/basename.c:67
@@ -951,32 +961,31 @@ msgid ""
 "  %s -a any/str1 any/str2   -> \"str1\" followed by \"str2\"\n"
 msgstr ""
 
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, c-format
 msgid "missing operand"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 msgid "Richard M. Stallman"
 msgstr ""
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1016,7 +1025,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr ""
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr ""
@@ -1033,14 +1042,14 @@ msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 msgid "Jim Meyering"
 msgstr ""
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, c-format
 msgid "failed to create security context: %s"
 msgstr ""
@@ -1050,8 +1059,8 @@ msgstr ""
 msgid "failed to set %s security context component to %s"
 msgstr ""
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, c-format
 msgid "failed to get security context of %s"
 msgstr ""
@@ -1061,18 +1070,18 @@ msgstr ""
 msgid "can't apply partial context to unlabeled file %s"
 msgstr ""
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, c-format
 msgid "failed to change context of %s to %s"
 msgstr ""
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
 msgstr ""
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, c-format
 msgid "cannot read directory %s"
 msgstr ""
@@ -1082,13 +1091,14 @@ msgstr ""
 msgid "changing security context of %s\n"
 msgstr ""
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, c-format
 msgid "fts_read failed"
 msgstr ""
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, c-format
 msgid "fts_close failed"
 msgstr ""
@@ -1103,7 +1113,7 @@ msgstr ""
 
 #: src/chcon.c:357
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
@@ -1124,7 +1134,7 @@ msgid ""
 "  -l, --range=RANGE      set range RANGE in the target security context\n"
 msgstr ""
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
 "      --preserve-root    fail to operate recursively on '/'\n"
@@ -1160,36 +1170,37 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr ""
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr ""
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, c-format
 msgid "missing operand after %s"
 msgstr ""
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, c-format
 msgid "invalid context: %s"
 msgstr ""
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr ""
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, c-format
 msgid "failed to get attributes of %s"
 msgstr ""
@@ -1213,7 +1224,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
@@ -1241,47 +1252,47 @@ msgid ""
 "  %s -hR staff /u  Change the group of /u and subfiles to \"staff\".\n"
 msgstr ""
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
 msgstr ""
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr ""
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr ""
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr ""
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr ""
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr ""
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, c-format
 msgid "changing permissions of %s"
 msgstr ""
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr ""
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1289,33 +1300,33 @@ msgid ""
 "  or:  %s [OPTION]... --reference=RFILE FILE...\n"
 msgstr ""
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 msgid ""
 "Change the mode of each FILE to MODE.\n"
 "With --reference, change the mode of each FILE to that of RFILE.\n"
 "\n"
 msgstr ""
 
-#: src/chmod.c:391
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr ""
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 msgid ""
 "\n"
 "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n"
 msgstr ""
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr ""
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, c-format
 msgid "invalid mode: %s"
 msgstr ""
@@ -1441,72 +1452,81 @@ msgid ""
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr ""
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr ""
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, c-format
 msgid "invalid group list %s"
 msgstr ""
 
-#: src/chroot.c:117
-#, c-format
-msgid "failed to set additional groups"
-msgstr ""
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
 "  or:  %s OPTION\n"
 msgstr ""
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
 msgstr ""
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
 msgstr ""
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 msgid ""
 "\n"
 "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n"
 msgstr ""
 
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, c-format
 msgid "cannot change root directory to %s"
 msgstr ""
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, c-format
 msgid "cannot chdir to root directory"
 msgstr ""
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr ""
+
+#: src/chroot.c:383
+#, c-format
+msgid "failed to get supplemental groups"
+msgstr ""
+
+#: src/chroot.c:395
+#, c-format
+msgid "failed to %s supplemental groups"
+msgstr ""
+
+#: src/chroot.c:402
 #, c-format
 msgid "failed to set group-ID"
 msgstr ""
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, c-format
 msgid "failed to set user-ID"
 msgstr ""
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, c-format
 msgid "failed to run command %s"
 msgstr ""
@@ -1534,7 +1554,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr ""
@@ -1601,294 +1621,327 @@ msgstr ""
 msgid "empty %s not allowed"
 msgstr ""
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr ""
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, c-format
 msgid "cannot lseek %s"
 msgstr ""
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr ""
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, c-format
 msgid "%s: failed to get extents info"
 msgstr ""
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, c-format
 msgid "%s: write failed"
 msgstr ""
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, c-format
 msgid "failed to extend %s"
 msgstr ""
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, c-format
 msgid "clearing permissions for %s"
 msgstr ""
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr ""
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
 msgstr ""
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, c-format
 msgid "failed to preserve authorship for %s"
 msgstr ""
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
 #, c-format
-msgid "cannot open %s for reading"
+msgid "failed to set default file creation context to %s"
 msgstr ""
 
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:820
 #, c-format
-msgid "cannot fstat %s"
+msgid "failed to set default file creation context for %s"
 msgstr ""
 
-#: src/copy.c:820
+#: src/copy.c:846
 #, c-format
-msgid "skipping file %s, as it was replaced while being copied"
+msgid "failed to set the security context of %s"
 msgstr ""
 
-#: src/copy.c:850
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
-msgid "failed to get file system create context"
+msgid "cannot open %s for reading"
+msgstr ""
+
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
+#, c-format
+msgid "cannot fstat %s"
 msgstr ""
 
-#: src/copy.c:864
+#: src/copy.c:935
 #, c-format
-msgid "failed to set the security context of %s to %s"
+msgid "skipping file %s, as it was replaced while being copied"
 msgstr ""
 
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
 msgid "cannot remove %s"
 msgstr ""
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
 msgstr ""
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr ""
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, c-format
 msgid "cannot create regular file %s"
 msgstr ""
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, c-format
 msgid "failed to clone %s from %s"
 msgstr ""
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr ""
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
 #, c-format
 msgid "failed to close %s"
 msgstr ""
 
-#: src/copy.c:1471
+#: src/copy.c:1580
+#, c-format
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
+msgstr ""
+
+#: src/copy.c:1581
 #, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
 msgstr ""
 
-#: src/copy.c:1478
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
 msgstr ""
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr ""
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr ""
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, c-format
 msgid "cannot create hard link %s to %s"
 msgstr ""
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, c-format
 msgid "cannot stat %s"
 msgstr ""
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, c-format
 msgid "omitting directory %s"
 msgstr ""
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr ""
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
 msgstr ""
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr ""
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr ""
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr ""
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr ""
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr ""
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr ""
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
 msgstr ""
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr ""
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr ""
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr ""
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr ""
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, c-format
 msgid "cannot move %s to %s"
 msgstr ""
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr ""
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, c-format
-msgid "failed to set default file creation context to %s"
-msgstr ""
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr ""
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr ""
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr ""
 
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, c-format
 msgid "cannot create fifo %s"
 msgstr ""
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, c-format
 msgid "cannot create special file %s"
 msgstr ""
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, c-format
 msgid "cannot read symbolic link %s"
 msgstr ""
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, c-format
 msgid "cannot create symbolic link %s"
 msgstr ""
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
 msgstr ""
 
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, c-format
 msgid "cannot un-backup %s"
 msgstr ""
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr ""
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr ""
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr ""
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, c-format
+msgid "unknown program %s"
+msgstr ""
+
+#: src/cp.c:157 src/mv.c:288
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -1896,11 +1949,11 @@ msgid ""
 "  or:  %s [OPTION]... -t DIRECTORY SOURCE...\n"
 msgstr ""
 
-#: src/cp.c:162
+#: src/cp.c:163
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 
-#: src/cp.c:168
+#: src/cp.c:169
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
 "      --attributes-only        don't copy the file data, just the "
@@ -1914,7 +1967,7 @@ msgid ""
 "  -d                           same as --no-dereference --preserve=links\n"
 msgstr ""
 
-#: src/cp.c:177
+#: src/cp.c:178
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
 "                                 opened, remove it and try again (this "
@@ -1927,20 +1980,20 @@ msgid ""
 "  -H                           follow command-line symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:186
+#: src/cp.c:187
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
 "  -L, --dereference            always follow symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:190
+#: src/cp.c:191
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
 "                                 a previous -i option)\n"
 "  -P, --no-dereference         never follow symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:195
+#: src/cp.c:196
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
 "      --preserve[=ATTR_LIST]   preserve the specified attributes (default:\n"
@@ -1950,13 +2003,13 @@ msgid ""
 "                                 all\n"
 msgstr ""
 
-#: src/cp.c:203
+#: src/cp.c:204
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                use full source file name under DIRECTORY\n"
 msgstr ""
 
-#: src/cp.c:207
+#: src/cp.c:208
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
 "      --reflink[=WHEN]         control clone/CoW copies. See below\n"
@@ -1965,7 +2018,7 @@ msgid ""
 "force)\n"
 msgstr ""
 
-#: src/cp.c:213
+#: src/cp.c:214
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
 "      --strip-trailing-slashes  remove any trailing slashes from each "
@@ -1973,7 +2026,7 @@ msgid ""
 "                                 argument\n"
 msgstr ""
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -1982,7 +2035,7 @@ msgid ""
 "  -T, --no-target-directory    treat DEST as a normal file\n"
 msgstr ""
 
-#: src/cp.c:224
+#: src/cp.c:225
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
 "                                 than the destination file or when the\n"
@@ -1991,7 +2044,15 @@ msgid ""
 "  -x, --one-file-system        stay on this file system\n"
 msgstr ""
 
-#: src/cp.c:233
+#: src/cp.c:232
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/cp.c:240
 msgid ""
 "\n"
 "By default, sparse SOURCE files are detected by a crude heuristic and the\n"
@@ -2007,7 +2068,7 @@ msgid ""
 "fails, or if --reflink=auto is specified, fall back to a standard copy.\n"
 msgstr ""
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 msgid ""
 "\n"
 "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n"
@@ -2017,7 +2078,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2025,7 +2086,7 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2033,226 +2094,236 @@ msgid ""
 "regular file.\n"
 msgstr ""
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, c-format
 msgid "failed to preserve times for %s"
 msgstr ""
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, c-format
 msgid "failed to preserve permissions for %s"
 msgstr ""
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, c-format
 msgid "cannot make directory %s"
 msgstr ""
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr ""
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
 #, c-format
 msgid "failed to access %s"
 msgstr ""
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, c-format
 msgid "missing file operand"
 msgstr ""
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, c-format
 msgid "missing destination file operand after %s"
 msgstr ""
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr ""
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, c-format
 msgid "target %s is not a directory"
 msgstr ""
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr ""
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, c-format
 msgid "multiple target directories specified"
 msgstr ""
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr ""
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr ""
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr ""
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr ""
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr ""
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, c-format
+msgid "cannot set target context and preserve it"
+msgstr ""
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr ""
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr ""
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr ""
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr ""
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, c-format
 msgid "%s: %s: line number out of range"
 msgstr ""
 
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, c-format
 msgid " on repetition %s\n"
 msgstr ""
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, c-format
 msgid "%s: %s: match not found"
 msgstr ""
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr ""
 
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, c-format
 msgid "write error for %s"
 msgstr ""
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, c-format
 msgid "%s: integer expected after delimiter"
 msgstr ""
 
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr ""
 
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr ""
 
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr ""
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr ""
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr ""
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr ""
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr ""
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr ""
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr ""
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr ""
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr ""
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr ""
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr ""
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr ""
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr ""
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr ""
 
-#: src/csplit.c:1455
+#: src/csplit.c:1483
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
 "and output byte counts of each piece to standard output.\n"
 msgstr ""
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2260,20 +2331,24 @@ msgid ""
 "  -k, --keep-files           do not remove output files on errors\n"
 msgstr ""
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr ""
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
 "  -z, --elide-empty-files    remove empty output files\n"
 msgstr ""
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
 msgstr ""
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 msgid ""
 "\n"
 "  INTEGER            copy up to but not including specified line number\n"
@@ -2290,27 +2365,23 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr ""
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr ""
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr ""
 
-#: src/cut.c:193
+#: src/cut.c:176
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr ""
 
-#: src/cut.c:199
+#: src/cut.c:182
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
 "  -c, --characters=LIST   select only these characters\n"
 "  -d, --delimiter=DELIM   use DELIM instead of TAB for field delimiter\n"
 msgstr ""
 
-#: src/cut.c:204
+#: src/cut.c:187
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
 "                            that contains no delimiter character, unless\n"
@@ -2318,20 +2389,20 @@ msgid ""
 "  -n                      (ignored)\n"
 msgstr ""
 
-#: src/cut.c:210
+#: src/cut.c:193
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
 "                            or fields\n"
 msgstr ""
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
 "                            the default is to use the input delimiter\n"
 msgstr ""
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2339,7 +2410,7 @@ msgid ""
 "in the same order that it is read, and is written exactly once.\n"
 msgstr ""
 
-#: src/cut.c:227
+#: src/cut.c:210
 msgid ""
 "Each range is one of:\n"
 "\n"
@@ -2351,56 +2422,60 @@ msgid ""
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
 
-#: src/cut.c:367 src/cut.c:493
+#: src/cut.c:300 src/cut.c:394
 msgid "invalid byte, character or field list"
 msgstr ""
 
-#: src/cut.c:387
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr ""
+
+#: src/cut.c:320
 msgid "invalid range with no endpoint: -"
 msgstr ""
 
-#: src/cut.c:403
+#: src/cut.c:334
 msgid "invalid decreasing range"
 msgstr ""
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, c-format
 msgid "byte offset %s is too large"
 msgstr ""
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, c-format
 msgid "field number %s is too large"
 msgstr ""
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr ""
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr ""
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr ""
 
-#: src/cut.c:850
+#: src/cut.c:790
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr ""
 
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
 msgstr ""
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr ""
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr ""
 
@@ -2440,7 +2515,7 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 
 #: src/date.c:158
@@ -2572,10 +2647,10 @@ msgid ""
 "  $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n"
 msgstr ""
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr ""
@@ -2613,7 +2688,7 @@ msgstr ""
 msgid "cannot set date"
 msgstr ""
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, c-format
 msgid "time %s is out of range"
 msgstr ""
@@ -2624,14 +2699,14 @@ msgstr ""
 msgid "Paul Rubin"
 msgstr ""
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
 "  or:  %s OPTION\n"
 msgstr ""
 
-#: src/dd.c:526
+#: src/dd.c:532
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
 "\n"
@@ -2642,7 +2717,7 @@ msgid ""
 "  ibs=BYTES       read up to BYTES bytes at a time (default: 512)\n"
 msgstr ""
 
-#: src/dd.c:535
+#: src/dd.c:541
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
 "  iflag=FLAGS     read as per the comma separated symbol list\n"
@@ -2655,7 +2730,7 @@ msgid ""
 "                  'noxfer' suppresses transfer stats, 'none' suppresses all\n"
 msgstr ""
 
-#: src/dd.c:546
+#: src/dd.c:552
 msgid ""
 "\n"
 "N and BYTES may be followed by the following multiplicative suffixes:\n"
@@ -2666,7 +2741,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dd.c:555
+#: src/dd.c:561
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
 "  ebcdic    from ASCII to EBCDIC\n"
@@ -2681,7 +2756,7 @@ msgid ""
 "            with block or unblock, pad with spaces rather than NULs\n"
 msgstr ""
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -2691,7 +2766,7 @@ msgid ""
 "  fsync     likewise, but also write metadata\n"
 msgstr ""
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -2700,75 +2775,75 @@ msgid ""
 "suggested)\n"
 msgstr ""
 
-#: src/dd.c:583
+#: src/dd.c:589
 msgid "  cio       use concurrent I/O for data\n"
 msgstr ""
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr ""
 
-#: src/dd.c:587
+#: src/dd.c:593
 msgid "  directory  fail unless a directory\n"
 msgstr ""
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr ""
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr ""
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr ""
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr ""
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr ""
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr ""
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr ""
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr ""
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr ""
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr ""
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr ""
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, c-format
 msgid ""
 "\n"
@@ -2785,28 +2860,38 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
 "%<PRIuMAX>+%<PRIuMAX> records out\n"
 msgstr ""
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr ""
 
@@ -2820,269 +2905,269 @@ msgstr ""
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
 msgstr ""
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, c-format
 msgid "closing input file %s"
 msgstr ""
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr ""
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr ""
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, c-format
 msgid "writing to %s"
 msgstr ""
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, c-format
 msgid "unrecognized operand %s"
 msgstr ""
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 msgid "invalid conversion"
 msgstr ""
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 msgid "invalid input flag"
 msgstr ""
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 msgid "invalid output flag"
 msgstr ""
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 msgid "invalid status flag"
 msgstr ""
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, c-format
 msgid "invalid number %s"
 msgstr ""
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr ""
 
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, c-format
 msgid "cannot combine block and unblock"
 msgstr ""
 
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, c-format
 msgid "cannot combine lcase and ucase"
 msgstr ""
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, c-format
 msgid "cannot combine excl and nocreat"
 msgstr ""
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, c-format
 msgid "cannot combine direct and nocache"
 msgstr ""
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
 "  of mt_type=0x%0lx -- see <sys/mtio.h> for the list of types"
 msgstr ""
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, c-format
 msgid "%s: cannot skip"
 msgstr ""
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, c-format
 msgid "%s: cannot seek"
 msgstr ""
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr ""
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr ""
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr ""
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, c-format
 msgid "setting flags for %s"
 msgstr ""
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr ""
 
-#: src/dd.c:2133
+#: src/dd.c:2172
 #, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
 msgstr ""
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr ""
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
 msgstr ""
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, c-format
 msgid "failed to open %s"
 msgstr ""
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
 "blocks"
 msgstr ""
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr ""
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, c-format
 msgid "failed to discard cache for: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr ""
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr ""
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr ""
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr ""
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr ""
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr ""
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr ""
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr ""
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr ""
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr ""
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr ""
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr ""
 
-#: src/df.c:383
+#: src/df.c:207
+msgid "File"
+msgstr ""
+
+#: src/df.c:387
 #, c-format
-msgid "option --output: field '%s' unknown"
+msgid "option --output: field %s unknown"
 msgstr ""
 
-#: src/df.c:390
+#: src/df.c:394
 #, c-format
-msgid "option --output: field '%s' used more than once"
+msgid "option --output: field %s used more than once"
 msgstr ""
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr ""
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr ""
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr ""
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
 msgstr ""
 
-#: src/df.c:1210
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr ""
+
+#: src/df.c:1384
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
 "or all file systems by default.\n"
 msgstr ""
 
-#: src/df.c:1217
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
 
-#: src/df.c:1227
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -3091,7 +3176,7 @@ msgid ""
 "(default)\n"
 msgstr ""
 
-#: src/df.c:1234
+#: src/df.c:1409
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
 "                               or print all fields if FIELD_LIST is "
@@ -3104,41 +3189,33 @@ msgid ""
 "  -v                    (ignored)\n"
 msgstr ""
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
 
-#: src/df.c:1285
+#: src/df.c:1460
 #, c-format
 msgid "options %s and %s are mutually exclusive"
 msgstr ""
 
-#: src/df.c:1335
-msgid "warning: "
-msgstr ""
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr ""
-
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr ""
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr ""
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 msgid "cannot read table of mounted file systems"
 msgstr ""
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr ""
@@ -3148,7 +3225,7 @@ msgstr ""
 msgid "H. Peter Anvin"
 msgstr ""
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr ""
@@ -3215,7 +3292,7 @@ msgid ""
 msgstr ""
 
 #: src/dirname.c:59
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/dirname.c:64
@@ -3228,21 +3305,20 @@ msgid ""
 "  %s stdio.h            -> \".\"\n"
 msgstr ""
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
 "  or:  %s [OPTION]... --files0-from=F\n"
 msgstr ""
 
-#: src/du.c:274
+#: src/du.c:285
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr ""
 
-#: src/du.c:280
+#: src/du.c:291
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3251,11 +3327,11 @@ msgid ""
 "                          fragmentation, indirect blocks, and the like\n"
 msgstr ""
 
-#: src/du.c:289
+#: src/du.c:300
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3267,17 +3343,18 @@ msgid ""
 "                          --summarize\n"
 msgstr ""
 
-#: src/du.c:302
+#: src/du.c:313
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
 
-#: src/du.c:310
+#: src/du.c:322
 msgid ""
 "  -k                    like --block-size=1K\n"
 "  -L, --dereference     dereference all symbolic links\n"
@@ -3285,16 +3362,17 @@ msgid ""
 "  -m                    like --block-size=1M\n"
 msgstr ""
 
-#: src/du.c:316
+#: src/du.c:328
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
 
-#: src/du.c:322
+#: src/du.c:334
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
 "                          or entries greater than SIZE if negative\n"
@@ -3303,77 +3381,77 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
 msgstr ""
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
 "  -x, --one-file-system    skip directories on different file systems\n"
 msgstr ""
 
-#: src/du.c:386
+#: src/du.c:398
 msgid "Infinity"
 msgstr ""
 
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr ""
-
-#: src/du.c:624
+#: src/du.c:636
 #, c-format
 msgid "fts_read failed: %s"
 msgstr ""
 
-#: src/du.c:780
+#: src/du.c:787
 #, c-format
 msgid "invalid maximum depth %s"
 msgstr ""
 
-#: src/du.c:809
+#: src/du.c:816
 #, c-format
 msgid "invalid --threshold argument '-0'"
 msgstr ""
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr ""
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr ""
 
-#: src/du.c:900
+#: src/du.c:911
 #, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr ""
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 msgid "file operands cannot be combined with --files0-from"
 msgstr ""
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr ""
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr ""
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 msgid "invalid zero-length file name"
 msgstr ""
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr ""
 
@@ -3457,7 +3535,7 @@ msgstr ""
 #: src/env.c:61
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
 
@@ -3525,23 +3603,23 @@ msgid "input line is too long"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr ""
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
 "  or:  %s OPTION\n"
 msgstr ""
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -3552,7 +3630,7 @@ msgid ""
 "  ARG1 & ARG2       ARG1 if neither argument is null or 0, otherwise 0\n"
 msgstr ""
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -3563,14 +3641,14 @@ msgid ""
 "  ARG1 > ARG2       ARG1 is greater than ARG2\n"
 msgstr ""
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
 "  ARG1 - ARG2       arithmetic difference of ARG1 and ARG2\n"
 msgstr ""
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -3579,7 +3657,7 @@ msgid ""
 "  ARG1 % ARG2       arithmetic remainder of ARG1 divided by ARG2\n"
 msgstr ""
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -3590,7 +3668,7 @@ msgid ""
 "  length STRING              length of STRING\n"
 msgstr ""
 
-#: src/expr.c:251
+#: src/expr.c:250
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
 "                               keyword like 'match' or an operator like '/'\n"
@@ -3598,7 +3676,7 @@ msgid ""
 "  ( EXPRESSION )             value of EXPRESSION\n"
 msgstr ""
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -3608,7 +3686,7 @@ msgid ""
 "0.\n"
 msgstr ""
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -3616,32 +3694,32 @@ msgid ""
 "or 0, 2 if EXPRESSION is syntactically invalid, and 3 if an error occurred.\n"
 msgstr ""
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, c-format
 msgid "syntax error"
 msgstr ""
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, c-format
 msgid "error in regular expression matcher"
 msgstr ""
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, c-format
 msgid "non-integer argument"
 msgstr ""
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr ""
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr ""
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, c-format
 msgid "the strings compared were %s and %s"
 msgstr ""
@@ -3651,34 +3729,34 @@ msgstr ""
 msgid "Niels Moller"
 msgstr ""
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
 msgstr ""
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
 msgstr ""
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, c-format
 msgid "%s is not a valid positive integer"
 msgstr ""
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr ""
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
 "  or:  %s OPTION\n"
 msgstr ""
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
 "are specified on the command line, read them from standard input.\n"
@@ -3765,28 +3843,28 @@ msgid "invalid number of columns: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr ""
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
 msgstr ""
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, c-format
 msgid "failed to get groups for user %s"
 msgstr ""
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, c-format
 msgid "failed to get groups for the current process"
 msgstr ""
@@ -3808,22 +3886,22 @@ msgid ""
 "the current process (which may differ if the groups database has changed).\n"
 msgstr ""
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, c-format
 msgid "cannot get real UID"
 msgstr ""
 
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, c-format
 msgid "cannot get effective GID"
 msgstr ""
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, c-format
 msgid "cannot get real GID"
 msgstr ""
 
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, c-format
 msgid "%s: no such user"
 msgstr ""
@@ -3859,58 +3937,48 @@ msgid ""
 "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n"
 msgstr ""
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr ""
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, c-format
 msgid "%s: number of bytes is too large"
 msgstr ""
 
-#: src/head.c:440
-#, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr ""
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr ""
 
-#: src/head.c:673
-#, c-format
-msgid "%s: failed to reset file pointer"
-msgstr ""
-
-#: src/head.c:798
+#: src/head.c:423 src/tail.c:457
 #, c-format
-msgid "cannot reposition file pointer for %s"
+msgid "%s: cannot seek to relative offset %s"
 msgstr ""
 
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr ""
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr ""
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr ""
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr ""
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr ""
 
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, c-format
 msgid "invalid trailing option -- %c"
 msgstr ""
@@ -3948,145 +4016,161 @@ msgid "cannot determine hostname"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr ""
 
-#: src/id.c:81
+#: src/id.c:84
 #, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
+msgid "Usage: %s [OPTION]... [USER]\n"
 msgstr ""
 
-#: src/id.c:82
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
 msgstr ""
 
-#: src/id.c:96
+#: src/id.c:90
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
+msgstr ""
+
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
 msgstr ""
 
-#: src/id.c:140
+#: src/id.c:151
+#, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr ""
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr ""
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr ""
 
-#: src/id.c:178
+#: src/id.c:198
 #, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr ""
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr ""
 
-#: src/id.c:199
+#: src/id.c:209
+#, c-format
+msgid "option --zero not permitted in default format"
+msgstr ""
+
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
 msgstr ""
 
-#: src/id.c:224
+#: src/id.c:265
 #, c-format
 msgid "cannot get effective UID"
 msgstr ""
 
-#: src/id.c:311
+#: src/id.c:354
 #, c-format
 msgid "cannot find name for user ID %s"
 msgstr ""
 
-#: src/id.c:329
+#: src/id.c:372
 #, c-format
 msgid "uid=%s"
 msgstr ""
 
-#: src/id.c:334
+#: src/id.c:377
 #, c-format
 msgid " gid=%s"
 msgstr ""
 
-#: src/id.c:341
+#: src/id.c:384
 #, c-format
 msgid " euid=%s"
 msgstr ""
 
-#: src/id.c:349
+#: src/id.c:392
 #, c-format
 msgid " egid=%s"
 msgstr ""
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr ""
 
-#: src/id.c:393
+#: src/id.c:437
 #, c-format
 msgid " context=%s"
 msgstr ""
 
-#: src/install.c:373
+#: src/install.c:376
 #, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr ""
 
-#: src/install.c:414
+#: src/install.c:417
 #, c-format
 msgid "creating directory %s"
 msgstr ""
 
-#: src/install.c:482
+#: src/install.c:485
 #, c-format
 msgid "cannot change ownership of %s"
 msgstr ""
 
-#: src/install.c:506
+#: src/install.c:509
 #, c-format
 msgid "cannot set time stamps for %s"
 msgstr ""
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, c-format
 msgid "fork system call failed"
 msgstr ""
 
-#: src/install.c:531
+#: src/install.c:535
 #, c-format
 msgid "cannot run %s"
 msgstr ""
 
-#: src/install.c:535
+#: src/install.c:539
 #, c-format
 msgid "waiting for strip"
 msgstr ""
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr ""
 
-#: src/install.c:558
+#: src/install.c:565
 #, c-format
 msgid "invalid user %s"
 msgstr ""
 
-#: src/install.c:594
+#: src/install.c:601
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -4095,7 +4179,7 @@ msgid ""
 "  or:  %s [OPTION]... -d DIRECTORY...\n"
 msgstr ""
 
-#: src/install.c:601
+#: src/install.c:608
 msgid ""
 "\n"
 "This install program copies files (often just compiled) into destination\n"
@@ -4109,7 +4193,7 @@ msgid ""
 "In the 4th form, create all components of the given DIRECTORY(ies).\n"
 msgstr ""
 
-#: src/install.c:615
+#: src/install.c:622
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
 "  -b                  like --backup but does not accept an argument\n"
@@ -4121,7 +4205,7 @@ msgid ""
 "                        components of the specified directories\n"
 msgstr ""
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -4133,7 +4217,7 @@ msgid ""
 "  -o, --owner=OWNER   set ownership (super-user only)\n"
 msgstr ""
 
-#: src/install.c:631
+#: src/install.c:638
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
 "files\n"
@@ -4147,60 +4231,57 @@ msgid ""
 "  -v, --verbose       print the name of each directory as it is created\n"
 msgstr ""
 
-#: src/install.c:641
+#: src/install.c:648
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
 
-#: src/install.c:859
+#: src/install.c:696 src/unlink.c:86
 #, c-format
-msgid ""
-"WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
+msgid "cannot unlink %s"
 msgstr ""
 
-#: src/install.c:869
+#: src/install.c:877
 #, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
+msgid ""
+"WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
 msgstr ""
 
-#: src/install.c:886
+#: src/install.c:917
 #, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr ""
 
-#: src/install.c:889
+#: src/install.c:920
 #, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr ""
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr ""
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, c-format
 msgid "invalid mode %s"
 msgstr ""
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr ""
 
-#: src/install.c:959
+#: src/install.c:1001
 #, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr ""
 
-#: src/install.c:966
+#: src/install.c:1008
 #, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr ""
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -4212,7 +4293,7 @@ msgstr ""
 msgid "Mike Haertel"
 msgstr ""
 
-#: src/join.c:191
+#: src/join.c:195
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
 "standard output.  The default join field is the first, delimited\n"
@@ -4223,7 +4304,7 @@ msgid ""
 "  -e EMPTY          replace missing input fields with EMPTY\n"
 msgstr ""
 
-#: src/join.c:200
+#: src/join.c:204
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
 "  -j FIELD          equivalent to '-1 FIELD -2 FIELD'\n"
@@ -4231,7 +4312,7 @@ msgid ""
 "  -t CHAR           use CHAR as input and output field separator\n"
 msgstr ""
 
-#: src/join.c:206
+#: src/join.c:210
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
 "  -1 FIELD          join on this FIELD of file 1\n"
@@ -4243,7 +4324,11 @@ msgid ""
 "                      print them without trying to pair them\n"
 msgstr ""
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr ""
+
+#: src/join.c:225
 msgid ""
 "\n"
 "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n"
@@ -4262,47 +4347,47 @@ msgid ""
 "warning message will be given.\n"
 msgstr ""
 
-#: src/join.c:403
+#: src/join.c:410
 #, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
 msgstr ""
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, c-format
 msgid "invalid field number: %s"
 msgstr ""
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, c-format
 msgid "invalid field specifier: %s"
 msgstr ""
 
-#: src/join.c:877
+#: src/join.c:884
 #, c-format
 msgid "invalid file number in field spec: %s"
 msgstr ""
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr ""
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr ""
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, c-format
 msgid "multi-character tab %s"
 msgstr ""
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr ""
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr ""
@@ -4404,47 +4489,47 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr ""
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr ""
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, c-format
 msgid "%s: cannot overwrite directory"
 msgstr ""
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
 msgstr ""
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, c-format
 msgid "failed to create symbolic link %s"
 msgstr ""
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr ""
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr ""
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, c-format
 msgid "failed to create hard link %s"
 msgstr ""
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, c-format
 msgid "failed to create hard link %s => %s"
 msgstr ""
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -4453,7 +4538,7 @@ msgid ""
 "  or:  %s [OPTION]... -t DIRECTORY TARGET...  (4th form)\n"
 msgstr ""
 
-#: src/ln.c:381
+#: src/ln.c:398
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
 "In the 2nd form, create a link to TARGET in the current directory.\n"
@@ -4465,7 +4550,7 @@ msgid ""
 "interpreted in relation to its parent directory.\n"
 msgstr ""
 
-#: src/ln.c:394
+#: src/ln.c:411
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
 "file\n"
@@ -4478,7 +4563,7 @@ msgid ""
 "  -f, --force                 remove existing destination files\n"
 msgstr ""
 
-#: src/ln.c:402
+#: src/ln.c:419
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
 "  -L, --logical               dereference TARGETs that are symbolic links\n"
@@ -4490,7 +4575,7 @@ msgid ""
 "  -s, --symbolic              make symbolic links instead of hard links\n"
 msgstr ""
 
-#: src/ln.c:411
+#: src/ln.c:428
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
 "  -t, --target-directory=DIRECTORY  specify the DIRECTORY in which to "
@@ -4500,7 +4585,7 @@ msgid ""
 "  -v, --verbose               print name of each linked file\n"
 msgstr ""
 
-#: src/ln.c:433
+#: src/ln.c:450
 #, c-format
 msgid ""
 "\n"
@@ -4508,12 +4593,12 @@ msgid ""
 "behavior when a TARGET is a symbolic link, defaulting to %s.\n"
 msgstr ""
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr ""
 
-#: src/ln.c:588
+#: src/ln.c:605
 #, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr ""
@@ -4544,7 +4629,7 @@ msgstr ""
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 msgid "%b %e  %Y"
 msgstr ""
 
@@ -4553,100 +4638,100 @@ msgstr ""
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 msgid "%b %e %H:%M"
 msgstr ""
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr ""
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr ""
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr ""
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, c-format
 msgid "invalid line width: %s"
 msgstr ""
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, c-format
 msgid "invalid tab size: %s"
 msgstr ""
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, c-format
 msgid "invalid time style format %s"
 msgstr ""
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 msgid "Valid arguments are:\n"
 msgstr ""
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr ""
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr ""
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, c-format
 msgid "unrecognized prefix: %s"
 msgstr ""
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr ""
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, c-format
 msgid "cannot open directory %s"
 msgstr ""
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, c-format
 msgid "cannot determine device and inode of %s"
 msgstr ""
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, c-format
 msgid "%s: not listing already-listed directory"
 msgstr ""
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, c-format
 msgid "reading directory %s"
 msgstr ""
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, c-format
 msgid "closing directory %s"
 msgstr ""
 
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, c-format
 msgid "cannot compare file names %s and %s"
 msgstr ""
 
-#: src/ls.c:4721
+#: src/ls.c:4781
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
 "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n"
 msgstr ""
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
 "  -A, --almost-all           do not list implied . and ..\n"
@@ -4655,33 +4740,32 @@ msgid ""
 "characters\n"
 msgstr ""
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
 "  -F, --classify             append indicator (one of */=>@|) to entries\n"
@@ -4691,40 +4775,41 @@ msgid ""
 "      --full-time            like -l --time-style=full-iso\n"
 msgstr ""
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr ""
 
-#: src/ls.c:4763
+#: src/ls.c:4823
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 
-#: src/ls.c:4769
+#: src/ls.c:4829
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
 
-#: src/ls.c:4775
+#: src/ls.c:4835
 msgid ""
 "  -H, --dereference-command-line\n"
 "                             follow symbolic links listed on the command "
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
 msgstr ""
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
 "names:\n"
@@ -4733,10 +4818,10 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -4746,7 +4831,7 @@ msgid ""
 "entries\n"
 msgstr ""
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -4757,11 +4842,11 @@ msgid ""
 "                             append / indicator to directories\n"
 msgstr ""
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -4769,7 +4854,7 @@ msgid ""
 "escape\n"
 msgstr ""
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
 "  -R, --recursive            list subdirectories recursively\n"
@@ -4777,56 +4862,59 @@ msgid ""
 "blocks\n"
 msgstr ""
 
-#: src/ls.c:4825
+#: src/ls.c:4886
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 
-#: src/ls.c:4835
+#: src/ls.c:4896
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
 msgstr ""
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 msgid ""
 "  -t                         sort by modification time, newest first\n"
 "  -T, --tabsize=COLS         assume tab stops at each COLS instead of 8\n"
 msgstr ""
 
-#: src/ls.c:4848
+#: src/ls.c:4912
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
 msgstr ""
 
-#: src/ls.c:4855
+#: src/ls.c:4919
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -4835,7 +4923,7 @@ msgid ""
 "variable can change the settings.  Use the dircolors command to set it.\n"
 msgstr ""
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -4899,19 +4987,16 @@ msgstr ""
 #: src/md5sum.c:195
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, c-format
 msgid ""
 "\n"
@@ -4921,157 +5006,183 @@ msgid ""
 "space for text), and name for each FILE.\n"
 msgstr ""
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, c-format
 msgid "%s: too many checksum lines"
 msgstr ""
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr ""
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr ""
 
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr ""
 
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr ""
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr ""
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
 msgstr ""
 
-#: src/md5sum.c:766
+#: src/md5sum.c:770
 #, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr ""
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
 msgstr ""
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr ""
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr ""
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr ""
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr ""
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr ""
 
-#: src/mkdir.c:57
+#: src/mkdir.c:59
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
 msgstr ""
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 
-#: src/mkdir.c:168
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/mkdir.c:127 src/mkdir.c:172
+#, c-format
+msgid "failed to set default creation context for %s"
+msgstr ""
+
+#: src/mkdir.c:191
+#, c-format
+msgid "failed to restore context for %s"
+msgstr ""
+
+#: src/mkdir.c:231
 #, c-format
 msgid "created directory %s"
 msgstr ""
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr ""
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr ""
 
-#: src/mkfifo.c:52
+#: src/mkfifo.c:54
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
 msgstr ""
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
 msgstr ""
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, c-format
 msgid "invalid mode"
 msgstr ""
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr ""
 
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
 #, c-format
-msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
+msgid "cannot set permissions of %s"
 msgstr ""
 
 #: src/mknod.c:54
-msgid "Create the special file NAME of the given TYPE.\n"
+#, c-format
+msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr ""
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
+#: src/mknod.c:56
+msgid "Create the special file NAME of the given TYPE.\n"
 msgstr ""
 
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -5080,7 +5191,7 @@ msgid ""
 "otherwise, as decimal.  TYPE may be:\n"
 msgstr ""
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 msgid ""
 "\n"
 "  b      create a block (buffered) special file\n"
@@ -5088,148 +5199,142 @@ msgid ""
 "  p      create a FIFO\n"
 msgstr ""
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 msgid "Special files require major and minor device numbers."
 msgstr ""
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 msgid "Fifos do not have major and minor device numbers."
 msgstr ""
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, c-format
 msgid "block special files not supported"
 msgstr ""
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, c-format
 msgid "character special files not supported"
 msgstr ""
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, c-format
 msgid "invalid major device number %s"
 msgstr ""
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, c-format
 msgid "invalid minor device number %s"
 msgstr ""
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, c-format
 msgid "invalid device %s %s"
 msgstr ""
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, c-format
 msgid "invalid device type %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr ""
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr ""
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
 "TEMPLATE must contain at least 3 consecutive 'X's in last component.\n"
 "If TEMPLATE is not specified, use tmp.XXXXXXXXXX, and --tmpdir is implied.\n"
 msgstr ""
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
 "  -q, --quiet         suppress diagnostics about file/dir-creation failure\n"
 msgstr ""
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
 msgstr ""
 
-#: src/mktemp.c:223
-#, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr ""
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, c-format
 msgid "too many templates"
 msgstr ""
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr ""
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr ""
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr ""
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr ""
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr ""
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, c-format
 msgid "failed to create directory via template %s"
 msgstr ""
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, c-format
 msgid "failed to create file via template %s"
 msgstr ""
 
-#: src/mv.c:292
+#: src/mv.c:294
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 
-#: src/mv.c:298
+#: src/mv.c:300
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
 "file\n"
@@ -5242,7 +5347,7 @@ msgid ""
 "effect.\n"
 msgstr ""
 
-#: src/mv.c:307
+#: src/mv.c:309
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
@@ -5250,7 +5355,7 @@ msgid ""
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
 msgstr ""
 
-#: src/mv.c:312
+#: src/mv.c:314
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
 "DIRECTORY\n"
@@ -5259,6 +5364,8 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
 
 #: src/nice.c:72
@@ -5497,95 +5604,90 @@ msgid "%s: invalid number to ignore"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
 msgstr ""
 
-#: src/numfmt.c:676
+#: src/numfmt.c:659
 #, c-format
-msgid "value too large to be converted: '%s'"
+msgid "value too large to be converted: %s"
 msgstr ""
 
-#: src/numfmt.c:680
+#: src/numfmt.c:663
 #, c-format
-msgid "invalid number: '%s'"
+msgid "invalid number: %s"
 msgstr ""
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
+msgid "rejecting suffix in input: %s (consider using --from)"
 msgstr ""
 
-#: src/numfmt.c:688
+#: src/numfmt.c:671
 #, c-format
-msgid "invalid suffix in input: '%s'"
+msgid "invalid suffix in input: %s"
 msgstr ""
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
 msgstr ""
 
-#: src/numfmt.c:723
+#: src/numfmt.c:722 src/numfmt.c:768
 #, c-format
 msgid "failed to prepare value '%Lf' for printing"
 msgstr ""
 
-#: src/numfmt.c:787
-#, c-format
-msgid "invalid unit size: '%s'"
-msgstr ""
-
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
+#: src/numfmt.c:791
 #, c-format
-msgid "out of memory (requested %zu bytes)"
+msgid "invalid unit size: %s"
 msgstr ""
 
-#: src/numfmt.c:813
+#: src/numfmt.c:814
 #, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
 msgstr ""
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
 msgstr ""
 
-#: src/numfmt.c:820
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
 msgstr ""
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
 msgstr ""
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
 "                         see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr ""
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
@@ -5593,19 +5695,19 @@ msgid ""
 "locale)\n"
 msgstr ""
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
 msgstr ""
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
 msgstr ""
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -5615,40 +5717,40 @@ msgid ""
 "                         is found\n"
 msgstr ""
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
 "nearest\n"
 msgstr ""
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
 msgstr ""
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr ""
 
-#: src/numfmt.c:877
+#: src/numfmt.c:878
 msgid ""
 "\n"
 "UNIT options:\n"
 msgstr ""
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr ""
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -5657,7 +5759,7 @@ msgid ""
 "               1Mi = 1048576,\n"
 msgstr ""
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
@@ -5665,7 +5767,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
@@ -5673,7 +5775,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
@@ -5681,18 +5783,18 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:905
+#: src/numfmt.c:906
 #, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -5704,7 +5806,7 @@ msgid ""
 "errors are not diagnosed and the exit status is 0.\n"
 msgstr ""
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -5725,112 +5827,112 @@ msgid ""
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 msgstr ""
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, c-format
 msgid "format %s has no %% directive"
 msgstr ""
 
-#: src/numfmt.c:990
+#: src/numfmt.c:1003
 #, c-format
 msgid "invalid format %s (width overflow)"
 msgstr ""
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr ""
+
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr ""
 
-#: src/numfmt.c:1010
+#: src/numfmt.c:1030
 #, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
 msgstr ""
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr ""
 
-#: src/numfmt.c:1070
+#: src/numfmt.c:1081
 #, c-format
-msgid "invalid suffix in input '%s': '%s'"
+msgid "invalid suffix in input %s: %s"
 msgstr ""
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
 msgstr ""
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
 msgstr ""
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
+msgid "large input value %s: possible precision loss"
 msgstr ""
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
 
-#: src/numfmt.c:1388
+#: src/numfmt.c:1403
 #, c-format
-msgid "invalid padding value '%s'"
+msgid "invalid padding value %s"
 msgstr ""
 
-#: src/numfmt.c:1401
+#: src/numfmt.c:1417
 #, c-format
-msgid "invalid field value '%s'"
+msgid "invalid field value %s"
 msgstr ""
 
-#: src/numfmt.c:1430
+#: src/numfmt.c:1447
 #, c-format
-msgid "invalid header value '%s'"
+msgid "invalid header value %s"
 msgstr ""
 
-#: src/numfmt.c:1456
+#: src/numfmt.c:1473
 #, c-format
 msgid "--grouping cannot be combined with --format"
 msgstr ""
 
-#: src/numfmt.c:1458
-#, c-format
-msgid "--padding cannot be combined with --format"
-msgstr ""
-
-#: src/numfmt.c:1463
+#: src/numfmt.c:1478
 #, c-format
 msgid "no conversion option specified"
 msgstr ""
 
-#: src/numfmt.c:1471
+#: src/numfmt.c:1486
 #, c-format
 msgid "grouping cannot be combined with --to"
 msgstr ""
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
 msgstr ""
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
 msgstr ""
 
-#: src/numfmt.c:1511
+#: src/numfmt.c:1526
 #, c-format
 msgid "error reading input"
 msgstr ""
 
-#: src/numfmt.c:1520
+#: src/numfmt.c:1535
 #, c-format
 msgid "failed to convert some of the input numbers"
 msgstr ""
 
-#: src/od.c:294
+#: src/od.c:320
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -5839,7 +5941,7 @@ msgid ""
 "[b]]\n"
 msgstr ""
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -5849,7 +5951,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/od.c:307
+#: src/od.c:333
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
 "if the last operand begins with + or (if there are 2 operands) a digit.\n"
@@ -5859,38 +5961,40 @@ msgid ""
 "suffixes may be . for octal and b for multiply by 512.\n"
 msgstr ""
 
-#: src/od.c:318
+#: src/od.c:344
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
 
-#: src/od.c:323
+#: src/od.c:350
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
 
-#: src/od.c:336
+#: src/od.c:363
 msgid ""
 "\n"
 "\n"
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 
-#: src/od.c:345
+#: src/od.c:372
 msgid ""
 "  -f   same as -t fF, select floats\n"
 "  -i   same as -t dI, select decimal ints\n"
@@ -5900,16 +6004,16 @@ msgid ""
 "  -x   same as -t x2, select hexadecimal 2-byte units\n"
 msgstr ""
 
-#: src/od.c:353
+#: src/od.c:380
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -5918,7 +6022,7 @@ msgid ""
 "  x[SIZE]    hexadecimal, SIZE bytes per integer\n"
 msgstr ""
 
-#: src/od.c:367
+#: src/od.c:394
 msgid ""
 "\n"
 "SIZE is a number.  For TYPE in [doux], SIZE may also be C for\n"
@@ -5927,14 +6031,14 @@ msgid ""
 "for sizeof(double) or L for sizeof(long double).\n"
 msgstr ""
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
 "each output line.\n"
 msgstr ""
 
-#: src/od.c:379
+#: src/od.c:406
 msgid ""
 "\n"
 "\n"
@@ -5947,55 +6051,55 @@ msgid ""
 "and so on for G, T, P, E, Z, Y.\n"
 msgstr ""
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, c-format
 msgid "invalid type string %s"
 msgstr ""
 
-#: src/od.c:649
+#: src/od.c:690
 #, c-format
 msgid ""
 "invalid type string %s;\n"
 "this system doesn't provide a %lu-byte integral type"
 msgstr ""
 
-#: src/od.c:770
+#: src/od.c:811
 #, c-format
 msgid ""
 "invalid type string %s;\n"
 "this system doesn't provide a %lu-byte floating point type"
 msgstr ""
 
-#: src/od.c:828
+#: src/od.c:869
 #, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr ""
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr ""
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr ""
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr ""
 
-#: src/od.c:1810
+#: src/od.c:1863
 msgid "compatibility mode supports at most one file"
 msgstr ""
 
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr ""
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr ""
@@ -6146,12 +6250,12 @@ msgstr ""
 msgid "Where"
 msgstr ""
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr ""
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -6161,7 +6265,7 @@ msgid ""
 "  -s              do short format output, this is the default\n"
 msgstr ""
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -6170,7 +6274,7 @@ msgid ""
 "                  in short format\n"
 msgstr ""
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, c-format
 msgid ""
 "\n"
@@ -6178,7 +6282,7 @@ msgid ""
 "The utmp file will be %s.\n"
 msgstr ""
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr ""
@@ -6345,12 +6449,13 @@ msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
 
-#: src/pr.c:2827
+#: src/pr.c:2828
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
 "                    separate columns by STRING,\n"
@@ -6360,7 +6465,7 @@ msgid ""
 "  -t, --omit-header  omit page headers and trailers\n"
 msgstr ""
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 msgid ""
 "  -T, --omit-pagination\n"
 "                    omit page headers and trailers, eliminate any "
@@ -6374,7 +6479,7 @@ msgid ""
 "(72)\n"
 msgstr ""
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
 "                    set page width to PAGE_WIDTH (72) characters always,\n"
@@ -6383,7 +6488,7 @@ msgid ""
 "                    with -S or -s\n"
 msgstr ""
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 msgid ""
 "\n"
 "-t is implied if PAGE_LENGTH <= 10.  With no FILE, or when FILE is -, read\n"
@@ -6400,7 +6505,7 @@ msgid ""
 msgstr ""
 
 #: src/printenv.c:69
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/printf.c:79
@@ -6496,32 +6601,32 @@ msgstr ""
 msgid "F. Pinard"
 msgstr ""
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, c-format
 msgid "%s (for regexp %s)"
 msgstr ""
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
 "  or:  %s -G [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr ""
 
-#: src/ptx.c:1821
+#: src/ptx.c:1824
 msgid ""
 "Output a permuted index, including context, of the words in the input "
 "files.\n"
 msgstr ""
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
 "  -G, --traditional              behave more like System V 'ptx'\n"
 "  -F, --flag-truncation=STRING   use STRING for flagging line truncations\n"
 msgstr ""
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
 "  -O, --format=roff              generate output as roff directives\n"
@@ -6530,7 +6635,7 @@ msgid ""
 "  -T, --format=tex               generate output as TeX directives\n"
 msgstr ""
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -6540,7 +6645,7 @@ msgid ""
 "  -o, --only-file=FILE           read only word list from this FILE\n"
 msgstr ""
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -6548,13 +6653,13 @@ msgid ""
 "excluded\n"
 msgstr ""
 
-#: src/ptx.c:1854
+#: src/ptx.c:1857
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, c-format
 msgid "invalid gap width: %s"
 msgstr ""
@@ -6571,22 +6676,28 @@ msgid ""
 "  -P, --physical  avoid all symlinks\n"
 msgstr ""
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+
+#: src/pwd.c:169
 #, c-format
 msgid "failed to chdir to %s"
 msgstr ""
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, c-format
 msgid "failed to stat %s"
 msgstr ""
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr ""
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, c-format
 msgid "ignoring non-option arguments"
 msgstr ""
@@ -6596,8 +6707,8 @@ msgstr ""
 msgid "Dmitry V. Levin"
 msgstr ""
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr ""
@@ -6631,8 +6742,7 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/readlink.c:152
@@ -6657,7 +6767,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 
@@ -6675,41 +6785,42 @@ msgstr ""
 msgid "%s: descend into directory %s? "
 msgstr ""
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr ""
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, c-format
 msgid "%s: remove %s %s? "
 msgstr ""
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, c-format
 msgid "removed directory: %s\n"
 msgstr ""
 
-#: src/remove.c:444
+#: src/remove.c:447
 #, c-format
-msgid "cannot remove directory: %s"
+msgid "refusing to remove %s or %s directory: skipping %s"
 msgstr ""
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr ""
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, c-format
 msgid "traversal failed: %s"
 msgstr ""
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -6734,12 +6845,12 @@ msgstr ""
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 
 #: src/rm.c:149
@@ -6787,13 +6898,17 @@ msgstr ""
 
 #: src/rm.c:342
 #, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr ""
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/rm.c:343
+#: src/rm.c:345
 #, c-format
-msgid "%s: remove all arguments? "
-msgstr ""
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] ""
+msgstr[1] ""
 
 #: src/rmdir.c:134 src/rmdir.c:233
 #, c-format
@@ -6836,7 +6951,7 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
 
@@ -6886,41 +7001,46 @@ msgstr ""
 msgid "no command specified"
 msgstr ""
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr ""
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, c-format
 msgid "failed to compute a new context"
 msgstr ""
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, c-format
 msgid "failed to set new user %s"
 msgstr ""
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, c-format
 msgid "failed to set new type %s"
 msgstr ""
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, c-format
 msgid "failed to set new range %s"
 msgstr ""
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, c-format
 msgid "failed to set new role %s"
 msgstr ""
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, c-format
 msgid "unable to set security context %s"
 msgstr ""
 
+#: src/selinux.c:127 src/selinux.c:300
+#, c-format
+msgid "error canonicalizing %s"
+msgstr ""
+
 #: src/seq.c:68
 #, c-format
 msgid ""
@@ -6945,95 +7065,47 @@ msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
 msgstr ""
 
-#: src/seq.c:94
+#: src/seq.c:96
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
 "it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n"
 "decimal numbers with maximum precision PREC, and to %g otherwise.\n"
 msgstr ""
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, c-format
 msgid "invalid floating point argument: %s"
 msgstr ""
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr ""
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr ""
 
-#: src/setuidgid.c:49
-#, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-
-#: src/setuidgid.c:55
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr ""
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr ""
-
-#: src/setuidgid.c:190
-#, c-format
-msgid "failed to set supplemental group(s)"
-msgstr ""
-
-#: src/setuidgid.c:200
-#, c-format
-msgid "cannot set group-ID to %lu"
-msgstr ""
-
-#: src/setuidgid.c:204
-#, c-format
-msgid "cannot set user-ID to %lu"
-msgstr ""
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr ""
 
-#: src/shred.c:148
+#: src/shred.c:170
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
 "for even very expensive hardware probing to recover the data.\n"
 msgstr ""
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -7042,28 +7114,32 @@ msgid ""
 "  -s, --size=N   shred this many bytes (suffixes like K, M, G accepted)\n"
 msgstr ""
 
-#: src/shred.c:161
+#: src/shred.c:183
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
 "  -z, --zero     add a final overwrite with zeros to hide shredding\n"
 msgstr ""
 
-#: src/shred.c:170
+#: src/shred.c:192
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -7074,7 +7150,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -7086,7 +7162,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -7095,7 +7171,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -7107,134 +7183,134 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:215
+#: src/shred.c:241
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
 "of the file that cannot be removed, and that will allow a shredded file\n"
 "to be recovered later.\n"
 msgstr ""
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, c-format
 msgid "%s: fdatasync failed"
 msgstr ""
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr ""
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr ""
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr ""
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, c-format
 msgid "%s: error writing at offset %s"
 msgstr ""
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, c-format
 msgid "%s: lseek failed"
 msgstr ""
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, c-format
 msgid "%s: file too large"
 msgstr ""
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr ""
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr ""
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, c-format
 msgid "%s: fstat failed"
 msgstr ""
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, c-format
 msgid "%s: invalid file type"
 msgstr ""
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr ""
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, c-format
 msgid "%s: error truncating"
 msgstr ""
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, c-format
 msgid "%s: fcntl failed"
 msgstr ""
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr ""
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr ""
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, c-format
 msgid "%s: renamed to %s"
 msgstr ""
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, c-format
 msgid "%s: failed to remove"
 msgstr ""
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr ""
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, c-format
 msgid "%s: failed to close"
 msgstr ""
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, c-format
 msgid "%s: failed to open for writing"
 msgstr ""
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, c-format
 msgid "%s: invalid number of passes"
 msgstr ""
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, c-format
 msgid "multiple random sources specified"
 msgstr ""
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, c-format
 msgid "%s: invalid file size"
 msgstr ""
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -7242,11 +7318,11 @@ msgid ""
 "  or:  %s -i LO-HI [OPTION]...\n"
 msgstr ""
 
-#: src/shuf.c:54
+#: src/shuf.c:67
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr ""
 
-#: src/shuf.c:60
+#: src/shuf.c:73
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
 "  -i, --input-range=LO-HI   treat each number LO through HI as an input "
@@ -7254,34 +7330,44 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
 msgstr ""
 
-#: src/shuf.c:244
+#: src/shuf.c:228
+#, c-format
+msgid "too many input lines"
+msgstr ""
+
+#: src/shuf.c:431
 #, c-format
 msgid "multiple -i options specified"
 msgstr ""
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, c-format
 msgid "invalid input range %s"
 msgstr ""
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, c-format
 msgid "invalid line count %s"
 msgstr ""
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, c-format
 msgid "multiple output files specified"
 msgstr ""
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, c-format
 msgid "cannot combine -e and -i options"
 msgstr ""
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr ""
+
 #: src/sleep.c:44
 #, c-format
 msgid ""
@@ -7296,27 +7382,27 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, c-format
 msgid "invalid time interval %s"
 msgstr ""
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr ""
 
-#: src/sort.c:399
+#: src/sort.c:427
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr ""
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
 msgstr ""
 
-#: src/sort.c:409
+#: src/sort.c:437
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
 "  -d, --dictionary-order      consider only blanks and alphanumeric "
@@ -7324,19 +7410,19 @@ msgid ""
 "  -f, --ignore-case           fold lower case to upper case characters\n"
 msgstr ""
 
-#: src/sort.c:415
+#: src/sort.c:443
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
 "  -i, --ignore-nonprinting    consider only printable characters\n"
 "  -M, --month-sort            compare (unknown) < 'JAN' < ... < 'DEC'\n"
 msgstr ""
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 
-#: src/sort.c:423
+#: src/sort.c:451
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
 "  -R, --random-sort           sort by random hash of keys\n"
@@ -7344,7 +7430,7 @@ msgid ""
 "  -r, --reverse               reverse the result of comparisons\n"
 msgstr ""
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -7354,19 +7440,19 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/sort.c:437
+#: src/sort.c:465
 msgid ""
 "Other options:\n"
 "\n"
 msgstr ""
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
 msgstr ""
 
-#: src/sort.c:445
+#: src/sort.c:473
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
 "  -C, --check=quiet, --check=silent  like -c, but do not report first bad "
@@ -7375,7 +7461,7 @@ msgid ""
 "                              decompress them with PROG -d\n"
 msgstr ""
 
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -7384,13 +7470,13 @@ msgid ""
 "                            If F is - then read names from standard input\n"
 msgstr ""
 
-#: src/sort.c:459
+#: src/sort.c:487
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
 "  -m, --merge               merge already sorted files; do not sort\n"
 msgstr ""
 
-#: src/sort.c:463
+#: src/sort.c:491
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "  -s, --stable              stabilize sort by disabling last-resort "
@@ -7398,7 +7484,7 @@ msgid ""
 "  -S, --buffer-size=SIZE    use SIZE for main memory buffer\n"
 msgstr ""
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -7413,11 +7499,7 @@ msgid ""
 "run\n"
 msgstr ""
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr ""
-
-#: src/sort.c:483
+#: src/sort.c:511
 msgid ""
 "\n"
 "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is "
@@ -7436,7 +7518,7 @@ msgid ""
 "SIZE may be followed by the following multiplicative suffixes:\n"
 msgstr ""
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -7448,254 +7530,239 @@ msgid ""
 "native byte values.\n"
 msgstr ""
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, c-format
 msgid "waiting for %s [-d]"
 msgstr ""
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr ""
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, c-format
 msgid "cannot create temporary file in %s"
 msgstr ""
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr ""
 
-#: src/sort.c:970
+#: src/sort.c:998
 msgid "fflush failed"
 msgstr ""
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr ""
 
-#: src/sort.c:986
-#, c-format
-msgid "dup2 failed"
-msgstr ""
-
-#: src/sort.c:1103
-#, c-format
-msgid "couldn't execute %s"
-msgstr ""
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 msgid "couldn't create temporary file"
 msgstr ""
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, c-format
 msgid "couldn't create process for %s -d"
 msgstr ""
 
-#: src/sort.c:1161
-#, c-format
-msgid "couldn't execute %s -d"
-msgstr ""
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, c-format
 msgid "warning: cannot remove: %s"
 msgstr ""
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, c-format
 msgid "invalid --%s argument %s"
 msgstr ""
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, c-format
 msgid "minimum --%s argument is %s"
 msgstr ""
 
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, c-format
 msgid "--%s argument %s too large"
 msgstr ""
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr ""
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr ""
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr ""
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr ""
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, c-format
 msgid "string transformation failed"
 msgstr ""
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, c-format
 msgid "the untransformed string was %s"
 msgstr ""
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr ""
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr ""
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr ""
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr ""
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr ""
 
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr ""
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr ""
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr ""
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr ""
 
-#: src/sort.c:3698
+#: src/sort.c:3738
 msgid "cannot read"
 msgstr ""
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, c-format
 msgid "%s: invalid field specification %s"
 msgstr ""
 
-#: src/sort.c:3987
+#: src/sort.c:4028
 #, c-format
 msgid "options '-%s' are incompatible"
 msgstr ""
 
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, c-format
 msgid "%s: invalid count at start of %s"
 msgstr ""
 
-#: src/sort.c:4295
+#: src/sort.c:4336
 msgid "invalid number after '-'"
 msgstr ""
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 msgid "invalid number after '.'"
 msgstr ""
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr ""
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, c-format
 msgid "multiple compress programs specified"
 msgstr ""
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
 msgstr ""
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
 msgstr ""
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr ""
 
-#: src/sort.c:4407
+#: src/sort.c:4448
 msgid "invalid number after ','"
 msgstr ""
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr ""
 
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, c-format
 msgid "cannot read file names from %s"
 msgstr ""
 
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr ""
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, c-format
 msgid "no input from %s"
 msgstr ""
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr ""
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr ""
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr ""
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr ""
 
-#: src/split.c:204
+#: src/split.c:203
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr ""
 
-#: src/split.c:208
+#: src/split.c:207
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
 "size is 1000 lines, and default PREFIX is 'x'.  With no INPUT, or when "
@@ -7703,32 +7770,31 @@ msgid ""
 "is -, read standard input.\n"
 msgstr ""
 
-#: src/split.c:216
+#: src/split.c:215
 #, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
 
-#: src/split.c:229
+#: src/split.c:228
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
 "                            output file is opened\n"
 msgstr ""
 
-#: src/split.c:236
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -7740,189 +7806,189 @@ msgid ""
 "r/K/N   likewise but only output Kth of N to stdout\n"
 msgstr ""
 
-#: src/split.c:354
+#: src/split.c:353
 #, c-format
 msgid "output file suffixes exhausted"
 msgstr ""
 
-#: src/split.c:366
+#: src/split.c:365
 #, c-format
 msgid "creating file %s\n"
 msgstr ""
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr ""
 
-#: src/split.c:391
+#: src/split.c:390
 #, c-format
 msgid "failed to set FILE environment variable"
 msgstr ""
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr ""
 
-#: src/split.c:395
+#: src/split.c:394
 #, c-format
 msgid "failed to create pipe"
 msgstr ""
 
-#: src/split.c:409
+#: src/split.c:408
 #, c-format
 msgid "closing prior pipe"
 msgstr ""
 
-#: src/split.c:411
+#: src/split.c:410
 #, c-format
 msgid "closing output pipe"
 msgstr ""
 
-#: src/split.c:415
+#: src/split.c:414
 #, c-format
 msgid "moving input pipe"
 msgstr ""
 
-#: src/split.c:417
+#: src/split.c:416
 #, c-format
 msgid "closing input pipe"
 msgstr ""
 
-#: src/split.c:422
+#: src/split.c:421
 #, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr ""
 
-#: src/split.c:428
+#: src/split.c:427
 #, c-format
 msgid "failed to close input pipe"
 msgstr ""
 
-#: src/split.c:464
+#: src/split.c:463
 #, c-format
 msgid "waiting for child process"
 msgstr ""
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr ""
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr ""
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr ""
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr ""
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, c-format
 msgid "%s: invalid number of chunks"
 msgstr ""
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, c-format
 msgid "%s: invalid chunk number"
 msgstr ""
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr ""
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr ""
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr ""
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, c-format
 msgid "line count option -%s%c... is too large"
 msgstr ""
 
-#: src/split.c:1248
+#: src/split.c:1298
 #, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr ""
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, c-format
 msgid "%s: invalid IO block size"
 msgstr ""
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr ""
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr ""
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, c-format
 msgid "%s: cannot determine file size"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr ""
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, c-format
 msgid "failed to canonicalize %s"
 msgstr ""
 
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr ""
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, c-format
 msgid "%s: invalid directive"
 msgstr ""
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, c-format
 msgid "warning: backslash at end of format"
 msgstr ""
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr ""
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, c-format
 msgid "cannot read file system information for %s"
 msgstr ""
 
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, c-format
 msgid "cannot stat standard input"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -7933,7 +7999,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -7941,30 +8007,30 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, c-format
 msgid "Context: %C\n"
 msgstr ""
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -7972,27 +8038,27 @@ msgid ""
 " Birth: %w\n"
 msgstr ""
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
 msgstr ""
 
-#: src/stat.c:1356
+#: src/stat.c:1418
 msgid ""
 "  -L, --dereference     follow links\n"
 "  -f, --file-system     display file system status instead of file status\n"
 msgstr ""
 
-#: src/stat.c:1360
+#: src/stat.c:1422
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 msgid ""
 "\n"
 "The valid format sequences for files (without --file-system):\n"
@@ -8004,7 +8070,7 @@ msgid ""
 "  %C   SELinux security context string\n"
 msgstr ""
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 msgid ""
 "  %d   device number in decimal\n"
 "  %D   device number in hex\n"
@@ -8014,7 +8080,7 @@ msgid ""
 "  %G   group name of owner\n"
 msgstr ""
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 msgid ""
 "  %h   number of hard links\n"
 "  %i   inode number\n"
@@ -8023,11 +8089,11 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 
-#: src/stat.c:1399
+#: src/stat.c:1461
 msgid ""
 "  %u   user ID of owner\n"
 "  %U   user name of owner\n"
@@ -8035,14 +8101,14 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 msgid ""
 "Valid format sequences for file systems:\n"
 "\n"
@@ -8053,7 +8119,7 @@ msgid ""
 "  %f   free blocks in file system\n"
 msgstr ""
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 msgid ""
 "  %i   file system ID in hex\n"
 "  %l   maximum length of filenames\n"
@@ -8114,22 +8180,27 @@ msgid ""
 "and are thus unaffected by 'stdbuf' settings.\n"
 msgstr ""
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, c-format
 msgid "failed to find %s"
 msgstr ""
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, c-format
 msgid "failed to update the environment with %s"
 msgstr ""
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr ""
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, c-format
+msgid "you must specify a buffering mode option"
+msgstr ""
+
+#: src/stty.c:516
 #, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -8137,25 +8208,25 @@ msgid ""
 "  or:  %s [-F DEVICE | --file=DEVICE] [-g|--save]\n"
 msgstr ""
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
 msgstr ""
 
-#: src/stty.c:525
+#: src/stty.c:528
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
 "  -g, --save         print all current settings in a stty-readable form\n"
 "  -F, --file=DEVICE  open and use the specified DEVICE instead of stdin\n"
 msgstr ""
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
 "settings.  The underlying system defines which settings are available.\n"
 msgstr ""
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -8164,7 +8235,7 @@ msgid ""
 "   eol CHAR      CHAR will end the line\n"
 msgstr ""
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -8172,7 +8243,7 @@ msgid ""
 "   kill CHAR     CHAR will erase the current line\n"
 msgstr ""
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -8180,7 +8251,7 @@ msgid ""
 "   start CHAR    CHAR will restart the output after stopping it\n"
 msgstr ""
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -8188,7 +8259,7 @@ msgid ""
 " * werase CHAR   CHAR will erase the last word typed\n"
 msgstr ""
 
-#: src/stty.c:562
+#: src/stty.c:565
 msgid ""
 "\n"
 "Special settings:\n"
@@ -8197,7 +8268,7 @@ msgid ""
 " * columns N     same as cols N\n"
 msgstr ""
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -8206,7 +8277,7 @@ msgid ""
 "   ospeed N      set the output speed to N\n"
 msgstr ""
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -8215,7 +8286,7 @@ msgid ""
 "   time N        with -icanon, set read timeout of N tenths of a second\n"
 msgstr ""
 
-#: src/stty.c:581
+#: src/stty.c:584
 msgid ""
 "\n"
 "Control settings:\n"
@@ -8226,7 +8297,7 @@ msgid ""
 "   csN           set character size to N bits, N in [5..8]\n"
 msgstr ""
 
-#: src/stty.c:590
+#: src/stty.c:593
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
 "   [-]hup        send a hangup signal when the last process closes the tty\n"
@@ -8234,9 +8305,10 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -8246,7 +8318,7 @@ msgid ""
 "   [-]igncr      ignore carriage return\n"
 msgstr ""
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -8255,11 +8327,11 @@ msgid ""
 "   [-]istrip     clear high (8th) bit of input characters\n"
 msgstr ""
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr ""
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -8269,7 +8341,7 @@ msgid ""
 "   [-]tandem     same as [-]ixoff\n"
 msgstr ""
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -8279,17 +8351,17 @@ msgid ""
 " * nlN           newline delay style, N in [0..1]\n"
 msgstr ""
 
-#: src/stty.c:631
+#: src/stty.c:635
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
 " * [-]onlret     newline performs a carriage return\n"
 msgstr ""
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -8299,7 +8371,7 @@ msgid ""
 " * vtN           vertical tab delay style, N in [0..1]\n"
 msgstr ""
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -8308,7 +8380,7 @@ msgid ""
 " * -crtkill      kill all line by obeying the echoctl and echok settings\n"
 msgstr ""
 
-#: src/stty.c:654
+#: src/stty.c:658
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
 "   [-]echo       echo input characters\n"
@@ -8317,7 +8389,7 @@ msgid ""
 "   [-]echok      echo a newline after a kill character\n"
 msgstr ""
 
-#: src/stty.c:661
+#: src/stty.c:665
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
 "   [-]echonl     echo newline even if not echoing other characters\n"
@@ -8326,7 +8398,7 @@ msgid ""
 "   [-]iexten     enable non-POSIX special characters\n"
 msgstr ""
 
-#: src/stty.c:668
+#: src/stty.c:672
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
 "   [-]noflsh     disable flushing after interrupt and quit special "
@@ -8336,7 +8408,7 @@ msgid ""
 " * [-]xcase      with icanon, escape with '\\' for uppercase characters\n"
 msgstr ""
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -8345,7 +8417,7 @@ msgid ""
 "   -cbreak       same as icanon\n"
 msgstr ""
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -8353,7 +8425,7 @@ msgid ""
 "   crt           same as echoe echoctl echoke\n"
 msgstr ""
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -8362,7 +8434,7 @@ msgid ""
 "   evenp         same as parenb -parodd cs7\n"
 msgstr ""
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -8372,7 +8444,7 @@ msgid ""
 "   -nl           same as icrnl -inlcr -igncr onlcr -ocrnl -onlret\n"
 msgstr ""
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -8381,7 +8453,7 @@ msgid ""
 "   -pass8        same as parenb istrip cs7\n"
 msgstr ""
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -8389,7 +8461,7 @@ msgid ""
 "   -raw          same as cooked\n"
 msgstr ""
 
-#: src/stty.c:716
+#: src/stty.c:720
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
 "                 -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n"
@@ -8399,7 +8471,7 @@ msgid ""
 "                 characters to their default values\n"
 msgstr ""
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -8408,55 +8480,55 @@ msgid ""
 "127; special values ^- or undef used to disable special characters.\n"
 msgstr ""
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, c-format
 msgid "only one device may be specified"
 msgstr ""
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
 "mutually exclusive"
 msgstr ""
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr ""
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr ""
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, c-format
 msgid "invalid argument %s"
 msgstr ""
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, c-format
 msgid "missing argument to %s"
 msgstr ""
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, c-format
 msgid "invalid line discipline %s"
 msgstr ""
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr ""
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr ""
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, c-format
 msgid "invalid integer argument %s"
 msgstr ""
@@ -8502,21 +8574,21 @@ msgstr ""
 msgid "      --version  output version information and exit\n"
 msgstr ""
 
-#: src/system.h:544
+#: src/system.h:543
 msgid ""
 "\n"
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/system.h:552
+#: src/system.h:551
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -8525,33 +8597,33 @@ msgid ""
 "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n"
 msgstr ""
 
-#: src/system.h:571
+#: src/system.h:570
 #, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
+"%s online help: <%s>\n"
 msgstr ""
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr ""
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr ""
 
-#: src/system.h:596
+#: src/system.h:591
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr ""
 
-#: src/system.h:628
+#: src/system.h:633
 #, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -8634,54 +8706,48 @@ msgstr ""
 
 #: src/tail.c:270
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
 
 #: src/tail.c:274
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 
-#: src/tail.c:281
+#: src/tail.c:280
 #, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
 
-#: src/tail.c:294
+#: src/tail.c:293
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 
-#: src/tail.c:301
+#: src/tail.c:298
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 
-#: src/tail.c:310
+#: src/tail.c:307
 msgid ""
 "\n"
 "If the first character of K (the number of bytes or lines) is a '+',\n"
@@ -8692,7 +8758,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/tail.c:319
+#: src/tail.c:316
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
 "means that even if a tail'ed file is renamed, tail will continue to track\n"
@@ -8702,159 +8768,164 @@ msgid ""
 "named file in a way that accommodates renaming, removal and creation.\n"
 msgstr ""
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr ""
 
-#: src/tail.c:453
-#, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr ""
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr ""
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr ""
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
 "reverting to polling"
 msgstr ""
 
-#: src/tail.c:963
+#: src/tail.c:965
 #, c-format
-msgid "%s has become inaccessible"
+msgid "%s has been replaced with a symbolic link. giving up on this name"
 msgstr ""
 
 #: src/tail.c:980
 #, c-format
+msgid "%s has become inaccessible"
+msgstr ""
+
+#: src/tail.c:997
+#, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr ""
 
-#: src/tail.c:989
+#: src/tail.c:1006
 #, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr ""
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, c-format
 msgid "%s has become accessible"
 msgstr ""
 
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr ""
 
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr ""
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr ""
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr ""
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr ""
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, c-format
 msgid "cannot watch parent directory of %s"
 msgstr ""
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, c-format
 msgid "inotify resources exhausted"
 msgstr ""
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, c-format
 msgid "cannot watch %s"
 msgstr ""
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr ""
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, c-format
 msgid "error reading inotify event"
 msgstr ""
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr ""
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, c-format
 msgid "number in %s is too large"
 msgstr ""
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr ""
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr ""
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr ""
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr ""
 
-#: src/tail.c:2034
+#: src/tail.c:2096
+#, c-format
+msgid "warning: --retry ignored; --retry is useful only when following"
+msgstr ""
+
+#: src/tail.c:2100
 #, c-format
-msgid "warning: --retry is useful mainly when following by name"
+msgid "warning: --retry only effective for the initial open"
 msgstr ""
 
-#: src/tail.c:2038
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
 msgstr ""
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr ""
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, c-format
 msgid "cannot follow %s by name"
 msgstr ""
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr ""
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr ""
@@ -9058,47 +9129,46 @@ msgstr ""
 msgid "warning: sigprocmask"
 msgstr ""
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr ""
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr ""
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
 "  or:  %s [OPTION]\n"
 msgstr ""
 
-#: src/timeout.c:229
+#: src/timeout.c:232
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
 msgstr ""
 
-#: src/timeout.c:235
+#: src/timeout.c:238
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 msgid ""
 "\n"
 "DURATION is a floating point number with an optional suffix:\n"
@@ -9106,7 +9176,7 @@ msgid ""
 "days.\n"
 msgstr ""
 
-#: src/timeout.c:259
+#: src/timeout.c:262
 msgid ""
 "\n"
 "If the command times out, and --preserve-status is not set, then exit with\n"
@@ -9117,17 +9187,17 @@ msgid ""
 "case the exit status is 128+9 rather than 124.\n"
 msgstr ""
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr ""
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, c-format
 msgid "error waiting for command"
 msgstr ""
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr ""
@@ -9437,7 +9507,7 @@ msgstr ""
 #: src/truncate.c:115
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 
 #: src/truncate.c:121
@@ -9517,12 +9587,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr ""
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr ""
@@ -9593,12 +9663,12 @@ msgstr ""
 msgid "tab stop value is too large"
 msgstr ""
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr ""
 
-#: src/uniq.c:138
+#: src/uniq.c:174
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
 "writing to OUTPUT (or standard output).\n"
@@ -9606,36 +9676,49 @@ msgid ""
 "With no options, matching lines are merged to the first occurrence.\n"
 msgstr ""
 
-#: src/uniq.c:147
+#: src/uniq.c:183
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
+msgstr ""
+
+#: src/uniq.c:187
+msgid ""
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
+msgstr ""
+
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr ""
+
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
 msgstr ""
 
-#: src/uniq.c:151
+#: src/uniq.c:199
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
 "  -i, --ignore-case     ignore differences in case when comparing\n"
 "  -s, --skip-chars=N    avoid comparing the first N characters\n"
 "  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
 msgstr ""
 
-#: src/uniq.c:161
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr ""
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 msgid ""
 "\n"
 "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n"
 "characters.  Fields are skipped before chars.\n"
 msgstr ""
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 msgid ""
 "\n"
 "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n"
@@ -9643,24 +9726,34 @@ msgid ""
 "Also, comparisons honor the rules specified by 'LC_COLLATE'.\n"
 msgstr ""
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, c-format
 msgid "too many repeated lines"
 msgstr ""
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
 msgstr ""
 
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
 msgstr ""
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
 msgstr ""
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr ""
+
+#: src/uniq.c:652
+#, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr ""
+
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr ""
@@ -9678,11 +9771,6 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/unlink.c:86
-#, c-format
-msgid "cannot unlink %s"
-msgstr ""
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -9727,7 +9815,7 @@ msgstr[1] ""
 msgid ",  load average: %.2f"
 msgstr ""
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -9735,19 +9823,19 @@ msgid ""
 "in the run queue over the last 1, 5 and 15 minutes."
 msgstr ""
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
 "an uninterruptible sleep state also contribute to the load average.\n"
 msgstr ""
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr ""
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
diff --git a/po/cs.gmo b/po/cs.gmo
index 37d113e4..33901fd9 100644
--- a/po/cs.gmo
+++ b/po/cs.gmo
diff --git a/po/cs.po b/po/cs.po
index 716b4a32..4d4f07fb 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the coreutils package.
 # Vladimir Michl <Vladimir.Michl@seznam.cz>, 1996.
 # Petr Pisar <petr.pisar@atlas.cz>, 2006, 2007, 2008, 2009, 2010, 2011, 2012.
-# Petr Pisar <petr.pisar@atlas.cz>, 2013.
+# Petr Pisar <petr.pisar@atlas.cz>, 2013, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: coreutils 8.20-pre3\n"
+"Project-Id-Version: coreutils 8.23-pre1\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
-"PO-Revision-Date: 2013-02-12 21:40+0100\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
+"PO-Revision-Date: 2014-07-14 20:52+0200\n"
 "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
 "Language: cs\n"
@@ -37,76 +37,119 @@ msgstr "Platné argumenty jsou:"
 msgid "error closing file"
 msgstr "chyba při zavírání souboru"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "chyba při zápisu"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "zachování práv pro %s"
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "Neznámá chyba systému"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "běžný prázdný soubor"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "běžný soubor"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "adresář"
 
-#: lib/file-type.c:44
-msgid "block special file"
-msgstr "blokové zařízení"
-
-#: lib/file-type.c:47
-msgid "character special file"
-msgstr "znakové zařízení"
-
-#: lib/file-type.c:50
-msgid "fifo"
-msgstr "FIFO"
-
-#: lib/file-type.c:53
+#: lib/file-type.c:46
 msgid "symbolic link"
 msgstr "symbolický odkaz"
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "soket"
-
-#: lib/file-type.c:59
+#: lib/file-type.c:52
 msgid "message queue"
 msgstr "fronta zpráv"
 
-#: lib/file-type.c:62
+#: lib/file-type.c:55
 msgid "semaphore"
 msgstr "semafor"
 
-#: lib/file-type.c:65
+#: lib/file-type.c:58
 msgid "shared memory object"
 msgstr "objekt sdílené paměti"
 
-#: lib/file-type.c:68
+#: lib/file-type.c:61
 msgid "typed memory object"
 msgstr "typovaný paměťový objekt"
 
-#: lib/file-type.c:70
+#: lib/file-type.c:66
+msgid "block special file"
+msgstr "blokové zařízení"
+
+#: lib/file-type.c:69
+msgid "character special file"
+msgstr "znakové zařízení"
+
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr "souvislá data"
+
+#: lib/file-type.c:75
+msgid "fifo"
+msgstr "FIFO"
+
+#: lib/file-type.c:78
+msgid "door"
+msgstr "dveře"
+
+#: lib/file-type.c:81
+msgid "multiplexed block special file"
+msgstr "multiplexované blokové zařízení"
+
+#: lib/file-type.c:84
+msgid "multiplexed character special file"
+msgstr "multiplexované znakové zařízení"
+
+#: lib/file-type.c:87
+msgid "multiplexed file"
+msgstr "multiplexovaný soubor"
+
+#: lib/file-type.c:90
+msgid "named file"
+msgstr "pojmenovaný soubor"
+
+#: lib/file-type.c:93
+msgid "network special file"
+msgstr "síťové zařízení"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr "migrovaný soubor s daty"
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr "migrovaný soubor bez dat"
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr "port"
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "soket"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr "vybělení"
+
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "divný soubor"
 
@@ -241,18 +284,18 @@ msgstr "%s: přepína� „-W %s“ musí být zadán bez argumentu\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: přepína� „-W %s“ vyžaduje argument\n"
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr "práva %s nelze změnit"
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "adresář %s nelze vytvořit"
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr "paměť vy�erpána"
@@ -369,7 +412,7 @@ msgstr "Regulární výraz je příliš dlouhý"
 msgid "Unmatched ) or \\)"
 msgstr "Nepárová ) nebo \\)"
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 msgid "No previous regular expression"
 msgstr "Chybí předcházející regulární výraz"
 
@@ -394,7 +437,7 @@ msgstr "tento záchranný režim potla�íte volbou --no-preserve-root"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[aAyY]"
 
@@ -404,11 +447,11 @@ msgstr "^[aAyY]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, c-format
 msgid "setting permissions for %s"
 msgstr "nastavení práv pro %s"
@@ -550,18 +593,6 @@ msgstr "Výpadek napájení (SIGPWR)"
 msgid "Resource lost"
 msgstr "Prostředek byl ztracen (SIGLOST)"
 
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, c-format
-msgid "cannot create pipe"
-msgstr "nelze vytvořit rouru"
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, c-format
-msgid "%s subprocess failed"
-msgstr "podproces %s selhal"
-
 #: lib/strsignal.c:114
 #, c-format
 msgid "Real-time signal %d"
@@ -773,7 +804,7 @@ msgstr ""
 msgid "Report %s bugs to: %s\n"
 msgstr "Chyby distribuce %s oznamujte na adrese <%s> (anglicky).\n"
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Domovská stránka %s: <%s>\n"
@@ -783,31 +814,11 @@ msgstr "Domovská stránka %s: <%s>\n"
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr "Domovská stránka %s: <http://www.gnu.org/software/%s/>\n"
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr ""
 "Obecná nápověda, jak používat GNU software: <http://www.gnu.org/gethelp/>\n"
 
-#: lib/w32spawn.h:43
-#, c-format
-msgid "_open_osfhandle failed"
-msgstr "volání _open_osfhandle selhalo"
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr "deskriptor %d nelze obnovit: volání dup2 selhalo"
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr "podproces %s"
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr "podproces %s obdržel fatální signál %d"
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr "standardního vstupu"
@@ -829,7 +840,7 @@ msgstr "neznámého proudu"
 msgid "failed to reopen %s with mode %s"
 msgstr "znovu otevření %s v režimu %s se nezdařilo"
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr "porovnání řetězců selhalo"
@@ -895,7 +906,7 @@ msgstr ""
 "                        Zalamování lze zakázat hodnotou 0\n"
 "\n"
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -917,48 +928,47 @@ msgstr ""
 "řádku. Obsahuje-li proud zakódovaných dat i bajty nepatřící do abecedy,\n"
 "můžete se je pokusit přesko�it volbou --ignore-garbage.\n"
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "chyba při �tení"
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, c-format
 msgid "invalid input"
 msgstr "neplatný vstup"
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, c-format
 msgid "invalid wrap size: %s"
 msgstr "neplatná délka zalomení: %s"
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, c-format
 msgid "extra operand %s"
 msgstr "nadbyte�ný operand %s"
 
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, c-format
 msgid "closing standard input"
 msgstr "zavírám standardní vstup"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -986,11 +996,11 @@ msgstr ""
 #: src/basename.c:60
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
 "  -a, --multiple        zpracuje násobné argumenty, každý považuje za JMÉNO\n"
-"  -s, --suffix=PŘ�PONA  odstraní koncovou PŘ�PONU\n"
+"  -s, --suffix=PŘ�PONA  odstraní koncovou PŘ�PONU; obsahuje -a\n"
 "  -z, --zero            odděluje výstup pomocí znaku NUL namísto novým "
 "řádkem\n"
 
@@ -1011,32 +1021,31 @@ msgstr ""
 "  %s -s .h include/stdio.h  Vypíše „stdio“\n"
 "  %s -a any/str1 any/str2   Vypíše „str1“ následováno „str2“\n"
 
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, c-format
 msgid "missing operand"
 msgstr "chybí operand"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr "Torbjörn Granlund"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 msgid "Richard M. Stallman"
 msgstr "Richard M. Stallman"
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1094,7 +1103,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr "ioctl na „%s“ není možné vykonat"
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr "standardní výstup"
@@ -1111,14 +1120,14 @@ msgstr "Russell Coker"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 msgid "Jim Meyering"
 msgstr "Jim Meyering"
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, c-format
 msgid "failed to create security context: %s"
 msgstr "chyba při výrobě bezpe�nostního kontextu: %s"
@@ -1128,8 +1137,8 @@ msgstr "chyba při výrobě bezpe�nostního kontextu: %s"
 msgid "failed to set %s security context component to %s"
 msgstr "nastavení složky %s bezpe�nostního kontextu na %s se nezdařilo"
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, c-format
 msgid "failed to get security context of %s"
 msgstr "získat bezpe�nostní kontext %s se nezdařilo"
@@ -1139,18 +1148,18 @@ msgstr "získat bezpe�nostní kontext %s se nezdařilo"
 msgid "can't apply partial context to unlabeled file %s"
 msgstr "�áste�ný kontext na neozna�ený soubor %s nelze uplatnit"
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, c-format
 msgid "failed to change context of %s to %s"
 msgstr "změnit kontext %s na %s se nezdařilo"
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
 msgstr "nelze přistoupit k %s"
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, c-format
 msgid "cannot read directory %s"
 msgstr "adresář %s nelze �íst"
@@ -1160,13 +1169,14 @@ msgstr "adresář %s nelze �íst"
 msgid "changing security context of %s\n"
 msgstr "měním bezpe�nostní kontext %s\n"
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, c-format
 msgid "fts_read failed"
 msgstr "fts_read selhalo"
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, c-format
 msgid "fts_close failed"
 msgstr "fts_close selhalo"
@@ -1185,11 +1195,11 @@ msgstr ""
 
 #: src/chcon.c:357
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
-"Změní bezpe�nostní kontext každého SOUBORU na KONTEXT.\n"
+"Změní selinuxový bezpe�nostní kontext každého SOUBORU na KONTEXT.\n"
 "Při použití --reference změní bezpe�nostní kontext každého SOUBORU na\n"
 "kontext RSOUBORU.\n"
 
@@ -1219,7 +1229,7 @@ msgstr ""
 "  -l, --range=ROZSAH     nastaví rozsah ROZSAH v cílovém bezpe�nostním "
 "kontextu\n"
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
 "      --preserve-root    fail to operate recursively on '/'\n"
@@ -1273,36 +1283,37 @@ msgstr ""
 "  -P                     neprochází žádné symbolické odkazy (výchozí)\n"
 "\n"
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr "-R --dereference vyžaduje bu� -H, a nebo -L"
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr "-R -h vyžaduje -P"
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, c-format
 msgid "missing operand after %s"
 msgstr "po %s chybí operand"
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, c-format
 msgid "invalid context: %s"
 msgstr "neplatný kontext: %s"
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr "byly zadány odporující si požadavky na bezpe�nostní kontext"
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, c-format
 msgid "failed to get attributes of %s"
 msgstr "selhalo získání vlastností souboru %s"
@@ -1331,7 +1342,7 @@ msgstr ""
 "Při použití --reference změní skupinu každého SOUBORU na skupinu RSOUBORU.\n"
 "\n"
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
@@ -1371,47 +1382,47 @@ msgstr ""
 "  %s staff /u      Změní skupinu /u na „staff“.\n"
 "  %s -hR staff /u  Změní skupinu /u a všech podsouborů na „staff“.\n"
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
 msgstr "získání nových vlastností %s"
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr "symbolický odkaz %s ani soubor, na nějž se odkazuje, nebyl změněny\n"
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr "práva souboru %s změněna z %04lo (%s) na %04lo (%s)\n"
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr "práva souboru %s se nepodařilo změnit z %04lo (%s) na %04lo (%s)\n"
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr "práva souboru %s zůstala %04lo (%s)\n"
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr "nad slepým symbolickým odkazem %s nelze pracovat"
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, c-format
 msgid "changing permissions of %s"
 msgstr "práva %s nelze změnit"
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr "%s: nová práva jsou %s, a ne %s"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1422,7 +1433,7 @@ msgstr ""
 "  nebo:  %s [PŘEP�NAČ]… OSMIČKOV�_PR�VA SOUBOR…\n"
 "  nebo:  %s [PŘEP�NAČ]… --reference=RSOUBOR SOUBOR…\n"
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 msgid ""
 "Change the mode of each FILE to MODE.\n"
 "With --reference, change the mode of each FILE to that of RFILE.\n"
@@ -1432,17 +1443,17 @@ msgstr ""
 "Při použití --reference změní práva každého SOUBORU na práva RSOUBORU.\n"
 "\n"
 
-#: src/chmod.c:391
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
 "      --reference=RSOUBOR\n"
 "                         místo hodnoty PR�VA použije práva souboru RSOUBOR\n"
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr "  -R, --recursive        působí na soubory a adresáře rekurzivně\n"
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 msgid ""
 "\n"
 "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n"
@@ -1450,12 +1461,12 @@ msgstr ""
 "\n"
 "Každá PR�VA mají zápis „[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+“.\n"
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr "PR�VA a --reference nelze použít sou�asně"
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, c-format
 msgid "invalid mode: %s"
 msgstr "neplatná práva: %s"
@@ -1608,26 +1619,21 @@ msgstr ""
 "  %s -hR root /u    Změní vlastníka /u a všech podsouborů na „root“.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr "Roland McGrath"
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr "neplatná skupina %s"
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, c-format
 msgid "invalid group list %s"
 msgstr "neplatný seznam skupin %s"
 
-#: src/chroot.c:117
-#, c-format
-msgid "failed to set additional groups"
-msgstr "doplňkové skupiny nebylo možné nastavit"
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
@@ -1636,7 +1642,7 @@ msgstr ""
 "Použití: %s [PŘEP�NAČ] NOV�_ROOT [PŘ�KAZ [ARG]…]\n"
 "  nebo:  %s PŘEP�NAČ\n"
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
@@ -1644,7 +1650,7 @@ msgstr ""
 "Spustí PŘ�KAZ s kořenovým adresářem nastaveným na NOV�_ROOT.\n"
 "\n"
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
@@ -1654,7 +1660,7 @@ msgstr ""
 "                          který se použije\n"
 "  --groups=SEZNAM_SKUPIN  ur�uje doplňkové skupiny (zápis: S1,S2,…,Sn)\n"
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 msgid ""
 "\n"
 "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n"
@@ -1662,28 +1668,42 @@ msgstr ""
 "\n"
 "Není-li zadán žádný příkaz, spustí „${SHELL} -i“ (výchozí: „/bin/sh -i“).\n"
 
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, c-format
 msgid "cannot change root directory to %s"
 msgstr "nelze změnit kořenový adresář na %s"
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, c-format
 msgid "cannot chdir to root directory"
 msgstr "nelze změnit pracovní adresář na kořenový"
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr "pro neznámé UID nebyla zadána žádná skupina: %d"
+
+#: src/chroot.c:383
+#, c-format
+msgid "failed to get supplemental groups"
+msgstr "doplňkové skupiny nelze získat"
+
+#: src/chroot.c:395
+#, c-format
+msgid "failed to %s supplemental groups"
+msgstr "doplňkové skupinu(y) nelze %s"
+
+#: src/chroot.c:402
 #, c-format
 msgid "failed to set group-ID"
 msgstr "selhalo nastavení ID skupiny"
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, c-format
 msgid "failed to set user-ID"
 msgstr "selhalo nastavení ID uživatele"
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, c-format
 msgid "failed to run command %s"
 msgstr "spuštění příkazu %s selhalo"
@@ -1715,7 +1735,7 @@ msgstr ""
 "Vypíše CRC kontrolní sou�et a po�et bajtů v každém SOUBORU.\n"
 "\n"
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr "Použití: %s [PŘEP�NAČ]… SOUBOR1 SOUBOR2\n"
@@ -1803,294 +1823,330 @@ msgstr "zadáno více oddělova�ů"
 msgid "empty %s not allowed"
 msgstr "prázdný %s nedovolen"
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr "chyba při �tení %s"
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, c-format
 msgid "cannot lseek %s"
 msgstr "nelze nastavit pozici pro %s"
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr "chyba při zápisu %s"
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, c-format
 msgid "%s: failed to get extents info"
 msgstr "%s: selhalo získání údajů o rozsazích"
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, c-format
 msgid "%s: write failed"
 msgstr "%s: zápis se nezdařil"
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, c-format
 msgid "failed to extend %s"
 msgstr "rozšíření %s selhalo"
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, c-format
 msgid "clearing permissions for %s"
 msgstr "odebírám práva k %s"
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "selhalo zachování vlastnictví souboru %s"
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
 msgstr "selhalo vyhledání souboru %s"
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, c-format
 msgid "failed to preserve authorship for %s"
 msgstr "selhalo zachování autorství souboru %s"
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
+#, c-format
+msgid "failed to set default file creation context to %s"
+msgstr "selhalo nastavení výchozího kontextu pro vytvářené soubory na %s"
+
+#: src/copy.c:820
+#, c-format
+msgid "failed to set default file creation context for %s"
+msgstr "selhalo nastavení výchozího kontextu pro vytvářené soubory v %s"
+
+#: src/copy.c:846
+#, c-format
+msgid "failed to set the security context of %s"
+msgstr "nastavení bezpe�nostního kontextu %s se nezdařilo"
+
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
 msgid "cannot open %s for reading"
 msgstr "%s nelze otevřít pro �tení"
 
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, c-format
 msgid "cannot fstat %s"
 msgstr "nelze získat informace o souboru %s z deskriptoru"
 
-#: src/copy.c:820
+#: src/copy.c:935
 #, c-format
 msgid "skipping file %s, as it was replaced while being copied"
 msgstr "přeskakuji soubor %s, protože byl nahrazen během kopírování"
 
-#: src/copy.c:850
-#, c-format
-msgid "failed to get file system create context"
-msgstr "získat kontext pro vytváření na souborovém systému se nezdařilo"
-
-#: src/copy.c:864
-#, c-format
-msgid "failed to set the security context of %s to %s"
-msgstr "nastavení bezpe�nostního kontextu %s na %s se nezdařilo"
-
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
 msgid "cannot remove %s"
 msgstr "nelze odstranit %s"
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
 msgstr "smazáno %s\n"
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr "nezapisuji skrze slepý symbolický odkaz %s"
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, c-format
 msgid "cannot create regular file %s"
 msgstr "nelze vytvořit oby�ejný soubor %s"
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, c-format
 msgid "failed to clone %s from %s"
 msgstr "klonování %s z %s selhalo"
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr "zachování �asů souboru %s"
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
 #, c-format
 msgid "failed to close %s"
 msgstr "zavření %s selhalo"
 
-#: src/copy.c:1471
+#: src/copy.c:1580
+#, c-format
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
+msgstr "%s: nahradit %s přebitím přístupových práv %04lo (%s)? "
+
+#: src/copy.c:1581
 #, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
-msgstr "%s: přepsat %s přebitím přístupových práv %04lo (%s)? "
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr "%s: nezapsatelný %s (práva %04lo, %s); zkusit znovu? "
 
-#: src/copy.c:1478
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
 msgstr "%s: přepsat %s? "
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr " (záloha: %s)"
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr "obnova výchozího kontextu pro vytvářené soubory selhala"
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, c-format
 msgid "cannot create hard link %s to %s"
 msgstr "nelze vytvořit pevný odkaz %s na %s"
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, c-format
 msgid "cannot stat %s"
 msgstr "nelze získat informace o %s"
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, c-format
 msgid "omitting directory %s"
 msgstr "vynechávám adresář %s"
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr "varování: zdrojový soubor %s byl zadán více krát"
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
 msgstr "%s a %s jsou jeden a tentýž soubor"
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr "ne-adresář %s nelze přepsat adresářem %s"
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr "právě vytvořený %s nebude přepsán %s"
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr "adresář %s nelze přepsat ne-adresářem"
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr "adresář nelze přesunout do ne-adresáře: %s → %s"
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr "vytvoření zálohy souboru %s může zni�it zdroj; `%s' nepřejmenován"
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr "vytvoření zálohy souboru %s může zni�it zdroj; %s nekopírován"
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
 msgstr "nelze vytvořit zálohu %s"
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr "nebudu kopírovat %s skrze právě vytvořený symbolický odkaz %s"
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr "nelze kopírovat adresář %s na sebe %s"
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr "pevný odkaz %s na adresář %s nebude vytvořen"
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr "nelze přesunout %s do podadresáře sebe sama (%s)"
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, c-format
 msgid "cannot move %s to %s"
 msgstr "nelze přesunout %s do %s"
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr "přesun mezi zařízeními selhal: %s na %s; cíl nelze odstranit"
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, c-format
-msgid "failed to set default file creation context to %s"
-msgstr "selhalo nastavení výchozího kontextu pro vytvářené soubory na %s"
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr "%s: zacyklené symbolické odkazy nelze kopírovat"
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr "%s: relativní symbolický odkaz lze vytvořit pouze v aktuálním adresáři"
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr "nelze vytvořit symbolický odkaz %s na %s"
 
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, c-format
 msgid "cannot create fifo %s"
 msgstr "nelze vytvořit rouru %s"
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, c-format
 msgid "cannot create special file %s"
 msgstr "nelze vytvořit zvláštní soubor %s"
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, c-format
 msgid "cannot read symbolic link %s"
 msgstr "symbolický odkaz %s nelze pře�íst"
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, c-format
 msgid "cannot create symbolic link %s"
 msgstr "nelze vytvořit symbolický odkaz %s"
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
 msgstr "%s: neznámý typ souboru"
 
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, c-format
 msgid "cannot un-backup %s"
 msgstr "%s: nelze obnovit ze zálohy"
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr "%s → %s (obnoven ze zálohy)\n"
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr "Alex Deymo"
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr "Použití: %s --coreutils-prog=N�ZEV_PROGRAMU [PARAMETRY]…\n"
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr "Vykoná vestavěný program N�ZEV_PROGRAMU se zadanými ARGUMENTY.\n"
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+"\n"
+"Použití: „%s --coreutils-prog=N�ZEV_PROGRAMU --help“ pro nápovědu "
+"k jednotlivému programu.\n"
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, c-format
+msgid "unknown program %s"
+msgstr "neznámý program %s"
+
+#: src/cp.c:157 src/mv.c:288
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -2101,11 +2157,11 @@ msgstr ""
 "  nebo:  %s [PŘEP�NAČ]… ZDROJ… ADRES�Ř\n"
 "  nebo:  %s [PŘEP�NAČ]… -t ADRES�Ř ZDROJ…\n"
 
-#: src/cp.c:162
+#: src/cp.c:163
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
 msgstr "Kopíruje ZDROJ do C�LE nebo více ZDROJŮ do ADRES�ŘE.\n"
 
-#: src/cp.c:168
+#: src/cp.c:169
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
 "      --attributes-only        don't copy the file data, just the "
@@ -2128,7 +2184,7 @@ msgstr ""
 "  -d,                          stejné jako --no-dereference --"
 "preserve=links\n"
 
-#: src/cp.c:177
+#: src/cp.c:178
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
 "                                 opened, remove it and try again (this "
@@ -2150,7 +2206,7 @@ msgstr ""
 "řádky\n"
 "                               ve ZDROJI\n"
 
-#: src/cp.c:186
+#: src/cp.c:187
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
 "  -L, --dereference            always follow symbolic links in SOURCE\n"
@@ -2158,7 +2214,7 @@ msgstr ""
 "  -l, --link                   místo kopírování tvoří pevné odkazy\n"
 "  -L, --dereference            vždy sleduje symbolické odkazy ve ZDROJI\n"
 
-#: src/cp.c:190
+#: src/cp.c:191
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
 "                                 a previous -i option)\n"
@@ -2169,7 +2225,7 @@ msgstr ""
 "  -P, --no-dereference         nikdy nenásleduje symbolické odkazy ve "
 "ZDROJI\n"
 
-#: src/cp.c:195
+#: src/cp.c:196
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
 "      --preserve[=ATTR_LIST]   preserve the specified attributes (default:\n"
@@ -2188,7 +2244,7 @@ msgstr ""
 "                               context [kontext], links [odkazy], xattr\n"
 "                               [rozšířené atributy], all [vše]\n"
 
-#: src/cp.c:203
+#: src/cp.c:204
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                use full source file name under DIRECTORY\n"
@@ -2197,7 +2253,7 @@ msgstr ""
 "                               nezachovává ur�ené atributy\n"
 "      --parents                přidává zdrojovou cestu do cílového ADRES�ŘE\n"
 
-#: src/cp.c:207
+#: src/cp.c:208
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
 "      --reflink[=WHEN]         control clone/CoW copies. See below\n"
@@ -2211,7 +2267,7 @@ msgstr ""
 "jej\n"
 "                               pokusí otevřít (opak --force)\n"
 
-#: src/cp.c:213
+#: src/cp.c:214
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
 "      --strip-trailing-slashes  remove any trailing slashes from each "
@@ -2222,7 +2278,7 @@ msgstr ""
 "      --strip-trailing-slashes odstraňuje lomítka na konci názvů všech "
 "ZDROJÅ®\n"
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -2236,7 +2292,7 @@ msgstr ""
 "                               všechny ZDROJE kopíruje do ADRES�ŘE\n"
 "  -T, --no-target-directory    C�L považuje za oby�ejný soubor\n"
 
-#: src/cp.c:224
+#: src/cp.c:225
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
 "                                 than the destination file or when the\n"
@@ -2251,7 +2307,21 @@ msgstr ""
 "příkazu\n"
 "  -x, --one-file-system        zůstane v jednom souborovém systému\n"
 
-#: src/cp.c:233
+#: src/cp.c:232
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+"  -Z                           nastaví selinuxový bezpe�ností kontext "
+"cílového\n"
+"                               souboru na výchozí hodnotu\n"
+"      --context[=KONTEXT]      jako -Z nebo je-li KONTEXT zadán, nastaví\n"
+"                               selinuxový nebo smackový bezpe�ností kontext\n"
+"                               na KONTEXT\n"
+
+#: src/cp.c:240
 msgid ""
 "\n"
 "By default, sparse SOURCE files are detected by a crude heuristic and the\n"
@@ -2280,7 +2350,7 @@ msgstr ""
 "Avšak je-li uvedeno --reflink=auto, kopírování se v případě chyby vrátí\n"
 "k standardnímu způsobu vytváření kopií.\n"
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 msgid ""
 "\n"
 "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n"
@@ -2296,7 +2366,7 @@ msgstr ""
 "prostředí VERSION_CONTROL. Hodnoty mohou být:\n"
 "\n"
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2310,7 +2380,7 @@ msgstr ""
 "                  jinak jednoduché\n"
 "  simple, never   jednoduché záložní kopie\n"
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2323,91 +2393,101 @@ msgstr ""
 "a C�L jsou stejného jména jednoho oby�ejného souboru. Pak cp kopii ZDROJE\n"
 "vytvoří.\n"
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, c-format
 msgid "failed to preserve times for %s"
 msgstr "selhalo zachování �asů souboru %s"
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, c-format
 msgid "failed to preserve permissions for %s"
 msgstr "selhalo zachování práv souboru %s"
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, c-format
 msgid "cannot make directory %s"
 msgstr "adresář %s nelze vytvořit"
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr "%s existuje, ale není adresářem"
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
 #, c-format
 msgid "failed to access %s"
 msgstr "k %s nelze přistoupit"
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, c-format
 msgid "missing file operand"
 msgstr "chybí název souboru"
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, c-format
 msgid "missing destination file operand after %s"
 msgstr "za %s chybí název cílového souboru"
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr ""
 "--target-directory (-t) a --no-target-directory (-T) se vzájemně vylu�ují"
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, c-format
 msgid "target %s is not a directory"
 msgstr "cíl %s není adresářem"
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr "za použití --parents musí být cílem adresář"
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, c-format
 msgid "multiple target directories specified"
 msgstr "zadáno více cílových adresářů"
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr "pozor: ignoruje se --context, je třeba jádro s podporou SELinuxu"
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr "symbolický a pevný odkaz nelze vytvořit zároveň"
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr "přepína�e --backup --no-clobber se vzájemně vylu�ují"
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr "--reflink lze požít jen s --sparse=auto"
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr "typ zálohy"
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, c-format
+msgid "cannot set target context and preserve it"
+msgstr "kontext nelze zároveň nastavit a zachovat"
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr "bez podpory SELinuxu v jádře nelze zachovat bezpe�nostní kontext"
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr ""
@@ -2415,131 +2495,131 @@ msgstr ""
 "atributů"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr "Stuart Kemp"
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr "vstup se ztratil"
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr "%s: �íslo řádku je mimo rozsah"
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, c-format
 msgid "%s: %s: line number out of range"
 msgstr "%s: %s: �íslo řádku je mimo rozsah"
 
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, c-format
 msgid " on repetition %s\n"
 msgstr " v %s. opakování\n"
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, c-format
 msgid "%s: %s: match not found"
 msgstr "%s: %s: nenalezeno"
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr "chyba při vyhledávání pomocí regulárního výrazu"
 
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, c-format
 msgid "write error for %s"
 msgstr "chyba při zápisu do %s"
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, c-format
 msgid "%s: integer expected after delimiter"
 msgstr "%s: po oddělova�i je o�ekáváno celé �íslo"
 
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr "%s: „}' je požadována v po�ítadle opakování"
 
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr "%s}: mezi „{“ a „}“ musí být celé �íslo"
 
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr "%s: postrádán koncový oddělova� „%c“"
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr "%s: chybný regulární výraz: %s"
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr "%s: chybný vzorek"
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr "%s: �íslo řádku musí být větší než nula"
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr "�íslo řádku %s je menší než �íslo předcházejícího řádku, %s"
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr "varování: �íslo řádku %s je stejné s �íslem předcházejícího řádku"
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr "v parametru přepína�e chybí ur�ení typu konverze"
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr "chybně zadaný typ konverze v parametru přepína�e: %c"
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr "chybně zadaný typ konverze v parametru přepína�e: \\%.3o"
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr "neplatné příznaky v zadání konverze: %%%c%c"
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr "příliš mnoho typů konverze %% v parametru přepína�e"
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr "v parametru přepína�e chybí zadání typu konverze pomocí %%"
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr "%s: chybné �íslo"
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr "Použití: %s [PŘEP�NAČ]… SOUBOR VZOREK…\n"
 
-#: src/csplit.c:1455
+#: src/csplit.c:1483
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
 "and output byte counts of each piece to standard output.\n"
@@ -2547,7 +2627,7 @@ msgstr ""
 "Rozděluje SOUBOR v místech VZORKU(Ů) do souborů „xx00“, „xx01“, …\n"
 "a vypisuje velikosti každého výstupního souboru na standardní výstup.\n"
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2559,7 +2639,11 @@ msgstr ""
 "  -f, --prefix=PŘEDPONA      použije PŘEDPONY místo „xx“\n"
 "  -k, --keep-files           nemaže výstupní soubory při chybách\n"
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr "  -m, --suppress-matched     potla�í řádky odpovídající VZORKU\n"
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
@@ -2569,7 +2653,7 @@ msgstr ""
 "  -s, --quiet, --silent      nevypisuje velikosti výstupních souborů\n"
 "  -z, --elide-empty-files    smaže prázdné výstupní soubory\n"
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
@@ -2577,7 +2661,7 @@ msgstr ""
 "\n"
 "Jestliže SOUBOR je „-“, bude �ten standardní vstup. Každý VZOREK může být:\n"
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 msgid ""
 "\n"
 "  INTEGER            copy up to but not including specified line number\n"
@@ -2606,20 +2690,16 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr "David M. Ihnat"
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr "položky a pozice se po�ítají od 1"
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr "Použití: %s PŘEP�NAČ… [SOUBOR]…\n"
 
-#: src/cut.c:193
+#: src/cut.c:176
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr "Vypíše vybrané �ásti řádků z každého SOUBORU na standardní výstup.\n"
 
-#: src/cut.c:199
+#: src/cut.c:182
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
 "  -c, --characters=LIST   select only these characters\n"
@@ -2630,7 +2710,7 @@ msgstr ""
 "  -d, --delimiter=ODDĚLOVAČ jako oddělova� použije ODDĚLOVAČ (místo "
 "tabulátoru)\n"
 
-#: src/cut.c:204
+#: src/cut.c:187
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
 "                            that contains no delimiter character, unless\n"
@@ -2643,7 +2723,7 @@ msgstr ""
 "                            není zadáno -s\n"
 "   -n                       (ignorováno)\n"
 
-#: src/cut.c:210
+#: src/cut.c:193
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
 "                            or fields\n"
@@ -2651,7 +2731,7 @@ msgstr ""
 "      --complement        použije doplněk zadaných bajtů, znaků nebo "
 "položek\n"
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
@@ -2664,7 +2744,7 @@ msgstr ""
 "vstupní\n"
 "                            oddělova�.\n"
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2677,7 +2757,7 @@ msgstr ""
 "vstupu jsou vypsány ve stejném pořadí, v jakém byly �teny, a jsou vypsány\n"
 "právě jednou.\n"
 
-#: src/cut.c:227
+#: src/cut.c:210
 msgid ""
 "Each range is one of:\n"
 "\n"
@@ -2697,46 +2777,50 @@ msgstr ""
 "\n"
 "Jestliže SOUBOR není zadán, nebo je „-“, bude �ten standardní vstup.\n"
 
-#: src/cut.c:367 src/cut.c:493
+#: src/cut.c:300 src/cut.c:394
 msgid "invalid byte, character or field list"
 msgstr "chybný seznam bajtů, znaků nebo položek"
 
-#: src/cut.c:387
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr "položky a pozice se po�ítají od 1"
+
+#: src/cut.c:320
 msgid "invalid range with no endpoint: -"
 msgstr "neplatný rozsah bez konce: -"
 
-#: src/cut.c:403
+#: src/cut.c:334
 msgid "invalid decreasing range"
 msgstr "neplatný klesající rozsah"
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, c-format
 msgid "byte offset %s is too large"
 msgstr "posun bajtů %s je příliš velký"
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, c-format
 msgid "field number %s is too large"
 msgstr "�íslo položky %s je příliš velké"
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr "pouze jeden typ seznamu může být zadán"
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr "oddělova� musí být jediný znak"
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr "musíte zadat seznam bajtů, znaků nebo položek"
 
-#: src/cut.c:850
+#: src/cut.c:790
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr "oddělova� vstupu může být zadán pouze při práci s položkami"
 
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
@@ -2744,11 +2828,11 @@ msgstr ""
 "potla�ení řádků neobsahujících oddělova�, má význam pouze\n"
 "při použití přepína�e -f"
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr "chybí seznam položek"
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr "chybí seznam pozicí"
 
@@ -2802,7 +2886,7 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 "      --rfc-3339=PŘESNOST  vypíše datum a �as podle RFC 3339.\n"
 "                           PŘESNOST musí být „date“, „seconds“, nebo „ns“ a\n"
@@ -3023,10 +3107,10 @@ msgstr ""
 "Zobrazí místní �as pro 9 hodin ráno příští pátek na západním pobřeží USA\n"
 "  $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n"
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr "standardní vstup"
@@ -3067,7 +3151,7 @@ msgstr ""
 msgid "cannot set date"
 msgstr "datum nelze nastavit"
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, c-format
 msgid "time %s is out of range"
 msgstr "�as %s je mimo rozsah"
@@ -3078,7 +3162,7 @@ msgstr "�as %s je mimo rozsah"
 msgid "Paul Rubin"
 msgstr "Paul Rubin"
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
@@ -3087,7 +3171,7 @@ msgstr ""
 "Použití: %s [OPERAND]…\n"
 "   nebo: %s PŘEP�NAČ\n"
 
-#: src/dd.c:526
+#: src/dd.c:532
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
 "\n"
@@ -3106,7 +3190,7 @@ msgstr ""
 "  count=N         zkopíruje pouze N vstupních bloků\n"
 "  ibs=BAJTŮ       �te BAJTŮ bajtů najednou (implicitně: 512)\n"
 
-#: src/dd.c:535
+#: src/dd.c:541
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
 "  iflag=FLAGS     read as per the comma separated symbol list\n"
@@ -3131,7 +3215,7 @@ msgstr ""
 "                  „noxfer“ potla�í statistické informace o přenosu dat,\n"
 "                  „none“ potla�í vše\n"
 
-#: src/dd.c:546
+#: src/dd.c:552
 msgid ""
 "\n"
 "N and BYTES may be followed by the following multiplicative suffixes:\n"
@@ -3149,7 +3233,7 @@ msgstr ""
 "Každá díl�í konverze v seznamu KONVERZ� může být:\n"
 "\n"
 
-#: src/dd.c:555
+#: src/dd.c:561
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
 "  ebcdic    from ASCII to EBCDIC\n"
@@ -3179,7 +3263,7 @@ msgstr ""
 "  sync       doplní každý vstupní blok nulovými bajty do velikosti „ibs“.\n"
 "             Za sou�asného použití block nebo unblock doplňuje mezerami.\n"
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -3195,7 +3279,7 @@ msgstr ""
 "  fdatasync  před ukon�ením vynutí fyzický zápis dat\n"
 "  fsync      podobně, ale zapíše i metadata\n"
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -3209,76 +3293,76 @@ msgstr ""
 "  append     připisuje na konec (má smysl pouze pro výstup;\n"
 "             doporu�eno s conv=notrunc)\n"
 
-#: src/dd.c:583
+#: src/dd.c:589
 msgid "  cio       use concurrent I/O for data\n"
 msgstr "  cio       použije souběžné I/O pro práci s daty\n"
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr ""
 "  direct     použije přímé vstupně-výstupní operace (I/O) pro práci s daty\n"
 
-#: src/dd.c:587
+#: src/dd.c:593
 msgid "  directory  fail unless a directory\n"
 msgstr "  directory  selže, pokud se nejedná o adresář\n"
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr "  dsync      použije synchronní I/O pro práci s daty\n"
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr "  sync       podobně, ale také pro metadata\n"
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr "  fullblock  sdružuje vstup do celých bloků (pouze iflag)\n"
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr "  nonblock   použije neblokující I/O\n"
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr "  noaime     neaktualizuje �as posledního přístupu k souboru\n"
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr "  nocache    zahodí nakešovaná data\n"
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr "  noctty     nepovažuje soubor za řídící terminál\n"
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr "  nofollow   nesleduje symbolické odkazy\n"
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr "  nolinks    selže, pokud na soubor vede více pevných odkazů\n"
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr "  binary     použije binární I/O pro práci s daty\n"
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr "  text       použije textové I/O pro práci s daty\n"
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr "  count_bytes  považuje „count=N“ za po�et bajtů (pouze iflag)\n"
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr "  skip_bytes  považuje „skip=N„ za po�et bajtů (pouze iflag)\n"
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr "  seek_bytes  považuje „seek=N“ za po�et bajtů (pouze oflag)\n"
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, c-format
 msgid ""
 "\n"
@@ -3296,36 +3380,47 @@ msgid ""
 msgstr ""
 "\n"
 "Zaslání signálu %s běžícímu procesu „dd“ způsobí vypsání statistických\n"
-"informací o I/O operacích na standardní chybový výstup. Pak se obnoví\n"
-"kopírování.\n"
+"informací o vstupně-výstupních operacích na standardní chybový výstup.\n"
+"Pak se obnoví kopírování.\n"
 "\n"
 "  $ dd if=/dev/zero of=/dev/null& pid=$!\n"
 "  $ kill -%s $pid; sleep 1; kill $pid\n"
-"  18335302+0 vstoupivších záznamů\n"
-"  18335302+0 vystoupivších záznamů\n"
+"  18335302+0 záznamů pře�teno\n"
+"  18335302+0 záznamů zapsáno\n"
 "  9 387 674 624 bajtů (9,4 GB) zkopírováno, 34,6279 s, 271 MB/s\n"
 "\n"
 "Volby jsou:\n"
 "\n"
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr "paměť vy�erpána vstupním bufferem o velikosti %'zu bajtů (%s)"
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr "paměť vy�erpána výstupním bufferem o velikosti %'zu bajtů (%s)"
+
+# TODO: Pluralize
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
 "%<PRIuMAX>+%<PRIuMAX> records out\n"
 msgstr ""
-"%<PRIuMAX>+%<PRIuMAX> vstoupivších záznamů\n"
-"%<PRIuMAX>+%<PRIuMAX> vystoupivších záznamů\n"
+"%<PRIuMAX>+%<PRIuMAX> záznamů pře�teno\n"
+"%<PRIuMAX>+%<PRIuMAX> záznamů zapsáno\n"
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
-msgstr[0] "%<PRIuMAX> zkrácený záznam\n"
-msgstr[1] "%<PRIuMAX> zkrácené záznamy\n"
-msgstr[2] "%<PRIuMAX> zkrácených záznamů\n"
+msgstr[0] "%<PRIuMAX> záznam zkrácen\n"
+msgstr[1] "%<PRIuMAX> záznamy zkráceny\n"
+msgstr[2] "%<PRIuMAX> záznamů zkráceno\n"
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
@@ -3333,7 +3428,7 @@ msgstr[0] "%<PRIuMAX> bajt (%s) zkopírován"
 msgstr[1] "%<PRIuMAX> bajty (%s) zkopírovány"
 msgstr[2] "%'<PRIuMAX> bajtů (%s) zkopírováno"
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr "nekone�no B"
 
@@ -3347,83 +3442,83 @@ msgstr "nekone�no B"
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
 msgstr ", %'g s, %s/s\n"
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, c-format
 msgid "closing input file %s"
 msgstr "zavírám vstupní soubor %s"
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr "zavírám výstupní soubor %s"
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr "vypnutí O_DIRECT selhalo: %s"
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, c-format
 msgid "writing to %s"
 msgstr "zapisuji do %s"
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, c-format
 msgid "unrecognized operand %s"
 msgstr "neznámý operand %s"
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 msgid "invalid conversion"
 msgstr "neplatná konverze"
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 msgid "invalid input flag"
 msgstr "neplatný příznak vstupu"
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 msgid "invalid output flag"
 msgstr "neplatný příznak výstupu"
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 msgid "invalid status flag"
 msgstr "neplatná hodnota operandu status"
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, c-format
 msgid "invalid number %s"
 msgstr "neplatné �íslo %s"
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr "tyto konverze nelze kombinovat: ascii, ebcdic, ibm"
 
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, c-format
 msgid "cannot combine block and unblock"
 msgstr "block a unblock nelze použít sou�asně"
 
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, c-format
 msgid "cannot combine lcase and ucase"
 msgstr "lcase a ucase nelze použít sou�asně"
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, c-format
 msgid "cannot combine excl and nocreat"
 msgstr "excl a nocreat nelze použít sou�asně"
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, c-format
 msgid "cannot combine direct and nocache"
 msgstr "direct a nocache nelze použít sou�asně"
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
@@ -3432,72 +3527,62 @@ msgstr ""
 "varování: obcházím chybu služby jádra lseek() nad souborem %s\n"
 "  typu mt_type=0x%0lx – seznam typů naleznete v <sys/mtio.h>"
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, c-format
 msgid "%s: cannot skip"
 msgstr "%s: vstup nelze převíjet"
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, c-format
 msgid "%s: cannot seek"
 msgstr "%s: výstup nelze převíjet"
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr "během �tení ze souboru %s přetekl offset"
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr "varování: chybný offset souboru poté, co selhalo �tení"
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr "stejně se nedokážu vyrovnat s chybou v jádře"
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, c-format
 msgid "setting flags for %s"
 msgstr "nastavuji příznaky pro %s"
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr "paměť vy�erpána vstupním bufferem o velikosti %'zu bajtů (%s)"
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr "paměť vy�erpána výstupním bufferem o velikosti %'zu bajtů (%s)"
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr "%s: nelze se přesunout na zadanou pozici ve vstupu"
 
-#: src/dd.c:2133
+#: src/dd.c:2172
 #, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
 msgstr "zkrácení výstupního souboru %2$s na %1$<PRIdMAX> bajtů selhalo"
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr "fdatasync na %s selhalo"
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
 msgstr "fsync na %s selhalo"
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, c-format
 msgid "failed to open %s"
 msgstr "otevření %s selhalo"
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
@@ -3506,96 +3591,105 @@ msgstr ""
 "příliš velký offset: nelze zkrátit na délku seek=%<PRIuMAX> (%lu-bajtových) "
 "bloků"
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr "zkrácení výstupního souboru %2$s na %1$<PRIuMAX> bajtů selhalo"
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, c-format
 msgid "failed to discard cache for: %s"
 msgstr "nepodařilo se zahodit keš pro: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr "Paul Eggert"
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr "Souborový systém"
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr "Typ"
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr "bloků"
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr "Užito"
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr "Volné"
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr "Uži%"
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr "I-uzlů"
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr "IUžito"
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr "IVolno"
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr "IUži%"
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr "Připojeno do"
 
-#: src/df.c:383
+#: src/df.c:207
+msgid "File"
+msgstr "Soubor"
+
+#: src/df.c:387
 #, c-format
-msgid "option --output: field '%s' unknown"
-msgstr "přepína� --output: neznámá položka „%s“"
+msgid "option --output: field %s unknown"
+msgstr "přepína� --output: neznámá položka %s"
 
-#: src/df.c:390
+#: src/df.c:394
 #, c-format
-msgid "option --output: field '%s' used more than once"
-msgstr "přepína� --output: položka „%s“ byla použita více krát"
+msgid "option --output: field %s used more than once"
+msgstr "přepína� --output: položka %s byla použita více krát"
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr "Velikost"
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr "Volno"
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr "Kapacita"
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
 msgstr "%s %s"
 
-#: src/df.c:1210
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr "nelze přistoupit k %s: bod připojení je překryt jiným zařízením"
+
+#: src/df.c:1384
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
 "or all file systems by default.\n"
@@ -3603,30 +3697,30 @@ msgstr ""
 "Vypíše informace o souborových systémech, ve kterých každý SOUBOR leží,\n"
 "nebo implicitně o všech souborových systémech.\n"
 
-#: src/df.c:1217
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
 "  -a, --all             také pseudosouborové systémy\n"
 "  -B  --block-size=VELIKOST\n"
-"                        velikosti vypisuje v násobcích VELIKOSTI. Např. „-"
+"                        velikosti vypisuje v násobcích VELIKOSTI, např. „-"
 "BM“\n"
 "                        vypisuje velikosti v jednotkách po 1 048 576 "
-"bajtech.\n"
-"                        Popis formátu VELIKOSTI naleznete níže.\n"
+"bajtech;\n"
+"                        popis formátu VELIKOSTI naleznete níže.\n"
 "      --total           vypíše celkový sou�et\n"
-"  -h, --human-readable  velikosti ve formátu �itelném pro �lověka\n"
-"                        (napÅ™. 1K 234M 2G)\n"
-"  -H, --si              podobně jako předchozí, ale násobky 1000, ne 1024\n"
+"  -h, --human-readable  vypisuje velikosti v mocninách 1024 (např. 1023M)\n"
+"  -H, --si              vypisuje velikosti v mocninách 1000 (např. 1,1G)\n"
 
-#: src/df.c:1227
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -3639,7 +3733,7 @@ msgstr ""
 "  -l, --local           omezení výpisu na lokální souborové systémy\n"
 "      --no-sync         nevolá „sync“ před získáním informací (implicitní)\n"
 
-#: src/df.c:1234
+#: src/df.c:1409
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
 "                               or print all fields if FIELD_LIST is "
@@ -3662,12 +3756,12 @@ msgstr ""
 "                        ve výstupu nebudou souborové systémy typu TYP\n"
 "  -v                    (ignorováno)\n"
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
 "\n"
 "SEZNAM_POLOŽEK je �árkou oddělený seznam sloupců. Platné názvy položek "
@@ -3676,35 +3770,28 @@ msgstr ""
 "iuzlů),\n"
 "„iused“ (použitých iuzlů), „iavail“ (volných iuzlů), „ipcent“ (procento\n"
 "iuzlů), „size“ (velikost), „used“ (použité místo), „avail“ (volné místo),\n"
-"„pcent“ (procento místa) a „target“ (cíl). Podrobnosti v info stránce.\n"
+"„pcent“ (procento místa), „file“ (soubor) a „target“ (cíl). Podrobnosti\n"
+"v info stránce.\n"
 
-#: src/df.c:1285
+#: src/df.c:1460
 #, c-format
 msgid "options %s and %s are mutually exclusive"
 msgstr "přepína�e %s a %s se vzájemně vylu�ují"
 
-#: src/df.c:1335
-msgid "warning: "
-msgstr "pozor: "
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr "dlouhý přepína� „--megabytes“ je zastaralý a brzy bude odebrán"
-
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr "souborový systém typu „%s“ je zároveň vybrán a vylou�en"
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr "Pozor: "
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 msgid "cannot read table of mounted file systems"
 msgstr "tabulku připojených souborových systémů nelze pře�íst"
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr "žádný souborový systém nebyl zpracován"
@@ -3714,7 +3801,7 @@ msgstr "žádný souborový systém nebyl zpracován"
 msgid "H. Peter Anvin"
 msgstr "Hans Peter Anvin"
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr "Použití: %s [PŘEP�NAČ]… [SOUBOR]…\n"
@@ -3802,9 +3889,10 @@ msgstr ""
 "\n"
 
 #: src/dirname.c:59
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
 msgstr ""
-"  -z, --zero     odděluje výstup nulovým bajtem místo znakem nového řádku\n"
+"-z, --zero       každý výstupní řádek zakon�í znakem NUL namísto znakem\n"
+"                 nového řádku\n"
 
 #: src/dirname.c:64
 #, c-format
@@ -3821,7 +3909,7 @@ msgstr ""
 "  %s adr1/řet adr2/řet  Vypíše „adr1“ následovaný „adr2“\n"
 "  %s stdio.h            Vypíše „.“.\n"
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -3830,15 +3918,14 @@ msgstr ""
 "Použití: %s [PŘEP�NAČ]… [SOUBOR]…\n"
 "  nebo:  %s [PŘEP�NAČ]… --files0-from=S\n"
 
-#: src/du.c:274
+#: src/du.c:285
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr ""
 "S�ítá diskový prostor zabraný každým SOUBOREM, pro adresáře rekurzivně.\n"
 
-#: src/du.c:280
+#: src/du.c:291
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3846,7 +3933,7 @@ msgid ""
 "                          larger due to holes in ('sparse') files, internal\n"
 "                          fragmentation, indirect blocks, and the like\n"
 msgstr ""
-"  -0, --null            řádky výstupu zakon�í nulovým bajtem místo znakem\n"
+"  -0, --null            řádky výstupu zakon�í znakem NUL místo znakem\n"
 "                        nového řádku\n"
 "  -a, --all             vypíše velikost i souborů, ne jen adresářů\n"
 "      --apparent-size   vypíše velikost obsahu souborů místo zabraného\n"
@@ -3856,11 +3943,11 @@ msgstr ""
 "fragmentaci,\n"
 "                        nepřímým blokům apod. může být i větší.\n"
 
-#: src/du.c:289
+#: src/du.c:300
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3872,11 +3959,11 @@ msgid ""
 "                          --summarize\n"
 msgstr ""
 "  -B  --block-size=VELIKOST\n"
-"                        velikosti vypisuje v násobcích VELIKOSTI. Např. „-"
+"                        velikosti vypisuje v násobcích VELIKOSTI, např. „-"
 "BM“\n"
 "                        vypisuje velikosti v jednotkách po 1 048 576 "
-"bajtech.\n"
-"                        Popis formátu VELIKOSTI naleznete níže.\n"
+"bajtech;\n"
+"                        popis formátu VELIKOSTI naleznete níže\n"
 "  -b, --bytes           rovnocenné s „--apparent-size --block-size=1“\n"
 "  -c, --total           vypíše i celkový sou�et\n"
 "  -D, --dereference-args\n"
@@ -3885,27 +3972,30 @@ msgstr ""
 "  -d, --max-depth=N     vypíše sou�et pro adresář (nebo soubor spolu s --"
 "all)\n"
 "                        pouze, když je N nebo méně úrovní pod argumentem\n"
-"                        z příkazového řádku. --max-depth=0 je rovno "
+"                        z příkazového řádku; --max-depth=0 je rovno "
 "přepína�i\n"
-"                        --summarize.\n"
+"                        --summarize\n"
 
-#: src/du.c:302
+#: src/du.c:313
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
 "      --files0-from=S   ze souboru S získá seznam jmen souborů oddělených\n"
 "                        nulovým bajtem a výpo�et diskového prostoru provede\n"
-"                        nad těmito soubory\n"
+"                        nad těmito soubory; je-li F -, �te názvy ze\n"
+"                        standardního vstupu\n"
 "  -H                    rovnocenné s --dereference-args (-D)\n"
-"  -h, --human-readable  vypisuje velikosti ve formátu �itelném pro lidi\n"
+"  -h, --human-readable  vypíše velikosti ve formátu �itelném pro lidi\n"
 "                        (napÅ™. 1K 234M 2G)\n"
+"      --inodes          vypíše využití iuzlů namísto bloků\n"
 
-#: src/du.c:310
+#: src/du.c:322
 msgid ""
 "  -k                    like --block-size=1K\n"
 "  -L, --dereference     dereference all symbolic links\n"
@@ -3918,20 +4008,21 @@ msgstr ""
 "                        zapo�te každý odkaz znovu\n"
 "  -m                    jako --block-size=1M\n"
 
-#: src/du.c:316
+#: src/du.c:328
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
 "  -P, --no-dereference  nenásleduje symbolické odkazy (výchozí chování)\n"
-"  -S, --separate-dirs   nezahrnuje velikosti podadresářů\n"
+"  -S, --separate-dirs   u adresářů nezahrnuje velikosti podadresářů\n"
 "      --si              jako -h, ale používá mocniny 1000 a ne 1024\n"
 "  -s, --summarize       vypíše pouze celkový sou�et pro každý argument\n"
 
-#: src/du.c:322
+#: src/du.c:334
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
 "                          or entries greater than SIZE if negative\n"
@@ -3940,9 +4031,9 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
 msgstr ""
 "  -t, --threshold=VELIKOST\n"
 "                        vynechá položky menší než VELIKOST, je-li kladná,\n"
@@ -3951,12 +4042,13 @@ msgstr ""
 "                        v�etně souborů v podadresářích\n"
 "      --time=TYP        vypisuje �as podle TYPU namísto změny obsahu:\n"
 "                        atime, access, use (poslední přístup);\n"
-"                        ctime, status (poslední změna i-uzlu)\n"
-"      --time-style=STYL �as zobrazí ve STYLU:\n"
-"                        full-iso (úplný), long-iso (dlouhý), iso, +FORM�T\n"
+"                        ctime (poslední změna i-uzlu) nebo status\n"
+"      --time-style=STYL �as zobrazí ve STYLU, což je:\n"
+"                        full-iso (úplný), long-iso (dlouhý), iso nebo "
+"+FORM�T;\n"
 "                        FORM�T je stejný jako u příkazu „date“\n"
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
@@ -3969,67 +4061,67 @@ msgstr ""
 "  -x, --one-file-system\n"
 "                        přesko�í adresáře z jiných souborových systémů\n"
 
-#: src/du.c:386
+#: src/du.c:398
 msgid "Infinity"
 msgstr "Nekone�no"
 
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr "přípojný bod %s již byl překro�en"
-
-#: src/du.c:624
+#: src/du.c:636
 #, c-format
 msgid "fts_read failed: %s"
 msgstr "fts_read selhalo: %s"
 
-#: src/du.c:780
+#: src/du.c:787
 #, c-format
 msgid "invalid maximum depth %s"
 msgstr "chybné maximální hloubka %s"
 
-#: src/du.c:809
+#: src/du.c:816
 #, c-format
 msgid "invalid --threshold argument '-0'"
 msgstr "argument „-0“ za přepína�em --threshold je neplatný"
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr ""
 "není možné oboje, po�ítat celkové sou�ty pro každý argument a ukázat\n"
 "všechny položky"
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr "varování: sumarizace je stejná jako použití --max-depth=0"
 
-#: src/du.c:900
+#: src/du.c:911
 #, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr "varování: sumarizace je v rozporu s --max-depth=%lu"
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr "pozor: přepína�e --apparent-size a -b ztrácí s --inodes ú�innost"
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 msgid "file operands cannot be combined with --files0-from"
 msgstr "operandy s názvy souborů nelze kombinovat s --files0-from"
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr "%s: chyba při �tení"
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr "při �tení jmen souborů ze standardního vstupu jméno %s není dovoleno"
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 msgid "invalid zero-length file name"
 msgstr "neplatný název souboru – nulová délka"
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr "celkem"
 
@@ -4142,11 +4234,11 @@ msgstr ""
 #: src/env.c:61
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
 "  -i, --ignore-environment  za�ne s prázdným prostředím\n"
-"  -0, --null                každý výstupní řádek zakon�í nulovým bajtem\n"
+"  -0, --null                každý výstupní řádek zakon�í znakem NUL\n"
 "                            místo znakem nového řádku\n"
 "  -u, --unset=JMÉNO         odstraní z prostředí proměnnou JMÉNO\n"
 
@@ -4226,16 +4318,16 @@ msgid "input line is too long"
 msgstr "řádka na vstupu je příliš dlouhá"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr "Mike Parker"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr "James Youngman"
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
@@ -4244,7 +4336,7 @@ msgstr ""
 "Použití: %s [V�RAZ]…\n"
 "  nebo:  %s PŘEP�NAČ\n"
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -4263,7 +4355,7 @@ msgstr ""
 "\n"
 "  ARG1 & ARG2       ARG1 pokud žádný argument není prázdný nebo 0, jinak 0\n"
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -4281,7 +4373,7 @@ msgstr ""
 "  ARG1 >= ARG2      ARG1 je větší nebo roven ARG2\n"
 "  ARG1 > ARG2       ARG1 je větší než ARG2\n"
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
@@ -4291,7 +4383,7 @@ msgstr ""
 "  ARG1 + ARG2       aritmetický sou�et ARG1 a ARG2\n"
 "  ARG1 - ARG2       aritmetický rozdíl ARG1 a ARG2\n"
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -4304,7 +4396,7 @@ msgstr ""
 "  ARG1 / ARG2       celo�íselný aritmetický podíl ARG1 / ARG2\n"
 "  ARG1 % ARG2       zbytek po aritmetickém dělení ARG1 / ARG2\n"
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -4324,7 +4416,7 @@ msgstr ""
 "                               v ŘETĚZCI, v případě neúspěchu 0\n"
 "  length ŘETĚZEC               délka ŘETĚZCE\n"
 
-#: src/expr.c:251
+#: src/expr.c:250
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
 "                               keyword like 'match' or an operator like '/'\n"
@@ -4337,7 +4429,7 @@ msgstr ""
 "\n"
 "  ( V�RAZ )                    hodnota V�RAZU\n"
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -4357,7 +4449,7 @@ msgstr ""
 "\\),\n"
 "vrací po�et odpovídajících znaků nebo 0.\n"
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -4370,32 +4462,32 @@ msgstr ""
 "prázdný nebo 0. 2, pokud V�RAZ je syntakticky chybný a 3, pokud dojde "
 "k chybě.\n"
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, c-format
 msgid "syntax error"
 msgstr "syntaktická chyba"
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, c-format
 msgid "error in regular expression matcher"
 msgstr "chyba při vyhledávání pomocí regulárního výrazu"
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, c-format
 msgid "non-integer argument"
 msgstr "necelo�íselný argument"
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr "dělení nulou"
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr "pro obejdete, když nastavíte LC_ALL='C'"
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, c-format
 msgid "the strings compared were %s and %s"
 msgstr "byly porovnávány řetězce %s a %s"
@@ -4405,27 +4497,27 @@ msgstr "byly porovnávány řetězce %s a %s"
 msgid "Niels Moller"
 msgstr "Niels Möller"
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
 msgstr "Lucasův prvo�íselný test selhal. Toto by se stát nemělo"
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
 msgstr "Fronta algoritmu SQUFOF přetekla"
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, c-format
 msgid "%s is not a valid positive integer"
 msgstr "%s není celé kladné �íslo"
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr "%s je příliš velké"
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
@@ -4434,7 +4526,7 @@ msgstr ""
 "Použití: %s [Č�SLO]…\n"
 "  nebo:  %s PŘEP�NAČ\n"
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
 "are specified on the command line, read them from standard input.\n"
@@ -4544,17 +4636,17 @@ msgid "invalid number of columns: %s"
 msgstr "neplatný po�et sloupců: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr "Pádraig Brady"
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, c-format
 msgid "Usage: %s\n"
 msgstr "Použití: %s\n"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
@@ -4563,12 +4655,12 @@ msgstr ""
 "skriptů.\n"
 "\n"
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, c-format
 msgid "failed to get groups for user %s"
 msgstr "získání skupin uživatele %s selhalo"
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, c-format
 msgid "failed to get groups for the current process"
 msgstr "získání skupin aktuálního procesu selhalo"
@@ -4593,22 +4685,22 @@ msgstr ""
 "proces, není-li JMÉNO_UŽIVATELE zadáno (zde se projeví rozdíl po změně\n"
 "v databázi skupin).\n"
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, c-format
 msgid "cannot get real UID"
 msgstr "nelze zjistit reálné ID uživatele"
 
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, c-format
 msgid "cannot get effective GID"
 msgstr "nelze zjistit efektivní ID skupiny"
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, c-format
 msgid "cannot get real GID"
 msgstr "nelze zjistit reálné ID skupiny"
 
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, c-format
 msgid "%s: no such user"
 msgstr "%s: uživatel neexistuje"
@@ -4661,59 +4753,49 @@ msgstr ""
 "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
 "GB 1000*1000*1000, G 1024*1024*1024 a tak dále pro T, P, E, Z, Y.\n"
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr "%s: soubor byl příliš zkrácen"
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, c-format
 msgid "%s: number of bytes is too large"
 msgstr "%s: po�et bajtů je příliš velký"
 
-#: src/head.c:440
-#, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr "%s: nelze se vrátit na původní místo v souboru (služba lseek)"
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr "%s: nelze se přemístit na pozici %s"
 
-#: src/head.c:673
+#: src/head.c:423 src/tail.c:457
 #, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "%s: nové nastavení ukazatele po souboru selhalo"
-
-#: src/head.c:798
-#, c-format
-msgid "cannot reposition file pointer for %s"
-msgstr "nelze přemístit ukazatel po souboru %s"
+msgid "%s: cannot seek to relative offset %s"
+msgstr "%s: nelze se přesunout na relativní pozici %s"
 
 # src/tail.c:968
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr "%s: %s je příliš velký, proto není reprezentovatelný"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr "po�et řádků"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr "po�et bajtů"
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr "chybný po�et řádků"
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr "chybný po�et bajtů"
 
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, c-format
 msgid "invalid trailing option -- %c"
 msgstr "neznámý závěre�ný přepína� – %c"
@@ -4758,40 +4840,48 @@ msgid "cannot determine hostname"
 msgstr "jméno po�íta�e nelze zjistit"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr "Arnold Robbins"
 
-#: src/id.c:81
+#: src/id.c:84
 #, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
-msgstr "Použití: %s [PŘEP�NAČ]… [JMÉNO_UŽIVATELE]\n"
+msgid "Usage: %s [OPTION]... [USER]\n"
+msgstr "Použití: %s [PŘEP�NAČ]… [UŽIVATEL]\n"
 
-#: src/id.c:82
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
 msgstr ""
-"Vypíše informace o uživateli JMÉNO_UŽIVATELE nebo (je-li JMÉNO_UŽIVATELE\n"
-"vynecháno) o aktuálním uživateli.\n"
+"Vypíše údaje o uživateli a skupině zadaného UŽIVATELE nebo (je-li\n"
+"UŽIVATEL vynechán) aktuálního uživatele.\n"
 "\n"
+
+#: src/id.c:90
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
+msgstr ""
 "  -a              ignoruje se, z důvodu kompatibility s jinými verzemi\n"
-"  -Z, --context   vypíše pouze bezpe�nostní kontext sou�asného uživatele\n"
+"  -Z, --context   vypíše pouze bezpe�nostní kontext procesu\n"
 "  -g, --group     vypíše pouze efektivní �íslo skupiny\n"
 "  -G, --groups    vypíše �ísla všech skupin\n"
 "  -n, --name      vypíše jména, ne �ísla (pro -ugG)\n"
 "  -r, --real      vypíše reálné ID místo efektivního (pro -ugG)\n"
 "  -u, --user      vypíše pouze efektivní �íslo uživatele\n"
+"  -z, --zero      položky oddělí znakem NUL, nikoliv bílou mezerou;\n"
+"                  není dovoleno ve výchozím tvaru\n"
 
-#: src/id.c:96
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
@@ -4799,116 +4889,126 @@ msgstr ""
 "\n"
 "Bez jakéhokoli PŘEP�NAČE jsou vypsány některé užite�né informace.\n"
 
-#: src/id.c:140
+#: src/id.c:151
+#, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr "--context (-Z) funguje jen na jádře podporujícím SELinux nebo SMACK"
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr "--context (-Z) funguje jen na jádře podporujícím SELinux"
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr "bezpe�ností kontext nelze vypsat, byl-li zadán uživatel"
 
-#: src/id.c:178
+#: src/id.c:198
 #, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr "při více možnostech vypsat „pouze jednu“ informaci nelze"
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr "pouze jména nebo skute�né ID nelze v implicitním formátu vypsat"
 
-#: src/id.c:199
+#: src/id.c:209
+#, c-format
+msgid "option --zero not permitted in default format"
+msgstr "přepína� --zero není dovolen ve výchozím tvaru"
+
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
 msgstr "kontext procesu nelze zjistit"
 
-#: src/id.c:224
+#: src/id.c:265
 #, c-format
 msgid "cannot get effective UID"
 msgstr "nelze zjistit efektivní ID uživatele"
 
-#: src/id.c:311
+#: src/id.c:354
 #, c-format
 msgid "cannot find name for user ID %s"
 msgstr "jméno uživatele pro UID %s nelze najít"
 
-#: src/id.c:329
+#: src/id.c:372
 #, c-format
 msgid "uid=%s"
 msgstr "uid=%s"
 
-#: src/id.c:334
+#: src/id.c:377
 #, c-format
 msgid " gid=%s"
 msgstr " gid=%s"
 
-#: src/id.c:341
+#: src/id.c:384
 #, c-format
 msgid " euid=%s"
 msgstr " euid=%s"
 
-#: src/id.c:349
+#: src/id.c:392
 #, c-format
 msgid " egid=%s"
 msgstr " egid=%s"
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr " skupiny="
 
-#: src/id.c:393
+#: src/id.c:437
 #, c-format
 msgid " context=%s"
 msgstr " kontext=%s"
 
-#: src/install.c:373
+#: src/install.c:376
 #, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr "varování: %s: změna kontextu na %s selhala"
 
-#: src/install.c:414
+#: src/install.c:417
 #, c-format
 msgid "creating directory %s"
 msgstr "vytvářím adresář %s"
 
-#: src/install.c:482
+#: src/install.c:485
 #, c-format
 msgid "cannot change ownership of %s"
 msgstr "vlastnictví %s nelze změnit"
 
-#: src/install.c:506
+#: src/install.c:509
 #, c-format
 msgid "cannot set time stamps for %s"
 msgstr "nelze nastavit �asy %s "
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, c-format
 msgid "fork system call failed"
 msgstr "systémové volání fork selhalo"
 
-#: src/install.c:531
+#: src/install.c:535
 #, c-format
 msgid "cannot run %s"
 msgstr "%s nelze spustit"
 
-#: src/install.c:535
+#: src/install.c:539
 #, c-format
 msgid "waiting for strip"
 msgstr "�ekám na strip"
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr "proces strip skon�il neobvykle"
 
-#: src/install.c:558
+#: src/install.c:565
 #, c-format
 msgid "invalid user %s"
 msgstr "neplatný uživatel %s"
 
-#: src/install.c:594
+#: src/install.c:601
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -4921,7 +5021,7 @@ msgstr ""
 "  nebo:  %s [PŘEP�NAČ]… -t ADRES�Ř ZDROJ…\n"
 "  nebo:  %s [PŘEP�NAČ]… -d ADRES�Ř…\n"
 
-#: src/install.c:601
+#: src/install.c:608
 msgid ""
 "\n"
 "This install program copies files (often just compiled) into destination\n"
@@ -4945,7 +5045,7 @@ msgstr ""
 "do existujícího ADRES�ŘE a nastaví uživatelská práva a vlastníky/skupiny.\n"
 "Čtvrtý způsob vytvoří všechny komponenty zadaného ADRES�ŘE(Ů).\n"
 
-#: src/install.c:615
+#: src/install.c:622
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
 "  -b                  like --backup but does not accept an argument\n"
@@ -4966,7 +5066,7 @@ msgstr ""
 "adresářů.\n"
 "                        Vytvoří všechny komponenty těchto adresářů\n"
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -4988,7 +5088,7 @@ msgstr ""
 "  -o, --owner=VLASTN�K  nastaví vlastníka souboru (pouze superuživatel – "
 "root)\n"
 
-#: src/install.c:631
+#: src/install.c:638
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
 "files\n"
@@ -5015,66 +5115,66 @@ msgstr ""
 "                        považuje C�L za běžný soubor\n"
 "  -v, --verbose         vypisuje jména všech vytvářených adresářů\n"
 
-#: src/install.c:641
+#: src/install.c:648
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
 "      --preserve-context\n"
 "                        zachová selinuxový bezpe�nostní kontext\n"
-"  -Z, --context=KONTEXT\n"
-"                        nastaví souborům a adresářům selinuxový bezp. "
-"kontext\n"
+"  -Z                    nastaví cílovému souboru selinuxový bezpe�nostní\n"
+"                        kontext na výchozí hodnotu\n"
+"      --context[=KONTEXT]\n"
+"                        jako -Z nebo je-li KONTEXT zadán, nastaví "
+"selinuxový\n"
+"                        nebo smackový bezpe�nostní kontext na KONTEXT\n"
+
+#: src/install.c:696 src/unlink.c:86
+#, c-format
+msgid "cannot unlink %s"
+msgstr "nelze odstranit odkaz %s"
 
-#: src/install.c:859
+#: src/install.c:877
 #, c-format
 msgid ""
 "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
 msgstr "VAROV�N�: ignoruji --preserve-context, toto jádro nepodporuje SELinux"
 
-#: src/install.c:869
-#, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
-msgstr "VAROV�N�: ignoruji --context (-Z), toto jádro nepodporuje SELinux"
-
-#: src/install.c:886
+#: src/install.c:917
 #, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr "při instalaci adresáře nesmí být použit přepína� --strip"
 
-#: src/install.c:889
+#: src/install.c:920
 #, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr "při instalaci adresáře není dovolen cílový adresář (-t)"
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr "nelze zároveň vynutit kontext na %s a zároveň jej zachovat"
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, c-format
 msgid "invalid mode %s"
 msgstr "neplatná práva: %s"
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr ""
 "VAROV�N�: ignoruji přepína� --strip-option, protože přepína� -s nebyl použit"
 
-#: src/install.c:959
+#: src/install.c:1001
 #, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr "přepína�e --compare (-C) a --preserve-timestamps se vzájemně vylu�ují"
 
-#: src/install.c:966
+#: src/install.c:1008
 #, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr "přepína�e --compare (-C) a --strip se vzájemně vylu�ují"
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -5087,7 +5187,7 @@ msgstr ""
 msgid "Mike Haertel"
 msgstr "Mike Haertel"
 
-#: src/join.c:191
+#: src/join.c:195
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
 "standard output.  The default join field is the first, delimited\n"
@@ -5108,7 +5208,7 @@ msgstr ""
 "                    kde STRANA je 1 nebo 2 pro SOUBOR1 nebo SOUBOR2\n"
 "  -e VYPLŇ          nahradí chybějící vstupní položky V�PLN�\n"
 
-#: src/join.c:200
+#: src/join.c:204
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
 "  -j FIELD          equivalent to '-1 FIELD -2 FIELD'\n"
@@ -5121,7 +5221,7 @@ msgstr ""
 "  -o FORM�T         řídí se FORM�TEM při tvorbě výstupního řádku\n"
 "  -t ZNAK           použije ZNAK jako oddělova� položek na vstupu i výstupu\n"
 
-#: src/join.c:206
+#: src/join.c:210
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
 "  -1 FIELD          join on this FIELD of file 1\n"
@@ -5142,7 +5242,12 @@ msgstr ""
 "položek,\n"
 "                    vypíše je aniž by se je pokoušet spárovat\n"
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr ""
+"  -z, --zero-terminated     oddělova� řádků je znak NUL, ne nový řádek\n"
+
+#: src/join.c:225
 msgid ""
 "\n"
 "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n"
@@ -5178,47 +5283,47 @@ msgstr ""
 "Nebude-li vstup seřazen a nebude-li možné některé řádky propojit, bude\n"
 "zobrazeno varování.\n"
 
-#: src/join.c:403
+#: src/join.c:410
 #, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
 msgstr "%s:%<PRIuMAX>: není seřazeno: %.*s"
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, c-format
 msgid "invalid field number: %s"
 msgstr "chybné �íslo položky: %s"
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, c-format
 msgid "invalid field specifier: %s"
 msgstr "chybně zadaná položka: %s"
 
-#: src/join.c:877
+#: src/join.c:884
 #, c-format
 msgid "invalid file number in field spec: %s"
 msgstr "chybné �íslo souboru v popisu položky: %s"
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr "neslu�itelné propojovací položky %lu, %lu"
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr "řetězce výplně je jsou v konfliktu"
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, c-format
 msgid "multi-character tab %s"
 msgstr "zvolený oddělova� položek %s má více znaků"
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr "neslu�itelné oddělova�e položek"
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr "oba dva soubory nemohou být standardním vstupem"
@@ -5337,47 +5442,47 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr "odkaz %s na %s nelze vytvořit"
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr "%s: na adresář nelze vytvořit pevný odkaz"
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, c-format
 msgid "%s: cannot overwrite directory"
 msgstr "%s: adresář nelze přepsat"
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
 msgstr "%s: přepsat %s? "
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, c-format
 msgid "failed to create symbolic link %s"
 msgstr "symbolický odkaz %s nebylo možné vytvořit"
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr "symbolický odkaz %s na %s nebylo možné vytvořit"
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr "pevný odkaz na %.0s%s nebylo možné vytvořit"
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, c-format
 msgid "failed to create hard link %s"
 msgstr "pevný odkaz %s nebylo možné vytvořit"
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, c-format
 msgid "failed to create hard link %s => %s"
 msgstr "pevný odkaz %s na %s nebylo možné vytvořit"
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -5390,7 +5495,7 @@ msgstr ""
 " nebo:   %s [PŘEP�NAČ]… C�L… ADRES�Ř           (3. forma)\n"
 " nebo:   %s [PŘEP�NAČ]… -t ADRES�Ř C�L…        (4. forma)\n"
 
-#: src/ln.c:381
+#: src/ln.c:398
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
 "In the 2nd form, create a link to TARGET in the current directory.\n"
@@ -5410,7 +5515,7 @@ msgstr ""
 "mohou nést libovolný text; při pozdějším vyhodnocování je relativní odkaz\n"
 "zvažován vzhledem ke svému nadřízenému adresáři.\n"
 
-#: src/ln.c:394
+#: src/ln.c:411
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
 "file\n"
@@ -5432,7 +5537,7 @@ msgstr ""
 "i superuživateli)\n"
 "  -f, --force                 odstraní existující cílové soubory\n"
 
-#: src/ln.c:402
+#: src/ln.c:419
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
 "  -L, --logical               dereference TARGETs that are symbolic links\n"
@@ -5455,7 +5560,7 @@ msgstr ""
 "                              umístění\n"
 "  -s, --symbolic              na místo pevných odkazů vytváří symbolické\n"
 
-#: src/ln.c:411
+#: src/ln.c:428
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
 "  -t, --target-directory=DIRECTORY  specify the DIRECTORY in which to "
@@ -5471,7 +5576,7 @@ msgstr ""
 "  -T, --no-target-directory   vždy považuje JMÉNO_ODKAZU za běžný soubor\n"
 "  -v, --verbose               tiskne jména všech odkazů\n"
 
-#: src/ln.c:433
+#: src/ln.c:450
 #, c-format
 msgid ""
 "\n"
@@ -5483,12 +5588,12 @@ msgstr ""
 "případě, je-li C�LEM symbolický odkaz, se uplatní poslední zadaný přepína�.\n"
 "Výchozí je %s.\n"
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr "--target-directory a --no-target-directory nelze kombinovat"
 
-#: src/ln.c:588
+#: src/ln.c:605
 #, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr "přepína� --relative nelze bez přepína�e --symbolic použít"
@@ -5521,7 +5626,7 @@ msgstr "chybí přihlašovací jméno"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 msgid "%b %e  %Y"
 msgstr "%e. %b  %Y"
 
@@ -5530,95 +5635,95 @@ msgstr "%e. %b  %Y"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 msgid "%b %e %H:%M"
 msgstr "%e. %b %H.%M"
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr "ignoruji neplatnou hodnotu proměnné prostření QUOTUNG_STYLE: %s"
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr "špatná šířka (%s) v proměnné prostředí COLUMNS, bude ignorována"
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr ""
 "špatná velikost tabelátoru (%s) v proměnné prostředí TABSIZE, bude ignorována"
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, c-format
 msgid "invalid line width: %s"
 msgstr "chybné délka řádku: %s"
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, c-format
 msgid "invalid tab size: %s"
 msgstr "chybná šířka tabelátoru: %s"
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, c-format
 msgid "invalid time style format %s"
 msgstr "chybný formát pro výpis �asu %s"
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 msgid "Valid arguments are:\n"
 msgstr "Platné argumenty jsou:\n"
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr "  - +FORM�T (např. +%H:%M) pro formát jako u „date“\n"
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr "chyba při inicializaci řetězců měsíců"
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, c-format
 msgid "unrecognized prefix: %s"
 msgstr "neznámý prefix: %s"
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr "nesrozumitelná hodnota v proměnné prostředí LS_COLORS"
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, c-format
 msgid "cannot open directory %s"
 msgstr "adresář %s nelze otevřít"
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, c-format
 msgid "cannot determine device and inode of %s"
 msgstr "zařízení a i-uzel pro %s nelze ur�it"
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, c-format
 msgid "%s: not listing already-listed directory"
 msgstr "%s: nevypisuji již dříve vypsaný adresář"
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, c-format
 msgid "reading directory %s"
 msgstr "�te se adresář %s"
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, c-format
 msgid "closing directory %s"
 msgstr "zavírá se adresář %s"
 
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, c-format
 msgid "cannot compare file names %s and %s"
 msgstr "jména souborů %s a %s nelze porovnat"
 
-#: src/ls.c:4721
+#: src/ls.c:4781
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
 "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n"
@@ -5627,7 +5732,7 @@ msgstr ""
 "není zadán žádný z přepína�ů -cftuvSUX nebo --sort, výstup bude seřazen\n"
 "abecednÄ›.\n"
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
 "  -A, --almost-all           do not list implied . and ..\n"
@@ -5641,25 +5746,25 @@ msgstr ""
 "      --author               spolu s -l vypíše autora každého souboru\n"
 "  -b, --escape               negrafické znaky escapuje ve stylu jazyka C\n"
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
-"      --block-size=VELIKOST  velikosti vypisuje v násobcích VELIKOSTI. "
-"NapÅ™.\n"
+"      --block-size=VELIKOST  velikosti vypisuje v násobcích VELIKOSTI; "
+"napÅ™.\n"
 "                             „--block-size=M“ vypisuje velikosti "
 "v jednotkách\n"
-"                             po 1 048 576 bajtech. Popis formátu VELIKOSTI\n"
-"                             je uveden níže.\n"
+"                             po 1 048 576 bajtech; popis formátu VELIKOSTI\n"
+"                             je uveden níže\n"
 "  -B, --ignore-backups       nevypisuje soubory kon�ící na ~\n"
 "  -c                         s -lt: řadí podle ctime a vypisuje ctime (�as\n"
 "                             poslední změny i-uzlových informací);\n"
@@ -5668,29 +5773,25 @@ msgstr ""
 "                             jinak: řadí podle ctime, vypisuje od "
 "nejnovějších\n"
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 "  -C                         vypisuje položky ve sloupcích\n"
-"      --color[=KDY]          obarví výstup. KDY je implicitně "
-"„always“ (vždy),\n"
-"                             další hodnoty jsou „never“ (nikdy) nebo "
-"„auto“.\n"
-"                             Podrobnosti níže\n"
-"  -d, --directory            vypíše názvy adresářů místo jejich obsahu a\n"
-"                             nenásleduje symbolické odkazy\n"
+"      --color[=KDY]          obarví výstup; KDY smí být „never“ (nikdy),\n"
+"                             „auto“ nebo „always“ (vždy, výchozí);\n"
+"                             podrobnosti níže\n"
+"  -d, --directory            vypíše názvy adresářů místo jejich obsahu\n"
 "  -D, --dired                generuje výstup formátovaný pro Emacsový\n"
 "                             mód „dired“\n"
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
 "  -F, --classify             append indicator (one of */=>@|) to entries\n"
@@ -5710,59 +5811,60 @@ msgstr ""
 "                             verbose jako -l, vertical jako -C\n"
 "      --full-time            jako -l --time-style=full-iso\n"
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr "  -g                         jako -l, ale nevypisuje vlastníka\n"
 
-#: src/ls.c:4763
+#: src/ls.c:4823
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 "      --group-directories-first\n"
-"                             seskupí adresáře před soubory\n"
-"                             Zachová funkci přepína�e --sort, avšak\n"
-"                             --sort=none (-U) seskupování potla�í.\n"
+"                             seskupí adresáře před soubory;\n"
+"                             zachová funkci přepína�e --sort, avšak\n"
+"                             --sort=none (-U) seskupování potla�í\n"
 
-#: src/ls.c:4769
+#: src/ls.c:4829
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
 "  -G, --no-group             při dlouhém formátu nevypisuje informace\n"
 "                             o skupinách\n"
-"  -h, --human-readable       při -l vypisuje velikosti ve formátu pohodlném\n"
-"                             pro �lověka (např. 1K, 234M, 2G)\n"
-"      --si                   jako předchozí, ale jednotky jsou násobky 1000\n"
-"                             a ne 1024.\n"
+"  -h, --human-readable       při -l a/nebo -s vypisuje velikosti ve formátu\n"
+"                             pohodlném pro �lověka (např. 1K, 234M, 2G)\n"
+"      --si                   jako předchozí, ale použije mocniny 1000 a ne "
+"1024\n"
 
-#: src/ls.c:4775
+#: src/ls.c:4835
 msgid ""
 "  -H, --dereference-command-line\n"
 "                             follow symbolic links listed on the command "
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
 msgstr ""
 "  -H, --dereference-command-line\n"
 "                             následuje symbolické odkazy uvedené na\n"
-"                             příkazové řádce\n"
+"                             příkazovém řádku\n"
 "      --dereference-command-line-symlink-to-dir\n"
-"                             následuje každý symbolický odkaz z příkazové\n"
-"                             řádky, který ukazuje na adresář\n"
+"                             následuje každý symbolický odkaz z příkazového\n"
+"                             řádku, který ukazuje na adresář\n"
 "      --hide=VZOR            nevypisuje implikované položky odpovídající\n"
 "                             shellovému VZORU (lze přebít přepína�i -a a -"
 "A)\n"
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
 "names:\n"
@@ -5771,7 +5873,7 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 "      --indicator-style=STYL\n"
 "                             k názvům souborů přidává indikátory ve\n"
@@ -5780,9 +5882,9 @@ msgstr ""
 "  -i, --inode                ke každému souboru vypíše �íslo jeho i-uzlu\n"
 "  -I, --ignore=VZOR          nevypisuje implikované soubory vyhovující\n"
 "                             shellovému VZORU\n"
-"  -k, --kibibytes            použije 1024bajtové bloky\n"
+"  -k, --kibibytes            u zaplnění disku použije 1024bajtové bloky\n"
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -5798,7 +5900,7 @@ msgstr ""
 "oddělených\n"
 "                             �árkami vyplňující šířku řádků\n"
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -5816,11 +5918,11 @@ msgstr ""
 "  -p, --indicator-style=slash\n"
 "                             za názvy adresářů připojí „/“\n"
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -5828,8 +5930,7 @@ msgid ""
 "escape\n"
 msgstr ""
 "  -q, --hide-control-chars   vypíše „?“ místo negrafických znaků\n"
-"      --show-control-chars   vypíše negrafické znaky tak jak jsou "
-"(implicitní,\n"
+"      --show-control-chars   vypíše negrafické znaky tak jak jsou (výchozí,\n"
 "                             jestliže program není „ls“ a výstup není na\n"
 "                             terminál)\n"
 "  -Q, --quote-name           vloží názvy souborů do uvozovek\n"
@@ -5839,7 +5940,7 @@ msgstr ""
 "                             literal (doslovný), locale (lokalizovaný),\n"
 "                             shell, shell-always, c, escape\n"
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
 "  -R, --recursive            list subdirectories recursively\n"
@@ -5851,51 +5952,56 @@ msgstr ""
 "  -s, --size                 vypíše alokovanou velikost každého souboru\n"
 "                             v blocích\n"
 
-#: src/ls.c:4825
+#: src/ls.c:4886
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 "  -S                         výstup seřadí podle délky souborů\n"
-"      --sort=SLOVO           výstup seřadí podle SLOVA: none (-U),\n"
-"                             extension (-X), size (-S), time (-t),version (-"
-"v)\n"
-"      --time=SLOVO           s -l vypisuje �as podle SLOVA místo �asu\n"
-"                             poslední změny obsahu: atime (-u), access (-"
+"      --sort=SLOVO           výstup seřadí podle SLOVA: none (-U), size (-"
+"S),\n"
+"                             time (-t), version (-v), extension (-X)\n"
+"      --time=SLOVO           s -l vypisuje �as podle SLOVA místo výchozího "
+"�asu\n"
+"                             poslední změny obsahu: atime, access nebo use (-"
 "u),\n"
-"                             use (-u), ctime (-c) nebo status (-c);\n"
+"                             ctime nebo status (-c);\n"
 "                             jestliže je zadán přepína� --sort=time, "
 "použije\n"
 "                             se tento �as jako řadicí klí�\n"
 
-#: src/ls.c:4835
+#: src/ls.c:4896
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
 msgstr ""
 "      --time-style=STYL      s -l vypisuje �as ve STYLU:\n"
 "                             full-iso (plný), long-iso (dlouhý), iso,\n"
-"                             locale (národní), +FORM�T.\n"
+"                             locale (národní) nebo +FORM�T.\n"
 "                             FORM�T má stejný význam jako u „date“;\n"
 "                             pokud FORM�T je ve tvaru\n"
-"                             FORM�T1<nový řádek>FORM�T2, FORM�T1 se\n"
+"                             FORM�T1<nový řádek>FORM�T2, pak se FORM�T1\n"
 "                             použije na starší soubory a FORM�T2 na\n"
 "                             mladší soubory; pokud STYL za�íná na „posix-“,\n"
 "                             bude STYL uvažován jen mimo POSIXOVÉ locale\n"
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 msgid ""
 "  -t                         sort by modification time, newest first\n"
 "  -T, --tabsize=COLS         assume tab stops at each COLS instead of 8\n"
@@ -5905,10 +6011,10 @@ msgstr ""
 "  -T, --tabsize=SLOUPCŮ      pozice tabelátoru každých SLOUPCŮ znaků (impl. "
 "8)\n"
 
-#: src/ls.c:4848
+#: src/ls.c:4912
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
@@ -5922,24 +6028,23 @@ msgstr ""
 "                             v jakém jsou v adresáři uloženy\n"
 "  -v                         přirozené řazení (verzovacích) �ísel v textu\n"
 
-#: src/ls.c:4855
+#: src/ls.c:4919
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 "  -w, --width=SLOUPCŮ        použije tuto šířku obrazovky při vypisování\n"
 "  -x                         jména souborů vypíše po řádcích místo po "
 "sloupcích\n"
 "  -X                         výstup seřadí abecedně podle přípon souborů\n"
-"  -Z, --context              vypíše pro každý soubor jakýkoliv selinuxový\n"
-"                             bezpe�nostní kontext\n"
+"  -Z, --context              vypíše pro každý soubor jakýkoliv bezpe�nostní\n"
+"                             kontext\n"
 "  -1                         vypíše jeden soubor na jeden řádek\n"
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -5954,7 +6059,7 @@ msgstr ""
 "jen, když standardní výstup bude napojen na terminál. Toto nastavení lze\n"
 "ovlivnit proměnnou prostředí LS_COLORS. Nastavit ji lze příkazem dircolors.\n"
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -6032,9 +6137,11 @@ msgstr "  -t, --text           �te v textovém módu (výchozí)\n"
 #: src/md5sum.c:195
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
@@ -6043,17 +6150,12 @@ msgstr ""
 "sou�tů:\n"
 "      --quiet          nevypisuje OK u každého úspěšně ověřeného souboru\n"
 "      --status         nevypisuje nic, úspěšnost zna�í návratový kód\n"
-"  -w, --warn           upozorňuje na nesprávně formátované řádky sou�tů\n"
+"      --strict         vrátí nenulový kód při chybně formátovaném řádku "
+"sou�tu\n"
+"  -w, --warn           upozorňuje na chybně formátované řádky sou�tů\n"
 "\n"
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-"      --strict         spolu s --check vrátí nenulový kód při neplatném "
-"vstupu\n"
-
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, c-format
 msgid ""
 "\n"
@@ -6068,35 +6170,35 @@ msgstr ""
 "řádku pro každý SOUBOR. Formát řádku je kontrolní sou�et, znak zna�ící\n"
 "vstupní režim („*“ pro binární, mezera pro textový) a jméno SOUBORU.\n"
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, c-format
 msgid "%s: too many checksum lines"
 msgstr "%s: příliš mnoho řádků s kontrolními sou�ty"
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr "%s: %<PRIuMAX>: nesprávně formátovaný řádek %s kontrolního sou�tu"
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr "%s: SELHALO otevření nebo �tení\n"
 
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr "CHYBN�"
 
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr "V POŘ�DKU"
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr "%s: nenalezeny správně formátované řádky %s kontrolního sou�tu"
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
@@ -6111,7 +6213,7 @@ msgstr[2] "POZOR: %<PRIuMAX> řádků není správně utvořeno"
 # see also md5sum.c:430. it is somewhat surprising that we need
 # such things only in two places in this file - rzm 960902
 #
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
@@ -6128,7 +6230,7 @@ msgstr[2] "POZOR: %<PRIuMAX> uvedených souborů nebylo možné pře�íst"
 # so we don't need to use two forms for plural (depending on number: nn[234]
 # are different that the other ones) - rzm 960902
 #
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
@@ -6136,122 +6238,152 @@ msgstr[0] "POZOR: %<PRIuMAX> spo�tený sou�et NESOUHLASIL"
 msgstr[1] "POZOR: %<PRIuMAX> spo�tené sou�ty NESOUHLASILY"
 msgstr[2] "POZOR: %<PRIuMAX> spo�tených sou�tů NESOUHLASILO"
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
 msgstr "přepína� --tag nepodporuje režim --text"
 
-#: src/md5sum.c:766
+#: src/md5sum.c:770
 #, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr "přepína� --tag nemá význam při ověřování kontrolních sou�tů"
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
 msgstr ""
 "přepína�e --binary a --text jsou bezvýznamné při ověřování kontrolních sou�tů"
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr "přepína� --status má význam pouze při ověřování kontrolních sou�tů"
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr "přepína� --warn má význam pouze při ověřování kontrolních sou�tů"
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr "přepína� --quiet má význam pouze při ověřování kontrolních sou�tů"
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr "přepína� --strict má význam pouze při ověřování kontrolních sou�tů"
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr "Použití: %s [PŘEP�NAČ]… ADRES�Ř…\n"
 
-#: src/mkdir.c:57
+#: src/mkdir.c:59
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
 msgstr "Vytvoří ADRES�Ř(E), pokud ještě neexistuje(í).\n"
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 "  -m, --mode=PR�VA  nastaví přístupová práva (zadány jako příkazu „chmod“),\n"
 "                    místo toho, aby byla práva nastavena na a=rwx - umask\n"
 "  -p, --parents     vytvoří neexistující rodi�ovské adresáře zadaného "
 "adresáře\n"
 "  -v, --verbose     vypíše zprávu o každém vytvořeném adresáři\n"
-"  -Z, --context=KONTEXT\n"
-"                    nastaví selinuxový bezpe�nostní kontext na KONTEXT\n"
-"                    každému vytvářenému adresáři\n"
 
-#: src/mkdir.c:168
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+"  -Z                nastaví každému vytvářenému adresáři selinuxový\n"
+"                    bezpe�nostní kontext na výchozí hodnotu\n"
+"      --context=KONTEXT\n"
+"                    jako -Z nebo je-li KONTEXT zadán, nastaví selinuxový\n"
+"                    nebo smackový bezpe�nostní kontext na KONTEXT\n"
+
+#: src/mkdir.c:127 src/mkdir.c:172
+#, c-format
+msgid "failed to set default creation context for %s"
+msgstr "selhalo nastavení výchozího kontextu u %s"
+
+#: src/mkdir.c:191
+#, c-format
+msgid "failed to restore context for %s"
+msgstr "selhalo obnovení kontextu u %s"
+
+#: src/mkdir.c:231
 #, c-format
 msgid "created directory %s"
 msgstr "adresář %s vytvořen"
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr ""
+"pozor: ignoruje se --context, je vyžadováno jádro s podporou SELinuxu/SMACKu"
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr "Použití: %s [PŘEP�NAČ]… [JMÉNO]…\n"
 
-#: src/mkfifo.c:52
+#: src/mkfifo.c:54
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
 msgstr "Vytvoří pojmenované roury (FIFO) se zadanými JMÉNY.\n"
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
 msgstr ""
 "  -m, --mode=PR�VA  nastaví bity přístupových práv na PR�VA, místo toho,\n"
 "                    aby byla nastavena na a=rw − umask\n"
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
-"  -Z, --context=KTX  nastaví selinuxový bezpe�nostní kontext každému JMÉNU\n"
-"na KTX\n"
+"  -Z                   nastaví selinuxový bezpe�nostní kontext na výchozí\n"
+"                       hodnotu\n"
+"      --context[=KTX]  jako -Z nebo je-li KTX zadán, nastaví selinuxový\n"
+"                       nebo smackový bezpe�nostní kontext na KTX\n"
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, c-format
 msgid "invalid mode"
 msgstr "neplatná práva"
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr "práva mohou ur�ovat jen bity přístupových práv k souboru"
 
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
+#, c-format
+msgid "cannot set permissions of %s"
+msgstr "nelze nastavit práva u %s"
+
+#: src/mknod.c:54
 #, c-format
 msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr "Použití: %s [PŘEP�NAČ]… JMÉNO TYP [HLAVN� VEDLEJŠ�]\n"
 
-#: src/mknod.c:54
+#: src/mknod.c:56
 msgid "Create the special file NAME of the given TYPE.\n"
 msgstr "Vytvoří zvláštní soubor pod JMÉNEM a zadaného TYPU.\n"
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr ""
-"  -Z, --context=KTX  nastaví selinuxový bezpe�nostní kontext JMÉNU na KTX\n"
-
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -6267,7 +6399,7 @@ msgstr ""
 "za�ínají na „0x“ nebo „0X“, jsou považována za šestnáctková; pokud za�ínají\n"
 "na 0, za osmi�ková, jinak za desítková. TYP smí být:\n"
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 msgid ""
 "\n"
 "  b      create a block (buffered) special file\n"
@@ -6279,55 +6411,55 @@ msgstr ""
 "  c, u   znakový (nebufferovaný) speciální soubor\n"
 "  p      roura (FIFO)\n"
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 msgid "Special files require major and minor device numbers."
 msgstr "Zvláštní soubory vyžadují hlavní a vedlejší �ísla zařízení."
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 msgid "Fifos do not have major and minor device numbers."
 msgstr "Roury nemají hlavní a vedlejší �íslo zařízení."
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, c-format
 msgid "block special files not supported"
 msgstr "zvláštní blokové soubory nejsou podporovány"
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, c-format
 msgid "character special files not supported"
 msgstr "zvláštní znakové soubory nejsou podporovány"
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, c-format
 msgid "invalid major device number %s"
 msgstr "neplatné hlavní �íslo zařízení: %s"
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, c-format
 msgid "invalid minor device number %s"
 msgstr "neplatné vedlejší �íslo zařízení %s"
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, c-format
 msgid "invalid device %s %s"
 msgstr "neplatné zařízení %s %s"
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, c-format
 msgid "invalid device type %s"
 msgstr "neplatný typ zařízení %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr "Eric Blake"
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr "Použití: %s [PŘEP�NAČ]… [ŠABLONA]\n"
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
 "TEMPLATE must contain at least 3 consecutive 'X's in last component.\n"
@@ -6337,13 +6469,13 @@ msgstr ""
 "ŠABLONA musí kon�it na alespoň 3 po sobě následující znaky „X“.\n"
 "Nebude-li zadána ŠABLONA, použije se tmp.XXXXXXXXXX a zapne se --tmpdir.\n"
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
 "Soubory jsou vytvářeny jako u+rw, adresáře jako u+rwx, mínus omezení umask.\n"
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
@@ -6353,27 +6485,28 @@ msgstr ""
 "  -u, --dry-run       nevytváří nic, jen vytiskne jméno (není bezpe�né)\n"
 "  -q, --quiet         potla�í hlášky o chybě při vytváření souboru/adresáře\n"
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
 "      --suffix=P�PONA\n"
-"                      k šabloně připojí PŘ�PONU. PŘ�PONA nesmí obsahovat\n"
+"                      k šabloně připojí PŘ�PONU; PŘ�PONA nesmí obsahovat\n"
 "                      lomítko. Tento přepína� se aktivuje, pokud ŠABLONA\n"
-"                      nekon�í na X.\n"
+"                      nekon�í na X\n"
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
-"      --tmpdir[=ADR]  interpretuje ŠABLONU relativně k adresáři ADR. Není-"
+"  -p ADR, --tmpdir[=ADR]\n"
+"                      interpretuje ŠABLONU relativně k adresáři ADR. Není-"
 "li\n"
 "                      ADR zadán, použije $TMPDIR, je-li nastavena, jinak /"
 "tmp.\n"
@@ -6382,69 +6515,61 @@ msgstr ""
 "                      Na rozdíl od -t ŠABLONA smí obsahovat lomítka, avšak\n"
 "                      i zde mktemp vytvoří jen závěre�nou složku cesty\n"
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
 msgstr ""
-"  -p ADRES�Ř          požije ADRES�Ř jako předponu, implikuje -t "
-"[zastaralé]\n"
 "  -t                  interpretuje ŠABLONU jako jedinou �ást jména souboru\n"
 "                      relativně k adresáři: $TMPDIR, je-li nastavena, jinak\n"
 "                      je adresář zadán pomocí -p, jinak /tmp [zastaralé]\n"
 
-#: src/mktemp.c:223
-#, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr "přesměrování standardního chybové výstupu do /dev/null se nezdařilo"
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, c-format
 msgid "too many templates"
 msgstr "příliš mnoho šablon"
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr "při --sufix šablona %s musí kon�it na X"
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr "chybná přípona %s, obsahuje oddělova� adresářů"
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr "příliš málo X v šabloně %s"
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr "chybná šablona %s, obsahuje oddělova� adresářů"
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr "chybná šablona %s, spolu s --tmpdir nesmí být absolutní"
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, c-format
 msgid "failed to create directory via template %s"
 msgstr "vytvoření adresáře dle šablony %s selhalo"
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, c-format
 msgid "failed to create file via template %s"
 msgstr "vytvoření souboru dle šablony %s selhalo"
 
-#: src/mv.c:292
+#: src/mv.c:294
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
 msgstr "Přejmenuje ZDROJ na C�L, nebo přesune ZDROJ(E) do ADRES�ŘE.\n"
 
-#: src/mv.c:298
+#: src/mv.c:300
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
 "file\n"
@@ -6465,7 +6590,7 @@ msgstr ""
 "Zadáte-li více jak jeden přepína� z -i, -f, -n, pouze poslední bude "
 "ú�inkovat.\n"
 
-#: src/mv.c:307
+#: src/mv.c:309
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
@@ -6475,7 +6600,7 @@ msgstr ""
 "      --strip-trailing-slashes odstraní všechna lomítka z konce ZDROJE(Ů)\n"
 "  -S, --suffix=PŘ�PONA         přípona záložních souborů\n"
 
-#: src/mv.c:312
+#: src/mv.c:314
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
 "DIRECTORY\n"
@@ -6484,12 +6609,16 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
 "  -t, --target-directory=ADRES�Ř\n"
 "                               přemístí všechny ZDROJE do ADRES�ŘE\n"
 "  -T, --no-target-directory    C�L považuje za běžný soubor\n"
 "  -u, --update                 přemístí pouze starší a úplně nové soubory\n"
 "  -v, --verbose                vypisuje co se děje\n"
+"  -Z, --context                nastaví selinuxový bezpe�nostní kontext\n"
+"                               cílovému souboru na výchozí hodnotu\n"
 
 #: src/nice.c:72
 #, c-format
@@ -6780,80 +6909,75 @@ msgid "%s: invalid number to ignore"
 msgstr "%s: chybný po�et na ignorování"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
 msgstr "Assaf Gordon"
 
-#: src/numfmt.c:676
+#: src/numfmt.c:659
 #, c-format
-msgid "value too large to be converted: '%s'"
-msgstr "hodnota je pro převod příliš velká: „%s“"
+msgid "value too large to be converted: %s"
+msgstr "hodnota je pro převod příliš velká: %s"
 
-#: src/numfmt.c:680
+#: src/numfmt.c:663
 #, c-format
-msgid "invalid number: '%s'"
-msgstr "neplatné �íslo: „%s“"
+msgid "invalid number: %s"
+msgstr "neplatné �íslo: %s"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
-msgstr "přípona ze vstupu odmítnuta: „%s“ (zvažte použití --from)"
+msgid "rejecting suffix in input: %s (consider using --from)"
+msgstr "přípona ze vstupu odmítnuta: %s (zvažte použití --from)"
 
-#: src/numfmt.c:688
+#: src/numfmt.c:671
 #, c-format
-msgid "invalid suffix in input: '%s'"
-msgstr "neplatná přípona na vstupu: „%s“"
+msgid "invalid suffix in input: %s"
+msgstr "neplatná přípona na vstupu: %s"
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
-msgstr "na vstupu chybí přípona „i“: „%s“ (na příklad Ki/Mi/Gi)"
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
+msgstr "na vstupu chybí přípona „i“: %s (na příklad Ki/Mi/Gi)"
 
-#: src/numfmt.c:723
+#: src/numfmt.c:722 src/numfmt.c:768
 #, c-format
 msgid "failed to prepare value '%Lf' for printing"
 msgstr "hodnotu „%Lf“ se nepodařilo se připravit pro výpis"
 
-#: src/numfmt.c:787
+#: src/numfmt.c:791
 #, c-format
-msgid "invalid unit size: '%s'"
-msgstr "chybná jednotka velikost: „%s“"
+msgid "invalid unit size: %s"
+msgstr "neplatná jednotka velikost: %s"
 
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
-#, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr "nedostatek paměti (požadováno %zu bajtů)"
-
-#: src/numfmt.c:813
+#: src/numfmt.c:814
 #, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
 msgstr "Použití: %s [PŘEP�NAČ]… [Č�SLO]…\n"
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
 msgstr ""
 "Přeformátuje Č�SLO(A), nebo �ísla ze standardního vstupu, nebyla-li zadána.\n"
 
-#: src/numfmt.c:820
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
 msgstr "      --debug          vypisuje varování při neplatném vstupu\n"
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
 "  -d, --delimiter=X    jako oddělova� položek použije X namísto bílého "
 "místa\n"
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
 "      --field=N        nahradí �íslo v položce vstupu N (výchozí je 1)\n"
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
@@ -6861,7 +6985,7 @@ msgstr ""
 "      --format=FORM�T  použije printf FORM�T pro výpis reálných �ísel,\n"
 "                       pro podrobnosti vizte FORM�T níže\n"
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
@@ -6871,14 +6995,14 @@ msgstr ""
 "                       automaticky přeškáluje vstupní �ísla na JEDNOTKY.\n"
 "                       Výchozí je „none“ (žádná). Vizte JEDNOTKY níže.\n"
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr ""
 "      --from-unit=N    ur�uje velikost vstupní jednotky (místo výchozí 1).\n"
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
@@ -6889,7 +7013,7 @@ msgstr ""
 "1 000 000\n"
 "                       (což znamená, že nemá smysl v locale C �i POSIX)\n"
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
@@ -6897,7 +7021,7 @@ msgstr ""
 "      --header[=N]     vypíše (bez převodu) prvních N řádků hlavi�ky,\n"
 "                         výchozí hodnota N je 1\n"
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
@@ -6906,7 +7030,7 @@ msgstr ""
 "                       abort (přerušit, výchozí), fail (selhat),\n"
 "                       warn (varovat), ignore (ignorovat).\n"
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -6920,7 +7044,7 @@ msgstr ""
 "                       výplň se ignoruje. Výchozí je automatická výplň,\n"
 "                       je-li nalezeno bílé místo.\n"
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
@@ -6931,7 +7055,7 @@ msgstr ""
 "                       from-zero (z nuly, výchozí), towards-zero (k nule),\n"
 "                       nearest (nejbližší)\n"
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
@@ -6941,19 +7065,19 @@ msgstr ""
 "volitelnou\n"
 "                       PŘ�PONU u vstupních �ísel\n"
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
 "      --to=JEDNOTKA    automaticky přeškáluje výstupní �ísla do JEDNOTEK.\n"
 "                       Vizte JEDNOTKY níže.\n"
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr "      --to-unit=N      velikost výstupní jednotky (místo výchozí 1).\n"
 
-#: src/numfmt.c:877
+#: src/numfmt.c:878
 msgid ""
 "\n"
 "UNIT options:\n"
@@ -6961,11 +7085,11 @@ msgstr ""
 "\n"
 "JEDNOTKY:\n"
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr "  none       neprovádí se žádné škálování. Přípony vyvolají chybu.\n"
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -6979,7 +7103,7 @@ msgstr ""
 "               1M  = 1000000,\n"
 "               1Mi = 1048576,\n"
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
@@ -6991,7 +7115,7 @@ msgstr ""
 "               1M = 1000000,\n"
 "               â‹®\n"
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
@@ -7003,7 +7127,7 @@ msgstr ""
 "               1M = 1048576,\n"
 "               â‹®\n"
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
@@ -7015,15 +7139,15 @@ msgstr ""
 "               1Mi = 1048576,\n"
 "               â‹®\n"
 
-#: src/numfmt.c:905
+#: src/numfmt.c:906
 #, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
 "\n"
 "FORM�T musí být vhodný pro zobrazení jednoho argumentu s plovoucí "
@@ -7031,10 +7155,11 @@ msgstr ""
 "�árkou „%f“.\n"
 "Volitelný apostrof (%'f) povolí seskupování (jako přepína� --grouping),\n"
 "podporuje-li to sou�asné locale.\n"
-"Volitelné zarovnání šířky (%10f) vyplní výstup. Volitelné záporné hodnoty\n"
-"šířky (%-10f) způsobí výplň výstupu zleva.\n"
+"Volitelné zarovnání šířky (%10f) vyplní výstup. Volitelné nulové hodnoty\n"
+"(%010f) šířky doplní �íslo nulami. Volitelné záporné hodnoty šířky (%-10f)\n"
+"způsobí výplň výstupu zleva.\n"
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -7053,7 +7178,7 @@ msgstr ""
 "ale návratový kód bude 0. S přepína�em --invalid='ignore' nejsou chyby\n"
 "převodu hlášeny a návratový kód je také 0.\n"
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -7090,116 +7215,116 @@ msgstr ""
 "  $ ls -lh | %s --header --field 5 --from=iec --padding=10\n"
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, c-format
 msgid "format %s has no %% directive"
 msgstr "formát %s nemá žádnou direktivu %%"
 
-#: src/numfmt.c:990
+#: src/numfmt.c:1003
 #, c-format
 msgid "invalid format %s (width overflow)"
 msgstr "neplatný formát %s (šířka přetekla)"
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr "výplň --format přebíjí --padding"
+
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr "formát %s kon�í na %%"
 
-#: src/numfmt.c:1010
+#: src/numfmt.c:1030
 #, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
-msgstr "neplatný formát %s, řídicí posloupnost musí být %%['][-][N]"
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
+msgstr "neplatný formát %s, řídicí posloupnost musí být %%[0]['][-][N]"
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr "formát %s má příliš mnoho direktiv %%"
 
-#: src/numfmt.c:1070
+#: src/numfmt.c:1081
 #, c-format
-msgid "invalid suffix in input '%s': '%s'"
-msgstr "neplatná přípona na vstupu „%s“: „%s“"
+msgid "invalid suffix in input %s: %s"
+msgstr "neplatná přípona na vstupu %s: %s"
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
 msgstr "hodnota je pro zobrazení příliš velká: „%Lg“ (zvažte použití --to)"
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
 msgstr ""
 "hodnota jen pro zobrazení příliš velká: „%Lg“ (hodnoty nad 999Y nelze "
 "zpracovat)"
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
-msgstr "velká vstupní hodnota „%s“: hrozí ztráta přesnosti"
+msgid "large input value %s: possible precision loss"
+msgstr "velká vstupní hodnota %s: hrozí ztráta přesnosti"
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
 "vstupní řádek je příliš krátký, v položce %ld nebyly nalezeny žádná �ísla "
 "k převodu"
 
-#: src/numfmt.c:1388
+#: src/numfmt.c:1403
 #, c-format
-msgid "invalid padding value '%s'"
-msgstr "chybný hodnota výplně „%s“"
+msgid "invalid padding value %s"
+msgstr "chybný hodnota výplně %s"
 
-#: src/numfmt.c:1401
+#: src/numfmt.c:1417
 #, c-format
-msgid "invalid field value '%s'"
-msgstr "chybná hodnota položky „%s“"
+msgid "invalid field value %s"
+msgstr "chybná hodnota položky %s"
 
-#: src/numfmt.c:1430
+#: src/numfmt.c:1447
 #, c-format
-msgid "invalid header value '%s'"
-msgstr "chybné hodnota hlavi�ky „%s“"
+msgid "invalid header value %s"
+msgstr "chybné hodnota hlavi�ky %s"
 
-#: src/numfmt.c:1456
+#: src/numfmt.c:1473
 #, c-format
 msgid "--grouping cannot be combined with --format"
 msgstr "přepína� --grouping nezle kombinovat s přepína�em --format"
 
-#: src/numfmt.c:1458
-#, c-format
-msgid "--padding cannot be combined with --format"
-msgstr "přepína� --padding nelze kombinovat s přepína�em --format"
-
-#: src/numfmt.c:1463
+#: src/numfmt.c:1478
 #, c-format
 msgid "no conversion option specified"
 msgstr "nezadán žádný přepína� konverze"
 
-#: src/numfmt.c:1471
+#: src/numfmt.c:1486
 #, c-format
 msgid "grouping cannot be combined with --to"
 msgstr "slu�ování do skupin nelze kombinovat s přepína�em --to"
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
 msgstr "v tomto locale nemá slu�ování do skupin žádný ú�inek"
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
 msgstr "přepína� --header je ignorován při vstupu z příkazového řádku"
 
-#: src/numfmt.c:1511
+#: src/numfmt.c:1526
 #, c-format
 msgid "error reading input"
 msgstr "chyba při �tení vstupu"
 
-#: src/numfmt.c:1520
+#: src/numfmt.c:1535
 #, c-format
 msgid "failed to convert some of the input numbers"
 msgstr "převod některých vstupních �ísel selhal"
 
-#: src/od.c:294
+#: src/od.c:320
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -7212,7 +7337,7 @@ msgstr ""
 "  nebo:  %s --traditional [PŘEP�NAČ]… [SOUBOR] [[+]POSUN[.][b] [+][N�VĚST�]"
 "[.][b]]\n"
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -7229,7 +7354,7 @@ msgstr ""
 "standardní vstup.\n"
 "\n"
 
-#: src/od.c:307
+#: src/od.c:333
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
 "if the last operand begins with + or (if there are 2 operands) a digit.\n"
@@ -7246,27 +7371,30 @@ msgstr ""
 "te�kou „.“, jsou považována za osmi�ková �ísla a pokud kon�í znakem „b“,\n"
 "znamená to, že budou násobena 512.\n"
 
-#: src/od.c:318
+#: src/od.c:344
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
-"  -A, --address-radix=Z�KLAD  formát výstupu pro pozice v souboru. Z�KLAD "
+"  -A, --address-radix=Z�KLAD  formát výstupu pro pozice v souboru; Z�KLAD "
 "je\n"
 "                              jeden z [doxn] pro soustavu desítkovou,\n"
 "                              osmi�kovou, šestnáctkovou nebo žádnou\n"
+"      --endian={big|little}   prohodí bajty vstupu podle zadaného pořadí\n"
 "  -j, --skip-bytes=POČET      přesko�í prvních POČET bajtů ze vstupu\n"
 
-#: src/od.c:323
+#: src/od.c:350
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
@@ -7280,14 +7408,14 @@ msgstr ""
 "                              je 32)\n"
 "      --traditional           přijímá argumenty v před-POSIXOVÉM tvaru\n"
 
-#: src/od.c:336
+#: src/od.c:363
 msgid ""
 "\n"
 "\n"
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 "\n"
@@ -7295,10 +7423,11 @@ msgstr ""
 "Před-POSIXOVÉ formáty mohou být používány spolu s POSIXOV�MI, to zahrnuje:\n"
 "  -a   stejné jako -t a,  názvy znaků, ignoruje nejvyšší bit\n"
 "  -b   stejné jako -t o1, bajty osmi�kově\n"
-"  -c   stejné jako -t c,  ASCII znaky nebo kódy znaků se zpětným lomítkem\n"
+"  -c   stejné jako -t c,  tisknutelné znaky nebo kódy znaků se zpětným "
+"lomítkem\n"
 "  -d   stejné jako -t u2, desítková bez znaménka (dvoubajtová)\n"
 
-#: src/od.c:345
+#: src/od.c:372
 msgid ""
 "  -f   same as -t fF, select floats\n"
 "  -i   same as -t dI, select decimal ints\n"
@@ -7314,21 +7443,21 @@ msgstr ""
 "  -s   stejné jako -t d2, desítková (dvoubajtová)\n"
 "  -x   stejné jako -t x2, šestnáctková (dvoubajtová)\n"
 
-#: src/od.c:353
+#: src/od.c:380
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 "\n"
 "\n"
 "TYP je tvořen z jedné nebo více těchto možností:\n"
 "  a          názvy znaků, nejvyšší bit je ignorován\n"
-"  c          ASCII znaky nebo kódy znaků se zpětným lomítkem\n"
+"  c          tisknutelné znaky nebo kódy znaků se zpětným lomítkem\n"
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -7342,7 +7471,7 @@ msgstr ""
 "  u[BAJTŮ]   desítkové bez znaménka s po�tem BAJTŮ na �íslo\n"
 "  x[BAJTŮ]   šestnáctkové s po�tem BAJTŮ na �íslo\n"
 
-#: src/od.c:367
+#: src/od.c:394
 msgid ""
 "\n"
 "SIZE is a number.  For TYPE in [doux], SIZE may also be C for\n"
@@ -7356,7 +7485,7 @@ msgstr ""
 "sizeof(long). Jestliže TYP je f, BAJTŮ může být také F jako sizeof(float),\n"
 "D jako sizeof(double) nebo L jako sizeof(long double).\n"
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
@@ -7366,7 +7495,7 @@ msgstr ""
 "Přidání přípony „z“ k typu způsobí vypsání tisknutelných znaků na konci\n"
 "každého výstupního řádku.\n"
 
-#: src/od.c:379
+#: src/od.c:406
 msgid ""
 "\n"
 "\n"
@@ -7389,12 +7518,12 @@ msgstr ""
 "  M    1024*1024\n"
 "a tak dále pro G, T, P, E, Z, Y.\n"
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, c-format
 msgid "invalid type string %s"
 msgstr "chybný typ řetězce %s"
 
-#: src/od.c:649
+#: src/od.c:690
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7403,7 +7532,7 @@ msgstr ""
 "chybný typ řetězce %s;\n"
 "tento systém nemá %lubajtová celá �ísla"
 
-#: src/od.c:770
+#: src/od.c:811
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7412,37 +7541,37 @@ msgstr ""
 "chybný typ řetězce %s;\n"
 "tento systém nemá %lubajtová �ísla s plovoucí řádovou �árkou"
 
-#: src/od.c:828
+#: src/od.c:869
 #, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr "znak „%c“ v řetězci typu „%s“ je chybný"
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr ""
 "více bajtů, než kolik obsahují všechny vstupní soubory, nelze přesko�it"
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr "chybný základ výstupní adresy „%c“; musí to být jeden ze znaků [doxn]"
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr "při vypisování řetězců nelze zadat typ"
 
-#: src/od.c:1810
+#: src/od.c:1863
 msgid "compatibility mode supports at most one file"
 msgstr "kompatibilní mód podporuje nejvýše jeden soubor"
 
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr "sou�et bajtů na přesko�ení a bajtů ke �tení je příliš velký"
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr "varování: chybná šířka %lu; užívám %d místo ní"
@@ -7605,12 +7734,12 @@ msgstr "Kdy"
 msgid "Where"
 msgstr "Odkud"
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr "Použití: %s [PŘEP�NAČ]… [UŽIVATEL]…\n"
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -7626,7 +7755,7 @@ msgstr ""
 "  -p              nevypisuje plán v dlouhém formátu\n"
 "  -s              krátký výstupní formát (implicitní)\n"
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -7639,7 +7768,7 @@ msgstr ""
 "  -i              nevypisuje celé jméno a odkud v krátkém formátu\n"
 "  -q              nevypisuje celé jméno, odkud a prostoj v krátkém formátu\n"
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, c-format
 msgid ""
 "\n"
@@ -7650,7 +7779,7 @@ msgstr ""
 "Odleh�ený program „finger“; vypisuje údaje o uživateli.\n"
 "Utmp soubor bude %s.\n"
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr "nezadáno jméno uživatele; při -l musí být uvedeno alespoň jedno"
@@ -7751,8 +7880,8 @@ msgid ""
 msgstr ""
 "  +PRVN�_STR�NKA[:POSLEDN�_STR�NKA], --pages=PRVN�_STR�NKA[:"
 "POSLEDN�_STR�NKA]\n"
-"                    za�ne [skon�í] výpis na stránce PRVN�_[POSLEDN�_]"
-"STR�NKA\n"
+"                    za�ne [skon�í] výpis na stránce "
+"PRVN�_[POSLEDN�_]STR�NKA\n"
 "  -SLOUPCÅ®, --columns=SLOUPCÅ®\n"
 "                    produkuje SLOUPCŮ-sloupcový výstup. Řádky vypisuje\n"
 "                    na stránku do sloupců, pokud není použit přepína� -a.\n"
@@ -7868,7 +7997,8 @@ msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
@@ -7880,7 +8010,7 @@ msgstr ""
 "                    sloupcových přepína�ů (-COLUMN|-a -COLUMN|-m), kromě\n"
 "                    případu, kdy je zadán přepína� -w\n"
 
-#: src/pr.c:2827
+#: src/pr.c:2828
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
 "                    separate columns by STRING,\n"
@@ -7896,7 +8026,7 @@ msgstr ""
 "                    neovlivňuje parametry sloupců.\n"
 "  -t, --omit-header nevypisuje hlavi�ky a pati�ky stránek\n"
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 msgid ""
 "  -T, --omit-pagination\n"
 "                    omit page headers and trailers, eliminate any "
@@ -7920,7 +8050,7 @@ msgstr ""
 "                    nastaví šířku stránky na Š�ŘKA_STR�NKY (72) znaků pouze\n"
 "                    pro vícesloupcový výstup, -s[ZNAK] vypíná (72)\n"
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
 "                    set page width to PAGE_WIDTH (72) characters always,\n"
@@ -7933,7 +8063,7 @@ msgstr ""
 "                    když není zadán přepína� -J, zkracuje řádky;\n"
 "                    neovlivňuje -S nebo -s.\n"
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 msgid ""
 "\n"
 "-t is implied if PAGE_LENGTH <= 10.  With no FILE, or when FILE is -, read\n"
@@ -7957,9 +8087,9 @@ msgstr ""
 "\n"
 
 #: src/printenv.c:69
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr ""
-"  -0, --null     každý výstupní řádek zakon�í nulový bajtem místo znakem\n"
+"  -0, --null     každý výstupní řádek zakon�í znakem NUL místo znakem\n"
 "                 nového řádku\n"
 
 #: src/printf.c:79
@@ -8079,12 +8209,12 @@ msgstr "varování: přebyte�né argumenty jsou ignorovány po�ínaje %s"
 msgid "F. Pinard"
 msgstr "François Pinard"
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, c-format
 msgid "%s (for regexp %s)"
 msgstr "%s (pro regvýr %s)"
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
@@ -8093,14 +8223,14 @@ msgstr ""
 "Použití: %s [PŘEP�NAČ]… [VSTUP]… (bez -G)\n"
 "  nebo:  %s -G [PŘEP�NAČ]… [VSTUP [V�STUP]]\n"
 
-#: src/ptx.c:1821
+#: src/ptx.c:1824
 msgid ""
 "Output a permuted index, including context, of the words in the input "
 "files.\n"
 msgstr ""
 "Vypíše permutovaný rejstřík, v�etně kontextu, slov ze vstupních souborů\n"
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
 "  -G, --traditional              behave more like System V 'ptx'\n"
@@ -8112,7 +8242,7 @@ msgstr ""
 "  -F, --flag-truncation=ŘETĚZEC  použije ŘETĚZEC pro ur�ení zkracování "
 "řádků\n"
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
 "  -O, --format=roff              generate output as roff directives\n"
@@ -8126,7 +8256,7 @@ msgstr ""
 "  -S, --sentence-regexp=REGV�R   pro konec řádků a konec vět\n"
 "  -T, --format=tex               generuje výstup pro TeX\n"
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -8145,7 +8275,7 @@ msgstr ""
 "                                 ze SOUBORU\n"
 "  -o, --only-file=SOUBOR         pře�tení seznamu slov pouze ze SOUBORU\n"
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -8156,16 +8286,16 @@ msgstr ""
 "  -t, --typeset-mode             – neimplementováno –\n"
 "  -w, --width=Č�SLO              šířka výstupu ve sloupcích, bez odkazů\n"
 
-#: src/ptx.c:1854
+#: src/ptx.c:1857
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
 "\n"
-"Jestliže není SOUBOR zadán nebo je „-“, bude �ten standardní vstup.\n"
-"Implicitní přepína�e: „-F /“\n"
+"Není-li uveden SOUBOR nebo když je SOUBOR „-“, �te ze standardního vstupu.\n"
+"Výchozí je „-F /“.\n"
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, c-format
 msgid "invalid gap width: %s"
 msgstr "chybné šířka mezery: %s"
@@ -8187,22 +8317,30 @@ msgstr ""
 "odkazy\n"
 "  -P, --physical  vyhne se všem symbolickým odkazům\n"
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+"\n"
+"Ne ní-li zadán žádný přepína�, předpokládá se -P.\n"
+
+#: src/pwd.c:169
 #, c-format
 msgid "failed to chdir to %s"
 msgstr "změna pracovního adresáře na %s selhala"
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, c-format
 msgid "failed to stat %s"
 msgstr "nelze získat informace o %s"
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr "v %s nemohu nalézt položku adresáře příslušného i-uzlu"
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, c-format
 msgid "ignoring non-option arguments"
 msgstr "ignoruji argumenty, které nejsou přepína�i"
@@ -8212,8 +8350,8 @@ msgstr "ignoruji argumenty, které nejsou přepína�i"
 msgid "Dmitry V. Levin"
 msgstr "Dmitry V. Levin"
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Použití: %s [PŘEP�NAČ]… SOUBOR…\n"
@@ -8257,8 +8395,7 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 "  -m, --canonicalize-missing    kanonizuje rekurzivním následováním každého\n"
 "                                symbolického odkazu v každé �ásti zadaného\n"
@@ -8268,7 +8405,9 @@ msgstr ""
 "  -q, --quiet,\n"
 "  -s, --silent                  potla�í většinu chybových hlášek\n"
 "  -v, --verbose                 hlásí chyby\n"
-"  -z, --zero                    výstup oddělí znakem NUL místo novým řádkem\n"
+"  -z, --zero                    zakon�í každý výstupní řádek znakem NUL "
+"místo\n"
+"                                novým řádkem\n"
 
 #: src/readlink.c:152
 #, c-format
@@ -8295,7 +8434,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 "  -e, --canonicalize-existing  všechny �ásti cesty musí existovat\n"
@@ -8309,8 +8448,9 @@ msgstr ""
 "      --relative-base=SOUBOR   vypíše absolutní cestu, nekon�í-li pod "
 "SOUBOREM\n"
 "  -s, --strip, --no-symlinks   nevyhodnocuje symbolické odkazy\n"
-"  -z, --zero                   výstup bude oddělen nulovými znaky namísto\n"
-"                               znaky konce řádku\n"
+"  -z, --zero                   zakon�í každý výstupní řádek znakem NUL "
+"namísto\n"
+"                               nového řádku\n"
 "\n"
 
 #: src/relpath.c:130
@@ -8327,41 +8467,42 @@ msgstr "%s: sestoupit do proti zápisu chráněného adresáře %s?"
 msgid "%s: descend into directory %s? "
 msgstr "%s: sestoupit do adresáře %s?"
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr "%s: smazat proti zápisu chráněný %s %s? "
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, c-format
 msgid "%s: remove %s %s? "
 msgstr "%s: smazat %s %s? "
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, c-format
 msgid "removed directory: %s\n"
 msgstr "smazán adresář: %s\n"
 
-#: src/remove.c:444
+#: src/remove.c:447
 #, c-format
-msgid "cannot remove directory: %s"
-msgstr "adresář nelze smazat: %s"
+msgid "refusing to remove %s or %s directory: skipping %s"
+msgstr "odstranění %s nebo adresáře %s se zamítá: přeskakuje se %s"
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
-msgstr "přeskakuji %s, protože se nachází na jiném zařízení"
+msgstr "přeskakuje se %s, protože se nachází na jiném zařízení"
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, c-format
 msgid "traversal failed: %s"
 msgstr "průchod se nezdařil: %s"
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -8393,20 +8534,20 @@ msgstr ""
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 "  -I                    zeptá se jednou před smazáním více než tří souborů,\n"
-"                        nebo rekurzivním mazáním. Obtěžuje méně než -i,\n"
-"                        přesto poskytuje ochranu proti většině chyb.\n"
+"                        nebo rekurzivním mazáním; obtěžuje méně než -i,\n"
+"                        přesto poskytuje ochranu proti většině chyb\n"
 "      --interactive[=KDY]\n"
 "                        ptá se podle KDY: „never“ (nikdy), „once“ (jednou, -"
 "I)\n"
-"                        nebo „always“ (vždy, -i). Bez KDY se ptá vždy.\n"
+"                        nebo „always“ (vždy, -i); bez KDY se ptá vždy\n"
 
 #: src/rm.c:149
 msgid ""
@@ -8478,13 +8619,19 @@ msgstr ""
 
 #: src/rm.c:342
 #, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr "%s: smazat všechny argumenty rekurzivně? "
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] "%s: smazat %zu argument rekurzivnÄ›? "
+msgstr[1] "%s: smazat %zu argumenty rekurzivnÄ›? "
+msgstr[2] "%s: smazat %zu argumentů rekurzivně? "
 
-#: src/rm.c:343
+#: src/rm.c:345
 #, c-format
-msgid "%s: remove all arguments? "
-msgstr "%s: smazat všechny argumenty? "
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] "%s: smazat %zu argument? "
+msgstr[1] "%s: smazat %zu argumenty? "
+msgstr[2] "%s: smazat %zu argumentů? "
 
 #: src/rmdir.c:134 src/rmdir.c:233
 #, c-format
@@ -8538,10 +8685,10 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
-"Spustí program v jiném bezpe�nostním kontextu.\n"
+"Spustí program v jiném bezpe�nostním kontextu SELinuxu.\n"
 "Bez KONTEXTU a bez PŘ�KAZU vypíše sou�asný bezpe�nostní kontext.\n"
 
 #: src/runcon.c:94
@@ -8597,41 +8744,46 @@ msgstr "musíte zadat -c, -t, -u, -l, -r nebo kontext"
 msgid "no command specified"
 msgstr "nebyl zadán žádný příkaz"
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr "%s lze provozovat jen na jádře podporujícím SELinux"
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, c-format
 msgid "failed to compute a new context"
 msgstr "selhal výpo�et nového kontextu"
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, c-format
 msgid "failed to set new user %s"
 msgstr "selhalo nastavení nového uživatele %s"
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, c-format
 msgid "failed to set new type %s"
 msgstr "selhalo nastavení nového druhu %s"
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, c-format
 msgid "failed to set new range %s"
 msgstr "selhalo nastavení nového rozsahu %s"
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, c-format
 msgid "failed to set new role %s"
 msgstr "selhalo nastavení nové role %s"
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, c-format
 msgid "unable to set security context %s"
 msgstr "bezpe�nostní kontext %s nelze nastavit"
 
+#: src/selinux.c:127 src/selinux.c:300
+#, c-format
+msgid "error canonicalizing %s"
+msgstr "chyba při normalizaci %s"
+
 #: src/seq.c:68
 #, c-format
 msgid ""
@@ -8663,6 +8815,8 @@ msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
@@ -8670,11 +8824,13 @@ msgstr ""
 "\n"
 "Bude-li PRVN� nebo PŘ�RŮSTEK vynechán, implicitně se nastaví na 1. Což\n"
 "znamená, že vynechaný PŘ�RŮSTEK bude 1, i když POSLEDN� je menší než PRVN�.\n"
+"Posloupnost �ísel kon�í, když sou�et sou�asného �ísla a PŘ�RŮSTKU by byl\n"
+"větší než POSLEDN�.\n"
 "PRVN�, PŘ�RŮSTEK a POSLEDN� jsou údaje v pohyblivé řádové �árce. PŘ�RŮSTEK\n"
 "bývá kladný, když PRVN� je menší než POSLEDN�, a bývá záporný, když PRVN�\n"
 "je větší než POSLEDN�.\n"
 
-#: src/seq.c:94
+#: src/seq.c:96
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
 "it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n"
@@ -8685,90 +8841,29 @@ msgstr ""
 "desítková �ísla s pevnou řádovou �árkou s největší přesností PŘES, jinak "
 "„%g“.\n"
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, c-format
 msgid "invalid floating point argument: %s"
 msgstr "chybný argument v pohyblivé řádové �árce: %s"
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr "formát %s má neznámou direktivu %%%c"
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr ""
 "formátovací řetězec nesmí být zadán při požadavku na tisk stejně širokých "
 "řetězců"
 
-#: src/setuidgid.c:49
-#, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-"Použití: %s [KR�TK�_PŘEP�NAČ]… JMÉNO_UŽIVATELE PŘ�KAZ [ARGUMENT]…\n"
-"  nebo:  %s DLOUH�_PŘEP�NAČ\n"
-
-#: src/setuidgid.c:55
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-"Zbaví se doplňkových skupin, převezme ID uživatele a ID skupiny ur�ené\n"
-"JMÉNEM_UŽIVATELE (�íselným ID nebo jménem) a spustí PŘ�KAZ se zadanými\n"
-"ARGUMENTY.\n"
-"Skon�í s výstupním kódem 111, pokud není možné přejmout požadované ID\n"
-"uživatele a skupiny. Jinak vrátí výstupní kód PŘ�KAZU.\n"
-"Tento program má smysl jen, je-li vyvolán rootem (ID uživatele 0).\n"
-"\n"
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-"  -g GID[,GID1…]    taktéž nastaví primární ID skupiny na �íslo GID a\n"
-"                    (je-li zadáno) ID doplňkových skupin na GID1, …\n"
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr "neznámé ID uživatele: %s"
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr "abyste mohli použit ID uživatele %s, musíte také použít -g"
-
-#: src/setuidgid.c:190
-#, c-format
-msgid "failed to set supplemental group(s)"
-msgstr "doplňkovou skupinu(y) nelze nastavit"
-
-#: src/setuidgid.c:200
-#, c-format
-msgid "cannot set group-ID to %lu"
-msgstr "ID skupiny nelze nastavit na %lu"
-
-#: src/setuidgid.c:204
-#, c-format
-msgid "cannot set user-ID to %lu"
-msgstr "ID uživatele nelze nastavit na %lu"
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr "Colin Plumb"
 
-#: src/shred.c:148
+#: src/shred.c:170
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
 "for even very expensive hardware probing to recover the data.\n"
@@ -8777,7 +8872,7 @@ msgstr ""
 "obsahu\n"
 "i za použití velmi drahého vybavení.\n"
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -8794,29 +8889,34 @@ msgstr ""
 "  -s, --size=N   aplikuje na toto množství bajtů (přípony jako K, M, G\n"
 "                 jsou možné)\n"
 
-#: src/shred.c:161
+#: src/shred.c:183
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
 "  -z, --zero     add a final overwrite with zeros to hide shredding\n"
 msgstr ""
-"  -u, --remove   zkrátí a smaže soubor po přepsání\n"
+"  -u, --remove[=JAK]\n"
+"                 zkrátí a smaže soubor po přepsání; vizte níže\n"
 "  -v, --verbose  výpis informací o průběhu\n"
 "  -x, --exact    nezaokrouhluje velikost souboru nahoru na celé bloky;\n"
 "                 implicitní pro ne-oby�ejné soubory\n"
 "  -z, --zero     přidá poslední fázi přepisu nulami, aby zametl stopy\n"
 
-#: src/shred.c:170
+#: src/shred.c:192
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 "\n"
@@ -8824,10 +8924,15 @@ msgstr ""
 "\n"
 "Je-li zadáno --remove (-u), SOUBOR(Y) smaže. Výchozí chování je nemazat\n"
 "soubory, protože je běžné zpracovávat zařízení jako /dev/hda a tyto\n"
-"soubory se obvykle nemažou. Pokud se pracuje nad oby�ejným souborem,\n"
-"většina lidí volí přepína� --remove.\n"
+"soubory se obvykle nemažou.\n"
+"Volitelný parametr JAK ur�uje, jak smazat položku adresáře:\n"
+"„unlink“ → použije se standardní volání unlink.\n"
+"„wipe“ → rovněž nejprve zne�itelní bajty v názvu.\n"
+"„wipesync“ → rovněž synchronizuje každý zne�itelněný bajt na disk.\n"
+"Výchozí režim je „wipesync“, avšak mějte na paměti, že je náro�ný.\n"
+"\n"
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -8846,7 +8951,7 @@ msgstr ""
 "těchto systémů:\n"
 "\n"
 
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -8868,7 +8973,7 @@ msgstr ""
 "Network Appliance\n"
 "\n"
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -8882,7 +8987,7 @@ msgstr ""
 "* komprimované souborové systémy\n"
 "\n"
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -8904,7 +9009,7 @@ msgstr ""
 "(man mount).\n"
 "\n"
 
-#: src/shred.c:215
+#: src/shred.c:241
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
 "of the file that cannot be removed, and that will allow a shredded file\n"
@@ -8914,127 +9019,127 @@ msgstr ""
 "souboru, který nemůže být smazán, a tak umožňují pozdější obnovu\n"
 "skartovaných souborů.\n"
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, c-format
 msgid "%s: fdatasync failed"
 msgstr "%s: fdatasync selhala"
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr "%s: fsync selhala"
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr "%s: nelze převinout"
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr "%s: průchod %lu/%lu (%s)…"
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, c-format
 msgid "%s: error writing at offset %s"
 msgstr "%s: chyba při zápisu na pozici %s"
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s: lseek selhala"
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, c-format
 msgid "%s: file too large"
 msgstr "%s: soubor je příliš dlouhý"
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr "%s: průchod %lu/%lu (%s)…%s"
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr "%s: průchod %lu/%lu (%s)…%s/%s %d%%"
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, c-format
 msgid "%s: fstat failed"
 msgstr "%s: fstat selhala"
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, c-format
 msgid "%s: invalid file type"
 msgstr "%s: chybný typ souboru"
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr "%s: soubor má zápornou velikost"
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, c-format
 msgid "%s: error truncating"
 msgstr "%s: chyba při zkracování souboru"
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, c-format
 msgid "%s: fcntl failed"
 msgstr "%s: fcntl selhala"
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr "%s: shred nelze použít na deskriptor souboru otevřený pro připojování"
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr "%s: probíhá mazání"
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, c-format
 msgid "%s: renamed to %s"
 msgstr "%s: přejmenováno na %s"
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, c-format
 msgid "%s: failed to remove"
 msgstr "%s: mazání selhalo"
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr "%s: smazán"
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, c-format
 msgid "%s: failed to close"
 msgstr "%s: uzavření selhalo"
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, c-format
 msgid "%s: failed to open for writing"
 msgstr "%s: soubor nelze otevřít pro zápis"
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, c-format
 msgid "%s: invalid number of passes"
 msgstr "%s: neplatný po�et průchodů"
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, c-format
 msgid "multiple random sources specified"
 msgstr "zadáno více zdrojů náhodných �ísel"
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, c-format
 msgid "%s: invalid file size"
 msgstr "%s: chybná velikost souboru"
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -9045,11 +9150,11 @@ msgstr ""
 "  nebo:  %s -e [PŘEP�NAČ]… [ARG]…\n"
 "  nebo:  %s -i DO-HO [PŘEP�NAČ]…\n"
 
-#: src/shuf.c:54
+#: src/shuf.c:67
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr "Vypíše náhodnou permutaci vstupních řádků na standardní výstup.\n"
 
-#: src/shuf.c:60
+#: src/shuf.c:73
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
 "  -i, --input-range=LO-HI   treat each number LO through HI as an input "
@@ -9057,7 +9162,7 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
 msgstr ""
 "  -e, --echo                každý ARG považuje za vstupní řádek\n"
 "  -i, --input-range=DO-HO   každé �íslo DO až HO považuje za vstupní řádek\n"
@@ -9066,34 +9171,43 @@ msgstr ""
 "                            standardní výstup\n"
 "      --random-source=SOUBOR\n"
 "                            získá náhodné bajty ze SOUBORU\n"
-"  -z, --zero-terminated     řádky zakon�í bajtem 0 místo znakem nového "
-"řádku\n"
+"  -r, --repeat              výstupní řádky se mohou opakovat\n"
+
+#: src/shuf.c:228
+#, c-format
+msgid "too many input lines"
+msgstr "příliš mnoho vstupních řádků"
 
-#: src/shuf.c:244
+#: src/shuf.c:431
 #, c-format
 msgid "multiple -i options specified"
 msgstr "zadáno více přepína�ů -i"
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, c-format
 msgid "invalid input range %s"
 msgstr "neplatný vstupní rozsah %s"
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, c-format
 msgid "invalid line count %s"
 msgstr "neplatný po�et řádků %s"
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, c-format
 msgid "multiple output files specified"
 msgstr "zadáno více výstupních souborů"
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, c-format
 msgid "cannot combine -e and -i options"
 msgstr "přepína�e -e a -i nelze kombinovat"
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr "žádné řádky na opakování"
+
 #: src/sleep.c:44
 #, c-format
 msgid ""
@@ -9117,21 +9231,21 @@ msgstr ""
 "�ekat po dobu danou sou�tem zadaných hodnot.\n"
 "\n"
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, c-format
 msgid "invalid time interval %s"
 msgstr "chybné �asový interval %s"
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr "z hodin reálného �asu nelze �íst"
 
-#: src/sort.c:399
+#: src/sort.c:427
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr "Vypíše seřazené zřetězení všech SOUBORŮ na standardní výstup.\n"
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
@@ -9139,7 +9253,7 @@ msgstr ""
 "Řadicí přepína�e:\n"
 "\n"
 
-#: src/sort.c:409
+#: src/sort.c:437
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
 "  -d, --dictionary-order      consider only blanks and alphanumeric "
@@ -9150,7 +9264,7 @@ msgstr ""
 "  -d, --dictionary-order      uvažuje pouze mezery a alfanumerické znaky\n"
 "  -f, --ignore-case           převede malá písmena na velká\n"
 
-#: src/sort.c:415
+#: src/sort.c:443
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
 "  -i, --ignore-nonprinting    consider only printable characters\n"
@@ -9161,14 +9275,14 @@ msgstr ""
 "  -M, --month-sort            porovnává podle měsíců\n"
 "                              (neznámý) < „LED“ < … < „PRO“\n"
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 "  -h, --human-numeric-sort    porovnává �ísla v lidsky �itelné podobě\n"
 "                              (například 2K 1G)\n"
 
-#: src/sort.c:423
+#: src/sort.c:451
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
 "  -R, --random-sort           sort by random hash of keys\n"
@@ -9180,7 +9294,7 @@ msgstr ""
 "      --random-source=SOUBOR  získá náhodné bajty ze SOUBORU\n"
 "  -r, --reverse               obrátí výsledek porovnávání\n"
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -9196,7 +9310,7 @@ msgstr ""
 "  -V, --version-sort          přirozené řazení (verzovacích) �ísel v textu\n"
 "\n"
 
-#: src/sort.c:437
+#: src/sort.c:465
 msgid ""
 "Other options:\n"
 "\n"
@@ -9204,7 +9318,7 @@ msgstr ""
 "Další přepína�e:\n"
 "\n"
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
@@ -9212,7 +9326,7 @@ msgstr ""
 "      --batch-size=PSPOJŮ   najednou spojí nejvýše PSPOJŮ vstupů;\n"
 "                            při více použije do�asné soubory\n"
 
-#: src/sort.c:445
+#: src/sort.c:473
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
 "  -C, --check=quiet, --check=silent  like -c, but do not report first bad "
@@ -9228,7 +9342,7 @@ msgstr ""
 "                            pomocné soubory komprimuje příkazem PROGRAM,\n"
 "                            dekomprimuje je pomocí PROGRAM -d\n"
 
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -9243,7 +9357,7 @@ msgstr ""
 "                            Je-li S „-“, pak na�te jména ze standardního "
 "vstupu\n"
 
-#: src/sort.c:459
+#: src/sort.c:487
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
 "  -m, --merge               merge already sorted files; do not sort\n"
@@ -9252,7 +9366,7 @@ msgstr ""
 "                            a druh\n"
 "  -m, --merge               spojí již seřazené soubory, neřadí\n"
 
-#: src/sort.c:463
+#: src/sort.c:491
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "  -s, --stable              stabilize sort by disabling last-resort "
@@ -9267,7 +9381,7 @@ msgstr ""
 "  -S, --buffer-size=VELIKOST\n"
 "                            použije VELIKOST pro hlavní paměťový buffer\n"
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -9292,12 +9406,7 @@ msgstr ""
 "  -u, --unique              s -c testuje striktní uspořádání;\n"
 "                            jinak vypíše pouze první ze stejných sekvencí\n"
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr ""
-"  -z, --zero-terminated     vstupní řádky jsou ukon�eny bajtem 0 místo LF\n"
-
-#: src/sort.c:483
+#: src/sort.c:511
 msgid ""
 "\n"
 "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is "
@@ -9328,7 +9437,7 @@ msgstr ""
 "\n"
 "VELIKOST smí být následována těmito násobnými příponami:\n"
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -9348,132 +9457,117 @@ msgstr ""
 "Tradi�ní pořadí řazení, které používá hodnoty jednotlivých bajtů, získáte\n"
 "nastavením LC_ALL=C.\n"
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, c-format
 msgid "waiting for %s [-d]"
 msgstr "�ekám na %s [-d]"
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr "%s [-d] skon�il neobvykle"
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, c-format
 msgid "cannot create temporary file in %s"
 msgstr "v %s nelze vytvořit do�asný soubor"
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr "soubor se nepodařilo otevřít"
 
-#: src/sort.c:970
+#: src/sort.c:998
 msgid "fflush failed"
 msgstr "vyprázdnění souborového proudu selhalo"
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr "uzavření souboru selhalo"
 
-#: src/sort.c:986
-#, c-format
-msgid "dup2 failed"
-msgstr "volání dup2 selhalo"
-
-#: src/sort.c:1103
-#, c-format
-msgid "couldn't execute %s"
-msgstr "nelze provést %s"
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 msgid "couldn't create temporary file"
 msgstr "nelze vytvořit do�asný soubor"
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, c-format
 msgid "couldn't create process for %s -d"
 msgstr "pro %s -d nelze založit proces"
 
-#: src/sort.c:1161
-#, c-format
-msgid "couldn't execute %s -d"
-msgstr "nelze provést %s -d"
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, c-format
 msgid "warning: cannot remove: %s"
 msgstr "varování: nelze smazat: %s"
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, c-format
 msgid "invalid --%s argument %s"
 msgstr "argument %2$s za --%1$s je neplatný"
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, c-format
 msgid "minimum --%s argument is %s"
 msgstr "minimální argument pro --%s je %s"
 
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, c-format
 msgid "--%s argument %s too large"
 msgstr "argument %2$s za --%1$s je příliš velký"
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr "maximální argument pro --%s se sou�asnými běhovými limity je %s"
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr "�íslo u --parallel nesmí být nulové"
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr "funkce stat selhala"
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr "�tení ze souboru se nezdařilo"
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, c-format
 msgid "string transformation failed"
 msgstr "převod řetězce selhal"
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, c-format
 msgid "the untransformed string was %s"
 msgstr "nepřevedený řetězec byl %s"
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr "^ žádná shoda klí�e\n"
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr "použit zastaralý klí� %s, zvažte použití %s"
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr "klí� %lu má nulovou šířku a nebude brán na zřetel"
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr "úvodní mezery u klí�e %lu mají význam, zvažte též zadání „b“"
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr "klí� %lu je �íselný a zasahuje do více položek"
 
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
@@ -9481,122 +9575,122 @@ msgstr[0] "přepína� „-%s“ je ignorován"
 msgstr[1] "přepína�e „-%s“ jsou ignorovány"
 msgstr[2] "přepína�e „-%s“ jsou ignorovány"
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr "přepína� „-r“ se vztahuje jen na poslední možné porovnání"
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr "zápis se nezdařil"
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr "%s: %s:%s: neseřaditelný řádek: "
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr "standardní chybový výstup"
 
-#: src/sort.c:3698
+#: src/sort.c:3738
 msgid "cannot read"
 msgstr "nelze �íst"
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, c-format
 msgid "%s: invalid field specification %s"
 msgstr "%s: neplatné ur�ení položky %s"
 
-#: src/sort.c:3987
+#: src/sort.c:4028
 #, c-format
 msgid "options '-%s' are incompatible"
 msgstr "přepína�e „-%s“ nejsou slu�itelné"
 
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, c-format
 msgid "%s: invalid count at start of %s"
 msgstr "%s: neplatné �íslo na za�átku %s"
 
-#: src/sort.c:4295
+#: src/sort.c:4336
 msgid "invalid number after '-'"
 msgstr "neplatné �íslo za „-“"
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 msgid "invalid number after '.'"
 msgstr "neplatné �íslo za „.“"
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr "zbloudilý znak v zadání řadicí položky"
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, c-format
 msgid "multiple compress programs specified"
 msgstr "zadáno více kompresních programů"
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
 msgstr "neplatné �íslo na za�átku položky"
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
 msgstr "�íslo položky je nula"
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr "posun znaku je nula"
 
-#: src/sort.c:4407
+#: src/sort.c:4448
 msgid "invalid number after ','"
 msgstr "neplatné �íslo za „,“"
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr "zvolený oddělova� položek je prázdný"
 
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, c-format
 msgid "cannot read file names from %s"
 msgstr "z %s nelze na�íst jména souborů"
 
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr "%s:%lu: neplatný název souboru s nulovou délkou"
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, c-format
 msgid "no input from %s"
 msgstr "žádný vstup z %s"
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr "použijí se řadicí pravidla %s"
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr "použije se oby�ejné porovnávání bajtů"
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr "další argument %s není s -%c dovolen"
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr "délka přípony musí být alespoň %zu"
 
-#: src/split.c:204
+#: src/split.c:203
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr "Použití: %s [PŘEP�NAČ]… [VSTUP [PŘEDPONA]]\n"
 
-#: src/split.c:208
+#: src/split.c:207
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
 "size is 1000 lines, and default PREFIX is 'x'.  With no INPUT, or when "
@@ -9607,27 +9701,26 @@ msgstr ""
 "délka je 1000 řádků a výchozí PŘEDPONA je „x“. Pokud VSTUP nebude zadán\n"
 "nebo bude „-“, bude �ten standardní vstup.\n"
 
-#: src/split.c:216
+#: src/split.c:215
 #, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
 "  -a, --suffix-length=N   použije přípony délky N (výchozí je %d)\n"
 "      --additional-suffix=P�PONA\n"
-"                          k názvům souborů připojí dodate�nou PŘ�PONU.\n"
+"                          k názvům souborů připojí dodate�nou PŘ�PONU\n"
 "  -b, --bytes=VELIKOST    zapíše VELIKOST bajtů do každého výstupního "
 "souboru\n"
 "  -C, --line-bytes=VELIKOST\n"
@@ -9635,19 +9728,19 @@ msgstr ""
 "do\n"
 "                          každého souboru\n"
 "  -d, --numeric-suffixes[=OD]\n"
-"                          použije �íselné přípony místo abecedních, OD mění\n"
-"                          po�áte�ní hodnotu (výchozí je 0).\n"
+"                          použije �íselné přípony místo abecedních; OD mění\n"
+"                          po�áte�ní hodnotu (výchozí je 0)\n"
 "  -e, --elide-empty-files\n"
 "                          netvoří prázdné výstupní soubory, je-li použito „-"
 "n“\n"
 "      --filter=PŘ�KAZ     zapíše do shellového PŘ�KAZU, název souboru je "
 "$FILE\n"
 "  -l, --lines=POČET       zapíše POČET řádků do každého výstupního souboru\n"
-"  -n, --number=D�LŮ       vytvoří D�LŮ výstupních souborů. Vizte níže.\n"
+"  -n, --number=D�LŮ       vytvoří D�LŮ výstupních souborů; vysvětlení níže\n"
 "  -u, --unbuffered        okamžitě kopíruje vstup na výstup spolu s „-n r/"
 "…“\n"
 
-#: src/split.c:229
+#: src/split.c:228
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
 "                            output file is opened\n"
@@ -9655,7 +9748,7 @@ msgstr ""
 "      --verbose           před otevřením každého výstupního souboru vypíše\n"
 "                          oznámení o tomto\n"
 
-#: src/split.c:236
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -9675,191 +9768,191 @@ msgstr ""
 "r/N     jako „l“, ale použije se cyklické dělení\n"
 "r/K/N   podobně, ale na standardní výstup vypíše pouze K-tý z N\n"
 
-#: src/split.c:354
+#: src/split.c:353
 #, c-format
 msgid "output file suffixes exhausted"
 msgstr "přípony výstupních souborů vy�erpány"
 
-#: src/split.c:366
+#: src/split.c:365
 #, c-format
 msgid "creating file %s\n"
 msgstr "vytvářím soubor %s\n"
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr "%s by přepsalo vstup; zpracování přerušeno"
 
-#: src/split.c:391
+#: src/split.c:390
 #, c-format
 msgid "failed to set FILE environment variable"
 msgstr "proměnnou prostředí FILE se nepodařilo nastavit"
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr "provádí se s FILE=%s\n"
 
-#: src/split.c:395
+#: src/split.c:394
 #, c-format
 msgid "failed to create pipe"
 msgstr "rouru nebylo možné vytvořit"
 
-#: src/split.c:409
+#: src/split.c:408
 #, c-format
 msgid "closing prior pipe"
 msgstr "zavírá se předchozí roura"
 
-#: src/split.c:411
+#: src/split.c:410
 #, c-format
 msgid "closing output pipe"
 msgstr "zavírá se výstupní roura"
 
-#: src/split.c:415
+#: src/split.c:414
 #, c-format
 msgid "moving input pipe"
 msgstr "přesunuje se vstupní roura"
 
-#: src/split.c:417
+#: src/split.c:416
 #, c-format
 msgid "closing input pipe"
 msgstr "zavírá se vstupní roura"
 
-#: src/split.c:422
+#: src/split.c:421
 #, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr "selhalo spuštění příkazu: „%s -c %s“"
 
-#: src/split.c:428
+#: src/split.c:427
 #, c-format
 msgid "failed to close input pipe"
 msgstr "uzavření vstupní roury selhalo"
 
-#: src/split.c:464
+#: src/split.c:463
 #, c-format
 msgid "waiting for child process"
 msgstr "�eká se na proces potomka"
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr "s FILE=%s, signálem %s z příkazu: %s"
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr "s FILE=%s, návratový kód %d z příkazu: %s"
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr "neznámý návratový kód příkazu (0x%X)"
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr "soubor nelze rozdělit více způsoby"
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, c-format
 msgid "%s: invalid number of chunks"
 msgstr "%s: neplatný po�et dílů"
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, c-format
 msgid "%s: invalid chunk number"
 msgstr "%s: chybné �íslo dílů"
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr "%s: chybná délka přípony"
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr "%s: chybný po�et bajtů"
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr "%s: chybný po�et řádků"
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, c-format
 msgid "line count option -%s%c... is too large"
 msgstr "přepína� po�tu řádků -%s%c… je příliš velký"
 
-#: src/split.c:1248
+#: src/split.c:1298
 #, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr "%s: chybná po�áte�ní hodnota �íselné přípony"
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, c-format
 msgid "%s: invalid IO block size"
 msgstr "%s: chybná velikost I/O bloku"
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr "--filter nezpracuje kus vytažený na standardní výstup"
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr "po�áte�ní hodnota �íselné přípony je na příponu příliš dlouhá"
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, c-format
 msgid "%s: cannot determine file size"
 msgstr "%s: velikost souboru nelze ur�it"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr "Michael Meskes"
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, c-format
 msgid "failed to canonicalize %s"
 msgstr "normalizace %s selhala"
 
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr "pozor: neznámá escape sekvence „\\%c“"
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, c-format
 msgid "%s: invalid directive"
 msgstr "%s: chybná specifikace"
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, c-format
 msgid "warning: backslash at end of format"
 msgstr "varování: zpětné lomítko na konci formátovacího řetězce"
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr ""
 "v režimu práce se systémem souborů není možné ozna�it standardní vstup "
 "pomocí %s"
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, c-format
 msgid "cannot read file system information for %s"
 msgstr "nelze pře�íst informace souborového systému pro %s"
 
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, c-format
 msgid "cannot stat standard input"
 msgstr "o standardním vstupu nelze zjistit podrobnosti"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -9875,7 +9968,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -9885,30 +9978,30 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr "Zařízení: %Dh/%dd\tI-uzel: %-10i  Odkazů: %-5h Druh zařízení: %t,%T\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr "Zařízení: %Dh/%dd\tI-uzel: %-10i  Odkazů: %h\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr "   Práva: (%04a/%10.10A)  UID: (%5u/%8U)   GID: (%5g/%8G)\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, c-format
 msgid "Context: %C\n"
 msgstr " Kontext: %C\n"
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -9920,11 +10013,11 @@ msgstr ""
 "Změna i-uzlu: %z\n"
 "       Vznik: %w\n"
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
 msgstr "Zobrazí informace o souboru nebo souborovém systému.\n"
 
-#: src/stat.c:1356
+#: src/stat.c:1418
 msgid ""
 "  -L, --dereference     follow links\n"
 "  -f, --file-system     display file system status instead of file status\n"
@@ -9933,24 +10026,24 @@ msgstr ""
 "  -f, --file-system     zobrazí informace o souborovém systému místo "
 "o souboru\n"
 
-#: src/stat.c:1360
+#: src/stat.c:1422
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 "  -c  --format=FORM�T   použije zadaný FORM�T místo implicitního;\n"
 "                        za každým FORM�TEM odřádkuje\n"
 "      --printf=FORMAT   jako --format, ale rozpozná escape sekvence "
 "zpětných\n"
-"                        lomítek a implicitně neodřádkuje. Pro odřádkování\n"
+"                        lomítek a implicitně neodřádkuje; pro odřádkování\n"
 "                        přidejte do FORM�TU „\\n“\n"
 "  -t, --terse           vytiskne informace ve stru�né podobě\n"
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 msgid ""
 "\n"
 "The valid format sequences for files (without --file-system):\n"
@@ -9970,7 +10063,7 @@ msgstr ""
 "  %B   velikost bloku z %b v bajtech\n"
 "  %C   řetězec selinuxového bezpe�nostního kontextu\n"
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 msgid ""
 "  %d   device number in decimal\n"
 "  %D   device number in hex\n"
@@ -9986,7 +10079,7 @@ msgstr ""
 "  %g   ID skupiny vlastníka\n"
 "  %G   jméno skupiny vlastníka\n"
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 msgid ""
 "  %h   number of hard links\n"
 "  %i   inode number\n"
@@ -9995,8 +10088,8 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 "  %h   po�et pevných odkazů\n"
 "  %i   �íslo i-uzlu\n"
@@ -10006,10 +10099,10 @@ msgstr ""
 "odkaz\n"
 "  %o   nejlepší velikost bloku při I/O přenosu\n"
 "  %s   celková velikost v bajtech\n"
-"  %t   hlavní �íslo zařízení šestnáctkově\n"
-"  %T   vedlejší �íslo zařízení šestnáctkově\n"
+"  %t   hlavní �íslo zařízení šestnáctkově, pro znaková a bloková zařízení\n"
+"  %T   vedlejší �íslo zařízení šestnáctkově, pro znaková a bloková zařízení\n"
 
-#: src/stat.c:1399
+#: src/stat.c:1461
 msgid ""
 "  %u   user ID of owner\n"
 "  %U   user name of owner\n"
@@ -10017,10 +10110,10 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 "  %u   uživatelské ID vlastníka\n"
@@ -10032,11 +10125,11 @@ msgstr ""
 "  %X   �as posledního přístupu v sekundách od po�átku unixové epochy\n"
 "  %y   �as poslední změny obsahu v přirozených jednotkách\n"
 "  %Y   �as poslední změny obsahu v sekundách od po�átku unixové epochy\n"
-"  %z   �as poslední změny i-uzlu v přirozených jednotkách\n"
-"  %Z   �as poslední změny i-uzlu v sekundách od po�átku unixové epochy\n"
+"  %z   �as poslední změny stavu v přirozených jednotkách\n"
+"  %Z   �as poslední změny stavu v sekundách od po�átku unixové epochy\n"
 "\n"
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 msgid ""
 "Valid format sequences for file systems:\n"
 "\n"
@@ -10054,7 +10147,7 @@ msgstr ""
 "  %d   volných i-uzlů v systému souborů\n"
 "  %f   volných bloků v systému souborů\n"
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 msgid ""
 "  %i   file system ID in hex\n"
 "  %l   maximum length of filenames\n"
@@ -10144,22 +10237,27 @@ msgstr ""
 "zpracování\n"
 "vstupu a výstupu proudy, a tudíž je nastavení „stdbuf“ nijak neovlivní.\n"
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, c-format
 msgid "failed to find %s"
 msgstr "%s se nepodařilo nalézt"
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, c-format
 msgid "failed to update the environment with %s"
 msgstr "aktualizace prostředí s %s se nezdařila"
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr "bufferování po řádcích standardního vstupu nemá význam"
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, c-format
+msgid "you must specify a buffering mode option"
+msgstr "musíte zadat přepína� režimu bufferování"
+
+#: src/stty.c:516
 #, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -10170,11 +10268,11 @@ msgstr ""
 "  nebo:  %s [-F ZA�ZEN�] | --file=ZA�ZEN�] [-a|--all]\n"
 "  nebo:  %s [-F ZA�ZEN�] | --file=ZA�ZEN�] [-g|--save]\n"
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
 msgstr "Vypíše nebo změní nastavení terminálu.\n"
 
-#: src/stty.c:525
+#: src/stty.c:528
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
 "  -g, --save         print all current settings in a stty-readable form\n"
@@ -10184,7 +10282,7 @@ msgstr ""
 "  -g, --save          vypíše všechna nastavení ve formě pro stty\n"
 "  -F, --file=ZAŘ�ZEN� místo stdin otevře a použije zadané zařízení\n"
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
@@ -10195,7 +10293,7 @@ msgstr ""
 "nedefinované normou POSIX. Použitý systém ur�uje, která nastavení jsou "
 "možná.\n"
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -10210,7 +10308,7 @@ msgstr ""
 "   eof ZNAK      ZNAK, který posílá „konec souboru“ (ukon�ení vstupu)\n"
 "   eol ZNAK      ZNAK, který ukon�uje řádek\n"
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -10222,7 +10320,7 @@ msgstr ""
 "   intr ZNAK     ZNAK, který zasílá signál interrupt\n"
 "   kill ZNAK     ZNAK, který maže aktuální řádek\n"
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -10234,7 +10332,7 @@ msgstr ""
 " * rprnt ZNAK    ZNAK, který překresluje aktuální řádek\n"
 "   start ZNAK    ZNAK, který znovu spustí výstup po jeho pozastavení\n"
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -10246,7 +10344,7 @@ msgstr ""
 " * swtch ZNAK    ZNAK, který přepíná na jinou vrstvu shellu\n"
 " * werase ZNAK   ZNAK, který maže poslední zapsané slovo\n"
 
-#: src/stty.c:562
+#: src/stty.c:565
 msgid ""
 "\n"
 "Special settings:\n"
@@ -10260,7 +10358,7 @@ msgstr ""
 " * cols N        sdělí jádru, že terminál má N sloupců\n"
 " * columns N     stejné jako cols N\n"
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -10274,7 +10372,7 @@ msgstr ""
 "                 �tení\n"
 "   ospeed N      nastaví rychlost výstupu na N\n"
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -10289,7 +10387,7 @@ msgstr ""
 "desetin\n"
 "                 sekundy\n"
 
-#: src/stty.c:581
+#: src/stty.c:584
 msgid ""
 "\n"
 "Control settings:\n"
@@ -10307,7 +10405,7 @@ msgstr ""
 " * [-]cdtrdsr    umožní „handshake“ DTR/DSR\n"
 "   csN           nastaví velikost znaku na N bitů, N je 5–8\n"
 
-#: src/stty.c:590
+#: src/stty.c:593
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
 "   [-]hup        send a hangup signal when the last process closes the tty\n"
@@ -10315,14 +10413,16 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 "   [-]cstopb     použije dva stop bity (jeden stop bit pomocí „-“)\n"
 "   [-]hup        pošle signál hangup, když poslední proces uzavře tty\n"
 "   [-]hupcl      jako [-]hup\n"
 "   [-]parenb     generuje paritní bit na výstupu a o�ekává ho na vstupu\n"
 "   [-]parodd     nastaví lichou paritu (nebo sudou pomocí „-“)\n"
+" * [-]cmspar     použije trvalou (stick) paritu (zna�ka/mezera)\n"
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -10338,7 +10438,7 @@ msgstr ""
 "   [-]ignbrk     ignoruje znak break\n"
 "   [-]igncr      ignoruje znak CR (carriage return)\n"
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -10354,11 +10454,11 @@ msgstr ""
 "   [-]inpck      za�ne kontrolovat paritu na vstupu\n"
 "   [-]istrip     nuluje horní (8.) bit vstupních znaků\n"
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr " * [-]iutf8      předpokládá vstupní znaky kódované v UTF-8\n"
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -10374,7 +10474,7 @@ msgstr ""
 "   [-]parmrk     ozna�í chyby parity (sekvencí 255-0-znak)\n"
 "   [-]tandem     jako [-]ixoff\n"
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -10390,23 +10490,23 @@ msgstr ""
 " * ffN           způsob �ekání na FF (form feed), N je 0–1\n"
 " * nlN           způsob �ekání na LF (newline), N je 0–1\n"
 
-#: src/stty.c:631
+#: src/stty.c:635
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
 " * [-]onlret     newline performs a carriage return\n"
 msgstr ""
 " * [-]ocrnl      překládá CR (cariage return) na LF (newline)\n"
-" * [-]ofdel      použije znak „delete“ místo znaku „null“ pro výplně\n"
+" * [-]ofdel      použije znak „delete“ místo znaku NUL pro výplně\n"
 " * [-]ofill      použije vyplňovací znak místo �ekání\n"
 " * [-]olcuc      překládá malá písmena na velká\n"
 " * [-]onlcr      překládá LF (newline) na CRLF (carriage return-newline)\n"
 " * [-]onlret     LF (newline) provede CR (carriage return)\n"
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -10422,7 +10522,7 @@ msgstr ""
 " * -tabs         jako tab3\n"
 " * vtN           způsob �ekání na svislý tabelátor, N je 0–1\n"
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -10437,7 +10537,7 @@ msgstr ""
 " * crtkill       zruší celý řádek podle nastavení echoprt a echoe\n"
 " * -crtkill      zruší celý řádek podle nastavení echoctl a echok\n"
 
-#: src/stty.c:654
+#: src/stty.c:658
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
 "   [-]echo       echo input characters\n"
@@ -10451,7 +10551,7 @@ msgstr ""
 "   [-]echoe      jako [-]crterase\n"
 "   [-]echok      vypíše znak CR (newline) po znaku „kill“\n"
 
-#: src/stty.c:661
+#: src/stty.c:665
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
 "   [-]echonl     echo newline even if not echoing other characters\n"
@@ -10465,7 +10565,7 @@ msgstr ""
 "   [-]icanon     povolí speciální znaky erase, kill, werase a rprnt\n"
 "   [-]iexten     povolí speciální znaky, které neodpovídají normě POSIX.\n"
 
-#: src/stty.c:668
+#: src/stty.c:672
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
 "   [-]noflsh     disable flushing after interrupt and quit special "
@@ -10484,7 +10584,7 @@ msgstr ""
 " * [-]xcase      spolu s icanon použije escape sekvenci („\\“) pro velká "
 "písmena\n"
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -10498,7 +10598,7 @@ msgstr ""
 "   cbreak        jako -icanon\n"
 "   -cbreak       jako icanon\n"
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -10512,7 +10612,7 @@ msgstr ""
 "   -cooked       jako raw\n"
 "   crt           jako echoe echoctl echoke\n"
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -10526,7 +10626,7 @@ msgstr ""
 "   ek            znaky erase a kill vrátí na jejich implicitní hodnoty\n"
 "   evenp         jako parenb -parodd cs7\n"
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -10542,7 +10642,7 @@ msgstr ""
 "   nl            jako -icrnl -onlcr\n"
 "   -nl           jako icrnl -inlcr -igncr onlcr -ocrnl -onlret\n"
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -10556,7 +10656,7 @@ msgstr ""
 "   pass8         jako -parenb -istrip cs8\n"
 "   -pass8        jako parenb istrip cs7\n"
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -10568,7 +10668,7 @@ msgstr ""
 "                 -imaxbel -opost -isig -icanon -xcase min 1 time 0\n"
 "   -raw          jako cooked\n"
 
-#: src/stty.c:716
+#: src/stty.c:720
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
 "                 -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n"
@@ -10584,7 +10684,7 @@ msgstr ""
 "                 -xcase -tostop -echoprt echoctl echoke, všechny speciální\n"
 "                 znaky vrátí na jejich implicitní hodnoty\n"
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -10599,12 +10699,12 @@ msgstr ""
 "127; speciální hodnoty ^- nebo „undef“ jsou použity pro zákaz speciálních\n"
 "znaků.\n"
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, c-format
 msgid "only one device may be specified"
 msgstr "pouze jedno zařízení může být zadáno"
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
@@ -10612,43 +10712,43 @@ msgid ""
 msgstr ""
 "přepína�e pro upovídaný a stty �itelný styl výstupu se vzájemně vylu�ují"
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr "při zadávání výstupního stylu, nemohou být nastavovány režimy"
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr "%s: neblokovací mód souboru nelze zrušit"
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, c-format
 msgid "invalid argument %s"
 msgstr "argument %s je neplatný"
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, c-format
 msgid "missing argument to %s"
 msgstr "postrádám argument pro %s"
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, c-format
 msgid "invalid line discipline %s"
 msgstr "chybná linková disciplína %s"
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr "%s: všechny požadované operace nelze provést"
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr "%s: pro toto zařízení neexistuje informace o velikosti"
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, c-format
 msgid "invalid integer argument %s"
 msgstr "chybná celo�íselný argument %s"
@@ -10704,7 +10804,7 @@ msgstr "      --help     vypíše tuto nápovědu a skon�í\n"
 msgid "      --version  output version information and exit\n"
 msgstr "      --version  vypíše ozna�ení verze a skon�í\n"
 
-#: src/system.h:544
+#: src/system.h:543
 msgid ""
 "\n"
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -10713,19 +10813,19 @@ msgstr ""
 "Povinné argumenty dlouhých přepína�ů jsou také povinné u odpovídajících\n"
 "krátkých přepína�ů.\n"
 
-#: src/system.h:552
+#: src/system.h:551
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 "\n"
-"VELIKOST je celé �íslo volitelně následováno jednotkou (příklad: 10M je\n"
-"10 * 1024 * 1024). Jednotky jsou K, M, G, T, P, E, Z, Y (násobky 1024) nebo\n"
-"KB, MB, … (násobky 1000).\n"
+"Argument VELIKOST je celé �íslo a volitelná jednotka (příklad: 10K je\n"
+"10 * 1024). Jednotky jsou K, M, G, T, P, E, Z, Y (mocniny 1024) nebo\n"
+"KB, MB, … (mocniny 1000).\n"
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -10739,38 +10839,38 @@ msgstr ""
 "a proměnných prostředí %s_BLOCK_SIZE, BLOCK_SIZE a BLOCKSIZE. Jinak se jako\n"
 "jednotka použije 1024 bajtů (nebo 512, je-li nastaveno POSIXLY_CORRECT).\n"
 
-#: src/system.h:571
+#: src/system.h:570
 #, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
+"%s online help: <%s>\n"
 msgstr ""
 "\n"
-"Chyby v programu %s oznamujte na adrese <%s> (anglicky).\n"
+"On-line nápověda %s: <%s>\n"
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr ""
 "Chyby v překladu %s hlaste na <http://translationproject.org/team/cs.html>\n"
 "(�esky).\n"
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr ""
 "Úplnou dokumentaci lze získat příkazem: info coreutils '%s invocation'\n"
 
-#: src/system.h:596
+#: src/system.h:591
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Více informací získáte příkazem „%s --help“.\n"
 
-#: src/system.h:628
+#: src/system.h:633
 #, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -10868,12 +10968,10 @@ msgstr ""
 
 #: src/tail.c:270
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
-"  -c, --bytes=K            vypíše posledních K bajtů; mimo jiné lze použít\n"
+"  -c, --bytes=K            vypíše posledních K bajtů; nebo lze použít\n"
 "                           zápis -c +K k vypsání bajtů po�ínaje K. "
 "z každého\n"
 "                           souboru\n"
@@ -10882,29 +10980,27 @@ msgstr ""
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           vypisuje pouze data přidávaná do souboru\n"
 "                           („name“ – sleduje dle jména souboru, \n"
 "                           „descriptor“ – dle deskriptoru souboru)\n"
-"                           -f, --follow a --follow=descriptor jsou stejné\n"
+"                           chybějící hodnota znamená „descriptor“\n"
 "  -F                       stejné jako --follow=name --retry\n"
 
-#: src/tail.c:281
+#: src/tail.c:280
 #, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
 "  -n, --lines=K            vypíše posledních K řádků místo posledních %d;\n"
 "                           nebo použijte -n +K pro výpis od K. řádku\n"
@@ -10915,38 +11011,35 @@ msgstr ""
 "podíval,\n"
 "                           zda nebyl soubor smazán, nebo přejmenován "
 "(obvyklé\n"
-"                           při rotaci log souborů). S inotify "
+"                           při rotaci log souborů); s inotify "
 "tento přepína�\n"
-"                           nemá valného smyslu.\n"
+"                           nemá valného smyslu\n"
 
-#: src/tail.c:294
+#: src/tail.c:293
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 "      --pid=PID            s -f se ukon�í, když proces s �íslem PID skon�í\n"
 "  -q, --quiet, --silent    nikdy nevypisuje názvy souborů\n"
-"      --retry              bude zkoušet otevřít soubor, i když je nebo bude\n"
-"                           nedostupný; vhodné při sledování podle jména,\n"
-"                           tj. s --follow=name\n"
+"      --retry              bude zkoušet otevřít soubor, i když je "
+"nedostupný\n"
 
-#: src/tail.c:301
+#: src/tail.c:298
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 "  -s, --sleep-interval=N   spolu s -f �eká asi N sekund (implicitně 1,0)\n"
-"                           mezi jednotlivými iteracemi. S inotify a --pid=P\n"
-"                           kontroluje proces P alespoň jednou za N sekund.\n"
+"                           mezi jednotlivými iteracemi; s inotify a --pid=P\n"
+"                           kontroluje proces P alespoň jednou za N sekund\n"
 "  -v, --verbose            vždy vypisuje záhlaví s názvy souborů\n"
 
-#: src/tail.c:310
+#: src/tail.c:307
 msgid ""
 "\n"
 "If the first character of K (the number of bytes or lines) is a '+',\n"
@@ -10964,7 +11057,7 @@ msgstr ""
 "GB – 1000*1000*1000, G – 1024*1024*1024 a tak dále pro T, P, E, Z, Y.\n"
 "\n"
 
-#: src/tail.c:319
+#: src/tail.c:316
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
 "means that even if a tail'ed file is renamed, tail will continue to track\n"
@@ -10981,27 +11074,22 @@ msgstr ""
 "soubor daného jména takovým způsobem, aby se vyrovnal s jeho přejmenováním,\n"
 "smazáním a vytvořením.\n"
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr "uzavírání %s (fd=%d)"
 
-#: src/tail.c:453
-#, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr "%s: nelze se přesunout na relativní pozici %s"
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr "%s nelze se přesunout na pozici %s zadanou vzhledem ke konci souboru"
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr "umístění %s nelze ur�it, návrat k aktivnímu dotazování"
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
@@ -11010,137 +11098,147 @@ msgstr ""
 "neznámý druh souborového systému 0x%08lx pod %s. Prosím, ohlaste tuto "
 "skute�nost na %s. Návrat k aktivnímu �ekání."
 
-#: src/tail.c:963
+#: src/tail.c:965
+#, c-format
+msgid "%s has been replaced with a symbolic link. giving up on this name"
+msgstr "soubor %s byl nahrazen symbolickým odkazem; s tímto jménem je konec"
+
+#: src/tail.c:980
 #, c-format
 msgid "%s has become inaccessible"
 msgstr "%s se stal nedostupným"
 
-#: src/tail.c:980
+#: src/tail.c:997
 #, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr "soubor %s byl nahrazen nesledovatelným; s tímto jménem kon�ím"
 
-#: src/tail.c:989
+#: src/tail.c:1006
 #, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr "soubor %s byl nahrazen vzdáleným souborem; s tímto jménem kon�ím"
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, c-format
 msgid "%s has become accessible"
 msgstr "%s se stal znovu dostupným"
 
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr "soubor %s se objevil, sledování konce nového souboru pokra�uje"
 
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr ""
 "soubor %s byl nahrazen jiným, sledování konce nového souboru pokra�uje."
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr "%s: neblokující režim nelze změnit"
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr "%s: soubor byl zkrácen"
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr "již nezbývají žádné soubory"
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, c-format
 msgid "cannot watch parent directory of %s"
 msgstr "rodi�ovský adresář %s nelze sledovat"
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, c-format
 msgid "inotify resources exhausted"
 msgstr "zdroje pro inotify vy�erpány"
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, c-format
 msgid "cannot watch %s"
 msgstr "%s nelze sledovat"
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr "chyba při sledování události inotify"
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, c-format
 msgid "error reading inotify event"
 msgstr "chyba při �tení události inotify"
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr "%s: nelze sledovat konec souboru tohoto typu; sledování ukon�eno"
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, c-format
 msgid "number in %s is too large"
 msgstr "po�et v %s je příliš velký"
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr ""
 "%s: neplatné �íslo maximálního po�tu nezměněných výsledků funkce stat\n"
 "mezi otevřeními"
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr "%s: neplatný PID"
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr "%s: neplatný po�et sekund"
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr "přepína� použit v chybném kontextu  – %c"
 
-#: src/tail.c:2034
+#: src/tail.c:2096
 #, c-format
-msgid "warning: --retry is useful mainly when following by name"
-msgstr "varování: --retry je užite�ný pouze v případě sledovaní dle jména"
+msgid "warning: --retry ignored; --retry is useful only when following"
+msgstr ""
+"pozor: --retry ignorován; --retry je užite�ný pouze v případě sledování konce"
 
-#: src/tail.c:2038
+#: src/tail.c:2100
+#, c-format
+msgid "warning: --retry only effective for the initial open"
+msgstr "pozor: --retry je ú�inný jen při prvním otevření"
+
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
 msgstr ""
-"varování: PID ignorován; --pid=PID je užite�ný pouze v případě sledování "
-"konce"
+"pozor: PID ignorován; --pid=PID je užite�ný pouze v případě sledování konce"
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
-msgstr "varování: --pid=PID není na tomto systému podporován"
+msgstr "pozor: --pid=PID není na tomto systému podporován"
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, c-format
 msgid "cannot follow %s by name"
 msgstr "%s nelze sledovat podle jména"
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr "varování: sledování standardního vstupu je ur�itě neefektivní"
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr "inotify nelze použít, návrat k aktivnímu dotazování"
@@ -11414,17 +11512,17 @@ msgstr "nadbyte�ný argumentů %s"
 msgid "warning: sigprocmask"
 msgstr "pozor: sigprocmask"
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr "pozor: timer_settime"
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr "pozor: timer_create"
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
@@ -11433,45 +11531,44 @@ msgstr ""
 "Použití: %s [PŘEP�NAČ] DOBA PŘ�KAZ [ARG]…\n"
 "  nebo:  %s [PŘEP�NAČ]\n"
 
-#: src/timeout.c:229
+#: src/timeout.c:232
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
 msgstr "Spustí PŘ�KAZ a zabije jej, pokud poběží i po zadané DOBĚ.\n"
 
-#: src/timeout.c:235
+#: src/timeout.c:238
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
 "      --preserve-status\n"
 "                 sko�í se stejným kódem jako PŘ�KAZ, i když příkazu vypršel\n"
-"                 �asový limit.\n"
+"                 �asový limit\n"
 "      --foreground\n"
 "                 nevyprší-li �asový limit přímo dotazu shellu,\n"
-"                 dovolí PŘ�KAZU �íst z TTY a přijímat TTY signály.\n"
-"                 V tomto režimu potomkům PŘ�KAZU nebude nastaven �asový "
-"limit.\n"
+"                 dovolí PŘ�KAZU �íst z TTY a přijímat TTY signály;\n"
+"                 v tomto režimu potomkům PŘ�KAZU nebude nastaven �asový "
+"limit\n"
 "  -k, --kill-after=DOBA\n"
 "                 rovněž zašle signál KILL, pokud PŘ�KAZ poběží i po DOBU\n"
-"                 od zaslání původního signálu.\n"
+"                 od zaslání původního signálu\n"
 "  -s, --signal=SIGN�L\n"
-"                 ur�uje signál, který bude po vypršení limitu zaslán.\n"
-"                 SIGN�L může být jméno jako „HUP“ nebo �íslo.\n"
-"                 Seznam signálů lze získat příkazem „kill -l“.\n"
+"                 ur�uje signál, který bude po vypršení limitu zaslán;\n"
+"                 SIGN�L může být jméno jako „HUP“ nebo �íslo;\n"
+"                 seznam signálů lze získat příkazem „kill -l“\n"
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 msgid ""
 "\n"
 "DURATION is a floating point number with an optional suffix:\n"
@@ -11482,7 +11579,7 @@ msgstr ""
 "DOBA je desetinné �íslo s možnou příponou:\n"
 "„s“ pro sekundy (výchozí), „m“ pro minuty, „h“ pro hodiny nebo „d“ pro dny.\n"
 
-#: src/timeout.c:259
+#: src/timeout.c:262
 msgid ""
 "\n"
 "If the command times out, and --preserve-status is not set, then exit with\n"
@@ -11501,17 +11598,17 @@ msgstr ""
 "nelze zachytit. Je-li zaslán signál KILL (9), návratový kód bude 128+9\n"
 "místo 124.\n"
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr "pozor: nepodařilo se vypnout vytváření výpisů paměti"
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, c-format
 msgid "error waiting for command"
 msgstr "chyba při �ekání na příkaz"
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr "sledovaný příkaz skon�il uložením obrazu paměti"
@@ -11924,10 +12021,10 @@ msgstr ""
 #: src/truncate.c:115
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 "  -r, --reference=SOUBOR  použije velikost tohoto SOUBORU\n"
-"  -s, --size=VELIKOST     použije tuto VELIKOST\n"
+"  -s, --size=VELIKOST     použije tuto VELIKOST v bajtech\n"
 
 #: src/truncate.c:121
 msgid ""
@@ -12016,12 +12113,12 @@ msgstr ""
 "vstup.\n"
 "\n"
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr "%s: vstup obsahuje lichý po�et položek"
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr "%s: vstup obsahuje cyklus:"
@@ -12119,12 +12216,12 @@ msgstr "tabelátory od jsou od sebe příliš vzdálené"
 msgid "tab stop value is too large"
 msgstr "velikost tabelátoru je příliš velká"
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr "Použití: %s [PŘEP�NAČ]… [VSTUP [V�STUP]]\n"
 
-#: src/uniq.c:138
+#: src/uniq.c:174
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
 "writing to OUTPUT (or standard output).\n"
@@ -12136,45 +12233,58 @@ msgstr ""
 "\n"
 "Bez přepína�ů zredukuje odpovídající řádky na první výskyt.\n"
 
-#: src/uniq.c:147
+#: src/uniq.c:183
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
 msgstr ""
 "  -c, --count           před každý řádek vloží po�et výskytů\n"
-"  -d, --repeated        vypisuje pouze opakující se řádky\n"
+"  -d, --repeated        vypisuje pouze opakující se řádky; jeden na\n"
+"                        každou skupinu\n"
+
+#: src/uniq.c:187
+msgid ""
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
+msgstr ""
+"  -D, --all-repeated[=ZPŮSOB]\n"
+"                        vypisuje všechny opakující se řádky;\n"
+"                        skupiny lze oddělit prázdným řádkem, ZPŮSOB:\n"
+"                        „none“ (žádný, výchozí), „prepend“ (uvozující),\n"
+"                        „separate“ (oddělující)\n"
+
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr "  -f, --skip-fields=N   neporovnává prvních N položek\n"
 
-#: src/uniq.c:151
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
+msgstr ""
+"      --group[=ZPŮSOB]  zobrazí všechny položky, skupiny oddělí prázdným\n"
+"                        řádkem, ZPŮSOB: „separate“ (oddělující, výchozí),\n"
+"                        „prepend“ (uvozující), „append“ (závěre�ný),\n"
+"                        „both“ (obojetný)\n"
+
+#: src/uniq.c:199
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
 "  -i, --ignore-case     ignore differences in case when comparing\n"
 "  -s, --skip-chars=N    avoid comparing the first N characters\n"
 "  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
 msgstr ""
-"  -D, --all-repeated[=ZPŮSOB_ODDĚLEN�]\n"
-"                        vypisuje všechny opakující se řádky; "
-"ZPŮSOB_ODDĚLEN�:\n"
-"                        „none“ (žádný, implicitní), „prepend“ (uvozující),\n"
-"                        „separate“ (oddělující); Odděluje se prázdným "
-"řádkem\n"
-"  -f, --skip-fields=N   neporovnává prvních N položek\n"
 "  -i, --ignore-case     ignoruje rozdíl mezi malými a velkými písmeny\n"
 "  -s, --skip-chars=N    neporovnává prvních N znaků\n"
 "  -u, --unique          vypisuje pouze neopakující se řádky\n"
-"  -z, --zero-terminated\n"
-"                        řádky zakon�uje nulovým bajtem, ne znakem nového "
-"řádku\n"
 
-#: src/uniq.c:161
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr ""
 "  -w, --check-chars=N   porovnává nejvýše N prvních znaků každého řádku\n"
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 msgid ""
 "\n"
 "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n"
@@ -12184,7 +12294,7 @@ msgstr ""
 "Jako položka je chápán sled bílých znaků (obvykle mezer a/nebo tabulátorů)\n"
 "následovaných nebílými znaky. Položky jsou před znaky přeskakovány.\n"
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 msgid ""
 "\n"
 "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n"
@@ -12196,25 +12306,35 @@ msgstr ""
 "budete chtít vstup nejprve seřadit nebo použít „sort -u“ bez „uniq“.\n"
 "Porovnávání rovněž respektuje pravidla daná „LC_COLLATE“.\n"
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, c-format
 msgid "too many repeated lines"
 msgstr "příliš mnoho opakujících se řádků"
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
 msgstr "chybný po�et položek na přesko�ení"
 
 # bytes to skip? we were talking about chars? - rzm
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
 msgstr "chybný po�et bajtů na přesko�ení"
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
 msgstr "chybný po�et bajtů pro porovnání"
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr "--group se vzájemně vylu�uje s -c/-d/-D/-u"
+
+#: src/uniq.c:652
+#, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr "výpis po skupinách a výpis po�ítadel opakování nemá smysl"
+
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr "výpis všech opakujících se řádků a po�ítadla opakování nemá smysl"
@@ -12234,11 +12354,6 @@ msgid ""
 "\n"
 msgstr "Odstraní zadaný SOUBOR voláním služby „unlink“ (odstranit odkaz).\n"
 
-#: src/unlink.c:86
-#, c-format
-msgid "cannot unlink %s"
-msgstr "nelze odstranit odkaz %s"
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -12285,7 +12400,7 @@ msgstr[2] "%lu uživatelů"
 msgid ",  load average: %.2f"
 msgstr ",  průměrná zátěž: %.2f"
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -12296,7 +12411,7 @@ msgstr ""
 "přihlášených v systému a průměrný po�et procesů �ekajících ve frontě\n"
 "na zpracování během posledních 1, 5 a 15 minut."
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
@@ -12305,12 +12420,12 @@ msgstr ""
 " Procesy v nepřerušitelném\n"
 "spánku rovněž přispívají do průměrné zátěže.\n"
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr "\n"
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
@@ -12553,6 +12668,159 @@ msgstr ""
 "Opakovaně vypisuje řádku se zadanými ŘETĚZCI nebo s „y“.\n"
 "\n"
 
+#~ msgid "cannot create pipe"
+#~ msgstr "nelze vytvořit rouru"
+
+#~ msgid "%s subprocess failed"
+#~ msgstr "podproces %s selhal"
+
+#~ msgid "_open_osfhandle failed"
+#~ msgstr "volání _open_osfhandle selhalo"
+
+#~ msgid "cannot restore fd %d: dup2 failed"
+#~ msgstr "deskriptor %d nelze obnovit: volání dup2 selhalo"
+
+#~ msgid "%s subprocess"
+#~ msgstr "podproces %s"
+
+#~ msgid "%s subprocess got fatal signal %d"
+#~ msgstr "podproces %s obdržel fatální signál %d"
+
+#~ msgid "failed to set additional groups"
+#~ msgstr "doplňkové skupiny nebylo možné nastavit"
+
+#~ msgid "mount point %s already traversed"
+#~ msgstr "přípojný bod %s již byl překro�en"
+
+#~ msgid "%s: cannot lseek back to original position"
+#~ msgstr "%s: nelze se vrátit na původní místo v souboru (služba lseek)"
+
+#~ msgid "%s: failed to reset file pointer"
+#~ msgstr "%s: nové nastavení ukazatele po souboru selhalo"
+
+#~ msgid "cannot reposition file pointer for %s"
+#~ msgstr "nelze přemístit ukazatel po souboru %s"
+
+#~ msgid ""
+#~ "  -Z, --context[=CTX]  set the SELinux security context of each NAME to\n"
+#~ "                         default type, or CTX if specified\n"
+#~ msgstr ""
+#~ "  -Z, --context[=KTX]  nastaví selinuxový bezpe�nostní kontext každému "
+#~ "JMÉNU\n"
+#~ "                       na výchozí hodnotu nebo na KTX, byl-li zadán\n"
+
+#~ msgid ""
+#~ "  -Z, --context[=CTX]  set the SELinux security context of NAME to\n"
+#~ "                         default type, or to CTX if specified\n"
+#~ msgstr ""
+#~ "  -Z, --context[=KTX]  nastaví selinuxový bezpe�nostní kontext JMÉNU na\n"
+#~ "                       výchozí hodnotu nebo na KTX, byl-li zadán\n"
+
+#~ msgid "out of memory (requested %zu bytes)"
+#~ msgstr "nedostatek paměti (požadováno %zu bajtů)"
+
+#~ msgid "--padding cannot be combined with --format"
+#~ msgstr "přepína� --padding nelze kombinovat s přepína�em --format"
+
+#~ msgid ""
+#~ "Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
+#~ "  or:  %s LONG-OPTION\n"
+#~ msgstr ""
+#~ "Použití: %s [KR�TK�_PŘEP�NAČ]… JMÉNO_UŽIVATELE PŘ�KAZ [ARGUMENT]…\n"
+#~ "  nebo:  %s DLOUH�_PŘEP�NAČ\n"
+
+#~ msgid ""
+#~ "Drop any supplemental groups, assume the user-ID and group-ID of the "
+#~ "specified\n"
+#~ "USER (numeric ID or user name), and run COMMAND with any specified "
+#~ "ARGUMENTs.\n"
+#~ "Exit with status 111 if unable to assume the required user and group ID.\n"
+#~ "Otherwise, exit with the exit status of COMMAND.\n"
+#~ "This program is useful only when run by root (user ID zero).\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Zbaví se doplňkových skupin, převezme ID uživatele a ID skupiny ur�ené\n"
+#~ "JMÉNEM_UŽIVATELE (�íselným ID nebo jménem) a spustí PŘ�KAZ se zadanými\n"
+#~ "ARGUMENTY.\n"
+#~ "Skon�í s výstupním kódem 111, pokud není možné přejmout požadované ID\n"
+#~ "uživatele a skupiny. Jinak vrátí výstupní kód PŘ�KAZU.\n"
+#~ "Tento program má smysl jen, je-li vyvolán rootem (ID uživatele 0).\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, "
+#~ "and\n"
+#~ "                      (if specified) supplemental group IDs to GID1, ...\n"
+#~ msgstr ""
+#~ "  -g GID[,GID1…]    taktéž nastaví primární ID skupiny na �íslo GID a\n"
+#~ "                    (je-li zadáno) ID doplňkových skupin na GID1, …\n"
+
+#~ msgid "unknown user-ID: %s"
+#~ msgstr "neznámé ID uživatele: %s"
+
+#~ msgid "to use user-ID %s you need to use -g too"
+#~ msgstr "abyste mohli použit ID uživatele %s, musíte také použít -g"
+
+#~ msgid "cannot set group-ID to %lu"
+#~ msgstr "ID skupiny nelze nastavit na %lu"
+
+#~ msgid "cannot set user-ID to %lu"
+#~ msgstr "ID uživatele nelze nastavit na %lu"
+
+#~ msgid "failed to get file system create context"
+#~ msgstr "získat kontext pro vytváření na souborovém systému se nezdařilo"
+
+#~ msgid "warning: "
+#~ msgstr "pozor: "
+
+#~ msgid "long option '--megabytes' is deprecated and will soon be removed"
+#~ msgstr "dlouhý přepína� „--megabytes“ je zastaralý a brzy bude odebrán"
+
+#~ msgid "Usage: %s [OPTION]... [USERNAME]\n"
+#~ msgstr "Použití: %s [PŘEP�NAČ]… [JMÉNO_UŽIVATELE]\n"
+
+#~ msgid ""
+#~ "      --strict         with --check, exit non-zero for any invalid input\n"
+#~ msgstr ""
+#~ "      --strict         spolu s --check vrátí nenulový kód při neplatném "
+#~ "vstupu\n"
+
+#~ msgid "failed to redirect stderr to /dev/null"
+#~ msgstr "přesměrování standardního chybové výstupu do /dev/null se nezdařilo"
+
+#~ msgid "invalid number: '%s'"
+#~ msgstr "neplatné �íslo: „%s“"
+
+#~ msgid ""
+#~ "\n"
+#~ "With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Jestliže není SOUBOR zadán nebo je „-“, bude �ten standardní vstup.\n"
+#~ "Implicitní přepína�e: „-F /“\n"
+
+#~ msgid "cannot remove directory: %s"
+#~ msgstr "adresář nelze smazat: %s"
+
+#~ msgid "dup2 failed"
+#~ msgstr "volání dup2 selhalo"
+
+#~ msgid "couldn't execute %s"
+#~ msgstr "nelze provést %s"
+
+#~ msgid "couldn't execute %s -d"
+#~ msgstr "nelze provést %s -d"
+
+#~ msgid ""
+#~ "\n"
+#~ "Report %s bugs to %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Chyby v programu %s oznamujte na adrese <%s> (anglicky).\n"
+
+#~ msgid "warning: --retry is useful mainly when following by name"
+#~ msgstr "varování: --retry je užite�ný pouze v případě sledovaní dle jména"
+
 #~ msgid "using single-precision arithmetic"
 #~ msgstr "používám aritmetiku s jednoduchou přesností"
 
@@ -13324,9 +13592,6 @@ msgstr ""
 #~ msgid "FATAL: cannot return to .. from %s"
 #~ msgstr "Z�VAŽNÉ: z %s se nelze vrátit do .."
 
-#~ msgid "cannot remove %s directory %s"
-#~ msgstr "v adresáři %s nelze %s smazat"
-
 #~ msgid "cannot remove root directory %s"
 #~ msgstr "kořenový adresář %s nelze smazat"
 
@@ -14633,8 +14898,8 @@ msgstr ""
 #~ "\n"
 #~ "  BAJTŮ je �íslo. Pro TYPy d, o, u, x může být BAJTŮ také C jako\n"
 #~ "sizeof(char), S jako sizeof(short), I jako sizeof(int) nebo L jako\n"
-#~ "sizeof(long). Jestliže TYP je f, BAJTŮ může být také F jako sizeof"
-#~ "(float),\n"
+#~ "sizeof(long). Jestliže TYP je f, BAJTŮ může být také F jako "
+#~ "sizeof(float),\n"
 #~ "D jako sizeof(double) nebo L jako sizeof(long double).\n"
 #~ "\n"
 #~ "  Z�KLAD je d pro dekadické, o - osmi�kové, x - šestnáctkové, n - žádné.\n"
diff --git a/po/da.gmo b/po/da.gmo
index 059a0ee0..4bbb3d68 100644
--- a/po/da.gmo
+++ b/po/da.gmo
diff --git a/po/da.po b/po/da.po
index ac27ad0d..2434a29d 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,12 +1,12 @@
-# translation of coreutils-8.19.po to Danish
+# translation of coreutils-8.22-pre4.po to Danish
 # Danish messages for core-utils.
-# Copyright (C) 1996, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 1996, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
 # This file is distributed under the same license as the coreutils package.
 #
 # Keld Jørn Simonsen <keld@dkuug.dk>, 2000-2003.
 # Gennemsyn 2003-03-26 Ole Laursen <olau@hardworking.dk>
 # Keld Simonsen <keld@keldix.com>, 2010.
-# Ask Hjorth Larsen <asklarsen@gmail.com>, 2009, 2010, 2011, 2012.
+# Ask Hjorth Larsen <asklarsen@gmail.com>, 2009, 2010, 2011, 2012, 2013, 2014.
 #
 #
 # Bemærk.  Coreutils består af mange programmer.  Konventioner er
@@ -71,10 +71,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: coreutils-8.20-pre1\n"
+"Project-Id-Version: coreutils-8.22-pre4\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
-"PO-Revision-Date: 2012-10-27 13:17+0200\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
+"PO-Revision-Date: 2014-02-23 20:14+0100\n"
 "Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
@@ -102,76 +102,124 @@ msgstr "Gyldige argumenter er:"
 msgid "error closing file"
 msgstr "fejl ved lukning af fil"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "skrivefejl"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "beholder rettigheder for %s"
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "Ukendt systemfejl"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "almindelig tom fil"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "almindelig fil"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "katalog"
 
-#: lib/file-type.c:44
-msgid "block special file"
-msgstr "blokspecialfil"
-
-#: lib/file-type.c:47
-msgid "character special file"
-msgstr "tegnspecialfil"
-
-#: lib/file-type.c:50
-msgid "fifo"
-msgstr "fifo"
-
-#: lib/file-type.c:53
+#: lib/file-type.c:46
 msgid "symbolic link"
 msgstr "symbolsk lænke"
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "sokkel"
-
-#: lib/file-type.c:59
+#: lib/file-type.c:52
 msgid "message queue"
 msgstr "meddelelseskø"
 
-#: lib/file-type.c:62
+#: lib/file-type.c:55
 msgid "semaphore"
 msgstr "semafor"
 
-#: lib/file-type.c:65
+#: lib/file-type.c:58
 msgid "shared memory object"
 msgstr "delt hukommelsesobjekt"
 
-#: lib/file-type.c:68
+#: lib/file-type.c:61
 msgid "typed memory object"
 msgstr "typetildelt hukommelsesobjekt"
 
-#: lib/file-type.c:70
+#: lib/file-type.c:66
+msgid "block special file"
+msgstr "blokspecialfil"
+
+#: lib/file-type.c:69
+msgid "character special file"
+msgstr "tegnspecialfil"
+
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr ""
+
+#: lib/file-type.c:75
+msgid "fifo"
+msgstr "fifo"
+
+#: lib/file-type.c:78
+msgid "door"
+msgstr ""
+
+#: lib/file-type.c:81
+#, fuzzy
+msgid "multiplexed block special file"
+msgstr "blokspecialfil"
+
+#: lib/file-type.c:84
+#, fuzzy
+msgid "multiplexed character special file"
+msgstr "tegnspecialfil"
+
+#: lib/file-type.c:87
+#, fuzzy
+msgid "multiplexed file"
+msgstr "flere roller"
+
+#: lib/file-type.c:90
+#, fuzzy
+msgid "named file"
+msgstr "mærkværdig fil"
+
+#: lib/file-type.c:93
+#, fuzzy
+msgid "network special file"
+msgstr "blokspecialfil"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr ""
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr ""
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr ""
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "sokkel"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr ""
+
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "mærkværdig fil"
 
@@ -306,18 +354,18 @@ msgstr "%s: flaget '-W %s' tillader ikke et argument\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: flaget '-W %s' kræver et argument\n"
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr "kan ikke ændre adgangsrettigheder på %s"
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "kan ikke oprette katalog %s"
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr "hukommelsen opbrugt"
@@ -434,7 +482,7 @@ msgstr "Regulært udtryk er for stort"
 msgid "Unmatched ) or \\)"
 msgstr "Uparret ) eller \\)"
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 msgid "No previous regular expression"
 msgstr "Intet foregående regulært udtryk"
 
@@ -459,7 +507,7 @@ msgstr "brug --no-preserve-root for at tilsidesætte denne sikring"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[YyJj]"
 
@@ -469,11 +517,11 @@ msgstr "^[YyJj]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, c-format
 msgid "setting permissions for %s"
 msgstr "sætter adgangsrettigheder på %s"
@@ -618,18 +666,6 @@ msgstr "Fejl på strømkilde"
 msgid "Resource lost"
 msgstr "Ressource tabt"
 
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, c-format
-msgid "cannot create pipe"
-msgstr "kan ikke oprette datakanal"
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, c-format
-msgid "%s subprocess failed"
-msgstr "%s: underproces fejlede"
-
 #: lib/strsignal.c:114
 #, c-format
 msgid "Real-time signal %d"
@@ -840,7 +876,7 @@ msgstr ""
 msgid "Report %s bugs to: %s\n"
 msgstr "Rapportér %s-fejl til %s\n"
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s hjemmeside: <%s>\n"
@@ -850,30 +886,10 @@ msgstr "%s hjemmeside: <%s>\n"
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr "Hjemmeside for %s: <http://www.gnu.org/software/%s/>\n"
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr "Generel hjælp til GNU-programmel: <http://www.gnu.org/gethelp/>\n"
 
-#: lib/w32spawn.h:43
-#, c-format
-msgid "_open_osfhandle failed"
-msgstr "_open_osfhandle mislykkedes"
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr "kan ikke gendanne fd %d: dup2 mislykkedes"
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr "%s-underproces"
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr "%s-underproces fik fatalt signal %d"
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr "stdin"
@@ -895,7 +911,7 @@ msgstr "ukendt strøm"
 msgid "failed to reopen %s with mode %s"
 msgstr "kunne ikke genåbne %s i tilstand %s"
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr "strengsammenligning mislykkedes"
@@ -937,7 +953,7 @@ msgstr "Simon Josefsson"
 
 # Base64 er en mime-kodning, så oversættelse bør være konservativ
 #: src/base64.c:60
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
 "Base64 encode or decode FILE, or standard input, to standard output.\n"
@@ -945,7 +961,6 @@ msgstr ""
 "Brug: %s [FLAG]... [FIL]\n"
 "Kod eller afkod FIL eller standard-ind i Base64, og udskriv til standard-"
 "ud.\n"
-"\n"
 
 #: src/base64.c:67
 msgid ""
@@ -963,7 +978,7 @@ msgstr ""
 "                          Brug 0 for at slå linjeombrydning fra\n"
 "\n"
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -985,48 +1000,47 @@ msgstr ""
 "i det formelle base64-alfabet.  Brug --ignore-garbage for at forsøge at\n"
 "fortsætte på trods af andre ikke-alfabetiske byte i den kodede strøm.\n"
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "læsefejl"
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, c-format
 msgid "invalid input"
 msgstr "ugyldig inddata"
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, c-format
 msgid "invalid wrap size: %s"
 msgstr "ugyldig ombrydningsstørrelse: %s"
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, c-format
 msgid "extra operand %s"
 msgstr "ekstra operand %s"
 
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, c-format
 msgid "closing standard input"
 msgstr "lukker standard-ind"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -1045,20 +1059,19 @@ msgstr ""
 "  eller: %s FLAG... NAVN...\n"
 
 #: src/basename.c:53
-#, fuzzy
 msgid ""
 "Print NAME with any leading directory components removed.\n"
 "If specified, also remove a trailing SUFFIX.\n"
 msgstr ""
 "Udskriv NAVN med eventuelle indledende katalog-komponenter fjernet.\n"
 "Hvis SUFFIKS er angivet, fjernes også afsluttende SUFFIKS.\n"
-"\n"
 
 #: src/basename.c:60
+#, fuzzy
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
 "  -a, --multiple       understøt flere argumenter og behandl hvert som et "
 "NAVN\n"
@@ -1082,14 +1095,13 @@ msgstr ""
 "  %s -s .h include/stdio.h     -> \"stdio\"\n"
 "  %s -a noget/str1 noget/str2  -> \"str1\" efterfulgt af \"str2\"\n"
 
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, c-format
 msgid "missing operand"
 msgstr "manglende operand"
@@ -1097,18 +1109,18 @@ msgstr "manglende operand"
 # Navn jf. http://www.nada.kth.se/~tege/
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr "Torbjørn Granlund"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 msgid "Richard M. Stallman"
 msgstr "Richard M. Stallman"
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1165,7 +1177,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr "kan ikke udføre ioctl på %s"
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr "standard-ud"
@@ -1182,14 +1194,14 @@ msgstr "Russell Coker"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 msgid "Jim Meyering"
 msgstr "Jim Meyering"
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, c-format
 msgid "failed to create security context: %s"
 msgstr "kunne ikke oprette sikkerhedskontekst: %s"
@@ -1200,8 +1212,8 @@ msgstr "kunne ikke oprette sikkerhedskontekst: %s"
 msgid "failed to set %s security context component to %s"
 msgstr "kunne ikke sætte %s-sikkerhedskontekstkomponent til %s"
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, c-format
 msgid "failed to get security context of %s"
 msgstr "kunne ikke hente sikkerhedskontekst for %s"
@@ -1211,18 +1223,18 @@ msgstr "kunne ikke hente sikkerhedskontekst for %s"
 msgid "can't apply partial context to unlabeled file %s"
 msgstr "kan ikke anvende delvis kontekst til umærket fil %s"
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, c-format
 msgid "failed to change context of %s to %s"
 msgstr "kunne ikke ændre kontekst for %s til %s"
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
 msgstr "kan ikke tilgå %s"
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, c-format
 msgid "cannot read directory %s"
 msgstr "kan ikke læse katalog %s"
@@ -1232,13 +1244,14 @@ msgstr "kan ikke læse katalog %s"
 msgid "changing security context of %s\n"
 msgstr "ændrer sikkerhedskontekst for %s\n"
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, c-format
 msgid "fts_read failed"
 msgstr "fts_read mislykkedes"
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, c-format
 msgid "fts_close failed"
 msgstr "fts_close mislykkedes"
@@ -1255,15 +1268,13 @@ msgstr ""
 "  eller: %s [FLAG]... --reference=RFIL FIL...\n"
 
 #: src/chcon.c:357
-#, fuzzy
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
-"Ændr sikkerhedskonteksten for hver FIL til KONTEKST.\n"
+"Ændr SELinux-sikkerhedskonteksten for hver FIL til KONTEKST.\n"
 "Med --reference ændres sikkerhedskonteksten for hver FIL til den for RFIL.\n"
-"\n"
 
 #: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94
 msgid ""
@@ -1289,7 +1300,7 @@ msgstr ""
 "  -t, --type=TYPE        sæt typen TYPE i målsikkerhedskonteksten\n"
 "  -l, --range=INTERVAL   sæt intervallet INTERVAL i målsikkerhedskonteksten\n"
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
 "      --preserve-root    fail to operate recursively on '/'\n"
@@ -1341,36 +1352,37 @@ msgstr ""
 "  -P                     gennemløb ingen symbolske lænker (standard)\n"
 "\n"
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr "-R --dereference kræver enten -H eller -L"
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr "-R -h kræver -P"
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, c-format
 msgid "missing operand after %s"
 msgstr "manglende operand efter %s"
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, c-format
 msgid "invalid context: %s"
 msgstr "ugyldig kontekst: %s"
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr "der er givet modstridende specifikationer for sikkerhedskontekst"
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, c-format
 msgid "failed to get attributes of %s"
 msgstr "kunne ikke hente attributter for %s"
@@ -1399,7 +1411,7 @@ msgstr ""
 "Med --reference ændres gruppen for hver FIL til den for RFIL.\n"
 "\n"
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
@@ -1439,47 +1451,47 @@ msgstr ""
 "  %s ansatte /u      Sæt gruppen for /u til \"ansatte\".\n"
 "  %s -hR ansatte /u  Sæt gruppen for /u og underfiler til \"ansatte\".\n"
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
 msgstr "henter nye attributter for %s"
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr "hverken symbolsk lænke %s eller referent er blevet ændret\n"
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr "tilstand for %s ændret fra %04lu (%s) til %04lo (%s)\n"
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr "kunne ikke ændre tilstand for %s fra %04lo (%s) til %04lo (%s)\n"
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr "tilstand for %s beholdt som %04lo (%s)\n"
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr "kan ikke operere på dinglende symlænke %s"
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, c-format
 msgid "changing permissions of %s"
 msgstr "ændrer rettigheder på %s"
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr "%s: nye adgangsrettigheder er %s, ikke %s"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1490,7 +1502,7 @@ msgstr ""
 "  eller: %s [FLAG]... OKTAL-TILSTAND FIL...\n"
 "  eller: %s [FLAG]... --reference=RFIL FIL...\n"
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 msgid ""
 "Change the mode of each FILE to MODE.\n"
 "With --reference, change the mode of each FILE to that of RFILE.\n"
@@ -1500,16 +1512,16 @@ msgstr ""
 "Med --reference ændres tilstanden for hver FIL til den for RFIL.\n"
 "\n"
 
-#: src/chmod.c:391
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
 "      --reference=RFIL   brug tilstand for RFIL frem for TILSTAND-værdier\n"
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr "  -R, --recursive        ændr filer og kataloger rekursivt\n"
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 msgid ""
 "\n"
 "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n"
@@ -1517,12 +1529,12 @@ msgstr ""
 "\n"
 "Hver TILSTAND er på formen '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n"
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr "kan ikke kombinere tilstandsangivelse med flaget --reference"
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, c-format
 msgid "invalid mode: %s"
 msgstr "ugyldig tilstand: %s"
@@ -1675,26 +1687,21 @@ msgstr ""
 "  %s -hR root /u    Sæt ejeren af /u og underfiler til \"root\".\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr "Roland McGrath"
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr "ugyldig gruppe %s"
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, c-format
 msgid "invalid group list %s"
 msgstr "ugyldig gruppeliste %s"
 
-#: src/chroot.c:117
-#, c-format
-msgid "failed to set additional groups"
-msgstr "kunne ikke sætte yderligere grupper"
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
@@ -1703,7 +1710,7 @@ msgstr ""
 "Brug:    %s [FLAG] NYROD [KOMMANDO [ARG]...]\n"
 "  eller: %s FLAG\n"
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
@@ -1711,7 +1718,7 @@ msgstr ""
 "Kør KOMMANDO med rod-kataloget sat til NYROD.\n"
 "\n"
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
@@ -1719,7 +1726,7 @@ msgstr ""
 "  --userspec=BRUGER:GRUPPE  angiv bruger og gruppe (ID eller navn)\n"
 "  --groups=G_LISTE       angiv supplerende grupper som g1,g2,..,gN\n"
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 msgid ""
 "\n"
 "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n"
@@ -1728,28 +1735,42 @@ msgstr ""
 "Hvis ingen kommando er angivet, køres '${SHELL} -i' (som standard: /bin/"
 "sh).\n"
 
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, c-format
 msgid "cannot change root directory to %s"
 msgstr "kan ikke ændre rod-kataloget til %s"
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, c-format
 msgid "cannot chdir to root directory"
 msgstr "kan ikke ændre til rod-katalog"
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr ""
+
+#: src/chroot.c:383
+#, fuzzy, c-format
+msgid "failed to get supplemental groups"
+msgstr "kunne ikke sætte supplerende grupper"
+
+#: src/chroot.c:395
+#, fuzzy, c-format
+msgid "failed to %s supplemental groups"
+msgstr "kunne ikke sætte supplerende grupper"
+
+#: src/chroot.c:402
 #, c-format
 msgid "failed to set group-ID"
 msgstr "kunne ikke sætte gruppe-ID"
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, c-format
 msgid "failed to set user-ID"
 msgstr "kunne ikke sætte bruger-ID"
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, c-format
 msgid "failed to run command %s"
 msgstr "kunne ikke køre kommandoen %s"
@@ -1781,7 +1802,7 @@ msgstr ""
 "Udskriv CRC-kontrolsum og byteantal for hver FIL.\n"
 "\n"
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr "Brug: %s [FLAG]... FIL1 FIL2\n"
@@ -1867,296 +1888,329 @@ msgstr "flere skilletegn angivet"
 msgid "empty %s not allowed"
 msgstr "tom %s er ikke tilladt"
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr "fejl ved læsning af %s"
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, c-format
 msgid "cannot lseek %s"
 msgstr "kan ikke udføre lseek() %s"
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr "fejl ved skrivning af %s"
 
 # ?
-#: src/copy.c:313
+#: src/copy.c:323
 #, c-format
 msgid "%s: failed to get extents info"
 msgstr "%s: kunne ikke hente omfangsinfo"
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, c-format
 msgid "%s: write failed"
 msgstr "%s: skrivning mislykkedes"
 
 # ?
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, c-format
 msgid "failed to extend %s"
 msgstr "kunne ikke udvide %s"
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, c-format
 msgid "clearing permissions for %s"
 msgstr "rydder rettigheder for %s"
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "kunne ikke bevare ejerskab for %s"
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
 msgstr "kunne ikke slå filen %s op"
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, c-format
 msgid "failed to preserve authorship for %s"
 msgstr "kunne ikke bevare forfatter af %s"
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
+#, c-format
+msgid "failed to set default file creation context to %s"
+msgstr "kunne ikke sætte standardkontekst for filoprettelse til %s"
+
+#: src/copy.c:820
+#, c-format
+msgid "failed to set default file creation context for %s"
+msgstr "kunne ikke sætte standardkontekst for filoprettelse for %s"
+
+#: src/copy.c:846
+#, c-format
+msgid "failed to set the security context of %s"
+msgstr "kunne ikke sætte sikkerhedskontekst for %s"
+
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
 msgid "cannot open %s for reading"
 msgstr "kan ikke åbne %s til læsning"
 
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, c-format
 msgid "cannot fstat %s"
 msgstr "kan ikke udføre fstat() %s"
 
-#: src/copy.c:820
+#: src/copy.c:935
 #, c-format
 msgid "skipping file %s, as it was replaced while being copied"
 msgstr "springer filen %s over, da den blev erstattet mens den blev kopieret"
 
-#: src/copy.c:850
-#, c-format
-msgid "failed to get file system create context"
-msgstr "kunne ikke hente filsystemets oprettelseskontekst"
-
-#: src/copy.c:864
-#, c-format
-msgid "failed to set the security context of %s to %s"
-msgstr "kunne ikke sætte sikkerhedskonteksten for %s til %s"
-
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
 msgid "cannot remove %s"
 msgstr "kan ikke fjerne %s"
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
 msgstr "fjernede %s\n"
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr "skriver ikke gennem dinglende symlænke %s"
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, c-format
 msgid "cannot create regular file %s"
 msgstr "kan ikke oprette almindelig fil %s"
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, c-format
 msgid "failed to clone %s from %s"
 msgstr "kunne ikke klone %s fra %s"
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr "beholder tider for %s"
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
-#, fuzzy, c-format
+#, c-format
 msgid "failed to close %s"
-msgstr "kunne ikke åbne %s"
+msgstr "kunne ikke lukke %s"
 
-#: src/copy.c:1471
-#, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
+#: src/copy.c:1580
+#, fuzzy, c-format
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
 msgstr "%s: forsøg at overskrive %s, uden hensyn til tilstand %04lo (%s)? "
 
-#: src/copy.c:1478
+#: src/copy.c:1581
+#, c-format
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr ""
+
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
 msgstr "%s: overskriv %s? "
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr " (sikkerhedskopi: %s)"
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr "kunne ikke genskabe standardkontekst for filoprettelse"
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, c-format
 msgid "cannot create hard link %s to %s"
 msgstr "kan ikke oprette hård lænke %s til %s"
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, c-format
 msgid "cannot stat %s"
 msgstr "kan ikke udføre stat() på %s"
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, c-format
 msgid "omitting directory %s"
 msgstr "udelader katalog %s"
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr "advarsel: kildefil %s er angivet mere end én gang"
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
 msgstr "%s og %s er den samme fil"
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr "kan ikke overskrive ikke-katalog %s med katalog %s"
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr "vil ikke overskrive netop oprettet %s med %s"
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr "kan ikke overskrive katalog %s med ikke-katalog"
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr "kan ikke flytte katalog til ikke-katalog: %s -> %s"
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr "sikkerhedskopi af %s vil overskrive kildefil; %s er ikke flyttet"
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr "sikkerhedskopi af %s vil overskrive kildefil; %s er ikke kopieret"
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
 msgstr "kan ikke sikkerhedskopiere %s"
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr "vil ikke kopiere %s gennem netop oprettet symlænke %s"
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr "kan ikke kopiere et katalog, %s, ind i sig selv, %s"
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr "vil ikke oprette hård lænke %s til katalog %s"
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr "kan ikke flytte %s til et underkatalog af sig selv, %s"
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, c-format
 msgid "cannot move %s to %s"
 msgstr "kan ikke flytte %s til %s"
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr "flytning mellem enheder mislykkedes: %s til %s; kan ikke fjerne målet"
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, c-format
-msgid "failed to set default file creation context to %s"
-msgstr "kunne ikke sætte standardkontekst for filoprettelse til %s"
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr "kan ikke kopiere cyklisk symbolsk lænke %s"
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr "%s: kan kun oprette relative symbolske lænker i aktuelt katalog"
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr "kan ikke oprette symbolsk lænke %s til %s"
 
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, c-format
 msgid "cannot create fifo %s"
 msgstr "kan ikke oprette fifo %s"
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, c-format
 msgid "cannot create special file %s"
 msgstr "kan ikke oprette specialfil %s"
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, c-format
 msgid "cannot read symbolic link %s"
 msgstr "kan ikke læse symbolsk lænke %s"
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, c-format
 msgid "cannot create symbolic link %s"
 msgstr "kan ikke oprette symbolsk lænke %s"
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
 msgstr "%s har ukendt filtype"
 
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, c-format
 msgid "cannot un-backup %s"
 msgstr "kan ikke fjerne sikkerhedskopi af %s"
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr "%s -> %s (fjern sikkerhedskopi)\n"
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr ""
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr ""
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, fuzzy, c-format
+msgid "unknown program %s"
+msgstr "ukendt strøm"
+
+#: src/cp.c:157 src/mv.c:288
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -2167,14 +2221,11 @@ msgstr ""
 "  eller: %s [FLAG]... KILDE... KATALOG\n"
 "  eller: %s [FLAG]... -t KATALOG KILDE...\n"
 
-#: src/cp.c:162
-#, fuzzy
+#: src/cp.c:163
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
-msgstr ""
-"Kopiér KILDE til MÅL eller en eller flere KILDEr til KATALOG.\n"
-"\n"
+msgstr "Kopiér KILDE til MÅL eller en eller flere KILDEr til KATALOG.\n"
 
-#: src/cp.c:168
+#: src/cp.c:169
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
 "      --attributes-only        don't copy the file data, just the "
@@ -2197,8 +2248,7 @@ msgstr ""
 "rekursion\n"
 "  -d                           samme som --no-dereference --preserve=links\n"
 
-#: src/cp.c:177
-#, fuzzy
+#: src/cp.c:178
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
 "                                 opened, remove it and try again (this "
@@ -2212,15 +2262,16 @@ msgid ""
 msgstr ""
 "  -f, --force                  hvis en eksisterende målfil ikke kan åbnes, "
 "så\n"
-"                                 fjern den og prøv igen (unødvendig hvis\n"
-"                                 flaget -n bruges)\n"
+"                                 fjern den og prøv igen (dette flag "
+"ignoreres\n"
+"                                 når flaget -n også bruges)\n"
 "  -i, --interactive            bed om bekræftelse før overskrivning af "
 "filer\n"
 "                                 (tilsidesætter tidligere -n-flag)\n"
-"  -H                           følg symbolske lænker fra kommandolinje\n"
-"                                 i KILDE\n"
+"  -H                           følg symbolske lænker fra kommandolinje i "
+"KILDE\n"
 
-#: src/cp.c:186
+#: src/cp.c:187
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
 "  -L, --dereference            always follow symbolic links in SOURCE\n"
@@ -2229,7 +2280,7 @@ msgstr ""
 "kopiere\n"
 "  -L, --dereference            følg altid symbolske lænker i KILDE\n"
 
-#: src/cp.c:190
+#: src/cp.c:191
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
 "                                 a previous -i option)\n"
@@ -2240,7 +2291,7 @@ msgstr ""
 "i)\n"
 "  -P, --no-dereference         følg aldrig symbolske lænker i KILDE\n"
 
-#: src/cp.c:195
+#: src/cp.c:196
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
 "      --preserve[=ATTR_LIST]   preserve the specified attributes (default:\n"
@@ -2257,7 +2308,7 @@ msgstr ""
 "xattr,\n"
 "                                 all\n"
 
-#: src/cp.c:203
+#: src/cp.c:204
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                use full source file name under DIRECTORY\n"
@@ -2265,7 +2316,7 @@ msgstr ""
 "      --no-preserve=ATTRLISTE  bevar ikke de angivne attributter\n"
 "      --parents                brug det fulde kildefilnavn under KATALOG\n"
 
-#: src/cp.c:207
+#: src/cp.c:208
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
 "      --reflink[=WHEN]         control clone/CoW copies. See below\n"
@@ -2278,7 +2329,7 @@ msgstr ""
 "      --remove-destination     fjern hver eksisterende målfil før forsøg på\n"
 "                                 at åbne den (sammenlign med --force)\n"
 
-#: src/cp.c:213
+#: src/cp.c:214
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
 "      --strip-trailing-slashes  remove any trailing slashes from each "
@@ -2291,7 +2342,7 @@ msgstr ""
 "af\n"
 "                               hvert KILDE-argument\n"
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -2306,7 +2357,7 @@ msgstr ""
 "  -t, --target-directory=KATALOG  kopiér alle KILDE-argumenter til KATALOG\n"
 "  -T, --no-target-directory    behandl MÃ…L som en normal fil\n"
 
-#: src/cp.c:224
+#: src/cp.c:225
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
 "                                 than the destination file or when the\n"
@@ -2319,7 +2370,20 @@ msgstr ""
 "  -v, --verbose                forklar hvad der sker\n"
 "  -x, --one-file-system        bliv på dette filsystem\n"
 
-#: src/cp.c:233
+#: src/cp.c:232
+#, fuzzy
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+"  -Z, --context[=KONT]         sæt SELinux-sikkerhedskontekst for "
+"destinations-\n"
+"                                 filen til standardtypen eller KONT hvis "
+"givet\n"
+
+#: src/cp.c:240
 msgid ""
 "\n"
 "By default, sparse SOURCE files are detected by a crude heuristic and the\n"
@@ -2345,7 +2409,7 @@ msgstr ""
 "forhindre oprettelse af usammenhængende filer.\n"
 "\n"
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 msgid ""
 "\n"
 "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n"
@@ -2361,7 +2425,7 @@ msgstr ""
 "er:\n"
 "\n"
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2375,7 +2439,7 @@ msgstr ""
 "                  ellers enkle sikkerhedskopier\n"
 "  simple, never   lav altid enkle sikkerhedskopier\n"
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2388,92 +2452,103 @@ msgstr ""
 "eksisterende,\n"
 "regulær fil.\n"
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, c-format
 msgid "failed to preserve times for %s"
 msgstr "kunne ikke beholde tider for %s"
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, c-format
 msgid "failed to preserve permissions for %s"
 msgstr "kan ikke beholde adgangsrettigheder på %s"
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, c-format
 msgid "cannot make directory %s"
 msgstr "kan ikke oprette katalog %s"
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr "%s eksisterer, men er ikke et katalog"
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
-#, fuzzy, c-format
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
+#, c-format
 msgid "failed to access %s"
-msgstr "kunne ikke åbne %s"
+msgstr "kunne ikke tilgå %s"
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, c-format
 msgid "missing file operand"
 msgstr "manglende filoperand"
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, c-format
 msgid "missing destination file operand after %s"
 msgstr "manglende målfilsoperand efter %s"
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr ""
 "kan ikke kombinere --target-directory (-t) og --no-target-directory (-T)"
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, c-format
 msgid "target %s is not a directory"
 msgstr "målet %s er ikke et katalog"
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr "ved brug af --parents, skal målet være et katalog"
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, c-format
 msgid "multiple target directories specified"
 msgstr "flere målkataloger angivet"
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr ""
+"advarsel: ignorerer --context; kræver en kerne, der understøtter SELinux"
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr "kan ikke lave både hårde og symbolske lænker"
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr "flagene --backup og --no-clobber kan ikke bruges samtidigt"
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr "--reflink kan kun bruges sammen med --sparse=auto"
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr "type af sikkerhedskopi"
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, c-format
+msgid "cannot set target context and preserve it"
+msgstr "kan ikke sætte målkontekst og bibeholde den"
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr ""
 "kan ikke beholde sikkerhedskontekst uden en kerne, der understøtter SELinux"
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr ""
@@ -2481,141 +2556,139 @@ msgstr ""
 "understøttelse"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr "Stuart Kemp"
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr "inddata forsvandt"
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr "%s: linjenummer uden for område"
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, c-format
 msgid "%s: %s: line number out of range"
 msgstr "%s: %s: linjenummer uden for område"
 
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, c-format
 msgid " on repetition %s\n"
 msgstr " ved gentagelse %s\n"
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, c-format
 msgid "%s: %s: match not found"
 msgstr "%s: %s: ingen træffer fundet"
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr "fejl i søgning med regulært udtryk"
 
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, c-format
 msgid "write error for %s"
 msgstr "skrivefejl for %s"
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, c-format
 msgid "%s: integer expected after delimiter"
 msgstr "%s: heltal forventedes efter skilletegn"
 
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr "%s: '}' er nødvendig i gentagelsesantal"
 
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr "%s}: heltal kræves mellem '{' og '}'"
 
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr "%s: afsluttende skilletegn '%c' mangler"
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr "%s: ugyldigt regulært udtryk: %s"
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr "%s: ugyldigt mønster"
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr "%s: linjenummeret skal være større end nul"
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr "linjenummer %s er mindre end foregående linjenummer, %s"
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr "advarsel: linjenummer %s er det samme som foregående"
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr "manglende konverteringsspecifikator i suffiks"
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr "ugyldig konverteringsspecifikator i suffiks: %c"
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr "ugyldig konverteringsspecifikator i suffiks: \\%.3o"
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr "ugyldige flag i konverteringsspecifikation: %%%c%c"
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr "for mange %%-konverteringsspecifikationer i suffiks"
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr "manglende %%-konverteringsspecifikation i suffiks"
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr "%s: ugyldigt tal"
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr "Brug: %s [FLAG]... FIL MØNSTER...\n"
 
-#: src/csplit.c:1455
-#, fuzzy
+#: src/csplit.c:1483
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
 "and output byte counts of each piece to standard output.\n"
 msgstr ""
-"Udskriv dele af FIL adskilt af MØNSTER til filerne 'xx01', 'xx02',...,\n"
+"Udskriv dele af FIL adskilt af MØNSTER til filerne 'xx01', 'xx02', ...,\n"
 "og vis antal byte for hver del på standard-ud.\n"
-"\n"
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2626,7 +2699,11 @@ msgstr ""
 "  -f, --prefix=PRÆFIKS       brug PRÆFIKS i stedet for 'xx'\n"
 "  -k, --keep-files           fjern ikke udfiler ved fejl\n"
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr "  -m, --suppress-matched     undertryk linjerne der matcher MØNSTER\n"
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
@@ -2636,7 +2713,7 @@ msgstr ""
 "  -s, --quiet, --silent      vis ikke størrelsen af udfilerne\n"
 "  -z, --elide-empty-files    fjern tomme udfiler\n"
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
@@ -2644,7 +2721,7 @@ msgstr ""
 "\n"
 "Læs standard-ind når FIL er '-'. Hvert MØNSTER kan være:\n"
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 msgid ""
 "\n"
 "  INTEGER            copy up to but not including specified line number\n"
@@ -2669,23 +2746,16 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr "David M. Ihnat"
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr "felter og positioner nummereres fra 1"
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr "Brug: %s FLAG... [FIL]...\n"
 
-#: src/cut.c:193
-#, fuzzy
+#: src/cut.c:176
 msgid "Print selected parts of lines from each FILE to standard output.\n"
-msgstr ""
-"Udskriv valgte dele af linjerne fra hver FIL til standard-ud.\n"
-"\n"
+msgstr "Udskriv valgte dele af linjerne fra hver FIL til standard-ud.\n"
 
-#: src/cut.c:199
+#: src/cut.c:182
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
 "  -c, --characters=LIST   select only these characters\n"
@@ -2695,7 +2765,7 @@ msgstr ""
 "  -c, --characters=LISTE  vælg kun disse tegn\n"
 "  -d, --delimiter=SKILLE  brug SKILLE i stedet for TAB som feltskilletegn\n"
 
-#: src/cut.c:204
+#: src/cut.c:187
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
 "                            that contains no delimiter character, unless\n"
@@ -2708,14 +2778,14 @@ msgstr ""
 "                          flaget -s er angivet\n"
 "  -n                      (ignoreres)\n"
 
-#: src/cut.c:210
+#: src/cut.c:193
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
 "                            or fields\n"
 msgstr ""
 "      --complement        omvend mængden af valgte byte, tegn eller felter\n"
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
@@ -2726,7 +2796,7 @@ msgstr ""
 "      --output-delimiter=STRENG  brug STRENG som forvalgt ud-skilletegn.\n"
 "                            forvalgt er at bruge ind-skilletegnet\n"
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2738,7 +2808,7 @@ msgstr ""
 "eller mange intervaller adskilt af kommaer.  De valgte inddata skrives i\n"
 "samme rækkefølge som de læses, og skrives netop én gang.\n"
 
-#: src/cut.c:227
+#: src/cut.c:210
 msgid ""
 "Each range is one of:\n"
 "\n"
@@ -2758,47 +2828,50 @@ msgstr ""
 "\n"
 "Hvis ingen FIL er angivet, eller FIL er -, læses fra standard-ind.\n"
 
-#: src/cut.c:367 src/cut.c:493
-#, fuzzy
+#: src/cut.c:300 src/cut.c:394
 msgid "invalid byte, character or field list"
-msgstr "ugyldig byte- eller feltliste"
+msgstr "ugyldig byte-, tegn- eller feltliste"
 
-#: src/cut.c:387
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr "felter og positioner nummereres fra 1"
+
+#: src/cut.c:320
 msgid "invalid range with no endpoint: -"
 msgstr "ugyldigt interval uden slutpunkt: -"
 
-#: src/cut.c:403
+#: src/cut.c:334
 msgid "invalid decreasing range"
 msgstr "ugyldigt aftagende interval"
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, c-format
 msgid "byte offset %s is too large"
 msgstr "byte-startpunktet %s er for stort"
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, c-format
 msgid "field number %s is too large"
 msgstr "felt nummer %s er for stort"
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr "kun én slags liste må bruges"
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr "skilletegnet skal være et enkelt tegn"
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr "du skal angive en liste af byte, tegn eller felter"
 
-#: src/cut.c:850
+#: src/cut.c:790
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr "et inddataskilletegn kan kun specificeres ved arbejde på felter"
 
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
@@ -2806,11 +2879,11 @@ msgstr ""
 "fjernelse af linjer uden skilletegn giver kun mening hvis man opererer\n"
 "\tmed felter"
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr "feltliste mangler"
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr "positionsliste mangler"
 
@@ -2825,10 +2898,9 @@ msgstr ""
 
 #: src/date.c:128
 msgid "Display the current time in the given FORMAT, or set the system date.\n"
-msgstr ""
+msgstr "Vis nuværende tidspunkt i det givne FORMAT, eller angiv systemdato.\n"
 
 #: src/date.c:134
-#, fuzzy
 msgid ""
 "  -d, --date=STRING         display time described by STRING, not 'now'\n"
 "  -f, --file=DATEFILE       like --date once for each line of DATEFILE\n"
@@ -2837,8 +2909,6 @@ msgid ""
 "                            'hours', 'minutes', 'seconds', or 'ns' for date\n"
 "                            and time to the indicated precision.\n"
 msgstr ""
-"Vis det nuværende tidspunkt i det givne FORMAT eller ændr systemdato.\n"
-"\n"
 "  -d, --date=STRENG         vis tidspunkt beskrevet ved STRENG frem for "
 "'nu'\n"
 "  -f, --file=DATOFIL        som --date en gang for hver linje af DATOFIL\n"
@@ -2868,7 +2938,7 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 "      --rfc-3339=TIDSSPEC   udskriv dato og tid i RFC 3339-format.\n"
 "                            TIMESPEC='date', 'seconds', eller 'ns' for\n"
@@ -3082,10 +3152,10 @@ msgstr ""
 "Vis det lokale klokkeslæt for 9:00 næste fredag på USA's vestkyst\n"
 "  $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n"
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr "standard-ind"
@@ -3126,7 +3196,7 @@ msgstr ""
 msgid "cannot set date"
 msgstr "kan ikke sætte dato"
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, c-format
 msgid "time %s is out of range"
 msgstr "tidspunktet %s uden for område"
@@ -3137,7 +3207,7 @@ msgstr "tidspunktet %s uden for område"
 msgid "Paul Rubin"
 msgstr "Paul Rubin"
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
@@ -3146,7 +3216,7 @@ msgstr ""
 "Brug:    %s [OPERAND]...\n"
 "  eller: %s FLAG\n"
 
-#: src/dd.c:526
+#: src/dd.c:532
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
 "\n"
@@ -3165,8 +3235,7 @@ msgstr ""
 "  count=N         kopiér kun N indblokke\n"
 "  ibs=BYTE        læs BYTE byte ad gangen (standard: 512)\n"
 
-#: src/dd.c:535
-#, fuzzy
+#: src/dd.c:541
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
 "  iflag=FLAGS     read as per the comma separated symbol list\n"
@@ -3183,14 +3252,15 @@ msgstr ""
 "  obs=BYTE        skriv BYTE byte ad gangen (standard: 512)\n"
 "  of=FIL          skriv til FIL i stedet for stdout\n"
 "  oflag=FLAG      skriv som angivet ved kommaadskilt liste af symboler\n"
-"  seek=BLOKKE     udelad BLOKKE blokke med obs-størrelse fra\n"
-"                  begyndelsen af uddata\n"
-"  skip=BLOKKE     udelad BLOKKE blokke med ibs-størrelse fra\n"
-"                  begyndelsen af inddata\n"
-"  status=noxfer   udelad statistik for overførsel\n"
+"  seek=N          udelad N blokke med størrelse obs fra begyndelsen af "
+"uddata\n"
+"  skip=N          udelad N blokke med størrelse ibs fra begyndelsen af "
+"inddata\n"
+"  status=HVILKE   HVILKE oplysninger der skal udelades på stderr;\n"
+"                  'noxfer' udelader overførselsstatistik, 'none' udelader "
+"alt\n"
 
-#: src/dd.c:546
-#, fuzzy
+#: src/dd.c:552
 msgid ""
 "\n"
 "N and BYTES may be followed by the following multiplicative suffixes:\n"
@@ -3201,14 +3271,14 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"BLOKKE og BYTE kan have følgende multiplikative suffikser:\n"
+"N og BYTE kan have følgende multiplikative suffikser:\n"
 "c =1, w =2, b =512, kB =1000, K =1024, MB =1000*1000, M=1024*1024, xM =M\n"
 "GB =1000*1000*1000, G =1024*1024*1024 og så videre for T, P, E, Z, Y.\n"
 "\n"
 "Hvert KONV-symbol kan være:\n"
 "\n"
 
-#: src/dd.c:555
+#: src/dd.c:561
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
 "  ebcdic    from ASCII to EBCDIC\n"
@@ -3237,7 +3307,7 @@ msgstr ""
 "  sync      udfyld hver ind-blok med NUL op til ibs-størrelse; ved brug\n"
 "            af block eller unblock, udfyldes med blanktegn frem for NUL.\n"
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -3253,7 +3323,7 @@ msgstr ""
 "  fdatasync  skriv data til udfil fysisk før der afsluttes\n"
 "  fsync     tilsvarende, men skriv også metadata\n"
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -3267,75 +3337,75 @@ msgstr ""
 "  append    tilføjelsestilstand (kun meningsfuld ved udskrift;\n"
 "            conv=notrunc anbefales)\n"
 
-#: src/dd.c:583
+#: src/dd.c:589
 msgid "  cio       use concurrent I/O for data\n"
 msgstr "  cio       brug parallel data-I/O\n"
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr "  direct    brug direkte data-I/O\n"
 
-#: src/dd.c:587
+#: src/dd.c:593
 msgid "  directory  fail unless a directory\n"
 msgstr "  directory  meld fejl for ikke-kataloger\n"
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr "  dsync     brug synkroniseret I/O til data\n"
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr "  sync      tilsvarende, men også for metadata\n"
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr "  fullblock  opsaml fulde ind-blokke (kun iflag)\n"
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr "  nonblock  brug ikkeblokerende I/O\n"
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr "  noatime   opdatér ikke tilgangstid\n"
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr "  nocache   forkast lagrede data\n"
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr "  noctty    tildel ikke styrende terminal fra fil\n"
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr "  nofollow  følg ikke symbolske lænker\n"
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr "  nolinks   meld fejl hvis lænket flere gange\n"
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr "  binary    brug binær I/O til data\n"
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr "  text      brug tekst-I/O til data\n"
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr "  count_bytes  behandl 'count=N' som et antal byte (kun iflag)\n"
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr "  skip_bytes  behandl 'skip=N' som et antal byte (kun iflag)\n"
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr "  seek_bytes  behandl 'seek=N' som et antal byte (kun oflag)\n"
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, c-format
 msgid ""
 "\n"
@@ -3364,7 +3434,17 @@ msgstr ""
 "Mulige flag:\n"
 "\n"
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr "hukommelsen blev opbrugt af inddatabuffer af størrelse %zu byte (%s)"
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr "hukommelsen blev opbrugt af uddatabuffer af størrelse %zu byte (%s)"
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
@@ -3373,21 +3453,21 @@ msgstr ""
 "%<PRIuMAX>+%<PRIuMAX> blokke ind\n"
 "%<PRIuMAX>+%<PRIuMAX> blokke ud\n"
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
 msgstr[0] "%<PRIuMAX> afkortet blok\n"
 msgstr[1] "%<PRIuMAX> afkortede blokke\n"
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
 msgstr[0] "%<PRIuMAX> byte (%s) kopieret"
 msgstr[1] "%<PRIuMAX> byte (%s) kopieret"
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr "Uendelig B"
 
@@ -3401,83 +3481,83 @@ msgstr "Uendelig B"
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
 msgstr ", %g s, %s/s\n"
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, c-format
 msgid "closing input file %s"
 msgstr "lukker indfil %s"
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr "lukker uddatafil %s"
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr "kunne ikke slå O_DIRECT fra: %s"
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, c-format
 msgid "writing to %s"
 msgstr "skriver til %s"
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, c-format
 msgid "unrecognized operand %s"
 msgstr "ukendt operand %s"
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 msgid "invalid conversion"
 msgstr "ugyldig konvertering"
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 msgid "invalid input flag"
 msgstr "ugyldigt ind-flag"
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 msgid "invalid output flag"
 msgstr "ugyldigt ud-flag"
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 msgid "invalid status flag"
 msgstr "ugyldigt statusflag"
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, c-format
 msgid "invalid number %s"
 msgstr "ugyldigt antal %s"
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr "kan ikke kombinere nogen af {ascii,ebcdic,ibm}"
 
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, c-format
 msgid "cannot combine block and unblock"
 msgstr "kan ikke kombinere block og unblock"
 
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, c-format
 msgid "cannot combine lcase and ucase"
 msgstr "kan ikke kombinere lcase og ucase"
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, c-format
 msgid "cannot combine excl and nocreat"
 msgstr "kan ikke kombinere excl og nocreat"
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, c-format
 msgid "cannot combine direct and nocache"
 msgstr "kan ikke kombinere direct og nocache"
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
@@ -3486,72 +3566,62 @@ msgstr ""
 "advarsel: omgår lseek-kernefejl for fil (%s)\n"
 "  med mt_type=0x%0lx -- se <sys/mtio.h> for listen af typer"
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, c-format
 msgid "%s: cannot skip"
 msgstr "%s: kan ikke overspringe"
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, c-format
 msgid "%s: cannot seek"
 msgstr "%s: kan ikke søge"
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr "overløb for afsæt ved læsning af fil %s"
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr "advarsel: ugyldigt filafsæt efter fejlslagen læsning"
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr "kan ikke arbejde omkring kernefejl alligevel"
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, c-format
 msgid "setting flags for %s"
 msgstr "sætter flag for %s"
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr "hukommelsen blev opbrugt af inddatabuffer af størrelse %zu byte (%s)"
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr "hukommelsen blev opbrugt af uddatabuffer af størrelse %zu byte (%s)"
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr "%s: kan ikke springe til det angivne afsæt"
 
-#: src/dd.c:2133
-#, fuzzy, c-format
+#: src/dd.c:2172
+#, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
-msgstr "kunne ikke afkorte til %<PRIuMAX> byte i udfilen %s"
+msgstr "kunne ikke afkorte til %<PRIdMAX> byte i udfilen %s"
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr "fdatasync mislykkedes for %s"
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
 msgstr "fsync mislykkedes for %s"
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, c-format
 msgid "failed to open %s"
 msgstr "kunne ikke åbne %s"
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
@@ -3560,127 +3630,136 @@ msgstr ""
 "afsæt for stort: kan ikke afkorte til en længde på seek=%<PRIuMAX> (%lu-"
 "byte) blokke"
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr "kunne ikke afkorte til %<PRIuMAX> byte i udfilen %s"
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, c-format
 msgid "failed to discard cache for: %s"
 msgstr "kunne ikke fjerne cache for: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr "Paul Eggert"
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr "Filsystem"
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr "Type"
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr "blokke"
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr "Brugt"
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr "Tilbage"
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr "Brug%"
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr "Inoder"
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr "IBrugt"
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr "IFri"
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr "IBrug%"
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr "Monteret på"
 
-#: src/df.c:383
+#: src/df.c:207
+msgid "File"
+msgstr "Fil"
+
+#: src/df.c:387
 #, c-format
-msgid "option --output: field '%s' unknown"
-msgstr ""
+msgid "option --output: field %s unknown"
+msgstr "tilvalg --output: feltet %s er ukendt"
 
-#: src/df.c:390
-#, fuzzy, c-format
-msgid "option --output: field '%s' used more than once"
-msgstr "advarsel: kildefil %s er angivet mere end én gang"
+#: src/df.c:394
+#, c-format
+msgid "option --output: field %s used more than once"
+msgstr "tilvalg --output: feltet %s bruges mere end en gang"
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr "Størr"
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr "Tilb"
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr "Kapacitet"
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
+msgstr "%s-%s"
+
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
 msgstr ""
 
-#: src/df.c:1210
-#, fuzzy
+#: src/df.c:1384
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
 "or all file systems by default.\n"
 msgstr ""
 "Vis information om filsystemet som FIL ligger på, eller som \n"
 "standard alle filsystemer.\n"
-"\n"
 
-#: src/df.c:1217
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
+#, fuzzy
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
 "  -a, --all             medtag uægte filsystemer\n"
 "  -B, --block-size=STØR  skalér størrelser med STØR før de udskrives.  F."
 "eks.\n"
 "                           vil '-BM' udskrive størrelser i enheder af "
 "1.048.576\n"
-"                           byte.  Se STØR-format nedenfor.\n"
+"                           byte.  Se STØR-format nedenfor\n"
 "      --total           udskriv en samlet sum\n"
 "  -h, --human-readable  skriv størrelser på en læsevenlig form \n"
 "                          (f.eks. 1K 234M 2G)\n"
 
-#: src/df.c:1227
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -3694,8 +3773,7 @@ msgstr ""
 "      --no-sync         kør ikke sync før hentning af forbrugsinfo "
 "(standard)\n"
 
-#: src/df.c:1234
-#, fuzzy
+#: src/df.c:1409
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
 "                               or print all fields if FIELD_LIST is "
@@ -3707,6 +3785,10 @@ msgid ""
 "  -x, --exclude-type=TYPE   limit listing to file systems not of type TYPE\n"
 "  -v                    (ignored)\n"
 msgstr ""
+"      --output=[FELTLISTE]  brug uddataformatet defineret af FELTLISTE, "
+"eller\n"
+"                              udskriv alle felter hvis FELTLISTE er "
+"udeladt.\n"
 "  -P, --portability     brug POSIX-format for uddata\n"
 "      --sync            kør sync før hentning af forbrugsinfo\n"
 "  -t, --type=TYPE       vis kun filsystemer af typen TYPE\n"
@@ -3714,41 +3796,38 @@ msgstr ""
 "  -x, --exclude-type=TYPE   vis kun filsystemer som ikke er af typen TYPE\n"
 "  -v                    (ignoreret)\n"
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
+"\n"
+"FELTLISTE er en kommaadskilt liste af kolonner som skal inkluderes.  "
+"Gyldige\n"
+"feltnavne er: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
+"'size', 'used', 'avail', 'pcent', 'file' og 'target' (se info-side).\n"
 
-#: src/df.c:1285
-#, fuzzy, c-format
+#: src/df.c:1460
+#, c-format
 msgid "options %s and %s are mutually exclusive"
-msgstr "flagene --compare (-C) og --strip kan ikke bruges samtidigt"
+msgstr "flagene %s og %s kan ikke bruges samtidigt"
 
-#: src/df.c:1335
-msgid "warning: "
-msgstr "advarsel: "
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr "det lange tilvalg '--megabytes' er forældet og vil snart blive fjernet"
-
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr "filsystem af typen %s er både valgt og udeladt"
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr "Advarsel: "
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 msgid "cannot read table of mounted file systems"
 msgstr "kan ikke læse tabellen over monterede filsystemer"
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr "ingen filsystemer behandlet"
@@ -3758,7 +3837,7 @@ msgstr "ingen filsystemer behandlet"
 msgid "H. Peter Anvin"
 msgstr "H. Peter Anvin"
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr "Brug: %s [FLAG]... [FIL]\n"
@@ -3843,7 +3922,8 @@ msgstr ""
 "nogen skråstreger, så udskriv '.' (for nuværende katalog).\n"
 
 #: src/dirname.c:59
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
+#, fuzzy
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
 msgstr "  -z, --zero     afslut linjer med en 0-byte frem for linjeskift\n"
 
 #: src/dirname.c:64
@@ -3861,7 +3941,7 @@ msgstr ""
 "  %s dir1/str dir2/str  -> \"dir1\" efterfulgt af \"dir2\"\n"
 "  %s stdio.h            -> \".\"\n"
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -3870,18 +3950,14 @@ msgstr ""
 "Brug:   %s [FLAG]... [FIL]...\n"
 " eller: %s [FLAG]... --files0-from=F\n"
 
-#: src/du.c:274
-#, fuzzy
+#: src/du.c:285
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
-msgstr ""
-"Opsummér diskforbrug for hver FIL, rekursivt for kataloger.\n"
-"\n"
+msgstr "Opsummér diskforbrug for hver FIL, rekursivt for kataloger.\n"
 
-#: src/du.c:280
+#: src/du.c:291
 #, fuzzy
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3889,6 +3965,7 @@ msgid ""
 "                          larger due to holes in ('sparse') files, internal\n"
 "                          fragmentation, indirect blocks, and the like\n"
 msgstr ""
+"  -0, --null            afslut hver udlinje med 0-byte frem for linjeskift\n"
 "  -a, --all             udskriv antal for alle filer, ikke kun kataloger\n"
 "      --apparent-size   udskriv tilsyneladende størrelser i stedet for\n"
 "                          diskforbrug; selvom den tilsyneladende størrelse\n"
@@ -3897,12 +3974,11 @@ msgstr ""
 "                          huller i (ikke-sammenhængende) filer, intern\n"
 "                          fragmentering, indirekte blokke og lignende\n"
 
-#: src/du.c:289
-#, fuzzy
+#: src/du.c:300
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3917,21 +3993,28 @@ msgstr ""
 "eks.\n"
 "                           vil '-BM' udskrive størrelser i enheder af "
 "1.048.576\n"
-"                           byte.  Se STØR-formatet nedenfor.\n"
+"                           byte.  Se STØR-formatet nedenfor\n"
 "  -b, --bytes           svarer til '--apparent-size --block-size=1'\n"
 "  -c, --total           angiv samlet sum\n"
 "  -D, --dereference-args  dereferér kun symbolske lænker, som angives på\n"
 "                          kommandolinjen\n"
+"  -d, --max-depth=N     udskriv kun sum for et katalog (eller en fil med --"
+"all)\n"
+"                          hvis det befinder sig N eller færre niveauer "
+"under\n"
+"                          kommandolinjeargumentet; --max-depth=0 er det "
+"samme\n"
+"                          som --summarize\n"
 
-#: src/du.c:302
-#, fuzzy
+#: src/du.c:313
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
 "      --files0-from=F   giv oversigt over diskforbrug for de NUL-afsluttede\n"
 "                          filnavne angivet i filen F;\n"
@@ -3939,10 +4022,10 @@ msgstr ""
 "  -H                    samme som --dereference-args (-D)\n"
 "  -h, --human-readable  udskriv størrelser i læsevenligt format\n"
 "                          (f.eks. 1K 234M 2G)\n"
-"      --si              som -h, men brug potenser af 1000 frem for 1024\n"
+"      --inodes          vis oplysninger om inode-forbrug frem for "
+"blokforbrug\n"
 
-#: src/du.c:310
-#, fuzzy
+#: src/du.c:322
 msgid ""
 "  -k                    like --block-size=1K\n"
 "  -L, --dereference     dereference all symbolic links\n"
@@ -3950,27 +4033,26 @@ msgid ""
 "  -m                    like --block-size=1M\n"
 msgstr ""
 "  -k                    som --block-size=1K\n"
+"  -L, --deferefence     følg alle symbolske lænker\n"
 "  -l, --count-links     tæl størrelser flere gange for hårde lænker\n"
 "  -m                    som --block-size=1M\n"
 
-#: src/du.c:316
-#, fuzzy
+#: src/du.c:328
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
-"  -L, --dereference     følg alle symbolske lænker\n"
 "  -P, --no-dereference  følg ingen symbolske lænker (standard)\n"
-"  -0, --null            afslut hver udskriftslinje med 0-byte frem for \n"
-"                          linjeskift\n"
-"  -S, --separate-dirs   medtag ikke størrelsen på underkataloger\n"
+"  -S, --separate-dirs   for kataloger; medtag ikke størrelsen på "
+"underkataloger\n"
+"      --si              som -h, men brug potenser af 1000 frem for 1024\n"
 "  -s, --summarize       vis kun sum for hvert argument\n"
 
-#: src/du.c:322
-#, fuzzy
+#: src/du.c:334
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
 "                          or entries greater than SIZE if negative\n"
@@ -3979,86 +4061,94 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
 msgstr ""
+"  -t, --threshold=STØRRELSE  ekskludér elementer mindre end STØRRELSE hvis\n"
+"                          positiv, eller elementer større end STØRRELSE\n"
+"                          hvis negativ\n"
 "      --time            vis tidspunktet for den seneste modifikation for "
 "alle\n"
 "                          filer i mappen og dens undermapper\n"
 "      --time=ORD        vis tid som ORD frem for modifikationstid:\n"
 "                          atime, access, use, ctime eller status\n"
-"      --time-style=STIL  vis tidspunkter med stilen STIL:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
+"      --time-style=STIL  vis tidspunkter med STIL, som kan være:\n"
+"                          full-iso, long-iso, iso eller +FORMAT;\n"
 "                          FORMAT fortolkes som i 'date'\n"
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
 "  -x, --one-file-system    skip directories on different file systems\n"
 msgstr ""
+"  -X, --exclude-from=FIL   ekskludér filer som matcher ethvert mønster i "
+"FIL\n"
+"      --exclude=MØNSTER    ekskludér filer som matcher MØNSTER\n"
+"  -x, --one-file-system    spring kataloger på andre filsystemer over\n"
 
-#: src/du.c:386
+#: src/du.c:398
 msgid "Infinity"
 msgstr "Uendelig"
 
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr ""
-
-#: src/du.c:624
+#: src/du.c:636
 #, c-format
 msgid "fts_read failed: %s"
 msgstr "fts_read mislykkedes: %s"
 
-#: src/du.c:780
+#: src/du.c:787
 #, c-format
 msgid "invalid maximum depth %s"
 msgstr "ugyldig største dybde %s"
 
-#: src/du.c:809
-#, fuzzy, c-format
+#: src/du.c:816
+#, c-format
 msgid "invalid --threshold argument '-0'"
-msgstr "ugyldigt argument %2$s til --%1$s"
+msgstr "ugyldigt argument '-0' til --threshold"
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr "kan ikke både summere og vise alle størrelser"
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr "advarsel: summering er det samme som at bruge --max-depth=0"
 
-#: src/du.c:900
+#: src/du.c:911
 #, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr "advarsel: summering er i konflikt med --max-depth=%lu"
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+"advarsel: flagene --apparent-size og -b gælder ikke sammen med --inodes"
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 msgid "file operands cannot be combined with --files0-from"
 msgstr "filoperander kan ikke kombineres med --files0-from"
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr "%s: læsefejl"
 
 # %s evaluerer til '-' ifølge wc's kildekode -- altså man må ikke angive stdin som fil, der skal læses, når man læser fra stdin (hvilket er logisk)
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr "når der læses filnavne fra stdin, må intet filnavn være %s"
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 msgid "invalid zero-length file name"
 msgstr "ugyldigt filnavn af længde nul"
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr "totalt"
 
@@ -4163,16 +4253,15 @@ msgstr "Brug: %s [FLAG]... [-] [NAVN=VÆRDI]... [KOMMANDO [ARG]...]\n"
 
 #: src/env.c:55
 msgid "Set each NAME to VALUE in the environment and run COMMAND.\n"
-msgstr ""
+msgstr "Sæt hvert NAVN til VÆRDI i miljøet og kør KOMMANDO.\n"
 
 #: src/env.c:61
 #, fuzzy
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
-"Sæt hvert NAVN til VÆRDI i miljøet og udfør KOMMANDO.\n"
 "  -i, --ignore-environment  start uden miljøvariable\n"
 "  -0, --null           afslut udskrevne linjer med 0-byte frem for\n"
 "                         linjeskift\n"
@@ -4204,14 +4293,12 @@ msgid "cannot specify --null (-0) with command"
 msgstr "kan ikke angive --null (-0) med kommando"
 
 #: src/expand.c:107
-#, fuzzy
 msgid ""
 "Convert tabs in each FILE to spaces, writing to standard output.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
 "Konvertér tabulatorer i hver FIL til mellemrum, skriv til standard-ud.\n"
 "Hvis ingen FIL er angivet, eller FIL er -, læses fra standard-ind.\n"
-"\n"
 
 #: src/expand.c:114
 msgid ""
@@ -4252,16 +4339,16 @@ msgid "input line is too long"
 msgstr "ind-linjen er for lang"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr "Mike Parker"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr "James Youngman"
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
@@ -4270,7 +4357,7 @@ msgstr ""
 "Brug:    %s UDTRYK\n"
 "  eller: %s FLAG\n"
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -4290,7 +4377,7 @@ msgstr ""
 "  ARG1 & ARG2       ARG1 hvis intet af argumenterne er null eller 0, ellers "
 "0\n"
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -4308,7 +4395,7 @@ msgstr ""
 "  ARG1 >= ARG2      ARG1 er større end eller lig med ARG2\n"
 "  ARG1 > ARG2       ARG1 er større end ARG2\n"
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
@@ -4318,7 +4405,7 @@ msgstr ""
 "  ARG1 + ARG2       aritmetisk sum af ARG1 og ARG2\n"
 "  ARG1 - ARG2       aritmetisk forskel mellem ARG1 og ARG2\n"
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -4331,7 +4418,7 @@ msgstr ""
 "  ARG1 / ARG2       aritmetisk kvotient af ARG1 divideret med ARG2\n"
 "  ARG1 % ARG2       aritmetisk rest af ARG1 divideret med ARG2\n"
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -4349,7 +4436,7 @@ msgstr ""
 "  index STRENG BOGST      index i STRENG hvor BOGST fandtes, eller 0\n"
 "  length STRENG           længden af STRENG\n"
 
-#: src/expr.c:251
+#: src/expr.c:250
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
 "                               keyword like 'match' or an operator like '/'\n"
@@ -4361,7 +4448,7 @@ msgstr ""
 "'/'\n"
 "  ( UDTRYK )                 værdien af UDTRYK\n"
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -4378,7 +4465,7 @@ msgstr ""
 "returnerer strengen som passede på mønstret mellem \\( og \\) eller null.\n"
 "Hvis \\( og \\) ikke bruges, returneres antal tegn som passede eller 0.\n"
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -4391,62 +4478,65 @@ msgstr ""
 "eller 0, 2 hvis UDTRYK indeholder syntaksfejl, og 3 hvis der opstod en "
 "fejl.\n"
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, c-format
 msgid "syntax error"
 msgstr "syntaksfejl"
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, c-format
 msgid "error in regular expression matcher"
 msgstr "fejl i regulært udtryksmatcher"
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, c-format
 msgid "non-integer argument"
 msgstr "ikke-heltalligt argument"
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr "deling med nul"
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr "sæt LC_ALL='C' for at omgå problemet"
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, c-format
 msgid "the strings compared were %s and %s"
 msgstr "de sammenlignede strenge var %s og %s"
 
+# Må være ham her:
+#
+# http://lists.gnu.org/archive/html/bug-coreutils/2012-09/msg00118.html
 #. This is a proper name. See the gettext manual, section Names.
 #: src/factor.c:111
 msgid "Niels Moller"
-msgstr ""
+msgstr "Niels Möller"
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
-msgstr ""
+msgstr "Fejl i Lucas-primtalstest.  Dette bør ikke ske"
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
-msgstr ""
+msgstr "squfof-køoverløb"
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, c-format
 msgid "%s is not a valid positive integer"
 msgstr "%s er ikke et gyldigt positivt heltal"
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr "%s er for stor"
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
@@ -4455,7 +4545,7 @@ msgstr ""
 "Brug:    %s [TAL]...\n"
 "  eller: %s FLAG\n"
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
 "are specified on the command line, read them from standard input.\n"
@@ -4493,14 +4583,12 @@ msgstr "Brug: %s [-BREDDE] [FLAG]... [FIL]...\n"
 
 # Navnet DIGITS er blevet ændret til WIDTH i coreutils 7.1, men de har vist glemt at rette denne streng
 #: src/fmt.c:271
-#, fuzzy
 msgid ""
 "Reformat each paragraph in the FILE(s), writing to standard output.\n"
 "The option -WIDTH is an abbreviated form of --width=DIGITS.\n"
 msgstr ""
 "Omformatér hvert afsnit i FILerne, og skriv til standard-ud.\n"
 "Flaget -BREDDE er en forkortet form af --width=BREDDE.\n"
-"\n"
 
 #: src/fmt.c:278
 msgid ""
@@ -4544,14 +4632,12 @@ msgid "invalid width: %s"
 msgstr "ugyldig bredde: %s"
 
 #: src/fold.c:70
-#, fuzzy
 msgid ""
 "Wrap input lines in each FILE (standard input by default), writing to\n"
 "standard output.\n"
 msgstr ""
 "Ombryd linjerne i hver FIL (forvalgt standard-ind), og skriv til standard-"
 "ud\n"
-"\n"
 
 #: src/fold.c:77
 msgid ""
@@ -4569,17 +4655,17 @@ msgid "invalid number of columns: %s"
 msgstr "ugyldigt antal kolonner: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr "Padraig Brady"
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, c-format
 msgid "Usage: %s\n"
 msgstr "Brug: %s\n"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
@@ -4588,12 +4674,12 @@ msgstr ""
 "skalscript.\n"
 "\n"
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, c-format
 msgid "failed to get groups for user %s"
 msgstr "kunne ikke hente grupper for brugeren %s"
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, c-format
 msgid "failed to get groups for the current process"
 msgstr "kunne ikke hente grupper for den aktuelle proces"
@@ -4619,28 +4705,27 @@ msgstr ""
 "er angivet, for den aktuelle proces (som kan være forskellige hvis gruppens\n"
 "database er ændret).\n"
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, c-format
 msgid "cannot get real UID"
 msgstr "kan ikke finde reel UID"
 
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, c-format
 msgid "cannot get effective GID"
 msgstr "kan ikke finde effektiv GID"
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, c-format
 msgid "cannot get real GID"
 msgstr "kan ikke finde reel GID"
 
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, c-format
 msgid "%s: no such user"
 msgstr "%s: ingen sådan bruger"
 
 #: src/head.c:109
-#, fuzzy
 msgid ""
 "Print the first 10 lines of each FILE to standard output.\n"
 "With more than one FILE, precede each with a header giving the file name.\n"
@@ -4649,7 +4734,6 @@ msgstr ""
 "Skriv de første 10 linjer af hver FIL til standard-ud.\n"
 "Med mere end en FIL angivet udskrives filnavnet før hver FIL.\n"
 "Hvis ingen FIL er angivet, eller FIL er -, læses fra standard-ind.\n"
-"\n"
 
 #: src/head.c:117
 msgid ""
@@ -4690,58 +4774,48 @@ msgstr ""
 "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
 "GB 1000*1000*1000, G 1024*1024*1024 og så videre for T, P, E, Z, Y.\n"
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr "%s: filen er krympet for meget"
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, c-format
 msgid "%s: number of bytes is too large"
 msgstr "%s: antal byte er for stort"
 
-#: src/head.c:440
-#, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr "%s: kan ikke søge (lseek) tilbage til oprindelige position"
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr "%s: kan ikke søge til afsæt %s"
 
-#: src/head.c:673
+#: src/head.c:423 src/tail.c:457
 #, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "%s: kunne ikke nulstille filmarkør"
-
-#: src/head.c:798
-#, c-format
-msgid "cannot reposition file pointer for %s"
-msgstr "kan ikke flytte filpegeren for %s"
+msgid "%s: cannot seek to relative offset %s"
+msgstr "%s: kan ikke søge til relativt afsæt %s"
 
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr "%s: %s er så stor at den ikke kan repræsenteres"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr "antal linjer"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr "antal byte"
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr "ugyldigt antal linjer"
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr "ugyldigt antal byte"
 
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, c-format
 msgid "invalid trailing option -- %c"
 msgstr "ugyldigt afsluttende flag -- %c"
@@ -4786,40 +4860,48 @@ msgid "cannot determine hostname"
 msgstr "kan ikke bestemme værtsnavnet"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr "Arnold Robbins"
 
-#: src/id.c:81
+#: src/id.c:84
 #, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
-msgstr "Brug: %s [FLAG]... [BRUGERNAVN]\n"
+msgid "Usage: %s [OPTION]... [USER]\n"
+msgstr "Brug: %s [FLAG]... [BRUGER]\n"
 
-#: src/id.c:82
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
 msgstr ""
-"Udskriv bruger- og gruppeinformation for det angivne BRUGERNAVN, \n"
-"eller den nuværende bruger, hvis BRUGERNAVN er udeladt.\n"
-"\n"
-"  -a              ignoreres, for kompatibilitet med andre versioner\n"
-"  -Z, --context   udskriv kun sikkerhedskontekst for den nuværende bruger\n"
-"  -g, --group     udskriv kun det effektive gruppe-ID\n"
-"  -G, --groups    udskriv alle gruppe-ID'er\n"
-"  -n, --name      udskriv et navn i stedet for et nummer, for -ugG\n"
-"  -r, --real      udskriv virkeligt ID i stedet for effektivt, for -ugG\n"
-"  -u, --user      udskriv kun det effektive bruger-ID\n"
+"Udskriv bruger- og gruppeoplysninger for den angivne BRUGER,\n"
+"eller (når BRUGER udelades) for den nuværende bruger.\n"
 
-#: src/id.c:96
+#: src/id.c:90
+#, fuzzy
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
+msgstr ""
+"  -a             ignorér, for kompatibilitet med andre versioner\n"
+"  -Z, --context  udskriv kun sikkerhedskontekst for den nuværende bruger\n"
+"  -g, --group    udskriv kun det effektive gruppe-ID\n"
+"  -G, --groups   udskriv alle gruppe-ID'er\n"
+"  -n, --name     udskriv et navn i stedet for et nummer, for -ugG\n"
+"  -r, --real     udskriv virkeligt ID i stedet for effektivt, for -ugG\n"
+"  -u, --user     udskriv kun det effektive bruger-ID\n"
+"  -z, --zero     adskil elementer med NUL-tegn frem for blanke tegn;\n"
+"                   tillades ikke i standardformat\n"
+
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
@@ -4827,117 +4909,127 @@ msgstr ""
 "\n"
 "Uden nogen FLAG udskrives et nyttigt udvalg af identificeret information.\n"
 
-#: src/id.c:140
+#: src/id.c:151
+#, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr "--context (-Z) virker kun på en kerne, der understøtter SELinux/SMACK"
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr "--context (-Z) virker kun på en kerne, der understøtter SELinux"
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr "kan ikke udskrive sikkerhedskontekst når denne er angivet af bruger"
 
 # Lidt kryptisk. 'id -gu' udskriver dette, idet både -g og -u lyder "print only <some property>.  Bedre forslag?
-#: src/id.c:178
+#: src/id.c:198
 #, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr "kan ikke udskrive \"kun\" for mere en ét valg"
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr "kan ikke udskrive kun navn eller virkelige ID'er i forvalgt format"
 
-#: src/id.c:199
+#: src/id.c:209
+#, c-format
+msgid "option --zero not permitted in default format"
+msgstr "tilvalget --zero tillades ikke i standardformat"
+
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
 msgstr "kan ikke hente proceskontekst"
 
-#: src/id.c:224
+#: src/id.c:265
 #, c-format
 msgid "cannot get effective UID"
 msgstr "kan ikke finde effektiv UID"
 
-#: src/id.c:311
+#: src/id.c:354
 #, c-format
 msgid "cannot find name for user ID %s"
 msgstr "kan ikke finde navn for bruger-id %s"
 
-#: src/id.c:329
+#: src/id.c:372
 #, c-format
 msgid "uid=%s"
 msgstr "uid=%s"
 
-#: src/id.c:334
+#: src/id.c:377
 #, c-format
 msgid " gid=%s"
 msgstr " gid=%s"
 
-#: src/id.c:341
+#: src/id.c:384
 #, c-format
 msgid " euid=%s"
 msgstr " euid=%s"
 
-#: src/id.c:349
+#: src/id.c:392
 #, c-format
 msgid " egid=%s"
 msgstr " egid=%s"
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr " grupper="
 
-#: src/id.c:393
+#: src/id.c:437
 #, c-format
 msgid " context=%s"
 msgstr " kontekst=%s"
 
-#: src/install.c:373
+#: src/install.c:376
 #, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr "advarsel: %s: kunne ikke ændre kontekst til %s"
 
-#: src/install.c:414
+#: src/install.c:417
 #, c-format
 msgid "creating directory %s"
 msgstr "opretter katalog %s"
 
-#: src/install.c:482
+#: src/install.c:485
 #, c-format
 msgid "cannot change ownership of %s"
 msgstr "kan ikke ændre ejerskab for %s"
 
-#: src/install.c:506
+#: src/install.c:509
 #, c-format
 msgid "cannot set time stamps for %s"
 msgstr "kan ikke sætte tidsstempler for %s"
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, c-format
 msgid "fork system call failed"
 msgstr "systemkaldet fork mislykkedes"
 
-#: src/install.c:531
+#: src/install.c:535
 #, c-format
 msgid "cannot run %s"
 msgstr "kan ikke køre %s"
 
-#: src/install.c:535
+#: src/install.c:539
 #, c-format
 msgid "waiting for strip"
 msgstr "venter på strip"
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr "strip-proces afsluttede uplanmæssigt"
 
-#: src/install.c:558
+#: src/install.c:565
 #, c-format
 msgid "invalid user %s"
 msgstr "ugyldig bruger %s"
 
-#: src/install.c:594
+#: src/install.c:601
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -4950,8 +5042,7 @@ msgstr ""
 "  eller: %s [FLAG]... -t KATALOG KILDE...\n"
 "  eller: %s [FLAG]... -d KATALOG...\n"
 
-#: src/install.c:601
-#, fuzzy
+#: src/install.c:608
 msgid ""
 "\n"
 "This install program copies files (often just compiled) into destination\n"
@@ -4974,9 +5065,8 @@ msgstr ""
 "De første tre formater kopierer KILDE til MÅL, eller flere KILDEr til det\n"
 "eksisterende KATALOG, mens adgangsrettigheder og ejer/gruppe indstilles.\n"
 "Med fjerde format oprettes alle komponenter af de givne KATALOGer.\n"
-"\n"
 
-#: src/install.c:615
+#: src/install.c:622
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
 "  -b                  like --backup but does not accept an argument\n"
@@ -4997,7 +5087,7 @@ msgstr ""
 "  -d, --directory     behandl alle argumenter som katalognavne; opret alle\n"
 "                        komponenter i de angivne kataloger.\n"
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -5016,7 +5106,7 @@ msgstr ""
 "x\n"
 "  -o, --owner=EJER    vælg ejerskab (kun superbruger)\n"
 
-#: src/install.c:631
+#: src/install.c:638
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
 "files\n"
@@ -5039,67 +5129,65 @@ msgstr ""
 "  -T, --no-target-directory  behandl MÃ…L som en normal fil\n"
 "  -v, --verbose       skriv navnet på hvert katalog når det bliver oprettet\n"
 
-#: src/install.c:641
+#: src/install.c:648
+#, fuzzy
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
 "      --preserve-context  behold SELinux-sikkerhedskontekst\n"
-"  -Z, --context=KONTEKST  sæt SELinux-sikkerhedskontekst for filer og "
-"kataloger\n"
+"  -Z, --context[=KONT]    sæt SELinux-sikkerhedskontekst for "
+"destinationsfil\n"
+"                            til standardtypen, eller til KONT hvis givet\n"
 
-#: src/install.c:859
+#: src/install.c:696 src/unlink.c:86
+#, c-format
+msgid "cannot unlink %s"
+msgstr "kan ikke aflænke %s"
+
+#: src/install.c:877
 #, c-format
 msgid ""
 "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
 msgstr ""
 "ADVARSEL: ignorerer --preserve-context; denne kerne understøtter ikke SELinux"
 
-#: src/install.c:869
-#, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
-msgstr ""
-"ADVARSEL: ignorerer --context (-Z); denne kerne understøtter ikke SELinux"
-
-#: src/install.c:886
+#: src/install.c:917
 #, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr "strip-flaget kan ikke bruges ved installation af et katalog"
 
-#: src/install.c:889
+#: src/install.c:920
 #, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr "målkatalog ikke tilladt ved installation af et katalog"
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr "kan ikke tvinge målkontekst til %s og bibeholde den"
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, c-format
 msgid "invalid mode %s"
 msgstr "ugyldig tilstand %s"
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr ""
 "ADVARSEL: ignorerer flaget --strip-program, da flaget -s ikke blev angivet"
 
-#: src/install.c:959
+#: src/install.c:1001
 #, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr ""
 "flagene --compare (-C) og --preserve-timestamps kan ikke bruges samtidigt"
 
-#: src/install.c:966
+#: src/install.c:1008
 #, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr "flagene --compare (-C) og --strip kan ikke bruges samtidigt"
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -5113,7 +5201,7 @@ msgstr ""
 msgid "Mike Haertel"
 msgstr "Mike Haertel"
 
-#: src/join.c:191
+#: src/join.c:195
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
 "standard output.  The default join field is the first, delimited\n"
@@ -5134,7 +5222,7 @@ msgstr ""
 "                      hvor FILNR er 1 eller 2 svarende til FIL1 eller FIL2\n"
 "  -e TOM            erstat manglende ind-felter med TOM\n"
 
-#: src/join.c:200
+#: src/join.c:204
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
 "  -j FIELD          equivalent to '-1 FIELD -2 FIELD'\n"
@@ -5148,7 +5236,7 @@ msgstr ""
 "  -o FORMAT         følg FORMAT ved sammensætning af udlinje\n"
 "  -t TEGN           brug TEGN som feltseparator for ind- og udfelter\n"
 
-#: src/join.c:206
+#: src/join.c:210
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
 "  -1 FIELD          join on this FIELD of file 1\n"
@@ -5170,8 +5258,14 @@ msgstr ""
 "og\n"
 "                      udskriv dem uden at forsøge parinddeling for disse\n"
 
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+#, fuzzy
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr ""
+"  -z, --zero-terminated     afslut linjer med en 0 byte, ikke ny-linje\n"
+
 # bruger ""-anførselstegn de steder hvor '' optræder i kommandolinjeeksempler af hensyn til læselighed
-#: src/join.c:218
+#: src/join.c:225
 msgid ""
 "\n"
 "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n"
@@ -5205,47 +5299,47 @@ msgstr ""
 "reglerne angivet ved 'LC_COLLATE'.  Hvis indlinjerne ikke er sorteret, og\n"
 "der optræder linjer som ikke kan flettes, vil der blive vist en advarsel.\n"
 
-#: src/join.c:403
-#, fuzzy, c-format
+#: src/join.c:410
+#, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
-msgstr "%s:%ju: er ikke sorteret: %.*s"
+msgstr "%s:%<PRIuMAX>: er ikke sorteret: %.*s"
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, c-format
 msgid "invalid field number: %s"
 msgstr "ugyldigt feltnummer: %s"
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, c-format
 msgid "invalid field specifier: %s"
 msgstr "ugyldig specifikation af felt: %s"
 
-#: src/join.c:877
+#: src/join.c:884
 #, c-format
 msgid "invalid file number in field spec: %s"
 msgstr "ugyldigt filnummer i feltspec: %s"
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr "inkompatible join-felter %lu, %lu"
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr "modstridende erstatningsstrenge for tomme felter"
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, c-format
 msgid "multi-character tab %s"
 msgstr "flertegns-tabulator %s"
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr "inkompatible tabulatorer"
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr "begge filer kan ikke være standard-ind"
@@ -5262,11 +5356,8 @@ msgstr ""
 "  eller: %s -t [SIGNAL]...\n"
 
 #: src/kill.c:82
-#, fuzzy
 msgid "Send signals to processes, or list signals.\n"
-msgstr ""
-"Send signaler til processer, eller vis signaler.\n"
-"\n"
+msgstr "Send signaler til processer, eller vis signaler.\n"
 
 #: src/kill.c:88
 msgid ""
@@ -5367,47 +5458,47 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr "kan ikke oprette lænke %s til %s"
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr "%s: hård lænke ikke tilladt for katalog"
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, c-format
 msgid "%s: cannot overwrite directory"
 msgstr "%s: kan ikke overskrive katalog"
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
 msgstr "%s: overskriv %s? "
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, c-format
 msgid "failed to create symbolic link %s"
 msgstr "kunne ikke oprette symbolsk lænke %s"
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr "kunne ikke oprette symbolsk lænke %s -> %s"
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr "kunne ikke oprette hård lænke til %.0s%s"
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, c-format
 msgid "failed to create hard link %s"
 msgstr "kunne ikke oprette hård lænke %s"
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, c-format
 msgid "failed to create hard link %s => %s"
 msgstr "kunne ikke oprette hård lænke %s => %s"
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -5421,8 +5512,7 @@ msgstr ""
 "  eller: %s [FLAG]... -t KATALOG MÃ…L...        (4. form)\n"
 
 # Det er vist unødvendigt at oversætte 'if later resolved' direkte
-#: src/ln.c:381
-#, fuzzy
+#: src/ln.c:398
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
 "In the 2nd form, create a link to TARGET in the current directory.\n"
@@ -5443,7 +5533,7 @@ msgstr ""
 "Symbolske lænker kan indeholde vilkårlig tekst; en relativ lænke fortolkes\n"
 "i relation til dets overkatalog.\n"
 
-#: src/ln.c:394
+#: src/ln.c:411
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
 "file\n"
@@ -5466,7 +5556,7 @@ msgstr ""
 "superbrugeren)\n"
 "  -f, --force                 fjern eksisterende destinationsfiler\n"
 
-#: src/ln.c:402
+#: src/ln.c:419
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
 "  -L, --logical               dereference TARGETs that are symbolic links\n"
@@ -5487,7 +5577,7 @@ msgstr ""
 "  -s, --symbolic              lav symbolske lænker i stedet for hårde "
 "lænker\n"
 
-#: src/ln.c:411
+#: src/ln.c:428
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
 "  -t, --target-directory=DIRECTORY  specify the DIRECTORY in which to "
@@ -5503,23 +5593,24 @@ msgstr ""
 "  -T, --no-target-directory   behandl altid LÆNKENAVN som en normal fil\n"
 "  -v, --verbose               skriv navnet på hver fil, der lænkes\n"
 
-#: src/ln.c:433
-#, fuzzy, c-format
+#: src/ln.c:450
+#, c-format
 msgid ""
 "\n"
 "Using -s ignores -L and -P.  Otherwise, the last option specified controls\n"
 "behavior when a TARGET is a symbolic link, defaulting to %s.\n"
 msgstr ""
+"\n"
 "Brug af -s ignorerer -L og -P.  Ellers vil det sidst givne flag angive\n"
 "opførslen når MÅL er en symbolsk lænke, med %s som standard.\n"
 "\n"
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr "kan ikke kombinere --target-directory og --no-target-directory"
 
-#: src/ln.c:588
+#: src/ln.c:605
 #, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr "kan ikke bruge --relative uden --symbolic"
@@ -5556,7 +5647,7 @@ msgstr "ikke noget login-navn"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 msgid "%b %e  %Y"
 msgstr "%e %b  %Y"
 
@@ -5565,95 +5656,94 @@ msgstr "%e %b  %Y"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 msgid "%b %e %H:%M"
 msgstr "%e %b %H:%M"
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr "ignorerer ugyldig værdi af miljøvariabelen QUOTING_STYLE: %s"
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr "ignorerer ugyldig længde i miljøvariabelen COLUMNS: %s"
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr "ignorerer ugyldig tabulatorstørrelse i miljøvariabelen TABSIZE: %s"
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, c-format
 msgid "invalid line width: %s"
 msgstr "ugyldig linjelængde: %s"
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, c-format
 msgid "invalid tab size: %s"
 msgstr "ugyldig tabulatorstørrelse %s"
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, c-format
 msgid "invalid time style format %s"
 msgstr "ugyldig tidsstilsformat %s"
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 msgid "Valid arguments are:\n"
 msgstr "Gyldige argumenter er:\n"
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr "  - +FORMAT (f.eks., +%H:%M) for et format i stil med 'date'\n"
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr "fejl ved klargørelse af månedsstrenge"
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, c-format
 msgid "unrecognized prefix: %s"
 msgstr "ukendt præfiks: %s"
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr "uforståelig værdi i miljøvariabelen LS_COLORS"
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, c-format
 msgid "cannot open directory %s"
 msgstr "kan ikke åbne katalog %s"
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, c-format
 msgid "cannot determine device and inode of %s"
 msgstr "kan ikke bestemme enhed og inode for %s"
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, c-format
 msgid "%s: not listing already-listed directory"
 msgstr "%s: viser ikke allerede vist katalog"
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, c-format
 msgid "reading directory %s"
 msgstr "læser katalog %s"
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, c-format
 msgid "closing directory %s"
 msgstr "lukker kataloget %s"
 
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, c-format
 msgid "cannot compare file names %s and %s"
 msgstr "kan ikke sammenligne filnavnene %s og %s"
 
-#: src/ls.c:4721
-#, fuzzy
+#: src/ls.c:4781
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
 "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n"
@@ -5661,9 +5751,8 @@ msgstr ""
 "Vis information om FILer (nuværende katalog med mindre andet er angivet).\n"
 "Sortér filerne alfabetisk hvis ingen af flagene -cftuvSUX eller --sort\n"
 "er givet.\n"
-"\n"
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
 "  -A, --almost-all           do not list implied . and ..\n"
@@ -5677,17 +5766,17 @@ msgstr ""
 "  -b, --escape               skriv undvigesekvenser for ikke-grafiske tegn\n"
 "                               i stil med C\n"
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
 "      --block-size=STØR      skalér størrelser med STØR før de udskrives.\n"
@@ -5698,32 +5787,30 @@ msgstr ""
 "  -B, --ignore-backups       vis ikke filer som ender på ~\n"
 "  -c                         med -lt: sortér efter, og vis, ctime "
 "(tidspunkt\n"
-"                               for sidste ændring af filstatusinformation)\n"
-"                               med -l: vis ctime og sortér efter navn\n"
+"                               for sidste ændring af filstatusinformation);\n"
+"                               med -l: vis ctime og sortér efter navn;\n"
 "                               ellers: sortér efter ctime, nyeste først\n"
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 "  -C                         vis filer i kolonner\n"
-"      --color[=NÃ…R]          udskriv med farver.  NÃ…R er som standard "
-"'always',\n"
-"                               men kan også være 'never' eller 'auto'.  "
-"Mere\n"
-"                               information findes nedenfor\n"
-"  -d, --directory            vis kataloger uden at vise indholdet,\n"
-"                               og dereferér ikke symbolske lænker\n"
+"      --color[=NÅR]          udskriv med farver.  NÅR kan være 'never', "
+"'auto'\n"
+"                               eller 'always' (standard).  Mere info "
+"nedenfor\n"
+"  -d, --directory            vis kataloger i sig selv frem for deres "
+"indhold\n"
 "  -D, --dired                lav uddata til Emacs' dired-tilstand\n"
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
 "  -F, --classify             append indicator (one of */=>@|) to entries\n"
@@ -5741,28 +5828,30 @@ msgstr ""
 "                               'vertical' -C\n"
 "      --full-time            ligesom -l --time-style=full-iso\n"
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr "  -g                         som -l, men udskriv ikke ejer\n"
 
 # bemærk: --sort-flaget er ikke nødvendigt, derfor "kan bruges med..."
-#: src/ls.c:4763
+#: src/ls.c:4823
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 "      --group-directories-first\n"
-"                             gruppér kataloger før filer.\n"
-"                               kan bruges med --sort-flaget, men enhver "
+"                             gruppér kataloger før filer;\n"
+"                               kan bruges med flaget --sort, men enhver "
 "brug\n"
 "                               af --sort=none (-U) deaktiverer gruppering\n"
 
-#: src/ls.c:4769
+#: src/ls.c:4829
+#, fuzzy
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
@@ -5778,14 +5867,14 @@ msgstr ""
 # mening.  Jeg udelader ordet i oversættelsen.
 #
 # shell pattern ~ regex-agtig syntaks.  http://www.gnu.org/software/findutils/manual/html_node/find_html/Shell-Pattern-Matching.html
-#: src/ls.c:4775
+#: src/ls.c:4835
 msgid ""
 "  -H, --dereference-command-line\n"
 "                             follow symbolic links listed on the command "
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
@@ -5795,12 +5884,12 @@ msgstr ""
 "kommandolinjen\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             følg hver symbolsk lænke angivet på\n"
-"                             kommandolinjen, der peger på et katalog\n"
+"                               kommandolinjen, der peger på et katalog\n"
 "      --hide=MØNSTER         udskriv ikke elementer, der matcher "
 "skalmønstret\n"
-"                             MØNSTER (tilsidesættes af -a eller -A)\n"
+"                               MØNSTER (tilsidesættes af -a eller -A)\n"
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
 "names:\n"
@@ -5809,7 +5898,7 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 "      --indicator-style=ORD  tilføj indikator med stilen ORD til elementer:\n"
 "                               none (standard), slash (-p),\n"
@@ -5817,9 +5906,10 @@ msgstr ""
 "  -i, --inode                vis indeksnummer for hver fil\n"
 "  -I, --ignore=MØNSTER       vis ikke filer, der matcher skalmønstret "
 "MØNSTER\n"
-"  -k, --kibibytes            brug blokke på 1024 byte\n"
+"  -k, --kibibytes            brug som standard blokke på 1024 byte for "
+"diskbrug\n"
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -5837,7 +5927,7 @@ msgstr ""
 "  -m                         brug hele skærmbredden med en liste adskilt af\n"
 "                               kommaer\n"
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -5855,11 +5945,11 @@ msgstr ""
 "  -p, --indicator-style=slash\n"
 "                             tilføj skråstreg som indikator for kataloger\n"
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -5867,7 +5957,8 @@ msgid ""
 "escape\n"
 msgstr ""
 "  -q, --hide-control-chars   skriv ? i stedet for ikke-grafiske tegn\n"
-"      --show-control-chars   vis ikke-grafiske tegn som de er (standard med\n"
+"      --show-control-chars   vis ikke-grafiske tegn som de er (standard, "
+"med\n"
 "                               mindre programmet er 'ls' og uddata er en\n"
 "                               terminal)\n"
 "  -Q, --quote-name           sæt filnavne i gåseøjne\n"
@@ -5875,7 +5966,7 @@ msgstr ""
 "                               literal, locale, shell, shell-always, c\n"
 "                               eller escape\n"
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
 "  -R, --recursive            list subdirectories recursively\n"
@@ -5887,48 +5978,57 @@ msgstr ""
 "  -s, --size                 skriv allokeret størrelse for hver fil i "
 "blokke\n"
 
-#: src/ls.c:4825
+#: src/ls.c:4886
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 "  -S                         sortér efter filstørrelse\n"
-"      --sort=ORD             sortér efter ORD frem for navn: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
+"      --sort=ORD             sortér efter ORD frem for navn: none (-U),\n"
+"                               size (-S), time (-t), version (-v),\n"
+"                               extension (-X)\n"
 "      --time=ORD             bruges med -l; vis tidspunkt som ORD frem for\n"
-"                             ændringstidspunkt: atime -u, access -u, use -"
-"u,\n"
-"                             ctime -c eller status -c; brug den angivne tid\n"
-"                             som sorteringsnøgle, hvis --sort=time\n"
+"                               om standardtidspunkt for modifikation: atime\n"
+"                               eller access eller use (-u)\n"
+"                               ctime eller status (-c); brug også den "
+"angivne\n"
+"                               tid som sorteringsnøgle, hvis --sort=time\n"
 
-#: src/ls.c:4835
+#: src/ls.c:4896
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
 msgstr ""
 "      --time-style=STIL      bruges med -l; vis tidspunkter med stilen "
 "STIL:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT fortolkes som 'date'; hvis FORMAT er\n"
-"                             FORMAT1<linjeskift>FORMAT2, gælder FORMAT1 for\n"
-"                             ældre filer, og FORMAT2 for nyere filer;\n"
-"                             hvis 'posix-' sættes foran STYLE, vil STYLE "
+"                               full-iso, long-iso, iso, locale eller "
+"+FORMAT.\n"
+"                               FORMAT fortolkes som i 'date'; hvis FORMAT "
+"er\n"
+"                               FORMAT1<linjeskift>FORMAT2, gælder FORMAT1 "
+"for\n"
+"                               ældre filer, og FORMAT2 for nyere filer;\n"
+"                               hvis 'posix-' sættes foran STYLE, vil STYLE "
 "kun\n"
-"                             blive anvendt uden for POSIX-lokalitet\n"
+"                               blive anvendt uden for POSIX-lokalitet\n"
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 msgid ""
 "  -t                         sort by modification time, newest first\n"
 "  -T, --tabsize=COLS         assume tab stops at each COLS instead of 8\n"
@@ -5936,28 +6036,29 @@ msgstr ""
 "  -t                         sortér efter ændringstidspunkt, nyeste først\n"
 "  -T, --tabsize=KOLONNER     antag tabulatorstop på KOLONNER frem for 8\n"
 
-#: src/ls.c:4848
+#: src/ls.c:4912
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
 msgstr ""
-"  -u                         med -lt: sortér efter, og vis, læsningstid\n"
-"                               med -l: vis læsningstid og sortér efter navn\n"
+"  -u                         med -lt: sortér efter, og vis, læsningstid;\n"
+"                               med -l: vis læsningstid og sortér efter "
+"navn;\n"
 "                               ellers: sortér efter læsningstid\n"
 "  -U                         sortér ikke; vis filer som de ligger i "
 "kataloget\n"
 "  -v                         naturlig sortering af (versions-)tal i tekst\n"
 
-#: src/ls.c:4855
+#: src/ls.c:4919
+#, fuzzy
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 "  -w, --width=KOLONNER       antag denne skærmbredde i stedet for aktuel "
@@ -5969,7 +6070,7 @@ msgstr ""
 "                               hver fil\n"
 "  -1                         vis én fil per linje\n"
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -5983,7 +6084,7 @@ msgstr ""
 "standard-ud er forbundet til en terminal.  Indstillingerne kan ændres\n"
 "med miljøvariablen LS_COLORS.  Brug kommandoen dircolors til at angive den.\n"
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -6045,7 +6146,7 @@ msgstr "  -c, --check          læs %s-summer fra FILerne og tjek dem\n"
 
 #: src/md5sum.c:184
 msgid "      --tag            create a BSD-style checksum\n"
-msgstr ""
+msgstr "      --tag            beregn en kontrolsum i stil med BSD\n"
 
 #: src/md5sum.c:188
 msgid ""
@@ -6061,28 +6162,25 @@ msgstr "  -t, --text           tekstlæsetilstand (forvalg)\n"
 #: src/md5sum.c:195
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
 "\n"
-"De følgende tre flag bruges kun ved kontrol af kontrolsummer:\n"
+"De følgende fire flag bruges kun ved kontrol af kontrolsummer:\n"
 "      --quiet          udskriv ikke O.k. for hver godkendt fil\n"
 "      --status         udskriv ikke noget; statuskode angiver resultat\n"
+"      --strict         afslut med status forskellig fra nul ved "
+"fejlformaterede\n"
+"                         kontrolsumlinjer\n"
 "  -w, --warn           advar om fejlformaterede kontrolsum-linjer\n"
 "\n"
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-"      --strict         afslut med status forskellig fra nul ved ugyldigt "
-"input\n"
-"                         sammen med --check\n"
-
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, c-format
 msgid ""
 "\n"
@@ -6097,66 +6195,66 @@ msgstr ""
 "linje med kontrolsum, et tegn som angiver inddatatilstand ('*' for binær,\n"
 "mellemrum for tekst), og navnet på hver FIL.\n"
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, c-format
 msgid "%s: too many checksum lines"
 msgstr "%s: for mange kontrolsumlinjer"
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr "%s: %<PRIuMAX>: ukorrekt formateret %s-kontrolsumlinje"
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr "%s: FEJL ved åbning eller læsning\n"
 
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr "MISLYKKEDES"
 
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr "O.k."
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr "%s: ingen rigtigt formatterede %s-kontrolsumlinjer fundet"
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
 msgstr[0] "ADVARSEL: %<PRIuMAX> linje er forkert formateret"
 msgstr[1] "ADVARSEL: %<PRIuMAX> linjer er forkert formateret"
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
 msgstr[0] "ADVARSEL: %<PRIuMAX> angivet fil kunne ikke læses"
 msgstr[1] "ADVARSEL: %<PRIuMAX> angivne filer kunne ikke læses"
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
 msgstr[0] "ADVARSEL: %<PRIuMAX> beregnet kontrolsum stemte IKKE overens"
 msgstr[1] "ADVARSEL: %<PRIuMAX> beregnede kontrolsummer stemte IKKE overens"
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
-msgstr ""
+msgstr "--tag understøtter ikke tilstanden --text"
 
-#: src/md5sum.c:766
-#, fuzzy, c-format
+#: src/md5sum.c:770
+#, c-format
 msgid "the --tag option is meaningless when verifying checksums"
-msgstr "flaget --status har kun betydning ved kontrol af kontrolsummer"
+msgstr "flaget --tag giver ikke mening når der verificeres kontrolsummer"
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
@@ -6164,111 +6262,128 @@ msgstr ""
 "flagene --binary og --text giver ikke mening ved verificering af "
 "kontrolsummer"
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr "flaget --status har kun betydning ved kontrol af kontrolsummer"
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr "flaget --warn har kun betydning ved kontrol af kontrolsummer"
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr "flaget --quiet har kun betydning ved kontrol af kontrolsummer"
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr "flaget --strict har kun betydning ved kontrol af kontrolsummer"
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr "Brug: %s [FLAG]... KATALOG...\n"
 
-#: src/mkdir.c:57
-#, fuzzy
+#: src/mkdir.c:59
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
-msgstr ""
-"Opret KATALOG(erne), hvis de ikke allerede eksisterer.\n"
-"\n"
+msgstr "Opret KATALOGerne, hvis de ikke allerede findes.\n"
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
+#, fuzzy
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 "  -m, --mode=TILSTAND  sæt rettigheder (som chmod), ikke a=rwx - umask\n"
 "  -p, --parents     opret overkataloger om nødvendigt, ingen fejl hvis "
 "findes\n"
 "  -v, --verbose     udskriv en besked for hvert katalog som oprettes\n"
-"  -Z, --context=KONT  sæt SELinux-sikkerhedskontekst for hvert oprettet \n"
-"                      katalog til KONT\n"
+"  -Z, --context[=KONT]  sæt SELinux-sikkerhedskontekst for hvert oprettet \n"
+"                      katalog til standardtypen eller KONT hvis givet\n"
+
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/mkdir.c:127 src/mkdir.c:172
+#, c-format
+msgid "failed to set default creation context for %s"
+msgstr "kunne ikke sætte standardoprettelseskontekst for %s"
+
+#: src/mkdir.c:191
+#, c-format
+msgid "failed to restore context for %s"
+msgstr "kunne ikke gendanne kontekst for %s"
 
-#: src/mkdir.c:168
+#: src/mkdir.c:231
 #, c-format
 msgid "created directory %s"
 msgstr "oprettede katalog %s"
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr ""
+"advarsel: ignorerer --context; kræver en kerne, der understøtter SELinux/"
+"SMACK"
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr "Brug: %s [FLAG]... NAVN...\n"
 
-#: src/mkfifo.c:52
-#, fuzzy
+#: src/mkfifo.c:54
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
-msgstr ""
-"Opret navngivne datakanaler (FIFOer) med angivne NAVNe.\n"
-"\n"
+msgstr "Opret navngivne datakanaler (FIFOer) med angivne NAVNe.\n"
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
 msgstr ""
 "  -m, --mode=TILSTAND  sæt filrettigheder til TILSTAND, ikke a=rw - umask\n"
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
-"  -Z, --context=KONT  sæt SELinux-sikkerhedskontekst for hvert NAVN til "
-"KONT\n"
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, c-format
 msgid "invalid mode"
 msgstr "ugyldig tilstand"
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr "tilstand må kun angive bit for filrettigheder"
 
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
+#, c-format
+msgid "cannot set permissions of %s"
+msgstr "kan ikke sætte adgangsrettigheder for %s"
+
+#: src/mknod.c:54
 #, c-format
 msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr "Brug: %s [FLAG]... NAVN TYPE [OVERNR UNDERNR]\n"
 
-#: src/mknod.c:54
-#, fuzzy
+#: src/mknod.c:56
 msgid "Create the special file NAME of the given TYPE.\n"
-msgstr ""
-"Opret specialfilen NAVN med den angivne TYPE.\n"
-"\n"
+msgstr "Opret specialfilen NAVN med den angivne TYPE.\n"
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr ""
-"  -Z, --context=KONT  sæt SELinux-sikkerhedskontekst for NAVN til KONT\n"
-
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -6282,7 +6397,7 @@ msgstr ""
 "forstås det som heksadecimalt; ellers, hvis de begynder med 0, som oktalt;\n"
 "ellers decimalt. TYPE kan være:\n"
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 msgid ""
 "\n"
 "  b      create a block (buffered) special file\n"
@@ -6294,55 +6409,55 @@ msgstr ""
 "  c, u   opret en tegn-specialfil (ubufret) \n"
 "  p      opret en FIFO\n"
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 msgid "Special files require major and minor device numbers."
 msgstr "Specialfiler kræver over- og underenhedsnummer."
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 msgid "Fifos do not have major and minor device numbers."
 msgstr "Fifoer har ikke over- og underenhedsnumre."
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, c-format
 msgid "block special files not supported"
 msgstr "blokspecialfiler understøttes ikke"
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, c-format
 msgid "character special files not supported"
 msgstr "tegnspecialfiler understøttes ikke"
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, c-format
 msgid "invalid major device number %s"
 msgstr "ugyldigt overenhedsnummer %s"
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, c-format
 msgid "invalid minor device number %s"
 msgstr "ugyldigt underenhedsnummer %s"
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, c-format
 msgid "invalid device %s %s"
 msgstr "ugyldig enhed %s %s"
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, c-format
 msgid "invalid device type %s"
 msgstr "ugyldig enhedstype %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr "Eric Blake"
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr "Brug: %s [FLAG]... [SKABELON]\n"
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
 "TEMPLATE must contain at least 3 consecutive 'X's in last component.\n"
@@ -6353,14 +6468,14 @@ msgstr ""
 "skal have mindst tre på hinanden følgende X'er i sidste komponent.  Hvis\n"
 "SKABELON ikke angives, bruges tmp.XXXXXXXXXX, og --tmpdir er underforstået.\n"
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
 "Filer oprettes i u+rw-tilstand, og kataloger med u+rw minus umask-"
 "begrænsninger.\n"
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
@@ -6371,102 +6486,93 @@ msgstr ""
 "  -q, --quiet         undertryk information om fejl ved fil-/"
 "katalogoprettelse\n"
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
 "      --suffix=SUFF   føj SUFF til SKABELON.  SUFF må ikke indeholde "
 "skråstreg.\n"
 "                        Dette flag bruges implicit hvis SKABELON ikke "
 "slutter\n"
-"                        med X.\n"
+"                        med X\n"
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
-"      --tmpdir[=KAT]  fortolk SKABELON relativt til KAT.  Hvis KAT ikke er\n"
+"  -p KAT, --tmpdir[=KAT]  fortolk SKABELON relativt til KAT.  Hvis KAT ikke "
+"er\n"
 "                        angivet, så brug $TMPDIR hvis angivet, ellers /tmp.\n"
 "                        Med dette flag må SKABELON ikke være et absolut "
 "navn.\n"
 "                        I modsætning til med -t, kan SKABELON indeholde\n"
 "                        skråstreger, men da vil mktemp kun oprette den\n"
-"                        sidste komponent.\n"
+"                        sidste komponent\n"
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
 msgstr ""
-"  -p KAT              brug KAT som præfiks; medfører -t [forældet]\n"
 "  -t                  fortolk SKABELON som en enkelt filnavnskomponent "
 "relativt\n"
 "                        til et katalog: $TMPDIR, hvis angivet; ellers "
 "kataloget\n"
 "                        angivet ved -p; ellers /tmp [forældet]\n"
 
-#: src/mktemp.c:223
-#, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr "kunne ikke omdirigere stderr til /dev/null"
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, c-format
 msgid "too many templates"
 msgstr "for mange skabeloner"
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr "med --suffix, skal skabelon %s slutte med X"
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr "ugyldig skabelon %s, indeholder katalogseparator"
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr "for få X'er i skabelonen %s"
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr "ugyldig skabelon, %s, indeholder katalogseparator"
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr "ugyldig skabelon, %s; må ikke være absolut med --tmpdir"
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, c-format
 msgid "failed to create directory via template %s"
 msgstr "kunne ikke oprette katalog ved hjælp af skabelon %s"
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, c-format
 msgid "failed to create file via template %s"
 msgstr "kunne ikke oprette fil via skabelonen %s"
 
-#: src/mv.c:292
-#, fuzzy
+#: src/mv.c:294
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
-msgstr ""
-"Omdøb KILDE til MÅL eller flyt KILDE(r) til KATALOG.\n"
-"\n"
+msgstr "Omdøb KILDE til MÅL eller flyt KILDEr til KATALOG.\n"
 
-#: src/mv.c:298
+#: src/mv.c:300
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
 "file\n"
@@ -6488,7 +6594,7 @@ msgstr ""
 "  -n, --no-clobber             overskriv ikke nogen eksisterende filer\n"
 "Hvis du angiver mere end én af -i, -f eller -n, vil kun den sidste gælde.\n"
 
-#: src/mv.c:307
+#: src/mv.c:309
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
@@ -6500,7 +6606,7 @@ msgstr ""
 "  -S, --suffix=SUFFIKS         tilsidesæt det sædvanlige sikkerhedskopi-"
 "suffiks\n"
 
-#: src/mv.c:312
+#: src/mv.c:314
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
 "DIRECTORY\n"
@@ -6509,12 +6615,16 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
 "  -t, --target-directory=KATALOG  flyt alle KILDE-argumenter ind i KATALOG\n"
 "  -T, --no-target-directory    behandl MÃ…L som en normal fil\n"
 "  -u, --update                 flyt kun hvis KILDE-filen er nyere end\n"
 "                                 målfilen, eller når målfilen ikke findes\n"
 "  -v, --verbose                forklar hvad der sker\n"
+"  -Z, --context                sæt SELinux-sikkerhedskontekst for\n"
+"                                 destinationsfil til standardtypen\n"
 
 #: src/nice.c:72
 #, c-format
@@ -6522,7 +6632,7 @@ msgid "Usage: %s [OPTION] [COMMAND [ARG]...]\n"
 msgstr "Brug: %s [FLAG]... [KOMMANDO [ARG]...]\n"
 
 #: src/nice.c:73
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Run COMMAND with an adjusted niceness, which affects process scheduling.\n"
 "With no COMMAND, print the current niceness.  Niceness values range from\n"
@@ -6531,12 +6641,11 @@ msgstr ""
 "Kør KOMMANDO med ændret prioritet (niceness), hvilket påvirker\n"
 "procesplanlægningen.  Uden KOMMANDO udskrives den aktuelle prioritet.\n"
 "Prioriteter går fra %d (højest prioritet) til %d (lavest prioritet).\n"
-"\n"
-"  -n, --adjustment=N   læg heltallet N til prioriteten (standard: 10)\n"
 
 #: src/nice.c:82
 msgid "  -n, --adjustment=N   add integer N to the niceness (default 10)\n"
 msgstr ""
+"  -n, --adjustment=N   læg heltallet N til niceness (standardværdi 10)\n"
 
 #: src/nice.c:172
 #, c-format
@@ -6564,14 +6673,12 @@ msgid "Scott Bartram"
 msgstr "Scott Bartram"
 
 #: src/nl.c:179
-#, fuzzy
 msgid ""
 "Write each FILE to standard output, with line numbers added.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
 "Skriv hver fil til standard-ud, med linjenummer lagt til.\n"
 "Hvis ingen FIL er angivet, eller FIL er -, læses fra standard-ind.\n"
-"\n"
 
 #: src/nl.c:186
 msgid ""
@@ -6804,119 +6911,125 @@ msgid "%s: invalid number to ignore"
 msgstr "%s: ugyldigt antal at ignorere"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
-msgstr ""
+msgstr "Assaf Gordon"
 
-#: src/numfmt.c:676
-#, fuzzy, c-format
-msgid "value too large to be converted: '%s'"
-msgstr "%s: værdi ikke fuldstændig konverteret"
+#: src/numfmt.c:659
+#, c-format
+msgid "value too large to be converted: %s"
+msgstr "værdi for stor til at blive konverteret: %s"
 
-#: src/numfmt.c:680
-#, fuzzy, c-format
-msgid "invalid number: '%s'"
-msgstr "ugyldigt antal %s"
+#: src/numfmt.c:663
+#, c-format
+msgid "invalid number: %s"
+msgstr "ugyldigt tal: %s"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
-msgstr ""
+msgid "rejecting suffix in input: %s (consider using --from)"
+msgstr "afviser suffiks i inddata: %s (overvej at bruge --from)"
 
-#: src/numfmt.c:688
-#, fuzzy, c-format
-msgid "invalid suffix in input: '%s'"
-msgstr "ugyldigt suffiks i %s%s-argument '%s'"
+#: src/numfmt.c:671
+#, c-format
+msgid "invalid suffix in input: %s"
+msgstr "ugyldigt suffiks i inddata: %s"
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
-msgstr ""
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
+msgstr "mangler 'i'-suffiks i inddata: %s (f.eks. Ki/Mi/Gi)"
 
-#: src/numfmt.c:723
-#, fuzzy, c-format
+#: src/numfmt.c:722 src/numfmt.c:768
+#, c-format
 msgid "failed to prepare value '%Lf' for printing"
-msgstr "kunne ikke åbne %s til skrivning"
-
-#: src/numfmt.c:787
-#, fuzzy, c-format
-msgid "invalid unit size: '%s'"
-msgstr "ugyldig tabulatorstørrelse %s"
+msgstr "kunne ikke forberede værdien '%Lf' til skrivning"
 
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
+#: src/numfmt.c:791
 #, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr ""
+msgid "invalid unit size: %s"
+msgstr "ugyldig enhedsstørrelse: %s"
 
-#: src/numfmt.c:813
-#, fuzzy, c-format
+#: src/numfmt.c:814
+#, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
-msgstr "Brug: %s [FLAG]... [BRUGER]...\n"
+msgstr "Brug: %s [FLAG]... [TAL]...\n"
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
-msgstr ""
+msgstr "Omformatér TAL eller tallene fra standard-input hvis ingen er givet.\n"
 
-#: src/numfmt.c:820
-#, fuzzy
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
-msgstr ""
-"      --strict         afslut med status forskellig fra nul ved ugyldigt "
-"input\n"
-"                         sammen med --check\n"
+msgstr "      --debug          udskriv advarsler om ugyldige inddata\n"
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
+"  -d, --delimiter=X    brug X frem for blanke tegn som feltskilletegn\n"
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
+"      --field=N        erstat tallet i inddatafelt N (standardværdi er 1)\n"
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
 msgstr ""
+"      --format=FORMAT  brug FORMAT til flydende tal i stil med printf;\n"
+"                         se detaljer for FORMAT nedenfor\n"
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
 "                         see UNIT below\n"
 msgstr ""
+"      --from=ENHED     auto-skalér ind-tal til ENHEDer; standardværdi er\n"
+"                         'none'; see ENHED nedenfor\n"
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr ""
+"      --from-unit=N    angiv enhedsstørrelse for inddata (ellers bruges 1)\n"
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
 "                         (which means it has no effect in the C/POSIX "
 "locale)\n"
 msgstr ""
+"      --grouping       brug regionsdefineret gruppering af cifre, f.eks.\n"
+"                         1,000,000 (hvilket betyder at det ingen effekt har\n"
+"                         i C/POSIX-regionsindstillinger)\n"
 
-#: src/numfmt.c:844
+# ikke sikker på hvad header er her
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
 msgstr ""
+"      --header[=N]     udskriv (uden konvertering) de første N hovedlinjer;\n"
+"                         N sættes til 1 hvis ikke givet\n"
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
 msgstr ""
+"      --invalid=TILSTAND  fejltilstand for ugyldige tal: TILSTAND kan være:\n"
+"                         abort (standard), fail, warn, ignore\n"
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -6925,44 +7038,61 @@ msgid ""
 "whitespace\n"
 "                         is found\n"
 msgstr ""
+"      --padding=N      udfyld udskriften til N tegn; positiv N "
+"højrestiller;\n"
+"                         negativ N venstrestiller; udfyldning ignoreres "
+"hvis\n"
+"                         uddata er bredere end N tegn; standardopførsel er "
+"at\n"
+"                         udfylde automatisk hvis der findes blanke tegn\n"
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
 "nearest\n"
 msgstr ""
+"      --round=METODE   brug afrundingsMETODE ved skalering; METODE kan "
+"være:\n"
+"                         up, down, from-zero (standard), towards-zero, "
+"nearest\n"
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
 msgstr ""
+"      --suffix=SUFFIKS  tilføj SUFFIKS til ud-numre, og acceptér valgfrit\n"
+"                         SUFFIKS i ind-numre\n"
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
+"      --to=ENHED       autoskalér ud-tal til ENHEDer; se ENHED nedenfor\n"
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr ""
+"      --to-unit=N      enhedsstørrelse for uddata (frem for standardværdien "
+"1)\n"
 
-#: src/numfmt.c:877
-#, fuzzy
+#: src/numfmt.c:878
 msgid ""
 "\n"
 "UNIT options:\n"
 msgstr ""
-"Andre flag:\n"
 "\n"
+"Flag til ENHED:\n"
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr ""
+"  none       der foretages ingen autoskalering; suffikser vil udløse en "
+"fejl\n"
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -6970,43 +7100,65 @@ msgid ""
 "               1M = 1000000,\n"
 "               1Mi = 1048576,\n"
 msgstr ""
+"  auto       acceptér valgfri et- eller tobogstavssuffiks:\n"
+"               1K = 1000,\n"
+"               1Ki = 1024,\n"
+"               1M = 1000000,\n"
+"               1Mi = 1048576,\n"
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
 "               1M = 1000000,\n"
 "               ...\n"
 msgstr ""
+"  si         acceptér valgfri etbogstavssuffiks:\n"
+"               1K = 1000,\n"
+"               1M = 1000000,\n"
+"               ...\n"
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
 "               1M = 1048576,\n"
 "               ...\n"
 msgstr ""
+"  iec        acceptér valgfri etbogstavssuffiks:\n"
+"               1K = 1024,\n"
+"               1M = 1048576,\n"
+"               ...\n"
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
 "               1Mi = 1048576,\n"
 "               ...\n"
 msgstr ""
+"  iec-i      acceptér valgfri tobogstavssuffiks:\n"
+"               1Ki = 1024,\n"
+"               1Mi = 1048576,\n"
+"               ...\n"
 
-#: src/numfmt.c:905
-#, c-format
+#: src/numfmt.c:906
+#, fuzzy, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
+"\n"
+"FORMAT skal passe til at udskrive ét flydende tal '%f'.\n"
+"Valgfrit citationstegn (%'f) medfører --grouping (hvis understøttet af\n"
+"regionsindstillinger). Udskrift fyldes op til valgfri breddeværdi (%10f).\n"
+"Valgfri negativ breddeværdi (%-10f) venstrefylder udskrift.\n"
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -7017,8 +7169,17 @@ msgid ""
 "diagnosed, but the exit status is 0.  With --invalid='ignore' conversion\n"
 "errors are not diagnosed and the exit status is 0.\n"
 msgstr ""
+"\n"
+"Slutstatus er 0 hvis alle ind-numre blev konverteret planmæssigt. Som "
+"standard\n"
+"vil %s stoppe ved første konverteringsfejl med slutstatus 2.  Med\n"
+"--invalid='fail' vil der blive vist en advarsel for hver konverteringsfejl, "
+"og\n"
+"slutstatus bliver 2.  Med --invalid='warn' diagnosticeres hver\n"
+"konverteringsfejl, men slutstatus er 0.  Med --invalid='ignore' vil\n"
+"konverteringsfejl ikke blive diagnosticeret, og slutstatus er 0.\n"
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -7038,113 +7199,132 @@ msgid ""
 "  $ ls -lh | %s --header --field 5 --from=iec --padding=10\n"
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 msgstr ""
+"\n"
+"Eksempler:\n"
+"  $ %s --to=si 1000\n"
+"            -> \"1.0K\"\n"
+"  $ %s --to=iec 2048\n"
+"           -> \"2.0K\"\n"
+"  $ %s --to=iec-i 4096\n"
+"           -> \"4.0Ki\"\n"
+"  $ echo 1K | %s --from=si\n"
+"           -> \"1000\"\n"
+"  $ echo 1K | %s --from=iec\n"
+"           -> \"1024\"\n"
+"  $ df | %s --header --field 2 --to=si\n"
+"  $ ls -l | %s --header --field 5 --to=iec\n"
+"  $ ls -lh | %s --header --field 5 --from=iec --padding=10\n"
+"  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, c-format
 msgid "format %s has no %% directive"
 msgstr "formatet %s har intet %%-direktiv"
 
-#: src/numfmt.c:990
-#, fuzzy, c-format
+#: src/numfmt.c:1003
+#, c-format
 msgid "invalid format %s (width overflow)"
-msgstr "ugyldigt datoformat %s"
+msgstr "ugyldigt format %s (breddeoverløb)"
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr ""
+
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr "formatet %s slutter med %%"
 
-#: src/numfmt.c:1010
-#, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
-msgstr ""
+#: src/numfmt.c:1030
+#, fuzzy, c-format
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
+msgstr "ugyldigt format %s; direktiv skal være %%['][-][N]f"
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr "formatet %s har for mange %%-direktiver"
 
-#: src/numfmt.c:1070
-#, fuzzy, c-format
-msgid "invalid suffix in input '%s': '%s'"
-msgstr "ugyldigt suffiks i %s%s-argument '%s'"
+#: src/numfmt.c:1081
+#, c-format
+msgid "invalid suffix in input %s: %s"
+msgstr "ugyldigt suffiks i inddata %s: %s"
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
-msgstr ""
+msgstr "værdi for stor til at udskrive: '%Lg' (overvej at bruge --to)"
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
 msgstr ""
+"værdi for stor til at udskrive: '%Lg' (kan ikke håndtere værdier > 999Y)"
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
-msgstr ""
+msgid "large input value %s: possible precision loss"
+msgstr "stor indværdi %s: muligt tab af præcision"
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
+"indlinjen er for kort; der blev ikke fundet nogen tal at konvertere i felt "
+"%ld"
 
-#: src/numfmt.c:1388
-#, fuzzy, c-format
-msgid "invalid padding value '%s'"
-msgstr "ugyldigt sideinterval %s"
+#: src/numfmt.c:1403
+#, c-format
+msgid "invalid padding value %s"
+msgstr "ugyldig udfyldningsværdi %s"
 
-#: src/numfmt.c:1401
-#, fuzzy, c-format
-msgid "invalid field value '%s'"
-msgstr "ugyldigt feltnummer: %s"
+#: src/numfmt.c:1417
+#, c-format
+msgid "invalid field value %s"
+msgstr "ugyldig feltværdi %s"
 
-#: src/numfmt.c:1430
-#, fuzzy, c-format
-msgid "invalid header value '%s'"
-msgstr "ugyldig dato %s"
+#: src/numfmt.c:1447
+#, c-format
+msgid "invalid header value %s"
+msgstr "ugyldig overskriftsværdi %s"
 
-#: src/numfmt.c:1456
-#, fuzzy, c-format
+#: src/numfmt.c:1473
+#, c-format
 msgid "--grouping cannot be combined with --format"
-msgstr "filoperander kan ikke kombineres med --files0-from"
-
-#: src/numfmt.c:1458
-#, fuzzy, c-format
-msgid "--padding cannot be combined with --format"
-msgstr "filoperander kan ikke kombineres med --files0-from"
+msgstr "--grouping kan ikke kombineres med --format"
 
-#: src/numfmt.c:1463
-#, fuzzy, c-format
+#: src/numfmt.c:1478
+#, c-format
 msgid "no conversion option specified"
-msgstr "flere -i-flag angivet"
+msgstr "intet konverteringsflag givet"
 
-#: src/numfmt.c:1471
-#, fuzzy, c-format
+#: src/numfmt.c:1486
+#, c-format
 msgid "grouping cannot be combined with --to"
-msgstr "filoperander kan ikke kombineres med --files0-from"
+msgstr "gruppering kan ikke kombineres med --to"
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
-msgstr ""
+msgstr "gruppering har ingen virkning med disse regionsindstillinger"
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
-msgstr ""
+msgstr "--header ignoreres med kommandolinjeinddata"
 
-#: src/numfmt.c:1511
-#, fuzzy, c-format
+#: src/numfmt.c:1526
+#, c-format
 msgid "error reading input"
-msgstr "fejl ved læsning af %s"
+msgstr "fejl ved læsning af inddata"
 
-#: src/numfmt.c:1520
-#, fuzzy, c-format
+#: src/numfmt.c:1535
+#, c-format
 msgid "failed to convert some of the input numbers"
-msgstr "kunne ikke ubrugeliggøre standard-ind"
+msgstr "kunne ikke konvertere visse af ind-tallene"
 
-#: src/od.c:294
+#: src/od.c:320
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -7156,7 +7336,7 @@ msgstr ""
 "  eller: %s [-abcdfilosx]... [FIL] [[+]AFSÆT[.][b]]\n"
 "  eller: %s --traditional [FLAG]... [FIL] [[+]AFSÆT[.][b] [+][MÆRKE][.][b]]\n"
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -7172,8 +7352,7 @@ msgstr ""
 "eller FIL er -, læses fra standard-ind.\n"
 "\n"
 
-#: src/od.c:307
-#, fuzzy
+#: src/od.c:333
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
 "if the last operand begins with + or (if there are 2 operands) a digit.\n"
@@ -7182,7 +7361,6 @@ msgid ""
 "For OFFSET and LABEL, a 0x or 0X prefix indicates hexadecimal;\n"
 "suffixes may be . for octal and b for multiply by 512.\n"
 msgstr ""
-"\n"
 "Hvis kommandoen kan opfattes i henhold til såvel første som anden \n"
 "parameterform, antages anden form hvis sidste operand begynder med + "
 "eller, \n"
@@ -7194,55 +7372,64 @@ msgstr ""
 "b\n"
 "for blokke på 512 bytes.\n"
 
-#: src/od.c:318
+#: src/od.c:344
 #, fuzzy
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
-"  -A, --address-radix=RADIX   bestem hvordan filafsæt udskrives\n"
+"  -A, --address-radix=RADIX   udskriftsformat for filafsæt.  RADIX er en af\n"
+"                                 [doxn], for titalssystem, oktal, heks "
+"eller\n"
+"                                 intet\n"
 "  -j, --skip-bytes=BYTE       overspring første BYTE fra hver fil\n"
 
-#: src/od.c:323
-#, fuzzy
+#: src/od.c:350
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
 "  -N, --read-bytes=BYTE       begræns dump til BYTE indbyte\n"
-"  -S BYTE, --strings[=BYTE]   udskriv strenge med mindst BYTE grafiske tegn\n"
+"  -S BYTE, --strings[=BYTE]   udskriv strenge med mindst BYTE grafiske "
+"tegn.\n"
+"                                3 antages når BYTE ikke er givet\n"
 "  -t, --format=TYPE           vælg udformater\n"
 "  -v, --output-duplicates     brug ikke * for at markere linjefjernelse\n"
-"  -w[BYTE], --width[=BYTE]    skriv BYTE byte per udlinje\n"
-"      --traditional           acceptér argumenter på traditionel form\n"
+"  -w[BYTE], --width[=BYTE]    skriv BYTE byte per udlinje.\n"
+"                                32 antages når BYTE ikke er givet.\n"
+"      --traditional           acceptér argumenter på tredje form jf. "
+"ovenfor\n"
 
-#: src/od.c:336
-#, fuzzy
+#: src/od.c:363
 msgid ""
 "\n"
 "\n"
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 "\n"
+"\n"
 "Traditionelle formatangivelser kan blandes, og de akkumulerer:\n"
 "  -a   samme som -t a,  vælg navngivne tegn, idet højeste bit ignoreres\n"
 "  -b   samme som -t o1, vælg oktalbyte\n"
-"  -c   samme som -t c,  vælg ASCII-tegn eller omvendt skråstregsnotation\n"
+"  -c   samme som -t c,  vælg udskrivelige tegn eller omvendt "
+"skråstregsnotation\n"
 "  -d   samme som -t u2, vælg decimale 2-byte-enheder uden fortegn\n"
 
-#: src/od.c:345
+#: src/od.c:372
 msgid ""
 "  -f   same as -t fF, select floats\n"
 "  -i   same as -t dI, select decimal ints\n"
@@ -7258,22 +7445,21 @@ msgstr ""
 "  -s   samme som -t d2, vælg decimale 2-byte-enheder\n"
 "  -x   samme som -t x2, vælg hexadecimale 2-byte-enheder\n"
 
-#: src/od.c:353
-#, fuzzy
+#: src/od.c:380
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 "\n"
-"TYPE består af en eller flere af disse specifikationer:\n"
 "\n"
+"TYPE består af en eller flere af disse specifikationer:\n"
 "  a          navngivet tegn, idet mest betydende (high-order) bit ignoreres\n"
-"  c          ASCII-tegn eller omvendt skråstregsnotation\n"
+"  c          tegn der kan udskrives eller omvendt skråstregsnotation\n"
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -7287,8 +7473,7 @@ msgstr ""
 "  u[STØR]    decimal uden fortegn, STØR byte per tal\n"
 "  x[STØR]    hexadecimal, STØR byte per tal\n"
 
-#: src/od.c:367
-#, fuzzy
+#: src/od.c:394
 msgid ""
 "\n"
 "SIZE is a number.  For TYPE in [doux], SIZE may also be C for\n"
@@ -7297,20 +7482,23 @@ msgid ""
 "for sizeof(double) or L for sizeof(long double).\n"
 msgstr ""
 "\n"
-"STØR er et tal.  For TYPE lig med d, o, u eller x, kan STØR også være\n"
-"C for sizeof(char), S for sizeof(short), I for sizeof(int) eller L for \n"
-"sizeof(long).  Når TYPE er f, kan STØR være F for sizeof(float), \n"
-"D for sizeof(double) eller L for sizeof(long double).\n"
+"STØR er et tal.  For TYPE i [doux], kan STØR også være C for\n"
+"sizeof(char), S for sizeof(short), I for sizeof(int) eller L for\n"
+"sizeof(long).  Når TYPE er f, kan STØR være F for sizeof(float), D for\n"
+"sizeof(double) eller L for sizeof(long double).\n"
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
 "each output line.\n"
 msgstr ""
+"\n"
+"Ved tilføjelse af z-suffiks til enhver type vil der vises ikke-blanke tegn "
+"til\n"
+"slut i hver udlinje.\n"
 
-#: src/od.c:379
-#, fuzzy
+#: src/od.c:406
 msgid ""
 "\n"
 "\n"
@@ -7323,16 +7511,22 @@ msgid ""
 "and so on for G, T, P, E, Z, Y.\n"
 msgstr ""
 "\n"
-"K kan have et multiplikativt suffiks:\n"
-"b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
-"GB 1000*1000*1000, G 1024*1024*1024 og så videre for T, P, E, Z, Y.\n"
+"\n"
+"BYTE er heks med 0x eller 0X-præfiks, og kan have et multiplikativt "
+"suffiks:\n"
+"  b    512\n"
+"  kB   1000\n"
+"  K    1024\n"
+"  MB   1000*1000\n"
+"  M    1024*1024\n"
+"og så videre for G, T, P, E, Z, Y.\n"
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, c-format
 msgid "invalid type string %s"
 msgstr "ugyldig typestreng %s"
 
-#: src/od.c:649
+#: src/od.c:690
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7341,7 +7535,7 @@ msgstr ""
 "ugyldig type-streng %s;\n"
 "dette system understøtter ikke en %lu-byte heltalstype"
 
-#: src/od.c:770
+#: src/od.c:811
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7350,37 +7544,37 @@ msgstr ""
 "ugyldig type-streng %s;\n"
 "dette system understøtter ikke en %lu-byte flydende-taltype"
 
-#: src/od.c:828
+#: src/od.c:869
 #, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr "ugyldigt tegn '%c' i typestrengen %s"
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr "kan ikke springe forbi afslutning af kombineret inddata"
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr "ugyldig ud-adresse-grundtal '%c'; det skal være et af tegnene [doxn]"
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr "ingen type kan angives når strenge gemmes"
 
-#: src/od.c:1810
+#: src/od.c:1863
 msgid "compatibility mode supports at most one file"
 msgstr "kompatibilitetstilstand understøtter højst én fil"
 
 # jf. --skip-bytes
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr "skip-bytes + read-bytes er for stor"
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr "advarsel: ugyldig bredde %lu; bruger %d i stedet"
@@ -7396,7 +7590,6 @@ msgid "standard input is closed"
 msgstr "standard-ind er lukket"
 
 #: src/paste.c:439
-#, fuzzy
 msgid ""
 "Write lines consisting of the sequentially corresponding lines from\n"
 "each FILE, separated by TABs, to standard output.\n"
@@ -7405,7 +7598,6 @@ msgstr ""
 "Skriv linjer som består af de sekventielt tilsvarende linjer fra hver\n"
 "FIL, separeret med tabulatorer, til standard-ud.\n"
 "Hvis ingen FIL er angivet, eller FIL er -, læses fra standard-ind.\n"
-"\n"
 
 #: src/paste.c:447
 msgid ""
@@ -7543,12 +7735,12 @@ msgstr "Hvornår"
 msgid "Where"
 msgstr "Hvor"
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr "Brug: %s [FLAG]... [BRUGER]...\n"
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -7564,7 +7756,7 @@ msgstr ""
 "  -p              udelad brugerens planfil i det lange format\n"
 "  -s              udskriv i kort format, dette er standard\n"
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -7579,7 +7771,7 @@ msgstr ""
 "  -q              udelad brugerens fulde navn, fjernvært og\n"
 "                  inaktiv tid i kort format\n"
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, c-format
 msgid ""
 "\n"
@@ -7590,7 +7782,7 @@ msgstr ""
 "Et letvægts-'finger'-program; udskriver brugerinformation.\n"
 "utmp-filen vil være %s.\n"
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr "intet brugernavn angivet; mindst ét skal angives når -l bruges"
@@ -7676,11 +7868,8 @@ msgid "Page %<PRIuMAX>"
 msgstr "Side %<PRIuMAX>"
 
 #: src/pr.c:2757
-#, fuzzy
 msgid "Paginate or columnate FILE(s) for printing.\n"
-msgstr ""
-"Sidenummerér eller omform FIL(er) til kolonner for udskrivning.\n"
-"\n"
+msgstr "Sidenummerér eller omform FILer til kolonner for udskrivning.\n"
 
 #: src/pr.c:2763
 msgid ""
@@ -7804,11 +7993,13 @@ msgstr ""
 "                    advar ikke når en fil ikke kan åbnes\n"
 
 #: src/pr.c:2820
+#, fuzzy
 msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
@@ -7818,7 +8009,7 @@ msgstr ""
 "                    -s[TEGN] slår linjeafkortning fra for alle 3 kolonne-\n"
 "                    flagene (-KOLONNER|-a -KOLONNER|-m) bortset fra -w\n"
 
-#: src/pr.c:2827
+#: src/pr.c:2828
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
 "                    separate columns by STRING,\n"
@@ -7835,7 +8026,7 @@ msgstr ""
 "kolonneflag\n"
 "  -t, --omit-header  brug ikke sidehoved og -fod\n"
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 msgid ""
 "  -T, --omit-pagination\n"
 "                    omit page headers and trailers, eliminate any "
@@ -7858,7 +8049,7 @@ msgstr ""
 "for\n"
 "                    flerkolonneudskrift, -s[tegn] slår fra (72)\n"
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
 "                    set page width to PAGE_WIDTH (72) characters always,\n"
@@ -7871,7 +8062,7 @@ msgstr ""
 "                    Afkort linjer hvis -J ikke er sat. PÃ¥virker ikke -S\n"
 "                    eller -s\n"
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 msgid ""
 "\n"
 "-t is implied if PAGE_LENGTH <= 10.  With no FILE, or when FILE is -, read\n"
@@ -7896,7 +8087,8 @@ msgstr ""
 "\n"
 
 #: src/printenv.c:69
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+#, fuzzy
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr "  -0, --null     afslut linjer med en 0-byte frem for linjeskift\n"
 
 #: src/printf.c:79
@@ -8014,12 +8206,12 @@ msgstr "advarsel: ignorerer overflødige argumenter, startende med %s"
 msgid "F. Pinard"
 msgstr "François Pinard"
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, c-format
 msgid "%s (for regexp %s)"
 msgstr "%s (for regudtryk %s)"
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
@@ -8028,16 +8220,14 @@ msgstr ""
 "Brug:    %s [FLAG]... [INDDATA]... (uden -G)\n"
 "  eller: %s -G [FLAG]... [INDDATA [UDDATA]]\n"
 
-#: src/ptx.c:1821
-#, fuzzy
+#: src/ptx.c:1824
 msgid ""
 "Output a permuted index, including context, of the words in the input "
 "files.\n"
 msgstr ""
 "Udskriv et permuteret indeks, med kontekst, over ordene i inddatafilerne.\n"
-"\n"
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
 "  -G, --traditional              behave more like System V 'ptx'\n"
@@ -8047,7 +8237,7 @@ msgstr ""
 "  -G, --traditional              vær mere som System V's 'ptx'\n"
 "  -F, --flag-truncation=STRENG   brug STRENG for at markere linjeafkortning\n"
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
 "  -O, --format=roff              generate output as roff directives\n"
@@ -8064,7 +8254,7 @@ msgstr ""
 "                                 sætninger\n"
 "  -T, --format=tex               generér udskrift som TeX-direktiver\n"
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -8083,7 +8273,7 @@ msgstr ""
 "                                 denne FIL\n"
 "  -o, --only-file=FIL            læs kun ordliste fra denne FIL\n"
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -8095,16 +8285,15 @@ msgstr ""
 "  -w, --width=BREDDE             udskriftbredde for kolonner, eksklusive\n"
 "                                   referencer\n"
 
-#: src/ptx.c:1854
+#: src/ptx.c:1857
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
 "\n"
-"Ved ingen FIL eller hvis FIL er -, læses fra standard-ind. '-F /' er "
-"forvalgt.\n"
+"Uden FIL, eller hvis FIL er -, læses fra standard-ind.  Standard er '-F /'.\n"
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, c-format
 msgid "invalid gap width: %s"
 msgstr "ugyldig hulbredde: %s"
@@ -8125,22 +8314,28 @@ msgstr ""
 "  -L, --logical   brug miljøvariablen PWD, selv om den indeholder symlænker\n"
 "  -P, --physical  undgå alle symlænker\n"
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+
+#: src/pwd.c:169
 #, c-format
 msgid "failed to chdir to %s"
 msgstr "kunne ikke foretage chdir til %s"
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, c-format
 msgid "failed to stat %s"
 msgstr "kunne ikke foretage stat på %s"
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr "kunne ikke finde katalogpost i %s med tilsvarende i-node"
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, c-format
 msgid "ignoring non-option arguments"
 msgstr "ignorerer argumenter som ikke er flag"
@@ -8150,8 +8345,8 @@ msgstr "ignorerer argumenter som ikke er flag"
 msgid "Dmitry V. Levin"
 msgstr "Dmitry V. Levin"
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Brug: %s [FLAG]... [FIL]...\n"
@@ -8197,22 +8392,22 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 "  -m, --canonicalize-missing    normalisér ved at følge hver symlænke i "
 "hver\n"
 "                                komponent i det givne navn rekursivt, uden\n"
 "                                krav på eksistensen af komponenter\n"
-"  -n, --no-newline              udskriv ikke det afsluttende linjeskift\n"
+"  -n, --no-newline              udskriv ikke det afsluttende skilletegn\n"
 "  -q, --quiet,\n"
 "  -s, --silent                  udelad de fleste fejlmeddelelser\n"
 "  -v, --verbose                 udskriv fejlmeddelelser\n"
+"  -z, --zero                    adskil uddata med NUL frem for linjeskift\n"
 
 #: src/readlink.c:152
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring --no-newline with multiple arguments"
-msgstr "ignorerer argumenter som ikke er flag"
+msgstr "ignorerer --no-newline når der er flere argumenter"
 
 #: src/realpath.c:72
 msgid ""
@@ -8225,6 +8420,7 @@ msgstr ""
 "\n"
 
 #: src/realpath.c:77
+#, fuzzy
 msgid ""
 "  -e, --canonicalize-existing  all components of the path must exist\n"
 "  -m, --canonicalize-missing   no components of the path need exist\n"
@@ -8234,7 +8430,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 "  -e, --canonicalize-existing  alle stiens komponenter skal eksistere\n"
@@ -8265,41 +8461,42 @@ msgstr "%s: gå ned i skrivebeskyttet katalog %s? "
 msgid "%s: descend into directory %s? "
 msgstr "%s: gå ned i katalog %s? "
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr "%s: fjern skrivebeskyttet %s %s? "
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, c-format
 msgid "%s: remove %s %s? "
 msgstr "%s: fjern %s %s? "
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, c-format
 msgid "removed directory: %s\n"
 msgstr "fjernede katalog %s\n"
 
-#: src/remove.c:444
+#: src/remove.c:447
 #, c-format
-msgid "cannot remove directory: %s"
-msgstr "kan ikke fjerne katalog: %s"
+msgid "refusing to remove %s or %s directory: skipping %s"
+msgstr "nægter at fjerne %s eller %s er et katalog: springer %s over"
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr "springer %s over, da den er på en anden enhed"
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, c-format
 msgid "traversal failed: %s"
 msgstr "gennemløb slog fejl: %s"
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -8331,12 +8528,12 @@ msgstr ""
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 "  -I                    spørg én gang før mere end tre filer fjernes, eller "
 "når\n"
@@ -8418,13 +8615,17 @@ msgstr ""
 
 #: src/rm.c:342
 #, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr "%s: fjern alle argumenter rekursivt? "
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] "%s: fjern %zu argument rekursivt? "
+msgstr[1] "%s: fjern %zu argumenter rekursivt? "
 
-#: src/rm.c:343
+#: src/rm.c:345
 #, c-format
-msgid "%s: remove all arguments? "
-msgstr "%s: fjern alle argumenter? "
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] "%s: fjern %zu argument? "
+msgstr[1] "%s: fjern %zu argumenter? "
 
 #: src/rmdir.c:134 src/rmdir.c:233
 #, c-format
@@ -8478,12 +8679,13 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
+"Kør et program i en anden SELinux-sikkerhedskontekst.\n"
+"Med hverken KONTEKST eller KOMMANDO udskrives nuværende sikkerhedskontekst.\n"
 
 #: src/runcon.c:94
-#, fuzzy
 msgid ""
 "  CONTEXT            Complete security context\n"
 "  -c, --compute      compute process transition context before modifying\n"
@@ -8493,9 +8695,6 @@ msgid ""
 "  -l, --range=RANGE  levelrange\n"
 "\n"
 msgstr ""
-"Kør et program i en anden sikkerhedskontekst.\n"
-"Uden KONTEKST og KOMMANDO udskrives den aktuelle sikkerhedskontekst.\n"
-"\n"
 "  KONTEKST           fuld sikkerhedskontekst\n"
 "  -c, --compute      beregn procestransitionskontekst før modifikation\n"
 "  -t, --type=TYPE    type (for samme rolle som forælder)\n"
@@ -8539,41 +8738,46 @@ msgstr "du skal angive -c, -t, -u, -l, -r eller kontekst"
 msgid "no command specified"
 msgstr "ingen kommando angivet"
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr "%s kan kun bruges på en SELinux-kerne"
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, c-format
 msgid "failed to compute a new context"
 msgstr "kunne ikke udregne en ny kontekst"
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, c-format
 msgid "failed to set new user %s"
 msgstr "kunne ikke sætte ny bruger %s"
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, c-format
 msgid "failed to set new type %s"
 msgstr "kunne ikke sætte ny type %s"
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, c-format
 msgid "failed to set new range %s"
 msgstr "kunne ikke sætte nyt interval %s"
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, c-format
 msgid "failed to set new role %s"
 msgstr "kunne ikke sætte ny rolle %s"
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, c-format
 msgid "unable to set security context %s"
 msgstr "kunne ikke sætte sikkerhedskontekst %s"
 
+#: src/selinux.c:127 src/selinux.c:300
+#, c-format
+msgid "error canonicalizing %s"
+msgstr "fejl ved normalisering af %s"
+
 #: src/seq.c:68
 #, c-format
 msgid ""
@@ -8587,17 +8791,14 @@ msgstr ""
 
 #: src/seq.c:73
 msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n"
-msgstr ""
+msgstr "Udskriv tal fra FØRSTE til SIDSTE i trin af FORØGELSE.\n"
 
 #: src/seq.c:79
-#, fuzzy
 msgid ""
 "  -f, --format=FORMAT      use printf style floating-point FORMAT\n"
 "  -s, --separator=STRING   use STRING to separate numbers (default: \\n)\n"
 "  -w, --equal-width        equalize width by padding with leading zeroes\n"
 msgstr ""
-"Udskriv tallene fra FØRSTE til SIDSTE, med trin på FORØGELSE.\n"
-"\n"
 "  -f, --format=FORMAT      brug printf-lignende FORMAT til flydende tal\n"
 "  -s, --separator=STRENG   brug STRENG til at separere tallene (forvalgt: "
 "\\n)\n"
@@ -8608,6 +8809,8 @@ msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
@@ -8615,11 +8818,15 @@ msgstr ""
 "\n"
 "Hvis FØRSTE eller FORØGELSE udelades, er den forvalgte værdi 1.  Dermed "
 "svarer\n"
-"en udeladt FORØGELSE til 1, selv når SIDSTE er mindre end FØRSTE.  FØRSTE,\n"
-"FORØGELSE og SIDSTE tolkes som flydende talværdier.  FORØGELSE bør være\n"
+"en udeladt FORØGELSE til 1, selv når SIDSTE er mindre end FØRSTE.  \n"
+"Talfølgen ender når summen af nuværende antal og FORØGELSE ville blive "
+"større\n"
+"end SIDSTE.\n"
+"FØRSTE, FORØGELSE og SIDSTE tolkes som flydende talværdier.  FORØGELSE bør "
+"være\n"
 "positiv hvis FØRSTE er mindre end SIDSTE, og negativ ellers.\n"
 
-#: src/seq.c:94
+#: src/seq.c:96
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
 "it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n"
@@ -8629,103 +8836,37 @@ msgstr ""
 "standard er det %.PRÆCf hvis FØRSTE, FORØGELSE og SIDSTE alle er\n"
 "decimaltal med fast komma og maksimal præcision PRÆC, ellers %g.\n"
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, c-format
 msgid "invalid floating point argument: %s"
 msgstr "ugyldigt flydende tal-argument: %s"
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr "formatet %s har et ukendt %%%c-direktiv"
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr ""
 "formatstrengen kan ikke angives når der udskrives strenge\n"
 "med ens bredde"
 
-#: src/setuidgid.c:49
-#, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-"Brug:    %s [KORT-FLAG]... BRUGER KOMMANDO [ARGUMENT]...\n"
-"  eller: %s LANGT-FLAG\n"
-
-#: src/setuidgid.c:55
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-"Smid eventuelle supplerende grupper væk, antag bruger-ID og gruppe-ID for "
-"den\n"
-"angivne BRUGER (numerisk ID eller brugernavn), og kør KOMMANDO med "
-"eventuelle\n"
-"angivne ARGUMENTer.  Afslut med status 111 hvis det ikke er muligt at "
-"antage\n"
-"den krævede bruger- og gruppe-ID.  Afslut ellers med afslutningskode for\n"
-"KOMMANDO.  Dette program er kun nyttigt, når det køres som root (bruger-ID "
-"0).\n"
-"\n"
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-"  -g GID[,GID1...]  sæt også primær gruppe-ID til den numeriske GID, og\n"
-"                    (hvis angivet) supplerende gruppe-ID'er til GID1, ...\n"
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr "ukendt bruger-ID: %s"
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr "du skal yderligere angive -g hvis du vil anvende bruger-ID %s"
-
-#: src/setuidgid.c:190
-#, c-format
-msgid "failed to set supplemental group(s)"
-msgstr "kunne ikke sætte supplerende grupper"
-
-#: src/setuidgid.c:200
-#, c-format
-msgid "cannot set group-ID to %lu"
-msgstr "kan ikke sætte gruppe-ID til %lu"
-
-#: src/setuidgid.c:204
-#, c-format
-msgid "cannot set user-ID to %lu"
-msgstr "kan ikke sætte bruger-ID til %lu"
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr "Colin Plumb"
 
-#: src/shred.c:148
-#, fuzzy
+#: src/shred.c:170
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
 "for even very expensive hardware probing to recover the data.\n"
 msgstr ""
-"Overskiv de angivne FILER gentagne gange for at gøre det sværere for\n"
+"Overskiv de angivne FILer gentagne gange for at gøre det sværere for\n"
 "selv meget dyrt genoprettelsesudstyr at genskabe data.\n"
-"\n"
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -8738,29 +8879,34 @@ msgstr ""
 "      --random-source=FIL  læs tilfældige byte fra FIL\n"
 "  -s, --size=N   makulér dette antal byte (endelser som K, M, G accepteres)\n"
 
-#: src/shred.c:161
+#: src/shred.c:183
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
 "  -z, --zero     add a final overwrite with zeros to hide shredding\n"
 msgstr ""
-"  -u, --remove   afkort og fjern fil efter overskrivningen\n"
+"  -u, --remove[=HVORDAN]  afkort og fjern fil efter overskrivning; se "
+"nedenfor\n"
 "  -v, --verbose  vis fremskridt\n"
 "  -x, --exact    rund ikke filstørrelser op til den næste fulde blok;\n"
 "                   dette er forvalg for ikke-regulære filer\n"
 "  -z, --zero     overskriv til slut med nuller for at skjule makulering\n"
 
-#: src/shred.c:170
+#: src/shred.c:192
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 "\n"
@@ -8769,12 +8915,15 @@ msgstr ""
 "Slet FILer hvis --remove (-u) er angivet. Standardhandlingen er, ikke at "
 "fjerne \n"
 "filerne, fordi det er almindeligt at behandle enhedsfiler som /dev/hda,\n"
-"og disse filer bør normalt ikke fjernes.  Ved behandling af almindelige "
-"filer,\n"
-"bruger de fleste flaget --remove.\n"
+"og disse filer bør normalt ikke fjernes.  Den valgfri parameter HVORDAN\n"
+"angiver hvordan en katalogindgang skal fjernes:\n"
+"'unlink' => brug et standardkald til unlink.\n"
+"'wipe' => slør også først bytene i navnet.\n"
+"'wipesync' => synkronisér også hver sløret byte til disken.\n"
+"Standardtilstanden er 'wipesync', men bemærk at den kan være tidskrævende.\n"
 "\n"
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -8791,7 +8940,7 @@ msgstr ""
 "fungere efter hensigten, eller ikke vil fungere i alle filsystemtilstande:\n"
 "\n"
 
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -8813,7 +8962,7 @@ msgstr ""
 "server\n"
 "\n"
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -8827,7 +8976,7 @@ msgstr ""
 "* komprimerede filsystemer\n"
 "\n"
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -8848,7 +8997,7 @@ msgstr ""
 "filen\n"
 "/etc/fstab, som dokumenteret i man-siden for mount (man mount).\n"
 
-#: src/shred.c:215
+#: src/shred.c:241
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
 "of the file that cannot be removed, and that will allow a shredded file\n"
@@ -8860,127 +9009,127 @@ msgstr ""
 "af\n"
 "en makuleret fil.\n"
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, c-format
 msgid "%s: fdatasync failed"
 msgstr "%s: fdatasync mislykkedes"
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr "%s: fsync mislykkedes"
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr "%s: kan ikke tilbagespole"
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr "%s: gennemløb %lu/%lu (%s)..."
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, c-format
 msgid "%s: error writing at offset %s"
 msgstr "%s: fejl ved skrivning fra afsæt %s"
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s: lseek mislykkedes"
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, c-format
 msgid "%s: file too large"
 msgstr "%s: fil for stor"
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr "%s: gennemløb %lu/%lu (%s)...%s"
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr "%s: gennemløb %lu/%lu (%s)...%s/%s %d%%"
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, c-format
 msgid "%s: fstat failed"
 msgstr "%s: fstat mislykkedes"
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, c-format
 msgid "%s: invalid file type"
 msgstr "%s: ugyldig filtype"
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr "%s: fil har negativ størrelse"
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, c-format
 msgid "%s: error truncating"
 msgstr "%s: fejl ved afkortning"
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, c-format
 msgid "%s: fcntl failed"
 msgstr "%s: fcntl mislykkedes"
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr "%s: kan ikke makulere beskriver for fil, der kun kan tilføjes til"
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr "%s: sletter"
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, c-format
 msgid "%s: renamed to %s"
 msgstr "%s: omdøbt til %s"
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, c-format
 msgid "%s: failed to remove"
 msgstr "%s: kunne ikke fjerne"
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr "%s: slettet"
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, c-format
 msgid "%s: failed to close"
 msgstr "%s: kunne ikke lukke"
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, c-format
 msgid "%s: failed to open for writing"
 msgstr "%s: kunne ikke åbne til skrivning"
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, c-format
 msgid "%s: invalid number of passes"
 msgstr "%s: ugyldigt antal gennemløb"
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, c-format
 msgid "multiple random sources specified"
 msgstr "der er angivet flere kilder til tilfældige tal"
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, c-format
 msgid "%s: invalid file size"
 msgstr "%s: ugyldig filstørrelse"
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -8991,14 +9140,12 @@ msgstr ""
 "  eller: %s -e [FLAG]... [ARG]\n"
 "  eller: %s -i LAV-HØJ [FLAG]...\n"
 
-#: src/shuf.c:54
-#, fuzzy
+#: src/shuf.c:67
 msgid "Write a random permutation of the input lines to standard output.\n"
-msgstr ""
-"Udskriv en tilfældig permutation af indlinjerne til standard-ud.\n"
-"\n"
+msgstr "Udskriv en tilfældig permutation af indlinjerne til standard-ud.\n"
 
-#: src/shuf.c:60
+#: src/shuf.c:73
+#, fuzzy
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
 "  -i, --input-range=LO-HI   treat each number LO through HI as an input "
@@ -9006,7 +9153,7 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
 msgstr ""
 "  -e, --echo                brug hvert ARG som en inddatalinje\n"
 "  -i, --input-range=LAV-HØJ  brug hvert tal fra LAV til HØJ som en "
@@ -9014,33 +9161,44 @@ msgstr ""
 "  -n, --head-count=ANTAL    udskriv højst ANTAL linjer\n"
 "  -o, --output=FIL          skriv resultat til FIL frem for standard-ud\n"
 "      --random-source=FIL   læs tilfældige byte fra FIL\n"
+"  -r, --repeat              udlinjer kan blive gentaget\n"
 "  -z, --zero-terminated     afslut linjer med 0-byte, ikke linjeskiftstegn\n"
 
-#: src/shuf.c:244
+#: src/shuf.c:228
+#, c-format
+msgid "too many input lines"
+msgstr "for mange indlinjer"
+
+#: src/shuf.c:431
 #, c-format
 msgid "multiple -i options specified"
 msgstr "flere -i-flag angivet"
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, c-format
 msgid "invalid input range %s"
 msgstr "ugyldigt talområde %s angivet"
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, c-format
 msgid "invalid line count %s"
 msgstr "ugyldigt linjetal %s"
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, c-format
 msgid "multiple output files specified"
 msgstr "flere udfiler angivet"
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, c-format
 msgid "cannot combine -e and -i options"
 msgstr "kan ikke kombinere flagene -e og -i"
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr ""
+
 #: src/sleep.c:44
 #, c-format
 msgid ""
@@ -9066,24 +9224,21 @@ msgstr ""
 "tidsrummet givet ved værdiernes sum.\n"
 "\n"
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, c-format
 msgid "invalid time interval %s"
 msgstr "ugyldigt tidsinterval %s"
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr "kan ikke læse realtids-ur"
 
-#: src/sort.c:399
-#, fuzzy
+#: src/sort.c:427
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
-msgstr ""
-"Skriv det samlede, sorterede indhold af FILer til standard-ud.\n"
-"\n"
+msgstr "Skriv det samlede, sorterede indhold af FILer til standard-ud.\n"
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
@@ -9091,7 +9246,7 @@ msgstr ""
 "Sorteringsflag:\n"
 "\n"
 
-#: src/sort.c:409
+#: src/sort.c:437
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
 "  -d, --dictionary-order      consider only blanks and alphanumeric "
@@ -9103,7 +9258,7 @@ msgstr ""
 "                                betragtning\n"
 "  -f, --ignore-case           behandl små bogstaver som store bogstaver\n"
 
-#: src/sort.c:415
+#: src/sort.c:443
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
 "  -i, --ignore-nonprinting    consider only printable characters\n"
@@ -9113,14 +9268,14 @@ msgstr ""
 "  -i, --ignore-nonprinting    tag kun synlige tegn i betragtning\n"
 "  -M, --month-sort            sammenlign (ukendt) < 'JAN' < ... < 'DEC'\n"
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 "  -h, --human-numeric-sort    sammenlign tal på læsevenlig form (f.eks. 2K, "
 "1G)\n"
 
-#: src/sort.c:423
+#: src/sort.c:451
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
 "  -R, --random-sort           sort by random hash of keys\n"
@@ -9132,7 +9287,7 @@ msgstr ""
 "      --random-source=FIL     hent tilfældige byte fra FIL \n"
 "  -r, --reverse               vend resultaterne af sammenligningerne om\n"
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -9149,7 +9304,7 @@ msgstr ""
 "tekst\n"
 "\n"
 
-#: src/sort.c:437
+#: src/sort.c:465
 msgid ""
 "Other options:\n"
 "\n"
@@ -9157,7 +9312,7 @@ msgstr ""
 "Andre flag:\n"
 "\n"
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
@@ -9165,7 +9320,7 @@ msgstr ""
 "      --batch-size=NFLET    flet højst NFLET ind-elementer på en gang;\n"
 "                            brug midlertidige filer hvis utilstrækkeligt\n"
 
-#: src/sort.c:445
+#: src/sort.c:473
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
 "  -C, --check=quiet, --check=silent  like -c, but do not report first bad "
@@ -9180,7 +9335,7 @@ msgstr ""
 "      --compress-program=PROG  komprimér midlertidige filer med PROG;\n"
 "                              udpak dem med PROG -d\n"
 
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -9195,7 +9350,7 @@ msgstr ""
 "                            navne i filen F; hvis F er -, så læs filnavne\n"
 "                            fra standard-ind\n"
 
-#: src/sort.c:459
+#: src/sort.c:487
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
 "  -m, --merge               merge already sorted files; do not sort\n"
@@ -9204,7 +9359,7 @@ msgstr ""
 "                              og type\n"
 "  -m, --merge               flet allerede sorterede filer; sortér ikke\n"
 
-#: src/sort.c:463
+#: src/sort.c:491
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "  -s, --stable              stabilize sort by disabling last-resort "
@@ -9218,7 +9373,7 @@ msgstr ""
 "hukommelsesbuffer\n"
 
 # Infosiden for sort indeholder bedre information om hvad dette betyder
-#: src/sort.c:469
+#: src/sort.c:497
 #, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -9244,12 +9399,7 @@ msgstr ""
 "                              uden -c: udskriv kun den første af en række "
 "ens\n"
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr ""
-"  -z, --zero-terminated     afslut linjer med en 0 byte, ikke ny-linje\n"
-
-#: src/sort.c:483
+#: src/sort.c:511
 msgid ""
 "\n"
 "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is "
@@ -9279,7 +9429,7 @@ msgstr ""
 "\n"
 "STØR kan efterfølges af de følgende multiplikative endelser:\n"
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -9300,259 +9450,243 @@ msgstr ""
 "Sæt LC_ALL=C for at få den traditionelle sorteringsorden som benytter\n"
 "de interne byte-værdier.\n"
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, c-format
 msgid "waiting for %s [-d]"
 msgstr "venter på %s [-d]"
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr "%s [-d] afsluttede uplanmæssigt"
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, c-format
 msgid "cannot create temporary file in %s"
 msgstr "kan ikke oprette midlertidig fil i %s"
 
 # bør det blive stående som open?
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr "fejl ved åbning"
 
-#: src/sort.c:970
+#: src/sort.c:998
 msgid "fflush failed"
 msgstr "fejl ved fflush"
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr "fejl ved lukning"
 
-#: src/sort.c:986
-#, c-format
-msgid "dup2 failed"
-msgstr "fejl ved dup2"
-
-#: src/sort.c:1103
-#, c-format
-msgid "couldn't execute %s"
-msgstr "kunne ikke eksekvere %s"
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 msgid "couldn't create temporary file"
 msgstr "kunne ikke oprette midlertidig fil"
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, c-format
 msgid "couldn't create process for %s -d"
 msgstr "kunne ikke oprette proces for %s -d"
 
-#: src/sort.c:1161
-#, c-format
-msgid "couldn't execute %s -d"
-msgstr "kunne ikke eksekvere %s -d"
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, c-format
 msgid "warning: cannot remove: %s"
 msgstr "advarsel: kan ikke fjerne: %s"
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, c-format
 msgid "invalid --%s argument %s"
 msgstr "ugyldigt argument %2$s til --%1$s"
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, c-format
 msgid "minimum --%s argument is %s"
 msgstr "mindste argument til --%s er %s"
 
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, c-format
 msgid "--%s argument %s too large"
 msgstr "argumentet %2$s til --%1$s er for stort"
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr "største argument til --%s med nuværende rlimit er %s"
 
 # relaterer til flere kerner der kører parallelt
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr "paralleliseringstallet skal være forskelligt fra nul"
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr "stat() mislykkedes"
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr "læsefejl"
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, c-format
 msgid "string transformation failed"
 msgstr "strengtransformation mislykkedes"
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, c-format
 msgid "the untransformed string was %s"
 msgstr "den utransformerede streng var %s"
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr "^ ingen træffer for nøgle\n"
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr "forældet nøgle %s brugt; overvej i stedet %s"
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr "nøglen %lu har bredden nul og vil blive ignoreret"
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr ""
 "indledende blanke tegn er betydningsbærende i nøglen %lu; overvej også at "
 "give 'b'"
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr "nøglen %lu er numerisk og spænder over flere felter"
 
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
 msgstr[0] "flaget '-%s' ignoreres"
 msgstr[1] "flagene '-%s' ignoreres"
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr "flaget '-r' gælder kun som sidste udvej for sammenligninger"
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr "fejl ved skrivning"
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr "%s: %s:%s: uorden: "
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr "standard-fejl"
 
-#: src/sort.c:3698
+#: src/sort.c:3738
 msgid "cannot read"
 msgstr "kan ikke læse"
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, c-format
 msgid "%s: invalid field specification %s"
 msgstr "%s: ugyldig feltangivelse %s"
 
-#: src/sort.c:3987
+#: src/sort.c:4028
 #, c-format
 msgid "options '-%s' are incompatible"
 msgstr "flagene '-%s' er inkompatible"
 
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, c-format
 msgid "%s: invalid count at start of %s"
 msgstr "%s: ugyldigt antal ved starten af %s"
 
-#: src/sort.c:4295
+#: src/sort.c:4336
 msgid "invalid number after '-'"
 msgstr "ugyldigt tal efter '-'"
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 msgid "invalid number after '.'"
 msgstr "ugyldigt tal efter '.'"
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr "forvildet tegn i feltangivelse"
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, c-format
 msgid "multiple compress programs specified"
 msgstr "flere compress-programmer angivet"
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
 msgstr "ugyldigt tal ved feltbegyndelsen"
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
 msgstr "felt-nummeret er nul"
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr "tegnafsæt er nul"
 
-#: src/sort.c:4407
+#: src/sort.c:4448
 msgid "invalid number after ','"
 msgstr "ugyldigt tal efter ','"
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr "tom tabulator"
 
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, c-format
 msgid "cannot read file names from %s"
 msgstr "kan ikke læse filnavne fra %s"
 
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr "%s:%lu: ugyldigt filnavn af længde nul"
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, c-format
 msgid "no input from %s"
 msgstr "ingen inddata fra %s"
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr "bruger sorteringsreglerne %s"
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr "bruger simpel bytesammenligning"
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr "ekstra operand %s er ikke tilladt med -%c"
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr "suffikslængden skal være mindst %zu"
 
-#: src/split.c:204
+#: src/split.c:203
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr "Brug: %s [FLAG]... [INDDATA [PRÆFIKS]]\n"
 
-#: src/split.c:208
-#, fuzzy
+#: src/split.c:207
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
 "size is 1000 lines, and default PREFIX is 'x'.  With no INPUT, or when "
@@ -9562,41 +9696,40 @@ msgstr ""
 "Skriv stykker af fast størrelse af INDDATA til PRÆFIKSaa, PRÆFIKSab, ...;\n"
 "forvalgt størrelse er 1000 linjer, og forvalgt PRÆFIKS er 'x'. Hvis ingen\n"
 "INDDATA er angivet, eller INDDATA er -, læses fra standard-ind.\n"
-"\n"
 
-#: src/split.c:216
+#: src/split.c:215
 #, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
 "  -a, --suffix-length=N   brug endelser med længden N (forvalg %d)\n"
 "      --additional-suffix=SUFFIKS  føj et ekstra SUFFIKS til slutningen af\n"
-"                                     filnavne.\n"
+"                                     filnavne\n"
 "  -b, --bytes=STØR        skriv STØR byte i hver udfil\n"
 "  -C, --line-bytes=STØR   skriv maksimalt STØR byte med linjer per udfil\n"
 "  -d, --numeric-suffixes[=FRA]  brug numeriske suffikser frem for "
 "alfabetiske.\n"
-"                                  FRA ændrer startværdien (forvalg 0).\n"
+"                                  FRA ændrer startværdien (forvalg 0)\n"
 "  -e, --elide-empty-files  generér ikke tomme udfiler med '-n'\n"
 "      --filter=KOMMANDO   skriv til skal-KOMMANDO; filnavn er $FILE\n"
 "  -l, --lines=ANTAL       skriv ANTAL linjer i hver udfil\n"
-"  -n, --number=KLUMPER    generér KLUMPER i udfiler.  Se herunder\n"
+"  -n, --number=KLUMPER    generér KLUMPER i udfiler.  Se forklaring "
+"nedenfor\n"
 "  -u, --unbuffered        kopiér omgående inddata til uddata med '-n r/...'\n"
 
-#: src/split.c:229
+#: src/split.c:228
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
 "                            output file is opened\n"
@@ -9604,7 +9737,7 @@ msgstr ""
 "      --verbose           skriv informationer til standard-fejl lige\n"
 "                            før hver udfil åbnes\n"
 
-#: src/split.c:236
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -9624,191 +9757,191 @@ msgstr ""
 "r/N     som 'l', men brug jævn ('round robin-') fordeling\n"
 "r/K/N   tilsvarende, men udskriv kun K'te af N til standard-ud\n"
 
-#: src/split.c:354
+#: src/split.c:353
 #, c-format
 msgid "output file suffixes exhausted"
 msgstr "løbet tør for endelser til udfiler"
 
-#: src/split.c:366
+#: src/split.c:365
 #, c-format
 msgid "creating file %s\n"
 msgstr "opretter filen %s\n"
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr "%s ville overskrive inddata; afbryder"
 
-#: src/split.c:391
+#: src/split.c:390
 #, c-format
 msgid "failed to set FILE environment variable"
 msgstr "kunne ikke sætte miljøvariablen FILE"
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr "kører med FILE=%s\n"
 
-#: src/split.c:395
+#: src/split.c:394
 #, c-format
 msgid "failed to create pipe"
 msgstr "kunne ikke oprette datakanal"
 
-#: src/split.c:409
+#: src/split.c:408
 #, c-format
 msgid "closing prior pipe"
 msgstr "lukker tidligere datakanal"
 
-#: src/split.c:411
+#: src/split.c:410
 #, c-format
 msgid "closing output pipe"
 msgstr "lukker uddatakanal"
 
-#: src/split.c:415
+#: src/split.c:414
 #, c-format
 msgid "moving input pipe"
 msgstr "flytter inddatakanal"
 
-#: src/split.c:417
+#: src/split.c:416
 #, c-format
 msgid "closing input pipe"
 msgstr "lukker inddatakanal"
 
-#: src/split.c:422
+#: src/split.c:421
 #, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr "kunne ikke køre kommandoen: \"%s -c %s\""
 
-#: src/split.c:428
+#: src/split.c:427
 #, c-format
 msgid "failed to close input pipe"
 msgstr "kunne ikke lukke inddatakanal"
 
-#: src/split.c:464
+#: src/split.c:463
 #, c-format
 msgid "waiting for child process"
 msgstr "venter på underproces"
 
 # Kan ikke helt regne ud om det her er rigtigt; FILE er vist en miljøvariabel og skal derfor ikke oversættes
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr "med FILE=%s, signal %s fra kommando: %s"
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr "med FILE=%s, slutstatus %d fra kommando: %s"
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr "ukendt status fra kommando (0x%X)"
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr "kan ikke opdele på mere end én måde"
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, c-format
 msgid "%s: invalid number of chunks"
 msgstr "%s: ugyldigt antal klumper"
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, c-format
 msgid "%s: invalid chunk number"
 msgstr "%s: ugyldigt klumpnummer"
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr "%s: ugyldig længde på endelse"
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr "%s: ugyldigt antal byte"
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr "%s: ugyldigt antal linjer"
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, c-format
 msgid "line count option -%s%c... is too large"
 msgstr "linjetalflaget -%s%c... er for stort"
 
-#: src/split.c:1248
+#: src/split.c:1298
 #, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr "%s: ugyldig startværdi for numerisk suffiks"
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, c-format
 msgid "%s: invalid IO block size"
 msgstr "%s: ugyldig IO-blokstørrelse"
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr "--filter behandler ikke en klump udtrukket til standard-ud"
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr "numerisk suffiksstartværdi er for stor til suffikslængden"
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, c-format
 msgid "%s: cannot determine file size"
 msgstr "%s: kan ikke bestemme filstørrelse"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr "Michael Meskes"
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, c-format
 msgid "failed to canonicalize %s"
 msgstr "kunne ikke normalisere %s"
 
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr "advarsel: ukendt undvigesekvens '\\%c'"
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, c-format
 msgid "%s: invalid directive"
 msgstr "%s: ugyldigt direktiv"
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, c-format
 msgid "warning: backslash at end of format"
 msgstr "advarsel: omvendt skråstreg ved slutningen af format"
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr ""
 "brug af %s til at angive standard-ind fungerer ikke i filsystemtilstand"
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, c-format
 msgid "cannot read file system information for %s"
 msgstr "kan ikke læse information om filsystem for %s"
 
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, c-format
 msgid "cannot stat standard input"
 msgstr "kan ikke køre stat på standard-ind"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -9824,7 +9957,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -9834,31 +9967,31 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr "Enhed: %Dt/%dd\tInode: %-10i  Lænker: %-5h Enhedstype: %t,%T\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr "Enhed: %Dt/%dd\tInode: %-10i  Lænker: %h\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr "Adgang: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, c-format
 msgid "Context: %C\n"
 msgstr "Kontekst: %C\n"
 
 # En streng andensteds har en kommentar, der angiver forskellen på modify og change.  Kan dog ikke beholde præcist de samme gloser grundet længdebegrænsninger
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -9870,28 +10003,25 @@ msgstr ""
 "Ændret: %z\n"
 "Opret.: %w\n"
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
-msgstr ""
+msgstr "Vis status for fil eller filsystem.\n"
 
-#: src/stat.c:1356
-#, fuzzy
+#: src/stat.c:1418
 msgid ""
 "  -L, --dereference     follow links\n"
 "  -f, --file-system     display file system status instead of file status\n"
 msgstr ""
-"Vis fil- eller filsystemstatus.\n"
-"\n"
 "  -L, --dereference     følg lænker\n"
 "  -f, --file-system     vis filsystemstatus fremfor filstatus\n"
 
-#: src/stat.c:1360
+#: src/stat.c:1422
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 "  -c  --format=FORMAT   brug det angivne FORMAT frem for standardformatet;\n"
@@ -9903,7 +10033,7 @@ msgstr ""
 "                          så tilføj \\n i FORMAT.\n"
 "  -t, --terse           udskriv information kortfattet\n"
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 msgid ""
 "\n"
 "The valid format sequences for files (without --file-system):\n"
@@ -9923,7 +10053,7 @@ msgstr ""
 "  %B   størrelsen i byte for hver blok rapporteret af %b\n"
 "  %C   streng for SELinux-sikkerhedskontekst\n"
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 msgid ""
 "  %d   device number in decimal\n"
 "  %D   device number in hex\n"
@@ -9939,7 +10069,7 @@ msgstr ""
 "  %g - gruppe-id på ejer\n"
 "  %G - gruppenavn på ejer\n"
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 msgid ""
 "  %h   number of hard links\n"
 "  %i   inode number\n"
@@ -9948,8 +10078,8 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 "  %h   antal hårde lænker\n"
 "  %i   inode-nummer\n"
@@ -9958,11 +10088,12 @@ msgstr ""
 "  %N   citeret filnavn med dereference hvis symbolsk lænke\n"
 "  %o   fif om optimal I/O-blokstørrelse\n"
 "  %s   samlet størrelse i byte\n"
-"  %t   underenhedstype i hex\n"
-"  %T   overenhedstype i hex\n"
+"  %t   underenhedstype i hex, for tegn-/blokenhedsspecialfiler\n"
+"  %T   overenhedstype i hex, for tegn-/blokenhedsspecialfiler\n"
 
 # Vi må hellere undgå den uklarheden i de engelske gloser (modification vs change)
-#: src/stat.c:1399
+#: src/stat.c:1461
+#, fuzzy
 msgid ""
 "  %u   user ID of owner\n"
 "  %U   user name of owner\n"
@@ -9970,10 +10101,10 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 "  %u   bruger-id på ejer\n"
@@ -9989,7 +10120,7 @@ msgstr ""
 "  %z   tidspunkt for sidste filegenskabsændring i læsevenligt format\n"
 "  %Z   tidspunkt for sidste filegenskabsændring i sekunder siden Epoken\n"
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 msgid ""
 "Valid format sequences for file systems:\n"
 "\n"
@@ -10007,7 +10138,7 @@ msgstr ""
 "  %d   frie filnoder i filsystem\n"
 "  %f   frie blokke i filsystem\n"
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 msgid ""
 "  %i   file system ID in hex\n"
 "  %l   maximum length of filenames\n"
@@ -10031,12 +10162,9 @@ msgid "Usage: %s OPTION... COMMAND\n"
 msgstr "Brug: %s FLAG... KOMMANDO\n"
 
 #: src/stdbuf.c:91
-#, fuzzy
 msgid ""
 "Run COMMAND, with modified buffering operations for its standard streams.\n"
-msgstr ""
-"Kør KOMMANDO med ændrede bufferoperationer for dens standardstrømme.\n"
-"\n"
+msgstr "Kør KOMMANDO med ændrede bufferoperationer for dens standardstrømme.\n"
 
 #: src/stdbuf.c:97
 msgid ""
@@ -10064,7 +10192,7 @@ msgid ""
 "If MODE is '0' the corresponding stream will be unbuffered.\n"
 msgstr ""
 "\n"
-"If TILSTAND er '0', vil den tilhørende strøm være uden buffer.\n"
+"Hvis TILSTAND er '0', vil den tilhørende strøm være uden buffer.\n"
 
 #: src/stdbuf.c:110
 msgid ""
@@ -10098,22 +10226,27 @@ msgstr ""
 "'stdbuf'.  Derudover bruger visse filtre (såsom 'dd' og 'cat') ikke strømme\n"
 "til I/O, og påvirkes derfor ikke af indstillingerne fra 'stdbuf'.\n"
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, c-format
 msgid "failed to find %s"
 msgstr "kunne ikke finde %s"
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, c-format
 msgid "failed to update the environment with %s"
 msgstr "kunne ikke opdatere miljøet med %s"
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr "linjebufring af stdin er meningsløst"
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, c-format
+msgid "you must specify a buffering mode option"
+msgstr "du skal angive et tilvalg til buffertilstand"
+
+#: src/stty.c:516
 #, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -10124,25 +10257,22 @@ msgstr ""
 "  eller: %s [-F ENHED | --file=ENHED] [-a|--all]\n"
 "  eller: %s [-F ENHED | --file=ENHED] [-g|--save]\n"
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
-msgstr ""
+msgstr "Udskriv eller ændr terminalegenskaber.\n"
 
-#: src/stty.c:525
-#, fuzzy
+#: src/stty.c:528
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
 "  -g, --save         print all current settings in a stty-readable form\n"
 "  -F, --file=DEVICE  open and use the specified DEVICE instead of stdin\n"
 msgstr ""
-"Udskriv eller ændr terminal-egenskaber.\n"
-"\n"
 "  -a, --all          udskriv alle nuværende indstillinger i læsevenlig form\n"
 "  -g, --save         udskriv alle nuværende indstillinger i stty-læsbar "
 "form\n"
 "  -F, --file=ENHED   åbn og brug den angivne ENHED i stedet for stdin\n"
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
@@ -10153,7 +10283,7 @@ msgstr ""
 "indstillinger som ikke følger POSIX-standarden. Det underliggende system\n"
 "definerer hvilke indstillinger som er tilgængelige.\n"
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -10167,7 +10297,7 @@ msgstr ""
 "   eof TEGN      TEGN sender et filslut (afslutter inddata)\n"
 "   eol TEGN      TEGN afslutter linjen\n"
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -10180,7 +10310,7 @@ msgstr ""
 "   kill TEGN     TEGN sletter nuværende linje\n"
 
 # SPØRGSMÅL.  Hvad handler dette 'character quoted' om?  stty formår på ingen måde at forklare det i nogen af manualsiderne.  Nogen kan måske lige skrive en forklaring og evt. rette denne streng til
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -10192,7 +10322,7 @@ msgstr ""
 " * rprnt TEGN    TEGN genskriver nuværende linje\n"
 "   start TEGN    TEGN starter udskrift igen efter at have stoppet den\n"
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -10204,7 +10334,7 @@ msgstr ""
 " * swtch TEGN    TEGN skifter til en anden skál\n"
 " * werase TEGN   TEGN sletter det senest skrevne ord\n"
 
-#: src/stty.c:562
+#: src/stty.c:565
 msgid ""
 "\n"
 "Special settings:\n"
@@ -10219,7 +10349,7 @@ msgstr ""
 " * columns N     samme som cols N\n"
 
 # http://en.wikipedia.org/wiki/Line_discipline
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -10233,7 +10363,7 @@ msgstr ""
 "læsning\n"
 "   ospeed N      sæt udskriftshastighed til N\n"
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -10247,8 +10377,7 @@ msgstr ""
 "   time N        med -icanon, sæt timeout for læsning til N tiendedels "
 "sekunder\n"
 
-#: src/stty.c:581
-#, fuzzy
+#: src/stty.c:584
 msgid ""
 "\n"
 "Control settings:\n"
@@ -10259,13 +10388,15 @@ msgid ""
 "   csN           set character size to N bits, N in [5..8]\n"
 msgstr ""
 "\n"
-" Kontrollindstillinger:\n"
+" Kontrolindstillinger:\n"
 "   [-]clocal      deaktivér signaler for modemkontrol\n"
 "   [-]cread       lad inddata blive modtaget\n"
-" * [-]crtscts     aktivér RTS-/CTS-forhandling ('handshaking')\n"
+" * [-]crtscts     aktivér RTS/CTS-forhandling ('handshaking')\n"
+" * [-]cdtrdsr     aktivér DTR/DSR-forhandling\n"
 "   csN            sæt tegnstørrelse til N bit, N i [5..8]\n"
 
-#: src/stty.c:590
+# stick, mark og space synes at være navne på bits i en eller anden sammenhæng....
+#: src/stty.c:593
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
 "   [-]hup        send a hangup signal when the last process closes the tty\n"
@@ -10273,6 +10404,7 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 "   [-]cstopb      brug to stop-bit per tegn (én med '-')\n"
 "   [-]hup         send et hangup-signal når den sidste proces lukker tty'en\n"
@@ -10281,8 +10413,9 @@ msgstr ""
 "ved\n"
 "                    læsning\n"
 "   [-]parodd      sæt ulige paritet (lige paritet med '-')\n"
+" * [-]cmspar      brug \"stick\"-paritet (\"mark\" og \"space\")\n"
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -10298,7 +10431,7 @@ msgstr ""
 "   [-]ignbrk     ignorér afbrydningstegn\n"
 "   [-]igncr      ignorér vognretur\n"
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -10313,11 +10446,11 @@ msgstr ""
 "   [-]inpck      muliggør paritetskontrol af inddata\n"
 "   [-]istrip     nulstil den høje (8.) bit i et inddatategn\n"
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr " * [-]iutf8      antag at ind-tegn er UTF-8-kodet\n"
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -10334,7 +10467,7 @@ msgstr ""
 "   [-]parmrk     markér paritetsfejl (med en 255-0 tegnsekvens)\n"
 "   [-]tandem     samme som [-]ixoff\n"
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -10350,10 +10483,11 @@ msgstr ""
 " * ffN           sideskift-forsinkelsesstil, N i [0..1]\n"
 " * nlN           linjeskift-forsinkelsesstil, N i [0..1]\n"
 
-#: src/stty.c:631
+#: src/stty.c:635
+#, fuzzy
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
@@ -10366,7 +10500,7 @@ msgstr ""
 " * [-]onlcr       transformér linjeskift til vognretur-linjeskift\n"
 " * [-]onlret      linjeskift foretager vognretur\n"
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -10382,7 +10516,7 @@ msgstr ""
 " * -tabs          samme som tab3\n"
 " * vtN            lodret tab-forsinkelsesstil, N i [0..1]\n"
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -10398,7 +10532,7 @@ msgstr ""
 " * -crtkill      dræb hele linjen ved at bruge indstillingerne\n"
 "                 for echoctl og echok\n"
 
-#: src/stty.c:654
+#: src/stty.c:658
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
 "   [-]echo       echo input characters\n"
@@ -10412,7 +10546,7 @@ msgstr ""
 "   [-]echoe      samme som [-]crterase\n"
 "   [-]echok      ekko et linjeskift efter et dræbertegn\n"
 
-#: src/stty.c:661
+#: src/stty.c:665
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
 "   [-]echonl     echo newline even if not echoing other characters\n"
@@ -10426,7 +10560,7 @@ msgstr ""
 "   [-]icanon     aktivér specialtegnene erase, kill, werase og rprnt\n"
 "   [-]iexten     aktivér specialtegn som ikke er POSIX-tegn\n"
 
-#: src/stty.c:668
+#: src/stty.c:672
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
 "   [-]noflsh     disable flushing after interrupt and quit special "
@@ -10443,7 +10577,7 @@ msgstr ""
 " * [-]xcase      sammen med icanon, brug '\\' som kontrolsekvens\n"
 "                 for store bogstaver\n"
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -10457,7 +10591,7 @@ msgstr ""
 "   cbreak        samme som -icanon\n"
 "   -cbreak       samme som icanon\n"
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -10469,7 +10603,7 @@ msgstr ""
 "   -cooked       samme som raw\n"
 "   crt           samme som echoe echoctl echoke\n"
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -10483,7 +10617,7 @@ msgstr ""
 "   ek            slette- og dræbertegn sættes til deres standardværdier\n"
 "   evenp         samme som parenb -parodd cs7\n"
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -10499,7 +10633,7 @@ msgstr ""
 "   nl            samme som -icrnl -onlcr\n"
 "   -nl           samme som icrnl -inlcr -igncr onlcr -ocrnl -onlret\n"
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -10513,7 +10647,7 @@ msgstr ""
 "   pass8         samme som -parenb -istrip cs8\n"
 "   -pass8        samme som parenb istrip cs7\n"
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -10525,7 +10659,7 @@ msgstr ""
 "                 -imaxbel -opost -isig -icanon -xcase min 1 time 0\n"
 "   -raw          samme som cooked\n"
 
-#: src/stty.c:716
+#: src/stty.c:720
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
 "                 -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n"
@@ -10541,7 +10675,7 @@ msgstr ""
 "                 -xcase -tostop -echoprt echoctl echoke, alle specialtegn\n"
 "                 sættes til deres standardværdier.\n"
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -10555,55 +10689,55 @@ msgstr ""
 "TEGN bogstaveligt eller kodet som i ^c, 0x37, 0177 eller 127; specielle\n"
 "værdier, ^- eller undef bruges for at deaktivere specielle tegn\n"
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, c-format
 msgid "only one device may be specified"
 msgstr "kun en enhed kan angives"
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
 "mutually exclusive"
 msgstr "flagene for fyldig og stty-læsbar udskrift udelukker hinanden"
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr "når en stil for uddata angives kan tilstande ikke sættes"
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr "%s: kunne ikke nulstille ikke-blokerende tilstand"
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, c-format
 msgid "invalid argument %s"
 msgstr "ugyldigt argument %s"
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, c-format
 msgid "missing argument to %s"
 msgstr "manglende argument til %s"
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, c-format
 msgid "invalid line discipline %s"
 msgstr "ugyldig linjedisciplin %s"
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr "%s: ikke i stand til at udføre alle forespurgte operationer"
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr "%s: ingen størrelsesinformation for denne enhed"
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, c-format
 msgid "invalid integer argument %s"
 msgstr "ugyldig heltalsargument %s"
@@ -10659,20 +10793,21 @@ msgstr "      --help     vis denne hjælpetekst og afslut\n"
 msgid "      --version  output version information and exit\n"
 msgstr "      --version  vis versionsinformation og afslut\n"
 
-#: src/system.h:544
-#, fuzzy
+#: src/system.h:543
 msgid ""
 "\n"
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
+"\n"
 "Obligatoriske argumenter til lange flag er også obligatoriske for de korte.\n"
 
-#: src/system.h:552
+#: src/system.h:551
+#, fuzzy
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 "\n"
 "STØRRELSE er et heltal eventuelt plus enhed (eksempel: 10M er "
@@ -10680,7 +10815,7 @@ msgstr ""
 "Enheder er K, M, G, T, P, E, Z, Y (potenser af 1024) eller KB, MB, ... \n"
 "(potenser af 1000).\n"
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -10693,37 +10828,37 @@ msgstr ""
 "eller miljøvariablerne %s_BLOCK_SIZE, BOCK_SIZE og BLOCKSIZE.  Ellers er \n"
 "enheden som standard 1024 byte (eller 512 hvis POSIXLY_CORRECT er givet).\n"
 
-#: src/system.h:571
+#: src/system.h:570
 #, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
+"%s online help: <%s>\n"
 msgstr ""
 "\n"
-"Rapportér %s-fejl til %s\n"
+"Hjælp til %s på nettet: <%s>\n"
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr "Rapportér oversættelsesfejl i %s til <dansk@dansk-gruppen.dk>\n"
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr ""
 "Den fuldstændige dokumentation fås ved at køre: info coreutils '%s "
 "invocation'\n"
 
-#: src/system.h:596
+#: src/system.h:591
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Prøv '%s --help' for mere information.\n"
 
-#: src/system.h:628
+#: src/system.h:633
 #, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -10744,14 +10879,12 @@ msgid "Jay Lepreau"
 msgstr "Jay Lepreau"
 
 #: src/tac.c:137
-#, fuzzy
 msgid ""
 "Write each FILE to standard output, last line first.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
 "Skriv hver fil til standard-ud, sidste linje først.\n"
 "Hvis ingen FIL er angivet, eller FIL er -, læses fra standard-ind.\n"
-"\n"
 
 #: src/tac.c:144
 msgid ""
@@ -10810,7 +10943,7 @@ msgid "Ian Lance Taylor"
 msgstr "Ian Lance Taylor"
 
 #: src/tail.c:262
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Print the last %d lines of each FILE to standard output.\n"
 "With more than one FILE, precede each with a header giving the file name.\n"
@@ -10819,82 +10952,72 @@ msgstr ""
 "Skriv de sidste %d linjer af hver FIL til standard-ud.\n"
 "Med mere end en FIL angivet, udskriv filnavnet før hver FIL.\n"
 "Hvis ingen FIL er angivet, eller FIL er -, læses fra standard-ind.\n"
-"\n"
 
 #: src/tail.c:270
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
-"  -c, --bytes=K            udskriv de sidste K byte; brug alternativt -c +K\n"
-"                           til at udskrive byte fra position K i hver fil\n"
+"  -c, --bytes=K            udskriv de sidste K byte, eller brug -c +K til "
+"at\n"
+"                             udskrive byte fra position K i hver fil\n"
 
 #: src/tail.c:274
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 "  -f, --follow[={navn|deskriptor}]\n"
-"                           udskriv tilføjede data efterhånden som filen\n"
-"                           vokser; -f, --follow, og --follow=deskriptor er\n"
-"                           det samme\n"
+"                           udskriv tilføjede data efterhånden som filen "
+"vokser;\n"
+"                           udeladt tilvalgsargument betyder 'descriptor'\n"
 "  -F                       det samme som --follow=navn --retry\n"
 
-#: src/tail.c:281
+#: src/tail.c:280
 #, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
 "  -n, --lines=K            udskriv sidste K linjer frem for de sidste %d, "
 "eller\n"
-"                           brug -n +K til at udskrive fra og med K'te linje\n"
+"                             brug -n +K til at udskrive fra og med K'te "
+"linje\n"
 "      --max-unchanged-stats=N\n"
 "                           med --follow=name: Genåbn en FIL som ikke har "
 "ændret\n"
-"                           størrelse efter N (forvalg %d) iterationer for at "
-"se\n"
-"                           om den er blevet aflænket eller omdøbt\n"
-"                           (dette er normalt tilfældet for roterede "
-"logfiler).\n"
-"                           Dette flag er sjældent nyttigt sammen med "
+"                             størrelse efter N (forvalg %d) iterationer for "
+"at\n"
+"                             se om den er blevet aflænket eller omdøbt "
+"(dette\n"
+"                             er normalt tilfældet for roterede logfiler).\n"
+"                             Dette flag er sjældent nyttigt sammen med "
 "inotify.\n"
 
-#: src/tail.c:294
+#: src/tail.c:293
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 "      --pid=PID            med -f, terminér efter proces med ID, PID er død\n"
 "  -q, --quiet, --silent    udskriv ikke overskrifter med filnavne\n"
-"      --retry              forsøg fortsat med at åbne en fil, selv når den "
-"er\n"
-"                             eller bliver utilgængelig; brugbar når der "
-"gives\n"
-"                             et efterfølgende navn, f.eks. med --"
-"follow=name\n"
+"      --retry              forsøg fortsat at åbne en fil hvis utilgængelig\n"
 
-#: src/tail.c:301
+#: src/tail.c:298
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 "  -s, --sleep-interval=N   med -f: sov cirka N sekunder mellem hver "
@@ -10905,7 +11028,7 @@ msgstr ""
 "                             en gang hvert N sekunder.\n"
 "  -v, --verbose            udskriv altid overskrifter med filnavne\n"
 
-#: src/tail.c:310
+#: src/tail.c:307
 msgid ""
 "\n"
 "If the first character of K (the number of bytes or lines) is a '+',\n"
@@ -10924,7 +11047,7 @@ msgstr ""
 "GB 1000*1000*1000, G 1024*1024*1024, og så videre for T, P, E, Z, Y.\n"
 "\n"
 
-#: src/tail.c:319
+#: src/tail.c:316
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
 "means that even if a tail'ed file is renamed, tail will continue to track\n"
@@ -10941,28 +11064,23 @@ msgstr ""
 "tilfælde.  Dette får 'tail' til at følge den angivne fil på en måde,\n"
 "der tillader omdøbning, sletning og oprettelse.\n"
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr "lukker %s (fd=%d)"
 
-#: src/tail.c:453
-#, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr "%s: kan ikke søge til relativt afsæt %s"
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr "%s: kan ikke søge til afsæt relativt til slutningen %s"
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr ""
 "kan ikke bestemme placeringen af %s. bruger i stedet gentagne forespørgsler"
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
@@ -10971,137 +11089,147 @@ msgstr ""
 "ukendt filsystemtype 0x%08lx for %s. rapportér venligst dette til %s. går "
 "over til gentagne forespørgsler"
 
-#: src/tail.c:963
+#: src/tail.c:965
+#, c-format
+msgid "%s has been replaced with a symbolic link. giving up on this name"
+msgstr "%s er blevet erstattet af en symbolsk lænke; giver op for dette navn"
+
+#: src/tail.c:980
 #, c-format
 msgid "%s has become inaccessible"
 msgstr "%s er blevet utilgængelig"
 
-#: src/tail.c:980
+#: src/tail.c:997
 #, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr ""
 "%s er blevet erstattet af en fil, der ikke kan køres 'tail' på; giver op for "
 "dette navn"
 
-#: src/tail.c:989
+#: src/tail.c:1006
 #, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr "%s er blevet erstattet af en fjern fil; giver op for dette navn"
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, c-format
 msgid "%s has become accessible"
 msgstr "%s er blevet tilgængelig"
 
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr "%s er dukket op.  Følger slutningen af ny fil"
 
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr "%s er blevet erstattet.  Følger slutningen af ny fil"
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr "%s: kan ikke ændre ikke-blokerende tilstand"
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr "%s: fil afkortet"
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr "ingen filer tilbage"
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, c-format
 msgid "cannot watch parent directory of %s"
 msgstr "kan ikke overvåge ophavskataloget for %s"
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, c-format
 msgid "inotify resources exhausted"
 msgstr "inotify-ressourcer opbrugt"
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, c-format
 msgid "cannot watch %s"
 msgstr "kan ikke overvåge %s"
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr "fejl ved overvågning af inotify-hændelse"
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, c-format
 msgid "error reading inotify event"
 msgstr "fejl ved læsning af inotify-hændelse"
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr ""
 "%s: kan ikke følge slutningen på denne filtype; giver op for dette navn"
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, c-format
 msgid "number in %s is too large"
 msgstr "tal i %s er for stort"
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr ""
 "%s: ugyldig maksimum antal af uændrede resultater af kald til stat() mellem "
 "kald til open()"
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr "%s: ugyldig PID"
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr "%s: ugyldigt antal sekunder"
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr "flag brugt i ugyldig kontekst -- %c"
 
-#: src/tail.c:2034
+#: src/tail.c:2096
 #, c-format
-msgid "warning: --retry is useful mainly when following by name"
-msgstr "advarsel: --retry er hovedsageligt brugbar ved følgning af navn"
+msgid "warning: --retry ignored; --retry is useful only when following"
+msgstr "advarsel: --retry ignoreres; --pid=PID er kun nyttig i følgetilstand"
 
-#: src/tail.c:2038
+#: src/tail.c:2100
+#, c-format
+msgid "warning: --retry only effective for the initial open"
+msgstr "advarsel: --retry gælder kun ved første åbning"
+
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
-msgstr "advarsel: PID ignoreret; --pid=PID er kun brugbart ved følgning"
+msgstr "advarsel: PID ignoreres; --pid=PID er kun nyttig i følgetilstand"
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr "advarsel: --pid=PID er ikke understøttet på dette system"
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, c-format
 msgid "cannot follow %s by name"
 msgstr "kan ikke følge %s ved navn"
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr "advarsel: det er ineffektivt at følge standard-ind på ubestemt tid"
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr "inotify kan ikke bruges, bruger i stedet gentagne forespørgsler"
@@ -11370,21 +11498,21 @@ msgid "extra argument %s"
 msgstr "ekstra argument %s"
 
 #: src/timeout.c:112
-#, fuzzy, c-format
+#, c-format
 msgid "warning: sigprocmask"
-msgstr "advarsel: timer_create"
+msgstr "advarsel: sigprocmask"
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr "advarsel: timer_settime"
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr "advarsel: timer_create"
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
@@ -11393,48 +11521,45 @@ msgstr ""
 "Brug:    %s [FLAG] VARIGHED KOMMANDO [ARG]...\n"
 "  eller: %s [FLAG]\n"
 
-#: src/timeout.c:229
-#, fuzzy
+#: src/timeout.c:232
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
-msgstr ""
-"Start KOMMANDO, og dræb den hvis den stadig kører efter VARIGHED.\n"
-"\n"
-"Obligatoriske argumenter til lange flag er også obligatoriske for de korte.\n"
+msgstr "Start KOMMANDO, og dræb den hvis den stadig kører efter VARIGHED.\n"
 
-#: src/timeout.c:235
-#, fuzzy
+#: src/timeout.c:238
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
+"      --preserve-status\n"
+"                 afslut med samme status som KOMMANDO, selv ved tidsudløb\n"
+"                   for kommandoen\n"
 "      --foreground\n"
 "                 Når der ikke køres timeout direkte fra en skalprompt, så\n"
-"                 tillad KOMMANDO at læse fra TTY'en og modtage TTY-"
+"                   tillad KOMMANDO at læse fra TTY'en og modtage TTY-"
 "signaler.\n"
-"                 I denne tilstand vil underprocesser af KOMMANDO ikke "
-"udløbe.\n"
+"                   I denne tilstand vil underprocesser af KOMMANDO ikke "
+"udløbe\n"
 "  -k, --kill-after=VARIGHED\n"
 "                 send også et KILL-signal hvis KOMMANDO stadig kører så\n"
-"                 længe efter udsendelsen af det oprindelige signal.\n"
+"                   længe efter udsendelsen af det oprindelige signal\n"
 "  -s, --signal=SIGNAL\n"
 "                 angiv signalet, der skal sendes ved tidsudløb.\n"
-"                 SIGNAL kan være et navn såsom 'HUP' eller et tal.\n"
-"                 Se 'kill -l' for en liste af signaler\n"
+"                   SIGNAL kan være et navn såsom 'HUP' eller et tal.\n"
+"                   Se 'kill -l' for en liste af signaler\n"
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 msgid ""
 "\n"
 "DURATION is a floating point number with an optional suffix:\n"
@@ -11446,8 +11571,7 @@ msgstr ""
 "'s' for sekunder (standard), 'm' for minutter, 'h' for timer og 'd' for "
 "dage.\n"
 
-#: src/timeout.c:259
-#, fuzzy
+#: src/timeout.c:262
 msgid ""
 "\n"
 "If the command times out, and --preserve-status is not set, then exit with\n"
@@ -11458,28 +11582,29 @@ msgid ""
 "case the exit status is 128+9 rather than 124.\n"
 msgstr ""
 "\n"
-"Hvis kommandoen overskrider tidsgrænsen, så afslut med kode 124.\n"
-"Afslut ellers med KOMMANDOs afslutningskode.  Hvis intet signal\n"
-"angives, vil TERM-signalet blive sendt når tidsgrænsen nås.\n"
-"TERM-signalet vil dræbe processer, som ikke blokerer eller fanger\n"
-"dette signal.  For andre processer kan det være nødvendigt at bruge\n"
-"KILL (9)-signalet, eftersom dette signal ikke kan fanges.  Hvis KILL\n"
-"(9)-signalet sendes, vil afslutningskoden være 128+9 frem for 124.\n"
+"Hvis kommandoen overskrider tidsgrænsen, og --preserve-status ikke er\n"
+"givet, så afslut med kode 124.  Afslut ellers med KOMMANDOs\n"
+"afslutningskode.  Hvis intet signal angives, vil TERM-signalet blive\n"
+"sendt når tidsgrænsen nås.  TERM-signalet vil dræbe processer, som\n"
+"ikke blokerer eller fanger dette signal.  Det kan\n"
+"være nødvendigt at bruge KILL (9)-signalet, eftersom dette signal ikke\n"
+"kan fanges.  Hvis KILL (9)-signalet sendes, vil afslutningskoden være\n"
+"128+9 frem for 124.\n"
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr "advarsel: deaktivering af kernedump mislykkedes"
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, c-format
 msgid "error waiting for command"
 msgstr "fejl under ventning på kommando"
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
-msgstr ""
+msgstr "kommandoen under overvågning udførte kernedump"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/touch.c:43
@@ -11507,7 +11632,6 @@ msgid "setting times of %s"
 msgstr "sætter tider for %s"
 
 #: src/touch.c:213
-#, fuzzy
 msgid ""
 "Update the access and modification times of each FILE to the current time.\n"
 "\n"
@@ -11525,7 +11649,6 @@ msgstr ""
 "\n"
 "En FIL-argumentstreng på - håndteres specielt, og får touch til at ændre\n"
 "tidspunkterne for filen associeret med standard-ud.\n"
-"\n"
 
 #: src/touch.c:225
 msgid ""
@@ -11555,7 +11678,6 @@ msgstr ""
 "  -m                     ændr kun ændringstidspunktet\n"
 
 #: src/touch.c:237
-#, fuzzy
 msgid ""
 "  -r, --reference=FILE   use this file's times instead of current time\n"
 "  -t STAMP               use [[CC]YY]MMDDhhmm[.ss] instead of current time\n"
@@ -11565,8 +11687,8 @@ msgid ""
 msgstr ""
 "  -r, --reference=FIL    brug denne fils tider frem for nuværende "
 "klokkeslæt\n"
-"  -t STEMPEL             brug MMDDttmm[[HH]ÅÅ][.ss] frem for nuværende\n"
-"                           klokkeslæt\n"
+"  -t STEMPEL             brug [[CC]ÅÅ]MMDDttmm[.ss] frem for nuværende\n"
+"                           klokkeslæt (C=århundrede)\n"
 "      --time=ORD         ændr den angivne tid:\n"
 "                           hvis ORD er access, atime eller use, gør som -a\n"
 "                           hvis ORD er mtime eller modify, gør som -m\n"
@@ -11863,7 +11985,6 @@ msgid "Usage: %s OPTION... FILE...\n"
 msgstr "Brug: %s FLAG... FIL...\n"
 
 #: src/truncate.c:97
-#, fuzzy
 msgid ""
 "Shrink or extend the size of each FILE to the specified size\n"
 "\n"
@@ -11880,7 +12001,6 @@ msgstr ""
 "Fylder en FIL mere end den angivne størrelse, vil de ekstra data gå tabt.\n"
 "Fylder en FIL mindre, vil den blive udvidet, og den udvidede del (hullet)\n"
 "sættes til nul-byte.\n"
-"\n"
 
 #: src/truncate.c:109
 msgid "  -c, --no-create        do not create any files\n"
@@ -11895,10 +12015,10 @@ msgstr ""
 #: src/truncate.c:115
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 "  -r, --reference=RFIL   basér størrelsen på RFIL\n"
-"  -s, --size=STØR        angiv eller justér filstørrelsen med STØR\n"
+"  -s, --size=STØR        angiv eller justér filstørrelsen med STØR byte\n"
 
 #: src/truncate.c:121
 msgid ""
@@ -11985,12 +12105,12 @@ msgstr ""
 "i FIL. Hvis ingen FIL eller hvis FIL er -, læses fra standard-ind.\n"
 "\n"
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr "%s: inddata indeholder et ulige antal elementer"
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr "%s: inddata indeholder en løkke:"
@@ -12057,14 +12177,12 @@ msgid "cannot get system name"
 msgstr "kan ikke finde ud af systemnavnet"
 
 #: src/unexpand.c:117
-#, fuzzy
 msgid ""
 "Convert blanks in each FILE to tabs, writing to standard output.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
 "Konvertér mellemrum i hver FIL til tabulatorer, og skriv til standard-ud.\n"
 "Uden en FIL, eller når FIL er -, læses standard-ind.\n"
-"\n"
 
 #: src/unexpand.c:124
 msgid ""
@@ -12092,13 +12210,12 @@ msgstr "tabulatorer er for vidt adskilt"
 msgid "tab stop value is too large"
 msgstr "tabulatorstopværdien er for stor"
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr "Brug: %s [FLAG]... [INDDATA [UDDATA]]\n"
 
-#: src/uniq.c:138
-#, fuzzy
+#: src/uniq.c:174
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
 "writing to OUTPUT (or standard output).\n"
@@ -12110,42 +12227,57 @@ msgstr ""
 "og skriv til UDATA (eller standard-ud).\n"
 "\n"
 "Uden flag vil identiske linjer reduceres til første forekomst.\n"
-"\n"
 
-#: src/uniq.c:147
+#: src/uniq.c:183
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
 msgstr ""
 "  -c, --count           begynd linjer med antal forekomster\n"
-"  -d, --repeated        udskriv kun linjer der er flere af\n"
+"  -d, --repeated        udskriv kun linjer der er flere af, en for hver "
+"gruppe\n"
+
+#: src/uniq.c:187
+msgid ""
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
+msgstr ""
+"  -D, --all-repeated[=METODE]  udskriv alle gentagne linjer\n"
+"                          grupper kan adskilles med en tom linje\n"
+"                          METODE={none(standard),prepend,separate}\n"
+
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr "  -f, --skip-fields=N   undgå at sammenligne de første N felter\n"
 
-#: src/uniq.c:151
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
+msgstr ""
+"      --group[=METODE]  vis alle elementer; grupper adskilles med en tom "
+"linje\n"
+"                          METODE={separate(standard),prepend,append,both}\n"
+
+#: src/uniq.c:199
+#, fuzzy
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
 "  -i, --ignore-case     ignore differences in case when comparing\n"
 "  -s, --skip-chars=N    avoid comparing the first N characters\n"
 "  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
 msgstr ""
-"  -D, --all-repeated[=adskillelses-metode]   udskriv alle gentagne linjer\n"
-"                        adskillelses-metode={none(forvalgt),prepend,"
-"separate}\n"
-"                        Adskillelse gøres med blanke linjer\n"
-"  -f, --skip-fields=N   sammenlign ikke de første N felter\n"
 "  -i, --ignore-case     ignorér forskelle med store og små bogstaver\n"
 "  -s, --skip-chars=N    sammenlign ikke de første N tegn\n"
 "  -u, --unique          udskriv kun unikke linjer\n"
 "  -z, --zero-terminated  afslut linjer med 0-byte frem for linjeskift\n"
 
-#: src/uniq.c:161
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr "  -w, --check-chars=N   sammenlign ikke mere end N tegn per linje\n"
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 msgid ""
 "\n"
 "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n"
@@ -12156,7 +12288,7 @@ msgstr ""
 "tabulatorer),\n"
 "fulgt af ikke-blanke tegn.  Felter hoppes over før tegn.\n"
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 msgid ""
 "\n"
 "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n"
@@ -12170,24 +12302,34 @@ msgstr ""
 "'sort -u' uden 'uniq'.  I øvrigt følger sammenligninger reglerne angivet\n"
 "af 'LC_COLLATE'.\n"
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, c-format
 msgid "too many repeated lines"
 msgstr "for mange gentagne linjer"
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
 msgstr "ugyldigt antal felter at hoppe over"
 
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
 msgstr "ugyldigt antal byte at hoppe over"
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
 msgstr "ugyldigt antal byte at sammenligne"
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr "--group udelukker gensidigt -c/-d/-D/-u"
+
+#: src/uniq.c:652
+#, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr "gruppering og udskrivning af gentagelsesantal giver ikke mening"
+
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr ""
@@ -12210,11 +12352,6 @@ msgstr ""
 "Kald funktionen unlink for at fjerne angivet FIL.\n"
 "\n"
 
-#: src/unlink.c:86
-#, c-format
-msgid "cannot unlink %s"
-msgstr "kan ikke aflænke %s"
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -12244,9 +12381,9 @@ msgstr[0] "oppe %ld dag %2d:%02d,  "
 msgstr[1] "oppe %ld dage %2d:%02d,  "
 
 #: src/uptime.c:149
-#, fuzzy, c-format
+#, c-format
 msgid "up  %2d:%02d,  "
-msgstr "oppe %ld dag %2d:%02d,  "
+msgstr "oppe  %2d:%02d,  "
 
 #: src/uptime.c:151
 #, c-format
@@ -12260,7 +12397,7 @@ msgstr[1] "%lu brugere"
 msgid ",  load average: %.2f"
 msgstr ",  belastningennemsnit: %.2f"
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -12271,7 +12408,7 @@ msgstr ""
 "antal brugere på systemet, og det gennemsnitlige antal opgaver\n"
 "i kørselskøen for de seneste 1, 5 og 15 minutter."
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
@@ -12280,12 +12417,12 @@ msgstr ""
 "  Processer i\n"
 "uafbrydelig sovetilstand bidrager også til belastningsmiddeltallet.\n"
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr "\n"
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
@@ -12523,114 +12660,158 @@ msgstr ""
 "Skriv gentagne gange en linje med alle specificerede STRENGe, eller 'y'\n"
 "\n"
 
-#~ msgid "using single-precision arithmetic"
-#~ msgstr "regner med enkeltpræcision"
+#~ msgid "cannot create pipe"
+#~ msgstr "kan ikke oprette datakanal"
 
-#~ msgid "using arbitrary-precision arithmetic"
-#~ msgstr "regner med arbitrær præcision"
+#~ msgid "%s subprocess failed"
+#~ msgstr "%s: underproces fejlede"
 
-#, fuzzy
-#~ msgid "  returning value: '%s'\n"
-#~ msgstr "opretter filen %s\n"
+#~ msgid "_open_osfhandle failed"
+#~ msgstr "_open_osfhandle mislykkedes"
 
-#, fuzzy
-#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n"
-#~ msgstr "Brug: %s [FLAG] NAVN...\n"
+#~ msgid "cannot restore fd %d: dup2 failed"
+#~ msgstr "kan ikke gendanne fd %d: dup2 mislykkedes"
 
-#, fuzzy
-#~ msgid "no valid suffix found\n"
-#~ msgstr "%s: ugyldig længde på endelse"
+#~ msgid "%s subprocess"
+#~ msgstr "%s-underproces"
+
+#~ msgid "%s subprocess got fatal signal %d"
+#~ msgstr "%s-underproces fik fatalt signal %d"
+
+#~ msgid "failed to set additional groups"
+#~ msgstr "kunne ikke sætte yderligere grupper"
 
-#~ msgid "reading %s"
-#~ msgstr "læser %s"
+#~ msgid "mount point %s already traversed"
+#~ msgstr "monteringspunkt %s allerede besøgt"
 
-#~ msgid "writing %s"
-#~ msgstr "skriver %s"
+#~ msgid "%s: cannot lseek back to original position"
+#~ msgstr "%s: kan ikke søge (lseek) tilbage til oprindelige position"
+
+#~ msgid "%s: failed to reset file pointer"
+#~ msgstr "%s: kunne ikke nulstille filmarkør"
+
+#~ msgid "cannot reposition file pointer for %s"
+#~ msgstr "kan ikke flytte filpegeren for %s"
+
+#~ msgid ""
+#~ "  -Z, --context[=CTX]  set the SELinux security context of each NAME to\n"
+#~ "                         default type, or CTX if specified\n"
+#~ msgstr ""
+#~ "  -Z, --context=[KONT]  sæt SELinux-sikkerhedskontekst for hvert NAVN "
+#~ "til\n"
+#~ "                          standardtypen eller KONT hvis givet\n"
 
-#~ msgid "closing %s"
-#~ msgstr "lukker %s"
+#~ msgid ""
+#~ "  -Z, --context[=CTX]  set the SELinux security context of NAME to\n"
+#~ "                         default type, or to CTX if specified\n"
+#~ msgstr ""
+#~ "  -Z, --context[=KONT]  sæt SELinux-sikkerhedskontekst for NAVN til\n"
+#~ "                         standardtypen, eller KONT hvis givet\n"
 
-#~ msgid "accessing %s"
-#~ msgstr "tilgår %s"
+#~ msgid "out of memory (requested %zu bytes)"
+#~ msgstr "løbet tør for hukommelse (der blev forespurgt om %zu byte)"
 
-#~ msgid "opening %s"
-#~ msgstr "Ã¥bner %s"
+#~ msgid "--padding cannot be combined with --format"
+#~ msgstr "--padding kan ikke kombineres med --format"
 
 #~ msgid ""
-#~ "  -x, --one-file-system    skip directories on different file systems\n"
-#~ "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
-#~ "      --exclude=PATTERN    exclude files that match PATTERN\n"
-#~ "  -d, --max-depth=N     print the total for a directory (or file, with --"
-#~ "all)\n"
-#~ "                          only if it is N or fewer levels below the "
-#~ "command\n"
-#~ "                          line argument;  --max-depth=0 is the same as\n"
-#~ "                          --summarize\n"
+#~ "Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
+#~ "  or:  %s LONG-OPTION\n"
 #~ msgstr ""
-#~ "  -x, --one-file-system    udelad kataloger på andre filsystemer\n"
-#~ "  -X, --exclude-from=FIL   udelad filer som svarer til et hvilket som\n"
-#~ "                             helst mønster i FIL.\n"
-#~ "      --exclude=MØNSTER    udelad filer som svarer til MØNSTER\n"
-#~ "  -d, --max-depth=N     vis kun totalsum for et katalog (eller fil, med --"
-#~ "all)\n"
-#~ "                        hvis der er N eller færre niveauer under "
-#~ "kommandolinje-\n"
-#~ "                        argumentet;  --max-depth=0 er det samme som\n"
-#~ "                        --summarize\n"
+#~ "Brug:    %s [KORT-FLAG]... BRUGER KOMMANDO [ARGUMENT]...\n"
+#~ "  eller: %s LANGT-FLAG\n"
 
 #~ msgid ""
-#~ "  none, off       never make backups (even if --backup is given)\n"
-#~ "  numbered, t     make numbered backups\n"
-#~ "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
-#~ "  simple, never   always make simple backups\n"
+#~ "Drop any supplemental groups, assume the user-ID and group-ID of the "
+#~ "specified\n"
+#~ "USER (numeric ID or user name), and run COMMAND with any specified "
+#~ "ARGUMENTs.\n"
+#~ "Exit with status 111 if unable to assume the required user and group ID.\n"
+#~ "Otherwise, exit with the exit status of COMMAND.\n"
+#~ "This program is useful only when run by root (user ID zero).\n"
 #~ "\n"
 #~ msgstr ""
-#~ "  none, off       lav aldrig sikkerhedskopier (selvom --backup er givet)\n"
-#~ "  numbered, t     lav nummererede sikkerhedskopier\n"
-#~ "  existing, nil   nummererede, hvis nummererede sikkerhedskopier "
-#~ "eksisterer,\n"
-#~ "                  ellers enkle sikkerhedskopier\n"
-#~ "  simple, never   lav altid enkle sikkerhedskopier\n"
+#~ "Smid eventuelle supplerende grupper væk, antag bruger-ID og gruppe-ID for "
+#~ "den\n"
+#~ "angivne BRUGER (numerisk ID eller brugernavn), og kør KOMMANDO med "
+#~ "eventuelle\n"
+#~ "angivne ARGUMENTer.  Afslut med status 111 hvis det ikke er muligt at "
+#~ "antage\n"
+#~ "den krævede bruger- og gruppe-ID.  Afslut ellers med afslutningskode for\n"
+#~ "KOMMANDO.  Dette program er kun nyttigt, når det køres som root (bruger-"
+#~ "ID 0).\n"
+#~ "\n"
 
 #~ msgid ""
-#~ "WARNING: --page-increment is deprecated; use --line-increment instead"
+#~ "  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, "
+#~ "and\n"
+#~ "                      (if specified) supplemental group IDs to GID1, ...\n"
+#~ msgstr ""
+#~ "  -g GID[,GID1...]  sæt også primær gruppe-ID til den numeriske GID, og\n"
+#~ "                      (hvis angivet) supplerende gruppe-ID'er til "
+#~ "GID1, ...\n"
+
+#~ msgid "unknown user-ID: %s"
+#~ msgstr "ukendt bruger-ID: %s"
+
+#~ msgid "to use user-ID %s you need to use -g too"
+#~ msgstr "du skal yderligere angive -g hvis du vil anvende bruger-ID %s"
+
+#~ msgid "cannot set group-ID to %lu"
+#~ msgstr "kan ikke sætte gruppe-ID til %lu"
+
+#~ msgid "cannot set user-ID to %lu"
+#~ msgstr "kan ikke sætte bruger-ID til %lu"
+
+#~ msgid "failed to get file system create context"
+#~ msgstr "kunne ikke hente filsystemets oprettelseskontekst"
+
+#~ msgid "warning: "
+#~ msgstr "advarsel: "
+
+#~ msgid "long option '--megabytes' is deprecated and will soon be removed"
 #~ msgstr ""
-#~ "ADVARSEL: --page-increment er forældet; brug --line-increment i stedet"
+#~ "det lange tilvalg '--megabytes' er forældet og vil snart blive fjernet"
 
-#~ msgid "All arguments to long options are mandatory for short options.\n"
+#~ msgid "Usage: %s [OPTION]... [USERNAME]\n"
+#~ msgstr "Brug: %s [FLAG]... [BRUGERNAVN]\n"
+
+#~ msgid ""
+#~ "      --strict         with --check, exit non-zero for any invalid input\n"
 #~ msgstr ""
-#~ "Alle argumenter til lange flag er obligatoriske for de korte flag.\n"
+#~ "      --strict         afslut med status forskellig fra nul ved ugyldigt "
+#~ "input\n"
+#~ "                         sammen med --check\n"
+
+#~ msgid "failed to redirect stderr to /dev/null"
+#~ msgstr "kunne ikke omdirigere stderr til /dev/null"
+
+#~ msgid "invalid number: '%s'"
+#~ msgstr "ugyldigt tal: '%s'"
 
-# (TYPE er skrevet med stort med vilje)
 #~ msgid ""
 #~ "\n"
-#~ "RADIX is d for decimal, o for octal, x for hexadecimal or n for none.\n"
-#~ "BYTES is hexadecimal with 0x or 0X prefix, and may have a multiplier "
-#~ "suffix:\n"
-#~ "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
-#~ "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n"
-#~ "Adding a z suffix to any type displays printable characters at the end of "
-#~ "each\n"
-#~ "output line.\n"
+#~ "With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
 #~ msgstr ""
 #~ "\n"
-#~ "RADIX er d for decimal, o for oktal, x for hexadecimal eller n for "
-#~ "ingen.\n"
-#~ "BYTE er hexadecimal med 0x- eller 0X-præfiks, og kan have et "
-#~ "multiplikativt\n"
-#~ "suffiks: \"b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024, \n"
-#~ "GB 1000*1000*1000, G 1024*1024*1024 og så videre for T, P, E, Z, Y.\n"
-#~ "Tilføjes suffikset z til TYPE, vil skrivbare tegn blive vist ved "
-#~ "slutningen \n"
-#~ "af hver linje af udskriften.\n"
+#~ "Ved ingen FIL eller hvis FIL er -, læses fra standard-ind. '-F /' er "
+#~ "forvalgt.\n"
+
+#~ msgid "cannot remove directory: %s"
+#~ msgstr "kan ikke fjerne katalog: %s"
+
+#~ msgid "dup2 failed"
+#~ msgstr "fejl ved dup2"
+
+#~ msgid "couldn't execute %s"
+#~ msgstr "kunne ikke eksekvere %s"
+
+#~ msgid "couldn't execute %s -d"
+#~ msgstr "kunne ikke eksekvere %s -d"
 
 #~ msgid ""
-#~ "Option --string without a number implies 3; option --width without a "
-#~ "number\n"
-#~ "implies 32.  By default, od uses -A o -t oS -w16.\n"
+#~ "\n"
+#~ "Report %s bugs to %s\n"
 #~ msgstr ""
-#~ "Flaget --string uden et tal implicerer 3. Flaget --width uden et tal\n"
-#~ "implicerer 32.  Normalt bruger od: -A o -t oS -w16.\n"
-
-#~ msgid "Usage: %s [OPTION]... FILE\n"
-#~ msgstr "Brug: %s [FLAG]... [FIL]\n"
+#~ "\n"
+#~ "Rapportér %s-fejl til %s\n"
diff --git a/po/de.gmo b/po/de.gmo
index 19419dc3..c02c7589 100644
--- a/po/de.gmo
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index 5e826ddb..2f38d015 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,5 +1,5 @@
 # Deutsche Übersetzungen für Meldungen der Coreutils.
-# Copyright © 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright © 2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
 # This file is distributed under the same license as the coreutils package.
 #
 # The first 200+ lines are translations for the lib directory. This is very
@@ -35,13 +35,13 @@
 # Lutz Behnke <lutz.behnke@gmx.de>, 1996, 1997, 1998, 1999, 2000, 2001.
 # Michael Schmidt <michael@guug.de>, 1996, 1997, 1998, 1999, 2000.
 # Michael Piefel <piefel@informatik.hu-berlin.de>, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011.
-# Philipp Thomas <pth@suse.de>, 2010, 2011, 2012, 2013.
+# Philipp Thomas <pth@suse.de>, 2010, 2011, 2012, 2013, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU coreutils-8.20-pre3\n"
+"Project-Id-Version: GNU coreutils-8.23-pre1\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
-"PO-Revision-Date: 2013-02-12 15:51+0100\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
+"PO-Revision-Date: 2014-07-15 18:45+0200\n"
 "Last-Translator: Philipp Thomas <pth@suse.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
 "Language: de\n"
@@ -69,76 +69,119 @@ msgstr "Gültige Argumente sind:"
 msgid "error closing file"
 msgstr "Fehler beim Schließen der Datei"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "Schreibfehler"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "Erhalten der Zugriffsrechte für %s"
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "Unbekannter Systemfehler"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "reguläre leere Datei"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "reguläre Datei"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "Verzeichnis"
 
-#: lib/file-type.c:44
-msgid "block special file"
-msgstr "blockorientierte Spezialdatei"
-
-#: lib/file-type.c:47
-msgid "character special file"
-msgstr "zeichenorientierte Spezialdatei"
-
-#: lib/file-type.c:50
-msgid "fifo"
-msgstr "FIFO"
-
-#: lib/file-type.c:53
+#: lib/file-type.c:46
 msgid "symbolic link"
 msgstr "symbolische Verknüpfung"
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "Socket"
-
-#: lib/file-type.c:59
+#: lib/file-type.c:52
 msgid "message queue"
 msgstr "Nachrichtenwarteschlange"
 
-#: lib/file-type.c:62
+#: lib/file-type.c:55
 msgid "semaphore"
 msgstr "Semaphor"
 
-#: lib/file-type.c:65
+#: lib/file-type.c:58
 msgid "shared memory object"
 msgstr "Objekt gemeinsamen Speichers"
 
-#: lib/file-type.c:68
+#: lib/file-type.c:61
 msgid "typed memory object"
 msgstr "Objekt getypten Speichers"
 
-#: lib/file-type.c:70
+#: lib/file-type.c:66
+msgid "block special file"
+msgstr "blockorientierte Spezialdatei"
+
+#: lib/file-type.c:69
+msgid "character special file"
+msgstr "zeichenorientierte Spezialdatei"
+
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr "zusammenhängende Daten"
+
+#: lib/file-type.c:75
+msgid "fifo"
+msgstr "FIFO"
+
+#: lib/file-type.c:78
+msgid "door"
+msgstr "Tür"
+
+#: lib/file-type.c:81
+msgid "multiplexed block special file"
+msgstr "gemultiplexte blockorientierte Spezialdatei"
+
+#: lib/file-type.c:84
+msgid "multiplexed character special file"
+msgstr "gemultiplexte zeichenorientierte Spezialdatei"
+
+#: lib/file-type.c:87
+msgid "multiplexed file"
+msgstr "gemultiplexte Datei"
+
+#: lib/file-type.c:90
+msgid "named file"
+msgstr "benannte Datei"
+
+#: lib/file-type.c:93
+msgid "network special file"
+msgstr "netzwerkorientierte Spezialdatei"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr "migrierte Datei mit Daten"
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr "migrierte Datei ohne Daten"
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr "Port"
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "Socket"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr "verdecken"
+
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "merkwürdige Datei"
 
@@ -273,18 +316,18 @@ msgstr "%s: die Option „-W %s“ erlaubt kein Argument\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: die Option „-W %s“ erfordert ein Argument\n"
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr "die Zugriffsrechte von %s können nicht geändert werden"
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "das Verzeichnis %s kann nicht angelegt werden"
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr "der Speicher ist ausgeschöpft"
@@ -401,7 +444,7 @@ msgstr "Der reguläre Ausdruck ist zu groß"
 msgid "Unmatched ) or \\)"
 msgstr "Kein Gegenstück für ) oder \\)"
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 msgid "No previous regular expression"
 msgstr "Kein vorhergehender regulärer Ausdruck"
 
@@ -427,7 +470,7 @@ msgstr ""
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[jJyY]"
 
@@ -437,11 +480,11 @@ msgstr "^[jJyY]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, c-format
 msgid "setting permissions for %s"
 msgstr "Setzen der Zugriffsrechte für %s"
@@ -582,18 +625,6 @@ msgstr "Stromausfall"
 msgid "Resource lost"
 msgstr "Resource verloren"
 
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, c-format
-msgid "cannot create pipe"
-msgstr "Erzeugen der Pipeline nicht möglich"
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, c-format
-msgid "%s subprocess failed"
-msgstr "Subprozess %s ist fehlgeschlagen"
-
 #: lib/strsignal.c:114
 #, c-format
 msgid "Real-time signal %d"
@@ -804,7 +835,7 @@ msgstr ""
 msgid "Report %s bugs to: %s\n"
 msgstr "Melden Sie Programmfehler für %s (auf Englisch, mit LC_ALL=C) an %s\n"
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s Homepage: <%s>\n"
@@ -814,32 +845,12 @@ msgstr "%s Homepage: <%s>\n"
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr "Homepage für %s: <http://www.gnu.org/software/%s/>\n"
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr ""
 "Allgemeine Hilfe zur Benutzung von GNU-Software: <http://www.gnu.org/gethelp/"
 ">\n"
 
-#: lib/w32spawn.h:43
-#, c-format
-msgid "_open_osfhandle failed"
-msgstr "_open_osfhandle ist fehlgeschlagen"
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr "Fd %d kann nicht wiederhergestellt werden: dup2 ist fehlgeschlagen"
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr "Subprozess %s"
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr "Subprozess „%s“ erhielt fatales Signal %d"
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr "Standardeingabe"
@@ -861,7 +872,7 @@ msgstr "Unbekannter Stream"
 msgid "failed to reopen %s with mode %s"
 msgstr "%s konnte nicht erneut im Modus %s geöffnet werden"
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr "Zeichenkettenvergleich fehlgeschlagen"
@@ -921,16 +932,17 @@ msgid ""
 "                          Use 0 to disable line wrapping\n"
 "\n"
 msgstr ""
-"  -d, --decode                Daten dekodieren\n"
-"  -i, --ignore-garbage   nicht-alphabetische Zeichen werden beim Dekodieren "
-"ignoriert\n"
-"  -w, --wrap=SPALTEN  bricht kodierte Zeilen nach SPALTEN Zeichen um "
-"(Vorgabe sind 76).\n"
-"                                         Verwenden Sie 0 um jeglichen "
-"Zeilenumbruch zu verhindern\n"
+"  -d, --decode          Daten dekodieren\n"
+"  -i, --ignore-garbage  nicht-alphabetische Zeichen werden beim Dekodieren\n"
+"                          ignoriert\n"
+"  -w, --wrap=SPALTEN    bricht kodierte Zeilen nach SPALTEN Zeichen um "
+"(Vorgabe\n"
+"                          sind 76).\n"
+"                        Verwenden Sie 0 um jeglichen Zeilenumbruch zu\n"
+"                          verhindern\n"
 "\n"
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -954,48 +966,47 @@ msgstr ""
 "gehörende\n"
 "Zeichen in der kodierten Eingabe zu verkraften.\n"
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "Lesefehler"
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, c-format
 msgid "invalid input"
 msgstr "ungültige Eingabe"
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, c-format
 msgid "invalid wrap size: %s"
 msgstr "ungültige Umbruchgröße: %s"
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, c-format
 msgid "extra operand %s"
 msgstr "zusätzlicher Operand %s"
 
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, c-format
 msgid "closing standard input"
 msgstr "schließe Standardeingabe"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -1025,11 +1036,11 @@ msgstr ""
 #: src/basename.c:60
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
 "  -a, --multiple       mehrere Argumente werden unterstützt, wobei jedes\n"
-"                       einzelne als NAME behandelt wird.\n"
+"                         einzelne als NAME behandelt wird.\n"
 "  -s, --suffix=ENDUNG  ENDUNG wird entfernt\n"
 "  -z, --zero           Die Ausgabe wird mit NULL statt Zeilenumbruch "
 "beendet\n"
@@ -1051,32 +1062,31 @@ msgstr ""
 "  %s -s .h include/stdio.h  -> \"stdio\"\n"
 "  %s -a any/str1 any/str2   -> \"str1\" gefolgt von \"str2\"\n"
 
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, c-format
 msgid "missing operand"
 msgstr "fehlender Operand"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr "Torbjörn Granlund"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 msgid "Richard M. Stallman"
 msgstr "Richard M. Stallman"
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1134,7 +1144,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr "Anwendung von ioctl auf „%s“ ist nicht möglich"
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr "Standardausgabe"
@@ -1151,14 +1161,14 @@ msgstr "Russell Coker"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 msgid "Jim Meyering"
 msgstr "Jim Meyering"
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, c-format
 msgid "failed to create security context: %s"
 msgstr "der Sicherheitskontext konnte nicht erstellt werden: %s"
@@ -1168,8 +1178,8 @@ msgstr "der Sicherheitskontext konnte nicht erstellt werden: %s"
 msgid "failed to set %s security context component to %s"
 msgstr "die %s-Sicherheitskontextkomponente konnte nicht auf %s gesetzt werden"
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, c-format
 msgid "failed to get security context of %s"
 msgstr "der Sicherheitskontext von %s konnte nicht ermittelt werden"
@@ -1181,18 +1191,18 @@ msgstr ""
 "der unvollständige Kontext kann nicht auf Datei %s ohne Label angewendt "
 "werden"
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, c-format
 msgid "failed to change context of %s to %s"
 msgstr "der Kontext von %s konnte nicht in %s geändert werden"
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
 msgstr "Zugriff auf %s nicht möglich"
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, c-format
 msgid "cannot read directory %s"
 msgstr "das Verzeichnis %s kann nicht gelesen werden"
@@ -1202,13 +1212,14 @@ msgstr "das Verzeichnis %s kann nicht gelesen werden"
 msgid "changing security context of %s\n"
 msgstr "der Sicherheitskontext von %s wird geändert\n"
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, c-format
 msgid "fts_read failed"
 msgstr "fts_read fehlgeschlagen"
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, c-format
 msgid "fts_close failed"
 msgstr "fts_close scheiterte"
@@ -1227,12 +1238,12 @@ msgstr ""
 
 #: src/chcon.c:357
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
 "Ändern des Sicherheitskontextes jeder DATEI nach KONTEXT.\n"
-"Mit --reference: Ändern des Sicherheitskontextes jeder DATEI auf die von "
+"Mit --reference: Ändern des Sicherheitskontextes jeder DATEI auf den von "
 "RDATEI.\n"
 "\n"
 
@@ -1245,10 +1256,10 @@ msgid ""
 msgstr ""
 "      --dereference      ändert jede Datei, auf die die symbolische "
 "Verknüpfung\n"
-"                         verweist (Vorgabe), statt der symbolischen "
+"                           verweist (Vorgabe), statt der symbolischen "
 "Verknüpfung\n"
 "  -h, --no-dereference   symbolische Verknüpfung anstatt der referenzierten\n"
-"                         Datei ändern\n"
+"                           Datei ändern\n"
 
 #: src/chcon.c:369
 msgid ""
@@ -1263,7 +1274,7 @@ msgstr ""
 "  -l, --range=BEREICH    BEREICH im Ziel-Sicherheitskontext setzen\n"
 "\n"
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
 "      --preserve-root    fail to operate recursively on '/'\n"
@@ -1319,36 +1330,37 @@ msgstr ""
 "                           (Voreinstellung)\n"
 "\n"
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr "-R --dereference erfordert entweder -H oder -L"
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr "-R -h erfordert -P"
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, c-format
 msgid "missing operand after %s"
 msgstr "fehlender Operand nach %s"
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, c-format
 msgid "invalid context: %s"
 msgstr "ungültiger Kontext: %s"
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr "widersprüchliche Sicherheitskontext-Angaben"
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, c-format
 msgid "failed to get attributes of %s"
 msgstr "konnte Attribute von %s nicht holen"
@@ -1377,17 +1389,17 @@ msgstr ""
 "Mit --reference: Ändert die Gruppe jeder DATEI auf die von RDATEI.\n"
 "\n"
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
 "  -v, --verbose          output a diagnostic for every file processed\n"
 msgstr ""
-"  -c, --changes          wie verbose aber nur Berichten, wenn Änderungen "
-"erfolgen\n"
+"  -c, --changes          wie verbose aber nur berichten, wenn Änderungen\n"
+"                           erfolgen\n"
 "  -f, --silent, --quiet  unterdrückt die meisten Fehlermeldungen\n"
-"  -v, --verbose          Es wird eine Meldung für jede verarbeitete Datei "
-"ausgegeben\n"
+"  -v, --verbose          Es wird eine Meldung für jede verarbeitete Datei\n"
+"                           ausgegeben\n"
 
 #: src/chgrp.c:128 src/chown.c:99
 msgid ""
@@ -1395,7 +1407,7 @@ msgid ""
 "                         ownership of a symlink)\n"
 msgstr ""
 "                         (Nützlich auf Systemen, die für symbolische\n"
-"                          Verknüpfungen die Besitzer ändern können.)\n"
+"                           Verknüpfungen die Besitzer ändern können.)\n"
 
 #: src/chgrp.c:136
 msgid ""
@@ -1403,7 +1415,7 @@ msgid ""
 "                         GROUP value\n"
 msgstr ""
 "      --reference=RDATEI benutzt die Gruppe von RDATEI statt einer direkt\n"
-"                         angegebenen GRUPPE\n"
+"                           angegebenen GRUPPE\n"
 
 #: src/chgrp.c:158
 #, c-format
@@ -1416,55 +1428,56 @@ msgstr ""
 "\n"
 "Beispiele:\n"
 "  %s staff /u      Ändert die Gruppe von /u zu „staff“.\n"
-"  %s -hR staff /u  Ändert die Gruppe von /u und enthaltener Dateien zu "
-"„staff“.\n"
+"  %s -hR staff /u  Ändert die Gruppe von /u und enthaltener Dateien zu\n"
+"                     „staff“.\n"
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
 msgstr "Beim Holen der neuen Attribute von %s"
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr ""
-"Weder die symbolische Verknüpfung %s, noch die referenzierte Datei wurden "
-"verändert.\n"
+"Weder die symbolische Verknüpfung %s, noch die referenzierte Datei wurden\n"
+"  verändert.\n"
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr "der Modus von %s wurde von %04lo (%s) in %04lo (%s) geändert\n"
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr ""
-"Änderung des Modus von %s von %04lo (%s) nach %04lo (%s) ist fehlgeschlagen\n"
+"Das Ändern des Modus von %s von %04lo (%s) nach %04lo (%s) ist "
+"fehlgeschlagen\n"
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr "Modus von %s als %04lo (%s) erhalten\n"
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr ""
-"auf der ins Leere weisenden symbolischen Verknüpfung %s kann nicht "
+"mit der ins Leere weisenden symbolischen Verknüpfung %s kann nicht\n"
 "gearbeitet werden"
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, c-format
 msgid "changing permissions of %s"
 msgstr "Beim Setzen der Zugriffsrechte für %s"
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr "%s: die neuen Zugriffsrechte sind %s, nicht %s"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1475,7 +1488,7 @@ msgstr ""
 " oder:  %s [OPTION]... OKTAL�MODUS DATEI...\n"
 " oder:  %s [OPTION]... --reference=RDATEI DATEI...\n"
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 msgid ""
 "Change the mode of each FILE to MODE.\n"
 "With --reference, change the mode of each FILE to that of RFILE.\n"
@@ -1485,17 +1498,17 @@ msgstr ""
 "Mit --reference: Ändert den Modus jeder DATEI auf den von RDATEI.\n"
 "\n"
 
-#: src/chmod.c:391
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
 "      --reference=RDATEI verwendet den Modus von RDATEI statt des\n"
 "                               angegebenen MODUS\n"
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr "  -R, --recursive        Dateien und Verzeichnisse rekursiv ändern\n"
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 msgid ""
 "\n"
 "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n"
@@ -1503,12 +1516,12 @@ msgstr ""
 "\n"
 "Jeder MODUS hat die Form „[ugoa]*([-+=]([rwxXst]*|[ugo]))+“.\n"
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr "Modus� und Referenz�Optionen können nicht kombiniert werden."
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, c-format
 msgid "invalid mode: %s"
 msgstr "Ungültiger Modus: %s"
@@ -1620,9 +1633,8 @@ msgstr ""
 "                            nur wenn der momentane Eigentümer und/oder die\n"
 "                            Gruppe der angegebenen entsprechen. Eine von "
 "beiden\n"
-"                            kann weggelassen werden, woraufhin "
-"eine                             Ãœbereinstimmung des weggelassenen "
-"Attributs\n"
+"                            kann weggelassen werden, woraufhin eine\n"
+"                            Ãœbereinstimmung des weggelassenen Attributs\n"
 "                            nicht notwendig ist.\n"
 
 #: src/chown.c:114
@@ -1665,26 +1677,21 @@ msgstr ""
 "                      Dateien auf „root“.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr "Roland McGrath"
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr "ungültige Gruppe %s"
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, c-format
 msgid "invalid group list %s"
 msgstr "ungültige Gruppenliste %s"
 
-#: src/chroot.c:117
-#, c-format
-msgid "failed to set additional groups"
-msgstr "es konnten keine zusätzlichen Gruppen gesetzt werden"
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
@@ -1693,7 +1700,7 @@ msgstr ""
 "Aufruf: %s [OPTION] NEUEWURZEL [BEFEHL [ARGUMENT]...]\n"
 "  oder: %s OPTION\n"
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
@@ -1701,17 +1708,16 @@ msgstr ""
 "BEFEHL ausführen, wobei das Wurzelverzeichnis auf NEUEWURZEL gesetzt wird.\n"
 "\n"
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
 msgstr ""
-"  --userspec=BENUTZER:GRUPPE  Angabe des zu verwenden Benutzers und Gruppe "
-"(ID oder Name)\n"
-"  --groups=G_LISTE                             zus\"atzliche Gruppen in der "
-"Form g1,g2,..,gN\n"
+"  --userspec=BENUTZER:GRUPPE  Angabe des zu verwenden Benutzers und Gruppe\n"
+"                                (ID oder Name)\n"
+"  --groups=G_LISTE            zusätzliche Gruppen in der Form g1,g2,..,gN\n"
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 msgid ""
 "\n"
 "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n"
@@ -1719,28 +1725,42 @@ msgstr ""
 "\n"
 "Wenn kein Befehl angegeben ist, „${SHELL} -i“ (Vorgabe: /bin/sh) ausführen.\n"
 
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, c-format
 msgid "cannot change root directory to %s"
 msgstr "Es ist nicht möglich, das Wurzelverzeichnis in %s zu ändern"
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, c-format
 msgid "cannot chdir to root directory"
 msgstr "Es ist nicht möglich, in das Wurzelverzeichnis zu wechseln"
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr "es wurde keine Gruppe angegeben oder die UID ist unbekannt: %d"
+
+#: src/chroot.c:383
+#, c-format
+msgid "failed to get supplemental groups"
+msgstr "es konnten keine zusätzlichen Gruppen ermittelt werden"
+
+#: src/chroot.c:395
+#, c-format
+msgid "failed to %s supplemental groups"
+msgstr "es konnten keine %s erweiterte Gruppe(n) gesetzt werden"
+
+#: src/chroot.c:402
 #, c-format
 msgid "failed to set group-ID"
 msgstr "die Gruppen-ID konnte nicht gesetzt werden"
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, c-format
 msgid "failed to set user-ID"
 msgstr "die Benutzer-ID konnte nicht gesetzt werden"
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, c-format
 msgid "failed to run command %s"
 msgstr "der Befehl %s konnte nicht ausgeführt werden"
@@ -1772,7 +1792,7 @@ msgstr ""
 "CRC-Checksumme und Byteanzahl für jede DATEI ausgeben.\n"
 "\n"
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr "Aufruf: %s [OPTION]... DATEI1 DATEI2\n"
@@ -1828,8 +1848,8 @@ msgid ""
 "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n"
 msgstr ""
 "\n"
-"Man beachte, dass die Vergleiche den durch „LC_COLLATE“ gegebenen Regeln "
-"folgen.\n"
+"Bitte beachten Sie, dass die Vergleiche den durch „LC_COLLATE“ gegebenen\n"
+"Regeln folgen.\n"
 
 #: src/comm.c:137
 #, c-format
@@ -1841,10 +1861,10 @@ msgid ""
 msgstr ""
 "\n"
 "Beispiel:\n"
-"  %s -12 Datei1 Datei2  Es werden nur die Zeilen ausgegeben, die in Datei1 "
-"und Datei2 sind.\n"
-"  %s -3 Datei1 Datei2    Gibt nur die Zeilen aus, die nur in Datei1 oder "
-"Datei2 vorkommen.\n"
+"  %s -12 Datei1 Datei2  Es werden nur die Zeilen ausgegeben, die in Datei1\n"
+"                          und Datei2 sind.\n"
+"  %s -3 Datei1 Datei2   Gibt nur die Zeilen aus, die nur in Datei1 oder\n"
+"                          Datei2 vorkommen.\n"
 
 #: src/comm.c:222
 #, c-format
@@ -1862,318 +1882,365 @@ msgstr "es wurden mehrfache Trennzeichen angegeben"
 msgid "empty %s not allowed"
 msgstr "leeres %s ist nicht erlaubt"
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr "Fehler beim Lesen von %s"
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, c-format
 msgid "cannot lseek %s"
 msgstr "der Aufruf von lseek für %s ist nicht möglich"
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr "Fehler beim Schreiben von %s"
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, c-format
 msgid "%s: failed to get extents info"
 msgstr "%s: Info über die Erweiterung konnte nicht erfragt werden"
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, c-format
 msgid "%s: write failed"
 msgstr "%s: das Schreiben schlug fehl"
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, c-format
 msgid "failed to extend %s"
 msgstr "%s konnte nicht erweitert werden"
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, c-format
 msgid "clearing permissions for %s"
 msgstr "die Zugriffsrechte für %s werden gelöscht"
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "der Eigentümer für %s konnte nicht beibehalten werden"
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
 msgstr "die Datei %s konnte nicht gefunden werden"
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, c-format
 msgid "failed to preserve authorship for %s"
 msgstr "der Urheber für %s konnte nicht beibehalten werden"
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
+#, c-format
+msgid "failed to set default file creation context to %s"
+msgstr ""
+"der Standard-Kontext zur Dateierstellung konnte nicht auf %s\n"
+"gesetzt werden"
+
+#: src/copy.c:820
+#, c-format
+msgid "failed to set default file creation context for %s"
+msgstr ""
+"der Standard-Kontext zur Dateierstellung von %s konnte nicht gesetzt werden"
+
+#: src/copy.c:846
+#, c-format
+msgid "failed to set the security context of %s"
+msgstr "der Sicherheitskontext von %s konnte nicht gesetzt werden"
+
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
 msgid "cannot open %s for reading"
 msgstr "%s kann nicht zum Lesen geöffnet werden"
 
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, c-format
 msgid "cannot fstat %s"
 msgstr "der Aufruf von fstat für %s ist nicht möglich"
 
-#: src/copy.c:820
+#: src/copy.c:935
 #, c-format
 msgid "skipping file %s, as it was replaced while being copied"
 msgstr ""
 "die Datei %s wird übersprungen, da sie während des Kopierens ersetzt wurde"
 
-#: src/copy.c:850
-#, c-format
-msgid "failed to get file system create context"
-msgstr "der Erstellungs-Kontext des Dateisystems konnte nicht ermittelt werden"
-
-#: src/copy.c:864
-#, c-format
-msgid "failed to set the security context of %s to %s"
-msgstr "der Sicherheitskontext von %s konnte nicht auf %s gesetzt werden"
-
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
 msgid "cannot remove %s"
 msgstr "das Entfernen von %s ist nicht möglich"
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
 msgstr "%s wurde entfernt\n"
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr ""
-"schreiben durch die unvollständige symbolische Verknüpfung %s ist nicht "
-"möglich"
+"Schreiben durch die unvollständige symbolische Verknüpfung %s ist\n"
+"nicht möglich"
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, c-format
 msgid "cannot create regular file %s"
 msgstr "reguläre Datei %s kann nicht angelegt werden"
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, c-format
 msgid "failed to clone %s from %s"
 msgstr "%s konnte nicht von %s geklont werden"
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr "die Zeiten für %s werden beibehalten"
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
 #, c-format
 msgid "failed to close %s"
-msgstr "%s konnte nicht geöffnet werden"
+msgstr "%s konnte nicht geschlossen werden"
 
-#: src/copy.c:1471
+#: src/copy.c:1580
 #, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
 msgstr "%s: Überschreiben von %s, über Modus %04lo (%s) hinwegsetzen? "
 
-#: src/copy.c:1478
+#: src/copy.c:1581
+#, c-format
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr ""
+"%s: %s kann nicht überschrieben werden (Rechte %04lo, %s); trotzdem "
+"versuchen? "
+
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
 msgstr "%s: %s überschreiben? "
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr " (Sicherung: %s)"
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr ""
 "der Standard-Kontext zur Dateierstellung konnte nicht wieder hergestellt "
 "werden"
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, c-format
 msgid "cannot create hard link %s to %s"
 msgstr ""
 "das Erzeugen von harter Verknüpfung %s zu Verzeichnis %s ist nicht möglich"
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, c-format
 msgid "cannot stat %s"
 msgstr "der Aufruf von stat für %s ist nicht möglich"
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, c-format
 msgid "omitting directory %s"
 msgstr "Verzeichnis %s wurde ausgelassen"
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr "Warnung: Quelldatei %s mehr als einmal angegeben"
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
 msgstr "%s und %s sind die gleiche Datei"
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr ""
-"das Überschreiben des Nicht�Verzeichnisses %s mit Verzeichnis %s ist nicht "
-"möglich."
+"das Überschreiben des Nicht�Verzeichnisses %s mit Verzeichnis %s ist\n"
+"nicht möglich."
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr "Neu erstelltes %s wird nicht mit %s überschrieben."
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr ""
-"das Überschreiben des Verzeichnisses %s mit einem Nicht�Verzeichnis ist "
+"das Überschreiben des Verzeichnisses %s mit einem Nicht�Verzeichnis ist\n"
 "nicht möglich."
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr ""
-"das Verschieben eines Verzeichnisses auf ein Nicht�Verzeichnis ist nicht "
+"das Verschieben eines Verzeichnisses auf ein Nicht�Verzeichnis ist nicht\n"
 "möglich: %s → %s"
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr ""
-"die Sicherung von %s würde die Quelle zerstören; %s wurde nicht verschoben"
+"die Sicherung von %s würde die Quelle zerstören; %s wurde\n"
+"nicht verschoben"
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr ""
-"die Sicherung von %s würde die Quelle zerstören; %s wurde nicht kopiert"
+"die Sicherung von %s würde die Quelle zerstören; %s wurde\n"
+"nicht kopiert"
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
 msgstr "die Sicherung von %s ist nicht möglich"
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr ""
-"%s wird nicht mittels der neu erstellten symbolische Verknüpfung %s kopiert"
+"%s wird nicht mittels der neu erstellten symbolische\n"
+"Verknüpfung %s kopiert"
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr ""
-"Kopieren eines Verzeichnisses, %s, in sich selbst (%s) ist nicht möglich"
+"Kopieren des Verzeichnisses %s in sich selbst (%s)\n"
+"ist nicht möglich"
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr "Harte Verknüpfung %s zu Verzeichnis %s wird nicht erzeugt"
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr ""
-"das Verschieben von %s in ein Unterverzeichnis seiner selbst (%s) ist nicht "
-"möglich"
+"das Verschieben von %s in ein Unterverzeichnis\n"
+"seiner selbst (%s) ist nicht möglich"
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, c-format
 msgid "cannot move %s to %s"
 msgstr "das Verschieben von %s nach %s ist nicht möglich"
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr ""
-"das Verschieben zwischen Geräten ist fehlgeschlagen: %s zu %s; das Ziel kann "
-"nicht entfernt werden"
-
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, c-format
-msgid "failed to set default file creation context to %s"
-msgstr ""
-"der Standard-Kontext zur Dateierstellung konnte nicht auf %s gesetzt werden"
+"das Verschieben zwischen Geräten ist fehlgeschlagen: %s zu %s;\n"
+"das Ziel kann nicht entfernt werden"
 
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr ""
 "das Kopieren der zyklischen symbolischen Verknüpfung %s ist nicht möglich"
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr ""
-"%s: eine relative symbolische Verknüpfungen kann nur im aktuellen "
-"Verzeichnis angelgt werden"
+"%s: eine relative symbolische Verknüpfungen kann nur im\n"
+"aktuellen Verzeichnis anglegt werden"
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr "die symbolische Verknüpfung %s zu %s kann nicht angelegt werden"
 
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, c-format
 msgid "cannot create fifo %s"
 msgstr "der FIFO %s kann nicht erzeugt werden"
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, c-format
 msgid "cannot create special file %s"
 msgstr "die Spezialdatei %s kann nicht erzeugt werden"
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, c-format
 msgid "cannot read symbolic link %s"
 msgstr "Lesen der symbolischen Verknüpfung %s nicht möglich"
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, c-format
 msgid "cannot create symbolic link %s"
 msgstr "die symbolische Verknüpfung %s kann nicht angelegt werden"
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
 msgstr "%s hat einen unbekannten Dateityp"
 
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, c-format
 msgid "cannot un-backup %s"
 msgstr "das Löschen der Sicherung von %s ist nicht möglich"
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr "%s →  %s (Löschen der Sicherung)\n"
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr "Alex Deymo"
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr "Aufruf: %s --coreutils-prog=PROGRAMMNAME [PARAMETER]…\n"
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+"Führt das eingebaute PROGRAMMNAME mit den angegebenen PARATERn aus.\n"
+"\n"
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+"\n"
+"Verwenden Sie: „%s --coreutils-prog=PROGRAMNAME --help“ für individuelle "
+"Hilfe\n"
+"               zum Programm.\n"
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, c-format
+msgid "unknown program %s"
+msgstr "Unbekanntes Programm %s"
+
+#: src/cp.c:157 src/mv.c:288
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -2184,13 +2251,13 @@ msgstr ""
 " oder:  %s [OPTION]... QUELLE... VERZEICHNIS\n"
 " oder:  %s [OPTION]... -t VERZEICHNIS QUELLE...\n"
 
-#: src/cp.c:162
+#: src/cp.c:163
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 "Kopieren von QUELLE nach ZIEL, oder mehrere QUELLE(n) in VERZEICHNIS\n"
 "\n"
 
-#: src/cp.c:168
+#: src/cp.c:169
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
 "      --attributes-only        don't copy the file data, just the "
@@ -2205,14 +2272,15 @@ msgid ""
 msgstr ""
 "  -a, --archive               genau wie -dpR --preserve=all\n"
 "      --attributes-only       nicht die Dateidaten sondern nur die Attribute "
-"kopieren/n      --backup[=KONTROLLE]    eine Sicherung existierender "
-"Zieldateien erzeugen\n"
-"  -b                          wie --backup, akzeptiert aber kein Argument\n"
+"kopieren\n"
+"      --backup[=KONTROLLE]    eine Sicherung existierender Zieldateien "
+"erzeugen\n"
+"  -b                            wie --backup, akzeptiert aber kein Argument\n"
 "      --copy-contents         wenn rekursiv, Inhalt von Spezialdateien "
 "kopieren\n"
 "  -d                          genauso wie --no-dereference --preserve=links\n"
 
-#: src/cp.c:177
+#: src/cp.c:178
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
 "                                 opened, remove it and try again (this "
@@ -2226,17 +2294,17 @@ msgid ""
 msgstr ""
 "  -f, --force                 wenn existierende Zieldatei nicht geöffnet "
 "werden\n"
-"                                kann, löschen und erneut versuchen "
-"(redundant\n"
-"                                bei Verwendung der Option -n)\n"
+"                                kann, löschen und erneut versuchen (wird "
+"bei\n"
+"                                Verwendung der Option -n ignoriert)\n"
 "  -i, --interactive           vor einem Ãœberschreiben nachfragen "
 "(überstimmt\n"
 "                                eine vorangehende Option -n)\n"
 "  -H                          symbolischen Verknüpfungen, die auf der\n"
-"                              Kommandozeile als QUELLE angegeben sind,\n"
-"                              folgen\n"
+"                                Kommandozeile als QUELLE angegeben sind,\n"
+"                                folgen\n"
 
-#: src/cp.c:186
+#: src/cp.c:187
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
 "  -L, --dereference            always follow symbolic links in SOURCE\n"
@@ -2245,7 +2313,7 @@ msgstr ""
 "  -L, --dereference           symbolischen Verknüpfungen in QUELLE immer "
 "folgen\n"
 
-#: src/cp.c:190
+#: src/cp.c:191
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
 "                                 a previous -i option)\n"
@@ -2256,7 +2324,7 @@ msgstr ""
 "  -P, --no-dereference        symbolischen Verknüpfungen in QUELLE nie "
 "folgen\n"
 
-#: src/cp.c:195
+#: src/cp.c:196
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
 "      --preserve[=ATTR_LIST]   preserve the specified attributes (default:\n"
@@ -2274,7 +2342,7 @@ msgstr ""
 "                                weitere Attribute: context, links, xattr, "
 "all\n"
 
-#: src/cp.c:203
+#: src/cp.c:204
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                use full source file name under DIRECTORY\n"
@@ -2282,7 +2350,7 @@ msgstr ""
 "      --no-preserve=ATTR_LIST  Angegebene Attribute nicht erhalten\n"
 "      --parents                Quell�Pfad an VERZEICHNIS anhängen\n"
 
-#: src/cp.c:207
+#: src/cp.c:208
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
 "      --reflink[=WHEN]         control clone/CoW copies. See below\n"
@@ -2291,12 +2359,12 @@ msgid ""
 "force)\n"
 msgstr ""
 "  -R, -r, --recursive         Verzeichnisse rekursiv kopieren\n"
-"      --reflink[=WANN]        Klon/CoW Kopien kontrollieren. Siehe unten/"
-"n      --remove-destination    jede Zieldatei vor dem Versuch, sie zu "
+"      --reflink[=WANN]        Klon/CoW Kopien kontrollieren. Siehe unten\n"
+"      --remove-destination    jede Zieldatei vor dem Versuch, sie zu "
 "öffnen,\n"
 "                                löschen (im Gegensatz zu --force)\n"
 
-#: src/cp.c:213
+#: src/cp.c:214
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
 "      --strip-trailing-slashes  remove any trailing slashes from each "
@@ -2309,7 +2377,7 @@ msgstr ""
 "Arguments\n"
 "                                 entfernen\n"
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -2323,7 +2391,7 @@ msgstr ""
 "  -t, --target-directory=VERZ  alle QUELLE�Argumente in VERZ kopieren\n"
 "  -T, --no-target-directory   ZIEL als normale Datei behandeln\n"
 
-#: src/cp.c:224
+#: src/cp.c:225
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
 "                                 than the destination file or when the\n"
@@ -2337,7 +2405,20 @@ msgstr ""
 "  -v, --verbose               durchgeführte Tätigkeiten erklären\n"
 "  -x, --one-file-system       in diesem Dateisystem verbleiben\n"
 
-#: src/cp.c:233
+#: src/cp.c:232
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+"  -Z                           den SELinux Sicherheitskontext der Zieldatei\n"
+"                                 auf den Standardtyp setzen\n"
+"      --context[=KTXT]         Wie -Z, oder, wenn KTXT angegeben wurde,den\n"
+"                                 SELinux oder SMACK Scherheitskontext auf\n"
+"                                 KTXT setzten\n"
+
+#: src/cp.c:240
 msgid ""
 "\n"
 "By default, sparse SOURCE files are detected by a crude heuristic and the\n"
@@ -2367,7 +2448,7 @@ msgstr ""
 "haben. Wenn dies nicht möglich ist, scheitert das Kopieren. Wurde\n"
 "--reflink=auto angegeben, wird statt dessen eine normale Kopie angelegt.\n"
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 msgid ""
 "\n"
 "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n"
@@ -2383,7 +2464,7 @@ msgstr ""
 "festgelegt werden. Mögliche Werte sind:\n"
 "\n"
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2397,7 +2478,7 @@ msgstr ""
 "einfach.\n"
 "  simple, never   Immer einfache Sicherheitskopien erzeugen\n"
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2410,95 +2491,106 @@ msgstr ""
 "„backup“ Optionen angegeben wurden und QUELLE und ZIEL der gleiche Name für\n"
 "eine vorhandene reguläre Datei sind.\n"
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, c-format
 msgid "failed to preserve times for %s"
 msgstr "die Zeiten für %s konnten nicht beibehalten werden"
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, c-format
 msgid "failed to preserve permissions for %s"
 msgstr "die Zugriffsrechte für %s konnten nicht beibehalten werden"
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, c-format
 msgid "cannot make directory %s"
 msgstr "das Verzeichnisses %s konnte nicht angelegt werden"
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr "%s existiert, ist aber kein Verzeichnis"
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
 #, c-format
 msgid "failed to access %s"
 msgstr "auf %s konnte nicht zugegriffen werden"
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, c-format
 msgid "missing file operand"
 msgstr "Fehlender Dateioperand"
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, c-format
 msgid "missing destination file operand after %s"
 msgstr "Fehlender Zieldatei�Operand hinter %s"
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr ""
 "--target-directory (-t) und --no-target-directory (-T) können nicht "
 "kombiniert werden"
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, c-format
 msgid "target %s is not a directory"
 msgstr "das angegebene Ziel %s ist kein Verzeichnis"
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr "mit --parents muss das Ziel ein Verzeichnis sein"
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, c-format
 msgid "multiple target directories specified"
 msgstr "mehrere Zielverzeichnisse angegeben"
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr ""
+"WARNUNG: --context wird ignoriert da dieser Kernel SELinux nicht unterstützt"
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr ""
 "Gleichzeitiges Erzeugen harter und symbolischer Verknüpfung ist nicht möglich"
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr "die Optionen --backup und --no-clobber schließen sich gegenseitig aus"
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr "--reflink kann nur zusammen mit --sparse=auto verwendet werden"
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr "Typ der Sicherung"
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, c-format
+msgid "cannot set target context and preserve it"
+msgstr "der Ziel-Kontext kann nicht gesetzt und beibehalten werden"
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr ""
 "das Beibehalten des Sicherheitskontextes ist ohne einen Kernel mit\n"
 "Unterstützung für SELinux nicht möglich"
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr ""
@@ -2506,131 +2598,131 @@ msgstr ""
 "Unterstützung für xattr gebaut wurde"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr "Stuart Kemp"
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr "Eingabe ist verschwunden"
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr "%s: Zeilennummer nicht im zulässigen Bereich"
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, c-format
 msgid "%s: %s: line number out of range"
 msgstr "%s: %s: Zeilennummer nicht im zulässigen Bereich"
 
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, c-format
 msgid " on repetition %s\n"
 msgstr " bei Wiederholung %s\n"
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, c-format
 msgid "%s: %s: match not found"
 msgstr "%s: %s: keine Entsprechung gefunden"
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr "Fehler bei Suche mit regulären Ausdrücken"
 
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, c-format
 msgid "write error for %s"
 msgstr "Fehler beim Schreiben von %s"
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, c-format
 msgid "%s: integer expected after delimiter"
 msgstr "%s: ganze Zahl nach Trenner erwartet"
 
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr "%s: „}“ ist bei Angabe einer Wiederholungsanzahl erforderlich"
 
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr "%s}: zwischen „{“ and „}“ ist eine Ganzzahl erforderlich"
 
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr "%s: schließender Trenner „%c“ fehlt"
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr "%s: ungültiger regulärer Ausdruck: %s"
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr "%s: ungültiges Muster"
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr "%s: Zeilennummer muss größer als Null sein"
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr "Zeilennummer %s ist kleiner als vorhergehende Zeilennummer %s"
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr "Warnung: Zeilennummer %s ist dieselbe wie die vorhergehende"
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr "Angabe zur Wandlung fehlt im Anhang"
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr "Angabe zur Wandlung fehlt im Anhang: %c"
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr "Ungültige Angabe zur Wandlung im Anhang: \\%.3o"
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr "ungültige Kennungen in der Umwandlungsangabe: %%%c%c"
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr "Zu viele Angaben zur %%-Wandlung im Anhang"
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr "Fehlende %%-Angabe zur Wandlung im Anhang"
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr "%s: ungültige Zahl"
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr "Aufruf: %s [OPTION]... DATEI MUSTER...\n"
 
-#: src/csplit.c:1455
+#: src/csplit.c:1483
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
 "and output byte counts of each piece to standard output.\n"
@@ -2639,7 +2731,7 @@ msgstr ""
 "schreiben und die Bytezahl für jedes Teil auf Standardausgabe ausgeben.\n"
 "\n"
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2650,7 +2742,12 @@ msgstr ""
 "  -f, --prefix=PRÄFIX        PRÄFIX anstelle von „xx“ benutzen\n"
 "  -k, --keep-files           Ausgabedateien bei Fehler nicht löschen\n"
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr ""
+"  -m, --suppress-matched     Zeilen die MUSTER entsprechen nicht ausgeben\n"
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
@@ -2662,7 +2759,7 @@ msgstr ""
 "ausgeben\n"
 "  -z, --elide-empty-files    leere Ausgabedateien löschen\n"
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
@@ -2670,7 +2767,7 @@ msgstr ""
 "\n"
 "Standardeingabe lesen, wenn DATEI „-“ ist. Jedes MUSTER kann sein:\n"
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 msgid ""
 "\n"
 "  INTEGER            copy up to but not including specified line number\n"
@@ -2698,21 +2795,17 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr "David M. Ihnat"
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr "Felder und Positionen werden von 1 an gezählt"
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr "Aufruf: %s OPTION... [DATEI]...\n"
 
-#: src/cut.c:193
+#: src/cut.c:176
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr ""
 "Ausgewählte Teile der Zeilen von jeder DATEI auf Standardausgabe ausgeben.\n"
 
-#: src/cut.c:199
+#: src/cut.c:182
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
 "  -c, --characters=LIST   select only these characters\n"
@@ -2722,7 +2815,7 @@ msgstr ""
 "  -c, --characters=LISTE  nur diese Zeichen ausgeben\n"
 "  -d, --delimiter=TRENN   TRENN anstelle von Tabulator als Trenner benutzen\n"
 
-#: src/cut.c:204
+#: src/cut.c:187
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
 "                            that contains no delimiter character, unless\n"
@@ -2735,7 +2828,7 @@ msgstr ""
 "                            Option -s ist gegeben\n"
 "  -n                      (wird ignoriert)\n"
 
-#: src/cut.c:210
+#: src/cut.c:193
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
 "                            or fields\n"
@@ -2743,7 +2836,7 @@ msgstr ""
 "      --complement        das Komplement der Menge der gewählten Bytes,\n"
 "                            Zeichen oder Felder bilden\n"
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
@@ -2754,7 +2847,7 @@ msgstr ""
 "      --ouput-delimiter=ZKETTE  ZKETTE als Ausgabetrennzeichen benutzen;\n"
 "                            Voreinstellung ist das Eingabetrennzeichen\n"
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2767,7 +2860,7 @@ msgstr ""
 "derselben Reihenfolge geschrieben, wie sie gelesen wird, und genau einmal\n"
 "geschrieben.\n"
 
-#: src/cut.c:227
+#: src/cut.c:210
 msgid ""
 "Each range is one of:\n"
 "\n"
@@ -2787,42 +2880,46 @@ msgstr ""
 "\n"
 "Ohne DATEI, oder wenn DATEI „-“ ist, die Standardeingabe lesen.\n"
 
-#: src/cut.c:367 src/cut.c:493
+#: src/cut.c:300 src/cut.c:394
 msgid "invalid byte, character or field list"
 msgstr "Ungültige Byte�, Zeichen- oder Feldliste"
 
-#: src/cut.c:387
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr "Felder und Positionen werden von 1 an gezählt"
+
+#: src/cut.c:320
 msgid "invalid range with no endpoint: -"
 msgstr "ungültiger Bereich ohne Endpunkt: -"
 
-#: src/cut.c:403
+#: src/cut.c:334
 msgid "invalid decreasing range"
 msgstr "ungültiger abnehmender Bereich"
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, c-format
 msgid "byte offset %s is too large"
 msgstr "Byte�Offset %s ist zu groß"
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, c-format
 msgid "field number %s is too large"
 msgstr "Feldnummer %s ist zu groß"
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr "Nur ein Typ einer Liste kann angegeben werden"
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr "Trenner muss ein einzelnes Zeichen sein"
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr "Sie müssen eine Liste von Bytes, Zeichen oder Feldern angeben"
 
-#: src/cut.c:850
+#: src/cut.c:790
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr ""
 "Ein Eingabe-Begrenzer darf nur angegeben werden, wenn auf Feldern gearbeitet "
@@ -2830,7 +2927,7 @@ msgstr ""
 
 # CHECKIT →  no \t, please
 # 2001-08-10 08:03:34 CEST -ke-
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
@@ -2838,11 +2935,11 @@ msgstr ""
 "Nicht�getrennte Zeilen zu unterdrücken ist nur sinnvoll,\n"
 "\twenn auf Feldern operiert wird."
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr "Liste der Felder fehlt"
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr "Liste der Positionen fehlt"
 
@@ -2897,7 +2994,7 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 "      --rfc-3339=ZEITSPEZ   Datumsausgabe gemäß RFC�3339 anzeigen;\n"
 "                              ZEITSPEZ=„date“, „seconds“ oder „ns“ für\n"
@@ -3115,10 +3212,10 @@ msgstr ""
 "USA\n"
 "  $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n"
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr "Standardeingabe"
@@ -3163,7 +3260,7 @@ msgstr ""
 msgid "cannot set date"
 msgstr "das Datum kann nicht gesetzt werden"
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, c-format
 msgid "time %s is out of range"
 msgstr "Zeit %s außerhalb des zulässigen Bereichs"
@@ -3174,7 +3271,7 @@ msgstr "Zeit %s außerhalb des zulässigen Bereichs"
 msgid "Paul Rubin"
 msgstr "Paul Rubin"
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
@@ -3183,7 +3280,7 @@ msgstr ""
 "Aufruf: %s [OPERAND...]\n"
 " oder:  %s OPTION\n"
 
-#: src/dd.c:526
+#: src/dd.c:532
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
 "\n"
@@ -3203,7 +3300,7 @@ msgstr ""
 "  count=N         nur N Eingabeblöcke kopieren\n"
 "  ibs=BYTES       Lesen von BYTES Bytes auf einmal (Voreinstellung: 512)\n"
 
-#: src/dd.c:535
+#: src/dd.c:541
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
 "  iflag=FLAGS     read as per the comma separated symbol list\n"
@@ -3223,11 +3320,11 @@ msgstr ""
 "  seek=N          N obs�große Blöcke am Anfang der Ausgabe überspringen\n"
 "  skip=N          N ibs�große Blöcke am Anfang der Eingabe überspringen\n"
 "  status=WELCHE   WELCHE Info nicht auf dem Standardfehlerkanal ausgegeben\n"
-"                  werden soll. „noxfer“ unterdrückt die "
+"                    werden soll. „noxfer“ unterdrückt die "
 "übertragungsstatistik\n"
-"                  und „none“ alle Ausgaben\n"
+"                    und „none“ alle Ausgaben\n"
 
-#: src/dd.c:546
+#: src/dd.c:552
 msgid ""
 "\n"
 "N and BYTES may be followed by the following multiplicative suffixes:\n"
@@ -3245,7 +3342,7 @@ msgstr ""
 "Jedes CONV�Symbol kann sein:\n"
 "\n"
 
-#: src/dd.c:555
+#: src/dd.c:561
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
 "  ebcdic    from ASCII to EBCDIC\n"
@@ -3272,7 +3369,7 @@ msgstr ""
 "  sync      jeden Eingabeblock mit NULLen zur ibs�Größe auffüllen; wenn mit\n"
 "              „block“ oder „unblock“ benutzt, stattdessen mit Leerzeichen\n"
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -3288,7 +3385,7 @@ msgstr ""
 "  fdatasync  vor Beendigung Ausgabedatendatei physisch schreiben\n"
 "  fsync     genauso, zusätzlich auch die Metadaten\n"
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -3301,75 +3398,75 @@ msgstr ""
 "\n"
 "  append    Anfügemodus (nur für Ausgabe sinnvoll; conv=notrunc empfohlen)\n"
 
-#: src/dd.c:583
+#: src/dd.c:589
 msgid "  cio       use concurrent I/O for data\n"
 msgstr "  cio       nebenläufige Ein�/Ausgabe für Daten benutzen\n"
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr "  direct    direkte Ein�/Ausgabe für Daten benutzen\n"
 
-#: src/dd.c:587
+#: src/dd.c:593
 msgid "  directory  fail unless a directory\n"
 msgstr "  directory  abbrechen, wenn kein Verzeichnis\n"
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr "  dsync     synchronisierte Ein�/Ausgabe für Daten benutzen\n"
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr "  sync      genauso, aber auch für Metadaten\n"
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr "  fullblock  volle Eingabeblöcke ansammeln (nur iflag)\n"
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr "  nonblock  nicht�blockierende  Ein�/Ausgabe benutzen\n"
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr "  noatime   die Zugriffszeit nicht erneuern\n"
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr "  nocache   zwischengespeicherte Daten verwerfen\n"
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr "  noctty    das kontrollierende Terminal nicht von Datei zuweisen\n"
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr "  nofollow  symbolischen Verknüpfungen nicht folgen\n"
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr "  nolinks   abbrechen, wenn mehrfach verlinkt\n"
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr "  binary    binäre Ein�/Ausgabe benutzen\n"
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr "  text      textuelle Ein�/Ausgabe benutzen\n"
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr "  count_bytes  behandelt „count=N“ als einen Byte-Zähler (nur iflag)\n"
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr "  skip_bytes  behandelt „skip=N“ als einen Byte-Zähler (nur iflag)\n"
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr "  seek_bytes  behandelt „seek=N“ als einen Byte-Zähler (nur iflag)\n"
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, c-format
 msgid ""
 "\n"
@@ -3399,7 +3496,17 @@ msgstr ""
 "Optionen sind:\n"
 "\n"
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr "Hauptspeicher erschöpft durch Eingabepuffer von %zu Bytes (%s)"
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr "Hauptspeicher erschöpft durch Ausgabepuffer von %zu Bytes (%s)"
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
@@ -3408,21 +3515,21 @@ msgstr ""
 "%<PRIuMAX>+%<PRIuMAX> Datensätze ein\n"
 "%<PRIuMAX>+%<PRIuMAX> Datensätze aus\n"
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
 msgstr[0] "ein abgeschnittener Datensatz\n"
 msgstr[1] "%<PRIuMAX> abgeschnittene Datensätze\n"
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
 msgstr[0] "ein Byte kopiert"
 msgstr[1] "%<PRIuMAX> Bytes (%s) kopiert"
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr "unendlich B"
 
@@ -3436,83 +3543,83 @@ msgstr "unendlich B"
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
 msgstr ", %g s, %s/s\n"
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, c-format
 msgid "closing input file %s"
 msgstr "Schließen der Eingabedatei %s"
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr "Schließen der Ausgabedatei %s"
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr "O_DIRECT konnte nicht abgeschaltet werden: %s"
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, c-format
 msgid "writing to %s"
 msgstr "Schreiben in %s"
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, c-format
 msgid "unrecognized operand %s"
 msgstr "nicht erkannter Operand %s"
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 msgid "invalid conversion"
 msgstr "ungültige Konvertierung"
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 msgid "invalid input flag"
 msgstr "ungültiges Eingabeflag"
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 msgid "invalid output flag"
 msgstr "ungültiges Ausgabeflag"
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 msgid "invalid status flag"
 msgstr "ungültiges Statusflag"
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, c-format
 msgid "invalid number %s"
 msgstr "ungültige Zahl %s"
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr "{ascii,ebcdic,ibm} sind in keiner Weise kombinierbar"
 
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, c-format
 msgid "cannot combine block and unblock"
 msgstr "block und unblock sind nicht kombinierbar"
 
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, c-format
 msgid "cannot combine lcase and ucase"
 msgstr "lcase und ucase sind nicht kombinierbar"
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, c-format
 msgid "cannot combine excl and nocreat"
 msgstr "excl und nocreat sind nicht kombinierbar"
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, c-format
 msgid "cannot combine direct and nocache"
 msgstr "direct und nocache sind nicht kombinierbar"
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
@@ -3521,72 +3628,62 @@ msgstr ""
 "Warnung: Umgehe lseek�Kernelbug für Datei (%s)\n"
 "  des Typs mt_type=0x%0lx – siehe <sys/mtio.h> für die Liste der Typen"
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, c-format
 msgid "%s: cannot skip"
 msgstr "%s: überspringen nicht möglich"
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, c-format
 msgid "%s: cannot seek"
 msgstr "%s: das Springen zu Position ist nicht möglich"
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr "Offset�Überlauf beim Lesen der Datei %s"
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr "Warnung: ungültiger Datei�Offset nach fehlgeschlagenem Lesen"
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr "ein Kernel�Fehler kann nun mal nicht umgangen werden"
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, c-format
 msgid "setting flags for %s"
 msgstr "die Flags für %s werden gesetzt"
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr "Hauptspeicher erschöpft durch Eingabepuffer von %zu Bytes (%s)"
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr "Hauptspeicher erschöpft durch Ausgabepuffer von %zu Bytes (%s)"
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr "%s: es ist nicht möglich, zum angegebenen Offset zu springen"
 
-#: src/dd.c:2133
+#: src/dd.c:2172
 #, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
 msgstr "das Abschneiden bei %<PRIdMAX> Bytes in Ausgabedatei %s scheiterte"
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr "fdatasync für %s ist fehlgeschlagen"
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
 msgstr "fsync für %s ist fehlgeschlagen"
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, c-format
 msgid "failed to open %s"
 msgstr "konnte %s nicht öffnen"
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
@@ -3595,96 +3692,106 @@ msgstr ""
 "Offset zu groß: kann nicht auf eine Länge von seek=%<PRIuMAX> (%lu�Byte�) "
 "Blöcke abschneiden"
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr "das Abschneiden bei %<PRIuMAX> Bytes in Ausgabedatei %s scheiterte"
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, c-format
 msgid "failed to discard cache for: %s"
 msgstr "der Zwischenspeicher für %s konnte nicht verworfen werden"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr "Paul Eggert"
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr "Dateisystem"
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr "Typ"
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr "Blöcke"
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr "Benutzt"
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr "Verfügbar"
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr "Verw%"
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr "Inodes"
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr "IBenutzt"
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr "IFrei"
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr "IUse%"
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr "Eingehängt auf"
 
-#: src/df.c:383
+#: src/df.c:207
+msgid "File"
+msgstr "Datei"
+
+#: src/df.c:387
 #, c-format
-msgid "option --output: field '%s' unknown"
+msgid "option --output: field %s unknown"
 msgstr "Option --output: Feld „%s“ ist unbekannt"
 
-#: src/df.c:390
+#: src/df.c:394
 #, c-format
-msgid "option --output: field '%s' used more than once"
+msgid "option --output: field %s used more than once"
 msgstr "Option --output: Feld „%s“ wird mehr als einmal verwendet"
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr "Größe"
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr "Verf."
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr "Kapazität"
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
 msgstr "%s-%s"
 
-#: src/df.c:1210
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr ""
+"auf %s kann nicht zugegriffen werden: dort wurde ein anderes Gerät eingehängt"
+
+#: src/df.c:1384
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
 "or all file systems by default.\n"
@@ -3693,16 +3800,17 @@ msgstr ""
 "DATEI befindet, oder alle Dateisysteme, welches der Normalfall ist.\n"
 "\n"
 
-#: src/df.c:1217
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
 "  -a, --all                 unechte Dateisysteme mit einschließen\n"
 "  -B, --block-size=GRÖßE    Größen in Einheiten von GRÖßE ausgeben, z.B. "
@@ -3712,11 +3820,11 @@ msgstr ""
 "                              Bytes ausgegeben. Siehe auch GRÖẞE weiter "
 "unten\n"
 "      --total               Gesamtsumme erstellen\n"
-"  -h, --human-readable      Größen in menschenlesbarem Format (z. B. 1K 234M "
+"  -h, --human-readable      Größen in menschenlesbarem Format (z.B. 1K 234M "
 "2G)\n"
 "  -H, --si                  genauso, aber mit 1000 statt 1024 als Teiler\n"
 
-#: src/df.c:1227
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -3732,7 +3840,7 @@ msgstr ""
 "Benutzungsinformation\n"
 "                              aufrufen (Standardvorgabe)\n"
 
-#: src/df.c:1234
+#: src/df.c:1409
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
 "                               or print all fields if FIELD_LIST is "
@@ -3756,45 +3864,38 @@ msgstr ""
 "begrenzen.\n"
 "  -v                        (ignoriert)\n"
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
 "\n"
 "FELDLISTE ist eine durch Komma getrennte Liste der zu verwendenden Spalten.\n"
 "Gültige Feldnamen sind: „source“, „fstype“, „itotal“, „iused“, „iavail“,\n"
-"„ipcent“, „size“, „used“, „avail“, „pcent“ und „target“ (siehe Infoseite).\n"
+"„ipcent“, „size“, „used“, „avail“, „pcent“, „file“ und „target“ (siehe\n"
+"Infoseite).\n"
 
-#: src/df.c:1285
+#: src/df.c:1460
 #, c-format
 msgid "options %s and %s are mutually exclusive"
 msgstr "die Optionen „%s“ und „%s“ schließen sich gegenseitig aus"
 
-#: src/df.c:1335
-msgid "warning: "
-msgstr "Warnung: "
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr "die lange Option „--megabytes� ist veraltet und wird bald entfernt"
-
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr "Dateisystemtyp %s ist sowohl ausgewählt als auch ausgeschlossen"
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr "Warnung: "
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 msgid "cannot read table of mounted file systems"
 msgstr "Lesen der Tabelle eingehängter Dateisysteme nicht möglich"
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr "keine Dateisysteme bearbeitet"
@@ -3804,7 +3905,7 @@ msgstr "keine Dateisysteme bearbeitet"
 msgid "H. Peter Anvin"
 msgstr "H. Peter Anvin"
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr "Aufruf: %s [OPTION]... [DATEI]\n"
@@ -3889,9 +3990,9 @@ msgstr ""
 "\n"
 
 #: src/dirname.c:59
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
 msgstr ""
-"  -z, --zero     Zeilen mit Nullbyte statt mit Zeilenvorschub beenden\n"
+"  -z, --zero     Ausgabezilen mit Nullbyte statt mit Zeilenvorschub beenden\n"
 
 #: src/dirname.c:64
 #, c-format
@@ -3908,7 +4009,7 @@ msgstr ""
 "  %s dir1/str dir2/str  -> \"dir1\" gefolgt von \"dir2\"\n"
 "  %s stdio.h            -> \".\"\n"
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -3917,16 +4018,15 @@ msgstr ""
 "Aufruf: %s [OPTION]... [DATEI]...\n"
 " oder:  %s [OPTION]... --files0-from=DL\n"
 
-#: src/du.c:274
+#: src/du.c:285
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr ""
 "Summierung der Plattennutzung jeder DATEI, rekursiv für Verzeichnisse\n"
 "\n"
 
-#: src/du.c:280
+#: src/du.c:291
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3946,11 +4046,11 @@ msgstr ""
 "Blöcke\n"
 "                            und ähnliches\n"
 
-#: src/du.c:289
+#: src/du.c:300
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3974,14 +4074,15 @@ msgstr ""
 "                            Kommando-zeilenarguments ist; --max-depth=0 ist\n"
 "                            gleichbedeutend mit --summarize\n"
 
-#: src/du.c:302
+#: src/du.c:313
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
 "      --files0-from=D     aufsummierten Platzverbrauch der in der Datei D\n"
 "                            angegebenen null-terminierten Dateinamen "
@@ -3993,7 +4094,7 @@ msgstr ""
 "2G)\n"
 "                            ausgeben\n"
 
-#: src/du.c:310
+#: src/du.c:322
 msgid ""
 "  -k                    like --block-size=1K\n"
 "  -L, --dereference     dereference all symbolic links\n"
@@ -4006,11 +4107,12 @@ msgstr ""
 "                            Verknüpfungen verbunden\n"
 "  -m                      Wie „--block-size=1M“\n"
 
-#: src/du.c:316
+#: src/du.c:328
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
@@ -4022,7 +4124,7 @@ msgstr ""
 "1024\n"
 "  -s, --summarize         nur Summe für jedes Argument anzeigen\n"
 
-#: src/du.c:322
+#: src/du.c:334
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
 "                          or entries greater than SIZE if negative\n"
@@ -4031,9 +4133,9 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
 msgstr ""
 "  -t, --threshold=GRÖẞE  Einträge kleiner als GRÖẞE ausschließen wenn "
 "positiv,\n"
@@ -4047,7 +4149,7 @@ msgstr ""
 "                           full-iso, long-iso, iso, +FORMAT\n"
 "                           FORMAT wird wie bei „date“ interpretiert\n"
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
@@ -4059,66 +4161,67 @@ msgstr ""
 "  -x, --one-file-system  Verzeichnisse auf anderen Dateisystemen "
 "überspringen\n"
 
-#: src/du.c:386
+#: src/du.c:398
 msgid "Infinity"
 msgstr "Unendlich"
 
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr "Einhängungspunkt %s wurde bereits durchlaufen"
-
-#: src/du.c:624
+#: src/du.c:636
 #, c-format
 msgid "fts_read failed: %s"
 msgstr "fts_read schlug fehl: %s"
 
-#: src/du.c:780
+#: src/du.c:787
 #, c-format
 msgid "invalid maximum depth %s"
 msgstr "Ungültige maximale Tiefe %s"
 
-#: src/du.c:809
+#: src/du.c:816
 #, c-format
 msgid "invalid --threshold argument '-0'"
 msgstr "ungültiges Argument „-0“ Option --threshold"
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr ""
 "Zusammenfassung und Anzeige aller Einträge ist nicht gleichzeitig möglich"
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr "Warnung: Zusammenfassen ist das gleiche wie --max-depth=0"
 
-#: src/du.c:900
+#: src/du.c:911
 #, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr "Warnung: Zusammenfassen widerspricht --max-depth=%lu"
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+"Warnung: Die Optionen --apparent-size und -b haben bei --inodes keine Wirkung"
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 msgid "file operands cannot be combined with --files0-from"
 msgstr "Dateioperanden können nicht mit --files0-from kombiniert werden."
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr "%s: Lesefehler"
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr "beim Lesen von Dateinamen aus stdin ist der Dateinane %s nicht erlaubt"
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 msgid "invalid zero-length file name"
 msgstr "ungültiger Dateiname der Länge 0"
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr "insgesamt"
 
@@ -4228,7 +4331,7 @@ msgstr "Jeden NAMEn in der Umgebung auf WERT setzen und BEFEHL ausführen.\n"
 #: src/env.c:61
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
 "  -i, --ignore-environment  mit leerer Umgebung beginnen\n"
@@ -4312,16 +4415,16 @@ msgid "input line is too long"
 msgstr "Eingabezeile zu lang"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr "Mike Parker"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr "James Youngman"
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
@@ -4330,7 +4433,7 @@ msgstr ""
 "Aufruf: %s AUSDRUCK\n"
 " oder:  %s OPTION\n"
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -4348,7 +4451,7 @@ msgstr ""
 "\n"
 "  ARG1 & ARG2       ARG1, wenn kein Argument null oder 0 ist, sonst 0\n"
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -4366,7 +4469,7 @@ msgstr ""
 "  ARG1 >= ARG2      ARG1 ist größer oder gleich ARG2\n"
 "  ARG1 > ARG2       ARG1 ist größer ARG2\n"
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
@@ -4376,7 +4479,7 @@ msgstr ""
 "  ARG1 + ARG2       arithmetische Summe von ARG1 und ARG2\n"
 "  ARG1 - ARG2       arithmetische Differenz von ARG1 und ARG2\n"
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -4389,7 +4492,7 @@ msgstr ""
 "  ARG1 / ARG2       arithmetischer Quotient von ARG1 geteilt durch ARG2\n"
 "  ARG1 % ARG2       arithmetischer Rest von ARG1 geteilt durch ARG2\n"
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -4408,7 +4511,7 @@ msgstr ""
 "                              sonst 0\n"
 "  length ZEICHENKETTE       Länge der ZEICHENKETTE\n"
 
-#: src/expr.c:251
+#: src/expr.c:250
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
 "                               keyword like 'match' or an operator like '/'\n"
@@ -4421,7 +4524,7 @@ msgstr ""
 "\n"
 "  ( AUSDRUCK )              Wert des AUSDRUCKs\n"
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -4442,7 +4545,7 @@ msgstr ""
 "0\n"
 "zurückgegeben.\n"
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -4455,32 +4558,32 @@ msgstr ""
 "und\n"
 "3, wenn ein Fehler auftrat\n"
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, c-format
 msgid "syntax error"
 msgstr "Syntaxfehler"
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, c-format
 msgid "error in regular expression matcher"
 msgstr "Fehler bei Suche mit regulären Ausdrücken"
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, c-format
 msgid "non-integer argument"
 msgstr "Argument, das keine Zahl ist"
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr "Teilung durch Null"
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr "setzen Sie LC_ALL=C, um das Problem zu umgehen"
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, c-format
 msgid "the strings compared were %s and %s"
 msgstr "die verglichenen Zeichenketten waren %s und %s"
@@ -4490,27 +4593,27 @@ msgstr "die verglichenen Zeichenketten waren %s und %s"
 msgid "Niels Moller"
 msgstr "Niels Möller"
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
 msgstr "Lucas-Primzahlentest scheiterte. Dies sollte nicht vorkommen"
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
 msgstr "Ãœberlauf der Warteschlange in squfof"
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, c-format
 msgid "%s is not a valid positive integer"
 msgstr "%s ist keine gültige positive ganze Zahl"
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr "%s ist zu groß"
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
@@ -4519,7 +4622,7 @@ msgstr ""
 "Aufruf: %s [ZAHL...]\n"
 "  oder: %s OPTION\n"
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
 "are specified on the command line, read them from standard input.\n"
@@ -4630,17 +4733,17 @@ msgid "invalid number of columns: %s"
 msgstr "Ungültige Anzahl Spalten: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr "Pádraig Brady"
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, c-format
 msgid "Usage: %s\n"
 msgstr "Aufruf: %s\n"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
@@ -4648,12 +4751,12 @@ msgstr ""
 "Plattformabhängige Grenzen ausgeben in für Shell-Scripte nützlichem Format.\n"
 "\n"
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, c-format
 msgid "failed to get groups for user %s"
 msgstr "konnte Gruppen für Nutzer %s nicht ermitteln"
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, c-format
 msgid "failed to get groups for the current process"
 msgstr "konnte Gruppen für den aktuellen Prozess nicht ermitteln"
@@ -4676,25 +4779,25 @@ msgid ""
 msgstr ""
 "Gruppenmitgliedschaften für BENUTZERNAME oder, wenn dieser nicht angegeben "
 "ist,\n"
-"dem aktuellen Prozess anzeigen (welche abweichen kann, wenn die Datenbank\n"
+"des aktuellen Prozesses anzeigen (welche abweichen kann, wenn die Datenbank\n"
 "mit Gruppeninformationen sich geändert hat).\n"
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, c-format
 msgid "cannot get real UID"
 msgstr "es ist nicht möglich, die echte UID zu erfragen"
 
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, c-format
 msgid "cannot get effective GID"
 msgstr "die effektive GID kann nicht ermittelt werden"
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, c-format
 msgid "cannot get real GID"
 msgstr "die echte GID kann nicht ermittelt werden"
 
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, c-format
 msgid "%s: no such user"
 msgstr "%s: Einen solchen Benutzer gibt es nicht"
@@ -4746,58 +4849,48 @@ msgstr ""
 "b 512, kB 1000, K 1024, MB 1000×1000, M 1024×1024,\n"
 "GB 1000×1000×1000, G 1024×1024×1024, und so weiter für T, P, E, Z, Y.\n"
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr "%s: Datei zu stark geschrumpft"
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, c-format
 msgid "%s: number of bytes is too large"
 msgstr "%s: Anzahl Bytes ist zu groß"
 
-#: src/head.c:440
-#, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr "%s: es ist nicht möglich, zum ursprünglichen Stelle zu springen"
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr "%s: es ist nicht möglich, zum Offset %s zu springen"
 
-#: src/head.c:673
-#, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "%s: der Dateizeiger konnte nicht zurück gesetzt werden"
-
-#: src/head.c:798
+#: src/head.c:423 src/tail.c:457
 #, c-format
-msgid "cannot reposition file pointer for %s"
-msgstr "es ist nicht möglich, den Datei�Zeiger für %s neu zu positionieren"
+msgid "%s: cannot seek to relative offset %s"
+msgstr "%s: es ist nicht möglich, zum relativen Offset %s zu springen"
 
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr "%s: %s ist so groß, dass es nicht dargestellt werden kann"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr "Anzahl Zeilen"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr "Anzahl Bytes"
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr "ungültige Anzahl von Zeilen"
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr "ungültige Anzahl von Bytes"
 
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, c-format
 msgid "invalid trailing option -- %c"
 msgstr "ungültige folgende Option -- %c"
@@ -4844,40 +4937,49 @@ msgid "cannot determine hostname"
 msgstr "es ist nicht möglich, den Rechnername zu ermitteln"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr "Arnold Robbins"
 
-#: src/id.c:81
+#: src/id.c:84
 #, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
-msgstr "Aufruf: %s [OPTION]... [BENUTZERNAME]\n"
+msgid "Usage: %s [OPTION]... [USER]\n"
+msgstr "Aufruf: %s [OPTION]... [BENUTZER]\n"
 
-#: src/id.c:82
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
 msgstr ""
 "Nutzer- und Gruppeninformationen zu BENUTZER anzeigen, oder\n"
 "(wenn BENUTZER nicht angegeben ist) für den aktuellen Benutzer.\n"
 "\n"
-"  -a              ignoriert, nur aus Kompatibilitätsgründen\n"
+
+#: src/id.c:90
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
+msgstr ""
+"  -a              ignoriert, dient nur der Kompatibilität zu anderen "
+"Versionen\n"
 "  -Z, --context   nur den Sicherheitskontext des aktuellen Nutzers ausgeben\n"
 "  -g, --group     nur die effektive Gruppen�ID ausgeben\n"
 "  -G, --groups    alle Gruppen-IDs ausgeben\n"
 "  -n, --name      Namen statt Nummer ausgeben, für -ugG\n"
 "  -r, --real      die reale ID anstelle der effektiven ausgeben, für -ugG\n"
 "  -u, --user      nur die effektive Benutzer�ID ausgeben\n"
+"  -z, --zero      Einträge durch NULL-Zeichen statt Leerzeichen trennen\n"
+"                   im Standardformat nicht erlaubt\n"
 
-#: src/id.c:96
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
@@ -4886,119 +4988,129 @@ msgstr ""
 "Ohne Angabe einer OPTION, wird eine brauchbare Menge an Informationen\n"
 "ausgegeben.\n"
 
-#: src/id.c:140
+#: src/id.c:151
+#, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr "--context (-Z) funktioniert nur auf einem Kernel mit SELinux/SMACK"
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr "--context (-Z) funktioniert nur auf einem Kernel mit SELinux"
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr ""
 "der Sicherheitskontext kann nicht ausgegeben werden, wenn ein Nutzer "
 "angegeben wurde"
 
-#: src/id.c:178
+#: src/id.c:198
 #, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr "eine eingeschränkte Ausgabe ist bei Mehrfachauswahl nicht möglich"
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr ""
 "Im Vorgabe�Format ist es nicht möglich, nur Namen oder echte IDs auszugeben"
 
-#: src/id.c:199
+#: src/id.c:209
+#, c-format
+msgid "option --zero not permitted in default format"
+msgstr "die Option --zero ist im Sandardformat nicht zulässig"
+
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
 msgstr "der Prozesskontext kann nicht ermittelt werden"
 
-#: src/id.c:224
+#: src/id.c:265
 #, c-format
 msgid "cannot get effective UID"
 msgstr "die effektive UID kann nicht ermittelt werden"
 
-#: src/id.c:311
+#: src/id.c:354
 #, c-format
 msgid "cannot find name for user ID %s"
 msgstr "Für Benutzerkennung %s kann kein Name gefunden werden"
 
-#: src/id.c:329
+#: src/id.c:372
 #, c-format
 msgid "uid=%s"
 msgstr "uid=%s"
 
-#: src/id.c:334
+#: src/id.c:377
 #, c-format
 msgid " gid=%s"
 msgstr " gid=%s"
 
-#: src/id.c:341
+#: src/id.c:384
 #, c-format
 msgid " euid=%s"
 msgstr " euid=%s"
 
-#: src/id.c:349
+#: src/id.c:392
 #, c-format
 msgid " egid=%s"
 msgstr " egid=%s"
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr " Gruppen="
 
-#: src/id.c:393
+#: src/id.c:437
 #, c-format
 msgid " context=%s"
 msgstr " Kontext=%s"
 
-#: src/install.c:373
+#: src/install.c:376
 #, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr "Warnung: %s: der Kontext konnte nicht auf %s geändert werden"
 
-#: src/install.c:414
+#: src/install.c:417
 #, c-format
 msgid "creating directory %s"
 msgstr "Verzeichnis %s wird angelegt"
 
-#: src/install.c:482
+#: src/install.c:485
 #, c-format
 msgid "cannot change ownership of %s"
 msgstr "der Eigentümer von %s kann nicht geändert werden"
 
-#: src/install.c:506
+#: src/install.c:509
 #, c-format
 msgid "cannot set time stamps for %s"
 msgstr "Setzen der Zeitstempel für %s nicht möglich"
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, c-format
 msgid "fork system call failed"
 msgstr "Systemruf fork fehlgeschlagen"
 
-#: src/install.c:531
+#: src/install.c:535
 #, c-format
 msgid "cannot run %s"
 msgstr "%s kann nicht ausgeführt werden"
 
-#: src/install.c:535
+#: src/install.c:539
 #, c-format
 msgid "waiting for strip"
 msgstr "Es wird auf strip gewartet"
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr "strip�Prozess beendete sich auf ungute Weise"
 
-#: src/install.c:558
+#: src/install.c:565
 #, c-format
 msgid "invalid user %s"
 msgstr "Ungültiger Anwender %s"
 
-#: src/install.c:594
+#: src/install.c:601
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -5011,7 +5123,7 @@ msgstr ""
 " oder:  %s [OPTION]... -t=VERZEICHNIS QUELLE...\n"
 " oder:  %s [OPTION]... -d=VERZEICHNIS...\n"
 
-#: src/install.c:601
+#: src/install.c:608
 msgid ""
 "\n"
 "This install program copies files (often just compiled) into destination\n"
@@ -5036,7 +5148,7 @@ msgstr ""
 "angegebenen Verzeichnis(se) erzeugt.\n"
 "\n"
 
-#: src/install.c:615
+#: src/install.c:622
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
 "  -b                  like --backup but does not accept an argument\n"
@@ -5058,7 +5170,7 @@ msgstr ""
 "                            Bestandteile der angegebenen Verzeichnisse "
 "erzeugen\n"
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -5077,7 +5189,7 @@ msgstr ""
 "xr-x\n"
 "  -o, --owner=BESITZER    Besitzer setzen (nur für den Superuser)\n"
 
-#: src/install.c:631
+#: src/install.c:638
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
 "files\n"
@@ -5100,70 +5212,68 @@ msgstr ""
 "  -v, --verbose           den Namen jedes Verzeichnisses bei Erzeugung "
 "ausgeben\n"
 
-#: src/install.c:641
+#: src/install.c:648
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
 "      --preserve-context  SELinux-Sicherheitskontext erhalten\n"
-"  -Z, --context=KONTEXT   SELinux-Sicherheitskontext von Dateien u. Verz. "
-"setzen\n"
+"  -Z                      SELinux-Sicherheitskontext von Dateien u. Verz.\n"
+"                            auf den Standardtyp setzen\n"
+"                            KONTEXT setzen\n"
+"      ---context[=KTXT]   wie -Z, oder, wenn angegeben, auf KONTEXT setzen\n"
+
+#: src/install.c:696 src/unlink.c:86
+#, c-format
+msgid "cannot unlink %s"
+msgstr "Entfernen (unlink) von %s nicht möglich"
 
-#: src/install.c:859
+#: src/install.c:877
 #, c-format
 msgid ""
 "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
 msgstr ""
 "WARNUNG: ignoriere --preserve-context; dieser Kernel unterstützt kein SELinux"
 
-#: src/install.c:869
-#, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
-msgstr ""
-"WARNUNG: ignoriere --context (-Z); dieser Kernel unterstützt kein SELinux"
-
-#: src/install.c:886
+#: src/install.c:917
 #, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr ""
 "die Option strip darf nicht bei Installation von Verzeichnissen benutzt "
 "werden"
 
-#: src/install.c:889
+#: src/install.c:920
 #, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr ""
 "Zielverzeichnis darf nicht bei Installation von Verzeichnissen benutzt werden"
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr "der Ziel-Kontext von %s kann nicht erzwungen und beibehalten werden"
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, c-format
 msgid "invalid mode %s"
 msgstr "Ungültiger Modus %s"
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr "WARNUNG: ignoriere --strip-program; Option -s wurde nicht angegeben"
 
-#: src/install.c:959
+#: src/install.c:1001
 #, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr ""
 "die Optionen --compare (-C) und --preserve-timestamps schließen sich "
 "gegenseitig aus"
 
-#: src/install.c:966
+#: src/install.c:1008
 #, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr "die Optionen --compare (-C) und --strip schließen sich gegenseitig aus"
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -5177,7 +5287,7 @@ msgstr ""
 msgid "Mike Haertel"
 msgstr "Mike Haertel"
 
-#: src/join.c:191
+#: src/join.c:195
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
 "standard output.  The default join field is the first, delimited\n"
@@ -5200,7 +5310,7 @@ msgstr ""
 "DATEI2\n"
 "  -e LEER           fehlende Eingabefelder durch LEER ersetzen\n"
 
-#: src/join.c:200
+#: src/join.c:204
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
 "  -j FIELD          equivalent to '-1 FIELD -2 FIELD'\n"
@@ -5214,7 +5324,7 @@ msgstr ""
 "  -t ZEICHEN        ZEICHEN als Trennzeichen für Ein� und Ausgabefelder "
 "nehmen\n"
 
-#: src/join.c:206
+#: src/join.c:210
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
 "  -1 FIELD          join on this FIELD of file 1\n"
@@ -5236,7 +5346,13 @@ msgstr ""
 "verwenden\n"
 "                    und sie ausgeben, ohne zu versuchen, sie zu kombinieren\n"
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr ""
+"  -z, --zero-terminated     Zeilen mit Nullbyte beenden, nicht mit\n"
+"                              Zeilenvorschub\n"
+
+#: src/join.c:225
 msgid ""
 "\n"
 "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n"
@@ -5271,47 +5387,47 @@ msgstr ""
 "Wenn die Eingabe nicht sortiert ist und einige Zeilen nicht verschmolzen\n"
 "werden können, so wird eine Warnmeldung ausgegeben.\n"
 
-#: src/join.c:403
+#: src/join.c:410
 #, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
 msgstr "%s:%<PRIuMAX>: ist nicht sortiert: %.*s"
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, c-format
 msgid "invalid field number: %s"
 msgstr "Ungültige Feldnummer: %s"
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, c-format
 msgid "invalid field specifier: %s"
 msgstr "Ungültiger Feldbezeichner: %s"
 
-#: src/join.c:877
+#: src/join.c:884
 #, c-format
 msgid "invalid file number in field spec: %s"
 msgstr "Ungültige Feldnummer in Feldbezeichner: %s"
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr "inkompatible Verschmelzungsfelder: %lu, %lu"
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr "einander widersprechende Leerfeld�Ersetzungszeichenketten"
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, c-format
 msgid "multi-character tab %s"
 msgstr "Multi-Zeichen-Tabulator %s"
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr "inkompatible Tabulatoren"
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr "Alle beide Dateien können nicht Standardeingabe sein"
@@ -5435,48 +5551,48 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr "Erzeugen von Verknüpfung %s zu %s nicht möglich"
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr "%s: harte Verknüpfung für Verzeichnisse nicht erlaubt"
 
 # %s: kann kein Verzeichnis überschreiben
-#: src/ln.c:255
+#: src/ln.c:271
 #, c-format
 msgid "%s: cannot overwrite directory"
 msgstr "%s: das Überschreiben des Verzeichnisses ist nicht möglich"
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
 msgstr "%s: %s ersetzen? "
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, c-format
 msgid "failed to create symbolic link %s"
 msgstr "die symbolische Verknüpfung %s konnte nicht angelegt werden"
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr "die symbolische Verknüpfung %s -> %s konnte nicht angelegt werden"
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr "Die harte Verknüpfung zu %.0s%s konnte nicht angelegt werden"
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, c-format
 msgid "failed to create hard link %s"
 msgstr "Die harte Verknüpfung %s konnte nicht angelegt werden"
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, c-format
 msgid "failed to create hard link %s => %s"
 msgstr "Die harte Verknüpfung %s => %s konnte nicht angelegt werden"
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -5489,7 +5605,7 @@ msgstr ""
 " oder:  %s [OPTION]... ZIEL... VERZ            (3. Form)\n"
 " oder:  %s [OPTION]... -t VERZ ZIEL...         (4. Form)\n"
 
-#: src/ln.c:381
+#: src/ln.c:398
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
 "In the 2nd form, create a link to TARGET in the current directory.\n"
@@ -5513,7 +5629,7 @@ msgstr ""
 "Verzeichnis interpretiert.\n"
 "\n"
 
-#: src/ln.c:394
+#: src/ln.c:411
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
 "file\n"
@@ -5535,7 +5651,7 @@ msgstr ""
 "                                 Systembeschränkungen, auch für Superuser.)\n"
 "  -f, --force                  Vorhandene Ziele entfernen.\n"
 
-#: src/ln.c:402
+#: src/ln.c:419
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
 "  -L, --logical               dereference TARGETs that are symbolic links\n"
@@ -5555,10 +5671,12 @@ msgstr ""
 "behandeln\n"
 "  -P, --physical              direkte harte Verknüpfungen zu symbolischen "
 "machen\n"
+"  -r, --relative              symbolische Verknüpfungen relativ zum Ursprung "
+"erzeugen\n"
 "  -s, --symbolic               symbolische statt harter Verknüpfung "
 "erzeugen\n"
 
-#: src/ln.c:411
+#: src/ln.c:428
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
 "  -t, --target-directory=DIRECTORY  specify the DIRECTORY in which to "
@@ -5575,7 +5693,7 @@ msgstr ""
 "  -T, --no-target-directory    LINK_NAME als Namen normaler Datei behandeln\n"
 "  -v, --verbose                jeden Dateinamen vor dem Verknüpfen ausgeben\n"
 
-#: src/ln.c:433
+#: src/ln.c:450
 #, c-format
 msgid ""
 "\n"
@@ -5590,12 +5708,12 @@ msgstr ""
 "ist. Vorgabe ist %s.\n"
 "\n"
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr "--target-directory und --no-target-directory sind nicht kombinierbar"
 
-#: src/ln.c:588
+#: src/ln.c:605
 #, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr "--relative ist ohne --symbolic nicht zulässig"
@@ -5628,7 +5746,7 @@ msgstr "kein Loginname"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 msgid "%b %e  %Y"
 msgstr "%e. %b %Y "
 
@@ -5637,95 +5755,95 @@ msgstr "%e. %b %Y "
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 msgid "%b %e %H:%M"
 msgstr "%e. %b %H:%M"
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr "Ungültiger Wert der Umgebungsvariable QUOTING_STYLE wird ignoriert: %s"
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr "Ungültige Breite in Umgebungsvariable COLUMNS wird ignoriert: %s"
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr ""
 "Ungültige Tabulator�Größe in Umgebungsvariable TABSIZE wird ignoriert: %s"
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, c-format
 msgid "invalid line width: %s"
 msgstr "ungültige Zeilenbreite: %s"
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, c-format
 msgid "invalid tab size: %s"
 msgstr "ungültige Tabulatorgröße: %s"
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, c-format
 msgid "invalid time style format %s"
 msgstr "Ungültiges Zeitformat %s"
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 msgid "Valid arguments are:\n"
 msgstr "Gültige Argumente sind:\n"
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr "  - +FORMAT (zB. +H:%M) für ein Format im Stil von „date“\n"
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr "Fehler beim Initialisieren der Monats-Zeichenketten"
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, c-format
 msgid "unrecognized prefix: %s"
 msgstr "Präfix nicht erkannt: %s"
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr "Wert für Umgebungsvariable LS_COLORS ist syntaktisch fehlerhaft."
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, c-format
 msgid "cannot open directory %s"
 msgstr "Öffnen von Verzeichnis %s nicht möglich"
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, c-format
 msgid "cannot determine device and inode of %s"
 msgstr "Gerät und INode von %s können nicht bestimmt werden"
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, c-format
 msgid "%s: not listing already-listed directory"
 msgstr "%s: schon angezeigtes Verzeichnis wird nicht erneut aufgeführt"
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, c-format
 msgid "reading directory %s"
 msgstr "das Verzeichnis %s wird gelesen"
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, c-format
 msgid "closing directory %s"
 msgstr "das Verzeichnis %s wird geschlossen"
 
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, c-format
 msgid "cannot compare file names %s and %s"
 msgstr "Die Dateinamen %s und %s können nicht verglichen werden"
 
-#: src/ls.c:4721
+#: src/ls.c:4781
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
 "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n"
@@ -5734,7 +5852,7 @@ msgstr ""
 "momentane Verzeichnis). Alphabetisches Sortieren der Einträge, falls weder\n"
 "-cftuvSUX noch --sort angegeben wurden.\n"
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
 "  -A, --almost-all           do not list implied . and ..\n"
@@ -5747,17 +5865,17 @@ msgstr ""
 "      --author               mit -l, den Urheber jeder Datei ausgeben\n"
 "  -b, --escape               nicht�druckbare Zeichen oktale ausgeben\n"
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
 "      --block-size=GRÖßE     GRÖßE große Blöcke verwenden. So gibt z.B\n"
@@ -5773,15 +5891,14 @@ msgstr ""
 "nach\n"
 "                               Namen sortieren\n"
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 "  -C                         Einträge mehrspaltig ausgeben\n"
@@ -5795,7 +5912,7 @@ msgstr ""
 "  -D, --dired                Ausgabe für den „dired“�Modus im Emacs "
 "formatieren\n"
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
 "  -F, --classify             append indicator (one of */=>@|) to entries\n"
@@ -5813,15 +5930,16 @@ msgstr ""
 "                               single-column -1, verbose -l, vertical -C\n"
 "      --full-time            wie -l --time-style=full-iso\n"
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr "  -g                         wie -l, aber Eigentümer nicht auflisten\n"
 
-#: src/ls.c:4763
+#: src/ls.c:4823
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 "      --group-directories-first\n"
@@ -5829,10 +5947,10 @@ msgstr ""
 "                               kann zusammen mit Sortierung benutzt werden,\n"
 "                               doch --sort=none schaltet Gruppierung ab\n"
 
-#: src/ls.c:4769
+#: src/ls.c:4829
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
@@ -5841,14 +5959,14 @@ msgstr ""
 "                               Format ausgeben (z. B. 1K 234M 2G)\n"
 "      --si                   genauso, aber mit 1000 statt 1024 als Teiler\n"
 
-#: src/ls.c:4775
+#: src/ls.c:4835
 msgid ""
 "  -H, --dereference-command-line\n"
 "                             follow symbolic links listed on the command "
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
@@ -5864,7 +5982,7 @@ msgstr ""
 "                               nicht auflisten (überschrieben durch -a oder -"
 "A)\n"
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
 "names:\n"
@@ -5873,7 +5991,7 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 "      --indicator-style=WORT  Indikator des Stils WORT an Namen der "
 "Einträge\n"
@@ -5885,7 +6003,7 @@ msgstr ""
 "                               passt, nicht auflisten\n"
 "  -k, --kibibytes            benutzt 1024 Byte Blöcke\n"
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -5901,7 +6019,7 @@ msgstr ""
 "  -m                         so viele Einträge wie möglich, durch Kommata\n"
 "                               getrennt, in eine Zeile packen\n"
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -5917,11 +6035,11 @@ msgstr ""
 "  -o                         wie -l, aber ohne Gruppen�Informationen\n"
 "  -p, --indicator-style=slash  an Verzeichnisse ein „/“ anhängen\n"
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -5938,7 +6056,7 @@ msgstr ""
 "                               literal, locale, shell, shell-always, c, "
 "escape\n"
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
 "  -R, --recursive            list subdirectories recursively\n"
@@ -5949,16 +6067,18 @@ msgstr ""
 "  -R, --recursive            Unterverzeichnissen rekursiv ausgeben\n"
 "  -s, --size                 die Größe jeder Datei in Blöcken ausgeben\n"
 
-#: src/ls.c:4825
+#: src/ls.c:4886
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 "  -S                         nach Dateigröße sortieren\n"
 "      --sort=WORT            nach WORT anstatt nach Name sortieren: none -U\n"
@@ -5969,16 +6089,18 @@ msgstr ""
 "                               die angegebene Zeit als Sortierkriterium\n"
 "                               bei --sort=time verwenden\n"
 
-#: src/ls.c:4835
+#: src/ls.c:4896
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
 msgstr ""
 "      --time-style=STIL      mit -l, Zeiten mittels Stil STIL anzeigen:\n"
 "                               full-iso, long-iso, iso, locale, +FORMAT\n"
@@ -5991,7 +6113,7 @@ msgstr ""
 "„posix-“,\n"
 "                             ist STIL nur außerhalb der POSIX�Locale gültig\n"
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 msgid ""
 "  -t                         sort by modification time, newest first\n"
 "  -T, --tabsize=COLS         assume tab stops at each COLS instead of 8\n"
@@ -6000,10 +6122,10 @@ msgstr ""
 "  -T, --tabsize=SPALTEN      Tabstops statt alle 8 alle SPALTEN Zeichen "
 "setzen\n"
 
-#: src/ls.c:4848
+#: src/ls.c:4912
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
@@ -6018,13 +6140,12 @@ msgstr ""
 "innerhalb\n"
 "                               von Text\n"
 
-#: src/ls.c:4855
+#: src/ls.c:4919
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 "  -w, --width=SPALTEN        gegebene Bildschirmbreite statt des momentanen\n"
@@ -6035,7 +6156,7 @@ msgstr ""
 "anzeigen\n"
 "  -1                         eine Datei pro Zeile auflisten\n"
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -6051,7 +6172,7 @@ msgstr ""
 "ist. Die Umgebungsvariable LS_COLORS kann die Einstellungen verändern.\n"
 "Verwenden Sie den Befehl dircolors um sie zu setzen.\n"
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -6129,27 +6250,26 @@ msgstr "  -t, --text           im Textmodus lesen (Voreinstellung)\n"
 #: src/md5sum.c:195
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
 "\n"
-"Die folgenden drei Optionen sind nur beim Überprüfen sinnvoll:\n"
+"Die folgenden vier Optionen sind nur beim Überprüfen sinnvoll:\n"
 "      --quiet           nicht für jede erfolgreich geprüfte Datei OK "
 "ausgeben\n"
 "      --status          nichts ausgeben, der Statuscode zeigt Erfolg an\n"
+"      --strict         bei inkorrekt formatierten Zeilen mit Prüfsummen das\n"
+"                        Programm mit einem Rückgabewert ungleich Null "
+"beenden\n"
 "  -w, --warn            bei ungeeignet formatierten Prüfsummenzeilen warnen\n"
 "\n"
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-"      --strict         mit --check, endet nicht-null bei illegalen Eingaben\n"
-
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, c-format
 msgid ""
 "\n"
@@ -6165,42 +6285,42 @@ msgstr ""
 "anzeigt („*“ für binär, „ “ für Text), und dem Namen jeder Datei "
 "auszugeben.\n"
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, c-format
 msgid "%s: too many checksum lines"
 msgstr "%s: zu viele Prüfsummenzeilen"
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr "%s: %<PRIuMAX>: nicht korrekt formatierte %s�Prüfsummenzeile"
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr "%s: FEHLSCHLAG bei open oder read\n"
 
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr "FEHLSCHLAG"
 
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr "OK"
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr "%s: keine korrekt formatierte %s�Prüfsummenzeile gefunden"
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
 msgstr[0] "WARNUNG: %<PRIuMAX> Zeile ist nicht korrekt formatiert"
 msgstr[1] "WARNUNG: %<PRIuMAX> Zeilen sind nicht korrekt formatiert"
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
@@ -6208,24 +6328,24 @@ msgstr[0] "WARNUNG: die aufgeführte Datei konnte nicht gelesen werden"
 msgstr[1] ""
 "WARNUNG: %<PRIuMAX> aufgeführte Dateien konnten nicht gelesen werden"
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
 msgstr[0] "WARNUNG: die %<PRIuMAX> berechnete Prüfsumme passte NICHT"
 msgstr[1] "WARNUNG: %<PRIuMAX> berechnete Prüfsummen passten NICHT"
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
 msgstr "--tag unterstützt nicht den --text Modus"
 
-#: src/md5sum.c:766
+#: src/md5sum.c:770
 #, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr "Die Option --tag ist für die Kontrolle von Prüfsummen sinnlos"
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
@@ -6233,109 +6353,143 @@ msgstr ""
 "Die Optionen --binary und --text sind bei der Kontrolle von Prüfsummen "
 "nutzlos"
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr "Die Option --status ist nur bei der Kontrolle von Prüfsummen sinnvoll"
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr ""
 "Die Option --warn ist nur nur bei der Kontrolle von Prüfsummen sinnvoll"
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr "Die Option --quiet ist nur bei der Kontrolle von Prüfsummen sinnvoll"
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr ""
 "Die Option --strict hat nur bei der Kontrolle von Prüfsummen eine Bedeutung"
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr "Aufruf: %s [OPTION]... VERZEICHNIS...\n"
 
-#: src/mkdir.c:57
+#: src/mkdir.c:59
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
 msgstr "Erzeugen der/des Verzeichnisse(s), wenn sie noch nicht existieren.\n"
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 "  -m, --mode=MODUS  Zugriffsrechte setzen (wie chmod), nicht a=rwx − umask\n"
 "  -p, --parents     kein Fehler, wenn vorhanden; übergeordnete\n"
 "                      Verzeichnisse erzeugen, wenn notwendig\n"
 "  -v, --verbose     für jedes angelegte Verzeichnis eine Meldung ausgeben\n"
-"  -Z, --context=K   SELinux-Sicherheitskontext jedes erzeugten "
+
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+"  -Z                   SELinux-Sicherheitskontext jedes erzeugten "
 "Verzeichnisses\n"
-"                      auf K setzen\n"
+"                         auf den Standardtyp setzen\n"
+"      --context[=KTXT] wie -Z, oder, wenn angegeben den SELinux- oder "
+"SMACK-\n"
+"                         Kontext auf KTXT setzen\n"
+
+#: src/mkdir.c:127 src/mkdir.c:172
+#, c-format
+msgid "failed to set default creation context for %s"
+msgstr ""
+"der Standard-Kontext zur Dateierstellung von %s konnte nicht gesetzt werden"
+
+#: src/mkdir.c:191
+#, c-format
+msgid "failed to restore context for %s"
+msgstr "der Kontext von %s konnten nicht wiederhergestellt werden"
 
-#: src/mkdir.c:168
+#: src/mkdir.c:231
 #, c-format
 msgid "created directory %s"
 msgstr "Verzeichnis %s angelegt"
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr ""
+"WARNUNG: --context wird ignoriert, da dieser Kernel SELinux/SMACK nicht\n"
+"           unterstützt"
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr "Aufruf: %s [OPTION]... NAME...\n"
 
-#: src/mkfifo.c:52
+#: src/mkfifo.c:54
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
 msgstr ""
 "Benannte Pipes (FIFOs) mit den angegebenen NAMEn erzeugen.\n"
 "\n"
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
 msgstr ""
 "  -m, --mode=MODUS   Zugriffsrechte auf MODUS setzen, nicht a=rw − umask\n"
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
-"  -Z, --context=KTX  den SELinux-Sicherheitskontext jedes NAME auf KTX "
-"setzen\n"
+"  -Z                           den SELinux Sicherheitskontext auf den\n"
+"                                 Standardtyp setzen\n"
+"      --context[=KTXT]         Wie -Z, oder, wenn KTXT angegeben wurde,den\n"
+"                                 SELinux oder SMACK Scherheitskontext auf\n"
+"                                 KTXT setzten\n"
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, c-format
 msgid "invalid mode"
 msgstr "ungültiger Zugriffsmodus"
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr "Der Modus darf nur Dateizugriffsrechte angeben."
 
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
+#, c-format
+msgid "cannot set permissions of %s"
+msgstr "die Zugriffsrechte von %s können nicht geändert werden"
+
+#: src/mknod.c:54
 #, c-format
 msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr "Aufruf: %s [OPTION]... NAME TYP [MAJOR MINOR]\n"
 
-#: src/mknod.c:54
+#: src/mknod.c:56
 msgid "Create the special file NAME of the given TYPE.\n"
 msgstr ""
 "Spezial�Datei NAME vom angegebenen TYP erzeugen.\n"
 "\n"
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr ""
-"  -Z, --context=KTX  den SELinux-Sicherheitskontext von NAME auf KTX setzen\n"
-
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -6352,7 +6506,7 @@ msgstr ""
 "0\n"
 "beginnen, oktal; anderenfalls dezimal. TYP kann sein:\n"
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 msgid ""
 "\n"
 "  b      create a block (buffered) special file\n"
@@ -6364,57 +6518,57 @@ msgstr ""
 "  c, u   eine zeichenorienterte (ungepufferte) Spezial�Datei anlegen\n"
 "  p      eine FIFO anlegen\n"
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 msgid "Special files require major and minor device numbers."
 msgstr ""
 "Beim Erzeugen von Spezialdateien müssen Major� und Minor�Gerätenummern "
 "angegeben werden"
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 msgid "Fifos do not have major and minor device numbers."
 msgstr "Fifos habe keine Major� und Minor�Gerätenummern."
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, c-format
 msgid "block special files not supported"
 msgstr "Blockorientierte Spezialdateien werden nicht unterstützt"
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, c-format
 msgid "character special files not supported"
 msgstr "Zeichenorientierte Spezialdateien werden nicht unterstützt"
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, c-format
 msgid "invalid major device number %s"
 msgstr "Ungültige Major�Gerätenummer %s"
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, c-format
 msgid "invalid minor device number %s"
 msgstr "Ungültige Minor�Gerätenummer %s"
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, c-format
 msgid "invalid device %s %s"
 msgstr "Ungültiges Gerät %s %s"
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, c-format
 msgid "invalid device type %s"
 msgstr "Ungültiger Gerätetyp %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr "Eric Blake"
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr "Aufruf: %s [OPTION]... [SCHABLONE]\n"
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
 "TEMPLATE must contain at least 3 consecutive 'X's in last component.\n"
@@ -6425,120 +6579,113 @@ msgstr ""
 "benutzt\n"
 "und --tmpdir wird implizit verwendet.\n"
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
 "Dateien werden u+rw erzeugt und Verzeichnisse u+rwx, abzüglich Umask-\n"
 "Beschränkungen.\n"
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
 "  -q, --quiet         suppress diagnostics about file/dir-creation failure\n"
 msgstr ""
-"  -d, --directory     erzeugt ein Verzeichnis und keine Datei  -u, --dry-"
-"run       es wird nichts erzeugt; nur ein Name wird ausgegeben\n"
+"  -d, --directory     erzeugt ein Verzeichnis und keine Datei\n"
+"  -u, --dry-run       es wird nichts erzeugt; nur ein Name wird ausgegeben\n"
 "                      (unsicher)\n"
 "  -q, --quiet         unterdrückt Benachrichtigungen beim Scheitern des\n"
 "                      Anlegens von Dateien bzw. Verzeichnissen\n"
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
 "      --suffix=ENDUNG hängt ENDUNG an SCHABLONE an. ENDUNG darf keinen\n"
 "                      Schrägstrich enthalten.\n"
 "                      Diese Option gilt implizit, wenn SCHABLONE nicht\n"
 "                      mit einem X endet.\n"
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
-"  --tmpdir[=VERZ]  SCHABLONE relativ zu VERZ betrachten. Wenn VERZ nicht\n"
-"                     angegeben, wird $TMPDIR benutzt (wenn gesetzt), sonst /"
-"tmp.\n"
-"                     Mit dieser Option muss SCHABLONE kein absoluter Name "
-"sein.\n"
-"                     Anders als mit -t darf SCHABLONE Schrägstriche "
-"enthalten,\n"
-"                     aber auch hier wird mktemp nur die letzte Komponente\n"
-"                     erstellen.\n"
+"  -p VERZ, --tmpdir[=VERZ]  SCHABLONE relativ zu VERZ betrachten. Wird VERZ\n"
+"                          nicht angegeben, wird $TMPDIR benutzt (wenn "
+"gesetzt),\n"
+"                          sonst /tmp.\n"
+"                          SCHABLONE darf kein absoluter Name sein.\n"
+"                          Anders als mit -t darf SCHABLONE Schrägstriche\n"
+"                          enthalten, aber auch hier wird mktemp nur die "
+"letzte\n"
+"                          Komponente erstellen.\n"
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
 msgstr ""
-"  -p DIR           verwendet DIR als Präfix; impliziert -t [veraltet]\n"
 "  -t               SCHABLONE als Komponente eines einzelnen Dateinamen "
 "nehmen,\n"
 "                     relativ zu einem Verzeichnis: $TMPDIR, wenn gesetzt; "
 "sonst\n"
 "                     das mit -p gegebene Verzeichnis; sonst /tmp (veraltet)\n"
 
-#: src/mktemp.c:223
-#, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr "konnte Standardfehlerausgabe nicht auf /dev/null umleiten"
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, c-format
 msgid "too many templates"
 msgstr "zu viele Schablonen"
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr "bei --suffix muss die Schablone %s mit einem X enden"
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr "ungültige Endung %s, sie enthält einen Verzeichnistrenner"
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr "zu wenige Xs in der Schablone %s"
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr "ungültige Schablone, %s, sie enthält einen Verzeichnistrenner"
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr "ungültige Schablone, %s; mit --tmpdir darf sie nicht absolut sein"
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, c-format
 msgid "failed to create directory via template %s"
 msgstr "konnte das Verzeichnis nicht mittels Schablone %s erstellen"
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, c-format
 msgid "failed to create file via template %s"
 msgstr "konnte die Datei nicht mittels Schablone %s erstellen"
 
-#: src/mv.c:292
+#: src/mv.c:294
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 "Umbenennen von QUELLE in ZIEL, oder QUELLE(en) in VERZEICHNIS verschieben\n"
 
-#: src/mv.c:298
+#: src/mv.c:300
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
 "file\n"
@@ -6559,7 +6706,7 @@ msgstr ""
 "Wenn mehr als eine Option von -i, -f und -n angeben wird, so gilt die "
 "letzte.\n"
 
-#: src/mv.c:307
+#: src/mv.c:309
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
@@ -6572,7 +6719,7 @@ msgstr ""
 "  -S, --suffix=SUFFIX          die normale Sicherungs�Erweiterung "
 "überschreiben\n"
 
-#: src/mv.c:312
+#: src/mv.c:314
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
 "DIRECTORY\n"
@@ -6581,12 +6728,17 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
 "      --target-directory=VERZ  alle Quellen in Verzeichnis VERZ verschieben\n"
 "  -T, --no-target-directory    ZIEL als normale Datei behandeln\n"
 "  -u, --update                 nur ältere oder brandneue Dateien "
 "verschieben\n"
 "  -v, --verbose                Erklärung über Abläufe ausgeben\n"
+"  -Z, --context                setzt den SELinux-Sicherheitskontext des "
+"Ziels\n"
+"                                 auf den Standardtyp\n"
 
 #: src/nice.c:72
 #, c-format
@@ -6888,78 +7040,73 @@ msgid "%s: invalid number to ignore"
 msgstr "%s: ungültige zu ignorierende Anzahl"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
 msgstr "Assaf Gordon"
 
-#: src/numfmt.c:676
+#: src/numfmt.c:659
 #, c-format
-msgid "value too large to be converted: '%s'"
-msgstr "Wert ist für Umwandlung zu groß: „%s“"
+msgid "value too large to be converted: %s"
+msgstr "der Wert ist für eine Umwandlung zu groß: „%s“"
 
-#: src/numfmt.c:680
+#: src/numfmt.c:663
 #, c-format
-msgid "invalid number: '%s'"
-msgstr "ungültige Zahl: „%s“"
+msgid "invalid number: %s"
+msgstr "ungültige Zahl %s"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
+msgid "rejecting suffix in input: %s (consider using --from)"
 msgstr "Endung in Eingabe zurück gewiesen: „%s“ (evtl. --from verwenden)"
 
-#: src/numfmt.c:688
+#: src/numfmt.c:671
 #, c-format
-msgid "invalid suffix in input: '%s'"
+msgid "invalid suffix in input: %s"
 msgstr "ungültige Endung in Eingabe: „%s“"
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
 msgstr "fehlende „i“-Endung in Eingabe: „%s“ (zB. Ki/Mi/Gi)"
 
-#: src/numfmt.c:723
+#: src/numfmt.c:722 src/numfmt.c:768
 #, c-format
 msgid "failed to prepare value '%Lf' for printing"
 msgstr "der Wert „%Lf“ konnte nicht für Ausgabe aufbereitet werden"
 
-#: src/numfmt.c:787
+#: src/numfmt.c:791
 #, c-format
-msgid "invalid unit size: '%s'"
-msgstr "ungültige Tabulatorgröße: „%s“"
+msgid "invalid unit size: %s"
+msgstr "ungültige Einheitengröße: „%s“"
 
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
-#, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr "Hauptspeicher erschöpft (%zu Bytes wurden angefordert)"
-
-#: src/numfmt.c:813
+#: src/numfmt.c:814
 #, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
 msgstr "Aufruf: %s [OPTION]... [NUMMER]...\n"
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
 msgstr "ZAHL(en) von Standardeingabe oder Befehlsargumenten neu formatieren.\n"
 
-#: src/numfmt.c:820
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
 msgstr "      --debug          Warnungen bei ungültigen Eingaben ausgeben.\n"
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
 "  -d, --delimiter=X    verwendet X anstelle von Leerraum als Feldbegrenzung\n"
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
 "      --field N        ersetzt die Zahl in Eingabefeld N (Vorgabe ist 1)\n"
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
@@ -6967,7 +7114,7 @@ msgstr ""
 "      --format=FORMAT  verwendet Fließkomma-FORMAT im Stil von printf.\n"
 "                         Siehe FORMAT weiter unten für Details.\n"
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
@@ -6977,7 +7124,7 @@ msgstr ""
 "1).\n"
 "                         Siehe EINHEIT weiter unten\n"
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
@@ -6985,7 +7132,7 @@ msgstr ""
 "      --from-unit=N    Angabe der Einheit der Eingabe (statt der Vorgabe "
 "1).\n"
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
@@ -6996,7 +7143,7 @@ msgstr ""
 "                         Ziffern, z.B. 1.000.000 (hat also in C/POSIX\n"
 "                         Locales keine Auswirkung).\n"
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
@@ -7004,7 +7151,7 @@ msgstr ""
 "      --header[=N]     Ausgabe (ohne Umwandlung) der ersten N Kopfzeilen.\n"
 "                         N ist 1 wenn es nicht ausdrücklich angegeben wird.\n"
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
@@ -7012,7 +7159,7 @@ msgstr ""
 "      --invalid=MODUS  Verhalten bei ungültigen Zahlen: MODUS kann sein:\n"
 "                         abort (Vorgabe), fail, warn, ignore.\n"
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -7029,7 +7176,7 @@ msgstr ""
 "                         Leerzeichen, Tabulator oder Zeilenumbruch gefunden\n"
 "                         werden.\n"
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
@@ -7041,7 +7188,7 @@ msgstr ""
 "                        up, down, from-zero (Vorgabe), towards-zero, "
 "nearest\n"
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
@@ -7051,21 +7198,21 @@ msgstr ""
 "Zahlen\n"
 "                         akzeptieren.\n"
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
 "      --to=EIONHEIT    auto-skaliert auszugebende Zahlen in EINHEITen.\n"
 "                         Siehe EINHEIT weiter unten.\n"
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr ""
 "      --to-unit=N      Angabe der Einheit der Ausgabe (statt der Vorgabe "
 "1).\n"
 
-#: src/numfmt.c:877
+#: src/numfmt.c:878
 msgid ""
 "\n"
 "UNIT options:\n"
@@ -7073,14 +7220,14 @@ msgstr ""
 "\n"
 "EINHEIT-Optionen:\n"
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr ""
 "       none        Keine auto-skalierung erfolgt. Endungen lösen einen "
 "Fehler\n"
 "                     aus.\n"
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -7094,7 +7241,7 @@ msgstr ""
 "               1M  = 1000000\n"
 "               1Mi = 1048576\n"
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
@@ -7106,7 +7253,7 @@ msgstr ""
 "               1M = 1000000\n"
 "               ...\n"
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
@@ -7118,7 +7265,7 @@ msgstr ""
 "               1M = 1048576\n"
 "               ...\n"
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
@@ -7130,25 +7277,25 @@ msgstr ""
 "               1Mi = 1048576\n"
 "               ...\n"
 
-#: src/numfmt.c:905
+#: src/numfmt.c:906
 #, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
 "\n"
 "FORMAT muß geeignet sein, ein Fließkomma-Argument „%f“ auszugeben.\n"
 "Ein optionales Apostroph (%'f) aktiviert --grouping (wenn es von der\n"
 "aktuellen Locale unterstützt wird). Eine angegebene Breite (%10f) bewirkt\n"
-"das Auffüllen der Ausgabe. Wird die Breite neagtiv angegeben (%-10f),\n"
+"das Auffüllen der Ausgabe. Das angeben einer Breite von Null (%010f) füllt\n"
+"die Zahl mit Nullen aus. Wird die Breite negativ angegeben (%-10f),\n"
 "wird nach links aufgefüllt.\n"
-"\n"
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -7162,7 +7309,8 @@ msgstr ""
 "\n"
 "Der Rückgabewert des Programms ist 0 wenn alle eingegeben Zahlen "
 "erfolgreich\n"
-"umgewandelt werden konnten. Noramlerweise stopt %s beim ersten Umwandlungs-\n"
+"umgewandelt werden konnten. Normalerweise stoppt %s beim ersten "
+"Umwandlungs-\n"
 "fehler mit dem Rückgabewert 2. Bei --invalid='fail' wird für jede "
 "fehlerhafte\n"
 "Umwandlung eine Warnung ausgegeben und der Rückgabewert bei Ende ist 2. Bei\n"
@@ -7172,7 +7320,7 @@ msgstr ""
 "nicht angegeben und das Programm mit 0 beendet.\n"
 "\n"
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -7209,114 +7357,114 @@ msgstr ""
 "  $ ls -lh | %s --header --field 5 --from=iec --padding=10\n"
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, c-format
 msgid "format %s has no %% directive"
 msgstr "das Format %s enthält keine %%-Anweisung"
 
-#: src/numfmt.c:990
+#: src/numfmt.c:1003
 #, c-format
 msgid "invalid format %s (width overflow)"
 msgstr "ungültiges Format %s (Überlauf der Breite)"
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr "Auffüllen mittels --format hat Vorrang vor --padding"
+
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr "das Format %s endet mit %%"
 
-#: src/numfmt.c:1010
+#: src/numfmt.c:1030
 #, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
-msgstr "ungültiges Formt %s, die Anweisung muss die Form %%['][-][N]f haben"
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
+msgstr "ungültiges Formt %s, die Anweisung muss die Form %%[0]['][-][N]f haben"
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr "das Format %s enthält zu viele %%-Direktiven"
 
-#: src/numfmt.c:1070
+#: src/numfmt.c:1081
 #, c-format
-msgid "invalid suffix in input '%s': '%s'"
+msgid "invalid suffix in input %s: %s"
 msgstr "ungültige Endung in Eingabe „%s“: „%s“"
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
 msgstr "Wert zu groß um ausgegeben zu werden: „%Lg“ (verwenden Sie evtl. --to)"
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
 msgstr ""
 "Wert zu groß um ausgegeben zu werden: „%Lg“ (Werte müssen <= 999Y sein)"
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
+msgid "large input value %s: possible precision loss"
 msgstr "großer Eingabewert „%s“: möglicher Verlust von Präzision"
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
 "Eingabezeile ist zu kurz, keine zu wandelnde Zahlen in Feld %ld gefunden"
 
-#: src/numfmt.c:1388
+#: src/numfmt.c:1403
 #, c-format
-msgid "invalid padding value '%s'"
+msgid "invalid padding value %s"
 msgstr "Ungültiger Wert für Auffüllung „%s“"
 
-#: src/numfmt.c:1401
+#: src/numfmt.c:1417
 #, c-format
-msgid "invalid field value '%s'"
+msgid "invalid field value %s"
 msgstr "Ungültiger Feldwert: %s"
 
-#: src/numfmt.c:1430
+#: src/numfmt.c:1447
 #, c-format
-msgid "invalid header value '%s'"
+msgid "invalid header value %s"
 msgstr "ungültiger Kopf-Wert „%s“"
 
-#: src/numfmt.c:1456
+#: src/numfmt.c:1473
 #, c-format
 msgid "--grouping cannot be combined with --format"
 msgstr "--grouping kann nicht mit --format kombiniert werden"
 
-#: src/numfmt.c:1458
-#, c-format
-msgid "--padding cannot be combined with --format"
-msgstr "--padding kann nicht zusammen mit --format verwendet werden"
-
-#: src/numfmt.c:1463
+#: src/numfmt.c:1478
 #, c-format
 msgid "no conversion option specified"
 msgstr "es wurde keine Umwandlungsoption angegeben"
 
-#: src/numfmt.c:1471
+#: src/numfmt.c:1486
 #, c-format
 msgid "grouping cannot be combined with --to"
 msgstr "Gruppierung kann nicht mit --to  kombiniert werden"
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
 msgstr "Gruppierung hat in dieser Locale keine Auswirkung"
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
 msgstr "--header wird bei Eingabe über Kommandozeile ignoriert"
 
-#: src/numfmt.c:1511
+#: src/numfmt.c:1526
 #, c-format
 msgid "error reading input"
 msgstr "Fehler beim Lesen der Eingabe"
 
-#: src/numfmt.c:1520
+#: src/numfmt.c:1535
 #, c-format
 msgid "failed to convert some of the input numbers"
 msgstr "einige der eingegebenen Zahlen konnten nicht umgewandelt werden"
 
-#: src/od.c:294
+#: src/od.c:320
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -7329,7 +7477,7 @@ msgstr ""
 " oder:  %s --traditional [OPTION]... [DATEI] [[+]OFFSET[.][b] [+][LABEL][.]"
 "[b]]\n"
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -7342,10 +7490,10 @@ msgstr ""
 "Eine eindeutige Darstellung der DATEI, auf Standardausgabe ausgeben "
 "(Vorgabe:\n"
 "Oktalzahlen). Bei mehr als einem Argument DATEI, die Dateien in der\n"
-"angegebenen Folge verketten und die Eingabe zu bilden.\n"
+"angegebenen Folge verketten und die Eingabe bilden.\n"
 "Ohne DATEI oder wenn DATEI „-“ ist, Standardeingabe lesen.\n"
 
-#: src/od.c:307
+#: src/od.c:333
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
 "if the last operand begins with + or (if there are 2 operands) a digit.\n"
@@ -7366,10 +7514,12 @@ msgstr ""
 "Vielfaches\n"
 "von 512 sein.\n"
 
-#: src/od.c:318
+#: src/od.c:344
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
 "  -A, --address-radix=BASIS   entscheiden, wie Dateioffsets ausgegeben "
@@ -7380,36 +7530,39 @@ msgstr ""
 "  -j, --skip-bytes=BYTES      BYTES Eingabebytes am Anfang jeder Datei\n"
 "                                übergehen\n"
 
-#: src/od.c:323
+#: src/od.c:350
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
 "  -N, --read-bytes=BYTES      Ausgabe auf BYTES Eingabebytes pro Datei\n"
 "                                begrenzen\n"
 "  -S Bytes, --strings[=BYTES] Ketten mit wenigstens BYTES alphanumerischen\n"
-"                                Zeichen ausgeben\n"
+"                                Zeichen ausgeben. Vorgabe ist 3 falls BYTES\n"
+"                                nicht angegeben\n"
 "  -t, --format=TYP            Ausgabeformat(e) wählen\n"
 "  -v, --output-duplicates     nicht * benutzen, um Zeilenunterdrückung\n"
 "                                anzuzeigen\n"
-"  -w[BYTES], --width[=BYTES]  Anzahl BYTES pro Ausgabezeile ausgeben\n"
-"      --traditional           Argumente in traditioneller Form akzeptieren\n"
+"  -w[BYTES], --width[=BYTES]  Anzahl BYTES pro Ausgabezeile ausgeben.\n"
+"                                Vorgabe ist 32 falls BYTES nicht angegeben\n"
+"      --traditional           Argumente in dritter, oben angegebener Form\n"
+"                                akzeptieren\n"
 
-#: src/od.c:336
+#: src/od.c:363
 msgid ""
 "\n"
 "\n"
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 "\n"
@@ -7422,7 +7575,7 @@ msgstr ""
 "wählen\n"
 "  -d   dasselbe wie -t u2, dezimale vorzeichenlose 2�Byte�Zahlen wählen\n"
 
-#: src/od.c:345
+#: src/od.c:372
 msgid ""
 "  -f   same as -t fF, select floats\n"
 "  -i   same as -t dI, select decimal ints\n"
@@ -7438,13 +7591,13 @@ msgstr ""
 "  -s   dasselbe wie -t d2, dezimale 2�Byte�Zahlen wählen\n"
 "  -x   dasselbe wie -t x2, hexadezimale 2�Byte�Zahlen wählen\n"
 
-#: src/od.c:353
+#: src/od.c:380
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 "\n"
 "\n"
@@ -7453,7 +7606,7 @@ msgstr ""
 "  a           ein benanntes Zeichen, oberstes Bit ignorieren\n"
 "  c           ASCII�Zeichen oder Rückschrägstrich�Escape\n"
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -7467,7 +7620,7 @@ msgstr ""
 "  u[ANZAHL]   dezimal ohne Vorzeichen, ANZAHL Bytes pro Zahl\n"
 "  x[ANZAHL]   hexadezimal, ANZAHL Bytes pro Zahl\n"
 
-#: src/od.c:367
+#: src/od.c:394
 msgid ""
 "\n"
 "SIZE is a number.  For TYPE in [doux], SIZE may also be C for\n"
@@ -7477,13 +7630,13 @@ msgid ""
 msgstr ""
 "\n"
 "ANZAHL ist eine Zahl. Wenn TYP einer von „d“, „o“, „u“, oder „x“ ist, kann\n"
-"ANZAHL auch „C“ für sizeof(char), „S“ für sizeof(short) , „I“ für sizeof"
-"(int)\n"
+"ANZAHL auch „C“ für sizeof(char), „S“ für sizeof(short) , „I“ für "
+"sizeof(int)\n"
 "oder „L“ für sizeof(long) sein. Wenn TYP „f“ ist, kann ANZAHL auch „F“ für\n"
 "sizeof(float), „D“ für sizeof(double) oder „L“ für sizeof(long double) "
 "sein.\n"
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
@@ -7494,7 +7647,7 @@ msgstr ""
 "ausgegebe-\n"
 "nen Zeile druckbare Zeichen angezeigt.\n"
 
-#: src/od.c:379
+#: src/od.c:406
 msgid ""
 "\n"
 "\n"
@@ -7517,12 +7670,12 @@ msgstr ""
 "  M    1024×1024\n"
 "und so weiter für G, T, P, E, Z, Y.\n"
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, c-format
 msgid "invalid type string %s"
 msgstr "Ungültige Typbezeichnung %s"
 
-#: src/od.c:649
+#: src/od.c:690
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7531,7 +7684,7 @@ msgstr ""
 "Ungültige Typbezeichnung %s;\n"
 "dieses System hat keinen Typ für %lu�Byte große Ganzzahlen"
 
-#: src/od.c:770
+#: src/od.c:811
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7540,38 +7693,38 @@ msgstr ""
 "Ungültige Typbezeichnung %s;\n"
 "dieses System hat keinen Typ für %lu-Byte große Gleitkommazahlen"
 
-#: src/od.c:828
+#: src/od.c:869
 #, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr "Ungültiges Zeichen „%c“ in Typenbezeichnung %s"
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr ""
 "Es ist nicht möglich, hinter das Ende der kombinierten Eingabe vorzurücken"
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr ""
 "Ungültiger Ausgabeadressradix „%c“; es muss ein Zeichen aus [doxn] sein"
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr "Bei der Ausgabe von Zeichenketten darf kein Typ angegeben werden"
 
-#: src/od.c:1810
+#: src/od.c:1863
 msgid "compatibility mode supports at most one file"
 msgstr "Der Kompatibilitätsmodus unterstützt höchstens eine Datei."
 
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr "skip-bytes + read-bytes ist zu groß"
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr "Warnung: ungültige Breite %lu; %d wird benutzt"
@@ -7736,12 +7889,12 @@ msgstr "Wann"
 msgid "Where"
 msgstr "Wo   "
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr "Aufruf: %s [OPTION]... [BENUTZER]...\n"
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -7758,7 +7911,7 @@ msgstr ""
 "  -p              ohne Plan�Datei der Benutzer (bei langem Format)\n"
 "  -s              kurzes Format erzeugen (dies ist die Vorgabe)\n"
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -7773,7 +7926,7 @@ msgstr ""
 "  -q              ohne volle Namen, entfernte Rechner und Idle�Zeit der "
 "Benutzer\n"
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, c-format
 msgid ""
 "\n"
@@ -7784,7 +7937,7 @@ msgstr ""
 "Ein abgespecktes „finger“�Programm zum Anzeigen von Benutzerinformationen.\n"
 "Als utmp�Datei wird %s genommen.\n"
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr ""
@@ -8015,7 +8168,8 @@ msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
@@ -8027,7 +8181,7 @@ msgstr ""
 "                  -s[ZEICHEN] schaltet Zeilenabschneidung bei allen drei\n"
 "                  Spaltenoptionen (-SPALTE|-a -SPALTE|-m) ab, außer bei -w\n"
 
-#: src/pr.c:2827
+#: src/pr.c:2828
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
 "                    separate columns by STRING,\n"
@@ -8043,7 +8197,7 @@ msgstr ""
 "                  Auswirkung auf Spaltenoptionen\n"
 "  -t, --omit-header  Kopf� und Fußzeilen unterdrücken\n"
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 msgid ""
 "  -T, --omit-pagination\n"
 "                    omit page headers and trailers, eliminate any "
@@ -8068,7 +8222,7 @@ msgstr ""
 "                    mehrfacher Textspalten setzen, -s[Zeichen] schaltet ab "
 "(72)\n"
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
 "                    set page width to PAGE_WIDTH (72) characters always,\n"
@@ -8082,7 +8236,7 @@ msgstr ""
 "                    Zeilen abschneiden, es sei denn -J ist gesetzt, keine\n"
 "                    gegenseitige Störung mit -S oder -s\n"
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 msgid ""
 "\n"
 "-t is implied if PAGE_LENGTH <= 10.  With no FILE, or when FILE is -, read\n"
@@ -8106,9 +8260,9 @@ msgstr ""
 "\n"
 
 #: src/printenv.c:69
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr ""
-"  -0, --null           Zeilen mit Nullbyte statt mit Zeilenvorschub beenden\n"
+"  -0, --null     Zeilen mit Nullbyte statt mit Zeilenvorschub beenden\n"
 
 #: src/printf.c:79
 #, c-format
@@ -8225,12 +8379,12 @@ msgstr "Warnung: überflüssige Argumente werden ignoriert, beginnend mit %s"
 msgid "F. Pinard"
 msgstr "F. Pinard"
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, c-format
 msgid "%s (for regexp %s)"
 msgstr "%s (für regulären Ausdruck %s)"
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
@@ -8239,7 +8393,7 @@ msgstr ""
 "Aufruf: %s [OPTION]... [EINGABE]...   (ohne -G)\n"
 " oder:  %s -G [OPTION]... [EINGABE [AUSGABE]]\n"
 
-#: src/ptx.c:1821
+#: src/ptx.c:1824
 msgid ""
 "Output a permuted index, including context, of the words in the input "
 "files.\n"
@@ -8249,7 +8403,7 @@ msgstr ""
 "ausgeben.\n"
 "\n"
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
 "  -G, --traditional              behave more like System V 'ptx'\n"
@@ -8260,7 +8414,7 @@ msgstr ""
 "  -F, --flag-truncation=ZKETTE   ZKETTE benutzen, um Abschneidungen "
 "anzuzeigen\n"
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
 "  -O, --format=roff              generate output as roff directives\n"
@@ -8275,7 +8429,7 @@ msgstr ""
 "  -S, --sentence-regexp=REGEXP   für Zeilen� oder Satzende\n"
 "  -T, --format=tex               Ausgabe als TeX�Anweisungen erzeugen\n"
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -8294,7 +8448,7 @@ msgstr ""
 "lesen\n"
 "  -o, --only-file=DATEI          Wortliste nur aus dieser DATEI lesen\n"
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -8307,16 +8461,16 @@ msgstr ""
 "die\n"
 "                                   Referenzen\n"
 
-#: src/ptx.c:1854
+#: src/ptx.c:1857
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
 "\n"
-"Ohne DATEI, oder falls DATEI „-“ ist, Standardeingabe lesen. Vorgabe: „-"
+"Ohne DATEI oder wenn DATEI „-“ ist, Standardeingabe lesen. Vorgabe ist „-"
 "F /“.\n"
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, c-format
 msgid "invalid gap width: %s"
 msgstr "ungültige Lückenbreite: %s"
@@ -8339,22 +8493,30 @@ msgstr ""
 "                    Verknüpfungen enthält\n"
 "  -P, --physical  alle symbolischen Verknüpfungen vermeiden\n"
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+"\n"
+"Wurde keine Option angegeben, wird -P angenommen.\n"
+
+#: src/pwd.c:169
 #, c-format
 msgid "failed to chdir to %s"
 msgstr "konnte nicht nach %s wechseln"
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, c-format
 msgid "failed to stat %s"
 msgstr "konnte auf %s nicht zugreifen"
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr "konnte in %s keine Verzeichniseintrag mit passendem Inode finden"
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, c-format
 msgid "ignoring non-option arguments"
 msgstr "Argumente, die keine Optionen sind, werden ignoriert"
@@ -8364,8 +8526,8 @@ msgstr "Argumente, die keine Optionen sind, werden ignoriert"
 msgid "Dmitry V. Levin"
 msgstr "Dmitry V. Levin"
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Aufruf: %s [OPTION]... DATEI...\n"
@@ -8413,8 +8575,7 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 "  -m, --canonicalize-missing   kanonisieren, indem jeder symb. Verknüpfung "
 "in jeder\n"
@@ -8453,7 +8614,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 "  -e, --canonicalize-existing  alle Komponenten des Pfades müssen "
@@ -8487,41 +8648,43 @@ msgstr "%s: in schreibgeschütztes Verzeichnis %s absteigen? "
 msgid "%s: descend into directory %s? "
 msgstr "%s: in Verzeichnis %s absteigen? "
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr "%s: %s (schreibgeschützt) %s entfernen? "
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, c-format
 msgid "%s: remove %s %s? "
 msgstr "%s: %s %s entfernen? "
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, c-format
 msgid "removed directory: %s\n"
 msgstr "Verzeichnis wurde entfernt: %s\n"
 
-#: src/remove.c:444
+# MPi: What stupid message is that? No proper translation possible.
+#: src/remove.c:447
 #, c-format
-msgid "cannot remove directory: %s"
-msgstr "das Verzeichnis kann nicht entfernt werden: %s"
+msgid "refusing to remove %s or %s directory: skipping %s"
+msgstr "Entfernen von %s Verzeichnis %s nicht möglich: %s wird übersprungen"
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr "überspringe %s, da es auf einem anderen Gerät ist"
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, c-format
 msgid "traversal failed: %s"
 msgstr "Traversal fehlgeschlagen: %s"
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -8553,12 +8716,12 @@ msgstr ""
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 "  -I                      einmal nachfragen, wenn mehr als drei Dateien\n"
 "                            gelöscht werden sollen oder beim rekursiven\n"
@@ -8641,13 +8804,17 @@ msgstr ""
 
 #: src/rm.c:342
 #, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr "%s: Alle Argumente rekursiv entfernen? "
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] "%s: %zu Argument rekursiv entfernen? "
+msgstr[1] "%s: Alle %zu Argumente rekursiv entfernen? "
 
-#: src/rm.c:343
+#: src/rm.c:345
 #, c-format
-msgid "%s: remove all arguments? "
-msgstr "%s: alle Argumente entfernen? "
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] "%s: %zu Argument entfernen? "
+msgstr[1] "%s: %zu Argumente entfernen? "
 
 # XLATE_REMARK: Check this out! is the %s replaced by the name of the directory?
 #: src/rmdir.c:134 src/rmdir.c:233
@@ -8702,10 +8869,10 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
-"Ein Programm in einem anderen Sicherheitskontext ausführen.\n"
+"Ein Programm in einem anderen SELinux Sicherheitskontext ausführen.\n"
 "Wenn weder KONTEXT noch BEFEHL gegeben sind, den aktuellen "
 "Sicherheitskontext\n"
 "ausgeben.\n"
@@ -8763,41 +8930,46 @@ msgstr "es müssen -c, -t, -u, -l, -r oder Kontext angegeben werden"
 msgid "no command specified"
 msgstr "kein Befehl angegeben"
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr "%s kann nur mit einem SELinux-Kernel verwendet werden"
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, c-format
 msgid "failed to compute a new context"
 msgstr "konnte keine neuen Kontext berechnen"
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, c-format
 msgid "failed to set new user %s"
 msgstr "konnte neuen Nutzer %s nicht setzen"
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, c-format
 msgid "failed to set new type %s"
 msgstr "konnte neuen Typ %s nicht setzen"
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, c-format
 msgid "failed to set new range %s"
 msgstr "konnte neuen Bereich %s nicht setzen"
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, c-format
 msgid "failed to set new role %s"
 msgstr "konnte neue Rolle %s nicht setzen"
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, c-format
 msgid "unable to set security context %s"
 msgstr "der Sicherheitskontext %s kann nicht gesetzt werden"
 
+#: src/selinux.c:127 src/selinux.c:300
+#, c-format
+msgid "error canonicalizing %s"
+msgstr "%s konnte nicht in kanonische Form gebracht werden"
+
 #: src/seq.c:68
 #, c-format
 msgid ""
@@ -8820,7 +8992,7 @@ msgid ""
 "  -w, --equal-width        equalize width by padding with leading zeroes\n"
 msgstr ""
 "  -f, --format=FORMAT      Fließkomma�FORMAT im Stil von printf benutzen\n"
-"  -s, --separator=ZKETTE   ZKETTE benutzen, um Zahlen zu trennen (Vorgabe :"
+"  -s, --separator=ZKETTE   ZKETTE benutzen, um Zahlen zu trennen (Vorgabe: "
 "\\n)\n"
 "  -w, --equal-width        gleiche Breite durch führende Nullen herstellen\n"
 
@@ -8829,6 +9001,8 @@ msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
@@ -8842,7 +9016,7 @@ msgstr ""
 "PLUS ist normalerweise positiv, wenn ERSTER kleiner als LETZTER ist, und\n"
 "PLUS ist normalerweise negativ, wenn ERSTER größer als LETZTER ist.\n"
 
-#: src/seq.c:94
+#: src/seq.c:96
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
 "it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n"
@@ -8859,91 +9033,29 @@ msgstr ""
 "ein Dezimalpunkt in der Eingabe und ein Dezimalkomma in der Ausgabe "
 "benutzt.)\n"
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, c-format
 msgid "invalid floating point argument: %s"
 msgstr "ungültiges Fließkommaargument: %s"
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr "das Format %s enthält die unbekannte Direktive %%%c"
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr ""
 "Formatzeichenkette darf nicht angegeben werden, wenn Zeichenketten\n"
 "gleicher Breite ausgegeben werden"
 
-#: src/setuidgid.c:49
-#, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-"Aufruf: %s [KURZOPTION]... NUTZERNAME BEFEHL [ARGUMENT]...\n"
-" oder:  %s LANGOPTION\n"
-
-#: src/setuidgid.c:55
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-"Jede zusätzliche Gruppe aufgeben, Nutzer� und Gruppen�ID des angegebenen\n"
-"Nutzers annehmen und BEFEHL mit angegebenen ARGUMENTen durchführen.\n"
-"Mit Status 111 beenden, wenn UID und GID nicht angenommen werden können.\n"
-"Ansonsten, mit Status von BEFEHL beenden.\n"
-"Dieses Programm ist nur nützlich, wenn es von Root (UID=0) gerufen wird.\n"
-"\n"
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-"  -g GID[,GID1...]  auch noch die primäre Gruppen-ID auf die numerische GID\n"
-"                      setzen und, wenn angegeben, erweiterte Gruppen-IDs "
-"auf\n"
-"                      GID1, ...\n"
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr "unbekannte Nutzer�ID: %s"
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr "um Nutzer-ID %s zu benutzen, müssen Sie auch -g angeben"
-
-#: src/setuidgid.c:190
-#, c-format
-msgid "failed to set supplemental group(s)"
-msgstr "konnte keine erweiterte Gruppe(n) setzen"
-
-#: src/setuidgid.c:200
-#, c-format
-msgid "cannot set group-ID to %lu"
-msgstr "die Gruppen�ID kann nicht auf %lu gesetzt werden"
-
-#: src/setuidgid.c:204
-#, c-format
-msgid "cannot set user-ID to %lu"
-msgstr "die Benutzer�ID kann nicht auf %lu gesetzt werden"
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr "Colin Plumb"
 
-#: src/shred.c:148
+#: src/shred.c:170
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
 "for even very expensive hardware probing to recover the data.\n"
@@ -8953,7 +9065,7 @@ msgstr ""
 "selbst mit aufwändigen und teuren Hardware�Analysemitteln die Daten\n"
 "wieder herzustellen.\n"
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -8967,9 +9079,9 @@ msgstr ""
 "  -s, --size=N    diese Anzahl Bytes zerhacken (Endungen wie K, M, G sind "
 "zulässig)\n"
 
-#: src/shred.c:161
+#: src/shred.c:183
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
@@ -8983,15 +9095,19 @@ msgstr ""
 "um\n"
 "                    Zerhacken zu verbergen.\n"
 
-#: src/shred.c:170
+#: src/shred.c:192
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 "\n"
@@ -9005,7 +9121,7 @@ msgstr ""
 "mit normalen Dateien verwenden die meisten Anwender die Option --remove.\n"
 "\n"
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -9019,12 +9135,12 @@ msgstr ""
 "beruht:\n"
 "dass das Dateisystem Daten an derselben Stelle überschreibt. Das ist die\n"
 "althergebrachte Vorgehensweise, doch viele moderne Betriebssystemdesigns\n"
-"erfüllen diese Annahme nicht. Die folgenden Systeme sind Beispiele von "
+"erfüllen diese Annahme nicht. Die folgenden Systeme sind Beispiele von\n"
 "Dateisystemen,auf denen „shred“ keine Wirkung hat oder auf denen nicht für\n"
 "alle Dateisystemmodi eine Wirkung garantiert werden kann:\n"
 "\n"
 
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -9046,7 +9162,7 @@ msgstr ""
 "von Network Appliance\n"
 "\n"
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -9060,7 +9176,7 @@ msgstr ""
 "* komprimierte Dateisysteme\n"
 "\n"
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -9081,7 +9197,7 @@ msgstr ""
 "bestimmtes\n"
 "Dateisystem in der /etc/fstab, wie es in der Manpage zu mount erklärt ist.\n"
 
-#: src/shred.c:215
+#: src/shred.c:241
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
 "of the file that cannot be removed, and that will allow a shredded file\n"
@@ -9092,127 +9208,127 @@ msgstr ""
 "enthalten, die nicht entfernt werden können, und die es erlauben, eine\n"
 "zerhackte Datei wieder herzustellen.\n"
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, c-format
 msgid "%s: fdatasync failed"
 msgstr "%s: fdatasync fehlgeschlagen"
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr "%s: fsync fehlgeschlagen"
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr "%s: Zurückspulen nicht möglich"
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr "%s: Durchgang %lu/%lu (%s)..."
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, c-format
 msgid "%s: error writing at offset %s"
 msgstr "%s: Fehler beim Schreiben an Verschiebung %s"
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s: lseek fehlgeschlagen"
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, c-format
 msgid "%s: file too large"
 msgstr "%s: Datei zu groß"
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr "%s: Durchgang %lu/%lu (%s)...%s"
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr "%s: Durchgang %lu/%lu (%s)...%s/%s %d%%"
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, c-format
 msgid "%s: fstat failed"
 msgstr "%s: fstat fehlgeschlagen"
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, c-format
 msgid "%s: invalid file type"
 msgstr "%s: ungültiger Dateityp"
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr "%s: Datei hat negative Größe"
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, c-format
 msgid "%s: error truncating"
 msgstr "%s: Fehler beim Abschneiden"
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, c-format
 msgid "%s: fcntl failed"
 msgstr "%s: fcntl fehlgeschlagen"
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr "%s: ein Nur�Anfügen�Dateideskriptor kann nicht vernichtet werden"
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr "%s: wird entfernt"
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, c-format
 msgid "%s: renamed to %s"
 msgstr "%s: in %s umbenannt"
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, c-format
 msgid "%s: failed to remove"
 msgstr "%s: konnte nicht entfernt werden"
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr "%s: entfernt"
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, c-format
 msgid "%s: failed to close"
 msgstr "%s: konnte nicht geschloßen werden"
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, c-format
 msgid "%s: failed to open for writing"
 msgstr "%s: konnte nicht zum Schreiben geöffnet werden"
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, c-format
 msgid "%s: invalid number of passes"
 msgstr "%s: ungültige Anzahl von Durchgängen"
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, c-format
 msgid "multiple random sources specified"
 msgstr "mehrere Zufallsquellen angegeben"
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, c-format
 msgid "%s: invalid file size"
 msgstr "%s: ungültige Dateigröße"
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -9223,14 +9339,14 @@ msgstr ""
 " oder:  %s -e [OPTION]... [ARG]...\n"
 " oder:  %s -i VON-BIS [OPTION]...\n"
 
-#: src/shuf.c:54
+#: src/shuf.c:67
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr ""
 "Eine zufällige Permutaion der Eingabezeilen in die Standardausgabe "
 "schreiben.\n"
 "\n"
 
-#: src/shuf.c:60
+#: src/shuf.c:73
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
 "  -i, --input-range=LO-HI   treat each number LO through HI as an input "
@@ -9238,7 +9354,7 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
 msgstr ""
 "  -e, --echo                jedes ARG als Eingabezeile ansehen\n"
 "  -i, --input-range=VON-BIS  Zahlen von VON bis BIS als Eingabezeilen "
@@ -9247,34 +9363,43 @@ msgstr ""
 "  -o, --output=DATEI        Ergebnis in DATEI schreiben statt in "
 "Standardausg.\n"
 "      --random-source=DATEI  zufällige Bytes aus DATEI nehmen\n"
-"  -z, --zero-terminated     Zeilen mit Nullbyte statt Zeilenumbruch "
-"abschließen\n"
+"  -r, --repeat              Ausgabezeilen können wiederholt werden\n"
 
-#: src/shuf.c:244
+#: src/shuf.c:228
+#, c-format
+msgid "too many input lines"
+msgstr "zu viele Eingabezeilen"
+
+#: src/shuf.c:431
 #, c-format
 msgid "multiple -i options specified"
 msgstr "mehrfach die Optionen -i angegeben"
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, c-format
 msgid "invalid input range %s"
 msgstr "ungültiger Eingabebereich: %s"
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, c-format
 msgid "invalid line count %s"
 msgstr "ungültige Zeilenanzahl: %s"
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, c-format
 msgid "multiple output files specified"
 msgstr "mehrere Ausgabedateien angegeben"
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, c-format
 msgid "cannot combine -e and -i options"
 msgstr "Optionen -e und -i können nicht kombiniert werden."
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr "keine zu wiederholenden Zeilen"
+
 #: src/sleep.c:44
 #, c-format
 msgid ""
@@ -9300,24 +9425,24 @@ msgstr ""
 "wird für eine Zeit pausiert, die der Summe der Werte entspricht.\n"
 "\n"
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, c-format
 msgid "invalid time interval %s"
 msgstr "ungültiges Zeitintervall %s"
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr "die Echtzeit�Uhr kann nicht gelesen werden"
 
-#: src/sort.c:399
+#: src/sort.c:427
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr ""
 "Aneinanderfügung aller DATEI(en) sortiert auf die Standardausgabe "
 "schreiben.\n"
 "\n"
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
@@ -9325,7 +9450,7 @@ msgstr ""
 "Sortieroptionen:\n"
 "\n"
 
-#: src/sort.c:409
+#: src/sort.c:437
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
 "  -d, --dictionary-order      consider only blanks and alphanumeric "
@@ -9337,7 +9462,7 @@ msgstr ""
 "beachten\n"
 "  -f, --ignore-case            Klein� als Großbuchstaben behandeln\n"
 
-#: src/sort.c:415
+#: src/sort.c:443
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
 "  -i, --ignore-nonprinting    consider only printable characters\n"
@@ -9349,14 +9474,14 @@ msgstr ""
 "  -M, --month-sort             Reihenfolge: (unbekannt) < „JAN“ < ... < "
 "„DEZ“\n"
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 "  -h, --human-numeric-sort    vergleiche menschenlesbare Zahlen (z.B., 2K "
 "1G)\n"
 
-#: src/sort.c:423
+#: src/sort.c:451
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
 "  -R, --random-sort           sort by random hash of keys\n"
@@ -9369,7 +9494,7 @@ msgstr ""
 "      --random-source=DATEI    zufällige Bytes aus DATEI nehmen\n"
 "  -r, --reverse                das Ergebnis der Sortierung umkehren\n"
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -9386,7 +9511,7 @@ msgstr ""
 "innerhalb\n"
 "                                 des Textes\n"
 
-#: src/sort.c:437
+#: src/sort.c:465
 msgid ""
 "Other options:\n"
 "\n"
@@ -9394,7 +9519,7 @@ msgstr ""
 "Andere Optionen:\n"
 "\n"
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
@@ -9403,7 +9528,7 @@ msgstr ""
 "                            zusammenführen; für mehr benutzen Sie temporäre\n"
 "                            Dateien\n"
 
-#: src/sort.c:445
+#: src/sort.c:473
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
 "  -C, --check=quiet, --check=silent  like -c, but do not report first bad "
@@ -9418,7 +9543,7 @@ msgstr ""
 "      --compress-program=PROG  temporäre Dateien mit PROG komprimieren;\n"
 "                              mit PROG -d wieder entpacken\n"
 
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -9434,7 +9559,7 @@ msgstr ""
 "                            NULL-terminiert in DATEI aufgeführt sind;\n"
 "                            ist D „-“, so wird die Standardeingabe gelesen\n"
 
-#: src/sort.c:459
+#: src/sort.c:487
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
 "  -m, --merge               merge already sorted files; do not sort\n"
@@ -9445,7 +9570,7 @@ msgstr ""
 "  -m, --merge               schon sortierte Dateien zusammenführen; nicht\n"
 "                              sortieren\n"
 
-#: src/sort.c:463
+#: src/sort.c:491
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "  -s, --stable              stabilize sort by disabling last-resort "
@@ -9459,7 +9584,7 @@ msgstr ""
 "                              deaktivieren)\n"
 "  -S, --buffer-size=GRÖßE   GRÖßE für Hauptspeicherpuffer benutzen\n"
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -9485,13 +9610,7 @@ msgstr ""
 "nur\n"
 "                              das erste von mehreren Gleichen ausgeben\n"
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr ""
-"  -z, --zero-terminated     Zeilen mit Nullbyte beenden, nicht mit\n"
-"                              Zeilenvorschub\n"
-
-#: src/sort.c:483
+#: src/sort.c:511
 msgid ""
 "\n"
 "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is "
@@ -9523,7 +9642,7 @@ msgstr ""
 "\n"
 "GRÖẞE kann eine der folgenden multiplikativen Endungen folgen:\n"
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -9546,258 +9665,243 @@ msgstr ""
 "bei\n"
 "der native Bytewerte verwendet werden.\n"
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, c-format
 msgid "waiting for %s [-d]"
 msgstr "Warte auf %s [-d]"
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr "%s [-d] beendete sich auf ungute Weise"
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, c-format
 msgid "cannot create temporary file in %s"
 msgstr "temporäre Datei konnte nicht in %s angelegt werden"
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr "Öffnen fehlgeschlagen"
 
-#: src/sort.c:970
+#: src/sort.c:998
 msgid "fflush failed"
 msgstr "fflush fehlgeschlagen"
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr "Schließen fehlgeschlagen"
 
-#: src/sort.c:986
-#, c-format
-msgid "dup2 failed"
-msgstr "dup2 fehlgeschlagen"
-
-#: src/sort.c:1103
-#, c-format
-msgid "couldn't execute %s"
-msgstr "konnte %s nicht ausführen"
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 msgid "couldn't create temporary file"
 msgstr "konnte temporäre Datei nicht anlegen"
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, c-format
 msgid "couldn't create process for %s -d"
 msgstr "konnte keinen Prozess für %s -d anlegen"
 
-#: src/sort.c:1161
-#, c-format
-msgid "couldn't execute %s -d"
-msgstr "konnte %s -d nicht ausführen"
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, c-format
 msgid "warning: cannot remove: %s"
 msgstr "Warnung: %s kann nicht entfernt werden"
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, c-format
 msgid "invalid --%s argument %s"
 msgstr "ungültiges Argument %2$s für Option --%1$s"
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, c-format
 msgid "minimum --%s argument is %s"
 msgstr "kleinstes Argument für Option --%s ist %s"
 
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, c-format
 msgid "--%s argument %s too large"
 msgstr "Argument %2$s für Option --%1$s zu groß"
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr "größtes Argument für Option --%s ist mit momentanem „rlimit“ %s"
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr "parallele Anzahl darf nicht Null sein"
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr "stat fehlgeschlagen"
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr "Lesen fehlgeschlagen"
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, c-format
 msgid "string transformation failed"
 msgstr "Zeichenkettentransformation fehlgeschlagen"
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, c-format
 msgid "the untransformed string was %s"
 msgstr "die untransformierte Zeichenkette war %s"
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr "^ passt nicht zu Schlüssel\n"
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr ""
 "überflüssiger Schlüssel „%s“ wird verwendet; verwenden Sie statt dessen\n"
 "besser „%s“"
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr "Schlüssel %lu hat eine Breite von Null und wird daher ignoriert"
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr ""
 "führende Leerzeichen sind signifikant in Schlüssel %lu: Sie sollten daher\n"
 "wahrscheinlich auch „b“ angeben"
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr "Schlüssel %lu ist numerisch und überspannt mehrere Felder"
 
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
 msgstr[0] "Option „-%s“ wird ignoriert"
 msgstr[1] "Optionen „-%s“ werden ignoriert"
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr "Option „-r“ gilt nur für Notlösungsvergleiche"
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr "Schreiben fehlgeschlagen"
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr "%s: %s:%s: ungeordnet: "
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr "Standardfehler"
 
-#: src/sort.c:3698
+#: src/sort.c:3738
 msgid "cannot read"
 msgstr "Lesen unmöglich"
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, c-format
 msgid "%s: invalid field specification %s"
 msgstr "%s: ungültige Feldangabe %s"
 
-#: src/sort.c:3987
+#: src/sort.c:4028
 #, c-format
 msgid "options '-%s' are incompatible"
 msgstr "Optionen „-%s“ sind inkompatibel"
 
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, c-format
 msgid "%s: invalid count at start of %s"
 msgstr "%s: ungültige Zähler am Anfang von %s"
 
-#: src/sort.c:4295
+#: src/sort.c:4336
 msgid "invalid number after '-'"
 msgstr "ungültige Zahl hinter „-“"
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 msgid "invalid number after '.'"
 msgstr "ungültige Zahl hinter „.“"
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr "verirrte Buchstaben in Feldspezifikation"
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, c-format
 msgid "multiple compress programs specified"
 msgstr "mehrere Komprimierungsprogramme angegeben"
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
 msgstr "ungültige Zahl am Feldanfang"
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
 msgstr "Feldnummer ist Null"
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr "Zeichenversatz ist Null"
 
-#: src/sort.c:4407
+#: src/sort.c:4448
 msgid "invalid number after ','"
 msgstr "ungültige Zahl hinter „,“"
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr "leerer Tabulator"
 
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, c-format
 msgid "cannot read file names from %s"
 msgstr "Kann Dateinamen  nicht aus %s lesen."
 
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr "%s:%lu: ungültiger Dateiname der Länge 0"
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, c-format
 msgid "no input from %s"
 msgstr "keine Eingabe aus %s"
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr "es werden die Sortierregeln für %s verwendet"
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr "es wird ein einfacher Bytevergleich verwendet"
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr "zusätzlicher Operand %s nicht erlaubt mit -%c"
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr "die Endungslänge muss mindestens %zu betragen"
 
-#: src/split.c:204
+#: src/split.c:203
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr "Aufruf: %s [OPTION]... [EINGABE [PRÄFIX]]\n"
 
-#: src/split.c:208
+#: src/split.c:207
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
 "size is 1000 lines, and default PREFIX is 'x'.  With no INPUT, or when "
@@ -9811,25 +9915,26 @@ msgstr ""
 "wurde oder die EINGABE „-“ ist, wird von der Standardeingabe gelesen.\n"
 "\n"
 
-#: src/split.c:216
+#: src/split.c:215
 #, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
 "  -a, --suffix-length=N    Endungen mit Länge N verwenden (Vorgabe %d)\n"
+"      --additional-suffix=ENDUNG  eine zusätzliche ENDUNG an Dateinamen\n"
+"                                    anhängen\n"
 "  -b, --bytes=GRÖẞE       GRÖẞE Bytes in die Ausgabedatei ausgeben\n"
 "  -C, --line-bytes=GRÖẞE  höchstens GRÖẞE Bytes pro Zeile auf die Ausgabe\n"
 "                             schreiben\n"
@@ -9843,7 +9948,7 @@ msgstr ""
 "  -u, --unbuffered         kopiere die Eingabe direkt mit „-n r/...“ zur\n"
 "                             Ausgabe\n"
 
-#: src/split.c:229
+#: src/split.c:228
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
 "                            output file is opened\n"
@@ -9851,7 +9956,7 @@ msgstr ""
 "      --verbose            Meldung ausgeben, bevor\n"
 "                             jede Ausgabedatei geöffnet wird\n"
 
-#: src/split.c:236
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -9871,132 +9976,132 @@ msgstr ""
 "r/N     wie `l' aber eine Rundlauf-Verteilung wird verwendet\n"
 "r/K/N   ebenso, aber nur der Kte Teil von N wird ausgegeben\n"
 
-#: src/split.c:354
+#: src/split.c:353
 #, c-format
 msgid "output file suffixes exhausted"
 msgstr "keine Endungen für Ausgabedateien mehr verfügbar"
 
-#: src/split.c:366
+#: src/split.c:365
 #, c-format
 msgid "creating file %s\n"
 msgstr "Datei %s wird angelegt\n"
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr "%s würde die Eingabe überschreiben; Abbruch"
 
-#: src/split.c:391
+#: src/split.c:390
 #, c-format
 msgid "failed to set FILE environment variable"
 msgstr "die Umgebungsvariable FILE konnte nicht gesetzt werden"
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr "Ausführung mit DATEI=%s\n"
 
-#: src/split.c:395
+#: src/split.c:394
 #, c-format
 msgid "failed to create pipe"
 msgstr "Die Pipe konnte nicht erzeugt werden"
 
-#: src/split.c:409
+#: src/split.c:408
 #, c-format
 msgid "closing prior pipe"
 msgstr "die vorherige Pipe wird geschlossen"
 
-#: src/split.c:411
+#: src/split.c:410
 #, c-format
 msgid "closing output pipe"
 msgstr "Die Ausgabepipe wird geschlossen"
 
-#: src/split.c:415
+#: src/split.c:414
 #, c-format
 msgid "moving input pipe"
 msgstr "die Eingabepipe wird verschoben"
 
-#: src/split.c:417
+#: src/split.c:416
 #, c-format
 msgid "closing input pipe"
 msgstr "die Eingabepipe wird geschlossen"
 
-#: src/split.c:422
+#: src/split.c:421
 #, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr "der Befehl „%s -c %s� konnte nicht ausgeführt werden"
 
-#: src/split.c:428
+#: src/split.c:427
 #, c-format
 msgid "failed to close input pipe"
 msgstr "die Eingabepipe konnte nicht geschlossen werden"
 
-#: src/split.c:464
+#: src/split.c:463
 #, c-format
 msgid "waiting for child process"
 msgstr "es wird auf den Kindprozess gewartet"
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr "mit FILE=%s, Signal %s von Befehl: %s"
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr "mit FILE=%s, Ende mit %d in Befehl: %s"
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr "unbekannter Status von Befehl (0x%X)"
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr "Es ist nicht möglich, auf mehr als eine Art zu splitten"
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, c-format
 msgid "%s: invalid number of chunks"
 msgstr "%s: ungültige Anzahl von Abschnitten"
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, c-format
 msgid "%s: invalid chunk number"
 msgstr "%s: ungültige Abschnittsnummer"
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr "%s: ungültige Endungslänge"
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr "%s: ungültige Anzahl von Bytes"
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr "%s: ungültige Anzahl von Zeilen"
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, c-format
 msgid "line count option -%s%c... is too large"
 msgstr "Zeilenanzahloption -%s%c... ist zu groß"
 
-#: src/split.c:1248
+#: src/split.c:1298
 #, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr "%s: ungültiger Startwert für eine numerische Endung"
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, c-format
 msgid "%s: invalid IO block size"
 msgstr "%s: ungültige E/A Blockgröße"
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr ""
@@ -10004,62 +10109,62 @@ msgstr ""
 "ausgegeben\n"
 "werden"
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr ""
 "der Startwert für die numerische Endung ist für die Endungslänge zu groß"
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, c-format
 msgid "%s: cannot determine file size"
 msgstr "%s: die Dateigröße kann nicht ermittelt werden"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr "Michael Meskes"
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, c-format
 msgid "failed to canonicalize %s"
 msgstr "%s konnte nicht in kanonische Form gebracht werden"
 
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr "Warnung: unbekannte Flucht�Sequenz „\\%c“"
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, c-format
 msgid "%s: invalid directive"
 msgstr "%s: ungültige Anweisung"
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, c-format
 msgid "warning: backslash at end of format"
 msgstr "Warnung: ungültiger Rückschrägstrich (\\) am Ende der Zeichenkette"
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr ""
 "die Verwendung von %s um die Standardeingabe zu verwenden funktioniert\n"
 "nicht im Dateisystem-Modus"
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, c-format
 msgid "cannot read file system information for %s"
 msgstr "die Dateisysteminformation für %s kann nicht gelesen werden"
 
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, c-format
 msgid "cannot stat standard input"
 msgstr "der Status der Standardeingabe kann nicht abgefragt werden"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -10075,7 +10180,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -10085,30 +10190,30 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr "Gerät: %Dh/%dd\tInode: %-10i  Verknüpfungen: %-5h Gerätetyp: %t,%T\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr "Gerät: %Dh/%dd\tInode: %-10i  Verknüpfungen: %h\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr "Zugriff: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, c-format
 msgid "Context: %C\n"
 msgstr "Kontext: %C\n"
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -10120,11 +10225,11 @@ msgstr ""
 "Geändert   : %z\n"
 " Geburt    : %w\n"
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
 msgstr "Status einer Datei oder eines Dateisystems anzeigen.\n"
 
-#: src/stat.c:1356
+#: src/stat.c:1418
 msgid ""
 "  -L, --dereference     follow links\n"
 "  -f, --file-system     display file system status instead of file status\n"
@@ -10132,13 +10237,13 @@ msgstr ""
 "  -L, --dereference     Verknüpfungen folgen\n"
 "  -f, --file-system     Dateisystemstatus anstelle von Dateistatus anzeigen\n"
 
-#: src/stat.c:1360
+#: src/stat.c:1422
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 "  -c  --format=FORMAT   das angegebene FORMAT anstelle der Voreinstellung\n"
@@ -10150,7 +10255,7 @@ msgstr ""
 "                          mittels \\n in FORMAT eingefügt werden\n"
 "  -t, --terse           die Information in knapper Form ausgeben\n"
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 msgid ""
 "\n"
 "The valid format sequences for files (without --file-system):\n"
@@ -10170,7 +10275,7 @@ msgstr ""
 "  %B   die Größe in Bytes jedes mit „%b“ gemeldeten Blocks\n"
 "  %C   SELinux-Sicherheitskontext-Zeichenkette\n"
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 msgid ""
 "  %d   device number in decimal\n"
 "  %D   device number in hex\n"
@@ -10186,7 +10291,7 @@ msgstr ""
 "  %g   Gruppen�ID des Eigners\n"
 "  %G   Gruppenname des Eigners\n"
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 msgid ""
 "  %h   number of hard links\n"
 "  %i   inode number\n"
@@ -10195,8 +10300,8 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 "  %h   Anzahl harter Verknüpfungen\n"
 "  %i   Inode�Nummer\n"
@@ -10208,7 +10313,7 @@ msgstr ""
 "  %t   Major�Gerätetyp in Hex\n"
 "  %T   Minor�Gerätetyp in Hex\n"
 
-#: src/stat.c:1399
+#: src/stat.c:1461
 msgid ""
 "  %u   user ID of owner\n"
 "  %U   user name of owner\n"
@@ -10216,10 +10321,10 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 "  %u   Nutzer�ID des Eigners\n"
@@ -10234,7 +10339,7 @@ msgstr ""
 "  %Z   Zeit der letzten Änderung in Sekunden seit der Epoche\n"
 "\n"
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 msgid ""
 "Valid format sequences for file systems:\n"
 "\n"
@@ -10252,7 +10357,7 @@ msgstr ""
 "  %d   Freie Dateiknoten im Dateisystem\n"
 "  %f   Freie Blöcke im Dateisystem\n"
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 msgid ""
 "  %i   file system ID in hex\n"
 "  %l   maximum length of filenames\n"
@@ -10346,22 +10451,27 @@ msgstr ""
 "E/A\n"
 "und werden daher durch „stdbuf“ nicht beeinflusst.\n"
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, c-format
 msgid "failed to find %s"
 msgstr "%s konnte nicht gefunden werden"
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, c-format
 msgid "failed to update the environment with %s"
 msgstr "die Umgebung konnte nicht mit %s aktualisiert werden"
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr "die zeilenweise Pufferung von Stdin hat keinen Sinn"
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, c-format
+msgid "you must specify a buffering mode option"
+msgstr "Sie müssen einen Pufferungsmodus angeben"
+
+#: src/stty.c:516
 #, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -10372,11 +10482,11 @@ msgstr ""
 " oder:  %s [-F GERÄT | --file=GERÄT] [-a|--all]\n"
 " oder:  %s [-F GERÄT | --file=GERÄT] [-g|--save]\n"
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
 msgstr "Eigenschaften eines Terminals ausgeben oder ändern.\n"
 
-#: src/stty.c:525
+#: src/stty.c:528
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
 "  -g, --save         print all current settings in a stty-readable form\n"
@@ -10388,7 +10498,7 @@ msgstr ""
 "öffnen\n"
 "                       und benutzen\n"
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
@@ -10399,7 +10509,7 @@ msgstr ""
 "nicht POSIX�konforme Einstellungen. Das Wirtssystem bestimmt, welche\n"
 "Einstellungen zur Verfügung stehen.\n"
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -10414,7 +10524,7 @@ msgstr ""
 "  eof CHAR      CHAR sendet Ende�der�Datei (Eingabe beenden)\n"
 "  eol CHAR      CHAR beendet Zeile\n"
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -10426,7 +10536,7 @@ msgstr ""
 "  intr CHAR     CHAR sendet Unterbrechungssignal (Interrupt)\n"
 "  kill CHAR     CHAR löscht aktuelle Zeile\n"
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -10438,7 +10548,7 @@ msgstr ""
 "* rprnt CHAR    CHAR gibt die aktuelle Zeile neu aus\n"
 "  start CHAR    CHAR startet die Ausgabe erneut nach einem Stopp\n"
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -10450,7 +10560,7 @@ msgstr ""
 "* swtch CHAR    CHAR wechselt zu einer anderen Shell�Ebene\n"
 "* werase CHAR   CHAR löscht das zuletzt eingegebene Wort\n"
 
-#: src/stty.c:562
+#: src/stty.c:565
 msgid ""
 "\n"
 "Special settings:\n"
@@ -10464,7 +10574,7 @@ msgstr ""
 "* cols N      an den Kernel melden, dass dieses Terminal N Spalten hat\n"
 "* columns N   dasselbe wie cols N\n"
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -10478,7 +10588,7 @@ msgstr ""
 "setzen\n"
 "  ospeed N    Ausgabegeschwindigkeit auf N setzen\n"
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -10491,7 +10601,7 @@ msgstr ""
 "  speed       die Terminal�Geschwindigkeit ausgeben\n"
 "  time N      mit -icanon, die Lesewartezeit auf N Zehntelsekunden setzen\n"
 
-#: src/stty.c:581
+#: src/stty.c:584
 msgid ""
 "\n"
 "Control settings:\n"
@@ -10506,10 +10616,10 @@ msgstr ""
 "  [-]clocal     Modemkontrollsignale ignorieren\n"
 "  [-]cread      Empfang von Eingaben erlauben\n"
 "* [-]crtscts    RTS/CTS�Handshaking erlauben\n"
-" * [-]cdtrdsr   DTR/DSR-Handshaking erlauben\n"
+"* [-]cdtrdsr    DTR/DSR-Handshaking erlauben\n"
 "  csN           Zeichengröße auf N Bits setzen, N in [5..8]\n"
 
-#: src/stty.c:590
+#: src/stty.c:593
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
 "   [-]hup        send a hangup signal when the last process closes the tty\n"
@@ -10517,17 +10627,19 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
-"  [-]cstopb     zwei Stopp�Bits pro Zeichen benutzen (eins mit „-“)\n"
-"  [-]hup        ein Hangup�Signal senden, wenn der letzte Prozess das "
+"   [-]cstopb     zwei Stopp�Bits pro Zeichen benutzen (eins mit „-“)\n"
+"   [-]hup        ein Hangup�Signal senden, wenn der letzte Prozess das "
 "Terminal\n"
-"                  schließt\n"
-"  [-]hupcl      dasselbe wie [-]hup\n"
-"  [-]parenb     Paritätsbit in der Ausgabe erzeugen und Paritätsbit in der\n"
-"                  Eingabe erwarten\n"
-"  [-]parodd     ungerade Parität setzen (oder gerade Parität „-“)\n"
+"                   schließt\n"
+"   [-]hupcl      dasselbe wie [-]hup\n"
+"   [-]parenb     Paritätsbit in der Ausgabe erzeugen und Paritätsbit in der\n"
+"                   Eingabe erwarten\n"
+"   [-]parodd     ungerade Parität setzen (oder gerade Parität „-“)\n"
+" * [-]cmspar     \"haftende\" (mark/space) Parität verwenden\n"
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -10543,7 +10655,7 @@ msgstr ""
 "  [-]ignbrk     Breaks ignorieren\n"
 "  [-]igncr      Wagenrücklauf ignorieren\n"
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -10558,11 +10670,11 @@ msgstr ""
 "  [-]inpck      Eingabeprüfung der Parity erlauben\n"
 "  [-]istrip     höchstes Bit (das 8.) der Eingabezeichen löschen\n"
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr "* [-]iutf8      Eingabezeichen als UTF-8 annehmen\n"
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -10579,7 +10691,7 @@ msgstr ""
 "  [-]parmrk     Parity�Fehler markieren (mit einer 255�0�Zeichenfolge)\n"
 "  [-]tandem     dasselbe wie [-]ixoff\n"
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -10595,10 +10707,10 @@ msgstr ""
 "* ffN           Verzögerungsstil für Seitenvorschub, N in [0..1]\n"
 "* nlN           Verzögerungsstil für Zeilenvorschub, N in [0..1]\n"
 
-#: src/stty.c:631
+#: src/stty.c:635
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
@@ -10612,7 +10724,7 @@ msgstr ""
 "* [-]onlcr      Zeilenvorschub in Wagenrücklauf (CR) wandeln\n"
 "* [-]onlret     Zeilenvorschub bedingt Wagenrücklauf (CR)\n"
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -10628,7 +10740,7 @@ msgstr ""
 "* -tabs         dasselbe wie tab3\n"
 "* vtN           vertikale Tabulatorverzögerung, N in [0..1]\n"
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -10642,7 +10754,7 @@ msgstr ""
 "* crtkill       Zeile mit echoprt� und echoe�Einstellungen löschen\n"
 "* -crtkill      Zeile mit echoctl� und echok�Einstellungen löschen\n"
 
-#: src/stty.c:654
+#: src/stty.c:658
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
 "   [-]echo       echo input characters\n"
@@ -10656,7 +10768,7 @@ msgstr ""
 "  [-]echoe      dasselbe wie [-]crterase\n"
 "  [-]echok      Zeilenvorschub nach Killzeichen ausgeben\n"
 
-#: src/stty.c:661
+#: src/stty.c:665
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
 "   [-]echonl     echo newline even if not echoing other characters\n"
@@ -10671,7 +10783,7 @@ msgstr ""
 "  [-]icanon     erase�, kill�, werase� und rprnt�Sonderzeichen erlauben\n"
 "  [-]iexten     Sonderzeichen erlauben, die nicht POSIX�konform sind\n"
 
-#: src/stty.c:668
+#: src/stty.c:672
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
 "   [-]noflsh     disable flushing after interrupt and quit special "
@@ -10687,7 +10799,7 @@ msgstr ""
 "* [-]tostop     Hintergrundjobs stoppen, die auf das Terminal schreiben\n"
 "* [-]xcase      mit icanon, Großbuchstaben mit „\\“ maskieren\n"
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -10701,7 +10813,7 @@ msgstr ""
 "  cbreak        dasselbe wie -icanon\n"
 "  -cbreak       dasselbe wie icanon\n"
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -10713,7 +10825,7 @@ msgstr ""
 "  -cooked       dasselbe wie raw\n"
 "  crt           dasselbe wie echoe echoctl echoke\n"
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -10727,7 +10839,7 @@ msgstr ""
 "  ek            Erase� und Killzeichen auf Vorgabewert setzen\n"
 "  evenp         dasselbe wie parenb -parodd cs7\n"
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -10743,7 +10855,7 @@ msgstr ""
 "  nl            dasselbe wie -icrnl -onlcr\n"
 "  -nl           dasselbe wie icrnl -inlcr -igncr onlcr -ocrnl -onlret\n"
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -10757,7 +10869,7 @@ msgstr ""
 "  pass8         dasselbe wie -parenb -istrip cs8\n"
 "  -pass8        dasselbe wie parenb istrip cs7\n"
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -10769,7 +10881,7 @@ msgstr ""
 "                  -imaxbel -opost -isig -icanon -xcase min 1 time 0\n"
 "  -raw          dasselbe wie cooked\n"
 
-#: src/stty.c:716
+#: src/stty.c:720
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
 "                 -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n"
@@ -10786,7 +10898,7 @@ msgstr ""
 "                  -xcase -tostop -echoprt echoctl echoke,\n"
 "                  alle Sonderzeichen auf ihren Vorgabewert\n"
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -10803,12 +10915,12 @@ msgstr ""
 "^c, 0x37, 0177 oder 127; spezielle Werte ^- oder undef werden benutzt, um\n"
 "Sonderzeichen zu unterbinden.\n"
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, c-format
 msgid "only one device may be specified"
 msgstr "nur ein Gerät darf angegeben werden"
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
@@ -10817,43 +10929,43 @@ msgstr ""
 "Die Optionen für ausführliche und stty�lesbare Ausgabe\n"
 "können nicht gleichzeitig benutzt werden"
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr "Wenn ein Ausgabestil angegeben ist, kann kein Modus gesetzt werden"
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr "%s: Zurücksetzen auf nicht-blockierenden Modus ist nicht möglich"
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, c-format
 msgid "invalid argument %s"
 msgstr "ungültiges Argument %s"
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, c-format
 msgid "missing argument to %s"
 msgstr "fehlendes Argument für %s"
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, c-format
 msgid "invalid line discipline %s"
 msgstr "ungültige Line�Disziplin %s"
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr "%s: es ist nicht möglich, alle angeforderten Operationen durchzuführen"
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr "%s: Keine Information zur Größe dieses Gerätes"
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, c-format
 msgid "invalid integer argument %s"
 msgstr "ungültiges Ganzzahlargument %s"
@@ -10913,7 +11025,7 @@ msgstr "      --help     diese Hilfe anzeigen und beenden\n"
 msgid "      --version  output version information and exit\n"
 msgstr "      --version  Versionsinformation anzeigen und beenden\n"
 
-#: src/system.h:544
+#: src/system.h:543
 msgid ""
 "\n"
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -10922,12 +11034,12 @@ msgstr ""
 "Erforderliche Argumente für lange Optionen sind auch für kurze "
 "erforderlich.\n"
 
-#: src/system.h:552
+#: src/system.h:551
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 "\n"
 "GRÖẞE ist eine Ganzzahl und eine optionale Einheit (Beispiel: 10M sind\n"
@@ -10935,7 +11047,7 @@ msgstr ""
 "oder\n"
 "KB, MB, ... (Potenzen von 1000).\n"
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -10949,39 +11061,39 @@ msgstr ""
 "Andernfalls ist die Vorgabe Einheiten von 1024 Bytes \t(oder 512 wenn\n"
 "POSIXLY_CORRECT gesetzt wurde).\n"
 
-#: src/system.h:571
+#: src/system.h:570
 #, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
+"%s online help: <%s>\n"
 msgstr ""
 "\n"
-"Melden Sie Programmfehler für %s (auf Englisch, mit LC_ALL=C) an %s\n"
+"%s Onlinehilfe: <%s>\n"
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr ""
 "Melden Sie Übersetzungsfehler für %s an <translation-team-de@lists."
 "sourceforge.net>\n"
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr ""
 "Für die vollständige Dokumentation starten Sie:\n"
 "info coreutils '%s invocation'\n"
 
-#: src/system.h:596
+#: src/system.h:591
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "„%s --help“ liefert weitere Informationen.\n"
 
-#: src/system.h:628
+#: src/system.h:633
 #, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -11080,10 +11192,8 @@ msgstr ""
 
 #: src/tail.c:270
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
 "  -c, --bytes=K            die letzten K Bytes ausgeben; oder -c +K "
 "benutzen,\n"
@@ -11093,8 +11203,7 @@ msgstr ""
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 "  -f, --follow[={name|descriptor}]\n"
@@ -11105,18 +11214,17 @@ msgstr ""
 "                             äquivalent\n"
 "  -F                       gleichbedeutend mit „--follow=name --retry“\n"
 
-#: src/tail.c:281
+#: src/tail.c:280
 #, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
 "  -n, --lines=K            die letzten K Zeilen ausgeben, statt der letzen "
 "%d;\n"
@@ -11131,13 +11239,11 @@ msgstr ""
 "                             (das ist normalerweise der Fall bei rotierten\n"
 "                             Logdateien)\n"
 
-#: src/tail.c:294
+#: src/tail.c:293
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 "      --pid=PID            mit -f: Programm beenden, wenn PID beendet wird\n"
 "  -q, --quiet, --silent    nie Kopfzeilen mit Dateinamen ausgeben\n"
@@ -11149,12 +11255,12 @@ msgstr ""
 "                             verfolgt wird, also mit --follow=Name\n"
 
 #
-#: src/tail.c:301
+#: src/tail.c:298
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 "  -s, --sleep-interval=N   mit -f: zwischen Versuchen etwa N Sekunden\n"
@@ -11163,7 +11269,7 @@ msgstr ""
 "                             mindestens alle N Sekunden geprüft.\n"
 "  -v, --verbose            immer Kopfzeilen mit Dateinamen ausgeben\n"
 
-#: src/tail.c:310
+#: src/tail.c:307
 msgid ""
 "\n"
 "If the first character of K (the number of bytes or lines) is a '+',\n"
@@ -11183,7 +11289,7 @@ msgstr ""
 "GB 1000×1000×1000, G 1024×1024×1024, und so weiter für T, P, E, Z, Y.\n"
 "\n"
 
-#: src/tail.c:319
+#: src/tail.c:316
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
 "means that even if a tail'ed file is renamed, tail will continue to track\n"
@@ -11204,29 +11310,24 @@ msgstr ""
 "ob\n"
 "die Datei gelöscht und von einem anderen Programm neu angelegt wurde.\n"
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr "%s wird geschlossen (df=%d)"
 
-#: src/tail.c:453
-#, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr "%s: es ist nicht möglich, zum relativen Offset %s zu springen"
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr ""
 "%s: es ist nicht möglich, vom Ende her zum relativen Offset %s zu springen"
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr ""
 "der Ort von %s kann nicht bestimmt werden. Es wird auf Pollen zurückgefallen"
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
@@ -11236,138 +11337,148 @@ msgstr ""
 "(in\n"
 "Englisch) an %s. Es wird auf Pollen zurückgefallen"
 
-#: src/tail.c:963
+#: src/tail.c:965
+#, c-format
+msgid "%s has been replaced with a symbolic link. giving up on this name"
+msgstr ""
+"%s wurde durch eine symbolishce Verknüpfung erstezt, kein weiterer Versuch"
+
+#: src/tail.c:980
 #, c-format
 msgid "%s has become inaccessible"
 msgstr "auf %s kann nicht mehr zugegriffen werden"
 
-#: src/tail.c:980
+#: src/tail.c:997
 #, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
-msgstr "%s wurde ersetzt durch eine ungeeignete Datei; kein weiterer Versuch"
+msgstr "%s wurde durch eine ungeeignete Datei ersetzt, kein weiterer Versuch"
 
-#: src/tail.c:989
+#: src/tail.c:1006
 #, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr ""
-"%s wurde ersetzt durch eine entfernt liegenden Datei; kein weiterer Versuch"
+"%s wurde durch eine entfernt liegenden Datei ersetzt , kein weiterer Versuch"
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, c-format
 msgid "%s has become accessible"
 msgstr "auf „%s“ kann jetzt zugegriffen werden"
 
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr "%s ist aufgetaucht;  folge Ende der neuen Datei"
 
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr "%s wurde ersetzt;  folge Ende der neuen Datei"
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr "%s: Ändern desf nicht�blockierenden Modus ist nicht möglich"
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr "%s: Datei abgeschnitten"
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr "Keine Dateien mehr übrig"
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, c-format
 msgid "cannot watch parent directory of %s"
 msgstr "das Elternverzeichnis von %s kann nicht beobachtet werden"
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, c-format
 msgid "inotify resources exhausted"
 msgstr "die Inotify-Resourcen sind erschöpft"
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, c-format
 msgid "cannot watch %s"
 msgstr "%s nicht beobachtet werden"
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr "Fehler beim Ãœberwachen der Inotify-Events"
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, c-format
 msgid "error reading inotify event"
 msgstr "Fehler beim Lesen des Inotify-Events"
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr ""
 "%s: es ist nicht möglich, bis zum Ende dieses Dateityps vorgehen;\n"
 "  kein weiterer Versuch für diesen Namen"
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, c-format
 msgid "number in %s is too large"
 msgstr "Zahl in %s ist zu groß"
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr ""
 "%s: ungültige maximale Anzahl von ungeänderten „stats“ zwischen Öffnungen"
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr "%s: ungültige PID"
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr "%s: ungültige Anzahl von Sekunden"
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr "Option in ungültigen Kontext benutzt – %c"
 
-#: src/tail.c:2034
+#: src/tail.c:2096
 #, c-format
-msgid "warning: --retry is useful mainly when following by name"
+msgid "warning: --retry ignored; --retry is useful only when following"
 msgstr ""
-"Warnung: --retry ist hauptsächlich sinnvoll, wenn dieser Option ein Name "
-"folgt"
+"Warnung: --retry wurde ignoriert; --retry ist nur bei Verfolgung sinnvoll"
+
+#: src/tail.c:2100
+#, c-format
+msgid "warning: --retry only effective for the initial open"
+msgstr "Warnung: --retry hat nur beim ersten Öffnen eine Wirkung"
 
-#: src/tail.c:2038
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
 msgstr "Warnung: PID ignoriert; --pid=PID ist nur sinnvoll, wenn es folgt"
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr "Warnung: --pid=PID wird auf diesem System nicht unterstützt"
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, c-format
 msgid "cannot follow %s by name"
 msgstr "%s nicht nach Namen verfolgt werden"
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr "Warnung: die Standardausgabe stetig zu verfolgen ist nicht wirksam"
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr ""
@@ -11646,17 +11757,17 @@ msgstr "zusätzliches Argument %s"
 msgid "warning: sigprocmask"
 msgstr "Warnung: sigprocmask"
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr "Warnung: timer_settime"
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr "Warnung: timer_create"
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
@@ -11665,29 +11776,28 @@ msgstr ""
 "Aufruf: %s [OPTION] ZEITSPANNE BEFEHL [ARGUMENT]...\n"
 "  oder: %s [OPTION]\n"
 
-#: src/timeout.c:229
+#: src/timeout.c:232
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
 msgstr ""
 "Starte BEFEHL und beende ihn zwangsweise, wenn er nach ZEITSPANNE noch "
 "läuft.\n"
 
-#: src/timeout.c:235
+#: src/timeout.c:238
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
 "      --preserve-status\n"
 "                   mit dem gleichen Status wie BEFEHL enden, selbst\n"
@@ -11707,7 +11817,7 @@ msgstr ""
 "                   SIGNAL kann ein Name wie „HUP“ oder eine Zahl sein.\n"
 "                   „kill -l“ gibt eine Übersicht verfügbarer Signale.\n"
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 msgid ""
 "\n"
 "DURATION is a floating point number with an optional suffix:\n"
@@ -11719,7 +11829,7 @@ msgstr ""
 "„s“ für Sekunden für Sekunden (Voreinstellung), „m“ für Minuten, „h“ für\n"
 "Stunden oder „d“ für Tage.\n"
 
-#: src/timeout.c:259
+#: src/timeout.c:262
 msgid ""
 "\n"
 "If the command times out, and --preserve-status is not set, then exit with\n"
@@ -11731,25 +11841,25 @@ msgid ""
 msgstr ""
 "\n"
 "Wenn ein Befehl von timeout beendet wird, so beendet sich timeout mit einem\n"
-"Rückgabewert von 124, sonst mit dem des ausgeführten Befehls. Ist kein "
+"Rückgabewert von 124, sonst mit dem des ausgeführten BEFEHLs. Ist kein "
 "Signal\n"
 "angegeben, wird bei Zeitablauf das Signal TERM gesendet. Das Signal TERM\n"
 "beendet Prozesse, die dieses Signal nicht abfangen. Für andere Prozesse\n"
 "muss eventuell KILL (9) benutzt werden, da dieses Signal nicht gefangen\n"
-"werden kann. Wenn das Signal Kill (9) gesendet wird, ist der Rückgabewert\n"
+"werden kann. Wenn das Signal KILL (9) gesendet wird, ist der Rückgabewert\n"
 "von timeout 128+9 statt 124.\n"
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr "Warnung: das Verhindern von Coredumps scheiterte"
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, c-format
 msgid "error waiting for command"
 msgstr "Fehler beim Warten auf den Befehl"
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr "der beobachtete Befehl erzeugte einen Speicherauszug"
@@ -12173,7 +12283,7 @@ msgstr ""
 #: src/truncate.c:115
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 "  -r, --reference=DATEI  die Größe dieser DATEI nehmen\n"
 "  -s, --size=GRÖßE       diese GRÖßE benutzen\n"
@@ -12264,12 +12374,12 @@ msgstr ""
 "Ohne DATEI, oder falls DATEI „-“ ist, Standardeingabe lesen.\n"
 "\n"
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr "%s: Eingabe enthält eine ungerade Anzahl Token"
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr "%s: Eingabe enthält eine Schleife:"
@@ -12370,12 +12480,12 @@ msgstr "Tabulatoren sind zu weit auseinander"
 msgid "tab stop value is too large"
 msgstr "Tabulatorstopp ist zu groß"
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr "Aufruf: %s [OPTION]... [EINGABE [AUSGABE]]\n"
 
-#: src/uniq.c:138
+#: src/uniq.c:174
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
 "writing to OUTPUT (or standard output).\n"
@@ -12389,41 +12499,56 @@ msgstr ""
 "Ohne Optionen werden identische Zeilen zur ersten vereinigt.\n"
 "\n"
 
-#: src/uniq.c:147
+#: src/uniq.c:183
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
 msgstr ""
 "  -c, --count           den Zeilen die Anzahl des Vorkommens voranstellen\n"
 "  -d, --repeated        nur die doppelten Zeilen ausgeben\n"
 
-#: src/uniq.c:151
+#: src/uniq.c:187
+msgid ""
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
+msgstr ""
+"  -D, --all-repeated[=TRENNMETHODE]  alle doppelten Zeilen ausgeben\n"
+"                          Gruppen können durch leere Zeilen begrentzt "
+"werden\n"
+"                          TRENNMETHODE={none(default),prepend,separate}\n"
+
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr "  -f, --skip-fields=N   die ersten N Felder überspringen\n"
+
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
+msgstr ""
+"      --group[=METHODE]  alle Fundstellen ausgeben, wobei Gruppen durch "
+"eine\n"
+"                          Leerzeile getrennt werden.\n"
+"                          METHODE={separate(default),prepend,append,both}\n"
+
+#: src/uniq.c:199
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
 "  -i, --ignore-case     ignore differences in case when comparing\n"
 "  -s, --skip-chars=N    avoid comparing the first N characters\n"
 "  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
 msgstr ""
-"  -D, --all-repeated[=TRENN�METHODE]   alle doppelten Zeilen ausgeben\n"
-"                        TRENN�METHODE={none(Vorgabe),prepend,separate)};\n"
-"                        das Abtrennen geschieht durch Leerzeilen\n"
-"  -f, --skip-fields=N   nicht die ersten N Felder vergleichen\n"
 "  -i, --ignore-case     Abweichung in Groß-/Kleinschreibung ignorieren\n"
 "  -s, --skip-chars=N    nicht die ersten N Zeichen vergleichen\n"
 "  -u, --unique          nur nur einmal vorkommende Zeilen ausgeben\n"
-"  -z, --zero-terminated  Zeilen mit Nullbyte, nicht Zeilenvorschub, "
-"abschließen\n"
 
-#: src/uniq.c:161
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr ""
 "  -w, --check-chars=N   nicht mehr als N Zeichen pro Zeile vergleichen\n"
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 msgid ""
 "\n"
 "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n"
@@ -12433,7 +12558,7 @@ msgstr ""
 "Ein Feld ist eine Folge von Freiraum (etwa Leerzeichen oder Tabulatoren)\n"
 "gefolgt von anderen Zeichen. Felder werden vor Zeichen übersprungen.\n"
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 msgid ""
 "\n"
 "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n"
@@ -12446,24 +12571,36 @@ msgstr ""
 "anstelle von „uniq“ gleich „sort -u“ verwenden.\n"
 "Die Vergleiche folgen dabei den durch „LC_COLLATE“ gegebenen Regeln.\n"
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, c-format
 msgid "too many repeated lines"
 msgstr "zu viele wiederholte Zeilen"
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
 msgstr "Ungültige Anzahl an zu überspringenden Feldern"
 
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
 msgstr "Ungültige Anzahl an zu überspringenden Bytes"
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
 msgstr "Ungültige Anzahl an zu vergleichenden Bytes"
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr "--group und -c/-d/-D/-u schließen einander aus"
+
+#: src/uniq.c:652
+#, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr ""
+"alle duplizierten Zeilen und Wiederholungszähler auszugeben ist nicht "
+"sinnvoll"
+
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr ""
@@ -12487,11 +12624,6 @@ msgstr ""
 "Die Funktion unlink aufrufen, um angegebene DATEI zu löschen.\n"
 "\n"
 
-#: src/unlink.c:86
-#, c-format
-msgid "cannot unlink %s"
-msgstr "Entfernen (unlink) von %s nicht möglich"
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -12524,7 +12656,7 @@ msgstr[1] "%ld Tage %2d:%02d an,  "
 #: src/uptime.c:149
 #, c-format
 msgid "up  %2d:%02d,  "
-msgstr "up %2d:%02d,  "
+msgstr "%2d:%02d an,  "
 
 #: src/uptime.c:151
 #, c-format
@@ -12538,7 +12670,7 @@ msgstr[1] "%lu Benutzer"
 msgid ",  load average: %.2f"
 msgstr ",  Durchschnittslast: %.2f"
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -12550,7 +12682,7 @@ msgstr ""
 "1,\n"
 "5 und 15 Minuten ausgeben."
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
@@ -12559,12 +12691,12 @@ msgstr ""
 " Prozesse in einem nicht unterbrechbaren\n"
 "Schlafzustand tragen ebenfalls zur Durchschnittslast bei.\n"
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr "\n"
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
@@ -12811,1093 +12943,3 @@ msgstr ""
 "Eine Zeile mit allen angegebenen ZEICHENKETTEn oder „y“ wiederholt "
 "ausgeben.\n"
 "\n"
-
-#~ msgid "using single-precision arithmetic"
-#~ msgstr "verwende Arithmetik mit einfacher Genauigkeit"
-
-#~ msgid "using arbitrary-precision arithmetic"
-#~ msgstr "verwende Arithmetik mit beliebiger Genauigkeit"
-
-#~ msgid ""
-#~ "simple_strtod_human:\n"
-#~ "  input string: '%s'\n"
-#~ "  locale decimal-point: '%s'\n"
-#~ msgstr ""
-#~ "simple_strtod_human:\n"
-#~ "  Eingabe: „%s“\n"
-#~ "  Dezimalpunkt der Locale: „%s“\n"
-
-#~ msgid ""
-#~ "  parsed numeric value: %Lf\n"
-#~ "  input precision = %d\n"
-#~ msgstr ""
-#~ "  geparster numerischer Wert: %Lf\n"
-#~ "  Genauigkeit der Eingabe = %d\n"
-
-#~ msgid "  Auto-scaling, found 'i', switching to base %d\n"
-#~ msgstr "  Auto-Skalierung, „i“ gefunden, Wechsel zu Basis %d\n"
-
-#~ msgid "  suffix power=%d^%d = %Lf\n"
-#~ msgstr "  Endung Potenz=%d^%d = %Lf\n"
-
-#~ msgid "  returning value: %Lf (%LG)\n"
-#~ msgstr "  Rückgabewert: %Lf (%LG)\n"
-
-#~ msgid "double_to_human:\n"
-#~ msgstr "double_to_human:\n"
-
-#~ msgid "  no scaling, returning (grouped) value: %'.*Lf\n"
-#~ msgstr ""
-#~ "  keine Skalierung, der (gruppierte) Wert wird zurück gegeben: %'.*Lf\n"
-
-#~ msgid "  no scaling, returning value: %.*Lf\n"
-#~ msgstr "  keine Skalierung, Rückgabe von: %.*Lf\n"
-
-#~ msgid "  scaled value to %Lf * %0.f ^ %d\n"
-#~ msgstr "  Wert wird skaliert auf %Lf * %0.f ^ %d\n"
-
-#~ msgid "  after rounding, value=%Lf * %0.f ^ %d\n"
-#~ msgstr "  nach Rundung, Wert=%Lf * %0.f ^ %d\n"
-
-#~ msgid "  returning value: '%s'\n"
-#~ msgstr " zurück gegebener Wert: „%s“\n"
-
-#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n"
-#~ msgstr "Aufruf: %s [OPTIONEN] [ZAHL]...\n"
-
-#~ msgid ""
-#~ "  --from=UNIT     auto-scale input numbers to UNITs. Default is 'none'.\n"
-#~ "                  See UNIT below.\n"
-#~ "  --from-unit=N   specify the input unit size (instead of the default "
-#~ "1).\n"
-#~ "  --to=UNIT       auto-scale output numbers to UNITs.\n"
-#~ "                  See UNIT below.\n"
-#~ "  --to-unit=N     the output unit size (instead of the default 1).\n"
-#~ "  --round=METHOD  the rounding method to use when scaling. METHOD can "
-#~ "be:\n"
-#~ "                  up, down, from-zero (default), towards-zero, nearest\n"
-#~ "  --suffix=SUFFIX add SUFFIX to output numbers, and accept optional "
-#~ "SUFFIX\n"
-#~ "                  in input numbers.\n"
-#~ "  --padding=N     pad the output to N characters.\n"
-#~ "                  Positive N will right-aligned. Negative N will left-"
-#~ "align.\n"
-#~ "                  Note: if the output is wider than N, padding is "
-#~ "ignored.\n"
-#~ "                  Default is to automatically pad if whitespace is "
-#~ "found.\n"
-#~ "  --grouping      group digits together (e.g. 1,000,000).\n"
-#~ "                  Uses the locale-defined grouping (i.e. have no effect\n"
-#~ "                  in C/POSIX locales).\n"
-#~ "  --header[=N]    print (without converting) the first N header lines.\n"
-#~ "                  N defaults to 1 if not specified.\n"
-#~ "  --field N       replace the number in input field N (default is 1)\n"
-#~ "  -d, --delimiter=X  use X instead of whitespace for field delimiter\n"
-#~ "  --format=FORMAT use printf style floating-point FORMAT.\n"
-#~ "                  See FORMAT below for details.\n"
-#~ "  --invalid=MODE  failure mode for invalid numbers: MODE can be:\n"
-#~ "                  abort (the default), fail, warn, ignore.\n"
-#~ "  --debug         print warnings about invalid input.\n"
-#~ "  \n"
-#~ msgstr ""
-#~ "  --from=EINHEIT   auto-skaliert Zahlen auf EINHEITen. Vorgabe ist "
-#~ "'none'.\n"
-#~ "                   Siehe EINHEIT weiter unten.\n"
-#~ "  --from-unit=N    Angabe der Einheit der Eingabe (statt der Vorgabe 1).\n"
-#~ "  --to=UNIT        auto-skaliert auszugebende Zahlen in EINHEITen.\n"
-#~ "                   Siehe EINHEIT weiter unten.\n"
-#~ "  --to-unit=N      Angabe der Einheit der Ausgabe (statt der Vorgabe 1).\n"
-#~ "  --round=METHODE  die bei der Skalierung zu verwendende "
-#~ "Rundungsmethode.\n"
-#~ "                   METHODE kann sein:\n"
-#~ "                   up, down, from-zero (Vorgabe), towards-zero, nearest\n"
-#~ "  --suffix=ENDUNG  ENDUNG an auszugebende Zahlen anhängen und eine "
-#~ "eventuell\n"
-#~ "                   vorhandene ENDUNG bei eingegebenen Zahlen "
-#~ "akzeptieren.\n"
-#~ "  --padding=N      die Ausgabe auf N Zeichen auffüllen.\n"
-#~ "                   Positives N bedeutet rechtsbündig, negatives N "
-#~ "linksbündig.\n"
-#~ "                   Hinweis: ist die Ausgabe breiter als N wird nicht\n"
-#~ "                   aufgefüllt.\n"
-#~ "                   Standardmäßig wird automatisch aufgefüllt, wenn "
-#~ "Leerzeichen,\n"
-#~ "                   Tabulator oder Zeilenumbruch gefunden wird.\n"
-#~ "  --grouping       Ziffern werden gruppiert (z.B. 1.000.000).\n"
-#~ "                   Verwendet die locale-spezifische Gruppierung (hat also "
-#~ "in\n"
-#~ "                   C/POSIX Locales keine Auswirkung).\n"
-#~ "  --header[=N]     Ausgabe (ohne Umwandlung) der ersten N Kopfzeilen.\n"
-#~ "                   N ist 1 wenn es nicht ausdrücklich angegeben wird.\n"
-#~ "  --field N        ersetzt die Zahl in Eingabefeld N (Vorgabe ist 1)\n"
-#~ "  -d, --delimiter=X  verwendet X anstelle von Leerraum als "
-#~ "Feldbegrenzung\n"
-#~ "  --format=FORMAT  verwendet Fließkomma-FORMAT im Stil von printf.\n"
-#~ "                   Siehe FORMAT weiter unten für Details.\n"
-#~ "  --invalid=MODUS  Verhalten bei ungültigen Zahlennumbers: MODUS kann "
-#~ "sein:\n"
-#~ "                   abort (the default), fail, warn, ignore.\n"
-#~ "  --debug          bei ungültigen Eingaben Warnungen ausgeben.\n"
-#~ "  \n"
-
-#~ msgid ""
-#~ "\n"
-#~ "UNIT options:\n"
-#~ "  none       No auto-scaling is done. Suffixes will trigger an error.\n"
-#~ "  auto       Accept optional single-letter/two-letter suffix:\n"
-#~ "             1K  = 1000\n"
-#~ "             1Ki = 1024\n"
-#~ "             1M  = 1000000\n"
-#~ "             1Mi = 1048576\n"
-#~ "  si         Accept optional single letter suffix:\n"
-#~ "             1K = 1000\n"
-#~ "             1M = 1000000\n"
-#~ "             ...\n"
-#~ "  iec        Accept optional single letter suffix:\n"
-#~ "             1K = 1024\n"
-#~ "             1M = 1048576\n"
-#~ "             ...\n"
-#~ "  iec-i      Accept optional two-letter suffix:\n"
-#~ "             1Ki = 1024\n"
-#~ "             1Mi = 1048576\n"
-#~ "             ...\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "EINHEIT Optionen:\n"
-#~ "  none       Keine auto-skalierung erfolgt. Endungen lösen einen Fehler "
-#~ "aus.\n"
-#~ "  auto       Akzeptiere optionale ein- bzw. zweibuchstabige Endungen:\n"
-#~ "             1K  = 1000\n"
-#~ "             1Ki = 1024\n"
-#~ "             1M  = 1000000\n"
-#~ "             1Mi = 1048576\n"
-#~ "  si         Akzeptiere eine optionale einbuchstabige Endung:\n"
-#~ "             1K = 1000\n"
-#~ "             1M = 1000000\n"
-#~ "             ...\n"
-#~ "  iec        Akzeptiere eine optionale einbuchstabige Endung:\n"
-#~ "             1K = 1024\n"
-#~ "             1M = 1048576\n"
-#~ "             ...\n"
-#~ "  iec-i      Akzeptiere eine optionale zweibuchstabige Endung:\n"
-#~ "             1Ki = 1024\n"
-#~ "             1Mi = 1048576\n"
-#~ "             ...\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "format String:\n"
-#~ "  input: %s\n"
-#~ "  grouping: %s\n"
-#~ "  padding width: %ld\n"
-#~ "  alignment: %s\n"
-#~ "  prefix: '%s'\n"
-#~ "  suffix: '%s'\n"
-#~ msgstr ""
-#~ "Formatanweisung:\n"
-#~ "  Eingabe: %s\n"
-#~ "  Gruppierung: %s\n"
-#~ "  Auffüllen auf: %ld\n"
-#~ "  Ausrichtung: %s\n"
-#~ "  Präfix: „%s“\n"
-#~ "  Anhang: „%s“\n"
-
-#~ msgid ""
-#~ "formatting output:\n"
-#~ "  value: %Lf\n"
-#~ "  humanized: '%s'\n"
-#~ msgstr ""
-#~ "Ausagbe wird formattiert:\n"
-#~ "  Wert: %Lf\n"
-#~ "  menschenlesbar: „%s“\n"
-
-#~ msgid "  After padding: '%s'\n"
-#~ msgstr "  Nach Auffüllung: „%s“\n"
-
-#~ msgid "trimming suffix '%s'\n"
-#~ msgstr "Endujng „%s“ wird gekürzt\n"
-
-#~ msgid "no valid suffix found\n"
-#~ msgstr "keine gültige Endungslänge gefunden\n"
-
-#~ msgid "setting Auto-Padding to %ld characters\n"
-#~ msgstr "Auto-Auffüllen wird auf %ld Zeichen gesetzt\n"
-
-#~ msgid ""
-#~ "extracting Fields:\n"
-#~ "  input: '%s'\n"
-#~ "  field: %d\n"
-#~ msgstr ""
-#~ "Extraktion der Felder:\n"
-#~ "  Eingabe: „%s“\n"
-#~ "  Feld: %d\n"
-
-#~ msgid ""
-#~ "  TOO FEW FIELDS!\n"
-#~ "  prefix: '%s'\n"
-#~ msgstr ""
-#~ "  ZU WENIGE FELDER!\n"
-#~ "  Präfix: „%s“\n"
-
-#~ msgid ""
-#~ "  prefix: '%s'\n"
-#~ "  number: '%s'\n"
-#~ "  suffix: '%s'\n"
-#~ msgstr ""
-#~ "  Präfix: „%s“\n"
-#~ "  Zahl  : „%s“\n"
-#~ "  Endung: „%s“\n"
-
-# XLATE_REMARK: Check this out! is the %s replaced by the name of the directory?
-#~ msgid "reading %s"
-#~ msgstr "%s wird gelesen"
-
-# XLATE_REMARK: Check this out! is the %s replaced by the name of the directory?
-#~ msgid "writing %s"
-#~ msgstr "%s wird geschrieben"
-
-# XLATE_REMARK: Check this out! is the %s replaced by the name of the directory?
-#~ msgid "closing %s"
-#~ msgstr "%s wird geschlossen"
-
-# XLATE_REMARK: Check this out! is the %s replaced by the name of the directory?
-#~ msgid "accessing %s"
-#~ msgstr "Zugriff auf %s"
-
-#~ msgid "opening %s"
-#~ msgstr "%s wird geöffnet"
-
-#~ msgid ""
-#~ "  -x, --one-file-system    skip directories on different file systems\n"
-#~ "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
-#~ "      --exclude=PATTERN    exclude files that match PATTERN\n"
-#~ "  -d, --max-depth=N     print the total for a directory (or file, with --"
-#~ "all)\n"
-#~ "                          only if it is N or fewer levels below the "
-#~ "command\n"
-#~ "                          line argument;  --max-depth=0 is the same as\n"
-#~ "                          --summarize\n"
-#~ msgstr ""
-#~ "  -x, --one-file-system    Verzeichnis auf anderen Dateisystemen "
-#~ "überspringen\n"
-#~ "  -X, --exclude-from=DAT   Dateien ausschließen, die auf Muster in DAT "
-#~ "passen\n"
-#~ "      --exclude=MUSTER     Dateien, die auf MUSTER passen, ausschließen\n"
-#~ "  -d, --max-depth=N        Summe für ein Verzeichnis ausgeben (oder "
-#~ "einer\n"
-#~ "                             Datei, mit „--all“) nur, wenn es N oder "
-#~ "weniger \n"
-#~ "                             Ebenen unterhalb des "
-#~ "Kommandozeilenargumentes ist.\n"
-#~ "                             „--max-depth=0“ ist dasselbe wie „--"
-#~ "summarize“.\n"
-
-#~ msgid ""
-#~ "  none, off       never make backups (even if --backup is given)\n"
-#~ "  numbered, t     make numbered backups\n"
-#~ "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
-#~ "  simple, never   always make simple backups\n"
-#~ "\n"
-#~ msgstr ""
-#~ "  none, off       Niemals Sicherung erzeugen (selbst wenn --backup\n"
-#~ "                    angegeben wurde)\n"
-#~ "  numbered, t     Erzeugen von nummerierten Sicherheitskopien\n"
-#~ "  existing, nil   Nummeriert, wenn nummerierte Backups existieren, sonst "
-#~ "einfach.\n"
-#~ "  simple, never   Immer einfache Sicherheitskopien erzeugen\n"
-
-#~ msgid ""
-#~ "WARNING: --page-increment is deprecated; use --line-increment instead"
-#~ msgstr ""
-#~ "WARNUNG: --page-increment ist veraltet; stattdessen --line-increment\n"
-#~ "benutzen"
-
-#~ msgid "All arguments to long options are mandatory for short options.\n"
-#~ msgstr ""
-#~ "Erforderliche Argumente für lange Optionen sind für kurze auch "
-#~ "notwendig.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "RADIX is d for decimal, o for octal, x for hexadecimal or n for none.\n"
-#~ "BYTES is hexadecimal with 0x or 0X prefix, and may have a multiplier "
-#~ "suffix:\n"
-#~ "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
-#~ "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n"
-#~ "Adding a z suffix to any type displays printable characters at the end of "
-#~ "each\n"
-#~ "output line.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "RADIX ist „d“ für dezimal, „o“ für oktal, „x“ für hexadezimal oder „n“ "
-#~ "für\n"
-#~ "nichts. BYTES ist hexadezimal mit 0x� oder 0X�Präfix und kann folgende\n"
-#~ "multiplikative Endungen tragen:\n"
-#~ "b 512, kB 1000, K 1024, MB 1000×1000, M 1024×1024,\n"
-#~ "GB 1000×1000×1000, G 1024×1024×1024, und so weiter für T, P, E, Z, Y.\n"
-#~ "Wird eine Endung „z“ an einen beliebigen Typ angehängt, werden am Ende "
-#~ "jeder\n"
-#~ "Zeile die druckbaren Zeichen ausgegeben.\n"
-
-#~ msgid ""
-#~ "Option --string without a number implies 3; option --width without a "
-#~ "number\n"
-#~ "implies 32.  By default, od uses -A o -t oS -w16.\n"
-#~ msgstr ""
-#~ "--string ohne Zahl impliziert „3“. --width ohne Zahl impliziert „32“.\n"
-#~ "Standardmäßig benutzt od: -A o -t oS -w16.\n"
-
-#~ msgid "Usage: %s [OPTION]... FILE\n"
-#~ msgstr "Aufruf: %s [OPTION]... DATEI\n"
-
-#~ msgid "Password:"
-#~ msgstr "Kennwort:"
-
-#~ msgid "getpass: cannot open /dev/tty"
-#~ msgstr "getpass: es ist nicht möglich, /dev/tty zu öffnen"
-
-#~ msgid "cannot set groups"
-#~ msgstr "es ist nicht möglich, die Gruppen zu setzen"
-
-#~ msgid "cannot set group id"
-#~ msgstr "es ist nicht möglich, die Gruppen�ID zu setzen"
-
-#~ msgid "cannot set user id"
-#~ msgstr "es ist nicht möglich, die Benutzer�ID zu setzen"
-
-#~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n"
-#~ msgstr "Aufruf: %s [OPTION]... [-] [BENUTZER [ARG]...]\n"
-
-#~ msgid ""
-#~ "Change the effective user id and group id to that of USER.\n"
-#~ "\n"
-#~ "  -, -l, --login               make the shell a login shell\n"
-#~ "  -c, --command=COMMAND        pass a single COMMAND to the shell with -"
-#~ "c\n"
-#~ "  -f, --fast                   pass -f to the shell (for csh or tcsh)\n"
-#~ "  -m, --preserve-environment   do not reset environment variables\n"
-#~ "  -p                           same as -m\n"
-#~ "  -s, --shell=SHELL            run SHELL if /etc/shells allows it\n"
-#~ msgstr ""
-#~ "Die effektive Benutzer� und Gruppen�ID in die des BENUTZERs ändern.\n"
-#~ "\n"
-#~ "  -, -l, --login               die Shell zur Loginshell machen\n"
-#~ "  -c, --command=BEFEHL         einen einzelnen BEFEHL an die Shell "
-#~ "weitergeben\n"
-#~ "  -f, --fast                   -f an die Shell weitergeben (für csh oder "
-#~ "tcsh)\n"
-#~ "  -m, --preserve-environment   Umgebungsvariablen nicht neu setzen\n"
-#~ "  -p                           dasselbe wie -m\n"
-#~ "  -s, --shell=SHELL            SHELL benutzen, falls /etc/shells es "
-#~ "erlaubt\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "A mere - implies -l.   If USER not given, assume root.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Ein schlichtes „-“ steht für -l. Falls kein BENUTZER angegeben ist,\n"
-#~ "wird „root“ angenommen.\n"
-
-#~ msgid "user %s does not exist"
-#~ msgstr "Benutzer %s existiert nicht"
-
-#~ msgid "incorrect password"
-#~ msgstr "ungültiges Kennwort"
-
-#~ msgid "using restricted shell %s"
-#~ msgstr "eingeschränkte Shell %s benutzen"
-
-#~ msgid "warning: cannot change directory to %s"
-#~ msgstr "Warnung: es ist nicht möglich, in das Verzeichnis %s zu wechseln"
-
-#~ msgid ""
-#~ "\n"
-#~ "Examples:\n"
-#~ "  %s /usr/bin/sort       Output \"sort\".\n"
-#~ "  %s include/stdio.h .h  Output \"stdio\".\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Beispiele:\n"
-#~ "  %s /usr/bin/sort        Ausgabe: „sort“.\n"
-#~ "  %s include/stdio.h .h   Ausgabe: „stdio“.\n"
-
-#~ msgid ""
-#~ "Usage: %s NAME\n"
-#~ "  or:  %s OPTION\n"
-#~ msgstr ""
-#~ "Aufruf: %s NAME\n"
-#~ " oder:  %s OPTION\n"
-
-#~ msgid "--relative-base requires --relative-to"
-#~ msgstr "--relative-base erfordert --relative-to"
-
-#~ msgid "character offset %s is too large"
-#~ msgstr "Zeichen�Offset %s ist zu groß"
-
-#~ msgid "only one way of folding may be specified"
-#~ msgstr "Nur ein Typ Faltung kann angegeben werden"
-
-#~ msgid "Invalid multibyte input %s."
-#~ msgstr "Ungültige Multibyte-Eingabe: %s."
-
-#~ msgid "cannot not open session: %s"
-#~ msgstr "Die Sitzung kann nicht geöffnet werden: %s"
-
-#~ msgid "cannot create child process"
-#~ msgstr "Erzeugen des Kindprozesses ist nicht möglich"
-
-#~ msgid "cannot block signals"
-#~ msgstr "Signale können nicht blockiert werden"
-
-#~ msgid "cannot set signal handler"
-#~ msgstr "Signalbehandlungsroutinen können nicht gesetzt werden"
-
-#~ msgid ""
-#~ "\n"
-#~ "Session terminated, killing shell..."
-#~ msgstr ""
-#~ "\n"
-#~ "Sitzung terminiert, die Shell wird gewaltsam beendet..."
-
-#~ msgid " ...killed.\n"
-#~ msgstr " ...gewaltsam beendet.\n"
-
-#~ msgid "Usage: %s [OPTION] FILE...\n"
-#~ msgstr "Aufruf: %s [OPTION] DATEI...\n"
-
-#~ msgid ""
-#~ "Change the group of each FILE to GROUP.\n"
-#~ "With --reference, change the group of each FILE to that of RFILE.\n"
-#~ "\n"
-#~ "  -c, --changes          like verbose but report only when a change is "
-#~ "made\n"
-#~ "      --dereference      affect the referent of each symbolic link (this "
-#~ "is\n"
-#~ "                         the default), rather than the symbolic link "
-#~ "itself\n"
-#~ msgstr ""
-#~ "Ändern der Gruppen�Zugehörigkeit für jede DATEI nach GRUPPE.\n"
-#~ "Mit --reference: Ändern der Gruppen�Zugehörigkeit für jede DATEI auf die "
-#~ "von RDATEI.\n"
-#~ "\n"
-#~ "  -c, --changes           wie --verbose, aber nur bei wirklichen "
-#~ "Änderungen\n"
-#~ "      --dereference       referenzierte Datei einer symbolischen "
-#~ "Verknüpfung\n"
-#~ "                            ändern (dies ist die Voreinstellung)\n"
-#~ "                            statt der Verknüpfung selbst\n"
-
-#~ msgid ""
-#~ "  -f, --silent, --quiet  suppress most error messages\n"
-#~ "      --reference=RFILE  use RFILE's group rather than specifying a\n"
-#~ "                         GROUP value\n"
-#~ "  -R, --recursive        operate on files and directories recursively\n"
-#~ "  -v, --verbose          output a diagnostic for every file processed\n"
-#~ "\n"
-#~ msgstr ""
-#~ "  -f, --silent, --quiet   die meisten Fehlermeldungen unterdrücken\n"
-#~ "      --reference=RDATEI  RDATEIs Gruppe verwenden anstatt eines GRUPPE�"
-#~ "Wertes\n"
-#~ "  -R, --recursive         Dateien und Verzeichnisse rekursiv ändern\n"
-#~ "  -v, --verbose           Diagnose für jede verarbeitete Datei ausgeben\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Change the mode of each FILE to MODE.\n"
-#~ "\n"
-#~ "  -c, --changes           like verbose but report only when a change is "
-#~ "made\n"
-#~ msgstr ""
-#~ "Den Modus jeder DATEI auf MODUS ändern.\n"
-#~ "\n"
-#~ "  -c, --changes           wie --verbose, aber nur bei wirklichen "
-#~ "Änderungen\n"
-
-#~ msgid ""
-#~ "      --no-preserve-root  do not treat `/' specially (the default)\n"
-#~ "      --preserve-root     fail to operate recursively on `/'\n"
-#~ msgstr ""
-#~ "      --no-preserve-root  „/“ nicht besonders behandeln (Voreinstellung)\n"
-#~ "      --preserve-root     nicht rekursiv auf „/“ arbeiten\n"
-
-#~ msgid ""
-#~ "  -f, --silent, --quiet   suppress most error messages\n"
-#~ "  -v, --verbose           output a diagnostic for every file processed\n"
-#~ "      --reference=RFILE   use RFILE's mode instead of MODE values\n"
-#~ "  -R, --recursive         change files and directories recursively\n"
-#~ msgstr ""
-#~ "  -f, --silent, --quiet   unterdrücken der meisten Fehlermeldungen\n"
-#~ "  -v, --verbose           eine Diagnose für jede verarbeitete Datei "
-#~ "ausgeben\n"
-#~ "      --reference=RDATEI  RDATEIs Modus anstatt eines MODUS-Wertes "
-#~ "verwenden\n"
-#~ "  -R, --recursive         Dateien und Verzeichnisse rekursiv ändern\n"
-
-#~ msgid ""
-#~ "Change the owner and/or group of each FILE to OWNER and/or GROUP.\n"
-#~ "With --reference, change the owner and group of each FILE to those of "
-#~ "RFILE.\n"
-#~ "\n"
-#~ "  -c, --changes          like verbose but report only when a change is "
-#~ "made\n"
-#~ "      --dereference      affect the referent of each symbolic link (this "
-#~ "is\n"
-#~ "                         the default), rather than the symbolic link "
-#~ "itself\n"
-#~ msgstr ""
-#~ "Ändern des Eigentümers und/oder der Gruppe für jede DATEI nach "
-#~ "EIGENTÃœMER\n"
-#~ "und/oder GRUPPE.\n"
-#~ "Mit --reference: Ändern von Eigentümers und Gruppe für jede DATEI auf "
-#~ "die\n"
-#~ "von RDATEI.\n"
-#~ "\n"
-#~ "  -c, --changes           wie --verbose, aber nur bei wirklichen "
-#~ "Änderungen\n"
-#~ "      --dereference       referenzierte Datei einer symbolischen "
-#~ "Verknüpfung\n"
-#~ "                            ändern (dies ist die Voreinstellung)\n"
-#~ "                            statt der Verknüpfung selbst\n"
-
-#~ msgid ""
-#~ "  -f, --silent, --quiet  suppress most error messages\n"
-#~ "      --reference=RFILE  use RFILE's owner and group rather than\n"
-#~ "                         specifying OWNER:GROUP values\n"
-#~ "  -R, --recursive        operate on files and directories recursively\n"
-#~ "  -v, --verbose          output a diagnostic for every file processed\n"
-#~ "\n"
-#~ msgstr ""
-#~ "  -f, --silent, --quiet   die meisten Fehlermeldungen unterdrücken\n"
-#~ "      --reference=RDATEI  RDATEIs Eigentümer und Gruppe verwenden "
-#~ "anstatt\n"
-#~ "                            eines EIGENTÜMER:GRUPPE�Wertes\n"
-#~ "  -R, --recursive         Dateien und Verzeichnisse rekursiv ändern\n"
-#~ "  -v, --verbose           Diagnose für jede verarbeitete Datei ausgeben\n"
-#~ "\n"
-
-#~ msgid "Usage: %s [OPTION]... PATH START\n"
-#~ msgstr "Aufruf: %s [OPTION]... PFAD START\n"
-
-#~ msgid ""
-#~ "          -n, --no-newline              do not output the trailing "
-#~ "newline\n"
-#~ "          "
-#~ msgstr ""
-#~ "Die ZEICHENKETTEn auf die Standardausgabe ausgeben.\n"
-#~ "\n"
-#~ "  -n             den abschließenden Zeilenvorschub unterdrücken\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "SIZE is an integer with an optional suffix (example: 10MB).  Suffixes "
-#~ "are:\n"
-#~ "KB 1000, K 1024, MB 1000*1000, M 1024*1024, and so on for G, T, P, E, Z, "
-#~ "Y.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "GRÖßE kann eine der folgenden Abkürzungen sein (oder eine Zahl, die "
-#~ "optional\n"
-#~ "von einer der Abkürzungen gefolgt wird):\n"
-#~ "KB 1000, K 1024, MB 1000×1000, M 1024×1024 und so weiter für G, T, P, E, "
-#~ "Z, Y.\n"
-
-#~ msgid ""
-#~ "Display the current time in the given FORMAT, or set the system date.\n"
-#~ "\n"
-#~ "  -d, --date=STRING         display time described by STRING, not `now'\n"
-#~ "  -f, --file=DATEFILE       like --date once for each line of DATEFILE\n"
-#~ msgstr ""
-#~ "Die aktuelle Uhrzeit im angegebenen FORMAT anzeigen oder die Systemzeit "
-#~ "setzen.\n"
-#~ "\n"
-#~ "  -d, --date=ZEICHENKETTE   Zeit gemäß ZEICHENKETTE anzeigen, nicht "
-#~ "„jetzt“\n"
-#~ "  -f, --file=DATEI          wie --date für jede Zeile in DATEI\n"
-
-#~ msgid "cannot create link %s"
-#~ msgstr "Erzeugen von Verknüpfung %s nicht möglich"
-
-#~ msgid ""
-#~ "WARNING: --preserve_context is deprecated; use --preserve-context instead"
-#~ msgstr ""
-#~ "WARNUNG: --preserve_context ist veraltet; stattdessen --preserve-context "
-#~ "benutzen"
-
-#~ msgid "truncating %s"
-#~ msgstr "%s wird verkürzt"
-
-#~ msgid ""
-#~ "  nocreat   do not create the output file\n"
-#~ "  excl      fail if the output file already exists\n"
-#~ "  notrunc   do not truncate the output file\n"
-#~ "  ucase     change lower case to upper case\n"
-#~ "  swab      swap every pair of input bytes\n"
-#~ msgstr ""
-#~ "  nocreat   Ausgabedatei nicht anlegen\n"
-#~ "  excl      wenn Ausgabedatei schon existiert, abbrechen\n"
-#~ "  notrunc   Ausgabedatei nicht abschneiden\n"
-#~ "  ucase     Kleinbuchstaben in Großbuchstaben ändern\n"
-#~ "  swab      jedes Paar von Eingabebytes vertauschen\n"
-
-#~ msgid "Filesystem        "
-#~ msgstr "Dateisystem       "
-
-#~ msgid "    Inodes   IUsed   IFree IUse%"
-#~ msgstr "    INodes  IBenut.  IFrei IBen%%"
-
-#~ msgid "    Size  Used Avail Use%"
-#~ msgstr "   Größe Benut  Verf Ben%%"
-
-#~ msgid "     Size   Used  Avail Use%"
-#~ msgstr "    Größe   Benut  Verf Ben%%"
-
-#~ msgid " %s-blocks      Used Available Capacity"
-#~ msgstr " %s�Blöcke   Benutzt Verfügbar Kapazität."
-
-#~ msgid " %4s-blocks      Used Available Use%%"
-#~ msgstr " %4s�Blöcke   Benutzt Verfügbar Ben%%"
-
-#~ msgid "invalid format precision"
-#~ msgstr "Ungültige Format�Genauigkeit"
-
-#~ msgid "invalid number of lines: 0"
-#~ msgstr "ungültige Anzahl von Zeilen: 0"
-
-#~ msgid "standard out"
-#~ msgstr "Standardausgabe"
-
-#~ msgid "options -o and --debug are incompatible"
-#~ msgstr "Optionen -o und --debug sind inkompatibel"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#~ msgid "creating symbolic link %s"
-#~ msgstr "Erzeuge symbolische Verknüpfung %s"
-
-#~ msgid "creating symbolic link %s -> %s"
-#~ msgstr "Erzeuge symbolische Verknüpfung %s →  %s"
-
-#~ msgid "creating hard link %s"
-#~ msgstr "Erzeuge harte Verknüpfung %s"
-
-#~ msgid "creating hard link %s => %s"
-#~ msgstr "Erzeuge harte Verknüpfung %s ⇒  %s"
-
-#~ msgid ""
-#~ "the --context (-Z) option is obsolete and will be removed\n"
-#~ "in a future release"
-#~ msgstr ""
-#~ "die Option --context (-Z) ist obsolet und wird zukünftig nicht mehr "
-#~ "unterstützt"
-
-#~ msgid "extra operand %s\n"
-#~ msgstr "zusätzlicher Operand %s\n"
-
-#~ msgid "warning: the --%s option is obsolete; use --reference"
-#~ msgstr "Warnung: Option --%s ist veraltet, benutzen Sie --reference"
-
-#~ msgid ""
-#~ "\n"
-#~ "Note that the -r and -s options are mutually exclusive.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Beachten Sie, dass -r und -s sich gegenseitig ausschließen.\n"
-
-#~ msgid ""
-#~ "Usage: %s [OPTION] NUMBER[SUFFIX] COMMAND [ARG]...\n"
-#~ "  or:  %s [OPTION]\n"
-#~ msgstr ""
-#~ "Aufruf: %s [OPTION] ANZAHL[SUFFIX] BEFEHL [ARGUMENT]...\n"
-#~ " oder:  %s [OPTION]\n"
-
-#~ msgid ""
-#~ "  -w, --wrap=COLS       Wrap encoded lines after COLS character (default "
-#~ "76).\n"
-#~ "                        Use 0 to disable line wrapping.\n"
-#~ "\n"
-#~ "  -d, --decode          Decode data.\n"
-#~ "  -i, --ignore-garbage  When decoding, ignore non-alphabet characters.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "  -w, --wrap=SPALTEN    kodierte Zeilen nach SPALTEN Zeichen umbrechen; "
-#~ "ohne\n"
-#~ "                          Angabe nach 76 Zeichen;\n"
-#~ "                          kein Zeilenumbruch, wenn hier 0 benutzt wird\n"
-#~ "\n"
-#~ "  -d, --decode          Daten dekodieren\n"
-#~ "  -i, --ignore-garbage  beim Dekodieren nicht zum Alphabet gehörende "
-#~ "Zeichen ignorieren\n"
-#~ "\n"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: ungültige Option -- %c\n"
-
-#~ msgid "%s home page: <http://www.gnu.org/software/%s/>.\n"
-#~ msgstr "Homepage für %s: <http://www.gnu.org/software/%s/>.\n"
-
-#~ msgid "General help using GNU software: <http://www.gnu.org/gethelp/>.\n"
-#~ msgstr ""
-#~ "Allgemeine Hilfe zur Benutzung von GNU-Software: <http://www.gnu.org/"
-#~ "gethelp/>.\n"
-
-#~ msgid "invalid argument: %s"
-#~ msgstr "ungültiges Argument: %s"
-
-#~ msgid ""
-#~ "      --help            Display this help and exit.\n"
-#~ "      --version         Output version information and exit.\n"
-#~ msgstr ""
-#~ "      --help            diese Hilfe anzeigen und beenden\n"
-#~ "      --version         Versionsinformation anzeigen und beenden\n"
-
-#~ msgid "the --megabytes option is deprecated; use -m instead"
-#~ msgstr ""
-#~ "Warnung: „--megabytes“ wird in einer kommenden Version aufgegeben "
-#~ "werden;\n"
-#~ "bitte verwenden Sie stattdessen „-m“."
-
-#~ msgid ""
-#~ "\n"
-#~ "If -e is in effect, the following sequences are recognized:\n"
-#~ "\n"
-#~ "  \\0NNN   the character whose ASCII code is NNN (octal)\n"
-#~ "  \\\\     backslash\n"
-#~ "  \\a     alert (BEL)\n"
-#~ "  \\b     backspace\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Wenn -e aktiv ist, werden die folgenden Sequenzen erkannt und umgesetzt:\n"
-#~ "\n"
-#~ "  \\0NNN  Zeichen mit dem ASCII�Code NNN (oktal)\n"
-#~ "  \\\\     Rückschrägstrich\n"
-#~ "  \\a     Alarm (BEL)\n"
-#~ "  \\b     Zeichen rückwärts löschen (Backspace)\n"
-
-#~ msgid "%s: warning: making a hard link to a symbolic link is not portable"
-#~ msgstr ""
-#~ "%s: Warnung: Erstellen einer harten Verknüpfung auf eine symbolische\n"
-#~ "             Verknüpfung ist nicht portabel"
-
-#~ msgid ""
-#~ "\n"
-#~ "By default, color is not used to distinguish types of files.  That is\n"
-#~ "equivalent to using --color=none.  Using the --color option without the\n"
-#~ "optional WHEN argument is equivalent to using --color=always.  With\n"
-#~ "--color=auto, color codes are output only if standard output is "
-#~ "connected\n"
-#~ "to a terminal (tty).  The environment variable LS_COLORS can influence "
-#~ "the\n"
-#~ "colors, and can be set easily by the dircolors command.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Standardmäßig werden keine Farben zum Unterscheiden der Dateitypen "
-#~ "verwendet.\n"
-#~ "Das ist das Äquivalent zur Verwendung von --color=none. Die Verwendung "
-#~ "der\n"
-#~ "--color�Option ohne das optionale WANN�Argument ist äquivalent zur "
-#~ "Verwendung\n"
-#~ "von --color=always. Mit --color=auto werden Farbcodes ausgegeben, wenn "
-#~ "die\n"
-#~ "Standardausgabe mit einem Terminal (tty) verbunden ist. Die "
-#~ "Umgebungsvariable\n"
-#~ "LS_COLORS kann die Farben beeinflussen und kann einfach mit dem Befehl\n"
-#~ "„dircolors“ gesetzt werden.\n"
-
-#~ msgid "  -d, --directory  create a directory, not a file\n"
-#~ msgstr "  -d, --directory  Verzeichnis erstellen statt Datei\n"
-
-#~ msgid ""
-#~ "  -q, --quiet      suppress diagnostics about file/dir-creation failure\n"
-#~ msgstr ""
-#~ "  -q, --quiet      Ausgaben zu Datei-/Verzeichniserstellungsfehlern "
-#~ "unterdrücken\n"
-
-#~ msgid ""
-#~ "  -u, --dry-run    do not create anything; merely print a name (unsafe)\n"
-#~ msgstr ""
-#~ "  -u, --dry-run    nichts erstellen; nur einen Namen ausgeben (unsicher)\n"
-
-#~ msgid "  -p DIR           use DIR as a prefix; implies -t [deprecated]\n"
-#~ msgstr ""
-#~ "  -p VERZ          VERZ als Präfix benutzen; impliziert -t (veraltet)\n"
-
-#~ msgid ""
-#~ "  \\a      alert (BEL)\n"
-#~ "  \\b      backspace\n"
-#~ "  \\c      produce no further output\n"
-#~ "  \\f      form feed\n"
-#~ msgstr ""
-#~ "  \\a      Alarm (BEL)\n"
-#~ "  \\b      Zeichen rückwärts löschen (Backspace)\n"
-#~ "  \\c      keine weitere Ausgabe\n"
-#~ "  \\f      Seitenvorschub\n"
-
-#~ msgid ""
-#~ "  \\n      new line\n"
-#~ "  \\r      carriage return\n"
-#~ "  \\t      horizontal tab\n"
-#~ "  \\v      vertical tab\n"
-#~ msgstr ""
-#~ "  \\n      Zeilenvorschub\n"
-#~ "  \\r      Wagenrücklauf (Carriage Return)\n"
-#~ "  \\t      horizontaler Tabulatorstopp\n"
-#~ "  \\v      vertikaler Tabulatorstopp\n"
-
-#~ msgid "FATAL: failed to close directory %s"
-#~ msgstr "FATAL: konnte Verzeichnis %s nicht schließen"
-
-#~ msgid "FATAL: cannot open .. from %s"
-#~ msgstr "FATAL: kann .. nicht von %s aus öffnen"
-
-#~ msgid "FATAL: cannot ensure %s (returned to via ..) is safe"
-#~ msgstr ""
-#~ "FATAL: kann nicht sicherstellen, dass %s (zurückgekehrt via ..) sicher ist"
-
-#~ msgid "FATAL: directory %s changed dev/ino"
-#~ msgstr "FATaL: Verzeichnis %s hat Gerät/Inode geändert"
-
-#~ msgid "FATAL: cannot enter directory %s"
-#~ msgstr "FATAL: kann Verzeichnis %s nicht betreten"
-
-#~ msgid "FATAL: just-changed-to directory %s changed dev/ino"
-#~ msgstr "FATaL: gerade betretenes Verzeichnis %s hat Gerät/Inode geändert"
-
-#~ msgid "FATAL: cannot return to .. from %s"
-#~ msgstr "FATAL: kann nicht nach „..“ zurückkehren aus %s"
-
-# MPi: What stupid message is that? No proper translation possible.
-#~ msgid "cannot remove %s directory %s"
-#~ msgstr "Entfernen von %s Verzeichnis %s nicht möglich"
-
-#~ msgid "cannot remove root directory %s"
-#~ msgstr "Entfernen von Wurzelverzeichnis %s nicht möglich"
-
-#~ msgid "cannot remove relative-named %s"
-#~ msgstr "kann relativ benanntes %s nicht entfernen"
-
-#~ msgid "cannot restore current working directory"
-#~ msgstr "kann aktuelles Verzeichnis nicht wieder herstellen"
-
-#~ msgid ""
-#~ "\n"
-#~ "SIZE may have a multiplier suffix:\n"
-#~ "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
-#~ "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "GRÖẞE kann folgende multiplikative Endungen tragen:\n"
-#~ "b 512, kB 1000, K 1024, MB 1000×1000, M 1024×1024,\n"
-#~ "GB 1000×1000×1000, G 1024×1024×1024, und so weiter für T, P, E, Z, Y.\n"
-
-#~ msgid ""
-#~ "Discard all but one of successive identical lines from INPUT (or\n"
-#~ "standard input), writing to OUTPUT (or standard output).\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Alle hintereinander stehenden identischen Zeilen von EINGABE (oder\n"
-#~ "Standardeingabe) bis auf eine löschen, und auf AUSGABE (oder "
-#~ "Standardausgabe)\n"
-#~ "schreiben.\n"
-#~ "\n"
-
-#~ msgid "couldn't open temporary file"
-#~ msgstr "konnte temporäre Datei nicht öffnen"
-
-#~ msgid "Usage: %s [OPTION]... [STRING]...\n"
-#~ msgstr "Aufruf: %s [OPTION]... [ZEICHENKETTE]...\n"
-
-#~ msgid ""
-#~ "      --bignum     always use arbitrary-precision arithmetic\n"
-#~ "      --no-bignum  always use single-precision arithmetic\n"
-#~ msgstr ""
-#~ "      --bignum     immer Arithmetik mit beliebiger Genauigkeit verwenden\n"
-#~ "      --no-bignum  immer Arithmetik mit einfacher Genauigkeit verwenden\n"
-
-#~ msgid ""
-#~ "arithmetic operation %c produced an out of range value, but arbitrary-"
-#~ "precision arithmetic is not available"
-#~ msgstr ""
-#~ "das Ergebnis der arithmetischen Operation %c ist außerhalb des "
-#~ "Wertebereichs, aber Arithmetik beliebiger Genauigkeit ist nicht verfügbar"
-
-#~ msgid "string too long"
-#~ msgstr "Zeichenkette zu lang"
-
-#~ msgid "arbitrary-precision support is not available"
-#~ msgstr "Unterstützung für beliebige Genauigkeit nicht verfügbar"
-
-#~ msgid "string offset is too large"
-#~ msgstr "Zeichenketten�Offset ist zu groß"
-
-#~ msgid "substring length too large"
-#~ msgstr "Unterzeichenkettenlänge zu groß"
-
-#~ msgid "arbitrary-precision arithmetic is not available"
-#~ msgstr "Arithmetik beliebiger Genauigkeit ist nicht verfügbar"
-
-#~ msgid ""
-#~ "\n"
-#~ "Exit status is 0 if OK, 1 if minor problems, 2 if serious trouble.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Exit�Status ist 0, wenn alles OK ist, 1 bei kleineren Problemen und\n"
-#~ "2 bei richtigem Ärger.\n"
-
-#~ msgid "no %% directive in format string %s"
-#~ msgstr "keine %%-Direktive in Formatzeichenkette %s"
-
-#~ msgid "too many %% directives in format string %s"
-#~ msgstr "zu viele %%-Direktive in Formatzeichenkette %s"
-
-#~ msgid "invalid format string: %s"
-#~ msgstr "ungültige Formatangabe: %s"
-
-#~ msgid "Usage: %s [OPTION] [FILE]...\n"
-#~ msgstr "Aufruf: %s [OPTION] [DATEI]...\n"
-
-#~ msgid ""
-#~ "cannot display context when selinux not enabled or when displaying the "
-#~ "id\n"
-#~ "of a different user"
-#~ msgstr ""
-#~ "kann Kontext nicht anzeigen, wenn SELinux nicht angeschaltet ist oder "
-#~ "wenn\n"
-#~ "die ID eines anderen Nutzers angezeigt wird"
-
-#~ msgid "Usage: %s [OPTION] DIRECTORY...\n"
-#~ msgstr "Aufruf: %s [OPTION] VERZEICHNIS...\n"
-
-#~ msgid "%d: fmt=\"%s\" width=%d\n"
-#~ msgstr "%d: fmt=\"%s\" width=%d\n"
-
-#~ msgid "  -SSTRING, --sep-string[=STRING]\n"
-#~ msgstr "  -SZKETTE, --sep-string[=ZKETTE]\n"
-
-#~ msgid "Usage: %s [OPTIONS] FILE [...]\n"
-#~ msgstr "Aufruf: %s [OPTIONEN] DATEI [...]\n"
-
-#~ msgid ""
-#~ "  -g, --general-numeric-sort  compare according to general numerical "
-#~ "value\n"
-#~ "  -i, --ignore-nonprinting    consider only printable characters\n"
-#~ "  -M, --month-sort            compare (unknown) < `JAN' < ... < `DEC'\n"
-#~ "  -n, --numeric-sort          compare according to string numerical "
-#~ "value\n"
-#~ "  -R, --random-sort           sort by random hash of keys\n"
-#~ "      --random-source=FILE    get random bytes from FILE (default /dev/"
-#~ "urandom)\n"
-#~ "      --sort=WORD             sort according to WORD:\n"
-#~ "                                general-numeric -g, month -M, numeric -"
-#~ "n,\n"
-#~ "                                random -R\n"
-#~ "  -r, --reverse               reverse the result of comparisons\n"
-#~ "\n"
-#~ msgstr ""
-#~ "  -g, --general-numeric-sort    anhand des allgemeinen numerischen "
-#~ "Wertes\n"
-#~ "                                  sortieren\n"
-#~ "  -i, --ignore-nonprinting      nur druckbare Zeichen beachten\n"
-#~ "  -M, --month-sort              Reihenfolge: (unbekannt) < „JAN“ < ... < "
-#~ "„DEZ“\n"
-#~ "  -n, --numeric-sort            anhand des numerischen Werts sortieren\n"
-#~ "  -R, --random-sort             anhand eines zufälligen Hash der "
-#~ "Schlüssel sortieren\n"
-#~ "      --random-source=DATEI     zufällige Bytes aus DATEI nehmen (/dev/"
-#~ "urandom)\n"
-#~ "      --sort=WORT               sortieren nach Kriterium WORT:\n"
-#~ "                                  general-numeric -g, month -M, numeric -"
-#~ "n,\n"
-#~ "                                  random -R\n"
-#~ "  -r, --reverse                 das Ergebnis der Sortierung umkehren\n"
-#~ "\n"
-
-#~ msgid "cannot create temporary file"
-#~ msgstr "temporäre Datei konnte nicht angelegt werden"
-
-#~ msgid "new_mode: mode\n"
-#~ msgstr "new_mode: Modus\n"
-
-#~ msgid ""
-#~ "      --retry              keep trying to open a file even if it is\n"
-#~ "                           inaccessible when tail starts or if it "
-#~ "becomes\n"
-#~ "                           inaccessible later; useful when following by "
-#~ "name,\n"
-#~ "                           i.e., with --follow=name\n"
-#~ "  -c, --bytes=N            output the last N bytes; alternatively, use +N "
-#~ "to\n"
-#~ "                           output bytes starting with the Nth of each "
-#~ "file\n"
-#~ msgstr ""
-#~ "      --retry              weiterhin versuchen, eine Datei zu öffnen, "
-#~ "auch wenn\n"
-#~ "                             sie beim Start nicht verfügbar ist oder "
-#~ "später\n"
-#~ "                             nicht mehr verfügbar wird; nützlich, wenn "
-#~ "mit Namen\n"
-#~ "                             verfolgt wird, also mit --follow=Name\n"
-#~ "  -c, --bytes=N            die letzten N Bytes ausgeben; alternativ +N "
-#~ "benutzen,\n"
-#~ "                             um Bytes beginnend mit dem Nten jeder Datei "
-#~ "auszugeben\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Translation occurs if -d is not given and both SET1 and SET2 appear.\n"
-#~ "-t may be used only when translating.  SET2 is extended to length of\n"
-#~ "SET1 by repeating its last character as necessary.  "
-#~ msgstr ""
-#~ "\n"
-#~ "Wandlung wird durchgeführt, wenn nicht -d spezifiziert ist und sowohl "
-#~ "MENGE1\n"
-#~ "als auch MENGE2 angegeben sind. -t darf nur bei Wandlung benutzt werden.\n"
-#~ "MENGE2 wird, wenn nötig, durch Wiederholung des letzten Zeichens auf die "
-#~ "Länge\n"
-#~ "von MENGE1 vergrößert.  "
-
-#~ msgid ""
-#~ "Excess characters\n"
-#~ "of SET2 are ignored.  Only [:lower:] and [:upper:] are guaranteed to\n"
-#~ "expand in ascending order; used in SET2 while translating, they may\n"
-#~ "only be used in pairs to specify case conversion.  "
-#~ msgstr ""
-#~ "Zusätzliche Zeichen in MENGE2 werden ignoriert. Nur\n"
-#~ "[:lower:] und [:upper:] werden mit Sicherheit in aufsteigender "
-#~ "Reihenfolge\n"
-#~ "expandiert. In MENGE2 dürfen sie zum Wandeln nur in Paaren benutzt "
-#~ "werden, um\n"
-#~ "eine Groß-/Kleinschreibung anzuzeigen.  "
-
-#~ msgid ""
-#~ "-s uses SET1 if not\n"
-#~ "translating nor deleting; else squeezing uses SET2 and occurs after\n"
-#~ "translation or deletion.\n"
-#~ msgstr ""
-#~ "-s benutzt MENGE1, wenn nicht\n"
-#~ "umgewandelt oder gelöscht wird; anderenfalls wird MENGE2 zum Verdichten "
-#~ "benutzt\n"
-#~ "und erscheint nach Wandlung und Löschung.\n"
-
-#~ msgid " %2d:%02d%s  up "
-#~ msgstr " %2d:%02d%s  an "
-
-#~ msgid "%ld day"
-#~ msgid_plural "%ld days"
-#~ msgstr[0] "%ld Tag"
-#~ msgstr[1] "%ld Tage"
-
-#~ msgid "Usage: %s [OPTION]... [ FILE ]\n"
-#~ msgstr "Aufruf: %s [OPTION]... [ DATEI ]\n"
-
-#~ msgid "unrecognized operand %s=%s"
-#~ msgstr "nicht erkannter Operand %s=%s"
-
-#~ msgid ""
-#~ "      --group-directories-first\n"
-#~ "                             group directories before files\n"
-#~ msgstr ""
-#~ "      --group-directories-first\n"
-#~ "                             Verzeichnisse vor Dateien anordnen\n"
diff --git a/po/el.gmo b/po/el.gmo
index 0ff6e32a..a701ba24 100644
--- a/po/el.gmo
+++ b/po/el.gmo
diff --git a/po/el.po b/po/el.po
index c0e15627..492d8ff3 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: coreutils 7.2\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
 "PO-Revision-Date: 2009-04-29 22:18+0200\n"
 "Last-Translator: Simos Xenitellis <simos.lists@googlemail.com>\n"
 "Language-Team: Greek <team@lists.gnome.gr>\n"
@@ -39,90 +39,142 @@ msgid "error closing file"
 msgstr "σφάλμα κατά το κλείσιμο του α�χείου"
 
 #
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "σφάλμα εγγ�αφής"
 
 #
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, fuzzy, c-format
 msgid "preserving permissions for %s"
 msgstr "αδυναμία αλλαγής ιδιοκτησίας στο %s"
 
 #
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "Άγνωστο σφάλμα συστήματος"
 
 #
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "κανονικό κενό α�χείο"
 
 #
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "κανονικό α�χείο"
 
 #
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "κατάλογος"
 
 #
-#: lib/file-type.c:44
+#: lib/file-type.c:46
+msgid "symbolic link"
+msgstr "συμβολικός σ�νδεσμος"
+
+#
+#: lib/file-type.c:52
+msgid "message queue"
+msgstr "ου�ά μηνυμάτων"
+
+#
+#: lib/file-type.c:55
+msgid "semaphore"
+msgstr "σημαφό�ος"
+
+#
+#: lib/file-type.c:58
+msgid "shared memory object"
+msgstr ""
+
+#: lib/file-type.c:61
+msgid "typed memory object"
+msgstr ""
+
+#
+#: lib/file-type.c:66
 msgid "block special file"
 msgstr "ειδικό α�χείο μπλοκ"
 
 #
-#: lib/file-type.c:47
+#: lib/file-type.c:69
 msgid "character special file"
 msgstr "ειδικό α�χείο χα�ακτή�ων"
 
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr ""
+
 #
-#: lib/file-type.c:50
+#: lib/file-type.c:75
 msgid "fifo"
 msgstr "φίφο"
 
-#
-#: lib/file-type.c:53
-msgid "symbolic link"
-msgstr "συμβολικός σ�νδεσμος"
+#: lib/file-type.c:78
+msgid "door"
+msgstr ""
 
 #
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "υποδοχέας"
+#: lib/file-type.c:81
+#, fuzzy
+msgid "multiplexed block special file"
+msgstr "ειδικό α�χείο μπλοκ"
 
 #
-#: lib/file-type.c:59
-msgid "message queue"
-msgstr "ου�ά μηνυμάτων"
+#: lib/file-type.c:84
+#, fuzzy
+msgid "multiplexed character special file"
+msgstr "ειδικό α�χείο χα�ακτή�ων"
+
+#: lib/file-type.c:87
+#, fuzzy
+msgid "multiplexed file"
+msgstr "είδος ώ�ας"
 
 #
-#: lib/file-type.c:62
-msgid "semaphore"
-msgstr "σημαφό�ος"
+#: lib/file-type.c:90
+#, fuzzy
+msgid "named file"
+msgstr "πα�άξενο α�χείο"
 
 #
-#: lib/file-type.c:65
-msgid "shared memory object"
+#: lib/file-type.c:93
+#, fuzzy
+msgid "network special file"
+msgstr "ειδικό α�χείο μπλοκ"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
 msgstr ""
 
-#: lib/file-type.c:68
-msgid "typed memory object"
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr ""
+
+#: lib/file-type.c:102
+msgid "port"
 msgstr ""
 
 #
-#: lib/file-type.c:70
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "υποδοχέας"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr ""
+
+#
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "πα�άξενο α�χείο"
 
@@ -274,20 +326,20 @@ msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: η επιλογή `-%s' απαιτεί ένα ό�ισμα\n"
 
 #
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr "αδ�νατη η αλλαγή δικαιωμάτων του %s"
 
 #
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "αδ�νατη η δημιου�γία καταλόγου %s"
 
 #
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr "η μνήμη εξαντλήθηκε"
@@ -420,7 +472,7 @@ msgid "Unmatched ) or \\)"
 msgstr ""
 
 #
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 #, fuzzy
 msgid "No previous regular expression"
 msgstr "σφάλμα στην ανε��εση μέσω κανονικής έκφ�ασης"
@@ -447,7 +499,7 @@ msgstr ""
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[yYν�]"
 
@@ -458,12 +510,12 @@ msgstr "^[yYν�]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[nNοΟ]"
 
 #
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, fuzzy, c-format
 msgid "setting permissions for %s"
 msgstr "αδυναμία αλλαγής ιδιοκτησίας στο %s"
@@ -618,20 +670,6 @@ msgid "Resource lost"
 msgstr ""
 
 #
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, fuzzy, c-format
-msgid "cannot create pipe"
-msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
-
-#
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, fuzzy, c-format
-msgid "%s subprocess failed"
-msgstr "σφάλμα κλεισίματος α�χείου"
-
-#
 #: lib/strsignal.c:114
 #, fuzzy, c-format
 msgid "Real-time signal %d"
@@ -840,7 +878,7 @@ msgstr ""
 "\n"
 "Αναφέ�ατε σφάλματα στο <%s>.\n"
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, fuzzy, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Χ�ήση: %s [ΕΠΙΛΟΓΗ]\n"
@@ -850,31 +888,10 @@ msgstr "Χ�ήση: %s [ΕΠΙΛΟΓΗ]\n"
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr ""
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr ""
 
-#
-#: lib/w32spawn.h:43
-#, fuzzy, c-format
-msgid "_open_osfhandle failed"
-msgstr "αποτυχία ανοίγματος"
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr ""
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr ""
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr ""
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr ""
@@ -902,7 +919,7 @@ msgid "failed to reopen %s with mode %s"
 msgstr "αδ�νατη η αλλαγή δικαιωμάτων στο %s"
 
 #
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr "η σ�γκ�ιση των συμβολοσει�ών απέτυχε"
@@ -973,7 +990,7 @@ msgid ""
 msgstr ""
 
 #
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -989,40 +1006,39 @@ msgid ""
 msgstr ""
 
 #
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "σφάλμα ανάγνωσης"
 
 #
-#: src/base64.c:230
+#: src/base64.c:231
 #, c-format
 msgid "invalid input"
 msgstr "Μη έγκυ�η είσοδος"
 
 #
-#: src/base64.c:267
+#: src/base64.c:268
 #, fuzzy, c-format
 msgid "invalid wrap size: %s"
 msgstr "μη έγκυ�ο είδος αλφα�ιθμητικο� `%s'"
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, c-format
 msgid "extra operand %s"
 msgstr ""
 
 #
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, fuzzy, c-format
 msgid "closing standard input"
 msgstr "κανονική είσοδος"
@@ -1030,11 +1046,11 @@ msgstr "κανονική είσοδος"
 #
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -1069,8 +1085,8 @@ msgstr ""
 #: src/basename.c:60
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/basename.c:67
@@ -1085,33 +1101,32 @@ msgid ""
 msgstr ""
 
 #
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, fuzzy, c-format
 msgid "missing operand"
 msgstr "%s: αναμενόταν ακέ�αιος μετά το `%c'"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 msgid "Richard M. Stallman"
 msgstr ""
 
 #
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1191,7 +1206,7 @@ msgid "cannot do ioctl on %s"
 msgstr "αδυναμία εκτέλεσης ioctl στο `%s'"
 
 #
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr "κανονική έξοδος"
@@ -1209,14 +1224,14 @@ msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 msgid "Jim Meyering"
 msgstr ""
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, fuzzy, c-format
 msgid "failed to create security context: %s"
 msgstr "διατή�ηση ω�ών στο %s"
@@ -1226,8 +1241,8 @@ msgstr "διατή�ηση ω�ών στο %s"
 msgid "failed to set %s security context component to %s"
 msgstr ""
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, fuzzy, c-format
 msgid "failed to get security context of %s"
 msgstr "διατή�ηση ω�ών στο %s"
@@ -1238,20 +1253,20 @@ msgid "can't apply partial context to unlabeled file %s"
 msgstr ""
 
 #
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, fuzzy, c-format
 msgid "failed to change context of %s to %s"
 msgstr "αδυναμία αλλαγής ιδιοκτησίας στο %s"
 
 #
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, fuzzy, c-format
 msgid "cannot access %s"
 msgstr "αδ�νατη η αλλαγή δικαιωμάτων στο %s"
 
 #
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, fuzzy, c-format
 msgid "cannot read directory %s"
 msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
@@ -1263,14 +1278,15 @@ msgid "changing security context of %s\n"
 msgstr "αδυναμία αλλαγής ιδιοκτησίας στο %s"
 
 #
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, fuzzy, c-format
 msgid "fts_read failed"
 msgstr "αποτυχία ανάγνωσης"
 
 #
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, fuzzy, c-format
 msgid "fts_close failed"
 msgstr "σφάλμα κλεισίματος α�χείου"
@@ -1288,7 +1304,7 @@ msgstr ""
 
 #: src/chcon.c:357
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
@@ -1309,7 +1325,7 @@ msgid ""
 "  -l, --range=RANGE      set range RANGE in the target security context\n"
 msgstr ""
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
 "      --preserve-root    fail to operate recursively on '/'\n"
@@ -1345,38 +1361,39 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr ""
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr ""
 
 #
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, c-format
 msgid "missing operand after %s"
 msgstr "λείπει τελεστής μετά το %s"
 
 #
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, fuzzy, c-format
 msgid "invalid context: %s"
 msgstr "μη έγκυ�ο είδος αλφα�ιθμητικο� `%s'"
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr ""
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, fuzzy, c-format
 msgid "failed to get attributes of %s"
 msgstr "διατή�ηση ω�ών στο %s"
@@ -1404,7 +1421,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
@@ -1438,50 +1455,50 @@ msgid ""
 "  %s -hR staff /u  Change the group of /u and subfiles to \"staff\".\n"
 msgstr ""
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, fuzzy, c-format
 msgid "getting new attributes of %s"
 msgstr "διατή�ηση ω�ών στο %s"
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr "ο�τε ο συμβολικός σ�νδεσμος %s ο�τε το αναφε�όμενο α�χείο αλλάχτηκαν\n"
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, fuzzy, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr "τα δικαιώματα του %s τ�οποποιήθηκαν σε %04lo (%s)\n"
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, fuzzy, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr "αποτυχία αλλαγής των δικαιωμάτων του %s σε %04lo (%s)\n"
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr "τα δικαιώματα του %s διατη�ο�νται ως έχουν, δηλαδή %04lo (%s)\n"
 
 #
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, fuzzy, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 
 #
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, fuzzy, c-format
 msgid "changing permissions of %s"
 msgstr "αδυναμία αλλαγής ιδιοκτησίας στο %s"
 
 #
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr "%s: τα νέα δικαιώματα είναι %s, και όχι %s"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1492,34 +1509,34 @@ msgstr ""
 "   ή:  %s [ΕΠΙΛΟΓΗ]... ΠΡΩΤΟΣ ΤΕΛΕΥΤΑΙΟΣ\n"
 "   ή:  %s [ΕΠΙΛΟΓΗ]... ΠΡΩΤΟΣ ΑΥΞΗΣΗ ΤΕΛΕΥΤΑΙΟΣ\n"
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 msgid ""
 "Change the mode of each FILE to MODE.\n"
 "With --reference, change the mode of each FILE to that of RFILE.\n"
 "\n"
 msgstr ""
 
-#: src/chmod.c:391
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr ""
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 msgid ""
 "\n"
 "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n"
 msgstr ""
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr ""
 
 #
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, fuzzy, c-format
 msgid "invalid mode: %s"
 msgstr "μη έγκυ�ος α�ιθμός πεδίου: `%s'"
@@ -1653,78 +1670,87 @@ msgid ""
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr ""
 
 #
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr "μη έγκυ�η ομάδα %s"
 
 #
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, fuzzy, c-format
 msgid "invalid group list %s"
 msgstr "μη έγκυ�η ομάδα %s"
 
-#: src/chroot.c:117
-#, fuzzy, c-format
-msgid "failed to set additional groups"
-msgstr "Δεν μπο�εί να πα�θεί ο συμπλη�ωματικός κατάλογος ομάδων."
-
 #
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
 "  or:  %s OPTION\n"
 msgstr "Χ�ήση: %s [ΕΠΙΛΟΓΗ]... [ΕΙΣΟΔΟΣ [ΕΞΟΔΟΣ]]\n"
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
 msgstr ""
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
 msgstr ""
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 msgid ""
 "\n"
 "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n"
 msgstr ""
 
 #
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, fuzzy, c-format
 msgid "cannot change root directory to %s"
 msgstr "αδ�νατη η αλλαγή στο κατάλογο %s"
 
 #
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, fuzzy, c-format
 msgid "cannot chdir to root directory"
 msgstr "αδ�νατη η αλλαγή στο κατάλογο %s"
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr ""
+
+#: src/chroot.c:383
+#, fuzzy, c-format
+msgid "failed to get supplemental groups"
+msgstr "Δεν μπο�εί να πα�θεί ο συμπλη�ωματικός κατάλογος ομάδων."
+
+#: src/chroot.c:395
+#, fuzzy, c-format
+msgid "failed to %s supplemental groups"
+msgstr "Δεν μπο�εί να πα�θεί ο συμπλη�ωματικός κατάλογος ομάδων."
+
+#: src/chroot.c:402
 #, fuzzy, c-format
 msgid "failed to set group-ID"
 msgstr "διατή�ηση ω�ών στο %s"
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, fuzzy, c-format
 msgid "failed to set user-ID"
 msgstr "διατή�ηση ω�ών στο %s"
 
 #
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, fuzzy, c-format
 msgid "failed to run command %s"
 msgstr "αδ�νατη η αλλαγή δικαιωμάτων στο %s"
@@ -1756,7 +1782,7 @@ msgid ""
 msgstr ""
 
 #
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr "Χ�ήση: %s [ΕΠΙΛΟΓΗ]... ΑΡΧΕΙΟ1 ΑΡΧΕΙΟ2\n"
@@ -1834,216 +1860,227 @@ msgid "empty %s not allowed"
 msgstr ""
 
 #
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr "σφάλμα ανάγνωσης %s"
 
 #
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, fuzzy, c-format
 msgid "cannot lseek %s"
 msgstr "αδ�νατη η αλλαγή δικαιωμάτων στο %s"
 
 #
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr "σφάλμα εγγ�αφής %s"
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, fuzzy, c-format
 msgid "%s: failed to get extents info"
 msgstr "διατή�ηση ω�ών στο %s"
 
 #
-#: src/copy.c:373
+#: src/copy.c:383
 #, fuzzy, c-format
 msgid "%s: write failed"
 msgstr "αποτυχία εγγ�αφής"
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, fuzzy, c-format
 msgid "failed to extend %s"
 msgstr "διατή�ηση ω�ών στο %s"
 
 #
-#: src/copy.c:662
+#: src/copy.c:687
 #, fuzzy, c-format
 msgid "clearing permissions for %s"
 msgstr "αδυναμία αλλαγής ιδιοκτησίας στο %s"
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, fuzzy, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "διατή�ηση ιδιοκτήτη για το %s"
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, fuzzy, c-format
 msgid "failed to lookup file %s"
 msgstr "διατή�ηση ω�ών στο %s"
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, fuzzy, c-format
 msgid "failed to preserve authorship for %s"
 msgstr "διατή�ηση ιδιοκτήτη για το %s"
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
+#, fuzzy, c-format
+msgid "failed to set default file creation context to %s"
+msgstr "διατή�ηση ω�ών στο %s"
+
+#: src/copy.c:820
+#, fuzzy, c-format
+msgid "failed to set default file creation context for %s"
+msgstr "διατή�ηση ω�ών στο %s"
+
+#: src/copy.c:846
+#, fuzzy, c-format
+msgid "failed to set the security context of %s"
+msgstr "αποτυχία αλλαγής της ομάδας από %s σε %s\n"
+
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
 msgid "cannot open %s for reading"
 msgstr "αδυναμία ανοίγματος του %s π�ος ανάγνωση"
 
 #
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, fuzzy, c-format
 msgid "cannot fstat %s"
 msgstr "αδ�νατη η αλλαγή δικαιωμάτων στο %s"
 
-#: src/copy.c:820
+#: src/copy.c:935
 #, c-format
 msgid "skipping file %s, as it was replaced while being copied"
 msgstr ""
 
-#: src/copy.c:850
-#, c-format
-msgid "failed to get file system create context"
-msgstr ""
-
-#: src/copy.c:864
-#, fuzzy, c-format
-msgid "failed to set the security context of %s to %s"
-msgstr "αποτυχία αλλαγής της ομάδας από %s σε %s\n"
-
 #
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, fuzzy, c-format
 msgid "cannot remove %s"
 msgstr "αδ�νατη η αλλαγή δικαιωμάτων στο %s"
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, fuzzy, c-format
 msgid "removed %s\n"
 msgstr "διαγ�αφή καταλόγου %s\n"
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr ""
 
 #
-#: src/copy.c:964
+#: src/copy.c:1070
 #, fuzzy, c-format
 msgid "cannot create regular file %s"
 msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 
 #
-#: src/copy.c:985
+#: src/copy.c:1091
 #, fuzzy, c-format
 msgid "failed to clone %s from %s"
 msgstr "αδ�νατη η αλλαγή στο κατάλογο %s"
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr "διατή�ηση ω�ών στο %s"
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
 #, fuzzy, c-format
 msgid "failed to close %s"
 msgstr "διατή�ηση ω�ών στο %s"
 
-#: src/copy.c:1471
+#: src/copy.c:1580
 #, fuzzy, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
-msgstr "%s: αντιγ�αφή πάνω στο `%s', πα�άκαμψη δικαιωμάτων %04lo; "
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
+msgstr "%s: αντικατάσταση του `%s', πα�άκαμψη δικαιωμάτων %04o; "
+
+#: src/copy.c:1581
+#, c-format
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr ""
 
 #
-#: src/copy.c:1478
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
 msgstr "%s: αντικατάσταση %s; "
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr " (αντίγ�αφο ασφαλείας: %s)"
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr ""
 
 #
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, fuzzy, c-format
 msgid "cannot create hard link %s to %s"
 msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 
 #
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, fuzzy, c-format
 msgid "cannot stat %s"
 msgstr "αδ�νατη η αλλαγή δικαιωμάτων στο %s"
 
 #
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, fuzzy, c-format
 msgid "omitting directory %s"
 msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr ""
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, fuzzy, c-format
 msgid "%s and %s are the same file"
 msgstr "τα `%s' και `%s' είναι το ίδιο α�χείο"
 
 #
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, fuzzy, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr "αδ�νατη η αλλαγή στο κατάλογο %s"
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, fuzzy, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr "%s: δε μπο�εί να γ�αφτεί μη-κατάλογος πάνω σε κατάλογο"
 
 #
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, fuzzy, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 
 #
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr ""
 "αδ�νατη η μετακίνηση του καταλόγου σε κάτι που δεν είναι κατάλογος: %s -> %s"
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, fuzzy, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr ""
 "η δημιου�γία αντιγ�άφου ασφαλείας του `%s' θα κατέστ�εφε τη πηγή· το `%s' δε "
 "μετακινείται"
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, fuzzy, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr ""
@@ -2051,57 +2088,51 @@ msgstr ""
 "δεν αντιγ�άφεται"
 
 #
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, fuzzy, c-format
 msgid "cannot backup %s"
 msgstr "αδ�νατη η αλλαγή δικαιωμάτων στο %s"
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, fuzzy, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr "%s: δε μπο�εί να γ�αφτεί μη-κατάλογος πάνω σε κατάλογο"
 
 #
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr "αδ�νατη η αντιγ�αφή του καταλόγου %s μέσα στον εαυτό του, %s"
 
 #
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, fuzzy, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr "αδ�νατη η αλλαγή στο κατάλογο %s"
 
 #
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr "αδ�νατη η μετακίνηση του %s σε υποκατάλογο του εαυτο� του, %s"
 
 #
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, fuzzy, c-format
 msgid "cannot move %s to %s"
 msgstr "αδ�νατη η αλλαγή δικαιωμάτων στο %s"
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr ""
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, fuzzy, c-format
-msgid "failed to set default file creation context to %s"
-msgstr "διατή�ηση ω�ών στο %s"
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, fuzzy, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr "%s: αδυναμία αντιγ�αφής κυκλίκο� συμβολικο� συνδέσμου"
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr ""
@@ -2109,53 +2140,82 @@ msgstr ""
 "κατάλογο"
 
 #
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, fuzzy, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 
 #
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, fuzzy, c-format
 msgid "cannot create fifo %s"
 msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 
 #
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, c-format
 msgid "cannot create special file %s"
 msgstr "αδυναμία δημιου�γίας του ειδικο� α�χείου %s"
 
 #
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, fuzzy, c-format
 msgid "cannot read symbolic link %s"
 msgstr "συμβολικός σ�νδεσμος"
 
 #
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, fuzzy, c-format
 msgid "cannot create symbolic link %s"
 msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, fuzzy, c-format
 msgid "%s has unknown file type"
 msgstr "%s: άγνωστο είδος α�χείου"
 
 #
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, fuzzy, c-format
 msgid "cannot un-backup %s"
 msgstr "αδ�νατη η αλλαγή δικαιωμάτων στο %s"
 
 # src/copy.c:924
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr "%s -> %s (χ�ήση αντιγ�άφου ασφαλείας)\n"
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr ""
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr ""
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+
+#
+#: src/coreutils.c:178 src/coreutils.c:202
+#, fuzzy, c-format
+msgid "unknown program %s"
+msgstr "Άγνωστο σφάλμα συστήματος"
+
+#: src/cp.c:157 src/mv.c:288
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -2166,11 +2226,11 @@ msgstr ""
 "   ή:  %s [ΕΠΙΛΟΓΗ]... ΠΡΩΤΟΣ ΤΕΛΕΥΤΑΙΟΣ\n"
 "   ή:  %s [ΕΠΙΛΟΓΗ]... ΠΡΩΤΟΣ ΑΥΞΗΣΗ ΤΕΛΕΥΤΑΙΟΣ\n"
 
-#: src/cp.c:162
+#: src/cp.c:163
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 
-#: src/cp.c:168
+#: src/cp.c:169
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
 "      --attributes-only        don't copy the file data, just the "
@@ -2184,7 +2244,7 @@ msgid ""
 "  -d                           same as --no-dereference --preserve=links\n"
 msgstr ""
 
-#: src/cp.c:177
+#: src/cp.c:178
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
 "                                 opened, remove it and try again (this "
@@ -2197,20 +2257,20 @@ msgid ""
 "  -H                           follow command-line symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:186
+#: src/cp.c:187
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
 "  -L, --dereference            always follow symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:190
+#: src/cp.c:191
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
 "                                 a previous -i option)\n"
 "  -P, --no-dereference         never follow symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:195
+#: src/cp.c:196
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
 "      --preserve[=ATTR_LIST]   preserve the specified attributes (default:\n"
@@ -2220,13 +2280,13 @@ msgid ""
 "                                 all\n"
 msgstr ""
 
-#: src/cp.c:203
+#: src/cp.c:204
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                use full source file name under DIRECTORY\n"
 msgstr ""
 
-#: src/cp.c:207
+#: src/cp.c:208
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
 "      --reflink[=WHEN]         control clone/CoW copies. See below\n"
@@ -2235,7 +2295,7 @@ msgid ""
 "force)\n"
 msgstr ""
 
-#: src/cp.c:213
+#: src/cp.c:214
 #, fuzzy
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
@@ -2292,7 +2352,7 @@ msgstr ""
 "Με --sparse=never απογο�ε�ετε τη δημιου�γία α�αιών α�χείων.\n"
 "\n"
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -2301,7 +2361,7 @@ msgid ""
 "  -T, --no-target-directory    treat DEST as a normal file\n"
 msgstr ""
 
-#: src/cp.c:224
+#: src/cp.c:225
 #, fuzzy
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
@@ -2332,7 +2392,15 @@ msgstr ""
 "      --version                εμφάνιση πλη�οφο�ιών έκδοσης και έξοδος\n"
 "\n"
 
-#: src/cp.c:233
+#: src/cp.c:232
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/cp.c:240
 #, fuzzy
 msgid ""
 "\n"
@@ -2397,7 +2465,7 @@ msgstr ""
 "Με --sparse=never απογο�ε�ετε τη δημιου�γία α�αιών α�χείων.\n"
 "\n"
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 #, fuzzy
 msgid ""
 "\n"
@@ -2420,7 +2488,7 @@ msgstr ""
 "                    απλά αντίγ�αφα\n"
 "  simple, never   πάντα δημιου�γία απλών αντιγ�άφων\n"
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 #, fuzzy
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
@@ -2441,7 +2509,7 @@ msgstr ""
 "                    απλά αντίγ�αφα\n"
 "  simple, never   πάντα δημιου�γία απλών αντιγ�άφων\n"
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2453,194 +2521,204 @@ msgstr ""
 "και τα ΠΗΓΗ και ΠΡΟΟΡΙΣΜΟΣ έχουν το ίδιο όνομα, για ένα υπά�χον, κανονικό "
 "α�χείο.\n"
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, fuzzy, c-format
 msgid "failed to preserve times for %s"
 msgstr "διατή�ηση ω�ών στο %s"
 
 #
-#: src/cp.c:348
+#: src/cp.c:355
 #, fuzzy, c-format
 msgid "failed to preserve permissions for %s"
 msgstr "αδυναμία αλλαγής ιδιοκτησίας στο %s"
 
 #
-#: src/cp.c:475
+#: src/cp.c:482
 #, fuzzy, c-format
 msgid "cannot make directory %s"
 msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 
 #
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, fuzzy, c-format
 msgid "%s exists but is not a directory"
 msgstr "το `%s' υπά�χει ήδη άλλα δεν είναι κατάλογος"
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
 #, fuzzy, c-format
 msgid "failed to access %s"
 msgstr "διατή�ηση ω�ών στο %s"
 
 #
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, fuzzy, c-format
 msgid "missing file operand"
 msgstr "π�οσπέ�ασμα ο�ίσματος"
 
 #
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, fuzzy, c-format
 msgid "missing destination file operand after %s"
 msgstr "έχει πα�αληφθεί η λίστα με τα πεδία"
 
 #
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, fuzzy, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr "το `%s' υπά�χει ήδη άλλα δεν είναι κατάλογος"
 
 #
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, fuzzy, c-format
 msgid "target %s is not a directory"
 msgstr "το `%s' υπά�χει ήδη άλλα δεν είναι κατάλογος"
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, fuzzy, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr ""
 "όταν διατη�ο�νται τα μονοπάτια, το τελευταίο ό�ισμα π�έπει να είναι κατάλογος"
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, fuzzy, c-format
 msgid "multiple target directories specified"
 msgstr "\\%c: Μη έγκυ�η διαφυγή."
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr ""
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr "αδυναμία δημιου�γίας σθενα�ών(hard) και συμβολικών συνδέσμων"
 
 #
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, fuzzy, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr "οι επιλογές --string και --check είναι αμοιβαίως αποκλειόμενες"
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr ""
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr "είδος αντιγ�άφου ασφάλειας"
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, c-format
+msgid "cannot set target context and preserve it"
+msgstr ""
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr ""
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr ""
 
 #
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr "η είσοδος εξαφανίστηκε"
 
 #
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr "%s: α�ιθμός γ�αμμής έξω από τα ό�ια"
 
 #
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, fuzzy, c-format
 msgid "%s: %s: line number out of range"
 msgstr "%s: `%s': α�ιθμός γ�αμμής έξω από τα ό�ια"
 
 #
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, fuzzy, c-format
 msgid " on repetition %s\n"
 msgstr " στην επανάληψη %d\n"
 
 #
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, fuzzy, c-format
 msgid "%s: %s: match not found"
 msgstr "%s: `%s': δεν β�έθηκε ταί�ιασμα"
 
 #
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr "σφάλμα στην ανε��εση μέσω κανονικής έκφ�ασης"
 
 #
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, fuzzy, c-format
 msgid "write error for %s"
 msgstr "σφάλμα εγγ�αφής για το `%s'"
 
 #
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, c-format
 msgid "%s: integer expected after delimiter"
 msgstr "%s: αναμενόταν ακέ�αιος μετά τον ο�ιοθέτη"
 
 #
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, fuzzy, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr "%s: το `}' απαιτείται όταν δηλώνονται οι επαναλήψεις"
 
 #
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, fuzzy, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr "%s}: απαιτείται ακέ�αιος μεταξ� των `{' και `}'"
 
 #
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, fuzzy, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr "%s: ο τελεστής τε�ματισμο� `%c' έχει πα�αληφθεί"
 
 #
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr "%s: μη έγκυ�η κανονική έκφ�αση: %s"
 
 #
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr "%s: μη έγκυ�η μο�φή"
 
 #
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr "%s: ο α�ιθμός γ�αμμής π�έπει να είναι μεγαλ�τε�ος από το μηδέν"
 
 #
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, fuzzy, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr ""
@@ -2648,7 +2726,7 @@ msgstr ""
 "%s"
 
 #
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, fuzzy, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr ""
@@ -2656,60 +2734,60 @@ msgstr ""
 "γ�αμμής"
 
 #
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr "έχει πα�αληφθεί ο δηλωτής μετατ�οπής στην κατάληξη"
 
 #
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr "μη έγκυ�ος δηλωτής μετατ�οπής στην κατάληξη: %c"
 
 #
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr "μη έγκυ�ος δηλωτής μετατ�οπής στην κατάληξη: \\%.3o"
 
 #
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, fuzzy, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr "μη έγκυ�η δήλωση πεδίου `%s'"
 
 #
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr "πά�α πολλές δηλώσεις μετατ�οπής στην κατάληξη"
 
 #
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr "έχει πα�αληφθεί η δήλωση μετατ�οπής %% στην κατάληξη"
 
 #
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr "%s: μη έγκυ�ος α�ιθμός"
 
 #
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr "Χ�ήση: %s [ΕΠΙΛΟΓΗ]... ΑΡΧΕΙΟ ΜΟΡΦΗ...\n"
 
-#: src/csplit.c:1455
+#: src/csplit.c:1483
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
 "and output byte counts of each piece to standard output.\n"
 msgstr ""
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2717,8 +2795,12 @@ msgid ""
 "  -k, --keep-files           do not remove output files on errors\n"
 msgstr ""
 
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr ""
+
 #
-#: src/csplit.c:1467
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
@@ -2726,13 +2808,13 @@ msgid ""
 msgstr ""
 
 #
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
 msgstr ""
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 msgid ""
 "\n"
 "  INTEGER            copy up to but not including specified line number\n"
@@ -2749,22 +2831,18 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr ""
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr ""
-
 #
-#: src/cut.c:189
+#: src/cut.c:172
 #, fuzzy, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr "Χ�ήση: %s [ΕΠΙΛΟΓΕΣ]... [ΑΡΧΕΙΟ]...\n"
 
-#: src/cut.c:193
+#: src/cut.c:176
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr ""
 
 #
-#: src/cut.c:199
+#: src/cut.c:182
 #, fuzzy
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
@@ -2780,7 +2858,7 @@ msgstr ""
 "      --help          εμφάνιση αυτής της βοήθειας και έξοδος\n"
 "      --version       εμφάνιση πλη�οφο�ιών έκδοσης και έξοδος\n"
 
-#: src/cut.c:204
+#: src/cut.c:187
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
 "                            that contains no delimiter character, unless\n"
@@ -2788,21 +2866,21 @@ msgid ""
 "  -n                      (ignored)\n"
 msgstr ""
 
-#: src/cut.c:210
+#: src/cut.c:193
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
 "                            or fields\n"
 msgstr ""
 
 #
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
 "                            the default is to use the input delimiter\n"
 msgstr ""
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2810,7 +2888,7 @@ msgid ""
 "in the same order that it is read, and is written exactly once.\n"
 msgstr ""
 
-#: src/cut.c:227
+#: src/cut.c:210
 msgid ""
 "Each range is one of:\n"
 "\n"
@@ -2823,59 +2901,63 @@ msgid ""
 msgstr ""
 
 #
-#: src/cut.c:367 src/cut.c:493
+#: src/cut.c:300 src/cut.c:394
 #, fuzzy
 msgid "invalid byte, character or field list"
 msgstr "μη έγκυ�ο byte ή λίστα πεδίων"
 
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr ""
+
 #
-#: src/cut.c:387
+#: src/cut.c:320
 #, fuzzy
 msgid "invalid range with no endpoint: -"
 msgstr "μη έγκυ�ο είδος αλφα�ιθμητικο� `%s'"
 
 #
-#: src/cut.c:403
+#: src/cut.c:334
 #, fuzzy
 msgid "invalid decreasing range"
 msgstr "μη έγκυ�ο είδος αλφα�ιθμητικο� `%s'"
 
 #
-#: src/cut.c:482
+#: src/cut.c:383
 #, fuzzy, c-format
 msgid "byte offset %s is too large"
 msgstr "το %s είναι πολ� μεγάλο"
 
 #
-#: src/cut.c:485
+#: src/cut.c:386
 #, fuzzy, c-format
 msgid "field number %s is too large"
 msgstr "μη έγκυ�ος α�ιθμός πεδίου: `%s'"
 
 #
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr "μόνο ένα είδος λίστας μπο�εί να ο�ιστεί"
 
 #
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr "ο διαχω�ιστής π�έπει να είναι ένας μόνο χα�ακτή�ας"
 
 #
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr "π�έπει να ο�ίσετε λίστα από bytes, χα�ακτή�ες ή πεδία"
 
 #
-#: src/cut.c:850
+#: src/cut.c:790
 #, fuzzy
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr "ένας διαχω�ιστής μπο�εί να ο�ιστεί μόνο όταν λειτου�γο�με με πεδία"
 
 #
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
@@ -2884,12 +2966,12 @@ msgstr ""
 "\tμόνο όταν λειτου�γο�με με πεδία"
 
 #
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr "έχει πα�αληφθεί η λίστα με τα πεδία"
 
 #
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr "έχει πα�αληφθεί η λίστα με τις θέσεις"
 
@@ -2931,7 +3013,7 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 
 #: src/date.c:158
@@ -3064,10 +3146,10 @@ msgid ""
 msgstr ""
 
 #
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr "κανονική είσοδος"
@@ -3114,7 +3196,7 @@ msgid "cannot set date"
 msgstr "Δεν μπο�εί να τεθεί η ημε�ομηνία."
 
 #
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, fuzzy, c-format
 msgid "time %s is out of range"
 msgstr "%s: α�ιθμός γ�αμμής έξω από τα ό�ια"
@@ -3126,7 +3208,7 @@ msgid "Paul Rubin"
 msgstr ""
 
 #
-#: src/dd.c:521
+#: src/dd.c:527
 #, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
@@ -3135,7 +3217,7 @@ msgstr ""
 "Χ�ήση: %s [ΤΕΛΕΣΤΗΣ]...\n"
 "  ή:  %s ΕΠΙΛΟΓΗ\n"
 
-#: src/dd.c:526
+#: src/dd.c:532
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
 "\n"
@@ -3146,7 +3228,7 @@ msgid ""
 "  ibs=BYTES       read up to BYTES bytes at a time (default: 512)\n"
 msgstr ""
 
-#: src/dd.c:535
+#: src/dd.c:541
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
 "  iflag=FLAGS     read as per the comma separated symbol list\n"
@@ -3159,7 +3241,7 @@ msgid ""
 "                  'noxfer' suppresses transfer stats, 'none' suppresses all\n"
 msgstr ""
 
-#: src/dd.c:546
+#: src/dd.c:552
 msgid ""
 "\n"
 "N and BYTES may be followed by the following multiplicative suffixes:\n"
@@ -3170,7 +3252,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dd.c:555
+#: src/dd.c:561
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
 "  ebcdic    from ASCII to EBCDIC\n"
@@ -3185,7 +3267,7 @@ msgid ""
 "            with block or unblock, pad with spaces rather than NULs\n"
 msgstr ""
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -3195,7 +3277,7 @@ msgid ""
 "  fsync     likewise, but also write metadata\n"
 msgstr ""
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -3204,77 +3286,77 @@ msgid ""
 "suggested)\n"
 msgstr ""
 
-#: src/dd.c:583
+#: src/dd.c:589
 msgid "  cio       use concurrent I/O for data\n"
 msgstr ""
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr ""
 
 #
-#: src/dd.c:587
+#: src/dd.c:593
 #, fuzzy
 msgid "  directory  fail unless a directory\n"
 msgstr "το `%s' υπά�χει ήδη άλλα δεν είναι κατάλογος"
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr ""
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr ""
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr ""
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr ""
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr ""
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr ""
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr ""
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr ""
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr ""
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr ""
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr ""
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, c-format
 msgid ""
 "\n"
@@ -3291,28 +3373,38 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
 "%<PRIuMAX>+%<PRIuMAX> records out\n"
 msgstr ""
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, fuzzy, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
 msgstr[0] "μηδενισμένη εγγ�αφή και γ�άψιμο πάνω σε αυτή (truncated)"
 msgstr[1] "μηδενισμένη εγγ�αφή και γ�άψιμο πάνω σε αυτή (truncated)"
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr ""
 
@@ -3326,285 +3418,285 @@ msgstr ""
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
 msgstr ""
 
 #
-#: src/dd.c:812
+#: src/dd.c:877
 #, fuzzy, c-format
 msgid "closing input file %s"
 msgstr "δημιου�γία α�χείου `%s'\n"
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, fuzzy, c-format
 msgid "closing output file %s"
 msgstr "διαγ�αφή καταλόγου %s\n"
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, fuzzy, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr "αποτυχία αλλαγής της ομάδας από %s σε %s\n"
 
 #
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, fuzzy, c-format
 msgid "writing to %s"
 msgstr "σφάλμα εγγ�αφής %s"
 
 #
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, c-format
 msgid "unrecognized operand %s"
 msgstr "άγνωστος τελεστής %s"
 
 #
-#: src/dd.c:1218
+#: src/dd.c:1285
 #, fuzzy
 msgid "invalid conversion"
 msgstr "μη έγκυ�ο είδος αλφα�ιθμητικο� `%s'"
 
 #
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 #, fuzzy
 msgid "invalid input flag"
 msgstr "μη έγκυ�ος α�ιθμός πεδίου: `%s'"
 
 #
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 msgid "invalid output flag"
 msgstr "μη έγκυ�η σημαία εξόδου"
 
 #
-#: src/dd.c:1227
+#: src/dd.c:1294
 msgid "invalid status flag"
 msgstr "μη έγκυ�η σημαία κατάστασης"
 
 #
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, c-format
 msgid "invalid number %s"
 msgstr "μη έγκυ�ος α�ιθμός %s"
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr ""
 
 #
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, fuzzy, c-format
 msgid "cannot combine block and unblock"
 msgstr "δεν είναι δυνατό να πα�αληφθεί χ�ήστης και ομάδα"
 
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, fuzzy, c-format
 msgid "cannot combine lcase and ucase"
 msgstr "δεν είναι δυνατό να δημιου�γηθεί το %s `%s' στο `%s'"
 
 #
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, fuzzy, c-format
 msgid "cannot combine excl and nocreat"
 msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 
 #
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, fuzzy, c-format
 msgid "cannot combine direct and nocache"
 msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
 "  of mt_type=0x%0lx -- see <sys/mtio.h> for the list of types"
 msgstr ""
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, fuzzy, c-format
 msgid "%s: cannot skip"
 msgstr "%s: δε μπο�εί να διαγ�αφεί"
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, fuzzy, c-format
 msgid "%s: cannot seek"
 msgstr "%s: δε μπο�εί να διαγ�αφεί"
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr ""
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr ""
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr ""
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, fuzzy, c-format
 msgid "setting flags for %s"
 msgstr "διατή�ηση ω�ών στο %s"
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr ""
-
 #
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, fuzzy, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 
-#: src/dd.c:2133
+#: src/dd.c:2172
 #, fuzzy, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
 msgstr "διαγ�αφή καταλόγου %s\n"
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr ""
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
 msgstr ""
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, fuzzy, c-format
 msgid "failed to open %s"
 msgstr "διατή�ηση ω�ών στο %s"
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
 "blocks"
 msgstr ""
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, fuzzy, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr "διαγ�αφή καταλόγου %s\n"
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, fuzzy, c-format
 msgid "failed to discard cache for: %s"
 msgstr "αποτυχία αλλαγής της ομάδας από %s σε %s\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr ""
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr ""
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr ""
 
 #
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 #, fuzzy
 msgid "blocks"
 msgstr "μέγεθος μπλοκ"
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr ""
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr ""
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr ""
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr ""
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr ""
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr ""
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr ""
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr ""
 
-#: src/df.c:383
-#, c-format
-msgid "option --output: field '%s' unknown"
+#: src/df.c:207
+msgid "File"
 msgstr ""
 
-#: src/df.c:390
+#: src/df.c:387
+#, fuzzy, c-format
+msgid "option --output: field %s unknown"
+msgstr "διαγ�αφή καταλόγου %s\n"
+
+#: src/df.c:394
 #, c-format
-msgid "option --output: field '%s' used more than once"
+msgid "option --output: field %s used more than once"
 msgstr ""
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr ""
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr ""
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr ""
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
 msgstr ""
 
-#: src/df.c:1210
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr ""
+
+#: src/df.c:1384
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
 "or all file systems by default.\n"
 msgstr ""
 
-#: src/df.c:1217
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
 
-#: src/df.c:1227
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -3613,7 +3705,7 @@ msgid ""
 "(default)\n"
 msgstr ""
 
-#: src/df.c:1234
+#: src/df.c:1409
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
 "                               or print all fields if FIELD_LIST is "
@@ -3626,44 +3718,35 @@ msgid ""
 "  -v                    (ignored)\n"
 msgstr ""
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
 
 #
-#: src/df.c:1285
+#: src/df.c:1460
 #, fuzzy, c-format
 msgid "options %s and %s are mutually exclusive"
 msgstr "οι επιλογές --string και --check είναι αμοιβαίως αποκλειόμενες"
 
-#: src/df.c:1335
-#, fuzzy
-msgid "warning: "
-msgstr "Π�οειδοποίηση:"
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr ""
-
-#: src/df.c:1442
+#: src/df.c:1610
 #, fuzzy, c-format
 msgid "file system type %s both selected and excluded"
 msgstr "το σ�στημα α�χείων `%s' είναι και επελεγμένο και αποκλειώμενο"
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr "Π�οειδοποίηση:"
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 #, fuzzy
 msgid "cannot read table of mounted file systems"
 msgstr "%sαδυναμία ανάγνωσης πίνακα π�οσα�τημένων συστήματος α�χείων"
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr ""
@@ -3674,7 +3757,7 @@ msgid "H. Peter Anvin"
 msgstr ""
 
 #
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr "Χ�ήση: %s [ΕΠΙΛΟΓΕΣ]... [ΑΡΧΕΙΟ]...\n"
@@ -3771,7 +3854,7 @@ msgstr ""
 "  --version   Εκτυπώνει πλη�οφο�ίες έκδοσης και τε�ματίζει\n"
 
 #: src/dirname.c:59
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/dirname.c:64
@@ -3785,7 +3868,7 @@ msgid ""
 msgstr ""
 
 #
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -3794,14 +3877,13 @@ msgstr ""
 "Χ�ήση: %s [ΕΠΙΛΟΓΗ]... [ΑΡΧΕΙΟ]...\n"
 "   ή:  %s --traditional [ΑΡΧΕΙΟ] [[+]ΘΕΣΗ [[+]ΧΑΡΑΚΤΗΡΙΣΤΙΚΟ]]\n"
 
-#: src/du.c:274
+#: src/du.c:285
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr ""
 
-#: src/du.c:280
+#: src/du.c:291
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3810,11 +3892,11 @@ msgid ""
 "                          fragmentation, indirect blocks, and the like\n"
 msgstr ""
 
-#: src/du.c:289
+#: src/du.c:300
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3827,22 +3909,23 @@ msgid ""
 msgstr ""
 
 #
-#: src/du.c:302
+#: src/du.c:313
 #, fuzzy
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
 "Εμφάνιση άθ�οισμα ελέγχου CRC και α�ιθμό bytes για κάθε ΑΡΧΕΙΟ.\n"
 "\n"
 "  --help       εμφάνιση αυτής της βοήθειας και έξοδος\n"
 "  --version    εμφάνιση πλη�οφο�ιών έκδοσης και έξοδος\n"
 
-#: src/du.c:310
+#: src/du.c:322
 msgid ""
 "  -k                    like --block-size=1K\n"
 "  -L, --dereference     dereference all symbolic links\n"
@@ -3850,16 +3933,17 @@ msgid ""
 "  -m                    like --block-size=1M\n"
 msgstr ""
 
-#: src/du.c:316
+#: src/du.c:328
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
 
-#: src/du.c:322
+#: src/du.c:334
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
 "                          or entries greater than SIZE if negative\n"
@@ -3868,85 +3952,85 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
 msgstr ""
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
 "  -x, --one-file-system    skip directories on different file systems\n"
 msgstr ""
 
-#: src/du.c:386
+#: src/du.c:398
 msgid "Infinity"
 msgstr ""
 
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr ""
-
 #
-#: src/du.c:624
+#: src/du.c:636
 #, fuzzy, c-format
 msgid "fts_read failed: %s"
 msgstr "αποτυχία ανάγνωσης"
 
 #
-#: src/du.c:780
+#: src/du.c:787
 #, fuzzy, c-format
 msgid "invalid maximum depth %s"
 msgstr "μη έγκυ�ος α�ιθμός πεδίου: `%s'"
 
 #
-#: src/du.c:809
+#: src/du.c:816
 #, fuzzy, c-format
 msgid "invalid --threshold argument '-0'"
 msgstr "μη έγκυ�ο ό�ισμα %s για %s"
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr ""
 "δεν είναι δυνατό να δειχτεί πε�ίληψη και να εμφανιστο�ν όλες οι καταχω�ίσεις"
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr "π�οειδοποίηση: η πε�ίληψη είναι όμοιο με --max-depth=0"
 
-#: src/du.c:900
+#: src/du.c:911
 #, fuzzy, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr "π�οειδοποίηση: η πε�ίληψη έ�χεται σε αντίφαση με το --max-depth=%d"
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 msgid "file operands cannot be combined with --files0-from"
 msgstr ""
 
 #
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr "%s: σφάλμα ανάγνωσης"
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr ""
 
 #
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 #, fuzzy
 msgid "invalid zero-length file name"
 msgstr "μη έγκυ�η ομάδα"
 
 #
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr "σ�νολο"
 
@@ -4034,7 +4118,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
 "Τίθεται σε κάθε ΜΕΤΑΒΛΗΤΗ του πε�ιβάλλοντος η ΤΙΜΗ εκτελείται η Ε�ΤΟΛΗ.\n"
@@ -4135,24 +4219,24 @@ msgid "input line is too long"
 msgstr "το α�χείο μηδενίστηκε"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr ""
 
 #
-#: src/expr.c:203
+#: src/expr.c:202
 #, fuzzy, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
 "  or:  %s OPTION\n"
 msgstr "Χ�ήση: %s [ΕΠΙΛΟΓΗ]... [ΕΙΣΟΔΟΣ [ΕΞΟΔΟΣ]]\n"
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -4163,7 +4247,7 @@ msgid ""
 "  ARG1 & ARG2       ARG1 if neither argument is null or 0, otherwise 0\n"
 msgstr ""
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -4174,14 +4258,14 @@ msgid ""
 "  ARG1 > ARG2       ARG1 is greater than ARG2\n"
 msgstr ""
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
 "  ARG1 - ARG2       arithmetic difference of ARG1 and ARG2\n"
 msgstr ""
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -4190,7 +4274,7 @@ msgid ""
 "  ARG1 % ARG2       arithmetic remainder of ARG1 divided by ARG2\n"
 msgstr ""
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -4201,7 +4285,7 @@ msgid ""
 "  length STRING              length of STRING\n"
 msgstr ""
 
-#: src/expr.c:251
+#: src/expr.c:250
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
 "                               keyword like 'match' or an operator like '/'\n"
@@ -4209,7 +4293,7 @@ msgid ""
 "  ( EXPRESSION )             value of EXPRESSION\n"
 msgstr ""
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -4227,7 +4311,7 @@ msgstr ""
 "\\( και \\) ή κενό. Εαν \\( και \\) δεν χ�ησιμοποιήθηκαν, τοτε επιστ�έφει\n"
 "τον α�ιθμό των χα�ακτή�ων που ταί�ιαξαν ή 0.\n"
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -4236,35 +4320,35 @@ msgid ""
 msgstr ""
 
 #
-#: src/expr.c:278
+#: src/expr.c:277
 #, fuzzy, c-format
 msgid "syntax error"
 msgstr "κανονικό σφάλμα"
 
 #
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, fuzzy, c-format
 msgid "error in regular expression matcher"
 msgstr "σφάλμα στην ανε��εση μέσω κανονικής έκφ�ασης"
 
 #
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, fuzzy, c-format
 msgid "non-integer argument"
 msgstr "ό�ιο ο�ίσματος"
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr ""
 
 #
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, fuzzy, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr "Θέστε LC_ALL='C' για να πα�ακάμψετε το π�όβλημα."
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, fuzzy, c-format
 msgid "the strings compared were %s and %s"
 msgstr "δεν είναι δυνατό να δημιου�γηθεί το %s `%s' στο `%s'"
@@ -4274,36 +4358,36 @@ msgstr "δεν είναι δυνατό να δημιου�γηθεί το %s `%s
 msgid "Niels Moller"
 msgstr ""
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
 msgstr ""
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
 msgstr ""
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, fuzzy, c-format
 msgid "%s is not a valid positive integer"
 msgstr "%s' δεν είναι ισχ�ων θετικός ακέ�αιος."
 
 #
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr "το %s είναι πολ� μεγάλο"
 
 #
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
 "  or:  %s OPTION\n"
 msgstr "Χ�ήση: %s [ΕΠΙΛΟΓΗ]... [ΕΙΣΟΔΟΣ [ΕΞΟΔΟΣ]]\n"
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 #, fuzzy
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
@@ -4451,28 +4535,28 @@ msgid "invalid number of columns: %s"
 msgstr "μη έγκυ�ος α�ιθμός από στήλες: `%s'"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr ""
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, fuzzy, c-format
 msgid "Usage: %s\n"
 msgstr "Χ�ήση: %s [ΕΠΙΛΟΓΗ]\n"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
 msgstr ""
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, fuzzy, c-format
 msgid "failed to get groups for user %s"
 msgstr "αποτυχία αλλαγής της ομάδας από %s σε %s\n"
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, fuzzy, c-format
 msgid "failed to get groups for the current process"
 msgstr "αποτυχία αλλαγής της ομάδας από %s σε %s\n"
@@ -4497,24 +4581,24 @@ msgid ""
 msgstr ""
 
 #
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, fuzzy, c-format
 msgid "cannot get real UID"
 msgstr "δεν είναι δυνατό να πα�αληφθεί χ�ήστης και ομάδα"
 
 #
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, fuzzy, c-format
 msgid "cannot get effective GID"
-msgstr "αδ�νατη η αλλαγή δικαιωμάτων στο %s"
+msgstr "δεν είναι δυνατό να γίνει διαχω�ισμός σε πε�ισσότε�ους από ένα τ�όπο"
 
 #
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, fuzzy, c-format
 msgid "cannot get real GID"
 msgstr "δεν είναι δυνατό να πα�αληφθεί χ�ήστης και ομάδα"
 
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, fuzzy, c-format
 msgid "%s: no such user"
 msgstr "%s: Δεν υπά�χει τέτοιος χ�ήστης."
@@ -4573,68 +4657,57 @@ msgid ""
 "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n"
 msgstr ""
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr ""
 
 #
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, fuzzy, c-format
 msgid "%s: number of bytes is too large"
 msgstr "μη έγκυ�ος α�ιθμός από bytes π�ος σ�γκ�ιση: `%s'"
 
-#: src/head.c:440
-#, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr ""
-
 #
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, fuzzy, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr "αδυναμία εκτέλεσης ioctl στο `%s'"
 
 #
-#: src/head.c:673
+#: src/head.c:423 src/tail.c:457
 #, fuzzy, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "το α�χείο μηδενίστηκε"
-
-#
-#: src/head.c:798
-#, fuzzy, c-format
-msgid "cannot reposition file pointer for %s"
+msgid "%s: cannot seek to relative offset %s"
 msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 
 #
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr "%s: το %s είναι τόσο μεγάλο που δε μπο�εί να αναπα�ασταθεί"
 
 #
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr "α�ιθμός γ�αμμών"
 
 #
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr "α�ιθμός από bytes"
 
 #
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr "μη έγκυ�ος α�ιθμός από γ�αμμές"
 
 #
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr "μη έγκυ�ος α�ιθμός από bytes"
 
 #
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, fuzzy, c-format
 msgid "invalid trailing option -- %c"
 msgstr "%s: μη έγκυ�η επιλογή -- %c\n"
@@ -4685,29 +4758,35 @@ msgid "cannot determine hostname"
 msgstr "Δεν μπο�εί να καθο�ιστεί το όνομα του συστήματος"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr ""
 
 #
-#: src/id.c:81
+#: src/id.c:84
 #, fuzzy, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
-msgstr "Χ�ήση: %s [ΕΠΙΛΟΓΗ]... ΣΥ�ΟΛΟ1 [ΣΥ�ΟΛΟ2]\n"
+msgid "Usage: %s [OPTION]... [USER]\n"
+msgstr "Χ�ήση: %s [ΕΠΙΛΟΓΕΣ]... [ΑΡΧΕΙΟ]...\n"
 
-#: src/id.c:82
-#, fuzzy
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
+msgstr ""
+
+#: src/id.c:90
+#, fuzzy
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
 msgstr ""
 "Εκτ�πωνει πλη�οφο�ίες που αφο�ο�ν ενα ΧΡΗΣΤΗ, ή τον τ�έχοντα χ�ήστη.\n"
 "\n"
@@ -4723,134 +4802,146 @@ msgstr ""
 "\n"
 "Χω�ίς καμιά ΕΠΙΛΟΓΗ, εκτυπώνει μια χ�ήσιμη σει�ά πλη�οφο�ιών.\n"
 
-#: src/id.c:96
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
 msgstr ""
 
-#: src/id.c:140
+#: src/id.c:151
+#, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr ""
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr ""
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr ""
 
 #
-#: src/id.c:178
+#: src/id.c:198
 #, fuzzy, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr "δεν είναι δυνατό να γίνει διαχω�ισμός σε πε�ισσότε�ους από ένα τ�όπο"
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr ""
 "Δεν μπο�εί να εκτυπωθο�ν μόνο ονόματα ή π�αγματική ταυτότητα(read ID) σε\n"
 "τυπική μο�φή"
 
-#: src/id.c:199
+#: src/id.c:209
+#, fuzzy, c-format
+msgid "option --zero not permitted in default format"
+msgstr ""
+"Δεν μπο�εί να εκτυπωθο�ν μόνο ονόματα ή π�αγματική ταυτότητα(read ID) σε\n"
+"τυπική μο�φή"
+
+#: src/id.c:225
 #, fuzzy, c-format
 msgid "can't get process context"
 msgstr "Δεν είναι δυνατόν να β�εθεί ο τ�πος του επεξε�γαστή."
 
 #
-#: src/id.c:224
+#: src/id.c:265
 #, fuzzy, c-format
 msgid "cannot get effective UID"
-msgstr "αδ�νατη η αλλαγή δικαιωμάτων στο %s"
+msgstr "δεν είναι δυνατό να γίνει διαχω�ισμός σε πε�ισσότε�ους από ένα τ�όπο"
 
-#: src/id.c:311
+#: src/id.c:354
 #, fuzzy, c-format
 msgid "cannot find name for user ID %s"
 msgstr "%s: δεν μπο�ει να β�εθεί όνομα χ�ήστη για το 'UID' %u\n"
 
-#: src/id.c:329
+#: src/id.c:372
 #, c-format
 msgid "uid=%s"
 msgstr ""
 
-#: src/id.c:334
+#: src/id.c:377
 #, c-format
 msgid " gid=%s"
 msgstr ""
 
-#: src/id.c:341
+#: src/id.c:384
 #, c-format
 msgid " euid=%s"
 msgstr ""
 
-#: src/id.c:349
+#: src/id.c:392
 #, c-format
 msgid " egid=%s"
 msgstr ""
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr " ομάδες="
 
 #
-#: src/id.c:393
+#: src/id.c:437
 #, fuzzy, c-format
 msgid " context=%s"
 msgstr "μη έγκυ�ο είδος αλφα�ιθμητικο� `%s'"
 
 #
-#: src/install.c:373
+#: src/install.c:376
 #, fuzzy, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 
 #
-#: src/install.c:414
+#: src/install.c:417
 #, fuzzy, c-format
 msgid "creating directory %s"
 msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 
 #
-#: src/install.c:482
+#: src/install.c:485
 #, fuzzy, c-format
 msgid "cannot change ownership of %s"
 msgstr "αδυναμία αλλαγής ιδιοκτησίας στο %s"
 
 #
-#: src/install.c:506
+#: src/install.c:509
 #, fuzzy, c-format
 msgid "cannot set time stamps for %s"
 msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 
 #
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, fuzzy, c-format
 msgid "fork system call failed"
 msgstr "ειδικό α�χείο μπλοκ"
 
-#: src/install.c:531
+#: src/install.c:535
 #, fuzzy, c-format
 msgid "cannot run %s"
 msgstr "Δεν είναι δυνατόν να εκτελεστεί το %s"
 
 #
-#: src/install.c:535
+#: src/install.c:539
 #, fuzzy, c-format
 msgid "waiting for strip"
 msgstr "σφάλμα εγγ�αφής %s"
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr ""
 
 #
-#: src/install.c:558
+#: src/install.c:565
 #, fuzzy, c-format
 msgid "invalid user %s"
 msgstr "μη έγκυ�ος χ�ήστης"
 
-#: src/install.c:594
+#: src/install.c:601
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -4862,7 +4953,7 @@ msgstr ""
 "   ή:  %s [ΕΠΙΛΟΓΗ]... ΠΡΩΤΟΣ ΤΕΛΕΥΤΑΙΟΣ\n"
 "   ή:  %s [ΕΠΙΛΟΓΗ]... ΠΡΩΤΟΣ ΑΥΞΗΣΗ ΤΕΛΕΥΤΑΙΟΣ\n"
 
-#: src/install.c:601
+#: src/install.c:608
 msgid ""
 "\n"
 "This install program copies files (often just compiled) into destination\n"
@@ -4876,7 +4967,7 @@ msgid ""
 "In the 4th form, create all components of the given DIRECTORY(ies).\n"
 msgstr ""
 
-#: src/install.c:615
+#: src/install.c:622
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
 "  -b                  like --backup but does not accept an argument\n"
@@ -4888,7 +4979,7 @@ msgid ""
 "                        components of the specified directories\n"
 msgstr ""
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -4900,7 +4991,7 @@ msgid ""
 "  -o, --owner=OWNER   set ownership (super-user only)\n"
 msgstr ""
 
-#: src/install.c:631
+#: src/install.c:638
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
 "files\n"
@@ -4914,67 +5005,65 @@ msgid ""
 "  -v, --verbose       print the name of each directory as it is created\n"
 msgstr ""
 
-#: src/install.c:641
+#: src/install.c:648
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
 
-#: src/install.c:859
+#
+#: src/install.c:696 src/unlink.c:86
+#, fuzzy, c-format
+msgid "cannot unlink %s"
+msgstr "αδ�νατη η αλλαγή δικαιωμάτων στο %s"
+
+#: src/install.c:877
 #, c-format
 msgid ""
 "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
 msgstr ""
 
-#: src/install.c:869
-#, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
-msgstr ""
-
-#: src/install.c:886
+#: src/install.c:917
 #, fuzzy, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr ""
 "Η αλυσίδα μο�φής δεν π�έπει να καθο�ίζεται όταν εκτυπώνονται\n"
 "αλυσίδες με ίσα μήκη."
 
-#: src/install.c:889
+#: src/install.c:920
 #, fuzzy, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr ""
 "Η αλυσίδα μο�φής δεν π�έπει να καθο�ίζεται όταν εκτυπώνονται\n"
 "αλυσίδες με ίσα μήκη."
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr ""
-
 #
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, fuzzy, c-format
 msgid "invalid mode %s"
 msgstr "μη έγκυ�ος α�ιθμός πεδίου: `%s'"
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr ""
 
 #
-#: src/install.c:959
+#: src/install.c:1001
 #, fuzzy, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr "οι επιλογές --string και --check είναι αμοιβαίως αποκλειόμενες"
 
 #
-#: src/install.c:966
+#: src/install.c:1008
 #, fuzzy, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr "οι επιλογές --string και --check είναι αμοιβαίως αποκλειόμενες"
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -4986,7 +5075,7 @@ msgstr ""
 msgid "Mike Haertel"
 msgstr ""
 
-#: src/join.c:191
+#: src/join.c:195
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
 "standard output.  The default join field is the first, delimited\n"
@@ -4997,7 +5086,7 @@ msgid ""
 "  -e EMPTY          replace missing input fields with EMPTY\n"
 msgstr ""
 
-#: src/join.c:200
+#: src/join.c:204
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
 "  -j FIELD          equivalent to '-1 FIELD -2 FIELD'\n"
@@ -5006,7 +5095,7 @@ msgid ""
 msgstr ""
 
 #
-#: src/join.c:206
+#: src/join.c:210
 #, fuzzy
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
@@ -5027,7 +5116,11 @@ msgstr ""
 "      --help      εμφάνιση αυτής της βοήθειας και έξοδος\n"
 "      --version   εμφάνιση πλη�οφο�ιών έκδοσης και έξοδος\n"
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr ""
+
+#: src/join.c:225
 msgid ""
 "\n"
 "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n"
@@ -5046,52 +5139,52 @@ msgid ""
 "warning message will be given.\n"
 msgstr ""
 
-#: src/join.c:403
+#: src/join.c:410
 #, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
 msgstr ""
 
 #
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, fuzzy, c-format
 msgid "invalid field number: %s"
 msgstr "μη έγκυ�ος α�ιθμός πεδίου: `%s'"
 
 #
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, fuzzy, c-format
 msgid "invalid field specifier: %s"
 msgstr "μη έγκυ�ος δηλωτής πεδίου: `%s'"
 
 #
-#: src/join.c:877
+#: src/join.c:884
 #, fuzzy, c-format
 msgid "invalid file number in field spec: %s"
 msgstr "μη έγκυ�ος α�ιθμός α�χείου στη δήλωση πεδίου: `%s'"
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr ""
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr ""
 
 #
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, fuzzy, c-format
 msgid "multi-character tab %s"
 msgstr "μη έγκυ�η τάξη χα�ακτή�ων `%s'"
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr ""
 
 #
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr "και τα δ�ο α�χεία δε μπο�εί να είναι η κανονική είσοδος"
@@ -5206,52 +5299,52 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, fuzzy, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr "Το `%s' δεν είναι κατάλογος."
 
 #
-#: src/ln.c:255
+#: src/ln.c:271
 #, fuzzy, c-format
 msgid "%s: cannot overwrite directory"
 msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, fuzzy, c-format
 msgid "%s: replace %s? "
 msgstr "%s: αντικατάσταση του `%s'; "
 
 #
-#: src/ln.c:345
+#: src/ln.c:362
 #, fuzzy, c-format
 msgid "failed to create symbolic link %s"
 msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 
 #
-#: src/ln.c:346
+#: src/ln.c:363
 #, fuzzy, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, fuzzy, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr "δημιου�γία σθενα�ο� συνδέσμου `%s' στο `%s'"
 
 #
-#: src/ln.c:351
+#: src/ln.c:368
 #, fuzzy, c-format
 msgid "failed to create hard link %s"
 msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 
 #
-#: src/ln.c:352
+#: src/ln.c:369
 #, fuzzy, c-format
 msgid "failed to create hard link %s => %s"
 msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -5263,7 +5356,7 @@ msgstr ""
 "    ή: %s [ΕΠΙΛΟΓΗ]... ΠΗΓΗ... ΚΑΤΑΛΟΓΟΣ   (2η μο�φή)\n"
 "    ή: %s -d [ΕΠΙΛΟΓΗ]... ΚΑΤΑΛΟΓΟΣ...     (3η μο�φή)\n"
 
-#: src/ln.c:381
+#: src/ln.c:398
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
 "In the 2nd form, create a link to TARGET in the current directory.\n"
@@ -5275,7 +5368,7 @@ msgid ""
 "interpreted in relation to its parent directory.\n"
 msgstr ""
 
-#: src/ln.c:394
+#: src/ln.c:411
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
 "file\n"
@@ -5288,7 +5381,7 @@ msgid ""
 "  -f, --force                 remove existing destination files\n"
 msgstr ""
 
-#: src/ln.c:402
+#: src/ln.c:419
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
 "  -L, --logical               dereference TARGETs that are symbolic links\n"
@@ -5300,7 +5393,7 @@ msgid ""
 "  -s, --symbolic              make symbolic links instead of hard links\n"
 msgstr ""
 
-#: src/ln.c:411
+#: src/ln.c:428
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
 "  -t, --target-directory=DIRECTORY  specify the DIRECTORY in which to "
@@ -5310,7 +5403,7 @@ msgid ""
 "  -v, --verbose               print name of each linked file\n"
 msgstr ""
 
-#: src/ln.c:433
+#: src/ln.c:450
 #, c-format
 msgid ""
 "\n"
@@ -5319,13 +5412,13 @@ msgid ""
 msgstr ""
 
 #
-#: src/ln.c:554
+#: src/ln.c:571
 #, fuzzy, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr "το `%s' υπά�χει ήδη άλλα δεν είναι κατάλογος"
 
 #
-#: src/ln.c:588
+#: src/ln.c:605
 #, fuzzy, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
@@ -5359,7 +5452,7 @@ msgstr "%s: μη έγκυ�ος α�ιθμός"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 #, fuzzy
 msgid "%b %e  %Y"
 msgstr "%b %e %H:%M %Y"
@@ -5370,22 +5463,22 @@ msgstr "%b %e %H:%M %Y"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 #, fuzzy
 msgid "%b %e %H:%M"
 msgstr "%b %e %H:%M %Y"
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, fuzzy, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr "αγνοείται μη έγκυ�ο πλάτος στη μεταβλητή πε�ιβάλλοντος COLUMNS: %s"
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr "αγνοείται μη έγκυ�ο πλάτος στη μεταβλητή πε�ιβάλλοντος COLUMNS: %s"
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr ""
@@ -5393,92 +5486,92 @@ msgstr ""
 "TABSIZE: %s"
 
 #
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, fuzzy, c-format
 msgid "invalid line width: %s"
 msgstr "μη έγκυ�ος α�ιθμός πεδίου: `%s'"
 
 #
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, fuzzy, c-format
 msgid "invalid tab size: %s"
 msgstr "μη έγκυ�ο είδος αλφα�ιθμητικο� `%s'"
 
 #
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, fuzzy, c-format
 msgid "invalid time style format %s"
 msgstr "μη έγκυ�ο ό�ισμα %s για %s"
 
 #
-#: src/ls.c:2057
+#: src/ls.c:2067
 #, fuzzy
 msgid "Valid arguments are:\n"
 msgstr "Έγκυ�α ο�ίσματα είναι:"
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr ""
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr ""
 
 #
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, fuzzy, c-format
 msgid "unrecognized prefix: %s"
 msgstr "απα�άδεκτη επιλογή `-%c'"
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr ""
 "τιμή που δε μπο�εί να αναγνω�ιστεί στη μεταβλητή πε�ιβάλλοντος LS_COLORS"
 
 #
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, fuzzy, c-format
 msgid "cannot open directory %s"
 msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 
 #
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, fuzzy, c-format
 msgid "cannot determine device and inode of %s"
 msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 
 #
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, fuzzy, c-format
 msgid "%s: not listing already-listed directory"
 msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 
 #
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, fuzzy, c-format
 msgid "reading directory %s"
 msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 
 #
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, fuzzy, c-format
 msgid "closing directory %s"
 msgstr "αδ�νατη η αλλαγή στο κατάλογο %s"
 
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, fuzzy, c-format
 msgid "cannot compare file names %s and %s"
 msgstr "δεν είναι δυνατό να δημιου�γηθεί το %s `%s' στο `%s'"
 
-#: src/ls.c:4721
+#: src/ls.c:4781
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
 "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n"
 msgstr ""
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
 "  -A, --almost-all           do not list implied . and ..\n"
@@ -5487,33 +5580,32 @@ msgid ""
 "characters\n"
 msgstr ""
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
 "  -F, --classify             append indicator (one of */=>@|) to entries\n"
@@ -5523,40 +5615,41 @@ msgid ""
 "      --full-time            like -l --time-style=full-iso\n"
 msgstr ""
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr ""
 
-#: src/ls.c:4763
+#: src/ls.c:4823
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 
-#: src/ls.c:4769
+#: src/ls.c:4829
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
 
-#: src/ls.c:4775
+#: src/ls.c:4835
 msgid ""
 "  -H, --dereference-command-line\n"
 "                             follow symbolic links listed on the command "
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
 msgstr ""
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
 "names:\n"
@@ -5565,10 +5658,10 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -5578,7 +5671,7 @@ msgid ""
 "entries\n"
 msgstr ""
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -5589,12 +5682,12 @@ msgid ""
 "                             append / indicator to directories\n"
 msgstr ""
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 #, fuzzy
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -5643,7 +5736,7 @@ msgstr ""
 "  -R, --recursive            εμφάνιση υποκαταλόγων αναδ�ομικά\n"
 "  -s, --size                 εμφάνιση μεγέθους κάθε α�χείου, σε μπλοκ\n"
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
 "  -R, --recursive            list subdirectories recursively\n"
@@ -5651,56 +5744,59 @@ msgid ""
 "blocks\n"
 msgstr ""
 
-#: src/ls.c:4825
+#: src/ls.c:4886
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 
-#: src/ls.c:4835
+#: src/ls.c:4896
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
 msgstr ""
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 msgid ""
 "  -t                         sort by modification time, newest first\n"
 "  -T, --tabsize=COLS         assume tab stops at each COLS instead of 8\n"
 msgstr ""
 
-#: src/ls.c:4848
+#: src/ls.c:4912
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
 msgstr ""
 
-#: src/ls.c:4855
+#: src/ls.c:4919
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -5709,7 +5805,7 @@ msgid ""
 "variable can change the settings.  Use the dircolors command to set it.\n"
 msgstr ""
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -5799,19 +5895,16 @@ msgstr ""
 #: src/md5sum.c:195
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, c-format
 msgid ""
 "\n"
@@ -5822,43 +5915,43 @@ msgid ""
 msgstr ""
 
 #
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, fuzzy, c-format
 msgid "%s: too many checksum lines"
 msgstr ""
 "%s: δε β�έθηκαν κανονικά μο�φοποιημένες γ�αμμές αθ�οισμάτων ελέγχου MD5"
 
 #
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, fuzzy, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr "%s: %lu: εσφαλμένα μο�φοποιημένη γ�αμμή αθ�οίσματος ελέγχου MD5"
 
 #
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr "%s: Α�ΕΠΙΤΥΧΕΣ άνοιγμα ή ανάγνωση\n"
 
 #
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr "Α�ΕΠΙΤΥΧΕΣ"
 
 #
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr "Ε�ΤΑΞΕΙ"
 
 #
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, fuzzy, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr ""
 "%s: δε β�έθηκαν κανονικά μο�φοποιημένες γ�αμμές αθ�οισμάτων ελέγχου MD5"
 
 #
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, fuzzy, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
@@ -5866,7 +5959,7 @@ msgstr[0] "%s: %lu: εσφαλμένα μοÏ�φοποιημένη γÏ�αμμή Î
 msgstr[1] "%s: %lu: εσφαλμένα μο�φοποιημένη γ�αμμή αθ�οίσματος ελέγχου MD5"
 
 #
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, fuzzy, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
@@ -5876,27 +5969,27 @@ msgstr[1] ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: %d από %d αναφε�όμενα %s δεν ήταν δυνατό να αναγνωστο�ν"
 
 #
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, fuzzy, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
 msgstr[0] "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: %d από %d υπολόγισαν σε %s ΔΕ� ταί�ιαξαν"
 msgstr[1] "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: %d από %d υπολόγισαν σε %s ΔΕ� ταί�ιαξαν"
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
 msgstr ""
 
 #
-#: src/md5sum.c:766
+#: src/md5sum.c:770
 #, fuzzy, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr ""
 "η επιλογή --status έχει έννοια μόνο στην επιβεβαίωση αθ�οισμάτων ελέγχου"
 
 #
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
@@ -5905,50 +5998,48 @@ msgstr ""
 "αθ�οίσματα ελέγχου"
 
 #
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr ""
 "η επιλογή --status έχει έννοια μόνο στην επιβεβαίωση αθ�οισμάτων ελέγχου"
 
 #
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr "η επιλογή --warn έχει έννοια μόνο στην επιβεβαίωση αθ�οισμάτων ελέγχου"
 
 #
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, fuzzy, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr ""
 "η επιλογή --status έχει έννοια μόνο στην επιβεβαίωση αθ�οισμάτων ελέγχου"
 
 #
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, fuzzy, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr ""
 "η επιλογή --status έχει έννοια μόνο στην επιβεβαίωση αθ�οισμάτων ελέγχου"
 
 #
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr "Χ�ήση: %s [ΕΠΙΛΟΓΕΣ]... [ΑΡΧΕΙΟ]...\n"
 
-#: src/mkdir.c:57
+#: src/mkdir.c:59
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
 msgstr ""
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
 #, fuzzy
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 "Δημιου�γία ΚΑΤΑΛΟΓΟΥ(Ω�), αν δεν υπά�χουν ήδη.\n"
 "\n"
@@ -5961,23 +6052,48 @@ msgstr ""
 "      --help        εμφάνιση αυτής της βοήθειας και έξοδος\n"
 "      --version     εμφάνιση πλη�οφο�ιών έκδοσης και έξοδος\n"
 
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/mkdir.c:127 src/mkdir.c:172
+#, fuzzy, c-format
+msgid "failed to set default creation context for %s"
+msgstr "διατή�ηση ω�ών στο %s"
+
+#: src/mkdir.c:191
+#, fuzzy, c-format
+msgid "failed to restore context for %s"
+msgstr "διατή�ηση ω�ών στο %s"
+
 #
-#: src/mkdir.c:168
+#: src/mkdir.c:231
 #, fuzzy, c-format
 msgid "created directory %s"
 msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr ""
+
 #
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr "Χ�ήση: %s [ΕΠΙΛΟΓΕΣ]... [ΑΡΧΕΙΟ]...\n"
 
-#: src/mkfifo.c:52
+#: src/mkfifo.c:54
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
 msgstr ""
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 #, fuzzy
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
@@ -5989,37 +6105,41 @@ msgstr ""
 "      --help        εμφάνιση αυτής της βοήθειας και έξοδος\n"
 "      --version     εμφάνιση πλη�οφο�ιών έκδοσης και έξοδος\n"
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
 
 #
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, fuzzy, c-format
 msgid "invalid mode"
 msgstr "μη έγκυ�ος α�ιθμός"
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr ""
 
 #
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
+#, fuzzy, c-format
+msgid "cannot set permissions of %s"
+msgstr "αδυναμία αλλαγής ιδιοκτησίας στο %s"
+
+#
+#: src/mknod.c:54
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr "Χ�ήση: %s [ΕΠΙΛΟΓΗ]... ΣΥ�ΟΛΟ1 [ΣΥ�ΟΛΟ2]\n"
 
-#: src/mknod.c:54
+#: src/mknod.c:56
 msgid "Create the special file NAME of the given TYPE.\n"
 msgstr ""
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr ""
-
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -6028,7 +6148,7 @@ msgid ""
 "otherwise, as decimal.  TYPE may be:\n"
 msgstr ""
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 #, fuzzy
 msgid ""
 "\n"
@@ -6050,7 +6170,7 @@ msgstr ""
 "  c, u   δημιου�γία ειδικο� α�χείου χα�ακτή�ων (χω�ίς ενταμίευση)\n"
 "  p      δημιου�γία α�χείου FIFO\n"
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 #, fuzzy
 msgid "Special files require major and minor device numbers."
 msgstr ""
@@ -6058,154 +6178,148 @@ msgstr ""
 "α�ιθμοί συσκευής π�έπει να ο�ίζονται"
 
 #
-#: src/mknod.c:160
+#: src/mknod.c:185
 #, fuzzy
 msgid "Fifos do not have major and minor device numbers."
 msgstr "μη έγκυ�ος α�χικός α�ιθμός γ�αμμής: `%s'"
 
 #
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, fuzzy, c-format
 msgid "block special files not supported"
 msgstr "ειδικό α�χείο μπλοκ"
 
 #
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, fuzzy, c-format
 msgid "character special files not supported"
 msgstr "ειδικό α�χείο χα�ακτή�ων"
 
 #
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, fuzzy, c-format
 msgid "invalid major device number %s"
 msgstr "μη έγκυ�ος α�χικός α�ιθμός γ�αμμής: `%s'"
 
 #
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, fuzzy, c-format
 msgid "invalid minor device number %s"
 msgstr "μη έγκυ�ος α�χικός α�ιθμός γ�αμμής: `%s'"
 
 #
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, fuzzy, c-format
 msgid "invalid device %s %s"
 msgstr "μη έγκυ�ο ό�ισμα %s για %s"
 
 #
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, fuzzy, c-format
 msgid "invalid device type %s"
 msgstr "μη έγκυ�ο ό�ισμα %s για %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr ""
 
 #
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr "Χ�ήση: %s [ΕΠΙΛΟΓΕΣ]... [ΑΡΧΕΙΟ]...\n"
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
 "TEMPLATE must contain at least 3 consecutive 'X's in last component.\n"
 "If TEMPLATE is not specified, use tmp.XXXXXXXXXX, and --tmpdir is implied.\n"
 msgstr ""
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
 "  -q, --quiet         suppress diagnostics about file/dir-creation failure\n"
 msgstr ""
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
 msgstr ""
 
-#: src/mktemp.c:223
-#, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr ""
-
 #
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, fuzzy, c-format
 msgid "too many templates"
 msgstr "πά�α πολλά ο�ίσματα"
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr ""
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr ""
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr ""
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr ""
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr ""
 
 #
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, fuzzy, c-format
 msgid "failed to create directory via template %s"
 msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, fuzzy, c-format
 msgid "failed to create file via template %s"
 msgstr "διατή�ηση ω�ών στο %s"
 
-#: src/mv.c:292
+#: src/mv.c:294
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 
-#: src/mv.c:298
+#: src/mv.c:300
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
 "file\n"
@@ -6218,7 +6332,7 @@ msgid ""
 "effect.\n"
 msgstr ""
 
-#: src/mv.c:307
+#: src/mv.c:309
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
@@ -6226,7 +6340,7 @@ msgid ""
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
 msgstr ""
 
-#: src/mv.c:312
+#: src/mv.c:314
 #, fuzzy
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
@@ -6236,6 +6350,8 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
 "Μετονομασία της ΠΗΓΗΣ σε ΠΡΟΟΡΙΣΜΟ ή μετακίνηση ΠΗΓΗΣ(Ω�) στο ΚΑΤΑΛΟΓΟ.\n"
 "\n"
@@ -6543,100 +6659,95 @@ msgid "%s: invalid number to ignore"
 msgstr "%s: μη έγκυ�ος α�ιθμός γ�αμμών"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
 msgstr ""
 
-#: src/numfmt.c:676
+#: src/numfmt.c:659
 #, fuzzy, c-format
-msgid "value too large to be converted: '%s'"
+msgid "value too large to be converted: %s"
 msgstr "%s: η τιμή δεν έχει πλή�ως μετατ�απεί."
 
 #
-#: src/numfmt.c:680
+#: src/numfmt.c:663
 #, fuzzy, c-format
-msgid "invalid number: '%s'"
+msgid "invalid number: %s"
 msgstr "μη έγκυ�ος α�ιθμός %s"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
+msgid "rejecting suffix in input: %s (consider using --from)"
 msgstr ""
 
 #
-#: src/numfmt.c:688
+#: src/numfmt.c:671
 #, fuzzy, c-format
-msgid "invalid suffix in input: '%s'"
+msgid "invalid suffix in input: %s"
 msgstr "μη έγκυ�η α�ξηση στον α�ιθμό εντολής: `%s'"
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
 msgstr ""
 
 #
-#: src/numfmt.c:723
+#: src/numfmt.c:722 src/numfmt.c:768
 #, fuzzy, c-format
 msgid "failed to prepare value '%Lf' for printing"
 msgstr "το α�χείο μηδενίστηκε"
 
 #
-#: src/numfmt.c:787
+#: src/numfmt.c:791
 #, fuzzy, c-format
-msgid "invalid unit size: '%s'"
+msgid "invalid unit size: %s"
 msgstr "μη έγκυ�ο είδος αλφα�ιθμητικο� `%s'"
 
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
-#, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr ""
-
 #
-#: src/numfmt.c:813
+#: src/numfmt.c:814
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
 msgstr "Χ�ήση: %s [ΕΠΙΛΟΓΕΣ]... [ΑΡΧΕΙΟ]...\n"
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
 msgstr ""
 
-#: src/numfmt.c:820
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
 msgstr ""
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
 msgstr ""
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
 "                         see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr ""
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
@@ -6644,19 +6755,19 @@ msgid ""
 "locale)\n"
 msgstr ""
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
 msgstr ""
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
 msgstr ""
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -6666,40 +6777,40 @@ msgid ""
 "                         is found\n"
 msgstr ""
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
 "nearest\n"
 msgstr ""
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
 msgstr ""
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr ""
 
-#: src/numfmt.c:877
+#: src/numfmt.c:878
 msgid ""
 "\n"
 "UNIT options:\n"
 msgstr ""
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr ""
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -6708,7 +6819,7 @@ msgid ""
 "               1Mi = 1048576,\n"
 msgstr ""
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
@@ -6716,7 +6827,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
@@ -6724,7 +6835,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
@@ -6732,18 +6843,18 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:905
+#: src/numfmt.c:906
 #, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -6755,7 +6866,7 @@ msgid ""
 "errors are not diagnosed and the exit status is 0.\n"
 msgstr ""
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -6777,120 +6888,120 @@ msgid ""
 msgstr ""
 
 #
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, fuzzy, c-format
 msgid "format %s has no %% directive"
 msgstr "το `%s' υπά�χει ήδη άλλα δεν είναι κατάλογος"
 
 #
-#: src/numfmt.c:990
+#: src/numfmt.c:1003
 #, fuzzy, c-format
 msgid "invalid format %s (width overflow)"
 msgstr "μη έγκυ�ο ό�ισμα %s για %s"
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr ""
+
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr ""
 
-#: src/numfmt.c:1010
+#: src/numfmt.c:1030
 #, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
 msgstr ""
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr ""
 
 #
-#: src/numfmt.c:1070
+#: src/numfmt.c:1081
 #, fuzzy, c-format
-msgid "invalid suffix in input '%s': '%s'"
+msgid "invalid suffix in input %s: %s"
 msgstr "μη έγκυ�η α�ξηση στον α�ιθμό εντολής: `%s'"
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
 msgstr ""
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
 msgstr ""
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
+msgid "large input value %s: possible precision loss"
 msgstr ""
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
 
 #
-#: src/numfmt.c:1388
+#: src/numfmt.c:1403
 #, fuzzy, c-format
-msgid "invalid padding value '%s'"
+msgid "invalid padding value %s"
 msgstr "μη έγκυ�ο είδος αλφα�ιθμητικο� `%s'"
 
 #
-#: src/numfmt.c:1401
+#: src/numfmt.c:1417
 #, fuzzy, c-format
-msgid "invalid field value '%s'"
+msgid "invalid field value %s"
 msgstr "μη έγκυ�ος α�ιθμός πεδίου: `%s'"
 
 #
-#: src/numfmt.c:1430
+#: src/numfmt.c:1447
 #, fuzzy, c-format
-msgid "invalid header value '%s'"
+msgid "invalid header value %s"
 msgstr "μη έγκυ�ος α�ιθμός πεδίου: `%s'"
 
-#: src/numfmt.c:1456
+#: src/numfmt.c:1473
 #, c-format
 msgid "--grouping cannot be combined with --format"
 msgstr ""
 
-#: src/numfmt.c:1458
-#, c-format
-msgid "--padding cannot be combined with --format"
-msgstr ""
-
-#: src/numfmt.c:1463
+#: src/numfmt.c:1478
 #, fuzzy, c-format
 msgid "no conversion option specified"
 msgstr "\\%c: Μη έγκυ�η διαφυγή."
 
-#: src/numfmt.c:1471
+#: src/numfmt.c:1486
 #, c-format
 msgid "grouping cannot be combined with --to"
 msgstr ""
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
 msgstr ""
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
 msgstr ""
 
 #
-#: src/numfmt.c:1511
+#: src/numfmt.c:1526
 #, fuzzy, c-format
 msgid "error reading input"
 msgstr "σφάλμα ανάγνωσης %s"
 
 #
-#: src/numfmt.c:1520
+#: src/numfmt.c:1535
 #, fuzzy, c-format
 msgid "failed to convert some of the input numbers"
-msgstr "και τα δ�ο α�χεία δε μπο�εί να είναι η κανονική είσοδος"
+msgstr "αδυναμία αλλαγής ιδιοκτησίας στο %s"
 
 #
-#: src/od.c:294
+#: src/od.c:320
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -6902,7 +7013,7 @@ msgstr ""
 "   ή:  %s --traditional [ΑΡΧΕΙΟ] [[+]ΘΕΣΗ [[+]ΧΑΡΑΚΤΗΡΙΣΤΙΚΟ]]\n"
 
 #
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -6912,7 +7023,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/od.c:307
+#: src/od.c:333
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
 "if the last operand begins with + or (if there are 2 operands) a digit.\n"
@@ -6922,38 +7033,40 @@ msgid ""
 "suffixes may be . for octal and b for multiply by 512.\n"
 msgstr ""
 
-#: src/od.c:318
+#: src/od.c:344
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
 
-#: src/od.c:323
+#: src/od.c:350
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
 
-#: src/od.c:336
+#: src/od.c:363
 msgid ""
 "\n"
 "\n"
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 
-#: src/od.c:345
+#: src/od.c:372
 msgid ""
 "  -f   same as -t fF, select floats\n"
 "  -i   same as -t dI, select decimal ints\n"
@@ -6963,17 +7076,17 @@ msgid ""
 "  -x   same as -t x2, select hexadecimal 2-byte units\n"
 msgstr ""
 
-#: src/od.c:353
+#: src/od.c:380
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 
 #
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -6982,7 +7095,7 @@ msgid ""
 "  x[SIZE]    hexadecimal, SIZE bytes per integer\n"
 msgstr ""
 
-#: src/od.c:367
+#: src/od.c:394
 msgid ""
 "\n"
 "SIZE is a number.  For TYPE in [doux], SIZE may also be C for\n"
@@ -6991,14 +7104,14 @@ msgid ""
 "for sizeof(double) or L for sizeof(long double).\n"
 msgstr ""
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
 "each output line.\n"
 msgstr ""
 
-#: src/od.c:379
+#: src/od.c:406
 msgid ""
 "\n"
 "\n"
@@ -7012,13 +7125,13 @@ msgid ""
 msgstr ""
 
 #
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, fuzzy, c-format
 msgid "invalid type string %s"
 msgstr "μη έγκυ�ο είδος αλφα�ιθμητικο� `%s'"
 
 #
-#: src/od.c:649
+#: src/od.c:690
 #, fuzzy, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7028,7 +7141,7 @@ msgstr ""
 "αυτό το σ�στημα δεν πα�έχει τον εσωτε�ικό τ�πο δεδομένων %lu-byte"
 
 #
-#: src/od.c:770
+#: src/od.c:811
 #, fuzzy, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7039,41 +7152,41 @@ msgstr ""
 "υποδιαστολής %lu-byte"
 
 #
-#: src/od.c:828
+#: src/od.c:869
 #, fuzzy, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr "μη έγκυ�ος χα�ακτή�ας `%c' στο τ�πο αλφα�ιθμητικο� `%s'"
 
 #
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr "αδυναμία π�οσπέ�ασης μετά το τέλος της συνδυασμένης εισόδου"
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr ""
 
 #
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr "κανένα είδος δε μπο�εί να δηλωθεί όταν τυπώνονται αλφα�ιθμητικά"
 
 #
-#: src/od.c:1810
+#: src/od.c:1863
 #, fuzzy
 msgid "compatibility mode supports at most one file"
 msgstr "η κατάσταση συμβατότητας υποστη�ίζει το πολ� τ�ία ο�ίσματα"
 
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr ""
 
 #
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr ""
@@ -7251,12 +7364,12 @@ msgid "Where"
 msgstr ""
 
 #
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr "Χ�ήση: %s [ΕΠΙΛΟΓΕΣ]... [ΑΡΧΕΙΟ]...\n"
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -7266,7 +7379,7 @@ msgid ""
 "  -s              do short format output, this is the default\n"
 msgstr ""
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -7275,7 +7388,7 @@ msgid ""
 "                  in short format\n"
 msgstr ""
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, c-format
 msgid ""
 "\n"
@@ -7284,7 +7397,7 @@ msgid ""
 msgstr ""
 
 #
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, fuzzy, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr "δε μπο�ο�ν να δηλώνονται α�χεία όταν γίνεται χ�ήση του --string"
@@ -7467,12 +7580,13 @@ msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
 
-#: src/pr.c:2827
+#: src/pr.c:2828
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
 "                    separate columns by STRING,\n"
@@ -7482,7 +7596,7 @@ msgid ""
 "  -t, --omit-header  omit page headers and trailers\n"
 msgstr ""
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 msgid ""
 "  -T, --omit-pagination\n"
 "                    omit page headers and trailers, eliminate any "
@@ -7497,7 +7611,7 @@ msgid ""
 msgstr ""
 
 #
-#: src/pr.c:2844
+#: src/pr.c:2845
 #, fuzzy
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
@@ -7516,7 +7630,7 @@ msgstr ""
 "      --version   εμφάνιση πλη�οφο�ιών έκδοσης και έξοδος\n"
 
 #
-#: src/pr.c:2852
+#: src/pr.c:2853
 #, fuzzy
 msgid ""
 "\n"
@@ -7553,7 +7667,7 @@ msgstr ""
 "  --version   Εκτυπώνει πλη�οφο�ίες έκδοσης και τε�ματίζει\n"
 
 #: src/printenv.c:69
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/printf.c:79
@@ -7656,13 +7770,13 @@ msgid "F. Pinard"
 msgstr ""
 
 #
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, fuzzy, c-format
 msgid "%s (for regexp %s)"
 msgstr "%s (για κανονική έκφ�αση `%s')"
 
 #
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
@@ -7671,20 +7785,20 @@ msgstr ""
 "Χ�ήση: %s [ΕΠΙΛΟΓΗ]... [ΕΙΣΟΔΟΣ]...   (χω�ίς -G)\n"
 "   ή:  %s -G [ΕΠΙΛΟΓΗ]... [ΕΙΣΟΔΟΣ [ΕΞΟΔΟΣ]]\n"
 
-#: src/ptx.c:1821
+#: src/ptx.c:1824
 msgid ""
 "Output a permuted index, including context, of the words in the input "
 "files.\n"
 msgstr ""
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
 "  -G, --traditional              behave more like System V 'ptx'\n"
 "  -F, --flag-truncation=STRING   use STRING for flagging line truncations\n"
 msgstr ""
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
 "  -O, --format=roff              generate output as roff directives\n"
@@ -7694,7 +7808,7 @@ msgid ""
 msgstr ""
 
 #
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -7705,7 +7819,7 @@ msgid ""
 msgstr ""
 
 #
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -7713,14 +7827,31 @@ msgid ""
 "excluded\n"
 msgstr ""
 
-#: src/ptx.c:1854
+#
+#: src/ptx.c:1857
+#, fuzzy
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
+"Μετατ�οπή διαστημάτων σε κάθε ΑΡΧΕΙΟ σε στηλοθέτες, γ�άφοντας στην κανονική "
+"έξοδο.\n"
+"Χω�ίς ΑΡΧΕΙΟ, ή όταν το α�χείο είναι το -, ανάγνωση από την κανονική "
+"είσοδο.\n"
+"\n"
+"  -a, --all           μετατ�οπή όλων των λευκών χα�ακτή�ων, αντί μόνο των "
+"α�χικών\n"
+"  -t, --tabs=ΑΡΙΘΜΟΣ  οι στηλοθέτες να έχουν απόσταση ΑΡΙΘΜΟΣ αντί 8\n"
+"  -t, --tabs=ΛΙΣΤΑ    χ�ήση λίστας χω�ισμένης με κόμμα για τη δήλωση της "
+"θέσης των στηλοθετών\n"
+"      --help          εμφάνιση αυτής της βοήθειας και έξοδος\n"
+"      --version       εμφάνιση πλη�οφο�ιών έκδοσης και έξοδος\n"
+"\n"
+"Αντί για -t ΑΡΙΘΜΟΣ ή -t ΛΙΣΤΑ, -ΑΡΙΘΜΟΣ ή -ΛΙΣΤΑ μπο�ο�ν να "
+"χ�ησιμοποιηθο�ν.\n"
 
 #
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, fuzzy, c-format
 msgid "invalid gap width: %s"
 msgstr "μη έγκυ�ος α�ιθμός πεδίου: `%s'"
@@ -7737,23 +7868,29 @@ msgid ""
 "  -P, --physical  avoid all symlinks\n"
 msgstr ""
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+
+#: src/pwd.c:169
 #, fuzzy, c-format
 msgid "failed to chdir to %s"
 msgstr "αποτυχία αλλαγής της ομάδας από %s σε %s\n"
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, fuzzy, c-format
 msgid "failed to stat %s"
 msgstr "διατή�ηση ω�ών στο %s"
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr ""
 
 #
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, fuzzy, c-format
 msgid "ignoring non-option arguments"
 msgstr "πά�α πολλά ο�ίσματα που δεν έχουν επιλογές"
@@ -7764,8 +7901,8 @@ msgid "Dmitry V. Levin"
 msgstr ""
 
 #
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Χ�ήση: %s [ΕΠΙΛΟΓΕΣ]... [ΑΡΧΕΙΟ]...\n"
@@ -7799,8 +7936,7 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 
 #
@@ -7826,7 +7962,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 
@@ -7846,44 +7982,45 @@ msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 msgid "%s: descend into directory %s? "
 msgstr "αδ�νατη η αλλαγή στο κατάλογο %s"
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, fuzzy, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr "%s: διαγ�αφή π�οστατευμένου από εγγ�αφή καταλόγου `%s'; "
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, fuzzy, c-format
 msgid "%s: remove %s %s? "
 msgstr "%s: διαγ�αφή του `%s'; "
 
 #
-#: src/remove.c:374
+#: src/remove.c:375
 #, fuzzy, c-format
 msgid "removed directory: %s\n"
 msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 
 #
-#: src/remove.c:444
+#: src/remove.c:447
 #, fuzzy, c-format
-msgid "cannot remove directory: %s"
+msgid "refusing to remove %s or %s directory: skipping %s"
 msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr ""
 
 #
-#: src/remove.c:520
+#: src/remove.c:525
 #, fuzzy, c-format
 msgid "traversal failed: %s"
 msgstr "αποτυχία ανάγνωσης"
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -7908,12 +8045,12 @@ msgstr ""
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 
 #: src/rm.c:149
@@ -7960,14 +8097,18 @@ msgid ""
 msgstr ""
 
 #: src/rm.c:342
-#, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] "%s: διαγ�αφή του `%s'; "
+msgstr[1] "%s: διαγ�αφή του `%s'; "
 
-#: src/rm.c:343
+#: src/rm.c:345
 #, fuzzy, c-format
-msgid "%s: remove all arguments? "
-msgstr "%s: διαγ�αφή του `%s'; "
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] "%s: διαγ�αφή του `%s'; "
+msgstr[1] "%s: διαγ�αφή του `%s'; "
 
 #
 #: src/rmdir.c:134 src/rmdir.c:233
@@ -8025,7 +8166,7 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
 
@@ -8076,43 +8217,49 @@ msgstr ""
 msgid "no command specified"
 msgstr "μόνο ένα ό�ισμα μπο�εί να δηλωθεί"
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr ""
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, c-format
 msgid "failed to compute a new context"
 msgstr ""
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, fuzzy, c-format
 msgid "failed to set new user %s"
 msgstr "διατή�ηση ω�ών στο %s"
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, fuzzy, c-format
 msgid "failed to set new type %s"
 msgstr "διατή�ηση ω�ών στο %s"
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, fuzzy, c-format
 msgid "failed to set new range %s"
 msgstr "διατή�ηση ω�ών στο %s"
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, fuzzy, c-format
 msgid "failed to set new role %s"
 msgstr "διατή�ηση ω�ών στο %s"
 
 #
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, fuzzy, c-format
 msgid "unable to set security context %s"
 msgstr "αδυναμία αλλαγής ιδιοκτησίας στο %s"
 
 #
+#: src/selinux.c:127 src/selinux.c:300
+#, fuzzy, c-format
+msgid "error canonicalizing %s"
+msgstr "σφάλμα ανάγνωσης %s"
+
+#
 #: src/seq.c:68
 #, fuzzy, c-format
 msgid ""
@@ -8140,6 +8287,8 @@ msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
@@ -8165,7 +8314,7 @@ msgstr ""
 "τις διαμο�φώσεις της printf για κινητής υποδιαστολής α�ιθμό %%e, %%f, or %"
 "%g.\n"
 
-#: src/seq.c:94
+#: src/seq.c:96
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
 "it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n"
@@ -8173,87 +8322,34 @@ msgid ""
 msgstr ""
 
 #
-#: src/seq.c:140
+#: src/seq.c:142
 #, fuzzy, c-format
 msgid "invalid floating point argument: %s"
 msgstr "μη έγκυ�ος α�χικός α�ιθμός γ�αμμής: `%s'"
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, fuzzy, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr "%s: άγνωστο είδος α�χείου"
 
 #
-#: src/seq.c:555
+#: src/seq.c:557
 #, fuzzy, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr "κανένα είδος δε μπο�εί να δηλωθεί όταν τυπώνονται αλφα�ιθμητικά"
 
-#
-#: src/setuidgid.c:49
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr "Χ�ήση: %s [ΕΠΙΛΟΓΗ]... [ΕΙΣΟΔΟΣ [ΕΞΟΔΟΣ]]\n"
-
-#: src/setuidgid.c:55
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr ""
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr ""
-
-#: src/setuidgid.c:190
-#, fuzzy, c-format
-msgid "failed to set supplemental group(s)"
-msgstr "Δεν μπο�εί να πα�θεί ο συμπλη�ωματικός κατάλογος ομάδων."
-
-#
-#: src/setuidgid.c:200
-#, fuzzy, c-format
-msgid "cannot set group-ID to %lu"
-msgstr "δεν είναι δυνατό να πα�αληφθεί χ�ήστης και ομάδα"
-
-#
-#: src/setuidgid.c:204
-#, fuzzy, c-format
-msgid "cannot set user-ID to %lu"
-msgstr "δεν είναι δυνατό να πα�αληφθεί χ�ήστης και ομάδα"
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr ""
 
-#: src/shred.c:148
+#: src/shred.c:170
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
 "for even very expensive hardware probing to recover the data.\n"
 msgstr ""
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -8262,28 +8358,32 @@ msgid ""
 "  -s, --size=N   shred this many bytes (suffixes like K, M, G accepted)\n"
 msgstr ""
 
-#: src/shred.c:161
+#: src/shred.c:183
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
 "  -z, --zero     add a final overwrite with zeros to hide shredding\n"
 msgstr ""
 
-#: src/shred.c:170
+#: src/shred.c:192
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -8294,7 +8394,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -8306,7 +8406,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -8315,7 +8415,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -8327,153 +8427,153 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:215
+#: src/shred.c:241
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
 "of the file that cannot be removed, and that will allow a shredded file\n"
 "to be recovered later.\n"
 msgstr ""
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, c-format
 msgid "%s: fdatasync failed"
 msgstr ""
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr ""
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, fuzzy, c-format
 msgid "%s: cannot rewind"
 msgstr "Δεν είναι δυνατόν να εκτελεστεί το %s"
 
 # src/shred.c:1067
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr "%s: πέ�ασμα %lu/%lu (%s)..."
 
 #
-#: src/shred.c:452
+#: src/shred.c:529
 #, fuzzy, c-format
 msgid "%s: error writing at offset %s"
 msgstr "σφάλμα εγγ�αφής %s"
 
 #
-#: src/shred.c:470
+#: src/shred.c:549
 #, fuzzy, c-format
 msgid "%s: lseek failed"
 msgstr "σφάλμα κλεισίματος α�χείου"
 
 #
-#: src/shred.c:481
+#: src/shred.c:561
 #, fuzzy, c-format
 msgid "%s: file too large"
 msgstr "το α�χείο μηδενίστηκε"
 
 # src/shred.c:1154
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr "%s: πέ�ασμα %lu/%lu (%s)...%s"
 
 # src/shred.c:1149
-#: src/shred.c:520
+#: src/shred.c:601
 #, fuzzy, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr "%s: πέ�ασμα %lu/%lu (%s)...%s/%s"
 
 #
-#: src/shred.c:767
+#: src/shred.c:859
 #, fuzzy, c-format
 msgid "%s: fstat failed"
 msgstr "αποτυχία εγγ�αφής"
 
 #
-#: src/shred.c:778
+#: src/shred.c:870
 #, fuzzy, c-format
 msgid "%s: invalid file type"
 msgstr "%s: μη έγκυ�ος α�ιθμός γ�αμμών"
 
 # src/shred.c:1424
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr "%s: το α�χείο έχει α�νητικό μέγεθος"
 
 #
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, fuzzy, c-format
 msgid "%s: error truncating"
 msgstr "το α�χείο μηδενίστηκε"
 
 #
-#: src/shred.c:880
+#: src/shred.c:989
 #, fuzzy, c-format
 msgid "%s: fcntl failed"
 msgstr "αποτυχία εγγ�αφής"
 
 # src/shred.c:1483
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr "%s: αδυναμία διάλυσης μόνο-π�οσθήκη πε�ιγ�αφέα α�χείου"
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr "%s: διαγ�άφεται"
 
 #
-#: src/shred.c:991
+#: src/shred.c:1102
 #, fuzzy, c-format
 msgid "%s: renamed to %s"
 msgstr "%s: σφάλμα ανάγνωσης"
 
 #
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, fuzzy, c-format
 msgid "%s: failed to remove"
 msgstr "το α�χείο μηδενίστηκε"
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr "%s: διεγ�άφει"
 
 #
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, fuzzy, c-format
 msgid "%s: failed to close"
 msgstr "το α�χείο μηδενίστηκε"
 
 #
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, fuzzy, c-format
 msgid "%s: failed to open for writing"
 msgstr "το α�χείο μηδενίστηκε"
 
 #
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, fuzzy, c-format
 msgid "%s: invalid number of passes"
 msgstr "%s: μη έγκυ�ος α�ιθμός δευτε�ολέπτων"
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, fuzzy, c-format
 msgid "multiple random sources specified"
 msgstr "\\%c: Μη έγκυ�η διαφυγή."
 
 #
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, fuzzy, c-format
 msgid "%s: invalid file size"
 msgstr "%s: μη έγκυ�ος α�ιθμός γ�αμμών"
 
 #
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -8483,11 +8583,11 @@ msgstr ""
 "Χ�ήση: %s [ΕΠΙΛΟΓΗ]... [ΕΙΣΟΔΟΣ]...   (χω�ίς -G)\n"
 "   ή:  %s -G [ΕΠΙΛΟΓΗ]... [ΕΙΣΟΔΟΣ [ΕΞΟΔΟΣ]]\n"
 
-#: src/shuf.c:54
+#: src/shuf.c:67
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr ""
 
-#: src/shuf.c:60
+#: src/shuf.c:73
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
 "  -i, --input-range=LO-HI   treat each number LO through HI as an input "
@@ -8495,37 +8595,48 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
 msgstr ""
 
-#: src/shuf.c:244
+#
+#: src/shuf.c:228
+#, fuzzy, c-format
+msgid "too many input lines"
+msgstr "πά�α πολλά ο�ίσματα"
+
+#: src/shuf.c:431
 #, fuzzy, c-format
 msgid "multiple -i options specified"
 msgstr "\\%c: Μη έγκυ�η διαφυγή."
 
 #
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, fuzzy, c-format
 msgid "invalid input range %s"
 msgstr "μη έγκυ�ος α�ιθμός"
 
 #
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, fuzzy, c-format
 msgid "invalid line count %s"
 msgstr "μη έγκυ�ος α�ιθμός πεδίου: `%s'"
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, fuzzy, c-format
 msgid "multiple output files specified"
 msgstr "\\%c: Μη έγκυ�η διαφυγή."
 
 #
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, fuzzy, c-format
 msgid "cannot combine -e and -i options"
 msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr ""
+
 #: src/sleep.c:44
 #, fuzzy, c-format
 msgid ""
@@ -8547,27 +8658,27 @@ msgstr ""
 "  --version   Εκτυπώνει πλη�οφο�ίες έκδοσης και τε�ματίζει\n"
 
 #
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, fuzzy, c-format
 msgid "invalid time interval %s"
 msgstr "μη έγκυ�ος α�ιθμός πεδίου: `%s'"
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr ""
 
-#: src/sort.c:399
+#: src/sort.c:427
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr ""
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
 msgstr ""
 
-#: src/sort.c:409
+#: src/sort.c:437
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
 "  -d, --dictionary-order      consider only blanks and alphanumeric "
@@ -8575,19 +8686,19 @@ msgid ""
 "  -f, --ignore-case           fold lower case to upper case characters\n"
 msgstr ""
 
-#: src/sort.c:415
+#: src/sort.c:443
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
 "  -i, --ignore-nonprinting    consider only printable characters\n"
 "  -M, --month-sort            compare (unknown) < 'JAN' < ... < 'DEC'\n"
 msgstr ""
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 
-#: src/sort.c:423
+#: src/sort.c:451
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
 "  -R, --random-sort           sort by random hash of keys\n"
@@ -8595,7 +8706,7 @@ msgid ""
 "  -r, --reverse               reverse the result of comparisons\n"
 msgstr ""
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -8605,19 +8716,19 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/sort.c:437
+#: src/sort.c:465
 msgid ""
 "Other options:\n"
 "\n"
 msgstr ""
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
 msgstr ""
 
-#: src/sort.c:445
+#: src/sort.c:473
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
 "  -C, --check=quiet, --check=silent  like -c, but do not report first bad "
@@ -8627,7 +8738,7 @@ msgid ""
 msgstr ""
 
 #
-#: src/sort.c:452
+#: src/sort.c:480
 #, fuzzy
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
@@ -8641,13 +8752,13 @@ msgstr ""
 "  --help       εμφάνιση αυτής της βοήθειας και έξοδος\n"
 "  --version    εμφάνιση πλη�οφο�ιών έκδοσης και έξοδος\n"
 
-#: src/sort.c:459
+#: src/sort.c:487
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
 "  -m, --merge               merge already sorted files; do not sort\n"
 msgstr ""
 
-#: src/sort.c:463
+#: src/sort.c:491
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "  -s, --stable              stabilize sort by disabling last-resort "
@@ -8655,7 +8766,7 @@ msgid ""
 "  -S, --buffer-size=SIZE    use SIZE for main memory buffer\n"
 msgstr ""
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -8671,12 +8782,7 @@ msgid ""
 msgstr ""
 
 #
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr ""
-
-#
-#: src/sort.c:483
+#: src/sort.c:511
 #, fuzzy
 msgid ""
 "\n"
@@ -8704,7 +8810,7 @@ msgstr ""
 "από την κανονική είσοδο.\n"
 
 #
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -8717,297 +8823,278 @@ msgid ""
 msgstr ""
 
 #
-#: src/sort.c:697
+#: src/sort.c:725
 #, fuzzy, c-format
 msgid "waiting for %s [-d]"
 msgstr "σφάλμα εγγ�αφής %s"
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr ""
 
 #
-#: src/sort.c:856
+#: src/sort.c:884
 #, fuzzy, c-format
 msgid "cannot create temporary file in %s"
 msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 
 #
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr "αποτυχία ανοίγματος"
 
 #
-#: src/sort.c:970
+#: src/sort.c:998
 #, fuzzy
 msgid "fflush failed"
 msgstr "ολοκλή�ωση α�χείου"
 
 #
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 #, fuzzy
 msgid "close failed"
 msgstr "σφάλμα κλεισίματος α�χείου"
 
 #
-#: src/sort.c:986
-#, fuzzy, c-format
-msgid "dup2 failed"
-msgstr "αποτυχία ανοίγματος"
-
-#
-#: src/sort.c:1103
-#, fuzzy, c-format
-msgid "couldn't execute %s"
-msgstr "αδ�νατη η αλλαγή δικαιωμάτων στο %s"
-
-#
-#: src/sort.c:1110
+#: src/sort.c:1140
 #, fuzzy
 msgid "couldn't create temporary file"
 msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 
 #
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, fuzzy, c-format
 msgid "couldn't create process for %s -d"
 msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 
 #
-#: src/sort.c:1161
-#, fuzzy, c-format
-msgid "couldn't execute %s -d"
-msgstr "αδ�νατη η αλλαγή δικαιωμάτων στο %s"
-
-#
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, fuzzy, c-format
 msgid "warning: cannot remove: %s"
 msgstr "αδ�νατη η αλλαγή δικαιωμάτων στο %s"
 
 #
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, fuzzy, c-format
 msgid "invalid --%s argument %s"
 msgstr "μη έγκυ�ο ό�ισμα %s για %s"
 
 #
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, fuzzy, c-format
 msgid "minimum --%s argument is %s"
 msgstr "μη έγκυ�ο ό�ισμα %s για %s"
 
 #
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, fuzzy, c-format
 msgid "--%s argument %s too large"
 msgstr "το %s είναι πολ� μεγάλο"
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr ""
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr ""
 
 #
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr ""
 
 #
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr "αποτυχία ανάγνωσης"
 
 #
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, c-format
 msgid "string transformation failed"
 msgstr "Η μετατ�οπή της συμβολοσει�άς απέτυχε"
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, c-format
 msgid "the untransformed string was %s"
 msgstr ""
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr ""
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr ""
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr ""
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr ""
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr ""
 
 #
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, fuzzy, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
-msgstr[0] "%s: η επιλογή `%s' είναι ασαφής\n"
-msgstr[1] "%s: η επιλογή `%s' είναι ασαφής\n"
+msgstr[0] "%s: η επιλογή `-W %s' είναι ασαφής\n"
+msgstr[1] "%s: η επιλογή `-W %s' είναι ασαφής\n"
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr ""
 
 #
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr "αποτυχία εγγ�αφής"
 
 #
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, fuzzy, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr "%s: %s:%d: όχι σε σει�ά: "
 
 #
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr "κανονικό σφάλμα"
 
 #
-#: src/sort.c:3698
+#: src/sort.c:3738
 #, fuzzy
 msgid "cannot read"
 msgstr "αδ�νατη η αλλαγή δικαιωμάτων στο %s"
 
 #
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, fuzzy, c-format
 msgid "%s: invalid field specification %s"
 msgstr "μη έγκυ�η δήλωση πεδίου `%s'"
 
-#
-#: src/sort.c:3987
-#, fuzzy, c-format
+#: src/sort.c:4028
+#, c-format
 msgid "options '-%s' are incompatible"
-msgstr "%s: η επιλογή `%s' είναι ασαφής\n"
+msgstr ""
 
 #
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, fuzzy, c-format
 msgid "%s: invalid count at start of %s"
 msgstr "μη έγκυ�ο ό�ισμα %s για `%s'"
 
 #
-#: src/sort.c:4295
+#: src/sort.c:4336
 #, fuzzy
 msgid "invalid number after '-'"
 msgstr "μη έγκυ�ος α�ιθμός από bytes"
 
 #
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 #, fuzzy
 msgid "invalid number after '.'"
 msgstr "μη έγκυ�ος α�ιθμός από bytes"
 
 #
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr ""
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, fuzzy, c-format
 msgid "multiple compress programs specified"
 msgstr "\\%c: Μη έγκυ�η διαφυγή."
 
 #
-#: src/sort.c:4379
+#: src/sort.c:4420
 #, fuzzy
 msgid "invalid number at field start"
 msgstr "μη έγκυ�ος α�ιθμός από γ�αμμές"
 
 #
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 #, fuzzy
 msgid "field number is zero"
 msgstr "μη έγκυ�ος α�ιθμός πεδίου: `%s'"
 
 #
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr ""
 
 #
-#: src/sort.c:4407
+#: src/sort.c:4448
 #, fuzzy
 msgid "invalid number after ','"
 msgstr "μη έγκυ�ος α�ιθμός από bytes"
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr ""
 
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, fuzzy, c-format
 msgid "cannot read file names from %s"
 msgstr "δεν είναι δυνατό να δημιου�γηθεί το %s `%s' στο `%s'"
 
 #
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, fuzzy, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr "μη έγκυ�η ομάδα"
 
 #
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, fuzzy, c-format
 msgid "no input from %s"
 msgstr "δημιου�γία α�χείου `%s'\n"
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr ""
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr ""
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr ""
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr ""
 
 #
-#: src/split.c:204
+#: src/split.c:203
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr "Χ�ήση: %s [ΕΠΙΛΟΓΗ] [ΕΙΣΟΔΟΣ [ΠΡΟΘΕΜΑ]]\n"
 
-#: src/split.c:208
+#: src/split.c:207
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
 "size is 1000 lines, and default PREFIX is 'x'.  With no INPUT, or when "
@@ -9015,51 +9102,31 @@ msgid ""
 "is -, read standard input.\n"
 msgstr ""
 
-#
-#: src/split.c:216
-#, fuzzy, c-format
+#: src/split.c:215
+#, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
-"Έξοδος τμημάτων σταθε�ο� μεγέθους από την ΕΙΣΟΔΟ σε ΠΡΟΘΕΜΑaa, "
-"ΠΡΟΘΕΜΑab, ...; εξ ο�ισμο�\n"
-"ΠΡΟΘΕΜΑ είναι το `x'.  Χω�ίς ΕΙΣΟΔΟ, ή όταν η ΕΙΣΟΔΟΣ είναι το -, ανάγνωση "
-"από την κανονική είσοδο.\n"
-"\n"
-"  -b, --bytes=ΜΕΓΕΘΟΣ     τοποθέτηση ΜΕΓΕΘΟΣ bytes σε κάθε α�χείο εξόδου\n"
-"  -C, --line-bytes=ΜΕΓΕΘΟΣ  τοποθέτηση το πολ� ΜΕΓΕΘΟΣ bytes από γ�αμμές σε "
-"κάθε α�χείο εξόδου\n"
-"  -l, --lines=ΑΡΙΘΜΟΣ     τοποθέτηση ΑΡΙΘΜΟΣ γ�αμμών σε κάθε α�χείου εξόδου\n"
-"  -ΑΡΙΘΜΟΣ                ίδιο με -l ΑΡΙΘΜΟΣ\n"
-"      --verbose           εκτ�πωση διαγνωστικο� στο κανονικό σφάλμα μόλις "
-"π�ιν\n"
-"                            ανοιχτεί κάθε α�χείο εξόδου\n"
-"      --help              εμφάνιση αυτής της βοήθειας και έξοδος\n"
-"      --version           εμφάνιση πλη�οφο�ιών έκδοσης και έξοδος\n"
-"\n"
-"ΜΕΓΕΘΟΣ μπο�εί να έχει π�όθεμα πολλαπλασιαστή: b για 512, k για 1K, m για 1 "
-"Meg.\n"
 
-#: src/split.c:229
+#: src/split.c:228
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
 "                            output file is opened\n"
 msgstr ""
 
-#: src/split.c:236
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -9071,210 +9138,210 @@ msgid ""
 "r/K/N   likewise but only output Kth of N to stdout\n"
 msgstr ""
 
-#: src/split.c:354
+#: src/split.c:353
 #, c-format
 msgid "output file suffixes exhausted"
 msgstr ""
 
 #
-#: src/split.c:366
+#: src/split.c:365
 #, fuzzy, c-format
 msgid "creating file %s\n"
 msgstr "δημιου�γία α�χείου `%s'\n"
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr ""
 
-#: src/split.c:391
+#: src/split.c:390
 #, fuzzy, c-format
 msgid "failed to set FILE environment variable"
 msgstr "διατή�ηση ω�ών στο %s"
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr ""
 
 #
-#: src/split.c:395
+#: src/split.c:394
 #, fuzzy, c-format
 msgid "failed to create pipe"
 msgstr "αδ�νατη η αλλαγή δικαιωμάτων στο %s"
 
 #
-#: src/split.c:409
+#: src/split.c:408
 #, fuzzy, c-format
 msgid "closing prior pipe"
 msgstr "αδ�νατη η αλλαγή στο κατάλογο %s"
 
-#: src/split.c:411
+#: src/split.c:410
 #, fuzzy, c-format
 msgid "closing output pipe"
 msgstr "διαγ�αφή καταλόγου %s\n"
 
 #
-#: src/split.c:415
+#: src/split.c:414
 #, fuzzy, c-format
 msgid "moving input pipe"
 msgstr "δημιου�γία α�χείου `%s'\n"
 
 #
-#: src/split.c:417
+#: src/split.c:416
 #, fuzzy, c-format
 msgid "closing input pipe"
 msgstr "δημιου�γία α�χείου `%s'\n"
 
 #
-#: src/split.c:422
+#: src/split.c:421
 #, fuzzy, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr "αδυναμία αλλαγής ιδιοκτησίας στο %s"
 
 #
-#: src/split.c:428
+#: src/split.c:427
 #, fuzzy, c-format
 msgid "failed to close input pipe"
 msgstr "αδ�νατη η αλλαγή στο κατάλογο %s"
 
 #
-#: src/split.c:464
+#: src/split.c:463
 #, fuzzy, c-format
 msgid "waiting for child process"
 msgstr "σφάλμα εγγ�αφής %s"
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr ""
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr ""
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr ""
 
 #
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr "δεν είναι δυνατό να γίνει διαχω�ισμός σε πε�ισσότε�ους από ένα τ�όπο"
 
 #
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, fuzzy, c-format
 msgid "%s: invalid number of chunks"
 msgstr "%s: μη έγκυ�ος α�ιθμός δευτε�ολέπτων"
 
 #
-#: src/split.c:1069
+#: src/split.c:1119
 #, fuzzy, c-format
 msgid "%s: invalid chunk number"
 msgstr "%s: μη έγκυ�ος α�ιθμός"
 
 #
-#: src/split.c:1119
+#: src/split.c:1169
 #, fuzzy, c-format
 msgid "%s: invalid suffix length"
 msgstr "%s: μη έγκυ�ος α�ιθμός γ�αμμών"
 
 #
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr "%s: μη έγκυ�ος α�ιθμός από bytes"
 
 #
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr "%s: μη έγκυ�ος α�ιθμός γ�αμμών"
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, c-format
 msgid "line count option -%s%c... is too large"
 msgstr ""
 
 #
-#: src/split.c:1248
+#: src/split.c:1298
 #, fuzzy, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr "μη έγκυ�ος α�χικός α�ιθμός γ�αμμής: `%s'"
 
 #
-#: src/split.c:1276
+#: src/split.c:1326
 #, fuzzy, c-format
 msgid "%s: invalid IO block size"
 msgstr "%s: μη έγκυ�ος α�ιθμός γ�αμμών"
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr ""
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr ""
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, fuzzy, c-format
 msgid "%s: cannot determine file size"
 msgstr "Δεν μπο�εί να καθο�ιστεί το όνομα του συστήματος"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr ""
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, fuzzy, c-format
 msgid "failed to canonicalize %s"
 msgstr "διατή�ηση ω�ών στο %s"
 
 #
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, fuzzy, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr "%s: μη αναγνω�ίσιμη επιλογή `-%c'\n"
 
 #
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, fuzzy, c-format
 msgid "%s: invalid directive"
 msgstr "%s: μη έγκυ�η μο�φή"
 
 #
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, fuzzy, c-format
 msgid "warning: backslash at end of format"
 msgstr "μη έγκυ�η διαφυγή με πισωκάθετο στο τέλος του αλφα�ιθμητικο�"
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr ""
 
 #
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, fuzzy, c-format
 msgid "cannot read file system information for %s"
 msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 
 #
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, fuzzy, c-format
 msgid "cannot stat standard input"
 msgstr "κανονική είσοδος"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -9285,7 +9352,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -9293,31 +9360,31 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr ""
 
 #
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, fuzzy, c-format
 msgid "Context: %C\n"
 msgstr "μη έγκυ�ο είδος αλφα�ιθμητικο� `%s'"
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -9325,27 +9392,27 @@ msgid ""
 " Birth: %w\n"
 msgstr ""
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
 msgstr ""
 
-#: src/stat.c:1356
+#: src/stat.c:1418
 msgid ""
 "  -L, --dereference     follow links\n"
 "  -f, --file-system     display file system status instead of file status\n"
 msgstr ""
 
-#: src/stat.c:1360
+#: src/stat.c:1422
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 msgid ""
 "\n"
 "The valid format sequences for files (without --file-system):\n"
@@ -9357,7 +9424,7 @@ msgid ""
 "  %C   SELinux security context string\n"
 msgstr ""
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 msgid ""
 "  %d   device number in decimal\n"
 "  %D   device number in hex\n"
@@ -9367,7 +9434,7 @@ msgid ""
 "  %G   group name of owner\n"
 msgstr ""
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 msgid ""
 "  %h   number of hard links\n"
 "  %i   inode number\n"
@@ -9376,11 +9443,11 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 
-#: src/stat.c:1399
+#: src/stat.c:1461
 msgid ""
 "  %u   user ID of owner\n"
 "  %U   user name of owner\n"
@@ -9388,14 +9455,14 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 msgid ""
 "Valid format sequences for file systems:\n"
 "\n"
@@ -9406,7 +9473,7 @@ msgid ""
 "  %f   free blocks in file system\n"
 msgstr ""
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 msgid ""
 "  %i   file system ID in hex\n"
 "  %l   maximum length of filenames\n"
@@ -9468,22 +9535,27 @@ msgid ""
 "and are thus unaffected by 'stdbuf' settings.\n"
 msgstr ""
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, fuzzy, c-format
 msgid "failed to find %s"
 msgstr "διατή�ηση ω�ών στο %s"
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, fuzzy, c-format
 msgid "failed to update the environment with %s"
 msgstr "αποτυχία αλλαγής της ομάδας από %s σε %s\n"
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr ""
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, fuzzy, c-format
+msgid "you must specify a buffering mode option"
+msgstr "αποτυχία αλλαγής της ομάδας από %s σε %s\n"
+
+#: src/stty.c:516
 #, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -9491,11 +9563,11 @@ msgid ""
 "  or:  %s [-F DEVICE | --file=DEVICE] [-g|--save]\n"
 msgstr ""
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
 msgstr ""
 
-#: src/stty.c:525
+#: src/stty.c:528
 #, fuzzy
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
@@ -9513,14 +9585,14 @@ msgstr ""
 "Π�οε�αιτικό - π�ιν την ΕΚΛΟΓΗ σημαίνει ά�νηση.  Το * σημαίνει μια\n"
 "ΕΚΛΟΓΗ μη POSIX.  Το σ�στημα καθο�ίζει ποιές επιλογές είναι διαθέσιμες.\n"
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
 "settings.  The underlying system defines which settings are available.\n"
 msgstr ""
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -9529,7 +9601,7 @@ msgid ""
 "   eol CHAR      CHAR will end the line\n"
 msgstr ""
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -9537,7 +9609,7 @@ msgid ""
 "   kill CHAR     CHAR will erase the current line\n"
 msgstr ""
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -9545,7 +9617,7 @@ msgid ""
 "   start CHAR    CHAR will restart the output after stopping it\n"
 msgstr ""
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -9553,7 +9625,7 @@ msgid ""
 " * werase CHAR   CHAR will erase the last word typed\n"
 msgstr ""
 
-#: src/stty.c:562
+#: src/stty.c:565
 msgid ""
 "\n"
 "Special settings:\n"
@@ -9562,7 +9634,7 @@ msgid ""
 " * columns N     same as cols N\n"
 msgstr ""
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -9571,7 +9643,7 @@ msgid ""
 "   ospeed N      set the output speed to N\n"
 msgstr ""
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -9580,7 +9652,7 @@ msgid ""
 "   time N        with -icanon, set read timeout of N tenths of a second\n"
 msgstr ""
 
-#: src/stty.c:581
+#: src/stty.c:584
 msgid ""
 "\n"
 "Control settings:\n"
@@ -9591,7 +9663,7 @@ msgid ""
 "   csN           set character size to N bits, N in [5..8]\n"
 msgstr ""
 
-#: src/stty.c:590
+#: src/stty.c:593
 #, fuzzy
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
@@ -9600,6 +9672,7 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 "\n"
 "Επιλογές ελέγχου:\n"
@@ -9616,7 +9689,7 @@ msgstr ""
 "                 ισότημίας στην είσοδο\n"
 "  [-]parodd     Θέτει πε�ιτή ισοτημία (ακόμα και με `-')\n"
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -9626,7 +9699,7 @@ msgid ""
 "   [-]igncr      ignore carriage return\n"
 msgstr ""
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -9635,11 +9708,11 @@ msgid ""
 "   [-]istrip     clear high (8th) bit of input characters\n"
 msgstr ""
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr ""
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -9649,7 +9722,7 @@ msgid ""
 "   [-]tandem     same as [-]ixoff\n"
 msgstr ""
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -9659,11 +9732,11 @@ msgid ""
 " * nlN           newline delay style, N in [0..1]\n"
 msgstr ""
 
-#: src/stty.c:631
+#: src/stty.c:635
 #, fuzzy
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
@@ -9693,7 +9766,7 @@ msgstr ""
 "* vtN           Τ�πος καθυστέ�ησης της κάθετης πινακοποίησης, N μεταξ� "
 "[0..1]\n"
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -9703,7 +9776,7 @@ msgid ""
 " * vtN           vertical tab delay style, N in [0..1]\n"
 msgstr ""
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -9712,7 +9785,7 @@ msgid ""
 " * -crtkill      kill all line by obeying the echoctl and echok settings\n"
 msgstr ""
 
-#: src/stty.c:654
+#: src/stty.c:658
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
 "   [-]echo       echo input characters\n"
@@ -9721,7 +9794,7 @@ msgid ""
 "   [-]echok      echo a newline after a kill character\n"
 msgstr ""
 
-#: src/stty.c:661
+#: src/stty.c:665
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
 "   [-]echonl     echo newline even if not echoing other characters\n"
@@ -9730,7 +9803,7 @@ msgid ""
 "   [-]iexten     enable non-POSIX special characters\n"
 msgstr ""
 
-#: src/stty.c:668
+#: src/stty.c:672
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
 "   [-]noflsh     disable flushing after interrupt and quit special "
@@ -9740,7 +9813,7 @@ msgid ""
 " * [-]xcase      with icanon, escape with '\\' for uppercase characters\n"
 msgstr ""
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -9749,7 +9822,7 @@ msgid ""
 "   -cbreak       same as icanon\n"
 msgstr ""
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -9757,7 +9830,7 @@ msgid ""
 "   crt           same as echoe echoctl echoke\n"
 msgstr ""
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -9766,7 +9839,7 @@ msgid ""
 "   evenp         same as parenb -parodd cs7\n"
 msgstr ""
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -9776,7 +9849,7 @@ msgid ""
 "   -nl           same as icrnl -inlcr -igncr onlcr -ocrnl -onlret\n"
 msgstr ""
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -9785,7 +9858,7 @@ msgid ""
 "   -pass8        same as parenb istrip cs7\n"
 msgstr ""
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -9793,7 +9866,7 @@ msgid ""
 "   -raw          same as cooked\n"
 msgstr ""
 
-#: src/stty.c:716
+#: src/stty.c:720
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
 "                 -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n"
@@ -9803,7 +9876,7 @@ msgid ""
 "                 characters to their default values\n"
 msgstr ""
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -9820,64 +9893,64 @@ msgstr ""
 "χα�ακτή�ες.\n"
 
 #
-#: src/stty.c:796
+#: src/stty.c:800
 #, fuzzy, c-format
 msgid "only one device may be specified"
 msgstr "μόνο ένα ό�ισμα μπο�εί να δηλωθεί"
 
 #
-#: src/stty.c:826
+#: src/stty.c:830
 #, fuzzy, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
 "mutually exclusive"
 msgstr "οι επιλογές --string και --check είναι αμοιβαίως αποκλειόμενες"
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr ""
 "Οταν καθο�ίζεται ένας τ�πος εξόδου, οι καταστάσεις λειτου�γίας (modes)\n"
 "δεν είναι δυνατόν να ο�ιστο�ν"
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr ""
 
 #
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, fuzzy, c-format
 msgid "invalid argument %s"
 msgstr "μη έγκυ�ο ό�ισμα %s για %s"
 
 #
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, fuzzy, c-format
 msgid "missing argument to %s"
 msgstr "ασαφές ό�ισμα %s για %s"
 
 #
-#: src/stty.c:983
+#: src/stty.c:987
 #, fuzzy, c-format
 msgid "invalid line discipline %s"
 msgstr "μη έγκυ�ος α�ιθμός πεδίου: `%s'"
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, fuzzy, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr ""
 "Τυπική είσοδος: αδ�νατον να π�αγματοποιήθουν όλες τις ζητο�μενες\n"
 "λειτου�γίες"
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, fuzzy, c-format
 msgid "%s: no size information for this device"
 msgstr "Δεν υπά�χουν πλη�οφο�ίες μεγέθους γι'αυτό το πε�ιφε�ειακό"
 
 #
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, fuzzy, c-format
 msgid "invalid integer argument %s"
 msgstr "μη έγκυ�η α�ξηση στον α�ιθμό εντολής: `%s'"
@@ -9946,21 +10019,21 @@ msgstr ""
 "  --help       εμφάνιση αυτής της βοήθειας και έξοδος\n"
 "  --version    εμφάνιση πλη�οφο�ιών έκδοσης και έξοδος\n"
 
-#: src/system.h:544
+#: src/system.h:543
 msgid ""
 "\n"
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/system.h:552
+#: src/system.h:551
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -9969,37 +10042,34 @@ msgid ""
 "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n"
 msgstr ""
 
-#
-#: src/system.h:571
-#, fuzzy, c-format
+#: src/system.h:570
+#, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
+"%s online help: <%s>\n"
 msgstr ""
-"\n"
-"Αναφέ�ατε σφάλματα στο <%s>.\n"
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr ""
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr ""
 
 #
-#: src/system.h:596
+#: src/system.h:591
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Δοκιμάστε `%s --help' για πε�ισσότε�η βοήθεια.\n"
 
-#: src/system.h:628
+#: src/system.h:633
 #, fuzzy, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -10142,55 +10212,48 @@ msgstr ""
 
 #: src/tail.c:270
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
 
-#
 #: src/tail.c:274
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 
-#: src/tail.c:281
+#: src/tail.c:280
 #, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
 
-#: src/tail.c:294
+#: src/tail.c:293
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 
-#: src/tail.c:301
+#: src/tail.c:298
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 
-#: src/tail.c:310
+#: src/tail.c:307
 msgid ""
 "\n"
 "If the first character of K (the number of bytes or lines) is a '+',\n"
@@ -10201,7 +10264,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/tail.c:319
+#: src/tail.c:316
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
 "means that even if a tail'ed file is renamed, tail will continue to track\n"
@@ -10212,28 +10275,22 @@ msgid ""
 msgstr ""
 
 #
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr "κλείσιμο του %s (fd=%d)"
 
-#
-#: src/tail.c:453
-#, fuzzy, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr ""
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr ""
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
@@ -10241,136 +10298,149 @@ msgid ""
 msgstr ""
 
 #
-#: src/tail.c:963
+#: src/tail.c:965
+#, fuzzy, c-format
+msgid "%s has been replaced with a symbolic link. giving up on this name"
+msgstr ""
+"%s: αδ�νατη η ακολο�θηση του τέλους αυτο� του είδους α�χείου· πα�άκαμψη"
+
+#
+#: src/tail.c:980
 #, fuzzy, c-format
 msgid "%s has become inaccessible"
 msgstr "το `%s' είναι μη-π�οσπελάσιμο"
 
 #
-#: src/tail.c:980
+#: src/tail.c:997
 #, fuzzy, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr ""
 "%s: αδ�νατη η ακολο�θηση του τέλους αυτο� του είδους α�χείου· πα�άκαμψη"
 
 #
-#: src/tail.c:989
+#: src/tail.c:1006
 #, fuzzy, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr ""
 "%s: αδ�νατη η ακολο�θηση του τέλους αυτο� του είδους α�χείου· πα�άκαμψη"
 
 #
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, fuzzy, c-format
 msgid "%s has become accessible"
 msgstr "το `%s' έχει γίνει π�οσπελάσιμο"
 
 #
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, fuzzy, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr "το `%s' εμφανίστηκε· ακολο�θηση τέλους νέου α�χείου"
 
 #
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, fuzzy, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr "το `%s' έχει αντικατασταθεί· ακολο�θηση τέλους νέου α�χείου"
 
 #
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, fuzzy, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr "δεν είναι δυνατό να πα�αληφθεί χ�ήστης και ομάδα"
 
 #
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, fuzzy, c-format
 msgid "%s: file truncated"
 msgstr "το α�χείο μηδενίστηκε"
 
 #
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr "δεν υπολείπονται α�χεία"
 
 #
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, fuzzy, c-format
 msgid "cannot watch parent directory of %s"
 msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 
 #
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, fuzzy, c-format
 msgid "inotify resources exhausted"
 msgstr "η ιδεατή μνήμη εξαντλήθηκε"
 
 #
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, fuzzy, c-format
 msgid "cannot watch %s"
 msgstr "αδ�νατη η αλλαγή δικαιωμάτων στο %s"
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr ""
 
 #
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, fuzzy, c-format
 msgid "error reading inotify event"
 msgstr "σφάλμα ανάγνωσης %s"
 
 #
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr ""
 "%s: αδ�νατη η ακολο�θηση του τέλους αυτο� του είδους α�χείου· πα�άκαμψη"
 
 #
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, fuzzy, c-format
 msgid "number in %s is too large"
 msgstr "το %s είναι πολ� μεγάλο"
 
 #
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr ""
 "%s: μη έγκυ�ος μέγιστος α�ιθμός από χω�ίς μεταβολή `stats' μεταξ� ανοιγμάτων"
 
 #
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr "%s: μη έγκυ�ος πε�ιγ�αφέας διε�γασίας (PID)"
 
 #
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr "%s: μη έγκυ�ος α�ιθμός δευτε�ολέπτων"
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr ""
 
 #
-#: src/tail.c:2034
+#: src/tail.c:2096
 #, fuzzy, c-format
-msgid "warning: --retry is useful mainly when following by name"
+msgid "warning: --retry ignored; --retry is useful only when following"
+msgstr ""
+"π�οειδοποίηση: ο πε�ιγ�αφέας διε�γασίας αγνοείτε· το --pid=PID είναι χ�ήσιμο "
+"μόνο σε πα�ακολο�θηση"
+
+#: src/tail.c:2100
+#, c-format
+msgid "warning: --retry only effective for the initial open"
 msgstr ""
-"π�οειδοποίηση: το --retry είναι χ�ήσιμο μόνο με πα�ακολο�θηση βάση ονόματος"
 
 #
-#: src/tail.c:2038
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
 msgstr ""
@@ -10378,23 +10448,23 @@ msgstr ""
 "μόνο σε πα�ακολο�θηση"
 
 #
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr "π�οειδοποίηση: το --pid=PID δεν υποστη�ίζεται σε αυτό το σ�στημα"
 
 #
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, fuzzy, c-format
 msgid "cannot follow %s by name"
 msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr ""
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr ""
@@ -10652,48 +10722,47 @@ msgstr "πά�α πολλά ο�ίσματα"
 msgid "warning: sigprocmask"
 msgstr ""
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr ""
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr ""
 
 #
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
 "  or:  %s [OPTION]\n"
 msgstr "Χ�ήση: %s [ΕΠΙΛΟΓΗ]... [ΕΙΣΟΔΟΣ [ΕΞΟΔΟΣ]]\n"
 
-#: src/timeout.c:229
+#: src/timeout.c:232
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
 msgstr ""
 
-#: src/timeout.c:235
+#: src/timeout.c:238
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 msgid ""
 "\n"
 "DURATION is a floating point number with an optional suffix:\n"
@@ -10701,7 +10770,7 @@ msgid ""
 "days.\n"
 msgstr ""
 
-#: src/timeout.c:259
+#: src/timeout.c:262
 msgid ""
 "\n"
 "If the command times out, and --preserve-status is not set, then exit with\n"
@@ -10712,18 +10781,18 @@ msgid ""
 "case the exit status is 128+9 rather than 124.\n"
 msgstr ""
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr ""
 
 #
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, fuzzy, c-format
 msgid "error waiting for command"
 msgstr "σφάλμα εγγ�αφής %s"
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr ""
@@ -11104,7 +11173,7 @@ msgstr ""
 #: src/truncate.c:115
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 
 #: src/truncate.c:121
@@ -11195,13 +11264,13 @@ msgstr ""
 "      --version    εμφάνιση πλη�οφο�ιών έκδοσης και έξοδος\n"
 
 #
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, fuzzy, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr "%s: η είσοδος πε�ιέχει β�όχο:"
 
 #
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr "%s: η είσοδος πε�ιέχει β�όχο:"
@@ -11315,12 +11384,12 @@ msgid "tab stop value is too large"
 msgstr "το %s είναι πολ� μεγάλο"
 
 #
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr "Χ�ήση: %s [ΕΠΙΛΟΓΗ]... [ΕΙΣΟΔΟΣ [ΕΞΟΔΟΣ]]\n"
 
-#: src/uniq.c:138
+#: src/uniq.c:174
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
 "writing to OUTPUT (or standard output).\n"
@@ -11328,38 +11397,50 @@ msgid ""
 "With no options, matching lines are merged to the first occurrence.\n"
 msgstr ""
 
-#
-#: src/uniq.c:147
+#: src/uniq.c:183
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
 msgstr ""
 
-#: src/uniq.c:151
+#: src/uniq.c:187
+msgid ""
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
+msgstr ""
+
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr ""
+
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
+msgstr ""
+
+#: src/uniq.c:199
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
 "  -i, --ignore-case     ignore differences in case when comparing\n"
 "  -s, --skip-chars=N    avoid comparing the first N characters\n"
 "  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
 msgstr ""
 
 #
-#: src/uniq.c:161
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr ""
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 msgid ""
 "\n"
 "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n"
 "characters.  Fields are skipped before chars.\n"
 msgstr ""
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 msgid ""
 "\n"
 "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n"
@@ -11368,31 +11449,43 @@ msgid ""
 msgstr ""
 
 #
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, fuzzy, c-format
 msgid "too many repeated lines"
 msgstr "πά�α πολλά ο�ίσματα"
 
 #
-#: src/uniq.c:521
+#: src/uniq.c:604
 #, fuzzy
 msgid "invalid number of fields to skip"
 msgstr "μη έγκυ�ος α�ιθμός πεδίων π�ος π�οσπέ�αση: `%s'"
 
 #
-#: src/uniq.c:530
+#: src/uniq.c:613
 #, fuzzy
 msgid "invalid number of bytes to skip"
 msgstr "μη έγκυ�ος α�ιθμός bytes π�ος π�οσπέ�αση: `%s'"
 
 #
-#: src/uniq.c:539
+#: src/uniq.c:623
 #, fuzzy
 msgid "invalid number of bytes to compare"
 msgstr "μη έγκυ�ος α�ιθμός από bytes π�ος σ�γκ�ιση: `%s'"
 
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr ""
+
 #
-#: src/uniq.c:558
+#: src/uniq.c:652
+#, fuzzy, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr ""
+"εκτ�πωση όλων των διπλών γ�αμμών και μετ�ητών επαναλήψεων δεν έχει έννοια"
+
+#
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr ""
@@ -11412,12 +11505,6 @@ msgid ""
 "\n"
 msgstr ""
 
-#
-#: src/unlink.c:86
-#, fuzzy, c-format
-msgid "cannot unlink %s"
-msgstr "αδ�νατη η αλλαγή δικαιωμάτων στο %s"
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -11463,7 +11550,7 @@ msgstr[1] "μη έγκυ�ος χ�ήστης"
 msgid ",  load average: %.2f"
 msgstr ",  Μέσος ό�ος φό�του: %.2f"
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, fuzzy, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -11477,19 +11564,19 @@ msgstr ""
 "      --help      Εκτυπώνει αυτή την βοήθεια και τε�ματίζει\n"
 "      --version   Εκτυπώνει πλη�οφο�ίες έκδοσης και τε�ματίζει\n"
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
 "an uninterruptible sleep state also contribute to the load average.\n"
 msgstr ""
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr ""
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, fuzzy, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
@@ -11728,19 +11815,13 @@ msgid ""
 msgstr ""
 
 #
-#, fuzzy
-#~ msgid "  returning value: '%s'\n"
-#~ msgstr "δημιου�γία α�χείου `%s'\n"
-
-#
-#, fuzzy
-#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n"
-#~ msgstr "Χ�ήση: %s [ΕΠΙΛΟΓΗ] [ΑΡΧΕΙΟ]...\n"
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: μη αναγνω�ίσιμη επιλογή -- %c\n"
 
 #
 #, fuzzy
-#~ msgid "no valid suffix found\n"
-#~ msgstr "%s: μη έγκυ�ος α�ιθμός γ�αμμών"
+#~ msgid "invalid argument: %s"
+#~ msgstr "μη έγκυ�ο ό�ισμα %s για %s"
 
 #
 #~ msgid "Try `%s --help' for more information.\n"
@@ -11748,131 +11829,14 @@ msgstr ""
 
 #
 #, fuzzy
-#~ msgid "reading %s"
-#~ msgstr "σφάλμα ανάγνωσης %s"
-
-#
-#, fuzzy
-#~ msgid "writing %s"
-#~ msgstr "σφάλμα εγγ�αφής %s"
-
-#
-#, fuzzy
-#~ msgid "closing %s"
-#~ msgstr "κλείσιμο του %s (fd=%d)"
-
-#, fuzzy
-#~ msgid "accessing %s"
-#~ msgstr "διαγ�αφή καταλόγου %s\n"
-
-#
-#, fuzzy
-#~ msgid "opening %s"
-#~ msgstr "σφάλμα ανάγνωσης %s"
-
-#
-#, fuzzy
-#~ msgid ""
-#~ "Usage: %s NAME\n"
-#~ "  or:  %s OPTION\n"
-#~ msgstr "Χ�ήση: %s [ΕΠΙΛΟΓΗ]... [ΕΙΣΟΔΟΣ [ΕΞΟΔΟΣ]]\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "  none, off       never make backups (even if --backup is given)\n"
-#~ "  numbered, t     make numbered backups\n"
-#~ "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
-#~ "  simple, never   always make simple backups\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Η κατάληξη των αντιγ�άφων ασφαλείας είναι το `~', εκτός αν τεθεί με το\n"
-#~ "--suffix ή το SIMPLE_BACKUP_SUFFIX.\n"
-#~ "Ο έλεγχος έκδοσης μπο�εί να τεθεί με την επιλογή --backup ή μέσω της\n"
-#~ "μεταβλητής πε�ιβάλλοντος VERSION_CONTROL. Οι δυνατές τιμές είναι:\n"
-#~ "\n"
-#~ "  none,off        να μη δημιου�γο�νται αντίγ�αδα ασφαλείας (ακόμα και\n"
-#~ "                    αν δίνεται --backup)\n"
-#~ "  numbered, t     δημιου�γία α�ιθμημένων αντιγ�άφων ασφαλείας\n"
-#~ "  existing, nil   α�ιθμημένων, αν υπά�χουν α�ιθμημένα αντίγ�αφα, "
-#~ "διαφο�ετικά\n"
-#~ "                    απλά αντίγ�αφα\n"
-#~ "  simple, never   πάντα δημιου�γία απλών αντιγ�άφων\n"
-
-#
-#, fuzzy
-#~ msgid "Usage: %s [OPTION]... FILE\n"
-#~ msgstr "Χ�ήση: %s [ΕΠΙΛΟΓΕΣ]... [ΑΡΧΕΙΟ]...\n"
-
-#~ msgid "Password:"
-#~ msgstr "Συνθηματικό:"
-
-#~ msgid "getpass: cannot open /dev/tty"
-#~ msgstr "getpass(): δεν είναι δυνατόν να ανοιχτεί το /dev/tty"
-
-#
-#, fuzzy
-#~ msgid "cannot set groups"
-#~ msgstr "δεν είναι δυνατό να πα�αληφθεί χ�ήστης και ομάδα"
-
-#
-#, fuzzy
-#~ msgid "cannot set group id"
-#~ msgstr "δεν είναι δυνατό να πα�αληφθεί χ�ήστης και ομάδα"
-
-#
-#, fuzzy
-#~ msgid "cannot set user id"
-#~ msgstr "δεν είναι δυνατό να πα�αληφθεί χ�ήστης και ομάδα"
-
-#
-#, fuzzy
-#~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n"
-#~ msgstr "Χ�ήση: %s [ΕΠΙΛΟΓΕΣ]... [ΑΡΧΕΙΟ]...\n"
-
-#, fuzzy
 #~ msgid ""
-#~ "Change the effective user id and group id to that of USER.\n"
-#~ "\n"
-#~ "  -, -l, --login               make the shell a login shell\n"
-#~ "  -c, --command=COMMAND        pass a single COMMAND to the shell with -"
-#~ "c\n"
-#~ "  -f, --fast                   pass -f to the shell (for csh or tcsh)\n"
-#~ "  -m, --preserve-environment   do not reset environment variables\n"
-#~ "  -p                           same as -m\n"
-#~ "  -s, --shell=SHELL            run SHELL if /etc/shells allows it\n"
+#~ "      --help            Display this help and exit.\n"
+#~ "      --version         Output version information and exit.\n"
 #~ msgstr ""
-#~ "Αλλάζει την ισχ�ουσα ταυτότητα (effective id) χ�ήστη και ομάδας σε αυτές\n"
-#~ "του ΧΡΗΣΤΗ.\n"
-#~ "\n"
-#~ "  -, -l, --login              Μετατ�έπει το κέλυφος (shell) σε κέλυφος "
-#~ "εισόδου\n"
-#~ "  -c, --command=Ε�ΤΟΛΗ        Στέλνει την Ε�ΤΟΛΗ στο φλοιό με -c\n"
-#~ "  -f, --fast                  Στέλνει -f στο φλοιό (για csh ή tcsh)\n"
-#~ "  -m, --preserve-environment  Δεν ξαναθέτει τις μεταβλητές του "
-#~ "πε�ιβάλλοντος\n"
-#~ "  -p                          Ομοιο με -m\n"
-#~ "  -s, --shell=ΚΕΛΥΦΟΣ         Εκτελεί το ΚΕΛΥΦΟΣ εαν /etc/shells το "
-#~ "επιτ�έπει\n"
-#~ "      --help                  Εκτυπώνει αυτή την βοήθεια και τε�ματίζει\n"
-#~ "      --version               Εκτυπώνει πλη�οφο�ίες έκδοσης και "
-#~ "τε�ματίζει\n"
+#~ "Εμφάνιση άθ�οισμα ελέγχου CRC και α�ιθμό bytes για κάθε ΑΡΧΕΙΟ.\n"
 #~ "\n"
-#~ "Εαν απλό - υπονοείται -l.   Εάν η πα�άμετ�ος ΧΡΗΣΤΗΣ δεν δίνεται,\n"
-#~ "θεω�είται οτι είναι ο `root'.\n"
-
-#~ msgid "user %s does not exist"
-#~ msgstr "ο χ�ήστης %s δεν υπά�χει"
-
-#~ msgid "incorrect password"
-#~ msgstr "λάθος συνθηματικό"
-
-#~ msgid "using restricted shell %s"
-#~ msgstr "χ�ησιμοποιείται το πε�ιο�ισμένο κέλυφος (restricted shell) %s"
-
-#
-#, fuzzy
-#~ msgid "warning: cannot change directory to %s"
-#~ msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
+#~ "  --help       εμφάνιση αυτής της βοήθειας και έξοδος\n"
+#~ "  --version    εμφάνιση πλη�οφο�ιών έκδοσης και έξοδος\n"
 
 #, fuzzy
 #~ msgid ""
@@ -11900,6 +11864,39 @@ msgstr ""
 #~ "Κάθε ΔΙΚΑΙΩΜΑ είναι ένα ή πε�ισσότε�α από τα γ�άμματα ugoa, ένα από τα\n"
 #~ "σ�μβολα +-= και ένα ή πε�ισσότε�α από τα γ�άμματα rwxXstugo.\n"
 
+#
+#, fuzzy
+#~ msgid "reading %s"
+#~ msgstr "σφάλμα ανάγνωσης %s"
+
+#
+#, fuzzy
+#~ msgid "writing %s"
+#~ msgstr "σφάλμα εγγ�αφής %s"
+
+#
+#, fuzzy
+#~ msgid "closing %s"
+#~ msgstr "κλείσιμο του %s (fd=%d)"
+
+#, fuzzy
+#~ msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
+#~ msgstr "%s: αντιγ�αφή πάνω στο `%s', πα�άκαμψη δικαιωμάτων %04lo; "
+
+#
+#, fuzzy
+#~ msgid "cannot create link %s"
+#~ msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
+
+#, fuzzy
+#~ msgid "accessing %s"
+#~ msgstr "διαγ�αφή καταλόγου %s\n"
+
+#
+#, fuzzy
+#~ msgid "invalid format precision"
+#~ msgstr "μη έγκυ�ο είδος αλφα�ιθμητικο� `%s'"
+
 #, fuzzy
 #~ msgid ""
 #~ "Display the current time in the given FORMAT, or set the system date.\n"
@@ -11929,34 +11926,26 @@ msgstr ""
 #~ "τε�ματίζει\n"
 
 #
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: μη αναγνω�ίσιμη επιλογή -- %c\n"
-
-#
 #, fuzzy
-#~ msgid "invalid argument: %s"
-#~ msgstr "μη έγκυ�ο ό�ισμα %s για %s"
+#~ msgid "opening %s"
+#~ msgstr "σφάλμα ανάγνωσης %s"
 
 #
 #, fuzzy
 #~ msgid ""
-#~ "      --help            Display this help and exit.\n"
-#~ "      --version         Output version information and exit.\n"
-#~ msgstr ""
-#~ "Εμφάνιση άθ�οισμα ελέγχου CRC και α�ιθμό bytes για κάθε ΑΡΧΕΙΟ.\n"
-#~ "\n"
-#~ "  --help       εμφάνιση αυτής της βοήθειας και έξοδος\n"
-#~ "  --version    εμφάνιση πλη�οφο�ιών έκδοσης και έξοδος\n"
+#~ "Usage: %s NAME\n"
+#~ "  or:  %s OPTION\n"
+#~ msgstr "Χ�ήση: %s [ΕΠΙΛΟΓΗ]... [ΕΙΣΟΔΟΣ [ΕΞΟΔΟΣ]]\n"
 
 #
 #, fuzzy
-#~ msgid "cannot create link %s"
+#~ msgid "cannot reposition file pointer for %s"
 #~ msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 
 #
 #, fuzzy
-#~ msgid "invalid format precision"
-#~ msgstr "μη έγκυ�ο είδος αλφα�ιθμητικο� `%s'"
+#~ msgid "Usage: %s [OPTION]... [USERNAME]\n"
+#~ msgstr "Χ�ήση: %s [ΕΠΙΛΟΓΗ]... ΣΥ�ΟΛΟ1 [ΣΥ�ΟΛΟ2]\n"
 
 #~ msgid "%s: warning: making a hard link to a symbolic link is not portable"
 #~ msgstr ""
@@ -11981,6 +11970,11 @@ msgstr ""
 
 #
 #, fuzzy
+#~ msgid "Usage: %s [OPTION]... FILE\n"
+#~ msgstr "Χ�ήση: %s [ΕΠΙΛΟΓΕΣ]... [ΑΡΧΕΙΟ]...\n"
+
+#
+#, fuzzy
 #~ msgid "FATAL: failed to close directory %s"
 #~ msgstr "αδ�νατη η αλλαγή στο κατάλογο %s"
 
@@ -11996,13 +11990,13 @@ msgstr ""
 
 #
 #, fuzzy
-#~ msgid "FATAL: cannot return to .. from %s"
-#~ msgstr "αδ�νατη η αλλαγή στο κατάλογο %s"
+#~ msgid "cannot remove directory %s"
+#~ msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
 
 #
 #, fuzzy
-#~ msgid "cannot remove %s directory %s"
-#~ msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
+#~ msgid "FATAL: cannot return to .. from %s"
+#~ msgstr "αδ�νατη η αλλαγή στο κατάλογο %s"
 
 #
 #, fuzzy
@@ -12021,9 +12015,144 @@ msgstr ""
 
 #
 #, fuzzy
+#~ msgid ""
+#~ "Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
+#~ "  or:  %s LONG-OPTION\n"
+#~ msgstr "Χ�ήση: %s [ΕΠΙΛΟΓΗ]... [ΕΙΣΟΔΟΣ [ΕΞΟΔΟΣ]]\n"
+
+#
+#, fuzzy
+#~ msgid "cannot set group-ID to %lu"
+#~ msgstr "δεν είναι δυνατό να πα�αληφθεί χ�ήστης και ομάδα"
+
+#
+#, fuzzy
+#~ msgid "cannot set user-ID to %lu"
+#~ msgstr "δεν είναι δυνατό να πα�αληφθεί χ�ήστης και ομάδα"
+
+#
+#, fuzzy
+#~ msgid "dup2 failed"
+#~ msgstr "αποτυχία ανοίγματος"
+
+#
+#, fuzzy
+#~ msgid "couldn't execute %s"
+#~ msgstr "αδ�νατη η αλλαγή δικαιωμάτων στο %s"
+
+#
+#, fuzzy
+#~ msgid "couldn't execute %s -d"
+#~ msgstr "αδ�νατη η αλλαγή δικαιωμάτων στο %s"
+
+#
+#, fuzzy
+#~ msgid ""
+#~ "  -a, --suffix-length=N   use suffixes of length N (default %d)\n"
+#~ "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
+#~ "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output "
+#~ "file\n"
+#~ "  -d, --numeric-suffixes  use numeric suffixes instead of alphabetic\n"
+#~ "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
+#~ msgstr ""
+#~ "Έξοδος τμημάτων σταθε�ο� μεγέθους από την ΕΙΣΟΔΟ σε ΠΡΟΘΕΜΑaa, "
+#~ "ΠΡΟΘΕΜΑab, ...; εξ ο�ισμο�\n"
+#~ "ΠΡΟΘΕΜΑ είναι το `x'.  Χω�ίς ΕΙΣΟΔΟ, ή όταν η ΕΙΣΟΔΟΣ είναι το -, "
+#~ "ανάγνωση από την κανονική είσοδο.\n"
+#~ "\n"
+#~ "  -b, --bytes=ΜΕΓΕΘΟΣ     τοποθέτηση ΜΕΓΕΘΟΣ bytes σε κάθε α�χείο εξόδου\n"
+#~ "  -C, --line-bytes=ΜΕΓΕΘΟΣ  τοποθέτηση το πολ� ΜΕΓΕΘΟΣ bytes από γ�αμμές "
+#~ "σε κάθε α�χείο εξόδου\n"
+#~ "  -l, --lines=ΑΡΙΘΜΟΣ     τοποθέτηση ΑΡΙΘΜΟΣ γ�αμμών σε κάθε α�χείου "
+#~ "εξόδου\n"
+#~ "  -ΑΡΙΘΜΟΣ                ίδιο με -l ΑΡΙΘΜΟΣ\n"
+#~ "      --verbose           εκτ�πωση διαγνωστικο� στο κανονικό σφάλμα μόλις "
+#~ "π�ιν\n"
+#~ "                            ανοιχτεί κάθε α�χείο εξόδου\n"
+#~ "      --help              εμφάνιση αυτής της βοήθειας και έξοδος\n"
+#~ "      --version           εμφάνιση πλη�οφο�ιών έκδοσης και έξοδος\n"
+#~ "\n"
+#~ "ΜΕΓΕΘΟΣ μπο�εί να έχει π�όθεμα πολλαπλασιαστή: b για 512, k για 1K, m για "
+#~ "1 Meg.\n"
+
+#
+#, fuzzy
 #~ msgid "invalid number of lines: 0"
 #~ msgstr "μη έγκυ�ος α�ιθμός από γ�αμμές"
 
+#~ msgid "Password:"
+#~ msgstr "Συνθηματικό:"
+
+#~ msgid "getpass: cannot open /dev/tty"
+#~ msgstr "getpass(): δεν είναι δυνατόν να ανοιχτεί το /dev/tty"
+
+#
+#, fuzzy
+#~ msgid "cannot set groups"
+#~ msgstr "δεν είναι δυνατό να πα�αληφθεί χ�ήστης και ομάδα"
+
+#
+#, fuzzy
+#~ msgid "cannot set group id"
+#~ msgstr "δεν είναι δυνατό να πα�αληφθεί χ�ήστης και ομάδα"
+
+#
+#, fuzzy
+#~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n"
+#~ msgstr "Χ�ήση: %s [ΕΠΙΛΟΓΕΣ]... [ΑΡΧΕΙΟ]...\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Change the effective user id and group id to that of USER.\n"
+#~ "\n"
+#~ "  -, -l, --login               make the shell a login shell\n"
+#~ "  -c, --command=COMMAND        pass a single COMMAND to the shell with -"
+#~ "c\n"
+#~ "  -f, --fast                   pass -f to the shell (for csh or tcsh)\n"
+#~ "  -m, --preserve-environment   do not reset environment variables\n"
+#~ "  -p                           same as -m\n"
+#~ "  -s, --shell=SHELL            run SHELL if /etc/shells allows it\n"
+#~ msgstr ""
+#~ "Αλλάζει την ισχ�ουσα ταυτότητα (effective id) χ�ήστη και ομάδας σε αυτές\n"
+#~ "του ΧΡΗΣΤΗ.\n"
+#~ "\n"
+#~ "  -, -l, --login              Μετατ�έπει το κέλυφος (shell) σε κέλυφος "
+#~ "εισόδου\n"
+#~ "  -c, --command=Ε�ΤΟΛΗ        Στέλνει την Ε�ΤΟΛΗ στο φλοιό με -c\n"
+#~ "  -f, --fast                  Στέλνει -f στο φλοιό (για csh ή tcsh)\n"
+#~ "  -m, --preserve-environment  Δεν ξαναθέτει τις μεταβλητές του "
+#~ "πε�ιβάλλοντος\n"
+#~ "  -p                          Ομοιο με -m\n"
+#~ "  -s, --shell=ΚΕΛΥΦΟΣ         Εκτελεί το ΚΕΛΥΦΟΣ εαν /etc/shells το "
+#~ "επιτ�έπει\n"
+#~ "      --help                  Εκτυπώνει αυτή την βοήθεια και τε�ματίζει\n"
+#~ "      --version               Εκτυπώνει πλη�οφο�ίες έκδοσης και "
+#~ "τε�ματίζει\n"
+#~ "\n"
+#~ "Εαν απλό - υπονοείται -l.   Εάν η πα�άμετ�ος ΧΡΗΣΤΗΣ δεν δίνεται,\n"
+#~ "θεω�είται οτι είναι ο `root'.\n"
+
+#~ msgid "user %s does not exist"
+#~ msgstr "ο χ�ήστης %s δεν υπά�χει"
+
+#~ msgid "incorrect password"
+#~ msgstr "λάθος συνθηματικό"
+
+#~ msgid "using restricted shell %s"
+#~ msgstr "χ�ησιμοποιείται το πε�ιο�ισμένο κέλυφος (restricted shell) %s"
+
+#
+#, fuzzy
+#~ msgid "warning: cannot change directory to %s"
+#~ msgstr "αδ�νατη η δημιου�γία καταλόγου `%s'"
+
+#
+#, fuzzy
+#~ msgid "warning: --retry is useful mainly when following by name"
+#~ msgstr ""
+#~ "π�οειδοποίηση: το --retry είναι χ�ήσιμο μόνο με πα�ακολο�θηση βάση "
+#~ "ονόματος"
+
 #
 #, fuzzy
 #~ msgid "creating %s"
@@ -12424,11 +12553,6 @@ msgstr ""
 #~ msgstr ""
 #~ "major και minor α�ιθμοί συσκευής δεν π�έπει να ο�ίζονται στα α�χεία fifo"
 
-#
-#, fuzzy
-#~ msgid "cannot set permissions of %s"
-#~ msgstr "αδυναμία αλλαγής ιδιοκτησίας στο %s"
-
 #~ msgid "when moving multiple files, last argument must be a directory"
 #~ msgstr ""
 #~ "όταν μετακινο�νται πολλαπλά α�χεία, το τελευταίο ό�ισμα π�έπει να είναι "
@@ -14031,9 +14155,6 @@ msgstr ""
 #~ "αδυναμία μετακίνησης του `%s' μεταξ� συστημάτων α�χείων: Δεν είναι "
 #~ "κανονικό α�χείο"
 
-#~ msgid "%s: replace `%s', overriding mode %04o? "
-#~ msgstr "%s: αντικατάσταση του `%s', πα�άκαμψη δικαιωμάτων %04o; "
-
 #~ msgid "%s: remove %s`%s', overriding mode %04o? "
 #~ msgstr "%s: διαγ�αφή του %s`%s', πα�ακάπτωντας τα δικαιώματα %04o; "
 
@@ -14528,8 +14649,8 @@ msgstr ""
 #~ "  [-]echo       Π�οσθέτει ηχώ στους εισαγώμενους χα�ακτή�ες\n"
 #~ "* [-]echoctl    Ομοιο με [-]ctlecho\n"
 #~ "  [-]echoe      Ομοιο με [-]crterase\n"
-#~ "  [-]echok      Π�οσθέτει `νεα γ�αμμή' μετά απο ένα `kill' χα�ακτή�α * [-]"
-#~ "echoke     Ομοιο [-]crtkill\n"
+#~ "  [-]echok      Π�οσθέτει `νεα γ�αμμή' μετά απο ένα `kill' χα�ακτή�α * "
+#~ "[-]echoke     Ομοιο [-]crtkill\n"
 #~ "  [-]echonl     Π�οσθέτει ηχώ στη `νέα γ�αμμή' ακόμη και αν δεν "
 #~ "συμβαίνει\n"
 #~ "                 για τους άλλους χα�ακτή�ες\n"
diff --git a/po/eo.gmo b/po/eo.gmo
index ebafb5f4..1c915797 100644
--- a/po/eo.gmo
+++ b/po/eo.gmo
diff --git a/po/eo.po b/po/eo.po
index 5a52eca3..8d64104d 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -1,26 +1,29 @@
 # Esperanto translations for GNU coreutils.
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Copyright (C) 2013 Free Software Foundation, Inc.
 # This file is distributed under the same license as the coreutils package.
 #
 # Eta klarigo pri la stilo de la tradukoj:
 # La mesa�o kiu priskribas komandon uzas prezenton (-as);
 # la priskriboj de opcioj uzas infinitivon (-i);
-# kaj ordonoj al la uzanto uzas imperativon (-u).
+# ordonoj al la uzanto uzas imperativon (-u).
 #
 # To get myself started, in September 2010 I downloaded the coreutils_eo.po
 # file from Launchpad.  Since then the messages have been edited so much,
 # that only a few of the original phrases remain unmodified.  To note: just
 # a handful from Aisano, Goren, and Kristjan Schmidt.  --  Benno
 #
-# "Mai liber, mai sănătos, mai bogat."
+# Ekde septembro 2012 mi ofte bazigis miajn aldonajn tradukojn
+# sur la tradukojn de Sian Mountbatten.  Mi dankas.  --  Benno
+#
+# "Blauwbloemen greuit veural op akkers, tussen 't groan."
 #
 # Benno Schulenberg <benno@vertaalt.nl>, 2011, 2012, 2013.
 msgid ""
 msgstr ""
-"Project-Id-Version: coreutils-8.20-pre1\n"
+"Project-Id-Version: coreutils-8.22-pre4\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
-"PO-Revision-Date: 2013-01-01 15:51+0100\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
+"PO-Revision-Date: 2013-12-10 22:42+0100\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
@@ -48,76 +51,124 @@ msgstr "Validaj argumentoj estas:"
 msgid "error closing file"
 msgstr "eraro dum fermado de dosiero"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "skrib-eraro"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "konservi�as permesoj pri %s"
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "Nekonata sistemeraro"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "normala malplena dosiero"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "normala dosiero"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "dosierujo"
 
-#: lib/file-type.c:44
-msgid "block special file"
-msgstr "blokaparatdosiero"
-
-#: lib/file-type.c:47
-msgid "character special file"
-msgstr "signoaparatdosiero"
-
-#: lib/file-type.c:50
-msgid "fifo"
-msgstr "vicmemoro"
-
-#: lib/file-type.c:53
+#: lib/file-type.c:46
 msgid "symbolic link"
 msgstr "simbola ligo"
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "konektilo"
-
-#: lib/file-type.c:59
+#: lib/file-type.c:52
 msgid "message queue"
 msgstr "mesa�ovico"
 
-#: lib/file-type.c:62
+#: lib/file-type.c:55
 msgid "semaphore"
 msgstr "semaforo"
 
-#: lib/file-type.c:65
+#: lib/file-type.c:58
 msgid "shared memory object"
 msgstr "komuna memorobjekto"
 
-#: lib/file-type.c:68
+#: lib/file-type.c:61
 msgid "typed memory object"
 msgstr "tipita memorobjekto"
 
-#: lib/file-type.c:70
+#: lib/file-type.c:66
+msgid "block special file"
+msgstr "blokaparatdosiero"
+
+#: lib/file-type.c:69
+msgid "character special file"
+msgstr "signoaparatdosiero"
+
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr ""
+
+#: lib/file-type.c:75
+msgid "fifo"
+msgstr "vicmemoro"
+
+#: lib/file-type.c:78
+msgid "door"
+msgstr ""
+
+#: lib/file-type.c:81
+#, fuzzy
+msgid "multiplexed block special file"
+msgstr "blokaparatdosiero"
+
+#: lib/file-type.c:84
+#, fuzzy
+msgid "multiplexed character special file"
+msgstr "signoaparatdosiero"
+
+#: lib/file-type.c:87
+#, fuzzy
+msgid "multiplexed file"
+msgstr "pluraj roloj"
+
+#: lib/file-type.c:90
+#, fuzzy
+msgid "named file"
+msgstr "stranga dosiero"
+
+#: lib/file-type.c:93
+#, fuzzy
+msgid "network special file"
+msgstr "blokaparatdosiero"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr ""
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr ""
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr ""
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "konektilo"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr ""
+
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "stranga dosiero"
 
@@ -252,18 +303,18 @@ msgstr "%s: opcio «-W %s» ne toleras argumenton\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: opcio «-W %s» bezonas argumenton\n"
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr "ne eblas �an�i permesojn de %s"
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "ne eblas krei dosierujon %s"
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr "mankas sufiĉa memoro"
@@ -380,7 +431,7 @@ msgstr "Regulesprimo tro grandas"
 msgid "Unmatched ) or \\)"
 msgstr "Senpara ) aÅ­ \\)"
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 msgid "No previous regular expression"
 msgstr "Mankas antaÅ­a regulesprimo"
 
@@ -405,7 +456,7 @@ msgstr "uzu «--no-preserve-root» por mal�alti ĉi tiun sekurilon"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[jJyY]"
 
@@ -415,11 +466,11 @@ msgstr "^[jJyY]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, c-format
 msgid "setting permissions for %s"
 msgstr "agordi�as permesoj pri %s"
@@ -577,18 +628,6 @@ msgstr "Elektra provizo perdi�is"
 msgid "Resource lost"
 msgstr "Risurco perdi�is"
 
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, c-format
-msgid "cannot create pipe"
-msgstr "ne eblas krei dukton"
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, c-format
-msgid "%s subprocess failed"
-msgstr "subprocezo %s malsukcesis"
-
 #: lib/strsignal.c:114
 #, c-format
 msgid "Real-time signal %d"
@@ -666,7 +705,7 @@ msgid ""
 msgstr ""
 "\n"
 "Ĉi tiu estas libera programaro: vi rajtas �in �an�i kaj redistribui.\n"
-"La �usta licenco estas GPLv3+: GNU GPL versio 3 aŭ sekva;\n"
+"La �usta permesilo estas GPLv3+: GNU GPL versio 3 aŭ sekva;\n"
 "por la kompleta (angla) teksto vidu <http://gnu.org/licenses/gpl.html>.\n"
 "Ĉi tiu programaro ne garantiatas, ene de la limoj de la le�o.\n"
 "\n"
@@ -798,7 +837,7 @@ msgstr ""
 msgid "Report %s bugs to: %s\n"
 msgstr "Raportu programmisojn en «%s» al: %s\n"
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Hejmpa�o de «%s»: <%s>\n"
@@ -808,30 +847,10 @@ msgstr "Hejmpa�o de «%s»: <%s>\n"
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr "Hejmpa�o de «%s»: <http://www.gnu.org/software/%s/>\n"
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr "Äœenerala helpo por uzi GNU-programojn: <http://www.gnu.org/gethelp/>\n"
 
-#: lib/w32spawn.h:43
-#, c-format
-msgid "_open_osfhandle failed"
-msgstr "'_open_osfhandle()' malsukcesis "
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr "ne eblas restaÅ­ri dosiernumeron %d: 'dup2()' malsukcesis"
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr "subprocezo %s"
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr "subprocezo %s ricevis pereigan signalon %d"
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr "ĉefenigujo"
@@ -853,7 +872,7 @@ msgstr "nekonata fluaĵo"
 msgid "failed to reopen %s with mode %s"
 msgstr "malsukcesis remalfermi %s kun moduso %s"
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr "ĉena komparo malsukcesis"
@@ -894,7 +913,7 @@ msgid "Simon Josefsson"
 msgstr "Simon ÄœOSEFSON (Simon Josefsson)"
 
 #: src/base64.c:60
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
 "Base64 encode or decode FILE, or standard input, to standard output.\n"
@@ -904,6 +923,7 @@ msgstr ""
 "Kodas aŭ malkodas 64-ume DOSIEROn (aŭ ĉefenigujon) al ĉefeligujo.\n"
 "\n"
 
+# XXX --  Please don't use periods; use semicolons.
 #: src/base64.c:67
 msgid ""
 "  -d, --decode          decode data\n"
@@ -918,7 +938,7 @@ msgstr ""
 "  -w, --wrap=NOMBRO      faldi koditajn liniojn post NOMBRO (defaÅ­lte 76)\n"
 "                           da signoj; uzu 0 por mal�alti linifaldadon\n"
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -940,48 +960,47 @@ msgstr ""
 "iuj liniavancoj en la enigaĵo.  Uzu «--ignore-garbage» por provi toleri\n"
 "aliajn ne-alfabetajn signojn en la kodita fluo.\n"
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "leg-eraro"
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, c-format
 msgid "invalid input"
 msgstr "nevalida enigaĵo"
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, c-format
 msgid "invalid wrap size: %s"
 msgstr "nevalida faldiga grando: %s"
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, c-format
 msgid "extra operand %s"
 msgstr "superflua argumento: %s"
 
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, c-format
 msgid "closing standard input"
 msgstr "fermi�as ĉefenigujo"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -1000,7 +1019,6 @@ msgstr ""
 "       aÅ­:  %s OPCIO... NOMO...\n"
 
 #: src/basename.c:53
-#, fuzzy
 msgid ""
 "Print NAME with any leading directory components removed.\n"
 "If specified, also remove a trailing SUFFIX.\n"
@@ -1010,10 +1028,11 @@ msgstr ""
 "\n"
 
 #: src/basename.c:60
+#, fuzzy
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
 "  -a, --multiple        permesi plurajn argumentojn kaj trakti ĉiun kiel "
 "NOMOn\n"
@@ -1037,32 +1056,31 @@ msgstr ""
 "  %s -s .h include/stdio.h    ->  «stdio»\n"
 "  %s -a ia/ĉeno1 ia/ĉeno2     ->  «ĉeno1» kaj poste «ĉeno2»\n"
 
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, c-format
 msgid "missing operand"
 msgstr "mankas argumento"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr "Torbjern GRANLUND (Torbjörn Granlund)"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 msgid "Richard M. Stallman"
 msgstr "Riĉard STOLMEN (Richard M. Stallman)"
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1120,7 +1138,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr "ne eblas fari 'ioctl' al %s"
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr "ĉefeligujo"
@@ -1137,14 +1155,14 @@ msgstr "Rosel KUKER (Russell Coker)"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 msgid "Jim Meyering"
 msgstr "Äœim MEJERING (Jim Meyering)"
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, c-format
 msgid "failed to create security context: %s"
 msgstr "malsukcesis krei sekurecan kuntekston: %s"
@@ -1154,8 +1172,8 @@ msgstr "malsukcesis krei sekurecan kuntekston: %s"
 msgid "failed to set %s security context component to %s"
 msgstr "malsukcesis agordi elementon %s de sekureca kunteksto al %s"
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, c-format
 msgid "failed to get security context of %s"
 msgstr "malsukcesis eltrovi sekurecan kuntekston de %s"
@@ -1165,18 +1183,18 @@ msgstr "malsukcesis eltrovi sekurecan kuntekston de %s"
 msgid "can't apply partial context to unlabeled file %s"
 msgstr "ne eblas apliki partan kuntekston al sen-etikeda dosiero %s"
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, c-format
 msgid "failed to change context of %s to %s"
 msgstr "malsukcesis �an�i kuntekston de %s al %s"
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
 msgstr "ne eblas atingi %s"
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, c-format
 msgid "cannot read directory %s"
 msgstr "ne eblas legi dosierujon %s"
@@ -1186,13 +1204,14 @@ msgstr "ne eblas legi dosierujon %s"
 msgid "changing security context of %s\n"
 msgstr "�an�i�as sekureca kunteksto de %s\n"
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, c-format
 msgid "fts_read failed"
 msgstr "malsukcesis 'fts_read()'"
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, c-format
 msgid "fts_close failed"
 msgstr "malsukcesis 'fts_close()'"
@@ -1210,16 +1229,14 @@ msgstr ""
 "       aÅ­:  %s [OPCIO...] --reference=REFERENCDOSIERO DOSIERO...\n"
 
 #: src/chcon.c:357
-#, fuzzy
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
-"Ŝan�as la sekurecan kuntekston de ĉiu DOSIERO al KUNTEKSTO.\n"
-"Kun «--reference», �an�as la sekurecan kuntekston de ĉiu\n"
-"DOSIERO al tiu de REFERENCDOSIERO.\n"
-"\n"
+"Ŝan�as la SELinuksan sekurecan kuntekston de ĉiu DOSIERO al KUNTEKSTO.\n"
+"Kun «--reference», �i �an�as la sekurecan kuntekston de ĉiu DOSIERO\n"
+"al tiu de REFERENCDOSIERO.\n"
 
 #: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94
 msgid ""
@@ -1245,7 +1262,7 @@ msgstr ""
 "  -t, --type=TIPO        difini tipon TIPO en la cela sekureca kunteksto\n"
 "  -l, --range=GAMO       difini gamon GAMO en la cela sekureca kunteksto\n"
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
 "      --preserve-root    fail to operate recursively on '/'\n"
@@ -1297,36 +1314,37 @@ msgstr ""
 "  -P                     ne trapasi iujn ajn simbolajn ligojn (defaÅ­lte)\n"
 "\n"
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr "'-R --dereference' bezonas aÅ­ '-H' aÅ­ '-L'"
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr "'-R -h' bezonas '-P'"
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, c-format
 msgid "missing operand after %s"
 msgstr "mankas argumento post %s"
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, c-format
 msgid "invalid context: %s"
 msgstr "nevalida kunteksto: %s"
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr "konfliktas la indikoj de sekureca kunteksto"
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, c-format
 msgid "failed to get attributes of %s"
 msgstr "malsukcesis eltrovi atributojn de %s"
@@ -1356,7 +1374,7 @@ msgstr ""
 "REFERENCDOSIERO.\n"
 "\n"
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
@@ -1396,47 +1414,47 @@ msgstr ""
 "  %s -hR teamo /u    Ŝan�as la grupon de /u kaj �iaj subdosieroj al \"teamo"
 "\".\n"
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
 msgstr "eltrovi�as novaj atributoj de %s"
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr "nek simbola ligo %s nek �ia referanto estas �an�ita\n"
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr "moduso de %s �an�i�is de %04lo (%s) al %04lo (%s)\n"
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr "malsukcesis �an�i moduson de %s de %04lo (%s) al %04lo (%s)\n"
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr "moduso de %s restas %04lo (%s)\n"
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr "ne eblas trakti sencelan simbolan ligon %s"
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, c-format
 msgid "changing permissions of %s"
 msgstr "�an�i�as permesoj pri %s"
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr "%s: novaj permesoj estas %s, ne %s"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1447,7 +1465,7 @@ msgstr ""
 "       aÅ­:  %s [OPCIO...] OKUMA_MODUSO  DOSIERO...\n"
 "       aÅ­:  %s [OPCIO...] --reference=REFERENCDOSIERO  DOSIERO...\n"
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 msgid ""
 "Change the mode of each FILE to MODE.\n"
 "With --reference, change the mode of each FILE to that of RFILE.\n"
@@ -1457,16 +1475,16 @@ msgstr ""
 "�i �angas la moduson de ĉiu DOSIERO al tiu de REFERENCDOSIERO.\n"
 "\n"
 
-#: src/chmod.c:391
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
 "      --reference=REFDOS  uzi la moduson de REFDOS anstataÅ­ de MODUSOn\n"
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr "  -R, --recursive         �an�as dosierojn kaj dosierujojn rikure\n"
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 msgid ""
 "\n"
 "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n"
@@ -1475,12 +1493,12 @@ msgstr ""
 "Ĉiu MODUSO estas laŭ la formo «[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=]"
 "[0-7]+».\n"
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr "nekombineblas modusaj argumentoj kaj opcio «--reference»"
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, c-format
 msgid "invalid mode: %s"
 msgstr "nevalida moduso: %s"
@@ -1634,26 +1652,21 @@ msgstr ""
 "\".\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr "Roland MEKGRAF (Roland McGrath)"
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr "nevalida grupo: %s"
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, c-format
 msgid "invalid group list %s"
 msgstr "nevalida gruplisto: %s"
 
-#: src/chroot.c:117
-#, c-format
-msgid "failed to set additional groups"
-msgstr "malsukcesis agordi la pluajn grupojn"
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
@@ -1662,7 +1675,7 @@ msgstr ""
 "Uzmaniero:  %s [OPCIO] CELDOSIERUJO [KOMANDO [ARGUMENTO...]]\n"
 "       aÅ­:  %s OPCIO\n"
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
@@ -1670,7 +1683,7 @@ msgstr ""
 "Rulas KOMANDOn kun CELDOSIERUJO kiel radika dosierujo.\n"
 "\n"
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
@@ -1679,7 +1692,7 @@ msgstr ""
 "  --groups=GRUPLISTO       agordendaj aldonaj grupoj (indiki kiel «g1,g2,..,"
 "gN»)\n"
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 msgid ""
 "\n"
 "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n"
@@ -1687,28 +1700,42 @@ msgstr ""
 "\n"
 "Sen KOMANDO, lanĉi�as '${SHELL} -i' (defaŭlte: '/bin/sh -i').\n"
 
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, c-format
 msgid "cannot change root directory to %s"
 msgstr "ne eblas �an�i radikan dosierujon al %s"
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, c-format
 msgid "cannot chdir to root directory"
 msgstr "ne eblas iri al radika dosierujo"
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr ""
+
+#: src/chroot.c:383
+#, fuzzy, c-format
+msgid "failed to get supplemental groups"
+msgstr "malsukcesis agordi la pluajn grupojn"
+
+#: src/chroot.c:395
+#, fuzzy, c-format
+msgid "failed to %s supplemental groups"
+msgstr "malsukcesis agordi la pluajn grupojn"
+
+#: src/chroot.c:402
 #, c-format
 msgid "failed to set group-ID"
 msgstr "malsukcesis agordi grupnumeron"
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, c-format
 msgid "failed to set user-ID"
 msgstr "malsukcesis agordi uzantnumeron"
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, c-format
 msgid "failed to run command %s"
 msgstr "malsukcesis ruli komandon %s"
@@ -1740,7 +1767,7 @@ msgstr ""
 "Montras la CRC-kontrolsumon kaj bajtnombrojn de ĉiu DOSIERO.\n"
 "\n"
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr "Uzmaniero:  %s [OPCIO...] DOSIERO1 DOSIERO2\n"
@@ -1829,294 +1856,327 @@ msgstr "pluraj limigiloj indikatas"
 msgid "empty %s not allowed"
 msgstr "vaka %s ne permesatas"
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr "eraro dum legado de %s"
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, c-format
 msgid "cannot lseek %s"
 msgstr "ne eblas 'lseek' sur %s"
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr "eraro dum skribado de %s"
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, c-format
 msgid "%s: failed to get extents info"
 msgstr "%s: malsukcesis eltrovi informon pri 'extents'"
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, c-format
 msgid "%s: write failed"
 msgstr "%s: malsukcesis skribo"
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, c-format
 msgid "failed to extend %s"
 msgstr "malsukcesis etendi %s"
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, c-format
 msgid "clearing permissions for %s"
 msgstr "vakigi�as permesoj pri %s"
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "malsukcesis konservi posedanton pri %s"
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
 msgstr "malsukcesis trovi dosieron %s"
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, c-format
 msgid "failed to preserve authorship for %s"
 msgstr "malsukcesis konservi aÅ­torecon pri %s"
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
+#, c-format
+msgid "failed to set default file creation context to %s"
+msgstr "malsukcesis agordi defaÅ­ltan dosierkrean kuntekston al %s"
+
+#: src/copy.c:820
+#, c-format
+msgid "failed to set default file creation context for %s"
+msgstr "malsukcesis agordi defaÅ­ltan dosierkrean kuntekston por %s"
+
+#: src/copy.c:846
+#, c-format
+msgid "failed to set the security context of %s"
+msgstr "malsukcesis agordi sekurecan kuntekston de %s"
+
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
 msgid "cannot open %s for reading"
 msgstr "ne eblas malfermi %s por legi"
 
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, c-format
 msgid "cannot fstat %s"
 msgstr "malsukcesis eltrovi statinformon pri malferma %s"
 
-#: src/copy.c:820
+#: src/copy.c:935
 #, c-format
 msgid "skipping file %s, as it was replaced while being copied"
 msgstr "ignoratas dosiero %s, ĉar �i estis substituata dum kopiado"
 
-#: src/copy.c:850
-#, c-format
-msgid "failed to get file system create context"
-msgstr "malsukcesis eltrovi dosiersisteman krean kuntekston"
-
-#: src/copy.c:864
-#, c-format
-msgid "failed to set the security context of %s to %s"
-msgstr "malsukcesis agordi sekurecan kuntekston de %s al %s"
-
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
 msgid "cannot remove %s"
 msgstr "ne eblas forigi %s"
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
 msgstr "forigi�is %s\n"
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr "ne skribi�os tra sencela simbola ligo %s"
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, c-format
 msgid "cannot create regular file %s"
 msgstr "ne eblas krei regulan dosieron %s"
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, c-format
 msgid "failed to clone %s from %s"
 msgstr "malsukcesis kloni %s el %s"
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr "konservi�as tempoj pri %s"
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
-#, fuzzy, c-format
+#, c-format
 msgid "failed to close %s"
 msgstr "malsukcesis malfermi %s"
 
-#: src/copy.c:1471
-#, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
+#: src/copy.c:1580
+#, fuzzy, c-format
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
 msgstr "%s: ĉu anstataŭigi %s, ignorante moduson %04lo (%s)? "
 
-#: src/copy.c:1478
+#: src/copy.c:1581
+#, c-format
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr ""
+
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
 msgstr "%s: ĉu anstataŭigi %s? "
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr " (savkopio: %s)"
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr "malsukcesis restaÅ­ri defaÅ­ltan dosierkrean kuntekston"
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, c-format
 msgid "cannot create hard link %s to %s"
 msgstr "ne eblas krei senperan ligon %s al %s"
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, c-format
 msgid "cannot stat %s"
 msgstr "malsukcesis eltrovi statinformon pri %s"
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, c-format
 msgid "omitting directory %s"
 msgstr "preterpasi�as dosierujo %s"
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr "averto: fontdosiero %s indikatas plurfoje"
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
 msgstr "%s kaj %s estas la sama dosiero"
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr "ne eblas anstataÅ­igi nedosierujon %s per dosierujo %s"
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr "ne anstataŭi�os ĵuskreita %s per %s"
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr "ne eblas anstataÅ­igi dosierujon %s per nedosierujo"
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr "ne eblas movi dosierujon al nedosierujo: %s -> %s"
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr "fari savkopion de %s detruus fontdosieron;  %s ne movi�is"
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr "fari savkopion de %s detruus fontdosieron;  %s ne kopii�is"
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
 msgstr "ne eblas krei savkopion de %s"
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr "ne kopii�os %s tra ĵuskreita simbola ligo %s"
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr "ne eblas kopii dosierujon %s al ene de si mem (%s)"
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr "ne krei�os senpera ligo %s al dosierujo %s"
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr "ne eblas movi %s al subdosiero de si mem (%s)"
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, c-format
 msgid "cannot move %s to %s"
 msgstr "ne eblas movi %s al %s"
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr "malsukcesis movo inter aparatoj: %s al %s;  ne eblas forigi celon"
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, c-format
-msgid "failed to set default file creation context to %s"
-msgstr "malsukcesis agordi defaÅ­ltan dosierkrean kuntekston al %s"
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr "ne eblas kopii ciklan simbolan ligon %s"
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr "%s: krei relativajn simbolajn ligojn eblas nur en aktuala dosierujo"
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr "ne eblas krei simbolan ligon %s al %s"
 
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, c-format
 msgid "cannot create fifo %s"
 msgstr "ne eblas krei vicmemoron %s"
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, c-format
 msgid "cannot create special file %s"
 msgstr "ne eblas krei specialan dosieron %s"
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, c-format
 msgid "cannot read symbolic link %s"
 msgstr "ne eblas legi simbolan ligon %s"
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, c-format
 msgid "cannot create symbolic link %s"
 msgstr "ne eblas krei simbolan ligon %s"
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
 msgstr "%s havas nekonatan dosiertipon"
 
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, c-format
 msgid "cannot un-backup %s"
 msgstr "ne eblas restaÅ­ri savkopion %s"
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr "%s -> %s (restaÅ­ro)\n"
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr ""
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr ""
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, fuzzy, c-format
+msgid "unknown program %s"
+msgstr "nekonata fluaĵo"
+
+#: src/cp.c:157 src/mv.c:288
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -2127,14 +2187,13 @@ msgstr ""
 "       aÅ­:  %s [OPCIO...] ORIGINO... DOSIERUJO\n"
 "       aÅ­:  %s [OPCIO...] -t DOSIERUJO ORIGINO...\n"
 
-#: src/cp.c:162
-#, fuzzy
+#: src/cp.c:163
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 "Kopias ORIGINOn al CELO, aÅ­ plurajn ORIGINOjn al DOSIERUJO.\n"
 "\n"
 
-#: src/cp.c:168
+#: src/cp.c:169
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
 "      --attributes-only        don't copy the file data, just the "
@@ -2150,16 +2209,14 @@ msgstr ""
 "  -a, --archive                egalas al «-dR --preserve=all»\n"
 "      --attributes-only        ne kopii la dosierdatumojn, nur la "
 "atributojn\n"
-"      --backup[=STIRO]         fari savkopion de ĉiu ekzistanta cela "
-"dosiero\n"
+"      --backup[=METODO]        fari savkopion de ĉiu ekzistanta celdosiero\n"
 "  -b                           kiel «--backup», sed ne akceptas argumenton\n"
 "      --copy-contents          kopii enhavon de specialaj dosieroj kiam "
 "rikure\n"
 "  -d                           egalas al «--no-dereference --"
 "preserve=links»\n"
 
-#: src/cp.c:177
-#, fuzzy
+#: src/cp.c:178
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
 "                                 opened, remove it and try again (this "
@@ -2173,14 +2230,14 @@ msgid ""
 msgstr ""
 "  -f, --force                  se ekzistanta celdosiero ne malfermeblas, "
 "forigi\n"
-"                                 �in kaj provi denove (nuli�as per opcio «-"
+"                                 �in kaj provi denove (ignori�as kun opcio «-"
 "n»)\n"
 "  -i, --interactive            averti antaÅ­ fari anstataÅ­igon\n"
 "                                 (transpasas antaŭan opcion «-n»)\n"
 "  -H                           sekvi komandliniajn simbolajn ligojn en "
 "ORIGINO\n"
 
-#: src/cp.c:186
+#: src/cp.c:187
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
 "  -L, --dereference            always follow symbolic links in SOURCE\n"
@@ -2188,7 +2245,7 @@ msgstr ""
 "  -l, --link                   senpere ligi dosierojn anstataÅ­ kopii ilin\n"
 "  -L, --dereference            ĉiam sekvi simbolajn ligojn en ORIGINO\n"
 
-#: src/cp.c:190
+#: src/cp.c:191
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
 "                                 a previous -i option)\n"
@@ -2198,7 +2255,7 @@ msgstr ""
 "                                 (transpasas antaŭan opcion «-i»)\n"
 "  -P, --no-dereference         neniam sekvi simbolajn ligojn en ORIGINO\n"
 
-#: src/cp.c:195
+#: src/cp.c:196
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
 "      --preserve[=ATTR_LIST]   preserve the specified attributes (default:\n"
@@ -2213,7 +2270,7 @@ msgstr ""
 "                                 (defaŭlte: «mode,ownership,timestamps»),\n"
 "                                 eblas ankaŭ: «context, links, xattr, all»\n"
 
-#: src/cp.c:203
+#: src/cp.c:204
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                use full source file name under DIRECTORY\n"
@@ -2222,7 +2279,7 @@ msgstr ""
 "      --parents                uzi plenan ORIGINOdosieran nomon sub "
 "DOSIERUJO\n"
 
-#: src/cp.c:207
+#: src/cp.c:208
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
 "      --reflink[=WHEN]         control clone/CoW copies. See below\n"
@@ -2236,7 +2293,7 @@ msgstr ""
 "                                 provi malfermi �in (kontraste kun «--"
 "force»)\n"
 
-#: src/cp.c:213
+#: src/cp.c:214
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
 "      --strip-trailing-slashes  remove any trailing slashes from each "
@@ -2248,7 +2305,7 @@ msgstr ""
 "      --strip-trailing-slashes forigi ajn vostajn suprenstrekojn de ĉiu "
 "ORIGINO\n"
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -2263,7 +2320,7 @@ msgstr ""
 "  -t, --target-directory=DOSIERUJO  kopii ĉiujn ORIGINOjn al DOSIERUJO\n"
 "  -T, --no-target-directory    trakti CELO kiel normala dosiero\n"
 
-#: src/cp.c:224
+#: src/cp.c:225
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
 "                                 than the destination file or when the\n"
@@ -2273,14 +2330,25 @@ msgid ""
 msgstr ""
 "  -u, --update                 kopii nur kiam la ORIGINO estas pli nova ol "
 "la\n"
-"                                 cela dosiero aÅ­ kiam la cela dosiero "
-"mankas\n"
+"                                 celdosiero aÅ­ kiam la celdosiero mankas\n"
 "  -v, --verbose                montri nomon de ĉiu dosiero antaŭ ol kopii "
 "�in\n"
 "  -x, --one-file-system        resti sur dosiersistemo sur kiu kopiado "
 "komencis\n"
 
-#: src/cp.c:233
+#: src/cp.c:232
+#, fuzzy
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+"  -Z, --context[=KUNTEKSTO]    agordi sekurecan kuntekston de celdosiero al\n"
+"                                 defaŭlta tipo, aŭ al KUNTEKSTO se �i "
+"indikatas\n"
+
+#: src/cp.c:240
 msgid ""
 "\n"
 "By default, sparse SOURCE files are detected by a crude heuristic and the\n"
@@ -2310,7 +2378,7 @@ msgstr ""
 "la\n"
 "kopio, aŭ (se «--reflink=aŭto» indikatas) normala kopio fari�as anstataŭe.\n"
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 msgid ""
 "\n"
 "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n"
@@ -2327,20 +2395,21 @@ msgstr ""
 "aŭ per ĉirkaŭaĵa variablo «VERSION_CONTROL».  Jen la eblaj metodoj:\n"
 "\n"
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
 "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
 "  simple, never   always make simple backups\n"
 msgstr ""
-"  none, off        neniam fari savkopiojn (eĉ se «--backup» indikatas)\n"
+"  none, off        neniam fari savkopiojn (eĉ se nuran «--backup» "
+"indikatas)\n"
 "  numbered, t      fari numeratajn savkopiojn\n"
 "  existing, nil    numeratajn se numeratajn savkopiojn ekzistas, alie "
 "simplajn\n"
 "  simple, never    ĉiam fari simplajn savkopiojn\n"
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2353,92 +2422,102 @@ msgstr ""
 "indikatas, kaj ORIGINO kaj CELO estas la sama nomo de ekzistanta normala "
 "dosiero.\n"
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, c-format
 msgid "failed to preserve times for %s"
 msgstr "malsukcesis konservi tempojn pri %s"
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, c-format
 msgid "failed to preserve permissions for %s"
 msgstr "malsukcesis konservi permesojn pri %s"
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, c-format
 msgid "cannot make directory %s"
 msgstr "ne eblas krei dosierujon %s"
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr "%s ekzistas sed ne estas dosierujo"
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
-#, fuzzy, c-format
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
+#, c-format
 msgid "failed to access %s"
-msgstr "malsukcesis malfermi %s"
+msgstr "malsukcesis atingi %s"
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, c-format
 msgid "missing file operand"
 msgstr "mankas dosiera argumento"
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, c-format
 msgid "missing destination file operand after %s"
 msgstr "mankas celdosiera argumento post %s"
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr ""
 "nekombineblas la opcioj '--target-directory' (-t) kaj '--no-target-"
 "directory' (-T)"
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, c-format
 msgid "target %s is not a directory"
 msgstr "cela %s ne estas dosierujo"
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr "kun opcio «--parents» la celo devas esti dosierujo"
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, c-format
 msgid "multiple target directories specified"
 msgstr "pluraj celaj dosierujoj indikatas"
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr "averto: ignori�as '--context' (-Z); �i bezonas kernon kun SELinux"
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr "ne eblas krei samtempe senperan kaj simbolan ligon"
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr "nekombineblas opcioj '--backup' kaj '--no-clobber'"
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr "eblas uzi opcion '--reflink' nur kune kun '--sparse=auto'"
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr "tipo de savkopio"
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, c-format
+msgid "cannot set target context and preserve it"
+msgstr "maleblas kaj agordi celkuntekston kaj reteni �in"
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr "ne eblas konservi sekurecan kuntekston sen SE-Linuksa kerno"
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr ""
@@ -2446,133 +2525,132 @@ msgstr ""
 "'xattr'"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr "StjuÅ­art KEMP (Stuart Kemp)"
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr "enigo malaperis"
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr "%s: lininumero estas ekster gamo"
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, c-format
 msgid "%s: %s: line number out of range"
 msgstr "%s: %s: lininumero estas ekster gamo"
 
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, c-format
 msgid " on repetition %s\n"
 msgstr " ĉe ripeto %s\n"
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, c-format
 msgid "%s: %s: match not found"
 msgstr "%s: %s: paron ne trovatas"
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr "eraro en regulesprima serĉo"
 
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, c-format
 msgid "write error for %s"
 msgstr "skrib-eraro por %s"
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, c-format
 msgid "%s: integer expected after delimiter"
 msgstr "%s: post disigilo atendi�as entjero"
 
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr "%s: '}' nepras en ripeta nombro"
 
 # La '}' endas, ĉar %s komencas per '{'.
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr "%s}: entjero nepras inter '{' kaj '}'"
 
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr "%s: mankas ferma disigilo '%c'"
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr "%s: nevalida regulesprimo: %s"
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr "%s: nevalida serĉa �ablono"
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr "%s: lininumero devas esti pli ol nulo"
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr "lininumero %s estas pli malgranda ol antaÅ­a lininumero %s"
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr "averto: lininumero %s egalas al ĵusantaŭa lininumero"
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr "mankas konvertindiko en sufikso"
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr "nevalida konvertindiko en sufikso: %c"
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr "nevalida konvertindiko en sufikso: \\%.3o"
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr "nevalidaj flagoj en konvertindiko:: %%%c%c"
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr "tro multaj konvertindikoj %% en sufikso"
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr "mankas konvertindiko %% en sufikso"
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr "%s: nevalida numero"
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
-msgstr "Uzmaniero:  %s [OPCIO...] DOSIERO SERĈŜABLONO...\n"
+msgstr "Uzmaniero:  %s [OPCIO...] DOSIERO ÅœABLONO...\n"
 
-#: src/csplit.c:1455
-#, fuzzy
+#: src/csplit.c:1483
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
 "and output byte counts of each piece to standard output.\n"
@@ -2581,7 +2659,7 @@ msgstr ""
 "'xx00', 'xx01', ...; kaj eligas la bajtnombron de ĉiu peco al ĉefeligujo.\n"
 "\n"
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2593,7 +2671,12 @@ msgstr ""
 "  -f, --prefix=PREFIKSO       uzi ĉi tiun PREFIKSOn anstataŭ 'xx'\n"
 "  -k, --keep-files            ne forigi eligajn dosierojn kiam eraro okazas\n"
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr ""
+"  -m, --suppress-matched     subpremi la liniojn kiuj kongruas kun ÅœABLONO\n"
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
@@ -2604,7 +2687,7 @@ msgstr ""
 "dosieroj\n"
 "  -z, --elide-empty-files     forigi vakajn eligajn dosierojn\n"
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
@@ -2612,7 +2695,7 @@ msgstr ""
 "\n"
 "Kiam DOSIERO estas «-», ĉefenigujo legi�as.  Ĉiu ŜABLONO povas esti:\n"
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 msgid ""
 "\n"
 "  INTEGER            copy up to but not including specified line number\n"
@@ -2637,23 +2720,18 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr "David IĤNAT (David M. Ihnat)"
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr "kampoj kaj pozicioj komencas ekde 1"
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr "Uzmaniero:  %s OPCIO... [DOSIERO...]\n"
 
-#: src/cut.c:193
-#, fuzzy
+#: src/cut.c:176
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr ""
 "Eligas al ĉefeligujo elektitajn partojn de linioj de ĉiu DOSIERO.\n"
 "\n"
 
-#: src/cut.c:199
+#: src/cut.c:182
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
 "  -c, --characters=LIST   select only these characters\n"
@@ -2663,7 +2741,7 @@ msgstr ""
 "  -c, --characters=LISTO  elekti nur ĉi tiujn signojn\n"
 "  -d, --delimiter=SIGNO   uzi SIGNOn anstataÅ­ TAB-on por kampdisigilo\n"
 
-#: src/cut.c:204
+#: src/cut.c:187
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
 "                            that contains no delimiter character, unless\n"
@@ -2676,7 +2754,7 @@ msgstr ""
 "                            krom se la opcio «-s» indikatas\n"
 "  -n                      (ignori�as)\n"
 
-#: src/cut.c:210
+#: src/cut.c:193
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
 "                            or fields\n"
@@ -2684,7 +2762,7 @@ msgstr ""
 "      --complement        komplementi la aron de elektitaj bajtoj, signoj,\n"
 "                            aÅ­ kampoj\n"
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
@@ -2694,7 +2772,7 @@ msgstr ""
 "      --output-delimter=ĈENO    uzi tiun ĉi ĈENOn kiel eligan disigilon;\n"
 "                                defaŭlte uzi�as la eniga disigilo\n"
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2706,7 +2784,7 @@ msgstr ""
 "unu gamo, aŭ multaj gamoj disigitaj per komoj.  Elektita enigo skribi�as\n"
 "en la sama ordo en kiu �i legi�as, kaj skribi�as ekzakte unufoje.\n"
 
-#: src/cut.c:227
+#: src/cut.c:210
 msgid ""
 "Each range is one of:\n"
 "\n"
@@ -2726,63 +2804,66 @@ msgstr ""
 "\n"
 "Sen DOSIERO, aŭ kiam DOSIERO estas «-», ĉefenigujo legi�as.\n"
 
-#: src/cut.c:367 src/cut.c:493
-#, fuzzy
+#: src/cut.c:300 src/cut.c:394
 msgid "invalid byte, character or field list"
-msgstr "nevalida listo de bajtoj aÅ­ kampoj"
+msgstr "nevalida listo de bajtoj, signoj, aÅ­ kampoj"
+
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr "kampoj kaj pozicioj komencas ekde 1"
 
 # La originalo malklaras, la traduko �ustas.
-#: src/cut.c:387
+#: src/cut.c:320
 msgid "invalid range with no endpoint: -"
 msgstr "nevalida gamo, sen finpunktoj: «-»"
 
-#: src/cut.c:403
+#: src/cut.c:334
 msgid "invalid decreasing range"
 msgstr "nevalida gamo, �i malkreskas"
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, c-format
 msgid "byte offset %s is too large"
 msgstr "bajtpozicio %s estas tro granda"
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, c-format
 msgid "field number %s is too large"
 msgstr "kampnumero %s estas tro granda"
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr "eblas indiki nur unu tipon de listo"
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr "la disigilo devas esti ununura signo"
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr "nepras indiki liston de bajtoj, signoj, aÅ­ kampoj"
 
-#: src/cut.c:850
+#: src/cut.c:790
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr "eblas indiki enigan disigilon nur kiam traktante kampojn"
 
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
 msgstr "subpremi liniojn sen disigilo eblas nur kiam traktante kampojn"
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr "mankas listo de kampoj"
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr "mankas listo de pozicioj"
 
 #: src/date.c:123
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [+FORMAT]\n"
 "  or:  %s [-u|--utc|--universal] [MMDDhhmm[[CC]YY][.ss]]\n"
@@ -2819,7 +2900,7 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 
 #: src/date.c:158
@@ -2951,10 +3032,10 @@ msgid ""
 "  $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n"
 msgstr ""
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr "ĉefenigujo"
@@ -2995,7 +3076,7 @@ msgstr ""
 msgid "cannot set date"
 msgstr "ne eblas agordi daton"
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, c-format
 msgid "time %s is out of range"
 msgstr "tempo %s estas ekster gamo"
@@ -3006,8 +3087,8 @@ msgstr "tempo %s estas ekster gamo"
 msgid "Paul Rubin"
 msgstr "PaÅ­l RUBIN (Paul Rubin)"
 
-#: src/dd.c:521
-#, c-format
+#: src/dd.c:527
+#, fuzzy, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
 "  or:  %s OPTION\n"
@@ -3015,7 +3096,7 @@ msgstr ""
 "Uzmaniero:  %s [ARGUMENTO...]\n"
 "       aÅ­:  %s OPCIO\n"
 
-#: src/dd.c:526
+#: src/dd.c:532
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
 "\n"
@@ -3026,7 +3107,7 @@ msgid ""
 "  ibs=BYTES       read up to BYTES bytes at a time (default: 512)\n"
 msgstr ""
 
-#: src/dd.c:535
+#: src/dd.c:541
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
 "  iflag=FLAGS     read as per the comma separated symbol list\n"
@@ -3039,7 +3120,7 @@ msgid ""
 "                  'noxfer' suppresses transfer stats, 'none' suppresses all\n"
 msgstr ""
 
-#: src/dd.c:546
+#: src/dd.c:552
 msgid ""
 "\n"
 "N and BYTES may be followed by the following multiplicative suffixes:\n"
@@ -3050,7 +3131,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dd.c:555
+#: src/dd.c:561
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
 "  ebcdic    from ASCII to EBCDIC\n"
@@ -3065,7 +3146,7 @@ msgid ""
 "            with block or unblock, pad with spaces rather than NULs\n"
 msgstr ""
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -3075,7 +3156,7 @@ msgid ""
 "  fsync     likewise, but also write metadata\n"
 msgstr ""
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -3084,75 +3165,75 @@ msgid ""
 "suggested)\n"
 msgstr ""
 
-#: src/dd.c:583
+#: src/dd.c:589
 msgid "  cio       use concurrent I/O for data\n"
 msgstr ""
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr ""
 
-#: src/dd.c:587
+#: src/dd.c:593
 msgid "  directory  fail unless a directory\n"
 msgstr ""
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr ""
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr ""
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr ""
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr ""
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr ""
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr ""
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr ""
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr ""
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr ""
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr ""
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr ""
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, c-format
 msgid ""
 "\n"
@@ -3169,7 +3250,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr "mankas sufiĉa memoro por eniga bufro de %zu bajtoj (%s)"
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr "mankas sufiĉa memoro por eliga bufro de %zu bajtoj (%s)"
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
@@ -3178,21 +3269,21 @@ msgstr ""
 "%<PRIuMAX>+%<PRIuMAX> rikordo eni�is\n"
 "%<PRIuMAX>+%<PRIuMAX> rikordoj eli�is\n"
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
 msgstr[0] "%<PRIuMAX> trunkita rikordo\n"
 msgstr[1] "%<PRIuMAX> trunkitaj rikordoj\n"
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
 msgstr[0] "%<PRIuMAX> bajto (%s) kopii�is"
 msgstr[1] "%<PRIuMAX> bajtoj (%s) kopii�is"
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr "senfino"
 
@@ -3206,155 +3297,145 @@ msgstr "senfino"
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
 msgstr ", %g s, %s/s\n"
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, c-format
 msgid "closing input file %s"
 msgstr "fermi�as eniga dosiero %s"
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr "fermi�as eliga dosiero %s"
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr "malsukcesis mal�alti O_DIRECT: %s"
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, c-format
 msgid "writing to %s"
 msgstr "skribi�as al %s"
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, c-format
 msgid "unrecognized operand %s"
 msgstr "ne rekonatas argumento %s"
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 msgid "invalid conversion"
 msgstr "nevalida konverto"
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 msgid "invalid input flag"
 msgstr "nevalida enigflago"
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 msgid "invalid output flag"
 msgstr "nevalida eligflago"
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 msgid "invalid status flag"
 msgstr "nevalida statflago"
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, c-format
 msgid "invalid number %s"
 msgstr "nevalida numero %s"
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr "ne eblas kombini iujn ajn el {ascii,ebcdic,ibm}"
 
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, c-format
 msgid "cannot combine block and unblock"
 msgstr "ne eblas kombini 'block' kaj 'unblock'"
 
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, c-format
 msgid "cannot combine lcase and ucase"
 msgstr "ne eblas kombini 'lcase' kaj 'ucase'"
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, c-format
 msgid "cannot combine excl and nocreat"
 msgstr "ne eblas kombini 'excl' kaj 'nocreat'"
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, c-format
 msgid "cannot combine direct and nocache"
 msgstr "ne eblas kombini 'direct' kaj 'nocache'"
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
 "  of mt_type=0x%0lx -- see <sys/mtio.h> for the list of types"
 msgstr ""
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, c-format
 msgid "%s: cannot skip"
 msgstr "%s: ne eblas transsalti"
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, c-format
 msgid "%s: cannot seek"
 msgstr "%s: 'seek' ne eblas"
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr "pozicio trograndi�is dum legado de dosiero %s"
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr "averto: nevalida dosiera pozicio post malsukcesa lego"
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr "tamen rezultas ke maleblas preterpasi kern-eraron"
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, c-format
 msgid "setting flags for %s"
 msgstr "agordi�as flagoj pri %s"
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr "mankas sufiĉa memoro por eniga bufro de %zu bajtoj (%s)"
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr "mankas sufiĉa memoro por eliga bufro de %zu bajtoj (%s)"
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr "%s: ne eblas salti al indikata pozicio"
 
-#: src/dd.c:2133
-#, fuzzy, c-format
+#: src/dd.c:2172
+#, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
-msgstr "malsukcesis trunki al %<PRIuMAX> bajtoj en eliga dosiero %s"
+msgstr "malsukcesis trunki al %<PRIdMAX> bajtoj en eliga dosiero %s"
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr "malsukcesis 'fdatasync' por %s"
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
 msgstr "malsukcesis 'fsync' por %s"
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, c-format
 msgid "failed to open %s"
 msgstr "malsukcesis malfermi %s"
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
@@ -3363,97 +3444,107 @@ msgstr ""
 "pozicio estas tro granda: ne eblas trunki al longeco de seek=%<PRIuMAX> (%lu-"
 "bajtaj) blokoj"
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr "malsukcesis trunki al %<PRIuMAX> bajtoj en eliga dosiero %s"
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, c-format
 msgid "failed to discard cache for: %s"
 msgstr "malsukcesis forĵeti ka�memoron por %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr "PaÅ­l EGERT (Paul Eggert)"
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr "Dosiersistemo"
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr "Tipo"
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr "blokoj"
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr "Uzata"
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr "Liberaj"
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr "Uza%"
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr "I-nodoj"
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr "I-uzata"
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr "I-lbr"
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr "Iuza%"
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr "Metita sur"
 
-#: src/df.c:383
+# SIGKILL       9       Term    Kill signal
+# Nek kaptebla nek ignorebla (malkiel ABORT)
+#: src/df.c:207
+msgid "File"
+msgstr "Dosiero"
+
+#: src/df.c:387
 #, c-format
-msgid "option --output: field '%s' unknown"
-msgstr ""
+msgid "option --output: field %s unknown"
+msgstr "je opcio «--output»: kampo %s nekonatas"
 
-#: src/df.c:390
-#, fuzzy, c-format
-msgid "option --output: field '%s' used more than once"
-msgstr "averto: fontdosiero %s indikatas plurfoje"
+#: src/df.c:394
+#, c-format
+msgid "option --output: field %s used more than once"
+msgstr "je opcio «--output»: kampo %s indikatas plurfoje"
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr "Grando"
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr "Liber"
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr "Kapacito"
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
 msgstr ""
 
-#: src/df.c:1210
-#, fuzzy
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr ""
+
+#: src/df.c:1384
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
 "or all file systems by default.\n"
@@ -3462,16 +3553,18 @@ msgstr ""
 "aŭ defaŭlte pri ĉiuj dosiersistemoj.\n"
 "\n"
 
-#: src/df.c:1217
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
+#, fuzzy
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
 "  -a, --all             inkluzivi virtualajn dosiersistemojn\n"
 "  -B, --block-size=NOMBRO  skali grandojn per NOMBRO antaÅ­ eligi ilin;\n"
@@ -3482,7 +3575,7 @@ msgstr ""
 "234M)\n"
 "  -H, --si              same, sed uzi potencojn de 1000 anstataÅ­ de 1024\n"
 
-#: src/df.c:1227
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -3494,11 +3587,10 @@ msgstr ""
 "blokuzado\n"
 "  -k                    kiel '--block-size=1K'\n"
 "  -l, --local           limigi listadon al lokaj dosiersistemoj\n"
-"      --no-sync         ne voki 'sync' antaÅ­ havigo de uzadinformo "
+"      --no-sync         ne voki 'sync' antaÅ­ kapti diskuzad-informojn "
 "(defaÅ­lto)\n"
 
-#: src/df.c:1234
-#, fuzzy
+#: src/df.c:1409
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
 "                               or print all fields if FIELD_LIST is "
@@ -3510,48 +3602,48 @@ msgid ""
 "  -x, --exclude-type=TYPE   limit listing to file systems not of type TYPE\n"
 "  -v                    (ignored)\n"
 msgstr ""
+"      --output[=KAMPLISTO]  uzi elig-aran�on difinita per KAMPLISTO,\n"
+"                              aŭ montri ĉiujn kampojn se KAMPLISTO mankas\n"
 "  -P, --portability     uzi la POSIX-an eligan aran�on\n"
-"      --sync            voki 'sync' antaÅ­ havigo de uzadinformo\n"
+"      --sync            voki 'sync' antaÅ­ kapti diskuzad-informojn\n"
 "  -t, --type=TIPO       nur listigi dosiersistemojn de ĉi tiu TIPO\n"
 "  -T, --print-type      eligi tipo de dosiersistemo\n"
 "  -x, --exclude-type=TIPO  ne listigi dosiersistemojn de ĉi tiu TIPO\n"
 "  -v                    (ignori�as)\n"
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
+"\n"
+"KAMPLISTO estas komodisigita listo de montrendaj kolumnoj.  Validaj "
+"kampnomoj\n"
+"estas: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent', 'size',\n"
+"'used', 'avail', 'pcent', 'file' kaj 'target' (vidu manlibron kun «info "
+"df»).\n"
 
-#: src/df.c:1285
-#, fuzzy, c-format
+#: src/df.c:1460
+#, c-format
 msgid "options %s and %s are mutually exclusive"
-msgstr "nekombineblas opcioj '--compare' (-C) kaj '--strip'"
+msgstr "nekombineblas opcioj '%s' kaj '%s'"
 
-#: src/df.c:1335
-msgid "warning: "
-msgstr "averto: "
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr ""
-
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr "dosiersistema tipo %s estas ambaÅ­ elektita kaj ekskluzivita"
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr "Averto: "
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 msgid "cannot read table of mounted file systems"
 msgstr "ne eblas legi tabelon de surmetitaj dosiersistemoj"
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr "neniu dosiersistemo pritraktatas"
@@ -3561,7 +3653,7 @@ msgstr "neniu dosiersistemo pritraktatas"
 msgid "H. Peter Anvin"
 msgstr "Piter ANVIN (H. Peter Anvin)"
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr "Uzmaniero:  %s [OPCIO...] [DOSIERO]\n"
@@ -3645,7 +3737,8 @@ msgstr ""
 "dosierujo).\n"
 
 #: src/dirname.c:59
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
+#, fuzzy
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
 msgstr "  -z, --zero      disigi eligon per nulbajtoj anstataÅ­ per novlinioj\n"
 
 #: src/dirname.c:64
@@ -3663,7 +3756,7 @@ msgstr ""
 "  %s ujo1/ĉeno ujo2/ĉeno    ->  «ujo1» kaj poste «ujo2»\n"
 "  %s stdio.h                ->  «.».\n"
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -3672,17 +3765,15 @@ msgstr ""
 "Uzmaniero:  %s [OPCIO...] [DOSIERO...]\n"
 "       aÅ­:  %s [OPCIO...] --files0-from=LISTDOSIERO\n"
 
-#: src/du.c:274
-#, fuzzy
+#: src/du.c:285
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr ""
 "Resumas uzon de disko por ĉiu indikata DOSIERO; rikure por dosierujoj.\n"
 "\n"
 
-#: src/du.c:280
+#: src/du.c:291
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3691,11 +3782,11 @@ msgid ""
 "                          fragmentation, indirect blocks, and the like\n"
 msgstr ""
 
-#: src/du.c:289
+#: src/du.c:300
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3707,24 +3798,23 @@ msgid ""
 "                          --summarize\n"
 msgstr ""
 
-#: src/du.c:302
+#: src/du.c:313
 #, fuzzy
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
 "      --files0-from=DOS  legi la enigon el la dosieroj kiuj indikatas en la\n"
 "                           dosiero DOS per NUL-finitaj nomoj; se DOS estas "
 "«-»,\n"
 "                           la nomoj legi�as el ĉefenigujo\n"
-"  -L, --max-line-length  montri la longon de la plej longa linio\n"
-"  -w, --words            montri la nombron de vortoj\n"
 
-#: src/du.c:310
+#: src/du.c:322
 msgid ""
 "  -k                    like --block-size=1K\n"
 "  -L, --dereference     dereference all symbolic links\n"
@@ -3732,16 +3822,17 @@ msgid ""
 "  -m                    like --block-size=1M\n"
 msgstr ""
 
-#: src/du.c:316
+#: src/du.c:328
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
 
-#: src/du.c:322
+#: src/du.c:334
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
 "                          or entries greater than SIZE if negative\n"
@@ -3750,77 +3841,78 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
 msgstr ""
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
 "  -x, --one-file-system    skip directories on different file systems\n"
 msgstr ""
 
-#: src/du.c:386
+#: src/du.c:398
 msgid "Infinity"
 msgstr "senfino"
 
-#: src/du.c:507
-#, fuzzy, c-format
-msgid "mount point %s already traversed"
-msgstr "muntloko %s jam trakti�is"
-
-#: src/du.c:624
+#: src/du.c:636
 #, c-format
 msgid "fts_read failed: %s"
 msgstr "malsukcesis 'fts_read()': %s"
 
-#: src/du.c:780
+#: src/du.c:787
 #, c-format
 msgid "invalid maximum depth %s"
 msgstr "nevalida maksimuma profundo %s"
 
-#: src/du.c:809
-#, fuzzy, c-format
+#: src/du.c:816
+#, c-format
 msgid "invalid --threshold argument '-0'"
-msgstr "nevalida argumento por opcio '--%s': %s"
+msgstr "nevalida argumento por opcio «--threshold»: '-0'"
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr "ne eblas ambaŭ resumi kaj montri ĉiujn elementojn"
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr "averto: resumi egalas al opcio «--max-depth=0»"
 
-#: src/du.c:900
+#: src/du.c:911
 #, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr "averto: resumi konfliktas kun opcio «--max-depth=%lu»"
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+"averto: opcioj '--apparent-size' kaj '-b' ne efikas kune kun '--inodes'"
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 msgid "file operands cannot be combined with --files0-from"
 msgstr "nekombineblas dosieraj argumentoj kun opcio «--files0-from»"
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr "%s: leg-eraro"
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr "kiam dosiernomoj legatas de ĉefenigujo, ne permesatas dosiernomo %s"
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 msgid "invalid zero-length file name"
 msgstr "nevalida dosiernomo (longo nulas)"
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr "totalo"
 
@@ -3927,19 +4019,19 @@ msgstr ""
 #: src/env.c:55
 msgid "Set each NAME to VALUE in the environment and run COMMAND.\n"
 msgstr ""
+"Agordas en la ĉirkaŭaĵo ĉiun NOMOn al VALORO kaj lanĉas KOMANDOn.\n"
+"\n"
 
 #: src/env.c:61
 #, fuzzy
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
-"Agordi en la ĉirkaŭaĵo ĉiun NOMOn al VALORO kaj lanĉi KOMANDOn.\n"
-"\n"
 "  -i, --ignore-environment  komenci kun vaka ĉirkaŭaĵo\n"
-"  -0, --null                disigi eligon per nulbajtoj anstataÅ­ per "
-"novlinioj\n"
+"  -0, --null                fini ĉiun linion per nulbajto anstataŭ per "
+"novlinio\n"
 "  -u, --unset=NOMO          forigi variablon de la ĉirkaŭaĵo\n"
 
 #: src/env.c:68
@@ -3966,7 +4058,6 @@ msgid "cannot specify --null (-0) with command"
 msgstr "ne eblas indiki opcio '--null' (-0) kune kun komando"
 
 #: src/expand.c:107
-#, fuzzy
 msgid ""
 "Convert tabs in each FILE to spaces, writing to standard output.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -4010,19 +4101,19 @@ msgstr "tabaj pozicioj devas kreski"
 #: src/expand.c:325 src/expand.c:344 src/unexpand.c:373 src/unexpand.c:418
 #, c-format
 msgid "input line is too long"
-msgstr "eniga linio estas tro longa"
+msgstr "eniga linio tro longas"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr "Majk PARKER (Mike Parker)"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr "Äœejmz JONGMAN (James Youngman)"
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
@@ -4031,7 +4122,7 @@ msgstr ""
 "Uzmaniero:  %s ESPRIMO\n"
 "       aÅ­:  %s OPCIO\n"
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -4051,7 +4142,7 @@ msgstr ""
 "\n"
 "  ARG1 & ARG2       ARG1 se nek ARG1 kaj ARG2 estas vaka aÅ­ nulo, alie nulo\n"
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -4069,7 +4160,7 @@ msgstr ""
 "  ARG1 >= ARG2      ARG1 estas pli ol aÅ­ egalas al ARG2\n"
 "  ARG1 > ARG2       ARG1 estas pli ol ARG2\n"
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
@@ -4079,7 +4170,7 @@ msgstr ""
 "  ARG1 + ARG2       aritmetika sumo de ARG1 kaj ARG2\n"
 "  ARG1 - ARG2       aritmetika diferenco de ARG1 kaj ARG2\n"
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -4092,7 +4183,7 @@ msgstr ""
 "  ARG1 / ARG2       aritmetika kvociento de ARG1 dividita per ARG2\n"
 "  ARG1 % ARG2       aritmetika resto de ARG1 dividita per ARG2\n"
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -4112,7 +4203,7 @@ msgstr ""
 "alie 0\n"
 "  length ĈENO                longo de ĈENO\n"
 
-#: src/expr.c:251
+#: src/expr.c:250
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
 "                               keyword like 'match' or an operator like '/'\n"
@@ -4125,7 +4216,7 @@ msgstr ""
 "\n"
 "  ( ESPRIMO )                valoro de ESPRIMO\n"
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -4142,7 +4233,7 @@ msgstr ""
 "malplenan ĉenon.  Se oni ne indikas \\( kaj \\), �ablona rekono liveras la\n"
 "nombron de kongruaj signoj, aÅ­ 0.\n"
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -4153,32 +4244,32 @@ msgstr ""
 "Elirstato estas 0 se ESPRIMO estas nek vaka nek nulo, 1 se ESPRIMO estas\n"
 "vaka aÅ­ nulo, 2 se ESPRIMO estas sintakse nevalida, kaj 3 se eraro okazis.\n"
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, c-format
 msgid "syntax error"
 msgstr "sintakseraro"
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, c-format
 msgid "error in regular expression matcher"
 msgstr "eraro en regulesprima serĉo"
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, c-format
 msgid "non-integer argument"
 msgstr "argumento estas ne-entjera"
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr "divido per nulo"
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr "Agordu LC_ALL='C' por eviti la problemon."
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, c-format
 msgid "the strings compared were %s and %s"
 msgstr "la komparitaj ĉenoj estis %s kaj %s"
@@ -4188,27 +4279,27 @@ msgstr "la komparitaj ĉenoj estis %s kaj %s"
 msgid "Niels Moller"
 msgstr "Nils MOLER (Niels Moller)"
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
-#, c-format
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
+#, fuzzy, c-format
 msgid "Lucas prime test failure.  This should not happen"
-msgstr ""
+msgstr "Malsukcesis ...  Ĉi tiu ne devus okazi."
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
 msgstr "troo en atendovico de «SQUFOF»"
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, c-format
 msgid "%s is not a valid positive integer"
 msgstr "%s ne estas valida pozitiva entjero"
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr "%s estas tro granda"
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
@@ -4217,7 +4308,7 @@ msgstr ""
 "Uzmaniero:  %s [ENTJERO...]\n"
 "       aÅ­:  %s OPCIO\n"
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
 "are specified on the command line, read them from standard input.\n"
@@ -4253,7 +4344,6 @@ msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n"
 msgstr "Uzmaniero:  %s [-LARÄœO] [OPCIO...] [DOSIERO...]\n"
 
 #: src/fmt.c:271
-#, fuzzy
 msgid ""
 "Reformat each paragraph in the FILE(s), writing to standard output.\n"
 "The option -WIDTH is an abbreviated form of --width=DIGITS.\n"
@@ -4306,7 +4396,6 @@ msgid "invalid width: %s"
 msgstr "nevalida lar�o: %s"
 
 #: src/fold.c:70
-#, fuzzy
 msgid ""
 "Wrap input lines in each FILE (standard input by default), writing to\n"
 "standard output.\n"
@@ -4330,17 +4419,17 @@ msgid "invalid number of columns: %s"
 msgstr "nevalida nombro da kolumnoj: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr "Padrejg BREJDI (Pádraig Brady)"
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, c-format
 msgid "Usage: %s\n"
 msgstr "Uzmaniero:  %s\n"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
@@ -4348,12 +4437,12 @@ msgstr ""
 "Eligas platformdependajn limojn en aran�o kiu utilas por �elskriptoj.\n"
 "\n"
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, c-format
 msgid "failed to get groups for user %s"
 msgstr "malsukcesis eltrovi grupojn por uzanto %s"
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, c-format
 msgid "failed to get groups for the current process"
 msgstr "malsukcesis eltrovi grupojn por aktuala procezo"
@@ -4378,28 +4467,27 @@ msgstr ""
 "por\n"
 "la aktuala procezo.  (Tiuj povas malsami se la grupa datumbazo �an�i�is.)\n"
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, c-format
 msgid "cannot get real UID"
 msgstr "malsukcesis eltrovi realan UID-on"
 
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, c-format
 msgid "cannot get effective GID"
 msgstr "malsukcesis eltrovi efektivan GID-on"
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, c-format
 msgid "cannot get real GID"
 msgstr "malsukcesis eltrovi realan GID-on"
 
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, c-format
 msgid "%s: no such user"
 msgstr "%s: tiu uzanto ne ekzistas"
 
 #: src/head.c:109
-#, fuzzy
 msgid ""
 "Print the first 10 lines of each FILE to standard output.\n"
 "With more than one FILE, precede each with a header giving the file name.\n"
@@ -4448,58 +4536,48 @@ msgstr ""
 "b = 512, kB = 1000, K = 1024, MB = 1000*1000, M = 1024*1024,\n"
 "GB = 1000*1000*1000, G = 1024*1024*1024, ktp por T, P, E, Z, Y.\n"
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr "%s: dosiero �rumpis troe"
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, c-format
 msgid "%s: number of bytes is too large"
 msgstr "%s: nombro de bajtoj tro grandas"
 
-#: src/head.c:440
-#, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr "%s: ne eblas fari 'lseek' reen al unua pozicio"
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr "%s: ne eblas fari 'seek' al pozicio %s"
 
-#: src/head.c:673
+#: src/head.c:423 src/tail.c:457
 #, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "%s: malsukcesis reagordi dosierpozician indikilon"
-
-#: src/head.c:798
-#, c-format
-msgid "cannot reposition file pointer for %s"
-msgstr "ne eblas �an�i dosierpozician indikilon pri %s"
+msgid "%s: cannot seek to relative offset %s"
+msgstr "%s: ne eblas fari 'seek' al relativa pozicio %s"
 
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr "%s: %s estas tiel granda ke �i ne prezenti�eblas"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr "nombro da linioj"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr "nombro da bajtoj"
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr "nevalida nombro da linioj"
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr "nevalida nombro da bajtoj"
 
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, c-format
 msgid "invalid trailing option -- %c"
 msgstr "nevalida opcio je la fino -- %c"
@@ -4546,31 +4624,39 @@ msgid "cannot determine hostname"
 msgstr "ne eblas eltrovi la retnomon"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr "Arnold ROBINS (Arnold Robbins)"
 
-#: src/id.c:81
+#: src/id.c:84
 #, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
-msgstr "Uzmaniero:  %s [OPCIO...] [UZANTNOMO]\n"
+msgid "Usage: %s [OPTION]... [USER]\n"
+msgstr "Uzmaniero:  %s [OPCIO...] [UZANTO]\n"
 
-#: src/id.c:82
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
 msgstr ""
 "Montras uzantan kaj grupan informon por la indikata UZANTNOMO,\n"
-"aÅ­ (kiam UZANTNOMO preterlasatas) por la aktuala uzanto.\n"
+"aÅ­ (kiam UZANTNOMO ne indikatas) por la aktuala uzanto.\n"
 "\n"
+
+# XXX 0 byte anstataÅ­ NUL char
+#: src/id.c:90
+#, fuzzy
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
+msgstr ""
 "  -a              ignori�as (rekoni�as nur por kongrui kun aliaj versioj)\n"
 "  -Z, --context   eligi nur la sekurecan kuntekston de la aktuala uzanto\n"
 "  -g, --group     eligi nur la efektivan grupan ID-on\n"
@@ -4579,8 +4665,10 @@ msgstr ""
 "  -r, --real      eligi la veran ID anstataÅ­ la efektivan ID-on (kun '-"
 "ugG')\n"
 "  -u, --user      eligi nur la efektivan uzantan ID-on\n"
+"  -z, --zero      disigi erojn per nulbajto anstataÅ­ per blankspaco;\n"
+"                    opcio ne permasatas en defaŭlta aran�o\n"
 
-#: src/id.c:96
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
@@ -4588,116 +4676,126 @@ msgstr ""
 "\n"
 "Sen iu ajn OPCIO, eligi iun utilan aron de uzanta kaj grupa informo.\n"
 
-#: src/id.c:140
+#: src/id.c:151
+#, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr "opcio '--context' (-Z) nur funkcias kun SELinuksa aÅ­ SMACKa kerno"
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
-msgstr "opcio '--context' (-Z) nur funkcias kun SE-Linuksa kerno"
+msgstr "opcio '--context' (-Z) nur funkcias kun SELinuksa kerno"
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr "maleblas eligi sekurecan kuntekston kiam uzanto indikatas"
 
-#: src/id.c:178
+#: src/id.c:198
 #, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr "maleblas eligi ion kun pliaj \"nuraj\" opcioj"
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr "maleblas eligi nur nomojn aŭ realajn numerojn en la defaŭlta aran�o"
 
-#: src/id.c:199
+#: src/id.c:209
+#, c-format
+msgid "option --zero not permitted in default format"
+msgstr "opcio «--zero» ne permesatas en la defaŭlta aran�o"
+
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
 msgstr "ne eblas eltrovi kuntekston de procezo"
 
-#: src/id.c:224
+#: src/id.c:265
 #, c-format
 msgid "cannot get effective UID"
 msgstr "malsukcesis eltrovi efektivan UID-on"
 
-#: src/id.c:311
+#: src/id.c:354
 #, c-format
 msgid "cannot find name for user ID %s"
 msgstr "ne eblas eltrovi nomon por uzantnumero %s"
 
-#: src/id.c:329
+#: src/id.c:372
 #, c-format
 msgid "uid=%s"
 msgstr "UID=%s"
 
-#: src/id.c:334
+#: src/id.c:377
 #, c-format
 msgid " gid=%s"
 msgstr " GID=%s"
 
-#: src/id.c:341
+#: src/id.c:384
 #, c-format
 msgid " euid=%s"
 msgstr " EUID=%s"
 
-#: src/id.c:349
+#: src/id.c:392
 #, c-format
 msgid " egid=%s"
 msgstr " EGID=%s"
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr " grupoj="
 
-#: src/id.c:393
+#: src/id.c:437
 #, c-format
 msgid " context=%s"
 msgstr " kunteksto=%s"
 
-#: src/install.c:373
+#: src/install.c:376
 #, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr "averto: %s: malsukcesis �an�i kuntekston al %s"
 
-#: src/install.c:414
+#: src/install.c:417
 #, c-format
 msgid "creating directory %s"
 msgstr "krei�as dosierujo %s"
 
-#: src/install.c:482
+#: src/install.c:485
 #, c-format
 msgid "cannot change ownership of %s"
 msgstr "ne eblas �an�i posedanton de %s"
 
-#: src/install.c:506
+#: src/install.c:509
 #, c-format
 msgid "cannot set time stamps for %s"
 msgstr "ne eblas agordi tempojn pri %s"
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, c-format
 msgid "fork system call failed"
 msgstr "ne eblas krei novan procezon"
 
-#: src/install.c:531
+#: src/install.c:535
 #, c-format
 msgid "cannot run %s"
 msgstr "ne eblas ruli %s"
 
-#: src/install.c:535
+#: src/install.c:539
 #, c-format
 msgid "waiting for strip"
 msgstr "atendi�as fino de 'strip'"
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr "procezo 'strip' fini�is nenormale"
 
-#: src/install.c:558
+#: src/install.c:565
 #, c-format
 msgid "invalid user %s"
 msgstr "nevalida uzanto: %s"
 
-#: src/install.c:594
+#: src/install.c:601
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -4710,7 +4808,7 @@ msgstr ""
 "       aÅ­:  %s [OPCIO...] -t DOSIERUJO ORIGINO...\n"
 "       aÅ­:  %s [OPCIO...] -d DOSIERUJO...\n"
 
-#: src/install.c:601
+#: src/install.c:608
 msgid ""
 "\n"
 "This install program copies files (often just compiled) into destination\n"
@@ -4723,8 +4821,20 @@ msgid ""
 "the existing DIRECTORY, while setting permission modes and owner/group.\n"
 "In the 4th form, create all components of the given DIRECTORY(ies).\n"
 msgstr ""
+"\n"
+"Ĉi tiu instalprogramo kopias dosierojn (ofte ĵuse kompilitaj) en celajn\n"
+"lokojn kiujn vi elektas.  Se vi volas el�uti kaj instali uzpretan pakon\n"
+"sur GNU/Linuksa sistemo, vi devus uzi anstataŭe pakaĵmastrumilon kiel\n"
+"yum(1) aÅ­ apt-get(1).\n"
+"\n"
+"En la tri unuaj aran�oj, �i kopias ORIGINOn al CELO, aŭ (pluraj) "
+"ORIGINO(j)n\n"
+"al ekzistanta DOSIERUJO, kaj starigas la permesojn kaj posedanton/grupon.\n"
+"En la kvara aran�o, �i kreas ĉiujn elementojn de la indikata(j) "
+"DOSIERUJO(j).\n"
+"\n"
 
-#: src/install.c:615
+#: src/install.c:622
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
 "  -b                  like --backup but does not accept an argument\n"
@@ -4735,8 +4845,15 @@ msgid ""
 "  -d, --directory     treat all arguments as directory names; create all\n"
 "                        components of the specified directories\n"
 msgstr ""
+"      --backup[=METODO]  fari savkopion de ĉiu ekzistanta celdosiero\n"
+"  -b                  kiel «--backup», sed ne akceptas argumenton\n"
+"  -c                  (ignori�as)\n"
+"  -C, --compare       kompari ĉiun duopon de origina kaj cela dosieroj,\n"
+"                        kaj en kelkaj kazoj ne modifi la celon iel ajn\n"
+"  -d, --directory     trakti ĉiujn argumentojn kiel dosierujnomojn; krei\n"
+"                        ĉiujn elementojn de la indikataj dosierujoj\n"
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -4747,8 +4864,17 @@ msgid ""
 "x\n"
 "  -o, --owner=OWNER   set ownership (super-user only)\n"
 msgstr ""
+"  -D                  krei ĉiujn komencajn elementojn de CELO krom la "
+"lastan,\n"
+"                        kaj poste kopii ORIGINOn al CELO\n"
+"  -g, --group=GRUPO   starigi grupan anecon, anstataÅ­ grupo de aktuala "
+"procezo\n"
+"  -m, --mode=MODUSO   starigi permesojn (kiel en 'chmod') anstataŭ «rwxr-xr-"
+"x»\n"
+"  -o, --owner=UZANTO  starigi dosierposedanton (uzeblas nur per "
+"sistemestro)\n"
 
-#: src/install.c:631
+#: src/install.c:638
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
 "files\n"
@@ -4761,62 +4887,75 @@ msgid ""
 "  -T, --no-target-directory  treat DEST as a normal file\n"
 "  -v, --verbose       print the name of each directory as it is created\n"
 msgstr ""
+"  -p, --preserve-timestamps  apliki la atingajn/modifajn tempojn de "
+"ORIGINOj\n"
+"                               al la korespondaj celdosieroj\n"
+"  -s, --strip                forigi el programoj la tabelojn de simboloj\n"
+"      --strip-program=PROGRAMO      uzenda programo por forigi "
+"simboltabelojn\n"
+"  -S, --suffix=SUFIKSO              uzenda savkopia sufikso\n"
+"  -t, --target-directory=DOSIERUJO  kopii ĉiujn ORIGINOjn al DOSIERUJO\n"
+"  -T, --no-target-directory         trakti CELOn kiel normalan dosieron\n"
+"  -v, --verbose              eligi la nomon de ĉiu dosierujo kiam �i "
+"krei�as\n"
 
-#: src/install.c:641
+#: src/install.c:648
+#, fuzzy
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
+"      --preserve-context     konservi SELinuksan sekurecan kuntekston\n"
+"  -Z, --context[=KUNTEKSTO]  agordi sekurecan kuntekston de celdosiero al\n"
+"                               defaŭlta tipo, aŭ al KUNTEKSTO se �i "
+"indikatas\n"
+
+#: src/install.c:696 src/unlink.c:86
+#, c-format
+msgid "cannot unlink %s"
+msgstr "malsukcesis forigi %s"
 
-#: src/install.c:859
+#: src/install.c:877
 #, c-format
 msgid ""
 "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
 msgstr ""
 "AVERTO: ignori�as '--preserve-context'; tiu ĉi kerno ne subtenas SELinux"
 
-#: src/install.c:869
-#, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
-msgstr "AVERTO: ignori�as '--context' (-Z); tiu ĉi kerno ne subtenas SELinux"
-
-#: src/install.c:886
+#: src/install.c:917
 #, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr "opcio '--strip' malpermesatas dum instalado al dosierujo"
 
-#: src/install.c:889
+#: src/install.c:920
 #, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr "celdosierujo malpermesatas dum instalado al dosierujo"
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr "maleblas ambaŭ agordi celkuntekston al %s kaj reteni �in"
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, c-format
 msgid "invalid mode %s"
 msgstr "nevalida moduso %s"
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr "AVERTO: ignori�as '--strip-program' ĉar opcio '-s' ne indikatas"
 
-#: src/install.c:959
+#: src/install.c:1001
 #, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr "nekombineblas opcioj '--compare' (-C) kaj '--preserve-timestamps'"
 
-#: src/install.c:966
+#: src/install.c:1008
 #, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr "nekombineblas opcioj '--compare' (-C) kaj '--strip'"
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -4830,7 +4969,7 @@ msgstr ""
 msgid "Mike Haertel"
 msgstr "Majk HERTEL (Mike Haertel)"
 
-#: src/join.c:191
+#: src/join.c:195
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
 "standard output.  The default join field is the first, delimited\n"
@@ -4840,16 +4979,30 @@ msgid ""
 "                      FILENUM is 1 or 2, corresponding to FILE1 or FILE2\n"
 "  -e EMPTY          replace missing input fields with EMPTY\n"
 msgstr ""
+"  \n"
+"Skribas linion al ĉefeligujo por ĉiu duopo de eniglinioj kiu havas identajn\n"
+"kuni�kampojn.  Defaŭlta kuni�kampo estas la unua, disigite per blankspaco.\n"
+"Kiam DOSIERO1 aŭ DOSIERO2 (sed ne ambaŭ) estas «-», ĉefenigujo legi�as.\n"
+"\n"
+"  -a NUMERO          ankaÅ­ eligi nepareblajn liniojn de dosiero NUMERO; "
+"NUMERO\n"
+"                       estas 1 aÅ­ 2, kiuj korespondas al DOSIERO1 kaj "
+"DOSIERO2\n"
+"  -e SIGNOĈENO       anstataŭigi mankantajn enigajn kampojn per SIGNOĈENO\n"
 
-#: src/join.c:200
+#: src/join.c:204
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
 "  -j FIELD          equivalent to '-1 FIELD -2 FIELD'\n"
 "  -o FORMAT         obey FORMAT while constructing output line\n"
 "  -t CHAR           use CHAR as input and output field separator\n"
 msgstr ""
+"  -i, --ignore-case  ignori malsamecojn en uskleco dum komparo de kampoj\n"
+"  -j KAMPO           egalas al '-1 KAMPO -2 KAMPO'\n"
+"  -o ARANÄœO          obei ARANÄœOn dum konstruo de eliglinio\n"
+"  -t SIGNO           uzi SIGNOn kiel eniga kaj eliga kampdisigilo\n"
 
-#: src/join.c:206
+#: src/join.c:210
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
 "  -1 FIELD          join on this FIELD of file 1\n"
@@ -4860,8 +5013,23 @@ msgid ""
 "  --header          treat the first line in each file as field headers,\n"
 "                      print them without trying to pair them\n"
 msgstr ""
+"  -v NUMERO          kiel '-a NUMERO' sed forlasi la kunigitajn eligliniojn\n"
+"  -1 KAMPO           kunigi je ĉi tiu KAMPO (positiva entjero) de dosiero 1\n"
+"  -2 KAMPO           kunigi je ĉi tiu KAMPO (positiva entjero) de dosiero 2\n"
+"  --check-order      kontroli ke la enigo estas �uste ordigita,\n"
+"                       eĉ se ĉiuj eniglinioj estas pareblaj\n"
+"  --nocheck-order    ne kontroli ke la enigo estas �uste ordigita\n"
+"  --header           trakti la unuan linion en ĉiu dosiero kiel kampĉapojn,\n"
+"                       kaj eligi ilin sen provi ilin parigi\n"
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+#, fuzzy
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr ""
+"  -z, --zero-terminated     disigi eligon per nulbajtoj anstataÅ­ per "
+"novlinioj\n"
+
+#: src/join.c:225
 msgid ""
 "\n"
 "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n"
@@ -4879,48 +5047,70 @@ msgid ""
 "If the input is not sorted and some lines cannot be joined, a\n"
 "warning message will be given.\n"
 msgstr ""
+"\n"
+"Krom se '-t SIGNO' indikatas, komencaj spacetoj disigas kampojn kaj "
+"ignori�as,\n"
+"alie kampoj disigi�as per SIGNO.  Ĉiu KAMPO estas numero de kampo, kiu "
+"komencas\n"
+"nombri ekde 1.  ARANÄœO estas unu aÅ­ pluraj kome aÅ­ spacete disigitaj "
+"indikoj,\n"
+"ĉiu de formo 'DOSIERNUMERO.KAMPO' aŭ '0'.  La defaŭlta ARANĜO eligas la "
+"kunigan\n"
+"kampon, la restantajn kampojn de DOSIERO1, la restantajn kampojn de "
+"DOSIERO2,\n"
+"kaj ĉiuj disigi�as per SIGNO.  Se ARANĜO estas la �losilvorto 'auto', la "
+"unua\n"
+"linio de ĉiu dosiero determinas la nombron de kampoj kiuj eligas por ĉiu "
+"linio.\n"
+"\n"
+"Gravas: DOSIERO1 kaj DOSIERO2 devas esti ordigitaj je la kunigaj kampoj.\n"
+"Ekzemple: uzu «sort -k 1b,1» se 'join' uzi�as sen opcioj,\n"
+"aŭ uzu «join -t ''» se 'sort' uzi�is sen iu ajn opcio.\n"
+"Notu ke komparoj honoras la regulojn indikatajn de 'LC_COLLATE'.\n"
+"Se la enigo ne estas ordigita kaj kelkaj linioj ne povas esti kunigitaj,\n"
+"averta mesa�o montri�os.\n"
 
-#: src/join.c:403
-#, fuzzy, c-format
+#: src/join.c:410
+#, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
-msgstr "%s:%ju: ne estas ordigita: %.*s"
+msgstr "%s:%<PRIuMAX>: ne estas ordigita: %.*s"
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, c-format
 msgid "invalid field number: %s"
 msgstr "nevalida kampnumero: %s"
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, c-format
 msgid "invalid field specifier: %s"
 msgstr "nevalida kampindiko: %s"
 
-#: src/join.c:877
+#: src/join.c:884
 #, c-format
 msgid "invalid file number in field spec: %s"
 msgstr "nevalida dosiernumero en kampindiko: %s"
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr "nekongruaj kunigkampoj %lu, %lu"
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr "konfliktas la anstataŭigaj ĉenoj por vakaj kampoj"
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, c-format
 msgid "multi-character tab %s"
 msgstr "plursigna tabo %s"
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr "nekongruaj taboj"
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr "ne ambaŭ dosieroj povas esti ĉefenigujo"
@@ -4937,7 +5127,6 @@ msgstr ""
 "       aÅ­:  %s -t [SIGNALO...]\n"
 
 #: src/kill.c:82
-#, fuzzy
 msgid "Send signals to processes, or list signals.\n"
 msgstr ""
 "Sendas signalojn al procezoj, aÅ­ eligas signalnomojn kaj -numerojn.\n"
@@ -5039,47 +5228,47 @@ msgstr "Kreas ligon de nomo DOSIERO2 al ekzistanta DOSIERO1.\n"
 msgid "cannot create link %s to %s"
 msgstr "ne eblas krei ligon %s al %s"
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr "%s: senpera ligo malpermesatas por dosierujo"
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, c-format
 msgid "%s: cannot overwrite directory"
 msgstr "%s: ne eblas anstataÅ­igi dosierujon"
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
 msgstr "%s: ĉu anstataŭigi %s? "
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, c-format
 msgid "failed to create symbolic link %s"
 msgstr "malsukcesis krei simbolan ligon %s"
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr "malsukcesis krei simbolan ligon %s al %s"
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr "malsukcesis krei senperan ligon al %.0s%s"
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, c-format
 msgid "failed to create hard link %s"
 msgstr "malsukcesis krei senperan ligon %s"
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, c-format
 msgid "failed to create hard link %s => %s"
 msgstr "malsukcesis krei senperan ligon %s al %s"
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -5088,7 +5277,7 @@ msgid ""
 "  or:  %s [OPTION]... -t DIRECTORY TARGET...  (4th form)\n"
 msgstr ""
 
-#: src/ln.c:381
+#: src/ln.c:398
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
 "In the 2nd form, create a link to TARGET in the current directory.\n"
@@ -5100,7 +5289,7 @@ msgid ""
 "interpreted in relation to its parent directory.\n"
 msgstr ""
 
-#: src/ln.c:394
+#: src/ln.c:411
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
 "file\n"
@@ -5112,8 +5301,16 @@ msgid ""
 "superuser)\n"
 "  -f, --force                 remove existing destination files\n"
 msgstr ""
+"      --backup[=METODO]       fari savkopion de ĉiu ekzistanta celdosiero\n"
+"  -b                          kiel «--backup», sed ne akceptas argumenton\n"
+"  -d, -F, --directory         permesi al ĉefuzanto provi krei rektajn ligojn "
+"al\n"
+"                                dosierujoj (rimarko: probable malsukcesos "
+"pro\n"
+"                                sistemaj limoj, eĉ por la ĉefuzanto)\n"
+"  -f, --force                 forigi ekzistantajn celdosierojn\n"
 
-#: src/ln.c:402
+#: src/ln.c:419
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
 "  -L, --logical               dereference TARGETs that are symbolic links\n"
@@ -5125,7 +5322,7 @@ msgid ""
 "  -s, --symbolic              make symbolic links instead of hard links\n"
 msgstr ""
 
-#: src/ln.c:411
+#: src/ln.c:428
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
 "  -t, --target-directory=DIRECTORY  specify the DIRECTORY in which to "
@@ -5135,25 +5332,26 @@ msgid ""
 "  -v, --verbose               print name of each linked file\n"
 msgstr ""
 
-#: src/ln.c:433
-#, fuzzy, c-format
+#: src/ln.c:450
+#, c-format
 msgid ""
 "\n"
 "Using -s ignores -L and -P.  Otherwise, the last option specified controls\n"
 "behavior when a TARGET is a symbolic link, defaulting to %s.\n"
 msgstr ""
+"\n"
 "Uzo de opcio '-s' ignoras '-L' kaj '-P'.  Alie, la laste indikata opcio\n"
 "difinas la konduton kiam iu CELO estas simbola ligo -- defaÅ­lte %s.\n"
 "\n"
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr ""
 "nekombineblas la opcioj '--target-directory' (-t) kaj '--no-target-"
 "directory' (-T)"
 
-#: src/ln.c:588
+#: src/ln.c:605
 #, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr "maleblas '--relative' sen '--symbolic'"
@@ -5186,7 +5384,7 @@ msgstr "neniu ensaluta nomo"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
@@ -5195,95 +5393,94 @@ msgstr "%b %e  %Y"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 msgid "%b %e %H:%M"
 msgstr "%b %e %H:%M"
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr "ignori�as nevalida valoro (%s) de ĉirkaŭaĵa variablo QUOTING_STYLE"
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr "ignori�as nevalida lar�o (%s) en ĉirkaŭaĵa variablo COLUMNS"
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr "ignori�as nevalida grando de tabo (%s) en ĉirkaŭaĵa variablo TABSIZE"
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, c-format
 msgid "invalid line width: %s"
 msgstr "nevalida linia lar�o: %s"
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, c-format
 msgid "invalid tab size: %s"
 msgstr "nevalida taba grando: %s"
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, c-format
 msgid "invalid time style format %s"
 msgstr "nevalida temparan�o: %s"
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 msgid "Valid arguments are:\n"
 msgstr "Validaj argumentoj estas:\n"
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr ""
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr "eraro dum estigo de monataj signoĉenoj"
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, c-format
 msgid "unrecognized prefix: %s"
 msgstr "nerekonata prefikso: %s"
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr "valoro de ĉirkaŭaĵa variablo LS_COLORS ne analizeblas "
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, c-format
 msgid "cannot open directory %s"
 msgstr "ne eblas malfermi dosierujon %s"
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, c-format
 msgid "cannot determine device and inode of %s"
 msgstr "ne eblas eltrovi aparaton kaj indeksnodon de %s"
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, c-format
 msgid "%s: not listing already-listed directory"
 msgstr "%s: ne listi�as jam listita dosierujo"
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, c-format
 msgid "reading directory %s"
 msgstr "legi�as dosierujo %s"
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, c-format
 msgid "closing directory %s"
 msgstr "fermi�as dosierujo %s"
 
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, c-format
 msgid "cannot compare file names %s and %s"
 msgstr "ne eblas kompari dosiernomojn %s kaj %s"
 
-#: src/ls.c:4721
-#, fuzzy
+#: src/ls.c:4781
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
 "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n"
@@ -5292,7 +5489,7 @@ msgstr ""
 "Alfabetigas la termojn se neniu de '-cftuvSUX' nek '--sort' indikatas.\n"
 "\n"
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
 "  -A, --almost-all           do not list implied . and ..\n"
@@ -5301,33 +5498,32 @@ msgid ""
 "characters\n"
 msgstr ""
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
 "  -F, --classify             append indicator (one of */=>@|) to entries\n"
@@ -5337,40 +5533,41 @@ msgid ""
 "      --full-time            like -l --time-style=full-iso\n"
 msgstr ""
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr ""
 
-#: src/ls.c:4763
+#: src/ls.c:4823
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 
-#: src/ls.c:4769
+#: src/ls.c:4829
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
 
-#: src/ls.c:4775
+#: src/ls.c:4835
 msgid ""
 "  -H, --dereference-command-line\n"
 "                             follow symbolic links listed on the command "
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
 msgstr ""
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
 "names:\n"
@@ -5379,10 +5576,10 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -5392,7 +5589,7 @@ msgid ""
 "entries\n"
 msgstr ""
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -5403,11 +5600,11 @@ msgid ""
 "                             append / indicator to directories\n"
 msgstr ""
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -5415,7 +5612,7 @@ msgid ""
 "escape\n"
 msgstr ""
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
 "  -R, --recursive            list subdirectories recursively\n"
@@ -5423,56 +5620,59 @@ msgid ""
 "blocks\n"
 msgstr ""
 
-#: src/ls.c:4825
+#: src/ls.c:4886
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 
-#: src/ls.c:4835
+#: src/ls.c:4896
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
 msgstr ""
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 msgid ""
 "  -t                         sort by modification time, newest first\n"
 "  -T, --tabsize=COLS         assume tab stops at each COLS instead of 8\n"
 msgstr ""
 
-#: src/ls.c:4848
+#: src/ls.c:4912
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
 msgstr ""
 
-#: src/ls.c:4855
+#: src/ls.c:4919
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -5481,7 +5681,7 @@ msgid ""
 "variable can change the settings.  Use the dircolors command to set it.\n"
 msgstr ""
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -5516,6 +5716,7 @@ msgstr ""
 "Uzmaniero:  %s [OPCIO...] [DOSIERO...]\n"
 "\n"
 "Montras aÅ­ kontrolas %s-kontrolsumojn (%d-bitajn).\n"
+"\n"
 "Sen DOSIERO, aŭ kiam DOSIERO estas «-», ĉefenigujo legi�as.\n"
 "\n"
 
@@ -5540,7 +5741,7 @@ msgstr ""
 
 #: src/md5sum.c:184
 msgid "      --tag            create a BSD-style checksum\n"
-msgstr ""
+msgstr "      --tag            krei kontrolsumon en BSD-stilo\n"
 
 #: src/md5sum.c:188
 msgid ""
@@ -5556,27 +5757,24 @@ msgstr "  -t, --text           legi en teksta moduso (defaÅ­lte)\n"
 #: src/md5sum.c:195
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
 "\n"
-"La sekvaj tri opcioj nur utilas dum kontrolo de kontrolsumoj:\n"
+"La sekvaj kvar opcioj nur utilas dum kontrolo de kontrolsumoj:\n"
 "      --quiet          ne eligi «bone» por ĉiu sukcese kontrolita dosiero\n"
 "      --status         ne eligi ion ajn; la elirstato montras (mal)sukceson\n"
+"      --strict         eliri nenule por mal�uste formitaj kontrolsumaj "
+"linioj\n"
 "  -w, --warn           averti pri mal�uste formitaj kontrolsumaj linioj\n"
 "\n"
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-"      --strict         kun «--check»: eliri nenule por iu ajn nevalida "
-"enigo\n"
-
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, c-format
 msgid ""
 "\n"
@@ -5591,178 +5789,204 @@ msgstr ""
 "estas eligi por ĉiu DOSIERO linion kiu konsistas de: kontrolsumo, signo kiu\n"
 "indikas la enigan moduson («*» por duuma, spaceto por teksta), kaj la nomo.\n"
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, c-format
 msgid "%s: too many checksum lines"
 msgstr "%s: tro multaj linioj de kontrolsumoj"
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr "%s: linio %<PRIuMAX>: nevalida %s-kontrolsumo"
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr "%s: malsukcesis malfermo aÅ­ lego\n"
 
 # Ĉi tiu priskribas malsaman kontrolsumon.
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr "MALSAMAS"
 
 # Ĉi tiu priskribas kongruan kontrolsumon.
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr "bonas"
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr "%s: neniu valida %s-kontrolsumo trovi�as"
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
 msgstr[0] "AVERTO: %<PRIuMAX> linio malbone aran�atas"
 msgstr[1] "AVERTO: %<PRIuMAX> linioj malbone aran�atas"
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
 msgstr[0] "AVERTO: %<PRIuMAX> listita dosiero ne legeblas"
 msgstr[1] "AVERTO: %<PRIuMAX> listitaj dosieroj ne legeblas"
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
 msgstr[0] "AVERTO: %<PRIuMAX> kalkulita kontrolsumo NE kongruas"
 msgstr[1] "AVERTO: %<PRIuMAX> kalkulitaj kontrolsumoj NE kongruas"
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
 msgstr "opcioj '--tag' kaj '--text' ne kombineblas"
 
-#: src/md5sum.c:766
+#: src/md5sum.c:770
 #, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr "opcio '--tag' ne havas sencon dum sumkontrolo"
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
 msgstr "opcioj '--binary' kaj '--text' ne havas sencon dum sumkontrolo"
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr "opcio '--status' nur havas sencon dum sumkontrolo"
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr "opcio '--warn' nur havas sencon dum sumkontrolo"
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr "opcio '--quiet' nur havas sencon dum sumkontrolo"
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr "opcio '--strict' nur havas sencon dum sumkontrolo"
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr "Uzmaniero:  %s [OPCIO...] DOSIERUJO...\n"
 
-#: src/mkdir.c:57
-#, fuzzy
+#: src/mkdir.c:59
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
 msgstr ""
 "Kreas la DOSIERUJO(j)n, se �i aŭ ili ne jam ekzistas.\n"
 "\n"
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
+#, fuzzy
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 "  -m, --mode=MODUSO  uzendaj permesoj (vidu 'chmod') anstataÅ­ de 'a=rwx - "
 "umask'\n"
 "  -p, --parents      ne estas eraro se jam ekzistas, kaj\n"
 "                       krei patrajn dosierujojn laÅ­bezone\n"
 "  -v, --verbose      eligi mesa�on por ĉiu kreita dosierujo\n"
-"  -Z, --context=KTT  agordi sekurecan kuntekston de ĉiu kreita dosierujo al "
-"KTT\n"
+"  -Z, --context[=KUNTEKSTO]  agordi sekurecan kuntekston de ĉiu kreita "
+"dosierujo\n"
+"                               al defaŭlta tipo, aŭ al KUNTEKSTO se �i "
+"indikatas\n"
+
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
 
-#: src/mkdir.c:168
+#: src/mkdir.c:127 src/mkdir.c:172
+#, c-format
+msgid "failed to set default creation context for %s"
+msgstr "malsukcesis agordi defaÅ­ltan krean kuntekston por %s"
+
+#: src/mkdir.c:191
+#, c-format
+msgid "failed to restore context for %s"
+msgstr "malsukcesis restaÅ­ri kuntekston por %s"
+
+#: src/mkdir.c:231
 #, c-format
 msgid "created directory %s"
 msgstr "krei�as dosierujo %s"
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr ""
+"averto: ignori�as '--context' (-Z); �i bezonas kernon kun SELinux aŭ SMACK"
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr "Uzmaniero:  %s [OPCIO...] NOMO...\n"
 
-#: src/mkfifo.c:52
-#, fuzzy
+#: src/mkfifo.c:54
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
 msgstr ""
 "Kreas nomhavajn duktojn (vicmemorojn) kun la indikataj NOMOj.\n"
 "\n"
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
 msgstr ""
 "  -m, --mode=MODUSO  uzendaj permesoj (vidu 'chmod') anstataÅ­ de 'a=rw - "
 "umask'\n"
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
-"  -Z, --context=KTT  agordi la sekurecan kuntekston de ĉiu NOMO al KTT\n"
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, c-format
 msgid "invalid mode"
 msgstr "nevalida moduso"
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr "moduso povas indiki nur permesajn bitojn"
 
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
+#, c-format
+msgid "cannot set permissions of %s"
+msgstr "ne eblas agordi permesojn de %s"
+
+#: src/mknod.c:54
 #, c-format
 msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr "Uzmaniero:  %s [OPCIO...] NOMO TIPO [ĈEFNUMERO KROMNUMERO]\n"
 
-#: src/mknod.c:54
-#, fuzzy
+#: src/mknod.c:56
 msgid "Create the special file NAME of the given TYPE.\n"
 msgstr ""
 "Kreas specialan dosieron kun indikata NOMO kaj de indikata TIPO.\n"
 "\n"
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr "  -Z, --context=KTT  agordi la sekurecan kuntekston de NOMO al KTT\n"
-
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -5779,7 +6003,7 @@ msgstr ""
 "'0',\n"
 "kiel okuma; alie, kiel dekuma.  TIPO povas esti:\n"
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 msgid ""
 "\n"
 "  b      create a block (buffered) special file\n"
@@ -5791,151 +6015,145 @@ msgstr ""
 "  c, u   krei signan specialan dosieron (nebufritan)\n"
 "  p      krei vicmemoron ('FIFO'-n)\n"
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 msgid "Special files require major and minor device numbers."
 msgstr "Specialaj dosieroj postulas ĉefajn kaj kromajn aparatnumerojn."
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 msgid "Fifos do not have major and minor device numbers."
 msgstr "Vicmemoro ('FIFO') ne havas ĉefan kaj kroman aparatnumeron."
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, c-format
 msgid "block special files not supported"
 msgstr "blokaparatdosieroj ne subtenatas"
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, c-format
 msgid "character special files not supported"
 msgstr "signoaparatdosieroj ne subtenatas"
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, c-format
 msgid "invalid major device number %s"
 msgstr "nevalida ĉefa aparatnumero %s"
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, c-format
 msgid "invalid minor device number %s"
 msgstr "nevalida kroma aparatnumero %s"
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, c-format
 msgid "invalid device %s %s"
 msgstr "nevalida aparato %s %s"
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, c-format
 msgid "invalid device type %s"
 msgstr "nevalida aparattipo %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr "Erik BLEJK (Eric Blake)"
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr "Uzmaniero:  %s [OPCIO...] [ÅœABLONO]\n"
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
 "TEMPLATE must contain at least 3 consecutive 'X's in last component.\n"
 "If TEMPLATE is not specified, use tmp.XXXXXXXXXX, and --tmpdir is implied.\n"
 msgstr ""
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
 "  -q, --quiet         suppress diagnostics about file/dir-creation failure\n"
 msgstr ""
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
 msgstr ""
 
-#: src/mktemp.c:223
-#, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr "malsukcesis alidirektigi ĉeferar-eligujon al /dev/null"
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, c-format
 msgid "too many templates"
 msgstr "tro multaj �ablonoj"
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr "kun opcio '--suffix', �ablono %s devas fini per X"
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr "nevalida sufikso %s; �i enhavas apartigilon de dosierujoj"
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr "tro malmultaj X en �ablono %s"
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr "nevalida �ablono %s; �i enhavas apartigilon de dosierujoj"
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr "nevalida �ablono %s; kun opcio '--tmpdir' �i ne rajtas esti absoluta"
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, c-format
 msgid "failed to create directory via template %s"
 msgstr "malsukcesis krei dosierujon tra �ablono %s"
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, c-format
 msgid "failed to create file via template %s"
 msgstr "malsukcesis krei dosieron tra �ablono %s"
 
-#: src/mv.c:292
-#, fuzzy
+#: src/mv.c:294
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
 msgstr ""
-"Renomas ORIGINOn al CELO, aÅ­ translokas ORIGINO(j)n al DOSIERUJO.\n"
+"Alinomas ORIGINOn al CELO, aÅ­ translokas ORIGINO(j)n al DOSIERUJO.\n"
 "\n"
 
-#: src/mv.c:298
+#: src/mv.c:300
+#, fuzzy
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
 "file\n"
@@ -5947,8 +6165,10 @@ msgid ""
 "If you specify more than one of -i, -f, -n, only the final one takes "
 "effect.\n"
 msgstr ""
+"      --backup[=METODO]        fari savkopion de ĉiu ekzistanta celdosiero\n"
+"  -b                           kiel «--backup», sed ne akceptas argumenton\n"
 
-#: src/mv.c:307
+#: src/mv.c:309
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
@@ -5956,7 +6176,7 @@ msgid ""
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
 msgstr ""
 
-#: src/mv.c:312
+#: src/mv.c:314
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
 "DIRECTORY\n"
@@ -5965,7 +6185,17 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
-msgstr ""
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
+msgstr ""
+"  -t, --target-directory=DOSIERUJO  movi ĉiujn ORIGINOjn ene al DOSIERUJO\n"
+"  -T, --no-target-directory         trakti CELOn kiel normalan dosieron\n"
+"  -u, --update                 movi nur kiam la ORIGINO estas pli nova ol\n"
+"                                 la celdosiero aÅ­ kiam la celdosiero mankas\n"
+"  -v, --verbose                montri nomon de ĉiu dosiero antaŭ ol movi "
+"�in\n"
+"  -Z, --context                agordi sekurecan kuntekston de celdosiero al\n"
+"                                 defaÅ­lta tipo\n"
 
 #: src/nice.c:72
 #, c-format
@@ -5973,7 +6203,7 @@ msgid "Usage: %s [OPTION] [COMMAND [ARG]...]\n"
 msgstr "Uzmaniero:  %s [OPCIO] [KOMANDO [ARGUMENTO...]]\n"
 
 #: src/nice.c:73
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Run COMMAND with an adjusted niceness, which affects process scheduling.\n"
 "With no COMMAND, print the current niceness.  Niceness values range from\n"
@@ -5983,11 +6213,11 @@ msgstr ""
 "Sen iu KOMANDO, la nuna afableco eligi�as.  Afablecoj etendi�as de\n"
 "%d (plej favora planado) al %d (malplej favora).\n"
 "\n"
-"  -n, --adjustment=N   aldoni entjeron N al la afableco (defaÅ­lte 10)\n"
 
 #: src/nice.c:82
 msgid "  -n, --adjustment=N   add integer N to the niceness (default 10)\n"
 msgstr ""
+"  -n, --adjustment=N   aldoni entjeron N al la afableco (defaÅ­lte 10)\n"
 
 #: src/nice.c:172
 #, c-format
@@ -6015,7 +6245,6 @@ msgid "Scott Bartram"
 msgstr "Skot BARTREM (Scott Bartram)"
 
 #: src/nl.c:179
-#, fuzzy
 msgid ""
 "Write each FILE to standard output, with line numbers added.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -6227,98 +6456,91 @@ msgid "%s: invalid number to ignore"
 msgstr "%s: nevalida ignorenda nombro"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
-msgstr ""
+msgstr "Asaf GORDON (Assaf Gordon)"
 
-#: src/numfmt.c:676
-#, fuzzy, c-format
-msgid "value too large to be converted: '%s'"
-msgstr "%s: valoro ne komplete konverti�is"
+#: src/numfmt.c:659
+#, c-format
+msgid "value too large to be converted: %s"
+msgstr "valoro tro grandas por konverti: %s"
 
-#: src/numfmt.c:680
-#, fuzzy, c-format
-msgid "invalid number: '%s'"
-msgstr "nevalida numero %s"
+#: src/numfmt.c:663
+#, c-format
+msgid "invalid number: %s"
+msgstr "nevalida nombro: %s"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
-msgstr ""
+msgid "rejecting suffix in input: %s (consider using --from)"
+msgstr "sufikso en enigo rifuzi�is: %s (konsideru uzon de «--from»)"
 
-#: src/numfmt.c:688
-#, fuzzy, c-format
-msgid "invalid suffix in input: '%s'"
-msgstr "nevalida sufikso en argumento de %s%s: «%s»"
+#: src/numfmt.c:671
+#, c-format
+msgid "invalid suffix in input: %s"
+msgstr "nevalida sufikso en enigo: %s"
 
-#: src/numfmt.c:692
+# XXX mankas punkto post e.g
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
-msgstr ""
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
+msgstr "mankas sufikso «i» en enigo: %s (ekzemple Ki/Mi/Gi)"
 
-#: src/numfmt.c:723
-#, fuzzy, c-format
+#: src/numfmt.c:722 src/numfmt.c:768
+#, c-format
 msgid "failed to prepare value '%Lf' for printing"
-msgstr "malsukcesis malfermi %s por skribado"
+msgstr "malsukcesis prepari valoron '%Lf' por montrado"
 
-#: src/numfmt.c:787
-#, fuzzy, c-format
-msgid "invalid unit size: '%s'"
-msgstr "nevalida taba grando: %s"
-
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
+#: src/numfmt.c:791
 #, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr ""
+msgid "invalid unit size: %s"
+msgstr "nevalida unueca grando: %s"
 
-#: src/numfmt.c:813
+#: src/numfmt.c:814
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
-msgstr "Uzmaniero:  %s [OPCIO...] [UZANTO...]\n"
+msgstr "Uzmaniero:  %s [OPCIO...] [NOMBRO...]\n"
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
 msgstr ""
 
-#: src/numfmt.c:820
-#, fuzzy
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
-msgstr ""
-"      --strict         kun «--check»: eliri nenule por iu ajn nevalida "
-"enigo\n"
+msgstr "      --debug          montri avertojn je nevalida enigo\n"
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
 msgstr ""
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
 "                         see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr ""
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
@@ -6326,19 +6548,19 @@ msgid ""
 "locale)\n"
 msgstr ""
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
 msgstr ""
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
 msgstr ""
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -6348,30 +6570,30 @@ msgid ""
 "                         is found\n"
 msgstr ""
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
 "nearest\n"
 msgstr ""
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
 msgstr ""
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr ""
 
-#: src/numfmt.c:877
+#: src/numfmt.c:878
 #, fuzzy
 msgid ""
 "\n"
@@ -6380,11 +6602,11 @@ msgstr ""
 "Aliaj opcioj:\n"
 "\n"
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr ""
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -6393,7 +6615,7 @@ msgid ""
 "               1Mi = 1048576,\n"
 msgstr ""
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
@@ -6401,7 +6623,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
@@ -6409,7 +6631,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
@@ -6417,18 +6639,18 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:905
+#: src/numfmt.c:906
 #, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -6440,7 +6662,7 @@ msgid ""
 "errors are not diagnosed and the exit status is 0.\n"
 msgstr ""
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -6461,112 +6683,113 @@ msgid ""
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 msgstr ""
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, c-format
 msgid "format %s has no %% directive"
 msgstr "aran�o %s ne enhavas %%-indikon"
 
-#: src/numfmt.c:990
-#, fuzzy, c-format
+#: src/numfmt.c:1003
+#, c-format
 msgid "invalid format %s (width overflow)"
-msgstr "nevalida dataran�o: %s"
+msgstr "nevalida aran�o %s (troo de lar�o)"
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr ""
+
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr "aran�o %s fini�as per %%"
 
-#: src/numfmt.c:1010
-#, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
-msgstr ""
+#: src/numfmt.c:1030
+#, fuzzy, c-format
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
+msgstr "nevalida aran�o %s;  indiko devas esti «%%['][-][N]f»"
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr "aran�o %s enhavas tro multajn %%-indikojn"
 
-#: src/numfmt.c:1070
-#, fuzzy, c-format
-msgid "invalid suffix in input '%s': '%s'"
-msgstr "nevalida sufikso en argumento de %s%s: «%s»"
+#: src/numfmt.c:1081
+#, c-format
+msgid "invalid suffix in input %s: %s"
+msgstr "nevalida sufikso en enigo %s: %s"
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
-msgstr ""
+msgstr "valoro tro grandas por montri: '%Lg' (pripensu uzi «--to»)"
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
-msgstr ""
+msgstr "valoro tro grandas por montri: '%Lg' (valoroj > 999Y ne trakteblas)"
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
-msgstr ""
+msgid "large input value %s: possible precision loss"
+msgstr "granda eniga valoro %s: eblas perdo de precizeco"
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
+"eniga linio tro mallongas;  ne trovi�is konvertendaj nombroj en kampo %ld"
 
-#: src/numfmt.c:1388
-#, fuzzy, c-format
-msgid "invalid padding value '%s'"
-msgstr "nevalida gamo de pa�oj: %s"
+#: src/numfmt.c:1403
+#, c-format
+msgid "invalid padding value %s"
+msgstr "nevalida �topvaloro %s"
 
-#: src/numfmt.c:1401
-#, fuzzy, c-format
-msgid "invalid field value '%s'"
-msgstr "nevalida kampnumero: %s"
+#: src/numfmt.c:1417
+#, c-format
+msgid "invalid field value %s"
+msgstr "nevalida kampvaloro %s"
 
-#: src/numfmt.c:1430
-#, fuzzy, c-format
-msgid "invalid header value '%s'"
-msgstr "nevalida dato %s"
+#: src/numfmt.c:1447
+#, c-format
+msgid "invalid header value %s"
+msgstr "nevalida ĉapvaloro %s"
 
-#: src/numfmt.c:1456
-#, fuzzy, c-format
+#: src/numfmt.c:1473
+#, c-format
 msgid "--grouping cannot be combined with --format"
-msgstr "nekombineblas dosieraj argumentoj kun opcio «--files0-from»"
+msgstr "nekombineblas opcioj «--grouping» kaj «--format»"
 
-#: src/numfmt.c:1458
-#, fuzzy, c-format
-msgid "--padding cannot be combined with --format"
-msgstr "nekombineblas dosieraj argumentoj kun opcio «--files0-from»"
-
-#: src/numfmt.c:1463
-#, fuzzy, c-format
+#: src/numfmt.c:1478
+#, c-format
 msgid "no conversion option specified"
-msgstr "pluraj opcioj '-i' indikatas"
+msgstr "neniu konverta opcio indikatas"
 
-#: src/numfmt.c:1471
-#, fuzzy, c-format
+#: src/numfmt.c:1486
+#, c-format
 msgid "grouping cannot be combined with --to"
-msgstr "nekombineblas dosieraj argumentoj kun opcio «--files0-from»"
+msgstr "nekombineblas opcioj «--grouping» kaj «--to»"
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
 msgstr ""
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
 msgstr ""
 
-#: src/numfmt.c:1511
-#, fuzzy, c-format
+#: src/numfmt.c:1526
+#, c-format
 msgid "error reading input"
-msgstr "eraro dum legado de %s"
+msgstr "eraro dum legado de enigo"
 
-#: src/numfmt.c:1520
-#, fuzzy, c-format
+#: src/numfmt.c:1535
+#, c-format
 msgid "failed to convert some of the input numbers"
-msgstr "malsukcesis fari ĉefenigujon neuzebla"
+msgstr "malsukcesis konverti kelkajn enigajn nombrojn"
 
-#: src/od.c:294
+#: src/od.c:320
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -6576,10 +6799,10 @@ msgid ""
 msgstr ""
 "Uzmaniero:  %s [OPCIO...] [DOSIERO...]\n"
 "       aÅ­:  %s [-abcdfilosx] [DOSIERO... [[+]DEÅœOVO[.][b]]\n"
-"       aÅ­:  %s --traditional [OPCIO...] [DOSIERO] [[+]DEÅœOVO[.][b]] [[+]"
-"ETIKEDO[.][b]]\n"
+"       aÅ­:  %s --traditional [OPCIO...] [DOSIERO] [[+]DEÅœOVO[.][b]] "
+"[[+]ETIKEDO[.][b]]\n"
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -6594,7 +6817,7 @@ msgstr ""
 "ili kunmeti�as en la indikata ordo por formi la enigon.\n"
 "Sen DOSIERO, aŭ kiam DOSIERO estas «-», ĉefenigujo legi�as.\n"
 
-#: src/od.c:307
+#: src/od.c:333
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
 "if the last operand begins with + or (if there are 2 operands) a digit.\n"
@@ -6604,38 +6827,40 @@ msgid ""
 "suffixes may be . for octal and b for multiply by 512.\n"
 msgstr ""
 
-#: src/od.c:318
+#: src/od.c:344
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
 
-#: src/od.c:323
+#: src/od.c:350
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
 
-#: src/od.c:336
+#: src/od.c:363
 msgid ""
 "\n"
 "\n"
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 
-#: src/od.c:345
+#: src/od.c:372
 msgid ""
 "  -f   same as -t fF, select floats\n"
 "  -i   same as -t dI, select decimal ints\n"
@@ -6645,16 +6870,16 @@ msgid ""
 "  -x   same as -t x2, select hexadecimal 2-byte units\n"
 msgstr ""
 
-#: src/od.c:353
+#: src/od.c:380
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -6663,7 +6888,7 @@ msgid ""
 "  x[SIZE]    hexadecimal, SIZE bytes per integer\n"
 msgstr ""
 
-#: src/od.c:367
+#: src/od.c:394
 msgid ""
 "\n"
 "SIZE is a number.  For TYPE in [doux], SIZE may also be C for\n"
@@ -6672,15 +6897,14 @@ msgid ""
 "for sizeof(double) or L for sizeof(long double).\n"
 msgstr ""
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
 "each output line.\n"
 msgstr ""
 
-#: src/od.c:379
-#, fuzzy
+#: src/od.c:406
 msgid ""
 "\n"
 "\n"
@@ -6693,16 +6917,17 @@ msgid ""
 "and so on for G, T, P, E, Z, Y.\n"
 msgstr ""
 "\n"
-"NOMBRO povas havi obligilan sufikson:\n"
-"b = 512, kB = 1000, K = 1024, MB = 1000*1000, M = 1024*1024,\n"
-"GB = 1000*1000*1000, G = 1024*1024*1024, ktp por T, P, E, Z, Y.\n"
+"NOMBRO estas deksesuma kiam �i havas prefikson «0x» aŭ «0X»,\n"
+"kaj �i povas havi obligilan sufikson:\n"
+"  b = 512, kB = 1000, K = 1024, MB = 1000*1000, M = 1024*1024,\n"
+"  GB = 1000*1000*1000, G = 1024*1024*1024, ktp por T, P, E, Z, Y.\n"
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, c-format
 msgid "invalid type string %s"
 msgstr "nevalida tipa ĉeno: %s"
 
-#: src/od.c:649
+#: src/od.c:690
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -6711,7 +6936,7 @@ msgstr ""
 "nevalida tipa ĉeno: %s\n"
 "ĉi tiu sistemo ne provizas entjertipon de %lu bajtoj"
 
-#: src/od.c:770
+#: src/od.c:811
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -6720,36 +6945,36 @@ msgstr ""
 "nevalida tipa ĉeno: %s\n"
 "ĉi tiu sistemo ne provizas glitkomtipon de %lu bajtoj"
 
-#: src/od.c:828
+#: src/od.c:869
 #, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr "nevalida signo '%c' en tipa ĉeno %s"
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr "maleblas transsalti la finon de kombinata enigo"
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr "nevalida eligadresa bazo '%c'; �i devas esti unu signo el [doxn]"
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr "ne eblas indiki tipon kiam �utendas ĉenoj"
 
-#: src/od.c:1810
+#: src/od.c:1863
 msgid "compatibility mode supports at most one file"
 msgstr "kongrua moduso permesas maksimume unu dosieron"
 
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr "la sumo de la argumentoj de '-j' kaj '-N' tro grandas"
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr "averto: nevalida lar�o %lu; uzatas %d anstataŭe"
@@ -6765,7 +6990,6 @@ msgid "standard input is closed"
 msgstr "ĉefenigujo fermitas"
 
 #: src/paste.c:439
-#, fuzzy
 msgid ""
 "Write lines consisting of the sequentially corresponding lines from\n"
 "each FILE, separated by TABs, to standard output.\n"
@@ -6914,12 +7138,12 @@ msgstr "Ensalutis"
 msgid "Where"
 msgstr "Kie"
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr "Uzmaniero:  %s [OPCIO...] [UZANTO...]\n"
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -6929,8 +7153,8 @@ msgid ""
 "  -s              do short format output, this is the default\n"
 msgstr ""
 "\n"
-"  -l              produkti eligon en longa aran�o por la indikata(j) UZANTO"
-"(j)\n"
+"  -l              produkti eligon en longa aran�o por la indikata(j) "
+"UZANTO(j)\n"
 "  -b              forlasi hejman dosierujon kaj �elon de uzanto en longa "
 "aran�o\n"
 "  -h              forlasi projektan dosieron de uzanto en longa aran�o\n"
@@ -6938,7 +7162,7 @@ msgstr ""
 "  -s              produkti eligon en mallonga aran�o (ĉi tio estas la "
 "defaÅ­lto)\n"
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -6951,7 +7175,7 @@ msgstr ""
 "  -i              kiel '-w' sed ankaÅ­ forlasi foran gastiganton\n"
 "  -q              kiel '-i' sed ankaÅ­ forlasi vakan tempon\n"
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, c-format
 msgid ""
 "\n"
@@ -6962,7 +7186,7 @@ msgstr ""
 "Malpeza 'finger'-programo; eligas informon pri uzantoj.\n"
 "La uzita 'utmp'-dosiero estos %s.\n"
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr ""
@@ -7130,12 +7354,13 @@ msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
 
-#: src/pr.c:2827
+#: src/pr.c:2828
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
 "                    separate columns by STRING,\n"
@@ -7145,7 +7370,7 @@ msgid ""
 "  -t, --omit-header  omit page headers and trailers\n"
 msgstr ""
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 msgid ""
 "  -T, --omit-pagination\n"
 "                    omit page headers and trailers, eliminate any "
@@ -7159,7 +7384,7 @@ msgid ""
 "(72)\n"
 msgstr ""
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
 "                    set page width to PAGE_WIDTH (72) characters always,\n"
@@ -7168,7 +7393,7 @@ msgid ""
 "                    with -S or -s\n"
 msgstr ""
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 msgid ""
 "\n"
 "-t is implied if PAGE_LENGTH <= 10.  With no FILE, or when FILE is -, read\n"
@@ -7190,7 +7415,8 @@ msgstr ""
 "\n"
 
 #: src/printenv.c:69
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+#, fuzzy
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr "  -0, --null     disigi eligon per nulbajtoj anstataÅ­ per novlinioj\n"
 
 #: src/printf.c:79
@@ -7213,6 +7439,9 @@ msgid ""
 "Print ARGUMENT(s) according to FORMAT, or execute according to OPTION:\n"
 "\n"
 msgstr ""
+"  \n"
+"Eligas ARGUMENTO(j)n laÅ­ ARANÄœO, aÅ­ montras informon laÅ­ OPCIO:\n"
+"\n"
 
 #: src/printf.c:99
 msgid ""
@@ -7221,6 +7450,11 @@ msgid ""
 "\n"
 "  \\\"      double quote\n"
 msgstr ""
+"\n"
+"ARANÄœO stiras la eligon kiel je 'printf()' de C.  Interpretitaj sekvencoj "
+"estas:\n"
+"\n"
+"  \\\"      duobla citigilo\n"
 
 #: src/printf.c:117
 msgid ""
@@ -7229,6 +7463,11 @@ msgid ""
 "  \\uHHHH  Unicode (ISO/IEC 10646) character with hex value HHHH (4 digits)\n"
 "  \\UHHHHHHHH  Unicode character with hex value HHHHHHHH (8 digits)\n"
 msgstr ""
+"  \\NNN    bajto kun okuma valoro NNN (1 �is 3 ciferoj)\n"
+"  \\xHH    bajto kun deksesuma valoro HH (1 aÅ­ 2 ciferoj)\n"
+"  \\uHHHH  Unikoda (ISO/IEC 10646) signo kun deksesuma valoro HHHH (4 "
+"ciferoj)\n"
+"  \\UHHHHHHHH  Unikoda signo kun deksesuma valoro HHHHHHHH (8 ciferoj)\n"
 
 #: src/printf.c:123
 msgid ""
@@ -7239,6 +7478,13 @@ msgid ""
 "and all C format specifications ending with one of diouxXfeEgGcs, with\n"
 "ARGUMENTs converted to proper type first.  Variable widths are handled.\n"
 msgstr ""
+"  %%      ununura '%'\n"
+"  %b      ARGUMENTO kiel signoĉeno kun '\\'-eskapoj interpretitaj,\n"
+"          escepte ke okumaj eskapoj havas la formon '\\0' aÅ­ '\\0NNN'\n"
+"\n"
+"Ankaŭ interpreti�as ĉiuj C-aran�indikoj kiuj finas kun unu el "
+"«diouxXfeEgGcs»\n"
+"kun ARGUMENTOj konvertitaj al �usta tipo unue.  Variablaj lar�oj trakti�as.\n"
 
 #: src/printf.c:148
 #, c-format
@@ -7288,12 +7534,12 @@ msgstr "averto: troaj argumentoj ignoratas, komence de %s"
 msgid "F. Pinard"
 msgstr "Fransŭa PINAR (François Pinard)"
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, c-format
 msgid "%s (for regexp %s)"
 msgstr "%s (por regulesprimo %s)"
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
@@ -7302,20 +7548,25 @@ msgstr ""
 "Uzmaniero:  %s [OPCIO...] [ENIGO...]   (sen '-G')\n"
 "       aÅ­:  %s -G [OPCIO...] [ENIGO [ELIGO]]\n"
 
-#: src/ptx.c:1821
+#: src/ptx.c:1824
 msgid ""
 "Output a permuted index, including context, of the words in the input "
 "files.\n"
 msgstr ""
+"Eligas ordigitan liston de la vortoj en la enigdosieroj,\n"
+"inkluzivante la kuntekston de tiuj vortoj.\n"
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
 "  -G, --traditional              behave more like System V 'ptx'\n"
 "  -F, --flag-truncation=STRING   use STRING for flagging line truncations\n"
 msgstr ""
+"  -A, --auto-reference           aldoni linireferencojn\n"
+"  -G, --traditional              konduti pli kiel Sistema V 'ptx'\n"
+"  -F, --flag-truncation=ĈENO     uzi ĈENOn por montri linidistranĉojn\n"
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
 "  -O, --format=roff              generate output as roff directives\n"
@@ -7323,8 +7574,14 @@ msgid ""
 "  -S, --sentence-regexp=REGEXP   for end of lines or end of sentences\n"
 "  -T, --format=tex               generate output as TeX directives\n"
 msgstr ""
+"  -M, --macro-name=NOMO          uzenda makronomo anstataŭ «xx»\n"
+"  -O, --format=roff              generi eligon en formo de 'roff'-"
+"direktivoj\n"
+"  -R, --right-side-refs          meti linireferencojn dekstre, ekster lar�o\n"
+"  -S, --sentence-regexp=REGESP   por linifinoj aÅ­ fino de frazoj\n"
+"  -T, --format=tex               generi eligon en formo de 'TeX'-direktivoj\n"
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -7333,25 +7590,39 @@ msgid ""
 "  -i, --ignore-file=FILE         read ignore word list from FILE\n"
 "  -o, --only-file=FILE           read only word list from this FILE\n"
 msgstr ""
+"  -W, --word-regexp=REGESP       uzi REGESP por kongrui ĉiun �losilvorton\n"
+"  -b, --break-file=DOSIERO       vortrompigaj signoj estas en ĉi tiu "
+"DOSIERO\n"
+"  -f, --ignore-case              trakti minusklojn kiel majusklojn por "
+"ordigo\n"
+"  -g, --gap-size=NOMBRO          breĉa grando en kolumnoj inter eligaj "
+"kampoj\n"
+"  -i, --ignore-file=DOSIERO      legi liston de ignorendaj vortoj el "
+"DOSIERO\n"
+"  -o, --only-file=DOSIERO        legi nuran vortliston el ĉi tiu DOSIERO\n"
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
 "  -w, --width=NUMBER             output width in columns, reference "
 "excluded\n"
 msgstr ""
+"  -r, --references               unua kampo de ĉiu linio estas referenco\n"
+"  -t, --typeset-mode             (ignori�as, ne funkcias)\n"
+"  -w, --width=NOMBRO             eliglar�o en kolumnoj (ekskluzive "
+"referenco)\n"
 
-#: src/ptx.c:1854
+#: src/ptx.c:1857
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
 "\n"
 "Sen DOSIERO, aŭ kiam DOSIERO estas «-», ĉefenigujo legi�as.\n"
 "Defaŭlte uzi�as opcio «-F /».\n"
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, c-format
 msgid "invalid gap width: %s"
 msgstr "nevalida lar�o de fendo: %s"
@@ -7373,22 +7644,28 @@ msgstr ""
 "ligojn\n"
 "  -P, --physical  eviti ĉiujn simbolajn ligojn\n"
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+
+#: src/pwd.c:169
 #, c-format
 msgid "failed to chdir to %s"
 msgstr "malsukcesis �an�i aktualan dosierujon al %s"
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, c-format
 msgid "failed to stat %s"
 msgstr "malsukcesis eltrovi statinformon pri %s"
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr "malsukcesis trovi en %s dosierujan elementon kies indeksnodo kongruas"
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, c-format
 msgid "ignoring non-option arguments"
 msgstr "ignoratas ne-opciaj argumentoj"
@@ -7398,8 +7675,8 @@ msgstr "ignoratas ne-opciaj argumentoj"
 msgid "Dmitry V. Levin"
 msgstr "Dmitri LEVIN (Dmitry V. Levin)"
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Uzmaniero:  %s [OPCIO...] DOSIERO...\n"
@@ -7435,14 +7712,13 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/readlink.c:152
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring --no-newline with multiple arguments"
-msgstr "ignoratas ne-opciaj argumentoj"
+msgstr "ignoratas «--no-newline» kun pluraj argumentoj"
 
 #: src/realpath.c:72
 msgid ""
@@ -7461,7 +7737,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 
@@ -7479,41 +7755,43 @@ msgstr "%s: ĉu eniri en kontraŭskribe protektatan dosierujon %s? "
 msgid "%s: descend into directory %s? "
 msgstr "%s: ĉu eniri en dosierujon %s? "
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr "%s: ĉu forigi kontraŭskribe protektatan %s %s? "
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, c-format
 msgid "%s: remove %s %s? "
 msgstr "%s: ĉu forigi %s %s? "
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, c-format
 msgid "removed directory: %s\n"
 msgstr "forigi�is dosierujo %s\n"
 
-#: src/remove.c:444
+# Temas pri . kaj .. (mem kaj patro).
+#: src/remove.c:447
 #, c-format
-msgid "cannot remove directory: %s"
-msgstr "ne eblas forigi dosierujon %s"
+msgid "refusing to remove %s or %s directory: skipping %s"
+msgstr "ne forigi�as dosierujojn %s kaj %s;  transsaltatas %s"
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr "transsaltatas %s, ĉar �i estas en alia aparato"
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, c-format
 msgid "traversal failed: %s"
 msgstr "malsukcesis transiro: %s"
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -7540,12 +7818,12 @@ msgstr ""
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 
 #: src/rm.c:149
@@ -7596,13 +7874,17 @@ msgstr ""
 
 #: src/rm.c:342
 #, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr "%s: ĉu forigi ĉiujn argumentojn rikure? "
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] "%s: ĉu forigi %zu argumenton rikure? "
+msgstr[1] "%s: ĉu forigi %zu argumentojn rikure? "
 
-#: src/rm.c:343
+#: src/rm.c:345
 #, c-format
-msgid "%s: remove all arguments? "
-msgstr "%s: ĉu forigi ĉiujn argumentojn? "
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] "%s: ĉu forigi %zu argumenton? "
+msgstr[1] "%s: ĉu forigi %zu argumentojn? "
 
 #: src/rmdir.c:134 src/rmdir.c:233
 #, c-format
@@ -7653,7 +7935,7 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
 
@@ -7703,41 +7985,46 @@ msgstr "nepras indiki '-c', '-l', '-r', '-t', '-u' aÅ­ kuntekston"
 msgid "no command specified"
 msgstr "neniu komando indikatas"
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr "eblas uzi %s nur je SE-Linuksa kerno"
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, c-format
 msgid "failed to compute a new context"
 msgstr "malsukcesis kalkuli novan kuntekston"
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, c-format
 msgid "failed to set new user %s"
 msgstr "malsukcesis agordi novan uzanton %s"
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, c-format
 msgid "failed to set new type %s"
 msgstr "malsukcesis agordi novan tipon %s"
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, c-format
 msgid "failed to set new range %s"
 msgstr "malsukcesis agordi novan gamon %s"
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, c-format
 msgid "failed to set new role %s"
 msgstr "malsukcesis agordi novan rolon %s"
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, c-format
 msgid "unable to set security context %s"
 msgstr "malsukcesis agordi sekurecan kuntekston %s"
 
+#: src/selinux.c:127 src/selinux.c:300
+#, c-format
+msgid "error canonicalizing %s"
+msgstr "eraro dum normaligo de %s"
+
 #: src/seq.c:68
 #, c-format
 msgid ""
@@ -7765,97 +8052,47 @@ msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
 msgstr ""
 
-#: src/seq.c:94
+#: src/seq.c:96
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
 "it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n"
 "decimal numbers with maximum precision PREC, and to %g otherwise.\n"
 msgstr ""
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, c-format
 msgid "invalid floating point argument: %s"
 msgstr "nevalida glitkoma argumento: %s"
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr "aran�o %s enhavas nekonatan %%%c-indikon"
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr "ne permesatas indiki aran�on kiam eligi�as egallar�ajn ĉenojn"
 
-#: src/setuidgid.c:49
-#, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-"Uzmaniero:  %s [MALLONGA_OPCIO...] UZANTO KOMANDO [ARGUMENTO...]\n"
-"       aÅ­:  %s LONGA_OPCIO\n"
-
-#: src/setuidgid.c:55
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr "nekonata uzant-ID: %s"
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr "por uzi uzant-ID %s nepras uzi ankaÅ­ opcion '-g'"
-
-#: src/setuidgid.c:190
-#, c-format
-msgid "failed to set supplemental group(s)"
-msgstr "malsukcesis agordi la pluajn grupojn"
-
-#: src/setuidgid.c:200
-#, c-format
-msgid "cannot set group-ID to %lu"
-msgstr "ne eblas agordi grupan ID-on al %lu"
-
-#: src/setuidgid.c:204
-#, c-format
-msgid "cannot set user-ID to %lu"
-msgstr "ne eblas agordi uzantan ID-on al %lu"
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr "Kolin PLOM (Colin Plumb)"
 
-#: src/shred.c:148
+#: src/shred.c:170
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
 "for even very expensive hardware probing to recover the data.\n"
 msgstr ""
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -7864,28 +8101,32 @@ msgid ""
 "  -s, --size=N   shred this many bytes (suffixes like K, M, G accepted)\n"
 msgstr ""
 
-#: src/shred.c:161
+#: src/shred.c:183
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
 "  -z, --zero     add a final overwrite with zeros to hide shredding\n"
 msgstr ""
 
-#: src/shred.c:170
+#: src/shred.c:192
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -7896,7 +8137,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -7908,7 +8149,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -7917,7 +8158,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -7929,134 +8170,134 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:215
+#: src/shred.c:241
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
 "of the file that cannot be removed, and that will allow a shredded file\n"
 "to be recovered later.\n"
 msgstr ""
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, c-format
 msgid "%s: fdatasync failed"
 msgstr "malsukcesis 'fdatasync' por %s"
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr "malsukcesis 'fsync' por %s"
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr "malsukcesis 'lseek' �is komenco sur %s"
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr "%s: pa�o %lu/%lu (%s)..."
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, c-format
 msgid "%s: error writing at offset %s"
 msgstr "%s: skrib-eraro je pozicio %s"
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, c-format
 msgid "%s: lseek failed"
 msgstr "malsukcesis 'lseek' sur %s"
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, c-format
 msgid "%s: file too large"
 msgstr "%s: dosiero tro grandas"
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr "%s: pa�o %lu/%lu (%s)...%s"
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr "%s: pa�o %lu/%lu (%s)...%s/%s %d%%"
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, c-format
 msgid "%s: fstat failed"
 msgstr "malsukcesis eltrovi statinformon pri malferma %s"
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, c-format
 msgid "%s: invalid file type"
 msgstr "%s: nevalida dosiertipo"
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr "%s: dosiero havas negativan grandon"
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, c-format
 msgid "%s: error truncating"
 msgstr "%s: eraro dum trunkado"
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, c-format
 msgid "%s: fcntl failed"
 msgstr "malsukcesis fcntl() sur %s"
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr "maleblas tutvi�i nur-aldonan dosieron %s"
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr "forigi�as %s"
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, c-format
 msgid "%s: renamed to %s"
 msgstr "%s renomi�is al %s"
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, c-format
 msgid "%s: failed to remove"
 msgstr "malsukcesis forigi %s"
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr "forigi�is %s"
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, c-format
 msgid "%s: failed to close"
 msgstr "malsukcesis fermi %s"
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, c-format
 msgid "%s: failed to open for writing"
 msgstr "malsukcesis malfermi %s por skribado"
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, c-format
 msgid "%s: invalid number of passes"
 msgstr "nevalida nombro de pa�oj: %s"
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, c-format
 msgid "multiple random sources specified"
 msgstr "pluraj aleatoraj fontoj indikatas"
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, c-format
 msgid "%s: invalid file size"
 msgstr "%s: nevalida dosiergrando"
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -8067,14 +8308,15 @@ msgstr ""
 "       aÅ­:  %s -e [OPCIO...] [ARGUMENTO...]\n"
 "       aÅ­:  %s -i DE-ÄœIS [OPCIO...]\n"
 
-#: src/shuf.c:54
-#, fuzzy
+#: src/shuf.c:67
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr ""
 "Skribas hazardan permuton de la enigaj linioj al ĉefeligujo.\n"
 "\n"
 
-#: src/shuf.c:60
+# XXX don't use periods
+#: src/shuf.c:73
+#, fuzzy
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
 "  -i, --input-range=LO-HI   treat each number LO through HI as an input "
@@ -8082,7 +8324,7 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
 msgstr ""
 "  -e, --echo                   trakti ĉiun ARGUMENTOn kiel enigan linion\n"
 "  -i, --input-range=DE-ĜIS     trakti ĉiun numeron ekde DE tra ĜIS kiel "
@@ -8091,34 +8333,45 @@ msgstr ""
 "  -o, --output=DOSIERO         eligi rezulton al DOSIERO anstataÅ­ al "
 "ĉefeligujo\n"
 "      --random-source=DOSIERO  preni hazardajn bajtojn el DOSIERO\n"
+"  -r, --repeat                 permesi ke la eniglinioj uzi�as plurfoje\n"
 "  -z, --zero-terminated        disigi eligon per nulbajtoj anstataÅ­ per "
 "novlinioj\n"
 
-#: src/shuf.c:244
+#: src/shuf.c:228
+#, c-format
+msgid "too many input lines"
+msgstr "tro multaj eniglinioj"
+
+#: src/shuf.c:431
 #, c-format
 msgid "multiple -i options specified"
 msgstr "pluraj opcioj '-i' indikatas"
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, c-format
 msgid "invalid input range %s"
 msgstr "nevalida gamo: %s"
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, c-format
 msgid "invalid line count %s"
 msgstr "nevalida nombro de linioj: %s"
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, c-format
 msgid "multiple output files specified"
 msgstr "pluraj eligaj dosieroj indikatas"
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, c-format
 msgid "cannot combine -e and -i options"
 msgstr "nekombineblas opcioj '-e' kaj '-i'"
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr ""
+
 #: src/sleep.c:44
 #, c-format
 msgid ""
@@ -8133,24 +8386,23 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, c-format
 msgid "invalid time interval %s"
 msgstr "nevalida tempintervalo: %s"
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr "malsukcesis legi realtempan horlo�on"
 
-#: src/sort.c:399
-#, fuzzy
+#: src/sort.c:427
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr ""
-"Eligas al ĉefeligujo elektitajn partojn de linioj de ĉiu DOSIERO.\n"
+"Eligas ordigitan kunmeton de ĉiuj DOSIEROj al ĉefeligujo.\n"
 "\n"
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
@@ -8158,7 +8410,7 @@ msgstr ""
 "Ordigantaj opcioj:\n"
 "\n"
 
-#: src/sort.c:409
+#: src/sort.c:437
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
 "  -d, --dictionary-order      consider only blanks and alphanumeric "
@@ -8166,19 +8418,19 @@ msgid ""
 "  -f, --ignore-case           fold lower case to upper case characters\n"
 msgstr ""
 
-#: src/sort.c:415
+#: src/sort.c:443
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
 "  -i, --ignore-nonprinting    consider only printable characters\n"
 "  -M, --month-sort            compare (unknown) < 'JAN' < ... < 'DEC'\n"
 msgstr ""
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 
-#: src/sort.c:423
+#: src/sort.c:451
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
 "  -R, --random-sort           sort by random hash of keys\n"
@@ -8186,7 +8438,7 @@ msgid ""
 "  -r, --reverse               reverse the result of comparisons\n"
 msgstr ""
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -8196,7 +8448,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/sort.c:437
+#: src/sort.c:465
 msgid ""
 "Other options:\n"
 "\n"
@@ -8204,13 +8456,13 @@ msgstr ""
 "Aliaj opcioj:\n"
 "\n"
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
 msgstr ""
 
-#: src/sort.c:445
+#: src/sort.c:473
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
 "  -C, --check=quiet, --check=silent  like -c, but do not report first bad "
@@ -8219,7 +8471,7 @@ msgid ""
 "                              decompress them with PROG -d\n"
 msgstr ""
 
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -8228,13 +8480,13 @@ msgid ""
 "                            If F is - then read names from standard input\n"
 msgstr ""
 
-#: src/sort.c:459
+#: src/sort.c:487
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
 "  -m, --merge               merge already sorted files; do not sort\n"
 msgstr ""
 
-#: src/sort.c:463
+#: src/sort.c:491
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "  -s, --stable              stabilize sort by disabling last-resort "
@@ -8242,7 +8494,7 @@ msgid ""
 "  -S, --buffer-size=SIZE    use SIZE for main memory buffer\n"
 msgstr ""
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -8257,13 +8509,7 @@ msgid ""
 "run\n"
 msgstr ""
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr ""
-"  -z, --zero-terminated     disigi eligon per nulbajtoj anstataÅ­ per "
-"novlinioj\n"
-
-#: src/sort.c:483
+#: src/sort.c:511
 msgid ""
 "\n"
 "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is "
@@ -8282,7 +8528,7 @@ msgid ""
 "SIZE may be followed by the following multiplicative suffixes:\n"
 msgstr ""
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -8294,255 +8540,240 @@ msgid ""
 "native byte values.\n"
 msgstr ""
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, c-format
 msgid "waiting for %s [-d]"
 msgstr "atendado pri '%s [-d]'"
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr "'%s [-d]' fini�is nenormale"
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, c-format
 msgid "cannot create temporary file in %s"
 msgstr "malsukcesis krei provizoran dosieron en %s"
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr "malsukcesis malfermo"
 
-#: src/sort.c:970
+#: src/sort.c:998
 msgid "fflush failed"
 msgstr "malsukcesis fflush()"
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr "malsukcesis fermo"
 
-#: src/sort.c:986
-#, c-format
-msgid "dup2 failed"
-msgstr "malsukcesis dup2()"
-
-#: src/sort.c:1103
-#, c-format
-msgid "couldn't execute %s"
-msgstr "malsukcesis ruli %s"
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 msgid "couldn't create temporary file"
 msgstr "malsukcesis krei provizoran dosieron"
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, c-format
 msgid "couldn't create process for %s -d"
 msgstr "malsukcesis krei novan procezon por '%s -d'"
 
-#: src/sort.c:1161
-#, c-format
-msgid "couldn't execute %s -d"
-msgstr "malsukcesis ruli '%s -d'"
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, c-format
 msgid "warning: cannot remove: %s"
 msgstr "averto: malsukcesis forigi %s"
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, c-format
 msgid "invalid --%s argument %s"
 msgstr "nevalida argumento por opcio '--%s': %s"
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, c-format
 msgid "minimum --%s argument is %s"
 msgstr "minimuma argumento por opcio '--%s' estas %s"
 
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, c-format
 msgid "--%s argument %s too large"
 msgstr "argumento por opcio '--%s' tro grandas: %s"
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr "maksimuma argumento por opcio '--%s' je aktuala 'rlimit' estas %s"
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr "paralelnombro devas esti pli ol nulo"
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr "malsukcesis eltrovi statinformon"
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr "malsukcesis lego"
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, c-format
 msgid "string transformation failed"
 msgstr "malsukcesis transformi signoĉenon"
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, c-format
 msgid "the untransformed string was %s"
 msgstr "la ne�an�ita ĉeno estas %s"
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr "^ neniu kongruo por klavo\n"
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr "uzi�is olda klavo %s; pripensu uzi %s anstataŭe"
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr "klavo %lu havas nulan lar�on kaj ignori�os"
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr ""
 "antaÅ­iraj spacetoj havas signifon en klavo %lu; pripensu indiki ankaÅ­ 'b'"
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr "klavo %lu estas numera kaj ampleksas plurajn kampojn"
 
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
 msgstr[0] "opcio «-%s» ignoratas"
 msgstr[1] "opcioj «-%s» ignoratas"
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr "opcio «-r» aplikas nur al lastebla komparo"
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr "malsukcesis skribo"
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr "%s: %s:%s: malordo: "
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr "ĉeferar-eligujo"
 
-#: src/sort.c:3698
+#: src/sort.c:3738
 msgid "cannot read"
 msgstr "ne eblas legi"
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, c-format
 msgid "%s: invalid field specification %s"
 msgstr "%s: nevalida kampindiko %s"
 
-#: src/sort.c:3987
+#: src/sort.c:4028
 #, c-format
 msgid "options '-%s' are incompatible"
 msgstr "nekombineblas opcioj «-%s»"
 
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, c-format
 msgid "%s: invalid count at start of %s"
 msgstr "%s: nevalida nombro je komenco de %s"
 
-#: src/sort.c:4295
+#: src/sort.c:4336
 msgid "invalid number after '-'"
 msgstr "nevalida numero post '-'"
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 msgid "invalid number after '.'"
 msgstr "nevalida numero post '.'"
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr "hazarda signo en kampindiko"
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, c-format
 msgid "multiple compress programs specified"
 msgstr "pluraj kunpremaj programoj indikatas"
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
 msgstr "nevalida numero je kampkomenco"
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
 msgstr "kampnumero estas nulo"
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr "signopozicio estas nulo"
 
-#: src/sort.c:4407
+#: src/sort.c:4448
 msgid "invalid number after ','"
 msgstr "nevalida numero post ','"
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr "vaka tabo"
 
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, c-format
 msgid "cannot read file names from %s"
 msgstr "malsukcesis legi dosiernomojn el %s"
 
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr "%s:%lu: nevalida dosiernomo (longo nulas)"
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, c-format
 msgid "no input from %s"
 msgstr "neniu enigo el %s"
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr "uzatas %s ordigaj reguloj"
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr "uzatas simpla bajtkomparo"
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr "aldona argumento %s ne permesatas por '-%c'"
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr "longo de sufikso nepras esti almenaÅ­ %zu"
 
-#: src/split.c:204
+#: src/split.c:203
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr "Uzmaniero:  %s [OPCIO...] [ENIGO [PREFIKSO]]\n"
 
-#: src/split.c:208
+#: src/split.c:207
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
 "size is 1000 lines, and default PREFIX is 'x'.  With no INPUT, or when "
@@ -8550,32 +8781,31 @@ msgid ""
 "is -, read standard input.\n"
 msgstr ""
 
-#: src/split.c:216
+#: src/split.c:215
 #, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
 
-#: src/split.c:229
+#: src/split.c:228
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
 "                            output file is opened\n"
 msgstr ""
 
-#: src/split.c:236
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -8587,189 +8817,189 @@ msgid ""
 "r/K/N   likewise but only output Kth of N to stdout\n"
 msgstr ""
 
-#: src/split.c:354
+#: src/split.c:353
 #, c-format
 msgid "output file suffixes exhausted"
 msgstr "elirdosieraj sufiksoj elĉerpi�is"
 
-#: src/split.c:366
+#: src/split.c:365
 #, c-format
 msgid "creating file %s\n"
 msgstr "krei�as dosiero %s\n"
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr "%s anstataŭigus la enigon -- aborti�as"
 
-#: src/split.c:391
+#: src/split.c:390
 #, c-format
 msgid "failed to set FILE environment variable"
 msgstr "malsukcesis agordi ĉirkaŭaĵan variablon FILE"
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr "plenumi�as kun FILE=%s\n"
 
-#: src/split.c:395
+#: src/split.c:394
 #, c-format
 msgid "failed to create pipe"
 msgstr "malsukcesis krei dukton"
 
-#: src/split.c:409
+#: src/split.c:408
 #, c-format
 msgid "closing prior pipe"
 msgstr "fermi�as antaŭa dukto"
 
-#: src/split.c:411
+#: src/split.c:410
 #, c-format
 msgid "closing output pipe"
 msgstr "fermi�as eliga dukto"
 
-#: src/split.c:415
+#: src/split.c:414
 #, c-format
 msgid "moving input pipe"
 msgstr "movi�as eniga dukto"
 
-#: src/split.c:417
+#: src/split.c:416
 #, c-format
 msgid "closing input pipe"
 msgstr "fermi�as eniga dukto"
 
-#: src/split.c:422
+#: src/split.c:421
 #, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr "malsukcesis ruli komandon \"%s -c %s\""
 
-#: src/split.c:428
+#: src/split.c:427
 #, c-format
 msgid "failed to close input pipe"
 msgstr "malsukcesis fermi enigan dukton"
 
-#: src/split.c:464
+#: src/split.c:463
 #, c-format
 msgid "waiting for child process"
 msgstr "atendado pri ida procezo"
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr "kun FILE=%s, signalo %s el komando %s"
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr "kun FILE=%s, eliro %d el komando %s"
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr "nekonata rezulto (0x%X) el komando"
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr "maleblas dividi en pluraj manieroj"
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, c-format
 msgid "%s: invalid number of chunks"
 msgstr "nevalida nombro da pecoj: %s"
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, c-format
 msgid "%s: invalid chunk number"
 msgstr "nevalida pecnumero: %s"
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr "nevalida sufikslongo: %s"
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr "nevalida nombro da bajtoj: %s"
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr "nevalida nombro da linioj: %s"
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, c-format
 msgid "line count option -%s%c... is too large"
 msgstr "lininombro '-%s%c...' tro grandas"
 
-#: src/split.c:1248
+#: src/split.c:1298
 #, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr "%s: nevalida komenca valoro por numera sufikso"
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, c-format
 msgid "%s: invalid IO block size"
 msgstr "nevalida grando por IO-bloko: %s"
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr "opcio «--filter» ne pritraktas pecon eligatan al ĉefeligujo"
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr "komenca valoro de numereca sufikso tro grandas por sufikslongo"
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, c-format
 msgid "%s: cannot determine file size"
 msgstr "%s: ne eblas eltrovi dosiergrandon"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr "Majkel MESKES (Michael Meskes)"
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, c-format
 msgid "failed to canonicalize %s"
 msgstr "malsukcesis normaligi %s"
 
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr "averto: nerekonata eskapsigno '\\%c'"
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, c-format
 msgid "%s: invalid directive"
 msgstr "nevalida indiko: %s"
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, c-format
 msgid "warning: backslash at end of format"
 msgstr "averto: malsuprenstreko je aran�ofino"
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr "uzi %s por indiki ĉefenigujo ne funkcias en dosiersistema moduso"
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, c-format
 msgid "cannot read file system information for %s"
 msgstr "malsukcesis legi en dosiersistemo informon pri %s"
 
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, c-format
 msgid "cannot stat standard input"
 msgstr "malsukcesis eltrovi statinformon pri ĉefenigujo"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -8785,7 +9015,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -8795,30 +9025,30 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr "Aparato: %Dh/%dd   I-nodo: %-10i   Ligoj: %-5h   Aparattipo: %t,%T\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr "Aparato: %Dh/%dd   I-nodo: %-10i   Ligoj: %h\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr "Atingo: (%04a/%10.10A)  UID: (%5u/%8U)   GID: (%5g/%8G)\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, c-format
 msgid "Context: %C\n"
 msgstr "Kunteksto: %C\n"
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -8830,27 +9060,27 @@ msgstr ""
 "Ŝan�o:  %z\n"
 "Kreo:   %w\n"
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
 msgstr ""
 
-#: src/stat.c:1356
+#: src/stat.c:1418
 msgid ""
 "  -L, --dereference     follow links\n"
 "  -f, --file-system     display file system status instead of file status\n"
 msgstr ""
 
-#: src/stat.c:1360
+#: src/stat.c:1422
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 msgid ""
 "\n"
 "The valid format sequences for files (without --file-system):\n"
@@ -8862,7 +9092,7 @@ msgid ""
 "  %C   SELinux security context string\n"
 msgstr ""
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 msgid ""
 "  %d   device number in decimal\n"
 "  %D   device number in hex\n"
@@ -8872,7 +9102,7 @@ msgid ""
 "  %G   group name of owner\n"
 msgstr ""
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 msgid ""
 "  %h   number of hard links\n"
 "  %i   inode number\n"
@@ -8881,11 +9111,11 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 
-#: src/stat.c:1399
+#: src/stat.c:1461
 msgid ""
 "  %u   user ID of owner\n"
 "  %U   user name of owner\n"
@@ -8893,14 +9123,14 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 msgid ""
 "Valid format sequences for file systems:\n"
 "\n"
@@ -8911,7 +9141,7 @@ msgid ""
 "  %f   free blocks in file system\n"
 msgstr ""
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 msgid ""
 "  %i   file system ID in hex\n"
 "  %l   maximum length of filenames\n"
@@ -8972,22 +9202,27 @@ msgid ""
 "and are thus unaffected by 'stdbuf' settings.\n"
 msgstr ""
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, c-format
 msgid "failed to find %s"
 msgstr "malsukcesis trovi %s"
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, c-format
 msgid "failed to update the environment with %s"
 msgstr "malsukcesis �isdatigi la ĉirkaŭaĵon kun %s"
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
-msgstr "linia bufrado de ĉefenigaĵo sensencas"
+msgstr "sensencas linibufrado de ĉefenigujo"
+
+#: src/stdbuf.c:376
+#, c-format
+msgid "you must specify a buffering mode option"
+msgstr "nepras indiki opcion por bufra moduso"
 
-#: src/stty.c:513
+#: src/stty.c:516
 #, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -8998,25 +9233,25 @@ msgstr ""
 "       aÅ­:  %s [-F APARATO | --file=APARATO] [-a|--all]\n"
 "       aÅ­:  %s [-F APARATO | --file=APARATO] [-g|--save]\n"
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
 msgstr ""
 
-#: src/stty.c:525
+#: src/stty.c:528
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
 "  -g, --save         print all current settings in a stty-readable form\n"
 "  -F, --file=DEVICE  open and use the specified DEVICE instead of stdin\n"
 msgstr ""
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
 "settings.  The underlying system defines which settings are available.\n"
 msgstr ""
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -9025,7 +9260,7 @@ msgid ""
 "   eol CHAR      CHAR will end the line\n"
 msgstr ""
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -9033,7 +9268,7 @@ msgid ""
 "   kill CHAR     CHAR will erase the current line\n"
 msgstr ""
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -9041,7 +9276,7 @@ msgid ""
 "   start CHAR    CHAR will restart the output after stopping it\n"
 msgstr ""
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -9049,7 +9284,7 @@ msgid ""
 " * werase CHAR   CHAR will erase the last word typed\n"
 msgstr ""
 
-#: src/stty.c:562
+#: src/stty.c:565
 msgid ""
 "\n"
 "Special settings:\n"
@@ -9058,7 +9293,7 @@ msgid ""
 " * columns N     same as cols N\n"
 msgstr ""
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -9067,7 +9302,7 @@ msgid ""
 "   ospeed N      set the output speed to N\n"
 msgstr ""
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -9076,7 +9311,7 @@ msgid ""
 "   time N        with -icanon, set read timeout of N tenths of a second\n"
 msgstr ""
 
-#: src/stty.c:581
+#: src/stty.c:584
 msgid ""
 "\n"
 "Control settings:\n"
@@ -9087,7 +9322,7 @@ msgid ""
 "   csN           set character size to N bits, N in [5..8]\n"
 msgstr ""
 
-#: src/stty.c:590
+#: src/stty.c:593
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
 "   [-]hup        send a hangup signal when the last process closes the tty\n"
@@ -9095,9 +9330,10 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -9107,7 +9343,7 @@ msgid ""
 "   [-]igncr      ignore carriage return\n"
 msgstr ""
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -9116,11 +9352,11 @@ msgid ""
 "   [-]istrip     clear high (8th) bit of input characters\n"
 msgstr ""
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr ""
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -9130,7 +9366,7 @@ msgid ""
 "   [-]tandem     same as [-]ixoff\n"
 msgstr ""
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -9140,17 +9376,17 @@ msgid ""
 " * nlN           newline delay style, N in [0..1]\n"
 msgstr ""
 
-#: src/stty.c:631
+#: src/stty.c:635
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
 " * [-]onlret     newline performs a carriage return\n"
 msgstr ""
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -9160,7 +9396,7 @@ msgid ""
 " * vtN           vertical tab delay style, N in [0..1]\n"
 msgstr ""
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -9169,7 +9405,7 @@ msgid ""
 " * -crtkill      kill all line by obeying the echoctl and echok settings\n"
 msgstr ""
 
-#: src/stty.c:654
+#: src/stty.c:658
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
 "   [-]echo       echo input characters\n"
@@ -9178,7 +9414,7 @@ msgid ""
 "   [-]echok      echo a newline after a kill character\n"
 msgstr ""
 
-#: src/stty.c:661
+#: src/stty.c:665
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
 "   [-]echonl     echo newline even if not echoing other characters\n"
@@ -9187,7 +9423,7 @@ msgid ""
 "   [-]iexten     enable non-POSIX special characters\n"
 msgstr ""
 
-#: src/stty.c:668
+#: src/stty.c:672
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
 "   [-]noflsh     disable flushing after interrupt and quit special "
@@ -9197,7 +9433,7 @@ msgid ""
 " * [-]xcase      with icanon, escape with '\\' for uppercase characters\n"
 msgstr ""
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -9206,7 +9442,7 @@ msgid ""
 "   -cbreak       same as icanon\n"
 msgstr ""
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -9214,7 +9450,7 @@ msgid ""
 "   crt           same as echoe echoctl echoke\n"
 msgstr ""
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -9223,7 +9459,7 @@ msgid ""
 "   evenp         same as parenb -parodd cs7\n"
 msgstr ""
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -9233,7 +9469,7 @@ msgid ""
 "   -nl           same as icrnl -inlcr -igncr onlcr -ocrnl -onlret\n"
 msgstr ""
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -9242,7 +9478,7 @@ msgid ""
 "   -pass8        same as parenb istrip cs7\n"
 msgstr ""
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -9250,7 +9486,7 @@ msgid ""
 "   -raw          same as cooked\n"
 msgstr ""
 
-#: src/stty.c:716
+#: src/stty.c:720
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
 "                 -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n"
@@ -9260,7 +9496,7 @@ msgid ""
 "                 characters to their default values\n"
 msgstr ""
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -9274,12 +9510,12 @@ msgstr ""
 "SIGNO prezentas sin mem, aÅ­ estas kodita (ekzemple ^c, 0x37, 0177, aÅ­ 127);\n"
 "la specialaj valoroj '^-' aÅ­ 'undef' malebligas specialajn signojn.\n"
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, c-format
 msgid "only one device may be specified"
 msgstr "eblas indiki nur unu aparaton"
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
@@ -9287,43 +9523,43 @@ msgid ""
 msgstr ""
 "nekombineblas opcioj '-a' kaj '-g' (por hom-legebla kaj stty-legebla eligo)"
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr "ne permesatas indiki re�imon kune kun indiko de eligostilo"
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr "%s: malsukcesis reagordi nebarantan moduson"
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, c-format
 msgid "invalid argument %s"
 msgstr "nevalida argumento %s"
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, c-format
 msgid "missing argument to %s"
 msgstr "mankas argumento al %s"
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, c-format
 msgid "invalid line discipline %s"
 msgstr "nevalida protokolo %s por lineo"
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr "%s: ne eblas efiki ĉiujn petatajn operaciojn"
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr "%s: mankas informo pri grando de ĉi tiu aparato"
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, c-format
 msgid "invalid integer argument %s"
 msgstr "nevalida entjerargumento %s"
@@ -9350,13 +9586,13 @@ msgid ""
 "Force changed blocks to disk, update the super block.\n"
 "\n"
 msgstr ""
-"Devigas skribon de �an�itaj blokoj al disko, kaj �isdatigas la superblokon.\n"
+"Devigas skribon de �an�itaj blokoj al disko, kaj �isdatigas la ĉefblokon.\n"
 "\n"
 
 #: src/sync.c:69
 #, c-format
 msgid "ignoring all arguments"
-msgstr "ignoratas ĉiuj argumentoj"
+msgstr "ignori�as ĉiuj argumentoj"
 
 #: src/system.h:343
 #, c-format
@@ -9375,22 +9611,23 @@ msgstr "      --help        montri ĉi tiun helpon kaj eliri\n"
 msgid "      --version  output version information and exit\n"
 msgstr "      --version     montri programversion kaj eliri\n"
 
-#: src/system.h:544
-#, fuzzy
+#: src/system.h:543
 msgid ""
 "\n"
 "Mandatory arguments to long options are mandatory for short options too.\n"
-msgstr "(Endaj argumentoj por longaj opcioj ankaÅ­ endas por la mallongaj.)\n"
+msgstr ""
+"\n"
+"(Endaj argumentoj por longaj opcioj ankaÅ­ endas por la mallongaj.)\n"
 
-#: src/system.h:552
+#: src/system.h:551
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -9399,37 +9636,37 @@ msgid ""
 "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n"
 msgstr ""
 
-#: src/system.h:571
+#: src/system.h:570
 #, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
+"%s online help: <%s>\n"
 msgstr ""
 "\n"
-"Raportu programmisojn en «%s» al <%s>.\n"
+"Helpo pri «%s» en la reto: <%s>\n"
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr ""
 "Sciigu tradukerarojn en «%s» al <translation-team-eo@lists.sourceforge."
 "net>.\n"
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr "Por kompleta dokumentado rulu: info coreutils '%s invocation'\n"
 
-#: src/system.h:596
+#: src/system.h:591
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Tajpu '%s --help' por pli da informoj.\n"
 
-#: src/system.h:628
+#: src/system.h:633
 #, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -9445,7 +9682,6 @@ msgid "Jay Lepreau"
 msgstr "Äœej LEPRO (Jay Lepreau)"
 
 #: src/tac.c:137
-#, fuzzy
 msgid ""
 "Write each FILE to standard output, last line first.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -9506,66 +9742,60 @@ msgid "Ian Lance Taylor"
 msgstr "Ien Lans TEJLOR (Ian Lance Taylor)"
 
 #: src/tail.c:262
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Print the last %d lines of each FILE to standard output.\n"
 "With more than one FILE, precede each with a header giving the file name.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
 "Eligas la %d lastajn liniojn de ĉiu indikata DOSIERO al ĉefeligujo.\n"
-"Kun plu ol unu DOSIERO, eligas la dosiernomon antaÅ­ la liniojn.\n"
+"Kun pli ol unu DOSIERO, eligas la dosiernomon antaÅ­ la liniojn.\n"
 "Sen DOSIERO, aŭ kiam DOSIERO estas «-», ĉefenigujo legi�as.\n"
 
 #: src/tail.c:270
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
 
 #: src/tail.c:274
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 
-#: src/tail.c:281
+#: src/tail.c:280
 #, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
 
-#: src/tail.c:294
+#: src/tail.c:293
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 
-#: src/tail.c:301
+#: src/tail.c:298
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 
-#: src/tail.c:310
+#: src/tail.c:307
 msgid ""
 "\n"
 "If the first character of K (the number of bytes or lines) is a '+',\n"
@@ -9576,7 +9806,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/tail.c:319
+#: src/tail.c:316
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
 "means that even if a tail'ed file is renamed, tail will continue to track\n"
@@ -9586,159 +9816,164 @@ msgid ""
 "named file in a way that accommodates renaming, removal and creation.\n"
 msgstr ""
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr "fermi�as %s (dosiernumero=%d)"
 
-#: src/tail.c:453
-#, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr "%s: ne eblas fari 'seek' al relativa pozicio %s"
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr "%s: ne eblas fari 'seek' al finrelativa pozicio %s"
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr "ne eblas eltrovi lokon de %s;  uzatas nun skrutinio"
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
 "reverting to polling"
 msgstr ""
 
-#: src/tail.c:963
+#: src/tail.c:965
+#, c-format
+msgid "%s has been replaced with a symbolic link. giving up on this name"
+msgstr "%s anstataŭi�is per simbola ligo;  rezignatas pri ĉi tiu nomo"
+
+#: src/tail.c:980
 #, c-format
 msgid "%s has become inaccessible"
 msgstr "%s i�is neatingebla"
 
-#: src/tail.c:980
+#: src/tail.c:997
 #, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr "%s anstataŭi�is per nesekvebla dosiero;  rezignatas pri ĉi tiu nomo"
 
-#: src/tail.c:989
+#: src/tail.c:1006
 #, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr "%s anstataŭi�is per fora dosiero;  rezignatas pri ĉi tiu nomo"
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, c-format
 msgid "%s has become accessible"
 msgstr "%s i�is atingebla"
 
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr "%s aperis;  sekvatas fino de nova dosiero"
 
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr "%s anstataŭi�is;  sekvatas fino de nova dosiero"
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr "%s: ne eblas �an�i nebarantan moduson"
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr "%s: dosiero trunkitas"
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr "ne restas dosieroj"
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, c-format
 msgid "cannot watch parent directory of %s"
 msgstr "ne eblas rigardadi patran dosierujon de %s"
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, c-format
 msgid "inotify resources exhausted"
 msgstr "mankas sufiĉaj risurcoj por 'inotify'"
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, c-format
 msgid "cannot watch %s"
 msgstr "ne eblas rigardadi %s"
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr "eraro dum rigardado de 'inotify'-evento"
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, c-format
 msgid "error reading inotify event"
 msgstr "eraro dum legado de 'inotify'-evento"
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr "%s anstataŭi�is per fora dosiero;  rezignatas pri ĉi tiu nomo"
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, c-format
 msgid "number in %s is too large"
 msgstr "nombro en %s tro grandas"
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr "nevalida nombro da sen�an�aj statinformoj inter malfermoj: %s"
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr "%s: nevalida PID"
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr "%s: nevalida nombro da sekundoj"
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr "opcio uzatas en nevalida kunteksto -- %c"
 
-#: src/tail.c:2034
+#: src/tail.c:2096
+#, c-format
+msgid "warning: --retry ignored; --retry is useful only when following"
+msgstr "averto: opcio '--retry' ignori�as; �i utilas nur dum sekvado"
+
+#: src/tail.c:2100
 #, c-format
-msgid "warning: --retry is useful mainly when following by name"
-msgstr "averto: opcio '--retry' ĉefe utilas dum sekvado je nomo"
+msgid "warning: --retry only effective for the initial open"
+msgstr "averto: opcio '--retry' efikas nur dum unua malfermo"
 
-#: src/tail.c:2038
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
-msgstr "averto: PID ignoratas; opcio '--pid=PID' ĉefe utilas nur dum sekvado"
+msgstr "averto: PID ignori�as; opcio '--pid=PID' utilas nur dum sekvado"
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr "averto: opcio '--pid=PID' ne subtenatas en ĉi tiu sistemo"
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, c-format
 msgid "cannot follow %s by name"
 msgstr "ne eblas sekvi %s je nomo"
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
-msgstr "averto: sekvi ĉefenigujon senĉese ne efikas"
+msgstr "averto: sekvi senĉese ĉefenigujon ne efikas"
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr "ne eblas uzi 'inotify';  uzatas nun skrutinio"
@@ -9950,21 +10185,21 @@ msgid "extra argument %s"
 msgstr "superflua argumento: %s"
 
 #: src/timeout.c:112
-#, fuzzy, c-format
+#, c-format
 msgid "warning: sigprocmask"
-msgstr "averto: malsukcesis krei horlo�on"
+msgstr "averto: malsukcesis malbloki signalon"
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr "averto: malsukcesis agordi horlo�tempon"
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr "averto: malsukcesis krei horlo�on"
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
@@ -9973,34 +10208,29 @@ msgstr ""
 "Uzmaniero:  %s [OPCIO] DAŬRO KOMANDO [ARGUMENTO...]\n"
 "       aÅ­:  %s [OPCIO]\n"
 
-#: src/timeout.c:229
-#, fuzzy
+#: src/timeout.c:232
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
-msgstr ""
-"Startas KOMANDOn, kaj ĉesigas �in kiam �i ankoraŭ rulas post DAŬRO.\n"
-"\n"
-"(Endaj argumentoj por longaj opcioj ankaÅ­ endas por la mallongaj.)\n"
+msgstr "Startas KOMANDOn, kaj ĉesigas �in kiam �i ankoraŭ rulas post DAŬRO.\n"
 
-#: src/timeout.c:235
+#: src/timeout.c:238
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 msgid ""
 "\n"
 "DURATION is a floating point number with an optional suffix:\n"
@@ -10008,7 +10238,7 @@ msgid ""
 "days.\n"
 msgstr ""
 
-#: src/timeout.c:259
+#: src/timeout.c:262
 msgid ""
 "\n"
 "If the command times out, and --preserve-status is not set, then exit with\n"
@@ -10019,17 +10249,17 @@ msgid ""
 "case the exit status is 128+9 rather than 124.\n"
 msgstr ""
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr "averto: malsukcesis mal�alti nekropsiojn"
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, c-format
 msgid "error waiting for command"
 msgstr "eraro dum atendado je komando"
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr ""
@@ -10328,6 +10558,7 @@ msgstr "Eliras kun rezultkodo kiu indikas malsukceson."
 msgid "Usage: %s OPTION... FILE...\n"
 msgstr "Uzmaniero:  %s OPCIO... DOSIERO...\n"
 
+# XXX -- Please add period.
 #: src/truncate.c:97
 msgid ""
 "Shrink or extend the size of each FILE to the specified size\n"
@@ -10338,21 +10569,32 @@ msgid ""
 "If a FILE is shorter, it is extended and the extended part (hole)\n"
 "reads as zero bytes.\n"
 msgstr ""
+"Ŝrumpigas aŭ etendas ĉiun indikatan DOSIEROn al la indikata grando.\n"
+"\n"
+"Se DOSIERO estas pli longa ol la indikata grando, la pluaj datumoj "
+"perdi�os.\n"
+"Se DOSIERO estas malpli longa, �i etendi�as, kaj la parto etendata (truo)\n"
+"legi�as kiel nulbajtoj.  Se iu argumenta DOSIERO ne ekzistas, �i krei�as.\n"
 
 #: src/truncate.c:109
 msgid "  -c, --no-create        do not create any files\n"
-msgstr ""
+msgstr "  -c, --no-create         ne krei iun ajn dosieron\n"
 
 #: src/truncate.c:112
 msgid ""
 "  -o, --io-blocks        treat SIZE as number of IO blocks instead of bytes\n"
 msgstr ""
+"  -o, --io-blocks         trakti GRANDOn kiel nombro de en-eligaj blokoj\n"
+"                            anstataÅ­ kiel bajtoj\n"
 
 #: src/truncate.c:115
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
+"  -r, --reference=REFDOS  uzi la grandon de ĉi tiu referenca dosiero\n"
+"  -s. --size=GRANDO       agordi aŭ adapti la dosiergrandon laŭ ĉi tiu "
+"GRANDO\n"
 
 #: src/truncate.c:121
 msgid ""
@@ -10361,6 +10603,10 @@ msgid ""
 "'+' extend by, '-' reduce by, '<' at most, '>' at least,\n"
 "'/' round down to multiple of, '%' round up to multiple of.\n"
 msgstr ""
+"\n"
+"Eblas prefiksi GRANDOn per unu el la sekvaj modifaj signoj:\n"
+"'+' etendi kun, '-' �rumpigi kun, '<' maksimume, '>' minimume,\n"
+"'/' subrondigi al multoblo de, '%' superrondigi al multoblo de.\n"
 
 #: src/truncate.c:149
 #, c-format
@@ -10436,12 +10682,12 @@ msgstr ""
 "\n"
 "Sen DOSIERO, aŭ kiam DOSIERO estas «-», ĉefenigujo legi�as.\n"
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr "%s: enigo enhavas malparecan nombron de simboloj"
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr "%s: enigo enhavas iteracion:"
@@ -10509,7 +10755,6 @@ msgid "cannot get system name"
 msgstr "malsukcesis eltrovi la nomon de la sistemo"
 
 #: src/unexpand.c:117
-#, fuzzy
 msgid ""
 "Convert blanks in each FILE to tabs, writing to standard output.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -10542,13 +10787,12 @@ msgstr "tabaj pozicioj tro malproksimas"
 msgid "tab stop value is too large"
 msgstr "taba pozicio estas tro granda"
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr "Uzmaniero:  %s [OPCIO...] [ENIGDOSIERO [ELIGDOSIERO]]\n"
 
-#: src/uniq.c:138
-#, fuzzy
+#: src/uniq.c:174
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
 "writing to OUTPUT (or standard output).\n"
@@ -10561,40 +10805,59 @@ msgstr ""
 "Sen opcioj, kongruaj linioj estas kunfandataj al la unua okazo.\n"
 "\n"
 
-#: src/uniq.c:147
+#: src/uniq.c:183
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
 msgstr ""
 "  -c, --count           prefiksi liniojn per la nombro de okazoj\n"
-"  -d, --repeated        montri nur la ripetitajn liniojn\n"
+"  -d, --repeated        montri nur la ripetitajn liniojn, unu por ĉiu grupo\n"
+
+#: src/uniq.c:187
+msgid ""
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
+msgstr ""
+"  -D, --all-repeated[=DISIGMETODO]  montri ĉiujn ripetitajn liniojn;\n"
+"                          DISIGMETODO povas esti 'none' (defaÅ­lte), "
+"'prepend',\n"
+"                          aŭ 'separate'; disigo fari�as per vakaj linioj\n"
+
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr "  -f, --skip-fields=N   eviti kompari la unuajn N kampojn\n"
 
-#: src/uniq.c:151
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
+msgstr ""
+"      --group[=DISIGMETODO]  montri ĉiujn erojn, disigante grupojn per "
+"vaklinio;\n"
+"                          DISIGMETODO povas esti 'separate' (disige, "
+"defaÅ­lte),\n"
+"                          'prepend' (antaÅ­meto), 'append' (postmeto),\n"
+"                          aÅ­ 'both' (ambaÅ­)\n"
+
+#: src/uniq.c:199
+#, fuzzy
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
 "  -i, --ignore-case     ignore differences in case when comparing\n"
 "  -s, --skip-chars=N    avoid comparing the first N characters\n"
 "  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
 msgstr ""
-"  -D, --all-repeated[=disigmetodo]  montri ĉiujn ripetitajn liniojn;\n"
-"                          disigmetodo povas esti 'none' (defaÅ­lte), "
-"'prepend',\n"
-"                          aŭ 'separate'; disigo fari�as per vakaj linioj\n"
-"  -f, --skip-fields=N   eviti kompari la unuajn N kampojn\n"
-"  -i, --ignore-case     ignori malsamecojn usklecajn je komparo\n"
+"  -i, --ignore-case     ignori usklecajn malsamecojn je komparo\n"
 "  -s, --skip-chars=N    eviti kompari la unuajn N signojn\n"
-"  -u, --unique          nur montri unikajn liniojn\n"
-"  -z, --zero-terminated   fini liniojn per NUL-bajto anstataÅ­ novlinio\n"
+"  -u, --unique          montri nur unikajn liniojn\n"
+"  -z, --zero-terminated   fini liniojn per nulbajto anstataÅ­ per novlinio\n"
 
-#: src/uniq.c:161
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr "  -w, --check-chars=N   kompari en ĉiu linio ne pli ol N signoj\n"
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 msgid ""
 "\n"
 "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n"
@@ -10602,9 +10865,9 @@ msgid ""
 msgstr ""
 "\n"
 "Kampo estas vico de blankspacoj (kutime spacetoj kaj/aÅ­ taboj) kaj poste\n"
-"neblankaj signoj.  Kampoj salti�as antaŭ signoj.\n"
+"neblankaj signoj.  Kampoj transsalti�as antaŭ signoj.\n"
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 msgid ""
 "\n"
 "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n"
@@ -10616,24 +10879,34 @@ msgstr ""
 "Vi eble volas unue ordigi la enigon, aÅ­ uzi 'sort -u' sen 'uniq'.\n"
 "AnkaÅ­, komparoj honoras la regulojn indikatajn de 'LC_COLLATE'.\n"
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, c-format
 msgid "too many repeated lines"
 msgstr "tro da ripetitaj linioj"
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
 msgstr "nevalida nombro de saltendaj kampoj"
 
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
 msgstr "nevalida nombro de saltendaj bajtoj"
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
 msgstr "nevalida nombro de komparendaj bajtoj"
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr "nekombineblas opcio «--group» kun «-c», «-d», «-D», kaj «-u»"
+
+#: src/uniq.c:652
+#, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr "sensencas kaj grupigi kaj montri ripetnombrojn"
+
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr "sensencas montri kaj ĉiujn ripetitajn liniojn kaj la ripetnombrojn"
@@ -10655,11 +10928,6 @@ msgstr ""
 "Forigas la indikatan DOSIEROn per alvoko al funkcio 'unlink()'.\n"
 "\n"
 
-#: src/unlink.c:86
-#, c-format
-msgid "cannot unlink %s"
-msgstr "malsukcesis forigi %s"
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -10688,9 +10956,9 @@ msgstr[0] "rulas %ld tago %2d:%02d,  "
 msgstr[1] "rulas %ld tagoj %2d:%02d,  "
 
 #: src/uptime.c:149
-#, fuzzy, c-format
+#, c-format
 msgid "up  %2d:%02d,  "
-msgstr "rulas %ld tago %2d:%02d,  "
+msgstr "rulas  %2d:%02d,  "
 
 #: src/uptime.c:151
 #, c-format
@@ -10704,7 +10972,7 @@ msgstr[1] "%lu uzantoj"
 msgid ",  load average: %.2f"
 msgstr ",  meznombra �ar�o: %.2f"
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -10715,7 +10983,7 @@ msgstr ""
 "de uzantoj, kaj la meznombro de taskoj en la rulvico dum la lastaj 1, 5\n"
 "kaj 15 minutoj."
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
@@ -10724,12 +10992,12 @@ msgstr ""
 "  Procezoj en ne-interrompebla dormstato ankaÅ­ kontribuas\n"
 "al la meznombra �ar�o.\n"
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr "\n"
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
@@ -10966,23 +11234,130 @@ msgstr ""
 "Daŭre eligas linion kun (ĉiuj) indikata(j) ĈENO(j), aŭ 'y'.\n"
 "\n"
 
-#~ msgid "using single-precision arithmetic"
-#~ msgstr "uzi�as aritmetiko de simpla precizeco"
+#~ msgid "cannot create pipe"
+#~ msgstr "ne eblas krei dukton"
 
-#~ msgid "using arbitrary-precision arithmetic"
-#~ msgstr "uzi�as aritmetiko de arbitra precizeco"
+#~ msgid "%s subprocess failed"
+#~ msgstr "subprocezo %s malsukcesis"
 
-#, fuzzy
-#~ msgid "  returning value: '%s'\n"
-#~ msgstr "krei�as dosiero %s\n"
+#~ msgid "_open_osfhandle failed"
+#~ msgstr "'_open_osfhandle()' malsukcesis "
 
-#, fuzzy
-#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n"
-#~ msgstr "Uzmaniero:  %s [OPCIO] NOMO...\n"
+#~ msgid "cannot restore fd %d: dup2 failed"
+#~ msgstr "ne eblas restaÅ­ri dosiernumeron %d: 'dup2()' malsukcesis"
 
-#, fuzzy
-#~ msgid "no valid suffix found\n"
-#~ msgstr "nevalida sufikslongo: %s"
+#~ msgid "%s subprocess"
+#~ msgstr "subprocezo %s"
+
+#~ msgid "%s subprocess got fatal signal %d"
+#~ msgstr "subprocezo %s ricevis pereigan signalon %d"
+
+#~ msgid "failed to set additional groups"
+#~ msgstr "malsukcesis agordi la pluajn grupojn"
+
+#~ msgid "mount point %s already traversed"
+#~ msgstr "muntloko %s jam trakti�is"
+
+#~ msgid "%s: cannot lseek back to original position"
+#~ msgstr "%s: ne eblas fari 'lseek' reen al unua pozicio"
+
+#~ msgid "%s: failed to reset file pointer"
+#~ msgstr "%s: malsukcesis reagordi dosierpozician indikilon"
+
+#~ msgid "cannot reposition file pointer for %s"
+#~ msgstr "ne eblas �an�i dosierpozician indikilon pri %s"
+
+#~ msgid ""
+#~ "  -Z, --context[=CTX]  set the SELinux security context of each NAME to\n"
+#~ "                         default type, or CTX if specified\n"
+#~ msgstr ""
+#~ "  -Z, --context[=KUNTEKSTO]  agordi sekurecan kuntekston de ĉiu NOMO al\n"
+#~ "                               defaŭlta tipo, aŭ al KUNTEKSTO se �i "
+#~ "indikatas\n"
+
+#~ msgid ""
+#~ "  -Z, --context[=CTX]  set the SELinux security context of NAME to\n"
+#~ "                         default type, or to CTX if specified\n"
+#~ msgstr ""
+#~ "  -Z, --context[=KUNTEKSTO]  agordi sekurecan kuntekston de NOMO al\n"
+#~ "                               defaŭlta tipo, aŭ al KUNTEKSTO se �i "
+#~ "indikatas\n"
+
+#~ msgid "out of memory (requested %zu bytes)"
+#~ msgstr "mankas sufiĉa memoro (%zu bajtoj peti�is)"
+
+#~ msgid "--padding cannot be combined with --format"
+#~ msgstr "nekombineblas opcioj «--padding» kaj «--format»"
+
+#~ msgid ""
+#~ "Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
+#~ "  or:  %s LONG-OPTION\n"
+#~ msgstr ""
+#~ "Uzmaniero:  %s [MALLONGA_OPCIO...] UZANTO KOMANDO [ARGUMENTO...]\n"
+#~ "       aÅ­:  %s LONGA_OPCIO\n"
+
+#~ msgid "unknown user-ID: %s"
+#~ msgstr "nekonata uzant-ID: %s"
+
+#~ msgid "to use user-ID %s you need to use -g too"
+#~ msgstr "por uzi uzant-ID %s nepras uzi ankaÅ­ opcion '-g'"
+
+#~ msgid "cannot set group-ID to %lu"
+#~ msgstr "ne eblas agordi grupan ID-on al %lu"
+
+#~ msgid "cannot set user-ID to %lu"
+#~ msgstr "ne eblas agordi uzantan ID-on al %lu"
+
+#~ msgid "failed to get file system create context"
+#~ msgstr "malsukcesis eltrovi dosiersisteman krean kuntekston"
+
+#~ msgid "warning: "
+#~ msgstr "averto: "
+
+#~ msgid "Usage: %s [OPTION]... [USERNAME]\n"
+#~ msgstr "Uzmaniero:  %s [OPCIO...] [UZANTNOMO]\n"
+
+#~ msgid ""
+#~ "      --strict         with --check, exit non-zero for any invalid input\n"
+#~ msgstr ""
+#~ "      --strict         kun «--check»: eliri nenule por iu ajn nevalida "
+#~ "enigo\n"
+
+#~ msgid "failed to redirect stderr to /dev/null"
+#~ msgstr "malsukcesis alidirektigi ĉeferar-eligujon al /dev/null"
+
+#~ msgid "invalid number: '%s'"
+#~ msgstr "nevalida numero: '%s'"
+
+#~ msgid ""
+#~ "\n"
+#~ "With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Sen DOSIERO, aŭ kiam DOSIERO estas «-», ĉefenigujo legi�as.\n"
+#~ "Defaŭlte uzi�as opcio «-F /».\n"
+
+#~ msgid "cannot remove directory: %s"
+#~ msgstr "ne eblas forigi dosierujon %s"
+
+#~ msgid "dup2 failed"
+#~ msgstr "malsukcesis dup2()"
+
+#~ msgid "couldn't execute %s"
+#~ msgstr "malsukcesis ruli %s"
+
+#~ msgid "couldn't execute %s -d"
+#~ msgstr "malsukcesis ruli '%s -d'"
+
+#~ msgid ""
+#~ "\n"
+#~ "Report %s bugs to %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Raportu programmisojn en «%s» al <%s>.\n"
+
+#~ msgid "warning: --retry is useful mainly when following by name"
+#~ msgstr "averto: opcio '--retry' ĉefe utilas dum sekvado je nomo"
 
 #~ msgid "reading %s"
 #~ msgstr "legi�as %s"
@@ -10999,6 +11374,12 @@ msgstr ""
 #~ msgid "opening %s"
 #~ msgstr "malfermi�as %s"
 
+#~ msgid "using single-precision arithmetic"
+#~ msgstr "uzi�as aritmetiko de simpla precizeco"
+
+#~ msgid "using arbitrary-precision arithmetic"
+#~ msgstr "uzi�as aritmetiko de arbitra precizeco"
+
 #~ msgid ""
 #~ "WARNING: --page-increment is deprecated; use --line-increment instead"
 #~ msgstr ""
diff --git a/po/es.gmo b/po/es.gmo
index eda281f0..9236a89e 100644
--- a/po/es.gmo
+++ b/po/es.gmo
diff --git a/po/es.po b/po/es.po
index a694cf54..6a2eeae7 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,7 +1,7 @@
 # Mensajes en español para GNU coreutils.
-# Copyright (C) 2002, 2003, 2004, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2010, 2011, 2013, 2014 Free Software Foundation, Inc.
 # This file is distributed under the same license as the coreutils package.
-# Santiago Vila Doncel <sanvila@unex.es>, 2002, 2003, 2004, 2010, 2011.
+# Santiago Vila Doncel <sanvila@unex.es>, 2002, 2003, 2004, 2010, 2011, 2013, 2014.
 #
 # La primera versión de esta traducción se hizo combinando las traducciones
 # existentes de fileutils, textutils y sh-utils, en las cuales también
@@ -9,12 +9,12 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU coreutils 8.14\n"
+"Project-Id-Version: GNU coreutils 8.23-pre1\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
-"PO-Revision-Date: 2011-10-18 15:26+0200\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
+"PO-Revision-Date: 2014-07-16 20:12+0200\n"
 "Last-Translator: Santiago Vila Doncel <sanvila@unex.es>\n"
-"Language-Team: Spanish <es@li.org>\n"
+"Language-Team: Spanish <es@tp.org.es>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,76 +39,124 @@ msgstr "Los argumentos válidos son:"
 msgid "error closing file"
 msgstr "error al cerrar el fichero"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "error de escritura"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "se conservan los permisos de %s"
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "Error del sistema desconocido"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "fichero regular vacío"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "fichero regular"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "directorio"
 
-#: lib/file-type.c:44
-msgid "block special file"
-msgstr "fichero especial de bloques"
-
-#: lib/file-type.c:47
-msgid "character special file"
-msgstr "fichero especial de caracteres"
-
-#: lib/file-type.c:50
-msgid "fifo"
-msgstr "`fifo'"
-
-#: lib/file-type.c:53
+#: lib/file-type.c:46
 msgid "symbolic link"
 msgstr "enlace simbólico"
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "`socket'"
-
-#: lib/file-type.c:59
+#: lib/file-type.c:52
 msgid "message queue"
 msgstr "cola de mensajes"
 
-#: lib/file-type.c:62
+#: lib/file-type.c:55
 msgid "semaphore"
 msgstr "semáforo"
 
-#: lib/file-type.c:65
+#: lib/file-type.c:58
 msgid "shared memory object"
 msgstr "objeto de memoria compartida"
 
-#: lib/file-type.c:68
+#: lib/file-type.c:61
 msgid "typed memory object"
 msgstr "objeto de memoria con tipo"
 
-#: lib/file-type.c:70
+#: lib/file-type.c:66
+msgid "block special file"
+msgstr "fichero especial de bloques"
+
+#: lib/file-type.c:69
+msgid "character special file"
+msgstr "fichero especial de caracteres"
+
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr ""
+
+#: lib/file-type.c:75
+msgid "fifo"
+msgstr "`fifo'"
+
+#: lib/file-type.c:78
+msgid "door"
+msgstr ""
+
+#: lib/file-type.c:81
+#, fuzzy
+msgid "multiplexed block special file"
+msgstr "fichero especial de bloques"
+
+#: lib/file-type.c:84
+#, fuzzy
+msgid "multiplexed character special file"
+msgstr "fichero especial de caracteres"
+
+#: lib/file-type.c:87
+#, fuzzy
+msgid "multiplexed file"
+msgstr "se han especificado varios roles"
+
+#: lib/file-type.c:90
+#, fuzzy
+msgid "named file"
+msgstr "fichero extraño"
+
+#: lib/file-type.c:93
+#, fuzzy
+msgid "network special file"
+msgstr "fichero especial de bloques"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr ""
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr ""
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr ""
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "`socket'"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr ""
+
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "fichero extraño"
 
@@ -268,18 +316,18 @@ msgstr "%s: la opción '-W %s' no admite ningún argumento\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: la opción '-W %s' requiere un argumento\n"
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr "no se pueden cambiar los permisos de %s"
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "no se puede crear el directorio %s"
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr "memoria agotada"
@@ -399,7 +447,7 @@ msgstr "La expresión regular es demasiado grande"
 msgid "Unmatched ) or \\)"
 msgstr ") o \\) desemparejado"
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 msgid "No previous regular expression"
 msgstr "No hay ninguna expresión regular previa"
 
@@ -426,9 +474,9 @@ msgstr "utilice --no-preserve-root para saltarse esta medida de seguridad"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
-msgstr "^[sS]"
+msgstr "^[sSyY]"
 
 # Y esto es para responder "no" cuando nos pregunte.
 #. TRANSLATORS: A regular expression testing for a negative answer
@@ -437,11 +485,11 @@ msgstr "^[sS]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, c-format
 msgid "setting permissions for %s"
 msgstr "estableciendo los permisos de %s"
@@ -611,52 +659,6 @@ msgstr "Fallo de alimentación"
 msgid "Resource lost"
 msgstr "Recurso perdido"
 
-# Dudo mucho que exista traducción de `fifo', pero si a alguien se le ocurre
-# alguna, por favor, que me diga en qué libro aparece y cuánta gente lo usa
-# (el término, no el libro).
-#
-# FIFO es un acrónimo (First-In, First-Out) ... Primero-que-Entra,
-# Primero-que-Sale (PEPS) ... no queda muy bien ¿no? :) ipg
-#
-# Lo sé, lo sé, pero no está el horno para bollos de inventarse
-# acrónimos en español que nadie usaría (*ni siquiera nosotros*). sv
-#
-# Lo que sí te digo es que es 'la' fifo. Y ya puestos, yo usaría, en todo
-# caso, 'pila fifo' em
-#
-# Es que no es "el fifo" ni "la fifo" sino "el [fichero] fifo"
-# Es un tipo especial de fichero.
-# Para que te quedes tranquilo, añado la palabra "fichero". sv+
-#
-# Ya... y `fifo' no es un fichero, sino una `cola'. tb
-#
-# Creo que se refiere a un "named pipe", de los que se crean con mkfifo.
-# Y es un fichero sólo en tanto que está en un determinado directorio,
-# como los dispositivos en /dev.
-# ¿Debo entender que propones eliminar fichero?
-# (¿y poner además "la cola"?). sv
-#
-# No exactamente. Quiero decir que `fifo' es una cola ---lo decía por toda
-# la discusión anterior---, pero como esta cola está construida sobre un
-# fichero, pues... Y me temo que "fichero para `fifo'" sería ya demasiado.
-# Más vale que lo dejes como está. tb
-#
-# Por una vez, y sin que sirva de precedente, Santiago, me pongo de
-# tu lado :) Déjalo como está :D ipg
-#
-# Gracias a los dos. sv
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, fuzzy, c-format
-msgid "cannot create pipe"
-msgstr "no se puede crear el fichero `fifo' %s"
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, fuzzy, c-format
-msgid "%s subprocess failed"
-msgstr "%s: seek falló"
-
 #: lib/strsignal.c:114
 #, c-format
 msgid "Real-time signal %d"
@@ -749,7 +751,7 @@ msgstr "Empaquetado por %s\n"
 #. locale.  Otherwise, do not translate "(C)"; leave it as-is.
 #: lib/version-etc.c:84
 msgid "(C)"
-msgstr "(C)"
+msgstr "©"
 
 #: lib/version-etc.c:86
 msgid ""
@@ -905,7 +907,7 @@ msgstr ""
 msgid "Report %s bugs to: %s\n"
 msgstr "Comunicar errores en %s a: %s\n"
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Página inicial de %s: <%s>\n"
@@ -915,32 +917,12 @@ msgstr "Página inicial de %s: <%s>\n"
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr "Página inicial de %s: <http://www.gnu.org/software/%s/>\n"
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr ""
 "Ayuda general sobre el uso de software de GNU: <http://www.gnu.org/gethelp/"
 ">\n"
 
-#: lib/w32spawn.h:43
-#, fuzzy, c-format
-msgid "_open_osfhandle failed"
-msgstr "fallo al abrir"
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr ""
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr ""
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr ""
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr "entrada estándar"
@@ -962,7 +944,7 @@ msgstr "flujo desconocido"
 msgid "failed to reopen %s with mode %s"
 msgstr "fallo al reabrir %s con modo %s"
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr "la comparación de cadenas falló"
@@ -983,19 +965,19 @@ msgid "cannot perform formatted output"
 msgstr "no se puede realizar salida formateada"
 
 #: lib/xstrtol-error.c:63
-#, fuzzy, c-format
+#, c-format
 msgid "invalid %s%s argument '%s'"
-msgstr "argumento %s%s inválido `%s'"
+msgstr "argumento %s%s inválido '%s'"
 
 #: lib/xstrtol-error.c:68
-#, fuzzy, c-format
+#, c-format
 msgid "invalid suffix in %s%s argument '%s'"
-msgstr "sufijo inválido en el argumento %s%s `%s'"
+msgstr "sufijo inválido en el argumento %s%s '%s'"
 
 #: lib/xstrtol-error.c:72
-#, fuzzy, c-format
+#, c-format
 msgid "%s%s argument '%s' too large"
-msgstr "%s%s: argumento `%s' demasiado grande"
+msgstr "%s%s: argumento '%s' demasiado grande"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/base64.c:40
@@ -1003,7 +985,7 @@ msgid "Simon Josefsson"
 msgstr "Simon Josefsson"
 
 #: src/base64.c:60
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
 "Base64 encode or decode FILE, or standard input, to standard output.\n"
@@ -1030,7 +1012,7 @@ msgstr ""
 "                          Utilice 0 para desactivar el corte de líneas\n"
 "\n"
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -1053,48 +1035,47 @@ msgstr ""
 "Utilice --ignore-garbage para descartar cualesquiera bytes del flujo\n"
 "de entrada que no pertenezcan al alfabeto.\n"
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "error de lectura"
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, c-format
 msgid "invalid input"
 msgstr "entrada inválida"
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, c-format
 msgid "invalid wrap size: %s"
 msgstr "tamaño del `wrap' inválido: %s"
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, c-format
 msgid "extra operand %s"
 msgstr "operando extra %s"
 
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, c-format
 msgid "closing standard input"
 msgstr "cierre de la entrada estándar"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -1104,16 +1085,15 @@ msgid "David MacKenzie"
 msgstr "David MacKenzie"
 
 #: src/basename.c:48
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s NAME [SUFFIX]\n"
 "  or:  %s OPTION... NAME...\n"
 msgstr ""
 "Modo de empleo: %s NOMBRE [SUFIJO]\n"
-"       o bien:  %s OPCIÓN\n"
+"       o bien:  %s OPCIÓN.. NOMBRE...\n"
 
 #: src/basename.c:53
-#, fuzzy
 msgid ""
 "Print NAME with any leading directory components removed.\n"
 "If specified, also remove a trailing SUFFIX.\n"
@@ -1121,14 +1101,18 @@ msgstr ""
 "Muestra NOMBRE eliminando cualquier componente de directorio que lo "
 "preceda.\n"
 "Si se especifica, también elimina un SUFIJO final.\n"
-"\n"
 
 #: src/basename.c:60
+#, fuzzy
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
+"  -a, --multiple       admite varios argumentos y trata cada uno como un "
+"NOMBRE\n"
+"  -s, --suffix=SUFIJO  elimina el SUFIJO final\n"
+"  -z, --zero           separa la salida con NUL en vez de con nueva línea\n"
 
 #: src/basename.c:67
 #, c-format
@@ -1140,33 +1124,38 @@ msgid ""
 "  %s -s .h include/stdio.h  -> \"stdio\"\n"
 "  %s -a any/str1 any/str2   -> \"str1\" followed by \"str2\"\n"
 msgstr ""
+"\n"
+"Ejemplos:\n"
+"  %s /usr/bin/sort          -> \"sort\"\n"
+"  %s include/stdio.h .h     -> \"stdio\"\n"
+"  %s -s .h include/stdio.h  -> \"stdio\"\n"
+"  %s -a algo/str1 algo/str2   -> \"str1\" seguido por \"str2\"\n"
 
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, c-format
 msgid "missing operand"
 msgstr "falta un operando"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr "Torbjorn Granlund"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 msgid "Richard M. Stallman"
 msgstr "Richard M. Stallman"
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1231,7 +1220,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr "no se puede ejecutar la función `ioctl' sobre %s"
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr "salida estándar"
@@ -1248,14 +1237,14 @@ msgstr "Russell Coker"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 msgid "Jim Meyering"
 msgstr "Jim Meyering"
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, c-format
 msgid "failed to create security context: %s"
 msgstr "fallo al crear el contexto de seguridad: %s"
@@ -1265,8 +1254,8 @@ msgstr "fallo al crear el contexto de seguridad: %s"
 msgid "failed to set %s security context component to %s"
 msgstr "fallo al establecer componente %s del contexto de seguridad a %s"
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, c-format
 msgid "failed to get security context of %s"
 msgstr "fallo al obtener el contexto de seguridad de %s"
@@ -1276,18 +1265,18 @@ msgstr "fallo al obtener el contexto de seguridad de %s"
 msgid "can't apply partial context to unlabeled file %s"
 msgstr "no se puede aplicar contexto parcial al fichero sin etiquetar %s"
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, c-format
 msgid "failed to change context of %s to %s"
 msgstr "fallo al cambiar el contexto de %s a %s"
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
 msgstr "no se puede acceder a %s"
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, c-format
 msgid "cannot read directory %s"
 msgstr "no se puede leer el directorio %s"
@@ -1297,13 +1286,14 @@ msgstr "no se puede leer el directorio %s"
 msgid "changing security context of %s\n"
 msgstr "cambiando el contexto de seguridad de %s\n"
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, c-format
 msgid "fts_read failed"
 msgstr "fts_read falló"
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, c-format
 msgid "fts_close failed"
 msgstr "fts_close falló"
@@ -1321,19 +1311,14 @@ msgstr ""
 "  o bien:  %s [OPCIÓN]... --reference=FICHERO-R FICHERO...\n"
 
 #: src/chcon.c:357
-#, fuzzy
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
-"Cambia el contexto de seguridad de cada FICHERO a CONTEXTO.\n"
+"Cambia el contexto de seguridad SELinux de cada FICHERO a CONTEXTO.\n"
 "Con --reference, cambia el contexto de seguridad de cada FICHERO al de\n"
 "FICHERO-R.\n"
-"\n"
-"  -h, --no-dereference   afecta a los enlaces simbólicos en vez de a "
-"cualquier\n"
-"                           fichero al que apunten\n"
 
 #: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94
 msgid ""
@@ -1342,9 +1327,15 @@ msgid ""
 "  -h, --no-dereference   affect symbolic links instead of any referenced "
 "file\n"
 msgstr ""
+"      --dereference      afecta al referente de cada enlace simbólico (esta "
+"es la opción\n"
+"                           predeterminada), en lugar de al propio enlace "
+"simbólico\n"
+"  -h, --no-dereference   afecta a los enlaces simbólicos en vez de a "
+"cualquier\n"
+"                           fichero al que apunten\n"
 
 #: src/chcon.c:369
-#, fuzzy
 msgid ""
 "  -u, --user=USER        set user USER in the target security context\n"
 "  -r, --role=ROLE        set role ROLE in the target security context\n"
@@ -1359,14 +1350,28 @@ msgstr ""
 "  -l, --range=RANGO      establece RANGO en el contexto de seguridad "
 "objetivo\n"
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
-#, fuzzy
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
 "      --preserve-root    fail to operate recursively on '/'\n"
 msgstr ""
-"      --no-preserve-root  no trata `/' de forma especial (predeterminado)\n"
-"      --preserve-root     no opera recursivamente sobre `/'\n"
+"      --no-preserve-root  no trata '/' de forma especial (predeterminado)\n"
+"      --preserve-root     no opera recursivamente sobre '/'\n"
+
+#: src/chcon.c:379
+msgid ""
+"      --reference=RFILE  use RFILE's security context rather than "
+"specifying\n"
+"                         a CONTEXT value\n"
+msgstr ""
+"      --reference=FICH_R utiliza el contexto de seguridad de FICH_R en "
+"lugar\n"
+"                         de especificar un valor de CONTEXTO\n"
+
+#: src/chcon.c:383 src/chgrp.c:140 src/chown.c:118
+msgid "  -R, --recursive        operate on files and directories recursively\n"
+msgstr ""
+"  -R, --recursive        opera sobre ficheros y directorios recursivamente\n"
 
 # He traducido "diagnostic" por "mensaje". ¿Alguna idea mejor?
 # `diagnóstico' ... ¿no? ipg
@@ -1390,30 +1395,12 @@ msgstr ""
 # Bueno, en este caso, por el contexto creo que no hace falta ser más
 # explícito, si dice "muestra un mensaje" y la opción se llama "verbose",
 # está claro que no es un mensaje de correo electrónico. sv
-#: src/chcon.c:379
-#, fuzzy
-msgid ""
-"      --reference=RFILE  use RFILE's security context rather than "
-"specifying\n"
-"                         a CONTEXT value\n"
-msgstr ""
-"      --reference=FICH_R utiliza el contexto de seguridad de FICH_R en "
-"lugar\n"
-"                         de especificar un valor de CONTEXTO\n"
-"  -R, --recursive        opera sobre ficheros y directorios recursivamente\n"
-"  -v, --verbose          muestra un mensaje por cada fichero procesado\n"
-"\n"
-
-#: src/chcon.c:383 src/chgrp.c:140 src/chown.c:118
-msgid "  -R, --recursive        operate on files and directories recursively\n"
-msgstr ""
-
 #: src/chcon.c:386
 msgid "  -v, --verbose          output a diagnostic for every file processed\n"
 msgstr ""
+"  -v, --verbose          muestra un mensaje por cada fichero procesado\n"
 
 #: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121
-#, fuzzy
 msgid ""
 "\n"
 "The following options modify how a hierarchy is traversed when the -R\n"
@@ -1427,6 +1414,7 @@ msgid ""
 "  -P                     do not traverse any symbolic links (default)\n"
 "\n"
 msgstr ""
+"\n"
 "Las siguientes opciones modifican cómo se atraviesa una jerarquía cuando\n"
 "se especifica también la opción -R. Si se especifica más de una, solamente\n"
 "tiene efecto la última.\n"
@@ -1440,36 +1428,37 @@ msgstr ""
 "  -P                     no atraviesa ningún enlace simbólico "
 "(predeterminado)\n"
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr "-R --dereference requiere o bien -H o bien -L"
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr "-R -h requiere -P"
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, c-format
 msgid "missing operand after %s"
 msgstr "falta un operando después de %s"
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, c-format
 msgid "invalid context: %s"
 msgstr "contexto inválido: %s"
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr "se han dado especificadores de contexto de seguridad conflictivos"
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, c-format
 msgid "failed to get attributes of %s"
 msgstr "fallo al obtener los permisos de %s"
@@ -1489,26 +1478,24 @@ msgstr ""
 "       o bien:  %s [OPCIÓN]... --reference=FICHERO-R FICHERO...\n"
 
 #: src/chgrp.c:113
-#, fuzzy
 msgid ""
 "Change the group of each FILE to GROUP.\n"
 "With --reference, change the group of each FILE to that of RFILE.\n"
 "\n"
 msgstr ""
-"Cambia el contexto de seguridad de cada FICHERO a CONTEXTO.\n"
-"Con --reference, cambia el contexto de seguridad de cada FICHERO al de\n"
-"FICHERO-R.\n"
+"Cambia el grupo de cada FICHERO a GRUPO.\n"
+"Con --reference, cambia el grupo de cada FICHERO al de FICHERO-R.\n"
 "\n"
-"  -h, --no-dereference   afecta a los enlaces simbólicos en vez de a "
-"cualquier\n"
-"                           fichero al que apunten\n"
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
 "  -v, --verbose          output a diagnostic for every file processed\n"
 msgstr ""
+"  -c, --changes          como `verbose' pero informa sólo de los cambios\n"
+"  -f, --silent, --quiet  suprime la mayoría de los mensajes de error\n"
+"  -v, --verbose          muestra un mensaje por cada fichero procesado\n"
 
 # ¿? ¿Existe el verbo "referenciar"? ¿Habría que poner referir?
 #
@@ -1525,21 +1512,21 @@ msgstr ""
 # (Esto me recuerda el palabro "influenciar", a mucha gente se le olvida
 # que se dice *influir*). sv
 #: src/chgrp.c:128 src/chown.c:99
-#, fuzzy
 msgid ""
 "                         (useful only on systems that can change the\n"
 "                         ownership of a symlink)\n"
 msgstr ""
-"  -h, --no-dereference   afecta a cada enlace simbólico en lugar de a los\n"
-"                         ficheros referidos (solamente es útil en sistemas\n"
-"                         que pueden cambiar el propietario de un enlace\n"
-"                         simbólico)\n"
+"                         (solamente es útil en sistemas que pueden cambiar "
+"el\n"
+"                         propietario de un enlace simbólico)\n"
 
 #: src/chgrp.c:136
 msgid ""
 "      --reference=RFILE  use RFILE's group rather than specifying a\n"
 "                         GROUP value\n"
 msgstr ""
+"      --reference=FICH_R utiliza el grupo de FICH_R en lugar de especificar\n"
+"                         un valor para GRUPO\n"
 
 #: src/chgrp.c:158
 #, c-format
@@ -1554,12 +1541,12 @@ msgstr ""
 "  %s staff /u      Cambia el grupo de /u a \"staff\".\n"
 "  %s -hR staff /u  Cambia el grupo de /u y subficheros a \"staff\".\n"
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
 msgstr "obteniendo nuevos permisos de %s"
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr "ni el enlace simbólico %s ni su referente ha cambiado\n"
@@ -1574,12 +1561,12 @@ msgstr "ni el enlace simbólico %s ni su referente ha cambiado\n"
 #
 # Pensaré esto sincronizadamente con los otros. sv
 #
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr "el modo de %s cambia de %04lo (%s) a %04lo (%s)\n"
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr "fallo al cambiar el modo de %s de %04lo (%s) a %04lo (%s)\n"
@@ -1587,27 +1574,27 @@ msgstr "fallo al cambiar el modo de %s de %04lo (%s) a %04lo (%s)\n"
 # al igual que con chgrp y por coherencia me parece más adecuado:
 # "ha permanecido"... uac
 #
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr "el modo de %s permanece como %04lo (%s)\n"
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr "no se puede operar sobre el enlace simbólico colgado %s"
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, c-format
 msgid "changing permissions of %s"
 msgstr "cambiando los permisos de %s"
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr "%s: los nuevos permisos son %s, no %s"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1618,73 +1605,39 @@ msgstr ""
 "       o bien:  %s [OPCIÓN]... MODO-OCTAL FICHERO...\n"
 "       o bien:  %s [OPCIÓN]... --reference=FICHERO-R FICHERO...\n"
 
-#: src/chmod.c:377
-#, fuzzy
+#: src/chmod.c:380
 msgid ""
 "Change the mode of each FILE to MODE.\n"
 "With --reference, change the mode of each FILE to that of RFILE.\n"
 "\n"
 msgstr ""
-"Cambia el contexto de seguridad de cada FICHERO a CONTEXTO.\n"
-"Con --reference, cambia el contexto de seguridad de cada FICHERO al de\n"
-"FICHERO-R.\n"
-"\n"
-"  -h, --no-dereference   afecta a los enlaces simbólicos en vez de a "
-"cualquier\n"
-"                           fichero al que apunten\n"
+"Cambia el modo de cada FICHERO a MODO.\n"
+"Con --reference, cambia el modo de cada FICHERO al de FICHERO-R.\n"
 
-# He traducido "diagnostic" por "mensaje". ¿Alguna idea mejor?
-# `diagnóstico' ... ¿no? ipg
-#
-# Rotundamente no. En español esa palabra solamente se usa en el
-# ámbito médico. "a nivel de hospitales" :-) sv
-#
-# pero en este caso, queda mejor (a mi parecer) `mensaje' ipg
-#
-# Menos mal :-) sv
-#
-# Y a mí que no me gusta `mensaje'... pero no encuentro alternativa. Quizá
-# `muestra lo realizado para/con/sobre cada fichero' tb
-#
-# Aunque prefiero mensaje, dejaré aquí tu sugerencia.
-# (Creo que es la mejor que me han hecho al respecto). sv
-#
-# sugiero que se especificara qué tipo de mensaje se muestra ya que un
-# "diagnostic" no es un mensaje cualquiera... uac
-#
-# Bueno, en este caso, por el contexto creo que no hace falta ser más
-# explícito, si dice "muestra un mensaje" y la opción se llama "verbose",
-# está claro que no es un mensaje de correo electrónico. sv
-#: src/chmod.c:391
-#, fuzzy
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
-"      --reference=FICH_R utiliza el contexto de seguridad de FICH_R en "
-"lugar\n"
-"                         de especificar un valor de CONTEXTO\n"
-"  -R, --recursive        opera sobre ficheros y directorios recursivamente\n"
-"  -v, --verbose          muestra un mensaje por cada fichero procesado\n"
-"\n"
+"      --reference=FICH_R  utiliza el modo de FICH_R en lugar del valor MODO\n"
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr ""
+"  -R, --recursive        cambia ficheros y directorios recursivamente\n"
 
-#: src/chmod.c:399
-#, fuzzy
+#: src/chmod.c:402
 msgid ""
 "\n"
 "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n"
 msgstr ""
 "\n"
-"Cada MODO es de la forma `[ugoa]*([-+=]([rwxXst]*|[ugo]))+'.\n"
+"Cada MODO es de la forma '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n"
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr "no se pueden combinar las opciones mode y --reference"
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, c-format
 msgid "invalid mode: %s"
 msgstr "modo inválido: %s"
@@ -1790,6 +1743,10 @@ msgid ""
 "RFILE.\n"
 "\n"
 msgstr ""
+"Cambia el propietario y/o grupo de cada FICHERO a PROPIETARIO y/o GRUPO.\n"
+"Con --reference, cambia el propietario y el grupo de cada FICHERO a los\n"
+"que tenga FICHERO-R.\n"
+"\n"
 
 #: src/chown.c:103
 msgid ""
@@ -1816,9 +1773,11 @@ msgid ""
 "      --reference=RFILE  use RFILE's owner and group rather than\n"
 "                         specifying OWNER:GROUP values\n"
 msgstr ""
+"      --reference=FICH_R utiliza el propietario y el grupo de FICH_R en "
+"lugar\n"
+"                         de especificar valores PROPIETARIO:GRUPO\n"
 
 #: src/chown.c:136
-#, fuzzy
 msgid ""
 "\n"
 "Owner is unchanged if missing.  Group is unchanged if missing, but changed\n"
@@ -1827,7 +1786,7 @@ msgid ""
 msgstr ""
 "\n"
 "El propietario no cambia si se omite. El grupo no cambia si se omite, pero\n"
-"cambia al grupo de login si se indica implícitamente con `:' después del\n"
+"cambia al grupo de login si se indica implícitamente con ':' después del\n"
 "PROPIETARIO simbólico. PROPIETARIO y GRUPO pueden ser numéricos o "
 "simbólicos.\n"
 
@@ -1847,26 +1806,21 @@ msgstr ""
 "  %s -hR root /u    Cambia el propietario de /u y subficheros a \"root\".\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr "Roland McGrath"
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr "grupo inválido %s"
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, c-format
 msgid "invalid group list %s"
 msgstr "lista de grupos inválida %s"
 
-#: src/chroot.c:117
-#, c-format
-msgid "failed to set additional groups"
-msgstr "fallo al establecer grupos adicionales"
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
@@ -1875,13 +1829,13 @@ msgstr ""
 "Modo de empleo: %s [OPCIÓN] NUEVO_RA�Z [ORDEN [ARG]...]\n"
 "       o bien:  %s OPCIÓN\n"
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
 msgstr "Ejecuta ORDEN siendo NUEVO_RA�Z el directorio raíz.\n"
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
@@ -1893,38 +1847,51 @@ msgstr ""
 "suplementarios\n"
 "\n"
 
-#: src/chroot.c:149
-#, fuzzy
+#: src/chroot.c:203
 msgid ""
 "\n"
 "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n"
 msgstr ""
 "\n"
-"Si no se especifica ninguna orden, ejecuta ``${SHELL} -i''\n"
-"(por omisión: /bin/sh).\n"
+"Si no se especifica ninguna orden, ejecuta '${SHELL} -i'\n"
+"(por omisión: '/bin/sh -i').\n"
 
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, c-format
 msgid "cannot change root directory to %s"
 msgstr "no se puede cambiar el directorio raíz a %s"
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, c-format
 msgid "cannot chdir to root directory"
 msgstr "no se puede cambiar al directorio raíz"
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr ""
+
+#: src/chroot.c:383
+#, fuzzy, c-format
+msgid "failed to get supplemental groups"
+msgstr "fallo al establecer el grupo o grupos suplementarios"
+
+#: src/chroot.c:395
+#, fuzzy, c-format
+msgid "failed to %s supplemental groups"
+msgstr "fallo al establecer el grupo o grupos suplementarios"
+
+#: src/chroot.c:402
 #, c-format
 msgid "failed to set group-ID"
 msgstr "fallo al establecer el ID del grupo"
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, c-format
 msgid "failed to set user-ID"
 msgstr "fallo al establecer el ID del usuario"
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, c-format
 msgid "failed to run command %s"
 msgstr "fallo al ejecutar la orden %s"
@@ -1986,7 +1953,7 @@ msgstr ""
 "Muestra la suma de comprobación CRC y el número de bytes de cada FICHERO.\n"
 "\n"
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr "Modo de empleo: %s [OPCIÓN]... FICHERO1 FICHERO2\n"
@@ -2040,14 +2007,13 @@ msgid "  --output-delimiter=STR  separate columns with STR\n"
 msgstr "  --output-delimiter=CAD  separa columnas con CAD\n"
 
 #: src/comm.c:133
-#, fuzzy
 msgid ""
 "\n"
 "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n"
 msgstr ""
 "\n"
 "Note que las comparaciones obedecen las reglas especificadas por "
-"`LC_COLLATE'.\n"
+"'LC_COLLATE'.\n"
 
 #: src/comm.c:137
 #, c-format
@@ -2079,269 +2045,288 @@ msgstr "se han especificado varios delimitadores"
 msgid "empty %s not allowed"
 msgstr "no se permite un %s vacío"
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr "error al leer %s"
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, c-format
 msgid "cannot lseek %s"
 msgstr "no se puede efectuar `lseek' sobre %s"
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr "error al escribir en %s"
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, c-format
 msgid "%s: failed to get extents info"
 msgstr "%s: fallo al obtener la información de `extents'"
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, c-format
 msgid "%s: write failed"
 msgstr "%s: error al escribir"
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, c-format
 msgid "failed to extend %s"
 msgstr "fallo al extender %s"
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, c-format
 msgid "clearing permissions for %s"
 msgstr "borrando los permisos de %s"
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "fallo al conservar el propietario de %s"
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
 msgstr "fallo al buscar el fichero %s"
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, c-format
 msgid "failed to preserve authorship for %s"
 msgstr "fallo al conservar el autor de %s"
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
+#, c-format
+msgid "failed to set default file creation context to %s"
+msgstr ""
+"fallo al obtener el contexto de creación de ficheros predeterminado a %s"
+
+#: src/copy.c:820
+#, c-format
+msgid "failed to set default file creation context for %s"
+msgstr ""
+"fallo al obtener el contexto de creación de ficheros predeterminado para %s"
+
+#: src/copy.c:846
+#, c-format
+msgid "failed to set the security context of %s"
+msgstr "fallo al establecer el contexto de seguridad de %s"
+
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
 msgid "cannot open %s for reading"
 msgstr "no se puede abrir %s para lectura"
 
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, c-format
 msgid "cannot fstat %s"
 msgstr "no se puede efectuar `fstat' sobre %s"
 
-#: src/copy.c:820
+#: src/copy.c:935
 #, c-format
 msgid "skipping file %s, as it was replaced while being copied"
 msgstr "saltando el fichero %s, ya que fue reemplazado mientras se copiaba"
 
-#: src/copy.c:850
-#, c-format
-msgid "failed to get file system create context"
-msgstr "fallo al obtener el contexto de creación del sistema de ficheros"
-
-#: src/copy.c:864
-#, c-format
-msgid "failed to set the security context of %s to %s"
-msgstr "fallo al establecer el contexto de seguridad de %s a %s"
-
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
 msgid "cannot remove %s"
 msgstr "no se puede borrar %s"
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
 msgstr "%s borrado\n"
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr "no se escribirá a través del enlace colgado %s"
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, c-format
 msgid "cannot create regular file %s"
 msgstr "no se puede crear el fichero regular %s"
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, c-format
 msgid "failed to clone %s from %s"
 msgstr "fallo al clonar %s a partir de %s"
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr "se conserva las fechas de %s"
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
-#, fuzzy, c-format
+#, c-format
 msgid "failed to close %s"
-msgstr "No se puede abrir %s"
+msgstr "fallo al cerrar %s"
 
+# ¿Tal vez la interrogación de apertura va justo después de la coma? ipg
+#
+# Excelente pregunta. Esto parece el referéndum de la OTAN:
+# Creo que el programa nos pregunta si queremos reemplazar un fichero
+# por otro, para que contestemos que sí o que no.
+# Al mismo tiempo, nos advierte de que, de llevarse a cabo el reemplazo
+# de un fichero por otro, también el modo resultaría sustituído.
+#
+# Si esto es así, ¿dónde habría que poner la interrogación?
+# O incluso: ¿Está bien el original?
+#
+# Creo que tal y como está, está bien. sv
 # SIoNO
-#: src/copy.c:1471
+#
+#: src/copy.c:1580
+#, fuzzy, c-format
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
+msgstr "%s: ¿reemplazar `%s', sustituyendo el modo %04o? (s/n) "
+
+#: src/copy.c:1581
 #, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
-msgstr "%s: ¿intentar sobreescribir %s, sustituyendo el modo %04lo? (%s) "
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr ""
 
 # SIoNO
-#: src/copy.c:1478
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
 msgstr "%s: ¿sobreescribir %s? (s/n) "
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr " (respaldo: %s)"
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr "fallo al restaurar el contexto de creación de fichero predeterminado"
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, c-format
 msgid "cannot create hard link %s to %s"
 msgstr "crea el enlace duro %s a %s"
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, c-format
 msgid "cannot stat %s"
 msgstr "no se puede efectuar `stat' sobre %s"
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, c-format
 msgid "omitting directory %s"
 msgstr "se omite el directorio %s"
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr "atención: se ha especificado el fichero origen %s más de una vez"
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
 msgstr "%s y %s son el mismo fichero"
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr "no se puede sobreescribir el no directorio %s con el directorio %s"
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr "no se sobreescribirá el fichero %s recién creado con %s"
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr "no se puede sobreescribir el directorio %s con un no directorio"
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr "no se puede sobreescribir un directorio con un no directorio: %s -> %s"
 
 # Nota: Este backing up *no* es un gerundio.
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr "respaldar %s destruiría el original; %s no se mueve"
 
 # Nota: Este backing up *tampoco* es un gerundio.
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr "respaldar %s destruiría el original; %s no se copia"
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
 msgstr "no se puede respaldar %s"
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr "no se copiará %s a través del enlace simbólico %s recién creado"
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr "no se puede copiar un directorio, %s, dentro de sí mismo, %s"
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr "no se crea el enlace duro %s al directorio %s"
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr "no se puede mover %s a un directorio de sí mismo, %s"
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, c-format
 msgid "cannot move %s to %s"
 msgstr "no se puede mover %s a %s"
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr ""
 "falló el movimiento entre distintos dispositivos: de %s a %s;\n"
 "no se puede borrar el objetivo"
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, c-format
-msgid "failed to set default file creation context to %s"
-msgstr ""
-"fallo al obtener el contexto de creación de ficheros predeterminado para %s"
-
 # Nota: Pongo "el" y no "un" porque no todos los enlaces simbólicos
 # cíclicos son imposibles de copiar, por ejemplo:
 # ln -s bb bb
 # mkdir aa
 # cp -d bb aa
 # ls -l aa
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr "no se puede copiar el enlace simbólico cíclico %s"
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr ""
 "%s: solamente se pueden crear enlaces simbólicos relativos\n"
 "en el directorio actual"
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr "no se puede crear el enlace simbólico %s a %s"
@@ -2380,27 +2365,27 @@ msgstr "no se puede crear el enlace simbólico %s a %s"
 # tu lado :) Déjalo como está :D ipg
 #
 # Gracias a los dos. sv
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, c-format
 msgid "cannot create fifo %s"
 msgstr "no se puede crear el fichero `fifo' %s"
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, c-format
 msgid "cannot create special file %s"
 msgstr "no se puede crear el fichero especial %s"
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, c-format
 msgid "cannot read symbolic link %s"
 msgstr "no se puede leer el enlace simbólico %s"
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, c-format
 msgid "cannot create symbolic link %s"
 msgstr "no se puede crear el enlace simbólico %s"
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
 msgstr "%s tiene un tipo de fichero desconocido"
@@ -2408,17 +2393,45 @@ msgstr "%s tiene un tipo de fichero desconocido"
 # Nota: Asegurarse de que significa eso.
 # Probablemente quiera decir que "no se puede recuperar `%s'" de la copia
 # de seguridad. tb
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, c-format
 msgid "cannot un-backup %s"
 msgstr "no se puede restaurar %s"
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr "%s -> %s (restauración)\n"
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr "Alex Deymo"
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr ""
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, fuzzy, c-format
+msgid "unknown program %s"
+msgstr "flujo desconocido"
+
+#: src/cp.c:157 src/mv.c:288
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -2429,14 +2442,11 @@ msgstr ""
 "       o bien:  %s [OPCIÓN]... ORIGEN... DIRECTORIO\n"
 "       o bien:  %s [OPCIÓN]... -t DIRECTORIO ORIGEN...\n"
 
-#: src/cp.c:162
-#, fuzzy
+#: src/cp.c:163
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
-msgstr ""
-"Copia ORIGEN a DESTINO, o varios ORIGEN(es) a DIRECTORIO.\n"
-"\n"
+msgstr "Copia ORIGEN a DESTINO, o varios ORIGEN(es) a DIRECTORIO.\n"
 
-#: src/cp.c:168
+#: src/cp.c:169
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
 "      --attributes-only        don't copy the file data, just the "
@@ -2464,8 +2474,7 @@ msgstr ""
 "  -d                           lo mismo que --no-dereference --"
 "preserve=link\n"
 
-#: src/cp.c:177
-#, fuzzy
+#: src/cp.c:178
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
 "                                 opened, remove it and try again (this "
@@ -2479,14 +2488,14 @@ msgid ""
 msgstr ""
 "  -f, --force                  si un fichero de destino no se puede abrir, "
 "lo\n"
-"                                 borra y lo intenta de nuevo (redundante si "
-"se\n"
-"                                 utiliza la opción -n)\n"
+"                                 borra y lo intenta de nuevo (no se tiene "
+"en\n"
+"                                 cuenta si se utiliza también la opción -n)\n"
 "  -i, --interactive            pide confirmación antes de sobreescribir\n"
 "  -H                           sigue los enlaces simbólicos de la línea\n"
 "                               de órdenes\n"
 
-#: src/cp.c:186
+#: src/cp.c:187
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
 "  -L, --dereference            always follow symbolic links in SOURCE\n"
@@ -2496,7 +2505,7 @@ msgstr ""
 "  -L, --dereference            siempre sigue los enlaces simbólicos en "
 "ORIGEN\n"
 
-#: src/cp.c:190
+#: src/cp.c:191
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
 "                                 a previous -i option)\n"
@@ -2507,7 +2516,7 @@ msgstr ""
 "anterior)\n"
 "  -P, --no-dereference         nunca sigue los enlaces simbólicos en ORIGEN\n"
 
-#: src/cp.c:195
+#: src/cp.c:196
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
 "      --preserve[=ATTR_LIST]   preserve the specified attributes (default:\n"
@@ -2525,7 +2534,7 @@ msgstr ""
 "xattr,\n"
 "                                  all\n"
 
-#: src/cp.c:203
+#: src/cp.c:204
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                use full source file name under DIRECTORY\n"
@@ -2535,7 +2544,7 @@ msgstr ""
 "completo\n"
 "                                  bajo DIRECTORIO\n"
 
-#: src/cp.c:207
+#: src/cp.c:208
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
 "      --reflink[=WHEN]         control clone/CoW copies. See below\n"
@@ -2550,7 +2559,7 @@ msgstr ""
 "                                 de intentar abrirlo (compárese con --"
 "force).\n"
 
-#: src/cp.c:213
+#: src/cp.c:214
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
 "      --strip-trailing-slashes  remove any trailing slashes from each "
@@ -2562,7 +2571,7 @@ msgstr ""
 "      --strip-trailing-slashes  elimina todas las barras finales de cada\n"
 "                                  argumento ORIGEN\n"
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -2573,11 +2582,11 @@ msgstr ""
 "  -s, --symbolic-link           crea enlaces simbólicos en lugar de "
 "copiarlos\n"
 "  -S, --suffix=SUFIJO           reemplaza el sufijo de respaldo habitual\n"
-"      --target-directory=DIRECTORIO  mueve todos los argumentos ORIGEN al\n"
+"  -t, --target-directory=DIRECTORIO  copia todos los argumentos ORIGEN al\n"
 "                                     directorio DIRECTORIO\n"
 "  -T, --no-target-directory     considera DEST como un fichero normal\n"
 
-#: src/cp.c:224
+#: src/cp.c:225
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
 "                                 than the destination file or when the\n"
@@ -2591,6 +2600,19 @@ msgstr ""
 "  -v, --verbose                da detalles sobre lo que se va haciendo\n"
 "  -x, --one-file-system        permanece en este sistema de ficheros\n"
 
+#: src/cp.c:232
+#, fuzzy
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+"  -Z, --context[=CTX]          establece el contexto de seguridad SELinux "
+"del fichero de\n"
+"                                 destino al tipo predeterminado, o a CTX si "
+"se especifica\n"
+
 # ¿"crude" es simple o sencillo?
 #
 # `a lo bruto' o `simple'.
@@ -2632,7 +2654,7 @@ msgstr ""
 # La traducción me parece correcta y fiel.
 # Si de verdad te parece que está mal explicado, se lo digo al autor. sv
 #
-#: src/cp.c:233
+#: src/cp.c:240
 msgid ""
 "\n"
 "By default, sparse SOURCE files are detected by a crude heuristic and the\n"
@@ -2665,8 +2687,7 @@ msgstr ""
 "es posible, la copia falla, o si se especifica --reflink=auto, se hace una\n"
 "copia normal.\n"
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
-#, fuzzy
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 msgid ""
 "\n"
 "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n"
@@ -2676,14 +2697,14 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"El sufijo de respaldo es `~', a menos que se establezca con --suffix o con\n"
+"El sufijo de respaldo es '~', a menos que se establezca con --suffix o con\n"
 "SIMPLE_BACKUP_SUFFIX. El método de control de versión se puede seleccionar\n"
 "con la opción --backup o a través de la variable de entorno "
 "VERSION_CONTROL.\n"
 "Estos son los valores:\n"
 "\n"
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2698,7 +2719,7 @@ msgstr ""
 "  simple, never   siempre crea copias de seguridad simples\n"
 
 # Revisar esto un poco. Especialmente la última línea.
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2712,68 +2733,75 @@ msgstr ""
 "para\n"
 "un nombre de fichero regular existente.\n"
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, c-format
 msgid "failed to preserve times for %s"
 msgstr "fallo al conservar la fecha de %s"
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, c-format
 msgid "failed to preserve permissions for %s"
 msgstr "fallo al conservar los permisos de %s"
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, c-format
 msgid "cannot make directory %s"
 msgstr "no se puede crear el directorio %s"
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr "%s existe pero no es un directorio"
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
-#, fuzzy, c-format
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
+#, c-format
 msgid "failed to access %s"
-msgstr "No se puede abrir %s"
+msgstr "fallo al acceder a %s"
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, c-format
 msgid "missing file operand"
 msgstr "falta un fichero como operando"
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, c-format
 msgid "missing destination file operand after %s"
 msgstr "falta el fichero de destino después de %s"
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr ""
 "no se puede combinar --target-directory (-t) y --no-target-directory (-T)"
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, c-format
 msgid "target %s is not a directory"
 msgstr "el objetivo %s no es un directorio"
 
 # Nota: Mejor no traducir "path" y "directory" de la misma forma dentro
 # de la misma frase.
-#: src/cp.c:728
+#: src/cp.c:735
 #, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr "con --parents, el destino debe ser un directorio"
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, c-format
 msgid "multiple target directories specified"
 msgstr "se han especificado varios directorios de destino"
 
+#: src/cp.c:1116 src/install.c:903
+#, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr ""
+"atención: no se tendrá en cuenta --context; necesita un núcleo con SELinux "
+"activado"
+
 # ¿? HARD ¿duro o fuerte?
 #
 # Yo lo dejaría en duro ... (queda más heavy :) ipg
@@ -2782,33 +2810,38 @@ msgstr "se han especificado varios directorios de destino"
 #
 # ¿bibliografía?
 # (¿en qué libros os basáis?) sv+
-#: src/cp.c:1110
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr "no se puede crear un enlace que sea duro y simbólico al mismo tiempo"
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr "las opciones --backup y --no-clobber son mutuamente excluyentes"
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr "--reflink solamente se puede usar con --sparse=auto"
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr "tipo de respaldo"
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, c-format
+msgid "cannot set target context and preserve it"
+msgstr "no se puede establecer el contexto y conservarlo"
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr ""
 "no se puede conservar el contexto de seguridad si un núcleo con SELinux "
 "activado"
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr ""
@@ -2816,37 +2849,37 @@ msgstr ""
 "soporte de xattr"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr "Stuart Kemp"
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr "la entrada dejó de existir"
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr "%s: número de línea fuera de rango"
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, c-format
 msgid "%s: %s: line number out of range"
 msgstr "%s: %s: número de línea fuera de rango"
 
 # ???
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, c-format
 msgid " on repetition %s\n"
 msgstr " repetido %s\n"
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, c-format
 msgid "%s: %s: match not found"
 msgstr "%s: %s: ocurrencia no encontrada"
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr "error en la búsqueda de la expresión regular"
@@ -2854,121 +2887,124 @@ msgstr "error en la búsqueda de la expresión regular"
 # %s debe de ser un fichero, ¿no? si es así a mí me parece "más natural":
 # "en %s" e incluso quizás "sobre %s"... o quizás no... ahí queda eso
 # Lo cambio em+
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, c-format
 msgid "write error for %s"
 msgstr "error de escritura para %s"
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, c-format
 msgid "%s: integer expected after delimiter"
 msgstr "%s: se esperaba un número entero después del delimitador"
 
-#: src/csplit.c:1075
-#, fuzzy, c-format
+#: src/csplit.c:1098
+#, c-format
 msgid "%s: '}' is required in repeat count"
-msgstr "%s: se requiere un `}' después del número de repeticiones"
+msgstr "%s: se requiere un '}' después del número de repeticiones"
 
-#: src/csplit.c:1085
-#, fuzzy, c-format
+#: src/csplit.c:1108
+#, c-format
 msgid "%s}: integer required between '{' and '}'"
-msgstr "%s}: entre `{' y `}' debe especificarse un número entero"
+msgstr "%s}: entre '{' y '}' debe especificarse un número entero"
 
-#: src/csplit.c:1112
-#, fuzzy, c-format
+#: src/csplit.c:1135
+#, c-format
 msgid "%s: closing delimiter '%c' missing"
-msgstr "%s: falta el delimitador de cierre `%c'"
+msgstr "%s: falta el delimitador de cierre '%c'"
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr "%s: la expresión regular no es válida: %s"
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr "%s: plantilla inválida"
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr "%s: el número de línea debe ser mayor que cero"
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr "el número de línea %s es menor que el número de línea anterior, %s"
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr "atención: el número de línea %s es el mismo que el anterior"
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr "falta el especificador de conversión en el sufijo"
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr "el especificador de conversión indicado en el sufijo no es válido: %c"
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr ""
 "el especificador de conversión indicado en el sufijo no es válido: \\%.3o"
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr "opciones inválidas en la especificación de conversión: %%%c%c"
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr "demasiados especificadores de conversión %% en el sufijo"
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr "falta el especificador de conversión %% en el sufijo"
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr "%s: número inválido"
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr "Modo de empleo: %s [OPCIÓN]... FICHERO PLANTILLA...\n"
 
-#: src/csplit.c:1455
-#, fuzzy
+#: src/csplit.c:1483
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
 "and output byte counts of each piece to standard output.\n"
 msgstr ""
 "Escribe los trozos de FICHERO que estén separados por PLANTILLA(s) en "
 "ficheros\n"
-"`xx00', `xx01', ..., y muestra el tamaño de cada trozo en la salida "
+"'xx00', 'xx01', ..., y muestra el tamaño de cada trozo en la salida "
 "estándar.\n"
-"\n"
 
-#: src/csplit.c:1462
-#, fuzzy, c-format
+#: src/csplit.c:1490
+#, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
 "  -f, --prefix=PREFIX        use PREFIX instead of 'xx'\n"
 "  -k, --keep-files           do not remove output files on errors\n"
 msgstr ""
 "  -b, --suffix-format=FORMATO usa sprintf con FORMATO en vez de %02d\n"
-"  -f, --prefix=PREFIJO       usa PREFIJO en vez de `xx'\n"
+"  -f, --prefix=PREFIJO       usa PREFIJO en vez de 'xx'\n"
 "  -k, --keep-files           no borra los ficheros de salida si hay errores\n"
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr ""
+"  -m, --suppress-matched     suprime las líneas que encajan con PATRÓN\n"
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
@@ -2979,16 +3015,15 @@ msgstr ""
 "  -s, --quiet, --silent       no muestra el tamaño de los ficheros creados\n"
 "  -z, --elide-empty-files     borra los ficheros de salida vacíos\n"
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
 msgstr ""
 "\n"
-"Lee la entrada estándar si FICHERO es `-'. Cada PLANTILLA puede ser:\n"
+"Lee la entrada estándar si FICHERO es -. Cada PLANTILLA puede ser:\n"
 
-#: src/csplit.c:1478
-#, fuzzy
+#: src/csplit.c:1509
 msgid ""
 "\n"
 "  INTEGER            copy up to but not including specified line number\n"
@@ -3008,30 +3043,24 @@ msgstr ""
 " {*}                 repite la plantilla especificada todas las veces "
 "posibles\n"
 "\n"
-"Un DESPLAZamiento de línea es un número entero precedido de `+' o de `-'.\n"
+"Un DESPLAZamiento de línea es un número entero precedido de '+' o de '-'.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cut.c:44 src/paste.c:52
 msgid "David M. Ihnat"
 msgstr "David M. Ihnat"
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr "los campos y posiciones se numeran a partir de 1"
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr "Modo de empleo: %s OPCIÓN... [FICHERO]...\n"
 
-#: src/cut.c:193
-#, fuzzy
+#: src/cut.c:176
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr ""
 "Extrae las partes seleccionadas de cada FICHERO en la salida estándar:\n"
-"\n"
 
-#: src/cut.c:199
+#: src/cut.c:182
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
 "  -c, --characters=LIST   select only these characters\n"
@@ -3042,7 +3071,7 @@ msgstr ""
 "  -d, --delimiter=DELIM   usa DELIM en vez de caracteres de tabulación\n"
 "                          para delimitar los campos\n"
 
-#: src/cut.c:204
+#: src/cut.c:187
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
 "                            that contains no delimiter character, unless\n"
@@ -3056,7 +3085,7 @@ msgstr ""
 "                            opción -s\n"
 "  -n                      (no tiene efecto)\n"
 
-#: src/cut.c:210
+#: src/cut.c:193
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
 "                            or fields\n"
@@ -3065,7 +3094,7 @@ msgstr ""
 "campos\n"
 "                            seleccionados\n"
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
@@ -3077,7 +3106,7 @@ msgstr ""
 "                            resultado. Por omisión se utiliza el\n"
 "                            delimitador de la entrada\n"
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -3093,7 +3122,7 @@ msgstr ""
 
 # Pregunta: ¿por qué se ha eliminado lo de "N-ésimo byte..."? ¿Por espacio?
 # Respuesta: en la posicion N = enésimo em+
-#: src/cut.c:227
+#: src/cut.c:210
 msgid ""
 "Each range is one of:\n"
 "\n"
@@ -3116,49 +3145,52 @@ msgstr ""
 "\n"
 "Si no hay FICHERO, o cuando FICHERO es -, lee la entrada estándar.\n"
 
-#: src/cut.c:367 src/cut.c:493
-#, fuzzy
+#: src/cut.c:300 src/cut.c:394
 msgid "invalid byte, character or field list"
-msgstr "la lista de bytes o campos no es válida"
+msgstr "byte, carácter o lista de campos inválido"
+
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr "los campos y posiciones se numeran a partir de 1"
 
-#: src/cut.c:387
+#: src/cut.c:320
 msgid "invalid range with no endpoint: -"
 msgstr "rango inválido sin punto de final: -"
 
-#: src/cut.c:403
+#: src/cut.c:334
 msgid "invalid decreasing range"
 msgstr "rango decreciente inválido"
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, c-format
 msgid "byte offset %s is too large"
 msgstr "el desplazamiento de bytes %s es demasiado grande"
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, c-format
 msgid "field number %s is too large"
 msgstr "el número de campo %s es demasiado grande"
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr "solamente se puede especificar un tipo de lista"
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr "el delimitador debe ser un sólo carácter"
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr "se debe indicar una lista de bytes, caracteres o campos"
 
-#: src/cut.c:850
+#: src/cut.c:790
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr ""
 "sólo se puede especificar un delimitador de entrada cuando se procesan campos"
 
 # FIXME: Comunicar al autor lo de los tabs. sv+
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
@@ -3166,11 +3198,11 @@ msgstr ""
 "suprimir las líneas no delimitadas solamente tiene sentido\n"
 "cuando se procesan campos"
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr "falta la lista de campos"
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr "falta la lista de posiciones"
 
@@ -3188,6 +3220,8 @@ msgstr ""
 #: src/date.c:128
 msgid "Display the current time in the given FORMAT, or set the system date.\n"
 msgstr ""
+"Muestra la hora actual en el FORMATO dado, o establece la fecha del "
+"sistema.\n"
 
 #: src/date.c:134
 msgid ""
@@ -3198,6 +3232,15 @@ msgid ""
 "                            'hours', 'minutes', 'seconds', or 'ns' for date\n"
 "                            and time to the indicated precision.\n"
 msgstr ""
+"  -d, --date=CADENA         muestra la hora descrita por CADENA, no 'now'\n"
+"  -f, --file=FICHERO_FECHA  igual que --date por cada línea de "
+"FICHERO_FECHA\n"
+"  -I[ESPTIEMPO], --iso-8601[=ESPTIEMPO]  muestra la fecha/hora en formato\n"
+"                            ISO 8601. ESPTIEMPO='date' para mostrar "
+"solamente\n"
+"                            la fecha (predeterminado), 'hours', 'minutes',\n"
+"                            'seconds', o 'ns' para la fecha y la hora en la\n"
+"                            precisión indicada.\n"
 
 #: src/date.c:142
 msgid ""
@@ -3211,7 +3254,6 @@ msgstr ""
 "                            Ejemplo: Mon, 07 Aug 2006 12:34:56 -0600\n"
 
 #: src/date.c:147
-#, fuzzy
 msgid ""
 "      --rfc-3339=TIMESPEC   output date and time in RFC 3339 format.\n"
 "                            TIMESPEC='date', 'seconds', or 'ns' for\n"
@@ -3219,16 +3261,16 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 "      --rfc-3339=ESPTIEMPO  muestra la fecha y hora en formato RFC 3339.\n"
-"                            ESPTIEMPO=`date', `seconds', o `ns' para\n"
+"                            ESPTIEMPO='date', 'seconds', o 'ns' para\n"
 "                            la fecha y hora con la precisión indicada.\n"
 "                            Las componentes de fecha y hora se separan por\n"
 "                            un espacio: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=CADENA          establece la hora descrita por CADENA\n"
 "  -u, --utc, --universal    muestra o establece el Tiempo Universal "
-"Coordinado\n"
+"Coordinado (UTC)\n"
 
 #: src/date.c:158
 msgid ""
@@ -3382,7 +3424,6 @@ msgstr ""
 "Por omisión, date rellena los campos numéricos con ceros.\n"
 
 #: src/date.c:230
-#, fuzzy
 msgid ""
 "The following optional flags may follow '%':\n"
 "\n"
@@ -3392,13 +3433,13 @@ msgid ""
 "  ^  use upper case if possible\n"
 "  #  use opposite case if possible\n"
 msgstr ""
-"Las siguientes opciones pueden seguir a `%':\n"
+"Las siguientes opciones pueden seguir a '%':\n"
 "\n"
 "  - (guión) no rellenar el campo\n"
 "  _ (subrayado) rellenar con espacios\n"
 "  0 (cero) rellenar con ceros\n"
 "  ^ utiliza mayúsculas si es posible\n"
-"  # utiliza mayúsuculas/minúsculas en sentido contrario si es posible\n"
+"  # utiliza mayúsculas/minúsculas en sentido contrario si es posible\n"
 
 #: src/date.c:239
 msgid ""
@@ -3445,10 +3486,10 @@ msgstr ""
 "hora peninsular española\n"
 "  $ date --date='TZ=\"Europe/Madrid\" 09:00 next Fri'\n"
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr "entrada estándar"
@@ -3476,22 +3517,22 @@ msgstr ""
 "las opciones para mostrar y establecer la hora no se pueden utilizar a la vez"
 
 #: src/date.c:458
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "the argument %s lacks a leading '+';\n"
 "when using an option to specify date(s), any non-option\n"
 "argument must be a format string beginning with '+'"
 msgstr ""
-"el argumento `%s' carece del signo `+' inicial;\n"
+"el argumento %s carece del signo '+' inicial;\n"
 "cuando se utiliza una opción para especificar fecha(s), cualquier argumento\n"
-"que no sea una opción debe ser una cadena de formato que comience con `+'."
+"que no sea una opción debe ser una cadena de formato que comience con '+'."
 
 #: src/date.c:535
 #, c-format
 msgid "cannot set date"
 msgstr "no se puede establecer la fecha"
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, c-format
 msgid "time %s is out of range"
 msgstr "la fecha %s está fuera de rango"
@@ -3502,7 +3543,7 @@ msgstr "la fecha %s está fuera de rango"
 msgid "Paul Rubin"
 msgstr "Paul Rubin"
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
@@ -3512,8 +3553,7 @@ msgstr ""
 "       o bien:  %s OPCIÓN\n"
 
 # Tenía un fuzzy pero no sé de qué.
-#: src/dd.c:526
-#, fuzzy
+#: src/dd.c:532
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
 "\n"
@@ -3530,11 +3570,10 @@ msgstr ""
 "  cbs=BYTES       convierte BYTES bytes cada vez\n"
 "  conv=PALABRAS   convierte el fichero según la lista de palabras clave\n"
 "                  separadas por comas\n"
-"  count=BLOQUES   copia solamente BLOQUES bloques de entrada\n"
+"  count=N         copia solamente N bloques de entrada\n"
 "  ibs=BYTES       lee BYTES bytes cada vez (por omision: 512)\n"
 
-#: src/dd.c:535
-#, fuzzy
+#: src/dd.c:541
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
 "  iflag=FLAGS     read as per the comma separated symbol list\n"
@@ -3551,14 +3590,15 @@ msgstr ""
 "  obs=BYTES       escribe BYTES bytes cada vez (por omision: 512)\n"
 "  of=FICHERO      escribe en FICHERO en lugar de la salida estándar\n"
 "  oflags=OPCIONES escribe según la lista de símbolos separados por comas\n"
-"  seek=BLOQUES    se salta BLOQUES bloques de tamaño obs al comienzo del\n"
-"                  resultado\n"
-"  skip=BLOQUES    se salta BLOQUES bloques de tamaño ibs al comienzo de la\n"
-"                  entrada\n"
-"  status=noxfer   suprime estadísticas sobre la transferencia\n"
+"  seek=N          se salta N bloques de tamaño obs al comienzo del "
+"resultado\n"
+"  skip=N          se salta N bloques de tamaño ibs al comienzo de la "
+"entrada\n"
+"  status=QUÉ      QUÉ información se suprime en stderr,\n"
+"                  'noxfer' suprime estadísticas sobre la transferencia,\n"
+"                  'none' lo suprime todo\n"
 
-#: src/dd.c:546
-#, fuzzy
+#: src/dd.c:552
 msgid ""
 "\n"
 "N and BYTES may be followed by the following multiplicative suffixes:\n"
@@ -3569,7 +3609,7 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"BLOQUES y BYTES pueden estar seguidos por los siguientes sufijos\n"
+"N y BYTES pueden estar seguidos por los siguientes sufijos\n"
 "multiplicativos:\n"
 "c =1, w =2, b =512, kB =1000, K =1024, MB =1000*1000, M =1024*1024, xM =M\n"
 "GB =1000*1000*1000, G =1024*1024*1024, y así sucesivamente para T, P, E, Z, "
@@ -3579,8 +3619,7 @@ msgstr ""
 "\n"
 
 # Tampoco le encuentro el fuzzy
-#: src/dd.c:555
-#, fuzzy
+#: src/dd.c:561
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
 "  ebcdic    from ASCII to EBCDIC\n"
@@ -3605,12 +3644,15 @@ msgstr ""
 "            con un carácter de nueva línea\n"
 "  lcase     cambia las mayúsculas a minúsculas\n"
 "  ucase     cambia las minúsculas a mayúsculas\n"
+"  sparse    intenta efectuar seek en lugar de escribir el resultado para "
+"los\n"
+"            bloques de entrada nulos\n"
 "  swab      intercambia cada pareja de bytes de entrada\n"
 "  sync      rellena cada bloque de entrada con NULs hasta el tamaño de ibs;\n"
 "              cuando se utiliza con block o unblock, rellena con espacios\n"
 "              en lugar de con NULos\n"
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -3626,7 +3668,7 @@ msgstr ""
 "  fdatasync escribe físicamente el fichero de salida antes de terminar\n"
 "  fsync     lo mismo, pero escriben también los metadatos\n"
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -3640,76 +3682,79 @@ msgstr ""
 "  append    modo de adición (solamente tiene sentido para salida,\n"
 "              se sugiere conv=notrunc)\n"
 
-#: src/dd.c:583
+#: src/dd.c:589
 msgid "  cio       use concurrent I/O for data\n"
 msgstr "  cio       utiliza E/S concurrente para los datos\n"
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr "  direct    utiliza E/S directa para los datos\n"
 
-#: src/dd.c:587
+#: src/dd.c:593
 msgid "  directory  fail unless a directory\n"
 msgstr "  directory  falla a menos que sea un directorio\n"
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr "  dsync     utiliza E/S sincronizada para los datos\n"
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr "  sync      similar, pero también para metadatos\n"
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr "  fullblock  acumula bloques llenos de entrada (solamente iflag)\n"
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr "  nonblock  utiliza E/S no bloqueante\n"
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr "  noatime   no actualiza la fecha de acceso\n"
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr "  nocache   descarta los datos en caché\n"
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr "  noctty    no asigna una terminal controladora del fichero\n"
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr "  nofollow  no sigue los enlaces simbólicos\n"
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr "  nolinks   falla si está enlazado varias veces\n"
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr "  binary    utiliza E/S binaria para los datos\n"
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr "  text      utiliza E/S de texto para los datos\n"
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr ""
+"  count_bytes  trata 'count=N' como contador de bytes (solamente iflag)\n"
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr ""
+"  skip_bytes  trata 'skip=N' como contador de bytes (solamente iflag)\n"
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr ""
+"  seek_bytes  trata 'seek=N' como contador de bytes (solamente oflag)\n"
 
-#: src/dd.c:625
-#, fuzzy, c-format
+#: src/dd.c:631
+#, c-format
 msgid ""
 "\n"
 "Sending a %s signal to a running 'dd' process makes it\n"
@@ -3725,7 +3770,7 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Enviar la señal %s a un proceso `dd' en marcha hace que muestre\n"
+"Enviar la señal %s a un proceso 'dd' en marcha hace que muestre\n"
 "estadísticas de E/S en la salida de error estándar, y luego continúa\n"
 "con la copia.\n"
 "\n"
@@ -3737,7 +3782,17 @@ msgstr ""
 "\n"
 "Las opciones son:\n"
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr "memoria agotada por búfer de entrada de %zu bytes (%s)"
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr "memoria agotada por un búfer de salida de %zu bytes (%s)"
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
@@ -3746,21 +3801,21 @@ msgstr ""
 "%<PRIuMAX>+%<PRIuMAX> registros leídos\n"
 "%<PRIuMAX>+%<PRIuMAX> registros escritos\n"
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
 msgstr[0] "%<PRIuMAX> registro truncado\n"
 msgstr[1] "%<PRIuMAX> registros truncado\n"
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
 msgstr[0] "%<PRIuMAX> byte (%s) copiado"
 msgstr[1] "%<PRIuMAX> bytes (%s) copiados"
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr "Infinito B"
 
@@ -3774,85 +3829,85 @@ msgstr "Infinito B"
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
 msgstr ", %g s, %s/s\n"
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, c-format
 msgid "closing input file %s"
 msgstr "cerrando el fichero de entrada %s"
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr "cerrando el fichero de salida %s"
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr "fallo al desactivar O_DIRECT: %s"
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, c-format
 msgid "writing to %s"
 msgstr "escribiendo en %s"
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, c-format
 msgid "unrecognized operand %s"
 msgstr "operando no reconocido %s"
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 msgid "invalid conversion"
 msgstr "conversión inválida"
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 msgid "invalid input flag"
 msgstr "opción de entrada inválida"
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 msgid "invalid output flag"
 msgstr "opción de salida inválida"
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 msgid "invalid status flag"
 msgstr "opción de estado inválida"
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, c-format
 msgid "invalid number %s"
 msgstr "número inválido %s"
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr "no se pueden combinar dos de entre {ascii,ebcdic,ibm}"
 
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, c-format
 msgid "cannot combine block and unblock"
 msgstr "no se puede combinar block y unblock"
 
 # Lo mismo de antes.
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, c-format
 msgid "cannot combine lcase and ucase"
 msgstr "no se puede combinar lcase y ucase"
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, c-format
 msgid "cannot combine excl and nocreat"
 msgstr "no se puede combinar excl y nocreat"
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, c-format
 msgid "cannot combine direct and nocache"
 msgstr "no se puede combinar direct y nocache"
 
 # Se admiten sugerencias.
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
@@ -3862,72 +3917,62 @@ msgstr ""
 "relacionado con lseek para el fichero (%s) de mt_type=0x%0lx;\n"
 "consulte la lista de tipos en <sys/mtio.h>"
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, c-format
 msgid "%s: cannot skip"
 msgstr "%s: no se puede saltar"
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, c-format
 msgid "%s: cannot seek"
 msgstr "%s: desplazamiento imposible"
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr "desbordamiento de desplazamiento leyendo el fichero %s"
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr "atención: desplazamiento inválido después de la lectura fallida"
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr "no se puede sortear un fallo del núcleo después de todo"
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, c-format
 msgid "setting flags for %s"
 msgstr "estableciendo opciones para %s"
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr "memoria agotada por búfer de entrada de %zu bytes (%s)"
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr "memoria agotada por un búfer de salida de %zu bytes (%s)"
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr "%s: no se puede saltar al desplazamiento especificado"
 
-#: src/dd.c:2133
-#, fuzzy, c-format
+#: src/dd.c:2172
+#, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
-msgstr "fallo al truncar a %<PRIuMAX> bytes el fichero de salida %s"
+msgstr "fallo al truncar a %<PRIdMAX> bytes el fichero de salida %s"
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr "fdatasync falló para %s"
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
 msgstr "falló fsync para %s"
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, c-format
 msgid "failed to open %s"
 msgstr "No se puede abrir %s"
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
@@ -3936,97 +3981,105 @@ msgstr ""
 "desplazamiento demasiado grande: no se puede truncar a una longitud de\n"
 "seek=%<PRIuMAX> bloques (%lu bytes)"
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr "fallo al truncar a %<PRIuMAX> bytes el fichero de salida %s"
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, c-format
 msgid "failed to discard cache for: %s"
 msgstr "fallo al descartar el caché para: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr "Paul Eggert"
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr "S.ficheros"
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr "Tipo"
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr "bloques"
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr "Usados"
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr "Disponibles"
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr "Uso%"
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr "Nodos-i"
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr "NUsados"
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr "NLibres"
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr "NUso%"
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr "Montado en"
 
-#: src/df.c:383
+#: src/df.c:207
+msgid "File"
+msgstr "Fichero"
+
+#: src/df.c:387
 #, c-format
-msgid "option --output: field '%s' unknown"
-msgstr ""
+msgid "option --output: field %s unknown"
+msgstr "opción --output: campo %s desconocido"
 
-#: src/df.c:390
-#, fuzzy, c-format
-msgid "option --output: field '%s' used more than once"
-msgstr "atención: se ha especificado el fichero origen %s más de una vez"
+#: src/df.c:394
+#, c-format
+msgid "option --output: field %s used more than once"
+msgstr "opción --output: se ha especificado el campo %s más de una vez"
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr "Disp"
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr "Capacidad"
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
+msgstr "%2$s de %1$s"
+
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
 msgstr ""
 
-#: src/df.c:1210
-#, fuzzy
+#: src/df.c:1384
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
 "or all file systems by default.\n"
@@ -4034,25 +4087,25 @@ msgstr ""
 "Muestra información sobre el sistema de ficheros en el que reside cada "
 "FICHERO,\n"
 "o por omisión sobre todos los sistemas de ficheros.\n"
-"\n"
 
 # Se aceptan sugerencias para lo de "dummy"
-#: src/df.c:1217
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
 #, fuzzy
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
 "  -a, --all             incluye los sistemas de ficheros virtuales\n"
-"  -B, --block-size=TAM  escala los tamaños por TAM antes de mostrarlos.\n"
-"                          P. ej., `-BM' muestra los tamaños en unidades de\n"
-"                          1.048.576 bytes. Vea el formato de TAMAÑO más "
+"  -B, --block-size=TAM  escala los tamaños por TAM antes de mostrarlos;\n"
+"                          p. ej., '-BM' muestra los tamaños en unidades de\n"
+"                          1.048.576 bytes; vea el formato de TAMAÑO más "
 "abajo.\n"
 "      --total           imprime la suma total\n"
 "  -h, --human-readable  imprime los tamaños en formato legible (p.e. 1K 234M "
@@ -4060,7 +4113,7 @@ msgstr ""
 "  -H, --si              análogo, pero utiliza potencias de 1000 y no de "
 "1024\n"
 
-#: src/df.c:1227
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -4076,8 +4129,7 @@ msgstr ""
 "      --no-sync         no llama a sync antes de obtener el modo de empleo\n"
 "                        (por defecto)\n"
 
-#: src/df.c:1234
-#, fuzzy
+#: src/df.c:1409
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
 "                               or print all fields if FIELD_LIST is "
@@ -4089,6 +4141,10 @@ msgid ""
 "  -x, --exclude-type=TYPE   limit listing to file systems not of type TYPE\n"
 "  -v                    (ignored)\n"
 msgstr ""
+"      --output[=LISTA_DE_CAMPOS]   usa el formato de salida definido por\n"
+"                                   LISTA_DE_CAMPOS, o muestra todos los "
+"campos\n"
+"                                   si se omite LISTA_DE_CAMPOS.\n"
 "  -P, --portability    utiliza el formato POSIX para el resultado\n"
 "      --sync           llama a sync antes de obtener el modo de empleo\n"
 "  -t, --type=TIPO      restringe el listado a sistemas de ficheros de tipo "
@@ -4099,42 +4155,39 @@ msgstr ""
 "                       no son del tipo TIPO\n"
 "  -v                   (no tiene efecto)\n"
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
+"\n"
+"LISTA_DE_CAMPOS es una lista separada por comas de columnas que se "
+"incluirán.\n"
+"Los nombres de campos válidos son: 'source', 'fstype', 'itotal', 'iused',\n"
+"'iavail', 'ipcent', 'size', 'used', 'avail', 'pcent', 'file' y 'target'\n"
+"(véase la página info).\n"
 
-#: src/df.c:1285
-#, fuzzy, c-format
+#: src/df.c:1460
+#, c-format
 msgid "options %s and %s are mutually exclusive"
-msgstr "las opciones --compare (-C) y --strip son mutuamente excluyentes"
-
-#: src/df.c:1335
-#, fuzzy
-msgid "warning: "
-msgstr "Atención: "
+msgstr "las opciones %s y %s son mutuamente excluyentes"
 
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr ""
-
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr "el sistema de ficheros %s está simultánemente seleccionado y excluido"
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr "Atención: "
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 msgid "cannot read table of mounted file systems"
 msgstr "no se puede leer la tabla de sistemas de ficheros montados"
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr "no se ha procesado ningún sistema de ficheros"
@@ -4144,7 +4197,7 @@ msgstr "no se ha procesado ningún sistema de ficheros"
 msgid "H. Peter Anvin"
 msgstr "H. Peter Anvin"
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr "Modo de empleo: %s [OPCIÓN]... [FICHERO]\n"
@@ -4168,7 +4221,6 @@ msgstr ""
 "  -p, --print-database        muestra los valores por defecto\n"
 
 #: src/dircolors.c:108
-#, fuzzy
 msgid ""
 "\n"
 "If FILE is specified, read it to determine which colors to use for which\n"
@@ -4181,7 +4233,7 @@ msgstr ""
 "tipos de ficheros y extensiones. En caso contrario, se utiliza una base de\n"
 "datos precompilada. Para más información acerca del formato de estos "
 "ficheros,\n"
-"ejecute `dircolors --print-database'.\n"
+"ejecute 'dircolors --print-database'.\n"
 
 #: src/dircolors.c:286
 #, c-format
@@ -4223,7 +4275,6 @@ msgid "Usage: %s [OPTION] NAME...\n"
 msgstr "Modo de empleo: %s [OPCIÓN] NOMBRE...\n"
 
 #: src/dirname.c:54
-#, fuzzy
 msgid ""
 "Output each NAME with its last non-slash component and trailing slashes\n"
 "removed; if NAME contains no /'s, output '.' (meaning the current "
@@ -4232,18 +4283,19 @@ msgid ""
 msgstr ""
 "Muestra NOMBRE eliminando las barras finales y la última componente que no "
 "sea\n"
-"una barra; si NOMBRE no tiene /'s, el resultado es `.'  (representando el\n"
+"una barra; si NOMBRE no tiene /'s, el resultado es '.'  (representando el\n"
 "directorio actual).\n"
 "\n"
 
 #: src/dirname.c:59
 #, fuzzy
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
 msgstr ""
-"  -0, --null     termina cada línea por un byte 0 en vez de nueva línea\n"
+"  -z, --zero     separa el resultado con NUL en vez de con nueva línea\n"
+"\n"
 
 #: src/dirname.c:64
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Examples:\n"
@@ -4253,10 +4305,11 @@ msgid ""
 msgstr ""
 "\n"
 "Ejemplos:\n"
-"  %s /usr/bin/      Salida \"/usr\".\n"
-"  %s stdio.h        Salida \".\".\n"
+"  %s /usr/bin/          -> \"/usr\"\n"
+"  %s dir1/str dir2/str  -> \"dir1\" seguido por \"dir2\"\n"
+"  %s stdio.h            -> \".\"\n"
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -4273,19 +4326,16 @@ msgstr ""
 # ¿Por qué no algo tan simple y comprensible como "no hace referencia a"? uac
 #
 # Lo pensaré despacito. sv
-#: src/du.c:274
-#, fuzzy
+#: src/du.c:285
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr ""
 "Muestra un resumen del uso de disco para cada FICHERO, recursivamente para\n"
 "directorios.\n"
-"\n"
 
-#: src/du.c:280
+#: src/du.c:291
 #, fuzzy
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -4293,6 +4343,8 @@ msgid ""
 "                          larger due to holes in ('sparse') files, internal\n"
 "                          fragmentation, indirect blocks, and the like\n"
 msgstr ""
+"  -0, --null            termina cada línea con un byte 0 en vez de con nueva "
+"línea\n"
 "  -a, --all             muestra resultados para todos los ficheros, no sólo\n"
 "                        para los directorios\n"
 "      --apparent-size   muestra los tamaños aparentes, en lugar del uso de\n"
@@ -4304,12 +4356,11 @@ msgstr ""
 "indirectos,\n"
 "                          etc.\n"
 
-#: src/du.c:289
-#, fuzzy
+#: src/du.c:300
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -4320,42 +4371,47 @@ msgid ""
 "                          line argument;  --max-depth=0 is the same as\n"
 "                          --summarize\n"
 msgstr ""
-"  -B, --block-size=TAM  escala los tamaños por TAM antes de mostrarlos.\n"
-"                          P. ej., `-BM' muestra los tamaños en unidades de\n"
-"                          1.048.576 bytes. Vea el formato de TAMAÑO más "
-"abajo.\n"
-"  -b, --bytes           equivalente a `--apparent-size --block-size=1'\n"
+"  -B, --block-size=TAM  escala los tamaños por TAM antes de mostrarlos;\n"
+"                          p. ej., '-BM' muestra los tamaños en unidades de\n"
+"                          1.048.576 bytes; vea el formato de TAMAÑO más "
+"abajo\n"
+"  -b, --bytes           equivalente a '--apparent-size --block-size=1'\n"
 "  -c, --total           produce un \"total\"\n"
 "  -D, --dereference-args  sigue solamente los enlaces listados en la línea "
 "de\n"
 "                          órdenes\n"
+"  -d, --max-depth=N     muestra el total para un directorio (o para un "
+"fichero,\n"
+"                          con --all) solamente si está N o menos niveles "
+"por\n"
+"                          debajo del argumento de la línea de órdenes;\n"
+"                          --max-depth=0 es lo mismo que --summarize\n"
 
 # prefiero enlaces duros a fuertes em
 #
 # En esto no os ponéis de acuerdo.
 # Creo que lo acabaremos preguntando en "spanglish". sv+
-#: src/du.c:302
-#, fuzzy
+#: src/du.c:313
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
 "      --files0-from=F   resume el uso de disco de los nombres de ficheros\n"
 "                          terminados en NUL especificados en el fichero F;\n"
-"                          Si F es - entonces lee los nombres de la entrada\n"
+"                          si F es - entonces lee los nombres de la entrada\n"
 "                          estándar\n"
 "  -H                    equivalente a --dereference-args (-D)\n"
 "  -h, --human-readable  muestra los tamaños de forma legible\n"
 "                        (p. ej., 1K 234M 2G)\n"
-"      --si              como -h, pero utiliza potencias de 1000 y no de "
-"1024\n"
+"      --inodes          muestra el uso de nodos-i en lugar del uso de "
+"bloques\n"
 
-#: src/du.c:310
-#, fuzzy
+#: src/du.c:322
 msgid ""
 "  -k                    like --block-size=1K\n"
 "  -L, --dereference     dereference all symbolic links\n"
@@ -4363,28 +4419,27 @@ msgid ""
 "  -m                    like --block-size=1M\n"
 msgstr ""
 "  -k                    como --block-size=1K\n"
+"  -L, --dereference     sigue todos los enlaces simbólicos\n"
 "  -l, --count-links     cuenta los tamaños varias veces si hay enlaces "
 "fuertes\n"
 "  -m                    como --block-size=1M\n"
 
-#: src/du.c:316
-#, fuzzy
+#: src/du.c:328
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
-"  -L, --dereference     desreferencia todos los enlaces simbólicos\n"
 "  -P, --no-dereference  no sigue ningún enlace simbólico (predeterminado)\n"
-"  -0, --null            termina cada línea por un byte 0 en vez de nueva "
-"línea\n"
-"  -S, --separate-dirs   no incluye el tamaño de los subdirectorios\n"
+"  -S, --separate-dirs   para directorios no incluye el tamaño de los "
+"subdirectorios\n"
+"      --si              como -h, pero utiliza potencias de 1000, no de 1024\n"
 "  -s, --summarize       muestra solamente un total para cada argumento\n"
 
-#: src/du.c:322
-#, fuzzy
+#: src/du.c:334
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
 "                          or entries greater than SIZE if negative\n"
@@ -4393,89 +4448,97 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
 msgstr ""
+"  -t, --threshold=TAM    excluye entradas menores que TAM si es positivo,\n"
+"                           o entradas mayores que TAM si es negativo\n"
 "      --time             muestra la fecha/hora de la última modificación de\n"
 "                           cualquier fichero dentro del directorio, o de\n"
 "                           cualquiera de sus subdirectorios\n"
 "      --time=PALABRA     muestra la fecha/hora como PALABRA en lugar de la\n"
 "                           fecha de modificación:\n"
 "                           atime, access, use, ctime o status\n"
-"      --time-style=ESTILO muestra las fechas/horas usando el estilo ESTILO:\n"
-"                          full-iso, long-iso, iso, +FORMATO\n"
-"                          FORMATO se intepreta como `date'\n"
+"      --time-style=ESTILO muestra las fechas/horas usando el estilo ESTILO,\n"
+"                          que puede ser: full-iso, long-iso, iso, o "
+"+FORMATO\n"
+"                          FORMATO se interpreta como en 'date'\n"
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
 "  -x, --one-file-system    skip directories on different file systems\n"
 msgstr ""
+"  -X, --exclude-from=FICH  excluye los ficheros que coinciden con\n"
+"                             cualquier patrón en FICH.\n"
+"      --exclude=PATRÓN     excluye los ficheros que coinciden con PATRÓN.\n"
+"  -x, --one-file-system    se salta los directorios de otros sistemas de\n"
+"                             ficheros\n"
 
-#: src/du.c:386
-#, fuzzy
+#: src/du.c:398
 msgid "Infinity"
-msgstr "Infinito B"
+msgstr "Infinito"
 
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr ""
-
-#: src/du.c:624
+#: src/du.c:636
 #, c-format
 msgid "fts_read failed: %s"
 msgstr "fts_read falló: %s"
 
-#: src/du.c:780
+#: src/du.c:787
 #, c-format
 msgid "invalid maximum depth %s"
 msgstr "profundidad máxima inválida %s"
 
-#: src/du.c:809
-#, fuzzy, c-format
+#: src/du.c:816
+#, c-format
 msgid "invalid --threshold argument '-0'"
-msgstr "argumento --%s inválido %s"
+msgstr "argumento --threshold inválido '-0'"
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr "no se puede al mismo tiempo resumir y mostrar todas las entradas"
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr "atención: resumir es lo mismo que usar --max-depth=0"
 
-#: src/du.c:900
+#: src/du.c:911
 #, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr "atención: resumir entra en conflicto con --max-depth=%lu"
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+"atención: las opciones --apparent-size y -b no tienen efecto con --inodes"
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 msgid "file operands cannot be combined with --files0-from"
 msgstr "los ficheros operando no se pueden combinar con --files0-from."
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr "%s: error de lectura"
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr ""
 "cuando se leen nombres de ficheros de la entrada estándar, no se\n"
 "permite un nombre de fichero de %s"
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 msgid "invalid zero-length file name"
 msgstr "nombre de fichero de longitud cero inválido"
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr "total"
 
@@ -4580,17 +4643,15 @@ msgstr ""
 
 #: src/env.c:55
 msgid "Set each NAME to VALUE in the environment and run COMMAND.\n"
-msgstr ""
+msgstr "Asigna a cada NOMBRE el VALOR en el entorno y ejecuta ORDEN.\n"
 
 #: src/env.c:61
 #, fuzzy
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
-"Asigna a cada NOMBRE el VALOR en el entorno y ejecuta ORDEN.\n"
-"\n"
 "  -i, --ignore-environment   comienza con un entorno vacío\n"
 "  -0, --null                 termina cada línea de salida con un byte 0\n"
 "                               en lugar de con nueva línea\n"
@@ -4620,15 +4681,13 @@ msgid "cannot specify --null (-0) with command"
 msgstr "no se puede especificar --null (-0) con la orden"
 
 #: src/expand.c:107
-#, fuzzy
 msgid ""
 "Convert tabs in each FILE to spaces, writing to standard output.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
 "Convierte las tabulaciones de cada FICHERO en espacios, escribiendo el\n"
 "resultado en la salida estándar. Si no se especifica FICHERO o FICHERO\n"
-"es `-', lee la entrada estándar.\n"
-"\n"
+"es -, lee la entrada estándar.\n"
 
 #: src/expand.c:114
 msgid ""
@@ -4674,16 +4733,16 @@ msgid "input line is too long"
 msgstr "la línea de entrada es demasiado larga"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr "Mike Parker"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr "James Youngman"
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
@@ -4692,7 +4751,7 @@ msgstr ""
 "Modo de empleo: %s EXPRESIÓN\n"
 "       o bien:  %s OPCIÓN\n"
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -4710,7 +4769,7 @@ msgstr ""
 "\n"
 "  ARG1 & ARG2       ARG1 si ningún argumento es nulo o 0, de otra manera 0\n"
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -4729,7 +4788,7 @@ msgstr ""
 "  ARG1 > ARG2       ARG1 es mayor que ARG2\n"
 "\n"
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
@@ -4739,7 +4798,7 @@ msgstr ""
 "  ARG1 + ARG2       suma aritmética de ARG1 y ARG2\n"
 "  ARG1 - ARG2       diferencia aritmética de  ARG1 y ARG2\n"
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -4752,7 +4811,7 @@ msgstr ""
 "  ARG1 / ARG2       cociente aritmético de ARG1 dividido entre ARG2\n"
 "  ARG1 % ARG2       residuo aritmético de ARG1 dividido entre ARG2\n"
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -4772,8 +4831,7 @@ msgstr ""
 "                             encontrado, ó 0\n"
 "  length CADENA              longitud de CADENA\n"
 
-#: src/expr.c:251
-#, fuzzy
+#: src/expr.c:250
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
 "                               keyword like 'match' or an operator like '/'\n"
@@ -4782,8 +4840,8 @@ msgid ""
 msgstr ""
 "  + TOKEN                    interpreta TOKEN como una cadena, incluso si "
 "es\n"
-"                               una palabra clave como `match' o un operador\n"
-"                               como `/'\n"
+"                               una palabra clave como 'match' o un operador\n"
+"                               como '/'\n"
 "\n"
 "  ( EXPRESIÓN )              valor de EXPRESIÓN\n"
 
@@ -4817,7 +4875,7 @@ msgstr ""
 # Gracias. Si se te ocurre alguna ingeniosa traducción de shell, que nos
 # guste a los dos, *y que estés dispuesta a usarla en tu lenguaje cotidiano*
 # me avisas. No creo que suceda. sv
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -4836,7 +4894,7 @@ msgstr ""
 "entre \\( y \\) o nulo; si no se utilizan \\( y \\), devuelven el número de\n"
 "caracteres coincidentes ó 0.\n"
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -4848,32 +4906,32 @@ msgstr ""
 "EXPRESIÓN es nula o 0, 2 si EXPRESIÓN es sintácticamente inválida, y 3\n"
 "si ocurrió un error.\n"
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, c-format
 msgid "syntax error"
 msgstr "error de sintaxis"
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, c-format
 msgid "error in regular expression matcher"
 msgstr "error en el comparador de expresiones regulares"
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, c-format
 msgid "non-integer argument"
 msgstr "argumento no entero"
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr "división por cero"
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr "establezca LC_ALL='C' para solucionar este problema de forma temporal."
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, c-format
 msgid "the strings compared were %s and %s"
 msgstr "las cadenas comparadas eran %s y %s."
@@ -4881,29 +4939,29 @@ msgstr "las cadenas comparadas eran %s y %s."
 #. This is a proper name. See the gettext manual, section Names.
 #: src/factor.c:111
 msgid "Niels Moller"
-msgstr ""
+msgstr "Niels Moller"
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
-msgstr ""
+msgstr "Fallo en el test de primalidad de Lucas.  Esto no debería ocurrir"
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
-msgstr ""
+msgstr "desbordamiento en la cola squfof"
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, c-format
 msgid "%s is not a valid positive integer"
 msgstr "%s no es un entero positivo válido"
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr "%s es demasiado grande"
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
@@ -4912,7 +4970,7 @@ msgstr ""
 "Modo de empleo: %s [NÚMERO]...\n"
 "       o bien:  %s OPCIÓN\n"
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
 "are specified on the command line, read them from standard input.\n"
@@ -4949,14 +5007,12 @@ msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n"
 msgstr "Modo de empleo: %s [-ANCHO] [OPCIÓN]... [FICHERO]...\n"
 
 #: src/fmt.c:271
-#, fuzzy
 msgid ""
 "Reformat each paragraph in the FILE(s), writing to standard output.\n"
 "The option -WIDTH is an abbreviated form of --width=DIGITS.\n"
 msgstr ""
 "Reformatea cada párrafo de FICHERO(s), escribiendo en la salida estándar.\n"
 "La opción -ANCHO es una forma abreviada de --width=D�GITOS.\n"
-"\n"
 
 #: src/fmt.c:278
 msgid ""
@@ -4970,8 +5026,10 @@ msgstr ""
 "  -s, --split-only          divide las líneas largas de manera que quepan\n"
 "                            en el ancho especificado, pero no junta líneas\n"
 
+# FIXME: El % debería ser en realidad %%.
+# De momento dejo eso en inglés y así al menos no se queja.
 #: src/fmt.c:287
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "  -t, --tagged-paragraph    indentation of first line different from second\n"
 "  -u, --uniform-spacing     one space between words, two after sentences\n"
@@ -4986,6 +5044,7 @@ msgstr ""
 "  -w, --width=ANCHO         establece el ancho de línea máximo (por "
 "defecto,\n"
 "                            75 columnas)\n"
+"  -g, --goal=ANCHO          objetivo de ancho (default of 93% of width)\n"
 
 #: src/fmt.c:359
 #, c-format
@@ -5004,14 +5063,12 @@ msgstr "ancho inválido: %s"
 # Sugerencia: "Ajusta ... de cada FICHERO, o de la entrada ..." sv
 # A mí me gusta como está. ipg
 #: src/fold.c:70
-#, fuzzy
 msgid ""
 "Wrap input lines in each FILE (standard input by default), writing to\n"
 "standard output.\n"
 msgstr ""
 "Ajusta el ancho de las líneas en cada FICHERO (por omisión la entrada\n"
 "estándar), y escribe el resultado en la salida estándar\n"
-"\n"
 
 #: src/fold.c:77
 msgid ""
@@ -5029,17 +5086,17 @@ msgid "invalid number of columns: %s"
 msgstr "el número de columnas no es válido %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr "Padraig Brady"
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, c-format
 msgid "Usage: %s\n"
 msgstr "Modo de empleo: %s\n"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
@@ -5049,12 +5106,12 @@ msgstr ""
 "de shell.\n"
 "\n"
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, c-format
 msgid "failed to get groups for user %s"
 msgstr "fallo al obtener los grupos del usuario %s"
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, c-format
 msgid "failed to get groups for the current process"
 msgstr "fallo al obtener los grupos del proceso actual"
@@ -5081,28 +5138,27 @@ msgstr ""
 "datos\n"
 "de grupos ha cambiado).\n"
 
-#: src/groups.c:105 src/id.c:233
-#, fuzzy, c-format
+#: src/groups.c:105 src/id.c:274
+#, c-format
 msgid "cannot get real UID"
-msgstr "no se puede establecer el id del usuario"
+msgstr "no se puede obtener el UID real"
 
-#: src/groups.c:110 src/id.c:241
-#, fuzzy, c-format
+#: src/groups.c:110 src/id.c:282
+#, c-format
 msgid "cannot get effective GID"
-msgstr "no se puede seguir %s"
+msgstr "no se puede obtener el GID efectivo"
 
-#: src/groups.c:115 src/id.c:246
-#, fuzzy, c-format
+#: src/groups.c:115 src/id.c:287
+#, c-format
 msgid "cannot get real GID"
-msgstr "no se puede establecer el id del usuario"
+msgstr "no se puede obtener el GID real"
 
-#: src/groups.c:128 src/id.c:206
-#, fuzzy, c-format
+#: src/groups.c:128 src/id.c:246
+#, c-format
 msgid "%s: no such user"
-msgstr "%s: No existe ese usuario"
+msgstr "%s: no existe ese usuario"
 
 #: src/head.c:109
-#, fuzzy
 msgid ""
 "Print the first 10 lines of each FILE to standard output.\n"
 "With more than one FILE, precede each with a header giving the file name.\n"
@@ -5110,11 +5166,9 @@ msgid ""
 msgstr ""
 "Muestra las primeras 10 líneas de cada FICHERO en la salida estándar.\n"
 "Si se especifican varios FICHERO(s), se muestra el nombre de cada uno.\n"
-"Si no se especifica FICHERO o FICHERO es `-', lee la entrada estándar.\n"
-"\n"
+"Si no se especifica FICHERO o FICHERO es -, lee la entrada estándar.\n"
 
 #: src/head.c:117
-#, fuzzy
 msgid ""
 "  -c, --bytes=[-]K         print the first K bytes of each file;\n"
 "                             with the leading '-', print all but the last\n"
@@ -5124,10 +5178,10 @@ msgid ""
 "                             K lines of each file\n"
 msgstr ""
 "  -c, --bytes=[-]K         muestra los primeros K bytes de cada fichero;\n"
-"                             con el `-' inicial, muestra todos menos los\n"
+"                             con el '-' inicial, muestra todos menos los\n"
 "                             últimos K bytes de cada fichero\n"
 "  -n, --lines=[-]K         muestra las primeras K líneas en lugar de las\n"
-"                             primeras 10; con el `-' inicial, muestra todas\n"
+"                             primeras 10; con el '-' inicial, muestra todas\n"
 "                             menos las últimas K líneas de cada fichero\n"
 
 #: src/head.c:125
@@ -5153,63 +5207,53 @@ msgstr ""
 "GB 1000*1000*1000, G 1024*1024*1024, y así sucesivamente para T, P, E, Z, "
 "Y.\n"
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr "%s: el fichero ha encogido demasiado"
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, c-format
 msgid "%s: number of bytes is too large"
 msgstr "%s: el número de bytes es demasiado grande"
 
-#: src/head.c:440
-#, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr "%s: no se puede efectuar `lseek' hasta la posición original"
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr "%s: no se puede desplazar a la posición %s"
 
-#: src/head.c:673
-#, fuzzy, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "%s: fallo al borrar"
-
-#: src/head.c:798
+#: src/head.c:423 src/tail.c:457
 #, c-format
-msgid "cannot reposition file pointer for %s"
-msgstr "no se puede reposicionar el puntero a fichero para %s"
+msgid "%s: cannot seek to relative offset %s"
+msgstr "%s: no se puede desplazar a la posición relativa %s"
 
 # Eso de "representable" no me suena muy bien, ¿podrías explicar a qué se
 # refiere?, incluso me parecen dos mensajes distintos...
 #
 # Pues un número, es un concepto abstracto, y su representación son
 # cosas como 1, 2 3i em+
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr "%s: %s es tan grande que no es representable"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr "número de líneas"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr "número de bytes"
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr "el número de líneas no es válido"
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr "el número de bytes no es válido"
 
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, c-format
 msgid "invalid trailing option -- %c"
 msgstr "opción inválida al final -- %c"
@@ -5274,32 +5318,38 @@ msgid "cannot determine hostname"
 msgstr "no se puede determinar el nombre del `host'"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr "Arnold Robbins"
 
-#: src/id.c:81
+#: src/id.c:84
 #, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
+msgid "Usage: %s [OPTION]... [USER]\n"
 msgstr "Modo de empleo: %s [OPCIÓN]... [USUARIO]\n"
 
-#: src/id.c:82
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
 msgstr ""
-"Muestra la información de usuario y grupo para el NOMBREUSUARIO "
-"especificado,\n"
-"o (cuando se omite NOMBREUSUARIO) para el usuario actual.\n"
+"Muestra la información de usuario y grupo para el USUARIO especificado,\n"
+"o (cuando se omite USUARIO) para el usuario actual.\n"
 "\n"
+
+#: src/id.c:90
+#, fuzzy
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
+msgstr ""
 "  -a              sin efecto, para compatibilidad con otras versiones\n"
 "  -Z, --context   muestra sólo el contexto de seguridad del usuario actual\n"
 "  -g, --group     muestra sólo el ID de grupo\n"
@@ -5307,8 +5357,11 @@ msgstr ""
 "  -n, --name      muestra un nombre en lugar de un número, para -ugG\n"
 "  -r, --real      muestra el ID real en lugar del ID efectivo, para -ugG\n"
 "  -u, --user      muestra sólo el ID efectivo del usuario\n"
+"  -z, --zero      delimita las entradas con caracteres NUL, no con "
+"espacios;\n"
+"                    no se permite con el formato predeterminado\n"
 
-#: src/id.c:96
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
@@ -5317,19 +5370,26 @@ msgstr ""
 "Sin ninguna OPCIÓN, muestra un conjunto útil de información sobre la "
 "identidad.\n"
 
-#: src/id.c:140
+#: src/id.c:151
+#, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr ""
+"--context (-Z) solamente funciona con núcleos que tengan SELinux/SMACK "
+"activado"
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr ""
 "--context (-Z) solamente funciona con núcleos que tengan SELinux activado"
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr ""
 "no se puede mostrar el contexto de seguridad cuando se especifica usuario"
 
-#: src/id.c:178
+#: src/id.c:198
 #, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr "no se puede mostrar \"only\" de más de una elección"
@@ -5337,73 +5397,81 @@ msgstr "no se puede mostrar \"only\" de más de una elección"
 # Cambio un poco este mensaje. Si el anterior habla en singular, prefiero
 # que este también lo haga. Después de todo la orden id solamente
 # acepta un usuario.
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr ""
 "no se puede imprimir solamente el nombre o el ID real en el formato\n"
 "predeterminado"
 
-#: src/id.c:199
+# Cambio un poco este mensaje. Si el anterior habla en singular, prefiero
+# que este también lo haga. Después de todo la orden id solamente
+# acepta un usuario.
+#: src/id.c:209
+#, c-format
+msgid "option --zero not permitted in default format"
+msgstr "la opción --zero no está permitida en el formato predeterminado"
+
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
 msgstr "no se puede obtener el contexto del proceso"
 
-#: src/id.c:224
-#, fuzzy, c-format
+#: src/id.c:265
+#, c-format
 msgid "cannot get effective UID"
-msgstr "no se puede seguir %s"
+msgstr "no se puede obtener el UID efectivo"
 
-#: src/id.c:311
-#, fuzzy, c-format
+#: src/id.c:354
+#, c-format
 msgid "cannot find name for user ID %s"
-msgstr "no se puede encontrar el nombre para el usuario con ID %lu"
+msgstr "no se puede encontrar el nombre para el usuario con ID %s"
 
-#: src/id.c:329
-#, fuzzy, c-format
+#: src/id.c:372
+#, c-format
 msgid "uid=%s"
-msgstr "uid=%lu"
+msgstr "uid=%s"
 
-#: src/id.c:334
-#, fuzzy, c-format
+#: src/id.c:377
+#, c-format
 msgid " gid=%s"
-msgstr " gid=%lu"
+msgstr " gid=%s"
 
-#: src/id.c:341
-#, fuzzy, c-format
+#: src/id.c:384
+#, c-format
 msgid " euid=%s"
-msgstr " euid=%lu"
+msgstr " euid=%s"
 
-#: src/id.c:349
-#, fuzzy, c-format
+#: src/id.c:392
+#, c-format
 msgid " egid=%s"
-msgstr " egid=%lu"
+msgstr " egid=%s"
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr " grupos="
 
-#: src/id.c:393
+#: src/id.c:437
 #, c-format
 msgid " context=%s"
 msgstr " contexto=%s"
 
-#: src/install.c:373
+#: src/install.c:376
 #, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr "atención: %s: fallo al cambiar el contexto a %s"
 
-#: src/install.c:414
+#: src/install.c:417
 #, c-format
 msgid "creating directory %s"
 msgstr "creando el directorio %s"
 
-#: src/install.c:482
+#: src/install.c:485
 #, c-format
 msgid "cannot change ownership of %s"
 msgstr "no se puede cambiar el propietario de %s"
 
-#: src/install.c:506
+#: src/install.c:509
 #, c-format
 msgid "cannot set time stamps for %s"
 msgstr "no se puede establecer la fecha de %s"
@@ -5414,32 +5482,32 @@ msgstr "no se puede establecer la fecha de %s"
 # (Antes decía simplemente "cannot fork").
 # Gracias a este cambio, tanto el original como la traducción son claros
 # y precisos, pero sin llegar a ser verborreicos.
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, c-format
 msgid "fork system call failed"
 msgstr "falló la llamada al sistema `fork'"
 
-#: src/install.c:531
+#: src/install.c:535
 #, c-format
 msgid "cannot run %s"
 msgstr "no se puede ejecutar %s"
 
-#: src/install.c:535
+#: src/install.c:539
 #, c-format
 msgid "waiting for strip"
 msgstr "esperando a strip"
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr "el proceso strip terminó anormalmente"
 
-#: src/install.c:558
+#: src/install.c:565
 #, c-format
 msgid "invalid user %s"
 msgstr "usuario inválido %s"
 
-#: src/install.c:594
+#: src/install.c:601
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -5452,8 +5520,7 @@ msgstr ""
 "       o bien:  %s [OPCIÓN]... -t DIRECTORIO ORIGEN...\n"
 "       o bien:  %s [OPCIÓN]... -d DIRECTORIO...\n"
 
-#: src/install.c:601
-#, fuzzy
+#: src/install.c:608
 msgid ""
 "\n"
 "This install program copies files (often just compiled) into destination\n"
@@ -5477,9 +5544,8 @@ msgstr ""
 "ORIGEN(es) al DIRECTORIO existente, mientras se establecen los\n"
 "permisos y el propietario/grupo. En la cuarta forma, crea todos los\n"
 "componentes del/de los DIRECTORIO(s) dado(s).\n"
-"\n"
 
-#: src/install.c:615
+#: src/install.c:622
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
 "  -b                  like --backup but does not accept an argument\n"
@@ -5511,7 +5577,7 @@ msgstr ""
 #
 # Estoy con tb, creo que "indicado" explica mejor... uac
 # Lo pensaré. ¿Alguien más? sv
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -5532,7 +5598,7 @@ msgstr ""
 "                          de rwxr-xr-x\n"
 "  -o, --owner=PROPIETARIO establece la propiedad (sólo superusuario)\n"
 
-#: src/install.c:631
+#: src/install.c:638
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
 "files\n"
@@ -5556,17 +5622,39 @@ msgstr ""
 "  -v, --verbose           muestra el nombre de cada directorio conforme se\n"
 "                          van creando\n"
 
-#: src/install.c:641
+#: src/install.c:648
+#, fuzzy
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
 "      --preserve-context  conserva el contexto de seguridad de SELinux\n"
-"  -Z, --context=CONTEXTO  establece el contexto de seguridad SELinux de los\n"
-"                          ficheros y directorios\n"
+"  -Z, --context=CONTEXTO  establece el contexto de seguridad SELinux del\n"
+"                            fichero de destino al tipo predeterminado,\n"
+"                            o a CONTEXTO si se especifica\n"
 
-#: src/install.c:859
+# Otra posibilidad sería "no se puede borrar el enlace `%s'".
+# Mirarlo con calma. sv
+#
+# recordatorio: un fichero es _siempre_ un nodo-i que es enlazado por
+# entrada/s en directorios, cuando se desenlaza el último enlace que une una
+# entrada de directorio con el fichero, entonces y sólo entonces se borra
+# físicamente.... uac
+#
+# Lo sé, lo sé.
+# En este caso habría que investigar las causas por las que no se puede
+# deshacer el tal enlace. Habrá que buscar al menos un ejemplo en el que
+# aparezca este mensaje. sv
+#
+#: src/install.c:696 src/unlink.c:86
+#, c-format
+msgid "cannot unlink %s"
+msgstr "no se puede deshacer el enlace %s"
+
+#: src/install.c:877
 #, c-format
 msgid ""
 "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
@@ -5574,35 +5662,22 @@ msgstr ""
 "ATENCIÓN: no se tendrá en cuenta --preserve-context; este núcleo no tiene\n"
 "SELinux activado"
 
-#: src/install.c:869
-#, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
-msgstr ""
-"ATENCIÓN: no se tendrá en cuenta --context (-Z); este núcleo no tiene "
-"SELinux\n"
-"activado"
-
-#: src/install.c:886
+#: src/install.c:917
 #, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr "la opción strip no se puede usar cuando se instala un directorio"
 
-#: src/install.c:889
+#: src/install.c:920
 #, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr "no se permite un directorio de destino cuando se instala un directorio"
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr "no se puede forzar al contexto a %s y conservarlo"
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, c-format
 msgid "invalid mode %s"
 msgstr "modo inválido %s"
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr ""
@@ -5610,19 +5685,19 @@ msgstr ""
 "especificado\n"
 "la opción -s"
 
-#: src/install.c:959
+#: src/install.c:1001
 #, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr ""
 "las opciones --compare (-C) y --preserve-timestamps son mutuamente "
 "excluyentes"
 
-#: src/install.c:966
+#: src/install.c:1008
 #, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr "las opciones --compare (-C) y --strip son mutuamente excluyentes"
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -5641,7 +5716,7 @@ msgstr "Mike Haertel"
 # Eso es repetir el "both". sv
 # En lugar de `no los dos a la vez' ¿`nunca los dos a la vez'? ipg
 # Eso está mucho mejor em
-#: src/join.c:191
+#: src/join.c:195
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
 "standard output.  The default join field is the first, delimited\n"
@@ -5654,8 +5729,7 @@ msgstr ""
 "Muestra una línea en la salida estándar por cada par de líneas que "
 "contengan\n"
 "campos idénticos. El campo a comparar por defecto es el primero, delimitado\n"
-"por un espacio en blanco. Si FICHERO1 o FICHERO2 es `-' (nunca dos a la "
-"vez),\n"
+"por un espacio en blanco. Si FICHERO1 o FICHERO2 es - (nunca dos a la vez),\n"
 "lee la entrada estándar.\n"
 "\n"
 "  -a NUMFICH        muestra también las líneas no emparejables del fichero\n"
@@ -5663,8 +5737,7 @@ msgstr ""
 "                      FICHERO1 o FICHERO2\n"
 "  -e VAC�O          reemplaza los campos inexistentes por VAC�O\n"
 
-#: src/join.c:200
-#, fuzzy
+#: src/join.c:204
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
 "  -j FIELD          equivalent to '-1 FIELD -2 FIELD'\n"
@@ -5679,7 +5752,7 @@ msgstr ""
 "en\n"
 "                      la salida\n"
 
-#: src/join.c:206
+#: src/join.c:210
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
 "  -1 FIELD          join on this FIELD of file 1\n"
@@ -5698,10 +5771,16 @@ msgstr ""
 "emparejables\n"
 "  --nocheck-order   no comprueba que la entrada está correctamente ordenada\n"
 
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+#, fuzzy
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr ""
+"  -z, --zero-terminated   termina las líneas con el byte 0, no con nueva "
+"línea\n"
+
 # Creo que "si no, los campos se separan con CAR�CTER" es redundante,
 # por supuesto al igual que en la versión english.
-#: src/join.c:218
-#, fuzzy
+#: src/join.c:225
 msgid ""
 "\n"
 "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n"
@@ -5726,58 +5805,58 @@ msgstr ""
 "el\n"
 "número de campo contado a partir de 1. FORMATO es una lista de elementos de "
 "la\n"
-"forma `NUMFICH.CAMPO' ó `0', separada por comas o por espacios en blanco. "
+"forma 'NUMFICH.CAMPO' ó '0', separada por comas o por espacios en blanco. "
 "El\n"
 "FORMATO por defecto muestra el campo que empareja, los restantes campos de\n"
 "FICHERO1 y los de FICHERO2, todos separados por CAR�CTER. Si FORMATO es la\n"
-"palabra clave `auto', entonces la primera línea de cada fichero determina "
+"palabra clave 'auto', entonces la primera línea de cada fichero determina "
 "el\n"
 "número de campos de salida para cada línea.\n"
 "\n"
 "Importante: FICHERO1 y FICHERO2 deben estar ordenados en los campos de "
 "unión\n"
-"P. ej., utilice `sort -k 1b,1' si `join' no tiene opciones.\n"
+"P. ej., utilice 'sort -k 1b,1' si 'join' no tiene opciones.\n"
 "Note que las comparaciones siguen las reglas especificadas por "
-"`LC_COLLATE'.\n"
+"'LC_COLLATE'.\n"
 "Si la entrada no está ordenada y no se pueden juntar algunas líneas, se\n"
 "dará un mensaje de aviso.\n"
 
-#: src/join.c:403
-#, fuzzy, c-format
+#: src/join.c:410
+#, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
-msgstr "%s:%ju: no está ordenado: %.*s"
+msgstr "%s:%<PRIuMAX>: no está ordenado: %.*s"
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, c-format
 msgid "invalid field number: %s"
 msgstr "número de campo inválido: %s"
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, c-format
 msgid "invalid field specifier: %s"
 msgstr "la especificación del campo no es válida: %s"
 
-#: src/join.c:877
+#: src/join.c:884
 #, c-format
 msgid "invalid file number in field spec: %s"
 msgstr "número de fichero inválido en la especificación del campo: %s"
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr "campos de unión %lu, %lu incompatibles"
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr "cadenas de reemplazo de campos vacíos conflictivas"
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, c-format
 msgid "multi-character tab %s"
 msgstr "tab multicarácter %s"
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr "tabulaciones incompatibles"
@@ -5787,7 +5866,7 @@ msgstr "tabulaciones incompatibles"
 # ¿¿Acaso hay sistemas con stdin1 y stdin2?? :-)
 #
 # Eso es lo de menos :) em+
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr "los dos ficheros no pueden ser a la vez la entrada estándar"
@@ -5804,11 +5883,8 @@ msgstr ""
 "       o bien:  %s -t [SEÑAL]...\n"
 
 #: src/kill.c:82
-#, fuzzy
 msgid "Send signals to processes, or list signals.\n"
-msgstr ""
-"Envía señales a los procesos, o lista señales.\n"
-"\n"
+msgstr "Envía señales a los procesos, o lista señales.\n"
 
 #: src/kill.c:88
 msgid ""
@@ -5827,7 +5903,6 @@ msgstr ""
 "  -t, --table       muestra una tabla de información sobre señales\n"
 
 #: src/kill.c:96
-#, fuzzy
 msgid ""
 "\n"
 "SIGNAL may be a signal name like 'HUP', or a signal number like '1',\n"
@@ -5835,8 +5910,8 @@ msgid ""
 "PID is an integer; if negative it identifies a process group.\n"
 msgstr ""
 "\n"
-"SEÑAL puede ser un nombre de señal como `HUP', o un número de señal como "
-"`1',\n"
+"SEÑAL puede ser un nombre de señal como 'HUP', o un número de señal como "
+"'1',\n"
 "o un estado de salida de un proceso terminado por una señal.\n"
 "PID es un entero; si es negativo identifica al grupo de un proceso.\n"
 
@@ -5913,49 +5988,49 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr "no se puede crear el enlace duro %s a %s"
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr "%s: no se permiten enlaces fuertes para directorios"
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, c-format
 msgid "%s: cannot overwrite directory"
 msgstr "%s: no se puede sobreescribir un directorio"
 
 # SIoNO
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
 msgstr "%s: ¿reemplazar %s? (s/n) "
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, c-format
 msgid "failed to create symbolic link %s"
 msgstr "fallo al crear el enlace simbólico %s"
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr "fallo al crear el enlace simbólico %s -> %s"
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr "fallo al crear el enlace duro a %.0s%s"
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, c-format
 msgid "failed to create hard link %s"
 msgstr "fallo al crear el enlace duro %s"
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, c-format
 msgid "failed to create hard link %s => %s"
 msgstr "fallo al crear el enlace duro %s => %s"
 
 # Aprovecho que en iso-8859-1 existen 1º y 1ª ...
-#: src/ln.c:374
+#: src/ln.c:391
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -5971,8 +6046,7 @@ msgstr ""
 # ... y de lo de poner la coletilla "y finaliza" en
 # las opciones --version y --help :) ipg
 # Si convences a Enrique de que la coletilla se puede quitar, te apoyo. sv
-#: src/ln.c:381
-#, fuzzy
+#: src/ln.c:398
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
 "In the 2nd form, create a link to TARGET in the current directory.\n"
@@ -5988,13 +6062,14 @@ msgstr ""
 "En la segunda forma, crea un enlace a OBJETIVO en el directorio actual.\n"
 "En las formas tercera y cuarta, crea enlaces a cada OBJETIVO en DIRECTORIO.\n"
 "Por omisión, se crean enlaces duros, se crean simbólicos con --symbolic.\n"
+"Por omisión, ningún destino (nombre del nuevo enlace) debe existir todavía.\n"
 "Cuando se crean enlaces duros, todos los OBJETIVOs deben existir. Los "
 "enlaces\n"
 "simbólicos pueden tener un texto arbitrario; si entonces se resuelve, un "
 "enlace\n"
 "relativo se interpreta en relación a su directorio padre.\n"
 
-#: src/ln.c:394
+#: src/ln.c:411
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
 "file\n"
@@ -6018,8 +6093,7 @@ msgstr ""
 "                                el superusuario)\n"
 "  -f, --force                 borra los ficheros destino que ya existan\n"
 
-#: src/ln.c:402
-#, fuzzy
+#: src/ln.c:419
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
 "  -L, --logical               dereference TARGETs that are symbolic links\n"
@@ -6031,18 +6105,20 @@ msgid ""
 "  -s, --symbolic              make symbolic links instead of hard links\n"
 msgstr ""
 "  -i, --interactive           pregunta si se borran los destinos\n"
-"  -L, --logical               crea enlaces duros a referencias de enlaces\n"
-"                                simbólicos\n"
-"  -n, --no-dereference        trata un destino que sea un enlace simbólico "
-"a\n"
-"                              un directorio como si fuera un fichero normal\n"
+"  -L, --logical               sigue los OBJETIVOS que sean enlaces "
+"simbólicos\n"
+"  -n, --no-dereference        trata NOMBRE_DEL_ENLACE como fichero normal si "
+"es\n"
+"                                un enlace simbólico a un directorio\n"
 "  -P, --physical              crea enlaces duros directamente a los enlaces\n"
 "                                simbólicos\n"
+"  -r, --relative              crea enlaces simbólicos relativos al lugar "
+"del\n"
+"                                enlace\n"
 "  -s, --symbolic              crea enlaces simbólicos en vez de enlaces "
 "duros\n"
 
-#: src/ln.c:411
-#, fuzzy
+#: src/ln.c:428
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
 "  -t, --target-directory=DIRECTORY  specify the DIRECTORY in which to "
@@ -6054,32 +6130,34 @@ msgstr ""
 "  -S, --suffix=SUFIJO         reemplaza el sufijo de respaldo habitual\n"
 "  -t, --target-directory=DIRECTORIO  especifica el DIRECTORIO en el que se\n"
 "                                     crearán los enlaces\n"
-"  -T, --no-target-directory   trata NOMBRE_DEL_ENLACE como un fichero "
-"normal\n"
+"  -T, --no-target-directory   trata siempre NOMBRE_DEL_ENLACE como un "
+"fichero\n"
+"                                normal\n"
 "  -v, --verbose               imprime el nombre de cada fichero antes\n"
 "                              de crear el enlace\n"
 
-#: src/ln.c:433
-#, fuzzy, c-format
+#: src/ln.c:450
+#, c-format
 msgid ""
 "\n"
 "Using -s ignores -L and -P.  Otherwise, the last option specified controls\n"
 "behavior when a TARGET is a symbolic link, defaulting to %s.\n"
 msgstr ""
+"\n"
 "Si se utiliza -s entonces ni -L ni -P tienen efecto. En caso contrario,\n"
-"la última opción especificada controla el comportamiento cuando el origen\n"
+"la última opción especificada controla el comportamiento cuando un OBJETIVO\n"
 "es un enlace simbólico, por omisión %s.\n"
 "\n"
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr "no se puede combinar --target-directory y --no-target-directory"
 
-#: src/ln.c:588
-#, fuzzy, c-format
+#: src/ln.c:605
+#, c-format
 msgid "cannot do --relative without --symbolic"
-msgstr "no se puede crear el enlace simbólico %s"
+msgstr "no se puede usar --relative sin --symbolic"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/logname.c:30
@@ -6118,7 +6196,7 @@ msgstr "no hay ningún nombre de `login'"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
@@ -6127,57 +6205,56 @@ msgstr "%b %e  %Y"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 msgid "%b %e %H:%M"
 msgstr "%b %e %H:%M"
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr ""
 "se descarta el valor inválido de la variable de entorno QUOTING_STYLE: %s"
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr "se descarta el ancho inválido de la variable de entorno COLUMNS: %s"
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr ""
 "se descarta el tamaño de `tab' inválido de la variable de entorno TABSIZE: %s"
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, c-format
 msgid "invalid line width: %s"
 msgstr "ancho de línea inválido: %s"
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, c-format
 msgid "invalid tab size: %s"
 msgstr "tamaño del `tab' inválido: %s"
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, c-format
 msgid "invalid time style format %s"
 msgstr "formato de estilo de fecha inválido %s"
 
-#: src/ls.c:2057
-#, fuzzy
+#: src/ls.c:2067
 msgid "Valid arguments are:\n"
-msgstr "Los argumentos válidos son:"
+msgstr "Los argumentos válidos son:\n"
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
-msgstr ""
+msgstr "  - +FORMATO (p. ej., +%H:%M) para un formato en estilo 'date'\n"
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr "error al inicializar las cadenas de meses"
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, c-format
 msgid "unrecognized prefix: %s"
 msgstr "prefijo no reconocido: %s"
@@ -6195,38 +6272,38 @@ msgstr "prefijo no reconocido: %s"
 # es ininteligible... (Si de verdad no fuera analizable, no daría
 # error, sino que produciría un "core dump" o algo así). sv
 #
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr "valor ininteligible para la variable de entorno LS_COLORS"
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, c-format
 msgid "cannot open directory %s"
 msgstr "no se puede abrir el directorio %s"
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, c-format
 msgid "cannot determine device and inode of %s"
 msgstr "no se puede determinar el dispositivo y el nodo-i de %s"
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, c-format
 msgid "%s: not listing already-listed directory"
 msgstr "%s: no se muestra el directorio ya mostrado"
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, c-format
 msgid "reading directory %s"
 msgstr "leyendo el directorio %s"
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, c-format
 msgid "closing directory %s"
 msgstr "cerrando el directorio %s"
 
 # Lo mismo de antes.
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, c-format
 msgid "cannot compare file names %s and %s"
 msgstr "no se pueden comparar los nombres de fichero %s y %s"
@@ -6251,8 +6328,7 @@ msgstr "no se pueden comparar los nombres de fichero %s y %s"
 # pero para lo que aquí se quiere decir le toca la segunda... ¿no? uac
 #
 # Eso es lo que me parece. Gracias. sv
-#: src/ls.c:4721
-#, fuzzy
+#: src/ls.c:4781
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
 "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n"
@@ -6261,9 +6337,8 @@ msgstr ""
 "defecto).\n"
 "Ordena las entradas alfabéticamente si no se especifica ninguna de las\n"
 "opciones -cftuvSUX ni --sort.\n"
-"\n"
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
 "  -A, --almost-all           do not list implied . and ..\n"
@@ -6278,61 +6353,54 @@ msgstr ""
 "no\n"
 "                             gráficos\n"
 
-#: src/ls.c:4734
-#, fuzzy
+#: src/ls.c:4794
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
 "      --block-size=TAMAÑO    escala los tamaños por TAMAÑO antes de "
-"mostrarlos.\n"
-"                               P. ej., `--block-size=M' muestra los tamaños "
+"mostrarlos;\n"
+"                               p. ej., '--block-size=M' muestra los tamaños "
 "en\n"
-"                               unidades de 1.048.576 bytes. Vea el formato "
+"                               unidades de 1.048.576 bytes; vea el formato "
 "de\n"
 "                               TAMAÑO más abajo.\n"
 "  -B, --ignore-backups       no muestra la entradas que terminan con ~\n"
 "  -c                         con -lt: ordena por ctime y muestra ctime "
 "(fecha\n"
-"                               de última modificación del fichero)\n"
-"                               con -l: muestra ctime y ordena por nombre\n"
+"                               de última modificación del fichero);\n"
+"                               con -l: muestra ctime y ordena por nombre;\n"
 "                               en cualquier otro caso: ordena por ctime, el\n"
 "                               más reciente primero\n"
 
-#: src/ls.c:4744
-#, fuzzy
+#: src/ls.c:4804
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 "  -C                         muestra las entradas por columnas\n"
-"      --color[=CU�NDO]       colorea la salida. Por omisión CU�NDO es "
-"`always'\n"
-"                               y puede ser también `never' o `auto'.\n"
-"                               Más información abajo.\n"
-"  -d, --directory            muestra las entradas de los directorios en "
-"lugar\n"
-"                               de sus contenidos, y no sigue los enlaces\n"
-"                               simbólicos\n"
-"  -D, --dired                genera el resultado para el modo `dired' de "
+"      --color[=CU�NDO]       colorea la salida. CU�NDO puede ser 'never', "
+"'auto',\n"
+"                               o 'always' (predeterminado); véase más abajo\n"
+"  -d, --directory            muestra los propios directorios, no el "
+"contenido\n"
+"  -D, --dired                genera el resultado para el modo 'dired' de "
 "Emacs\n"
 
-#: src/ls.c:4752
-#, fuzzy
+#: src/ls.c:4812
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
 "  -F, --classify             append indicator (one of */=>@|) to entries\n"
@@ -6344,34 +6412,36 @@ msgstr ""
 "  -f                         no ordena, utiliza -aU, no utiliza -ls --color\n"
 "  -F, --classify             añade un indicador (uno de */=@|) a las "
 "entradas\n"
-"      --file-type            similar, pero no añade `*'\n"
+"      --file-type            similar, pero no añade '*'\n"
 "      --format=PALABRA       across -x, commas -m, horizontal -x, long -l,\n"
 "                               single-column -1, verbose -l, vertical -C\n"
 "      --full-time            como -l --time-style=full-iso\n"
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr "  -g                         como -l, pero no lista el propietario\n"
 
-#: src/ls.c:4763
+#: src/ls.c:4823
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 "      --group-directories-first\n"
-"                             agrupa directorios antes que los ficheros\n"
-"                               compatible con una opción --sort, pero "
+"                             agrupa directorios antes que los ficheros;\n"
+"                               se puede añadir una opción --sort, pero "
 "cualquier\n"
 "                               uso de --sort=none (-U) desactiva la "
 "agrupación\n"
 
 # Se aceptan sugerencias para lo de "dummy"
-#: src/ls.c:4769
+#: src/ls.c:4829
+#, fuzzy
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
@@ -6382,14 +6452,14 @@ msgstr ""
 "  -H, --si                   análogo, pero utiliza potencias de 1000 y no de "
 "1024\n"
 
-#: src/ls.c:4775
+#: src/ls.c:4835
 msgid ""
 "  -H, --dereference-command-line\n"
 "                             follow symbolic links listed on the command "
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
@@ -6399,13 +6469,12 @@ msgstr ""
 "                             órdenes\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             sigue cada enlace simbólico en la línea de\n"
-"                             órdenes que apunte a un directorio\n"
+"                               órdenes que apunte a un directorio\n"
 "      --hide=PATRÓN          no lista las entradas implícitas que coinciden\n"
 "                               con el patrón de shell PATRÓN\n"
 "                               (las opciones -a o -A tienen prioridad)\n"
 
-#: src/ls.c:4785
-#, fuzzy
+#: src/ls.c:4845
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
 "names:\n"
@@ -6414,7 +6483,7 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 "      --indicator-style=PALABRA  añade un indicador con estilo PALABRA a "
 "los\n"
@@ -6425,9 +6494,10 @@ msgstr ""
 "  -i, --inode                muestra el número de índice de cada fichero\n"
 "  -I, --ignore=PATRÓN        no lista las entradas que coincidan (encajen)\n"
 "                               con PATRÓN de shell\n"
-"  -k                         como --block-size=1K\n"
+"  -k, --kibibytes            utiliza bloques de 1024 bytes para el uso de "
+"disco\n"
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -6446,7 +6516,7 @@ msgstr ""
 "  -m                         rellena el ancho con una lista de entradas\n"
 "                             separadas por comas\n"
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -6476,12 +6546,11 @@ msgstr ""
 # una línea más, y quedaría más feo. Si digo "sin el grupo", queda
 # claro que el grupo no sale. sv
 #
-#: src/ls.c:4811
-#, fuzzy
+#: src/ls.c:4871
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -6491,9 +6560,9 @@ msgstr ""
 "  -q, --hide-control-chars   imprime ? en lugar de los caracteres no "
 "gráficos\n"
 "      --show-control-chars   muestra los caracteres no gráficos tal y como\n"
-"                             son (predeterminado a menos que el programa "
+"                               son (predeterminado a menos que el programa "
 "sea\n"
-"                             `ls' y la salida sea un terminal)\n"
+"                               'ls' y la salida sea un terminal)\n"
 "  -Q, --quote-name           encierra los nombres de las entradas entre\n"
 "                             comillas\n"
 "      --quoting-style=PALABRA  utiliza el estilo de cita PALABRA para los\n"
@@ -6501,7 +6570,7 @@ msgstr ""
 "                               literal, locale, shell, shell-always, c, "
 "escape\n"
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
 "  -R, --recursive            list subdirectories recursively\n"
@@ -6515,55 +6584,62 @@ msgstr ""
 # Nota: ctime, extension, none, etc. son posibles "WORD"s,
 # por lo tanto, *no* deben traducirse, o de lo contrario el programa
 # no las reconocería.
-#: src/ls.c:4825
+#: src/ls.c:4886
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 "  -S                         ordena los ficheros por tamaño\n"
-"      --sort=PALABRA         ordena por PALABRA en vez de por nombre: none -"
-"U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
+"      --sort=PALABRA         ordena por PALABRA en vez de por nombre: none (-"
+"U),\n"
+"                               size (-S), time (-t), version (-v), extension "
+"(-X)\n"
 "      --time=PALABRA         con -l, muestra la fecha según PALABRA, en "
 "lugar\n"
 "                               de la fecha de modificación:\n"
-"                               atime -u, access -u, use -u, ctime -c, ó "
-"status -c;\n"
-"                               utiliza la fecha especificada como clave de\n"
+"                               atime o access o use (-u); ctime o status (-"
+"c)\n"
+"                               también utiliza la fecha especificada como "
+"clave de\n"
 "                               ordenación si --sort=time\n"
 
-#: src/ls.c:4835
-#, fuzzy
+#: src/ls.c:4896
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
 msgstr ""
 "      --time-style=ESTILO    con -l, muestra la fecha utilizando el estilo "
 "ESTILO:\n"
-"                               full-iso, long-iso, iso, locale, +FORMATO\n"
-"                             FORMATO se interpreta como en `date'; si "
+"                               full-iso, long-iso, iso, locale, o +FORMATO;\n"
+"                               FORMATO se interpreta como en 'date'; si "
 "FORMATO\n"
-"                             es FORMATO1<nuevalínea>FORMATO2, FORMATO1 se\n"
-"                             aplica a los ficheros no recientes y FORMATO2\n"
-"                             a los ficheros recientes; si ESTILO está "
+"                               es FORMATO1<nuevalínea>FORMATO2, entonces "
+"FORMATO1\n"
+"                               se aplica a los ficheros no recientes y "
+"FORMATO2\n"
+"                               a los ficheros recientes; si ESTILO está "
 "precedido\n"
-"                             por `posix-', ESTILO surte efecto solamente "
+"                               por 'posix-', ESTILO surte efecto solamente "
 "fuera\n"
-"                             del local POSIX\n"
+"                               del local POSIX\n"
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 msgid ""
 "  -t                         sort by modification time, newest first\n"
 "  -T, --tabsize=COLS         assume tab stops at each COLS instead of 8\n"
@@ -6573,18 +6649,18 @@ msgstr ""
 "  -T, --tabsize=COLS         establece los topes de tabulación a cada COLS\n"
 "                             en lugar de 8\n"
 
-#: src/ls.c:4848
+#: src/ls.c:4912
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
 msgstr ""
 "  -u                         con -lt: ordena por atime y muestra atime "
 "(fecha\n"
-"                               de último acceso al fichero)\n"
-"                               con -l: muestra atime y ordena por nombre\n"
+"                               de último acceso al fichero);\n"
+"                               con -l: muestra atime y ordena por nombre;\n"
 "                               en cualquier otro caso: ordena por atime\n"
 "  -U                         no ordena; muestra las entradas en el orden "
 "del\n"
@@ -6592,13 +6668,13 @@ msgstr ""
 "  -v                         orden natural de números (de versión) dentro\n"
 "                               del texto\n"
 
-#: src/ls.c:4855
+#: src/ls.c:4919
+#, fuzzy
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 "  -w, --width=COLS           establece el ancho de la pantalla en lugar del\n"
@@ -6612,7 +6688,7 @@ msgstr ""
 "                               fichero\n"
 "  -1                         muestra un fichero por cada línea\n"
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -6627,7 +6703,7 @@ msgstr ""
 "terminal. La variable de entorno LS_COLORS puede cambiar las opciones.\n"
 "Utilice la orden dircolors para establecerla.\n"
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -6669,7 +6745,7 @@ msgid ""
 msgstr ""
 "Modo de empleo: %s [OPCIÓN]... [FICHERO]...\n"
 "Muestra o comprueba sumas de comprobación %s (de %d bits).\n"
-"Si no se especifica FICHERO o FICHERO es `-', lee la entrada estándar.\n"
+"Si no se especifica FICHERO o FICHERO es -, lee la entrada estándar.\n"
 
 #: src/md5sum.c:174
 msgid ""
@@ -6690,7 +6766,7 @@ msgstr "  -c, --check          lee %s sumas de los FICHEROs y las comprueba\n"
 
 #: src/md5sum.c:184
 msgid "      --tag            create a BSD-style checksum\n"
-msgstr ""
+msgstr "      --tag            crea una suma de comprobación de estilo BSD\n"
 
 #: src/md5sum.c:188
 msgid ""
@@ -6710,32 +6786,29 @@ msgstr "  -t, --text           lee en modo de texto (por omisión)\n"
 #: src/md5sum.c:195
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
 "\n"
-"Las siguientes tres opciones son útiles sólo cuando ser verifican sumas de\n"
+"Las siguientes cuatro opciones son útiles sólo cuando se verifican sumas de\n"
 "comprobación:\n"
 "      --quiet          no muestra OK por cada fichero verificado con éxito\n"
 "      --status         no muestra nada, el valor de retorno indica el\n"
 "                         resultado\n"
+"      --strict         sale con estado distinto de cero cuando hay alguna "
+"línea\n"
+"                         de suma de comprobación mal formateada\n"
 "  -w, --warn           avisa de las líneas de comprobación de sumas\n"
 "                         que no están correctamente formateadas\n"
 "\n"
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-"      --strict         con --check, sale con estado de salida distinto de "
-"cero\n"
-"                         para cualquier entrada inválida\n"
-
-#: src/md5sum.c:208
-#, fuzzy, c-format
+#: src/md5sum.c:206
+#, c-format
 msgid ""
 "\n"
 "The sums are computed as described in %s.  When checking, the input\n"
@@ -6749,9 +6822,10 @@ msgstr ""
 "defecto\n"
 "se muestra una línea con la suma de comprobación, un carácter indicando el "
 "modo\n"
-"de entrada (`*' para binario, ` ' para texto), y el nombre de cada FICHERO.\n"
+"de entrada ('*' para binario, espacio para texto), y el nombre de cada "
+"FICHERO.\n"
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, c-format
 msgid "%s: too many checksum lines"
 msgstr "%s: demasiadas líneas de suma de comprobación"
@@ -6764,14 +6838,14 @@ msgstr "%s: demasiadas líneas de suma de comprobación"
 # "...de comprobación MD5 con formato erróneo."
 #
 # ipg: ¿y crece por allí? ¡con el frío que hace! }:-)
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr "%s: %<PRIuMAX>: línea de suma de comprobación %s con formato erróneo"
 
 # Sí, ( no hace falta leerse los coding standards para saberlo, aunque ahí lo
 # puedes encontrar también ) %s es el nombre del programa. em
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr "%s: FALLO al abrir o leer\n"
@@ -6779,7 +6853,7 @@ msgstr "%s: FALLO al abrir o leer\n"
 # Puestos a simplificar, a lo mejor podrías poner simplemente
 # "coincide" o "no coincide". Cualquiera que use el programa sabe
 # perfectamente qué es lo que coincide y lo que no. sv+
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr "La suma no coincide"
 
@@ -6788,12 +6862,12 @@ msgstr "La suma no coincide"
 # Correcto/incorrecto, o sea no se refieren al resultado de la suma sino
 # a la comprobación.... es simple y corto... como el mensaje original....
 #
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr "La suma coincide"
 
 # Me pregunto y no me contesto: ¿Qué podrá ser el segundo %s?
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr ""
@@ -6807,40 +6881,39 @@ msgstr ""
 # "...de comprobación MD5 con formato erróneo."
 #
 # ipg: ¿y crece por allí? ¡con el frío que hace! }:-)
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
 msgstr[0] "ATENCIÓN: %<PRIuMAX>: línea tiene un formato erróneo"
 msgstr[1] "ATENCIÓN: %<PRIuMAX>: líneas tienen un formato erróneo"
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
 msgstr[0] "ATENCIÓN: no se pudo leer %<PRIuMAX> fichero listado"
 msgstr[1] "ATENCIÓN: no se pudieron leer %<PRIuMAX> ficheros listados"
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
 msgstr[0] "ATENCIÓN: %<PRIuMAX> suma calculada NO coincidió"
 msgstr[1] "ATENCIÓN: %<PRIuMAX> sumas calculadas NO coincidieron"
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
-msgstr ""
+msgstr "--tag no admite modo --text"
 
-#: src/md5sum.c:766
-#, fuzzy, c-format
+#: src/md5sum.c:770
+#, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr ""
-"la opción --status sólo tiene sentido cuando se verifican sumas de "
-"comprobación"
+"la opción --tag sólo tiene sentido cuando se verifican sumas de comprobación"
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
@@ -6848,67 +6921,91 @@ msgstr ""
 "las opciones --binary y --text no tienen sentido cuando se verifican sumas\n"
 "de comprobación"
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr ""
 "la opción --status sólo tiene sentido cuando se verifican sumas de "
 "comprobación"
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr ""
 "la opción --warn sólo tiene sentido cuando se verifican sumas de comprobación"
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr ""
 "la opción --quiet sólo tiene sentido cuando se verifican sumas de "
 "comprobación"
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr ""
 "la opción --strict sólo tiene sentido cuando se verifican sumas de "
 "comprobación"
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr "Modo de empleo: %s [OPCIÓN]... DIRECTORIO...\n"
 
-#: src/mkdir.c:57
-#, fuzzy
+#: src/mkdir.c:59
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
-msgstr ""
-"Crea los DIRECTORIO(s), si no existen ya.\n"
-"\n"
+msgstr "Crea los DIRECTORIO(s), si no existen ya.\n"
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
+#, fuzzy
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 "  -m, --mode=MODE   establece los permisos (como en chmod), en lugar\n"
 "                    de  a=rwx - umask\n"
 "  -p, --parents     no hay error si existen, crea los directorios padres en\n"
 "                    caso necesario\n"
 "  -v, --verbose     muestra un mensaje por cada directorio creado\n"
-"  -Z, --context=CTX  establece el contexto de seguridad SELinux de cada\n"
-"                       directorio creado a CTX\n"
+"  -Z, --context[=CTX]  establece el contexto de seguridad SELinux de cada\n"
+"                       directorio creado al tipo predeterminado o a CTX si\n"
+"                       se especifica\n"
+
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
 
-#: src/mkdir.c:168
+#: src/mkdir.c:127 src/mkdir.c:172
+#, c-format
+msgid "failed to set default creation context for %s"
+msgstr "fallo al establecer el contexto de creación predeterminado para %s"
+
+#: src/mkdir.c:191
+#, c-format
+msgid "failed to restore context for %s"
+msgstr "fallo al restaurar el contexto para %s"
+
+#: src/mkdir.c:231
 #, c-format
 msgid "created directory %s"
 msgstr "se ha creado el directorio %s"
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr ""
+"atención: no se tendrá en cuenta --context; necesita un núcleo con SELinux/"
+"SMACK activado"
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr "Modo de empleo: %s [OPCIÓN]... [NOMBRE]...\n"
@@ -6949,27 +7046,23 @@ msgstr "Modo de empleo: %s [OPCIÓN]... [NOMBRE]...\n"
 #
 # Supongo que te refieres al "named" del "named pipe".
 # Habrá que pensarlo bastante, me temo. sv
-#: src/mkfifo.c:52
-#, fuzzy
+#: src/mkfifo.c:54
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
-msgstr ""
-"Crea tuberías con nombre (FIFOs) con los NOMBREs dados.\n"
-"\n"
+msgstr "Crea tuberías con nombre (FIFOs) con los NOMBREs dados.\n"
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
 msgstr ""
 "  -m, --mode=MODO    establece los permisos a MODO, en lugar\n"
 "                     de  a=rw - umask\n"
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
-"  -Z, --context=CTX  establece el contexto de seguridad SELinux de cada "
-"NOMBRE\n"
-"                       a CTX\n"
 
 # Utilizo "inválido" en lugar de "no válido", porque la palabra existe,
 # y no usarla es empobrecer el idioma.
@@ -6977,37 +7070,33 @@ msgstr ""
 # Si a alguien le parece más natural "no válido", deberíamos discutir
 # esto al mismo tiempo que la "retroreferencia" de Iñaky.
 #
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, c-format
 msgid "invalid mode"
 msgstr "modo inválido"
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr "el modo solamente debe especificar los bits de permisos del fichero"
 
+#: src/mkfifo.c:174 src/mknod.c:269
+#, c-format
+msgid "cannot set permissions of %s"
+msgstr "no se pueden establecer los permisos de %s"
+
 # Nota: El que no sepa que major y minor es principal y secundario
 # es que no sabe inglés. Esto viene hasta en el Collins de bolsillo.
-#: src/mknod.c:52
+#: src/mknod.c:54
 #, c-format
 msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr "Modo de empleo: %s [OPCIÓN]... NOMBRE TIPO [PRINCIPAL SECUNDARIO]\n"
 
-#: src/mknod.c:54
-#, fuzzy
+#: src/mknod.c:56
 msgid "Create the special file NAME of the given TYPE.\n"
-msgstr ""
-"Crea el fichero especial NOMBRE del TIPO dado.\n"
-"\n"
+msgstr "Crea el fichero especial NOMBRE del TIPO dado.\n"
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr ""
-"  -Z, --context=CTX  establece el contexto de seguridad SELinux de NOMBRE a "
-"CTX\n"
-
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -7023,7 +7112,7 @@ msgstr ""
 "o 0X, se interpreta como hexadecimal; en caso contrario, si comienza con 0,\n"
 "como octal, en caso contrario, como decimal. TIPO puede ser:\n"
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 msgid ""
 "\n"
 "  b      create a block (buffered) special file\n"
@@ -7035,58 +7124,57 @@ msgstr ""
 "  c, u   crea un fichero especial de caracteres (unbuffered)\n"
 "  p      crea un `FIFO'\n"
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 msgid "Special files require major and minor device numbers."
 msgstr ""
 "Los ficheros especiales necesitan números de dispositivo principal y "
 "secundario."
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 msgid "Fifos do not have major and minor device numbers."
 msgstr "Los fifos no tienen números de dispositivo principal y secundario."
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, c-format
 msgid "block special files not supported"
 msgstr "los ficheros especiales de bloques no están soportados"
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, c-format
 msgid "character special files not supported"
 msgstr "los ficheros especiales de caracteres no están soportados"
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, c-format
 msgid "invalid major device number %s"
 msgstr "número principal de dispositivo inválido %s"
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, c-format
 msgid "invalid minor device number %s"
 msgstr "número secundario de dispositivo inválido %s"
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, c-format
 msgid "invalid device %s %s"
 msgstr "dispositivo inválido %s %s"
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, c-format
 msgid "invalid device type %s"
 msgstr "tipo de dispositivo inválido %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr "Eric Blake"
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr "Modo de empleo: %s [OPCIÓN]... [PLANTILLA]\n"
 
-#: src/mktemp.c:69
-#, fuzzy
+#: src/mktemp.c:67
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
 "TEMPLATE must contain at least 3 consecutive 'X's in last component.\n"
@@ -7098,14 +7186,14 @@ msgstr ""
 "componente.\n"
 "Si no se especifica PLANTILLA, utiliza tmp.XXXXXXXXXX e implica --tmpdir.\n"
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
 "los ficheros se crean con permisos u+rw, los directories con u+rwx,\n"
 "menos las restricciones de umask.\n"
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
@@ -7117,42 +7205,40 @@ msgstr ""
 "  -q, --quiet         elimina los mensajes sobre fallos de creación de\n"
 "                        ficheros/directorios\n"
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
-"      --suffix=SUF    añade SUF a PLANTILLA. SUF no debe contener la barra.\n"
+"      --suffix=SUF    añade SUF a PLANTILLA; SUF no debe contener la barra.\n"
 "                        Esta opción va implícita si TEMPLATE no termina en "
-"X.\n"
+"X\n"
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
-"  --tmpdir[=DIR]   interpreta PLANTILLA relativa a DIR.  Si no se "
+"  -p DIR --tmpdir[=DIR]  interpreta PLANTILLA relativa a DIR; si no se "
 "especifica\n"
 "                     DIR, utiliza $TMPDIR si existe, o si no /tmp.\n"
 "                     Con esta opción, PLANTILLA no debe ser un nombre "
-"absoluto.\n"
-"                     Al contrario que con -t, PLANTILLA puede contener "
+"absoluto;\n"
+"                     al contrario que con -t, PLANTILLA puede contener "
 "barras,\n"
-"                     pero mktemp solamente crea la última componente.\n"
+"                     pero mktemp solamente crea la última componente\n"
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
 msgstr ""
-"  -p DIR           utiliza DIR como prefijo, implica -t [obsoleto]\n"
 "  -t               interpreta PLANTILLA como una sola componente de nombre "
 "de\n"
 "                     fichero relativa a un directorio: $TMPDIR, si existe;\n"
@@ -7160,59 +7246,51 @@ msgstr ""
 "tmp\n"
 "                     (obsoleto)\n"
 
-#: src/mktemp.c:223
-#, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr "fallo al redireccionar la salida de error estándar a /dev/null"
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, c-format
 msgid "too many templates"
 msgstr "demasiadas plantillas"
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr "con --suffix, la plantilla %s debe terminar en X"
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr "sufijo inválido %s, contiene el separador de directorios"
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr "insuficiente número de X en la plantilla %s"
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr "plantilla inválida, %s, contiene separador de directorios"
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr "plantilla inválida, %s; con --tmpdir, no puede ser absoluta"
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, c-format
 msgid "failed to create directory via template %s"
 msgstr "fallo al crear el directorio a través de la plantilla %s"
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, c-format
 msgid "failed to create file via template %s"
 msgstr "fallo al crear el fichero a través de la plantilla %s"
 
-#: src/mv.c:292
-#, fuzzy
+#: src/mv.c:294
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
-msgstr ""
-"Renombra ORIGEN a DESTINO, o mueve ORIGEN(es) a DIRECTORIO.\n"
-"\n"
+msgstr "Renombra ORIGEN a DESTINO, o mueve ORIGEN(es) a DIRECTORIO.\n"
 
-#: src/mv.c:298
+#: src/mv.c:300
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
 "file\n"
@@ -7230,7 +7308,7 @@ msgstr ""
 "  -f, --force                  no pregunta nunca antes de sobreescribir\n"
 "  -i, --interactive            pide confirmación antes de sobreescribir\n"
 
-#: src/mv.c:307
+#: src/mv.c:309
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
@@ -7241,7 +7319,7 @@ msgstr ""
 "                                  argumento ORIGEN\n"
 "  -S, --suffix=SUFIJO           reemplaza el sufijo de respaldo habitual\n"
 
-#: src/mv.c:312
+#: src/mv.c:314
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
 "DIRECTORY\n"
@@ -7250,8 +7328,10 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
-"      --target-directory=DIRECTORIO  mueve todos los argumentos ORIGEN al\n"
+"  -t, --target-directory=DIRECTORIO  mueve todos los argumentos ORIGEN al\n"
 "                                       directorio DIRECTORIO\n"
 "  -T, --no-target-directory          trata DESTINO como fichero normal\n"
 "  -u, --update                       mueve solamente cuando el fichero "
@@ -7260,6 +7340,9 @@ msgstr ""
 "destino,\n"
 "                                       o cuando falta el fichero de destino\n"
 "  -v, --verbose                      da detalles de lo que va haciendo\n"
+"  -Z, --context                establece el contexto de seguridad SELinux "
+"del fichero\n"
+"                                 de destino al tipo predeterminado\n"
 
 #: src/nice.c:72
 #, c-format
@@ -7272,7 +7355,7 @@ msgstr "Modo de empleo: %s [OPCIÓN] [ORDEN [ARG]...]\n"
 # ajustado y exacto, se entienda mejor. gerardo
 # Vale. Me quedo con ejecución, pero dejo aquí la otra posibilidad. sv
 #: src/nice.c:73
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Run COMMAND with an adjusted niceness, which affects process scheduling.\n"
 "With no COMMAND, print the current niceness.  Niceness values range from\n"
@@ -7281,14 +7364,13 @@ msgstr ""
 "Ejecuta ORDEN con un valor ajustado de `nice', lo cual afecta a la prioridad "
 "de\n"
 "ejecución. Si no hay ORDEN, muestra el valor de `nice' actual. El rango de\n"
-"valores de `nice' abarca desde %d (prioridad más favorable) hasta %d\n"
-"(menos favorable).\n"
-"\n"
-"  -n, --adjustment=N   añade el entero N al valor `nice' (10 por omisión)\n"
+"valores de `nice' abarca desde %d (más favorable al proceso) hasta %d\n"
+"(menos favorable al proceso).\n"
 
 #: src/nice.c:82
 msgid "  -n, --adjustment=N   add integer N to the niceness (default 10)\n"
 msgstr ""
+"  -n, --adjustment=N   añade el entero N al valor `nice' (10 por omisión)\n"
 
 #: src/nice.c:172
 #, c-format
@@ -7320,14 +7402,12 @@ msgid "Scott Bartram"
 msgstr "Scott Bartram"
 
 #: src/nl.c:179
-#, fuzzy
 msgid ""
 "Write each FILE to standard output, with line numbers added.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
 "Escribe cada FICHERO en la salida estándar, con las líneas numeradas.\n"
-"Si no se especifica FICHERO o FICHERO es `-', lee la entrada estándar.\n"
-"\n"
+"Si no se especifica FICHERO o FICHERO es -, lee la entrada estándar.\n"
 
 #: src/nl.c:186
 msgid ""
@@ -7476,7 +7556,7 @@ msgstr ""
 "\n"
 
 #: src/nohup.c:65
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "If standard input is a terminal, redirect it from /dev/null.\n"
@@ -7487,10 +7567,10 @@ msgid ""
 msgstr ""
 "\n"
 "Si la entrada estándar es una terminal, la redirige desde /dev/null.\n"
-"Si la salida estándar es una terminal, añade la salida a `nohup.out' si\n"
-"es posible, o a `$HOME/nohup.out' en caso contrario.\n"
+"Si la salida estándar es una terminal, añade la salida a 'nohup.out' si\n"
+"es posible, o a '$HOME/nohup.out' en caso contrario.\n"
 "Si la salida de error estándar es una terminal, la redirige a la salida\n"
-"estándar. Para guardar la salida en FICHERO, utilice `%s ORDEN > FICHERO'.\n"
+"estándar. Para guardar la salida en FICHERO, utilice '%s ORDEN > FICHERO'.\n"
 
 #: src/nohup.c:127
 #, c-format
@@ -7567,119 +7647,132 @@ msgid "%s: invalid number to ignore"
 msgstr "%s: número que se descarta inválido"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
-msgstr ""
+msgstr "Assaf Gordon"
 
-#: src/numfmt.c:676
-#, fuzzy, c-format
-msgid "value too large to be converted: '%s'"
-msgstr "%s: valor no completamente convertido"
+#: src/numfmt.c:659
+#, c-format
+msgid "value too large to be converted: %s"
+msgstr "valor demasiado grande para ser convertido: %s"
 
-#: src/numfmt.c:680
-#, fuzzy, c-format
-msgid "invalid number: '%s'"
-msgstr "número inválido %s"
+#: src/numfmt.c:663
+#, c-format
+msgid "invalid number: %s"
+msgstr "número inválido: %s"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
-msgstr ""
+msgid "rejecting suffix in input: %s (consider using --from)"
+msgstr "se rechaza el sufijo en la entrada: %s (considere utilizar --from)"
 
-#: src/numfmt.c:688
-#, fuzzy, c-format
-msgid "invalid suffix in input: '%s'"
-msgstr "sufijo inválido en el argumento %s%s `%s'"
+#: src/numfmt.c:671
+#, c-format
+msgid "invalid suffix in input: %s"
+msgstr "sufijo inválido en la entrada: %s"
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
-msgstr ""
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
+msgstr "falta el sifijo 'i' en la entrada: %s (p. ej. Ki/Mi/Gi)"
 
-#: src/numfmt.c:723
-#, fuzzy, c-format
+#: src/numfmt.c:722 src/numfmt.c:768
+#, c-format
 msgid "failed to prepare value '%Lf' for printing"
-msgstr "%s: fallo al abrir para escritura"
+msgstr "fallo al preparar la impresión del valor '%Lf'"
 
-#: src/numfmt.c:787
-#, fuzzy, c-format
-msgid "invalid unit size: '%s'"
-msgstr "tamaño del `tab' inválido: %s"
-
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
+#: src/numfmt.c:791
 #, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr ""
+msgid "invalid unit size: %s"
+msgstr "tamaño de unidades inválido: %s"
 
-#: src/numfmt.c:813
-#, fuzzy, c-format
+#: src/numfmt.c:814
+#, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
-msgstr "Modo de empleo: %s [OPCIÓN]... [USUARIO]...\n"
+msgstr "Modo de empleo: %s [OPCIÓN]... [NÚMERO]...\n"
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
 msgstr ""
+"Reformatea NÚMERO(s), o los números de la entrada estándar si no se "
+"especifica ninguno.\n"
 
-#: src/numfmt.c:820
-#, fuzzy
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
-msgstr ""
-"      --strict         con --check, sale con estado de salida distinto de "
-"cero\n"
-"                         para cualquier entrada inválida\n"
+msgstr "      --debug          muestra avisos sobre entrada inválida\n"
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
+"  -d, --delimiter=X    utiliza X en lugar de espacio como delimitador de "
+"campos\n"
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
+"      --field N        reemplaza el número en el campo en entrada N (1 por "
+"omisión)\n"
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
 msgstr ""
+"      --format=FORMATO usa el formato de coma flotante de estilo printf "
+"FORMATO.\n"
+"                         Véase FORMATO debajo para detalles.\n"
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
 "                         see UNIT below\n"
 msgstr ""
+"      --from=UNIDAD    autoescala los números de entrada a UNIDADes. Por "
+"defecto\n"
+"                         es 'none'. Véase UNIDAD más abajo\n"
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr ""
+"      --from-unit=N    especifica el tamaño de la unidad de entrada\n"
+"                         (en lugar del valor predeterminado que es 1)\n"
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
 "                         (which means it has no effect in the C/POSIX "
 "locale)\n"
 msgstr ""
+"      --grouping       Usa el agrupamiento definido por el local p. ej. "
+"1.000.000\n"
+"                         (es decir, no tiene efectos en locales C/POSIX)\n"
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
 msgstr ""
+"     --header[=N]      muestra (sin convertir) las primeras N líneas de "
+"cabecera;\n"
+"                         N es 1 si no se especifica\n"
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
 msgstr ""
+"      --invalid=MODO   modo de fallo para los números inválidos: MODO puede\n"
+"                         ser: abort (predeterminado), fail, warn, ignore\n"
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -7688,44 +7781,59 @@ msgid ""
 "whitespace\n"
 "                         is found\n"
 msgstr ""
+"      --padding=N      rellena la salida hasta N caracteres; un N positivo\n"
+"                         alinea a la derecha. Un N negativo, a la "
+"izquierda;\n"
+"                         no se tiene en cuenta si la salida es más ancha que "
+"N;\n"
+"                         Por omisión se rellena automáticamente si se\n"
+"                         encuentran espacios\n"
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
 "nearest\n"
 msgstr ""
+"      --round=MÉTODO   el método de redondeo que se utiliza al escalar. "
+"MÉTODO\n"
+"                         puede ser: up, down, from-zero (predeterminado),\n"
+"                         towards-zero, nearest\n"
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
 msgstr ""
+"      --suffix=SUFIJO  añade SUFIJO a los números de salida, y acepta "
+"SUFIJO\n"
+"                         opcional en los números de entrada\n"
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
+"      --to=UNIDAD      autoescala los números de salida a UNIDADes;\n"
+"                         véase UNIDAD más abajo\n"
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
-msgstr ""
+msgstr "      --to-unit=N      tamaño de la unidad de salida (en lugar de 1)\n"
 
-#: src/numfmt.c:877
-#, fuzzy
+#: src/numfmt.c:878
 msgid ""
 "\n"
 "UNIT options:\n"
 msgstr ""
-"Otras opciones:\n"
 "\n"
+"opciones de UNIDAD:\n"
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
-msgstr ""
+msgstr "  none       no se autoescala; los sufijos provocan un error\n"
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -7733,43 +7841,67 @@ msgid ""
 "               1M = 1000000,\n"
 "               1Mi = 1048576,\n"
 msgstr ""
+"  auto       acepta sufijos opcionales de una o dos letras:\n"
+"               1K  = 1000,\n"
+"               1Ki = 1024,\n"
+"               1M  = 1000000,\n"
+"               1Mi = 1048576,\n"
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
 "               1M = 1000000,\n"
 "               ...\n"
 msgstr ""
+"  si         acepta sufijos opcionales de una letra:\n"
+"               1K = 1000,\n"
+"               1M = 1000000,\n"
+"               ...\n"
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
 "               1M = 1048576,\n"
 "               ...\n"
 msgstr ""
+"  iec        acepta sufijos opcionales de una letra:\n"
+"               1K = 1024,\n"
+"               1M = 1048576,\n"
+"               ...\n"
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
 "               1Mi = 1048576,\n"
 "               ...\n"
 msgstr ""
+"  iec-i      acepta sufijos opcionales de dos letras:\n"
+"               1Ki = 1024,\n"
+"               1Mi = 1048576,\n"
+"               ...\n"
 
-#: src/numfmt.c:905
-#, c-format
+#: src/numfmt.c:906
+#, fuzzy, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
+"\n"
+"FORMATO debe ser apropiado para imprimir un argumento de coma flotante "
+"'%f'.\n"
+"La coma opcional (%'f) activará --grouping (si está soportado por el "
+"local).\n"
+"Un valor de ancho opcional (%10f) rellenará la salida. Los valores de\n"
+"ancho negativo (%-10f) rellenarán la salida por la izquierda.\n"
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -7780,8 +7912,17 @@ msgid ""
 "diagnosed, but the exit status is 0.  With --invalid='ignore' conversion\n"
 "errors are not diagnosed and the exit status is 0.\n"
 msgstr ""
+"\n"
+"El estado de salida es 0 si todos los números de entrada fueron convertidos\n"
+"con éxito. Por defecto, %s se detendrá en el primer error de conversión\n"
+"con estado de salida 2. Con --invalid='fail' se muestra un aviso por cada\n"
+"error de conversión, y el estado de salida es 2. Con --invalid='warn' se\n"
+"muestra cada error de conversión, pero el estado de salida es 0.\n"
+"Con --invalid='ignore' los errores de conversión no se muestran\n"
+"y el estado de salida es 0.\n"
 
-#: src/numfmt.c:921
+# FIXME: Habrá que ver si eso eso es así con el local es_ES o similar
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -7801,113 +7942,134 @@ msgid ""
 "  $ ls -lh | %s --header --field 5 --from=iec --padding=10\n"
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 msgstr ""
+"\n"
+"Ejemplos:\n"
+"  $ %s --to=si 1000\n"
+"            -> \"1.0K\"\n"
+"  $ %s --to=iec 2048\n"
+"           -> \"2.0K\"\n"
+"  $ %s --to=iec-i 4096\n"
+"           -> \"4.0Ki\"\n"
+"  $ echo 1K | %s --from=si\n"
+"           -> \"1000\"\n"
+"  $ echo 1K | %s --from=iec\n"
+"           -> \"1024\"\n"
+"  $ df | %s --header --field 2 --to=si\n"
+"  $ ls -l | %s --header --field 5 --to=iec\n"
+"  $ ls -lh | %s --header --field 5 --from=iec --padding=10\n"
+"  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, c-format
 msgid "format %s has no %% directive"
 msgstr "el formato %s no tiene ninguna directiva %%"
 
-#: src/numfmt.c:990
-#, fuzzy, c-format
+#: src/numfmt.c:1003
+#, c-format
 msgid "invalid format %s (width overflow)"
-msgstr "formato de ancho inválido"
+msgstr "formato inválido %s (desbordamiento en el ancho)"
+
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr ""
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr "el formato %s termina en %%"
 
-#: src/numfmt.c:1010
-#, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
-msgstr ""
+#: src/numfmt.c:1030
+#, fuzzy, c-format
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
+msgstr "formato inválido %s, la directiva debe ser %%['][-][N]f"
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr "el formato %s tiene demasiadas directivas %%"
 
-#: src/numfmt.c:1070
-#, fuzzy, c-format
-msgid "invalid suffix in input '%s': '%s'"
-msgstr "sufijo inválido en el argumento %s%s `%s'"
+#: src/numfmt.c:1081
+#, c-format
+msgid "invalid suffix in input %s: %s"
+msgstr "sufijo inválido en la entrada %s: %s"
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
 msgstr ""
+"valor demasiado grande para ser mostrado: '%Lg' (considere utilizar --to)"
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
 msgstr ""
+"valor demasiado grande para ser mostrado: '%Lg' (no se pueden manejar "
+"valores > 999Y)"
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
-msgstr ""
+msgid "large input value %s: possible precision loss"
+msgstr "valor de entrada grande %s: posible pérdida de precisión"
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
+"la línea de entrada es demasiado corta, no se encontraron números para "
+"convertir en el campo %ld"
 
-#: src/numfmt.c:1388
-#, fuzzy, c-format
-msgid "invalid padding value '%s'"
-msgstr "rango de páginas inválido %s"
+#: src/numfmt.c:1403
+#, c-format
+msgid "invalid padding value %s"
+msgstr "valor de relleno inválido %s"
 
-#: src/numfmt.c:1401
-#, fuzzy, c-format
-msgid "invalid field value '%s'"
-msgstr "número de campo inválido: `%s'"
+#: src/numfmt.c:1417
+#, c-format
+msgid "invalid field value %s"
+msgstr "valor de campo inválido: %s"
 
-#: src/numfmt.c:1430
-#, fuzzy, c-format
-msgid "invalid header value '%s'"
-msgstr "fecha inválida %s"
+#: src/numfmt.c:1447
+#, c-format
+msgid "invalid header value %s"
+msgstr "valor de cabecera inválido %s"
 
-#: src/numfmt.c:1456
-#, fuzzy, c-format
+#: src/numfmt.c:1473
+#, c-format
 msgid "--grouping cannot be combined with --format"
-msgstr "los ficheros operando no se pueden combinar con --files0-from."
+msgstr "..grouping no se puede combinar con --format"
 
-#: src/numfmt.c:1458
-#, fuzzy, c-format
-msgid "--padding cannot be combined with --format"
-msgstr "los ficheros operando no se pueden combinar con --files0-from."
-
-#: src/numfmt.c:1463
-#, fuzzy, c-format
+#: src/numfmt.c:1478
+#, c-format
 msgid "no conversion option specified"
-msgstr "se han especificado varias opciones -i"
+msgstr "no se ha especificado ninguna opción de conversión"
 
-#: src/numfmt.c:1471
-#, fuzzy, c-format
+#: src/numfmt.c:1486
+#, c-format
 msgid "grouping cannot be combined with --to"
-msgstr "los ficheros operando no se pueden combinar con --files0-from."
+msgstr "grouping no se puede combinar con --to"
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
-msgstr ""
+msgstr "grouping no tiene ningún efecto en este local"
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
-msgstr ""
+msgstr "no se tiene en cuenta --header con la entrada de la línea de órdenes"
 
-#: src/numfmt.c:1511
-#, fuzzy, c-format
+#: src/numfmt.c:1526
+#, c-format
 msgid "error reading input"
-msgstr "error al leer %s"
+msgstr "error al leer la entrada"
 
-#: src/numfmt.c:1520
-#, fuzzy, c-format
+#: src/numfmt.c:1535
+#, c-format
 msgid "failed to convert some of the input numbers"
-msgstr "fallo al establecer la salida estándar como no utilizable"
+msgstr "fallo al convertir alguno de los números de entrada"
 
-#: src/od.c:294
+#: src/od.c:320
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -7923,7 +8085,7 @@ msgstr ""
 
 # Creo que si pones `-' en vez de -, deberías consultarlo primero con
 # el autor. Además, no lo has cambiado en todas partes. sv+
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -7934,12 +8096,11 @@ msgid ""
 msgstr ""
 "\n"
 "Escribe una representación inequívoca, por defecto en base ocho, de FICHERO\n"
-"en la salida estándar. Si no se especifica FICHERO o FICHERO es `-', lee la\n"
+"en la salida estándar. Si no se especifica FICHERO o FICHERO es -, lee la\n"
 "entrada estándar.\n"
 "\n"
 
-#: src/od.c:307
-#, fuzzy
+#: src/od.c:333
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
 "if the last operand begins with + or (if there are 2 operands) a digit.\n"
@@ -7948,73 +8109,79 @@ msgid ""
 "For OFFSET and LABEL, a 0x or 0X prefix indicates hexadecimal;\n"
 "suffixes may be . for octal and b for multiply by 512.\n"
 msgstr ""
-"\n"
 "Si son aplicables tanto el primero como el segundo formato de llamada,\n"
 "se supone el segundo si el último operando comienza con + o (si hay\n"
 "dos operandos) un dígito.  Un operando DESPLAZAMIENTO significa\n"
 "-j DESPLAZAMIENTO. ETIQUETA es la pseudodirección del primer byte\n"
 "mostrado, que se incrementa a la vez que se va procesando el\n"
 "volcado. Para DESPLAZAMIENTO y ETIQUETA, el prefijo 0x ó 0X indica\n"
-"hexadecimal, los sufijos pueden ser `.' para octal y `b' para bloques\n"
+"hexadecimal, los sufijos pueden ser . para octal y b para bloques\n"
 "de 512 bytes.\n"
 
-#: src/od.c:318
+#: src/od.c:344
 #, fuzzy
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
-"  -A, --address-radix=BASE    indica cómo se han de mostrar las posiciones\n"
-"                              del fichero\n"
+"  -A, --address-radix=BASE    formato de salida para las posiciones de "
+"fichero;\n"
+"                                BASE es uno de [doxn], para decimal, octal,\n"
+"                                hexadecimal o ninguno\n"
 "  -j, --skip-bytes=BYTES      descarta los primeros BYTES bytes de cada "
 "fichero\n"
 
-#: src/od.c:323
-#, fuzzy
+#: src/od.c:350
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
 "  -N, --read-bytes=BYTES      restringe la salida a BYTES bytes\n"
-"  -s, --strings[=BYTES]       muestra cadenas de caracteres de al menos "
+"  -S BYTES, --strings[=BYTES] muestra cadenas de caracteres de al menos "
 "BYTES\n"
-"                              caracteres gráficos\n"
+"                                caracteres gráficos; si no se especifica "
+"BYTES,\n"
+"                                el valor predeterminado es 3\n"
 "  -t, --format=TIPO           selecciona el formato o formatos de salida\n"
 "  -v, --output-duplicates     no usa * para indicar líneas suprimidas\n"
-"  -w, --width[=BYTES]         muestra BYTES bytes por línea de salida\n"
+"  -w[BYTES], --width[=BYTES]  muestra BYTES bytes por línea de salida;\n"
+"                                si no se especifica BYTES, el valor\n"
+"                                predeterminado es 32\n"
 "      --traditional           acepta los argumentos en formato tradicional\n"
 
-#: src/od.c:336
-#, fuzzy
+#: src/od.c:363
 msgid ""
 "\n"
 "\n"
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 "\n"
+"\n"
 "Las especificaciones de formato tradicionales pueden estar mezcladas y\n"
 "se acumulan:\n"
 "  -a   lo mismo que -t a,  selecciona los caracteres nombrados, descartando\n"
 "         el bit más significativo\n"
 "  -b   lo mismo que -t o1, selecciona bytes en base octal\n"
-"  -c   lo mismo que -t c,  selecciona caracteres ASCII o secuencias de "
+"  -c   lo mismo que -t c,  selecciona caracteres imprimibles o secuencias de "
 "escape\n"
 "  -d   lo mismo que -t u2, selecciona unidades decimales de 2 bytes sin "
 "signo\n"
 
-#: src/od.c:345
+#: src/od.c:372
 msgid ""
 "  -f   same as -t fF, select floats\n"
 "  -i   same as -t dI, select decimal ints\n"
@@ -8030,22 +8197,21 @@ msgstr ""
 "  -s   lo mismo que -t d2, selecciona unidades decimales de 2 bytes\n"
 "  -x   lo mismo que -t x2, selecciona unidades hexadecimales de 2 bytes\n"
 
-#: src/od.c:353
-#, fuzzy
+#: src/od.c:380
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 "\n"
-"TIPO se construye con una o más de las siguientes especificaciones:\n"
 "\n"
+"TIPO se construye con una o más de las siguientes especificaciones:\n"
 "  a          un determinado carácter, descartando el bit más significativo\n"
-"  c          carácter ASCII o secuencia de escape\n"
+"  c          carácter imprimible o secuencia de escape\n"
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -8059,8 +8225,7 @@ msgstr ""
 "  u[TAMAÑO]  decimal sin signo, TAMAÑO bytes por cada entero\n"
 "  x[TAMAÑO]  hexadecimal, TAMAÑO bytes por cada entero\n"
 
-#: src/od.c:367
-#, fuzzy
+#: src/od.c:394
 msgid ""
 "\n"
 "SIZE is a number.  For TYPE in [doux], SIZE may also be C for\n"
@@ -8069,22 +8234,24 @@ msgid ""
 "for sizeof(double) or L for sizeof(long double).\n"
 msgstr ""
 "\n"
-"TAMAÑO es un número. Para los TIPOs d, o, u ó x, TAMAÑO puede ser también:\n"
+"TAMAÑO es un número. Para los TIPOs en [doux], TAMAÑO puede ser también:\n"
 "C para `sizeof(char)', S para `sizeof(short)', I para `sizeof(int)' ó L "
 "para\n"
-"`sizeof(long)'. Si TIPO es f, TAMAÑO puede ser también F para `sizeof"
-"(float)',\n"
+"`sizeof(long)'. Si TIPO es f, TAMAÑO puede ser también F para "
+"`sizeof(float)',\n"
 " D para `sizeof(double)' ó L para `sizeof(long double)'.\n"
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
 "each output line.\n"
 msgstr ""
+"\n"
+"Si se añade el sufijo z a cualquier tipo, se añade un visor de caracteres\n"
+"imprimibles al final de cada línea del resultado.\n"
 
-#: src/od.c:379
-#, fuzzy
+#: src/od.c:406
 msgid ""
 "\n"
 "\n"
@@ -8097,17 +8264,21 @@ msgid ""
 "and so on for G, T, P, E, Z, Y.\n"
 msgstr ""
 "\n"
-"K puede tener un sufijo multilplicativo:\n"
-"b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
-"GB 1000*1000*1000, G 1024*1024*1024, y así sucesivamente para T, P, E, Z, "
-"Y.\n"
+"BYTES es hexadecimal con prefijo 0x ó 0X, y puede tener un sufijo\n"
+"multilplicativo:\n"
+"  b   512\n"
+"  kB  1000\n"
+"  K   1024\n"
+"  MB  1000*1000\n"
+"  M   1024*1024\n"
+"y así sucesivamente para G, T, P, E, Z, Y.\n"
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, c-format
 msgid "invalid type string %s"
 msgstr "tipo de cadena inválido %s"
 
-#: src/od.c:649
+#: src/od.c:690
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -8116,7 +8287,7 @@ msgstr ""
 "tipo de cadena inválido %s;\n"
 "este sistema no posee el tipo de entero de %lu bytes"
 
-#: src/od.c:770
+#: src/od.c:811
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -8125,12 +8296,12 @@ msgstr ""
 "tipo de cadena inválido %s;\n"
 "este sistema no dispone de un tipo de coma flotante de %lu bytes"
 
-#: src/od.c:828
-#, fuzzy, c-format
+#: src/od.c:869
+#, c-format
 msgid "invalid character '%c' in type string %s"
-msgstr "carácter inválido `%c' en la cadena de tipo %s"
+msgstr "carácter inválido '%c' en la cadena de tipo %s"
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr ""
@@ -8138,27 +8309,27 @@ msgstr ""
 
 # `set' -> [set] ... no deberíamos cambiar la terminología original, so pena
 # de hacernos la picha un lío ... (opino, vamos :) ipg
-#: src/od.c:1609
-#, fuzzy, c-format
+#: src/od.c:1650
+#, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr ""
-"la base de la dirección de salida no es válida `%c'; debe ser uno de [doxn]"
+"la base de la dirección de salida no es válida '%c'; debe ser uno de [doxn]"
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr "no se puede especificar tipo cuando se vuelcan cadenas"
 
-#: src/od.c:1810
+#: src/od.c:1863
 msgid "compatibility mode supports at most one file"
 msgstr "el modo de compatibilidad admite un fichero como mucho"
 
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr "skip-bytes + read-bytes es demasiado grande"
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr "atención: ancho %lu inválido; se usará %d en su lugar"
@@ -8174,7 +8345,6 @@ msgid "standard input is closed"
 msgstr "la entrada estándar está cerrada"
 
 #: src/paste.c:439
-#, fuzzy
 msgid ""
 "Write lines consisting of the sequentially corresponding lines from\n"
 "each FILE, separated by TABs, to standard output.\n"
@@ -8182,8 +8352,7 @@ msgid ""
 msgstr ""
 "Escribe secuencialmente en la salida estándar cada línea de los FICHEROs\n"
 "especificados, separadas por tabuladores.\n"
-"Si no se especifica FICHERO o FICHERO es `-', lee la entrada estándar.\n"
-"\n"
+"Si no se especifica FICHERO o FICHERO es -, lee la entrada estándar.\n"
 
 #: src/paste.c:447
 msgid ""
@@ -8218,9 +8387,9 @@ msgstr ""
 "                        (equivalente a -p -P)\n"
 
 #: src/pathchk.c:170
-#, fuzzy, c-format
+#, c-format
 msgid "leading '-' in a component of file name %s"
-msgstr "`-' inicial en un componente del nombre de fichero %s"
+msgstr "'-' inicial en un componente del nombre de fichero %s"
 
 #: src/pathchk.c:196
 #, c-format
@@ -8330,12 +8499,12 @@ msgstr "Cuándo"
 msgid "Where"
 msgstr "Dónde"
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr "Modo de empleo: %s [OPCIÓN]... [USUARIO]...\n"
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -8353,7 +8522,7 @@ msgstr ""
 "  -p              omite el fichero plan del usuario en formato largo\n"
 "  -s              usa el formato corto (este es el predeterminado)\n"
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -8368,18 +8537,18 @@ msgstr ""
 "  -q              omite el nombre completo del usuario, el `host' remoto\n"
 "                  y el tiempo inactivo en formato corto\n"
 
-#: src/pinky.c:511
-#, fuzzy, c-format
+#: src/pinky.c:513
+#, c-format
 msgid ""
 "\n"
 "A lightweight 'finger' program;  print user information.\n"
 "The utmp file will be %s.\n"
 msgstr ""
 "\n"
-"Un programa `finger' sencillo; muestra información del usuario.\n"
+"Un programa 'finger' sencillo; muestra información del usuario.\n"
 "El fichero utmp será %s.\n"
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr ""
@@ -8397,9 +8566,9 @@ msgid "Roland Huebner"
 msgstr "Roland Huebner"
 
 #: src/pr.c:908
-#, fuzzy, c-format
+#, c-format
 msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument"
-msgstr "`--pages=PRIMERA_P�GINA[:ÚLTIMA_P�GINA]' falta un argumento"
+msgstr "'--pages=PRIMERA_P�GINA[:ÚLTIMA_P�GINA]' falta un argumento"
 
 #: src/pr.c:910
 #, c-format
@@ -8407,29 +8576,29 @@ msgid "invalid page range %s"
 msgstr "rango de páginas inválido %s"
 
 #: src/pr.c:975
-#, fuzzy, c-format
+#, c-format
 msgid "'-l PAGE_LENGTH' invalid number of lines: %s"
-msgstr "`-l LONGITUD_P�GINA' el número de líneas no es válido: %s"
+msgstr "'-l LONGITUD_P�GINA' el número de líneas no es válido: %s"
 
 #: src/pr.c:999
-#, fuzzy, c-format
+#, c-format
 msgid "'-N NUMBER' invalid starting line number: %s"
-msgstr "`-N NÚMERO' número de comienzo de línea inválido: %s"
+msgstr "'-N NÚMERO' número de comienzo de línea inválido: %s"
 
 #: src/pr.c:1011
-#, fuzzy, c-format
+#, c-format
 msgid "'-o MARGIN' invalid line offset: %s"
-msgstr "`-o MARGEN' el desplazamiento de línea no es válido: %s"
+msgstr "'-o MARGEN' el desplazamiento de línea no es válido: %s"
 
 #: src/pr.c:1052
-#, fuzzy, c-format
+#, c-format
 msgid "'-w PAGE_WIDTH' invalid number of characters: %s"
-msgstr "`-w ANCHO_P�GINA' número inválido de caracteres: %s"
+msgstr "'-w ANCHO_P�GINA' número inválido de caracteres: %s"
 
 #: src/pr.c:1066
-#, fuzzy, c-format
+#, c-format
 msgid "'-W PAGE_WIDTH' invalid number of characters: %s"
-msgstr "`-W ANCHO_P�GINA' número de caracteres inválido: %s"
+msgstr "'-W ANCHO_P�GINA' número de caracteres inválido: %s"
 
 #: src/pr.c:1096
 #, c-format
@@ -8444,9 +8613,9 @@ msgstr ""
 "no se puede especificar a la vez impresión en paralelo y transversalmente."
 
 #: src/pr.c:1196
-#, fuzzy, c-format
+#, c-format
 msgid "'-%c' extra characters or invalid number in the argument: %s"
-msgstr "`-%c' sobran caracteres, o número inválido en el argumento: %s"
+msgstr "'-%c' sobran caracteres, o número inválido en el argumento: %s"
 
 #: src/pr.c:1293
 #, c-format
@@ -8471,11 +8640,8 @@ msgid "Page %<PRIuMAX>"
 msgstr "Página %<PRIuMAX>"
 
 #: src/pr.c:2757
-#, fuzzy
 msgid "Paginate or columnate FILE(s) for printing.\n"
-msgstr ""
-"Pagina o encolumna FICHERO(s) para su impresión.\n"
-"\n"
+msgstr "Pagina o encolumna FICHERO(s) para su impresión.\n"
 
 #: src/pr.c:2763
 msgid ""
@@ -8487,8 +8653,8 @@ msgid ""
 "                    columns on each page\n"
 msgstr ""
 "  +PRIMERA_PAGINA[:ÚLTIMA_PAGINA], --pages=PRIMERA_PAGINA[:ÚLTIMA_PAGINA]\n"
-"                    comienza [termina] a imprimir por PRIMERA_[ÚLTIMA_]"
-"P�GINA\n"
+"                    comienza [termina] a imprimir por "
+"PRIMERA_[ÚLTIMA_]P�GINA\n"
 "  -COLUMNAS, --columns=COLUMNAS\n"
 "                    muestra una salida en COLUMNAS columnas e imprime las\n"
 "                    columnas, a menos que se especifique -a. Equilibra el\n"
@@ -8557,8 +8723,8 @@ msgstr ""
 "CAR�CTER)\n"
 "                    de ancho ANCHO (8)\n"
 "  -J, --join-lines  mezcla líneas completas, desactiva el truncamiento de\n"
-"                    líneas -W, no alinea las columnas, --sep-string"
-"[=CADENA]\n"
+"                    líneas -W, no alinea las columnas, --sep-"
+"string[=CADENA]\n"
 "                    establece los separadores\n"
 
 #: src/pr.c:2798
@@ -8612,11 +8778,13 @@ msgstr ""
 "                    omite el aviso cuando no se puede abrir un fichero\n"
 
 #: src/pr.c:2820
+#, fuzzy
 msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
@@ -8627,8 +8795,7 @@ msgstr ""
 "                    truncamiento de líneas de las 3 opciones de columnas\n"
 "                    (-COLUMN|-a -COLUMN|-m) excepto si se usa -w.\n"
 
-#: src/pr.c:2827
-#, fuzzy
+#: src/pr.c:2828
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
 "                    separate columns by STRING,\n"
@@ -8637,14 +8804,14 @@ msgid ""
 "options\n"
 "  -t, --omit-header  omit page headers and trailers\n"
 msgstr ""
-"  -SCADENA, --sep-string[=CADENA]\n"
+"  -S[CADENA], --sep-string[=CADENA]\n"
 "                    separa las columnas mediante CADENA,\n"
 "                    sin -S: El separador predeterminado es <TAB> con -J\n"
 "                    y <espacio> en caso contrario (lo mismo que -S\" \"), \n"
 "                    no hay ningún efecto en las opciones de columnas\n"
 "  -t, --omit-header no muestra cabeceras ni colas\n"
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 msgid ""
 "  -T, --omit-pagination\n"
 "                    omit page headers and trailers, eliminate any "
@@ -8669,7 +8836,7 @@ msgstr ""
 "varias\n"
 "                    columnas, -s[car] lo desactiva (72)\n"
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
 "                    set page width to PAGE_WIDTH (72) characters always,\n"
@@ -8684,7 +8851,7 @@ msgstr ""
 "                    se usa la opción -J, no interfiere con las opciones -S o "
 "-s\n"
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 msgid ""
 "\n"
 "-t is implied if PAGE_LENGTH <= 10.  With no FILE, or when FILE is -, read\n"
@@ -8709,7 +8876,8 @@ msgstr ""
 "todas ellas.\n"
 
 #: src/printenv.c:69
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+#, fuzzy
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr ""
 "  -0, --null     termina cada línea por un byte 0 en vez de nueva línea\n"
 
@@ -8766,7 +8934,6 @@ msgstr ""
 "dígitos)\n"
 
 #: src/printf.c:123
-#, fuzzy
 msgid ""
 "  %%      a single %\n"
 "  %b      ARGUMENT as a string with '\\' escapes interpreted,\n"
@@ -8776,7 +8943,7 @@ msgid ""
 "ARGUMENTs converted to proper type first.  Variable widths are handled.\n"
 msgstr ""
 "  %%      un sólo %\n"
-"  %b      ARGUMENTO como una cadena con secuencias de escape `\\' "
+"  %b      ARGUMENTO como una cadena con secuencias de escape '\\' "
 "interpretadas,\n"
 "            excepto que los escapes octales son de la forma \\0 o \\0NNN\n"
 "\n"
@@ -8834,12 +9001,12 @@ msgstr "atención: se descartan los argumentos que sobran, comenzando por %s"
 msgid "F. Pinard"
 msgstr "François Pinard"
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, c-format
 msgid "%s (for regexp %s)"
 msgstr "%s (para la expresión regular %s)"
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
@@ -8848,8 +9015,7 @@ msgstr ""
 "Modo de empleo: %s [OPCIÓN]... [ENTRADA]...   (sin -G)\n"
 "       o bien:  %s -G [OPCIÓN]... [ENTRADA [SALIDA]]\n"
 
-#: src/ptx.c:1821
-#, fuzzy
+#: src/ptx.c:1824
 msgid ""
 "Output a permuted index, including context, of the words in the input "
 "files.\n"
@@ -8929,8 +9095,7 @@ msgstr ""
 # quiso indicar eso dando más información de la que tú das
 # en la traducción. sv
 # Emoción, intriga, dolor de barriga :) ipg
-#: src/ptx.c:1827
-#, fuzzy
+#: src/ptx.c:1830
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
 "  -G, --traditional              behave more like System V 'ptx'\n"
@@ -8938,12 +9103,11 @@ msgid ""
 msgstr ""
 "  -A, --auto-reference           muestra automáticamente las referencias\n"
 "                                 generadas\n"
-"  -G, --traditional              se comporta como el `ptx' de System V\n"
+"  -G, --traditional              se comporta como el 'ptx' de System V\n"
 "  -F, --flag-truncation=CADENA   usa CADENA para marcar las líneas "
 "truncadas\n"
 
-#: src/ptx.c:1832
-#, fuzzy
+#: src/ptx.c:1835
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
 "  -O, --format=roff              generate output as roff directives\n"
@@ -8952,7 +9116,7 @@ msgid ""
 "  -T, --format=tex               generate output as TeX directives\n"
 msgstr ""
 "  -M, --macro-name=CADENA        usa CADENA como nombre de macro en lugar\n"
-"                                 de `xx'\n"
+"                                 de 'xx'\n"
 "  -O, --format=roff              genera el resultado con directivas roff\n"
 "  -R, --right-side-refs          pone las referencias a la derecha,\n"
 "                                 sin contarlas en -w\n"
@@ -8963,7 +9127,7 @@ msgstr ""
 # Pues gap suele ser una especie de desplazamiento o desajuste,
 # lo traduciría aquí como separación em+
 # Gracias. ipg
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -8985,7 +9149,7 @@ msgstr ""
 "  -o, --only-file=ARCHIVO        lee la lista de palabras a mantener de\n"
 "                                 ARCHIVO\n"
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -8998,17 +9162,16 @@ msgstr ""
 "  -w, --width=NÚMERO             anchura de la salida en columnas,\n"
 "                                 excluyendo referencias\n"
 
-#: src/ptx.c:1854
-#, fuzzy
+#: src/ptx.c:1857
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
 "\n"
-"Si no se especifica ARCHIVO o ARCHIVO es `-', lee de la entrada estándar.\n"
-"Se toma `-F /' por defecto.\n"
+"Sin FICHERO, o cuando FICHERO es -, lee la entrada estándar. Por omisión es "
+"'-F /'.\n"
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, c-format
 msgid "invalid gap width: %s"
 msgstr "ancho de salto inválido: %s"
@@ -9030,24 +9193,30 @@ msgstr ""
 "                    simbólicos\n"
 "  -P, --physical  evita todos los enlaces simbólicos\n"
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+
+#: src/pwd.c:169
 #, c-format
 msgid "failed to chdir to %s"
 msgstr "fallo al cambiar a %s"
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, c-format
 msgid "failed to stat %s"
 msgstr "fallo al efectuar stat sobre %s"
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr ""
 "no se pudo encontrar la entrada de directorio en %s que corresponda con el "
 "nodo-i"
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, c-format
 msgid "ignoring non-option arguments"
 msgstr "los argumentos que no son opciones no serán tenidos en cuenta"
@@ -9057,8 +9226,8 @@ msgstr "los argumentos que no son opciones no serán tenidos en cuenta"
 msgid "Dmitry V. Levin"
 msgstr "Dmitry V. Levin"
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Modo de empleo: %s [OPCIÓN]... FICHERO...\n"
@@ -9107,22 +9276,23 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 "  -m, --canonicalize-missing    canonicaliza siguiendo recursivamente cada\n"
 "                                  enlace simbólico en cada componente de la\n"
 "                                  ruta dada; sin requerir la existencia de\n"
 "                                  cada componente\n"
-"  -n, --no-newline              no muestra el carácter final de nueva línea\n"
+"  -n, --no-newline              no muestra el delimitador final\n"
 "  -q, --quiet,\n"
 "  -s, --silent                  suprime la mayor parte de mensajes de error\n"
 "  -v, --verbose                 muestra los mensajes de error\n"
+"  -z, --zero                    separate la salida con NUL en vez de nueva "
+"línea\n"
 
 #: src/readlink.c:152
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring --no-newline with multiple arguments"
-msgstr "los argumentos que no son opciones no serán tenidos en cuenta"
+msgstr "no se tendrá en cuenta --no-newline con varios argumentos"
 
 #: src/realpath.c:72
 msgid ""
@@ -9130,8 +9300,12 @@ msgid ""
 "all but the last component must exist\n"
 "\n"
 msgstr ""
+"Muestra el nombre de fichero absoluto resultante;\n"
+"todas las componentes menos la última deben existir\n"
+"\n"
 
 #: src/realpath.c:77
+#, fuzzy
 msgid ""
 "  -e, --canonicalize-existing  all components of the path must exist\n"
 "  -m, --canonicalize-missing   no components of the path need exist\n"
@@ -9141,13 +9315,29 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
+"  -e, --canonicalize-existing  todas las componentes de la ruta deben "
+"existir\n"
+"  -m, --canonicalize-missing   ninguna componente de la ruta debe existir\n"
+"  -L, --logical                traduce componentes '..' antes de los "
+"enlaces\n"
+"                                 simbólicos\n"
+"  -P, --physical               traduce los enlaces simbólicos tal y como se\n"
+"                                 encuentran (predeterminado)\n"
+"  -q, --quiet                  suprime la mayoría de mensajes de error\n"
+"      --relative-to=FICHERO    muestra la ruta relativa a FICHERO\n"
+"      --relative-base=FICHERO  muestra rutas absolutas a menos que estén "
+"por\n"
+"                                 debajo de FICHERO\n"
+"  -s, --strip, --no-symlinks   no expande los enlaces simbólicos\n"
+"  -z, --zero                   separa la salida con NULs en vez de con\n"
+"                                 caracteres de nueva línea\n"
 
 #: src/relpath.c:130
 msgid "generating relative path"
-msgstr ""
+msgstr "generando una ruta relativa"
 
 # SIoNO
 #: src/remove.c:273
@@ -9162,11 +9352,12 @@ msgid "%s: descend into directory %s? "
 msgstr "%s: ¿descender al directorio %s? (s/n) "
 
 # SIoNO
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr "%s: ¿borrar el %s %s  protegido contra escritura? (s/n) "
@@ -9176,33 +9367,34 @@ msgstr "%s: ¿borrar el %s %s  protegido contra escritura? (s/n) "
 # ¿y el primero?
 #
 # SIoNO
-#: src/remove.c:291
+#: src/remove.c:292
 #, c-format
 msgid "%s: remove %s %s? "
 msgstr "%s: ¿borrar el %s %s? (s/n) "
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, c-format
 msgid "removed directory: %s\n"
 msgstr "directorio borrado: %s\n"
 
-#: src/remove.c:444
+# FIXME: Sin un ejemplo nunca sabré si el primer %s está bien situado.
+#: src/remove.c:447
 #, c-format
-msgid "cannot remove directory: %s"
-msgstr "no se puede borrar el directorio: %s"
+msgid "refusing to remove %s or %s directory: skipping %s"
+msgstr "se rechaza borrar el directorio %s o %s: se salta %s"
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr "se salta %s, dado que está en un sistema de ficheros distinto"
 
 # Un ejemplito, por caridad
-#: src/remove.c:520
+#: src/remove.c:525
 #, c-format
 msgid "traversal failed: %s"
 msgstr "fallo al atravesar: %s"
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -9212,12 +9404,11 @@ msgstr ""
 "por favor comuníqueselo a %s"
 
 #: src/rm.c:119
-#, fuzzy, c-format
+#, c-format
 msgid "Try '%s ./%s' to remove the file %s.\n"
-msgstr "Pruebe `%s ./%s' para borrar el fichero %s.\n"
+msgstr "Pruebe '%s ./%s' para borrar el fichero %s.\n"
 
 #: src/rm.c:136
-#, fuzzy
 msgid ""
 "Remove (unlink) the FILE(s).\n"
 "\n"
@@ -9227,31 +9418,32 @@ msgid ""
 msgstr ""
 "Borra (desenlaza) los FICHERO(s).\n"
 "\n"
-"  -f, --force           descarta los ficheros que no existan, sin preguntar\n"
+"  -f, --force           descarta los ficheros y argumentos que no existan,\n"
+"                          sin preguntar\n"
 "  -i                    pregunta antes de cada borrado\n"
 
 #: src/rm.c:142
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 "  -I                     pregunta una vez antes de borrar más de tres "
 "ficheros,\n"
-"                           o cuando se borra recursivamente. Menos "
+"                           o cuando se borra recursivamente; menos "
 "intrusivo\n"
 "                           que -i, pero todavía protege contra la mayoría "
 "de\n"
 "                           las equivocaciones\n"
 "      --interactive[=CU�NDO]  pregunta de acuerdo con CU�NDO: never "
 "(nunca),\n"
-"                              once (una vez, -I), o always (siempre, -i).\n"
-"                              Sin CU�NDO, pregunta siempre\n"
+"                              once (una vez, -I), o always (siempre, -i);\n"
+"                              sin CU�NDO, pregunta siempre\n"
 
 #: src/rm.c:149
 msgid ""
@@ -9266,7 +9458,6 @@ msgstr ""
 "                          argumento de la línea de órdenes\n"
 
 #: src/rm.c:154
-#, fuzzy
 msgid ""
 "      --no-preserve-root  do not treat '/' specially\n"
 "      --preserve-root   do not remove '/' (default)\n"
@@ -9274,10 +9465,11 @@ msgid ""
 "  -d, --dir             remove empty directories\n"
 "  -v, --verbose         explain what is being done\n"
 msgstr ""
-"      --no-preserve-root no trata `/' de forma especial\\n\"\n"
-"      --preserve-root   no borra `/' (por omisión)\\n\"\n"
+"      --no-preserve-root no trata '/' de forma especial\\n\"\n"
+"      --preserve-root   no borra '/' (por omisión)\\n\"\n"
 "  -r, -R, --recursive   borra los contenidos de los directorios "
 "recursivamente\n"
+"  -d, --dir             borra los directorios vacíos\n"
 "  -v, --verbose         explica lo que va haciendo\n"
 
 #: src/rm.c:163
@@ -9293,7 +9485,7 @@ msgstr ""
 "para borrar también cada directorio listado, junto con todo su contenido.\n"
 
 #: src/rm.c:168
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "To remove a file whose name starts with a '-', for example '-foo',\n"
@@ -9303,7 +9495,7 @@ msgid ""
 "  %s ./-foo\n"
 msgstr ""
 "\n"
-"Para borrar un fichero cuyo nombre comience con un `-', por ejemplo `-fu',\n"
+"Para borrar un fichero cuyo nombre comience con un '-', por ejemplo '-fu',\n"
 "utilice una de las siguientes órdenes:\n"
 "  %s -- -fu\n"
 "\n"
@@ -9324,20 +9516,25 @@ msgstr ""
 "mayor seguridad de que el contenido es realmente irrecuperable, considere\n"
 "utilizar shred.\n"
 
+# SIoNO
 #: src/rm.c:342
 #, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr "%s: ¿borrar todos los argumentos recursivamente? "
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] "%s: ¿borrar el argumento %zu argument recursivamente? (s/n) "
+msgstr[1] "%s: ¿borrar los argumentos %zu recursivamente? (s/n) "
 
 # Convendría saber qué son los `%s'. Ver el código fuente.
 # El segundo es el nombre del fichero que se va a borrar, pero
 # ¿y el primero?
 #
 # SIoNO
-#: src/rm.c:343
+#: src/rm.c:345
 #, c-format
-msgid "%s: remove all arguments? "
-msgstr "%s: ¿borrar todos los argumentos? (s/n) "
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] "%s: ¿borrar el argumento %zu? (s/n) "
+msgstr[1] "%s: ¿borrar los argumentos %zu? (s/n) "
 
 #: src/rmdir.c:134 src/rmdir.c:233
 #, c-format
@@ -9364,16 +9561,15 @@ msgstr ""
 "                    porque un directorio no está vacío\n"
 
 #: src/rmdir.c:172
-#, fuzzy
 msgid ""
 "  -p, --parents   remove DIRECTORY and its ancestors; e.g., 'rmdir -p a/b/c' "
 "is\n"
 "                    similar to 'rmdir a/b/c a/b a'\n"
 "  -v, --verbose   output a diagnostic for every directory processed\n"
 msgstr ""
-"  -p, --parents   borra DIRECTORIO y sus antecesores. P. ej. `rmdir -p a/b/"
+"  -p, --parents   borra DIRECTORIO y sus antecesores. P. ej. 'rmdir -p a/b/"
 "c'\n"
-"                    es similar a `rmdir a/b/c a/b a'.\n"
+"                    es similar a 'rmdir a/b/c a/b a'.\n"
 "  -v, --verbose   muestra un mensaje por cada directorio procesado\n"
 
 #: src/rmdir.c:242
@@ -9393,12 +9589,13 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
+"Ejecuta un programa en un contexto de seguridad SELinux diferente.\n"
+"Sin CONTEXTO ni ORDEN, muestra el contexto de seguridad actual.\n"
 
 #: src/runcon.c:94
-#, fuzzy
 msgid ""
 "  CONTEXT            Complete security context\n"
 "  -c, --compute      compute process transition context before modifying\n"
@@ -9408,9 +9605,6 @@ msgid ""
 "  -l, --range=RANGE  levelrange\n"
 "\n"
 msgstr ""
-"Ejecuta un programa en un contexto de seguridad diferente.\n"
-"Sin CONTEXTO ni ORDEN, muestra el contexto de seguridad actual.\n"
-"\n"
 "  CONTEXTO           Contexto de seguridad completo\n"
 "  -c, --compute      calcula el contexto de transición de proceso antes de\n"
 "                       modificar\n"
@@ -9461,41 +9655,46 @@ msgstr "se debe especificar -c, -t, -u, -l, -r, o contexto"
 msgid "no command specified"
 msgstr "no se ha especificado ninguna orden"
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr "%s solamente se puede usar con un núcleo SELinux"
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, c-format
 msgid "failed to compute a new context"
 msgstr "fallo al calcular un nuevo contexto"
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, c-format
 msgid "failed to set new user %s"
 msgstr "fallo al establecer nuevo usuario %s"
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, c-format
 msgid "failed to set new type %s"
 msgstr "fallo al establecer nuevo tipo %s"
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, c-format
 msgid "failed to set new range %s"
 msgstr "fallo al establecer nuevo rango %s"
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, c-format
 msgid "failed to set new role %s"
 msgstr "fallo al establecer nuevo rol %s"
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, c-format
 msgid "unable to set security context %s"
 msgstr "no se puede establecer el contexto de seguridad %s"
 
+#: src/selinux.c:127 src/selinux.c:300
+#, c-format
+msgid "error canonicalizing %s"
+msgstr "error al canonicalizar %s"
+
 #: src/seq.c:68
 #, c-format
 msgid ""
@@ -9510,17 +9709,15 @@ msgstr ""
 #: src/seq.c:73
 msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n"
 msgstr ""
+"Muestra los números desde PRIMERO hasta ÚLTIMO, en incrementos de "
+"INCREMENTO.\n"
 
 #: src/seq.c:79
-#, fuzzy
 msgid ""
 "  -f, --format=FORMAT      use printf style floating-point FORMAT\n"
 "  -s, --separator=STRING   use STRING to separate numbers (default: \\n)\n"
 "  -w, --equal-width        equalize width by padding with leading zeroes\n"
 msgstr ""
-"Muestra los números desde PRIMERO hasta ÚLTIMO, en incrementos de "
-"INCREMENTO.\n"
-"\n"
 "  -f, --format=FORMATO     utiliza un FORMATO de coma flotante en estilo "
 "printf\n"
 "  -s, --separador=CADENA   utiliza CADENA para separar los números\n"
@@ -9532,6 +9729,8 @@ msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
@@ -9540,110 +9739,46 @@ msgstr ""
 "Si se omiten PRIMERO o INCREMENTO, el valor predeterminado es 1. Es decir,\n"
 "un INCREMENTO omitido tiene un valor predeterminado de 1 incluso cuando "
 "ÚLTIMO\n"
-"es más pequeño que PRIMERO. PRIMERO, INCREMENTO y ÚLTIMO se interpretan "
-"como\n"
-"valores de coma flotante. INCREMENTO es normalmente positivo si PRIMERO es\n"
-"menor que ÚLTIMO, y es normalmente negativo si PRIMERO es mayor que ÚLTIMO.\n"
+"es más pequeño que PRIMERO. La sucesión de números termina cuando la suma\n"
+"del número actual y el incremento sería mayor que ÚLTIMO.\n"
+"PRIMERO, INCREMENTO y ÚLTIMO se interpretan como valores de coma flotante.\n"
+"INCREMENTO es normalmente positivo si PRIMERO es menor que ÚLTIMO, e\n"
+"INCREMENTO es normalmente negativo si PRIMERO es mayor que ÚLTIMO.\n"
 
-#: src/seq.c:94
-#, fuzzy
+#: src/seq.c:96
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
 "it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n"
 "decimal numbers with maximum precision PREC, and to %g otherwise.\n"
 msgstr ""
-"FORMATO debe ser apropiado para imprimir un argumento de tipo `double';\n"
+"FORMATO debe ser apropiado para imprimir un argumento de tipo 'double';\n"
 "de forma predeterminada es %.PRECf si PRIMERO, INCREMENTO, y último\n"
 "son todos números decimales de coma fija con una precisión máxima de PREC,\n"
 "y %g en caso contrario.\n"
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, c-format
 msgid "invalid floating point argument: %s"
 msgstr "argumento de coma flotante inválido: %s"
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr "el formato %s tiene una directiva %%%c desconocida"
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr ""
 "la cadena de formato no debe especificarse cuando se muestran\n"
 "cadenas de la misma anchura"
 
-#: src/setuidgid.c:49
-#, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-"Modo de empleo: %s [OPCIÓN-CORTA]... USUARIO ORDEN [ARGUMENTO]...\n"
-"       o bien:  %s OPCIÓN-LARGA\n"
-
-#: src/setuidgid.c:55
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-"Abandona cualquier grupo suplementario, asume el ID de usuario y el ID\n"
-"de grupo del USUARIO especificado, y ejecuta ORDEN con cualesquiera\n"
-"ARGUMENTOs especificados. Termina con estado 111 si es incapaz de asumir\n"
-"los UID y GID necesarios. En caso contrario, termina con el estado de "
-"salida\n"
-"de ORDEN. Este programa solamente es útil cuando lo ejecuta root (user ID "
-"cero)\n"
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-"  -g GID[,GID1...]  también establece el ID de grupo primario al GID "
-"numérico,\n"
-"                    y (si se especifica) IDs de grupo sumplementario a "
-"GID1,...\n"
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr "ID de usuario desconocido: %s"
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr "para usar el ID de usuario %s necesita usar -g también"
-
-#: src/setuidgid.c:190
-#, c-format
-msgid "failed to set supplemental group(s)"
-msgstr "fallo al establecer el grupo o grupos suplementarios"
-
-#: src/setuidgid.c:200
-#, c-format
-msgid "cannot set group-ID to %lu"
-msgstr "no se puede establecer el ID del grupo a %lu"
-
-#: src/setuidgid.c:204
-#, c-format
-msgid "cannot set user-ID to %lu"
-msgstr "no se puede establecer el ID del usuario a %lu"
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr "Colin Plumb"
 
-#: src/shred.c:148
-#, fuzzy
+#: src/shred.c:170
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
 "for even very expensive hardware probing to recover the data.\n"
@@ -9651,9 +9786,8 @@ msgstr ""
 "Sobreescribe los FICHERO(s) especificados repetidamente, para hacer más "
 "difícil\n"
 "la recuperación de los datos incluso utilizando hardware muy costoso.\n"
-"\n"
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -9668,15 +9802,16 @@ msgstr ""
 "  -s, --size=N   efectúa el `shred' sobre este número de bytes\n"
 "                 (se permiten los sufijos K, M y G)\n"
 
-#: src/shred.c:161
+#: src/shred.c:183
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
 "  -z, --zero     add a final overwrite with zeros to hide shredding\n"
 msgstr ""
-"  -u, --remove   trunca y borra el fichero después de sobreescribirlo\n"
+"  -u, --remove[=CÓMO] trunca y borra el fichero después de sobreescribirlo;\n"
+"                      véase más abajo\n"
 "  -v, --verbose  muestra el progreso\n"
 "  -x, --exact    no redondea hacia arriba los tamaños de los ficheros hasta "
 "el\n"
@@ -9685,15 +9820,19 @@ msgstr ""
 "  -z, --zero     añade una sobreescritura final con ceros para ocultar la\n"
 "                 acción de esta orden\n"
 
-#: src/shred.c:170
+#: src/shred.c:192
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 "\n"
@@ -9704,12 +9843,15 @@ msgstr ""
 "es no borrar los ficheros porque es habitual operar sobre ficheros de\n"
 "dispositivo como /dev/hda, y dichos ficheros normalmente no se deben "
 "borrar.\n"
-"Cuando se opera sobre ficheros regulares, la mayor parte de la gente utiliza "
-"la\n"
-"opción --remove.\n"
+"El parámetro opcional CÓMO indica cómo borrar una entrada de directorio:\n"
+"'unlink' => utiliza una llamada unlink estándar.\n"
+"'wipe' => además ofusca primero bytes en el nombre\n"
+"'wipesync' => además efectúa sync con cada byte ofuscado al disco\n"
+"El modo predeterminado es 'wipesync', pero tenga en cuenta que puede ser "
+"costoso.\n"
 "\n"
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -9730,7 +9872,7 @@ msgstr ""
 "que sea efectivo en todos los modos de sistemas de ficheros:\n"
 "\n"
 
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -9752,7 +9894,7 @@ msgstr ""
 "Network Appliance\n"
 "\n"
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -9765,7 +9907,7 @@ msgstr ""
 "\n"
 "* sistemas de ficheros comprimidos\n"
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -9786,7 +9928,7 @@ msgstr ""
 "un sistema de ficheros en particular en el fichero /etc/fstab, tal y\n"
 "como se documenta en la página de manual de mount (man mount).\n"
 
-#: src/shred.c:215
+#: src/shred.c:241
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
 "of the file that cannot be removed, and that will allow a shredded file\n"
@@ -9797,127 +9939,127 @@ msgstr ""
 "un\n"
 "fichero al que se le haya hecho shred.\n"
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, c-format
 msgid "%s: fdatasync failed"
 msgstr "%s: fdatasync falló"
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr "%s: fsync falló"
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr "%s: no se puede rebobinar"
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr "%s: paso %lu/%lu (%s)..."
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, c-format
 msgid "%s: error writing at offset %s"
 msgstr "%s: error al escribir en el desplazamiento %s"
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s: lseek falló"
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, c-format
 msgid "%s: file too large"
 msgstr "%s: fichero demasiado grande"
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr "%s: paso %lu/%lu (%s)...%s"
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr "%s: paso %lu/%lu (%s)...%s/%s %d%%"
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, c-format
 msgid "%s: fstat failed"
 msgstr "%s: fallo en `fstat'"
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, c-format
 msgid "%s: invalid file type"
 msgstr "%s: tipo de fichero inválido"
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr "%s: el fichero tiene un tamaño negativo"
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, c-format
 msgid "%s: error truncating"
 msgstr "%s: error al truncar"
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, c-format
 msgid "%s: fcntl failed"
 msgstr "%s: fcntl falló"
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr "%s: no se puede efectuar shred un descriptor de fichero de sólo añadir"
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr "%s: borrando"
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, c-format
 msgid "%s: renamed to %s"
 msgstr "%s: renombrado a %s"
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, c-format
 msgid "%s: failed to remove"
 msgstr "%s: fallo al borrar"
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr "%s: borrado"
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, c-format
 msgid "%s: failed to close"
 msgstr "%s: fallo al cerrar"
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, c-format
 msgid "%s: failed to open for writing"
 msgstr "%s: fallo al abrir para escritura"
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, c-format
 msgid "%s: invalid number of passes"
 msgstr "%s: número inválido de pasos"
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, c-format
 msgid "multiple random sources specified"
 msgstr "se han especificado varios ficheros de origen"
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, c-format
 msgid "%s: invalid file size"
 msgstr "%s: tamaño de fichero inválido"
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -9928,14 +10070,14 @@ msgstr ""
 "       o bien:  %s -e [OPCIÓN]... [ARGUMENTO]...\n"
 "       o bien:  %s -i IN-SU [OPCIÓN]...\n"
 
-#: src/shuf.c:54
-#, fuzzy
+#: src/shuf.c:67
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr ""
 "Escribe una permutación aleatoria de las líneas de entrada a la salida "
 "estándar.\n"
 
-#: src/shuf.c:60
+#: src/shuf.c:73
+#, fuzzy
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
 "  -i, --input-range=LO-HI   treat each number LO through HI as an input "
@@ -9943,7 +10085,7 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
 msgstr ""
 "  -e, --echo                trata cada ARG como fichero de entrada\n"
 "  -i, --input-range=IN-SU   trata cada número de IN a SU como fichero de "
@@ -9952,36 +10094,47 @@ msgstr ""
 "  -o, --output=FICHERO      escribe el resultado en FICHERO en lugar de la\n"
 "                              salida estándar\n"
 "      --random-source=FICHERO obtiene bytes aleatorios de FICHERO\n"
+"  -r, --repeat              las líneas de salida se pueden repetir\n"
 "  -z, --zero-terminated     termina las líneas con un byte 0, no con nueva "
 "línea\n"
 
-#: src/shuf.c:244
+#: src/shuf.c:228
+#, c-format
+msgid "too many input lines"
+msgstr "demasiadas líneas de entrada"
+
+#: src/shuf.c:431
 #, c-format
 msgid "multiple -i options specified"
 msgstr "se han especificado varias opciones -i"
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, c-format
 msgid "invalid input range %s"
 msgstr "rango de entrada inválido %s"
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, c-format
 msgid "invalid line count %s"
 msgstr "contador de líneas inválido %s"
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, c-format
 msgid "multiple output files specified"
 msgstr "se han especificado varios ficheros de salida"
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, c-format
 msgid "cannot combine -e and -i options"
 msgstr "no se pueden combinar las opciones -e y -i"
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr ""
+
 #: src/sleep.c:44
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s NUMBER[SUFFIX]...\n"
 "  or:  %s OPTION\n"
@@ -9996,33 +10149,31 @@ msgstr ""
 "Modo de empleo: %s NÚMERO[SUFIJO]...\n"
 "       o bien:  %s OPCIÓN\n"
 "\n"
-"Hace una pausa de NÚMERO segundos. El SUFIJO puede ser `s' para segundos\n"
-"(predeterminado), `m' para minutos, `h' para horas o `d' para días.\n"
+"Hace una pausa de NÚMERO segundos. El SUFIJO puede ser 's' para segundos\n"
+"(predeterminado), `m' para minutos, 'h' para horas o 'd' para días.\n"
 "Al contrario de la mayoría de las implementaciones que exigen que\n"
 "NÚMERO sea un entero, aquí NÚMERO puede ser un número de coma flotante\n"
 "arbitrario. Dados dos o más argumentos, hace una pausa por la cantidad\n"
 "de tiempo especificada por la suma de sus valores.\n"
 "\n"
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, c-format
 msgid "invalid time interval %s"
 msgstr "intervalo de tiempo inválido %s"
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr "no se puede leer el reloj de tiempo real"
 
-#: src/sort.c:399
-#, fuzzy
+#: src/sort.c:427
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr ""
 "Muestra la concatenación ordenada de todos los FICHERO(s) en la salida\n"
 "estándar.\n"
-"\n"
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
@@ -10030,7 +10181,7 @@ msgstr ""
 "Opciones de ordenación:\n"
 "\n"
 
-#: src/sort.c:409
+#: src/sort.c:437
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
 "  -d, --dictionary-order      consider only blanks and alphanumeric "
@@ -10042,8 +10193,7 @@ msgstr ""
 "                              y los espacios\n"
 "  -f, --ignore-case           convierte las minúsculas en mayúsculas\n"
 
-#: src/sort.c:415
-#, fuzzy
+#: src/sort.c:443
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
 "  -i, --ignore-nonprinting    consider only printable characters\n"
@@ -10052,16 +10202,16 @@ msgstr ""
 "  -g, --general-numeric-sort  compara de acuerdo con el valor numérico "
 "general\n"
 "  -i, --ignore-nonprinting    considera solamente caracteres imprimibles\n"
-"  -M, --month-sort            compara (desconocido) < `JAN' < ... < `DEC'\n"
+"  -M, --month-sort            compara (desconocido) < 'JAN' < ... < 'DEC'\n"
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 "  -h, --human-numeric-sort    compara números en forma legible (p. ej., 2K "
 "1G)\n"
 
-#: src/sort.c:423
+#: src/sort.c:451
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
 "  -R, --random-sort           sort by random hash of keys\n"
@@ -10074,7 +10224,7 @@ msgstr ""
 "      --random-source=FICHERO obtiene bytes aleatorios de FICHERO\n"
 "  -r, --reverse               invierte el resultado de las comparaciones\n"
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -10091,7 +10241,7 @@ msgstr ""
 "dentro\n"
 "                                del texto\n"
 
-#: src/sort.c:437
+#: src/sort.c:465
 msgid ""
 "Other options:\n"
 "\n"
@@ -10099,7 +10249,7 @@ msgstr ""
 "Otras opciones:\n"
 "\n"
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
@@ -10107,7 +10257,7 @@ msgstr ""
 "      --batch-size=NCOMBI   combina como mucho NCOMBI entradas cada vez;\n"
 "                            para más use ficheros temporales\n"
 
-#: src/sort.c:445
+#: src/sort.c:473
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
 "  -C, --check=quiet, --check=silent  like -c, but do not report first bad "
@@ -10123,7 +10273,7 @@ msgstr ""
 "      --compress-program=PROG  comprime temporales con PROG;\n"
 "                               los descomprime con PROG -d\n"
 
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -10141,24 +10291,21 @@ msgstr ""
 "                           Si F es - entonces lee los nombre de la entrada\n"
 "                           estándar\n"
 
-#: src/sort.c:459
-#, fuzzy
+#: src/sort.c:487
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
 "  -m, --merge               merge already sorted files; do not sort\n"
 msgstr ""
-"  -k, --key=POS1[,POS2]     comienza una clave en POS1 (origen 1), y termina "
-"en\n"
-"                              POS2 (por omisión el final de la línea). Vea "
-"la\n"
-"                              sintaxis de POS debajo.\n"
+"  -k, --key=CLAVEDEF       ordena de acuerdo con una clave, CLAVEDEF "
+"establece\n"
+"                             lugar y tipo\n"
 "  -m, --merge               combina ficheros ya ordenados, no ordena\n"
 
 # Sugerencia para la -c:
 # comprueba si los ficheros ya están ordenados, pero no los ordena.
 # Si lo que buscas es algo corto, sugiero cambiar "y no ordena"
 # por "pero no ordena", o bien "sin ordenar[los]". sv+
-#: src/sort.c:463
+#: src/sort.c:491
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "  -s, --stable              stabilize sort by disabling last-resort "
@@ -10172,7 +10319,7 @@ msgstr ""
 "  -S, --buffer-size=TAMAÑO  utiliza TAMAÑO para el búfer de memoria "
 "principal\n"
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -10198,14 +10345,7 @@ msgstr ""
 "                            sin -c;  muestra solamente la primera de\n"
 "                            una tanda igual\n"
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr ""
-"  -z, --zero-terminated   termina las líneas con el byte 0, no con nueva "
-"línea\n"
-
-#: src/sort.c:483
-#, fuzzy
+#: src/sort.c:511
 msgid ""
 "\n"
 "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is "
@@ -10224,17 +10364,22 @@ msgid ""
 "SIZE may be followed by the following multiplicative suffixes:\n"
 msgstr ""
 "\n"
-"POS es F[.C][OPCIONES], donde F es el número de campo y C la posición\n"
-"del carácter en el campo; ambos comenzando en 1. Si no se usa -t ni -b,\n"
-"los caracteres de un campo se cuentan desde el comienzo del espacio en\n"
-"blanco precedente.  OPCIONES se compone de una o más de las opciones\n"
-"de ordenación de una letra, lo cual deshabilita las opciones de\n"
-"ordenación globales para esa clave. Si no se da ninguna clave, usa la\n"
-"línea entera como clave.\n"
+"CLAVEDEF es F[.C][OPCIONES][,F[.C][OPTS]] para las posiciones de comienzo y\n"
+"final, donde F es el número de campo y C la posición del carácter en el "
+"campo;\n"
+"ambos comenzando en 1, y la posición final por omisión es el final de la "
+"línea.\n"
+"Si no se usa -t ni -b, los caracteres de un campo se cuentan desde el "
+"comienzo\n"
+"del espacio en blanco precedente. OPCIONES se compone de una o más de las\n"
+"opciones de ordenación de una letra [bdfgiMhnRrV], lo cual deshabilita las\n"
+"opciones de ordenación globales para esa clave. Si no se da ninguna clave, "
+"usa\n"
+"la línea entera como clave.\n"
 "\n"
 "TAMAÑO puede estar seguido por lo siguientes sufijos multiplicativos:\n"
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -10247,7 +10392,7 @@ msgid ""
 msgstr ""
 "% 1% de memoria, b 1, K 1024 (predeterminado), etc con M, G, T, P, E, Z, Y.\n"
 "\n"
-"Si no se especifica ningún FICHERO o FICHERO es `-', lee la entrada\n"
+"Si no se especifica ningún FICHERO o FICHERO es -, lee la entrada\n"
 "estándar.\n"
 "\n"
 "*** ATENCIÓN ***\n"
@@ -10255,267 +10400,247 @@ msgstr ""
 "Establezca LC_ALL=C para obtener la forma de ordenación tradicional que\n"
 "utiliza los valores de los bytes originales.\n"
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, c-format
 msgid "waiting for %s [-d]"
 msgstr "esperando a %s [-d]"
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr "%s [-d] terminó anormalmente"
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, c-format
 msgid "cannot create temporary file in %s"
 msgstr "no se puede crear un fichero temporal en %s"
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr "fallo al abrir"
 
-#: src/sort.c:970
+#: src/sort.c:998
 msgid "fflush failed"
 msgstr "fflush falló"
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr "error al cerrar"
 
-#: src/sort.c:986
-#, c-format
-msgid "dup2 failed"
-msgstr "dup2 falló"
-
-#: src/sort.c:1103
-#, c-format
-msgid "couldn't execute %s"
-msgstr "no se pudo ejecutar %s"
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 msgid "couldn't create temporary file"
 msgstr "no se pudo crear un fichero temporal"
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, c-format
 msgid "couldn't create process for %s -d"
 msgstr "no se pudo crear el proceso para %s -d"
 
-#: src/sort.c:1161
-#, c-format
-msgid "couldn't execute %s -d"
-msgstr "no se pudo ejecutar %s -d"
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, c-format
 msgid "warning: cannot remove: %s"
 msgstr "atención: no se puede borrar: %s"
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, c-format
 msgid "invalid --%s argument %s"
 msgstr "argumento --%s inválido %s"
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, c-format
 msgid "minimum --%s argument is %s"
 msgstr "el argumento --%s mínimo es %s"
 
 # Sin ejemplo ni contexto estamos a ciegas
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, c-format
 msgid "--%s argument %s too large"
 msgstr "el argumento --%s %s es demasiado grande"
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr "el argumento --%s máximo con el rlimit actual es %s"
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr "el número en paralelo debe ser distinto de cero"
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr "fallo en `stat'"
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr "fallo al leer"
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, c-format
 msgid "string transformation failed"
 msgstr "la transformación de cadenas falló"
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, c-format
 msgid "the untransformed string was %s"
 msgstr "la cadena sin transformar era %s."
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr "^ no hay ninguna coincidencia para la clave\n"
 
-#: src/sort.c:2389
-#, fuzzy, c-format
+#: src/sort.c:2422
+#, c-format
 msgid "obsolescent key %s used; consider %s instead"
-msgstr "se ha utilizado la clave obsoleta  `%s`; considere `%s' en su lugar"
+msgstr "se ha utilizado la clave obsoleta %s; considere %s en su lugar"
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr "la clave %lu tiene ancho cero y no se tendrá en cuenta"
 
-#: src/sort.c:2406
-#, fuzzy, c-format
+#: src/sort.c:2439
+#, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr ""
 "los blancos iniciales son significativos en la clave %lu; considere "
 "especificar\n"
-"también `b'"
+"también 'b'"
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr "la clave %lu es numérica y abarca varios campos"
 
-#: src/sort.c:2451
-#, fuzzy, c-format
+#: src/sort.c:2484
+#, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
-msgstr[0] "la opción `-%s' se descarta"
-msgstr[1] "las opciones `-%s' se descartan"
+msgstr[0] "la opción '-%s' se descarta"
+msgstr[1] "las opciones '-%s' se descartan"
 
-#: src/sort.c:2457
-#, fuzzy, c-format
+#: src/sort.c:2490
+#, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr ""
-"la option `-r' solamente es aplicable a comparaciones de último recurso"
+"la option '-r' solamente es aplicable a comparaciones de último recurso"
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr "error al escribir"
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr "%s: %s:%s: fuera de secuencia: "
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr "salida de error estándar"
 
 # FIXME: ¿Por qué no "fork system call failed", como antes?
-#: src/sort.c:3698
-#, fuzzy
+#: src/sort.c:3738
 msgid "cannot read"
-msgstr "falló la llamada al sistema `fork'"
+msgstr "no se puede leer"
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, c-format
 msgid "%s: invalid field specification %s"
 msgstr "%s: especificación de campo inválida %s"
 
-#: src/sort.c:3987
-#, fuzzy, c-format
+#: src/sort.c:4028
+#, c-format
 msgid "options '-%s' are incompatible"
-msgstr "las opciones `-%s' son incompatibles"
+msgstr "las opciones '-%s' son incompatibles"
 
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, c-format
 msgid "%s: invalid count at start of %s"
 msgstr "%s: contador inválido al comienzo de %s"
 
-#: src/sort.c:4295
-#, fuzzy
+#: src/sort.c:4336
 msgid "invalid number after '-'"
-msgstr "número inválido después de`-'"
+msgstr "número inválido después de '-'"
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
-#, fuzzy
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 msgid "invalid number after '.'"
-msgstr "número inválido después de `.'"
+msgstr "número inválido después de '.'"
 
 # No estoy muy seguro. Comprobar.
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr "carácter extraño en el especificador de campo"
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, c-format
 msgid "multiple compress programs specified"
 msgstr "se han especificado varios programas de compresión"
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
 msgstr "número inválido al comienzo del campo"
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
 msgstr "el número de campo es cero"
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr "el desplazamiento de caracteres es cero"
 
-#: src/sort.c:4407
-#, fuzzy
+#: src/sort.c:4448
 msgid "invalid number after ','"
-msgstr "número inválido después de `,'"
+msgstr "número inválido después de ','"
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr "tabulación vacía"
 
 # Lo mismo de antes.
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, c-format
 msgid "cannot read file names from %s"
 msgstr "no se pueden leer los nombres de fichero de %s"
 
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr "%s:%lu: nombre de fichero de longitud cero inválido"
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, c-format
 msgid "no input from %s"
 msgstr "no hay entrada desde %s"
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr "se utilizan las reglas de ordenación %s"
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr "se utiliza la comparación simple de bytes"
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr "el operando extra %s no está permitido con -%c"
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr "la longitud del sufijo debe ser al menos %zu"
 
-#: src/split.c:204
+#: src/split.c:203
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr "Modo de empleo: %s [OPCIÓN]... [ENTRADA [PREFIJO]]\n"
 
-#: src/split.c:208
-#, fuzzy
+#: src/split.c:207
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
 "size is 1000 lines, and default PREFIX is 'x'.  With no INPUT, or when "
@@ -10524,44 +10649,47 @@ msgid ""
 msgstr ""
 "Vuelca trozos de tamaño fijo de ENTRADA a PREFIJOaa, PREFIJOab, ...;\n"
 "el tamaño predeterminado son 1000 líneas, y el PREFIJO predeterminado\n"
-"es `x'. Si no es especifica ENTRADA, o cuando ENTRADA es -, lee la\n"
+"es 'x'. Si no es especifica ENTRADA, o cuando ENTRADA es -, lee la\n"
 "entrada estandar.\n"
-"\n"
 
 # FIXME: ¿Ahora dos espacios es el estándar para mensajes de continuación?
 # (before each output file...)
-#: src/split.c:216
-#, fuzzy, c-format
+#: src/split.c:215
+#, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
 "  -a, --suffix-length=N   utiliza sufijos de longitud N (por omisión %d)\n"
+"      --additional-suffix=SUFIJO  añade un SUFIJO adicional a los nombres de "
+"ficheros\n"
 "  -b, --bytes=TAMAÑO      escribe TAMAÑO bytes en cada fichero de salida\n"
 "  -C, --line-bytes=BYTES  escribe un máximo de BYTES bytes sin cortar "
 "líneas\n"
-"  -d, --numeric-suffixes  utiliza sufijos numéricos en vez de alfabéticos\n"
-"  -e, --elide-empty-files  no genera líneas de salida vacías con `-n'\n"
+"  -d, --numeric-suffixes[=DESDE]  utiliza sufijos numéricos en vez de "
+"alfabéticos;\n"
+"                                    DESDE cambia el valor de comienzo (0 por "
+"omisión)\n"
+"  -e, --elide-empty-files  no genera líneas de salida vacías con '-n'\n"
 "      --filter=ORDEN      escribe a la ORDEN de shell; el nombre de fichero "
 "es $FILE\\n\"\n"
 "  -l, --lines=NÚMERO      pone NÚMERO de líneas en cada fichero de salida\n"
-"  -n, --number=TROZOS     genera TROZOS ficheros de salida.  Véase debajo\n"
+"  -n, --number=TROZOS     genera TROZOS ficheros de salida; véase debajo\n"
 "  -u, --unbuffered        copia inmediatamente la entrada a la salida\n"
-"                            con `-n r/...'\n"
+"                            con '-n r/...'\n"
 
-#: src/split.c:229
+#: src/split.c:228
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
 "                            output file is opened\n"
@@ -10569,8 +10697,7 @@ msgstr ""
 "      --verbose           muestra un diagnóstico justo antes de abrir cada\n"
 "                            fichero\n"
 
-#: src/split.c:236
-#, fuzzy
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -10588,177 +10715,179 @@ msgstr ""
 "l/N     divide en N ficheros sin dividir las líneas\n"
 "l/K/N   muestra el K-ésimo de N en la salida estándar sin dividir las "
 "líneas\n"
-"r/N     como `l' pero usando la distribución round robin\n"
+"r/N     como 'l' pero usando la distribución round robin\n"
 "r/K/N   análogo pero solamente muestra el K-ésimo de N a la salida estándar\n"
 
-#: src/split.c:354
+#: src/split.c:353
 #, c-format
 msgid "output file suffixes exhausted"
 msgstr "se han agotado los sufijos para los ficheros de salida"
 
-#: src/split.c:366
+#: src/split.c:365
 #, c-format
 msgid "creating file %s\n"
 msgstr "creando fichero %s\n"
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
-msgstr ""
+msgstr "%s sobreescribiría la entrada; abortando"
 
-#: src/split.c:391
+#: src/split.c:390
 #, c-format
 msgid "failed to set FILE environment variable"
 msgstr "fallo al establecer la variable de entorno FILE"
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr "ejecutando con FILE=%s\n"
 
 # El original no aclara si es "la" tubería o "una" tubería,
 # por lo que tampoco se puede asegurar en la traducción.
-#: src/split.c:395
+#: src/split.c:394
 #, c-format
 msgid "failed to create pipe"
 msgstr "fallo al crear tubería"
 
-#: src/split.c:409
+#: src/split.c:408
 #, c-format
 msgid "closing prior pipe"
 msgstr "cerrando la tubería anterior"
 
-#: src/split.c:411
+#: src/split.c:410
 #, c-format
 msgid "closing output pipe"
 msgstr "cerrando la tubería de salida"
 
-#: src/split.c:415
+#: src/split.c:414
 #, c-format
 msgid "moving input pipe"
 msgstr "moviendo la tubería de entrada"
 
-#: src/split.c:417
+#: src/split.c:416
 #, c-format
 msgid "closing input pipe"
 msgstr "cerrando la tubería de entrada"
 
-#: src/split.c:422
+#: src/split.c:421
 #, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr "fallo al ejecutar la orden: \"%s -c %s"
 
-#: src/split.c:428
+#: src/split.c:427
 #, c-format
 msgid "failed to close input pipe"
 msgstr "fallo al cerrar la tubería de entrada"
 
-#: src/split.c:464
+#: src/split.c:463
 #, c-format
 msgid "waiting for child process"
 msgstr "esperando al proceso hijo"
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr "con FILE=%s, envía la señal %s a la orden: %s"
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr "con FILE=%s, sale con %d de la orden: %s"
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr "estado desconocido de la orden (0x%X)"
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr "no se puede trocear de varias formas distintas"
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, c-format
 msgid "%s: invalid number of chunks"
 msgstr "%s: número de trozos inválido"
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, c-format
 msgid "%s: invalid chunk number"
 msgstr "%s: número de trozo inválido"
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr "%s: longitud del sufijo inválida"
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr "%s: número de bytes inválido"
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr "%s: número de líneas inválido"
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, c-format
 msgid "line count option -%s%c... is too large"
 msgstr "opción de contador de líneas -%s%c... demasiado grande"
 
-#: src/split.c:1248
-#, fuzzy, c-format
+#: src/split.c:1298
+#, c-format
 msgid "%s: invalid start value for numerical suffix"
-msgstr "número de comienzo de línea inválido: %s"
+msgstr "%s: valor de comienzo inválido para el sufijo numérico"
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, c-format
 msgid "%s: invalid IO block size"
 msgstr "%s: tamaño de bloque de E/S inválido"
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr "--filter no procesa un trozo extraído de la salida estándar"
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr ""
+"el valor de comienzo del sufijo numérico es demasiado grande para la "
+"longitud del sufijo"
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, c-format
 msgid "%s: cannot determine file size"
 msgstr "%s: no se puede determinar el tamaño del fichero"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr "Michael Meskes"
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, c-format
 msgid "failed to canonicalize %s"
 msgstr "fallo al canonicalizar %s"
 
-#: src/stat.c:1069
-#, fuzzy, c-format
+#: src/stat.c:1129
+#, c-format
 msgid "warning: unrecognized escape '\\%c'"
-msgstr "atención: escape no reconocido `\\%c'"
+msgstr "atención: escape no reconocido '\\%c'"
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, c-format
 msgid "%s: invalid directive"
 msgstr "%s: directiva inválida"
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, c-format
 msgid "warning: backslash at end of format"
 msgstr "atención: barra invertida al final del formato"
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr ""
@@ -10766,19 +10895,19 @@ msgstr ""
 "de\n"
 "ficheros"
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, c-format
 msgid "cannot read file system information for %s"
 msgstr "no se puede leer la información del sistema de ficheros para %s"
 
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, c-format
 msgid "cannot stat standard input"
 msgstr "no se puede efectuar `stat' en la entrada estándar"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -10794,7 +10923,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -10804,7 +10933,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr ""
 "Dispositivo: %Dh/%dd\tNodo-i: %-10i  Enlaces: %-5h Tipo de dispositivo: %t,"
@@ -10812,24 +10941,24 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr "Dispositivo: %Dh/%dd\tNodo-i: %-10i  Enlaces: %h\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr "Acceso: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, c-format
 msgid "Context: %C\n"
 msgstr "Contexto: %C\n"
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -10841,30 +10970,27 @@ msgstr ""
 "      Cambio: %z\n"
 "    Creación: %w\n"
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
-msgstr ""
+msgstr "Muestra el estado del fichero o del sistema de ficheros.\n"
 
-#: src/stat.c:1356
-#, fuzzy
+#: src/stat.c:1418
 msgid ""
 "  -L, --dereference     follow links\n"
 "  -f, --file-system     display file system status instead of file status\n"
 msgstr ""
-"Muestra el estado del fichero o del sistema de ficheros.\n"
-"\n"
 "  -L, --dereference     sigue los enlaces\n"
 "  -f, --file-system     muestra el estado del sistema de ficheros en lugar "
 "del\n"
 "                        estado del fichero\n"
 
-#: src/stat.c:1360
+#: src/stat.c:1422
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 "  -c  --format=FORMATO  usa el FORMATO especificado en vez del "
@@ -10872,15 +10998,13 @@ msgstr ""
 "                         muestra una nueva línea después de cada uso del "
 "FORMATO\n"
 "      --printf=FORMATO  como --format, pero interpreta las secuencias de "
-"escape\n"
+"escape,\n"
 "                          y no muestra un carácter de nueva línea final\n"
-"                          obligatoriamente. Si quiere un carácter de nueva\n"
+"                          obligatoriamente; si quiere un carácter de nueva\n"
 "                          línea, incluya \\n en el FORMATO\n"
-"                          If you want a newline, include \\n in FORMAT.\n"
 "  -t, --terse           muestra la información de manera escueta\n"
 
-#: src/stat.c:1371
-#, fuzzy
+#: src/stat.c:1433
 msgid ""
 "\n"
 "The valid format sequences for files (without --file-system):\n"
@@ -10894,14 +11018,13 @@ msgstr ""
 "\n"
 "Las secuencias de formato válidas para ficheros (sin --file-system):\n"
 "\n"
-"  %a   Derechos de acceso en octal\n"
-"  %A   Derechos de acceso en forma legible\n"
-"  %b   Número de bloques asignados (véase %B)\n"
-"  %B   El tamaño en bytes de cada bloque indicado por %b\n"
-"  %C   Cadena de contexto de seguridad de SELinux\n"
+"  %a   derechos de acceso en octal\n"
+"  %A   derechos de acceso en forma legible\n"
+"  %b   número de bloques asignados (véase %B)\n"
+"  %B   el tamaño en bytes de cada bloque indicado por %b\n"
+"  %C   cadena de contexto de seguridad de SELinux\n"
 
-#: src/stat.c:1380
-#, fuzzy
+#: src/stat.c:1442
 msgid ""
 "  %d   device number in decimal\n"
 "  %D   device number in hex\n"
@@ -10910,15 +11033,14 @@ msgid ""
 "  %g   group ID of owner\n"
 "  %G   group name of owner\n"
 msgstr ""
-"  %d   Número de dispositivo en decimal\n"
-"  %D   Número de dispositivo en hexadecimal\n"
-"  %f   Modo en hexadecimal\n"
-"  %F   Tipo de fichero\n"
+"  %d   número de dispositivo en decimal\n"
+"  %D   número de dispositivo en hexadecimal\n"
+"  %f   modo en hexadecimal\n"
+"  %F   tipo de fichero\n"
 "  %g   ID del grupo del propietario\n"
-"  %G   Nombre de grupo del propietario\n"
+"  %G   nombre de grupo del propietario\n"
 
-#: src/stat.c:1388
-#, fuzzy
+#: src/stat.c:1450
 msgid ""
 "  %h   number of hard links\n"
 "  %i   inode number\n"
@@ -10927,21 +11049,25 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
-msgstr ""
-"  %h   Número de enlaces duros\n"
-"  %i   Número de nodo-i\n"
-"  %m   Punto de montaje\n"
-"  %n   Nombre del fichero\n"
-"  %N   Nombre de fichero entrecomillado desreferenciado si era un enlace\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
+msgstr ""
+"  %h   número de enlaces duros\n"
+"  %i   número de nodo-i\n"
+"  %m   punto de montaje\n"
+"  %n   nombre del fichero\n"
+"  %N   nombre de fichero entrecomillado desreferenciado si era un enlace\n"
 "         simbólico\n"
-"  %o   tamaño del bloque de E/S\n"
-"  %s   Tamaño total, en bytes\n"
-"  %t   Tipo de dispositivo principal en hexadecimal\n"
-"  %T   Tipo de dispositivo secundario en hexadecimal\n"
+"  %o   indicación del tamaño óptimo de bloque de E/S\n"
+"  %s   tamaño total, en bytes\n"
+"  %t   tipo de dispositivo principal en hexadecimal, para ficheros "
+"especiales\n"
+"         de caracteres o dispositivos de bloques\n"
+"  %T   tipo de dispositivo secundario en hexadecimal, para ficheros "
+"especiales\n"
+"         de caracteres o dispositivos de bloques\n"
 
-#: src/stat.c:1399
+#: src/stat.c:1461
 #, fuzzy
 msgid ""
 "  %u   user ID of owner\n"
@@ -10950,25 +11076,24 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 "  %u   ID de usuario del propietario\n"
-"  %U   Nombre de usuario del propietario \n"
-"  %w   Fecha de creación del fichero, formato legible, - si es desconocido\n"
-"  %W   Fecha de creación, segundos desde la Época, 0 si es desconocido\n"
-"  %x   Fecha de último acceso, formato legible\n"
-"  %X   Fecha de último acceso, segundos desde la Época\n"
-"  %y   Fecha de última modificación, formato legible\n"
-"  %Y   Fecha de última modificación, segundos desde la Época\n"
-"  %z   Fecha de último cambio, formato legible\n"
-"  %Z   Fecha de último cambio, segundos desde la Época\n"
-
-#: src/stat.c:1413
-#, fuzzy
+"  %U   nombre de usuario del propietario \n"
+"  %w   fecha de creación del fichero, formato legible, - si es desconocido\n"
+"  %W   fecha de creación, segundos desde la Época, 0 si es desconocido\n"
+"  %x   fecha de último acceso, formato legible\n"
+"  %X   fecha de último acceso, segundos desde la Época\n"
+"  %y   fecha de última modificación, formato legible\n"
+"  %Y   fecha de última modificación, segundos desde la Época\n"
+"  %z   fecha de último cambio, formato legible\n"
+"  %Z   fecha de último cambio, segundos desde la Época\n"
+
+#: src/stat.c:1475
 msgid ""
 "Valid format sequences for file systems:\n"
 "\n"
@@ -10980,14 +11105,13 @@ msgid ""
 msgstr ""
 "Formatos válidos para sistemas de ficheros:\n"
 "\n"
-"  %a   Bloques libres disponibles para el no superusuario\n"
-"  %b   Total de bloques de datos en el sistema de ficheros\n"
-"  %c   Total de nodos de ficheros en el sistema de ficheros\n"
-"  %d   Nodos de ficheros libres en el sistema de ficheros\n"
-"  %f   Bloques libres en el sistema de ficheros\n"
+"  %a   bloques libres disponibles para el no superusuario\n"
+"  %b   total de bloques de datos en el sistema de ficheros\n"
+"  %c   total de nodos de ficheros en el sistema de ficheros\n"
+"  %d   nodos de ficheros libres en el sistema de ficheros\n"
+"  %f   bloques libres en el sistema de ficheros\n"
 
-#: src/stat.c:1422
-#, fuzzy
+#: src/stat.c:1484
 msgid ""
 "  %i   file system ID in hex\n"
 "  %l   maximum length of filenames\n"
@@ -10998,12 +11122,12 @@ msgid ""
 "  %T   file system type in human readable form\n"
 msgstr ""
 "  %i   id del sistema de ficheros en hexadecimal\n"
-"  %l   Longitud máxima de los nombres de ficheros\n"
-"  %n   Nombre del fichero\n"
-"  %s   Tamaño de bloque de transferencia óptima\n"
-"  %S   Tamaño de bloque fundamental (para contar bloques)\n"
-"  %t   Tipo en hexadecimal\n"
-"  %T   Tipo de forma legible\n"
+"  %l   longitud máxima de los nombres de ficheros\n"
+"  %n   nombre del fichero\n"
+"  %s   tamaño de bloque de transferencia óptima\n"
+"  %S   tamaño de bloque fundamental (para contar bloques)\n"
+"  %t   tipo en hexadecimal\n"
+"  %T   tipo de forma legible\n"
 
 #: src/stdbuf.c:90
 #, c-format
@@ -11011,7 +11135,6 @@ msgid "Usage: %s OPTION... COMMAND\n"
 msgstr "Modo de empleo: %s [OPCIÓN]... ORDEN\n"
 
 #: src/stdbuf.c:91
-#, fuzzy
 msgid ""
 "Run COMMAND, with modified buffering operations for its standard streams.\n"
 msgstr ""
@@ -11029,24 +11152,22 @@ msgstr ""
 "  -e, --error=MODO   ajusta el búfer de la salida de error estándar\n"
 
 #: src/stdbuf.c:104
-#, fuzzy
 msgid ""
 "\n"
 "If MODE is 'L' the corresponding stream will be line buffered.\n"
 "This option is invalid with standard input.\n"
 msgstr ""
 "\n"
-"Si MODO es `L' el flujo correspondiente tendrá un búfer de línea.\n"
+"Si MODO es 'L' el flujo correspondiente tendrá un búfer de línea.\n"
 "Esta opción es inválida con la entrada estándar.\n"
 
 #: src/stdbuf.c:107
-#, fuzzy
 msgid ""
 "\n"
 "If MODE is '0' the corresponding stream will be unbuffered.\n"
 msgstr ""
 "\n"
-"Si MODO es `0' el flujo correspondiente no tendrá búfer.\n"
+"Si MODO es '0' el flujo correspondiente no tendrá búfer.\n"
 
 #: src/stdbuf.c:110
 msgid ""
@@ -11065,7 +11186,6 @@ msgstr ""
 "con el tamaño del búfer establecido en MODO bytes.\n"
 
 #: src/stdbuf.c:116
-#, fuzzy
 msgid ""
 "\n"
 "NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n"
@@ -11075,29 +11195,34 @@ msgid ""
 "and are thus unaffected by 'stdbuf' settings.\n"
 msgstr ""
 "\n"
-"NOTA: Si ORDEN ajusta el búfer de sus flujos estándar (p. ej. `tee' lo "
+"NOTA: Si ORDEN ajusta el búfer de sus flujos estándar (p. ej. 'tee' lo "
 "hace)\n"
-"entones eso tendrá prioridad sobre las opciones cambiadas por `stdbuf'.\n"
-"Además, algunos filtros (como `dd' y `cat' etc.) no usan flujos para la E/"
+"entones eso tendrá prioridad sobre las opciones cambiadas por 'stdbuf'.\n"
+"Además, algunos filtros (como 'dd' y 'cat' etc.) no usan flujos para la E/"
 "S,\n"
-"y por lo tanto no se ven afectados por las opciones de `stdbuf'.\n"
+"y por lo tanto no se ven afectados por las opciones de 'stdbuf'.\n"
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, c-format
 msgid "failed to find %s"
 msgstr "fallo al encontrar %s"
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, c-format
 msgid "failed to update the environment with %s"
 msgstr "fallo al actualizar el entorno con %s"
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr "no tiene sentido un búfer de línea con la entrada estándar"
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, c-format
+msgid "you must specify a buffering mode option"
+msgstr "debe especificar una opción para el modo de búfer"
+
+#: src/stty.c:516
 #, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -11108,9 +11233,9 @@ msgstr ""
 "       o bien:  %s [-F DISPOSITIVO | --file=DISPOSITIVO] [-a|--all]\n"
 "       o bien:  %s [-F DISPOSITIVO | --file=DISPOSITIVO] [-g|--save]\n"
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
-msgstr ""
+msgstr "Muestra o establece las características de la terminal\n"
 
 # Eso de los "humanos" en español suena un poco raro. ¿no? sv
 # Por acuerdo, usamos 'el' terminal em+
@@ -11118,15 +11243,12 @@ msgstr ""
 # FIXME. Comunicar primero al autor. sv+
 # Sistema subyacente ?? , mejor dejar 'sistema' a secas em+
 # Depende, ¿qué ocurre con los compiladores cruzados?
-#: src/stty.c:525
-#, fuzzy
+#: src/stty.c:528
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
 "  -g, --save         print all current settings in a stty-readable form\n"
 "  -F, --file=DEVICE  open and use the specified DEVICE instead of stdin\n"
 msgstr ""
-"Muestra o establece las características de la terminal\n"
-"\n"
 "  -a, --all       muestra todos los valores actuales en forma legible para\n"
 "                  humanos\n"
 "  -g, --save      muestra todos los valores actuales en forma legible para\n"
@@ -11134,7 +11256,7 @@ msgstr ""
 "  -F, --file=DISP abre y utiliza el DISPositivo especificado en lugar de la\n"
 "                  entrada estándar\n"
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
@@ -11145,7 +11267,7 @@ msgstr ""
 "El sistema subyacente define qué valores están disponibles.\n"
 
 # Contexto del shell ? , ¿qué es eso? em+
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -11161,7 +11283,7 @@ msgstr ""
 "   eof CAR       el CARácter enviará un fin de línea (termina la entrada)\n"
 "   eol CAR       el CARácter terminará la línea\n"
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -11173,7 +11295,7 @@ msgstr ""
 "   intr CAR      el CARácter enviará una señal de interrupción\n"
 "   kill CAR      el CARácter borrará la línea actual\n"
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -11186,7 +11308,7 @@ msgstr ""
 "   start CAR     el CARácter reiniciará la salida después de haberla "
 "detenido\n"
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -11199,7 +11321,7 @@ msgstr ""
 " * werase CAR    el CARácter borrará la última palabra tecleada\n"
 
 # FIXME: Falta un espacio ¿?
-#: src/stty.c:562
+#: src/stty.c:565
 msgid ""
 "\n"
 "Special settings:\n"
@@ -11213,7 +11335,7 @@ msgstr ""
 " * cols N        dice al núcleo que la terminal tiene N columnas\n"
 " * columns N     igual que cols N\n"
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -11227,7 +11349,7 @@ msgstr ""
 "                 lectura completada\n"
 "   ospeed N      establece la velocidad de salida a N\n"
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -11242,8 +11364,7 @@ msgstr ""
 "   time N        con -icanon, establece el tiempo fuera de lectura en N\n"
 "                 décimas de segundo\n"
 
-#: src/stty.c:581
-#, fuzzy
+#: src/stty.c:584
 msgid ""
 "\n"
 "Control settings:\n"
@@ -11258,12 +11379,12 @@ msgstr ""
 "   [-]clocal     desactiva las señales de control del módem\n"
 "   [-]cread      permite que se reciba entrada\n"
 " * [-]crtscts    permite negociación RTS/CTS\n"
+" * [-]cdtrdsr    permite negociación DTR/DSR\n"
 "   csN           establece el tamaño del carácter en N bits, N en [5..8]\n"
 
 # ## en -cread -> permite que se reciba entrada
 # ## vale.
-#: src/stty.c:590
-#, fuzzy
+#: src/stty.c:593
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
 "   [-]hup        send a hangup signal when the last process closes the tty\n"
@@ -11271,16 +11392,18 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
-"   [-]cstopb     utiliza dos bits de paro por carácter (uno con `-')\n"
+"   [-]cstopb     utiliza dos bits de paro por carácter (uno con '-')\n"
 "   [-]hup        manda una señal de colgar cuando el último proceso cierra\n"
 "                   la tty\n"
 "   [-]hupcl      igual que [-]hup\n"
 "   [-]parenb     genera un bit de paridad en la salida y espera un bit de\n"
 "                   paridad en la entrada\n"
-"   [-]parodd     establece paridad impar (incluso con `-')\n"
+"   [-]parodd     establece paridad impar (o paridad par con '-')\n"
+" * [-]cmspar     utiliza paridad \"stick\" (marca/espacio)\n"
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -11296,7 +11419,7 @@ msgstr ""
 "   [-]ignbrk     descarta los caracteres de `break'\n"
 "   [-]igncr      descarta los retornos de carro\n"
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -11312,11 +11435,11 @@ msgstr ""
 "   [-]inpck      permite la revisión de paridad de entrada\n"
 "   [-]istrip     borra el bit alto (8º) de los caracteres de entrada\n"
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr " * [-]iutf8      supone que los caracteres de entrada son UTF-8\n"
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -11334,7 +11457,7 @@ msgstr ""
 "255-0)\n"
 "   [-]tandem     igual que [-]ixoff\n"
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -11350,10 +11473,11 @@ msgstr ""
 " * ffN           estilo de retardo de salto de página, N en [0..1]\n"
 " * nlN           estilo de retardo de nueva línea, N in [0..1]\n"
 
-#: src/stty.c:631
+#: src/stty.c:635
+#, fuzzy
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
@@ -11368,7 +11492,7 @@ msgstr ""
 " * [-]onlcr      traduce nueva línea a retorno de carro-nueva línea\n"
 " * [-]onlret     nueva línea realiza un retorno de carro\n"
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -11387,7 +11511,7 @@ msgstr ""
 # lo del carácter de matar es un poco fuerte, ¿no? sv
 # echo = muestra, mejor que repite, aquí, creo. gerardo
 # perdería parte del significado. sv
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -11402,8 +11526,7 @@ msgstr ""
 " * crtkill       mata toda la línea obedeciendo los valores echoprt y echoe\n"
 " * -crtkill      mata toda la línea obedeciendo los valores echoctl y echok\n"
 
-#: src/stty.c:654
-#, fuzzy
+#: src/stty.c:658
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
 "   [-]echo       echo input characters\n"
@@ -11411,14 +11534,13 @@ msgid ""
 "   [-]echoe      same as [-]crterase\n"
 "   [-]echok      echo a newline after a kill character\n"
 msgstr ""
-" * [-]ctlecho    repite los caracteres de control en notación gorro (`^c')\n"
+" * [-]ctlecho    repite los caracteres de control en notación gorro ('^c')\n"
 "   [-]echo       repite los caracteres de entrada\n"
 " * [-]echoctl    igual que [-]ctlecho\n"
 "   [-]echoe      igual que [-]crterase\n"
 "   [-]echok      repite una nueva línea después de un carácter de matar\n"
 
-#: src/stty.c:661
-#, fuzzy
+#: src/stty.c:665
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
 "   [-]echonl     echo newline even if not echoing other characters\n"
@@ -11430,13 +11552,12 @@ msgstr ""
 "   [-]echonl     repite nueva línea aún si no está repitiendo otros "
 "caracteres\n"
 " * [-]echoprt    repite los caracteres borrados en orden inverso, entre\n"
-"                 `\\' y '/'\n"
+"                 '\\' y '/'\n"
 "   [-]icanon     permite los caracteres especiales erase, kill, werase,\n"
 "                 y rprnt\n"
 "   [-]iexten     permite caracteres especiales no-POSIX\n"
 
-#: src/stty.c:668
-#, fuzzy
+#: src/stty.c:672
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
 "   [-]noflsh     disable flushing after interrupt and quit special "
@@ -11445,16 +11566,16 @@ msgid ""
 " * [-]tostop     stop background jobs that try to write to the terminal\n"
 " * [-]xcase      with icanon, escape with '\\' for uppercase characters\n"
 msgstr ""
-"  [-]isig        permite los caracteres especiales interrupt, quit, y "
+"   [-]isig       permite los caracteres especiales interrupt, quit, y "
 "suspend\n"
-"  [-]noflsh      no permite limpieza después de los caracteres especiales\n"
+"   [-]noflsh     no permite limpieza después de los caracteres especiales\n"
 "                 interrupt y quit\n"
 " * [-]prterase   igual que [-]echoprt\n"
 " * [-]tostop     detiene trabajos en `background' que tratan de escribir a\n"
 "                 la terminal\n"
-" * [-]xcase      con icanon, escapa con `\\' para caracteres en mayúscula\n"
+" * [-]xcase      con icanon, escapa con '\\' para caracteres en mayúscula\n"
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -11468,7 +11589,7 @@ msgstr ""
 "   cbreak        igual que -icanon\n"
 "   -cbreak       igual que icanon\n"
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -11480,7 +11601,7 @@ msgstr ""
 "   -cooked       igual que raw\n"
 "   crt           igual que echoe echoctl echoke\n"
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -11494,7 +11615,7 @@ msgstr ""
 "   ek            caracteres erase y kill a sus valores por omisión\n"
 "   evenp         igual que parenb -parodd cs7\n"
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -11510,7 +11631,7 @@ msgstr ""
 "   nl            igual que -icrnl -onlcr\n"
 "   -nl           igual que icrnl -inlcr -igncr onlcr -ocrnl -onlret\n"
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -11524,7 +11645,7 @@ msgstr ""
 "   pass8         igual que -parenb -istrip cs8\n"
 "   -pass8        igual que parenb istrip cs7\n"
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -11536,7 +11657,7 @@ msgstr ""
 "                 -imaxbel -opost -isig -icanon -xcase min 1 time 0\n"
 "   -raw          igual que cooked\n"
 
-#: src/stty.c:716
+#: src/stty.c:720
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
 "                 -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n"
@@ -11552,7 +11673,7 @@ msgstr ""
 "                 -xcase -tostop -echoprt echoctl echoke, y todos los\n"
 "                 caracteres especiales a sus valores por omisión.\n"
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -11567,12 +11688,12 @@ msgstr ""
 "o codificado como en ^c, 0x37, 0177 ó 127; los valores especiales ^- o\n"
 "undef son utilizados para no permitir caracteres especiales.\n"
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, c-format
 msgid "only one device may be specified"
 msgstr "sólo se puede especificar un dispositivo"
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
@@ -11581,44 +11702,44 @@ msgstr ""
 "las opciones para estilos de salida explícitos y legibles para terminal son\n"
 "mutuamente excluyentes"
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr ""
 "cuando se especifica un estilo de salida, no se pueden establecer los modos"
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr "%s: no se pudo reiniciar el modo `non-blocking'"
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, c-format
 msgid "invalid argument %s"
 msgstr "argumento inválido %s"
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, c-format
 msgid "missing argument to %s"
 msgstr "falta el argumento de %s"
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, c-format
 msgid "invalid line discipline %s"
 msgstr "disciplina de línea inválida %s"
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr "%s: no se pudieron realizar todas las operaciones solicitadas"
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr "%s: no hay información sobre tamaño para este dispositivo"
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, c-format
 msgid "invalid integer argument %s"
 msgstr "argumento entero inválido %s"
@@ -11694,25 +11815,30 @@ msgstr "      --help     muestra esta ayuda y finaliza\n"
 msgid "      --version  output version information and exit\n"
 msgstr "      --version  informa de la versión y finaliza\n"
 
-#: src/system.h:544
-#, fuzzy
+#: src/system.h:543
 msgid ""
 "\n"
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
+"\n"
 "Los argumentos obligatorios para las opciones largas son también "
 "obligatorios\n"
 "para las opciones cortas.\n"
 
-#: src/system.h:552
+#: src/system.h:551
+#, fuzzy
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
+"\n"
+"TAM es un entero y una unidad opcional (ejemplo: 10M es 10*1024*1024). Las\n"
+"unidades son K, M, G, T, P, E, Z, Y (potencias de 1024) o KB, MB, ...\n"
+"(potencias de 1000).\n"
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -11727,42 +11853,39 @@ msgstr ""
 "En caso contrario, las unidades son 1024 bytes (o 512 si se ha\n"
 "establecido POSIXLY_CORRECT).\n"
 
-# "We could, for instance, begin with cleaning up our language by no
-# longer calling a bug a bug but by calling it an error." 
-#
-# Edsger W. Dijkstra, "On the cruelty of really teaching computing science"
-#
-# http://www.cs.utexas.edu/users/EWD/transcriptions/EWD10xx/EWD1036.html
-#: src/system.h:571
+#: src/system.h:570
 #, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
+"%s online help: <%s>\n"
 msgstr ""
 "\n"
-"Comunicar errores en %s a %s\n"
+"ayuda en línea sobre %s: <%s>\n"
 
 # Ni idea de lo que puede ser %s
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr ""
-"Informe de errores de traducción %s a <http://translationproject.org/team/>\n"
+"Informe de errores de traducción en %s a <http://translationproject.org/team/"
+"es.html>\n"
 
-#: src/system.h:589
+# Nota: En este caso es importante usar apóstrofos como en el original,
+# pues es para escribirlo literalmente en la línea de órdenes.
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr ""
-"Para la documentación completa, ejecute: info coreutils `%s invocation'\n"
+"Para la documentación completa, ejecute: info coreutils '%s invocation'\n"
 
-#: src/system.h:596
-#, fuzzy, c-format
+#: src/system.h:591
+#, c-format
 msgid "Try '%s --help' for more information.\n"
-msgstr "Pruebe `%s --help' para más información.\n"
+msgstr "Pruebe '%s --help' para más información.\n"
 
 # "Esto quiere decir que seguramente el sistema..." tb
 # Eso sería "This means that almost certainly you have..." sv
@@ -11772,7 +11895,7 @@ msgstr "Pruebe `%s --help' para más información.\n"
 # seguridad esto se debe a que tiene un sistema de ficheros corrupto".
 # Pero... tb
 # Lo pensaré. sv
-#: src/system.h:628
+#: src/system.h:633
 #, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -11793,14 +11916,12 @@ msgid "Jay Lepreau"
 msgstr "Jay Lepreau"
 
 #: src/tac.c:137
-#, fuzzy
 msgid ""
 "Write each FILE to standard output, last line first.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
 "Escribe cada FICHERO en la salida estándar comenzando por la última línea\n"
-"Si no se especifica FICHERO o FICHERO es `-', lee la entrada estándar.\n"
-"\n"
+"Si no se especifica FICHERO o FICHERO es -, lee la entrada estándar.\n"
 
 #: src/tac.c:144
 msgid ""
@@ -11827,19 +11948,19 @@ msgid "record too large"
 msgstr "registro demasiado grande"
 
 #: src/tac.c:450
-#, fuzzy, c-format
+#, c-format
 msgid "failed to create temporary file in %s"
-msgstr "no se puede crear un fichero temporal en %s"
+msgstr "fallo al crear un fichero temporal en %s"
 
 #: src/tac.c:458
-#, fuzzy, c-format
+#, c-format
 msgid "failed to open %s for writing"
-msgstr "%s: fallo al abrir para escritura"
+msgstr "fallo al abrir %s para escritura"
 
 #: src/tac.c:475
-#, fuzzy, c-format
+#, c-format
 msgid "failed to rewind stream for %s"
-msgstr "fallo al conservar la fecha de %s"
+msgstr "fallo al rebobinar el flujo para %s"
 
 #: src/tac.c:511 src/tac.c:518
 #, c-format
@@ -11847,9 +11968,9 @@ msgid "%s: write error"
 msgstr "%s: error de escritura"
 
 #: src/tac.c:571
-#, fuzzy, c-format
+#, c-format
 msgid "failed to open %s for reading"
-msgstr "no se puede abrir %s para lectura"
+msgstr "fallo al abrir %s para lectura"
 
 # "la cadena" ¿de dónde sale eso? sv
 # Bueno, siempre he traducido array por cadena, cuando
@@ -11873,7 +11994,7 @@ msgid "Ian Lance Taylor"
 msgstr "Ian Lance Taylor"
 
 #: src/tail.c:262
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Print the last %d lines of each FILE to standard output.\n"
 "With more than one FILE, precede each with a header giving the file name.\n"
@@ -11881,48 +12002,41 @@ msgid ""
 msgstr ""
 "Muestra las últimas %d líneas de cada FICHERO en la salida estándar.\n"
 "Con más de un FICHERO, precede a cada grupo de líneas con una cabecera.\n"
-"Si no se especifica FICHERO o FICHERO es `-', lee la entrada estándar.\n"
-"\n"
+"Si no se especifica FICHERO o FICHERO es -, lee la entrada estándar.\n"
 
 #: src/tail.c:270
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
-"  -c, --bytes=K            muestra los últimos K bytes; alternativamente,\n"
-"                             use -c +K para mostrar los bytes que comienzan "
-"en\n"
+"  -c, --bytes=K            muestra los últimos K bytes; o utilice -c +K\n"
+"                             para mostrar los bytes que comienzan en\n"
 "                             el K-ésimo de cada fichero\n"
 
 #: src/tail.c:274
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 "  -f, --follow[={name|descriptor}] muestra a medida que el fichero crece;\n"
-"                             -f, --follow, y --follow=descriptor son\n"
-"                             equivalentes\n"
+"                                     sin opción significa 'descriptor'\n"
 "  -F                       lo mismo que --follow=name --retry\n"
 
-#: src/tail.c:281
+#: src/tail.c:280
 #, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
-"  -n, --lines=K            muestra las últimas K líneas en lugar de %d,\n"
+"  -n, --lines=K            muestra las últimas K líneas en lugar de %d;\n"
 "                             o use -n +K para mostrar líneas comenzando\n"
 "                             por la K-ésima\n"
 "      --max-unchanged-stats=N\n"
@@ -11930,45 +12044,38 @@ msgstr ""
 "                           cambiado de tamaño después de N (por omisión %d)\n"
 "                           iteraciones, para ver si ha sido borrado o\n"
 "                           renombrado (este es el caso usual para ficheros\n"
-"                           de registro que rotan). Con inotify, esta opción\n"
-"                           raramente es útil.\n"
+"                           de registro que rotan); con inotify, esta opción\n"
+"                           raramente es útil\n"
 
-#: src/tail.c:294
+#: src/tail.c:293
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 "      --pid=PID            con -f, termina después de que el ID del "
 "proceso,\n"
 "                             PID, muere\n"
 "  -q, --quiet, --silent    no presenta cabeceras para cada fichero\n"
-"      --retry              sigue intentando abrir un fichero incluso si es\n"
-"                             inaccesible cuando tail comienza o si se "
-"vuelve\n"
-"                             inaccesible más tarde; útil solamente si se "
-"sigue\n"
-"                             por nombre, es decir, con --follow=name\n"
+"      --retry              sigue intentando abrir el fichero si es "
+"inaccesible\n"
 
-#: src/tail.c:301
+#: src/tail.c:298
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 "  -s, --sleep-interval=N   con -f, espera aproximadamente N segundos entre\n"
-"                             iteraciones (por omisión 1.0).\n"
-"                             Con inotify y --pid=P, comprueba el proceso P "
+"                             iteraciones (por omisión 1.0);\n"
+"                             con inotify y --pid=P, comprueba el proceso P "
 "al\n"
-"                             menos una vez cada N segundos.\n"
+"                             menos una vez cada N segundos\n"
 "  -v, --verbose            presenta siempre las cabeceras para cada fichero\n"
 
-#: src/tail.c:310
-#, fuzzy
+#: src/tail.c:307
 msgid ""
 "\n"
 "If the first character of K (the number of bytes or lines) is a '+',\n"
@@ -11979,7 +12086,7 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Si el primer carácter de K (el número de bytes o líneas) es un `+',\n"
+"Si el primer carácter de K (el número de bytes o líneas) es un '+',\n"
 "comienza a mostrar en el elemento K-ésimo contando desde el principio\n"
 "de cada fichero, en otro caso, muestra los últimos N elementos del\n"
 "fichero.  N puede tener diferentes sufijos que indican un factor:\n"
@@ -11988,7 +12095,7 @@ msgstr ""
 "Y.\n"
 "\n"
 
-#: src/tail.c:319
+#: src/tail.c:316
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
 "means that even if a tail'ed file is renamed, tail will continue to track\n"
@@ -12009,166 +12116,176 @@ msgstr ""
 "borrado o recreado por algún otro programa.\n"
 
 # df=descriptor de fichero, por supuesto... sv
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr "cerrando %s (df=%d)"
 
-#: src/tail.c:453
-#, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr "%s: no se puede desplazar a la posición relativa %s"
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr "%s: no se puede desplazar a la posición relativa al final %s"
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr "no se puede determinar la localización de %s, se vuelve a `polling'"
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
 "reverting to polling"
 msgstr ""
+"tipo de sistema de ficheros 0x%08lx no reconocido para %s. Por favor informe "
+"de esto a %s. Se usará `polling' de nuevo"
 
-#: src/tail.c:963
+#: src/tail.c:965
+#, c-format
+msgid "%s has been replaced with a symbolic link. giving up on this name"
+msgstr ""
+"%s ha sido reemplazado por un enlace simbólico. abandono con este nombre"
+
+#: src/tail.c:980
 #, c-format
 msgid "%s has become inaccessible"
 msgstr "%s se ha vuelto inaccesible"
 
-#: src/tail.c:980
+#: src/tail.c:997
 #, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr ""
 "%s ha sido reemplazado por un fichero al que no se le puede hacer tail;\n"
 "abandono con este nombre"
 
-#: src/tail.c:989
+#: src/tail.c:1006
 #, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr ""
 "%s ha sido reemplazado por un fichero al que no se le puede hacer tail.\n"
 "abandono con este nombre"
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, c-format
 msgid "%s has become accessible"
 msgstr "%s se ha vuelto accesible"
 
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr "%s ha aparecido;  siguiendo el final del nuevo fichero"
 
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr "%s ha sido reemplazado;  siguiendo el final del nuevo fichero"
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr "%s: no se puede cambiar el modo `non-blocking'"
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr "%s: fichero truncado"
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr "no queda ningún fichero"
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, c-format
 msgid "cannot watch parent directory of %s"
 msgstr "no se puede vigilar el directorio padre de %s"
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, c-format
 msgid "inotify resources exhausted"
 msgstr "se han agotado los recursos `inotify'"
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, c-format
 msgid "cannot watch %s"
 msgstr "no se puede vigilar %s"
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr "error al monitorizar evento inotify"
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, c-format
 msgid "error reading inotify event"
 msgstr "error al leer evento inotify"
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr ""
 "%s: no se puede seguir el final de este tipo de fichero; abandono\n"
 "con este nombre"
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, c-format
 msgid "number in %s is too large"
 msgstr "el número en %s es demasiado grande"
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr "%s: número máximo de stats entre aperturas inválido"
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr "%s: PID inválido"
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr "%s: número de segundos inválido"
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr "opción utilizada en un contexto inválido -- %c"
 
-#: src/tail.c:2034
+# FIXME: "when following"? when following by what? sv
+#: src/tail.c:2096
+#, c-format
+msgid "warning: --retry ignored; --retry is useful only when following"
+msgstr ""
+"atención: se descarta --retry; --retry solamente es útil cuando se sigue"
+
+#: src/tail.c:2100
 #, c-format
-msgid "warning: --retry is useful mainly when following by name"
-msgstr "atención: --retry es útil principalmente cuando se sigue por nombre"
+msgid "warning: --retry only effective for the initial open"
+msgstr "atención: --retry solamente es efectivo para la apertura inicial"
 
 # FIXME: "when following"? when following by what? sv
-#: src/tail.c:2038
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
-msgstr "atención: PID descartado; --pid=PID solamente es útil cuando se sigue"
+msgstr "atención: se descarta PID; --pid=PID solamente es útil cuando se sigue"
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr "atención: no se admite --pid=PID en este sistema"
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, c-format
 msgid "cannot follow %s by name"
 msgstr "no se puede seguir %s por el nombre"
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr "atención: seguir la entrada estándar indefinidamente no es efectivo"
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr "no se puede usar `inotify', se vuelve a `polling'"
@@ -12469,9 +12586,8 @@ msgid "Matthew Bradburn"
 msgstr "Matthew Bradburn"
 
 #: src/test.c:858
-#, fuzzy
 msgid "missing ']'"
-msgstr "falta un `]'"
+msgstr "falta un ']'"
 
 #: src/test.c:872
 #, c-format
@@ -12479,21 +12595,21 @@ msgid "extra argument %s"
 msgstr "sobra el argumento %s"
 
 #: src/timeout.c:112
-#, fuzzy, c-format
+#, c-format
 msgid "warning: sigprocmask"
-msgstr "atención: timer_create"
+msgstr "atención: sigprocmask"
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr "atención: timer_settime"
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr "atención: timer_create"
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
@@ -12502,51 +12618,46 @@ msgstr ""
 "Modo de empleo: %s [OPCIÓN] DURACIÓN ORDEN [ARG]...\n"
 "       o bien:  %s [OPCIÓN]\n"
 
-#: src/timeout.c:229
-#, fuzzy
+#: src/timeout.c:232
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
-msgstr ""
-"Inicia ORDEN, y la termina si todavía funciona después de DURACIÓN.\n"
-"\n"
-"Los argumentos obligatorios para las opciones largas son también "
-"obligatorios\n"
-"para las opciones cortas.\n"
+msgstr "Inicia ORDEN, y la termina si todavía funciona después de DURACIÓN.\n"
 
-#: src/timeout.c:235
-#, fuzzy
+#: src/timeout.c:238
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
+"      --preserve-status\n"
+"                   sale con el mismo estado que ORDEN, incluso cuando la "
+"orden\n"
+"                   expira\n"
 "      --foreground\n"
-"                 Cuando no se ejecuta timeout directamente desde el shell,\n"
+"                 cuando no se ejecuta timeout directamente desde el shell,\n"
 "                   permite que ORDEN lea de la terminal y que reciba señales "
-"de ella.\n"
-"                   En este modo, los hijos de ORDEN no expirarán.\n"
+"de ella;\n"
+"                   en este modo, los hijos de ORDEN no expirarán\n"
 "  -k, --kill-after=DURACIÓN\n"
 "                   envía además la señal KILL si ORDEN todavía funciona\n"
 "                     pasada esta DURACIÓN después de que se envió la señal\n"
 "                     inicial\n"
 "  -s, --signal=SEÑAL\n"
 "                   especifica la señal que se enviará si el tiempo se acaba\n"
-"                   SEÑAL puede ser un nombre como `HUP' o un número.\n"
-"                   Véase `kill -l' para una lista de señales\n"
+"                     SEÑAL puede ser un nombre como 'HUP' o un número;\n"
+"                     véase 'kill -l' para una lista de señales\n"
 
-#: src/timeout.c:254
-#, fuzzy
+#: src/timeout.c:257
 msgid ""
 "\n"
 "DURATION is a floating point number with an optional suffix:\n"
@@ -12555,11 +12666,10 @@ msgid ""
 msgstr ""
 "\n"
 "DURACIÓN es un número de coma flotante con un sufijo opcional:\n"
-"`s' para segundos (por omisión), `m' para minutos, `h' para horas o\n"
-"`d' para días.\n"
+"'s' para segundos (por omisión), 'm' para minutos, 'h' para horas o\n"
+"'d' para días.\n"
 
-#: src/timeout.c:259
-#, fuzzy
+#: src/timeout.c:262
 msgid ""
 "\n"
 "If the command times out, and --preserve-status is not set, then exit with\n"
@@ -12570,28 +12680,28 @@ msgid ""
 "case the exit status is 128+9 rather than 124.\n"
 msgstr ""
 "\n"
-"Si la orden no termina, entonces sale con estado 124. En caso contrario,\n"
-"sale con el estado de ORDEN. Si no se especifica ninguna señal, envía la\n"
-"señal TERM. La señal TERM matará cualquier procesos que no bloquee o "
-"capture\n"
-"dicha señal. Para otros procesos, puede ser necesario usar la señal KILL "
-"(9),\n"
-"dado que esta señal no se puede capturar.\n"
+"Si la orden no termina, y no se ha establecido --preserve-status, entonces\n"
+"sale con estado 124. En caso contrario, sale con el estado de ORDEN.\n"
+"Si no se especifica ninguna señal, envía la señal TERM. La señal TERM\n"
+"matará cualquier procesos que no bloquee o capture dicha señal. Para\n"
+"otros procesos, puede ser necesario usar la señal KILL (9), dado que\n"
+"esta señal no se puede capturar.  Si se envía la señal KILL (9), el\n"
+"estado de salida es 128+9 en lugar de 124.\n"
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr "atención: la desactivación de volcados de core ha fallado"
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, c-format
 msgid "error waiting for command"
 msgstr "error esperando a la orden"
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
-msgstr ""
+msgstr "la orden monitorizada ha volcado un 'core'"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/touch.c:43
@@ -12619,7 +12729,6 @@ msgid "setting times of %s"
 msgstr "estableciendo la fecha de %s"
 
 #: src/touch.c:213
-#, fuzzy
 msgid ""
 "Update the access and modification times of each FILE to the current time.\n"
 "\n"
@@ -12680,7 +12789,6 @@ msgstr ""
 "  -m                     cambia solamente la fecha de modificación\n"
 
 #: src/touch.c:237
-#, fuzzy
 msgid ""
 "  -r, --reference=FILE   use this file's times instead of current time\n"
 "  -t STAMP               use [[CC]YY]MMDDhhmm[.ss] instead of current time\n"
@@ -12694,7 +12802,7 @@ msgstr ""
 "  -t FECHA                utiliza [[SS]AA]MMDDhhmm[.ss] en lugar de la "
 "fecha\n"
 "                          actual\n"
-"  --time=PALABRA          establece la fecha dada por PALABRA:\n"
+"      --time=PALABRA      establece la fecha dada por PALABRA:\n"
 "                            PALABRA es access, atime o use: equivale a -a\n"
 "                            PALABRA es modify o mtime: equivale a -m\n"
 
@@ -12715,11 +12823,11 @@ msgid "cannot specify times from more than one source"
 msgstr "no se puede especificar la fecha de dos formas distintas"
 
 #: src/touch.c:409
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'"
 msgstr ""
-"atención `touch %s' está obsoleto; use `touch -t %04ld%02d%02d%02d%02d.%02d'"
+"atención 'touch %s' está obsoleto; use 'touch -t %04ld%02d%02d%02d%02d.%02d'"
 
 #: src/tr.c:286
 #, c-format
@@ -12869,9 +12977,9 @@ msgstr ""
 "transportable"
 
 #: src/tr.c:673
-#, fuzzy, c-format
+#, c-format
 msgid "range-endpoints of '%s-%s' are in reverse collating sequence order"
-msgstr "los extremos del rango en `%s-%s' están en orden inverso"
+msgstr "los extremos del rango en '%s-%s' están en orden inverso"
 
 # También necesito aquí ayuda em
 # Yo creo que queda bien. ipg
@@ -12881,14 +12989,14 @@ msgid "invalid repeat count %s in [c*n] construct"
 msgstr "número de repeticiones %s inválido en la especificación [c*n]"
 
 #: src/tr.c:910
-#, fuzzy, c-format
+#, c-format
 msgid "missing character class name '[::]'"
-msgstr "falta el nombre de la clase de caracteres `[::]'"
+msgstr "falta el nombre de la clase de caracteres '[::]'"
 
 #: src/tr.c:913
-#, fuzzy, c-format
+#, c-format
 msgid "missing equivalence class character '[==]'"
-msgstr "falta el carácter de clase de equivalencia `[==]'"
+msgstr "falta el carácter de clase de equivalencia '[==]'"
 
 #: src/tr.c:928
 #, c-format
@@ -12936,7 +13044,7 @@ msgid "[=c=] expressions may not appear in string2 when translating"
 msgstr "las expresiones [=c=] no pueden aparecer en cadena2 al traducir"
 
 #: src/tr.c:1505
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "when translating, the only character classes that may appear in\n"
 "string2 are 'upper' and 'lower'"
@@ -13002,7 +13110,6 @@ msgid "Usage: %s OPTION... FILE...\n"
 msgstr "Modo de empleo: %s OPCIÓN... FICHERO...\n"
 
 #: src/truncate.c:97
-#, fuzzy
 msgid ""
 "Shrink or extend the size of each FILE to the specified size\n"
 "\n"
@@ -13021,7 +13128,6 @@ msgstr ""
 "pierden. Si un FICHERO es más pequeño, se extiende y la parte extendida "
 "(hueco)\n"
 "se lee como bytes cero.\n"
-"\n"
 
 #: src/truncate.c:109
 msgid "  -c, --no-create        do not create any files\n"
@@ -13038,14 +13144,13 @@ msgstr ""
 #: src/truncate.c:115
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 "  -r, --reference=FICHERO_R  base el tamaño en FICHERO_R\n"
 "  -s, --size=TAMAÑO          establece o ajusta el tamaño del fichero en "
-"TAMAÑO\n"
+"TAMAÑO bytes\n"
 
 #: src/truncate.c:121
-#, fuzzy
 msgid ""
 "\n"
 "SIZE may also be prefixed by one of the following modifying characters:\n"
@@ -13056,8 +13161,8 @@ msgstr ""
 "TAMAÑO también puede estar precedido por uno de los siguientes caracteres\n"
 "modificadores:\n"
 "\n"
-"`+' extender por, `-' reducir por, `<' como mucho, `>' como mínimo,\n"
-"`/' redondeo hacia abajo al múltiplo de, `%' redondeo hacia arriba al\n"
+"'+' extender por, '-' reducir por, '<' como mucho, '>' como mínimo,\n"
+"'/' redondeo hacia abajo al múltiplo de, '%' redondeo hacia arriba al\n"
 "múltiplo de\n"
 
 #: src/truncate.c:149
@@ -13136,12 +13241,12 @@ msgstr ""
 "estándar.\n"
 "\n"
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr "%s: la entrada contiene un número impar de elementos"
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr "%s: la entrada contiene un bucle:"
@@ -13242,7 +13347,6 @@ msgid "cannot get system name"
 msgstr "no se puede obtener el nombre del sistema"
 
 #: src/unexpand.c:117
-#, fuzzy
 msgid ""
 "Convert blanks in each FILE to tabs, writing to standard output.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -13277,13 +13381,12 @@ msgstr "las tabulaciones están demasiado separadas"
 msgid "tab stop value is too large"
 msgstr "la parada de tabulación es demasiado grande"
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr "Modo de empleo: %s [OPCIÓN]... [ENTRADA [SALIDA]]\n"
 
-#: src/uniq.c:138
-#, fuzzy
+#: src/uniq.c:174
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
 "writing to OUTPUT (or standard output).\n"
@@ -13296,32 +13399,51 @@ msgstr ""
 "Si no se da ninguna opción, las líneas coincidentes se combinan en la "
 "primera\n"
 "aparición.\n"
-"\n"
 
-#: src/uniq.c:147
+#: src/uniq.c:183
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
 msgstr ""
 "  -c, --count           precede a las líneas con el número de ocurrencias\n"
-"  -d, --repeated        muestra sólo las líneas duplicadas\n"
+"  -d, --repeated        muestra sólo las líneas duplicadas, una por cada "
+"grupo\n"
+
+#: src/uniq.c:187
+msgid ""
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
+msgstr ""
+"  -D, --all-repeated[=MÉTODO]  muestra todas las líneas duplicadas\n"
+"                          los grupos se pueden delimitar con una línea en "
+"blanco\n"
+"                          MÉTODO={none(predeterminado),prepend,separate}\n"
 
-#: src/uniq.c:151
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr ""
+"  -f, --skip-fields=N   pasa por alto la comparación de los primeros N "
+"campos\n"
+
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
+msgstr ""
+"      --group[=MÉTODO]  muestra todos los elementos, separando grupos con "
+"una línea vacía\n"
+"                          MÉTODO={separate(predeterminado),prepend,append,"
+"both}\n"
+
+#: src/uniq.c:199
+#, fuzzy
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
 "  -i, --ignore-case     ignore differences in case when comparing\n"
 "  -s, --skip-chars=N    avoid comparing the first N characters\n"
 "  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
 msgstr ""
-"  -D, --all-repeated[=método]  muestra todas las líneas duplicadas\n"
-"                        método={none(predeterminado),prepend,separate}\n"
-"                        La delimitación se hace con líneas en blanco.\n"
-"  -f, --skip-fields=N   pasa por alto la comparación de los primeros N "
-"campos\n"
 "  -i, --ignore-case     pasa por alto las diferencias entra mayúsculas y\n"
 "                        minúsculas\n"
 "  -s, --skip-chars=N    pasa por alto la comparación de los primeros N\n"
@@ -13329,12 +13451,12 @@ msgstr ""
 "  -u, --unique          muestra sólo las líneas que son únicas\n"
 "  -z, --zero-terminated  termina las líneas con un byte 0, no nueva línea\n"
 
-#: src/uniq.c:161
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr ""
 "  -w, --check-chars=N   sólo compara los primeros N caracteres de la línea\n"
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 msgid ""
 "\n"
 "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n"
@@ -13345,8 +13467,7 @@ msgstr ""
 "de\n"
 "caracteres no blancos. Los campos se descartan antes que los caracteres.\n"
 
-#: src/uniq.c:171
-#, fuzzy
+#: src/uniq.c:217
 msgid ""
 "\n"
 "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n"
@@ -13354,28 +13475,38 @@ msgid ""
 "Also, comparisons honor the rules specified by 'LC_COLLATE'.\n"
 msgstr ""
 "\n"
-"Nota: `uniq' no detecta líneas repetidas a menos que sean adyacentes.\n"
-"Puede que quiera ordenar la entrada primero, o usar `sort -u' sin `uniq'.\n"
-"Además, las comparaciones siguen las reglas especificadas por `LC_COLLATE'.\n"
+"Nota: 'uniq' no detecta líneas repetidas a menos que sean adyacentes.\n"
+"Puede que quiera ordenar la entrada primero, o usar 'sort -u' sin 'uniq'.\n"
+"Además, las comparaciones siguen las reglas especificadas por 'LC_COLLATE'.\n"
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, c-format
 msgid "too many repeated lines"
 msgstr "demasiadas líneas repetidas"
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
 msgstr "el número de campos que se deben saltar es inválido"
 
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
 msgstr "el número de bytes que se deben saltar es inválido"
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
 msgstr "el número de bytes que hay que comparar es inválido"
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr "--group es mutuamente excluyente con -c/-d/-D/-u"
+
+#: src/uniq.c:652
+#, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr "agrupar y mostrar los contadores de repetición no tiene sentido"
+
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr ""
@@ -13399,24 +13530,6 @@ msgstr ""
 "Llama a la función unlink para borrar el FICHERO especificado.\n"
 "\n"
 
-# Otra posibilidad sería "no se puede borrar el enlace `%s'".
-# Mirarlo con calma. sv
-#
-# recordatorio: un fichero es _siempre_ un nodo-i que es enlazado por
-# entrada/s en directorios, cuando se desenlaza el último enlace que une una
-# entrada de directorio con el fichero, entonces y sólo entonces se borra
-# físicamente.... uac
-#
-# Lo sé, lo sé.
-# En este caso habría que investigar las causas por las que no se puede
-# deshacer el tal enlace. Habrá que buscar al menos un ejemplo en el que
-# aparezca este mensaje. sv
-#
-#: src/unlink.c:86
-#, c-format
-msgid "cannot unlink %s"
-msgstr "no se puede deshacer el enlace %s"
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -13445,9 +13558,9 @@ msgstr[0] "arriba %ld día %2d:%02d,  "
 msgstr[1] "arriba %ld días %2d:%02d,  "
 
 #: src/uptime.c:149
-#, fuzzy, c-format
+#, c-format
 msgid "up  %2d:%02d,  "
-msgstr "arriba %ld día %2d:%02d,  "
+msgstr "arriba %2d:%02d,  "
 
 #: src/uptime.c:151
 #, c-format
@@ -13461,7 +13574,7 @@ msgstr[1] "%lu usuarios"
 msgid ",  load average: %.2f"
 msgstr ",  carga promedio: %.2f"
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -13473,7 +13586,7 @@ msgstr ""
 "el número de usuarios en el sistema, y el número medio de trabajos\n"
 "en la cola de ejecución en los últimos 1, 5 y 15 minutos."
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
@@ -13482,13 +13595,13 @@ msgstr ""
 "  Los procesos que están en un estado de sueño no interrumpible también\n"
 "contribuyen a la carga del sistema.\n"
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr "\n"
 
 # Nota: El primer %s era /etc/utmp y el segundo /etc/wtmp.
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
@@ -13729,7 +13842,7 @@ msgstr ""
 "      --writable    igual que -T\n"
 
 #: src/who.c:673
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
@@ -13738,7 +13851,7 @@ msgstr ""
 "\n"
 "Si no se especifica ningún FICHERO, se utiliza %s. Habitualmente,\n"
 "FICHERO es %s. Si se dan ARG1 y ARG2, se supone -m: habitualmente\n"
-"`am i' o `mom likes'.\n"
+"'am i' o 'mom likes'.\n"
 
 #: src/whoami.c:45
 msgid ""
@@ -13781,2369 +13894,10 @@ msgstr ""
 # Si no hay oportunidad de escribir "sí", para que salga una tira de
 # eses, mejor olvidarse. sv
 #: src/yes.c:47
-#, fuzzy
 msgid ""
 "Repeatedly output a line with all specified STRING(s), or 'y'.\n"
 "\n"
 msgstr ""
 "Muestra repetidamente una línea con todas las CADENA(s) especificadas, o "
-"`y'.\n"
+"'y'.\n"
 "\n"
-
-#~ msgid "using single-precision arithmetic"
-#~ msgstr "se usa aritmética de simple precisión"
-
-#~ msgid "using arbitrary-precision arithmetic"
-#~ msgstr "se usa aritmética de precisión arbitraria"
-
-#, fuzzy
-#~ msgid "  returning value: '%s'\n"
-#~ msgstr "creando fichero %s\n"
-
-#, fuzzy
-#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n"
-#~ msgstr "Modo de empleo: %s [OPCIÓN] NOMBRE...\n"
-
-#, fuzzy
-#~ msgid "no valid suffix found\n"
-#~ msgstr "%s: longitud del sufijo inválida"
-
-#~ msgid ""
-#~ "\n"
-#~ "Examples:\n"
-#~ "  %s /usr/bin/sort       Output \"sort\".\n"
-#~ "  %s include/stdio.h .h  Output \"stdio\".\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Ejemplos:\n"
-#~ "  %s /usr/bin/sort       Salida \"sort\".\n"
-#~ "  %s include/stdio.h .h  Salida \"stdio\".\n"
-
-#~ msgid "reading %s"
-#~ msgstr "leyendo %s"
-
-#~ msgid "writing %s"
-#~ msgstr "escribiendo %s"
-
-#~ msgid "closing %s"
-#~ msgstr "cerrando %s"
-
-#~ msgid "accessing %s"
-#~ msgstr "accediendo a %s"
-
-#~ msgid "opening %s"
-#~ msgstr "abriendo %s"
-
-#~ msgid ""
-#~ "Usage: %s NAME\n"
-#~ "  or:  %s OPTION\n"
-#~ msgstr ""
-#~ "Modo de empleo: %s NOMBRE\n"
-#~ "       o bien:  %s OPCIÓN\n"
-
-#~ msgid ""
-#~ "  -x, --one-file-system    skip directories on different file systems\n"
-#~ "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
-#~ "      --exclude=PATTERN    exclude files that match PATTERN\n"
-#~ "  -d, --max-depth=N     print the total for a directory (or file, with --"
-#~ "all)\n"
-#~ "                          only if it is N or fewer levels below the "
-#~ "command\n"
-#~ "                          line argument;  --max-depth=0 is the same as\n"
-#~ "                          --summarize\n"
-#~ msgstr ""
-#~ "  -x, --one-file-system  se salta los directorios de otros sistemas de "
-#~ "ficheros\n"
-#~ "  -X, --exclude-from=FICH  excluye los ficheros que coinciden con\n"
-#~ "                                cualquier patrón en FICH.\n"
-#~ "      --exclude=PATRÓN  excluye los ficheros que coinciden con PATRÓN.\n"
-#~ "  -d, --max-depth=N     muestra el total para un directorio (o fichero,\n"
-#~ "                        con --all) solamente si está N o menos niveles "
-#~ "por\n"
-#~ "                        debajo del argumento de la línea de órdenes;\n"
-#~ "                        --max-depth=0 es lo mismo que --summarize\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "  none, off       never make backups (even if --backup is given)\n"
-#~ "  numbered, t     make numbered backups\n"
-#~ "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
-#~ "  simple, never   always make simple backups\n"
-#~ "\n"
-#~ msgstr ""
-#~ "  none, off       nunca realiza copias de seguridad (incluso si se da la\n"
-#~ "                  opción --backup)\n"
-#~ "  numbered, t     crea copias de seguridad numeradas\n"
-#~ "  existing, nil   numeradas si existen copias de seguridad numeradas,\n"
-#~ "                  simples en caso contrario\n"
-#~ "  simple, never   siempre crea copias de seguridad simples\n"
-
-#~ msgid ""
-#~ "WARNING: --page-increment is deprecated; use --line-increment instead"
-#~ msgstr ""
-#~ "ATENCIÓN: --page-increment está obsoleto, utilice --line-increment en\n"
-#~ "su lugar"
-
-#~ msgid "All arguments to long options are mandatory for short options.\n"
-#~ msgstr ""
-#~ "Todos los argumentos para las opciones largas son obligatorios para las\n"
-#~ "opciones cortas.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "RADIX is d for decimal, o for octal, x for hexadecimal or n for none.\n"
-#~ "BYTES is hexadecimal with 0x or 0X prefix, and may have a multiplier "
-#~ "suffix:\n"
-#~ "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
-#~ "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n"
-#~ "Adding a z suffix to any type displays printable characters at the end of "
-#~ "each\n"
-#~ "output line.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "BASE es d para decimal, o para octal, x para hexadecimal o n para "
-#~ "ninguna.\n"
-#~ "BYTES es hexadecimal con 0x ó 0X como prefijo, y puede tener un sufijo\n"
-#~ "multiplicativo:\n"
-#~ "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
-#~ "GB 1000*1000*1000, G 1024*1024*1024, y así sucesivamente para T, P, E, Z, "
-#~ "Y.\n"
-#~ "Si se añade el sufijo z a cualquier tipo, se añade un visor de "
-#~ "caracteres\n"
-#~ "imprimibles al final de cada línea del resultado.\n"
-
-#~ msgid ""
-#~ "Option --string without a number implies 3; option --width without a "
-#~ "number\n"
-#~ "implies 32.  By default, od uses -A o -t oS -w16.\n"
-#~ msgstr ""
-#~ "La opción --string sin ningún número implica 3. la opción --width sin "
-#~ "ningún\n"
-#~ "número implica 32.  Por omisión, od usa -A o -t oS -w16.\n"
-
-#~ msgid "Usage: %s [OPTION]... FILE\n"
-#~ msgstr "Modo de empleo: %s [OPCIÓN]... FICHERO\n"
-
-#~ msgid "Password:"
-#~ msgstr "Contraseña:"
-
-#~ msgid "getpass: cannot open /dev/tty"
-#~ msgstr "getpass: no se puede abrir /dev/tty"
-
-# Aquí habla de "groups", en plural. No se pueden establecer los
-# grupos. gerardo
-# Cierto, eso es literalmente, pero: ¿"su" puede cambiar a varios grupos
-# o a uno cada vez? sv
-#~ msgid "cannot set groups"
-#~ msgstr "no se puede establecer el grupo"
-
-#~ msgid "cannot set group id"
-#~ msgstr "no se puede establecer el id del grupo"
-
-#~ msgid "cannot set user id"
-#~ msgstr "no se puede establecer el id del usuario"
-
-#~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n"
-#~ msgstr "Modo de empleo: %s [OPCIÓN]... [-] [USUARIO [ARG]...]\n"
-
-# login shell no lo traduciría em+
-# Caparazón de entrada. Bueno, vale, `shell' de entrada. gerardo
-# Si acaso shell de inicio. Pero sólo si acaso. sv
-#~ msgid ""
-#~ "Change the effective user id and group id to that of USER.\n"
-#~ "\n"
-#~ "  -, -l, --login               make the shell a login shell\n"
-#~ "  -c, --command=COMMAND        pass a single COMMAND to the shell with -"
-#~ "c\n"
-#~ "  -f, --fast                   pass -f to the shell (for csh or tcsh)\n"
-#~ "  -m, --preserve-environment   do not reset environment variables\n"
-#~ "  -p                           same as -m\n"
-#~ "  -s, --shell=SHELL            run SHELL if /etc/shells allows it\n"
-#~ msgstr ""
-#~ "Cambia el identificador efectivo de usuario y de grupo al del USUARIO.\n"
-#~ "\n"
-#~ "  -, -l, --login               hace al shell un shell de `login'\n"
-#~ "  -c, --command=ORDEN          pasa una sola ORDEN al shell con -c\n"
-#~ "  -f, --fast                   pasa -f al shell (para csh o tcsh)\n"
-#~ "  -m, --preserve-environment   no borra las variables de entorno\n"
-#~ "  -p                           igual que -m\n"
-#~ "  -s, --shell=SHELL            ejecuta SHELL si /etc/shells lo permite\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "A mere - implies -l.   If USER not given, assume root.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Un simple - implica -l. Si no se da el USUARIO, se supone root.\n"
-
-#~ msgid "user %s does not exist"
-#~ msgstr "el usuario %s no existe"
-
-#~ msgid "incorrect password"
-#~ msgstr "contraseña incorrecta"
-
-#~ msgid "using restricted shell %s"
-#~ msgstr "usando el shell restringido %s"
-
-#~ msgid "warning: cannot change directory to %s"
-#~ msgstr "atención: no se puede cambiar al directorio %s"
-
-#, fuzzy
-#~ msgid ""
-#~ "Change the group of each FILE to GROUP.\n"
-#~ "With --reference, change the group of each FILE to that of RFILE.\n"
-#~ "\n"
-#~ "  -c, --changes          like verbose but report only when a change is "
-#~ "made\n"
-#~ "  -f, --silent, --quiet  suppress most error messages\n"
-#~ "  -v, --verbose          output a diagnostic for every file processed\n"
-#~ msgstr ""
-#~ "Cambia el grupo de cada FICHERO a GRUPO.\n"
-#~ "Con --reference, cambia el grupo de cada FICHERO al de FICHERO-R.\n"
-#~ "\n"
-#~ "  -c, --changes          como `verbose' pero informa sólo de los cambios\n"
-#~ "\n"
-#~ "\n"
-#~ "      --dereference      afecta al referente de cada enlace simbólico "
-#~ "(por\n"
-#~ "                           omisión), en lugar de al propio enlace "
-#~ "simbólico\n"
-
-#~ msgid ""
-#~ "      --no-preserve-root  do not treat `/' specially (the default)\n"
-#~ "      --preserve-root     fail to operate recursively on `/'\n"
-#~ msgstr ""
-#~ "      --no-preserve-root  no trata `/' de forma especial "
-#~ "(predeterminado)\n"
-#~ "      --preserve-root     no opera recursivamente sobre `/'\n"
-
-# He traducido "diagnostic" por "mensaje". ¿Alguna idea mejor?
-# `diagnóstico' ... ¿no? ipg
-#
-# Rotundamente no. En español esa palabra solamente se usa en el
-# ámbito médico. "a nivel de hospitales" :-) sv
-#
-# pero en este caso, queda mejor (a mi parecer) `mensaje' ipg
-#
-# Menos mal :-) sv
-#
-# Y a mí que no me gusta `mensaje'... pero no encuentro alternativa. Quizá
-# `muestra lo realizado para/con/sobre cada fichero' tb
-#
-# Aunque prefiero mensaje, dejaré aquí tu sugerencia.
-# (Creo que es la mejor que me han hecho al respecto). sv
-#
-# sugiero que se especificara qué tipo de mensaje se muestra ya que un
-# "diagnostic" no es un mensaje cualquiera... uac
-#
-# Bueno, en este caso, por el contexto creo que no hace falta ser más
-# explícito, si dice "muestra un mensaje" y la opción se llama "verbose",
-# está claro que no es un mensaje de correo electrónico. sv
-#~ msgid ""
-#~ "  -f, --silent, --quiet  suppress most error messages\n"
-#~ "      --reference=RFILE  use RFILE's group rather than specifying a\n"
-#~ "                         GROUP value\n"
-#~ "  -R, --recursive        operate on files and directories recursively\n"
-#~ "  -v, --verbose          output a diagnostic for every file processed\n"
-#~ "\n"
-#~ msgstr ""
-#~ "  -f, --silent, --quiet  suprime la mayoría de los mensajes de error\n"
-#~ "      --reference=FICH_R utiliza el grupo de FICH_R en lugar de "
-#~ "especificar\n"
-#~ "                         un valor para GRUPO\n"
-#~ "  -R, --recursive        opera sobre ficheros y directorios "
-#~ "recursivamente\n"
-#~ "  -v, --verbose          muestra un mensaje por cada fichero procesado\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Change the mode of each FILE to MODE.\n"
-#~ "\n"
-#~ "  -c, --changes           like verbose but report only when a change is "
-#~ "made\n"
-#~ msgstr ""
-#~ "Cambia el modo de cada FICHERO a MODO.\n"
-#~ "\n"
-#~ "  -c, --changes           como `verbose' pero sólo informa de los "
-#~ "cambios\n"
-
-#~ msgid ""
-#~ "  -f, --silent, --quiet   suppress most error messages\n"
-#~ "  -v, --verbose           output a diagnostic for every file processed\n"
-#~ "      --reference=RFILE   use RFILE's mode instead of MODE values\n"
-#~ "  -R, --recursive         change files and directories recursively\n"
-#~ msgstr ""
-#~ "  -f, --silent, --quiet   suprime la mayoría de los mensajes de error\n"
-#~ "  -v, --verbose           muestra un mensaje por cada fichero procesado\n"
-#~ "      --reference=FICH_R  utiliza el modo de FICH_R en lugar del valor "
-#~ "MODO\n"
-#~ "  -R, --recursive         cambia ficheros y directorios recursivamente\n"
-
-# La línea del "verbose", "da detalles de lo que va haciendo" es
-# realmente sosa, ¿alguna sugerencia que la mejore?
-# (¿o quizá no hay mucho que mejorar?)
-#
-# Opera verbosamente (ya sé que es pero ... pero es lo que se
-# me ocurrió a mí) :) ipg
-#
-# Con sinceridad, "verbosamente" me parece un "palabro". sv
-#
-# ¿Y "muestra en detalle los cambios" ? em
-#
-# Eso tiene el problema siguiente: "Lo que va haciendo" puede ser
-# cambiar unas cosas sí y otras no. No son sólo los cambios. sv
-#
-# ¿más sugerencias? sv+
-# "muestra mensajes sólo cuando hay algún cambio" tb
-# Vale. Aceptado. Es casi igual pero un poquito mejor. sv
-#
-#~ msgid ""
-#~ "Change the owner and/or group of each FILE to OWNER and/or GROUP.\n"
-#~ "With --reference, change the owner and group of each FILE to those of "
-#~ "RFILE.\n"
-#~ "\n"
-#~ "  -c, --changes          like verbose but report only when a change is "
-#~ "made\n"
-#~ "      --dereference      affect the referent of each symbolic link (this "
-#~ "is\n"
-#~ "                         the default), rather than the symbolic link "
-#~ "itself\n"
-#~ msgstr ""
-#~ "Cambia el propietario y/o grupo de cada FICHERO a PROPIETARIO y/o GRUPO.\n"
-#~ "Con --reference, cambia el propietario y el grupo de cada FICHERO a los\n"
-#~ "que tenga FICHERO-R.\n"
-#~ "\n"
-#~ "  -c, --changes          como verbose pero informa solamente cuando se "
-#~ "efectúa\n"
-#~ "                         un cambio\n"
-#~ "      --dereference      afecta al referente al que apunta cada enlace\n"
-#~ "                         simbólico (por omisión), en vez de al propio\n"
-#~ "                         enlace simbólico\n"
-
-#~ msgid ""
-#~ "  -f, --silent, --quiet  suppress most error messages\n"
-#~ "      --reference=RFILE  use RFILE's owner and group rather than\n"
-#~ "                         specifying OWNER:GROUP values\n"
-#~ "  -R, --recursive        operate on files and directories recursively\n"
-#~ "  -v, --verbose          output a diagnostic for every file processed\n"
-#~ "\n"
-#~ msgstr ""
-#~ "  -f, --silent, --quiet  suprime la mayoría de los mensajes de error\n"
-#~ "      --reference=FICH_R utiliza el propietario y el grupo de FICH_R en "
-#~ "lugar\n"
-#~ "                         de especificar valores PROPIETARIO:GRUPO\n"
-#~ "  -R, --recursive        opera sobre ficheros y directorios "
-#~ "recursivamente\n"
-#~ "  -v, --verbose          muestra un mensaje por cada fichero procesado\n"
-
-# UTC = Tiempo Universal Coordinado, antiguo GMT (Greenwich Mean Time,
-# Hora Media de Greenwich). gerardo
-#~ msgid ""
-#~ "Display the current time in the given FORMAT, or set the system date.\n"
-#~ "\n"
-#~ "  -d, --date=STRING         display time described by STRING, not `now'\n"
-#~ "  -f, --file=DATEFILE       like --date once for each line of DATEFILE\n"
-#~ msgstr ""
-#~ "Muestra la hora actual en el FORMATO dado, o establece la fecha del "
-#~ "sistema.\n"
-#~ "\n"
-#~ "  -d, --date=CADENA         muestra la hora descrita por CADENA, no "
-#~ "`now'\n"
-#~ "  -f, --file=FICHERO_FECHA  igual que --date por cada línea de "
-#~ "FICHERO_FECHA\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "SIZE may be (or may be an integer optionally followed by) one of "
-#~ "following:\n"
-#~ "KB 1000, K 1024, MB 1000*1000, M 1024*1024, and so on for G, T, P, E, Z, "
-#~ "Y.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "TAMAÑO puede ser (o puede ser un entero seguido opcionalmente por) uno\n"
-#~ "de los siguientes:\n"
-#~ "\n"
-#~ "KB 1000, K 1024, MB 1000*1000, M 1024*1024, y así sucesivamente para G, "
-#~ "T, P,\n"
-#~ "E, Z, Y.\n"
-
-#~ msgid "cannot create link %s"
-#~ msgstr "no se puede crear el enlace %s"
-
-#~ msgid ""
-#~ "WARNING: --preserve_context is deprecated; use --preserve-context instead"
-#~ msgstr ""
-#~ "ATENCIÓN: --preserve_context está obsoleto, utilice --preserve-context "
-#~ "en\n"
-#~ "su lugar"
-
-#~ msgid "truncating %s"
-#~ msgstr "se trunca %s"
-
-#~ msgid ""
-#~ "  nocreat   do not create the output file\n"
-#~ "  excl      fail if the output file already exists\n"
-#~ "  notrunc   do not truncate the output file\n"
-#~ "  ucase     change lower case to upper case\n"
-#~ "  swab      swap every pair of input bytes\n"
-#~ msgstr ""
-#~ "  nocreat   no crea el fichero de salida\n"
-#~ "  excl      falla si el fichero de salida ya existe\n"
-#~ "  notrunc   no trunca el fichero de salida\n"
-#~ "  ucase     cambia las minúsculas a mayúsculas\n"
-#~ "  swab      intercambia cada pareja de bytes de entrada\n"
-
-#~ msgid "Filesystem        "
-#~ msgstr "S.ficheros        "
-
-#~ msgid "    Inodes   IUsed   IFree IUse%"
-#~ msgstr "   Nodos-i NUsados NLibres NUso%"
-
-#~ msgid "    Size  Used Avail Use%"
-#~ msgstr "  Tamaño Usado  Disp Uso%"
-
-#~ msgid "     Size   Used  Avail Use%"
-#~ msgstr "   Tamaño  Usado   Disp Uso%"
-
-# Nota: %-4s es para que justifique a la izquierda.
-# El espacio inicial es necesario para que la palabra Bloques no aparezca
-# pegada a la palabra Tipo cuando se usa df -T.
-#~ msgid " %s-blocks      Used Available Capacity"
-#~ msgstr " Bloques de %-s Usado  Disponible  Ocupado"
-
-#~ msgid " %4s-blocks      Used Available Use%%"
-#~ msgstr " Bloques de %-4s Usado    Dispon Uso%%"
-
-#~ msgid "invalid number of lines: 0"
-#~ msgstr "número de líneas inválido: 0"
-
-#~ msgid "invalid format precision"
-#~ msgstr "formato de precisión inválido"
-
-# FIXME: Me lo explique.
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#~ msgid "creating symbolic link %s"
-#~ msgstr "creando el enlace simbólico %s"
-
-#~ msgid "creating symbolic link %s -> %s"
-#~ msgstr "creando el enlace simbólico %s -> %s"
-
-#~ msgid "creating hard link %s"
-#~ msgstr "creando el enlace duro %s"
-
-#~ msgid "creating hard link %s => %s"
-#~ msgstr "creando el enlace duro %s => %s"
-
-#~ msgid "extra operand %s\n"
-#~ msgstr "operando extra %s\n"
-
-#~ msgid "both SI and IEC prefixes present on units"
-#~ msgstr "se han utilizado tanto prefijos SI como ICE en las unidades"
-
-#~ msgid ""
-#~ "the --context (-Z) option is obsolete and will be removed\n"
-#~ "in a future release"
-#~ msgstr ""
-#~ "la opción --context (-Z) está obsoleta y desaparecerá en una futura "
-#~ "versión"
-
-#~ msgid "warning: the --%s option is obsolete; use --reference"
-#~ msgstr "la opción `--%s' está obsoleta; utilice --reference"
-
-#~ msgid ""
-#~ "\n"
-#~ "Note that the -r and -s options are mutually exclusive.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Note que las opciones -r y -s son mutuamente excluyentes.\n"
-
-#~ msgid ""
-#~ "  -w, --wrap=COLS       Wrap encoded lines after COLS character (default "
-#~ "76).\n"
-#~ "                        Use 0 to disable line wrapping.\n"
-#~ "\n"
-#~ "  -d, --decode          Decode data.\n"
-#~ "  -i, --ignore-garbage  When decoding, ignore non-alphabet characters.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "  -w, --wrap=COLS       Cambia de línea tras el carácter COLS (por "
-#~ "omisión 76)\n"
-#~ "                        Utilice 0 para desabilitar esta opción.\n"
-#~ "  -d, --decode          Descodifica los datos.\n"
-#~ "  -i, --ignore-garbage  Cuando se descodifica, descarta los caracteres "
-#~ "no\n"
-#~ "                        alfabéticos\n"
-
-#~ msgid ""
-#~ "Usage: %s [OPTION] NUMBER[SUFFIX] COMMAND [ARG]...\n"
-#~ "  or:  %s [OPTION]\n"
-#~ msgstr ""
-#~ "Modo de empleo: %s [OPCIÓN] NÚMERO[SUFIJO] ORDEN [ARGUMENTO]...\n"
-#~ "       o bien:  %s [OPCIÓN]\n"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: opción ilegal -- %c\n"
-
-#~ msgid ""
-#~ "      --help            Display this help and exit.\n"
-#~ "      --version         Output version information and exit.\n"
-#~ msgstr ""
-#~ "      --help            Muestra esta ayuda y finaliza.\n"
-#~ "      --version         Informa de la versión y finaliza\n"
-
-#~ msgid ""
-#~ "With --follow (-f), tail defaults to following the file descriptor, "
-#~ "which\n"
-#~ "means that even if a tail'ed file is renamed, tail will continue to "
-#~ "track\n"
-#~ "its end.  "
-#~ msgstr ""
-#~ "Con --follow (-f), tail de forma predeterminada seguirá el descriptor "
-#~ "del\n"
-#~ "fichero, lo que significa que si se renombra un fichero al que se le hace "
-#~ "tail\n"
-#~ "tail continuará siguiendo su final. "
-
-#~ msgid "invalid argument: %s"
-#~ msgstr "argumento inválido: %s"
-
-# Véase la excelente película "A bug's life".
-#~ msgid "Report %s bugs to <%s>.\n"
-#~ msgstr "Comunicar errores en %s a <%s>.\n"
-
-#~ msgid "%s home page: <http://www.gnu.org/software/%s/>.\n"
-#~ msgstr "Página inicial de %s: <http://www.gnu.org/software/%s/>.\n"
-
-#~ msgid "General help using GNU software: <http://www.gnu.org/gethelp/>.\n"
-#~ msgstr ""
-#~ "Ayuda general sobre software de GNU: <http://www.gnu.org/gethelp/>.\n"
-
-#~ msgid "the --megabytes option is deprecated; use -m instead"
-#~ msgstr "con 0 bloques"
-
-# alerta (BEL) -> pitido audible (BEL) em+
-# Vale que no es alerta, pero yo creo que debería ser campana. sv+
-#
-#~ msgid ""
-#~ "\n"
-#~ "If -e is in effect, the following sequences are recognized:\n"
-#~ "\n"
-#~ "  \\0NNN   the character whose ASCII code is NNN (octal)\n"
-#~ "  \\\\     backslash\n"
-#~ "  \\a     alert (BEL)\n"
-#~ "  \\b     backspace\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Si -e está activado, se reconocen las siguientes secuencias:\n"
-#~ "\n"
-#~ "  \\0NNN   el carácter cuyo código es NNN (octal)\n"
-#~ "  \\\\     barra invertida\n"
-#~ "  \\a     campana (BEL)\n"
-#~ "  \\b     retroceso\n"
-
-#~ msgid "  -d, --directory  create a directory, not a file\n"
-#~ msgstr "  -d  --directory  crea un directorio, no un fichero\n"
-
-#~ msgid ""
-#~ "  -q, --quiet      suppress diagnostics about file/dir-creation failure\n"
-#~ msgstr ""
-#~ "  -q, --quiet      suprime mensajes sobre fallos de creación de fich/dir\n"
-
-#~ msgid ""
-#~ "  -u, --dry-run    do not create anything; merely print a name (unsafe)\n"
-#~ msgstr ""
-#~ "  -u, --dry-run    no crea nada; simplemente muestra un nombre "
-#~ "(inseguro)\n"
-
-#~ msgid "  -p DIR           use DIR as a prefix; implies -t [deprecated]\n"
-#~ msgstr ""
-#~ "  -p DIR           utiliza DIR como prefijo, implica -t [obsoleto]\n"
-
-# alerta (BEL) ? mejor, pitido audible (BEL) em+
-# campana. sv+
-# ¿Manejada? . ¿Qué te parece 'Se considera el ancho variable' em
-# A ver si te gusta lo que he puesto. sv+
-#~ msgid ""
-#~ "  \\a      alert (BEL)\n"
-#~ "  \\b      backspace\n"
-#~ "  \\c      produce no further output\n"
-#~ "  \\f      form feed\n"
-#~ msgstr ""
-#~ "  \\a      campana (BEL)\n"
-#~ "  \\b      carácter de retroceso (backspace)\n"
-#~ "  \\c      no produce más salida\n"
-#~ "  \\f      avance de página (form feed)\n"
-
-#~ msgid ""
-#~ "  \\n      new line\n"
-#~ "  \\r      carriage return\n"
-#~ "  \\t      horizontal tab\n"
-#~ "  \\v      vertical tab\n"
-#~ msgstr ""
-#~ "  \\n      nueva línea\n"
-#~ "  \\r      retorno de carro\n"
-#~ "  \\t      tabulador horizontal\n"
-#~ "  \\v      tabulador vertical\n"
-
-#~ msgid "path truncated when looking for %s"
-#~ msgstr "ruta truncada mientras se localizaba %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "By default, color is not used to distinguish types of files.  That is\n"
-#~ "equivalent to using --color=none.  Using the --color option without the\n"
-#~ "optional WHEN argument is equivalent to using --color=always.  With\n"
-#~ "--color=auto, color codes are output only if standard output is "
-#~ "connected\n"
-#~ "to a terminal (tty).  The environment variable LS_COLORS can influence "
-#~ "the\n"
-#~ "colors, and can be set easily by the dircolors command.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Por defecto, no se emplea color para distinguir los tipos de ficheros. "
-#~ "Esto\n"
-#~ "equivale a usar --color=none. Usar la opción --color sin el argumento "
-#~ "opcional\n"
-#~ "CU�NDO equivale a usar --color=always. Con --color=auto, sólo se "
-#~ "muestran\n"
-#~ "los códigos de color si la salida estándar está conectada a un terminal "
-#~ "(tty).\n"
-#~ "La variable de entorno LS_COLOR puede influir sobre los colores, y se "
-#~ "puede\n"
-#~ "establecer fácilmente con la orden dircolors.\n"
-
-#~ msgid "FATAL: failed to close directory %s"
-#~ msgstr "FATAL: fallo al cerrar el directorio %s"
-
-#~ msgid "FATAL: cannot open .. from %s"
-#~ msgstr "FATAL: no se puede abrir .. a partir de %s"
-
-#~ msgid "FATAL: cannot ensure %s (returned to via ..) is safe"
-#~ msgstr ""
-#~ "FATAL: no se puede comprobar que %s (devuelto mediante ..) sea seguro"
-
-# FIXME: ¿Por qué el original no dice inode, si es que es eso lo que quiere
-# decir?
-#~ msgid "FATAL: directory %s changed dev/ino"
-#~ msgstr "FATAL: el directorio %s ha cambiado dev/nodo-i"
-
-#~ msgid "FATAL: cannot enter directory %s"
-#~ msgstr "FATAL: no se puede entrar en el directorio %s"
-
-#~ msgid "FATAL: just-changed-to directory %s changed dev/ino"
-#~ msgstr ""
-#~ "ERROR FATAL: el directorio al que se acaba de cambiar %s cambió de "
-#~ "dispositivo/nodo-i"
-
-#~ msgid "FATAL: cannot return to .. from %s"
-#~ msgstr "FATAL: no se puede volver a .. desde %s"
-
-# Sin un ejemplo nunca sabré si el primer %s está bien situado.
-#~ msgid "cannot remove %s directory %s"
-#~ msgstr "no se puede borrar %s el directorio %s"
-
-#~ msgid "cannot remove root directory %s"
-#~ msgstr "no se puede borrar el directorio raíz %s"
-
-#~ msgid "cannot remove relative-named %s"
-#~ msgstr "no se puede borrar el directorio nombrado relativamente %s"
-
-#~ msgid "cannot restore current working directory"
-#~ msgstr "no se puede restablecer el directorio actual"
-
-#~ msgid "%s: warning: making a hard link to a symbolic link is not portable"
-#~ msgstr ""
-#~ "%s: atención: crear un enlace duro a un enlace simbólico\n"
-#~ "no es transportable"
-
-#~ msgid ""
-#~ "\n"
-#~ "SIZE may have a multiplier suffix:\n"
-#~ "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
-#~ "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "TAMAÑO puede tener un sufijo multiplicativo:\n"
-#~ "b 512, kB 1000, K 1024,MB 1000*1000, M 1024*1024,\n"
-#~ "GB 1000*1000*1000, G 1024*1024*1024, y así sucesivamente para T, P, E, Z, "
-#~ "Y.\n"
-
-#~ msgid ""
-#~ "Discard all but one of successive identical lines from INPUT (or\n"
-#~ "standard input), writing to OUTPUT (or standard output).\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Descarta todas las líneas sucesivas idénticas, menos una. de ENTRADA (o\n"
-#~ "entrada estándar), escribiendo en SALIDA (o en la salida estándar).\n"
-#~ "\n"
-
-#~ msgid "couldn't open temporary file"
-#~ msgstr "no se pudo abrir un fichero temporal"
-
-#~ msgid "the --reply option is deprecated; use -i or -f instead"
-#~ msgstr "la opción --reply está obsoleta; utilice -i o -f en su lugar"
-
-#~ msgid ""
-#~ "WARNING: use --si, not -H; the meaning of the -H option will soon\n"
-#~ "change to be the same as that of --dereference-args (-D)"
-#~ msgstr ""
-#~ "ATENCIÓN: Utilice --si, no -H; el significado de la opción -H cambiará\n"
-#~ "pronto y será el mismo que el de --dereference-args (-D)"
-
-#~ msgid "Usage: %s [OPTION]... [STRING]...\n"
-#~ msgstr "Modo de empleo: %s [OPCIÓN]... [CADENA]...\n"
-
-#~ msgid ""
-#~ "      --bignum     always use arbitrary-precision arithmetic\n"
-#~ "      --no-bignum  always use single-precision arithmetic\n"
-#~ msgstr ""
-#~ "      --bignum     utiliza siempre aritmética de precisión arbitraria\n"
-#~ "      --no-bignum  utiliza siempre aritmética de simple precisión\n"
-
-#~ msgid ""
-#~ "arithmetic operation %c produced an out of range value, but arbitrary-"
-#~ "precision arithmetic is not available"
-#~ msgstr ""
-#~ "la operaciónn aritmética %c produjo un valor fuera de rango, pero la "
-#~ "aritmética\n"
-#~ "de precisión arbitraria no está disponible"
-
-#~ msgid "string too long"
-#~ msgstr "cadena demasiado larga"
-
-#~ msgid "arbitrary-precision support is not available"
-#~ msgstr "el soporte de precisión arbitraria no está disponible"
-
-#~ msgid "string offset is too large"
-#~ msgstr "la cadena de desplazamiento es demasiado grande"
-
-#~ msgid "substring length too large"
-#~ msgstr "longitud de subcadena demasiado grande"
-
-#~ msgid "arbitrary-precision arithmetic is not available"
-#~ msgstr "la aritmética de precisión arvitraria no está disponible"
-
-#~ msgid ""
-#~ "\n"
-#~ "Exit status is 0 if OK, 1 if minor problems, 2 if serious trouble.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "El estado de salida es 0 si todo va bien, 1 en caso de problema poco "
-#~ "importante,\n"
-#~ "o 2 si se trata de un problema serio.\n"
-
-#~ msgid "no %% directive in format string %s"
-#~ msgstr "no hay ninguna directiva %% en la cadena de formato %s"
-
-#~ msgid "too many %% directives in format string %s"
-#~ msgstr "demasiadas directivas %% en la cadena de formato %s"
-
-#~ msgid "invalid format string: %s"
-#~ msgstr "cadena de formato inválida: %s"
-
-# Pues no lo entiendo
-#~ msgid "FIXME unknown"
-#~ msgstr "FIXME desconocido"
-
-#~ msgid "Usage: %s [OPTION] [FILE]...\n"
-#~ msgstr "Modo de empleo: %s [OPCIÓN] [FICHERO]...\n"
-
-#~ msgid "Richard Stallman"
-#~ msgstr "Richard Stallman"
-
-#~ msgid ""
-#~ "The backup suffix is `~', unless set with --suffix or "
-#~ "SIMPLE_BACKUP_SUFFIX.\n"
-#~ "The version control method may be selected via the --backup option or "
-#~ "through\n"
-#~ "the VERSION_CONTROL environment variable.  Here are the values:\n"
-#~ "\n"
-#~ msgstr ""
-#~ "El sufijo de respaldo es `~', a menos que se establezca con --suffix o "
-#~ "con\n"
-#~ "SIMPLE_BACKUP_SUFFIX. El método de control de versión se puede "
-#~ "seleccionar\n"
-#~ "con la opción --backup o a través de la variable de entorno "
-#~ "VERSION_CONTROL.\n"
-#~ "Estos son los valores:\n"
-#~ "\n"
-
-#~ msgid "David Ihnat"
-#~ msgstr "David Ihnat"
-
-#~ msgid ""
-#~ "Print the prime factors of each NUMBER.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Muestra los factores de cada NÚMERO.\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "cannot display context when selinux not enabled or when displaying the "
-#~ "id\n"
-#~ "of a different user"
-#~ msgstr ""
-#~ "no se puede mostrar el contexto cuando selinux no está activado o cuando "
-#~ "se\n"
-#~ "muestra el id de un usuari diferente"
-
-#~ msgid "Usage: %s [OPTION] DIRECTORY...\n"
-#~ msgstr "Modo de empleo: %s [OPCIÓN] DIRECTORIO...\n"
-
-#~ msgid "%d: fmt=\"%s\" width=%d\n"
-#~ msgstr "%d: fmt=\"%s\" ancho=%d\n"
-
-#~ msgid "  -SSTRING, --sep-string[=STRING]\n"
-#~ msgstr "  -SCADENA, --sep-string[=CADENA]\n"
-
-#~ msgid "Usage: %s [OPTIONS] FILE [...]\n"
-#~ msgstr "Modo de empleo: %s [OPCIONES] FICHERO [...]\n"
-
-#~ msgid ""
-#~ "  -g, --general-numeric-sort  compare according to general numerical "
-#~ "value\n"
-#~ "  -i, --ignore-nonprinting    consider only printable characters\n"
-#~ "  -M, --month-sort            compare (unknown) < `JAN' < ... < `DEC'\n"
-#~ "  -n, --numeric-sort          compare according to string numerical "
-#~ "value\n"
-#~ "  -R, --random-sort           sort by random hash of keys\n"
-#~ "      --random-source=FILE    get random bytes from FILE (default /dev/"
-#~ "urandom)\n"
-#~ "      --sort=WORD             sort according to WORD:\n"
-#~ "                                general-numeric -g, month -M, numeric -"
-#~ "n,\n"
-#~ "                                random -R\n"
-#~ "  -r, --reverse               reverse the result of comparisons\n"
-#~ "\n"
-#~ msgstr ""
-#~ "  -g, --general-numeric-sort  compara de acuerdo con el valor numérico\n"
-#~ "  -i, --ignore-nonprinting    considera sólo los caracteres imprimibles\n"
-#~ "  -M, --month-sort            compara (desconocido) < 'JAN' < ... < "
-#~ "`DEC'\n"
-#~ "  -n, --numeric-sort          compara de acuerdo con el valor numérico "
-#~ "de\n"
-#~ "                              la cadena\n"
-#~ "  -R, --random-sort           ordena según un hash aleatorio de las "
-#~ "claves\n"
-#~ "      --random-source=FICHERO obtiene bytes aleatorios de FICHERO\n"
-#~ "                                (por omisión /dev/urandom)\n"
-#~ "      --sort=PALABRA          ordena de acuerdo con PALABRA:\n"
-#~ "                                general-numeric -g, month -M, numeric -"
-#~ "n,\n"
-#~ "                                random -R\n"
-#~ "  -r, --reverse               invierte el resultado de las comparaciones\n"
-#~ "\n"
-
-#~ msgid "cannot create temporary file"
-#~ msgstr "no se puede crear un fichero temporal"
-
-#~ msgid "Usage: %s [OPTION] FILE...\n"
-#~ msgstr "Modo de empleo: %s [OPCIÓN] FICHERO...\n"
-
-# Me temo que new_mode no se puede traducir. sv
-#~ msgid "new_mode: mode\n"
-#~ msgstr "new_mode: modo\n"
-
-#~ msgid ""
-#~ "      --retry              keep trying to open a file even if it is\n"
-#~ "                           inaccessible when tail starts or if it "
-#~ "becomes\n"
-#~ "                           inaccessible later; useful when following by "
-#~ "name,\n"
-#~ "                           i.e., with --follow=name\n"
-#~ "  -c, --bytes=N            output the last N bytes; alternatively, use +N "
-#~ "to\n"
-#~ "                           output bytes starting with the Nth of each "
-#~ "file\n"
-#~ msgstr ""
-#~ "      --retry              sigue intentando abrir un fichero incluso si "
-#~ "es\n"
-#~ "                             inaccesible cuando tail comienza o si se "
-#~ "vuelve\n"
-#~ "                             inaccesible más tarde; útil solamente si se "
-#~ "sigue\n"
-#~ "                             por nombre, es decir, con --follow=name\n"
-#~ "  -c, --bytes=N            muestra los últimos N bytes; "
-#~ "alternativamente,\n"
-#~ "                             use +N para mostrar los bytes que comienzan "
-#~ "en\n"
-#~ "                             el N-ésimo de cada fichero\n"
-
-# squeezing -> la compresión; lo has usado tú antes :) ipg
-# se me pasó em+
-#~ msgid ""
-#~ "\n"
-#~ "Translation occurs if -d is not given and both SET1 and SET2 appear.\n"
-#~ "-t may be used only when translating.  SET2 is extended to length of\n"
-#~ "SET1 by repeating its last character as necessary.  "
-#~ msgstr ""
-#~ "\n"
-#~ "Se produce la traducción si no se especifican CONJUNTO1 y CONJUNTO2, "
-#~ "siempre\n"
-#~ "y cuando no aparezca la opción -d. -t se puede usar sólo al traducir.\n"
-#~ "CONJUNTO2 se expande a la longitud de CONJUNTO1, repitiendo su último\n"
-#~ "carácter tantas veces como sea necesario. "
-
-#~ msgid ""
-#~ "Excess characters\n"
-#~ "of SET2 are ignored.  Only [:lower:] and [:upper:] are guaranteed to\n"
-#~ "expand in ascending order; used in SET2 while translating, they may\n"
-#~ "only be used in pairs to specify case conversion.  "
-#~ msgstr ""
-#~ "Los caracteres que sobran en\n"
-#~ "CONJUNTO2 no se tienen en cuenta. Solamente se garantiza que [:lower:]\n"
-#~ "y [:upper:] sean expandidos en orden ascendente; si se usa en\n"
-#~ "CONJUNTO2 al traducir, sólo se pueden usar en parejas, para\n"
-#~ "especificar conversión a mayúsculas. "
-
-#~ msgid ""
-#~ "-s uses SET1 if not\n"
-#~ "translating nor deleting; else squeezing uses SET2 and occurs after\n"
-#~ "translation or deletion.\n"
-#~ msgstr ""
-#~ "-s usa CONJUNTO1 si no se está\n"
-#~ "traduciendo ni borrando; si no, la compresión usa CONJUNTO2 después de\n"
-#~ "la traducción o el borrado.\n"
-
-#~ msgid " %2d:%02d%s  up "
-#~ msgstr " %2d:%02d%s  funcionando "
-
-# Por indicación de Gerardo Aburruzaga, lo pongo con mayúsculas.
-#~ msgid "am"
-#~ msgstr "AM"
-
-#~ msgid "pm"
-#~ msgstr "PM"
-
-#~ msgid "%ld day"
-#~ msgid_plural "%ld days"
-#~ msgstr[0] "%ld día"
-#~ msgstr[1] "%ld días"
-
-#~ msgid "Usage: %s [OPTION]... [ FILE ]\n"
-#~ msgstr "Modo de empleo: %s [OPCIÓN]... [FICHERO]\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "This is free software.  You may redistribute copies of it under the terms "
-#~ "of\n"
-#~ "the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n"
-#~ "There is NO WARRANTY, to the extent permitted by law.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Esto es software libre. Usted puede redistribuir copias de él bajo los "
-#~ "términos\n"
-#~ "de la Licencia Pública General de GNU <http://www.gnu.org/licenses/gpl."
-#~ "html>.\n"
-#~ "No hay NINGUNA GARANT�A, hasta donde permite la ley.\n"
-#~ "\n"
-
-#~ msgid "invalid %s `%s'"
-#~ msgstr "%s inválido/a `%s'"
-
-#~ msgid "invalid character following %s in `%s'"
-#~ msgstr "carácter inválido siguiendo a %s en `%s'"
-
-#~ msgid "%s `%s' too large"
-#~ msgstr "%s `%s' es demasiado grande"
-
-#~ msgid "unrecognized operand %s=%s"
-#~ msgstr "operando no reconocido %s=%s"
-
-#~ msgid "the --kilobytes option is deprecated; use -k instead"
-#~ msgstr "la opción --kilobytes está obsoleta; use -k en su lugar"
-
-#~ msgid ""
-#~ "\n"
-#~ "N may have a multiplier suffix: b 512, k 1024, m 1024*1024.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "N puede tener un sufijo multiplicador: b 512, k 1024, m 1024*1024.\n"
-
-# No se puedeN imprimir ... en plural, que son varias cosas las que no
-# se pueden imprimir. gerardo
-# Precisamente, lo que dice el mensaje es que es una sola cosa
-# la que se imprime, sin quedar claro cuál de las dos (usuario o grupo)
-# es esa única cosa. sv
-# En cualquier caso, el "no se puede" se refiere a un *hecho*:
-# "imprimir solamente el usuario y solamente el grupo" sv
-#~ msgid "cannot print only user and only group"
-#~ msgstr "no se puede imprimir solamente el usuario y solamente el grupo"
-
-#~ msgid "cannot get supplemental group list"
-#~ msgstr "no se puede obtener la lista de grupos suplementarios"
-
-#~ msgid "strip failed"
-#~ msgstr "strip falló"
-
-#~ msgid "value %s is so large that it is not representable"
-#~ msgstr "el valor %s es tan grande que no es representable"
-
-#~ msgid ""
-#~ "      --group-directories-first\n"
-#~ "                             group directories before files\n"
-#~ msgstr ""
-#~ "      --group-directories-first\n"
-#~ "                             agrupa los directorios antes que los "
-#~ "ficheros\n"
-
-#~ msgid "skip argument"
-#~ msgstr "pasando por alto este argumento"
-
-# ¿Tiene sentido? ¿No sería `argumento límite'? (no tengo las fuentes,
-# sorry O:) ipg
-# No lo sé, yo tengo las fuentes, pero a primera vista no concluyo em+
-#
-# a ver si te acuerdas la próxima vez y "pegas" el trocito de código donde esté,
-# así podremos discutir sobre ello....
-# FIXME: Asegurarse de que significa eso. sv+
-#~ msgid "limit argument"
-#~ msgstr "limitando este argumento"
-
-# ¿longitud mínima de cadena? Es que si no, me suena a spanglish :) ipg
-# ok em+
-#~ msgid "minimum string length"
-#~ msgstr "longitud mínima de cadena"
-
-#~ msgid "width specification"
-#~ msgstr "especificación de ancho"
-
-#~ msgid "page range"
-#~ msgstr "rango de páginas"
-
-# ¿Es esto correcto? ¿Qué significa?
-#~ msgid "sort size"
-#~ msgstr "tamaño de la ordenación"
-
-#~ msgid ""
-#~ "\n"
-#~ "SIZE may have a multiplier suffix: b for 512, k for 1K, m for 1 Meg.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "TAMAÑO puede tener un factor indicado con el sufijo: b para 512, k para "
-#~ "1K,\n"
-#~ "m para 1Meg\n"
-
-# En este texto de ayuda, para no estar repitiendo siempre "fecha/hora", he
-# decidido llamar simplemente "fecha" a la "combinación de la fecha y la hora".
-# (o sea, "time stamp" -> fecha)
-# Por el contexto, no creo que haya confusión.
-#~ msgid ""
-#~ "Update the access and modification times of each FILE to the current "
-#~ "time.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Actualiza la fecha de acceso y modificación de cada FICHERO a la\n"
-#~ "fecha actual.\n"
-#~ "\n"
-
-#~ msgid "Warning: -i will be removed in a future release;   use -u instead"
-#~ msgstr ""
-#~ "Atención: -i será eliminado en versiones futuras; utilice -u en su lugar"
-
-#~ msgid "cannot change owner and/or group of %s"
-#~ msgstr "no se puede cambiar el propietario y/o el grupo de %s"
-
-#~ msgid "cannot chdir to directory %s"
-#~ msgstr "no se puede cambiar al directorio %s"
-
-#~ msgid "openat: unable to restore working directory"
-#~ msgstr "openat: no se puede restablecer el directorio de trabajo"
-
-#~ msgid "cannot get the login group of a numeric UID"
-#~ msgstr "no se puede obtener el grupo de login de un UID numérico"
-
-#~ msgid ""
-#~ "This is free software; see the source for copying conditions.  There is "
-#~ "NO\n"
-#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
-#~ "PURPOSE.\n"
-#~ msgstr ""
-#~ "Esto es software libre; vea el código fuente para las condiciones de "
-#~ "copia.\n"
-#~ "No hay NINGUNA garantía; ni siquiera de COMERCIABILIDAD o IDONEIDAD PARA "
-#~ "UN\n"
-#~ "FIN DETERMINADO.\n"
-
-#~ msgid "closing standard output"
-#~ msgstr "cierre de la salida estándar"
-
-#~ msgid ""
-#~ "      --no-preserve-root do not treat `/' specially (the default)\n"
-#~ "      --preserve-root    fail to operate recursively on `/'\n"
-#~ msgstr ""
-#~ "      --no-preserve-root no trata `/' de forma especial (predeterminado)"
-#~ "<\n"
-#~ "      --preserve-root    no opera recursivamente sobre `/'\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Each MODE is one or more of the letters ugoa, one of the symbols +-= and\n"
-#~ "one or more of the letters rwxXstugo.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Cada MODO es una o más de las letras ugoa, uno de los símbolos +-= y\n"
-#~ "una o más de las letras rwxXstugo.\n"
-
-#~ msgid "cannot overwrite directory %s"
-#~ msgstr "no se puede sobreescribir el directorio %s"
-
-#~ msgid ""
-#~ "warning: --version-control (-V) is obsolete;  support for it\n"
-#~ "will be removed in some future release.  Use --backup=%s instead."
-#~ msgstr ""
-#~ "atención: --version-control (-V) está obsoleta;  su soporte será "
-#~ "eliminado\n"
-#~ "en alguna versión posterior.  Utilice --backup=%s en su lugar."
-
-#~ msgid "symbolic links are not supported on this system"
-#~ msgstr "este sistema no admite enlaces simbólicos"
-
-#~ msgid ""
-#~ "  %F   same as %Y-%m-%d\n"
-#~ "  %g   the 2-digit year corresponding to the %V week number\n"
-#~ "  %G   the 4-digit year corresponding to the %V week number\n"
-#~ msgstr ""
-#~ "  %F   lo mismo que %Y-%m-%d\n"
-#~ "  %g   el año de 2 dígitos que corresponde a la semana %V\n"
-#~ "  %G   el año de 4 dígitos que corresponde a la semana %V\n"
-
-#~ msgid ""
-#~ "  %z   RFC-2822 style numeric timezone (-0500) (a nonstandard extension)\n"
-#~ "  %Z   time zone (e.g., EDT), or nothing if no time zone is determinable\n"
-#~ "\n"
-#~ "By default, date pads numeric fields with zeroes.  GNU date recognizes\n"
-#~ "the following modifiers between `%' and a numeric directive.\n"
-#~ "\n"
-#~ "  `-' (hyphen) do not pad the field\n"
-#~ "  `_' (underscore) pad the field with spaces\n"
-#~ msgstr ""
-#~ "  %z   la zona horaria numérica estilo RFC-2822 (-0500)\n"
-#~ "        (una extensión no estándar)\n"
-#~ "  %Z   la zona horaria (p.e., EDT), o nada si no es determinable la\n"
-#~ "        zona horaria\n"
-#~ "\n"
-#~ "Por omisión, date rellena los campos numéricos con ceros. GNU date\n"
-#~ "reconoce los siguientes modificadores entre `%%' y una directiva "
-#~ "numérica.\n"
-#~ "\n"
-#~ "  `-' (guión) no rellena el campo\n"
-#~ "  `_' (subrayado) rellena el campo con espacios\n"
-
-#~ msgid ""
-#~ "a format string may not be specified when using the --rfc-2822 (-R) option"
-#~ msgstr ""
-#~ "no se puede especificar una cadena de formato cuando se usa\n"
-#~ "la opción --rfc-2822 (-R)"
-
-# Nota: Se refiere con toda probabilidad a una fecha o a una hora.
-#~ msgid "undefined"
-#~ msgstr "no definida"
-
-#~ msgid "%s+%s records in\n"
-#~ msgstr "%s+%s registros leídos\n"
-
-#~ msgid "%s+%s records out\n"
-#~ msgstr "%s+%s registros escritos\n"
-
-#~ msgid "truncated records"
-#~ msgstr "registros truncados"
-
-# No me acaba de sonar bien lo de fuera de rango.
-# Se admiten sugerencias. sv
-#~ msgid "file offset out of range"
-#~ msgstr "desplazamiento de fichero fuera de rango"
-
-#~ msgid "`-LIST' option is obsolete; use `-t LIST'"
-#~ msgstr "la opción `-LISTA' está obsoleta; utilice `-t LISTA'"
-
-# Portable = transportable (sugerencia: gerardo)
-# Me gusta más "portable". sv
-#
-# A mí no, pero como el traductor eres tú... :-( ¿Tú dices por
-# ejemplo: "voy a portar un mueble de una habitación a otra"? "¡Hay
-# que ver lo de la huelga de portes y camioneros...!" "Este televisor
-# es muy grande para ser de 14'', es incómodo de portar"... etc...
-# gerardo
-#
-# No te niego que son buenos tus ejemplos. Pero dime:
-# ¿De verdad dirías que DJGPP es un "transporte" de GNU CC a MS-DOS?
-# (Erosión, transporte y sedimentación).
-#
-# Al final me convenciste. Ahora estoy intrigado:
-# ¿Aparecerá en algún sitio más? sv
-#~ msgid ""
-#~ "warning: unportable BRE: `%s': using `^' as the first character\n"
-#~ "of the basic regular expression is not portable; it is being ignored"
-#~ msgstr ""
-#~ "atención: ERB no transportable: `%s': utilizar `^' como el primer "
-#~ "carácter\n"
-#~ "de la expresión regular básica no es transportable; no se tendrá en cuenta"
-
-#~ msgid "`%s' is too large"
-#~ msgstr "`%s' es demasiado grande"
-
-# FIXME: There options ... abbreviated: <- ¿no faltan los dos puntos? sv
-#~ msgid ""
-#~ "Usage: %s [ignored command line arguments]\n"
-#~ "  or:  %s OPTION\n"
-#~ "Exit with a status code indicating failure.\n"
-#~ "\n"
-#~ "These option names may not be abbreviated.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Modo de empleo: %s [argumentos que no se tienen en cuenta]\n"
-#~ "       o bien:  %s OPCIÓN\n"
-#~ "Sale con un código de estado que indica fallo.\n"
-#~ "\n"
-#~ "Estos nombres de opciones no se pueden abreviar:\n"
-#~ "\n"
-
-#~ msgid "`%s' option is obsolete; use `%s'"
-#~ msgstr "la opción `%s' está obsoleta; utilice `%s'"
-
-# FIXME: just "large" or "too large"?
-#~ msgid "%s: number of bytes is large"
-#~ msgstr "%s: el número de bytes es demasiado grande"
-
-#~ msgid "unrecognized option `-%c'"
-#~ msgstr "opción no reconocida '-%c'"
-
-#~ msgid "`-%s' option is obsolete; use `-%c %.*s%.*s%s'"
-#~ msgstr "la opción `-%s' está obsoleta; utilice `-%c %.*s%.*s%s'"
-
-#~ msgid "cannot obtain time stamps for %s"
-#~ msgstr "no se puede obtener la fecha de %s"
-
-#~ msgid "invalid field number for file 1: `%s'"
-#~ msgstr "número de campo inválido para el fichero 1: `%s'"
-
-#~ msgid "invalid field number for file 2: `%s'"
-#~ msgstr "número de campo inválido para el fichero 2: `%s'"
-
-#~ msgid "create symbolic link %s to %s"
-#~ msgstr "crea el enlace simbólico %s a %s"
-
-#~ msgid "create hard link %s to %s"
-#~ msgstr "crea el enlace duro %s a %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "  -b, --binary            read files in binary mode (default on DOS/"
-#~ "Windows)\n"
-#~ "  -c, --check             check %s sums against given list\n"
-#~ "  -t, --text              read files in text mode (default)\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "  -b, --binary           lee los ficheros en modo binario (por omisión "
-#~ "en\n"
-#~ "                         DOS/Windows)\n"
-#~ "  -c, --check            comprueba las sumas %s con la lista dada\n"
-#~ "  -t, --text             lee los ficheros en modo de texto (por defecto)\n"
-#~ "\n"
-
-#~ msgid "Only one operand may be specified when using --check."
-#~ msgstr "Cuando se utiliza --check sólo se puede especificar un argumento."
-
-#~ msgid "cannot set permissions of directory %s"
-#~ msgstr "no se pueden establecer los permisos del directorio %s"
-
-#~ msgid "cannot set permissions of fifo %s"
-#~ msgstr "no se pueden establecer los permisos del fichero `fifo' %s"
-
-#~ msgid "cannot set permissions of %s"
-#~ msgstr "no se pueden establecer los permisos de %s"
-
-#~ msgid "cannot get priority"
-#~ msgstr "no se puede obtener la prioridad"
-
-#~ msgid "cannot set priority"
-#~ msgstr "no se puede establecer la prioridad"
-
-# Sugerencia: "no sólo este"-> "no sólo éste" gerardo
-# ¿Estás seguro? sv
-# ¡¡S�!! Observa: "todos los sistemas... no sólo este sistema"
-#                 "todos los sistemas... no sólo éste."
-# En el primer caso, "este" es adjetivo, y en el 2º, adverbio.
-# La RAE dice que la tilde es optativa si no hay ambigüedad posible.
-# Yo creo que es mejor ponerla siempre.
-#
-# Yo prefiero no ponerla si no hay ambigüedad... sv
-#~ msgid ""
-#~ "Diagnose unportable constructs in NAME.\n"
-#~ "\n"
-#~ "  -p, --portability   check for all POSIX systems, not only this one\n"
-#~ msgstr ""
-#~ "Diagnostica construcciones no portables en NOMBRE\n"
-#~ "\n"
-#~ "  -p, --portability   comprueba para todos los sistemas POSIX, no sólo "
-#~ "este\n"
-
-#~ msgid "column count too large"
-#~ msgstr "el contador de columna es demasiado grande"
-
-#~ msgid "`--columns=COLUMN' invalid number of columns: `%s'"
-#~ msgstr "`--columns=COLUMNAS' número de columnas inválido: `%s'"
-
-#~ msgid ""
-#~ "This program is distributed in the hope that it will be useful,\n"
-#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-#~ "GNU General Public License for more details.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Este programa se distribuye con la esperanza de que sea útil,\n"
-#~ "pero SIN NINGUNA GARANT�A; ni siquiera la garantía implícita de\n"
-#~ "COMERCIABILIDAD o IDONEIDAD PARA UN FIN DETERMINADO. Véase la\n"
-#~ "Licencia Pública General de GNU para más detalles.\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "You should have received a copy of the GNU General Public License\n"
-#~ "along with this program; if not, write to the Free Software Foundation,\n"
-#~ "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
-#~ msgstr ""
-#~ "Usted debería haber recibido una copia de la Licencia Pública\n"
-#~ "General de GNU junto con este programa; en caso contrario, escriba\n"
-#~ "a la Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n"
-#~ "Boston, MA 02111-1307, EE.UU.\n"
-
-#~ msgid "cannot chdir from %s to .."
-#~ msgstr "no se puede cambiar de %s a .."
-
-#~ msgid "cannot lstat `.' in %s"
-#~ msgstr "no se puede efectuar `lstat' sobre `.' en %s"
-
-#~ msgid "cannot lstat %s"
-#~ msgstr "no se puede efectuar `lstat' sobre %s"
-
-#~ msgid "cannot chdir from %s to %s"
-#~ msgstr "no se puede cambiar del directorio %s al %s"
-
-#~ msgid "cannot remove `.' or `..'"
-#~ msgstr "no se puede borrar `.' o `..'"
-
-# prompt es "preguntar" o "pedir confirmación".
-# No me gusta nada cómo me ha quedado el verbose. Se admiten sugerencias.
-#
-# ¿Por qué no utilizar la forma que has utilizado anteriormente en este caso?
-# "da detalles...", creo que explicar no pega ni con cola...
-#
-# ¿Y en inglés sí te pega? sv
-#
-#~ msgid ""
-#~ "Remove (unlink) the FILE(s).\n"
-#~ "\n"
-#~ "  -d, --directory       unlink FILE, even if it is a non-empty directory\n"
-#~ "                          (super-user only; this works only if your "
-#~ "system\n"
-#~ "                           supports `unlink' for nonempty directories)\n"
-#~ "  -f, --force           ignore nonexistent files, never prompt\n"
-#~ "  -i, --interactive     prompt before any removal\n"
-#~ msgstr ""
-#~ "Borra (desenlaza) el/los FICHERO(s).\n"
-#~ "\n"
-#~ "  -d, --directory       desenlaza FICHERO, incluso si es un directorio no "
-#~ "vacío\n"
-#~ "                          (solamente superusuario; esto solamente "
-#~ "funciona\n"
-#~ "                          si el sistema admite `unlink' para directorios\n"
-#~ "                          no vacíos).\n"
-#~ "  -f, --force           descarta los ficheros que no existan, sin "
-#~ "preguntar\n"
-#~ "  -i, --interactive     pide confirmación antes de borrar\n"
-
-#~ msgid ""
-#~ "Display file or file system status.\n"
-#~ "\n"
-#~ "  -f, --file-system     display file system status instead of file "
-#~ "status\n"
-#~ "  -c  --format=FORMAT   use the specified FORMAT instead of the default\n"
-#~ "  -L, --dereference     follow links\n"
-#~ "  -t, --terse           print the information in terse form\n"
-#~ msgstr ""
-#~ "Muestra el estado del fichero o del sistema de ficheros.\n"
-#~ "\n"
-#~ "  -f, --file-system     muestra el estado del sistema de ficheros en "
-#~ "lugar del\n"
-#~ "                          estado del fichero\n"
-#~ "  -c  --format=FORMATO  utiliza el FORMATO especificado en lugar del\n"
-#~ "                          predeterminado\n"
-#~ "  -L, --dereference     sigue los enlaces\n"
-#~ "  -t, --terse           muestra la información de manera escueta\n"
-
-#~ msgid "Warning: `-l' is deprecated; use `-L' instead"
-#~ msgstr "atención: `-l' está obsoleto; utilice `-L' en su lugar"
-
-#~ msgid "stdin: read error"
-#~ msgstr "stdin: error de lectura"
-
-#~ msgid "`%s' option is obsolete; use `%s-%c %<PRIuMAX>'"
-#~ msgstr "la opción `%s' está obsoleta; utilice `%s-%c %<PRIuMAX>'"
-
-#~ msgid "%s: integer expression expected\n"
-#~ msgstr "%s: se esperaba una expresión entera\n"
-
-#~ msgid "before -lt"
-#~ msgstr "antes de -lt"
-
-#~ msgid "after -lt"
-#~ msgstr "después de -lt"
-
-#~ msgid "before -le"
-#~ msgstr "antes de -le"
-
-#~ msgid "after -le"
-#~ msgstr "después de -le"
-
-#~ msgid "before -gt"
-#~ msgstr "antes de -gt"
-
-#~ msgid "after -gt"
-#~ msgstr "después de -gt"
-
-#~ msgid "before -ge"
-#~ msgstr "antes de -ge"
-
-#~ msgid "after -ge"
-#~ msgstr "después de -ge"
-
-#~ msgid "before -ne"
-#~ msgstr "antes de -ne"
-
-#~ msgid "after -ne"
-#~ msgstr "después de -ne"
-
-#~ msgid "before -eq"
-#~ msgstr "antes de -eq"
-
-#~ msgid "after -eq"
-#~ msgstr "después de -eq"
-
-#~ msgid "after -t"
-#~ msgstr "después de -t"
-
-#~ msgid ""
-#~ "Usage: %s [ignored command line arguments]\n"
-#~ "  or:  %s OPTION\n"
-#~ "Exit with a status code indicating success.\n"
-#~ "\n"
-#~ "These option names may not be abbreviated.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Modo de empleo: %s [argumentos que no se tienen en cuenta]\n"
-#~ "       o bien:  %s OPCIÓN\n"
-#~ "Sale con un código de estado que indica éxito.\n"
-#~ "\n"
-#~ "Los nombres de estas opciones no se pueden abreviar:\n"
-#~ "\n"
-
-#~ msgid "`-LIST' option is obsolete; use `--first-only -t LIST'"
-#~ msgstr "la opción `-LISTA' está obsoleta; utilice `--first-only -t LISTA'"
-
-#~ msgid "`-%lu' option is obsolete; use `-f %lu'"
-#~ msgstr "la opción `-%lu' está obsoleta; utilice `-f %lu'"
-
-#~ msgid ""
-#~ "  -i, --idle        add idle time as HOURS:MINUTES, . or old\n"
-#~ "                    (deprecated, use -u)\n"
-#~ "  -l, --login       print system login processes\n"
-#~ msgstr ""
-#~ "  -i,  --idle       añade el tiempo inactivo del usuario como\n"
-#~ "                    HORAS:MINUTOS, . o antiguo (obsoleto, use -u)\n"
-#~ "  -l,  --login      muestra procesos de entrada en el sistema\n"
-#~ "                    (equivalente al -l de SUS)\n"
-
-#~ msgid "%s: cannot find username for UID %lu\n"
-#~ msgstr "%s: no se puede encontrar el nombre de usuario para el UID %lu\n"
-
-#~ msgid "too few arguments"
-#~ msgstr "número de argumentos insuficiente"
-
-# Nota: se refiere al grupo número 0.
-# La convención nulo=cero también existe en español, al menos en el
-# lenguaje matemático. Por eso he preferido respetar el matiz.
-#~ msgid "cannot change to null group"
-#~ msgstr "no se puede cambiar al grupo nulo"
-
-#~ msgid "group number"
-#~ msgstr "número de grupo"
-
-#~ msgid "invalid group number %s"
-#~ msgstr "número de grupo inválido %s"
-
-#~ msgid "invalid mode string: %s"
-#~ msgstr "cadena de modo inválida %s"
-
-#~ msgid "%s: specified destination directory does not exist"
-#~ msgstr "%s: el directorio objetivo especificado no existe"
-
-#~ msgid "%s: specified target is not a directory"
-#~ msgstr "%s: el objetivo especificado no es un directorio"
-
-#~ msgid "copying multiple files, but last argument %s is not a directory"
-#~ msgstr ""
-#~ "se copian varios ficheros, pero el último argumento %s\n"
-#~ "no es un directorio"
-
-#~ msgid "too many non-option arguments: %s%s"
-#~ msgstr "demasiados argumentos que no son opciones: %s%s"
-
-# Nota: El `conv' es el mismo que aparece más adelante como
-# "conv=KEYWORD", por lo tanto *no* se debe traducir.
-#~ msgid ""
-#~ "\tonly one conv in {ascii,ebcdic,ibm}, {lcase,ucase}, {block,unblock}"
-#~ msgstr ""
-#~ "        sólo una `conv' en {ascii,ebcdic,ibm}, {lcase,ucase}, {block,"
-#~ "unblock},\n"
-#~ "{unblock,sync}"
-
-#~ msgid ""
-#~ "no FILE arguments may be used with the option to output\n"
-#~ "dircolors' internal database"
-#~ msgstr ""
-#~ "no se pueden usar argumentos de tipo FICHERO con la opción para mostrar\n"
-#~ "la base de datos interna de dircolors"
-
-#~ msgid ""
-#~ "Echo the STRING(s) to standard output.\n"
-#~ "\n"
-#~ "  -n              do not output the trailing newline\n"
-#~ "  -e              enable interpretation of the backslash-escaped "
-#~ "characters\n"
-#~ "                    listed below\n"
-#~ "  -E              disable interpretation of those sequences in STRINGs\n"
-#~ msgstr ""
-#~ "Repite la(s) CADENA(s) por la salida estándar.\n"
-#~ "\n"
-#~ "  -n              no muestra el carácter final de nueva línea\n"
-#~ "  -e              activa la interpretación de caracteres escapados con "
-#~ "una\n"
-#~ "                  barra invertida que se listan más abajo\n"
-#~ "  -E              desactiva la interpretación de esas secuencias en "
-#~ "CADENAs\n"
-
-#~ msgid "installing multiple files, but last argument, %s is not a directory"
-#~ msgstr ""
-#~ "se instalan varios ficheros, pero el último argumento %s\n"
-#~ "no es un directorio"
-
-#~ msgid "%s is a directory"
-#~ msgstr "%s es un directorio"
-
-# No sé en qué caso se muestra este mensaje pero creo que es _muy_ ambiguo...
-# creo que la solución que se adopta en el siguiente mensaje sería más
-# apropiada...
-#
-# Ahora sí lo has arreglado...
-# Decía "número de argumentos insuficiente".
-# Pongo "demasiados argumentos".
-# Con esto ya están "igualados" este y el siguiente. sv
-#
-# El único problema ahora es que te comes lo de "non-option", ese matiz
-# se pierde en la traducción. sv+
-#~ msgid "too many non-option arguments"
-#~ msgstr "demasiados argumentos"
-
-#~ msgid "too few non-option arguments"
-#~ msgstr "número de argumentos insuficiente"
-
-#~ msgid "%s: File exists"
-#~ msgstr "%s: El fichero existe"
-
-#~ msgid ""
-#~ "Usage: %s [OPTION]... TARGET [LINK_NAME]\n"
-#~ "  or:  %s [OPTION]... TARGET... DIRECTORY\n"
-#~ "  or:  %s [OPTION]... --target-directory=DIRECTORY TARGET...\n"
-#~ msgstr ""
-#~ "Modo de empleo: %s [OPCIÓN]... OBJETIVO [NOMBRE_DEL_ENLACE]\n"
-#~ "       o bien:  %s [OPCIÓN]... OBJETIVO... DIRECTORIO\n"
-#~ "       o bien:  %s [OPCIÓN]... --target-directory=DIRECTORIO OBJETIVO...\n"
-
-#~ msgid "when making multiple links, last argument must be a directory"
-#~ msgstr ""
-#~ "cuando se crean varios enlaces, el último argumento debe ser un directorio"
-
-#~ msgid "file"
-#~ msgstr "fichero"
-
-#~ msgid "files"
-#~ msgstr "ficheros"
-
-#~ msgid "checksum"
-#~ msgstr "suma de comprobación"
-
-#~ msgid "checksums"
-#~ msgstr "sumas de comprobación"
-
-#~ msgid "no files may be specified when using --string"
-#~ msgstr "no se puede especificar FICHERO cuando se usa --string"
-
-#~ msgid "wrong number of arguments"
-#~ msgstr "número incorrecto de argumentos"
-
-#~ msgid "major and minor device numbers may not be specified for fifo files"
-#~ msgstr ""
-#~ "los números de dispositivo principal y secundario no se pueden "
-#~ "especificar\n"
-#~ "para ficheros `fifo'"
-
-#~ msgid "when moving multiple files, last argument must be a directory"
-#~ msgstr ""
-#~ "al mover varios ficheros, el último argumento debe ser un directorio"
-
-#~ msgid "invalid option `%s'"
-#~ msgstr "opción inválida `%s'"
-
-#~ msgid "invalid priority `%s'"
-#~ msgstr "prioridad inválida `%s'"
-
-#~ msgid "old-style offset"
-#~ msgstr "desplazamiento al estilo antiguo"
-
-# aunque con "operando no válido" se pueda llegar a la misma conclusión,
-# creo que lo que propongo es mucho más claro...
-# Creo que está bien así y de la otra forma, a mí me suena igual em+
-#~ msgid "invalid second operand in compatibility mode `%s'"
-#~ msgstr "segundo operando inválido en el modo de compatibilidad `%s'"
-
-#~ msgid "in compatibility mode, the last two arguments must be offsets"
-#~ msgstr ""
-#~ "en el modo de compatibilidad, los dos últimos argumentos deben ser\n"
-#~ "desplazamientos"
-
-# Aquí también pongo transportable.
-#~ msgid "path `%s' contains nonportable character `%c'"
-#~ msgstr "la ruta de acceso `%s' contiene el carácter no transportable `%c'"
-
-#~ msgid "`%s' is not a directory"
-#~ msgstr "`%s' no es un directorio"
-
-#~ msgid "directory `%s' is not searchable"
-#~ msgstr "el directorio `%s' es inaccesible"
-
-#~ msgid "name `%s' has length %ld; exceeds limit of %ld"
-#~ msgstr "el nombre `%s' tiene longitud %ld; excede el límite de %ld"
-
-#~ msgid "path `%s' has length %lu; exceeds limit of %ld"
-#~ msgstr "la ruta de acceso `%s' tiene longitud %lu; excede el límite de %ld"
-
-# FIXME: El original es horrible.
-#~ msgid "`--pages' invalid range of page numbers: `%s'"
-#~ msgstr "`--pages' rango de número de páginas inválido: `%s'"
-
-#~ msgid "`--pages' invalid starting page number: `%s'"
-#~ msgstr "`--pages' número de página de comienzo inválido: `%s'"
-
-#~ msgid "`--pages' invalid ending page number: `%s'"
-#~ msgstr "`--pages' número de página final inválido: `%s'"
-
-#~ msgid "`--pages' starting page number is larger than ending page number"
-#~ msgstr ""
-#~ "`--pages' el número de página de comienzo es mayor que el número de "
-#~ "página final"
-
-#~ msgid "%b %e %H:%M %Y"
-#~ msgstr "%b %e %H:%M %Y"
-
-#~ msgid "starting page number larger than total number of pages: `%d'"
-#~ msgstr ""
-#~ "el número de página de comienzo es mayor que el número total de páginas: `"
-#~ "%d'"
-
-# ¿Y cómo se asegura uno de esto?, pregunto. sv
-#~ msgid "Page %d"
-#~ msgstr "Página %d"
-
-#~ msgid "Usage: %s format [argument...]\n"
-#~ msgstr "Modo de empleo: %s formato [argumento...]\n"
-
-#~ msgid "%c: invalid suffix character in obsolescent option"
-#~ msgstr "%c: el sufijo es inválido en una opción obsoleta"
-
-# FIXME: Es muy raro que después de ; se use mayúscula.
-#~ msgid ""
-#~ "too many arguments;  When using tail's obsolescent option syntax (%s)\n"
-#~ "there may be no more than one file argument.  Use the equivalent -n or -"
-#~ "c\n"
-#~ "option instead."
-#~ msgstr ""
-#~ "demasiados argumentos;  Cuando se utiliza la opción de sintaxis obsoleta "
-#~ "de\n"
-#~ "tail (%s) no puede haber más de un fichero como argumento. Utilice la "
-#~ "opción\n"
-#~ "equivalente -n ó -c en su lugar."
-
-#~ msgid ""
-#~ "Warning: it is not portable to use two or more file arguments with\n"
-#~ "tail's obsolescent option syntax (%s).  Use the equivalent -n or -c\n"
-#~ "option instead."
-#~ msgstr ""
-#~ "Atención: no es transportable usar dos o más ficheros como argumentos con "
-#~ "la\n"
-#~ "opción de sintaxis obsoleta (%s). Utilice la opción equivalente -n ó -c\n"
-#~ "en su lugar."
-
-#~ msgid "%s: invalid maximum number of consecutive size changes"
-#~ msgstr "%s: número máximo de cambios de tamaño consecutivos inválido"
-
-#~ msgid "argument expected\n"
-#~ msgstr "se esperaba un argumento\n"
-
-#~ msgid "too many arguments\n"
-#~ msgstr "demasiados argumentos\n"
-
-# Esto salió parecido en wdiff y hubo que pensarlo bastante...
-#
-# A mí me parece más que correcto, otra opción, aunque a mí no me gustan más:
-# "faltan ficheros como argumentos" -> no claro
-# "faltan argumentos de tipo fichero/FICHERO" uac
-#
-# Creo que exactamente esas dos posibilidades aparecen
-# en wdiff como "finalistas" :-) sv
-#
-#~ msgid "file arguments missing"
-#~ msgstr "faltan argumentos (ficheros)"
-
-#~ msgid "invalid backslash escape `\\%c'"
-#~ msgstr "secuencia de escape inválida `\\%c'"
-
-#~ msgid "at least one string must be given when squeezing repeats"
-#~ msgstr ""
-#~ "cuando se comprimen repeticiones se debe especificar al menos una cadena"
-
-#~ msgid ""
-#~ "invalid identity mapping;  when translating, any [:lower:] or [:upper:]\n"
-#~ "construct in string1 must be aligned with a corresponding construct\n"
-#~ "([:upper:] or [:lower:], respectively) in string2"
-#~ msgstr ""
-#~ "correspondencia inválida; cuando se traduce, cualquier construcción [:"
-#~ "lower] o\n"
-#~ "[:upper:] en la cadena1 debe de estar alineada con la correpondiente\n"
-#~ "construcción ([:upper:] o [:lower:], respectivamente) en cadena2"
-
-#~ msgid "only one argument may be specified"
-#~ msgstr "sólo se puede especificar un argumento"
-
-#~ msgid "tab size contains an invalid character"
-#~ msgstr "el tamaño de tabulación contiene un carácter inválido"
-
-#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n"
-#~ msgstr "Modo de empleo: %s [OPCIÓN]... FICHERO1 FICHERO2\n"
-
-#~ msgid "*** invalid date/time ***"
-#~ msgstr "*** fecha/hora inválida ***"
-
-#~ msgid "%s: `+' or `-' expected after delimeter"
-#~ msgstr "%s: se esperaba un `+' ó un  `-' después del delimitador"
-
-#~ msgid "cannot change to parent of directory %s"
-#~ msgstr "no se puede cambiar al directorio padre de %s"
-
-#~ msgid ""
-#~ "when the starting value is larger than the limit,\n"
-#~ "the increment must be negative"
-#~ msgstr ""
-#~ "cuando el valor inicial es mayor que el límite,\n"
-#~ "el incremento debe ser negativo"
-
-#~ msgid ""
-#~ "when the starting value is smaller than the limit,\n"
-#~ "the increment must be positive"
-#~ msgstr ""
-#~ "cuando el valor inicial es menor que el límite,\n"
-#~ "el incremento debe ser positivo"
-
-#~ msgid ""
-#~ "Warning: the meaning of '-l' will change in a future release to conform "
-#~ "to POSIX"
-#~ msgstr ""
-#~ "Atención: el significado de `-l' cambiará en una versión futura para\n"
-#~ "estar de acuerdo con POSIX"
-
-#~ msgid ""
-#~ "\n"
-#~ "In -wNUMBER, the letter `w' may be omitted.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "En `-wNÚMERO' se puede omitir la letra `w'.\n"
-
-#~ msgid ""
-#~ "  -c, --bytes=SIZE         print first SIZE bytes\n"
-#~ "  -n, --lines=NUMBER       print first NUMBER lines instead of first 10\n"
-#~ msgstr ""
-#~ "  -c, --bytes=TAMAÑO       muestra los primeros TAMAÑO bytes\n"
-#~ "  -n, --lines=N            muestra las N primeras líneas en vez de 10\n"
-
-#~ msgid "invalid number"
-#~ msgstr "número inválido"
-
-#~ msgid "%s is larger than the maximum file size on this system"
-#~ msgstr "%s es más grande que el tamaño máximo de fichero para este sistema"
-
-#~ msgid "program error"
-#~ msgstr "error del programa"
-
-#~ msgid "stack overflow"
-#~ msgstr "desbordamiento de pila"
-
-#~ msgid "\\%c: invalid escape"
-#~ msgstr "\\%c: secuencia de escape inválida"
-
-#~ msgid "warning: unable to use large stack"
-#~ msgstr "atención: no se puede usar una pila grande"
-
-#~ msgid "missing file arguments"
-#~ msgstr "faltan argumentos (ficheros)"
-
-#~ msgid "cannot lstat `.'"
-#~ msgstr "no se puede efectuar `lstat' sobre `.'"
-
-# SIoNO
-#~ msgid "%s: remove directory %s? "
-#~ msgstr "%s: ¿borrar el directorio %s? (s/n) "
-
-# SIoNO
-#~ msgid "%s: directory %s is write protected; descend into it anyway? "
-#~ msgstr ""
-#~ "%s: el directorio %s está protegido contra escritura;\n"
-#~ "¿descender en él, a pesar de todo? (s/n) "
-
-#~ msgid "removing all entries of directory %s\n"
-#~ msgstr "borrando todas las entradas del directorio %s\n"
-
-#~ msgid "directory %s was replaced before being removed"
-#~ msgstr "el directorio %s ha sido reemplazado antes de ser borrado"
-
-#~ msgid "cannot change back to directory %s via `..'"
-#~ msgstr "no se puede volver al directorio %s a través de `..'"
-
-#~ msgid "subdirectory of %s was moved while being removed"
-#~ msgstr "un subdirectorio de %s fue movido mientras era borrado"
-
-# SIoNO
-#~ msgid "%s: remove directory %s%s? "
-#~ msgstr "%s: ¿borrar el directorio %s%s? (s/n) "
-
-#~ msgid " (might be nonempty)"
-#~ msgstr " (podría no estar vacío)"
-
-#~ msgid "removing the directory itself: %s\n"
-#~ msgstr "se borró el propio directorio: %s\n"
-
-#~ msgid "cannot remove current directory %s"
-#~ msgstr "no se puede borrar el directorio actual %s"
-
-#~ msgid ""
-#~ "ERROR: the source file %s initially had device/inode\n"
-#~ "numbers %lu/%lu, but now (after opening it), the numbers\n"
-#~ "are %lu/%lu.  That means that while this program was running,\n"
-#~ "the file was replaced with another one.  Skipping this file."
-#~ msgstr ""
-#~ "ERROR: el fichero origen %s inicialmente tenía números de dispositivo/"
-#~ "nodo-i\n"
-#~ "%lu/%lu, pero ahora (después de abrirlo), los números son %lu/%lu.\n"
-#~ "Esto quiere decir que mientras este programa estaba funcionando, el "
-#~ "fichero\n"
-#~ "ha sido reemplazado por otro. Nos saltamos este fichero."
-
-#~ msgid ""
-#~ "ERROR: the directory %s initially had device/inode\n"
-#~ "numbers %lu/%lu, but now (after a chdir into it), the numbers for `.'\n"
-#~ "are %lu/%lu.  That means that while rm was running, the directory\n"
-#~ "was replaced with either another directory or a link to another directory."
-#~ msgstr ""
-#~ "ERROR: el directorio %s inicialmente tenía números de dispositivo/nodo-i\n"
-#~ "%lu/%lu, pero ahora (después de un chdir dentro de él), los números para "
-#~ "`.'\n"
-#~ "son %lu/%lu. Esto quiere decir que mientras rm estaba funcionando,\n"
-#~ "el directorio ha sido reemplazado por otro directorio o por un enlace a "
-#~ "otro\n"
-#~ "directorio."
-
-# Esta traducción me ha sorprendido verla, creo que "changed" debería
-# traducirse como "ha cambiado". Además cuando estos mensajes "de
-# diagnóstico" aparecen, la operación ya se ha realizado... uac
-#
-# Si solamente fuera por el modo verbal empleado en el original,
-# estaría de acuerdo contigo.
-# Sin duda esto es un mensaje de "diagnóstico" o "verbose", y como tal
-# debe tratarse.
-# La cosa está en si esos mensajes deben decirnos "lo que va ocurriendo"
-# o "lo que ha ocurrido". En este mensaje concreto (no en general), me
-# parece más apropiado que el programa nos diga "lo que va ocurriendo"
-# y por eso utilizo el modo presente.
-# Tal vez tengo la impresión de que al original le falta un "is":
-# "group of %s is changed to %s". sv
-#~ msgid "group of %s changed to %s\n"
-#~ msgstr "el grupo de %s cambia a %s\n"
-
-# Normas de la casa:
-# "El programa hablará al usuario de usted y no de tú". sv
-#~ msgid "you are not a member of group `%s'"
-#~ msgstr "usted no es miembro del grupo `%s'"
-
-#~ msgid "%s: invalid group number"
-#~ msgstr "%s: número de grupo inválido"
-
-# Ya sé que no te gustará: "%s se cedió a "
-# o "el propietario de %s es ahora " tb
-# El segundo me gusta mucho más que el primero, pero a pesar de todo, prefiero
-# usar el verbo cambiar, decir "es ahora" no da a entender tan claramente
-# que se produce un cambio. sv
-#
-# A mí me gusta también "el propietario de %s es ahora", ¿por qué traducciones
-# tan literales, si se pueden poner de una forma corta y más clara? uac
-#
-# En este caso, "es ahora" es menos claro que "cambia a"
-# De la primera forma, te dice cómo queda pero te quedas con la duda
-# de si antes estaba también así o no.
-# Con "cambia a" te dice cómo queda y además sabes que antes estaba de otra
-# forma distinta. sv
-#~ msgid "owner of %s changed to "
-#~ msgstr "el propietario de %s cambia a "
-
-#~ msgid "cannot change permissions for %s"
-#~ msgstr "no se pueden cambiar los permisos de %s"
-
-#~ msgid "`%s' and `%s' are the same file"
-#~ msgstr "`%s' y `%s' son el mismo fichero"
-
-#~ msgid "cannot backup `%s'"
-#~ msgstr "no se puede respaldar `%s'"
-
-#~ msgid "cannot remove `%s'"
-#~ msgstr "no se puede borrar `%s'"
-
-# Nota: Asegurarse de que significa eso.
-# Probablemente quiera decir que "no se puede recuperar `%s'" de la copia
-# de seguridad. tb
-#~ msgid "cannot un-backup `%s'"
-#~ msgstr "no se puede restaurar `%s'"
-
-#~ msgid "invalid mode `%s'"
-#~ msgstr "modo inválido `%s'"
-
-#~ msgid "cannot create directory `%s'"
-#~ msgstr "no se puede crear el directorio `%s'"
-
-#~ msgid "cannot make fifo `%s'"
-#~ msgstr "No se puede crear el `fifo' `%s'"
-
-# El primer %s es "hardlink" o "symlink".
-# Mantengo el "de" y toco madera.
-#~ msgid "create %s %s to %s"
-#~ msgstr "crea %s de %s a %s"
-
-#~ msgid "link"
-#~ msgstr "enlace"
-
-#~ msgid "starting directory"
-#~ msgstr "directorio de comienzo"
-
-#~ msgid "%s -> %s (backup)\n"
-#~ msgstr "%s -> %s (copia de seguridad)\n"
-
-#~ msgid ""
-#~ "Usage: %s [OPTION]... TARGET [LINK_NAME]\n"
-#~ "  or:  %s [OPTION]... TARGET... DIRECTORY\n"
-#~ msgstr ""
-#~ "Modo de empleo: %s [OPCIÓN]... OBJETIVO [NOMBRE_DEL_ENLACE]\n"
-#~ "       o bien:  %s [OPCIÓN]... OBJETIVO... DIRECTORIO\n"
-
-#~ msgid ""
-#~ "Usage: %s [OPTION]... SOURCE DEST\n"
-#~ "  or:  %s [OPTION]... SOURCE... DIRECTORY\n"
-#~ msgstr ""
-#~ "Modo de empleo: %s [OPCIÓN]... ORIGEN DESTINO\n"
-#~ "       o bien:  %s [OPCIÓN]... ORIGEN... DIRECTORIO\n"
-
-#~ msgid "--no-dereference (-h) is not supported on this system"
-#~ msgstr "--no-dereference (-h) no está disponible en este sistema"
-
-#~ msgid "Usage: %s [OPTION]... EXISTING_DIR NEW_DIR\n"
-#~ msgstr "Modo de empleo: %s [OPCIÓN]... DIR_EXISTENTE NUEVO_DIR\n"
-
-#~ msgid "cannot rename `.' or `..'"
-#~ msgstr "no se puede renombrar `.' o `..'"
-
-# ¿ancestro?
-#
-# Sip :) Es la traducción. ipg
-#
-# Supongo que será un directorio que abarca a uno dado em+
-# No sé como te las apaqanas aquí, pero lo de ancestro no lo dejes, porfa
-#
-# ¿Sugerencias? sv+
-# ¿Qué es un ancestro? ¿Un predecesor? tb
-# Ni idea. sv
-#
-# ancestro es un familiar ascendiente en el árbol genealógico (recordad que
-# normalmente los árboles se dibujan de arriba hacia abajo) uac
-#
-# Si te digo la verdad, nunca me ha hecho gracia eso de que los árboles
-# crezcan hacia abajo... sv
-#
-# Aunque ancestro creo que no estará mal, antecesor estará igual de bien y
-# mucho más claro, ¿o no? uac
-#
-# Si no os han aclarado las ideas mis explicaciones, recordad cuando
-# utilizáis el NOTESCAPES para ftpear y veis: "upper directory"= ".." uac
-#
-# Bueno, esto sería el "directorio superior", lo cual indica que en
-# Netscape Communications Inc., los árboles también crecen al revés... :-) sv
-#
-# Bueno, vale. De momento lo cambio. Antes decía ancestro.
-#~ msgid "`%s' is an ancestor of `%s'"
-#~ msgstr "`%s' es un antecesor de `%s'"
-
-#~ msgid "%s is closed"
-#~ msgstr "%s está cerrado"
-
-#~ msgid "out of memory"
-#~ msgstr "memoria agotada"
-
-#~ msgid "%s: pass %lu/%lu (%s)...%lu/%lu K"
-#~ msgstr "%s: paso %lu/%lu (%s)...%lu/%lu K"
-
-#~ msgid "%s: pass %lu/%lu (%s)...%lu K"
-#~ msgstr "%s: paso %lu/%lu (%s)...%lu K"
-
-#~ msgid "%s: not a regular file; use -D to enable operations on devices"
-#~ msgstr ""
-#~ "%s: no es un fichero regular; utilice -D para activar las operaciones\n"
-#~ "sobre dispositivos"
-
-#~ msgid "unable to allocate storage for %lu passes"
-#~ msgstr "no se puede asignar espacio de almacenamiento para %lu pasos"
-
-#~ msgid "%s: cannot shred read-only file descriptor"
-#~ msgstr ""
-#~ "%s: no se puede ejecutar shred sobre un descriptor de fichero de sólo "
-#~ "lectura"
-
-#~ msgid "%s: can't wipe stdout and print verbose messages to it"
-#~ msgstr ""
-#~ "%s: no se puede cepillar la salida estándar e imprimir mensajes "
-#~ "explicativos"
-
-#~ msgid "Can't fstat file `%s'"
-#~ msgstr "No se puede ejecutar fstat sobre el fichero `%s'"
-
-# Un fichero `sparse' es un fichero que contiene muchos ceros seguidos, y
-# que en algunos casos, el sistema operativo trata de forma especial.
-# ¿tiene traducción?
-#
-# Creo que finalmente me decidiré por traducirlo como "disperso".
-# (creo que Federico Rivas ya lo ha hecho así en tar).
-# Tal vez añadiendo el sparse al final, para que todo el mundo se entere. sv
-# O sea: tipo disperso (sparse).
-# De momento lo dejo en `sparse'.
-# FIXME.
-#~ msgid "sparse type"
-#~ msgstr "tipo `sparse'"
-
-# FIXME
-# Esto sería "tipo de ordenación",
-# pero como forma parte de un mensaje más largo que *no*
-# está todavía internacionalizado, para evitar que, por ejemplo
-# "ls --sort=ñ" dé como resultado "invalid tipo de ordenación `ñ'"
-# lo dejo de momento en inglés, para no mezclar.
-#~ msgid "sort type"
-#~ msgstr "sort type"
-
-# FIXME
-# Esto sería "tipo de formato",
-# pero como forma parte de un mensaje más largo que *no*
-# está todavía internacionalizado, para evitar que, por ejemplo,
-# "ls --format=ñ" dé como resultado "invalid tipo de formato `ñ'"
-# lo dejo de momento en inglés, para no mezclar.
-#~ msgid "format type"
-#~ msgstr "format type"
-
-# Del diccionario de María Moliner:
-# Colorear: Colorar. Teñir. Dar [Dar un] color a cierta cosa.
-# Coloración: Acción de colorear.
-#~ msgid "colorization criterion"
-#~ msgstr "criterio de coloración"
-
-# De este no estoy muy seguro.
-#~ msgid "indicator style"
-#~ msgstr "estilo de indicación"
-
-# De este tampoco...
-#~ msgid "quoting style"
-#~ msgstr "estilo de cita"
-
-# FIXME
-# o igual es hora, o tiempo, vaya usted a saber. Mirarlo bien.
-#~ msgid "time selector"
-#~ msgstr "selector de fecha"
-
-#~ msgid ""
-#~ "the option for counting 1MB blocks may not be used\n"
-#~ "with the portable output format"
-#~ msgstr ""
-#~ "la opción para contar bloques de 1MB no se puede usar\n"
-#~ "con el formato de salida portable"
-
-# ¿adaptive es adaptable?
-# ¿eh?
-#
-# Yo lo he mirado en el Collins y no está, por otra parte adaptable= adaptable
-# (inglis= castellano)... uac
-#
-# Una cosa creo que está clara, se refiere a las opciones para especificar
-# diferentes unidades de capacidad... y _creo_ que si pensamos en este sentido
-# la traducción no es muy coherente... al menos en castellano... uac
-#
-# Yo lo cambiaría a algo como:
-# "la opción para imprimir con unidades específicas no se puede usar..." uac
-#
-# Este tengo que pensarlo despacio. sv
-#~ msgid ""
-#~ "the option for printing with adaptive units may not be used\n"
-#~ "with the portable output format"
-#~ msgstr ""
-#~ "la opción para imprimir con unidades adaptables no se puede usar\n"
-#~ "con el formato de salida portable"
-
-#~ msgid "removing non-directory %s\n"
-#~ msgstr "se borró el no directorio %s\n"
-
-# ¿Tal vez la interrogación de apertura va justo después de la coma? ipg
-#
-# Excelente pregunta. Esto parece el referéndum de la OTAN:
-# Creo que el programa nos pregunta si queremos reemplazar un fichero
-# por otro, para que contestemos que sí o que no.
-# Al mismo tiempo, nos advierte de que, de llevarse a cabo el reemplazo
-# de un fichero por otro, también el modo resultaría sustituído.
-#
-# Si esto es así, ¿dónde habría que poner la interrogación?
-# O incluso: ¿Está bien el original?
-#
-# Creo que tal y como está, está bien. sv
-# SIoNO
-#
-#~ msgid "%s: replace `%s', overriding mode %04o? "
-#~ msgstr "%s: ¿reemplazar `%s', sustituyendo el modo %04o? (s/n) "
-
-# Yo no traduciría "regular file" literalmente... a mi entender en el Collins
-# salen acepciones mucho mejores, como:
-# fichero normal
-# fichero corriente
-# y esta que me la invento yo: fichero genérico. uac
-#
-# ¿Y una expresión regular? sv
-#
-# Aunque a decir verdad, eso de "normal" no me parece mal del todo,
-# habrá que pensarlo seriamente. sv
-# FIXME.
-#~ msgid "cannot move `%s' across filesystems: Not a regular file"
-#~ msgstr ""
-#~ "no se puede mover `%s' de un sistema de ficheros a otro:\n"
-#~ "No es un fichero regular"
-
-#~ msgid "Usage: %s [OPTION]... GROUP FILE...\n"
-#~ msgstr "Modo de empleo: %s [OPCIÓN]... GRUPO FICHERO...\n"
-
-# Este overriding no es como el de "mv".
-# ¿Tal vez el original no tiene sentido?
-# (lo digo porque para borrar, el modo que importa es el del directorio,
-# donde está lo que se va a borrar)
-#
-# overriding es pasar por alto em
-#
-# En general no, solamente en este caso.
-# ¿Quieres decir que sugieres poner
-# "..., pasando por alto el modo %04o"? sv+
-#
-#~ msgid "%s: remove %s`%s', overriding mode %04o? "
-#~ msgstr "%s: ¿borrar %s`%s', sustituyendo el modo %04o? (s/n) "
-
-# Este tendré que estudiarlo más.
-# De momento lo dejo así.
-# SIoNO
-#~ msgid "%s: descend directory `%s', overriding mode %04o? "
-#~ msgstr ""
-#~ "%s: ¿descender al directorio `%s', sustituyendo el modo %04o? (s/n) "
-
-# SIoNO
-#~ msgid "%s: remove directory `%s' (might be nonempty)? "
-#~ msgstr "%s: ¿borrar el directorio `%s'? (podría no estar vacío) (s/n) "
-
-# [ Antes decía "...el punto de montaje para %s" ]
-# No me gusta punto "de montaje". ¿Sugerencias?
-#
-# Como se monta en un directorio, se podría decir `directorio de montaje'
-# De todas maneras, punto de montaje no queda tan mal ... :) ipg
-#
-# Esta es dura, nunca se me ocurrió pensar que habría que traducirlo
-# un día. ... ¿Qué tal ... "lugar para montar" o "directorio en
-# el que montar"? em
-#
-# Algo mejor. Pero no estoy seguro. Tengo que pensarlo. sv
-#
-# "No se puede encontrar el sitio para montar %s" Sólo es una
-# sugerencia más. tb
-#
-# La conservaremos.
-# ¿Más candidatos? sv
-#
-# ¿`punto de montaje de %s'? ipg
-#
-# Bien, este es uno de esos casos en los que uno decide salirse
-# por la tangente. Espero que os guste así.
-# Razones: El "punto" de montaje es siempre un directorio (¿o no?).
-# Llamarle "punto" es emplear un lenguaje algo oscuro.
-# Si alguien sabe de algún caso en el que el punto de montaje no sea
-# un directorio, por favor que lo diga. sv
-#~ msgid "cannot find mount point for %s"
-#~ msgstr "no se puede encontrar el directorio para montar %s"
-
-#~ msgid "USER"
-#~ msgstr "USUARIO"
-
-# ¿Qué es eso de MESG? Si se refiere a si la tty acepta mensajes
-# (orden mesg), ¿no habría que traducir MENS " o algo así? Porque
-# "mensaje" en español no tiene ninguna G.erardo
-# Ni idea. Investigarlo. sv
-# Lo investigo por ti: un "who --help; who -H -T" te dará la
-# pista. Estoy en lo correcto. Cámbialo. gerardo
-# Efectivamente, who -H -T es muy esclarecedor.
-# Pero no me acaba de convencer. Ese MESG no es necesariamente MENSAJES.
-# Yo lo veo como una variable llamada MESG que puede tener dos valores
-# distintos, "y" y "n", y que se cambia con la orden mesg.
-# ¿Opiniones?
-#~ msgid "MESG "
-#~ msgstr "MESG "
-
-#~ msgid "LOGIN-TIME   "
-#~ msgstr "HORA DE CONEXIÓN "
-
-#~ msgid "FROM\n"
-#~ msgstr "DESDE\n"
-
-#~ msgid "<undef>"
-#~ msgstr "<no definido>"
-
-#~ msgid ""
-#~ "\n"
-#~ "Instead of -t NUMBER or -t LIST, -NUMBER or -LIST may be used.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "En vez de `-t N' ó `-t LISTA' puede usarse -N ó -LISTA.\n"
-
-# ¿Qué tal dejar bien claro que "...en vez de 10 por defecto." aunque no
-#                                                ^^^^^^^^^^^
-# esté en la versión english?
-#
-#~ msgid ""
-#~ "\n"
-#~ "SIZE may have a multiplier suffix: b for 512, k for 1K, m for 1 Meg.\n"
-#~ "If -VALUE is used as first OPTION, read -c VALUE when one of\n"
-#~ "multipliers bkm follows concatenated, else read -n VALUE.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "TAMAÑO puede tener un sufijo: `b' para 512, `k' para 1K, `m' para 1 "
-#~ "Megabyte.\n"
-#~ "Se se utiliza -VALOR como primera OPCIÓN, se entiende como -c VALOR si "
-#~ "va\n"
-#~ "seguido por uno de los multiplicadores `b', `k' ó `m', si no, se "
-#~ "entiende\n"
-#~ "como -n VALOR.\n"
-
-#~ msgid ""
-#~ "  +POS1 [-POS2]             start a key at POS1, end it before POS2 "
-#~ "(origin 0)\n"
-#~ "                              Warning: this option is obsolete\n"
-#~ msgstr ""
-#~ "  +POS1 [-POS2]           comienza una clave en POS1 y la termina antes\n"
-#~ "                            de POS2. Atención: esta opción está obsoleta\n"
-#~ "<"
-
-#~ msgid ""
-#~ "A first OPTION of -VALUE\n"
-#~ "is treated like -n VALUE unless VALUE has one of the [bkm] suffix\n"
-#~ "multipliers, in which case it is treated like -c VALUE.\n"
-#~ msgstr ""
-#~ "Si la primera\n"
-#~ "OPCIÓN es -VALOR se trata como si fuese -n VALOR, a menos que VALOR "
-#~ "tenga\n"
-#~ "uno de los sufijos mencionados (bkm), en cuyo caso se trata como -c "
-#~ "VALOR.\n"
-
-#~ msgid ""
-#~ "A first option of +VALUE is treated like -+VALUE, but this usage is "
-#~ "obsolete\n"
-#~ "and support for it will be withdrawn.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Si la primera opción es +VALOR se trata como -+VALOR, pero este uso\n"
-#~ "está obsoleto, y su soporte desaparecerá.\n"
-
-#~ msgid ""
-#~ "specified number of bytes `%s' is larger than the maximum\n"
-#~ "representable value of type `long'"
-#~ msgstr ""
-#~ "el número especificado de bytes `%s' es más grande que el valor máximo\n"
-#~ "representable de tipo `long'"
-
-#~ msgid ""
-#~ "when using the old-style +POS and -POS key specifiers,\n"
-#~ "the +POS specifier must come first"
-#~ msgstr ""
-#~ "cuando se utiliza el estilo de parámetros antiguo con +POS y -POS,\n"
-#~ "el primero de ellos debe ser +POS"
-
-#~ msgid ""
-#~ "the starting field number argument to the `-k' option must be positive"
-#~ msgstr ""
-#~ "el número que especifica el primer campo en la opción `-k' debe\n"
-#~ "ser positivo"
-
-#~ msgid "starting field spec has `.' but lacks following character offset"
-#~ msgstr ""
-#~ "la especificación del campo de comienzo tiene `.' pero carece de número "
-#~ "de\n"
-#~ "desplazamiento de caracteres"
-
-#~ msgid ""
-#~ "starting field character offset argument to the `-k' option\n"
-#~ "must be positive"
-#~ msgstr ""
-#~ "el argumento de desplazamiento del campo de comienzo para la opción `-k'\n"
-#~ "debe ser positivo."
-
-#~ msgid "field specification has `,' but lacks following field spec"
-#~ msgstr ""
-#~ "la especificación de campo tiene `,' pero no constan a continuación las\n"
-#~ "especificaciones del campo"
-
-#~ msgid "ending field number argument to the `-k' option must be positive"
-#~ msgstr "el número de campo final para la opción `-k' debe ser positivo"
-
-# �dem. ipg
-#~ msgid "ending field spec has `.' but lacks following character offset"
-#~ msgstr ""
-#~ "la especificación del campo de final tiene `.' pero no le sigue un\n"
-#~ "desplazamiento de caracteres"
-
-#~ msgid "%s: cannot follow end of non-regular file"
-#~ msgstr "%s: no se puede localizar el final de un fichero no regular"
-
-#~ msgid "could not find loop"
-#~ msgstr "no se puede encontrar un bucle"
-
-#~ msgid "`%s' has reappeared"
-#~ msgstr "`%s' ha reaparecido"
-
-#~ msgid "`-w PAGE_WIDTH' invalid column number: `%s'"
-#~ msgstr "`-w ANCHO_P�GINA' el número de columna no es válido: `%s'"
-
-#~ msgid "%s: extra characters in the argument to the `-%c' option: `%s'\n"
-#~ msgstr "%s: sobran caracteres en el argumento de la opción `-%c' : `%s'\n"
diff --git a/po/et.gmo b/po/et.gmo
index 171d6663..df865f64 100644
--- a/po/et.gmo
+++ b/po/et.gmo
diff --git a/po/et.po b/po/et.po
index 4cb8329b..0d6c3410 100644
--- a/po/et.po
+++ b/po/et.po
@@ -1,15 +1,15 @@
 # This file is distributed under the same license as the coreutils package.
 # Estonian translations for coreutils
 # Copyright (C) 2000 Free Software Foundation, Inc.
-# Toomas Soome <Toomas.Soome@microlink.ee>, 2013.
+# Toomas Soome <tsoome@me.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: coreutils 8.20-pre3\n"
+"Project-Id-Version: coreutils 8.23-pre1\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
-"PO-Revision-Date: 2013-02-12 13:06+0200\n"
-"Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
+"PO-Revision-Date: 2014-07-14 13:25+0300\n"
+"Last-Translator: Toomas Soome <tsoome@me.com>\n"
 "Language-Team: Estonian <linux-ee@lists.eenet.ee>\n"
 "Language: et\n"
 "MIME-Version: 1.0\n"
@@ -35,76 +35,119 @@ msgstr "Lubatud argumendid on:"
 msgid "error closing file"
 msgstr "viga faili sulgemisel"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "viga kirjutamisel"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "säilitan %s õigused"
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "Tundmatu süsteemne viga"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "tavaline tühi fail"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "tavaline fail"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "Kataloog"
 
-#: lib/file-type.c:44
-msgid "block special file"
-msgstr "blokkseadme fail"
-
-#: lib/file-type.c:47
-msgid "character special file"
-msgstr "sümbolseadme fail"
-
-#: lib/file-type.c:50
-msgid "fifo"
-msgstr "fifo"
-
-#: lib/file-type.c:53
+#: lib/file-type.c:46
 msgid "symbolic link"
 msgstr "nimeviide"
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "sokkel"
-
-#: lib/file-type.c:59
+#: lib/file-type.c:52
 msgid "message queue"
 msgstr "teadete järjekord"
 
-#: lib/file-type.c:62
+#: lib/file-type.c:55
 msgid "semaphore"
 msgstr "semafor"
 
-#: lib/file-type.c:65
+#: lib/file-type.c:58
 msgid "shared memory object"
 msgstr "jagatud mälu objekt"
 
-#: lib/file-type.c:68
+#: lib/file-type.c:61
 msgid "typed memory object"
 msgstr "tüübitud mälu objekt"
 
-#: lib/file-type.c:70
+#: lib/file-type.c:66
+msgid "block special file"
+msgstr "blokkseadme fail"
+
+#: lib/file-type.c:69
+msgid "character special file"
+msgstr "sümbolseadme fail"
+
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr "andmevoog"
+
+#: lib/file-type.c:75
+msgid "fifo"
+msgstr "fifo"
+
+#: lib/file-type.c:78
+msgid "door"
+msgstr "uks"
+
+#: lib/file-type.c:81
+msgid "multiplexed block special file"
+msgstr "multipleksitud blokkseadme fail"
+
+#: lib/file-type.c:84
+msgid "multiplexed character special file"
+msgstr "multipleksitud sümbolseadme fail"
+
+#: lib/file-type.c:87
+msgid "multiplexed file"
+msgstr "multipleksitud fail"
+
+#: lib/file-type.c:90
+msgid "named file"
+msgstr "nimega fail"
+
+#: lib/file-type.c:93
+msgid "network special file"
+msgstr "võrgu seadme fail"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr "migreeritud fail andmetega"
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr "migreeritud fail andmeteta"
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr "port"
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "sokkel"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr "whiteout"
+
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "veider fail"
 
@@ -239,18 +282,18 @@ msgstr "%s: võti '-W %s' ei luba kasutada argumenti\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: võti '-W %s' nõuab argumenti\n"
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr "ei õnnestu muuta %s õigusi"
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "kataloogi `%s' ei õnnestu luua"
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr "mälu on otsas"
@@ -367,7 +410,7 @@ msgstr "Regulaaravaldis on liiga suur"
 msgid "Unmatched ) or \\)"
 msgstr "Puudub ) või \\)"
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 msgid "No previous regular expression"
 msgstr "Eelmist regulaaravaldist pole"
 
@@ -392,7 +435,7 @@ msgstr "selle ettevaatusabinõu blokeerimiseks kasutage --no-preserve-root"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[jJ]"
 
@@ -402,11 +445,11 @@ msgstr "^[jJ]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[eE]"
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, c-format
 msgid "setting permissions for %s"
 msgstr "sean %s õigusi"
@@ -547,18 +590,6 @@ msgstr "Voolutõrge"
 msgid "Resource lost"
 msgstr "Resurss on kadunud"
 
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, c-format
-msgid "cannot create pipe"
-msgstr "ei õnnestu luua toru"
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, c-format
-msgid "%s subprocess failed"
-msgstr "%s alamprotsess sai vea"
-
 #: lib/strsignal.c:114
 #, c-format
 msgid "Real-time signal %d"
@@ -767,7 +798,7 @@ msgstr ""
 msgid "Report %s bugs to: %s\n"
 msgstr "%s vigadest teatage palun aadressil: %s\n"
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s koduleht: <%s>\n"
@@ -777,30 +808,10 @@ msgstr "%s koduleht: <%s>\n"
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr "%s koduleht: <http://www.gnu.org/software/%s/>\n"
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr "Ãœldine abiinfo GNU tarkvara kohta: <http://www.gnu.org/gethelp/>\n"
 
-#: lib/w32spawn.h:43
-#, c-format
-msgid "_open_osfhandle failed"
-msgstr "_open_osfhandle ebaõnnestus"
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr "fd %d ei saa taastada: dup2 ebaõnnestus"
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr "%s alamprosess"
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr "%s alamprotsess sai fataalse signaali %d"
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr "standardsisend"
@@ -822,7 +833,7 @@ msgstr "tundmatu voog"
 msgid "failed to reopen %s with mode %s"
 msgstr "reopen %s moodiga %s ebaõnnestus"
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr "sõnede võrdlus ebaõnnestus"
@@ -889,7 +900,7 @@ msgstr ""
 "                        kasutage väärtust 0\n"
 "\n"
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -911,48 +922,47 @@ msgstr ""
 "ka reavahetusi. Andmevoos tähestikuväliste sümbolite eemaldamiseks\n"
 "kasutage --ignore-garbage.\n"
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "viga lugemisel"
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, c-format
 msgid "invalid input"
 msgstr "vigane sisend"
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, c-format
 msgid "invalid wrap size: %s"
 msgstr "vigane murdmise veerg: %s"
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, c-format
 msgid "extra operand %s"
 msgstr "liigne operand %s"
 
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, c-format
 msgid "closing standard input"
 msgstr "sulen standardsisendi"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -981,11 +991,11 @@ msgstr ""
 #: src/basename.c:60
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
 "  -a, --multiple       luba mitut argumenti ja käsitle neid kui NIMI\n"
-"  -s, --suffix=SUFIKS  eemalda lõpetav SUFIKS\n"
+"  -s, --suffix=SUFIKS  eemalda lõpetav SUFIKS, eeldab -a\n"
 "  -z, --zero           eralda väljund reavahetuse asemel sümboliga NUL\n"
 
 #: src/basename.c:67
@@ -1005,32 +1015,31 @@ msgstr ""
 "  %s -s .h include/stdio.h  -> \"stdio\"\n"
 "  %s -a any/str1 any/str2   -> \"str1\" millele järgneb \"str2\"\n"
 
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, c-format
 msgid "missing operand"
 msgstr "puudub operand"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr "Torbjorn Granlund"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 msgid "Richard M. Stallman"
 msgstr "Richard M. Stallman"
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1087,7 +1096,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr "%s peal ioctl ei õnnestu"
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr "standardväljund"
@@ -1104,14 +1113,14 @@ msgstr "Russell Coker"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 msgid "Jim Meyering"
 msgstr "Jim Meyering"
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, c-format
 msgid "failed to create security context: %s"
 msgstr "turvakonteksti loomine ebaõnnestus: %s"
@@ -1121,8 +1130,8 @@ msgstr "turvakonteksti loomine ebaõnnestus: %s"
 msgid "failed to set %s security context component to %s"
 msgstr "turvakonteksti %s komponendi %s seadmine ebaõnnestus"
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, c-format
 msgid "failed to get security context of %s"
 msgstr "%s turvakonteksti lugemine ebaõnnestus"
@@ -1132,18 +1141,18 @@ msgstr "%s turvakonteksti lugemine ebaõnnestus"
 msgid "can't apply partial context to unlabeled file %s"
 msgstr "osalist konteksti ei saa rakendada märgendamata failile %s"
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, c-format
 msgid "failed to change context of %s to %s"
 msgstr "%s konteksti seadmine %s ei õnnestu"
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
 msgstr "%s ei saa kasutada"
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, c-format
 msgid "cannot read directory %s"
 msgstr "kataloogi %s ei õnnestu lugeda"
@@ -1153,13 +1162,14 @@ msgstr "kataloogi %s ei õnnestu lugeda"
 msgid "changing security context of %s\n"
 msgstr "muudan %s turvakonteksti\n"
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, c-format
 msgid "fts_read failed"
 msgstr "fts_read ebaõnnestus"
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, c-format
 msgid "fts_close failed"
 msgstr "fts_close ebaõnnestus"
@@ -1178,11 +1188,11 @@ msgstr ""
 
 #: src/chcon.c:357
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
-"Sea igale failile turvakontekst.\n"
+"Sea igale failile SELinux turvakontekst.\n"
 "Võtmega --reference, sea igale failile turvakontekst viidatud faili järgi.\n"
 
 #: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94
@@ -1210,7 +1220,7 @@ msgstr ""
 "  -l, --range=VAHEMIK    määra turvakonteksti vahemik\n"
 "\n"
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
 "      --preserve-root    fail to operate recursively on '/'\n"
@@ -1258,36 +1268,37 @@ msgstr ""
 "  -P                     ära lahenda nimeviiteid (vaikimisi)\n"
 "\n"
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr "-R --dereference nõuab kas -H või -L"
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr "-R -h nõuab -P"
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, c-format
 msgid "missing operand after %s"
 msgstr "%s järel puudub operand"
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, c-format
 msgid "invalid context: %s"
 msgstr "vigane kontekst: %s"
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr "anti konfliktne turvakontekst"
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, c-format
 msgid "failed to get attributes of %s"
 msgstr "%s atribuutide lugemine ebaõnnestus"
@@ -1316,7 +1327,7 @@ msgstr ""
 "Võtmega --reference, sea igale failile grupp viidatud faili järgi.\n"
 "\n"
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
@@ -1353,47 +1364,47 @@ msgstr ""
 "  %s staff /u      Sea /u grupi \"staff\" omaks.\n"
 "  %s -hR staff /u  Sea /u ja selle sisu grupi \"staff\" omaks.\n"
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
 msgstr "loen %s uusi atribuute"
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr "nii nimeviide %s kui ka viidatav fail jäeti muutmata\n"
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr "%s õigused muutusid, enne %04lo (%s), nüüd %04lo (%s)\n"
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr "faili %s õiguste %04lo (%s) muutmine õigusteks %04lo (%s) ei õnnestu\n"
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr "%s õigused jäeti %04lo (%s)\n"
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr "nimeviitega %s, millel viidatav puudub, ei saa opereerida"
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, c-format
 msgid "changing permissions of %s"
 msgstr "muudan %s õigusi"
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr "%s: uued õigused on %s, mitte %s"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1404,7 +1415,7 @@ msgstr ""
 "       või: %s [VÕTI]... KAHEKSAND-MOOD FAIL...\n"
 "       või: %s [VÕTI]... --reference=VFAIL FAIL...\n"
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 msgid ""
 "Change the mode of each FILE to MODE.\n"
 "With --reference, change the mode of each FILE to that of RFILE.\n"
@@ -1414,15 +1425,15 @@ msgstr ""
 "Võtmega --reference, sea igale failile õigused viidatud faili järgi.\n"
 "\n"
 
-#: src/chmod.c:391
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr "      --reference=VFAIL  kasuta faili VFAIL moodi\n"
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr "  -R, --recursive        muuda faile ja katalooge rekursiivselt\n"
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 msgid ""
 "\n"
 "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n"
@@ -1430,12 +1441,12 @@ msgstr ""
 "\n"
 "Iga MOOD on kujul '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n"
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr "moodi ja --reference võtmeid ei saa kombineerida"
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, c-format
 msgid "invalid mode: %s"
 msgstr "vigane mood: %s"
@@ -1582,26 +1593,21 @@ msgstr ""
 "  %s -hR root /u    Sea /u ja selle sisu omanikuks \"root\".\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr "Roland McGrath"
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr "vigane grupp %s"
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, c-format
 msgid "invalid group list %s"
 msgstr "vigane grupi nimekiri %s"
 
-#: src/chroot.c:117
-#, c-format
-msgid "failed to set additional groups"
-msgstr "täiendavate gruppide seadmine ebaõnnestus"
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
@@ -1610,7 +1616,7 @@ msgstr ""
 "Kasutamine: %s [VÕTI] UUSJUUR [KÄSK [ARG]...]\n"
 "       või:  %s VÕTI\n"
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
@@ -1618,7 +1624,7 @@ msgstr ""
 "Käivita KÄSK kasutades juurkataloogina kataloogi UUSJUUR.\n"
 "\n"
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
@@ -1628,7 +1634,7 @@ msgstr ""
 "  --groups=G_LOEND        määra täiendav gruppide nimekiri kujul g1,g2,..,"
 "gN\n"
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 msgid ""
 "\n"
 "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n"
@@ -1636,28 +1642,42 @@ msgstr ""
 "\n"
 "Kui käsklust ei antud, käivita '${SHELL} -i'' (vaikimisi: '/bin/sh -i').\n"
 
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, c-format
 msgid "cannot change root directory to %s"
 msgstr "%s ei õnnestu juurkataloogiks seada"
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, c-format
 msgid "cannot chdir to root directory"
 msgstr "ei saa minna juurkataloogi"
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr "undmatu uid jaoks ei ole gruppi määratud: %d"
+
+#: src/chroot.c:383
+#, c-format
+msgid "failed to get supplemental groups"
+msgstr "lisagruppide nimekirja ei õnnestu seada"
+
+#: src/chroot.c:395
+#, c-format
+msgid "failed to %s supplemental groups"
+msgstr "failed to %s supplemental groups"
+
+#: src/chroot.c:402
 #, c-format
 msgid "failed to set group-ID"
 msgstr "grupi ID seadmine ebaõnnestus"
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, c-format
 msgid "failed to set user-ID"
 msgstr "kasutaja ID seadmine ebaõnnestus"
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, c-format
 msgid "failed to run command %s"
 msgstr "käsklust %s ei saa käivitada"
@@ -1689,7 +1709,7 @@ msgstr ""
 "Väljasta iga FAILI kohta CRC kontrollsumma ja baitide arv.\n"
 "\n"
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr "Kasutamine: %s [VÕTI]... FAIL1 FAIL2\n"
@@ -1775,296 +1795,334 @@ msgstr "kasutati mitut eraldajat"
 msgid "empty %s not allowed"
 msgstr "tühi %s pole lubatud"
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr "viga %s lugemisel"
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, c-format
 msgid "cannot lseek %s"
 msgstr "lseek %s ei õnnestu"
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr "viga %s kirjutamisel"
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, c-format
 msgid "%s: failed to get extents info"
 msgstr "%s: laienduste info lugemine ebaõnnestus"
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, c-format
 msgid "%s: write failed"
 msgstr "%s: kirjutamine ebaõnnestus"
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, c-format
 msgid "failed to extend %s"
 msgstr "%s laiendamine ebaõnnestus"
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, c-format
 msgid "clearing permissions for %s"
 msgstr "puhastan %s õigused"
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "%s omanikku ei õnnestu säilitada"
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
 msgstr "ei õnnestu leida faili %s"
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, c-format
 msgid "failed to preserve authorship for %s"
 msgstr "%s autorit ei õnnestu säilitada"
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
+#, c-format
+msgid "failed to set default file creation context to %s"
+msgstr "vaikimisi faili loomise konteksti %s seadmine ebaõnnestus"
+
+#: src/copy.c:820
+#, c-format
+msgid "failed to set default file creation context for %s"
+msgstr "vaikimisi faili loomise konteksti seadmine failile %s ebaõnnestus"
+
+#: src/copy.c:846
+#, c-format
+msgid "failed to set the security context of %s"
+msgstr "%s turvakonteksti seadmine ebaõnnestus"
+
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
 msgid "cannot open %s for reading"
 msgstr "ei õnnestu avada %s lugemiseks"
 
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, c-format
 msgid "cannot fstat %s"
 msgstr "fstat %s ei õnnestu"
 
-#: src/copy.c:820
+#: src/copy.c:935
 #, c-format
 msgid "skipping file %s, as it was replaced while being copied"
 msgstr "jätan %s vahele, kuna see asendati kopeerimise ajal"
 
-#: src/copy.c:850
-#, c-format
-msgid "failed to get file system create context"
-msgstr "failisüsteemi loomise konteksti ei õnnestu lugeda"
-
-#: src/copy.c:864
-#, c-format
-msgid "failed to set the security context of %s to %s"
-msgstr "%s turvakonteksti seadmine %s ebaõnnestus"
-
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
 msgid "cannot remove %s"
 msgstr "%s ei saa kustutada"
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
 msgstr "%s eemaldatud\n"
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr "ei kirjuta läbi rippuva nimeviite %s"
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, c-format
 msgid "cannot create regular file %s"
 msgstr "ei õnnestu luua tavalist faili %s"
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, c-format
 msgid "failed to clone %s from %s"
 msgstr "%s kloonimine kloonitavast %s ebaõnnestus"
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr "jätan %s ajad muutmata"
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
 #, c-format
 msgid "failed to close %s"
 msgstr "%s sulgemine ebaõnnestus"
 
-#: src/copy.c:1471
+#: src/copy.c:1580
 #, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
 msgstr "%s: kirjutan %s üle, kirjutan üle ka õigused %04lo (%s)? "
 
-#: src/copy.c:1478
+#: src/copy.c:1581
+#, c-format
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr "%s: mittekirjutatav %s (mood %04lo, %s); proovin ikka? "
+
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
 msgstr "%s: kirjutan %s üle? "
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr " (varukoopia: %s)"
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr "vaikimisi faili loomise konteksti ei õnnestunud taastada"
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, c-format
 msgid "cannot create hard link %s to %s"
 msgstr "ei õnnestu luua viidet %s -> %s"
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, c-format
 msgid "cannot stat %s"
 msgstr "stat %s ei õnnestu"
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, c-format
 msgid "omitting directory %s"
 msgstr "jätan kataloogi %s vahele"
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr "hoiatus: lähtefail %s on esitatur enam kui korra"
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
 msgstr "%s ja %s on üks ja sama fail"
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr "ei saa üle kirjutada mitte-katataloogi %s kataloogiga %s"
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr "ei kirjuta üle just loodud faili %s failiga %s"
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr "kataloogi %s ei saa üle kirjutada mitte kataloogiga"
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr "kataloogi ei saa tõsta mitte-kataloogi: %s -> %s"
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr "%s varundamine hävitaks allika; %s ei teisaldatud"
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr "%s varundamine hävitaks allika; %s ei kopeeritud"
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
 msgstr "ei õnnestu luua %s varukoopiat"
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr "ei kopeeri faili %s üle just loodud nimeviite %s "
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr "kataloogi %s ei saa iseendasse, %s, kopeerida"
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr "ei loo viidet %s kataloogile %s"
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr "%s ei saa tõsta iseenda alamkataloogi %s"
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, c-format
 msgid "cannot move %s to %s"
 msgstr "ei õnnestu tõsta %s -> %s"
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr ""
 "seadmete-vaheline teisaldamine ebaõnnestus: %s -> %s; allikat ei saa "
 "kustutada"
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, c-format
-msgid "failed to set default file creation context to %s"
-msgstr "vaikimisi faili loomise konteksti %s seadmine ebaõnnestus"
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr "tsüklilist nimeviita %s ei õnnestu kopeerida"
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr "%s: suhtelisi nimeviiteid saab luua ainult jooksvas kataloogis"
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr "ei õnnestu luua nimeviidet %s -> %s"
 
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, c-format
 msgid "cannot create fifo %s"
 msgstr "ei õnnestu luua fifot %s"
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, c-format
 msgid "cannot create special file %s"
 msgstr "ei õnnestu luua seadmefaili %s"
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, c-format
 msgid "cannot read symbolic link %s"
 msgstr "ei õnnestu lugeda nimeviidet %s"
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, c-format
 msgid "cannot create symbolic link %s"
 msgstr "ei õnnestu luua nimeviidet %s"
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
 msgstr "%s on tundmatut tüüpi fail"
 
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, c-format
 msgid "cannot un-backup %s"
 msgstr "%s ei saa taastada"
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr "%s -> %s (taastamine)\n"
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr "Alex Deymo"
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr "Kasutamine: %s --coreutils-prog=PROGRAMMI_NIMI [PARAMEETRID]... \n"
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+"Käivita PROGRAMMI_NIMI sisse ehitatud programm antud PARAMEETRITEGA.\n"
+"\n"
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+"\n"
+"Kasutamine: '%s --coreutils-prog=PROGRAMMI_NIMI --help' annab programmi "
+"abiinfo.\n"
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, c-format
+msgid "unknown program %s"
+msgstr "tundmatu programm %s"
+
+#: src/cp.c:157 src/mv.c:288
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -2075,11 +2133,11 @@ msgstr ""
 "       või: %s [VÕTI]... ALG... KATALOOG\n"
 "       või: %s [VÕTI]... -t KATALOOG ALG...\n"
 
-#: src/cp.c:162
+#: src/cp.c:163
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
 msgstr "Kopeeri allikas sihtpunkti või kataloogi või mitu allikat kataloogi.\n"
 
-#: src/cp.c:168
+#: src/cp.c:169
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
 "      --attributes-only        don't copy the file data, just the "
@@ -2101,7 +2159,7 @@ msgstr ""
 "sisu\n"
 "  -d                           sama kui --no-dereference --preserve=links\n"
 
-#: src/cp.c:177
+#: src/cp.c:178
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
 "                                 opened, remove it and try again (this "
@@ -2122,7 +2180,7 @@ msgstr ""
 "  -H                           järgi käsureal antud nimeviiteid "
 "kopeeritavas\n"
 
-#: src/cp.c:186
+#: src/cp.c:187
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
 "  -L, --dereference            always follow symbolic links in SOURCE\n"
@@ -2130,7 +2188,7 @@ msgstr ""
 "  -l, --link                   kopeerimise asemel loo viited\n"
 "  -L, --dereference            järgi alati nimeviited kopeeritavas\n"
 
-#: src/cp.c:190
+#: src/cp.c:191
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
 "                                 a previous -i option)\n"
@@ -2140,7 +2198,7 @@ msgstr ""
 "                                 kehtetuks eelmise -i võtme)\n"
 "  -P, --no-dereference         ära kunagi järgi nimeviiteid kopeeeritavas\n"
 
-#: src/cp.c:195
+#: src/cp.c:196
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
 "      --preserve[=ATTR_LIST]   preserve the specified attributes (default:\n"
@@ -2156,7 +2214,7 @@ msgstr ""
 "                               täiendavad atribuudid: context, links, xattr, "
 "all\n"
 
-#: src/cp.c:203
+#: src/cp.c:204
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                use full source file name under DIRECTORY\n"
@@ -2164,7 +2222,7 @@ msgstr ""
 "      --no-preserve=ATR_LOEND  ära säilita antud atribuute\n"
 "      --parents                lisa allika tee kataloogi ette\n"
 
-#: src/cp.c:207
+#: src/cp.c:208
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
 "      --reflink[=WHEN]         control clone/CoW copies. See below\n"
@@ -2177,7 +2235,7 @@ msgstr ""
 "      --remove-destination     eemalda iga sihtfail enne selle avamist\n"
 "                               (vastupidiselt võtmele --force)\n"
 
-#: src/cp.c:213
+#: src/cp.c:214
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
 "      --strip-trailing-slashes  remove any trailing slashes from each "
@@ -2189,7 +2247,7 @@ msgstr ""
 "nime\n"
 "                                 lõpus olevad kaldkriipsud\n"
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -2202,7 +2260,7 @@ msgstr ""
 "  -t, --target-directory=KATALOOG  tõsta kõik antud allikad kataloogi\n"
 "  -T, --no-target-directory    käsitle sihti failina\n"
 
-#: src/cp.c:224
+#: src/cp.c:225
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
 "                                 than the destination file or when the\n"
@@ -2215,7 +2273,19 @@ msgstr ""
 "  -v, --verbose                selgita, mis toimub\n"
 "  -x, --one-file-system        püsi selles failisüsteemis\n"
 
-#: src/cp.c:233
+#: src/cp.c:232
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+"  -Z                           sea sihtfaili SELinux vaikimisi "
+"turvakontekst\n"
+"      --context[=KTST]         nagu -Z, või kui KTST on antud, siis sea\n"
+"                                 SELinux või SMACK turvakontekst\n"
+
+#: src/cp.c:240
 msgid ""
 "\n"
 "By default, sparse SOURCE files are detected by a crude heuristic and the\n"
@@ -2243,7 +2313,7 @@ msgstr ""
 "kopeerimine ebaõnnestub, või kui kasutati --reflink=auto, siis kasutatakse\n"
 "tavalist kopeerimist.\n"
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 msgid ""
 "\n"
 "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n"
@@ -2259,7 +2329,7 @@ msgstr ""
 "väärtused on järgnevad:\n"
 "\n"
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2271,7 +2341,7 @@ msgstr ""
 "  existing, nil   nummerdatud, kui neid on, muidu lihtne\n"
 "  simple, never   loo alati lihtsaid varukoopiaid\n"
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2283,222 +2353,232 @@ msgstr ""
 "force ja backup ning ALLIKAS ja SIHT on sama nimi olemasoleval tavalisel\n"
 "failil.\n"
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, c-format
 msgid "failed to preserve times for %s"
 msgstr "%s aegu ei õnnestu säilitada"
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, c-format
 msgid "failed to preserve permissions for %s"
 msgstr "%s õigusi ei õnnestu säilitada"
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, c-format
 msgid "cannot make directory %s"
 msgstr "kataloogi %s ei õnnestu luua"
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr "`%s' on olemas, aga ei ole kataloog"
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
 #, c-format
 msgid "failed to access %s"
 msgstr "%s kasutamine ebaõnnestus"
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, c-format
 msgid "missing file operand"
 msgstr "argumentides puudub failinimi"
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, c-format
 msgid "missing destination file operand after %s"
 msgstr "%s järel puudub sihtfail"
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr ""
 "--target-directory (-t) ja --no-target-directory (-T) ei saa koos kasutada"
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, c-format
 msgid "target %s is not a directory"
 msgstr "antud siht, %s, ei ole kataloog"
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr "võtme --parents kasutamisel peab sihtkoht olema kataloog"
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, c-format
 msgid "multiple target directories specified"
 msgstr "määrati mitu sihtkataloogi"
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr "hoiatus: ignoreerin --context; see nõuab SELinux tuuma"
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr "ei õnnestu luua ei tavalist ega nimeviita"
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr "võtmed --backup ja --no-clobber on üksteist välistavad"
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr "--reflink saab kasutada ainult võtmega --sparse=auto"
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr "varukoopia tüüp"
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, c-format
+msgid "cannot set target context and preserve it"
+msgstr "ei saa määrata konteksti ja seda säilitada"
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr "SELinux tuumata ei saa turvakonteksti säilitada"
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr ""
 "laiendatud atribuute ei saa säilitada kuna cp on kompileeritud xattr toeta"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr "Stuart Kemp"
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr "sisend kadus"
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr "%s: rea number on piirkonnast väljas"
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, c-format
 msgid "%s: %s: line number out of range"
 msgstr "%s: %s: rea number on piirkonnast väljas"
 
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, c-format
 msgid " on repetition %s\n"
 msgstr " %s kordamisel\n"
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, c-format
 msgid "%s: %s: match not found"
 msgstr "%s: %s: sobivat ei leitud"
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr "viga regulaaravaldisega otsingul"
 
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, c-format
 msgid "write error for %s"
 msgstr "viga %s kirjutamisel"
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, c-format
 msgid "%s: integer expected after delimiter"
 msgstr "%s: eraldaja järel oodati täisarvu"
 
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr "%s: korduste arvuga peab kasutama '}'"
 
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr "%s}: '{' ja '}' vahel peab olema täisarv"
 
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr "%s: puudub sulgev eraldaja '%c'"
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr "%s: vigane regulaaravaldis: %s"
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr "%s: vigane muster"
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr "%s: rea number peab olema suurem kui null"
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr "rea number %s on väiksem, kui eelneva rea number, %s"
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr "hoiatus: rea number %s on sama, kui eelneva rea number"
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr "sufiksis puudub teisenduse määrang"
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr "vigane teisenduse määraja sufiksis: %c"
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr "vigane teisenduse määraja sufiksis: \\%.3o"
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr "vigased lipud teisenduse määrangus: %%%c%c"
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr "sufiksis on liiga palju %% teisenduse määranguid"
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr "sufiksis puudub %% teisenduse määrang"
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr "%s: vigane number"
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr "Kasutamine: %s [VÕTI]... FAIL MUSTER...\n"
 
-#: src/csplit.c:1455
+#: src/csplit.c:1483
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
 "and output byte counts of each piece to standard output.\n"
@@ -2507,7 +2587,7 @@ msgstr ""
 "'xx02', ...\n"
 "ja väljasta standardväljundisse iga osa suurus baitides.\n"
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2518,7 +2598,11 @@ msgstr ""
 "  -f, --prefix=PREFIKS        kasuta 'xx' asemel PREFIKS\n"
 "  -k, --keep-files            vigade korral jäta väljundfailid kustutamata\n"
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr "  -m, --suppress-matched     blokeeri mustrile vastavad read\n"
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
@@ -2528,7 +2612,7 @@ msgstr ""
 "  -s, --quiet, --silent      ära väljasta väljundfailide mahte\n"
 "  -z, --elide-empty-files    kustuta tühjad väljundfailid\n"
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
@@ -2536,7 +2620,7 @@ msgstr ""
 "\n"
 "Kui FAIL on -, loe standardsisendit. Iga MUSTER võib olla:\n"
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 msgid ""
 "\n"
 "  INTEGER            copy up to but not including specified line number\n"
@@ -2563,20 +2647,16 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr "David M. Ihnat"
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr "väljad ja positsioonid nummerdatakse alates numbrist 1"
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr "Kasutamine: %s VÕTI... [FAIL]...\n"
 
-#: src/cut.c:193
+#: src/cut.c:176
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr "Väljasta igast FAIList valitud osad standardväljundisse.\n"
 
-#: src/cut.c:199
+#: src/cut.c:182
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
 "  -c, --characters=LIST   select only these characters\n"
@@ -2586,7 +2666,7 @@ msgstr ""
 "  -c, --characters=LOEND  väljasta ainult need sümbolid\n"
 "  -d, --delimiter=ERALD   määra TAB asemel väljade eraldaja\n"
 
-#: src/cut.c:204
+#: src/cut.c:187
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
 "                            that contains no delimiter character, unless\n"
@@ -2598,7 +2678,7 @@ msgstr ""
 "                            välja arvatu juhul, kui kasutati võtit -s\n"
 "  -n                      (ignoreerin)\n"
 
-#: src/cut.c:210
+#: src/cut.c:193
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
 "                            or fields\n"
@@ -2606,7 +2686,7 @@ msgstr ""
 "      --complement        täienda valitud baitide, sümbolite või väljade "
 "hulka.\n"
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
@@ -2616,7 +2696,7 @@ msgstr ""
 "      --output-delimiter=SÕNE  kasuta väljundis eraldajana SÕNE\n"
 "                            vaikimisi kasutatakse sisendi eraldajat\n"
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2628,7 +2708,7 @@ msgstr ""
 "koosneb vahemikust või komadega eraldatud vahemikest. Valitud sisend\n"
 "kirjutatakse täpselt üks kord lugemise järjekorras.\n"
 
-#: src/cut.c:227
+#: src/cut.c:210
 msgid ""
 "Each range is one of:\n"
 "\n"
@@ -2648,46 +2728,50 @@ msgstr ""
 "\n"
 "Kui FAIL puudub või on -, loeb standardsisendit.\n"
 
-#: src/cut.c:367 src/cut.c:493
+#: src/cut.c:300 src/cut.c:394
 msgid "invalid byte, character or field list"
 msgstr "vigane baitide, sümbolite või väljade loend"
 
-#: src/cut.c:387
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr "väljad ja positsioonid nummerdatakse alates numbrist 1"
+
+#: src/cut.c:320
 msgid "invalid range with no endpoint: -"
 msgstr "vigane vahemik, lõpp puudub: -"
 
-#: src/cut.c:403
+#: src/cut.c:334
 msgid "invalid decreasing range"
 msgstr "vigane vähenev vahemik"
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, c-format
 msgid "byte offset %s is too large"
 msgstr "baidi nihe %s on liiga suur"
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, c-format
 msgid "field number %s is too large"
 msgstr "välja number %s on liiga suur"
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr "lubatud on ainult sama tüüpi loend"
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr "eraldaja peab olema üks sümbol"
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr "peate määrama baitide, sümbolite või väljade loendi"
 
-#: src/cut.c:850
+#: src/cut.c:790
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr "sisendi eraldajat saab määrata ainult juhul kui töötatakse väljadega"
 
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
@@ -2695,11 +2779,11 @@ msgstr ""
 "eraldamata ridade blokeerimine omab mõtet ainult\n"
 "\tväljadega töötamise puhul"
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr "puudub väljade loend"
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr "puudub asukohtade loend"
 
@@ -2750,12 +2834,13 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 "      --rfc-3339=MÄÄRANG    väljasta RFC-3339 ühilduv kuupäeva sõne.\n"
 "                            MÄÄRANG võib olla 'date', 'seconds' või 'ns'.\n"
 "  -s, --set=SÕNE            sea SÕNEga määratud aeg\n"
-"  -u, --utc, --universal    esita või sea koordineeritud universaalaeg\n"
+"  -u, --utc, --universal    esita või sea koordineeritud universaalaeg "
+"(UTC)\n"
 
 #: src/date.c:158
 msgid ""
@@ -2959,10 +3044,10 @@ msgstr ""
 "Näita USA läänekalda ajas järgmise reede kell 9 hommikul\n"
 "  $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n"
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr "standardsisend"
@@ -3003,7 +3088,7 @@ msgstr ""
 msgid "cannot set date"
 msgstr "kuupäeva ja kellaaega ei õnnestu seada"
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, c-format
 msgid "time %s is out of range"
 msgstr "aeg %s on piirkonnast väljas"
@@ -3014,7 +3099,7 @@ msgstr "aeg %s on piirkonnast väljas"
 msgid "Paul Rubin"
 msgstr "Paul Rubin"
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
@@ -3023,7 +3108,7 @@ msgstr ""
 "Kasutamine: %s [OPERAND]...\n"
 "       või: %s VÕTI\n"
 
-#: src/dd.c:526
+#: src/dd.c:532
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
 "\n"
@@ -3041,7 +3126,7 @@ msgstr ""
 "  count=N         kopeeri ainult N sisendplokki\n"
 "  ibs=BAITI       loe BAITI baiti korraga (vaikimisi: 512)\n"
 
-#: src/dd.c:535
+#: src/dd.c:541
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
 "  iflag=FLAGS     read as per the comma separated symbol list\n"
@@ -3064,7 +3149,7 @@ msgstr ""
 "                  'noxfer' blokeerib ülekande statistika, 'none' blokeerib "
 "kõik\n"
 
-#: src/dd.c:546
+#: src/dd.c:552
 msgid ""
 "\n"
 "N and BYTES may be followed by the following multiplicative suffixes:\n"
@@ -3083,7 +3168,7 @@ msgstr ""
 "Iga VÕTMESÕNA võib olla:\n"
 "\n"
 
-#: src/dd.c:555
+#: src/dd.c:561
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
 "  ebcdic    from ASCII to EBCDIC\n"
@@ -3109,7 +3194,7 @@ msgstr ""
 "  sync      täienda iga sisendplokk nullidega ibs-mahtu; kui kasutatakse\n"
 "            block või unblock, täienda tühikutega\n"
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -3125,7 +3210,7 @@ msgstr ""
 "  fdatasync enne lõpetamist kindlusta andmete faili kirjutamine\n"
 "  fsync     nagu eelmine, aga kirjuta ka metainfo\n"
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -3139,75 +3224,75 @@ msgstr ""
 "  append    lisamise mood (omab mõtet ainult väljundil; soovitame "
 "conv=notrunc)\n"
 
-#: src/dd.c:583
+#: src/dd.c:589
 msgid "  cio       use concurrent I/O for data\n"
 msgstr "  cio       kasuta andmete käsitlemisel samaaegset S/V\n"
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr "  direct    kasuta andmete käsitlemisel puhverdamata S/V\n"
 
-#: src/dd.c:587
+#: src/dd.c:593
 msgid "  directory  fail unless a directory\n"
 msgstr "  directory    katkesta kui ei ole kataloog\n"
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr "  dsync     kasuta andmete käsitlemisel sünkroonmoodi S/V\n"
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr "  sync      sama, aga ka metainfo korral\n"
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr "  fullblock  kasuta sisendit täisblokkidena (ainult iflag)\n"
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr "  nonblock  kasuta mitteblokeeruvat S/V\n"
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr "  noatime   ära uuenda kasutamise aega\n"
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr "  nocache   ära kasuta puhverdatud andmeid\n"
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr "  noctty    ei seosta kontrollivat terminali\n"
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr "  nofollow  ei järgi nimeviiteid\n"
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr "  nolinks   katkesta, kui on viiteid\n"
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr "  binary    kasuta andmete käsitlemisel binaarmoodi\n"
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr "  text      kasuta andmete käsitlemisel tekstimoodi\n"
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr "  count_bytes  käsitle 'count=N' kui baitide arvu (ainult iflag)\n"
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr "  skip_bytes  käsitle 'skip=N' kui baitide arvu (ainult iflag)\n"
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr "  seek_bytes  käsitle 'seek=N' kui baitide arvu (ainult oflag)\n"
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, c-format
 msgid ""
 "\n"
@@ -3237,7 +3322,17 @@ msgstr ""
 "Võtmed on:\n"
 "\n"
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr "sisendpuhver suurusega %zu baiti (%s) põhjustas mälu täis saamise"
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr "väljundpuhver suurusega %zu baiti (%s) põhjustas mälu täis saamise"
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
@@ -3246,21 +3341,21 @@ msgstr ""
 "%<PRIuMAX>+%<PRIuMAX> kirjet sisse\n"
 "%<PRIuMAX>+%<PRIuMAX> kirjet välja\n"
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
 msgstr[0] "%<PRIuMAX> lühendatud kirje\n"
 msgstr[1] "%<PRIuMAX> lühendatud kirjet\n"
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
 msgstr[0] "%<PRIuMAX> bait (%s) kopeeritud"
 msgstr[1] "%<PRIuMAX> baiti (%s) kopeeritud"
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr "Lõpmatu B"
 
@@ -3274,83 +3369,83 @@ msgstr "Lõpmatu B"
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
 msgstr ", %g s, %s/s\n"
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, c-format
 msgid "closing input file %s"
 msgstr "sulgen sisendfaili %s"
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr "sulgen väljundfaili %s"
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr "O_DIRECT välja lülitamine ebaõnnestus: %s"
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, c-format
 msgid "writing to %s"
 msgstr "kirjutan faili %s"
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, c-format
 msgid "unrecognized operand %s"
 msgstr "tundmatu operand %s"
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 msgid "invalid conversion"
 msgstr "vigane teisendus"
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 msgid "invalid input flag"
 msgstr "vigane sisendi lipp"
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 msgid "invalid output flag"
 msgstr "vigane väljundi lipp"
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 msgid "invalid status flag"
 msgstr "vigane oleku lipp"
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, c-format
 msgid "invalid number %s"
 msgstr "vigane number %s"
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr "hulgast {ascii,ebcdic,ibm} ei saa ühtegi paari kasutada"
 
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, c-format
 msgid "cannot combine block and unblock"
 msgstr "block ja unblock ei saa koos kasutada"
 
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, c-format
 msgid "cannot combine lcase and ucase"
 msgstr "lcase ja ucase ei saa koos kasutada"
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, c-format
 msgid "cannot combine excl and nocreat"
 msgstr "excl ja nocreat ei saa koos kasutada"
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, c-format
 msgid "cannot combine direct and nocache"
 msgstr "direct ja nocache ei saa koos kasutada"
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
@@ -3359,72 +3454,62 @@ msgstr ""
 "hoiatus: kasutan lseek funktsiooni tuuma vea tõttu alternatiivset meetodit,\n"
 "fail (%s) mt_type=0x%0lx -- tüüpide nimekirja leiate <sys/mtio.h>"
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, c-format
 msgid "%s: cannot skip"
 msgstr "%s: skip ebaõnnestus"
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, c-format
 msgid "%s: cannot seek"
 msgstr "%s: seek ebaõnnestus"
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr "failiviida ületäitumine %s lugemisel"
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr "hoiatus: peale lugemisviga ei pruugi failiviit olla õige"
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr "ei õnnestu tuuma veast mööda minna"
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, c-format
 msgid "setting flags for %s"
 msgstr "sean %s lipud"
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr "sisendpuhver suurusega %zu baiti (%s) põhjustas mälu täis saamise"
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr "väljundpuhver suurusega %zu baiti (%s) põhjustas mälu täis saamise"
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr "%s: ei õnnestu liikuda antud nihkele"
 
-#: src/dd.c:2133
+#: src/dd.c:2172
 #, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
 msgstr "%<PRIdMAX> baidini väljundfailis %s lühendamine ebaõnnestus"
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr "fdatasync %s ebaõnnestus"
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
 msgstr "fsync %s ebaõnnestus"
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, c-format
 msgid "failed to open %s"
 msgstr "%s avamine ebaõnnestus"
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
@@ -3433,96 +3518,105 @@ msgstr ""
 "indeks on liiga suur: ei õnnestu lühendada pikkuseni seek=%<PRIuMAX> (%lu-"
 "baiti) blokki"
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr "%<PRIuMAX> baiti väljundfailis %s lühendamine ebaõnnestus"
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, c-format
 msgid "failed to discard cache for: %s"
 msgstr "puhvist loobumine ebaõnnestus: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr "Paul Eggert"
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr "Failisüsteem"
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr "Tüüp"
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr "blokke"
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr "Kasut"
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr "Vaba"
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr "Kas%"
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr "I-kirjeid"
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr "IKasut"
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr "IVaba"
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr "IKas%"
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr "Haagitud"
 
-#: src/df.c:383
+#: src/df.c:207
+msgid "File"
+msgstr "Fail"
+
+#: src/df.c:387
 #, c-format
-msgid "option --output: field '%s' unknown"
-msgstr "võti --output: väli '%s' on tundmatu"
+msgid "option --output: field %s unknown"
+msgstr "võti --output: väli %s on tundmatu"
 
-#: src/df.c:390
+#: src/df.c:394
 #, c-format
-msgid "option --output: field '%s' used more than once"
-msgstr "võti --option: väli '%s' on esitatud enam kui korra"
+msgid "option --output: field %s used more than once"
+msgstr "võti --option: väli %s on esitatud enam kui korra"
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr "Maht"
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr "Vaba"
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr "Maht"
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
 msgstr "%s-%s"
 
-#: src/df.c:1210
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr "%s ei ole kasutatav: teise seadme poolt üle haagitud"
+
+#: src/df.c:1384
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
 "or all file systems by default.\n"
@@ -3530,29 +3624,29 @@ msgstr ""
 "Esita informatsioon failisüsteemidest, milles iga antud fail asub.\n"
 "Vaikimisi esita infot igast haagitud failisüsteemist.\n"
 
-#: src/df.c:1217
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
 "  -a, --all             väljasta kõik failisüsteemid\n"
 "  -B  --block-size=MAHT kasuta määratud ploki suurust. Näiteks '-BM' "
 "väljastab\n"
 "                        suurused 1 048 576 baidiste blokkidena. MAHT "
 "vorming\n"
-"                        on kirjeldatud allpool.\n"
+"                        on kirjeldatud allpool\n"
 "      --total           väljasta kogusumma\n"
-"  -h, --human-readable  väljasta suurused inimesele loetavalt (n. 1K 234M "
-"2G)\n"
-"  -H, --si              sama, kui kasuta 1000 kordseid, mitte 1024\n"
+"  -h, --human-readable  väljasta suurused 1024 kordsetena (n. 1023M)\n"
+"  -H, --si              väljasta suurused 1000 kordseten (n. 1.1G)\n"
 
-#: src/df.c:1227
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -3565,7 +3659,7 @@ msgstr ""
 "  -l, --local           näita ainult lokaalseid failisüsteeme\n"
 "      --no-sync         enne info lugemist ära kasuta synci (vikimisi)\n"
 
-#: src/df.c:1234
+#: src/df.c:1409
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
 "                               or print all fields if FIELD_LIST is "
@@ -3585,45 +3679,37 @@ msgstr ""
 "  -x, --exclude-type=TÜÜP  ära väljasta infot antud tüüpi failisüsteemidest\n"
 "  -v                    (ignoreeritakse)\n"
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
 "\n"
 "VÄLJAD on komadega eraldatud veergude loend, lubatud nimed on:\n"
 "'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' ja 'target' (vaadake info lehte).\n"
+"'size', 'used', 'avail', 'pcent', 'file' ja 'target' (vaadake info lehte).\n"
 
-#: src/df.c:1285
+#: src/df.c:1460
 #, c-format
 msgid "options %s and %s are mutually exclusive"
 msgstr "võtmed %s ja %s on üksteist välistavad"
 
-#: src/df.c:1335
-msgid "warning: "
-msgstr "hoiatus: "
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr "pikk võti '--megabytes' ei ole soovitatav ja eemaldatakse peagi"
-
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr "failisüsteemi tüüp %s on nii valitute kui ka väljaarvatute nimekirjas"
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr "Hoiatus: "
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 msgid "cannot read table of mounted file systems"
 msgstr "ei õnnestu lugeda haagitud failisüsteemide tabelit"
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr "ühtegi failisüsteemi ei töödeldud"
@@ -3633,7 +3719,7 @@ msgstr "ühtegi failisüsteemi ei töödeldud"
 msgid "H. Peter Anvin"
 msgstr "H. Peter Anvin"
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr "Kasutamine: %s [VÕTI]... [FAIL]\n"
@@ -3717,7 +3803,7 @@ msgstr ""
 "\n"
 
 #: src/dirname.c:59
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
 msgstr "  -z, --zero     lõpeta read reavahetuse asemel sümboliga NUL\n"
 
 #: src/dirname.c:64
@@ -3735,7 +3821,7 @@ msgstr ""
 "  %s dir1/str dir2/str  -> \"dir1\" millele järgneb \"dir2\" \n"
 "  %s stdio.h            -> \".\".\n"
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -3744,14 +3830,13 @@ msgstr ""
 "Kasutamine: %s [VÕTI]... [FAIL]...\n"
 "       või: %s [VÕTI]... --files0-from=F\n"
 
-#: src/du.c:274
+#: src/du.c:285
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr "Summeeri iga faili kettakasutus, kataloogid rekursiivselt.\n"
 
-#: src/du.c:280
+#: src/du.c:291
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3769,11 +3854,11 @@ msgstr ""
 "                        misele fragmenteerumisele, kaudsetele blokkidele "
 "jms\n"
 
-#: src/du.c:289
+#: src/du.c:300
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3788,7 +3873,7 @@ msgstr ""
 "väljastab\n"
 "                        mahud 1 048 576 baidiste blokkidena. MAHT vorming "
 "on\n"
-"                        kirjeldatud allpool.\n"
+"                        kirjeldatud allpool\n"
 "  -b, --bytes           sama kui '--apparent-size --block-size=1'\n"
 "  -c, --total           väljasta kogumaht\n"
 "  -D, --dereference-args  kasuta käsureal antud nimeviidete korral "
@@ -3799,22 +3884,24 @@ msgstr ""
 "on\n"
 "                        sama, kui --summarize\n"
 
-#: src/du.c:302
+#: src/du.c:313
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
 "      --files0-from=F   summeeri failist F loetud failide kettakasutus\n"
 "                        failinimed failis F on eraldatud sümboliga NUL\n"
 "  -H                    sama, kui võti --dereference-args (-D)\n"
 "  -h, --human-readable  väljasta suurused inimesele loetavalt (n. 1K 234M "
 "2G)\n"
+"      --inodes          anna blokkide asemel inode kasutamise informatsioon\n"
 
-#: src/du.c:310
+#: src/du.c:322
 msgid ""
 "  -k                    like --block-size=1K\n"
 "  -L, --dereference     dereference all symbolic links\n"
@@ -3826,21 +3913,21 @@ msgstr ""
 "  -l, --count-links     loenda viiteid eraldi failidena\n"
 "  -m                    sama, kui --block-size=1M\n"
 
-#: src/du.c:316
+#: src/du.c:328
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
 "  -P, --no-dereference  ära järgne nimeviidetele (vaikimisi)\n"
-"  -O, --null            lõpeta iga rida reavahetuse asemel baidiga 0\n"
-"  -S, --separate-dirs   ära arvesta kataloogide suurusi\n"
+"  -S, --separate-dirs   kataliigide korral ära arvesta kataloogide suurusi\n"
 "      --si              nagu -h, aga kasuta 1000 kordseid\n"
 "  -s, --summarize       väljasta iga argumendi kohta summa\n"
 
-#: src/du.c:322
+#: src/du.c:334
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
 "                          or entries greater than SIZE if negative\n"
@@ -3849,9 +3936,9 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
 msgstr ""
 "  -t, --threshold=SUURUS positiivse väärtuse korral välista väiksemad,\n"
 "                        negatiivse korral suuremad kui SUURUS.\n"
@@ -3860,10 +3947,10 @@ msgstr ""
 "      --time=SÕNA       muutmise aja asemel näita üht järgnevaist:\n"
 "                          atime, access, use, ctime või status\n"
 "      --time-style=STIIL esita aeg kasutades järgnevat stiili\n"
-"                          full-iso, long-iso, iso, +VORMING\n"
+"                          full-iso, long-iso, iso, +VORMING;\n"
 "                          VORMING on sama mis 'date' käsu korral\n"
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
@@ -3874,66 +3961,67 @@ msgstr ""
 "      --exclude=PATTERN    välista mustrile vastavad failid\n"
 "  -x, --one-file-system    ära mine muudesse failisüsteemidesse\n"
 
-#: src/du.c:386
+#: src/du.c:398
 msgid "Infinity"
 msgstr "Lõpmatu"
 
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr "haakepunkt %s on juba läbitud"
-
-#: src/du.c:624
+#: src/du.c:636
 #, c-format
 msgid "fts_read failed: %s"
 msgstr "fts_read ebaõnnestus: %s"
 
-#: src/du.c:780
+#: src/du.c:787
 #, c-format
 msgid "invalid maximum depth %s"
 msgstr "vigane maksimaalne sügavus %s"
 
-#: src/du.c:809
+#: src/du.c:816
 #, c-format
 msgid "invalid --threshold argument '-0'"
 msgstr "vigane --threshold argument '-0'"
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr "korraga ei saa summeerida ja näidata kõiki"
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr "hoiatus: summeerimine on sama, kui kasutada --max-depth=0"
 
-#: src/du.c:900
+#: src/du.c:911
 #, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr "hoiatus: summeerimine on konfliktne võtmega --max-depth=%lu"
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+"hoiatus: võtmed --apparent-size ja -b ei ole võtmega --inodes efektiivsed"
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 msgid "file operands cannot be combined with --files0-from"
 msgstr "faili operande ei saa võtmega --files0-from koos kasutada"
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr "%s: viga lugemisel"
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr ""
 "kui failide nimesid loetakse standardsisendist, pole failide nimed %s lubatud"
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 msgid "invalid zero-length file name"
 msgstr "vigane null-pikkusega faili nimi"
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr "kokku"
 
@@ -4041,7 +4129,7 @@ msgstr "Sea keskkonnas iga NIMI=VÄÄRTUS ja käivita käsk.\n"
 #: src/env.c:61
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
 "  -i, --ignore-environment   alusta tühja keskkonnaga\n"
@@ -4121,16 +4209,16 @@ msgid "input line is too long"
 msgstr "sisendi rida on liiga pikk"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr "Mike Parker"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr "James Youngman"
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
@@ -4139,7 +4227,7 @@ msgstr ""
 "Kasutamine: %s AVALDIS\n"
 "       või: %s VÕTI\n"
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -4157,7 +4245,7 @@ msgstr ""
 "\n"
 "  ARG1 & ARG2       ARG1 kui kumbki argument ei ole null või 0, muidu 0\n"
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -4175,7 +4263,7 @@ msgstr ""
 "  ARG1 >= ARG2      ARG1 on suurem või võrdne, kui ARG2\n"
 "  ARG1 > ARG2       ARG1 on suurem, kui ARG2\n"
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
@@ -4185,7 +4273,7 @@ msgstr ""
 "  ARG1 + ARG2       ARG1 ja ARG2 aritmeetiline summa\n"
 "  ARG1 - ARG2       ARG1 ja ARG2 aritmeetiline vahe\n"
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -4198,7 +4286,7 @@ msgstr ""
 "  ARG1 / ARG2       ARG1 jagatud ARG2 täisosa\n"
 "  ARG1 % ARG2       ARG1 jagatud ARG2 jääk\n"
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -4216,7 +4304,7 @@ msgstr ""
 "  index SÕNE SÜMBOLID         SÕNE indeks, kust leiti SÜMBOLID, või 0\n"
 "  length SÕNE                 SÕNE pikkus\n"
 
-#: src/expr.c:251
+#: src/expr.c:250
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
 "                               keyword like 'match' or an operator like '/'\n"
@@ -4228,7 +4316,7 @@ msgstr ""
 "\n"
 "  ( AVALDIS )              AVALDISe väärtus\n"
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -4245,7 +4333,7 @@ msgstr ""
 "Mustri otsing tagastab teksti, mis leiti \\( ja \\) vahel või null; kui\n"
 "\\( ja \\) ei kasutata, tagastatakse leitud sümbolite arv või 0.\n"
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -4256,32 +4344,32 @@ msgstr ""
 "Lõpetamise kood on 0 kui AVALDIS pole ei null ega 0, 1 kui AVALDIS on null\n"
 "või 0, 2 kui AVALDIS on süntaktiliselt vigane ja 3 kui tekkis viga.\n"
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, c-format
 msgid "syntax error"
 msgstr "süntaksi viga"
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, c-format
 msgid "error in regular expression matcher"
 msgstr "viga regulaaravaldisega otsingul"
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, c-format
 msgid "non-integer argument"
 msgstr "mitte-numbriline argument"
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr "nulliga jagamine"
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr "probleemi lahendamiseks seadke LC_ALL=C."
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, c-format
 msgid "the strings compared were %s and %s"
 msgstr "võrreldi sõnesid %s ja %s"
@@ -4291,27 +4379,27 @@ msgstr "võrreldi sõnesid %s ja %s"
 msgid "Niels Moller"
 msgstr "Niels Moller"
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
 msgstr "Lucas algarvu testi tõrge. Seda et peaks juhtuma"
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
 msgstr "squfof järjekorra ületäitumine"
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, c-format
 msgid "%s is not a valid positive integer"
 msgstr "%s ei ole korrektne positiivne täisarv"
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr "%s on liiga suur"
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
@@ -4320,7 +4408,7 @@ msgstr ""
 "Kasutamine: %s [NUMBER]...\n"
 "       või: %s VÕTI\n"
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
 "are specified on the command line, read them from standard input.\n"
@@ -4426,17 +4514,17 @@ msgid "invalid number of columns: %s"
 msgstr "vigane veergude arv: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr "Padraig Brady"
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, c-format
 msgid "Usage: %s\n"
 msgstr "Kasutamine: %s\n"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
@@ -4445,12 +4533,12 @@ msgstr ""
 "kujul.\n"
 "\n"
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, c-format
 msgid "failed to get groups for user %s"
 msgstr "kasutaja %s gruppide lugemine ebaõnnestus"
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, c-format
 msgid "failed to get groups for the current process"
 msgstr "jooksva protsessi gruppide lugemine ebaõnnestus"
@@ -4474,22 +4562,22 @@ msgstr ""
 "Väljasta iga kasutaja või kui seda pole määratud, siis protsessi kasutaja,\n"
 "gruppide info.\n"
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, c-format
 msgid "cannot get real UID"
 msgstr "ei õnnestu lugeda reaalset UID"
 
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, c-format
 msgid "cannot get effective GID"
 msgstr "ei õnnestu lugeda efektiivset GID"
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, c-format
 msgid "cannot get real GID"
 msgstr "ei õnnestu lugeda reaalset GID"
 
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, c-format
 msgid "%s: no such user"
 msgstr "%s: sellist kasutajat pole"
@@ -4540,58 +4628,48 @@ msgstr ""
 "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
 "GB 1000*1000*1000, G 1024*1024*1024 ja nii edasi sümbolitele T, P, E, Z, Y.\n"
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr "%s: fail on liiga palju lühenenud"
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, c-format
 msgid "%s: number of bytes is too large"
 msgstr "%s: baitide arv on liiga suur"
 
-#: src/head.c:440
-#, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr "%s: ei õnnestu liikuda (lseek) algsele positsioonile"
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr "%s: ei õnnestu liikuda nihkele %s"
 
-#: src/head.c:673
+#: src/head.c:423 src/tail.c:457
 #, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "%s: failiviida ümberseadmine ebaõnnestus"
-
-#: src/head.c:798
-#, c-format
-msgid "cannot reposition file pointer for %s"
-msgstr "ei õnnestu muuta %s failiviita"
+msgid "%s: cannot seek to relative offset %s"
+msgstr "%s: ei õnnestu liikuda suhtelisele nihkele %s"
 
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr "%s: %s on nii suur, et seda ei saa esitada"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr "ridu"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr "baite"
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr "vigane ridade arv"
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr "vigane baitide arv"
 
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, c-format
 msgid "invalid trailing option -- %c"
 msgstr "vigane võti lõpus -- %c"
@@ -4636,39 +4714,48 @@ msgid "cannot determine hostname"
 msgstr "ei õnnestu tuvastada süsteemi nime"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr "Arnold Robbins"
 
-#: src/id.c:81
+#: src/id.c:84
 #, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
-msgstr "Kasutamine: %s [VÕTI]... [KASUTAJANIMI]\n"
+msgid "Usage: %s [OPTION]... [USER]\n"
+msgstr "Kasutamine: %s [VÕTI]... [KASUTAJA]\n"
 
-#: src/id.c:82
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
 msgstr ""
-"Väljasta informatsiooni KASUTAJA või käsu kasutaja kohta.\n"
+"Väljasta kasutaja ja grupi info määratud või kui pole antud,\n"
+"hetkel kehtivale kasutajale.\n"
 "\n"
-"  -a              ignoreeri, võti on ühilduvuseks vanemate versioonidega\n"
-"  -Z, --context   väljasta ainult jooksva kasutaja turvakontekst\n"
-"  -g, --group     väljasta ainult grupi ID\n"
-"  -G, --groups    väljasta ainult lisagupid\n"
-"  -n, --name      väljasta numbri asemel nimi, võtmetele -ugG\n"
-"  -r, --real      väljasta efektiivse ID asemel reaalne ID, võtmetega -ugG\n"
-"  -u, --user      väljasta ainult kasutaja ID\n"
 
-#: src/id.c:96
+#: src/id.c:90
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
+msgstr ""
+"  -a             ignoreeri, võti on ühilduvuseks vanemate versioonidega\n"
+"  -Z, --context  väljasta ainult protsessi turvakontekst\n"
+"  -g, --group    väljasta ainult grupi ID\n"
+"  -G, --groups   väljasta ainult lisagupid\n"
+"  -n, --name     väljasta numbri asemel nimi, võtmetele -ugG\n"
+"  -r, --real     väljasta efektiivse ID asemel reaalne ID, võtmetega -ugG\n"
+"  -u, --user     väljasta ainult kasutaja ID\n"
+"  -z, --zero     eralda väljad tühemiku asemel sümboliga NUL;\n"
+"                   vaikimisi vormingu korral ei ole lubatud\n"
+
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
@@ -4676,117 +4763,127 @@ msgstr ""
 "\n"
 "Kui võtmeid pole antud, väljasta komplekt kasutatavat informatsiooni.\n"
 
-#: src/id.c:140
+#: src/id.c:151
+#, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr "--context (-Z) töötab ainult SELinux/SMACK funktsionaalsusega tuumaga"
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr "--context (-Z) töötab ainult SELinux funktsionaalsusega tuumaga"
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr "kui on kasutaja määratud, siis ei saa turvakonteksti väljastada"
 
-#: src/id.c:178
+#: src/id.c:198
 #, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr "ei saa väljastada enam kui ühte \"ainult\" valikut"
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr ""
 "vaikimisi formaati kasutades ei saa väljastada ainult nimesid või reaalset ID"
 
-#: src/id.c:199
+#: src/id.c:209
+#, c-format
+msgid "option --zero not permitted in default format"
+msgstr "võti --zero ei ole vaikimisi vorminguga lubatud"
+
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
 msgstr "protsessi konteksti ei õnnestu tuvastada"
 
-#: src/id.c:224
+#: src/id.c:265
 #, c-format
 msgid "cannot get effective UID"
 msgstr "ei õnnestu lugeda efektiivset UID"
 
-#: src/id.c:311
+#: src/id.c:354
 #, c-format
 msgid "cannot find name for user ID %s"
 msgstr "ei leia kasutaja ID %s vastavat kasutajanime"
 
-#: src/id.c:329
+#: src/id.c:372
 #, c-format
 msgid "uid=%s"
 msgstr "uid=%s"
 
-#: src/id.c:334
+#: src/id.c:377
 #, c-format
 msgid " gid=%s"
 msgstr " gid=%s"
 
-#: src/id.c:341
+#: src/id.c:384
 #, c-format
 msgid " euid=%s"
 msgstr " euid=%s"
 
-#: src/id.c:349
+#: src/id.c:392
 #, c-format
 msgid " egid=%s"
 msgstr " egid=%s"
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr " grupid="
 
-#: src/id.c:393
+#: src/id.c:437
 #, c-format
 msgid " context=%s"
 msgstr " kontekst=%s"
 
-#: src/install.c:373
+#: src/install.c:376
 #, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr "hoiatus: %s: ei saa muuta kontekstiks %s"
 
-#: src/install.c:414
+#: src/install.c:417
 #, c-format
 msgid "creating directory %s"
 msgstr "loon kataloogi %s"
 
-#: src/install.c:482
+#: src/install.c:485
 #, c-format
 msgid "cannot change ownership of %s"
 msgstr "ei õnnestu muuta %s omanikku"
 
-#: src/install.c:506
+#: src/install.c:509
 #, c-format
 msgid "cannot set time stamps for %s"
 msgstr "ei õnnestu seada %s ajatempleid"
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, c-format
 msgid "fork system call failed"
 msgstr "süsteemifunktsioon fork ebaõnnestus"
 
-#: src/install.c:531
+#: src/install.c:535
 #, c-format
 msgid "cannot run %s"
 msgstr "käsku %s ei saa käivitada"
 
-#: src/install.c:535
+#: src/install.c:539
 #, c-format
 msgid "waiting for strip"
 msgstr "ootan strip käsu lõpetamist"
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr "strip protsess lõpetas veaga"
 
-#: src/install.c:558
+#: src/install.c:565
 #, c-format
 msgid "invalid user %s"
 msgstr "vigane kasutaja %s"
 
-#: src/install.c:594
+#: src/install.c:601
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -4799,7 +4896,7 @@ msgstr ""
 "       või: %s [VÕTI]... -t KATALOOG ALG...\n"
 "       või: %s [VÕTI]... -d KATALOOG...\n"
 
-#: src/install.c:601
+#: src/install.c:608
 msgid ""
 "\n"
 "This install program copies files (often just compiled) into destination\n"
@@ -4821,7 +4918,7 @@ msgstr ""
 "olemasolevasse kataloogi seades õigused ja omaniku/grupi.\n"
 "Neljas variant loob antud kataloogi(d).\n"
 
-#: src/install.c:615
+#: src/install.c:622
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
 "  -b                  like --backup but does not accept an argument\n"
@@ -4840,7 +4937,7 @@ msgstr ""
 "  -d, --directory     käsitle kõiki argumente kataloogidena; loo kõik\n"
 "                      antud kataloogide komponendid\n"
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -4857,7 +4954,7 @@ msgstr ""
 "  -m, --mode=MOOD     sea rwxr-xr-x õiguste asemel antud õigused\n"
 "  -o, --owner=OMANIK  sea omanik (ainult super-kasutaja)\n"
 
-#: src/install.c:631
+#: src/install.c:638
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
 "files\n"
@@ -4879,66 +4976,63 @@ msgstr ""
 "  -T, --no-target-directory käsitle SIHT tavalise failina\n"
 "  -v, --verbose       väljasta iga loodava kataloogi nimi\n"
 
-#: src/install.c:641
+#: src/install.c:648
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
 "      --preserve-context  säilita SELinux turvakontekst\n"
-"  -Z, --context=KONTEKST  sea SELinux turvakontekst failidele ja "
-"kataloogidele\n"
+"  -Z                      sea SELinux vaikimisi turvakontekst\n"
+"      --context[=KTST]    nagu -Z, või kui KTST on antud, sea SELinux\n"
+"                          või SMACK turvakontekst\n"
 
-#: src/install.c:859
+#: src/install.c:696 src/unlink.c:86
+#, c-format
+msgid "cannot unlink %s"
+msgstr "%s ei saa kustutada"
+
+#: src/install.c:877
 #, c-format
 msgid ""
 "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
 msgstr ""
 "HOIATUS: ignoreerin --preserve-context; see tuum ei kasuta SELinux laiendusi"
 
-#: src/install.c:869
-#, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
-msgstr ""
-"HOIATUS: ignoreerin --context (-Z); see tuum ei kasuta SELinux laiendusi"
-
-#: src/install.c:886
+#: src/install.c:917
 #, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr "kataloogi installeerimisel ei saa kasutada võtit strip"
 
-#: src/install.c:889
+#: src/install.c:920
 #, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr "kataloogi installeerimisel ei saa sihtkataloogi määrata"
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr "ei saa määrata kontekstiks %s ja seda säilitada"
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, c-format
 msgid "invalid mode %s"
 msgstr "vigane mood %s"
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr "HOIATUS: ignoreerin võtit --strip-program, kuna võtit -s ei kasutata"
 
-#: src/install.c:959
+#: src/install.c:1001
 #, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr ""
 "parameetrid --compare (-C) ja --preserve-timestamps on üksteist välistavad"
 
-#: src/install.c:966
+#: src/install.c:1008
 #, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr "parameetrid --compare (-C) ja --strip on üksteist välistavad"
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -4951,7 +5045,7 @@ msgstr ""
 msgid "Mike Haertel"
 msgstr "Mike Haertel"
 
-#: src/join.c:191
+#: src/join.c:195
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
 "standard output.  The default join field is the first, delimited\n"
@@ -4970,7 +5064,7 @@ msgstr ""
 "  -a FAILINUM       samuti väljasta paariliseta read failist FAILINUM\n"
 "  -e TÜHI           asenda puuduvad sisendväljad sõnaga TÜHI\n"
 
-#: src/join.c:200
+#: src/join.c:204
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
 "  -j FIELD          equivalent to '-1 FIELD -2 FIELD'\n"
@@ -4982,7 +5076,7 @@ msgstr ""
 "  -o VORMING        väljundrea koostamise VORMING\n"
 "  -t SÜMBOL         kasuta SÜMBOLit sisend- ja väljundväljade eraldajana\n"
 
-#: src/join.c:206
+#: src/join.c:210
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
 "  -1 FIELD          join on this FIELD of file 1\n"
@@ -5002,7 +5096,11 @@ msgstr ""
 "  --header          käsitle iga faili esimest rida väljade päistena,\n"
 "                    väljasta need muutmata\n"
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr "  -z, --zero-terminated     lõpeta read reavahetuse asemel baidiga 0\n"
+
+#: src/join.c:225
 msgid ""
 "\n"
 "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n"
@@ -5039,47 +5137,47 @@ msgstr ""
 "Kui sisend pole järjestatud ja mõningaid ridu ei saa ühendada,\n"
 "väljastatakse hoiatus.\n"
 
-#: src/join.c:403
+#: src/join.c:410
 #, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
 msgstr "%s:%<PRIuMAX>: ei ole järjestatud: %.*s"
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, c-format
 msgid "invalid field number: %s"
 msgstr "vigane välja number: %s"
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, c-format
 msgid "invalid field specifier: %s"
 msgstr "vigane välja määrang: %s"
 
-#: src/join.c:877
+#: src/join.c:884
 #, c-format
 msgid "invalid file number in field spec: %s"
 msgstr "vigane faili number välja määrangus: %s"
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr "ühildamatud väljad %lu, %lu"
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr "konfliktsed tühja-välja asendamise sõned"
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, c-format
 msgid "multi-character tab %s"
 msgstr "mitme-sümboliline tabulaator %s"
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr "mitteühilduvad tabulaatorid"
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr "mõlemad failid ei saa olla standardsisendid"
@@ -5196,47 +5294,47 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr "ei õnnestu luua viidet %s -> %s"
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr "%s: kataloogidele ei saa luua viiteid"
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, c-format
 msgid "%s: cannot overwrite directory"
 msgstr "%s: kataloogi ei saa üle kirjutada"
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
 msgstr "%s: asendan %s? "
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, c-format
 msgid "failed to create symbolic link %s"
 msgstr "ei õnnestu luua nimeviidet %s"
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr "ei õnnestu luua nimeviidet %s -> %s"
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr "viite loomine failile %.0s%s ebaõnnestus"
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, c-format
 msgid "failed to create hard link %s"
 msgstr "ei õnnestu luua viidet %s"
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, c-format
 msgid "failed to create hard link %s => %s"
 msgstr "ei õnnestu luua viidet %s => %s"
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -5249,7 +5347,7 @@ msgstr ""
 "  või:  %s [VÕTI]... SIHT... KATALOOG           (3. vorm)\n"
 "  või:  %s [VÕTI]... -t KATALOOG SIHT...        (4. vorm)\n"
 
-#: src/ln.c:381
+#: src/ln.c:398
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
 "In the 2nd form, create a link to TARGET in the current directory.\n"
@@ -5271,7 +5369,7 @@ msgstr ""
 "suhtelist\n"
 "viidet tema vanemkataloogi suhtes.\n"
 
-#: src/ln.c:394
+#: src/ln.c:411
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
 "file\n"
@@ -5293,7 +5391,7 @@ msgstr ""
 "luua)\n"
 "  -f, --force                 eemalda olemasolevad sihtfailid\n"
 
-#: src/ln.c:402
+#: src/ln.c:419
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
 "  -L, --logical               dereference TARGETs that are symbolic links\n"
@@ -5311,7 +5409,7 @@ msgstr ""
 "  -P, --physical              loo viide nimeviitele\n"
 "  -s, --symbolic              loo viidete asemel nimeviited\n"
 
-#: src/ln.c:411
+#: src/ln.c:428
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
 "  -t, --target-directory=DIRECTORY  specify the DIRECTORY in which to "
@@ -5325,7 +5423,7 @@ msgstr ""
 "  -T, --no-target-directory   käsitle viite nime tavalise failina\n"
 "  -v, --verbose               väljasta faili nimi enne viite loomist\n"
 
-#: src/ln.c:433
+#: src/ln.c:450
 #, c-format
 msgid ""
 "\n"
@@ -5336,12 +5434,12 @@ msgstr ""
 "Võti -s ignoreerib -L ja -P.  Muidu, viimane võti kontrollib kuidas käituda\n"
 "nimeviidetega, kasutades vaikimisi %s.\n"
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr "--target-directory ja --no-target-directory ei saa koos kasutada"
 
-#: src/ln.c:588
+#: src/ln.c:605
 #, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr "--relative ei saa kasutada võtmeta --symbolic"
@@ -5374,7 +5472,7 @@ msgstr "kasutajanime pole"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 msgid "%b %e  %Y"
 msgstr "%e. %b  %Y"
 
@@ -5383,94 +5481,94 @@ msgstr "%e. %b  %Y"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 msgid "%b %e %H:%M"
 msgstr "%e. %b %H:%M"
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr "eiran vigast keskkonnamuutuja QUOTING_STYLE väärtust: %s"
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr "eiran vigast laiuse kirjeldust keskkonnamuutujas COLUMNS: %s"
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr "eiran vigast tabulaatori kirjeldust keskkonnamuutujas TABSIZE: %s"
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, c-format
 msgid "invalid line width: %s"
 msgstr "vigane rea laius: %s"
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, c-format
 msgid "invalid tab size: %s"
 msgstr "vigane tabulaatori suurus: %s"
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, c-format
 msgid "invalid time style format %s"
 msgstr "vigane ajamäärang %s"
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 msgid "Valid arguments are:\n"
 msgstr "Lubatud argumendid on:\n"
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr "  - +VORMING (n., +%H:%M) 'date'-stiilis vorming\n"
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr "viga kuu sõnede initsialiseerimisel"
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, c-format
 msgid "unrecognized prefix: %s"
 msgstr "tundmatu prefiks: %s"
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr "arusaamatu väärtus keskkonnamuutuja LS_COLORS jaoks"
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, c-format
 msgid "cannot open directory %s"
 msgstr "kataloogi %s ei saa avada"
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, c-format
 msgid "cannot determine device and inode of %s"
 msgstr "ei õnnestu tuvastada %s seadet ja i-kirje numbrit"
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, c-format
 msgid "%s: not listing already-listed directory"
 msgstr "%s: ei näita juba näidatud kataloogi"
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, c-format
 msgid "reading directory %s"
 msgstr "loen kataloogi %s"
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, c-format
 msgid "closing directory %s"
 msgstr "sulen kataloogi %s"
 
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, c-format
 msgid "cannot compare file names %s and %s"
 msgstr "failide %s ja %s nimesid ei õnnestu võrrelda"
 
-#: src/ls.c:4721
+#: src/ls.c:4781
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
 "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n"
@@ -5479,7 +5577,7 @@ msgstr ""
 "Kui ei ole kasutatud võtmeid -cftuvSUX ega --sort, järjesta väljund\n"
 "tähestikuliselt\n"
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
 "  -A, --almost-all           do not list implied . and ..\n"
@@ -5493,24 +5591,24 @@ msgstr ""
 "  -b, --escape               väljasta mitte-esitatavad sümbolid\n"
 "                             C-style vormingus\n"
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
 "      --block-size=SUURUS    kasuta määratud ploki suurust. Näiteks\n"
 "                               '--block-size=M' väljastab suurused 1 048 "
 "576\n"
 "                               baidiste blokkidena. SUURUS vorming on "
-"allpool.\n"
+"allpool\n"
 "  -B, --ignore-backups       ära näita nimesid, mille lõpus on ~\n"
 "  -c                         võtmega -lt: järjesta ja näita ctime (faili\n"
 "                               oleku viimase muutmise aeg)\n"
@@ -5518,28 +5616,27 @@ msgstr ""
 "järgi\n"
 "                               muidu: järjesta ctime järgi, uusim esimesena\n"
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 "  -C                         esita väljund veergudena\n"
 "      --color[=MILLAL]       määra, millal kasutada failitüüpide "
 "eristamiseks\n"
-"                             värve. MILLAL on vaikimisi 'always',\n"
+"                             värve; MILLAL on vaikimisi 'always',\n"
 "                             võib olla ka 'never' või 'auto', Rohkem infot\n"
 "                             allpool\n"
 "  -d, --directory            näita kataloogide sisu asemel neid endid, ei\n"
 "                             lahenda nimeviiteid\n"
 "  -D, --dired                vorminda väljund Emacs dired moodile\n"
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
 "  -F, --classify             append indicator (one of */=>@|) to entries\n"
@@ -5555,42 +5652,44 @@ msgstr ""
 "                               single-column -1, verbose -l, vertical -C\n"
 "      --full-time            nagu -l --time-style=full-iso\n"
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr "  -g                         nagu -l, aga ei näita omanikku\n"
 
-#: src/ls.c:4763
+#: src/ls.c:4823
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 "      --group-directories-first\n"
-"                             grupeeri kataloogid enne faile.\n"
+"                             grupeeri kataloogid enne faile;\n"
 "                               täienda võtmega --sort, aga --sort=none (-U)\n"
 "                               blokeerib grupeerimise\n"
 
-#: src/ls.c:4769
+#: src/ls.c:4829
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
 "  -G, --no-group        pikas loetelus ei väljasta gruppide nimesid\n"
-"  -h, --human-readable  väljasta suurused inimesele loetavalt (n. 1K 234M "
-"2G)\n"
+"  -h, --human-readable  võtmetega -l, -s, väljasta suurused inimesele "
+"loetavalt\n"
+"                          (n. 1K 234M 2G)\n"
 "      --si              sama, kui kasuta 1000 kordseid, mitte 1024\n"
 
-#: src/ls.c:4775
+#: src/ls.c:4835
 msgid ""
 "  -H, --dereference-command-line\n"
 "                             follow symbolic links listed on the command "
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
@@ -5600,11 +5699,11 @@ msgstr ""
 "      --dereference-command-line-symlink-to-dir\n"
 "                             järgne igale käsureal olevale nimeviitele, kui "
 "see\n"
-"                             viitab kataloogile\n"
+"                               viitab kataloogile\n"
 "      --hide=MUSTER          ära näita mustrile vastavaid elemente\n"
-"                             (-a või -A tühistab)\n"
+"                               (-a või -A tühistab)\n"
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
 "names:\n"
@@ -5613,16 +5712,16 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 "      --indicator-style=SÕNA lisa nimedele indikaator, vastavalt antud\n"
 "                             stiilile: none (vaikimisi), slash (-p),\n"
 "                             file-type (--file-type), classify (-F)\n"
 "  -i, --inode                väljasta iga faili i-kirje number\n"
 "  -I, --ignore=MUSTER        ära näita shelli mustrile vastavaid nimesid\n"
-"  -k, --kibibytes            kasuta 1024 baidiseid blokke\n"
+"  -k, --kibibytes            vaikimisi kasuta 1024 baidiseid blokke\n"
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -5636,7 +5735,7 @@ msgstr ""
 "                             asemel infot viidatavast failist\n"
 "  -m                         väljasta nimed komadega eraldatult\n"
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -5653,11 +5752,11 @@ msgstr ""
 "  -o                         nagu -l, aga ära väljasta grupi infot\n"
 "  -p, --indicator-style=slash lisa kataloogide nimedele lõppu /\n"
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -5666,14 +5765,14 @@ msgid ""
 msgstr ""
 "  -q, --hide-control-chars   väljasta ? mitte-esitatava sümboli asemel\n"
 "      --show-control-chars   näita mitte-esitatavat sümbolit, nagu on\n"
-"                             (vaikimisi, kui programm on 'ls' ja väljund\n"
-"                             ei ole terminal)\n"
+"                               (vaikimisi, kui programm on 'ls' ja väljund\n"
+"                               ei ole terminal)\n"
 "  -Q, --quote-name           väljasta nimed jutumärkide vahel\n"
 "      --quoting-style=SÕNA   kasuta nimede kvootimisel stiili:\n"
 "                               literal, locale, shell, shell-always, c, "
 "escape\n"
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
 "  -R, --recursive            list subdirectories recursively\n"
@@ -5684,40 +5783,45 @@ msgstr ""
 "  -R, --recursive            esita alamkataloogid rekursiivselt\n"
 "  -s, --size                 väljasta iga faili suurus plokkides\n"
 
-#: src/ls.c:4825
+#: src/ls.c:4886
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 "  -S                         järjesta faili suuruse järgi\n"
-"      --sort=SÕNA            kasuta järjestamisel nime asemel sõna: none -"
-"U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=SÕNA            võtmega -l, näita muutmise aja asemel:\n"
-"                             atime -u, access -u, use -u, ctime -c\n"
-"                             või status -c; kasuta antud aega järjestamise "
-"võtmena,\n"
-"                             kui kasutati --sort=time\n"
-
-#: src/ls.c:4835
+"      --sort=SÕNA            kasuta järjestamisel nime asemel sõna: none (-"
+"U),\n"
+"                             size (-S), time (-t), version (-v), extension (-"
+"X)\n"
+"      --time=SÕNA            võtmega -l, näita vaikimisi muutmise aja "
+"asemel:\n"
+"                             atime või access või use (-u), ctime või\n"
+"                             status (-c); samuti kasuta antud aega\n"
+"                             järjestamise võtmena, kui kasutati --sort=time\n"
+
+#: src/ls.c:4896
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
 msgstr ""
 "      --time-style=SÕNA      võtmega -l, näita aegu kasutades stiili SÕNA:\n"
-"                               full-iso, long-iso, iso, locale, +VORMING\n"
+"                               full-iso, long-iso, iso, locale, +VORMING;\n"
 "                             VORMINGut käsitletakse kui 'date'; kui VORMING\n"
 "                             on VORMING1<reavahetus>VORMING2, rakendub\n"
 "                             VORMING1 vanematele failidele ja VORMING2\n"
@@ -5725,7 +5829,7 @@ msgstr ""
 "                             kasutatakse SONA ainult mitte-POSIX lokaadi\n"
 "                             muutmise aegade järjestamisel\n"
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 msgid ""
 "  -t                         sort by modification time, newest first\n"
 "  -T, --tabsize=COLS         assume tab stops at each COLS instead of 8\n"
@@ -5734,39 +5838,39 @@ msgstr ""
 "esimesena\n"
 "  -T, --tabsize=VEERGE       sea tabulaatori pikkus (vaikimisi 8 veergu)\n"
 
-#: src/ls.c:4848
+#: src/ls.c:4912
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
 msgstr ""
-"  -u                         võtmega -lt: järjesta ja näita kasutamise aega\n"
+"  -u                         võtmega -lt: järjesta ja näita kasutamise "
+"aega;\n"
 "                               võtmega -l: näita kasutamise aega ja "
 "järjesta\n"
-"                                 nime järgi\n"
+"                                 nime järgi;\n"
 "                               muidu: järjesta kasutamise aja järgi\n"
 "  -U                         ära järjesta; väljasta kirjed nagu on "
 "kataloogis\n"
 "  -v                         järjesta versiooni järgi\n"
 
-#: src/ls.c:4855
+#: src/ls.c:4919
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 "  -w, --width=VEERGE         määra ekraani laius\n"
 "  -x                         väljasta nimed ridadesse, mitte veergusesse\n"
 "  -X                         järjesta tähestikuliselt laiendite järgi\n"
-"  -Z, --context              väljasta iga faili kohta SELinux turvakontekst\n"
+"  -Z, --context              väljasta iga faili kohta turvakontekst\n"
 "  -1                         väljasta üks nimi rea kohta\n"
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -5781,7 +5885,7 @@ msgstr ""
 "LS_COLORS mõjutab värviseadeid. Selle muutuja seadmiseks kasutage dircolors\n"
 "käsku.\n"
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -5857,26 +5961,23 @@ msgstr "  -t, --text           loe tekstimoodis (vaikimisi)\n"
 #: src/md5sum.c:195
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
 "\n"
-"Järgmised võtmed on kasulikud ainult kontrollsummade kontrollimisel:\n"
+"Järgmised neli võtit on kasulikud ainult kontrollsummade kontrollimisel:\n"
 "      --quiet          ära väljasta OK iga eduka kontrolli kohta\n"
 "      --status         ära väljasta midagi, tulemust näitab lõpetamise kood\n"
+"      --strict         vigaste kontrollsummade korral lõpeta mitte-nulliga\n"
 "  -w, --warn           hoiata vigaselt vormindatud kontrollsummadest\n"
 "\n"
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-"      --strict         võtmega --check, lõpeta vigase sisendi korral veaga\n"
-
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, c-format
 msgid ""
 "\n"
@@ -5891,162 +5992,194 @@ msgstr ""
 "rida kontrollsummaga, seejärel sümbol, mis märgib faili tüüpi ('*' kahend-\n"
 "ja tühik tekstifaili korral) ja seejärel faili nimi.\n"
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, c-format
 msgid "%s: too many checksum lines"
 msgstr "%s: liiga palju kontrollsumma ridu"
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr "%s: %<PRIuMAX>: vigaselt vormindatud %s kontrollsumma rida"
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr "%s: avamine või lugemine ebaõnnestus\n"
 
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr "EBAÕNNESTUS"
 
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr "OK"
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr "%s: korrektselt vormindatud %s kontrollsumma ridu pole"
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
 msgstr[0] "HOIATUS: %<PRIuMAX>: vigaselt vormindatud kontrollsumma rida"
 msgstr[1] "HOIATUS: %<PRIuMAX>: vigaselt vormindatud kontrollsumma read"
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
 msgstr[0] "HOIATUS: %<PRIuMAX> näidatud faili ei saanud lugeda"
 msgstr[1] "HOIATUS: %<PRIuMAX> näidatud faile ei saanud lugeda"
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
 msgstr[0] "HOIATUS: %<PRIuMAX> arvutatud kontrollsumma EI klappinud"
 msgstr[1] "HOIATUS: %<PRIuMAX> arvutatud kontrollsummad EI klappinud"
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
 msgstr "--tag ei toeta --text moodi"
 
-#: src/md5sum.c:766
+#: src/md5sum.c:770
 #, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr "võti --tag ei oma mõtet kontrollsummade kontrollimisel"
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
 msgstr "võtmed --binary ja --text ei oma kontrollsummade kontrollimisel mõtet"
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr "võtit --status on mõtet kasutada ainult kontrollsummade kontrollimisel"
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr "võtit --warn on mõtet kasutada ainult kontrollsummade kontrollimisel"
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr "võtit --quiet on mõtet kasutada ainult kontrollsummade kontrollimisel"
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr "võtit --strict on mõtet kasutada ainult kontrollsummade kontrollimisel"
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr "Kasutamine: %s [VÕTI]... KATALOOG...\n"
 
-#: src/mkdir.c:57
+#: src/mkdir.c:59
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
 msgstr "Loo KATALOOGid, kui neid juba pole.\n"
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 "  -m, --mode=MOOD   seab õigused (nagu chmod), mitte a=rwx - umask\n"
 "  -p, --parents     loob vajadusel ülemised kataloogid, kui need on olemas,\n"
 "                    siis veateadet ei väljasta\n"
 "  -v, --verbose     teavitab igast loodud kataloogist\n"
-"  -Z, --context=CTX sea iga loodud kataloogi SELinux turvakontekstiks CTX\n"
 
-#: src/mkdir.c:168
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+"  -Z                   sea iga loodud kataloogi SELinux vaikimisi "
+"turvakontekst\n"
+"      --context[=KTST]  nagu -Z, või kui CTX on antud, sea SELinux\n"
+"                         või SMACK turvakontekst\n"
+
+#: src/mkdir.c:127 src/mkdir.c:172
+#, c-format
+msgid "failed to set default creation context for %s"
+msgstr "vaikimisi loomise konteksti %s seadmine ebaõnnestus"
+
+#: src/mkdir.c:191
+#, c-format
+msgid "failed to restore context for %s"
+msgstr "ei õnnestu taastada %s konteksti"
+
+#: src/mkdir.c:231
 #, c-format
 msgid "created directory %s"
 msgstr "kataloog %s on loodud"
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr "hoiatus: ignoreerin --context; see nõuab SELinux/SMACK tuuma"
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr "Kasutamine: %s [VÕTI]... NIMI...\n"
 
-#: src/mkfifo.c:52
+#: src/mkfifo.c:54
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
 msgstr "Loo antud NIMega torud (FIFOd).\n"
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
 msgstr "  -m, --mode=MOOD   sea õigused MOOD, mitte a=rw - umask\n"
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
-msgstr "  -Z, --context=KTST  sea iga nime SELinux turvakontekst\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+"  -Z                   sea SELinux vaikimisi turvakontekst\n"
+"      --context[=KTST]  nagu -Z, või kui CTX on antud, sea SELinux\n"
+"                         või SMACK turvakontekst\n"
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, c-format
 msgid "invalid mode"
 msgstr "vigane mood"
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr "mood peab määrama ainult failiõigused"
 
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
+#, c-format
+msgid "cannot set permissions of %s"
+msgstr "ei õnnestu seada %s õigusi"
+
+#: src/mknod.c:54
 #, c-format
 msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr "Kasutamine: %s [VÕTI]... NIMI TÜÜP [PÕHI ALAM]\n"
 
-#: src/mknod.c:54
+#: src/mknod.c:56
 msgid "Create the special file NAME of the given TYPE.\n"
 msgstr "Loo antud NIMEga ja TÜÜPi seadmefail.\n"
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr "  -Z, --context=KTST  sea nime SELinux turvakontekst\n"
-
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -6061,7 +6194,7 @@ msgstr ""
 "käsitletakse seda kuueteistkümnendarvuna. Kui See algab numbriga 0,\n"
 "käsitletakse seda kaheksandarvuna, muidu kümnendarvuna. TÜÜP võib olla:\n"
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 msgid ""
 "\n"
 "  b      create a block (buffered) special file\n"
@@ -6073,56 +6206,56 @@ msgstr ""
 "  c, u   loo sümbolseade (puhverdamata)\n"
 "  p      loo FIFO\n"
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 msgid "Special files require major and minor device numbers."
 msgstr ""
 "Seadmefailide loomisel peab olema määratud nii klassi, kui esindaja number."
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 msgid "Fifos do not have major and minor device numbers."
 msgstr "Fifodel puuduvad seadme klassi ja esindaja numbrid."
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, c-format
 msgid "block special files not supported"
 msgstr "blokkseadme faile ei toetata"
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, c-format
 msgid "character special files not supported"
 msgstr "sümbolseadme faile ei toetata"
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, c-format
 msgid "invalid major device number %s"
 msgstr "vigane seadme põhinumber %s"
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, c-format
 msgid "invalid minor device number %s"
 msgstr "vigane seadme alamnumber %s"
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, c-format
 msgid "invalid device %s %s"
 msgstr "vigane seade %s %s"
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, c-format
 msgid "invalid device type %s"
 msgstr "vigane seadme tüüp %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr "Eric Blake"
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr "Kasutamine: %s [VÕTI]... [MAATRIKS]\n"
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
 "TEMPLATE must contain at least 3 consecutive 'X's in last component.\n"
@@ -6132,12 +6265,12 @@ msgstr ""
 "MAATRIKS peab sisaldama lõpus vähemalt kolm järjestikulist 'X'.\n"
 "Kui maatriksit ei näidatud, kasutatakse tmp.XXXXXXXXXX ja --tmpdir.\n"
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr "Failis luuakse u+rw, kataloogid u+rwx, miinus umaski piirangud.\n"
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
@@ -6147,99 +6280,92 @@ msgstr ""
 "  -u, --dry-run       ära loo midagi, ainult väljasta nimi (ebaturvaline)\n"
 "  -q, --quiet         blokeeri faili/kataloogi loomise vea diagnostika\n"
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
-"      --suffix=SUF    lisa maatriksile SUF.  SUF ei tohi sisaldada "
+"      --suffix=SUF    lisa maatriksile SUF;  SUF ei tohi sisaldada "
 "kaldkriipsu.\n"
 "                        Seda parameetrit eeldadakse juhul, kui maatriks ei\n"
 "                        lõppe sümboliga X.\n"
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
-"      --tmpdir[=KAT]  interpreteeri maatriksit kataloogi suhtes. Kui KAT "
+"      --tmpdir[=KAT]  interpreteeri maatriksit kataloogi suhtes; Kui KAT "
 "pole\n"
 "                        antud, kasuta $TMPDIR, kui seda pole seatud, siis /"
 "tmp.\n"
 "                        Selle võtme kasutamisel ei saa maatriks olla "
 "absoluutne\n"
-"                        nimi. Erinevalt võtmest -t, võib maatriks sisaldada\n"
+"                        nimi; Erinevalt võtmest -t, võib maatriks sisaldada\n"
 "                        kaldkriipse, aga mktemp loob ainult viimase "
 "komponendi\n"
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
 msgstr ""
-"  -p KAT              kasuta prefiksina KAT; eeldab -t [mittesoovitatav]\n"
 "  -t                  interpreteeri maatriksit nime komponendina kataloogi\n"
 "                        suhtes: $TMPDIR, kui on seatud või -p võtmega "
 "näidatud\n"
 "                        kataloog või /tmp [mittesoovitatav]\n"
 
-#: src/mktemp.c:223
-#, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr "standard veavoo ümbersuunamine /dev/null peale ebaõnnestus"
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, c-format
 msgid "too many templates"
 msgstr "liiga palju maatrikseid"
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr "võtmega --suffix, maatriks %s peab lõppema tähega X"
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr "vigane sufiks %s, sisaldab kataloogi eraldajat"
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr "maatriks %s sisaldab liiga vähe X tähti"
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr "vigane maatriks %s, sisaldab kataloogi eraldajaid"
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr "vigane maatriks, %s; võtmega --tmpdir, ei saa see olla absoluutne"
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, c-format
 msgid "failed to create directory via template %s"
 msgstr "maatriksiga %s ei õnnestunud kataloogi luua"
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, c-format
 msgid "failed to create file via template %s"
 msgstr "maatriksiga %s ei õnnestunud faili luua"
 
-#: src/mv.c:292
+#: src/mv.c:294
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
 msgstr "Nimeta fail ümber või tõsta argumendid antud kataloogi.\n"
 
-#: src/mv.c:298
+#: src/mv.c:300
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
 "file\n"
@@ -6260,7 +6386,7 @@ msgstr ""
 "Kui te annate enam kui ühe võtmetest -i, -f, -n, ainult viimane jääb "
 "kehtima.\n"
 
-#: src/mv.c:307
+#: src/mv.c:309
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
@@ -6271,7 +6397,7 @@ msgstr ""
 "                                 lõpus olevad kaldkriipsud\n"
 "  -S, --suffix=SUFIKS          määra varukoopia järelliide\n"
 
-#: src/mv.c:312
+#: src/mv.c:314
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
 "DIRECTORY\n"
@@ -6280,6 +6406,8 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
 "  -t, --target-directory=KATALOOG  tõsta kõik antud allikad kataloogi\n"
 "  -T, --no-target-directory    käsitle sihtkohta tavalise failina\n"
@@ -6287,6 +6415,8 @@ msgstr ""
 "sihtfail\n"
 "                               või kui sihtfail puudub\n"
 "  -v, --verbose                selgita mida tehakse\n"
+"  -Z, --context                sea sihtfailile SELinux vaimisi "
+"turvakontekst\n"
 
 #: src/nice.c:72
 #, c-format
@@ -6575,76 +6705,71 @@ msgid "%s: invalid number to ignore"
 msgstr "%s: vigane number ignoreerimiseks"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
 msgstr "Assaf Gordon"
 
-#: src/numfmt.c:676
+#: src/numfmt.c:659
 #, c-format
-msgid "value too large to be converted: '%s'"
-msgstr "väärtus on teisendamiseks liiga suur: '%s'"
+msgid "value too large to be converted: %s"
+msgstr "väärtus on teisendamiseks liiga suur: %s"
 
-#: src/numfmt.c:680
+#: src/numfmt.c:663
 #, c-format
-msgid "invalid number: '%s'"
-msgstr "vigane number: '%s'"
+msgid "invalid number: %s"
+msgstr "vigane number: %s"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
-msgstr "ei kasuta sisendi sufiksit: '%s' (kaaluge --from kasutamist)"
+msgid "rejecting suffix in input: %s (consider using --from)"
+msgstr "ei kasuta sisendi sufiksit: %s (kaaluge --from kasutamist)"
 
-#: src/numfmt.c:688
+#: src/numfmt.c:671
 #, c-format
-msgid "invalid suffix in input: '%s'"
-msgstr "vigane sufiks sisendis: '%s'"
+msgid "invalid suffix in input: %s"
+msgstr "vigane sufiks sisendis: %s"
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
-msgstr "sisendis puudub sufiks 'i': '%s' (n. Ki/Mi/Gi)"
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
+msgstr "sisendis puudub sufiks 'i': %s (n. Ki/Mi/Gi)"
 
-#: src/numfmt.c:723
+#: src/numfmt.c:722 src/numfmt.c:768
 #, c-format
 msgid "failed to prepare value '%Lf' for printing"
 msgstr "väärtuse '%Lf' väljastamiseks ettevalmistamine ebaõnnestus"
 
-#: src/numfmt.c:787
-#, c-format
-msgid "invalid unit size: '%s'"
-msgstr "vigane ühiku suurus: '%s'"
-
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
+#: src/numfmt.c:791
 #, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr "mälu on otsas (küsiti %zu baiti)"
+msgid "invalid unit size: %s"
+msgstr "vigane ühiku suurus: %s"
 
-#: src/numfmt.c:813
+#: src/numfmt.c:814
 #, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
 msgstr "Kasutamine: %s [VÕTI]... [NUMBER]...\n"
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
 msgstr "Vorminda numbrid standardsisendist või käsurealt.\n"
 
-#: src/numfmt.c:820
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
 msgstr "      --debug          väljasta hoiatused vigase sisendi kohta\n"
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr "  -d, --delimiter=X    kasuta väljade eraldajana tühiku asemel X\n"
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr "      --field=N        asenda number sisendväljal N (vaikimisi 1)\n"
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
@@ -6652,7 +6777,7 @@ msgstr ""
 "      --format=FORMAT  kasuta printf stiilis ujukoma vormingut;\n"
 "                         detailid leiate allpool\n"
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
@@ -6662,13 +6787,13 @@ msgstr ""
 "'none'\n"
 "                         ühikute kirjeldus on allpool\n"
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr "      --from-unit=N    määra sisend ühiku suurus (vaimimisi on 1)\n"
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
@@ -6678,7 +6803,7 @@ msgstr ""
 "      --grouping       grupeeri numbrid kasutades lokaadi reegleid,\n"
 "                         näiteks. 1,000,000\n"
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
@@ -6686,7 +6811,7 @@ msgstr ""
 "      --header[=N]     väljastab (teisendamata) esimesed N päiserida\n"
 "                         vaikimisi N on 1\n"
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
@@ -6695,7 +6820,7 @@ msgstr ""
 "väärtused:\n"
 "                         abort (vaikimisi), fail, warn, ignore\n"
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -6711,7 +6836,7 @@ msgstr ""
 "automaatselt\n"
 "                         juhul, kui leitakse tühemik\n"
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
@@ -6723,7 +6848,7 @@ msgstr ""
 "zero,\n"
 "                         nearest\n"
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
@@ -6732,19 +6857,19 @@ msgstr ""
 "mittekohustuslik\n"
 "                         sufiks sisendnumbritel\n"
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
 "      --to=UNIT        teisenda väljundnumbrid antud ühikutesse\n"
 "                         ühikute kirjeldus on allpool\n"
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr "      --to-unit=N      määra väljund ühiku suurus (vaimimisi on 2)\n"
 
-#: src/numfmt.c:877
+#: src/numfmt.c:878
 msgid ""
 "\n"
 "UNIT options:\n"
@@ -6752,11 +6877,11 @@ msgstr ""
 "\n"
 "Ühiku võtmed:\n"
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr "  none       teisendamist ei toimu, esinevad sufiksid annavad vea\n"
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -6770,7 +6895,7 @@ msgstr ""
 "               1M = 1000000,\n"
 "               1Mi = 1048576,\n"
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
@@ -6782,7 +6907,7 @@ msgstr ""
 "               1M = 1000000,\n"
 "               ...\n"
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
@@ -6794,7 +6919,7 @@ msgstr ""
 "               1M = 1048576,\n"
 "               ...\n"
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
@@ -6806,25 +6931,26 @@ msgstr ""
 "               1Mi = 1048576,\n"
 "               ...\n"
 
-#: src/numfmt.c:905
+#: src/numfmt.c:906
 #, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
 "\n"
 "VORMING peab olema sobiv ühe ujukoma argumendi väljastamiseks '%f'.\n"
 "Mittekohustuslik kvoot (%'f) lülitab võtme --grouping (kui lokaat seda "
 "toetab).\n"
 "Mittekohustuslik laiuse väärtus (%10f) määrab väljundi täitmise.\n"
+"Mittekohustuslik null (%010f) laius täidab numbri nullidega.\n"
 "Mittekohustuslik negatiivne laiuse väärtus (%-10f) määrab väljundi vasakult\n"
-"täitmise.\n"
+"joondamise.\n"
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -6843,7 +6969,7 @@ msgstr ""
 "iga teisendamise vea korral hoiatus, aga lõpetamise kood on 0. Võtme\n"
 "--invalid='ignore' korral vigadest ei teatata ja lõpetamise kood on 0.\n"
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -6880,113 +7006,113 @@ msgstr ""
 "  $ ls -lh | %s --header --field 5 --from=iec --padding=10\n"
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, c-format
 msgid "format %s has no %% directive"
 msgstr "vormingus %s puudub %% direktiiv"
 
-#: src/numfmt.c:990
+#: src/numfmt.c:1003
 #, c-format
 msgid "invalid format %s (width overflow)"
 msgstr "vigane vorming %s (laius on liiga suur)"
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr "--format täitmine kirjutab --padding üle"
+
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr "vormingu %s lõpus on %%"
 
-#: src/numfmt.c:1010
+#: src/numfmt.c:1030
 #, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
-msgstr "vigane vorming %s, direktiiv peab olema %%['][-][N]f"
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
+msgstr "vigane vorming %s, direktiiv peab olema %%[0]['][-][N]f"
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr "vormingus %s on liiga palju %% direktiive"
 
-#: src/numfmt.c:1070
+#: src/numfmt.c:1081
 #, c-format
-msgid "invalid suffix in input '%s': '%s'"
-msgstr "vigane sufiks sisendis '%s': '%s'"
+msgid "invalid suffix in input %s: %s"
+msgstr "vigane sufiks sisendis %s: %s"
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
 msgstr "väärtus on väljastamiseks liiga suur: '%Lg' (kaaluge --to kasutamist)"
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
 msgstr ""
 "väärtus on väljastamiseks liiga suur: '%Lg' (ei saa kasutada väärtusi > 999Y)"
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
-msgstr "suur sisendväärtus '%s': võimalik on täpsuse kadu"
+msgid "large input value %s: possible precision loss"
+msgstr "suur sisendväärtus %s: võimalik on täpsuse kadu"
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr "sisendrida on liiga lühike, väljal %ld ei ole teisendatavaid numbreid"
 
-#: src/numfmt.c:1388
+#: src/numfmt.c:1403
 #, c-format
-msgid "invalid padding value '%s'"
-msgstr "vigane täitmise väärtus '%s'"
+msgid "invalid padding value %s"
+msgstr "vigane täitmise väärtus %s"
 
-#: src/numfmt.c:1401
+#: src/numfmt.c:1417
 #, c-format
-msgid "invalid field value '%s'"
-msgstr "vigane välja väärtus: '%s'"
+msgid "invalid field value %s"
+msgstr "vigane välja väärtus: %s"
 
-#: src/numfmt.c:1430
+#: src/numfmt.c:1447
 #, c-format
-msgid "invalid header value '%s'"
-msgstr "vigane päise väärtus '%s'"
+msgid "invalid header value %s"
+msgstr "vigane päise väärtus %s"
 
-#: src/numfmt.c:1456
+#: src/numfmt.c:1473
 #, c-format
 msgid "--grouping cannot be combined with --format"
 msgstr "--grouping ei saa võtmega --format koos kasutada"
 
-#: src/numfmt.c:1458
-#, c-format
-msgid "--padding cannot be combined with --format"
-msgstr "--padding ei saa võtmega --format koos kasutada"
-
-#: src/numfmt.c:1463
+#: src/numfmt.c:1478
 #, c-format
 msgid "no conversion option specified"
 msgstr "teisendamise võtit ei antud"
 
-#: src/numfmt.c:1471
+#: src/numfmt.c:1486
 #, c-format
 msgid "grouping cannot be combined with --to"
 msgstr "grupeerimist ei saa kasutada võtmega --to"
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
 msgstr "selles lokaadis grupeerimine ei mõju"
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
 msgstr "käsurea sisendi korral ignoreetitakse võtit --header"
 
-#: src/numfmt.c:1511
+#: src/numfmt.c:1526
 #, c-format
 msgid "error reading input"
 msgstr "viga sisendi lugemisel"
 
-#: src/numfmt.c:1520
+#: src/numfmt.c:1535
 #, c-format
 msgid "failed to convert some of the input numbers"
 msgstr "osade sisendnumbrite teisendamine ebaõnnestus"
 
-#: src/od.c:294
+#: src/od.c:320
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -6999,7 +7125,7 @@ msgstr ""
 "    või:    %s --traditional [VÕTI]... [FAIL] [[+]INDEKS[.][b] [+]MÄRGEND[.]"
 "[b]]\n"
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -7015,7 +7141,7 @@ msgstr ""
 "Kui FAIL puudub või on -, loe standardsisendit.\n"
 "\n"
 
-#: src/od.c:307
+#: src/od.c:333
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
 "if the last operand begins with + or (if there are 2 operands) a digit.\n"
@@ -7031,47 +7157,50 @@ msgstr ""
 "Indeksi ja märgendi puhul tähistab 0x või 0X kuueteistkümnendesitust,\n"
 "sufiks võib olla . kaheksandesituse korral ja b tähistab 512 kordseid.\n"
 
-#: src/od.c:318
+#: src/od.c:344
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
-"  -A, --address-radix=RAADIKS kuidas väljastada faili positsioonid. RAADIKS\n"
+"  -A, --address-radix=RAADIKS kuidas väljastada faili positsioonid; RAADIKS\n"
 "                              on üks [doxn], tähendades kümnende, "
 "kaheksand,\n"
 "                              kuueteiskümnend süsteemi või None\n"
+"      --endian={big|little}   vaheta baidid vastavalt antud järjekorrale\n"
 "  -j, --skip-bytes=BAIDID     jäta esimesed BAIDID baiti vahele\n"
 
-#: src/od.c:323
+#: src/od.c:350
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
 "  -N, --read-bytes=BAITE      väljasta ainult antud arv baite\n"
-"  -S BAITE, --strings[=BAITE] väljasta vähemalt BAITE pikkusega sõned\n"
-"                              vaikimisi 3\n"
+"  -S BAITE, --strings[=BAITE] väljasta vähemalt BAITE pikkusega sõned;\n"
+"                                vaikimisi 3\n"
 "  -t, --format=TÜÜP           määra väljundvorming või vormingud\n"
 "  -v, --output-duplicates     ära kasuta korduvate ridade märkimiseks *\n"
-"  -w[BAITE], --width[=BAITE]  väljasta BAITE baiti rea kohta\n"
-"                              vaikimisi 32\n"
+"  -w[BAITE], --width[=BAITE]  väljasta BAITE baiti rea kohta;\n"
+"                                vaikimisi 32\n"
 "      --traditional           kasuta traditsioonilisel kujul argumente\n"
 
-#: src/od.c:336
+#: src/od.c:363
 msgid ""
 "\n"
 "\n"
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 "\n"
@@ -7080,10 +7209,10 @@ msgstr ""
 "  -a   sama, kui -t a,  vali nimedega sümbolid, ülemist bitti "
 "ignoreeritakse\n"
 "  -b   sama, kui -t o1, vali kaheksandbaidid\n"
-"  -c   sama, kui -t c,  vali ASCII sümbolid või langkriipsuga paojada\n"
+"  -c   sama, kui -t c,  vali trükitavad sümbolid või langkriipsuga paojada\n"
 "  -d   sama, kui -t u2, vali märgita 2-baidised kümnendarvud\n"
 
-#: src/od.c:345
+#: src/od.c:372
 msgid ""
 "  -f   same as -t fF, select floats\n"
 "  -i   same as -t dI, select decimal ints\n"
@@ -7099,21 +7228,21 @@ msgstr ""
 "  -s   sama, kui -t d2, vali 2-baidised kümnendarvud\n"
 "  -x   sama, kui -t x2, vali 2-baidised kuueteistkümnendarvud\n"
 
-#: src/od.c:353
+#: src/od.c:380
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 "\n"
 "\n"
 "TÜÜP on üks või enam järgnevaid:\n"
 "  a          sümbolid nimedega, ülemist bitti ignoreeritakse\"\n"
-"  c          ASCII sümbol või langkriipsuga paojada\n"
+"  c          trükitav sümbol või langkriipsuga paojada\n"
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -7127,7 +7256,7 @@ msgstr ""
 "  u[SUURUS]   märgita kümnendarv, SUURUS baiti\n"
 "  x[SUURUS]   kuueteiskümnendarv, SUURUS baiti\n"
 
-#: src/od.c:367
+#: src/od.c:394
 msgid ""
 "\n"
 "SIZE is a number.  For TYPE in [doux], SIZE may also be C for\n"
@@ -7142,7 +7271,7 @@ msgstr ""
 "sizeof(float), D tähistamaks sizeof(double) või L tähistamaks\n"
 "sizeof(long double).\n"
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
@@ -7152,7 +7281,7 @@ msgstr ""
 "Lisades igale tüübile sufiksi z, väljastatakse iga rea lõpus olevad\n"
 "prinditavad sümbolid.\n"
 
-#: src/od.c:379
+#: src/od.c:406
 msgid ""
 "\n"
 "\n"
@@ -7175,12 +7304,12 @@ msgstr ""
 "  M    1024*1024\n"
 "ja nii edasi G, T, P, E, Z, Y korral.\n"
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, c-format
 msgid "invalid type string %s"
 msgstr "vigane tüübisõne %s"
 
-#: src/od.c:649
+#: src/od.c:690
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7189,7 +7318,7 @@ msgstr ""
 "vigane tüübisõne %s;\n"
 "see süsteem ei realiseeri %lu-baidist sisetüüpi"
 
-#: src/od.c:770
+#: src/od.c:811
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7198,37 +7327,37 @@ msgstr ""
 "vigane tüübisõne %s;\n"
 "see süsteem ei realiseeri %lu-baidist ujukoma tüüpi"
 
-#: src/od.c:828
+#: src/od.c:869
 #, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr "vigane sümbol '%c' tüübisõnes %s"
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr "kombineeritud sisendi lõpust kaugemale liikuda ei saa"
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr ""
 "vigane väljundi aadressi raadiks '%c'; see peab olema üks sümbolitest [doxn]"
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr "tüüpi ei saa määrata, kui trükitakse sõnesid"
 
-#: src/od.c:1810
+#: src/od.c:1863
 msgid "compatibility mode supports at most one file"
 msgstr "ühilduvuse mood toetab ülimalt ühte faili"
 
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr "skip-bytes + read-bytes on liiga suur"
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr "hoiatus: vigane laius %lu; kasutan selle asemel %d"
@@ -7389,12 +7518,12 @@ msgstr "Millal"
 msgid "Where"
 msgstr "Kust"
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr "Kasutamine: %s [VÕTI]... [KASUTAJA]...\n"
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -7410,7 +7539,7 @@ msgstr ""
 "  -p              ära esita kogu infos kasutaja plaani faili\n"
 "  -s              väljasta lühiinfo, seda kasutatakse vaikimisi\n"
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -7424,7 +7553,7 @@ msgstr ""
 "  -q              ära väljasta lühiinfos kasutaja täisnime, masinat ja\n"
 "                  eemalolekut\n"
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, c-format
 msgid ""
 "\n"
@@ -7435,7 +7564,7 @@ msgstr ""
 "Kerge 'finger' programm;  väljastab kasutaja kohta infot.\n"
 "Kasutatakse utmp faili %s.\n"
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr ""
@@ -7535,8 +7664,8 @@ msgid ""
 "                    columns on each page\n"
 msgstr ""
 "  +ESIMENE_LEHT[:VIIMANE], --pages=ESIMENE_LEHT[:VIIMANE]\n"
-"                    alusta [lõpeta] trükkimine lehelt ESIMENE_[VIIMANE]"
-"_LEHT\n"
+"                    alusta [lõpeta] trükkimine lehelt "
+"ESIMENE_[VIIMANE]_LEHT\n"
 "  -N, --columns=N\n"
 "                    väljasta N veergu ja väljasta veerud ülalt alla,\n"
 "                    välja arvatud juhul, kui kasutatakse võtit -a.\n"
@@ -7651,7 +7780,8 @@ msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
@@ -7662,7 +7792,7 @@ msgstr ""
 "                    veergudega seotud võtmete puhul (-VEERG|-a -VEERG|-m),\n"
 "                    välja arvatud juhul, kui kasutatakse võtit -w\n"
 
-#: src/pr.c:2827
+#: src/pr.c:2828
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
 "                    separate columns by STRING,\n"
@@ -7679,7 +7809,7 @@ msgstr ""
 "                    seotud võtmetega\n"
 "  -t, --omit-header blokeeri lehe päised ja sabad\n"
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 msgid ""
 "  -T, --omit-pagination\n"
 "                    omit page headers and trailers, eliminate any "
@@ -7702,7 +7832,7 @@ msgstr ""
 "tekstiveeru\n"
 "                    väljundis, -s[sümbol] lülitab välja (72)\n"
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
 "                    set page width to PAGE_WIDTH (72) characters always,\n"
@@ -7715,7 +7845,7 @@ msgstr ""
 "                    ridu, välja arvatud juhul, kui on seatud võti -J, ei\n"
 "                    sega võtmeid -S või -s\n"
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 msgid ""
 "\n"
 "-t is implied if PAGE_LENGTH <= 10.  With no FILE, or when FILE is -, read\n"
@@ -7739,7 +7869,7 @@ msgstr ""
 "\n"
 
 #: src/printenv.c:69
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr "  -0, --null     lõpeta read reavahetuse asemel baidiga 0\n"
 
 #: src/printf.c:79
@@ -7857,12 +7987,12 @@ msgstr "hoiatus: ignoreerin liigseid argumente, alustan argumendist %s"
 msgid "F. Pinard"
 msgstr "François Pinard"
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, c-format
 msgid "%s (for regexp %s)"
 msgstr "%s (regulaaravaldisele %s)"
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
@@ -7871,13 +8001,13 @@ msgstr ""
 "Kasutamine: %s [VÕTI]... [SISEND]... (ilma -G)\n"
 "       või: %s [VÕTI]... [SISEND [VÄLJUND]]\n"
 
-#: src/ptx.c:1821
+#: src/ptx.c:1824
 msgid ""
 "Output a permuted index, including context, of the words in the input "
 "files.\n"
 msgstr "Väljasta sisendfailide sõnade kontekstregister.\n"
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
 "  -G, --traditional              behave more like System V 'ptx'\n"
@@ -7887,7 +8017,7 @@ msgstr ""
 "  -G, --traditional              käitu kui System V 'ptx'\n"
 "  -F, --flag-truncation=SÕNE     kasuta ridade lühendamise märkimiseks SÕNE\n"
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
 "  -O, --format=roff              generate output as roff directives\n"
@@ -7902,7 +8032,7 @@ msgstr ""
 "  -S, --sentence-regexp=REGAV    realõpud või lausete lõpud\n"
 "  -T, --format=tex               loo väljund TeX käskudena\n"
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -7918,7 +8048,7 @@ msgstr ""
 "  -i, --ignore-file=FAIL         loe ignoreeritavate sõnade nimekiri\n"
 "  -o, --only-file=FAIL           ainult lugemiseks olevate sõnade fail\n"
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -7929,15 +8059,15 @@ msgstr ""
 "  -t, --typeset-mode               - ei ole realiseeritud -\n"
 "  -w, --width=NUMBER             väljasta veergudena, viideteta\n"
 
-#: src/ptx.c:1854
+#: src/ptx.c:1857
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
 "\n"
-"Kui FAIL puudub või on -, loe standardsisendit.  '-F /' on vaikimisi.\n"
+"Kui FAIL puudub või on -, loe standardsisendit. Vaikimisi on '-F /'.\n"
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, c-format
 msgid "invalid gap width: %s"
 msgstr "vigane tühemiku laius: %s"
@@ -7959,22 +8089,30 @@ msgstr ""
 "nimeviiteid\n"
 "  -P, --physical  väldi kõiki nimeviiteid\n"
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+"\n"
+"Kui võtmeid ei kasutatud, eeldatakse -P.\n"
+
+#: src/pwd.c:169
 #, c-format
 msgid "failed to chdir to %s"
 msgstr "chdir %s ebaõnnestus"
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, c-format
 msgid "failed to stat %s"
 msgstr "stat %s ebaõnnestus"
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr "ei leia %s kataloogi kirjet, mille i-kirje sobiks"
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, c-format
 msgid "ignoring non-option arguments"
 msgstr "ignoreerin argumente, mis ei ole võtmed"
@@ -7984,8 +8122,8 @@ msgstr "ignoreerin argumente, mis ei ole võtmed"
 msgid "Dmitry V. Levin"
 msgstr "Dmitry V. Levin"
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Kasutamine: %s [VÕTI]... [FAIL]...\n"
@@ -8028,8 +8166,7 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 "  -m, --canonicalize-missing    õgvenda järgides iga nimeviidet igas nime\n"
 "                                komponendis rekursiivselt,\n"
@@ -8066,7 +8203,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 "  -e, --canonicalize-existing  kõik tee komponendid peavad olemas olema\n"
@@ -8095,41 +8232,42 @@ msgstr "%s: laskun kirjutamise kaitsega kataloogi %s? "
 msgid "%s: descend into directory %s? "
 msgstr "%s: laskun kataloogi %s? "
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr "%s: eemaldan kirjutuskaitsega %s %s? "
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, c-format
 msgid "%s: remove %s %s? "
 msgstr "%s: eemaldan %s %s? "
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, c-format
 msgid "removed directory: %s\n"
 msgstr "kustutatud kataloog: %s\n"
 
-#: src/remove.c:444
+#: src/remove.c:447
 #, c-format
-msgid "cannot remove directory: %s"
-msgstr "ei õnnestu kustutada kataloogi: %s"
+msgid "refusing to remove %s or %s directory: skipping %s"
+msgstr "keeldun kustutamast %s või %s kataloogi: jätan %s vahele"
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr "jätan %s vahele, kuna asub teisel seadmel"
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, c-format
 msgid "traversal failed: %s"
 msgstr "lugemine ebaõnnestus: %s"
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -8160,21 +8298,21 @@ msgstr ""
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 "  -I                    küsi korra enne enam kui kolme faili eemaldamist "
 "või\n"
-"                          kui eemaldatakse rekursiivselt. Vähem pealetükkiv "
+"                          kui eemaldatakse rekursiivselt; vähem pealetükkiv "
 "kui -i,\n"
 "                          aga pakub siiski kaitset enamus vigade vastu\n"
 "      --interactive[=MILLAL]  küsi vastavalt määrangule: never, once (-I) "
 "või\n"
-"                          always (-i). Kui MILLAL puudub, küsi alati\n"
+"                          always (-i); kui MILLAL puudub, küsi alati\n"
 
 #: src/rm.c:149
 msgid ""
@@ -8241,13 +8379,17 @@ msgstr ""
 
 #: src/rm.c:342
 #, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr "%s: eemaldada kõik argumendid rekursiivselt? "
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] "%s: eemaldada %zu argument rekursiivselt? "
+msgstr[1] "%s: eemaldada %zu argumenti rekursiivselt? "
 
-#: src/rm.c:343
+#: src/rm.c:345
 #, c-format
-msgid "%s: remove all arguments? "
-msgstr "%s: eemaldan kõik argumendid? "
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] "%s: eemaldan %zu argumendi? "
+msgstr[1] "%s: eemaldan %zu argumenti? "
 
 #: src/rmdir.c:134 src/rmdir.c:233
 #, c-format
@@ -8301,10 +8443,10 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
-"Käivitab programmi teises turvakontekstis.\n"
+"Käivitab programmi teises SELinux turvakontekstis.\n"
 "Kui kontekst ja käsk puudub, väljastab hetkel kehtiva turvakonteksti.\n"
 
 #: src/runcon.c:94
@@ -8360,41 +8502,46 @@ msgstr "peab olema antud -c, -t, -u, -l, -r või kontekst"
 msgid "no command specified"
 msgstr "puudub käsklus"
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr "%s saab kasutada ainult SELinux tuumaga"
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, c-format
 msgid "failed to compute a new context"
 msgstr "uue konteksti arvutamine ebaõnnestus"
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, c-format
 msgid "failed to set new user %s"
 msgstr "uue kasutaja %s seadmine ebaõnnestus"
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, c-format
 msgid "failed to set new type %s"
 msgstr "uue tüübi %s seadmine ebaõnnestus"
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, c-format
 msgid "failed to set new range %s"
 msgstr "uue vahemiku %s seadmine ebaõnnestus"
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, c-format
 msgid "failed to set new role %s"
 msgstr "uue rolli %s seadmine ebaõnnestus"
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, c-format
 msgid "unable to set security context %s"
 msgstr "turvakonteksti %s ei saa seada"
 
+#: src/selinux.c:127 src/selinux.c:300
+#, c-format
+msgid "error canonicalizing %s"
+msgstr "%s kanoniseerimine sai vea"
+
 #: src/seq.c:68
 #, c-format
 msgid ""
@@ -8427,6 +8574,8 @@ msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
@@ -8434,11 +8583,13 @@ msgstr ""
 "\n"
 "Kui ESIMENE või SAMM puudub, kasutatakse väärtust 1. Puuduva SAMMU asemel\n"
 "kasutatakse väärtust 1 isegi kui VIIMANE on väiksem, kui ESIMENE.\n"
+"Numbrite järjend lõppeb, kui praeguse numbri ja SAMM summa on suurem,\n"
+"kui VIIMANE.\n"
 "ESIMENE, SAMM, VIIMANE interpreteeritakse, kui murdarve.\n"
 "SAMM on tavaliselt positiivne, kui ESIMENE on VIIMASEST väiksem ja\n"
 "negatiivne, kui VIIMANE on ESIMESEST väiksem.\n"
 
-#: src/seq.c:94
+#: src/seq.c:96
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
 "it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n"
@@ -8448,87 +8599,27 @@ msgstr ""
 "on fikseeritud punktiga kümnendnumbrid maksimum täpsusega PREC,\n"
 "kasutatakse formaadina %.PRECf, muidu %g.\n"
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, c-format
 msgid "invalid floating point argument: %s"
 msgstr "vigane murdarv: %s"
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr "vormingus %s on tundmatu %%%c direktiiv"
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr "kui trükitakse võrdse pikkusega sõnesid, ei saa formaadisõnet kasutada"
 
-#: src/setuidgid.c:49
-#, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-"Kasutamine: %s [LÜHIVÕTI]... KASUTAJA KÄSKLUS [ARGUMENT]...\n"
-"       või: %s PIKK-VÕTI\n"
-
-#: src/setuidgid.c:55
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-"Eemalda täiendavad grupiõigused, võta antud KASUTAJA ID ja tema grupi ID\n"
-"ja käivita KÄSKLUS koos määratud argumentidega. Kui kasutaja ja grupi ID\n"
-"ei ole võimalik seada, lõpeta koodiga 111, muidu lõpeta sama koodiga,\n"
-"millega lõpetab KÄSKLUS.\n"
-"See programm on kasulik ainult juhul, kui käivitajaks on root (UID=0).\n"
-"\n"
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-"  -g GID[,GID1...]  samuti sea primaarseks grupiks GID ja (kui on antud),\n"
-"                    täiendavate gruppide nimekiri GID1, ...\n"
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr "tundmatu kasutaja-ID: %s"
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr "et kasutada kasutaja-ID %s, on vaja samuti kasutada -g"
-
-#: src/setuidgid.c:190
-#, c-format
-msgid "failed to set supplemental group(s)"
-msgstr "lisagruppide nimekirja ei õnnestu seada"
-
-#: src/setuidgid.c:200
-#, c-format
-msgid "cannot set group-ID to %lu"
-msgstr "ei õnnestu seada grupi ID %lu"
-
-#: src/setuidgid.c:204
-#, c-format
-msgid "cannot set user-ID to %lu"
-msgstr "ei õnnestu seada kasutaja ID %lu"
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr "Colin Plumb"
 
-#: src/shred.c:148
+#: src/shred.c:170
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
 "for even very expensive hardware probing to recover the data.\n"
@@ -8536,7 +8627,7 @@ msgstr ""
 "Kirjuta antud failid korduvalt üle, et muuta raskemaks andmete taastamine\n"
 "isegi väga kalli riistvara abil.\n"
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -8549,29 +8640,34 @@ msgstr ""
 "      --random-source=FAIL loe juhuarvudjuhuslikud baidid failist\n"
 "  -s, --size=N   töötle N baiti (lubatud on kasutada ka sufiksit K, M, G)\n"
 
-#: src/shred.c:161
+#: src/shred.c:183
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
 "  -z, --zero     add a final overwrite with zeros to hide shredding\n"
 msgstr ""
-"  -u, --remove   lühenda ja eemalda fail peale ülekirjutamisi\n"
+"  -u, --remove[=KUIDAS]  lühenda ja eemalda fail peale ülekirjutamisi;\n"
+"                           Vaadake allpool\n"
 "  -v, --verbose  näita töö käiku\n"
 "  -x, --exact    ära ümarda failisuurusi üles täisplokini;\n"
 "                   see on mitte-tavafailide puhul vaikimisi käitumine\n"
 "  -z, --zero     varja töötlemist, kirjutades viimase tegevusena nulle\n"
 
-#: src/shred.c:170
+#: src/shred.c:192
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 "\n"
@@ -8579,11 +8675,16 @@ msgstr ""
 "\n"
 "Kustuta failid, kui kasutati võtit --remove (-u). Vaikimisi faile ei\n"
 "kustutata, kuna enamasti töötatakse seadmefailidega, näiteks /dev/hda,\n"
-"ja enamasti ei soovita nende eemaldamist. Tavaliste failidega töötamisel\n"
-"kasutab enamus inimesi võtit --remove.\n"
+"ja enamasti ei soovita nende eemaldamist. Mittekohustuslik parameeter "
+"KUIDAS\n"
+"määrab kuidas eemaldada kataloogi kirje:\n"
+"'unlink' => kasuta standard funktsiooni unlink.\n"
+"'wipe' => esmalt hägusta nimes baidid.\n"
+"'wipesync' => samuti kirjuta iga högustatud bait kettale.\n"
+"Vaikimisi mood on 'wipesync', aga see võib olla kallis.\n"
 "\n"
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -8599,7 +8700,7 @@ msgstr ""
 "ei ole shred efektiivne või ei ole efektiivne kõikides moodides:\n"
 "\n"
 
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -8620,7 +8721,7 @@ msgstr ""
 "  Network Appliance NFS server\n"
 "\n"
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -8632,7 +8733,7 @@ msgstr ""
 "\n"
 "* tihendavad failisüsteemid\n"
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -8652,7 +8753,7 @@ msgstr ""
 "käsu manualist (man mount).\n"
 "\n"
 
-#: src/shred.c:215
+#: src/shred.c:241
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
 "of the file that cannot be removed, and that will allow a shredded file\n"
@@ -8662,127 +8763,127 @@ msgstr ""
 "faili koopiaid, mida ei saa eemaldada ja see kõik võib võimaldada siiski\n"
 "seda faili hiljem taastada.\n"
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, c-format
 msgid "%s: fdatasync failed"
 msgstr "%s: fdatasync ebaõnnestus"
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr "%s: fsync ebaõnnestus"
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr "%s: ei saa ümber kerida"
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr "%s: läbimine %lu/%lu (%s)..."
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, c-format
 msgid "%s: error writing at offset %s"
 msgstr "%s: viga kirjutamisel aadressile %s"
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s: lseek ebaõnnestus"
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, c-format
 msgid "%s: file too large"
 msgstr "%s: fail on liiga suur"
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr "%s: läbimine %lu/%lu (%s)...%s"
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr "%s: läbimine %lu/%lu (%s)...%s/%s %d%%"
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, c-format
 msgid "%s: fstat failed"
 msgstr "%s: fstat ebaõnnestus"
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, c-format
 msgid "%s: invalid file type"
 msgstr "%s: vigane failitüüp"
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr "%s: fail on negatiivse suurusega"
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, c-format
 msgid "%s: error truncating"
 msgstr "%s: viga lühendamisel"
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, c-format
 msgid "%s: fcntl failed"
 msgstr "%s: fcntl ebaõnnestus"
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr "%s: ei õnnestu töödelda ainult lisamiseks mõeldud faili"
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr "%s: eemaldan"
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, c-format
 msgid "%s: renamed to %s"
 msgstr "%s: uus nimi %s"
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, c-format
 msgid "%s: failed to remove"
 msgstr "%s: kustutamine ebaõnnestus"
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr "%s: eemaldatud"
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, c-format
 msgid "%s: failed to close"
 msgstr "%s: sulgemine ebaõnnestus"
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, c-format
 msgid "%s: failed to open for writing"
 msgstr "%s: faili ei saa kirjutamiseks avada"
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, c-format
 msgid "%s: invalid number of passes"
 msgstr "%s: vigane läbimiste arv"
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, c-format
 msgid "multiple random sources specified"
 msgstr "määrati mitu juhuarvude allikat"
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, c-format
 msgid "%s: invalid file size"
 msgstr "%s: vigane faili suurus"
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -8793,12 +8894,12 @@ msgstr ""
 "       või: %s -e [VÕTI]... [ARG]...\n"
 "       või: %s -i ALG-LÕPP [VÕTI]...\n"
 
-#: src/shuf.c:54
+#: src/shuf.c:67
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr ""
 "Kirjuta sisendfailide read juhuslikus permutatsioonis standardväljundisse.\n"
 
-#: src/shuf.c:60
+#: src/shuf.c:73
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
 "  -i, --input-range=LO-HI   treat each number LO through HI as an input "
@@ -8806,40 +8907,50 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
 msgstr ""
 "  -e, --echo                käsitle iga ARG kui sisendi rida\n"
 "  -i, --input-range=ALG-LÕPP käsitle iga numbrit vahemikust sisendreana\n"
-"  -n, --head-lines=RIDU     väljasta maksimaalselt RIDU rida\n"
+"  -n, --head-lines=NU       väljasta maksimaalselt N rida\n"
 "  -o, --output=FAIL         kirjuta tulemu standardväljundi asemel faili\n"
 "      --random-source=FAIL  loe juhuslikud baidid FAIList\n"
-"  -z, --zero-terminated     ridade lõppu bait 0, mitte reavahetus\n"
+"  -r, --repeat              väljundridu võib korrata\n"
+
+#: src/shuf.c:228
+#, c-format
+msgid "too many input lines"
+msgstr "liiga palju sisendi ridu"
 
-#: src/shuf.c:244
+#: src/shuf.c:431
 #, c-format
 msgid "multiple -i options specified"
 msgstr "kasutati mitut -i võtit"
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, c-format
 msgid "invalid input range %s"
 msgstr "vigane sisendi vahemik: %s"
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, c-format
 msgid "invalid line count %s"
 msgstr "vigane ridade arv: %s"
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, c-format
 msgid "multiple output files specified"
 msgstr "määrati mitu väljundfaili"
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, c-format
 msgid "cannot combine -e and -i options"
 msgstr "-e ja -i võtmeid ei saa kombineerida"
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr "korratavaid ridu pole"
+
 #: src/sleep.c:44
 #, c-format
 msgid ""
@@ -8861,21 +8972,21 @@ msgstr ""
 "argumenti, on pausi pikkus kõikide argumentide summa.\n"
 "\n"
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, c-format
 msgid "invalid time interval %s"
 msgstr "vigane ajaintervall %s"
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr "ei õnnestu lugeda reaalaja kella"
 
-#: src/sort.c:399
+#: src/sort.c:427
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr "Kirjuta järjestatud FAILide ühend standardväljundisse.\n"
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
@@ -8883,7 +8994,7 @@ msgstr ""
 "Võtmed järjestamiseks:\n"
 "\n"
 
-#: src/sort.c:409
+#: src/sort.c:437
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
 "  -d, --dictionary-order      consider only blanks and alphanumeric "
@@ -8895,7 +9006,7 @@ msgstr ""
 "numbreid\n"
 "  -f, --ignore-case           tööta tõstutundetult\n"
 
-#: src/sort.c:415
+#: src/sort.c:443
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
 "  -i, --ignore-nonprinting    consider only printable characters\n"
@@ -8905,14 +9016,14 @@ msgstr ""
 "  -i, --ignore-nonprinting    kasuta ainult trükitavaid sümboleid\n"
 "  -M, --month-sort            võrdle (tundmatu) < 'JAAN' < ... < 'DETS'\n"
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 "  -h, --human-numeric-sort    võrdle inimesele loetavaid numbreid (n., 2K "
 "1G)\n"
 
-#: src/sort.c:423
+#: src/sort.c:451
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
 "  -R, --random-sort           sort by random hash of keys\n"
@@ -8925,7 +9036,7 @@ msgstr ""
 "  -r, --reverse               pööra võrdluste tulemus\n"
 "\n"
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -8942,7 +9053,7 @@ msgstr ""
 "tekstis\n"
 "\n"
 
-#: src/sort.c:437
+#: src/sort.c:465
 msgid ""
 "Other options:\n"
 "\n"
@@ -8950,7 +9061,7 @@ msgstr ""
 "Muud võtmed:\n"
 "\n"
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
@@ -8958,7 +9069,7 @@ msgstr ""
 "      --batch-size=NMESTI   mesti korraga ülimalt NMESTI sisendit;\n"
 "                            paremaks ajutiste failide kasutamiseks\n"
 
-#: src/sort.c:445
+#: src/sort.c:473
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
 "  -C, --check=quiet, --check=silent  like -c, but do not report first bad "
@@ -8972,7 +9083,7 @@ msgstr ""
 "      --compress-program=PROG  tihenda ajutised failid programmiga PROG;\n"
 "                              taastamiseks PROG -d\n"
 
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -8987,7 +9098,7 @@ msgstr ""
 "                            nimedega failist F;\n"
 "                            Kui F on - siis loe nimed standardsisendist\n"
 
-#: src/sort.c:459
+#: src/sort.c:487
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
 "  -m, --merge               merge already sorted files; do not sort\n"
@@ -8996,7 +9107,7 @@ msgstr ""
 "                            ja tüübi.\n"
 "  -m, --merge               mesti juba järjestatud failid; ei järjesta\n"
 
-#: src/sort.c:463
+#: src/sort.c:491
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "  -s, --stable              stabilize sort by disabling last-resort "
@@ -9008,7 +9119,7 @@ msgstr ""
 "võrdlus\n"
 "  -S, --buffer-size=MAHT    määra mälupuhvri suurus\n"
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -9031,11 +9142,7 @@ msgstr ""
 "  -u, --unique              võtmega -c: kontrolli ranget järjestatust\n"
 "                              muidu: väljasta võrdsetest ainult üks\n"
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr "  -z, --zero-terminated     lõpeta read reavahetuse asemel baidiga 0\n"
-
-#: src/sort.c:483
+#: src/sort.c:511
 msgid ""
 "\n"
 "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is "
@@ -9066,7 +9173,7 @@ msgstr ""
 "\n"
 "MAHT järel võib kasutada järgnevaid kordavaid sufikseid:\n"
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -9085,254 +9192,239 @@ msgstr ""
 "Keskkonna poolt määratud lokaat mõjutab järjestamist. Traditsioonilise,\n"
 "baitide väärtusel põhineva järjestuse saamiseks seadke LC_ALL=C. \n"
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, c-format
 msgid "waiting for %s [-d]"
 msgstr "ootan %s [-d] järel"
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr "%s [-d] lõpetas ebanormaalselt"
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, c-format
 msgid "cannot create temporary file in %s"
 msgstr "%s sees ei õnnestu ajutist faili luua"
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr "open ebaõnnestus"
 
-#: src/sort.c:970
+#: src/sort.c:998
 msgid "fflush failed"
 msgstr "fflush ebaõnnestus"
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr "close ebaõnnestus"
 
-#: src/sort.c:986
-#, c-format
-msgid "dup2 failed"
-msgstr "dup2 ebaõnnestus"
-
-#: src/sort.c:1103
-#, c-format
-msgid "couldn't execute %s"
-msgstr "%s ei õnnestu käivitada"
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 msgid "couldn't create temporary file"
 msgstr "ajutist faili ei õnnestu luua"
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, c-format
 msgid "couldn't create process for %s -d"
 msgstr "%s -d jaoks ei õnnestunud protsessi luua"
 
-#: src/sort.c:1161
-#, c-format
-msgid "couldn't execute %s -d"
-msgstr "%s -d ei õnnestu käivitada"
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, c-format
 msgid "warning: cannot remove: %s"
 msgstr "hoiatus: ei saa kustutada: %s"
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, c-format
 msgid "invalid --%s argument %s"
 msgstr "vigane --%s argument %s"
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, c-format
 msgid "minimum --%s argument is %s"
 msgstr "miinimum --%s argument on %s"
 
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, c-format
 msgid "--%s argument %s too large"
 msgstr "--%s argument %s on liiga suur"
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr "maksimaalne --%s argument praeguse rlimit piiranguga on %s"
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr "paralleelsuse number peab olema mittenull"
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr "stat ebaõnnestus"
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr "lugemine ebaõnnestus"
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, c-format
 msgid "string transformation failed"
 msgstr "sõnede teisendamine ebaõnnestus"
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, c-format
 msgid "the untransformed string was %s"
 msgstr "teisendamata sõne oli %s."
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr "^ võtit ei leitud\n"
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr "kasutati aeguvat võtit %s; kasutage selle asemel %s"
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr "võtme %lu laius on null ja ignoreeritakse"
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr "võtme %lu ees olevad tühemikud on olulised; kaaluge ka 'b' kasutamist"
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr "võti %lu on numbriline ja haarab mitut välja"
 
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
 msgstr[0] "võtit '-%s' ignoreeritakse"
 msgstr[1] "võtmeid '-%s' ignoreeritakse"
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr "võti '-r' rakendub ainult viimase võrdluse korral"
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr "kirjutamine ebaõnnestus"
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr "%s: %s:%s: korratu: "
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr "standard veavoog"
 
-#: src/sort.c:3698
+#: src/sort.c:3738
 msgid "cannot read"
 msgstr "ei saa lugeda"
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, c-format
 msgid "%s: invalid field specification %s"
 msgstr "%s: vigane välja määrang %s"
 
-#: src/sort.c:3987
+#: src/sort.c:4028
 #, c-format
 msgid "options '-%s' are incompatible"
 msgstr "võtmed '-%s' ei sobi kokku"
 
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, c-format
 msgid "%s: invalid count at start of %s"
 msgstr "%s: vigane loendur %s alguses"
 
-#: src/sort.c:4295
+#: src/sort.c:4336
 msgid "invalid number after '-'"
 msgstr "vigane kuupäev peale '-'"
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 msgid "invalid number after '.'"
 msgstr "vigane number peale '.'"
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr "juhuslik sümbol välja määrangus"
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, c-format
 msgid "multiple compress programs specified"
 msgstr "määrati mitu tihendusprogrammi"
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
 msgstr "vigane number välja alguses"
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
 msgstr "välja number on null"
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr "sümboli nihe on null"
 
-#: src/sort.c:4407
+#: src/sort.c:4448
 msgid "invalid number after ','"
 msgstr "vigane number peale ','"
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr "tühi tabulaator"
 
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, c-format
 msgid "cannot read file names from %s"
 msgstr "failist %s ei õnnestu failide nimesid lugeda"
 
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr "%s:%lu: vigane null-pikkusega faili nimi"
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, c-format
 msgid "no input from %s"
 msgstr "%s sisend puudub"
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr "kasutan %s järjestamise reegleid"
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr "kasutan lihtsat baidivõrdlust"
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr "täiendav operand %s pole võtmega -%c lubatud"
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr "sufiksi pikkus peab olema vähemalt %zu"
 
-#: src/split.c:204
+#: src/split.c:203
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr "Kasutamine: %s [VÕTI]... [SISEND [PREFIKS]]\n"
 
-#: src/split.c:208
+#: src/split.c:207
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
 "size is 1000 lines, and default PREFIX is 'x'.  With no INPUT, or when "
@@ -9344,22 +9436,21 @@ msgstr ""
 "'x'.\n"
 "Kui sisend puudub või on -, loe standardsisendit.\n"
 
-#: src/split.c:216
+#: src/split.c:215
 #, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
 "  -a, --suffix-length=N   kasuta sufikseid pikkusega N (vaikimisi %d)\n"
@@ -9367,15 +9458,15 @@ msgstr ""
 "  -b, --bytes=MAHT        pane väljundi ritta MAHT baiti\n"
 "  -C, --line-bytes=MAHT   väljasta faili ülimalt MAHT baidiseid ridu\n"
 "  -d, --numeric-suffixes[=ALG]  kasuta tähtedega sufiksite asemel "
-"numbrilisi.\n"
-"                                ALG määrab alguse (vaikimisi 0)\n"
+"numbrilisi;\n"
+"                                  ALG määrab alguse (vaikimisi 0)\n"
 "  -e, --elide-empty-files ära loo tühje faile võtmega '-n'\n"
 "      --filter=KÄSKLUS    saada programmi; faili nimi on $FILE\n"
 "  -l, --lines=NUMBER      väljasta väljundfaili kohta NUMBER rida\n"
 "  -n, --number=TÜKKI      loo TÜKKI väljundfaili. Vaata allpoolt\n"
 "  -u, --unbuffered        kopeeri sisend kohe väljundiks võtmega '-n r/...'\n"
 
-#: src/split.c:229
+#: src/split.c:228
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
 "                            output file is opened\n"
@@ -9383,7 +9474,7 @@ msgstr ""
 "      --verbose           väljasta enne iga faili avamist standard veavoogu\n"
 "                            diagnostilist infot\n"
 
-#: src/split.c:236
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -9403,189 +9494,189 @@ msgstr ""
 "r/N     nagu 'l' aga kasuta \"round robin\" jaotust\n"
 "r/K/N   sama, aga väljasta standardväljundisse ainult N'i K's osa\n"
 
-#: src/split.c:354
+#: src/split.c:353
 #, c-format
 msgid "output file suffixes exhausted"
 msgstr "väljundfailide sufiksid said otsa"
 
-#: src/split.c:366
+#: src/split.c:365
 #, c-format
 msgid "creating file %s\n"
 msgstr "loon faili %s\n"
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr "%s kirjutab sisendi üle; katkestan"
 
-#: src/split.c:391
+#: src/split.c:390
 #, c-format
 msgid "failed to set FILE environment variable"
 msgstr "keskkonna muutuja FILE väärtustamine ei õnnestunud"
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr "käivitan muutujaga FILE=%s\n"
 
-#: src/split.c:395
+#: src/split.c:394
 #, c-format
 msgid "failed to create pipe"
 msgstr "ei õnnestu luua toru"
 
-#: src/split.c:409
+#: src/split.c:408
 #, c-format
 msgid "closing prior pipe"
 msgstr "sulen eelneva toru"
 
-#: src/split.c:411
+#: src/split.c:410
 #, c-format
 msgid "closing output pipe"
 msgstr "sulgen väljundtoru"
 
-#: src/split.c:415
+#: src/split.c:414
 #, c-format
 msgid "moving input pipe"
 msgstr "liigutan sisendtoru"
 
-#: src/split.c:417
+#: src/split.c:416
 #, c-format
 msgid "closing input pipe"
 msgstr "sulgen sisendtoru"
 
-#: src/split.c:422
+#: src/split.c:421
 #, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr "viga käivitamisel: \"%s -c %s\""
 
-#: src/split.c:428
+#: src/split.c:427
 #, c-format
 msgid "failed to close input pipe"
 msgstr "sisendtoru sulgemine ebaõnnestus"
 
-#: src/split.c:464
+#: src/split.c:463
 #, c-format
 msgid "waiting for child process"
 msgstr "ootan alamprotsessi lõpetamist"
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr "failiga FILE=%s, signaal %s käsult: %s"
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr "failiga FILE=%s, lõpetamise kood %d käsult: %s"
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr "tundmatu olek käsult (0x%X)"
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr "ei saa tükeldada enam kui ühel viisil"
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, c-format
 msgid "%s: invalid number of chunks"
 msgstr "%s: vigane osade arv"
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, c-format
 msgid "%s: invalid chunk number"
 msgstr "%s: vigane osa number"
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr "%s: vigane sufiksi pikkus"
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr "%s: vigane baitide arv"
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr "%s: vigane ridade arv"
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, c-format
 msgid "line count option -%s%c... is too large"
 msgstr "ridade arvu võti -%s%c... on liiga suur"
 
-#: src/split.c:1248
+#: src/split.c:1298
 #, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr "%s: vigane sufiksi alustamise number"
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, c-format
 msgid "%s: invalid IO block size"
 msgstr "%s: vigane IO bloki suurus"
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr "--filter ei töötle standardväljundisse kirjutatud tükki"
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr "numbriline sufikisi algväärtus on sufiksi pikkuse jaoks liiga suur"
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, c-format
 msgid "%s: cannot determine file size"
 msgstr "%s: ei õnnestu tuvastada faili suurust"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr "Michael Meskes"
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, c-format
 msgid "failed to canonicalize %s"
 msgstr "%s kanoniseerimine ebaõnnestus"
 
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr "hoiatus: tundmatu jada '\\%c'"
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, c-format
 msgid "%s: invalid directive"
 msgstr "%s: vigane direktiiv"
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, c-format
 msgid "warning: backslash at end of format"
 msgstr "hoiatus: langkriips vormingu lõpus"
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr "%s standard sisendi tähistamiseks ei tööta faili süsteemi moodis"
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, c-format
 msgid "cannot read file system information for %s"
 msgstr "ei õnnestu lugeda %s failisüsteemi informatsiooni"
 
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, c-format
 msgid "cannot stat standard input"
 msgstr "stat ei saa standardsisendil kasutada"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -9601,7 +9692,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -9611,30 +9702,30 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr "Seade: %Dh/%dd\tInode: %-10i  Linke: %-5h Seadme tüüp: %t,%T\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr "Seade: %Dh/%dd\tInode: %-10i  Linke: %h\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr "Juurdepääs: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, c-format
 msgid "Context: %C\n"
 msgstr "Kontekst=%C\n"
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -9646,11 +9737,11 @@ msgstr ""
 "Muutmine: %z\n"
 " Sünd: %w\n"
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
 msgstr "Näita faili või failisüsteemi olekut.\n"
 
-#: src/stat.c:1356
+#: src/stat.c:1418
 msgid ""
 "  -L, --dereference     follow links\n"
 "  -f, --file-system     display file system status instead of file status\n"
@@ -9658,24 +9749,24 @@ msgstr ""
 "  -L, --dereference     järgi viiteid\n"
 "  -f, --filesystem      esita faili oleku asemel failisüsteemi olek\n"
 
-#: src/stat.c:1360
+#: src/stat.c:1422
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 "  -c  --format=VORMING  määra uus vorming; peale iga VORMING kasutamist\n"
 "                          väljastatakse reavahetus\n"
 "      --printf=VORMING  nagu --format, aga töötleb ka langkriipsu "
 "paojadasid,\n"
-"                          ja ei väljasta automaatselt reavahetusi.\n"
+"                          ja ei väljasta automaatselt reavahetusi;\n"
 "                          Kui soovite reavahetust, kasutage \\n.\n"
 "  -t, --terse           esita info lakooniliselt\n"
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 msgid ""
 "\n"
 "The valid format sequences for files (without --file-system):\n"
@@ -9695,7 +9786,7 @@ msgstr ""
 "  %B   iga `%b' poolt antud bloki maht baitides\n"
 "  %C   SELinux turvakontekst\n"
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 msgid ""
 "  %d   device number in decimal\n"
 "  %D   device number in hex\n"
@@ -9711,7 +9802,7 @@ msgstr ""
 "  %g   omaniku grupi ID\n"
 "  %G   omaniku grupi nimi\n"
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 msgid ""
 "  %h   number of hard links\n"
 "  %i   inode number\n"
@@ -9720,8 +9811,8 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 "  %h   viidete arv\n"
 "  %i   ikirje number\n"
@@ -9730,10 +9821,10 @@ msgstr ""
 "  %N   jutumärkides faili nimi, nimeviite korral viidatav nimi\n"
 "  %o   S/V bloki suurus\n"
 "  %s   kogumaht, baitides\n"
-"  %t   seadme kuueteistkümnendsüsteemis põhinumber\n"
-"  %T   seadme kuueteistkümnendsüsteemis alamnumber\n"
+"  %t   sümbol/blokk seadme kuueteistkümnendsüsteemis põhinumber\n"
+"  %T   sümbol/blokk seadme kuueteistkümnendsüsteemis alamnumber\n"
 
-#: src/stat.c:1399
+#: src/stat.c:1461
 msgid ""
 "  %u   user ID of owner\n"
 "  %U   user name of owner\n"
@@ -9741,10 +9832,10 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 "  %u   omaniku kasutaja ID\n"
@@ -9753,13 +9844,13 @@ msgstr ""
 "  %W   faili loomise aeg, sekundites alates epohhist; 0 kui pole teada\n"
 "  %x   viimane kasutamine, inimesele loetav\n"
 "  %X   viimane kasutamine, sekundites alates epohhist\n"
-"  %y   viimane täiendamine, inimesele loetav\n"
-"  %Y   viimane täiendamine, sekundites alates epohhist\n"
-"  %z   viimane muutmine, inimesele loetav\n"
-"  %Z   viimane muutmine, sekundites alates epohhist\n"
+"  %y   viimane andmete täiendamine, inimesele loetav\n"
+"  %Y   viimane andmete täiendamine, sekundites alates epohhist\n"
+"  %z   viimane oleku muutmine, inimesele loetav\n"
+"  %Z   viimane oleku muutmine, sekundites alates epohhist\n"
 "\n"
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 msgid ""
 "Valid format sequences for file systems:\n"
 "\n"
@@ -9777,7 +9868,7 @@ msgstr ""
 "  %d   vabu failikirjeid failisüsteemis\n"
 "  %f   vabu blokke failisüsteemis\n"
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 msgid ""
 "  %i   file system ID in hex\n"
 "  %l   maximum length of filenames\n"
@@ -9862,22 +9953,27 @@ msgstr ""
 "Samuti osad filtrid (nagu 'dd' ja 'cat' jne.) ei kasuta vooge ja seega\n"
 "'stdbuf' seaded neid ei mõjuta.\n"
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, c-format
 msgid "failed to find %s"
 msgstr "%s ei leitud"
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, c-format
 msgid "failed to update the environment with %s"
 msgstr "keskkonna muutmine väärtusega %s ei õnnestunud"
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr "reapuhver standardsisendil ei oma mõtet"
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, c-format
+msgid "you must specify a buffering mode option"
+msgstr "peab olema määratud puhverdamise mood"
+
+#: src/stty.c:516
 #, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -9888,11 +9984,11 @@ msgstr ""
 "       või: %s [-F SEADE] [--file=SEADE] [-a|--all]\n"
 "       või: %s [-F SEADE] [--file=SEADE] [-g|--save]\n"
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
 msgstr "Näita või muuda terminali seadistust.\n"
 
-#: src/stty.c:525
+#: src/stty.c:528
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
 "  -g, --save         print all current settings in a stty-readable form\n"
@@ -9903,7 +9999,7 @@ msgstr ""
 "loetavalt\n"
 "  -F, --file=SEADE   ava ja kasuta standardsisendi asemel antud seadet\n"
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
@@ -9914,7 +10010,7 @@ msgstr ""
 "mittevastavat seadet. Seadete kasutatavuse määrab kasutatav\n"
 "operatsioonisüsteem.\n"
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -9929,7 +10025,7 @@ msgstr ""
 "   eof SÜMBOL    SÜMBOL saadab faili lõpu teate (lõpetab sisendi)\n"
 "   eol SÜMBOL    SÜMBOL lõpetab rea\n"
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -9941,7 +10037,7 @@ msgstr ""
 "   intr SÃœMBOL   SÃœMBOL saadab katkestamise signaali\n"
 "   kill SÃœMBOL   SÃœMBOL kustutab jooksva rea\n"
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -9953,7 +10049,7 @@ msgstr ""
 " * rprnt SÃœMBOL  SÃœMBOL joonistab jooksva rea uuesti\n"
 "   start SÜMBOL  SÜMBOL käivitab väljundi peale peatamist\n"
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -9965,7 +10061,7 @@ msgstr ""
 " * swtch SÜMBOL  SÜMBOL vahetab käsuinterpretaatori taset\n"
 " * werase SÜMBOL SÜMBOL kustutab viimati kirjutatud sõna\n"
 
-#: src/stty.c:562
+#: src/stty.c:565
 msgid ""
 "\n"
 "Special settings:\n"
@@ -9979,7 +10075,7 @@ msgstr ""
 " * cols N        teata tuumale, et terminalil on N veergu\n"
 " * columns N     sama, kui cols N\n"
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -9993,7 +10089,7 @@ msgstr ""
 "sümbolit\n"
 "   ospeed N      sea väljundi kiiruseks N\n"
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -10007,7 +10103,7 @@ msgstr ""
 "   time N        -icanon omadusega, sea lugemise taimout N sekundi "
 "kümnendikku\n"
 
-#: src/stty.c:581
+#: src/stty.c:584
 msgid ""
 "\n"
 "Control settings:\n"
@@ -10025,7 +10121,7 @@ msgstr ""
 " * [-]cdtrdsr    luba DRT/DSR vookontroll\n"
 "   csN           sea sümboli suuruseks N bitti, N vahemikust [5..8]\n"
 
-#: src/stty.c:590
+#: src/stty.c:593
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
 "   [-]hup        send a hangup signal when the last process closes the tty\n"
@@ -10033,14 +10129,16 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 "   [-]cstopb     kasuta sümboli kohta kaht stop bitti (üks '-' korral)\n"
 "   [-]hup        saada hangup signaal, kui viimane protsess suleb tty\n"
 "   [-]hupcl      sama, kui [-]hup\n"
 "   [-]parenb     genereeri väljundis paarsusbitt ja eelda paarsust sisendis\n"
 "   [-]parodd     sea paaritu paarsus (paaris '-' korral)\n"
+" * [-]cmspar     kasuta \\\"stick\\\" (mark/space) paarsust\n"
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -10056,7 +10154,7 @@ msgstr ""
 "   [-]ignbrk     ignoreeri break sümbolit\n"
 "   [-]igncr      ignoreeri rea algusse sümbolit\n"
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -10070,12 +10168,12 @@ msgstr ""
 "   [-]inpck      luba sisendi paarsuse kontroll\n"
 "   [-]istrip     eemalda sisendsümbolitelt ülemine (8-s) bitt\n"
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr ""
 " * [-]iutf8      eelda et sisendsümbolid kasutavad UTF-8 kooditabelit\n"
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -10091,7 +10189,7 @@ msgstr ""
 "   [-]parmrk     märgi paarsusvead (kasutatakse 255-0-sümbol järjendis)\n"
 "   [-]tandem     sama, kui [-]ixoff\n"
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -10107,23 +10205,23 @@ msgstr ""
 " * ffN           lehevahetuse viivitus, N vahemikust [0..1]\n"
 " * nlN           reavahetuse viivitus, N vahemikust [0..1]\n"
 
-#: src/stty.c:631
+#: src/stty.c:635
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
 " * [-]onlret     newline performs a carriage return\n"
 msgstr ""
 " * [-]ocrnl      tõlgi rea algusse sümbol reavahetuseks\n"
-" * [-]ofdel      kasuta täitesümbolitena null asemel kustutamise sümbolit\n"
+" * [-]ofdel      kasuta täitesümbolitena NUL asemel kustutamise sümbolit\n"
 " * [-]ofill      kasuta viivitustel ootamise asemel täitesümboleid\n"
 " * [-]olcuc      tõlgi väiketähed suurtähtedeks\n"
 " * [-]onlcr      tõlgi reavahetus paariks rea algusse-reavahetus\n"
 " * [-]onlret     reavahetus käitub, nagu rea algusse sümbol\n"
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -10139,7 +10237,7 @@ msgstr ""
 " * -tabs         sama, kui tab3\n"
 " * vtN           vertikaalse tabulaatori viivitus, N vahemikust [0..1]\n"
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -10154,7 +10252,7 @@ msgstr ""
 " * crtkill       surma terve rida vastavalt echoprt ja echoe seadetele\n"
 " * -crtkill      surma terve rida vastavalt echoctl ja echok seadetele\n"
 
-#: src/stty.c:654
+#: src/stty.c:658
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
 "   [-]echo       echo input characters\n"
@@ -10168,7 +10266,7 @@ msgstr ""
 "   [-]echoe      sama, kui [-]crterase\n"
 "   [-]echok      väljasta kill sümboli järel reavahetus\n"
 
-#: src/stty.c:661
+#: src/stty.c:665
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
 "   [-]echonl     echo newline even if not echoing other characters\n"
@@ -10182,7 +10280,7 @@ msgstr ""
 "   [-]icanon     luba spetsiaalsümbolid erase, kill, werase ja rprnt\n"
 "   [-]iexten     luba POSIX mittevastavad spetsiaalsümbolid\n"
 
-#: src/stty.c:668
+#: src/stty.c:672
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
 "   [-]noflsh     disable flushing after interrupt and quit special "
@@ -10198,7 +10296,7 @@ msgstr ""
 " * [-]tostop     peata taustatööd, mis üritavad terminalile kirjutada\n"
 " * [-]xcase      icanon omadusega, kasuta suurtähtede ees '\\'\n"
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -10212,7 +10310,7 @@ msgstr ""
 "   cbreak        sama, kui -icanon\n"
 "   -cbreak       sama, kui icanon\n"
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -10224,7 +10322,7 @@ msgstr ""
 "   -cooked       sama, kui raw\n"
 "   crt           sama, kui echoe echoctl echoke\n"
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -10238,7 +10336,7 @@ msgstr ""
 "   ek            erase ja kill sümbolid seatakse vaikimisi väärtustele\n"
 "   evenp         sama, kui parenb -parodd cs7\n"
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -10254,7 +10352,7 @@ msgstr ""
 "   nl            sama, kui -icrnl -onlcr\n"
 "   -nl           sama, kui icrnl -inlcr -igncr onlcr -ocrnl -onlret\n"
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -10268,7 +10366,7 @@ msgstr ""
 "   pass8         sama, kui -parenb -istrip cs8\n"
 "   -pass8        sama, kui parenb istrip cs7\n"
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -10280,7 +10378,7 @@ msgstr ""
 "                 -imaxbel -opost -isig -icanon -xcase min 1 time 0\n"
 "   -raw          sama, kui cooked\n"
 
-#: src/stty.c:716
+#: src/stty.c:720
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
 "                 -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n"
@@ -10296,7 +10394,7 @@ msgstr ""
 "                 -xcase -tostop -echoprt echoctl echoke, kõik\n"
 "                 spetsiaalsümbolid seatakse vaikimisi väärtustele\n"
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -10311,12 +10409,12 @@ msgstr ""
 "literalina või kui ^c, 0x37, 0177 või 127; spetsiaalväärtuseid ^- või\n"
 "undef kasutatakse vastava sümboli blokeerimiseks.\n"
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, c-format
 msgid "only one device may be specified"
 msgstr "lubatud on ainult üks seade"
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
@@ -10325,43 +10423,43 @@ msgstr ""
 "inimesele loetava ja programmile loetava väljundi seaded on üksteist "
 "välistavad"
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr "kui määrate väljundi moodi, siis ei saa seadme moodi seada"
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr "%s: ei õnnestu eemaldada mitte-blokeeruvat moodi"
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, c-format
 msgid "invalid argument %s"
 msgstr "vigane argument %s"
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, c-format
 msgid "missing argument to %s"
 msgstr "%s nõuab argumenti"
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, c-format
 msgid "invalid line discipline %s"
 msgstr "vigane liini määrang %s"
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr "%s: kõiki nõutud operatsioone ei õnnestunud sooritada"
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr "%s: sellel seadmel puudub info suuruse kohta"
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, c-format
 msgid "invalid integer argument %s"
 msgstr "vigane numbriline argument %s"
@@ -10419,7 +10517,7 @@ msgstr "      --help     väljasta see abiinfo ja lõpeta töö\n"
 msgid "      --version  output version information and exit\n"
 msgstr "      --version  väljasta versiooniinfo ja lõpeta töö\n"
 
-#: src/system.h:544
+#: src/system.h:543
 msgid ""
 "\n"
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -10428,18 +10526,18 @@ msgstr ""
 "Kohustuslikud argumendid pikkadele võtmetele on kohustuslikud ka "
 "lühikestele.\n"
 
-#: src/system.h:552
+#: src/system.h:551
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 "\n"
-"SUURUS on täisarv ja võimalik ühik (näiteks: 10M on 10*1024*1024).  Ühikud\n"
+"SUURUS on täisarv ja võimalik ühik (näiteks: 10K on 10*1024).  Ühikud\n"
 "on K, M, G, T, P, E, Z, Y (1024 kordsed) või KB, MB, ... (1000 kordsed).\n"
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -10453,37 +10551,37 @@ msgstr ""
 "keskkonnamuutujatest. Muidu on ühik vaikimisi 1024 (või 512, kui \n"
 "POSIXLY_CORRECT on seatud).\n"
 
-#: src/system.h:571
+#: src/system.h:570
 #, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
+"%s online help: <%s>\n"
 msgstr ""
 "\n"
-"%s vigadest teatage palun aadressil %s\n"
+"%s abiinfo võrgus: <%s>\n"
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr ""
 "Teatage %s tõlkevigadest aadressil <http://translationproject.org/team/>\n"
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr ""
 "Täieliku dokumentatsiooni saate käsuga: info coreutils '%s invocation'\n"
 
-#: src/system.h:596
+#: src/system.h:591
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Lisainfo saamiseks proovige '%s --help'.\n"
 
-#: src/system.h:628
+#: src/system.h:633
 #, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -10579,83 +10677,77 @@ msgstr ""
 
 #: src/tail.c:270
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
-"  -c, --bytes=K            väljasta viimased K baiti; alternatiiv, kasutage\n"
-"                            K-nda baidiga alustades baidid võtmega -c +K\n"
+"  -c, --bytes=K            väljasta viimased K baiti; või kasutage -c +K\n"
+"                            et väljastada baidid igast failist alustades\n"
+"                            K-ndast baidist\n"
 
 #: src/tail.c:274
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
-"  -f, --follow[={nimi|pide}]\n"
+"  -f, --follow[={name|descriptor}]\n"
 "                           väljasta faili kasvamisel lisanduvad andmed;\n"
-"                           -f, --follow ja --follow=pide on samaväärsed\n"
+"                             puuduv argument tähendab 'descriptor'\n"
 "  -F                       sama, kui --follow=nimi --retry\n"
 
-#: src/tail.c:281
+#: src/tail.c:280
 #, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
 "  -n, --lines=K            väljasta vaikimisi %d viimase rea asemel K rida\n"
-"                           või kasuta -n +K et väljastatda read alates "
+"                             või kasuta -n +K et väljastatda read alates "
 "Kndast\n"
 "      --max-unchanged-stats=N\n"
 "                           võtmega --follow=nimi, ava FAIL, mis ei ole N\n"
-"                           iteratsiooni (vaikimisi %d) järel muutunud, "
+"                             iteratsiooni (vaikimisi %d) järel muutunud, "
 "uuesti\n"
-"                           tegemaks kindlaks, et seda faili ei ole "
+"                             tegemaks kindlaks, et seda faili ei ole "
 "kustutatud\n"
-"                           või ümber nimetatud (nagu seda võib juhtuda\n"
-"                           logifailidega). inotify korral pole seda võtit\n"
-"                           eriti vaja.\n"
+"                             või ümber nimetatud (nagu seda võib juhtuda\n"
+"                             logifailidega); inotify korral pole seda võtit\n"
+"                             eriti vaja\n"
 
-#: src/tail.c:294
+#: src/tail.c:293
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 "      --pid=PID            võtmega -f, lõpeta töö, kui protsess PID lõpetab\n"
 "  -q, --quiet, --silent    ära väljasta päiseid faili nimega\n"
 "      --retry              jätka faili avamise üritamist, isegi kui see\n"
-"                           muutub mittekasutatavaks; kasutatav võtmega\n"
-"                           --follow=nimi\n"
+"                           on mittekasutatav\n"
 
-#: src/tail.c:301
+#: src/tail.c:298
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 "  -s, --sleep-interval=N   võtmega -f, maga jälgimiste vahel umbes N "
 "sekundit\n"
-"                           (vaikimisi 1.0). Koos inotify ja --pid=P, "
+"                           (vaikimisi 1.0); koos inotify ja --pid=P, "
 "kontrolli\n"
-"                           protsessi P vähemalt N sekundi järel.\n"
+"                           protsessi P vähemalt N sekundi järel\n"
 "  -v, --verbose            väljasta alati päised faili nimega\n"
 
-#: src/tail.c:310
+#: src/tail.c:307
 msgid ""
 "\n"
 "If the first character of K (the number of bytes or lines) is a '+',\n"
@@ -10674,7 +10766,7 @@ msgstr ""
 "G 1024*1024*1024 ja nii edasi tähtedega T, P, E, Z, Y.\n"
 "\n"
 
-#: src/tail.c:319
+#: src/tail.c:316
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
 "means that even if a tail'ed file is renamed, tail will continue to track\n"
@@ -10691,27 +10783,22 @@ msgstr ""
 "seda perioodiliselt uuesti, millega testitakse faili ümber nimetatmist,\n"
 "kustutamist ja uuesti loomist.\n"
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr "sulen %s (fd=%d)"
 
-#: src/tail.c:453
-#, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr "%s: ei õnnestu liikuda suhtelisele nihkele %s"
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr "%s: ei õnnestu liikuda lõpu-suhtelisele nihkele %s"
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr "%s asukohta ei õnnestu tuvastada. kasutan pollimist"
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
@@ -10720,133 +10807,144 @@ msgstr ""
 "tundmatu failisüsteemi tüüp 0x%08lx %s jaoks. Palun saatke raport: %s. "
 "kasutan pollimist"
 
-#: src/tail.c:963
+#: src/tail.c:965
+#, c-format
+msgid "%s has been replaced with a symbolic link. giving up on this name"
+msgstr "%s asendati nimeviitega; ei jälgi seda enam"
+
+#: src/tail.c:980
 #, c-format
 msgid "%s has become inaccessible"
 msgstr "%s pole enam kasutatav"
 
-#: src/tail.c:980
+#: src/tail.c:997
 #, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr "%s asendati mitte-jälgitava failiga; ei jälgi seda enam"
 
-#: src/tail.c:989
+#: src/tail.c:1006
 #, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr "%s asendati mitte-lokaalse failiga; ei jälgi seda enam"
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, c-format
 msgid "%s has become accessible"
 msgstr "%s on jälle kasutatav"
 
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr "%s tekkis;  järgin uue faili lõppu"
 
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr "%s asendati;  järgin uue faili lõppu"
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr "%s: ei õnnestu muuta mitte-blokeeruvat moodi"
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr "%s: fail on lühendatud"
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr "rohkem faile pole"
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, c-format
 msgid "cannot watch parent directory of %s"
 msgstr "ei õnnestu jälgida %s vanemkataloogi"
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, c-format
 msgid "inotify resources exhausted"
 msgstr "inotify ressursid said otsa"
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, c-format
 msgid "cannot watch %s"
 msgstr "%s ei õnnestu jälgida"
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr "viga inotify sündmuse monitoorimisel"
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, c-format
 msgid "error reading inotify event"
 msgstr "viga inotify sündmuse lugemisel"
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr "%s: seda tüüpi faili lõppu ei saa järgida; annan alla"
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, c-format
 msgid "number in %s is too large"
 msgstr "%s number on liiga suur"
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr "%s: vigane maksimum arv mittemuutunud atribuute avamiste vahel"
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr "%s: vigane PID"
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr "%s: vigane arv sekundeid"
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr "võtit kasutati vales kontekstis -- %c"
 
-#: src/tail.c:2034
+#: src/tail.c:2096
 #, c-format
-msgid "warning: --retry is useful mainly when following by name"
-msgstr "hoiatus: --retry on kasutatav ainult failide jälgimisel nime põhjal"
+msgid "warning: --retry ignored; --retry is useful only when following"
+msgstr ""
+"hoiatus: --retry ignoreeritakse; --retry on kasulik ainult failide jälgimisel"
 
-#: src/tail.c:2038
+#: src/tail.c:2100
+#, c-format
+msgid "warning: --retry only effective for the initial open"
+msgstr "hoiatus: --retry mõjub ainult algsele avamisele"
+
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
 msgstr ""
 "hoiatus: PID ignoreeritakse; --pid=PID on kasulik ainult failide jälgimisel"
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr "hoiatus: --pid=PID ei ole selles süsteemis toetatud"
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, c-format
 msgid "cannot follow %s by name"
 msgstr "ei õnnestu %s nime järgi leida"
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr "hoiatus: standardsisendi lõpmatu jälgimine ei toimi"
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr "inotify ei saa kasutada, kasutan pollimist"
@@ -11119,17 +11217,17 @@ msgstr "liigne argument: %s"
 msgid "warning: sigprocmask"
 msgstr "hoiatus: sigprocmask"
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr "hoiatus: timer_settime"
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr "hoiatus: timer_create"
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
@@ -11138,45 +11236,44 @@ msgstr ""
 "Kasutamine: %s [VÕTI] KESTUS KÄSKLUS [ARGUMENT]...\n"
 "       või: %s [VÕTI]\n"
 
-#: src/timeout.c:229
+#: src/timeout.c:232
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
 msgstr ""
 "Käivita käsk ja tapa see, kui see pole peale antud aega veel lõpetanud.\n"
 
-#: src/timeout.c:235
+#: src/timeout.c:238
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
 "      --preserve-status\n"
 "                 lõpeta sama koodiga kui käsklus, isegi juhul kui programm\n"
-"                 tapeti\n"
+"                   tapeti\n"
 "      --foreground\n"
 "                 Kui ei tööta esiplaanil, luba käsul lugeda terminali ja\n"
-"                 saada terminali signaale.\n"
-"                 Selles moodis käsu alamprotsessid timeout ei saa.\n"
+"                   saada terminali signaale;\n"
+"                   selles moodis käsu alamprotsessid timeout ei saa\n"
 "  -k, --kill-after=KESTUS\n"
 "                 saada KILL signaal, kui käsklus on nii kaua käinud peale\n"
-"                 esimese signaali saatmist.\n"
+"                   esimese signaali saatmist\n"
 "  -s, --signal=SIGNAAL\n"
-"                 määra taimouti korral saadetav signaal.\n"
-"                 SIGNAAL võib olla nimi, nagu 'HUP', või number.\n"
-"                 Signaalide nimekirja saate käsuga 'kill -l`\n"
+"                 määra taimouti korral saadetav signaal;\n"
+"                   SIGNAAL võib olla nimi, nagu 'HUP', või number;\n"
+"                   signaalide nimekirja saate käsuga 'kill -l`\n"
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 msgid ""
 "\n"
 "DURATION is a floating point number with an optional suffix:\n"
@@ -11187,7 +11284,7 @@ msgstr ""
 "KESTUS on ujukomaarv järgneva võimaliku sufiksiga:\n"
 "'s' on sekundit(vikimisi), 'm' on minutit, 'h' on tunde ja 'd' on päevi.\n"
 
-#: src/timeout.c:259
+#: src/timeout.c:262
 msgid ""
 "\n"
 "If the command times out, and --preserve-status is not set, then exit with\n"
@@ -11209,17 +11306,17 @@ msgstr ""
 "KILL (9) signaali, sest seda signaali ei saa kinni püüda. KILL (9) korral\n"
 "on lõpetamise kood 128+9, mitte 124.\n"
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr "hoiatus: mälupildi salvaestamise keelamine ei õnnestunud"
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, c-format
 msgid "error waiting for command"
 msgstr "viga käsu järele ootamisel"
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr "jälgitav käsk salvestas core faili"
@@ -11623,10 +11720,10 @@ msgstr ""
 #: src/truncate.c:115
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 "  -r, --reference=FAIL   kasuta selle faili suurust\n"
-"  -s, --size=SUURUS      sea või muuda faili suurust\n"
+"  -s, --size=SUURUS      sea või muuda faili suurust baitides\n"
 
 #: src/truncate.c:121
 msgid ""
@@ -11714,12 +11811,12 @@ msgstr ""
 "Kui FAIL puudub või on -, loe standardsisendit.\n"
 "\n"
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr "%s: sisend sisaldab juhusliku arvu märke"
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr "%s: sisend sisaldab tsüklit:"
@@ -11813,12 +11910,12 @@ msgstr "tabulaatorid on liiga kaugel"
 msgid "tab stop value is too large"
 msgstr "tabulaatori peatus on liiga suur"
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr "Kasutamine: %s [VÕTI]... [SISEND [VÄLJUND]]\n"
 
-#: src/uniq.c:138
+#: src/uniq.c:174
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
 "writing to OUTPUT (or standard output).\n"
@@ -11830,39 +11927,53 @@ msgstr ""
 "\n"
 "Võtmeteta, sobivad read mestitakse esimese esinemiseni.\n"
 
-#: src/uniq.c:147
+#: src/uniq.c:183
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
+msgstr ""
+"  -c, --count           lisa rea algusse esinemiste arv\n"
+"  -d, --repeated        väljasta ainult dubleeritud read, üks iga grupi "
+"kohta\n"
+
+#: src/uniq.c:187
+msgid ""
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
+msgstr ""
+"  -D, --all-repeated[=MEETOD]  väljasta kõik duplikaat read\n"
+"                          gruppe saab eraldada tühja reaga\n"
+"                          METHOD={none(vaikimisi),prepend,separate}\n"
+
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr "  -f, --skip-fields=N   ära võrdle esimest N välja\n"
+
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
 msgstr ""
-"  -c, --count           lisa rea algusse esinemise number\n"
-"  -d, --repeated        väljasta ainult dubleeritud read\n"
+"      --group[=MEETOD]  näita kõiki elemente, eraldades grupid tühja reaga\n"
+"                          METHOD={separate(vaikimisi),prepend,append,both}\n"
 
-#: src/uniq.c:151
+#: src/uniq.c:199
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
 "  -i, --ignore-case     ignore differences in case when comparing\n"
 "  -s, --skip-chars=N    avoid comparing the first N characters\n"
 "  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
 msgstr ""
-"  -D, --all-repeated[=eraldaja-meetod] väljasta kõik duplikaat read\n"
-"                        eraldaja-meetod={none(vaikimisi),prepend,separate}\n"
-"                        Eraldatatakse tühjade ridadega.\n"
-"  -f, --skip-fields=N   ära võrdle esimest N välja\n"
 "  -i, --ignore-case     võrdle tõstutundetult\n"
 "  -s, --skip-chars=N    ära võrdle esimest N sümbolit\n"
 "  -u, --unique          väljasta ainult dubleerimata read\n"
-"  -z, --zero-terminated  lõpeta read reavahetuse asemel baidiga 0\n"
 
-#: src/uniq.c:161
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr "  -w, --check-chars=N   ära võrdle real enam kui N sümbolit\n"
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 msgid ""
 "\n"
 "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n"
@@ -11873,7 +11984,7 @@ msgstr ""
 "millele\n"
 "järgnevad mittetühimik sümbolid. Väljad jäetakse vahele enne sümboleid.\n"
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 msgid ""
 "\n"
 "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n"
@@ -11885,24 +11996,34 @@ msgstr ""
 "Esmalt tuleb sisend järjestada, või kasutage 'uniq' asemel 'sort -u'.\n"
 "Võrdlused kasutavad 'LC_COLLATE' poolt määratud reegleid.\n"
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, c-format
 msgid "too many repeated lines"
 msgstr "liiga palju korduvaid ridu"
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
 msgstr "vigane vahelejäetavate väljade arv"
 
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
 msgstr "vigane vahelejäetavate baitide arv"
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
 msgstr "vigane võrreldavate baitide arv"
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr "--group ei saa kasutada võtmetega -c/-d/-D/-u"
+
+#: src/uniq.c:652
+#, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr "grupeerimine ja korduste arvu väljastamine ei oma mõtet"
+
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr "kõikide duplikaat ridade ja korduste arvu ei saa korraga väljastada"
@@ -11924,11 +12045,6 @@ msgstr ""
 "Kasutan antud FAILI kustutamiseks unlink funktsiooni.\n"
 "\n"
 
-#: src/unlink.c:86
-#, c-format
-msgid "cannot unlink %s"
-msgstr "%s ei saa kustutada"
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -11973,7 +12089,7 @@ msgstr[1] "%lu kasutajat"
 msgid ",  load average: %.2f"
 msgstr ", tööjärjekorra koormus: %.2f"
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -11983,7 +12099,7 @@ msgstr ""
 "Väljasta praegune aeg, süsteemi töötamise aeg, kasutajate arv süsteemis,\n"
 "ja tööjärjekorra koormus viimase 1, 5 ja 15 minuti vältel."
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
@@ -11992,12 +12108,12 @@ msgstr ""
 "  Protsess\n"
 "mittekatkestatava magamise olekus suurendab samuti koormust.\n"
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr "\n"
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
diff --git a/po/eu.gmo b/po/eu.gmo
index 66c0afaf..d36b0f18 100644
--- a/po/eu.gmo
+++ b/po/eu.gmo
diff --git a/po/eu.po b/po/eu.po
index b7d21055..8c19e690 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: coreutils-8.3\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
 "PO-Revision-Date: 2010-01-08 12:38+0100\n"
 "Last-Translator: Mikel Olasagasti Uranga <hey_neken@mundurat.net>\n"
 "Language-Team: Basque <translation-team-eu@lists.sourceforge.net>\n"
@@ -35,77 +35,125 @@ msgstr "Baliozko argumentuak hauek dira:"
 msgid "error closing file"
 msgstr "errorea fitxategia itxitzerakoan"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "idazketa errorea"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, fuzzy, c-format
 msgid "preserving permissions for %s"
 msgstr "baimenak errepikatu arte"
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "Sistema-errore ezezaguna"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "fitxategi erregular hutsa"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "Espresio erregularra"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "direktorioa"
 
-#: lib/file-type.c:44
-msgid "block special file"
-msgstr "bloke fitxategi berezia"
-
-#: lib/file-type.c:47
-msgid "character special file"
-msgstr "karaktere fitxategi berezia"
-
-#: lib/file-type.c:50
-msgid "fifo"
-msgstr "fifo"
-
-#: lib/file-type.c:53
+#: lib/file-type.c:46
 msgid "symbolic link"
 msgstr "esteka sinbolikoa"
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "socket-a"
-
-#: lib/file-type.c:59
+#: lib/file-type.c:52
 msgid "message queue"
 msgstr "Bidali ilara"
 
-#: lib/file-type.c:62
+#: lib/file-type.c:55
 msgid "semaphore"
 msgstr "semaforoa"
 
-#: lib/file-type.c:65
+#: lib/file-type.c:58
 msgid "shared memory object"
 msgstr "memoria partekatuaren objektua"
 
-#: lib/file-type.c:68
+#: lib/file-type.c:61
 #, fuzzy
 msgid "typed memory object"
 msgstr "memoria partekatuaren objektua"
 
-#: lib/file-type.c:70
+#: lib/file-type.c:66
+msgid "block special file"
+msgstr "bloke fitxategi berezia"
+
+#: lib/file-type.c:69
+msgid "character special file"
+msgstr "karaktere fitxategi berezia"
+
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr ""
+
+#: lib/file-type.c:75
+msgid "fifo"
+msgstr "fifo"
+
+#: lib/file-type.c:78
+msgid "door"
+msgstr ""
+
+#: lib/file-type.c:81
+#, fuzzy
+msgid "multiplexed block special file"
+msgstr "bloke fitxategi berezia"
+
+#: lib/file-type.c:84
+#, fuzzy
+msgid "multiplexed character special file"
+msgstr "karaktere fitxategi berezia"
+
+#: lib/file-type.c:87
+#, fuzzy
+msgid "multiplexed file"
+msgstr "rol anitz"
+
+#: lib/file-type.c:90
+#, fuzzy
+msgid "named file"
+msgstr "fitxategi arraroa"
+
+#: lib/file-type.c:93
+#, fuzzy
+msgid "network special file"
+msgstr "bloke fitxategi berezia"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr ""
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr ""
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr ""
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "socket-a"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr ""
+
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "fitxategi arraroa"
 
@@ -241,18 +289,18 @@ msgstr "%s: '-W.%s' aukerak ez du argumenturik onartzen\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: '%s' aukerak argumentu bat behar du\n"
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr "ezin da %s-(r)en baimenak aldatu"
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "ezin da %s direktorioa sortu"
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr "memoria agortuta"
@@ -373,7 +421,7 @@ msgstr "in bilatu"
 msgid "Unmatched ) or \\)"
 msgstr ""
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 #, fuzzy
 msgid "No previous regular expression"
 msgstr "in bilatu"
@@ -399,7 +447,7 @@ msgstr "erabili --no-preserve-root segurtasun neurri hau ekiditeko"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[bB]"
 
@@ -409,11 +457,11 @@ msgstr "^[bB]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[eE]"
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, c-format
 msgid "setting permissions for %s"
 msgstr "%s-(r)en baimenak ezartzen"
@@ -557,18 +605,6 @@ msgstr "Argindarra arazoa"
 msgid "Resource lost"
 msgstr "-lt baino lehen"
 
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, fuzzy, c-format
-msgid "cannot create pipe"
-msgstr "ezin da %s fifo-a sortu"
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, fuzzy, c-format
-msgid "%s subprocess failed"
-msgstr "%s: seek-ek huts egin du"
-
 #: lib/strsignal.c:114
 #, c-format
 msgid "Real-time signal %d"
@@ -773,7 +809,7 @@ msgstr ""
 "\n"
 "Programa-erroreen berri emateko idatzi hona: <%s>.\n"
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s-(r)en orri nagusia: <%s>\n"
@@ -783,31 +819,11 @@ msgstr "%s-(r)en orri nagusia: <%s>\n"
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr "%s-(r)en orri nagusia: <http://www.gnu.org/software/%s/>\n"
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr ""
 "GNU softwarearen erabilera laguntza orokorra: <http://www.gnu.org/gethelp/>\n"
 
-#: lib/w32spawn.h:43
-#, fuzzy, c-format
-msgid "_open_osfhandle failed"
-msgstr "irekitzeak huts egin du"
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr ""
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr ""
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr ""
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr "stdin"
@@ -830,7 +846,7 @@ msgstr "Sistema-errore ezezaguna"
 msgid "failed to reopen %s with mode %s"
 msgstr "huts egin da %s irekitzen"
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr "kate konparaketak huts egin du"
@@ -889,7 +905,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 #, fuzzy
 msgid ""
 "\n"
@@ -905,48 +921,47 @@ msgid ""
 "from any other non-alphabet bytes in the encoded stream.\n"
 msgstr ""
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "irakurketa errorea"
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, c-format
 msgid "invalid input"
 msgstr "baliogabeko sarrera"
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, fuzzy, c-format
 msgid "invalid wrap size: %s"
 msgstr "baliogabea tamaina"
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, fuzzy, c-format
 msgid "extra operand %s"
 msgstr "`%s' eragigai extra"
 
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, c-format
 msgid "closing standard input"
 msgstr "sarrera estandarra itxitzen"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -974,8 +989,8 @@ msgstr "Inprimatu IZENA honekin edozein a e e"
 #: src/basename.c:60
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/basename.c:67
@@ -989,32 +1004,31 @@ msgid ""
 "  %s -a any/str1 any/str2   -> \"str1\" followed by \"str2\"\n"
 msgstr ""
 
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, c-format
 msgid "missing operand"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr "Torbjorn Granlund"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 msgid "Richard M. Stallman"
 msgstr "Richard M. Stallman"
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1067,7 +1081,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr "ezin zaio %s-(e)ri ioctil egin"
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr "irteera estandarra"
@@ -1084,14 +1098,14 @@ msgstr "Russell Coker"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 msgid "Jim Meyering"
 msgstr "Jim Meyering"
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, fuzzy, c-format
 msgid "failed to create security context: %s"
 msgstr "-"
@@ -1101,8 +1115,8 @@ msgstr "-"
 msgid "failed to set %s security context component to %s"
 msgstr ""
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, fuzzy, c-format
 msgid "failed to get security context of %s"
 msgstr "-"
@@ -1112,18 +1126,18 @@ msgstr "-"
 msgid "can't apply partial context to unlabeled file %s"
 msgstr ""
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, fuzzy, c-format
 msgid "failed to change context of %s to %s"
 msgstr "- e"
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
 msgstr "ezin da %s-ra sartu"
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, c-format
 msgid "cannot read directory %s"
 msgstr ""
@@ -1133,13 +1147,14 @@ msgstr ""
 msgid "changing security context of %s\n"
 msgstr "%s-ren baimenak aldatzen"
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, c-format
 msgid "fts_read failed"
 msgstr "`fts_read'-ek huts egin du"
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, c-format
 msgid "fts_close failed"
 msgstr "fts_close-ek huts egin du"
@@ -1158,7 +1173,7 @@ msgstr ""
 
 #: src/chcon.c:357
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
@@ -1179,7 +1194,7 @@ msgid ""
 "  -l, --range=RANGE      set range RANGE in the target security context\n"
 msgstr ""
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 #, fuzzy
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
@@ -1231,36 +1246,37 @@ msgstr ""
 "\n"
 " edozein lehenetsia e e"
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr "-R --dereference aukerak -H edo -L behar du"
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr "-R -h aukerak -P behar du"
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, fuzzy, c-format
 msgid "missing operand after %s"
 msgstr "baimenak errepikatu arte"
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, c-format
 msgid "invalid context: %s"
 msgstr "baliogabeko kontestua: %s"
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr ""
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, fuzzy, c-format
 msgid "failed to get attributes of %s"
 msgstr "-"
@@ -1286,7 +1302,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
@@ -1318,47 +1334,47 @@ msgid ""
 "  %s -hR staff /u  Change the group of /u and subfiles to \"staff\".\n"
 msgstr ""
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
 msgstr "%s-(r)en atributo berriak irakurtzen"
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, fuzzy, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr "lotura e"
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, fuzzy, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr "modua - e"
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, fuzzy, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr "modua - e"
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, fuzzy, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr "modua - e"
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, fuzzy, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr "lotura"
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, c-format
 msgid "changing permissions of %s"
 msgstr "%s-ren baimenak aldatzen"
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr "%s: baimen bereziak %s dira, ez %s"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1369,39 +1385,33 @@ msgstr ""
 " edo FITXATEGIA\n"
 " edo FITXATEGIA e"
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 msgid ""
 "Change the mode of each FILE to MODE.\n"
 "With --reference, change the mode of each FILE to that of RFILE.\n"
 "\n"
 msgstr ""
 
-#: src/chmod.c:391
-#, fuzzy
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
-"\n"
-" erabili taldea\n"
-" balioa\n"
-" G aktibatuta eta\n"
-" a errepikatu arte e e"
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr ""
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 msgid ""
 "\n"
 "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n"
 msgstr ""
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr ""
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, c-format
 msgid "invalid mode: %s"
 msgstr "baliogabea modua: %s"
@@ -1536,26 +1546,21 @@ msgid ""
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr "Roland McGrath"
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr "baliogabea taldea %s"
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, c-format
 msgid "invalid group list %s"
 msgstr "baliogabea talde zerrenda %s"
 
-#: src/chroot.c:117
-#, c-format
-msgid "failed to set additional groups"
-msgstr "huts egin da talde gehiago ezartzen"
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
@@ -1564,48 +1569,62 @@ msgstr ""
 "Erabilera: %s [AUKERA] ERRO-BERRIA [KOMANDOA [ARGUMENTUA]...]\n"
 "  edo:  %s AUKERA\n"
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 #, fuzzy
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
 msgstr "Exekutatu KOMANDOA honekin e e"
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
 msgstr ""
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 #, fuzzy
 msgid ""
 "\n"
 "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n"
 msgstr "ez da lehenetsia e"
 
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, c-format
 msgid "cannot change root directory to %s"
 msgstr ""
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, c-format
 msgid "cannot chdir to root directory"
 msgstr ""
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr ""
+
+#: src/chroot.c:383
+#, fuzzy, c-format
+msgid "failed to get supplemental groups"
+msgstr "taldea"
+
+#: src/chroot.c:395
+#, fuzzy, c-format
+msgid "failed to %s supplemental groups"
+msgstr "taldea"
+
+#: src/chroot.c:402
 #, c-format
 msgid "failed to set group-ID"
 msgstr "huts egin da talde-id-a ezartzen"
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, c-format
 msgid "failed to set user-ID"
 msgstr "huts egin da erabiltzaile-id-a ezartzen"
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, c-format
 msgid "failed to run command %s"
 msgstr "huts egin da %s komandoa exekutatzen"
@@ -1636,7 +1655,7 @@ msgid ""
 "\n"
 msgstr "Inprimatu eta - FITXATEGIA e e"
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr "Erabilera: %s [AUKERA]... 1FITXATEGIA 2FITXATEGIA\n"
@@ -1712,294 +1731,327 @@ msgstr "irteera fitxategi anitz espezifikatu dira"
 msgid "empty %s not allowed"
 msgstr "%s hutsa ez da onartzen"
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr "errorea %s irakurtzen"
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, c-format
 msgid "cannot lseek %s"
 msgstr "ezin zaio `lseek' egin %s-ri"
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr "errorea %s idazten"
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, fuzzy, c-format
 msgid "%s: failed to get extents info"
 msgstr "-"
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, fuzzy, c-format
 msgid "%s: write failed"
 msgstr "idazketak huts egin du"
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, fuzzy, c-format
 msgid "failed to extend %s"
 msgstr "huts egin da %s irekitzen"
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, fuzzy, c-format
 msgid "clearing permissions for %s"
 msgstr "baimenak errepikatu arte"
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, fuzzy, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "errepikatu arte"
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
 msgstr ""
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, fuzzy, c-format
 msgid "failed to preserve authorship for %s"
 msgstr "errepikatu arte"
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
+#, fuzzy, c-format
+msgid "failed to set default file creation context to %s"
+msgstr "-"
+
+#: src/copy.c:820
+#, fuzzy, c-format
+msgid "failed to set default file creation context for %s"
+msgstr "-"
+
+#: src/copy.c:846
+#, fuzzy, c-format
+msgid "failed to set the security context of %s"
+msgstr "taldea - e"
+
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, fuzzy, c-format
 msgid "cannot open %s for reading"
 msgstr "errepikatu arte"
 
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, c-format
 msgid "cannot fstat %s"
 msgstr "ezin zaio `fstat' egin %s-(e)ri"
 
-#: src/copy.c:820
+#: src/copy.c:935
 #, c-format
 msgid "skipping file %s, as it was replaced while being copied"
 msgstr ""
 
-#: src/copy.c:850
-#, fuzzy, c-format
-msgid "failed to get file system create context"
-msgstr "kopiatu - aktibatuta"
-
-#: src/copy.c:864
-#, fuzzy, c-format
-msgid "failed to set the security context of %s to %s"
-msgstr "taldea - e"
-
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
 msgid "cannot remove %s"
 msgstr "ezin da %s kendu"
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
 msgstr "%s ezabatua\n"
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr ""
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, c-format
 msgid "cannot create regular file %s"
 msgstr ""
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, fuzzy, c-format
 msgid "failed to clone %s from %s"
 msgstr "huts egin da %s klonatzen"
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, fuzzy, c-format
 msgid "preserving times for %s"
 msgstr "errepikatu arte"
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
 #, fuzzy, c-format
 msgid "failed to close %s"
-msgstr "huts egin da %s irekitzen"
+msgstr "huts egin da %s klonatzen"
 
-#: src/copy.c:1471
+#: src/copy.c:1580
 #, fuzzy, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
 msgstr "modua "
 
-#: src/copy.c:1478
+#: src/copy.c:1581
+#, c-format
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr ""
+
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
 msgstr "%s: %s gainidatzi?"
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr " (babeskopia: %s)"
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr ""
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, fuzzy, c-format
 msgid "cannot create hard link %s to %s"
 msgstr "lotura"
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, c-format
 msgid "cannot stat %s"
 msgstr "ezin da `stat' egin %s-(r)engan"
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, c-format
 msgid "omitting directory %s"
 msgstr ""
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr ""
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, fuzzy, c-format
 msgid "%s and %s are the same file"
 msgstr "eta"
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, fuzzy, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr "honekin"
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, fuzzy, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr "honekin"
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, fuzzy, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr "honekin"
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr ""
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, fuzzy, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr "gora"
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, fuzzy, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr "gora"
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
 msgstr "ezin da %s-(r)en babeskopia egin"
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, fuzzy, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr "honekin"
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, fuzzy, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr "kopiatu a bere gainera"
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, fuzzy, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr "lotura"
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, fuzzy, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr "a - bere gainera"
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, c-format
 msgid "cannot move %s to %s"
 msgstr "ezin izan da %s %s-(r)a mugitu"
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, fuzzy, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr "gailua"
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, fuzzy, c-format
-msgid "failed to set default file creation context to %s"
-msgstr "-"
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, fuzzy, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr "kopiatu lotura"
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, fuzzy, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr "erlatiboa in"
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, fuzzy, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr "lotura"
 
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, c-format
 msgid "cannot create fifo %s"
 msgstr "ezin da %s fifo-a sortu"
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, c-format
 msgid "cannot create special file %s"
 msgstr "ezin da %s fitxategi berezia sortu"
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, fuzzy, c-format
 msgid "cannot read symbolic link %s"
 msgstr "lotura"
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, fuzzy, c-format
 msgid "cannot create symbolic link %s"
 msgstr "lotura"
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, fuzzy, c-format
 msgid "%s has unknown file type"
 msgstr "ezezaguna mota"
 
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, c-format
 msgid "cannot un-backup %s"
 msgstr "ezin da %s babeskopia kendu"
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, fuzzy, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr "e"
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr ""
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr ""
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, fuzzy, c-format
+msgid "unknown program %s"
+msgstr "Sistema-errore ezezaguna"
+
+#: src/cp.c:157 src/mv.c:288
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -2010,12 +2062,12 @@ msgstr ""
 "  edo:  %s [AUKERA]... ITURRIA... DIREKTORIOA\n"
 "  edo:  %s [AUKERA]... -t DIREKTORIOA ITURRIA...\n"
 
-#: src/cp.c:162
+#: src/cp.c:163
 #, fuzzy
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
 msgstr "Kopiatu ITURBURUA edo ITURBURUA DIREKTORIOA e e"
 
-#: src/cp.c:168
+#: src/cp.c:169
 #, fuzzy
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
@@ -2035,7 +2087,7 @@ msgstr ""
 " kopiatu kopiatu -\n"
 " ez lotura e"
 
-#: src/cp.c:177
+#: src/cp.c:178
 #, fuzzy
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
@@ -2054,20 +2106,20 @@ msgstr ""
 " lehenago\n"
 " T e"
 
-#: src/cp.c:186
+#: src/cp.c:187
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
 "  -L, --dereference            always follow symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:190
+#: src/cp.c:191
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
 "                                 a previous -i option)\n"
 "  -P, --no-dereference         never follow symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:195
+#: src/cp.c:196
 #, fuzzy
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
@@ -2084,7 +2136,7 @@ msgstr ""
 " modua\n"
 " e"
 
-#: src/cp.c:203
+#: src/cp.c:204
 #, fuzzy
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
@@ -2094,7 +2146,7 @@ msgstr ""
 " bide-izena DIREKTORIOA\n"
 " ez e"
 
-#: src/cp.c:207
+#: src/cp.c:208
 #, fuzzy
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
@@ -2107,7 +2159,7 @@ msgstr ""
 " lehenago\n"
 " honekin behartu e"
 
-#: src/cp.c:213
+#: src/cp.c:214
 #, fuzzy
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
@@ -2121,7 +2173,7 @@ msgstr ""
 " edozein ITURBURUA\n"
 " e"
 
-#: src/cp.c:218
+#: src/cp.c:219
 #, fuzzy
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
@@ -2134,7 +2186,7 @@ msgstr ""
 " S\n"
 " DIREKTORIOA ITURBURUA DIREKTORIOA e"
 
-#: src/cp.c:224
+#: src/cp.c:225
 #, fuzzy
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
@@ -2149,7 +2201,15 @@ msgstr ""
 " da eginda\n"
 " x aktibatuta uneko e"
 
-#: src/cp.c:233
+#: src/cp.c:232
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/cp.c:240
 #, fuzzy
 msgid ""
 "\n"
@@ -2168,7 +2228,7 @@ msgstr ""
 "lehenetsia ITURBURUA bider a eta da da bider auto a ITURBURUA hau daukana a "
 "- - e e"
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 #, fuzzy
 msgid ""
 "\n"
@@ -2179,7 +2239,7 @@ msgid ""
 "\n"
 msgstr "da honekin edo maiatzak edo BERTSIOA e e"
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 #, fuzzy
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
@@ -2192,7 +2252,7 @@ msgstr ""
 " sinplea\n"
 " sinplea sinplea e"
 
-#: src/cp.c:258
+#: src/cp.c:265
 #, fuzzy
 msgid ""
 "\n"
@@ -2201,227 +2261,237 @@ msgid ""
 "regular file.\n"
 msgstr "a a - ITURBURUA behartu eta eta ITURBURUA eta errepikatu arte e"
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, fuzzy, c-format
 msgid "failed to preserve times for %s"
 msgstr "errepikatu arte"
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, fuzzy, c-format
 msgid "failed to preserve permissions for %s"
 msgstr "baimenak errepikatu arte"
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, c-format
 msgid "cannot make directory %s"
 msgstr "ezin da %s direktorioa egin"
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr "%s badago baina ez da direktorio bat"
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
 #, fuzzy, c-format
 msgid "failed to access %s"
-msgstr "huts egin da %s irekitzen"
+msgstr "huts egin da %s klonatzen"
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, fuzzy, c-format
 msgid "missing file operand"
 msgstr "zerrenda -"
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, fuzzy, c-format
 msgid "missing destination file operand after %s"
 msgstr "errepikatu arte"
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr ""
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, fuzzy, c-format
 msgid "target %s is not a directory"
 msgstr "da a"
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, fuzzy, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr "a"
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, fuzzy, c-format
 msgid "multiple target directories specified"
 msgstr "irteera fitxategi anitz espezifikatu dira"
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr ""
+
+#: src/cp.c:1137
 #, fuzzy, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr "eta"
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, fuzzy, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr "eta"
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr ""
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr "babeskopia moeta"
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, c-format
+msgid "cannot set target context and preserve it"
+msgstr ""
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr ""
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr "Stuart Kemp"
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr "sarrera desagertu da"
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, fuzzy, c-format
 msgid "%s: line number out of range"
 msgstr "-"
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, fuzzy, c-format
 msgid "%s: %s: line number out of range"
 msgstr "-"
 
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, fuzzy, c-format
 msgid " on repetition %s\n"
 msgstr "aktibatuta e"
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, c-format
 msgid "%s: %s: match not found"
 msgstr "%s: %s: ez da parekiderik topatu"
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, fuzzy, c-format
 msgid "error in regular expression search"
 msgstr "in bilatu"
 
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, c-format
 msgid "write error for %s"
 msgstr "idazketa errorea %s-(r)entzat"
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, fuzzy, c-format
 msgid "%s: integer expected after delimiter"
 msgstr "geroago"
 
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, fuzzy, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr "da in"
 
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, fuzzy, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr "eta"
 
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr ""
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, fuzzy, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr "baliogabea"
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr "%s: baliogabeko eredua"
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr ""
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, fuzzy, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr "da"
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, fuzzy, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr "da"
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, fuzzy, c-format
 msgid "missing conversion specifier in suffix"
 msgstr "in"
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, fuzzy, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr "baliogabea in"
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, fuzzy, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr "baliogabea in"
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, fuzzy, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr "baliogabea"
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, fuzzy, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr "in"
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, fuzzy, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr "in"
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr "%s: baliogabeko zenbakia"
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr "Erabilera: %s [AUKERA]... FITXATEGI EREDUA...\n"
 
-#: src/csplit.c:1455
+#: src/csplit.c:1483
 #, fuzzy
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
 "and output byte counts of each piece to standard output.\n"
 msgstr "Irteera - FITXATEGIA bider - e e"
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, fuzzy, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2432,7 +2502,11 @@ msgstr ""
 " AURRIZKIA erabili AURRIZKIA horren ordez -\n"
 " aktibatuta e"
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr ""
+
+#: src/csplit.c:1498
 #, fuzzy
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
@@ -2443,14 +2517,14 @@ msgstr ""
 " -\n"
 " hutsik hutsik e"
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 #, fuzzy
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
 msgstr "FITXATEGIA da maiatzak e"
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 #, fuzzy
 msgid ""
 "\n"
@@ -2474,21 +2548,17 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr "David M. Ihnat"
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr ""
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, fuzzy, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr "Erabilera: %s [AUKERA]... [FITXATEGIA]...\n"
 
-#: src/cut.c:193
+#: src/cut.c:176
 #, fuzzy
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr "Inprimatu - lerroz behin FITXATEGIA e e"
 
-#: src/cut.c:199
+#: src/cut.c:182
 #, fuzzy
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
@@ -2499,7 +2569,7 @@ msgstr ""
 "\n"
 " erabili horren ordez - errepikatu arte e"
 
-#: src/cut.c:204
+#: src/cut.c:187
 #, fuzzy
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
@@ -2512,7 +2582,7 @@ msgstr ""
 " da\n"
 " e enoratua e"
 
-#: src/cut.c:210
+#: src/cut.c:193
 #, fuzzy
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
@@ -2521,7 +2591,7 @@ msgstr ""
 "a\n"
 " lehenago da e"
 
-#: src/cut.c:214
+#: src/cut.c:197
 #, fuzzy
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
@@ -2532,7 +2602,7 @@ msgstr ""
 " KATEA erabili KATEA\n"
 " lehenetsia da erabili e"
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2540,7 +2610,7 @@ msgid ""
 "in the same order that it is read, and is written exactly once.\n"
 msgstr ""
 
-#: src/cut.c:227
+#: src/cut.c:210
 #, fuzzy
 msgid ""
 "Each range is one of:\n"
@@ -2558,64 +2628,68 @@ msgstr ""
 " I M I M edo\n"
 " M lehen M edo e ez FITXATEGIA edo FITXATEGIA da e"
 
-#: src/cut.c:367 src/cut.c:493
+#: src/cut.c:300 src/cut.c:394
 #, fuzzy
 msgid "invalid byte, character or field list"
 msgstr "baliogabea edo zerrenda"
 
-#: src/cut.c:387
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr ""
+
+#: src/cut.c:320
 #, fuzzy
 msgid "invalid range with no endpoint: -"
 msgstr "baliogabea zabalera"
 
-#: src/cut.c:403
+#: src/cut.c:334
 #, fuzzy
 msgid "invalid decreasing range"
 msgstr "baliogabea modua"
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, c-format
 msgid "byte offset %s is too large"
 msgstr "%s byte offset-a luzeegia da"
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, fuzzy, c-format
 msgid "field number %s is too large"
 msgstr "da"
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 #, fuzzy
 msgid "only one type of list may be specified"
 msgstr "mota - zerrenda maiatzak"
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, fuzzy, c-format
 msgid "the delimiter must be a single character"
 msgstr "a"
 
-#: src/cut.c:847
+#: src/cut.c:787
 #, fuzzy
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr "a zerrenda - edo"
 
-#: src/cut.c:850
+#: src/cut.c:790
 #, fuzzy
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr "maiatzak aktibatuta"
 
-#: src/cut.c:854
+#: src/cut.c:794
 #, fuzzy
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
 msgstr "lerroz behin e aktibatuta"
 
-#: src/cut.c:870
+#: src/cut.c:800
 #, fuzzy
 msgid "missing list of fields"
 msgstr "zerrenda -"
 
-#: src/cut.c:872
+#: src/cut.c:802
 #, fuzzy
 msgid "missing list of positions"
 msgstr "zerrenda -"
@@ -2672,7 +2746,7 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 
 #: src/date.c:158
@@ -2851,10 +2925,10 @@ msgid ""
 "  $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n"
 msgstr ""
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr "sarrera estandarra"
@@ -2892,7 +2966,7 @@ msgstr "a edozein a honekin."
 msgid "cannot set date"
 msgstr "ezin da data ezarri"
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, c-format
 msgid "time %s is out of range"
 msgstr "%s ordua barrutitik kanpora dago"
@@ -2903,7 +2977,7 @@ msgstr "%s ordua barrutitik kanpora dago"
 msgid "Paul Rubin"
 msgstr "Paul Rubin"
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
@@ -2912,7 +2986,7 @@ msgstr ""
 "Erabilera: %s [ERAGIGAI]...\n"
 "  edo:  %s AUKERA\n"
 
-#: src/dd.c:526
+#: src/dd.c:532
 #, fuzzy
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
@@ -2930,7 +3004,7 @@ msgstr ""
 " kopiatu\n"
 " a e"
 
-#: src/dd.c:535
+#: src/dd.c:541
 #, fuzzy
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
@@ -2949,7 +3023,7 @@ msgstr ""
 " hasi -\n"
 " hasi - e"
 
-#: src/dd.c:546
+#: src/dd.c:552
 #, fuzzy
 msgid ""
 "\n"
@@ -2962,7 +3036,7 @@ msgid ""
 msgstr ""
 "eta maiatzak bider M MB M B eta aktibatuta errepikatu arte E Y maiatzak e e"
 
-#: src/dd.c:555
+#: src/dd.c:561
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
 "  ebcdic    from ASCII to EBCDIC\n"
@@ -2977,7 +3051,7 @@ msgid ""
 "            with block or unblock, pad with spaces rather than NULs\n"
 msgstr ""
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -2987,7 +3061,7 @@ msgid ""
 "  fsync     likewise, but also write metadata\n"
 msgstr ""
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -2996,76 +3070,76 @@ msgid ""
 "suggested)\n"
 msgstr ""
 
-#: src/dd.c:583
+#: src/dd.c:589
 msgid "  cio       use concurrent I/O for data\n"
 msgstr ""
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr ""
 
-#: src/dd.c:587
+#: src/dd.c:593
 #, fuzzy
 msgid "  directory  fail unless a directory\n"
 msgstr "da a"
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr ""
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr ""
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr ""
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr ""
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr ""
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr ""
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr ""
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr ""
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr ""
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr ""
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr ""
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3087,28 +3161,38 @@ msgstr ""
 " in\n"
 " e"
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
 "%<PRIuMAX>+%<PRIuMAX> records out\n"
 msgstr ""
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr "Infinity B"
 
@@ -3122,87 +3206,87 @@ msgstr "Infinity B"
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
 msgstr ", %g s, %s/s\n"
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, c-format
 msgid "closing input file %s"
 msgstr "%s sarrera fitxategia itxitzen"
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr "%s irteera fitxategia itxitzen"
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr ""
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, c-format
 msgid "writing to %s"
 msgstr "%s-ra idazten"
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, fuzzy, c-format
 msgid "unrecognized operand %s"
 msgstr "%s: '--%s' aukera ezezaguna\n"
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 #, fuzzy
 msgid "invalid conversion"
 msgstr "baliogabea"
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 #, fuzzy
 msgid "invalid input flag"
 msgstr "baliogabea hasi"
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 #, fuzzy
 msgid "invalid output flag"
 msgstr "baliogabeko taldea"
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 #, fuzzy
 msgid "invalid status flag"
 msgstr "baliogabea"
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, fuzzy, c-format
 msgid "invalid number %s"
 msgstr "baliogabea"
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr ""
 
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, fuzzy, c-format
 msgid "cannot combine block and unblock"
 msgstr "ezin dira biak, erabiltzailea eta taldea, alde batera utzi"
 
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, fuzzy, c-format
 msgid "cannot combine lcase and ucase"
 msgstr "eta"
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, fuzzy, c-format
 msgid "cannot combine excl and nocreat"
 msgstr "honekin edo"
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, fuzzy, c-format
 msgid "cannot combine direct and nocache"
 msgstr "honekin edo"
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, fuzzy, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
@@ -3211,168 +3295,167 @@ msgstr ""
 "errepikatu arte\n"
 " - mota<sys/mtio.h> errepikatu arte zerrenda -"
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, fuzzy, c-format
 msgid "%s: cannot skip"
 msgstr "%s: ezin da kendu"
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, fuzzy, c-format
 msgid "%s: cannot seek"
 msgstr "%s: ezin da kendu"
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr ""
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, fuzzy, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr "baliogabea zabalera horren ordez"
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr ""
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, fuzzy, c-format
 msgid "setting flags for %s"
 msgstr "-"
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, fuzzy, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr "erlatiboa"
 
-#: src/dd.c:2133
+#: src/dd.c:2172
 #, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
 msgstr ""
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr "`fdatasync'-ek huts egin du %s-(r)entzat"
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
 msgstr "%s-(r)entzat fsync-ek huts egin du"
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, c-format
 msgid "failed to open %s"
 msgstr "huts egin da %s irekitzen"
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
 "blocks"
 msgstr ""
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr ""
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, fuzzy, c-format
 msgid "failed to discard cache for: %s"
 msgstr "huts egin da %s-(r)i `chdir' egiten"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr "Paul Eggert"
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr "Fitxategi-sistema"
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr "Moeta"
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr "bloke"
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr "Erab"
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr "Eskuragar"
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr "Erab%"
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr "Inodoak"
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr "IErabil"
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr "ILibre"
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr "IErab%"
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr "Non muntatua"
 
-#: src/df.c:383
-#, c-format
-msgid "option --output: field '%s' unknown"
+#: src/df.c:207
+msgid "File"
 msgstr ""
 
-#: src/df.c:390
+#: src/df.c:387
+#, fuzzy, c-format
+msgid "option --output: field %s unknown"
+msgstr "%s irteera fitxategia itxitzen"
+
+#: src/df.c:394
 #, c-format
-msgid "option --output: field '%s' used more than once"
+msgid "option --output: field %s used more than once"
 msgstr ""
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr "Tamai"
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr "Libre"
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr "Edukiera"
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
 msgstr ""
 
-#: src/df.c:1210
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr ""
+
+#: src/df.c:1384
 #, fuzzy
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
@@ -3383,17 +3466,18 @@ msgstr ""
 "lehenetsitako moduan fitxategi-sistema guztiena.\n"
 "\n"
 
-#: src/df.c:1217
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
 #, fuzzy
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
 "  -a, --all             0 bloke dizuten fitxategi-sistemak ere erakutsi\n"
 "  -B, --block-size=TAMAINUA erabili TAMAINUA-byte-eko blokeak\n"
@@ -3402,7 +3486,7 @@ msgstr ""
 "  -H, --si              analogoa, but 1000 erabiliz potentzia bezala 1024 "
 "beharrean\n"
 
-#: src/df.c:1227
+#: src/df.c:1402
 #, fuzzy
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
@@ -3417,7 +3501,7 @@ msgstr ""
 "      --no-sync         ez deitu sync-i erabilera datuak lortu aurretik "
 "(lehenetsia)\n"
 
-#: src/df.c:1234
+#: src/df.c:1409
 #, fuzzy
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
@@ -3439,43 +3523,34 @@ msgstr ""
 "moetakoa ez direnera\n"
 "  -v                    (ignoratua)\n"
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
 
-#: src/df.c:1285
+#: src/df.c:1460
 #, fuzzy, c-format
 msgid "options %s and %s are mutually exclusive"
 msgstr "errepikatu arte"
 
-#: src/df.c:1335
-#, fuzzy
-msgid "warning: "
-msgstr "Abisua:"
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr ""
-
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr "%s fitxategi-sistema moeta aukeratuta eta eskludituta"
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr "Abisua:"
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 #, fuzzy
 msgid "cannot read table of mounted file systems"
 msgstr "%sezin da irakurri muntaturiko fitxategi-sistemen taula"
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr "ez da fitxategi sistemarik prozesatu"
@@ -3485,7 +3560,7 @@ msgstr "ez da fitxategi sistemarik prozesatu"
 msgid "H. Peter Anvin"
 msgstr "H. Peter Anvin"
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr "Erabilera: %s [AUKERA]... [FITXATEGIA]\n"
@@ -3560,7 +3635,7 @@ msgstr "Inprimatu IZENA honekin osagaia IZENA hau daukana ez e e"
 
 #: src/dirname.c:59
 #, fuzzy
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
 msgstr "lerroz behin honekin e"
 
 #: src/dirname.c:64
@@ -3573,7 +3648,7 @@ msgid ""
 "  %s stdio.h            -> \".\"\n"
 msgstr ""
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -3582,16 +3657,15 @@ msgstr ""
 "Erabilera: %s [AUKERA]... [FITXATEGIA]...\n"
 "  edo:  %s [AUKERA]... --files0-from=FITXATEGIA\n"
 
-#: src/du.c:274
+#: src/du.c:285
 #, fuzzy
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr "- FITXATEGIA errepikatu arte e e"
 
-#: src/du.c:280
+#: src/du.c:291
 #, fuzzy
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3609,12 +3683,12 @@ msgstr ""
 " a\n"
 " e"
 
-#: src/du.c:289
+#: src/du.c:300
 #, fuzzy
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3633,15 +3707,16 @@ msgstr ""
 " da\n"
 " e"
 
-#: src/du.c:302
+#: src/du.c:313
 #, fuzzy
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
 "T a\n"
 "\n"
@@ -3650,7 +3725,7 @@ msgstr ""
 " tamaina\n"
 " e"
 
-#: src/du.c:310
+#: src/du.c:322
 msgid ""
 "  -k                    like --block-size=1K\n"
 "  -L, --dereference     dereference all symbolic links\n"
@@ -3658,12 +3733,13 @@ msgid ""
 "  -m                    like --block-size=1M\n"
 msgstr ""
 
-#: src/du.c:316
+#: src/du.c:328
 #, fuzzy
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
@@ -3673,8 +3749,7 @@ msgstr ""
 " S tamaina -\n"
 " a errepikatu arte e"
 
-#: src/du.c:322
-#, fuzzy
+#: src/du.c:334
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
 "                          or entries greater than SIZE if negative\n"
@@ -3683,86 +3758,79 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
 msgstr ""
-"S bider tamaina\n"
-" X bat ere ez tamaina S\n"
-"\n"
-" erabili\n"
-" horren ordez -\n"
-" erabili edo erabili\n"
-" e"
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
 "  -x, --one-file-system    skip directories on different file systems\n"
 msgstr ""
 
-#: src/du.c:386
+#: src/du.c:398
 #, fuzzy
 msgid "Infinity"
 msgstr "Infinity B"
 
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr ""
-
-#: src/du.c:624
+#: src/du.c:636
 #, fuzzy, c-format
 msgid "fts_read failed: %s"
 msgstr "`fts_read'-ek huts egin du"
 
-#: src/du.c:780
+#: src/du.c:787
 #, fuzzy, c-format
 msgid "invalid maximum depth %s"
 msgstr "baliogabea gehienezkoa"
 
-#: src/du.c:809
+#: src/du.c:816
 #, fuzzy, c-format
 msgid "invalid --threshold argument '-0'"
 msgstr "baliogabeko argumentua: %s"
 
-#: src/du.c:887
+#: src/du.c:898
 #, fuzzy, c-format
 msgid "cannot both summarize and show all entries"
 msgstr "eta"
 
-#: src/du.c:894
+#: src/du.c:905
 #, fuzzy, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr "da 0"
 
-#: src/du.c:900
+#: src/du.c:911
 #, fuzzy, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr "honekin"
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 msgid "file operands cannot be combined with --files0-from"
 msgstr ""
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr "%s: irakurketa errorea"
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr ""
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 #, fuzzy
 msgid "invalid zero-length file name"
 msgstr "baliogabea taldea"
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr "guztira"
 
@@ -3861,7 +3929,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
 "IZENA in eta KOMANDOA e\n"
@@ -3938,16 +4006,16 @@ msgid "input line is too long"
 msgstr "sarrera lerroa luzeegia da"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr "Mike Parker"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr "James Youngman"
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
@@ -3956,7 +4024,7 @@ msgstr ""
 "Erabilera: %s ADIERAZPENA\n"
 "  edo:  %s AUKERA\n"
 
-#: src/expr.c:211
+#: src/expr.c:210
 #, fuzzy
 msgid ""
 "\n"
@@ -3971,7 +4039,7 @@ msgstr ""
 " da e\n"
 " da edo e"
 
-#: src/expr.c:220
+#: src/expr.c:219
 #, fuzzy
 msgid ""
 "\n"
@@ -3990,7 +4058,7 @@ msgstr ""
 " da edo\n"
 " da e"
 
-#: src/expr.c:229
+#: src/expr.c:228
 #, fuzzy
 msgid ""
 "\n"
@@ -4001,7 +4069,7 @@ msgstr ""
 " batuketa - eta\n"
 " - eta e"
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, fuzzy, no-c-format
 msgid ""
 "\n"
@@ -4014,7 +4082,7 @@ msgstr ""
 " - bider\n"
 " - bider e"
 
-#: src/expr.c:242
+#: src/expr.c:241
 #, fuzzy
 msgid ""
 "\n"
@@ -4032,7 +4100,7 @@ msgstr ""
 " KATEA in KATEA edozein da edo\n"
 " KATEA - KATEA e"
 
-#: src/expr.c:251
+#: src/expr.c:250
 #, fuzzy
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
@@ -4044,7 +4112,7 @@ msgstr ""
 " edo e\n"
 " ADIERAZPENA balioa - ADIERAZPENA e"
 
-#: src/expr.c:257
+#: src/expr.c:256
 #, fuzzy
 msgid ""
 "\n"
@@ -4055,7 +4123,7 @@ msgid ""
 "0.\n"
 msgstr "edo errepikatu arte eta edo e eta - edo e"
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -4063,32 +4131,32 @@ msgid ""
 "or 0, 2 if EXPRESSION is syntactically invalid, and 3 if an error occurred.\n"
 msgstr ""
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, c-format
 msgid "syntax error"
 msgstr "sintasi errorea"
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, fuzzy, c-format
 msgid "error in regular expression matcher"
 msgstr "in bilatu"
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, fuzzy, c-format
 msgid "non-integer argument"
 msgstr "baliogabea"
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, fuzzy, c-format
 msgid "division by zero"
 msgstr "bider"
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr "ezarri LC_ALL='C' arazo hau une batez konpontzeko"
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, fuzzy, c-format
 msgid "the strings compared were %s and %s"
 msgstr "Alderatutako bi kateak %s eta %s izan dira."
@@ -4098,27 +4166,27 @@ msgstr "Alderatutako bi kateak %s eta %s izan dira."
 msgid "Niels Moller"
 msgstr ""
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
 msgstr ""
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
 msgstr ""
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, c-format
 msgid "%s is not a valid positive integer"
 msgstr "%s ez da zenbaki positibo zuzena"
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr "%s luzeegia da"
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
@@ -4127,7 +4195,7 @@ msgstr ""
 "Erabilera: %s [ZENBAKIA]...\n"
 "  edo:  %s AUKERA\n"
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 #, fuzzy
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
@@ -4231,28 +4299,28 @@ msgid "invalid number of columns: %s"
 msgstr "baliogabeko zutabe kopurua: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr "Padraig Brady"
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, c-format
 msgid "Usage: %s\n"
 msgstr "Erabilera: %s\n"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
 msgstr ""
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, fuzzy, c-format
 msgid "failed to get groups for user %s"
 msgstr "taldea - e"
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, fuzzy, c-format
 msgid "failed to get groups for the current process"
 msgstr "taldea - e"
@@ -4274,22 +4342,22 @@ msgid ""
 "the current process (which may differ if the groups database has changed).\n"
 msgstr ""
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, fuzzy, c-format
 msgid "cannot get real UID"
 msgstr "ezin da erabiltzailearen id-a ezarri"
 
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, fuzzy, c-format
 msgid "cannot get effective GID"
-msgstr "ezin da %s kendu"
+msgstr "- eguna"
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, fuzzy, c-format
 msgid "cannot get real GID"
 msgstr "ezin da erabiltzailearen id-a ezarri"
 
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, fuzzy, c-format
 msgid "%s: no such user"
 msgstr "%s: Ez dago alako erabiltzailerik"
@@ -4340,58 +4408,48 @@ msgid ""
 msgstr ""
 "eta maiatzak bider M MB M B eta aktibatuta errepikatu arte E Y maiatzak e e"
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr ""
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, fuzzy, c-format
 msgid "%s: number of bytes is too large"
 msgstr "- da"
 
-#: src/head.c:440
-#, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr ""
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr ""
 
-#: src/head.c:673
-#, fuzzy, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "%s: huts egin da ezabatzen"
-
-#: src/head.c:798
+#: src/head.c:423 src/tail.c:457
 #, fuzzy, c-format
-msgid "cannot reposition file pointer for %s"
-msgstr "errepikatu arte"
+msgid "%s: cannot seek to relative offset %s"
+msgstr "erlatiboa"
 
-#: src/head.c:885
+#: src/head.c:886
 #, fuzzy, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr "da da"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr "lerro kopurua"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr "byte kopurua"
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr "lerro kopuru okerra"
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr "byte kopuru okerra"
 
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, fuzzy, c-format
 msgid "invalid trailing option -- %c"
 msgstr "baliogabea"
@@ -4433,28 +4491,34 @@ msgid "cannot determine hostname"
 msgstr "ezin izan da ostalari-izena zehaztu"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr "Arnold Robbins"
 
-#: src/id.c:81
-#, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
-msgstr "Erabilera: %s [AUKERA]... [ERABILTZAILEA]\n"
+#: src/id.c:84
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]... [USER]\n"
+msgstr "Erabilera: %s [AUKERA]... [ERABILTZAILEA]...\n"
 
-#: src/id.c:82
-#, fuzzy
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
+msgstr ""
+
+#: src/id.c:90
+#, fuzzy
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
 msgstr ""
 "Inprimatu errepikatu arte edo e\n"
 " a ez ikusi egin errepikatu arte honekin bestelakoa\n"
@@ -4464,123 +4528,133 @@ msgstr ""
 " IDa horren ordez - IDa honekin\n"
 " IDa e"
 
-#: src/id.c:96
+#: src/id.c:103
 #, fuzzy
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
 msgstr "edozein - e"
 
-#: src/id.c:140
+#: src/id.c:151
+#, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr ""
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr ""
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr ""
 
-#: src/id.c:178
+#: src/id.c:198
 #, fuzzy, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr "in"
 
-#: src/id.c:185
+#: src/id.c:205
 #, fuzzy, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr "edo in lehenetsia"
 
-#: src/id.c:199
+#: src/id.c:209
+#, fuzzy, c-format
+msgid "option --zero not permitted in default format"
+msgstr "edo in lehenetsia"
+
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
 msgstr ""
 
-#: src/id.c:224
+#: src/id.c:265
 #, fuzzy, c-format
 msgid "cannot get effective UID"
-msgstr "ezin da %s kendu"
+msgstr "- eguna"
 
-#: src/id.c:311
+#: src/id.c:354
 #, fuzzy, c-format
 msgid "cannot find name for user ID %s"
 msgstr "errepikatu arte IDa"
 
-#: src/id.c:329
+#: src/id.c:372
 #, fuzzy, c-format
 msgid "uid=%s"
 msgstr "uid=%lu"
 
-#: src/id.c:334
+#: src/id.c:377
 #, fuzzy, c-format
 msgid " gid=%s"
 msgstr " gid=%lu"
 
-#: src/id.c:341
+#: src/id.c:384
 #, fuzzy, c-format
 msgid " euid=%s"
 msgstr " euid=%lu"
 
-#: src/id.c:349
+#: src/id.c:392
 #, fuzzy, c-format
 msgid " egid=%s"
 msgstr " egid=%lu"
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr " taldeak="
 
-#: src/id.c:393
+#: src/id.c:437
 #, c-format
 msgid " context=%s"
 msgstr " kontestua=%s"
 
-#: src/install.c:373
+#: src/install.c:376
 #, fuzzy, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr "- e"
 
-#: src/install.c:414
+#: src/install.c:417
 #, c-format
 msgid "creating directory %s"
 msgstr "%s direktorioa sortzen"
 
-#: src/install.c:482
+#: src/install.c:485
 #, c-format
 msgid "cannot change ownership of %s"
 msgstr "ezin da aldatu %s-(r)en jabegoa"
 
-#: src/install.c:506
+#: src/install.c:509
 #, fuzzy, c-format
 msgid "cannot set time stamps for %s"
 msgstr "errepikatu arte"
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, c-format
 msgid "fork system call failed"
 msgstr ""
 
-#: src/install.c:531
+#: src/install.c:535
 #, c-format
 msgid "cannot run %s"
 msgstr "ezin da %s exekutatu"
 
-#: src/install.c:535
+#: src/install.c:539
 #, fuzzy, c-format
 msgid "waiting for strip"
 msgstr "%s-ra idazten"
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr ""
 
-#: src/install.c:558
+#: src/install.c:565
 #, c-format
 msgid "invalid user %s"
 msgstr "%s baliogabeko erabiltzailea"
 
-#: src/install.c:594
+#: src/install.c:601
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -4592,7 +4666,7 @@ msgstr ""
 " edo ITURBURUA DIREKTORIOA\n"
 " edo DIREKTORIOA ITURBURUA e"
 
-#: src/install.c:601
+#: src/install.c:608
 #, fuzzy
 msgid ""
 "\n"
@@ -4609,7 +4683,7 @@ msgstr ""
 "Handiagotu lehen bikoa kopiatu ITURBURUA edo ITURBURUA DIREKTORIOA eta jabea "
 "taldea hirugarren - DIREKTORIOA e e"
 
-#: src/install.c:615
+#: src/install.c:622
 #, fuzzy
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
@@ -4627,7 +4701,7 @@ msgstr ""
 "\n"
 " - e"
 
-#: src/install.c:624
+#: src/install.c:631
 #, fuzzy
 msgid ""
 "  -D                  create all leading components of DEST except the "
@@ -4645,7 +4719,7 @@ msgstr ""
 " m modua modua in horren ordez - x\n"
 " jabea JABEA e"
 
-#: src/install.c:631
+#: src/install.c:638
 #, fuzzy
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
@@ -4665,60 +4739,57 @@ msgstr ""
 " S\n"
 " - da e"
 
-#: src/install.c:641
+#: src/install.c:648
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
 
-#: src/install.c:859
+#: src/install.c:696 src/unlink.c:86
 #, c-format
-msgid ""
-"WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
-msgstr ""
+msgid "cannot unlink %s"
+msgstr "ezin da %s esteka kendu"
 
-#: src/install.c:869
+#: src/install.c:877
 #, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
+msgid ""
+"WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
 msgstr ""
 
-#: src/install.c:886
+#: src/install.c:917
 #, fuzzy, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr "maiatzak a"
 
-#: src/install.c:889
+#: src/install.c:920
 #, fuzzy, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr "maiatzak a"
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr ""
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, c-format
 msgid "invalid mode %s"
 msgstr "%s baliogabeko modua"
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr ""
 
-#: src/install.c:959
+#: src/install.c:1001
 #, fuzzy, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr "eta"
 
-#: src/install.c:966
+#: src/install.c:1008
 #, fuzzy, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr "errepikatu arte"
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -4730,7 +4801,7 @@ msgstr ""
 msgid "Mike Haertel"
 msgstr "Mike Haertel"
 
-#: src/join.c:191
+#: src/join.c:195
 #, fuzzy
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
@@ -4746,7 +4817,7 @@ msgstr ""
 " da edo edo\n"
 " honekin e"
 
-#: src/join.c:200
+#: src/join.c:204
 #, fuzzy
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
@@ -4759,7 +4830,7 @@ msgstr ""
 "\n"
 " erabili eta bereizlea e"
 
-#: src/join.c:206
+#: src/join.c:210
 #, fuzzy
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
@@ -4775,7 +4846,12 @@ msgstr ""
 " aktibatuta uneko -\n"
 " aktibatuta uneko - e"
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+#, fuzzy
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr "lerroz behin honekin e"
+
+#: src/join.c:225
 #, fuzzy
 msgid ""
 "\n"
@@ -4796,47 +4872,47 @@ msgid ""
 msgstr ""
 "da eta enoratua bider da a da edo edo edo Lehenetsia bider e eta aktibatuta e"
 
-#: src/join.c:403
+#: src/join.c:410
 #, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
 msgstr ""
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, fuzzy, c-format
 msgid "invalid field number: %s"
 msgstr "baliogabea"
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, fuzzy, c-format
 msgid "invalid field specifier: %s"
 msgstr "baliogabea"
 
-#: src/join.c:877
+#: src/join.c:884
 #, fuzzy, c-format
 msgid "invalid file number in field spec: %s"
 msgstr "baliogabea in"
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr ""
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr ""
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, fuzzy, c-format
 msgid "multi-character tab %s"
 msgstr "baliogabea"
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr ""
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr ""
@@ -4951,47 +5027,47 @@ msgstr "Deitu lotura a lotura e e"
 msgid "cannot create link %s to %s"
 msgstr "ezin da %s esteka sortu %s-(r)a"
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, fuzzy, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr "lotura errepikatu arte"
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, c-format
 msgid "%s: cannot overwrite directory"
 msgstr ""
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
 msgstr "%s: %s ordezkatu?"
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, fuzzy, c-format
 msgid "failed to create symbolic link %s"
 msgstr "lotura"
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, fuzzy, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr "lotura"
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, fuzzy, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr "%.0s%s-(e)ra esteka trinkoa sortzen"
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, fuzzy, c-format
 msgid "failed to create hard link %s"
 msgstr "lotura"
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, fuzzy, c-format
 msgid "failed to create hard link %s => %s"
 msgstr "lotura"
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -5003,7 +5079,7 @@ msgstr ""
 " edo ITURBURUA DIREKTORIOA 2.\n"
 " edo DIREKTORIOA 3. e"
 
-#: src/ln.c:381
+#: src/ln.c:398
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
 "In the 2nd form, create a link to TARGET in the current directory.\n"
@@ -5015,7 +5091,7 @@ msgid ""
 "interpreted in relation to its parent directory.\n"
 msgstr ""
 
-#: src/ln.c:394
+#: src/ln.c:411
 #, fuzzy
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
@@ -5035,7 +5111,7 @@ msgstr ""
 " errepikatu arte\n"
 " behartu e"
 
-#: src/ln.c:402
+#: src/ln.c:419
 #, fuzzy
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
@@ -5052,7 +5128,7 @@ msgstr ""
 "\n"
 " horren ordez - e"
 
-#: src/ln.c:411
+#: src/ln.c:428
 #, fuzzy
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
@@ -5067,7 +5143,7 @@ msgstr ""
 "\n"
 " - lehenago e"
 
-#: src/ln.c:433
+#: src/ln.c:450
 #, c-format
 msgid ""
 "\n"
@@ -5075,12 +5151,12 @@ msgid ""
 "behavior when a TARGET is a symbolic link, defaulting to %s.\n"
 msgstr ""
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, fuzzy, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr "da a"
 
-#: src/ln.c:588
+#: src/ln.c:605
 #, fuzzy, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr "lotura"
@@ -5112,7 +5188,7 @@ msgstr "ez"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 msgid "%b %e  %Y"
 msgstr "%Y  %b %e"
 
@@ -5121,102 +5197,102 @@ msgstr "%Y  %b %e"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 msgid "%b %e %H:%M"
 msgstr "%b %e %H:%M"
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, fuzzy, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr "baliogabea balioa - ESTILOA"
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, fuzzy, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr "baliogabea zabalera in"
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, fuzzy, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr "baliogabea tamaina in"
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, fuzzy, c-format
 msgid "invalid line width: %s"
 msgstr "baliogabea zabalera"
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, fuzzy, c-format
 msgid "invalid tab size: %s"
 msgstr "baliogabea tamaina"
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, fuzzy, c-format
 msgid "invalid time style format %s"
 msgstr "baliogabea"
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 #, fuzzy
 msgid "Valid arguments are:\n"
 msgstr "Baliozko argumentuak hauek dira:"
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr ""
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr ""
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, c-format
 msgid "unrecognized prefix: %s"
 msgstr "aurrizki ezezaguna: %s"
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, fuzzy, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr "balioa errepikatu arte"
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, c-format
 msgid "cannot open directory %s"
 msgstr "ezin da %s direktorioa ireki"
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, fuzzy, c-format
 msgid "cannot determine device and inode of %s"
 msgstr "gailua eta -"
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, fuzzy, c-format
 msgid "%s: not listing already-listed directory"
 msgstr "lotura errepikatu arte"
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, c-format
 msgid "reading directory %s"
 msgstr "%s direktorioa irakurtzen"
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, c-format
 msgid "closing directory %s"
 msgstr "%s direktorioa itxitzen"
 
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, fuzzy, c-format
 msgid "cannot compare file names %s and %s"
 msgstr "eta"
 
-#: src/ls.c:4721
+#: src/ls.c:4781
 #, fuzzy
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
 "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n"
 msgstr "Zerrenda bider lehenetsia bat ere ez - e e"
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 #, fuzzy
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
@@ -5230,18 +5306,18 @@ msgstr ""
 " egilea egilea -\n"
 " errepikatu arte e"
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 #, fuzzy
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
 "tamaina TAMAINA erabili TAMAINA\n"
@@ -5251,16 +5327,15 @@ msgstr ""
 " honekin eta bider\n"
 " bider e"
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 #, fuzzy
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 "C zerrenda bider zutabetan\n"
@@ -5270,7 +5345,7 @@ msgstr ""
 " eta\n"
 " errepikatu arte Emacs modua e"
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 #, fuzzy
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
@@ -5286,23 +5361,24 @@ msgstr ""
 " C\n"
 " e"
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr ""
 
-#: src/ls.c:4763
+#: src/ls.c:4823
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 
-#: src/ls.c:4769
+#: src/ls.c:4829
 #, fuzzy
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
@@ -5313,20 +5389,20 @@ msgstr ""
 "  -H, --si              analogoa, but 1000 erabiliz potentzia bezala 1024 "
 "beharrean\n"
 
-#: src/ls.c:4775
+#: src/ls.c:4835
 msgid ""
 "  -H, --dereference-command-line\n"
 "                             follow symbolic links listed on the command "
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
 msgstr ""
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 #, fuzzy
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
@@ -5336,7 +5412,7 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 "honekin\n"
 " bat ere ez lehenetsia mota\n"
@@ -5344,7 +5420,7 @@ msgstr ""
 " jn. ez ikusi egin zerrenda\n"
 " tamaina e"
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 #, fuzzy
 msgid ""
 "  -l                         use a long listing format\n"
@@ -5360,7 +5436,7 @@ msgstr ""
 " errepikatu arte lotura bere gainera\n"
 " m zabalera honekin a zerrenda - e"
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 #, fuzzy
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
@@ -5377,12 +5453,12 @@ msgstr ""
 " zerrenda taldea\n"
 " mota - e"
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 #, fuzzy
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -5396,7 +5472,7 @@ msgstr ""
 " erabili errepikatu arte\n"
 " e"
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 #, fuzzy
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
@@ -5408,17 +5484,19 @@ msgstr ""
 " G zerrenda\n"
 " tamaina tamaina - in e"
 
-#: src/ls.c:4825
+#: src/ls.c:4886
 #, fuzzy
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 "S bider tamaina\n"
 " X bat ere ez tamaina S\n"
@@ -5428,17 +5506,19 @@ msgstr ""
 " erabili edo erabili\n"
 " e"
 
-#: src/ls.c:4835
+#: src/ls.c:4896
 #, fuzzy
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
 msgstr ""
 "ESTILOA ESTILOA\n"
 "\n"
@@ -5450,17 +5530,17 @@ msgstr ""
 " bider\n"
 " horren ordez - e"
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 msgid ""
 "  -t                         sort by modification time, newest first\n"
 "  -T, --tabsize=COLS         assume tab stops at each COLS instead of 8\n"
 msgstr ""
 
-#: src/ls.c:4848
+#: src/ls.c:4912
 #, fuzzy
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
@@ -5471,14 +5551,13 @@ msgstr ""
 " zerrenda in\n"
 " bider e"
 
-#: src/ls.c:4855
+#: src/ls.c:4919
 #, fuzzy
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 "zabalera zabalera horren ordez - balioa\n"
@@ -5486,7 +5565,7 @@ msgstr ""
 " X bider\n"
 " zerrenda e"
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -5495,7 +5574,7 @@ msgid ""
 "variable can change the settings.  Use the dircolors command to set it.\n"
 msgstr ""
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -5571,9 +5650,11 @@ msgstr ""
 #, fuzzy
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
@@ -5581,12 +5662,7 @@ msgstr ""
 "\n"
 " lerroz behin e e"
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -5598,167 +5674,193 @@ msgstr ""
 "in Noiz a - uneko programa lehenetsia modua da honekin a mota errepikatu "
 "arte errepikatu arte eta errepikatu arte FITXATEGIA e"
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, fuzzy, c-format
 msgid "%s: too many checksum lines"
 msgstr "ez lerroz behin"
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, fuzzy, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr "ez lerroz behin"
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr "%s: HUTS egin du irekitzeak edo irakurtzeak\n"
 
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr "HUTS EGIN DA"
 
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr "ongi"
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, fuzzy, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr "ez lerroz behin"
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, fuzzy, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
 msgstr[0] "ez lerroz behin"
 msgstr[1] "ez lerroz behin"
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, fuzzy, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
 msgstr[0] "ABISUA -"
 msgstr[1] "ABISUA -"
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, fuzzy, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
 msgstr[0] "ABISUA -"
 msgstr[1] "ABISUA -"
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
 msgstr ""
 
-#: src/md5sum.c:766
+#: src/md5sum.c:770
 #, fuzzy, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr "da"
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, fuzzy, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
 msgstr "eta testua"
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, fuzzy, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr "da"
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, fuzzy, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr "da"
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, fuzzy, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr "da"
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, fuzzy, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr "da"
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr "Erabilera: %s [AUKERA]... DIREKTORIOA...\n"
 
-#: src/mkdir.c:57
+#: src/mkdir.c:59
 #, fuzzy
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
 msgstr ""
 "Sortu DIREKTORIOA(k) dagoeneko ez badira existitzen.\n"
 "\n"
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
 #, fuzzy
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 "m modua modua in\n"
 " ez\n"
 " a errepikatu arte e"
 
-#: src/mkdir.c:168
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/mkdir.c:127 src/mkdir.c:172
+#, fuzzy, c-format
+msgid "failed to set default creation context for %s"
+msgstr "-"
+
+#: src/mkdir.c:191
+#, fuzzy, c-format
+msgid "failed to restore context for %s"
+msgstr "errepikatu arte"
+
+#: src/mkdir.c:231
 #, c-format
 msgid "created directory %s"
 msgstr "%s direktorioa sortua"
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr ""
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr "Erabilera: %s [AUKERA]... IZENA...\n"
 
-#: src/mkfifo.c:52
+#: src/mkfifo.c:54
 #, fuzzy
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
 msgstr "Sortu honekin e e"
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 #, fuzzy
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
 msgstr "m modua modua in a e"
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, fuzzy, c-format
 msgid "invalid mode"
 msgstr "baliogabea modua"
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr ""
 
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
+#, fuzzy, c-format
+msgid "cannot set permissions of %s"
+msgstr "baimenak -"
+
+#: src/mknod.c:54
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr "IZENA MOTA e"
 
-#: src/mknod.c:54
+#: src/mknod.c:56
 #, fuzzy
 msgid "Create the special file NAME of the given TYPE.\n"
 msgstr "Sortu IZENA - MOTA e e"
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr ""
-
-#: src/mknod.c:68
+#: src/mknod.c:72
 #, fuzzy
 msgid ""
 "\n"
@@ -5770,7 +5872,7 @@ msgstr ""
 "eta MOTA da edo eta MOTA da Baldintzak edo honekin edo da honekin MOTA "
 "maiatzak e"
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 #, fuzzy
 msgid ""
 "\n"
@@ -5783,151 +5885,145 @@ msgstr ""
 " a\n"
 " a e"
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 #, fuzzy
 msgid "Special files require major and minor device numbers."
 msgstr "eta gailua"
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 #, fuzzy
 msgid "Fifos do not have major and minor device numbers."
 msgstr "baliogabea gailua"
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, c-format
 msgid "block special files not supported"
 msgstr ""
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, c-format
 msgid "character special files not supported"
 msgstr ""
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, c-format
 msgid "invalid major device number %s"
 msgstr "%s baliogabeko `major' gailu zenbakia"
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, c-format
 msgid "invalid minor device number %s"
 msgstr "%s baliogabeko `minor' gailu zenbakia"
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, c-format
 msgid "invalid device %s %s"
 msgstr "%s %s baliogabeko gailua"
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, c-format
 msgid "invalid device type %s"
 msgstr "%s baliogabeko gailua mota"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr "Eric Blake"
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr "Erabilera: %s [AUKERA]... [TXANTILOIA]\n"
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
 "TEMPLATE must contain at least 3 consecutive 'X's in last component.\n"
 "If TEMPLATE is not specified, use tmp.XXXXXXXXXX, and --tmpdir is implied.\n"
 msgstr ""
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
 "  -q, --quiet         suppress diagnostics about file/dir-creation failure\n"
 msgstr ""
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
 msgstr ""
 
-#: src/mktemp.c:223
-#, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr ""
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, c-format
 msgid "too many templates"
 msgstr "txantiloi gehiegi"
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr ""
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr ""
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr "X gutxitxo %s txantiloian"
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr ""
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr ""
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, fuzzy, c-format
 msgid "failed to create directory via template %s"
 msgstr "ezin da %s direktorioa sortu"
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, fuzzy, c-format
 msgid "failed to create file via template %s"
 msgstr "errepikatu arte"
 
-#: src/mv.c:292
+#: src/mv.c:294
 #, fuzzy
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
 msgstr "Izena aldatu ITURBURUA edo ITURBURUA DIREKTORIOA e e"
 
-#: src/mv.c:298
+#: src/mv.c:300
 #, fuzzy
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
@@ -5947,7 +6043,7 @@ msgstr ""
 " lehenago\n"
 " e"
 
-#: src/mv.c:307
+#: src/mv.c:309
 #, fuzzy
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
@@ -5961,7 +6057,7 @@ msgstr ""
 "\n"
 " S e"
 
-#: src/mv.c:312
+#: src/mv.c:314
 #, fuzzy
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
@@ -5971,6 +6067,8 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
 "DIREKTORIOA ITURBURUA DIREKTORIOA\n"
 " ITURBURUA da\n"
@@ -6242,95 +6340,90 @@ msgid "%s: invalid number to ignore"
 msgstr "baliogabea - lerroz behin"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
 msgstr ""
 
-#: src/numfmt.c:676
+#: src/numfmt.c:659
 #, fuzzy, c-format
-msgid "value too large to be converted: '%s'"
+msgid "value too large to be converted: %s"
 msgstr "balioa"
 
-#: src/numfmt.c:680
+#: src/numfmt.c:663
 #, fuzzy, c-format
-msgid "invalid number: '%s'"
+msgid "invalid number: %s"
 msgstr "baliogabea"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
+msgid "rejecting suffix in input: %s (consider using --from)"
 msgstr ""
 
-#: src/numfmt.c:688
+#: src/numfmt.c:671
 #, fuzzy, c-format
-msgid "invalid suffix in input: '%s'"
+msgid "invalid suffix in input: %s"
 msgstr "baliogabeko atzizkia %s%s argumentua `%s'"
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
 msgstr ""
 
-#: src/numfmt.c:723
+#: src/numfmt.c:722 src/numfmt.c:768
 #, fuzzy, c-format
 msgid "failed to prepare value '%Lf' for printing"
 msgstr "%s: huts egin da idazteko irekitzean"
 
-#: src/numfmt.c:787
+#: src/numfmt.c:791
 #, fuzzy, c-format
-msgid "invalid unit size: '%s'"
+msgid "invalid unit size: %s"
 msgstr "baliogabea tamaina"
 
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
-#, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr ""
-
-#: src/numfmt.c:813
+#: src/numfmt.c:814
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
 msgstr "Erabilera: %s [AUKERA]... [ERABILTZAILEA]...\n"
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
 msgstr ""
 
-#: src/numfmt.c:820
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
 msgstr ""
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
 msgstr ""
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
 "                         see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr ""
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
@@ -6338,19 +6431,19 @@ msgid ""
 "locale)\n"
 msgstr ""
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
 msgstr ""
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
 msgstr ""
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -6360,30 +6453,30 @@ msgid ""
 "                         is found\n"
 msgstr ""
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
 "nearest\n"
 msgstr ""
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
 msgstr ""
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr ""
 
-#: src/numfmt.c:877
+#: src/numfmt.c:878
 #, fuzzy
 msgid ""
 "\n"
@@ -6392,11 +6485,11 @@ msgstr ""
 "Beste aukerak:\n"
 "\n"
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr ""
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -6405,7 +6498,7 @@ msgid ""
 "               1Mi = 1048576,\n"
 msgstr ""
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
@@ -6413,7 +6506,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
@@ -6421,7 +6514,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
@@ -6429,18 +6522,18 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:905
+#: src/numfmt.c:906
 #, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -6452,7 +6545,7 @@ msgid ""
 "errors are not diagnosed and the exit status is 0.\n"
 msgstr ""
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -6473,112 +6566,112 @@ msgid ""
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 msgstr ""
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, c-format
 msgid "format %s has no %% directive"
 msgstr ""
 
-#: src/numfmt.c:990
+#: src/numfmt.c:1003
 #, fuzzy, c-format
 msgid "invalid format %s (width overflow)"
 msgstr "baliogabea zabalera"
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr ""
+
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr ""
 
-#: src/numfmt.c:1010
+#: src/numfmt.c:1030
 #, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
 msgstr ""
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr ""
 
-#: src/numfmt.c:1070
+#: src/numfmt.c:1081
 #, fuzzy, c-format
-msgid "invalid suffix in input '%s': '%s'"
+msgid "invalid suffix in input %s: %s"
 msgstr "baliogabeko atzizkia %s%s argumentua `%s'"
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
 msgstr ""
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
 msgstr ""
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
+msgid "large input value %s: possible precision loss"
 msgstr ""
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
 
-#: src/numfmt.c:1388
+#: src/numfmt.c:1403
 #, fuzzy, c-format
-msgid "invalid padding value '%s'"
+msgid "invalid padding value %s"
 msgstr "baliogabea mota"
 
-#: src/numfmt.c:1401
+#: src/numfmt.c:1417
 #, fuzzy, c-format
-msgid "invalid field value '%s'"
+msgid "invalid field value %s"
 msgstr "baliogabea"
 
-#: src/numfmt.c:1430
+#: src/numfmt.c:1447
 #, fuzzy, c-format
-msgid "invalid header value '%s'"
+msgid "invalid header value %s"
 msgstr " %s baliogabeko data"
 
-#: src/numfmt.c:1456
+#: src/numfmt.c:1473
 #, fuzzy, c-format
 msgid "--grouping cannot be combined with --format"
 msgstr "honekin edo"
 
-#: src/numfmt.c:1458
-#, fuzzy, c-format
-msgid "--padding cannot be combined with --format"
-msgstr "honekin edo"
-
-#: src/numfmt.c:1463
+#: src/numfmt.c:1478
 #, fuzzy, c-format
 msgid "no conversion option specified"
 msgstr "-l edo -t aukera anitz espezifikatu dira"
 
-#: src/numfmt.c:1471
+#: src/numfmt.c:1486
 #, fuzzy, c-format
 msgid "grouping cannot be combined with --to"
 msgstr "honekin edo"
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
 msgstr ""
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
 msgstr ""
 
-#: src/numfmt.c:1511
+#: src/numfmt.c:1526
 #, fuzzy, c-format
 msgid "error reading input"
 msgstr "errorea %s irakurtzen"
 
-#: src/numfmt.c:1520
+#: src/numfmt.c:1535
 #, fuzzy, c-format
 msgid "failed to convert some of the input numbers"
 msgstr "stderr berbideratzeak huts egin du"
 
-#: src/od.c:294
+#: src/od.c:320
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -6589,7 +6682,7 @@ msgstr ""
 "FITXATEGIA\n"
 " edo FITXATEGIA e"
 
-#: src/od.c:300
+#: src/od.c:326
 #, fuzzy
 msgid ""
 "\n"
@@ -6601,7 +6694,7 @@ msgid ""
 msgstr ""
 "bider lehenetsia FITXATEGIA FITXATEGIA in ez FITXATEGIA edo FITXATEGIA da e e"
 
-#: src/od.c:307
+#: src/od.c:333
 #, fuzzy
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
@@ -6616,26 +6709,25 @@ msgstr ""
 " a\n"
 " ASCII edo e"
 
-#: src/od.c:318
-#, fuzzy
+#: src/od.c:344
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
-"A\n"
-" lehen e"
 
-#: src/od.c:323
+#: src/od.c:350
 #, fuzzy
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
@@ -6646,7 +6738,7 @@ msgstr ""
 " zabalera\n"
 " in e"
 
-#: src/od.c:336
+#: src/od.c:363
 #, fuzzy
 msgid ""
 "\n"
@@ -6654,7 +6746,7 @@ msgid ""
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 "maiatzak\n"
@@ -6663,7 +6755,7 @@ msgstr ""
 " ASCII edo\n"
 " e"
 
-#: src/od.c:345
+#: src/od.c:372
 #, fuzzy
 msgid ""
 "  -f   same as -t fF, select floats\n"
@@ -6680,16 +6772,16 @@ msgstr ""
 "\n"
 " x e"
 
-#: src/od.c:353
+#: src/od.c:380
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 
-#: src/od.c:360
+#: src/od.c:387
 #, fuzzy
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
@@ -6704,7 +6796,7 @@ msgstr ""
 " TAMAINA TAMAINA\n"
 " x TAMAINA TAMAINA e"
 
-#: src/od.c:367
+#: src/od.c:394
 #, fuzzy
 msgid ""
 "\n"
@@ -6717,14 +6809,14 @@ msgstr ""
 "errepikatu arte edo errepikatu arte Baldintzak MOTA da TAMAINA maiatzak "
 "errepikatu arte bikoitza edo errepikatu arte bikoitza e"
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
 "each output line.\n"
 msgstr ""
 
-#: src/od.c:379
+#: src/od.c:406
 #, fuzzy
 msgid ""
 "\n"
@@ -6739,56 +6831,56 @@ msgid ""
 msgstr ""
 "eta maiatzak bider M MB M B eta aktibatuta errepikatu arte E Y maiatzak e e"
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, fuzzy, c-format
 msgid "invalid type string %s"
 msgstr "baliogabea mota"
 
-#: src/od.c:649
+#: src/od.c:690
 #, fuzzy, c-format
 msgid ""
 "invalid type string %s;\n"
 "this system doesn't provide a %lu-byte integral type"
 msgstr "baliogabea mota a mota"
 
-#: src/od.c:770
+#: src/od.c:811
 #, fuzzy, c-format
 msgid ""
 "invalid type string %s;\n"
 "this system doesn't provide a %lu-byte floating point type"
 msgstr "baliogabea mota a puntu mota"
 
-#: src/od.c:828
+#: src/od.c:869
 #, fuzzy, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr "baliogabea in mota"
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, fuzzy, c-format
 msgid "cannot skip past end of combined input"
 msgstr "-"
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, fuzzy, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr "baliogabea"
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, fuzzy, c-format
 msgid "no type may be specified when dumping strings"
 msgstr "ez mota maiatzak"
 
-#: src/od.c:1810
+#: src/od.c:1863
 #, fuzzy
 msgid "compatibility mode supports at most one file"
 msgstr "modua hirukoa"
 
-#: src/od.c:1831
+#: src/od.c:1884
 #, fuzzy, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr "da"
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, fuzzy, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr "baliogabea zabalera horren ordez"
@@ -6945,12 +7037,12 @@ msgstr "Noiz"
 msgid "Where"
 msgstr "Non"
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr "Erabilera: %s [AUKERA]... [ERABILTZAILEA]...\n"
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 #, fuzzy
 msgid ""
 "\n"
@@ -6967,7 +7059,7 @@ msgstr ""
 " in\n"
 " uneko da lehenetsia e"
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 #, fuzzy
 msgid ""
 "  -f              omit the line of column headings in short format\n"
@@ -6982,7 +7074,7 @@ msgstr ""
 " urrunekoa eta\n"
 " in e"
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -6990,7 +7082,7 @@ msgid ""
 "The utmp file will be %s.\n"
 msgstr "programa e"
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, fuzzy, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr "ez"
@@ -7209,7 +7301,8 @@ msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
@@ -7219,7 +7312,7 @@ msgstr ""
 " desaktibatuta -\n"
 " a m da e"
 
-#: src/pr.c:2827
+#: src/pr.c:2828
 #, fuzzy
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
@@ -7234,7 +7327,7 @@ msgstr ""
 " S ez aktibatuta\n"
 " goiburua eta e"
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 #, fuzzy
 msgid ""
 "  -T, --omit-pagination\n"
@@ -7257,7 +7350,7 @@ msgstr ""
 " zabalera errepikatu arte\n"
 " testua desaktibatuta e"
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 #, fuzzy
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
@@ -7271,7 +7364,7 @@ msgstr ""
 " lerroz behin da ez\n"
 " honekin S edo e"
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 #, fuzzy
 msgid ""
 "\n"
@@ -7292,7 +7385,7 @@ msgstr ""
 
 #: src/printenv.c:69
 #, fuzzy
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr "lerroz behin honekin e"
 
 #: src/printf.c:79
@@ -7404,12 +7497,12 @@ msgstr "honekin"
 msgid "F. Pinard"
 msgstr "F. Pinard"
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, fuzzy, c-format
 msgid "%s (for regexp %s)"
 msgstr "errepikatu arte"
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
@@ -7418,14 +7511,14 @@ msgstr ""
 "B\n"
 " edo B e"
 
-#: src/ptx.c:1821
+#: src/ptx.c:1824
 #, fuzzy
 msgid ""
 "Output a permuted index, including context, of the words in the input "
 "files.\n"
 msgstr "Irteera a - in e e"
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 #, fuzzy
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
@@ -7437,7 +7530,7 @@ msgstr ""
 " B Sistema B\n"
 " KATEA erabili KATEA errepikatu arte e"
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 #, fuzzy
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
@@ -7452,7 +7545,7 @@ msgstr ""
 " S errepikatu arte - lerroz behin edo -\n"
 " e"
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 #, fuzzy
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
@@ -7469,7 +7562,7 @@ msgstr ""
 " ez ikusi egin FITXATEGIA ez ikusi egin zerrenda FITXATEGIA\n"
 " FITXATEGIA zerrenda uneko FITXATEGIA e"
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 #, fuzzy
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
@@ -7481,14 +7574,14 @@ msgstr ""
 " modua\n"
 " zabalera KOPURUA zabalera in zutabetan e"
 
-#: src/ptx.c:1854
+#: src/ptx.c:1857
 #, fuzzy
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
-msgstr "ez FITXATEGIA edo FITXATEGIA da Estandarra Sarrera bider lehenetsia e"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
+msgstr "ez FITXATEGIA edo FITXATEGIA da e"
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, fuzzy, c-format
 msgid "invalid gap width: %s"
 msgstr "baliogabea zabalera"
@@ -7506,22 +7599,28 @@ msgid ""
 "  -P, --physical  avoid all symlinks\n"
 msgstr ""
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+
+#: src/pwd.c:169
 #, c-format
 msgid "failed to chdir to %s"
 msgstr "huts egin da %s-(r)i `chdir' egiten"
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, c-format
 msgid "failed to stat %s"
 msgstr "huts egin da %s-(r) `stat' egiten"
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr ""
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, c-format
 msgid "ignoring non-option arguments"
 msgstr "aukera ez diren argumentuak baztertzen"
@@ -7531,8 +7630,8 @@ msgstr "aukera ez diren argumentuak baztertzen"
 msgid "Dmitry V. Levin"
 msgstr "Dmitry V. Levin"
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Erabilera: %s [AUKERA]... FITXATEGIA...\n"
@@ -7568,8 +7667,7 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 "bider in\n"
 " osagaia - bide-izena\n"
@@ -7600,7 +7698,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 
@@ -7618,41 +7716,42 @@ msgstr ""
 msgid "%s: descend into directory %s? "
 msgstr ""
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr ""
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, c-format
 msgid "%s: remove %s %s? "
 msgstr "%s: %s %s ezabatu?"
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, fuzzy, c-format
 msgid "removed directory: %s\n"
 msgstr "e"
 
-#: src/remove.c:444
+#: src/remove.c:447
 #, fuzzy, c-format
-msgid "cannot remove directory: %s"
-msgstr "ezin da %s direktorioa sortu"
+msgid "refusing to remove %s or %s directory: skipping %s"
+msgstr "e"
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr ""
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, fuzzy, c-format
 msgid "traversal failed: %s"
 msgstr "irakurtzeak huts egin du"
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -7677,12 +7776,12 @@ msgstr ""
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 
 #: src/rm.c:149
@@ -7738,14 +7837,18 @@ msgid ""
 msgstr "erabili a da - Baldintzak e"
 
 #: src/rm.c:342
-#, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr "%s: ezabatu argumentu guztiak errekurtsiboki?"
+#, fuzzy, c-format
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] "%s: ezabatu argumentu guztiak errekurtsiboki?"
+msgstr[1] "%s: ezabatu argumentu guztiak errekurtsiboki?"
 
-#: src/rm.c:343
-#, c-format
-msgid "%s: remove all arguments? "
-msgstr "%s: ezabatu argumentu guztiak?"
+#: src/rm.c:345
+#, fuzzy, c-format
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] "%s: ezabatu argumentu guztiak?"
+msgstr[1] "%s: ezabatu argumentu guztiak?"
 
 #: src/rmdir.c:134 src/rmdir.c:233
 #, c-format
@@ -7798,7 +7901,7 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
 
@@ -7848,41 +7951,46 @@ msgstr "-c, -t, -u, -l, -r edo kontestua adierazi behar duzu"
 msgid "no command specified"
 msgstr "ez IDa"
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr ""
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, fuzzy, c-format
 msgid "failed to compute a new context"
 msgstr "huts egin da %s irekitzen"
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, fuzzy, c-format
 msgid "failed to set new user %s"
 msgstr "huts egin da %s irekitzen"
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, fuzzy, c-format
 msgid "failed to set new type %s"
 msgstr "huts egin da %s irekitzen"
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, fuzzy, c-format
 msgid "failed to set new range %s"
 msgstr "huts egin da %s irekitzen"
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, fuzzy, c-format
 msgid "failed to set new role %s"
 msgstr "huts egin da %s irekitzen"
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, c-format
 msgid "unable to set security context %s"
 msgstr ""
 
+#: src/selinux.c:127 src/selinux.c:300
+#, fuzzy, c-format
+msgid "error canonicalizing %s"
+msgstr "errorea %s irakurtzen"
+
 #: src/seq.c:68
 #, fuzzy, c-format
 msgid ""
@@ -7916,101 +8024,48 @@ msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
 msgstr "edo da da da eta puntu da da eta da da - puntu e"
 
-#: src/seq.c:94
+#: src/seq.c:96
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
 "it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n"
 "decimal numbers with maximum precision PREC, and to %g otherwise.\n"
 msgstr ""
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, fuzzy, c-format
 msgid "invalid floating point argument: %s"
 msgstr "baliogabea puntu"
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, fuzzy, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr "ezezaguna mota"
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, fuzzy, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr "maiatzak zabalera"
 
-#: src/setuidgid.c:49
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-"KOMANDOA\n"
-" edo e"
-
-#: src/setuidgid.c:55
-#, fuzzy
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-"edozein IDa eta taldea IDa - eta KOMANDOA honekin edozein honekin UID eta "
-"GID honekin - KOMANDOA programa da bider UID e e"
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr "erabiltzile-ID ezezaguna: %s"
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr ""
-
-#: src/setuidgid.c:190
-#, fuzzy, c-format
-msgid "failed to set supplemental group(s)"
-msgstr "taldea"
-
-#: src/setuidgid.c:200
-#, fuzzy, c-format
-msgid "cannot set group-ID to %lu"
-msgstr "taldea IDa"
-
-#: src/setuidgid.c:204
-#, fuzzy, c-format
-msgid "cannot set user-ID to %lu"
-msgstr "IDa"
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr "Colin Plumb"
 
-#: src/shred.c:148
+#: src/shred.c:170
 #, fuzzy
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
 "for even very expensive hardware probing to recover the data.\n"
 msgstr "Gainidatzi FITXATEGIA in e e"
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, fuzzy, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -8022,10 +8077,10 @@ msgstr ""
 " e I Gainidatzi I horren ordez - lehenetsia\n"
 " tamaina I uneko M B e"
 
-#: src/shred.c:161
+#: src/shred.c:183
 #, fuzzy
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
@@ -8038,7 +8093,7 @@ msgstr ""
 " a honekin\n"
 " e"
 
-#: src/shred.c:170
+#: src/shred.c:192
 #, fuzzy
 msgid ""
 "\n"
@@ -8046,13 +8101,17 @@ msgid ""
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 "FITXATEGIA da lehenetsia da da aktibatuta gailua Noiz aktibatuta erabili e e"
 
-#: src/shred.c:180
+#: src/shred.c:206
 #, fuzzy
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
@@ -8064,7 +8123,7 @@ msgid ""
 "\n"
 msgstr "Oharra aktibatuta a garrantzitsua in da uneko - aktibatuta da e e"
 
-#: src/shred.c:188
+#: src/shred.c:214
 #, fuzzy
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
@@ -8080,7 +8139,7 @@ msgstr ""
 " eta Solaris eta e e eta aktibatuta\n"
 " e e Sarea zerbitzaria e e"
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -8089,7 +8148,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -8101,7 +8160,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:215
+#: src/shred.c:241
 #, fuzzy
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
@@ -8111,127 +8170,127 @@ msgstr ""
 "in\n"
 " e e e eta urrunekoa maiatzak eta a e"
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, c-format
 msgid "%s: fdatasync failed"
 msgstr ""
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr ""
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr ""
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr ""
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, c-format
 msgid "%s: error writing at offset %s"
 msgstr ""
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s: lseek-ek huts egin du"
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, c-format
 msgid "%s: file too large"
 msgstr "%s: fitxategi luzeegia"
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr ""
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr ""
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, c-format
 msgid "%s: fstat failed"
 msgstr "%s: fstat-ek huts egin du"
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, c-format
 msgid "%s: invalid file type"
 msgstr "%s: fitxategi moeta baliogabea"
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr "%s: fitxategiak luzeera negatiboa dauka"
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, c-format
 msgid "%s: error truncating"
 msgstr ""
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, c-format
 msgid "%s: fcntl failed"
 msgstr "%s: fnctl-ek huts egin du"
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr ""
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr "%s: kentzen"
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, c-format
 msgid "%s: renamed to %s"
 msgstr "%s: %s-(e)ra izena aldatu da"
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, c-format
 msgid "%s: failed to remove"
 msgstr "%s: huts egin da ezabatzen"
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr "%s: kenduta"
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, c-format
 msgid "%s: failed to close"
 msgstr "%s: huts egin da itxitzean"
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, c-format
 msgid "%s: failed to open for writing"
 msgstr "%s: huts egin da idazteko irekitzean"
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, c-format
 msgid "%s: invalid number of passes"
 msgstr "%s: baliogabeko pausu kopurua"
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, fuzzy, c-format
 msgid "multiple random sources specified"
 msgstr "irteera fitxategi anitz espezifikatu dira"
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, c-format
 msgid "%s: invalid file size"
 msgstr "%s; fitxategi tamaina baliogabea"
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -8242,12 +8301,12 @@ msgstr ""
 "  edo:  %s -e [AUKERA]... [ARGUMENTUA]...\n"
 "  edo:  %s -i LO-HI [AUKERA]...\n"
 
-#: src/shuf.c:54
+#: src/shuf.c:67
 #, fuzzy
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr "Inprimatu - lerroz behin FITXATEGIA e e"
 
-#: src/shuf.c:60
+#: src/shuf.c:73
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
 "  -i, --input-range=LO-HI   treat each number LO through HI as an input "
@@ -8255,34 +8314,44 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
 msgstr ""
 
-#: src/shuf.c:244
+#: src/shuf.c:228
+#, fuzzy, c-format
+msgid "too many input lines"
+msgstr "errepikatutako lerro gehiegi"
+
+#: src/shuf.c:431
 #, fuzzy, c-format
 msgid "multiple -i options specified"
 msgstr "-l edo -t aukera anitz espezifikatu dira"
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, fuzzy, c-format
 msgid "invalid input range %s"
 msgstr "baliogabea"
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, fuzzy, c-format
 msgid "invalid line count %s"
 msgstr "baliogabea zabalera"
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, c-format
 msgid "multiple output files specified"
 msgstr "irteera fitxategi anitz espezifikatu dira"
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, fuzzy, c-format
 msgid "cannot combine -e and -i options"
 msgstr "honekin edo"
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr ""
+
 #: src/sleep.c:44
 #, fuzzy, c-format
 msgid ""
@@ -8301,22 +8370,22 @@ msgstr ""
 "lehenetsia e m errepikatu arte minutu h errepikatu arte ordu edo errepikatu "
 "arte egun eskatu KOPURUA KOPURUA maiatzak e e"
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, fuzzy, c-format
 msgid "invalid time interval %s"
 msgstr "baliogabea"
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr ""
 
-#: src/sort.c:399
+#: src/sort.c:427
 #, fuzzy
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr "Idatzi - FITXATEGIA e e e"
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
@@ -8324,7 +8393,7 @@ msgstr ""
 "Aukerak ordenatzen:\n"
 "\n"
 
-#: src/sort.c:409
+#: src/sort.c:437
 #, fuzzy
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
@@ -8336,7 +8405,7 @@ msgstr ""
 " eta\n"
 " ez ikusi egin e"
 
-#: src/sort.c:415
+#: src/sort.c:443
 #, fuzzy
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
@@ -8349,12 +8418,12 @@ msgstr ""
 " e balioa\n"
 " - e e"
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 
-#: src/sort.c:423
+#: src/sort.c:451
 #, fuzzy
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
@@ -8368,7 +8437,7 @@ msgstr ""
 " e balioa\n"
 " - e e"
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -8378,7 +8447,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/sort.c:437
+#: src/sort.c:465
 msgid ""
 "Other options:\n"
 "\n"
@@ -8386,13 +8455,13 @@ msgstr ""
 "Beste aukerak:\n"
 "\n"
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
 msgstr ""
 
-#: src/sort.c:445
+#: src/sort.c:473
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
 "  -C, --check=quiet, --check=silent  like -c, but do not report first bad "
@@ -8401,7 +8470,7 @@ msgid ""
 "                              decompress them with PROG -d\n"
 msgstr ""
 
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -8410,13 +8479,13 @@ msgid ""
 "                            If F is - then read names from standard input\n"
 msgstr ""
 
-#: src/sort.c:459
+#: src/sort.c:487
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
 "  -m, --merge               merge already sorted files; do not sort\n"
 msgstr ""
 
-#: src/sort.c:463
+#: src/sort.c:491
 #, fuzzy
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
@@ -8432,7 +8501,7 @@ msgstr ""
 " bider azken\n"
 " S tamaina TAMAINA erabili TAMAINA errepikatu arte e"
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, fuzzy, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -8452,12 +8521,7 @@ msgstr ""
 " esklusiboa honekin errepikatu arte\n"
 " lehen - e"
 
-#: src/sort.c:478
-#, fuzzy
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr "lerroz behin honekin e"
-
-#: src/sort.c:483
+#: src/sort.c:511
 #, fuzzy
 msgid ""
 "\n"
@@ -8479,7 +8543,7 @@ msgstr ""
 "da C da eta C da edo errepikatu arte Baldintzak ez da erabili e maiatzak "
 "bider e"
 
-#: src/sort.c:496
+#: src/sort.c:524
 #, fuzzy
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
@@ -8494,263 +8558,248 @@ msgstr ""
 "- lehenetsia eta aktibatuta errepikatu arte M B E Y e ez FITXATEGIA edo "
 "FITXATEGIA da e e ABISUA bider DENAK C e"
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, fuzzy, c-format
 msgid "waiting for %s [-d]"
 msgstr "%s-ra idazten"
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr ""
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, fuzzy, c-format
 msgid "cannot create temporary file in %s"
 msgstr "ezin da %s esteka sortu"
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr "irekitzeak huts egin du"
 
-#: src/sort.c:970
+#: src/sort.c:998
 #, fuzzy
 msgid "fflush failed"
 msgstr "itxierak huts egin du"
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr "itxierak huts egin du"
 
-#: src/sort.c:986
-#, fuzzy, c-format
-msgid "dup2 failed"
-msgstr "irekitzeak huts egin du"
-
-#: src/sort.c:1103
-#, c-format
-msgid "couldn't execute %s"
-msgstr "ezin izan da %s exekutatu"
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 #, fuzzy
 msgid "couldn't create temporary file"
 msgstr "ezin izan da abio ordua lortu"
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, fuzzy, c-format
 msgid "couldn't create process for %s -d"
 msgstr "ezin da %s direktorioa sortu"
 
-#: src/sort.c:1161
-#, c-format
-msgid "couldn't execute %s -d"
-msgstr "ezin izan da %s -d exekutatu"
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, fuzzy, c-format
 msgid "warning: cannot remove: %s"
 msgstr "ezin da %s kendu"
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, fuzzy, c-format
 msgid "invalid --%s argument %s"
 msgstr "baliogabeko argumentua: %s"
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, fuzzy, c-format
 msgid "minimum --%s argument is %s"
 msgstr "%s argumentu anbiguoa da %s-(r)entzat"
 
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, fuzzy, c-format
 msgid "--%s argument %s too large"
 msgstr "%s luzeegia da"
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr "uneko rlimit-arekin gehienezko --%s argumentu kopurua %s da "
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr ""
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr "`stat'-ek huts egin du"
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr "irakurtzeak huts egin du"
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, fuzzy, c-format
 msgid "string transformation failed"
 msgstr "kate konparaketak huts egin du"
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, c-format
 msgid "the untransformed string was %s"
 msgstr ""
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr ""
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr ""
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr ""
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr ""
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr ""
 
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, fuzzy, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
-msgstr[0] "`-%s' aukerak ez dira bateragarriak"
-msgstr[1] "`-%s' aukerak ez dira bateragarriak"
+msgstr[0] "%s: '%s' aukera anbiguoa da\n"
+msgstr[1] "%s: '%s' aukera anbiguoa da\n"
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr ""
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr "idazketak huts egin du"
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr "%s: %s:%s: desordena: "
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr "errore estandarra"
 
-#: src/sort.c:3698
+#: src/sort.c:3738
 #, fuzzy
 msgid "cannot read"
 msgstr "ezin da data ezarri"
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, fuzzy, c-format
 msgid "%s: invalid field specification %s"
 msgstr "baliogabea"
 
-#: src/sort.c:3987
+#: src/sort.c:4028
 #, fuzzy, c-format
 msgid "options '-%s' are incompatible"
 msgstr "`-%s' aukerak ez dira bateragarriak"
 
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, fuzzy, c-format
 msgid "%s: invalid count at start of %s"
 msgstr "baliogabea hasi -"
 
-#: src/sort.c:4295
+#: src/sort.c:4336
 #, fuzzy
 msgid "invalid number after '-'"
 msgstr "baliogabeko zenbakia `-'-ren ondoren"
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 #, fuzzy
 msgid "invalid number after '.'"
 msgstr "baliogabeko zenbakia `.'-ren ondoren"
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 #, fuzzy
 msgid "stray character in field spec"
 msgstr "in"
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, fuzzy, c-format
 msgid "multiple compress programs specified"
 msgstr "-l edo -t aukera anitz espezifikatu dira"
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 #, fuzzy
 msgid "invalid number at field start"
 msgstr "baliogabea hasi"
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 #, fuzzy
 msgid "field number is zero"
 msgstr "da"
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr "offset karakterea zero da"
 
-#: src/sort.c:4407
+#: src/sort.c:4448
 #, fuzzy
 msgid "invalid number after ','"
 msgstr "`,' ondoren zenbaki baliogabea"
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr "tabulazioa hutsa"
 
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, fuzzy, c-format
 msgid "cannot read file names from %s"
 msgstr "eta"
 
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, fuzzy, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr "%s: fitxategi moeta baliogabea"
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, c-format
 msgid "no input from %s"
 msgstr "ez dago sarrearik %s-(e)tik"
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr ""
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr ""
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, fuzzy, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr "-c-rekin baimendu gabeko `%s' eragigai extra"
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr ""
 
-#: src/split.c:204
+#: src/split.c:203
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr "Erabilera: %s [AUKERA]... [SARRERA [AURRIZKIA]]\n"
 
-#: src/split.c:208
+#: src/split.c:207
 #, fuzzy
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
@@ -8759,31 +8808,25 @@ msgid ""
 "is -, read standard input.\n"
 msgstr "Irteera finkoa tamaina - lehenetsia da x ez edo da e e"
 
-#: src/split.c:216
-#, fuzzy, c-format
+#: src/split.c:215
+#, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
-"a I erabili - I lehenetsia\n"
-" TAMAINA TAMAINA\n"
-" C TAMAINA TAMAINA - lerroz behin\n"
-" erabili horren ordez -\n"
-" lerroz behin KOPURUA KOPURUA lerroz behin e"
 
-#: src/split.c:229
+#: src/split.c:228
 #, fuzzy
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
@@ -8792,7 +8835,7 @@ msgstr ""
 "a\n"
 " lehenago da e"
 
-#: src/split.c:236
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -8804,189 +8847,189 @@ msgid ""
 "r/K/N   likewise but only output Kth of N to stdout\n"
 msgstr ""
 
-#: src/split.c:354
+#: src/split.c:353
 #, fuzzy, c-format
 msgid "output file suffixes exhausted"
 msgstr "Irteera"
 
-#: src/split.c:366
+#: src/split.c:365
 #, fuzzy, c-format
 msgid "creating file %s\n"
 msgstr "`%s' fitxategia sortzen\n"
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr ""
 
-#: src/split.c:391
+#: src/split.c:390
 #, fuzzy, c-format
 msgid "failed to set FILE environment variable"
 msgstr "huts egin da %s irekitzen"
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr ""
 
-#: src/split.c:395
+#: src/split.c:394
 #, fuzzy, c-format
 msgid "failed to create pipe"
 msgstr "huts egin da %s irekitzen"
 
-#: src/split.c:409
+#: src/split.c:408
 #, fuzzy, c-format
 msgid "closing prior pipe"
 msgstr "%s direktorioa itxitzen"
 
-#: src/split.c:411
+#: src/split.c:410
 #, fuzzy, c-format
 msgid "closing output pipe"
 msgstr "%s irteera fitxategia itxitzen"
 
-#: src/split.c:415
+#: src/split.c:414
 #, fuzzy, c-format
 msgid "moving input pipe"
 msgstr "%s sarrera fitxategia itxitzen"
 
-#: src/split.c:417
+#: src/split.c:416
 #, fuzzy, c-format
 msgid "closing input pipe"
 msgstr "%s sarrera fitxategia itxitzen"
 
-#: src/split.c:422
+#: src/split.c:421
 #, fuzzy, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr "huts egin da %s komandoa exekutatzen"
 
-#: src/split.c:428
+#: src/split.c:427
 #, fuzzy, c-format
 msgid "failed to close input pipe"
 msgstr "huts egin da %s klonatzen"
 
-#: src/split.c:464
+#: src/split.c:463
 #, fuzzy, c-format
 msgid "waiting for child process"
 msgstr "%s-ra idazten"
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr ""
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr ""
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr ""
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, fuzzy, c-format
 msgid "cannot split in more than one way"
 msgstr "in"
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, fuzzy, c-format
 msgid "%s: invalid number of chunks"
 msgstr "baliogabea - segundo"
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, fuzzy, c-format
 msgid "%s: invalid chunk number"
 msgstr "%s: baliogabeko zenbakia"
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, fuzzy, c-format
 msgid "%s: invalid suffix length"
 msgstr "baliogabea"
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, fuzzy, c-format
 msgid "%s: invalid number of bytes"
 msgstr "baliogabea -"
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, fuzzy, c-format
 msgid "%s: invalid number of lines"
 msgstr "baliogabea - lerroz behin"
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, fuzzy, c-format
 msgid "line count option -%s%c... is too large"
 msgstr "da"
 
-#: src/split.c:1248
+#: src/split.c:1298
 #, fuzzy, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr "baliogabea"
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, fuzzy, c-format
 msgid "%s: invalid IO block size"
 msgstr "%s; fitxategi tamaina baliogabea"
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr ""
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr ""
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, fuzzy, c-format
 msgid "%s: cannot determine file size"
 msgstr "ezin izan da ostalari-izena zehaztu"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr "Michael Meskes"
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, fuzzy, c-format
 msgid "failed to canonicalize %s"
 msgstr "huts egin da %s klonatzen"
 
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, fuzzy, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr "%s: '%c%s' aukera ezezaguna\n"
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, fuzzy, c-format
 msgid "%s: invalid directive"
 msgstr "%%%c. direktiba baliogabea"
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, fuzzy, c-format
 msgid "warning: backslash at end of format"
 msgstr "baliogabea -"
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr ""
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, fuzzy, c-format
 msgid "cannot read file system information for %s"
 msgstr "errepikatu arte"
 
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, fuzzy, c-format
 msgid "cannot stat standard input"
 msgstr "sarrera estandarra itxitzen"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -8997,7 +9040,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -9005,30 +9048,30 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, fuzzy, c-format
 msgid "Context: %C\n"
 msgstr " kontestua=%s"
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -9036,27 +9079,27 @@ msgid ""
 " Birth: %w\n"
 msgstr ""
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
 msgstr ""
 
-#: src/stat.c:1356
+#: src/stat.c:1418
 msgid ""
 "  -L, --dereference     follow links\n"
 "  -f, --file-system     display file system status instead of file status\n"
 msgstr ""
 
-#: src/stat.c:1360
+#: src/stat.c:1422
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 #, fuzzy
 msgid ""
 "\n"
@@ -9074,7 +9117,7 @@ msgstr ""
 " B tamaina in - bider\n"
 " Zenbakia - B e"
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 #, fuzzy
 msgid ""
 "  %d   device number in decimal\n"
@@ -9091,7 +9134,7 @@ msgstr ""
 " B Taldea - jabea\n"
 " Taldea IDa - jabea e"
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 #, fuzzy
 msgid ""
 "  %h   number of hard links\n"
@@ -9101,8 +9144,8 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 "h Zenbakia -\n"
 "\n"
@@ -9113,7 +9156,7 @@ msgstr ""
 " gailua mota in\n"
 " gailua mota in e"
 
-#: src/stat.c:1399
+#: src/stat.c:1461
 #, fuzzy
 msgid ""
 "  %u   user ID of owner\n"
@@ -9122,10 +9165,10 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 "Erabiltzailea - jabea\n"
@@ -9137,7 +9180,7 @@ msgstr ""
 " Ordua - azken segundo\n"
 " Ordua - azken e e"
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 #, fuzzy
 msgid ""
 "Valid format sequences for file systems:\n"
@@ -9155,7 +9198,7 @@ msgstr ""
 " Libre in\n"
 " Libre in e"
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 #, fuzzy
 msgid ""
 "  %i   file system ID in hex\n"
@@ -9223,22 +9266,27 @@ msgid ""
 "and are thus unaffected by 'stdbuf' settings.\n"
 msgstr ""
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, fuzzy, c-format
 msgid "failed to find %s"
 msgstr "huts egin da %s irekitzen"
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, c-format
 msgid "failed to update the environment with %s"
 msgstr ""
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr ""
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, fuzzy, c-format
+msgid "you must specify a buffering mode option"
+msgstr "a zerrenda - edo"
+
+#: src/stty.c:516
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -9249,11 +9297,11 @@ msgstr ""
 " edo GAILUA GAILUA a\n"
 " edo GAILUA GAILUA e"
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
 msgstr ""
 
-#: src/stty.c:525
+#: src/stty.c:528
 #, fuzzy
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
@@ -9265,7 +9313,7 @@ msgstr ""
 " in a\n"
 " GAILUA eta erabili GAILUA horren ordez - e"
 
-#: src/stty.c:532
+#: src/stty.c:535
 #, fuzzy
 msgid ""
 "\n"
@@ -9273,7 +9321,7 @@ msgid ""
 "settings.  The underlying system defines which settings are available.\n"
 msgstr "lehenago e"
 
-#: src/stty.c:537
+#: src/stty.c:540
 #, fuzzy
 msgid ""
 "\n"
@@ -9287,7 +9335,7 @@ msgstr ""
 " -\n"
 " e"
 
-#: src/stty.c:544
+#: src/stty.c:547
 #, fuzzy
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
@@ -9300,7 +9348,7 @@ msgstr ""
 "\n"
 " e"
 
-#: src/stty.c:550
+#: src/stty.c:553
 #, fuzzy
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
@@ -9313,7 +9361,7 @@ msgstr ""
 "\n"
 " hasi geroago e"
 
-#: src/stty.c:556
+#: src/stty.c:559
 #, fuzzy
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
@@ -9326,7 +9374,7 @@ msgstr ""
 " a\n"
 " azken e"
 
-#: src/stty.c:562
+#: src/stty.c:565
 #, fuzzy
 msgid ""
 "\n"
@@ -9340,7 +9388,7 @@ msgstr ""
 " I terminala I zutabetan\n"
 " zutabetan I I e"
 
-#: src/stty.c:569
+#: src/stty.c:572
 #, fuzzy
 msgid ""
 "   ispeed N      set the input speed to N\n"
@@ -9354,7 +9402,7 @@ msgstr ""
 " min I honekin I gutxienekoa errepikatu arte a\n"
 " I I e"
 
-#: src/stty.c:575
+#: src/stty.c:578
 #, fuzzy
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
@@ -9368,7 +9416,7 @@ msgstr ""
 " terminala\n"
 " I honekin - I - a segundo e"
 
-#: src/stty.c:581
+#: src/stty.c:584
 #, fuzzy
 msgid ""
 "\n"
@@ -9385,7 +9433,7 @@ msgstr ""
 " gaitu\n"
 " tamaina I I in e"
 
-#: src/stty.c:590
+#: src/stty.c:593
 #, fuzzy
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
@@ -9394,6 +9442,7 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 "erabili bikoa gelditu honekin\n"
 " a azken\n"
@@ -9401,7 +9450,7 @@ msgstr ""
 " in eta in\n"
 " honekin e"
 
-#: src/stty.c:597
+#: src/stty.c:601
 #, fuzzy
 msgid ""
 "\n"
@@ -9417,7 +9466,7 @@ msgstr ""
 " ez ikusi egin\n"
 " ez ikusi egin e"
 
-#: src/stty.c:605
+#: src/stty.c:609
 #, fuzzy
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
@@ -9432,11 +9481,11 @@ msgstr ""
 " gaitu\n"
 " garbitu handia 8. - e"
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr ""
 
-#: src/stty.c:615
+#: src/stty.c:619
 #, fuzzy
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
@@ -9453,7 +9502,7 @@ msgstr ""
 " honekin a\n"
 " e"
 
-#: src/stty.c:623
+#: src/stty.c:627
 #, fuzzy
 msgid ""
 "\n"
@@ -9469,11 +9518,11 @@ msgstr ""
 " I in\n"
 " I in e"
 
-#: src/stty.c:631
+#: src/stty.c:635
 #, fuzzy
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
@@ -9486,7 +9535,7 @@ msgstr ""
 "\n"
 " a e"
 
-#: src/stty.c:639
+#: src/stty.c:643
 #, fuzzy
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
@@ -9503,7 +9552,7 @@ msgstr ""
 "\n"
 " I in e"
 
-#: src/stty.c:647
+#: src/stty.c:651
 #, fuzzy
 msgid ""
 "\n"
@@ -9517,7 +9566,7 @@ msgstr ""
 " bider eta\n"
 " bider eta e"
 
-#: src/stty.c:654
+#: src/stty.c:658
 #, fuzzy
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
@@ -9532,7 +9581,7 @@ msgstr ""
 "\n"
 " a geroago a e"
 
-#: src/stty.c:661
+#: src/stty.c:665
 #, fuzzy
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
@@ -9547,7 +9596,7 @@ msgstr ""
 " gaitu eta\n"
 " gaitu e"
 
-#: src/stty.c:668
+#: src/stty.c:672
 #, fuzzy
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
@@ -9563,7 +9612,7 @@ msgstr ""
 " gelditu atzeko planoa terminala\n"
 " honekin honekin errepikatu arte e"
 
-#: src/stty.c:675
+#: src/stty.c:679
 #, fuzzy
 msgid ""
 "\n"
@@ -9577,7 +9626,7 @@ msgstr ""
 "\n"
 " e"
 
-#: src/stty.c:682
+#: src/stty.c:686
 #, fuzzy
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
@@ -9590,7 +9639,7 @@ msgstr ""
 "\n"
 " e"
 
-#: src/stty.c:688
+#: src/stty.c:692
 #, fuzzy
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
@@ -9605,7 +9654,7 @@ msgstr ""
 " eta lehenetsia\n"
 " e"
 
-#: src/stty.c:695
+#: src/stty.c:699
 #, fuzzy
 msgid ""
 "   -evenp        same as -parenb cs8\n"
@@ -9622,7 +9671,7 @@ msgstr ""
 "\n"
 " e"
 
-#: src/stty.c:703
+#: src/stty.c:707
 #, fuzzy
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
@@ -9637,7 +9686,7 @@ msgstr ""
 "\n"
 " e"
 
-#: src/stty.c:710
+#: src/stty.c:714
 #, fuzzy
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
@@ -9650,7 +9699,7 @@ msgstr ""
 " min\n"
 " e"
 
-#: src/stty.c:716
+#: src/stty.c:720
 #, fuzzy
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
@@ -9667,7 +9716,7 @@ msgstr ""
 "\n"
 " lehenetsia e"
 
-#: src/stty.c:724
+#: src/stty.c:728
 #, fuzzy
 msgid ""
 "\n"
@@ -9677,55 +9726,55 @@ msgid ""
 "127; special values ^- or undef used to disable special characters.\n"
 msgstr "eta Handiagotu da edo in edo edo desgaitu e"
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, fuzzy, c-format
 msgid "only one device may be specified"
 msgstr "gailua maiatzak"
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, fuzzy, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
 "mutually exclusive"
 msgstr "errepikatu arte eta"
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, fuzzy, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr "maiatzak"
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, fuzzy, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr "berrezarri modua"
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, c-format
 msgid "invalid argument %s"
 msgstr "baliogabeko argumentua: %s"
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, c-format
 msgid "missing argument to %s"
 msgstr "argumentua falta da %s-(r)entzat"
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, fuzzy, c-format
 msgid "invalid line discipline %s"
 msgstr "baliogabea zabalera"
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr ""
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, fuzzy, c-format
 msgid "%s: no size information for this device"
 msgstr "ez tamaina errepikatu arte uneko gailua"
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, fuzzy, c-format
 msgid "invalid integer argument %s"
 msgstr "baliogabea"
@@ -9776,7 +9825,7 @@ msgstr "      --help     mezu hau erakutsi eta irten\n"
 msgid "      --version  output version information and exit\n"
 msgstr "      --version  bertsioari buruzko informazioa atera eta irten\n"
 
-#: src/system.h:544
+#: src/system.h:543
 #, fuzzy
 msgid ""
 "\n"
@@ -9785,15 +9834,15 @@ msgstr ""
 "Beharrezkoak diren argumentuak aukera luzeetan, beharrezkoak dira aukera "
 "txikietan ere.\n"
 
-#: src/system.h:552
+#: src/system.h:551
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -9802,35 +9851,33 @@ msgid ""
 "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n"
 msgstr ""
 
-#: src/system.h:571
-#, c-format
+#: src/system.h:570
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
-msgstr ""
-"\n"
-"%s-(r)en rograma-erroreen berri emateko idatzi %s-(e)ri\n"
+"%s online help: <%s>\n"
+msgstr "%s-(r)en orri nagusia: <%s>\n"
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr ""
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr ""
 
-#: src/system.h:596
+#: src/system.h:591
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Saiatu `%s --help' erabiltzen informazio gehiagorako.\n"
 
-#: src/system.h:628
+#: src/system.h:633
 #, fuzzy, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -9922,10 +9969,8 @@ msgstr ""
 
 #: src/tail.c:270
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
 
 #: src/tail.c:274
@@ -9933,8 +9978,7 @@ msgstr ""
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 "\n"
@@ -9943,18 +9987,17 @@ msgstr ""
 "\n"
 " e"
 
-#: src/tail.c:281
+#: src/tail.c:280
 #, fuzzy, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
 "e lerroz behin I azken I lerroz behin horren ordez - azken\n"
 " I\n"
@@ -9963,14 +10006,12 @@ msgstr ""
 " edo\n"
 " uneko da - e"
 
-#: src/tail.c:294
+#: src/tail.c:293
 #, fuzzy
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 "PID honekin geroago IDa PID\n"
 "\n"
@@ -9978,13 +10019,13 @@ msgstr ""
 " lehenetsia\n"
 " e"
 
-#: src/tail.c:301
+#: src/tail.c:298
 #, fuzzy
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 "PID honekin geroago IDa PID\n"
@@ -9993,7 +10034,7 @@ msgstr ""
 " lehenetsia\n"
 " e"
 
-#: src/tail.c:310
+#: src/tail.c:307
 #, fuzzy
 msgid ""
 "\n"
@@ -10007,7 +10048,7 @@ msgstr ""
 "lehen - I - edo lerroz behin da a honekin hasi - azken I in I maiatzak a m e "
 "e"
 
-#: src/tail.c:319
+#: src/tail.c:316
 #, fuzzy
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
@@ -10018,159 +10059,164 @@ msgid ""
 "named file in a way that accommodates renaming, removal and creation.\n"
 msgstr "lehenetsia da - Erabili in bider eta bider bestelakoa programa e"
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr "%s itxitzen (fd=%d)"
 
-#: src/tail.c:453
-#, fuzzy, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr "erlatiboa"
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, fuzzy, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr "erlatiboa"
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr ""
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
 "reverting to polling"
 msgstr ""
 
-#: src/tail.c:963
+#: src/tail.c:965
+#, fuzzy, c-format
+msgid "%s has been replaced with a symbolic link. giving up on this name"
+msgstr "honekin gora aktibatuta uneko"
+
+#: src/tail.c:980
 #, c-format
 msgid "%s has become inaccessible"
 msgstr ""
 
-#: src/tail.c:980
+#: src/tail.c:997
 #, fuzzy, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr "honekin gora aktibatuta uneko"
 
-#: src/tail.c:989
+#: src/tail.c:1006
 #, fuzzy, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr "honekin gora aktibatuta uneko"
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, c-format
 msgid "%s has become accessible"
 msgstr ""
 
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, fuzzy, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr "- berria"
 
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, fuzzy, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr "- berria"
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, fuzzy, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr "berrezarri modua"
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr "%s: fitxategia trunkatu da"
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr "ez da fitxategirik geratzen"
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, fuzzy, c-format
 msgid "cannot watch parent directory of %s"
 msgstr "ezin da 'stat' egin  uneko direktorioan (unekoa %s)"
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, fuzzy, c-format
 msgid "inotify resources exhausted"
 msgstr "Irteera"
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, c-format
 msgid "cannot watch %s"
 msgstr "ezin zaio %s-(r)i watch egin"
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr ""
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, c-format
 msgid "error reading inotify event"
 msgstr "errorea inotify gertakariak irakurtzen"
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, fuzzy, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr "- uneko mota - gora aktibatuta uneko"
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, c-format
 msgid "number in %s is too large"
 msgstr "zenbakia %s-(e)-n luzeegia da"
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, fuzzy, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr "baliogabea gehienezkoa -"
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr "%s: baliogabeko PIDa"
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, fuzzy, c-format
 msgid "%s: invalid number of seconds"
 msgstr "baliogabea - segundo"
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr ""
 
-#: src/tail.c:2034
+#: src/tail.c:2096
 #, fuzzy, c-format
-msgid "warning: --retry is useful mainly when following by name"
-msgstr "da bider"
+msgid "warning: --retry ignored; --retry is useful only when following"
+msgstr "PID enoratua PID da"
 
-#: src/tail.c:2038
+#: src/tail.c:2100
+#, c-format
+msgid "warning: --retry only effective for the initial open"
+msgstr ""
+
+#: src/tail.c:2105
 #, fuzzy, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
 msgstr "PID enoratua PID da"
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, fuzzy, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr "PID da aktibatuta uneko"
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, fuzzy, c-format
 msgid "cannot follow %s by name"
 msgstr "bider"
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, fuzzy, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr "da"
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr ""
@@ -10439,17 +10485,17 @@ msgstr "argumentu gehigarria: %s"
 msgid "warning: sigprocmask"
 msgstr ""
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr ""
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr ""
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
@@ -10458,33 +10504,29 @@ msgstr ""
 "Erabilera: %s [AUKERA] ERRO-BERRIA [KOMANDOA [ARGUMENTUA]...]\n"
 "  edo:  %s AUKERA\n"
 
-#: src/timeout.c:229
-#, fuzzy
+#: src/timeout.c:232
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
 msgstr ""
-"Beharrezkoak diren argumentuak aukera luzeetan, beharrezkoak dira aukera "
-"txikietan ere.\n"
 
-#: src/timeout.c:235
+#: src/timeout.c:238
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 msgid ""
 "\n"
 "DURATION is a floating point number with an optional suffix:\n"
@@ -10492,7 +10534,7 @@ msgid ""
 "days.\n"
 msgstr ""
 
-#: src/timeout.c:259
+#: src/timeout.c:262
 msgid ""
 "\n"
 "If the command times out, and --preserve-status is not set, then exit with\n"
@@ -10503,17 +10545,17 @@ msgid ""
 "case the exit status is 128+9 rather than 124.\n"
 msgstr ""
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr ""
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, c-format
 msgid "error waiting for command"
 msgstr "errorea komandoari itxaroten"
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr ""
@@ -10882,7 +10924,7 @@ msgstr ""
 #: src/truncate.c:115
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 
 #: src/truncate.c:121
@@ -10963,12 +11005,12 @@ msgid ""
 msgstr ""
 "FITXATEGIA zerrenda honekin in FITXATEGIA ez FITXATEGIA edo FITXATEGIA da e e"
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, fuzzy, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr "hau daukana -"
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, fuzzy, c-format
 msgid "%s: input contains a loop:"
 msgstr "hau daukana a:"
@@ -11060,12 +11102,12 @@ msgstr ""
 msgid "tab stop value is too large"
 msgstr "gelditu da"
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr "Erabilera: %s [AUKERA]... [SARRERA [IRTEERA]]\n"
 
-#: src/uniq.c:138
+#: src/uniq.c:174
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
 "writing to OUTPUT (or standard output).\n"
@@ -11073,41 +11115,46 @@ msgid ""
 "With no options, matching lines are merged to the first occurrence.\n"
 msgstr ""
 
-#: src/uniq.c:147
+#: src/uniq.c:183
 #, fuzzy
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
 msgstr ""
 "lerroz behin bider - aldiz\n"
 " lerroz behin e"
 
-#: src/uniq.c:151
-#, fuzzy
+#: src/uniq.c:187
+msgid ""
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
+msgstr ""
+
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr ""
+
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
+msgstr ""
+
+#: src/uniq.c:199
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
 "  -i, --ignore-case     ignore differences in case when comparing\n"
 "  -s, --skip-chars=N    avoid comparing the first N characters\n"
 "  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
 msgstr ""
-"lerroz behin\n"
-" bat ere ez lehenetsia\n"
-" da eginda honekin lerroz behin\n"
-" I lehen I\n"
-" ez ikusi egin ez ikusi egin in\n"
-" I lehen I\n"
-" esklusiboa esklusiboa lerroz behin e"
 
-#: src/uniq.c:161
+#: src/uniq.c:207
 #, fuzzy
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr "I ez I in lerroz behin e"
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 #, fuzzy
 msgid ""
 "\n"
@@ -11115,7 +11162,7 @@ msgid ""
 "characters.  Fields are skipped before chars.\n"
 msgstr "da a - lehenago e"
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 msgid ""
 "\n"
 "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n"
@@ -11123,27 +11170,37 @@ msgid ""
 "Also, comparisons honor the rules specified by 'LC_COLLATE'.\n"
 msgstr ""
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, c-format
 msgid "too many repeated lines"
 msgstr "errepikatutako lerro gehiegi"
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 #, fuzzy
 msgid "invalid number of fields to skip"
 msgstr "baliogabea -"
 
-#: src/uniq.c:530
+#: src/uniq.c:613
 #, fuzzy
 msgid "invalid number of bytes to skip"
 msgstr "baliogabea -"
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 #, fuzzy
 msgid "invalid number of bytes to compare"
 msgstr "baliogabea -"
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr ""
+
+#: src/uniq.c:652
+#, fuzzy, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr "lerroz behin eta da"
+
+#: src/uniq.c:659
 #, fuzzy, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr "lerroz behin eta da"
@@ -11164,11 +11221,6 @@ msgid ""
 "\n"
 msgstr "Deitu FITXATEGIA e e"
 
-#: src/unlink.c:86
-#, c-format
-msgid "cannot unlink %s"
-msgstr "ezin da %s esteka kendu"
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -11213,7 +11265,7 @@ msgstr[1] "%lu erabiltzaile"
 msgid ",  load average: %.2f"
 msgstr ",  karga batez bestekoa: %.2f"
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, fuzzy, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -11223,19 +11275,19 @@ msgstr ""
 "Inprimatu - gora - aktibatuta eta batez bestekoa - azken eta minutu "
 "FITXATEGIA da erabili FITXATEGIA da e e"
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
 "an uninterruptible sleep state also contribute to the load average.\n"
 msgstr ""
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr "\n"
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, fuzzy, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
@@ -11454,17 +11506,111 @@ msgstr ""
 "Errepikatu lerro berri batean espezifikatutako KATEA(k), edo `y'.\n"
 "\n"
 
+#~ msgid "%s"
+#~ msgstr "%s"
+
 #, fuzzy
-#~ msgid "  returning value: '%s'\n"
-#~ msgstr "`%s' fitxategia sortzen\n"
+#~ msgid ""
+#~ "Change the group of each FILE to GROUP.\n"
+#~ "With --reference, change the group of each FILE to that of RFILE.\n"
+#~ "\n"
+#~ "  -c, --changes          like verbose but report only when a change is "
+#~ "made\n"
+#~ "      --dereference      affect the referent of each symbolic link (this "
+#~ "is\n"
+#~ "                         the default), rather than the symbolic link "
+#~ "itself\n"
+#~ msgstr ""
+#~ "Aldatu taldea - FITXATEGIA taldea - FITXATEGIA - e\n"
+#~ " a da\n"
+#~ " - lotura\n"
+#~ " lotura bere gainera e"
 
 #, fuzzy
-#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n"
-#~ msgstr "Erabilera: %s [AUKERA] IZENA...\n"
+#~ msgid ""
+#~ "  -f, --silent, --quiet  suppress most error messages\n"
+#~ "      --reference=RFILE  use RFILE's group rather than specifying a\n"
+#~ "                         GROUP value\n"
+#~ "  -R, --recursive        operate on files and directories recursively\n"
+#~ "  -v, --verbose          output a diagnostic for every file processed\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ " erabili taldea\n"
+#~ " balioa\n"
+#~ " G aktibatuta eta\n"
+#~ " a errepikatu arte e e"
 
 #, fuzzy
-#~ msgid "no valid suffix found\n"
-#~ msgstr "baliogabea"
+#~ msgid ""
+#~ "Change the mode of each FILE to MODE.\n"
+#~ "\n"
+#~ "  -c, --changes           like verbose but report only when a change is "
+#~ "made\n"
+#~ msgstr ""
+#~ "Aldatu modua - FITXATEGIA e\n"
+#~ " a da e"
+
+#, fuzzy
+#~ msgid ""
+#~ "      --no-preserve-root  do not treat `/' specially (the default)\n"
+#~ "      --preserve-root     fail to operate recursively on `/'\n"
+#~ msgstr ""
+#~ "ez lehenetsia\n"
+#~ " aktibatuta e"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -f, --silent, --quiet   suppress most error messages\n"
+#~ "  -v, --verbose           output a diagnostic for every file processed\n"
+#~ "      --reference=RFILE   use RFILE's mode instead of MODE values\n"
+#~ "  -R, --recursive         change files and directories recursively\n"
+#~ msgstr ""
+#~ "\n"
+#~ " a errepikatu arte\n"
+#~ " erabili modua horren ordez -\n"
+#~ " G eta e"
+
+#, fuzzy
+#~ msgid ""
+#~ "Change the owner and/or group of each FILE to OWNER and/or GROUP.\n"
+#~ "With --reference, change the owner and group of each FILE to those of "
+#~ "RFILE.\n"
+#~ "\n"
+#~ "  -c, --changes          like verbose but report only when a change is "
+#~ "made\n"
+#~ "      --dereference      affect the referent of each symbolic link (this "
+#~ "is\n"
+#~ "                         the default), rather than the symbolic link "
+#~ "itself\n"
+#~ msgstr ""
+#~ "Aldatu jabea eta edo taldea - FITXATEGIA JABEA eta edo jabea eta taldea - "
+#~ "FITXATEGIA - e\n"
+#~ " a da\n"
+#~ " - lotura\n"
+#~ " lotura bere gainera e"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -f, --silent, --quiet  suppress most error messages\n"
+#~ "      --reference=RFILE  use RFILE's owner and group rather than\n"
+#~ "                         specifying OWNER:GROUP values\n"
+#~ "  -R, --recursive        operate on files and directories recursively\n"
+#~ "  -v, --verbose          output a diagnostic for every file processed\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ " erabili jabea eta taldea\n"
+#~ " JABEA\n"
+#~ " G aktibatuta eta\n"
+#~ " a errepikatu arte e e"
+
+#~ msgid "failed to set additional groups"
+#~ msgstr "huts egin da talde gehiago ezartzen"
+
+#, fuzzy
+#~ msgid "failed to get file system create context"
+#~ msgstr "kopiatu - aktibatuta"
 
 #~ msgid "reading %s"
 #~ msgstr "%s irakurtzen"
@@ -11475,9 +11621,16 @@ msgstr ""
 #~ msgid "closing %s"
 #~ msgstr "%s itxitzen"
 
+#~ msgid "cannot create link %s"
+#~ msgstr "ezin da %s esteka sortu"
+
 #~ msgid "accessing %s"
 #~ msgstr "%s-(r)a sartzen"
 
+#, fuzzy
+#~ msgid "invalid format precision"
+#~ msgstr "baliogabea"
+
 #~ msgid "opening %s"
 #~ msgstr "%s irekitzen"
 
@@ -11489,17 +11642,23 @@ msgstr ""
 #~ " edo:  %s AUKERA\n"
 
 #, fuzzy
-#~ msgid ""
-#~ "  none, off       never make backups (even if --backup is given)\n"
-#~ "  numbered, t     make numbered backups\n"
-#~ "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
-#~ "  simple, never   always make simple backups\n"
-#~ "\n"
-#~ msgstr ""
-#~ "bat ere ez desaktibatuta da\n"
-#~ "\n"
-#~ " sinplea\n"
-#~ " sinplea sinplea e"
+#~ msgid "cannot reposition file pointer for %s"
+#~ msgstr "errepikatu arte"
+
+#~ msgid "Usage: %s [OPTION]... [USERNAME]\n"
+#~ msgstr "Erabilera: %s [AUKERA]... [ERABILTZAILEA]\n"
+
+#~ msgid "creating symbolic link %s"
+#~ msgstr "%s esteka sinbolikoa sortzen"
+
+#~ msgid "creating symbolic link %s -> %s"
+#~ msgstr "%s -> %s esteka sinbolikoa sortzen"
+
+#~ msgid "creating hard link %s"
+#~ msgstr "%s esteka trinkoa sortzen"
+
+#~ msgid "creating hard link %s => %s"
+#~ msgstr "%s => %s esteka trinkoa sortzen"
 
 #, fuzzy
 #~ msgid ""
@@ -11512,6 +11671,14 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
+#~ "  -A, --address-radix=RADIX   decide how file offsets are printed\n"
+#~ "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
+#~ msgstr ""
+#~ "A\n"
+#~ " lehen e"
+
+#, fuzzy
+#~ msgid ""
 #~ "\n"
 #~ "RADIX is d for decimal, o for octal, x for hexadecimal or n for none.\n"
 #~ "BYTES is hexadecimal with 0x or 0X prefix, and may have a multiplier "
@@ -11533,9 +11700,86 @@ msgstr ""
 #~ "implies 32.  By default, od uses -A o -t oS -w16.\n"
 #~ msgstr "a zabalera a lehenetsia A e"
 
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "With no FILE or if FILE is -, read Standard Input.  `-F /' by default.\n"
+#~ msgstr ""
+#~ "ez FITXATEGIA edo FITXATEGIA da Estandarra Sarrera bider lehenetsia e"
+
 #~ msgid "Usage: %s [OPTION]... FILE\n"
 #~ msgstr "Erabilera: %s [AUKERA]... FITXATEGIA\n"
 
+#, fuzzy
+#~ msgid "cannot remove directory: %s"
+#~ msgstr "ezin da %s direktorioa sortu"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
+#~ "  or:  %s LONG-OPTION\n"
+#~ msgstr ""
+#~ "KOMANDOA\n"
+#~ " edo e"
+
+#, fuzzy
+#~ msgid ""
+#~ "Drop any supplemental groups, assume the user-ID and group-ID of the "
+#~ "specified\n"
+#~ "USER (numeric ID or user name), and run COMMAND with any specified "
+#~ "ARGUMENTs.\n"
+#~ "Exit with status 111 if unable to assume the required user and group ID.\n"
+#~ "Otherwise, exit with the exit status of COMMAND.\n"
+#~ "This program is useful only when run by root (user ID zero).\n"
+#~ "\n"
+#~ msgstr ""
+#~ "edozein IDa eta taldea IDa - eta KOMANDOA honekin edozein honekin UID eta "
+#~ "GID honekin - KOMANDOA programa da bider UID e e"
+
+#~ msgid "unknown user-ID: %s"
+#~ msgstr "erabiltzile-ID ezezaguna: %s"
+
+#, fuzzy
+#~ msgid "cannot set group-ID to %lu"
+#~ msgstr "taldea IDa"
+
+#, fuzzy
+#~ msgid "cannot set user-ID to %lu"
+#~ msgstr "IDa"
+
+#, fuzzy
+#~ msgid "extra operand %s\n"
+#~ msgstr "`%s' eragigai extra"
+
+#, fuzzy
+#~ msgid "dup2 failed"
+#~ msgstr "irekitzeak huts egin du"
+
+#~ msgid "couldn't execute %s"
+#~ msgstr "ezin izan da %s exekutatu"
+
+#~ msgid "couldn't execute %s -d"
+#~ msgstr "ezin izan da %s -d exekutatu"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -a, --suffix-length=N   use suffixes of length N (default %d)\n"
+#~ "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
+#~ "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output "
+#~ "file\n"
+#~ "  -d, --numeric-suffixes  use numeric suffixes instead of alphabetic\n"
+#~ "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
+#~ msgstr ""
+#~ "a I erabili - I lehenetsia\n"
+#~ " TAMAINA TAMAINA\n"
+#~ " C TAMAINA TAMAINA - lerroz behin\n"
+#~ " erabili horren ordez -\n"
+#~ " lerroz behin KOPURUA KOPURUA lerroz behin e"
+
+#, fuzzy
+#~ msgid "invalid number of lines: 0"
+#~ msgstr "baliogabea - lerroz behin 0"
+
 #~ msgid "Password:"
 #~ msgstr "Pasahitza:"
 
@@ -11548,9 +11792,6 @@ msgstr ""
 #~ msgid "cannot set group id"
 #~ msgstr "ezin da taldearen id-a ezarri"
 
-#~ msgid "cannot set user id"
-#~ msgstr "ezin da erabiltzailearen id-a ezarri"
-
 #~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n"
 #~ msgstr "Erabilera: %s[AUKERA]... [-][ERABILTZAILEA [ARG]...]\n"
 
@@ -11588,100 +11829,6 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
-#~ "Change the group of each FILE to GROUP.\n"
-#~ "With --reference, change the group of each FILE to that of RFILE.\n"
-#~ "\n"
-#~ "  -c, --changes          like verbose but report only when a change is "
-#~ "made\n"
-#~ "  -f, --silent, --quiet  suppress most error messages\n"
-#~ "  -v, --verbose          output a diagnostic for every file processed\n"
-#~ msgstr ""
-#~ "Aldatu taldea - FITXATEGIA taldea - FITXATEGIA - e\n"
-#~ " a da\n"
-#~ " - lotura\n"
-#~ " lotura bere gainera e"
-
-#, fuzzy
-#~ msgid ""
-#~ "      --no-preserve-root  do not treat `/' specially (the default)\n"
-#~ "      --preserve-root     fail to operate recursively on `/'\n"
-#~ msgstr ""
-#~ "ez lehenetsia\n"
-#~ " aktibatuta e"
-
-#, fuzzy
-#~ msgid ""
-#~ "  -f, --silent, --quiet  suppress most error messages\n"
-#~ "      --reference=RFILE  use RFILE's group rather than specifying a\n"
-#~ "                         GROUP value\n"
-#~ "  -R, --recursive        operate on files and directories recursively\n"
-#~ "  -v, --verbose          output a diagnostic for every file processed\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ " erabili taldea\n"
-#~ " balioa\n"
-#~ " G aktibatuta eta\n"
-#~ " a errepikatu arte e e"
-
-#, fuzzy
-#~ msgid ""
-#~ "Change the mode of each FILE to MODE.\n"
-#~ "\n"
-#~ "  -c, --changes           like verbose but report only when a change is "
-#~ "made\n"
-#~ msgstr ""
-#~ "Aldatu modua - FITXATEGIA e\n"
-#~ " a da e"
-
-#, fuzzy
-#~ msgid ""
-#~ "  -f, --silent, --quiet   suppress most error messages\n"
-#~ "  -v, --verbose           output a diagnostic for every file processed\n"
-#~ "      --reference=RFILE   use RFILE's mode instead of MODE values\n"
-#~ "  -R, --recursive         change files and directories recursively\n"
-#~ msgstr ""
-#~ "\n"
-#~ " a errepikatu arte\n"
-#~ " erabili modua horren ordez -\n"
-#~ " G eta e"
-
-#, fuzzy
-#~ msgid ""
-#~ "Change the owner and/or group of each FILE to OWNER and/or GROUP.\n"
-#~ "With --reference, change the owner and group of each FILE to those of "
-#~ "RFILE.\n"
-#~ "\n"
-#~ "  -c, --changes          like verbose but report only when a change is "
-#~ "made\n"
-#~ "      --dereference      affect the referent of each symbolic link (this "
-#~ "is\n"
-#~ "                         the default), rather than the symbolic link "
-#~ "itself\n"
-#~ msgstr ""
-#~ "Aldatu jabea eta edo taldea - FITXATEGIA JABEA eta edo jabea eta taldea - "
-#~ "FITXATEGIA - e\n"
-#~ " a da\n"
-#~ " - lotura\n"
-#~ " lotura bere gainera e"
-
-#, fuzzy
-#~ msgid ""
-#~ "  -f, --silent, --quiet  suppress most error messages\n"
-#~ "      --reference=RFILE  use RFILE's owner and group rather than\n"
-#~ "                         specifying OWNER:GROUP values\n"
-#~ "  -R, --recursive        operate on files and directories recursively\n"
-#~ "  -v, --verbose          output a diagnostic for every file processed\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ " erabili jabea eta taldea\n"
-#~ " JABEA\n"
-#~ " G aktibatuta eta\n"
-#~ " a errepikatu arte e e"
-
-#, fuzzy
-#~ msgid ""
 #~ "\n"
 #~ "SIZE may be (or may be an integer optionally followed by) one of "
 #~ "following:\n"
@@ -11694,35 +11841,16 @@ msgstr ""
 #~ "kB 1000, K 1024, MB 1000*1000, M 1024*1024, edo berdina hauekin G, T, P, "
 #~ "E, Z, Y.\n"
 
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#~ msgid "cannot create link %s"
-#~ msgstr "ezin da %s esteka sortu"
-
-#, fuzzy
-#~ msgid "invalid format precision"
-#~ msgstr "baliogabea"
-
-#~ msgid "creating symbolic link %s"
-#~ msgstr "%s esteka sinbolikoa sortzen"
-
-#~ msgid "creating symbolic link %s -> %s"
-#~ msgstr "%s -> %s esteka sinbolikoa sortzen"
-
-#~ msgid "creating hard link %s"
-#~ msgstr "%s esteka trinkoa sortzen"
-
-#~ msgid "creating hard link %s => %s"
-#~ msgstr "%s => %s esteka trinkoa sortzen"
+#~ msgid ""
+#~ "\n"
+#~ "Report %s bugs to %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "%s-(r)en rograma-erroreen berri emateko idatzi %s-(e)ri\n"
 
 #, fuzzy
-#~ msgid "extra operand %s\n"
-#~ msgstr "`%s' eragigai extra"
-
-#, fuzzy
-#~ msgid "invalid number of lines: 0"
-#~ msgstr "baliogabea - lerroz behin 0"
+#~ msgid "warning: --retry is useful mainly when following by name"
+#~ msgstr "da bider"
 
 #~ msgid ""
 #~ "Usage: %s [OPTION] NUMBER[SUFFIX] COMMAND [ARG]...\n"
@@ -11741,6 +11869,25 @@ msgstr ""
 #~ "Note that the -r and -s options are mutually exclusive.\n"
 #~ msgstr "eta"
 
+#, fuzzy
+#~ msgid ""
+#~ "  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
+#~ "                        delimit-method={none(default),prepend,separate}\n"
+#~ "                        Delimiting is done with blank lines.\n"
+#~ "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+#~ "  -i, --ignore-case     ignore differences in case when comparing\n"
+#~ "  -s, --skip-chars=N    avoid comparing the first N characters\n"
+#~ "  -u, --unique          only print unique lines\n"
+#~ "  -z, --zero-terminated  end lines with 0 byte, not newline\n"
+#~ msgstr ""
+#~ "lerroz behin\n"
+#~ " bat ere ez lehenetsia\n"
+#~ " da eginda honekin lerroz behin\n"
+#~ " I lehen I\n"
+#~ " ez ikusi egin ez ikusi egin in\n"
+#~ " I lehen I\n"
+#~ " esklusiboa esklusiboa lerroz behin e"
+
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: -- %c aukera ilegala\n"
 
@@ -12032,6 +12179,10 @@ msgstr ""
 #~ msgstr "balioa da da"
 
 #, fuzzy
+#~ msgid "invalid field number: `%s'"
+#~ msgstr "baliogabea"
+
+#, fuzzy
 #~ msgid "invalid field number for file 1: `%s'"
 #~ msgstr "baliogabea errepikatu arte"
 
@@ -12167,10 +12318,6 @@ msgstr ""
 #~ msgstr "eta gailua maiatzak errepikatu arte"
 
 #, fuzzy
-#~ msgid "cannot set permissions of %s"
-#~ msgstr "baimenak -"
-
-#, fuzzy
 #~ msgid "when moving multiple files, last argument must be a directory"
 #~ msgstr "azken a"
 
diff --git a/po/fi.gmo b/po/fi.gmo
index 352284db..68f67d83 100644
--- a/po/fi.gmo
+++ b/po/fi.gmo
diff --git a/po/fi.po b/po/fi.po
index 6807b1aa..47d5d8eb 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: coreutils 8.5\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
 "PO-Revision-Date: 2010-07-18 00:17+0300\n"
 "Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -51,76 +51,123 @@ msgstr "Kelvolliset argumentit:"
 msgid "error closing file"
 msgstr "virhe tiedoston sulkemisessa"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "kirjoitusvirhe"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "säilytettäessä tiedoston %s oikeuksia"
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "Tuntematon järjestelmävirhe"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "tavallinen tyhjä tiedosto"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "tavallinen tiedosto"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "hakemisto"
 
-#: lib/file-type.c:44
-msgid "block special file"
-msgstr "lohkoerikoistiedosto"
-
-#: lib/file-type.c:47
-msgid "character special file"
-msgstr "merkkierikoistiedosto"
-
-#: lib/file-type.c:50
-msgid "fifo"
-msgstr "putkitiedosto"
-
-#: lib/file-type.c:53
+#: lib/file-type.c:46
 msgid "symbolic link"
 msgstr "symbolinen linkki"
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "pistoke"
-
-#: lib/file-type.c:59
+#: lib/file-type.c:52
 msgid "message queue"
 msgstr "viestijono"
 
-#: lib/file-type.c:62
+#: lib/file-type.c:55
 msgid "semaphore"
 msgstr "semafori"
 
-#: lib/file-type.c:65
+#: lib/file-type.c:58
 msgid "shared memory object"
 msgstr "jaettu muistiobjekti"
 
-#: lib/file-type.c:68
+#: lib/file-type.c:61
 msgid "typed memory object"
 msgstr "tyypitetty muistiobjekti"
 
-#: lib/file-type.c:70
+#: lib/file-type.c:66
+msgid "block special file"
+msgstr "lohkoerikoistiedosto"
+
+#: lib/file-type.c:69
+msgid "character special file"
+msgstr "merkkierikoistiedosto"
+
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr ""
+
+#: lib/file-type.c:75
+msgid "fifo"
+msgstr "putkitiedosto"
+
+#: lib/file-type.c:78
+msgid "door"
+msgstr ""
+
+#: lib/file-type.c:81
+#, fuzzy
+msgid "multiplexed block special file"
+msgstr "lohkoerikoistiedosto"
+
+#: lib/file-type.c:84
+#, fuzzy
+msgid "multiplexed character special file"
+msgstr "merkkierikoistiedosto"
+
+#: lib/file-type.c:87
+msgid "multiplexed file"
+msgstr ""
+
+#: lib/file-type.c:90
+#, fuzzy
+msgid "named file"
+msgstr "outo tiedosto"
+
+#: lib/file-type.c:93
+#, fuzzy
+msgid "network special file"
+msgstr "lohkoerikoistiedosto"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr ""
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr ""
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr ""
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "pistoke"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr ""
+
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "outo tiedosto"
 
@@ -258,18 +305,18 @@ msgstr "%s: valitsin �-W %s� ei salli argumenttia\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: valitsin �%s� vaatii argumentin\n"
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr "kohteen %s oikeuksien muuttaminen ei onnistu"
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "hakemiston %s luominen ei onnistu"
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr "muisti loppu"
@@ -391,7 +438,7 @@ msgstr "virhe säännöllisen lausekkeen haussa"
 msgid "Unmatched ) or \\)"
 msgstr ""
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 #, fuzzy
 msgid "No previous regular expression"
 msgstr "virhe säännöllisen lausekkeen haussa"
@@ -417,7 +464,7 @@ msgstr "käytä valitsinta --no-preserve-root tämän varmistuksen ohittamiseksi
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[kKyY]"
 
@@ -427,11 +474,11 @@ msgstr "^[kKyY]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[eEnN]"
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, c-format
 msgid "setting permissions for %s"
 msgstr "asetettaessa tiedoston %s oikeuksia"
@@ -580,18 +627,6 @@ msgstr "outo tiedosto"
 msgid "Resource lost"
 msgstr "ennen operaattoria -lt"
 
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, fuzzy, c-format
-msgid "cannot create pipe"
-msgstr "nimettyä putkea %s ei voi luoda"
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, fuzzy, c-format
-msgid "%s subprocess failed"
-msgstr "%s: siirtyminen epäonnistui"
-
 #: lib/strsignal.c:114
 #, fuzzy, c-format
 msgid "Real-time signal %d"
@@ -802,7 +837,7 @@ msgstr ""
 "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen\n"
 "<%s>.\n"
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, fuzzy, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Käyttö: %s\n"
@@ -812,30 +847,10 @@ msgstr "Käyttö: %s\n"
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr ""
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr ""
 
-#: lib/w32spawn.h:43
-#, fuzzy, c-format
-msgid "_open_osfhandle failed"
-msgstr "avaaminen epäonnistui"
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr ""
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr ""
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr ""
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr ""
@@ -859,7 +874,7 @@ msgstr "Tuntematon järjestelmävirhe"
 msgid "failed to reopen %s with mode %s"
 msgstr "tiedoston %s avaaminen epäonnistui"
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr "merkkijonovertailu epäonnistui"
@@ -919,7 +934,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -936,48 +951,47 @@ msgid ""
 "from any other non-alphabet bytes in the encoded stream.\n"
 msgstr ""
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "lukuvirhe"
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, fuzzy, c-format
 msgid "invalid input"
 msgstr "virheellinen leveys: %s"
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, fuzzy, c-format
 msgid "invalid wrap size: %s"
 msgstr "virheellinen sarkainkoko: %s"
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, c-format
 msgid "extra operand %s"
 msgstr "ylimääräinen operandi %s"
 
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, c-format
 msgid "closing standard input"
 msgstr "suljetaan vakiosyöte"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -1008,8 +1022,8 @@ msgstr ""
 #: src/basename.c:60
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/basename.c:67
@@ -1023,32 +1037,31 @@ msgid ""
 "  %s -a any/str1 any/str2   -> \"str1\" followed by \"str2\"\n"
 msgstr ""
 
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, c-format
 msgid "missing operand"
 msgstr "operandi puuttuu"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr "Torbjörn Granlund"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 msgid "Richard M. Stallman"
 msgstr "Richard M. Stallman"
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1107,7 +1120,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr "tiedostolle %s ei voi käyttää ioctl:ää"
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr "vakiotuloste"
@@ -1124,14 +1137,14 @@ msgstr "Russell Coker"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 msgid "Jim Meyering"
 msgstr "Jim Meyering"
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, fuzzy, c-format
 msgid "failed to create security context: %s"
 msgstr "tiedoston %s omistajuuden muuttaminen epäonnistui\n"
@@ -1141,8 +1154,8 @@ msgstr "tiedoston %s omistajuuden muuttaminen epäonnistui\n"
 msgid "failed to set %s security context component to %s"
 msgstr ""
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, fuzzy, c-format
 msgid "failed to get security context of %s"
 msgstr "tiedoston %s ominaisuuksien hakeminen ei onnistu"
@@ -1152,18 +1165,18 @@ msgstr "tiedoston %s ominaisuuksien hakeminen ei onnistu"
 msgid "can't apply partial context to unlabeled file %s"
 msgstr ""
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, fuzzy, c-format
 msgid "failed to change context of %s to %s"
 msgstr "tiedoston %s omistajan vaihtaminen arvoon %s epäonnistui\n"
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
 msgstr "tiedostoa %s ei voi käsitellä"
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, c-format
 msgid "cannot read directory %s"
 msgstr "hakemistoa %s ei voi lukea"
@@ -1173,13 +1186,14 @@ msgstr "hakemistoa %s ei voi lukea"
 msgid "changing security context of %s\n"
 msgstr "muutettaessa tiedoston %s oikeuksia"
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, c-format
 msgid "fts_read failed"
 msgstr "fts_read epäonnistui"
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, fuzzy, c-format
 msgid "fts_close failed"
 msgstr "sulkeminen epäonnistui"
@@ -1199,7 +1213,7 @@ msgstr ""
 #: src/chcon.c:357
 #, fuzzy
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
@@ -1228,7 +1242,7 @@ msgid ""
 "  -l, --range=RANGE      set range RANGE in the target security context\n"
 msgstr ""
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 #, fuzzy
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
@@ -1284,36 +1298,37 @@ msgstr ""
 "  -P                     älä seuraa symbolisia linkkejä (oletus)\n"
 "\n"
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr "-R --dereference vaatii joko -H:n tai -L:n"
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr "-R -h vaatii -P:n"
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, c-format
 msgid "missing operand after %s"
 msgstr "%s:n jälkeen puuttuu operandi"
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, fuzzy, c-format
 msgid "invalid context: %s"
 msgstr "virheelliset oikeudet: %s"
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr ""
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, c-format
 msgid "failed to get attributes of %s"
 msgstr "tiedoston %s ominaisuuksien hakeminen ei onnistu"
@@ -1348,7 +1363,7 @@ msgstr ""
 "      --dereference      muuta symbolisen linkin kohdetta, ei linkkiä\n"
 "                         itseään (tämä on oletus)\n"
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
@@ -1386,47 +1401,47 @@ msgstr ""
 "  %s hlokunta /u      Vaihda /u:n ryhmäksi �hlokunta�.\n"
 "  %s -hR hlokunta /u  Vaihda /u:n ja alitiedostojen ryhmäksi �hlokunta�.\n"
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
 msgstr "haettaessa tiedoston %s uusia ominaisuuksia"
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr "symbolista linkkiä %s tai sen viittaamaa tiedostoa ei muutettu\n"
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, fuzzy, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr "tiedoston %s oikeuksiksi asetettu %04lo (%s)\n"
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, fuzzy, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr "tiedoston %s oikeuksien muuttaminen arvoon %04lo (%s) epäonnistui\n"
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr "tiedoston %s oikeuksina säilytettiin %04lo (%s)\n"
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr "rikkinäistä symlinkkiä %s ei voi käyttää"
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, c-format
 msgid "changing permissions of %s"
 msgstr "muutettaessa tiedoston %s oikeuksia"
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr "%s: uudet oikeudet ovat %s, ei %s"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1437,7 +1452,7 @@ msgstr ""
 "  tai:  %s [VALITSIN]... OKTAALI-OIKEUDET TIEDOSTO...\n"
 "  tai:  %s [VALITSIN]... --reference=VTIED TIEDOSTO...\n"
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 #, fuzzy
 msgid ""
 "Change the mode of each FILE to MODE.\n"
@@ -1453,32 +1468,26 @@ msgstr ""
 "      --dereference      muuta symbolisen linkin kohdetta, ei linkkiä\n"
 "                         itseään (tämä on oletus)\n"
 
-# Onko rekursiivisuudelle suomenkielisempää sanaa?
-#: src/chmod.c:391
-#, fuzzy
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
-"  -f, --silent, --quiet  vaienna useimmat virheilmoitukset\n"
-"      --reference=VTIED  käytä VTIEDoston ryhmää annetun RYHMÄ-arvon sijaan\n"
-"  -R, --recursive        käsittele tiedostot ja hakemistot rekursiivisesti\n"
-"  -v, --verbose          näytä ilmoitus jokaisesta käsitellystä tiedostosta\n"
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr ""
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 msgid ""
 "\n"
 "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n"
 msgstr ""
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr ""
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, c-format
 msgid "invalid mode: %s"
 msgstr "virheelliset oikeudet: %s"
@@ -1623,26 +1632,21 @@ msgid ""
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr "Roland McGrath"
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr "virheellinen ryhmä %s"
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, fuzzy, c-format
 msgid "invalid group list %s"
 msgstr "virheellinen ryhmä %s"
 
-#: src/chroot.c:117
-#, fuzzy, c-format
-msgid "failed to set additional groups"
-msgstr "lisäryhmän asetus ei onnistu"
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
@@ -1651,7 +1655,7 @@ msgstr ""
 "Käyttö: %s UUSIJUURI [KOMENTO [ARG]...]\n"
 "  tai:  %s VALITSIN\n"
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
@@ -1659,13 +1663,13 @@ msgstr ""
 "Aja KOMENTO siten, että UUSIJUURI on asetettuna juurihakemistoksi.\n"
 "\n"
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
 msgstr ""
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 #, fuzzy
 msgid ""
 "\n"
@@ -1674,28 +1678,42 @@ msgstr ""
 "\n"
 "Jos komentoa ei anneta, ajetaan �${SHELL} -i� (oletus: /bin/sh).\n"
 
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, c-format
 msgid "cannot change root directory to %s"
 msgstr "hakemiston %s asettaminen juurihakemistoksi ei onnistu"
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, c-format
 msgid "cannot chdir to root directory"
 msgstr "juurihakemistoon siirtyminen ei onnistu"
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr ""
+
+#: src/chroot.c:383
+#, fuzzy, c-format
+msgid "failed to get supplemental groups"
+msgstr "lisäryhmän asetus ei onnistu"
+
+#: src/chroot.c:395
+#, fuzzy, c-format
+msgid "failed to %s supplemental groups"
+msgstr "lisäryhmän asetus ei onnistu"
+
+#: src/chroot.c:402
 #, fuzzy, c-format
 msgid "failed to set group-ID"
 msgstr "tiedoston %s avaaminen epäonnistui"
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, fuzzy, c-format
 msgid "failed to set user-ID"
 msgstr "tiedoston %s avaaminen epäonnistui"
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, fuzzy, c-format
 msgid "failed to run command %s"
 msgstr "komentoa %s ei voi ajaa"
@@ -1727,7 +1745,7 @@ msgstr ""
 "Näytä kunkin TIEDOSTOn CRC-tarkistussumma ja tavumäärä.\n"
 "\n"
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr "Käyttö: %s [VALITSIN]... TIEDOSTO1 TIEDOSTO2\n"
@@ -1810,304 +1828,335 @@ msgstr "useita tulostiedostoja annettu"
 msgid "empty %s not allowed"
 msgstr ""
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr "virhe luettaessa tiedostoa %s"
 
 # Onko seek nyt sitten siirtymistä, selaamista, vaiko muuta.
 # Saa ehdottaa myös vastavaa substantiivia.
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, c-format
 msgid "cannot lseek %s"
 msgstr "siirtyminen tiedostossa %s ei onnistu"
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr "virhe kirjoitettaessa tiedostoa %s"
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, fuzzy, c-format
 msgid "%s: failed to get extents info"
 msgstr "tiedoston %s ominaisuuksien hakeminen ei onnistu"
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, fuzzy, c-format
 msgid "%s: write failed"
 msgstr "kirjoitus epäonnistui"
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, fuzzy, c-format
 msgid "failed to extend %s"
 msgstr "tiedoston %s avaaminen epäonnistui"
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, fuzzy, c-format
 msgid "clearing permissions for %s"
 msgstr "asetettaessa tiedoston %s oikeuksia"
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "tiedoston %s omistajuuden säilytys ei onnistu"
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
 msgstr "tiedostoa %s ei löytynyt"
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, c-format
 msgid "failed to preserve authorship for %s"
 msgstr "tiedoston %s tekijän tietojen säilytys ei onnistunut"
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
+#, fuzzy, c-format
+msgid "failed to set default file creation context to %s"
+msgstr "tiedoston %s ominaisuuksien hakeminen ei onnistu"
+
+#: src/copy.c:820
+#, fuzzy, c-format
+msgid "failed to set default file creation context for %s"
+msgstr "tiedoston %s ominaisuuksien hakeminen ei onnistu"
+
+#: src/copy.c:846
+#, fuzzy, c-format
+msgid "failed to set the security context of %s"
+msgstr "tiedoston %s ryhmän vaihtaminen arvoon %s epäonnistui\n"
+
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
 msgid "cannot open %s for reading"
 msgstr "tiedostoa %s ei voi avata lukemista varten"
 
 # On sitten ihan turha tehdä suomennoksissa mitään eroa statin, fstatin, ym.
 # välille, käyttäjää ei kiinnosta.
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, c-format
 msgid "cannot fstat %s"
 msgstr "tiedoston %s tilan lukeminen ei onnistu"
 
-#: src/copy.c:820
+#: src/copy.c:935
 #, c-format
 msgid "skipping file %s, as it was replaced while being copied"
 msgstr "ohitetaan tiedosto %s, sillä se korvattiin kopioinnin aikana"
 
-#: src/copy.c:850
-#, fuzzy, c-format
-msgid "failed to get file system create context"
-msgstr ""
-"vakiovirhetulosteen kopion asettaminen sulkeutumaan käynnistettäessä "
-"epäonnistui"
-
-#: src/copy.c:864
-#, fuzzy, c-format
-msgid "failed to set the security context of %s to %s"
-msgstr "tiedoston %s ryhmän vaihtaminen arvoon %s epäonnistui\n"
-
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
 msgid "cannot remove %s"
 msgstr "tiedostoa %s ei voi poistaa"
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
 msgstr "poistettiin tiedosto %s\n"
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr "ei kirjoiteta rikkinäisen symlinkin %s kautta"
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, c-format
 msgid "cannot create regular file %s"
 msgstr "tavallisen tiedoston %s luominen ei onnistu"
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, fuzzy, c-format
 msgid "failed to clone %s from %s"
 msgstr "tiedoston %s avaaminen epäonnistui"
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr "säilytettäessä tiedoston %s aikoja"
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
 #, fuzzy, c-format
 msgid "failed to close %s"
 msgstr "tiedoston %s avaaminen epäonnistui"
 
-#: src/copy.c:1471
-#, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
+#: src/copy.c:1580
+#, fuzzy, c-format
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
 msgstr "%s: korvataanko tiedosto %s, ohittaen oikeudet %04lo (%s)? "
 
-#: src/copy.c:1478
+#: src/copy.c:1581
+#, c-format
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr ""
+
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
 msgstr "%s: korvataanko tiedosto %s? "
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr " (varmuuskopio: %s)"
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr ""
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, c-format
 msgid "cannot create hard link %s to %s"
 msgstr "kovan linkin %s luominen tiedostoon %s ei onnistu"
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, c-format
 msgid "cannot stat %s"
 msgstr "tiedoston %s tilaa ei voi lukea"
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, c-format
 msgid "omitting directory %s"
 msgstr "ohitetaan hakemisto %s"
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr "varoitus: lähdetiedosto %s annettu useammin kuin kerran"
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
 msgstr "%s ja %s ovat sama tiedosto"
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr "ei-hakemistoa %s ei voi korvata hakemistolla %s"
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr "ei korvata juuri luotua tiedostoa %s tiedostolla %s"
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr "hakemistoa %s ei voi korvata ei-hakemistolla"
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr "hakemistoa ei voi siirtää ei-hakemistoon: %s -> %s"
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr ""
 "tiedoston %s varmuuskopiointi tuhoaisi lähteen; tiedostoa %s ei siirretty"
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr ""
 "tiedoston %s varmuuskopiointi tuhoaisi lähteen; tiedostoa %s ei kopioitu"
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
 msgstr "tiedostoa %s ei voi varmuuskopioida"
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr "ei kopioida tiedostoa %s juuri luodun symlinkin %s kautta"
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr "hakemistoa, %s, ei voi kopioida itseensä, %s"
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr "ei luoda kovaa linkkiä %s hakemistoon %s"
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr "hakemistoa %s ei voi siirtää omaan alihakemistoonsa, %s"
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, c-format
 msgid "cannot move %s to %s"
 msgstr "tiedostoa %s ei voi siirtää kohteeseen %s"
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr ""
 "laitteiden välinen siirto epäonnistui: %s -> %s; kohdetta ei voi poistaa"
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, fuzzy, c-format
-msgid "failed to set default file creation context to %s"
-msgstr "tiedoston %s ominaisuuksien hakeminen ei onnistu"
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr "kiertävää symbolista linkkiä %s ei voi kopioida"
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr ""
 "%s: suhteellisia symbolisia linkkejä voi tehdä vain nykyisessä hakemistossa"
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr "kohteeseen %2$s ei voi luoda symbolista linkkiä %1$s"
 
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, c-format
 msgid "cannot create fifo %s"
 msgstr "nimettyä putkea %s ei voi luoda"
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, c-format
 msgid "cannot create special file %s"
 msgstr "erikoistiedostoa %s ei voi luoda"
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, c-format
 msgid "cannot read symbolic link %s"
 msgstr "symbolista linkkiä %s ei voi lukea"
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, c-format
 msgid "cannot create symbolic link %s"
 msgstr "symbolisen linkin %s luominen ei onnistu"
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
 msgstr "tiedostolla %s on tuntematon tiedostotyyppi"
 
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, c-format
 msgid "cannot un-backup %s"
 msgstr "tiedoston %s varmuuskopion palautus ei onnistu"
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr "%s -> %s (varmuuskopion palautus)\n"
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr ""
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr ""
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, fuzzy, c-format
+msgid "unknown program %s"
+msgstr "Tuntematon järjestelmävirhe"
+
+#: src/cp.c:157 src/mv.c:288
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -2118,14 +2167,14 @@ msgstr ""
 "  tai:  %s [VALITSIN]... LÄHDE... HAKEMISTO\n"
 "  tai:  %s [VALITSIN]... -t HAKEMISTO LÄHDE...\n"
 
-#: src/cp.c:162
+#: src/cp.c:163
 #, fuzzy
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 "Kopioi LÄHDE KOHTEeseen, tai useita LÄHTEitä HAKEMISTOon.\n"
 "\n"
 
-#: src/cp.c:168
+#: src/cp.c:169
 #, fuzzy
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
@@ -2147,7 +2196,7 @@ msgstr ""
 "                                 käytettäessä\n"
 "  -d                           sama kuin --no-dereference --preserve=links\n"
 
-#: src/cp.c:177
+#: src/cp.c:178
 #, fuzzy
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
@@ -2169,7 +2218,7 @@ msgstr ""
 "  -H                           seuraa komentorivillä annettuja LÄHTEEN\n"
 "                                 symbolisia linkkejä\n"
 
-#: src/cp.c:186
+#: src/cp.c:187
 #, fuzzy
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
@@ -2178,7 +2227,7 @@ msgstr ""
 "  -l, --link                   linkitä tiedostot kopioinnin sijaan\n"
 "  -L, --dereference            seuraa aina LÄHTEEN symbolisia linkkejä\n"
 
-#: src/cp.c:190
+#: src/cp.c:191
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
 "                                 a previous -i option)\n"
@@ -2189,7 +2238,7 @@ msgstr ""
 "  -P, --no-dereference         älä koskaan seuraa LÄHTEEN symbolisia "
 "linkkejä\n"
 
-#: src/cp.c:195
+#: src/cp.c:196
 #, fuzzy
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
@@ -2206,7 +2255,7 @@ msgstr ""
 "mahdollista,\n"
 "                                 lisäominaisuudet: links, all\n"
 
-#: src/cp.c:203
+#: src/cp.c:204
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                use full source file name under DIRECTORY\n"
@@ -2214,7 +2263,7 @@ msgstr ""
 "      --no-preserve=OMIN.LUETT älä säilytä annettuja ominaisuuksia\n"
 "      --parents                lisää lähdepolku HAKEMISTOon\n"
 
-#: src/cp.c:207
+#: src/cp.c:208
 #, fuzzy
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
@@ -2228,7 +2277,7 @@ msgstr ""
 "                                 ennen avausyritystä (vertaa\n"
 "                                 valitsimeen --force)\n"
 
-#: src/cp.c:213
+#: src/cp.c:214
 #, fuzzy
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
@@ -2243,7 +2292,7 @@ msgstr ""
 "                                 perästä\n"
 
 # parempi suomennos overridelle kuin "kumoa"?
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -2257,7 +2306,7 @@ msgstr ""
 "  -t, --target-directory=HAK   siirrä kaikki LÄHDE-argumentit HAKemistoon\n"
 "  -T, --no-target-directory    käsittele KOHDE normaalina tiedostona\n"
 
-#: src/cp.c:224
+#: src/cp.c:225
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
 "                                 than the destination file or when the\n"
@@ -2271,7 +2320,15 @@ msgstr ""
 "  -v, --verbose                selitä mitä tapahtuu\n"
 "  -x, --one-file-system        pysy tässä tiedostojärjestelmässä\n"
 
-#: src/cp.c:233
+#: src/cp.c:232
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/cp.c:240
 #, fuzzy
 msgid ""
 "\n"
@@ -2296,7 +2353,7 @@ msgstr ""
 "KOHDEtiedosto aina, kun LÄHDE sisältää riittävän pitkän sarjan 0-tavuja.\n"
 "Valitsin --sparse=never estää hajanaisten tiedostojen luomisen.\n"
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 #, fuzzy
 msgid ""
 "\n"
@@ -2313,7 +2370,7 @@ msgstr ""
 "ovat seuraavat:\n"
 "\n"
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2326,7 +2383,7 @@ msgstr ""
 "yksinkertaisia\n"
 "  simple, never   tee aina yksinkertaisia varmuuskopiota\n"
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2338,222 +2395,232 @@ msgstr ""
 "valitsimet on annettu, ja LÄHDE ja KOHDE ovat sama nimi olemassaolevalle\n"
 "tavalliselle tiedostolle.\n"
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, c-format
 msgid "failed to preserve times for %s"
 msgstr "tiedoston %s aikojen säilyttäminen ei onnistu"
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, c-format
 msgid "failed to preserve permissions for %s"
 msgstr "tiedoston %s oikeuksien säilyttäminen ei onnistu"
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, c-format
 msgid "cannot make directory %s"
 msgstr "hakemiston %s luominen ei onnistu"
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr "%s on olemassa, mutta ei ole hakemisto"
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
 #, fuzzy, c-format
 msgid "failed to access %s"
 msgstr "tiedoston %s avaaminen epäonnistui"
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, c-format
 msgid "missing file operand"
 msgstr "puuttuva tiedosto-operandi"
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, fuzzy, c-format
 msgid "missing destination file operand after %s"
 msgstr "puuttuva kohdetiedosto"
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr ""
 "valitsimia --target-directory (-t) ja --no-target-directory (-T) ei voi "
 "yhdistää"
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, c-format
 msgid "target %s is not a directory"
 msgstr "kohde %s ei ole hakemisto"
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, fuzzy, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr "polkuja säilytettäessä kohteen on oltava hakemisto"
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, fuzzy, c-format
 msgid "multiple target directories specified"
 msgstr "useita tulostiedostoja annettu"
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr ""
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr "linkit eivät voi olla sekä kovia että symbolisia"
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, fuzzy, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr "valitsimet --string ja --check ovat toisensa poissulkevia"
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr ""
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr "varmuuskopiotyyppi"
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, c-format
+msgid "cannot set target context and preserve it"
+msgstr ""
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr ""
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr "Stuart Kemp"
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr "syöte katosi"
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr "%s: rivinumero sallitun välin ulkopuolella"
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, c-format
 msgid "%s: %s: line number out of range"
 msgstr "%s: %s: rivinumero sallitun välin ulkopuolella"
 
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, c-format
 msgid " on repetition %s\n"
 msgstr " kierroksella %s\n"
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, c-format
 msgid "%s: %s: match not found"
 msgstr "%s: %s: täsmäävyyttä ei löydy"
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr "virhe säännöllisen lausekkeen haussa"
 
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, c-format
 msgid "write error for %s"
 msgstr "virhe kirjoitettaessa tiedostoa %s"
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, c-format
 msgid "%s: integer expected after delimiter"
 msgstr "%s: rajoittimen jälkeen odotetaan kokonaislukua"
 
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, fuzzy, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr "%s: toistomäärässä tarvitaan merkki �}�"
 
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, fuzzy, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr "%s}: merkkien �{� ja �}� väliin tarvitaan kokonaisluku"
 
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, fuzzy, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr "%s: sulkeva rajoitin �%c� puuttuu"
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr "%s: virheellinen säännöllinen lauseke: %s"
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr "%s: virheellinen hahmo"
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr "%s: rivinumeron on oltava suurempi kuin nolla"
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr "rivinumero %s on pienempi kuin edeltävä rivinumero %s"
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr "varoitus: rivinumero %s on sama kuin edeltävä rivinumero"
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr "puuttuva muunnostarkennin jälkiliitteessä"
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr "virheellinen muunnostarkennin jälkiliitteessä: %c"
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr "virheellinen muunnostarkennin jälkiliitteessä: \\%.3o"
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, fuzzy, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr "%s: virheellinen kenttämääritys \"%s\""
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr "liian monta %%-muunnosmääritystä jälkiliitteessä"
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr "puuttuva %%-muunnosmääritys jälkiliitteessä"
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr "%s: virheellinen luku"
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr "Käyttö: %s [VALITSIN]... TIEDOSTO HAHMO...\n"
 
-#: src/csplit.c:1455
+#: src/csplit.c:1483
 #, fuzzy
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
@@ -2563,7 +2630,7 @@ msgstr ""
 "�xx02�, ..., ja tulosta kunkin osan tavumäärä vakiotulosteeseen.\n"
 "\n"
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, fuzzy, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2574,7 +2641,11 @@ msgstr ""
 "  -f, --prefix=ETULIITE      käytä ETULIITEttä �xx�:n sijaan\n"
 "  -k, --keep-files           älä poista tulostiedostoja virhetilanteessa\n"
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr ""
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
@@ -2584,7 +2655,7 @@ msgstr ""
 "  -s, --quiet, --silent      älä tulosta tulostiedostojen kokoja\n"
 "  -z, --elide-empty-files    poista tyhjät tulostiedostot\n"
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
@@ -2592,7 +2663,7 @@ msgstr ""
 "\n"
 "Lue vakiosyötettä jos TIEDOSTO on -. Kukin HAHMO voi olla:\n"
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 #, fuzzy
 msgid ""
 "\n"
@@ -2620,23 +2691,19 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr "David M. Ihnat"
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr ""
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr "Käyttö: %s VALITSIN... [TIEDOSTO]...\n"
 
-#: src/cut.c:193
+#: src/cut.c:176
 #, fuzzy
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr ""
 "Tulosta kunkin TIEDOSTOn valitut osat vakiotulosteeseen.\n"
 "\n"
 
-#: src/cut.c:199
+#: src/cut.c:182
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
 "  -c, --characters=LIST   select only these characters\n"
@@ -2646,7 +2713,7 @@ msgstr ""
 "  -c, --characters=LUETTELO  tulosta vain nämä merkit\n"
 "  -d, --delimiter=RAJOIT  käytä RAJOITinta kenttien rajana sarkaimen sijaan\n"
 
-#: src/cut.c:204
+#: src/cut.c:187
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
 "                            that contains no delimiter character, unless\n"
@@ -2658,7 +2725,7 @@ msgstr ""
 "                            annettu\n"
 "  -n                      (ei huomioida)\n"
 
-#: src/cut.c:210
+#: src/cut.c:193
 #, fuzzy
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
@@ -2667,7 +2734,7 @@ msgstr ""
 "      --verbose           tulosta ilmoitus vakiovirhetulosteeseen juuri\n"
 "                            ennen kunkin tulostiedoston avaamista\n"
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
@@ -2677,7 +2744,7 @@ msgstr ""
 "      --output-delimiter=MERKKIJ  käytä MERKKIJonoa tulosteen rajoittimena\n"
 "                            oletus on käyttää syötteen rajoitinta\n"
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2689,7 +2756,7 @@ msgstr ""
 "yhdestä välistä tai useasta pilkuin erotetusta välistä. Valittu syöte\n"
 "kirjoitetaan lukujärjestyksessa, täsmälleen kerran.\n"
 
-#: src/cut.c:227
+#: src/cut.c:210
 msgid ""
 "Each range is one of:\n"
 "\n"
@@ -2711,49 +2778,53 @@ msgstr ""
 "\n"
 "Jos TIEDOSTOa ei ole annettu, tai se on �-�, luetaan vakiosyötettä.\n"
 
-#: src/cut.c:367 src/cut.c:493
+#: src/cut.c:300 src/cut.c:394
 #, fuzzy
 msgid "invalid byte, character or field list"
 msgstr "virheellinen tavu- tai kenttälista"
 
-#: src/cut.c:387
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr ""
+
+#: src/cut.c:320
 #, fuzzy
 msgid "invalid range with no endpoint: -"
 msgstr "virheellinen leveysvalitsin: %s"
 
-#: src/cut.c:403
+#: src/cut.c:334
 #, fuzzy
 msgid "invalid decreasing range"
 msgstr "virheellinen leveys: %s"
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, c-format
 msgid "byte offset %s is too large"
 msgstr "tavusiirtymä %s on liian suuri"
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, c-format
 msgid "field number %s is too large"
 msgstr "kenttänumero %s on liian suuri"
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr "voidaan antaa vain yhden tyyppinen luettelo"
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr "rajoittimen on oltava yksittäinen merkki"
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr "on annettava luettelo tavuista, merkeistä tai kentistä"
 
-#: src/cut.c:850
+#: src/cut.c:790
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr "syöterajoitin voidaan antaa vain käsiteltäessä kenttiä"
 
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
@@ -2761,11 +2832,11 @@ msgstr ""
 "ei-rajoitettujen rivien vaiennus on mahdollista\n"
 "\tvain käsiteltäessä kenttiä"
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr "kenttälista puuttuu"
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr "sijaintilista puuttuu"
 
@@ -2827,7 +2898,7 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 "  -s, --set=MERKKIJONO      aseta MERKKIJONOn määräämä aika\n"
 "  -u, --utc, --universal    näytä tai aseta UTC-aika\n"
@@ -3019,10 +3090,10 @@ msgid ""
 "  $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n"
 msgstr ""
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr "vakiosyöte"
@@ -3063,7 +3134,7 @@ msgstr ""
 msgid "cannot set date"
 msgstr "ajan asetus ei onnistu"
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, c-format
 msgid "time %s is out of range"
 msgstr "aika %s on sallitun välin ulkopuolella"
@@ -3074,7 +3145,7 @@ msgstr "aika %s on sallitun välin ulkopuolella"
 msgid "Paul Rubin"
 msgstr "Paul Rubin"
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
@@ -3083,7 +3154,7 @@ msgstr ""
 "Käyttö: %s [OPERANDI]...\n"
 "  tai:  %s VALITSIN\n"
 
-#: src/dd.c:526
+#: src/dd.c:532
 #, fuzzy
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
@@ -3103,7 +3174,7 @@ msgstr ""
 "  count=LOHKOT    kopioi vain LOHKOT-arvon verran lohkoja\n"
 "  ibs=MÄÄRÄ       lue MÄÄRÄ tavua kerralla\n"
 
-#: src/dd.c:535
+#: src/dd.c:541
 #, fuzzy
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
@@ -3122,7 +3193,7 @@ msgstr ""
 "  seek=LOHKOT     ohita tulosteen alussa LOHKOT verran obs-kokoisia lohkoja\n"
 "  skip=LOHKOT     ohita syötteen alusta LOHKOT verran ibs-kokoisia lohkoja\n"
 
-#: src/dd.c:546
+#: src/dd.c:552
 #, fuzzy
 msgid ""
 "\n"
@@ -3141,7 +3212,7 @@ msgstr ""
 "Kukin MUUNNOS voi olla:\n"
 "\n"
 
-#: src/dd.c:555
+#: src/dd.c:561
 #, fuzzy
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
@@ -3170,7 +3241,7 @@ msgstr ""
 "käytettäessä\n"
 "              avainsanaa block tai unblock, tasataan välilyönneillä\n"
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -3186,7 +3257,7 @@ msgstr ""
 "  fdatasync  physically write output file data before finishing\n"
 "  fsync     likewise, but also write metadata\n"
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -3195,76 +3266,76 @@ msgid ""
 "suggested)\n"
 msgstr ""
 
-#: src/dd.c:583
+#: src/dd.c:589
 msgid "  cio       use concurrent I/O for data\n"
 msgstr ""
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr ""
 
-#: src/dd.c:587
+#: src/dd.c:593
 #, fuzzy
 msgid "  directory  fail unless a directory\n"
 msgstr "kohdehakemisto ei ole sallittu asennettaessa hakemistoa"
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr ""
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr ""
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr ""
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr ""
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr ""
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr ""
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr ""
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr ""
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr ""
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr ""
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr ""
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3293,7 +3364,17 @@ msgstr ""
 "Valitsimet ovat:\n"
 "\n"
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
@@ -3302,21 +3383,21 @@ msgstr ""
 "%<PRIuMAX>+%<PRIuMAX> tietuetta sisään\n"
 "%<PRIuMAX>+%<PRIuMAX> tietuetta ulos\n"
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
 msgstr[0] "%<PRIuMAX> typistetty tietue\n"
 msgstr[1] "%<PRIuMAX> typistettyä tietuetta\n"
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
 msgstr[0] "%<PRIuMAX> tavu (%s) kopioitu"
 msgstr[1] "%<PRIuMAX> tavua (%s) kopioitu"
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr ""
 
@@ -3330,86 +3411,86 @@ msgstr ""
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
 msgstr " %g sekunnissa, %s/s\n"
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, c-format
 msgid "closing input file %s"
 msgstr "suljetaan syötetiedosto %s"
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr "suljetaan tulostiedosto %s"
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, fuzzy, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr "siirtyminen hakemistoon %s epäonnistui"
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, c-format
 msgid "writing to %s"
 msgstr "kirjoitettaessa tiedostoon %s"
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, c-format
 msgid "unrecognized operand %s"
 msgstr "tunnistamaton operandi %s"
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 msgid "invalid conversion"
 msgstr "virheellinen muunnos"
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 #, fuzzy
 msgid "invalid input flag"
 msgstr "virheellinen leveys: %s"
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 #, fuzzy
 msgid "invalid output flag"
 msgstr "virheellinen ryhmänimi %s"
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 #, fuzzy
 msgid "invalid status flag"
 msgstr "virheellinen päiväyksen muoto %s"
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, c-format
 msgid "invalid number %s"
 msgstr "virheellinen määrä %s"
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr ""
 
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, fuzzy, c-format
 msgid "cannot combine block and unblock"
 msgstr "sekä käyttäjää että ryhmää ei voi jättää antamatta"
 
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, fuzzy, c-format
 msgid "cannot combine lcase and ucase"
 msgstr "tiedostonimiä %s ja %s ei voi vertailla"
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, fuzzy, c-format
 msgid "cannot combine excl and nocreat"
 msgstr "signaalin yhdistäminen valitsimen -l tai -t kanssa ei onnistu"
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, fuzzy, c-format
 msgid "cannot combine direct and nocache"
 msgstr "signaalin yhdistäminen valitsimen -l tai -t kanssa ei onnistu"
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
@@ -3418,168 +3499,167 @@ msgstr ""
 "varoitus: ohitetaan ytimen lseek-ohjelmistovika tiedostolle (%s)\n"
 "  mt_type=0x%0lx – katso tyyppien luettelo tiedostosta <sys/mtio.h>"
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, fuzzy, c-format
 msgid "%s: cannot skip"
 msgstr "%s: ei voi poistaa"
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, fuzzy, c-format
 msgid "%s: cannot seek"
 msgstr "%s: ei voi poistaa"
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr ""
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, fuzzy, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr "varoitus: lähdetiedosto %s annettu useammin kuin kerran"
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr ""
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, fuzzy, c-format
 msgid "setting flags for %s"
 msgstr "asetettaessa tiedoston %s lippuja"
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, fuzzy, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr "%s: siirtyminen suhteelliseen siirtymään %s ei onnistu"
 
-#: src/dd.c:2133
+#: src/dd.c:2172
 #, fuzzy, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
 msgstr "edetään %s tavun yli tulostiedostossa %s"
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr ""
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, fuzzy, c-format
 msgid "fsync failed for %s"
 msgstr "tiedoston %s avaaminen epäonnistui"
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, c-format
 msgid "failed to open %s"
 msgstr "tiedoston %s avaaminen epäonnistui"
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
 "blocks"
 msgstr ""
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, fuzzy, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr "edetään %s tavun yli tulostiedostossa %s"
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, fuzzy, c-format
 msgid "failed to discard cache for: %s"
 msgstr "siirtyminen hakemistoon %s epäonnistui"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr "Paul Eggert"
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr "Tiedostojärjestelmä"
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr "Tyyppi"
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr "lohkot"
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr "Käyt"
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr "Vapaana"
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr "Käy%"
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr "I-solmut"
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr "IKäyt"
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr "IJälj"
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr "IKäy%"
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr "Liitospiste"
 
-#: src/df.c:383
-#, c-format
-msgid "option --output: field '%s' unknown"
+#: src/df.c:207
+msgid "File"
 msgstr ""
 
-#: src/df.c:390
+#: src/df.c:387
+#, fuzzy, c-format
+msgid "option --output: field %s unknown"
+msgstr "suljetaan tulostiedosto %s"
+
+#: src/df.c:394
 #, fuzzy, c-format
-msgid "option --output: field '%s' used more than once"
+msgid "option --output: field %s used more than once"
 msgstr "varoitus: lähdetiedosto %s annettu useammin kuin kerran"
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr "Koko"
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr "Vapaa"
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr "Käytetty"
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
 msgstr ""
 
-#: src/df.c:1210
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr ""
+
+#: src/df.c:1384
 #, fuzzy
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
@@ -3589,17 +3669,18 @@ msgstr ""
 "tai oletuksena kaikista tiedostojärjestelmistä.\n"
 "\n"
 
-#: src/df.c:1217
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
 #, fuzzy
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
 "  -a, --all             näytä myös valetiedostojärjestelmät\n"
 "  -B, --block-size=KOKO käytä KOKO-tavuisia lohkoja\n"
@@ -3607,7 +3688,7 @@ msgstr ""
 "2G)\n"
 "  -H, --si              sama kuin edellä, mutta monikerta on 1000, ei 1024\n"
 
-#: src/df.c:1227
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -3621,7 +3702,7 @@ msgstr ""
 "      --no-sync         älä kutsu synciä ennen tilatietojen selvittämistä "
 "(oletus)\n"
 
-#: src/df.c:1234
+#: src/df.c:1409
 #, fuzzy
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
@@ -3643,42 +3724,33 @@ msgstr ""
 "muunTYYPPIsiin\n"
 "  -v                    (ei huomioida)\n"
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
 
-#: src/df.c:1285
+#: src/df.c:1460
 #, fuzzy, c-format
 msgid "options %s and %s are mutually exclusive"
 msgstr "valitsimet --string ja --check ovat toisensa poissulkevia"
 
-#: src/df.c:1335
-#, fuzzy
-msgid "warning: "
-msgstr "Varoitus: "
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr ""
-
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr "tiedostojärjestelmätyyppi %s on sekä valittu että jätetty pois"
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr "Varoitus: "
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 msgid "cannot read table of mounted file systems"
 msgstr "liitettyjen tiedostojärjestelmien taulua ei voi lukea"
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr ""
@@ -3688,7 +3760,7 @@ msgstr ""
 msgid "H. Peter Anvin"
 msgstr "H. Peter Anvin"
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr "Käyttö: %s [VALITSIN]... [TIEDOSTO]\n"
@@ -3774,11 +3846,11 @@ msgstr ""
 
 #: src/dirname.c:59
 #, fuzzy
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
 msgstr "  -z, --zero-terminated     päätä rivit 0-tavuun, ei rivinvaihtoon\n"
 
 #: src/dirname.c:64
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Examples:\n"
@@ -3786,12 +3858,8 @@ msgid ""
 "  %s dir1/str dir2/str  -> \"dir1\" followed by \"dir2\"\n"
 "  %s stdio.h            -> \".\"\n"
 msgstr ""
-"\n"
-"Esimerkkejä:\n"
-"  %s /usr/bin/sort  Tuloste: �/usr/bin�.\n"
-"  %s stdio.h        Tuloste: �.�.\n"
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -3800,7 +3868,7 @@ msgstr ""
 "Käyttö: %s [VALITSIN]... [TIEDOSTO]...\n"
 "  tai:  %s [VALITSIN]... --files0-from=T\n"
 
-#: src/du.c:274
+#: src/du.c:285
 #, fuzzy
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr ""
@@ -3808,11 +3876,10 @@ msgstr ""
 "rekursiivisesti.\n"
 "\n"
 
-#: src/du.c:280
+#: src/du.c:291
 #, fuzzy
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3829,12 +3896,12 @@ msgstr ""
 "pirstoutumisesta,\n"
 "                          epäsuorista lohkoista, ym.\n"
 
-#: src/du.c:289
+#: src/du.c:300
 #, fuzzy
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3845,21 +3912,27 @@ msgid ""
 "                          line argument;  --max-depth=0 is the same as\n"
 "                          --summarize\n"
 msgstr ""
-"  -B, --block-size=KOKO käytä KOKO-tavuisia lohkoja\n"
-"  -b, --bytes           sama kuin �--apparent-size --block-size=1�\n"
-"  -c, --total           näytä myös kokonaismäärä\n"
-"  -D, --dereference-args  laske mukaan vain komentorivillä annettujen\n"
-"                          symlinkkien kohteiden koot\n"
+"  -x, --one-file-system  ohita muilla tiedostojärjestelmillä sijaitsevat\n"
+"                           hakemistot\n"
+"  -X TIED, --exclude-from=TIED  Jätä laskematta tiedostot, jotka täsmäävät\n"
+"                           vähintään yhteen TIEDostossa olevaan hahmoon.\n"
+"      --exclude=HAHMO   jätä laskematta tiedostot, jotka täsmäävät HAHMOon.\n"
+"      --max-depth=N     näytä kokonaismäärä hakemistolle (tai valitsimen --"
+"all\n"
+"                          kanssa tiedostolle) vain, jos se on korkeintaan N\n"
+"                          tasoa argumenttina annetun alla; --max-depth=0 on\n"
+"                          sama kuin --summarize\n"
 
-#: src/du.c:302
+#: src/du.c:313
 #, fuzzy
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
 "      --files0-from=T   tee yhteenveto tiedostossa T annetuista\n"
 "                          NUL-päätetyistä tiedostonimistä;\n"
@@ -3869,7 +3942,7 @@ msgstr ""
 "2G)\n"
 "      --si              sama kuin -h, mutta monikerta on 1000, ei 1024\n"
 
-#: src/du.c:310
+#: src/du.c:322
 #, fuzzy
 msgid ""
 "  -k                    like --block-size=1K\n"
@@ -3881,12 +3954,13 @@ msgstr ""
 "  -l, --count-links     laske kovien linkkien koot monta kertaa\n"
 "  -m                    sama kuin --block-size=1M\n"
 
-#: src/du.c:316
+#: src/du.c:328
 #, fuzzy
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
@@ -3898,7 +3972,7 @@ msgstr ""
 "  -S, --separate-dirs   älä laske mukaan alihakemistojen kokoa\n"
 "  -s, --summarize       näytä vain kokonaismäärä jokaiselle argumentille\n"
 
-#: src/du.c:322
+#: src/du.c:334
 #, fuzzy
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
@@ -3908,9 +3982,9 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
 msgstr ""
 "  -S                         lajittele tiedoston koon mukaan\n"
 "      --sort=SANA            extension -X, none -U, size -S, time -t,\n"
@@ -3921,73 +3995,73 @@ msgstr ""
 "                             status; annettua aikaa käytetään lajitteluun,\n"
 "                             jos --sort=time\n"
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
 "  -x, --one-file-system    skip directories on different file systems\n"
 msgstr ""
 
-#: src/du.c:386
+#: src/du.c:398
 msgid "Infinity"
 msgstr ""
 
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr ""
-
-#: src/du.c:624
+#: src/du.c:636
 #, fuzzy, c-format
 msgid "fts_read failed: %s"
 msgstr "fts_read epäonnistui"
 
-#: src/du.c:780
+#: src/du.c:787
 #, c-format
 msgid "invalid maximum depth %s"
 msgstr "virheellinen enimmäissyvyys %s"
 
-#: src/du.c:809
+#: src/du.c:816
 #, fuzzy, c-format
 msgid "invalid --threshold argument '-0'"
 msgstr "virheellinen argumentti %s"
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr "yhteenvetoa ja kaikkia merkintöjä ei voi näyttää samaan aikaan"
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr "varoitus: yhteenvedon teko on sama asia kuin --max-depth=0"
 
-#: src/du.c:900
+#: src/du.c:911
 #, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr ""
 "varoitus: yhteenvedon teko on ristiriidassa valitsimen --max-depth=%lu kanssa"
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 msgid "file operands cannot be combined with --files0-from"
 msgstr ""
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr "%s: lukuvirhe"
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr ""
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 msgid "invalid zero-length file name"
 msgstr "virheellinen tyhjä tiedostonimi"
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr "yhteensä"
 
@@ -4085,7 +4159,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
 "Aseta kullekin ympäristömuuttujalle NIMI vastaava ARVO ja aja KOMENTO.\n"
@@ -4168,16 +4242,16 @@ msgid "input line is too long"
 msgstr "syöterivi on liian pitkä"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr "Mike Parker"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr "James Youngman"
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
@@ -4186,7 +4260,7 @@ msgstr ""
 "Käyttö: %s LAUSEKE\n"
 "  tai:  %s VALITSIN\n"
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -4204,7 +4278,7 @@ msgstr ""
 "\n"
 "  ARG1 & ARG2       ARG1 jos kumpikaan ei ole tyhjä eikä 0, muutoin 0\n"
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -4222,7 +4296,7 @@ msgstr ""
 "  ARG1 >= ARG2      ARG1 on suurempi tai yhtäsuuri kuin ARG2\n"
 "  ARG1 > ARG2       ARG1 on suurempi kuin ARG2\n"
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
@@ -4232,7 +4306,7 @@ msgstr ""
 "  ARG1 + ARG2       ARG1:n ja ARG2:n aritmeettinen summa\n"
 "  ARG1 - ARG2       ARG1:n ja ARG2:n aritmeettinen erotus\n"
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -4245,7 +4319,7 @@ msgstr ""
 "  ARG1 / ARG2       aritmeettinen osamäärä ARG1 jaettuna ARG2:lla\n"
 "  ARG1 % ARG2       aritmeettinen jakojäännös ARG1 jaettuna ARG2:lla\n"
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -4264,7 +4338,7 @@ msgstr ""
 "tai 0\n"
 "  length MERKKIJONO              MERKKIJONOn pituus\n"
 
-#: src/expr.c:251
+#: src/expr.c:250
 #, fuzzy
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
@@ -4279,7 +4353,7 @@ msgstr ""
 "\n"
 "  ( LAUSEKE )                LAUSEKKEen arvo\n"
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -4296,7 +4370,7 @@ msgstr ""
 "tyhjän. Merkkien \\( ja \\) puuttuessa palautuu täsmäävien merkkien määrä "
 "tai 0.\n"
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -4304,32 +4378,32 @@ msgid ""
 "or 0, 2 if EXPRESSION is syntactically invalid, and 3 if an error occurred.\n"
 msgstr ""
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, c-format
 msgid "syntax error"
 msgstr "syntaksivirhe"
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, fuzzy, c-format
 msgid "error in regular expression matcher"
 msgstr "virhe säännöllisen lausekkeen haussa"
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, fuzzy, c-format
 msgid "non-integer argument"
 msgstr "ei-numeerinen argumentti"
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr "nollalla jako"
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr "aseta LC_ALL='C' ongelman kiertämiseksi"
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, fuzzy, c-format
 msgid "the strings compared were %s and %s"
 msgstr "Vertaillut merkkijonot olivat %s ja %s."
@@ -4339,27 +4413,27 @@ msgstr "Vertaillut merkkijonot olivat %s ja %s."
 msgid "Niels Moller"
 msgstr ""
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
 msgstr ""
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
 msgstr ""
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, c-format
 msgid "%s is not a valid positive integer"
 msgstr "%s ei ole kelvollinen positiivinen kokonaisluku"
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr "%s on liian suuri"
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
@@ -4368,7 +4442,7 @@ msgstr ""
 "Käyttö: %s [LUKU]...\n"
 "  tai:  %s VALITSIN\n"
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
 "are specified on the command line, read them from standard input.\n"
@@ -4483,28 +4557,28 @@ msgid "invalid number of columns: %s"
 msgstr "virheellinen sarakemäärä: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr "Padraig Brady"
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, c-format
 msgid "Usage: %s\n"
 msgstr "Käyttö: %s\n"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
 msgstr ""
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, fuzzy, c-format
 msgid "failed to get groups for user %s"
 msgstr "tiedoston %s ryhmän vaihtaminen arvoon %s epäonnistui\n"
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, fuzzy, c-format
 msgid "failed to get groups for the current process"
 msgstr "tiedoston %s ryhmän vaihtaminen arvoon %s epäonnistui\n"
@@ -4526,22 +4600,22 @@ msgid ""
 "the current process (which may differ if the groups database has changed).\n"
 msgstr ""
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, fuzzy, c-format
 msgid "cannot get real UID"
 msgstr "tunnuksen id:n asetus ei onnistu"
 
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, fuzzy, c-format
 msgid "cannot get effective GID"
-msgstr "tiedostoa %s ei voi poistaa"
+msgstr "ajan haku ei onnistu"
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, fuzzy, c-format
 msgid "cannot get real GID"
 msgstr "tunnuksen id:n asetus ei onnistu"
 
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, fuzzy, c-format
 msgid "%s: no such user"
 msgstr "%s: Käyttäjää ei ole"
@@ -4604,58 +4678,48 @@ msgstr ""
 "Kukin MUUNNOS voi olla:\n"
 "\n"
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr "%s: tiedosto on kutistunut liikaa"
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, c-format
 msgid "%s: number of bytes is too large"
 msgstr "%s: tavumäärä on liian suuri"
 
-#: src/head.c:440
-#, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr "%s: siirtyminen takaisin alkuperäiseen siirtymään ei onnistu"
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr "%s: siirtyminen kohtaan %s ei onnistu"
 
-#: src/head.c:673
-#, fuzzy, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "%s: poisto epäonnistui"
-
-#: src/head.c:798
+#: src/head.c:423 src/tail.c:457
 #, c-format
-msgid "cannot reposition file pointer for %s"
-msgstr "tiedosto-osoitinta ei voi siirtää tiedostossa %s"
+msgid "%s: cannot seek to relative offset %s"
+msgstr "%s: siirtyminen suhteelliseen siirtymään %s ei onnistu"
 
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr "%s: %s on liian suuri esitettäväksi"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr "rivimäärä"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr "tavumäärä"
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr "virheellinen rivimäärä"
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr "virheellinen tavumäärä"
 
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, fuzzy, c-format
 msgid "invalid trailing option -- %c"
 msgstr "virheellinen valitsin – %c"
@@ -4702,28 +4766,34 @@ msgid "cannot determine hostname"
 msgstr "järjestelmän konenimen määritys ei onnistu"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr "Arnold Robbins"
 
-#: src/id.c:81
-#, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
-msgstr "Käyttö: %s [VALITSIN]... [KÄYTTÄJÄTUNNUS]\n"
+#: src/id.c:84
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]... [USER]\n"
+msgstr "Käyttö: %s [VALITSIN]... [TUNNUS]...\n"
 
-#: src/id.c:82
-#, fuzzy
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
+msgstr ""
+
+#: src/id.c:90
+#, fuzzy
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
 msgstr ""
 "Tulosta KÄYTTÄJÄTUNNUksen tai nykyisen käyttäjän tiedot.\n"
 "\n"
@@ -4735,7 +4805,7 @@ msgstr ""
 "valitsimilla\n"
 "  -u, --user      tulosta vain vallitseva käyttäjä-ID\n"
 
-#: src/id.c:96
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
@@ -4743,117 +4813,128 @@ msgstr ""
 "\n"
 "Ilman VALITSIMIA tulostetaan jokin sovelias kokoelma tunnistettua tietoa.\n"
 
-#: src/id.c:140
+#: src/id.c:151
+#, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr ""
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr ""
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr ""
 
-#: src/id.c:178
+#: src/id.c:198
 #, fuzzy, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr "voidaan jakaa vain yhdellä tavalla"
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr ""
 "pelkkien nimien tai todellisten ID:iden tulostus oletusmuodossa ei onnistu"
 
-#: src/id.c:199
+#: src/id.c:209
+#, fuzzy, c-format
+msgid "option --zero not permitted in default format"
+msgstr ""
+"pelkkien nimien tai todellisten ID:iden tulostus oletusmuodossa ei onnistu"
+
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
 msgstr ""
 
-#: src/id.c:224
+#: src/id.c:265
 #, fuzzy, c-format
 msgid "cannot get effective UID"
-msgstr "tiedostoa %s ei voi poistaa"
+msgstr "ajan haku ei onnistu"
 
-#: src/id.c:311
+#: src/id.c:354
 #, fuzzy, c-format
 msgid "cannot find name for user ID %s"
 msgstr "käyttäjä-ID:tä %lu vastaavaa nimeä ei löydy"
 
-#: src/id.c:329
+#: src/id.c:372
 #, fuzzy, c-format
 msgid "uid=%s"
 msgstr "uid=%lu"
 
-#: src/id.c:334
+#: src/id.c:377
 #, fuzzy, c-format
 msgid " gid=%s"
 msgstr " gid=%lu"
 
-#: src/id.c:341
+#: src/id.c:384
 #, fuzzy, c-format
 msgid " euid=%s"
 msgstr " euid=%lu"
 
-#: src/id.c:349
+#: src/id.c:392
 #, fuzzy, c-format
 msgid " egid=%s"
 msgstr " egid=%lu"
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr " ryhmät="
 
-#: src/id.c:393
+#: src/id.c:437
 #, fuzzy, c-format
 msgid " context=%s"
 msgstr "virheelliset oikeudet: %s"
 
-#: src/install.c:373
+#: src/install.c:376
 #, fuzzy, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr "varoitus: ei voida siirtyä hakemistoon %s"
 
-#: src/install.c:414
+#: src/install.c:417
 #, c-format
 msgid "creating directory %s"
 msgstr "luodaan hakemisto %s"
 
-#: src/install.c:482
+#: src/install.c:485
 #, c-format
 msgid "cannot change ownership of %s"
 msgstr "tiedoston %s omistajuuden muuttaminen ei onnistu"
 
-#: src/install.c:506
+#: src/install.c:509
 #, c-format
 msgid "cannot set time stamps for %s"
 msgstr "tiedoston %s aikaleimojen asettaminen ei onnistu"
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, c-format
 msgid "fork system call failed"
 msgstr "järjestelmäkutsu fork epäonnistui"
 
-#: src/install.c:531
+#: src/install.c:535
 #, fuzzy, c-format
 msgid "cannot run %s"
 msgstr "ohjelmaa strip ei voi ajaa"
 
-#: src/install.c:535
+#: src/install.c:539
 #, c-format
 msgid "waiting for strip"
 msgstr "odotettaessa strip-ohjelman päättymistä"
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr ""
 
-#: src/install.c:558
+#: src/install.c:565
 #, c-format
 msgid "invalid user %s"
 msgstr "virheellinen käyttäjä %s"
 
-#: src/install.c:594
+#: src/install.c:601
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -4866,7 +4947,7 @@ msgstr ""
 "  tai:  %s [VALITSIN]... -t HAKEMISTO LÄHDE...\n"
 "  tai:  %s [VALITSIN]... -d HAKEMISTO...\n"
 
-#: src/install.c:601
+#: src/install.c:608
 #, fuzzy
 msgid ""
 "\n"
@@ -4891,7 +4972,7 @@ msgstr ""
 "Neljäs muoto: luo annettujen HAKEMISTOjen kaikki (puuttuvat) ylähakemistot.\n"
 "\n"
 
-#: src/install.c:615
+#: src/install.c:622
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
 "  -b                  like --backup but does not accept an argument\n"
@@ -4911,7 +4992,7 @@ msgstr ""
 "  -d, --directory     kohtele kaikkia argumentteja hakemistoniminä; luo\n"
 "                        kaikki annetut hakemistot alihakemistoineen\n"
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -4930,7 +5011,7 @@ msgstr ""
 "  -m, --mode=OIKEUDET aseta oikeudet (kuten chmodissa) – muuten rwxr-xr-x\n"
 "  -o, --owner=OMISTAJA  aseta omistajuus (vain pääkäyttäjä)\n"
 
-#: src/install.c:631
+#: src/install.c:638
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
 "files\n"
@@ -4953,60 +5034,57 @@ msgstr ""
 "  -T, --no-target-directory  käsittele KOHDEtta normaalina tiedostona\n"
 "  -v, --verbose       tulosta kunkin hakemiston nimi luotaessa\n"
 
-#: src/install.c:641
+#: src/install.c:648
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
 
-#: src/install.c:859
+#: src/install.c:696 src/unlink.c:86
 #, c-format
-msgid ""
-"WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
-msgstr ""
+msgid "cannot unlink %s"
+msgstr "tiedoston %s linkitystä ei voi poistaa"
 
-#: src/install.c:869
+#: src/install.c:877
 #, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
+msgid ""
+"WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
 msgstr ""
 
-#: src/install.c:886
+#: src/install.c:917
 #, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr "strip-valitsinta ei voi käyttää asennettaessa hakemistoa"
 
-#: src/install.c:889
+#: src/install.c:920
 #, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr "kohdehakemisto ei ole sallittu asennettaessa hakemistoa"
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr ""
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, c-format
 msgid "invalid mode %s"
 msgstr "virheelliset oikeudet %s"
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr ""
 
-#: src/install.c:959
+#: src/install.c:1001
 #, fuzzy, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr "valitsimet --string ja --check ovat toisensa poissulkevia"
 
-#: src/install.c:966
+#: src/install.c:1008
 #, fuzzy, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr "valitsimet --string ja --check ovat toisensa poissulkevia"
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -5019,7 +5097,7 @@ msgid "Mike Haertel"
 msgstr "Mike Haertel"
 
 # *** *** *** ***
-#: src/join.c:191
+#: src/join.c:195
 #, fuzzy
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
@@ -5040,7 +5118,7 @@ msgstr ""
 "                      TIEDNUM on 1 tai 2 (TIEDOSTO1 tai TIEDOSTO2)\n"
 "  -e TYHJÄ          korvaa puuttuvat syötekentät TYHJÄllä\n"
 
-#: src/join.c:200
+#: src/join.c:204
 #, fuzzy
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
@@ -5053,7 +5131,7 @@ msgstr ""
 "  -o MUOTO          noudata MUOTOa tulosteriviä muodostettaessa\n"
 "  -t MERKKI         käytä MERKKIä syöte- ja tulostesarakkeiden erottimena\n"
 
-#: src/join.c:206
+#: src/join.c:210
 #, fuzzy
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
@@ -5070,7 +5148,12 @@ msgstr ""
 "  -1 SARAKE         yhdistä tämä tiedoston 1 SARAKE\n"
 "  -2 SARAKE         yhdistä tämä tiedoston 2 SARAKE\n"
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+#, fuzzy
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr "  -z, --zero-terminated     päätä rivit 0-tavuun, ei rivinvaihtoon\n"
+
+#: src/join.c:225
 #, fuzzy
 msgid ""
 "\n"
@@ -5103,47 +5186,47 @@ msgstr ""
 "Tärkeää: TIEDOSTO1:n ja TIEDOSTO2:n on oltava lajiteltu liitossarakkeen\n"
 "mukaan.\n"
 
-#: src/join.c:403
+#: src/join.c:410
 #, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
 msgstr ""
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, c-format
 msgid "invalid field number: %s"
 msgstr "virheellinen sarakenumero: %s"
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, c-format
 msgid "invalid field specifier: %s"
 msgstr "virheellinen saraketarkennin: %s"
 
-#: src/join.c:877
+#: src/join.c:884
 #, c-format
 msgid "invalid file number in field spec: %s"
 msgstr "virheellinen tiedostonumero sarakemäärityksessä: %s"
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr "epäyhteensopivat liitossarakkeet %lu, %lu"
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr ""
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, c-format
 msgid "multi-character tab %s"
 msgstr "monimerkkinen sarkain %s"
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr "epäyhteensopivat sarkaimet"
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr "vakiosyötettä ei voi käyttää molempina tiedostoina"
@@ -5266,47 +5349,47 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr "linkkiä %s kohteeseen %s ei voi luoda"
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr "%s: kova linkki ei ole sallittu hakemistolle"
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, c-format
 msgid "%s: cannot overwrite directory"
 msgstr "%s: hakemistoa ei voi korvata"
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
 msgstr "%s: korvataanko tiedosto %s? "
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, fuzzy, c-format
 msgid "failed to create symbolic link %s"
 msgstr "symbolisen linkin %s luominen ei onnistu"
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, fuzzy, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr "kohteeseen %2$s ei voi luoda symbolista linkkiä %1$s"
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, fuzzy, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr "luotaessa kovaa linkkiä kohteeseen %.0s%s"
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, fuzzy, c-format
 msgid "failed to create hard link %s"
 msgstr "kovan linkin %s luominen tiedostoon %s ei onnistu"
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, fuzzy, c-format
 msgid "failed to create hard link %s => %s"
 msgstr "kovan linkin %s luominen tiedostoon %s ei onnistu"
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -5319,7 +5402,7 @@ msgstr ""
 "  tai:  %s [VALITSIN]... KOHDE... HAKEMISTO...   (3. muoto)\n"
 "  tai:  %s [VALITSIN]... -t HAKEMISTO KOHDE...   (4. muoto)\n"
 
-#: src/ln.c:381
+#: src/ln.c:398
 #, fuzzy
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
@@ -5343,7 +5426,7 @@ msgstr ""
 "kovia linkkejä.\n"
 "\n"
 
-#: src/ln.c:394
+#: src/ln.c:411
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
 "file\n"
@@ -5364,7 +5447,7 @@ msgstr ""
 "                                myös pääkäyttäjältä)\n"
 "  -f, --force                 poista olemassaolevat kohdetiedostot\n"
 
-#: src/ln.c:402
+#: src/ln.c:419
 #, fuzzy
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
@@ -5382,7 +5465,7 @@ msgstr ""
 "  -s, --symbolic              tee symbolisia linkkejä kovien linkkien "
 "sijaan\n"
 
-#: src/ln.c:411
+#: src/ln.c:428
 #, fuzzy
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
@@ -5399,7 +5482,7 @@ msgstr ""
 "  -v, --verbose               näytä kunkin linkitetyn tiedoston tiedoston "
 "nimi\n"
 
-#: src/ln.c:433
+#: src/ln.c:450
 #, c-format
 msgid ""
 "\n"
@@ -5407,12 +5490,12 @@ msgid ""
 "behavior when a TARGET is a symbolic link, defaulting to %s.\n"
 msgstr ""
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr "valitsimia --target-directory ja --no-target-directory ei voi yhdistää"
 
-#: src/ln.c:588
+#: src/ln.c:605
 #, fuzzy, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr "symbolisen linkin %s luominen ei onnistu"
@@ -5445,7 +5528,7 @@ msgstr "ei sisäänkirjautumistunnusta"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 msgid "%b %e  %Y"
 msgstr "%e.%-m.%Y"
 
@@ -5454,96 +5537,96 @@ msgstr "%e.%-m.%Y"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 msgid "%b %e %H:%M"
 msgstr "%e.%-m. %H:%M"
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr "ei huomioida virheellistä arvoa ympäristömuuttujassa QUOTING_STYLE: %s"
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr "ei huomioida virheellistä leveyttä ympäristömuuttujassa COLUMNS: %s"
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr ""
 "ei huomioida virheellistä sarkainkokoa ympäristömuuttujassa TABSIZE: %s"
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, c-format
 msgid "invalid line width: %s"
 msgstr "virheellinen rivileveys: %s"
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, c-format
 msgid "invalid tab size: %s"
 msgstr "virheellinen sarkainkoko: %s"
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, c-format
 msgid "invalid time style format %s"
 msgstr "virheellinen ajan muoto %s"
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 #, fuzzy
 msgid "Valid arguments are:\n"
 msgstr "Kelvolliset argumentit:"
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr ""
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr "virhe kuukausimerkkijonojen alustuksessa"
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, c-format
 msgid "unrecognized prefix: %s"
 msgstr "tunnistamaton etuliite: %s"
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr "jäsentymätön arvo LS_COLORS-ympäristömuuttujalle"
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, c-format
 msgid "cannot open directory %s"
 msgstr "hakemiston %s avaaminen ei onnistu"
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, c-format
 msgid "cannot determine device and inode of %s"
 msgstr "hakemiston %s laitetta ja i-solmua ei voida määrittää"
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, c-format
 msgid "%s: not listing already-listed directory"
 msgstr "%s: ei luetella jo lueteltua hakemistoa"
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, c-format
 msgid "reading directory %s"
 msgstr "luetaan hakemistoa %s"
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, c-format
 msgid "closing directory %s"
 msgstr "suljetaan hakemisto %s"
 
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, c-format
 msgid "cannot compare file names %s and %s"
 msgstr "tiedostonimiä %s ja %s ei voi vertailla"
 
-#: src/ls.c:4721
+#: src/ls.c:4781
 #, fuzzy
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
@@ -5554,7 +5637,7 @@ msgstr ""
 "tai --sort ole annettu.\n"
 "\n"
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 #, fuzzy
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
@@ -5570,18 +5653,18 @@ msgstr ""
 "  -b, --escape               tulosta oktaaliset suojaukset ei-graafisille\n"
 "                               merkeille\n"
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 #, fuzzy
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
 "      --block-size=KOKO      käytä KOKO-tavuisia lohkoja\n"
@@ -5594,16 +5677,15 @@ msgstr ""
 "                               nimen mukaan\n"
 "                               muuten: lajittele ctimen mukaan\n"
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 #, fuzzy
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 "  -C                         luettele merkinnät sarakkeissa\n"
@@ -5615,7 +5697,7 @@ msgstr ""
 "                               äläkä seuraa symbolisia linkkejä\n"
 "  -D, --dired                tuota tuloste Emacsin dired-muodossa\n"
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 #, fuzzy
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
@@ -5632,22 +5714,24 @@ msgstr ""
 "                               single-column -1, verbose -l, vertical -C\n"
 "      --full-time            kuten -l --time-style=full-iso\n"
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr "  -g                         kuten -l, mutta älä näytä omistajia\n"
 
-#: src/ls.c:4763
+#: src/ls.c:4823
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 
-#: src/ls.c:4769
+#: src/ls.c:4829
+#, fuzzy
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
@@ -5657,7 +5741,7 @@ msgstr ""
 "      --si                   sama kuin edellä, mutta kantalukuna 1000, ei "
 "1024\n"
 
-#: src/ls.c:4775
+#: src/ls.c:4835
 #, fuzzy
 msgid ""
 "  -H, --dereference-command-line\n"
@@ -5665,7 +5749,7 @@ msgid ""
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
@@ -5685,7 +5769,7 @@ msgstr ""
 "      --hide=HAHMO           älä luettele HAHMOon täsmääviä merkintöjä\n"
 "                               (-a ja -A kumoavat tämän valitsimen)\n"
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 #, fuzzy
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
@@ -5695,7 +5779,7 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 "      --indicator-style=SANA lisää SANAn mukainen ilmaisin merkintöjen "
 "nimiin:\n"
@@ -5706,7 +5790,7 @@ msgstr ""
 "  -I, --ignore=HAHMO         älä luettele HAHMOon täsmääviä merkintöjä\n"
 "  -k                         sama kuin --block-size=1K\n"
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -5722,7 +5806,7 @@ msgstr ""
 "  -m                         näytä tiedostonimet pilkuilla erotettuna\n"
 "                               luettelona\n"
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -5741,12 +5825,12 @@ msgstr ""
 "  -p, --indicator-style=slash\n"
 "                             lisää hakemistoihin ilmaisin �/�\n"
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 #, fuzzy
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -5762,7 +5846,7 @@ msgstr ""
 "                               literal, locale, shell, shell-always, c, "
 "escape\n"
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
 "  -R, --recursive            list subdirectories recursively\n"
@@ -5773,16 +5857,19 @@ msgstr ""
 "  -R, --recursive            luettele alihakemistot rekursiivisesti\n"
 "  -s, --size                 tulosta kunkin tiedoston varaama koko lohkoina\n"
 
-#: src/ls.c:4825
+#: src/ls.c:4886
+#, fuzzy
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 "  -S                         lajittele tiedoston koon mukaan\n"
 "      --sort=SANA            lajittele SANAn perusteella, ei nimen mukaan:\n"
@@ -5794,17 +5881,19 @@ msgstr ""
 "käytetään\n"
 "                             lajitteluun, jos --sort=time\n"
 
-#: src/ls.c:4835
+#: src/ls.c:4896
 #, fuzzy
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
 msgstr ""
 "      --time-style=TYYLI     kun -l annettu, näytä ajat käyttäen TYYLIä:\n"
 "                             full-iso, long-iso, iso, locale, +MUOTO.\n"
@@ -5817,7 +5906,7 @@ msgstr ""
 "muu\n"
 "                             kuin POSIX\n"
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 #, fuzzy
 msgid ""
 "  -t                         sort by modification time, newest first\n"
@@ -5826,11 +5915,11 @@ msgstr ""
 "  -t                         lajittele muutosajan mukaan\n"
 "  -T, --tabsize=LEVEYS       aseta sarkainkooksi LEVEYS, ei 8\n"
 
-#: src/ls.c:4848
+#: src/ls.c:4912
 #, fuzzy
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
@@ -5844,14 +5933,13 @@ msgstr ""
 "                               hakemistojärjestyksessä\n"
 "  -v                         lajittele version mukaan\n"
 
-#: src/ls.c:4855
+#: src/ls.c:4919
 #, fuzzy
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 "  -w, --width=LEVEYS         oleta ruudun leveydeksi LEVEYS\n"
@@ -5860,7 +5948,7 @@ msgstr ""
 "  -X                         aakkosta merkinnän päätteen mukaan\n"
 "  -1                         luettele vain yksi tiedosto yhdellä rivillä\n"
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -5869,7 +5957,7 @@ msgid ""
 "variable can change the settings.  Use the dircolors command to set it.\n"
 msgstr ""
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -5941,9 +6029,11 @@ msgstr "  -b, --binary            lue binäärimuodossa\n"
 #, fuzzy
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
@@ -5953,12 +6043,7 @@ msgstr ""
 "  -w, --warn              varoita väärin muotoilluista summariveistä\n"
 "\n"
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -5973,49 +6058,49 @@ msgstr ""
 "rivi, jolla on tarkistussumma, tyyppiä ilmaiseva merkki (�*� = binääri,\n"
 "� � = teksti), ja TIEDoston nimi. \n"
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, c-format
 msgid "%s: too many checksum lines"
 msgstr "%s: liian monta tarkistussummariviä"
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr "%s: %<PRIuMAX>: väärin muotoiltu %s-tarkistussummarivi"
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr "%s: avaaminen tai luku EPÄONNISTUI\n"
 
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr "EI TÄSMÄÄ"
 
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr "OK"
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr "%s: kelvollisesti muotoiltuja %s-tarkistussummarivejä ei löytynyt"
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, fuzzy, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
 msgstr[0] "%s: %<PRIuMAX>: väärin muotoiltu %s-tarkistussummarivi"
 msgstr[1] "%s: %<PRIuMAX>: väärin muotoiltu %s-tarkistussummarivi"
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, fuzzy, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
 msgstr[0] "VAROITUS: %<PRIuMAX> tiedosto %<PRIuMAX> luetellusta jäi lukematta"
 msgstr[1] "VAROITUS: %<PRIuMAX> tiedostoa %<PRIuMAX> luetellusta jäi lukematta"
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, fuzzy, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
@@ -6024,19 +6109,19 @@ msgstr[0] ""
 msgstr[1] ""
 "VAROITUS: %<PRIuMAX> tarkistussummaa %<PRIuMAX> lasketusta EI TÄSMÄNNYT"
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
 msgstr ""
 
 # onko verify tarkastamista, todentamista vai varmentamista?
-#: src/md5sum.c:766
+#: src/md5sum.c:770
 #, fuzzy, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr ""
 "valitsin --status on merkityksellinen vain tarkastettaessa tarkistussummia"
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
@@ -6045,38 +6130,38 @@ msgstr ""
 "tarkistussummia"
 
 # onko verify tarkastamista, todentamista vai varmentamista?
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr ""
 "valitsin --status on merkityksellinen vain tarkastettaessa tarkistussummia"
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr ""
 "valitsin --warn on merkityksellinen vain tarkastettaessa tarkistussummia"
 
 # onko verify tarkastamista, todentamista vai varmentamista?
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, fuzzy, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr ""
 "valitsin --status on merkityksellinen vain tarkastettaessa tarkistussummia"
 
 # onko verify tarkastamista, todentamista vai varmentamista?
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, fuzzy, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr ""
 "valitsin --status on merkityksellinen vain tarkastettaessa tarkistussummia"
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr "Käyttö: %s [VALITSIN]... HAKEMISTO...\n"
 
-#: src/mkdir.c:57
+#: src/mkdir.c:59
 #, fuzzy
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
 msgstr ""
@@ -6084,74 +6169,100 @@ msgstr ""
 "\n"
 
 # Ensimmäinen kohta on aika hämärä alkutekstissä.
-#: src/mkdir.c:63
+#: src/mkdir.c:65
 #, fuzzy
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 "  -m, --mode=OIK    aseta oikeudet (kuten chmodilla)\n"
 "  -p, --parents     ei virhettä jos jo olemassa, luo tarvittavat "
 "ylähakemistot\n"
 "  -v, --verbose     näytä viesti kutakin hakemistoa luodessa\n"
 
-#: src/mkdir.c:168
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/mkdir.c:127 src/mkdir.c:172
+#, fuzzy, c-format
+msgid "failed to set default creation context for %s"
+msgstr "tiedoston %s ominaisuuksien hakeminen ei onnistu"
+
+#: src/mkdir.c:191
+#, fuzzy, c-format
+msgid "failed to restore context for %s"
+msgstr "tiedoston %s aikojen säilyttäminen ei onnistu"
+
+#: src/mkdir.c:231
 #, c-format
 msgid "created directory %s"
 msgstr "luotiin hakemisto %s"
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr ""
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr "Käyttö: %s [VALITSIN]... NIMI...\n"
 
-#: src/mkfifo.c:52
+#: src/mkfifo.c:54
 #, fuzzy
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
 msgstr "Luo nimettyjä putkia (FIFOja) annetuilla NIMIllä.\n"
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 #, fuzzy
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
 msgstr ""
 "  -m, --mode=OIK    aseta oikeudet (kuten chmodilla), ei a=rw vaan umask\n"
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, c-format
 msgid "invalid mode"
 msgstr "virheelliset oikeudet"
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr ""
 
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
+#, c-format
+msgid "cannot set permissions of %s"
+msgstr "tiedoston %s oikeuksien asettaminen ei onnistu"
+
+#: src/mknod.c:54
 #, c-format
 msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr "Käyttö: %s [VALITSIN]... NIMI TYYPPI [MAJOR MINOR]\n"
 
-#: src/mknod.c:54
+#: src/mknod.c:56
 #, fuzzy
 msgid "Create the special file NAME of the given TYPE.\n"
 msgstr ""
 "Luo TYYPIn mukainen erikoistiedosto NIMI.\n"
 "\n"
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr ""
-
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -6167,7 +6278,7 @@ msgstr ""
 "oktaaliluvuksi;\n"
 "muussa tapauksessa kymmenkantaiseksi luvuksi. TYYPPI voi olla:\n"
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 msgid ""
 "\n"
 "  b      create a block (buffered) special file\n"
@@ -6179,57 +6290,57 @@ msgstr ""
 "  c, u   luo merkkierikoistiedosto (puskuroimaton)\n"
 "  p      luo FIFO-putki\n"
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 msgid "Special files require major and minor device numbers."
 msgstr ""
 "Major- ja minor-laitearvot on annettava luotaessa\n"
 "erikoistiedostoja"
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 msgid "Fifos do not have major and minor device numbers."
 msgstr "FIFO-putkilla ei ole major- ja minor-laitearvoja."
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, c-format
 msgid "block special files not supported"
 msgstr "lohkoerikoistiedostot eivät ole tuettuja"
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, c-format
 msgid "character special files not supported"
 msgstr "merkkierikoistiedostot eivät ole tuettuja"
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, c-format
 msgid "invalid major device number %s"
 msgstr "virheellinen laitteen major-arvo %s"
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, c-format
 msgid "invalid minor device number %s"
 msgstr "virheellinen laitteen minor-arvo %s"
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, c-format
 msgid "invalid device %s %s"
 msgstr "virheellinen laite %s %s"
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, c-format
 msgid "invalid device type %s"
 msgstr "virheellinen laitetyyppi %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr ""
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr "Käyttö: %s [VALITSIN]... [POHJA]\n"
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 #, fuzzy
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
@@ -6239,96 +6350,90 @@ msgstr ""
 "Luo väliaikainen tiedosto tai hakemisto turvallisesti ja näytä sen nimi.\n"
 "Jos POHJAa ei anneta, käytetään pohjana tmp.XXXXXXXXXX:ää.\n"
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
 "  -q, --quiet         suppress diagnostics about file/dir-creation failure\n"
 msgstr ""
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
 msgstr ""
 
-#: src/mktemp.c:223
-#, fuzzy, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr "vakiovirhetulosteen uudelleenohjaus epäonnistui"
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, fuzzy, c-format
 msgid "too many templates"
 msgstr "liian monta argumenttia"
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr ""
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr ""
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr ""
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr ""
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr ""
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, fuzzy, c-format
 msgid "failed to create directory via template %s"
 msgstr "hakemiston %s sulkeminen epäonnistui"
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, fuzzy, c-format
 msgid "failed to create file via template %s"
 msgstr "tiedoston %s aikojen säilyttäminen ei onnistu"
 
-#: src/mv.c:292
+#: src/mv.c:294
 #, fuzzy
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 "Uudelleennimeä LÄHDE -> KOHDE, tai siirrä LÄHDE(teet) HAKEMISTOon.\n"
 "\n"
 
-#: src/mv.c:298
+#: src/mv.c:300
 #, fuzzy
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
@@ -6349,7 +6454,7 @@ msgstr ""
 "  -i, --interactive            kysy ennen ylikirjoitusta\n"
 "                                 (vastaava kuin --reply=query)\n"
 
-#: src/mv.c:307
+#: src/mv.c:309
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
@@ -6361,7 +6466,8 @@ msgstr ""
 "  -S, --suffix=JÄLKILIITE      korvaa tavanomainen varmuuskopioiden "
 "jälkiliite\n"
 
-#: src/mv.c:312
+#: src/mv.c:314
+#, fuzzy
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
 "DIRECTORY\n"
@@ -6370,6 +6476,8 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
 "  -t, --target-directory=HAKEMISTO  siirrä kaikki LÄHDEargumentit\n"
 "                                 kohdeHAKEMISTOon\n"
@@ -6663,95 +6771,90 @@ msgid "%s: invalid number to ignore"
 msgstr "%s: virheellinen rivimäärä"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
 msgstr ""
 
-#: src/numfmt.c:676
+#: src/numfmt.c:659
 #, fuzzy, c-format
-msgid "value too large to be converted: '%s'"
+msgid "value too large to be converted: %s"
 msgstr "%s: arvoa ei muunnettu kokonaisuudessaan"
 
-#: src/numfmt.c:680
+#: src/numfmt.c:663
 #, fuzzy, c-format
-msgid "invalid number: '%s'"
+msgid "invalid number: %s"
 msgstr "virheellinen määrä %s"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
+msgid "rejecting suffix in input: %s (consider using --from)"
 msgstr ""
 
-#: src/numfmt.c:688
+#: src/numfmt.c:671
 #, fuzzy, c-format
-msgid "invalid suffix in input: '%s'"
+msgid "invalid suffix in input: %s"
 msgstr "argumentti �%s� ei kelpaa"
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
 msgstr ""
 
-#: src/numfmt.c:723
+#: src/numfmt.c:722 src/numfmt.c:768
 #, fuzzy, c-format
 msgid "failed to prepare value '%Lf' for printing"
 msgstr "%s: avaaminen kirjoitustilassa epäonnistui"
 
-#: src/numfmt.c:787
+#: src/numfmt.c:791
 #, fuzzy, c-format
-msgid "invalid unit size: '%s'"
+msgid "invalid unit size: %s"
 msgstr "virheellinen sarkainkoko: %s"
 
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
-#, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr ""
-
-#: src/numfmt.c:813
+#: src/numfmt.c:814
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
 msgstr "Käyttö: %s [VALITSIN]... [TUNNUS]...\n"
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
 msgstr ""
 
-#: src/numfmt.c:820
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
 msgstr ""
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
 msgstr ""
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
 "                         see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr ""
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
@@ -6759,19 +6862,19 @@ msgid ""
 "locale)\n"
 msgstr ""
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
 msgstr ""
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
 msgstr ""
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -6781,30 +6884,30 @@ msgid ""
 "                         is found\n"
 msgstr ""
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
 "nearest\n"
 msgstr ""
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
 msgstr ""
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr ""
 
-#: src/numfmt.c:877
+#: src/numfmt.c:878
 #, fuzzy
 msgid ""
 "\n"
@@ -6813,11 +6916,11 @@ msgstr ""
 "Lajitteluvalitsimet:\n"
 "\n"
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr ""
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -6826,7 +6929,7 @@ msgid ""
 "               1Mi = 1048576,\n"
 msgstr ""
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
@@ -6834,7 +6937,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
@@ -6842,7 +6945,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
@@ -6850,18 +6953,18 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:905
+#: src/numfmt.c:906
 #, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -6873,7 +6976,7 @@ msgid ""
 "errors are not diagnosed and the exit status is 0.\n"
 msgstr ""
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -6894,112 +6997,112 @@ msgid ""
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 msgstr ""
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, fuzzy, c-format
 msgid "format %s has no %% directive"
 msgstr "kohde %s ei ole hakemisto"
 
-#: src/numfmt.c:990
+#: src/numfmt.c:1003
 #, fuzzy, c-format
 msgid "invalid format %s (width overflow)"
 msgstr "virheellinen muodon leveys"
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr ""
+
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr ""
 
-#: src/numfmt.c:1010
+#: src/numfmt.c:1030
 #, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
 msgstr ""
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr ""
 
-#: src/numfmt.c:1070
+#: src/numfmt.c:1081
 #, fuzzy, c-format
-msgid "invalid suffix in input '%s': '%s'"
+msgid "invalid suffix in input %s: %s"
 msgstr "argumentti �%s� ei kelpaa"
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
 msgstr ""
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
 msgstr ""
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
+msgid "large input value %s: possible precision loss"
 msgstr ""
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
 
-#: src/numfmt.c:1388
+#: src/numfmt.c:1403
 #, fuzzy, c-format
-msgid "invalid padding value '%s'"
+msgid "invalid padding value %s"
 msgstr "virheellinen sivuväli %s"
 
-#: src/numfmt.c:1401
+#: src/numfmt.c:1417
 #, fuzzy, c-format
-msgid "invalid field value '%s'"
-msgstr "virheellinen sarakenumero: \"%s\""
+msgid "invalid field value %s"
+msgstr "virheellinen sarakenumero: %s"
 
-#: src/numfmt.c:1430
+#: src/numfmt.c:1447
 #, fuzzy, c-format
-msgid "invalid header value '%s'"
+msgid "invalid header value %s"
 msgstr "virheellinen päiväys %s"
 
-#: src/numfmt.c:1456
+#: src/numfmt.c:1473
 #, fuzzy, c-format
 msgid "--grouping cannot be combined with --format"
 msgstr "signaalin yhdistäminen valitsimen -l tai -t kanssa ei onnistu"
 
-#: src/numfmt.c:1458
-#, fuzzy, c-format
-msgid "--padding cannot be combined with --format"
-msgstr "signaalin yhdistäminen valitsimen -l tai -t kanssa ei onnistu"
-
-#: src/numfmt.c:1463
+#: src/numfmt.c:1478
 #, fuzzy, c-format
 msgid "no conversion option specified"
 msgstr "useita -l tai -t -valitsimia annettu"
 
-#: src/numfmt.c:1471
+#: src/numfmt.c:1486
 #, fuzzy, c-format
 msgid "grouping cannot be combined with --to"
 msgstr "signaalin yhdistäminen valitsimen -l tai -t kanssa ei onnistu"
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
 msgstr ""
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
 msgstr ""
 
-#: src/numfmt.c:1511
+#: src/numfmt.c:1526
 #, fuzzy, c-format
 msgid "error reading input"
 msgstr "virhe luettaessa tiedostoa %s"
 
-#: src/numfmt.c:1520
+#: src/numfmt.c:1535
 #, fuzzy, c-format
 msgid "failed to convert some of the input numbers"
 msgstr "vakiotulosteen uudelleenohjaus epäonnistui"
 
-#: src/od.c:294
+#: src/od.c:320
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -7012,7 +7115,7 @@ msgstr ""
 "  tai:  %s --traditional [VALITSIN]... [TIEDOSTO] [[+]SIIRTYMÄ[.][b]\n"
 "               [+][NIMIÖ][.][b]]\n"
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -7028,7 +7131,7 @@ msgstr ""
 "Jos TIEDOSTOa ei ole annettu, tai se on �-�, luetaan vakiosyötettä.\n"
 "\n"
 
-#: src/od.c:307
+#: src/od.c:333
 #, fuzzy
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
@@ -7051,26 +7154,25 @@ msgstr ""
 "  a         nimetty merkki\n"
 "  c         ASCII-merkki tai kenoviivasuojaus\n"
 
-#: src/od.c:318
-#, fuzzy
+#: src/od.c:344
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
-"  -A, --address-radix=KANTA   päätä miten tiedostosiirtymät tulostetaan\n"
-"  -j, --skip-bytes=MÄÄRÄ      ohita aluksi MÄÄRÄ syötetavua\n"
 
-#: src/od.c:323
+#: src/od.c:350
 #, fuzzy
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
@@ -7083,7 +7185,7 @@ msgstr ""
 "  -w, --width[=MÄÄRÄ]         tulosta MÄÄRÄ tavua kullekin tulosteriville\n"
 "      --traditional           hyväksy argumentteja perinteisessä muodossa\n"
 
-#: src/od.c:336
+#: src/od.c:363
 #, fuzzy
 msgid ""
 "\n"
@@ -7091,7 +7193,7 @@ msgid ""
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 "\n"
@@ -7102,7 +7204,7 @@ msgstr ""
 "  -d   sama kuin -t u2, valitse etumerkittömät 10-kantaiset lyhyet kok."
 "luvut\n"
 
-#: src/od.c:345
+#: src/od.c:372
 msgid ""
 "  -f   same as -t fF, select floats\n"
 "  -i   same as -t dI, select decimal ints\n"
@@ -7118,16 +7220,16 @@ msgstr ""
 "  -s   sama kuin -t d2, valitse 10-kantaiset 2:n tavun yksiköt\n"
 "  -x   sama kuin -t x2, valitse 16-kantaiset 2:n tavun yksiköt\n"
 
-#: src/od.c:353
+#: src/od.c:380
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -7141,7 +7243,7 @@ msgstr ""
 "  u[KOKO]    etumerkitön kymmenkantainen luku, KOKO tavua/kokonaisluku\n"
 "  x[KOKO]    kuusitoistakantainen luku, KOKO tavua/kokonaisluku\n"
 
-#: src/od.c:367
+#: src/od.c:394
 #, fuzzy
 msgid ""
 "\n"
@@ -7156,14 +7258,14 @@ msgstr ""
 "Jos TYYPPI on f, KOKO voi myös olla F: sizeof(float), D: sizeof(double)\n"
 "tai L: sizeof(long double).\n"
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
 "each output line.\n"
 msgstr ""
 
-#: src/od.c:379
+#: src/od.c:406
 #, fuzzy
 msgid ""
 "\n"
@@ -7184,12 +7286,12 @@ msgstr ""
 "Kukin MUUNNOS voi olla:\n"
 "\n"
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, fuzzy, c-format
 msgid "invalid type string %s"
 msgstr "virheellinen muotoilumerkkijono %s"
 
-#: src/od.c:649
+#: src/od.c:690
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7198,7 +7300,7 @@ msgstr ""
 "virheellinen tyyppi %s;\n"
 "järjestelmä ei tarjoa %lu-tavuista perustyyppiä"
 
-#: src/od.c:770
+#: src/od.c:811
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7207,38 +7309,38 @@ msgstr ""
 "virheellinen tyyppi %s;\n"
 "järjestelmä ei tarjoa %lu-tavuista liukulukutyyppiä"
 
-#: src/od.c:828
+#: src/od.c:869
 #, fuzzy, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr "virheellinen merkki �%c� muotoilumerkkijonossa �%s�"
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr "yhdistetyn syötteen lopun yli ei voi ohittaa"
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, fuzzy, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr ""
 "virheellinen tulosteosoitteen kanta �%c�; sen on oltava yksi merkeistä [doxn]"
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr "tyyppiä ei voi antaa merkkijonoja vedostettaessa"
 
-#: src/od.c:1810
+#: src/od.c:1863
 #, fuzzy
 msgid "compatibility mode supports at most one file"
 msgstr "Yhteensopivuustila tukee vain yhtä tiedostoa."
 
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr "ohitettavat-tavut + luettavat-tavut on liian suuri"
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr "varoitus: virheellinen leveys %lu; käytetään arvoa %d"
@@ -7400,12 +7502,12 @@ msgstr "Milloin"
 msgid "Where"
 msgstr "Missä"
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr "Käyttö: %s [VALITSIN]... [TUNNUS]...\n"
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -7421,7 +7523,7 @@ msgstr ""
 "  -p              älä näytä plan-tiedostoa pitkässä mallissa\n"
 "  -s              lyhyen mallin tuloste, tämä on oletus\n"
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -7437,7 +7539,7 @@ msgstr ""
 "joutenoloaikaa\n"
 "                  lyhyessä mallissa\n"
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -7448,7 +7550,7 @@ msgstr ""
 "Kevyt �finger�-ohjelma; näyttää käyttäjätietoja.\n"
 "utmp-tiedostona %s.\n"
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr ""
@@ -7558,8 +7660,8 @@ msgid ""
 msgstr ""
 "  +ENSIMMÄINEN_SIVU[:VIIMEINEN_SIVU], --pages=ENSIMMÄINEN_SIVU[:"
 "VIIMEINEN_SIVU\n"
-"                    aloita [lopeta] tulostus sivulta/lle ENSIMMÄINEN_"
-"[VIIMEINEN_]SIVU\n"
+"                    aloita [lopeta] tulostus sivulta/lle "
+"ENSIMMÄINEN_[VIIMEINEN_]SIVU\n"
 "  -PALSTA, --columns=PALSTA\n"
 "                    tulosta PALSTA palstaa, tulosta alas ellei valitsinta -"
 "a\n"
@@ -7626,8 +7728,8 @@ msgstr ""
 "                    korvaa välit MERKEILLÄ (sarkaimilla) sarkainLEVEYTeen "
 "(8)\n"
 "  -J, --join-lines  lomita täydet rivit, poistaa käytöstä valitsimen -W\n"
-"                    rivitypistyksen, ei saraketasausta, --sep-string"
-"[=MJONO]\n"
+"                    rivitypistyksen, ei saraketasausta, --sep-"
+"string[=MJONO]\n"
 "                    asettaa erottimet\n"
 
 #: src/pr.c:2798
@@ -7688,7 +7790,8 @@ msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
@@ -7699,7 +7802,7 @@ msgstr ""
 "                    kolmen sarakevalitsimen osalta (-SARAKE|-a -SARAKE|-m),\n"
 "                    paitsi jos -w on annettu\n"
 
-#: src/pr.c:2827
+#: src/pr.c:2828
 #, fuzzy
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
@@ -7716,7 +7819,7 @@ msgstr ""
 "                    sarakevalitsimiin\n"
 "  -t, --omit-header jätä pois sivun otsakkeet ja lopukkeet\n"
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 #, fuzzy
 msgid ""
 "  -T, --omit-pagination\n"
@@ -7741,7 +7844,7 @@ msgstr ""
 "                    SIVUN_LEVEYS (72) merkkiä, -s[merkki] ottaa pois\n"
 "                    käytöstä (72)\n"
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 #, fuzzy
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
@@ -7755,7 +7858,7 @@ msgstr ""
 "                    katkaise rivit, paitsi jos valitsin -J on käytössä, ei\n"
 "                    vaikutusta valitsimen -S tai -s kanssa\n"
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 #, fuzzy
 msgid ""
 "\n"
@@ -7783,7 +7886,7 @@ msgstr ""
 
 #: src/printenv.c:69
 #, fuzzy
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr "  -z, --zero-terminated     päätä rivit 0-tavuun, ei rivinvaihtoon\n"
 
 #: src/printf.c:79
@@ -7906,12 +8009,12 @@ msgstr "varoitus: ylimääräiset argumentit jätetty huomiotta alkaen %s:sta"
 msgid "F. Pinard"
 msgstr "François Pinard"
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, c-format
 msgid "%s (for regexp %s)"
 msgstr "%s (säännölliselle lausekkeelle %s)"
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
@@ -7920,7 +8023,7 @@ msgstr ""
 "Käyttö: %s [VALITSIN]... [SYÖTE]...   (ilman valitsinta -G)\n"
 "  tai:  %s -G [VALITSIN]... [SYÖTE [TULOSTE]]\n"
 
-#: src/ptx.c:1821
+#: src/ptx.c:1824
 #, fuzzy
 msgid ""
 "Output a permuted index, including context, of the words in the input "
@@ -7930,7 +8033,7 @@ msgstr ""
 "sanoista.\n"
 "\n"
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 #, fuzzy
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
@@ -7942,7 +8045,7 @@ msgstr ""
 "  -F, --flag-truncation=MJONO    käytä MJONOa rivinkatkaisujen "
 "merkitsemiseen\n"
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 #, fuzzy
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
@@ -7959,7 +8062,7 @@ msgstr ""
 "  -T, --format=tex               tuota tuloste TeX-käskyinä\n"
 
 # Osa on aika hämäriä.
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -7978,7 +8081,7 @@ msgstr ""
 "  -o, --only-file=TIEDOSTO       lue ainoiden sanojen luettelo tästä "
 "TIEDOSTOsta\n"
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -7990,17 +8093,16 @@ msgstr ""
 "  -w, --width=MÄÄRÄ              tulosteleveys sarakkeina, viite "
 "poistettuna\n"
 
-#: src/ptx.c:1854
+#: src/ptx.c:1857
 #, fuzzy
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
 "\n"
-"Jos TIEDOSTOA ei ole annettu, tai se on �-�, luetaan vakiosyötettä.\n"
-"Oletus on �-F /�.\n"
+"Jos TIEDOSTOa ei ole annettu, tai se on �-�, luetaan vakiosyötettä.\n"
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, fuzzy, c-format
 msgid "invalid gap width: %s"
 msgstr "virheellinen leveys: %s"
@@ -8019,22 +8121,28 @@ msgid ""
 "  -P, --physical  avoid all symlinks\n"
 msgstr ""
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+
+#: src/pwd.c:169
 #, c-format
 msgid "failed to chdir to %s"
 msgstr "siirtyminen hakemistoon %s epäonnistui"
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, fuzzy, c-format
 msgid "failed to stat %s"
 msgstr "tiedoston %s avaaminen epäonnistui"
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr ""
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, c-format
 msgid "ignoring non-option arguments"
 msgstr "jätetään huomiotta argumentit, jotka eivät ole valitsimia"
@@ -8045,8 +8153,8 @@ msgstr "jätetään huomiotta argumentit, jotka eivät ole valitsimia"
 msgid "Dmitry V. Levin"
 msgstr "Dmitry V. Levin"
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Käyttö: %s [VALITSIN]... TIEDOSTO...\n"
@@ -8084,8 +8192,7 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 "  -f, --canonicalize      muunna symlinkki vakiomuotoon seuraamalla annetun\n"
 "                          polun jokaista symlinkkiä rekursiivisesti\n"
@@ -8115,7 +8222,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 
@@ -8133,41 +8240,42 @@ msgstr "%s: edetäänkö kirjoitussuojattuun hakemistoon %s? "
 msgid "%s: descend into directory %s? "
 msgstr "%s: edetäänkö hakemistoon %s? "
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr "%s: poistetaanko kirjoitussuojattu %s %s? "
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, c-format
 msgid "%s: remove %s %s? "
 msgstr "%s: poistetaanko %s %s? "
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, c-format
 msgid "removed directory: %s\n"
 msgstr "poistettiin hakemisto: %s\n"
 
-#: src/remove.c:444
+#: src/remove.c:447
 #, fuzzy, c-format
-msgid "cannot remove directory: %s"
+msgid "refusing to remove %s or %s directory: skipping %s"
 msgstr "hakemiston %s poistaminen ei onnistu"
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr "ohitetaan %s, koska se on toisella laitteella"
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, fuzzy, c-format
 msgid "traversal failed: %s"
 msgstr "lukeminen epäonnistui"
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -8192,12 +8300,12 @@ msgstr ""
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 
 #: src/rm.c:149
@@ -8260,14 +8368,18 @@ msgstr ""
 "shred-komentoa.\n"
 
 #: src/rm.c:342
-#, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] "%s: poistetaanko %s %s? "
+msgstr[1] "%s: poistetaanko %s %s? "
 
-#: src/rm.c:343
+#: src/rm.c:345
 #, fuzzy, c-format
-msgid "%s: remove all arguments? "
-msgstr "%s: poistetaanko %s %s? "
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] "%s: poistetaanko %s %s? "
+msgstr[1] "%s: poistetaanko %s %s? "
 
 #: src/rmdir.c:134 src/rmdir.c:233
 #, c-format
@@ -8321,7 +8433,7 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
 
@@ -8371,41 +8483,46 @@ msgstr ""
 msgid "no command specified"
 msgstr "prosessi-ID:tä ei ole annettu"
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr ""
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, fuzzy, c-format
 msgid "failed to compute a new context"
 msgstr "tiedoston %s avaaminen epäonnistui"
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, fuzzy, c-format
 msgid "failed to set new user %s"
 msgstr "tiedoston %s avaaminen epäonnistui"
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, fuzzy, c-format
 msgid "failed to set new type %s"
 msgstr "tiedoston %s avaaminen epäonnistui"
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, fuzzy, c-format
 msgid "failed to set new range %s"
 msgstr "tiedoston %s avaaminen epäonnistui"
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, fuzzy, c-format
 msgid "failed to set new role %s"
 msgstr "tiedoston %s avaaminen epäonnistui"
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, fuzzy, c-format
 msgid "unable to set security context %s"
 msgstr "tiedoston %s oikeuksien palauttaminen ei onnistu"
 
+#: src/selinux.c:127 src/selinux.c:300
+#, fuzzy, c-format
+msgid "error canonicalizing %s"
+msgstr "virhe luettaessa tiedostoa %s"
+
 #: src/seq.c:68
 #, c-format
 msgid ""
@@ -8441,6 +8558,8 @@ msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
@@ -8455,94 +8574,34 @@ msgstr ""
 "Jos MUOTO annetaan, sen on sisällettävä tasan yksi\n"
 "printf-tyylisistä liukulukuesityksistä %e, %f, %g\n"
 
-#: src/seq.c:94
+#: src/seq.c:96
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
 "it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n"
 "decimal numbers with maximum precision PREC, and to %g otherwise.\n"
 msgstr ""
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, c-format
 msgid "invalid floating point argument: %s"
 msgstr "virheellinen liukulukuargumentti: %s"
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, fuzzy, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr "tiedostolla %s on tuntematon tiedostotyyppi"
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr "muotoilua ei voi määritellä kun tulostetaan tasalevyisiä lukuja"
 
-#: src/setuidgid.c:49
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-"Käyttö: %s KÄYTTÄJÄNIMI KOMENTO [ARGUMENTTI]...\n"
-"  tai:  %s VALITSIN\n"
-
-#: src/setuidgid.c:55
-#, fuzzy
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-"Poista käytöstä mahdolliset lisäryhmät, aseta käyttäjä- ja ryhmä-ID\n"
-"annetun KÄYTTÄJÄNIMEn perusteella, ja suorita KOMENTO annetuilla\n"
-"ARGUMENTeilla. Poistu paluuarvolla 111, jos käyttäjä- ja ryhmä-ID:n\n"
-"asetus ei onnistu. Muussa tapauksessa poistutaan KOMENNOn paluuarvolla.\n"
-"Tämä ohjelma on käyttökelpoinen vain pääkäyttäjän (käyttäjä-ID 0)\n"
-"suorittamana.\n"
-"\n"
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr "tuntematon käyttäjä-ID: %s"
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr ""
-
-#: src/setuidgid.c:190
-#, fuzzy, c-format
-msgid "failed to set supplemental group(s)"
-msgstr "lisäryhmän asetus ei onnistu"
-
-#: src/setuidgid.c:200
-#, fuzzy, c-format
-msgid "cannot set group-ID to %lu"
-msgstr "ryhmä-ID:n asetus arvoon %ld ei onnistu"
-
-#: src/setuidgid.c:204
-#, fuzzy, c-format
-msgid "cannot set user-ID to %lu"
-msgstr "käyttäjä-ID:n asetus arvoon %ld ei onnistu"
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr "Colin Plumb"
 
-#: src/shred.c:148
+#: src/shred.c:170
 #, fuzzy
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
@@ -8552,7 +8611,7 @@ msgstr ""
 "palauttaminen olisi vaikeampaa jopa hyvin kalliilla laitteilla.\n"
 "\n"
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, fuzzy, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -8565,10 +8624,10 @@ msgstr ""
 "  -s, --size=N   silppua näin monta tavua (jälkiliitteet kuten K, M,\n"
 "                   G hyväksytään)\n"
 
-#: src/shred.c:161
+#: src/shred.c:183
 #, fuzzy
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
@@ -8581,15 +8640,20 @@ msgstr ""
 "  -z, --zero     ylikirjoita lopuksi nollia silppuamisen kätkemiseksi\n"
 "  -              silppua vakiotuloste\n"
 
-#: src/shred.c:170
+#: src/shred.c:192
+#, fuzzy
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 "\n"
@@ -8602,7 +8666,7 @@ msgstr ""
 "yleensä käsiteltäessä tavallisia tiedostoja.\n"
 "\n"
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -8622,7 +8686,7 @@ msgstr ""
 "toimintatiloissa:\n"
 "\n"
 
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -8644,7 +8708,7 @@ msgstr ""
 "  Appliancen NFS-palvelin\n"
 "\n"
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -8658,7 +8722,7 @@ msgstr ""
 "* tiivistetyt tiedostojärjestelmät\n"
 "\n"
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -8670,7 +8734,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:215
+#: src/shred.c:241
 #, fuzzy
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
@@ -8686,127 +8750,127 @@ msgstr ""
 "tiedostosta kopioita, joita ei voida poistaa, ja jotka mahdollistavat\n"
 "silputun tiedoston palauttamisen myöhemmin.\n"
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, c-format
 msgid "%s: fdatasync failed"
 msgstr "%s: fdatasync epäonnistui"
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr "%s: fsync epäonnistui"
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr "%s: taaksepäin siirtyminen ei onnistu"
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr "%s: ylikirjoituskerta %lu/%lu (%s)..."
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, c-format
 msgid "%s: error writing at offset %s"
 msgstr "%s: virhe kirjoitettaessa siirtymässä %s"
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s: lseek epäonnistui"
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, c-format
 msgid "%s: file too large"
 msgstr "%s: tiedosto on liian suuri"
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr "%s: ylikirjoituskerta %lu/%lu (%s)...%s"
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr "%s: ylikirjoituskerta %lu/%lu (%s)...%s/%s %d%%"
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, c-format
 msgid "%s: fstat failed"
 msgstr "%s: fstat epäonnistui"
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, c-format
 msgid "%s: invalid file type"
 msgstr "%s: virheellinen tiedostotyyppi"
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr "%s: tiedoston koko on negatiivinen"
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, c-format
 msgid "%s: error truncating"
 msgstr "%s: virhe typistettäessä"
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, c-format
 msgid "%s: fcntl failed"
 msgstr "%s: fcntl epäonnistui"
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr "%s: vain lisäykseen soveltuvaa tiedostokahvaa ei voi silputa"
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr "%s: poistetaan"
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, c-format
 msgid "%s: renamed to %s"
 msgstr "%s: nimettiin uudelleen nimelle %s"
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, c-format
 msgid "%s: failed to remove"
 msgstr "%s: poisto epäonnistui"
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr "%s: poistettu"
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, c-format
 msgid "%s: failed to close"
 msgstr "%s: sulkeminen epäonnistui"
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, c-format
 msgid "%s: failed to open for writing"
 msgstr "%s: avaaminen kirjoitustilassa epäonnistui"
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, c-format
 msgid "%s: invalid number of passes"
 msgstr "%s: virheellinen ylikirjoituskertojen määrä"
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, fuzzy, c-format
 msgid "multiple random sources specified"
 msgstr "useita tulostusmuotoja annettu"
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, c-format
 msgid "%s: invalid file size"
 msgstr "%s: virheellinen tiedostokoko"
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -8817,14 +8881,14 @@ msgstr ""
 "  tai:  %s [VALITSIN]... ALKU LOPPU\n"
 "  tai:  %s [VALITSIN]... ALKU LISÄYS LOPPU\n"
 
-#: src/shuf.c:54
+#: src/shuf.c:67
 #, fuzzy
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr ""
 "Kirjoita kaikkien TIEDOSTO(jen) yhdistelmä lajiteltuna vakiotulosteeseen.\n"
 "\n"
 
-#: src/shuf.c:60
+#: src/shuf.c:73
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
 "  -i, --input-range=LO-HI   treat each number LO through HI as an input "
@@ -8832,34 +8896,44 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
 msgstr ""
 
-#: src/shuf.c:244
+#: src/shuf.c:228
+#, fuzzy, c-format
+msgid "too many input lines"
+msgstr "liian monta argumenttia"
+
+#: src/shuf.c:431
 #, fuzzy, c-format
 msgid "multiple -i options specified"
 msgstr "useita -l tai -t -valitsimia annettu"
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, fuzzy, c-format
 msgid "invalid input range %s"
 msgstr "virheellinen leveys: %s"
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, fuzzy, c-format
 msgid "invalid line count %s"
 msgstr "virheellinen rivileveys: %s"
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, c-format
 msgid "multiple output files specified"
 msgstr "useita tulostiedostoja annettu"
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, c-format
 msgid "cannot combine -e and -i options"
 msgstr "valitsimia -e ja -i ei voi käyttää yhdessä"
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr ""
+
 #: src/sleep.c:44
 #, fuzzy, c-format
 msgid ""
@@ -8881,24 +8955,24 @@ msgstr ""
 "mielivaltainen liukuluku.\n"
 "\n"
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, c-format
 msgid "invalid time interval %s"
 msgstr "ajanjakso ei kelpaa: %s"
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr "tosiaikaisen kellon luku ei onnistu"
 
-#: src/sort.c:399
+#: src/sort.c:427
 #, fuzzy
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr ""
 "Kirjoita kaikkien TIEDOSTO(jen) yhdistelmä lajiteltuna vakiotulosteeseen.\n"
 "\n"
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
@@ -8906,7 +8980,7 @@ msgstr ""
 "Lajitteluvalitsimet:\n"
 "\n"
 
-#: src/sort.c:409
+#: src/sort.c:437
 #, fuzzy
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
@@ -8919,19 +8993,19 @@ msgstr ""
 "merkkien mukaan\n"
 "  -f, --ignore-case           älä huomioi kirjainkokoa\n"
 
-#: src/sort.c:415
+#: src/sort.c:443
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
 "  -i, --ignore-nonprinting    consider only printable characters\n"
 "  -M, --month-sort            compare (unknown) < 'JAN' < ... < 'DEC'\n"
 msgstr ""
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 
-#: src/sort.c:423
+#: src/sort.c:451
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
 "  -R, --random-sort           sort by random hash of keys\n"
@@ -8939,7 +9013,7 @@ msgid ""
 "  -r, --reverse               reverse the result of comparisons\n"
 msgstr ""
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -8949,7 +9023,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/sort.c:437
+#: src/sort.c:465
 #, fuzzy
 msgid ""
 "Other options:\n"
@@ -8958,13 +9032,13 @@ msgstr ""
 "Lajitteluvalitsimet:\n"
 "\n"
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
 msgstr ""
 
-#: src/sort.c:445
+#: src/sort.c:473
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
 "  -C, --check=quiet, --check=silent  like -c, but do not report first bad "
@@ -8973,7 +9047,7 @@ msgid ""
 "                              decompress them with PROG -d\n"
 msgstr ""
 
-#: src/sort.c:452
+#: src/sort.c:480
 #, fuzzy
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
@@ -8985,13 +9059,13 @@ msgstr ""
 "  -L, --max-line-length  näytä pisimmän rivin pituus\n"
 "  -w, --words            näytä sanamäärät\n"
 
-#: src/sort.c:459
+#: src/sort.c:487
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
 "  -m, --merge               merge already sorted files; do not sort\n"
 msgstr ""
 
-#: src/sort.c:463
+#: src/sort.c:491
 #, fuzzy
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
@@ -9011,7 +9085,7 @@ msgstr ""
 "�viimeinen oljenkorsi�-vertailu\n"
 "  -S, --buffer-size=KOKO    käytä KOKOa muistipuskurille\n"
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, fuzzy, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -9036,11 +9110,7 @@ msgstr ""
 "                              ilman -c:tä: tulosta vain ensimmäinen\n"
 "                              yhtäläisten joukosta\n"
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr "  -z, --zero-terminated     päätä rivit 0-tavuun, ei rivinvaihtoon\n"
-
-#: src/sort.c:483
+#: src/sort.c:511
 #, fuzzy
 msgid ""
 "\n"
@@ -9067,7 +9137,7 @@ msgstr ""
 "\n"
 "KOKOon voi liittää kertoimen:\n"
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -9086,260 +9156,245 @@ msgstr ""
 "lajittelujärjestykseen. Asettamalla LC_ALL=C otetaan käyttöön\n"
 "perinteinen lajittelujärjestys, joka käyttää tavujen arvoja.\n"
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, fuzzy, c-format
 msgid "waiting for %s [-d]"
 msgstr "kirjoitetaan tiedostoon %s"
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr ""
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, fuzzy, c-format
 msgid "cannot create temporary file in %s"
 msgstr "väliaikaistiedoston %s luominen ei onnistu"
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr "avaaminen epäonnistui"
 
-#: src/sort.c:970
+#: src/sort.c:998
 msgid "fflush failed"
 msgstr "puskurin tyhjennys epäonnistui"
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr "sulkeminen epäonnistui"
 
-#: src/sort.c:986
-#, c-format
-msgid "dup2 failed"
-msgstr "dup2 epäonnistui"
-
-#: src/sort.c:1103
-#, c-format
-msgid "couldn't execute %s"
-msgstr ""
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 #, fuzzy
 msgid "couldn't create temporary file"
 msgstr "väliaikaistiedoston luominen ei onnistu"
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, fuzzy, c-format
 msgid "couldn't create process for %s -d"
 msgstr "hakemiston %s luominen ei onnistu"
 
-#: src/sort.c:1161
-#, c-format
-msgid "couldn't execute %s -d"
-msgstr ""
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, c-format
 msgid "warning: cannot remove: %s"
 msgstr "varoitus: ei voida poistaa: %s"
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, fuzzy, c-format
 msgid "invalid --%s argument %s"
 msgstr "virheellinen argumentti %s"
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, fuzzy, c-format
 msgid "minimum --%s argument is %s"
 msgstr "argumentti �%s� ei kelpaa"
 
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, fuzzy, c-format
 msgid "--%s argument %s too large"
 msgstr "%s: lukumäärä �%.*s� on liian suuri"
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, fuzzy, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr "argumentti �%s� ei kelpaa"
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr ""
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr "tiedoston tilan lukeminen epäonnistui"
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr "lukeminen epäonnistui"
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, fuzzy, c-format
 msgid "string transformation failed"
 msgstr "merkkijonovertailu epäonnistui"
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, c-format
 msgid "the untransformed string was %s"
 msgstr ""
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr ""
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr ""
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr ""
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr ""
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr ""
 
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, fuzzy, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
-msgstr[0] "%s: valitsin �-W %s� ei ole yksiselitteinen\n"
-msgstr[1] "%s: valitsin �-W %s� ei ole yksiselitteinen\n"
+msgstr[0] "%s: valitsin �%s� ei ole yksiselitteinen\n"
+msgstr[1] "%s: valitsin �%s� ei ole yksiselitteinen\n"
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr ""
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr "kirjoitus epäonnistui"
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr "%s: %s:%s: epäjärjestys: "
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr "vakiovirhe"
 
-#: src/sort.c:3698
+#: src/sort.c:3738
 #, fuzzy
 msgid "cannot read"
 msgstr "%s: taaksepäin siirtyminen ei onnistu"
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, c-format
 msgid "%s: invalid field specification %s"
 msgstr "%s: virheellinen kenttämääritys %s"
 
-#: src/sort.c:3987
-#, fuzzy, c-format
+#: src/sort.c:4028
+#, c-format
 msgid "options '-%s' are incompatible"
-msgstr "%s: valitsin �-W %s� ei ole yksiselitteinen\n"
+msgstr ""
 
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, c-format
 msgid "%s: invalid count at start of %s"
 msgstr "%s: virheellinen määrä merkkijonon %s alussa"
 
-#: src/sort.c:4295
+#: src/sort.c:4336
 #, fuzzy
 msgid "invalid number after '-'"
 msgstr "virheellinen lukuarvo merkin �-� jälkeen"
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 #, fuzzy
 msgid "invalid number after '.'"
 msgstr "virheellinen lukuarvo merkin �.� jälkeen"
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr "outo merkki kenttämäärityksessä"
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, fuzzy, c-format
 msgid "multiple compress programs specified"
 msgstr "useita tulostusmuotoja annettu"
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
 msgstr "virheellinen lukuarvo kentän alussa"
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
 msgstr "kentän numero on nolla"
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr "merkin siirtymä on nolla"
 
-#: src/sort.c:4407
+#: src/sort.c:4448
 #, fuzzy
 msgid "invalid number after ','"
 msgstr "virheellinen lukuarvo merkin �,� jälkeen"
 
 # Tarkoitetaanko tässä sarkainta?
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr "tyhjä sarkain"
 
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, fuzzy, c-format
 msgid "cannot read file names from %s"
 msgstr "tiedostonimiä %s ja %s ei voi vertailla"
 
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr "%s:%lu: virheellinen tyhjä tiedostonimi"
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, fuzzy, c-format
 msgid "no input from %s"
 msgstr "suljetaan syötetiedosto %s"
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr ""
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr ""
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, fuzzy, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr "ylimääräinen operandi %s ei ole sallittu valitsimen -c kanssa"
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr ""
 
-#: src/split.c:204
+#: src/split.c:203
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr "Käyttö: %s [VALITSIN]... [SYÖTE [ETULIITE]]\n"
 
-#: src/split.c:208
+#: src/split.c:207
 #, fuzzy
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
@@ -9352,32 +9407,25 @@ msgstr ""
 "Jos SYÖTEttä ei ole annettu tai se on �-�, luetaan vakiosyötettä.\n"
 "\n"
 
-#: src/split.c:216
-#, fuzzy, c-format
+#: src/split.c:215
+#, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
-"  -a, --suffix-length=N   käytä N merkin pituisia jälkiliitteitä (oletus "
-"%d)\n"
-"  -b, --bytes=KOKO        kirjoita KOKO tavua yhteen tulostiedostoon\n"
-"  -C, --line-bytes=KOKO   kirjoita KOKO tavua rivejä yhteen tulostiedostoon\n"
-"  -d, --numeric-suffixes  käytä numeerisia jälkiliitteitä kirjaimien sijaan\n"
-"  -l, --lines=MÄÄRÄ       kirjoita MÄÄRÄ riviä yhteen tulostiedostoon\n"
 
-#: src/split.c:229
+#: src/split.c:228
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
 "                            output file is opened\n"
@@ -9385,7 +9433,7 @@ msgstr ""
 "      --verbose           näytä ilmoitus juuri ennen kunkin\n"
 "                            tulostiedoston avaamista\n"
 
-#: src/split.c:236
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -9397,189 +9445,189 @@ msgid ""
 "r/K/N   likewise but only output Kth of N to stdout\n"
 msgstr ""
 
-#: src/split.c:354
+#: src/split.c:353
 #, fuzzy, c-format
 msgid "output file suffixes exhausted"
 msgstr "Tulostiedostojen jälkiliitteet käytetty loppuun"
 
-#: src/split.c:366
+#: src/split.c:365
 #, c-format
 msgid "creating file %s\n"
 msgstr "luodaan tiedostoa %s\n"
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr ""
 
-#: src/split.c:391
+#: src/split.c:390
 #, fuzzy, c-format
 msgid "failed to set FILE environment variable"
 msgstr "tiedoston %s ryhmän vaihtaminen arvoon %s epäonnistui\n"
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr ""
 
-#: src/split.c:395
+#: src/split.c:394
 #, fuzzy, c-format
 msgid "failed to create pipe"
 msgstr "tiedoston %s avaaminen epäonnistui"
 
-#: src/split.c:409
+#: src/split.c:408
 #, fuzzy, c-format
 msgid "closing prior pipe"
 msgstr "suljetaan hakemisto %s"
 
-#: src/split.c:411
+#: src/split.c:410
 #, fuzzy, c-format
 msgid "closing output pipe"
 msgstr "suljetaan tulostiedosto %s"
 
-#: src/split.c:415
+#: src/split.c:414
 #, fuzzy, c-format
 msgid "moving input pipe"
 msgstr "suljetaan syötetiedosto %s"
 
-#: src/split.c:417
+#: src/split.c:416
 #, fuzzy, c-format
 msgid "closing input pipe"
 msgstr "suljetaan syötetiedosto %s"
 
-#: src/split.c:422
+#: src/split.c:421
 #, fuzzy, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr "komentoa %s ei voi ajaa"
 
-#: src/split.c:428
+#: src/split.c:427
 #, fuzzy, c-format
 msgid "failed to close input pipe"
 msgstr "hakemiston %s sulkeminen epäonnistui"
 
-#: src/split.c:464
+#: src/split.c:463
 #, fuzzy, c-format
 msgid "waiting for child process"
 msgstr "odotettaessa strip-ohjelman päättymistä"
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr ""
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr ""
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr ""
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr "voidaan jakaa vain yhdellä tavalla"
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, fuzzy, c-format
 msgid "%s: invalid number of chunks"
 msgstr "%s: virheellinen sekuntimäärä"
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, fuzzy, c-format
 msgid "%s: invalid chunk number"
 msgstr "%s: virheellinen luku"
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr "%s: virheellinen jälkiliitteen pituus"
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr "%s: virheellinen tavumäärä"
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr "%s: virheellinen rivimäärä"
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, c-format
 msgid "line count option -%s%c... is too large"
 msgstr "rivimäärävalitsin -%s%c... on liian suuri"
 
-#: src/split.c:1248
+#: src/split.c:1298
 #, fuzzy, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr "virheellinen aloitusrivin numero: %s"
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, fuzzy, c-format
 msgid "%s: invalid IO block size"
 msgstr "%s: virheellinen tiedostokoko"
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr ""
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr ""
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, fuzzy, c-format
 msgid "%s: cannot determine file size"
 msgstr "järjestelmän konenimen määritys ei onnistu"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr "Michael Meskes"
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, fuzzy, c-format
 msgid "failed to canonicalize %s"
 msgstr "tiedoston %s avaaminen epäonnistui"
 
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, fuzzy, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr "varoitus: tunnistamaton suojaus �\\%c�"
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, c-format
 msgid "%s: invalid directive"
 msgstr "%s: säännös ei kelpaa"
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, c-format
 msgid "warning: backslash at end of format"
 msgstr "varoitus: kenoviiva muotoilun lopussa"
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr ""
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, c-format
 msgid "cannot read file system information for %s"
 msgstr "tiedostojärjestelmän tietojen lukeminen tiedostolle %s ei onnistu"
 
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, fuzzy, c-format
 msgid "cannot stat standard input"
 msgstr "suljetaan vakiosyöte"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -9590,7 +9638,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -9598,30 +9646,30 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, fuzzy, c-format
 msgid "Context: %C\n"
 msgstr "virheelliset oikeudet: %s"
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -9629,11 +9677,11 @@ msgid ""
 " Birth: %w\n"
 msgstr ""
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
 msgstr ""
 
-#: src/stat.c:1356
+#: src/stat.c:1418
 #, fuzzy
 msgid ""
 "  -L, --dereference     follow links\n"
@@ -9645,14 +9693,14 @@ msgstr ""
 "  -f, --file-system      näytä tiedostojärjestelmän tila tiedoston tilan "
 "sijaan\n"
 
-#: src/stat.c:1360
+#: src/stat.c:1422
 #, fuzzy
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 "  -c  --format=MUOTO    käytä annettua MUOTOa oletusmuodon sijaan;\n"
@@ -9663,7 +9711,7 @@ msgstr ""
 "                          Rivinvaihdon saa lisäämällä MUOTOon merkintä \\n.  "
 "-t, --terse           tulosta tiedot lyhyessä muodossa\n"
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 #, fuzzy
 msgid ""
 "\n"
@@ -9683,7 +9731,7 @@ msgstr ""
 "  %b   Varattujen lohkojen määrä (katso myös %B)\n"
 "  %B   Kunkin �%b�:n ilmoittaman lohkon koko tavuina\n"
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 #, fuzzy
 msgid ""
 "  %d   device number in decimal\n"
@@ -9700,7 +9748,7 @@ msgstr ""
 "  %G   Omistajan ryhmän nimi\n"
 "  %g   Omistajan ryhmä-ID\n"
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 #, fuzzy
 msgid ""
 "  %h   number of hard links\n"
@@ -9710,8 +9758,8 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 "  %h   Kovien linkkien määrä\n"
 "  %i   I-solmunumero\n"
@@ -9723,7 +9771,7 @@ msgstr ""
 "  %t   Major-laitetyyppi heksadesimaalimuodossa\n"
 "  %T   Minor-laitetyyppi heksadesimaalimuodossa\n"
 
-#: src/stat.c:1399
+#: src/stat.c:1461
 #, fuzzy
 msgid ""
 "  %u   user ID of owner\n"
@@ -9732,10 +9780,10 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 "  %u   Omistajan käyttäjä-ID\n"
@@ -9748,7 +9796,7 @@ msgstr ""
 "  %Z   Viimeisen ominaisuusmuutoksen ajankohta sekunteina vuoden epookista\n"
 "\n"
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 #, fuzzy
 msgid ""
 "Valid format sequences for file systems:\n"
@@ -9767,7 +9815,7 @@ msgstr ""
 "  %d   Tiedostojärjestelmän vapaiden tiedostosolmujen määrä\n"
 "  %f   Tiedostojärjestelmän vapaiden lohkojen määrä\n"
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 #, fuzzy
 msgid ""
 "  %i   file system ID in hex\n"
@@ -9840,22 +9888,27 @@ msgid ""
 "and are thus unaffected by 'stdbuf' settings.\n"
 msgstr ""
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, fuzzy, c-format
 msgid "failed to find %s"
 msgstr "tiedoston %s avaaminen epäonnistui"
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, fuzzy, c-format
 msgid "failed to update the environment with %s"
 msgstr "tiedoston %s ryhmän vaihtaminen arvoon %s epäonnistui\n"
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr ""
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, fuzzy, c-format
+msgid "you must specify a buffering mode option"
+msgstr "tiedoston %s ryhmän vaihtaminen arvoon %s epäonnistui\n"
+
+#: src/stty.c:516
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -9866,11 +9919,11 @@ msgstr ""
 "  tai:  %s [-F LAITE] [--file=LAITE] [-a|--all]\n"
 "  tai:  %s [-F LAITE] [--file=LAITE] [-g|--save]\n"
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
 msgstr ""
 
-#: src/stty.c:525
+#: src/stty.c:528
 #, fuzzy
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
@@ -9885,7 +9938,7 @@ msgstr ""
 "  -F, --file=LAITE   avaa ja ota käyttöön määrätty LAITE vakiosyötteen "
 "sijaan\n"
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
@@ -9895,7 +9948,7 @@ msgstr ""
 "Valinnainen �-� ennen ASETUSta tarkoittaa vastakohtaa. Ei-POSIX-asetukset\n"
 "on merkitty *:lla. Käytettävissä olevat asetukset riippuvat alustasta.\n"
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -9909,7 +9962,7 @@ msgstr ""
 "   eof MERKKI      MERKKI lähettää tiedostonlopetuksen (syöte päättyy)\n"
 "   eol MERKKI      MERKKI päättää rivin\n"
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -9921,7 +9974,7 @@ msgstr ""
 "   intr MERKKI     MERKKI lähettää keskeytyssignaalin\n"
 "   kill MERKKI     MERKKI pyyhkii käsillä olevan rivin\n"
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -9933,7 +9986,7 @@ msgstr ""
 " * rprnt MERKKI    MERKKI uudistaa käsillä olevan rivin\n"
 "   start MERKKI    MERKKI käynnistää tulosteen uudelleen pysäytettyään sen\n"
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -9945,7 +9998,7 @@ msgstr ""
 " * swtch MERKKI    MERKKI vaihtaa toiselle kuoren tasolle\n"
 " * werase MERKKI   MERKKI pyyhkii viimeisimmän kirjoitetun sanan\n"
 
-#: src/stty.c:562
+#: src/stty.c:565
 #, fuzzy
 msgid ""
 "\n"
@@ -9960,7 +10013,7 @@ msgstr ""
 " * cols N        kerro ytimelle, että päätteen leveys on N merkkiä\n"
 " * columns N     kuten cols N\n"
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -9973,7 +10026,7 @@ msgstr ""
 "   min N         kun myös -icanon, aseta valmiin luvun merkkiminimiksi N\n"
 "   ospeed N      aseta tulostenopeudeksi N\n"
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -9987,7 +10040,7 @@ msgstr ""
 "   time N        kun myös -icanon, aseta luvun aikarajaksi N "
 "kymmenesosasekuntia\n"
 
-#: src/stty.c:581
+#: src/stty.c:584
 #, fuzzy
 msgid ""
 "\n"
@@ -10005,7 +10058,7 @@ msgstr ""
 " * [-]crtscts    ota RTS/CTS-kättely käyttöön\n"
 "   csN           aseta merkkikooksi N bittiä, N välillä [5..8]\n"
 
-#: src/stty.c:590
+#: src/stty.c:593
 #, fuzzy
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
@@ -10014,6 +10067,7 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 "   [-]cstopb     käytä kahta pysäytysbittiä per merkki (�-�:lla yksi)\n"
 "   [-]hup        lähetä sulkusignaali kun viimeinen prosessi sulkee tty:n\n"
@@ -10022,7 +10076,7 @@ msgstr ""
 "syötteessä\n"
 "   [-]parodd     aseta pariton pariteetti (myös �-�:lla)\n"
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -10038,7 +10092,7 @@ msgstr ""
 "   [-]ignbrk     jätä katkosmerkit huomiotta\n"
 "   [-]igncr      jätä vaununpalautus huomiotta\n"
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -10052,11 +10106,11 @@ msgstr ""
 "   [-]inpck      ota syötteen pariteettitarkistus käyttöön\n"
 "   [-]istrip     poista ylin (8:s) bitti syötteen merkeistä\n"
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr " * [-]iutf8      oleta syötemerkit UTF-8-koodatuiksi\n"
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -10072,7 +10126,7 @@ msgstr ""
 "   [-]parmrk     merkitse pariteettivirheet (255-0-merkkisarjalla)\n"
 "   [-]tandem     kuten [-]ixoff\n"
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -10088,10 +10142,11 @@ msgstr ""
 " * ffN           arkinsyötön viivetyyli, N välillä [0..1]\n"
 " * nlN           rivinvaihdon viivetyyli, N välillä [0..1]\n"
 
-#: src/stty.c:631
+#: src/stty.c:635
+#, fuzzy
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
@@ -10104,7 +10159,7 @@ msgstr ""
 " * [-]onlcr      muunna rivinvaihto vaununpalautus-rivinvaihdoksi\n"
 " * [-]onlret     rivinvaihto suorittaa vaununpalautuksen\n"
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -10120,7 +10175,7 @@ msgstr ""
 " * -tabs         sama kuin tab3\n"
 " * vtN           pystysarkaimen viivetyyli, N välillä [0..1]\n"
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -10135,7 +10190,7 @@ msgstr ""
 " * crtkill       hävitä koko rivi totellen echoprt- ja echoe-asetuksia\n"
 " * -crtkill      hävitä koko rivi totellen echoctl- ja echok-asetuksia\n"
 
-#: src/stty.c:654
+#: src/stty.c:658
 #, fuzzy
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
@@ -10150,7 +10205,7 @@ msgstr ""
 "   [-]echoe      sama kuin [-]crterase\n"
 "   [-]echok      toista rivinvaihto hävitysmerkin jälkeen\n"
 
-#: src/stty.c:661
+#: src/stty.c:665
 #, fuzzy
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
@@ -10166,7 +10221,7 @@ msgstr ""
 "   [-]icanon     ota erase, kill, werase, ja rprnt -erikoismerkit käyttöön\n"
 "   [-]iexten     ota ei-POSIX-erikoismerkit käyttöön\n"
 
-#: src/stty.c:668
+#: src/stty.c:672
 #, fuzzy
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
@@ -10183,7 +10238,7 @@ msgstr ""
 " * [-]tostop     pysäytä tausta-ajot, jotka yrittävät kirjoittaa päätteelle\n"
 " * [-]xcase      kun myös icanon, piilota isot kirjaimet �\\� -merkillä\n"
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -10197,7 +10252,7 @@ msgstr ""
 "   cbreak        sama kuin -icanon\n"
 "   -cbreak       sama kuin icanon\n"
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -10209,7 +10264,7 @@ msgstr ""
 "   -cooked       sama kuin raw\n"
 "   crt           sama kuin echoe echoctl echoke\n"
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -10223,7 +10278,7 @@ msgstr ""
 "   ek            erase ja kill -merkit oletusarvoihinsa\n"
 "   evenp         sama kuin parenb -parodd cs7\n"
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -10239,7 +10294,7 @@ msgstr ""
 "   nl            sama kuin -icrnl -onlcr\n"
 "   -nl           sama kuin icrnl -inlcr -igncr onlcr -ocrnl -onlret\n"
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -10253,7 +10308,7 @@ msgstr ""
 "   pass8         sama kuin -parenb -istrip cs8\n"
 "   -pass8        sama kuin parenb istrip cs7\n"
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -10265,7 +10320,7 @@ msgstr ""
 "                 -imaxbel -opost -isig -icanon -xcase min 1 time 0\n"
 "   -raw          sama kuin cooked\n"
 
-#: src/stty.c:716
+#: src/stty.c:720
 #, fuzzy
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
@@ -10282,7 +10337,7 @@ msgstr ""
 "                 -xcase -tostop -echoprt echoctl echoke, kaikki\n"
 "                 erikoismerkit oletusarvoihinsa.\n"
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -10297,12 +10352,12 @@ msgstr ""
 "0x37, 0177 tai 127; erikoisarvoja �^-� ja �undef� käytetään kun halutaan\n"
 "erikoismerkit pois käytöstä.\n"
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, c-format
 msgid "only one device may be specified"
 msgstr "vain yhden laitteen voi määritellä"
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
@@ -10311,43 +10366,43 @@ msgstr ""
 "valitsimet verbose ja stty-readable -tulostetyyleille\n"
 "ovat toisensa poissulkevat"
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr "tiloja ei voi asettaa, kun tulostetyyli on määriteltynä"
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr "%s: ei-estävän tilan uudelleenasetus ei onnistunut"
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, c-format
 msgid "invalid argument %s"
 msgstr "virheellinen argumentti %s"
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, c-format
 msgid "missing argument to %s"
 msgstr "%s vaatii argumentin"
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, fuzzy, c-format
 msgid "invalid line discipline %s"
 msgstr "virheellinen rivileveys: %s"
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr "%s: kaikkia pyydettyjä toimenpiteitä ei voida suorittaa"
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr "%s: ei kokotietoja tälle laitteelle"
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, c-format
 msgid "invalid integer argument %s"
 msgstr "kokonaislukuargumentti %s ei kelpaa"
@@ -10404,7 +10459,7 @@ msgstr "      --help     näytä tämä ohje ja poistu\n"
 msgid "      --version  output version information and exit\n"
 msgstr "      --version  tulosta versiotiedot ja poistu\n"
 
-#: src/system.h:544
+#: src/system.h:543
 #, fuzzy
 msgid ""
 "\n"
@@ -10412,15 +10467,15 @@ msgid ""
 msgstr ""
 "Pitkien valitsinten pakolliset argumentit ovat pakollisia myös lyhyille.\n"
 
-#: src/system.h:552
+#: src/system.h:551
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -10429,36 +10484,33 @@ msgid ""
 "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n"
 msgstr ""
 
-#: src/system.h:571
+#: src/system.h:570
 #, fuzzy, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
-msgstr ""
-"\n"
-"Ilmoita ohjelmistovioista (englanniksi) osoitteeseen\n"
-"<%s>.\n"
+"%s online help: <%s>\n"
+msgstr "Käyttö: %s\n"
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr ""
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr ""
 
-#: src/system.h:596
+#: src/system.h:591
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Lisätietoja komennolla �%s --help�.\n"
 
-#: src/system.h:628
+#: src/system.h:633
 #, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -10557,18 +10609,16 @@ msgstr ""
 
 #: src/tail.c:270
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
 
 #: src/tail.c:274
+#, fuzzy
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 "  -f, --follow[={name|descriptor}]\n"
@@ -10577,18 +10627,17 @@ msgstr ""
 "asia\n"
 "  -F                       sama kuin --follow=name --retry\n"
 
-#: src/tail.c:281
+#: src/tail.c:280
 #, fuzzy, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
 "  -n, --lines=N            tulosta viimeiset N riviä viimeisten %d sijaan\n"
 "      --max-unchanged-stats=N\n"
@@ -10599,14 +10648,12 @@ msgstr ""
 "                           poistettu (tämä on yleistä syrjäytettyjen\n"
 "                           lokitiedostojen kanssa)\n"
 
-#: src/tail.c:294
+#: src/tail.c:293
 #, fuzzy
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 "      --pid=PID            valitsimen -f kanssa, lopeta prosessin PID\n"
 "                           kuollessa\n"
@@ -10616,13 +10663,13 @@ msgstr ""
 "                           (oletus 1,0) toistojen välissä.\n"
 "  -v, --verbose            tulosta aina tiedostonimen sisältävät otsakkeet\n"
 
-#: src/tail.c:301
+#: src/tail.c:298
 #, fuzzy
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 "      --pid=PID            valitsimen -f kanssa, lopeta prosessin PID\n"
@@ -10633,7 +10680,7 @@ msgstr ""
 "                           (oletus 1,0) toistojen välissä.\n"
 "  -v, --verbose            tulosta aina tiedostonimen sisältävät otsakkeet\n"
 
-#: src/tail.c:310
+#: src/tail.c:307
 #, fuzzy
 msgid ""
 "\n"
@@ -10652,7 +10699,7 @@ msgstr ""
 "b 512, k 1024, m 1024².\n"
 "\n"
 
-#: src/tail.c:319
+#: src/tail.c:316
 #, fuzzy
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
@@ -10668,40 +10715,43 @@ msgstr ""
 "seurattavan nimisen tiedoston uudelleen säännöllisesti tarkistaakseen,\n"
 "onko jokin toinen ohjelma poistanut ja luonut sen uudelleen.\n"
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr "suljetaan %s (fd=%d)"
 
-#: src/tail.c:453
-#, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr "%s: siirtyminen suhteelliseen siirtymään %s ei onnistu"
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr "%s: siirtyminen siirtymään %s suhteessa loppuun ei onnistu"
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr ""
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
 "reverting to polling"
 msgstr ""
 
-#: src/tail.c:963
+# Joo, untailable on vähän hankala sana.
+#: src/tail.c:965
+#, fuzzy, c-format
+msgid "%s has been replaced with a symbolic link. giving up on this name"
+msgstr ""
+"%s on korvattu seuraamiskelvottamalla tiedostolla; luovutaan tämän tiedoston "
+"seuraamisesta"
+
+#: src/tail.c:980
 #, c-format
 msgid "%s has become inaccessible"
 msgstr "%s ei ole enää käytettävissä"
 
 # Joo, untailable on vähän hankala sana.
-#: src/tail.c:980
+#: src/tail.c:997
 #, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr ""
@@ -10709,129 +10759,135 @@ msgstr ""
 "seuraamisesta"
 
 # Joo, untailable on vähän hankala sana.
-#: src/tail.c:989
+#: src/tail.c:1006
 #, fuzzy, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr ""
 "%s on korvattu seuraamiskelvottamalla tiedostolla; luovutaan tämän tiedoston "
 "seuraamisesta"
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, c-format
 msgid "%s has become accessible"
 msgstr "%s on nyt käytettävissä"
 
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr "%s on ilmaantunut; seurataan uuden tiedoston loppua"
 
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr "%s on korvattu; seurataan uuden tiedoston loppua"
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr "%s: ei-estävän tilan muuttaminen ei onnistu"
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr "%s: tiedosto typistynyt"
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr "tiedostoja ei ole jäljellä"
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, fuzzy, c-format
 msgid "cannot watch parent directory of %s"
 msgstr "nykyisen hakemiston (%s) tilaa ei voi lukea"
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, fuzzy, c-format
 msgid "inotify resources exhausted"
 msgstr "Tulostiedostojen jälkiliitteet käytetty loppuun"
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, fuzzy, c-format
 msgid "cannot watch %s"
 msgstr "tiedostoa %s ei voi koskettaa"
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr ""
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, fuzzy, c-format
 msgid "error reading inotify event"
 msgstr "virhe luettaessa tiedostoa %s"
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr ""
 "%s: tämän tyyppisen tiedoston loppua ei voi seurata; luovutaan tämän "
 "tiedoston seuraamisesta"
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, fuzzy, c-format
 msgid "number in %s is too large"
 msgstr "kenttänumero %s on liian suuri"
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr ""
 "%s: virheellinen avausten välinen muuttumattomien tilan lukemisten "
 "enimmäismäärä"
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr "%s: virheellinen PID"
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr "%s: virheellinen sekuntimäärä"
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr ""
 
-#: src/tail.c:2034
+#: src/tail.c:2096
 #, fuzzy, c-format
-msgid "warning: --retry is useful mainly when following by name"
-msgstr "varoitus: --retry toimii vain seurattaessa nimen perusteella"
+msgid "warning: --retry ignored; --retry is useful only when following"
+msgstr ""
+"warning: ei huomioida PID:tä; --pid=PID on käyttökelpoinen vain seurattaessa"
 
-#: src/tail.c:2038
+#: src/tail.c:2100
+#, c-format
+msgid "warning: --retry only effective for the initial open"
+msgstr ""
+
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
 msgstr ""
 "warning: ei huomioida PID:tä; --pid=PID on käyttökelpoinen vain seurattaessa"
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr "varoitus: --pid=PID ei ole tuettu tässä järjestelmässä"
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, c-format
 msgid "cannot follow %s by name"
 msgstr "tiedostoa %s ei voi seurata nimen perusteella"
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr "varoitus: vakiosyötteen seuraaminen ikuisesti on tehotonta"
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr ""
@@ -11112,17 +11168,17 @@ msgstr "ylimääräinen argumentti %s"
 msgid "warning: sigprocmask"
 msgstr ""
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr ""
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr ""
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
@@ -11131,32 +11187,31 @@ msgstr ""
 "Käyttö: %s KÄYTTÄJÄNIMI KOMENTO [ARGUMENTTI]...\n"
 "  tai:  %s VALITSIN\n"
 
-#: src/timeout.c:229
+#: src/timeout.c:232
 #, fuzzy
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
 msgstr ""
 "Pitkien valitsinten pakolliset argumentit ovat pakollisia myös lyhyille.\n"
 
-#: src/timeout.c:235
+#: src/timeout.c:238
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 msgid ""
 "\n"
 "DURATION is a floating point number with an optional suffix:\n"
@@ -11164,7 +11219,7 @@ msgid ""
 "days.\n"
 msgstr ""
 
-#: src/timeout.c:259
+#: src/timeout.c:262
 msgid ""
 "\n"
 "If the command times out, and --preserve-status is not set, then exit with\n"
@@ -11175,17 +11230,17 @@ msgid ""
 "case the exit status is 128+9 rather than 124.\n"
 msgstr ""
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr ""
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, fuzzy, c-format
 msgid "error waiting for command"
 msgstr "virhe kirjoitettaessa tiedostoa %s"
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr ""
@@ -11575,7 +11630,7 @@ msgstr ""
 #: src/truncate.c:115
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 
 #: src/truncate.c:121
@@ -11661,12 +11716,12 @@ msgstr ""
 "vakiosyötettä.\n"
 "\n"
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr "%s: syöte sisältää parittoman määrän symboleja"
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr "%s: syöte sisältää silmukan:"
@@ -11768,12 +11823,12 @@ msgstr ""
 msgid "tab stop value is too large"
 msgstr "sarkainasetin %s on liian suuri"
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr "Käyttö: %s [VALITSIN]... [SYÖTE [TULOSTE]]\n"
 
-#: src/uniq.c:138
+#: src/uniq.c:174
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
 "writing to OUTPUT (or standard output).\n"
@@ -11781,40 +11836,45 @@ msgid ""
 "With no options, matching lines are merged to the first occurrence.\n"
 msgstr ""
 
-#: src/uniq.c:147
+#: src/uniq.c:183
+#, fuzzy
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
 msgstr ""
 "  -c, --count           liitä rivin eteen sen esiintymiskertojen määrä\n"
 "  -d, --repeated        tulosta vain useaan kertaan esiintyvät rivit\n"
 
-#: src/uniq.c:151
-#, fuzzy
+#: src/uniq.c:187
+msgid ""
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
+msgstr ""
+
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr ""
+
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
+msgstr ""
+
+#: src/uniq.c:199
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
 "  -i, --ignore-case     ignore differences in case when comparing\n"
 "  -s, --skip-chars=N    avoid comparing the first N characters\n"
 "  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
-msgstr ""
-"  -D, --all-repeated[=erotustapa] tulosta kaikki vähintään kahteen kertaan\n"
-"                          esiintyvät rivit\n"
-"                        erotustapa={none(oletus),prepend,separate}\n"
-"                        Erotus tehdään tyhjillä riveillä.\n"
-"  -f, --skip-fields=N   älä vertaa N:ää ensimmäistä kenttää\n"
-"  -i, --ignore-case     älä huomioi kirjainkokoa vertaillessa\n"
-"  -s, --skip-chars=N    älä vertaa N:ää ensimmäistä merkkiä\n"
-"  -u, --unique          tulosta vain ainutkertaiset rivit\n"
-
-#: src/uniq.c:161
+msgstr ""
+
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr "  -w, --check-chars=N   vertaa vain rivien N:ää ensimmäistä merkkiä\n"
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 #, fuzzy
 msgid ""
 "\n"
@@ -11825,7 +11885,7 @@ msgstr ""
 "Kenttä on joukko tyhjeitä, joita seuraa joukko ei-tyhjeitä.\n"
 "Kentät ohitetaan ennen merkkejä.\n"
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 msgid ""
 "\n"
 "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n"
@@ -11833,24 +11893,36 @@ msgid ""
 "Also, comparisons honor the rules specified by 'LC_COLLATE'.\n"
 msgstr ""
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, fuzzy, c-format
 msgid "too many repeated lines"
 msgstr "liian monta argumenttia"
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
 msgstr "virheellinen ohitettavien kenttien määrä"
 
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
 msgstr "virheellinen ohitettavien tavujen määrä"
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
 msgstr "virheellinen verrattavien tavujen määrä"
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr ""
+
+#: src/uniq.c:652
+#, fuzzy, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr ""
+"kaikkien vähintään kahteen kertaan esiintyvien rivien ja esiintymiskertojen "
+"määrän tulostaminen on merkityksetöntä"
+
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr ""
@@ -11874,11 +11946,6 @@ msgstr ""
 "Kutsu unlink-funktiota annetun TIEDOSTOn poistamiseksi.\n"
 "\n"
 
-#: src/unlink.c:86
-#, c-format
-msgid "cannot unlink %s"
-msgstr "tiedoston %s linkitystä ei voi poistaa"
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -11923,7 +11990,7 @@ msgstr[1] "%lu käyttäjää"
 msgid ",  load average: %.2f"
 msgstr ", keskimääräinen kuorma: %.2f"
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -11934,19 +12001,19 @@ msgstr ""
 "kirjautuneiden käyttäjien määrä sekä ajojonon töiden keskimääräinen\n"
 "lukumäärä viimeisten 1, 5 ja 15 minuutin ajalta."
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
 "an uninterruptible sleep state also contribute to the load average.\n"
 msgstr ""
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr "\n"
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
@@ -12181,18 +12248,6 @@ msgstr ""
 "jos merkkijonoja ei anneta.\n"
 "\n"
 
-#, fuzzy
-#~ msgid "  returning value: '%s'\n"
-#~ msgstr "luodaan tiedostoa %s\n"
-
-#, fuzzy
-#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n"
-#~ msgstr "Käyttö: %s [VALITSIN] NIMI...\n"
-
-#, fuzzy
-#~ msgid "no valid suffix found\n"
-#~ msgstr "%s: virheellinen jälkiliitteen pituus"
-
 #~ msgid ""
 #~ "\n"
 #~ "Examples:\n"
@@ -12204,18 +12259,163 @@ msgstr ""
 #~ "  %s /usr/bin/sort       Tuloste: �sort�.\n"
 #~ "  %s include/stdio.h .h  Tuloste: �stdio�.\n"
 
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid ""
+#~ "Change the group of each FILE to GROUP.\n"
+#~ "With --reference, change the group of each FILE to that of RFILE.\n"
+#~ "\n"
+#~ "  -c, --changes          like verbose but report only when a change is "
+#~ "made\n"
+#~ "      --dereference      affect the referent of each symbolic link (this "
+#~ "is\n"
+#~ "                         the default), rather than the symbolic link "
+#~ "itself\n"
+#~ msgstr ""
+#~ "Muuta kunkin TIEDOSTOn ryhmäksi RYHMÄ.\n"
+#~ "Jos valitsin --reference on annettu, vaihda kunkin TIEDOSTOn ryhmäksi "
+#~ "samat\n"
+#~ "kuin VTIEDostolla.\n"
+#~ "\n"
+#~ "  -c, --changes          kuten monisanaisuus, mutta ilmoitetaan vain "
+#~ "tehdyt\n"
+#~ "                         muutokset\n"
+#~ "      --dereference      muuta symbolisen linkin kohdetta, ei linkkiä\n"
+#~ "                         itseään (tämä on oletustoiminta)\n"
+
+# Onko rekursiivisuudelle suomenkielisempää sanaa?
+#~ msgid ""
+#~ "  -f, --silent, --quiet  suppress most error messages\n"
+#~ "      --reference=RFILE  use RFILE's group rather than specifying a\n"
+#~ "                         GROUP value\n"
+#~ "  -R, --recursive        operate on files and directories recursively\n"
+#~ "  -v, --verbose          output a diagnostic for every file processed\n"
+#~ "\n"
+#~ msgstr ""
+#~ "  -f, --silent, --quiet  vaienna useimmat virheilmoitukset\n"
+#~ "      --reference=VTIED  käytä VTIEDoston ryhmää RYHMÄ-arvon antamisen\n"
+#~ "                         sijaan\n"
+#~ "  -R, --recursive        käsittele tiedostot ja hakemistot "
+#~ "rekursiivisesti\n"
+#~ "  -v, --verbose          näytä ilmoitus jokaisesta käsitellystä "
+#~ "tiedostosta\n"
+
+#~ msgid ""
+#~ "Change the mode of each FILE to MODE.\n"
+#~ "\n"
+#~ "  -c, --changes           like verbose but report only when a change is "
+#~ "made\n"
+#~ msgstr ""
+#~ "Vaihda kunkin TIEDOSTOn oikeuksiksi OIKEUDET.\n"
+#~ "\n"
+#~ "  -c, --changes           kuten monisanaisuus, mutta ilmoita vain tehdyt\n"
+#~ "                            muutokset\n"
+
+#~ msgid ""
+#~ "      --no-preserve-root  do not treat `/' specially (the default)\n"
+#~ "      --preserve-root     fail to operate recursively on `/'\n"
+#~ msgstr ""
+#~ "      --no-preserve-root  älä kohtele juurta (�/�) erityisesti (oletus)\n"
+#~ "      --preserve-root     estä rekursiivinen toiminta juuressa (�/�)\n"
+
+#~ msgid ""
+#~ "  -f, --silent, --quiet   suppress most error messages\n"
+#~ "  -v, --verbose           output a diagnostic for every file processed\n"
+#~ "      --reference=RFILE   use RFILE's mode instead of MODE values\n"
+#~ "  -R, --recursive         change files and directories recursively\n"
+#~ msgstr ""
+#~ "  -f, --silent, --quiet   vaienna useimmat virheilmoitukset\n"
+#~ "  -v, --verbose           näytä ilmoitus jokaisesta käsitellystä "
+#~ "tiedostosta\n"
+#~ "      --reference=VTIED   käytä VTIEDoston ryhmää annetun RYHMÄ-arvon "
+#~ "sijaan\n"
+#~ "  -R, --recursive         toimi rekursiivisesti\n"
+
+#~ msgid ""
+#~ "Change the owner and/or group of each FILE to OWNER and/or GROUP.\n"
+#~ "With --reference, change the owner and group of each FILE to those of "
+#~ "RFILE.\n"
+#~ "\n"
+#~ "  -c, --changes          like verbose but report only when a change is "
+#~ "made\n"
+#~ "      --dereference      affect the referent of each symbolic link (this "
+#~ "is\n"
+#~ "                         the default), rather than the symbolic link "
+#~ "itself\n"
+#~ msgstr ""
+#~ "Vaihda kunkin TIEDOSTOn omistajaksi ja/tai ryhmäksi OMISTAJA ja/tai "
+#~ "RYHMÄ.\n"
+#~ "Jos valitsin --reference on annettu, vaihda kunkin TIEDOSTOn omistajaksi\n"
+#~ "ja ryhmäksi samat kuin VTIEDostolla.\n"
+#~ "\n"
+#~ "  -c, --changes          kuin monisanaisuus, mutta ilmoita vain tehdyt\n"
+#~ "                         muutokset\n"
+#~ "      --dereference      muuta symbolisen linkin kohdetta, ei linkkiä\n"
+#~ "                         itseään (tämä on oletustoimintatapa)\n"
+
+#~ msgid ""
+#~ "  -f, --silent, --quiet  suppress most error messages\n"
+#~ "      --reference=RFILE  use RFILE's owner and group rather than\n"
+#~ "                         specifying OWNER:GROUP values\n"
+#~ "  -R, --recursive        operate on files and directories recursively\n"
+#~ "  -v, --verbose          output a diagnostic for every file processed\n"
+#~ "\n"
+#~ msgstr ""
+#~ "  -f, --silent, --quiet  vaienna useimmat virheilmoitukset\n"
+#~ "      --reference=VTIED  käytä VTIEDoston omistajaa ja ryhmää\n"
+#~ "                         OMISTAJA:RYHMÄ-arvojen antamisen sijaan\n"
+#~ "  -R, --recursive        käsittele tiedostot ja hakemistot "
+#~ "rekursiivisesti\n"
+#~ "  -v, --verbose          näytä ilmoitus jokaisesta käsitellystä "
+#~ "tiedostosta\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "failed to set additional groups"
+#~ msgstr "lisäryhmän asetus ei onnistu"
+
+#, fuzzy
+#~ msgid "failed to get file system create context"
+#~ msgstr ""
+#~ "vakiovirhetulosteen kopion asettaminen sulkeutumaan käynnistettäessä "
+#~ "epäonnistui"
+
 #~ msgid "reading %s"
 #~ msgstr "luettaessa tiedostoa %s"
 
 #~ msgid "writing %s"
 #~ msgstr "kirjoitettaessa tiedostoa %s"
 
+#, fuzzy
+#~ msgid "truncating %s"
+#~ msgstr "luodaan %s"
+
 #~ msgid "closing %s"
 #~ msgstr "suljettaessa tiedostoa %s"
 
+#~ msgid "cannot create link %s"
+#~ msgstr "linkkiä %s ei voi luoda"
+
 #~ msgid "accessing %s"
 #~ msgstr "käytetään tiedostoa %s"
 
+#~ msgid "invalid format precision"
+#~ msgstr "virheellinen muodon tarkkuus"
+
+#~ msgid ""
+#~ "Display the current time in the given FORMAT, or set the system date.\n"
+#~ "\n"
+#~ "  -d, --date=STRING         display time described by STRING, not `now'\n"
+#~ "  -f, --file=DATEFILE       like --date once for each line of DATEFILE\n"
+#~ msgstr ""
+#~ "Näytä tämänhetkinen aika annetulla MUOTOILUlla, tai aseta järjestelmän "
+#~ "aika.\n"
+#~ "\n"
+#~ "  -d, --date=MJONO          näytä MJONOn määräämä aika �now�:n sijaan\n"
+#~ "  -f, --file=PVMTIED        kuten --date, kerran kullekin PVMTIEDoston "
+#~ "riville\n"
+
 #~ msgid "opening %s"
 #~ msgstr "tiedoston %s avaaminen"
 
@@ -12226,47 +12426,62 @@ msgstr ""
 #~ "Käyttö: %s NIMI\n"
 #~ "  tai:  %s VALITSIN\n"
 
-#, fuzzy
 #~ msgid ""
-#~ "  -x, --one-file-system    skip directories on different file systems\n"
-#~ "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
-#~ "      --exclude=PATTERN    exclude files that match PATTERN\n"
-#~ "  -d, --max-depth=N     print the total for a directory (or file, with --"
-#~ "all)\n"
-#~ "                          only if it is N or fewer levels below the "
-#~ "command\n"
-#~ "                          line argument;  --max-depth=0 is the same as\n"
-#~ "                          --summarize\n"
+#~ "\n"
+#~ "Examples:\n"
+#~ "  %s /usr/bin/sort  Output \"/usr/bin\".\n"
+#~ "  %s stdio.h        Output \".\".\n"
 #~ msgstr ""
-#~ "  -x, --one-file-system  ohita muilla tiedostojärjestelmillä sijaitsevat\n"
-#~ "                           hakemistot\n"
-#~ "  -X TIED, --exclude-from=TIED  Jätä laskematta tiedostot, jotka "
-#~ "täsmäävät\n"
-#~ "                           vähintään yhteen TIEDostossa olevaan hahmoon.\n"
-#~ "      --exclude=HAHMO   jätä laskematta tiedostot, jotka täsmäävät "
-#~ "HAHMOon.\n"
-#~ "      --max-depth=N     näytä kokonaismäärä hakemistolle (tai valitsimen "
-#~ "--all\n"
-#~ "                          kanssa tiedostolle) vain, jos se on korkeintaan "
-#~ "N\n"
-#~ "                          tasoa argumenttina annetun alla; --max-depth=0 "
-#~ "on\n"
-#~ "                          sama kuin --summarize\n"
+#~ "\n"
+#~ "Esimerkkejä:\n"
+#~ "  %s /usr/bin/sort  Tuloste: �/usr/bin�.\n"
+#~ "  %s stdio.h        Tuloste: �.�.\n"
+
+#~ msgid ""
+#~ "  -B, --block-size=SIZE  use SIZE-byte blocks\n"
+#~ "  -b, --bytes           equivalent to `--apparent-size --block-size=1'\n"
+#~ "  -c, --total           produce a grand total\n"
+#~ "  -D, --dereference-args  dereference only symlinks that are listed on "
+#~ "the\n"
+#~ "                          command line\n"
+#~ msgstr ""
+#~ "  -B, --block-size=KOKO käytä KOKO-tavuisia lohkoja\n"
+#~ "  -b, --bytes           sama kuin �--apparent-size --block-size=1�\n"
+#~ "  -c, --total           näytä myös kokonaismäärä\n"
+#~ "  -D, --dereference-args  laske mukaan vain komentorivillä annettujen\n"
+#~ "                          symlinkkien kohteiden koot\n"
+
+#~ msgid "%s: cannot lseek back to original position"
+#~ msgstr "%s: siirtyminen takaisin alkuperäiseen siirtymään ei onnistu"
+
+#~ msgid "cannot reposition file pointer for %s"
+#~ msgstr "tiedosto-osoitinta ei voi siirtää tiedostossa %s"
+
+#~ msgid "Usage: %s [OPTION]... [USERNAME]\n"
+#~ msgstr "Käyttö: %s [VALITSIN]... [KÄYTTÄJÄTUNNUS]\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "  none, off       never make backups (even if --backup is given)\n"
-#~ "  numbered, t     make numbered backups\n"
-#~ "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
-#~ "  simple, never   always make simple backups\n"
-#~ "\n"
+#~ "WARNING: --preserve_context is deprecated; use --preserve-context instead"
 #~ msgstr ""
-#~ "  none, off       älä varmuuskopioi koskaan (vaikka --backup olisi "
-#~ "annettu)\n"
-#~ "  numbered, t     tee numeroituja varmuuskopioita\n"
-#~ "  existing, nil   numeroituja jos sellaisia on jo olemassa, muuten "
-#~ "yksinkertaisia\n"
-#~ "  simple, never   tee aina yksinkertaisia varmuuskopiota\n"
+#~ "valitsin --reply ei ole suositeltava; käytä valitsinta -i tai -f sen "
+#~ "sijaan"
+
+#~ msgid "creating symbolic link %s"
+#~ msgstr "luotaessa symbolista linkkiä %s"
+
+#~ msgid "creating symbolic link %s -> %s"
+#~ msgstr "luotaessa symbolista linkkiä %s -> %s"
+
+#~ msgid "creating hard link %s"
+#~ msgstr "luotaessa kovaa linkkiä %s"
+
+#~ msgid "creating hard link %s => %s"
+#~ msgstr "luotaessa kovaa linkkiä %s → %s"
+
+#, fuzzy
+#~ msgid "failed to redirect stderr to /dev/null"
+#~ msgstr "vakiovirhetulosteen uudelleenohjaus epäonnistui"
 
 #, fuzzy
 #~ msgid ""
@@ -12279,6 +12494,13 @@ msgstr ""
 #~ msgstr ""
 #~ "Pitkien valitsinten pakolliset argumentit ovat pakollisia myös lyhyille.\n"
 
+#~ msgid ""
+#~ "  -A, --address-radix=RADIX   decide how file offsets are printed\n"
+#~ "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
+#~ msgstr ""
+#~ "  -A, --address-radix=KANTA   päätä miten tiedostosiirtymät tulostetaan\n"
+#~ "  -j, --skip-bytes=MÄÄRÄ      ohita aluksi MÄÄRÄ syötetavua\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "\n"
@@ -12309,9 +12531,86 @@ msgstr ""
 #~ "--string ilman lukuarvoa on 3. --width ilman lukuarvoa on 32.\n"
 #~ "Oletuksena od käyttää -A o -t d2 -w 16.\n"
 
+#~ msgid ""
+#~ "\n"
+#~ "With no FILE or if FILE is -, read Standard Input.  `-F /' by default.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Jos TIEDOSTOA ei ole annettu, tai se on �-�, luetaan vakiosyötettä.\n"
+#~ "Oletus on �-F /�.\n"
+
 #~ msgid "Usage: %s [OPTION]... FILE\n"
 #~ msgstr "Käyttö: %s [VALITSIN]... TIEDOSTO\n"
 
+#, fuzzy
+#~ msgid "cannot remove directory: %s"
+#~ msgstr "hakemiston %s poistaminen ei onnistu"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
+#~ "  or:  %s LONG-OPTION\n"
+#~ msgstr ""
+#~ "Käyttö: %s KÄYTTÄJÄNIMI KOMENTO [ARGUMENTTI]...\n"
+#~ "  tai:  %s VALITSIN\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Drop any supplemental groups, assume the user-ID and group-ID of the "
+#~ "specified\n"
+#~ "USER (numeric ID or user name), and run COMMAND with any specified "
+#~ "ARGUMENTs.\n"
+#~ "Exit with status 111 if unable to assume the required user and group ID.\n"
+#~ "Otherwise, exit with the exit status of COMMAND.\n"
+#~ "This program is useful only when run by root (user ID zero).\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Poista käytöstä mahdolliset lisäryhmät, aseta käyttäjä- ja ryhmä-ID\n"
+#~ "annetun KÄYTTÄJÄNIMEn perusteella, ja suorita KOMENTO annetuilla\n"
+#~ "ARGUMENTeilla. Poistu paluuarvolla 111, jos käyttäjä- ja ryhmä-ID:n\n"
+#~ "asetus ei onnistu. Muussa tapauksessa poistutaan KOMENNOn paluuarvolla.\n"
+#~ "Tämä ohjelma on käyttökelpoinen vain pääkäyttäjän (käyttäjä-ID 0)\n"
+#~ "suorittamana.\n"
+#~ "\n"
+
+#~ msgid "unknown user-ID: %s"
+#~ msgstr "tuntematon käyttäjä-ID: %s"
+
+#, fuzzy
+#~ msgid "cannot set group-ID to %lu"
+#~ msgstr "ryhmä-ID:n asetus arvoon %ld ei onnistu"
+
+#, fuzzy
+#~ msgid "cannot set user-ID to %lu"
+#~ msgstr "käyttäjä-ID:n asetus arvoon %ld ei onnistu"
+
+#, fuzzy
+#~ msgid "extra operand %s\n"
+#~ msgstr "ylimääräinen operandi %s"
+
+#~ msgid "dup2 failed"
+#~ msgstr "dup2 epäonnistui"
+
+#~ msgid ""
+#~ "  -a, --suffix-length=N   use suffixes of length N (default %d)\n"
+#~ "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
+#~ "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output "
+#~ "file\n"
+#~ "  -d, --numeric-suffixes  use numeric suffixes instead of alphabetic\n"
+#~ "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
+#~ msgstr ""
+#~ "  -a, --suffix-length=N   käytä N merkin pituisia jälkiliitteitä (oletus "
+#~ "%d)\n"
+#~ "  -b, --bytes=KOKO        kirjoita KOKO tavua yhteen tulostiedostoon\n"
+#~ "  -C, --line-bytes=KOKO   kirjoita KOKO tavua rivejä yhteen "
+#~ "tulostiedostoon\n"
+#~ "  -d, --numeric-suffixes  käytä numeerisia jälkiliitteitä kirjaimien "
+#~ "sijaan\n"
+#~ "  -l, --lines=MÄÄRÄ       kirjoita MÄÄRÄ riviä yhteen tulostiedostoon\n"
+
+#~ msgid "invalid number of lines: 0"
+#~ msgstr "virheellinen rivimäärä: 0"
+
 #~ msgid "Password:"
 #~ msgstr "Salasana:"
 
@@ -12324,9 +12623,6 @@ msgstr ""
 #~ msgid "cannot set group id"
 #~ msgstr "ryhmän id:n asetus ei onnistu"
 
-#~ msgid "cannot set user id"
-#~ msgstr "tunnuksen id:n asetus ei onnistu"
-
 #~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n"
 #~ msgstr "Käyttö: %s [VALITSIN]... [-] [TUNNUS [ARG]...]\n"
 
@@ -12374,127 +12670,6 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
-#~ "Change the group of each FILE to GROUP.\n"
-#~ "With --reference, change the group of each FILE to that of RFILE.\n"
-#~ "\n"
-#~ "  -c, --changes          like verbose but report only when a change is "
-#~ "made\n"
-#~ "  -f, --silent, --quiet  suppress most error messages\n"
-#~ "  -v, --verbose          output a diagnostic for every file processed\n"
-#~ msgstr ""
-#~ "Muuta kunkin TIEDOSTOn ryhmäksi RYHMÄ.\n"
-#~ "Jos valitsin --reference on annettu, vaihda kunkin TIEDOSTOn ryhmäksi "
-#~ "samat\n"
-#~ "kuin VTIEDostolla.\n"
-#~ "\n"
-#~ "  -c, --changes          kuten monisanaisuus, mutta ilmoitetaan vain "
-#~ "tehdyt\n"
-#~ "                         muutokset\n"
-#~ "      --dereference      muuta symbolisen linkin kohdetta, ei linkkiä\n"
-#~ "                         itseään (tämä on oletustoiminta)\n"
-
-#~ msgid ""
-#~ "      --no-preserve-root  do not treat `/' specially (the default)\n"
-#~ "      --preserve-root     fail to operate recursively on `/'\n"
-#~ msgstr ""
-#~ "      --no-preserve-root  älä kohtele juurta (�/�) erityisesti (oletus)\n"
-#~ "      --preserve-root     estä rekursiivinen toiminta juuressa (�/�)\n"
-
-# Onko rekursiivisuudelle suomenkielisempää sanaa?
-#~ msgid ""
-#~ "  -f, --silent, --quiet  suppress most error messages\n"
-#~ "      --reference=RFILE  use RFILE's group rather than specifying a\n"
-#~ "                         GROUP value\n"
-#~ "  -R, --recursive        operate on files and directories recursively\n"
-#~ "  -v, --verbose          output a diagnostic for every file processed\n"
-#~ "\n"
-#~ msgstr ""
-#~ "  -f, --silent, --quiet  vaienna useimmat virheilmoitukset\n"
-#~ "      --reference=VTIED  käytä VTIEDoston ryhmää RYHMÄ-arvon antamisen\n"
-#~ "                         sijaan\n"
-#~ "  -R, --recursive        käsittele tiedostot ja hakemistot "
-#~ "rekursiivisesti\n"
-#~ "  -v, --verbose          näytä ilmoitus jokaisesta käsitellystä "
-#~ "tiedostosta\n"
-
-#~ msgid ""
-#~ "Change the mode of each FILE to MODE.\n"
-#~ "\n"
-#~ "  -c, --changes           like verbose but report only when a change is "
-#~ "made\n"
-#~ msgstr ""
-#~ "Vaihda kunkin TIEDOSTOn oikeuksiksi OIKEUDET.\n"
-#~ "\n"
-#~ "  -c, --changes           kuten monisanaisuus, mutta ilmoita vain tehdyt\n"
-#~ "                            muutokset\n"
-
-#~ msgid ""
-#~ "  -f, --silent, --quiet   suppress most error messages\n"
-#~ "  -v, --verbose           output a diagnostic for every file processed\n"
-#~ "      --reference=RFILE   use RFILE's mode instead of MODE values\n"
-#~ "  -R, --recursive         change files and directories recursively\n"
-#~ msgstr ""
-#~ "  -f, --silent, --quiet   vaienna useimmat virheilmoitukset\n"
-#~ "  -v, --verbose           näytä ilmoitus jokaisesta käsitellystä "
-#~ "tiedostosta\n"
-#~ "      --reference=VTIED   käytä VTIEDoston ryhmää annetun RYHMÄ-arvon "
-#~ "sijaan\n"
-#~ "  -R, --recursive         toimi rekursiivisesti\n"
-
-#~ msgid ""
-#~ "Change the owner and/or group of each FILE to OWNER and/or GROUP.\n"
-#~ "With --reference, change the owner and group of each FILE to those of "
-#~ "RFILE.\n"
-#~ "\n"
-#~ "  -c, --changes          like verbose but report only when a change is "
-#~ "made\n"
-#~ "      --dereference      affect the referent of each symbolic link (this "
-#~ "is\n"
-#~ "                         the default), rather than the symbolic link "
-#~ "itself\n"
-#~ msgstr ""
-#~ "Vaihda kunkin TIEDOSTOn omistajaksi ja/tai ryhmäksi OMISTAJA ja/tai "
-#~ "RYHMÄ.\n"
-#~ "Jos valitsin --reference on annettu, vaihda kunkin TIEDOSTOn omistajaksi\n"
-#~ "ja ryhmäksi samat kuin VTIEDostolla.\n"
-#~ "\n"
-#~ "  -c, --changes          kuin monisanaisuus, mutta ilmoita vain tehdyt\n"
-#~ "                         muutokset\n"
-#~ "      --dereference      muuta symbolisen linkin kohdetta, ei linkkiä\n"
-#~ "                         itseään (tämä on oletustoimintatapa)\n"
-
-#~ msgid ""
-#~ "  -f, --silent, --quiet  suppress most error messages\n"
-#~ "      --reference=RFILE  use RFILE's owner and group rather than\n"
-#~ "                         specifying OWNER:GROUP values\n"
-#~ "  -R, --recursive        operate on files and directories recursively\n"
-#~ "  -v, --verbose          output a diagnostic for every file processed\n"
-#~ "\n"
-#~ msgstr ""
-#~ "  -f, --silent, --quiet  vaienna useimmat virheilmoitukset\n"
-#~ "      --reference=VTIED  käytä VTIEDoston omistajaa ja ryhmää\n"
-#~ "                         OMISTAJA:RYHMÄ-arvojen antamisen sijaan\n"
-#~ "  -R, --recursive        käsittele tiedostot ja hakemistot "
-#~ "rekursiivisesti\n"
-#~ "  -v, --verbose          näytä ilmoitus jokaisesta käsitellystä "
-#~ "tiedostosta\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Display the current time in the given FORMAT, or set the system date.\n"
-#~ "\n"
-#~ "  -d, --date=STRING         display time described by STRING, not `now'\n"
-#~ "  -f, --file=DATEFILE       like --date once for each line of DATEFILE\n"
-#~ msgstr ""
-#~ "Näytä tämänhetkinen aika annetulla MUOTOILUlla, tai aseta järjestelmän "
-#~ "aika.\n"
-#~ "\n"
-#~ "  -d, --date=MJONO          näytä MJONOn määräämä aika �now�:n sijaan\n"
-#~ "  -f, --file=PVMTIED        kuten --date, kerran kullekin PVMTIEDoston "
-#~ "riville\n"
-
-#, fuzzy
-#~ msgid ""
 #~ "\n"
 #~ "SIZE may be (or may be an integer optionally followed by) one of "
 #~ "following:\n"
@@ -12505,44 +12680,18 @@ msgstr ""
 #~ "KOKO voi olla (tai voi olla kokonaisluku, jota seuraa) yksi seuraavista:\n"
 #~ "kB 1000, K 1024, MB 1000², M 1024², sekä samoin G, T, P, E, Z, Y.\n"
 
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#, fuzzy
-#~ msgid "truncating %s"
-#~ msgstr "luodaan %s"
-
-#~ msgid "cannot create link %s"
-#~ msgstr "linkkiä %s ei voi luoda"
-
-#~ msgid "invalid format precision"
-#~ msgstr "virheellinen muodon tarkkuus"
-
 #, fuzzy
 #~ msgid ""
-#~ "WARNING: --preserve_context is deprecated; use --preserve-context instead"
+#~ "\n"
+#~ "Report %s bugs to %s\n"
 #~ msgstr ""
-#~ "valitsin --reply ei ole suositeltava; käytä valitsinta -i tai -f sen "
-#~ "sijaan"
-
-#~ msgid "creating symbolic link %s"
-#~ msgstr "luotaessa symbolista linkkiä %s"
-
-#~ msgid "creating symbolic link %s -> %s"
-#~ msgstr "luotaessa symbolista linkkiä %s -> %s"
-
-#~ msgid "creating hard link %s"
-#~ msgstr "luotaessa kovaa linkkiä %s"
-
-#~ msgid "creating hard link %s => %s"
-#~ msgstr "luotaessa kovaa linkkiä %s → %s"
+#~ "\n"
+#~ "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen\n"
+#~ "<%s>.\n"
 
 #, fuzzy
-#~ msgid "extra operand %s\n"
-#~ msgstr "ylimääräinen operandi %s"
-
-#~ msgid "invalid number of lines: 0"
-#~ msgstr "virheellinen rivimäärä: 0"
+#~ msgid "warning: --retry is useful mainly when following by name"
+#~ msgstr "varoitus: --retry toimii vain seurattaessa nimen perusteella"
 
 #, fuzzy
 #~ msgid "warning: the --%s option is obsolete; use --reference"
@@ -12554,6 +12703,27 @@ msgstr ""
 #~ "Note that the -r and -s options are mutually exclusive.\n"
 #~ msgstr "valitsimet --string ja --check ovat toisensa poissulkevia"
 
+#, fuzzy
+#~ msgid ""
+#~ "  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
+#~ "                        delimit-method={none(default),prepend,separate}\n"
+#~ "                        Delimiting is done with blank lines\n"
+#~ "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+#~ "  -i, --ignore-case     ignore differences in case when comparing\n"
+#~ "  -s, --skip-chars=N    avoid comparing the first N characters\n"
+#~ "  -u, --unique          only print unique lines\n"
+#~ "  -z, --zero-terminated  end lines with 0 byte, not newline\n"
+#~ msgstr ""
+#~ "  -D, --all-repeated[=erotustapa] tulosta kaikki vähintään kahteen "
+#~ "kertaan\n"
+#~ "                          esiintyvät rivit\n"
+#~ "                        erotustapa={none(oletus),prepend,separate}\n"
+#~ "                        Erotus tehdään tyhjillä riveillä.\n"
+#~ "  -f, --skip-fields=N   älä vertaa N:ää ensimmäistä kenttää\n"
+#~ "  -i, --ignore-case     älä huomioi kirjainkokoa vertaillessa\n"
+#~ "  -s, --skip-chars=N    älä vertaa N:ää ensimmäistä merkkiä\n"
+#~ "  -u, --unique          tulosta vain ainutkertaiset rivit\n"
+
 # Pitäisikö --:n olla oikea Unicode-ajatusviiva (m-viiva)?
 # Tai suomeen paremmin sopiva n-viiva.
 #~ msgid "%s: illegal option -- %c\n"
@@ -12667,10 +12837,6 @@ msgstr ""
 #~ msgstr "hakemiston %s luominen ei onnistu"
 
 #, fuzzy
-#~ msgid "cannot remove %s directory %s"
-#~ msgstr "hakemiston %s poistaminen ei onnistu"
-
-#, fuzzy
 #~ msgid "cannot remove root directory %s"
 #~ msgstr "hakemiston %s poistaminen ei onnistu"
 
@@ -12800,8 +12966,8 @@ msgstr ""
 #~ "  -n, --numeric-sort          compare according to string numerical "
 #~ "value\n"
 #~ "  -R, --random-sort           sort by random hash of keys\n"
-#~ "  -V, --version-sort          sort by numeric version (see strverscmp"
-#~ "(3C))\n"
+#~ "  -V, --version-sort          sort by numeric version (see "
+#~ "strverscmp(3C))\n"
 #~ "      --random-source=FILE    get random bytes from FILE (default /dev/"
 #~ "urandom)\n"
 #~ "      --sort=WORD             sort according to WORD:\n"
@@ -13068,9 +13234,6 @@ msgstr ""
 #~ msgid "cannot set permissions of fifo %s"
 #~ msgstr "fifon %s oikeuksien asettaminen ei onnistu"
 
-#~ msgid "cannot set permissions of %s"
-#~ msgstr "tiedoston %s oikeuksien asettaminen ei onnistu"
-
 #~ msgid ""
 #~ "This program is free software; you can redistribute it and/or modify\n"
 #~ "it under the terms of the GNU General Public License as published by\n"
@@ -13337,6 +13500,9 @@ msgstr ""
 #~ msgid "too many non-option arguments"
 #~ msgstr "liikaa argumentteja, jotka eivät ole valitsimia"
 
+#~ msgid "invalid field number: `%s'"
+#~ msgstr "virheellinen sarakenumero: \"%s\""
+
 #~ msgid "invalid field number for file 1: `%s'"
 #~ msgstr "virheellinen sarakenumero tiedostolle 1: \"%s\""
 
diff --git a/po/fr.gmo b/po/fr.gmo
index 34994779..5cbb7290 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
diff --git a/po/fr.po b/po/fr.po
index 182609a7..53830dfd 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,17 +1,17 @@
 # French translation of coreutils
-# Copyright © 2004, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
+# Copyright © 2004, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
 # This file is distributed under the same license as the coreutils package.
 #
 # Michel Robitaille <robitail@IRO.UMontreal.CA>, 1996-2007.
 # kerb <y.kerb@laposte.net>, 2008, 2009.
 # Stéphane Raimbault <stephane.raimbault@gmail.com>, 2009-2012.
-# David Prévot <david@tilapin.org>, 2012, 2013.
+# David Prévot <david@tilapin.org>, 2012-2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: coreutils-8.20-pre3\n"
+"Project-Id-Version: coreutils-8.23-pre1\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
-"PO-Revision-Date: 2013-02-11 17:08-0400\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
+"PO-Revision-Date: 2014-07-15 18:40-0400\n"
 "Last-Translator: David Prévot <david@tilapin.org>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "Language: fr\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Lokalize 1.4\n"
+"X-Generator: Lokalize 1.5\n"
 
 #: lib/argmatch.c:133
 #, c-format
@@ -39,76 +39,119 @@ msgstr "Les arguments valables sont :"
 msgid "error closing file"
 msgstr "erreur de fermeture de fichier"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "erreur d'écriture"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, c-format
 msgid "preserving permissions for %s"
-msgstr "conservation des permissions de %s"
+msgstr "conservation des droits de %s"
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "Erreur système inconnue"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "fichier vide"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "fichier"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "répertoire"
 
-#: lib/file-type.c:44
-msgid "block special file"
-msgstr "fichier spécial de bloc"
-
-#: lib/file-type.c:47
-msgid "character special file"
-msgstr "fichier spécial de caractères"
-
-#: lib/file-type.c:50
-msgid "fifo"
-msgstr "FIFO"
-
-#: lib/file-type.c:53
+#: lib/file-type.c:46
 msgid "symbolic link"
 msgstr "lien symbolique"
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "socket"
-
-#: lib/file-type.c:59
+#: lib/file-type.c:52
 msgid "message queue"
 msgstr "file de messages"
 
-#: lib/file-type.c:62
+#: lib/file-type.c:55
 msgid "semaphore"
 msgstr "sémaphore"
 
-#: lib/file-type.c:65
+#: lib/file-type.c:58
 msgid "shared memory object"
 msgstr "objet de mémoire partagée"
 
-#: lib/file-type.c:68
+#: lib/file-type.c:61
 msgid "typed memory object"
 msgstr "objet mémoire typée"
 
-#: lib/file-type.c:70
+#: lib/file-type.c:66
+msgid "block special file"
+msgstr "fichier spécial de bloc"
+
+#: lib/file-type.c:69
+msgid "character special file"
+msgstr "fichier spécial de caractères"
+
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr "données contiguës"
+
+#: lib/file-type.c:75
+msgid "fifo"
+msgstr "FIFO"
+
+#: lib/file-type.c:78
+msgid "door"
+msgstr "porte"
+
+#: lib/file-type.c:81
+msgid "multiplexed block special file"
+msgstr "fichier spécial de bloc multiplexé"
+
+#: lib/file-type.c:84
+msgid "multiplexed character special file"
+msgstr "fichier spécial de caractères multiplexé"
+
+#: lib/file-type.c:87
+msgid "multiplexed file"
+msgstr "fichier multiplexé"
+
+#: lib/file-type.c:90
+msgid "named file"
+msgstr "fichier nommé"
+
+#: lib/file-type.c:93
+msgid "network special file"
+msgstr "fichier spécial de réseau"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr "fichier migré avec données"
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr "fichier migré sans données"
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr "port"
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "socket"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr "effaceur"
+
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "fichier étrange"
 
@@ -243,18 +286,18 @@ msgstr "%s : l'option « -W %s » n'accepte pas d'argument\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s : l'option « -W %s » nécessite un argument\n"
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
-msgstr "impossible de modifier les permissions de %s"
+msgstr "impossible de modifier les droits de %s"
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "impossible de créer le répertoire %s"
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr "mémoire insuffisante"
@@ -371,7 +414,7 @@ msgstr "Expression rationnelle trop grande"
 msgid "Unmatched ) or \\)"
 msgstr ") ou \\) sans correspondance"
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 msgid "No previous regular expression"
 msgstr "Pas d'expression rationnelle précédente"
 
@@ -396,7 +439,7 @@ msgstr "utilisez --no-preserve-root pour inhiber cette mesure de sûreté"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[oOyY].*"
 
@@ -406,14 +449,14 @@ msgstr "^[oOyY].*"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[nN].*"
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, c-format
 msgid "setting permissions for %s"
-msgstr "initialisation des permissions de %s"
+msgstr "initialisation des droits de %s"
 
 #: lib/siglist.h:31
 msgid "Hangup"
@@ -551,18 +594,6 @@ msgstr "Échec d'alimentation"
 msgid "Resource lost"
 msgstr "Ressource perdue"
 
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, c-format
-msgid "cannot create pipe"
-msgstr "impossible de créer un tube (« pipe »)"
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, c-format
-msgid "%s subprocess failed"
-msgstr "échec de sous-processus %s"
-
 #: lib/strsignal.c:114
 #, c-format
 msgid "Real-time signal %d"
@@ -772,7 +803,7 @@ msgstr ""
 msgid "Report %s bugs to: %s\n"
 msgstr "Signalez les anomalies de « %s » à : <%s>\n"
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Page d'accueil de « %s » : %s\n"
@@ -782,32 +813,11 @@ msgstr "Page d'accueil de « %s » : %s\n"
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr "Page d'accueil de « %s » : <http://www.gnu.org/software/%s/>\n"
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr ""
 "Aide globale sur les logiciels GNU : <http://www.gnu.org/help/gethelp>\n"
 
-#: lib/w32spawn.h:43
-#, c-format
-msgid "_open_osfhandle failed"
-msgstr "échec de _open_osfhandle"
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr ""
-"impossible de restaurer le descripteur de fichier (fd) %d : échec de dup2"
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr "sous-processus %s"
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr "le sous-processus %s a reçu un signal fatal %d"
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr "entrée standard (stdin)"
@@ -829,7 +839,7 @@ msgstr "flux inconnu"
 msgid "failed to reopen %s with mode %s"
 msgstr "impossible de rouvrir %s en mode %s"
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr "échec de comparaison de chaîne"
@@ -876,9 +886,9 @@ msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
 "Base64 encode or decode FILE, or standard input, to standard output.\n"
 msgstr ""
-"Utilisation : %s [OPTION]... [FILE]\n"
-"Encoder ou décoder en base64 FILE, ou l'entrée standard, sur la sortie "
-"standard.\n"
+"Utilisation : %s [OPTION]... [FICHIER]\n"
+"Encoder ou décoder FICHIER en base64, ou l'entrée standard, vers la\n"
+"sortie standard.\n"
 
 #: src/base64.c:67
 msgid ""
@@ -898,13 +908,13 @@ msgstr ""
 "césure\n"
 "\n"
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
 "\n"
-"Sans FILE ou quand FILE est -, lire l'entrée standard.\n"
+"Sans FICHIER ou quand FICHIER est -, lire l'entrée standard.\n"
 
 #: src/base64.c:79
 msgid ""
@@ -923,48 +933,47 @@ msgstr ""
 "de\n"
 "récupérer tout autre octet non alphabétique dans le flux codé.\n"
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "erreur de lecture"
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, c-format
 msgid "invalid input"
 msgstr "entrée incorrecte"
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, c-format
 msgid "invalid wrap size: %s"
 msgstr "longueur de césure incorrecte : %s"
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, c-format
 msgid "extra operand %s"
 msgstr "opérande supplémentaire %s"
 
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, c-format
 msgid "closing standard input"
 msgstr "fermeture de l'entrée standard"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -979,28 +988,28 @@ msgid ""
 "Usage: %s NAME [SUFFIX]\n"
 "  or:  %s OPTION... NAME...\n"
 msgstr ""
-"Utilisation : %s NAME [SUFFIX]...\n"
-"         ou : %s OPTION... NAME...\n"
+"Utilisation : %s NOM [SUFFIXE]...\n"
+"         ou : %s OPTION... NOM...\n"
 
 #: src/basename.c:53
 msgid ""
 "Print NAME with any leading directory components removed.\n"
 "If specified, also remove a trailing SUFFIX.\n"
 msgstr ""
-"Afficher NAME sans le précéder des composants des noms de répertoires\n"
-"Si indiqué, enlever aussi SUFFIX en terminaison.\n"
+"Afficher NOM sans le précéder des composants des noms de répertoires\n"
+"Si indiqué, enlever aussi SUFFIXE en terminaison.\n"
 
 #: src/basename.c:60
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
 "  -a, --multiple       accepter plusieurs arguments et les traiter comme un "
-"NAME\n"
-"  -s, --suffix=SUFFIX  supprimer un SUFFIX de terminaison\n"
-"  -z, --zero           séparer la sortie par NUL au lieu de changements de "
-"ligne\n"
+"NOM\n"
+"  -s, --suffix=SUFFIXE  supprimer un SUFFIXE de terminaison ; implique -a\n"
+"  -z, --zero           terminer chaque ligne de sortie par NULL, pas un\n"
+"                         changement de ligne\n"
 
 #: src/basename.c:67
 #, c-format
@@ -1020,36 +1029,35 @@ msgstr ""
 "  %s -a nimp/chaine1 nimp/chaine2  → « chaine1 » suivi par « chaine2 »\n"
 
 # Opérande est un nom masculin
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, c-format
 msgid "missing operand"
 msgstr "opérande manquant"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr "Torbjorn Granlund"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 msgid "Richard M. Stallman"
 msgstr "Richard M. Stallman"
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
-msgstr "Utilisation : %s [OPTION]... [FILE]...\n"
+msgstr "Utilisation : %s [OPTION]... [FICHIER]...\n"
 
 #: src/cat.c:92
 msgid ""
@@ -1062,7 +1070,8 @@ msgid ""
 "  -n, --number             number all output lines\n"
 "  -s, --squeeze-blank      suppress repeated empty output lines\n"
 msgstr ""
-"Concaténer le ou les FILEs, ou l'entrée standard, vers la sortie standard.\n"
+"Concaténer le ou les FICHIERs, ou l'entrée standard, vers la sortie "
+"standard.\n"
 "\n"
 "  -A, --show-all           équivalent à -vET\n"
 "  -b, --number-nonblank    numéroter lignes non vides en sortie, surcharge -"
@@ -1098,7 +1107,7 @@ msgstr ""
 "\n"
 "Exemples :\n"
 "  %s f - g  Afficher le contenu de f, suivi de l'entrée standard, puis du\n"
-"               contenu de g.\n"
+"              contenu de g.\n"
 "  %s        Copier l'entrée standard vers la sortie standard.\n"
 
 #: src/cat.c:326
@@ -1106,7 +1115,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr "impossible d'exécuter ioctl sur %s"
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr "sortie standard"
@@ -1123,14 +1132,14 @@ msgstr "Russell Coker"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 msgid "Jim Meyering"
 msgstr "Jim Meyering"
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, c-format
 msgid "failed to create security context: %s"
 msgstr "impossible de créer le contexte de sécurité : %s"
@@ -1140,8 +1149,8 @@ msgstr "impossible de créer le contexte de sécurité : %s"
 msgid "failed to set %s security context component to %s"
 msgstr "impossible de définir le composant de contexte de sécurité %s à %s"
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, c-format
 msgid "failed to get security context of %s"
 msgstr "impossible de récupérer du contexte de sécurité de %s"
@@ -1151,18 +1160,18 @@ msgstr "impossible de récupérer du contexte de sécurité de %s"
 msgid "can't apply partial context to unlabeled file %s"
 msgstr "impossible d'appliquer un contexte partiel au fichier %s non étiqueté"
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, c-format
 msgid "failed to change context of %s to %s"
 msgstr "impossible de modifier le contexte de %s à %s"
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
 msgstr "impossible d'accéder à %s"
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, c-format
 msgid "cannot read directory %s"
 msgstr "impossible de lire le répertoire %s"
@@ -1172,13 +1181,14 @@ msgstr "impossible de lire le répertoire %s"
 msgid "changing security context of %s\n"
 msgstr "changement du contexte de sécurité de %s\n"
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, c-format
 msgid "fts_read failed"
 msgstr "échec de fts_read"
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, c-format
 msgid "fts_close failed"
 msgstr "échec de fts_close"
@@ -1190,20 +1200,20 @@ msgid ""
 "  or:  %s [OPTION]... [-u USER] [-r ROLE] [-l RANGE] [-t TYPE] FILE...\n"
 "  or:  %s [OPTION]... --reference=RFILE FILE...\n"
 msgstr ""
-"Utilisation : %s [OPTION]... CONTEXT FILE...\n"
-"         ou : %s [OPTION]... [-u USER] [-r ROLE] [-l RANGE] [-t TYPE] "
-"FILE...\n"
-"         ou : %s [OPTION]... --reference=RFILE FILE...\n"
+"Utilisation : %s [OPTION]... CONTEXTE FICHIER...\n"
+"         ou : %s [OPTION]... [-u UTILIS] [-r RÔLE] [-l INT] [-t TYPE] "
+"FICHIER...\n"
+"         ou : %s [OPTION]... --reference=FICHIER_R FICHIER...\n"
 
 #: src/chcon.c:357
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
-"Modifier le contexte de sécurité de chaque FILE en CONTEXT.\n"
-"Avec --reference, modifier le contexte de sécurité de chaque FILE à\n"
-"celui de RFILE.\n"
+"Modifier le contexte de sécurité SELinux de chaque FICHIER en CONTEXTE.\n"
+"Avec --reference, modifier le contexte de sécurité de chaque FICHIER à\n"
+"celui de FICHIER_R.\n"
 
 #: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94
 msgid ""
@@ -1226,16 +1236,16 @@ msgid ""
 "  -t, --type=TYPE        set type TYPE in the target security context\n"
 "  -l, --range=RANGE      set range RANGE in the target security context\n"
 msgstr ""
-"  -u, --user=USER        définir l'utilisateur USER dans le contexte de\n"
+"  -u, --user=UTILIS      définir l'utilisateur UTILIS dans le contexte de\n"
 "                           sécurité cible\n"
-"  -r, --role=ROLE        définir le rôle ROLE dans le contexte de sécurité "
+"  -r, --role=RÔLE        définir le rôle RÔLE dans le contexte de sécurité "
 "cible\n"
 "  -t, --type=TYPE        définir le type TYPE dans le contexte de sécurité "
 "cible\n"
-"  -l, --range=RANGE      définir l'intervalle RANGE dans le contexte de\n"
+"  -l, --range=INT        définir l'intervalle INT dans le contexte de\n"
 "                         sécurité cible\n"
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
 "      --preserve-root    fail to operate recursively on '/'\n"
@@ -1250,8 +1260,9 @@ msgid ""
 "specifying\n"
 "                         a CONTEXT value\n"
 msgstr ""
-"      --reference=RFILE  utiliser le contexte de sécurité de RFILE au lieu\n"
-"                           d'indiquer une valeur CONTEXT\n"
+"      --reference=FICHIER_R  utiliser le contexte de sécurité de FICHIER_R "
+"au\n"
+"                             lieu d'indiquer une valeur de CONTEXTE\n"
 
 #: src/chcon.c:383 src/chgrp.c:140 src/chown.c:118
 msgid "  -R, --recursive        operate on files and directories recursively\n"
@@ -1291,36 +1302,37 @@ msgstr ""
 "  -P                     ne parcourir aucun lien symbolique (par défaut)\n"
 "\n"
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr "-R --dereference nécessite soit -H ou -L"
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr "-R -h nécessite -P"
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, c-format
 msgid "missing operand after %s"
 msgstr "opérande manquant après %s"
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, c-format
 msgid "invalid context: %s"
 msgstr "contexte incorrect : %s"
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr "paramètres de contexte de sécurité en conflit"
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, c-format
 msgid "failed to get attributes of %s"
 msgstr "impossible d'obtenir les attributs de %s"
@@ -1336,8 +1348,8 @@ msgid ""
 "Usage: %s [OPTION]... GROUP FILE...\n"
 "  or:  %s [OPTION]... --reference=RFILE FILE...\n"
 msgstr ""
-"Utilisation : %s [OPTION]... GROUP FILE...\n"
-"         ou : %s [OPTION]... --reference=RFILE FILE...\n"
+"Utilisation : %s [OPTION]... GROUPE FICHIER...\n"
+"         ou : %s [OPTION]... --reference=FICHIER_R FICHIER...\n"
 
 #: src/chgrp.c:113
 msgid ""
@@ -1345,11 +1357,12 @@ msgid ""
 "With --reference, change the group of each FILE to that of RFILE.\n"
 "\n"
 msgstr ""
-"Modifier le groupe de chaque FILE en GROUP.\n"
-"Avec --reference, modifier le groupe de chaque FILE à celui de RFILE.\n"
+"Modifier le groupe de chaque FICHIER en GROUPE.\n"
+"Avec --reference, modifier le groupe de chaque FICHIER à celui de "
+"FICHIER_R.\n"
 "\n"
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
@@ -1373,8 +1386,9 @@ msgid ""
 "      --reference=RFILE  use RFILE's group rather than specifying a\n"
 "                         GROUP value\n"
 msgstr ""
-"      --reference=RFILE  utiliser le groupe de RFILE au lieu d'indiquer une\n"
-"                         valeur GROUP\n"
+"      --reference=FICHIER_R  utiliser le groupe de FICHIER_R au lieu "
+"d'indiquer\n"
+"                             une valeur de GROUPE\n"
 
 #: src/chgrp.c:158
 #, c-format
@@ -1389,78 +1403,79 @@ msgstr ""
 "  %s staff /u      Modifier le groupe de /u en « staff ».\n"
 "  %s -hR staff /u  Modifier le groupe de /u et sous-fichiers en « staff ».\n"
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
 msgstr "obtention des nouveaux attributs de %s"
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr "ni le lien symbolique %s ni la référence n'ont été modifiés.\n"
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr "le mode de %s a été modifié de %04lo (%s) en %04lo (%s)\n"
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr "impossible de modifier le mode de %s de %04lo (%s) en %04lo (%s)\n"
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr "le mode de %s a été conservé à %04lo (%s).\n"
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr "impossible d'opérer sur un lien symbolique ballant %s"
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, c-format
 msgid "changing permissions of %s"
-msgstr "modification des permissions de %s"
+msgstr "modification des droits de %s"
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, c-format
 msgid "%s: new permissions are %s, not %s"
-msgstr "%s : les nouvelles permissions sont %s, et non %s"
+msgstr "%s : les nouveaux droits sont %s et non %s"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
 "  or:  %s [OPTION]... OCTAL-MODE FILE...\n"
 "  or:  %s [OPTION]... --reference=RFILE FILE...\n"
 msgstr ""
-"Utilisation : %s [OPTION]... MODE[,MODE]... FILE...\n"
-"         ou : %s [OPTION]... OCTAL-MODE FILE\n"
-"         ou : %s [OPTION]... --reference=RFILE FILE\n"
+"Utilisation : %s [OPTION]... MODE[,MODE]... FICHIER...\n"
+"         ou : %s [OPTION]... MODE_OCTAL FICHIER\n"
+"         ou : %s [OPTION]... --reference=FICHIER_R FICHIER\n"
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 msgid ""
 "Change the mode of each FILE to MODE.\n"
 "With --reference, change the mode of each FILE to that of RFILE.\n"
 "\n"
 msgstr ""
-"Modifier le mode de chaque FILE en MODE.\n"
-"Avec --reference, modifier le mode de chaque FILE à celui de RFILE.\n"
+"Modifier le mode de chaque FICHIER en MODE.\n"
+"Avec --reference, modifier le mode de chaque FICHIER à celui de FICHIER_R.\n"
 
-#: src/chmod.c:391
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
-"      --reference=RFILE  utiliser le mode de RFILE au lieu d'indiquer une\n"
-"                           valeur GROUP\n"
+"      --reference=FICHIER_R  utiliser le mode de FICHIER_R au lieu des "
+"valeur\n"
+"                             de MODE\n"
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr ""
 "  -R, --recursive        modifier récursivement les fichiers et répertoires\n"
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 msgid ""
 "\n"
 "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n"
@@ -1469,12 +1484,12 @@ msgstr ""
 "Chaque MODE est de la forme « [ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=]"
 "[0-7]+ ».\n"
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr "impossible de combiner les options mode et --reference"
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, c-format
 msgid "invalid mode: %s"
 msgstr "mode incorrect : %s"
@@ -1555,8 +1570,8 @@ msgid ""
 "Usage: %s [OPTION]... [OWNER][:[GROUP]] FILE...\n"
 "  or:  %s [OPTION]... --reference=RFILE FILE...\n"
 msgstr ""
-"Utilisation : %s [OPTION]... [OWNER][:GROUP] FILE...\n"
-"         ou : %s [OPTION]... --reference=RFILE FILE...\n"
+"Utilisation : %s [OPTION]... [PROPRIO][:GROUPE] FICHIER...\n"
+"         ou : %s [OPTION]... --reference=FICHIER_R FICHIER...\n"
 
 #: src/chown.c:84
 msgid ""
@@ -1565,9 +1580,10 @@ msgid ""
 "RFILE.\n"
 "\n"
 msgstr ""
-"Modifier le propriétaire ou le groupe de chaque FILE en OWNER ou GROUP.\n"
-"Avec --reference, modifier le propriétaire et le groupe de chaque FILE à\n"
-"ceux de RFILE.\n"
+"Modifier le propriétaire ou le groupe de chaque FICHIER en PROPRIO ou "
+"GROUPE.\n"
+"Avec --reference, modifier le propriétaire et le groupe de chaque FICHIER à\n"
+"ceux de FICHIER_R.\n"
 "\n"
 
 #: src/chown.c:103
@@ -1580,7 +1596,7 @@ msgid ""
 "match\n"
 "                         is not required for the omitted attribute\n"
 msgstr ""
-"      --from=CURRENT_OWNER:CURRENT_GROUP\n"
+"      --from=PROPRIO_ACTUEL:GROUPE_ACTUEL\n"
 "                         modifier le propriétaire ou le groupe de chaque "
 "fichier\n"
 "                         dont le propriétaire ou le groupe actuel "
@@ -1594,9 +1610,9 @@ msgid ""
 "      --reference=RFILE  use RFILE's owner and group rather than\n"
 "                         specifying OWNER:GROUP values\n"
 msgstr ""
-"      --reference=RFILE  utiliser les propriétaires et groupe de RFILE au "
-"lieu\n"
-"                           d'indiquer des valeurs OWNER:GROUP\n"
+"      --reference=FICHIER_R  utiliser les propriétaires et groupe de "
+"FICHIER_R\n"
+"                             au lieu d’indiquer des valeurs PROPRIO:GROUPE\n"
 
 #: src/chown.c:136
 msgid ""
@@ -1609,8 +1625,8 @@ msgstr ""
 "Le propriétaire n'est pas modifié s'il n'est pas indiqué. Le groupe n'est "
 "pas\n"
 "modifié sil n'est pas indiqué, mais modifié en groupe de connexion s'il est\n"
-"sous-entendu par un « : » suivant un OWNER (propriétaire) symbolique.\n"
-"Le OWNER et le GROUP peuvent être numériques ou symboliques.\n"
+"sous-entendu par un « : » suivant un PROPRIO symbolique.\n"
+"Les PROPRIO et GROUPE peuvent être numériques ou symboliques.\n"
 
 #: src/chown.c:142
 #, c-format
@@ -1629,53 +1645,49 @@ msgstr ""
 "                         en « root ».\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr "Roland McGrath"
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr "groupe %s incorrect"
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, c-format
 msgid "invalid group list %s"
 msgstr "liste de groupes %s incorrecte"
 
-#: src/chroot.c:117
-#, c-format
-msgid "failed to set additional groups"
-msgstr "impossible de définir des groupes supplémentaires"
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
 "  or:  %s OPTION\n"
 msgstr ""
-"Utilisation : %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
+"Utilisation : %s [OPTION] NOUV_RACINE [COMMANDE [ARG]...]\n"
 "         ou : %s OPTION\n"
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
 msgstr ""
-"Exécuter COMMAND avec le répertoire racine initialisé à NEWROOT.\n"
+"Exécuter COMMANDE avec le répertoire racine initialisé à NOUV_RACINE.\n"
 "\n"
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
 msgstr ""
-"  --userspec=USER:GROUP  indiquer l'utilisateur et le groupe (ID ou nom) à\n"
-"                           utiliser\n"
-"  --groups=G_LIST        indiquer les groupes supplémentaires comme g1,g2,..,"
+"  --userspec=UTILIS:GROUPE  indiquer l'utilisateur et le groupe (ID ou nom) "
+"à\n"
+"                            utiliser\n"
+"  --groups=LISTE_G       indiquer les groupes supplémentaires comme g1,g2,..,"
 "gN\n"
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 msgid ""
 "\n"
 "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n"
@@ -1684,28 +1696,42 @@ msgstr ""
 "Sans commande fournie, exécuter « ${SHELL} -i » (« /bin/sh -i » par "
 "défaut).\n"
 
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, c-format
 msgid "cannot change root directory to %s"
 msgstr "impossible de modifier le répertoire racine en %s"
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, c-format
 msgid "cannot chdir to root directory"
 msgstr "impossible d'aller dans le répertoire racine"
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr "Aucun groupe indiqué pour l’UID inconnu : %d"
+
+#: src/chroot.c:383
+#, c-format
+msgid "failed to get supplemental groups"
+msgstr "impossible d’obtenir les groupes supplémentaires"
+
+#: src/chroot.c:395
+#, c-format
+msgid "failed to %s supplemental groups"
+msgstr "impossible de %s les groupes supplémentaires"
+
+#: src/chroot.c:402
 #, c-format
 msgid "failed to set group-ID"
 msgstr "impossible de définir l'identifiant de groupe"
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, c-format
 msgid "failed to set user-ID"
 msgstr "impossible de définir l'identifiant de l'utilisateur"
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, c-format
 msgid "failed to run command %s"
 msgstr "impossible d'exécuter la commande %s"
@@ -1726,7 +1752,7 @@ msgid ""
 "Usage: %s [FILE]...\n"
 "  or:  %s [OPTION]\n"
 msgstr ""
-"Utilisation : %s [FILE]...\n"
+"Utilisation : %s [FICHIER]...\n"
 "         ou : %s [OPTION]\n"
 
 #: src/cksum.c:268
@@ -1734,17 +1760,18 @@ msgid ""
 "Print CRC checksum and byte counts of each FILE.\n"
 "\n"
 msgstr ""
-"Afficher la somme de contrôle CRC et le décompte d'octets de chaque FILE.\n"
+"Afficher la somme de contrôle CRC et le décompte d'octets de chaque "
+"FICHIER.\n"
 "\n"
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
-msgstr "Utilisation : %s [OPTION]... FILE1 FILE2\n"
+msgstr "Utilisation : %s [OPTION]... FICHIER1 FICHIER2\n"
 
 #: src/comm.c:107
 msgid "Compare sorted files FILE1 and FILE2 line by line.\n"
-msgstr "Comparer les fichiers triés FILE1 et FILE2 ligne à ligne.\n"
+msgstr "Comparer les fichiers triés FICHIER1 et FICHIER2 ligne à ligne.\n"
 
 #: src/comm.c:110
 msgid ""
@@ -1755,9 +1782,9 @@ msgid ""
 msgstr ""
 "\n"
 "Sans option, l'affichage s'effectue sur trois colonnes. La première colonne\n"
-"contient les lignes uniques de FILE1, la deuxième contient les lignes "
+"contient les lignes uniques de FICHIER1, la deuxième contient les lignes "
 "uniques\n"
-"de FILE2 et la troisième contient les lignes communes aux deux fichiers.\n"
+"de FICHIER2 et la troisième contient les lignes communes aux deux fichiers.\n"
 
 #: src/comm.c:116
 msgid ""
@@ -1767,8 +1794,8 @@ msgid ""
 "  -3              suppress column 3 (lines that appear in both files)\n"
 msgstr ""
 "\n"
-"  -1              supprimer la colonne 1 (lignes uniques de FILE1)\n"
-"  -2              supprimer la colonne 2 (lignes uniques de FILE2)\n"
+"  -1              supprimer la colonne 1 (lignes uniques de FICHIER1)\n"
+"  -2              supprimer la colonne 2 (lignes uniques de FICHIER2)\n"
 "  -3              supprimer la colonne 3 (lignes présentes dans les "
 "2 fichiers)\n"
 
@@ -1786,7 +1813,7 @@ msgstr ""
 
 #: src/comm.c:128
 msgid "  --output-delimiter=STR  separate columns with STR\n"
-msgstr "  --output-delimiter=STR  séparer les colonnes avec STR\n"
+msgstr "  --output-delimiter=CHA  séparer les colonnes par CHA\n"
 
 #: src/comm.c:133
 msgid ""
@@ -1828,300 +1855,341 @@ msgstr "plusieurs délimiteurs indiqués"
 msgid "empty %s not allowed"
 msgstr "%s vide n'est pas autorisé"
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr "erreur de lecture %s"
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, c-format
 msgid "cannot lseek %s"
 msgstr "impossible de se positionner (lseek) dans %s"
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr "erreur d'écriture de %s"
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, c-format
 msgid "%s: failed to get extents info"
 msgstr "%s : impossible d'obtenir les informations d'extension"
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, c-format
 msgid "%s: write failed"
 msgstr "%s : échec d'écriture"
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, c-format
 msgid "failed to extend %s"
 msgstr "impossible d'étendre %s"
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, c-format
 msgid "clearing permissions for %s"
-msgstr "réinitialisation des permissions de %s"
+msgstr "initialisation des droits de %s"
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "impossible de préserver l'appartenance pour %s"
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
 msgstr "impossible de repérer le fichier %s"
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, c-format
 msgid "failed to preserve authorship for %s"
 msgstr "impossible de préserver l'auteur pour %s"
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
+#, c-format
+msgid "failed to set default file creation context to %s"
+msgstr ""
+"impossible de définir le contexte de création de fichier par défaut à %s"
+
+#: src/copy.c:820
+#, c-format
+msgid "failed to set default file creation context for %s"
+msgstr ""
+"impossible de définir le contexte de création de fichier par défaut pour %s"
+
+#: src/copy.c:846
+#, c-format
+msgid "failed to set the security context of %s"
+msgstr "impossible de définir le contexte de sécurité de %s"
+
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
 msgid "cannot open %s for reading"
 msgstr "impossible d'ouvrir %s en lecture"
 
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, c-format
 msgid "cannot fstat %s"
 msgstr "impossible d'obtenir l'état du fichier (fstat) %s"
 
-#: src/copy.c:820
+#: src/copy.c:935
 #, c-format
 msgid "skipping file %s, as it was replaced while being copied"
 msgstr "le fichier %s est ignoré car il a été remplacé durant la copie"
 
-#: src/copy.c:850
-#, c-format
-msgid "failed to get file system create context"
-msgstr "impossible d'obtenir le contexte de création du système de fichiers"
-
-#: src/copy.c:864
-#, c-format
-msgid "failed to set the security context of %s to %s"
-msgstr "impossible de définir le contexte de sécurité de %s en %s"
-
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
 msgid "cannot remove %s"
 msgstr "impossible de supprimer %s"
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
 msgstr "%s supprimé\n"
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr "pas d'écriture à travers le lien symbolique ballant %s"
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, c-format
 msgid "cannot create regular file %s"
 msgstr "impossible de créer le fichier standard %s"
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, c-format
 msgid "failed to clone %s from %s"
 msgstr "impossible de cloner %s depuis %s"
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr "préservation des dates pour %s"
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
 #, c-format
 msgid "failed to close %s"
 msgstr "impossible de fermer %s"
 
-#: src/copy.c:1471
+#: src/copy.c:1580
 #, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
-msgstr "%s : voulez-vous écraser %s en outrepassant le mode %04lo (%s) ? "
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
+msgstr "%s : voulez-vous remplacer %s en outrepassant le mode %04lo (%s) ? "
 
-#: src/copy.c:1478
+#: src/copy.c:1581
+#, c-format
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr ""
+"%s : %s non autorisé en écriture (mode %04lo, %s) ; voulez-vous essayer "
+"quand même ? "
+
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
 msgstr "%s : voulez-vous écraser %s ? "
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr " (archive : %s)"
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr "impossible de restaurer le contexte de création de fichier par défaut"
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, c-format
 msgid "cannot create hard link %s to %s"
 msgstr "impossible de créer le lien direct %s vers %s"
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, c-format
 msgid "cannot stat %s"
 msgstr "impossible d'évaluer %s"
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, c-format
 msgid "omitting directory %s"
 msgstr "omission du répertoire %s"
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr "avertissement : le fichier source %s est mentionné plusieurs fois"
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
 msgstr "%s et %s identifient le même fichier"
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr "impossible d'écraser le non répertoire %s par le répertoire %s"
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr "n'écrasera pas %s qui vient d'être créé par %s"
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr "impossible d'écraser le répertoire %s par un non répertoire"
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr "impossible de déplacer le répertoire dans un non répertoire : %s → %s"
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr "l'archivage de %s détruirait la source ; %s non déplacé"
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr "l'archivage de %s détruirait la source ; %s non copié"
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
 msgstr "impossible d'archiver %s"
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr ""
 "ne copiera pas %s depuis le lien symbolique %s qui vient juste d'être créé"
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr "impossible de créer un répertoire (%s) dans lui-même (%s)"
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr "ne créera pas le lien direct %s vers le répertoire %s"
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr "impossible de déplacer %s vers un sous-répertoire de lui-même, %s"
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, c-format
 msgid "cannot move %s to %s"
 msgstr "impossible de déplacer %s vers %s"
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr ""
 "échec de déplacement interpériphérique de %s vers %s ; impossible de "
 "supprimer la cible"
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, c-format
-msgid "failed to set default file creation context to %s"
-msgstr ""
-"impossible de définir le contexte de création de fichier par défaut à %s"
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr "impossible de copier liens symboliques cycliques %s"
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr ""
 "%s : ne peut créer des liens symboliques relatifs que dans le répertoire "
 "actuel"
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr "impossible de créer le lien symbolique %s vers %s"
 
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, c-format
 msgid "cannot create fifo %s"
 msgstr "impossible de créer la FIFO %s"
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, c-format
 msgid "cannot create special file %s"
 msgstr "impossible de créer le fichier spécial %s"
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, c-format
 msgid "cannot read symbolic link %s"
 msgstr "impossible de lire le lien symbolique %s"
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, c-format
 msgid "cannot create symbolic link %s"
 msgstr "impossible de créer le lien symbolique %s"
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
 msgstr "%s possède un type de fichier inconnu"
 
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, c-format
 msgid "cannot un-backup %s"
 msgstr "impossible de désarchiver %s"
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr "%s → %s (désarchivage)\n"
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr "Alex Deymo"
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr "Utilisation : %s --coreutils-prog=PROGRAMME [PARAMÈTRES]... \n"
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+"Exécuter le programme intégré PROGRAMME avec les PARAMÈTRES donnés.\n"
+"\n"
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+"\n"
+"Utilisez : « %s --coreutils-prog=PROGRAMME --help » pour obtenir l’aide "
+"spécifique au programme.\n"
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, c-format
+msgid "unknown program %s"
+msgstr "programme %s inconnu"
+
+#: src/cp.c:157 src/mv.c:288
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -2129,14 +2197,14 @@ msgid ""
 "  or:  %s [OPTION]... -t DIRECTORY SOURCE...\n"
 msgstr ""
 "Utilisation : %s [OPTION]... [-T] SOURCE DEST\n"
-"         ou : %s [OPTION]... SOURCE... DIRECTORY\n"
-"         ou : %s [OPTION]... -t DIRECTORY SOURCE...\n"
+"         ou : %s [OPTION]... SOURCE... RÉPERTOIRE\n"
+"         ou : %s [OPTION]... -t RÉPERTOIRE SOURCE...\n"
 
-#: src/cp.c:162
+#: src/cp.c:163
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
-msgstr "Copier la SOURCE vers DEST, ou plusieurs SOURCEs vers DIRECTORY.\n"
+msgstr "Copier la SOURCE vers DEST ou plusieurs SOURCEs vers RÉPERTOIRE.\n"
 
-#: src/cp.c:168
+#: src/cp.c:169
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
 "      --attributes-only        don't copy the file data, just the "
@@ -2153,7 +2221,7 @@ msgstr ""
 "      --attributes-only        ne pas copier les données du fichier, "
 "seulement\n"
 "                                 les attributs\n"
-"      --backup[=CONTROL]       archiver chaque fichier de destination\n"
+"      --backup[=CONTRÔLE]      archiver chaque fichier de destination\n"
 "  -b                           comme --backup mais n'accepte pas d'argument\n"
 "      --copy-contents          copier le contenu des fichiers spéciaux en "
 "mode\n"
@@ -2161,7 +2229,7 @@ msgstr ""
 "  -d                           identique à --no-dereference --"
 "preserve=links\n"
 
-#: src/cp.c:177
+#: src/cp.c:178
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
 "                                 opened, remove it and try again (this "
@@ -2187,7 +2255,7 @@ msgstr ""
 "commande\n"
 "                                 dans SOURCE\n"
 
-#: src/cp.c:186
+#: src/cp.c:187
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
 "  -L, --dereference            always follow symbolic links in SOURCE\n"
@@ -2196,7 +2264,7 @@ msgstr ""
 "  -L, --dereference            toujours suivre les liens symboliques de "
 "SOURCE\n"
 
-#: src/cp.c:190
+#: src/cp.c:191
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
 "                                 a previous -i option)\n"
@@ -2208,7 +2276,7 @@ msgstr ""
 "  -P, --no-deference           ne jamais suivre les liens symboliques de "
 "SOURCE\n"
 
-#: src/cp.c:195
+#: src/cp.c:196
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
 "      --preserve[=ATTR_LIST]   preserve the specified attributes (default:\n"
@@ -2219,23 +2287,23 @@ msgid ""
 msgstr ""
 "  -p                           identique à --preserve=mode,ownership,"
 "timestamps\n"
-"      --preserve[=ATTR_LIST]   préserver les attributs indiqués (par défaut\n"
+"      --preserve[=LISTE_ATT]   préserver les attributs indiqués (par défaut\n"
 "                                 « mode,ownership,timestamps ») et si "
 "possible\n"
 "                                 les attributs supplémentaires « context »,\n"
 "                                 « links », « xattr » et « all »\n"
 
-#: src/cp.c:203
+#: src/cp.c:204
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                use full source file name under DIRECTORY\n"
 msgstr ""
-"      --no-preserve=ATTR_LIST  ne pas préserver les attributs spécifiques\n"
+"      --no-preserve=LISTE_ATT  ne pas préserver les attributs spécifiques\n"
 "      --parents                utiliser le nom de fichier source complet "
 "dans\n"
-"                                 DIRECTORY\n"
+"                                 RÉPERTOIRE\n"
 
-#: src/cp.c:207
+#: src/cp.c:208
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
 "      --reflink[=WHEN]         control clone/CoW copies. See below\n"
@@ -2244,7 +2312,7 @@ msgid ""
 "force)\n"
 msgstr ""
 "  -R, -r, --recursive          copier récursivement les répertoires\n"
-"      --reflink[=WHEN]         contrôler les copies clones/COW (Copy On "
+"      --reflink[=QUAND]        contrôler les copies clones/COW (Copy On "
 "Write)\n"
 "      --remove-destination     supprimer chaque fichier de destination "
 "existant\n"
@@ -2252,18 +2320,18 @@ msgstr ""
 "à\n"
 "                                 --force)\n"
 
-#: src/cp.c:213
+#: src/cp.c:214
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
 "                                 argument\n"
 msgstr ""
-"      --sparse=WHEN            contrôler la création des fichiers dispersés\n"
-"      --strip-trailing-slashes enlever les « / » de terminaison de chaque\n"
+"      --sparse=QUAND           contrôler la création des fichiers dispersés\n"
+"      --strip-trailing-slashes  enlever les « / » de terminaison de chaque\n"
 "                                 argument SOURCE\n"
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -2273,12 +2341,12 @@ msgid ""
 msgstr ""
 "  -s, --symbolic-link        créer des liens symboliques au lieu d'une "
 "copie\n"
-"  -S, --suffix=SUFFIX        écraser le suffixe habituel d'archivage\n"
-"      --target-directory=DIRECTORY  copier tous les arguments SOURCE dans\n"
-"                                    DIRECTORY\n"
+"  -S, --suffix=SUFFIXE       remplacer le suffixe habituel d'archivage\n"
+"      --target-directory=RÉPERTOIRE  copier tous les arguments SOURCE dans\n"
+"                                     RÉPERTOIRE\n"
 "  -T, --no-target-directory  traiter DEST comme un fichier normal\n"
 
-#: src/cp.c:224
+#: src/cp.c:225
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
 "                                 than the destination file or when the\n"
@@ -2294,7 +2362,20 @@ msgstr ""
 "  -v, --verbose                expliquer ce qui est fait\n"
 "  -x, --one-file-system        rester sur ce système de fichiers\n"
 
-#: src/cp.c:233
+#: src/cp.c:232
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+"  -Z                           définir le contexte de sécurité SELinux du\n"
+"                                 fichier de destination au type par défaut\n"
+"      --context[=CTX]          comme -Z ou, si CTX est indiqué, définir le\n"
+"                                 contexte de sécurité SELinux ou SMACK à "
+"CTX\n"
+
+#: src/cp.c:240
 msgid ""
 "\n"
 "By default, sparse SOURCE files are detected by a crude heuristic and the\n"
@@ -2326,7 +2407,7 @@ msgstr ""
 "échoue,\n"
 "ou, si --reflink=auto est indiqué, elle se rabat sur une copie classique.\n"
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 msgid ""
 "\n"
 "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n"
@@ -2344,7 +2425,7 @@ msgstr ""
 "Les valeurs possibles sont les suivantes :\n"
 "\n"
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2357,7 +2438,7 @@ msgstr ""
 "                    comporter comme « simple » dans le cas contraire\n"
 "  simple, never   effectuer toujours des archives simples\n"
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2369,92 +2450,104 @@ msgstr ""
 "« force » et « backup » sont utilisées et que SOURCE et DEST portent le\n"
 "même nom qu'un fichier normal existant.\n"
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, c-format
 msgid "failed to preserve times for %s"
-msgstr "échec de préservation des dates pour %s"
+msgstr "impossible de préserver les dates pour %s"
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, c-format
 msgid "failed to preserve permissions for %s"
-msgstr "échec de préservation des permissions de %s"
+msgstr "impossible de préserver les droits de %s"
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, c-format
 msgid "cannot make directory %s"
 msgstr "impossible de créer le répertoire %s"
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr "%s existe mais n'est pas un répertoire"
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
 #, c-format
 msgid "failed to access %s"
 msgstr "impossible d'accéder à %s"
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, c-format
 msgid "missing file operand"
 msgstr "opérande de fichier manquant"
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, c-format
 msgid "missing destination file operand after %s"
 msgstr "opérande de fichier cible manquant après %s"
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr ""
 "impossible de combiner --target-directory (-t) et --no-target-directory (-T)"
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, c-format
 msgid "target %s is not a directory"
 msgstr "la cible %s n'est pas un répertoire"
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr "avec --parents, la destination doit être un répertoire"
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, c-format
 msgid "multiple target directories specified"
 msgstr "plusieurs répertoires cibles indiqués"
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr ""
+"avertissement : --context a été ignorée, un noyau avec SELinux activé est "
+"nécessaire"
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr "impossible de créer un lien à la fois symbolique et direct"
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr "les options --backup et --no-clobber sont mutuellement exclusives"
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr "--reflink ne peut être utilisé qu'avec --sparse=auto"
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr "type d'archive"
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, c-format
+msgid "cannot set target context and preserve it"
+msgstr "impossible de définir le contexte cible et de le préserver"
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr ""
 "impossible de préserver le contexte de sécurité en dehors d'un noyau SELinux"
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr ""
@@ -2462,145 +2555,145 @@ msgstr ""
 "charge xattr"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr "Stuart Kemp"
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr "l'entrée a disparu"
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr "%s : numéro de ligne hors limite"
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, c-format
 msgid "%s: %s: line number out of range"
 msgstr "%s : %s : numéro de ligne hors limite"
 
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, c-format
 msgid " on repetition %s\n"
 msgstr " par répétition %s\n"
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, c-format
 msgid "%s: %s: match not found"
 msgstr "%s : %s : pas de correspondance"
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr "erreur dans la recherche de l'expression rationnelle"
 
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, c-format
 msgid "write error for %s"
 msgstr "erreur d'écriture pour %s"
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, c-format
 msgid "%s: integer expected after delimiter"
 msgstr "%s : entier attendu après le délimiteur"
 
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr "%s : « } » est nécessaire pour un compteur de répétition"
 
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr "%s} : entier nécessaire entre « { » et « } »"
 
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr "%s : délimiteur de fermeture « %c » manquant"
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr "%s : expression rationnelle incorrecte : %s"
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr "%s : motif incorrect"
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr "%s : le numéro de ligne doit être plus grand que zéro"
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr ""
 "le numéro de ligne %s est plus petit que le numéro de ligne précédent, %s"
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr ""
-"avertissement, le numéro de ligne %s est le même que le numéro de ligne "
+"avertissement : le numéro de ligne %s est le même que le numéro de ligne "
 "précédent"
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr "symbole de conversion manquant dans le suffixe"
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr "le symbole de conversion %c est incorrect dans le suffixe"
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr "le symbole de conversion \\%.3o est incorrect dans le suffixe"
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr "attributs de spécification de conversion incorrects : %%%c%c"
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr "trop de spécifications de conversion %% dans le suffixe"
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr "la spécification de conversion %% est manquante dans le suffixe"
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr "%s : nombre incorrect"
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
-msgstr "Utilisation : %s [OPTION]... FILE PATTERN...\n"
+msgstr "Utilisation : %s [OPTION]... FICHIER MOTIF...\n"
 
-#: src/csplit.c:1455
+#: src/csplit.c:1483
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
 "and output byte counts of each piece to standard output.\n"
 msgstr ""
-"Extraire des morceaux de FILE séparés par un ou des PATTERNs vers les "
+"Extraire des morceaux de FICHIER séparés par un ou des MOTIFs vers les "
 "fichiers\n"
 "« xx01 », « xx02 », etc. ainsi que le taille en octet de chaque séquence "
 "vers\n"
 "la sortie standard.\n"
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2608,30 +2701,35 @@ msgid ""
 "  -k, --keep-files           do not remove output files on errors\n"
 msgstr ""
 "  -b, --suffix-format=FORMAT utiliser le FORMAT sprintf au lieu de %02d\n"
-"  -f, --prefix=PREFIX        utiliser PREFIX au lieu de « xx »\n"
+"  -f, --prefix=PRÉFIXE       utiliser PRÉFIXE au lieu de « xx »\n"
 "  -k, --keep-files           ne pas supprimer les fichiers de sortie en cas\n"
 "                               d'erreurs\n"
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr ""
+"  -m, --suppress-matched     supprimer les lignes correspondant à MOTIF\n"
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
 "  -z, --elide-empty-files    remove empty output files\n"
 msgstr ""
-"  -n, --digits=DIGITS        utiliser DIGITS chiffres au lieu de 2\n"
+"  -n, --digits=CHIFFRES      utiliser le nombre de CHIFFRES au lieu de 2\n"
 "  -s, --quiet, --silent      ne pas afficher la taille des fichiers de "
 "sortie\n"
 "  -z, --elide-empty-files    supprimer les fichiers de sortie vides\n"
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
 msgstr ""
 "\n"
-"Lire l'entrée standard si le FILE est -. Chaque PATTERN peut être :\n"
+"Lire l'entrée standard si le FICHIER est -. Chaque MOTIF peut être :\n"
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 msgid ""
 "\n"
 "  INTEGER            copy up to but not including specified line number\n"
@@ -2643,35 +2741,34 @@ msgid ""
 "A line OFFSET is a required '+' or '-' followed by a positive integer.\n"
 msgstr ""
 "\n"
-"  INTEGER            copier jusqu'à, sans inclure le nombre de lignes "
+"  ENTIER             copier jusqu'à, sans inclure le nombre de lignes "
 "indiqué\n"
-"  /REGEXP/[OFFSET]   copier jusqu'à, sans inclure une ligne correspondante\n"
-"  %%REGEXP%%[OFFSET] ignorer jusqu'à, sans inclure une ligne correspondante\n"
-"  {INTEGER}          répéter le motif précédent le nombre de fois indiqué\n"
+"  /EXP_RAT/[POSITION]  copier jusqu'à, sans inclure une ligne "
+"correspondante\n"
+"  %%EXP_RAT%%[POSITION]  ignorer jusqu'à, sans inclure une ligne "
+"correspondante\n"
+"  {ENTIER}           répéter le motif précédent le nombre de fois indiqué\n"
 "  {*}                répéter le motif précédent autant que possible\n"
 "\n"
-"Une ligne OFFSET nécessite un « + » ou un « - » suivi d'un entier positif.\n"
+"Une ligne POSITION nécessite un « + » ou un « - » suivi d'un entier "
+"positif.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cut.c:44 src/paste.c:52
 msgid "David M. Ihnat"
 msgstr "David M. Ihnat"
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr "champs et positions sont numérotés à partir de 1"
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
-msgstr "Utilisation : %s [OPTION]... [FILE]...\n"
+msgstr "Utilisation : %s [OPTION]... [FICHIER]...\n"
 
-#: src/cut.c:193
+#: src/cut.c:176
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr ""
-"Afficher des extraits de lignes de chaque FILE vers la sortie standard.\n"
+"Afficher des extraits de lignes de chaque FICHIER vers la sortie standard.\n"
 
-#: src/cut.c:199
+#: src/cut.c:182
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
 "  -c, --characters=LIST   select only these characters\n"
@@ -2682,7 +2779,7 @@ msgstr ""
 "  -d, --delimiter=DELIM   utiliser DELIM au lieu de TAB comme délimiteur\n"
 "                            de champ\n"
 
-#: src/cut.c:204
+#: src/cut.c:187
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
 "                            that contains no delimiter character, unless\n"
@@ -2696,7 +2793,7 @@ msgstr ""
 "indiquée\n"
 "  -n                      (ignoré)\n"
 
-#: src/cut.c:210
+#: src/cut.c:193
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
 "                            or fields\n"
@@ -2704,17 +2801,19 @@ msgstr ""
 "      --complement        compléter le jeu d'octets, caractères ou champs\n"
 "                            sélectionnés\n"
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
 "                            the default is to use the input delimiter\n"
 msgstr ""
 "  -s, --only-delimited    ne pas afficher les lignes sans délimiteurs\n"
-"      --output-delimiter=STRING  utiliser STRING comme délimiteur de sortie\n"
-"                            le délimiteur d'entrée est utilisé par défaut\n"
+"      --output-delimiter=CHAÎNE  utiliser CHAÎNE comme délimiteur de "
+"sortie,\n"
+"                                 le délimiteur d'entrée est utilisé par "
+"défaut\n"
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2722,12 +2821,12 @@ msgid ""
 "in the same order that it is read, and is written exactly once.\n"
 msgstr ""
 "\n"
-"Utilisez une, et seulement une parmi -b, -c ou -f. Chaque LIST est faite "
+"Utilisez une, et seulement une, parmi -b, -c ou -f. Chaque LIST est faite "
 "d'un\n"
 "ou de plusieurs intervalles séparés par des virgules. L'entrée sélectionnée\n"
-"est écrite dans le même ordre qu'elle est lue, et écrite une seule fois.\n"
+"est écrite dans le même ordre qu'elle est lue et écrite une seule fois.\n"
 
-#: src/cut.c:227
+#: src/cut.c:210
 msgid ""
 "Each range is one of:\n"
 "\n"
@@ -2745,49 +2844,53 @@ msgstr ""
 "  N-M   du Nième au Mième octets (inclus), caractère ou champ\n"
 "  -M    du premier au Mième octets (inclus), caractère ou champ\n"
 "\n"
-"Sans FILE, ou quand FILE est -, lire l'entrée standard.\n"
+"Sans FICHIER, ou quand FICHIER est -, lire l'entrée standard.\n"
 
-#: src/cut.c:367 src/cut.c:493
+#: src/cut.c:300 src/cut.c:394
 msgid "invalid byte, character or field list"
 msgstr "octet, caractère ou liste de champs incorrects"
 
-#: src/cut.c:387
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr "champs et positions sont numérotés à partir de 1"
+
+#: src/cut.c:320
 msgid "invalid range with no endpoint: -"
 msgstr "intervalle incorrect sans limite de fin : -"
 
-#: src/cut.c:403
+#: src/cut.c:334
 msgid "invalid decreasing range"
 msgstr "intervalle décroissant incorrect"
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, c-format
 msgid "byte offset %s is too large"
 msgstr "le décalage d'octet %s est trop grand"
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, c-format
 msgid "field number %s is too large"
 msgstr "le numéro de champ %s est trop grand"
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr "un seul type de liste peut être indiqué"
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr "le délimiteur doit être un seul caractère"
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr "une liste d'octets, de caractères ou de champs doit être indiquée"
 
-#: src/cut.c:850
+#: src/cut.c:790
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr ""
 "un délimiteur ne peut être indiqué que lorsque des champs sont manipulés"
 
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
@@ -2795,11 +2898,11 @@ msgstr ""
 "la suppression des lignes non délimitées n'est permise\n"
 "\tque lorsque des champs sont manipulés."
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr "liste des champs manquante"
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr "liste des positions manquante"
 
@@ -2826,13 +2929,13 @@ msgid ""
 "                            'hours', 'minutes', 'seconds', or 'ns' for date\n"
 "                            and time to the indicated precision.\n"
 msgstr ""
-"  -d, --date=STRING         afficher la date indiqué par STRING, pas "
+"  -d, --date=CHAÎNE         afficher la date indiqué par CHAÎNE, pas "
 "l'actuelle\n"
-"  -f, --file=DATEFILE       identique à --date pour chaque ligne de "
-"DATEFILE\n"
-"  -I[TIMESPEC], --iso-8601[=TIMESPEC]  afficher la date et l'heure au "
+"  -f, --file=FIC_DATE       identique à --date pour chaque ligne de "
+"FIC_DATE\n"
+"  -I[SPEC_DATE], --iso-8601[=SPEC_DATE]  afficher la date et l'heure au "
 "format\n"
-"                            ISO 8601. TIMESPEC est « date » pour la date "
+"                            ISO 8601. SPEC_DATE est « date » pour la date "
 "seule\n"
 "                            (par défaut), « hours », « minutes », "
 "« seconds » ou\n"
@@ -2845,8 +2948,8 @@ msgid ""
 "  -R, --rfc-2822            output date and time in RFC 2822 format.\n"
 "                            Example: Mon, 07 Aug 2006 12:34:56 -0600\n"
 msgstr ""
-"  -r, --reference=FILE      afficher la dernière date de modification de "
-"FILE\n"
+"  -r, --reference=FICHIER   afficher la dernière date de modification de "
+"FICHIER\n"
 "  -R, --rfc-2822            afficher la date et l'heure au format RFC 2822.\n"
 "                            Exemple : Mon, 07 Aug 2006 12:34:56 -0600\n"
 
@@ -2858,19 +2961,18 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
-"      --rfc-3339=TIMESPEC  afficher la date et l'heure au format RFC 3339.\n"
-"                           TIMESPEC est « date » pour la date seule par "
-"défaut),\n"
-"                           « hours », « minutes », « seconds » ou « ns » "
-"pour\n"
-"                           indiquer la précision de date et heure.\n"
+"      --rfc-3339=SPEC_DATE  afficher la date et l'heure au format RFC 3339.\n"
+"                           SPEC_DATE est « date » pour la date seule par\n"
+"                           défaut), « seconds » ou « ns » pour indiquer la\n"
+"                           précision de date et heure.\n"
 "                           Les éléments de date et d'heure sont séparés par\n"
 "                           une seule espace : 2006-08-07 12:34:56-06:00\n"
-"  -s, --set=STRING         initialiser la date selon STRING\n"
+"  -s, --set=CHAÃŽNE         initialiser la date selon CHAÃŽNE\n"
 "  -u, --utc, --universal   afficher ou initialiser au système de temps "
 "universel\n"
+"                           (UTC)\n"
 
 #: src/date.c:158
 msgid ""
@@ -3052,7 +3154,7 @@ msgstr ""
 "\n"
 "Chaque attribut est suivi d'un champ optionnel de largeur, sous la forme\n"
 "d'un nombre décimal puis d'un éventuel modificateur suivant :\n"
-"E pour utiliser la représentation localisée alternative si disponible, ou\n"
+"E pour utiliser la représentation localisée alternative si disponible ou\n"
 "O pour utiliser la représentation localisée alternative de symboles "
 "numériques\n"
 "si disponible.\n"
@@ -3082,10 +3184,10 @@ msgstr ""
 "Martinique :\n"
 "  $ date --date='TZ=\"America/Martinique\" 09:00 next Fri'\n"
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr "entrée standard"
@@ -3131,7 +3233,7 @@ msgstr ""
 msgid "cannot set date"
 msgstr "impossible d'initialiser la date"
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, c-format
 msgid "time %s is out of range"
 msgstr "heure %s hors limite"
@@ -3142,7 +3244,7 @@ msgstr "heure %s hors limite"
 msgid "Paul Rubin"
 msgstr "Paul Rubin"
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
@@ -3151,7 +3253,7 @@ msgstr ""
 "Utilisation : %s [OPERAND]...\n"
 "         ou : %s OPTION\n"
 
-#: src/dd.c:526
+#: src/dd.c:532
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
 "\n"
@@ -3163,14 +3265,14 @@ msgid ""
 msgstr ""
 "Copie un fichier en le convertissant et le formatant selon les opérandes.\n"
 "\n"
-"  bs=BYTES        lire et écrire jusqu'à BYTES octets à la fois\n"
-"  cbs=BYTES       convertir BYTES octets à la fois\n"
+"  bs=OCTETS       lire et écrire jusqu'à OCTETS octets à la fois\n"
+"  cbs=OCTETS      convertir OCTETS octets à la fois\n"
 "  conv=CONVS      convertir le fichier en liste de symboles séparés de "
 "virgules\n"
 "  count=N         ne copier que N blocs d'entrée\n"
-"  ibs=BYTES       lire jusqu'à BYTES octets à la fois (512 par défaut)\n"
+"  ibs=OCTETS      lire jusqu'à OCTETS octets à la fois (512 par défaut)\n"
 
-#: src/dd.c:535
+#: src/dd.c:541
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
 "  iflag=FLAGS     read as per the comma separated symbol list\n"
@@ -3182,22 +3284,22 @@ msgid ""
 "  status=WHICH    WHICH info to suppress outputting to stderr;\n"
 "                  'noxfer' suppresses transfer stats, 'none' suppresses all\n"
 msgstr ""
-"  if=FILE         lire FILE au lieu de l'entrée standard (stdin)\n"
-"  iflag=FLAGS     lire selon la liste de symboles séparés par des virgules\n"
-"  obs=BYTES       écrire BYTES octets à la fois (512 par défaut)\n"
-"  of=FILE         écrire dans FILE au lieu de la sortie standard (stdout)\n"
-"  oflag=FLAGS     écrire selon la liste de symboles séparés par des "
+"  if=FICHIER      lire FICHIER au lieu de l'entrée standard (stdin)\n"
+"  iflag=ATTRS     lire selon la liste de symboles séparés par des virgules\n"
+"  obs=OCTETS      écrire OCTETS octets à la fois (512 par défaut)\n"
+"  of=FICHIER      écrire dans FICHIER au lieu de la sortie standard "
+"(stdout)\n"
+"  oflag=ATTRS     écrire selon la liste de symboles séparés par des "
 "virgules\n"
 "  seek=N          se déplacer de N blocs de taille « obs » au début de la "
 "sortie\n"
 "  skip=N          ignorer N blocs de taille « ibs » au début de l'entrée\n"
-"  status=WHICH    les renseignements WHICH à supprimer de la sortie "
-"d'erreur\n"
-"                    standard : « noxfer » supprime les statistiques de "
+"  status=QUELS    les renseignements à supprimer de la sortie d'erreur\n"
+"                  standard : « noxfer » supprime les statistiques de "
 "transfert\n"
-"                    et « none » supprime tout\n"
+"                  et « none » supprime tout\n"
 
-#: src/dd.c:546
+#: src/dd.c:552
 msgid ""
 "\n"
 "N and BYTES may be followed by the following multiplicative suffixes:\n"
@@ -3208,7 +3310,7 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"N et BYTES peuvent être suivis des suffixes multiplicatifs suivants :\n"
+"N et OCTETS peuvent être suivis des suffixes multiplicatifs suivants :\n"
 "c = 1, w = 2, b = 512, kB = 1000, K = 1024, MB = 1000*1000, M = 1024*1024,\n"
 "xM = M, GB = 1000*1000*1000, G = 1024*1024*1024 et ainsi de suite pour\n"
 "T, P, E, Z et Y.\n"
@@ -3216,7 +3318,7 @@ msgstr ""
 "Chaque symbole CONV peut être :\n"
 "\n"
 
-#: src/dd.c:555
+#: src/dd.c:561
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
 "  ebcdic    from ASCII to EBCDIC\n"
@@ -3242,15 +3344,15 @@ msgstr ""
 "  lcase     transformer les majuscules en minuscules\n"
 "  ucase     transformer les minuscules en majuscules\n"
 "  sparse    essayer de chercher plutôt qu'écrire la sortie pour les blocs\n"
-"              d'entrée NUL\n"
+"              d'entrée NULL\n"
 "  swab      inverser chaque paire d'octets en entrée\n"
-"  sync      remplir chaque bloc lu avec des NUL jusqu'à la taille « ibs » ; "
+"  sync      remplir chaque bloc lu par des NULL jusqu'à la taille « ibs » ; "
 "avec\n"
 "              « block » ou « unblock », remplir avec des espaces au lieu de "
-"NUL\n"
+"NULL\n"
 "\n"
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -3266,7 +3368,7 @@ msgstr ""
 "  fdatasync écrire physiquement les données en sortie avant la fin\n"
 "  fsync     identique, mais écrire aussi les métadonnées\n"
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -3280,81 +3382,81 @@ msgstr ""
 "  append    mode d'ajout (n'a de sens que pour la sortie ; conv=notrunc "
 "suggéré)\n"
 
-#: src/dd.c:583
+#: src/dd.c:589
 msgid "  cio       use concurrent I/O for data\n"
 msgstr "  cio       utiliser des E/S simultanées pour les données\n"
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr "  direct    utiliser des E/S directes pour les données\n"
 
-#: src/dd.c:587
+#: src/dd.c:593
 msgid "  directory  fail unless a directory\n"
 msgstr "  directory échouer sauf s'il s'agit d'un répertoire\n"
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr "  dsync     utiliser des E/S synchronisées pour les données\n"
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr "  sync      identique mais aussi pour les métadonnées\n"
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr "  fullblock accumuler des blocs pleins en entrée (uniquement iflag)\n"
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr "  nonblock  utiliser des E/S non bloquantes\n"
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr "  noatime   ne pas mettre à jour la date d'accès\n"
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr "  nocache   abandonner les données en cache\n"
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr "  noctty    ne pas assigner de terminal contrôleur depuis le fichier\n"
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr "  nofollow  ne pas suivre les liens symboliques\n"
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr "  nolinks   échouer en cas de liens multiples\n"
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr "   binary   utiliser des E/S binaires pour les données\n"
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr "  text      utiliser des E/S textuelles pour les données\n"
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr ""
 "  count_bytes  traiter « count=N » comme un décompte d'octets (seulement "
 "iflag)\n"
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr ""
 "  skip_bytes  traiter « skip=N » comme un décompte d'octets (seulement "
 "iflag)\n"
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr ""
 "  seek_bytes  traiter « seek=N » comme un décompte d'octets (seulement "
 "oflag)\n"
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, c-format
 msgid ""
 "\n"
@@ -3383,7 +3485,17 @@ msgstr ""
 "\n"
 "Les options sont :\n"
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr "impossible d'allouer un tampon d'entrée de %zu octets (%s)"
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr "impossible d'allouer un tampon de sortie de %zu octets (%s)"
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
@@ -3392,21 +3504,21 @@ msgstr ""
 "%<PRIuMAX>+%<PRIuMAX> enregistrements lus\n"
 "%<PRIuMAX>+%<PRIuMAX> enregistrements écrits\n"
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
 msgstr[0] "%<PRIuMAX> enregistrement tronqué\n"
 msgstr[1] "%<PRIuMAX> enregistrements tronqués\n"
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
 msgstr[0] "%<PRIuMAX> octet (%s) copié"
 msgstr[1] "%<PRIuMAX> octets (%s) copiés"
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr "Infinité B"
 
@@ -3420,160 +3532,150 @@ msgstr "Infinité B"
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
 msgstr ", %g s, %s/s\n"
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, c-format
 msgid "closing input file %s"
 msgstr "fermeture du fichier d'entrée %s"
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr "fermeture du fichier de sortie %s"
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr "impossible de désactiver O_DIRECT : %s"
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, c-format
 msgid "writing to %s"
 msgstr "écriture vers %s"
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, c-format
 msgid "unrecognized operand %s"
 msgstr "opérande %s non reconnu"
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 msgid "invalid conversion"
 msgstr "conversion incorrecte"
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 msgid "invalid input flag"
 msgstr "attribut d'entrée incorrect"
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 msgid "invalid output flag"
 msgstr "attribut de sortie incorrect"
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 msgid "invalid status flag"
 msgstr "attribut d'état incorrect"
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, c-format
 msgid "invalid number %s"
 msgstr "nombre %s incorrect"
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr "impossible de combiner deux options parmi ascii, ebcdic et ibm"
 
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, c-format
 msgid "cannot combine block and unblock"
 msgstr "impossible de combiner block et unblock"
 
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, c-format
 msgid "cannot combine lcase and ucase"
 msgstr "impossible de combiner lcase et ucase"
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, c-format
 msgid "cannot combine excl and nocreat"
 msgstr "impossible de combiner excl et nocreat"
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, c-format
 msgid "cannot combine direct and nocache"
 msgstr "impossible de combiner direct et nocache"
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
 "  of mt_type=0x%0lx -- see <sys/mtio.h> for the list of types"
 msgstr ""
-"Avertissement : contournement d'une anomalie de lseek présente dans le "
+"avertissement : contournement d'une anomalie de lseek présente dans le "
 "noyau\n"
 "  pour le fichier (%s) de type mt_type=0x%0lx\n"
 "  — consultez <sys/mtio.h> pour la liste des types"
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, c-format
 msgid "%s: cannot skip"
 msgstr "%s : impossible d'ignorer"
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, c-format
 msgid "%s: cannot seek"
 msgstr "%s : impossible de se déplacer"
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr "débordement du décalage à la lecture du fichier %s"
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr ""
 "avertissement : décalage de fichier incorrect suite à un échec de lecture"
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr "impossible de contourner une anomalie du noyau finalement"
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, c-format
 msgid "setting flags for %s"
 msgstr "initialisation des attributs pour %s"
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr "impossible d'allouer un tampon d'entrée de %zu octets (%s)"
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr "impossible d'allouer un tampon de sortie de %zu octets (%s)"
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr "%s : impossible d'ignorer jusqu'au décalage indiqué"
 
-#: src/dd.c:2133
+#: src/dd.c:2172
 #, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
 msgstr "impossible de tronquer le fichier de sortie %2$s à %1$<PRIdMAX> octets"
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr "fdatasync a échoué pour %s"
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
 msgstr "fsync a échoué pour %s"
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, c-format
 msgid "failed to open %s"
 msgstr "impossible d'ouvrir %s"
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
@@ -3582,128 +3684,138 @@ msgstr ""
 "décalage trop grand : impossible de tronquer à la longueur seek="
 "%<PRIuMAX> blocs (de %lu octets)"
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr "impossible de tronquer le fichier de sortie %2$s à %1$<PRIuMAX> octets"
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, c-format
 msgid "failed to discard cache for: %s"
 msgstr "impossible d'abandonner le cache pour : %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr "Paul Eggert"
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr "Sys. de fichiers"
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr "Type"
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr "blocs"
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr "Utilisé"
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr "Disponible"
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr "Uti%"
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr "Inœuds"
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr "IUtil."
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr "ILibre"
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr "IUti%"
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr "Monté sur"
 
-#: src/df.c:383
+#: src/df.c:207
+msgid "File"
+msgstr "Fichier"
+
+#: src/df.c:387
 #, c-format
-msgid "option --output: field '%s' unknown"
-msgstr "option --output : champ « %s » inconnu"
+msgid "option --output: field %s unknown"
+msgstr "option --output : champ %s inconnu"
 
-#: src/df.c:390
+#: src/df.c:394
 #, c-format
-msgid "option --output: field '%s' used more than once"
-msgstr "option --output : champ « %s » utilisé plusieurs fois"
+msgid "option --output: field %s used more than once"
+msgstr "option --output : champ %s utilisé plusieurs fois"
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr "Taille"
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr "Dispo"
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr "Capacité"
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
 msgstr "%2$s de %1$s"
 
-#: src/df.c:1210
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr "impossible d'accéder à %s : sur-monté par un autre périphérique"
+
+#: src/df.c:1384
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
 "or all file systems by default.\n"
 msgstr ""
-"Afficher des renseignements sur le système de fichiers qui contient FILE,\n"
+"Afficher des renseignements sur le système de fichiers qui contient "
+"FICHIER,\n"
 "ou sur tous les systèmes de fichiers par défaut.\n"
 
-#: src/df.c:1217
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
 "  -a, --all             inclure les systèmes de fichiers factices\n"
-"  -B, --block-size=SIZE  convertir les tailles en SIZE avant de les "
-"afficher.\n"
-"                          Par exemple « -BM » affiche les tailles en unités "
-"de\n"
-"                          1 048 576 octets. Voir le format de SIZE ci-"
-"dessous.\n"
+"  -B, --block-size=TAILLE  convertir les tailles en TAILLE avant de les\n"
+"                           afficher ; par exemple « -BM » affiche les "
+"tailles en\n"
+"                           unités de 1 048 576 octets ;\n"
+"                           consultez le format de TAILLE ci-dessous\n"
 "      --total           produire un total général\n"
 "  -h, --human-readable  afficher les tailles dans un format lisible (par "
 "exemple\n"
 "                          1K, 234M ou 2G)\n"
 "  -H, --si              identique avec un multiple de 1000 au lieu de 1024\n"
 
-#: src/df.c:1227
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -3719,7 +3831,7 @@ msgstr ""
 "les\n"
 "                          renseignements d'utilisation (par défaut)\n"
 
-#: src/df.c:1234
+#: src/df.c:1409
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
 "                               or print all fields if FIELD_LIST is "
@@ -3731,10 +3843,9 @@ msgid ""
 "  -x, --exclude-type=TYPE   limit listing to file systems not of type TYPE\n"
 "  -v                    (ignored)\n"
 msgstr ""
-"      --output[=FIELD_LIST]  utiliser le format de sortie défini par "
-"FIELD_LIST,\n"
-"                             ou afficher tous les champs si FIELD_LIST est "
-"omis.\n"
+"      --output[=LISTE_CHAMPS]  utiliser le format de sortie défini par\n"
+"                               LISTE_CHAMPS, ou afficher tous les champs en\n"
+"                               absence d’argument.\n"
 "  -P, --portability     utiliser le format de sortie POSIX\n"
 "      --sync            invoquer sync avant d'obtenir les renseignements\n"
 "                          d'utilisation\n"
@@ -3746,49 +3857,41 @@ msgstr ""
 "                           que ceux de type TYPE\n"
 "  -v                    (ignorée)\n"
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
 "\n"
-"FIELD_LIST est une liste séparée par des virgules de colonnes à inclure. "
+"LISTE_CHAMPS est une liste séparée par des virgules de colonnes à inclure. "
 "Les\n"
 "noms de champs possibles sont : « source », « fstype », « itotal », "
 "« iused »,\n"
-"« iavail », « ipcent », « size », « used », « avail », « pcent » et "
-"« target »\n"
-"(consultez la page info).\n"
+"« iavail », « ipcent », « size », « used », « avail », « pcent », « file » "
+"et\n"
+"« target » (consultez la page info).\n"
 
-#: src/df.c:1285
+#: src/df.c:1460
 #, c-format
 msgid "options %s and %s are mutually exclusive"
 msgstr "les options %s et %s sont mutuellement exclusives"
 
-#: src/df.c:1335
-msgid "warning: "
-msgstr "avertissement : "
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr "l'option longue « --megabytes » est obsolète et sera bientôt supprimée"
-
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr "le système de fichiers %s est à la fois sélectionné et exclu"
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr "Avertissement : "
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 msgid "cannot read table of mounted file systems"
 msgstr "impossible de lire la table des systèmes de fichiers montés"
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr "aucun système de fichiers traité"
@@ -3798,10 +3901,10 @@ msgstr "aucun système de fichiers traité"
 msgid "H. Peter Anvin"
 msgstr "H. Peter Anvin"
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
-msgstr "Utilisation : %s [OPTION]... [FILE]\n"
+msgstr "Utilisation : %s [OPTION]... [FICHIER]\n"
 
 #: src/dircolors.c:98
 msgid ""
@@ -3831,7 +3934,7 @@ msgid ""
 "For details on the format of these files, run 'dircolors --print-database'.\n"
 msgstr ""
 "\n"
-"Si FILE est fourni, le lire pour déterminer les couleurs à utiliser pour "
+"Si FICHIER est fourni, le lire pour déterminer les couleurs à utiliser pour "
 "les\n"
 "types de fichiers et les extensions. Autrement, la base de données "
 "précompilée\n"
@@ -3871,13 +3974,13 @@ msgstr ""
 #, c-format
 msgid "no SHELL environment variable, and no shell type option given"
 msgstr ""
-"aucune variable d'environnement SHELL, et aucune option de type de shell "
+"aucune variable d'environnement SHELL et aucune option de type de shell "
 "donnée"
 
 #: src/dirname.c:50
 #, c-format
 msgid "Usage: %s [OPTION] NAME...\n"
-msgstr "Utilisation : %s [OPTION] NAME...\n"
+msgstr "Utilisation : %s [OPTION] NOM...\n"
 
 #: src/dirname.c:54
 msgid ""
@@ -3886,17 +3989,17 @@ msgid ""
 "directory).\n"
 "\n"
 msgstr ""
-"Afficher chaque NAME en supprimant son dernier composant et sa barre "
-"oblique\n"
-"finale ; si NAME ne contient pas de « / », la sortie sera « . » (signifiant\n"
+"Afficher chaque NOM en supprimant son dernier composant et sa barre oblique\n"
+"finale ; si NOM ne contient pas de « / », la sortie sera « . » (signifiant\n"
 "le répertoire actuel).\n"
 "\n"
 
 #: src/dirname.c:59
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
 msgstr ""
-"  -z, --zero     séparer la sortie par des NULL au lieu de changements de "
-"ligne\n"
+"  -z, --zero     terminer chaque ligne de sortie par NULL, pas un "
+"changement\n"
+"                         de ligne\n"
 
 #: src/dirname.c:64
 #, c-format
@@ -3913,26 +4016,24 @@ msgstr ""
 "  %s rep1/cha rep2/cha  → « rep1 » suivi de « rep2 »\n"
 "  %s stdio.h            → « . »\n"
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
 "  or:  %s [OPTION]... --files0-from=F\n"
 msgstr ""
-"Utilisation : %s [OPTION]... [FILE]...\n"
+"Utilisation : %s [OPTION]... [FICHIER]...\n"
 "         ou : %s [OPTION]... --files0-from=F\n"
 
-#: src/du.c:274
+#: src/du.c:285
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr ""
-"Synthétiser l'utilisation de l'espace disque pour chaque FILE, "
-"récursivement\n"
+"Synthétiser l’occupation d’espace disque pour chaque FICHIER, récursivement\n"
 "pour les répertoires.\n"
 
-#: src/du.c:280
+#: src/du.c:291
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3940,13 +4041,13 @@ msgid ""
 "                          larger due to holes in ('sparse') files, internal\n"
 "                          fragmentation, indirect blocks, and the like\n"
 msgstr ""
-"  -0, --null            terminer chaque ligne de sortie par un octet NULL\n"
-"                          au lieu d'un changement de ligne\n"
+"  -0, --null            terminer chaque ligne de sortie par NULL, pas un\n"
+"                          changement de ligne\n"
 "  -a, --all             afficher le décompte pour tous les fichiers, pas\n"
 "                          seulement pour les répertoires\n"
 "      --apparent-size   afficher les tailles apparentes, au lieu de "
-"l'occupation\n"
-"                          disque ; même si la taille apparente est\n"
+"l’occupation\n"
+"                          d’espace disque ; même si la taille apparente est\n"
 "                          habituellement plus petite, elle peut être plus "
 "grande\n"
 "                          en raison de trous dans les fichiers (« sparse »), "
@@ -3955,11 +4056,11 @@ msgstr ""
 "raisons\n"
 "                          similaires\n"
 
-#: src/du.c:289
+#: src/du.c:300
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3970,12 +4071,11 @@ msgid ""
 "                          line argument;  --max-depth=0 is the same as\n"
 "                          --summarize\n"
 msgstr ""
-"  -B, --block-size=SIZE  convertir les tailles en SIZE avant de les "
-"afficher.\n"
-"                          Par exemple, « -BM » affiche les tailles en unités "
-"de\n"
-"                          1 048 576 octets. Consultez le format SIZE ci-"
-"dessous.\n"
+"  -B, --block-size=TAILLE  convertir les tailles en TAILLE avant de les\n"
+"                           afficher ; par exemple, « -BM » affiche les "
+"tailles\n"
+"                           en unités de 1 048 576 octets ;\n"
+"                           consultez le format de TAILLE ci-dessous\n"
 "  -b, --bytes           équivalent à « --apparent-size --block-size=1 »\n"
 "  -c, --total           produire le total général\n"
 "  -D, --dereference-args  ne déréférencer que les liens symboliques sur\n"
@@ -3987,25 +4087,28 @@ msgstr ""
 "                           selon les arguments de la ligne de commande ;\n"
 "                           --max-depth=0 est identique à --summarize\n"
 
-#: src/du.c:302
+#: src/du.c:313
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
-"      --files0-from=F   résumer l'occupation disque des noms de fichiers\n"
-"                          terminés par NULL, indiqués dans le fichier F. Si "
+"      --files0-from=F   résumer l’occupation de disque des noms de fichiers\n"
+"                          terminés par NULL, indiqués dans le fichier F ; si "
 "F\n"
 "                          est -, alors les noms sont lus sur l'entrée "
 "standard\n"
 "  -H,                   équivalent à --dereference-args (-D)\n"
 "  -h, --human-readable  afficher les tailles dans un format lisible\n"
-"                          (par exemple 1K, 234M, ou 2G)\n"
+"                          (par exemple 1K, 234M ou 2G)\n"
+"  -i, --inodes          afficher les renseignements des inœuds, pas des "
+"blocs\n"
 
-#: src/du.c:310
+#: src/du.c:322
 msgid ""
 "  -k                    like --block-size=1K\n"
 "  -L, --dereference     dereference all symbolic links\n"
@@ -4017,11 +4120,12 @@ msgstr ""
 "  -l, --count-links     comptabiliser les tailles de tous les liens directs\n"
 "  -m                    identique à --block-size=1M\n"
 
-#: src/du.c:316
+#: src/du.c:328
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
@@ -4031,7 +4135,7 @@ msgstr ""
 "1024\n"
 "  -s, --summarize       n'afficher qu'un total pour chaque argument\n"
 
-#: src/du.c:322
+#: src/du.c:334
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
 "                          or entries greater than SIZE if negative\n"
@@ -4040,101 +4144,102 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
 msgstr ""
-"  -t, --threshold=SIZE  exclure les entrées plus petites que SIZE si "
-"positive,\n"
-"                          ou les entrées plus grandes que SIZE si négative\n"
+"  -t, --threshold=TAILLE  exclure les entrées plus petites que TAILLE si\n"
+"                          positive, ou plus grandes que TAILLE si négative\n"
 "      --time            afficher l'heure de la dernière modification de "
 "tous\n"
 "                          les fichiers du répertoire ou des sous-"
 "répertoires\n"
-"      --time=WORD       afficher l'heure de WORD au lieu de l'heure de\n"
+"      --time=MOT        afficher l'heure de MOT au lieu de l'heure de\n"
 "                          modification : atime, access, use, ctime ou "
 "status.\n"
-"      --time-style=STYLE afficher l'heure en utilisant le STYLE :\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT est interprété comme « date »\n"
+"      --time-style=STYLE afficher l'heure en utilisant le STYLE qui peut "
+"être :\n"
+"                          full-iso, long-iso, iso ou +FORMAT ;\n"
+"                          FORMAT est interprété comme dans « date »\n"
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
 "  -x, --one-file-system    skip directories on different file systems\n"
 msgstr ""
-"  -X, --exclude-from=FILE  exclure les fichiers correspondants à un des "
-"motifs\n"
-"                             de FILE\n"
-"      --exclude=PATTERN    exclure les fichiers correspondants à PATTERN\n"
+"  -X, --exclude-from=FICHIER  exclure les fichiers correspondants à un des\n"
+"                              motifs du FICHIER\n"
+"      --exclude=MOTIF      exclure les fichiers correspondants à MOTIF\n"
 "  -x, --one-file-system    ignorer les répertoires de différents systèmes "
 "de\n"
-"                             fichiers\n"
+"                           fichiers\n"
 
-#: src/du.c:386
+#: src/du.c:398
 msgid "Infinity"
 msgstr "Infinité"
 
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr "Point de montage %s déjà traversé"
-
-#: src/du.c:624
+#: src/du.c:636
 #, c-format
 msgid "fts_read failed: %s"
 msgstr "échec de fts_read : %s"
 
-#: src/du.c:780
+#: src/du.c:787
 #, c-format
 msgid "invalid maximum depth %s"
 msgstr "profondeur maximale %s incorrecte"
 
-#: src/du.c:809
+#: src/du.c:816
 #, c-format
 msgid "invalid --threshold argument '-0'"
 msgstr "argument « -0 » de --threshold incorrect"
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr "impossible d'afficher à la fois un résumé et toutes les entrées"
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr ""
 "avertissement : résumer est la même chose qu'utiliser l'option --max-depth=0"
 
-#: src/du.c:900
+#: src/du.c:911
 #, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr "avertissement : conflit avec --max-depth=%lu à la génération du résumé"
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+"avertissement : les options --apparent-size et -b sont inefficaces avec --"
+"inodes"
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 msgid "file operands cannot be combined with --files0-from"
 msgstr ""
 "les opérandes de fichier ne peuvent pas être combinés avec --files0-from"
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr "%s : erreur de lecture"
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr ""
 "le nom de fichier %s n'est pas autorisé lors de la lecture de l'entrée "
 "standard"
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 msgid "invalid zero-length file name"
 msgstr "nom de fichier de longueur nulle incorrect"
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr "total"
 
@@ -4154,8 +4259,8 @@ msgid ""
 "Usage: %s [SHORT-OPTION]... [STRING]...\n"
 "  or:  %s LONG-OPTION\n"
 msgstr ""
-"Utilisation : %s [SHORT-OPTION]... [STRING]...\n"
-"         ou : %s LONG-OPTION\n"
+"Utilisation : %s [OPTION_COURTE]... [CHAÎNE]...\n"
+"         ou : %s OPTION_LONGUE\n"
 
 #: src/echo.c:45
 msgid ""
@@ -4163,7 +4268,7 @@ msgid ""
 "\n"
 "  -n             do not output the trailing newline\n"
 msgstr ""
-"Duplique les chaînes STRING sur la sortie standard.\n"
+"Duplique la ou les CHAÃŽNEs sur la sortie standard.\n"
 "\n"
 "  -n             ne pas afficher de changement de ligne de terminaison\n"
 
@@ -4240,24 +4345,23 @@ msgstr "Richard Mlynarik"
 #: src/env.c:52
 #, c-format
 msgid "Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n"
-msgstr "Utilisation : %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n"
+msgstr "Utilisation : %s [OPTION]... [-] [NOM=VALEUR]... [COMMANDE [ARG]...]\n"
 
 #: src/env.c:55
 msgid "Set each NAME to VALUE in the environment and run COMMAND.\n"
 msgstr ""
-"Initialiser chaque NAME à VALUE dans l'environnement et exécuter COMMAND.\n"
+"Initialiser chaque NOM à VALEUR dans l'environnement et exécuter COMMANDE.\n"
 
 #: src/env.c:61
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
 "  -i, --ignore-environment  démarrer avec un environnement vide\n"
-"  -0, --null           terminer chaque ligne de sortie avec l'octet 0 au "
-"lieu\n"
-"                         d'un changement de ligne\n"
-"  -u, --unset=NAME     supprimer la variable de l'environnement\n"
+"  -0, --null           terminer chaque ligne de sortie par NULL, pas un\n"
+"                         changement de ligne\n"
+"  -u, --unset=NOM      supprimer la variable de l'environnement\n"
 
 #: src/env.c:68
 msgid ""
@@ -4265,7 +4369,7 @@ msgid ""
 "A mere - implies -i.  If no COMMAND, print the resulting environment.\n"
 msgstr ""
 "\n"
-"Un simple - implique -i. Si aucune COMMAND n'est fournie, afficher\n"
+"Un simple - implique -i. Si aucune COMMANDE n'est fournie, afficher\n"
 "l'environnement résultant.\n"
 
 #: src/env.c:124
@@ -4288,9 +4392,9 @@ msgid ""
 "Convert tabs in each FILE to spaces, writing to standard output.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
-"Convertir les tabulations de chaque FILE en espaces, en écrivant sur la "
-"sortie\n"
-"standard. Sans FILE, ou quand FILE est -, lire l'entrée standard.\n"
+"Convertir les tabulations de chaque FICHIER en espaces, en écrivant sur la\n"
+"sortie standard. Sans FICHIER, ou quand FICHIER est -, lire l'entrée "
+"standard.\n"
 
 #: src/expand.c:114
 msgid ""
@@ -4335,16 +4439,16 @@ msgid "input line is too long"
 msgstr "la ligne d'entrée est trop longue"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr "Mike Parker"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr "James Youngman"
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
@@ -4353,7 +4457,7 @@ msgstr ""
 "Utilisation : %s EXPRESSION\n"
 "         ou : %s OPTION\n"
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -4372,7 +4476,7 @@ msgstr ""
 "\n"
 "  ARG1 & ARG2       ARG1 si aucun des arguments est nul ou 0, sinon 0\n"
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -4390,7 +4494,7 @@ msgstr ""
 "  ARG1 >= ARG2      ARG1 si supérieur ou égal à ARG2\n"
 "  ARG1 > ARG2       ARG1 si supérieur à ARG2\n"
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
@@ -4400,7 +4504,7 @@ msgstr ""
 "  ARG1 + ARG2       somme arithmétique de ARG1 et ARG2\n"
 "  ARG1 - ARG2       différence arithmétique entre ARG1 et ARG2\n"
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -4413,7 +4517,7 @@ msgstr ""
 "  ARG1 / ARG2       quotient arithmétique de ARG1 divisé par ARG2\n"
 "  ARG1 % ARG2       reste arithmétique ARG1 divisé par ARG2\n"
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -4424,16 +4528,16 @@ msgid ""
 "  length STRING              length of STRING\n"
 msgstr ""
 "\n"
-"  STRING : REGEXP   motif d'ancrage de correspondance de REGEXP dans STRING\n"
+"  CHAÃŽNE : EXP_RAT  motif d'ancrage de correspondance de EXP_RAT dans "
+"CHAÃŽNE\n"
 "\n"
-"  match STRING REGEXP        identique à STRING : REGEXP\n"
-"  substr STRING POS LENGTH   sous-chaîne de STRING, POS débute à 1\n"
-"  index STRING CHARS         index dans STRING où un des CHARS a été "
-"trouvé,\n"
+"  match CHAÎNE EXP_RAT       identique à CHAÎNE : EXP_RAT\n"
+"  substr CHAÎNE POS TAILLE   sous-chaîne de CHAÎNE, POS débute à 1\n"
+"  index CHAÎNE CARS          index dans CHAÎNE où un des CARS a été trouvé,\n"
 "                               sinon 0\n"
-"  length STRING              longueur de STRING\n"
+"  length CHAÃŽNE              longueur de CHAÃŽNE\n"
 
-#: src/expr.c:251
+#: src/expr.c:250
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
 "                               keyword like 'match' or an operator like '/'\n"
@@ -4446,7 +4550,7 @@ msgstr ""
 "\n"
 "  ( EXPRESSION )             valeur de l'EXPRESSION\n"
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -4466,7 +4570,7 @@ msgstr ""
 "entre \\( et \\) ou nul ; si \\( et \\) ne sont pas utilisées, le nombre de\n"
 "caractères qui correspondent est renvoyé ou 0 sinon.\n"
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -4479,32 +4583,32 @@ msgstr ""
 "est nulle ou 0, 2 si l'EXPRESSION est syntaxiquement incorrecte et 3 si une\n"
 "erreur est survenue.\n"
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, c-format
 msgid "syntax error"
 msgstr "erreur de syntaxe"
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, c-format
 msgid "error in regular expression matcher"
 msgstr "erreur de correspondance d'expression rationnelle"
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, c-format
 msgid "non-integer argument"
 msgstr "argument non entier"
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr "division par zéro"
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr "définissez LC_ALL='C' pour contourner le problème"
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, c-format
 msgid "the strings compared were %s and %s"
 msgstr "les chaînes comparées étaient %s et %s"
@@ -4514,43 +4618,43 @@ msgstr "les chaînes comparées étaient %s et %s"
 msgid "Niels Moller"
 msgstr "Niels Moller"
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
 msgstr ""
 "Échec du test de primalité de Lucas-Lehmer. Cela ne devrait pas arriver"
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
 msgstr "dépassement de la file de squfof"
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, c-format
 msgid "%s is not a valid positive integer"
 msgstr "%s n'est pas un entier positif valable"
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr "%s est trop grand"
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
 "  or:  %s OPTION\n"
 msgstr ""
-"Utilisation : %s [NUMBER]...\n"
+"Utilisation : %s [NOMBRE]...\n"
 "         ou : %s OPTION\n"
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
 "are specified on the command line, read them from standard input.\n"
 "\n"
 msgstr ""
-"Afficher les facteurs premiers de chaque entier NUMBER indiqué.\n"
+"Afficher les facteurs premiers de chaque NOMBRE entier indiqué.\n"
 "Sans argument fourni, les nombres sont lus depuis l'entrée standard.\n"
 "\n"
 
@@ -4578,15 +4682,16 @@ msgstr "Ross Paterson"
 #: src/fmt.c:270
 #, c-format
 msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n"
-msgstr "Utilisation : %s [-WIDTH] [OPTION]... [FILE]...\n"
+msgstr "Utilisation : %s [-LARGEUR] [OPTION]... [FICHIER]...\n"
 
 #: src/fmt.c:271
 msgid ""
 "Reformat each paragraph in the FILE(s), writing to standard output.\n"
 "The option -WIDTH is an abbreviated form of --width=DIGITS.\n"
 msgstr ""
-"Reformater chaque paragraphe de FILE, en écrivant sur la sortie standard.\n"
-"L'option -WIDTH est un forme abrégée de --width=DIGITS.\n"
+"Reformater chaque paragraphe de FICHIER, en écrivant sur la sortie "
+"standard.\n"
+"L'option -LARGEUR est une forme abrégée de --width=CHIFFRES.\n"
 
 #: src/fmt.c:278
 msgid ""
@@ -4598,7 +4703,7 @@ msgstr ""
 "  -c, --crown-margin        préserver l'indentation des deux premières "
 "lignes\n"
 "  -p, --prefix=CHAÎNE       ne reformater que les lignes débutant par "
-"STRING\n"
+"CHAÃŽNE\n"
 "                              en rattachant le préfixe aux lignes "
 "reformatées\n"
 "  -s, --split-only          effectuer la césure des longues lignes mais "
@@ -4626,7 +4731,7 @@ msgid ""
 "invalid option -- %c; -WIDTH is recognized only when it is the first\n"
 "option; use -w N instead"
 msgstr ""
-"option incorrecte — %c ; -WIDTH n'est reconnue que si c'est la\n"
+"option incorrecte — %c ; -LARGEUR n'est reconnue que si c'est la\n"
 "première option ; utilisez -w N à la place"
 
 #: src/fmt.c:405 src/fmt.c:416
@@ -4639,7 +4744,8 @@ msgid ""
 "Wrap input lines in each FILE (standard input by default), writing to\n"
 "standard output.\n"
 msgstr ""
-"Effectuer la césure des lignes d'entrée de chaque FILE (entrée standard par\n"
+"Effectuer la césure des lignes d'entrée de chaque FICHIER (entrée standard "
+"par\n"
 "défaut), en écrivant sur la sortie standard.\n"
 
 #: src/fold.c:77
@@ -4650,7 +4756,7 @@ msgid ""
 msgstr ""
 "  -b, --bytes         compter les octets au lieu des colonnes\n"
 "  -s, --spaces        césure aux espaces\n"
-"  -w, --width=WIDTH   utiliser WIDTH colonnes au lieu de 80\n"
+"  -w, --width=LARGEUR  utiliser LARGEUR colonnes au lieu de 80\n"
 
 #: src/fold.c:288 src/pr.c:832
 #, c-format
@@ -4658,17 +4764,17 @@ msgid "invalid number of columns: %s"
 msgstr "nombre de colonnes incorrect : %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr "Padraig Brady"
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, c-format
 msgid "Usage: %s\n"
 msgstr "Utilisation : %s\n"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
@@ -4677,12 +4783,12 @@ msgstr ""
 "shell.\n"
 "\n"
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, c-format
 msgid "failed to get groups for user %s"
 msgstr "impossible d'obtenir les groupes pour l'utilisateur %s"
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, c-format
 msgid "failed to get groups for the current process"
 msgstr "impossible d'obtenir les groupes pour le processus actuel"
@@ -4695,7 +4801,7 @@ msgstr "impossible de trouver le nom pour le GID %lu"
 #: src/groups.c:53
 #, c-format
 msgid "Usage: %s [OPTION]... [USERNAME]...\n"
-msgstr "Utilisation : %s [OPTION]... [USERNAME]...\n"
+msgstr "Utilisation : %s [OPTION]... [IDENTIFIANT]...\n"
 
 #: src/groups.c:54
 msgid ""
@@ -4703,28 +4809,27 @@ msgid ""
 "for\n"
 "the current process (which may differ if the groups database has changed).\n"
 msgstr ""
-"Afficher l'appartenance à des groupes pour chaque USERNAME ou, si aucun "
-"USERNAME\n"
-"n'est indiqué, pour le processus actuel (qui peut être différent si la base "
-"de\n"
-"données des groupes a changé).\n"
+"Afficher l'appartenance à des groupes pour chaque IDENTIFIANT ou, si aucun\n"
+"IDENTIFIANT n'est indiqué, pour le processus actuel (qui peut être différent "
+"si\n"
+"la base de données des groupes a changé).\n"
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, c-format
 msgid "cannot get real UID"
 msgstr "impossible d'obtenir l'UID réel"
 
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, c-format
 msgid "cannot get effective GID"
 msgstr "impossible d'obtenir le GID effectif"
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, c-format
 msgid "cannot get real GID"
 msgstr "impossible d'obtenir le GID réel"
 
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, c-format
 msgid "%s: no such user"
 msgstr "%s : utilisateur inexistant"
@@ -4735,10 +4840,10 @@ msgid ""
 "With more than one FILE, precede each with a header giving the file name.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
-"Afficher les dix premières lignes de chaque FILE sur la sortie standard.\n"
+"Afficher les dix premières lignes de chaque FICHIER sur la sortie standard.\n"
 "Chaque fichier est précédé d'un en-tête avec son nom, si plusieurs "
 "fichiers.\n"
-"Sans FILE, ou quand FILE est -, lire l'entrée standard.\n"
+"Sans FICHIER, ou quand FICHIER est -, lire l'entrée standard.\n"
 
 #: src/head.c:117
 msgid ""
@@ -4781,61 +4886,50 @@ msgstr ""
 "\n"
 "K peut avoir un suffixe multiplicateur :\n"
 "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
-"GB 1000*1000*1000, G 1024*1024*1024, et ainsi de suite pour T, P, E, Z et "
-"Y.\n"
+"GB 1000*1000*1000, G 1024*1024*1024 et ainsi de suite pour T, P, E, Z et Y.\n"
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr "%s : le fichier a été trop réduit"
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, c-format
 msgid "%s: number of bytes is too large"
 msgstr "%s : le nombre d'octets est trop grand"
 
-#: src/head.c:440
-#, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr "%s : impossible d'utiliser lseek pour revenir à la position d'origine"
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr "%s : impossible de se déplacer à la position %s"
 
-#: src/head.c:673
+#: src/head.c:423 src/tail.c:457
 #, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "%s : échec de réinitialisation du pointeur de fichier"
-
-#: src/head.c:798
-#, c-format
-msgid "cannot reposition file pointer for %s"
-msgstr "impossible de repositionner le pointeur de fichier pour %s"
+msgid "%s: cannot seek to relative offset %s"
+msgstr "%s : impossible de se déplacer selon le décalage relatif %s"
 
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr "%s : %s est tellement grand qu'il n'est pas représentable"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr "le nombre de lignes"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr "le ombre d'octets"
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr "nombre de lignes incorrect"
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr "nombre d'octets incorrect"
 
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, c-format
 msgid "invalid trailing option -- %c"
 msgstr "option de terminaison incorrecte — %c"
@@ -4882,42 +4976,51 @@ msgid "cannot determine hostname"
 msgstr "impossible de déterminer le nom d'hôte"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr "Arnold Robbins"
 
-#: src/id.c:81
+#: src/id.c:84
 #, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
-msgstr "Utilisation : %s [OPTION]... [USERNAME]\n"
+msgid "Usage: %s [OPTION]... [USER]\n"
+msgstr "Utilisation : %s [OPTION]... [UTILIS]\n"
 
-#: src/id.c:82
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
 msgstr ""
-"Afficher les informations d'utilisateur et de groupe du USERNAME indiqué,\n"
-"ou pour l'utilisateur actuel quand USERNAME est omis.\n"
+"Afficher les informations d'utilisateur et de groupe de l’UTILISateur "
+"indiqué,\n"
+"ou pour l'utilisateur actuel quand UTILIS est omis.\n"
 "\n"
-"  -a              ignorée, pour compatibilité avec les autres versions\n"
-"  -Z, --context   n'afficher que le contexte de sécurité de l'utilisateur "
-"actuel\n"
-"  -g, --group     n'afficher que le GID effectif\n"
-"  -G, --groups    afficher tous les GID\n"
-"  -n, --name      afficher le nom au lieu du numéro, pour -ugG\n"
-"  -r, --real      afficher l'identifiant réel au lieu de l'effectif, avec -"
+
+#: src/id.c:90
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
+msgstr ""
+"  -a             ignorée, pour compatibilité avec les autres versions\n"
+"  -Z, --context  n'afficher que le contexte de sécurité du processus\n"
+"  -g, --group    n'afficher que le GID effectif\n"
+"  -G, --groups   afficher tous les GID\n"
+"  -n, --name     afficher le nom au lieu du numéro, pour -ugG\n"
+"  -r, --real     afficher l'identifiant réel au lieu de l'effectif, avec -"
 "ugG\n"
-"  -u, --user      n'afficher que l'UID effectif\n"
+"  -u, --user     n'afficher que l'UID effectif\n"
+"  -z, --zero     délimiter la sortie avec des caractères NULL au lieu de "
+"blancs ;\n"
+"                   impossible avec le format par défaut\n"
 
-#: src/id.c:96
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
@@ -4925,121 +5028,132 @@ msgstr ""
 "\n"
 "Sans aucune OPTION, afficher des informations utiles d'identification.\n"
 
-#: src/id.c:140
+#: src/id.c:151
+#, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr ""
+"--context (-Z) ne fonctionne qu'avec noyau avec SELinux ou SMACK activés"
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
-msgstr "--context (-Z) ne fonctionne qu'avec noyau activé pour SELinux"
+msgstr "--context (-Z) ne fonctionne qu'avec noyau avec SELinux activé"
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr ""
 "impossible d'afficher le contexte de sécurité quand un utilisateur est "
 "indiqué"
 
-#: src/id.c:178
+#: src/id.c:198
 #, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr "impossible d'afficher le « seulement » parmi plusieurs choix"
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr ""
 "impossible de n'afficher que les noms ou les identifiants réels au format "
 "par défaut"
 
-#: src/id.c:199
+#: src/id.c:209
+#, c-format
+msgid "option --zero not permitted in default format"
+msgstr "l’option --zero est impossible avec le format par défaut"
+
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
 msgstr "impossible d'obtenir le contexte de traitement"
 
-#: src/id.c:224
+#: src/id.c:265
 #, c-format
 msgid "cannot get effective UID"
 msgstr "impossible d'obtenir l'UID effectif"
 
-#: src/id.c:311
+#: src/id.c:354
 #, c-format
 msgid "cannot find name for user ID %s"
 msgstr ""
 "impossible de trouver le nom associé à l'identifiant utilisateur (UID) %s"
 
-#: src/id.c:329
+#: src/id.c:372
 #, c-format
 msgid "uid=%s"
 msgstr "uid=%s"
 
-#: src/id.c:334
+#: src/id.c:377
 #, c-format
 msgid " gid=%s"
 msgstr " gid=%s"
 
-#: src/id.c:341
+#: src/id.c:384
 #, c-format
 msgid " euid=%s"
 msgstr " euid=%s"
 
-#: src/id.c:349
+#: src/id.c:392
 #, c-format
 msgid " egid=%s"
 msgstr " egid=%s"
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr " groupes="
 
-#: src/id.c:393
+#: src/id.c:437
 #, c-format
 msgid " context=%s"
 msgstr " contexte=%s"
 
-#: src/install.c:373
+#: src/install.c:376
 #, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr "avertissement : %s : impossible de modifier le contexte en %s"
 
-#: src/install.c:414
+#: src/install.c:417
 #, c-format
 msgid "creating directory %s"
 msgstr "création du répertoire %s"
 
-#: src/install.c:482
+#: src/install.c:485
 #, c-format
 msgid "cannot change ownership of %s"
 msgstr "impossible de modifier l'appartenance de %s"
 
-#: src/install.c:506
+#: src/install.c:509
 #, c-format
 msgid "cannot set time stamps for %s"
 msgstr "impossible de définir le format horaire pour %s"
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, c-format
 msgid "fork system call failed"
 msgstr "échec de l'appel système fork"
 
-#: src/install.c:531
+#: src/install.c:535
 #, c-format
 msgid "cannot run %s"
 msgstr "impossible d'exécuter %s"
 
-#: src/install.c:535
+#: src/install.c:539
 #, c-format
 msgid "waiting for strip"
 msgstr "en attente de strip"
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr "le traitement en chaîne s'est arrêté anormalement"
 
-#: src/install.c:558
+#: src/install.c:565
 #, c-format
 msgid "invalid user %s"
 msgstr "utilisateur %s incorrect"
 
-#: src/install.c:594
+#: src/install.c:601
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -5048,11 +5162,11 @@ msgid ""
 "  or:  %s [OPTION]... -d DIRECTORY...\n"
 msgstr ""
 "Utilisation : %s [OPTION]... [-T] SOURCE DEST\n"
-"         ou : %s [OPTION]... SOURCE... DIRECTORY\n"
-"         ou : %s [OPTION]... -t DIRECTORY SOURCE...\n"
-"         ou : %s [OPTION]... -d DIRECTORY...\n"
+"         ou : %s [OPTION]... SOURCE... RÉPERTOIRE\n"
+"         ou : %s [OPTION]... -t RÉPERTOIRE SOURCE...\n"
+"         ou : %s [OPTION]... -d RÉPERTOIRE...\n"
 
-#: src/install.c:601
+#: src/install.c:608
 msgid ""
 "\n"
 "This install program copies files (often just compiled) into destination\n"
@@ -5075,11 +5189,13 @@ msgstr ""
 "comme yum(1) ou apt-get(1).\n"
 "\n"
 "Dans les trois premiers formats, copier SOURCE vers DEST ou de plusieurs\n"
-"fichiers SOURCE vers un répertoire DIRECTORY existant, tout en initialisant\n"
+"fichiers SOURCE vers un répertoire RÉPERTOIRE existant, tout en "
+"initialisant\n"
 "les modes de protection et les droits de propriétaire et groupe.\n"
-"Dans le quatrième format, créer tous les composants des DIRECTORY indiqués.\n"
+"Dans le quatrième, créer tous les composants du ou des RÉPERTOIREs "
+"indiqués.\n"
 
-#: src/install.c:615
+#: src/install.c:622
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
 "  -b                  like --backup but does not accept an argument\n"
@@ -5102,7 +5218,7 @@ msgstr ""
 "répertoire ;\n"
 "                        créer tous les composants des répertoires indiqués\n"
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -5123,7 +5239,7 @@ msgstr ""
 "  -o, --owner=PROPRIO définir l'appartenance (uniquement pour "
 "l'administrateur)\n"
 
-#: src/install.c:631
+#: src/install.c:638
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
 "files\n"
@@ -5143,82 +5259,80 @@ msgstr ""
 "  -s, --strip         enlever les tables des symboles\n"
 "      --strip-program=PROGRAMME  pour enlever la table des symboles du "
 "binaire\n"
-"  -S, --suffix=SUFFIXE  substituer le SUFFIXE habituel d'archivage\n"
+"  -S, --suffix=SUFFIXE  remplacer le SUFFIXE habituel d'archivage\n"
 "  -t, --target-directory=RÉPERTOIRE  copier tous les arguments de la SOURCE "
 "dans\n"
 "                        le RÉPERTOIRE\n"
 "  -T, --no-target-directory  traiter DEST comme un fichier normal\n"
 "  -v, --verbose       afficher le nom de chaque répertoire créé\n"
 
-#: src/install.c:641
+#: src/install.c:648
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
 "      --preserve-context  préserver le contexte de sécurité SELinux\n"
-"  -Z, --context=CONTEXT  établir le contexte de sécurité SELinux des "
-"fichiers\n"
-"                        et répertoires\n"
+"  -Z                      définir le contexte de sécurité SELinux du fichier "
+"de\n"
+"                            destination au type par défaut\n"
+"      --context[=CTX]     comme -Z ou, si CTX est indiqué, définir le "
+"contexte\n"
+"                            de sécurité SELinux ou SMACK à CTX\n"
 
-#: src/install.c:859
+#: src/install.c:696 src/unlink.c:86
 #, c-format
-msgid ""
-"WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
-msgstr ""
-"Attention : --preserve-context a été ignoré car SELinux n'est pas activé sur "
-"ce noyau."
+msgid "cannot unlink %s"
+msgstr "impossible de supprimer %s"
 
-#: src/install.c:869
+#: src/install.c:877
 #, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
+msgid ""
+"WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
 msgstr ""
-"Attention : --context (-Z) a été ignoré car SELinux n'est pas activé sur ce "
-"noyau"
+"Attention : --preserve-context a été ignorée car SELinux n'est pas activé "
+"sur ce noyau"
 
-#: src/install.c:886
+#: src/install.c:917
 #, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr ""
 "l'option --strip ne peut pas être utilisée lors de l'installation d'un "
 "répertoire"
 
-#: src/install.c:889
+#: src/install.c:920
 #, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr ""
 "un répertoire cible n'est pas autorisé lors de l'installation d'un répertoire"
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr "impossible de forcer le contexte cible à %s et de le préserver"
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, c-format
 msgid "invalid mode %s"
 msgstr "mode %s incorrect"
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr ""
 "Attention : l'option --strip-program a été ignorée car l'option -s n'a pas "
 "été indiquée"
 
-#: src/install.c:959
+#: src/install.c:1001
 #, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr ""
 "les options --compare (-C) et --preserve-timestamps sont mutuellement "
 "exclusives"
 
-#: src/install.c:966
+#: src/install.c:1008
 #, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr "les options --compare (-C) et --strip sont mutuellement exclusives"
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -5232,7 +5346,7 @@ msgstr ""
 msgid "Mike Haertel"
 msgstr "Mike Haertel"
 
-#: src/join.c:191
+#: src/join.c:195
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
 "standard output.  The default join field is the first, delimited\n"
@@ -5245,14 +5359,15 @@ msgstr ""
 "Pour chaque paire de lignes en entrée ayant des champs de fusion\n"
 "identiques, afficher une ligne sur la sortie standard.\n"
 "Le champ de fusion par défaut est le premier, délimité par un blanc.\n"
-"Si soit FILE1, soit FILE2 (pas les 2) est -, lire l'entrée standard.\n"
+"Si soit FICHIER1, soit FICHIER2 (pas les 2) est -, lire l'entrée standard.\n"
 "\n"
-"  -a FILENUM        afficher aussi les lignes non associables du fichier "
-"FILENUM\n"
-"                      où FILENUM est 1 ou 2, correspondant à FILE1 ou FILE2\n"
-"  -e EMPTY          remplacer les champs d'entrée manquants par EMPTY\n"
+"  -a NUM_FICHIER    afficher aussi les lignes non associables de NUM_FICHIER "
+"où\n"
+"                    NUM_FICHIER est 1 ou 2, correspondant à FICHIER1 ou "
+"FICHIER2\n"
+"  -e VIDE           remplacer les champs d'entrée manquants par VIDE\n"
 
-#: src/join.c:200
+#: src/join.c:204
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
 "  -j FIELD          equivalent to '-1 FIELD -2 FIELD'\n"
@@ -5260,13 +5375,13 @@ msgid ""
 "  -t CHAR           use CHAR as input and output field separator\n"
 msgstr ""
 "  -i, --ignore-case  ignorer la casse lors de la comparaison de champs\n"
-"  -j FIELD          équivalent à « -1 FIELD -2 FIELD »\n"
+"  -j CHAMP          équivalent à « -1 CHAMP -2 CHAMP »\n"
 "  -o FORMAT         respecter FORMAT lors de la construction de la ligne\n"
 "                      de sortie\n"
-"  -t CHAR           utiliser CHAR comme délimiteur de champs d'entrée et\n"
-"                      de sortie\n"
+"  -t CAR            utiliser CAR comme délimiteur de champs d'entrée et "
+"sortie\n"
 
-#: src/join.c:206
+#: src/join.c:210
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
 "  -1 FIELD          join on this FIELD of file 1\n"
@@ -5277,10 +5392,10 @@ msgid ""
 "  --header          treat the first line in each file as field headers,\n"
 "                      print them without trying to pair them\n"
 msgstr ""
-"  -v FILENUM        comme -a FILENUM, mais supprimer les lignes jointes\n"
+"  -v NUM_FICHIER    comme -a NUM_FICHIER, mais supprimer les lignes jointes\n"
 "                      en sortie\n"
-"  -1 FIELD          fusionner sur le champ FIELD du fichier 1\n"
-"  -2 FIELD          fusionner sur le champ FIELD du fichier 2\n"
+"  -1 CHAMP          fusionner sur le champ CHAMP du fichier 1\n"
+"  -2 CHAMP          fusionner sur le champ CHAMP du fichier 2\n"
 "  --check-order     vérifier que l'entrée est correctement triée, même\n"
 "                      si toutes les lignes en entrée sont appairées\n"
 "  --nocheck-order   ne pas vérifier que l'entrée est correctement triée\n"
@@ -5290,7 +5405,14 @@ msgstr ""
 "les\n"
 "                      appairer\n"
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr ""
+"  -z, --zero-terminated     le délimiteur de lignes est l’octet NULL, pas "
+"le\n"
+"                              changement de ligne\n"
+
+#: src/join.c:225
 msgid ""
 "\n"
 "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n"
@@ -5309,64 +5431,66 @@ msgid ""
 "warning message will be given.\n"
 msgstr ""
 "\n"
-"À moins que -t CHAR ne soit renseigné, les premiers blancs qui séparent\n"
-"les champs sont ignorés sinon les champs sont séparés par CHAR. Chaque "
-"FIELD\n"
-"est un numéro de champ à partir de 1. FORMAT est une ou plusieurs\n"
-"spécifications séparées par une virgule ou un blanc, chacune étant\n"
-"« FILENUM.FIELD » ou « 0 ». Par défaut, FORMAT affiche le champ fusionné, "
-"puis\n"
-"les champs restants de FILE1 et enfin ceux de FILE2, tous séparés par CHAR.\n"
+"À moins que -t CAR ne soit renseigné, les premiers blancs qui séparent les\n"
+"champs sont ignorés sinon les champs sont séparés par CAR. Chaque CHAMP est "
+"un\n"
+"numéro de champ à partir de 1. FORMAT est une ou plusieurs spécifications\n"
+"séparées par une virgule ou un blanc, chacune étant « NUM_FICHIER.CHAMP » "
+"ou\n"
+"« 0 ». Par défaut, FORMAT affiche le champ fusionné, puis les champs "
+"restants de\n"
+"FICHIER1 et enfin ceux de FICHIER2, tous séparés par CAR.\n"
 "\n"
-"Important : FILE1 et FILE2 doivent être triés sur les champs de jointure.\n"
-"Par exemple, utilisez « sort -k 1b,1 » si « join » n'a pas d'option, ou\n"
+"Important : FICHIER1 et FICHIER2 doivent être triés sur les champs de "
+"jointure.\n"
+"Par exemple, utilisez « sort -k 1b,1 » si « join » n'a pas d'option ou\n"
 "utilisez « join -t '' » si « sort » n'a pas d'option.\n"
 "Remarquez que les comparaisons s'effectuent selon les règles définies par\n"
 "« LC_COLLATE ». Si l'entrée n'est pas triée et que quelques lignes ne "
 "peuvent\n"
 "être fusionnées, un message d'alerte l'indiquera.\n"
 
-#: src/join.c:403
+#: src/join.c:410
 #, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
 msgstr "%s:%<PRIuMAX> : n'est pas trié : %.*s"
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, c-format
 msgid "invalid field number: %s"
 msgstr "numéro de champ incorrect : %s"
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, c-format
 msgid "invalid field specifier: %s"
 msgstr "spécificateur de champ incorrect : %s"
 
-#: src/join.c:877
+#: src/join.c:884
 #, c-format
 msgid "invalid file number in field spec: %s"
 msgstr "numéro de fichier incorrect dans la spécification de champ : %s"
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr "jonction incompatible des champs %lu, %lu"
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr "chaînes de remplacement de champ vide conflictuelles"
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, c-format
 msgid "multi-character tab %s"
 msgstr "tabulation multicaractère %s"
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr "tabulations incompatibles"
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr "les fichiers ne peuvent pas être tous les deux l'entrée standard."
@@ -5408,9 +5532,8 @@ msgid ""
 "PID is an integer; if negative it identifies a process group.\n"
 msgstr ""
 "\n"
-"SIGNAL peut être un nom de signal comme « HUP » ou un numéro de signal "
-"comme\n"
-"« 1 », ou un état de fin d'un processus terminé par un signal.\n"
+"SIGNAL peut être un nom de signal comme « HUP », un numéro de signal comme\n"
+"« 1 » ou un état de fin d'un processus terminé par un signal.\n"
 "PID est un entier, si négatif il identifie un groupe de processus.\n"
 
 #: src/kill.c:205
@@ -5469,7 +5592,7 @@ msgid ""
 "Usage: %s FILE1 FILE2\n"
 "  or:  %s OPTION\n"
 msgstr ""
-"Utilisation : %s FILE1 FILE2\n"
+"Utilisation : %s FICHIER1 FICHIER2\n"
 "         ou : %s OPTION\n"
 
 #: src/link.c:48
@@ -5477,7 +5600,8 @@ msgid ""
 "Call the link function to create a link named FILE2 to an existing FILE1.\n"
 "\n"
 msgstr ""
-"Exécuter la fonction link() pour créer un lien nommé FILE2 sur le FILE1\n"
+"Exécuter la fonction link() pour créer un lien nommé FICHIER2 sur le "
+"FICHIER1\n"
 "existant.\n"
 
 #: src/link.c:90
@@ -5485,47 +5609,47 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr "impossible de créer le lien %s sur %s"
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr "%s : lien direct non permis pour un répertoire"
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, c-format
 msgid "%s: cannot overwrite directory"
 msgstr "%s : impossible d'écraser le répertoire"
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
 msgstr "%s : faut-il remplacer %s ? "
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, c-format
 msgid "failed to create symbolic link %s"
 msgstr "impossible de créer le lien symbolique %s"
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr "impossible de créer le lien symbolique %s → %s"
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr "impossible de créer un lien direct sur %.0s%s"
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, c-format
 msgid "failed to create hard link %s"
 msgstr "impossible de créer le lien direct %s"
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, c-format
 msgid "failed to create hard link %s => %s"
 msgstr "impossible de créer le lien direct %s → %s"
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -5533,12 +5657,12 @@ msgid ""
 "  or:  %s [OPTION]... TARGET... DIRECTORY     (3rd form)\n"
 "  or:  %s [OPTION]... -t DIRECTORY TARGET...  (4th form)\n"
 msgstr ""
-"Utilisation : %s [OPTION]... [-T] TARGET LINK_NAME   (1er format)\n"
-"         ou : %s [OPTION]... TARGET                  (2e format)\n"
-"         ou : %s [OPTION]... TARGET... DIRECTORY     (3e format)\n"
-"         ou : %s [OPTION]... -t DIRECTORY TARGET...  (4e format)\n"
+"Utilisation : %s [OPTION]... [-T] CIBLE NOM_LIEN     (1er format)\n"
+"         ou : %s [OPTION]... CIBLE                   (2e format)\n"
+"         ou : %s [OPTION]... CIBLE... RÉPERTOIRE     (3e format)\n"
+"         ou : %s [OPTION]... -t RÉPERTOIRE CIBLE...  (4e format)\n"
 
-#: src/ln.c:381
+#: src/ln.c:398
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
 "In the 2nd form, create a link to TARGET in the current directory.\n"
@@ -5549,21 +5673,21 @@ msgid ""
 "can hold arbitrary text; if later resolved, a relative link is\n"
 "interpreted in relation to its parent directory.\n"
 msgstr ""
-"Dans le 1er format, créer un lien vers TARGET avec le nom LINK_NAME.\n"
-"Dans le 2e format, créer un lien vers TARGET dans le répertoire actuel.\n"
-"Dans les 3e et 4e formats, créer des liens vers chaque TARGET dans "
-"DIRECTORY.\n"
+"Dans le 1er format, créer un lien vers CIBLE avec le nom NOM_LIEN.\n"
+"Dans le 2e format, créer un lien vers CIBLE dans le répertoire actuel.\n"
+"Dans les 3e et 4e formats, créer des liens vers chaque CIBLE dans "
+"RÉPERTOIRE.\n"
 "Créer des liens directs par défaut et des liens symboliques avec --"
 "symbolic.\n"
 "Par défaut, aucune destination (nom ou nouveau lien) ne devrait encore "
 "exister.\n"
-"À la création de liens directs, chaque TARGET doit exister. Les liens\n"
+"À la création de liens directs, chaque CIBLE doit exister. Les liens\n"
 "symboliques peuvent contenir un texte arbitraire ; s'il est résolu par la "
 "suite,\n"
 "un lien relatif est interprété comme une relation avec son répertoire "
 "parent.\n"
 
-#: src/ln.c:394
+#: src/ln.c:411
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
 "file\n"
@@ -5589,7 +5713,7 @@ msgstr ""
 "  -f, --force                 supprimer les fichiers de destination "
 "existants\n"
 
-#: src/ln.c:402
+#: src/ln.c:419
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
 "  -L, --logical               dereference TARGETs that are symbolic links\n"
@@ -5601,10 +5725,9 @@ msgid ""
 "  -s, --symbolic              make symbolic links instead of hard links\n"
 msgstr ""
 "  -i, --interactive           demander s'il faut supprimer les destinations\n"
-"  -L, --logical               déréférencer les TARGETs qui sont des liens\n"
+"  -L, --logical               déréférencer les CIBLEs qui sont des liens\n"
 "                                symboliques\n"
-"  -n, --no-dereference        traiter LINK_NAME comme un fichier normal "
-"s'il\n"
+"  -n, --no-dereference        traiter NOM_LIEN comme un fichier normal s'il\n"
 "                                s'agit d'un lien symbolique vers un "
 "répertoire\n"
 "  -P, --physical              transformer les liens directs en liens "
@@ -5614,7 +5737,7 @@ msgstr ""
 "  -s, --symbolic              créer un lien symbolique au lieu d'un lien "
 "direct\n"
 
-#: src/ln.c:411
+#: src/ln.c:428
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
 "  -t, --target-directory=DIRECTORY  specify the DIRECTORY in which to "
@@ -5623,14 +5746,15 @@ msgid ""
 "  -T, --no-target-directory   treat LINK_NAME as a normal file always\n"
 "  -v, --verbose               print name of each linked file\n"
 msgstr ""
-"  -S, --suffix=SUFFIX         écraser le suffixe d'archivage habituel\n"
-"  -t, --target-directory=DIRECTORY  indiquer le DIRECTORY dans lequel créer\n"
+"  -S, --suffix=SUFFIXE        remplacer le suffixe d'archivage habituel\n"
+"  -t, --target-directory=RÉPERTOIRE  indiquer le RÉPERTOIRE dans lequel "
+"créer\n"
 "                                les liens\n"
-"  -T, --no-target-directory   toujours traiter LINK_NAME comme un fichier "
+"  -T, --no-target-directory   toujours traiter NOM_LIEN comme un fichier "
 "normal\n"
 "  -v, --verbose               afficher le nom de chaque fichier lié\n"
 
-#: src/ln.c:433
+#: src/ln.c:450
 #, c-format
 msgid ""
 "\n"
@@ -5639,16 +5763,15 @@ msgid ""
 msgstr ""
 "\n"
 "L'utilisation de -s ignore -L et -P. Autrement, la dernière option indiquée\n"
-"contrôle le comportement lorsqu'une TARGET est un lien symbolique, "
-"utilisant\n"
+"contrôle le comportement lorsqu'une CIBLE est un lien symbolique, utilisant\n"
 "%s par défaut.\n"
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr "impossible de combiner --target-directory et --no-target-directory"
 
-#: src/ln.c:588
+#: src/ln.c:605
 #, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr "impossible de faire --relative sans --symbolic"
@@ -5681,7 +5804,7 @@ msgstr "aucun identifiant"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 msgid "%b %e  %Y"
 msgstr "%e %b  %Y"
 
@@ -5690,109 +5813,109 @@ msgstr "%e %b  %Y"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 msgid "%b %e %H:%M"
 msgstr "%e %b %H:%M"
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr ""
 "valeur incorrecte de la variable d'environnement QUOTING_STYLE ignorée : %s"
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr "largeur incorrecte de la variable d'environnement COLUMNS ignorée : %s"
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr ""
 "taille de tabulation incorrecte de la variable d'environnement TABSIZE "
 "ignorée :%s"
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, c-format
 msgid "invalid line width: %s"
 msgstr "largeur de ligne incorrecte : %s"
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, c-format
 msgid "invalid tab size: %s"
 msgstr "taille de tabulation incorrecte : %s"
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, c-format
 msgid "invalid time style format %s"
 msgstr "format de style de temps %s incorrect"
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 msgid "Valid arguments are:\n"
 msgstr "Les arguments possible sont :\n"
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr "  - +FORMAT (par exemple +%H:%M) pour un format de type « date »\n"
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr "erreur d'initialisation des chaînes de mois"
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, c-format
 msgid "unrecognized prefix: %s"
 msgstr "préfixe non reconnu : %s"
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr ""
 "impossible d'analyser la valeur de la variable d'environnement LS_COLORS"
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, c-format
 msgid "cannot open directory %s"
 msgstr "impossible d'ouvrir le répertoire %s"
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, c-format
 msgid "cannot determine device and inode of %s"
 msgstr "impossible de déterminer le périphérique et l'inœud de %s"
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, c-format
 msgid "%s: not listing already-listed directory"
 msgstr "%s : impossible d'afficher un répertoire déjà affiché"
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, c-format
 msgid "reading directory %s"
 msgstr "lecture du répertoire %s"
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, c-format
 msgid "closing directory %s"
 msgstr "fermeture du répertoire %s"
 
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, c-format
 msgid "cannot compare file names %s and %s"
 msgstr "impossible de comparer les noms de fichier %s et %s"
 
-#: src/ls.c:4721
+#: src/ls.c:4781
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
 "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n"
 msgstr ""
-"Afficher des renseignements sur les FILEs (du répertoire actuel par "
+"Afficher des renseignements sur les FICHIERs (du répertoire actuel par "
 "défaut).\n"
 "Trier les entrées alphabétiquement si aucune des options -cftuvSUX ou --"
 "sort\n"
 "ne sont utilisées.\n"
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
 "  -A, --almost-all           do not list implied . and ..\n"
@@ -5807,61 +5930,61 @@ msgstr ""
 "des\n"
 "                               protections selon le style C\n"
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
-"      --block-size=SIZE      convertir les tailles en SIZE avant de les\n"
+"      --block-size=TAILLE    convertir les tailles en TAILLE avant de les\n"
 "                               afficher. Par exemple, « --block-size=M » "
 "affiche\n"
-"                               les tailles en unités de 1 048 576 octets.\n"
-"                               Consultez le format SIZE ci-dessous.\n"
+"                               les tailles en unités de 1 048 576 octets ;\n"
+"                               consultez le format de TAILLE ci-dessous\n"
 "  -B, --ignore-backups       ne pas inclure les entrées se terminant par ~ "
 "dans\n"
-"                               la liste.\n"
+"                               la liste\n"
 "  -c                         avec -lt : afficher et trier selon ctime (date "
 "de\n"
 "                               dernière modification provenant des "
 "informations\n"
-"                               d'état du fichier)\n"
+"                               d'état du fichier) ;\n"
 "                               avec -l : afficher ctime et trier selon le "
-"nom\n"
+"nom ;\n"
 "                               autrement : trier selon ctime\n"
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 "  -C                         afficher les noms en colonnes\n"
-"      --color[=WHEN]         colorier la sortie. Par défaut, WHEN est défini "
-"à\n"
-"                               « always » (toujours) mais peut aussi être\n"
-"                               « never » (jamais) ou "
-"« auto » (automatique).\n"
-"  -d, --directory            afficher les noms de répertoires plutôt que "
-"leur\n"
-"                             contenu sans déréférencer les liens "
-"symboliques\n"
-"  -D, --dired                générer une sortie adaptée au mode « dired »\n"
-"                               d'Emacs\n"
+"      --color[=QUAND]        colorer la sortie ; par défaut, QUAND peut "
+"être\n"
+"                               « never » (jamais), « auto » (automatique) "
+"ou\n"
+"                               « always » (toujours, valeur par défaut) ; "
+"des \n"
+"                               renseignements complémentaires sont ci-"
+"dessous\n"
+"  -d, --directory            afficher les noms de répertoires, pas leur "
+"contenu\n"
+"  -D, --dired                générer une sortie pour le mode « dired » "
+"d’Emacs\n"
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
 "  -F, --classify             append indicator (one of */=>@|) to entries\n"
@@ -5875,7 +5998,7 @@ msgstr ""
 "  -F, --classify             ajouter un indicateur (parmi */=>@|) aux "
 "entrées\n"
 "      --file-type            identique mais sans ajout de « * »\n"
-"      --format=WORD          « across » -x (croisé), « commas » -m (avec\n"
+"      --format=MOT           « across » -x (croisé), « commas » -m (avec\n"
 "                               virgules), « horizontal » -x (horizontal),\n"
 "                               « long » -l (long), « single-column » -1 "
 "(une\n"
@@ -5883,50 +6006,51 @@ msgstr ""
 "                               « vertical » -C (vertical)\n"
 "      --full-time            identique à -l --time-style=full-iso\n"
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr ""
 "  -g                         identique à -l mais sans afficher le "
 "propriétaire\n"
 
-#: src/ls.c:4763
+#: src/ls.c:4823
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 "      --group-directories-first\n"
-"                             regrouper les répertoires avant les fichiers.\n"
-"                               Augmenter avec une option --sort, mais toute\n"
-"                               utilisation de --sort=none (-U) inhibe le\n"
+"                             regrouper les répertoires avant les fichiers ; "
+"peut\n"
+"                               être augmenté avec une option --sort, mais\n"
+"                               l’utilisation de --sort=none (-U) inhibe le\n"
 "                               regroupement\n"
 
-#: src/ls.c:4769
+#: src/ls.c:4829
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
 "  -G, --no-group             dans une longue liste, ne pas afficher les noms "
 "de\n"
 "                               groupe\n"
-"  -h, --human-readable       avec -l, afficher les tailles au format "
-"lisible\n"
+"  -h, --human-readable       avec -l ou -s, afficher des tailles lisibles\n"
 "                               (par exemple 1K, 234M ou 2G)\n"
 "      --si                   similaire, mais utiliser une puissance de 1 000 "
 "au\n"
 "                               lieu de 1 024\n"
 
-#: src/ls.c:4775
+#: src/ls.c:4835
 msgid ""
 "  -H, --dereference-command-line\n"
 "                             follow symbolic links listed on the command "
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
@@ -5937,11 +6061,11 @@ msgstr ""
 "      --dereference-command-line-symlink-to-dir\n"
 "                             suivre tous les liens symboliques en ligne de\n"
 "                               commande qui pointent vers un répertoire\n"
-"      --hide=PATTERN         ne pas afficher les entrées implicites\n"
-"                               correspondant au PATTERN de l'interpréteur\n"
+"      --hide=MOTIF           ne pas afficher les entrées implicites\n"
+"                               correspondant au MOTIF de l'interpréteur\n"
 "                               (écrasé par -a ou -A)\n"
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
 "names:\n"
@@ -5950,11 +6074,11 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
-"      --indicator-style=WORD  ajouter un indicateur de type à chaque entrée, "
+"      --indicator-style=MOT  ajouter un indicateur de type à chaque entrée, "
 "en\n"
-"                               respectant le style indiqué par WORD : "
+"                               respectant le style indiqué par MOT : "
 "« none »\n"
 "                               (aucun suffixe, par défaut), "
 "« slash » (barre\n"
@@ -5964,11 +6088,13 @@ msgstr ""
 "« classify »\n"
 "                               (secret, comme l'option -F)\n"
 "  -i, --inode                afficher le numéro d'index de chaque fichier\n"
-"  -I, --ignore=PATTERN       ne pas afficher les entrées implicites\n"
-"                               correspondant au PATTERN de l'interpréteur\n"
-"  -k, --kibibytes            utiliser des blocs de 1024 octets\n"
+"  -I, --ignore=MOTIF         ne pas afficher les entrées implicites\n"
+"                               correspondant au MOTIF de l'interpréteur\n"
+"  -k, --kibibytes            blocs de 1024 octets par défaut pour "
+"l’occupation\n"
+"                               d’espace disque\n"
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -5984,7 +6110,7 @@ msgstr ""
 "  -m                         remplir la largeur avec une liste d'entrées\n"
 "                               séparées par des virgules\n"
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -6004,11 +6130,11 @@ msgstr ""
 "                               de groupe\n"
 "  -p, --indicator-style=slash  ajouter l'indicateur « / » aux répertoires\n"
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -6019,15 +6145,16 @@ msgstr ""
 "graphiques\n"
 "      --show-control-chars   afficher les caractères non graphiques tel "
 "quel\n"
-"                               (par défaut)\n"
+"                               (par défaut sauf si le programme est « ls » "
+"et\n"
+"                               que la sortie s’effectue sur un terminal)\n"
 "  -Q, --quote-name           encapsuler chaque nom d'entrée entre "
 "guillemets\n"
-"      --quoting-style=WORD   utiliser le style d'encapsultation défini par\n"
-"                               WORD : « literal », « shell », « shell-"
-"always »,\n"
-"                               « c » ou « escape »\n"
+"      --quoting-style=MOT    utiliser le style d'encapsultation défini par "
+"MOT :\n"
+"                             literal, shell, shell-always, c ou escape\n"
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
 "  -R, --recursive            list subdirectories recursively\n"
@@ -6040,57 +6167,63 @@ msgstr ""
 "fichier,\n"
 "                               en bloc\n"
 
-#: src/ls.c:4825
+#: src/ls.c:4886
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 "  -S                         trier selon la taille des fichiers\n"
-"      --sort=WORD            trier selon WORD au lieu du nom : "
+"      --sort=MOT             trier selon MOT au lieu du nom : "
 "« none » (aucun,\n"
-"                               -U), « extension » (extension, -X), « size »\n"
-"                               (taille, -S), « date » (date, -t) ou "
-"« version »\n"
-"                               (version, -v)\n"
-"      --time=WORD            avec -l, afficher la date selon WORD au lieu "
-"de\n"
-"                               la date de modification : « atime » -u,\n"
-"                               « access » -u, « use » -u, « ctime » -c ou\n"
-"                               « status » -c ; utiliser la date indiquée "
-"comme\n"
-"                               clef de tri si --sort=time\n"
+"                               -U), « size » (taille, -S), « date » (date, -"
+"t),\n"
+"                               « version » (version, -v) ou « extension »\n"
+"                               (extension, -X)\n"
+"      --time=MOT             avec -l, afficher la date selon MOT au lieu de "
+"la\n"
+"                               date de modification par défaut : « atime »,\n"
+"                               « access » ou « use » (-u), « ctime » ou\n"
+"                               « status » (-c) ; utiliser aussi la date "
+"indiquée\n"
+"                               comme clef de tri si --sort=time\n"
 
-#: src/ls.c:4835
+#: src/ls.c:4896
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
 msgstr ""
 "      --time-style=STYLE     avec -l, afficher les dates selon STYLE :\n"
 "                               « full-iso », « long-iso », « iso »,\n"
-"                               « locale » ou « +FORMAT ».\n"
-"                               FORMAT est interprété comme « date ». Si\n"
+"                               « locale » ou « +FORMAT » ;\n"
+"                               FORMAT est interprété comme dans « date » ; "
+"si\n"
 "                               FORMAT est FORMAT1<changement de "
 "ligne>FORMAT2,\n"
-"                               FORMAT1 s'applique aux fichiers non récents "
-"et\n"
-"                               FORMAT2 aux fichiers récents. Si STYLE est\n"
+"                               alors FORMAT1 s'applique aux fichiers non "
+"récents\n"
+"                               et FORMAT2 aux fichiers récents ; si STYLE "
+"est\n"
 "                               préfixé par « posix- », STYLE ne prend effet\n"
-"                               qu'en dehors des paramètres régionaux POSIX.\n"
+"                               qu'en dehors des paramètres régionaux POSIX\n"
 
 # Stéphane : « récent d'abord » est court et évite de dépasser 79 cols
-#: src/ls.c:4844
+#: src/ls.c:4908
 msgid ""
 "  -t                         sort by modification time, newest first\n"
 "  -T, --tabsize=COLS         assume tab stops at each COLS instead of 8\n"
@@ -6100,10 +6233,10 @@ msgstr ""
 "  -T, --tabsize=COLS         utiliser des tabulations à chaque COLS au lieu "
 "de 8\n"
 
-#: src/ls.c:4848
+#: src/ls.c:4912
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
@@ -6119,13 +6252,12 @@ msgstr ""
 "  -v                         tri naturel des numéros (de versions) dans le "
 "texte\n"
 
-#: src/ls.c:4855
+#: src/ls.c:4919
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 "  -w, --width=COLS           définir la largeur de l'écran au lieu de la "
@@ -6135,11 +6267,11 @@ msgstr ""
 "colonne\n"
 "  -X                         trier alphabétiquement selon les extension des\n"
 "                               entrées\n"
-"  -Z, --context              afficher les contextes de sécurité SELinux de\n"
-"                               tous les fichiers\n"
+"  -Z, --context              afficher le contexte de sécurité de chaque "
+"fichier\n"
 "  -1                         afficher un fichier par ligne\n"
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -6157,7 +6289,7 @@ msgstr ""
 "la\n"
 "commande dircolors pour le définir.\n"
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -6197,9 +6329,9 @@ msgid ""
 "With no FILE, or when FILE is -, read standard input.\n"
 "\n"
 msgstr ""
-"Utilisation : %s [OPTION]... [FILE]...\n"
+"Utilisation : %s [OPTION]... [FICHIER]...\n"
 "Afficher ou vérifier les sommes de contrôle %s (%d bits).\n"
-"Sans FILE, ou quand FILE est -, lire l'entrée standard.\n"
+"Sans FICHIER, ou quand FICHIER est -, lire l'entrée standard.\n"
 "\n"
 
 #: src/md5sum.c:174
@@ -6220,7 +6352,7 @@ msgstr "  -b, --binary         lire en mode binaire\n"
 #, c-format
 msgid "  -c, --check          read %s sums from the FILEs and check them\n"
 msgstr ""
-"  -c, --check          lire les sommes %s à partir des FILEs et les "
+"  -c, --check          lire les sommes %s à partir des FICHIERs et les "
 "vérifier\n"
 
 #: src/md5sum.c:184
@@ -6242,30 +6374,26 @@ msgstr "  -t, --text           lire en mode texte (par défaut)\n"
 #: src/md5sum.c:195
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
 "\n"
-"Les trois options suivantes sont utiles qu'en vérifiant des sommes de "
-"contrôle :\n"
+"Les quatre options suivantes ne sont utiles qu’en vérifiant des sommes\n"
+"de contrôle :\n"
 "      --quiet          ne pas afficher OK à chaque vérification réussie\n"
 "      --status         ne rien afficher, seul le code d'état est mis à jour\n"
+"      --strict         quitter avec un code de retour non nul en cas de\n"
+"                         formatage incorrect des lignes de contrôle\n"
 "  -w, --warn           avertir en cas de lignes de contrôle mal formatées\n"
 "\n"
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-"      --strict         avec --check, quitter avec un code de retour non nul "
-"pour\n"
-"                         toute entrée incorrecte\n"
-
 # Un peu d'espace en fin de ligne pour la norme... (Stéphane)
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, c-format
 msgid ""
 "\n"
@@ -6283,35 +6411,35 @@ msgstr ""
 "d'entrée (« * » pour binaire, espace pour texte) et un nom pour chaque "
 "FICHIER.\n"
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, c-format
 msgid "%s: too many checksum lines"
 msgstr "%s : trop de lignes de somme de contrôle"
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr "%s : %<PRIuMAX> : ligne de somme de contrôle %s mal formatée"
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr "%s : Échec d'ouverture ou de lecture.\n"
 
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr "Échec"
 
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr "Réussi"
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr "%s : aucune ligne de somme de contrôle %s trouvée"
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
@@ -6319,32 +6447,32 @@ msgstr[0] "Attention : la ligne %<PRIuMAX> n'est pas correctement formatée"
 msgstr[1] ""
 "Attention : les lignes %<PRIuMAX> ne sont pas correctement formatées"
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
 msgstr[0] "Attention : le fichier %<PRIuMAX> affiché n'a pas pu être lu"
 msgstr[1] "Attention : les fichiers %<PRIuMAX> affichés n'ont pas pu être lus"
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
 msgstr[0] "Attention : la somme de contrôle %<PRIuMAX> ne correspond pas"
 msgstr[1] "Attention : les sommes de contrôle %<PRIuMAX> ne correspondent pas"
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
 msgstr "--tag ne prend pas en charge le mode --text"
 
-#: src/md5sum.c:766
+#: src/md5sum.c:770
 #, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr ""
 "l'option --tag est sans effet lors de la vérification des sommes de contrôle"
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
@@ -6352,113 +6480,145 @@ msgstr ""
 "les options --binary et --text sont sans effet lors de la la vérification "
 "des sommes de contrôle"
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr ""
 "l'option --status n'a de sens que lors de la vérification des sommes de "
 "contrôle"
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr ""
 "l'option --warn n'a de sens que lors de la vérification des sommes de "
 "contrôle"
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr ""
 "l'option --quiet n'a de sens que lors de la vérification des sommes de "
 "contrôle"
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr ""
 "l'option --strict n'a de sens que lors de la vérification des sommes de "
 "contrôle"
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
-msgstr "Utilisation : %s [OPTION]... DIRECTORY...\n"
+msgstr "Utilisation : %s [OPTION]... RÉPERTOIRE...\n"
 
-#: src/mkdir.c:57
+#: src/mkdir.c:59
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
-msgstr "Créer le ou les répertoires DIRECTORY s'ils n'existent pas.\n"
+msgstr "Créer le ou les RÉPERTOIREs s'ils n'existent pas.\n"
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 "  -m, --mode=MODE   définir l'accès fichier à MODE (comme avec chmod),\n"
 "                      et non a=rwx - umask\n"
 "  -p, --parents     créer les répertoires parents nécessaire, sans erreur\n"
 "                      s'ils existent\n"
 "  -v, --verbose     afficher un message pour chaque répertoire créé\n"
-"  -Z, --context=CTX  définir à CTX le contexte de sécurité SELinux de "
-"chaque\n"
-"                      répertoire créé\n"
 
-#: src/mkdir.c:168
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+"  -Z                   définir le contexte de sécurité SELinux de tous les\n"
+"                         répertoires créés au type par défaut\n"
+"      --context[=CTX]  comme -Z ou, si CTX est indiqué, définir le contexte "
+"de\n"
+"                         sécurité SELinux ou SMACK à CTX\n"
+
+#: src/mkdir.c:127 src/mkdir.c:172
+#, c-format
+msgid "failed to set default creation context for %s"
+msgstr "impossible de définir le contexte de création par défaut pour %s"
+
+#: src/mkdir.c:191
+#, c-format
+msgid "failed to restore context for %s"
+msgstr "impossible de restaurer le contexte pour %s"
+
+#: src/mkdir.c:231
 #, c-format
 msgid "created directory %s"
 msgstr "création du répertoire %s"
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr ""
+"avertissement : --context a été ignorée, un noyau avec SELinux ou SMACK "
+"activés est nécessaire"
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
-msgstr "Utilisation : %s [OPTION]... NAME...\n"
+msgstr "Utilisation : %s [OPTION]... NOM...\n"
 
-#: src/mkfifo.c:52
+#: src/mkfifo.c:54
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
-msgstr "Créer des tubes nommés (FIFO) avec les noms NAMEs.\n"
+msgstr "Créer des tubes nommés (FIFO) avec les NOMs.\n"
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
 msgstr ""
 "  -m, --mode=MODE   définir les bits de droits du fichier à MODE,\n"
 "                      et non a=rw - umask\n"
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
-"  -Z, --context=CTX  définir à CTX le contexte de sécurité SELinux de\n"
-"                      chaque NAME\n"
+"  -Z                   définir le contexte de sécurité SELinux au type\n"
+"                         par défaut\n"
+"      --context[=CTX]  comme -Z ou, si CTX est indiqué, définir le contexte "
+"de\n"
+"                         sécurité SELinux ou SMACK à CTX\n"
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, c-format
 msgid "invalid mode"
 msgstr "mode incorrect"
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr "le mode ne doit indiquer que les bits de droits de fichier"
 
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
 #, c-format
-msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
-msgstr "Utilisation : %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
+msgid "cannot set permissions of %s"
+msgstr "impossible de définir les droits de %s"
 
 #: src/mknod.c:54
-msgid "Create the special file NAME of the given TYPE.\n"
-msgstr "Créer le fichier spécial avec le nom NAME et le TYPE donnés.\n"
+#, c-format
+msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
+msgstr "Utilisation : %s [OPTION]... NOM TYPE [MAJEUR MINEUR]\n"
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr ""
-"  -Z, --context=CTX  définir à CTX le contexte de sécurité SELinux de NAME\n"
+#: src/mknod.c:56
+msgid "Create the special file NAME of the given TYPE.\n"
+msgstr "Créer le fichier spécial avec le NOM et le TYPE donnés.\n"
 
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -6467,13 +6627,15 @@ msgid ""
 "otherwise, as decimal.  TYPE may be:\n"
 msgstr ""
 "\n"
-"MAJOR et MINOR doivent tous deux être indiqués quand le TYPE est b, c ou u,\n"
-"et ils doivent être omis lorsque le TYPE est p. Si MAJOR et MINOR, avec 0x\n"
+"MAJEUR et MINEUR doivent tous deux être indiqués quand le TYPE est b, c ou "
+"u,\n"
+"et ils doivent être omis lorsque le TYPE est p. Si MAJEUR et MINEUR, avec "
+"0x\n"
 "ou 0X, sont fournis, ils sont interprétés en hexadécimal ; autrement, s'ils\n"
 "débutent par 0, ils le sont en octal et sinon en décimal. Le TYPE peut "
 "être :\n"
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 msgid ""
 "\n"
 "  b      create a block (buffered) special file\n"
@@ -6485,75 +6647,75 @@ msgstr ""
 "  c, u   créer un fichier spécial de type caractère (sans tampon)\n"
 "  p      créer un FIFO\n"
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 msgid "Special files require major and minor device numbers."
 msgstr ""
 "Les fichiers spéciaux nécessitent les numéros majeur et mineur de "
 "périphériques."
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 msgid "Fifos do not have major and minor device numbers."
 msgstr "Les FIFOs n'ont pas de numéros mineur et majeur de périphérique."
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, c-format
 msgid "block special files not supported"
 msgstr "fichier spécial de bloc non pris en charge"
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, c-format
 msgid "character special files not supported"
 msgstr "fichier spécial de caractères non pris en charge"
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, c-format
 msgid "invalid major device number %s"
 msgstr "numéro majeur %s de périphérique incorrect"
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, c-format
 msgid "invalid minor device number %s"
 msgstr "numéro mineur %s de périphérique incorrect"
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, c-format
 msgid "invalid device %s %s"
 msgstr "périphérique incorrect %s %s"
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, c-format
 msgid "invalid device type %s"
 msgstr "type de périphérique %s incorrect"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr "Eric Blake"
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
-msgstr "Utilisation : %s [OPTION]... [TEMPLATE]\n"
+msgstr "Utilisation : %s [OPTION]... [MODÈLE]\n"
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
 "TEMPLATE must contain at least 3 consecutive 'X's in last component.\n"
 "If TEMPLATE is not specified, use tmp.XXXXXXXXXX, and --tmpdir is implied.\n"
 msgstr ""
-"Créer un fichier ou un répertoire temporaire, sûrs, et afficher leur nom.\n"
-"TEMPLATE doit contenir au moins trois « X » consécutifs dans la partie "
+"Créer un fichier ou un répertoire temporaire, sûrs et afficher leur nom.\n"
+"MODÈLE doit contenir au moins trois « X » consécutifs dans la partie "
 "finale.\n"
-"Si TEMPLATE n'est pas indiqué, tmp.XXXXXXXXXX et --tmpdir sont utilisés.\n"
+"Si MODÈLE n'est pas indiqué, tmp.XXXXXXXXXX et --tmpdir sont utilisés.\n"
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
 "Les fichiers sont créés u+rw et les répertoires u+rwx, sauf restrictions de "
 "umask.\n"
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
@@ -6564,103 +6726,96 @@ msgstr ""
 "  -q, --quiet         ne pas afficher les diagnostiques d'échec de création\n"
 "                        des fichiers ou répertoires\n"
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
-"      --suffix=SUFF  ajouter SUFF à TEMPLATE, SUFF ne doit pas contenir de\n"
-"                       barre oblique. Cette option est utilisée si TEMPLATE\n"
-"                       ne se termine pas par un X.\n"
+"      --suffix=SUFF  ajouter SUFF à MODÈLE ; SUFF ne doit pas contenir de\n"
+"                       barre oblique ; cette option est implicite si MODÈLE\n"
+"                       ne se termine pas par un X\n"
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
-"      --tmpdir[=DIR]  interpréter TEMPLATE en relation avec DIR. Si DIR "
-"n'est\n"
-"                        pas indiqué, utiliser $TMPDIR si défini ou /tmp "
-"sinon.\n"
-"                        Avec cette option, TEMPLATE ne doit pas être un nom\n"
-"                        absolu. Contrairement à -t, TEMPLATE peut contenir "
-"des\n"
-"                        barres obliques, mais mktemp ne crée que la partie\n"
+"  -p RÉP, --tmpdir[=RÉP]  interpréter MODÈLE en relation avec RÉP ; si RÉP\n"
+"                        n'est pas indiqué, utiliser $TMPDIR si défini ou /"
+"tmp\n"
+"                        sinon ; avec cette option, MODÈLE ne doit pas être "
+"un\n"
+"                        nom absolu ; contrairement à -t, MODÈLE peut "
+"contenir\n"
+"                        des barres obliques, mais mktemp ne crée que la "
+"partie\n"
 "                        finale\n"
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
 msgstr ""
-"  -p DIR              utiliser DIR comme préfixe, implique -t [déconseillé]\n"
-"  -t                  interpréter TEMPLATE comme un seul composant de nom "
-"de\n"
+"  -t                  interpréter MODÈLE comme un seul composant de nom de\n"
 "                        fichier, relatif au répertoire $TMPDIR s'il est "
 "défini ;\n"
 "                        ou à défaut le répertoire indiqué par -p ; ou sinon /"
 "tmp\n"
-"                        [déconseillé]\n"
-
-#: src/mktemp.c:223
-#, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr "impossible de rediriger la sortie d'erreur standard vers /dev/null"
+"                        [déconseillée]\n"
 
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, c-format
 msgid "too many templates"
 msgstr "trop de modèles"
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr "avec --suffix, le modèle %s doit se terminer par un X"
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr ""
 "le suffixe %s est incorrect car il contient un séparateur de répertoires"
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr "trop peu de X dans le modèle %s"
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr "modèle incorrect, %s, contient des séparateurs de répertoires"
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr "modèle incorrect, %s ; avec --tmpdir, il ne peut pas être absolu"
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, c-format
 msgid "failed to create directory via template %s"
 msgstr "impossible de créer le répertoire à partir du modèle %s"
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, c-format
 msgid "failed to create file via template %s"
 msgstr "impossible de créer le fichier à partir du modèle %s"
 
-#: src/mv.c:292
+#: src/mv.c:294
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
 msgstr ""
-"Renommer SOURCE en DEST, ou déplacer le ou les SOURCEs vers DIRECTORY.\n"
+"Renommer SOURCE en DEST, ou déplacer le ou les SOURCEs vers RÉPERTOIRE.\n"
 
-#: src/mv.c:298
+#: src/mv.c:300
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
 "file\n"
@@ -6682,7 +6837,7 @@ msgstr ""
 "Si vous indiquez plusieurs options parmi -i, -f, -n, seule la dernière sera\n"
 "effective.\n"
 
-#: src/mv.c:307
+#: src/mv.c:309
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
@@ -6691,9 +6846,9 @@ msgid ""
 msgstr ""
 "      --strip-trailing-slashes  enlever les « / » en suffixe de tous les\n"
 "                                 arguments SOURCE\n"
-"  -S, --suffix=SUFFIX          écraser le suffixe usuel d'archivage\n"
+"  -S, --suffix=SUFFIXE         remplacer le suffixe usuel d'archivage\n"
 
-#: src/mv.c:312
+#: src/mv.c:314
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
 "DIRECTORY\n"
@@ -6702,9 +6857,12 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
-"  -t, --target-directory=DIRECTORY  déplacer tous les arguments SOURCE vers\n"
-"                                 DIRECTORY\n"
+"  -t, --target-directory=RÉPERTOIRE  déplacer tous les arguments SOURCE "
+"vers\n"
+"                                     RÉPERTOIRE\n"
 "  -T, --no-target-directory    traiter DEST comme un fichier normal\n"
 "  -u, --update                 ne déplacer que si le fichier SOURCE est "
 "plus\n"
@@ -6712,11 +6870,13 @@ msgstr ""
 "fichier\n"
 "                                 cible n'existe\n"
 "  -v, --verbose                expliquer ce qui est fait\n"
+"  -Z, --context                définir le contexte de sécurité SELinux du\n"
+"                                 fichier de destination au type par défaut\n"
 
 #: src/nice.c:72
 #, c-format
 msgid "Usage: %s [OPTION] [COMMAND [ARG]...]\n"
-msgstr "Utilisation : %s [OPTION] [COMMAND] [ARG]...\n"
+msgstr "Utilisation : %s [OPTION] [COMMANDE] [ARG]...\n"
 
 #: src/nice.c:73
 #, c-format
@@ -6725,11 +6885,11 @@ msgid ""
 "With no COMMAND, print the current niceness.  Niceness values range from\n"
 "%d (most favorable to the process) to %d (least favorable to the process).\n"
 msgstr ""
-"Exécuter COMMAND avec un niveau de priorité ajusté, modifiant la priorité\n"
+"Exécuter COMMANDE avec un niveau de priorité ajusté, modifiant la priorité\n"
 "d'ordonnancement du processus.\n"
-"Sans COMMAND, afficher le niveau de priorité actuel. L'étendue des niveaux "
-"va de\n"
-"%d (priorité la plus favorable au processus) à %d (la moins favorable).\n"
+"Sans COMMANDE, afficher le niveau de priorité actuel. L'étendue des niveaux "
+"va\n"
+"de %d (priorité la plus favorable au processus) à %d (la moins favorable).\n"
 
 #: src/nice.c:82
 msgid "  -n, --adjustment=N   add integer N to the niceness (default 10)\n"
@@ -6767,8 +6927,8 @@ msgid ""
 "Write each FILE to standard output, with line numbers added.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
-"Afficher chaque FILE sur la sortie standard avec les numéros de ligne.\n"
-"Sans FILE, ou quand FILE est -, lire l'entrée standard.\n"
+"Afficher chaque FICHIER sur la sortie standard avec les numéros de ligne.\n"
+"Sans FICHIER, ou quand FICHIER est -, lire l'entrée standard.\n"
 
 #: src/nl.c:186
 msgid ""
@@ -6805,7 +6965,7 @@ msgstr ""
 "  -p, --no-renumber               ne pas réinitialiser le nombre de lignes "
 "aux\n"
 "                                    pages logiques\n"
-"  -s, --number-separator=STRING   ajouter STRING après le numéro de ligne "
+"  -s, --number-separator=CHAÎNE   ajouter CHAÎNE après le numéro de ligne "
 "(si\n"
 "                                    possible)\n"
 
@@ -6916,7 +7076,7 @@ msgid ""
 "Usage: %s COMMAND [ARG]...\n"
 "  or:  %s OPTION\n"
 msgstr ""
-"Utilisation : %s COMMAND [ARG]...\n"
+"Utilisation : %s COMMANDE [ARG]...\n"
 "         ou : %s OPTION\n"
 
 #: src/nohup.c:59
@@ -6924,7 +7084,7 @@ msgid ""
 "Run COMMAND, ignoring hangup signals.\n"
 "\n"
 msgstr ""
-"Exécuter COMMAND en ignorant les signaux de déconnexion.\n"
+"Exécuter COMMANDE en ignorant les signaux de déconnexion.\n"
 "\n"
 
 #: src/nohup.c:65
@@ -6943,7 +7103,8 @@ msgstr ""
 "« nohup.out » ou à « $HOME/nohup.out » sinon.\n"
 "Si la sortie d'erreur standard est un terminal, la rediriger vers la sortie\n"
 "standard.\n"
-"Pour enregistrer la sortie dans FILE, utilisez « %s COMMAND > FILE ».\n"
+"Pour enregistrer la sortie dans FICHIER, utilisez « %s COMMANDE > "
+"FICHIER ».\n"
 
 #: src/nohup.c:127
 #, c-format
@@ -6969,7 +7130,8 @@ msgstr "la sortie est ajoutée à %s"
 #, c-format
 msgid "failed to set the copy of stderr to close on exec"
 msgstr ""
-"échec de copie sur la sortie d'erreur standard pour terminer l'exécution"
+"impossible de copier vers la sortie d'erreur standard pour terminer "
+"l'exécution"
 
 #: src/nohup.c:198
 #, c-format
@@ -6985,7 +7147,7 @@ msgstr "redirection de la sortie d'erreur standard vers la sortie standard"
 #: src/nohup.c:203
 #, c-format
 msgid "failed to redirect standard error"
-msgstr "échec de redirection vers la sortie d'erreur standard"
+msgstr "impossible de rediriger vers la sortie d'erreur standard"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/nproc.c:33
@@ -7021,111 +7183,106 @@ msgid "%s: invalid number to ignore"
 msgstr "%s : nombre à ignorer incorrect"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
 msgstr "Assaf Gordon"
 
-#: src/numfmt.c:676
+#: src/numfmt.c:659
 #, c-format
-msgid "value too large to be converted: '%s'"
-msgstr "valeur trop grande pour être convertie : « %s »"
+msgid "value too large to be converted: %s"
+msgstr "valeur trop grande pour être convertie : %s"
 
-#: src/numfmt.c:680
+#: src/numfmt.c:663
 #, c-format
-msgid "invalid number: '%s'"
-msgstr "nombre incorrect : « %s »"
+msgid "invalid number: %s"
+msgstr "nombre incorrect : %s"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
-msgstr "rejet du suffixe en entrée : « %s » (songez à utiliser --from)"
+msgid "rejecting suffix in input: %s (consider using --from)"
+msgstr "rejet du suffixe en entrée : %s (songez à utiliser --from)"
 
-#: src/numfmt.c:688
+#: src/numfmt.c:671
 #, c-format
-msgid "invalid suffix in input: '%s'"
-msgstr "suffixe incorrect en entrée : « %s »"
+msgid "invalid suffix in input: %s"
+msgstr "suffixe incorrect en entrée : %s"
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
-msgstr "suffixe « i » manquant en entrée : « %s » (par exemple Ki, Mi ou Gi)"
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
+msgstr "suffixe « i » manquant en entrée : %s (par exemple Ki, Mi ou Gi)"
 
-#: src/numfmt.c:723
+#: src/numfmt.c:722 src/numfmt.c:768
 #, c-format
 msgid "failed to prepare value '%Lf' for printing"
-msgstr "échec de préparation de la valeur « %Lf » pour l'affichage"
+msgstr "impossible de préparer la valeur « %Lf » pour l'affichage"
 
-#: src/numfmt.c:787
+#: src/numfmt.c:791
 #, c-format
-msgid "invalid unit size: '%s'"
-msgstr "taille d'unité incorrecte : « %s »"
+msgid "invalid unit size: %s"
+msgstr "taille d'unité incorrecte : %s"
 
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
-#, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr "plus de mémoire (%zu octets demandés)"
-
-#: src/numfmt.c:813
+#: src/numfmt.c:814
 #, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
-msgstr "Utilisation : %s [OPTION]... [NUMBER]...\n"
+msgstr "Utilisation : %s [OPTION]... [NOMBRE]...\n"
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
 msgstr ""
-"Reformater le ou les NUMBERs, ou les nombres de l'entrée standard si aucun "
-"n'est indiqué.\n"
+"Reformater le ou les NOMBREs, ou les nombres de l'entrée standard si aucun "
+"n'est\n"
+"indiqué.\n"
 
-#: src/numfmt.c:820
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
 msgstr ""
 "      --debug          afficher les avertissements en cas d'entrée "
 "incorrecte\n"
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
 "  -d, --delimiter=X    utiliser X au lieu d'un blanc comme délimiteur de "
 "champ\n"
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
 "      --field=N        remplacer le nombre dans le champs d'entrée N\n"
 "                         (1 par défaut)\n"
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
 msgstr ""
-"      --format=FORMAT  utiliser le le type printf de virgule flottante "
+"      --format=FORMAT  utiliser le le type printf à virgule flottante "
 "FORMAT ;\n"
 "                         consultez FORMAT plus bas pour des précisions\n"
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
 "                         see UNIT below\n"
 msgstr ""
-"      --from=UNIT      mettre automatiquement à l'échelle « UNIT » les "
-"nombres\n"
-"                         en entrée ; « none » par défaut ; consultez UNIT\n"
-"                         plus bas\n"
+"      --from=ÉCHELLE   mettre automatiquement à l’ÉCHELLE les nombres en\n"
+"                         entrée ; « none » par défaut ; consultez ÉCHELLE\n"
+"                         ci-dessous\n"
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr ""
-"      --from-unit=N    indiquer l'unité en entrée (au lieu de 1 par défaut)\n"
+"      --from-unit=N    indiquer la taille d’unité en entrée (1 par défaut)\n"
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
@@ -7139,7 +7296,7 @@ msgstr ""
 "                         régionaux (donc sans effet avec les locales C/"
 "POSIX)\n"
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
@@ -7147,17 +7304,16 @@ msgstr ""
 "      --header[=N]     afficher (sans conversion) les N premières lignes\n"
 "                         d'en-tête ; N vaut 1 par défaut si non indiqué\n"
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
 msgstr ""
 "      --invalid=MODE   mode d'échec pour les nombres incorrects ; MODE peut "
 "être\n"
-"                        « abort » (par défaut), « fail », « warn » ou "
-"« ignore »\n"
+"                         abort (par défaut), fail, warn ou ignore\n"
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -7175,54 +7331,55 @@ msgstr ""
 "blanc\n"
 "                         est trouvé\n"
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
 "nearest\n"
 msgstr ""
-"      --round=METHOD   utiliser METHOD pour arrondir lors de la mise à\n"
-"                         l'échelle ; METHOD peut être : « up », « down »,\n"
+"      --round=MÉTHODE  utiliser MÉTHODE pour arrondir lors de la mise à\n"
+"                         l'échelle ; MÉTHODE peut être : « up », « down »,\n"
 "                         « from-zero » (par défaut), « towards-zero » ou\n"
 "                         « nearest »\n"
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
 msgstr ""
-"      --suffix=SUFFIX  ajouter le SUFFIX aux nombres en sortie, et accepter "
+"      --suffix=SUFFIXE  ajouter le SUFFIXE aux nombres en sortie et accepter "
 "le\n"
-"                         SUFFIX facultatif aux nombres en entrée\n"
+"                         SUFFIXE facultatif aux nombres en entrée\n"
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
-"      --to=UNIT        mettre à l'échelle automatiquement les nombres en "
-"sortie\n"
-"                         à « UNIT » ; consultez UNIT plus bas\n"
+"      --to=ÉCHELLE     mettre à l’ÉCHELLE automatiquement les nombres en\n"
+"                         sortie ; consultez ÉCHELLE plus bas\n"
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
-msgstr "      --to-unit=N      l'unité en sortie (au lieu de 1 par défaut)\n"
+msgstr ""
+"      --to-unit=N      la taille d’unité en sortie (au lieu de 1 par "
+"défaut)\n"
 
-#: src/numfmt.c:877
+#: src/numfmt.c:878
 msgid ""
 "\n"
 "UNIT options:\n"
 msgstr ""
 "\n"
-"Options UNIT :\n"
+"Options ÉCHELLE :\n"
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr ""
 "  none       aucune mise à l'échelle automatique n'est effectuée ;\n"
 "               les suffixes déclencheront une erreur\n"
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -7237,7 +7394,7 @@ msgstr ""
 "               1Mi = 1048576 ;\n"
 "               ...\n"
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
@@ -7249,7 +7406,7 @@ msgstr ""
 "               1M = 1000000 ;\n"
 "               ...\n"
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
@@ -7261,7 +7418,7 @@ msgstr ""
 "               1M = 1048576 ;\n"
 "               ...\n"
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
@@ -7273,15 +7430,15 @@ msgstr ""
 "               1Mi = 1048576 ;\n"
 "               ...\n"
 
-#: src/numfmt.c:905
+#: src/numfmt.c:906
 #, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
 "\n"
 "FORMAT doit être adapté à l'affichage d'un argument de virgule flottante "
@@ -7290,10 +7447,11 @@ msgstr ""
 "paramètres\n"
 "régionaux actuels). Une valeur de largeur facultative (%10f) remplira la "
 "sortie.\n"
-"Une valeur de largeur négative facultative (%-10f) remplira la sortie à "
-"gauche.\n"
+"Une valeur de largeur facultative nulle (%010f) remplira de zéros le nombre. "
+"Les\n"
+"valeurs négatives facultatives (%-10f) aligneront la sortie à gauche.\n"
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -7311,9 +7469,9 @@ msgstr ""
 "affiché à chaque erreur de conversion et le code de retour est 2. Avec\n"
 "--invalid='warn', toutes les erreurs de conversion sont diagnostiquées,\n"
 "mais le code de retour est 0. Avec --invalid='ignore', les erreur de\n"
-"conversion ne sont pas diagnostiquées, et le code de retour est 0.\n"
+"conversion ne sont pas diagnostiquées et le code de retour est 0.\n"
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -7350,117 +7508,118 @@ msgstr ""
 "  $ ls -lh | %s --header --field 5 --from=iec --padding=10\n"
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, c-format
 msgid "format %s has no %% directive"
 msgstr "le format %s ne contient pas de directive %%"
 
-#: src/numfmt.c:990
+#: src/numfmt.c:1003
 #, c-format
 msgid "invalid format %s (width overflow)"
 msgstr "format %s incorrect (dépassement de largeur)"
 
-#: src/numfmt.c:1007 src/seq.c:229
+# NOTE: s/dd/d/
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr "--format de remplissage écrasant --padding"
+
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr "le format %s termine avec %%"
 
-#: src/numfmt.c:1010
+#: src/numfmt.c:1030
 #, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
-msgstr "format %s incorrect, la directive doit être %%['][-][N]f"
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
+msgstr "format %s incorrect, la directive doit être %%[0]['][-][N]f"
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr "le format %s contient trop de directives %%"
 
-#: src/numfmt.c:1070
+#: src/numfmt.c:1081
 #, c-format
-msgid "invalid suffix in input '%s': '%s'"
-msgstr "suffixe incorrect dans l'entrée « %s » : « %s »"
+msgid "invalid suffix in input %s: %s"
+msgstr "suffixe incorrect dans l'entrée %s : %s"
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
 msgstr ""
 "valeur trop grande pour être affichée : « %Lg » (songez à utiliser --to)"
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
 msgstr ""
 "valeur trop grande pour être affichée : « %Lg » (impossible de gérer des "
 "valeurs supérieures à 999Y)"
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
-msgstr "grande valeur d'entrée « %s » : perte de précisions potentielle"
+msgid "large input value %s: possible precision loss"
+msgstr "grande valeur d'entrée %s : perte de précisions potentielle"
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
 "la ligne d'entrée est trop courte, aucun nombre à convertir n'a été trouvé "
 "dans le champ %ld"
 
-#: src/numfmt.c:1388
+#: src/numfmt.c:1403
 #, c-format
-msgid "invalid padding value '%s'"
-msgstr "valeur de remplissage « %s » incorrecte"
+msgid "invalid padding value %s"
+msgstr "valeur de remplissage %s incorrecte"
 
-#: src/numfmt.c:1401
+#: src/numfmt.c:1417
 #, c-format
-msgid "invalid field value '%s'"
-msgstr "valeur de champ « %s » incorrecte"
+msgid "invalid field value %s"
+msgstr "valeur de champ %s incorrecte"
 
-#: src/numfmt.c:1430
+#: src/numfmt.c:1447
 #, c-format
-msgid "invalid header value '%s'"
-msgstr "valeur d'en-tête « %s » incorrecte"
+msgid "invalid header value %s"
+msgstr "valeur d'en-tête %s incorrecte"
 
-#: src/numfmt.c:1456
+#: src/numfmt.c:1473
 #, c-format
 msgid "--grouping cannot be combined with --format"
 msgstr "--grouping ne peut pas être combiné avec --format"
 
-#: src/numfmt.c:1458
-#, c-format
-msgid "--padding cannot be combined with --format"
-msgstr "--padding ne peut pas être combiné avec --format"
-
-#: src/numfmt.c:1463
+#: src/numfmt.c:1478
 #, c-format
 msgid "no conversion option specified"
 msgstr "aucune option de conversion indiquée"
 
-#: src/numfmt.c:1471
+#: src/numfmt.c:1486
 #, c-format
 msgid "grouping cannot be combined with --to"
 msgstr "le groupement ne peut pas être combiné avec --format"
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
 msgstr "le groupement n'a pas d'effet avec ces paramètres régionaux"
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
 msgstr "--header ignoré avec l'entrée en ligne de commande"
 
-#: src/numfmt.c:1511
+#: src/numfmt.c:1526
 #, c-format
 msgid "error reading input"
 msgstr "erreur de lecture de l'entrée"
 
-#: src/numfmt.c:1520
+#: src/numfmt.c:1535
 #, c-format
 msgid "failed to convert some of the input numbers"
 msgstr "impossible de convertir certains des nombres en entrée"
 
-#: src/od.c:294
+#: src/od.c:320
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -7468,12 +7627,12 @@ msgid ""
 "  or:  %s --traditional [OPTION]... [FILE] [[+]OFFSET[.][b] [+][LABEL][.]"
 "[b]]\n"
 msgstr ""
-"Utilisation : %s [OPTION]... [FILE]...\n"
-"         ou : %s [-abcdfilosx]... [FILE] [[+]OFFSET[.][b]]\n"
-"         ou : %s --traditional [OPTION]... [FILE] [[+]OFFSET[.][b] [+][LABEL]"
-"[.][b]]\n"
+"Utilisation : %s [OPTION]... [FICHIER]...\n"
+"         ou : %s [-abcdfilosx]... [FICHIER] [[+]POSITION[.][b]]\n"
+"         ou : %s --traditional [OPTION]... [FICHIER] [[+]POSITION[.][b] \\\n"
+"                                                     [+][ÉTIQUETTE][.][b]]\n"
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -7484,11 +7643,11 @@ msgid ""
 msgstr ""
 "\n"
 "Afficher sur la sortie standard et de manière non ambiguë, par défaut\n"
-"sous forme d'octets en représentation octale, le contenu du FILE.\n"
-"Sans FILE, ou quand FILE est -, lire l'entrée standard.\n"
+"sous forme d'octets en représentation octale, le contenu du FICHIER.\n"
+"Sans FICHIER, ou quand FICHIER est -, lire l'entrée standard.\n"
 "\n"
 
-#: src/od.c:307
+#: src/od.c:333
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
 "if the last operand begins with + or (if there are 2 operands) a digit.\n"
@@ -7500,55 +7659,61 @@ msgstr ""
 "Si les formats du premier et du second appel s'appliquent, le 2e format est\n"
 "retenu si le dernier opérande débute par + ou (s'il y a 2 opérandes) un "
 "chiffre.\n"
-"Un opérande de décalage signifie -j OFFSET. LABEL est la pseudoadresse "
-"affichée\n"
-"dès le premier octet, incrémentée lorsque le vidage mémoire s'effectue.\n"
-"Pour OFFSET et LABEL, un préfixe 0x ou 0X indique de l'hexadécimal ;\n"
+"Un opérande de décalage signifie -j POSITION. ÉTIQUETTE est la "
+"pseudoadresse\n"
+"affichée dès le premier octet, incrémentée lorsque le vidage mémoire "
+"s'effectue.\n"
+"Pour POSITION et ÉTIQUETTE, un préfixe 0x ou 0X indique de l'hexadécimal ;\n"
 "les suffixes peuvent être . pour l'octal et b pour multiple de 512.\n"
 
-#: src/od.c:318
+#: src/od.c:344
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
-"  -A, --address-radix=RADIX   format de sortie pour les indices de fichier.\n"
+"  -A, --address-radix=RADIX   format de sortie pour les indices de "
+"fichier ;\n"
 "                                RADIX est d, o, x ou n, pour décimal, "
 "octal,\n"
 "                                hexadécimal ou sans\n"
-"  -j, --skip-bytes=BYTES      ignorer BYTES premiers octets en entrée\n"
+"      --endian={big|little}   inverser les octets en entrée d’après l’ordre\n"
+"                                indiqué\n"
+"  -j, --skip-bytes=OCTETS     ignorer OCTETS premiers octets en entrée\n"
 
-#: src/od.c:323
+#: src/od.c:350
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
-"  -N, --read-bytes=BYTES      limiter l'image à BYTES octets en entrée\n"
-"  -S BYTES, --strings[=BYTES]  afficher les chaînes d'au moins "
-"BYTES caractères\n"
-"                                graphiques. 3 est implicite sans BYTES\n"
+"  -N, --read-bytes=OCTETS     limiter l'image à OCTETS octets en entrée\n"
+"  -S OCTETS, --strings[=OCTETS]  afficher les chaînes d'au moins\n"
+"                                 OCTETS caractères graphiques ;\n"
+"                                 3 est implicite sans OCTETS\n"
 "  -t, --format=TYPE           sélectionner le ou les formats d'affichage\n"
 "  -v, --output-duplicates     ne pas utiliser * pour marquer la suppression\n"
-"  -w, --width[=BYTES]         afficher BYTES octets par ligne de sortie.\n"
-"                                32 est implicite sans BYTES\n"
+"  -w, --width[=OCTETS]        afficher OCTETS octets par ligne de sortie.\n"
+"                                32 est implicite sans OCTETS\n"
 "      --traditional           accepter les arguments sous la troisième\n"
 "                                forme précédente\n"
 
-#: src/od.c:336
+#: src/od.c:363
 msgid ""
 "\n"
 "\n"
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 "\n"
@@ -7559,13 +7724,12 @@ msgstr ""
 "le\n"
 "                            bit de poids fort\n"
 "  -b   identique à -t o1, sélectionner les octets en octal\n"
-"  -c   identique à -t c,  sélectionner les caractères ASCII ou les "
-"protections\n"
-"                            par barre oblique inverses\n"
+"  -c   identique à -t c,  sélectionner les caractères affichables ou les\n"
+"                            protections par barre oblique inverses\n"
 "  -d   identique à -t u2, sélectionner les décimaux non signées sur "
 "2 octets\n"
 
-#: src/od.c:345
+#: src/od.c:372
 msgid ""
 "  -f   same as -t fF, select floats\n"
 "  -i   same as -t dI, select decimal ints\n"
@@ -7582,21 +7746,21 @@ msgstr ""
 "  -x   identique à -t x2, sélectionner les nombres hexadécimaux sur "
 "2 octets\n"
 
-#: src/od.c:353
+#: src/od.c:380
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 "\n"
 "\n"
 "TYPE est composé d'une ou plusieurs des spécifications suivantes :\n"
 "  a          caractère nommé, en ignorant le bit de poids fort\n"
-"  c          caractère ASCII ou barre oblique inversé protégée\n"
+"  c          caractère affichable ou protection par barre oblique inverse\n"
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -7604,13 +7768,13 @@ msgid ""
 "  u[SIZE]    unsigned decimal, SIZE bytes per integer\n"
 "  x[SIZE]    hexadecimal, SIZE bytes per integer\n"
 msgstr ""
-"  d[SIZE]    décimal signé, SIZE octets par entier\n"
-"  f[SIZE]    point flottant, SIZE octets par entier\n"
-"  o[SIZE]    octal, SIZE octets par entier\n"
-"  u[SIZE]    décimal non signé SIZE octets par entier\n"
-"  x[SIZE]    hexadécimal, SIZE octets par entier\n"
+"  d[TAILLE]  décimal signé, TAILLE octets par entier\n"
+"  f[TAILLE]  point flottant, TAILLE octets par entier\n"
+"  o[TAILLE]  octal, TAILLE octets par entier\n"
+"  u[TAILLE]  décimal non signé TAILLE octets par entier\n"
+"  x[TAILLE]  hexadécimal, TAILLE octets par entier\n"
 
-#: src/od.c:367
+#: src/od.c:394
 msgid ""
 "\n"
 "SIZE is a number.  For TYPE in [doux], SIZE may also be C for\n"
@@ -7619,14 +7783,14 @@ msgid ""
 "for sizeof(double) or L for sizeof(long double).\n"
 msgstr ""
 "\n"
-"SIZE est un nombre. Si le TYPE est d, o, u ou x, SIZE peut aussi être C "
+"TAILLE est un nombre. Si le TYPE est d, o, u ou x, TAILLE peut aussi être C "
 "pour\n"
-"sizeof(char), S pour sizeof(short), I pour sizeof(int) ou L pour sizeof"
-"(long).\n"
-"Si le TYPE est f, SIZE peut aussi être F pour sizeof(float), D pour\n"
+"sizeof(char), S pour sizeof(short), I pour sizeof(int) ou L pour "
+"sizeof(long).\n"
+"Si le TYPE est f, TAILLE peut aussi être F pour sizeof(float), D pour\n"
 "sizeof(double) ou L pour sizeof(long double).\n"
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
@@ -7634,9 +7798,9 @@ msgid ""
 msgstr ""
 "\n"
 "L'ajout du suffixe « z » à l'un de ces types affiche des caractères\n"
-"imprimables à la fin de chaque ligne de résultat\n"
+"imprimables à la fin de chaque ligne de résultat.\n"
 
-#: src/od.c:379
+#: src/od.c:406
 msgid ""
 "\n"
 "\n"
@@ -7650,7 +7814,7 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"BYTES est hexadécimal avec un préfixe 0x ou 0X, est peut avoir un\n"
+"OCTETS est hexadécimal avec un préfixe 0x ou 0X, est peut avoir un\n"
 "suffixe multiplicateur :\n"
 "  b    512 ;\n"
 "  KB   1000 ;\n"
@@ -7659,12 +7823,12 @@ msgstr ""
 "  M    1024*1024 ;\n"
 "et ainsi de suite pour G, T, P, E, Z et Y.\n"
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, c-format
 msgid "invalid type string %s"
 msgstr "type de chaîne %s incorrect"
 
-#: src/od.c:649
+#: src/od.c:690
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7673,7 +7837,7 @@ msgstr ""
 "type de chaîne %s incorrect ;\n"
 "ce système ne fournit pas de type entier sur %lu octets"
 
-#: src/od.c:770
+#: src/od.c:811
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7682,38 +7846,38 @@ msgstr ""
 "type de chaîne %s incorrect ;\n"
 "ce système ne fournit pas de type en point flottant sur %lu octets"
 
-#: src/od.c:828
+#: src/od.c:869
 #, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr "caractère « %c » incorrect dans le type de chaîne %s"
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr "impossible d'ignorer au delà de la fin de l'entrée combinée"
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr ""
 "adresse radix de sortie « %c » incorrecte, ce doit être caractère parmi "
 "[doxn]"
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr "aucun type ne peut être indiqué lors de l'affichage brut des chaînes"
 
-#: src/od.c:1810
+#: src/od.c:1863
 msgid "compatibility mode supports at most one file"
 msgstr "le mode de compatibilité ne prend pas en charge plusieurs fichiers"
 
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr "octets ignorés + le nombre d'octets lus est trop grand"
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr "avertissement : largeur %lu incorrecte ; %d sera utilisé à la place"
@@ -7735,8 +7899,8 @@ msgid ""
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
 "Écrire séquentiellement les lignes correspondantes de chaque\n"
-"FILE, séparées par des tabulations, vers la sortie standard.\n"
-"Sans FILE, ou quand FILE est -, lire l'entrée standard.\n"
+"FICHIER, séparées par des tabulations, vers la sortie standard.\n"
+"Sans FICHIER, ou quand FICHIER est -, lire l'entrée standard.\n"
 
 #: src/paste.c:447
 msgid ""
@@ -7881,12 +8045,12 @@ msgstr "Quand"
 msgid "Where"
 msgstr "Où"
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
-msgstr "Utilisation : %s [OPTION]... [USER]...\n"
+msgstr "Utilisation : %s [OPTION]... [UTILIS]...\n"
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -7896,7 +8060,7 @@ msgid ""
 "  -s              do short format output, this is the default\n"
 msgstr ""
 "\n"
-"  -l              afficher au format long pour les USERs indiqués\n"
+"  -l              afficher au format long pour les UTILISateurs indiqués\n"
 "  -b              omettre le répertoire personnel de l'utilisateur et son\n"
 "                    interpréteur de commandes au format long\n"
 "  -h              omettre le fichier de projet de l'utilisateur au format "
@@ -7906,7 +8070,7 @@ msgstr ""
 "  -s              afficher au format court, c'est le comportement par "
 "défaut\n"
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -7922,7 +8086,7 @@ msgstr ""
 "  -q              omettre le nom complet de l'utilisateur, le nom de l'hôte\n"
 "                    et le temps d'inactivité au format court\n"
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, c-format
 msgid ""
 "\n"
@@ -7933,7 +8097,7 @@ msgstr ""
 "Une version allégée du programme « finger » ; afficher les renseignements\n"
 "relatifs à un utilisateur. Le fichier utmp sera %s.\n"
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr ""
@@ -7953,7 +8117,7 @@ msgstr "Roland Huebner"
 #: src/pr.c:908
 #, c-format
 msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument"
-msgstr "argument « --page=FIRST_PAGE[:LAST_PAGE] » manquant"
+msgstr "argument « --page=PREMIÈRE_PAGE[:DERNIÈRE_PAGE] » manquant"
 
 #: src/pr.c:910
 #, c-format
@@ -7963,27 +8127,27 @@ msgstr "intervalle de pages %s incorrect"
 #: src/pr.c:975
 #, c-format
 msgid "'-l PAGE_LENGTH' invalid number of lines: %s"
-msgstr "« -l PAGE_LENGTH » nombre de lignes incorrect : %s"
+msgstr "« -l TAILLE_PAGE » nombre de lignes incorrect : %s"
 
 #: src/pr.c:999
 #, c-format
 msgid "'-N NUMBER' invalid starting line number: %s"
-msgstr "« -N NUMBER » numéro de ligne de début incorrect : %s"
+msgstr "« -N NUMÉRO » numéro de ligne de début incorrect : %s"
 
 #: src/pr.c:1011
 #, c-format
 msgid "'-o MARGIN' invalid line offset: %s"
-msgstr "« -o MARGIN » saut de ligne incorrect : %s"
+msgstr "« -o MARGE » saut de ligne incorrect : %s"
 
 #: src/pr.c:1052
 #, c-format
 msgid "'-w PAGE_WIDTH' invalid number of characters: %s"
-msgstr "« -w PAGE_WIDTH » nombre de caractères incorrect : %s"
+msgstr "« -w LARGEUR_PAGE » nombre de caractères incorrect : %s"
 
 #: src/pr.c:1066
 #, c-format
 msgid "'-W PAGE_WIDTH' invalid number of characters: %s"
-msgstr "« -W PAGE_WIDTH » nombre de caractères incorrect : %s"
+msgstr "« -W LARGEUR_PAGE » nombre de caractères incorrect : %s"
 
 #: src/pr.c:1096
 #, c-format
@@ -8025,7 +8189,7 @@ msgstr "Page %<PRIuMAX>"
 
 #: src/pr.c:2757
 msgid "Paginate or columnate FILE(s) for printing.\n"
-msgstr "Paginer ou mettre en colonne le ou les FILEs pour impression.\n"
+msgstr "Paginer ou mettre en colonne le ou les FICHIERs pour impression.\n"
 
 #: src/pr.c:2763
 msgid ""
@@ -8036,11 +8200,11 @@ msgid ""
 "                    unless -a is used. Balance number of lines in the\n"
 "                    columns on each page\n"
 msgstr ""
-"  +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n"
-"                    débuter ou terminer l'impression à la page FIRST_PAGE\n"
-"                      ou LAST_PAGE\n"
-"  -COLUMN, --columns=COLUMN\n"
-"                    afficher COLUMN colonnes et les représenter en "
+"  +PREMIÈRE_PAGE[:DERNIÈRE_PAGE], --pages=PREMIÈRE_PAGE[:DERNIÈRE_PAGE]\n"
+"                    commencer [ou terminer] l'impression à la page\n"
+"                      PREMIÈRE_PAGE [ou DERNIÈRE_PAGE]\n"
+"  -COLONNE, --columns=COLONNE\n"
+"                    afficher COLONNE colonnes et les représenter en "
 "descendant,\n"
 "                      sauf si -a est utilisé. Équilibrer le nombre de lignes "
 "de\n"
@@ -8056,7 +8220,7 @@ msgid ""
 "                    double space the output\n"
 msgstr ""
 "  -a, --across      imprimer les colonnes horizontalement au lieu de\n"
-"                      verticalement quand utilisé avec -COLUMN\n"
+"                      verticalement quand utilisé avec -COLONNE\n"
 "  -c, --show-control-chars\n"
 "                    utiliser une notation par chapeau (^G) et octale avec "
 "barre\n"
@@ -8076,15 +8240,15 @@ msgid ""
 msgstr ""
 "  -D, --date-format=FORMAT\n"
 "                    utiliser le FORMAT pour l'en-tête de la date\n"
-"  -e[CHAR[WIDTH]], --expand-tabs[=CHAR[WIDTH]]\n"
-"                    étendre les caractères CHAR en entrée (tabulations) aux\n"
-"                      tabulations de largeur WIDTH (8 par défaut)\n"
+"  -e[CAR[LARGEUR]], --expand-tabs[=CAR[LARGEUR]]\n"
+"                    étendre les CARactères en entrée (tabulations) à la "
+"LARGEUR\n"
+"                    de tabulation (8 par défaut)\n"
 "  -F, -f, --form-feed\n"
 "                    utiliser des sauts de page au lieu des sauts de lignes "
 "pour\n"
-"                      séparer les pages (trois lignes par en-tête avec -F "
-"ou\n"
-"                      cinq lignes par en-tête et bas de page sans -f)\n"
+"                    séparer les pages (trois lignes par en-tête avec -F ou\n"
+"                    cinq lignes par en-tête et bas de page sans -f)\n"
 
 #: src/pr.c:2789
 msgid ""
@@ -8098,20 +8262,19 @@ msgid ""
 "column\n"
 "                    alignment, --sep-string[=STRING] sets separators\n"
 msgstr ""
-"  -h, --header=HEADER\n"
-"                    utiliser un en-tête HEADER centré au lieu du nom de "
-"fichier\n"
-"                      dans l'entête de page, -h \"\" imprime une ligne "
-"blanche,\n"
-"                      n'utilisez pas -h\"\"\n"
-"  -i[CHAR[WIDTH]], --output-tabs[=CHAR[WIDTH]]\n"
-"                    remplacer les espaces avec le caractères CHAR (ou\n"
-"                      tabulations) par des tabulations de largeur WIDTH (8\n"
-"                      par défaut)\n"
+"  -h, --header=EN-TÊTE\n"
+"                    utiliser un EN-TÊTE centré au lieu du nom de fichier "
+"dans\n"
+"                    l'en-tête de page, -h \"\" imprime une ligne blanche,\n"
+"                    n'utilisez pas -h\"\"\n"
+"  -i[CAR[LARGEUR]], --output-tabs[=CAR[LARGEUR]]\n"
+"                    remplacer les espaces par le ou les CARactères "
+"(tabulations)\n"
+"                    par la LARGEUR de tabulation (8 par défaut)\n"
 "  -J, --join-lines  fusionner des lignes complètes, désactiver la "
 "troncature\n"
-"                      des lignes -W, sans alignement des colonnes,\n"
-"                      --sep-string[=STRING] définit les séparateurs\n"
+"                    des lignes -W, sans alignement des colonnes,\n"
+"                    --sep-string[=CHAÎNE] définit les séparateurs\n"
 
 #: src/pr.c:2798
 msgid ""
@@ -8121,15 +8284,16 @@ msgid ""
 "  -m, --merge       print all files in parallel, one in each column,\n"
 "                    truncate lines, but join lines of full length with -J\n"
 msgstr ""
-"  -l, --length=PAGE_LENGTH\n"
-"                    définir la longueur de page à PAGE_LENGTH (66) lignes\n"
-"                      (par, défaut une page contient 56 lignes de texte, 63\n"
-"                      avec l'option -F)\n"
+"  -l, --length=TAILLE_PAGE\n"
+"                    définir la taille de page à TAILLE_PAGE (66 par défaut)\n"
+"                    lignes (par, défaut une page contient 56 lignes de "
+"texte,\n"
+"                    63 avec l'option -F)\n"
 "  -m, --merge       imprimer tous les fichiers en parallèle, un par "
 "colonne,\n"
-"                      tronquer les lignes, mais joindre les lignes de "
+"                    tronquer les lignes, mais joindre les lignes de "
 "longueur\n"
-"                      complète avec -J\n"
+"                    complète avec -J\n"
 
 #: src/pr.c:2805
 msgid ""
@@ -8140,17 +8304,17 @@ msgid ""
 "                    start counting with NUMBER at 1st line of first\n"
 "                    page printed (see +FIRST_PAGE)\n"
 msgstr ""
-"  -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n"
-"                    numéroter les lignes, en utilisant DIGITS chiffres (5 "
-"par\n"
-"                      défaut), suivi du séparateur SEP (tabulation par "
+"  -n[SEP[CHIFFRES]], --number-lines[=SEP[CHIFFRES]]\n"
+"                    numéroter les lignes, en utilisant CHIFFRES (5 par "
 "défaut),\n"
-"                      le compteur débute par défaut à la première ligne du\n"
-"                      fichier d'entrée\n"
-"  -N, --first-line-number=NUMBER\n"
-"                    débuter le compteur à NUMBER avec la première ligne de "
+"                    suivi du séparateur SEP (tabulation par défaut), le "
+"compteur\n"
+"                    débute par défaut à la première ligne du fichier "
+"d'entrée\n"
+"  -N, --first-line-number=NUMÉRO\n"
+"                    débuter le compteur à NUMÉRO avec la première ligne de "
 "la\n"
-"                      première page imprimée (consultez +FIRST_PAGE)\n"
+"                    première page imprimée (consultez +PREMIÈRE_PAGE)\n"
 
 #: src/pr.c:2813
 msgid ""
@@ -8160,9 +8324,9 @@ msgid ""
 "  -r, --no-file-warnings\n"
 "                    omit warning when a file cannot be opened\n"
 msgstr ""
-"  -o, --indent=MARGIN\n"
-"                    décaler chaque ligne avec MARGIN (zéro) espaces, ne pas\n"
-"                      affecter -w ou -W, MARGIN est ajouté à PAGE_WIDTH\n"
+"  -o, --indent=MARGE\n"
+"                    décaler chaque ligne avec MARGE (zéro) espaces, ne pas\n"
+"                      affecter -w ou -W, MARGE est ajouté à LARGEUR_PAGE\n"
 "  -r, --no-file-warnings\n"
 "                    inhiber l'avertissement lorsqu'un fichier ne peut pas "
 "être\n"
@@ -8173,18 +8337,19 @@ msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
-"  -s[CHAR], --separator[=CHAR]\n"
+"  -s[CAR], --separator[=CAR]\n"
 "                    séparer les colonnes à l'aide d'un seul caractère, le\n"
 "                      caractère de tabulation par défaut sans -w et sans\n"
-"                      caractère avec -w ; -s[CHAR] inhibe la troncature de\n"
+"                      caractère avec -w ; -s[CAR] inhibe la troncature de\n"
 "                      ligne pour les trois options de colonnes\n"
-"                      (-COLUMN|-a - COLUMN|-m) sauf si -w est défini\n"
+"                      (-COLONNE|-a - COLONNE|-m) sauf si -w est défini\n"
 
-#: src/pr.c:2827
+#: src/pr.c:2828
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
 "                    separate columns by STRING,\n"
@@ -8193,15 +8358,15 @@ msgid ""
 "options\n"
 "  -t, --omit-header  omit page headers and trailers\n"
 msgstr ""
-"  -SSTRING, --sep-string[=STRING]\n"
-"                    séparer les colonnes avec STRING,\n"
-"                      sans -S : le séparateur par défaut est <TAB> avec -J "
-"et\n"
-"                      <espace> sinon (comme -S\" \"), sans effet sur les "
-"colonnes\n"
+"  -S[CHAÃŽNE], --sep-string[=CHAÃŽNE]\n"
+"                    séparer les colonnes par CHAÎNE ; sans -S, le séparateur "
+"par\n"
+"                    défaut est <TAB> avec -J et <espace> sinon (comme -S\" "
+"\"),\n"
+"                    sans effet sur les options de colonne\n"
 "  -t, --omit-header  ne pas afficher les en-têtes et les pieds de page\n"
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 msgid ""
 "  -T, --omit-pagination\n"
 "                    omit page headers and trailers, eliminate any "
@@ -8222,14 +8387,14 @@ msgstr ""
 "                      d'entrée\n"
 "  -v, --show-nonprinting\n"
 "                    utiliser la notation octale avec barre oblique inverse\n"
-"  -w, --width=PAGE_WIDTH\n"
-"                    utiliser PAGE_WIDTH comme largeur de page, au lieu de\n"
-"                      72 colonnes par défaut, uniquement pour afficher les\n"
-"                      textes en plusieurs colonnes. Cette option est "
-"annulée\n"
-"                      si utilisée avec -s[CAR]\n"
+"  -w, --width=LARGEUR_PAGE\n"
+"                    utiliser LARGEUR_PAGE comme largeur de page (72 colonnes "
+"par\n"
+"                    défaut), pour n’afficher que les textes en plusieurs\n"
+"                    colonnes. Cette option est annulée si utilisée avec -"
+"s[CAR]\n"
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
 "                    set page width to PAGE_WIDTH (72) characters always,\n"
@@ -8237,22 +8402,21 @@ msgid ""
 "interference\n"
 "                    with -S or -s\n"
 msgstr ""
-"  -W, --page-width=PAGE_WIDTH\n"
-"                    toujours utiliser PAGE_WIDTH comme largeur de page, au "
-"lieu\n"
-"                      de 72 colonnes par défaut, sauf lorsque l'option -J "
-"est\n"
-"                      active, sans interférence avec -S ou -s\n"
+"  -W, --page-width=LARGEUR_PAGE\n"
+"                    toujours utiliser LARGEUR_PAGE comme largeur de page\n"
+"                    (72 colonnes par défaut), sauf lorsque l'option -J est\n"
+"                    active, sans interférence avec -S ou -s\n"
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 msgid ""
 "\n"
 "-t is implied if PAGE_LENGTH <= 10.  With no FILE, or when FILE is -, read\n"
 "standard input.\n"
 msgstr ""
 "\n"
-"-t est implicite si PAGE_LENGTH <= 10. Sans FILE, ou quand FILE est -, lire\n"
-"l'entrée standard.\n"
+"-t est implicite si TAILLE_PAGE <= 10. Sans FICHIER, ou quand FICHIER est "
+"-,\n"
+"lire l'entrée standard.\n"
 
 #: src/printenv.c:62
 #, c-format
@@ -8268,10 +8432,10 @@ msgstr ""
 "\n"
 
 #: src/printenv.c:69
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr ""
-" -0, --null     terminer les lignes avec l'octet 0 et non un changement de "
-"ligne\n"
+" -0, --null     terminer chaque ligne de sortie par NULL, pas un changement\n"
+"                  de ligne\n"
 
 #: src/printf.c:79
 #, c-format
@@ -8295,7 +8459,7 @@ msgid ""
 "Print ARGUMENT(s) according to FORMAT, or execute according to OPTION:\n"
 "\n"
 msgstr ""
-"Afficher les ARGUMENTS selon le FORMAT, ou exécuter selon OPTION :\n"
+"Afficher les ARGUMENTS selon le FORMAT ou exécuter selon OPTION :\n"
 "\n"
 
 #: src/printf.c:99
@@ -8391,21 +8555,21 @@ msgstr "avertissement : arguments superflus ignorés, débutant par %s"
 msgid "F. Pinard"
 msgstr "François Pinard"
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, c-format
 msgid "%s (for regexp %s)"
 msgstr "%s (pour l'expression rationnelle %s)"
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
 "  or:  %s -G [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr ""
-"Utilisation : %s [OPTION]... [INPUT]...   (sans l'option -G)\n"
-"         ou : %s -G [OPTION]... [INPUT [OUTPUT]]\n"
+"Utilisation : %s [OPTION]... [ENTRÉE]...   (sans l'option -G)\n"
+"         ou : %s -G [OPTION]... [ENTRÉE [SORTIE]]\n"
 
-#: src/ptx.c:1821
+#: src/ptx.c:1824
 msgid ""
 "Output a permuted index, including context, of the words in the input "
 "files.\n"
@@ -8413,7 +8577,7 @@ msgstr ""
 "Afficher un index permuté, incluant le contexte des mots des fichiers "
 "d'entrée.\n"
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
 "  -G, --traditional              behave more like System V 'ptx'\n"
@@ -8423,11 +8587,11 @@ msgstr ""
 "automatiquement\n"
 "  -G, --traditional              se comporter plutôt comme « ptx » de System "
 "V\n"
-"  -F, --flag-truncation=STRING   utiliser STRING pour indiquer les "
+"  -F, --flag-truncation=CHAÃŽNE   utiliser CHAÃŽNE pour indiquer les "
 "troncatures\n"
 "                                   de ligne\n"
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
 "  -O, --format=roff              generate output as roff directives\n"
@@ -8435,16 +8599,16 @@ msgid ""
 "  -S, --sentence-regexp=REGEXP   for end of lines or end of sentences\n"
 "  -T, --format=tex               generate output as TeX directives\n"
 msgstr ""
-"  -M, --macro-name=STRING        nom de la macro à utiliser au lieu de "
+"  -M, --macro-name=CHAÎNE        nom de la macro à utiliser au lieu de "
 "« xx »\n"
 "  -O, --format=roff              générer la sortie comme des directives "
 "roff\n"
 "  -R, --right-side-refs          placer références à droite, sans décompte -"
 "w\n"
-"  -S, --sentence-regexp=REGEXP   pour les fins de lignes ou de phrases\n"
+"  -S, --sentence-regexp=EXP_RAT  pour les fins de lignes ou de phrases\n"
 "  -T, --format=tex               générer la sortie comme des directives TeX\n"
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -8453,18 +8617,19 @@ msgid ""
 "  -i, --ignore-file=FILE         read ignore word list from FILE\n"
 "  -o, --only-file=FILE           read only word list from this FILE\n"
 msgstr ""
-"  -W, --word-regexp=REGEXP       utiliser REGEXP pour établir la "
+"  -W, --word-regexp=EXP_RAT      utiliser EXP_RAT pour établir la "
 "correspondance\n"
-"                                   à chaque mot\n"
-"  -b, --break-file=FILE          utiliser les césures de mots de FILE\n"
+"                                 à chaque mot\n"
+"  -b, --break-file=FICHIER       utiliser les césures de mots de FICHIER\n"
 "  -f, --ignore-case              convertir minuscules en majuscules pour le "
 "tri\n"
-"  -g, --gap-size=NUMBER          espacer les champs de NUMBER colonnes\n"
-"  -i, --ignore-file=FILE         lire la liste des mots à ignorer dans FILE\n"
-"  -o, --only-file=FILE           lire la liste des mots à conserver dans "
-"FILE\n"
+"  -g, --gap-size=NOMBRE          espacer les champs de NOMBRE colonnes\n"
+"  -i, --ignore-file=FICHIER      lire la liste des mots à ignorer dans "
+"FICHIER\n"
+"  -o, --only-file=FICHIER        lire la liste des mots à conserver dans "
+"FICHIER\n"
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -8472,20 +8637,20 @@ msgid ""
 "excluded\n"
 msgstr ""
 "  -r, --references               premier champ de chaque ligne en référence\n"
-"  -t, --typeset-mode               — option non implémentée —\n"
-"  -w, --width=NUMBER             largeur d'affichage en colonnes, sans "
+"  -t, --typeset-mode             — option non implémentée —\n"
+"  -w, --width=NOMBRE             largeur d'affichage en colonnes, sans "
 "référence\n"
 
-#: src/ptx.c:1854
+#: src/ptx.c:1857
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
 "\n"
-"Sans FILE, ou quand FILE est -, lire l'entrée standard. « -F / » par "
+"Sans FICHIER ou si FICHIER est -, lire l'entrée standard. « -F / » par "
 "défaut.\n"
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, c-format
 msgid "invalid gap width: %s"
 msgstr "largeur de saut incorrecte : %s"
@@ -8508,24 +8673,32 @@ msgstr ""
 "                    liens symboliques\n"
 "  -P, --physical  éviter tout lien symbolique\n"
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+"\n"
+"Si aucune option n’est indiquée, -P est assumé.\n"
+
+#: src/pwd.c:169
 #, c-format
 msgid "failed to chdir to %s"
 msgstr "impossible de changer de répertoire vers %s"
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, c-format
 msgid "failed to stat %s"
-msgstr "échec d'obtention d'état de %s"
+msgstr "impossible d’obtenir l’état de %s"
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr ""
 "impossible de repérer l'entrée du répertoire dans %s avec l'inœud "
 "correspondant"
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, c-format
 msgid "ignoring non-option arguments"
 msgstr "ignore les arguments qui ne sont pas des options"
@@ -8535,11 +8708,11 @@ msgstr "ignore les arguments qui ne sont pas des options"
 msgid "Dmitry V. Levin"
 msgstr "Dmitry V. Levin"
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
-msgstr "Utilisation : %s [OPTION]... FILE...\n"
+msgstr "Utilisation : %s [OPTION]... FICHIER...\n"
 
 #: src/readlink.c:63
 msgid ""
@@ -8583,8 +8756,7 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 "  -m, --canonicalize-missing    canoniser en suivant récursivement chaque "
 "lien\n"
@@ -8594,8 +8766,9 @@ msgstr ""
 "  -q, --quiet,\n"
 "  -s, --silent                  supprimer la plupart des messages d'erreur\n"
 "  -v, --verbose                 afficher les messages d'erreur\n"
-"  -z, --zero                    séparer la sortie avec NULL plutôt qu'un\n"
-"                                  changement de ligne\n"
+"  -z, --zero                    terminer chaque ligne de sortie par NULL, "
+"pas\n"
+"                                  un changement de ligne\n"
 
 #: src/readlink.c:152
 #, c-format
@@ -8622,7 +8795,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 "  -e, --canonicalize-existing  tous les composants du chemin doivent "
@@ -8635,12 +8808,14 @@ msgstr ""
 "  -P, --physical               résoudre les liens symboliques rencontrés\n"
 "                                 (par défaut)\n"
 "  -q, --quiet                  supprimer la plupart des messages d'erreur\n"
-"      --relative-to=FILE       afficher le chemin résolu relativement à "
-"FILE\n"
-"      --relative-base=FILE     afficher les chemins absolus sauf sous FILE\n"
+"      --relative-to=FICHIER    afficher le chemin résolu relativement à "
+"FICHIER\n"
+"      --relative-base=FICHIER  afficher les chemins absolus sauf sous "
+"FICHIER\n"
 "  -s, --strip, --no-symlinks   ne pas résoudre les liens symboliques\n"
-"  -z, --zero                   séparer la sortie par NULL au lieu de\n"
-"                                 changements de ligne\n"
+"  -z, --zero                   terminer chaque ligne de sortie par NULL, "
+"pas\n"
+"                                 un changement de ligne\n"
 "\n"
 
 #: src/relpath.c:130
@@ -8657,41 +8832,42 @@ msgstr "%s : descendre dans le répertoire protégé en écriture %s ? "
 msgid "%s: descend into directory %s? "
 msgstr "%s : descendre dans le répertoire %s ? "
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr "%s : supprimer %s (protégé en écriture) %s ? "
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, c-format
 msgid "%s: remove %s %s? "
 msgstr "%s : supprimer %s %s ? "
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, c-format
 msgid "removed directory: %s\n"
 msgstr "répertoire supprimé : %s\n"
 
-#: src/remove.c:444
+#: src/remove.c:447
 #, c-format
-msgid "cannot remove directory: %s"
-msgstr "impossible de supprimer le répertoire : %s"
+msgid "refusing to remove %s or %s directory: skipping %s"
+msgstr "refus de suppression des répertoires %s ou %s : %s ignoré"
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr "%s est ignoré car il est sur un périphérique différent"
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, c-format
 msgid "traversal failed: %s"
 msgstr "impossible de parcourir : %s"
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -8713,7 +8889,7 @@ msgid ""
 "prompt\n"
 "  -i                    prompt before every removal\n"
 msgstr ""
-"Supprimer (retirer le lien) le ou les fichiers FILEs.\n"
+"Supprimer (retirer le lien) le ou les FICHIERs.\n"
 "\n"
 "  -f, --force           ignorer les fichiers et arguments inexistants, ne\n"
 "                          jamais demander\n"
@@ -8723,24 +8899,24 @@ msgstr ""
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 "  -I                    demander confirmation une fois avant de supprimer "
 "plus\n"
-"                          de trois fichiers, ou lors de suppression "
-"récursive.\n"
-"                          Moins intrusif que -i, tout en protégeant contre "
+"                          de trois fichiers ou lors de suppression "
+"récursive ;\n"
+"                          moins intrusif que -i, tout en protégeant contre "
 "la\n"
 "                          plupart des erreurs\n"
-"      --interactive[=WHEN]  demander confirmation selon WHEN : « never »\n"
-"                          (jamais), « once » (une fois, -I), ou « always »\n"
-"                          (toujours, -i). Sans WHEN, toujours poser la "
-"question\n"
+"      --interactive[=QUAND]  demander confirmation selon QUAND : « never »\n"
+"                            (jamais), « once » (-I, une fois) ou "
+"« always » (-i,\n"
+"                            toujours) ; sans QUAND, toujours demander\n"
 
 #: src/rm.c:149
 msgid ""
@@ -8815,23 +8991,27 @@ msgstr ""
 
 #: src/rm.c:342
 #, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr "%s : supprimer tous les arguments récursivement ? "
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] "%s : supprimer l’argument %zu récursivement ? "
+msgstr[1] "%s : supprimer les arguments %zu récursivement ? "
 
-#: src/rm.c:343
+#: src/rm.c:345
 #, c-format
-msgid "%s: remove all arguments? "
-msgstr "%s : supprimer tous les arguments ? "
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] "%s : supprimer l’argument %zu ? "
+msgstr[1] "%s : supprimer les arguments %zu ? "
 
 #: src/rmdir.c:134 src/rmdir.c:233
 #, c-format
 msgid "removing directory, %s"
-msgstr "suppression du répertoire %s"
+msgstr "suppression du répertoire, %s"
 
 #: src/rmdir.c:148
 #, c-format
 msgid "failed to remove directory %s"
-msgstr "échec de suppression du répertoire %s"
+msgstr "impossible de supprimer le répertoire %s"
 
 #: src/rmdir.c:165
 msgid ""
@@ -8841,7 +9021,7 @@ msgid ""
 "                  ignore each failure that is solely because a directory\n"
 "                    is non-empty\n"
 msgstr ""
-"Supprimer les répertoires DIRECTORY, s'ils sont vides.\n"
+"Supprimer le ou les RÉPERTOIRE, s'ils sont vides.\n"
 "\n"
 "      --ignore-fail-on-non-empty\n"
 "                  ignorer les échecs uniquement dus à un répertoire non "
@@ -8854,7 +9034,7 @@ msgid ""
 "                    similar to 'rmdir a/b/c a/b a'\n"
 "  -v, --verbose   output a diagnostic for every directory processed\n"
 msgstr ""
-"  -p, --parents   supprimer DIRECTORY et ses parents, par exemple\n"
+"  -p, --parents   supprimer RÉPERTOIRE et ses parents, par exemple\n"
 "                    « rmdir -p a/b/c » est identique à « rmdir a/b/c a/b "
 "a »\n"
 "  -v, --verbose   afficher un diagnostic pour chaque répertoire traité\n"
@@ -8862,7 +9042,7 @@ msgstr ""
 #: src/rmdir.c:242
 #, c-format
 msgid "failed to remove %s"
-msgstr "échec de suppression de %s"
+msgstr "impossible de de supprimer %s"
 
 #: src/runcon.c:83
 #, c-format
@@ -8870,17 +9050,17 @@ msgid ""
 "Usage: %s CONTEXT COMMAND [args]\n"
 "  or:  %s [ -c ] [-u USER] [-r ROLE] [-t TYPE] [-l RANGE] COMMAND [args]\n"
 msgstr ""
-"Utilisation : %s CONTEXT COMMAND [args]\n"
-"         ou : %s [ -c ] [-u USER] [-r ROLE] [-t TYPE] [-l RANGE] COMMAND "
+"Utilisation : %s CONTEXTE COMMANDE [args]\n"
+"         ou : %s [ -c ] [-u UTILIS] [-r RÔLE] [-t TYPE] [-l INT] COMMANDE "
 "[args]\n"
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
-"Exécuter un programme dans un contexte de sécurité différent.\n"
-"Sans CONTEXT ni COMMAND, afficher le contexte de sécurité actuel.\n"
+"Exécuter un programme dans un contexte de sécurité SELinux différent.\n"
+"Sans CONTEXTE ni COMMANDE, afficher le contexte de sécurité actuel.\n"
 
 #: src/runcon.c:94
 msgid ""
@@ -8892,14 +9072,14 @@ msgid ""
 "  -l, --range=RANGE  levelrange\n"
 "\n"
 msgstr ""
-"  CONTEXT            contexte de sécurité complet\n"
+"  CONTEXTE           contexte de sécurité complet\n"
 "  -c, --compute      calculer le contexte de transition de processus avant "
 "de\n"
 "                       le modifier\n"
 "  -t, --type=TYPE    type (pour le même rôle que le parent)\n"
-"  -u, --user=USER    identité d'utilisateur\n"
-"  -r, --role=ROLE    rôle\n"
-"  -l, --range=RANGE  intervalle de niveau\n"
+"  -u, --user=UTILIS  identité d'utilisateur\n"
+"  -r, --role=RÔLE    rôle\n"
+"  -l, --range=INT    intervalle de niveau\n"
 "\n"
 
 #: src/runcon.c:144
@@ -8937,41 +9117,46 @@ msgstr "vous devez indiquer -c, -t, -u, -l, -r ou le contexte"
 msgid "no command specified"
 msgstr "aucune commande indiquée"
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr "%s ne peut être utilisé que sur un noyau SELinux"
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, c-format
 msgid "failed to compute a new context"
 msgstr "impossible de créer un nouveau contexte"
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, c-format
 msgid "failed to set new user %s"
 msgstr "impossible de définir le nouvel utilisateur %s"
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, c-format
 msgid "failed to set new type %s"
 msgstr "impossible de définir le nouveau type %s"
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, c-format
 msgid "failed to set new range %s"
 msgstr "impossible de définir le nouvel intervalle %s"
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, c-format
 msgid "failed to set new role %s"
 msgstr "impossible de définir le nouveau rôle %s"
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, c-format
 msgid "unable to set security context %s"
 msgstr "impossible de définir le contexte de sécurité %s"
 
+#: src/selinux.c:127 src/selinux.c:300
+#, c-format
+msgid "error canonicalizing %s"
+msgstr "erreur de canonisation %s"
+
 #: src/seq.c:68
 #, c-format
 msgid ""
@@ -8993,9 +9178,9 @@ msgid ""
 "  -s, --separator=STRING   use STRING to separate numbers (default: \\n)\n"
 "  -w, --equal-width        equalize width by padding with leading zeroes\n"
 msgstr ""
-"  -f, --format=FORMAT      utiliser FORMAT comme style printf de\n"
+"  -f, --format=FORMAT      utiliser FORMAT comme style printf à\n"
 "                             virgule flottante\n"
-"  -s, --separator=STRING   utiliser STRING pour séparer les nombres\n"
+"  -s, --separator=CHAÎNE   utiliser CHAÎNE pour séparer les nombres\n"
 "                             (\\n par défaut)\n"
 "  -w, --equal-width        équilibrer la largeur en remplissant l'en-tête "
 "par\n"
@@ -9006,6 +9191,8 @@ msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
@@ -9014,11 +9201,14 @@ msgstr ""
 "Si FIRST ou INCREMENT sont omis, la valeur 1 est utilisée par défaut. La\n"
 "valeur INCREMENT par défaut est 1 même lorsque LAST est plus petit que "
 "FIRST.\n"
-"FIRST, INCREMENT et LAST sont interprétés en notation flottante.\n"
-"INCREMENT est habituellement positif si FIRST est plus petit que LAST, et\n"
+"La suite de nombres se termine quand la somme du nombre actuel et "
+"d’INCREMENT\n"
+"deviendrait plus grande que LAST.\n"
+"FIRST, INCREMENT et LAST sont interprétés en notation à virgule flottante.\n"
+"INCREMENT est habituellement positif si FIRST est plus petit que LAST et\n"
 "INCREMENT est habituellement négatif si FIRST est plus grand que LAST.\n"
 
-#: src/seq.c:94
+#: src/seq.c:96
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
 "it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n"
@@ -9028,101 +9218,37 @@ msgstr ""
 "par défaut à %.PRECf si FIRST, INCREMENT et LAST sont tous décimaux en\n"
 "notation fixe avec une précision maximale PREC, et à %g sinon.\n"
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, c-format
 msgid "invalid floating point argument: %s"
-msgstr "argument en virgule flottante incorrect : %s"
+msgstr "argument à virgule flottante incorrect : %s"
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr "le format %s contient une directive %%%c inconnue"
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr ""
 "le format de chaîne ne peut pas être indiqué quand l'affichage est égal à la "
 "largeur des chaînes"
 
-#: src/setuidgid.c:49
-#, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-"Utilisation : %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"         ou : %s LONG-OPTION\n"
-
-#: src/setuidgid.c:55
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-"Éliminer tous les groupes supplémentaires, utiliser l'UID et le GID de "
-"l'USER\n"
-"indiqué (identifiant numérique ou nom) et exécuter COMMAND avec les\n"
-"ARGUMENTs indiqués.\n"
-"Quitter avec l'état 111 s'il est impossible d'obtenir les UID et GID.\n"
-"Autrement, quitter avec l'état de sortie de COMMAND.\n"
-"Ce programme est utile lorsqu'il est exécuté par le superutilisateur (UID "
-"zéro).\n"
-"\n"
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-"  -g GID[,GID1...]  définir aussi le GID primaire au GID numérique et\n"
-"                      (si indiqués) les GID supplémentaires à GID1, ...\n"
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr "UID inconnu : %s"
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr "pour utiliser l'UID %s, vous devez aussi utiliser -g"
-
-#: src/setuidgid.c:190
-#, c-format
-msgid "failed to set supplemental group(s)"
-msgstr "impossible de définir les groupes supplémentaires"
-
-#: src/setuidgid.c:200
-#, c-format
-msgid "cannot set group-ID to %lu"
-msgstr "impossible de définir le GID à %lu"
-
-#: src/setuidgid.c:204
-#, c-format
-msgid "cannot set user-ID to %lu"
-msgstr "impossible de définir l'UID à %lu"
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr "Colin Plumb"
 
-#: src/shred.c:148
+#: src/shred.c:170
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
 "for even very expensive hardware probing to recover the data.\n"
 msgstr ""
-"Écraser le fichier FILE indiqué de manière répétitive, afin de rendre "
-"difficile\n"
+"Écraser le FICHIER indiqué de manière répétée, afin de rendre difficile\n"
 "toute récupération des données par du matériel même coûteux.\n"
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -9132,20 +9258,20 @@ msgid ""
 msgstr ""
 "  -f, --force    modifier les droits pour permettre l'écriture si "
 "nécessaire\n"
-"  -n, --iterations=N  écraser N fois au lieu du nombre par défaut (%d)\n"
-"      --random-source=FILE  obtenir des octets aléatoires de FILE\n"
-"                            (/dev/urandom par défaut)\n"
-"  -s, --size=N   broyer N octets (les suffixes K, M, G sont acceptés)\n"
+"  -n, --iterations=N  écraser N fois (%d par défaut)\n"
+"      --random-source=FICHIER  obtenir des octets aléatoires de FICHIER\n"
+"  -s, --size=N   broyer N octets (les suffixes comme K, M, G sont acceptés)\n"
 
-#: src/shred.c:161
+#: src/shred.c:183
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
 "  -z, --zero     add a final overwrite with zeros to hide shredding\n"
 msgstr ""
-"  -u, --remove   tronquer et supprimer le fichier après l'avoir écrasé\n"
+"  -u, --remove[=FAÇON]  tronquer et supprimer le fichier après l'avoir "
+"écrasé\n"
 "  -v, --verbose  afficher un indicateur de progression\n"
 "  -x, --exact    ne pas arrondir la taille des fichiers jusqu'au prochain "
 "bloc\n"
@@ -9156,30 +9282,38 @@ msgstr ""
 "le\n"
 "                   broyage du fichier\n"
 
-#: src/shred.c:170
+#: src/shred.c:192
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 "\n"
-"Si FILE est -, broyer à partir de l'entrée standard.\n"
+"Si FICHIER est -, broyer à partir de l'entrée standard.\n"
 "\n"
-"Supprimer le ou les FILEs si --remove (-u) est indiqué. Par défaut, les\n"
+"Supprimer le ou les FICHIERs si --remove (-u) est indiqué. Par défaut, les\n"
 "fichiers ne sont pas supprimés car il est fréquent d'opérer sur des "
 "fichiers\n"
-"de périphérique comme /dev/hda, et habituellement ces fichiers ne doivent "
-"pas\n"
-"être supprimés. Sur des fichiers standards, la majorité des gens utilise\n"
-"l'option --remove.\n"
+"de périphérique comme /dev/hda et ces fichiers ne devraient normalement pas\n"
+"être supprimés.\n"
+"Le paramètre facultatif FAÇON indique la façon de supprimer une entrée de\n"
+"répertoire :\n"
+"« unlink » => utiliser un appel unlink standard ;\n"
+"« wipe » => commencer en plus par effacer les octets du nom ;\n"
+"« wipesync » => en plus synchroniser les octets effacés avec le disque.\n"
+"Le mode par défaut est « wipesync », mais cela peut être coûteux.\n"
 "\n"
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -9198,7 +9332,7 @@ msgstr ""
 "lesquels le broyage n'est pas effectif dans tous les modes :\n"
 "\n"
 
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -9222,7 +9356,7 @@ msgstr ""
 "  Network Appliance\n"
 "\n"
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -9236,7 +9370,7 @@ msgstr ""
 "* systèmes de fichiers compressés\n"
 "\n"
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -9255,12 +9389,11 @@ msgstr ""
 "comme\n"
 "d'habitude. Les modes de journalisation ext3 peuvent être changés en "
 "ajoutant\n"
-"data=something aux options de montage pour un système de fichiers "
-"particulier\n"
+"data=truc aux options de montage pour un système de fichiers particulier\n"
 "dans le fichier /etc/fstab, tel que documenté dans la page man mount(8).\n"
 "\n"
 
-#: src/shred.c:215
+#: src/shred.c:241
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
 "of the file that cannot be removed, and that will allow a shredded file\n"
@@ -9271,146 +9404,146 @@ msgstr ""
 "contenir des copies des fichiers qui ne peuvent être supprimés et qui\n"
 "permettront à un fichier broyé d'être récupéré ultérieurement.\n"
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, c-format
 msgid "%s: fdatasync failed"
 msgstr "%s : échec de fdatasync"
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr "%s : échec de fsync"
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr "%s : impossible de rembobiner"
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr "%s : passe %lu/%lu (%s)…"
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, c-format
 msgid "%s: error writing at offset %s"
 msgstr "%s : erreur d'écriture au décalage %s"
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s : échec de lseek"
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, c-format
 msgid "%s: file too large"
 msgstr "%s : fichier trop gros"
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr "%s : passe %lu/%lu (%s)…%s"
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr "%s : passe %lu/%lu (%s)…%s/%s %d %%"
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, c-format
 msgid "%s: fstat failed"
 msgstr "%s : échec de fstat"
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, c-format
 msgid "%s: invalid file type"
 msgstr "%s : type de fichier incorrect"
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr "%s : le fichier a une taille négative"
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, c-format
 msgid "%s: error truncating"
 msgstr "%s : erreur de troncature"
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, c-format
 msgid "%s: fcntl failed"
 msgstr "%s : échec de fcntl"
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr ""
 "%s : impossible d'utiliser « shred » sur un descripteur de fichier en ajout "
 "seul"
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr "%s : suppression"
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, c-format
 msgid "%s: renamed to %s"
 msgstr "%s : renommé en %s"
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, c-format
 msgid "%s: failed to remove"
-msgstr "%s : échec de suppression"
+msgstr "%s : impossible de supprimer"
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr "%s : supprimé"
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, c-format
 msgid "%s: failed to close"
-msgstr "%s : échec de fermeture"
+msgstr "%s : impossible de fermer"
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, c-format
 msgid "%s: failed to open for writing"
-msgstr "%s : échec d'ouverture en écriture"
+msgstr "%s : impossible d’ouvrir en écriture"
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, c-format
 msgid "%s: invalid number of passes"
 msgstr "%s : nombre de passes incorrect"
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, c-format
 msgid "multiple random sources specified"
 msgstr "plusieurs sources aléatoires indiquées"
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, c-format
 msgid "%s: invalid file size"
 msgstr "%s : longueur de fichier incorrect"
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
 "  or:  %s -e [OPTION]... [ARG]...\n"
 "  or:  %s -i LO-HI [OPTION]...\n"
 msgstr ""
-"Utilisation : %s [OPTION]... [FILE]\n"
+"Utilisation : %s [OPTION]... [FICHIER]\n"
 "         ou : %s -e [OPTION]... [ARG]...\n"
-"         ou : %s -i LO-HI [OPTION]...\n"
+"         ou : %s -i MIN-MAX [OPTION]...\n"
 
-#: src/shuf.c:54
+#: src/shuf.c:67
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr ""
 "Afficher une permutation aléatoire des lignes entrées sur la sortie "
 "standard.\n"
 
-#: src/shuf.c:60
+#: src/shuf.c:73
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
 "  -i, --input-range=LO-HI   treat each number LO through HI as an input "
@@ -9418,46 +9551,54 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
 msgstr ""
 "  -e, --echo                traiter chaque ARG comme une ligne d'entrée\n"
-"  -i, --input-range=LO-HI   traiter chaque nombre de LO à HI comme une "
+"  -i, --input-range=MIN-MAX  traiter chaque nombre de MIN à MAX comme une "
 "ligne\n"
 "                              d'entrée\n"
-"  -n, --head-count=COUNT    afficher au plus COUNT lignes\n"
-"  -o, --output=FILE         écrire le résultat dans FILE au lieu de la "
+"  -n, --head-count=N        afficher au plus N lignes\n"
+"  -o, --output=FICHIER      écrire le résultat dans FICHIER au lieu de la "
 "sortie\n"
 "                              standard\n"
-"      --random-source=FILE  obtenir des octets aléatoires de FILE\n"
-"                              (/dev/urandom par défaut)\n"
-"  -z, --zero-terminated     terminer les lignes avec l'octet NULL, sans\n"
-"                              changement de ligne\n"
+"      --random-source=FICHIER  obtenir des octets aléatoires de FICHIER\n"
+"  -r, --repeat              les lignes affichées peuvent être répétées\n"
+
+#: src/shuf.c:228
+#, c-format
+msgid "too many input lines"
+msgstr "trop de lignes d’entrée"
 
-#: src/shuf.c:244
+#: src/shuf.c:431
 #, c-format
 msgid "multiple -i options specified"
 msgstr "plusieurs options -l indiquées"
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, c-format
 msgid "invalid input range %s"
 msgstr "intervalle d'entrée %s incorrect"
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, c-format
 msgid "invalid line count %s"
 msgstr "compteur de lignes %s incorrect"
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, c-format
 msgid "multiple output files specified"
 msgstr "plusieurs fichiers de sortie indiquées"
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, c-format
 msgid "cannot combine -e and -i options"
 msgstr "impossible de combiner les options -e et -i"
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr "aucune ligne à répéter"
+
 #: src/sleep.c:44
 #, c-format
 msgid ""
@@ -9471,32 +9612,33 @@ msgid ""
 "specified by the sum of their values.\n"
 "\n"
 msgstr ""
-"Utilisation : %s NUMBER[SUFFIX]...\n"
+"Utilisation : %s NOMBRE[SUFFIXE]...\n"
 "         ou : %s OPTION\n"
-"Effectuer une pause de NUMBER secondes. SUFFIX peut être « s » pour "
+"Effectuer une pause de NOMBRE secondes. SUFFIXE peut être « s » pour "
 "secondes\n"
 "(par défaut), « m » pour minutes, « h » pour heures ou « d » pour jours.\n"
 "Contrairement à la plupart des implémentations qui nécessitent un nombre\n"
-"entier, NUMBER peut ici être un nombre arbitraire en virgule flottante.\n"
+"entier, NOMBRE peut ici être un nombre arbitraire à virgule flottante.\n"
 "Avec plusieurs arguments, la pause se fait selon la somme des valeurs.\n"
 "\n"
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, c-format
 msgid "invalid time interval %s"
 msgstr "intervalle de temps %s incorrect"
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr "impossible de lire l'horloge temps réel"
 
-#: src/sort.c:399
+#: src/sort.c:427
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr ""
-"Afficher la concaténation triée de tous les FILEs sur la sortie standard.\n"
+"Afficher la concaténation triée de tous les FICHIERs sur la sortie "
+"standard.\n"
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
@@ -9504,7 +9646,7 @@ msgstr ""
 "Options de tri :\n"
 "\n"
 
-#: src/sort.c:409
+#: src/sort.c:437
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
 "  -d, --dictionary-order      consider only blanks and alphanumeric "
@@ -9517,7 +9659,7 @@ msgstr ""
 "                                alphanumériques\n"
 "  -f, --ignore-case           transformer les minuscules en majuscules\n"
 
-#: src/sort.c:415
+#: src/sort.c:443
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
 "  -i, --ignore-nonprinting    consider only printable characters\n"
@@ -9528,14 +9670,14 @@ msgstr ""
 "  -M, --month-sort            comparer (inconnu) < « JANV. » < ... < "
 "« DÉC. »\n"
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 "  -h, --human-numeric-sort    comparer des chiffres lisibles (par exemple 2K "
 "1G)\n"
 
-#: src/sort.c:423
+#: src/sort.c:451
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
 "  -R, --random-sort           sort by random hash of keys\n"
@@ -9545,10 +9687,10 @@ msgstr ""
 "  -n, --numeric-sort          comparer selon une valeur numérique de type "
 "chaîne\n"
 "  -R, --random-sort           trier par clef de hachage aléatoire\n"
-"      --random-source=FILE    obtenir des octets aléatoires de FILE\n"
+"      --random-source=FICHIER  obtenir des octets aléatoires de FICHIER\n"
 "  -r, --reverse               inverser le résultat des comparaisons\n"
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -9557,16 +9699,16 @@ msgid ""
 "  -V, --version-sort          natural sort of (version) numbers within text\n"
 "\n"
 msgstr ""
-"      --sort=WORD             trier selon WORD :\n"
+"      --sort=MOT             trier selon MOT :\n"
 "                                general-numeric -g, human-numeric -h, month -"
 "M,\n"
-"                                numeric -n, random -R, version -V\n"
+"                                numeric -n, random -R ou version -V\n"
 "  -V, --version-sort          tri naturel des numéros (de version) contenus "
 "dans\n"
 "                                le texte\n"
 "\n"
 
-#: src/sort.c:437
+#: src/sort.c:465
 msgid ""
 "Other options:\n"
 "\n"
@@ -9574,7 +9716,7 @@ msgstr ""
 "Autres Options :\n"
 "\n"
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
@@ -9582,7 +9724,7 @@ msgstr ""
 "      --batch-size=NMERGE   fusionner au plus NMERGE entrées à la fois ;\n"
 "                              pour plus, employez des fichiers temporaires\n"
 
-#: src/sort.c:445
+#: src/sort.c:473
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
 "  -C, --check=quiet, --check=silent  like -c, but do not report first bad "
@@ -9598,7 +9740,7 @@ msgstr ""
 "      --compress-program=PROG  compresser les temporaires avec PROG et les\n"
 "                               décompresser avec PROG -d\n"
 
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -9606,8 +9748,8 @@ msgid ""
 "                            NUL-terminated names in file F;\n"
 "                            If F is - then read names from standard input\n"
 msgstr ""
-"      --debug               annoter la partie de la ligne à trier, et "
-"avertir en\n"
+"      --debug               annoter la partie de la ligne à trier et avertir "
+"en\n"
 "                              cas d'utilisation étrange sur la sortie "
 "d'erreur\n"
 "      --files0-from=F       lire en entrée des fichiers indiqués par des "
@@ -9616,33 +9758,34 @@ msgstr ""
 "                              Si F est -, lire les noms depuis l'entrée "
 "standard\n"
 
-#: src/sort.c:459
+#: src/sort.c:487
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
 "  -m, --merge               merge already sorted files; do not sort\n"
 msgstr ""
-"  -k, --key=KEYDEF          trier suivant une clef, KEYDEF indique "
+"  -k, --key=DÉF_CLEF        trier suivant une clef, DÉF_CLEF indique "
 "l'emplacement\n"
 "                              et le type\n"
 "  -m, --merge               fusionner les fichiers déjà triés ; ne pas "
 "trier\n"
 
-#: src/sort.c:463
+#: src/sort.c:491
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "  -s, --stable              stabilize sort by disabling last-resort "
 "comparison\n"
 "  -S, --buffer-size=SIZE    use SIZE for main memory buffer\n"
 msgstr ""
-"  -o, --output=FILE         écrire le résultat dans FILE au lieu de la "
+"  -o, --output=FICHIER      écrire le résultat dans FICHIER au lieu de la "
 "sortie\n"
 "                              standard\n"
 "  -s, --stable              stabiliser le tri en désactivant la comparaison "
 "de\n"
 "                              dernier recours\n"
-"  -S, --buffer-size=SIZE    utiliser SIZE pour le tampon mémoire principal\n"
+"  -S, --buffer-size=TAILLE    utiliser TAILLE pour le tampon mémoire "
+"principal\n"
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -9658,7 +9801,7 @@ msgid ""
 msgstr ""
 "  -t, --field-separator=SEP      utiliser SEP au lieu de non blanc pour les\n"
 "                                   transitions d'espace\n"
-"  -T, --temporary-directory=DIR  utiliser DIR pour les fichiers temporaires, "
+"  -T, --temporary-directory=RÉP  utiliser RÉP pour les fichiers temporaires, "
 "non\n"
 "                                   pas $TMPDIR ou %s ; plusieurs options\n"
 "                                   indiquent plusieurs répertoires\n"
@@ -9669,13 +9812,7 @@ msgstr ""
 "d'une\n"
 "                                   passe équivalente\n"
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr ""
-"  -z, --zero-terminated     terminer les lignes avec l'octet NULL, sans\n"
-"                              changement de ligne\n"
-
-#: src/sort.c:483
+#: src/sort.c:511
 msgid ""
 "\n"
 "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is "
@@ -9694,18 +9831,19 @@ msgid ""
 "SIZE may be followed by the following multiplicative suffixes:\n"
 msgstr ""
 "\n"
-"KEYDEF est F[.C][OPTS][,F[.C][OPTS]] pour les positions de début et fin,\n"
+"DÉF_CLEF est F[.C][OPTS][,F[.C][OPTS]] pour les positions de début et fin,\n"
 "où F est un numéro de champ et C une position du caractère dans le champ ;\n"
-"chacun à origine 1, et la position d'arrêt est la fin de ligne par défaut.\n"
+"chacun a pour origine 1 et la position d'arrêt est la fin de ligne par "
+"défaut.\n"
 "Si ni -t ni -b ne sont actifs, les caractères d'un champ sont comptés\n"
 "depuis le début de l'espace précédant.\n"
 "OPTS se compose d'une option de tri d'une ou plusieurs lettres simples\n"
 "[bdfgiMhnRrV], laquelle écrase l'ordonnancement global pour cette clef.\n"
 "Si aucune clef n'est donnée, la ligne entière est utilisée comme clef.\n"
 "\n"
-"SIZE peut être suivi d'un des suffixes multiplicatifs suivants :\n"
+"TAILLE peut être suivi d'un des suffixes multiplicatifs suivants :\n"
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -9716,318 +9854,305 @@ msgid ""
 "Set LC_ALL=C to get the traditional sort order that uses\n"
 "native byte values.\n"
 msgstr ""
-"% 1 % de mémoire, b 1, k 1024 (par défaut), et ainsi de suite pour\n"
+"% 1 % de mémoire, b 1, k 1024 (par défaut) et ainsi de suite pour\n"
 "M, G, T, P, E, Z et Y.\n"
 "\n"
-"Sans FILE, ou quand FILE est -, lire l'entrée standard.\n"
+"Sans FICHIER, ou quand FICHIER est -, lire l'entrée standard.\n"
 "\n"
 "*** Attention ***\n"
 "Les paramètres régionaux (locale) utilisés dans l'environnement\n"
 "affectent l'ordre de tri. Utilisez LC_ALL=C pour trier selon un\n"
 "ordre traditionnel qui utilise la valeur native des octets.\n"
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, c-format
 msgid "waiting for %s [-d]"
 msgstr "en attente de %s [-d]"
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr "%s [-d] a terminé anormalement"
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, c-format
 msgid "cannot create temporary file in %s"
 msgstr "impossible de créer le fichier temporaire dans %s"
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr "échec d'ouverture"
 
-#: src/sort.c:970
+#: src/sort.c:998
 msgid "fflush failed"
 msgstr "échec de fflush"
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr "échec de fermeture"
 
-#: src/sort.c:986
-#, c-format
-msgid "dup2 failed"
-msgstr "échec de dup2"
-
-#: src/sort.c:1103
-#, c-format
-msgid "couldn't execute %s"
-msgstr "impossible d'exécuter %s"
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 msgid "couldn't create temporary file"
 msgstr "impossible de créer le fichier temporaire"
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, c-format
 msgid "couldn't create process for %s -d"
 msgstr "impossible de créer le processus pour %s -d"
 
-#: src/sort.c:1161
-#, c-format
-msgid "couldn't execute %s -d"
-msgstr "impossible d'exécuter %s -d"
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, c-format
 msgid "warning: cannot remove: %s"
 msgstr "avertissement : impossible de supprimer : %s"
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, c-format
 msgid "invalid --%s argument %s"
 msgstr "argument %2$s de --%1$s incorrect"
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, c-format
 msgid "minimum --%s argument is %s"
 msgstr "l'argument minimal de --%s est %s"
 
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, c-format
 msgid "--%s argument %s too large"
 msgstr "argument de --%s %s trop grand"
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr "l'argument maximal de --%s avec la rlimit actuelle est %s"
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr "le nombre en parallèle doit être non nul"
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr "échec de stat()"
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr "échec de lecture"
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, c-format
 msgid "string transformation failed"
 msgstr "échec de transformation de chaîne"
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, c-format
 msgid "the untransformed string was %s"
 msgstr "la chaîne non transformée était %s"
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr "^ ne correspond à aucun mot clef\n"
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr "le mot clef obsolète « %s » est utilisé ; considérez « %s » à la place"
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr "le mot clef %lu a une largeur nulle et sera ignoré"
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr ""
 "les espaces au début sont significatifs dans le mot clef %lu ; considérez "
 "aussi l'emploi de « b »"
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr "le mot clef %lu est numérique et s'étend sur plusieurs champs"
 
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
 msgstr[0] "l'option « -%s » est ignorée"
 msgstr[1] "les options « -%s » sont ignorées"
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr ""
 "l'option « -r » s'applique seulement à la comparaison de dernier recours"
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr "échec d'écriture"
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr "%s : %s:%s : désordre : "
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr "erreur standard"
 
-#: src/sort.c:3698
+#: src/sort.c:3738
 msgid "cannot read"
 msgstr "impossible de lire"
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, c-format
 msgid "%s: invalid field specification %s"
 msgstr "%s : spécification de champ incorrect %s"
 
-#: src/sort.c:3987
+#: src/sort.c:4028
 #, c-format
 msgid "options '-%s' are incompatible"
 msgstr "les options « -%s » sont incompatibles"
 
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, c-format
 msgid "%s: invalid count at start of %s"
 msgstr "%s : compteur incorrect au départ de %s"
 
-#: src/sort.c:4295
+#: src/sort.c:4336
 msgid "invalid number after '-'"
 msgstr "nombre incorrect après « - »"
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 msgid "invalid number after '.'"
 msgstr "nombre incorrect après « . »"
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr "caractère égaré dans le champ de spécification"
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, c-format
 msgid "multiple compress programs specified"
 msgstr "plusieurs programmes de compression indiqués"
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
 msgstr "nombre incorrect dans le champ de départ"
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
 msgstr "le numéro de champ est zéro"
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr "l'adresse relative du caractère est zéro"
 
-#: src/sort.c:4407
+#: src/sort.c:4448
 msgid "invalid number after ','"
 msgstr "nombre incorrect après « , »"
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr "tabulation vide"
 
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, c-format
 msgid "cannot read file names from %s"
 msgstr "impossible de lire les noms de fichiers à partir de %s"
 
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr "%s:%lu : incorrect, nom de fichier de longueur nulle"
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, c-format
 msgid "no input from %s"
 msgstr "aucune d'entrée depuis %s"
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr "utilisation des règles de tri %s"
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr "utilisation de la comparaison simple d'octet"
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr "opérande supplémentaire « %s » non permis avec -%c"
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr "la longueur du suffixe doit au minimum être %zu"
 
-#: src/split.c:204
+#: src/split.c:203
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
-msgstr "Utilisation : %s [OPTION]... [INPUT [PREFIX]]\n"
+msgstr "Utilisation : %s [OPTION]... [ENTRÉE [PRÉFIXE]]\n"
 
-#: src/split.c:208
+#: src/split.c:207
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
 "size is 1000 lines, and default PREFIX is 'x'.  With no INPUT, or when "
 "INPUT\n"
 "is -, read standard input.\n"
 msgstr ""
-"Afficher des morceaux de INPUT de taille fixe selon PREFIXaa, "
-"PREFIXab, ... ;\n"
+"Afficher des morceaux de ENTRÉE de taille fixe selon PRÉFIXEaa, "
+"PRÉFIXEab, ... ;\n"
 "la taille est de 1000 lignes et le préfixe est « x » par défaut.\n"
-"Sans INPUT, ou quand INPUT est -, lire l'entrée standard.\n"
+"Sans ENTRÉE, ou quand ENTRÉE est -, lire l'entrée standard.\n"
 
-#: src/split.c:216
+#: src/split.c:215
 #, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
 "  -a, --suffix-length=N   générer ces suffixes de longueur N (%d par "
 "défaut)\n"
-"      --additional-suffix=SUFFIX  ajouter un SUFFIX supplémentaire aux noms\n"
-"                                    de fichiers\n"
-"  -b, --bytes=SIZE        écrire SIZE octets par fichier de sortie\n"
-"  -C, --line-bytes=SIZE   écrire au plus SIZE octets par ligne par fichier "
+"      --additional-suffix=SUFFIXE  ajouter un SUFFIXE supplémentaire aux "
+"noms\n"
+"                                   de fichiers\n"
+"  -b, --bytes=TAILLE      écrire TAILLE octets par fichier de sortie\n"
+"  -C, --line-bytes=TAILLE  écrire au plus TAILLE octets par ligne par "
+"fichier de\n"
+"                             sortie\n"
+"  -d, --numeric-suffixes[=ORIG]  utiliser des suffixes numériques et non\n"
+"                                   alphabétiques ; ORIG modifie la valeur "
 "de\n"
-"                            sortie\n"
-"  -d, --numeric-suffixes[=FROM]  utiliser des suffixes numériques et non\n"
-"                                   alphabétiques. FROM modifie la valeur de\n"
 "                                   départ (0 par défaut)\n"
 "  -e, --elide-empty-files  ne pas générer de fichiers vides avec « -n »\n"
-"      --filter=COMMAND    écrire vers la commande d'interpréteur COMMAND ; "
+"      --filter=COMMANDE   écrire vers la commande d'interpréteur COMMANDE ; "
 "le\n"
 "                            nom de fichier est $FILE\n"
-"  -l, --lines=NUMBER      écrire NUMBER lignes par fichier de sortie\n"
-"  -n, --number=CHUNKS     générer CHUNKS fichiers de sortie. Voir ci-"
-"dessous.\n"
+"  -l, --lines=N           écrire N lignes par fichier de sortie\n"
+"  -n, --number=PARTIES    générer PARTIES fichiers de sortie ; consultez "
+"les\n"
+"                            explications ci-dessous\n"
 "  -u, --unbuffered        copier immédiatement l'entrée sur la sortie avec\n"
 "                            « -n r/... »\n"
 
-#: src/split.c:229
+#: src/split.c:228
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
 "                            output file is opened\n"
@@ -10035,7 +10160,7 @@ msgstr ""
 "      --verbose           afficher un diagnostic juste avant l'ouverture de\n"
 "                            chaque fichier de sortie\n"
 
-#: src/split.c:236
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -10047,201 +10172,201 @@ msgid ""
 "r/K/N   likewise but only output Kth of N to stdout\n"
 msgstr ""
 "\n"
-"CHUNKS peut être :\n"
+"PARTIES peut être :\n"
 "N       séparer en N fichiers selon la taille de l'entrée\n"
-"K/N     afficher le Ke de N sur la sortie\n"
+"K/N     afficher le Kième de N sur la sortie\n"
 "l/N     séparer en N fichiers sans couper les lignes\n"
-"l/K/N   afficher le Ke de N sur la sortie sans couper les lignes\n"
+"l/K/N   afficher le Kième de N sur la sortie sans couper les lignes\n"
 "r/N     comme « l » mais utiliser une distribution « round robin »\n"
-"r/K/N   identique mais n'afficher que le Ke de N sur la sortie\n"
+"r/K/N   identique mais n'afficher que le Kième de N sur la sortie\n"
 
-#: src/split.c:354
+#: src/split.c:353
 #, c-format
 msgid "output file suffixes exhausted"
 msgstr "les suffixes des fichiers de sortie sont épuisés"
 
-#: src/split.c:366
+#: src/split.c:365
 #, c-format
 msgid "creating file %s\n"
 msgstr "création du fichier %s\n"
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr "%s écraserait l'entrée ; abandon"
 
-#: src/split.c:391
+#: src/split.c:390
 #, c-format
 msgid "failed to set FILE environment variable"
 msgstr "impossible de définir la variable d'environnement FILE"
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr "exécution avec FILE=%s\n"
 
-#: src/split.c:395
+#: src/split.c:394
 #, c-format
 msgid "failed to create pipe"
 msgstr "impossible de créer le tube"
 
-#: src/split.c:409
+#: src/split.c:408
 #, c-format
 msgid "closing prior pipe"
 msgstr "fermeture du tube précédent"
 
-#: src/split.c:411
+#: src/split.c:410
 #, c-format
 msgid "closing output pipe"
 msgstr "fermeture du tube de sortie"
 
-#: src/split.c:415
+#: src/split.c:414
 #, c-format
 msgid "moving input pipe"
 msgstr "déplacement du tube d'entrée"
 
-#: src/split.c:417
+#: src/split.c:416
 #, c-format
 msgid "closing input pipe"
 msgstr "fermeture du tube d'entrée"
 
-#: src/split.c:422
+#: src/split.c:421
 #, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr "impossible d'exécuter la commande : « %s -s %s »"
 
-#: src/split.c:428
+#: src/split.c:427
 #, c-format
 msgid "failed to close input pipe"
 msgstr "impossible de fermer le tube d'entrée"
 
-#: src/split.c:464
+#: src/split.c:463
 #, c-format
 msgid "waiting for child process"
 msgstr "en attente du processus fils"
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr "avec FILE=%s, signal %s de la commande : %s"
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr "avec FILE=%s, sortie %d de la commande : %s"
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr "état inconnu de la commande (0x%X)"
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr "impossible de séparer de plusieurs manières"
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, c-format
 msgid "%s: invalid number of chunks"
 msgstr "%s : nombre de morceaux incorrect"
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, c-format
 msgid "%s: invalid chunk number"
 msgstr "%s : numéro de morceau incorrect"
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr "%s : longueur de suffixe incorrecte"
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr "%s : nombre d'octets incorrect"
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr "%s : nombre de lignes incorrect"
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, c-format
 msgid "line count option -%s%c... is too large"
 msgstr "l'option de décompte de ligne -%s%c... est trop grande"
 
-#: src/split.c:1248
+#: src/split.c:1298
 #, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr "%s : valeur de départ incorrecte pour le suffixe numérique"
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, c-format
 msgid "%s: invalid IO block size"
 msgstr "%s : taille de bloc d'E/S incorrecte"
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr "--filter ne traite pas les morceaux extraits vers la sortie standard"
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr ""
 "la valeur de départ du suffixe numérique est trop grande pour la longueur de "
 "suffixe"
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, c-format
 msgid "%s: cannot determine file size"
 msgstr "%s : impossible de déterminer la taille de fichier"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr "Michael Meskes"
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, c-format
 msgid "failed to canonicalize %s"
 msgstr "impossible de canoniser %s"
 
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr "avertissement : séquence de protection « \\%c » non reconnue"
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, c-format
 msgid "%s: invalid directive"
 msgstr "%s : directive incorrecte"
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, c-format
 msgid "warning: backslash at end of format"
 msgstr "avertissement : barre oblique inverse à la fin du format"
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr ""
 "l'utilisation de %s pour désigner l'entrée standard ne fonctionne pas en "
 "mode système de fichiers"
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, c-format
 msgid "cannot read file system information for %s"
 msgstr "impossible de lire les informations du système de fichiers pour %s"
 
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, c-format
 msgid "cannot stat standard input"
 msgstr "impossible d'utiliser stat sur l'entrée standard"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -10257,7 +10382,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -10267,31 +10392,31 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr ""
 "Périphérique : %Dh/%dd\tInœud : %-10i  Liens : %-5h Type de périph. : %t,%T\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr "Périphérique : %Dh/%dd\tInœud : %-10i  Liens : %h\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr "Accès : (%04a/%10.10A)  UID : (%5u/%8U)   GID : (%5g/%8G)\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, c-format
 msgid "Context: %C\n"
 msgstr "Contexte : %C\n"
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -10303,11 +10428,11 @@ msgstr ""
 "Changt : %z\n"
 "  Créé : %w\n"
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
 msgstr "Afficher l'état d'un fichier ou d'un système de fichiers.\n"
 
-#: src/stat.c:1356
+#: src/stat.c:1418
 msgid ""
 "  -L, --dereference     follow links\n"
 "  -f, --file-system     display file system status instead of file status\n"
@@ -10316,30 +10441,29 @@ msgstr ""
 "  -f, --file-system     afficher l'état du système de fichiers au lieu de\n"
 "                          l'état du fichier\n"
 
-#: src/stat.c:1360
+#: src/stat.c:1422
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 "  -c  --format=FORMAT   utiliser le FORMAT indiqué au lieu de celui par "
 "défaut ;\n"
 "                          afficher un changement de ligne après chaque\n"
 "                          utilisation de FORMAT\n"
-"      --printf=FORMAT   identique à --format mais, interpréter les "
+"      --printf=FORMAT   identique à --format, mais interpréter les "
 "séquences\n"
 "                          de protection, et ne pas afficher de changement "
 "de\n"
-"                          ligne. Si vous désirez un changement de ligne, "
-"ajoutez\n"
-"                          « \\n » à FORMAT.\n"
+"                          ligne ; si vous désirez un changement de ligne,\n"
+"                          ajoutez « \\n » à FORMAT.\n"
 "  -t, --terse           afficher l'information dans un format "
 "compréhensible\n"
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 msgid ""
 "\n"
 "The valid format sequences for files (without --file-system):\n"
@@ -10359,7 +10483,7 @@ msgstr ""
 "  %B   la taille en octets de chaque bloc rapportée par %b\n"
 "  %C   la chaîne de contexte de sécurité SELinux\n"
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 msgid ""
 "  %d   device number in decimal\n"
 "  %D   device number in hex\n"
@@ -10375,7 +10499,7 @@ msgstr ""
 "  %g   GID du propriétaire\n"
 "  %G   nom de groupe du propriétaire\n"
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 msgid ""
 "  %h   number of hard links\n"
 "  %i   inode number\n"
@@ -10384,8 +10508,8 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 "  %h   nombre de liens directs (hard)\n"
 "  %i   numéro d'inœud\n"
@@ -10394,10 +10518,14 @@ msgstr ""
 "  %N   nom de fichier en citation avec référence si lien symbolique\n"
 "  %o   conseil sur la taille optimale de transfert d'E/S\n"
 "  %s   taille totale, en octets\n"
-"  %t   type majeur de périphérique en hexadécimal\n"
-"  %T   type mineur de périphérique en hexadécimal\n"
+"  %t   type majeur de périphérique en hexadécimal, pour les fichiers "
+"spéciaux de\n"
+"         périphériques caractère ou bloc\n"
+"  %T   type mineur de périphérique en hexadécimal, pour les fichiers "
+"spéciaux de\n"
+"         périphériques caractère ou bloc\n"
 
-#: src/stat.c:1399
+#: src/stat.c:1461
 msgid ""
 "  %u   user ID of owner\n"
 "  %U   user name of owner\n"
@@ -10405,10 +10533,10 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 "  %u   UID du propriétaire\n"
@@ -10417,13 +10545,13 @@ msgstr ""
 "  %W   date de création du fichier, en seconde depuis Epoch ; 0 si inconnue\n"
 "  %x   date du dernier accès, lisible\n"
 "  %X   date du dernier accès en seconde depuis Epoch\n"
-"  %y   date de la dernière modification, lisible\n"
-"  %Y   date de la dernière modification en seconde depuis Epoch\n"
-"  %z   date du dernier changement, lisible\n"
-"  %Z   date du dernier changement en seconde depuis Epoch\n"
+"  %y   date de la dernière modification de données, lisible\n"
+"  %Y   date de la dernière modification de données en seconde depuis Epoch\n"
+"  %z   date du dernier changement d’état, lisible\n"
+"  %Z   date du dernier changement d’état en seconde depuis Epoch\n"
 "\n"
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 msgid ""
 "Valid format sequences for file systems:\n"
 "\n"
@@ -10441,7 +10569,7 @@ msgstr ""
 "  %d   nœuds de fichiers libres dans le système de fichiers\n"
 "  %f   blocs libres dans le système de fichiers\n"
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 msgid ""
 "  %i   file system ID in hex\n"
 "  %l   maximum length of filenames\n"
@@ -10463,14 +10591,15 @@ msgstr ""
 #, c-format
 msgid "Usage: %s OPTION... COMMAND\n"
 msgstr ""
-"Utilisation : %s [OPTION]... COMMAND\n"
+"Utilisation : %s [OPTION]... COMMANDE\n"
 "\n"
 
 #: src/stdbuf.c:91
 msgid ""
 "Run COMMAND, with modified buffering operations for its standard streams.\n"
 msgstr ""
-"Exécuter COMMAND, avec des opérations de mises en tampon modifiées pour ses\n"
+"Exécuter COMMANDE, avec des opérations de mises en tampon modifiées pour "
+"ses\n"
 "flux standards.\n"
 
 #: src/stdbuf.c:97
@@ -10528,44 +10657,51 @@ msgid ""
 "and are thus unaffected by 'stdbuf' settings.\n"
 msgstr ""
 "\n"
-"Remarque : si COMMAND ajuste la mise en tampon de ses flux standards (comme\n"
+"Remarque : si COMMANDE ajuste la mise en tampon de ses flux standards "
+"(comme\n"
 "« tee » par exemple), alors cela va écraser les paramètres correspondant\n"
 "modifiés par « stdbuf ».\n"
 "Certains filtres (comme « dd » ou « cat », etc.) n'utilisent par les flux "
 "pour\n"
-"les E/S, et ne sont donc pas affectés par les paramètres de « stdbuf ».\n"
+"les E/S et ne sont donc pas affectés par les paramètres de « stdbuf ».\n"
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, c-format
 msgid "failed to find %s"
 msgstr "impossible de trouver %s"
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, c-format
 msgid "failed to update the environment with %s"
 msgstr "impossible de mettre à jour l'environnement avec %s"
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr "la mise en tampon de l'entrée standard est sans effet"
 
-#: src/stty.c:513
+# « une » option
+#: src/stdbuf.c:376
+#, c-format
+msgid "you must specify a buffering mode option"
+msgstr "vous devez indiquer une option de mode de mise en tampon"
+
+#: src/stty.c:516
 #, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
 "  or:  %s [-F DEVICE | --file=DEVICE] [-a|--all]\n"
 "  or:  %s [-F DEVICE | --file=DEVICE] [-g|--save]\n"
 msgstr ""
-"Utilisation : %s [-F DEVICE] | --file=DEVICE] [SETTING]...\n"
-"         ou : %s [-F DEVICE | --file=DEVICE] [-a|--all]\n"
-"         ou : %s [-F DEVICE | --file=DEVICE] [-g|--save]\n"
+"Utilisation : %s [-F PÉRIPHÉRIQUE] | --file=PÉRIPHÉRIQUE] [RÉGLAGE]...\n"
+"         ou : %s [-F PÉRIPHÉRIQUE | --file=PÉRIPHÉRIQUE] [-a|--all]\n"
+"         ou : %s [-F PÉRIPHÉRIQUE | --file=PÉRIPHÉRIQUE] [-g|--save]\n"
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
 msgstr "Afficher ou modifier les caractéristiques du terminal.\n"
 
-#: src/stty.c:525
+#: src/stty.c:528
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
 "  -g, --save         print all current settings in a stty-readable form\n"
@@ -10575,21 +10711,21 @@ msgstr ""
 "  -g, --save         afficher tous les paramètres actuels en format "
 "compatible\n"
 "                       avec « stty »\n"
-"  -F, --file=DEVICE  utiliser le périphérique DEVICE indiqué au lieu de\n"
+"  -F, --file=PÉRIPHÉRIQUE  utiliser le PÉRIPHÉRIQUE indiqué au lieu de\n"
 "                       l'entrée standard\n"
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
 "settings.  The underlying system defines which settings are available.\n"
 msgstr ""
 "\n"
-"Un « - » optionnel avant SETTINGS indique une négation. Un * indique des\n"
+"Un « - » optionnel avant RÉGLAGE indique une négation. Un * indique des\n"
 "paramètres non POSIX. Le système sous-jacent détermine les paramètres\n"
 "applicables.\n"
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -10599,50 +10735,49 @@ msgid ""
 msgstr ""
 "\n"
 "Caractères spéciaux :\n"
-" * dsusp CHAR    CHAR émettra un signal d'arrêt de terminal une fois le "
+" * dsusp CAR     CAR émettra un signal d'arrêt de terminal une fois le "
 "tampon\n"
 "                   d'entrée vidé\n"
-"   eof CHAR      CHAR émettra une fin de fichier (pour arrêter l'entrée)\n"
-"   eol CHAR      CHAR arrêtera la ligne\n"
+"   eof CAR       CAR émettra une fin de fichier (pour arrêter l'entrée)\n"
+"   eol CAR       CAR arrêtera la ligne\n"
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
 "   intr CHAR     CHAR will send an interrupt signal\n"
 "   kill CHAR     CHAR will erase the current line\n"
 msgstr ""
-" * eol2 CHAR     CHAR alternatif pour arrêter la ligne\n"
-"   erase CHAR    CHAR supprimera le dernier caractère saisi\n"
-"   intr CHAR     CHAR émettra un signal d'interruption\n"
-"   kill CHAR     CHAR supprimera la ligne actuelle\n"
+" * eol2 CAR      CAR alternatif pour arrêter la ligne\n"
+"   erase CAR     CAR supprimera le dernier caractère saisi\n"
+"   intr CAR      CAR émettra un signal d'interruption\n"
+"   kill CAR      CAR supprimera la ligne actuelle\n"
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
 " * rprnt CHAR    CHAR will redraw the current line\n"
 "   start CHAR    CHAR will restart the output after stopping it\n"
 msgstr ""
-" * lnext CHAR    CHAR entrera le prochain caractère entre guillemets\n"
-"   quit CHAR     CHAR émettra un signal de fin\n"
-" * rprnt CHAR    CHAR réaffichera la ligne actuelle\n"
-"   start CHAR    CHAR redémarrera la sortie après l'avoir arrêtée\n"
+" * lnext CAR     CAR entrera le prochain caractère entre guillemets\n"
+"   quit CAR      CAR émettra un signal de fin\n"
+" * rprnt CAR     CAR réaffichera la ligne actuelle\n"
+"   start CAR     CAR redémarrera la sortie après l'avoir arrêtée\n"
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
 " * swtch CHAR    CHAR will switch to a different shell layer\n"
 " * werase CHAR   CHAR will erase the last word typed\n"
 msgstr ""
-"   stop CHAR     CHAR arrêtera la sortie\n"
-"   susp CHAR     CHAR émettra un signal d'arrêt de terminal\n"
-" * swtch CHAR    CHAR permettra de basculer à une couche différente du "
-"shell\n"
-" * werase CHAR   CHAR supprimera le dernier mot saisi\n"
+"   stop CAR      CAR arrêtera la sortie\n"
+"   susp CAR      CAR émettra un signal d'arrêt de terminal\n"
+" * swtch CAR     CAR permettra de basculer à une couche différente du shell\n"
+" * werase CAR    CAR supprimera le dernier mot saisi\n"
 
-#: src/stty.c:562
+#: src/stty.c:565
 msgid ""
 "\n"
 "Special settings:\n"
@@ -10656,7 +10791,7 @@ msgstr ""
 " * cols N        indiquer au noyau que le terminal a N colonnes\n"
 " * columns N     identique à « cols N »\n"
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -10670,7 +10805,7 @@ msgstr ""
 "                   nécessaires pour obtenir une lecture complète\n"
 "   ospeed N      initialiser la vitesse de sortie à N\n"
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -10686,7 +10821,7 @@ msgstr ""
 "à\n"
 "                   N dixièmes de seconde\n"
 
-#: src/stty.c:581
+#: src/stty.c:584
 msgid ""
 "\n"
 "Control settings:\n"
@@ -10705,7 +10840,7 @@ msgstr ""
 "   csN           initialiser la taille des caractères à N bits,\n"
 "                   avec N compris entre 5 et 8\n"
 
-#: src/stty.c:590
+#: src/stty.c:593
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
 "   [-]hup        send a hangup signal when the last process closes the tty\n"
@@ -10713,6 +10848,7 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 "   [-]cstopb     utiliser 2 bits d'arrêt par caractère (un avec « - »)\n"
 "   [-]hup        émettre un signal de déconnexion quand le dernier "
@@ -10722,9 +10858,10 @@ msgstr ""
 "   [-]parenb     générer le bit de parité pour la sortie et traiter "
 "l'entrée\n"
 "                   avec un bit de parité implicite\n"
-"   [-]parodd     utiliser une parité impaire (paire avec « - »)\n"
+"   [-]parodd     utiliser une parité impaire (ou paire avec « - »)\n"
+" * [-]cmspar     utiliser une parité « stick » (marque ou espace)\n"
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -10740,7 +10877,7 @@ msgstr ""
 "   [-]ignbrk     ignorer les caractères break\n"
 "   [-]igncr      ignorer le retour chariot\n"
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -10756,12 +10893,12 @@ msgstr ""
 "   [-]inpck      autoriser la vérification de la parité à l'entrée\n"
 "   [-]istrip     effacer le bit de poids fort (8e) des caractères en entrée\n"
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr ""
 " * [-]iutf8      présumer que les caractères en entrée sont codés en UTF-8\n"
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -10781,7 +10918,7 @@ msgstr ""
 "                   caractères (255-0)\n"
 "   [-]tandem     identique à [-]ixoff\n"
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -10797,10 +10934,10 @@ msgstr ""
 " * ffN           style du délai du saut de page, N parmi [0..1]\n"
 " * nlN           style du délai du saut de ligne, N parmi [0..1]\n"
 
-#: src/stty.c:631
+#: src/stty.c:635
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
@@ -10808,7 +10945,7 @@ msgid ""
 msgstr ""
 " * [-]ocrnl      transformer un retour chariot par un changement de ligne\n"
 " * [-]ofdel      utiliser des caractères d'effacement comme caractère\n"
-"                   de remplissage au lieu de caractères nuls\n"
+"                   de remplissage au lieu de caractères NULL\n"
 " * [-]ofill      utiliser le remplissage de caractères au lieu du délai par\n"
 "                   minuterie\n"
 " * [-]olcuc      traduire les minuscules en majuscules\n"
@@ -10816,7 +10953,7 @@ msgstr ""
 "ligne\n"
 " * [-]onlret     le changement de ligne génère un retour chariot\n"
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -10832,7 +10969,7 @@ msgstr ""
 " * -tabs         identique à tab3\n"
 " * vtN           style du délai de tabulation verticale, N parmi [0..1]\n"
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -10849,7 +10986,7 @@ msgstr ""
 " * -crtkill      supprimer toute la ligne en respectant les paramètres\n"
 "                   « echoctl » et « echok »\n"
 
-#: src/stty.c:654
+#: src/stty.c:658
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
 "   [-]echo       echo input characters\n"
@@ -10865,7 +11002,7 @@ msgstr ""
 "   [-]echok      écho d'un changement de ligne après un caractère "
 "d'annulation\n"
 
-#: src/stty.c:661
+#: src/stty.c:665
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
 "   [-]echonl     echo newline even if not echoing other characters\n"
@@ -10879,10 +11016,10 @@ msgstr ""
 " * [-]echoprt    écho des caractères d'effacement par retour arrière, entre\n"
 "                   « \\ » et « / »\n"
 "   [-]icanon     autoriser les caractères spéciaux\n"
-"                   « erase », « kill », « werase », et « rprnt »\n"
+"                   « erase », « kill », « werase » et « rprnt »\n"
 "   [-]iexten     autoriser les caractères spéciaux non POSIX\n"
 
-#: src/stty.c:668
+#: src/stty.c:672
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
 "   [-]noflsh     disable flushing after interrupt and quit special "
@@ -10892,7 +11029,7 @@ msgid ""
 " * [-]xcase      with icanon, escape with '\\' for uppercase characters\n"
 msgstr ""
 "   [-]isig       autoriser les caractères spéciaux\n"
-"                   « interrupt », « quit », et « suspend »\n"
+"                   « interrupt », « quit » et « suspend »\n"
 "   [-]noflsh     désactiver la vidange après réception des caractères\n"
 "                   « interrupt » et « quit »\n"
 " * [-]prterase   identique à [-]echoprt\n"
@@ -10901,7 +11038,7 @@ msgstr ""
 "                   le terminal\n"
 " * [-]xcase      avec « icanon », protéger les majuscules avec « \\ »\n"
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -10915,7 +11052,7 @@ msgstr ""
 "   cbreak        identique à -icanon\n"
 "   -cbreak       identique à icanon\n"
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -10927,7 +11064,7 @@ msgstr ""
 "   -cooked       identique à raw\n"
 "   crt           identique à echoe echoctl echoke\n"
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -10942,7 +11079,7 @@ msgstr ""
 "                   par défaut\n"
 "   evenp         identique à parenb -parodd cs7\n"
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -10958,7 +11095,7 @@ msgstr ""
 "   nl            identique à -icrnl -onlcr\n"
 "   -nl           identique à icrnl -inlcr -igncr onlcr -ocrnl -onlret\n"
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -10972,7 +11109,7 @@ msgstr ""
 "   pass8         identique à -parenb -istrip cs8\n"
 "   -pass8        identique à parenb istrip cs7\n"
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -10984,7 +11121,7 @@ msgstr ""
 "                   -imaxbel -opost -isig -icanon -xcase min 1 time 0\n"
 "   -raw          identique à cooked\n"
 
-#: src/stty.c:716
+#: src/stty.c:720
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
 "                 -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n"
@@ -11002,7 +11139,7 @@ msgstr ""
 "caractères\n"
 "                    spéciaux avec leur valeur par défaut.\n"
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -11014,17 +11151,17 @@ msgstr ""
 "Prendre en charge la ligne « tty » reliée à l'entrée standard. En l'absence\n"
 "d'argument, afficher la vitesse, la procédure de contrôle et les "
 "modifications\n"
-"appliquées par « stty sane ». Dans les paramètres, CHAR est pris "
+"appliquées par « stty sane ». Dans les paramètres, CAR est pris "
 "littéralement,\n"
 "ou codé comme ^c, 0x37, 0177 ou 127 ; les valeurs spéciales comme ^- ou\n"
 "indéfinies sont utilisées pour inhiber les caractères spéciaux.\n"
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, c-format
 msgid "only one device may be specified"
 msgstr "un seul périphérique peut être indiqué"
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
@@ -11034,44 +11171,44 @@ msgstr ""
 "stty\n"
 "sont mutuellement exclusives"
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr ""
 "les mode ne peuvent pas être initialisés quand le style de sortie est indiqué"
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr "%s : impossible de réinitialiser le mode non bloquant"
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, c-format
 msgid "invalid argument %s"
 msgstr "argument %s incorrect"
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, c-format
 msgid "missing argument to %s"
 msgstr "argument manquant pour %s"
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, c-format
 msgid "invalid line discipline %s"
 msgstr "procédure de contrôle %s incorrecte"
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr "%s : impossible d'effectuer toutes les opérations demandées"
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr "%s : aucune information sur la taille de ce périphérique"
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, c-format
 msgid "invalid integer argument %s"
 msgstr "argument numérique %s incorrect"
@@ -11088,7 +11225,7 @@ msgid ""
 "  -r              use BSD sum algorithm, use 1K blocks\n"
 "  -s, --sysv      use System V sum algorithm, use 512 bytes blocks\n"
 msgstr ""
-"Afficher la somme de contrôle et le nombre de blocs de chaque FILE.\n"
+"Afficher la somme de contrôle et le nombre de blocs de chaque FICHIER.\n"
 "\n"
 "  -r              utiliser l'algorithme de calcul de somme BSD avec des "
 "blocs de\n"
@@ -11133,7 +11270,7 @@ msgstr "      --help     afficher l'aide et quitter\n"
 msgid "      --version  output version information and exit\n"
 msgstr "      --version  afficher des informations de version et quitter\n"
 
-#: src/system.h:544
+#: src/system.h:543
 msgid ""
 "\n"
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -11142,19 +11279,21 @@ msgstr ""
 "Les arguments obligatoires pour les options longues le sont aussi pour les\n"
 "options courtes.\n"
 
-#: src/system.h:552
+#: src/system.h:551
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 "\n"
-"SIZE est un entier suivi d'une unité facultative (10M pour 10*1024*1024 par\n"
-"exemple). Les unités sont K, M, G, T, P, E, Z et Y (puissances de 1024) ou\n"
+"L’argument TAILLE est un entier suivi d'une unité facultative (10k pour "
+"10*1024\n"
+"par exemple). Les unités sont K, M, G, T, P, E, Z et Y (puissances de 1024) "
+"ou\n"
 "KB, MB, etc. (puissances de 1000).\n"
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -11163,44 +11302,46 @@ msgid ""
 "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n"
 msgstr ""
 "\n"
-"Les valeurs sont affichées selon les unités du premier SIZE parmi --block-"
-"size\n"
-"et les variables d'environnement %s_BLOCK_SIZE, BLOCK_SIZE and BLOCKSIZE.\n"
-"Dans le cas contraire, les unités par défaut sont 1 024 octets (ou 512 si\n"
-"POSIXLY_CORRECT est défini).\n"
+"Les valeurs sont affichées selon les unités de la première TAILLE "
+"disponible\n"
+"parmi --block-size et les variables d'environnement %s_BLOCK_SIZE, "
+"BLOCK_SIZE\n"
+"et BLOCKSIZE. Dans le cas contraire, les unités par défaut sont "
+"1 024 octets\n"
+"(ou 512 si POSIXLY_CORRECT est défini).\n"
 
-#: src/system.h:571
+#: src/system.h:570
 #, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
+"%s online help: <%s>\n"
 msgstr ""
 "\n"
-"Signalez les anomalies de « %s » à <%s>\n"
+"Aide en ligne de %s : <%s>\n"
 
 # J'ai fait une entorse pour que la traduction reste sur une seule ligne (Stéphane)
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr ""
 "Signalez les problèmes de traduction de « %s » à : <traduc@traduc.org>\n"
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr ""
 "Utilisez « info coreutils '%s invocation' » pour toute la documentation\n"
 
-#: src/system.h:596
+#: src/system.h:591
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Saisissez « %s --help » pour plus d'informations.\n"
 
-#: src/system.h:628
+#: src/system.h:633
 #, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -11225,8 +11366,8 @@ msgid ""
 "Write each FILE to standard output, last line first.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
-"Écrire chaque FILE sur la sortie standard, la dernière ligne en premier.\n"
-"Sans FILE, ou quand FILE est -, lire l'entrée standard.\n"
+"Écrire chaque FICHIER sur la sortie standard, la dernière ligne en premier.\n"
+"Sans FICHIER, ou quand FICHIER est -, lire l'entrée standard.\n"
 
 #: src/tac.c:144
 msgid ""
@@ -11237,7 +11378,7 @@ msgstr ""
 "  -b, --before             placer le séparateur avant plutôt qu'après\n"
 "  -r, --regex              interpréter le séparateur comme une expression\n"
 "                             rationnelle\n"
-"  -s, --separator=STRING   utiliser STRING comme séparateur au lieu d'un\n"
+"  -s, --separator=CHAÎNE   utiliser CHAÎNE comme séparateur au lieu d'un\n"
 "                             changement de ligne\n"
 
 #: src/tac.c:234 src/tac.c:335
@@ -11258,12 +11399,12 @@ msgstr "impossible de créer le fichier temporaire dans %s"
 #: src/tac.c:458
 #, c-format
 msgid "failed to open %s for writing"
-msgstr "échec d'ouverture de %s en écriture"
+msgstr "impossible d’ouvrir %s en écriture"
 
 #: src/tac.c:475
 #, c-format
 msgid "failed to rewind stream for %s"
-msgstr "échec de rembobinage du flux pour %s"
+msgstr "impossible de rembobiner le flux pour %s"
 
 #: src/tac.c:511 src/tac.c:518
 #, c-format
@@ -11292,100 +11433,93 @@ msgid ""
 "With more than one FILE, precede each with a header giving the file name.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
-"Afficher les %d dernières lignes de chaque FILE sur la sortie standard.\n"
-"Avec plusieurs fichiers FILE, précéder chacun d'un en-tête donnant le nom.\n"
-"Sans FILE, ou quand FILE est -, lire l'entrée standard.\n"
+"Afficher les %d dernières lignes de chaque FICHIER sur la sortie standard.\n"
+"Avec plusieurs FICHIERs, précéder chacun d'un en-tête donnant le nom.\n"
+"Sans FICHIER, ou quand FICHIER est -, lire l'entrée standard.\n"
 
 #: src/tail.c:270
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
-"  -c, --bytes=K            afficher les K derniers octets ; -c peut aussi "
-"être\n"
-"                             utilisé pour afficher les octets débutant au "
-"Ke\n"
-"                             de chaque fichier\n"
+"  -c, --bytes=K            afficher les K derniers octets ; -c +K peut "
+"aussi\n"
+"                             être utilisé pour afficher les octets à partir "
+"du\n"
+"                             Kième de chaque fichier\n"
 
 #: src/tail.c:274
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           afficher les données ajoutées au fur et à mesure\n"
-"                             que le fichier grandit ; -f, --follow et\n"
-"                             --follow=descriptor sont équivalents\n"
+"                             que le fichier grandit ; sans argument, c’est\n"
+"                             équivalent à 'descriptor'\n"
 "  -F                       identique à --follow=name --retry\n"
 
-#: src/tail.c:281
+#: src/tail.c:280
 #, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
 "  -n, --lines=K            afficher les K dernières lignes, au lieu des %d\n"
-"                             dernières ou utilisez -n +K pour afficher les\n"
-"                             lignes à partir de la Ke\n"
+"                             dernières, -n +K pour afficher à partir de la "
+"Kième\n"
 "      --max-unchanged-stats=N\n"
-"                           avec l'option --follow=name, rouvrir un FILE qui\n"
+"                           avec l'option --follow=name, rouvrir un FICHIER "
+"qui\n"
 "                             n'a pas changé de taille après N itérations "
 "(%d\n"
 "                             par défaut) afin de vérifier s'il a été délié "
 "ou\n"
 "                             renommé (c'est le cas habituellement des "
 "fichiers\n"
-"                             tournants de journalisation).\n"
-"                             Avec inotify, cette option est rarement "
-"utilisée.\n"
+"                             tournants de journalisation) ;\n"
+"                             avec inotify, cette option est rarement "
+"utilisée\n"
 
-#: src/tail.c:294
+#: src/tail.c:293
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 "      --pid=PID            avec -f, terminer après la mort du PID\n"
 "  -q, --quiet, --silent    ne jamais afficher l'en-tête donnant les noms\n"
 "                             de fichiers\n"
-"      --retry              continuer d'essayer à ouvrir un fichier même "
-"quand il\n"
-"                             est ou devient inaccessible ; utile avec un "
-"suivi\n"
-"                             par nom, par exemple, avec --follow=nom\n"
+"      --retry              continuer d'essayer à ouvrir un fichier s’il est\n"
+"                             inaccessible\n"
 
-#: src/tail.c:301
+#: src/tail.c:298
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 "  -s, --sleep-interval=N   avec -f, dort environ N secondes (1.0 par "
 "défaut)\n"
-"                             entre les itérations. Avec inotify et --pid=P,\n"
+"                             entre les itérations ; avec inotify et --"
+"pid=P,\n"
 "                             vérifier le processus P au moins une fois "
 "toutes\n"
-"                             les N secondes.\n"
+"                             les N secondes\n"
 "  -v, --verbose            afficher toujours les en-têtes des noms de "
 "fichier\n"
 
-#: src/tail.c:310
+#: src/tail.c:307
 msgid ""
 "\n"
 "If the first character of K (the number of bytes or lines) is a '+',\n"
@@ -11398,15 +11532,15 @@ msgstr ""
 "\n"
 "Si le premier caractère de K (le nombre d'octets ou de lignes) est un "
 "« + »,\n"
-"afficher à partir du Ke éléments depuis le début de chaque fichier, "
-"autrement,\n"
+"afficher à partir du Kième éléments depuis le début de chaque fichier, "
+"sinon,\n"
 "afficher les K derniers éléments du fichier. K peut avoir un suffixe\n"
 "multiplicateur :\n"
 "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
 "GB 1000*1000*1000, G 1024*1024*1024 et ainsi de suite pour T, P, E, Z et Y.\n"
 "\n"
 
-#: src/tail.c:319
+#: src/tail.c:316
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
 "means that even if a tail'ed file is renamed, tail will continue to track\n"
@@ -11426,28 +11560,23 @@ msgstr ""
 "--follow=name et tail suivra l'évolution du fichier en s'accommodant des\n"
 "changements de nom, des suppressions ou des créations.\n"
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr "fermeture de %s (fd=%d)"
 
-#: src/tail.c:453
-#, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr "%s : impossible de se déplacer selon le décalage relatif %s"
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr "%s : impossible de se déplacer à la fin du décalage relatif %s"
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr ""
 "impossible de déterminer l'emplacement de %s, retour à l'interrogation active"
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
@@ -11456,136 +11585,145 @@ msgstr ""
 "type 0x%08lx de système de fichiers non reconnu pour %s, veuillez signaler "
 "cela à %s, retour à l'interrogation active"
 
-#: src/tail.c:963
+#: src/tail.c:965
+#, c-format
+msgid "%s has been replaced with a symbolic link. giving up on this name"
+msgstr "%s a été remplacé par un lien symbolique, abandon sur ce nom"
+
+#: src/tail.c:980
 #, c-format
 msgid "%s has become inaccessible"
 msgstr "%s est devenu inaccessible"
 
-#: src/tail.c:980
+#: src/tail.c:997
 #, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr ""
 "%s a été remplacé par un fichier incompatible avec tail, abandon sur ce nom"
 
-#: src/tail.c:989
+#: src/tail.c:1006
 #, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr "%s a été remplacé par un fichier distant, abandon sur ce nom"
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, c-format
 msgid "%s has become accessible"
 msgstr "%s est devenu accessible"
 
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr "%s est apparu ; suivi de la fin du nouveau fichier"
 
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr "%s a été remplacé ; suivi de la fin du nouveau fichier"
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr "%s : impossible de modifier le mode non bloquant"
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr "%s : fichier tronqué"
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr "aucun fichier restant"
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, c-format
 msgid "cannot watch parent directory of %s"
 msgstr "impossible de surveiller le répertoire parent de %s"
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, c-format
 msgid "inotify resources exhausted"
 msgstr "les ressources inotify sont épuisés"
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, c-format
 msgid "cannot watch %s"
 msgstr "impossible de surveiller %s"
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr "erreur de suivi d'un événement inotify"
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, c-format
 msgid "error reading inotify event"
 msgstr "erreur de lecture d'un événement inotify"
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr ""
 "%s : impossible de suivre la fin de ce type de fichier, abandon sur ce nom"
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, c-format
 msgid "number in %s is too large"
 msgstr "le numéro dans %s est trop grand"
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr ""
 "%s : nombre maximal de changements d'état incorrect entre les ouvertures"
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr "%s : PID incorrect"
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr "%s : nombre de secondes incorrect"
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr "option utilisée dans un contexte incorrect — %c"
 
-#: src/tail.c:2034
+#: src/tail.c:2096
 #, c-format
-msgid "warning: --retry is useful mainly when following by name"
-msgstr ""
-"avertissement : --retry est principalement utile s'il est suivi par un nom"
+msgid "warning: --retry ignored; --retry is useful only when following"
+msgstr "avertissement : --retry ignoré ; --retry n'est utile que lors du suivi"
 
-#: src/tail.c:2038
+#: src/tail.c:2100
+#, c-format
+msgid "warning: --retry only effective for the initial open"
+msgstr "avertissement : --retry n’est effective que pour l’ouverture initiale"
+
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
 msgstr "avertissement : PID ignoré ; --pid=PID n'est utile que lors du suivi"
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr "avertissement : --pid=PID n'est pas pris en charge sur ce système"
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, c-format
 msgid "cannot follow %s by name"
 msgstr "impossible de suivre %s selon son nom"
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr "avertissement : suivre l'entrée standard indéfiniment est inefficace"
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr "impossible d'utiliser inotify, retour à l'interrogation active"
@@ -11597,10 +11735,10 @@ msgid ""
 "  -a, --append              append to the given FILEs, do not overwrite\n"
 "  -i, --ignore-interrupts   ignore interrupt signals\n"
 msgstr ""
-"Copier l'entrée standard vers chaque FILE, et également vers la sortie "
+"Copier l'entrée standard vers chaque FICHIER et aussi vers la sortie "
 "standard.\n"
 "\n"
-"  -a, --append              ajouter aux FILEs, sans les écraser\n"
+"  -a, --append              ajouter aux FICHIERs, sans les écraser\n"
 "  -i, --ignore-interrupts   ignorer les signaux d'interruption\n"
 
 #: src/tee.c:71
@@ -11609,7 +11747,7 @@ msgid ""
 "If a FILE is -, copy again to standard output.\n"
 msgstr ""
 "\n"
-"Si FILE est -, recopier sur la sortie standard.\n"
+"Si FICHIER est -, recopier sur la sortie standard.\n"
 
 #: src/test.c:123
 #, c-format
@@ -11715,11 +11853,11 @@ msgid ""
 "  STRING1 != STRING2   the strings are not equal\n"
 msgstr ""
 "\n"
-"  -n STRING               la longueur de STRING n'est pas nulle\n"
-"  STRING                  équivalent à -n STRING\n"
-"  -z STRING               la longueur de STRING est nulle\n"
-"  STRING1 = STRING2       les chaînes sont identiques\n"
-"  STRING1 != STRING2      les chaînes sont différentes\n"
+"  -n CHAÃŽNE               la longueur de CHAÃŽNE n'est pas nulle\n"
+"  CHAÎNE                  équivalent à -n CHAÎNE\n"
+"  -z CHAÃŽNE               la longueur de CHAÃŽNE est nulle\n"
+"  CHAÎNE1 = CHAÎNE2       les chaînes sont identiques\n"
+"  CHAÎNE1 != CHAÎNE2      les chaînes sont différentes\n"
 
 #: src/test.c:737
 msgid ""
@@ -11747,10 +11885,11 @@ msgid ""
 "  FILE1 -ot FILE2   FILE1 is older than FILE2\n"
 msgstr ""
 "\n"
-"  FILE1 -ef FILE2   FILE1 et FILE2 ont les mêmes numéros de périphérique\n"
-"                      et d'inœud\n"
-"  FILE1 -nt FILE2   FILE1 est plus récent (date de modification) que FILE2\n"
-"  FILE1 -ot FILE2   FILE1 est plus ancien que FILE2\n"
+"  FICHIER1 -ef FICHIER2  FICHIER1 et FICHIER2 ont les mêmes numéros de\n"
+"                         périphérique et d'inœud\n"
+"  FICHIER1 -nt FICHIER2  FICHIER1 est plus récent (date de modification) que "
+"FICHIER2\n"
+"  FICHIER1 -ot FICHIER2  FICHIER1 est plus ancien que FICHIER2\n"
 
 #: src/test.c:752
 msgid ""
@@ -11761,10 +11900,10 @@ msgid ""
 "  -e FILE     FILE exists\n"
 msgstr ""
 "\n"
-"  -b FILE     FILE existe et est un bloc spécial\n"
-"  -c FILE     FILE existe et est un caractère spécial\n"
-"  -d FILE     FILE existe et est un répertoire\n"
-"  -e FILE     FILE existe\n"
+"  -b FICHIER  FICHIER existe et est un bloc spécial\n"
+"  -c FICHIER  FICHIER existe et est un caractère spécial\n"
+"  -d FICHIER  FICHIER existe et est un répertoire\n"
+"  -e FICHIER  FICHIER existe\n"
 
 #: src/test.c:759
 msgid ""
@@ -11774,11 +11913,11 @@ msgid ""
 "  -h FILE     FILE exists and is a symbolic link (same as -L)\n"
 "  -k FILE     FILE exists and has its sticky bit set\n"
 msgstr ""
-"  -f FILE     FILE existe et est un fichier standard\n"
-"  -g FILE     FILE existe et le bit « Set-GID » est initialisé\n"
-"  -G FILE     FILE existe et appartient au GID effectif\n"
-"  -h FILE     FILE existe et est un lien symbolique (identique à -L)\n"
-"  -k FILE     FILE existe et le bit « sticky » est initialisé\n"
+"  -f FICHIER  FICHIER existe et est un fichier standard\n"
+"  -g FICHIER  FICHIER existe et le bit « Set-GID » est initialisé\n"
+"  -G FICHIER  FICHIER existe et appartient au GID effectif\n"
+"  -h FICHIER  FICHIER existe et est un lien symbolique (identique à -L)\n"
+"  -k FICHIER  FICHIER existe et le bit « sticky » est initialisé\n"
 
 #: src/test.c:766
 msgid ""
@@ -11788,11 +11927,11 @@ msgid ""
 "  -r FILE     FILE exists and read permission is granted\n"
 "  -s FILE     FILE exists and has a size greater than zero\n"
 msgstr ""
-"  -L FILE     FILE existe et est un lien symbolique (identique à -h)\n"
-"  -O FILE     FILE existe et appartient à l'UID effectif\n"
-"  -p FILE     FILE existe et est un tube nommé\n"
-"  -r FILE     FILE existe et dispose des permissions en lecture\n"
-"  -s FILE     FILE existe et a une taille plus grande que zéro\n"
+"  -L FICHIER  FICHIER existe et est un lien symbolique (identique à -h)\n"
+"  -O FICHIER  FICHIER existe et appartient à l'UID effectif\n"
+"  -p FICHIER  FICHIER existe et est un tube nommé\n"
+"  -r FICHIER  FICHIER existe et dispose des droits en lecture\n"
+"  -s FICHIER  FICHIER existe et a une taille supérieure à zéro\n"
 
 #: src/test.c:773
 msgid ""
@@ -11802,12 +11941,12 @@ msgid ""
 "  -w FILE     FILE exists and write permission is granted\n"
 "  -x FILE     FILE exists and execute (or search) permission is granted\n"
 msgstr ""
-"  -S FILE     FILE existe et est une « socket »\n"
-"  -t FD       le descripteur de fichier FD est ouvert sur un terminal\n"
-"  -u FILE     FILE existe et le bit « Set-UID » est initialisé\n"
-"  -w FILE     FILE existe et dispose des permissions en écriture\n"
-"  -x FILE     FILE existe et est exécutable (ou peut être parcouru dans le "
-"cas\n"
+"  -S FICHIER  FICHIER existe et est une « socket »\n"
+"  -t DF       le descripteur de fichier DF est ouvert sur un terminal\n"
+"  -u FICHIER  FICHIER existe et le bit « Set-UID » est initialisé\n"
+"  -w FICHIER  FICHIER existe et dispose des droits en écriture\n"
+"  -x FICHIER  FICHIER existe et est exécutable (ou peut être parcouru dans "
+"le cas\n"
 "                d'un répertoire)\n"
 
 #: src/test.c:780
@@ -11819,12 +11958,12 @@ msgid ""
 "INTEGER may also be -l STRING, which evaluates to the length of STRING.\n"
 msgstr ""
 "\n"
-"Excepté pour -h et -L, tous les tests relatifs aux fichiers déréférencent "
+"À part pour -h et -L, tous les tests relatifs aux fichiers déréférencent "
 "les\n"
 "liens symboliques. Prenez soin de protéger les parenthèses (par exemple avec "
 "des\n"
 "barres obliques inverses) dans un interpréteur.\n"
-"INTEGER peut être -l STRING, qui évalue alors la longueur de la chaîne.\n"
+"ENTIER peut être -l CHAÎNE, qui évalue alors la longueur de la chaîne.\n"
 
 #: src/test.c:786
 msgid ""
@@ -11835,7 +11974,7 @@ msgstr ""
 "\n"
 "Remarque : [ respecte les options --help et --version, mais test ne le fait "
 "pas.\n"
-"test traite chacun de ceux-là comme il traite n'importe quelle STRING non "
+"test traite chacun de ceux-là comme il traite n'importe quelle CHAÎNE non "
 "vide.\n"
 
 #: src/test.c:791
@@ -11866,72 +12005,69 @@ msgstr "argument surnuméraire %s"
 msgid "warning: sigprocmask"
 msgstr "avertissement : sigprocmask"
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr "avertissement : timer_settime"
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr "avertissement : timer_create"
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
 "  or:  %s [OPTION]\n"
 msgstr ""
-"Utilisation : %s [OPTION] DURATION [COMMAND [ARG]...]\n"
+"Utilisation : %s [OPTION] DURÉE [COMMANDE [ARG]...]\n"
 "         ou : %s OPTION\n"
 
-#: src/timeout.c:229
+#: src/timeout.c:232
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
 msgstr ""
-"Démarrer COMMAND et l'arrêter si elle fonctionne encore après la durée "
-"DURATION.\n"
+"Démarrer COMMANDE et l'arrêter si elle fonctionne encore après la DURÉE.\n"
 
-#: src/timeout.c:235
+#: src/timeout.c:238
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
 "      --preserve-status\n"
-"                 se terminer avec le même état que COMMAND, même si la "
+"                 se terminer avec le même état que COMMANDE, même si la "
 "commande\n"
 "                   dépasse le temps imparti\n"
 "      --foreground\n"
 "                 quand timeout ne s'exécute pas directement d'une invite de\n"
-"                   commande, permettre à COMMAND de lire depuis le TTY et "
-"de\n"
-"                   recevoir les signaux du TTY. Dans ce mode, les enfants "
+"                   commande, permettre à COMMANDE de lire depuis le TTY et\n"
+"                   d’obtenir les signaux du TTY ; dans ce mode, les enfants "
 "de\n"
-"                   COMMAND ne s'arrêteront pas à l'expiration du délai.\n"
-"  -k, --kill-after=DURATION\n"
-"                 envoyer aussi le signal KILL if COMMAND est toujours en "
+"                   COMMANDE ne s'arrêteront pas à l'expiration du délai\n"
+"  -k, --kill-after=DURÉE\n"
+"                 envoyer aussi le signal KILL if COMMANDE est toujours en "
 "cours\n"
 "                   d'exécution bien après que le signal initial ait été "
-"envoyé.\n"
+"envoyé\n"
 "  -s, --signal=SIGNAL\n"
 "                 indiquer le signal à envoyer lors d'une expiration de "
-"délai.\n"
-"                   SIGNAL peut être un nom comme « HUP » ou un nombre.\n"
-"                   Consultez « kill -l » pour une liste des signaux.\n"
+"délai ;\n"
+"                   SIGNAL peut être un nom comme « HUP » ou un nombre ;\n"
+"                   consultez « kill -l » pour une liste des signaux\n"
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 msgid ""
 "\n"
 "DURATION is a floating point number with an optional suffix:\n"
@@ -11939,11 +12075,11 @@ msgid ""
 "days.\n"
 msgstr ""
 "\n"
-"DURATION est un nombre en virgule flottante avec un suffixe facultatif :\n"
+"DURÉE est un nombre à virgule flottante avec un suffixe facultatif :\n"
 "« s » pour secondes (par défaut), « m » pour minutes, « h » pour heures\n"
 "ou « d » pour jours.\n"
 
-#: src/timeout.c:259
+#: src/timeout.c:262
 msgid ""
 "\n"
 "If the command times out, and --preserve-status is not set, then exit with\n"
@@ -11954,26 +12090,26 @@ msgid ""
 "case the exit status is 128+9 rather than 124.\n"
 msgstr ""
 "\n"
-"Si la commande dépasse le temps imparti, et que --preserve-status n'est pas\n"
+"Si la commande dépasse le temps imparti et que --preserve-status n'est pas\n"
 "définie, alors quitter avec l'état 124, sinon quitter avec l'état de "
-"COMMAND.\n"
+"COMMANDE.\n"
 "Si aucun signal n'est indiqué, le signal TERM est envoyé à l'expiration.\n"
 "Le signal TERM tuera tous les processus qui n'attrapent pas ce signal.\n"
 "Il peut être nécessaire d'utiliser le signal KILL (9), puisque ce signal ne\n"
 "peut pas être capturé, auquel cas l'état de retour est 128+9 au lieu de "
 "124.\n"
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr "avertissement : impossible de désactiver les core dumps"
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, c-format
 msgid "error waiting for command"
 msgstr "erreur d'attente de la commande"
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr "la commande surveillée a renvoyé un core dump"
@@ -12013,13 +12149,13 @@ msgid ""
 "A FILE argument string of - is handled specially and causes touch to\n"
 "change the times of the file associated with standard output.\n"
 msgstr ""
-"Mettre à jour la date d'accès et de modification de FILE à l'heure "
+"Mettre à jour la date d'accès et de modification de FICHIER à l'heure "
 "actuelle.\n"
 "\n"
-"Un argument FILE qui n'existe pas est créé vide, sauf si -c ou -h sont "
+"Un argument FICHIER n’existant pas est créé vide sauf si -c ou -h sont "
 "indiqués.\n"
 "\n"
-"Une chaîne d'argument FILE à - est géré spécifiquement et fait que touch\n"
+"Une chaîne d'argument FICHIER à - est géré spécifiquement et fait que touch\n"
 "modifie la date du fichier associé à la sortie standard.\n"
 
 #: src/touch.c:225
@@ -12031,8 +12167,7 @@ msgid ""
 msgstr ""
 "  -a                     ne modifier que la date d'accès\n"
 "  -c, --no-create        ne créer aucun fichier\n"
-"  -d, --date=STRING      analyser la chaîne STRING et l'utiliser au lieu de "
-"la\n"
+"  -d, --date=CHAÃŽNE      analyser la CHAÃŽNE et l'utiliser au lieu de la\n"
 "                           date actuelle\n"
 "  -f                     (ignorée)\n"
 
@@ -12059,16 +12194,15 @@ msgid ""
 "                           WORD is access, atime, or use: equivalent to -a\n"
 "                           WORD is modify or mtime: equivalent to -m\n"
 msgstr ""
-"  -r, --reference=FILE   utiliser la date de ce fichier au lieu de la date\n"
+"  -r, --reference=FICHIER  utiliser la date de ce fichier au lieu de la "
+"date\n"
 "                           actuelle\n"
-"  -t STAMP               utiliser [[CC]AA]MMJJhhmm[.ss] au lieu de la date\n"
+"  -t DATE                utiliser [[CC]AA]MMJJhhmm[.ss] au lieu de la date\n"
 "                           actuelle\n"
-"      --time=WORD        modifier le temps indiqué :\n"
-"                           équivalent à -a si WORD est « access », "
-"« atime »\n"
-"                             ou « use » ;\n"
-"                           équivalent à -m si WORD est « modify » ou "
-"« mtime »\n"
+"      --time=MOT         modifier le temps indiqué :\n"
+"                           équivalent à -a si MOT est access, atime ou "
+"use ;\n"
+"                           équivalent à -m si MOT est modify ou mtime\n"
 
 #: src/touch.c:246
 msgid ""
@@ -12095,7 +12229,7 @@ msgstr ""
 #: src/tr.c:286
 #, c-format
 msgid "Usage: %s [OPTION]... SET1 [SET2]\n"
-msgstr "Utilisation : %s [OPTION]... SET1 [SET2]\n"
+msgstr "Utilisation : %s [OPTION]... ENSEMBLE1 [ENSEMBLE2]\n"
 
 #: src/tr.c:290
 msgid ""
@@ -12113,13 +12247,15 @@ msgstr ""
 "Convertir, compresser ou éliminer des caractères de l'entrée standard en\n"
 "écrivant sur la sortie standard.\n"
 "\n"
-"  -c, -C, --complement    utiliser le complément de SET1 \n"
-"  -d, --delete            supprimer les caractères de SET1, ne pas "
+"  -c, -C, --complement    utiliser le complément d’ENSEMBLE1 \n"
+"  -d, --delete            supprimer les caractères d’ENSEMBLE1, ne pas "
 "convertir\n"
 "  -s, --squeeze-repeats   remplacer chaque séquence en entrée de caractères\n"
-"                            répétés qui apparaît dans SET1 par une seule\n"
+"                            répétés qui apparaît dans ENSEMBLE1 par une "
+"seule\n"
 "                            occurrence de ce caractère\n"
-"  -t, --truncate-set1     tronquer d'abord SET1 à la longueur de SET2\n"
+"  -t, --truncate-set1     tronquer d'abord ENSEMBLE1 à la longueur de "
+"ENSEMBLE2\n"
 
 #: src/tr.c:303
 msgid ""
@@ -12137,9 +12273,9 @@ msgid ""
 "  \\t              horizontal tab\n"
 msgstr ""
 "\n"
-"Les ensembles SET sont indiqués comme des chaînes de caractères.\n"
+"Les ENSEMBLEs sont indiqués comme des chaînes de caractères.\n"
 "La plupart se représente eux-mêmes.\n"
-"Les séquences d'interprétation sont les suivantes :\n"
+"Les suites d'interprétation sont les suivantes :\n"
 "\n"
 "  \\NNN            caractère ayant la valeur octale NNN (1 à 3 chiffres "
 "octaux)\n"
@@ -12164,10 +12300,11 @@ msgid ""
 "  [:digit:]       all digits\n"
 msgstr ""
 "  \\v              saut vertical\n"
-"  CHAR1-CHAR2     tous les caractères de CHAR1 à CHAR2 en ordre croissant\n"
-"  [CHAR*]         dans SET2, copie de CHAR jusqu'à longueur de SET1\n"
-"  [CHAR*REPEAT]   REPEAT copies de CHAR, REPEAT est un octal s'il débute par "
-"0\n"
+"  CAR1-CAR2       tous les caractères de CAR1 à CAR2 en ordre croissant\n"
+"  [CAR*]          dans ENSEMBLE2, copie de CAR jusqu'à longueur de "
+"ENSEMBLE1\n"
+"  [CAR*RÉPÉTER]   RÉPÉTER copies de CAR, RÉPÉTER est un octal s'il débute "
+"par 0\n"
 "  [:alnum:]       toutes les lettres et les chiffres\n"
 "  [:alpha:]       toutes les lettres\n"
 "  [:blank:]       tous les blancs horizontaux\n"
@@ -12192,7 +12329,7 @@ msgstr ""
 "  [:space:]       tous les sauts verticaux ou horizontaux\n"
 "  [:upper:]       toutes les lettres majuscules\n"
 "  [:xdigit:]      tous les chiffres hexadécimaux\n"
-"  [=CHAR=]        tous les caractères équivalents à CHAR\n"
+"  [=CAR=]         tous les caractères équivalents à CAR\n"
 
 #: src/tr.c:338
 msgid ""
@@ -12207,19 +12344,19 @@ msgid ""
 "translation or deletion.\n"
 msgstr ""
 "\n"
-"La conversion se fait si -d n'est pas donné et si SET1 et SET2 apparaissent\n"
-"tous les deux. -t ne peut être employé qu'en conversion. SET2 est adapté à "
-"la\n"
-"longueur de SET1 par la répétition de son dernier caractère. Les caractères\n"
-"en excédents de SET2 sont ignorés. Seuls [:lower:] et [:upper:] "
-"garantissent\n"
-"l'expansion dans l'ordre croissant ; utilisé dans SET2 lors de la "
-"conversion,\n"
-"ils ne devraient être utilisés que par paires pour indiquer le changement "
+"La conversion se fait si -d n'est pas donné et si ENSEMBLE et ENSEMBLE2\n"
+"apparaissent tous les deux. -t ne peut être employé qu'en conversion. "
+"ENSEMBLE2\n"
+"est adapté à la longueur d’ENSEMBLE1 par la répétition de son dernier\n"
+"caractère. Les caractères en excédents d’ENSEMBLE2 sont ignorés. Seuls [:"
+"lower:]\n"
+"et [:upper:] garantissent l'expansion dans l'ordre croissant ; utilisé dans\n"
+"ENSEMBLE2 lors de la conversion, ils ne devraient être utilisés que par "
+"paires\n"
+"pour indiquer le changement de casse. -s utilise ENSEMBLE1 s'il n'y a pas "
 "de\n"
-"casse. -s emploie SET1 s'il n'y a pas de conversion, ni de suppression ; "
-"sinon\n"
-"la compression emploie SET2 et intervient après conversion et suppression.\n"
+"conversion, ni de suppression ; sinon la compression utilise ENSEMBLE2 et\n"
+"intervient après conversion et suppression.\n"
 
 #: src/tr.c:509
 #, c-format
@@ -12371,7 +12508,7 @@ msgstr "Quitter avec un code d'état indiquant l'échec."
 #: src/truncate.c:96
 #, c-format
 msgid "Usage: %s OPTION... FILE...\n"
-msgstr "Utilisation : %s [OPTION]... FILE...\n"
+msgstr "Utilisation : %s [OPTION]... FICHIER...\n"
 
 #: src/truncate.c:97
 msgid ""
@@ -12383,12 +12520,14 @@ msgid ""
 "If a FILE is shorter, it is extended and the extended part (hole)\n"
 "reads as zero bytes.\n"
 msgstr ""
-"Réduire ou étendre la taille de chaque FILE à la taille indiquée\n"
+"Réduire ou étendre la taille de chaque FICHIER à la taille indiquée\n"
 "\n"
-"Un argument FILE qui n'existe pas est créé.\n"
+"Un argument FICHIER qui n'existe pas est créé.\n"
 "\n"
-"Si FILE est plus grand que la taille indiquée, les données restantes sont\n"
-"perdues. Si FILE est plus court, il est étendu et la partie supplémentaire\n"
+"Si FICHIER est plus grand que la taille indiquée, les données restantes "
+"sont\n"
+"perdues. Si FICHIER est plus court, il est étendu et la partie "
+"supplémentaire\n"
 "(trou) contient des octets à zéro.\n"
 
 #: src/truncate.c:109
@@ -12399,17 +12538,18 @@ msgstr "  -c, --no-create         ne pas créer de fichier\n"
 msgid ""
 "  -o, --io-blocks        treat SIZE as number of IO blocks instead of bytes\n"
 msgstr ""
-"  -o, --io-blocks        traiter SIZE comme un nombre de blocs d'E/S au "
+"  -o, --io-blocks        traiter TAILLE comme un nombre de blocs d'E/S au "
 "lieu\n"
 "                           d'octets\n"
 
 #: src/truncate.c:115
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
-"  -r, --reference=RFILE  utiliser la taille de RFILE\n"
-"  -s, --size=SIZE        définir ou ajuster la taille du fichier de SIZE\n"
+"  -r, --reference=FICHIER_R  utiliser la taille de FICHIER_R\n"
+"  -s, --size=TAILLE      définir ou ajuster la taille du fichier à "
+"TAILLE octets\n"
 
 #: src/truncate.c:121
 msgid ""
@@ -12419,7 +12559,7 @@ msgid ""
 "'/' round down to multiple of, '%' round up to multiple of.\n"
 msgstr ""
 "\n"
-"SIZE peut aussi être préfixé par un de ces caractères modificateurs :\n"
+"TAILLE peut aussi être préfixé par un de ces caractères modificateurs :\n"
 "« + » agrandit de, « - » réduit de, « < » au maximum, « > » au minimum,\n"
 "« / » arrondi au multiple inférieur de, « % » arrondi au multiple supérieur "
 "de.\n"
@@ -12494,18 +12634,18 @@ msgid ""
 "With no FILE, or when FILE is -, read standard input.\n"
 "\n"
 msgstr ""
-"Utilisation : %s [OPTION] [FILE]\n"
-"Afficher une liste entièrement ordonnée cohérente avec le tri partiel de "
-"FILE.\n"
-"Sans FILE, ou quand  FILE est -, lire l'entrée standard.\n"
+"Utilisation : %s [OPTION] [FICHIER]\n"
+"Afficher une liste entièrement ordonnée cohérente par le tri partiel de "
+"FICHIER.\n"
+"Sans FICHIER, ou quand  FICHIER est -, lire l'entrée standard.\n"
 "\n"
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr "%s : l'entrée contient un nombre impair de jetons"
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr "%s : l'entrée contient une boucle :"
@@ -12579,10 +12719,10 @@ msgid ""
 "Convert blanks in each FILE to tabs, writing to standard output.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
-"Convertir les blancs de chaque FILE par des tabulations, lors de "
+"Convertir les blancs de chaque FICHIER par des tabulations, lors de "
 "l'affichage\n"
 "sur la sortie standard.\n"
-"Sans FILE, ou quand le FILE est -, lire l'entrée standard.\n"
+"Sans FICHIER, ou quand le FICHIER est -, lire l'entrée standard.\n"
 
 #: src/unexpand.c:124
 msgid ""
@@ -12610,63 +12750,76 @@ msgstr "les tabulations sont trop éloignées"
 msgid "tab stop value is too large"
 msgstr "la valeur de l'arrêt de tabulation est trop grande"
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
-msgstr "Utilisation : %s [OPTION]... [INPUT [OUTPUT]]\n"
+msgstr "Utilisation : %s [OPTION]... [ENTRÉE [SORTIE]]\n"
 
-#: src/uniq.c:138
+#: src/uniq.c:174
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
 "writing to OUTPUT (or standard output).\n"
 "\n"
 "With no options, matching lines are merged to the first occurrence.\n"
 msgstr ""
-"Filtrer les lignes adjacentes correspondantes depuis INPUT (ou l'entrée\n"
-"standard), en écrivant dans OUTPUT (ou la sortie standard).\n"
+"Filtrer les lignes adjacentes correspondantes depuis ENTRÉE (ou l'entrée\n"
+"standard), en écrivant dans SORTIE (ou la sortie standard).\n"
 "\n"
 "Sans option, les lignes correspondantes sont fusionnées sur la première\n"
 "occurrence.\n"
 
-#: src/uniq.c:147
+#: src/uniq.c:183
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
 msgstr ""
 "  -c, --count           préfixer les lignes par le nombre d'occurrences\n"
-"  -d, --repeated        n'afficher que les lignes ayant des duplicatas\n"
+"  -d, --repeated        n'afficher que les lignes ayant des duplicatas, une\n"
+"                          pour chaque groupe\n"
+
+#: src/uniq.c:187
+msgid ""
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
+msgstr ""
+"  -D, --all-repeated[=MÉTHODE]  afficher toutes les lignes en double, les\n"
+"                          groupes peuvent être délimités par une ligne "
+"vide :\n"
+"                          none (par défaut), prepend ou separate\n"
+
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr "  -f, --skip-fields=N   ne pas comparer les N premiers champs\n"
 
-#: src/uniq.c:151
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
+msgstr ""
+"      --group[=MÉTHODE]  montrer tous les éléments, en séparant les groupes "
+"par\n"
+"                          une ligne vide ; valeurs possibles pour MÉTHODE :\n"
+"                          none (par défaut), prepend, append ou both\n"
+
+#: src/uniq.c:199
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
 "  -i, --ignore-case     ignore differences in case when comparing\n"
 "  -s, --skip-chars=N    avoid comparing the first N characters\n"
 "  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
-msgstr ""
-"  -D, --all-repeated[=delimit-method]  afficher toutes les lignes en "
-"double,\n"
-"                          delimit-method peut être « none » (par défaut),\n"
-"                          « prepend » ou « separate ».\n"
-"                          La délimitation est faite avec des lignes "
-"blanches.\n"
-"  -f, --skip-fields=N   éviter de comparer les N premiers champs\n"
+msgstr ""
 "  -i, --ignore-case     ignorer les différences de casse à la comparaison\n"
 "  -s, --skip-chars=N    éviter de comparer les N premiers caractères\n"
 "  -u, --unique          n'afficher que les lignes uniques\n"
-"  -z, --zero-terminated  terminer les lignes avec l'octet NULL, sans\n"
-"                          changement de ligne\n"
 
-#: src/uniq.c:161
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr ""
 "  -w, --check-chars=N   ne pas comparer plus de N caractères dans les "
 "lignes\n"
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 msgid ""
 "\n"
 "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n"
@@ -12678,7 +12831,7 @@ msgstr ""
 "suivis de caractères non blancs. Les champs avant les caractères sont "
 "ignorés.\n"
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 msgid ""
 "\n"
 "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n"
@@ -12687,29 +12840,40 @@ msgid ""
 msgstr ""
 "\n"
 "Remarque : « uniq » ne détecte pas les lignes répétées à moins qu'elles ne\n"
-"soient adjacentes. Il est possible de trier l'entrée en premier, ou "
+"soient adjacentes. Il est possible de trier l'entrée en premier ou "
 "d'utiliser\n"
 "« sort -u » sans « uniq ».\n"
 "Les comparaisons respectent les règles définies par « LC_COLLATE ».\n"
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, c-format
 msgid "too many repeated lines"
 msgstr "trop de lignes répétées"
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
 msgstr "nombre de champs à ignorer incorrect"
 
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
 msgstr "nombre d'octets à ignorer incorrect"
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
 msgstr "nombre d'octets à comparer incorrect"
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr "--group et -c, -d, -D ou -u s'excluent mutuellement"
+
+#: src/uniq.c:652
+#, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr ""
+"Le regroupement et l’affichage du décompte de répétition est sans effet"
+
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr ""
@@ -12722,7 +12886,7 @@ msgid ""
 "Usage: %s FILE\n"
 "  or:  %s OPTION\n"
 msgstr ""
-"Utilisation : %s FILE\n"
+"Utilisation : %s FICHIER\n"
 "         ou : %s OPTION\n"
 
 #: src/unlink.c:48
@@ -12730,14 +12894,9 @@ msgid ""
 "Call the unlink function to remove the specified FILE.\n"
 "\n"
 msgstr ""
-"Exécuter la fonction unlink pour supprimer le FILE indiqué.\n"
+"Exécuter la fonction unlink pour supprimer le FICHIER indiqué.\n"
 "\n"
 
-#: src/unlink.c:86
-#, c-format
-msgid "cannot unlink %s"
-msgstr "impossible de supprimer %s"
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -12782,7 +12941,7 @@ msgstr[1] "%lu utilisateurs"
 msgid ",  load average: %.2f"
 msgstr ",  charge moyenne : %.2f"
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -12793,7 +12952,7 @@ msgstr ""
 "le nombre d'utilisateurs sur le système, et le nombre moyen de tâches\n"
 "dans la file d'exécution depuis les 1, 5 et 15 dernières minutes."
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
@@ -12802,18 +12961,19 @@ msgstr ""
 "  Les tâches dans\n"
 "un état dormant ininterruptible contribuent aussi à la charge moyenne.\n"
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr "\n"
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
 "\n"
 msgstr ""
-"Si FILE n'est pas indiqué, utiliser %s. %s en tant que FILE est usuel.\n"
+"Si FICHIER n'est pas indiqué, utiliser %s. %s en tant que FICHIER est "
+"usuel.\n"
 "\n"
 
 #: src/users.c:106
@@ -12823,8 +12983,8 @@ msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
 "\n"
 msgstr ""
-"Afficher les utilisateurs connectés selon FILE.\n"
-"Si FILE est indiqué, utiliser %s. %s en tant que FILE est usuel.\n"
+"Afficher les utilisateurs connectés selon FICHIER.\n"
+"Si FICHIER est indiqué, utiliser %s. %s en tant que FICHIER est usuel.\n"
 "\n"
 
 #: src/wc.c:117
@@ -12839,9 +12999,9 @@ msgid ""
 "  -m, --chars            print the character counts\n"
 "  -l, --lines            print the newline counts\n"
 msgstr ""
-"Afficher le nombre de nouvelles lignes, mots et d'octets pour chaque FILE\n"
-"ainsi que le total des lignes si plusieurs fichiers FILE sont indiqués.\n"
-"Sans FILE, ou quand FILE est -, lire l'entrée standard.\n"
+"Afficher le nombre de nouvelles lignes, mots et octets pour chaque FICHIER\n"
+"ainsi que le total des lignes si plusieurs fichiers FICHIER sont indiqués.\n"
+"Sans FICHIER, ou quand FICHIER est -, lire l'entrée standard.\n"
 "Un mot est une suite non nulle de caractères, délimitée par un blanc.\n"
 "Les options ci-dessous permettent de sélectionner les compteurs à afficher,\n"
 "qui sont toujours utilisés dans l'ordre suivant : nouvelle ligne, mot, "
@@ -12940,7 +13100,7 @@ msgstr "EXIT"
 #: src/who.c:640
 #, c-format
 msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n"
-msgstr "Utilisation : %s [OPTION]... [ FILE | ARG1 ARG2 ]\n"
+msgstr "Utilisation : %s [OPTION]... [ FICHIER | ARG1 ARG2 ]\n"
 
 #: src/who.c:641
 msgid "Print information about users who are currently logged in.\n"
@@ -13010,10 +13170,11 @@ msgid ""
 "If ARG1 ARG2 given, -m presumed: 'am i' or 'mom likes' are usual.\n"
 msgstr ""
 "\n"
-"Si FILE n'est pas indiqué, utiliser %s. %s en tant que FILE est usuel.\n"
-"Si ARG1 ARG2 sont renseignés, -m est supposé, « am i » ou « mom likes » "
-"sont\n"
-"usuels.\n"
+"Si FICHIER n'est pas indiqué, utiliser %s. %s en tant que FICHIER est "
+"usuel.\n"
+"Si ARG1 ARG2 sont renseignés, -m est supposé, « suis je » ou « la la » "
+"peuvent\n"
+"être utilisés.\n"
 
 #: src/whoami.c:45
 msgid ""
@@ -13036,7 +13197,7 @@ msgid ""
 "Usage: %s [STRING]...\n"
 "  or:  %s OPTION\n"
 msgstr ""
-"Utilisation : %s [STRING]...\n"
+"Utilisation : %s [CHAÎNE]...\n"
 "         ou : %s OPTION\n"
 
 #: src/yes.c:47
@@ -13044,9 +13205,168 @@ msgid ""
 "Repeatedly output a line with all specified STRING(s), or 'y'.\n"
 "\n"
 msgstr ""
-"Afficher à répétition une ligne de caractères avec toutes les chaînes "
-"STRING\n"
-"indiquées, ou « y ».\n"
+"Afficher à répétition une ligne de caractères avec toutes les CHAÎNEs\n"
+"indiquées ou « y ».\n"
+
+#~ msgid "cannot create pipe"
+#~ msgstr "impossible de créer un tube (« pipe »)"
+
+#~ msgid "%s subprocess failed"
+#~ msgstr "échec du sous-processus %s"
+
+#~ msgid "_open_osfhandle failed"
+#~ msgstr "échec de _open_osfhandle"
+
+#~ msgid "cannot restore fd %d: dup2 failed"
+#~ msgstr ""
+#~ "impossible de restaurer le descripteur de fichier (fd) %d : échec de dup2"
+
+#~ msgid "%s subprocess"
+#~ msgstr "sous-processus %s"
+
+#~ msgid "%s subprocess got fatal signal %d"
+#~ msgstr "le sous-processus %s a reçu un signal fatal %d"
+
+#~ msgid "failed to set additional groups"
+#~ msgstr "impossible de définir des groupes supplémentaires"
+
+#~ msgid "mount point %s already traversed"
+#~ msgstr "Point de montage %s déjà traversé"
+
+#~ msgid "%s: cannot lseek back to original position"
+#~ msgstr ""
+#~ "%s : impossible d'utiliser lseek pour revenir à la position d'origine"
+
+#~ msgid "%s: failed to reset file pointer"
+#~ msgstr "%s : impossible de réinitialiser le pointeur de fichier"
+
+#~ msgid "cannot reposition file pointer for %s"
+#~ msgstr "impossible de repositionner le pointeur de fichier pour %s"
+
+#~ msgid ""
+#~ "  -Z, --context[=CTX]  set the SELinux security context of each NAME to\n"
+#~ "                         default type, or CTX if specified\n"
+#~ msgstr ""
+#~ "  -Z, --context[=CTX]  définir le contexte de sécurité SELinux de chaque "
+#~ "NAME\n"
+#~ "                         au type par défaut ou à CTX si indiqué\n"
+
+#~ msgid ""
+#~ "  -Z, --context[=CTX]  set the SELinux security context of NAME to\n"
+#~ "                         default type, or to CTX if specified\n"
+#~ msgstr ""
+#~ "  -Z, --context[=CTX]  définir le contexte de sécurité SELinux de NAME\n"
+#~ "                         au type par défaut ou à CTX si indiqué\n"
+
+#~ msgid "out of memory (requested %zu bytes)"
+#~ msgstr "plus de mémoire (%zu octets demandés)"
+
+#~ msgid "--padding cannot be combined with --format"
+#~ msgstr "--padding ne peut pas être combiné avec --format"
+
+#~ msgid ""
+#~ "Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
+#~ "  or:  %s LONG-OPTION\n"
+#~ msgstr ""
+#~ "Utilisation : %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
+#~ "         ou : %s LONG-OPTION\n"
+
+#~ msgid ""
+#~ "Drop any supplemental groups, assume the user-ID and group-ID of the "
+#~ "specified\n"
+#~ "USER (numeric ID or user name), and run COMMAND with any specified "
+#~ "ARGUMENTs.\n"
+#~ "Exit with status 111 if unable to assume the required user and group ID.\n"
+#~ "Otherwise, exit with the exit status of COMMAND.\n"
+#~ "This program is useful only when run by root (user ID zero).\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Éliminer tous les groupes supplémentaires, utiliser l'UID et le GID de "
+#~ "l'USER\n"
+#~ "indiqué (identifiant numérique ou nom) et exécuter COMMAND avec les\n"
+#~ "ARGUMENTs indiqués.\n"
+#~ "Quitter avec l'état 111 s'il est impossible d'obtenir les UID et GID.\n"
+#~ "Autrement, quitter avec l'état de sortie de COMMAND.\n"
+#~ "Ce programme est utile lorsqu'il est exécuté par le superutilisateur (UID "
+#~ "zéro).\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, "
+#~ "and\n"
+#~ "                      (if specified) supplemental group IDs to GID1, ...\n"
+#~ msgstr ""
+#~ "  -g GID[,GID1...]  définir aussi le GID primaire au GID numérique et\n"
+#~ "                      (si indiqués) les GID supplémentaires à GID1, ...\n"
+
+#~ msgid "unknown user-ID: %s"
+#~ msgstr "UID inconnu : %s"
+
+#~ msgid "to use user-ID %s you need to use -g too"
+#~ msgstr "pour utiliser l'UID %s, vous devez aussi utiliser -g"
+
+#~ msgid "cannot set group-ID to %lu"
+#~ msgstr "impossible de définir le GID à %lu"
+
+#~ msgid "cannot set user-ID to %lu"
+#~ msgstr "impossible de définir l'UID à %lu"
+
+#~ msgid "failed to get file system create context"
+#~ msgstr "impossible d'obtenir le contexte de création du système de fichiers"
+
+#~ msgid "warning: "
+#~ msgstr "avertissement : "
+
+#~ msgid "long option '--megabytes' is deprecated and will soon be removed"
+#~ msgstr ""
+#~ "l'option longue « --megabytes » est obsolète et sera bientôt supprimée"
+
+#~ msgid "Usage: %s [OPTION]... [USERNAME]\n"
+#~ msgstr "Utilisation : %s [OPTION]... [USERNAME]\n"
+
+#~ msgid ""
+#~ "      --strict         with --check, exit non-zero for any invalid input\n"
+#~ msgstr ""
+#~ "      --strict         avec --check, quitter avec un code de retour non "
+#~ "nul pour\n"
+#~ "                         toute entrée incorrecte\n"
+
+#~ msgid "failed to redirect stderr to /dev/null"
+#~ msgstr "impossible de rediriger la sortie d'erreur standard vers /dev/null"
+
+#~ msgid "invalid number: '%s'"
+#~ msgstr "nombre incorrect : « %s »"
+
+#~ msgid ""
+#~ "\n"
+#~ "With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Sans FILE, ou quand FILE est -, lire l'entrée standard. « -F / » par "
+#~ "défaut.\n"
+
+#~ msgid "cannot remove directory: %s"
+#~ msgstr "impossible de supprimer le répertoire : %s"
+
+#~ msgid "dup2 failed"
+#~ msgstr "échec de dup2"
+
+#~ msgid "couldn't execute %s"
+#~ msgstr "impossible d'exécuter %s"
+
+#~ msgid "couldn't execute %s -d"
+#~ msgstr "impossible d'exécuter %s -d"
+
+#~ msgid ""
+#~ "\n"
+#~ "Report %s bugs to %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Signalez les anomalies de « %s » à <%s>\n"
+
+#~ msgid "warning: --retry is useful mainly when following by name"
+#~ msgstr ""
+#~ "avertissement : --retry est principalement utile s'il est suivi par un nom"
 
 #~ msgid "using single-precision arithmetic"
 #~ msgstr "utilisation d'arithmétique à précision simple"
diff --git a/po/ga.gmo b/po/ga.gmo
index 2d98a385..8febefae 100644
--- a/po/ga.gmo
+++ b/po/ga.gmo
diff --git a/po/ga.po b/po/ga.po
index 3001f3ba..421c9552 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: coreutils 6.12\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
 "PO-Revision-Date: 2008-06-01 12:24-0500\n"
 "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -36,78 +36,126 @@ msgstr "Na hargóintí bailí:"
 msgid "error closing file"
 msgstr "earráid agus comhad á dhúnadh"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "earráid sa scríobh"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "ceadanna ar %s á gcaomhnú"
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "Earráid chórais anaithnid"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "gnáthchomhad folamh"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "gnáthchomhad"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "comhadlann"
 
-#: lib/file-type.c:44
-msgid "block special file"
-msgstr "comhad speisialta den chineál `bloc'"
-
-#: lib/file-type.c:47
-msgid "character special file"
-msgstr "comhad speisialta den chineál `carachtar'"
-
-# `TITA' ?! -KPS
-#: lib/file-type.c:50
-msgid "fifo"
-msgstr "fifo"
-
-#: lib/file-type.c:53
+#: lib/file-type.c:46
 msgid "symbolic link"
 msgstr "nasc siombalach"
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "soicéad"
-
-#: lib/file-type.c:59
+#: lib/file-type.c:52
 msgid "message queue"
 msgstr "ciú teachtaireachta"
 
-#: lib/file-type.c:62
+#: lib/file-type.c:55
 msgid "semaphore"
 msgstr "séamafór"
 
 # FARF --KPS
-#: lib/file-type.c:65
+#: lib/file-type.c:58
 msgid "shared memory object"
 msgstr "comhad comhchuimhne"
 
-#: lib/file-type.c:68
+#: lib/file-type.c:61
 msgid "typed memory object"
 msgstr "comhad cuimhne le cineál"
 
-#: lib/file-type.c:70
+#: lib/file-type.c:66
+msgid "block special file"
+msgstr "comhad speisialta den chineál `bloc'"
+
+#: lib/file-type.c:69
+msgid "character special file"
+msgstr "comhad speisialta den chineál `carachtar'"
+
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr ""
+
+# `TITA' ?! -KPS
+#: lib/file-type.c:75
+msgid "fifo"
+msgstr "fifo"
+
+#: lib/file-type.c:78
+msgid "door"
+msgstr ""
+
+#: lib/file-type.c:81
+#, fuzzy
+msgid "multiplexed block special file"
+msgstr "comhad speisialta den chineál `bloc'"
+
+#: lib/file-type.c:84
+#, fuzzy
+msgid "multiplexed character special file"
+msgstr "comhad speisialta den chineál `carachtar'"
+
+#: lib/file-type.c:87
+#, fuzzy
+msgid "multiplexed file"
+msgstr "il-rólanna"
+
+#: lib/file-type.c:90
+#, fuzzy
+msgid "named file"
+msgstr "comhad aisteach"
+
+#: lib/file-type.c:93
+#, fuzzy
+msgid "network special file"
+msgstr "comhad speisialta den chineál `bloc'"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr ""
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr ""
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr ""
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "soicéad"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr ""
+
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "comhad aisteach"
 
@@ -242,18 +290,18 @@ msgstr "%s: ní cheadaítear argóint i ndiaidh na rogha `-W %s'\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: tá argóint de dhíth i ndiaidh na rogha `%s'\n"
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr "ní féidir na ceadanna de %s a athrú"
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "ní féidir comhadlann %s a chruthú"
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr "cuimhne ídithe"
@@ -370,7 +418,7 @@ msgstr "Slonn ionadaíochta rómhor"
 msgid "Unmatched ) or \\)"
 msgstr ") nó \\) corr"
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 msgid "No previous regular expression"
 msgstr "Ní raibh slonn ionadaíochta roimhe seo"
 
@@ -397,7 +445,7 @@ msgstr "bain úsáid as --no-preserve-root chun na cosanta seo a shárú"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[yYiIsS]"
 
@@ -408,11 +456,11 @@ msgstr "^[yYiIsS]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, c-format
 msgid "setting permissions for %s"
 msgstr "ceadanna ar %s á socrú"
@@ -559,18 +607,6 @@ msgstr "theip ar oscailt"
 msgid "Resource lost"
 msgstr ""
 
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, fuzzy, c-format
-msgid "cannot create pipe"
-msgstr "ní féidir an `fifo' %s a chruthú"
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, fuzzy, c-format
-msgid "%s subprocess failed"
-msgstr "%s: níorbh fhéidir `seek' a dhéanamh"
-
 #: lib/strsignal.c:114
 #, fuzzy, c-format
 msgid "Real-time signal %d"
@@ -782,7 +818,7 @@ msgstr ""
 "\n"
 "Seol tuairiscí fabhtanna chuig <%s>.\n"
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr ""
@@ -792,30 +828,10 @@ msgstr ""
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr ""
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr ""
 
-#: lib/w32spawn.h:43
-#, fuzzy, c-format
-msgid "_open_osfhandle failed"
-msgstr "theip ar oscailt"
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr ""
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr ""
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr ""
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr ""
@@ -838,7 +854,7 @@ msgstr "Earráid chórais anaithnid"
 msgid "failed to reopen %s with mode %s"
 msgstr "theip ar %s a bhaint"
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr "theip ar chomparáid idir teaghráin"
@@ -899,7 +915,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -923,48 +939,47 @@ msgstr ""
 "iarracht a dhéanamh teacht slán ó charachtair neamhaibítreacha eile sa\n"
 "sruth ionchódaithe.\n"
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "earráid sa léamh"
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, c-format
 msgid "invalid input"
 msgstr "ionchur neamhbhailí"
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, c-format
 msgid "invalid wrap size: %s"
 msgstr "méid neamhbhailí timfhillte: %s"
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, c-format
 msgid "extra operand %s"
 msgstr "oibreann breise %s"
 
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, c-format
 msgid "closing standard input"
 msgstr "gnáth-ionchur á dhúnadh"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -995,8 +1010,8 @@ msgstr ""
 #: src/basename.c:60
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/basename.c:67
@@ -1011,32 +1026,31 @@ msgid ""
 msgstr ""
 
 # plural above under cp.c -KPS
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, c-format
 msgid "missing operand"
 msgstr "oibreann ar iarraidh"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr "Torbjorn Granlund"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 msgid "Richard M. Stallman"
 msgstr "Richard M. Stallman"
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1093,7 +1107,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr "ní féidir ioctl a dhéanamh ar %s"
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr "gnáth-aschur"
@@ -1110,14 +1124,14 @@ msgstr "Russell Coker"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 msgid "Jim Meyering"
 msgstr "Jim Meyering"
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, c-format
 msgid "failed to create security context: %s"
 msgstr "theip ar chomhthéacs slándála a chruthú: %s"
@@ -1127,8 +1141,8 @@ msgstr "theip ar chomhthéacs slándála a chruthú: %s"
 msgid "failed to set %s security context component to %s"
 msgstr "theip ar chomhpháirt chomhthéacs slándála %s a shocrú mar %s"
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, c-format
 msgid "failed to get security context of %s"
 msgstr "níorbh fhéidir comhthéacs slándála de %s a fháil"
@@ -1139,18 +1153,18 @@ msgid "can't apply partial context to unlabeled file %s"
 msgstr ""
 "ní féidir comhthéacs neamhiomlán a chur i bhfeidhm ar chomhad gan lipéad %s"
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, c-format
 msgid "failed to change context of %s to %s"
 msgstr "theip ar chomhthéacs de %s a athrú go %s"
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
 msgstr "ní féidir %s a rochtain"
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, c-format
 msgid "cannot read directory %s"
 msgstr "ní féidir comhadlann %s a léamh"
@@ -1160,13 +1174,14 @@ msgstr "ní féidir comhadlann %s a léamh"
 msgid "changing security context of %s\n"
 msgstr "comhthéacs slándála de %s á athrú"
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, c-format
 msgid "fts_read failed"
 msgstr "theip ar fts_read"
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, fuzzy, c-format
 msgid "fts_close failed"
 msgstr "theip ar dhúnadh"
@@ -1186,7 +1201,7 @@ msgstr ""
 #: src/chcon.c:357
 #, fuzzy
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
@@ -1200,12 +1215,21 @@ msgstr ""
 "                           chomhaid tagartha\n"
 
 #: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94
+#, fuzzy
 msgid ""
 "      --dereference      affect the referent of each symbolic link (this is\n"
 "                         the default), rather than the symbolic link itself\n"
 "  -h, --no-dereference   affect symbolic links instead of any referenced "
 "file\n"
 msgstr ""
+"Athraigh an comhthéacs slándála de gach COMHAD go COMHTHÉACS.\n"
+"Le --reference, athraigh an comhthéacs slándála de gach COMHAD go dtí an "
+"comhthéacs de TCOMHAD.\n"
+"\n"
+"  -c, --changes          cosúil le `verbose' ach tabhair tuairisc nuair a\n"
+"                           athraítear rud éigin amháin\n"
+"  -h, --no-dereference   téigh i bhfeidhm ar naisc shiombalacha in ionad an\n"
+"                           chomhaid tagartha\n"
 
 #: src/chcon.c:369
 #, fuzzy
@@ -1221,7 +1245,7 @@ msgstr ""
 "  -l, --range=RAON       socraigh RAON sa chomhthéacs sprice slándála\n"
 "\n"
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 #, fuzzy
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
@@ -1278,36 +1302,37 @@ msgstr ""
 "  -P                     ná lean aon nasc siombalach (réamhshocrú)\n"
 "\n"
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr "tá gá le ceann de -H nó -L leis na roghanna -R --dereference"
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr "tá gá le -P leis na roghanna -R -h"
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, c-format
 msgid "missing operand after %s"
 msgstr "oibreann ar iarraidh i ndiaidh %s"
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, c-format
 msgid "invalid context: %s"
 msgstr "comhthéacs neamhbhailí: %s"
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr "sonraitheoirí contrártha um chomhthéacs slándála"
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, c-format
 msgid "failed to get attributes of %s"
 msgstr "níorbh fhéidir na saintréithe de %s a rochtain"
@@ -1327,22 +1352,13 @@ msgstr ""
 "  nó:  %s [ROGHA]... --reference=TCOMHAD COMHAD...\n"
 
 #: src/chgrp.c:113
-#, fuzzy
 msgid ""
 "Change the group of each FILE to GROUP.\n"
 "With --reference, change the group of each FILE to that of RFILE.\n"
 "\n"
 msgstr ""
-"Athraigh an comhthéacs slándála de gach COMHAD go COMHTHÉACS.\n"
-"Le --reference, athraigh an comhthéacs slándála de gach COMHAD go dtí an "
-"comhthéacs de TCOMHAD.\n"
-"\n"
-"  -c, --changes          cosúil le `verbose' ach tabhair tuairisc nuair a\n"
-"                           athraítear rud éigin amháin\n"
-"  -h, --no-dereference   téigh i bhfeidhm ar naisc shiombalacha in ionad an\n"
-"                           chomhaid tagartha\n"
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
@@ -1379,47 +1395,47 @@ msgstr ""
 "  %s -hR foireann /u Athraigh grúpa de /u agus a fhochomhaid go \"foireann"
 "\".\n"
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
 msgstr "saintréithe nua de %s á bhfáil"
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr "níor athraíodh nasc siombalach %s ná a thagrán\n"
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, fuzzy, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr "rinneadh athrú ar mhód %s go %04lo (%s)\n"
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, fuzzy, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr "níorbh fhéidir an mód de %s a athrú go %04lo (%s)\n"
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr "coimeádadh an mód de %s mar %04lo (%s)\n"
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr "ní féidir oibriú ar nasc siombalach %s gan sprioc"
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, c-format
 msgid "changing permissions of %s"
 msgstr "ceadanna %s á n-athrú"
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr "%s: is %s na ceadanna nua, ní %s"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1430,37 +1446,22 @@ msgstr ""
 "  nó:  %s [ROGHA]... MÓD-OCHTACH COMHAD...\n"
 "  nó:  %s [ROGHA]... --reference=TCOMHAD COMHAD...\n"
 
-#: src/chmod.c:377
-#, fuzzy
+#: src/chmod.c:380
 msgid ""
 "Change the mode of each FILE to MODE.\n"
 "With --reference, change the mode of each FILE to that of RFILE.\n"
 "\n"
 msgstr ""
-"Athraigh an comhthéacs slándála de gach COMHAD go COMHTHÉACS.\n"
-"Le --reference, athraigh an comhthéacs slándála de gach COMHAD go dtí an "
-"comhthéacs de TCOMHAD.\n"
-"\n"
-"  -c, --changes          cosúil le `verbose' ach tabhair tuairisc nuair a\n"
-"                           athraítear rud éigin amháin\n"
-"  -h, --no-dereference   téigh i bhfeidhm ar naisc shiombalacha in ionad an\n"
-"                           chomhaid tagartha\n"
 
-#: src/chmod.c:391
-#, fuzzy
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
-"      --reference=TCOMHAD bain úsáid as an gcomhthéacs slándála atá ag "
-"TCOMHAD\n"
-"                          in ionad luach COMHTHÉACS a shonrú\n"
-"  -R, --recursive         oibrigh ar chomhaid/chomhadlanna go hathchúrsach\n"
-"  -v, --verbose           taispeáin diagnóisic do gach comhad próiseáilte\n"
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr ""
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 #, fuzzy
 msgid ""
 "\n"
@@ -1469,12 +1470,12 @@ msgstr ""
 "\n"
 "Tá gach MÓD den fhoirm `[ugoa]*([-+=]([rwxXst]*|[ugo]))+'.\n"
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr "ní féidir rogha mhóid a chumasc leis an rogha --reference"
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, c-format
 msgid "invalid mode: %s"
 msgstr "mód neamhbhailí: %s"
@@ -1625,26 +1626,21 @@ msgstr ""
 "\".\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr "Roland McGrath"
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr "grúpa neamhbhailí %s"
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, fuzzy, c-format
 msgid "invalid group list %s"
 msgstr "grúpa neamhbhailí %s"
 
-#: src/chroot.c:117
-#, fuzzy, c-format
-msgid "failed to set additional groups"
-msgstr "níorbh fhéidir an grúpa (nó na grúpaí) forlíontach a shocrú"
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
@@ -1653,7 +1649,7 @@ msgstr ""
 "Úsáid: %s ROGHA ÚS�IDEOIR ORDÚ [ARGÓINT]...\n"
 "  nó:  %s ROGHA\n"
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
@@ -1661,13 +1657,13 @@ msgstr ""
 "Rith ORDÚ leis an fhréamhchomhadlann mar FRÉAMHNUA.\n"
 "\n"
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
 msgstr ""
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 #, fuzzy
 msgid ""
 "\n"
@@ -1677,28 +1673,42 @@ msgstr ""
 "Mura bhfuil ORDÚ ann, rith ``${SHELL} -i'' (réamhshocrú: /bin/sh).\n"
 
 # in FARF --KPS
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, c-format
 msgid "cannot change root directory to %s"
 msgstr "ní féidir an fhréamhchomhadlann a athrú go %s"
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, c-format
 msgid "cannot chdir to root directory"
 msgstr "ní féidir chdir a dhéanamh go dtí an fhréamhchomhadlann"
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr ""
+
+#: src/chroot.c:383
+#, fuzzy, c-format
+msgid "failed to get supplemental groups"
+msgstr "níorbh fhéidir an grúpa (nó na grúpaí) forlíontach a shocrú"
+
+#: src/chroot.c:395
+#, fuzzy, c-format
+msgid "failed to %s supplemental groups"
+msgstr "níorbh fhéidir an grúpa (nó na grúpaí) forlíontach a shocrú"
+
+#: src/chroot.c:402
 #, fuzzy, c-format
 msgid "failed to set group-ID"
 msgstr "theip ar ról nua %s a shocrú"
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, fuzzy, c-format
 msgid "failed to set user-ID"
 msgstr "níorbh fhéidir úsáideoir nua %s a shocrú"
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, fuzzy, c-format
 msgid "failed to run command %s"
 msgstr "ní féidir ordú %s a rith"
@@ -1730,7 +1740,7 @@ msgstr ""
 "Taispeáin suim sheiceála CRC agus líon bearta di gach COMHAD.\n"
 "\n"
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr "Úsáid: %s [ROGHA]... COMHAD1 COMHAD2\n"
@@ -1816,302 +1826,336 @@ msgstr "sonraíodh roghanna -i iomadúla"
 msgid "empty %s not allowed"
 msgstr ""
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr "earráid agus %s á léamh"
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, c-format
 msgid "cannot lseek %s"
 msgstr "ní féidir %s a `lseek'"
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr "earráid agus %s á scríobh"
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, fuzzy, c-format
 msgid "%s: failed to get extents info"
 msgstr "níorbh fhéidir an comhthéacs reatha a fháil"
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, fuzzy, c-format
 msgid "%s: write failed"
 msgstr "theip ar scríobh"
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, fuzzy, c-format
 msgid "failed to extend %s"
 msgstr "Ní féidir %s a oscailt"
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, c-format
 msgid "clearing permissions for %s"
 msgstr "ceadanna ar %s á nglanadh"
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "níorbh fhéidir an úinéireacht de %s a chaomhnú"
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
 msgstr "theip ar luchtú an chomhaid %s"
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, c-format
 msgid "failed to preserve authorship for %s"
 msgstr "níorbh fhéidir an t-údar de %s a chaomhnú"
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
+#, c-format
+msgid "failed to set default file creation context to %s"
+msgstr ""
+"níorbh fhéidir an comhthéacs réamhshocraithe cruthaithe comhad a shocrú go %s"
+
+#: src/copy.c:820
+#, fuzzy, c-format
+msgid "failed to set default file creation context for %s"
+msgstr ""
+"níorbh fhéidir an comhthéacs réamhshocraithe cruthaithe comhad a shocrú go %s"
+
+#: src/copy.c:846
+#, fuzzy, c-format
+msgid "failed to set the security context of %s"
+msgstr "theip ar an gcomhthéacs slándála de %s a athrú go %s"
+
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
 msgid "cannot open %s for reading"
 msgstr "ní féidir %s a oscailt chun léamh"
 
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, c-format
 msgid "cannot fstat %s"
 msgstr "ní féidir %s a `fstat'"
 
-#: src/copy.c:820
+#: src/copy.c:935
 #, c-format
 msgid "skipping file %s, as it was replaced while being copied"
 msgstr "ag gabháil thar an chomhad %s; bhí sé curtha as áit agus á chóipeáil"
 
-#: src/copy.c:850
-#, c-format
-msgid "failed to get file system create context"
-msgstr "níorbh fhéidir comhthéacs chruthú an chórais comhad a fháil"
-
-#: src/copy.c:864
-#, c-format
-msgid "failed to set the security context of %s to %s"
-msgstr "theip ar an gcomhthéacs slándála de %s a athrú go %s"
-
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
 msgid "cannot remove %s"
 msgstr "ní féidir %s a scriosadh"
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
 msgstr "%s scriosta\n"
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr "ní scríobhfar trí nasc siombalach %s gan sprioc"
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, c-format
 msgid "cannot create regular file %s"
 msgstr "ní féidir gnáthchomhad %s a chruthú"
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, fuzzy, c-format
 msgid "failed to clone %s from %s"
 msgstr "theip ar dhúnadh comhadlann %s"
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr "amanna á gcaomhnú le haghaidh %s"
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
 #, fuzzy, c-format
 msgid "failed to close %s"
 msgstr "Ní féidir %s a oscailt"
 
-#: src/copy.c:1471
-#, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
+#: src/copy.c:1580
+#, fuzzy, c-format
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
 msgstr "%s: déan iarracht ar %s a fhorscríobh, agus mód %04lo (%s) a shárú? "
 
-#: src/copy.c:1478
+#: src/copy.c:1581
+#, c-format
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr ""
+
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
 msgstr "%s: forscríobh %s? "
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr " (cúltaca: %s)"
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr ""
 "níorbh fhéidir an comhthéacs réamhshocraithe cruthaithe comhad a athchóiriú"
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, c-format
 msgid "cannot create hard link %s to %s"
 msgstr "ní féidir nasc crua %s a chruthú go dtí %s"
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, c-format
 msgid "cannot stat %s"
 msgstr "ní féidir %s a `stat'"
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, c-format
 msgid "omitting directory %s"
 msgstr "comhadlann %s á fágáil ar lár"
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr "rabhadh: comhad foinse %s tugtha níos mó ná uair amháin"
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
 msgstr "is iad %s agus %s an comhad céanna"
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr ""
 "ní féidir forscríobh a dhéanamh ar %s (ní comhadlann é) le %s (comhadlann)"
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr "diúltaíodh forscríobh ar an chomhad nua %s le %s"
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr "ní féidir forscríobh a dhéanamh ar %s (comhadlann) le gnáthchomhad"
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr "ní féidir comhadlann a aistriú go dtí gnáthchomhad: %s -> %s"
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr "léirscriosfadh cúltaca de %s an comhad foinse;  níor aistríodh %s"
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr "léirscriosfadh cúltaca de %s an comhad foinse;  níor cóipeáladh %s"
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
 msgstr "ní féidir cúltaca a dhéanamh ar %s"
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr "ní chóipeálfar %s trí nasc siombalach %s a cruthaíodh anois beag"
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr ""
 "ní féidir an chomhadlann %s a chóipeáil isteach sa chomhadlann féin, %s"
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr "ní chruthófar nasc crua %s go dtí comhadlann %s"
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr ""
 "ní féidir an chomhadlann %s a aistriú go dtí fochomhadlann dá chuid féin, %s"
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, c-format
 msgid "cannot move %s to %s"
 msgstr "ní féidir %s a aistriú go %s"
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr ""
 "aistriú idir gléasanna teipthe: %s go %s; ní féidir an sprioc a scriosadh"
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, c-format
-msgid "failed to set default file creation context to %s"
-msgstr ""
-"níorbh fhéidir an comhthéacs réamhshocraithe cruthaithe comhad a shocrú go %s"
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr "ní féidir nasc siombalach ciorclach %s a chóipeáil"
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr ""
 "%s: ní foláir naisc shiombalacha coibhneasta a dhéanamh sa chomhadlann oibre"
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr "ní féidir nasc siombalach a dhéanamh ó %s go %s"
 
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, c-format
 msgid "cannot create fifo %s"
 msgstr "ní féidir an `fifo' %s a chruthú"
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, c-format
 msgid "cannot create special file %s"
 msgstr "ní féidir comhad speisialta %s a chruthú"
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, c-format
 msgid "cannot read symbolic link %s"
 msgstr "ní féidir nasc siombalach %s a léamh"
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, c-format
 msgid "cannot create symbolic link %s"
 msgstr "ní féidir an nasc siombalach %s a chruthú"
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
 msgstr "tá %s de chineál anaithnid"
 
 # bad coinage --KPS
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, c-format
 msgid "cannot un-backup %s"
 msgstr "ní féidir dí-chúltaca a dhéanamh ar %s"
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr "%s -> %s (dí-chúltaca)\n"
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr ""
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr ""
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, fuzzy, c-format
+msgid "unknown program %s"
+msgstr "Aitheantas úsáideora anaithnid: %s"
+
+#: src/cp.c:157 src/mv.c:288
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -2122,14 +2166,14 @@ msgstr ""
 "  nó:  %s [ROGHA]... FOINSE... COMHADLANN\n"
 "  nó:  %s [ROGHA]... -t COMHADLANN FOINSE...\n"
 
-#: src/cp.c:162
+#: src/cp.c:163
 #, fuzzy
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 "Cóipeáil FOINSE go SPRIOC, nó FOINSE/� go COMHADLANN.\n"
 "\n"
 
-#: src/cp.c:168
+#: src/cp.c:169
 #, fuzzy
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
@@ -2150,7 +2194,7 @@ msgstr ""
 "                                  más athchúrsach é\n"
 "  -d                           == `--no-dereference --preserve=links'\n"
 
-#: src/cp.c:177
+#: src/cp.c:178
 #, fuzzy
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
@@ -2169,7 +2213,7 @@ msgstr ""
 "  -H                           lean naisc shiombalacha ar líne na n-"
 "orduithe\n"
 
-#: src/cp.c:186
+#: src/cp.c:187
 #, fuzzy
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
@@ -2178,7 +2222,7 @@ msgstr ""
 "  -l, --link                   nasc comhaid in ionad iad a chóipeáil\n"
 "  -L, --dereference            lean naisc shiombalacha i FOINSE i gcónaí\n"
 
-#: src/cp.c:190
+#: src/cp.c:191
 #, fuzzy
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
@@ -2191,7 +2235,7 @@ msgstr ""
 "  -H                           lean naisc shiombalacha ar líne na n-"
 "orduithe\n"
 
-#: src/cp.c:195
+#: src/cp.c:196
 #, fuzzy
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
@@ -2206,7 +2250,7 @@ msgstr ""
 "                                 mode,ownership,timestamps), más féidir\n"
 "                                 tréithe eile: context, links, all\n"
 
-#: src/cp.c:203
+#: src/cp.c:204
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                use full source file name under DIRECTORY\n"
@@ -2214,7 +2258,7 @@ msgstr ""
 "      --no-preserve=TRÉITHE    ná caomhnaigh na tréithe ceaptha\n"
 "      --parents                úsáid ainm lán an chomhaid faoi CHOMHADLANN\n"
 
-#: src/cp.c:207
+#: src/cp.c:208
 #, fuzzy
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
@@ -2227,7 +2271,7 @@ msgstr ""
 "      --remove-destination     scrios gach sprioc-chomhad atá ann roimh\n"
 "                                 oscailt (i gcodarsnacht le `--force')\n"
 
-#: src/cp.c:213
+#: src/cp.c:214
 #, fuzzy
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
@@ -2240,7 +2284,7 @@ msgstr ""
 "argóint\n"
 "                                 FOINSE\n"
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -2253,7 +2297,7 @@ msgstr ""
 "  -t, --target-directory=COMHADLANN cóipeáil gach FOINSE go dtí COMHADLANN\n"
 "  -T, --no-target-directory    caith le SPRIOC mar ghnáthchomhad\n"
 
-#: src/cp.c:224
+#: src/cp.c:225
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
 "                                 than the destination file or when the\n"
@@ -2268,7 +2312,15 @@ msgstr ""
 "  -v, --verbose                mínigh na rudaí atá ag tarlú\n"
 "  -x, --one-file-system        fan ar an chóras chomhaid seo\n"
 
-#: src/cp.c:233
+#: src/cp.c:232
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/cp.c:240
 #, fuzzy
 msgid ""
 "\n"
@@ -2294,7 +2346,7 @@ msgstr ""
 "Bain úsáid as `--sparse=never' chun an cruthú de chomhaid thanaí a chosc.\n"
 "\n"
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 #, fuzzy
 msgid ""
 "\n"
@@ -2311,7 +2363,7 @@ msgstr ""
 "thimpeallachta VERSION_CONTROL.  Seo duit na luachanna bailí:\n"
 "\n"
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2323,7 +2375,7 @@ msgstr ""
 "  existing, nil   numbered má tá uimhreacha orthu anois, simple mura bhfuil\n"
 "  simple, never   déan cúltacaí simplí i gcónaí\n"
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2336,224 +2388,236 @@ msgstr ""
 "agus\n"
 "SPRIOC ar ghnáthchomhad atá ann.\n"
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, c-format
 msgid "failed to preserve times for %s"
 msgstr "níorbh fhéidir amanna a chaomhnú ar %s"
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, c-format
 msgid "failed to preserve permissions for %s"
 msgstr "níorbh fhéidir ceadanna a chaomhnú ar %s"
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, c-format
 msgid "cannot make directory %s"
 msgstr "ní féidir an chomhadlann %s a chruthú"
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr "Tá %s ann cheana, ach ní comhadlann é"
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
 #, fuzzy, c-format
 msgid "failed to access %s"
 msgstr "Ní féidir %s a oscailt"
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, c-format
 msgid "missing file operand"
 msgstr "oibreann comhaid ar iarraidh"
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, c-format
 msgid "missing destination file operand after %s"
 msgstr "oibreann sprioc-chomhaid ar iarraidh i ndiaidh %s"
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, fuzzy, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr ""
 "Ní féidir --target-directory (-t) agus --no-target-directory (-T) a úsáid "
 "lena chéile"
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, c-format
 msgid "target %s is not a directory"
 msgstr "ní comhadlann é an sprioc-chomhad %s"
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr "le --parents, caithfidh an sprioc-chomhad a bheith ina chomhadlann"
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, c-format
 msgid "multiple target directories specified"
 msgstr "sonraíodh sprioc-chomhadlanna iomadúla"
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, fuzzy, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr ""
+"Rabhadh: ag déanamh neamhaird de --context (-Z); níl an eithne seo "
+"cumasaithe do SELinux."
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr "ní féidir nasc crua agus nasc siombalach araon a dhéanamh"
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, fuzzy, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr "is comheisiatach iad na roghanna --string agus --check"
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr ""
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr "cineál cúltaca"
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, fuzzy, c-format
+msgid "cannot set target context and preserve it"
+msgstr "ní féidir cur iallach ar chomhthéacs sprice %s agus é a chaomhnú"
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr ""
 "ní féidir an comhthéacs slándála a chaomhnú gan eithne atá cumasaithe do "
 "SELinux"
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr "Stuart Kemp"
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr "ionchur imithe"
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr "%s: líne-uimhir as raon"
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, c-format
 msgid "%s: %s: line number out of range"
 msgstr "%s: %s: líne-uimhir as raon"
 
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, c-format
 msgid " on repetition %s\n"
 msgstr " le linn timthriall %s\n"
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, c-format
 msgid "%s: %s: match not found"
 msgstr "%s: %s: níl a leithéid ann"
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr "earráid le linn cuardaigh ar shlonn ionadaíochta"
 
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, c-format
 msgid "write error for %s"
 msgstr "earráid sa scríobh le haghaidh %s"
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, c-format
 msgid "%s: integer expected after delimiter"
 msgstr "%s: bhíothas ag súil le slánuimhir i ndiaidh teormharcóra"
 
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, fuzzy, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr "%s: tá gá le `}' i líon na hathráite"
 
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, fuzzy, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr "%s}: tá gá le slánuimhir idir `{' agus `}'"
 
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, fuzzy, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr "%s: teormharcóir foirceanta `%c' ar iarraidh"
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr "%s: slonn ionadaíochta neamhbhailí: %s"
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr "%s: patrún neamhbhailí"
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr "%s: ní foláir líne-uimhir dheimhneach"
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr "líne-uimhir %s níos lú ná an líne-uimhir roimpi, %s"
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr "rabhadh: is ionann líne-uimhir %s agus an líne-uimhir roimpi"
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr "tá sonraitheoir tiontaithe ar iarraidh in iarmhír"
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr "sonraitheoir tiontaithe neamhbhailí in iarmhír: %c"
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr "sonraitheoir tiontaithe neamhbhailí in iarmhír: \\%.3o"
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, fuzzy, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr "%.*s: tiontú neamhbhailí"
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr "an iomarca sonraitheoirí tiontaithe %% in iarmhír"
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr "sonraitheoir tiontaithe %% ar iarraidh in iarmhír"
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr "%s: uimhir neamhbhailí"
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr "Úsáid: %s [ROGHA]... COMHAD PATRÚN...\n"
 
-#: src/csplit.c:1455
+#: src/csplit.c:1483
 #, fuzzy
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
@@ -2564,7 +2628,7 @@ msgstr ""
 "agus taispeáin líon na mbeart i ngach píosa ar an gnáth-aschur.\n"
 "\n"
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, fuzzy, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2575,7 +2639,11 @@ msgstr ""
 "  -f, --prefix=RÉIM�R         bain úsáid as RÉIM�R in ionad `xx'\n"
 "  -k, --keep-files            ná scrios aschomhaid tar éis earráidí\n"
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr ""
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
@@ -2585,7 +2653,7 @@ msgstr ""
 "  -s, --quiet, --silent       ná taispeáin líonta na mbeart in aschomhaid\n"
 "  -z, --elide-empty-files     scrios aschomhaid fholmha\n"
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
@@ -2593,7 +2661,7 @@ msgstr ""
 "\n"
 "Má tá an COMHAD `-', léigh ón ghnáth-ionchur.  Is féidir PATRÚN a bheith:\n"
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 #, fuzzy
 msgid ""
 "\n"
@@ -2621,23 +2689,19 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr "David M. Ihnat"
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr "uimhrítear réimsí agus ionaid ó 1"
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr "Úsáid: %s ROGHA... [COMHAD]...\n"
 
-#: src/cut.c:193
+#: src/cut.c:176
 #, fuzzy
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr ""
 "Taispeáin codanna tofa de na línte as gach COMHAD ar an ngnáth-aschur.\n"
 "\n"
 
-#: src/cut.c:199
+#: src/cut.c:182
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
 "  -c, --characters=LIST   select only these characters\n"
@@ -2648,7 +2712,7 @@ msgstr ""
 "  -d, --delimiter=TEORAN  úsáid TEORAN in ionad TAB mar theormharcóir "
 "réimse\n"
 
-#: src/cut.c:204
+#: src/cut.c:187
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
 "                            that contains no delimiter character, unless\n"
@@ -2661,7 +2725,7 @@ msgstr ""
 "                            rogha -s tugtha\n"
 "  -n                      (gan feidhm)\n"
 
-#: src/cut.c:210
+#: src/cut.c:193
 #, fuzzy
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
@@ -2670,7 +2734,7 @@ msgstr ""
 "      --complement        inbhéartaigh na bearta, carachtair, nó réimsí\n"
 "                            roghnaithe.\n"
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
@@ -2680,7 +2744,7 @@ msgstr ""
 "      --output-delimiter=TEAGHR�N úsáid TEAGHR�N mar theormharcóir aschuir\n"
 "                            agus an teormharcóir ionchurtha mar réamhshocrú\n"
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2692,7 +2756,7 @@ msgstr ""
 "nó roinnt raonta scartha le camóga.  Scríobhann an t-ionchur roghnaithe\n"
 "san ord á léadh, agus ní scríobhtar é ach uair amháin.\n"
 
-#: src/cut.c:227
+#: src/cut.c:210
 msgid ""
 "Each range is one of:\n"
 "\n"
@@ -2712,48 +2776,52 @@ msgstr ""
 "\n"
 "Mura bhfuil COMHAD ann, nó más '-' é, léigh ón ghnáth-ionchur.\n"
 
-#: src/cut.c:367 src/cut.c:493
+#: src/cut.c:300 src/cut.c:394
 #, fuzzy
 msgid "invalid byte, character or field list"
 msgstr "liosta bearta nó réimsí neamhbhailí"
 
-#: src/cut.c:387
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr "uimhrítear réimsí agus ionaid ó 1"
+
+#: src/cut.c:320
 msgid "invalid range with no endpoint: -"
 msgstr "raon neamhbhailí gan chríoch: -"
 
-#: src/cut.c:403
+#: src/cut.c:334
 msgid "invalid decreasing range"
 msgstr "raon neamhbhailí laghdaitheach"
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, c-format
 msgid "byte offset %s is too large"
 msgstr "tá an fritháireamh birt %s rómhór"
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, c-format
 msgid "field number %s is too large"
 msgstr "tá an uimhir réimse %s rómhór"
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr "ní cheadaítear liostaí iomadúla"
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr "is gá an teormharcóir a bheith ina charachtar aonarach"
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr "ní foláir duit liosta bearta, carachtair, nó réimsí a cheapadh"
 
-#: src/cut.c:850
+#: src/cut.c:790
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr ""
 "ní cheadaítear teormharcóir a thabhairt ach nuair atáthar ag oibriú le réimsí"
 
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
@@ -2761,11 +2829,11 @@ msgstr ""
 "ní cheiltear línte gan teormharcóirí ach nuair\n"
 "\tatáthar ag oibriú le réimsí"
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr "liosta réimsí ar iarraidh"
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr "liosta ionad ar iarraidh"
 
@@ -2811,7 +2879,7 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 "      --rfc-3339=AMCHÓD     taispeáin dáta/am de réir RFC 3339.\n"
 "                            AMCHÓD=`date', `seconds', nó `ns' do dháta\n"
@@ -3024,10 +3092,10 @@ msgid ""
 "  $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n"
 msgstr ""
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr "gnáth-ionchur"
@@ -3069,7 +3137,7 @@ msgstr ""
 msgid "cannot set date"
 msgstr "ní féidir an dáta a shocrú"
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, c-format
 msgid "time %s is out of range"
 msgstr "is as raon an t-am %s"
@@ -3080,7 +3148,7 @@ msgstr "is as raon an t-am %s"
 msgid "Paul Rubin"
 msgstr "Paul Rubin"
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
@@ -3089,7 +3157,7 @@ msgstr ""
 "Úsáid: %s [OIBREANN]...\n"
 "  nó:  %s ROGHA\n"
 
-#: src/dd.c:526
+#: src/dd.c:532
 #, fuzzy
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
@@ -3108,7 +3176,7 @@ msgstr ""
 "  count=BLOIC     cóipeáil BLOIC bloc ionchurtha amháin\n"
 "  ibs=BEARTA      léigh BEARTA beart sa turas\n"
 
-#: src/dd.c:535
+#: src/dd.c:541
 #, fuzzy
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
@@ -3131,7 +3199,7 @@ msgstr ""
 "ionchuir\n"
 "  status=noxfer   ná taispeáin staitistic faoin aistriú\n"
 
-#: src/dd.c:546
+#: src/dd.c:552
 #, fuzzy
 msgid ""
 "\n"
@@ -3150,7 +3218,7 @@ msgstr ""
 "Is féidir EOCHAIRFHOCAL a bheith:\n"
 "\n"
 
-#: src/dd.c:555
+#: src/dd.c:561
 #, fuzzy
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
@@ -3179,7 +3247,7 @@ msgstr ""
 "             nuair atá `block' nó `unblock' in úsáid, stuáil le spásanna\n"
 "             in ionad carachtair NUL\n"
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -3195,7 +3263,7 @@ msgstr ""
 "  fdatasync scríobh ar an aschomhad go fisiceach roimh chríochnú\n"
 "  fsync     mar an gcéanna, ach scríobh meiteashonraí freisin\n"
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -3209,77 +3277,77 @@ msgstr ""
 "  append    mód iarcheangail (ná húsáid ach le haschur; moltar "
 "conv=notrunc)\n"
 
-#: src/dd.c:583
+#: src/dd.c:589
 #, fuzzy
 msgid "  cio       use concurrent I/O for data\n"
 msgstr "  text      úsáid I/A téacs le haghaidh sonraí\n"
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr "  direct    úsáid I/A díreach le haghaidh sonraí\n"
 
-#: src/dd.c:587
+#: src/dd.c:593
 #, fuzzy
 msgid "  directory  fail unless a directory\n"
 msgstr "  directory teip mura comhadlann é\n"
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr "  dsync     úsáid I/A sioncrónaithe le haghaidh sonraí\n"
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr "  sync      mar an gcéanna, ach le haghaidh meiteashonraí fosta\n"
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr "  nonblock  úsáid I/A gan bhacainní\n"
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr "  noatime   ná nuashonraigh an t-am rochtana\n"
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr ""
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr "  noctty    ná ceap an teirminéal rialaithe ó chomhad\n"
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr "  nofollow  ná lean naisc shiombalacha\n"
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr "  nolinks   teip má tá naisc iomadúla ann\n"
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr "  binary    úsáid I/A dénártha le haghaidh sonraí\n"
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr "  text      úsáid I/A téacs le haghaidh sonraí\n"
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr ""
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3309,7 +3377,17 @@ msgstr ""
 "Roghanna:\n"
 "\n"
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
@@ -3318,7 +3396,7 @@ msgstr ""
 "%<PRIuMAX>+%<PRIuMAX> taifead isteach\n"
 "%<PRIuMAX>+%<PRIuMAX> taifead amach\n"
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
@@ -3328,7 +3406,7 @@ msgstr[2] "%<PRIuMAX> thaifead teasctha\n"
 msgstr[3] "%<PRIuMAX> dtaifead teasctha\n"
 msgstr[4] "%<PRIuMAX> taifead teasctha\n"
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
@@ -3338,7 +3416,7 @@ msgstr[2] "cóipeáladh %<PRIuMAX> bheart (%s)"
 msgstr[3] "cóipeáladh %<PRIuMAX> mbeart (%s)"
 msgstr[4] "cóipeáladh %<PRIuMAX> beart (%s)"
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr "Éigríoch B"
 
@@ -3352,83 +3430,83 @@ msgstr "Éigríoch B"
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
 msgstr ", %g shoicind, %s/s\n"
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, c-format
 msgid "closing input file %s"
 msgstr "inchomhad %s á dhúnadh"
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr "aschomhad %s á dhúnadh"
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, fuzzy, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr "theip ar chdir go dtí an chomhadlann %s"
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, c-format
 msgid "writing to %s"
 msgstr "á scríobh i %s"
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, c-format
 msgid "unrecognized operand %s"
 msgstr "oibreann anaithnid %s"
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 msgid "invalid conversion"
 msgstr "tiontú neamhbhailí"
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 msgid "invalid input flag"
 msgstr "bratach neamhbhailí ionchurtha"
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 msgid "invalid output flag"
 msgstr "bratach neamhbhailí aschurtha"
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 msgid "invalid status flag"
 msgstr "bratach neamhbhailí stádais"
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, c-format
 msgid "invalid number %s"
 msgstr "uimhir neamhbhailí %s"
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr "ní féidir aon dá cheann de {ascii,ebcdic,ibm} a úsáid lena chéile"
 
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, c-format
 msgid "cannot combine block and unblock"
 msgstr "ní féidir `block' agus `unblock' a úsáid lena chéile"
 
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, c-format
 msgid "cannot combine lcase and ucase"
 msgstr "ní féidir `lcase' agus `ucase' a úsáid lena chéile"
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, c-format
 msgid "cannot combine excl and nocreat"
 msgstr "ní féidir `excl' agus `nocreat' a úsáid lena chéile"
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, fuzzy, c-format
 msgid "cannot combine direct and nocache"
 msgstr "ní féidir `excl' agus `nocreat' a úsáid lena chéile"
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
@@ -3437,72 +3515,62 @@ msgstr ""
 "rabhadh: ag seachaint fabht eithne `lseek' don chomhad (%s)\n"
 "  de mt_type=0x%0lx -- féach ar <sys/mtio.h> le haghaidh liosta cineálacha"
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, fuzzy, c-format
 msgid "%s: cannot skip"
 msgstr "%s: ní féidir seek a dhéanamh"
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, c-format
 msgid "%s: cannot seek"
 msgstr "%s: ní féidir seek a dhéanamh"
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr "fritháireamh thar maoil agus comhad %s á léamh"
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr "rabhadh: fritháireamh neamhbhailí i ndiaidh léamh teipthe"
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr "tar éis an tsaoil, ní féidir fabht san eithne a sheachaint"
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, c-format
 msgid "setting flags for %s"
 msgstr "bratacha á socraithe le haghaidh %s"
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, fuzzy, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr "%s: ní féidir bogadh go fritháireamh coibhneasta %s"
 
-#: src/dd.c:2133
+#: src/dd.c:2172
 #, fuzzy, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
 msgstr "á theascadh ag %<PRIuMAX> beart san aschomhad %s"
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr "theip ar fdatasync i gcomhair %s"
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
 msgstr "theip ar fsync i gcomhair %s"
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, c-format
 msgid "failed to open %s"
 msgstr "Ní féidir %s a oscailt"
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
@@ -3510,97 +3578,106 @@ msgid ""
 msgstr ""
 "fritháireamh rómhór: ní féidir teascadh go fad %<PRIuMAX> (%lu beart) bloc"
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, fuzzy, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr "á theascadh ag %<PRIuMAX> beart san aschomhad %s"
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, fuzzy, c-format
 msgid "failed to discard cache for: %s"
 msgstr "theip ar chdir go dtí an chomhadlann %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr "Paul Eggert"
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr "Córas comhaid"
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr "Cineál"
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr "bloc"
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr "�dithe"
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr "Ar Fáil"
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr "Úsáid%"
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr "Inóid"
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr "Iídithe"
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr "Isaor"
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr "IÚsáid%"
 
 # my coinage - cuir suas = mount in this sense --KPS
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr "Curtha suas ar"
 
-#: src/df.c:383
-#, c-format
-msgid "option --output: field '%s' unknown"
+#: src/df.c:207
+msgid "File"
 msgstr ""
 
-#: src/df.c:390
+#: src/df.c:387
 #, fuzzy, c-format
-msgid "option --output: field '%s' used more than once"
+msgid "option --output: field %s unknown"
+msgstr "aschomhad %s á dhúnadh"
+
+#: src/df.c:394
+#, fuzzy, c-format
+msgid "option --output: field %s used more than once"
 msgstr "rabhadh: comhad foinse %s tugtha níos mó ná uair amháin"
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr "Méid"
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr "ArFáil"
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr "Iomlán"
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
 msgstr ""
 
-#: src/df.c:1210
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr ""
+
+#: src/df.c:1384
 #, fuzzy
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
@@ -3610,25 +3687,20 @@ msgstr ""
 "nó faoi gach córas comhaid mar réamhshocrú.\n"
 "\n"
 
-#: src/df.c:1217
-#, fuzzy
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
-"  -a, --all             cuir córais chaocha chomhaid san áireamh\n"
-"  -B, --block-size=MÉID úsáid bloic den mhéid MÉID beart\n"
-"  -h, --human-readable  taispeáin méideanna i gcruth inléite (m.sh., 1K 2G "
-"srl)\n"
-"  -H, --si              mar an gcéanna, ach le 1K=1000, nach 1024\n"
 
-#: src/df.c:1227
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -3641,7 +3713,7 @@ msgstr ""
 "  -l, --local           ná taispeáin ach córais chomhaid logánta\n"
 "      --no-sync         ná sync roimh eolas úsáide a fháil (réamhshocrú)\n"
 
-#: src/df.c:1234
+#: src/df.c:1409
 #, fuzzy
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
@@ -3661,42 +3733,33 @@ msgstr ""
 "  -x, --exclude-type=CINE�L ná taispeáin córais chomhaid den chineál CINE�L\n"
 "  -v                    (gan feidhm)\n"
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
 
-#: src/df.c:1285
+#: src/df.c:1460
 #, fuzzy, c-format
 msgid "options %s and %s are mutually exclusive"
-msgstr "is comheisiatach iad na roghanna chun dátaí a cheapadh le priontáil"
-
-#: src/df.c:1335
-#, fuzzy
-msgid "warning: "
-msgstr "Rabhadh: "
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr ""
+msgstr "is comheisiatach iad na roghanna --string agus --check"
 
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr "Tá an cineál %s roghnaithe agus fágtha as"
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr "Rabhadh: "
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 msgid "cannot read table of mounted file systems"
 msgstr "ní féidir an tábla de chórais chomhad feistithe a léamh"
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr "níor próiseáladh aon chórais chomhaid"
@@ -3706,7 +3769,7 @@ msgstr "níor próiseáladh aon chórais chomhaid"
 msgid "H. Peter Anvin"
 msgstr "H. Peter Anvin"
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr "Úsáid: %s [ROGHA]... [COMHAD]\n"
@@ -3798,11 +3861,11 @@ msgstr ""
 
 #: src/dirname.c:59
 #, fuzzy
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
 msgstr "  -z, --zero-terminated     úsáid NUL foirceanta in ionad líne nua\n"
 
 #: src/dirname.c:64
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Examples:\n"
@@ -3810,12 +3873,8 @@ msgid ""
 "  %s dir1/str dir2/str  -> \"dir1\" followed by \"dir2\"\n"
 "  %s stdio.h            -> \".\"\n"
 msgstr ""
-"\n"
-"Mar shampla:\n"
-"  %s /usr/bin/sort  Aschur \"/usr/bin\".\n"
-"  %s stdio.h        Aschur \".\".\n"
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -3824,18 +3883,17 @@ msgstr ""
 "Úsáid: %s [ROGHA]... [COMHAD]...\n"
 "  nó:  %s [ROGHA]... --files0-from=C\n"
 
-#: src/du.c:274
+#: src/du.c:285
 #, fuzzy
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr ""
 "Coimrigh úsáid diosca do gach COMHAD, go hathchúrsach do chomhadlanna.\n"
 "\n"
 
-#: src/du.c:280
+#: src/du.c:291
 #, fuzzy
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3852,12 +3910,12 @@ msgstr ""
 "                        i gcomhaid (`tanaí), bloghadh inmheánach, bloic\n"
 "                        indíreacha agus a leithéidí\n"
 
-#: src/du.c:289
+#: src/du.c:300
 #, fuzzy
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3868,21 +3926,30 @@ msgid ""
 "                          line argument;  --max-depth=0 is the same as\n"
 "                          --summarize\n"
 msgstr ""
-"  -B, --block-size=MÉID bain úsáid as bloic den mhéid MÉID\n"
-"  -b, --bytes           ar comhbhrí le `--apparent-size --block-size=1'\n"
-"  -c, --total           taispeáin suim iomlán\n"
-"  -D, --dereference-args  dí-thagair naisc shiombalacha a thugtar ar\n"
-"                          líne na n-orduithe amháin\n"
+"  -x, --one-file-system  fan ar an chóras chomhaid seo\n"
+"  -X COMHAD, --exclude-from=COMHAD  Ná cuir comhaid san áireamh atá\n"
+"                                     comhoiriúnach le haon phatrún i "
+"gCOMHAD.\n"
+"      --exclude=PATRÚN  Ná cuir comhaid atá comhoiriúnach le PATRÚN san "
+"áireamh\n"
+"      --max-depth=N     taispeáin iomlán do chomhadlann (nó comhad, le --"
+"all)\n"
+"                          nuair atá sé N leibhéal, ar a mhéad, faoin "
+"argóint\n"
+"                          ar líne na n-orduithe;  is ionann --max-depth=0 "
+"agus\n"
+"                          --summarize\n"
 
-#: src/du.c:302
+#: src/du.c:313
 #, fuzzy
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
 "      --files0-from=C   achoimrigh spás diosca úsáidte ag na comhaid atá\n"
 "                          ainmnithe i gcomhad C, foirceanta le NULanna\n"
@@ -3893,7 +3960,7 @@ msgstr ""
 "2G)\n"
 "      --si              cosúil le -h, ach le 1K=1000 in ionad 1024\n"
 
-#: src/du.c:310
+#: src/du.c:322
 #, fuzzy
 msgid ""
 "  -k                    like --block-size=1K\n"
@@ -3905,12 +3972,13 @@ msgstr ""
 "  -l, --count-links     cuir méid san áireamh gach uair más nasc crua é\n"
 "  -m                    ar comhbhrí le `--block-size=1M'\n"
 
-#: src/du.c:316
+#: src/du.c:328
 #, fuzzy
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
@@ -3921,7 +3989,7 @@ msgstr ""
 "  -S, --separate-dirs   ná cuir comhadlanna san áireamh\n"
 "  -s, --summarize       ná taispeáin ach an tsuim iomlán\n"
 
-#: src/du.c:322
+#: src/du.c:334
 #, fuzzy
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
@@ -3931,9 +3999,9 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
 msgstr ""
 "      --time            taispeáin am an mhionathraithe is déanaí d'aon "
 "chomhad\n"
@@ -3945,76 +4013,76 @@ msgstr ""
 "                          full-iso, long-iso, iso, +FORM�ID\n"
 "                          Parsáiltear FORM�ID cosúil le `date'\n"
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
 "  -x, --one-file-system    skip directories on different file systems\n"
 msgstr ""
 
-#: src/du.c:386
+#: src/du.c:398
 #, fuzzy
 msgid "Infinity"
 msgstr "Éigríoch B"
 
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr ""
-
-#: src/du.c:624
+#: src/du.c:636
 #, fuzzy, c-format
 msgid "fts_read failed: %s"
 msgstr "theip ar fts_read"
 
-#: src/du.c:780
+#: src/du.c:787
 #, c-format
 msgid "invalid maximum depth %s"
 msgstr "doimhneacht uasta neamhbhailí %s"
 
-#: src/du.c:809
+#: src/du.c:816
 #, fuzzy, c-format
 msgid "invalid --threshold argument '-0'"
-msgstr "argóint neamhbhailí %s"
+msgstr "argóint neamhbhailí %s%s: `%s'"
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr "ní féidir coimriú a dhéanamh agus gach iontráil a thaispeáint"
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr "rabhadh: is ionann iad coimriú agus --max-depth=0"
 
-#: src/du.c:900
+#: src/du.c:911
 #, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr "rabhadh: tagann an coimriú agus --max-depth=%lu salach ar a chéile"
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 #, fuzzy
 msgid "file operands cannot be combined with --files0-from"
 msgstr "Ní féidir oibrinn chomhaid a úsáid in éineacht le --files0-from."
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr "%s: earráid sa léamh"
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr ""
 "ní cheadaítear comhad darbh ainm %s agus ainmneacha comhaid á léamh ón "
 "ghnáth-ionchur"
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 msgid "invalid zero-length file name"
 msgstr "ainm neamhbhailí comhaid: folamh"
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr "iomlán"
 
@@ -4115,7 +4183,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
 "Sann an LUACH go gach AINM sa timpeallacht agus rith ORDÚ.\n"
@@ -4197,16 +4265,16 @@ msgid "input line is too long"
 msgstr "tá an líne ionchurtha rófhada"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr "Mike Parker"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr "James Youngman"
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
@@ -4215,7 +4283,7 @@ msgstr ""
 "Úsáid: %s SLONN\n"
 "  nó:  %s ROGHA\n"
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -4233,7 +4301,7 @@ msgstr ""
 "\n"
 "  ARG1 & ARG2       0 má tá ceachtar nialasach, ARG1 mura bhfuil\n"
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -4251,7 +4319,7 @@ msgstr ""
 "  ARG1 >= ARG2      Tá ARG1 níos mó ná, nó is ionann agus, ARG2\n"
 "  ARG1 > ARG2       Tá ARG1 níos mó ná ARG2\n"
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
@@ -4261,7 +4329,7 @@ msgstr ""
 "  ARG1 + ARG2       suim uimhríochtúil de ARG1 agus ARG2\n"
 "  ARG1 - ARG2       difríocht uimhríochtúil idir ARG1 agus ARG2\n"
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -4274,7 +4342,7 @@ msgstr ""
 "  ARG1 / ARG2       líon uimhríochtúil de ARG1 roinnte le ARG2\n"
 "  ARG1 % ARG2       fuílleach agus ARG1 á roinnt le ARG2\n"
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -4292,7 +4360,7 @@ msgstr ""
 "  index TEAGHR�N CAR       áit i dTEAGHR�N atá aon charachtar i CAR, nó 0\n"
 "  length TEAGHR�N          fad an TEAGHR�IN\n"
 
-#: src/expr.c:251
+#: src/expr.c:250
 #, fuzzy
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
@@ -4306,7 +4374,7 @@ msgstr ""
 "\n"
 "  ( SLONN )                  luach de SLONN\n"
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -4325,7 +4393,7 @@ msgstr ""
 "\\( agus \\) ann, ais-seolann siad líon na gcarachtar a bhí "
 "comhoiriúnaithe.\n"
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -4337,32 +4405,32 @@ msgstr ""
 "2 más slonn neamhbhailí é, agus 3 má tharlaíonn earráid.\n"
 
 # in FARF --KPS
-#: src/expr.c:278
+#: src/expr.c:277
 #, c-format
 msgid "syntax error"
 msgstr "earráid chomhréire"
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, c-format
 msgid "error in regular expression matcher"
 msgstr "earráid le linn cuardaigh ar shlonn ionadaíochta"
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, fuzzy, c-format
 msgid "non-integer argument"
 msgstr "argóint neamhuimhriúil"
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr "roinnt le nialas"
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, fuzzy, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr "Cuir LC_ALL='C' ionas gur féidir an fhadhb seo a sheachaint."
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, fuzzy, c-format
 msgid "the strings compared were %s and %s"
 msgstr "Rinneadh comparáid idir na teaghráin %s agus %s."
@@ -4372,27 +4440,27 @@ msgstr "Rinneadh comparáid idir na teaghráin %s agus %s."
 msgid "Niels Moller"
 msgstr ""
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
 msgstr ""
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
 msgstr ""
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, c-format
 msgid "%s is not a valid positive integer"
 msgstr "Ní slánuimhir dheimhneach bhailí é %s"
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr "tá %s rómhór"
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
@@ -4401,7 +4469,7 @@ msgstr ""
 "Úsáid: %s [UIMHIR]...\n"
 "  nó:  %s ROGHA\n"
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 #, fuzzy
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
@@ -4514,28 +4582,28 @@ msgid "invalid number of columns: %s"
 msgstr "líon neamhbhailí na gcolún: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr ""
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, fuzzy, c-format
 msgid "Usage: %s\n"
 msgstr "Úsáid: %s [ROGHA]\n"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
 msgstr ""
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, c-format
 msgid "failed to get groups for user %s"
 msgstr "níorbh fhéidir grúpaí a fháil le haghaidh %s"
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, c-format
 msgid "failed to get groups for the current process"
 msgstr "níorbh fhéidir grúpaí a fháil le haghaidh an phróisis reatha"
@@ -4561,22 +4629,22 @@ msgstr ""
 "an próiseas reatha (atá difriúil má tá an bunachar sonraí grúpaí tar éis a "
 "athrú).\n"
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, fuzzy, c-format
 msgid "cannot get real UID"
 msgstr "ní féidir aitheantas an úsáideora a shocrú"
 
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, fuzzy, c-format
 msgid "cannot get effective GID"
-msgstr "ní féidir %s a dhí-thagairt"
+msgstr "níl aon fháil ar an am lae"
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, fuzzy, c-format
 msgid "cannot get real GID"
 msgstr "ní féidir aitheantas an úsáideora a shocrú"
 
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, fuzzy, c-format
 msgid "%s: no such user"
 msgstr "%s: Níl a leithéid d'úsáideoir ann"
@@ -4632,59 +4700,48 @@ msgstr ""
 "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
 "GB 1000*1000*1000, G 1024*1024*1024, srl. le T, P, E, Z, Y.\n"
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr "%s: is róchraptha an comhad"
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, c-format
 msgid "%s: number of bytes is too large"
 msgstr "%s: is rómhór líon na mbeart"
 
-#: src/head.c:440
-#, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr ""
-"%s: ní féidir `lseek' a dhéanamh ar ais go dtí an láthair thionscantach"
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr "%s: ní féidir bogadh go fritháireamh %s"
 
-#: src/head.c:673
-#, fuzzy, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "%s: theip ar bhaint"
-
-#: src/head.c:798
+#: src/head.c:423 src/tail.c:457
 #, c-format
-msgid "cannot reposition file pointer for %s"
-msgstr "ní féidir an pointeoir comhaid a athshocrú do %s"
+msgid "%s: cannot seek to relative offset %s"
+msgstr "%s: ní féidir bogadh go fritháireamh coibhneasta %s"
 
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr "%s: tá %s chomh mór nach inléirithe é"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr "líon na línte"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr "líon na mbeart"
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr "líon na línte neamhbhailí"
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr "líon neamhbhailí na mbeart"
 
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, c-format
 msgid "invalid trailing option -- %c"
 msgstr "rogha neamhbhailí chun deiridh -- %c"
@@ -4730,28 +4787,34 @@ msgid "cannot determine hostname"
 msgstr "ní féidir an t-óstainm a aimsiú"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr "Arnold Robbins"
 
-#: src/id.c:81
-#, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
-msgstr "Úsáid: %s [ROGHA]... [ÚS�IDEOIR]\n"
+#: src/id.c:84
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]... [USER]\n"
+msgstr "Úsáid: %s [ROGHA]... [ÚS�IDEOIR]...\n"
 
-#: src/id.c:82
-#, fuzzy
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
+msgstr ""
+
+#: src/id.c:90
+#, fuzzy
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
 msgstr ""
 "Taispeáin eolas faoi ÚS�IDEOIR, nó faoin úsáideoir reatha.\n"
 "\n"
@@ -4764,7 +4827,7 @@ msgstr ""
 "                     i bhfeidhm, le -ugG\n"
 "  -u, --user      ná taispeáin ach an t-aitheantas úsáideora atá i bhfeidhm\n"
 
-#: src/id.c:96
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
@@ -4772,118 +4835,130 @@ msgstr ""
 "\n"
 "Mura bhfuil ROGHA ann, taispeáin roinnt bheag eolais thairbhigh.\n"
 
-#: src/id.c:140
+#: src/id.c:151
+#, fuzzy, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr "oibríonn --context (-Z) le heithne atá cumasaithe do SELinux amháin"
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr "oibríonn --context (-Z) le heithne atá cumasaithe do SELinux amháin"
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr "ní féidir an comhthéacs slándála nuair atá sonraithe ag an úsáideoir"
 
-#: src/id.c:178
+#: src/id.c:198
 #, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr "ní féidir \"only\" a thaispeáint le haghaidh níos mó ná rogha amháin"
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr ""
 "ní féidir ach ainmneacha nó fíoraitheantais a thaispeáint san fhormáid "
 "réamhshocraithe"
 
-#: src/id.c:199
+#: src/id.c:209
+#, fuzzy, c-format
+msgid "option --zero not permitted in default format"
+msgstr ""
+"ní féidir ach ainmneacha nó fíoraitheantais a thaispeáint san fhormáid "
+"réamhshocraithe"
+
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
 msgstr "níl aon fháil ar chomhthéacs an phróisis"
 
-#: src/id.c:224
+#: src/id.c:265
 #, fuzzy, c-format
 msgid "cannot get effective UID"
-msgstr "ní féidir %s a dhí-thagairt"
+msgstr "níl aon fháil ar an am lae"
 
-#: src/id.c:311
+#: src/id.c:354
 #, fuzzy, c-format
 msgid "cannot find name for user ID %s"
 msgstr "níl aon fháil ar ainm don aitheantas úsáideora %lu"
 
-#: src/id.c:329
+#: src/id.c:372
 #, c-format
 msgid "uid=%s"
 msgstr ""
 
-#: src/id.c:334
+#: src/id.c:377
 #, c-format
 msgid " gid=%s"
 msgstr ""
 
-#: src/id.c:341
+#: src/id.c:384
 #, c-format
 msgid " euid=%s"
 msgstr ""
 
-#: src/id.c:349
+#: src/id.c:392
 #, c-format
 msgid " egid=%s"
 msgstr ""
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr " grúpaí="
 
-#: src/id.c:393
+#: src/id.c:437
 #, fuzzy, c-format
 msgid " context=%s"
 msgstr "comhthéacs neamhbhailí: %s"
 
-#: src/install.c:373
+#: src/install.c:376
 #, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr "rabhadh: %s: níorbh fhéidir an comhthéacs a athrú go %s"
 
-#: src/install.c:414
+#: src/install.c:417
 #, c-format
 msgid "creating directory %s"
 msgstr "comhadlann %s á cruthú"
 
-#: src/install.c:482
+#: src/install.c:485
 #, c-format
 msgid "cannot change ownership of %s"
 msgstr "ní féidir an t-úinéir de %s a athrú"
 
-#: src/install.c:506
+#: src/install.c:509
 #, c-format
 msgid "cannot set time stamps for %s"
 msgstr "ní féidir an stampa ama a shocrú do %s"
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, c-format
 msgid "fork system call failed"
 msgstr "theip ar ghlao córais fork()"
 
-#: src/install.c:531
+#: src/install.c:535
 #, fuzzy, c-format
 msgid "cannot run %s"
 msgstr "ní féidir \"strip\" a rith"
 
-#: src/install.c:535
+#: src/install.c:539
 #, c-format
 msgid "waiting for strip"
 msgstr "ag feitheamh le \"strip\""
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr "chríochnaigh \"strip\" gan an chúis a mhíniú"
 
-#: src/install.c:558
+#: src/install.c:565
 #, c-format
 msgid "invalid user %s"
 msgstr "úsáideoir neamhbhailí %s"
 
-#: src/install.c:594
+#: src/install.c:601
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -4896,7 +4971,7 @@ msgstr ""
 "  nó:  %s [ROGHA]... -t COMHADLANN FOINSE...\n"
 "  nó:  %s [ROGHA]... -d COMHADLANN...\n"
 
-#: src/install.c:601
+#: src/install.c:608
 #, fuzzy
 msgid ""
 "\n"
@@ -4917,7 +4992,7 @@ msgstr ""
 "\n"
 
 # backup stuff same as cp. -KPS
-#: src/install.c:615
+#: src/install.c:622
 #, fuzzy
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
@@ -4935,7 +5010,7 @@ msgstr ""
 "  -d, --directory     is comhadlann gach argóint; cruthaigh gach ball de na\n"
 "                        comhadlanna sonraithe\n"
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -4954,7 +5029,7 @@ msgstr ""
 "x\n"
 "  -o, --owner=ÚINÉIR  socraigh an t-úinéir (forúsáideoir amháin)\n"
 
-#: src/install.c:631
+#: src/install.c:638
 #, fuzzy
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
@@ -4977,17 +5052,21 @@ msgstr ""
 "  -T, --no-target-directory  caith le SPRIOC mar ghnáthchomhad\n"
 "  -v, --verbose       taispeáin gach comhadlann agus á cruthú\n"
 
-#: src/install.c:641
+#: src/install.c:648
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
-"      --preserve-context  caomhnaigh an comhthéacs slándála SELinux\n"
-"  -Z, --context=CMHTCS  socraigh comhthéacs slándála de chomhaid/"
-"chomhadlanna\n"
 
-#: src/install.c:859
+#: src/install.c:696 src/unlink.c:86
+#, c-format
+msgid "cannot unlink %s"
+msgstr "ní féidir %s a dhínasc"
+
+#: src/install.c:877
 #, fuzzy, c-format
 msgid ""
 "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
@@ -4995,49 +5074,37 @@ msgstr ""
 "Rabhadh: ag déanamh neamhaird de --preserve-context; níl an eithne seo "
 "cumasaithe do SELinux."
 
-#: src/install.c:869
-#, fuzzy, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
-msgstr ""
-"Rabhadh: ag déanamh neamhaird de --context (-Z); níl an eithne seo "
-"cumasaithe do SELinux."
-
-#: src/install.c:886
+#: src/install.c:917
 #, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr "ní cheadaítear an rogha --strip agus comhadlann á suiteáil"
 
-#: src/install.c:889
+#: src/install.c:920
 #, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr "ní cheadaítear sprioc-chomhadlann agus comhadlann á suiteáil"
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr "ní féidir cur iallach ar chomhthéacs sprice %s agus é a chaomhnú"
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, c-format
 msgid "invalid mode %s"
 msgstr "mód neamhbhailí %s"
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr ""
 
-#: src/install.c:959
+#: src/install.c:1001
 #, fuzzy, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr "is comheisiatach iad na roghanna --string agus --check"
 
-#: src/install.c:966
+#: src/install.c:1008
 #, fuzzy, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr "is comheisiatach iad na roghanna chun dátaí a cheapadh le priontáil"
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -5049,7 +5116,7 @@ msgstr ""
 msgid "Mike Haertel"
 msgstr "Mike Haertel"
 
-#: src/join.c:191
+#: src/join.c:195
 #, fuzzy
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
@@ -5068,7 +5135,7 @@ msgstr ""
 "  -a TAOBH          taispeáin línte gan phéire as an gcomhad TAOBH\n"
 "  -e FOLAMH         cuir FOLAMH in ionad réimsí ionchurtha ar iarraidh\n"
 
-#: src/join.c:200
+#: src/join.c:204
 #, fuzzy
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
@@ -5081,7 +5148,7 @@ msgstr ""
 "  -o FORM�ID        tóg an líne aschurtha de réir FORM�ID\n"
 "  -t CAR            úsáid CAR mar theormharcóir idir réimsí ionchur/aschur\n"
 
-#: src/join.c:206
+#: src/join.c:210
 #, fuzzy
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
@@ -5101,7 +5168,12 @@ msgstr ""
 "phéireáil.\n"
 "  --nocheck-order   ná féach an bhfuil an t-ionchur sórtáilte mar is ceart\n"
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+#, fuzzy
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr "  -z, --zero-terminated     úsáid NUL foirceanta in ionad líne nua\n"
+
+#: src/join.c:225
 #, fuzzy
 msgid ""
 "\n"
@@ -5134,47 +5206,47 @@ msgstr ""
 "Mura bhfuil an t-ionchur sórtáilte agus ní féidir roinnt línte a nascadh,\n"
 "taispeánfar teachtaireacht rabhaidh duit.\n"
 
-#: src/join.c:403
+#: src/join.c:410
 #, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
 msgstr ""
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, c-format
 msgid "invalid field number: %s"
 msgstr "uimhir neamhbhailí réimse: %s"
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, c-format
 msgid "invalid field specifier: %s"
 msgstr "sonraitheoir neamhbhailí réimse: %s"
 
-#: src/join.c:877
+#: src/join.c:884
 #, c-format
 msgid "invalid file number in field spec: %s"
 msgstr "uimhir neamhbhailí chomhaid i sonraitheoir réimse: %s"
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr "réimsí neamh-chomhoiriúnacha ceangail %lu, %lu"
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr "teaghrán ionaid le haghaidh réimsí folmha i gcoinbhleacht"
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, c-format
 msgid "multi-character tab %s"
 msgstr "táb ilcharachtair %s"
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr "táib éaguibhreannacha"
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr "ní gnáth-ionchur é ceann de na comhaid"
@@ -5297,47 +5369,47 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr "ní féidir nasc a chruthú ó %s chuig %s"
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr "%s: ní cheadaítear nasc crua le comhadlann"
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, c-format
 msgid "%s: cannot overwrite directory"
 msgstr "%s: ní féidir forscríobh a dhéanamh ar chomhadlann"
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
 msgstr "%s: ionadaigh %s? "
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, fuzzy, c-format
 msgid "failed to create symbolic link %s"
 msgstr "ní féidir an nasc siombalach %s a chruthú"
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, fuzzy, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr "ní féidir nasc siombalach a dhéanamh ó %s go %s"
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, fuzzy, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr "nasc crua le %.0s%s á chruthú"
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, fuzzy, c-format
 msgid "failed to create hard link %s"
 msgstr "ní féidir nasc crua %s a chruthú go dtí %s"
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, fuzzy, c-format
 msgid "failed to create hard link %s => %s"
 msgstr "ní féidir nasc crua %s a chruthú go dtí %s"
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -5350,7 +5422,7 @@ msgstr ""
 "  nó:  %s [ROGHA]... SPRIOC... COMHADLANN    (an tríú leagan)\n"
 "  nó:  %s [ROGHA]... -t COMHADLANN SPRIOC... (an cheathrú leagan)\n"
 
-#: src/ln.c:381
+#: src/ln.c:398
 #, fuzzy
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
@@ -5369,7 +5441,7 @@ msgstr ""
 "Ní foláir gach SPRIOC a bheith ann agus naisc chrua á gcruthú.\n"
 "\n"
 
-#: src/ln.c:394
+#: src/ln.c:411
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
 "file\n"
@@ -5390,8 +5462,7 @@ msgstr ""
 "                               don fhorúsáideoir)\n"
 "  -f, --force                 scrios sprioc-chomhad má tá sé ann cheana\n"
 
-#: src/ln.c:402
-#, fuzzy
+#: src/ln.c:419
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
 "  -L, --logical               dereference TARGETs that are symbolic links\n"
@@ -5402,11 +5473,8 @@ msgid ""
 "location\n"
 "  -s, --symbolic              make symbolic links instead of hard links\n"
 msgstr ""
-"  -n, --no-dereference        ná lean naisc shiombalacha\n"
-"  -i, --interactive           fiafraigh roimh sprioc-chomhaid a scriosadh\n"
-"  -s, --symbolic              naisc shiombalacha in ionad nasc crua\n"
 
-#: src/ln.c:411
+#: src/ln.c:428
 #, fuzzy
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
@@ -5423,7 +5491,7 @@ msgstr ""
 "  -T, --no-target-directory   caith le AINM_NAISC mar ghnáthchomhad\n"
 "  -v, --verbose               taispeáin an t-ainm de gach comhad nasctha\n"
 
-#: src/ln.c:433
+#: src/ln.c:450
 #, c-format
 msgid ""
 "\n"
@@ -5431,13 +5499,13 @@ msgid ""
 "behavior when a TARGET is a symbolic link, defaulting to %s.\n"
 msgstr ""
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, fuzzy, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr ""
 "Ní féidir --target-directory a úsáid in éineacht le --no-target-directory"
 
-#: src/ln.c:588
+#: src/ln.c:605
 #, fuzzy, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr "ní féidir an nasc siombalach %s a chruthú"
@@ -5470,7 +5538,7 @@ msgstr "níl aon ainm logáilte isteach ann"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
@@ -5479,97 +5547,97 @@ msgstr "%b %e  %Y"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 msgid "%b %e %H:%M"
 msgstr "%b %e %H:%M"
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr ""
 "tá an athróg thimpeallachta QUOTING_STYLE neamhbhailí: %s; ag ligean thar"
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr "tá an athróg thimpeallachta COLUMNS neamhbhailí: %s; ag ligean thar"
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr "tá an athróg thimpeallachta TABSIZE neamhbhailí: %s; ag ligean thar"
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, c-format
 msgid "invalid line width: %s"
 msgstr "leithead líne neamhbhailí: %s"
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, c-format
 msgid "invalid tab size: %s"
 msgstr "méid neamhbhailí táib: %s"
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, c-format
 msgid "invalid time style format %s"
 msgstr "formáid neamhbhailí ar an am: %s"
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 #, fuzzy
 msgid "Valid arguments are:\n"
 msgstr "Na hargóintí bailí:"
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr ""
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr ""
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, c-format
 msgid "unrecognized prefix: %s"
 msgstr "réimír anaithnid: %s"
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr "tá an athróg thimpeallachta LS_COLORS neamhbhailí"
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, c-format
 msgid "cannot open directory %s"
 msgstr "ní féidir an chomhadlann %s a oscailt"
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, c-format
 msgid "cannot determine device and inode of %s"
 msgstr "ní féidir an gléas agus inode de %s a dhéanamh amach"
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, c-format
 msgid "%s: not listing already-listed directory"
 msgstr "%s: ní liostófar comhadlann atá liostaithe cheana"
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, c-format
 msgid "reading directory %s"
 msgstr "comhadlann %s á léamh"
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, c-format
 msgid "closing directory %s"
 msgstr "comhadlann %s á dúnadh"
 
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, c-format
 msgid "cannot compare file names %s and %s"
 msgstr ""
 "ní féidir na hainmneacha comhaid %s agus %s a chur i gcomparáid le chéile"
 
-#: src/ls.c:4721
+#: src/ls.c:4781
 #, fuzzy
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
@@ -5579,7 +5647,7 @@ msgstr ""
 "Sórtáil san ord aibítre mura bhfuil --sort ná aon cheann de -cftuvSUX ann.\n"
 "\n"
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 #, fuzzy
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
@@ -5593,18 +5661,18 @@ msgstr ""
 "      --author               le -l, taispeáin an t-údar de gach comhad\n"
 "  -b, --escape               ochtnártha in ionad carachtair neamhghrafacha\n"
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 #, fuzzy
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
 "      --block-size=MÉID      úsáid bloic den mhéid MÉID beart\n"
@@ -5614,16 +5682,15 @@ msgstr ""
 "ainm\n"
 "                               i ngach cás eile: sórtáil de réir ctime\n"
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 #, fuzzy
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 "  -C                         taispeáin iontrálacha de réir colúin\n"
@@ -5633,7 +5700,7 @@ msgstr ""
 "  -d, --directory            taispeáin comhadlanna in ionad a n-ábhar\n"
 "  -D, --dired                gin aschur chun an mhóid dired i Emacs\n"
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 #, fuzzy
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
@@ -5650,17 +5717,19 @@ msgstr ""
 "                               single-column -1, verbose -l, vertical -C\n"
 "      --full-time            ar comhbhrí le `-l --time-style=full-iso\n"
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr ""
 "  -g                         cosúil le -l, ach ná taispeáin úinéir an "
 "liosta\n"
 
-#: src/ls.c:4763
+#: src/ls.c:4823
+#, fuzzy
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 "      --group-directories-first\n"
@@ -5669,10 +5738,11 @@ msgstr ""
 "                               grúpáil má bhaintear úsáid ar bith as\n"
 "                               --sort=none (-U)\n"
 
-#: src/ls.c:4769
+#: src/ls.c:4829
+#, fuzzy
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
@@ -5681,14 +5751,15 @@ msgstr ""
 "                               (m.sh., 1K 234M 2G srl.)\n"
 "      --si                   mar an gcéanna, ach le 1K=1000, ní 1024\n"
 
-#: src/ls.c:4775
+#: src/ls.c:4835
+#, fuzzy
 msgid ""
 "  -H, --dereference-command-line\n"
 "                             follow symbolic links listed on the command "
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
@@ -5703,7 +5774,7 @@ msgstr ""
 "leis\n"
 "                              an PATRÚN blaoisce (sáraithe ag -a nó -A)\n"
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 #, fuzzy
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
@@ -5713,7 +5784,7 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 "      --indicator-style=FOCAL cuir táscaire den chineál FOCAL le "
 "hiontrálacha:\n"
@@ -5724,7 +5795,7 @@ msgstr ""
 "                               comhoiriúnach le PATRÚN\n"
 "  -k                         ar comhbhrí le `--block-size=1K'\n"
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -5738,7 +5809,7 @@ msgstr ""
 "                               t-eolas faoin tagraí seachas an nasc féin\n"
 "  -m                         taispeáin iontrálacha scartha le camóga\n"
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -5756,12 +5827,12 @@ msgstr ""
 "  -p, --indicator-style=slash\n"
 "                             cuir táscaire / le comhadlanna\n"
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 #, fuzzy
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -5778,7 +5849,7 @@ msgstr ""
 "                               literal, locale, shell, shell-always, c, "
 "escape\n"
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 #, fuzzy
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
@@ -5790,16 +5861,19 @@ msgstr ""
 "  -R, --recursive            taispeáin comhadlanna go hathchúrsach\n"
 "  -s, --size                 taispeáin an mhéid de gach comhad (bloic)\n"
 
-#: src/ls.c:4825
+#: src/ls.c:4886
+#, fuzzy
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 "  -S                         sórtáil de réir méid an chomhaid\n"
 "      --sort=FOCAL           sórtáil de réir FOCAL in ionad an ainm: none -"
@@ -5812,17 +5886,19 @@ msgstr ""
 "sonraithe\n"
 "                               mar eochair shórtála más --sort=time\n"
 
-#: src/ls.c:4835
+#: src/ls.c:4896
 #, fuzzy
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
 msgstr ""
 "      --time-style=ST�L      le -l, taispeáin amanna de réir na stíle ST�L:\n"
 "                             full-iso, long-iso, iso, locale, +FORM�ID.\n"
@@ -5832,7 +5908,7 @@ msgstr ""
 "                             má tá réimír `posix-' ar ST�L, bain úsáid as\n"
 "                             mura bhfuil an logchaighdeán POSIX socraithe\n"
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 #, fuzzy
 msgid ""
 "  -t                         sort by modification time, newest first\n"
@@ -5841,11 +5917,11 @@ msgstr ""
 "  -t                         sórtáil de réir am mionathraithe\n"
 "  -T, --tabsize=COLÚIN       cuir táb ar gach COLÚIN colún (réamhshocrú=8)\n"
 
-#: src/ls.c:4848
+#: src/ls.c:4912
 #, fuzzy
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
@@ -5858,13 +5934,13 @@ msgstr ""
 "  -U                         ná sórtáil; taispeáin in ord na comhadlainne\n"
 "  -v                         sórtáil de réir leagan\n"
 
-#: src/ls.c:4855
+#: src/ls.c:4919
+#, fuzzy
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 "  -w, --width=COLÚIN         socraigh leithead den scáileán\n"
@@ -5875,7 +5951,7 @@ msgstr ""
 "                                comhad má tá ann\n"
 "  -1                         taispeáin aon chomhad sa líne\n"
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -5884,7 +5960,7 @@ msgid ""
 "variable can change the settings.  Use the dircolors command to set it.\n"
 msgstr ""
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -5961,9 +6037,11 @@ msgstr "  -t, --text              léigh sa mhód téacs (réamhshocrú)\n"
 #, fuzzy
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
@@ -5975,12 +6053,7 @@ msgstr ""
 "  -w, --warn              tabhair rabhadh má tá línte míchumtha ann\n"
 "\n"
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -5996,35 +6069,35 @@ msgstr ""
 "taispeáin líne le suim sheiceála, carachtar a chomharthaíonn an cineál\n"
 "(`*'=dénártha, ` '=téacs), agus an t-ainm gach COMHAD.\n"
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, c-format
 msgid "%s: too many checksum lines"
 msgstr "%s: an iomarca línte shuim sheiceála"
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr "%s: %<PRIuMAX>: líne mhíchumtha le suim sheiceála %s"
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr "%s: Theip ar oscailt nó ar léamh\n"
 
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr "TEIPTHE"
 
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr "OK"
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr "%s: níl aon líne dhea-chumtha ar fáil le suim sheiceála %s"
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, fuzzy, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
@@ -6034,7 +6107,7 @@ msgstr[2] "%s: %<PRIuMAX>: líne mhíchumtha le suim sheiceála %s"
 msgstr[3] "%s: %<PRIuMAX>: líne mhíchumtha le suim sheiceála %s"
 msgstr[4] "%s: %<PRIuMAX>: líne mhíchumtha le suim sheiceála %s"
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, fuzzy, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
@@ -6044,7 +6117,7 @@ msgstr[2] "RABHADH: ní féidir %<PRIuMAX> as %<PRIuMAX> comhaid a léamh"
 msgstr[3] "RABHADH: ní féidir %<PRIuMAX> as %<PRIuMAX> comhaid a léamh"
 msgstr[4] "RABHADH: ní féidir %<PRIuMAX> as %<PRIuMAX> comhaid a léamh"
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, fuzzy, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
@@ -6054,19 +6127,19 @@ msgstr[2] "RABHADH: ní ceart %<PRIuMAX> as %<PRIuMAX> shuim ríofa seiceála"
 msgstr[3] "RABHADH: ní ceart %<PRIuMAX> as %<PRIuMAX> suim ríofa seiceála"
 msgstr[4] "RABHADH: ní ceart %<PRIuMAX> as %<PRIuMAX> suim ríofa seiceála"
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
 msgstr ""
 
-#: src/md5sum.c:766
+#: src/md5sum.c:770
 #, fuzzy, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr ""
 "tá an rogha --status gan bhrí ach amháin nuair atáthar ag fíorú suimeanna "
 "seiceála"
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
@@ -6074,53 +6147,52 @@ msgstr ""
 "tá na roghanna --binary agus --text gan bhrí agus suimeanna seiceála á "
 "bhfíorú"
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr ""
 "tá an rogha --status gan bhrí ach amháin nuair atáthar ag fíorú suimeanna "
 "seiceála"
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr ""
 "tá an rogha --warn gan bhrí ach amháin nuair atáthar ag fíorú suimeanna "
 "seiceála"
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, fuzzy, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr ""
 "tá an rogha --status gan bhrí ach amháin nuair atáthar ag fíorú suimeanna "
 "seiceála"
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, fuzzy, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr ""
 "tá an rogha --status gan bhrí ach amháin nuair atáthar ag fíorú suimeanna "
 "seiceála"
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr "Úsáid: %s [ROGHA]... COMHADLANN...\n"
 
-#: src/mkdir.c:57
+#: src/mkdir.c:59
 #, fuzzy
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
 msgstr ""
 "Cruthaigh an chomhadlann/na comhadlanna, mura bhfuil siad ann cheana féin.\n"
 "\n"
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
+#, fuzzy
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 "  -m, --mode=MÓD    socraigh mód an chomhaid (mar le chmod), ní a=rwx - "
 "umask\n"
@@ -6131,63 +6203,93 @@ msgstr ""
 "comhadlann\n"
 "                      a chruthaítear go CTCS\n"
 
-#: src/mkdir.c:168
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/mkdir.c:127 src/mkdir.c:172
+#, fuzzy, c-format
+msgid "failed to set default creation context for %s"
+msgstr ""
+"níorbh fhéidir an comhthéacs réamhshocraithe cruthaithe comhad a shocrú go %s"
+
+#: src/mkdir.c:191
+#, fuzzy, c-format
+msgid "failed to restore context for %s"
+msgstr "níorbh fhéidir amanna a chaomhnú ar %s"
+
+#: src/mkdir.c:231
 #, c-format
 msgid "created directory %s"
 msgstr "cruthaíodh comhadlann %s"
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, fuzzy, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr ""
+"Rabhadh: ag déanamh neamhaird de --context (-Z); níl an eithne seo "
+"cumasaithe do SELinux."
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr "Úsáid: %s [ROGHA]... AINM...\n"
 
-#: src/mkfifo.c:52
+#: src/mkfifo.c:54
 #, fuzzy
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
 msgstr ""
 "Cruthaigh píopaí ainmnithe (FIFO) leis na hAINMneacha tugtha.\n"
 "\n"
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 #, fuzzy
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
 msgstr ""
 "  -m, --mode=MÓD    socraigh ceadanna (mar le chmod), ní a=rw - umask\n"
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
-"  -Z, --context=CTCS socraigh comhthéacs slándála de gach AINM go CTCS\n"
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, c-format
 msgid "invalid mode"
 msgstr "mód neamhbhailí"
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr "caithfidh an mód na giotáin cheada amháin a shonrú"
 
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
+#, c-format
+msgid "cannot set permissions of %s"
+msgstr "ní féidir na ceadanna de %s a shocrú"
+
+#: src/mknod.c:54
 #, c-format
 msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr "Úsáid: %s [ROGHA]... AINM CINE�L [PR�OMH MION]\n"
 
-#: src/mknod.c:54
+#: src/mknod.c:56
 #, fuzzy
 msgid "Create the special file NAME of the given TYPE.\n"
 msgstr ""
 "Cruthaigh an comhad speisialta AINM den chineál ceaptha CINE�L.\n"
 "\n"
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr "  -Z, --context=CTCS socraigh comhthéacs slándála de AINM go CTCS\n"
-
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -6203,7 +6305,7 @@ msgstr ""
 "ochtnártha;\n"
 "agus i ngach cás eile, mar deachúlach.  CINE�Lacha bailí:\n"
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 msgid ""
 "\n"
 "  b      create a block (buffered) special file\n"
@@ -6215,57 +6317,57 @@ msgstr ""
 "  c, u   cruthaigh comhad speisialta den chineál `carachtar' (gan mhaolán)\n"
 "  p      cruthaigh FIFO\n"
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 msgid "Special files require major and minor device numbers."
 msgstr ""
 "Ní mór príomhuimhir ghléis agus mionuimhir ghléis a cheapadh le haghaidh na "
 "gcomhad speisialta"
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 msgid "Fifos do not have major and minor device numbers."
 msgstr "Níl príomhuimhir ná mionuimhir ghléis ag comhaid fifo."
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, c-format
 msgid "block special files not supported"
 msgstr "Níl comhaid speisialta den chineál `bloc' ar fáil"
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, c-format
 msgid "character special files not supported"
 msgstr "Níl comhaid speisialta den chineál `carachtar' ar fáil"
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, c-format
 msgid "invalid major device number %s"
 msgstr "is neamhbhailí an phríomhuimhir ghléis %s"
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, c-format
 msgid "invalid minor device number %s"
 msgstr "is neamhbhailí an mhionuimhir ghléis %s"
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, c-format
 msgid "invalid device %s %s"
 msgstr "gléas neamhbhailí %s %s"
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, c-format
 msgid "invalid device type %s"
 msgstr "gléas neamhbhailí %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr ""
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr "Úsáid: %s [ROGHA]... [TEIMPLÉAD]\n"
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 #, fuzzy
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
@@ -6275,33 +6377,33 @@ msgstr ""
 "Cruthaigh comhad nó comhadlann shealadach, go sábháilte, agus\n"
 "taispeáin a ainm. Mura dtugtar TEIMPLÉAD, úsáid tmp.XXXXXXXXXX.\n"
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
 "  -q, --quiet         suppress diagnostics about file/dir-creation failure\n"
 msgstr ""
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
 #, fuzzy
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
 "  --tmpdir[=CMHDLNN] TEIMPLÉAD i gcoibhneas le CMHDLNN.  Mura dtugtar\n"
@@ -6310,10 +6412,9 @@ msgstr ""
 "                     an rogha seo.  Ceadaítear slaiseanna i dTEIMPLÉAD, ach\n"
 "                     ní chruthóidh 'mktemp' ach an chomhpháirt deiridh.\n"
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
 #, fuzzy
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
@@ -6323,53 +6424,48 @@ msgstr ""
 "                     é sin nó an chomhadlann a thugtar le -p; nó /tmp [i "
 "léig]\n"
 
-#: src/mktemp.c:223
-#, fuzzy, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr "níorbh fhéidir an gnáth-ionchur earráide a athsheoladh"
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, c-format
 msgid "too many templates"
 msgstr "an iomarca teimpléad"
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr ""
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, fuzzy, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr "teimpléad neamhbhailí, %s, tá deighilteoir comhadlainne ann"
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr "easpa Xanna i dteimpléad %s"
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr "teimpléad neamhbhailí, %s, tá deighilteoir comhadlainne ann"
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr ""
 "teimpléad neamhbhailí, %s; le --tmpdir, seans nach dearbhchonair atá ann"
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, c-format
 msgid "failed to create directory via template %s"
 msgstr "níorbh fhéidir comhadlann a chruthú le teimpléad %s"
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, c-format
 msgid "failed to create file via template %s"
 msgstr "níorbh fhéidir comhad a chruthú le teimpléad %s"
 
-#: src/mv.c:292
+#: src/mv.c:294
 #, fuzzy
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
 msgstr ""
@@ -6377,7 +6473,7 @@ msgstr ""
 "\n"
 
 # same stuff under cp, install, etc. --KPS
-#: src/mv.c:298
+#: src/mv.c:300
 #, fuzzy
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
@@ -6395,7 +6491,7 @@ msgstr ""
 "  -f, --force                  ná fiafraigh roimh fhorscríobh\n"
 "  -i, --interactive            fiafraigh roimh fhorscríobh\n"
 
-#: src/mv.c:307
+#: src/mv.c:309
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
@@ -6406,7 +6502,8 @@ msgstr ""
 "                                 FOINSE\n"
 "  -S, --suffix=IARMH�R         sáraigh an gnáth-iarmhír cúltaca\n"
 
-#: src/mv.c:312
+#: src/mv.c:314
+#, fuzzy
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
 "DIRECTORY\n"
@@ -6415,6 +6512,8 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
 "      --target-directory=COMHADLANN aistrigh gach FOINSE isteach i "
 "gCOMHADLANN\n"
@@ -6723,95 +6822,90 @@ msgid "%s: invalid number to ignore"
 msgstr "%s: líon na línte neamhbhailí"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
 msgstr ""
 
-#: src/numfmt.c:676
+#: src/numfmt.c:659
 #, fuzzy, c-format
-msgid "value too large to be converted: '%s'"
+msgid "value too large to be converted: %s"
 msgstr "%s: níl an luach tiontaithe ar fad"
 
-#: src/numfmt.c:680
+#: src/numfmt.c:663
 #, fuzzy, c-format
-msgid "invalid number: '%s'"
+msgid "invalid number: %s"
 msgstr "uimhir neamhbhailí %s"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
+msgid "rejecting suffix in input: %s (consider using --from)"
 msgstr ""
 
-#: src/numfmt.c:688
+#: src/numfmt.c:671
 #, fuzzy, c-format
-msgid "invalid suffix in input: '%s'"
+msgid "invalid suffix in input: %s"
 msgstr "iarmhír neamhbhailí in argóint %s%s: `%s'"
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
 msgstr ""
 
-#: src/numfmt.c:723
+#: src/numfmt.c:722 src/numfmt.c:768
 #, fuzzy, c-format
 msgid "failed to prepare value '%Lf' for printing"
 msgstr "%s: theip ar oscailt chun é a scríobh"
 
-#: src/numfmt.c:787
+#: src/numfmt.c:791
 #, fuzzy, c-format
-msgid "invalid unit size: '%s'"
+msgid "invalid unit size: %s"
 msgstr "méid neamhbhailí táib: %s"
 
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
-#, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr ""
-
-#: src/numfmt.c:813
+#: src/numfmt.c:814
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
 msgstr "Úsáid: %s [ROGHA]... [ÚS�IDEOIR]...\n"
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
 msgstr ""
 
-#: src/numfmt.c:820
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
 msgstr ""
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
 msgstr ""
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
 "                         see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr ""
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
@@ -6819,19 +6913,19 @@ msgid ""
 "locale)\n"
 msgstr ""
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
 msgstr ""
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
 msgstr ""
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -6841,43 +6935,40 @@ msgid ""
 "                         is found\n"
 msgstr ""
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
 "nearest\n"
 msgstr ""
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
 msgstr ""
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr ""
 
-#: src/numfmt.c:877
-#, fuzzy
+#: src/numfmt.c:878
 msgid ""
 "\n"
 "UNIT options:\n"
 msgstr ""
-"Roghanna sórtála:\n"
-"\n"
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr ""
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -6886,7 +6977,7 @@ msgid ""
 "               1Mi = 1048576,\n"
 msgstr ""
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
@@ -6894,7 +6985,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
@@ -6902,7 +6993,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
@@ -6910,18 +7001,18 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:905
+#: src/numfmt.c:906
 #, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -6933,7 +7024,7 @@ msgid ""
 "errors are not diagnosed and the exit status is 0.\n"
 msgstr ""
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -6954,113 +7045,113 @@ msgid ""
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 msgstr ""
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, fuzzy, c-format
 msgid "format %s has no %% directive"
 msgstr "ní comhadlann é an sprioc-chomhad %s"
 
 # similar string for time format in ls.c -KPS
-#: src/numfmt.c:990
+#: src/numfmt.c:1003
 #, fuzzy, c-format
 msgid "invalid format %s (width overflow)"
 msgstr "leithead neamhbhailí na formáide"
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr ""
+
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr ""
 
-#: src/numfmt.c:1010
+#: src/numfmt.c:1030
 #, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
 msgstr ""
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr ""
 
-#: src/numfmt.c:1070
+#: src/numfmt.c:1081
 #, fuzzy, c-format
-msgid "invalid suffix in input '%s': '%s'"
+msgid "invalid suffix in input %s: %s"
 msgstr "iarmhír neamhbhailí in argóint %s%s: `%s'"
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
 msgstr ""
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
 msgstr ""
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
+msgid "large input value %s: possible precision loss"
 msgstr ""
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
 
-#: src/numfmt.c:1388
+#: src/numfmt.c:1403
 #, fuzzy, c-format
-msgid "invalid padding value '%s'"
-msgstr "Raon neamhbhailí leathanach %s"
+msgid "invalid padding value %s"
+msgstr "dáta neamhbhailí %s"
 
-#: src/numfmt.c:1401
+#: src/numfmt.c:1417
 #, fuzzy, c-format
-msgid "invalid field value '%s'"
-msgstr "uimhir réimse neamhbhailí: `%s'"
+msgid "invalid field value %s"
+msgstr "uimhir neamhbhailí réimse: %s"
 
-#: src/numfmt.c:1430
+#: src/numfmt.c:1447
 #, fuzzy, c-format
-msgid "invalid header value '%s'"
+msgid "invalid header value %s"
 msgstr "dáta neamhbhailí %s"
 
-#: src/numfmt.c:1456
+#: src/numfmt.c:1473
 #, fuzzy, c-format
 msgid "--grouping cannot be combined with --format"
 msgstr "Ní féidir oibrinn chomhaid a úsáid in éineacht le --files0-from."
 
-#: src/numfmt.c:1458
-#, fuzzy, c-format
-msgid "--padding cannot be combined with --format"
-msgstr "Ní féidir oibrinn chomhaid a úsáid in éineacht le --files0-from."
-
-#: src/numfmt.c:1463
+#: src/numfmt.c:1478
 #, fuzzy, c-format
 msgid "no conversion option specified"
 msgstr "sonraíodh roghanna -i iomadúla"
 
-#: src/numfmt.c:1471
+#: src/numfmt.c:1486
 #, fuzzy, c-format
 msgid "grouping cannot be combined with --to"
 msgstr "Ní féidir oibrinn chomhaid a úsáid in éineacht le --files0-from."
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
 msgstr ""
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
 msgstr ""
 
-#: src/numfmt.c:1511
+#: src/numfmt.c:1526
 #, fuzzy, c-format
 msgid "error reading input"
 msgstr "earráid agus %s á léamh"
 
-#: src/numfmt.c:1520
+#: src/numfmt.c:1535
 #, fuzzy, c-format
 msgid "failed to convert some of the input numbers"
-msgstr "níorbh fhéidir an gnáth-ionchur earráide a athsheoladh"
+msgstr "theip ar chomhthéacs de %s a athrú go %s"
 
-#: src/od.c:294
+#: src/od.c:320
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -7073,7 +7164,7 @@ msgstr ""
 "  nó:  %s --traditional [ROGHA]... [COMHAD] [[+]FRITH�IREAMH[.][b] [+]"
 "[LIPÉAD][.][b]]\n"
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -7089,7 +7180,7 @@ msgstr ""
 "Mura bhfuil COMHAD ann, nó más '-' é, léigh ón ghnáth-ionchur.\n"
 "\n"
 
-#: src/od.c:307
+#: src/od.c:333
 #, fuzzy
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
@@ -7111,26 +7202,25 @@ msgstr ""
 "0x nó 0X heicsidheachúlach; úsáid iarmhír `.' don ochtnártha agus `b' mar "
 "512.\n"
 
-#: src/od.c:318
-#, fuzzy
+#: src/od.c:344
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
-"  -A, --address-radix=BUNUIMHIR formáid de fhritháireamh comhaid\n"
-"  -j, --skip-bytes=BEARTA     gabh thar BEARTA beart ionchurtha ar dtús\n"
 
-#: src/od.c:323
+#: src/od.c:350
 #, fuzzy
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
@@ -7142,7 +7232,7 @@ msgstr ""
 "  -w, --width[=BEARTA]        BEARTA beart ar líne aschuir\n"
 "      --traditional           glac le hargóintí san fhoirm thraidisiúnta\n"
 
-#: src/od.c:336
+#: src/od.c:363
 #, fuzzy
 msgid ""
 "\n"
@@ -7150,7 +7240,7 @@ msgid ""
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 "\n"
@@ -7163,7 +7253,7 @@ msgstr ""
 "  -d   ar comhbhrí le `-t u2', roghnaigh aonaid dheachúlacha gan sín, 2 "
 "bheart\n"
 
-#: src/od.c:345
+#: src/od.c:372
 msgid ""
 "  -f   same as -t fF, select floats\n"
 "  -i   same as -t dI, select decimal ints\n"
@@ -7180,14 +7270,14 @@ msgstr ""
 "  -x   ar comhbhrí le `-t x2', roghnaigh aonaid heicsidheachúlacha, 2 "
 "bheart\n"
 
-#: src/od.c:353
+#: src/od.c:380
 #, fuzzy
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 "\n"
 "Is éard atá i gCINE�L: sonrú amháin ar a laghad de na cinn seo a leanas:\n"
@@ -7195,7 +7285,7 @@ msgstr ""
 "  a          carachtar ainmnithe, déan neamhshuim ar an ngiotán is airde\n"
 "  c          carachtar ASCII nó carachtar éalúcháin le cúlslais\n"
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -7209,7 +7299,7 @@ msgstr ""
 "  u[MÉID]    slánuimhir dheachúlach gan sín, MÉID beart ar an gceann\n"
 "  x[MÉID]    heicsidheachúlach, MÉID beart ar an gceann\n"
 
-#: src/od.c:367
+#: src/od.c:394
 #, fuzzy
 msgid ""
 "\n"
@@ -7224,14 +7314,14 @@ msgstr ""
 "Más ionann CINE�L agus f, is féidir MÉID a bheith `F'=sizeof(float),\n"
 "`D'=sizeof(double), nó `L'=sizeof(long double).\n"
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
 "each output line.\n"
 msgstr ""
 
-#: src/od.c:379
+#: src/od.c:406
 #, fuzzy
 msgid ""
 "\n"
@@ -7249,12 +7339,12 @@ msgstr ""
 "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
 "GB 1000*1000*1000, G 1024*1024*1024, srl. le T, P, E, Z, Y.\n"
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, c-format
 msgid "invalid type string %s"
 msgstr "teaghrán neamhbhailí cineáil %s"
 
-#: src/od.c:649
+#: src/od.c:690
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7263,7 +7353,7 @@ msgstr ""
 "teaghrán neamhbhailí cineáil %s;\n"
 "níl slánuimhreacha le %lu beart le fáil ar an gcóras seo"
 
-#: src/od.c:770
+#: src/od.c:811
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7272,37 +7362,37 @@ msgstr ""
 "teaghrán neamhbhailí cineáil %s;\n"
 "níl uimhreacha shnámhphointe le %lu beart le fáil ar an gcóras seo"
 
-#: src/od.c:828
+#: src/od.c:869
 #, fuzzy, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr "carachtar neamhbhailí `%c' i dteaghrán cineáil %s"
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr "ní féidir a ghabháil thar dheireadh an ionchuir iomláin"
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, fuzzy, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr "bunuimhir neamhbhailí `%c' do sheoltaí aschuir; roghnaigh as [doxn]"
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr "ní cheadaítear sonrú cineáil agus teaghráin á ndumpáil"
 
-#: src/od.c:1810
+#: src/od.c:1863
 #, fuzzy
 msgid "compatibility mode supports at most one file"
 msgstr "Aon chomhad amháin ar a mhéad sa mhód comhoiriúnachta."
 
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr "is rómhór skip-bytes + read-bytes"
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr "rabhadh: leithead neamhbhailí %lu; bainfear úsáid as %d ina ionad"
@@ -7467,12 +7557,12 @@ msgstr "Cathain"
 msgid "Where"
 msgstr "Cén �it"
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr "Úsáid: %s [ROGHA]... [ÚS�IDEOIR]...\n"
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -7490,7 +7580,7 @@ msgstr ""
 "  -p              ná taispeáin an comhad plean i bhformáid fhada\n"
 "  -s              formáid achomair (réamhshocrú)\n"
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -7505,7 +7595,7 @@ msgstr ""
 "  -q              ná taispeáin ainm iomlán, cianóstach, nó am díomhaoin\n"
 "                  i bhformáid achomair\n"
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -7516,7 +7606,7 @@ msgstr ""
 "Feidhmchlár beag cosúil le `finger'; taispeáin eolas faoi úsáideoir.\n"
 "Beidh %s an comhad utmp.\n"
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr "is gá ainm úsáideora amháin a thabhairt ar a laghad le -l"
@@ -7685,8 +7775,8 @@ msgstr ""
 "                    cuir CAR in ionad spásanna go dtí LEITHEAD táib (8)\n"
 "  -J, --join-lines  cónaisc línte iomlána, stop teascadh línte -W, ná "
 "hailínigh\n"
-"                    colúin, socraigh deighilteoirí le --sep-string"
-"[=TEAGHR�N]\n"
+"                    colúin, socraigh deighilteoirí le --sep-"
+"string[=TEAGHR�N]\n"
 
 #: src/pr.c:2798
 #, fuzzy
@@ -7743,7 +7833,8 @@ msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
@@ -7753,7 +7844,7 @@ msgstr ""
 "                    stopann -s[CAR] teascadh línte de na trí rogha\n"
 "                    (-COLÚN|-a -COLÚN|-m) ach is lasta an rogha -w\n"
 
-#: src/pr.c:2827
+#: src/pr.c:2828
 #, fuzzy
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
@@ -7770,7 +7861,7 @@ msgstr ""
 "                   níl aon éifeacht ar roghanna colúin\n"
 "  -t, --omit-header  fág na ceanntásca agus na buntásca leathanaigh ar lár\n"
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 #, fuzzy
 msgid ""
 "  -T, --omit-pagination\n"
@@ -7793,7 +7884,7 @@ msgstr ""
 "                    leithead an leathanaigh = LEITHEAD (72) carachtar\n"
 "                    d'aschur ilcholúnach, stopann -s[car] é seo (72)\n"
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 #, fuzzy
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
@@ -7808,7 +7899,7 @@ msgstr ""
 "isteach\n"
 "                    ar na roghanna -S nó -s\n"
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 #, fuzzy
 msgid ""
 "\n"
@@ -7834,7 +7925,7 @@ msgstr ""
 
 #: src/printenv.c:69
 #, fuzzy
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr "  -z, --zero-terminated     úsáid NUL foirceanta in ionad líne nua\n"
 
 #: src/printf.c:79
@@ -7954,12 +8045,12 @@ msgstr "rabhadh: ag déanamh neamhshuim ar argóintí breise, ó %s amach"
 msgid "F. Pinard"
 msgstr "F. Pinard"
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, c-format
 msgid "%s (for regexp %s)"
 msgstr "%s (ar regexp %s)"
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
@@ -7968,7 +8059,7 @@ msgstr ""
 "Úsáid: %s [ROGHA]... [IONCHUR]...   (gan -G)\n"
 "  nó:  %s -G [ROGHA]... [IONCHUR [ASCHUR]]\n"
 
-#: src/ptx.c:1821
+#: src/ptx.c:1824
 #, fuzzy
 msgid ""
 "Output a permuted index, including context, of the words in the input "
@@ -7977,7 +8068,7 @@ msgstr ""
 "Cuir as innéacs iomalartaithe, le comhthéacs, de na focail sna hinchomhaid.\n"
 "\n"
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 #, fuzzy
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
@@ -7988,7 +8079,7 @@ msgstr ""
 "  -G, --traditional            oibrigh ar nós `ptx' System V\n"
 "  -F, --flag-truncation=TGHR�N úsáid TGHR�N chun línte teasctha a léiriú\n"
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 #, fuzzy
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
@@ -8004,7 +8095,7 @@ msgstr ""
 "  -S, --sentence-regexp=REGEXP foircinn línte ní foircinn abairtí\n"
 "  -T, --format=tex             táirg an t-aschur i riocht treoracha `TeX'\n"
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -8021,7 +8112,7 @@ msgstr ""
 "  -i, --ignore-file=COMHAD     tá focail le ligean tharat i gCOMHAD\n"
 "  -o, --only-file=COMHAD       tá liosta treoirfhocal i gCOMHAD\n"
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -8032,17 +8123,16 @@ msgstr ""
 "  -t, --typeset-mode             - neamhchríochnaithe -\n"
 "  -w, --width=UIMHIR           leithead an aschuir, gan tagairt\n"
 
-#: src/ptx.c:1854
+#: src/ptx.c:1857
 #, fuzzy
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
 "\n"
-"Mura bhfuil COMHAD ann, nó más '-' é,\n"
-"léigh ón ghnáth-ionchur.  `-F /' mar réamhshocrú.\n"
+"Mura bhfuil COMHAD ann, nó más '-' é, léigh ón gnáth-ionchur.\n"
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, c-format
 msgid "invalid gap width: %s"
 msgstr "leithead neamhbhailí bearna: %s"
@@ -8061,22 +8151,28 @@ msgid ""
 "  -P, --physical  avoid all symlinks\n"
 msgstr ""
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+
+#: src/pwd.c:169
 #, c-format
 msgid "failed to chdir to %s"
 msgstr "theip ar chdir go dtí an chomhadlann %s"
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, c-format
 msgid "failed to stat %s"
 msgstr "theip ar stat %s"
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr "níorbh fhéidir iontráil chomhadlainne i %s le i-nód comhoiriúnach"
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, c-format
 msgid "ignoring non-option arguments"
 msgstr "ag déanamh neamhshuim ar argóintí nach roghanna iad"
@@ -8086,8 +8182,8 @@ msgstr "ag déanamh neamhshuim ar argóintí nach roghanna iad"
 msgid "Dmitry V. Levin"
 msgstr "Dmitry V. Levin"
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Úsáid: %s [ROGHA]... COMHAD...\n"
@@ -8134,8 +8230,7 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 "  -m, --canonicalize-missing  caighdeánaigh trí leanúint gach nasc "
 "siombalach\n"
@@ -8168,7 +8263,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 
@@ -8186,41 +8281,42 @@ msgstr "%s: téigh síos isteach i gcomhadlann scríobh-bhactha %s? "
 msgid "%s: descend into directory %s? "
 msgstr "%s: téigh síos isteach i gcomhadlann %s? "
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr "%s: scrios %s scríobh-bhactha %s? "
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, c-format
 msgid "%s: remove %s %s? "
 msgstr "%s: scrios %s %s? "
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, c-format
 msgid "removed directory: %s\n"
 msgstr "scriosadh comhadlann %s\n"
 
-#: src/remove.c:444
+#: src/remove.c:447
 #, fuzzy, c-format
-msgid "cannot remove directory: %s"
-msgstr "ní féidir comhadlann %s a scriosadh"
+msgid "refusing to remove %s or %s directory: skipping %s"
+msgstr "theip ar chomhadlann %s a bhaint"
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr "ag gabháil thar %s, de bhrí go bhfuil sé ar ghléas difriúil"
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, fuzzy, c-format
 msgid "traversal failed: %s"
 msgstr "theip ar léamh"
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -8248,15 +8344,16 @@ msgstr ""
 "  -i                    tabhair leid sula mbainfear aon rud\n"
 
 #: src/rm.c:142
+#, fuzzy
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 "  -I                    tabhair leid uair amháin sula mbainfear níos mó ná\n"
 "                         trí chomhad, nó nuair a bhainfear go hathchúrsach.\n"
@@ -8335,14 +8432,24 @@ msgstr ""
 "bain úsáid as `shred'.\n"
 
 #: src/rm.c:342
-#, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr "%s: bain gach argóint go hathchúrsach? "
+#, fuzzy, c-format
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] "%s: bain gach argóint go hathchúrsach? "
+msgstr[1] "%s: bain gach argóint go hathchúrsach? "
+msgstr[2] "%s: bain gach argóint go hathchúrsach? "
+msgstr[3] "%s: bain gach argóint go hathchúrsach? "
+msgstr[4] "%s: bain gach argóint go hathchúrsach? "
 
-#: src/rm.c:343
-#, c-format
-msgid "%s: remove all arguments? "
-msgstr "%s: bain gach argóint? "
+#: src/rm.c:345
+#, fuzzy, c-format
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] "%s: bain gach argóint? "
+msgstr[1] "%s: bain gach argóint? "
+msgstr[2] "%s: bain gach argóint? "
+msgstr[3] "%s: bain gach argóint? "
+msgstr[4] "%s: bain gach argóint? "
 
 #: src/rmdir.c:134 src/rmdir.c:233
 #, c-format
@@ -8399,7 +8506,7 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
 
@@ -8460,41 +8567,46 @@ msgstr "caithfidh tú -c, -t, -u, -l, -r, nó comhthéacs a shonrú"
 msgid "no command specified"
 msgstr "níor sonraíodh ordú ar bith"
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, fuzzy, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr "is féidir runcon a úsáid le heithne SELinux amháin."
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, c-format
 msgid "failed to compute a new context"
 msgstr "theip ar chomhthéacs nua a chruthú"
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, c-format
 msgid "failed to set new user %s"
 msgstr "níorbh fhéidir úsáideoir nua %s a shocrú"
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, c-format
 msgid "failed to set new type %s"
 msgstr "theip ar chineál nua %s a shocrú"
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, c-format
 msgid "failed to set new range %s"
 msgstr "theip ar raon nua %s a shocrú"
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, c-format
 msgid "failed to set new role %s"
 msgstr "theip ar ról nua %s a shocrú"
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, c-format
 msgid "unable to set security context %s"
 msgstr "ní féidir comhthéacs slándála %s a shocrú"
 
+#: src/selinux.c:127 src/selinux.c:300
+#, fuzzy, c-format
+msgid "error canonicalizing %s"
+msgstr "earráid agus %s á léamh"
+
 #: src/seq.c:68
 #, c-format
 msgid ""
@@ -8525,10 +8637,13 @@ msgstr ""
 "  -w, --equal-width        cothromaigh leithead le nialais tosaigh\n"
 
 #: src/seq.c:86
+#, fuzzy
 msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
@@ -8542,7 +8657,7 @@ msgstr ""
 "DEIREADH, agus tá INCRIMINT diúltach de ghnáth má tá AONÚ níos mó ná "
 "DEIREADH.\n"
 
-#: src/seq.c:94
+#: src/seq.c:96
 #, fuzzy
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
@@ -8555,91 +8670,28 @@ msgstr ""
 "deachúlacha pointe fosaithe iad AONÚ, INCRIMINT, agus DEIREADH le\n"
 "huasbheachtas BCHT, agus is é %g i ngach cás eile.\n"
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, c-format
 msgid "invalid floating point argument: %s"
 msgstr "argóint neamhbhailí shnámhphointe: %s"
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, fuzzy, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr "tá %s de chineál anaithnid"
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr ""
 "ní cheadaítear teaghrán formáide agus teaghráin ar comhfhad á dtaispeáint"
 
-#: src/setuidgid.c:49
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-"Úsáid: %s ROGHA ÚS�IDEOIR ORDÚ [ARGÓINT]...\n"
-"  nó:  %s ROGHA\n"
-
-#: src/setuidgid.c:55
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-"Tréig aon ghrúpaí forlíontacha, glac le haitheantas úsáideora/grúpa\n"
-"an ÚS�IDEORA sonraithe (aitheantas uimhriúil nó ainm an úsáideora), agus\n"
-"rith ORDÚ le ARGÓINTí, má tá ann.  Scoir le stádas 111 mura bhfuiltear\n"
-"in ann na haitheantais úsáideora/grúpa a ghlacadh.\n"
-"I ngach cás eile, scoir le stádas scortha an ORDÚ.\n"
-"Ní úsáideach an clár seo mura bhfuil sé rite ag an bhforúsáideoir (UID=0).\n"
-"\n"
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-"  -g GID[,GID1...]  socraigh aitheantas an phríomhghrúpa go dtí an GID "
-"uimhriúil,\n"
-"                    agus (má thugtar iad) na haitheantais forlíontacha go "
-"GID1,...\n"
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr "Aitheantas úsáideora anaithnid: %s"
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr "chun aitheantas úsáideora %s a úsáid, ní mór duit -g a úsáid freisin"
-
-#: src/setuidgid.c:190
-#, c-format
-msgid "failed to set supplemental group(s)"
-msgstr "níorbh fhéidir an grúpa (nó na grúpaí) forlíontach a shocrú"
-
-#: src/setuidgid.c:200
-#, c-format
-msgid "cannot set group-ID to %lu"
-msgstr "ní féidir aitheantas grúpa a shocrú mar %lu"
-
-#: src/setuidgid.c:204
-#, c-format
-msgid "cannot set user-ID to %lu"
-msgstr "ní féidir aitheantas úsáideora a shocrú mar %lu"
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr "Colin Plumb"
 
-#: src/shred.c:148
+#: src/shred.c:170
 #, fuzzy
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
@@ -8649,7 +8701,7 @@ msgstr ""
 "deacra na sonraí a fháil ar ais, fiú le crua-earraí an-chostasacha.\n"
 "\n"
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, fuzzy, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -8663,9 +8715,10 @@ msgstr ""
 "(réamhshocrú: /dev/urandom)\n"
 "  -s, --size=N   léirscrios N beart (glactar le hiarmhíreanna mar K, M, G)\n"
 
-#: src/shred.c:161
+#: src/shred.c:183
+#, fuzzy
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
@@ -8677,15 +8730,20 @@ msgstr ""
 "                   is réamhshocraithe é seo le haghaidh comhad neamhghnách\n"
 "  -z, --zero     forscríobh deireanach le nialais, folaigh an léirscrios\n"
 
-#: src/shred.c:170
+#: src/shred.c:192
+#, fuzzy
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 "\n"
@@ -8698,7 +8756,7 @@ msgstr ""
 "an rogha --remove go hiondúil le gnáthchomhaid.\n"
 "\n"
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -8715,7 +8773,7 @@ msgstr ""
 "sé cumasach i ngach mód ar na córais a leanas:\n"
 "\n"
 
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -8737,7 +8795,7 @@ msgstr ""
 "Network Appliances\n"
 "\n"
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -8751,7 +8809,7 @@ msgstr ""
 "* córais chomhad comhbhrúite\n"
 "\n"
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -8772,7 +8830,7 @@ msgstr ""
 "mount (`man mount').\n"
 "\n"
 
-#: src/shred.c:215
+#: src/shred.c:241
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
 "of the file that cannot be removed, and that will allow a shredded file\n"
@@ -8782,129 +8840,129 @@ msgstr ""
 "comhad nó ar shuímh scáthánaithe, agus ní féidir na cóipeanna seo a bhaint.\n"
 "Dá bharr seo, b'fhéidir comhad léirscriosta a fháil ar ais amach anseo.\n"
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, c-format
 msgid "%s: fdatasync failed"
 msgstr "%s: theip ar fdatasync"
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr "%s: theip ar fsync"
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr "%s: ní féidir atochras"
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr "%s: timthriall %lu/%lu (%s)..."
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, c-format
 msgid "%s: error writing at offset %s"
 msgstr "%s: earráid le linn scríobh ag fritháireamh %s"
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s: theip ar lseek"
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, c-format
 msgid "%s: file too large"
 msgstr "%s: tá an comhad rómhór"
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr "%s: timthriall %lu/%lu (%s)...%s"
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr "%s: timthriall %lu/%lu (%s)...%s/%s %d%%"
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, c-format
 msgid "%s: fstat failed"
 msgstr "%s: theip ar fstat"
 
 # in FARF -KPS
-#: src/shred.c:778
+#: src/shred.c:870
 #, c-format
 msgid "%s: invalid file type"
 msgstr "%s: cineál comhaid neamhbhailí"
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr "%s: comhad de mhéid diúltach"
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, c-format
 msgid "%s: error truncating"
 msgstr "%s: earráid le linn teasctha"
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, c-format
 msgid "%s: fcntl failed"
 msgstr "%s: theip ar fcntl"
 
 # file descriptor in FARF -KPS
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr "%s: ní féidir tuarascálaí comhaid sínte amháin a léirscriosadh"
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr "%s: á scriosadh"
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, c-format
 msgid "%s: renamed to %s"
 msgstr "%s: ainm nua %s"
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, c-format
 msgid "%s: failed to remove"
 msgstr "%s: theip ar bhaint"
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr "%s: scriosta"
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, c-format
 msgid "%s: failed to close"
 msgstr "%s: theip ar dhúnadh"
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, c-format
 msgid "%s: failed to open for writing"
 msgstr "%s: theip ar oscailt chun é a scríobh"
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, c-format
 msgid "%s: invalid number of passes"
 msgstr "%s: líon na dtimthriallta neamhbhailí"
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, c-format
 msgid "multiple random sources specified"
 msgstr "sonraíodh foinsí iomadúla randamacha"
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, c-format
 msgid "%s: invalid file size"
 msgstr "%s: méid comhaid neamhbhailí"
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -8915,14 +8973,14 @@ msgstr ""
 "  nó:  %s -e [ROGHA]... [ARG]...\n"
 "  nó:  %s -i �SEAL-ARD [ROGHA]...\n"
 
-#: src/shuf.c:54
+#: src/shuf.c:67
 #, fuzzy
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr ""
 "Scríobh iomalartú randamach de na línte ionchurtha go dtí an gnáth-aschur.\n"
 "\n"
 
-#: src/shuf.c:60
+#: src/shuf.c:73
 #, fuzzy
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
@@ -8931,7 +8989,7 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
 msgstr ""
 "  -e, --echo                caith le gach ARG mar líne ionchurtha\n"
 "  -i, --input-range=LO-HI   caith le huimhreacha idir LO agus HI mar línte "
@@ -8944,31 +9002,41 @@ msgstr ""
 "  -z, --zero-terminated     cuir beart nialasach ag deireadh na línte,\n"
 "                              in ionad líne nua\n"
 
-#: src/shuf.c:244
+#: src/shuf.c:228
+#, fuzzy, c-format
+msgid "too many input lines"
+msgstr "an iomarca línte dúblacha"
+
+#: src/shuf.c:431
 #, c-format
 msgid "multiple -i options specified"
 msgstr "sonraíodh roghanna -i iomadúla"
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, c-format
 msgid "invalid input range %s"
 msgstr "raon neamhbhailí ionchurtha: %s"
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, c-format
 msgid "invalid line count %s"
 msgstr "líon neamhbhailí línte %s"
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, c-format
 msgid "multiple output files specified"
 msgstr "aschomhaid iomadúla"
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, c-format
 msgid "cannot combine -e and -i options"
 msgstr "ní féidir roghanna -e agus -i a chumasc"
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr ""
+
 #: src/sleep.c:44
 #, fuzzy, c-format
 msgid ""
@@ -8992,17 +9060,17 @@ msgstr ""
 "den luach iomlán.\n"
 "\n"
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, c-format
 msgid "invalid time interval %s"
 msgstr "tréimhse neamhbhailí %s"
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr "ní féidir an clog fhíor-ama a léamh"
 
-#: src/sort.c:399
+#: src/sort.c:427
 #, fuzzy
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr ""
@@ -9010,7 +9078,7 @@ msgstr ""
 "aschur.\n"
 "\n"
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
@@ -9018,7 +9086,7 @@ msgstr ""
 "Roghanna sórtála:\n"
 "\n"
 
-#: src/sort.c:409
+#: src/sort.c:437
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
 "  -d, --dictionary-order      consider only blanks and alphanumeric "
@@ -9030,19 +9098,19 @@ msgstr ""
 "uimhriúla\n"
 "  -f, --ignore-case           sórtáil an cás íochtair leis an gcás uachtair\n"
 
-#: src/sort.c:415
+#: src/sort.c:443
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
 "  -i, --ignore-nonprinting    consider only printable characters\n"
 "  -M, --month-sort            compare (unknown) < 'JAN' < ... < 'DEC'\n"
 msgstr ""
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 
-#: src/sort.c:423
+#: src/sort.c:451
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
 "  -R, --random-sort           sort by random hash of keys\n"
@@ -9050,7 +9118,7 @@ msgid ""
 "  -r, --reverse               reverse the result of comparisons\n"
 msgstr ""
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -9060,7 +9128,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/sort.c:437
+#: src/sort.c:465
 #, fuzzy
 msgid ""
 "Other options:\n"
@@ -9069,13 +9137,13 @@ msgstr ""
 "Roghanna sórtála:\n"
 "\n"
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
 msgstr ""
 
-#: src/sort.c:445
+#: src/sort.c:473
 #, fuzzy
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
@@ -9095,7 +9163,7 @@ msgstr ""
 "  -m, --merge               cumaisc comhaid atá sórtáilte cheana; ná "
 "sórtáil\n"
 
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -9104,13 +9172,13 @@ msgid ""
 "                            If F is - then read names from standard input\n"
 msgstr ""
 
-#: src/sort.c:459
+#: src/sort.c:487
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
 "  -m, --merge               merge already sorted files; do not sort\n"
 msgstr ""
 
-#: src/sort.c:463
+#: src/sort.c:491
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "  -s, --stable              stabilize sort by disabling last-resort "
@@ -9123,7 +9191,7 @@ msgstr ""
 "                              sórtála den rogha dheireanach\n"
 "  -S, --buffer-size=MÉID    maolán príomhchuimhne = MÉID\n"
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, fuzzy, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -9146,11 +9214,7 @@ msgstr ""
 "  -u, --unique              le -c, deimhnigh sórtáil gan dúblaigh;\n"
 "                              gan -c, ná taispeáin ach línte uathúla\n"
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr "  -z, --zero-terminated     úsáid NUL foirceanta in ionad líne nua\n"
-
-#: src/sort.c:483
+#: src/sort.c:511
 #, fuzzy
 msgid ""
 "\n"
@@ -9182,7 +9246,7 @@ msgstr ""
 "\n"
 "Is féidir na hiarmhíreanna seo a leanas a chur i ndiaidh MÉID:\n"
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -9202,261 +9266,246 @@ msgstr ""
 "Cuir LC_ALL=C chun sórtáil de réir an oird traidisiúnta\n"
 "(.i. de réir luachanna dúchasacha de na bearta.\n"
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, c-format
 msgid "waiting for %s [-d]"
 msgstr "ag feitheamh le %s [-d]"
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr "Chríochnaigh %s [-d] gan an chúis a mhíniú"
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, fuzzy, c-format
 msgid "cannot create temporary file in %s"
 msgstr "ní féidir comhad sealadach %s a chruthú"
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr "theip ar oscailt"
 
-#: src/sort.c:970
+#: src/sort.c:998
 msgid "fflush failed"
 msgstr "theip ar fflush"
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr "theip ar dhúnadh"
 
-#: src/sort.c:986
-#, c-format
-msgid "dup2 failed"
-msgstr "theip ar dup2"
-
-#: src/sort.c:1103
-#, c-format
-msgid "couldn't execute %s"
-msgstr "níorbh fhéidir %s a rith"
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 msgid "couldn't create temporary file"
 msgstr "níorbh fhéidir comhad sealadach a chruthú"
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, c-format
 msgid "couldn't create process for %s -d"
 msgstr "níorbh fhéidir próiseas a chruthú le haghaidh %s -d"
 
-#: src/sort.c:1161
-#, c-format
-msgid "couldn't execute %s -d"
-msgstr "níorbh fhéidir %s -d a rith"
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, c-format
 msgid "warning: cannot remove: %s"
 msgstr "rabhadh: ní féidir %s a scriosadh"
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, fuzzy, c-format
 msgid "invalid --%s argument %s"
 msgstr "argóint neamhbhailí %s"
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, fuzzy, c-format
 msgid "minimum --%s argument is %s"
 msgstr "argóint neamhbhailí %s%s: `%s'"
 
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, fuzzy, c-format
 msgid "--%s argument %s too large"
 msgstr "argóint %s%s rómhór: `%s'"
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr ""
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr ""
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr "stat() teipthe"
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr "theip ar léamh"
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, c-format
 msgid "string transformation failed"
 msgstr "theip ar thiontú teaghráin"
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, fuzzy, c-format
 msgid "the untransformed string was %s"
 msgstr "Ba é %s an teaghrán gan trasfhoirmiú."
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr ""
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr ""
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr ""
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr ""
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr ""
 
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, fuzzy, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
-msgstr[0] "%s: Tá an rogha `%s' débhríoch\n"
-msgstr[1] "%s: Tá an rogha `%s' débhríoch\n"
-msgstr[2] "%s: Tá an rogha `%s' débhríoch\n"
-msgstr[3] "%s: Tá an rogha `%s' débhríoch\n"
-msgstr[4] "%s: Tá an rogha `%s' débhríoch\n"
+msgstr[0] "%s: Tá an rogha `-W %s' débhríoch\n"
+msgstr[1] "%s: Tá an rogha `-W %s' débhríoch\n"
+msgstr[2] "%s: Tá an rogha `-W %s' débhríoch\n"
+msgstr[3] "%s: Tá an rogha `-W %s' débhríoch\n"
+msgstr[4] "%s: Tá an rogha `-W %s' débhríoch\n"
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr ""
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr "theip ar scríobh"
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr "%s: %s:%s: mí-eagar: "
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr "gnáth-aschur earráide"
 
-#: src/sort.c:3698
+#: src/sort.c:3738
 #, fuzzy
 msgid "cannot read"
 msgstr "%s: ní féidir atochras"
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, c-format
 msgid "%s: invalid field specification %s"
 msgstr "%s: sonraíocht neamhbhailí réimse %s"
 
-#: src/sort.c:3987
+#: src/sort.c:4028
 #, fuzzy, c-format
 msgid "options '-%s' are incompatible"
 msgstr "níl na roghanna `-%s' comhoiriúnach"
 
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, c-format
 msgid "%s: invalid count at start of %s"
 msgstr "%s: áireamh neamhbhailí ag tús %s"
 
-#: src/sort.c:4295
+#: src/sort.c:4336
 #, fuzzy
 msgid "invalid number after '-'"
 msgstr "uimhir neamhbhailí i ndiaidh `-'"
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 #, fuzzy
 msgid "invalid number after '.'"
 msgstr "uimhir neamhbhailí i ndiaidh `.'"
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr "carachtar ar seachrán i sonrú réimse"
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, c-format
 msgid "multiple compress programs specified"
 msgstr "sonraíodh cláir iomadúla chomhbhrúite"
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
 msgstr "uimhir neamhbhailí ag tús réimse"
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
 msgstr "is nialas an uimhir réimse"
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr "is nialas an fritháireamh carachtair"
 
-#: src/sort.c:4407
+#: src/sort.c:4448
 #, fuzzy
 msgid "invalid number after ','"
 msgstr "uimhir neamhbhailí i ndiaidh `,'"
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr "táb folamh"
 
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, c-format
 msgid "cannot read file names from %s"
 msgstr "ní féidir ainmneacha comhaid a léamh ó %s"
 
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, fuzzy, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr "ainm neamhbhailí comhaid: folamh"
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, fuzzy, c-format
 msgid "no input from %s"
 msgstr "inchomhad %s á dhúnadh"
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr ""
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr ""
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr "ní cheadaítear oibreann breise %s le -%c"
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr ""
 
-#: src/split.c:204
+#: src/split.c:203
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr "Úsáid: %s [ROGHA] [IONCHUR [RÉIM�R]]\n"
 
-#: src/split.c:208
+#: src/split.c:207
 #, fuzzy
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
@@ -9469,32 +9518,25 @@ msgstr ""
 "Mura bhfuil IONCHUR ann, nó más `-' é, léigh ón ghnáth-ionchur.\n"
 "\n"
 
-#: src/split.c:216
-#, fuzzy, c-format
+#: src/split.c:215
+#, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
-"  -a, --suffix-length=N   fad na hiarmhíreanna = N (réamhshocrú %d)\n"
-"  -b, --bytes=MÉID        cuir MÉID beart do gach aschomhad\n"
-"  -C, --line-bytes=MÉID   cuir MÉID beart línte ar a mhéad do gach "
-"aschomhad\n"
-"  -d, --numeric-suffixes  úsáid iarmhíreanna uimhriúla in ionad aibítreacha\n"
-"  -l, --lines=UIMHIR      cuir UIMHIR líne do gach aschomhad\n"
 
-#: src/split.c:229
+#: src/split.c:228
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
 "                            output file is opened\n"
@@ -9502,7 +9544,7 @@ msgstr ""
 "      --verbose           taispeáin diagnóisic go díreach roimh atá\n"
 "                            gach aschomhad oscailte\n"
 
-#: src/split.c:236
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -9514,189 +9556,189 @@ msgid ""
 "r/K/N   likewise but only output Kth of N to stdout\n"
 msgstr ""
 
-#: src/split.c:354
+#: src/split.c:353
 #, fuzzy, c-format
 msgid "output file suffixes exhausted"
 msgstr "Iarmhíreanna don aschomhad ídithe"
 
-#: src/split.c:366
+#: src/split.c:365
 #, c-format
 msgid "creating file %s\n"
 msgstr "comhad %s á chruthú\n"
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr ""
 
-#: src/split.c:391
+#: src/split.c:390
 #, fuzzy, c-format
 msgid "failed to set FILE environment variable"
 msgstr "theip ar ról nua %s a shocrú"
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr ""
 
-#: src/split.c:395
+#: src/split.c:394
 #, fuzzy, c-format
 msgid "failed to create pipe"
 msgstr "theip ar %s a bhaint"
 
-#: src/split.c:409
+#: src/split.c:408
 #, fuzzy, c-format
 msgid "closing prior pipe"
 msgstr "comhadlann %s á dúnadh"
 
-#: src/split.c:411
+#: src/split.c:410
 #, fuzzy, c-format
 msgid "closing output pipe"
 msgstr "aschomhad %s á dhúnadh"
 
-#: src/split.c:415
+#: src/split.c:414
 #, fuzzy, c-format
 msgid "moving input pipe"
 msgstr "inchomhad %s á dhúnadh"
 
-#: src/split.c:417
+#: src/split.c:416
 #, fuzzy, c-format
 msgid "closing input pipe"
 msgstr "inchomhad %s á dhúnadh"
 
-#: src/split.c:422
+#: src/split.c:421
 #, fuzzy, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr "theip ar chomhthéacs de %s a athrú go %s"
 
-#: src/split.c:428
+#: src/split.c:427
 #, fuzzy, c-format
 msgid "failed to close input pipe"
 msgstr "theip ar dhúnadh comhadlann %s"
 
-#: src/split.c:464
+#: src/split.c:463
 #, fuzzy, c-format
 msgid "waiting for child process"
 msgstr "ag feitheamh le \"strip\""
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr ""
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr ""
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr ""
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr "ní féidir scoilt a dhéanamh de réir níos mó ná dóigh amháin"
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, fuzzy, c-format
 msgid "%s: invalid number of chunks"
 msgstr "%s: líon na soicindí neamhbhailí"
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, fuzzy, c-format
 msgid "%s: invalid chunk number"
 msgstr "%s: uimhir neamhbhailí"
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr "%s: fad iarmhíre neamhbhailí"
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr "%s: líon neamhbhailí na mbeart"
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr "%s: líon na línte neamhbhailí"
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, c-format
 msgid "line count option -%s%c... is too large"
 msgstr "is rómhór an rogha -%s%c... don áireamh línte"
 
-#: src/split.c:1248
+#: src/split.c:1298
 #, fuzzy, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr "líne-uimhir imeachta neamhbhailí: %s"
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, fuzzy, c-format
 msgid "%s: invalid IO block size"
 msgstr "%s: méid comhaid neamhbhailí"
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr ""
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr ""
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, fuzzy, c-format
 msgid "%s: cannot determine file size"
 msgstr "ní féidir an t-óstainm a aimsiú"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr "Michael Meskes"
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, fuzzy, c-format
 msgid "failed to canonicalize %s"
 msgstr "Ní féidir %s a oscailt"
 
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, fuzzy, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr "rabhadh: éalúchán anaithnid `\\%c'"
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, c-format
 msgid "%s: invalid directive"
 msgstr "%s: treoir neamhbhailí"
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, c-format
 msgid "warning: backslash at end of format"
 msgstr "rabhadh: cúlslais ag deireadh na formáide"
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr ""
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, c-format
 msgid "cannot read file system information for %s"
 msgstr "ní féidir an t-eolas faoin chóras comhaid a léamh do %s"
 
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, fuzzy, c-format
 msgid "cannot stat standard input"
 msgstr "gnáth-ionchur á dhúnadh"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -9707,7 +9749,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -9715,30 +9757,30 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, c-format
 msgid "Context: %C\n"
 msgstr ""
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -9746,11 +9788,11 @@ msgid ""
 " Birth: %w\n"
 msgstr ""
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
 msgstr ""
 
-#: src/stat.c:1356
+#: src/stat.c:1418
 #, fuzzy
 msgid ""
 "  -L, --dereference     follow links\n"
@@ -9761,14 +9803,14 @@ msgstr ""
 "  -L, --dereference     lean naisc\n"
 "  -f, --file-system     taispeáin stádas de chóras in ionad comhaid\n"
 
-#: src/stat.c:1360
+#: src/stat.c:1422
 #, fuzzy
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 "  -c  --format=FORM�ID  úsáid FORM�ID in ionad an réamhshocraithe;\n"
@@ -9778,7 +9820,7 @@ msgstr ""
 "                          Má tá línte nua uait, cuir \\n i bhFORM�ID.\n"
 "  -t, --terse           taispeáin an t-eolas i bhfoirm ghonta\n"
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 #, fuzzy
 msgid ""
 "\n"
@@ -9799,7 +9841,7 @@ msgstr ""
 "  %B   an mhéid, i mbearta, de gach bloc tugtha ag %b\n"
 "  %C   comhthéacs slándála SELinux\n"
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 #, fuzzy
 msgid ""
 "  %d   device number in decimal\n"
@@ -9816,7 +9858,7 @@ msgstr ""
 "  %g   Aitheantas ghrúpa den úinéir\n"
 "  %G   Ainm grúpa den úinéir\n"
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 #, fuzzy
 msgid ""
 "  %h   number of hard links\n"
@@ -9826,8 +9868,8 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 "  %h   Líon na nasc crua\n"
 "  %i   Uimhir inode\n"
@@ -9838,7 +9880,7 @@ msgstr ""
 "  %t   Cineál gléis príomha, heicsidheachúlach\n"
 "  %T   Cineál gléis mion, heicsidheachúlach\n"
 
-#: src/stat.c:1399
+#: src/stat.c:1461
 #, fuzzy
 msgid ""
 "  %u   user ID of owner\n"
@@ -9847,10 +9889,10 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 "  %u   Aitheantas an úinéara\n"
@@ -9863,7 +9905,7 @@ msgstr ""
 "  %Z   Am den athrú is déanaí, soicindí ón tSainré\n"
 "\n"
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 #, fuzzy
 msgid ""
 "Valid format sequences for file systems:\n"
@@ -9883,7 +9925,7 @@ msgstr ""
 "  %f   Bloic ar fáil sa chóras comhaid\n"
 "  %C   Comhthéacs slándála SELinux\n"
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 #, fuzzy
 msgid ""
 "  %i   file system ID in hex\n"
@@ -9952,22 +9994,27 @@ msgid ""
 "and are thus unaffected by 'stdbuf' settings.\n"
 msgstr ""
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, fuzzy, c-format
 msgid "failed to find %s"
 msgstr "Ní féidir %s a oscailt"
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, fuzzy, c-format
 msgid "failed to update the environment with %s"
 msgstr "theip ar an gcomhthéacs slándála de %s a athrú go %s"
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr ""
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, c-format
+msgid "you must specify a buffering mode option"
+msgstr ""
+
+#: src/stty.c:516
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -9978,11 +10025,11 @@ msgstr ""
 "  nó:  %s [-F GLÉAS] [--file=GLÉAS] [-a|--all]\n"
 "  nó:  %s [-F GLÉAS] [--file=GLÉAS] [-g|--save]\n"
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
 msgstr ""
 
-#: src/stty.c:525
+#: src/stty.c:528
 #, fuzzy
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
@@ -9995,7 +10042,7 @@ msgstr ""
 "  -g, --save         taispeáin na hairíonna go léir i gcruth stty-inléite\n"
 "  -F, --file=GLÉAS   oscail úsáid GLÉAS in ionad an ghnáth-ionchuir\n"
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
@@ -10006,7 +10053,7 @@ msgstr ""
 "roghanna neamh-POSIX le `*'.  Socraíonn an córas féin na roghanna atá ar "
 "fáil.\n"
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -10021,7 +10068,7 @@ msgstr ""
 "   eof CAR       Seolfaidh CAR comhadchríoch (críochnaigh ionchur)\n"
 "   eol CAR       Críochnóidh CAR an líne\n"
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -10033,7 +10080,7 @@ msgstr ""
 "   intr CAR      seolfaidh CAR comhartha idirbhriste\n"
 "   kill CAR      léirscriosfaidh CAR an líne reatha\n"
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -10045,7 +10092,7 @@ msgstr ""
 " * rprnt CAR     priontálfaidh CAR an líne reatha arís\n"
 "   start CAR     atosóidh CAR an t-aschur i ndiaidh á stopadh\n"
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -10057,7 +10104,7 @@ msgstr ""
 " * swtch CAR     athróidh CAR chuig sraith bhlaoisce eile\n"
 " * werase CAR    léirscriosfaidh CAR an focal is déanaí\n"
 
-#: src/stty.c:562
+#: src/stty.c:565
 #, fuzzy
 msgid ""
 "\n"
@@ -10072,7 +10119,7 @@ msgstr ""
 " * cols N        cuir in iúl go bhfuil N colún ag an teirminéal\n"
 " * columns N     ar comhbhrí le `cols N'\n"
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -10085,7 +10132,7 @@ msgstr ""
 "   min N         le -icanon, N=íosmhéid de charachtair in aon léamh\n"
 "   ospeed N      socraigh an luas aschurtha a bheith N bád\n"
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -10098,7 +10145,7 @@ msgstr ""
 "   speed         taispeáin luas an teirminéil\n"
 "   time N        le -icanon, socraigh seal fanachta, N deachú soicind\n"
 
-#: src/stty.c:581
+#: src/stty.c:584
 #, fuzzy
 msgid ""
 "\n"
@@ -10116,7 +10163,7 @@ msgstr ""
 " * [-]crtscts    cuir croitheadh láimhe RTS/CTS ar siúl\n"
 "   csN           socraigh an mhéid carachtair, N giotán, N=5,6,7, nó 8\n"
 
-#: src/stty.c:590
+#: src/stty.c:593
 #, fuzzy
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
@@ -10125,6 +10172,7 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 "   [-]cstopb     dhá ghiotán stoptha an charachtair (1 le `-')\n"
 "   [-]hup        seol comhartha HUP nuair a dhúnann an tty\n"
@@ -10132,7 +10180,7 @@ msgstr ""
 "   [-]parenb     gin giotán paireachta san aschur agus iarr é san ionchur\n"
 "   [-]parodd     socraigh paireacht chorr (cothrom le `-')\n"
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -10148,7 +10196,7 @@ msgstr ""
 "   [-]ignbrk     déan neamhshuim ar charachtair bhriste\n"
 "   [-]igncr      déan neamhshuim ar aisfhilleadh\n"
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -10162,11 +10210,11 @@ msgstr ""
 "   [-]inpck      cuir seiceáil phaireachta den ionchur ar siúl\n"
 "   [-]istrip     glan an t-ochtú giotán de gach carachtar ionchurtha\n"
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr " * [-]iutf8      glac le carachtair san ionchódú UTF-8\n"
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -10182,7 +10230,7 @@ msgstr ""
 "   [-]parmrk     comharthaigh earráidí phaireachta (le cód 255-0-carachtar)\n"
 "   [-]tandem     ar comhbhrí le [-]ixoff\n"
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -10198,10 +10246,11 @@ msgstr ""
 " * ffN           mód moille d'fhoirmfhotha, N=0 nó 1\n"
 " * nlN           mód moille do línte nua, N=0 nó 1\n"
 
-#: src/stty.c:631
+#: src/stty.c:635
+#, fuzzy
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
@@ -10214,7 +10263,7 @@ msgstr ""
 " * [-]onlcr      tiontaigh líne nua go haisfhilleadh+líne nua\n"
 " * [-]onlret     déan líne nua aisfhilleadh\n"
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -10230,7 +10279,7 @@ msgstr ""
 " * -tabs         ar comhbhrí le tab3\n"
 " * vtN           mód moille do tháib ingearacha, N=0 nó 1\n"
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -10247,7 +10296,7 @@ msgstr ""
 " * -crtkill      scrios gach líne trí ghéilleadh do na roghanna echoctl/"
 "echok\n"
 
-#: src/stty.c:654
+#: src/stty.c:658
 #, fuzzy
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
@@ -10262,7 +10311,7 @@ msgstr ""
 "   [-]echoe      ar comhbhrí le [-]crterase\n"
 "   [-]echok      déan macalla de líne nua i ndiaidh carachtair maraithe\n"
 
-#: src/stty.c:661
+#: src/stty.c:665
 #, fuzzy
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
@@ -10279,7 +10328,7 @@ msgstr ""
 "rprnt\n"
 "   [-]iexten     cumasaigh carachtair speisialta neamh-POSIX\n"
 
-#: src/stty.c:668
+#: src/stty.c:672
 #, fuzzy
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
@@ -10298,7 +10347,7 @@ msgstr ""
 " * [-]xcase      le icanon, éalúchán le `\\' do charachtair sa chás "
 "uachtair\n"
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -10312,7 +10361,7 @@ msgstr ""
 "   cbreak        ar comhbhrí le -icanon\n"
 "   -cbreak       ar comhbhrí le icanon\n"
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -10325,7 +10374,7 @@ msgstr ""
 "   -cooked       ar comhbhrí le `raw'\n"
 "   crt           ar comhbhrí le echoe echoctl echoke\n"
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -10340,7 +10389,7 @@ msgstr ""
 "réamhshocraithe\n"
 "   evenp         ar comhbhrí le parenb -parodd cs7\n"
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -10356,7 +10405,7 @@ msgstr ""
 "   nl            ar comhbhrí le -icrnl -onlcr\n"
 "   -nl           ar comhbhrí le icrnl -inlcr -igncr onlcr -ocrnl -onlret\n"
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -10370,7 +10419,7 @@ msgstr ""
 "   pass8         ar comhbhrí le -parenb -istrip cs8\n"
 "   -pass8        ar comhbhrí le parenb istrip cs7\n"
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -10383,7 +10432,7 @@ msgstr ""
 "                 -imaxbel -opost -isig -icanon -xcase min 1 time 0\n"
 "   -raw          ar comhbhrí le `cooked'\n"
 
-#: src/stty.c:716
+#: src/stty.c:720
 #, fuzzy
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
@@ -10402,7 +10451,7 @@ msgstr ""
 "                 agus glacann carachtair speisialta a luach "
 "réamhshocraithe.\n"
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -10417,12 +10466,12 @@ msgstr ""
 "nó\n"
 "127; úsáid luachanna ^- nó undef chun carachtair speisialta a stopadh.\n"
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, c-format
 msgid "only one device may be specified"
 msgstr "ní cheadaítear ach gléas amháin a bheith ceaptha"
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
@@ -10431,43 +10480,43 @@ msgstr ""
 "is comheisiatach iad na roghanna d'aschur foclach agus\n"
 "d'aschur stty-inléite"
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr "ní cheadaítear móid a shocrú agus an fhormáid aschurtha a cheapadh"
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr "%s: ní féidir mód gan bacainní a athshocrú"
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, c-format
 msgid "invalid argument %s"
 msgstr "argóint neamhbhailí %s"
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, c-format
 msgid "missing argument to %s"
 msgstr "tá argóint de dhíth i ndiaidh na rogha %s"
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, c-format
 msgid "invalid line discipline %s"
 msgstr "disciplín neamhbhailí líne %s"
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr "%s: ní féidir gach tasc iarrtha a dhéanamh"
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr "%s: níl aon eolas ar fáil faoin mhéid den ghléas seo"
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, c-format
 msgid "invalid integer argument %s"
 msgstr "argóint neamhbhailí shlánuimhreach %s"
@@ -10525,7 +10574,7 @@ msgstr "      --help     taispeáin an chabhair seo agus scoir\n"
 msgid "      --version  output version information and exit\n"
 msgstr "      --version  taispeáin eolas faoin leagan agus scoir\n"
 
-#: src/system.h:544
+#: src/system.h:543
 #, fuzzy
 msgid ""
 "\n"
@@ -10534,15 +10583,15 @@ msgstr ""
 "Is riachtanach le rogha ghearr aon argóint atá riachtanach leis an rogha "
 "fhada.\n"
 
-#: src/system.h:552
+#: src/system.h:551
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -10551,35 +10600,33 @@ msgid ""
 "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n"
 msgstr ""
 
-#: src/system.h:571
-#, fuzzy, c-format
+#: src/system.h:570
+#, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
+"%s online help: <%s>\n"
 msgstr ""
-"\n"
-"Seol tuairiscí fabhtanna chuig <%s>.\n"
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr ""
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr ""
 
-#: src/system.h:596
+#: src/system.h:591
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Bain triail as `%s --help' chun tuilleadh eolais a fháil.\n"
 
-#: src/system.h:628
+#: src/system.h:633
 #, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -10682,18 +10729,16 @@ msgstr ""
 
 #: src/tail.c:270
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
 
 #: src/tail.c:274
+#, fuzzy
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 "  -f, --follow[={name|descriptor}]\n"
@@ -10703,18 +10748,17 @@ msgstr ""
 "comhbhrí\n"
 "  -F                     ar comhbhrí le --follow=name --retry\n"
 
-#: src/tail.c:281
+#: src/tail.c:280
 #, fuzzy, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
 "  -n, --lines=N            scríobh an N líne is déanaí, in ionad an %d líne\n"
 "                             is déanaí; nó bain úsáid as +N chun línte a\n"
@@ -10726,14 +10770,12 @@ msgstr ""
 "                           féachaint an raibh sé dínasctha nó athainmnithe\n"
 "                           (mar shampla do logchomhaid uainíochta go minic)\n"
 
-#: src/tail.c:294
+#: src/tail.c:293
 #, fuzzy
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 "      --pid=PID            le -f, stop tar éis bháis an phróisis\n"
 "  -q, --quiet, --silent    ná taispeáin ceanntásca le hainmneacha comhaid\n"
@@ -10742,16 +10784,16 @@ msgstr ""
 "  -v, --verbose            taispeáin ceanntásca le hainmneacha comhaid i "
 "gcónaí\n"
 
-#: src/tail.c:301
+#: src/tail.c:298
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 
-#: src/tail.c:310
+#: src/tail.c:307
 #, fuzzy
 msgid ""
 "\n"
@@ -10771,7 +10813,7 @@ msgstr ""
 "GB 1000*1000*1000, G 1024*1024*1024, srl. le T, P, E, Z, Y.\n"
 "\n"
 
-#: src/tail.c:319
+#: src/tail.c:316
 #, fuzzy
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
@@ -10788,162 +10830,169 @@ msgstr ""
 "comhad tugtha trína athoscailt anois agus arís, féachaint ar scrios agus\n"
 "ar athchruthaigh clár eile é.\n"
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr "%s (fd=%d) á dhúnadh"
 
-#: src/tail.c:453
-#, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr "%s: ní féidir bogadh go fritháireamh coibhneasta %s"
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr "%s: ní féidir bogadh go fritháireamh coibhneasta ón chríoch %s"
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr ""
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
 "reverting to polling"
 msgstr ""
 
-#: src/tail.c:963
+#: src/tail.c:965
+#, fuzzy, c-format
+msgid "%s has been replaced with a symbolic link. giving up on this name"
+msgstr "cuireadh comhad nach féidir a `tail' in áit %s; á thréigean"
+
+#: src/tail.c:980
 #, c-format
 msgid "%s has become inaccessible"
 msgstr "tá %s dorochtana anois"
 
-#: src/tail.c:980
+#: src/tail.c:997
 #, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr "cuireadh comhad nach féidir a `tail' in áit %s; á thréigean"
 
-#: src/tail.c:989
+#: src/tail.c:1006
 #, fuzzy, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr "cuireadh comhad nach féidir a `tail' in áit %s; á thréigean"
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, c-format
 msgid "%s has become accessible"
 msgstr "tá %s insroichte anois"
 
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr "tá %s ann anois;  críoch an chomhaid nua á leanúint"
 
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr "tá comhad nua in áit %s anois;  críoch an chomhaid nua á leanúint"
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr "%s: ní féidir mód gan bacainní a athshocrú"
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr "%s: comhad teasctha"
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr "níl aon chomhad fágtha"
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, fuzzy, c-format
 msgid "cannot watch parent directory of %s"
 msgstr "níl an chomhadlann oibre ar fáil (%s anois)"
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, fuzzy, c-format
 msgid "inotify resources exhausted"
 msgstr "cuimhne ídithe"
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, fuzzy, c-format
 msgid "cannot watch %s"
 msgstr "ní féidir %s a `touch'"
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr ""
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, fuzzy, c-format
 msgid "error reading inotify event"
 msgstr "earráid agus %s á léamh"
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr ""
 "%s: ní féidir an chríoch a lorg do chomhad den chineál seo; ag tréigean"
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, c-format
 msgid "number in %s is too large"
 msgstr "tá an uimhir i %s rómhór"
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr "%s: is neamhbhailí é an líon uasta `stat'anna gan athrú idir oscailtí"
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr "%s: PID neamhbhailí"
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr "%s: líon na soicindí neamhbhailí"
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr "úsáideadh an rogha i gcomhthéacs neamhbhailí -- %c"
 
-#: src/tail.c:2034
+#: src/tail.c:2096
+#, fuzzy, c-format
+msgid "warning: --retry ignored; --retry is useful only when following"
+msgstr ""
+"rabhadh: rinneadh neamhshuim ar PID; níl --pid=PID tairbheach\n"
+"mura bhfuiltear ag leanúint"
+
+#: src/tail.c:2100
 #, c-format
-msgid "warning: --retry is useful mainly when following by name"
-msgstr "rabhadh: níl --retry áisiúil ach amháin nuair a leantar de réir ainm"
+msgid "warning: --retry only effective for the initial open"
+msgstr ""
 
-#: src/tail.c:2038
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
 msgstr ""
 "rabhadh: rinneadh neamhshuim ar PID; níl --pid=PID tairbheach\n"
 "mura bhfuiltear ag leanúint"
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr "rabhadh: níl --pid=PID ar fáil ar an gcóras seo"
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, c-format
 msgid "cannot follow %s by name"
 msgstr "ní féidir %s a leanúint de réir a ainm"
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr "rabhadh: níl maith ar bith i lorg an ghnáth-ionchur gan teorainn ama"
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr ""
@@ -11218,17 +11267,17 @@ msgstr "argóint bhreise %s"
 msgid "warning: sigprocmask"
 msgstr ""
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr ""
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr ""
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
@@ -11237,33 +11286,29 @@ msgstr ""
 "Úsáid: %s ROGHA ÚS�IDEOIR ORDÚ [ARGÓINT]...\n"
 "  nó:  %s ROGHA\n"
 
-#: src/timeout.c:229
-#, fuzzy
+#: src/timeout.c:232
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
 msgstr ""
-"Is riachtanach le rogha ghearr aon argóint atá riachtanach leis an rogha "
-"fhada.\n"
 
-#: src/timeout.c:235
+#: src/timeout.c:238
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 msgid ""
 "\n"
 "DURATION is a floating point number with an optional suffix:\n"
@@ -11271,7 +11316,7 @@ msgid ""
 "days.\n"
 msgstr ""
 
-#: src/timeout.c:259
+#: src/timeout.c:262
 msgid ""
 "\n"
 "If the command times out, and --preserve-status is not set, then exit with\n"
@@ -11282,17 +11327,17 @@ msgid ""
 "case the exit status is 128+9 rather than 124.\n"
 msgstr ""
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr ""
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, fuzzy, c-format
 msgid "error waiting for command"
 msgstr "earráid agus %s á scríobh"
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr ""
@@ -11689,7 +11734,7 @@ msgstr ""
 #: src/truncate.c:115
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 
 #: src/truncate.c:121
@@ -11777,12 +11822,12 @@ msgstr ""
 "Mura bhfuil COMHAD ann, nó más '-' é, léigh ón ghnáth-ionchur.\n"
 "\n"
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr "%s: is corr líon na dteaghrán san ionchur"
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr "%s: tá lúb san ionchur:"
@@ -11880,12 +11925,12 @@ msgstr "táib rófhada ó chéile"
 msgid "tab stop value is too large"
 msgstr "is rómhór an luach tábstoip"
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr "Úsáid: %s [ROGHA]... [IONCHUR [ASCHUR]]\n"
 
-#: src/uniq.c:138
+#: src/uniq.c:174
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
 "writing to OUTPUT (or standard output).\n"
@@ -11893,41 +11938,45 @@ msgid ""
 "With no options, matching lines are merged to the first occurrence.\n"
 msgstr ""
 
-#: src/uniq.c:147
+#: src/uniq.c:183
+#, fuzzy
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
 msgstr ""
 "  -c, --count           taispeáin líon na dtarluithe ar tosach gach líne  -"
 "d, --repeated        ná taispeáin ach línte dúblacha\n"
 
-#: src/uniq.c:151
-#, fuzzy
+#: src/uniq.c:187
+msgid ""
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
+msgstr ""
+
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr ""
+
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
+msgstr ""
+
+#: src/uniq.c:199
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
 "  -i, --ignore-case     ignore differences in case when comparing\n"
 "  -s, --skip-chars=N    avoid comparing the first N characters\n"
 "  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
-msgstr ""
-"  -D, --all-repeated[=modh] taispeáin gach líne dhúblach\n"
-"                        modh={none(réamhshocrú),prepend,separate}\n"
-"                        Úsáidtear línte folmha mar theormharcóirí.\n"
-"  -f, --skip-fields=N   ná déan comparáid ar an chéad N réimse\n"
-"  -i, --ignore-case     déan neamhshuim ar chás i gcomparáidí\n"
-"  -s, --skip-chars=N    ná déan comparáid ar an chéad N carachtar\n"
-"  -u, --unique          ná taispeáin ach línte uathúla\n"
-"  -z, --zero-terminated cuir beart 0 ag deireadh gach líne in ionad líne "
-"nuaí\n"
-
-#: src/uniq.c:161
+msgstr ""
+
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr "  -w, --check-chars=N   déan comparáid ar N carachtar ar a mhéad\n"
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 msgid ""
 "\n"
 "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n"
@@ -11938,7 +11987,7 @@ msgstr ""
 "agus\n"
 "ansin carachtair nach spás bán.  Gabhtar thar réimsí roimh charachtair.\n"
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 #, fuzzy
 msgid ""
 "\n"
@@ -11951,24 +12000,34 @@ msgstr ""
 "Dá bhrí seo is fearr má sórtálann tú an t-ionchur ar dtús, nó bain\n"
 "úsáid as `sort -u' gan `uniq'.\n"
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, c-format
 msgid "too many repeated lines"
 msgstr "an iomarca línte dúblacha"
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
 msgstr "is neamhbhailí líon na réimsí le ligean thar"
 
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
 msgstr "is neamhbhailí líon na mbeart le ligean thar"
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
 msgstr "is neamhbhailí líon na mbeart a chur i gcomparáid"
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr ""
+
+#: src/uniq.c:652
+#, fuzzy, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr "Is gan chiall línte dúblacha AGUS líon na hathráite a thaispeáint"
+
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr "Is gan chiall línte dúblacha AGUS líon na hathráite a thaispeáint"
@@ -11990,11 +12049,6 @@ msgstr ""
 "Bain úsáid as an fheidhm unlink() chun an COMHAD a scriosadh.\n"
 "\n"
 
-#: src/unlink.c:86
-#, c-format
-msgid "cannot unlink %s"
-msgstr "ní féidir %s a dhínasc"
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -12045,7 +12099,7 @@ msgstr[4] "%lu úsáideoir"
 msgid ",  load average: %.2f"
 msgstr ",  meánlód: %.2f"
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, fuzzy, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -12058,19 +12112,19 @@ msgstr ""
 "Mura bhfuil COMHAD tugtha, úsáid %s.  Feictear %s mar CHOMHAD go minic.\n"
 "\n"
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
 "an uninterruptible sleep state also contribute to the load average.\n"
 msgstr ""
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr ""
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, fuzzy, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
@@ -12309,207 +12363,69 @@ msgstr ""
 "Priontáil líne arís agus arís le gach TEAGHR�N ceaptha, nó `y'.\n"
 "\n"
 
-#, fuzzy
-#~ msgid "  returning value: '%s'\n"
-#~ msgstr "comhad %s á chruthú\n"
-
-#, fuzzy
-#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n"
-#~ msgstr "Úsáid: %s [ROGHA] AINM...\n"
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: rogha neamhcheadaithe -- %c\n"
 
-#, fuzzy
-#~ msgid "no valid suffix found\n"
-#~ msgstr "%s: fad iarmhíre neamhbhailí"
+#~ msgid "invalid argument: %s"
+#~ msgstr "argóint neamhbhailí: %s"
 
 #~ msgid ""
+#~ "  -w, --wrap=COLS       Wrap encoded lines after COLS character (default "
+#~ "76).\n"
+#~ "                        Use 0 to disable line wrapping.\n"
 #~ "\n"
-#~ "Examples:\n"
-#~ "  %s /usr/bin/sort       Output \"sort\".\n"
-#~ "  %s include/stdio.h .h  Output \"stdio\".\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Mar shampla:\n"
-#~ "  %s /usr/bin/sort       Aschur: \"sort\".\n"
-#~ "  %s include/stdio.h .h  Aschur: \"stdio\".\n"
-
-#~ msgid "reading %s"
-#~ msgstr "%s á léamh"
-
-#~ msgid "writing %s"
-#~ msgstr "%s á scríobh"
-
-#~ msgid "closing %s"
-#~ msgstr "%s á dhúnadh"
-
-#~ msgid "accessing %s"
-#~ msgstr "%s á rochtain"
-
-#~ msgid "opening %s"
-#~ msgstr "%s á oscailt"
-
-#~ msgid ""
-#~ "Usage: %s NAME\n"
-#~ "  or:  %s OPTION\n"
-#~ msgstr ""
-#~ "Úsáid: %s AINM\n"
-#~ "  nó:  %s ROGHA\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "  -x, --one-file-system    skip directories on different file systems\n"
-#~ "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
-#~ "      --exclude=PATTERN    exclude files that match PATTERN\n"
-#~ "  -d, --max-depth=N     print the total for a directory (or file, with --"
-#~ "all)\n"
-#~ "                          only if it is N or fewer levels below the "
-#~ "command\n"
-#~ "                          line argument;  --max-depth=0 is the same as\n"
-#~ "                          --summarize\n"
-#~ msgstr ""
-#~ "  -x, --one-file-system  fan ar an chóras chomhaid seo\n"
-#~ "  -X COMHAD, --exclude-from=COMHAD  Ná cuir comhaid san áireamh atá\n"
-#~ "                                     comhoiriúnach le haon phatrún i "
-#~ "gCOMHAD.\n"
-#~ "      --exclude=PATRÚN  Ná cuir comhaid atá comhoiriúnach le PATRÚN san "
-#~ "áireamh\n"
-#~ "      --max-depth=N     taispeáin iomlán do chomhadlann (nó comhad, le --"
-#~ "all)\n"
-#~ "                          nuair atá sé N leibhéal, ar a mhéad, faoin "
-#~ "argóint\n"
-#~ "                          ar líne na n-orduithe;  is ionann --max-depth=0 "
-#~ "agus\n"
-#~ "                          --summarize\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "  none, off       never make backups (even if --backup is given)\n"
-#~ "  numbered, t     make numbered backups\n"
-#~ "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
-#~ "  simple, never   always make simple backups\n"
+#~ "  -d, --decode          Decode data.\n"
+#~ "  -i, --ignore-garbage  When decoding, ignore non-alphabet characters.\n"
 #~ "\n"
 #~ msgstr ""
-#~ "  none, off       ná déan cúltacaí choíche (fiú má tá --backup ceaptha)\n"
-#~ "  numbered, t     déan cúltacaí agus uimhreacha orthu\n"
-#~ "  existing, nil   numbered má tá uimhreacha orthu anois, simple mura "
-#~ "bhfuil\n"
-#~ "  simple, never   déan cúltacaí simplí i gcónaí\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "WARNING: --page-increment is deprecated; use --line-increment instead"
-#~ msgstr ""
-#~ "tá an rogha --allow-missing dulta i léig; bain úsáid as --retry ina háit"
-
-#~ msgid "All arguments to long options are mandatory for short options.\n"
-#~ msgstr ""
-#~ "Is riachtanach le rogha ghearr aon argóint atá riachtanach leis an rogha "
-#~ "fhada.\n"
-
-#, fuzzy
-#~ msgid ""
+#~ "  -w, --wrap=COLÚIN     Timfhill línte ionchódaithe tar éis COLÚIN "
+#~ "charachtar\n"
+#~ "                        (réamhshocrú=76).\n"
+#~ "                        Úsáid 0 chun timfhilleadh a dhíchumasú.\n"
 #~ "\n"
-#~ "RADIX is d for decimal, o for octal, x for hexadecimal or n for none.\n"
-#~ "BYTES is hexadecimal with 0x or 0X prefix, and may have a multiplier "
-#~ "suffix:\n"
-#~ "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
-#~ "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n"
-#~ "Adding a z suffix to any type displays printable characters at the end of "
-#~ "each\n"
-#~ "output line.\n"
-#~ msgstr ""
+#~ "  -d, --decode          Díchódaigh sonraí.\n"
+#~ "  -i, --ignore-garbage  Déan neamhshuim ar charachtair neamhaibítreacha "
+#~ "le\n"
+#~ "                         linn díchódaithe.\n"
 #~ "\n"
-#~ "BUNUIMHIR: d=deachúlach, o=ochtnártha, x=heicsidheachúlach, nó "
-#~ "n=neamhní.\n"
-#~ "Comharthaíonn réimír 0x nó 0X go bhfuil BEARTA heicsidheachúlach, agus "
-#~ "is\n"
-#~ "féidir iarmhír iolraithe a chur leis:\n"
-#~ "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
-#~ "GB 1000*1000*1000, G 1024*1024*1024, srl. le T, P, E, Z, Y.\n"
-#~ "Má tá iarmhír `z' ann le cineál ar bith, taispeánfar carachtair\n"
-#~ "inphriontáilte ag an deireadh de gach líne aschurtha.  "
 
-#, fuzzy
 #~ msgid ""
-#~ "Option --string without a number implies 3; option --width without a "
-#~ "number\n"
-#~ "implies 32.  By default, od uses -A o -t oS -w16.\n"
+#~ "      --help            Display this help and exit.\n"
+#~ "      --version         Output version information and exit.\n"
 #~ msgstr ""
-#~ "Glactar le 3 mura bhfuil uimhir i ndiaidh --string, agus glactar le 32\n"
-#~ "i ndiaidh --width mar an gcéanna.  De réir réamhshocraithe, úsáideann od\n"
-#~ "roghanna -A o -t d2 -w16.\n"
-
-#~ msgid "Usage: %s [OPTION]... FILE\n"
-#~ msgstr "Úsáid: %s [ROGHA]... COMHAD\n"
-
-#~ msgid "Password:"
-#~ msgstr "Focal faire:"
-
-#~ msgid "getpass: cannot open /dev/tty"
-#~ msgstr "getpass: ní féidir /dev/tty a oscailt"
-
-#~ msgid "cannot set groups"
-#~ msgstr "ní féidir grúpaí a shocrú"
-
-#~ msgid "cannot set group id"
-#~ msgstr "ní féidir aitheantas an ghrúpa a shocrú"
-
-#~ msgid "cannot set user id"
-#~ msgstr "ní féidir aitheantas an úsáideora a shocrú"
-
-#~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n"
-#~ msgstr "Úsáid: %s [ROGHA]... [-] [ÚS�IDEOIR [ARG]...]\n"
+#~ "      --help            Taispeáin an chabhair seo agus scoir.\n"
+#~ "      --version         Taispeáin eolas faoin leagan agus scoir.\n"
 
-#~ msgid ""
-#~ "Change the effective user id and group id to that of USER.\n"
-#~ "\n"
-#~ "  -, -l, --login               make the shell a login shell\n"
-#~ "  -c, --command=COMMAND        pass a single COMMAND to the shell with -"
-#~ "c\n"
-#~ "  -f, --fast                   pass -f to the shell (for csh or tcsh)\n"
-#~ "  -m, --preserve-environment   do not reset environment variables\n"
-#~ "  -p                           same as -m\n"
-#~ "  -s, --shell=SHELL            run SHELL if /etc/shells allows it\n"
-#~ msgstr ""
-#~ "Athraigh an t-aitheantas úsáideora/grúpa i bhfeidhm go dtí na cinn\n"
-#~ "atá ag ÚS�IDEOIR.\n"
-#~ "\n"
-#~ "  -, -l, --login               bain úsáid as blaosc logála isteach\n"
-#~ "  -c, --commmand=ORDÚ          seachaid ORDÚ chuig an bhlaosc le -c\n"
-#~ "  -f, --fast                   seachaid -f chuig an bhlaosc (csh nó "
-#~ "tcsh)\n"
-#~ "  -m, --preserve-environment   ná hathshocraigh athróga thimpeallachta\n"
-#~ "  -p                           ar comhbhrí le -m\n"
-#~ "  -s, --shell=BLAOSC           rith BLAOSC má cheadaíonn /etc/shells é\n"
+#~ msgid "FIXME unknown"
+#~ msgstr "FIXME: anaithnid"
 
 #~ msgid ""
 #~ "\n"
-#~ "A mere - implies -l.   If USER not given, assume root.\n"
+#~ "Examples:\n"
+#~ "  %s /usr/bin/sort       Output \"sort\".\n"
+#~ "  %s include/stdio.h .h  Output \"stdio\".\n"
 #~ msgstr ""
 #~ "\n"
-#~ "Úsáidtear -l go huathoibríoch nuair a shonraítear `-' lom.\n"
-#~ "Mura bhfuil ÚS�IDEOIR ann, glactar le root.\n"
-
-#~ msgid "user %s does not exist"
-#~ msgstr "níl a leithéid d'úsáideoir %s"
-
-#~ msgid "incorrect password"
-#~ msgstr "focal faire mícheart"
+#~ "Mar shampla:\n"
+#~ "  %s /usr/bin/sort       Aschur: \"sort\".\n"
+#~ "  %s include/stdio.h .h  Aschur: \"stdio\".\n"
 
-#~ msgid "using restricted shell %s"
-#~ msgstr "ag baint úsáid as blaosc shrianta %s"
+#~ msgid "Usage: %s [OPTION] [FILE]...\n"
+#~ msgstr "Úsáid: %s [ROGHA] [COMHAD]...\n"
 
-#~ msgid "warning: cannot change directory to %s"
-#~ msgstr "rabhadh: ní féidir an chomhadlann oibre a athrú go %s"
+#~ msgid "%s"
+#~ msgstr "%s"
 
-#, fuzzy
 #~ msgid ""
 #~ "Change the group of each FILE to GROUP.\n"
 #~ "With --reference, change the group of each FILE to that of RFILE.\n"
 #~ "\n"
 #~ "  -c, --changes          like verbose but report only when a change is "
 #~ "made\n"
-#~ "  -f, --silent, --quiet  suppress most error messages\n"
-#~ "  -v, --verbose          output a diagnostic for every file processed\n"
+#~ "      --dereference      affect the referent of each symbolic link (this "
+#~ "is\n"
+#~ "                         the default), rather than the symbolic link "
+#~ "itself\n"
 #~ msgstr ""
 #~ "Athraigh an grúpa de gach COMHAD go GRÚPA.\n"
 #~ "Le --reference, athraigh an grúpa de gach COMHAD go dtí an grúpa de "
@@ -12522,14 +12438,6 @@ msgstr ""
 #~ "                           shiombalaigh féin\n"
 
 #~ msgid ""
-#~ "      --no-preserve-root  do not treat `/' specially (the default)\n"
-#~ "      --preserve-root     fail to operate recursively on `/'\n"
-#~ msgstr ""
-#~ "      --no-preserve-root  ná tabhair cóir speisialta do "
-#~ "`/' (réamhshocrú)\n"
-#~ "      --preserve-root     ná caith le `/' go hathchúrsach\n"
-
-#~ msgid ""
 #~ "  -f, --silent, --quiet  suppress most error messages\n"
 #~ "      --reference=RFILE  use RFILE's group rather than specifying a\n"
 #~ "                         GROUP value\n"
@@ -12557,6 +12465,14 @@ msgstr ""
 #~ "ar athruithe\n"
 
 #~ msgid ""
+#~ "      --no-preserve-root  do not treat `/' specially (the default)\n"
+#~ "      --preserve-root     fail to operate recursively on `/'\n"
+#~ msgstr ""
+#~ "      --no-preserve-root  ná tabhair cóir speisialta do "
+#~ "`/' (réamhshocrú)\n"
+#~ "      --preserve-root     ná caith le `/' go hathchúrsach\n"
+
+#~ msgid ""
 #~ "  -f, --silent, --quiet   suppress most error messages\n"
 #~ "  -v, --verbose           output a diagnostic for every file processed\n"
 #~ "      --reference=RFILE   use RFILE's mode instead of MODE values\n"
@@ -12610,74 +12526,6 @@ msgstr ""
 #~ "próiseáilte\n"
 
 #~ msgid ""
-#~ "Display the current time in the given FORMAT, or set the system date.\n"
-#~ "\n"
-#~ "  -d, --date=STRING         display time described by STRING, not `now'\n"
-#~ "  -f, --file=DATEFILE       like --date once for each line of DATEFILE\n"
-#~ msgstr ""
-#~ "Taispeáin an t-am anois i gcruth FORM�ID, nó socraigh dáta an chórais.\n"
-#~ "\n"
-#~ "  -d, --date=TEAGHR�N       taispeáin am tugtha i dTEAGHR�N, ní `now'\n"
-#~ "  -f, --file=COMHADD�TA     mar --date uair amháin sa líne de "
-#~ "CHOMHADD�TA\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "SIZE may be (or may be an integer optionally followed by) one of "
-#~ "following:\n"
-#~ "KB 1000, K 1024, MB 1000*1000, M 1024*1024, and so on for G, T, P, E, Z, "
-#~ "Y.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Is féidir MÉID a bheith ceann acu seo a leanas (le, go roghnach, "
-#~ "slánuimhir\n"
-#~ "ar tosach): kB 1000, K 1024, MB 1,000,000, M 1,048,576, srl. do G,T,P,E,Z,"
-#~ "Y.\n"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: rogha neamhcheadaithe -- %c\n"
-
-#~ msgid "invalid argument: %s"
-#~ msgstr "argóint neamhbhailí: %s"
-
-#~ msgid ""
-#~ "  -w, --wrap=COLS       Wrap encoded lines after COLS character (default "
-#~ "76).\n"
-#~ "                        Use 0 to disable line wrapping.\n"
-#~ "\n"
-#~ "  -d, --decode          Decode data.\n"
-#~ "  -i, --ignore-garbage  When decoding, ignore non-alphabet characters.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "  -w, --wrap=COLÚIN     Timfhill línte ionchódaithe tar éis COLÚIN "
-#~ "charachtar\n"
-#~ "                        (réamhshocrú=76).\n"
-#~ "                        Úsáid 0 chun timfhilleadh a dhíchumasú.\n"
-#~ "\n"
-#~ "  -d, --decode          Díchódaigh sonraí.\n"
-#~ "  -i, --ignore-garbage  Déan neamhshuim ar charachtair neamhaibítreacha "
-#~ "le\n"
-#~ "                         linn díchódaithe.\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "      --help            Display this help and exit.\n"
-#~ "      --version         Output version information and exit.\n"
-#~ msgstr ""
-#~ "      --help            Taispeáin an chabhair seo agus scoir.\n"
-#~ "      --version         Taispeáin eolas faoin leagan agus scoir.\n"
-
-#~ msgid "FIXME unknown"
-#~ msgstr "FIXME: anaithnid"
-
-#~ msgid "Usage: %s [OPTION] [FILE]...\n"
-#~ msgstr "Úsáid: %s [ROGHA] [COMHAD]...\n"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#~ msgid ""
 #~ "Usage: %s NEWROOT [COMMAND...]\n"
 #~ "  or:  %s OPTION\n"
 #~ msgstr ""
@@ -12687,6 +12535,18 @@ msgstr ""
 #~ msgid "Richard Stallman"
 #~ msgstr "Richard Stallman"
 
+#~ msgid "failed to get file system create context"
+#~ msgstr "níorbh fhéidir comhthéacs chruthú an chórais comhad a fháil"
+
+#~ msgid "reading %s"
+#~ msgstr "%s á léamh"
+
+#~ msgid "writing %s"
+#~ msgstr "%s á scríobh"
+
+#~ msgid "closing %s"
+#~ msgstr "%s á dhúnadh"
+
 #~ msgid "cannot create link %s"
 #~ msgstr "ní féidir an nasc %s a chruthú"
 
@@ -12710,6 +12570,9 @@ msgstr ""
 #~ "thimpeallachta VERSION_CONTROL.  Seo duit na luachanna bailí:\n"
 #~ "\n"
 
+#~ msgid "accessing %s"
+#~ msgstr "%s á rochtain"
+
 #~ msgid "the --reply option is deprecated; use -i or -f instead"
 #~ msgstr "tá an rogha --reply dulta i léig; bain úsáid as -i nó -f ina háit"
 
@@ -12720,6 +12583,79 @@ msgstr ""
 #~ msgstr "David Ihnat"
 
 #~ msgid ""
+#~ "Display the current time in the given FORMAT, or set the system date.\n"
+#~ "\n"
+#~ "  -d, --date=STRING         display time described by STRING, not `now'\n"
+#~ "  -f, --file=DATEFILE       like --date once for each line of DATEFILE\n"
+#~ msgstr ""
+#~ "Taispeáin an t-am anois i gcruth FORM�ID, nó socraigh dáta an chórais.\n"
+#~ "\n"
+#~ "  -d, --date=TEAGHR�N       taispeáin am tugtha i dTEAGHR�N, ní `now'\n"
+#~ "  -f, --file=COMHADD�TA     mar --date uair amháin sa líne de "
+#~ "CHOMHADD�TA\n"
+
+#~ msgid "opening %s"
+#~ msgstr "%s á oscailt"
+
+#~ msgid ""
+#~ "  -a, --all             include dummy file systems\n"
+#~ "  -B, --block-size=SIZE  use SIZE-byte blocks\n"
+#~ "  -h, --human-readable  print sizes in human readable format (e.g., 1K "
+#~ "234M 2G)\n"
+#~ "  -H, --si              likewise, but use powers of 1000 not 1024\n"
+#~ msgstr ""
+#~ "  -a, --all             cuir córais chaocha chomhaid san áireamh\n"
+#~ "  -B, --block-size=MÉID úsáid bloic den mhéid MÉID beart\n"
+#~ "  -h, --human-readable  taispeáin méideanna i gcruth inléite (m.sh., 1K "
+#~ "2G srl)\n"
+#~ "  -H, --si              mar an gcéanna, ach le 1K=1000, nach 1024\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "SIZE may be (or may be an integer optionally followed by) one of "
+#~ "following:\n"
+#~ "kB 1000, K 1024, MB 1000*1000, M 1024*1024, and so on for G, T, P, E, Z, "
+#~ "Y.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Is féidir MÉID a bheith ceann acu seo a leanas (le, go roghnach, "
+#~ "slánuimhir\n"
+#~ "ar tosach): kB 1000, K 1024, MB 1,000,000, M 1,048,576, srl. do G,T,P,E,Z,"
+#~ "Y.\n"
+
+#~ msgid ""
+#~ "Usage: %s NAME\n"
+#~ "  or:  %s OPTION\n"
+#~ msgstr ""
+#~ "Úsáid: %s AINM\n"
+#~ "  nó:  %s ROGHA\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Examples:\n"
+#~ "  %s /usr/bin/sort  Output \"/usr/bin\".\n"
+#~ "  %s stdio.h        Output \".\".\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Mar shampla:\n"
+#~ "  %s /usr/bin/sort  Aschur \"/usr/bin\".\n"
+#~ "  %s stdio.h        Aschur \".\".\n"
+
+#~ msgid ""
+#~ "  -B, --block-size=SIZE  use SIZE-byte blocks\n"
+#~ "  -b, --bytes           equivalent to `--apparent-size --block-size=1'\n"
+#~ "  -c, --total           produce a grand total\n"
+#~ "  -D, --dereference-args  dereference only symlinks that are listed on "
+#~ "the\n"
+#~ "                          command line\n"
+#~ msgstr ""
+#~ "  -B, --block-size=MÉID bain úsáid as bloic den mhéid MÉID\n"
+#~ "  -b, --bytes           ar comhbhrí le `--apparent-size --block-size=1'\n"
+#~ "  -c, --total           taispeáin suim iomlán\n"
+#~ "  -D, --dereference-args  dí-thagair naisc shiombalacha a thugtar ar\n"
+#~ "                          líne na n-orduithe amháin\n"
+
+#~ msgid ""
 #~ "WARNING: use --si, not -H; the meaning of the -H option will soon\n"
 #~ "change to be the same as that of --dereference-args (-D)"
 #~ msgstr ""
@@ -12757,6 +12693,13 @@ msgstr ""
 #~ "Taispeáin na fachtóirí príomha de gach UIMHIR.\n"
 #~ "\n"
 
+#~ msgid "%s: cannot lseek back to original position"
+#~ msgstr ""
+#~ "%s: ní féidir `lseek' a dhéanamh ar ais go dtí an láthair thionscantach"
+
+#~ msgid "cannot reposition file pointer for %s"
+#~ msgstr "ní féidir an pointeoir comhaid a athshocrú do %s"
+
 #~ msgid ""
 #~ "cannot display context when selinux not enabled or when displaying the "
 #~ "id\n"
@@ -12766,6 +12709,15 @@ msgstr ""
 #~ "nó\n"
 #~ "nuair atá aitheantas úsáideora eile á thaispeáint"
 
+#~ msgid ""
+#~ "      --preserve-context  preserve SELinux security context\n"
+#~ "  -Z, --context=CONTEXT  set SELinux security context of files and "
+#~ "directories\n"
+#~ msgstr ""
+#~ "      --preserve-context  caomhnaigh an comhthéacs slándála SELinux\n"
+#~ "  -Z, --context=CMHTCS  socraigh comhthéacs slándála de chomhaid/"
+#~ "chomhadlanna\n"
+
 #~ msgid "%s: warning: making a hard link to a symbolic link is not portable"
 #~ msgstr "%s: rabhadh: ní iniompartha nasc crua go nasc siombalach"
 
@@ -12782,6 +12734,17 @@ msgstr ""
 #~ msgstr "nasc crua %s le %s á chruthú"
 
 #~ msgid ""
+#~ "  -n, --no-dereference        treat destination that is a symlink to a\n"
+#~ "                                directory as if it were a normal file\n"
+#~ "  -i, --interactive           prompt whether to remove destinations\n"
+#~ "  -s, --symbolic              make symbolic links instead of hard links\n"
+#~ msgstr ""
+#~ "  -n, --no-dereference        ná lean naisc shiombalacha\n"
+#~ "  -i, --interactive           fiafraigh roimh sprioc-chomhaid a "
+#~ "scriosadh\n"
+#~ "  -s, --symbolic              naisc shiombalacha in ionad nasc crua\n"
+
+#~ msgid ""
 #~ "\n"
 #~ "By default, color is not used to distinguish types of files.  That is\n"
 #~ "equivalent to using --color=none.  Using the --color option without the\n"
@@ -12813,6 +12776,16 @@ msgstr ""
 #~ msgstr "Úsáid: %s [ROGHA] COMHADLANN...\n"
 
 #~ msgid ""
+#~ "  -Z, --context=CTX  set the SELinux security context of each NAME to "
+#~ "CTX\n"
+#~ msgstr ""
+#~ "  -Z, --context=CTCS socraigh comhthéacs slándála de gach AINM go CTCS\n"
+
+#~ msgid ""
+#~ "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
+#~ msgstr "  -Z, --context=CTCS socraigh comhthéacs slándála de AINM go CTCS\n"
+
+#~ msgid ""
 #~ "  -q, --quiet      suppress diagnostics about file/dir-creation failure\n"
 #~ msgstr ""
 #~ "  -q, --quiet      ná taispeáin diagnóisic nuair nach féidir comhad nó\n"
@@ -12827,6 +12800,48 @@ msgstr ""
 #~ msgid "  -p DIR           use DIR as a prefix; implies -t [deprecated]\n"
 #~ msgstr "  -p CMHDLNN       úsáid CMHDLNN mar réimír; => -t [i léig]\n"
 
+#~ msgid "All arguments to long options are mandatory for short options.\n"
+#~ msgstr ""
+#~ "Is riachtanach le rogha ghearr aon argóint atá riachtanach leis an rogha "
+#~ "fhada.\n"
+
+#~ msgid ""
+#~ "  -A, --address-radix=RADIX   decide how file offsets are printed\n"
+#~ "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
+#~ msgstr ""
+#~ "  -A, --address-radix=BUNUIMHIR formáid de fhritháireamh comhaid\n"
+#~ "  -j, --skip-bytes=BEARTA     gabh thar BEARTA beart ionchurtha ar dtús\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "RADIX is d for decimal, o for octal, x for hexadecimal or n for none.\n"
+#~ "BYTES is hexadecimal with 0x or 0X prefix, and may have a multiplier "
+#~ "suffix:\n"
+#~ "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
+#~ "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n"
+#~ "Adding a z suffix to any type displays printable characters at the end of "
+#~ "each\n"
+#~ "output line.  "
+#~ msgstr ""
+#~ "\n"
+#~ "BUNUIMHIR: d=deachúlach, o=ochtnártha, x=heicsidheachúlach, nó "
+#~ "n=neamhní.\n"
+#~ "Comharthaíonn réimír 0x nó 0X go bhfuil BEARTA heicsidheachúlach, agus "
+#~ "is\n"
+#~ "féidir iarmhír iolraithe a chur leis:\n"
+#~ "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
+#~ "GB 1000*1000*1000, G 1024*1024*1024, srl. le T, P, E, Z, Y.\n"
+#~ "Má tá iarmhír `z' ann le cineál ar bith, taispeánfar carachtair\n"
+#~ "inphriontáilte ag an deireadh de gach líne aschurtha.  "
+
+#~ msgid ""
+#~ "--string without a number implies 3.  --width without a number\n"
+#~ "implies 32.  By default, od uses -A o -t d2 -w16.\n"
+#~ msgstr ""
+#~ "Glactar le 3 mura bhfuil uimhir i ndiaidh --string, agus glactar le 32\n"
+#~ "i ndiaidh --width mar an gcéanna.  De réir réamhshocraithe, úsáideann od\n"
+#~ "roghanna -A o -t d2 -w16.\n"
+
 #~ msgid "%d: fmt=\"%s\" width=%d\n"
 #~ msgstr "%d: fmd=\"%s\" leithead=%d\n"
 
@@ -12855,6 +12870,17 @@ msgstr ""
 #~ "  \\t      táb cothrománach\n"
 #~ "  \\v      táb ingearach\n"
 
+#~ msgid ""
+#~ "\n"
+#~ "With no FILE or if FILE is -, read Standard Input.  `-F /' by default.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Mura bhfuil COMHAD ann, nó más '-' é,\n"
+#~ "léigh ón ghnáth-ionchur.  `-F /' mar réamhshocrú.\n"
+
+#~ msgid "Usage: %s [OPTION]... FILE\n"
+#~ msgstr "Úsáid: %s [ROGHA]... COMHAD\n"
+
 #~ msgid "FATAL: failed to close directory %s"
 #~ msgstr "MARFACH: theip ar chomhadlann %s a dhúnadh"
 
@@ -12877,6 +12903,9 @@ msgstr ""
 #~ "MARFACH: d'athraigh dev/ino na comhadlainne a bhfuil tú tar éis dul inti "
 #~ "(%s)"
 
+#~ msgid "cannot remove directory %s"
+#~ msgstr "ní féidir comhadlann %s a scriosadh"
+
 #~ msgid "FATAL: cannot return to .. from %s"
 #~ msgstr "MARFACH: ní féidir dul ar ais go .. ó %s"
 
@@ -12898,6 +12927,45 @@ msgstr ""
 #~ msgid "invalid format string: %s"
 #~ msgstr "teaghrán neamhbhailí formáide: %s"
 
+#~ msgid ""
+#~ "Drop any supplemental groups, assume the user-ID and group-ID of the "
+#~ "specified\n"
+#~ "USER (numeric ID or user name), and run COMMAND with any specified "
+#~ "ARGUMENTs.\n"
+#~ "Exit with status 111 if unable to assume the required user and group ID.\n"
+#~ "Otherwise, exit with the exit status of COMMAND.\n"
+#~ "This program is useful only when run by root (user ID zero).\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Tréig aon ghrúpaí forlíontacha, glac le haitheantas úsáideora/grúpa\n"
+#~ "an ÚS�IDEORA sonraithe (aitheantas uimhriúil nó ainm an úsáideora), agus\n"
+#~ "rith ORDÚ le ARGÓINTí, má tá ann.  Scoir le stádas 111 mura bhfuiltear\n"
+#~ "in ann na haitheantais úsáideora/grúpa a ghlacadh.\n"
+#~ "I ngach cás eile, scoir le stádas scortha an ORDÚ.\n"
+#~ "Ní úsáideach an clár seo mura bhfuil sé rite ag an bhforúsáideoir "
+#~ "(UID=0).\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, "
+#~ "and\n"
+#~ "                    (if specified) supplemental group IDs to GID1, ...\n"
+#~ msgstr ""
+#~ "  -g GID[,GID1...]  socraigh aitheantas an phríomhghrúpa go dtí an GID "
+#~ "uimhriúil,\n"
+#~ "                    agus (má thugtar iad) na haitheantais forlíontacha go "
+#~ "GID1,...\n"
+
+#~ msgid "to use user-ID %s you need to use -g too"
+#~ msgstr ""
+#~ "chun aitheantas úsáideora %s a úsáid, ní mór duit -g a úsáid freisin"
+
+#~ msgid "cannot set group-ID to %lu"
+#~ msgstr "ní féidir aitheantas grúpa a shocrú mar %lu"
+
+#~ msgid "cannot set user-ID to %lu"
+#~ msgstr "ní féidir aitheantas úsáideora a shocrú mar %lu"
+
 #~ msgid "Usage: %s [OPTIONS] FILE [...]\n"
 #~ msgstr "Úsáid: %s [ROGHANNA] COMHAD [...]\n"
 
@@ -12940,9 +13008,34 @@ msgstr ""
 #~ msgid "cannot create temporary file"
 #~ msgstr "ní féidir comhad sealadach a chruthú"
 
+#~ msgid "dup2 failed"
+#~ msgstr "theip ar dup2"
+
+#~ msgid "couldn't execute %s"
+#~ msgstr "níorbh fhéidir %s a rith"
+
 #~ msgid "couldn't open temporary file"
 #~ msgstr "níorbh fhéidir comhad sealadach a oscailt"
 
+#~ msgid "couldn't execute %s -d"
+#~ msgstr "níorbh fhéidir %s -d a rith"
+
+#~ msgid ""
+#~ "  -a, --suffix-length=N   use suffixes of length N (default %d)\n"
+#~ "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
+#~ "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output "
+#~ "file\n"
+#~ "  -d, --numeric-suffixes  use numeric suffixes instead of alphabetic\n"
+#~ "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
+#~ msgstr ""
+#~ "  -a, --suffix-length=N   fad na hiarmhíreanna = N (réamhshocrú %d)\n"
+#~ "  -b, --bytes=MÉID        cuir MÉID beart do gach aschomhad\n"
+#~ "  -C, --line-bytes=MÉID   cuir MÉID beart línte ar a mhéad do gach "
+#~ "aschomhad\n"
+#~ "  -d, --numeric-suffixes  úsáid iarmhíreanna uimhriúla in ionad "
+#~ "aibítreacha\n"
+#~ "  -l, --lines=UIMHIR      cuir UIMHIR líne do gach aschomhad\n"
+
 #~ msgid ""
 #~ "\n"
 #~ "SIZE may have a multiplier suffix:\n"
@@ -12964,6 +13057,63 @@ msgstr ""
 #~ msgid "new_mode: mode\n"
 #~ msgstr "new_mode: mode\n"
 
+#~ msgid "Password:"
+#~ msgstr "Focal faire:"
+
+#~ msgid "getpass: cannot open /dev/tty"
+#~ msgstr "getpass: ní féidir /dev/tty a oscailt"
+
+#~ msgid "cannot set groups"
+#~ msgstr "ní féidir grúpaí a shocrú"
+
+#~ msgid "cannot set group id"
+#~ msgstr "ní féidir aitheantas an ghrúpa a shocrú"
+
+#~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n"
+#~ msgstr "Úsáid: %s [ROGHA]... [-] [ÚS�IDEOIR [ARG]...]\n"
+
+#~ msgid ""
+#~ "Change the effective user id and group id to that of USER.\n"
+#~ "\n"
+#~ "  -, -l, --login               make the shell a login shell\n"
+#~ "  -c, --command=COMMAND        pass a single COMMAND to the shell with -"
+#~ "c\n"
+#~ "  -f, --fast                   pass -f to the shell (for csh or tcsh)\n"
+#~ "  -m, --preserve-environment   do not reset environment variables\n"
+#~ "  -p                           same as -m\n"
+#~ "  -s, --shell=SHELL            run SHELL if /etc/shells allows it\n"
+#~ msgstr ""
+#~ "Athraigh an t-aitheantas úsáideora/grúpa i bhfeidhm go dtí na cinn\n"
+#~ "atá ag ÚS�IDEOIR.\n"
+#~ "\n"
+#~ "  -, -l, --login               bain úsáid as blaosc logála isteach\n"
+#~ "  -c, --commmand=ORDÚ          seachaid ORDÚ chuig an bhlaosc le -c\n"
+#~ "  -f, --fast                   seachaid -f chuig an bhlaosc (csh nó "
+#~ "tcsh)\n"
+#~ "  -m, --preserve-environment   ná hathshocraigh athróga thimpeallachta\n"
+#~ "  -p                           ar comhbhrí le -m\n"
+#~ "  -s, --shell=BLAOSC           rith BLAOSC má cheadaíonn /etc/shells é\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "A mere - implies -l.   If USER not given, assume root.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Úsáidtear -l go huathoibríoch nuair a shonraítear `-' lom.\n"
+#~ "Mura bhfuil ÚS�IDEOIR ann, glactar le root.\n"
+
+#~ msgid "user %s does not exist"
+#~ msgstr "níl a leithéid d'úsáideoir %s"
+
+#~ msgid "incorrect password"
+#~ msgstr "focal faire mícheart"
+
+#~ msgid "using restricted shell %s"
+#~ msgstr "ag baint úsáid as blaosc shrianta %s"
+
+#~ msgid "warning: cannot change directory to %s"
+#~ msgstr "rabhadh: ní féidir an chomhadlann oibre a athrú go %s"
+
 #~ msgid ""
 #~ "      --retry              keep trying to open a file even if it is\n"
 #~ "                           inaccessible when tail starts or if it "
@@ -13001,6 +13151,10 @@ msgstr ""
 #~ "dá bhrí sin, fiú má athainmnítear an comhad idir lámha, leanfaidh tail\n"
 #~ "ag próiseáil a chríoch.  "
 
+#~ msgid "warning: --retry is useful mainly when following by name"
+#~ msgstr ""
+#~ "rabhadh: níl --retry áisiúil ach amháin nuair a leantar de réir ainm"
+
 #~ msgid "creating %s"
 #~ msgstr "%s á chruthú"
 
@@ -13047,6 +13201,26 @@ msgstr ""
 #~ "ón ghnáth-ionchur) agus scríobh chuig ASCHUR (nó an gnáth-aschur).\n"
 #~ "\n"
 
+#~ msgid ""
+#~ "  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
+#~ "                        delimit-method={none(default),prepend,separate}\n"
+#~ "                        Delimiting is done with blank lines.\n"
+#~ "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+#~ "  -i, --ignore-case     ignore differences in case when comparing\n"
+#~ "  -s, --skip-chars=N    avoid comparing the first N characters\n"
+#~ "  -u, --unique          only print unique lines\n"
+#~ "  -z, --zero-terminated  end lines with 0 byte, not newline\n"
+#~ msgstr ""
+#~ "  -D, --all-repeated[=modh] taispeáin gach líne dhúblach\n"
+#~ "                        modh={none(réamhshocrú),prepend,separate}\n"
+#~ "                        Úsáidtear línte folmha mar theormharcóirí.\n"
+#~ "  -f, --skip-fields=N   ná déan comparáid ar an chéad N réimse\n"
+#~ "  -i, --ignore-case     déan neamhshuim ar chás i gcomparáidí\n"
+#~ "  -s, --skip-chars=N    ná déan comparáid ar an chéad N carachtar\n"
+#~ "  -u, --unique          ná taispeáin ach línte uathúla\n"
+#~ "  -z, --zero-terminated cuir beart 0 ag deireadh gach líne in ionad líne "
+#~ "nuaí\n"
+
 #~ msgid "am"
 #~ msgstr "am"
 
@@ -13219,9 +13393,6 @@ msgstr ""
 #~ msgid "cannot set permissions of fifo %s"
 #~ msgstr "ní féidir na ceadanna den FIFO %s a shocrú"
 
-#~ msgid "cannot set permissions of %s"
-#~ msgstr "ní féidir na ceadanna de %s a shocrú"
-
 #~ msgid ""
 #~ "This program is free software; you can redistribute it and/or modify\n"
 #~ "it under the terms of the GNU General Public License as published by\n"
@@ -13313,6 +13484,10 @@ msgstr ""
 #~ msgid "Warning: `-l' is deprecated; use `-L' instead"
 #~ msgstr "Rabhadh: tá --l dulta i léig; bain úsáid as `-L' ina háit"
 
+#~ msgid "the --allow-missing option is deprecated; use --retry instead"
+#~ msgstr ""
+#~ "tá an rogha --allow-missing dulta i léig; bain úsáid as --retry ina háit"
+
 #~ msgid ""
 #~ "  -i, --idle        add idle time as HOURS:MINUTES, . or old\n"
 #~ "                    (deprecated, use -u)\n"
@@ -13423,6 +13598,9 @@ msgstr ""
 #~ msgid "cannot obtain time stamps for %s"
 #~ msgstr "níl stampa ama ar fáil do %s"
 
+#~ msgid "invalid field number: `%s'"
+#~ msgstr "uimhir réimse neamhbhailí: `%s'"
+
 #~ msgid "invalid field number for file 1: `%s'"
 #~ msgstr "uimhir réimse neamhbhailí do chomhad 1: `%s'"
 
diff --git a/po/gl.gmo b/po/gl.gmo
index 31862663..578d1378 100644
--- a/po/gl.gmo
+++ b/po/gl.gmo
diff --git a/po/gl.po b/po/gl.po
index 7497b191..511e2d4d 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: textutils 2.0.22\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
 "PO-Revision-Date: 2002-07-23 03:07+0200\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@trasno.net>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -34,77 +34,124 @@ msgstr "Os parámetros correctos son:"
 msgid "error closing file"
 msgstr "volcando o ficheiro"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "erro de escritura"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, fuzzy, c-format
 msgid "preserving permissions for %s"
 msgstr "non se pode cambia-los permisos de %s"
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "Erro do sistema descoñecido"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "ficheiro normal baleiro"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "ficheiro normal"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "directorio"
 
-#: lib/file-type.c:44
-msgid "block special file"
-msgstr "ficheiro especial de bloque"
-
-#: lib/file-type.c:47
-msgid "character special file"
-msgstr "ficheiro especial de carácter"
-
-#: lib/file-type.c:50
-msgid "fifo"
-msgstr "fifo"
-
-#: lib/file-type.c:53
+#: lib/file-type.c:46
 msgid "symbolic link"
 msgstr "ligazón simbólica"
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "socket"
-
-#: lib/file-type.c:59
+#: lib/file-type.c:52
 msgid "message queue"
 msgstr "cola de mensaxes"
 
-#: lib/file-type.c:62
+#: lib/file-type.c:55
 msgid "semaphore"
 msgstr "semáforo"
 
-#: lib/file-type.c:65
+#: lib/file-type.c:58
 msgid "shared memory object"
 msgstr "obxecto de memoria compartida"
 
-#: lib/file-type.c:68
+#: lib/file-type.c:61
 #, fuzzy
 msgid "typed memory object"
 msgstr "obxecto de memoria compartida"
 
-#: lib/file-type.c:70
+#: lib/file-type.c:66
+msgid "block special file"
+msgstr "ficheiro especial de bloque"
+
+#: lib/file-type.c:69
+msgid "character special file"
+msgstr "ficheiro especial de carácter"
+
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr ""
+
+#: lib/file-type.c:75
+msgid "fifo"
+msgstr "fifo"
+
+#: lib/file-type.c:78
+msgid "door"
+msgstr ""
+
+#: lib/file-type.c:81
+#, fuzzy
+msgid "multiplexed block special file"
+msgstr "ficheiro especial de bloque"
+
+#: lib/file-type.c:84
+#, fuzzy
+msgid "multiplexed character special file"
+msgstr "ficheiro especial de carácter"
+
+#: lib/file-type.c:87
+msgid "multiplexed file"
+msgstr ""
+
+#: lib/file-type.c:90
+#, fuzzy
+msgid "named file"
+msgstr "ficheiro estraño"
+
+#: lib/file-type.c:93
+#, fuzzy
+msgid "network special file"
+msgstr "ficheiro especial de bloque"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr ""
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr ""
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr ""
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "socket"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr ""
+
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "ficheiro estraño"
 
@@ -244,18 +291,18 @@ msgstr "%s: a opción \"-W %s\" non permite un argumento\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: a opción \"%s\" precisa dun argumento\n"
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr "non se pode cambia-los permisos de %s"
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "non se pode crea-lo directorio %s"
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr "memoria esgotada"
@@ -377,7 +424,7 @@ msgstr "erro ao buscar por expresións regulares"
 msgid "Unmatched ) or \\)"
 msgstr ""
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 #, fuzzy
 msgid "No previous regular expression"
 msgstr "erro ao buscar por expresións regulares"
@@ -403,7 +450,7 @@ msgstr ""
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[sSyY]"
 
@@ -413,11 +460,11 @@ msgstr "^[sSyY]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, fuzzy, c-format
 msgid "setting permissions for %s"
 msgstr "non se pode cambia-los permisos de %s"
@@ -565,18 +612,6 @@ msgstr "a apertura fallou"
 msgid "Resource lost"
 msgstr ""
 
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, fuzzy, c-format
-msgid "cannot create pipe"
-msgstr "non se pode crea-lo directorio %s"
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, fuzzy, c-format
-msgid "%s subprocess failed"
-msgstr "o peche fallou"
-
 #: lib/strsignal.c:114
 #, c-format
 msgid "Real-time signal %d"
@@ -767,7 +802,7 @@ msgstr ""
 "Informe dos erros no programa a <%s>.\n"
 "Informe dos erros na traducción a <proxecto@trasno.net>.\n"
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr ""
@@ -777,30 +812,10 @@ msgstr ""
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr ""
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr ""
 
-#: lib/w32spawn.h:43
-#, fuzzy, c-format
-msgid "_open_osfhandle failed"
-msgstr "a apertura fallou"
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr ""
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr ""
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr ""
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr ""
@@ -823,7 +838,7 @@ msgstr "Erro do sistema descoñecido"
 msgid "failed to reopen %s with mode %s"
 msgstr "non foi posible mudar o grupo de %s a %s\n"
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr "a comparación de cadeas fallou"
@@ -864,15 +879,11 @@ msgid "Simon Josefsson"
 msgstr ""
 
 #: src/base64.c:60
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
 "Base64 encode or decode FILE, or standard input, to standard output.\n"
 msgstr ""
-"Emprego: %s [OPCIÓN] [FICHEIRO]...\n"
-"    ou:  %s [OPCIÓN] --check [FICHEIRO]\n"
-"Amosar ou comprobar sumas de comprobación %s (de %d bits).\n"
-"Sen un FICHEIRO, ou cando o FICHEIRO é -, lese da entrada estándar.\n"
 
 #: src/base64.c:67
 msgid ""
@@ -884,7 +895,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -901,48 +912,47 @@ msgid ""
 "from any other non-alphabet bytes in the encoded stream.\n"
 msgstr ""
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "erro de lectura"
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, fuzzy, c-format
 msgid "invalid input"
 msgstr "número incorrecto"
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, fuzzy, c-format
 msgid "invalid wrap size: %s"
 msgstr "cadea de tipo incorrecta \"%s\""
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, fuzzy, c-format
 msgid "extra operand %s"
 msgstr "operando \"%s\" extra"
 
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, fuzzy, c-format
 msgid "closing standard input"
 msgstr "entrada estándar"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -976,8 +986,8 @@ msgstr ""
 #: src/basename.c:60
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/basename.c:67
@@ -991,33 +1001,32 @@ msgid ""
 "  %s -a any/str1 any/str2   -> \"str1\" followed by \"str2\"\n"
 msgstr ""
 
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, fuzzy, c-format
 msgid "missing operand"
 msgstr "%s: esperábase un enteiro tras \"%c\""
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 #, fuzzy
 msgid "Richard M. Stallman"
 msgstr "Torbjorn Grandlund e Richard M. Stallman"
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1070,7 +1079,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr "non se poden facer operacións de ioctl en \"%s\""
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr "saída estándar"
@@ -1087,15 +1096,15 @@ msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 #, fuzzy
 msgid "Jim Meyering"
 msgstr "Mike Haertel e Paul Eggert"
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, fuzzy, c-format
 msgid "failed to create security context: %s"
 msgstr "obtendo os atributos de %s"
@@ -1105,8 +1114,8 @@ msgstr "obtendo os atributos de %s"
 msgid "failed to set %s security context component to %s"
 msgstr ""
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, fuzzy, c-format
 msgid "failed to get security context of %s"
 msgstr "obtendo os atributos de %s"
@@ -1116,18 +1125,18 @@ msgstr "obtendo os atributos de %s"
 msgid "can't apply partial context to unlabeled file %s"
 msgstr ""
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, fuzzy, c-format
 msgid "failed to change context of %s to %s"
 msgstr "non se pode cambia-los permisos de %s"
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, fuzzy, c-format
 msgid "cannot access %s"
 msgstr "non se poden cambia-los permisos de `%s'"
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, fuzzy, c-format
 msgid "cannot read directory %s"
 msgstr "non se pode crea-lo directorio %s"
@@ -1137,13 +1146,14 @@ msgstr "non se pode crea-lo directorio %s"
 msgid "changing security context of %s\n"
 msgstr "non se pode cambia-los permisos de %s"
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, fuzzy, c-format
 msgid "fts_read failed"
 msgstr "erro de lectura"
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, fuzzy, c-format
 msgid "fts_close failed"
 msgstr "o peche fallou"
@@ -1161,7 +1171,7 @@ msgstr ""
 
 #: src/chcon.c:357
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
@@ -1182,7 +1192,7 @@ msgid ""
 "  -l, --range=RANGE      set range RANGE in the target security context\n"
 msgstr ""
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
 "      --preserve-root    fail to operate recursively on '/'\n"
@@ -1218,36 +1228,37 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr ""
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr ""
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, fuzzy, c-format
 msgid "missing operand after %s"
 msgstr "%s: esperábase un enteiro tras \"%c\""
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, fuzzy, c-format
 msgid "invalid context: %s"
 msgstr "opción de anchura non válida: \"%s\""
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr ""
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, fuzzy, c-format
 msgid "failed to get attributes of %s"
 msgstr "obtendo os atributos de %s"
@@ -1273,12 +1284,26 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
+#, fuzzy
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
 "  -v, --verbose          output a diagnostic for every file processed\n"
 msgstr ""
+"Muda o modo de cada FICHEIRO a MODO.\n"
+"\n"
+"  -c, --changes           coma `verbose' mais informando só dos cambios\n"
+"  -f, --silent, --quiet   suprimi-la maioría das mensaxes de erro\n"
+"  -v, --verbose           amosar unha mensaxe por cada ficheiro procesado\n"
+"      --reference=FICH-R  usa-lo modo de FICH-R en vez do valor MODO\n"
+"  -R, --recursive         mudar ficheiros e directorios recursivamente\n"
+"      --help              amosar esta axuda e saír\n"
+"      --version           amosa-la información da versión e saír\n"
+"\n"
+"Cada MODO é unha ou máis das letras ugoa, un dos símbolos +-= e unha ou "
+"máis\n"
+"das letras rwxXstugo.\n"
 
 #: src/chgrp.c:128 src/chown.c:99
 #, fuzzy
@@ -1307,47 +1332,47 @@ msgid ""
 "  %s -hR staff /u  Change the group of /u and subfiles to \"staff\".\n"
 msgstr ""
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
 msgstr "obtendo os novos atributos de %s"
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr "non se mudou a ligazón simbólica %s nin o ficheiro referido\n"
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, fuzzy, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr "o modo de %s mudou a %04lo (%s)\n"
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, fuzzy, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr "non foi posible muda-lo modo de %s a %04lo (%s)\n"
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr "o modo de %s mantense como %04lo (%s)\n"
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, fuzzy, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr "non se pode crea-lo directorio %s"
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, fuzzy, c-format
 msgid "changing permissions of %s"
 msgstr "non se pode cambia-los permisos de %s"
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, fuzzy, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr "non se pode cambia-los permisos de %s"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1358,33 +1383,33 @@ msgstr ""
 " ou: %s [OPCIÓN]... PRIMEIRO ÚLTIMO\n"
 " ou: %s [OPCIÓN]... PRIMEIRO INCREMENTO ÚLTIMO\n"
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 msgid ""
 "Change the mode of each FILE to MODE.\n"
 "With --reference, change the mode of each FILE to that of RFILE.\n"
 "\n"
 msgstr ""
 
-#: src/chmod.c:391
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr ""
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 msgid ""
 "\n"
 "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n"
 msgstr ""
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr ""
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, fuzzy, c-format
 msgid "invalid mode: %s"
 msgstr "anchura non válida: \"%s\""
@@ -1517,26 +1542,21 @@ msgid ""
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr ""
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, fuzzy, c-format
 msgid "invalid group %s"
 msgstr "grupo incorrecto"
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, fuzzy, c-format
 msgid "invalid group list %s"
 msgstr "grupo incorrecto"
 
-#: src/chroot.c:117
-#, fuzzy, c-format
-msgid "failed to set additional groups"
-msgstr "obtendo os atributos de %s"
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
@@ -1545,46 +1565,60 @@ msgstr ""
 "Uso: %s [FICHEIRO]...\n"
 " ou: %s [OPCIÓN]\n"
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
 msgstr ""
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
 msgstr ""
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 msgid ""
 "\n"
 "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n"
 msgstr ""
 
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, fuzzy, c-format
 msgid "cannot change root directory to %s"
 msgstr "non se pode cambiar ao directorio %s"
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, fuzzy, c-format
 msgid "cannot chdir to root directory"
 msgstr "non se pode cambiar ao directorio %s"
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr ""
+
+#: src/chroot.c:383
+#, fuzzy, c-format
+msgid "failed to get supplemental groups"
+msgstr "non se pode obte-la lista de grupos suplementarios"
+
+#: src/chroot.c:395
+#, fuzzy, c-format
+msgid "failed to %s supplemental groups"
+msgstr "non se pode obte-la lista de grupos suplementarios"
+
+#: src/chroot.c:402
 #, fuzzy, c-format
 msgid "failed to set group-ID"
 msgstr "non se poden omiti-lo usuario e o grupo"
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, c-format
 msgid "failed to set user-ID"
 msgstr ""
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, fuzzy, c-format
 msgid "failed to run command %s"
 msgstr "obtendo os atributos de %s"
@@ -1616,7 +1650,7 @@ msgstr ""
 "Amosa-la suma de comprobación CRC e o número de bytes de cada FICHEIRO.\n"
 "\n"
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr "Uso: %s [OPCIÓN]... FICHEIRO1 FICHEIRO2\n"
@@ -1690,295 +1724,328 @@ msgstr "\\%c: secuencia de escape non válida"
 msgid "empty %s not allowed"
 msgstr ""
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr "erro lendo %s"
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, fuzzy, c-format
 msgid "cannot lseek %s"
 msgstr "non se poden cambia-los permisos de `%s'"
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr "erro escribindo %s"
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, fuzzy, c-format
 msgid "%s: failed to get extents info"
 msgstr "obtendo os atributos de %s"
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, fuzzy, c-format
 msgid "%s: write failed"
 msgstr "erro de escritura"
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, fuzzy, c-format
 msgid "failed to extend %s"
 msgstr "obtendo os atributos de %s"
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, fuzzy, c-format
 msgid "clearing permissions for %s"
 msgstr "non se pode cambia-los permisos de %s"
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, fuzzy, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "mantense o dono de %s"
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, fuzzy, c-format
 msgid "failed to lookup file %s"
 msgstr "mantense a data de %s"
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, fuzzy, c-format
 msgid "failed to preserve authorship for %s"
 msgstr "mantense o dono de %s"
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
+#, fuzzy, c-format
+msgid "failed to set default file creation context to %s"
+msgstr "obtendo os atributos de %s"
+
+#: src/copy.c:820
+#, fuzzy, c-format
+msgid "failed to set default file creation context for %s"
+msgstr "obtendo os atributos de %s"
+
+#: src/copy.c:846
+#, fuzzy, c-format
+msgid "failed to set the security context of %s"
+msgstr "obtendo os atributos de %s"
+
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
 msgid "cannot open %s for reading"
 msgstr "non se pode abrir %s para lectura"
 
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, fuzzy, c-format
 msgid "cannot fstat %s"
 msgstr "non se poden cambia-los permisos de `%s'"
 
-#: src/copy.c:820
+#: src/copy.c:935
 #, c-format
 msgid "skipping file %s, as it was replaced while being copied"
 msgstr ""
 
-#: src/copy.c:850
-#, c-format
-msgid "failed to get file system create context"
-msgstr ""
-
-#: src/copy.c:864
-#, fuzzy, c-format
-msgid "failed to set the security context of %s to %s"
-msgstr "non foi posible mudar o grupo de %s a %s\n"
-
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, fuzzy, c-format
 msgid "cannot remove %s"
 msgstr "non se poden cambia-los permisos de `%s'"
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, fuzzy, c-format
 msgid "removed %s\n"
 msgstr "borrando %s\n"
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr ""
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, fuzzy, c-format
 msgid "cannot create regular file %s"
 msgstr "non se pode crea-lo ficheiro temporal"
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, fuzzy, c-format
 msgid "failed to clone %s from %s"
 msgstr "non foi posible mudar o grupo de %s a %s\n"
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr "mantense a data de %s"
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
 #, fuzzy, c-format
 msgid "failed to close %s"
 msgstr "mantense a data de %s"
 
-#: src/copy.c:1471
+#: src/copy.c:1580
 #, fuzzy, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
 msgstr "%s: ¿sobrescribir %s, ignorando o modo %04lo? "
 
-#: src/copy.c:1478
+#: src/copy.c:1581
+#, c-format
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr ""
+
+#: src/copy.c:1588
 #, fuzzy, c-format
 msgid "%s: overwrite %s? "
 msgstr "%s: erro de escritura"
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr " (copia de seguridade: %s)"
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr ""
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, fuzzy, c-format
 msgid "cannot create hard link %s to %s"
 msgstr "non se pode crea-lo directorio %s"
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, fuzzy, c-format
 msgid "cannot stat %s"
 msgstr "non se poden cambia-los permisos de `%s'"
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, fuzzy, c-format
 msgid "omitting directory %s"
 msgstr "non se pode crea-lo directorio %s"
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr ""
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
 msgstr "%s e %s son o mesmo ficheiro"
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, fuzzy, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr "non se pode cambiar ao directorio %s"
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, fuzzy, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr "non se pode sobrescribir o non-directorio %s co directorio %s"
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, fuzzy, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr "non se pode crea-lo directorio %s"
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, fuzzy, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr "non se pode cambiar ao directorio %s"
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr "facer copia de seguridade de %s destruiría a orixe;  %s non movido"
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr "facer copia de seguridade de %s destruiría a orixe;  %s non copiado"
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, fuzzy, c-format
 msgid "cannot backup %s"
 msgstr "non se poden cambia-los permisos de `%s'"
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, fuzzy, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr "non se pode sobrescribir o non-directorio %s co directorio %s"
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, fuzzy, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr "non se pode crea-lo directorio %s"
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, fuzzy, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr "non se pode cambiar ao directorio %s"
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, fuzzy, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr "non se pode cambiar ao directorio %s"
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, fuzzy, c-format
 msgid "cannot move %s to %s"
 msgstr "non se poden cambia-los permisos de `%s'"
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr ""
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, fuzzy, c-format
-msgid "failed to set default file creation context to %s"
-msgstr "obtendo os atributos de %s"
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr "non se pode copia-la ligazón simbólica cíclica %s"
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr ""
 "%s: só se poden facer ligazóns simbólicas relativas no directorio actual"
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, fuzzy, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr "non se pode crea-lo directorio %s"
 
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, fuzzy, c-format
 msgid "cannot create fifo %s"
 msgstr "non se pode crea-lo directorio %s"
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, fuzzy, c-format
 msgid "cannot create special file %s"
 msgstr "ficheiro especial de carácter"
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, fuzzy, c-format
 msgid "cannot read symbolic link %s"
 msgstr "ligazón simbólica"
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, fuzzy, c-format
 msgid "cannot create symbolic link %s"
 msgstr "non se pode crea-lo directorio %s"
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
 msgstr "%s é un tipo de ficheiro descoñecido"
 
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, fuzzy, c-format
 msgid "cannot un-backup %s"
 msgstr "non se poden cambia-los permisos de `%s'"
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr "%s -> %s (restaurado da copia de seguridade)\n"
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr ""
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr ""
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, c-format
+msgid "unknown program %s"
+msgstr ""
+
+#: src/cp.c:157 src/mv.c:288
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -1989,11 +2056,11 @@ msgstr ""
 " ou: %s [OPCIÓN]... PRIMEIRO ÚLTIMO\n"
 " ou: %s [OPCIÓN]... PRIMEIRO INCREMENTO ÚLTIMO\n"
 
-#: src/cp.c:162
+#: src/cp.c:163
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 
-#: src/cp.c:168
+#: src/cp.c:169
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
 "      --attributes-only        don't copy the file data, just the "
@@ -2007,7 +2074,7 @@ msgid ""
 "  -d                           same as --no-dereference --preserve=links\n"
 msgstr ""
 
-#: src/cp.c:177
+#: src/cp.c:178
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
 "                                 opened, remove it and try again (this "
@@ -2020,20 +2087,20 @@ msgid ""
 "  -H                           follow command-line symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:186
+#: src/cp.c:187
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
 "  -L, --dereference            always follow symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:190
+#: src/cp.c:191
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
 "                                 a previous -i option)\n"
 "  -P, --no-dereference         never follow symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:195
+#: src/cp.c:196
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
 "      --preserve[=ATTR_LIST]   preserve the specified attributes (default:\n"
@@ -2043,13 +2110,13 @@ msgid ""
 "                                 all\n"
 msgstr ""
 
-#: src/cp.c:203
+#: src/cp.c:204
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                use full source file name under DIRECTORY\n"
 msgstr ""
 
-#: src/cp.c:207
+#: src/cp.c:208
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
 "      --reflink[=WHEN]         control clone/CoW copies. See below\n"
@@ -2058,7 +2125,7 @@ msgid ""
 "force)\n"
 msgstr ""
 
-#: src/cp.c:213
+#: src/cp.c:214
 #, fuzzy
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
@@ -2090,7 +2157,7 @@ msgstr ""
 "inhibi-la creación de ficheiros con ocos.\n"
 "\n"
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -2099,7 +2166,7 @@ msgid ""
 "  -T, --no-target-directory    treat DEST as a normal file\n"
 msgstr ""
 
-#: src/cp.c:224
+#: src/cp.c:225
 #, fuzzy
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
@@ -2128,7 +2195,15 @@ msgstr ""
 "      --help                   amosar esta axuda e saír\n"
 "      --version                amosa-la información da versión e saír\n"
 
-#: src/cp.c:233
+#: src/cp.c:232
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/cp.c:240
 #, fuzzy
 msgid ""
 "\n"
@@ -2168,7 +2243,7 @@ msgstr ""
 "inhibi-la creación de ficheiros con ocos.\n"
 "\n"
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 #, fuzzy
 msgid ""
 "\n"
@@ -2190,7 +2265,7 @@ msgstr ""
 "  existing, nil   copias numeradas se xa existen numeradas, se non simples\n"
 "  simple, never   facer sempre copias de seguridade simples\n"
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 #, fuzzy
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
@@ -2210,7 +2285,7 @@ msgstr ""
 "  existing, nil   copias numeradas se xa existen numeradas, se non simples\n"
 "  simple, never   facer sempre copias de seguridade simples\n"
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2222,220 +2297,230 @@ msgstr ""
 "as opcións `force' e `backup', e ORIXE e DESTINO teñen o mesmo nome que un\n"
 "ficheiro regular xa existente.\n"
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, fuzzy, c-format
 msgid "failed to preserve times for %s"
 msgstr "mantense a data de %s"
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, fuzzy, c-format
 msgid "failed to preserve permissions for %s"
 msgstr "non se pode cambia-los permisos de %s"
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, fuzzy, c-format
 msgid "cannot make directory %s"
 msgstr "non se pode crea-lo directorio %s"
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr "%s existe pero non é un directorio"
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
 #, fuzzy, c-format
 msgid "failed to access %s"
-msgstr "mantense a data de %s"
+msgstr "non se poden cambia-los permisos de `%s'"
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, fuzzy, c-format
 msgid "missing file operand"
 msgstr "argumento de salto"
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, fuzzy, c-format
 msgid "missing destination file operand after %s"
 msgstr "lista de campos non atopada"
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, fuzzy, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr "non se pode cambiar ao directorio %s"
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, fuzzy, c-format
 msgid "target %s is not a directory"
 msgstr "%s existe pero non é un directorio"
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, fuzzy, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr "ao manter os camiños de acceso, o destino ten que ser un directorio"
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, fuzzy, c-format
 msgid "multiple target directories specified"
 msgstr "\\%c: secuencia de escape non válida"
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr ""
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr "non se poden facer ligazóns duras e simbólicas ao mesmo tempo"
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, fuzzy, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr "as opcións --string e --check son mutuamente exclusivas"
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr ""
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr "tipo de copia de seguridade"
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, c-format
+msgid "cannot set target context and preserve it"
+msgstr ""
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr ""
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr ""
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr "a entrada desapareceu"
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr "%s: número de liña inexistente"
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, fuzzy, c-format
 msgid "%s: %s: line number out of range"
 msgstr "%s: \"%s\": número de liña fóra do seu rango"
 
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, fuzzy, c-format
 msgid " on repetition %s\n"
 msgstr " na repetición %d\n"
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, fuzzy, c-format
 msgid "%s: %s: match not found"
 msgstr "%s: \"%s\": non se atopou nada que coincidira"
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr "erro ao buscar por expresións regulares"
 
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, fuzzy, c-format
 msgid "write error for %s"
 msgstr "erro de escritura en \"%s\""
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, fuzzy, c-format
 msgid "%s: integer expected after delimiter"
 msgstr "%s: esperábase un enteiro tras \"%c\""
 
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, fuzzy, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr "%s: fai falla un \"}\" no número de repeticións"
 
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, fuzzy, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr "%s}: fai falla un enteiro entre \"{\" e \"}\""
 
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, fuzzy, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr "%s: delimitador de peche \"%c\" non atopado"
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr "%s: expresión regular incorrecta: %s"
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr "%s: patrón incorrecto"
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr "%s: o número de liña debe ser maior que cero"
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, fuzzy, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr "o número de liña \"%s\" é menor que o número de liña anterior, %s"
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, fuzzy, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr "aviso: o número de liña \"%s\" é o mesmo que o número de liña anterior"
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr "especificador de conversión non atopado no sufixo"
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr "especificador de conversión do sufixo incorrecto: %c"
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr "especificador de conversión do sufixo incorrecto: \\%.3o"
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, fuzzy, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr "especificador de conversión do sufixo incorrecto: %c"
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr "demasiadas especificacións de conversión %% no sufixo"
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr "especificación de conversión %% non atopada no sufixo"
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr "%s: número incorrecto"
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr "Uso: %s [OPCIÓN]... FICHEIRO PATRÓN...\n"
 
-#: src/csplit.c:1455
+#: src/csplit.c:1483
 #, fuzzy
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
@@ -2445,7 +2530,7 @@ msgstr ""
 "\"xx02\", ..., e amosa-lo número de bytes de cada anaco na saída estándar.\n"
 "\n"
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, fuzzy, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2457,7 +2542,11 @@ msgstr ""
 "  -k, --keep-files            non elimina-los ficheiros de saída se hai "
 "erros\n"
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr ""
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
@@ -2468,7 +2557,7 @@ msgstr ""
 "  -s, --quite, --silent       non amosa-los tamaños dos ficheiros de saída\n"
 "  -z, --elide-empty-files     elimina-los ficheiros de saída baleiros\n"
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
@@ -2476,7 +2565,7 @@ msgstr ""
 "\n"
 "Lese da entrada estándar se o FICHEIRO é -. Cada PATRÓN pode ser:\n"
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 #, fuzzy
 msgid ""
 "\n"
@@ -2503,23 +2592,19 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr ""
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr ""
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, fuzzy, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr "Uso: %s [OPCIÓN]... [FICHEIRO]...\n"
 
-#: src/cut.c:193
+#: src/cut.c:176
 #, fuzzy
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr ""
 "Amosar partes seleccionadas das liñas de cada FICHEIRO na saída estándar.\n"
 "\n"
 
-#: src/cut.c:199
+#: src/cut.c:182
 #, fuzzy
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
@@ -2530,7 +2615,7 @@ msgstr ""
 "  -c, --characters=LISTA  amosar só estes caracteres\n"
 "  -d, --delimiter=DELIM   emprega-lo DELIMitador no canto da tabulación\n"
 
-#: src/cut.c:204
+#: src/cut.c:187
 #, fuzzy
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
@@ -2543,7 +2628,7 @@ msgstr ""
 "                            se indica a opción -s\n"
 "  -n                      (ignórase)\n"
 
-#: src/cut.c:210
+#: src/cut.c:193
 #, fuzzy
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
@@ -2552,7 +2637,7 @@ msgstr ""
 "      --verbose           amosar un diagnóstico no erro estándar antes de\n"
 "                            abrir cada ficheiro de saída\n"
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
@@ -2563,7 +2648,7 @@ msgstr ""
 "      --output-delimiter=CADEA  emprega-la CADEA coma delimitador de saída\n"
 "                            por defecto emprégase o delimitador de entrada\n"
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2571,7 +2656,7 @@ msgid ""
 "in the same order that it is read, and is written exactly once.\n"
 msgstr ""
 
-#: src/cut.c:227
+#: src/cut.c:210
 #, fuzzy
 msgid ""
 "Each range is one of:\n"
@@ -2595,50 +2680,54 @@ msgstr ""
 "\n"
 "Sen un FICHEIRO, ou cando o FICHEIRO é -, lese da entrada estándar.\n"
 
-#: src/cut.c:367 src/cut.c:493
+#: src/cut.c:300 src/cut.c:394
 #, fuzzy
 msgid "invalid byte, character or field list"
 msgstr "lista de bytes ou campos non correcta"
 
-#: src/cut.c:387
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr ""
+
+#: src/cut.c:320
 #, fuzzy
 msgid "invalid range with no endpoint: -"
 msgstr "opción de anchura non válida: \"%s\""
 
-#: src/cut.c:403
+#: src/cut.c:334
 #, fuzzy
 msgid "invalid decreasing range"
 msgstr "cadea de tipo incorrecta \"%s\""
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, fuzzy, c-format
 msgid "byte offset %s is too large"
 msgstr "%s é grande de máis"
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, fuzzy, c-format
 msgid "field number %s is too large"
 msgstr "o número do campo é cero"
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr "só se pode indicar un tipo de lista"
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr "o delimitador debe ser un só carácter"
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr "debe especificarse unha lista de bytes, caracteres ou campos"
 
-#: src/cut.c:850
+#: src/cut.c:790
 #, fuzzy
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr "só se pode especificar un delimitador cando se traballa con campos"
 
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
@@ -2646,11 +2735,11 @@ msgstr ""
 "elimina-las liñas sen delimitadores ten sentido\n"
 "\tsó cando se traballa con campos"
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr "lista de campos non atopada"
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr "lista de posicións non atopada"
 
@@ -2692,7 +2781,7 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 
 #: src/date.c:158
@@ -2824,10 +2913,10 @@ msgid ""
 "  $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n"
 msgstr ""
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr "entrada estándar"
@@ -2869,7 +2958,7 @@ msgstr ""
 msgid "cannot set date"
 msgstr "non se pode establece-la data"
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, fuzzy, c-format
 msgid "time %s is out of range"
 msgstr "%s: número de liña inexistente"
@@ -2880,7 +2969,7 @@ msgstr "%s: número de liña inexistente"
 msgid "Paul Rubin"
 msgstr ""
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
@@ -2889,7 +2978,7 @@ msgstr ""
 "Uso: %s [FICHEIRO]...\n"
 " ou: %s [OPCIÓN]\n"
 
-#: src/dd.c:526
+#: src/dd.c:532
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
 "\n"
@@ -2900,7 +2989,7 @@ msgid ""
 "  ibs=BYTES       read up to BYTES bytes at a time (default: 512)\n"
 msgstr ""
 
-#: src/dd.c:535
+#: src/dd.c:541
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
 "  iflag=FLAGS     read as per the comma separated symbol list\n"
@@ -2913,7 +3002,7 @@ msgid ""
 "                  'noxfer' suppresses transfer stats, 'none' suppresses all\n"
 msgstr ""
 
-#: src/dd.c:546
+#: src/dd.c:552
 msgid ""
 "\n"
 "N and BYTES may be followed by the following multiplicative suffixes:\n"
@@ -2924,7 +3013,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dd.c:555
+#: src/dd.c:561
 #, fuzzy
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
@@ -2953,7 +3042,7 @@ msgstr ""
 "              usalo con block e unblock, completar con espacios en vez de "
 "NULs\n"
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -2969,7 +3058,7 @@ msgstr ""
 "  fdatasync  physically write output file data before finishing\n"
 "  fsync     likewise, but also write metadata\n"
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -2978,76 +3067,76 @@ msgid ""
 "suggested)\n"
 msgstr ""
 
-#: src/dd.c:583
+#: src/dd.c:589
 msgid "  cio       use concurrent I/O for data\n"
 msgstr ""
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr ""
 
-#: src/dd.c:587
+#: src/dd.c:593
 #, fuzzy
 msgid "  directory  fail unless a directory\n"
 msgstr "%s existe pero non é un directorio"
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr ""
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr ""
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr ""
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr ""
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr ""
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr ""
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr ""
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr ""
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr ""
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr ""
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr ""
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, c-format
 msgid ""
 "\n"
@@ -3064,28 +3153,38 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
 "%<PRIuMAX>+%<PRIuMAX> records out\n"
 msgstr ""
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, fuzzy, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
 msgstr[0] "rexistro truncado"
 msgstr[1] "rexistro truncado"
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr ""
 
@@ -3099,273 +3198,273 @@ msgstr ""
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
 msgstr ""
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, fuzzy, c-format
 msgid "closing input file %s"
 msgstr "creando ficheiro \"%s\"\n"
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr "pechando o ficheiro de saída %s"
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr ""
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, fuzzy, c-format
 msgid "writing to %s"
 msgstr "erro escribindo %s"
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, fuzzy, c-format
 msgid "unrecognized operand %s"
 msgstr "opción descoñecida \"-%c\""
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 #, fuzzy
 msgid "invalid conversion"
 msgstr "opción de anchura non válida: \"%s\""
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 #, fuzzy
 msgid "invalid input flag"
 msgstr "número non válido ao comezo do campo"
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 #, fuzzy
 msgid "invalid output flag"
 msgstr "grupo incorrecto"
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 #, fuzzy
 msgid "invalid status flag"
 msgstr "usuario incorrecto"
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, fuzzy, c-format
 msgid "invalid number %s"
 msgstr "número incorrecto"
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr ""
 
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, fuzzy, c-format
 msgid "cannot combine block and unblock"
 msgstr "non se poden omiti-lo usuario e o grupo"
 
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, fuzzy, c-format
 msgid "cannot combine lcase and ucase"
 msgstr "As cadeas que se compararon foron %s e %s"
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, fuzzy, c-format
 msgid "cannot combine excl and nocreat"
 msgstr "non se pode move-lo punteiro do ficheiro de %s"
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, fuzzy, c-format
 msgid "cannot combine direct and nocache"
 msgstr "non se pode move-lo punteiro do ficheiro de %s"
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
 "  of mt_type=0x%0lx -- see <sys/mtio.h> for the list of types"
 msgstr ""
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, fuzzy, c-format
 msgid "%s: cannot skip"
 msgstr "non se pode executar %s"
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, fuzzy, c-format
 msgid "%s: cannot seek"
 msgstr "%s: non se pode borrar"
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr ""
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, fuzzy, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr "aviso: ancho %lu incorrecto; usando %d na súa vez"
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr ""
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, fuzzy, c-format
 msgid "setting flags for %s"
 msgstr "establecendo a data de %s"
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, fuzzy, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr "%s: non se pode desprazar á posición relativa %s%s"
 
-#: src/dd.c:2133
+#: src/dd.c:2172
 #, fuzzy, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
 msgstr "avanzando os pasados %s bytes no ficheiro de saída %s"
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr ""
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
 msgstr ""
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, fuzzy, c-format
 msgid "failed to open %s"
 msgstr "mantense a data de %s"
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
 "blocks"
 msgstr ""
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, fuzzy, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr "avanzando os pasados %s bytes no ficheiro de saída %s"
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, fuzzy, c-format
 msgid "failed to discard cache for: %s"
 msgstr "mantense a data de %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr ""
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr "Sist. Fich"
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr "Tipo"
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr "bloques"
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr "Usado"
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr "Dispoñib"
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr "Uso%"
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr "Inodos"
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr "IUsados"
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr "ILibres"
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr "IUso%"
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr "Montado en"
 
-#: src/df.c:383
-#, c-format
-msgid "option --output: field '%s' unknown"
+#: src/df.c:207
+msgid "File"
 msgstr ""
 
-#: src/df.c:390
+#: src/df.c:387
+#, fuzzy, c-format
+msgid "option --output: field %s unknown"
+msgstr "pechando o ficheiro de saída %s"
+
+#: src/df.c:394
 #, c-format
-msgid "option --output: field '%s' used more than once"
+msgid "option --output: field %s used more than once"
 msgstr ""
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr "Disp"
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr "Capacid"
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
 msgstr ""
 
-#: src/df.c:1210
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr ""
+
+#: src/df.c:1384
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
 "or all file systems by default.\n"
 msgstr ""
 
-#: src/df.c:1217
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
 
-#: src/df.c:1227
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -3374,7 +3473,7 @@ msgid ""
 "(default)\n"
 msgstr ""
 
-#: src/df.c:1234
+#: src/df.c:1409
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
 "                               or print all fields if FIELD_LIST is "
@@ -3387,43 +3486,34 @@ msgid ""
 "  -v                    (ignored)\n"
 msgstr ""
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
 
-#: src/df.c:1285
+#: src/df.c:1460
 #, fuzzy, c-format
 msgid "options %s and %s are mutually exclusive"
 msgstr "as opcións --string e --check son mutuamente exclusivas"
 
-#: src/df.c:1335
-#, fuzzy
-msgid "warning: "
-msgstr "Aviso: "
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr ""
-
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr "o sistema de ficheiros tipo %s foi escollido e exluído ao mesmo tempo"
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr "Aviso: "
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 #, fuzzy
 msgid "cannot read table of mounted file systems"
 msgstr "%snon se pode le-la táboa cos sistemas de ficheiros montados"
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr ""
@@ -3433,7 +3523,7 @@ msgstr ""
 msgid "H. Peter Anvin"
 msgstr ""
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr "Uso: %s [OPCIÓN]... [FICHEIRO]...\n"
@@ -3527,7 +3617,7 @@ msgstr ""
 
 #: src/dirname.c:59
 #, fuzzy
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
 msgstr ""
 "  -z, --zero-terminated           remata-las liñas cun byte 0, non un\n"
 "                                    salto de liña\n"
@@ -3542,7 +3632,7 @@ msgid ""
 "  %s stdio.h            -> \".\"\n"
 msgstr ""
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -3551,14 +3641,13 @@ msgstr ""
 "Uso: %s [OPCIÓN]... [FICHEIRO]...\n"
 " ou: %s --traditional [FICHEIRO] [[+]DESPRAZAMENTO [[+]ETIQUETA]]\n"
 
-#: src/du.c:274
+#: src/du.c:285
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr ""
 
-#: src/du.c:280
+#: src/du.c:291
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3567,11 +3656,11 @@ msgid ""
 "                          fragmentation, indirect blocks, and the like\n"
 msgstr ""
 
-#: src/du.c:289
+#: src/du.c:300
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3583,17 +3672,18 @@ msgid ""
 "                          --summarize\n"
 msgstr ""
 
-#: src/du.c:302
+#: src/du.c:313
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
 
-#: src/du.c:310
+#: src/du.c:322
 msgid ""
 "  -k                    like --block-size=1K\n"
 "  -L, --dereference     dereference all symbolic links\n"
@@ -3601,16 +3691,17 @@ msgid ""
 "  -m                    like --block-size=1M\n"
 msgstr ""
 
-#: src/du.c:316
+#: src/du.c:328
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
 
-#: src/du.c:322
+#: src/du.c:334
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
 "                          or entries greater than SIZE if negative\n"
@@ -3619,78 +3710,78 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
 msgstr ""
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
 "  -x, --one-file-system    skip directories on different file systems\n"
 msgstr ""
 
-#: src/du.c:386
+#: src/du.c:398
 msgid "Infinity"
 msgstr ""
 
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr ""
-
-#: src/du.c:624
+#: src/du.c:636
 #, fuzzy, c-format
 msgid "fts_read failed: %s"
 msgstr "erro de lectura"
 
-#: src/du.c:780
+#: src/du.c:787
 #, fuzzy, c-format
 msgid "invalid maximum depth %s"
 msgstr "anchura non válida: \"%s\""
 
-#: src/du.c:809
+#: src/du.c:816
 #, fuzzy, c-format
 msgid "invalid --threshold argument '-0'"
-msgstr "argumento incorrecto %s para %s"
+msgstr "incremento de números de liña incorrecto: \"%s\""
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr "non se pode resumir e amosar tódalas entradas ao mesmo tempo"
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr "aviso: resumir é o mesmo que usar --max-depth=0"
 
-#: src/du.c:900
+#: src/du.c:911
 #, fuzzy, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr "aviso: resumir vai en conflicto con --max-depth=%d"
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 msgid "file operands cannot be combined with --files0-from"
 msgstr ""
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr "%s: erro de lectura"
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr ""
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 #, fuzzy
 msgid "invalid zero-length file name"
 msgstr "grupo incorrecto"
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr "total"
 
@@ -3778,7 +3869,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
 "Establecer cada NOME a VALOR no ambiente e executar COMANDO.\n"
@@ -3863,16 +3954,16 @@ msgid "input line is too long"
 msgstr "%s: ficheiro longo de máis"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr ""
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, fuzzy, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
@@ -3881,7 +3972,7 @@ msgstr ""
 "Uso: %s [FICHEIRO]...\n"
 " ou: %s [OPCIÓN]\n"
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -3892,7 +3983,7 @@ msgid ""
 "  ARG1 & ARG2       ARG1 if neither argument is null or 0, otherwise 0\n"
 msgstr ""
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -3903,14 +3994,14 @@ msgid ""
 "  ARG1 > ARG2       ARG1 is greater than ARG2\n"
 msgstr ""
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
 "  ARG1 - ARG2       arithmetic difference of ARG1 and ARG2\n"
 msgstr ""
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -3919,7 +4010,7 @@ msgid ""
 "  ARG1 % ARG2       arithmetic remainder of ARG1 divided by ARG2\n"
 msgstr ""
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -3930,7 +4021,7 @@ msgid ""
 "  length STRING              length of STRING\n"
 msgstr ""
 
-#: src/expr.c:251
+#: src/expr.c:250
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
 "                               keyword like 'match' or an operator like '/'\n"
@@ -3938,7 +4029,7 @@ msgid ""
 "  ( EXPRESSION )             value of EXPRESSION\n"
 msgstr ""
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -3956,7 +4047,7 @@ msgstr ""
 "Os encaixes dos patróns devolven a cadea entre \\( e \\), ou nada; se non\n"
 "se usan \\( e \\), devólvese o número de caracteres coincidintes ou 0.\n"
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -3964,32 +4055,32 @@ msgid ""
 "or 0, 2 if EXPRESSION is syntactically invalid, and 3 if an error occurred.\n"
 msgstr ""
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, fuzzy, c-format
 msgid "syntax error"
 msgstr "erro estándar"
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, fuzzy, c-format
 msgid "error in regular expression matcher"
 msgstr "erro ao buscar por expresións regulares"
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, fuzzy, c-format
 msgid "non-integer argument"
 msgstr "argumento de límite"
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr ""
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, fuzzy, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr "Estabreza LC_ALL='C' para palia-lo problema"
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, fuzzy, c-format
 msgid "the strings compared were %s and %s"
 msgstr "As cadeas que se compararon foron %s e %s"
@@ -3999,27 +4090,27 @@ msgstr "As cadeas que se compararon foron %s e %s"
 msgid "Niels Moller"
 msgstr ""
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
 msgstr ""
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
 msgstr ""
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, fuzzy, c-format
 msgid "%s is not a valid positive integer"
 msgstr "`%s' non é un enteiro positivo válido"
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr "%s é grande de máis"
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
@@ -4028,7 +4119,7 @@ msgstr ""
 "Uso: %s [FICHEIRO]...\n"
 " ou: %s [OPCIÓN]\n"
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 #, fuzzy
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
@@ -4143,28 +4234,28 @@ msgid "invalid number of columns: %s"
 msgstr "número de columnas incorrecto: \"%s\""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr ""
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, fuzzy, c-format
 msgid "Usage: %s\n"
 msgstr "Uso: %s [OPCIÓN] [FICHEIRO]...\n"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
 msgstr ""
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, fuzzy, c-format
 msgid "failed to get groups for user %s"
 msgstr "non foi posible mudar o grupo de %s a %s\n"
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, fuzzy, c-format
 msgid "failed to get groups for the current process"
 msgstr "non foi posible mudar o grupo de %s a %s\n"
@@ -4186,22 +4277,22 @@ msgid ""
 "the current process (which may differ if the groups database has changed).\n"
 msgstr ""
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, fuzzy, c-format
 msgid "cannot get real UID"
 msgstr "non se poden omiti-lo usuario e o grupo"
 
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, fuzzy, c-format
 msgid "cannot get effective GID"
-msgstr "non se poden cambia-los permisos de `%s'"
+msgstr "non se pode partir en máis dun xeito"
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, fuzzy, c-format
 msgid "cannot get real GID"
 msgstr "non se poden omiti-lo usuario e o grupo"
 
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, fuzzy, c-format
 msgid "%s: no such user"
 msgstr "%s: Non hai tal usuario"
@@ -4245,58 +4336,48 @@ msgid ""
 "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n"
 msgstr ""
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr ""
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, fuzzy, c-format
 msgid "%s: number of bytes is too large"
 msgstr "número de bytes a comparar non válido"
 
-#: src/head.c:440
-#, fuzzy, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr "%s: non se pode desprazar á posición relativa %s%s"
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, fuzzy, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr "%s: non se pode desprazar á posición %s%s"
 
-#: src/head.c:673
+#: src/head.c:423 src/tail.c:457
 #, fuzzy, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "%s: ficheiro longo de máis"
-
-#: src/head.c:798
-#, c-format
-msgid "cannot reposition file pointer for %s"
-msgstr "non se pode move-lo punteiro do ficheiro de %s"
+msgid "%s: cannot seek to relative offset %s"
+msgstr "%s: non se pode desprazar á posición relativa %s%s"
 
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr "%s: %s é tan grande que non é representable"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr "número de liñas"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr "número de bytes"
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr "número de liñas incorrecto"
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr "número de bytes incorrecto"
 
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, fuzzy, c-format
 msgid "invalid trailing option -- %c"
 msgstr "%s: opción incorrecta -- %c\n"
@@ -4347,28 +4428,34 @@ msgid "cannot determine hostname"
 msgstr "non se pode determina-lo nome da máquina"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr ""
 
-#: src/id.c:81
+#: src/id.c:84
 #, fuzzy, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
-msgstr "Uso: %s [OPCIÓN]... CONXUNTO1 [CONXUNTO2]\n"
+msgid "Usage: %s [OPTION]... [USER]\n"
+msgstr "Uso: %s [OPCIÓN]... [FICHEIRO]...\n"
 
-#: src/id.c:82
-#, fuzzy
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
+msgstr ""
+
+#: src/id.c:90
+#, fuzzy
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
 msgstr ""
 "Amosa-la información de NOME_USUARIO, ou do usuario actual.\n"
 "\n"
@@ -4384,123 +4471,134 @@ msgstr ""
 "Sen ningunha OPCIÓN, escríbese un conxunto útil de información de\n"
 "identificación.\n"
 
-#: src/id.c:96
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
 msgstr ""
 
-#: src/id.c:140
+#: src/id.c:151
+#, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr ""
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr ""
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr ""
 
-#: src/id.c:178
+#: src/id.c:198
 #, fuzzy, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr "non se pode partir en máis dun xeito"
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr ""
 "non se pode escribir só o nome ou o identificador real no formato por defecto"
 
-#: src/id.c:199
+#: src/id.c:209
+#, fuzzy, c-format
+msgid "option --zero not permitted in default format"
+msgstr ""
+"non se pode escribir só o nome ou o identificador real no formato por defecto"
+
+#: src/id.c:225
 #, fuzzy, c-format
 msgid "can't get process context"
 msgstr "non se pode obte-lo tipo de procesador"
 
-#: src/id.c:224
+#: src/id.c:265
 #, fuzzy, c-format
 msgid "cannot get effective UID"
-msgstr "non se poden cambia-los permisos de `%s'"
+msgstr "non se pode partir en máis dun xeito"
 
-#: src/id.c:311
+#: src/id.c:354
 #, fuzzy, c-format
 msgid "cannot find name for user ID %s"
 msgstr "%s: non se pode atopa-lo nome de usuario do UID %u\n"
 
-#: src/id.c:329
+#: src/id.c:372
 #, c-format
 msgid "uid=%s"
 msgstr ""
 
-#: src/id.c:334
+#: src/id.c:377
 #, c-format
 msgid " gid=%s"
 msgstr ""
 
-#: src/id.c:341
+#: src/id.c:384
 #, c-format
 msgid " euid=%s"
 msgstr ""
 
-#: src/id.c:349
+#: src/id.c:392
 #, c-format
 msgid " egid=%s"
 msgstr ""
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr " grupos="
 
-#: src/id.c:393
+#: src/id.c:437
 #, c-format
 msgid " context=%s"
 msgstr ""
 
-#: src/install.c:373
+#: src/install.c:376
 #, fuzzy, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr "non se pode crea-lo directorio %s"
 
-#: src/install.c:414
+#: src/install.c:417
 #, fuzzy, c-format
 msgid "creating directory %s"
 msgstr "non se pode crea-lo directorio %s"
 
-#: src/install.c:482
+#: src/install.c:485
 #, fuzzy, c-format
 msgid "cannot change ownership of %s"
 msgstr "non se pode cambia-los permisos de %s"
 
-#: src/install.c:506
+#: src/install.c:509
 #, fuzzy, c-format
 msgid "cannot set time stamps for %s"
 msgstr "non se pode crea-lo directorio %s"
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, fuzzy, c-format
 msgid "fork system call failed"
 msgstr "ficheiro especial de bloque"
 
-#: src/install.c:531
+#: src/install.c:535
 #, fuzzy, c-format
 msgid "cannot run %s"
 msgstr "non se poden cambia-los permisos de `%s'"
 
-#: src/install.c:535
+#: src/install.c:539
 #, fuzzy, c-format
 msgid "waiting for strip"
 msgstr "erro escribindo %s"
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr ""
 
-#: src/install.c:558
+#: src/install.c:565
 #, fuzzy, c-format
 msgid "invalid user %s"
 msgstr "usuario incorrecto"
 
-#: src/install.c:594
+#: src/install.c:601
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -4512,7 +4610,7 @@ msgstr ""
 " ou: %s [OPCIÓN]... PRIMEIRO ÚLTIMO\n"
 " ou: %s [OPCIÓN]... PRIMEIRO INCREMENTO ÚLTIMO\n"
 
-#: src/install.c:601
+#: src/install.c:608
 msgid ""
 "\n"
 "This install program copies files (often just compiled) into destination\n"
@@ -4526,7 +4624,7 @@ msgid ""
 "In the 4th form, create all components of the given DIRECTORY(ies).\n"
 msgstr ""
 
-#: src/install.c:615
+#: src/install.c:622
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
 "  -b                  like --backup but does not accept an argument\n"
@@ -4538,7 +4636,7 @@ msgid ""
 "                        components of the specified directories\n"
 msgstr ""
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -4550,7 +4648,7 @@ msgid ""
 "  -o, --owner=OWNER   set ownership (super-user only)\n"
 msgstr ""
 
-#: src/install.c:631
+#: src/install.c:638
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
 "files\n"
@@ -4564,62 +4662,59 @@ msgid ""
 "  -v, --verbose       print the name of each directory as it is created\n"
 msgstr ""
 
-#: src/install.c:641
+#: src/install.c:648
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
 
-#: src/install.c:859
+#: src/install.c:696 src/unlink.c:86
+#, fuzzy, c-format
+msgid "cannot unlink %s"
+msgstr "non se poden cambia-los permisos de `%s'"
+
+#: src/install.c:877
 #, c-format
 msgid ""
 "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
 msgstr ""
 
-#: src/install.c:869
-#, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
-msgstr ""
-
-#: src/install.c:886
+#: src/install.c:917
 #, fuzzy, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr ""
 "a cadea de formato non se pode especificar ó escribir cadeas da mesma anchura"
 
-#: src/install.c:889
+#: src/install.c:920
 #, fuzzy, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr ""
 "a cadea de formato non se pode especificar ó escribir cadeas da mesma anchura"
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr ""
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, fuzzy, c-format
 msgid "invalid mode %s"
 msgstr "anchura non válida: \"%s\""
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr ""
 
-#: src/install.c:959
+#: src/install.c:1001
 #, fuzzy, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr "as opcións --string e --check son mutuamente exclusivas"
 
-#: src/install.c:966
+#: src/install.c:1008
 #, fuzzy, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr "as opcións --string e --check son mutuamente exclusivas"
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -4632,7 +4727,7 @@ msgstr ""
 msgid "Mike Haertel"
 msgstr "Mike Haertel e Paul Eggert"
 
-#: src/join.c:191
+#: src/join.c:195
 #, fuzzy
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
@@ -4652,7 +4747,7 @@ msgstr ""
 "LADO\n"
 "  -e BALEIRO        substituí-los campos de entrada baleiros con BALEIRO\n"
 
-#: src/join.c:200
+#: src/join.c:204
 #, fuzzy
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
@@ -4668,7 +4763,7 @@ msgstr ""
 "  -t CAR            emprega-lo CARácter coma separador de campos de entrada\n"
 "                      e saída\n"
 
-#: src/join.c:206
+#: src/join.c:210
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
 "  -1 FIELD          join on this FIELD of file 1\n"
@@ -4680,7 +4775,14 @@ msgid ""
 "                      print them without trying to pair them\n"
 msgstr ""
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+#, fuzzy
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr ""
+"  -z, --zero-terminated           remata-las liñas cun byte 0, non un\n"
+"                                    salto de liña\n"
+
+#: src/join.c:225
 #, fuzzy
 msgid ""
 "\n"
@@ -4709,47 +4811,47 @@ msgstr ""
 "defecto amosa o campo de join, os campos restantes de FICHEIRO1 e os campos\n"
 "restantes de FICHEIRO2, todos separados por CAR.\n"
 
-#: src/join.c:403
+#: src/join.c:410
 #, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
 msgstr ""
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, fuzzy, c-format
 msgid "invalid field number: %s"
 msgstr "número de campo incorrecto: \"%s\""
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, fuzzy, c-format
 msgid "invalid field specifier: %s"
 msgstr "especificador de campo incorrecto: \"%s\""
 
-#: src/join.c:877
+#: src/join.c:884
 #, fuzzy, c-format
 msgid "invalid file number in field spec: %s"
 msgstr "número de ficheiro incorrecto na especificación de campos: \"%s\""
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr ""
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr ""
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, fuzzy, c-format
 msgid "multi-character tab %s"
 msgstr "tabulación multi-carácter \"%s\""
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr ""
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr "os dous ficheiros non poden ser entrada estándar"
@@ -4861,47 +4963,47 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr "non se pode crea-lo directorio %s"
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, fuzzy, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr "`%s' non é un directorio"
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, fuzzy, c-format
 msgid "%s: cannot overwrite directory"
 msgstr "non se pode crea-lo directorio %s"
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
 msgstr "%s: ¿substituír %s?"
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, fuzzy, c-format
 msgid "failed to create symbolic link %s"
 msgstr "non se pode crea-lo directorio %s"
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, fuzzy, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr "non se pode crea-lo directorio %s"
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, fuzzy, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr "non se pode crea-lo directorio %s"
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, fuzzy, c-format
 msgid "failed to create hard link %s"
 msgstr "non se pode crea-lo directorio %s"
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, fuzzy, c-format
 msgid "failed to create hard link %s => %s"
 msgstr "non se pode crea-lo directorio %s"
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -4913,7 +5015,7 @@ msgstr ""
 " ou: %s [OPCIÓN]... ORIXE... DIRECTORIO   (segunda forma)\n"
 " ou: %s -d [OPCIÓN]... DIRECTORIO         (terceira forma)\n"
 
-#: src/ln.c:381
+#: src/ln.c:398
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
 "In the 2nd form, create a link to TARGET in the current directory.\n"
@@ -4925,7 +5027,7 @@ msgid ""
 "interpreted in relation to its parent directory.\n"
 msgstr ""
 
-#: src/ln.c:394
+#: src/ln.c:411
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
 "file\n"
@@ -4938,7 +5040,7 @@ msgid ""
 "  -f, --force                 remove existing destination files\n"
 msgstr ""
 
-#: src/ln.c:402
+#: src/ln.c:419
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
 "  -L, --logical               dereference TARGETs that are symbolic links\n"
@@ -4950,7 +5052,7 @@ msgid ""
 "  -s, --symbolic              make symbolic links instead of hard links\n"
 msgstr ""
 
-#: src/ln.c:411
+#: src/ln.c:428
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
 "  -t, --target-directory=DIRECTORY  specify the DIRECTORY in which to "
@@ -4960,7 +5062,7 @@ msgid ""
 "  -v, --verbose               print name of each linked file\n"
 msgstr ""
 
-#: src/ln.c:433
+#: src/ln.c:450
 #, c-format
 msgid ""
 "\n"
@@ -4968,12 +5070,12 @@ msgid ""
 "behavior when a TARGET is a symbolic link, defaulting to %s.\n"
 msgstr ""
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, fuzzy, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr "%s existe pero non é un directorio"
 
-#: src/ln.c:588
+#: src/ln.c:605
 #, fuzzy, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr "non se pode crea-lo directorio %s"
@@ -5004,7 +5106,7 @@ msgstr "%s: número incorrecto"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 #, fuzzy
 msgid "%b %e  %Y"
 msgstr "%e %b %Y %H:%M"
@@ -5014,106 +5116,106 @@ msgstr "%e %b %Y %H:%M"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 #, fuzzy
 msgid "%b %e %H:%M"
 msgstr "%e %b %Y %H:%M"
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, fuzzy, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr ""
 "ignorando o tamaño de tabulador non válido na variable de ambiente TABSIZE: "
 "%s"
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr "ignorando o ancho non válido na variable de ambiente COLUMNS: %s"
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr ""
 "ignorando o tamaño de tabulador non válido na variable de ambiente TABSIZE: "
 "%s"
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, fuzzy, c-format
 msgid "invalid line width: %s"
 msgstr "anchura non válida: \"%s\""
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, fuzzy, c-format
 msgid "invalid tab size: %s"
 msgstr "cadea de tipo incorrecta \"%s\""
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, fuzzy, c-format
 msgid "invalid time style format %s"
 msgstr "argumento incorrecto %s para %s"
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 #, fuzzy
 msgid "Valid arguments are:\n"
 msgstr "Os parámetros correctos son:"
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr ""
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr ""
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, fuzzy, c-format
 msgid "unrecognized prefix: %s"
 msgstr "opción descoñecida \"-%c\""
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr "a variable de ambiente LS_COLORS ten un valor ilexible"
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, fuzzy, c-format
 msgid "cannot open directory %s"
 msgstr "non se pode crea-lo directorio %s"
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, fuzzy, c-format
 msgid "cannot determine device and inode of %s"
 msgstr "non se pode move-lo punteiro do ficheiro de %s"
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, fuzzy, c-format
 msgid "%s: not listing already-listed directory"
 msgstr "non se pode crea-lo directorio %s"
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, fuzzy, c-format
 msgid "reading directory %s"
 msgstr "non se pode crea-lo directorio %s"
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, fuzzy, c-format
 msgid "closing directory %s"
 msgstr "non se pode cambiar ao directorio %s"
 
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, fuzzy, c-format
 msgid "cannot compare file names %s and %s"
 msgstr "As cadeas que se compararon foron %s e %s"
 
-#: src/ls.c:4721
+#: src/ls.c:4781
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
 "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n"
 msgstr ""
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
 "  -A, --almost-all           do not list implied . and ..\n"
@@ -5122,33 +5224,32 @@ msgid ""
 "characters\n"
 msgstr ""
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
 "  -F, --classify             append indicator (one of */=>@|) to entries\n"
@@ -5158,40 +5259,41 @@ msgid ""
 "      --full-time            like -l --time-style=full-iso\n"
 msgstr ""
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr ""
 
-#: src/ls.c:4763
+#: src/ls.c:4823
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 
-#: src/ls.c:4769
+#: src/ls.c:4829
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
 
-#: src/ls.c:4775
+#: src/ls.c:4835
 msgid ""
 "  -H, --dereference-command-line\n"
 "                             follow symbolic links listed on the command "
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
 msgstr ""
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
 "names:\n"
@@ -5200,10 +5302,10 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -5213,7 +5315,7 @@ msgid ""
 "entries\n"
 msgstr ""
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -5224,12 +5326,12 @@ msgid ""
 "                             append / indicator to directories\n"
 msgstr ""
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 #, fuzzy
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -5280,7 +5382,7 @@ msgstr ""
 "  -R, --recursive            amosa-los subdirectorios recursivamente\n"
 "  -s, --size                 escribi-lo tamaño de cada ficheiro, en bloques\n"
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
 "  -R, --recursive            list subdirectories recursively\n"
@@ -5288,53 +5390,56 @@ msgid ""
 "blocks\n"
 msgstr ""
 
-#: src/ls.c:4825
+#: src/ls.c:4886
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 
-#: src/ls.c:4835
+#: src/ls.c:4896
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
 msgstr ""
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 msgid ""
 "  -t                         sort by modification time, newest first\n"
 "  -T, --tabsize=COLS         assume tab stops at each COLS instead of 8\n"
 msgstr ""
 
-#: src/ls.c:4848
+#: src/ls.c:4912
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
 msgstr ""
 
-#: src/ls.c:4855
+#: src/ls.c:4919
 #, fuzzy
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 "  -f, --fields=LISTA      amosar só estes campos; tamén amosa calquera liña\n"
@@ -5342,7 +5447,7 @@ msgstr ""
 "                            se indica a opción -s\n"
 "  -n                      (ignórase)\n"
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -5351,7 +5456,7 @@ msgid ""
 "variable can change the settings.  Use the dircolors command to set it.\n"
 msgstr ""
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -5425,9 +5530,11 @@ msgstr ""
 #, fuzzy
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
@@ -5437,12 +5544,7 @@ msgstr ""
 "  -w, --warn              abisar das liñas mal formatadas\n"
 "\n"
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -5457,109 +5559,107 @@ msgstr ""
 "unha liña con suma de comprobación, un carácter que indica tipo (\"*\" para\n"
 "binario, \" \" para texto) e o nome de cada FICHEIRO.\n"
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, fuzzy, c-format
 msgid "%s: too many checksum lines"
 msgstr "%s: non se atoparon liñas de suma de comprobación %s ben formatadas"
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, fuzzy, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr "%s: %lu: liña de suma de comprobación %s mal formatada"
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr "%s: apertura ou lectura FALLIDA\n"
 
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr "FALLA"
 
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr "OK"
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr "%s: non se atoparon liñas de suma de comprobación %s ben formatadas"
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, fuzzy, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
 msgstr[0] "AVISO: non se puido ler %d de %d %s listados"
 msgstr[1] "AVISO: non se puido ler %d de %d %s listados"
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, fuzzy, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
 msgstr[0] "AVISO: NON coincidiron %d de %d %s calculadas"
 msgstr[1] "AVISO: NON coincidiron %d de %d %s calculadas"
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
 msgstr ""
 
-#: src/md5sum.c:766
+#: src/md5sum.c:770
 #, fuzzy, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr "a opción --status ten sentido só cando se verifican sumas"
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
 msgstr ""
 "as opcións --binary e --text non teñen sentido cando se comproban sumas"
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr "a opción --status ten sentido só cando se verifican sumas"
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr "a opción --warn ten sentido só cando se verifican sumas"
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, fuzzy, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr "a opción --status ten sentido só cando se verifican sumas"
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, fuzzy, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr "a opción --status ten sentido só cando se verifican sumas"
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr "Uso: %s [OPCIÓN]... [FICHEIRO]...\n"
 
-#: src/mkdir.c:57
+#: src/mkdir.c:59
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
 msgstr ""
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
 #, fuzzy
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 "Crea o(s) DIRECTORIO(s), se aínda non existen.\n"
 "\n"
@@ -5571,21 +5671,46 @@ msgstr ""
 "      --help        amosar esta axuda e saír\n"
 "      --version     amosa-la información da versión e saír\n"
 
-#: src/mkdir.c:168
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/mkdir.c:127 src/mkdir.c:172
+#, fuzzy, c-format
+msgid "failed to set default creation context for %s"
+msgstr "obtendo os atributos de %s"
+
+#: src/mkdir.c:191
+#, fuzzy, c-format
+msgid "failed to restore context for %s"
+msgstr "mantense a data de %s"
+
+#: src/mkdir.c:231
 #, fuzzy, c-format
 msgid "created directory %s"
 msgstr "non se pode crea-lo directorio %s"
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr ""
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr "Uso: %s [OPCIÓN]... [FICHEIRO]...\n"
 
-#: src/mkfifo.c:52
+#: src/mkfifo.c:54
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
 msgstr ""
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 #, fuzzy
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
@@ -5597,35 +5722,38 @@ msgstr ""
 "      --help        amosar esta axuda e saír\n"
 "      --version     amosa-la información da versión e saír\n"
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, fuzzy, c-format
 msgid "invalid mode"
 msgstr "número incorrecto"
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr ""
 
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
+#, fuzzy, c-format
+msgid "cannot set permissions of %s"
+msgstr "non se pode cambia-los permisos de %s"
+
+#: src/mknod.c:54
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr "Uso: %s [OPCIÓN]... CONXUNTO1 [CONXUNTO2]\n"
 
-#: src/mknod.c:54
+#: src/mknod.c:56
 msgid "Create the special file NAME of the given TYPE.\n"
 msgstr ""
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr ""
-
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -5634,7 +5762,7 @@ msgid ""
 "otherwise, as decimal.  TYPE may be:\n"
 msgstr ""
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 #, fuzzy
 msgid ""
 "\n"
@@ -5656,152 +5784,146 @@ msgstr ""
 "  c, u   crea un ficheiro especial de caracteres (unbuffered)\n"
 "  p      crea unha FIFO\n"
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 #, fuzzy
 msgid "Special files require major and minor device numbers."
 msgstr ""
 "ao crear ficheiros especiais de bloque, débense indicar os números\n"
 "de dispositivo `major' e `minor'"
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 #, fuzzy
 msgid "Fifos do not have major and minor device numbers."
 msgstr "número de liña inicial incorrecto: \"%s\""
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, fuzzy, c-format
 msgid "block special files not supported"
 msgstr "ficheiro especial de bloque"
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, fuzzy, c-format
 msgid "character special files not supported"
 msgstr "ficheiro especial de carácter"
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, fuzzy, c-format
 msgid "invalid major device number %s"
 msgstr "número de liña inicial incorrecto: \"%s\""
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, fuzzy, c-format
 msgid "invalid minor device number %s"
 msgstr "número de liña inicial incorrecto: \"%s\""
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, fuzzy, c-format
 msgid "invalid device %s %s"
 msgstr "argumento incorrecto %s para %s"
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, fuzzy, c-format
 msgid "invalid device type %s"
 msgstr "argumento incorrecto %s para %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr ""
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr "Uso: %s [OPCIÓN]... [FICHEIRO]...\n"
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
 "TEMPLATE must contain at least 3 consecutive 'X's in last component.\n"
 "If TEMPLATE is not specified, use tmp.XXXXXXXXXX, and --tmpdir is implied.\n"
 msgstr ""
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
 "  -q, --quiet         suppress diagnostics about file/dir-creation failure\n"
 msgstr ""
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
 msgstr ""
 
-#: src/mktemp.c:223
-#, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr ""
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, fuzzy, c-format
 msgid "too many templates"
 msgstr "demasiados argumentos"
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr ""
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr ""
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr ""
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr ""
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr ""
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, fuzzy, c-format
 msgid "failed to create directory via template %s"
 msgstr "non se pode crea-lo directorio %s"
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, fuzzy, c-format
 msgid "failed to create file via template %s"
 msgstr "mantense a data de %s"
 
-#: src/mv.c:292
+#: src/mv.c:294
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 
-#: src/mv.c:298
+#: src/mv.c:300
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
 "file\n"
@@ -5814,7 +5936,7 @@ msgid ""
 "effect.\n"
 msgstr ""
 
-#: src/mv.c:307
+#: src/mv.c:309
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
@@ -5822,7 +5944,7 @@ msgid ""
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
 msgstr ""
 
-#: src/mv.c:312
+#: src/mv.c:314
 #, fuzzy
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
@@ -5832,6 +5954,8 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
 "Renomea ORIXE a DESTINO, ou mover ORIXE(s) a DIRECTORIO.\n"
 "\n"
@@ -6135,95 +6259,90 @@ msgid "%s: invalid number to ignore"
 msgstr "%s: número de liñas incorrecto"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
 msgstr ""
 
-#: src/numfmt.c:676
+#: src/numfmt.c:659
 #, fuzzy, c-format
-msgid "value too large to be converted: '%s'"
+msgid "value too large to be converted: %s"
 msgstr "%s: valor non convertido por completo"
 
-#: src/numfmt.c:680
+#: src/numfmt.c:663
 #, fuzzy, c-format
-msgid "invalid number: '%s'"
+msgid "invalid number: %s"
 msgstr "número incorrecto"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
+msgid "rejecting suffix in input: %s (consider using --from)"
 msgstr ""
 
-#: src/numfmt.c:688
+#: src/numfmt.c:671
 #, fuzzy, c-format
-msgid "invalid suffix in input: '%s'"
-msgstr "incremento de números de liña incorrecto: \"%s\""
+msgid "invalid suffix in input: %s"
+msgstr "anchura non válida: \"%s\""
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
 msgstr ""
 
-#: src/numfmt.c:723
+#: src/numfmt.c:722 src/numfmt.c:768
 #, fuzzy, c-format
 msgid "failed to prepare value '%Lf' for printing"
-msgstr "%s: ficheiro longo de máis"
+msgstr "mantense a data de %s"
 
-#: src/numfmt.c:787
+#: src/numfmt.c:791
 #, fuzzy, c-format
-msgid "invalid unit size: '%s'"
+msgid "invalid unit size: %s"
 msgstr "cadea de tipo incorrecta \"%s\""
 
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
-#, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr ""
-
-#: src/numfmt.c:813
+#: src/numfmt.c:814
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
 msgstr "Uso: %s [OPCIÓN]... [FICHEIRO]...\n"
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
 msgstr ""
 
-#: src/numfmt.c:820
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
 msgstr ""
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
 msgstr ""
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
 "                         see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr ""
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
@@ -6231,19 +6350,19 @@ msgid ""
 "locale)\n"
 msgstr ""
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
 msgstr ""
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
 msgstr ""
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -6253,40 +6372,40 @@ msgid ""
 "                         is found\n"
 msgstr ""
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
 "nearest\n"
 msgstr ""
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
 msgstr ""
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr ""
 
-#: src/numfmt.c:877
+#: src/numfmt.c:878
 msgid ""
 "\n"
 "UNIT options:\n"
 msgstr ""
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr ""
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -6295,7 +6414,7 @@ msgid ""
 "               1Mi = 1048576,\n"
 msgstr ""
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
@@ -6303,7 +6422,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
@@ -6311,7 +6430,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
@@ -6319,18 +6438,18 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:905
+#: src/numfmt.c:906
 #, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -6342,7 +6461,7 @@ msgid ""
 "errors are not diagnosed and the exit status is 0.\n"
 msgstr ""
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -6363,112 +6482,112 @@ msgid ""
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 msgstr ""
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, c-format
 msgid "format %s has no %% directive"
 msgstr ""
 
-#: src/numfmt.c:990
+#: src/numfmt.c:1003
 #, fuzzy, c-format
 msgid "invalid format %s (width overflow)"
 msgstr "argumento incorrecto %s para %s"
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr ""
+
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr ""
 
-#: src/numfmt.c:1010
+#: src/numfmt.c:1030
 #, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
 msgstr ""
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr ""
 
-#: src/numfmt.c:1070
+#: src/numfmt.c:1081
 #, fuzzy, c-format
-msgid "invalid suffix in input '%s': '%s'"
-msgstr "incremento de números de liña incorrecto: \"%s\""
+msgid "invalid suffix in input %s: %s"
+msgstr "anchura non válida: \"%s\""
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
 msgstr ""
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
 msgstr ""
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
+msgid "large input value %s: possible precision loss"
 msgstr ""
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
 
-#: src/numfmt.c:1388
+#: src/numfmt.c:1403
 #, fuzzy, c-format
-msgid "invalid padding value '%s'"
-msgstr "cadea de tipo incorrecta \"%s\""
+msgid "invalid padding value %s"
+msgstr "anchura non válida: \"%s\""
 
-#: src/numfmt.c:1401
+#: src/numfmt.c:1417
 #, fuzzy, c-format
-msgid "invalid field value '%s'"
+msgid "invalid field value %s"
 msgstr "número de campo incorrecto: \"%s\""
 
-#: src/numfmt.c:1430
+#: src/numfmt.c:1447
 #, fuzzy, c-format
-msgid "invalid header value '%s'"
+msgid "invalid header value %s"
 msgstr "anchura non válida: \"%s\""
 
-#: src/numfmt.c:1456
+#: src/numfmt.c:1473
 #, c-format
 msgid "--grouping cannot be combined with --format"
 msgstr ""
 
-#: src/numfmt.c:1458
-#, c-format
-msgid "--padding cannot be combined with --format"
-msgstr ""
-
-#: src/numfmt.c:1463
+#: src/numfmt.c:1478
 #, fuzzy, c-format
 msgid "no conversion option specified"
-msgstr "\\%c: secuencia de escape non válida"
+msgstr "especificador de conversión non atopado no sufixo"
 
-#: src/numfmt.c:1471
+#: src/numfmt.c:1486
 #, c-format
 msgid "grouping cannot be combined with --to"
 msgstr ""
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
 msgstr ""
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
 msgstr ""
 
-#: src/numfmt.c:1511
+#: src/numfmt.c:1526
 #, fuzzy, c-format
 msgid "error reading input"
 msgstr "erro lendo %s"
 
-#: src/numfmt.c:1520
-#, fuzzy, c-format
+#: src/numfmt.c:1535
+#, c-format
 msgid "failed to convert some of the input numbers"
-msgstr "os dous ficheiros non poden ser entrada estándar"
+msgstr ""
 
-#: src/od.c:294
+#: src/od.c:320
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -6479,7 +6598,7 @@ msgstr ""
 "Uso: %s [OPCIÓN]... [FICHEIRO]...\n"
 " ou: %s --traditional [FICHEIRO] [[+]DESPRAZAMENTO [[+]ETIQUETA]]\n"
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -6495,7 +6614,7 @@ msgstr ""
 "un FICHEIRO, ou se este é -, lese da entrada estándar.\n"
 "\n"
 
-#: src/od.c:307
+#: src/od.c:333
 #, fuzzy
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
@@ -6517,26 +6636,25 @@ msgstr ""
 "  a          carácter con nome\n"
 "  c          carácter ASCII ou escapado\n"
 
-#: src/od.c:318
-#, fuzzy
+#: src/od.c:344
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
-"  -A, --address-radix=BASE    indicar como se amosan os desprazamentos\n"
-"  -j, --skip-bytes=BYTES      omiti-los primeiros BYTES bytes de entrada\n"
 
-#: src/od.c:323
+#: src/od.c:350
 #, fuzzy
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
@@ -6548,7 +6666,7 @@ msgstr ""
 "  -w, --width[=BYTES]         amosar BYTES bytes por liña de saída\n"
 "      --traditional           acepta-los argumentos en formato tradicional\n"
 
-#: src/od.c:336
+#: src/od.c:363
 #, fuzzy
 msgid ""
 "\n"
@@ -6556,7 +6674,7 @@ msgid ""
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 "\n"
@@ -6566,7 +6684,7 @@ msgstr ""
 "  -c   igual que -t c,  escoller caracteres ASCII ou escapados\n"
 "  -d   igual que -t u2, escoller números curtos decimais sen signo\n"
 
-#: src/od.c:345
+#: src/od.c:372
 #, fuzzy
 msgid ""
 "  -f   same as -t fF, select floats\n"
@@ -6583,16 +6701,16 @@ msgstr ""
 "  -o   igual que -t o2, escoller números curtos octais\n"
 "  -x   igual que -t x2, escoller números curtos hexadecimais\n"
 
-#: src/od.c:353
+#: src/od.c:380
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -6606,7 +6724,7 @@ msgstr ""
 "  u[TAMAÑO]  decimal sen signo, TAMAÑO bytes por enteiro\n"
 "  x[TAMAÑO]  hexadecimal, TAMAÑO bytes por enteiro\n"
 
-#: src/od.c:367
+#: src/od.c:394
 #, fuzzy
 msgid ""
 "\n"
@@ -6621,14 +6739,14 @@ msgstr ""
 "sizeof(long). Se TIPO é f, TAMAÑO tamén pode ser F para sizeof(float),\n"
 "D para sizeof(double) ou L para sizeof(long double).\n"
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
 "each output line.\n"
 msgstr ""
 
-#: src/od.c:379
+#: src/od.c:406
 msgid ""
 "\n"
 "\n"
@@ -6641,12 +6759,12 @@ msgid ""
 "and so on for G, T, P, E, Z, Y.\n"
 msgstr ""
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, fuzzy, c-format
 msgid "invalid type string %s"
 msgstr "cadea de tipo incorrecta \"%s\""
 
-#: src/od.c:649
+#: src/od.c:690
 #, fuzzy, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -6655,7 +6773,7 @@ msgstr ""
 "cadea de tipo incorrecta \"%s\";\n"
 "este sistema non proporciona un tipo integral de %lu bytes"
 
-#: src/od.c:770
+#: src/od.c:811
 #, fuzzy, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -6664,38 +6782,38 @@ msgstr ""
 "cadea de tipo incorrecta \"%s\";\n"
 "este sistema non proporciona un tipo de punto flotante de %lu bytes"
 
-#: src/od.c:828
+#: src/od.c:869
 #, fuzzy, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr "carácter \"%c\" incorrecto na cadea de tipo \"%s\""
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr "non se pode saltar máis aló do final da entrada combinada"
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, fuzzy, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr ""
 "base de direccións de saída \"%c\" incorrecta; debe ser un carácter de [doxn]"
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr "non se pode especificar un tipo ao volcar cadeas"
 
-#: src/od.c:1810
+#: src/od.c:1863
 #, fuzzy
 msgid "compatibility mode supports at most one file"
 msgstr "o modo de compatibilidade soporta 3 argumentos como moito"
 
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr ""
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr "aviso: ancho %lu incorrecto; usando %d na súa vez"
@@ -6857,12 +6975,12 @@ msgstr "Cando"
 msgid "Where"
 msgstr "Onde"
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr "Uso: %s [OPCIÓN]... [FICHEIRO]...\n"
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -6872,7 +6990,7 @@ msgid ""
 "  -s              do short format output, this is the default\n"
 msgstr ""
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -6881,7 +6999,7 @@ msgid ""
 "                  in short format\n"
 msgstr ""
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, c-format
 msgid ""
 "\n"
@@ -6889,7 +7007,7 @@ msgid ""
 "The utmp file will be %s.\n"
 msgstr ""
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, fuzzy, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr "non se pode especificar ficheiros cando se usa --string"
@@ -7126,7 +7244,8 @@ msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
@@ -7138,7 +7257,7 @@ msgstr ""
 "                    opcións de tres columnas (-COLUMNA|-a -COLUMNA|-m) agás\n"
 "                    se -w está estabrecido\n"
 
-#: src/pr.c:2827
+#: src/pr.c:2828
 #, fuzzy
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
@@ -7155,7 +7274,7 @@ msgstr ""
 "                    opcións de columnas\n"
 "  -t, --omit-header omiti-las cabeceiras e pés de páxina\n"
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 #, fuzzy
 msgid ""
 "  -T, --omit-pagination\n"
@@ -7180,7 +7299,7 @@ msgstr ""
 "                    para o formato de saída de varias solumnas de texto,\n"
 "                    -s[car] desactívao (72)\n"
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 #, fuzzy
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
@@ -7195,7 +7314,7 @@ msgstr ""
 "estea\n"
 "                    estabrecida; non interfire con -S ou -s\n"
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 #, fuzzy
 msgid ""
 "\n"
@@ -7222,7 +7341,7 @@ msgstr ""
 
 #: src/printenv.c:69
 #, fuzzy
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr ""
 "  -z, --zero-terminated           remata-las liñas cun byte 0, non un\n"
 "                                    salto de liña\n"
@@ -7323,12 +7442,12 @@ msgstr "aviso: os argumentos de máis foron ignorados"
 msgid "F. Pinard"
 msgstr ""
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, fuzzy, c-format
 msgid "%s (for regexp %s)"
 msgstr "%s (para a expresión regular \"%s\")"
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
@@ -7337,7 +7456,7 @@ msgstr ""
 "Uso: %s [OPCIÓN]... [ENTRADA]...   (sen -G)\n"
 " ou: %s -G [OPCIÓN] [ENTRADA [SA�DA]]\n"
 
-#: src/ptx.c:1821
+#: src/ptx.c:1824
 #, fuzzy
 msgid ""
 "Output a permuted index, including context, of the words in the input "
@@ -7347,7 +7466,7 @@ msgstr ""
 "de entrada.\n"
 "\n"
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 #, fuzzy
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
@@ -7361,7 +7480,7 @@ msgstr ""
 "  -F, --flag-truncation=CADEA   emprega-la CADEA para marca-las liñas "
 "truncadas\n"
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 #, fuzzy
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
@@ -7378,7 +7497,7 @@ msgstr ""
 "  -S, --sentence-regexp=EXPREG   para a fin de liña ou fin de oración\n"
 "  -T, --format=tex               xera-la saída coma directivas TeX\n"
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -7397,7 +7516,7 @@ msgstr ""
 "FICHEIRO\n"
 "  -o, --only-file=FICHEIRO       le-la lista de palabras únicas do FICHEIRO\n"
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -7409,17 +7528,16 @@ msgstr ""
 "  -t, --typeset-mode               - sen implementar -\n"
 "  -w, --width=NÚMERO             ancho da saída, excluíndo referencias\n"
 
-#: src/ptx.c:1854
+#: src/ptx.c:1857
 #, fuzzy
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
 "\n"
-"Sen un FICHEIRO, ou se o FICHEIRO é -, lese da entrada estándar.\n"
-"\"-F /\" por defecto.\n"
+"Sen FICHEIRO, ou cando o FICHEIRO é -, lese da entrada estándar.\n"
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, fuzzy, c-format
 msgid "invalid gap width: %s"
 msgstr "anchura non válida: \"%s\""
@@ -7436,22 +7554,28 @@ msgid ""
 "  -P, --physical  avoid all symlinks\n"
 msgstr ""
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+
+#: src/pwd.c:169
 #, fuzzy, c-format
 msgid "failed to chdir to %s"
 msgstr "non foi posible mudar o grupo de %s a %s\n"
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, fuzzy, c-format
 msgid "failed to stat %s"
 msgstr "obtendo os atributos de %s"
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr ""
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, fuzzy, c-format
 msgid "ignoring non-option arguments"
 msgstr "demasiados argumentos"
@@ -7461,8 +7585,8 @@ msgstr "demasiados argumentos"
 msgid "Dmitry V. Levin"
 msgstr ""
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Uso: %s [OPCIÓN]... [FICHEIRO]...\n"
@@ -7496,8 +7620,7 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/readlink.c:152
@@ -7522,7 +7645,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 
@@ -7540,41 +7663,42 @@ msgstr "non se pode crea-lo directorio %s"
 msgid "%s: descend into directory %s? "
 msgstr "non se pode cambiar ao directorio %s"
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, fuzzy, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr "%s: ¿borra-lo ficheiro protexido contra escritura %s? "
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, fuzzy, c-format
 msgid "%s: remove %s %s? "
 msgstr "%s: ¿borrar %s? "
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, fuzzy, c-format
 msgid "removed directory: %s\n"
 msgstr "non se pode crea-lo directorio %s"
 
-#: src/remove.c:444
-#, fuzzy, c-format
-msgid "cannot remove directory: %s"
-msgstr "non se pode crea-lo directorio %s"
+#: src/remove.c:447
+#, c-format
+msgid "refusing to remove %s or %s directory: skipping %s"
+msgstr ""
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr ""
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, fuzzy, c-format
 msgid "traversal failed: %s"
 msgstr "erro de lectura"
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -7599,12 +7723,12 @@ msgstr ""
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 
 #: src/rm.c:149
@@ -7652,13 +7776,17 @@ msgstr ""
 
 #: src/rm.c:342
 #, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr ""
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/rm.c:343
+#: src/rm.c:345
 #, fuzzy, c-format
-msgid "%s: remove all arguments? "
-msgstr "%s: ¿borrar %s? "
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] "%s: ¿borrar %s? "
+msgstr[1] "%s: ¿borrar %s? "
 
 #: src/rmdir.c:134 src/rmdir.c:233
 #, fuzzy, c-format
@@ -7713,7 +7841,7 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
 
@@ -7763,41 +7891,46 @@ msgstr ""
 msgid "no command specified"
 msgstr "só se pode especificar un argumento"
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr ""
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, c-format
 msgid "failed to compute a new context"
 msgstr ""
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, fuzzy, c-format
 msgid "failed to set new user %s"
 msgstr "mantense a data de %s"
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, fuzzy, c-format
 msgid "failed to set new type %s"
 msgstr "mantense a data de %s"
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, fuzzy, c-format
 msgid "failed to set new range %s"
 msgstr "mantense a data de %s"
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, fuzzy, c-format
 msgid "failed to set new role %s"
 msgstr "obtendo os atributos de %s"
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, fuzzy, c-format
 msgid "unable to set security context %s"
 msgstr "non se pode cambia-los permisos de %s"
 
+#: src/selinux.c:127 src/selinux.c:300
+#, fuzzy, c-format
+msgid "error canonicalizing %s"
+msgstr "erro lendo %s"
+
 #: src/seq.c:68
 #, fuzzy, c-format
 msgid ""
@@ -7820,117 +7953,51 @@ msgid ""
 msgstr ""
 
 #: src/seq.c:86
-#, fuzzy
 msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
 msgstr ""
-"Escribi-los números dende PRIMEIRO a ÚLTIMO, en incrementos de INCREMENTO.\n"
-"\n"
-"  -f, --format FORMATO     usar un FORMATO de estilo printf(3) (defecto: %"
-"%g)\n"
-"  -s, --separator CADEA    usar CADEA para separa-los números (defecto: "
-"\\n)\n"
-"  -w, --equal-width        iguala-la anchura recheando con ceros ó comezo\n"
-"      --help               amosar esta axuda e saír\n"
-"      --version            amosa-la información da versión e saír\n"
-"\n"
-"Se non se indican PRIMEIRO ou INCREMENTO, por defecto son 1.\n"
-"PRIMEIRO, INCREMENTO e ÚLTIMO interprétanse coma valores de coma frotante.\n"
-"INCREMENTO ten que ser positivo se PRIMEIRO é máis pequeno que ÚLTIMO, e\n"
-"negativo doutro xeito.  Se se indica, o argumento de FORMATO ten que conter\n"
-"só un dos formatos de coma frotante de estilo printf %%e, %%f, %%g.\n"
 
-#: src/seq.c:94
+#: src/seq.c:96
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
 "it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n"
 "decimal numbers with maximum precision PREC, and to %g otherwise.\n"
 msgstr ""
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, fuzzy, c-format
 msgid "invalid floating point argument: %s"
 msgstr "número de liña inicial incorrecto: \"%s\""
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, fuzzy, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr "%s é un tipo de ficheiro descoñecido"
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, fuzzy, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr "non se pode especificar un tipo ao volcar cadeas"
 
-#: src/setuidgid.c:49
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-"Uso: %s [FICHEIRO]...\n"
-" ou: %s [OPCIÓN]\n"
-
-#: src/setuidgid.c:55
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr ""
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr ""
-
-#: src/setuidgid.c:190
-#, fuzzy, c-format
-msgid "failed to set supplemental group(s)"
-msgstr "non se pode obte-la lista de grupos suplementarios"
-
-#: src/setuidgid.c:200
-#, fuzzy, c-format
-msgid "cannot set group-ID to %lu"
-msgstr "non se poden omiti-lo usuario e o grupo"
-
-#: src/setuidgid.c:204
-#, fuzzy, c-format
-msgid "cannot set user-ID to %lu"
-msgstr "non se poden omiti-lo usuario e o grupo"
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr ""
 
-#: src/shred.c:148
+#: src/shred.c:170
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
 "for even very expensive hardware probing to recover the data.\n"
 msgstr ""
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -7939,28 +8006,32 @@ msgid ""
 "  -s, --size=N   shred this many bytes (suffixes like K, M, G accepted)\n"
 msgstr ""
 
-#: src/shred.c:161
+#: src/shred.c:183
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
 "  -z, --zero     add a final overwrite with zeros to hide shredding\n"
 msgstr ""
 
-#: src/shred.c:170
+#: src/shred.c:192
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -7971,7 +8042,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -7983,7 +8054,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -7992,7 +8063,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -8004,136 +8075,136 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:215
+#: src/shred.c:241
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
 "of the file that cannot be removed, and that will allow a shredded file\n"
 "to be recovered later.\n"
 msgstr ""
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, fuzzy, c-format
 msgid "%s: fdatasync failed"
 msgstr "a obtención de datos do ficheiro fallou"
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr ""
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, fuzzy, c-format
 msgid "%s: cannot rewind"
 msgstr "non se pode executar %s"
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr "%s: pasada %lu/%lu (%s)..."
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, fuzzy, c-format
 msgid "%s: error writing at offset %s"
 msgstr "erro escribindo %s"
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, fuzzy, c-format
 msgid "%s: lseek failed"
 msgstr "o peche fallou"
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, fuzzy, c-format
 msgid "%s: file too large"
 msgstr "%s: ficheiro longo de máis"
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr "%s: pasada %lu/%lu (%s)...%s"
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, fuzzy, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr "%s: pasada %lu/%lu (%s)...%s/%s"
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, fuzzy, c-format
 msgid "%s: fstat failed"
 msgstr "a obtención de datos do ficheiro fallou"
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, fuzzy, c-format
 msgid "%s: invalid file type"
 msgstr "%s: lonxitude do sufixo non válida"
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr "%s: o ficheiro ten un tamaño negativo"
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, fuzzy, c-format
 msgid "%s: error truncating"
 msgstr "%s: ficheiro truncado"
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, fuzzy, c-format
 msgid "%s: fcntl failed"
 msgstr "a obtención de datos do ficheiro fallou"
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr ""
 "%s: non se pode facer un borrado seguro dun descriptor de ficheiro\n"
 "de tipo só-engadir"
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr "%s: borrando"
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, fuzzy, c-format
 msgid "%s: renamed to %s"
 msgstr "%s: erro de lectura"
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, fuzzy, c-format
 msgid "%s: failed to remove"
 msgstr "%s: ficheiro longo de máis"
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr "%s: borrado"
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, fuzzy, c-format
 msgid "%s: failed to close"
 msgstr "%s: ficheiro longo de máis"
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, fuzzy, c-format
 msgid "%s: failed to open for writing"
 msgstr "%s: ficheiro longo de máis"
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, fuzzy, c-format
 msgid "%s: invalid number of passes"
 msgstr "%s: número de segundos incorrecto"
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, fuzzy, c-format
 msgid "multiple random sources specified"
 msgstr "\\%c: secuencia de escape non válida"
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, fuzzy, c-format
 msgid "%s: invalid file size"
 msgstr "%s: lonxitude do sufixo non válida"
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -8143,14 +8214,11 @@ msgstr ""
 "Uso: %s [OPCIÓN]... [ENTRADA]...   (sen -G)\n"
 " ou: %s -G [OPCIÓN] [ENTRADA [SA�DA]]\n"
 
-#: src/shuf.c:54
-#, fuzzy
+#: src/shuf.c:67
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr ""
-"Amosar partes seleccionadas das liñas de cada FICHEIRO na saída estándar.\n"
-"\n"
 
-#: src/shuf.c:60
+#: src/shuf.c:73
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
 "  -i, --input-range=LO-HI   treat each number LO through HI as an input "
@@ -8158,34 +8226,44 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
 msgstr ""
 
-#: src/shuf.c:244
+#: src/shuf.c:228
+#, fuzzy, c-format
+msgid "too many input lines"
+msgstr "demasiados argumentos"
+
+#: src/shuf.c:431
 #, fuzzy, c-format
 msgid "multiple -i options specified"
 msgstr "\\%c: secuencia de escape non válida"
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, fuzzy, c-format
 msgid "invalid input range %s"
 msgstr "número incorrecto"
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, fuzzy, c-format
 msgid "invalid line count %s"
 msgstr "anchura non válida: \"%s\""
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, fuzzy, c-format
 msgid "multiple output files specified"
 msgstr "\\%c: secuencia de escape non válida"
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, fuzzy, c-format
 msgid "cannot combine -e and -i options"
 msgstr "non se pode move-lo punteiro do ficheiro de %s"
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr ""
+
 #: src/sleep.c:44
 #, fuzzy, c-format
 msgid ""
@@ -8212,17 +8290,17 @@ msgstr ""
 "  --help      amosar esta axuda e saír\n"
 "  --version   amosa-la información da versión e saír\n"
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, fuzzy, c-format
 msgid "invalid time interval %s"
 msgstr "número de campo incorrecto: \"%s\""
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr "non se pode le-lo reloxo coa hora real"
 
-#: src/sort.c:399
+#: src/sort.c:427
 #, fuzzy
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr ""
@@ -8231,13 +8309,13 @@ msgstr ""
 "Opcións de ordeamento:\n"
 "\n"
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
 msgstr ""
 
-#: src/sort.c:409
+#: src/sort.c:437
 #, fuzzy
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
@@ -8250,7 +8328,7 @@ msgstr ""
 "alfanuméricos\n"
 "  -f, --ignore-case           ignora-las maiúsculas e minúsculas\n"
 
-#: src/sort.c:415
+#: src/sort.c:443
 #, fuzzy
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
@@ -8264,12 +8342,12 @@ msgstr ""
 "  -n, --numeric-sort          comarar de acordo ao valor numérico da cadea\n"
 "  -r, --reverse               inverti-lo resultado das comparacións\n"
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 
-#: src/sort.c:423
+#: src/sort.c:451
 #, fuzzy
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
@@ -8284,7 +8362,7 @@ msgstr ""
 "  -n, --numeric-sort          comarar de acordo ao valor numérico da cadea\n"
 "  -r, --reverse               inverti-lo resultado das comparacións\n"
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -8294,19 +8372,19 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/sort.c:437
+#: src/sort.c:465
 msgid ""
 "Other options:\n"
 "\n"
 msgstr ""
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
 msgstr ""
 
-#: src/sort.c:445
+#: src/sort.c:473
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
 "  -C, --check=quiet, --check=silent  like -c, but do not report first bad "
@@ -8315,7 +8393,7 @@ msgid ""
 "                              decompress them with PROG -d\n"
 msgstr ""
 
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -8324,13 +8402,13 @@ msgid ""
 "                            If F is - then read names from standard input\n"
 msgstr ""
 
-#: src/sort.c:459
+#: src/sort.c:487
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
 "  -m, --merge               merge already sorted files; do not sort\n"
 msgstr ""
 
-#: src/sort.c:463
+#: src/sort.c:491
 #, fuzzy
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
@@ -8350,7 +8428,7 @@ msgstr ""
 "                              de derradeiro recurso\n"
 "  -S, --buffer-size=TAMAÑO  empregar un buffer de memoria deste TAMAÑO\n"
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, fuzzy, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -8373,13 +8451,7 @@ msgstr ""
 "                              noutro caso: amosar só o primeiro dun grupo\n"
 "                                           de elementos iguais\n"
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr ""
-"  -z, --zero-terminated           remata-las liñas cun byte 0, non un\n"
-"                                    salto de liña\n"
-
-#: src/sort.c:483
+#: src/sort.c:511
 #, fuzzy
 msgid ""
 "\n"
@@ -8406,7 +8478,7 @@ msgstr ""
 "\n"
 "TAMAÑO pode estar seguido polos seguintes sufixos multiplicativos:\n"
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -8427,260 +8499,245 @@ msgstr ""
 "Estabreza LC_ALL=C para obte-la orde tradicional que emprega\n"
 "valores de byte nativos.\n"
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, fuzzy, c-format
 msgid "waiting for %s [-d]"
 msgstr "erro escribindo %s"
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr ""
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, fuzzy, c-format
 msgid "cannot create temporary file in %s"
 msgstr "non se pode crea-lo ficheiro temporal"
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr "a apertura fallou"
 
-#: src/sort.c:970
+#: src/sort.c:998
 #, fuzzy
 msgid "fflush failed"
 msgstr "volcando o ficheiro"
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr "o peche fallou"
 
-#: src/sort.c:986
-#, fuzzy, c-format
-msgid "dup2 failed"
-msgstr "a apertura fallou"
-
-#: src/sort.c:1103
-#, fuzzy, c-format
-msgid "couldn't execute %s"
-msgstr "non se poden cambia-los permisos de `%s'"
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 #, fuzzy
 msgid "couldn't create temporary file"
 msgstr "non se pode crea-lo ficheiro temporal"
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, fuzzy, c-format
 msgid "couldn't create process for %s -d"
 msgstr "non se pode crea-lo directorio %s"
 
-#: src/sort.c:1161
-#, fuzzy, c-format
-msgid "couldn't execute %s -d"
-msgstr "non se poden cambia-los permisos de `%s'"
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, fuzzy, c-format
 msgid "warning: cannot remove: %s"
 msgstr "non se poden cambia-los permisos de `%s'"
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, fuzzy, c-format
 msgid "invalid --%s argument %s"
 msgstr "argumento incorrecto %s para %s"
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, fuzzy, c-format
 msgid "minimum --%s argument is %s"
 msgstr "argumento %s ambiguo para %s"
 
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, fuzzy, c-format
 msgid "--%s argument %s too large"
 msgstr "%s: conta \"%.*s\" grande de máis"
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr ""
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr ""
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr "a obtención de datos do ficheiro fallou"
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr "erro de lectura"
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, fuzzy, c-format
 msgid "string transformation failed"
 msgstr "a comparación de cadeas fallou"
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, c-format
 msgid "the untransformed string was %s"
 msgstr ""
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr ""
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr ""
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr ""
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr ""
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr ""
 
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, fuzzy, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
-msgstr[0] "%s: a opción \"%s\" é ambigua\n"
-msgstr[1] "%s: a opción \"%s\" é ambigua\n"
+msgstr[0] "%s: a opción \"-W %s\" é ambigua\n"
+msgstr[1] "%s: a opción \"-W %s\" é ambigua\n"
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr ""
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr "erro de escritura"
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr "%s: %s:%s: desorde: "
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr "erro estándar"
 
-#: src/sort.c:3698
+#: src/sort.c:3738
 #, fuzzy
 msgid "cannot read"
 msgstr "non se poden cambia-los permisos de `%s'"
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, fuzzy, c-format
 msgid "%s: invalid field specification %s"
 msgstr "%s: especificación de campo incorrecta \"%s\""
 
-#: src/sort.c:3987
-#, fuzzy, c-format
+#: src/sort.c:4028
+#, c-format
 msgid "options '-%s' are incompatible"
-msgstr "%s: a opción \"%s\" é ambigua\n"
+msgstr ""
 
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, fuzzy, c-format
 msgid "%s: invalid count at start of %s"
 msgstr "%s: conta non válida ao principio de \"%s\""
 
-#: src/sort.c:4295
+#: src/sort.c:4336
 #, fuzzy
 msgid "invalid number after '-'"
 msgstr "número non válido despois de \"-\""
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 #, fuzzy
 msgid "invalid number after '.'"
 msgstr "número non válido despois de \".\""
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr "carácter de sobras na especificación do campo"
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, fuzzy, c-format
 msgid "multiple compress programs specified"
 msgstr "\\%c: secuencia de escape non válida"
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
 msgstr "número non válido ao comezo do campo"
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
 msgstr "o número do campo é cero"
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr "o desprazamento do carácter é cero"
 
-#: src/sort.c:4407
+#: src/sort.c:4448
 #, fuzzy
 msgid "invalid number after ','"
 msgstr "número non válido despois de \",\""
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr ""
 
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, fuzzy, c-format
 msgid "cannot read file names from %s"
 msgstr "As cadeas que se compararon foron %s e %s"
 
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, fuzzy, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr "%s: lonxitude do sufixo non válida"
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, fuzzy, c-format
 msgid "no input from %s"
 msgstr "creando ficheiro \"%s\"\n"
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr ""
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr ""
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, fuzzy, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr "operando \"%s\" extra non admitido despois de -c"
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr ""
 
-#: src/split.c:204
+#: src/split.c:203
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr "Uso: %s [OPCIÓN] [ENTRADA [PREFIXO]]\n"
 
-#: src/split.c:208
+#: src/split.c:207
 #, fuzzy
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
@@ -8694,26 +8751,25 @@ msgstr ""
 "estándar.\n"
 "\n"
 
-#: src/split.c:216
+#: src/split.c:215
 #, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
 
-#: src/split.c:229
+#: src/split.c:228
 #, fuzzy
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
@@ -8722,7 +8778,7 @@ msgstr ""
 "      --verbose           amosar un diagnóstico no erro estándar antes de\n"
 "                            abrir cada ficheiro de saída\n"
 
-#: src/split.c:236
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -8734,189 +8790,189 @@ msgid ""
 "r/K/N   likewise but only output Kth of N to stdout\n"
 msgstr ""
 
-#: src/split.c:354
+#: src/split.c:353
 #, fuzzy, c-format
 msgid "output file suffixes exhausted"
 msgstr "Esgotáronse os sufixos de ficheiros de saída"
 
-#: src/split.c:366
+#: src/split.c:365
 #, fuzzy, c-format
 msgid "creating file %s\n"
 msgstr "creando ficheiro \"%s\"\n"
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr ""
 
-#: src/split.c:391
+#: src/split.c:390
 #, fuzzy, c-format
 msgid "failed to set FILE environment variable"
 msgstr "a variable de ambiente LS_COLORS ten un valor ilexible"
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr ""
 
-#: src/split.c:395
+#: src/split.c:394
 #, fuzzy, c-format
 msgid "failed to create pipe"
 msgstr "mantense a data de %s"
 
-#: src/split.c:409
+#: src/split.c:408
 #, fuzzy, c-format
 msgid "closing prior pipe"
 msgstr "non se pode cambiar ao directorio %s"
 
-#: src/split.c:411
+#: src/split.c:410
 #, fuzzy, c-format
 msgid "closing output pipe"
 msgstr "pechando o ficheiro de saída %s"
 
-#: src/split.c:415
+#: src/split.c:414
 #, fuzzy, c-format
 msgid "moving input pipe"
 msgstr "creando ficheiro \"%s\"\n"
 
-#: src/split.c:417
+#: src/split.c:416
 #, fuzzy, c-format
 msgid "closing input pipe"
 msgstr "creando ficheiro \"%s\"\n"
 
-#: src/split.c:422
+#: src/split.c:421
 #, fuzzy, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr "non foi posible mudar o grupo de %s a %s\n"
 
-#: src/split.c:428
+#: src/split.c:427
 #, c-format
 msgid "failed to close input pipe"
 msgstr ""
 
-#: src/split.c:464
+#: src/split.c:463
 #, c-format
 msgid "waiting for child process"
 msgstr ""
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr ""
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr ""
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr ""
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr "non se pode partir en máis dun xeito"
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, fuzzy, c-format
 msgid "%s: invalid number of chunks"
 msgstr "%s: número de segundos incorrecto"
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, fuzzy, c-format
 msgid "%s: invalid chunk number"
 msgstr "%s: número incorrecto"
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr "%s: lonxitude do sufixo non válida"
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr "%s: número de bytes incorrecto"
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr "%s: número de liñas incorrecto"
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, fuzzy, c-format
 msgid "line count option -%s%c... is too large"
 msgstr "%s: conta \"%.*s\" grande de máis"
 
-#: src/split.c:1248
+#: src/split.c:1298
 #, fuzzy, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr "número de liña inicial incorrecto: \"%s\""
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, fuzzy, c-format
 msgid "%s: invalid IO block size"
 msgstr "%s: lonxitude do sufixo non válida"
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr ""
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr ""
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, fuzzy, c-format
 msgid "%s: cannot determine file size"
 msgstr "non se pode determina-lo nome da máquina"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr ""
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, c-format
 msgid "failed to canonicalize %s"
 msgstr ""
 
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, fuzzy, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr "%s: opción descoñecida `-%c'\n"
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, fuzzy, c-format
 msgid "%s: invalid directive"
 msgstr "%s: patrón incorrecto"
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, fuzzy, c-format
 msgid "warning: backslash at end of format"
 msgstr "secuencia de escape incorrecta na fin da cadea"
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr ""
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, fuzzy, c-format
 msgid "cannot read file system information for %s"
 msgstr "non se pode move-lo punteiro do ficheiro de %s"
 
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, fuzzy, c-format
 msgid "cannot stat standard input"
 msgstr "entrada estándar"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -8927,7 +8983,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -8935,30 +8991,30 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, c-format
 msgid "Context: %C\n"
 msgstr ""
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -8966,27 +9022,27 @@ msgid ""
 " Birth: %w\n"
 msgstr ""
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
 msgstr ""
 
-#: src/stat.c:1356
+#: src/stat.c:1418
 msgid ""
 "  -L, --dereference     follow links\n"
 "  -f, --file-system     display file system status instead of file status\n"
 msgstr ""
 
-#: src/stat.c:1360
+#: src/stat.c:1422
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 msgid ""
 "\n"
 "The valid format sequences for files (without --file-system):\n"
@@ -8998,7 +9054,7 @@ msgid ""
 "  %C   SELinux security context string\n"
 msgstr ""
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 msgid ""
 "  %d   device number in decimal\n"
 "  %D   device number in hex\n"
@@ -9008,7 +9064,7 @@ msgid ""
 "  %G   group name of owner\n"
 msgstr ""
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 msgid ""
 "  %h   number of hard links\n"
 "  %i   inode number\n"
@@ -9017,11 +9073,11 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 
-#: src/stat.c:1399
+#: src/stat.c:1461
 msgid ""
 "  %u   user ID of owner\n"
 "  %U   user name of owner\n"
@@ -9029,14 +9085,14 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 msgid ""
 "Valid format sequences for file systems:\n"
 "\n"
@@ -9047,7 +9103,7 @@ msgid ""
 "  %f   free blocks in file system\n"
 msgstr ""
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 msgid ""
 "  %i   file system ID in hex\n"
 "  %l   maximum length of filenames\n"
@@ -9108,22 +9164,27 @@ msgid ""
 "and are thus unaffected by 'stdbuf' settings.\n"
 msgstr ""
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, c-format
 msgid "failed to find %s"
 msgstr ""
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, c-format
 msgid "failed to update the environment with %s"
 msgstr ""
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr ""
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, c-format
+msgid "you must specify a buffering mode option"
+msgstr ""
+
+#: src/stty.c:516
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -9134,11 +9195,11 @@ msgstr ""
 " ou: %s [-F DISPOSITIVO] [--file=DISPOSITIVO] [-a|--all]\n"
 " ou: %s [-F DISPOSITIVO] [--file=DISPOSITIVO] [-g|--save]\n"
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
 msgstr ""
 
-#: src/stty.c:525
+#: src/stty.c:528
 #, fuzzy
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
@@ -9160,14 +9221,14 @@ msgstr ""
 "parámetros\n"
 "non POSIX.  O sistema presente define os parámetros que están dispoñibles.\n"
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
 "settings.  The underlying system defines which settings are available.\n"
 msgstr ""
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -9176,7 +9237,7 @@ msgid ""
 "   eol CHAR      CHAR will end the line\n"
 msgstr ""
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -9184,7 +9245,7 @@ msgid ""
 "   kill CHAR     CHAR will erase the current line\n"
 msgstr ""
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -9192,7 +9253,7 @@ msgid ""
 "   start CHAR    CHAR will restart the output after stopping it\n"
 msgstr ""
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -9200,7 +9261,7 @@ msgid ""
 " * werase CHAR   CHAR will erase the last word typed\n"
 msgstr ""
 
-#: src/stty.c:562
+#: src/stty.c:565
 msgid ""
 "\n"
 "Special settings:\n"
@@ -9209,7 +9270,7 @@ msgid ""
 " * columns N     same as cols N\n"
 msgstr ""
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -9218,7 +9279,7 @@ msgid ""
 "   ospeed N      set the output speed to N\n"
 msgstr ""
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -9227,7 +9288,7 @@ msgid ""
 "   time N        with -icanon, set read timeout of N tenths of a second\n"
 msgstr ""
 
-#: src/stty.c:581
+#: src/stty.c:584
 msgid ""
 "\n"
 "Control settings:\n"
@@ -9238,7 +9299,7 @@ msgid ""
 "   csN           set character size to N bits, N in [5..8]\n"
 msgstr ""
 
-#: src/stty.c:590
+#: src/stty.c:593
 #, fuzzy
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
@@ -9247,6 +9308,7 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 "\n"
 "Parámetros de control:\n"
@@ -9264,7 +9326,7 @@ msgstr ""
 "                na entrada\n"
 "  [-]parodd     establecer paridade impar (mesmo con `-')\n"
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -9274,7 +9336,7 @@ msgid ""
 "   [-]igncr      ignore carriage return\n"
 msgstr ""
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -9283,11 +9345,11 @@ msgid ""
 "   [-]istrip     clear high (8th) bit of input characters\n"
 msgstr ""
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr ""
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -9297,7 +9359,7 @@ msgid ""
 "   [-]tandem     same as [-]ixoff\n"
 msgstr ""
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -9307,11 +9369,11 @@ msgid ""
 " * nlN           newline delay style, N in [0..1]\n"
 msgstr ""
 
-#: src/stty.c:631
+#: src/stty.c:635
 #, fuzzy
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
@@ -9338,7 +9400,7 @@ msgstr ""
 "* -tabs         o mesmo que tab3\n"
 "* vtN           estilo de retardo da tabulación vertical, N entre [0..1]\n"
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -9348,7 +9410,7 @@ msgid ""
 " * vtN           vertical tab delay style, N in [0..1]\n"
 msgstr ""
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -9357,7 +9419,7 @@ msgid ""
 " * -crtkill      kill all line by obeying the echoctl and echok settings\n"
 msgstr ""
 
-#: src/stty.c:654
+#: src/stty.c:658
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
 "   [-]echo       echo input characters\n"
@@ -9366,7 +9428,7 @@ msgid ""
 "   [-]echok      echo a newline after a kill character\n"
 msgstr ""
 
-#: src/stty.c:661
+#: src/stty.c:665
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
 "   [-]echonl     echo newline even if not echoing other characters\n"
@@ -9375,7 +9437,7 @@ msgid ""
 "   [-]iexten     enable non-POSIX special characters\n"
 msgstr ""
 
-#: src/stty.c:668
+#: src/stty.c:672
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
 "   [-]noflsh     disable flushing after interrupt and quit special "
@@ -9385,7 +9447,7 @@ msgid ""
 " * [-]xcase      with icanon, escape with '\\' for uppercase characters\n"
 msgstr ""
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -9394,7 +9456,7 @@ msgid ""
 "   -cbreak       same as icanon\n"
 msgstr ""
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -9402,7 +9464,7 @@ msgid ""
 "   crt           same as echoe echoctl echoke\n"
 msgstr ""
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -9411,7 +9473,7 @@ msgid ""
 "   evenp         same as parenb -parodd cs7\n"
 msgstr ""
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -9421,7 +9483,7 @@ msgid ""
 "   -nl           same as icrnl -inlcr -igncr onlcr -ocrnl -onlret\n"
 msgstr ""
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -9430,7 +9492,7 @@ msgid ""
 "   -pass8        same as parenb istrip cs7\n"
 msgstr ""
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -9438,7 +9500,7 @@ msgid ""
 "   -raw          same as cooked\n"
 msgstr ""
 
-#: src/stty.c:716
+#: src/stty.c:720
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
 "                 -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n"
@@ -9448,7 +9510,7 @@ msgid ""
 "                 characters to their default values\n"
 msgstr ""
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -9463,55 +9525,55 @@ msgstr ""
 "coma en ^c, 0x37, 0177 ou 127; os valores especiais ^- ou undef úsanse para\n"
 "desactiva-los caracteres especiais.\n"
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, fuzzy, c-format
 msgid "only one device may be specified"
 msgstr "só se pode especificar un argumento"
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, fuzzy, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
 "mutually exclusive"
 msgstr "as opcións --string e --check son mutuamente exclusivas"
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr "cando se indica un estilo de saída, non se poden establecer modos"
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr "%s: non se pode restablece-lo modo de non bloqueo"
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, fuzzy, c-format
 msgid "invalid argument %s"
 msgstr "argumento incorrecto %s para %s"
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, fuzzy, c-format
 msgid "missing argument to %s"
 msgstr "argumento %s ambiguo para %s"
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, fuzzy, c-format
 msgid "invalid line discipline %s"
 msgstr "anchura non válida: \"%s\""
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr "%s: non se poden facer tódalas operacións pedidas"
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr "%s: non hai información de tamaño para este dispositivo"
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, fuzzy, c-format
 msgid "invalid integer argument %s"
 msgstr "incremento de números de liña incorrecto: \"%s\""
@@ -9565,7 +9627,7 @@ msgstr "      --help     amosar esta axuda e saír\n"
 msgid "      --version  output version information and exit\n"
 msgstr "      --version  amosar información da versión e saír\n"
 
-#: src/system.h:544
+#: src/system.h:543
 #, fuzzy
 msgid ""
 "\n"
@@ -9574,15 +9636,15 @@ msgstr ""
 "Os argumentos obrigatorios nas opcións longas tamén o son nas opcións "
 "curtas.\n"
 
-#: src/system.h:552
+#: src/system.h:551
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -9591,36 +9653,33 @@ msgid ""
 "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n"
 msgstr ""
 
-#: src/system.h:571
-#, fuzzy, c-format
+#: src/system.h:570
+#, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
+"%s online help: <%s>\n"
 msgstr ""
-"\n"
-"Informe dos erros no programa a <%s>.\n"
-"Informe dos erros na traducción a <proxecto@trasno.net>.\n"
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr ""
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr ""
 
-#: src/system.h:596
+#: src/system.h:591
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Escriba \"%s --help\" para máis información.\n"
 
-#: src/system.h:628
+#: src/system.h:633
 #, fuzzy, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -9679,7 +9738,7 @@ msgstr "non se pode crea-lo ficheiro temporal"
 #: src/tac.c:458
 #, fuzzy, c-format
 msgid "failed to open %s for writing"
-msgstr "%s: ficheiro longo de máis"
+msgstr "non se pode abrir %s para lectura"
 
 #: src/tac.c:475
 #, fuzzy, c-format
@@ -9721,18 +9780,16 @@ msgstr ""
 
 #: src/tail.c:270
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
 
 #: src/tail.c:274
+#, fuzzy
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 "  -f, --follow[={name|descriptor}]\n"
@@ -9742,18 +9799,17 @@ msgstr ""
 "equivalentes\n"
 "  -F                       igual que --follow=name --retry\n"
 
-#: src/tail.c:281
+#: src/tail.c:280
 #, fuzzy, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
 "  -n, --lines=N            amosa-las derradeiras N liñas, no canto de %d\n"
 "      --max-unchanged-stats=N\n"
@@ -9763,14 +9819,12 @@ msgstr ""
 "                           (é o caso normal de ficheiros de rexistro "
 "rotados)\n"
 
-#: src/tail.c:294
+#: src/tail.c:293
 #, fuzzy
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 "      --pid=PID            con -f, rematar trala morte do proceso co PID\n"
 "  -q, --quiet, --silent    non amosa-las cabeceiras cos nomes de ficheiro\n"
@@ -9778,16 +9832,16 @@ msgstr ""
 "  -v, --verbose            amosar sempre as cabeceiras cos nomes de "
 "ficheiro\n"
 
-#: src/tail.c:301
+#: src/tail.c:298
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 
-#: src/tail.c:310
+#: src/tail.c:307
 #, fuzzy
 msgid ""
 "\n"
@@ -9807,7 +9861,7 @@ msgstr ""
 "multiplicativo: b para 512, k para 1024, m para 1048576 (1 Mega).\n"
 "\n"
 
-#: src/tail.c:319
+#: src/tail.c:316
 #, fuzzy
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
@@ -9825,164 +9879,171 @@ msgstr ""
 "programa\n"
 "o eliminou e volveu crear.\n"
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr "pechando %s (fd=%d)"
 
-#: src/tail.c:453
-#, fuzzy, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr "%s: non se pode desprazar á posición relativa %s%s"
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, fuzzy, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr "%s: non se pode desprazar á posición relativa á final %s%s"
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr ""
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
 "reverting to polling"
 msgstr ""
 
-#: src/tail.c:963
+#: src/tail.c:965
+#, fuzzy, c-format
+msgid "%s has been replaced with a symbolic link. giving up on this name"
+msgstr ""
+"\"%s\" foi remprazado cun ficheiro do que non se pode amosa-la fin; "
+"abandonando este ficheiro"
+
+#: src/tail.c:980
 #, fuzzy, c-format
 msgid "%s has become inaccessible"
 msgstr "\"%s\" volveuse inaccesible"
 
-#: src/tail.c:980
+#: src/tail.c:997
 #, fuzzy, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr ""
 "\"%s\" foi remprazado cun ficheiro do que non se pode amosa-la fin; "
 "abandonando este ficheiro"
 
-#: src/tail.c:989
+#: src/tail.c:1006
 #, fuzzy, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr ""
 "\"%s\" foi remprazado cun ficheiro do que non se pode amosa-la fin; "
 "abandonando este ficheiro"
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, fuzzy, c-format
 msgid "%s has become accessible"
 msgstr "\"%s\" volveuse accesible"
 
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, fuzzy, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr "\"%s\" apareceu; buscando a fin do novo ficheiro"
 
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, fuzzy, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr "\"%s\" foi remprazado; buscando a fin do ficheiro novo"
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, fuzzy, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr "%s: non se pode restablece-lo modo de non bloqueo"
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr "%s: ficheiro truncado"
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr "non quedan ficheiros"
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, fuzzy, c-format
 msgid "cannot watch parent directory of %s"
 msgstr "non se pode crea-lo directorio %s"
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, fuzzy, c-format
 msgid "inotify resources exhausted"
 msgstr "memoria virtual esgotada"
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, fuzzy, c-format
 msgid "cannot watch %s"
 msgstr "non se poden cambia-los permisos de `%s'"
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr ""
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, fuzzy, c-format
 msgid "error reading inotify event"
 msgstr "erro lendo %s"
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr ""
 "%s: non se pode segui-la fin deste tipo de ficheiro; abandoando este nome"
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, fuzzy, c-format
 msgid "number in %s is too large"
 msgstr "%s é grande de máis"
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr "%s: número máximo de datos non cambiados entre aperturas incorrecto"
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr "%s: PID incorrecto"
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr "%s: número de segundos incorrecto"
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr ""
 
-#: src/tail.c:2034
+#: src/tail.c:2096
 #, fuzzy, c-format
-msgid "warning: --retry is useful mainly when following by name"
-msgstr "aviso: --retry é útil só cando vai seguido por name"
+msgid "warning: --retry ignored; --retry is useful only when following"
+msgstr "aviso: PID ignorado; --pid=PID é útil só cando segue"
 
-#: src/tail.c:2038
+#: src/tail.c:2100
+#, c-format
+msgid "warning: --retry only effective for the initial open"
+msgstr ""
+
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
 msgstr "aviso: PID ignorado; --pid=PID é útil só cando segue"
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr "aviso: --pid=PID non é soportado neste sistema"
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, fuzzy, c-format
 msgid "cannot follow %s by name"
 msgstr "non se pode crea-lo ficheiro temporal"
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr ""
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr ""
@@ -10235,17 +10296,17 @@ msgstr "demasiados argumentos"
 msgid "warning: sigprocmask"
 msgstr ""
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr ""
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr ""
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
@@ -10254,33 +10315,29 @@ msgstr ""
 "Uso: %s [FICHEIRO]...\n"
 " ou: %s [OPCIÓN]\n"
 
-#: src/timeout.c:229
-#, fuzzy
+#: src/timeout.c:232
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
 msgstr ""
-"Os argumentos obrigatorios nas opcións longas tamén o son nas opcións "
-"curtas.\n"
 
-#: src/timeout.c:235
+#: src/timeout.c:238
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 msgid ""
 "\n"
 "DURATION is a floating point number with an optional suffix:\n"
@@ -10288,7 +10345,7 @@ msgid ""
 "days.\n"
 msgstr ""
 
-#: src/timeout.c:259
+#: src/timeout.c:262
 msgid ""
 "\n"
 "If the command times out, and --preserve-status is not set, then exit with\n"
@@ -10299,17 +10356,17 @@ msgid ""
 "case the exit status is 128+9 rather than 124.\n"
 msgstr ""
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr ""
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, fuzzy, c-format
 msgid "error waiting for command"
 msgstr "erro escribindo %s"
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr ""
@@ -10686,7 +10743,7 @@ msgstr ""
 #: src/truncate.c:115
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 
 #: src/truncate.c:121
@@ -10770,12 +10827,12 @@ msgstr ""
 "do FICHEIRO. Se non se indica un FICHEIRO, ou cando o FICHEIRO é -, lese\n"
 "da entrada estándar.\n"
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, fuzzy, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr "%s: a entrada contén un lazo:"
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr "%s: a entrada contén un lazo:"
@@ -10874,12 +10931,12 @@ msgstr ""
 msgid "tab stop value is too large"
 msgstr "%s é grande de máis"
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr "Uso: %s [OPCIÓN]... [ENTRADA [SA�DA]]\n"
 
-#: src/uniq.c:138
+#: src/uniq.c:174
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
 "writing to OUTPUT (or standard output).\n"
@@ -10887,42 +10944,46 @@ msgid ""
 "With no options, matching lines are merged to the first occurrence.\n"
 msgstr ""
 
-#: src/uniq.c:147
+#: src/uniq.c:183
+#, fuzzy
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
 msgstr ""
 "  -c, --count           preceder cada liña co número de aparicións\n"
 "  -d, --repeated        amosar só as liñas duplicadas\n"
 
-#: src/uniq.c:151
-#, fuzzy
+#: src/uniq.c:187
+msgid ""
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
+msgstr ""
+
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr ""
+
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
+msgstr ""
+
+#: src/uniq.c:199
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
 "  -i, --ignore-case     ignore differences in case when comparing\n"
 "  -s, --skip-chars=N    avoid comparing the first N characters\n"
 "  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
-msgstr ""
-"  -D, --all-repeated[=método] amosar tódalas liñas duplicadas\n"
-"                        método={none(por defecto),prepend,separate}\n"
-"                        (ningún, anteceder, separar)\n"
-"                        A delimitación faise con liñas en branco.\n"
-"  -f, --skip-fields=N   evitar compara-los primeiros N campos\n"
-"  -i, --ignore-case     ignora-las diferencias entre maiúsculas-minúsculas\n"
-"                        ao comparar\n"
-"  -s, --skip­chars=N    evitar compara-los primeiros N caracteres\n"
-"  -u, --unique          amosar só as liñas únicas\n"
-
-#: src/uniq.c:161
+msgstr ""
+
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr ""
 "  -w, --check-chars=N   non comparar máis de N caracteres en cada liña\n"
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 #, fuzzy
 msgid ""
 "\n"
@@ -10933,7 +10994,7 @@ msgstr ""
 "Un campo é un grupo de espacios seguidos de varios caracteres.\n"
 "Os campos omítense antes dos caracteres.\n"
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 msgid ""
 "\n"
 "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n"
@@ -10941,24 +11002,35 @@ msgid ""
 "Also, comparisons honor the rules specified by 'LC_COLLATE'.\n"
 msgstr ""
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, fuzzy, c-format
 msgid "too many repeated lines"
 msgstr "demasiados argumentos"
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
 msgstr "número de campos a omitir non válido"
 
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
 msgstr "número de bytes a omitir non válido"
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
 msgstr "número de bytes a comparar non válido"
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr ""
+
+#: src/uniq.c:652
+#, fuzzy, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr ""
+"amosar tódalas liñas duplicadas e a conta de repeticións non ten sentido"
+
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr ""
@@ -10979,11 +11051,6 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/unlink.c:86
-#, fuzzy, c-format
-msgid "cannot unlink %s"
-msgstr "non se poden cambia-los permisos de `%s'"
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -11028,7 +11095,7 @@ msgstr[1] "usuario incorrecto"
 msgid ",  load average: %.2f"
 msgstr ",  carga media: %.2f"
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, fuzzy, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -11044,19 +11111,19 @@ msgstr ""
 "      --help        amosar esta axuda e saír\n"
 "      --version     amosa-la información da versión e saír\n"
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
 "an uninterruptible sleep state also contribute to the load average.\n"
 msgstr ""
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr ""
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, fuzzy, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
@@ -11233,18 +11300,12 @@ msgid ""
 msgstr ""
 
 #: src/who.c:673
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
 "If ARG1 ARG2 given, -m presumed: 'am i' or 'mom likes' are usual.\n"
 msgstr ""
-"Escribir quen está conectado actualmente segundo FICHEIRO.\n"
-"Se non se indica FICHEIRO, usarase %s.  O normal como FICHEIRO\n"
-"é %s\n"
-"\n"
-"      --help        amosar esta axuda e saír\n"
-"      --version     amosa-la información da versión e saír\n"
 
 #: src/whoami.c:45
 #, fuzzy
@@ -11280,220 +11341,6 @@ msgid ""
 "\n"
 msgstr ""
 
-#, fuzzy
-#~ msgid "  returning value: '%s'\n"
-#~ msgstr "creando ficheiro \"%s\"\n"
-
-#, fuzzy
-#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n"
-#~ msgstr "Uso: %s [OPCIÓN] [FICHEIRO]...\n"
-
-#, fuzzy
-#~ msgid "no valid suffix found\n"
-#~ msgstr "%s: lonxitude do sufixo non válida"
-
-#~ msgid "Try `%s --help' for more information.\n"
-#~ msgstr "Escriba \"%s --help\" para máis información.\n"
-
-#, fuzzy
-#~ msgid "reading %s"
-#~ msgstr "erro lendo %s"
-
-#, fuzzy
-#~ msgid "writing %s"
-#~ msgstr "erro escribindo %s"
-
-#, fuzzy
-#~ msgid "closing %s"
-#~ msgstr "pechando %s (fd=%d)"
-
-#~ msgid "accessing %s"
-#~ msgstr "accediendo a %s"
-
-#, fuzzy
-#~ msgid "opening %s"
-#~ msgstr "erro lendo %s"
-
-#, fuzzy
-#~ msgid ""
-#~ "Usage: %s NAME\n"
-#~ "  or:  %s OPTION\n"
-#~ msgstr ""
-#~ "Uso: %s [FICHEIRO]...\n"
-#~ " ou: %s [OPCIÓN]\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "  none, off       never make backups (even if --backup is given)\n"
-#~ "  numbered, t     make numbered backups\n"
-#~ "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
-#~ "  simple, never   always make simple backups\n"
-#~ "\n"
-#~ msgstr ""
-#~ "O sufixo de copia de seguridade é `~', a menos que se estableza con --"
-#~ "suffix\n"
-#~ "ou con SIMPLE_BACKUP_SUFFIX.  O método do control de versión pode ser\n"
-#~ "establecido coa opción --backup ou coa variable de ambiente "
-#~ "VERSION_CONTROL.\n"
-#~ "Os valores poden ser:\n"
-#~ "\n"
-#~ "  none, off       non facer nunca copias de seguridade (mesmo con --"
-#~ "backup)\n"
-#~ "  numbered, t     facer copias de seguridade numeradas\n"
-#~ "  existing, nil   copias numeradas se xa existen numeradas, se non "
-#~ "simples\n"
-#~ "  simple, never   facer sempre copias de seguridade simples\n"
-
-#~ msgid "All arguments to long options are mandatory for short options.\n"
-#~ msgstr ""
-#~ "Tódolos argumentos para as opcións longas son obrigatorios nas opcións "
-#~ "curtas.\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "RADIX is d for decimal, o for octal, x for hexadecimal or n for none.\n"
-#~ "BYTES is hexadecimal with 0x or 0X prefix, and may have a multiplier "
-#~ "suffix:\n"
-#~ "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
-#~ "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n"
-#~ "Adding a z suffix to any type displays printable characters at the end of "
-#~ "each\n"
-#~ "output line.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "BASE é d para decimal, o para octal, x para hexadecimao ou n para "
-#~ "ningunha.\n"
-#~ "BYTES é hexadecimal cun prefixo 0x ou 0X; multiplícase por 512 cun "
-#~ "sufixo\n"
-#~ "b, por 1024 con k e por 1048576 con m. Ao engadir un sufixo z a calquera\n"
-#~ "tipo engádese unha mostra de caracteres imprimibles á final de cada liña\n"
-#~ "de saída. "
-
-#, fuzzy
-#~ msgid ""
-#~ "Option --string without a number implies 3; option --width without a "
-#~ "number\n"
-#~ "implies 32.  By default, od uses -A o -t oS -w16.\n"
-#~ msgstr ""
-#~ "--string sen un número implica 3. --width sen un número implica 32.\n"
-#~ "Por defecto, od emprega -A o -t d2 -w 16.\n"
-
-#, fuzzy
-#~ msgid "Usage: %s [OPTION]... FILE\n"
-#~ msgstr "Uso: %s [OPCIÓN]... [FICHEIRO]...\n"
-
-#~ msgid "Password:"
-#~ msgstr "Contrasinal:"
-
-#~ msgid "getpass: cannot open /dev/tty"
-#~ msgstr "getpass: non se pode abrir /dev/tty"
-
-#, fuzzy
-#~ msgid "cannot set groups"
-#~ msgstr "non se poden omiti-lo usuario e o grupo"
-
-#, fuzzy
-#~ msgid "cannot set group id"
-#~ msgstr "non se poden omiti-lo usuario e o grupo"
-
-#, fuzzy
-#~ msgid "cannot set user id"
-#~ msgstr "non se poden omiti-lo usuario e o grupo"
-
-#, fuzzy
-#~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n"
-#~ msgstr "Uso: %s [OPCIÓN]... [FICHEIRO]...\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Change the effective user id and group id to that of USER.\n"
-#~ "\n"
-#~ "  -, -l, --login               make the shell a login shell\n"
-#~ "  -c, --command=COMMAND        pass a single COMMAND to the shell with -"
-#~ "c\n"
-#~ "  -f, --fast                   pass -f to the shell (for csh or tcsh)\n"
-#~ "  -m, --preserve-environment   do not reset environment variables\n"
-#~ "  -p                           same as -m\n"
-#~ "  -s, --shell=SHELL            run SHELL if /etc/shells allows it\n"
-#~ msgstr ""
-#~ "Cambia-lo identificador efectivo de usuario e grupo ós de USUARIO.\n"
-#~ "\n"
-#~ "  -, -l, --login               facer que a shell sexa de login\n"
-#~ "  -c, --command=COMANDO        enviar un só COMANDO á shell con -c\n"
-#~ "  -f, --fast                   enviar a opción -f á shell (para csh ou "
-#~ "tcsh)\n"
-#~ "  -m, --preserve-environment   non esquece-las variables de ambiente\n"
-#~ "  -p                           o mesmo que -m\n"
-#~ "  -s, --shell=SHELL            executar SHELL se /etc/shells o permite\n"
-#~ "      --help                   amosar esta axuda e saír\n"
-#~ "      --version                amosa-la información da versión e saír\n"
-
-#~ msgid "user %s does not exist"
-#~ msgstr "o usuario %s non existe"
-
-#~ msgid "incorrect password"
-#~ msgstr "contrasinal incorrecto"
-
-#~ msgid "using restricted shell %s"
-#~ msgstr "usando shell restrinxida %s"
-
-#, fuzzy
-#~ msgid "warning: cannot change directory to %s"
-#~ msgstr "non se pode crea-lo directorio %s"
-
-#, fuzzy
-#~ msgid ""
-#~ "  -f, --silent, --quiet   suppress most error messages\n"
-#~ "  -v, --verbose           output a diagnostic for every file processed\n"
-#~ "      --reference=RFILE   use RFILE's mode instead of MODE values\n"
-#~ "  -R, --recursive         change files and directories recursively\n"
-#~ msgstr ""
-#~ "Muda o modo de cada FICHEIRO a MODO.\n"
-#~ "\n"
-#~ "  -c, --changes           coma `verbose' mais informando só dos cambios\n"
-#~ "  -f, --silent, --quiet   suprimi-la maioría das mensaxes de erro\n"
-#~ "  -v, --verbose           amosar unha mensaxe por cada ficheiro "
-#~ "procesado\n"
-#~ "      --reference=FICH-R  usa-lo modo de FICH-R en vez do valor MODO\n"
-#~ "  -R, --recursive         mudar ficheiros e directorios recursivamente\n"
-#~ "      --help              amosar esta axuda e saír\n"
-#~ "      --version           amosa-la información da versión e saír\n"
-#~ "\n"
-#~ "Cada MODO é unha ou máis das letras ugoa, un dos símbolos +-= e unha ou "
-#~ "máis\n"
-#~ "das letras rwxXstugo.\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Display the current time in the given FORMAT, or set the system date.\n"
-#~ "\n"
-#~ "  -d, --date=STRING         display time described by STRING, not `now'\n"
-#~ "  -f, --file=DATEFILE       like --date once for each line of DATEFILE\n"
-#~ msgstr ""
-#~ "Amosa-la data actual no FORMATO indicado, ou establece-la data do "
-#~ "sistema.\n"
-#~ "\n"
-#~ "  -d, --date=CADEA          amosa-la data descrita por CADEA, non "
-#~ "`agora'\n"
-#~ "  -f, --file=FICH_DATA      coma --date, unha vez para cada liña en "
-#~ "FICH_DATA\n"
-#~ "  -I, --iso-8601[=ESPDATA]  escribir unha cadea de data/hora seguindo o\n"
-#~ "                            estándar ISO-8601.  ESPDATA=`date' (ou sen "
-#~ "nada)\n"
-#~ "                            para que só o sexa a data, `hours', `minutes' "
-#~ "ou\n"
-#~ "                            `seconds' para a data e a hora coa precisión\n"
-#~ "                            indicada.\n"
-#~ "  -r, --reference=FICH      amosa-la última data de modificación de FICH\n"
-#~ "  -R, --rfc-822             amosar unha cadea coa data seguindo o "
-#~ "RFC-822\n"
-#~ "  -s, --set=CADEA           establece-la data descrita por CADEA\n"
-#~ "  -u, --utc, --universal    escribir ou establece-la Hora Universal "
-#~ "Coordinada\n"
-#~ "      --help                amosar esta axuda e saír\n"
-#~ "      --version             amosa-la información da versión e saír\n"
-
 #~ msgid "program error"
 #~ msgstr "erro do programa"
 
@@ -11526,6 +11373,9 @@ msgstr ""
 #~ "garantía; nin sequera de COMERCIABILIDADE ou APTITUDE PARA UN FIN "
 #~ "DETERMINADO.\n"
 
+#~ msgid "Try `%s --help' for more information.\n"
+#~ msgstr "Escriba \"%s --help\" para máis información.\n"
+
 #~ msgid "too few arguments"
 #~ msgstr "número de argumentos insuficiente"
 
@@ -11554,6 +11404,18 @@ msgstr ""
 #~ msgstr "Uso: %s [OPCIÓN]... FICHEIRO_ESQUERDO FICHEIRO_DEREITO\n"
 
 #, fuzzy
+#~ msgid "reading %s"
+#~ msgstr "erro lendo %s"
+
+#, fuzzy
+#~ msgid "writing %s"
+#~ msgstr "erro escribindo %s"
+
+#, fuzzy
+#~ msgid "closing %s"
+#~ msgstr "pechando %s (fd=%d)"
+
+#, fuzzy
 #~ msgid "cannot overwrite directory %s"
 #~ msgstr "non se pode crea-lo directorio %s"
 
@@ -11592,6 +11454,9 @@ msgstr ""
 #~ msgid "missing file arguments"
 #~ msgstr "número de argumentos insuficiente"
 
+#~ msgid "accessing %s"
+#~ msgstr "accediendo a %s"
+
 #, fuzzy
 #~ msgid "%s: specified target is not a directory"
 #~ msgstr "%s existe pero non é un directorio"
@@ -11657,6 +11522,10 @@ msgstr ""
 #~ "só unha conversión de {ascii,ebcdic,ibm}, {lcase,ucase}, {block,unblock}, "
 #~ "{unblock,sync}"
 
+#, fuzzy
+#~ msgid "opening %s"
+#~ msgstr "erro lendo %s"
+
 #~ msgid ""
 #~ "no FILE arguments may be used with the option to output\n"
 #~ "dircolors' internal database"
@@ -11730,6 +11599,9 @@ msgstr ""
 #~ "TAMAÑO pode ter un sufixo multiplicativo: b para 512, k para 1K, m para 1 "
 #~ "mega.\n"
 
+#~ msgid "cannot reposition file pointer for %s"
+#~ msgstr "non se pode move-lo punteiro do ficheiro de %s"
+
 #~ msgid "unrecognized option `-%c'"
 #~ msgstr "opción descoñecida \"-%c\""
 
@@ -11781,9 +11653,6 @@ msgstr ""
 #~ msgid "invalid field number for file 2: `%s'"
 #~ msgstr "número de campo incorrecto para o ficheiro 2: \"%s\""
 
-#~ msgid "too many non-option arguments"
-#~ msgstr "demasiados argumentos"
-
 #~ msgid "too few non-option arguments"
 #~ msgstr "insuficientes argumentos"
 
@@ -11876,10 +11745,6 @@ msgstr ""
 #~ "fifos"
 
 #, fuzzy
-#~ msgid "cannot set permissions of %s"
-#~ msgstr "non se pode cambia-los permisos de %s"
-
-#, fuzzy
 #~ msgid "Mike Parker, David MacKenzie, and Jim Meyering"
 #~ msgstr "David Ihnat, David MacKenzie e Jim Meyering"
 
@@ -11923,6 +11788,43 @@ msgstr ""
 #~ msgid "Scott Bartram and David MacKenzie"
 #~ msgstr "Scott Bartram e David MacKenzie"
 
+#~ msgid "All arguments to long options are mandatory for short options.\n"
+#~ msgstr ""
+#~ "Tódolos argumentos para as opcións longas son obrigatorios nas opcións "
+#~ "curtas.\n"
+
+#~ msgid ""
+#~ "  -A, --address-radix=RADIX   decide how file offsets are printed\n"
+#~ "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
+#~ msgstr ""
+#~ "  -A, --address-radix=BASE    indicar como se amosan os desprazamentos\n"
+#~ "  -j, --skip-bytes=BYTES      omiti-los primeiros BYTES bytes de entrada\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "RADIX is d for decimal, o for octal, x for hexadecimal or n for none.\n"
+#~ "BYTES is hexadecimal with 0x or 0X prefix, it is multiplied by 512\n"
+#~ "with b suffix, by 1024 with k and by 1048576 with m.  Adding a z suffix "
+#~ "to\n"
+#~ "any type adds a display of printable characters to the end of each line\n"
+#~ "of output.  "
+#~ msgstr ""
+#~ "\n"
+#~ "BASE é d para decimal, o para octal, x para hexadecimao ou n para "
+#~ "ningunha.\n"
+#~ "BYTES é hexadecimal cun prefixo 0x ou 0X; multiplícase por 512 cun "
+#~ "sufixo\n"
+#~ "b, por 1024 con k e por 1048576 con m. Ao engadir un sufixo z a calquera\n"
+#~ "tipo engádese unha mostra de caracteres imprimibles á final de cada liña\n"
+#~ "de saída. "
+
+#~ msgid ""
+#~ "--string without a number implies 3.  --width without a number\n"
+#~ "implies 32.  By default, od uses -A o -t d2 -w 16.\n"
+#~ msgstr ""
+#~ "--string sen un número implica 3. --width sen un número implica 32.\n"
+#~ "Por defecto, od emprega -A o -t d2 -w 16.\n"
+
 #~ msgid "old-style offset"
 #~ msgstr "desprazamento ao estilo antigo"
 
@@ -12037,6 +11939,14 @@ msgstr ""
 #~ msgstr "Uso: %s formato [argumento...]\n"
 
 #~ msgid ""
+#~ "\n"
+#~ "With no FILE or if FILE is -, read Standard Input.  `-F /' by default.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Sen un FICHEIRO, ou se o FICHEIRO é -, lese da entrada estándar.\n"
+#~ "\"-F /\" por defecto.\n"
+
+#~ msgid ""
 #~ "This program is free software; you can redistribute it and/or modify\n"
 #~ "it under the terms of the GNU General Public License as published by\n"
 #~ "the Free Software Foundation; either version 2, or (at your option)\n"
@@ -12125,6 +12035,35 @@ msgstr ""
 #~ "que\n"
 #~ "o contido é realmente irrecuperable, considere utilizar o shred.\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "If FIRST or INCREMENT is omitted, it defaults to 1.\n"
+#~ "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
+#~ "INCREMENT should be positive if FIRST is smaller than LAST, and negative\n"
+#~ "otherwise.  When given, the FORMAT argument must contain exactly one of\n"
+#~ "the printf-style, floating point output formats %e, %f, %g\n"
+#~ msgstr ""
+#~ "Escribi-los números dende PRIMEIRO a ÚLTIMO, en incrementos de "
+#~ "INCREMENTO.\n"
+#~ "\n"
+#~ "  -f, --format FORMATO     usar un FORMATO de estilo printf(3) (defecto: %"
+#~ "%g)\n"
+#~ "  -s, --separator CADEA    usar CADEA para separa-los números (defecto: "
+#~ "\\n)\n"
+#~ "  -w, --equal-width        iguala-la anchura recheando con ceros ó "
+#~ "comezo\n"
+#~ "      --help               amosar esta axuda e saír\n"
+#~ "      --version            amosa-la información da versión e saír\n"
+#~ "\n"
+#~ "Se non se indican PRIMEIRO ou INCREMENTO, por defecto son 1.\n"
+#~ "PRIMEIRO, INCREMENTO e ÚLTIMO interprétanse coma valores de coma "
+#~ "frotante.\n"
+#~ "INCREMENTO ten que ser positivo se PRIMEIRO é máis pequeno que ÚLTIMO, e\n"
+#~ "negativo doutro xeito.  Se se indica, o argumento de FORMATO ten que "
+#~ "conter\n"
+#~ "só un dos formatos de coma frotante de estilo printf %%e, %%f, %%g.\n"
+
 #~ msgid ""
 #~ "when the starting value is larger than the limit,\n"
 #~ "the increment must be negative"
@@ -12175,6 +12114,53 @@ msgstr ""
 #~ msgid "new_mode: mode\n"
 #~ msgstr "new_mode: modo\n"
 
+#~ msgid "Password:"
+#~ msgstr "Contrasinal:"
+
+#~ msgid "getpass: cannot open /dev/tty"
+#~ msgstr "getpass: non se pode abrir /dev/tty"
+
+#, fuzzy
+#~ msgid "cannot set group id"
+#~ msgstr "non se poden omiti-lo usuario e o grupo"
+
+#, fuzzy
+#~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n"
+#~ msgstr "Uso: %s [OPCIÓN]... [FICHEIRO]...\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Change the effective user id and group id to that of USER.\n"
+#~ "\n"
+#~ "  -, -l, --login               make the shell a login shell\n"
+#~ "  -c, --command=COMMAND        pass a single COMMAND to the shell with -"
+#~ "c\n"
+#~ "  -f, --fast                   pass -f to the shell (for csh or tcsh)\n"
+#~ "  -m, --preserve-environment   do not reset environment variables\n"
+#~ "  -p                           same as -m\n"
+#~ "  -s, --shell=SHELL            run SHELL if /etc/shells allows it\n"
+#~ msgstr ""
+#~ "Cambia-lo identificador efectivo de usuario e grupo ós de USUARIO.\n"
+#~ "\n"
+#~ "  -, -l, --login               facer que a shell sexa de login\n"
+#~ "  -c, --command=COMANDO        enviar un só COMANDO á shell con -c\n"
+#~ "  -f, --fast                   enviar a opción -f á shell (para csh ou "
+#~ "tcsh)\n"
+#~ "  -m, --preserve-environment   non esquece-las variables de ambiente\n"
+#~ "  -p                           o mesmo que -m\n"
+#~ "  -s, --shell=SHELL            executar SHELL se /etc/shells o permite\n"
+#~ "      --help                   amosar esta axuda e saír\n"
+#~ "      --version                amosa-la información da versión e saír\n"
+
+#~ msgid "user %s does not exist"
+#~ msgstr "o usuario %s non existe"
+
+#~ msgid "incorrect password"
+#~ msgstr "contrasinal incorrecto"
+
+#~ msgid "using restricted shell %s"
+#~ msgstr "usando shell restrinxida %s"
+
 #~ msgid "Jay Lepreau and David MacKenzie"
 #~ msgstr "Jay Lepreau e David MacKenzie"
 
@@ -12243,6 +12229,9 @@ msgstr ""
 #~ msgid "%s: invalid maximum number of consecutive size changes"
 #~ msgstr "%s: número máximo de cambios de tamaño consecutivos incorrecto"
 
+#~ msgid "warning: --retry is useful only when following by name"
+#~ msgstr "aviso: --retry é útil só cando vai seguido por name"
+
 #, fuzzy
 #~ msgid "Mike Parker, Richard M. Stallman, and David MacKenzie"
 #~ msgstr "Richard Stallman e David MacKenzie"
@@ -12387,6 +12376,26 @@ msgstr ""
 #~ "gravando na SA�DA (ou saída estándar).\n"
 #~ "\n"
 
+#~ msgid ""
+#~ "  -D, --all-repeated[=delimit-method] print all duplicate lines\n"
+#~ "                        delimit-method={none(default),prepend,separate}\n"
+#~ "                        Delimiting is done with blank lines.\n"
+#~ "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+#~ "  -i, --ignore-case     ignore differences in case when comparing\n"
+#~ "  -s, --skip-chars=N    avoid comparing the first N characters\n"
+#~ "  -u, --unique          only print unique lines\n"
+#~ msgstr ""
+#~ "  -D, --all-repeated[=método] amosar tódalas liñas duplicadas\n"
+#~ "                        método={none(por defecto),prepend,separate}\n"
+#~ "                        (ningún, anteceder, separar)\n"
+#~ "                        A delimitación faise con liñas en branco.\n"
+#~ "  -f, --skip-fields=N   evitar compara-los primeiros N campos\n"
+#~ "  -i, --ignore-case     ignora-las diferencias entre maiúsculas-"
+#~ "minúsculas\n"
+#~ "                        ao comparar\n"
+#~ "  -s, --skip­chars=N    evitar compara-los primeiros N caracteres\n"
+#~ "  -u, --unique          amosar só as liñas únicas\n"
+
 #~ msgid "`-%lu' option is obsolete; use `-f %lu'"
 #~ msgstr "a opción \"-%lu\" é obsoleta; empregue \"-f %lu\""
 
@@ -13495,6 +13504,36 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
+#~ "Display the current time in the given FORMAT, or set the system date.\n"
+#~ "\n"
+#~ "  -d, --date=STRING         display time described by STRING, not `now'\n"
+#~ "  -f, --file=DATEFILE       like --date once for each line of DATEFILE\n"
+#~ msgstr ""
+#~ "Amosa-la data actual no FORMATO indicado, ou establece-la data do "
+#~ "sistema.\n"
+#~ "\n"
+#~ "  -d, --date=CADEA          amosa-la data descrita por CADEA, non "
+#~ "`agora'\n"
+#~ "  -f, --file=FICH_DATA      coma --date, unha vez para cada liña en "
+#~ "FICH_DATA\n"
+#~ "  -I, --iso-8601[=ESPDATA]  escribir unha cadea de data/hora seguindo o\n"
+#~ "                            estándar ISO-8601.  ESPDATA=`date' (ou sen "
+#~ "nada)\n"
+#~ "                            para que só o sexa a data, `hours', `minutes' "
+#~ "ou\n"
+#~ "                            `seconds' para a data e a hora coa precisión\n"
+#~ "                            indicada.\n"
+#~ "  -r, --reference=FICH      amosa-la última data de modificación de FICH\n"
+#~ "  -R, --rfc-822             amosar unha cadea coa data seguindo o "
+#~ "RFC-822\n"
+#~ "  -s, --set=CADEA           establece-la data descrita por CADEA\n"
+#~ "  -u, --utc, --universal    escribir ou establece-la Hora Universal "
+#~ "Coordinada\n"
+#~ "      --help                amosar esta axuda e saír\n"
+#~ "      --version             amosa-la información da versión e saír\n"
+
+#, fuzzy
+#~ msgid ""
 #~ "Run COMMAND with root directory set to NEWROOT.\n"
 #~ "\n"
 #~ "      --help       display this help and exit\n"
@@ -14871,8 +14910,8 @@ msgstr ""
 #~ "Paxinar ou encolumna-lo(s) FICHEIRO(s) para imprimir.\n"
 #~ "\n"
 #~ "  +PRIMEIRA_P�XINA[:ÚLTIMA_P�XINA]\n"
-#~ "                    comezar [deter] a impresión coa PRIMEIRA_[ÚLTIMA_]"
-#~ "P�XINA\n"
+#~ "                    comezar [deter] a impresión coa "
+#~ "PRIMEIRA_[ÚLTIMA_]P�XINA\n"
 #~ "  -COLUMNAS, --columnas=COLUMNAS\n"
 #~ "                    producir unha saida de COLUMNAS columnas e imprimir "
 #~ "por\n"
diff --git a/po/hr.gmo b/po/hr.gmo
index 146ecee0..e27a9823 100644
--- a/po/hr.gmo
+++ b/po/hr.gmo
diff --git a/po/hr.po b/po/hr.po
index f4464c4f..e599abad 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU coreutils 8.19\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
 "PO-Revision-Date: 2012-10-01 17:38+0200\n"
 "Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -37,76 +37,123 @@ msgstr "Ispravni argumenti su:"
 msgid "error closing file"
 msgstr "greška pri zatvaranju datoteke"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "greška pisanja"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "�uvam dozvole za %s"
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "Nepoznata greška sustava"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "obi�na prazna datoteka"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "obi�na datoteka"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "direktorij"
 
-#: lib/file-type.c:44
-msgid "block special file"
-msgstr "posebna blokovska datoteka"
-
-#: lib/file-type.c:47
-msgid "character special file"
-msgstr "posebna znakovna datoteka"
-
-#: lib/file-type.c:50
-msgid "fifo"
-msgstr "fifo"
-
-#: lib/file-type.c:53
+#: lib/file-type.c:46
 msgid "symbolic link"
 msgstr "simboli�ka veza"
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "uti�nica"
-
-#: lib/file-type.c:59
+#: lib/file-type.c:52
 msgid "message queue"
 msgstr "red poruka"
 
-#: lib/file-type.c:62
+#: lib/file-type.c:55
 msgid "semaphore"
 msgstr "semafor"
 
-#: lib/file-type.c:65
+#: lib/file-type.c:58
 msgid "shared memory object"
 msgstr "dijeljeni memorijski objekt"
 
-#: lib/file-type.c:68
+#: lib/file-type.c:61
 msgid "typed memory object"
 msgstr "tipizirani memorijski objekt"
 
-#: lib/file-type.c:70
+#: lib/file-type.c:66
+msgid "block special file"
+msgstr "posebna blokovska datoteka"
+
+#: lib/file-type.c:69
+msgid "character special file"
+msgstr "posebna znakovna datoteka"
+
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr ""
+
+#: lib/file-type.c:75
+msgid "fifo"
+msgstr "fifo"
+
+#: lib/file-type.c:78
+msgid "door"
+msgstr ""
+
+#: lib/file-type.c:81
+#, fuzzy
+msgid "multiplexed block special file"
+msgstr "posebna blokovska datoteka"
+
+#: lib/file-type.c:84
+#, fuzzy
+msgid "multiplexed character special file"
+msgstr "posebna znakovna datoteka"
+
+#: lib/file-type.c:87
+msgid "multiplexed file"
+msgstr ""
+
+#: lib/file-type.c:90
+#, fuzzy
+msgid "named file"
+msgstr "�udna datoteka"
+
+#: lib/file-type.c:93
+#, fuzzy
+msgid "network special file"
+msgstr "posebna blokovska datoteka"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr ""
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr ""
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr ""
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "uti�nica"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr ""
+
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "�udna datoteka"
 
@@ -241,18 +288,18 @@ msgstr "%s: opcija „-W %s� ne dozvoljava argument\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: opcija „-W %s� zahtijeva argument\n"
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr "ne mogu promijeniti dozvole %s"
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "ne mogu napraviti direktorij %s"
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr "memorija iscrpljena"
@@ -369,7 +416,7 @@ msgstr "Regularni izraz je prevelik"
 msgid "Unmatched ) or \\)"
 msgstr "Neuparena ) ili \\)"
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 msgid "No previous regular expression"
 msgstr "Nedostaje prethodni regularni izraz"
 
@@ -394,7 +441,7 @@ msgstr "koristite --no-preserve-root za zaobilaženje ove zaštite"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[dDyY]"
 
@@ -404,11 +451,11 @@ msgstr "^[dDyY]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, c-format
 msgid "setting permissions for %s"
 msgstr "postavljam dozvole za %s"
@@ -549,18 +596,6 @@ msgstr "Prekid napajanja"
 msgid "Resource lost"
 msgstr "Resurs izgubljen"
 
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, c-format
-msgid "cannot create pipe"
-msgstr "ne mogu napraviti cjevovod"
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, c-format
-msgid "%s subprocess failed"
-msgstr "%s potproces nije uspio"
-
 #: lib/strsignal.c:114
 #, c-format
 msgid "Real-time signal %d"
@@ -770,7 +805,7 @@ msgstr ""
 msgid "Report %s bugs to: %s\n"
 msgstr "Prijavite greške %s na %s\n"
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s po�etna stranica: <%s>\n"
@@ -780,31 +815,11 @@ msgstr "%s po�etna stranica: <%s>\n"
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr "%s po�etna stranica: <http://www.gnu.org/software/%s/>\n"
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr ""
 "Općenita pomoć za korištenje GNU softvera: <http://www.gnu.org/gethelp/>\n"
 
-#: lib/w32spawn.h:43
-#, c-format
-msgid "_open_osfhandle failed"
-msgstr "_open_osfhandle nije uspio"
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr "ne mogu vratiti fd %d: dup2 nije uspio"
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr "%s potproces"
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr "%s potproces je dobio fatalni signal %d"
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr "standardni ulaz"
@@ -826,7 +841,7 @@ msgstr "nepoznat tok podataka"
 msgid "failed to reopen %s with mode %s"
 msgstr "nisam uspio ponovo otvoriti %s s modom %s"
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr "usporedba nizova nije uspjela"
@@ -883,7 +898,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -900,48 +915,47 @@ msgid ""
 "from any other non-alphabet bytes in the encoded stream.\n"
 msgstr ""
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "greška �itanja"
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, c-format
 msgid "invalid input"
 msgstr "neispravan ulaz"
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, c-format
 msgid "invalid wrap size: %s"
 msgstr ""
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, c-format
 msgid "extra operand %s"
 msgstr "operand viška %s"
 
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, c-format
 msgid "closing standard input"
 msgstr "zatvaram standardni ulaz"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -968,8 +982,8 @@ msgstr ""
 #: src/basename.c:60
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/basename.c:67
@@ -983,32 +997,31 @@ msgid ""
 "  %s -a any/str1 any/str2   -> \"str1\" followed by \"str2\"\n"
 msgstr ""
 
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, c-format
 msgid "missing operand"
 msgstr "nedostaje operand"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr "Torbjorn Granlund"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 msgid "Richard M. Stallman"
 msgstr "Richard M. Stallman"
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1048,7 +1061,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr "ne mogu izvršiti ioctl na %s"
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr "standardni izlaz"
@@ -1065,14 +1078,14 @@ msgstr "Russell Coker"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 msgid "Jim Meyering"
 msgstr "Jim Meyering"
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, c-format
 msgid "failed to create security context: %s"
 msgstr "nisam uspio napraviti sigurnosni kontekst: %s"
@@ -1082,8 +1095,8 @@ msgstr "nisam uspio napraviti sigurnosni kontekst: %s"
 msgid "failed to set %s security context component to %s"
 msgstr ""
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, c-format
 msgid "failed to get security context of %s"
 msgstr "nisam uspio dohvatiti sigurnosni kontekst %s"
@@ -1093,18 +1106,18 @@ msgstr "nisam uspio dohvatiti sigurnosni kontekst %s"
 msgid "can't apply partial context to unlabeled file %s"
 msgstr "ne mogu primijeniti djelomi�ni kontekst neozna�enoj datoteci %s"
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, c-format
 msgid "failed to change context of %s to %s"
 msgstr "nisam uspio promijeniti kontekst %s u %s"
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
 msgstr "ne mogu pristupiti %s"
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, c-format
 msgid "cannot read directory %s"
 msgstr "ne mogu �itati direktorij %s"
@@ -1114,13 +1127,14 @@ msgstr "ne mogu �itati direktorij %s"
 msgid "changing security context of %s\n"
 msgstr "mijenjam sigurnosni kontekst %s\n"
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, c-format
 msgid "fts_read failed"
 msgstr "fts_read nije uspio"
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, c-format
 msgid "fts_close failed"
 msgstr "fts_close nije uspio"
@@ -1139,7 +1153,7 @@ msgstr ""
 
 #: src/chcon.c:357
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
@@ -1160,7 +1174,7 @@ msgid ""
 "  -l, --range=RANGE      set range RANGE in the target security context\n"
 msgstr ""
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
 "      --preserve-root    fail to operate recursively on '/'\n"
@@ -1196,36 +1210,37 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr ""
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr ""
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, c-format
 msgid "missing operand after %s"
 msgstr "nedostaje operand nakon %s"
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, c-format
 msgid "invalid context: %s"
 msgstr "neispravan kontekst: %s"
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr ""
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, c-format
 msgid "failed to get attributes of %s"
 msgstr "nisam uspio otkriti svojstva %s"
@@ -1251,7 +1266,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
@@ -1279,47 +1294,47 @@ msgid ""
 "  %s -hR staff /u  Change the group of /u and subfiles to \"staff\".\n"
 msgstr ""
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
 msgstr ""
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr ""
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr ""
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr ""
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr ""
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr ""
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, c-format
 msgid "changing permissions of %s"
 msgstr "mijenjam dozvole %s"
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr "%s: nove dozvole su %s, ne %s"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1330,33 +1345,33 @@ msgstr ""
 "    ili: %s [OPCIJA]... OKTALNI-MOD DATOTEKA...\n"
 "    ili: %s [OPCIJA]... --reference=REFDATOTEKA DATOTEKA...\n"
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 msgid ""
 "Change the mode of each FILE to MODE.\n"
 "With --reference, change the mode of each FILE to that of RFILE.\n"
 "\n"
 msgstr ""
 
-#: src/chmod.c:391
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr ""
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 msgid ""
 "\n"
 "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n"
 msgstr ""
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr ""
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, c-format
 msgid "invalid mode: %s"
 msgstr ""
@@ -1482,72 +1497,81 @@ msgid ""
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr ""
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr ""
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, c-format
 msgid "invalid group list %s"
 msgstr ""
 
-#: src/chroot.c:117
-#, c-format
-msgid "failed to set additional groups"
-msgstr ""
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
 "  or:  %s OPTION\n"
 msgstr ""
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
 msgstr ""
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
 msgstr ""
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 msgid ""
 "\n"
 "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n"
 msgstr ""
 
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, c-format
 msgid "cannot change root directory to %s"
 msgstr ""
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, c-format
 msgid "cannot chdir to root directory"
 msgstr ""
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr ""
+
+#: src/chroot.c:383
+#, fuzzy, c-format
+msgid "failed to get supplemental groups"
+msgstr "nisam uspio dohvatiti sigurnosni kontekst %s"
+
+#: src/chroot.c:395
+#, c-format
+msgid "failed to %s supplemental groups"
+msgstr ""
+
+#: src/chroot.c:402
 #, c-format
 msgid "failed to set group-ID"
 msgstr ""
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, c-format
 msgid "failed to set user-ID"
 msgstr ""
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, c-format
 msgid "failed to run command %s"
 msgstr ""
@@ -1575,7 +1599,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr ""
@@ -1642,294 +1666,327 @@ msgstr ""
 msgid "empty %s not allowed"
 msgstr ""
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr ""
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, c-format
 msgid "cannot lseek %s"
 msgstr ""
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr ""
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, c-format
 msgid "%s: failed to get extents info"
 msgstr ""
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, c-format
 msgid "%s: write failed"
 msgstr ""
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, c-format
 msgid "failed to extend %s"
 msgstr ""
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, c-format
 msgid "clearing permissions for %s"
 msgstr ""
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr ""
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
 msgstr ""
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, c-format
 msgid "failed to preserve authorship for %s"
 msgstr ""
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
-#, c-format
-msgid "cannot open %s for reading"
-msgstr ""
-
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
 #, c-format
-msgid "cannot fstat %s"
+msgid "failed to set default file creation context to %s"
 msgstr ""
 
 #: src/copy.c:820
+#, fuzzy, c-format
+msgid "failed to set default file creation context for %s"
+msgstr "nisam uspio dohvatiti sigurnosni kontekst %s"
+
+#: src/copy.c:846
+#, fuzzy, c-format
+msgid "failed to set the security context of %s"
+msgstr "nisam uspio dohvatiti sigurnosni kontekst %s"
+
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
-msgid "skipping file %s, as it was replaced while being copied"
+msgid "cannot open %s for reading"
 msgstr ""
 
-#: src/copy.c:850
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, c-format
-msgid "failed to get file system create context"
+msgid "cannot fstat %s"
 msgstr ""
 
-#: src/copy.c:864
+#: src/copy.c:935
 #, c-format
-msgid "failed to set the security context of %s to %s"
+msgid "skipping file %s, as it was replaced while being copied"
 msgstr ""
 
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
 msgid "cannot remove %s"
 msgstr ""
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
 msgstr ""
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr ""
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, c-format
 msgid "cannot create regular file %s"
 msgstr ""
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, c-format
 msgid "failed to clone %s from %s"
 msgstr ""
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr ""
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
 #, fuzzy, c-format
 msgid "failed to close %s"
 msgstr "nisam uspio ponovo otvoriti %s s modom %s"
 
-#: src/copy.c:1471
+#: src/copy.c:1580
+#, c-format
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
+msgstr ""
+
+#: src/copy.c:1581
 #, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
 msgstr ""
 
-#: src/copy.c:1478
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
 msgstr ""
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr ""
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr ""
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, c-format
 msgid "cannot create hard link %s to %s"
 msgstr ""
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, c-format
 msgid "cannot stat %s"
 msgstr ""
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, c-format
 msgid "omitting directory %s"
 msgstr ""
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr ""
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
 msgstr ""
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr ""
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr ""
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr ""
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr ""
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr ""
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr ""
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
 msgstr ""
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr ""
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr ""
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr ""
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr ""
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, c-format
 msgid "cannot move %s to %s"
 msgstr ""
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr ""
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, c-format
-msgid "failed to set default file creation context to %s"
-msgstr ""
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr ""
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr ""
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr ""
 
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, c-format
 msgid "cannot create fifo %s"
 msgstr ""
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, c-format
 msgid "cannot create special file %s"
 msgstr ""
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, c-format
 msgid "cannot read symbolic link %s"
 msgstr ""
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, c-format
 msgid "cannot create symbolic link %s"
 msgstr ""
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
 msgstr ""
 
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, c-format
 msgid "cannot un-backup %s"
 msgstr ""
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr ""
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr ""
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr ""
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, fuzzy, c-format
+msgid "unknown program %s"
+msgstr "nepoznat tok podataka"
+
+#: src/cp.c:157 src/mv.c:288
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -1937,11 +1994,11 @@ msgid ""
 "  or:  %s [OPTION]... -t DIRECTORY SOURCE...\n"
 msgstr ""
 
-#: src/cp.c:162
+#: src/cp.c:163
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 
-#: src/cp.c:168
+#: src/cp.c:169
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
 "      --attributes-only        don't copy the file data, just the "
@@ -1955,7 +2012,7 @@ msgid ""
 "  -d                           same as --no-dereference --preserve=links\n"
 msgstr ""
 
-#: src/cp.c:177
+#: src/cp.c:178
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
 "                                 opened, remove it and try again (this "
@@ -1968,20 +2025,20 @@ msgid ""
 "  -H                           follow command-line symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:186
+#: src/cp.c:187
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
 "  -L, --dereference            always follow symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:190
+#: src/cp.c:191
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
 "                                 a previous -i option)\n"
 "  -P, --no-dereference         never follow symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:195
+#: src/cp.c:196
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
 "      --preserve[=ATTR_LIST]   preserve the specified attributes (default:\n"
@@ -1991,13 +2048,13 @@ msgid ""
 "                                 all\n"
 msgstr ""
 
-#: src/cp.c:203
+#: src/cp.c:204
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                use full source file name under DIRECTORY\n"
 msgstr ""
 
-#: src/cp.c:207
+#: src/cp.c:208
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
 "      --reflink[=WHEN]         control clone/CoW copies. See below\n"
@@ -2006,7 +2063,7 @@ msgid ""
 "force)\n"
 msgstr ""
 
-#: src/cp.c:213
+#: src/cp.c:214
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
 "      --strip-trailing-slashes  remove any trailing slashes from each "
@@ -2014,7 +2071,7 @@ msgid ""
 "                                 argument\n"
 msgstr ""
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -2023,7 +2080,7 @@ msgid ""
 "  -T, --no-target-directory    treat DEST as a normal file\n"
 msgstr ""
 
-#: src/cp.c:224
+#: src/cp.c:225
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
 "                                 than the destination file or when the\n"
@@ -2032,7 +2089,15 @@ msgid ""
 "  -x, --one-file-system        stay on this file system\n"
 msgstr ""
 
-#: src/cp.c:233
+#: src/cp.c:232
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/cp.c:240
 msgid ""
 "\n"
 "By default, sparse SOURCE files are detected by a crude heuristic and the\n"
@@ -2048,7 +2113,7 @@ msgid ""
 "fails, or if --reflink=auto is specified, fall back to a standard copy.\n"
 msgstr ""
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 msgid ""
 "\n"
 "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n"
@@ -2058,7 +2123,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2066,7 +2131,7 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2074,226 +2139,236 @@ msgid ""
 "regular file.\n"
 msgstr ""
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, c-format
 msgid "failed to preserve times for %s"
 msgstr ""
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, c-format
 msgid "failed to preserve permissions for %s"
 msgstr ""
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, c-format
 msgid "cannot make directory %s"
 msgstr ""
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr ""
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
 #, fuzzy, c-format
 msgid "failed to access %s"
 msgstr "ne mogu pristupiti %s"
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, c-format
 msgid "missing file operand"
 msgstr ""
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, c-format
 msgid "missing destination file operand after %s"
 msgstr ""
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr ""
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, c-format
 msgid "target %s is not a directory"
 msgstr ""
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr ""
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, c-format
 msgid "multiple target directories specified"
 msgstr ""
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr ""
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr ""
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr ""
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr ""
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr ""
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, c-format
+msgid "cannot set target context and preserve it"
+msgstr ""
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr ""
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr ""
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr ""
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr ""
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, c-format
 msgid "%s: %s: line number out of range"
 msgstr ""
 
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, c-format
 msgid " on repetition %s\n"
 msgstr ""
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, c-format
 msgid "%s: %s: match not found"
 msgstr ""
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr ""
 
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, c-format
 msgid "write error for %s"
 msgstr ""
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, c-format
 msgid "%s: integer expected after delimiter"
 msgstr ""
 
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr ""
 
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr ""
 
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr ""
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr ""
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr ""
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr ""
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr ""
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr ""
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr ""
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr ""
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr ""
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr ""
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr ""
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr ""
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr ""
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr ""
 
-#: src/csplit.c:1455
+#: src/csplit.c:1483
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
 "and output byte counts of each piece to standard output.\n"
 msgstr ""
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2301,20 +2376,24 @@ msgid ""
 "  -k, --keep-files           do not remove output files on errors\n"
 msgstr ""
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr ""
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
 "  -z, --elide-empty-files    remove empty output files\n"
 msgstr ""
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
 msgstr ""
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 msgid ""
 "\n"
 "  INTEGER            copy up to but not including specified line number\n"
@@ -2331,27 +2410,23 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr ""
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr ""
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr ""
 
-#: src/cut.c:193
+#: src/cut.c:176
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr ""
 
-#: src/cut.c:199
+#: src/cut.c:182
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
 "  -c, --characters=LIST   select only these characters\n"
 "  -d, --delimiter=DELIM   use DELIM instead of TAB for field delimiter\n"
 msgstr ""
 
-#: src/cut.c:204
+#: src/cut.c:187
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
 "                            that contains no delimiter character, unless\n"
@@ -2359,20 +2434,20 @@ msgid ""
 "  -n                      (ignored)\n"
 msgstr ""
 
-#: src/cut.c:210
+#: src/cut.c:193
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
 "                            or fields\n"
 msgstr ""
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
 "                            the default is to use the input delimiter\n"
 msgstr ""
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2380,7 +2455,7 @@ msgid ""
 "in the same order that it is read, and is written exactly once.\n"
 msgstr ""
 
-#: src/cut.c:227
+#: src/cut.c:210
 msgid ""
 "Each range is one of:\n"
 "\n"
@@ -2392,56 +2467,60 @@ msgid ""
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
 
-#: src/cut.c:367 src/cut.c:493
+#: src/cut.c:300 src/cut.c:394
 msgid "invalid byte, character or field list"
 msgstr ""
 
-#: src/cut.c:387
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr ""
+
+#: src/cut.c:320
 msgid "invalid range with no endpoint: -"
 msgstr ""
 
-#: src/cut.c:403
+#: src/cut.c:334
 msgid "invalid decreasing range"
 msgstr ""
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, c-format
 msgid "byte offset %s is too large"
 msgstr ""
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, c-format
 msgid "field number %s is too large"
 msgstr ""
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr ""
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr ""
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr ""
 
-#: src/cut.c:850
+#: src/cut.c:790
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr ""
 
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
 msgstr ""
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr ""
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr ""
 
@@ -2481,7 +2560,7 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 
 #: src/date.c:158
@@ -2613,10 +2692,10 @@ msgid ""
 "  $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n"
 msgstr ""
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr ""
@@ -2654,7 +2733,7 @@ msgstr ""
 msgid "cannot set date"
 msgstr ""
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, c-format
 msgid "time %s is out of range"
 msgstr ""
@@ -2665,14 +2744,14 @@ msgstr ""
 msgid "Paul Rubin"
 msgstr ""
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
 "  or:  %s OPTION\n"
 msgstr ""
 
-#: src/dd.c:526
+#: src/dd.c:532
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
 "\n"
@@ -2683,7 +2762,7 @@ msgid ""
 "  ibs=BYTES       read up to BYTES bytes at a time (default: 512)\n"
 msgstr ""
 
-#: src/dd.c:535
+#: src/dd.c:541
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
 "  iflag=FLAGS     read as per the comma separated symbol list\n"
@@ -2696,7 +2775,7 @@ msgid ""
 "                  'noxfer' suppresses transfer stats, 'none' suppresses all\n"
 msgstr ""
 
-#: src/dd.c:546
+#: src/dd.c:552
 msgid ""
 "\n"
 "N and BYTES may be followed by the following multiplicative suffixes:\n"
@@ -2707,7 +2786,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dd.c:555
+#: src/dd.c:561
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
 "  ebcdic    from ASCII to EBCDIC\n"
@@ -2722,7 +2801,7 @@ msgid ""
 "            with block or unblock, pad with spaces rather than NULs\n"
 msgstr ""
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -2732,7 +2811,7 @@ msgid ""
 "  fsync     likewise, but also write metadata\n"
 msgstr ""
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -2741,75 +2820,75 @@ msgid ""
 "suggested)\n"
 msgstr ""
 
-#: src/dd.c:583
+#: src/dd.c:589
 msgid "  cio       use concurrent I/O for data\n"
 msgstr ""
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr ""
 
-#: src/dd.c:587
+#: src/dd.c:593
 msgid "  directory  fail unless a directory\n"
 msgstr ""
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr ""
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr ""
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr ""
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr ""
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr ""
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr ""
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr ""
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr ""
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr ""
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr ""
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr ""
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, c-format
 msgid ""
 "\n"
@@ -2826,14 +2905,24 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
 "%<PRIuMAX>+%<PRIuMAX> records out\n"
 msgstr ""
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
@@ -2841,7 +2930,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
@@ -2849,7 +2938,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr ""
 
@@ -2863,269 +2952,269 @@ msgstr ""
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
 msgstr ""
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, c-format
 msgid "closing input file %s"
 msgstr ""
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr ""
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr ""
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, c-format
 msgid "writing to %s"
 msgstr ""
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, c-format
 msgid "unrecognized operand %s"
 msgstr ""
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 msgid "invalid conversion"
 msgstr ""
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 msgid "invalid input flag"
 msgstr ""
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 msgid "invalid output flag"
 msgstr ""
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 msgid "invalid status flag"
 msgstr ""
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, c-format
 msgid "invalid number %s"
 msgstr ""
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr ""
 
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, c-format
 msgid "cannot combine block and unblock"
 msgstr ""
 
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, c-format
 msgid "cannot combine lcase and ucase"
 msgstr ""
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, c-format
 msgid "cannot combine excl and nocreat"
 msgstr ""
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, c-format
 msgid "cannot combine direct and nocache"
 msgstr ""
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
 "  of mt_type=0x%0lx -- see <sys/mtio.h> for the list of types"
 msgstr ""
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, c-format
 msgid "%s: cannot skip"
 msgstr ""
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, c-format
 msgid "%s: cannot seek"
 msgstr ""
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr ""
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr ""
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr ""
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, c-format
 msgid "setting flags for %s"
 msgstr ""
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr ""
 
-#: src/dd.c:2133
+#: src/dd.c:2172
 #, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
 msgstr ""
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr ""
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
 msgstr ""
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, c-format
 msgid "failed to open %s"
 msgstr ""
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
 "blocks"
 msgstr ""
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr ""
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, c-format
 msgid "failed to discard cache for: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr ""
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr ""
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr ""
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr ""
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr ""
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr ""
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr ""
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr ""
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr ""
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr ""
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr ""
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr ""
 
-#: src/df.c:383
+#: src/df.c:207
+msgid "File"
+msgstr ""
+
+#: src/df.c:387
 #, c-format
-msgid "option --output: field '%s' unknown"
+msgid "option --output: field %s unknown"
 msgstr ""
 
-#: src/df.c:390
+#: src/df.c:394
 #, c-format
-msgid "option --output: field '%s' used more than once"
+msgid "option --output: field %s used more than once"
 msgstr ""
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr ""
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr ""
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr ""
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
 msgstr ""
 
-#: src/df.c:1210
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr ""
+
+#: src/df.c:1384
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
 "or all file systems by default.\n"
 msgstr ""
 
-#: src/df.c:1217
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
 
-#: src/df.c:1227
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -3134,7 +3223,7 @@ msgid ""
 "(default)\n"
 msgstr ""
 
-#: src/df.c:1234
+#: src/df.c:1409
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
 "                               or print all fields if FIELD_LIST is "
@@ -3147,41 +3236,33 @@ msgid ""
 "  -v                    (ignored)\n"
 msgstr ""
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
 
-#: src/df.c:1285
+#: src/df.c:1460
 #, c-format
 msgid "options %s and %s are mutually exclusive"
 msgstr ""
 
-#: src/df.c:1335
-msgid "warning: "
-msgstr ""
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr ""
-
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr ""
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr ""
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 msgid "cannot read table of mounted file systems"
 msgstr ""
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr ""
@@ -3191,7 +3272,7 @@ msgstr ""
 msgid "H. Peter Anvin"
 msgstr ""
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr ""
@@ -3258,7 +3339,7 @@ msgid ""
 msgstr ""
 
 #: src/dirname.c:59
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/dirname.c:64
@@ -3271,21 +3352,20 @@ msgid ""
 "  %s stdio.h            -> \".\"\n"
 msgstr ""
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
 "  or:  %s [OPTION]... --files0-from=F\n"
 msgstr ""
 
-#: src/du.c:274
+#: src/du.c:285
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr ""
 
-#: src/du.c:280
+#: src/du.c:291
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3294,11 +3374,11 @@ msgid ""
 "                          fragmentation, indirect blocks, and the like\n"
 msgstr ""
 
-#: src/du.c:289
+#: src/du.c:300
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3310,17 +3390,18 @@ msgid ""
 "                          --summarize\n"
 msgstr ""
 
-#: src/du.c:302
+#: src/du.c:313
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
 
-#: src/du.c:310
+#: src/du.c:322
 msgid ""
 "  -k                    like --block-size=1K\n"
 "  -L, --dereference     dereference all symbolic links\n"
@@ -3328,16 +3409,17 @@ msgid ""
 "  -m                    like --block-size=1M\n"
 msgstr ""
 
-#: src/du.c:316
+#: src/du.c:328
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
 
-#: src/du.c:322
+#: src/du.c:334
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
 "                          or entries greater than SIZE if negative\n"
@@ -3346,77 +3428,77 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
 msgstr ""
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
 "  -x, --one-file-system    skip directories on different file systems\n"
 msgstr ""
 
-#: src/du.c:386
+#: src/du.c:398
 msgid "Infinity"
 msgstr ""
 
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr ""
-
-#: src/du.c:624
+#: src/du.c:636
 #, c-format
 msgid "fts_read failed: %s"
 msgstr ""
 
-#: src/du.c:780
+#: src/du.c:787
 #, c-format
 msgid "invalid maximum depth %s"
 msgstr ""
 
-#: src/du.c:809
+#: src/du.c:816
 #, fuzzy, c-format
 msgid "invalid --threshold argument '-0'"
 msgstr "neispravan %s%s argument „%s�"
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr ""
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr ""
 
-#: src/du.c:900
+#: src/du.c:911
 #, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr ""
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 msgid "file operands cannot be combined with --files0-from"
 msgstr ""
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr ""
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr ""
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 msgid "invalid zero-length file name"
 msgstr ""
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr ""
 
@@ -3500,7 +3582,7 @@ msgstr ""
 #: src/env.c:61
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
 
@@ -3571,23 +3653,23 @@ msgid "input line is too long"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr ""
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
 "  or:  %s OPTION\n"
 msgstr ""
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -3598,7 +3680,7 @@ msgid ""
 "  ARG1 & ARG2       ARG1 if neither argument is null or 0, otherwise 0\n"
 msgstr ""
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -3609,14 +3691,14 @@ msgid ""
 "  ARG1 > ARG2       ARG1 is greater than ARG2\n"
 msgstr ""
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
 "  ARG1 - ARG2       arithmetic difference of ARG1 and ARG2\n"
 msgstr ""
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -3625,7 +3707,7 @@ msgid ""
 "  ARG1 % ARG2       arithmetic remainder of ARG1 divided by ARG2\n"
 msgstr ""
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -3636,7 +3718,7 @@ msgid ""
 "  length STRING              length of STRING\n"
 msgstr ""
 
-#: src/expr.c:251
+#: src/expr.c:250
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
 "                               keyword like 'match' or an operator like '/'\n"
@@ -3644,7 +3726,7 @@ msgid ""
 "  ( EXPRESSION )             value of EXPRESSION\n"
 msgstr ""
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -3654,7 +3736,7 @@ msgid ""
 "0.\n"
 msgstr ""
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -3662,32 +3744,32 @@ msgid ""
 "or 0, 2 if EXPRESSION is syntactically invalid, and 3 if an error occurred.\n"
 msgstr ""
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, c-format
 msgid "syntax error"
 msgstr ""
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, c-format
 msgid "error in regular expression matcher"
 msgstr ""
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, c-format
 msgid "non-integer argument"
 msgstr ""
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr ""
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr ""
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, c-format
 msgid "the strings compared were %s and %s"
 msgstr ""
@@ -3697,34 +3779,34 @@ msgstr ""
 msgid "Niels Moller"
 msgstr ""
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
 msgstr ""
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
 msgstr ""
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, c-format
 msgid "%s is not a valid positive integer"
 msgstr ""
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr ""
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
 "  or:  %s OPTION\n"
 msgstr ""
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
 "are specified on the command line, read them from standard input.\n"
@@ -3811,28 +3893,28 @@ msgid "invalid number of columns: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr ""
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
 msgstr ""
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, c-format
 msgid "failed to get groups for user %s"
 msgstr ""
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, c-format
 msgid "failed to get groups for the current process"
 msgstr ""
@@ -3854,22 +3936,22 @@ msgid ""
 "the current process (which may differ if the groups database has changed).\n"
 msgstr ""
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, c-format
 msgid "cannot get real UID"
 msgstr ""
 
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, c-format
 msgid "cannot get effective GID"
 msgstr ""
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, c-format
 msgid "cannot get real GID"
 msgstr ""
 
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, c-format
 msgid "%s: no such user"
 msgstr ""
@@ -3905,58 +3987,48 @@ msgid ""
 "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n"
 msgstr ""
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr ""
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, c-format
 msgid "%s: number of bytes is too large"
 msgstr ""
 
-#: src/head.c:440
-#, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr ""
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr ""
 
-#: src/head.c:673
-#, c-format
-msgid "%s: failed to reset file pointer"
-msgstr ""
-
-#: src/head.c:798
+#: src/head.c:423 src/tail.c:457
 #, c-format
-msgid "cannot reposition file pointer for %s"
+msgid "%s: cannot seek to relative offset %s"
 msgstr ""
 
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr ""
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr ""
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr ""
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr ""
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr ""
 
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, c-format
 msgid "invalid trailing option -- %c"
 msgstr ""
@@ -3994,145 +4066,161 @@ msgid "cannot determine hostname"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr ""
 
-#: src/id.c:81
-#, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
-msgstr ""
+#: src/id.c:84
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]... [USER]\n"
+msgstr "Uporaba: %s [OPCIJA]... [DATOTEKA]...\n"
 
-#: src/id.c:82
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
 msgstr ""
 
-#: src/id.c:96
+#: src/id.c:90
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
+msgstr ""
+
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
 msgstr ""
 
-#: src/id.c:140
+#: src/id.c:151
+#, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr ""
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr ""
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr ""
 
-#: src/id.c:178
+#: src/id.c:198
 #, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr ""
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr ""
 
-#: src/id.c:199
+#: src/id.c:209
+#, c-format
+msgid "option --zero not permitted in default format"
+msgstr ""
+
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
 msgstr ""
 
-#: src/id.c:224
+#: src/id.c:265
 #, c-format
 msgid "cannot get effective UID"
 msgstr ""
 
-#: src/id.c:311
+#: src/id.c:354
 #, c-format
 msgid "cannot find name for user ID %s"
 msgstr ""
 
-#: src/id.c:329
+#: src/id.c:372
 #, c-format
 msgid "uid=%s"
 msgstr ""
 
-#: src/id.c:334
+#: src/id.c:377
 #, c-format
 msgid " gid=%s"
 msgstr ""
 
-#: src/id.c:341
+#: src/id.c:384
 #, c-format
 msgid " euid=%s"
 msgstr ""
 
-#: src/id.c:349
+#: src/id.c:392
 #, c-format
 msgid " egid=%s"
 msgstr ""
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr ""
 
-#: src/id.c:393
+#: src/id.c:437
 #, c-format
 msgid " context=%s"
 msgstr ""
 
-#: src/install.c:373
+#: src/install.c:376
 #, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr ""
 
-#: src/install.c:414
+#: src/install.c:417
 #, c-format
 msgid "creating directory %s"
 msgstr ""
 
-#: src/install.c:482
+#: src/install.c:485
 #, c-format
 msgid "cannot change ownership of %s"
 msgstr ""
 
-#: src/install.c:506
+#: src/install.c:509
 #, c-format
 msgid "cannot set time stamps for %s"
 msgstr ""
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, c-format
 msgid "fork system call failed"
 msgstr ""
 
-#: src/install.c:531
+#: src/install.c:535
 #, c-format
 msgid "cannot run %s"
 msgstr ""
 
-#: src/install.c:535
+#: src/install.c:539
 #, c-format
 msgid "waiting for strip"
 msgstr ""
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr ""
 
-#: src/install.c:558
+#: src/install.c:565
 #, c-format
 msgid "invalid user %s"
 msgstr ""
 
-#: src/install.c:594
+#: src/install.c:601
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -4141,7 +4229,7 @@ msgid ""
 "  or:  %s [OPTION]... -d DIRECTORY...\n"
 msgstr ""
 
-#: src/install.c:601
+#: src/install.c:608
 msgid ""
 "\n"
 "This install program copies files (often just compiled) into destination\n"
@@ -4155,7 +4243,7 @@ msgid ""
 "In the 4th form, create all components of the given DIRECTORY(ies).\n"
 msgstr ""
 
-#: src/install.c:615
+#: src/install.c:622
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
 "  -b                  like --backup but does not accept an argument\n"
@@ -4167,7 +4255,7 @@ msgid ""
 "                        components of the specified directories\n"
 msgstr ""
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -4179,7 +4267,7 @@ msgid ""
 "  -o, --owner=OWNER   set ownership (super-user only)\n"
 msgstr ""
 
-#: src/install.c:631
+#: src/install.c:638
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
 "files\n"
@@ -4193,60 +4281,57 @@ msgid ""
 "  -v, --verbose       print the name of each directory as it is created\n"
 msgstr ""
 
-#: src/install.c:641
+#: src/install.c:648
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
 
-#: src/install.c:859
+#: src/install.c:696 src/unlink.c:86
 #, c-format
-msgid ""
-"WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
+msgid "cannot unlink %s"
 msgstr ""
 
-#: src/install.c:869
+#: src/install.c:877
 #, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
+msgid ""
+"WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
 msgstr ""
 
-#: src/install.c:886
+#: src/install.c:917
 #, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr ""
 
-#: src/install.c:889
+#: src/install.c:920
 #, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr ""
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr ""
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, c-format
 msgid "invalid mode %s"
 msgstr ""
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr ""
 
-#: src/install.c:959
+#: src/install.c:1001
 #, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr ""
 
-#: src/install.c:966
+#: src/install.c:1008
 #, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr ""
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -4258,7 +4343,7 @@ msgstr ""
 msgid "Mike Haertel"
 msgstr ""
 
-#: src/join.c:191
+#: src/join.c:195
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
 "standard output.  The default join field is the first, delimited\n"
@@ -4269,7 +4354,7 @@ msgid ""
 "  -e EMPTY          replace missing input fields with EMPTY\n"
 msgstr ""
 
-#: src/join.c:200
+#: src/join.c:204
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
 "  -j FIELD          equivalent to '-1 FIELD -2 FIELD'\n"
@@ -4277,7 +4362,7 @@ msgid ""
 "  -t CHAR           use CHAR as input and output field separator\n"
 msgstr ""
 
-#: src/join.c:206
+#: src/join.c:210
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
 "  -1 FIELD          join on this FIELD of file 1\n"
@@ -4289,7 +4374,11 @@ msgid ""
 "                      print them without trying to pair them\n"
 msgstr ""
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr ""
+
+#: src/join.c:225
 msgid ""
 "\n"
 "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n"
@@ -4308,47 +4397,47 @@ msgid ""
 "warning message will be given.\n"
 msgstr ""
 
-#: src/join.c:403
+#: src/join.c:410
 #, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
 msgstr ""
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, c-format
 msgid "invalid field number: %s"
 msgstr ""
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, c-format
 msgid "invalid field specifier: %s"
 msgstr ""
 
-#: src/join.c:877
+#: src/join.c:884
 #, c-format
 msgid "invalid file number in field spec: %s"
 msgstr ""
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr ""
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr ""
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, c-format
 msgid "multi-character tab %s"
 msgstr ""
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr ""
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr ""
@@ -4450,47 +4539,47 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr ""
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr ""
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, c-format
 msgid "%s: cannot overwrite directory"
 msgstr ""
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
 msgstr ""
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, c-format
 msgid "failed to create symbolic link %s"
 msgstr ""
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr ""
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr ""
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, c-format
 msgid "failed to create hard link %s"
 msgstr ""
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, c-format
 msgid "failed to create hard link %s => %s"
 msgstr ""
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -4499,7 +4588,7 @@ msgid ""
 "  or:  %s [OPTION]... -t DIRECTORY TARGET...  (4th form)\n"
 msgstr ""
 
-#: src/ln.c:381
+#: src/ln.c:398
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
 "In the 2nd form, create a link to TARGET in the current directory.\n"
@@ -4511,7 +4600,7 @@ msgid ""
 "interpreted in relation to its parent directory.\n"
 msgstr ""
 
-#: src/ln.c:394
+#: src/ln.c:411
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
 "file\n"
@@ -4524,7 +4613,7 @@ msgid ""
 "  -f, --force                 remove existing destination files\n"
 msgstr ""
 
-#: src/ln.c:402
+#: src/ln.c:419
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
 "  -L, --logical               dereference TARGETs that are symbolic links\n"
@@ -4536,7 +4625,7 @@ msgid ""
 "  -s, --symbolic              make symbolic links instead of hard links\n"
 msgstr ""
 
-#: src/ln.c:411
+#: src/ln.c:428
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
 "  -t, --target-directory=DIRECTORY  specify the DIRECTORY in which to "
@@ -4546,7 +4635,7 @@ msgid ""
 "  -v, --verbose               print name of each linked file\n"
 msgstr ""
 
-#: src/ln.c:433
+#: src/ln.c:450
 #, c-format
 msgid ""
 "\n"
@@ -4554,12 +4643,12 @@ msgid ""
 "behavior when a TARGET is a symbolic link, defaulting to %s.\n"
 msgstr ""
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr ""
 
-#: src/ln.c:588
+#: src/ln.c:605
 #, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr ""
@@ -4590,7 +4679,7 @@ msgstr ""
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 msgid "%b %e  %Y"
 msgstr ""
 
@@ -4599,100 +4688,100 @@ msgstr ""
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 msgid "%b %e %H:%M"
 msgstr ""
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr ""
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr ""
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr ""
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, c-format
 msgid "invalid line width: %s"
 msgstr ""
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, c-format
 msgid "invalid tab size: %s"
 msgstr ""
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, c-format
 msgid "invalid time style format %s"
 msgstr ""
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 msgid "Valid arguments are:\n"
 msgstr ""
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr ""
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr ""
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, c-format
 msgid "unrecognized prefix: %s"
 msgstr ""
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr ""
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, c-format
 msgid "cannot open directory %s"
 msgstr ""
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, c-format
 msgid "cannot determine device and inode of %s"
 msgstr ""
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, c-format
 msgid "%s: not listing already-listed directory"
 msgstr ""
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, c-format
 msgid "reading directory %s"
 msgstr ""
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, c-format
 msgid "closing directory %s"
 msgstr ""
 
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, c-format
 msgid "cannot compare file names %s and %s"
 msgstr ""
 
-#: src/ls.c:4721
+#: src/ls.c:4781
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
 "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n"
 msgstr ""
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
 "  -A, --almost-all           do not list implied . and ..\n"
@@ -4701,33 +4790,32 @@ msgid ""
 "characters\n"
 msgstr ""
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
 "  -F, --classify             append indicator (one of */=>@|) to entries\n"
@@ -4737,40 +4825,41 @@ msgid ""
 "      --full-time            like -l --time-style=full-iso\n"
 msgstr ""
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr ""
 
-#: src/ls.c:4763
+#: src/ls.c:4823
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 
-#: src/ls.c:4769
+#: src/ls.c:4829
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
 
-#: src/ls.c:4775
+#: src/ls.c:4835
 msgid ""
 "  -H, --dereference-command-line\n"
 "                             follow symbolic links listed on the command "
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
 msgstr ""
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
 "names:\n"
@@ -4779,10 +4868,10 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -4792,7 +4881,7 @@ msgid ""
 "entries\n"
 msgstr ""
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -4803,11 +4892,11 @@ msgid ""
 "                             append / indicator to directories\n"
 msgstr ""
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -4815,7 +4904,7 @@ msgid ""
 "escape\n"
 msgstr ""
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
 "  -R, --recursive            list subdirectories recursively\n"
@@ -4823,56 +4912,59 @@ msgid ""
 "blocks\n"
 msgstr ""
 
-#: src/ls.c:4825
+#: src/ls.c:4886
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 
-#: src/ls.c:4835
+#: src/ls.c:4896
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
 msgstr ""
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 msgid ""
 "  -t                         sort by modification time, newest first\n"
 "  -T, --tabsize=COLS         assume tab stops at each COLS instead of 8\n"
 msgstr ""
 
-#: src/ls.c:4848
+#: src/ls.c:4912
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
 msgstr ""
 
-#: src/ls.c:4855
+#: src/ls.c:4919
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -4881,7 +4973,7 @@ msgid ""
 "variable can change the settings.  Use the dircolors command to set it.\n"
 msgstr ""
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -4945,19 +5037,16 @@ msgstr ""
 #: src/md5sum.c:195
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, c-format
 msgid ""
 "\n"
@@ -4967,35 +5056,35 @@ msgid ""
 "space for text), and name for each FILE.\n"
 msgstr ""
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, c-format
 msgid "%s: too many checksum lines"
 msgstr ""
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr ""
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr ""
 
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr ""
 
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr ""
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr ""
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
@@ -5003,7 +5092,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
@@ -5011,7 +5100,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
@@ -5019,108 +5108,134 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
 msgstr ""
 
-#: src/md5sum.c:766
+#: src/md5sum.c:770
 #, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr ""
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
 msgstr ""
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr ""
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr ""
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr ""
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr ""
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr ""
 
-#: src/mkdir.c:57
+#: src/mkdir.c:59
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
 msgstr ""
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 
-#: src/mkdir.c:168
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/mkdir.c:127 src/mkdir.c:172
+#, fuzzy, c-format
+msgid "failed to set default creation context for %s"
+msgstr "nisam uspio dohvatiti sigurnosni kontekst %s"
+
+#: src/mkdir.c:191
+#, fuzzy, c-format
+msgid "failed to restore context for %s"
+msgstr "nisam uspio dohvatiti sigurnosni kontekst %s"
+
+#: src/mkdir.c:231
 #, c-format
 msgid "created directory %s"
 msgstr ""
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr ""
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr ""
 
-#: src/mkfifo.c:52
+#: src/mkfifo.c:54
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
 msgstr ""
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
 msgstr ""
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, c-format
 msgid "invalid mode"
 msgstr ""
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr ""
 
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
+#, fuzzy, c-format
+msgid "cannot set permissions of %s"
+msgstr "ne mogu promijeniti dozvole %s"
+
+#: src/mknod.c:54
 #, c-format
 msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr ""
 
-#: src/mknod.c:54
+#: src/mknod.c:56
 msgid "Create the special file NAME of the given TYPE.\n"
 msgstr ""
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr ""
-
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -5129,7 +5244,7 @@ msgid ""
 "otherwise, as decimal.  TYPE may be:\n"
 msgstr ""
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 msgid ""
 "\n"
 "  b      create a block (buffered) special file\n"
@@ -5137,148 +5252,142 @@ msgid ""
 "  p      create a FIFO\n"
 msgstr ""
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 msgid "Special files require major and minor device numbers."
 msgstr ""
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 msgid "Fifos do not have major and minor device numbers."
 msgstr ""
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, c-format
 msgid "block special files not supported"
 msgstr ""
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, c-format
 msgid "character special files not supported"
 msgstr ""
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, c-format
 msgid "invalid major device number %s"
 msgstr ""
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, c-format
 msgid "invalid minor device number %s"
 msgstr ""
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, c-format
 msgid "invalid device %s %s"
 msgstr ""
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, c-format
 msgid "invalid device type %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr ""
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr ""
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
 "TEMPLATE must contain at least 3 consecutive 'X's in last component.\n"
 "If TEMPLATE is not specified, use tmp.XXXXXXXXXX, and --tmpdir is implied.\n"
 msgstr ""
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
 "  -q, --quiet         suppress diagnostics about file/dir-creation failure\n"
 msgstr ""
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
 msgstr ""
 
-#: src/mktemp.c:223
-#, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr ""
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, c-format
 msgid "too many templates"
 msgstr ""
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr ""
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr ""
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr ""
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr ""
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr ""
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, c-format
 msgid "failed to create directory via template %s"
 msgstr ""
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, c-format
 msgid "failed to create file via template %s"
 msgstr ""
 
-#: src/mv.c:292
+#: src/mv.c:294
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 
-#: src/mv.c:298
+#: src/mv.c:300
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
 "file\n"
@@ -5291,7 +5400,7 @@ msgid ""
 "effect.\n"
 msgstr ""
 
-#: src/mv.c:307
+#: src/mv.c:309
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
@@ -5299,7 +5408,7 @@ msgid ""
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
 msgstr ""
 
-#: src/mv.c:312
+#: src/mv.c:314
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
 "DIRECTORY\n"
@@ -5308,6 +5417,8 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
 
 #: src/nice.c:72
@@ -5549,95 +5660,90 @@ msgid "%s: invalid number to ignore"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
 msgstr ""
 
-#: src/numfmt.c:676
-#, c-format
-msgid "value too large to be converted: '%s'"
-msgstr ""
+#: src/numfmt.c:659
+#, fuzzy, c-format
+msgid "value too large to be converted: %s"
+msgstr "nisam uspio napraviti sigurnosni kontekst: %s"
 
-#: src/numfmt.c:680
+#: src/numfmt.c:663
 #, fuzzy, c-format
-msgid "invalid number: '%s'"
+msgid "invalid number: %s"
 msgstr "neispravan kontekst: %s"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
+msgid "rejecting suffix in input: %s (consider using --from)"
 msgstr ""
 
-#: src/numfmt.c:688
+#: src/numfmt.c:671
 #, fuzzy, c-format
-msgid "invalid suffix in input: '%s'"
+msgid "invalid suffix in input: %s"
 msgstr "neispravan sufiks u %s%s argumentu „%s�"
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
 msgstr ""
 
-#: src/numfmt.c:723
+#: src/numfmt.c:722 src/numfmt.c:768
 #, c-format
 msgid "failed to prepare value '%Lf' for printing"
 msgstr ""
 
-#: src/numfmt.c:787
+#: src/numfmt.c:791
 #, fuzzy, c-format
-msgid "invalid unit size: '%s'"
+msgid "invalid unit size: %s"
 msgstr "neispravan kontekst: %s"
 
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
-#, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr ""
-
-#: src/numfmt.c:813
+#: src/numfmt.c:814
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
 msgstr "Uporaba: %s [OPCIJA]... [DATOTEKA]...\n"
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
 msgstr ""
 
-#: src/numfmt.c:820
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
 msgstr ""
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
 msgstr ""
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
 "                         see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr ""
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
@@ -5645,19 +5751,19 @@ msgid ""
 "locale)\n"
 msgstr ""
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
 msgstr ""
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
 msgstr ""
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -5667,40 +5773,40 @@ msgid ""
 "                         is found\n"
 msgstr ""
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
 "nearest\n"
 msgstr ""
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
 msgstr ""
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr ""
 
-#: src/numfmt.c:877
+#: src/numfmt.c:878
 msgid ""
 "\n"
 "UNIT options:\n"
 msgstr ""
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr ""
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -5709,7 +5815,7 @@ msgid ""
 "               1Mi = 1048576,\n"
 msgstr ""
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
@@ -5717,7 +5823,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
@@ -5725,7 +5831,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
@@ -5733,18 +5839,18 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:905
+#: src/numfmt.c:906
 #, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -5756,7 +5862,7 @@ msgid ""
 "errors are not diagnosed and the exit status is 0.\n"
 msgstr ""
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -5777,112 +5883,112 @@ msgid ""
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 msgstr ""
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, c-format
 msgid "format %s has no %% directive"
 msgstr ""
 
-#: src/numfmt.c:990
+#: src/numfmt.c:1003
 #, c-format
 msgid "invalid format %s (width overflow)"
 msgstr ""
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr ""
+
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr ""
 
-#: src/numfmt.c:1010
+#: src/numfmt.c:1030
 #, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
 msgstr ""
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr ""
 
-#: src/numfmt.c:1070
+#: src/numfmt.c:1081
 #, fuzzy, c-format
-msgid "invalid suffix in input '%s': '%s'"
+msgid "invalid suffix in input %s: %s"
 msgstr "neispravan sufiks u %s%s argumentu „%s�"
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
 msgstr ""
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
 msgstr ""
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
+msgid "large input value %s: possible precision loss"
 msgstr ""
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
 
-#: src/numfmt.c:1388
+#: src/numfmt.c:1403
 #, fuzzy, c-format
-msgid "invalid padding value '%s'"
-msgstr "neispravan %s%s argument „%s�"
+msgid "invalid padding value %s"
+msgstr "neispravna grupa: %s"
 
-#: src/numfmt.c:1401
+#: src/numfmt.c:1417
 #, fuzzy, c-format
-msgid "invalid field value '%s'"
+msgid "invalid field value %s"
 msgstr "neispravan %s%s argument „%s�"
 
-#: src/numfmt.c:1430
+#: src/numfmt.c:1447
 #, fuzzy, c-format
-msgid "invalid header value '%s'"
-msgstr "neispravan %s%s argument „%s�"
+msgid "invalid header value %s"
+msgstr "neispravna grupa: %s"
 
-#: src/numfmt.c:1456
+#: src/numfmt.c:1473
 #, c-format
 msgid "--grouping cannot be combined with --format"
 msgstr ""
 
-#: src/numfmt.c:1458
-#, c-format
-msgid "--padding cannot be combined with --format"
-msgstr ""
-
-#: src/numfmt.c:1463
+#: src/numfmt.c:1478
 #, c-format
 msgid "no conversion option specified"
 msgstr ""
 
-#: src/numfmt.c:1471
+#: src/numfmt.c:1486
 #, c-format
 msgid "grouping cannot be combined with --to"
 msgstr ""
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
 msgstr ""
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
 msgstr ""
 
-#: src/numfmt.c:1511
+#: src/numfmt.c:1526
 #, c-format
 msgid "error reading input"
 msgstr ""
 
-#: src/numfmt.c:1520
+#: src/numfmt.c:1535
 #, fuzzy, c-format
 msgid "failed to convert some of the input numbers"
 msgstr "nisam uspio promijeniti kontekst %s u %s"
 
-#: src/od.c:294
+#: src/od.c:320
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -5891,7 +5997,7 @@ msgid ""
 "[b]]\n"
 msgstr ""
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -5901,7 +6007,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/od.c:307
+#: src/od.c:333
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
 "if the last operand begins with + or (if there are 2 operands) a digit.\n"
@@ -5911,38 +6017,40 @@ msgid ""
 "suffixes may be . for octal and b for multiply by 512.\n"
 msgstr ""
 
-#: src/od.c:318
+#: src/od.c:344
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
 
-#: src/od.c:323
+#: src/od.c:350
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
 
-#: src/od.c:336
+#: src/od.c:363
 msgid ""
 "\n"
 "\n"
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 
-#: src/od.c:345
+#: src/od.c:372
 msgid ""
 "  -f   same as -t fF, select floats\n"
 "  -i   same as -t dI, select decimal ints\n"
@@ -5952,16 +6060,16 @@ msgid ""
 "  -x   same as -t x2, select hexadecimal 2-byte units\n"
 msgstr ""
 
-#: src/od.c:353
+#: src/od.c:380
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -5970,7 +6078,7 @@ msgid ""
 "  x[SIZE]    hexadecimal, SIZE bytes per integer\n"
 msgstr ""
 
-#: src/od.c:367
+#: src/od.c:394
 msgid ""
 "\n"
 "SIZE is a number.  For TYPE in [doux], SIZE may also be C for\n"
@@ -5979,14 +6087,14 @@ msgid ""
 "for sizeof(double) or L for sizeof(long double).\n"
 msgstr ""
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
 "each output line.\n"
 msgstr ""
 
-#: src/od.c:379
+#: src/od.c:406
 msgid ""
 "\n"
 "\n"
@@ -5999,55 +6107,55 @@ msgid ""
 "and so on for G, T, P, E, Z, Y.\n"
 msgstr ""
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, c-format
 msgid "invalid type string %s"
 msgstr ""
 
-#: src/od.c:649
+#: src/od.c:690
 #, c-format
 msgid ""
 "invalid type string %s;\n"
 "this system doesn't provide a %lu-byte integral type"
 msgstr ""
 
-#: src/od.c:770
+#: src/od.c:811
 #, c-format
 msgid ""
 "invalid type string %s;\n"
 "this system doesn't provide a %lu-byte floating point type"
 msgstr ""
 
-#: src/od.c:828
+#: src/od.c:869
 #, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr ""
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr ""
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr ""
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr ""
 
-#: src/od.c:1810
+#: src/od.c:1863
 msgid "compatibility mode supports at most one file"
 msgstr ""
 
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr ""
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr ""
@@ -6198,12 +6306,12 @@ msgstr ""
 msgid "Where"
 msgstr ""
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr ""
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -6213,7 +6321,7 @@ msgid ""
 "  -s              do short format output, this is the default\n"
 msgstr ""
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -6222,7 +6330,7 @@ msgid ""
 "                  in short format\n"
 msgstr ""
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, c-format
 msgid ""
 "\n"
@@ -6230,7 +6338,7 @@ msgid ""
 "The utmp file will be %s.\n"
 msgstr ""
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr ""
@@ -6397,12 +6505,13 @@ msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
 
-#: src/pr.c:2827
+#: src/pr.c:2828
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
 "                    separate columns by STRING,\n"
@@ -6412,7 +6521,7 @@ msgid ""
 "  -t, --omit-header  omit page headers and trailers\n"
 msgstr ""
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 msgid ""
 "  -T, --omit-pagination\n"
 "                    omit page headers and trailers, eliminate any "
@@ -6426,7 +6535,7 @@ msgid ""
 "(72)\n"
 msgstr ""
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
 "                    set page width to PAGE_WIDTH (72) characters always,\n"
@@ -6435,7 +6544,7 @@ msgid ""
 "                    with -S or -s\n"
 msgstr ""
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 msgid ""
 "\n"
 "-t is implied if PAGE_LENGTH <= 10.  With no FILE, or when FILE is -, read\n"
@@ -6452,7 +6561,7 @@ msgid ""
 msgstr ""
 
 #: src/printenv.c:69
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/printf.c:79
@@ -6548,32 +6657,32 @@ msgstr ""
 msgid "F. Pinard"
 msgstr ""
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, c-format
 msgid "%s (for regexp %s)"
 msgstr ""
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
 "  or:  %s -G [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr ""
 
-#: src/ptx.c:1821
+#: src/ptx.c:1824
 msgid ""
 "Output a permuted index, including context, of the words in the input "
 "files.\n"
 msgstr ""
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
 "  -G, --traditional              behave more like System V 'ptx'\n"
 "  -F, --flag-truncation=STRING   use STRING for flagging line truncations\n"
 msgstr ""
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
 "  -O, --format=roff              generate output as roff directives\n"
@@ -6582,7 +6691,7 @@ msgid ""
 "  -T, --format=tex               generate output as TeX directives\n"
 msgstr ""
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -6592,7 +6701,7 @@ msgid ""
 "  -o, --only-file=FILE           read only word list from this FILE\n"
 msgstr ""
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -6600,13 +6709,16 @@ msgid ""
 "excluded\n"
 msgstr ""
 
-#: src/ptx.c:1854
+#: src/ptx.c:1857
+#, fuzzy
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
+"\n"
+"Ako DATOTEKA nije navedena ili je „-�, �itaj standardni ulaz.\n"
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, c-format
 msgid "invalid gap width: %s"
 msgstr ""
@@ -6623,22 +6735,28 @@ msgid ""
 "  -P, --physical  avoid all symlinks\n"
 msgstr ""
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+
+#: src/pwd.c:169
 #, c-format
 msgid "failed to chdir to %s"
 msgstr ""
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, c-format
 msgid "failed to stat %s"
 msgstr ""
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr ""
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, c-format
 msgid "ignoring non-option arguments"
 msgstr ""
@@ -6648,8 +6766,8 @@ msgstr ""
 msgid "Dmitry V. Levin"
 msgstr ""
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr ""
@@ -6683,8 +6801,7 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/readlink.c:152
@@ -6709,7 +6826,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 
@@ -6727,41 +6844,42 @@ msgstr ""
 msgid "%s: descend into directory %s? "
 msgstr ""
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr ""
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, c-format
 msgid "%s: remove %s %s? "
 msgstr ""
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, c-format
 msgid "removed directory: %s\n"
 msgstr ""
 
-#: src/remove.c:444
+#: src/remove.c:447
 #, c-format
-msgid "cannot remove directory: %s"
+msgid "refusing to remove %s or %s directory: skipping %s"
 msgstr ""
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr ""
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, c-format
 msgid "traversal failed: %s"
 msgstr ""
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -6786,12 +6904,12 @@ msgstr ""
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 
 #: src/rm.c:149
@@ -6839,13 +6957,19 @@ msgstr ""
 
 #: src/rm.c:342
 #, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr ""
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: src/rm.c:343
+#: src/rm.c:345
 #, c-format
-msgid "%s: remove all arguments? "
-msgstr ""
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: src/rmdir.c:134 src/rmdir.c:233
 #, c-format
@@ -6888,7 +7012,7 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
 
@@ -6938,41 +7062,46 @@ msgstr ""
 msgid "no command specified"
 msgstr ""
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr ""
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, c-format
 msgid "failed to compute a new context"
 msgstr ""
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, c-format
 msgid "failed to set new user %s"
 msgstr ""
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, c-format
 msgid "failed to set new type %s"
 msgstr ""
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, c-format
 msgid "failed to set new range %s"
 msgstr ""
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, c-format
 msgid "failed to set new role %s"
 msgstr ""
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, c-format
 msgid "unable to set security context %s"
 msgstr ""
 
+#: src/selinux.c:127 src/selinux.c:300
+#, c-format
+msgid "error canonicalizing %s"
+msgstr ""
+
 #: src/seq.c:68
 #, c-format
 msgid ""
@@ -6997,95 +7126,47 @@ msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
 msgstr ""
 
-#: src/seq.c:94
+#: src/seq.c:96
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
 "it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n"
 "decimal numbers with maximum precision PREC, and to %g otherwise.\n"
 msgstr ""
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, c-format
 msgid "invalid floating point argument: %s"
 msgstr ""
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr ""
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr ""
 
-#: src/setuidgid.c:49
-#, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-
-#: src/setuidgid.c:55
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr ""
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr ""
-
-#: src/setuidgid.c:190
-#, c-format
-msgid "failed to set supplemental group(s)"
-msgstr ""
-
-#: src/setuidgid.c:200
-#, c-format
-msgid "cannot set group-ID to %lu"
-msgstr ""
-
-#: src/setuidgid.c:204
-#, c-format
-msgid "cannot set user-ID to %lu"
-msgstr ""
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr ""
 
-#: src/shred.c:148
+#: src/shred.c:170
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
 "for even very expensive hardware probing to recover the data.\n"
 msgstr ""
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -7094,28 +7175,32 @@ msgid ""
 "  -s, --size=N   shred this many bytes (suffixes like K, M, G accepted)\n"
 msgstr ""
 
-#: src/shred.c:161
+#: src/shred.c:183
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
 "  -z, --zero     add a final overwrite with zeros to hide shredding\n"
 msgstr ""
 
-#: src/shred.c:170
+#: src/shred.c:192
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -7126,7 +7211,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -7138,7 +7223,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -7147,7 +7232,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -7159,134 +7244,134 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:215
+#: src/shred.c:241
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
 "of the file that cannot be removed, and that will allow a shredded file\n"
 "to be recovered later.\n"
 msgstr ""
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, c-format
 msgid "%s: fdatasync failed"
 msgstr ""
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr ""
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr ""
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr ""
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, c-format
 msgid "%s: error writing at offset %s"
 msgstr ""
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, c-format
 msgid "%s: lseek failed"
 msgstr ""
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, c-format
 msgid "%s: file too large"
 msgstr ""
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr ""
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr ""
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, c-format
 msgid "%s: fstat failed"
 msgstr ""
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, c-format
 msgid "%s: invalid file type"
 msgstr ""
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr ""
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, c-format
 msgid "%s: error truncating"
 msgstr ""
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, c-format
 msgid "%s: fcntl failed"
 msgstr ""
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr ""
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr ""
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, c-format
 msgid "%s: renamed to %s"
 msgstr ""
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, c-format
 msgid "%s: failed to remove"
 msgstr ""
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr ""
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, c-format
 msgid "%s: failed to close"
 msgstr ""
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, c-format
 msgid "%s: failed to open for writing"
 msgstr ""
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, c-format
 msgid "%s: invalid number of passes"
 msgstr ""
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, c-format
 msgid "multiple random sources specified"
 msgstr ""
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, c-format
 msgid "%s: invalid file size"
 msgstr ""
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -7294,11 +7379,11 @@ msgid ""
 "  or:  %s -i LO-HI [OPTION]...\n"
 msgstr ""
 
-#: src/shuf.c:54
+#: src/shuf.c:67
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr ""
 
-#: src/shuf.c:60
+#: src/shuf.c:73
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
 "  -i, --input-range=LO-HI   treat each number LO through HI as an input "
@@ -7306,34 +7391,44 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
+msgstr ""
+
+#: src/shuf.c:228
+#, c-format
+msgid "too many input lines"
 msgstr ""
 
-#: src/shuf.c:244
+#: src/shuf.c:431
 #, c-format
 msgid "multiple -i options specified"
 msgstr ""
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, c-format
 msgid "invalid input range %s"
 msgstr ""
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, c-format
 msgid "invalid line count %s"
 msgstr ""
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, c-format
 msgid "multiple output files specified"
 msgstr ""
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, c-format
 msgid "cannot combine -e and -i options"
 msgstr ""
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr ""
+
 #: src/sleep.c:44
 #, c-format
 msgid ""
@@ -7348,27 +7443,27 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, c-format
 msgid "invalid time interval %s"
 msgstr ""
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr ""
 
-#: src/sort.c:399
+#: src/sort.c:427
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr ""
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
 msgstr ""
 
-#: src/sort.c:409
+#: src/sort.c:437
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
 "  -d, --dictionary-order      consider only blanks and alphanumeric "
@@ -7376,19 +7471,19 @@ msgid ""
 "  -f, --ignore-case           fold lower case to upper case characters\n"
 msgstr ""
 
-#: src/sort.c:415
+#: src/sort.c:443
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
 "  -i, --ignore-nonprinting    consider only printable characters\n"
 "  -M, --month-sort            compare (unknown) < 'JAN' < ... < 'DEC'\n"
 msgstr ""
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 
-#: src/sort.c:423
+#: src/sort.c:451
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
 "  -R, --random-sort           sort by random hash of keys\n"
@@ -7396,7 +7491,7 @@ msgid ""
 "  -r, --reverse               reverse the result of comparisons\n"
 msgstr ""
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -7406,19 +7501,19 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/sort.c:437
+#: src/sort.c:465
 msgid ""
 "Other options:\n"
 "\n"
 msgstr ""
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
 msgstr ""
 
-#: src/sort.c:445
+#: src/sort.c:473
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
 "  -C, --check=quiet, --check=silent  like -c, but do not report first bad "
@@ -7427,7 +7522,7 @@ msgid ""
 "                              decompress them with PROG -d\n"
 msgstr ""
 
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -7436,13 +7531,13 @@ msgid ""
 "                            If F is - then read names from standard input\n"
 msgstr ""
 
-#: src/sort.c:459
+#: src/sort.c:487
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
 "  -m, --merge               merge already sorted files; do not sort\n"
 msgstr ""
 
-#: src/sort.c:463
+#: src/sort.c:491
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "  -s, --stable              stabilize sort by disabling last-resort "
@@ -7450,7 +7545,7 @@ msgid ""
 "  -S, --buffer-size=SIZE    use SIZE for main memory buffer\n"
 msgstr ""
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -7465,11 +7560,7 @@ msgid ""
 "run\n"
 msgstr ""
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr ""
-
-#: src/sort.c:483
+#: src/sort.c:511
 msgid ""
 "\n"
 "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is "
@@ -7488,7 +7579,7 @@ msgid ""
 "SIZE may be followed by the following multiplicative suffixes:\n"
 msgstr ""
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -7500,132 +7591,117 @@ msgid ""
 "native byte values.\n"
 msgstr ""
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, c-format
 msgid "waiting for %s [-d]"
 msgstr ""
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr ""
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, c-format
 msgid "cannot create temporary file in %s"
 msgstr ""
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr ""
 
-#: src/sort.c:970
+#: src/sort.c:998
 msgid "fflush failed"
 msgstr ""
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr ""
 
-#: src/sort.c:986
-#, c-format
-msgid "dup2 failed"
-msgstr ""
-
-#: src/sort.c:1103
-#, c-format
-msgid "couldn't execute %s"
-msgstr ""
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 msgid "couldn't create temporary file"
 msgstr ""
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, c-format
 msgid "couldn't create process for %s -d"
 msgstr ""
 
-#: src/sort.c:1161
-#, c-format
-msgid "couldn't execute %s -d"
-msgstr ""
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, c-format
 msgid "warning: cannot remove: %s"
 msgstr ""
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, c-format
 msgid "invalid --%s argument %s"
 msgstr ""
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, c-format
 msgid "minimum --%s argument is %s"
 msgstr ""
 
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, c-format
 msgid "--%s argument %s too large"
 msgstr ""
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr ""
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr ""
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr ""
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr ""
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, c-format
 msgid "string transformation failed"
 msgstr ""
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, c-format
 msgid "the untransformed string was %s"
 msgstr ""
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr ""
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr ""
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr ""
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr ""
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr ""
 
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
@@ -7633,122 +7709,122 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr ""
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr ""
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr ""
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr ""
 
-#: src/sort.c:3698
+#: src/sort.c:3738
 msgid "cannot read"
 msgstr ""
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, c-format
 msgid "%s: invalid field specification %s"
 msgstr ""
 
-#: src/sort.c:3987
+#: src/sort.c:4028
 #, c-format
 msgid "options '-%s' are incompatible"
 msgstr ""
 
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, c-format
 msgid "%s: invalid count at start of %s"
 msgstr ""
 
-#: src/sort.c:4295
+#: src/sort.c:4336
 msgid "invalid number after '-'"
 msgstr ""
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 msgid "invalid number after '.'"
 msgstr ""
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr ""
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, c-format
 msgid "multiple compress programs specified"
 msgstr ""
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
 msgstr ""
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
 msgstr ""
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr ""
 
-#: src/sort.c:4407
+#: src/sort.c:4448
 msgid "invalid number after ','"
 msgstr ""
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr ""
 
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, c-format
 msgid "cannot read file names from %s"
 msgstr ""
 
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr ""
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, c-format
 msgid "no input from %s"
 msgstr ""
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr ""
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr ""
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr ""
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr ""
 
-#: src/split.c:204
+#: src/split.c:203
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr ""
 
-#: src/split.c:208
+#: src/split.c:207
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
 "size is 1000 lines, and default PREFIX is 'x'.  With no INPUT, or when "
@@ -7756,32 +7832,31 @@ msgid ""
 "is -, read standard input.\n"
 msgstr ""
 
-#: src/split.c:216
+#: src/split.c:215
 #, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
 
-#: src/split.c:229
+#: src/split.c:228
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
 "                            output file is opened\n"
 msgstr ""
 
-#: src/split.c:236
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -7793,189 +7868,189 @@ msgid ""
 "r/K/N   likewise but only output Kth of N to stdout\n"
 msgstr ""
 
-#: src/split.c:354
+#: src/split.c:353
 #, c-format
 msgid "output file suffixes exhausted"
 msgstr ""
 
-#: src/split.c:366
+#: src/split.c:365
 #, c-format
 msgid "creating file %s\n"
 msgstr ""
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr ""
 
-#: src/split.c:391
+#: src/split.c:390
 #, c-format
 msgid "failed to set FILE environment variable"
 msgstr ""
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr ""
 
-#: src/split.c:395
+#: src/split.c:394
 #, c-format
 msgid "failed to create pipe"
 msgstr ""
 
-#: src/split.c:409
+#: src/split.c:408
 #, c-format
 msgid "closing prior pipe"
 msgstr ""
 
-#: src/split.c:411
+#: src/split.c:410
 #, c-format
 msgid "closing output pipe"
 msgstr ""
 
-#: src/split.c:415
+#: src/split.c:414
 #, c-format
 msgid "moving input pipe"
 msgstr ""
 
-#: src/split.c:417
+#: src/split.c:416
 #, c-format
 msgid "closing input pipe"
 msgstr ""
 
-#: src/split.c:422
+#: src/split.c:421
 #, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr ""
 
-#: src/split.c:428
+#: src/split.c:427
 #, c-format
 msgid "failed to close input pipe"
 msgstr ""
 
-#: src/split.c:464
+#: src/split.c:463
 #, c-format
 msgid "waiting for child process"
 msgstr ""
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr ""
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr ""
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr ""
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr ""
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, c-format
 msgid "%s: invalid number of chunks"
 msgstr ""
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, c-format
 msgid "%s: invalid chunk number"
 msgstr ""
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr ""
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr ""
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr ""
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, c-format
 msgid "line count option -%s%c... is too large"
 msgstr ""
 
-#: src/split.c:1248
+#: src/split.c:1298
 #, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr ""
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, c-format
 msgid "%s: invalid IO block size"
 msgstr ""
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr ""
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr ""
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, c-format
 msgid "%s: cannot determine file size"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr ""
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, c-format
 msgid "failed to canonicalize %s"
 msgstr ""
 
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr ""
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, c-format
 msgid "%s: invalid directive"
 msgstr ""
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, c-format
 msgid "warning: backslash at end of format"
 msgstr ""
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr ""
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, c-format
 msgid "cannot read file system information for %s"
 msgstr ""
 
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, c-format
 msgid "cannot stat standard input"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -7986,7 +8061,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -7994,30 +8069,30 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, c-format
 msgid "Context: %C\n"
 msgstr ""
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -8025,27 +8100,27 @@ msgid ""
 " Birth: %w\n"
 msgstr ""
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
 msgstr ""
 
-#: src/stat.c:1356
+#: src/stat.c:1418
 msgid ""
 "  -L, --dereference     follow links\n"
 "  -f, --file-system     display file system status instead of file status\n"
 msgstr ""
 
-#: src/stat.c:1360
+#: src/stat.c:1422
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 msgid ""
 "\n"
 "The valid format sequences for files (without --file-system):\n"
@@ -8057,7 +8132,7 @@ msgid ""
 "  %C   SELinux security context string\n"
 msgstr ""
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 msgid ""
 "  %d   device number in decimal\n"
 "  %D   device number in hex\n"
@@ -8067,7 +8142,7 @@ msgid ""
 "  %G   group name of owner\n"
 msgstr ""
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 msgid ""
 "  %h   number of hard links\n"
 "  %i   inode number\n"
@@ -8076,11 +8151,11 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 
-#: src/stat.c:1399
+#: src/stat.c:1461
 msgid ""
 "  %u   user ID of owner\n"
 "  %U   user name of owner\n"
@@ -8088,14 +8163,14 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 msgid ""
 "Valid format sequences for file systems:\n"
 "\n"
@@ -8106,7 +8181,7 @@ msgid ""
 "  %f   free blocks in file system\n"
 msgstr ""
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 msgid ""
 "  %i   file system ID in hex\n"
 "  %l   maximum length of filenames\n"
@@ -8167,22 +8242,27 @@ msgid ""
 "and are thus unaffected by 'stdbuf' settings.\n"
 msgstr ""
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, c-format
 msgid "failed to find %s"
 msgstr ""
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, c-format
 msgid "failed to update the environment with %s"
 msgstr ""
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr ""
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, c-format
+msgid "you must specify a buffering mode option"
+msgstr ""
+
+#: src/stty.c:516
 #, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -8190,25 +8270,25 @@ msgid ""
 "  or:  %s [-F DEVICE | --file=DEVICE] [-g|--save]\n"
 msgstr ""
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
 msgstr ""
 
-#: src/stty.c:525
+#: src/stty.c:528
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
 "  -g, --save         print all current settings in a stty-readable form\n"
 "  -F, --file=DEVICE  open and use the specified DEVICE instead of stdin\n"
 msgstr ""
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
 "settings.  The underlying system defines which settings are available.\n"
 msgstr ""
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -8217,7 +8297,7 @@ msgid ""
 "   eol CHAR      CHAR will end the line\n"
 msgstr ""
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -8225,7 +8305,7 @@ msgid ""
 "   kill CHAR     CHAR will erase the current line\n"
 msgstr ""
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -8233,7 +8313,7 @@ msgid ""
 "   start CHAR    CHAR will restart the output after stopping it\n"
 msgstr ""
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -8241,7 +8321,7 @@ msgid ""
 " * werase CHAR   CHAR will erase the last word typed\n"
 msgstr ""
 
-#: src/stty.c:562
+#: src/stty.c:565
 msgid ""
 "\n"
 "Special settings:\n"
@@ -8250,7 +8330,7 @@ msgid ""
 " * columns N     same as cols N\n"
 msgstr ""
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -8259,7 +8339,7 @@ msgid ""
 "   ospeed N      set the output speed to N\n"
 msgstr ""
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -8268,7 +8348,7 @@ msgid ""
 "   time N        with -icanon, set read timeout of N tenths of a second\n"
 msgstr ""
 
-#: src/stty.c:581
+#: src/stty.c:584
 msgid ""
 "\n"
 "Control settings:\n"
@@ -8279,7 +8359,7 @@ msgid ""
 "   csN           set character size to N bits, N in [5..8]\n"
 msgstr ""
 
-#: src/stty.c:590
+#: src/stty.c:593
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
 "   [-]hup        send a hangup signal when the last process closes the tty\n"
@@ -8287,9 +8367,10 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -8299,7 +8380,7 @@ msgid ""
 "   [-]igncr      ignore carriage return\n"
 msgstr ""
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -8308,11 +8389,11 @@ msgid ""
 "   [-]istrip     clear high (8th) bit of input characters\n"
 msgstr ""
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr ""
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -8322,7 +8403,7 @@ msgid ""
 "   [-]tandem     same as [-]ixoff\n"
 msgstr ""
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -8332,17 +8413,17 @@ msgid ""
 " * nlN           newline delay style, N in [0..1]\n"
 msgstr ""
 
-#: src/stty.c:631
+#: src/stty.c:635
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
 " * [-]onlret     newline performs a carriage return\n"
 msgstr ""
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -8352,7 +8433,7 @@ msgid ""
 " * vtN           vertical tab delay style, N in [0..1]\n"
 msgstr ""
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -8361,7 +8442,7 @@ msgid ""
 " * -crtkill      kill all line by obeying the echoctl and echok settings\n"
 msgstr ""
 
-#: src/stty.c:654
+#: src/stty.c:658
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
 "   [-]echo       echo input characters\n"
@@ -8370,7 +8451,7 @@ msgid ""
 "   [-]echok      echo a newline after a kill character\n"
 msgstr ""
 
-#: src/stty.c:661
+#: src/stty.c:665
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
 "   [-]echonl     echo newline even if not echoing other characters\n"
@@ -8379,7 +8460,7 @@ msgid ""
 "   [-]iexten     enable non-POSIX special characters\n"
 msgstr ""
 
-#: src/stty.c:668
+#: src/stty.c:672
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
 "   [-]noflsh     disable flushing after interrupt and quit special "
@@ -8389,7 +8470,7 @@ msgid ""
 " * [-]xcase      with icanon, escape with '\\' for uppercase characters\n"
 msgstr ""
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -8398,7 +8479,7 @@ msgid ""
 "   -cbreak       same as icanon\n"
 msgstr ""
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -8406,7 +8487,7 @@ msgid ""
 "   crt           same as echoe echoctl echoke\n"
 msgstr ""
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -8415,7 +8496,7 @@ msgid ""
 "   evenp         same as parenb -parodd cs7\n"
 msgstr ""
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -8425,7 +8506,7 @@ msgid ""
 "   -nl           same as icrnl -inlcr -igncr onlcr -ocrnl -onlret\n"
 msgstr ""
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -8434,7 +8515,7 @@ msgid ""
 "   -pass8        same as parenb istrip cs7\n"
 msgstr ""
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -8442,7 +8523,7 @@ msgid ""
 "   -raw          same as cooked\n"
 msgstr ""
 
-#: src/stty.c:716
+#: src/stty.c:720
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
 "                 -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n"
@@ -8452,7 +8533,7 @@ msgid ""
 "                 characters to their default values\n"
 msgstr ""
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -8461,55 +8542,55 @@ msgid ""
 "127; special values ^- or undef used to disable special characters.\n"
 msgstr ""
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, c-format
 msgid "only one device may be specified"
 msgstr ""
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
 "mutually exclusive"
 msgstr ""
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr ""
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr ""
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, c-format
 msgid "invalid argument %s"
 msgstr ""
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, c-format
 msgid "missing argument to %s"
 msgstr ""
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, c-format
 msgid "invalid line discipline %s"
 msgstr ""
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr ""
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr ""
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, c-format
 msgid "invalid integer argument %s"
 msgstr ""
@@ -8555,21 +8636,21 @@ msgstr ""
 msgid "      --version  output version information and exit\n"
 msgstr ""
 
-#: src/system.h:544
+#: src/system.h:543
 msgid ""
 "\n"
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/system.h:552
+#: src/system.h:551
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -8578,33 +8659,33 @@ msgid ""
 "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n"
 msgstr ""
 
-#: src/system.h:571
-#, c-format
+#: src/system.h:570
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
-msgstr ""
+"%s online help: <%s>\n"
+msgstr "%s po�etna stranica: <%s>\n"
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr ""
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr ""
 
-#: src/system.h:596
+#: src/system.h:591
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr ""
 
-#: src/system.h:628
+#: src/system.h:633
 #, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -8690,54 +8771,48 @@ msgstr ""
 
 #: src/tail.c:270
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
 
 #: src/tail.c:274
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 
-#: src/tail.c:281
+#: src/tail.c:280
 #, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
 
-#: src/tail.c:294
+#: src/tail.c:293
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 
-#: src/tail.c:301
+#: src/tail.c:298
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 
-#: src/tail.c:310
+#: src/tail.c:307
 msgid ""
 "\n"
 "If the first character of K (the number of bytes or lines) is a '+',\n"
@@ -8748,7 +8823,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/tail.c:319
+#: src/tail.c:316
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
 "means that even if a tail'ed file is renamed, tail will continue to track\n"
@@ -8758,159 +8833,164 @@ msgid ""
 "named file in a way that accommodates renaming, removal and creation.\n"
 msgstr ""
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr ""
 
-#: src/tail.c:453
-#, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr ""
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr ""
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr ""
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
 "reverting to polling"
 msgstr ""
 
-#: src/tail.c:963
+#: src/tail.c:965
 #, c-format
-msgid "%s has become inaccessible"
+msgid "%s has been replaced with a symbolic link. giving up on this name"
 msgstr ""
 
 #: src/tail.c:980
 #, c-format
+msgid "%s has become inaccessible"
+msgstr ""
+
+#: src/tail.c:997
+#, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr ""
 
-#: src/tail.c:989
+#: src/tail.c:1006
 #, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr ""
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, c-format
 msgid "%s has become accessible"
 msgstr ""
 
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr ""
 
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr ""
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr ""
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr ""
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr ""
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, c-format
 msgid "cannot watch parent directory of %s"
 msgstr ""
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, c-format
 msgid "inotify resources exhausted"
 msgstr ""
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, c-format
 msgid "cannot watch %s"
 msgstr ""
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr ""
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, c-format
 msgid "error reading inotify event"
 msgstr ""
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr ""
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, c-format
 msgid "number in %s is too large"
 msgstr ""
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr ""
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr ""
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr ""
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr ""
 
-#: src/tail.c:2034
+#: src/tail.c:2096
 #, c-format
-msgid "warning: --retry is useful mainly when following by name"
+msgid "warning: --retry ignored; --retry is useful only when following"
 msgstr ""
 
-#: src/tail.c:2038
+#: src/tail.c:2100
+#, c-format
+msgid "warning: --retry only effective for the initial open"
+msgstr ""
+
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
 msgstr ""
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr ""
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, c-format
 msgid "cannot follow %s by name"
 msgstr ""
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr ""
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr ""
@@ -9114,47 +9194,46 @@ msgstr ""
 msgid "warning: sigprocmask"
 msgstr ""
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr ""
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr ""
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
 "  or:  %s [OPTION]\n"
 msgstr ""
 
-#: src/timeout.c:229
+#: src/timeout.c:232
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
 msgstr ""
 
-#: src/timeout.c:235
+#: src/timeout.c:238
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 msgid ""
 "\n"
 "DURATION is a floating point number with an optional suffix:\n"
@@ -9162,7 +9241,7 @@ msgid ""
 "days.\n"
 msgstr ""
 
-#: src/timeout.c:259
+#: src/timeout.c:262
 msgid ""
 "\n"
 "If the command times out, and --preserve-status is not set, then exit with\n"
@@ -9173,17 +9252,17 @@ msgid ""
 "case the exit status is 128+9 rather than 124.\n"
 msgstr ""
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr ""
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, c-format
 msgid "error waiting for command"
 msgstr ""
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr ""
@@ -9493,7 +9572,7 @@ msgstr ""
 #: src/truncate.c:115
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 
 #: src/truncate.c:121
@@ -9573,12 +9652,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr ""
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr ""
@@ -9652,12 +9731,12 @@ msgstr ""
 msgid "tab stop value is too large"
 msgstr ""
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr ""
 
-#: src/uniq.c:138
+#: src/uniq.c:174
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
 "writing to OUTPUT (or standard output).\n"
@@ -9665,36 +9744,49 @@ msgid ""
 "With no options, matching lines are merged to the first occurrence.\n"
 msgstr ""
 
-#: src/uniq.c:147
+#: src/uniq.c:183
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
 msgstr ""
 
-#: src/uniq.c:151
+#: src/uniq.c:187
+msgid ""
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
+msgstr ""
+
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr ""
+
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
+msgstr ""
+
+#: src/uniq.c:199
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
 "  -i, --ignore-case     ignore differences in case when comparing\n"
 "  -s, --skip-chars=N    avoid comparing the first N characters\n"
 "  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
 msgstr ""
 
-#: src/uniq.c:161
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr ""
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 msgid ""
 "\n"
 "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n"
 "characters.  Fields are skipped before chars.\n"
 msgstr ""
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 msgid ""
 "\n"
 "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n"
@@ -9702,24 +9794,34 @@ msgid ""
 "Also, comparisons honor the rules specified by 'LC_COLLATE'.\n"
 msgstr ""
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, c-format
 msgid "too many repeated lines"
 msgstr ""
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
 msgstr ""
 
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
 msgstr ""
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
 msgstr ""
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr ""
+
+#: src/uniq.c:652
+#, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr ""
+
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr ""
@@ -9737,11 +9839,6 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/unlink.c:86
-#, c-format
-msgid "cannot unlink %s"
-msgstr ""
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -9788,7 +9885,7 @@ msgstr[2] ""
 msgid ",  load average: %.2f"
 msgstr ""
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -9796,19 +9893,19 @@ msgid ""
 "in the run queue over the last 1, 5 and 15 minutes."
 msgstr ""
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
 "an uninterruptible sleep state also contribute to the load average.\n"
 msgstr ""
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr ""
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
@@ -9993,3 +10090,21 @@ msgid ""
 "Repeatedly output a line with all specified STRING(s), or 'y'.\n"
 "\n"
 msgstr ""
+
+#~ msgid "cannot create pipe"
+#~ msgstr "ne mogu napraviti cjevovod"
+
+#~ msgid "%s subprocess failed"
+#~ msgstr "%s potproces nije uspio"
+
+#~ msgid "_open_osfhandle failed"
+#~ msgstr "_open_osfhandle nije uspio"
+
+#~ msgid "cannot restore fd %d: dup2 failed"
+#~ msgstr "ne mogu vratiti fd %d: dup2 nije uspio"
+
+#~ msgid "%s subprocess"
+#~ msgstr "%s potproces"
+
+#~ msgid "%s subprocess got fatal signal %d"
+#~ msgstr "%s potproces je dobio fatalni signal %d"
diff --git a/po/hu.gmo b/po/hu.gmo
index ab1d6fc7..fde3952c 100644
--- a/po/hu.gmo
+++ b/po/hu.gmo
diff --git a/po/hu.po b/po/hu.po
index 7978736f..1e03e27d 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -4,13 +4,13 @@
 # Translated using gnu.twm
 #
 # Emese Kovács <emese@instantweb.hu>, 2002.
-# Gabor Kelemen <kelemeng@gnome.hu>, 2005, 2006, 2007, 2008, 2010, 2011, 2012.
+# Gabor Kelemen <kelemeng@gnome.hu>, 2005, 2006, 2007, 2008, 2010, 2011, 2012, 2013, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: coreutils 8.15\n"
+"Project-Id-Version: coreutils 8.22-pre4\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
-"PO-Revision-Date: 2012-01-22 02:58+0100\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
+"PO-Revision-Date: 2014-04-07 16:40+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Generator: Lokalize 1.4\n"
 
 #: lib/argmatch.c:133
 #, c-format
@@ -38,76 +38,124 @@ msgstr "Az érvényes argumentumok a következők:"
 msgid "error closing file"
 msgstr "hiba a fájl lezárásakor"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "íráshiba"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "%s jogosultságainak megtartása"
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "Ismeretlen rendszerhiba"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "szabályos üres fájl"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "szabályos fájl"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "könyvtár"
 
-#: lib/file-type.c:44
-msgid "block special file"
-msgstr "speciális blokkfájl"
-
-#: lib/file-type.c:47
-msgid "character special file"
-msgstr "speciális karakterfájl"
-
-#: lib/file-type.c:50
-msgid "fifo"
-msgstr "fifo"
-
-#: lib/file-type.c:53
+#: lib/file-type.c:46
 msgid "symbolic link"
 msgstr "szimbolikus link"
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "foglalat"
-
-#: lib/file-type.c:59
+#: lib/file-type.c:52
 msgid "message queue"
 msgstr "üzenetsor"
 
-#: lib/file-type.c:62
+#: lib/file-type.c:55
 msgid "semaphore"
 msgstr "szemafor"
 
-#: lib/file-type.c:65
+#: lib/file-type.c:58
 msgid "shared memory object"
 msgstr "megosztott memóriaobjektum"
 
-#: lib/file-type.c:68
+#: lib/file-type.c:61
 msgid "typed memory object"
 msgstr "típusos memóriaobjektum"
 
-#: lib/file-type.c:70
+#: lib/file-type.c:66
+msgid "block special file"
+msgstr "speciális blokkfájl"
+
+#: lib/file-type.c:69
+msgid "character special file"
+msgstr "speciális karakterfájl"
+
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr ""
+
+#: lib/file-type.c:75
+msgid "fifo"
+msgstr "fifo"
+
+#: lib/file-type.c:78
+msgid "door"
+msgstr ""
+
+#: lib/file-type.c:81
+#, fuzzy
+msgid "multiplexed block special file"
+msgstr "speciális blokkfájl"
+
+#: lib/file-type.c:84
+#, fuzzy
+msgid "multiplexed character special file"
+msgstr "speciális karakterfájl"
+
+#: lib/file-type.c:87
+#, fuzzy
+msgid "multiplexed file"
+msgstr "több szerep"
+
+#: lib/file-type.c:90
+#, fuzzy
+msgid "named file"
+msgstr "szokatlan fájl"
+
+#: lib/file-type.c:93
+#, fuzzy
+msgid "network special file"
+msgstr "speciális blokkfájl"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr ""
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr ""
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr ""
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "foglalat"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr ""
+
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "szokatlan fájl"
 
@@ -242,18 +290,18 @@ msgstr "%s: a „-W %s� kapcsoló nem enged meg argumentumot\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: a(z) „-W%s� kapcsolóhoz argumentum szükséges\n"
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr "nem lehet %s jogosultságait megváltoztatni"
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "nem lehet a következő könyvtárat létrehozni: %s"
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr "elfogyott a memória"
@@ -370,7 +418,7 @@ msgstr "A szabályos kifejezés túl nagy"
 msgid "Unmatched ) or \\)"
 msgstr "Pár nélküli ) vagy \\)"
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 msgid "No previous regular expression"
 msgstr "Nincs megelőző szabályos kifejezés"
 
@@ -397,7 +445,7 @@ msgstr ""
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[iIyY]"
 
@@ -407,11 +455,11 @@ msgstr "^[iIyY]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, c-format
 msgid "setting permissions for %s"
 msgstr "%s jogosultságainak beállítása"
@@ -552,18 +600,6 @@ msgstr "Tápfeszültség-kimaradás"
 msgid "Resource lost"
 msgstr "Erőforrás elveszítve"
 
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, fuzzy, c-format
-msgid "cannot create pipe"
-msgstr "%s fifo nem hozható létre"
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, fuzzy, c-format
-msgid "%s subprocess failed"
-msgstr "%s: a keresés meghiúsult"
-
 #: lib/strsignal.c:114
 #, c-format
 msgid "Real-time signal %d"
@@ -772,7 +808,7 @@ msgstr ""
 msgid "Report %s bugs to: %s\n"
 msgstr "A(z) %s hibái a(z) %s címen jelenthetők.\n"
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "A(z) %s honlapja: <%s>\n"
@@ -782,32 +818,12 @@ msgstr "A(z) %s honlapja: <%s>\n"
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr "A %s honlapja: <http://www.gnu.org/software/%s/>\n"
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr ""
 "�ltalános segítség a GNU szoftverek használatához: <http://www.gnu.org/"
 "gethelp/>\n"
 
-#: lib/w32spawn.h:43
-#, fuzzy, c-format
-msgid "_open_osfhandle failed"
-msgstr "a megnyitás meghiúsult"
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr ""
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr ""
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr ""
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr "szabványos bemenet"
@@ -829,7 +845,7 @@ msgstr "ismeretlen adatfolyam"
 msgid "failed to reopen %s with mode %s"
 msgstr "%s újranyitása %s móddal meghiúsult"
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr "karakterlánc-összehasonlítás sikertelen"
@@ -871,15 +887,13 @@ msgid "Simon Josefsson"
 msgstr "Simon Josefsson"
 
 #: src/base64.c:60
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
 "Base64 encode or decode FILE, or standard input, to standard output.\n"
 msgstr ""
 "Használat: %s [KAPCSOLÓ]… [F�JL]\n"
-"A F�JL vagy a szabványos bemenet Base64 kódolása vagy visszafejtése, a\n"
-"szabványos kimenetre.\n"
-"\n"
+"A F�JL vagy a szabványos bemenet Base64 kódolása a szabványos kimenetre.\n"
 
 #: src/base64.c:67
 msgid ""
@@ -897,7 +911,7 @@ msgstr ""
 "                           (alapértelmezésben 76). A 0 kikapcsolja a törést\n"
 "\n"
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -922,48 +936,47 @@ msgstr ""
 "az\n"
 "ábécében nem szereplő karakterekből.\n"
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "olvasási hiba"
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, c-format
 msgid "invalid input"
 msgstr "érvénytelen bemenet"
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, c-format
 msgid "invalid wrap size: %s"
 msgstr "érvénytelen sortörésméret: %s"
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, c-format
 msgid "extra operand %s"
 msgstr "extra operandus: „%s�"
 
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, c-format
 msgid "closing standard input"
 msgstr "a szabványos bemenet lezárása"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -973,30 +986,33 @@ msgid "David MacKenzie"
 msgstr "David MacKenzie"
 
 #: src/basename.c:48
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s NAME [SUFFIX]\n"
 "  or:  %s OPTION... NAME...\n"
 msgstr ""
 "Használat: %s NÉV [UTÓTAG]\n"
-"  vagy:    %s KAPCSOLÓ\n"
+"  vagy:    %s KAPCSOLÓ... NÉV...\n"
 
 #: src/basename.c:53
-#, fuzzy
 msgid ""
 "Print NAME with any leading directory components removed.\n"
 "If specified, also remove a trailing SUFFIX.\n"
 msgstr ""
 "Kiírja a NEVET a kezdő könyvtárösszetevő eltávolítása után.\n"
 "Ha meg van adva, a záró UTÓTAGOT is eltávolítja.\n"
-"\n"
 
 #: src/basename.c:60
+#, fuzzy
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
+"  -a, --multiple       több argumentum támogatása, és mindegyik NÉVKÉNT "
+"kezelése\n"
+"  -s, --suffix=UTÓTAG  remove a trailing SUFFIX\n"
+"  -z, --zero           kimenet elválasztása NULL-lal új sor helyett\n"
 
 #: src/basename.c:67
 #, c-format
@@ -1008,33 +1024,38 @@ msgid ""
 "  %s -s .h include/stdio.h  -> \"stdio\"\n"
 "  %s -a any/str1 any/str2   -> \"str1\" followed by \"str2\"\n"
 msgstr ""
-
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+"\n"
+"Példák:\n"
+"  %s /usr/bin/sort          -> „sort�\n"
+"  %s include/stdio.h .h     -> „stdio�\n"
+"  %s -s .h include/stdio.h  -> „stdio�\n"
+"  %s -a izé/str1 izé/str2   -> „str1� majd „str2�\n"
+
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, c-format
 msgid "missing operand"
 msgstr "hiányzó operandus"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr "Torbjorn Granlund"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 msgid "Richard M. Stallman"
 msgstr "Richard M. Stallman"
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1092,7 +1113,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr "nem végezhető ioctl a következőn: %s"
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr "szabványos kimenet"
@@ -1109,14 +1130,14 @@ msgstr "Russell Coker"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 msgid "Jim Meyering"
 msgstr "Jim Meyering"
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, c-format
 msgid "failed to create security context: %s"
 msgstr "a biztonsági kontextus létrehozása meghiúsult: %s"
@@ -1128,8 +1149,8 @@ msgstr ""
 "a(z) %s biztonsági kontextus összetevőjének beállítása meghiúsult a "
 "következőre: %s"
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, c-format
 msgid "failed to get security context of %s"
 msgstr "%s biztonsági kontextusának lekérése meghiúsult"
@@ -1139,18 +1160,18 @@ msgstr "%s biztonsági kontextusának lekérése meghiúsult"
 msgid "can't apply partial context to unlabeled file %s"
 msgstr "nem alkalmazható részleges kontextus a(z) %s nem címkézett fájlra"
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, c-format
 msgid "failed to change context of %s to %s"
 msgstr "%s kontextusának megváltoztatása meghiúsult a következőre: %s"
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
 msgstr "%s nem érhető el"
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, c-format
 msgid "cannot read directory %s"
 msgstr "a következő könyvtár nem olvasható: %s"
@@ -1160,13 +1181,14 @@ msgstr "a következő könyvtár nem olvasható: %s"
 msgid "changing security context of %s\n"
 msgstr "%s biztonsági kontextusának megváltoztatása\n"
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, c-format
 msgid "fts_read failed"
 msgstr "az fts_read sikertelen"
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, c-format
 msgid "fts_close failed"
 msgstr "a fts_close hívás meghiúsult"
@@ -1184,16 +1206,14 @@ msgstr ""
 "  vagy:    %s [KAPCSOLÓ]… --reference=REFERENCIAF�JL F�JL…\n"
 
 #: src/chcon.c:357
-#, fuzzy
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
-"Megváltoztatja mindegyik F�JL biztonsági kontextusát a KONTEXTUSRA.\n"
+"Megváltoztatja mindegyik F�JL SELinux biztonsági kontextusát a KONTEXTUSRA.\n"
 "A --reference használatával minden egyes F�JL biztonsági kontextusát a\n"
 "REFERENCIAF�JL kontextusára változtatja.\n"
-"\n"
 
 #: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94
 msgid ""
@@ -1225,8 +1245,7 @@ msgstr ""
 "  -l, --range=TARTOM�NY  a TARTOM�NY tartomány beállítása a cél biztonsági\n"
 "                           kontextusában\n"
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
-#, fuzzy
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
 "      --preserve-root    fail to operate recursively on '/'\n"
@@ -1282,36 +1301,37 @@ msgstr ""
 "                           (alapértelmezett)\n"
 "\n"
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr "A -R --dereference igényli a -H vagy -L egyikét"
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr "a -R -h megköveteli a -P használatát"
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, c-format
 msgid "missing operand after %s"
 msgstr "a(z) „%s� operandusa hiányzik"
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, c-format
 msgid "invalid context: %s"
 msgstr "érvénytelen kontextus: %s"
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr "ütköző biztonságikontextus-meghatározót adott meg"
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, c-format
 msgid "failed to get attributes of %s"
 msgstr "%s attribútumainak beolvasása sikertelen"
@@ -1341,7 +1361,7 @@ msgstr ""
 "kontextusára változtatja.\n"
 "\n"
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
@@ -1385,50 +1405,50 @@ msgstr ""
 "módosítása\n"
 "                       „staff�-ra.\n"
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
 msgstr "%s új attribútumainak beolvasása"
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr ""
 "a szimbolikus link (%s) és az általa hivatkozott fájl egyaránt változatlan\n"
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr "%s jogosultságai megváltoztatva erről: %04lo (%s) erre: %04lo (%s)\n"
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr ""
 "%s jogosultságainak megváltoztatása sikertelen erről: %04lo (%s) erre: %04lo "
 "(%s)\n"
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr "%s jogosultsága a következő maradt: %04lo (%s)\n"
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr "nem lehet dolgozni a(z) %s törött szimbolikus linken"
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, c-format
 msgid "changing permissions of %s"
 msgstr "%s jogosultságainak megváltoztatása"
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr "%s: az új jogosultságok: %s, nem pedig %s"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1439,7 +1459,7 @@ msgstr ""
 "  vagy:    %s [KAPCSOLÓ]… OKT�LIS-MÓD F�JL…\n"
 "  vagy:    %s [KAPCSOLÓ]… --reference=REFERENCIAF�JL F�JL…\n"
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 msgid ""
 "Change the mode of each FILE to MODE.\n"
 "With --reference, change the mode of each FILE to that of RFILE.\n"
@@ -1450,17 +1470,16 @@ msgstr ""
 "módjára változtatja.\n"
 "\n"
 
-#: src/chmod.c:391
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
 "      --reference=RF�JL  az RF�JL MÓDJ�T állítja be a MÓD értékek helyett\n"
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr "  -R, --recursive        fájlok és könyvtárak rekurzív módosítása\n"
 
-#: src/chmod.c:399
-#, fuzzy
+#: src/chmod.c:402
 msgid ""
 "\n"
 "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n"
@@ -1468,12 +1487,12 @@ msgstr ""
 "\n"
 "Minden egyes MÓD a következő formátumú: „[ugoa]*([-+=]([rwxXst]*|[ugo]))+�.\n"
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr "a mód és a --reference kapcsolók nem kombinálhatók"
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, c-format
 msgid "invalid mode: %s"
 msgstr "érvénytelen mód: %s"
@@ -1599,7 +1618,6 @@ msgstr ""
 "helyett\n"
 
 #: src/chown.c:136
-#, fuzzy
 msgid ""
 "\n"
 "Owner is unchanged if missing.  Group is unchanged if missing, but changed\n"
@@ -1630,26 +1648,21 @@ msgstr ""
 "                      módosítása „root�-ra.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr "Roland McGrath"
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr "érvénytelen csoport: %s"
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, c-format
 msgid "invalid group list %s"
 msgstr "érvénytelen csoportlista: %s"
 
-#: src/chroot.c:117
-#, c-format
-msgid "failed to set additional groups"
-msgstr "a további csoportok beállítása meghiúsult"
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
@@ -1658,7 +1671,7 @@ msgstr ""
 "Használat: %s [KAPCSOLÓ] ÚJGYÖKÉR [PARANCS [ARGUMENTUM]…]\n"
 "  vagy:    %s KAPCSOLÓ\n"
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
@@ -1666,7 +1679,7 @@ msgstr ""
 "A PARANCS futtatása a gyökérkönyvtár ÚJGYÖKÉRRE állításával.\n"
 "\n"
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
@@ -1676,38 +1689,51 @@ msgstr ""
 "                           vagy név)\n"
 "  --groups=G_LISTa       kiegészítő csoportok megadása mint g1,g2,..,gN\n"
 
-#: src/chroot.c:149
-#, fuzzy
+#: src/chroot.c:203
 msgid ""
 "\n"
 "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n"
 msgstr ""
 "\n"
-"Ha nincs parancs megadva, a ``${SHELL} -i'' (alapértelmezés: /bin/sh) indul "
+"Ha nincs parancs megadva, a „${SHELL} -i� (alapértelmezés: „/bin/sh�) indul "
 "el.\n"
 
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, c-format
 msgid "cannot change root directory to %s"
 msgstr "a gyökérkönyvtár nem váltható át a következőre: %s"
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, c-format
 msgid "cannot chdir to root directory"
 msgstr "nem lehet a gyökérkönyvtárba lépni"
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr ""
+
+#: src/chroot.c:383
+#, fuzzy, c-format
+msgid "failed to get supplemental groups"
+msgstr "a kiegészítő csoportok beállítása meghiúsult"
+
+#: src/chroot.c:395
+#, fuzzy, c-format
+msgid "failed to %s supplemental groups"
+msgstr "a kiegészítő csoportok beállítása meghiúsult"
+
+#: src/chroot.c:402
 #, c-format
 msgid "failed to set group-ID"
 msgstr "a csoportazonosító beállítása meghiúsult"
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, c-format
 msgid "failed to set user-ID"
 msgstr "a felhasználói azonosító beállítása meghiúsult"
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, c-format
 msgid "failed to run command %s"
 msgstr "a(z) %s parancs futtatása meghiúsult"
@@ -1739,7 +1765,7 @@ msgstr ""
 "Minden egyes F�JL CRC ellenőrzőösszegének és bájtjai számának kiírása.\n"
 "\n"
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr "Használat: %s [KAPCSOLÓ]… F�JL1 F�JL2\n"
@@ -1791,13 +1817,13 @@ msgstr ""
 "  --output-delimiter=STR  oszlopok elválasztása a STR karakterlánccal\n"
 
 #: src/comm.c:133
-#, fuzzy
 msgid ""
 "\n"
 "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n"
 msgstr ""
 "\n"
-"Ne feledje, hogy az összehasonlítások figyelembe veszik az LC_COLLATE által\n"
+"Ne feledje, hogy az összehasonlítások figyelembe veszik az „LC_COLLATE� "
+"által\n"
 "megadott szabályokat.\n"
 
 #: src/comm.c:137
@@ -1828,306 +1854,340 @@ msgstr "több -elválasztót adott meg"
 msgid "empty %s not allowed"
 msgstr "üres %s nem engedélyezett"
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr "hiba %s olvasása közben"
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, c-format
 msgid "cannot lseek %s"
 msgstr "lseek %s sikertelen"
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr "hiba %s írása közben"
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, c-format
 msgid "%s: failed to get extents info"
 msgstr "%s: az extent információinak lekérése meghiúsult"
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, c-format
 msgid "%s: write failed"
 msgstr "%s: az írás meghiúsult"
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, c-format
 msgid "failed to extend %s"
 msgstr "%s kiterjesztése meghiúsult"
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, c-format
 msgid "clearing permissions for %s"
 msgstr "%s jogosultságainak törlése"
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "%s tulajdonosának megtartása meghiúsult"
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
 msgstr "%s fájl kikeresése meghiúsult"
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, c-format
 msgid "failed to preserve authorship for %s"
 msgstr "%s szerzőjének megtartása meghiúsult"
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
+#, c-format
+msgid "failed to set default file creation context to %s"
+msgstr ""
+"az alapértelmezett fájllétrehozási kontextus beállítása meghiúsult a "
+"következőre: %s"
+
+#: src/copy.c:820
+#, c-format
+msgid "failed to set default file creation context for %s"
+msgstr ""
+"az alapértelmezett fájllétrehozási kontextus beállítása meghiúsult ehhez: %s"
+
+#: src/copy.c:846
+#, c-format
+msgid "failed to set the security context of %s"
+msgstr "%s biztonsági kontextusának beállítása meghiúsult"
+
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
 msgid "cannot open %s for reading"
 msgstr "%s nem nyitható meg olvasásra"
 
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, c-format
 msgid "cannot fstat %s"
 msgstr "fstat %s sikertelen"
 
-#: src/copy.c:820
+#: src/copy.c:935
 #, c-format
 msgid "skipping file %s, as it was replaced while being copied"
 msgstr "%s fájl kihagyása, mivel kicserélték másolás közben"
 
-#: src/copy.c:850
-#, c-format
-msgid "failed to get file system create context"
-msgstr "a fájlrendszer létrehozási kontextusának lekérése meghiúsult"
-
-#: src/copy.c:864
-#, c-format
-msgid "failed to set the security context of %s to %s"
-msgstr "%s biztonsági kontextusának beállítása meghiúsult a következőre: %s"
-
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
 msgid "cannot remove %s"
 msgstr "%s nem törölhető"
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
 msgstr "%s törölve\n"
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr "nincs írás a(z) %s törött szimbolikus linken keresztül"
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, c-format
 msgid "cannot create regular file %s"
 msgstr "%s reguláris fájl nem hozható létre"
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, c-format
 msgid "failed to clone %s from %s"
 msgstr "%s klónozása meghiúsult innen: %s"
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr "%s összes idejének megtartása"
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
-#, fuzzy, c-format
+#, c-format
 msgid "failed to close %s"
-msgstr "%s megnyitása meghiúsult"
+msgstr "%s bezárása meghiúsult"
 
-#: src/copy.c:1471
-#, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
+#: src/copy.c:1580
+#, fuzzy, c-format
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
 msgstr ""
 "%s: megpróbálja felülírni a(z) %s fájlt, figyelmen kívül hagyva a(z) %04lo "
 "(%s) módot? "
 
-#: src/copy.c:1478
+#: src/copy.c:1581
+#, c-format
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr ""
+
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
 msgstr "%s: felülírod a(z) %s fájlt? "
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr " (biztonsági mentés: %s)"
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr "az alapértelmezett fájllétrehozási kontextus visszaállítása meghiúsult"
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, c-format
 msgid "cannot create hard link %s to %s"
 msgstr "%s hard link nem hozható létre a következőre: %s"
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, c-format
 msgid "cannot stat %s"
 msgstr "stat %s sikertelen"
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, c-format
 msgid "omitting directory %s"
 msgstr "%s könyvtár kihagyása"
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr "figyelmeztetés: %s forrásfájl többször is meg van adva"
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
 msgstr "%s és %s ugyanaz a fájl"
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr "%s nem könyvtár; nem írható felül %s könyvtárral"
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr "az éppen létrehozott %s-t nem fogom felülírni ezzel: %s"
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr "%s könyvtárat nem írható felül nem könyvtárral"
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr "a könyvtárat nem lehet nem könyvtárba áthelyezni: %s -> %s"
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr ""
 "%s biztonsági mentése megsemmisítené a forrást; %s nem került áthelyezésre"
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr ""
 "%s biztonsági mentése megsemmisítené a forrást; %s nem került másolásra"
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
 msgstr "%s biztonsági mentése sikertelen"
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr ""
 "a(z) %s nem kerül átmásolásra az imént létrehozott %s szimbolikus linken "
 "keresztül"
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr "%s könyvtárat nem lehet saját magába (%s) másolni"
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr "%2$s könyvtárra mutató %1$s hard link nem lesz létrehozva"
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr "%s-t nem lehet egy saját alkönyvtárába (%s) áthelyezni"
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, c-format
 msgid "cannot move %s to %s"
 msgstr "%s-t nem lehet ide áthelyezni: %s"
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr ""
 "eszközközi áthelyezés sikertelen:\n"
 "%s --> %s; cél törlése sikertelen"
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, c-format
-msgid "failed to set default file creation context to %s"
-msgstr ""
-"az alapértelmezett fájllétrehozási kontextus beállítása meghiúsult a "
-"következőre: %s"
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr "%s körkörös szimbolikus link nem másolható"
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr ""
 "%s: relatív szimbolikus linkeket csak az aktuális könyvtárban lehet "
 "létrehozni"
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr "%s szimbolikus link nem hozható létre a következőre: %s"
 
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, c-format
 msgid "cannot create fifo %s"
 msgstr "%s fifo nem hozható létre"
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, c-format
 msgid "cannot create special file %s"
 msgstr "%s speciális fájl nem hozható létre"
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, c-format
 msgid "cannot read symbolic link %s"
 msgstr "%s szimbolikus link nem olvasható"
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, c-format
 msgid "cannot create symbolic link %s"
 msgstr "%s szimbolikus link nem hozható létre"
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
 msgstr "%s fájltípusa ismeretlen"
 
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, c-format
 msgid "cannot un-backup %s"
 msgstr "%s biztonsági mentése nem állítható vissza"
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr "%s -> %s (biztonsági mentés visszaállítása)\n"
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr ""
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr ""
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, fuzzy, c-format
+msgid "unknown program %s"
+msgstr "ismeretlen adatfolyam"
+
+#: src/cp.c:157 src/mv.c:288
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -2138,14 +2198,11 @@ msgstr ""
 "  vagy:    %s [KAPCSOLÓ]… FORR�S… KÖNYVT�R\n"
 "  vagy:    %s [KAPCSOLÓ]… -t KÖNYVT�R FORR�S…\n"
 
-#: src/cp.c:162
-#, fuzzy
+#: src/cp.c:163
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
-msgstr ""
-"A FORR�ST a CÉLRA, vagy több FORR�ST a KÖNYVT�RBA másol.\n"
-"\n"
+msgstr "A FORR�ST a CÉLRA, vagy több FORR�ST a KÖNYVT�RBA másol.\n"
 
-#: src/cp.c:168
+#: src/cp.c:169
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
 "      --attributes-only        don't copy the file data, just the "
@@ -2169,8 +2226,7 @@ msgstr ""
 "                                 másolja\n"
 "  -d                           mint a --no-dereference --preserve=links\n"
 
-#: src/cp.c:177
-#, fuzzy
+#: src/cp.c:178
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
 "                                 opened, remove it and try again (this "
@@ -2184,13 +2240,13 @@ msgid ""
 msgstr ""
 "  -f, --force                  ha egy létező célfájlt nem lehet megnyitni,\n"
 "                                 akkor törli azt, majd újrapróbálja "
-"(redundáns\n"
-"                                 a -n kapcsoló használata mellett)\n"
+"(figyelmen\n"
+"                                 kívül marad a -n kapcsoló használatakor)\n"
 "  -i, --interactive            felülírás előtt kérdez\n"
 "  -H                           parancssori szimbolikus linkek követése a\n"
 "                                 FORR�SBAN\n"
 
-#: src/cp.c:186
+#: src/cp.c:187
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
 "  -L, --dereference            always follow symbolic links in SOURCE\n"
@@ -2199,7 +2255,7 @@ msgstr ""
 "  -L, --dereference            a szimbolikus linkek követése mindig a "
 "FORR�SBAN\n"
 
-#: src/cp.c:190
+#: src/cp.c:191
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
 "                                 a previous -i option)\n"
@@ -2210,7 +2266,7 @@ msgstr ""
 "  -P, --no-dereference         soha ne kövesse a szimbolikus linkeket a\n"
 "                                  FORR�SBAN\n"
 
-#: src/cp.c:195
+#: src/cp.c:196
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
 "      --preserve[=ATTR_LIST]   preserve the specified attributes (default:\n"
@@ -2225,7 +2281,7 @@ msgstr ""
 "                                 további attribútumokat is: context, links,\n"
 "                                 xattr, all\n"
 
-#: src/cp.c:203
+#: src/cp.c:204
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                use full source file name under DIRECTORY\n"
@@ -2234,7 +2290,7 @@ msgstr ""
 "      --parents                teljes forrásfájlnév használata a KÖNYVT�R "
 "alatt\n"
 
-#: src/cp.c:207
+#: src/cp.c:208
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
 "      --reflink[=WHEN]         control clone/CoW copies. See below\n"
@@ -2249,7 +2305,7 @@ msgstr ""
 "                                 megnyitni (ellentétben a --force "
 "kapcsolóval)\n"
 
-#: src/cp.c:213
+#: src/cp.c:214
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
 "      --strip-trailing-slashes  remove any trailing slashes from each "
@@ -2261,7 +2317,7 @@ msgstr ""
 "      --strip-trailing-slashes eltávolítja a befejező osztásjeleket minden\n"
 "                                 egyes FORR�S argumentumról\n"
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -2277,7 +2333,7 @@ msgstr ""
 "                                    megadott KÖNYVT�RBA\n"
 "  -T, --no-target-directory    a CÉL kezelése normál fájlként\n"
 
-#: src/cp.c:224
+#: src/cp.c:225
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
 "                                 than the destination file or when the\n"
@@ -2291,7 +2347,20 @@ msgstr ""
 "  -v, --verbose                elmagyarázza, mi történik\n"
 "  -x, --one-file-system        az adott fájlrendszeren marad\n"
 
-#: src/cp.c:233
+#: src/cp.c:232
+#, fuzzy
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+"  -Z, --context[=KTX]          a célfájl SELinux biztonsági kontextusának\n"
+"                                 beállítása az alapértelmezett típusra, "
+"vagy\n"
+"                                 ha meg van adva akkor a KTX-ra\n"
+
+#: src/cp.c:240
 msgid ""
 "\n"
 "By default, sparse SOURCE files are detected by a crude heuristic and the\n"
@@ -2320,8 +2389,7 @@ msgstr ""
 "a másolás meghiúsul, vagy ha --reflink=auto megadásakor hagyományos másolás\n"
 "kerül végrehajtásra.\n"
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
-#, fuzzy
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 msgid ""
 "\n"
 "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n"
@@ -2340,7 +2408,7 @@ msgstr ""
 "Az érvényes értékek a következők:\n"
 "\n"
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2353,7 +2421,7 @@ msgstr ""
 "                  egyszerű\n"
 "  simple, never   mindig egyszerű biztonsági mentés\n"
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2366,92 +2434,104 @@ msgstr ""
 "és backup kapcsolók egyaránt meg vannak adva, továbbá a FORR�S és a CÉL "
 "ugyanaz a szabályos fájl.\n"
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, c-format
 msgid "failed to preserve times for %s"
 msgstr "%s időinek megtartása meghiúsult"
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, c-format
 msgid "failed to preserve permissions for %s"
 msgstr "%s jogosultságainak megtartása sikertelen"
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, c-format
 msgid "cannot make directory %s"
 msgstr "%s könyvtár nem hozható létre"
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr "%s létezik, de nem könyvtár"
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
-#, fuzzy, c-format
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
+#, c-format
 msgid "failed to access %s"
-msgstr "%s megnyitása meghiúsult"
+msgstr "%s elérése meghiúsult"
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, c-format
 msgid "missing file operand"
 msgstr "hiányzó fájloperandus"
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, c-format
 msgid "missing destination file operand after %s"
 msgstr "hiányzik a célfájl-operandus a következő után: %s"
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr ""
 "A --target-directory (-t) és a --no-target-directory (-T) nem kombinálhatók"
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, c-format
 msgid "target %s is not a directory"
 msgstr "a megadott cél (%s) nem könyvtár"
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr "a --parents használatakor a cél könyvtár kell legyen"
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, c-format
 msgid "multiple target directories specified"
 msgstr "több kimeneti célkönyvtár van megadva"
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr ""
+"FIGYELMEZTETÉS: a --context figyelmen kívül marad; SELinux-képes kernelt "
+"igényel"
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr "nem lehet egyszerre hard linket és szimbolikus linket létrehozni"
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr "a --backup és --no-clobber kapcsolók egymást kölcsönösen kizárják"
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr "a --reflink csak a --sparse=auto kapcsolóval együtt használható"
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr "biztonsági mentés típusa"
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, c-format
+msgid "cannot set target context and preserve it"
+msgstr "a cél kontextusa nem állítható be és nem és őrizhető meg"
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr ""
 "a biztonsági kontextus nem őrizhető meg SELinux-képes rendszermag nélkül"
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr ""
@@ -2459,142 +2539,140 @@ msgstr ""
 "készült"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr "Stuart Kemp"
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr "a bemenet eltűnt"
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr "%s: a sorszám kívül esik a tartományon"
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, c-format
 msgid "%s: %s: line number out of range"
 msgstr "%s: %s: a sorszám kívül esik a tartományon"
 
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, c-format
 msgid " on repetition %s\n"
 msgstr " a(z) %s ismétlésben\n"
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, c-format
 msgid "%s: %s: match not found"
 msgstr "%s: %s: a találat nem található"
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr "hiba a szabályos kifejezés keresésében"
 
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, c-format
 msgid "write error for %s"
 msgstr "írási hiba a következőhöz: %s"
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, c-format
 msgid "%s: integer expected after delimiter"
 msgstr "%s a program egész értéket várt az elhatároló után"
 
-#: src/csplit.c:1075
-#, fuzzy, c-format
+#: src/csplit.c:1098
+#, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr "%s: egy „}� szükséges az ismétlésszámban"
 
-#: src/csplit.c:1085
-#, fuzzy, c-format
+#: src/csplit.c:1108
+#, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr "%s}: egy egész érték szükséges a „{� és „}� között"
 
-#: src/csplit.c:1112
-#, fuzzy, c-format
+#: src/csplit.c:1135
+#, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr "%s: a záró „%c� elhatároló hiányzik"
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr "%s: érvénytelen szabályos kifejezés: %s"
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr "%s: érvénytelen minta"
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr "%s: a sorszámnak nagyobbnak kell lennie, mint 0"
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr "a(z) %s sorszám kisebb, mint a megelőző sorszám (%s)"
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr "figyelmeztetés: a(z) %s sorszám azonos a megelőző sorszámmal"
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr "az utótagból hiányzik az átalakítás meghatározása"
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr "az utótagból hiányzik az átalakítás meghatározása: %c"
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr "az utótagból hiányzik az átalakítás meghatározása: \\%.3o"
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr "érvénytelen jelzők a konverziós specifikációban: %%%c%c"
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr "túl sok %% átalakítási meghatározás van az utótagban"
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr "az utótagból hiányzik a %% átalakítási meghatározás"
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr "érvénytelen szám: %s"
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr "Használat: %s [KAPCSOLÓ]… F�JL MINTA…\n"
 
-#: src/csplit.c:1455
-#, fuzzy
+#: src/csplit.c:1483
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
 "and output byte counts of each piece to standard output.\n"
 msgstr ""
 "A F�JL MINT�K által elválasztott darabjait az „xx00�, „xx01�, …, fájlokba\n"
 "írja, valamint az egyes darabok bájtjai számát a szabványos kimenetre írja.\n"
-"\n"
 
-#: src/csplit.c:1462
-#, fuzzy, c-format
+#: src/csplit.c:1490
+#, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
 "  -f, --prefix=PREFIX        use PREFIX instead of 'xx'\n"
@@ -2605,7 +2683,11 @@ msgstr ""
 "  -f, --prefix=EL�TAG        az EL�TAG használata az „xx� helyett\n"
 "  -k, --keep-files           ne törölje  kimeneti fájlokat hiba esetén\n"
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr "  -m, --suppress-matched     a MINT�RA illeszkedő sorok elnyomása\n"
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
@@ -2617,7 +2699,7 @@ msgstr ""
 "összegét\n"
 "  -z, --elide-empty-files    üres kimeneti fájlok eltávolítása\n"
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
@@ -2625,8 +2707,7 @@ msgstr ""
 "\n"
 "Ha a F�JL a -, akkor a szabványos bemenetet olvassa. A MINTA lehet:\n"
 
-#: src/csplit.c:1478
-#, fuzzy
+#: src/csplit.c:1509
 msgid ""
 "\n"
 "  INTEGER            copy up to but not including specified line number\n"
@@ -2651,23 +2732,17 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr "David M. Ihnat"
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr "a mezők és pozíciók számozása 1-től kezdődik"
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr "Használat: %s KAPCSOLÓ… [F�JL]…\n"
 
-#: src/cut.c:193
-#, fuzzy
+#: src/cut.c:176
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr ""
 "Minden egyes F�JL kiválasztott részeinek kiírása a szabványos kimenetre.\n"
-"\n"
 
-#: src/cut.c:199
+#: src/cut.c:182
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
 "  -c, --characters=LIST   select only these characters\n"
@@ -2678,7 +2753,7 @@ msgstr ""
 "  -d, --delimiter=ELHAT   az ELHAT használata a TAB helyett "
 "mezőelválasztóként\n"
 
-#: src/cut.c:204
+#: src/cut.c:187
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
 "                            that contains no delimiter character, unless\n"
@@ -2692,7 +2767,7 @@ msgstr ""
 "                            kivéve ha a -s kapcsoló meg van adva\n"
 "  -n                      (figyelmen kívül marad)\n"
 
-#: src/cut.c:210
+#: src/cut.c:193
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
 "                            or fields\n"
@@ -2701,7 +2776,7 @@ msgstr ""
 "halmazának\n"
 "                            kiegészítése.\n"
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
@@ -2713,7 +2788,7 @@ msgstr ""
 "                            elhatárolójaként, az alapértelmezés a bemenet\n"
 "                            elhatárolójának használata\n"
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2725,7 +2800,7 @@ msgstr ""
 "egy, vesszőkkel elválasztott tartományból áll. A kiválasztott bemenet a\n"
 "beolvasás sorrendjében és pontosan egyszer kerül kiírásra.\n"
 
-#: src/cut.c:227
+#: src/cut.c:210
 msgid ""
 "Each range is one of:\n"
 "\n"
@@ -2747,47 +2822,50 @@ msgstr ""
 "\n"
 "Ha a F�JL nincs megadva vagy -, akkor a szabványos bemenetet olvassa.\n"
 
-#: src/cut.c:367 src/cut.c:493
-#, fuzzy
+#: src/cut.c:300 src/cut.c:394
 msgid "invalid byte, character or field list"
-msgstr "érvénytelen bájt- vagy mezőlista"
+msgstr "érvénytelen bájt-, karakter- vagy mezőlista"
+
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr "a mezők és pozíciók számozása 1-től kezdődik"
 
-#: src/cut.c:387
+#: src/cut.c:320
 msgid "invalid range with no endpoint: -"
 msgstr "érvénytelen tartomány végpont nélkül: -"
 
-#: src/cut.c:403
+#: src/cut.c:334
 msgid "invalid decreasing range"
 msgstr "érvénytelen csökkenő tartomány"
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, c-format
 msgid "byte offset %s is too large"
 msgstr "a(z) %s bájteltolás túl nagy"
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, c-format
 msgid "field number %s is too large"
 msgstr "a(z) %s mezőszám túl nagy"
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr "csak egy listatípus adható meg"
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr "az elhatárolónak egyetlen karakternek kell lennie"
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr "bájtok, karakterek vagy mezők listáját kell megadnod"
 
-#: src/cut.c:850
+#: src/cut.c:790
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr "bemeneti elhatároló csak mezőkön való működés esetén adható meg"
 
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
@@ -2795,11 +2873,11 @@ msgstr ""
 "el nem határolt sorok elnyomásának csak mezőkön \n"
 "\tvaló működés esetén van értelme"
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr "a mezőlista hiányzik"
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr "a pozíciólista hiányzik"
 
@@ -2815,9 +2893,10 @@ msgstr ""
 #: src/date.c:128
 msgid "Display the current time in the given FORMAT, or set the system date.\n"
 msgstr ""
+"Az aktuális idő megjelenítése a FORM�TUMBAN, vagy a rendszerdátum "
+"beállítása.\n"
 
 #: src/date.c:134
-#, fuzzy
 msgid ""
 "  -d, --date=STRING         display time described by STRING, not 'now'\n"
 "  -f, --file=DATEFILE       like --date once for each line of DATEFILE\n"
@@ -2826,9 +2905,6 @@ msgid ""
 "                            'hours', 'minutes', 'seconds', or 'ns' for date\n"
 "                            and time to the indicated precision.\n"
 msgstr ""
-"Az aktuális idő megjelenítése a megadott FORM�TUMBAN, vagy a rendszerdátum\n"
-"beállítása.\n"
-"\n"
 "  -d, --date=KARAKTERL�NC   a KARAKTERL�NC által leírt dátum megjelenítése\n"
 "                              az aktuális helyett\n"
 "  -f, --file=D�TUMF�JL      mint a --date egyszer a D�TUMF�JL minden sorára\n"
@@ -2851,7 +2927,6 @@ msgstr ""
 "                            Például: Mon, 07 Aug 2006 12:34:56 -0600\n"
 
 #: src/date.c:147
-#, fuzzy
 msgid ""
 "      --rfc-3339=TIMESPEC   output date and time in RFC 3339 format.\n"
 "                            TIMESPEC='date', 'seconds', or 'ns' for\n"
@@ -2859,7 +2934,7 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 "      --rfc-3339=ID�MEGHAT  dátum kiírása RFC 3339 formátumban.\n"
 "                              Az ID�MEGHAT=„date�, „seconds�, vagy „ns�\n"
@@ -3019,7 +3094,6 @@ msgstr ""
 "Alapértelmezésben a date a numerikus mezőket nullákkal tölti ki.\n"
 
 #: src/date.c:230
-#, fuzzy
 msgid ""
 "The following optional flags may follow '%':\n"
 "\n"
@@ -3076,10 +3150,10 @@ msgstr ""
 "A helyi idő megjelenítése következő péntek 9.00-kor\n"
 "  $ date --date='TZ=\"Europe/Budapest\" 09:00 next Fri'\n"
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr "szabványos bemenet"
@@ -3108,7 +3182,7 @@ msgstr ""
 "az idő kiíratására és beállítására használt kapcsolók nem használhatók együtt"
 
 #: src/date.c:458
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "the argument %s lacks a leading '+';\n"
 "when using an option to specify date(s), any non-option\n"
@@ -3123,7 +3197,7 @@ msgstr ""
 msgid "cannot set date"
 msgstr "nem állítható be a dátum"
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, c-format
 msgid "time %s is out of range"
 msgstr "a(z)%s időpont kívül esik a tartományon"
@@ -3134,7 +3208,7 @@ msgstr "a(z)%s időpont kívül esik a tartományon"
 msgid "Paul Rubin"
 msgstr "Paul Rubin"
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
@@ -3143,8 +3217,7 @@ msgstr ""
 "Használat: %s [OPERANDUS]…\n"
 "  vagy:    %s KAPCSOLÓ\n"
 
-#: src/dd.c:526
-#, fuzzy
+#: src/dd.c:532
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
 "\n"
@@ -3161,11 +3234,10 @@ msgstr ""
 "  conv=KONV       a fájl átalakítása a vesszővel elválasztott "
 "szimbólumlistának\n"
 "                    megfelelően\n"
-"  count=BLOKK     csak BLOKK bemeneti blokkot másol\n"
+"  count=N         csak N bemeneti blokkot másol\n"
 "  ibs=B�JT        egyszerre B�JT bájtot olvas be (alapérték: 512)\n"
 
-#: src/dd.c:535
-#, fuzzy
+#: src/dd.c:541
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
 "  iflag=FLAGS     read as per the comma separated symbol list\n"
@@ -3178,17 +3250,17 @@ msgid ""
 "                  'noxfer' suppresses transfer stats, 'none' suppresses all\n"
 msgstr ""
 "  if=F�JL         olvasás a F�JLBÓL a szabványos bemenet helyett\n"
-"  iflag=JELÖL�K   a vesszővel elválasztott szimbólumlistának megfelelően "
-"olvas\n"
+"  iflag=JELÖL�K   olvasás a vesszővel elválasztott szimbólumlistának "
+"megfelelően\n"
 "  obs=B�JT        egyszerre B�JT bájt kiírása\n"
 "  of=F�JL         a F�JLBA ír a szabványos kimenet helyett\n"
 "  oflag=JELÖL�K   a vesszővel elválasztott szimbólumlistának megfelelően ír\n"
 "  seek=BLOKK      ennyi obs-méretű blokkot hagy ki a kimenet elején\n"
 "  skip=BLOKK      ennyi ibs-méretű blokkot hagy ki a bemenet elején\n"
-"  status=noxfer   átviteli statisztika elnyomása\n"
+"  status=MELYIK   MELYIK infó elnyomása a szabványos hibakimeneten:\n"
+"                    „noxfer�: átviteli statisztika, „none�: minden\n"
 
-#: src/dd.c:546
-#, fuzzy
+#: src/dd.c:552
 msgid ""
 "\n"
 "N and BYTES may be followed by the following multiplicative suffixes:\n"
@@ -3199,15 +3271,14 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"A BLOKKHOZ és a B�JTHOZ a következő szorzó-utótagok adhatók meg:\n"
+"Az N és a B�JT után a következő szorzó-utótagok adhatók meg:\n"
 "c =1, w =2, b =512, kB =1000, K =1024, MB =1000*1000, M =1024*1024, xM =M\n"
 "GB =1000*1000*1000, G =1024*1024*1024, és ugyanígy T, P, E, Z, Y.\n"
 "\n"
-"A KULCSSZÓ szimbólumok az alábbiak lehetnek:\n"
+"A KONV szimbólumok az alábbiak lehetnek:\n"
 "\n"
 
-#: src/dd.c:555
-#, fuzzy
+#: src/dd.c:561
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
 "  ebcdic    from ASCII to EBCDIC\n"
@@ -3229,12 +3300,15 @@ msgstr ""
 "  unblock   a sorvégi szóközöket cbs méretű rekordokban soremelésre cseréli\n"
 "  lcase     nagybetűről kisbetűre cserél\n"
 "  ucase     kisbetűről nagybetűre cserél\n"
+"  sparse    megpróbál pozicionálni a NULL bemeneti blokkokhoz tartozó "
+"kimenet\n"
+"              írása helyett\n"
 "  swab      minden bemeneti bájtpár sorrendjét megcseréli\n"
 "  sync      minden bemeneti blokkot NULL bájtokkal ibs méretűre egészít ki;\n"
 "              ha a „block� vagy „unblock� is szerepel a listában,\n"
 "              akkor a feltöltéshez NULL helyett szóközt használ\n"
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -3250,7 +3324,7 @@ msgstr ""
 "  fdatasync a kimeneti fájladatok kiírása fizikailag a befejezés előtt\n"
 "  fsync     hasonló az előzőhöz, de a metaadatokat is kiírja\n"
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -3264,77 +3338,81 @@ msgstr ""
 "  append    hozzáfűzési mód (csak kimenet esetén van értelme; javasolt a\n"
 "              conv=notrunc)\n"
 
-#: src/dd.c:583
+#: src/dd.c:589
 msgid "  cio       use concurrent I/O for data\n"
 msgstr "  cio       párhuzamos I/O használata az adatokhoz\n"
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr "  direct    közvetlen I/O használata az adatokhoz\n"
 
-#: src/dd.c:587
+#: src/dd.c:593
 msgid "  directory  fail unless a directory\n"
 msgstr "  directory  működés csak könyvtárakon\n"
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr "  dsync     szinkronizált I/O használata az adatokhoz\n"
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr "  sync      hasonló az előzőhöz, de a metaadatok esetén is érvényes\n"
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr "  fullblock  a bemenet teljes blokkjainak összegyűjtése (csak iflag)\n"
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr "  nonblock  nem blokkoló I/O használata\n"
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr "  noatime   ne frissítse a hozzáférési időt\n"
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr "  nocache   gyorsítótárazott adatok eldobása\n"
 
 # fixme
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr "  noctty    ne rendelje hozzá a vezérlő terminált fájlból\n"
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr "  nofollow  ne kövesse a szimbolikus linkeket\n"
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr "  nolinks   többszörös linkek esetén a működés visszautasítása\n"
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr "  binary    bináris I/O használata az adatokhoz\n"
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr "  text      szöveges I/O használata az adatokhoz\n"
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr ""
+"  count_bytes  a „count=N� bájtszámként kezelése (csak az iflag "
+"kapcsolóval)\n"
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr ""
+"  skip_bytes  a „skip=N� bájtszámként kezelése (csak az iflag kapcsolóval)\n"
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr ""
+"  seek_bytes  a „seek=N� bájtszámként kezelése (csak az oflag kapcsolóval)\n"
 
-#: src/dd.c:625
-#, fuzzy, c-format
+#: src/dd.c:631
+#, c-format
 msgid ""
 "\n"
 "Sending a %s signal to a running 'dd' process makes it\n"
@@ -3363,7 +3441,17 @@ msgstr ""
 "A kapcsolók:\n"
 "\n"
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr "a memóriát elfogyasztotta a %zu bájt hosszú bemeneti puffer (%s)"
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr "a memóriát elfogyasztotta a %zu bájt hosszú kimeneti puffer (%s)"
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
@@ -3372,21 +3460,21 @@ msgstr ""
 "%<PRIuMAX>+%<PRIuMAX> beolvasott rekord\n"
 "%<PRIuMAX>+%<PRIuMAX> kiírt rekord\n"
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
 msgstr[0] "%<PRIuMAX> levágott rekord\n"
 msgstr[1] "%<PRIuMAX> levágott rekord\n"
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
 msgstr[0] "%<PRIuMAX> bájt (%s) másolva"
 msgstr[1] "%<PRIuMAX> bájt (%s) másolva"
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr "Végtelen B"
 
@@ -3400,83 +3488,83 @@ msgstr "Végtelen B"
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
 msgstr ", %g mp, %s/s\n"
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, c-format
 msgid "closing input file %s"
 msgstr "%s bemeneti fájl lezárása"
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr "%s kimeneti fájl lezárása"
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr "az O_DIRECT kikapcsolása meghiúsult: %s"
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, c-format
 msgid "writing to %s"
 msgstr "írás a következőbe: %s"
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, c-format
 msgid "unrecognized operand %s"
 msgstr "ismeretlen operandus: %s"
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 msgid "invalid conversion"
 msgstr "érvénytelen átalakítás"
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 msgid "invalid input flag"
 msgstr "érvénytelen bemeneti jelölő"
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 msgid "invalid output flag"
 msgstr "érvénytelen kimeneti jelölő"
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 msgid "invalid status flag"
 msgstr "érvénytelen állapotjelölő"
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, c-format
 msgid "invalid number %s"
 msgstr "érvénytelen szám: %s"
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr "az {ascii,ebcdic,ibm} közül csak egy adható meg egyszerre"
 
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, c-format
 msgid "cannot combine block and unblock"
 msgstr "a block és az unblock nem adható meg egyszerre"
 
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, c-format
 msgid "cannot combine lcase and ucase"
 msgstr "az lcase és az ucase nem adható meg egyszerre"
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, c-format
 msgid "cannot combine excl and nocreat"
 msgstr "az excl és a nocreat nem adható meg egyszerre"
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, c-format
 msgid "cannot combine direct and nocache"
 msgstr "a direct és a nocache nem adható meg egyszerre"
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
@@ -3486,73 +3574,63 @@ msgstr ""
 "%s (mt_type=0x%0lx)\n"
 "A <sys/mtio.h> fájlban megtalálod a típusok listáját"
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, c-format
 msgid "%s: cannot skip"
 msgstr "%s: nem lehet ugrani"
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, c-format
 msgid "%s: cannot seek"
 msgstr "%s: nem lehet pozicionálni"
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr "eltolástúlcsordulás a(z) %s fájl olvasása közben"
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr "figyelmeztetés: érvénytelen fájleltolás a meghiúsult olvasás után"
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr "a kernelhiba nem kerülhető meg"
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, c-format
 msgid "setting flags for %s"
 msgstr "%s jelölőinek beállítása"
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr "a memóriát elfogyasztotta a %zu bájt hosszú bemeneti puffer (%s)"
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr "a memóriát elfogyasztotta a %zu bájt hosszú kimeneti puffer (%s)"
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr "%s: nem lehet a megadott eltolásra ugrani"
 
-#: src/dd.c:2133
-#, fuzzy, c-format
+#: src/dd.c:2172
+#, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
 msgstr ""
-"a csonkítás meghiúsult %<PRIuMAX> bájtra a következő kimeneti fájlban: %s"
+"a csonkítás meghiúsult %<PRIdMAX> bájtra a következő kimeneti fájlban: %s"
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr "az fdatasync meghiúsult a következőhöz: %s"
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
 msgstr "az fsync meghiúsult a következőhöz: %s"
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, c-format
 msgid "failed to open %s"
 msgstr "%s megnyitása meghiúsult"
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
@@ -3561,129 +3639,137 @@ msgstr ""
 "Az eltolás túl nagy: nem lehet seek=%<PRIuMAX> (%lu bájt) blokk\n"
 "hosszára csonkítani"
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr ""
 "a csonkítás meghiúsult %<PRIuMAX> bájtra a következő kimeneti fájlban: %s"
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, c-format
 msgid "failed to discard cache for: %s"
 msgstr "a következő gyorsítótárának eldobása meghiúsult: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr "Paul Eggert"
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr "Fájlrendszer"
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr "Típ."
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr "blokk"
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr "Fogl."
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr "Szabad"
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr "Fo.%"
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr "Inode-ok"
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr "IFogl"
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr "ISzab."
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr "IFo.%"
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr "Csatol. pont"
 
-#: src/df.c:383
+#: src/df.c:207
+msgid "File"
+msgstr "Fájl"
+
+#: src/df.c:387
 #, c-format
-msgid "option --output: field '%s' unknown"
-msgstr ""
+msgid "option --output: field %s unknown"
+msgstr "--output kapcsoló: a(z) „%s� mező ismeretlen"
 
-#: src/df.c:390
-#, fuzzy, c-format
-msgid "option --output: field '%s' used more than once"
-msgstr "figyelmeztetés: %s forrásfájl többször is meg van adva"
+#: src/df.c:394
+#, c-format
+msgid "option --output: field %s used more than once"
+msgstr "--output kapcsoló: a(z) „%s� mező többször is meg van adva"
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr "Méret"
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr "Szab."
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr "Kapacit."
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
+msgstr "%s-%s"
+
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
 msgstr ""
 
-#: src/df.c:1210
-#, fuzzy
+#: src/df.c:1384
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
 "or all file systems by default.\n"
 msgstr ""
 "Arról a fájlrendszerről jelenít meg adatokat, ahol a megadott F�JLOK\n"
 "találhatók, vagy alapértelmezésben minden fájlrendszerről.\n"
-"\n"
 
-#: src/df.c:1217
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
 #, fuzzy
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
 "  -a, --all              üres fájlrendszereket is listázza\n"
-"  -B, --block-size=MÉRET MÉRET bájtos blokkok használata kiírás előtt.\n"
+"  -B, --block-size=MÉRET MÉRET bájtos blokkok használata kiírás előtt\n"
 "                           Például a „-BM� a méreteket 1,048,576 bájtos\n"
 "                           egységekben írja ki. Lásd a MÉRET formátumot "
-"alább.\n"
+"alább\n"
 "      --total            összesítés előállítása\n"
 "  -h, --human-readable   közérthető formátum (például 1K 234M 2G)\n"
 "  -H, --si               ugyanaz mint előbb, de 1000-es szorzó 1024-es "
 "helyett\n"
 
-#: src/df.c:1227
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -3698,8 +3784,7 @@ msgstr ""
 "információk\n"
 "                           beolvasása előtt (alapértelmezett)\n"
 
-#: src/df.c:1234
-#, fuzzy
+#: src/df.c:1409
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
 "                               or print all fields if FIELD_LIST is "
@@ -3711,6 +3796,9 @@ msgid ""
 "  -x, --exclude-type=TYPE   limit listing to file systems not of type TYPE\n"
 "  -v                    (ignored)\n"
 msgstr ""
+"      --output[=MEZ�LISTA]  a MEZ�LISTA által megadott kimeneti formátum\n"
+"                              használata, vagy minden mező kiírása, "
+"ha                               a MEZ�LISTA hiányzik.\n"
 "  -P, --portability      POSIX kompatibilis kimenet\n"
 "      --sync             kiadja a sync parancsot a használati információk\n"
 "                           beolvasása előtt\n"
@@ -3720,43 +3808,38 @@ msgstr ""
 "ki\n"
 "  -v                     (figyelmen kívül marad)\n"
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
+"\n"
+"A MEZ�LISTA a kiírandó oszlopok vesszőkkel elválasztott listája. Érvényes\n"
+"mezőnevek: „source�, „fstype�, „itotal�, „iused�, „iavail�, „ipcent�,\n"
+"„size�, �used�, „avail�, „pcent�, „file� és „target� (lásd az info oldalt).\n"
 
-#: src/df.c:1285
-#, fuzzy, c-format
+#: src/df.c:1460
+#, c-format
 msgid "options %s and %s are mutually exclusive"
-msgstr "a --compare (-C) és --strip kapcsolók egymást kölcsönösen kizárják"
-
-#: src/df.c:1335
-#, fuzzy
-msgid "warning: "
-msgstr "Figyelmeztetés: "
+msgstr "a(z) %s és %s kapcsolók egymást kölcsönösen kizárják"
 
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr ""
-
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr ""
 "%s típusú fájlrendszer ki is van jelölve, de figyelmen kívül is van hagyva"
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr "Figyelmeztetés: "
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 msgid "cannot read table of mounted file systems"
 msgstr "a csatolt fájlrendszerek táblája nem olvasható"
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr "nem került feldolgozásra fájlrendszer"
@@ -3766,7 +3849,7 @@ msgstr "nem került feldolgozásra fájlrendszer"
 msgid "H. Peter Anvin"
 msgstr "H. Peter Anvin"
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr "Használat: %s [KAPCSOLÓ]… [F�JL]\n"
@@ -3789,7 +3872,6 @@ msgstr ""
 "  -p, --print-data-base       alapértelmezés kiírása\n"
 
 #: src/dircolors.c:108
-#, fuzzy
 msgid ""
 "\n"
 "If FILE is specified, read it to determine which colors to use for which\n"
@@ -3836,30 +3918,30 @@ msgid "no SHELL environment variable, and no shell type option given"
 msgstr "nincs SHELL változó beállítva és nem adtad meg a shell típusát"
 
 #: src/dirname.c:50
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: %s [OPTION] NAME...\n"
-msgstr "Használat: %s [KAPCSOLÓ] NÉV…\n"
+msgstr "Használat: %s [KAPCSOLÓ]… NÉV…\n"
 
 #: src/dirname.c:54
-#, fuzzy
 msgid ""
 "Output each NAME with its last non-slash component and trailing slashes\n"
 "removed; if NAME contains no /'s, output '.' (meaning the current "
 "directory).\n"
 "\n"
 msgstr ""
-"Kiírja a NEVET az utolsó / összetevőjének eltávolítása után; ha a NÉV nem\n"
+"Kiírja az összes NEVET az utolsó / összetevőjének eltávolítása után; ha a "
+"NÉV nem\n"
 "tartalmaz „/� jeleket, akkor egy „.� lesz a kimenet (ami az aktuális\n"
 "könyvtárat jelenti).\n"
 "\n"
 
 #: src/dirname.c:59
 #, fuzzy
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
-msgstr "  -0, --null     a sorok lezárása a 0 bájttal új sor helyett\n"
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
+msgstr "  -z, --zero     a sorok lezárása a NULL bájttal új sor helyett\n"
 
 #: src/dirname.c:64
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Examples:\n"
@@ -3869,10 +3951,11 @@ msgid ""
 msgstr ""
 "\n"
 "Példák:\n"
-"  %s /usr/bin/      A „/usr� kiírása.\n"
-"  %s stdio.h        A „.� kiírása.\n"
+"  %s /usr/bin/          -> „/usr�\n"
+"  %s kvt1/str kvt2/str  -> „kvt1� majd „kvt2�\n"
+"  %s stdio.h            -> „.�\n"
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -3881,18 +3964,14 @@ msgstr ""
 "Használat: %s [KAPCSOLÓ]… F�JL…\n"
 "  vagy:    %s [KAPCSOLÓ]… --files0-from=F\n"
 
-#: src/du.c:274
-#, fuzzy
+#: src/du.c:285
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
-msgstr ""
-"Összefoglalja minden F�JL lemezhasználatát, könyvtárakra rekurzívan.\n"
-"\n"
+msgstr "Összefoglalja minden F�JL lemezhasználatát, könyvtárakra rekurzívan.\n"
 
-#: src/du.c:280
+#: src/du.c:291
 #, fuzzy
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3900,21 +3979,22 @@ msgid ""
 "                          larger due to holes in ('sparse') files, internal\n"
 "                          fragmentation, indirect blocks, and the like\n"
 msgstr ""
+"  -0, --null            minden egyes új sort a 0 bájttal fejez be új sor "
+"helyett\n"
 "  -a, --all             minden fájl adatait kiírja, nem csak a könyvtárakat\n"
 "      --apparent-size   a tényleges méretet írja ki a lemezhasználat "
 "helyett,\n"
 "                          jóllehet a tényleges méret általában kisebb, "
 "nagyobb\n"
-"                          is lehet a lyukak miatt a (ritka) fájlokban, a "
+"                          is lehet a lyukak miatt a („ritka�) fájlokban, a "
 "belső\n"
 "                          töredezettség, indirekt blokkok és hasonlók miatt\n"
 
-#: src/du.c:289
-#, fuzzy
+#: src/du.c:300
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3925,24 +4005,28 @@ msgid ""
 "                          line argument;  --max-depth=0 is the same as\n"
 "                          --summarize\n"
 msgstr ""
-"  -B, --block-size=MÉRET MÉRET bájtos blokkok használata kiírás előtt.\n"
-"                           Például a „-BM� a méreteket 1,048,576 bájtos\n"
+"  -B, --block-size=MÉRET MÉRET bájtos blokkok használata kiírás előtt\n"
+"                           például a „-BM� a méreteket 1,048,576 bájtos\n"
 "                           egységekben írja ki. Lásd a MÉRET formátumot "
-"alább.\n"
+"alább\n"
 "  -b, --bytes           ugyanaz, mint a „--apparent-size --block-size=1�\n"
 "  -c, --total           összesítést ír ki\n"
 "  -D, --dereference-args csak a parancssorban felsorolt szimbolikus linkek\n"
 "                           törlése\n"
+"  -d, --max-depth=N     egy könyvtár (vagy fájl a --all kapcsolóval)\n"
+"                          összesítésének kiírása csak ha a parancssori\n"
+"                          argumentum alatt N vagy kevesebb szinttel van;\n"
+"                          a --max-depth=0 ugyanaz, mint a --summarize\n"
 
-#: src/du.c:302
-#, fuzzy
+#: src/du.c:313
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
 "      --files0-from=F   az F fájlban megadott, NULL végű fájlnevek\n"
 "                          lemezhasználatának összegzése\n"
@@ -3950,10 +4034,8 @@ msgstr ""
 "neveket\n"
 "  -H                    ugyanaz, mint a --dereference-args (-D)\n"
 "  -h, --human-readable  közérthető formátum (például: 1K 234M 2G)\n"
-"      --si              mint előbb, de 1000-es szorzó 1024-es helyett\n"
 
-#: src/du.c:310
-#, fuzzy
+#: src/du.c:322
 msgid ""
 "  -k                    like --block-size=1K\n"
 "  -L, --dereference     dereference all symbolic links\n"
@@ -3961,28 +4043,27 @@ msgid ""
 "  -m                    like --block-size=1M\n"
 msgstr ""
 "  -k                    mint a --block-size=1K\n"
+"  -L, --dereference     mindig követi a szimbolikus linkeket\n"
 "  -l, --count-links     többször számolja a méretet, ha hard linkek vannak\n"
 "  -m                    mint a  --block-size=1M\n"
 
-#: src/du.c:316
-#, fuzzy
+#: src/du.c:328
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
-"  -L, --dereference     mindig követi a szimbolikus linkeket\n"
 "  -P, --no-dereference  ne kövesse a szimbolikus linkeket\n"
 "                        (ez az alapértelmezés)\n"
-"  -0, --null            minden egyes új sort a 0 bájttal fejez be új sor "
-"helyett\n"
-"  -S, --separate-dirs   alkönyvtárakat nem számolja bele\n"
+"  -S, --separate-dirs   könyvtárak esetén az alkönyvtárakat nem számolja "
+"bele\n"
+"      --si              mint előbb, de 1000-es szorzó 1024-es helyett\n"
 "  -s, --summarize       argumentumonként egy összeget mutat\n"
 
-#: src/du.c:322
-#, fuzzy
+#: src/du.c:334
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
 "                          or entries greater than SIZE if negative\n"
@@ -3991,10 +4072,14 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
-msgstr ""
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
+msgstr ""
+"  -t, --threshold=MÉRET  a MÉRETNÉL kisebb bejegyzések kihagyása, ha "
+"pozitív,\n"
+"                           a MÉRETNÉL nagyobb bejegyzések kihagyása, ha "
+"negatív\n"
 "      --time            a könyvtár bármely fájljának vagy alkönyvtárának "
 "utolsó\n"
 "                          módosítása idejének kiírása\n"
@@ -4007,79 +4092,84 @@ msgstr ""
 "                            „date� parancsnál megadottakhoz hasonlóan kerül\n"
 "                            értelmezésre\n"
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
 "  -x, --one-file-system    skip directories on different file systems\n"
 msgstr ""
+"  -X  --exclude-from=F�JL a F�JLBAN található mintákra illeszkedő fájlok\n"
+"                           kihagyása\n"
+"      --exclude=MINTA   a MINT�RA illeszkedő nevű fájlok kihagyása\n"
+"  -x, --one-file-system a más fájlrendszeren lévő könyvtárak kihagyása\n"
 
-#: src/du.c:386
-#, fuzzy
+#: src/du.c:398
 msgid "Infinity"
-msgstr "Végtelen B"
-
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr ""
+msgstr "Végtelen"
 
-#: src/du.c:624
+#: src/du.c:636
 #, c-format
 msgid "fts_read failed: %s"
 msgstr "az fts_read sikertelen: %s"
 
-#: src/du.c:780
+#: src/du.c:787
 #, c-format
 msgid "invalid maximum depth %s"
 msgstr "érvénytelen maximális mélység: %s"
 
-#: src/du.c:809
-#, fuzzy, c-format
+#: src/du.c:816
+#, c-format
 msgid "invalid --threshold argument '-0'"
-msgstr "érvénytelen --%s argumentum: %s"
+msgstr "érvénytelen --threshold argumentum: „-0�"
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr ""
 "nem lehet egyszerre összesítést kérni és minden bejegyzést megjeleníteni"
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr ""
 "figyelmeztetés: az összesítés megegyezik a --max-depth=0 kapcsoló "
 "használatával"
 
-#: src/du.c:900
+#: src/du.c:911
 #, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr ""
 "figyelmeztetés: az összesítés kérése ütközik a --max-depth=%lu kapcsolóval"
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+"figyelmeztetés: a --apparent-size és -b kapcsolók hatástalanok a --inodes "
+"megadásakor"
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 msgid "file operands cannot be combined with --files0-from"
 msgstr "a fájloperandusok nem kombinálhatók a --files0-from kapcsolóval"
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr "%s: olvasási hiba"
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr ""
 "fájlnevek szabványos bemenetről való olvasásakor a(z) %s fájlnév nem "
 "engedélyezett"
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 msgid "invalid zero-length file name"
 msgstr "érvénytelen nulla hosszúságú fájlnév"
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr "összesen"
 
@@ -4186,17 +4276,16 @@ msgstr "Használat: %s [KAPCSOLÓ]… [-] [NÉV=ÉRTÉK]… [PARANCS [ARG]…]\n
 #: src/env.c:55
 msgid "Set each NAME to VALUE in the environment and run COMMAND.\n"
 msgstr ""
+"Minden egyes NÉVHEZ beállítja az ÉRTÉKET a környezetben és futtatja a "
+"PARANCSOT.\n"
 
 #: src/env.c:61
 #, fuzzy
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
-"Minden egyes NÉVHEZ beállítja az ÉRTÉKET a környezetben és futtatja a "
-"PARANCSOT.\n"
-"\n"
 "  -i, --ignore-environment  indulás üres környezettel\n"
 "  -0, --null           minden kimeneti sor lezárása új sor helyett 0 "
 "bájttal\n"
@@ -4228,7 +4317,6 @@ msgid "cannot specify --null (-0) with command"
 msgstr "a --null (-0) nem adható meg paranccsal együtt"
 
 #: src/expand.c:107
-#, fuzzy
 msgid ""
 "Convert tabs in each FILE to spaces, writing to standard output.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -4278,16 +4366,16 @@ msgid "input line is too long"
 msgstr "a bemeneti sor túl hosszú"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr "Mike Parker"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr "James Youngman"
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
@@ -4296,7 +4384,7 @@ msgstr ""
 "Használat: %s KIFEJEZÉS\n"
 "  vagy:    %s KAPCSOLÓ\n"
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -4314,7 +4402,7 @@ msgstr ""
 "\n"
 "  ARG1 & ARG2       ARG1, ha egyik argumentum sem null vagy 0, egyébként 0\n"
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -4332,7 +4420,7 @@ msgstr ""
 "  ARG1 >= ARG2      ARG1 nagyobb vagy egyenlő ARG2\n"
 "  ARG1 > ARG2       ARG1 nagyobb mint ARG2\n"
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
@@ -4342,7 +4430,7 @@ msgstr ""
 "  ARG1 + ARG2       ARG1 és ARG2 aritmetikai összege\n"
 "  ARG1 - ARG2       ARG1 és ARG2 aritmetikai különbsége\n"
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -4355,7 +4443,7 @@ msgstr ""
 "  ARG1 / ARG2       ARG1 és ARG2 aritmetikai hányadosa\n"
 "  ARG1 % ARG2       ARG1 és ARG2 aritmetikai maradéka\n"
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -4377,8 +4465,7 @@ msgstr ""
 "                                    KARAKTERL�NCBAN, vagy 0\n"
 "  length KARAKTERL�NC             a KARAKTERL�NC hossza\n"
 
-#: src/expr.c:251
-#, fuzzy
+#: src/expr.c:250
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
 "                               keyword like 'match' or an operator like '/'\n"
@@ -4393,7 +4480,7 @@ msgstr ""
 "\n"
 "  ( KIFEJEZÉS )              a KIFEJEZÉS értéke\n"
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -4411,7 +4498,7 @@ msgstr ""
 "nincsenek\n"
 "használva, akkor az illeszkedő karakterek számát vagy 0-t adnak vissza.\n"
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -4424,32 +4511,32 @@ msgstr ""
 "null vagy 0 értékű, 2, ha a KIFEJEZÉS szintaktikailag érvénytelen és 3, ha\n"
 "hiba történt.\n"
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, c-format
 msgid "syntax error"
 msgstr "szintaktikai hiba"
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, c-format
 msgid "error in regular expression matcher"
 msgstr "hiba a szabályos kifejezés illesztésében"
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, c-format
 msgid "non-integer argument"
 msgstr "nem egész argumentum"
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr "osztás nullával"
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr "állítsa be az LC_ALL='C' környezeti változót a probléma megkerüléséhez"
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, c-format
 msgid "the strings compared were %s and %s"
 msgstr "az összehasonlított karakterláncok: %s és %s."
@@ -4457,29 +4544,29 @@ msgstr "az összehasonlított karakterláncok: %s és %s."
 #. This is a proper name. See the gettext manual, section Names.
 #: src/factor.c:111
 msgid "Niels Moller"
-msgstr ""
+msgstr "Niels Moller"
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
-msgstr ""
+msgstr "Lucas prím teszt hiba. Ennek nem lenne szabad megtörténnie"
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
-msgstr ""
+msgstr "squfof sor túlcsordulás"
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, c-format
 msgid "%s is not a valid positive integer"
 msgstr "%s nem egy érvényes pozitív egész"
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr "a(z) %s túl nagy"
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
@@ -4488,7 +4575,7 @@ msgstr ""
 "Használat: %s [SZ�M]…\n"
 "  vagy:    %s KAPCSOLÓ\n"
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
 "are specified on the command line, read them from standard input.\n"
@@ -4527,7 +4614,6 @@ msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n"
 msgstr "Használat: %s [-SZÉLESSÉG] [KAPCSOLÓ]… [F�JL]…\n"
 
 #: src/fmt.c:271
-#, fuzzy
 msgid ""
 "Reformat each paragraph in the FILE(s), writing to standard output.\n"
 "The option -WIDTH is an abbreviated form of --width=DIGITS.\n"
@@ -4535,7 +4621,6 @@ msgstr ""
 "A F�JLOK minden egyes bekezdésének újraformázása és szabványos kimenetre "
 "írása.\n"
 "A -SZÉLESSÉG kapcsoló a --width=SZÉLESSÉG rövidítése.\n"
-"\n"
 
 #: src/fmt.c:278
 msgid ""
@@ -4553,7 +4638,7 @@ msgstr ""
 "  -s, --split-only          hosszú sorok szétvágása, de újratöltés nélkül\n"
 
 #: src/fmt.c:287
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "  -t, --tagged-paragraph    indentation of first line different from second\n"
 "  -u, --uniform-spacing     one space between words, two after sentences\n"
@@ -4563,6 +4648,8 @@ msgstr ""
 "  -t, --tagged-paragraph    az első sor behúzása különbözik a másodikétól\n"
 "  -u, --uniform-spacing     egy szóköz szavak között, kettő mondatok után\n"
 "  -w, --width=SZÉLESSÉG     maximum sorszélesség (alapértelmezés 75 oszlop)\n"
+"  -g, --goal=SZÉLESSÉG      cél szélessége (alapértelmezés a szélesség 93%-"
+"a)\n"
 
 #: src/fmt.c:359
 #, c-format
@@ -4580,7 +4667,6 @@ msgid "invalid width: %s"
 msgstr "érvénytelen szélesség: %s"
 
 #: src/fold.c:70
-#, fuzzy
 msgid ""
 "Wrap input lines in each FILE (standard input by default), writing to\n"
 "standard output.\n"
@@ -4588,7 +4674,6 @@ msgstr ""
 "Minden egyes F�JL (alapértelmezésben a szabványos bemenet) bemeneti "
 "sorainak\n"
 "tördelése és szabványos kimenetre írása.\n"
-"\n"
 
 #: src/fold.c:77
 msgid ""
@@ -4606,17 +4691,17 @@ msgid "invalid number of columns: %s"
 msgstr "érvénytelen oszlopszám: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr "Padraig Brady"
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, c-format
 msgid "Usage: %s\n"
 msgstr "Használat: %s\n"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
@@ -4625,12 +4710,12 @@ msgstr ""
 "formátumban.\n"
 "\n"
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, c-format
 msgid "failed to get groups for user %s"
 msgstr "%s felhasználó csoportjainak lekérése meghiúsult"
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, c-format
 msgid "failed to get groups for the current process"
 msgstr "a jelenlegi folyamat csoportjainak lekérése meghiúsult"
@@ -4655,28 +4740,27 @@ msgstr ""
 "folyamat csoporttagságainak kiírása (ez eltérhet, ha a csoportadatbázis\n"
 "módosult).\n"
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, c-format
 msgid "cannot get real UID"
 msgstr "a valódi felhasználóazonosító nem kérhető le"
 
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, c-format
 msgid "cannot get effective GID"
 msgstr "a hatásos csoportazonosító nem kérhető le"
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, c-format
 msgid "cannot get real GID"
 msgstr "a valódi csoportazonosító nem kérhető le"
 
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, c-format
 msgid "%s: no such user"
 msgstr "%s: nincs ilyen felhasználó"
 
 #: src/head.c:109
-#, fuzzy
 msgid ""
 "Print the first 10 lines of each FILE to standard output.\n"
 "With more than one FILE, precede each with a header giving the file name.\n"
@@ -4686,10 +4770,8 @@ msgstr ""
 "Több F�JL esetén mindegyiket egy fejléc előzi meg, amely megadja a fájl "
 "nevét.\n"
 "Ha a F�JL nincs megadva, vagy -, akkor a szabványos bemenetet olvassa.\n"
-"\n"
 
 #: src/head.c:117
-#, fuzzy
 msgid ""
 "  -c, --bytes=[-]K         print the first K bytes of each file;\n"
 "                             with the leading '-', print all but the last\n"
@@ -4727,58 +4809,48 @@ msgstr ""
 "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
 "GB 1000*1000*1000, G 1024*1024*1024, és ugyanígy T, P, E, Z, Y.\n"
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr "%s: a fájl túl sokat zsugorodott"
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, c-format
 msgid "%s: number of bytes is too large"
 msgstr "%s: a bájtszám túl nagy"
 
-#: src/head.c:440
-#, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr "%s: nem lehet lseek-elni az eredeti pozícióra"
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr "%s: nem lehet a(z) %s eltolásra pozicionálni"
 
-#: src/head.c:673
-#, fuzzy, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "%s: az eltávolítás meghiúsult"
-
-#: src/head.c:798
+#: src/head.c:423 src/tail.c:457
 #, c-format
-msgid "cannot reposition file pointer for %s"
-msgstr "nem lehet újrapozicionálni %s fájlmutatóját"
+msgid "%s: cannot seek to relative offset %s"
+msgstr "%s: nem lehet a(z) %s relatív eltolásra keresni"
 
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr "%s: %s olyan nagy, hogy nem ábrázolható"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr "sorok száma"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr "bájtok száma"
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr "érvénytelen sorszám"
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr "érvénytelen bájtszám"
 
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, c-format
 msgid "invalid trailing option -- %c"
 msgstr "érvénytelen bevezető kapcsoló -- %c"
@@ -4824,43 +4896,53 @@ msgid "cannot determine hostname"
 msgstr "a gépnév nem határozható meg"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr "Arnold Robbins"
 
-#: src/id.c:81
+#: src/id.c:84
 #, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
-msgstr "Használat: %s [KAPCSOLÓ]… [FELHASZN�LÓNÉV]\n"
+msgid "Usage: %s [OPTION]... [USER]\n"
+msgstr "Használat: %s [KAPCSOLÓ]… [FELHASZN�LÓ]\n"
 
-#: src/id.c:82
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
 msgstr ""
-"Információk kiírása a FELHASZN�LÓNÉVR�L vagy (ennek hiányában)\n"
-"az aktuális felhasználóról.\n"
+"Felhasználó- és csoportinformációk kiírása a megadott FELHASZN�LÓRÓL, vagy\n"
+"(ennek hiányában) az aktuális felhasználóról.\n"
 "\n"
-"  -a              figyelmen kívül marad, a más verziókkal való "
+
+#: src/id.c:90
+#, fuzzy
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
+msgstr ""
+"  -a             figyelmen kívül marad, a más verziókkal való "
 "kompatibilitáshoz\n"
-"  -Z, --context   csak a jelenlegi felhasználó biztonsági kontextusának "
+"  -Z, --context  csak a jelenlegi felhasználó biztonsági kontextusának "
 "kiírása\n"
-"  -g, --group     csak a hatásos csoportazonosító kiírása\n"
-"  -G, --groups    az összes csoportazonosító kiírása\n"
-"  -n, --name      egy név kiírása egy szám helyett, az -ugG kapcsolókhoz\n"
-"  -r, --real      a valódi azonosító kiírása a hatásos helyett, az -ugG\n"
-"                    kapcsolókkal\n"
-"  -u, --user      csak a hatásos felhasználói azonosító kiírása\n"
+"  -g, --group    csak a hatásos csoportazonosító kiírása\n"
+"  -G, --groups   az összes csoportazonosító kiírása\n"
+"  -n, --name     egy név kiírása egy szám helyett, az -ugG kapcsolókhoz\n"
+"  -r, --real     a valódi azonosító kiírása a hatásos helyett, az -ugG\n"
+"                   kapcsolókkal\n"
+"  -u, --user     csak a hatásos felhasználói azonosító kiírása\n"
+"  -z, --zero     bejegyzések elválasztása NULL karakterekkel üres helyek "
+"helyett;\n"
+"                   nem engedélyezett az alapértelmezett formátumban\n"
 
-#: src/id.c:96
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
@@ -4868,118 +4950,128 @@ msgstr ""
 "\n"
 "KAPCSOLÓK nélkül az azonosított információk egy hasznos halmazát írja ki.\n"
 
-#: src/id.c:140
+#: src/id.c:151
+#, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr "a --context (-Z) csak SELinux/SMACK-képes rendszermagokkal működik"
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr "a --context (-Z) csak SELinux-képes rendszermagokkal működik"
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr "a biztonsági kontextus nem írható ki, ha meg van adva felhasználó"
 
-#: src/id.c:178
+#: src/id.c:198
 #, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr "nem írható ki „csak� több választás"
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr ""
 "csak nevek vagy valódi azonosítók nem írhatók ki az alapértelmezett "
 "formátumban"
 
-#: src/id.c:199
+#: src/id.c:209
+#, c-format
+msgid "option --zero not permitted in default format"
+msgstr "a --zero kapcsoló nem engedélyezett az alapértelmezett formátumban"
+
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
 msgstr "a kontextus nem dolgozható fel"
 
-#: src/id.c:224
+#: src/id.c:265
 #, c-format
 msgid "cannot get effective UID"
 msgstr "a hatásos felhasználóazonosító nem kérhető le"
 
-#: src/id.c:311
-#, fuzzy, c-format
+#: src/id.c:354
+#, c-format
 msgid "cannot find name for user ID %s"
-msgstr "nem található a név a(z) %lu felhasználói azonosítóhoz"
+msgstr "nem található a név a(z) %s felhasználói azonosítóhoz"
 
-#: src/id.c:329
-#, fuzzy, c-format
+#: src/id.c:372
+#, c-format
 msgid "uid=%s"
-msgstr "uid=%lu"
+msgstr "uid=%s"
 
-#: src/id.c:334
-#, fuzzy, c-format
+#: src/id.c:377
+#, c-format
 msgid " gid=%s"
-msgstr " gid=%lu"
+msgstr " gid=%s"
 
-#: src/id.c:341
-#, fuzzy, c-format
+#: src/id.c:384
+#, c-format
 msgid " euid=%s"
-msgstr " euid=%lu"
+msgstr " euid=%s"
 
-#: src/id.c:349
-#, fuzzy, c-format
+#: src/id.c:392
+#, c-format
 msgid " egid=%s"
-msgstr " egid=%lu"
+msgstr " egid=%s"
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr " csoportok="
 
-#: src/id.c:393
+#: src/id.c:437
 #, c-format
 msgid " context=%s"
 msgstr " kontextus=%s"
 
-#: src/install.c:373
+#: src/install.c:376
 #, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr "figyelmeztetés: %s: nem módosítható a kontextus a következőre: %s"
 
-#: src/install.c:414
+#: src/install.c:417
 #, c-format
 msgid "creating directory %s"
 msgstr "%s könyvtár létrehozása"
 
-#: src/install.c:482
+#: src/install.c:485
 #, c-format
 msgid "cannot change ownership of %s"
 msgstr "%s tulajdonosa nem változtatható meg"
 
-#: src/install.c:506
+#: src/install.c:509
 #, c-format
 msgid "cannot set time stamps for %s"
 msgstr "%s időbélyegei nem állíthatók be"
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, c-format
 msgid "fork system call failed"
 msgstr "a fork() rendszerhívás sikertelen"
 
-#: src/install.c:531
+#: src/install.c:535
 #, c-format
 msgid "cannot run %s"
 msgstr "a(z) %s nem futtatható"
 
-#: src/install.c:535
+#: src/install.c:539
 #, c-format
 msgid "waiting for strip"
 msgstr "várakozás a strip programra"
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr "A strip folyamat hibával fejeződött be"
 
-#: src/install.c:558
+#: src/install.c:565
 #, c-format
 msgid "invalid user %s"
 msgstr "érvénytelen felhasználó: %s"
 
-#: src/install.c:594
+#: src/install.c:601
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -4992,8 +5084,7 @@ msgstr ""
 "  vagy:    %s [KAPCSOLÓ]… -t KÖNYVT�R FORR�S…\n"
 "  vagy:    %s [KAPCSOLÓ]… -d KÖNYVT�R…\n"
 
-#: src/install.c:601
-#, fuzzy
+#: src/install.c:608
 msgid ""
 "\n"
 "This install program copies files (often just compiled) into destination\n"
@@ -5018,9 +5109,8 @@ msgstr ""
 "KÖNYVT�RBA másolja a fájlokat. Másolás közben beállítja a fájlok\n"
 "jogosultságait és a tulajdonosát/csoportját.\n"
 "A negyedik alaknál létrehozza az adott KÖNYVT�RAK minden elemét.\n"
-"\n"
 
-#: src/install.c:615
+#: src/install.c:622
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
 "  -b                  like --backup but does not accept an argument\n"
@@ -5039,7 +5129,7 @@ msgstr ""
 "  -d, --directory     minden argumentum könyvtárnév; a megadott könyvtárak\n"
 "                        minden elemét létrehozza\n"
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -5057,7 +5147,7 @@ msgstr ""
 "                        rwxr-xr-x helyett\n"
 "  -o, --owner=TULAJDONOS tulajdonos beállítása (csak root)\n"
 
-#: src/install.c:631
+#: src/install.c:638
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
 "files\n"
@@ -5082,17 +5172,27 @@ msgstr ""
 "  -T, --no-target-directory  a CÉL kezelése normál fájlként\n"
 "  -v, --verbose       minden létrehozott könyvtár nevét kiírja\n"
 
-#: src/install.c:641
+#: src/install.c:648
+#, fuzzy
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
 "      --preserve-context   a SELinux biztonsági kontextus megőrzése\n"
-"  -Z, --context=KONTEXTUS  fájlok és könyvtárak SELinux biztonsági\n"
-"                             kontextusának beállítása\n"
+"  -Z, --context[=KTX]      a célfájl SELinux biztonsági kontextusának "
+"beállítása\n"
+"                             az alapértelmezett típusra vagy a megadott KTX-"
+"re\n"
+
+#: src/install.c:696 src/unlink.c:86
+#, c-format
+msgid "cannot unlink %s"
+msgstr "%s törlése sikertelen"
 
-#: src/install.c:859
+#: src/install.c:877
 #, c-format
 msgid ""
 "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
@@ -5100,54 +5200,41 @@ msgstr ""
 "FIGYELMEZTETÉS: a --preserve-context figyelmen kívül marad; ez a rendszermag "
 "nem SELinux-képes."
 
-#: src/install.c:869
-#, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
-msgstr ""
-"FIGYELMEZTETÉS: a --context (-Z) figyelmen kívül marad; ez a rendszermag nem "
-"SELinux-képes."
-
-#: src/install.c:886
+#: src/install.c:917
 #, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr "könyvtár telepítésénél nem használható a „strip� kapcsoló"
 
-#: src/install.c:889
+#: src/install.c:920
 #, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr "könyvtár telepítésénél nem engedélyezett a célkönyvtár"
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr ""
-"a cél kontextusa nem kényszeríthető a következőre: %s és nem és őrizhető meg"
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, c-format
 msgid "invalid mode %s"
 msgstr "érvénytelen mód: %s"
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr ""
 "FIGYELMEZTETÉS: a --strip-program kapcsoló figyelmen kívül marad, mivel a -s "
 "kapcsoló nincs megadva"
 
-#: src/install.c:959
+#: src/install.c:1001
 #, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr ""
 "a --compare (-C) és az --preserve-timestamps kapcsolók egymást kölcsönösen "
 "kizárják"
 
-#: src/install.c:966
+#: src/install.c:1008
 #, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr "a --compare (-C) és --strip kapcsolók egymást kölcsönösen kizárják"
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -5161,7 +5248,7 @@ msgstr ""
 msgid "Mike Haertel"
 msgstr "Mike Haertel"
 
-#: src/join.c:191
+#: src/join.c:195
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
 "standard output.  The default join field is the first, delimited\n"
@@ -5186,8 +5273,7 @@ msgstr ""
 "                      megfelelően.\n"
 "  -e ÜRES           a hiányzó bemeneti mezők helyettesítése az ÜRESSEL\n"
 
-#: src/join.c:200
-#, fuzzy
+#: src/join.c:204
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
 "  -j FIELD          equivalent to '-1 FIELD -2 FIELD'\n"
@@ -5202,7 +5288,7 @@ msgstr ""
 "  -t KARAKTER       a KARAKTER használata a bementi és kimeneti mező\n"
 "                      elválasztójaként\n"
 
-#: src/join.c:206
+#: src/join.c:210
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
 "  -1 FIELD          join on this FIELD of file 1\n"
@@ -5224,8 +5310,13 @@ msgstr ""
 "  --header          minden fájl első sorát mezőfejlécnek tekinti,\n"
 "                      ezeket a párosításukra tett kísérlet nélkül írja ki\n"
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
 #, fuzzy
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr ""
+"  -z, --zero-terminated     a sorok lezárása a 0 bájttal új sor helyett\n"
+
+#: src/join.c:225
 msgid ""
 "\n"
 "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n"
@@ -5266,47 +5357,47 @@ msgstr ""
 "szabályait. Ha a bemenet nincs rendezve, és egyes sorok nem kapcsolhatók\n"
 "össze, akkor figyelmeztető üzenet jelenik meg.\n"
 
-#: src/join.c:403
-#, fuzzy, c-format
+#: src/join.c:410
+#, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
-msgstr "%s:%ju: nincs rendezve: %.*s"
+msgstr "%s:%<PRIuMAX>: nincs rendezve: %.*s"
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, c-format
 msgid "invalid field number: %s"
 msgstr "érvénytelen mezőszám: %s"
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, c-format
 msgid "invalid field specifier: %s"
 msgstr "érvénytelen mezőmeghatározás: %s"
 
-#: src/join.c:877
+#: src/join.c:884
 #, c-format
 msgid "invalid file number in field spec: %s"
 msgstr "érvénytelen mezőszám a mezőspecifikációban: %s"
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr "inkompatibilis összekapcsolási mezők: %lu, %lu"
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr "ütköző üres-mező helyettesítési karakterlánc"
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, c-format
 msgid "multi-character tab %s"
 msgstr "többkarakteres tab: %s"
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr "nem kompatibilis tabok"
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr "mindkét fájl nem lehet a szabványos bemenet"
@@ -5323,11 +5414,8 @@ msgstr ""
 "  vagy:    %s -t [SZIGN�L]…\n"
 
 #: src/kill.c:82
-#, fuzzy
 msgid "Send signals to processes, or list signals.\n"
-msgstr ""
-"Szignálok küldése folyamatoknak, vagy szignálok felsorolása\n"
-"\n"
+msgstr "Szignálok küldése folyamatoknak, vagy szignálok felsorolása\n"
 
 #: src/kill.c:88
 msgid ""
@@ -5344,7 +5432,6 @@ msgstr ""
 "  -t, --table      szignálinformációkat tartalmazó táblázat kiírása\n"
 
 #: src/kill.c:96
-#, fuzzy
 msgid ""
 "\n"
 "SIGNAL may be a signal name like 'HUP', or a signal number like '1',\n"
@@ -5430,47 +5517,47 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr "%s link nem hozható létre a következőre: %s"
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr "%s: könyvtárra mutató hard link nem engedélyezett"
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, c-format
 msgid "%s: cannot overwrite directory"
 msgstr "%s: a könyvtár nem írható felül"
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
 msgstr "%s: %s cseréje? "
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, c-format
 msgid "failed to create symbolic link %s"
 msgstr "%s szimbolikus link létrehozása meghiúsult"
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr "%s -> %s szimbolikus link nem hozható létre"
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr "hard link létrehozása meghiúsult a következőre: %.0s%s"
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, c-format
 msgid "failed to create hard link %s"
 msgstr "%s hard link nem hozható létre"
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, c-format
 msgid "failed to create hard link %s => %s"
 msgstr "%s -> %s hard link nem hozható létre"
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -5483,8 +5570,7 @@ msgstr ""
 "  vagy:    %s [KAPCSOLÓ]… CÉL… KÖNYVT�R       (3. alak)\n"
 "  vagy:    %s [KAPCSOLÓ]… -t KÖNYVT�R… CÉL… (4. alak)\n"
 
-#: src/ln.c:381
-#, fuzzy
+#: src/ln.c:398
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
 "In the 2nd form, create a link to TARGET in the current directory.\n"
@@ -5506,9 +5592,8 @@ msgstr ""
 "léteznie\n"
 "kell. A szimbolikus linkek tetszőleges szöveget tartalmazhatnak, későbbi\n"
 "feloldáskor a relatív linkek szülőkönyvtárukhoz képest lesznek értelmezve.\n"
-"\n"
 
-#: src/ln.c:394
+#: src/ln.c:411
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
 "file\n"
@@ -5528,8 +5613,7 @@ msgstr ""
 "is)\n"
 "  -f, --force                létező célfájlok törlése\n"
 
-#: src/ln.c:402
-#, fuzzy
+#: src/ln.c:419
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
 "  -L, --logical               dereference TARGETs that are symbolic links\n"
@@ -5548,10 +5632,12 @@ msgstr ""
 "  -P, --physical              hard linkek létrehozása közvetlenül a "
 "szimbolikus\n"
 "                                linkekre\n"
+"  -r, --relative              szimbolikus linkek létrehozása a link "
+"helyéhez                                 képest\n"
 "  -s, --symbolic              szimbolikus linkek létrehozása hard linkek "
 "helyett\n"
 
-#: src/ln.c:411
+#: src/ln.c:428
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
 "  -t, --target-directory=DIRECTORY  specify the DIRECTORY in which to "
@@ -5569,27 +5655,28 @@ msgstr ""
 "fájlként\n"
 "  -v, --verbose               linkelés előtt kiírja minden fájl nevét\n"
 
-#: src/ln.c:433
-#, fuzzy, c-format
+#: src/ln.c:450
+#, c-format
 msgid ""
 "\n"
 "Using -s ignores -L and -P.  Otherwise, the last option specified controls\n"
 "behavior when a TARGET is a symbolic link, defaulting to %s.\n"
 msgstr ""
+"\n"
 "A -s használata figyelmen kívül hagyja a -L és -P kapcsolókat. Ellenkező\n"
 "esetben az utoljára megadott kapcsoló vezérli a viselkedést, ha a CÉL\n"
 "szimbolikus link, alapértelmezésben %s.\n"
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr ""
 "a --target-directory és a --no-target-directory nem használhatók együtt"
 
-#: src/ln.c:588
-#, fuzzy, c-format
+#: src/ln.c:605
+#, c-format
 msgid "cannot do --relative without --symbolic"
-msgstr "%s szimbolikus link nem hozható létre"
+msgstr "a --relative nem használható a --symbolic nélkül"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/logname.c:30
@@ -5619,7 +5706,7 @@ msgstr "nincs bejelentkezési név"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 msgid "%b %e  %Y"
 msgstr "%Y %b %e"
 
@@ -5628,102 +5715,100 @@ msgstr "%Y %b %e"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 msgid "%b %e %H:%M"
 msgstr "%b %e %H.%M"
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr ""
 "a QUOTING_STYLE környezeti változóban megadott érvénytelen érték\n"
 "figyelmen kívül hagyása: %s"
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr ""
 "a COLUMNS környezeti változóban megadott érvénytelen szélesség\n"
 "figyelmen kívül hagyása: %s"
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr ""
 "a TABSIZE környezeti változóban megadott érvénytelen tabulátorméret\n"
 "figyelmen kívül hagyása: %s"
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, c-format
 msgid "invalid line width: %s"
 msgstr "érvénytelen sorhossz: %s"
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, c-format
 msgid "invalid tab size: %s"
 msgstr "érvénytelen tabulátorméret: %s"
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, c-format
 msgid "invalid time style format %s"
 msgstr "érvénytelen időformátum stílus: %s"
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 msgid "Valid arguments are:\n"
 msgstr "Az érvényes argumentumok a következők:\n"
 
-#: src/ls.c:2061
-#, fuzzy
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr "  - +FORM�TUM (pl.: +%H:%M) a „date�-stílusú formátumért\n"
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr "hiba a hónap karakterláncok előkészítésekor"
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, c-format
 msgid "unrecognized prefix: %s"
 msgstr "ismeretlen előtag: %s"
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr "az LS_COLORS környezeti változó értéke nem értelmezhető"
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, c-format
 msgid "cannot open directory %s"
 msgstr "nem lehet a következő könyvtárat megnyitni: %s"
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, c-format
 msgid "cannot determine device and inode of %s"
 msgstr "%s eszközét és inode-ját nem lehet megállapítani"
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, c-format
 msgid "%s: not listing already-listed directory"
 msgstr "%s: a már listázott könyvtár nem kerül listázásra"
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, c-format
 msgid "reading directory %s"
 msgstr "%s könyvtár olvasása"
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, c-format
 msgid "closing directory %s"
 msgstr "%s könyvtár bezárása"
 
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, c-format
 msgid "cannot compare file names %s and %s"
 msgstr "%s és %s fájlnevek nem hasonlíthatók össze"
 
-#: src/ls.c:4721
-#, fuzzy
+#: src/ls.c:4781
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
 "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n"
@@ -5731,9 +5816,8 @@ msgstr ""
 "Információt ír ki a F�JLOKRÓL, alapértelmezésben az aktuális könyvtárról.\n"
 "�bécé sorrendbe rendezi a bejegyzéseket, ha nincs megadva a -cftuvSUX\n"
 "vagy a --sort kapcsolók valamelyike.\n"
-"\n"
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
 "  -A, --almost-all           do not list implied . and ..\n"
@@ -5748,24 +5832,23 @@ msgstr ""
 "  -b, --escape               C-stílusú escape karaktereket jelenít meg\n"
 "                               a nem-grafikus karakterek helyett\n"
 
-#: src/ls.c:4734
-#, fuzzy
+#: src/ls.c:4794
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
 "      --block-size=MÉRET     a méretek növelése MÉRET bájttal kiírás előtt.\n"
 "                               Például a „-BM� a méreteket 1,048,576 bájtos\n"
 "                               egységekben írja ki. Lásd a MÉRET formátumot "
-"alább.\n"
+"alább\n"
 "  -B, --ignore-backups       nem listázza ki a ~-ra végződő fájlokat\n"
 "  -c                         „-lt�-vel: rendezés és kiírás ctime "
 "(fájlállapot-\n"
@@ -5775,30 +5858,25 @@ msgstr ""
 "                               szerint, egyébként: rendezés ctime szerint,\n"
 "                               legújabb előre\n"
 
-#: src/ls.c:4744
-#, fuzzy
+#: src/ls.c:4804
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 "  -C                         oszlopok szerinti listázás\n"
-"      --color[=EKKOR]        beállítja, hogy mikor legyen színes a kimenet\n"
-"                               (fájltípusok szerint). Az EKKOR lehet "
-"„always�,\n"
-"                               „never� vagy „auto�, további információk "
+"      --color[=EKKOR]        kimenet színezése, az EKKOR lehet „never�, "
+"„auto�\n"
+"                               vagy „always� (alap), további információk "
 "alább\n"
 "  -d, --directory            könyvtár listázása a könyvtár tartalma helyett\n"
-"                               és ne kövesse a szimbolikus linkeket\n"
-"  -D, --dired                az Emacs dired módja által használt kimenet\n"
+"  -D, --dired                az Emacs dired módjához tervezett kimenet\n"
 
-#: src/ls.c:4752
-#, fuzzy
+#: src/ls.c:4812
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
 "  -F, --classify             append indicator (one of */=>@|) to entries\n"
@@ -5820,15 +5898,16 @@ msgstr ""
 "                               vertical: -C\n"
 "      --full-time            mint a -l --time-style=full-iso\n"
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr "  -g                         mint a -l, de tulajdonos kiírása nélkül\n"
 
-#: src/ls.c:4763
+#: src/ls.c:4823
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 "      --group-directories-first\n"
@@ -5837,10 +5916,11 @@ msgstr ""
 "                               --sort=none (-U) használata letiltja a\n"
 "                               csoportosítást\n"
 
-#: src/ls.c:4769
+#: src/ls.c:4829
+#, fuzzy
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
@@ -5850,20 +5930,21 @@ msgstr ""
 "  -H, --si                   ugyanaz mint előbb, de a szorzó 1024 helyett "
 "1000\n"
 
-#: src/ls.c:4775
+#: src/ls.c:4835
 msgid ""
 "  -H, --dereference-command-line\n"
 "                             follow symbolic links listed on the command "
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
 msgstr ""
-"  -H, --dereference-command-line  parancssorban megadott szimbolikus linkek\n"
-"                               követése\n"
+"  -H, --dereference-command-line\n"
+"                             parancssorban megadott szimbolikus linkek "
+"követése\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             minden egyes parancssori szimbolikus link "
 "követése\n"
@@ -5872,7 +5953,7 @@ msgstr ""
 "illeszkedő\n"
 "                               bejegyzéseket (a -a vagy -A felülbírálja)\n"
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
 "names:\n"
@@ -5881,7 +5962,7 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 "      --indicator-style=SZÓ  a bejegyzésnevekhez jelet fűz a SZÓ alapján:\n"
 "                               none (alapértelmezett), slash (-p),\n"
@@ -5890,9 +5971,10 @@ msgstr ""
 "  -I, --ignore=MINTA         nem írja ki a parancsértelmező MINT�RA "
 "illeszkedő\n"
 "                               bejegyzéseket\n"
-"  -k, --kibibytes            1024 bájtos blokkok használata\n"
+"  -k, --kibibytes            alapesetben 1024 bájtos blokkok "
+"lemezhasználathoz\n"
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -5909,7 +5991,7 @@ msgstr ""
 "  -m                         a szélességet a bejegyzések vesszővel\n"
 "                               elválasztott listájával tölti ki\n"
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -5929,12 +6011,11 @@ msgstr ""
 "  -p, --indicator-style=slash\n"
 "                             egy / jelet fűz a könyvtárakhoz\n"
 
-#: src/ls.c:4811
-#, fuzzy
+#: src/ls.c:4871
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -5951,7 +6032,7 @@ msgstr ""
 "                               literal, locale, shell, shell-always, c, "
 "escape\n"
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
 "  -R, --recursive            list subdirectories recursively\n"
@@ -5962,42 +6043,45 @@ msgstr ""
 "  -R, --recursive            alkönyvtárak rekurzív listázása\n"
 "  -s, --size                 az egyes fájlok méretének kiírása blokkban\n"
 
-#: src/ls.c:4825
+#: src/ls.c:4886
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 "  -S                         rendezés fájlméret alapján\n"
-"      --sort=SZÓ             rendezés a SZÓ szerint a név helyett, a SZÓ\n"
-"                               érvényes értékei és a kapcsoló, amelynek\n"
-"                               megfelelnek: extension -X, size -S,\n"
-"                               time -t, version -v\n"
+"      --sort=SZÓ             rendezés a SZÓ szerint a név helyett: none (-"
+"U),\n"
+"                               size (-S), time (-t), version (-v), "
+"extension\n"
+"                               (-X)\n"
 "      --time=SZÓ             a -l kapcsolóval együtt használva az időt a "
 "SZÓNAK\n"
 "                               megfelelően mutatja a módosítás ideje "
 "helyett:\n"
-"                               atime: -u, access: -u, use: -u, ctime: -c "
-"vagy\n"
-"                               status: -c; a megadott idő alapján rendez,\n"
+"                               atime vagy access vagy use (-u), ctime vagy\n"
+"                               status (-c); a megadott idő alapján rendez,\n"
 "                               ha a --sort=time kapcsoló meg van adva\n"
 
-#: src/ls.c:4835
-#, fuzzy
+#: src/ls.c:4896
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
 msgstr ""
 "      --time-style=ST�LUS    a -l kapcsolóval együtt használva az időt a\n"
 "                               ST�LUSNAK megfelelő formátumban mutatja:\n"
@@ -6013,7 +6097,7 @@ msgstr ""
 "                               csak a POSIX területi beállításokon kívül\n"
 "                               lép életbe.\n"
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 msgid ""
 "  -t                         sort by modification time, newest first\n"
 "  -T, --tabsize=COLS         assume tab stops at each COLS instead of 8\n"
@@ -6022,10 +6106,10 @@ msgstr ""
 "előre\n"
 "  -T, --tabsize=OSZL         tabulátor minden OSZL-nál, 8 helyett\n"
 
-#: src/ls.c:4848
+#: src/ls.c:4912
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
@@ -6041,13 +6125,13 @@ msgstr ""
 "  -v                         rendezés a szövegben lévő (verzió)számok "
 "szerint\n"
 
-#: src/ls.c:4855
+#: src/ls.c:4919
+#, fuzzy
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 "  -w, --width=OSZL           feltételezi, hogy a képernyő OSZL széles\n"
@@ -6058,7 +6142,7 @@ msgstr ""
 "                               kontextusának kiírása\n"
 "  -1                         soronként egy fájlnevet ír ki\n"
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -6074,7 +6158,7 @@ msgstr ""
 "változóval módosíthatók a beállítások, ehhez a dircolors parancs "
 "használható.\n"
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -6138,7 +6222,7 @@ msgstr ""
 
 #: src/md5sum.c:184
 msgid "      --tag            create a BSD-style checksum\n"
-msgstr ""
+msgstr "      --tag            BSD-stílusú ellenőrzőösszeg létrehozása\n"
 
 #: src/md5sum.c:188
 msgid ""
@@ -6154,30 +6238,26 @@ msgstr "  -t, --text           olvasás szöveges módban (alapértelmezett)\n"
 #: src/md5sum.c:195
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
 "\n"
-"Az alábbi három kapcsoló csak ellenőrzőösszegek ellenőrzésekor hasznos:\n"
+"Az alábbi négy kapcsoló csak ellenőrzőösszegek ellenőrzésekor hasznos:\n"
 "      --quiet          ne írja ki az OK-t minden sikeres ellenőrzéskor\n"
 "      --status         ne írjon ki semmit, az állapotkód jelzi a sikert\n"
+"      --strict         kilépés nem nullával a hibásan formázott\n"
+"                         ellenőrzőösszeg-sorokhoz\n"
 "  -w, --warn           figyelmeztessen a helytelenül formázott\n"
 "                         ellenőrzőösszeg-sorokra\n"
 "\n"
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-"      --strict         a --check kapcsolóval: nem nulla értékkel lép ki "
-"minden\n"
-"                         érvénytelen bemenet esetén\n"
-
-#: src/md5sum.c:208
-#, fuzzy, c-format
+#: src/md5sum.c:206
+#, c-format
 msgid ""
 "\n"
 "The sums are computed as described in %s.  When checking, the input\n"
@@ -6192,177 +6272,197 @@ msgstr ""
 "karakter („*� = bináris, szóköz = szöveg) és egy név kiírása minden egyes "
 "F�JLHOZ.\n"
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, c-format
 msgid "%s: too many checksum lines"
 msgstr "%s: túl sok ellenőrzőösszeg-sor"
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr "%s: %<PRIuMAX>: nem megfelelően formázott %s ellenőrzőösszeg-sor"
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr "%s: a megnyitás vagy olvasás meghiúsult\n"
 
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr "HIB�S"
 
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr "RENDBEN"
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr "%s: nem találhatók megfelelően formázott %s ellenőrzőösszeg sorok"
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
 msgstr[0] "FIGYELMEZTETÉS: %<PRIuMAX> sor nem megfelelően formázott"
 msgstr[1] "FIGYELMEZTETÉS: %<PRIuMAX> sor nem megfelelően formázott"
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
 msgstr[0] "FIGYELMEZTETÉS: %<PRIuMAX> felsorolt fájl nem olvasható"
 msgstr[1] "FIGYELMEZTETÉS: %<PRIuMAX> felsorolt fájl nem olvasható"
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
 msgstr[0] "FIGYELMEZTETÉS: %<PRIuMAX> számított ellenőrzőösszeg NEM egyezett"
 msgstr[1] "FIGYELMEZTETÉS: %<PRIuMAX> számított ellenőrzőösszeg NEM egyezett"
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
-msgstr ""
+msgstr "a --tag nem támogatja a --text módot"
 
-#: src/md5sum.c:766
-#, fuzzy, c-format
+#: src/md5sum.c:770
+#, c-format
 msgid "the --tag option is meaningless when verifying checksums"
-msgstr "a --status kapcsoló csak ellenőrzőösszegek ellenőrzésekor értelmes"
+msgstr "a --tag kapcsoló értelmetlen ellenőrzőösszegek ellenőrzésekor"
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
 msgstr ""
 "a --binary és --text kapcsolók értelmetlenek ellenőrzőösszegek ellenőrzésekor"
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr "a --status kapcsoló csak ellenőrzőösszegek ellenőrzésekor értelmes"
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr "a --warn kapcsoló csak ellenőrzőösszegek ellenőrzésekor értelmes"
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr "a --quiet kapcsoló csak ellenőrzőösszegek ellenőrzésekor értelmes"
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr "a --strict kapcsoló csak ellenőrzőösszegek ellenőrzésekor értelmes"
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr "Használat: %s [KAPCSOLÓ]… KÖNYVT�R…\n"
 
-#: src/mkdir.c:57
-#, fuzzy
+#: src/mkdir.c:59
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
 msgstr "KÖNYVT�RAKAT hoz létre, ha még nem léteznek.\n"
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
+#, fuzzy
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 "  -m, --mode=MÓD    fájlmód beállítása, (mint a chmod), nem a=rwx - umask\n"
 "  -p, --parents     könyvtárstruktúrát hoz létre. Nem ad hibát, ha már "
 "létezik\n"
 "  -v, --verbose     üzenetet ír ki minden egyes létrehozott könyvtárhoz\n"
-"  -Z, --context=KTX  minden létrehozott könyvtár SELinux biztonsági\n"
-"                       kontextusának beállítása a KTX-re\n"
+"  -Z, --context[=KTX]  minden létrehozott könyvtár SELinux biztonsági\n"
+"                         kontextusának beállítása az alapértelmezett "
+"típusra,\n"
+"                         vagy ha meg van adva, a KTX-re\n"
 
-#: src/mkdir.c:168
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/mkdir.c:127 src/mkdir.c:172
+#, c-format
+msgid "failed to set default creation context for %s"
+msgstr ""
+"az alapértelmezett létrehozási kontextus beállítása meghiúsult ehhez: %s"
+
+#: src/mkdir.c:191
+#, c-format
+msgid "failed to restore context for %s"
+msgstr "%s kontextusának visszaállítása meghiúsult"
+
+#: src/mkdir.c:231
 #, c-format
 msgid "created directory %s"
 msgstr "%s könyvtár létrejött"
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr ""
+"figyelmeztetés: a --context figyelmen kívül marad; SELinux/SMACK-képes "
+"kernelt igényel"
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr "Használat: %s [KAPCSOLÓ] NÉV…\n"
 
-#: src/mkfifo.c:52
-#, fuzzy
+#: src/mkfifo.c:54
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
-msgstr ""
-"NÉV nevű névvel rendelkező adatcsatornát (FIFO-t) hoz létre.\n"
-"\n"
+msgstr "NÉV nevű névvel rendelkező adatcsatornát (FIFO-t) hoz létre.\n"
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
 msgstr ""
 "  -m, --mode=MÓD    fájljogosultságok beállítása a MÓDRA, nem a=rw - umask\n"
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
-"  -Z, --context=KTX  minden NÉV SELinux biztonsági kontextusának beállítása "
-"a\n"
-"                       KTX-re\n"
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, c-format
 msgid "invalid mode"
 msgstr "érvénytelen mód"
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr "a mód csak fájljogosultságbiteket adhat meg"
 
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
+#, c-format
+msgid "cannot set permissions of %s"
+msgstr "nem lehet %s jogosultságait beállítani"
+
+#: src/mknod.c:54
 #, c-format
 msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr "Használat: %s [KAPCSOLÓ]… NÉV T�PUS [MAJOR MINOR]\n"
 
-#: src/mknod.c:54
-#, fuzzy
+#: src/mknod.c:56
 msgid "Create the special file NAME of the given TYPE.\n"
-msgstr ""
-"Az adott NEVŰ és T�PUSÚ speciális fájl létrehozása.\n"
-"\n"
-
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr ""
-"  -Z, --context=KTX  a NÉV SELinux biztonsági kontextusának beállítása a KTX-"
-"re\n"
+msgstr "Az adott NEVŰ és T�PUSÚ speciális fájl létrehozása.\n"
 
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -6379,7 +6479,7 @@ msgstr ""
 "egyébként\n"
 "decimálisan. A T�PUS az alábbiak egyike lehet:\n"
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 msgid ""
 "\n"
 "  b      create a block (buffered) special file\n"
@@ -6391,58 +6491,57 @@ msgstr ""
 "  c, u   speciális karakterfájl (nem-pufferelt) létrehozása\n"
 "  p      FIFO létrehozása\n"
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 msgid "Special files require major and minor device numbers."
 msgstr ""
 "Speciális fájlok létrehozásakor meg kell adni major és minor\n"
 "eszközszámokat."
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 msgid "Fifos do not have major and minor device numbers."
 msgstr "A Fifo-k nem rendelkeznek major és minor eszközszámokkal."
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, c-format
 msgid "block special files not supported"
 msgstr "a speciális blokkfájl nem támogatott"
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, c-format
 msgid "character special files not supported"
 msgstr "a speciális karakterfájl nem támogatott"
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, c-format
 msgid "invalid major device number %s"
 msgstr "érvénytelen major eszközszám: %s"
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, c-format
 msgid "invalid minor device number %s"
 msgstr "érvénytelen minor eszközszám: %s"
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, c-format
 msgid "invalid device %s %s"
 msgstr "érvénytelen eszköz %s %s"
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, c-format
 msgid "invalid device type %s"
 msgstr "érvénytelen eszköztípus: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr "Eric Blake"
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr "Használat: %s [KAPCSOLÓ]… [SABLON]\n"
 
-#: src/mktemp.c:69
-#, fuzzy
+#: src/mktemp.c:67
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
 "TEMPLATE must contain at least 3 consecutive 'X's in last component.\n"
@@ -6454,14 +6553,14 @@ msgstr ""
 "összetevőben. Ha a SABLON nincs megadva, akkor a tmp.XXXXXXXXXX kerül\n"
 "felhasználásra, és a --tmpdir is felhasználásra kerül.\n"
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
 "A Fájlok u+rw, a könyvtárak u+rwx mínusz az umask korlátozásaival jönnek "
 "létre.\n"
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
@@ -6473,103 +6572,95 @@ msgstr ""
 "  -q, --quiet         a fájl/könyvtár-létrehozási hibáról szóló diagnosztika "
 "elnyomása\n"
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
 "      --suffix=UTÓTAG   az UTÓTAG hozzáfűzése a SABLONHOZ. Az UTÓTAG nem\n"
 "                          tartalmazhat osztásjelet. Ez a kapcsoló akkor "
 "kerül\n"
-"                          felhasználásra, ha a SABLON nem X-re végződik.\n"
+"                          felhasználásra, ha a SABLON nem X-re végződik\n"
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
-"  --tmpdir[=KVT]   a SABLON értelmezése a KVT könyvtárhoz képest. Ha a KVT\n"
-"                     nincs megadva, akkor a $TMPDIR értékét használja,\n"
-"                     egyébként a /tmp könyvtárat. Ezzel a kapcsolóval "
-"használva\n"
-"                     a SABLON nem lehet abszolút név. A -t használatával\n"
-"                     ellentétben a SABLON tartalmazhat osztásjeleket, de az\n"
-"                     mktemp csak az utolsó összetevőt hozza létre.\n"
+"  -p KVT, --tmpdir[=KVT]  a SABLON értelmezése a KVT könyvtárhoz képest. Ha "
+"a\n"
+"                        KVT nincs megadva, akkor a $TMPDIR értékét "
+"használja,\n"
+"                        egyébként a /tmp könyvtárat. Ezzel a kapcsolóval\n"
+"                        használva a SABLON nem lehet abszolút név. A -t\n"
+"                        használatával ellentétben a SABLON tartalmazhat\n"
+"                        osztásjeleket, de az mktemp csak az utolsó "
+"összetevőt\n"
+"                        hozza létre.\n"
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
 msgstr ""
-"  -p KVT           a KVT használata előtagként, a -t használatát "
-"feltételezi\n"
-"                     [elavult]\n"
 "  -t               a SABLON értelmezése egyetlen fájlnév-összetevőként,\n"
 "                     egy könyvtárhoz képest: $TMPDIR, ha az be van állítva,\n"
 "                     különben a -p segítségével megadott könyvtár, különben\n"
 "                     /tmp [elavult]\n"
 
-#: src/mktemp.c:223
-#, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr "a szabványos hibakimenet átirányítása meghiúsult a /dev/null-ba"
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, c-format
 msgid "too many templates"
 msgstr "túl sok sablon"
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr "a --suffix használatakor, a sablonnak (%s) X-re kell végződnie"
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr "a(z) %s utótag érvénytelen, könyvtárelválasztót tartalmaz"
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr "túl kevés X a következő sablonban: %s"
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr "érvénytelen sablon, a(z) %s könyvtárelválasztót tartalmaz"
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr ""
 "érvénytelen sablon, a(z) %s a --tmpdir használatakor nem lehet abszolút"
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, c-format
 msgid "failed to create directory via template %s"
 msgstr "a könyvtár létrehozása meghiúsult a következő sablon használatával: %s"
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, c-format
 msgid "failed to create file via template %s"
 msgstr "a fájl létrehozása meghiúsult a következő sablon használatával: %s"
 
-#: src/mv.c:292
-#, fuzzy
+#: src/mv.c:294
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 "A FORR�ST átnevezi a CÉLRA vagy több FORR�ST egy CÉLKÖNYVT�RBA helyez át.\n"
-"\n"
 
-#: src/mv.c:298
+#: src/mv.c:300
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
 "file\n"
@@ -6590,7 +6681,7 @@ msgstr ""
 "  -n, --no-clobber             ne írja felül a meglévő fájlokat\n"
 "Ha a -i, -f, -n közül többet is megad, akkor csak az utolsó lép életbe.\n"
 
-#: src/mv.c:307
+#: src/mv.c:309
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
@@ -6603,7 +6694,7 @@ msgstr ""
 "kiterjesztésének\n"
 "                                 felülbírálása\n"
 
-#: src/mv.c:312
+#: src/mv.c:314
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
 "DIRECTORY\n"
@@ -6612,14 +6703,18 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
-"      --target-directory=KÖNYVT�R  minden FORR�S áthelyezése a megadott\n"
+"  -t, --target-directory=KÖNYVT�R  minden FORR�S áthelyezése a megadott\n"
 "                                     KÖNYVT�RBA\n"
 "  -T, --no-target-directory    a CÉL kezelése normál fájlként\n"
 "  -u, --update                 csak akkor helyezi át, ha a célfájl régebbi,\n"
 "                                 mint a FORR�S, vagy ha a célfájl nem "
 "létezik\n"
 "  -v, --verbose                elmagyarázza, mi történik\n"
+"  -Z, --context                a célfájl SELinux biztonsági kontextusának\n"
+"                                 beállítása az alapértelmezett típusra\n"
 
 #: src/nice.c:72
 #, c-format
@@ -6627,7 +6722,7 @@ msgid "Usage: %s [OPTION] [COMMAND [ARG]...]\n"
 msgstr "Használat: %s [KAPCSOLÓ] [PARANCS [ARG]…]\n"
 
 #: src/nice.c:73
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Run COMMAND with an adjusted niceness, which affects process scheduling.\n"
 "With no COMMAND, print the current niceness.  Niceness values range from\n"
@@ -6636,15 +6731,15 @@ msgstr ""
 "A PARANCS futtatása módosított nice értékkel, amely a folyamatütemezést "
 "érinti.\n"
 "Ha a PARANCS nincs megadva, akkor az aktuális nice értéket írja ki. A nice\n"
-"értékek a(z) %d (leginkább előnyben részesített) értéktől %d-ig (legkevésbé\n"
-"előnyben részesített) terjednek.\n"
-"\n"
-"  -n, --adjustment=N   az N egész szám hozzáadása a nice értékhez\n"
-"                         (az alapértelmezett: 10)\n"
+"értékek a(z) %d (a folyamatnak leginkább előnyös) értéktől %d-ig (a "
+"folyamatnak\n"
+"legkevésbé előnyös) terjednek.\n"
 
 #: src/nice.c:82
 msgid "  -n, --adjustment=N   add integer N to the niceness (default 10)\n"
 msgstr ""
+"  -n, --adjustment=N   az N egész szám hozzáadása a nice értékhez\n"
+"                         (alapértelmezés: 10)\n"
 
 #: src/nice.c:172
 #, c-format
@@ -6672,14 +6767,12 @@ msgid "Scott Bartram"
 msgstr "Scott Bartram"
 
 #: src/nl.c:179
-#, fuzzy
 msgid ""
 "Write each FILE to standard output, with line numbers added.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
 "Minden egyes F�JL kiírása a szabványos kimenetre, sorszámokkal ellátva.\n"
 "Ha a F�JL nincs megadva, vagy -, akkor a szabványos bemenetet olvassa.\n"
-"\n"
 
 #: src/nl.c:186
 msgid ""
@@ -6835,7 +6928,7 @@ msgstr ""
 "\n"
 
 #: src/nohup.c:65
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "If standard input is a terminal, redirect it from /dev/null.\n"
@@ -6932,119 +7025,127 @@ msgid "%s: invalid number to ignore"
 msgstr "%s: érvénytelen figyelmen kívül hagyandó szám"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
-msgstr ""
+msgstr "Assaf Gordon"
 
-#: src/numfmt.c:676
-#, fuzzy, c-format
-msgid "value too large to be converted: '%s'"
-msgstr "%s: az érték átalakítása nem teljes"
+#: src/numfmt.c:659
+#, c-format
+msgid "value too large to be converted: %s"
+msgstr "az érték túl nagy az átalakításhoz: %s"
 
-#: src/numfmt.c:680
-#, fuzzy, c-format
-msgid "invalid number: '%s'"
+#: src/numfmt.c:663
+#, c-format
+msgid "invalid number: %s"
 msgstr "érvénytelen szám: %s"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
-msgstr ""
+msgid "rejecting suffix in input: %s (consider using --from)"
+msgstr "utótag visszautasítása a bemenetben: %s (használja a --from kapcsolót)"
 
-#: src/numfmt.c:688
-#, fuzzy, c-format
-msgid "invalid suffix in input: '%s'"
-msgstr "érvénytelen utótag a(z) %s%s argumentumban: „%s�"
+#: src/numfmt.c:671
+#, c-format
+msgid "invalid suffix in input: %s"
+msgstr "érvénytelen utótag a bemenetben: %s"
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
-msgstr ""
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
+msgstr "hiányzó „i� utótag a bemenetben: %s (pl. Ki/Mi/Gi)"
 
-#: src/numfmt.c:723
-#, fuzzy, c-format
+#: src/numfmt.c:722 src/numfmt.c:768
+#, c-format
 msgid "failed to prepare value '%Lf' for printing"
-msgstr "%s megnyitása írásra meghiúsult"
+msgstr "a(z) „%Lf� érték előkészítése kiírásra meghiúsult"
 
-#: src/numfmt.c:787
-#, fuzzy, c-format
-msgid "invalid unit size: '%s'"
-msgstr "érvénytelen tabulátorméret: %s"
-
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
+#: src/numfmt.c:791
 #, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr ""
+msgid "invalid unit size: %s"
+msgstr "érvénytelen egységméret: %s"
 
-#: src/numfmt.c:813
-#, fuzzy, c-format
+#: src/numfmt.c:814
+#, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
-msgstr "Használat: %s [KAPCSOLÓ]… [FELHASZN�LÓ]…\n"
+msgstr "Használat: %s [KAPCSOLÓ]… [SZ�M]…\n"
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
 msgstr ""
+"A SZ�MOK, vagy ha nincs megadva a szabványos bemenet számainak "
+"újraformázása.\n"
 
-#: src/numfmt.c:820
-#, fuzzy
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
 msgstr ""
-"      --strict         a --check kapcsolóval: nem nulla értékkel lép ki "
-"minden\n"
-"                         érvénytelen bemenet esetén\n"
+"      --debug          figyelmeztetések kiírása érvénytelen bemenetről\n"
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
+"  -d, --delimiter=X    az X használata üreshely helyett mezőhatárolóként\n"
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
+"  --field N       a szám helyettesítése az N. bemeneti mezőben (alap=1)\n"
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
 msgstr ""
+"  --format=FORM�TUM printf stílusú lebegőpontos FORM�TUM használata.\n"
+"                      Részletekért lásd a FORM�TUMOT alább.\n"
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
 "                         see UNIT below\n"
 msgstr ""
+"  --from=EGYSÉG   a bemeneti számok automatikus átszámolása EGYSÉGEKRE.\n"
+"                    Alapértelmezett: „none�. Lásd alább az EGYSÉG leírását.\n"
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr ""
+"  --from-unit=N   a bemeneti egység méretének megadása (az alap 1 helyett).\n"
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
 "                         (which means it has no effect in the C/POSIX "
 "locale)\n"
 msgstr ""
+"  --grouping      számjegyek csoportosítása (például 1,000,000).\n"
+"                  A területi beállítástól függő csoportosítást használja\n"
+"                    (azaz nincs hatása C/POSIX locale esetén.\n"
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
 msgstr ""
+"  --header[=N]    az első N fejlécsor kiírása (konvertálás nélkül).\n"
+"                    Az N alapértelmezett értéke 1, ha nincs megadva.\n"
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
 msgstr ""
+"  --invalid=MÓD   hibamód érvénytelen számokhoz: a MÓD lehet:\n"
+"                  abort (alapértelmezés), fail, warn, ignore.\n"
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -7053,44 +7154,60 @@ msgid ""
 "whitespace\n"
 "                         is found\n"
 msgstr ""
+"  --padding=N     a kimenet kiegészítése N karakterre.\n"
+"                    A pozitív N jobbra igazít, a negatív N balra.\n"
+"                    Megjegyzés: ha a kimenet N-nél szélesebb, a padding "
+"kapcsoló\n"
+"                    figyelmen kívül marad. Az alapértelmezés az automatikus\n"
+"                    kitöltés, ha a kimenetben van üreshely.\n"
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
 "nearest\n"
 msgstr ""
+"  --round=MÓDSZER   az átszámoláskor használandó kerekítési módszer. "
+"Lehetséges\n"
+"                    értékek: up, down, from-zero (alap), towards-zero, "
+"nearest\n"
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
 msgstr ""
+"  --suffix=UTÓTAG UTÓTAG hozzáadása a kimeneti számokhoz, és elhagyható "
+"UTÓTAG\n"
+"                    elfogadása a bemeneti számokban.\n"
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
+"  --to=EGYSÉG     kimeneti számok automatikus átszámolása EGYSÉGRE.\n"
+"                  Lásd alább az EGYSÉG leírását.\n"
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
-msgstr ""
+msgstr "  --to-unit=N     a kimeneti egység mérete (az alap 1 helyett).\n"
 
-#: src/numfmt.c:877
-#, fuzzy
+#: src/numfmt.c:878
 msgid ""
 "\n"
 "UNIT options:\n"
 msgstr ""
-"Egyéb kapcsolók:\n"
 "\n"
+"EGYSÉG beállításai:\n"
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr ""
+"  none       Nincs automatikus átszámolás. Az utótagok használata hibát "
+"okoz.\n"
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -7098,43 +7215,69 @@ msgid ""
 "               1M = 1000000,\n"
 "               1Mi = 1048576,\n"
 msgstr ""
+"  auto       Opcionális egybetűs/kétbetűs utótag elfogadása:\n"
+"             1K  = 1000\n"
+"             1Ki = 1024\n"
+"             1M  = 1000000\n"
+"             1Mi = 1048576\n"
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
 "               1M = 1000000,\n"
 "               ...\n"
 msgstr ""
+"  si         Opcionális egybetűs utótag elfogadása:\n"
+"             1K = 1000\n"
+"             1M = 1000000\n"
+"             ...\n"
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
 "               1M = 1048576,\n"
 "               ...\n"
 msgstr ""
+"  iec        Opcionális egybetűs utótag elfogadása:\n"
+"             1K = 1024\n"
+"             1M = 1048576\n"
+"             ...\n"
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
 "               1Mi = 1048576,\n"
 "               ...\n"
 msgstr ""
+"  iec-i      Opcionális kétbetűs utótag elfogadása:\n"
+"             1Ki = 1024\n"
+"             1Mi = 1048576\n"
+"             ...\n"
 
-#: src/numfmt.c:905
-#, c-format
+#: src/numfmt.c:906
+#, fuzzy, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
+"\n"
+"A FORM�TUMNAK meg kell felelnie egy lebegőpontos „%f� argumentum "
+"kiírásához.\n"
+"Az elhagyható idézőjel (%'f) bekapcsolja a --grouping kapcsolót (ha a "
+"területi\n"
+"beállítás támogatja).\n"
+"Az elhagyható szélességérték (%10f) kitölti a kimenetet. Az elhagyható "
+"negatív\n"
+"szélességértékek (%-10f) balról töltik ki a kimenetet.\n"
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -7145,8 +7288,19 @@ msgid ""
 "diagnosed, but the exit status is 0.  With --invalid='ignore' conversion\n"
 "errors are not diagnosed and the exit status is 0.\n"
 msgstr ""
+"\n"
+"A kilépési állapot 0, ha minden bemeneti szám konvertálása sikeres.\n"
+"Alapesetben a %s megáll az első konverziós hibánál a 2 kilépési állapottal.\n"
+"Az --invalid='fail' megadásakor figyelmeztetés jelenik meg minden "
+"konverziós\n"
+"hibánál, és a kilépési állapot 2 lesz. Az --invalid='warn' megadásakor "
+"minden\n"
+"konverziós hiba felismerésre kerül, de a kilépési állapot 0 lesz. Az\n"
+"--invalid='ignore' megadásakor a konverziós hibák nem kerülnek "
+"felismerésre,\n"
+"és a kilépési állapot 0 lesz.\n"
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -7166,113 +7320,133 @@ msgid ""
 "  $ ls -lh | %s --header --field 5 --from=iec --padding=10\n"
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 msgstr ""
+"\n"
+"Példák:\n"
+"  $ %s --to=si 1000\n"
+"            -> „1.0K�\n"
+"  $ %s --to=iec 2048\n"
+"           -> „2.0K�\n"
+"  $ %s --to=iec-i 4096\n"
+"           -> „4.0Ki�\n"
+"  $ echo 1K | %s --from=si\n"
+"           -> „1000�\n"
+"  $ echo 1K | %s --from=iec\n"
+"           -> „1024�\n"
+"  $ df | %s --header --field 2 --to=si\n"
+"  $ ls -l | %s --header --field 5 --to=iec\n"
+"  $ ls -lh | %s --header --field 5 --from=iec --padding=10\n"
+"  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, c-format
 msgid "format %s has no %% directive"
 msgstr "a formátum (%s) nem tartalmaz %% direktívát"
 
-#: src/numfmt.c:990
-#, fuzzy, c-format
+#: src/numfmt.c:1003
+#, c-format
 msgid "invalid format %s (width overflow)"
-msgstr "érvénytelen dátumformátum: %s"
+msgstr "érvénytelen formátum: %s (szélesség-túlcsordulás)"
+
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr ""
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr "a formátum (%s) vége %%"
 
-#: src/numfmt.c:1010
-#, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
+#: src/numfmt.c:1030
+#, fuzzy, c-format
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
 msgstr ""
+"érvénytelen formátum: %s, a direktívának a következők egyikének kell lennie: "
+"%%['][-][N]f"
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr "a formátum (%s) túl sok %% direktívát tartalmaz"
 
-#: src/numfmt.c:1070
-#, fuzzy, c-format
-msgid "invalid suffix in input '%s': '%s'"
-msgstr "érvénytelen utótag a(z) %s%s argumentumban: „%s�"
+#: src/numfmt.c:1081
+#, c-format
+msgid "invalid suffix in input %s: %s"
+msgstr "érvénytelen utótag a(z) %s bemenetben: %s"
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
-msgstr ""
+msgstr "az érték túl nagy a kiíráshoz: „%Lg� (használja a --to kapcsolót)"
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
-msgstr ""
+msgstr "az érték túl nagy a kiíráshoz: „%Lg� (nem kezelhetők > 999Y értékek)"
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
-msgstr ""
+msgid "large input value %s: possible precision loss"
+msgstr "nagy bemeneti érték: %s: a pontosság csökkenhet"
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
+"a bemeneti sor túl rövid, nem találhatók konvertálandó számok a(z) %ld. "
+"mezőben"
 
-#: src/numfmt.c:1388
-#, fuzzy, c-format
-msgid "invalid padding value '%s'"
-msgstr "érvénytelen oldaltartomány: %s"
+#: src/numfmt.c:1403
+#, c-format
+msgid "invalid padding value %s"
+msgstr "érvénytelen kitöltési érték: %s"
 
-#: src/numfmt.c:1401
-#, fuzzy, c-format
-msgid "invalid field value '%s'"
-msgstr "érvénytelen mezőszám: %s"
+#: src/numfmt.c:1417
+#, c-format
+msgid "invalid field value %s"
+msgstr "érvénytelen mezőérték: %s"
 
-#: src/numfmt.c:1430
-#, fuzzy, c-format
-msgid "invalid header value '%s'"
-msgstr "érvénytelen dátum: %s"
+#: src/numfmt.c:1447
+#, c-format
+msgid "invalid header value %s"
+msgstr "érvénytelen fejlécérték: %s"
 
-#: src/numfmt.c:1456
-#, fuzzy, c-format
+#: src/numfmt.c:1473
+#, c-format
 msgid "--grouping cannot be combined with --format"
-msgstr "a fájloperandusok nem kombinálhatók a --files0-from kapcsolóval"
+msgstr "a --grouping nem kombinálható a --format kapcsolóval"
 
-#: src/numfmt.c:1458
-#, fuzzy, c-format
-msgid "--padding cannot be combined with --format"
-msgstr "a fájloperandusok nem kombinálhatók a --files0-from kapcsolóval"
-
-#: src/numfmt.c:1463
-#, fuzzy, c-format
+#: src/numfmt.c:1478
+#, c-format
 msgid "no conversion option specified"
-msgstr "több -i kapcsolót adott meg"
+msgstr "nem adott meg konverziós kapcsolót"
 
-#: src/numfmt.c:1471
-#, fuzzy, c-format
+#: src/numfmt.c:1486
+#, c-format
 msgid "grouping cannot be combined with --to"
-msgstr "a fájloperandusok nem kombinálhatók a --files0-from kapcsolóval"
+msgstr "a --grouping nem kombinálható a --to kapcsolóval"
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
-msgstr ""
+msgstr "a csoportosításnak nincs hatása ezen területi beállításban"
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
-msgstr ""
+msgstr "a --header figyelmen kívül marad parancssori bemenet esetén"
 
-#: src/numfmt.c:1511
-#, fuzzy, c-format
+#: src/numfmt.c:1526
+#, c-format
 msgid "error reading input"
-msgstr "hiba %s olvasása közben"
+msgstr "hiba a bemenet olvasása közben"
 
-#: src/numfmt.c:1520
-#, fuzzy, c-format
+#: src/numfmt.c:1535
+#, c-format
 msgid "failed to convert some of the input numbers"
-msgstr "a szabványos hibakimenet használhatatlanná tétele meghiúsult"
+msgstr "nem sikerült néhány bemeneti szám átalakítása"
 
-#: src/od.c:294
+#: src/od.c:320
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -7285,7 +7459,7 @@ msgstr ""
 "  vagy:    %s --traditional [KAPCSOLÓ]… [F�JL] [[+]ELTOL�S[.][b]\n"
 "              [+][C�MKE][.][b]]\n"
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -7302,8 +7476,7 @@ msgstr ""
 "Ha a F�JL nincs megadva, vagy -, akkor a szabványos bemenetet olvassa.\n"
 "\n"
 
-#: src/od.c:307
-#, fuzzy
+#: src/od.c:333
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
 "if the last operand begins with + or (if there are 2 operands) a digit.\n"
@@ -7312,7 +7485,6 @@ msgid ""
 "For OFFSET and LABEL, a 0x or 0X prefix indicates hexadecimal;\n"
 "suffixes may be . for octal and b for multiply by 512.\n"
 msgstr ""
-"\n"
 "Az első és második hívási alak egyidejű alkalmazása esetén a második alak\n"
 "feltételezett, ha az utolsó operandus +-al vagy (2 operandus esetén) "
 "számmal\n"
@@ -7323,26 +7495,30 @@ msgstr ""
 "jelez;\n"
 "az utótagok a . (oktális) és b (szorzás 512-vel) lehetnek.\n"
 
-#: src/od.c:318
+#: src/od.c:344
 #, fuzzy
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
-"  -A, --address-radix=ALAP    a fájleltolások kiírási módjának eldöntése\n"
+"  -A, --address-radix=ALAP    a fájleltolások kiírási formátuma. Az ALAP a\n"
+"                                [doxn] egyike: decimális, oktális, hexa "
+"vagy\n"
+"                                nincs\n"
 "  -j, --skip-bytes=B�JT       B�JT darab bemeneti bájt kihagyása először\n"
 
-#: src/od.c:323
-#, fuzzy
+#: src/od.c:350
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
@@ -7354,32 +7530,32 @@ msgstr ""
 "  -t, --format=T�PUS          a kimeneti formátumok kiválasztása\n"
 "  -v, --output-duplicates     ne használja a * jelet a sorelnyomások "
 "jelölésére\n"
-"  -w, --width[=B�JT]          B�JT darab bájt kiírása kimeneti soronként\n"
+"  -w[B�JT], --width[=B�JT]    B�JT darab bájt kiírása kimeneti soronként\n"
 "      --traditional           argumentumok elfogadása a hagyományos "
 "formában\n"
 
-#: src/od.c:336
-#, fuzzy
+#: src/od.c:363
 msgid ""
 "\n"
 "\n"
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 "\n"
+"\n"
 "A hagyományos formátummeghatározások keverhetők, az alábbiak lehetnek:\n"
 "  -a  ugyanaz, mint -t a,  megnevezett karakterek kiválasztása, a magas\n"
 "                             sorrend bit figyelmen kívül hagyása\n"
 "  -b  ugyanaz, mint -t o1, oktális bájtok kiválasztása\n"
-"  -c  ugyanaz, mint -t c,  ASCII karakterek vagy visszaper escape-ek\n"
+"  -c  ugyanaz, mint -t c,  nyomtatható karakterek vagy visszaper escape-ek\n"
 "                             kiválasztása\n"
 "  -d  ugyanaz, mint -t u2, előjel nélküli tízes alapú 2 bájtos egységek\n"
 "                             kiválasztása\n"
 
-#: src/od.c:345
+#: src/od.c:372
 msgid ""
 "  -f   same as -t fF, select floats\n"
 "  -i   same as -t dI, select decimal ints\n"
@@ -7395,23 +7571,22 @@ msgstr ""
 "  -s  ugyanaz, mint -t d2, tízes alapú 2 bájtos egységek kiválasztása\n"
 "  -x  ugyanaz, mint -t x2, hexadecimális 2 bájtos egységek kiválasztása\n"
 
-#: src/od.c:353
-#, fuzzy
+#: src/od.c:380
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 "\n"
-"A T�PUST az alábbi specifikációk közül néhány alkothatja:\n"
 "\n"
+"A T�PUST az alábbi specifikációk közül néhány alkothatja:\n"
 "  a          megnevezett karakter, a magas sorrend bit figyelmen kívül "
 "hagyása\n"
-"  c          ASCII karakter vagy visszaper escape\n"
+"  c          nyomtatható karakter vagy visszaper escape\n"
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -7425,8 +7600,7 @@ msgstr ""
 "  u[MÉRET]   előjel nélküli decimális, MÉRET bájt egészenként\n"
 "  x[MÉRET]   hexadecimális, MÉRET bájt egészenként\n"
 
-#: src/od.c:367
-#, fuzzy
+#: src/od.c:394
 msgid ""
 "\n"
 "SIZE is a number.  For TYPE in [doux], SIZE may also be C for\n"
@@ -7435,20 +7609,23 @@ msgid ""
 "for sizeof(double) or L for sizeof(long double).\n"
 msgstr ""
 "\n"
-"A MÉRET egy szám. For TYPE in doux, a MÉRET lehet C a\n"
+"A MÉRET egy szám. A T�PUS a [doux] egyike, a MÉRET lehet C a\n"
 "sizeof(char), S a sizeof(short), I a sizeof(int) vagy L a\n"
 "sizeof(long) értékekhez. Ha a T�PUS f, akkor a MÉRET szintén lehet F a\n"
 "sizeof(float), D a sizeof(double) vagy L a sizeof(long double) értékéhez.\n"
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
 "each output line.\n"
 msgstr ""
+"\n"
+"Egy z utótag hatására bármely típus esetén a nyomtatható karakterek "
+"megjelennek\n"
+"a kimeneti sorok végén.\n"
 
-#: src/od.c:379
-#, fuzzy
+#: src/od.c:406
 msgid ""
 "\n"
 "\n"
@@ -7461,16 +7638,23 @@ msgid ""
 "and so on for G, T, P, E, Z, Y.\n"
 msgstr ""
 "\n"
-"A K a következő szorzó-utótagokkal rendelkezhet:\n"
-"b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
-"GB 1000*1000*1000, G 1024*1024*1024, és ugyanígy T, P, E, Z, Y.\n"
+"\n"
+"A B�JTOK egy hexadecimális szám 0x vagy 0X előtaggal, és a következő "
+"szorzó-\n"
+"utótagokkal rendelkezhet:\n"
+"  b     512\n"
+"  kB    1000\n"
+"  K     1024\n"
+"  MB    1000*1000\n"
+"  M     1024*1024\n"
+"és ugyanígy a G, T, P, E, Z, Y esetén.\n"
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, c-format
 msgid "invalid type string %s"
 msgstr "érvénytelen típus-karakterlánc: %s"
 
-#: src/od.c:649
+#: src/od.c:690
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7479,7 +7663,7 @@ msgstr ""
 "érvénytelen típus-karakterlánc: %s\n"
 "ez a rendszer nem biztosít %lu bájtos egész típust"
 
-#: src/od.c:770
+#: src/od.c:811
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7488,38 +7672,37 @@ msgstr ""
 "érvénytelen típus-karakterlánc: %s\n"
 "ez a rendszer nem biztosít %lu bájtos lebegőpontos típust"
 
-#: src/od.c:828
-#, fuzzy, c-format
+#: src/od.c:869
+#, c-format
 msgid "invalid character '%c' in type string %s"
-msgstr "a(z) %c karakter érvénytelen a(z) %s típus-karakterláncban"
+msgstr "a(z) „%c� karakter érvénytelen a(z) %s típus-karakterláncban"
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr "nem lehet a kombinált bemenet elhagyott végére ugrani"
 
-#: src/od.c:1609
-#, fuzzy, c-format
+#: src/od.c:1650
+#, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr ""
-"„%c� érvénytelen  kimeneti cím alap; a [doxn] karakterek egyikének kell "
-"lennie"
+"„%c� érvénytelen kimeneti cím alap; a [doxn] karakterek egyikének kell lennie"
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr "nem adható meg típus karakterláncok kiíratásakor"
 
-#: src/od.c:1810
+#: src/od.c:1863
 msgid "compatibility mode supports at most one file"
 msgstr "a kompatibilitási mód legfeljebb egy fájlt támogat"
 
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr "a kihagyandó és beolvasandó bájtok összege túl nagy"
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr ""
@@ -7536,7 +7719,6 @@ msgid "standard input is closed"
 msgstr "a szabványos bemenet le van zárva"
 
 #: src/paste.c:439
-#, fuzzy
 msgid ""
 "Write lines consisting of the sequentially corresponding lines from\n"
 "each FILE, separated by TABs, to standard output.\n"
@@ -7545,7 +7727,6 @@ msgstr ""
 "Az egyes F�JLOK sorozatban megfelelő soraiból álló sorok kiírása a\n"
 "szabványos kimenetre, tabokkal elválasztva.\n"
 "Ha a F�JL nincs megadva, vagy -, akkor a szabványos bemenetet olvassa.\n"
-"\n"
 
 #: src/paste.c:447
 msgid ""
@@ -7578,7 +7759,7 @@ msgstr ""
 "vel)\n"
 
 #: src/pathchk.c:170
-#, fuzzy, c-format
+#, c-format
 msgid "leading '-' in a component of file name %s"
 msgstr "kezdő „-� jel a(z) %s fájlnév összetevőjében"
 
@@ -7687,12 +7868,12 @@ msgstr "Mikor"
 msgid "Where"
 msgstr "Hol"
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr "Használat: %s [KAPCSOLÓ]… [FELHASZN�LÓ]…\n"
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -7713,7 +7894,7 @@ msgstr ""
 "  -s              rövid formátumú kimenet előállítása, ez az "
 "alapértelmezett\n"
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -7729,8 +7910,8 @@ msgstr ""
 "   -q              a felhasználó teljes nevének, távoli kiszolgálójának és\n"
 "                     üresjárati idejének kihagyása a rövid formátumban\n"
 
-#: src/pinky.c:511
-#, fuzzy, c-format
+#: src/pinky.c:513
+#, c-format
 msgid ""
 "\n"
 "A lightweight 'finger' program;  print user information.\n"
@@ -7740,7 +7921,7 @@ msgstr ""
 "Egy könnyűsúlyú „finger� program, felhasználói információkat ír ki.\n"
 "Az utmp fájl a következő lesz: %s.\n"
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr ""
@@ -7758,7 +7939,7 @@ msgid "Roland Huebner"
 msgstr "Roland Huebner"
 
 #: src/pr.c:908
-#, fuzzy, c-format
+#, c-format
 msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument"
 msgstr "„--pages=ELS�_OLDAL[:UTOLSÓ_OLDAL]� hiányzó argumentum"
 
@@ -7768,27 +7949,27 @@ msgid "invalid page range %s"
 msgstr "érvénytelen oldaltartomány: %s"
 
 #: src/pr.c:975
-#, fuzzy, c-format
+#, c-format
 msgid "'-l PAGE_LENGTH' invalid number of lines: %s"
 msgstr "„-l OLDALHOSSZ� érvénytelen sorszám: %s"
 
 #: src/pr.c:999
-#, fuzzy, c-format
+#, c-format
 msgid "'-N NUMBER' invalid starting line number: %s"
 msgstr "„-N SZ�M� érvénytelen kezdő sorszám: %s"
 
 #: src/pr.c:1011
-#, fuzzy, c-format
+#, c-format
 msgid "'-o MARGIN' invalid line offset: %s"
 msgstr "„-o MARGÓ� érvénytelen soreltolás: %s"
 
 #: src/pr.c:1052
-#, fuzzy, c-format
+#, c-format
 msgid "'-w PAGE_WIDTH' invalid number of characters: %s"
 msgstr "„-w OLDAL_SZÉLESSÉG� érvénytelen karakterszám: %s"
 
 #: src/pr.c:1066
-#, fuzzy, c-format
+#, c-format
 msgid "'-W PAGE_WIDTH' invalid number of characters: %s"
 msgstr "„-W OLDAL_SZÉLESSÉG� érvénytelen karakterszám: %s"
 
@@ -7803,7 +7984,7 @@ msgid "cannot specify both printing across and printing in parallel"
 msgstr "nem adható meg mind a vízszintes, mind a párhuzamos nyomtatás"
 
 #: src/pr.c:1196
-#, fuzzy, c-format
+#, c-format
 msgid "'-%c' extra characters or invalid number in the argument: %s"
 msgstr ""
 "„-%c� extra karakterek vagy érvénytelen szám a következő argumentumban:\n"
@@ -7830,12 +8011,10 @@ msgid "Page %<PRIuMAX>"
 msgstr "%<PRIuMAX>. oldal"
 
 #: src/pr.c:2757
-#, fuzzy
 msgid "Paginate or columnate FILE(s) for printing.\n"
 msgstr ""
 "A F�JLOK oldalakra tördelése vagy oszlopokba rendezése\n"
 "nyomtatáshoz.\n"
-"\n"
 
 #: src/pr.c:2763
 msgid ""
@@ -7847,8 +8026,8 @@ msgid ""
 "                    columns on each page\n"
 msgstr ""
 "  +ELS�_OLDAL[:UTOLSÓ_OLDAL], --pages=ELS�_OLDAL[:UTOLSÓ_OLDAL]\n"
-"                    a nyomtatás elkezdése [befejezése] az ELS�_[UTOLSÓ]"
-"_OLDALON\n"
+"                    a nyomtatás elkezdése [befejezése] az "
+"ELS�_[UTOLSÓ]_OLDALON\n"
 "  -OSZLOP, --columns=OSZLOP\n"
 "                    OSZLOP darab oszlop előállítása és az oszlopok "
 "nyomtatása,\n"
@@ -7969,11 +8148,13 @@ msgstr ""
 "                    figyelmeztetés kihagyása, ha egy fájl nem nyitható meg\n"
 
 #: src/pr.c:2820
+#, fuzzy
 msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
@@ -7985,8 +8166,7 @@ msgstr ""
 "kivéve\n"
 "                    ha a -w be van állítva\n"
 
-#: src/pr.c:2827
-#, fuzzy
+#: src/pr.c:2828
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
 "                    separate columns by STRING,\n"
@@ -7995,7 +8175,7 @@ msgid ""
 "options\n"
 "  -t, --omit-header  omit page headers and trailers\n"
 msgstr ""
-"  -SKARAKTERL�NC, --sep-string[=KARAKTERL�NC]\n"
+"  -S[KARAKTERL�NC], --sep-string[=KARAKTERL�NC]\n"
 "                    az oszlopok elválasztása a KARAKTERL�NCCAL,\n"
 "                    a -S nélkül: az alapértelmezett elválasztó a <TAB> a -J\n"
 "                    kapcsolóval és <szóköz> egyébként (ugyanaz, mint a -S\" "
@@ -8003,7 +8183,7 @@ msgstr ""
 "                    nincs hatással az oszlopkapcsolókra\n"
 "  -t, --omit-header oldalfejlécek és befejezők kihagyása\n"
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 msgid ""
 "  -T, --omit-pagination\n"
 "                    omit page headers and trailers, eliminate any "
@@ -8029,7 +8209,7 @@ msgstr ""
 "                    karakterre, csak több szöveges oszlopot tartalmazó\n"
 "                    kimenethez, az s[karakter] kikapcsolja (72)\n"
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
 "                    set page width to PAGE_WIDTH (72) characters always,\n"
@@ -8044,7 +8224,7 @@ msgstr ""
 "s\n"
 "                    kapcsolókkal\n"
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 msgid ""
 "\n"
 "-t is implied if PAGE_LENGTH <= 10.  With no FILE, or when FILE is -, read\n"
@@ -8068,7 +8248,8 @@ msgstr ""
 "\n"
 
 #: src/printenv.c:69
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+#, fuzzy
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr "  -0, --null     a sorok lezárása a 0 bájttal új sor helyett\n"
 
 #: src/printf.c:79
@@ -8125,7 +8306,6 @@ msgstr ""
 "számjegy)\n"
 
 #: src/printf.c:123
-#, fuzzy
 msgid ""
 "  %%      a single %\n"
 "  %b      ARGUMENT as a string with '\\' escapes interpreted,\n"
@@ -8192,12 +8372,12 @@ msgstr ""
 msgid "F. Pinard"
 msgstr "F. Pinard"
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, c-format
 msgid "%s (for regexp %s)"
 msgstr "%s (a(z) %s regexphez)"
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
@@ -8206,18 +8386,15 @@ msgstr ""
 "Használat: %s [KAPCSOLÓ]… [BEMENET]…   (-G nélkül)\n"
 "  vagy:    %s -G [KAPCSOLÓ]… [BEMENET [KIMENET]]\n"
 
-#: src/ptx.c:1821
-#, fuzzy
+#: src/ptx.c:1824
 msgid ""
 "Output a permuted index, including context, of the words in the input "
 "files.\n"
 msgstr ""
 "A bemeneti fájlok szavai permutált indexének kiírása a kontextust is "
 "beleértve.\n"
-"\n"
 
-#: src/ptx.c:1827
-#, fuzzy
+#: src/ptx.c:1830
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
 "  -G, --traditional              behave more like System V 'ptx'\n"
@@ -8229,8 +8406,7 @@ msgstr ""
 "  -F, --flag-truncation=KARAKTERL�NC  a KARAKTERL�NC használata a\n"
 "                                      sorcsonkítások jelölésére\n"
 
-#: src/ptx.c:1832
-#, fuzzy
+#: src/ptx.c:1835
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
 "  -O, --format=roff              generate output as roff directives\n"
@@ -8245,7 +8421,7 @@ msgstr ""
 "  -S, --sentence-regexp=REGEXP   sorok vagy mondatok végéhez\n"
 "  -T, --format=tex               a kimenet előállítása TeX irányelvekként\n"
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -8265,7 +8441,7 @@ msgstr ""
 "  -o, --only-file=F�JL           az egyedüli szólista olvasása ebből a "
 "F�JLBÓL\n"
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -8278,17 +8454,16 @@ msgstr ""
 "  -w, --width=SZ�M               a kimenet szélessége oszlopokban, a \n"
 "                                   hivatkozások kihagyásával\n"
 
-#: src/ptx.c:1854
-#, fuzzy
+#: src/ptx.c:1857
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
 "\n"
 "Ha a F�JL nincs megadva, vagy -, akkor a szabványos bemenetet olvassa.\n"
-"A „-F /� az alapértelmezés.\n"
+"Alapértelmezett: „-F /�.\n"
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, c-format
 msgid "invalid gap width: %s"
 msgstr "érvénytelen résszélesség: %s"
@@ -8310,17 +8485,23 @@ msgstr ""
 "                    linkeket is tartalmaz\n"
 "  -P, --physical  minden szimbolikus link elkerülése\n"
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+
+#: src/pwd.c:169
 #, c-format
 msgid "failed to chdir to %s"
 msgstr "a következő könyvtárba lépés meghiúsult: %s"
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, c-format
 msgid "failed to stat %s"
 msgstr "%s elérése meghiúsult"
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr ""
@@ -8328,7 +8509,7 @@ msgstr ""
 "következőben:\n"
 "%s"
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, c-format
 msgid "ignoring non-option arguments"
 msgstr "a nem kapcsoló argumentumok figyelmen kívül hagyva"
@@ -8338,8 +8519,8 @@ msgstr "a nem kapcsoló argumentumok figyelmen kívül hagyva"
 msgid "Dmitry V. Levin"
 msgstr "Dmitry V. Levin"
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Használat: %s [KAPCSOLÓ]… F�JL…\n"
@@ -8387,23 +8568,24 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 "  -m, --canonicalize-missing    egyszerűsítés minden szimbolikus link "
 "rekurzív\n"
 "                                követésével az adott név minden "
 "összetevőjében,\n"
 "                                az összetevők létezésére tekintet nélkül\n"
-"  -n, --no-newline              ne írja ki a záró új sort\n"
+"  -n, --no-newline              ne írja ki a záró elhatárolót\n"
 "  -q, --quiet,\n"
 "  -s, --silent                  megszünteti a legtöbb hibaüzenetet\n"
 "  -v, --verbose                 hibaüzenetek kiírása\n"
+"  -z, --zero                    kimenet elválasztása NULL-lal új sor "
+"helyett\n"
 
 #: src/readlink.c:152
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring --no-newline with multiple arguments"
-msgstr "a nem kapcsoló argumentumok figyelmen kívül hagyva"
+msgstr "a --no-newline figyelmen kívül hagyva több argumentum esetén"
 
 #: src/realpath.c:72
 msgid ""
@@ -8426,7 +8608,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 "  -e, --canonicalize-existing  az útvonal minden összetevőjének léteznie "
@@ -8449,7 +8631,7 @@ msgstr ""
 
 #: src/relpath.c:130
 msgid "generating relative path"
-msgstr ""
+msgstr "relatív útvonal előállítása"
 
 #: src/remove.c:273
 #, c-format
@@ -8461,41 +8643,42 @@ msgstr "%s: belép a(z) %s írásvédett könyvtárba? "
 msgid "%s: descend into directory %s? "
 msgstr "%s: belép a(z) %s könyvtárba? "
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr "%1$s: eltávolítja az írásvédett %3$s nevű, „%2$s� típusú elemet? "
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, c-format
 msgid "%s: remove %s %s? "
 msgstr "%1$s: eltávolítja a(z) %3$s nevű, „%2$s� típusú elemet? "
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, c-format
 msgid "removed directory: %s\n"
 msgstr "%s könyvtár törölve\n"
 
-#: src/remove.c:444
+#: src/remove.c:447
 #, c-format
-msgid "cannot remove directory: %s"
-msgstr "nem törölhető a következő könyvtár: %s"
+msgid "refusing to remove %s or %s directory: skipping %s"
+msgstr "a(z) %s vagy %s könyvtár eltávolítása elutasítva: %s kihagyása"
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr "%s kihagyása, mivel másik eszközön van"
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, c-format
 msgid "traversal failed: %s"
 msgstr "a bejárás meghiúsult: %s"
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -8505,12 +8688,11 @@ msgstr ""
 "jelentse a következő címen: %s"
 
 #: src/rm.c:119
-#, fuzzy, c-format
+#, c-format
 msgid "Try '%s ./%s' to remove the file %s.\n"
 msgstr "Próbálja kiadni a(z) „%s ./%s� parancsot a(z) %s eltávolításához.\n"
 
 #: src/rm.c:136
-#, fuzzy
 msgid ""
 "Remove (unlink) the FILE(s).\n"
 "\n"
@@ -8520,8 +8702,8 @@ msgid ""
 msgstr ""
 "A F�JLOK eltávolítása (unlink).\n"
 "\n"
-"  -f, --force           nem létező fájlok figyelmen kívül hagyása, nem "
-"kérdez\n"
+"  -f, --force           nem létező fájlok és argumentumok kérdés nélküli\n"
+"                           figyelmen kívül hagyása\n"
 "  -i                    kérdés minden eltávolítás előtt\n"
 
 # rc/rm.c:166
@@ -8529,12 +8711,12 @@ msgstr ""
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 "  -I                    egyszer kérdez háromnál több fájl eltávolításakor\n"
 "                          vagy rekurzív törlés esetén. Nem olyan zavaró, "
@@ -8557,7 +8739,6 @@ msgstr ""
 "                          kapcsoló ban megadottól eltérő fájlrendszeren van\n"
 
 #: src/rm.c:154
-#, fuzzy
 msgid ""
 "      --no-preserve-root  do not treat '/' specially\n"
 "      --preserve-root   do not remove '/' (default)\n"
@@ -8569,6 +8750,7 @@ msgstr ""
 "                           (alapértelmezett)\n"
 "      --preserve-root   a rekurzív működés visszautasítása a „/� könyvtáron\n"
 "  -r, -R, --recursive   könyvtárak és tartalmuk rekurzív törlése\n"
+"  -d, --dir             üres könyvtárak törlése\n"
 "  -v, --verbose         elmagyarázza, mi történik\n"
 
 #: src/rm.c:163
@@ -8584,7 +8766,7 @@ msgstr ""
 "törölhető.\n"
 
 #: src/rm.c:168
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "To remove a file whose name starts with a '-', for example '-foo',\n"
@@ -8616,13 +8798,17 @@ msgstr ""
 
 #: src/rm.c:342
 #, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr "%s: rekurzívan eltávolítja az összes argumentumot? "
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] "%s: rekurzívan eltávolít %zu argumentumot? "
+msgstr[1] "%s: rekurzívan eltávolít %zu argumentumot? "
 
-#: src/rm.c:343
+#: src/rm.c:345
 #, c-format
-msgid "%s: remove all arguments? "
-msgstr "%s: eltávolítja az összes argumentumot? "
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] "%s: eltávolít %zu argumentumot? "
+msgstr[1] "%s: eltávolít %zu argumentumot? "
 
 #: src/rmdir.c:134 src/rmdir.c:233
 #, c-format
@@ -8649,7 +8835,6 @@ msgstr ""
 "                  oka, hogy a könyvtár nem üres\n"
 
 #: src/rmdir.c:172
-#, fuzzy
 msgid ""
 "  -p, --parents   remove DIRECTORY and its ancestors; e.g., 'rmdir -p a/b/c' "
 "is\n"
@@ -8657,8 +8842,8 @@ msgid ""
 "  -v, --verbose   output a diagnostic for every directory processed\n"
 msgstr ""
 "  -p, --parents   törli a KÖNYVT�RAT és szülőkönyvtárait.\n"
-"                  Például, az „rmdir -p a/b/c� ugyanaz, mint\n"
-"                  az „rmdir a/b/c a/b a�.\n"
+"                    Például, az „rmdir -p a/b/c� ugyanaz, mint\n"
+"                    az „rmdir a/b/c a/b a�.\n"
 "  -v, --verbose   minden feldolgozott könyvtár után diagnosztikai üzenetet "
 "ír ki\n"
 
@@ -8679,12 +8864,14 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
+"Egy program futtatása másik SELinux biztonsági kontextusban.\n"
+"Ha sem a KONTEXTUS, sem a PARANCS nincs megadva, akkor kiírja a jelenlegi\n"
+"biztonsági kontextust.\n"
 
 #: src/runcon.c:94
-#, fuzzy
 msgid ""
 "  CONTEXT            Complete security context\n"
 "  -c, --compute      compute process transition context before modifying\n"
@@ -8694,10 +8881,6 @@ msgid ""
 "  -l, --range=RANGE  levelrange\n"
 "\n"
 msgstr ""
-"Egy program futtatása másik biztonsági kontextusban.\n"
-"Ha sem a KONTEXTUS, sem a PARANCS nincs megadva, akkor kiírja a jelenlegi\n"
-"biztonsági kontextust.\n"
-"\n"
 "  KONTEXTUS          Teljes biztonsági kontextus\n"
 "  -c, --compute      folyamatátmeneti kontextus kiszámítása a módosítás "
 "előtt\n"
@@ -8742,41 +8925,46 @@ msgstr "meg kell adnia a -c, -t, -u, -l, -r egyikét vagy a kontextust"
 msgid "no command specified"
 msgstr "nincs megadva parancs"
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr "a(z) %s csak SELinux rendszermagon használható"
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, c-format
 msgid "failed to compute a new context"
 msgstr "az új kontextus kiszámítása meghiúsult"
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, c-format
 msgid "failed to set new user %s"
 msgstr "%s új felhasználó beállítása meghiúsult"
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, c-format
 msgid "failed to set new type %s"
 msgstr "%s új típus beállítása meghiúsult"
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, c-format
 msgid "failed to set new range %s"
 msgstr "%s új tartomány beállítása meghiúsult"
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, c-format
 msgid "failed to set new role %s"
 msgstr "%s új szerep beállítása meghiúsult"
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, c-format
 msgid "unable to set security context %s"
 msgstr "%s biztonsági kontextus nem állítható be"
 
+#: src/selinux.c:127 src/selinux.c:300
+#, c-format
+msgid "error canonicalizing %s"
+msgstr "%s kanonikalizálása meghiúsult"
+
 #: src/seq.c:68
 #, c-format
 msgid ""
@@ -8790,17 +8978,14 @@ msgstr ""
 
 #: src/seq.c:73
 msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n"
-msgstr ""
+msgstr "Számok kiírása az ELS�T�L az UTOLSÓIG, NÖVEKMÉNY lépésenként.\n"
 
 #: src/seq.c:79
-#, fuzzy
 msgid ""
 "  -f, --format=FORMAT      use printf style floating-point FORMAT\n"
 "  -s, --separator=STRING   use STRING to separate numbers (default: \\n)\n"
 "  -w, --equal-width        equalize width by padding with leading zeroes\n"
 msgstr ""
-"Számok kiírása az ELS�T�L az UTOLSÓIG, NÖVEKMÉNY lépésenként.\n"
-"\n"
 "  -f, --format=FORM�TUM    printf stílusú lebegőpontos FORM�TUM használata\n"
 "  -s, --separator=KARAKTERL�NC  a KARAKTERL�NC használata a számok\n"
 "                                elválasztására (alapértelmezett: \\n)\n"
@@ -8812,6 +8997,8 @@ msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
@@ -8820,15 +9007,16 @@ msgstr ""
 "Ha az ELS� vagy a NÖVEKMÉNY nincs megadva, akkor az alapértelmezés 1.\n"
 "Ez azt jelenti, hogy a kihagyott NÖVEKMÉNY akkor is 1 lesz "
 "alapértelmezésben,\n"
-"ha az UTOLSÓ kisebb, mint az ELS�. Az ELS�, NÖVEKMÉNY és UTOLSÓ "
-"lebegőpontos\n"
-"értékekként kerülnek értelmezésre. A NÖVEKMÉNY általában pozitív, ha az "
+"ha az UTOLSÓ kisebb, mint az ELS�. A számsorozat véget ér, ha az aktuális\n"
+"szám és a NÖVEKMÉNY összege nagyobb lenne, mint az UTOLSÓ. Az ELS�, "
+"NÖVEKMÉNY\n"
+"és UTOLSÓ lebegőpontos értékekként kerülnek értelmezésre. A NÖVEKMÉNY "
+"általában\n"
+"pozitív, ha az ELS� kisebb, mint az UTOLSÓ, és általában negatív, ha az "
 "ELS�\n"
-"kisebb, mint az UTOLSÓ, és általában negatív, ha az ELS� nagyobb, mint az \n"
-"UTOLSÓ.\n"
+"nagyobb, mint az UTOLSÓ.\n"
 
-#: src/seq.c:94
-#, fuzzy
+#: src/seq.c:96
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
 "it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n"
@@ -8840,106 +9028,37 @@ msgstr ""
 "PONTOSS�G,\n"
 "ellenkező esetben %g\n"
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, c-format
 msgid "invalid floating point argument: %s"
 msgstr "érvénytelen lebegőpontos argumentum: %s"
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr "a formátum (%s) ismeretlen %%%c direktívát tartalmaz"
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr ""
 "a formátum-karakterlánc nem használható egyenlő szélességű\n"
 "karakterláncok kiírásakor"
 
-#: src/setuidgid.c:49
-#, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-"Használat: %s [RÖVID KAPCSOLÓ]… FELHASZN�LÓ PARANCS [ARGUMENTUM]…\n"
-"  vagy:    %s HOSSZÚ KAPCSOLÓ\n"
-
-#: src/setuidgid.c:55
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-"Minden kiegészítő csoport eldobása, a megadott FELHASZN�LÓNÉV felhasználó- "
-"és\n"
-"csoportazonosítójának felvétele és a PARANCS futtatása a megadott\n"
-"ARGUMENTUMOKKAL. 111-es állapottal lép ki, ha a szükséges UID és GID nem\n"
-"vehető fel. Egyébként a PARANCS kilépési állapotával tér vissza.\n"
-"Ez a program csak akkor hasznos, ha a root (0 felhasználói azonosító) "
-"futtatja.\n"
-"\n"
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-"  -g GID[,GID1…]  az elsődleges csoportazonosító beállítása a numerikus GID-"
-"re\n"
-"                      és (ha meg van adva) akkor a kiegészítő "
-"csoportazonosítók\n"
-"                      beállítása a GID1, … értékeire\n"
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr "ismeretlen felhasználói azonosító: %s"
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr ""
-"a(z) %s felhasználói azonosító használatához a -g kapcsolót is használnia "
-"kell"
-
-#: src/setuidgid.c:190
-#, c-format
-msgid "failed to set supplemental group(s)"
-msgstr "a kiegészítő csoportok beállítása meghiúsult"
-
-#: src/setuidgid.c:200
-#, c-format
-msgid "cannot set group-ID to %lu"
-msgstr "a csoportazonosító nem állítható be a következőre: %lu"
-
-#: src/setuidgid.c:204
-#, c-format
-msgid "cannot set user-ID to %lu"
-msgstr "a felhasználói azonosító nem állítható be a következőre: %lu"
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr "Colin Plumb"
 
-#: src/shred.c:148
-#, fuzzy
+#: src/shred.c:170
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
 "for even very expensive hardware probing to recover the data.\n"
 msgstr ""
 "A megadott F�JLT többször egymás után felülírja, így még nagyon költséges\n"
 "hardver megoldásokkal sem lehet könnyen visszaállítani az adatokat.\n"
-"\n"
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -8953,30 +9072,35 @@ msgstr ""
 "  -s, --size=N   ennyi bájt megsemmisítése (a k, M, G utótagok "
 "megengedettek)\n"
 
-#: src/shred.c:161
+#: src/shred.c:183
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
 "  -z, --zero     add a final overwrite with zeros to hide shredding\n"
 msgstr ""
-"  -u, --remove   fájl csonkítása és törlése felülírás után\n"
+"  -u, --remove[=�GY]   fájl csonkítása és törlése felülírás után, lásd "
+"alább\n"
 "  -v, --verbose  folyamat előrehaladásának mutatása\n"
 "  -x, --exact    nem kerekíti fel a fájlméretet a következő teljes blokkra\n"
 "                   ez az alapértelmezés nem szabályos fájlok esetén\n"
 "  -z, --zero     a végén nullákkal írja felül a fájlt, így álcázva a\n"
 "                   megsemmisítést\n"
 
-#: src/shred.c:170
+#: src/shred.c:192
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 "\n"
@@ -8985,11 +9109,17 @@ msgstr ""
 "Csak akkor törli a F�JLOKAT, ha megadod a --remove (-u) kapcsolót.\n"
 "Alapértelmezésben nem törli a fájlokat, mert gyakran használatos\n"
 "eszközfájlokon (például /dev/hda), és ezeket a fájlokat általában nem kell\n"
-"törölni. �ltalános fájlokon általában használni szokták a --remove "
-"kapcsolót.\n"
+"törölni.\n"
+"Az elhagyható �GY paraméter jelzi a könyvtárbejegyzés törlésének módját:\n"
+"„unlink� => szabványos unlink hívás használata.\n"
+"„wipe� => ezen kívül először a név bájtjainak olvashatatlanná tétele.\n"
+"„wipesync� => ezen kívül minden olvashatatlan bájt szinkronizálása a "
+"lemezre.\n"
+"Az alapértelmezett mód a „wipesync�, de ne feledje, hogy ez költséges "
+"lehet.\n"
 "\n"
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -9007,7 +9137,7 @@ msgstr ""
 "hatásossága:\n"
 "\n"
 
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -9029,7 +9159,7 @@ msgstr ""
 "  NFS kiszolgálója\n"
 "\n"
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -9043,7 +9173,7 @@ msgstr ""
 "* tömörített fájlrendszerek\n"
 "\n"
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -9066,7 +9196,7 @@ msgstr ""
 "ahogyan az a mount kézikönyvoldalában dokumentálva van (man mount).\n"
 "\n"
 
-#: src/shred.c:215
+#: src/shred.c:241
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
 "of the file that cannot be removed, and that will allow a shredded file\n"
@@ -9077,128 +9207,128 @@ msgstr ""
 "vagy egy távoli tükörkiszolgálón. Ezek alapján vissza lehet állítani a\n"
 "megsemmisített fájlt.\n"
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, c-format
 msgid "%s: fdatasync failed"
 msgstr "%s: az fdatasync meghiúsult"
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr "%s: az fsync meghiúsult"
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr "%s: nem lehet visszacsévélni"
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr "%s: %lu/%lu menet (%s)…"
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, c-format
 msgid "%s: error writing at offset %s"
 msgstr "%s: írási hiba a következő eltolásnál: %s"
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s: az lseek meghiúsult"
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, c-format
 msgid "%s: file too large"
 msgstr "%s: a fájl túl nagy"
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr "%s: %lu/%lu menet (%s)…%s"
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr "%s: %lu/%lu menet (%s)…%s/%s %d%%"
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, c-format
 msgid "%s: fstat failed"
 msgstr "%s: az elérés meghiúsult"
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, c-format
 msgid "%s: invalid file type"
 msgstr "%s: érvénytelen fájltípus"
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr "%s: a fájl mérete negatív"
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, c-format
 msgid "%s: error truncating"
 msgstr "%s: hiba a csonkításnál"
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, c-format
 msgid "%s: fcntl failed"
 msgstr "%s: az fcntl meghiúsult"
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr ""
 "%s: nem lehet a megsemmisíteni a csak hozzáfűzésre megnyitott fájlleírót"
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr "%s: törlés alatt"
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, c-format
 msgid "%s: renamed to %s"
 msgstr "%s: átnevezve a következőre: %s"
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, c-format
 msgid "%s: failed to remove"
 msgstr "%s: az eltávolítás meghiúsult"
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr "%s: törölve"
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, c-format
 msgid "%s: failed to close"
 msgstr "%s: a bezárás meghiúsult"
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, c-format
 msgid "%s: failed to open for writing"
 msgstr "%s: az írásra megnyitás meghiúsult"
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, c-format
 msgid "%s: invalid number of passes"
 msgstr "%s: érvénytelen menetszám"
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, c-format
 msgid "multiple random sources specified"
 msgstr "több véletlen forrás van megadva"
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, c-format
 msgid "%s: invalid file size"
 msgstr "%s: érvénytelen fájlméret"
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -9209,14 +9339,13 @@ msgstr ""
 "  vagy:    %s -e [KAPCSOLÓ]… [ARG]…\n"
 "  vagy:    %s -i LO-HI [KAPCSOLÓ]…\n"
 
-#: src/shuf.c:54
-#, fuzzy
+#: src/shuf.c:67
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr ""
 "A bemeneti sorok véletlen permutációjának kiírása a szabványos kimenetre.\n"
-"\n"
 
-#: src/shuf.c:60
+#: src/shuf.c:73
+#, fuzzy
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
 "  -i, --input-range=LO-HI   treat each number LO through HI as an input "
@@ -9224,7 +9353,7 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
 msgstr ""
 "  -e, --echo                minden egyes ARG bemeneti sorként való kezelése\n"
 "  -i, --input-range=LO-HI   a LO és HI közötti számok kezelése bemeneti "
@@ -9234,35 +9363,46 @@ msgstr ""
 "kimenet\n"
 "                              helyett\n"
 "      --random-source=F�JL  véletlen bájtok olvasása a F�JLBÓL\n"
+"  -r, --repeat              a kimeneti sorok ismétlődhetnek\n"
 "  -z, --zero-terminated     a sorok lezárása a 0 bájttal az új sor helyett\n"
 
-#: src/shuf.c:244
+#: src/shuf.c:228
+#, c-format
+msgid "too many input lines"
+msgstr "túl sok bemeneti sor"
+
+#: src/shuf.c:431
 #, c-format
 msgid "multiple -i options specified"
 msgstr "több -i kapcsolót adott meg"
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, c-format
 msgid "invalid input range %s"
 msgstr "érvénytelen bemeneti tartomány: %s"
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, c-format
 msgid "invalid line count %s"
 msgstr "érvénytelen sorszám: %s"
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, c-format
 msgid "multiple output files specified"
 msgstr "több kimeneti fájl van megadva"
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, c-format
 msgid "cannot combine -e and -i options"
 msgstr "a -e és -i kapcsolók nem kombinálhatók"
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr ""
+
 #: src/sleep.c:44
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s NUMBER[SUFFIX]...\n"
 "  or:  %s OPTION\n"
@@ -9285,24 +9425,22 @@ msgstr ""
 "tart\n"
 "\n"
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, c-format
 msgid "invalid time interval %s"
 msgstr "érvénytelen időtartam: %s"
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr "a valósidejű óra nem olvasható"
 
-#: src/sort.c:399
-#, fuzzy
+#: src/sort.c:427
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr ""
 "Az összes F�JL rendezett konkatenációjának kiírása a szabványos kimenetre.\n"
-"\n"
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
@@ -9310,7 +9448,7 @@ msgstr ""
 "Rendezési lehetőségek:\n"
 "\n"
 
-#: src/sort.c:409
+#: src/sort.c:437
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
 "  -d, --dictionary-order      consider only blanks and alphanumeric "
@@ -9323,8 +9461,7 @@ msgstr ""
 "                                vétele\n"
 "  -f, --ignore-case           kisbetűk nagybetűkké alakítása\n"
 
-#: src/sort.c:415
-#, fuzzy
+#: src/sort.c:443
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
 "  -i, --ignore-nonprinting    consider only printable characters\n"
@@ -9336,14 +9473,14 @@ msgstr ""
 "  -M, --month-sort            összehasonlítás: (ismeretlen) < „JAN� < … < "
 "„DEC�\n"
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 "  -h, --human-numeric-sort    közérthető számok összehasonlítása (például:\n"
 "                                2K 1G)\n"
 
-#: src/sort.c:423
+#: src/sort.c:451
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
 "  -R, --random-sort           sort by random hash of keys\n"
@@ -9357,7 +9494,7 @@ msgstr ""
 "  -r, --reverse               az összehasonlítások eredményének "
 "megfordítása\n"
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -9375,7 +9512,7 @@ msgstr ""
 "                                belül\n"
 "\n"
 
-#: src/sort.c:437
+#: src/sort.c:465
 msgid ""
 "Other options:\n"
 "\n"
@@ -9383,7 +9520,7 @@ msgstr ""
 "Egyéb kapcsolók:\n"
 "\n"
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
@@ -9392,7 +9529,7 @@ msgstr ""
 "összefésülése,\n"
 "                              többhöz használjon ideiglenes fájlokat\n"
 
-#: src/sort.c:445
+#: src/sort.c:473
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
 "  -C, --check=quiet, --check=silent  like -c, but do not report first bad "
@@ -9408,7 +9545,7 @@ msgstr ""
 "      --compress-program=PROG  ideiglenes fájlok tömörítése a PROG,\n"
 "                               kibontása a PROG -d segítségével\n"
 
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -9426,7 +9563,7 @@ msgstr ""
 "                              Ha az F a -, akkor a szabványos bemenetről "
 "olvas\n"
 
-#: src/sort.c:459
+#: src/sort.c:487
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
 "  -m, --merge               merge already sorted files; do not sort\n"
@@ -9437,7 +9574,7 @@ msgstr ""
 "  -m, --merge               a már rendezett fájlok összefésülése; ne "
 "rendezzen\n"
 
-#: src/sort.c:463
+#: src/sort.c:491
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "  -s, --stable              stabilize sort by disabling last-resort "
@@ -9451,7 +9588,7 @@ msgstr ""
 "                              összehasonlítás letiltásával\n"
 "  -S, --buffer-size=MÉRET   a MÉRET használata a fő memóriapufferhez\n"
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -9478,12 +9615,7 @@ msgstr ""
 "                              -c nélkül csak az elsőt írja ki egy egyenlő\n"
 "                              menetből\n"
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr ""
-"  -z, --zero-terminated     a sorok lezárása a 0 bájttal új sor helyett\n"
-
-#: src/sort.c:483
+#: src/sort.c:511
 msgid ""
 "\n"
 "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is "
@@ -9516,7 +9648,7 @@ msgstr ""
 "\n"
 "A MÉRETET a következő többszöröző utótagok követhetik:\n"
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -9537,262 +9669,242 @@ msgstr ""
 "sorrendet. Az LC_ALL=C beállításával megkapható a hagyományos rendezési\n"
 "sorrend, amely a natív bájtértékeket használja.\n"
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, c-format
 msgid "waiting for %s [-d]"
 msgstr "várakozás a következőre: %s [-d]"
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr "A(z) %s [-d] váratlanul befejeződött"
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, c-format
 msgid "cannot create temporary file in %s"
 msgstr "nem hozható létre ideiglenes fájl itt: %s"
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr "a megnyitás meghiúsult"
 
-#: src/sort.c:970
+#: src/sort.c:998
 msgid "fflush failed"
 msgstr "az fflush meghiúsult"
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr "a lezárás meghiúsult"
 
-#: src/sort.c:986
-#, c-format
-msgid "dup2 failed"
-msgstr "a dup2 meghiúsult"
-
-#: src/sort.c:1103
-#, c-format
-msgid "couldn't execute %s"
-msgstr "nem hajtható végre: %s"
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 msgid "couldn't create temporary file"
 msgstr "nem hozható létre ideiglenes fájl"
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, c-format
 msgid "couldn't create process for %s -d"
 msgstr "nem hozható létre folyamat a következőhöz: %s -d"
 
-#: src/sort.c:1161
-#, c-format
-msgid "couldn't execute %s -d"
-msgstr "nem hajtható végre: %s -d"
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, c-format
 msgid "warning: cannot remove: %s"
 msgstr "figyelmeztetés: a(z) %s nem távolítható el"
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, c-format
 msgid "invalid --%s argument %s"
 msgstr "érvénytelen --%s argumentum: %s"
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, c-format
 msgid "minimum --%s argument is %s"
 msgstr "a minimális --%s argumentum: %s"
 
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, c-format
 msgid "--%s argument %s too large"
 msgstr "a --%s %s argumentuma túl nagy"
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr "a minimális --%s argumentum a jelenlegi rlimittel: %s"
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr "a párhuzamos rendezések száma nem lehet nulla"
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr "az elérés meghiúsult"
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr "az olvasás meghiúsult"
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, c-format
 msgid "string transformation failed"
 msgstr "a karakterlánc-átalakítás sikertelen"
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, c-format
 msgid "the untransformed string was %s"
 msgstr "az átalakítatlan karakterlánc: %s"
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr "^ nincs illeszkedés a kulcsra\n"
 
-#: src/sort.c:2389
-#, fuzzy, c-format
+#: src/sort.c:2422
+#, c-format
 msgid "obsolescent key %s used; consider %s instead"
-msgstr "a használt „%s� kulcs elavult, használja inkább ezt: „%s�"
+msgstr "a használt %s kulcs elavult, használja inkább ezt: %s"
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr "a(z) %lu. kulcs nulla hosszú és figyelmen kívül marad"
 
-#: src/sort.c:2406
-#, fuzzy, c-format
+#: src/sort.c:2439
+#, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr ""
 "a kezdő üres helyeknek jelentőségük van a(z) %lu. kulcsban, adja meg a „b�-t "
 "is"
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr "a(z) %lu. kulcs numerikus és több mezőbe is átnyúlik"
 
-#: src/sort.c:2451
-#, fuzzy, c-format
+#: src/sort.c:2484
+#, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
 msgstr[0] "a következő kapcsoló figyelmen kívül marad: „-%s�"
 msgstr[1] "a következő kapcsolók figyelmen kívül maradnak: „-%s�"
 
-#: src/sort.c:2457
-#, fuzzy, c-format
+#: src/sort.c:2490
+#, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr ""
 "a „-r� kapcsoló csak az utolsó újrarendezéses összehasonlításra érvényes"
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr "az írás meghiúsult"
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr "%s: %s:%s: rendezetlenség: "
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr "szabványos hibakimenet"
 
-#: src/sort.c:3698
-#, fuzzy
+#: src/sort.c:3738
 msgid "cannot read"
-msgstr "%s: nem lehet visszacsévélni"
+msgstr "nem olvasható"
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, c-format
 msgid "%s: invalid field specification %s"
 msgstr "%s: érvénytelen mezőspecifikáció: %s"
 
-#: src/sort.c:3987
-#, fuzzy, c-format
+#: src/sort.c:4028
+#, c-format
 msgid "options '-%s' are incompatible"
-msgstr "a következő kapcsolók inkompatibilisak: „-%s�"
+msgstr "a következő kapcsolók inkompatibilisek: „-%s�"
 
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, c-format
 msgid "%s: invalid count at start of %s"
 msgstr "%s: érvénytelen szám a(z) %s kezdetén"
 
-#: src/sort.c:4295
-#, fuzzy
+#: src/sort.c:4336
 msgid "invalid number after '-'"
 msgstr "érvénytelen szám a „-� után"
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
-#, fuzzy
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 msgid "invalid number after '.'"
 msgstr "érvénytelen szám a „.� után"
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr "véletlen karakter a mezőspecifikációban"
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, c-format
 msgid "multiple compress programs specified"
 msgstr "több tömörítőprogram van megadva"
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
 msgstr "érvénytelen szám a mező kezdeténél"
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
 msgstr "a mezőszám nulla"
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr "karaktereltolás nulla"
 
-#: src/sort.c:4407
-#, fuzzy
+#: src/sort.c:4448
 msgid "invalid number after ','"
 msgstr "érvénytelen szám a „,� után"
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr "üres tab"
 
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, c-format
 msgid "cannot read file names from %s"
 msgstr "nem olvashatók fájlnevek a következőből: %s"
 
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr "%s:%lu: érvénytelen nulla hosszúságú fájlnév"
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, c-format
 msgid "no input from %s"
 msgstr "nincs bemenet ebből: %s"
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr "%s rendezési szabályok használata"
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
-msgstr "egyszerű bájtösszehasonlítás használata"
+msgstr "egyszerű bájt-összehasonlítás használata"
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr "a(z) %s extra operandus nem engedélyezett a -%c kapcsolóval"
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr "az utótag hossza legalább %zu kell legyen"
 
-#: src/split.c:204
+#: src/split.c:203
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr "Használat: %s [KAPCSOLÓ]… [BEMENET [EL�TAG]]\n"
 
-#: src/split.c:208
-#, fuzzy
+#: src/split.c:207
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
 "size is 1000 lines, and default PREFIX is 'x'.  With no INPUT, or when "
@@ -9803,33 +9915,35 @@ msgstr ""
 "fájlokba, az alapértelmezett méret az 1000, és az alapértelmezett EL�TAG az\n"
 "„x�. Ha a BEMENET nincs megadva, vagy -, akkor a szabványos bemenetet "
 "olvassa.\n"
-"\n"
 
-#: src/split.c:216
-#, fuzzy, c-format
+#: src/split.c:215
+#, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
 "  -a, --suffix-length=N   N hosszúságú utótagok használata (alapértelmezett: "
 "%d)\n"
+"      --additional-suffix=UTÓTAG  az UTÓTAG hozzáfűzése a fájlnevekhez\n"
 "  -b, --bytes=MÉRET       MÉRET darab bájt kimeneti fájlonként\n"
 "  -C, --line-bytes=MÉRET  legfeljebb MÉRET darab bájt hosszú sorok kimeneti\n"
 "                            fájlonként\n"
-"  -d, --numeric-suffixes  numerikus utótagok használata alfabetikusok "
-"helyett\n"
+"  -d, --numeric-suffixes[=INNEN]  numerikus utótagok használata "
+"alfabetikusok\n"
+"                                  helyett. Az INNEN a kezdőértéket "
+"módosítja\n"
+"                                  (alapértelmezés: 0)\n"
 "  -e, --elide-empty-files  ne generáljon üres kimeneti fájlokat a „-n�-nel\n"
 "      --filter=PARANCS    írás a shell PARANCSBA, a fájlnév a $F�JL\n"
 "  -l, --lines=SZ�M        SZ�M darab sor kimeneti fájlonként\n"
@@ -9838,7 +9952,7 @@ msgstr ""
 "  -u, --unbuffered        bemenet azonnali kimenetre másolása a „-n r/...�\n"
 "                            használatával\n"
 
-#: src/split.c:229
+#: src/split.c:228
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
 "                            output file is opened\n"
@@ -9847,8 +9961,7 @@ msgstr ""
 "kimeneti\n"
 "                            fájl megnyitása előtt\n"
 
-#: src/split.c:236
-#, fuzzy
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -9869,191 +9982,191 @@ msgstr ""
 "r/N     mint az „l�, de körbeforgó elosztás használatával\n"
 "r/K/N   hasonló, de csak az N K. részének szabványos kimenetre írása\n"
 
-#: src/split.c:354
+#: src/split.c:353
 #, c-format
 msgid "output file suffixes exhausted"
 msgstr "a kimenetifájl-utótagok elfogytak"
 
-#: src/split.c:366
+#: src/split.c:365
 #, c-format
 msgid "creating file %s\n"
 msgstr "%s fájl létrehozása\n"
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
-msgstr ""
+msgstr "%s felülírná a bemenetet, megszakítás"
 
-#: src/split.c:391
+#: src/split.c:390
 #, c-format
 msgid "failed to set FILE environment variable"
 msgstr "a F�JL környezeti változó beállítása meghiúsult"
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr "végrehajtás a F�JL=%s használatával\n"
 
-#: src/split.c:395
+#: src/split.c:394
 #, c-format
 msgid "failed to create pipe"
 msgstr "az adatcsatorna létrehozása meghiúsult"
 
-#: src/split.c:409
+#: src/split.c:408
 #, c-format
 msgid "closing prior pipe"
 msgstr "korábbi adatcsatorna bezárása"
 
-#: src/split.c:411
+#: src/split.c:410
 #, c-format
 msgid "closing output pipe"
 msgstr "kimeneti adatcsatorna lezárása"
 
-#: src/split.c:415
+#: src/split.c:414
 #, c-format
 msgid "moving input pipe"
 msgstr "bemeneti adatcsatorna mozgatása"
 
-#: src/split.c:417
+#: src/split.c:416
 #, c-format
 msgid "closing input pipe"
 msgstr "bemeneti adatcsatorna lezárása"
 
-#: src/split.c:422
+#: src/split.c:421
 #, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr "a parancs futtatása meghiúsult: „%s -c %s�"
 
-#: src/split.c:428
+#: src/split.c:427
 #, c-format
 msgid "failed to close input pipe"
 msgstr "a bemeneti adatcsatorna bezárása meghiúsult"
 
-#: src/split.c:464
+#: src/split.c:463
 #, c-format
 msgid "waiting for child process"
 msgstr "várakozás a gyermekfolyamatra"
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr "a F�JL=%s mellett %s szignál ettől a parancstól: %s"
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr "a F�JL=%s mellett %d kilépés ettől a parancstól: %s"
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr "ismeretlen állapot a parancstól (0x%X)"
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr "egynél több módon nem lehet darabolni"
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, c-format
 msgid "%s: invalid number of chunks"
 msgstr "%s: a darabok száma érvénytelen"
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, c-format
 msgid "%s: invalid chunk number"
 msgstr "%s: érvénytelen darabszám"
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr "%s: érvénytelen utótaghossz"
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr "%s: érvénytelen bájtszám"
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr "%s: érvénytelen sorszám"
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, c-format
 msgid "line count option -%s%c... is too large"
 msgstr "a -%s%c… sorszámolási kapcsoló túl nagy"
 
-#: src/split.c:1248
-#, fuzzy, c-format
+#: src/split.c:1298
+#, c-format
 msgid "%s: invalid start value for numerical suffix"
-msgstr "érvénytelen kezdősorszám: %s"
+msgstr "%s: érvénytelen kezdőérték a numerikus utótaghoz"
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, c-format
 msgid "%s: invalid IO block size"
 msgstr "%s: érvénytelen IO-blokkméret"
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr ""
 "a --filter nem dolgozza fel a kinyert adatdarabot a szabványos kimenetre"
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
-msgstr ""
+msgstr "a numerikus utótag kezdőértéke túl nagy az utótag hosszához"
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, c-format
 msgid "%s: cannot determine file size"
 msgstr "%s: a fájlméret nem határozható meg"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr "Michael Meskes"
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, c-format
 msgid "failed to canonicalize %s"
 msgstr "%s kanonikalizálása meghiúsult"
 
-#: src/stat.c:1069
-#, fuzzy, c-format
+#: src/stat.c:1129
+#, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr "figyelmeztetés: fel nem ismert védés „\\%c�"
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, c-format
 msgid "%s: invalid directive"
 msgstr "%s: érvénytelen direktíva"
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, c-format
 msgid "warning: backslash at end of format"
 msgstr "figyelmeztetés: fordított osztásjel a formátum végén"
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr ""
 "%s használata a szabványos bemenet jelzésére nem működik fájlrendszer módban"
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, c-format
 msgid "cannot read file system information for %s"
 msgstr "nem lehet fájlrendszer-információkat beolvasni a következőhöz: %s"
 
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, c-format
 msgid "cannot stat standard input"
 msgstr "a szabványos bemenet nem érhető el"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -10069,7 +10182,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -10079,30 +10192,30 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr "   Eszköz: %Dh/%dd\tI-node: %-10i  linkek: %-5h eszköztípus: %t,%T\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr "   Eszköz: %Dh/%dd\tI-node: %-10i  linkek: %h\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr "Hozzáférés: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, c-format
 msgid "Context: %C\n"
 msgstr "Kontextus: %C\n"
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -10114,40 +10227,37 @@ msgstr ""
 " Változás: %z\n"
 " Születés: %w\n"
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
-msgstr ""
+msgstr "Kijelzi a fájl vagy fájlrendszer állapotát.\n"
 
-#: src/stat.c:1356
-#, fuzzy
+#: src/stat.c:1418
 msgid ""
 "  -L, --dereference     follow links\n"
 "  -f, --file-system     display file system status instead of file status\n"
 msgstr ""
-"Kijelzi a fájl vagy fájlrendszer állapotát.\n"
-"\n"
 "  -L, --dereference     kövesse a linkeket\n"
 "  -f, --file-system     a fájlrendszer, és nem a fájl állapotát jelzi ki\n"
 
-#: src/stat.c:1360
+#: src/stat.c:1422
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 "  -c  --format=FORM�TUM a megadott FORM�TUMOT használja az alapértelmezett "
 "helyett;\n"
 "                          minden FORM�TUM után új sor\n"
 "      --printf=FORM�TUM mint a --format, de értelmezi a fordított "
-"osztásjeles,\n"
+"osztásjeles\n"
 "                          védelmet és nem tesz kötelezően befejező új sort.\n"
 "                          Új sorhoz a FORM�TUMBAN használja a \\n jelölést.\n"
 "  -t, --terse           információk kiírása tömör formátumban\n"
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 msgid ""
 "\n"
 "The valid format sequences for files (without --file-system):\n"
@@ -10167,7 +10277,7 @@ msgstr ""
 "  %B   a „%b� által jelentett egyes blokkok mérete bájtokban\n"
 "  %C   SELinux biztonsági kontextus karakterlánc\n"
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 msgid ""
 "  %d   device number in decimal\n"
 "  %D   device number in hex\n"
@@ -10183,8 +10293,7 @@ msgstr ""
 "  %g   a tulajdonos csoportazonosítója\n"
 "  %G   a tulajdonos csoportneve\n"
 
-#: src/stat.c:1388
-#, fuzzy
+#: src/stat.c:1450
 msgid ""
 "  %h   number of hard links\n"
 "  %i   inode number\n"
@@ -10193,20 +10302,23 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 "  %h   hard linkek száma\n"
 "  %i   I-node szám\n"
 "  %m   csatolási pont\n"
 "  %n   fájlnév\n"
 "  %N   idézőjelek közé tett fájlnév, követéssel, ha szimbolikus link\n"
-"  %o   I/O blokkméret\n"
+"  %o   optimális I/O átviteli méret tipp\n"
 "  %s   teljes méret, bájtokban\n"
-"  %t   major eszköztípus hexadecimálisan\n"
-"  %T   minor eszköztípus hexadecimálisan\n"
+"  %t   major eszköztípus hexadecimálisan, a karakteres/blokkos "
+"eszközfájlokhoz\n"
+"  %T   minor eszköztípus hexadecimálisan, a karakteres/blokkos "
+"eszközfájlokhoz\n"
 
-#: src/stat.c:1399
+#: src/stat.c:1461
+#, fuzzy
 msgid ""
 "  %u   user ID of owner\n"
 "  %U   user name of owner\n"
@@ -10214,10 +10326,10 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 "  %u   a tulajdonos felhasználói azonosítója\n"
@@ -10233,7 +10345,7 @@ msgstr ""
 "  %Z   utolsó változtatás ideje az Epoch óta eltelt másodpercekként\n"
 "\n"
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 msgid ""
 "Valid format sequences for file systems:\n"
 "\n"
@@ -10251,7 +10363,7 @@ msgstr ""
 "  %d   szabad fájlcsomópontok a fájlrendszeren\n"
 "  %f   szabad blokkok a fájlrendszeren\n"
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 msgid ""
 "  %i   file system ID in hex\n"
 "  %l   maximum length of filenames\n"
@@ -10275,13 +10387,11 @@ msgid "Usage: %s OPTION... COMMAND\n"
 msgstr "Használat: %s KAPCSOLÓ… PARANCS\n"
 
 #: src/stdbuf.c:91
-#, fuzzy
 msgid ""
 "Run COMMAND, with modified buffering operations for its standard streams.\n"
 msgstr ""
 "A PARANCS futtatása módosított pufferelési műveletekkel a szabványos "
 "adatfolyamaihoz.\n"
-"\n"
 
 #: src/stdbuf.c:97
 msgid ""
@@ -10295,7 +10405,6 @@ msgstr ""
 "módosítása\n"
 
 #: src/stdbuf.c:104
-#, fuzzy
 msgid ""
 "\n"
 "If MODE is 'L' the corresponding stream will be line buffered.\n"
@@ -10306,7 +10415,6 @@ msgstr ""
 "Ez a beállítás érvénytelen a szabványos bemenettel.\n"
 
 #: src/stdbuf.c:107
-#, fuzzy
 msgid ""
 "\n"
 "If MODE is '0' the corresponding stream will be unbuffered.\n"
@@ -10330,7 +10438,6 @@ msgstr ""
 "méretű puffer használatával.\n"
 
 #: src/stdbuf.c:116
-#, fuzzy
 msgid ""
 "\n"
 "NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n"
@@ -10345,22 +10452,27 @@ msgstr ""
 "megfelelő beállításokat. Egyes szűrők (mint a „dd� és „cat�) nem használnak\n"
 "adatfolyamokat az I/O-hoz, így az „stdbuf� beállításai nem hatnak rájuk.\n"
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, c-format
 msgid "failed to find %s"
 msgstr "%s keresése meghiúsult"
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, c-format
 msgid "failed to update the environment with %s"
 msgstr "a környezet frissítése meghiúsult a következővel: %s"
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr "a szabványos bemenet sorpufferelése értelmetlen"
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, c-format
+msgid "you must specify a buffering mode option"
+msgstr "meg kell adnia egy pufferelésimód-beállítást"
+
+#: src/stty.c:516
 #, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -10371,19 +10483,16 @@ msgstr ""
 "  vagy:    %s [-F ESZKÖZ | --file=ESZKÖZ] [-a|--all]\n"
 "  vagy:    %s [-F ESZKÖZ | --file=ESZKÖZ] [-g|--save]\n"
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
-msgstr ""
+msgstr "A terminál jellemzőinek kiírása vagy megváltoztatása.\n"
 
-#: src/stty.c:525
-#, fuzzy
+#: src/stty.c:528
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
 "  -g, --save         print all current settings in a stty-readable form\n"
 "  -F, --file=DEVICE  open and use the specified DEVICE instead of stdin\n"
 msgstr ""
-"A terminál jellemzőinek kiírása vagy megváltoztatása.\n"
-"\n"
 "  -a, --all          az összes aktuális beállítás kiírása ember által "
 "olvasható\n"
 "                       formában.\n"
@@ -10392,7 +10501,7 @@ msgstr ""
 "  -F, --file=ESZKÖZ  a megadott ESZKÖZ használata a szabványos bemenet "
 "helyett\n"
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
@@ -10403,7 +10512,7 @@ msgstr ""
 "beállításokat\n"
 "jelöl. Az alapul szolgáló rendszer határozza meg az elérhető beállításokat.\n"
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -10419,7 +10528,7 @@ msgstr ""
 "   eof KAR      a KAR egy fájl végét fog küldeni (a bemenet befejeztetése)\n"
 "   eol KAR      a KAR lezárja a sort\n"
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -10431,7 +10540,7 @@ msgstr ""
 "   intr KAR     a KAR egy megszakítási szignált fog küldeni\n"
 "   kill KAR     a KAR törli az aktuális sort\n"
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -10444,7 +10553,7 @@ msgstr ""
 " * rprnt KAR    a KAR újrarajzolja az aktuális sort\n"
 "   start KAR    a KAR újraindítja a kimenetet annak leállítása után\n"
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -10456,7 +10565,7 @@ msgstr ""
 " * swtch KAR    a KAR egy másik parancsértelmező-rétegre fog váltani\n"
 " * werase KAR   a KAR törli az utoljára begépelt szót\n"
 
-#: src/stty.c:562
+#: src/stty.c:565
 msgid ""
 "\n"
 "Special settings:\n"
@@ -10471,7 +10580,7 @@ msgstr ""
 " * columns N     ugyanaz, mint a cols N\n"
 
 # fixme line discipline???
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -10486,7 +10595,7 @@ msgstr ""
 "                   befejezett olvasáshoz\n"
 "   ospeed N      beállítja a kimeneti sebességet N-re\n"
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -10501,8 +10610,7 @@ msgstr ""
 "N\n"
 "                   tizedmásodpercre\n"
 
-#: src/stty.c:581
-#, fuzzy
+#: src/stty.c:584
 msgid ""
 "\n"
 "Control settings:\n"
@@ -10517,10 +10625,10 @@ msgstr ""
 "   [-]clocal     modem vezérlőszignálok letiltása\n"
 "   [-]cread      engedélyezi a bemenet fogadását\n"
 " * [-]crtscts    engedélyezi az RTS/CTS kézfogást\n"
+" * [-]cdtrdsr    engedélyezi a DTR/DSR kézfogást\n"
 "   csN           beállítja a karakterméretet N bitre, N értéke [5..8] lehet\n"
 
-#: src/stty.c:590
-#, fuzzy
+#: src/stty.c:593
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
 "   [-]hup        send a hangup signal when the last process closes the tty\n"
@@ -10528,6 +10636,7 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 "   [-]cstopb     két stop bit használata karakterenként (egy, ha „-�)\n"
 "   [-]hup        egy hangup szignál küldése amikor az utolsó folyamat "
@@ -10536,9 +10645,10 @@ msgstr ""
 "   [-]hupcl      ugyanaz, mint a [-]hup\n"
 "   [-]parenb     paritásbit előállítása a kimenetben és paritásbit\n"
 "                   feltételezése a bemenetben\n"
-"   [-]parodd     páratlan paritás beállítása (páros, ha „-�)\n"
+"   [-]parodd     páratlan paritás beállítása (vagy páros, ha „-�)\n"
+" * [-]cmspar     „stick� (jel/szóköz) paritás használata\n"
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -10554,7 +10664,7 @@ msgstr ""
 "   [-]ignbrk     sortörés karakterek figyelmen kívül hagyása\n"
 "   [-]igncr      kocsivissza figyelmen kívül hagyása\n"
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -10569,12 +10679,12 @@ msgstr ""
 "   [-]inpck      bemeneti paritás-ellenőrzés engedélyezése\n"
 "   [-]istrip     bemeneti karakterek magas (8.) bitjének törlése\n"
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr ""
 " * [-]iutf8      a bemeneti karakterek UTF-8 kódolásának feltételezése\n"
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -10591,7 +10701,7 @@ msgstr ""
 "   [-]parmrk     paritáshibák jelölése (egy 255-0 karaktersorozattal)\n"
 "   [-]tandem     ugyanaz, mint a [-]ixoff\n"
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -10607,10 +10717,11 @@ msgstr ""
 " * ffN           lapdobás késleltetési stílusa, N lehet [0..1]\n"
 " * nlN           új sor késleltetési stílusa, N lehet [0..1]\n"
 
-#: src/stty.c:631
+#: src/stty.c:635
+#, fuzzy
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
@@ -10625,7 +10736,7 @@ msgstr ""
 " * [-]onlcr      új sor karakterek kocsivissza - új sorrá alakítása\n"
 " * [-]onlret     az új sor kocsivisszát hajt végre\n"
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -10641,7 +10752,7 @@ msgstr ""
 " * -tabs         ugyanaz, mint a tab3\n"
 " * vtN           függőleges tab késleltetési stílus, N lehet [0..1]\n"
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -10658,8 +10769,7 @@ msgstr ""
 " * -crtkill      az összes vonal kilövése az echoctl és echok beállítások\n"
 "                   alkalmazásával\n"
 
-#: src/stty.c:654
-#, fuzzy
+#: src/stty.c:658
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
 "   [-]echo       echo input characters\n"
@@ -10673,8 +10783,7 @@ msgstr ""
 "   [-]echoe      ugyanaz, mint a [-]crterase\n"
 "   [-]echok      új sor visszaadása egy kill karakter után\n"
 
-#: src/stty.c:661
-#, fuzzy
+#: src/stty.c:665
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
 "   [-]echonl     echo newline even if not echoing other characters\n"
@@ -10691,8 +10800,7 @@ msgstr ""
 "                   bekapcsolása\n"
 "   [-]iexten     a nem POSIX különleges karakterek bekapcsolása\n"
 
-#: src/stty.c:668
-#, fuzzy
+#: src/stty.c:672
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
 "   [-]noflsh     disable flushing after interrupt and quit special "
@@ -10711,7 +10819,7 @@ msgstr ""
 " * [-]xcase      az icanon használatakor escape-elés a „\\� karakterekkel\n"
 "                   nagybetűs karakterekhez\n"
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -10725,7 +10833,7 @@ msgstr ""
 "   cbreak        ugyanaz, mint a -icanon\n"
 "   -cbreak       ugyanaz, mint az icanon\n"
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -10739,7 +10847,7 @@ msgstr ""
 "   -cooked       ugyanaz, mint a raw\n"
 "   crt           ugyanaz, mint az echoe echoctl echoke\n"
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -10755,7 +10863,7 @@ msgstr ""
 "                   értékeikre\n"
 "   evenp         ugyanaz, mint a parenb -parodd cs7\n"
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -10771,7 +10879,7 @@ msgstr ""
 "   nl            ugyanaz, mint az -icrnl -onlcr\n"
 "   -nl           ugyanaz, mint az icrnl -inlcr -igncr onlcr -ocrnl -onlret\n"
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -10785,7 +10893,7 @@ msgstr ""
 "   pass8         ugyanaz, mint a -parenb -istrip cs8\n"
 "   -pass8        ugyanaz, mint a parenb istrip cs7\n"
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -10798,7 +10906,7 @@ msgstr ""
 "                 -imaxbel -opost -isig -icanon -xcase min 1 time 0\n"
 "   -raw          ugyanaz, mint a cooked\n"
 
-#: src/stty.c:716
+#: src/stty.c:720
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
 "                 -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n"
@@ -10816,7 +10924,7 @@ msgstr ""
 "különleges\n"
 "                 karakter beállítása az alapértelmezett értékeikre\n"
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -10834,12 +10942,12 @@ msgstr ""
 "0177 vagy 127; a ^- vagy undef különleges értékek a különleges karakterek\n"
 "letiltására használatosak.\n"
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, c-format
 msgid "only one device may be specified"
 msgstr "csak egyetlen eszköz adható meg"
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
@@ -10848,43 +10956,43 @@ msgstr ""
 "a részletes és az stty-által olvasható kimeneti stílusok\n"
 "kapcsolói egymást kölcsönösen kizárják"
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr "egy kimeneti stílus megadásakor nem állíthatók be módok"
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr "%s: nem állítható vissza a nem blokkoló mód"
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, c-format
 msgid "invalid argument %s"
 msgstr "érvénytelen argumentum: %s"
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, c-format
 msgid "missing argument to %s"
 msgstr "a(z) %s argumentuma hiányzik"
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, c-format
 msgid "invalid line discipline %s"
 msgstr "érvénytelen vonalmódszer: %s"
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr "%s: nem hajtható végre az össze kért művelet"
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr "%s: nincsenek méretinformációk ehhez az eszközhöz"
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, c-format
 msgid "invalid integer argument %s"
 msgstr "érvénytelen egész argumentum: %s"
@@ -10944,28 +11052,28 @@ msgstr "      --help     ezen súgó megjelenítése és kilépés\n"
 msgid "      --version  output version information and exit\n"
 msgstr "      --version  verzióinformációk megjelenítése és kilépés\n"
 
-#: src/system.h:544
-#, fuzzy
+#: src/system.h:543
 msgid ""
 "\n"
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
-"Ha egy hosszú kapcsolóhoz kötelező argumentumot megadni, akkor ez a \n"
-"megfelelő rövid kapcsolónál is kötelező.\n"
+"\n"
+"A hosszú kapcsolók kötelező argumentumai a rövid kapcsolókhoz is kötelezők.\n"
 
-#: src/system.h:552
+#: src/system.h:551
+#, fuzzy
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 "\n"
 "A MÉRET egy egész és elhagyható egység (például: 10M = 10*1024*1024). Az\n"
 "egységek K, M, G, T, P, E, Z, Y (1024 hatványai) vagy KB, MB, … (1000 "
 "hatványai)\n"
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -10980,38 +11088,38 @@ msgstr ""
 "esetben az egység alapértelmezése 1024 bájt (vagy 512, ha a POSIXLY_CORRECT\n"
 "változó be van állítva).\n"
 
-#: src/system.h:571
+#: src/system.h:570
 #, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
+"%s online help: <%s>\n"
 msgstr ""
 "\n"
-"A(z) %s hibái a(z) %s címen jelenthetők.\n"
+"A(z) %s online súgója: <%s>\n"
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr ""
 "A(z) %s fordítási hibái a <http://translationproject.org/team/hu.html>\n"
 "címen jelenthetők.\n"
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr ""
 "A teljes dokumentációért futtassa az „info coreutils %s hívás� parancsot\n"
 
-#: src/system.h:596
-#, fuzzy, c-format
+#: src/system.h:591
+#, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "További információkért adja ki a(z) „%s --help� parancsot.\n"
 
-#: src/system.h:628
+#: src/system.h:633
 #, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -11032,14 +11140,12 @@ msgid "Jay Lepreau"
 msgstr "Jay Lepreau"
 
 #: src/tac.c:137
-#, fuzzy
 msgid ""
 "Write each FILE to standard output, last line first.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
 "Minden egyes F�JL kiírása a szabványos kimenetre, az utolsó sorral kezdve.\n"
 "Ha a F�JL nincs megadva, vagy -, akkor a szabványos bemenetet olvassa.\n"
-"\n"
 
 #: src/tac.c:144
 msgid ""
@@ -11099,7 +11205,7 @@ msgid "Ian Lance Taylor"
 msgstr "Ian Lance Taylor"
 
 #: src/tail.c:262
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Print the last %d lines of each FILE to standard output.\n"
 "With more than one FILE, precede each with a header giving the file name.\n"
@@ -11112,13 +11218,11 @@ msgstr ""
 
 #: src/tail.c:270
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
-"  -c, --bytes=K            az utolsó K bájt kiírása, ehelyett használható a -"
-"c +K\n"
+"  -c, --bytes=K            az utolsó K bájt kiírása, vagy használható a -c "
+"+K\n"
 "                           a bájtok kiíratására minden fájl K. bájtjától "
 "kezdve\n"
 
@@ -11126,33 +11230,31 @@ msgstr ""
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           a fájl növekedése során hozzáfűzött adatok "
 "kiírása;\n"
-"                             a -f, --follow és --follow=descriptor "
-"megegyeznek\n"
+"                             a hiányzó argumentum jelentése „descriptor�\n"
 "  -F                       ugyanaz, mint a --follow=name --retry\n"
 
-#: src/tail.c:281
+#: src/tail.c:280
 #, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
-msgstr ""
-"  -n, --lines=K            az utolsó K sor kiírása az utolsó %d helyett\n"
-"                             vagy a +K segítségével a sorok a K.-tól\n"
-"                             kezdődően írathatók ki\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
+msgstr ""
+"  -n, --lines=K            az utolsó K sor kiírása az utolsó %d helyett, "
+"vagy a\n"
+"                             +K segítségével a K.-tól kezdődően írathatók "
+"ki\n"
 "      --max-unchanged-stats=N\n"
 "                           a --follow=name kapcsolóval újranyit egy F�JLT,\n"
 "                             amely mérete nem változott N (alapértelmezett: "
@@ -11164,28 +11266,24 @@ msgstr ""
 "                             eset forgatott naplófájlok esetén).\n"
 "                             Az inotify használatakor ez ritkán hasznos.\n"
 
-#: src/tail.c:294
+#: src/tail.c:293
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 "      --pid=PID            a -f kapcsolóval, befejeződik, ha a PID\n"
 "                             folyamatazonosító megszűnik\n"
 "  -q, --quiet, --silent    ne írja ki a fájlneveket megadó fejléceket\n"
-"      --retry              próbáljon megnyitni egy fájlt akkor is, ha az "
-"(már)\n"
-"                             nem érhető el; hasznos név szerinti követéskor\n"
-"                             azaz a --follow=name kapcsolóval\n"
+"      --retry              próbáljon megnyitni egy fájlt akkor is, ha az\n"
+"                             nem érhető el\n"
 
-#: src/tail.c:301
+#: src/tail.c:298
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 "  -s, --sleep-interval=N   a -f kapcsolóval, aludjon körülbelül N "
@@ -11193,12 +11291,10 @@ msgstr ""
 "                             (alapértelmezett: 1.0) az ismétlések között\n"
 "                             Az inotify és a --pid=P használatakor a P "
 "folyamat\n"
-"                             ellenőrzése N másodpercenként legalább "
-"egyszer.\n"
+"                             ellenőrzése N másodpercenként legalább egyszer\n"
 "  -v, --verbose            mindig írja ki a fájlneveket megadó fejléceket\n"
 
-#: src/tail.c:310
-#, fuzzy
+#: src/tail.c:307
 msgid ""
 "\n"
 "If the first character of K (the number of bytes or lines) is a '+',\n"
@@ -11214,8 +11310,9 @@ msgstr ""
 "A K a következő szorzó-utótagokkal rendelkezhet:\n"
 "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
 "GB 1000*1000*1000, G 1024*1024*1024, és ugyanígy T, P, E, Z, Y.\n"
+"\n"
 
-#: src/tail.c:319
+#: src/tail.c:316
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
 "means that even if a tail'ed file is renamed, tail will continue to track\n"
@@ -11234,27 +11331,22 @@ msgstr ""
 "nevű fájlt úgy követi, hogy az átnevezést, eltávolítást és létrehozást "
 "kezelje.\n"
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr "%s lezárása (fd=%d)"
 
-#: src/tail.c:453
-#, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr "%s: nem lehet a(z) %s relatív eltolásra keresni"
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr "%s: nem lehet a(z) %s befejező relatív eltolásra keresni"
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr "%s helye nem határozható meg, visszatérés a lekérdezésre"
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
@@ -11263,142 +11355,155 @@ msgstr ""
 "Ismeretlen fájlrendszertípus (0x%08lx) ehhez: %s. Jelentse be ezt a hibát "
 "itt: %s. Visszaállás a lekérdezésre."
 
-#: src/tail.c:963
+#: src/tail.c:965
+#, c-format
+msgid "%s has been replaced with a symbolic link. giving up on this name"
+msgstr ""
+"%s le lett cserélve egy szimbolikus linkre, a program ezen a néven befejezi "
+"a próbálkozást"
+
+#: src/tail.c:980
 #, c-format
 msgid "%s has become inaccessible"
 msgstr "%s elérhetetlenné vált"
 
-#: src/tail.c:980
+#: src/tail.c:997
 #, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr ""
 "%s le lett cserélve egy követhetetlen fájlra;\n"
 "a program ezen a néven befejezi a próbálkozást"
 
-#: src/tail.c:989
+#: src/tail.c:1006
 #, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr ""
 "%s le lett cserélve egy távoli fájlra, a program ezen a néven befejezi a "
 "próbálkozást"
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, c-format
 msgid "%s has become accessible"
 msgstr "%s elérhetővé vált"
 
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr "%s megjelent; a program az új fájl végét követi"
 
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr "%s helyettesítésre került; a program az új fájl végét követi"
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr "%s: nem módosítható a nem blokkoló mód"
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr "%s: a fájl csonkítva"
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr "nem maradtak fájlok"
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, c-format
 msgid "cannot watch parent directory of %s"
 msgstr "nem lehet %s szülőkönyvtárát figyelni"
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, c-format
 msgid "inotify resources exhausted"
 msgstr "az inotify-erőforrások elfogytak"
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, c-format
 msgid "cannot watch %s"
 msgstr "%s nem figyelhető"
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr "hiba az inotify esemény figyelésekor"
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, c-format
 msgid "error reading inotify event"
 msgstr "hiba az inotify esemény olvasásakor"
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr ""
 "%s: ezen fájltípus vége nem követhető;\n"
 "a program ezen a néven befejezi a próbálkozást"
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, c-format
 msgid "number in %s is too large"
 msgstr "a szám túl nagy a következőben: %s"
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr ""
 "%s: a változatlan statok maximális száma érvénytelen a megnyitások között"
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr "%s: érvénytelen PID"
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr "%s: a másodpercek száma érvénytelen"
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr "a kapcsoló érvénytelen kontextusban került felhasználásra: -- %c"
 
-#: src/tail.c:2034
+#: src/tail.c:2096
 #, c-format
-msgid "warning: --retry is useful mainly when following by name"
+msgid "warning: --retry ignored; --retry is useful only when following"
 msgstr ""
-"figyelmeztetés: a --retry elsősorban név szerinti követés esetén hasznos"
+"figyelmeztetés: a --retry figyelmen kívül marad; a --retry csak követés "
+"esetén hasznos"
 
-#: src/tail.c:2038
+#: src/tail.c:2100
+#, c-format
+msgid "warning: --retry only effective for the initial open"
+msgstr "figyelmeztetés: a --retry csak a kezdeti megnyitáshoz hatásos"
+
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
 msgstr ""
 "figyelmeztetés: a PID figyelmen kívül marad; a --pid=PID csak követés\n"
 "esetén hasznos"
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr "figyelmeztetés: ez a rendszer nem támogatja a --pid=PID kapcsolót"
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, c-format
 msgid "cannot follow %s by name"
 msgstr "%s nem követhető név szerint"
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr "figyelmeztetés: a szabványos bemenet korlátlan követése nem hatékony"
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr "az inotify nem használható, visszatérés a lekérdezésre"
@@ -11664,7 +11769,6 @@ msgid "Matthew Bradburn"
 msgstr "Matthew Bradburn"
 
 #: src/test.c:858
-#, fuzzy
 msgid "missing ']'"
 msgstr "hiányzó „]�"
 
@@ -11674,21 +11778,21 @@ msgid "extra argument %s"
 msgstr "extra argumentum: %s"
 
 #: src/timeout.c:112
-#, fuzzy, c-format
+#, c-format
 msgid "warning: sigprocmask"
-msgstr "figyelmeztetés: timer_create"
+msgstr "figyelmeztetés: sigprocmask"
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr "figyelmeztetés: timer_settime"
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr "figyelmeztetés: timer_create"
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
@@ -11697,37 +11801,34 @@ msgstr ""
 "Használat: %s [KAPCSOLÓ] ID�TARTAM PARANCS [ARGUMENTUM]…\n"
 "  vagy:    %s [KAPCSOLÓ]\n"
 
-#: src/timeout.c:229
-#, fuzzy
+#: src/timeout.c:232
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
 msgstr ""
 "A PARANCS elindítása, és ha az ID�TARTAM után még mindig fut, akkor "
 "kilövése.\n"
-"\n"
-"Ha egy hosszú kapcsolóhoz kötelező argumentumot megadni, akkor ez a \n"
-"megfelelő rövid kapcsolónál is kötelező.\n"
 
-#: src/timeout.c:235
-#, fuzzy
+#: src/timeout.c:238
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
+"      --preserve-status\n"
+"                 kilépés ugyanazzal az állapottal, mint a PARANCS, még ha a\n"
+"                 parancs túl is lépi az időkorlátot\n"
 "      --foreground\n"
-"                 Ha a timeout nem közvetlenül a parancsértelmező promptból "
+"                 ha a timeout nem közvetlenül a parancsértelmező promptból "
 "fut,\n"
 "                   akkor a PARANCS olvashat a TTY-ról és TTY szignálokat\n"
 "                   kaphat. Ebben a módban a PARANCS gyermekei nem lépik túl "
@@ -11736,14 +11837,13 @@ msgstr ""
 "  -k, --kill-after=ID�TARTAM\n"
 "                 KILL szignál küldése, ha a PARANCS az első szignál "
 "elküldése\n"
-"                   után ennyi idővel még mindig fut.\n"
+"                   után ennyi idővel még mindig fut\n"
 "  -s, --signal=SZIGN�L\n"
 "                 az időtúllépéskor küldendő szignál megadása\n"
 "                   a SZIGN�L lehet név, mint például a „HUP�, vagy egy szám\n"
 "                   a szignálok listájáért lásd a „kill -l� kimenetét\n"
 
-#: src/timeout.c:254
-#, fuzzy
+#: src/timeout.c:257
 msgid ""
 "\n"
 "DURATION is a floating point number with an optional suffix:\n"
@@ -11754,8 +11854,7 @@ msgstr ""
 "Az ID�TARTAM egy lebegőpontos szám, és egy elhagyható UTÓTAG követheti:\n"
 "„s� (másodperc, alapértelmezett), „m� (perc), „h� (óra) vagy „d� (nap).\n"
 
-#: src/timeout.c:259
-#, fuzzy
+#: src/timeout.c:262
 msgid ""
 "\n"
 "If the command times out, and --preserve-status is not set, then exit with\n"
@@ -11772,22 +11871,23 @@ msgstr ""
 "szignált küldi el időtúllépéskor. A TERM szignál kilövi a szignált nem "
 "blokkoló\n"
 "vagy el nem kapó folyamatokat. Más folyamatok esetén a KILL (9) szignál\n"
-"használandó, mivel ez nem kapható el.\n"
+"használandó, mivel ez nem kapható el; ebben az esetben a kilépési állapot\n"
+"124 helyett 128+9.\n"
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr "figyelmeztetés: a magkiíratások letiltása meghiúsult"
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, c-format
 msgid "error waiting for command"
 msgstr "hiba a parancsra várakozás közben"
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
-msgstr ""
+msgstr "a megfigyelt parancs hibakeresési kimenetet adott vissza"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/touch.c:43
@@ -11815,7 +11915,6 @@ msgid "setting times of %s"
 msgstr "%s idejének beállítása"
 
 #: src/touch.c:213
-#, fuzzy
 msgid ""
 "Update the access and modification times of each FILE to the current time.\n"
 "\n"
@@ -11832,7 +11931,6 @@ msgstr ""
 "\n"
 "A - F�JL argumentum jelentése speciális, és hatására a touch\n"
 "a szabványos kimenethez társított fájl időit módosítja.\n"
-"\n"
 
 #: src/touch.c:225
 msgid ""
@@ -11861,7 +11959,6 @@ msgstr ""
 "  -m                   csak a módosítási időt módosítja\n"
 
 #: src/touch.c:237
-#, fuzzy
 msgid ""
 "  -r, --reference=FILE   use this file's times instead of current time\n"
 "  -t STAMP               use [[CC]YY]MMDDhhmm[.ss] instead of current time\n"
@@ -11891,7 +11988,7 @@ msgid "cannot specify times from more than one source"
 msgstr "az idők nem adhatók meg több forrásból"
 
 #: src/touch.c:409
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'"
 msgstr ""
@@ -12041,7 +12138,7 @@ msgstr ""
 "nem portolható"
 
 #: src/tr.c:673
-#, fuzzy, c-format
+#, c-format
 msgid "range-endpoints of '%s-%s' are in reverse collating sequence order"
 msgstr "a(z) „%s-%s� tartományvégpontok fordított rendezési sorrendben vannak"
 
@@ -12051,12 +12148,12 @@ msgid "invalid repeat count %s in [c*n] construct"
 msgstr "%s ismétlési szám érvénytelen a [c*n] szerkezetben"
 
 #: src/tr.c:910
-#, fuzzy, c-format
+#, c-format
 msgid "missing character class name '[::]'"
 msgstr "hiányzó karakterosztály-név: „[::]�"
 
 #: src/tr.c:913
-#, fuzzy, c-format
+#, c-format
 msgid "missing equivalence class character '[==]'"
 msgstr "hiányzó egyenlőségosztály-karakter: „[==]�"
 
@@ -12105,7 +12202,7 @@ msgid "[=c=] expressions may not appear in string2 when translating"
 msgstr "[=c=] kifejezések nem jelenhetnek meg a 2. karakterláncban fordításkor"
 
 #: src/tr.c:1505
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "when translating, the only character classes that may appear in\n"
 "string2 are 'upper' and 'lower'"
@@ -12171,7 +12268,6 @@ msgid "Usage: %s OPTION... FILE...\n"
 msgstr "Használat: %s KAPCSOLÓ… F�JL…\n"
 
 #: src/truncate.c:97
-#, fuzzy
 msgid ""
 "Shrink or extend the size of each FILE to the specified size\n"
 "\n"
@@ -12187,7 +12283,6 @@ msgstr ""
 "\n"
 "Ha egy F�JL nagyobb a megadott méretnél, akkor a további adatok elvesznek.\n"
 "Ha egy F�JL kisebb, akkor nulla bájtokkal megnövelésre kerül.\n"
-"\n"
 
 #: src/truncate.c:109
 msgid "  -c, --no-create        do not create any files\n"
@@ -12203,13 +12298,12 @@ msgstr ""
 #: src/truncate.c:115
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 "  -r, --reference=RF�JL  ezen RF�JL méretének használata\n"
-"  -s, --size=MÉRET       fájlméret beállítása ezen MÉRETRE vagy MÉRETTEL\n"
+"  -s, --size=MÉRET       fájlméret beállítása vagy módosítása MÉRET bájtra\n"
 
 #: src/truncate.c:121
-#, fuzzy
 msgid ""
 "\n"
 "SIZE may also be prefixed by one of the following modifying characters:\n"
@@ -12295,12 +12389,12 @@ msgstr ""
 "olvassa.\n"
 "\n"
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr "%s: a bemenet páratlan számú jelsort tartalmaz"
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr "%s: bemenet hurkot tartalmaz:"
@@ -12370,7 +12464,6 @@ msgid "cannot get system name"
 msgstr "nem kérhető le a rendszer neve"
 
 #: src/unexpand.c:117
-#, fuzzy
 msgid ""
 "Convert blanks in each FILE to tabs, writing to standard output.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -12378,7 +12471,6 @@ msgstr ""
 "Szóközök átalakítása minden egyes F�JLBAN tabokká és kiírás a szabványos\n"
 "kimenetre. Ha a F�JL nincs megadva, vagy -, akkor a szabványos bemenetet\n"
 "olvassa.\n"
-"\n"
 
 #: src/unexpand.c:124
 msgid ""
@@ -12407,13 +12499,12 @@ msgstr "a tabok túl messze vannak egymástól"
 msgid "tab stop value is too large"
 msgstr "a tab méret túl nagy"
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr "Használat: %s [KAPCSOLÓ]… [BEMENET [KIMENET]]\n"
 
-#: src/uniq.c:138
-#, fuzzy
+#: src/uniq.c:174
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
 "writing to OUTPUT (or standard output).\n"
@@ -12424,44 +12515,61 @@ msgstr ""
 "kiírás a KIMENETRE (vagy szabványos kimenetre).\n"
 "\n"
 "Kapcsolók nélkül az egyező sorok az első előfordulásba lesznek egyesítve.\n"
-"\n"
 
-#: src/uniq.c:147
+#: src/uniq.c:183
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
 msgstr ""
 "  -c, --count           a sorok elé az előfordulások számának kiírása\n"
-"  -d, --repeated        csak a kettőzött sorok kiírása\n"
+"  -d, --repeated        csak a kettőzött sorok kiírása, csoportonként egyet\n"
+
+#: src/uniq.c:187
+msgid ""
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
+msgstr ""
+"  -D, --all-repeated[=MÓD]  minden többször szereplő sor kiírása\n"
+"                          a csoportok üres sorral választhatók el\n"
+"                          MÓD={none(alapértelmezett),prepend,separate}\n"
 
-#: src/uniq.c:151
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr ""
+"  -f, --skip-fields=N   az első N mező összehasonlításának elkerülése\n"
+
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
+msgstr ""
+"      --group[=MÓD]     minden elem megjelenítése, a csoportok elválasztása\n"
+"                          üres sorral. MÓD={separate(alapértelmezett),"
+"prepend,\n"
+"                          append,both}\n"
+
+#: src/uniq.c:199
+#, fuzzy
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
 "  -i, --ignore-case     ignore differences in case when comparing\n"
 "  -s, --skip-chars=N    avoid comparing the first N characters\n"
 "  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
 msgstr ""
-"  -D, --all-repeated[=elhatárolási-mód] az összes többszörözött sor kiírása\n"
-"                        elhatárolási-mód={none(alapért.),prepend,separate}\n"
-"                        Az elhatárolás üres sorokkal valósul meg.\n"
-"  -f, --skip-fields=N   az első N mező összehasonlításának elkerülése\n"
 "  -i, --ignore-case     a kis- és nagybetűk nem különböznek "
 "összehasonlításkor\n"
 "  -s, --skip-chars=N    az első N karakter összehasonlításának elkerülése\n"
 "  -u, --unique          csak az egyedi sorok kiírása\n"
 "  -z, --zero-terminated  a sorok befejezése 0 bájttal új sor helyett\n"
 
-#: src/uniq.c:161
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr ""
 "  -w, --check-chars=N   a sorokban N-től ne hasonlítson össze több "
 "karaktert\n"
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 msgid ""
 "\n"
 "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n"
@@ -12472,8 +12580,7 @@ msgstr ""
 "üreshely karakterek követnek. A mezők karakterek előtti része ki lesz "
 "hagyva.\n"
 
-#: src/uniq.c:171
-#, fuzzy
+#: src/uniq.c:217
 msgid ""
 "\n"
 "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n"
@@ -12486,24 +12593,34 @@ msgstr ""
 "parancsot a „uniq� nélkül. Az összehasonlítások figyelembe veszik az\n"
 "„LC_COLLATE� által megadott szabályokat.\n"
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, c-format
 msgid "too many repeated lines"
 msgstr "túl sok ismétlődő sor"
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
 msgstr "a kihagyandó mezők száma érvénytelen"
 
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
 msgstr "a kihagyandó bájtok száma érvénytelen"
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
 msgstr "az összehasonlítandó bájtok száma érvénytelen"
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr "a --group és a -c/-d/-D/-u kapcsolók kölcsönösen kizárják egymást"
+
+#: src/uniq.c:652
+#, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr "a csoportosítás és az ismétlődések számának kiírása értelmetlen"
+
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr "az összes kettőzött sor és az ismétlődések kiírása értelmetlen"
@@ -12525,11 +12642,6 @@ msgstr ""
 "Az unlink függvény meghívása a megadott F�JL törlése érdekében.\n"
 "\n"
 
-#: src/unlink.c:86
-#, c-format
-msgid "cannot unlink %s"
-msgstr "%s törlése sikertelen"
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -12558,9 +12670,9 @@ msgstr[0] "fut %ld nap %2d.%02d,  "
 msgstr[1] "fut %ld nap %2d.%02d,  "
 
 #: src/uptime.c:149
-#, fuzzy, c-format
+#, c-format
 msgid "up  %2d:%02d,  "
-msgstr "fut %ld nap %2d.%02d,  "
+msgstr "fut %2d.%02d,  "
 
 #: src/uptime.c:151
 #, c-format
@@ -12574,7 +12686,7 @@ msgstr[1] "%lu felhasználó"
 msgid ",  load average: %.2f"
 msgstr ",  átlagos terh.: %.2f"
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -12587,7 +12699,7 @@ msgstr ""
 "15\n"
 "percre vonatkozóan."
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
@@ -12596,12 +12708,12 @@ msgstr ""
 "  A megszakíthatatlan\n"
 "alvási állapotban lévő folyamatok is hozzájárulnak az átlagos terheléshez.\n"
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr "\n"
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
@@ -12800,7 +12912,7 @@ msgstr ""
 "      --writable    ugyanaz, mint a -T\n"
 
 #: src/who.c:673
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
@@ -12809,7 +12921,7 @@ msgstr ""
 "\n"
 "Ha a F�JL nincs megadva, akkor a %s fájlt használja.\n"
 "A %s használata általános a F�JLKÉNT. Az ARG1 ARG2 hatása azonos\n"
-" a -m kapcsolóval; funkciója csupán a „who am i� vagy a „who mom likes� és\n"
+"a -m kapcsolóval; funkciója csupán a „who am i� vagy a „who mom likes� és\n"
 "hasonló parancsok értelmes megválaszolása.\n"
 
 #: src/whoami.c:45
@@ -12838,32 +12950,412 @@ msgstr ""
 "  vagy:    %s KAPCSOLÓ\n"
 
 #: src/yes.c:47
-#, fuzzy
 msgid ""
 "Repeatedly output a line with all specified STRING(s), or 'y'.\n"
 "\n"
 msgstr ""
-"Az összes megadott KARAKTERL�NCOT vagy az „y�-t tartalmazó sor ismételt\n"
+"Az összes megadott KARAKTERL�NCOT vagy az „y�-t tartalmazó sor ismételt "
 "kiírása.\n"
 "\n"
 
+#~ msgid "cannot create pipe"
+#~ msgstr "nem hozható létre adatcsatorna"
+
+#~ msgid "%s subprocess failed"
+#~ msgstr "%s alfolyamat sikertelen"
+
+#~ msgid "_open_osfhandle failed"
+#~ msgstr "az _open_osfhandle meghiúsult"
+
+#~ msgid "cannot restore fd %d: dup2 failed"
+#~ msgstr "a(z) %d fájlleíró nem állítható vissza: a dup2 sikertelen"
+
+#~ msgid "%s subprocess"
+#~ msgstr "%s alfolyamat"
+
+#~ msgid "%s subprocess got fatal signal %d"
+#~ msgstr "%s alfolyamat végzetes szignált (%d) kapott"
+
+#~ msgid "failed to set additional groups"
+#~ msgstr "a további csoportok beállítása meghiúsult"
+
+#~ msgid "mount point %s already traversed"
+#~ msgstr "%s csatolási pont már bejárva"
+
+#~ msgid "%s: cannot lseek back to original position"
+#~ msgstr "%s: nem lehet lseek-elni az eredeti pozícióra"
+
+#~ msgid "%s: failed to reset file pointer"
+#~ msgstr "%s: a fájlmutató visszaállítása meghiúsult"
+
+#~ msgid "cannot reposition file pointer for %s"
+#~ msgstr "nem lehet újrapozicionálni %s fájlmutatóját"
+
+#~ msgid ""
+#~ "  -Z, --context[=CTX]  set the SELinux security context of each NAME to\n"
+#~ "                         default type, or CTX if specified\n"
+#~ msgstr ""
+#~ "  -Z, --context[=KTX]  minden NÉV SELinux biztonsági kontextusának "
+#~ "beállítása\n"
+#~ "                         az alapértelmezett típusra, vagy\n"
+#~ "                         ha meg van adva akkor a KTX-ra\n"
+
+#~ msgid ""
+#~ "  -Z, --context[=CTX]  set the SELinux security context of NAME to\n"
+#~ "                         default type, or to CTX if specified\n"
+#~ msgstr ""
+#~ "  -Z, --context[=KTX]  a NÉV SELinux biztonsági kontextusának beállítása\n"
+#~ "                         az alapértelmezett típusra, vagy\n"
+#~ "                         ha meg van adva akkor a KTX-ra\n"
+
+#~ msgid "out of memory (requested %zu bytes)"
+#~ msgstr "elfogyott a memória (%zu bájt lett kérve)"
+
+#~ msgid "--padding cannot be combined with --format"
+#~ msgstr "a --padding nem kombinálható a --format kapcsolóval"
+
+#~ msgid ""
+#~ "Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
+#~ "  or:  %s LONG-OPTION\n"
+#~ msgstr ""
+#~ "Használat: %s [RÖVID KAPCSOLÓ]… FELHASZN�LÓ PARANCS [ARGUMENTUM]…\n"
+#~ "  vagy:    %s HOSSZÚ KAPCSOLÓ\n"
+
+#~ msgid ""
+#~ "Drop any supplemental groups, assume the user-ID and group-ID of the "
+#~ "specified\n"
+#~ "USER (numeric ID or user name), and run COMMAND with any specified "
+#~ "ARGUMENTs.\n"
+#~ "Exit with status 111 if unable to assume the required user and group ID.\n"
+#~ "Otherwise, exit with the exit status of COMMAND.\n"
+#~ "This program is useful only when run by root (user ID zero).\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Minden kiegészítő csoport eldobása, a megadott FELHASZN�LÓNÉV "
+#~ "felhasználó- és\n"
+#~ "csoportazonosítójának felvétele és a PARANCS futtatása a megadott\n"
+#~ "ARGUMENTUMOKKAL. 111-es állapottal lép ki, ha a szükséges UID és GID nem\n"
+#~ "vehető fel. Egyébként a PARANCS kilépési állapotával tér vissza.\n"
+#~ "Ez a program csak akkor hasznos, ha a root (0 felhasználói azonosító) "
+#~ "futtatja.\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, "
+#~ "and\n"
+#~ "                      (if specified) supplemental group IDs to GID1, ...\n"
+#~ msgstr ""
+#~ "  -g GID[,GID1…]  az elsődleges csoportazonosító beállítása a numerikus "
+#~ "GID-re\n"
+#~ "                      és (ha meg van adva) akkor a kiegészítő "
+#~ "csoportazonosítók\n"
+#~ "                      beállítása a GID1, … értékeire\n"
+
+#~ msgid "unknown user-ID: %s"
+#~ msgstr "ismeretlen felhasználói azonosító: %s"
+
+#~ msgid "to use user-ID %s you need to use -g too"
+#~ msgstr ""
+#~ "a(z) %s felhasználói azonosító használatához a -g kapcsolót is használnia "
+#~ "kell"
+
+#~ msgid "cannot set group-ID to %lu"
+#~ msgstr "a csoportazonosító nem állítható be a következőre: %lu"
+
+#~ msgid "cannot set user-ID to %lu"
+#~ msgstr "a felhasználói azonosító nem állítható be a következőre: %lu"
+
+#~ msgid "failed to get file system create context"
+#~ msgstr "a fájlrendszer létrehozási kontextusának lekérése meghiúsult"
+
+#~ msgid "warning: "
+#~ msgstr "figyelmeztetés: "
+
+#~ msgid "long option '--megabytes' is deprecated and will soon be removed"
+#~ msgstr "a „--megabytes� hosszú kapcsoló elavult és hamarosan megszűnik"
+
+#~ msgid "Usage: %s [OPTION]... [USERNAME]\n"
+#~ msgstr "Használat: %s [KAPCSOLÓ]… [FELHASZN�LÓNÉV]\n"
+
+#~ msgid ""
+#~ "      --strict         with --check, exit non-zero for any invalid input\n"
+#~ msgstr ""
+#~ "      --strict         a --check kapcsolóval: nem nulla értékkel lép ki "
+#~ "minden\n"
+#~ "                         érvénytelen bemenet esetén\n"
+
+#~ msgid "failed to redirect stderr to /dev/null"
+#~ msgstr "a szabványos hibakimenet átirányítása meghiúsult a /dev/null-ba"
+
+#~ msgid "invalid number: '%s'"
+#~ msgstr "érvénytelen szám: „%s�"
+
+#~ msgid ""
+#~ "\n"
+#~ "With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Ha a F�JL nincs megadva, vagy -, akkor a szabványos bemenetet olvassa.\n"
+#~ "A „-F /� az alapértelmezés.\n"
+
+#~ msgid "cannot remove directory: %s"
+#~ msgstr "nem törölhető a következő könyvtár: %s"
+
+#~ msgid "dup2 failed"
+#~ msgstr "a dup2 meghiúsult"
+
+#~ msgid "couldn't execute %s"
+#~ msgstr "nem hajtható végre: %s"
+
+#~ msgid "couldn't execute %s -d"
+#~ msgstr "nem hajtható végre: %s -d"
+
+#~ msgid ""
+#~ "\n"
+#~ "Report %s bugs to %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "A(z) %s hibái a(z) %s címen jelenthetők.\n"
+
+#~ msgid "warning: --retry is useful mainly when following by name"
+#~ msgstr ""
+#~ "figyelmeztetés: a --retry elsősorban név szerinti követés esetén hasznos"
+
 #~ msgid "using single-precision arithmetic"
 #~ msgstr "egyszeres pontosságú aritmetika használata"
 
 #~ msgid "using arbitrary-precision arithmetic"
 #~ msgstr "tetszőleges pontosságú aritmetika használata"
 
-#, fuzzy
+#~ msgid ""
+#~ "simple_strtod_human:\n"
+#~ "  input string: '%s'\n"
+#~ "  locale decimal-point: '%s'\n"
+#~ msgstr ""
+#~ "simple_strtod_human:\n"
+#~ "  bemeneti karakterlánc: „%s�\n"
+#~ "  területi decimális pont: „%s�\n"
+
+#~ msgid ""
+#~ "  parsed numeric value: %Lf\n"
+#~ "  input precision = %d\n"
+#~ msgstr ""
+#~ "  feldolgozott számérték: %Lf\n"
+#~ "  bemenet pontossága = %d\n"
+
+#~ msgid "  Auto-scaling, found 'i', switching to base %d\n"
+#~ msgstr "  Auto-méretezés, „i� megtalálva, átváltás %d alapra\n"
+
+#~ msgid "  suffix power=%d^%d = %Lf\n"
+#~ msgstr "  utótag kitevője=%d^%d = %Lf\n"
+
+#~ msgid "  returning value: %Lf (%LG)\n"
+#~ msgstr "  érték visszaadása: %Lf (%LG)\n"
+
+#~ msgid "double_to_human:\n"
+#~ msgstr "double_to_human:\n"
+
+#~ msgid "  no scaling, returning (grouped) value: %'.*Lf\n"
+#~ msgstr "  nincs méretezés, (csoportosított) érték visszaadása: %'.*Lf\n"
+
+#~ msgid "  no scaling, returning value: %.*Lf\n"
+#~ msgstr "  nincs méretezés, érték visszaadása: %.*Lf\n"
+
+#~ msgid "  scaled value to %Lf * %0.f ^ %d\n"
+#~ msgstr "  érték méretezve erre: %Lf * %0.f ^ %d\n"
+
+#~ msgid "  after rounding, value=%Lf * %0.f ^ %d\n"
+#~ msgstr "  kerekítés után érték=%Lf * %0.f ^ %d\n"
+
+#~| msgid "creating file %s\n"
 #~ msgid "  returning value: '%s'\n"
-#~ msgstr "%s fájl létrehozása\n"
+#~ msgstr "  érték visszaadása: „%s�\n"
 
-#, fuzzy
+#~| msgid "Usage: %s [OPTION]... [USER]...\n"
 #~ msgid "Usage: %s [OPTIONS] [NUMBER]\n"
-#~ msgstr "Használat: %s [KAPCSOLÓ]… [FELHASZN�LÓ]…\n"
+#~ msgstr "Használat: %s [KAPCSOLÓK] [SZ�M]\n"
 
-#, fuzzy
+#~ msgid ""
+#~ "  --from=UNIT     auto-scale input numbers to UNITs. Default is 'none'.\n"
+#~ "                  See UNIT below.\n"
+#~ "  --from-unit=N   specify the input unit size (instead of the default "
+#~ "1).\n"
+#~ "  --to=UNIT       auto-scale output numbers to UNITs.\n"
+#~ "                  See UNIT below.\n"
+#~ "  --to-unit=N     the output unit size (instead of the default 1).\n"
+#~ "  --round=METHOD  the rounding method to use when scaling. METHOD can "
+#~ "be:\n"
+#~ "                  up, down, from-zero (default), towards-zero, nearest\n"
+#~ "  --suffix=SUFFIX add SUFFIX to output numbers, and accept optional "
+#~ "SUFFIX\n"
+#~ "                  in input numbers.\n"
+#~ "  --padding=N     pad the output to N characters.\n"
+#~ "                  Positive N will right-aligned. Negative N will left-"
+#~ "align.\n"
+#~ "                  Note: if the output is wider than N, padding is "
+#~ "ignored.\n"
+#~ "                  Default is to automatically pad if whitespace is "
+#~ "found.\n"
+#~ "  --grouping      group digits together (e.g. 1,000,000).\n"
+#~ "                  Uses the locale-defined grouping (i.e. have no effect\n"
+#~ "                  in C/POSIX locales).\n"
+#~ "  --header[=N]    print (without converting) the first N header lines.\n"
+#~ "                  N defaults to 1 if not specified.\n"
+#~ "  --field N       replace the number in input field N (default is 1)\n"
+#~ "  -d, --delimiter=X  use X instead of whitespace for field delimiter\n"
+#~ "  --format=FORMAT use printf style floating-point FORMAT.\n"
+#~ "                  See FORMAT below for details.\n"
+#~ "  --invalid=MODE  failure mode for invalid numbers: MODE can be:\n"
+#~ "                  abort (the default), fail, warn, ignore.\n"
+#~ "  --debug         print warnings about invalid input.\n"
+#~ "  \n"
+#~ msgstr ""
+#~ "  --from=EGYSÉG   a bemeneti számok automatikus méretezése EGYSÉGEKRE.\n"
+#~ "                    Alapértelmezett: „none�. Lásd alább az EGYSÉG "
+#~ "leírását.\n"
+#~ "  --from-unit=N   a bemeneti egység méretének megadása (az alap 1 "
+#~ "helyett).\n"
+#~ "  --to=EGYSÉG     kimeneti számok automatikus méretezése EGYSÉGRE.\n"
+#~ "                  Lásd alább az EGYSÉG leírását.\n"
+#~ "  --to-unit=N     a kimeneti egység mérete (az alap 1 helyett).\n"
+#~ "  --round=MÓDSZER   a méretezéskor használandó kerekítési módszer. "
+#~ "Lehetséges\n"
+#~ "                    értékek: up, down, from-zero (alap), towards-zero, "
+#~ "nearest\n"
+#~ "  --suffix=UTÓTAG UTÓTAG hozzáadása a kimeneti számokhoz, és elhagyható "
+#~ "UTÓTAG\n"
+#~ "                    elfogadása a bemeneti számokban.\n"
+#~ "  --padding=N     a kimenet kiegészítése N karakterre.\n"
+#~ "                    A pozitív N jobbra igazít, a negatív N balra.\n"
+#~ "                    Megjegyzés: ha a kimenet N-nél szélesebb, a padding "
+#~ "kapcsoló\n"
+#~ "                    figyelmen kívül marad. Az alapértelmezés az "
+#~ "automatikus\n"
+#~ "                    kitöltés, ha a kimenetben van üreshely.\n"
+#~ "  --grouping      számjegyek csoportosítása (például 1,000,000).\n"
+#~ "                  A területi beállítástól függő csoportosítást használja\n"
+#~ "                    (azaz nincs hatása C/POSIX locale esetén.\n"
+#~ "  --header[=N]    az első N fejlécsor kiírása (konvertálás nélkül).\n"
+#~ "                    Az N alapértelmezett értéke 1, ha nincs megadva.\n"
+#~ "  --field N       a szám helyettesítése az N. bemeneti mezőben (alap=1)\n"
+#~ "  -d, --delimiter=X  az X használata mezőhatárolóként az üreshely "
+#~ "helyett\n"
+#~ "  --format=FORM�TUM printf stílusú lebegőpontos FORM�TUM használata.\n"
+#~ "                      Részletekért lásd a FORM�TUMOT alább.\n"
+#~ "  --invalid=MÓD   hibamód érvénytelen számokhoz: a MÓD lehet:\n"
+#~ "                  abort (alapértelmezés), fail, warn, ignore.\n"
+#~ "  --debug         figyelmeztetések kiírása az érvénytelen bemenetről.\n"
+#~ "  \n"
+
+#~ msgid ""
+#~ "\n"
+#~ "UNIT options:\n"
+#~ "  none       No auto-scaling is done. Suffixes will trigger an error.\n"
+#~ "  auto       Accept optional single-letter/two-letter suffix:\n"
+#~ "             1K  = 1000\n"
+#~ "             1Ki = 1024\n"
+#~ "             1M  = 1000000\n"
+#~ "             1Mi = 1048576\n"
+#~ "  si         Accept optional single letter suffix:\n"
+#~ "             1K = 1000\n"
+#~ "             1M = 1000000\n"
+#~ "             ...\n"
+#~ "  iec        Accept optional single letter suffix:\n"
+#~ "             1K = 1024\n"
+#~ "             1M = 1048576\n"
+#~ "             ...\n"
+#~ "  iec-i      Accept optional two-letter suffix:\n"
+#~ "             1Ki = 1024\n"
+#~ "             1Mi = 1048576\n"
+#~ "             ...\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Lehetséges EGYSÉGEK:\n"
+#~ "  none       Nincs automatikus méretezés. Az utótagok használata hibát "
+#~ "okoz.\n"
+#~ "  auto       Opcionális egybetűs/kétbetűs utótag elfogadása:\n"
+#~ "             1K  = 1000\n"
+#~ "             1Ki = 1024\n"
+#~ "             1M  = 1000000\n"
+#~ "             1Mi = 1048576\n"
+#~ "  si         Opcionális egybetűs utótag elfogadása:\n"
+#~ "             1K = 1000\n"
+#~ "             1M = 1000000\n"
+#~ "             ...\n"
+#~ "  iec        Opcionális egybetűs utótag elfogadása:\n"
+#~ "             1K = 1024\n"
+#~ "             1M = 1048576\n"
+#~ "             ...\n"
+#~ "  iec-i      Opcionális kétbetűs utótag elfogadása:\n"
+#~ "             1Ki = 1024\n"
+#~ "             1Mi = 1048576\n"
+#~ "             ...\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "format String:\n"
+#~ "  input: %s\n"
+#~ "  grouping: %s\n"
+#~ "  padding width: %ld\n"
+#~ "  alignment: %s\n"
+#~ "  prefix: '%s'\n"
+#~ "  suffix: '%s'\n"
+#~ msgstr ""
+#~ "formátum-karakterlánc:\n"
+#~ "  bemenet: %s\n"
+#~ "  csoportosítás: %s\n"
+#~ "  kitöltés szélessége: %ld\n"
+#~ "  igazítás: %s\n"
+#~ "  előtag: „%s�\n"
+#~ "  utótag: „%s�\n"
+
+#~ msgid ""
+#~ "formatting output:\n"
+#~ "  value: %Lf\n"
+#~ "  humanized: '%s'\n"
+#~ msgstr ""
+#~ "kimenet formázása:\n"
+#~ "  érték: %Lf\n"
+#~ "  emberi formátumban: „%s�\n"
+
+#~ msgid "  After padding: '%s'\n"
+#~ msgstr "  Kitöltés után: „%s�\n"
+
+#~ msgid "trimming suffix '%s'\n"
+#~ msgstr "„%s� utótag levágása\n"
+
+#~| msgid "%s: invalid suffix length"
 #~ msgid "no valid suffix found\n"
-#~ msgstr "%s: érvénytelen utótaghossz"
+#~ msgstr "nem található érvényes utótag\n"
+
+#~ msgid "setting Auto-Padding to %ld characters\n"
+#~ msgstr "automatikus kitöltés beállítása %ld karakterre\n"
+
+#~ msgid ""
+#~ "extracting Fields:\n"
+#~ "  input: '%s'\n"
+#~ "  field: %d\n"
+#~ msgstr ""
+#~ "mezők kinyerése:\n"
+#~ "  bemenet: „%s�\n"
+#~ "  mező: %d\n"
+
+#~ msgid ""
+#~ "  TOO FEW FIELDS!\n"
+#~ "  prefix: '%s'\n"
+#~ msgstr ""
+#~ "  TÚL KEVÉS MEZ�!\n"
+#~ "  előtag: „%s�\n"
+
+#~ msgid ""
+#~ "  prefix: '%s'\n"
+#~ "  number: '%s'\n"
+#~ "  suffix: '%s'\n"
+#~ msgstr ""
+#~ "  előtag: „%s�\n"
+#~ "  szám: „%s�\n"
+#~ "  utótag: „%s�\n"
 
 #~ msgid ""
 #~ "\n"
diff --git a/po/ia.gmo b/po/ia.gmo
index c4c808b3..5aaee233 100644
--- a/po/ia.gmo
+++ b/po/ia.gmo
diff --git a/po/ia.po b/po/ia.po
index 92b801ff..91deeb8a 100644
--- a/po/ia.po
+++ b/po/ia.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: coreutils-8.20-pre1\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
 "PO-Revision-Date: 2012-12-22 07:27+0400\n"
 "Last-Translator: Nik Kalach <nik.kalach@inbox.ru>\n"
 "Language-Team: Interlingua <translation-team-ia@lists.sourceforge.net>\n"
@@ -35,76 +35,123 @@ msgstr "Le argumentos valide es:"
 msgid "error closing file"
 msgstr "error al clauder le file"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "error de scriptura"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "preservation del permissiones pro %s"
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "Error del systema incognite"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "file regular vacue"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "file regular"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "directorio"
 
-#: lib/file-type.c:44
-msgid "block special file"
-msgstr "file special de blocos"
-
-#: lib/file-type.c:47
-msgid "character special file"
-msgstr "file special de characteres"
-
-#: lib/file-type.c:50
-msgid "fifo"
-msgstr "fifo"
-
-#: lib/file-type.c:53
+#: lib/file-type.c:46
 msgid "symbolic link"
 msgstr "ligamine symbolic"
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "socket"
-
-#: lib/file-type.c:59
+#: lib/file-type.c:52
 msgid "message queue"
 msgstr "cauda de messages"
 
-#: lib/file-type.c:62
+#: lib/file-type.c:55
 msgid "semaphore"
 msgstr "semaphoro"
 
-#: lib/file-type.c:65
+#: lib/file-type.c:58
 msgid "shared memory object"
 msgstr "objecto de memoria condivise"
 
-#: lib/file-type.c:68
+#: lib/file-type.c:61
 msgid "typed memory object"
 msgstr "objecto de memoria con typo"
 
-#: lib/file-type.c:70
+#: lib/file-type.c:66
+msgid "block special file"
+msgstr "file special de blocos"
+
+#: lib/file-type.c:69
+msgid "character special file"
+msgstr "file special de characteres"
+
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr ""
+
+#: lib/file-type.c:75
+msgid "fifo"
+msgstr "fifo"
+
+#: lib/file-type.c:78
+msgid "door"
+msgstr ""
+
+#: lib/file-type.c:81
+#, fuzzy
+msgid "multiplexed block special file"
+msgstr "file special de blocos"
+
+#: lib/file-type.c:84
+#, fuzzy
+msgid "multiplexed character special file"
+msgstr "file special de characteres"
+
+#: lib/file-type.c:87
+msgid "multiplexed file"
+msgstr ""
+
+#: lib/file-type.c:90
+#, fuzzy
+msgid "named file"
+msgstr "file estranie"
+
+#: lib/file-type.c:93
+#, fuzzy
+msgid "network special file"
+msgstr "file special de blocos"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr ""
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr ""
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr ""
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "socket"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr ""
+
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "file estranie"
 
@@ -239,18 +286,18 @@ msgstr "%s: le option '-W %s' non accepta necun argumento\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: le option '-W %s' require un argumento\n"
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr "impossibile de cambiar le permissiones de %s"
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "impossibile de crear le directorio %s"
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr "memoria exhauste"
@@ -367,7 +414,7 @@ msgstr "Expression regular es troppo grande"
 msgid "Unmatched ) or \\)"
 msgstr ") o \\) non accopulate"
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 msgid "No previous regular expression"
 msgstr "Nulle expression regular previe"
 
@@ -392,7 +439,7 @@ msgstr "utilisa --no-preserve-root pro inhibir iste mesura de securitate"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[sSyY]"
 
@@ -402,11 +449,11 @@ msgstr "^[sSyY]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, c-format
 msgid "setting permissions for %s"
 msgstr "initiation de permissiones de %s"
@@ -547,18 +594,6 @@ msgstr ""
 msgid "Resource lost"
 msgstr ""
 
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, c-format
-msgid "cannot create pipe"
-msgstr ""
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, c-format
-msgid "%s subprocess failed"
-msgstr ""
-
 #: lib/strsignal.c:114
 #, c-format
 msgid "Real-time signal %d"
@@ -742,7 +777,7 @@ msgstr ""
 msgid "Report %s bugs to: %s\n"
 msgstr ""
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr ""
@@ -752,30 +787,10 @@ msgstr ""
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr ""
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr ""
 
-#: lib/w32spawn.h:43
-#, c-format
-msgid "_open_osfhandle failed"
-msgstr ""
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr ""
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr ""
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr ""
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr ""
@@ -797,7 +812,7 @@ msgstr ""
 msgid "failed to reopen %s with mode %s"
 msgstr ""
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr ""
@@ -854,7 +869,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -869,48 +884,47 @@ msgid ""
 "from any other non-alphabet bytes in the encoded stream.\n"
 msgstr ""
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr ""
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, c-format
 msgid "invalid input"
 msgstr ""
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, c-format
 msgid "invalid wrap size: %s"
 msgstr ""
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, c-format
 msgid "extra operand %s"
 msgstr ""
 
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, c-format
 msgid "closing standard input"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -935,8 +949,8 @@ msgstr ""
 #: src/basename.c:60
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/basename.c:67
@@ -950,32 +964,31 @@ msgid ""
 "  %s -a any/str1 any/str2   -> \"str1\" followed by \"str2\"\n"
 msgstr ""
 
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, c-format
 msgid "missing operand"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 msgid "Richard M. Stallman"
 msgstr ""
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1015,7 +1028,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr ""
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr ""
@@ -1032,14 +1045,14 @@ msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 msgid "Jim Meyering"
 msgstr ""
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, c-format
 msgid "failed to create security context: %s"
 msgstr ""
@@ -1049,8 +1062,8 @@ msgstr ""
 msgid "failed to set %s security context component to %s"
 msgstr ""
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, c-format
 msgid "failed to get security context of %s"
 msgstr ""
@@ -1060,18 +1073,18 @@ msgstr ""
 msgid "can't apply partial context to unlabeled file %s"
 msgstr ""
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, c-format
 msgid "failed to change context of %s to %s"
 msgstr ""
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
 msgstr ""
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, c-format
 msgid "cannot read directory %s"
 msgstr ""
@@ -1081,13 +1094,14 @@ msgstr ""
 msgid "changing security context of %s\n"
 msgstr ""
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, c-format
 msgid "fts_read failed"
 msgstr ""
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, c-format
 msgid "fts_close failed"
 msgstr ""
@@ -1102,7 +1116,7 @@ msgstr ""
 
 #: src/chcon.c:357
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
@@ -1123,7 +1137,7 @@ msgid ""
 "  -l, --range=RANGE      set range RANGE in the target security context\n"
 msgstr ""
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
 "      --preserve-root    fail to operate recursively on '/'\n"
@@ -1159,36 +1173,37 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr ""
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr ""
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, c-format
 msgid "missing operand after %s"
 msgstr ""
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, c-format
 msgid "invalid context: %s"
 msgstr ""
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr ""
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, c-format
 msgid "failed to get attributes of %s"
 msgstr ""
@@ -1212,7 +1227,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
@@ -1240,47 +1255,47 @@ msgid ""
 "  %s -hR staff /u  Change the group of /u and subfiles to \"staff\".\n"
 msgstr ""
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
 msgstr ""
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr ""
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr ""
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr ""
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr ""
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr ""
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, c-format
 msgid "changing permissions of %s"
 msgstr ""
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr ""
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1288,33 +1303,33 @@ msgid ""
 "  or:  %s [OPTION]... --reference=RFILE FILE...\n"
 msgstr ""
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 msgid ""
 "Change the mode of each FILE to MODE.\n"
 "With --reference, change the mode of each FILE to that of RFILE.\n"
 "\n"
 msgstr ""
 
-#: src/chmod.c:391
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr ""
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 msgid ""
 "\n"
 "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n"
 msgstr ""
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr ""
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, c-format
 msgid "invalid mode: %s"
 msgstr ""
@@ -1440,72 +1455,81 @@ msgid ""
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr ""
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr ""
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, c-format
 msgid "invalid group list %s"
 msgstr ""
 
-#: src/chroot.c:117
-#, c-format
-msgid "failed to set additional groups"
-msgstr ""
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
 "  or:  %s OPTION\n"
 msgstr ""
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
 msgstr ""
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
 msgstr ""
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 msgid ""
 "\n"
 "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n"
 msgstr ""
 
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, c-format
 msgid "cannot change root directory to %s"
 msgstr ""
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, c-format
 msgid "cannot chdir to root directory"
 msgstr ""
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr ""
+
+#: src/chroot.c:383
+#, c-format
+msgid "failed to get supplemental groups"
+msgstr ""
+
+#: src/chroot.c:395
+#, c-format
+msgid "failed to %s supplemental groups"
+msgstr ""
+
+#: src/chroot.c:402
 #, c-format
 msgid "failed to set group-ID"
 msgstr ""
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, c-format
 msgid "failed to set user-ID"
 msgstr ""
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, c-format
 msgid "failed to run command %s"
 msgstr ""
@@ -1533,7 +1557,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr ""
@@ -1600,294 +1624,327 @@ msgstr ""
 msgid "empty %s not allowed"
 msgstr ""
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr ""
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, c-format
 msgid "cannot lseek %s"
 msgstr ""
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr ""
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, c-format
 msgid "%s: failed to get extents info"
 msgstr ""
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, c-format
 msgid "%s: write failed"
 msgstr ""
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, c-format
 msgid "failed to extend %s"
 msgstr ""
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, c-format
 msgid "clearing permissions for %s"
 msgstr ""
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr ""
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
 msgstr ""
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, c-format
 msgid "failed to preserve authorship for %s"
 msgstr ""
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
 #, c-format
-msgid "cannot open %s for reading"
+msgid "failed to set default file creation context to %s"
 msgstr ""
 
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:820
 #, c-format
-msgid "cannot fstat %s"
+msgid "failed to set default file creation context for %s"
 msgstr ""
 
-#: src/copy.c:820
+#: src/copy.c:846
 #, c-format
-msgid "skipping file %s, as it was replaced while being copied"
+msgid "failed to set the security context of %s"
 msgstr ""
 
-#: src/copy.c:850
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
-msgid "failed to get file system create context"
+msgid "cannot open %s for reading"
+msgstr ""
+
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
+#, c-format
+msgid "cannot fstat %s"
 msgstr ""
 
-#: src/copy.c:864
+#: src/copy.c:935
 #, c-format
-msgid "failed to set the security context of %s to %s"
+msgid "skipping file %s, as it was replaced while being copied"
 msgstr ""
 
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
 msgid "cannot remove %s"
 msgstr ""
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
 msgstr ""
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr ""
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, c-format
 msgid "cannot create regular file %s"
 msgstr ""
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, c-format
 msgid "failed to clone %s from %s"
 msgstr ""
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr ""
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
 #, c-format
 msgid "failed to close %s"
 msgstr ""
 
-#: src/copy.c:1471
+#: src/copy.c:1580
+#, c-format
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
+msgstr ""
+
+#: src/copy.c:1581
 #, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
 msgstr ""
 
-#: src/copy.c:1478
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
 msgstr ""
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr ""
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr ""
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, c-format
 msgid "cannot create hard link %s to %s"
 msgstr ""
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, c-format
 msgid "cannot stat %s"
 msgstr ""
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, c-format
 msgid "omitting directory %s"
 msgstr ""
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr ""
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
 msgstr ""
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr ""
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr ""
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr ""
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr ""
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr ""
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr ""
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
 msgstr ""
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr ""
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr ""
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr ""
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr ""
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, c-format
 msgid "cannot move %s to %s"
 msgstr ""
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr ""
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, c-format
-msgid "failed to set default file creation context to %s"
-msgstr ""
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr ""
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr ""
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr ""
 
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, c-format
 msgid "cannot create fifo %s"
 msgstr ""
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, c-format
 msgid "cannot create special file %s"
 msgstr ""
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, c-format
 msgid "cannot read symbolic link %s"
 msgstr ""
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, c-format
 msgid "cannot create symbolic link %s"
 msgstr ""
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
 msgstr ""
 
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, c-format
 msgid "cannot un-backup %s"
 msgstr ""
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr ""
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr ""
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr ""
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, fuzzy, c-format
+msgid "unknown program %s"
+msgstr "Error incognite"
+
+#: src/cp.c:157 src/mv.c:288
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -1895,11 +1952,11 @@ msgid ""
 "  or:  %s [OPTION]... -t DIRECTORY SOURCE...\n"
 msgstr ""
 
-#: src/cp.c:162
+#: src/cp.c:163
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 
-#: src/cp.c:168
+#: src/cp.c:169
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
 "      --attributes-only        don't copy the file data, just the "
@@ -1913,7 +1970,7 @@ msgid ""
 "  -d                           same as --no-dereference --preserve=links\n"
 msgstr ""
 
-#: src/cp.c:177
+#: src/cp.c:178
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
 "                                 opened, remove it and try again (this "
@@ -1926,20 +1983,20 @@ msgid ""
 "  -H                           follow command-line symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:186
+#: src/cp.c:187
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
 "  -L, --dereference            always follow symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:190
+#: src/cp.c:191
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
 "                                 a previous -i option)\n"
 "  -P, --no-dereference         never follow symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:195
+#: src/cp.c:196
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
 "      --preserve[=ATTR_LIST]   preserve the specified attributes (default:\n"
@@ -1949,13 +2006,13 @@ msgid ""
 "                                 all\n"
 msgstr ""
 
-#: src/cp.c:203
+#: src/cp.c:204
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                use full source file name under DIRECTORY\n"
 msgstr ""
 
-#: src/cp.c:207
+#: src/cp.c:208
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
 "      --reflink[=WHEN]         control clone/CoW copies. See below\n"
@@ -1964,7 +2021,7 @@ msgid ""
 "force)\n"
 msgstr ""
 
-#: src/cp.c:213
+#: src/cp.c:214
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
 "      --strip-trailing-slashes  remove any trailing slashes from each "
@@ -1972,7 +2029,7 @@ msgid ""
 "                                 argument\n"
 msgstr ""
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -1981,7 +2038,7 @@ msgid ""
 "  -T, --no-target-directory    treat DEST as a normal file\n"
 msgstr ""
 
-#: src/cp.c:224
+#: src/cp.c:225
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
 "                                 than the destination file or when the\n"
@@ -1990,7 +2047,15 @@ msgid ""
 "  -x, --one-file-system        stay on this file system\n"
 msgstr ""
 
-#: src/cp.c:233
+#: src/cp.c:232
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/cp.c:240
 msgid ""
 "\n"
 "By default, sparse SOURCE files are detected by a crude heuristic and the\n"
@@ -2006,7 +2071,7 @@ msgid ""
 "fails, or if --reflink=auto is specified, fall back to a standard copy.\n"
 msgstr ""
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 msgid ""
 "\n"
 "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n"
@@ -2016,7 +2081,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2024,7 +2089,7 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2032,226 +2097,236 @@ msgid ""
 "regular file.\n"
 msgstr ""
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, c-format
 msgid "failed to preserve times for %s"
 msgstr ""
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, c-format
 msgid "failed to preserve permissions for %s"
 msgstr ""
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, c-format
 msgid "cannot make directory %s"
 msgstr ""
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr ""
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
 #, c-format
 msgid "failed to access %s"
 msgstr ""
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, c-format
 msgid "missing file operand"
 msgstr ""
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, c-format
 msgid "missing destination file operand after %s"
 msgstr ""
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr ""
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, c-format
 msgid "target %s is not a directory"
 msgstr ""
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr ""
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, c-format
 msgid "multiple target directories specified"
 msgstr ""
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr ""
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr ""
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr ""
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr ""
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr ""
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, c-format
+msgid "cannot set target context and preserve it"
+msgstr ""
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr ""
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr ""
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr ""
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr ""
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, c-format
 msgid "%s: %s: line number out of range"
 msgstr ""
 
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, c-format
 msgid " on repetition %s\n"
 msgstr ""
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, c-format
 msgid "%s: %s: match not found"
 msgstr ""
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr ""
 
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, c-format
 msgid "write error for %s"
 msgstr ""
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, c-format
 msgid "%s: integer expected after delimiter"
 msgstr ""
 
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr ""
 
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr ""
 
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr ""
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr ""
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr ""
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr ""
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr ""
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr ""
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr ""
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr ""
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr ""
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr ""
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr ""
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr ""
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr ""
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr ""
 
-#: src/csplit.c:1455
+#: src/csplit.c:1483
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
 "and output byte counts of each piece to standard output.\n"
 msgstr ""
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2259,20 +2334,24 @@ msgid ""
 "  -k, --keep-files           do not remove output files on errors\n"
 msgstr ""
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr ""
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
 "  -z, --elide-empty-files    remove empty output files\n"
 msgstr ""
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
 msgstr ""
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 msgid ""
 "\n"
 "  INTEGER            copy up to but not including specified line number\n"
@@ -2289,27 +2368,23 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr ""
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr ""
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr ""
 
-#: src/cut.c:193
+#: src/cut.c:176
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr ""
 
-#: src/cut.c:199
+#: src/cut.c:182
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
 "  -c, --characters=LIST   select only these characters\n"
 "  -d, --delimiter=DELIM   use DELIM instead of TAB for field delimiter\n"
 msgstr ""
 
-#: src/cut.c:204
+#: src/cut.c:187
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
 "                            that contains no delimiter character, unless\n"
@@ -2317,20 +2392,20 @@ msgid ""
 "  -n                      (ignored)\n"
 msgstr ""
 
-#: src/cut.c:210
+#: src/cut.c:193
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
 "                            or fields\n"
 msgstr ""
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
 "                            the default is to use the input delimiter\n"
 msgstr ""
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2338,7 +2413,7 @@ msgid ""
 "in the same order that it is read, and is written exactly once.\n"
 msgstr ""
 
-#: src/cut.c:227
+#: src/cut.c:210
 msgid ""
 "Each range is one of:\n"
 "\n"
@@ -2350,56 +2425,60 @@ msgid ""
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
 
-#: src/cut.c:367 src/cut.c:493
+#: src/cut.c:300 src/cut.c:394
 msgid "invalid byte, character or field list"
 msgstr ""
 
-#: src/cut.c:387
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr ""
+
+#: src/cut.c:320
 msgid "invalid range with no endpoint: -"
 msgstr ""
 
-#: src/cut.c:403
+#: src/cut.c:334
 msgid "invalid decreasing range"
 msgstr ""
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, c-format
 msgid "byte offset %s is too large"
 msgstr ""
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, c-format
 msgid "field number %s is too large"
 msgstr ""
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr ""
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr ""
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr ""
 
-#: src/cut.c:850
+#: src/cut.c:790
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr ""
 
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
 msgstr ""
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr ""
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr ""
 
@@ -2439,7 +2518,7 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 
 #: src/date.c:158
@@ -2571,10 +2650,10 @@ msgid ""
 "  $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n"
 msgstr ""
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr ""
@@ -2612,7 +2691,7 @@ msgstr ""
 msgid "cannot set date"
 msgstr ""
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, c-format
 msgid "time %s is out of range"
 msgstr ""
@@ -2623,14 +2702,14 @@ msgstr ""
 msgid "Paul Rubin"
 msgstr ""
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
 "  or:  %s OPTION\n"
 msgstr ""
 
-#: src/dd.c:526
+#: src/dd.c:532
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
 "\n"
@@ -2641,7 +2720,7 @@ msgid ""
 "  ibs=BYTES       read up to BYTES bytes at a time (default: 512)\n"
 msgstr ""
 
-#: src/dd.c:535
+#: src/dd.c:541
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
 "  iflag=FLAGS     read as per the comma separated symbol list\n"
@@ -2654,7 +2733,7 @@ msgid ""
 "                  'noxfer' suppresses transfer stats, 'none' suppresses all\n"
 msgstr ""
 
-#: src/dd.c:546
+#: src/dd.c:552
 msgid ""
 "\n"
 "N and BYTES may be followed by the following multiplicative suffixes:\n"
@@ -2665,7 +2744,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dd.c:555
+#: src/dd.c:561
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
 "  ebcdic    from ASCII to EBCDIC\n"
@@ -2680,7 +2759,7 @@ msgid ""
 "            with block or unblock, pad with spaces rather than NULs\n"
 msgstr ""
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -2690,7 +2769,7 @@ msgid ""
 "  fsync     likewise, but also write metadata\n"
 msgstr ""
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -2699,75 +2778,75 @@ msgid ""
 "suggested)\n"
 msgstr ""
 
-#: src/dd.c:583
+#: src/dd.c:589
 msgid "  cio       use concurrent I/O for data\n"
 msgstr ""
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr ""
 
-#: src/dd.c:587
+#: src/dd.c:593
 msgid "  directory  fail unless a directory\n"
 msgstr ""
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr ""
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr ""
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr ""
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr ""
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr ""
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr ""
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr ""
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr ""
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr ""
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr ""
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr ""
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, c-format
 msgid ""
 "\n"
@@ -2784,28 +2863,38 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
 "%<PRIuMAX>+%<PRIuMAX> records out\n"
 msgstr ""
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr ""
 
@@ -2819,269 +2908,269 @@ msgstr ""
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
 msgstr ""
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, c-format
 msgid "closing input file %s"
 msgstr ""
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr ""
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr ""
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, c-format
 msgid "writing to %s"
 msgstr ""
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, c-format
 msgid "unrecognized operand %s"
 msgstr ""
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 msgid "invalid conversion"
 msgstr ""
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 msgid "invalid input flag"
 msgstr ""
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 msgid "invalid output flag"
 msgstr ""
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 msgid "invalid status flag"
 msgstr ""
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, c-format
 msgid "invalid number %s"
 msgstr ""
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr ""
 
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, c-format
 msgid "cannot combine block and unblock"
 msgstr ""
 
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, c-format
 msgid "cannot combine lcase and ucase"
 msgstr ""
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, c-format
 msgid "cannot combine excl and nocreat"
 msgstr ""
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, c-format
 msgid "cannot combine direct and nocache"
 msgstr ""
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
 "  of mt_type=0x%0lx -- see <sys/mtio.h> for the list of types"
 msgstr ""
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, c-format
 msgid "%s: cannot skip"
 msgstr ""
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, c-format
 msgid "%s: cannot seek"
 msgstr ""
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr ""
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr ""
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr ""
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, c-format
 msgid "setting flags for %s"
 msgstr ""
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr ""
 
-#: src/dd.c:2133
+#: src/dd.c:2172
 #, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
 msgstr ""
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr ""
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
 msgstr ""
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, c-format
 msgid "failed to open %s"
 msgstr ""
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
 "blocks"
 msgstr ""
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr ""
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, c-format
 msgid "failed to discard cache for: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr ""
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr ""
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr ""
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr ""
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr ""
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr ""
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr ""
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr ""
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr ""
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr ""
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr ""
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr ""
 
-#: src/df.c:383
+#: src/df.c:207
+msgid "File"
+msgstr ""
+
+#: src/df.c:387
 #, c-format
-msgid "option --output: field '%s' unknown"
+msgid "option --output: field %s unknown"
 msgstr ""
 
-#: src/df.c:390
+#: src/df.c:394
 #, c-format
-msgid "option --output: field '%s' used more than once"
+msgid "option --output: field %s used more than once"
 msgstr ""
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr ""
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr ""
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr ""
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
 msgstr ""
 
-#: src/df.c:1210
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr ""
+
+#: src/df.c:1384
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
 "or all file systems by default.\n"
 msgstr ""
 
-#: src/df.c:1217
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
 
-#: src/df.c:1227
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -3090,7 +3179,7 @@ msgid ""
 "(default)\n"
 msgstr ""
 
-#: src/df.c:1234
+#: src/df.c:1409
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
 "                               or print all fields if FIELD_LIST is "
@@ -3103,41 +3192,33 @@ msgid ""
 "  -v                    (ignored)\n"
 msgstr ""
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
 
-#: src/df.c:1285
+#: src/df.c:1460
 #, c-format
 msgid "options %s and %s are mutually exclusive"
 msgstr ""
 
-#: src/df.c:1335
-msgid "warning: "
-msgstr ""
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr ""
-
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr ""
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr ""
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 msgid "cannot read table of mounted file systems"
 msgstr ""
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr ""
@@ -3147,7 +3228,7 @@ msgstr ""
 msgid "H. Peter Anvin"
 msgstr ""
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr ""
@@ -3214,7 +3295,7 @@ msgid ""
 msgstr ""
 
 #: src/dirname.c:59
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/dirname.c:64
@@ -3227,21 +3308,20 @@ msgid ""
 "  %s stdio.h            -> \".\"\n"
 msgstr ""
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
 "  or:  %s [OPTION]... --files0-from=F\n"
 msgstr ""
 
-#: src/du.c:274
+#: src/du.c:285
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr ""
 
-#: src/du.c:280
+#: src/du.c:291
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3250,11 +3330,11 @@ msgid ""
 "                          fragmentation, indirect blocks, and the like\n"
 msgstr ""
 
-#: src/du.c:289
+#: src/du.c:300
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3266,17 +3346,18 @@ msgid ""
 "                          --summarize\n"
 msgstr ""
 
-#: src/du.c:302
+#: src/du.c:313
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
 
-#: src/du.c:310
+#: src/du.c:322
 msgid ""
 "  -k                    like --block-size=1K\n"
 "  -L, --dereference     dereference all symbolic links\n"
@@ -3284,16 +3365,17 @@ msgid ""
 "  -m                    like --block-size=1M\n"
 msgstr ""
 
-#: src/du.c:316
+#: src/du.c:328
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
 
-#: src/du.c:322
+#: src/du.c:334
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
 "                          or entries greater than SIZE if negative\n"
@@ -3302,77 +3384,77 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
 msgstr ""
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
 "  -x, --one-file-system    skip directories on different file systems\n"
 msgstr ""
 
-#: src/du.c:386
+#: src/du.c:398
 msgid "Infinity"
 msgstr ""
 
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr ""
-
-#: src/du.c:624
+#: src/du.c:636
 #, c-format
 msgid "fts_read failed: %s"
 msgstr ""
 
-#: src/du.c:780
+#: src/du.c:787
 #, c-format
 msgid "invalid maximum depth %s"
 msgstr ""
 
-#: src/du.c:809
+#: src/du.c:816
 #, c-format
 msgid "invalid --threshold argument '-0'"
 msgstr ""
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr ""
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr ""
 
-#: src/du.c:900
+#: src/du.c:911
 #, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr ""
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 msgid "file operands cannot be combined with --files0-from"
 msgstr ""
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr ""
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr ""
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 msgid "invalid zero-length file name"
 msgstr ""
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr ""
 
@@ -3456,7 +3538,7 @@ msgstr ""
 #: src/env.c:61
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
 
@@ -3524,23 +3606,23 @@ msgid "input line is too long"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr ""
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
 "  or:  %s OPTION\n"
 msgstr ""
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -3551,7 +3633,7 @@ msgid ""
 "  ARG1 & ARG2       ARG1 if neither argument is null or 0, otherwise 0\n"
 msgstr ""
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -3562,14 +3644,14 @@ msgid ""
 "  ARG1 > ARG2       ARG1 is greater than ARG2\n"
 msgstr ""
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
 "  ARG1 - ARG2       arithmetic difference of ARG1 and ARG2\n"
 msgstr ""
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -3578,7 +3660,7 @@ msgid ""
 "  ARG1 % ARG2       arithmetic remainder of ARG1 divided by ARG2\n"
 msgstr ""
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -3589,7 +3671,7 @@ msgid ""
 "  length STRING              length of STRING\n"
 msgstr ""
 
-#: src/expr.c:251
+#: src/expr.c:250
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
 "                               keyword like 'match' or an operator like '/'\n"
@@ -3597,7 +3679,7 @@ msgid ""
 "  ( EXPRESSION )             value of EXPRESSION\n"
 msgstr ""
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -3607,7 +3689,7 @@ msgid ""
 "0.\n"
 msgstr ""
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -3615,32 +3697,32 @@ msgid ""
 "or 0, 2 if EXPRESSION is syntactically invalid, and 3 if an error occurred.\n"
 msgstr ""
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, c-format
 msgid "syntax error"
 msgstr ""
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, c-format
 msgid "error in regular expression matcher"
 msgstr ""
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, c-format
 msgid "non-integer argument"
 msgstr ""
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr ""
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr ""
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, c-format
 msgid "the strings compared were %s and %s"
 msgstr ""
@@ -3650,34 +3732,34 @@ msgstr ""
 msgid "Niels Moller"
 msgstr ""
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
 msgstr ""
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
 msgstr ""
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, c-format
 msgid "%s is not a valid positive integer"
 msgstr ""
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr ""
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
 "  or:  %s OPTION\n"
 msgstr ""
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
 "are specified on the command line, read them from standard input.\n"
@@ -3764,28 +3846,28 @@ msgid "invalid number of columns: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr ""
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, c-format
 msgid "Usage: %s\n"
 msgstr ""
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
 msgstr ""
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, c-format
 msgid "failed to get groups for user %s"
 msgstr ""
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, c-format
 msgid "failed to get groups for the current process"
 msgstr ""
@@ -3807,22 +3889,22 @@ msgid ""
 "the current process (which may differ if the groups database has changed).\n"
 msgstr ""
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, c-format
 msgid "cannot get real UID"
 msgstr ""
 
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, c-format
 msgid "cannot get effective GID"
 msgstr ""
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, c-format
 msgid "cannot get real GID"
 msgstr ""
 
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, c-format
 msgid "%s: no such user"
 msgstr ""
@@ -3858,58 +3940,48 @@ msgid ""
 "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n"
 msgstr ""
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr ""
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, c-format
 msgid "%s: number of bytes is too large"
 msgstr ""
 
-#: src/head.c:440
-#, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr ""
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr ""
 
-#: src/head.c:673
-#, c-format
-msgid "%s: failed to reset file pointer"
-msgstr ""
-
-#: src/head.c:798
+#: src/head.c:423 src/tail.c:457
 #, c-format
-msgid "cannot reposition file pointer for %s"
+msgid "%s: cannot seek to relative offset %s"
 msgstr ""
 
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr ""
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr ""
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr ""
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr ""
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr ""
 
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, c-format
 msgid "invalid trailing option -- %c"
 msgstr ""
@@ -3947,145 +4019,161 @@ msgid "cannot determine hostname"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr ""
 
-#: src/id.c:81
+#: src/id.c:84
 #, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
+msgid "Usage: %s [OPTION]... [USER]\n"
 msgstr ""
 
-#: src/id.c:82
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
 msgstr ""
 
-#: src/id.c:96
+#: src/id.c:90
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
+msgstr ""
+
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
 msgstr ""
 
-#: src/id.c:140
+#: src/id.c:151
+#, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr ""
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr ""
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr ""
 
-#: src/id.c:178
+#: src/id.c:198
 #, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr ""
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr ""
 
-#: src/id.c:199
+#: src/id.c:209
+#, c-format
+msgid "option --zero not permitted in default format"
+msgstr ""
+
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
 msgstr ""
 
-#: src/id.c:224
+#: src/id.c:265
 #, c-format
 msgid "cannot get effective UID"
 msgstr ""
 
-#: src/id.c:311
+#: src/id.c:354
 #, c-format
 msgid "cannot find name for user ID %s"
 msgstr ""
 
-#: src/id.c:329
+#: src/id.c:372
 #, c-format
 msgid "uid=%s"
 msgstr ""
 
-#: src/id.c:334
+#: src/id.c:377
 #, c-format
 msgid " gid=%s"
 msgstr ""
 
-#: src/id.c:341
+#: src/id.c:384
 #, c-format
 msgid " euid=%s"
 msgstr ""
 
-#: src/id.c:349
+#: src/id.c:392
 #, c-format
 msgid " egid=%s"
 msgstr ""
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr ""
 
-#: src/id.c:393
+#: src/id.c:437
 #, c-format
 msgid " context=%s"
 msgstr ""
 
-#: src/install.c:373
+#: src/install.c:376
 #, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr ""
 
-#: src/install.c:414
+#: src/install.c:417
 #, c-format
 msgid "creating directory %s"
 msgstr ""
 
-#: src/install.c:482
+#: src/install.c:485
 #, c-format
 msgid "cannot change ownership of %s"
 msgstr ""
 
-#: src/install.c:506
+#: src/install.c:509
 #, c-format
 msgid "cannot set time stamps for %s"
 msgstr ""
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, c-format
 msgid "fork system call failed"
 msgstr ""
 
-#: src/install.c:531
+#: src/install.c:535
 #, c-format
 msgid "cannot run %s"
 msgstr ""
 
-#: src/install.c:535
+#: src/install.c:539
 #, c-format
 msgid "waiting for strip"
 msgstr ""
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr ""
 
-#: src/install.c:558
+#: src/install.c:565
 #, c-format
 msgid "invalid user %s"
 msgstr ""
 
-#: src/install.c:594
+#: src/install.c:601
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -4094,7 +4182,7 @@ msgid ""
 "  or:  %s [OPTION]... -d DIRECTORY...\n"
 msgstr ""
 
-#: src/install.c:601
+#: src/install.c:608
 msgid ""
 "\n"
 "This install program copies files (often just compiled) into destination\n"
@@ -4108,7 +4196,7 @@ msgid ""
 "In the 4th form, create all components of the given DIRECTORY(ies).\n"
 msgstr ""
 
-#: src/install.c:615
+#: src/install.c:622
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
 "  -b                  like --backup but does not accept an argument\n"
@@ -4120,7 +4208,7 @@ msgid ""
 "                        components of the specified directories\n"
 msgstr ""
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -4132,7 +4220,7 @@ msgid ""
 "  -o, --owner=OWNER   set ownership (super-user only)\n"
 msgstr ""
 
-#: src/install.c:631
+#: src/install.c:638
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
 "files\n"
@@ -4146,60 +4234,57 @@ msgid ""
 "  -v, --verbose       print the name of each directory as it is created\n"
 msgstr ""
 
-#: src/install.c:641
+#: src/install.c:648
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
 
-#: src/install.c:859
+#: src/install.c:696 src/unlink.c:86
 #, c-format
-msgid ""
-"WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
+msgid "cannot unlink %s"
 msgstr ""
 
-#: src/install.c:869
+#: src/install.c:877
 #, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
+msgid ""
+"WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
 msgstr ""
 
-#: src/install.c:886
+#: src/install.c:917
 #, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr ""
 
-#: src/install.c:889
+#: src/install.c:920
 #, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr ""
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr ""
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, c-format
 msgid "invalid mode %s"
 msgstr ""
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr ""
 
-#: src/install.c:959
+#: src/install.c:1001
 #, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr ""
 
-#: src/install.c:966
+#: src/install.c:1008
 #, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr ""
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -4211,7 +4296,7 @@ msgstr ""
 msgid "Mike Haertel"
 msgstr ""
 
-#: src/join.c:191
+#: src/join.c:195
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
 "standard output.  The default join field is the first, delimited\n"
@@ -4222,7 +4307,7 @@ msgid ""
 "  -e EMPTY          replace missing input fields with EMPTY\n"
 msgstr ""
 
-#: src/join.c:200
+#: src/join.c:204
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
 "  -j FIELD          equivalent to '-1 FIELD -2 FIELD'\n"
@@ -4230,7 +4315,7 @@ msgid ""
 "  -t CHAR           use CHAR as input and output field separator\n"
 msgstr ""
 
-#: src/join.c:206
+#: src/join.c:210
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
 "  -1 FIELD          join on this FIELD of file 1\n"
@@ -4242,7 +4327,11 @@ msgid ""
 "                      print them without trying to pair them\n"
 msgstr ""
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr ""
+
+#: src/join.c:225
 msgid ""
 "\n"
 "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n"
@@ -4261,47 +4350,47 @@ msgid ""
 "warning message will be given.\n"
 msgstr ""
 
-#: src/join.c:403
+#: src/join.c:410
 #, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
 msgstr ""
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, c-format
 msgid "invalid field number: %s"
 msgstr ""
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, c-format
 msgid "invalid field specifier: %s"
 msgstr ""
 
-#: src/join.c:877
+#: src/join.c:884
 #, c-format
 msgid "invalid file number in field spec: %s"
 msgstr ""
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr ""
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr ""
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, c-format
 msgid "multi-character tab %s"
 msgstr ""
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr ""
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr ""
@@ -4403,47 +4492,47 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr ""
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr ""
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, c-format
 msgid "%s: cannot overwrite directory"
 msgstr ""
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
 msgstr ""
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, c-format
 msgid "failed to create symbolic link %s"
 msgstr ""
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr ""
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr ""
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, c-format
 msgid "failed to create hard link %s"
 msgstr ""
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, c-format
 msgid "failed to create hard link %s => %s"
 msgstr ""
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -4452,7 +4541,7 @@ msgid ""
 "  or:  %s [OPTION]... -t DIRECTORY TARGET...  (4th form)\n"
 msgstr ""
 
-#: src/ln.c:381
+#: src/ln.c:398
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
 "In the 2nd form, create a link to TARGET in the current directory.\n"
@@ -4464,7 +4553,7 @@ msgid ""
 "interpreted in relation to its parent directory.\n"
 msgstr ""
 
-#: src/ln.c:394
+#: src/ln.c:411
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
 "file\n"
@@ -4477,7 +4566,7 @@ msgid ""
 "  -f, --force                 remove existing destination files\n"
 msgstr ""
 
-#: src/ln.c:402
+#: src/ln.c:419
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
 "  -L, --logical               dereference TARGETs that are symbolic links\n"
@@ -4489,7 +4578,7 @@ msgid ""
 "  -s, --symbolic              make symbolic links instead of hard links\n"
 msgstr ""
 
-#: src/ln.c:411
+#: src/ln.c:428
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
 "  -t, --target-directory=DIRECTORY  specify the DIRECTORY in which to "
@@ -4499,7 +4588,7 @@ msgid ""
 "  -v, --verbose               print name of each linked file\n"
 msgstr ""
 
-#: src/ln.c:433
+#: src/ln.c:450
 #, c-format
 msgid ""
 "\n"
@@ -4507,12 +4596,12 @@ msgid ""
 "behavior when a TARGET is a symbolic link, defaulting to %s.\n"
 msgstr ""
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr ""
 
-#: src/ln.c:588
+#: src/ln.c:605
 #, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr ""
@@ -4543,7 +4632,7 @@ msgstr ""
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 msgid "%b %e  %Y"
 msgstr ""
 
@@ -4552,100 +4641,100 @@ msgstr ""
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 msgid "%b %e %H:%M"
 msgstr ""
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr ""
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr ""
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr ""
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, c-format
 msgid "invalid line width: %s"
 msgstr ""
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, c-format
 msgid "invalid tab size: %s"
 msgstr ""
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, c-format
 msgid "invalid time style format %s"
 msgstr ""
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 msgid "Valid arguments are:\n"
 msgstr ""
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr ""
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr ""
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, c-format
 msgid "unrecognized prefix: %s"
 msgstr ""
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr ""
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, c-format
 msgid "cannot open directory %s"
 msgstr ""
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, c-format
 msgid "cannot determine device and inode of %s"
 msgstr ""
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, c-format
 msgid "%s: not listing already-listed directory"
 msgstr ""
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, c-format
 msgid "reading directory %s"
 msgstr ""
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, c-format
 msgid "closing directory %s"
 msgstr ""
 
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, c-format
 msgid "cannot compare file names %s and %s"
 msgstr ""
 
-#: src/ls.c:4721
+#: src/ls.c:4781
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
 "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n"
 msgstr ""
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
 "  -A, --almost-all           do not list implied . and ..\n"
@@ -4654,33 +4743,32 @@ msgid ""
 "characters\n"
 msgstr ""
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
 "  -F, --classify             append indicator (one of */=>@|) to entries\n"
@@ -4690,40 +4778,41 @@ msgid ""
 "      --full-time            like -l --time-style=full-iso\n"
 msgstr ""
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr ""
 
-#: src/ls.c:4763
+#: src/ls.c:4823
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 
-#: src/ls.c:4769
+#: src/ls.c:4829
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
 
-#: src/ls.c:4775
+#: src/ls.c:4835
 msgid ""
 "  -H, --dereference-command-line\n"
 "                             follow symbolic links listed on the command "
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
 msgstr ""
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
 "names:\n"
@@ -4732,10 +4821,10 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -4745,7 +4834,7 @@ msgid ""
 "entries\n"
 msgstr ""
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -4756,11 +4845,11 @@ msgid ""
 "                             append / indicator to directories\n"
 msgstr ""
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -4768,7 +4857,7 @@ msgid ""
 "escape\n"
 msgstr ""
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
 "  -R, --recursive            list subdirectories recursively\n"
@@ -4776,56 +4865,59 @@ msgid ""
 "blocks\n"
 msgstr ""
 
-#: src/ls.c:4825
+#: src/ls.c:4886
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 
-#: src/ls.c:4835
+#: src/ls.c:4896
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
 msgstr ""
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 msgid ""
 "  -t                         sort by modification time, newest first\n"
 "  -T, --tabsize=COLS         assume tab stops at each COLS instead of 8\n"
 msgstr ""
 
-#: src/ls.c:4848
+#: src/ls.c:4912
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
 msgstr ""
 
-#: src/ls.c:4855
+#: src/ls.c:4919
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -4834,7 +4926,7 @@ msgid ""
 "variable can change the settings.  Use the dircolors command to set it.\n"
 msgstr ""
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -4898,19 +4990,16 @@ msgstr ""
 #: src/md5sum.c:195
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, c-format
 msgid ""
 "\n"
@@ -4920,157 +5009,183 @@ msgid ""
 "space for text), and name for each FILE.\n"
 msgstr ""
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, c-format
 msgid "%s: too many checksum lines"
 msgstr ""
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr ""
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr ""
 
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr ""
 
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr ""
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr ""
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
 msgstr ""
 
-#: src/md5sum.c:766
+#: src/md5sum.c:770
 #, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr ""
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
 msgstr ""
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr ""
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr ""
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr ""
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr ""
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr ""
 
-#: src/mkdir.c:57
+#: src/mkdir.c:59
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
 msgstr ""
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 
-#: src/mkdir.c:168
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/mkdir.c:127 src/mkdir.c:172
+#, c-format
+msgid "failed to set default creation context for %s"
+msgstr ""
+
+#: src/mkdir.c:191
+#, c-format
+msgid "failed to restore context for %s"
+msgstr ""
+
+#: src/mkdir.c:231
 #, c-format
 msgid "created directory %s"
 msgstr ""
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr ""
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr ""
 
-#: src/mkfifo.c:52
+#: src/mkfifo.c:54
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
 msgstr ""
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
 msgstr ""
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, c-format
 msgid "invalid mode"
 msgstr ""
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr ""
 
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
+#, fuzzy, c-format
+msgid "cannot set permissions of %s"
+msgstr "impossibile de cambiar le permissiones de %s"
+
+#: src/mknod.c:54
 #, c-format
 msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr ""
 
-#: src/mknod.c:54
+#: src/mknod.c:56
 msgid "Create the special file NAME of the given TYPE.\n"
 msgstr ""
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr ""
-
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -5079,7 +5194,7 @@ msgid ""
 "otherwise, as decimal.  TYPE may be:\n"
 msgstr ""
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 msgid ""
 "\n"
 "  b      create a block (buffered) special file\n"
@@ -5087,148 +5202,142 @@ msgid ""
 "  p      create a FIFO\n"
 msgstr ""
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 msgid "Special files require major and minor device numbers."
 msgstr ""
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 msgid "Fifos do not have major and minor device numbers."
 msgstr ""
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, c-format
 msgid "block special files not supported"
 msgstr ""
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, c-format
 msgid "character special files not supported"
 msgstr ""
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, c-format
 msgid "invalid major device number %s"
 msgstr ""
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, c-format
 msgid "invalid minor device number %s"
 msgstr ""
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, c-format
 msgid "invalid device %s %s"
 msgstr ""
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, c-format
 msgid "invalid device type %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr ""
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr ""
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
 "TEMPLATE must contain at least 3 consecutive 'X's in last component.\n"
 "If TEMPLATE is not specified, use tmp.XXXXXXXXXX, and --tmpdir is implied.\n"
 msgstr ""
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
 "  -q, --quiet         suppress diagnostics about file/dir-creation failure\n"
 msgstr ""
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
 msgstr ""
 
-#: src/mktemp.c:223
-#, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr ""
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, c-format
 msgid "too many templates"
 msgstr ""
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr ""
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr ""
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr ""
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr ""
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr ""
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, c-format
 msgid "failed to create directory via template %s"
 msgstr ""
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, c-format
 msgid "failed to create file via template %s"
 msgstr ""
 
-#: src/mv.c:292
+#: src/mv.c:294
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 
-#: src/mv.c:298
+#: src/mv.c:300
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
 "file\n"
@@ -5241,7 +5350,7 @@ msgid ""
 "effect.\n"
 msgstr ""
 
-#: src/mv.c:307
+#: src/mv.c:309
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
@@ -5249,7 +5358,7 @@ msgid ""
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
 msgstr ""
 
-#: src/mv.c:312
+#: src/mv.c:314
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
 "DIRECTORY\n"
@@ -5258,6 +5367,8 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
 
 #: src/nice.c:72
@@ -5496,95 +5607,90 @@ msgid "%s: invalid number to ignore"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
 msgstr ""
 
-#: src/numfmt.c:676
+#: src/numfmt.c:659
 #, c-format
-msgid "value too large to be converted: '%s'"
+msgid "value too large to be converted: %s"
 msgstr ""
 
-#: src/numfmt.c:680
+#: src/numfmt.c:663
 #, fuzzy, c-format
-msgid "invalid number: '%s'"
+msgid "invalid number: %s"
 msgstr "argumento %s invalide pro %s"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
+msgid "rejecting suffix in input: %s (consider using --from)"
 msgstr ""
 
-#: src/numfmt.c:688
+#: src/numfmt.c:671
 #, c-format
-msgid "invalid suffix in input: '%s'"
+msgid "invalid suffix in input: %s"
 msgstr ""
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
 msgstr ""
 
-#: src/numfmt.c:723
+#: src/numfmt.c:722 src/numfmt.c:768
 #, c-format
 msgid "failed to prepare value '%Lf' for printing"
 msgstr ""
 
-#: src/numfmt.c:787
+#: src/numfmt.c:791
 #, fuzzy, c-format
-msgid "invalid unit size: '%s'"
+msgid "invalid unit size: %s"
 msgstr "argumento %s invalide pro %s"
 
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
-#, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr ""
-
-#: src/numfmt.c:813
+#: src/numfmt.c:814
 #, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
 msgstr ""
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
 msgstr ""
 
-#: src/numfmt.c:820
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
 msgstr ""
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
 msgstr ""
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
 "                         see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr ""
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
@@ -5592,19 +5698,19 @@ msgid ""
 "locale)\n"
 msgstr ""
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
 msgstr ""
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
 msgstr ""
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -5614,40 +5720,40 @@ msgid ""
 "                         is found\n"
 msgstr ""
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
 "nearest\n"
 msgstr ""
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
 msgstr ""
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr ""
 
-#: src/numfmt.c:877
+#: src/numfmt.c:878
 msgid ""
 "\n"
 "UNIT options:\n"
 msgstr ""
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr ""
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -5656,7 +5762,7 @@ msgid ""
 "               1Mi = 1048576,\n"
 msgstr ""
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
@@ -5664,7 +5770,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
@@ -5672,7 +5778,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
@@ -5680,18 +5786,18 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:905
+#: src/numfmt.c:906
 #, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -5703,7 +5809,7 @@ msgid ""
 "errors are not diagnosed and the exit status is 0.\n"
 msgstr ""
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -5724,112 +5830,112 @@ msgid ""
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 msgstr ""
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, c-format
 msgid "format %s has no %% directive"
 msgstr ""
 
-#: src/numfmt.c:990
+#: src/numfmt.c:1003
 #, c-format
 msgid "invalid format %s (width overflow)"
 msgstr ""
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1008
 #, c-format
-msgid "format %s ends in %%"
+msgid "--format padding overridding --padding"
 msgstr ""
 
-#: src/numfmt.c:1010
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
+msgid "format %s ends in %%"
 msgstr ""
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1030
 #, c-format
-msgid "format %s has too many %% directives"
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
 msgstr ""
 
-#: src/numfmt.c:1070
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
-msgid "invalid suffix in input '%s': '%s'"
+msgid "format %s has too many %% directives"
 msgstr ""
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1081
+#, fuzzy, c-format
+msgid "invalid suffix in input %s: %s"
+msgstr "argumento %s invalide pro %s"
+
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
 msgstr ""
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
 msgstr ""
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
+msgid "large input value %s: possible precision loss"
 msgstr ""
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
 
-#: src/numfmt.c:1388
+#: src/numfmt.c:1403
 #, fuzzy, c-format
-msgid "invalid padding value '%s'"
-msgstr "%s: option invalide -- '%c'\n"
+msgid "invalid padding value %s"
+msgstr "argumento %s invalide pro %s"
 
-#: src/numfmt.c:1401
+#: src/numfmt.c:1417
 #, c-format
-msgid "invalid field value '%s'"
+msgid "invalid field value %s"
 msgstr ""
 
-#: src/numfmt.c:1430
-#, c-format
-msgid "invalid header value '%s'"
-msgstr ""
+#: src/numfmt.c:1447
+#, fuzzy, c-format
+msgid "invalid header value %s"
+msgstr "argumento %s invalide pro %s"
 
-#: src/numfmt.c:1456
+#: src/numfmt.c:1473
 #, c-format
 msgid "--grouping cannot be combined with --format"
 msgstr ""
 
-#: src/numfmt.c:1458
-#, c-format
-msgid "--padding cannot be combined with --format"
-msgstr ""
-
-#: src/numfmt.c:1463
+#: src/numfmt.c:1478
 #, c-format
 msgid "no conversion option specified"
 msgstr ""
 
-#: src/numfmt.c:1471
+#: src/numfmt.c:1486
 #, c-format
 msgid "grouping cannot be combined with --to"
 msgstr ""
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
 msgstr ""
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
 msgstr ""
 
-#: src/numfmt.c:1511
+#: src/numfmt.c:1526
 #, c-format
 msgid "error reading input"
 msgstr ""
 
-#: src/numfmt.c:1520
+#: src/numfmt.c:1535
 #, c-format
 msgid "failed to convert some of the input numbers"
 msgstr ""
 
-#: src/od.c:294
+#: src/od.c:320
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -5838,7 +5944,7 @@ msgid ""
 "[b]]\n"
 msgstr ""
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -5848,7 +5954,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/od.c:307
+#: src/od.c:333
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
 "if the last operand begins with + or (if there are 2 operands) a digit.\n"
@@ -5858,38 +5964,40 @@ msgid ""
 "suffixes may be . for octal and b for multiply by 512.\n"
 msgstr ""
 
-#: src/od.c:318
+#: src/od.c:344
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
 
-#: src/od.c:323
+#: src/od.c:350
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
 
-#: src/od.c:336
+#: src/od.c:363
 msgid ""
 "\n"
 "\n"
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 
-#: src/od.c:345
+#: src/od.c:372
 msgid ""
 "  -f   same as -t fF, select floats\n"
 "  -i   same as -t dI, select decimal ints\n"
@@ -5899,16 +6007,16 @@ msgid ""
 "  -x   same as -t x2, select hexadecimal 2-byte units\n"
 msgstr ""
 
-#: src/od.c:353
+#: src/od.c:380
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -5917,7 +6025,7 @@ msgid ""
 "  x[SIZE]    hexadecimal, SIZE bytes per integer\n"
 msgstr ""
 
-#: src/od.c:367
+#: src/od.c:394
 msgid ""
 "\n"
 "SIZE is a number.  For TYPE in [doux], SIZE may also be C for\n"
@@ -5926,14 +6034,14 @@ msgid ""
 "for sizeof(double) or L for sizeof(long double).\n"
 msgstr ""
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
 "each output line.\n"
 msgstr ""
 
-#: src/od.c:379
+#: src/od.c:406
 msgid ""
 "\n"
 "\n"
@@ -5946,55 +6054,55 @@ msgid ""
 "and so on for G, T, P, E, Z, Y.\n"
 msgstr ""
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, c-format
 msgid "invalid type string %s"
 msgstr ""
 
-#: src/od.c:649
+#: src/od.c:690
 #, c-format
 msgid ""
 "invalid type string %s;\n"
 "this system doesn't provide a %lu-byte integral type"
 msgstr ""
 
-#: src/od.c:770
+#: src/od.c:811
 #, c-format
 msgid ""
 "invalid type string %s;\n"
 "this system doesn't provide a %lu-byte floating point type"
 msgstr ""
 
-#: src/od.c:828
+#: src/od.c:869
 #, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr ""
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr ""
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr ""
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr ""
 
-#: src/od.c:1810
+#: src/od.c:1863
 msgid "compatibility mode supports at most one file"
 msgstr ""
 
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr ""
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr ""
@@ -6145,12 +6253,12 @@ msgstr ""
 msgid "Where"
 msgstr ""
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr ""
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -6160,7 +6268,7 @@ msgid ""
 "  -s              do short format output, this is the default\n"
 msgstr ""
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -6169,7 +6277,7 @@ msgid ""
 "                  in short format\n"
 msgstr ""
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, c-format
 msgid ""
 "\n"
@@ -6177,7 +6285,7 @@ msgid ""
 "The utmp file will be %s.\n"
 msgstr ""
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr ""
@@ -6344,12 +6452,13 @@ msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
 
-#: src/pr.c:2827
+#: src/pr.c:2828
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
 "                    separate columns by STRING,\n"
@@ -6359,7 +6468,7 @@ msgid ""
 "  -t, --omit-header  omit page headers and trailers\n"
 msgstr ""
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 msgid ""
 "  -T, --omit-pagination\n"
 "                    omit page headers and trailers, eliminate any "
@@ -6373,7 +6482,7 @@ msgid ""
 "(72)\n"
 msgstr ""
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
 "                    set page width to PAGE_WIDTH (72) characters always,\n"
@@ -6382,7 +6491,7 @@ msgid ""
 "                    with -S or -s\n"
 msgstr ""
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 msgid ""
 "\n"
 "-t is implied if PAGE_LENGTH <= 10.  With no FILE, or when FILE is -, read\n"
@@ -6399,7 +6508,7 @@ msgid ""
 msgstr ""
 
 #: src/printenv.c:69
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/printf.c:79
@@ -6495,32 +6604,32 @@ msgstr ""
 msgid "F. Pinard"
 msgstr ""
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, c-format
 msgid "%s (for regexp %s)"
 msgstr ""
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
 "  or:  %s -G [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr ""
 
-#: src/ptx.c:1821
+#: src/ptx.c:1824
 msgid ""
 "Output a permuted index, including context, of the words in the input "
 "files.\n"
 msgstr ""
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
 "  -G, --traditional              behave more like System V 'ptx'\n"
 "  -F, --flag-truncation=STRING   use STRING for flagging line truncations\n"
 msgstr ""
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
 "  -O, --format=roff              generate output as roff directives\n"
@@ -6529,7 +6638,7 @@ msgid ""
 "  -T, --format=tex               generate output as TeX directives\n"
 msgstr ""
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -6539,7 +6648,7 @@ msgid ""
 "  -o, --only-file=FILE           read only word list from this FILE\n"
 msgstr ""
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -6547,13 +6656,13 @@ msgid ""
 "excluded\n"
 msgstr ""
 
-#: src/ptx.c:1854
+#: src/ptx.c:1857
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, c-format
 msgid "invalid gap width: %s"
 msgstr ""
@@ -6570,22 +6679,28 @@ msgid ""
 "  -P, --physical  avoid all symlinks\n"
 msgstr ""
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+
+#: src/pwd.c:169
 #, c-format
 msgid "failed to chdir to %s"
 msgstr ""
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, c-format
 msgid "failed to stat %s"
 msgstr ""
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr ""
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, c-format
 msgid "ignoring non-option arguments"
 msgstr ""
@@ -6595,8 +6710,8 @@ msgstr ""
 msgid "Dmitry V. Levin"
 msgstr ""
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr ""
@@ -6630,8 +6745,7 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/readlink.c:152
@@ -6656,7 +6770,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 
@@ -6674,41 +6788,42 @@ msgstr ""
 msgid "%s: descend into directory %s? "
 msgstr ""
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr ""
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, c-format
 msgid "%s: remove %s %s? "
 msgstr ""
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, c-format
 msgid "removed directory: %s\n"
 msgstr ""
 
-#: src/remove.c:444
+#: src/remove.c:447
 #, c-format
-msgid "cannot remove directory: %s"
+msgid "refusing to remove %s or %s directory: skipping %s"
 msgstr ""
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr ""
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, c-format
 msgid "traversal failed: %s"
 msgstr ""
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -6733,12 +6848,12 @@ msgstr ""
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 
 #: src/rm.c:149
@@ -6786,13 +6901,17 @@ msgstr ""
 
 #: src/rm.c:342
 #, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr ""
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/rm.c:343
+#: src/rm.c:345
 #, c-format
-msgid "%s: remove all arguments? "
-msgstr ""
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] ""
+msgstr[1] ""
 
 #: src/rmdir.c:134 src/rmdir.c:233
 #, c-format
@@ -6835,7 +6954,7 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
 
@@ -6885,41 +7004,46 @@ msgstr ""
 msgid "no command specified"
 msgstr ""
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr ""
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, c-format
 msgid "failed to compute a new context"
 msgstr ""
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, c-format
 msgid "failed to set new user %s"
 msgstr ""
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, c-format
 msgid "failed to set new type %s"
 msgstr ""
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, c-format
 msgid "failed to set new range %s"
 msgstr ""
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, c-format
 msgid "failed to set new role %s"
 msgstr ""
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, c-format
 msgid "unable to set security context %s"
 msgstr ""
 
+#: src/selinux.c:127 src/selinux.c:300
+#, c-format
+msgid "error canonicalizing %s"
+msgstr ""
+
 #: src/seq.c:68
 #, c-format
 msgid ""
@@ -6944,95 +7068,47 @@ msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
 msgstr ""
 
-#: src/seq.c:94
+#: src/seq.c:96
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
 "it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n"
 "decimal numbers with maximum precision PREC, and to %g otherwise.\n"
 msgstr ""
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, c-format
 msgid "invalid floating point argument: %s"
 msgstr ""
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr ""
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr ""
 
-#: src/setuidgid.c:49
-#, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-
-#: src/setuidgid.c:55
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr ""
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr ""
-
-#: src/setuidgid.c:190
-#, c-format
-msgid "failed to set supplemental group(s)"
-msgstr ""
-
-#: src/setuidgid.c:200
-#, c-format
-msgid "cannot set group-ID to %lu"
-msgstr ""
-
-#: src/setuidgid.c:204
-#, c-format
-msgid "cannot set user-ID to %lu"
-msgstr ""
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr ""
 
-#: src/shred.c:148
+#: src/shred.c:170
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
 "for even very expensive hardware probing to recover the data.\n"
 msgstr ""
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -7041,28 +7117,32 @@ msgid ""
 "  -s, --size=N   shred this many bytes (suffixes like K, M, G accepted)\n"
 msgstr ""
 
-#: src/shred.c:161
+#: src/shred.c:183
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
 "  -z, --zero     add a final overwrite with zeros to hide shredding\n"
 msgstr ""
 
-#: src/shred.c:170
+#: src/shred.c:192
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -7073,7 +7153,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -7085,7 +7165,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -7094,7 +7174,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -7106,134 +7186,134 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:215
+#: src/shred.c:241
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
 "of the file that cannot be removed, and that will allow a shredded file\n"
 "to be recovered later.\n"
 msgstr ""
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, c-format
 msgid "%s: fdatasync failed"
 msgstr ""
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr ""
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr ""
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr ""
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, c-format
 msgid "%s: error writing at offset %s"
 msgstr ""
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, c-format
 msgid "%s: lseek failed"
 msgstr ""
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, c-format
 msgid "%s: file too large"
 msgstr ""
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr ""
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr ""
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, c-format
 msgid "%s: fstat failed"
 msgstr ""
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, c-format
 msgid "%s: invalid file type"
 msgstr ""
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr ""
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, c-format
 msgid "%s: error truncating"
 msgstr ""
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, c-format
 msgid "%s: fcntl failed"
 msgstr ""
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr ""
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr ""
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, c-format
 msgid "%s: renamed to %s"
 msgstr ""
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, c-format
 msgid "%s: failed to remove"
 msgstr ""
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr ""
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, c-format
 msgid "%s: failed to close"
 msgstr ""
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, c-format
 msgid "%s: failed to open for writing"
 msgstr ""
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, c-format
 msgid "%s: invalid number of passes"
 msgstr ""
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, c-format
 msgid "multiple random sources specified"
 msgstr ""
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, c-format
 msgid "%s: invalid file size"
 msgstr ""
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -7241,11 +7321,11 @@ msgid ""
 "  or:  %s -i LO-HI [OPTION]...\n"
 msgstr ""
 
-#: src/shuf.c:54
+#: src/shuf.c:67
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr ""
 
-#: src/shuf.c:60
+#: src/shuf.c:73
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
 "  -i, --input-range=LO-HI   treat each number LO through HI as an input "
@@ -7253,34 +7333,44 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
+msgstr ""
+
+#: src/shuf.c:228
+#, c-format
+msgid "too many input lines"
 msgstr ""
 
-#: src/shuf.c:244
+#: src/shuf.c:431
 #, c-format
 msgid "multiple -i options specified"
 msgstr ""
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, c-format
 msgid "invalid input range %s"
 msgstr ""
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, c-format
 msgid "invalid line count %s"
 msgstr ""
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, c-format
 msgid "multiple output files specified"
 msgstr ""
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, c-format
 msgid "cannot combine -e and -i options"
 msgstr ""
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr ""
+
 #: src/sleep.c:44
 #, c-format
 msgid ""
@@ -7295,27 +7385,27 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, c-format
 msgid "invalid time interval %s"
 msgstr ""
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr ""
 
-#: src/sort.c:399
+#: src/sort.c:427
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr ""
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
 msgstr ""
 
-#: src/sort.c:409
+#: src/sort.c:437
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
 "  -d, --dictionary-order      consider only blanks and alphanumeric "
@@ -7323,19 +7413,19 @@ msgid ""
 "  -f, --ignore-case           fold lower case to upper case characters\n"
 msgstr ""
 
-#: src/sort.c:415
+#: src/sort.c:443
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
 "  -i, --ignore-nonprinting    consider only printable characters\n"
 "  -M, --month-sort            compare (unknown) < 'JAN' < ... < 'DEC'\n"
 msgstr ""
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 
-#: src/sort.c:423
+#: src/sort.c:451
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
 "  -R, --random-sort           sort by random hash of keys\n"
@@ -7343,7 +7433,7 @@ msgid ""
 "  -r, --reverse               reverse the result of comparisons\n"
 msgstr ""
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -7353,19 +7443,19 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/sort.c:437
+#: src/sort.c:465
 msgid ""
 "Other options:\n"
 "\n"
 msgstr ""
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
 msgstr ""
 
-#: src/sort.c:445
+#: src/sort.c:473
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
 "  -C, --check=quiet, --check=silent  like -c, but do not report first bad "
@@ -7374,7 +7464,7 @@ msgid ""
 "                              decompress them with PROG -d\n"
 msgstr ""
 
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -7383,13 +7473,13 @@ msgid ""
 "                            If F is - then read names from standard input\n"
 msgstr ""
 
-#: src/sort.c:459
+#: src/sort.c:487
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
 "  -m, --merge               merge already sorted files; do not sort\n"
 msgstr ""
 
-#: src/sort.c:463
+#: src/sort.c:491
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "  -s, --stable              stabilize sort by disabling last-resort "
@@ -7397,7 +7487,7 @@ msgid ""
 "  -S, --buffer-size=SIZE    use SIZE for main memory buffer\n"
 msgstr ""
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -7412,11 +7502,7 @@ msgid ""
 "run\n"
 msgstr ""
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr ""
-
-#: src/sort.c:483
+#: src/sort.c:511
 msgid ""
 "\n"
 "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is "
@@ -7435,7 +7521,7 @@ msgid ""
 "SIZE may be followed by the following multiplicative suffixes:\n"
 msgstr ""
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -7447,254 +7533,239 @@ msgid ""
 "native byte values.\n"
 msgstr ""
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, c-format
 msgid "waiting for %s [-d]"
 msgstr ""
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr ""
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, c-format
 msgid "cannot create temporary file in %s"
 msgstr ""
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr ""
 
-#: src/sort.c:970
+#: src/sort.c:998
 msgid "fflush failed"
 msgstr ""
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr ""
 
-#: src/sort.c:986
-#, c-format
-msgid "dup2 failed"
-msgstr ""
-
-#: src/sort.c:1103
-#, c-format
-msgid "couldn't execute %s"
-msgstr ""
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 msgid "couldn't create temporary file"
 msgstr ""
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, c-format
 msgid "couldn't create process for %s -d"
 msgstr ""
 
-#: src/sort.c:1161
-#, c-format
-msgid "couldn't execute %s -d"
-msgstr ""
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, c-format
 msgid "warning: cannot remove: %s"
 msgstr ""
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, c-format
 msgid "invalid --%s argument %s"
 msgstr ""
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, c-format
 msgid "minimum --%s argument is %s"
 msgstr ""
 
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, c-format
 msgid "--%s argument %s too large"
 msgstr ""
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr ""
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr ""
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr ""
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr ""
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, c-format
 msgid "string transformation failed"
 msgstr ""
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, c-format
 msgid "the untransformed string was %s"
 msgstr ""
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr ""
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr ""
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr ""
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr ""
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr ""
 
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr ""
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr ""
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr ""
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr ""
 
-#: src/sort.c:3698
+#: src/sort.c:3738
 msgid "cannot read"
 msgstr ""
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, c-format
 msgid "%s: invalid field specification %s"
 msgstr ""
 
-#: src/sort.c:3987
+#: src/sort.c:4028
 #, c-format
 msgid "options '-%s' are incompatible"
 msgstr ""
 
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, c-format
 msgid "%s: invalid count at start of %s"
 msgstr ""
 
-#: src/sort.c:4295
+#: src/sort.c:4336
 msgid "invalid number after '-'"
 msgstr ""
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 msgid "invalid number after '.'"
 msgstr ""
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr ""
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, c-format
 msgid "multiple compress programs specified"
 msgstr ""
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
 msgstr ""
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
 msgstr ""
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr ""
 
-#: src/sort.c:4407
+#: src/sort.c:4448
 msgid "invalid number after ','"
 msgstr ""
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr ""
 
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, c-format
 msgid "cannot read file names from %s"
 msgstr ""
 
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr ""
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, c-format
 msgid "no input from %s"
 msgstr ""
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr ""
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr ""
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr ""
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr ""
 
-#: src/split.c:204
+#: src/split.c:203
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr ""
 
-#: src/split.c:208
+#: src/split.c:207
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
 "size is 1000 lines, and default PREFIX is 'x'.  With no INPUT, or when "
@@ -7702,32 +7773,31 @@ msgid ""
 "is -, read standard input.\n"
 msgstr ""
 
-#: src/split.c:216
+#: src/split.c:215
 #, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
 
-#: src/split.c:229
+#: src/split.c:228
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
 "                            output file is opened\n"
 msgstr ""
 
-#: src/split.c:236
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -7739,189 +7809,189 @@ msgid ""
 "r/K/N   likewise but only output Kth of N to stdout\n"
 msgstr ""
 
-#: src/split.c:354
+#: src/split.c:353
 #, c-format
 msgid "output file suffixes exhausted"
 msgstr ""
 
-#: src/split.c:366
+#: src/split.c:365
 #, c-format
 msgid "creating file %s\n"
 msgstr ""
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr ""
 
-#: src/split.c:391
+#: src/split.c:390
 #, c-format
 msgid "failed to set FILE environment variable"
 msgstr ""
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr ""
 
-#: src/split.c:395
+#: src/split.c:394
 #, c-format
 msgid "failed to create pipe"
 msgstr ""
 
-#: src/split.c:409
+#: src/split.c:408
 #, c-format
 msgid "closing prior pipe"
 msgstr ""
 
-#: src/split.c:411
+#: src/split.c:410
 #, c-format
 msgid "closing output pipe"
 msgstr ""
 
-#: src/split.c:415
+#: src/split.c:414
 #, c-format
 msgid "moving input pipe"
 msgstr ""
 
-#: src/split.c:417
+#: src/split.c:416
 #, c-format
 msgid "closing input pipe"
 msgstr ""
 
-#: src/split.c:422
+#: src/split.c:421
 #, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr ""
 
-#: src/split.c:428
+#: src/split.c:427
 #, c-format
 msgid "failed to close input pipe"
 msgstr ""
 
-#: src/split.c:464
+#: src/split.c:463
 #, c-format
 msgid "waiting for child process"
 msgstr ""
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr ""
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr ""
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr ""
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr ""
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, c-format
 msgid "%s: invalid number of chunks"
 msgstr ""
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, c-format
 msgid "%s: invalid chunk number"
 msgstr ""
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr ""
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr ""
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr ""
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, c-format
 msgid "line count option -%s%c... is too large"
 msgstr ""
 
-#: src/split.c:1248
+#: src/split.c:1298
 #, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr ""
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, c-format
 msgid "%s: invalid IO block size"
 msgstr ""
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr ""
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr ""
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, c-format
 msgid "%s: cannot determine file size"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr ""
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, c-format
 msgid "failed to canonicalize %s"
 msgstr ""
 
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr ""
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, c-format
 msgid "%s: invalid directive"
 msgstr ""
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, c-format
 msgid "warning: backslash at end of format"
 msgstr ""
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr ""
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, c-format
 msgid "cannot read file system information for %s"
 msgstr ""
 
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, c-format
 msgid "cannot stat standard input"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -7932,7 +8002,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -7940,30 +8010,30 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, c-format
 msgid "Context: %C\n"
 msgstr ""
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -7971,27 +8041,27 @@ msgid ""
 " Birth: %w\n"
 msgstr ""
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
 msgstr ""
 
-#: src/stat.c:1356
+#: src/stat.c:1418
 msgid ""
 "  -L, --dereference     follow links\n"
 "  -f, --file-system     display file system status instead of file status\n"
 msgstr ""
 
-#: src/stat.c:1360
+#: src/stat.c:1422
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 msgid ""
 "\n"
 "The valid format sequences for files (without --file-system):\n"
@@ -8003,7 +8073,7 @@ msgid ""
 "  %C   SELinux security context string\n"
 msgstr ""
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 msgid ""
 "  %d   device number in decimal\n"
 "  %D   device number in hex\n"
@@ -8013,7 +8083,7 @@ msgid ""
 "  %G   group name of owner\n"
 msgstr ""
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 msgid ""
 "  %h   number of hard links\n"
 "  %i   inode number\n"
@@ -8022,11 +8092,11 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 
-#: src/stat.c:1399
+#: src/stat.c:1461
 msgid ""
 "  %u   user ID of owner\n"
 "  %U   user name of owner\n"
@@ -8034,14 +8104,14 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 msgid ""
 "Valid format sequences for file systems:\n"
 "\n"
@@ -8052,7 +8122,7 @@ msgid ""
 "  %f   free blocks in file system\n"
 msgstr ""
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 msgid ""
 "  %i   file system ID in hex\n"
 "  %l   maximum length of filenames\n"
@@ -8113,22 +8183,27 @@ msgid ""
 "and are thus unaffected by 'stdbuf' settings.\n"
 msgstr ""
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, c-format
 msgid "failed to find %s"
 msgstr ""
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, c-format
 msgid "failed to update the environment with %s"
 msgstr ""
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr ""
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, c-format
+msgid "you must specify a buffering mode option"
+msgstr ""
+
+#: src/stty.c:516
 #, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -8136,25 +8211,25 @@ msgid ""
 "  or:  %s [-F DEVICE | --file=DEVICE] [-g|--save]\n"
 msgstr ""
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
 msgstr ""
 
-#: src/stty.c:525
+#: src/stty.c:528
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
 "  -g, --save         print all current settings in a stty-readable form\n"
 "  -F, --file=DEVICE  open and use the specified DEVICE instead of stdin\n"
 msgstr ""
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
 "settings.  The underlying system defines which settings are available.\n"
 msgstr ""
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -8163,7 +8238,7 @@ msgid ""
 "   eol CHAR      CHAR will end the line\n"
 msgstr ""
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -8171,7 +8246,7 @@ msgid ""
 "   kill CHAR     CHAR will erase the current line\n"
 msgstr ""
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -8179,7 +8254,7 @@ msgid ""
 "   start CHAR    CHAR will restart the output after stopping it\n"
 msgstr ""
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -8187,7 +8262,7 @@ msgid ""
 " * werase CHAR   CHAR will erase the last word typed\n"
 msgstr ""
 
-#: src/stty.c:562
+#: src/stty.c:565
 msgid ""
 "\n"
 "Special settings:\n"
@@ -8196,7 +8271,7 @@ msgid ""
 " * columns N     same as cols N\n"
 msgstr ""
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -8205,7 +8280,7 @@ msgid ""
 "   ospeed N      set the output speed to N\n"
 msgstr ""
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -8214,7 +8289,7 @@ msgid ""
 "   time N        with -icanon, set read timeout of N tenths of a second\n"
 msgstr ""
 
-#: src/stty.c:581
+#: src/stty.c:584
 msgid ""
 "\n"
 "Control settings:\n"
@@ -8225,7 +8300,7 @@ msgid ""
 "   csN           set character size to N bits, N in [5..8]\n"
 msgstr ""
 
-#: src/stty.c:590
+#: src/stty.c:593
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
 "   [-]hup        send a hangup signal when the last process closes the tty\n"
@@ -8233,9 +8308,10 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -8245,7 +8321,7 @@ msgid ""
 "   [-]igncr      ignore carriage return\n"
 msgstr ""
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -8254,11 +8330,11 @@ msgid ""
 "   [-]istrip     clear high (8th) bit of input characters\n"
 msgstr ""
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr ""
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -8268,7 +8344,7 @@ msgid ""
 "   [-]tandem     same as [-]ixoff\n"
 msgstr ""
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -8278,17 +8354,17 @@ msgid ""
 " * nlN           newline delay style, N in [0..1]\n"
 msgstr ""
 
-#: src/stty.c:631
+#: src/stty.c:635
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
 " * [-]onlret     newline performs a carriage return\n"
 msgstr ""
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -8298,7 +8374,7 @@ msgid ""
 " * vtN           vertical tab delay style, N in [0..1]\n"
 msgstr ""
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -8307,7 +8383,7 @@ msgid ""
 " * -crtkill      kill all line by obeying the echoctl and echok settings\n"
 msgstr ""
 
-#: src/stty.c:654
+#: src/stty.c:658
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
 "   [-]echo       echo input characters\n"
@@ -8316,7 +8392,7 @@ msgid ""
 "   [-]echok      echo a newline after a kill character\n"
 msgstr ""
 
-#: src/stty.c:661
+#: src/stty.c:665
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
 "   [-]echonl     echo newline even if not echoing other characters\n"
@@ -8325,7 +8401,7 @@ msgid ""
 "   [-]iexten     enable non-POSIX special characters\n"
 msgstr ""
 
-#: src/stty.c:668
+#: src/stty.c:672
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
 "   [-]noflsh     disable flushing after interrupt and quit special "
@@ -8335,7 +8411,7 @@ msgid ""
 " * [-]xcase      with icanon, escape with '\\' for uppercase characters\n"
 msgstr ""
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -8344,7 +8420,7 @@ msgid ""
 "   -cbreak       same as icanon\n"
 msgstr ""
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -8352,7 +8428,7 @@ msgid ""
 "   crt           same as echoe echoctl echoke\n"
 msgstr ""
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -8361,7 +8437,7 @@ msgid ""
 "   evenp         same as parenb -parodd cs7\n"
 msgstr ""
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -8371,7 +8447,7 @@ msgid ""
 "   -nl           same as icrnl -inlcr -igncr onlcr -ocrnl -onlret\n"
 msgstr ""
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -8380,7 +8456,7 @@ msgid ""
 "   -pass8        same as parenb istrip cs7\n"
 msgstr ""
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -8388,7 +8464,7 @@ msgid ""
 "   -raw          same as cooked\n"
 msgstr ""
 
-#: src/stty.c:716
+#: src/stty.c:720
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
 "                 -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n"
@@ -8398,7 +8474,7 @@ msgid ""
 "                 characters to their default values\n"
 msgstr ""
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -8407,55 +8483,55 @@ msgid ""
 "127; special values ^- or undef used to disable special characters.\n"
 msgstr ""
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, c-format
 msgid "only one device may be specified"
 msgstr ""
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
 "mutually exclusive"
 msgstr ""
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr ""
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr ""
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, c-format
 msgid "invalid argument %s"
 msgstr ""
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, c-format
 msgid "missing argument to %s"
 msgstr ""
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, c-format
 msgid "invalid line discipline %s"
 msgstr ""
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr ""
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr ""
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, c-format
 msgid "invalid integer argument %s"
 msgstr ""
@@ -8501,21 +8577,21 @@ msgstr ""
 msgid "      --version  output version information and exit\n"
 msgstr ""
 
-#: src/system.h:544
+#: src/system.h:543
 msgid ""
 "\n"
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/system.h:552
+#: src/system.h:551
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -8524,33 +8600,33 @@ msgid ""
 "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n"
 msgstr ""
 
-#: src/system.h:571
+#: src/system.h:570
 #, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
+"%s online help: <%s>\n"
 msgstr ""
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr ""
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr ""
 
-#: src/system.h:596
+#: src/system.h:591
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr ""
 
-#: src/system.h:628
+#: src/system.h:633
 #, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -8633,54 +8709,48 @@ msgstr ""
 
 #: src/tail.c:270
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
 
 #: src/tail.c:274
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 
-#: src/tail.c:281
+#: src/tail.c:280
 #, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
 
-#: src/tail.c:294
+#: src/tail.c:293
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 
-#: src/tail.c:301
+#: src/tail.c:298
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 
-#: src/tail.c:310
+#: src/tail.c:307
 msgid ""
 "\n"
 "If the first character of K (the number of bytes or lines) is a '+',\n"
@@ -8691,7 +8761,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/tail.c:319
+#: src/tail.c:316
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
 "means that even if a tail'ed file is renamed, tail will continue to track\n"
@@ -8701,159 +8771,164 @@ msgid ""
 "named file in a way that accommodates renaming, removal and creation.\n"
 msgstr ""
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr ""
 
-#: src/tail.c:453
-#, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr ""
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr ""
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr ""
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
 "reverting to polling"
 msgstr ""
 
-#: src/tail.c:963
+#: src/tail.c:965
 #, c-format
-msgid "%s has become inaccessible"
+msgid "%s has been replaced with a symbolic link. giving up on this name"
 msgstr ""
 
 #: src/tail.c:980
 #, c-format
+msgid "%s has become inaccessible"
+msgstr ""
+
+#: src/tail.c:997
+#, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr ""
 
-#: src/tail.c:989
+#: src/tail.c:1006
 #, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr ""
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, c-format
 msgid "%s has become accessible"
 msgstr ""
 
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr ""
 
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr ""
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr ""
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr ""
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr ""
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, c-format
 msgid "cannot watch parent directory of %s"
 msgstr ""
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, c-format
 msgid "inotify resources exhausted"
 msgstr ""
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, c-format
 msgid "cannot watch %s"
 msgstr ""
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr ""
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, c-format
 msgid "error reading inotify event"
 msgstr ""
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr ""
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, c-format
 msgid "number in %s is too large"
 msgstr ""
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr ""
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr ""
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr ""
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr ""
 
-#: src/tail.c:2034
+#: src/tail.c:2096
+#, c-format
+msgid "warning: --retry ignored; --retry is useful only when following"
+msgstr ""
+
+#: src/tail.c:2100
 #, c-format
-msgid "warning: --retry is useful mainly when following by name"
+msgid "warning: --retry only effective for the initial open"
 msgstr ""
 
-#: src/tail.c:2038
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
 msgstr ""
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr ""
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, c-format
 msgid "cannot follow %s by name"
 msgstr ""
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr ""
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr ""
@@ -9057,47 +9132,46 @@ msgstr ""
 msgid "warning: sigprocmask"
 msgstr ""
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr ""
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr ""
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
 "  or:  %s [OPTION]\n"
 msgstr ""
 
-#: src/timeout.c:229
+#: src/timeout.c:232
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
 msgstr ""
 
-#: src/timeout.c:235
+#: src/timeout.c:238
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 msgid ""
 "\n"
 "DURATION is a floating point number with an optional suffix:\n"
@@ -9105,7 +9179,7 @@ msgid ""
 "days.\n"
 msgstr ""
 
-#: src/timeout.c:259
+#: src/timeout.c:262
 msgid ""
 "\n"
 "If the command times out, and --preserve-status is not set, then exit with\n"
@@ -9116,17 +9190,17 @@ msgid ""
 "case the exit status is 128+9 rather than 124.\n"
 msgstr ""
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr ""
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, c-format
 msgid "error waiting for command"
 msgstr ""
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr ""
@@ -9436,7 +9510,7 @@ msgstr ""
 #: src/truncate.c:115
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 
 #: src/truncate.c:121
@@ -9516,12 +9590,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr ""
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr ""
@@ -9592,12 +9666,12 @@ msgstr ""
 msgid "tab stop value is too large"
 msgstr ""
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr ""
 
-#: src/uniq.c:138
+#: src/uniq.c:174
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
 "writing to OUTPUT (or standard output).\n"
@@ -9605,36 +9679,49 @@ msgid ""
 "With no options, matching lines are merged to the first occurrence.\n"
 msgstr ""
 
-#: src/uniq.c:147
+#: src/uniq.c:183
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
+msgstr ""
+
+#: src/uniq.c:187
+msgid ""
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
+msgstr ""
+
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr ""
+
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
 msgstr ""
 
-#: src/uniq.c:151
+#: src/uniq.c:199
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
 "  -i, --ignore-case     ignore differences in case when comparing\n"
 "  -s, --skip-chars=N    avoid comparing the first N characters\n"
 "  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
 msgstr ""
 
-#: src/uniq.c:161
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr ""
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 msgid ""
 "\n"
 "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n"
 "characters.  Fields are skipped before chars.\n"
 msgstr ""
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 msgid ""
 "\n"
 "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n"
@@ -9642,24 +9729,34 @@ msgid ""
 "Also, comparisons honor the rules specified by 'LC_COLLATE'.\n"
 msgstr ""
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, c-format
 msgid "too many repeated lines"
 msgstr ""
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
 msgstr ""
 
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
 msgstr ""
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
 msgstr ""
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr ""
+
+#: src/uniq.c:652
+#, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr ""
+
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr ""
@@ -9677,11 +9774,6 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/unlink.c:86
-#, c-format
-msgid "cannot unlink %s"
-msgstr ""
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -9726,7 +9818,7 @@ msgstr[1] ""
 msgid ",  load average: %.2f"
 msgstr ""
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -9734,19 +9826,19 @@ msgid ""
 "in the run queue over the last 1, 5 and 15 minutes."
 msgstr ""
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
 "an uninterruptible sleep state also contribute to the load average.\n"
 msgstr ""
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr ""
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
diff --git a/po/id.gmo b/po/id.gmo
index 22497b91..195f5b2c 100644
--- a/po/id.gmo
+++ b/po/id.gmo
diff --git a/po/id.po b/po/id.po
index a60864f0..a126c8dd 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,14 +1,14 @@
 # Pesan Bahasa Indonesia untuk coreutils
 # Copyright (C) 2008 Free Software Foundation, Inc.
 # This file is distributed under the same license as the coreutils package.
-# Arif E. Nugroho <arif_endro@yahoo.com>, 2008, 2009, 2010.
+# Arif E. Nugroho <arif_endro@yahoo.com>, 2008, 2009, 2010, 2011, 2012, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: coreutils 8.4\n"
+"Project-Id-Version: coreutils 8.21\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
-"PO-Revision-Date: 2010-01-16 08:45+0700\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
+"PO-Revision-Date: 2013-05-16 08:45+0700\n"
 "Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
 "Language: id\n"
@@ -35,76 +35,124 @@ msgstr "Argumen yang valid adalah:"
 msgid "error closing file"
 msgstr "error menutup berkas"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "error menulis"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "menyimpan permission untuk %s"
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "System error tidak diketahui"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "berkas kosong regular"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "berkas regular"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "direktori"
 
-#: lib/file-type.c:44
-msgid "block special file"
-msgstr "berkas blok spesial"
-
-#: lib/file-type.c:47
-msgid "character special file"
-msgstr "berkas karakter spesial"
-
-#: lib/file-type.c:50
-msgid "fifo"
-msgstr "fifo"
-
-#: lib/file-type.c:53
+#: lib/file-type.c:46
 msgid "symbolic link"
 msgstr "link simbolik"
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "socket"
-
-#: lib/file-type.c:59
+#: lib/file-type.c:52
 msgid "message queue"
 msgstr "pesan antrian"
 
-#: lib/file-type.c:62
+#: lib/file-type.c:55
 msgid "semaphore"
 msgstr "semaphore"
 
-#: lib/file-type.c:65
+#: lib/file-type.c:58
 msgid "shared memory object"
 msgstr "objek memori dibagi"
 
-#: lib/file-type.c:68
+#: lib/file-type.c:61
 msgid "typed memory object"
 msgstr "objek memori diketik"
 
-#: lib/file-type.c:70
+#: lib/file-type.c:66
+msgid "block special file"
+msgstr "berkas blok spesial"
+
+#: lib/file-type.c:69
+msgid "character special file"
+msgstr "berkas karakter spesial"
+
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr ""
+
+#: lib/file-type.c:75
+msgid "fifo"
+msgstr "fifo"
+
+#: lib/file-type.c:78
+msgid "door"
+msgstr ""
+
+#: lib/file-type.c:81
+#, fuzzy
+msgid "multiplexed block special file"
+msgstr "berkas blok spesial"
+
+#: lib/file-type.c:84
+#, fuzzy
+msgid "multiplexed character special file"
+msgstr "berkas karakter spesial"
+
+#: lib/file-type.c:87
+#, fuzzy
+msgid "multiplexed file"
+msgstr "banyak peran"
+
+#: lib/file-type.c:90
+#, fuzzy
+msgid "named file"
+msgstr "berkas aneh"
+
+#: lib/file-type.c:93
+#, fuzzy
+msgid "network special file"
+msgstr "berkas blok spesial"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr ""
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr ""
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr ""
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "socket"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr ""
+
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "berkas aneh"
 
@@ -239,18 +287,18 @@ msgstr "%s: pilihan '-W %s' tidak memperbolehkan sebuah argumen\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: pilihan '%s' membutuhkan sebuah argumen\n"
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr "tidak dapat merubah ijin dari %s"
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "tidak dapat membuat direktori %s"
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr "kehabisan memori"
@@ -367,7 +415,7 @@ msgstr "Ekspresi regular terlalu besar"
 msgid "Unmatched ) or \\)"
 msgstr "Tidak cocok ) atau \\)"
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 msgid "No previous regular expression"
 msgstr "Tidak ada ekspresi regular sebelumnya"
 
@@ -393,7 +441,7 @@ msgstr "gunakan --no-preserve-root untuk memaksa gagal-aman ini"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[yY]"
 
@@ -403,11 +451,11 @@ msgstr "^[yY]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[tT]"
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, c-format
 msgid "setting permissions for %s"
 msgstr "menset ijin untuk %s"
@@ -548,18 +596,6 @@ msgstr "Kegagalan penyuplai listrik"
 msgid "Resource lost"
 msgstr "Kehilangan sumber daya"
 
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, fuzzy, c-format
-msgid "cannot create pipe"
-msgstr "tidak dapat membuat fifo %s"
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, fuzzy, c-format
-msgid "%s subprocess failed"
-msgstr "%s: gagal mencari"
-
 #: lib/strsignal.c:114
 #, c-format
 msgid "Real-time signal %d"
@@ -769,7 +805,7 @@ msgstr ""
 msgid "Report %s bugs to: %s\n"
 msgstr "Laporkan %s bugs ke: %s\n"
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s halaman rumah: <%s>\n"
@@ -779,30 +815,10 @@ msgstr "%s halaman rumah: <%s>\n"
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr "%s halaman rumah: <http://www.gnu.org/software/%s/>\n"
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr "Bantuan umum menggunakan aplikasi GNU: <http://www.gnu.org/gethelp/>\n"
 
-#: lib/w32spawn.h:43
-#, fuzzy, c-format
-msgid "_open_osfhandle failed"
-msgstr "gagal membuka"
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr ""
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr ""
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr ""
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr "stdin"
@@ -824,7 +840,7 @@ msgstr "Aliran tidak diketahui"
 msgid "failed to reopen %s with mode %s"
 msgstr "gagal untuk membuka kembali %s dengan mode %s"
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr "gagal membandingkan string"
@@ -885,7 +901,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -910,48 +926,47 @@ msgstr ""
 "merekover\n"
 "dari karakter bukan alphabet bytes dalam stream yang dienkode.\n"
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "error baca"
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, c-format
 msgid "invalid input"
 msgstr "masukan tidak valid"
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, c-format
 msgid "invalid wrap size: %s"
 msgstr "ukuran wrap tidak valid: %s"
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, c-format
 msgid "extra operand %s"
 msgstr "extra operand %s"
 
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, c-format
 msgid "closing standard input"
 msgstr "menutup masukan standar"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -981,8 +996,8 @@ msgstr ""
 #: src/basename.c:60
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/basename.c:67
@@ -996,32 +1011,31 @@ msgid ""
 "  %s -a any/str1 any/str2   -> \"str1\" followed by \"str2\"\n"
 msgstr ""
 
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, c-format
 msgid "missing operand"
 msgstr "operand hilang"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr "Torbjorn Granlund"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 msgid "Richard M. Stallman"
 msgstr "Richard M. Stallman"
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1079,7 +1093,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr "tidak dapat melakukan ioctl di %s"
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr "keluaran standar"
@@ -1096,14 +1110,14 @@ msgstr "Russel Coker"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 msgid "Jim Meyering"
 msgstr "Jim Meyering"
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, c-format
 msgid "failed to create security context: %s"
 msgstr "gagal untuk membuat konteks keamanan: %s"
@@ -1113,8 +1127,8 @@ msgstr "gagal untuk membuat konteks keamanan: %s"
 msgid "failed to set %s security context component to %s"
 msgstr "gagal menset %s kontek keamanan komponen ke %s"
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, c-format
 msgid "failed to get security context of %s"
 msgstr "gagal untuk memperoleh konteks keamanan dari %s"
@@ -1124,18 +1138,18 @@ msgstr "gagal untuk memperoleh konteks keamanan dari %s"
 msgid "can't apply partial context to unlabeled file %s"
 msgstr "tidak dapat mengapply konteks pecahan ke berkas yang tidak bernama %s"
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, c-format
 msgid "failed to change context of %s to %s"
 msgstr "gagal untuk mengubah konteks dari %s ke %s"
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
 msgstr "tidak dapat mengakses %s"
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, c-format
 msgid "cannot read directory %s"
 msgstr "tidak dapat membaca direktori %s"
@@ -1145,13 +1159,14 @@ msgstr "tidak dapat membaca direktori %s"
 msgid "changing security context of %s\n"
 msgstr "mengubah konteks keamanan dari %s\n"
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, c-format
 msgid "fts_read failed"
 msgstr "fts_read gagal"
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, c-format
 msgid "fts_close failed"
 msgstr "fts_close gagal"
@@ -1171,7 +1186,7 @@ msgstr ""
 #: src/chcon.c:357
 #, fuzzy
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
@@ -1202,7 +1217,7 @@ msgstr ""
 "  -t, --type=TYPE        set type TIPE dalam target konteks keamanan\n"
 "  -l, --range=RANGE      set range RANGE dalam target konteks keamanan\n"
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 #, fuzzy
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
@@ -1262,36 +1277,37 @@ msgstr ""
 "  -P                     jangan menelusuri link simbolik apapun (default)\n"
 "\n"
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr "-R --dereference membutuhkan baik -H atau -L"
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr "-R -h membutuhkan -P"
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, c-format
 msgid "missing operand after %s"
 msgstr "hilang operand setelah %s"
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, c-format
 msgid "invalid context: %s"
 msgstr "konteks tidak valid: %s"
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr "konteks keamanan konflik dengan spesifikasi yang diberikan"
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, c-format
 msgid "failed to get attributes of %s"
 msgstr "gagal untuk memperoleh atribut dari %s"
@@ -1323,7 +1339,7 @@ msgstr ""
 "  -h, --no-dereference   mempengaruhi sambungan simbolik daripada referensi "
 "ke berkas apapun\n"
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
@@ -1360,47 +1376,47 @@ msgstr ""
 "  %s staff /u      Ubah grup dari /u ke \"staff\".\n"
 "  %s -hR staff /u  Ubah grup dari /u dan berkas dibawahnya ke \"staff\".\n"
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
 msgstr "memperoleh atribut baru dari %s"
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr "bukan link simbolik %s ataupun referensi yang telah diubah\n"
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, fuzzy, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr "mode dari %s diubah menjadi %04lo (%s)\n"
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, fuzzy, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr "gagal untuk mengubah mode dari %s ke %04lo (%s)\n"
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr "mode dari %s dijaga sebagai %04lo (%s)\n"
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr "tidak dapat beroperasi di simlink dangling %s"
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, c-format
 msgid "changing permissions of %s"
 msgstr "mengubah ijin dari %s"
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr "%s: ijin baru adalah %s, bukan %s"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1411,7 +1427,7 @@ msgstr ""
 "  atau:     %s [PILIHAN]... MODE-OKTAL BERKAS...\n"
 "  atau:     %s [PILIHAN]... --reference=RFILE BERKAS...\n"
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 #, fuzzy
 msgid ""
 "Change the mode of each FILE to MODE.\n"
@@ -1424,22 +1440,15 @@ msgstr ""
 "  -h, --no-dereference   mempengaruhi sambungan simbolik daripada referensi "
 "ke berkas apapun\n"
 
-#: src/chmod.c:391
-#, fuzzy
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
-"      --reference=RFILE  gunakan RFILE konteks keamanan daripada "
-"menspesifikasikan\n"
-"                         sebuah nilai KONTEKS\n"
-"  -R, --recursive        beroperasi di berkas dan direktori secara rekursif\n"
-"  -v, --verbose          mengeluarkan sebuah diagnosa untuk setiap berkas "
-"yang diproses\n"
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr ""
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 #, fuzzy
 msgid ""
 "\n"
@@ -1448,12 +1457,12 @@ msgstr ""
 "\n"
 "Setiap MODE adalah dalam bentuk '[ugoa]*([-+=]([rwxXst]*|[ugo]))+'.\n"
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr "tidak dapat mengkombinasikan mode dan pilihan --reference"
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, c-format
 msgid "invalid mode: %s"
 msgstr "mode tidak valid: %s"
@@ -1601,26 +1610,21 @@ msgstr ""
 "  %s -hR root /u    Ubah pemilik dari /u dan subfiles ke \"root\".\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr "Roland McGrath"
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr "grup tidak valid %s"
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, c-format
 msgid "invalid group list %s"
 msgstr "daftar grup tidak valid %s"
 
-#: src/chroot.c:117
-#, c-format
-msgid "failed to set additional groups"
-msgstr "gagal untuk menset grup tambahan"
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
@@ -1629,7 +1633,7 @@ msgstr ""
 "Penggunaan: %s [PILIHAN] NEWROOT [PERINTAH [ARG]...]\n"
 "  atau:     %s PILIHAN\n"
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
@@ -1637,7 +1641,7 @@ msgstr ""
 "Jalankan PERINTAH dengan direktori root set ke NEWROOT.\n"
 "\n"
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
@@ -1646,7 +1650,7 @@ msgstr ""
 "yang digunakan\n"
 "  --groups=G_LIST          spesifikasikan grup tambahan sebagai g1,g2,..,gN\n"
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 #, fuzzy
 msgid ""
 "\n"
@@ -1656,28 +1660,42 @@ msgstr ""
 "Jika tidak ada perintah yang diberikan, jalankan ``${SHELL} -i'' (default: /"
 "bin/sh).\n"
 
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, c-format
 msgid "cannot change root directory to %s"
 msgstr "tidak dapat mengubah direktori root ke %s"
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, c-format
 msgid "cannot chdir to root directory"
 msgstr "tidak dapat chdir ke direktori root"
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr ""
+
+#: src/chroot.c:383
+#, fuzzy, c-format
+msgid "failed to get supplemental groups"
+msgstr "gagal untuk menset grup tambahan"
+
+#: src/chroot.c:395
+#, fuzzy, c-format
+msgid "failed to %s supplemental groups"
+msgstr "gagal untuk menset grup tambahan"
+
+#: src/chroot.c:402
 #, c-format
 msgid "failed to set group-ID"
 msgstr "gagal untuk menset ID grup"
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, c-format
 msgid "failed to set user-ID"
 msgstr "gagal untuk menset ID pengguna"
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, c-format
 msgid "failed to run command %s"
 msgstr "gagal menjalankan perintah %s"
@@ -1709,7 +1727,7 @@ msgstr ""
 "Tampilkan checksum CRC dan jumlah byte dari setiap BERKAS\n"
 "\n"
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr "Penggunaan: %s [PILIHAN]... BERKAS1 BERKAS2\n"
@@ -1798,297 +1816,330 @@ msgstr "banyak pembatas dispesifikasikan"
 msgid "empty %s not allowed"
 msgstr "kosong %s tidak diperbolehkan"
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr "error membaca %s"
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, c-format
 msgid "cannot lseek %s"
 msgstr "tidak dapat lseek %s"
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr "error menulis %s"
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, fuzzy, c-format
 msgid "%s: failed to get extents info"
 msgstr "gagal memperolek konteks sekarang"
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, fuzzy, c-format
 msgid "%s: write failed"
 msgstr "tulis gagal"
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, fuzzy, c-format
 msgid "failed to extend %s"
 msgstr "gagal untuk membuka %s"
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, c-format
 msgid "clearing permissions for %s"
 msgstr "menghapus ijin untuk %s"
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "gagal untuk menjaga kepemilikan untuk %s"
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
 msgstr "gagal untuk menlookup berkas %s"
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, c-format
 msgid "failed to preserve authorship for %s"
 msgstr "gagal untuk menjaga kepengarangan untuk %s"
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
+#, c-format
+msgid "failed to set default file creation context to %s"
+msgstr "gagal untuk menset default berkas pembuatan konteks ke %s"
+
+#: src/copy.c:820
+#, fuzzy, c-format
+msgid "failed to set default file creation context for %s"
+msgstr "gagal untuk menset default berkas pembuatan konteks ke %s"
+
+#: src/copy.c:846
+#, fuzzy, c-format
+msgid "failed to set the security context of %s"
+msgstr "gagal untuk menset konteks keamanan dari %s ke %s"
+
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
 msgid "cannot open %s for reading"
 msgstr "tidak dapat membuka %s untuk dibaca"
 
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, c-format
 msgid "cannot fstat %s"
 msgstr "tidak dapat fstat %s"
 
-#: src/copy.c:820
+#: src/copy.c:935
 #, c-format
 msgid "skipping file %s, as it was replaced while being copied"
 msgstr "melewati berkas %s, seperti ini ditimpa ketika sedang disalin"
 
-#: src/copy.c:850
-#, c-format
-msgid "failed to get file system create context"
-msgstr "gagal memperoleh file sysmte create context"
-
-#: src/copy.c:864
-#, c-format
-msgid "failed to set the security context of %s to %s"
-msgstr "gagal untuk menset konteks keamanan dari %s ke %s"
-
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
 msgid "cannot remove %s"
 msgstr "tidak dapat menghapus %s"
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
 msgstr "menghapus %s\n"
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr "tidak menulis melalui dangling symlink %s"
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, c-format
 msgid "cannot create regular file %s"
 msgstr "tidak dapat membuat berkas regular %s"
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, fuzzy, c-format
 msgid "failed to clone %s from %s"
 msgstr "gagal untuk menutup %s"
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr "menjaga waktu untuk %s"
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
 #, fuzzy, c-format
 msgid "failed to close %s"
-msgstr "gagal untuk membuka %s"
+msgstr "gagal untuk menutup %s"
 
-#: src/copy.c:1471
-#, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
+#: src/copy.c:1580
+#, fuzzy, c-format
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
 msgstr "%s: mencoba untuk menulis %s, mengoveride mode %04lo (%s)? "
 
-#: src/copy.c:1478
+#: src/copy.c:1581
+#, c-format
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr ""
+
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
 msgstr "%s: menimpa %s? "
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr " (backup: %s)"
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr "gagal merestore ke default berkas konteks pembuatan"
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, c-format
 msgid "cannot create hard link %s to %s"
 msgstr "tidak dapat membuah link keras %s ke %s"
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, c-format
 msgid "cannot stat %s"
 msgstr "tidak dapat memperoleh statistik %s"
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, c-format
 msgid "omitting directory %s"
 msgstr "mengabaikan direktori %s"
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr "peringatan: berkas sumber %s dispesifikasikan lebih dari sekali"
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
 msgstr "%s dan %s adalah berkas yang sama"
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr "tidak dapat menimpa bukan-direktori %s dengan direktori %s"
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr "tidak akan menimpa baru dibuat %s dengan %s"
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr "tidak dapat menimpa direktori %s dengan bukan-direktori"
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr "tidak dapat memindahkan direktori ke bukan-direktori: %s -> %s"
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr "backing up %s akan menghancurkan sumber; %s tidak dipindah"
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr "backing up %s akan menghancurkan sumber; %s tidak disalin"
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
 msgstr "tidak dapat membackup %s"
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr "tidak akan disalin %s melalui baru-dibuat symlink %s"
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr "tidak dapat menyalin sebuah direktori, %s, kedalam diri sendiri, %s"
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr "tidak akan membuah link keras %s ke direktori %s"
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr ""
 "tidak dapat memindahkan %s ke sebuah subdirektori dari direktori itu "
 "sendiri, %s"
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, c-format
 msgid "cannot move %s to %s"
 msgstr "tidak dapat memindahkan %s ke %s"
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr "inter-device pindah gagal; %s ke %s; tidak dapat menghapus target"
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, c-format
-msgid "failed to set default file creation context to %s"
-msgstr "gagal untuk menset default berkas pembuatan konteks ke %s"
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr "tidak dapat menyalin cyclic link simbolik %s"
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr ""
 "%s: dapat membuat relative link simbolik hanya dalam direktori sekarang"
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr "tidak dapat membuat link simbolik %s ke %s"
 
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, c-format
 msgid "cannot create fifo %s"
 msgstr "tidak dapat membuat fifo %s"
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, c-format
 msgid "cannot create special file %s"
 msgstr "tidak dapat membuah berkas spesial %s"
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, c-format
 msgid "cannot read symbolic link %s"
 msgstr "tidak dapat membaca link simbolik %s"
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, c-format
 msgid "cannot create symbolic link %s"
 msgstr "tidak dapat membuat link simbolik %s"
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
 msgstr "%s memiliki tipe berkas tidak diketahui"
 
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, c-format
 msgid "cannot un-backup %s"
 msgstr "tidak dapat un-backup %s"
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr "%s -> %s (unbackup)\n"
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr ""
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr ""
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, fuzzy, c-format
+msgid "unknown program %s"
+msgstr "Aliran tidak diketahui"
+
+#: src/cp.c:157 src/mv.c:288
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -2099,14 +2150,14 @@ msgstr ""
 "  atau:     %s [PILIHAN]... SUMBER... DIREKTORI\n"
 "  atau:     %s [PILIHAN]... -t DIREKTORI SUMBER...\n"
 
-#: src/cp.c:162
+#: src/cp.c:163
 #, fuzzy
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 "Salin SUMBER ke TUJUAN, atau multiple SUMBER ke DIREKTORI.\n"
 "\n"
 
-#: src/cp.c:168
+#: src/cp.c:169
 #, fuzzy
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
@@ -2130,7 +2181,7 @@ msgstr ""
 "  -d                           sama seperti --no-dereference --"
 "preserve=links\n"
 
-#: src/cp.c:177
+#: src/cp.c:178
 #, fuzzy
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
@@ -2152,7 +2203,7 @@ msgstr ""
 "  -H                           ikuti baris-perintah link simbolik dalam "
 "SUMBER\n"
 
-#: src/cp.c:186
+#: src/cp.c:187
 #, fuzzy
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
@@ -2161,7 +2212,7 @@ msgstr ""
 "  -l, --link                   berkas link daripada menyalin\n"
 "  -L, --dereference            selalu mengikuti link simbolik dalam SUMBER\n"
 
-#: src/cp.c:190
+#: src/cp.c:191
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
 "                                 a previous -i option)\n"
@@ -2171,7 +2222,7 @@ msgstr ""
 "                               (memaksa pilihan -i sebelumnya)\n"
 "  -P, --no-dereference         jangan ikuti link simbolik dalam SUMBER\n"
 
-#: src/cp.c:195
+#: src/cp.c:196
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
 "      --preserve[=ATTR_LIST]   preserve the specified attributes (default:\n"
@@ -2188,7 +2239,7 @@ msgstr ""
 "                               atribut tambahan: context, links, xattr\n"
 "                               all\n"
 
-#: src/cp.c:203
+#: src/cp.c:204
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                use full source file name under DIRECTORY\n"
@@ -2197,7 +2248,7 @@ msgstr ""
 "      --parents                gunakan full nama berkas sumber dibawah "
 "DIREKTORI\n"
 
-#: src/cp.c:207
+#: src/cp.c:208
 #, fuzzy
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
@@ -2213,7 +2264,7 @@ msgstr ""
 "                               mencoba untuk membukanya (kebalikan dengan --"
 "force)\n"
 
-#: src/cp.c:213
+#: src/cp.c:214
 #, fuzzy
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
@@ -2226,7 +2277,7 @@ msgstr ""
 "      --strip-trailing-slashes hapus akhiran slashes dari setiap SUMBER\n"
 "                               argumen\n"
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -2241,7 +2292,7 @@ msgstr ""
 "  -T, --no-target-directory    perlakukan TUJUAN sebagai sebuah berkas "
 "normal\n"
 
-#: src/cp.c:224
+#: src/cp.c:225
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
 "                                 than the destination file or when the\n"
@@ -2255,7 +2306,15 @@ msgstr ""
 "  -v, --verbose                jelaskan apa yang sedang dilakukan\n"
 "  -x, --one-file-system        tetap di sistem berkas ini\n"
 
-#: src/cp.c:233
+#: src/cp.c:232
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/cp.c:240
 msgid ""
 "\n"
 "By default, sparse SOURCE files are detected by a crude heuristic and the\n"
@@ -2286,7 +2345,7 @@ msgstr ""
 "penyalinan akan gagal, atau jika --reflink=auto dispesifikasikan, kembali ke "
 "standar penyalinan.\n"
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 #, fuzzy
 msgid ""
 "\n"
@@ -2303,7 +2362,7 @@ msgstr ""
 "melalui variabel lingkungan VERSION_CONTROL. Ini adalah nilainya:\n"
 "\n"
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2316,7 +2375,7 @@ msgstr ""
 "  existing, nil   bernomor jika backup bernomor ada, simple jika tidak\n"
 "  simple, never   selalu membuat backup sederhana\n"
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2329,223 +2388,233 @@ msgstr ""
 "pilihan diberikan dan SOURCE dan DEST memiliki nama sama untuk sebuah\n"
 "berkas regular yang telah ada.\n"
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, c-format
 msgid "failed to preserve times for %s"
 msgstr "gagal untuk menjaga waktu untuk %s"
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, c-format
 msgid "failed to preserve permissions for %s"
 msgstr "gagal untuk menjaga ijin untuk %s"
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, c-format
 msgid "cannot make directory %s"
 msgstr "tidak dapat membuat direktori %s"
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr "%s ada tetapi bukan sebuah direktori"
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
 #, fuzzy, c-format
 msgid "failed to access %s"
-msgstr "gagal untuk membuka %s"
+msgstr "gagal untuk menutup %s"
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, c-format
 msgid "missing file operand"
 msgstr "operand berkas hilang"
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, c-format
 msgid "missing destination file operand after %s"
 msgstr "berkas tujuan operand hilang setelah %s"
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr ""
 "tidak dapat mengkombinasikan --target-directory (-t) dan --no-target-"
 "directory (-T)"
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, c-format
 msgid "target %s is not a directory"
 msgstr "target %s bukan sebuah direktori"
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr "dengan --parents, tujuan harus berupa sebuah direktori"
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, c-format
 msgid "multiple target directories specified"
 msgstr "multiple target direktori dispesifikasikan"
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, fuzzy, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr "PERINGATAN: mengabaikan --context (-Z); kernel ini bukan SELinux-aktif"
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr "tidak dapat membuat hard dan simbolik link"
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr "pilihan --backup dan --no-clobber adalah mutually ekslusif"
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr "--reflink hanya dapat digunakan dengan --sparse=auto"
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr "tipe backup"
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, fuzzy, c-format
+msgid "cannot set target context and preserve it"
+msgstr "tidak dapat memaksa konteks tujuan ke %s dan menjaganya"
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr ""
 "tidak dapat menjaga konteks keamanan tanpa sebuah kernel SELinux support"
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr "tidak dapat menjaga atribut ekstensi, cp dibuat tanpa dukungan xattr"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr "Stuart Kemp"
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr "masukan hilang"
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr "%s: nomor baris hilang dari jangkauan"
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, c-format
 msgid "%s: %s: line number out of range"
 msgstr "%s: %s: nomor baris hilang dari jangkauan"
 
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, c-format
 msgid " on repetition %s\n"
 msgstr " repetisi di %s\n"
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, c-format
 msgid "%s: %s: match not found"
 msgstr "%s: %s: cocok tidak ditemukan"
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr "error dalam pencarian ekspresi regular"
 
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, c-format
 msgid "write error for %s"
 msgstr "error dalam penulisan untuk %s"
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, c-format
 msgid "%s: integer expected after delimiter"
 msgstr "%s: integer diperkirakan setelah delimiter"
 
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, fuzzy, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr "%s: `}' dibutuhkan dalam jumlah berulang"
 
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, fuzzy, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr "%s}: integer dibutuhkan diantara `{' dan `}'"
 
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, fuzzy, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr "%s: menutup delimiter `%c' hilang"
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr "%s: ekspresi regular tidak valid: %s"
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr "%s: pola tidak valid"
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr "%s: nomor baris harus lebih besar dari nol"
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr "nomor baris %s lebih kecil dari nomor baris sebelumnya, %s"
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr "peringatan: nomor baris %s sama dengan nomor baris sebelumnya"
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr "hilang spesifikasi konversi dalam akhiran"
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr "spesifikasi konversi tidak valid dalam akhiran: %c"
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr "spesifikasi konversi tidak valid dalam akhiran: \\%.3o"
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, fuzzy, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr "%.*s: spesifikasi konversi tidak valid"
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr "terlalu banyak %% spesifikasi konversi dalam akhiran"
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr "hilang %% spesifikasi konversi di akhiran"
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr "%s: nomor tidak valid"
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr "Penggunaan: %s [PILIHAN]... BERKAS POLA...\n"
 
-#: src/csplit.c:1455
+#: src/csplit.c:1483
 #, fuzzy
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
@@ -2556,7 +2625,7 @@ msgstr ""
 "dan jumlah keluaran byte dari setiap potongan ke keluaran standar.\n"
 "\n"
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, fuzzy, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2567,7 +2636,11 @@ msgstr ""
 "  -f, --prefix=PREFIX        gunakan PREFIX daripada `xx'\n"
 "  -k, --keep-files           jangan menghapus berkas keluaran di errors\n"
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr ""
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
@@ -2579,7 +2652,7 @@ msgstr ""
 "keluaran\n"
 "  -z, --elide-empty-files    hapus keluaran berkas kosong\n"
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
@@ -2587,7 +2660,7 @@ msgstr ""
 "\n"
 "Baca standard masukan jika BERKAS adalah -. Setiap POLA mungkin:\n"
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 #, fuzzy
 msgid ""
 "\n"
@@ -2614,16 +2687,12 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr "David M. Ihnat"
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr "fields dan posisi dinomori dari 1"
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr "Penggunaan: %s PILIHAN... [BERKAS]...\n"
 
-#: src/cut.c:193
+#: src/cut.c:176
 #, fuzzy
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr ""
@@ -2631,7 +2700,7 @@ msgstr ""
 "standar.\n"
 "\n"
 
-#: src/cut.c:199
+#: src/cut.c:182
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
 "  -c, --characters=LIST   select only these characters\n"
@@ -2641,7 +2710,7 @@ msgstr ""
 "  -c, --character=LIST    pilih hanya karakter ini\n"
 "  -d, --delimiter=DELIM   gunakan DELIM daripada TAB untuk bagian pembatas\n"
 
-#: src/cut.c:204
+#: src/cut.c:187
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
 "                            that contains no delimiter character, unless\n"
@@ -2654,7 +2723,7 @@ msgstr ""
 "                          pilihan -s dispesifikasikan\n"
 "  -n                      (diabaikan)\n"
 
-#: src/cut.c:210
+#: src/cut.c:193
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
 "                            or fields\n"
@@ -2663,7 +2732,7 @@ msgstr ""
 "yang\n"
 "                          dipilih\n"
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
@@ -2674,7 +2743,7 @@ msgstr ""
 "                          sebagai default yang digunakan sebagai masukan "
 "delimiter\n"
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2688,7 +2757,7 @@ msgstr ""
 "ditulis\n"
 "dalam urutan yang sama dengan waktu dibaca, dan ditulis tepat sekali.\n"
 
-#: src/cut.c:227
+#: src/cut.c:210
 msgid ""
 "Each range is one of:\n"
 "\n"
@@ -2706,50 +2775,54 @@ msgstr ""
 "  N-M   dari N ke M (termasuk) byte, karakter atau field\n"
 "  -M    dari pertama ke M (termasuk) byte, karakter atau field\n"
 
-#: src/cut.c:367 src/cut.c:493
+#: src/cut.c:300 src/cut.c:394
 #, fuzzy
 msgid "invalid byte, character or field list"
 msgstr "byte tidak valid atau daftar field"
 
-#: src/cut.c:387
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr "fields dan posisi dinomori dari 1"
+
+#: src/cut.c:320
 msgid "invalid range with no endpoint: -"
 msgstr "jangkauan tidak valid dengan tidak ada endpoint: -"
 
-#: src/cut.c:403
+#: src/cut.c:334
 msgid "invalid decreasing range"
 msgstr "jangkauan berkurang tidak valid"
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, c-format
 msgid "byte offset %s is too large"
 msgstr "byte offset %s terlalu besar"
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, c-format
 msgid "field number %s is too large"
 msgstr "nomor field %s terlalu besar"
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr "hanya satu tipe dari daftar yang boleh dispesifikasikan"
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr "pembatas harus berupa sebuah karakter"
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr ""
 "anda harus menspesifikasikan sebuah daftar dari bytes, karakter, atau fields"
 
-#: src/cut.c:850
+#: src/cut.c:790
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr ""
 "sebuah pembatas masukana mungkin dispesifikan hanya ketika beroperasi di "
 "fields"
 
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
@@ -2757,11 +2830,11 @@ msgstr ""
 "menekan non-delimited baris membuat masuk akal\n"
 "\thanya ketika beroperasi di fields"
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr "hilang daftar dari fields"
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr "hilang daftar dari posisi"
 
@@ -2807,7 +2880,7 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 "      --ufc-3339=TIMESPEC   mengeluarkan tanggal dan jam dalam format RFC "
 "3339.\n"
@@ -3020,10 +3093,10 @@ msgid ""
 "  $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n"
 msgstr ""
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr "standar masukan"
@@ -3066,7 +3139,7 @@ msgstr ""
 msgid "cannot set date"
 msgstr "tidak dapat menset tanggal"
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, c-format
 msgid "time %s is out of range"
 msgstr "jam %s adalah diluar jangkauan"
@@ -3077,7 +3150,7 @@ msgstr "jam %s adalah diluar jangkauan"
 msgid "Paul Rubin"
 msgstr "Paul Rubin"
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
@@ -3086,7 +3159,7 @@ msgstr ""
 "Penggunaan: %s [OPERAND]...\n"
 "  atau:     %s PILIHAN\n"
 
-#: src/dd.c:526
+#: src/dd.c:532
 #, fuzzy
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
@@ -3107,7 +3180,7 @@ msgstr ""
 "  count=BLOCKS    salin hanya BLOK input blok\n"
 "  ibs=BYTES       baca BYTES byte dalam satu waktu\n"
 
-#: src/dd.c:535
+#: src/dd.c:541
 #, fuzzy
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
@@ -3129,7 +3202,7 @@ msgstr ""
 "  skip=BLOK       lewati BLOK sebesar ibs blok di awal dari masukan\n"
 "  status=noxfer   tekan statistik transfer\n"
 
-#: src/dd.c:546
+#: src/dd.c:552
 #, fuzzy
 msgid ""
 "\n"
@@ -3148,7 +3221,7 @@ msgstr ""
 "Setiap simbol CONV bisa berupa:\n"
 "\n"
 
-#: src/dd.c:555
+#: src/dd.c:561
 #, fuzzy
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
@@ -3176,7 +3249,7 @@ msgstr ""
 "digunakan\n"
 "            dengan blok atau unblok, pad dengan spasi daripada dengan NUL\n"
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -3192,7 +3265,7 @@ msgstr ""
 "  fdatasync secara fisik tulis berkas keluaran data sebelum selesai\n"
 "  fsync     sama seperti, tetapi juga tulis metadata\n"
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -3206,75 +3279,75 @@ msgstr ""
 "  append    mode append (berguna hanya untuk keluaran; conv=notrunc "
 "disarankan)\n"
 
-#: src/dd.c:583
+#: src/dd.c:589
 msgid "  cio       use concurrent I/O for data\n"
 msgstr "  cio       gunakan I/O bersamaan untuk data\n"
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr "  direct    gunakan I/O langsung untuk data\n"
 
-#: src/dd.c:587
+#: src/dd.c:593
 msgid "  directory  fail unless a directory\n"
 msgstr "  direktori  gagal kecuali sebuah direktori\n"
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr "  dsync     gunakan I/O tersinkron untuk data\n"
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr "  sync      sama seperti itu, tetapi juga untuk metadata\n"
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr "  fullblock  akumulasikan blok penuh dari masukan (hanya iflag)\n"
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr "  nonblock  gunakan I/O non-blok\n"
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr "  noatime   jangan perbaharui waktu akses\n"
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr ""
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr "  noctty    jangan assign pengontrol terminal dari berkas\n"
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr "  nofollow  jangan ikuti symlinks\n"
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr "  nolinks   gagal jika multiply-linked\n"
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr "  binary    gunakan binary I/O untuk data\n"
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr "  text      gunakan teks I/O untuk data\n"
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr ""
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3304,7 +3377,17 @@ msgstr ""
 "Pilihan adalah:\n"
 "\n"
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
@@ -3313,21 +3396,21 @@ msgstr ""
 "%<PRIuMAX>+%<PRIuMAX> catatan masuk\n"
 "%<PRIuMAX>+%<PRIuMAX> catatan keluar\n"
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
 msgstr[0] "%<PRIuMAX> rekaman terpotong\n"
 msgstr[1] "%<PRIuMAX> rekaman terpotong\n"
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
 msgstr[0] "%<PRIuMAX> byte (%s) tersalin"
 msgstr[1] "%<PRIuMAX> byte (%s) tersalin"
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr "Tak terhingga B"
 
@@ -3341,83 +3424,83 @@ msgstr "Tak terhingga B"
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
 msgstr ", %g s, %s/s\n"
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, c-format
 msgid "closing input file %s"
 msgstr "menutup berkas masukan %s"
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr "menutup berkas keluaran %s"
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr "gagal untuk mematikan O_DIRECT: %s"
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, c-format
 msgid "writing to %s"
 msgstr "menulis ke %s"
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, c-format
 msgid "unrecognized operand %s"
 msgstr "operand %s tidak dikenal"
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 msgid "invalid conversion"
 msgstr "konversi tidak valid"
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 msgid "invalid input flag"
 msgstr "masukan flag tidak valid"
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 msgid "invalid output flag"
 msgstr "keluaran flag tidak valid"
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 msgid "invalid status flag"
 msgstr "statu flag tidak valid"
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, c-format
 msgid "invalid number %s"
 msgstr "nomor %s tidak valid"
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr "tidak dapat mengkombinasikan dua dari {ascii, ebcdic, ibm}"
 
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, c-format
 msgid "cannot combine block and unblock"
 msgstr "tidak dapat mengkombinasikan blok dan unblok"
 
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, c-format
 msgid "cannot combine lcase and ucase"
 msgstr "tidak dapat mengkombinasikan huruf kecil dan huruf besar"
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, c-format
 msgid "cannot combine excl and nocreat"
 msgstr "tidak dapat mengkombinasikan excl dan nocreat"
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, fuzzy, c-format
 msgid "cannot combine direct and nocache"
 msgstr "tidak dapat mengkombinasikan excl dan nocreat"
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
@@ -3426,72 +3509,62 @@ msgstr ""
 "peringatan: bekerja dalam lseek kernel bug untuk berkas (%s)\n"
 "  dari mt type=0x%00lx -- lihat <sys/mtio.h> untuk daftar dari type"
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, c-format
 msgid "%s: cannot skip"
 msgstr "%s: tidak dapat melewati"
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, c-format
 msgid "%s: cannot seek"
 msgstr "%s: tidak dapat mencari"
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr "offset overflow ketika membaca berkas %s"
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr "peringatan: berkas ofset tidak valid setelah gagal baca"
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr "tidak dapat bekerja dalam kernel bug ternyata"
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, c-format
 msgid "setting flags for %s"
 msgstr "menset flag untuk %s"
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr "%s: tidak dapat melewati ofset yang dispesifikasikan"
 
-#: src/dd.c:2133
+#: src/dd.c:2172
 #, fuzzy, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
 msgstr "gagal untuk memotong %<PRIuMAX> byte dalam berkas keluaran %s"
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr "fdatasync gagal untuk %s"
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
 msgstr "fsync gagal untuk %s"
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, c-format
 msgid "failed to open %s"
 msgstr "gagal untuk membuka %s"
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
@@ -3500,96 +3573,105 @@ msgstr ""
 "ofset terlalu besar: tidak dapat memotong ke panjang dari seek=%<PRIuMAX> "
 "(%lu-byte) blok"
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr "gagal untuk memotong %<PRIuMAX> byte dalam berkas keluaran %s"
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, fuzzy, c-format
 msgid "failed to discard cache for: %s"
 msgstr "gagal untuk chdir ke %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr "Paul Eggert"
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr "Sistem Berkas"
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr "Tipe"
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr "blok"
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr "Isi"
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr "Sisa"
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr "Isi%"
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr "Inode"
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr "IIsi"
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr "Ibebas"
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr "IIsi%"
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr "Dipasang di"
 
-#: src/df.c:383
-#, c-format
-msgid "option --output: field '%s' unknown"
+#: src/df.c:207
+msgid "File"
 msgstr ""
 
-#: src/df.c:390
+#: src/df.c:387
+#, fuzzy, c-format
+msgid "option --output: field %s unknown"
+msgstr "peringatan: berkas sumber %s dispesifikasikan lebih dari sekali"
+
+#: src/df.c:394
 #, fuzzy, c-format
-msgid "option --output: field '%s' used more than once"
+msgid "option --output: field %s used more than once"
 msgstr "peringatan: berkas sumber %s dispesifikasikan lebih dari sekali"
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr "Besar"
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr "Sisa"
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr "Kapasita"
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
 msgstr ""
 
-#: src/df.c:1210
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr ""
+
+#: src/df.c:1384
 #, fuzzy
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
@@ -3599,17 +3681,18 @@ msgstr ""
 "atau seluruh sistem berkas dengan default.\n"
 "\n"
 
-#: src/df.c:1217
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
 #, fuzzy
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
 "  -a, --all             termasuk sistem berkas dummy\n"
 "  -B, --block-size=SIZE gunakan SIZE-byte blok\n"
@@ -3618,7 +3701,7 @@ msgstr ""
 "  -H, --si              sama seperti itu, tetapi menggunakan kelipatan dari "
 "1000 bukan 1024\n"
 
-#: src/df.c:1227
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -3632,7 +3715,7 @@ msgstr ""
 "      --no-sync         jangan menjalankan sync sebelum memperoleh informasi "
 "penggunaan (default)\n"
 
-#: src/df.c:1234
+#: src/df.c:1409
 #, fuzzy
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
@@ -3654,42 +3737,33 @@ msgstr ""
 "tipe TIPE\n"
 "  -v                    (diabaikan)\n"
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
 
-#: src/df.c:1285
+#: src/df.c:1460
 #, fuzzy, c-format
 msgid "options %s and %s are mutually exclusive"
 msgstr "pilihan --compare (C) dan --strip adalah mutually exclusive"
 
-#: src/df.c:1335
-#, fuzzy
-msgid "warning: "
-msgstr "Peringatan: "
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr ""
-
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr "sistem berkas tipe %s keduanyan dipilih dan diexclude"
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr "Peringatan: "
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 msgid "cannot read table of mounted file systems"
 msgstr "tidak dapat membaca tabel dari sistem berkas yang terpasang"
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr "tidak ada sistem berkas yang diproses"
@@ -3699,7 +3773,7 @@ msgstr "tidak ada sistem berkas yang diproses"
 msgid "H. Peter Anvin"
 msgstr "H. Peter Anvin"
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr "Penggunaan: %s [PILIHAN]... [BERKAS]\n"
@@ -3790,13 +3864,13 @@ msgstr ""
 
 #: src/dirname.c:59
 #, fuzzy
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
 msgstr ""
 "  -0, --null     akhiri setiap baris keluaran dengan 0 byte daripada baris "
 "baru\n"
 
 #: src/dirname.c:64
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Examples:\n"
@@ -3804,12 +3878,8 @@ msgid ""
 "  %s dir1/str dir2/str  -> \"dir1\" followed by \"dir2\"\n"
 "  %s stdio.h            -> \".\"\n"
 msgstr ""
-"\n"
-"Contoh:\n"
-"  %s /usr/bin/sort Keluar \"/usr/bin\".\n"
-"  %s stdio.h       Keluar \".\".\n"
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -3818,7 +3888,7 @@ msgstr ""
 "Penggunaan: %s [PILIHAN]... [BERKAS]...\n"
 "  atau:     %s [PILIHAN]... --files0-from=F\n"
 
-#: src/du.c:274
+#: src/du.c:285
 #, fuzzy
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr ""
@@ -3826,11 +3896,10 @@ msgstr ""
 "direktori.\n"
 "\n"
 
-#: src/du.c:280
+#: src/du.c:291
 #, fuzzy
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3848,12 +3917,12 @@ msgstr ""
 "berkas, internal\n"
 "                        fragmentasi, blok tidak langsung, dan seperti itu\n"
 
-#: src/du.c:289
+#: src/du.c:300
 #, fuzzy
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3864,21 +3933,27 @@ msgid ""
 "                          line argument;  --max-depth=0 is the same as\n"
 "                          --summarize\n"
 msgstr ""
-"  -B, --block-size=SIZE  gunakan SIZE-byte blok\n"
-"  -b, --bytes            sama seperti `--apparent-size --block-size=1'\n"
-"  -c, --total            menghasilkan jumlah total\n"
-"  -D, --dereference-args dereference hanya symlink yang terdaftar di\n"
-"                         baris perintah\n"
+"  -x, --one-filesystem  lewati direktori di sistem berkas berbeda\n"
+"  -X, --exclude-from=BERKAS Exclude berkas yang cocok dari pola apapun dalam "
+"BERKAS.\n"
+"      --exclude=POLA    Exclude berkas yang cocok dengan POLA.\n"
+"      --max-depth=N     menampilkan total untuk sebuah direktori (atau "
+"berkas, dengan --all)\n"
+"                        hanya jika ini adalah N atau level lebih kecil "
+"dibawah perintah\n"
+"                        argumen baris; --max-depth=0 sama seperti dalam\n"
+"                        --summarize\n"
 
-#: src/du.c:302
+#: src/du.c:313
 #, fuzzy
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
 "      --files0-from=F   ringkas penggunaan disk dari NUL-terminated berkas\n"
 "                        nama dispesifikasikan dalam berkas F\n"
@@ -3889,7 +3964,7 @@ msgstr ""
 "      --si              seperti -h, tetapi menggunakan kelipatan 1000 bukan "
 "1024\n"
 
-#: src/du.c:310
+#: src/du.c:322
 #, fuzzy
 msgid ""
 "  -k                    like --block-size=1K\n"
@@ -3901,12 +3976,13 @@ msgstr ""
 "  -l, --count-links     hitung ukuran beberapa kali jika hard linked\n"
 "  -m                    seperti --block-size=1M\n"
 
-#: src/du.c:316
+#: src/du.c:328
 #, fuzzy
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
@@ -3917,7 +3993,7 @@ msgstr ""
 "  -S, --separate-dirs   jangan memasukan ukuran dari subdirektori\n"
 "  -s, --summarize       tampilkan hanya sebuah total dari setiap argumen\n"
 
-#: src/du.c:322
+#: src/du.c:334
 #, fuzzy
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
@@ -3927,9 +4003,9 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
 msgstr ""
 "      --time            menampilkan waktu dari terakhir modifikasi dari "
 "setiap berkas dalam \n"
@@ -3941,75 +4017,75 @@ msgstr ""
 "                        full-iso, long-iso, iso, +FORMAT\n"
 "                        FORMAT diinterpretasikan seperti `date'\n"
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
 "  -x, --one-file-system    skip directories on different file systems\n"
 msgstr ""
 
-#: src/du.c:386
+#: src/du.c:398
 #, fuzzy
 msgid "Infinity"
 msgstr "Tak terhingga B"
 
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr ""
-
-#: src/du.c:624
+#: src/du.c:636
 #, fuzzy, c-format
 msgid "fts_read failed: %s"
 msgstr "fts_read gagal"
 
-#: src/du.c:780
+#: src/du.c:787
 #, c-format
 msgid "invalid maximum depth %s"
 msgstr "kedalaman maksimal %s tidak valid"
 
-#: src/du.c:809
+#: src/du.c:816
 #, fuzzy, c-format
 msgid "invalid --threshold argument '-0'"
 msgstr "argumen --%s tidak valid %s"
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr "tidak dapat meringkas dan menampilkan seluruh masukan bersamaan"
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr "peringatan: meringkas adalah sama dengan menggunakan --max-depth=0"
 
-#: src/du.c:900
+#: src/du.c:911
 #, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr "peringatan: meringkas konflik dengan --max-depth=%lu"
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 msgid "file operands cannot be combined with --files0-from"
 msgstr "berkas operand tidak dapat dikombinasikan dengan --files0-from."
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr "%s: error membaca"
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr ""
 "ketika membaca nama berkas dari stdin, tidak ada nama berkas dari %s "
 "dibolehkan"
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 msgid "invalid zero-length file name"
 msgstr "nama berkas panjang-nol tidak valid"
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr "total"
 
@@ -4118,7 +4194,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
 "Set setiap NAMA ke NILAI dalam lingkungan dan jalankan PERINTAH.\n"
@@ -4203,16 +4279,16 @@ msgid "input line is too long"
 msgstr "baris masukan terlalu panjang"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr "Mike Parker"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr "James Youngman"
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
@@ -4221,7 +4297,7 @@ msgstr ""
 "Penggunaan: %s EKSPRESI\n"
 "  atau:     %s PILIHAN\n"
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -4239,7 +4315,7 @@ msgstr ""
 "\n"
 "  ARG1 & ARG2      ARG1 jika bukan argumen adalah nol atau 0, jika tidak 0\n"
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -4257,7 +4333,7 @@ msgstr ""
 "  ARG1 >= ARG2      ARG1 lebih besar atau sama dengan ARG2\n"
 "  ARG1 > ARG2       ARG1 lebih besar dari ARG2\n"
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
@@ -4267,7 +4343,7 @@ msgstr ""
 "  ARG1 + ARG2       penjumlahan aritmetik dari ARG1 dan ARG2\n"
 "  ARG1 - ARG2       perbedaan aritmetik dari ARG1 dan ARG2\n"
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -4280,7 +4356,7 @@ msgstr ""
 "  ARG1 / ARG2       pembagian aritmetik dari ARG1 dibagi oleh ARG2\n"
 "  ARG1 % ARG2       arithmetic remainder dari ARG1 dibagi oleh ARG2\n"
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -4299,7 +4375,7 @@ msgstr ""
 "ditemukan, atau 0\n"
 "  length STRING              panjang dari STRING\n"
 
-#: src/expr.c:251
+#: src/expr.c:250
 #, fuzzy
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
@@ -4314,7 +4390,7 @@ msgstr ""
 "\n"
 "  ( EXPRESSION )             nilai dari EKSPRESI\n"
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -4331,7 +4407,7 @@ msgstr ""
 "\\( dan \\) tidak digunakan, mereka mengembalikan jumlah karakter yang cocok "
 "atau 0.\n"
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -4344,32 +4420,32 @@ msgstr ""
 "atau 0, 2 jika EKSPRESI adalah secara sintaks tidak valid, dan 3 jika sebuah "
 "error ditemui.\n"
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, c-format
 msgid "syntax error"
 msgstr "sintaks error"
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, c-format
 msgid "error in regular expression matcher"
 msgstr "error dalam pencocokan ekspresi regular"
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, fuzzy, c-format
 msgid "non-integer argument"
 msgstr "argumen tidak numeric"
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr "pembagian dengan nol"
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr "set LC_ALL='C' untuk memperbaiki masalah"
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, c-format
 msgid "the strings compared were %s and %s"
 msgstr "string yang dibandingkan adalah %s dan %s"
@@ -4379,27 +4455,27 @@ msgstr "string yang dibandingkan adalah %s dan %s"
 msgid "Niels Moller"
 msgstr ""
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
 msgstr ""
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
 msgstr ""
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, c-format
 msgid "%s is not a valid positive integer"
 msgstr "%s bukan sebuah valid positif integer"
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr "%s terlalu besar"
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
@@ -4408,7 +4484,7 @@ msgstr ""
 "Penggunaan: %s [NOMOR]...\n"
 "  atau:     %s PILIHAN\n"
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
 "are specified on the command line, read them from standard input.\n"
@@ -4523,17 +4599,17 @@ msgid "invalid number of columns: %s"
 msgstr "jumlah dari kolom tidak valid: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr "Padraig Brady"
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, c-format
 msgid "Usage: %s\n"
 msgstr "Penggunaan: %s\n"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
@@ -4542,12 +4618,12 @@ msgstr ""
 "untuk shell scripts.\n"
 "\n"
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, c-format
 msgid "failed to get groups for user %s"
 msgstr "gagal memperoleh grup untuk user %s"
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, c-format
 msgid "failed to get groups for the current process"
 msgstr "gagal memperoleh grup untuk proses sekarang"
@@ -4572,22 +4648,22 @@ msgstr ""
 "NAMA pengguna yang dispesifikasikan,\n"
 "proses sekarang (yang berbeda jika database grup telah berubah).\n"
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, fuzzy, c-format
 msgid "cannot get real UID"
 msgstr "tidak dapat menset id pengguna"
 
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, fuzzy, c-format
 msgid "cannot get effective GID"
 msgstr "tidak dapat dereferensi %s"
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, fuzzy, c-format
 msgid "cannot get real GID"
 msgstr "tidak dapat menset id pengguna"
 
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, fuzzy, c-format
 msgid "%s: no such user"
 msgstr "%s: Tidak ada pengguna seperti itu"
@@ -4645,58 +4721,48 @@ msgstr ""
 "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
 "GB 1000*1000*1000, G 1024*1024*1024, dan seterusnya untuk T, P, E, Z, Y.\n"
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr "%s: berkas telah mengecil terlalu banyak"
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, c-format
 msgid "%s: number of bytes is too large"
 msgstr "%s: jumlah dari byte terlalu besar"
 
-#: src/head.c:440
-#, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr "%s: tidak dapat lseek ke posisi original"
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr "%s: tidak dapat mencari ofset %s"
 
-#: src/head.c:673
-#, fuzzy, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "%s: gagal untuk menghapus"
-
-#: src/head.c:798
+#: src/head.c:423 src/tail.c:457
 #, c-format
-msgid "cannot reposition file pointer for %s"
-msgstr "tidak dapat mereposisi berkas penunjuk untuk %s"
+msgid "%s: cannot seek to relative offset %s"
+msgstr "%s: tidak dapat mencari ofset relatif %s"
 
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr "%s: %s terlalu besar yang ini tidak direpresentasikan"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr "jumlah dari baris"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr "jumlah dari byte"
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr "jumlah dari baris tidak valid"
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr "jumlah dari byte tidak valid"
 
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, c-format
 msgid "invalid trailing option -- %c"
 msgstr "akhiran pilihan tidak valid -- %c"
@@ -4742,27 +4808,34 @@ msgid "cannot determine hostname"
 msgstr "tidak dapat menentukan nama host"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr "Arnold Robbins"
 
-#: src/id.c:81
-#, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
-msgstr "Penggunaan: %s [PILIHAN]... [NAMA PENGGUNA]\n"
+#: src/id.c:84
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]... [USER]\n"
+msgstr "Penggunaan: %s [PILIHAN]... [PENGGUNA]...\n"
 
-#: src/id.c:82
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
+msgstr ""
+
+#: src/id.c:90
+#, fuzzy
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
 msgstr ""
 "Tampilkan informasi pengguna dan grup untuk NAMA PENGGUNA yang "
 "dispesifikasikan.\n"
@@ -4776,7 +4849,7 @@ msgstr ""
 "  -r, --real      tampilkan real ID daripada efektif ID, dengan -ugG\n"
 "  -u, --user      tampilkan hanya efektif ID pengguna\n"
 
-#: src/id.c:96
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
@@ -4784,117 +4857,127 @@ msgstr ""
 "\n"
 "Tanpa PILIHAN apapun, menampilkan beberapa informasi identifikasi berguna.\n"
 
-#: src/id.c:140
+#: src/id.c:151
+#, fuzzy, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr "--context (-Z) hanya bekerja di kernel dengan SELinux-aktif"
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr "--context (-Z) hanya bekerja di kernel dengan SELinux-aktif"
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr ""
 "tidak dapat menampilkan konteks keamanan ketika pengguna dispesifikasikan"
 
-#: src/id.c:178
+#: src/id.c:198
 #, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr "tidak dapat menampilkan \"only\" lebih dari satu pilihan"
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr "tidak dapat menampilkan hanya nama atau ril ID dalam format default"
 
-#: src/id.c:199
+#: src/id.c:209
+#, fuzzy, c-format
+msgid "option --zero not permitted in default format"
+msgstr "tidak dapat menampilkan hanya nama atau ril ID dalam format default"
+
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
 msgstr "tidak dapat memperoleh konteks proses"
 
-#: src/id.c:224
+#: src/id.c:265
 #, fuzzy, c-format
 msgid "cannot get effective UID"
 msgstr "tidak dapat dereferensi %s"
 
-#: src/id.c:311
+#: src/id.c:354
 #, fuzzy, c-format
 msgid "cannot find name for user ID %s"
 msgstr "tidak dapat menemukan nama untuk pengguna ID %lu"
 
-#: src/id.c:329
+#: src/id.c:372
 #, fuzzy, c-format
 msgid "uid=%s"
 msgstr "uid=%lu"
 
-#: src/id.c:334
+#: src/id.c:377
 #, fuzzy, c-format
 msgid " gid=%s"
 msgstr " gid=%lu"
 
-#: src/id.c:341
+#: src/id.c:384
 #, fuzzy, c-format
 msgid " euid=%s"
 msgstr " euid=%lu"
 
-#: src/id.c:349
+#: src/id.c:392
 #, fuzzy, c-format
 msgid " egid=%s"
 msgstr " egid=%lu"
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr " groups="
 
-#: src/id.c:393
+#: src/id.c:437
 #, c-format
 msgid " context=%s"
 msgstr " konteks=%s"
 
-#: src/install.c:373
+#: src/install.c:376
 #, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr "peringatan: %s: gagal untuk mengubah konteks ke %s"
 
-#: src/install.c:414
+#: src/install.c:417
 #, c-format
 msgid "creating directory %s"
 msgstr "membuat direktori %s"
 
-#: src/install.c:482
+#: src/install.c:485
 #, c-format
 msgid "cannot change ownership of %s"
 msgstr "tidak dapat mengubah kepemilikan dari %s"
 
-#: src/install.c:506
+#: src/install.c:509
 #, c-format
 msgid "cannot set time stamps for %s"
 msgstr "tidak dapat menset time stamps untuk %s"
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, c-format
 msgid "fork system call failed"
 msgstr "fork system call gagal"
 
-#: src/install.c:531
+#: src/install.c:535
 #, c-format
 msgid "cannot run %s"
 msgstr "tidak dapat menjalankan %s"
 
-#: src/install.c:535
+#: src/install.c:539
 #, c-format
 msgid "waiting for strip"
 msgstr "menunggu untuk strip"
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr "strip proses berakhir abnormal"
 
-#: src/install.c:558
+#: src/install.c:565
 #, c-format
 msgid "invalid user %s"
 msgstr "pengguna tidak valid %s"
 
-#: src/install.c:594
+#: src/install.c:601
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -4907,7 +4990,7 @@ msgstr ""
 "  atau:     %s [PILIHAN]... -t DIREKTORI ASAL...\n"
 "  atau:     %s [PILIHAN]... -d DIREKTORI...\n"
 
-#: src/install.c:601
+#: src/install.c:608
 #, fuzzy
 msgid ""
 "\n"
@@ -4932,7 +5015,7 @@ msgstr ""
 "Dalam bentuk ke 4, buat seluruh komponen dari DIREKTORI yang diberikan.\n"
 "\n"
 
-#: src/install.c:615
+#: src/install.c:622
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
 "  -b                  like --backup but does not accept an argument\n"
@@ -4955,7 +5038,7 @@ msgstr ""
 "buat seluruh\n"
 "                      komponen dari direktori yang dispesifikasikan\n"
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -4973,7 +5056,7 @@ msgstr ""
 "  -m, --mode=MODE     set mode ijin (seperti dalam chmod), daripa rwxr-xr-x\n"
 "  -o, --owner=OWNER   set kepemilikan (pengguna-super saja)\n"
 
-#: src/install.c:631
+#: src/install.c:638
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
 "files\n"
@@ -4998,67 +5081,61 @@ msgstr ""
 "  -v, --verbose       menampilkan nama dari setiap direktori seperti telah "
 "dibuat\n"
 
-#: src/install.c:641
+#: src/install.c:648
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
-"      --preserve-context  jaga SELinux konteks keamanan\n"
-"  -Z, --context=CONTEXT   set SELinux konteks keamanan dari berkas dan "
-"direktori\n"
 
-#: src/install.c:859
+#: src/install.c:696 src/unlink.c:86
+#, c-format
+msgid "cannot unlink %s"
+msgstr "tidak dapat unlink %s"
+
+#: src/install.c:877
 #, c-format
 msgid ""
 "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
 msgstr ""
 "PERINGATAN: mengabaikan --preserve-context; kernel ini bukan SELinux-aktif."
 
-#: src/install.c:869
-#, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
-msgstr "PERINGATAN: mengabaikan --context (-Z); kernel ini bukan SELinux-aktif"
-
-#: src/install.c:886
+#: src/install.c:917
 #, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr "pilihan strip tidak boleh digunakan ketika memasang sebuah direktori"
 
-#: src/install.c:889
+#: src/install.c:920
 #, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr "direktori tujuan tidak memperbolehkan ketika memasang sebuah direktori"
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr "tidak dapat memaksa konteks tujuan ke %s dan menjaganya"
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, c-format
 msgid "invalid mode %s"
 msgstr "mode tidak valid %s"
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr ""
 "PERINGATAN: mengabaikan pilihan --strip-program karena pilihan -s tidak "
 "dispesifikasikan"
 
-#: src/install.c:959
+#: src/install.c:1001
 #, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr ""
 "pilihan --compare (C) dan --preserve-timestamps adalah mutually exclusive"
 
-#: src/install.c:966
+#: src/install.c:1008
 #, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr "pilihan --compare (C) dan --strip adalah mutually exclusive"
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -5072,7 +5149,7 @@ msgstr ""
 msgid "Mike Haertel"
 msgstr "Mike Haertel"
 
-#: src/join.c:191
+#: src/join.c:195
 #, fuzzy
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
@@ -5094,7 +5171,7 @@ msgstr ""
 "                    FILENUM adalah 1 atau 2, sesuai dengan FILE1 atau FILE2\n"
 "  -e EMPTY          menggantikan field masukan yang hilang dengan EMPTY\n"
 
-#: src/join.c:200
+#: src/join.c:204
 #, fuzzy
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
@@ -5107,7 +5184,7 @@ msgstr ""
 "  -o FORMAT         patuhi FORMAT ketika membuat baris keluaran\n"
 "  -t CHAR           gunakan CHAR sebagai pemisah field masukan dan keluaran\n"
 
-#: src/join.c:206
+#: src/join.c:210
 #, fuzzy
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
@@ -5128,7 +5205,13 @@ msgstr ""
 "                    jika seluruh masukan baris dapat dipasangkan\n"
 "  --nocheck-order   jangan periksa masukan adalah diurutkan secara benar\n"
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+#, fuzzy
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr ""
+"  -z, --zero-terminated     akhir baris dengan 0 byte, bukan baris baru\n"
+
+#: src/join.c:225
 #, fuzzy
 msgid ""
 "\n"
@@ -5167,47 +5250,47 @@ msgstr ""
 "sebuah\n"
 "pesan peringatan akan diberikan.\n"
 
-#: src/join.c:403
+#: src/join.c:410
 #, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
 msgstr ""
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, c-format
 msgid "invalid field number: %s"
 msgstr "nomor field tidak valid: %s"
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, c-format
 msgid "invalid field specifier: %s"
 msgstr "spesifikasi field tidak valid: %s"
 
-#: src/join.c:877
+#: src/join.c:884
 #, c-format
 msgid "invalid file number in field spec: %s"
 msgstr "nomor berkas tidak valid dalam field spec: %s"
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr "join field tidak kompatible %lu, %lu"
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr "konflik penggantian string empty-field"
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, c-format
 msgid "multi-character tab %s"
 msgstr "multi-character tab %s"
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr "incompatible tabs"
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr "kedua berkas tidak dapat berupa standar masukan"
@@ -5331,47 +5414,47 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr "tidak dapat membuat link %s ke %s"
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr "%s: link keras tidak diijinkan untuk direktori"
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, c-format
 msgid "%s: cannot overwrite directory"
 msgstr "%s: tidak dapat overwrite direktori"
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
 msgstr "%s: menimpa %s? "
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, fuzzy, c-format
 msgid "failed to create symbolic link %s"
 msgstr "tidak dapat membuat link simbolik %s"
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, fuzzy, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr "tidak dapat membuat link simbolik %s ke %s"
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, fuzzy, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr "membuat link keras ke %.0s%s"
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, fuzzy, c-format
 msgid "failed to create hard link %s"
 msgstr "tidak dapat membuah link keras %s ke %s"
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, fuzzy, c-format
 msgid "failed to create hard link %s => %s"
 msgstr "tidak dapat membuah link keras %s ke %s"
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -5384,7 +5467,7 @@ msgstr ""
 "  atau:     %s [PILIHAN]... TARGET... DIREKTORI   (bentuk ketiga)\n"
 "  atau:     %s [PILIHAN]... -t DIREKTORI TARGET...(bentuk keempat)\n"
 
-#: src/ln.c:381
+#: src/ln.c:398
 #, fuzzy
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
@@ -5404,7 +5487,7 @@ msgstr ""
 "Ketika membuat link keras, setiap TARGET harus ada. Link simbolik\n"
 "diinterpretasikan dalam hubungan dengan direktori atasnya.\n"
 
-#: src/ln.c:394
+#: src/ln.c:411
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
 "file\n"
@@ -5427,7 +5510,7 @@ msgstr ""
 "                              pembatasan sistem, bahkan untuk superuser)\n"
 "  -f, --force                 hapus berkas tujuan yang sudah ada\n"
 
-#: src/ln.c:402
+#: src/ln.c:419
 #, fuzzy
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
@@ -5450,7 +5533,7 @@ msgstr ""
 "sambungan simbolik\n"
 "  -s, --symbolic              buat link simbolik daripada link keras\n"
 
-#: src/ln.c:411
+#: src/ln.c:428
 #, fuzzy
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
@@ -5469,7 +5552,7 @@ msgstr ""
 "  -v, --verbose               menampilkan nama dari setiap berkas yang "
 "terhubung\n"
 
-#: src/ln.c:433
+#: src/ln.c:450
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -5480,13 +5563,13 @@ msgstr ""
 "dispesifikasikan mengontrol\n"
 "perilaku ketika sumber adalah sebuah link simbolik, baku ke %s.\n"
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr ""
 "tidak dapat mengkombinasikan --target-directory dan --no-target-directory"
 
-#: src/ln.c:588
+#: src/ln.c:605
 #, fuzzy, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr "tidak dapat membuat link simbolik %s"
@@ -5519,7 +5602,7 @@ msgstr "bukan nama login"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 msgid "%b %e  %Y"
 msgstr "%b %e %Y"
 
@@ -5528,97 +5611,97 @@ msgstr "%b %e %Y"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 msgid "%b %e %H:%M"
 msgstr "%b %e %H:%M"
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr ""
 "mengabaikan nilai tidak valid dari variabel lingkungan QUOTING_STYLE: %s"
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr "mengabaikan lebar tidak valid dalam variabel lingkungan KOLOM: %s"
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr ""
 "mengabaikan ukuran tab tidak valid dalam variabel lingkungan UKURAN TAB: %s"
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, c-format
 msgid "invalid line width: %s"
 msgstr "lebar baris tidak valid: %s"
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, c-format
 msgid "invalid tab size: %s"
 msgstr "ukuran tab tidak valid: %s"
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, c-format
 msgid "invalid time style format %s"
 msgstr "format gaya waktu tidak valid: %s"
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 #, fuzzy
 msgid "Valid arguments are:\n"
 msgstr "Argumen yang valid adalah:"
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr ""
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr "error menginisialisasi string bulan"
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, c-format
 msgid "unrecognized prefix: %s"
 msgstr "prefix tidak dikenal: %s"
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr "nilai tidak dapat diparse untuk variabel lingkungan LS_COLORS"
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, c-format
 msgid "cannot open directory %s"
 msgstr "tidak dapat membuka direktori %s"
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, c-format
 msgid "cannot determine device and inode of %s"
 msgstr "tidak dapat menentukan perangkat dan inode dari %s"
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, c-format
 msgid "%s: not listing already-listed directory"
 msgstr "%s: tidak mendaftar direktori yang sudah terdaftar"
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, c-format
 msgid "reading directory %s"
 msgstr "membaca direktori %s"
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, c-format
 msgid "closing directory %s"
 msgstr "menutup direktori %s"
 
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, c-format
 msgid "cannot compare file names %s and %s"
 msgstr "tidak dapat membandingkan nama berkas %s dan %s"
 
-#: src/ls.c:4721
+#: src/ls.c:4781
 #, fuzzy
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
@@ -5628,7 +5711,7 @@ msgstr ""
 "Urutkan masukan secara alphabet jika tidak ada dari -cftuvSUX atau --sort.\n"
 "\n"
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 #, fuzzy
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
@@ -5644,18 +5727,18 @@ msgstr ""
 "  -b, --escape               menampilkan oktal escape untuk karakter bukan "
 "bergambar\n"
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 #, fuzzy
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
 "      --block-size=BESAR     gunakan BESAR-byte blok. Lihat format BESAR "
@@ -5669,16 +5752,15 @@ msgstr ""
 "nama\n"
 "                             jika tidak; urutkan dengan ctime\n"
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 #, fuzzy
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 "  -C                         mendaftar masukan dengan kolom\n"
@@ -5691,7 +5773,7 @@ msgstr ""
 "  -D, --dired                menghasilkan keluarkan didesign untuk Emacs' "
 "dired mode\n"
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 #, fuzzy
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
@@ -5712,16 +5794,18 @@ msgstr ""
 "                             satu-kolom -1, verbose -l, vertikal -C\n"
 "      --full-time            seperti -l --time-style=full-iso\n"
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr ""
 "  -g                         seperti -l, tetapi jangan mendaftar pemilik\n"
 
-#: src/ls.c:4763
+#: src/ls.c:4823
+#, fuzzy
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 "      --group-directories-first\n"
@@ -5731,10 +5815,11 @@ msgstr ""
 "                               penggunaan apapun dari --sort=none (-U) "
 "menonaktifkan grup\n"
 
-#: src/ls.c:4769
+#: src/ls.c:4829
+#, fuzzy
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
@@ -5746,14 +5831,15 @@ msgstr ""
 "      --si                   sama seperti diatas, tetapi menggunakan "
 "kelipatan 1000 bukan 1024\n"
 
-#: src/ls.c:4775
+#: src/ls.c:4835
+#, fuzzy
 msgid ""
 "  -H, --dereference-command-line\n"
 "                             follow symbolic links listed on the command "
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
@@ -5768,7 +5854,7 @@ msgstr ""
 "POLA\n"
 "                             (overriden dengan -a atau -A)\n"
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 #, fuzzy
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
@@ -5778,7 +5864,7 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 "      --indicator-style=WORD menambahkan indikator dengan style WORD ke nama "
 "masukan:\n"
@@ -5789,7 +5875,7 @@ msgstr ""
 "POLA\n"
 "  -k                         seperti --block-size=1K\n"
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -5807,7 +5893,7 @@ msgstr ""
 "  -m                          isi lebar dengan sebuah masukan yang "
 "dipisahkan dengan koma\n"
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -5827,12 +5913,12 @@ msgstr ""
 "  -p, --indicator-style=slash\n"
 "                             menambahkan / indikator ke direktori\n"
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 #, fuzzy
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -5848,7 +5934,7 @@ msgstr ""
 "      --quoting-style-chars  gunakan quoting style KATA untuk masukan nama:\n"
 "                             literal, local, shell, shell-always, c, escape\n"
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
 "  -R, --recursive            list subdirectories recursively\n"
@@ -5860,16 +5946,19 @@ msgstr ""
 "  -s, --size                 tampilkan ukuran dari setiap berkas yang "
 "dialokasikan, dalam blok\n"
 
-#: src/ls.c:4825
+#: src/ls.c:4886
+#, fuzzy
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 "  -S                         mengurutkan dengan ukuran berkas\n"
 "      --sort=WORD            urutkan dengan WORD daripada dari nama: none -"
@@ -5882,17 +5971,19 @@ msgstr ""
 "sebagai kunci pengurut\n"
 "                             jika --sort=time\n"
 
-#: src/ls.c:4835
+#: src/ls.c:4896
 #, fuzzy
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
 msgstr ""
 "      --time-style           dengan -l, menampilkan waktu menggunakan gaya "
 "STYLE:\n"
@@ -5905,7 +5996,7 @@ msgstr ""
 "                             jika STYLE di awali dengan `posix-', STYLE\n"
 "                             berpengaruh hanya diluar POSIX locale\n"
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 #, fuzzy
 msgid ""
 "  -t                         sort by modification time, newest first\n"
@@ -5915,10 +6006,11 @@ msgstr ""
 "  -T, --tabsize=COLS         asumsikan tab stops ada  di setiap COLS "
 "daripada 8\n"
 
-#: src/ls.c:4848
+#: src/ls.c:4912
+#, fuzzy
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
@@ -5932,13 +6024,13 @@ msgstr ""
 "direktori\n"
 "  -v                         urutkan sesuai dengan versi\n"
 
-#: src/ls.c:4855
+#: src/ls.c:4919
+#, fuzzy
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 "  -w, -width=COLS            asumsikan lebar layar daripada nilai sekarang\n"
@@ -5950,7 +6042,7 @@ msgstr ""
 "untuk setiap berkas\n"
 "  -1                         tampilkan sat berkas per baris\n"
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -5967,7 +6059,7 @@ msgstr ""
 "dapat mengubah konfigurasi ini. Gunakan perintah dircolors untuk "
 "mengubahnya.\n"
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -6052,9 +6144,11 @@ msgstr "  -t, --text              baca dalam mode text (default)\n"
 #, fuzzy
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
@@ -6068,12 +6162,7 @@ msgstr ""
 "dengan baris checksum\n"
 "\n"
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -6090,42 +6179,42 @@ msgstr ""
 "untuk binary, ` ' untuk \n"
 "text), dan nama untuk setiap BERKAS.\n"
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, c-format
 msgid "%s: too many checksum lines"
 msgstr "%s: terlalu banyak baris checksum"
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr "%s: %<PRIuMAX>: baris checksum %s terformat secara tidak benar"
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr "%s: GAGAL membuka atau membaca\n"
 
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr "GAGAL"
 
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr "OK"
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr "%s: tidak ada baris checksum %s yang di format secara benar ditemukan"
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, fuzzy, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
 msgstr[0] "%s: %<PRIuMAX>: baris checksum %s terformat secara tidak benar"
 msgstr[1] "%s: %<PRIuMAX>: baris checksum %s terformat secara tidak benar"
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, fuzzy, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
@@ -6134,7 +6223,7 @@ msgstr[0] ""
 msgstr[1] ""
 "PERINGATAN: %<PRIuMAX> dari %<PRIuMAX> daftar berkas tidak dapat dibaca"
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, fuzzy, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
@@ -6143,62 +6232,61 @@ msgstr[0] ""
 msgstr[1] ""
 "PERINGATAN: %<PRIuMAX> dari %<PRIuMAX> checksum yang terhitung TIDAK cocok"
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
 msgstr ""
 
-#: src/md5sum.c:766
+#: src/md5sum.c:770
 #, fuzzy, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr "pilihan --status hanya berguna ketika memverifikasikan checksum"
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
 msgstr ""
 "Pilihan --binary dan --text tidak berarti ketika memverifikasikan checksum"
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr "pilihan --status hanya berguna ketika memverifikasikan checksum"
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr "pilihan --warn hanya berguna ketika memverifikasikan checksum"
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr "pilihan --quiet hanya berguna ketika memverifikasikan checksum"
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, fuzzy, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr "pilihan --status hanya berguna ketika memverifikasikan checksum"
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr "Penggunaan: %s [PILIHAN]... DIREKTORI...\n"
 
-#: src/mkdir.c:57
+#: src/mkdir.c:59
 #, fuzzy
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
 msgstr ""
 "Membuat DIREKTORI, jika mereka tidak sudah ada.\n"
 "\n"
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
+#, fuzzy
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 "  -m, --mode=MODE  set mode berkas (seperti dalam chmod), bukan a=rwx - "
 "umask\n"
@@ -6209,61 +6297,88 @@ msgstr ""
 "  -Z, --context=CTX set konteks keamanan SELinux dari setiap direktori\n"
 "                   yang dibuat ke CTX\n"
 
-#: src/mkdir.c:168
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/mkdir.c:127 src/mkdir.c:172
+#, fuzzy, c-format
+msgid "failed to set default creation context for %s"
+msgstr "gagal untuk menset default berkas pembuatan konteks ke %s"
+
+#: src/mkdir.c:191
+#, fuzzy, c-format
+msgid "failed to restore context for %s"
+msgstr "gagal untuk menjaga waktu untuk %s"
+
+#: src/mkdir.c:231
 #, c-format
 msgid "created directory %s"
 msgstr "direktori %s dibuat"
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, fuzzy, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr "PERINGATAN: mengabaikan --context (-Z); kernel ini bukan SELinux-aktif"
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr "Penggunaan: %s [PILIHAN]... NAMA...\n"
 
-#: src/mkfifo.c:52
+#: src/mkfifo.c:54
 #, fuzzy
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
 msgstr ""
 "Buat pipe bernama (FIFO) dengan NAMA yang diberikan.\n"
 "\n"
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
 msgstr "  -m, --mode=MODE   set ijin berkas bits ke MODE, bukan a=rw - umask\n"
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
-"  -Z, --context=CTX  set konteks keamanan SELinux dari setiap NAMA ke CTX\n"
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, c-format
 msgid "invalid mode"
 msgstr "mode tidak valid"
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr "mode seharusnya menspesifikasikan hanya berkas ijin bits"
 
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
+#, fuzzy, c-format
+msgid "cannot set permissions of %s"
+msgstr "tidak dapat merubah ijin dari %s"
+
+#: src/mknod.c:54
 #, c-format
 msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr "Penggunaan: %s [PILIHAN]... NAMA TIPE [MAJOR MINOR]\n"
 
-#: src/mknod.c:54
+#: src/mknod.c:56
 #, fuzzy
 msgid "Create the special file NAME of the given TYPE.\n"
 msgstr ""
 "Buat sebuah berkas spesial NAMA dengan TIPE yang diberikan.\n"
 "\n"
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr "  -Z, --context=CTX  set konteks keamanan SELinux dari NAMA ke CTX\n"
-
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -6280,7 +6395,7 @@ msgstr ""
 "dengan 0, seperti oktal;\n"
 "jika tidak, sebagai desimal. TIPE mungkin juga:\n"
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 msgid ""
 "\n"
 "  b      create a block (buffered) special file\n"
@@ -6292,55 +6407,55 @@ msgstr ""
 "  c, u   buat sebuah berkas spesial karakter (unbuffered)\n"
 "  p      membuat sebuah FIFO\n"
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 msgid "Special files require major and minor device numbers."
 msgstr "Berkas spesial membutuhkan nomor perangkat major dan minor."
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 msgid "Fifos do not have major and minor device numbers."
 msgstr "FIFO tidak memiliki nomor perangkat major dan minor."
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, c-format
 msgid "block special files not supported"
 msgstr "blok berkas spesial tidak didukung"
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, c-format
 msgid "character special files not supported"
 msgstr "karakter berkas spesial tidak didukung"
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, c-format
 msgid "invalid major device number %s"
 msgstr "nomor perangkat major tidak valid %s"
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, c-format
 msgid "invalid minor device number %s"
 msgstr "nomor perangkat minor tidak valid %s"
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, c-format
 msgid "invalid device %s %s"
 msgstr "perangkat %s %s tidak valid"
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, c-format
 msgid "invalid device type %s"
 msgstr "tipe perangkat %s tidak valid"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr "Eric Blake"
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr "Penggunaan: %s [PILIHAN]... [TEMPLATE]\n"
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 #, fuzzy
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
@@ -6352,12 +6467,12 @@ msgstr ""
 "TEMPLATE harus berisi paling tidak 3 'X' berurutan dalam komponen terakhir.\n"
 "Jika TEMPLATE tidak dispesifikasikan, gunakan tmp.XXXXXXXXXXX.\n"
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
@@ -6369,25 +6484,26 @@ msgstr ""
 "  -q, --quiet         tekan diagnosa mengenai kegagalan pembuatan berkas/"
 "direktori\n"
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
+#, fuzzy
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
 "      --suffix=AKHIR  tambahkan AKHIRAN ke TEMPLATE. AKHIRAN tidak boleh "
 "berisi slash.\n"
 "                         Pilihan ini mengindikasikan jika TEMPLATE tidak "
 "berakhir dalam X.\n"
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
 #, fuzzy
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
 "      --tmpdir[=DIR]  interpretasikan TEMPLATE relatif ke DIREKTORI. Jika "
@@ -6401,9 +6517,9 @@ msgstr ""
 "                        disini, mktemp tetap hanya membuat komponen "
 "terakhir.\n"
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
+#, fuzzy
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
@@ -6417,59 +6533,54 @@ msgstr ""
 "                        direktori relatif melalui -p; selain itu /tmp "
 "[ditinggalkan]\n"
 
-#: src/mktemp.c:223
-#, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr "gagal untuk mengarahkan stderr ke /dev/null"
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, c-format
 msgid "too many templates"
 msgstr "terlalu banyak template"
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr "dengan --suffix, template %s harus berakhir dalam X"
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr "akhiran tidak valid %s, berisi pemisah direktori"
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr "terlalu sedikit X dalam template %s"
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr "template tidak valid, %s, berisi pemisah direktori"
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr "template tidak valid, %s; dengan --tmpdir, ini mungkin bukan absolut"
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, c-format
 msgid "failed to create directory via template %s"
 msgstr "gagal untuk membuat direktori melalui template %s"
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, c-format
 msgid "failed to create file via template %s"
 msgstr "gagal untuk membuat berkas melalui template %s"
 
-#: src/mv.c:292
+#: src/mv.c:294
 #, fuzzy
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 "Mengubah nama SUMBER menjadi TUJUAN, atau memindahkan SUMBER ke DIREKTORI.\n"
 "\n"
 
-#: src/mv.c:298
+#: src/mv.c:300
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
 "file\n"
@@ -6491,7 +6602,7 @@ msgstr ""
 "Jika anda menspesifikasikan lebih dari salah satu dari -i, -f, -n, hanya "
 "yang terakhir yang berpengaruh.\n"
 
-#: src/mv.c:307
+#: src/mv.c:309
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
@@ -6503,7 +6614,8 @@ msgstr ""
 "                                argumen\n"
 "  -S, --suffix=SUFFIX           memaksa akhiran backup biasa\n"
 
-#: src/mv.c:312
+#: src/mv.c:314
+#, fuzzy
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
 "DIRECTORY\n"
@@ -6512,6 +6624,8 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
 "  -t, --target-directory=DIREKTORI  pindahkan seluruh argumen SUMBER kedalam "
 "DIREKTORI\n"
@@ -6823,95 +6937,90 @@ msgid "%s: invalid number to ignore"
 msgstr "%s: nomor tidak valid diabaikan"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
 msgstr ""
 
-#: src/numfmt.c:676
+#: src/numfmt.c:659
 #, fuzzy, c-format
-msgid "value too large to be converted: '%s'"
+msgid "value too large to be converted: %s"
 msgstr "%s: nilai tidak secara lengkap diubah"
 
-#: src/numfmt.c:680
+#: src/numfmt.c:663
 #, fuzzy, c-format
-msgid "invalid number: '%s'"
+msgid "invalid number: %s"
 msgstr "nomor %s tidak valid"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
+msgid "rejecting suffix in input: %s (consider using --from)"
 msgstr ""
 
-#: src/numfmt.c:688
+#: src/numfmt.c:671
 #, fuzzy, c-format
-msgid "invalid suffix in input: '%s'"
+msgid "invalid suffix in input: %s"
 msgstr "akhiran dalam %s%s tidak valid argumen `%s'"
 
-#: src/numfmt.c:692
-#, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
-msgstr ""
+#: src/numfmt.c:675
+#, fuzzy, c-format
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
+msgstr "akhiran dalam %s%s tidak valid argumen `%s'"
 
-#: src/numfmt.c:723
+#: src/numfmt.c:722 src/numfmt.c:768
 #, fuzzy, c-format
 msgid "failed to prepare value '%Lf' for printing"
 msgstr "%s: gagal untuk membuka untuk menulis"
 
-#: src/numfmt.c:787
+#: src/numfmt.c:791
 #, fuzzy, c-format
-msgid "invalid unit size: '%s'"
+msgid "invalid unit size: %s"
 msgstr "ukuran tab tidak valid: %s"
 
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
-#, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr ""
-
-#: src/numfmt.c:813
+#: src/numfmt.c:814
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
 msgstr "Penggunaan: %s [PILIHAN]... [PENGGUNA]...\n"
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
 msgstr ""
 
-#: src/numfmt.c:820
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
 msgstr ""
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
 msgstr ""
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
 "                         see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr ""
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
@@ -6919,19 +7028,19 @@ msgid ""
 "locale)\n"
 msgstr ""
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
 msgstr ""
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
 msgstr ""
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -6941,30 +7050,30 @@ msgid ""
 "                         is found\n"
 msgstr ""
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
 "nearest\n"
 msgstr ""
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
 msgstr ""
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr ""
 
-#: src/numfmt.c:877
+#: src/numfmt.c:878
 #, fuzzy
 msgid ""
 "\n"
@@ -6973,11 +7082,11 @@ msgstr ""
 "Pilihan lain:\n"
 "\n"
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr ""
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -6986,7 +7095,7 @@ msgid ""
 "               1Mi = 1048576,\n"
 msgstr ""
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
@@ -6994,7 +7103,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
@@ -7002,7 +7111,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
@@ -7010,18 +7119,18 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:905
+#: src/numfmt.c:906
 #, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -7033,7 +7142,7 @@ msgid ""
 "errors are not diagnosed and the exit status is 0.\n"
 msgstr ""
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -7054,112 +7163,112 @@ msgid ""
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 msgstr ""
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, c-format
 msgid "format %s has no %% directive"
 msgstr "format %s tidak memiliki %% direktif"
 
-#: src/numfmt.c:990
+#: src/numfmt.c:1003
 #, fuzzy, c-format
 msgid "invalid format %s (width overflow)"
 msgstr "format lebar tidak valid"
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr ""
+
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr "format %s berakhir dalam %%"
 
-#: src/numfmt.c:1010
+#: src/numfmt.c:1030
 #, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
 msgstr ""
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr "format %s memiliki terlalu banyak %% direktif"
 
-#: src/numfmt.c:1070
+#: src/numfmt.c:1081
 #, fuzzy, c-format
-msgid "invalid suffix in input '%s': '%s'"
+msgid "invalid suffix in input %s: %s"
 msgstr "akhiran dalam %s%s tidak valid argumen `%s'"
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
 msgstr ""
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
 msgstr ""
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
+msgid "large input value %s: possible precision loss"
 msgstr ""
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
 
-#: src/numfmt.c:1388
+#: src/numfmt.c:1403
 #, fuzzy, c-format
-msgid "invalid padding value '%s'"
+msgid "invalid padding value %s"
 msgstr "jangkauan halaman %s tidak valid"
 
-#: src/numfmt.c:1401
+#: src/numfmt.c:1417
 #, fuzzy, c-format
-msgid "invalid field value '%s'"
+msgid "invalid field value %s"
 msgstr "nomor field tidak valid: %s"
 
-#: src/numfmt.c:1430
+#: src/numfmt.c:1447
 #, fuzzy, c-format
-msgid "invalid header value '%s'"
+msgid "invalid header value %s"
 msgstr "tanggal tidak valid %s"
 
-#: src/numfmt.c:1456
+#: src/numfmt.c:1473
 #, fuzzy, c-format
 msgid "--grouping cannot be combined with --format"
 msgstr "berkas operand tidak dapat dikombinasikan dengan --files0-from."
 
-#: src/numfmt.c:1458
-#, fuzzy, c-format
-msgid "--padding cannot be combined with --format"
-msgstr "berkas operand tidak dapat dikombinasikan dengan --files0-from."
-
-#: src/numfmt.c:1463
+#: src/numfmt.c:1478
 #, fuzzy, c-format
 msgid "no conversion option specified"
 msgstr "banyak pilihan -i dispesifikasikan"
 
-#: src/numfmt.c:1471
+#: src/numfmt.c:1486
 #, fuzzy, c-format
 msgid "grouping cannot be combined with --to"
 msgstr "berkas operand tidak dapat dikombinasikan dengan --files0-from."
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
 msgstr ""
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
 msgstr ""
 
-#: src/numfmt.c:1511
+#: src/numfmt.c:1526
 #, fuzzy, c-format
 msgid "error reading input"
 msgstr "error membaca %s"
 
-#: src/numfmt.c:1520
+#: src/numfmt.c:1535
 #, fuzzy, c-format
 msgid "failed to convert some of the input numbers"
 msgstr "gagal untuk me-'render' masukan baku yang tidak berguna"
 
-#: src/od.c:294
+#: src/od.c:320
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -7172,7 +7281,7 @@ msgstr ""
 "  atau:     %s --traditional [PILIHAN]... [BERKAS] [[+]OFFSET[.][b] [+]"
 "[LABEL][.][b]]\n"
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -7188,7 +7297,7 @@ msgstr ""
 "dengan tidak ada BERKAS, atau ketika BERKAS adalah -, baca standar masukan.\n"
 "\n"
 
-#: src/od.c:307
+#: src/od.c:333
 #, fuzzy
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
@@ -7209,26 +7318,28 @@ msgstr ""
 "hexadesimal;\n"
 "akhiran mungkin . untuk oktal dan b untuk kelipatan dari 512.\n"
 
-#: src/od.c:318
+#: src/od.c:344
 #, fuzzy
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
 "  -A, --address-radix=RADIX   tentukan bagaimana berkas ofset ditampilkan\n"
 "  -j, --skip-bytes=BYTES      lewati BYTES masukan awal byte\n"
 
-#: src/od.c:323
+#: src/od.c:350
 #, fuzzy
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
@@ -7241,7 +7352,7 @@ msgstr ""
 "  -w, --width[=BYTES]         keluarkan byte BYTES per baris keluaran\n"
 "      --traditional           menerima argumen dalam format tradisional\n"
 
-#: src/od.c:336
+#: src/od.c:363
 #, fuzzy
 msgid ""
 "\n"
@@ -7249,7 +7360,7 @@ msgid ""
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 "\n"
@@ -7260,7 +7371,7 @@ msgstr ""
 "  -c   sama seperti -t c, pilih ASCII karakter atau backslash escapes\n"
 "  -d   sama seperti -t u2, pilih unsigned desimal 2-byte units\n"
 
-#: src/od.c:345
+#: src/od.c:372
 msgid ""
 "  -f   same as -t fF, select floats\n"
 "  -i   same as -t dI, select decimal ints\n"
@@ -7276,14 +7387,14 @@ msgstr ""
 "  -s   sama seperti -t d2, pilih desimal 2-byte units\n"
 "  -x   sama seperti -t x2, pilih hexadesimal 2-byte units\n"
 
-#: src/od.c:353
+#: src/od.c:380
 #, fuzzy
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 "\n"
 "TIPE dibuat dari satu atau lebih dari spesifikasi berikut:\n"
@@ -7291,7 +7402,7 @@ msgstr ""
 "  a          karakter bernama, mengabaikan high-order bit\n"
 "  c          karakter ASCII atau backslash escape\n"
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -7305,7 +7416,7 @@ msgstr ""
 "  u[SIZE]    unsigned desimal, SIZE bytes per integer\n"
 "  x[SIZE]    hexadesimal, SIZE bytes per integer\n"
 
-#: src/od.c:367
+#: src/od.c:394
 #, fuzzy
 msgid ""
 "\n"
@@ -7321,14 +7432,14 @@ msgstr ""
 "D\n"
 "untuk sizeof (double) atau L untuk sizeof(long double).\n"
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
 "each output line.\n"
 msgstr ""
 
-#: src/od.c:379
+#: src/od.c:406
 #, fuzzy
 msgid ""
 "\n"
@@ -7346,12 +7457,12 @@ msgstr ""
 "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
 "GB 1000*1000*1000, G 1024*1024*1024, dan seterusnya untuk T, P, E, Z, Y.\n"
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, c-format
 msgid "invalid type string %s"
 msgstr "tipe string %s tidak valid"
 
-#: src/od.c:649
+#: src/od.c:690
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7360,7 +7471,7 @@ msgstr ""
 "tipe string %s tidak valid;\n"
 "Sistem ini tidak memberikan sebuah tipe %lu-byte integral"
 
-#: src/od.c:770
+#: src/od.c:811
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7369,38 +7480,38 @@ msgstr ""
 "Tipe string %s tidak valid;\n"
 "Sistem ini tidak memberikan sebuah %lu-byte tipe floating point"
 
-#: src/od.c:828
+#: src/od.c:869
 #, fuzzy, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr "karakter `%c' tidak valid dalam tipe string %s"
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr "tidak dapat melewatkan akhir dari kombinasi masukan"
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, fuzzy, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr ""
 "keluaran alamat radix `%c' tidak valid; ini harus berupa sebuah karakter "
 "dari [doxn]"
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr "tidak ada tipe yang bisa dispesikasikan ketika mendump strings"
 
-#: src/od.c:1810
+#: src/od.c:1863
 msgid "compatibility mode supports at most one file"
 msgstr "mode kompabilitas melayani di setiap berkas."
 
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr "Skip-bytes + read-bytes terlalu besar"
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr "peringatan: lebar tidak valid %lu; menggunakan %d"
@@ -7565,12 +7676,12 @@ msgstr "Ketika"
 msgid "Where"
 msgstr "Dimana"
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr "Penggunaan: %s [PILIHAN]... [PENGGUNA]...\n"
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -7588,7 +7699,7 @@ msgstr ""
 "  -p              mengabaikan berkas rencana pengguna dalam format panjang\n"
 "  -s              jangan memendekan format keluaran, ini adalah default\n"
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -7604,7 +7715,7 @@ msgstr ""
 "idle\n"
 "                  dalam format pendek\n"
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -7615,7 +7726,7 @@ msgstr ""
 "Sebuah aplikasi ringan `finger'; menampilkan informasi pengguna.\n"
 "Berkas utmp akan berada %s.\n"
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr ""
@@ -7845,11 +7956,13 @@ msgstr ""
 "dibuka\n"
 
 #: src/pr.c:2820
+#, fuzzy
 msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
@@ -7861,7 +7974,7 @@ msgstr ""
 "kolom\n"
 "                    pilihan (-COLUMN|-a -COLUMN|-m) kecuali -w diset\n"
 
-#: src/pr.c:2827
+#: src/pr.c:2828
 #, fuzzy
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
@@ -7878,7 +7991,7 @@ msgstr ""
 "pilihan kolom\n"
 "  -t, --omit-header  abaikan header halaman dan akhiran\n"
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 msgid ""
 "  -T, --omit-pagination\n"
 "                    omit page headers and trailers, eliminate any "
@@ -7902,7 +8015,7 @@ msgstr ""
 "                    keluaran multiple text-kolom saja, -s[char] matikan "
 "(72)\n"
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
 "                    set page width to PAGE_WIDTH (72) characters always,\n"
@@ -7916,7 +8029,7 @@ msgstr ""
 "interference\n"
 "                     dengan -S atau -s\n"
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 msgid ""
 "\n"
 "-t is implied if PAGE_LENGTH <= 10.  With no FILE, or when FILE is -, read\n"
@@ -7942,7 +8055,8 @@ msgstr ""
 "\n"
 
 #: src/printenv.c:69
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+#, fuzzy
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr ""
 "  -0, --null     akhiri setiap baris keluaran dengan 0 byte daripada baris "
 "baru\n"
@@ -8066,12 +8180,12 @@ msgstr "peringatan: mengabaikan kelebihan argumen, dimulai dengan %s"
 msgid "F. Pinard"
 msgstr "François Pinard"
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, c-format
 msgid "%s (for regexp %s)"
 msgstr "%s (untuk regexp %s)"
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
@@ -8080,7 +8194,7 @@ msgstr ""
 "Penggunaan: %s [PILIHAN]... [MASUKAN]... (tanpa -G)\n"
 "  atau:     %s -G [PILIHAN]... [INPUT [OUTPUT]]\n"
 
-#: src/ptx.c:1821
+#: src/ptx.c:1824
 #, fuzzy
 msgid ""
 "Output a permuted index, including context, of the words in the input "
@@ -8090,7 +8204,7 @@ msgstr ""
 "berkas masukan.\n"
 "\n"
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 #, fuzzy
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
@@ -8103,7 +8217,7 @@ msgstr ""
 "  -F, --flag-truncation=STRING   gunakan STRING untuk flagging pemotongan "
 "baris\n"
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 #, fuzzy
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
@@ -8121,7 +8235,7 @@ msgstr ""
 "kalimat\n"
 "  -T, --format=tex               menghasilkan keluaran seperti direktif Tex\n"
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -8142,7 +8256,7 @@ msgstr ""
 "  -o, --only-file=FILE           baca hanya daftar kata saja dari BERKAS "
 "ini\n"
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -8155,17 +8269,16 @@ msgstr ""
 "  -w, --width=NUMBER             lebar keluaran dalam kolom, referensi "
 "diabaikan\n"
 
-#: src/ptx.c:1854
+#: src/ptx.c:1857
 #, fuzzy
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
 "\n"
-"Dengan tanpa BERKAS atau jika BERKAS adalah -, baca Standar Masukan. `-F /' "
-"secara default.\n"
+"Tanpa BERKAS, atau ketika BERKAS adalah -, baca masukan standar.\n"
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, c-format
 msgid "invalid gap width: %s"
 msgstr "lebar gap tidak valid: %s"
@@ -8187,22 +8300,28 @@ msgstr ""
 "symlinks\n"
 "  -P, --physical  hindari semua symlinks\n"
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+
+#: src/pwd.c:169
 #, c-format
 msgid "failed to chdir to %s"
 msgstr "gagal untuk chdir ke %s"
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, c-format
 msgid "failed to stat %s"
 msgstr "gagal memperoleh statistik %s"
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr "tidak dapat menemukan masukan direktori di %s dengan -node yang cocok"
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, c-format
 msgid "ignoring non-option arguments"
 msgstr "mengabaikan argumen bukan pilihan"
@@ -8212,8 +8331,8 @@ msgstr "mengabaikan argumen bukan pilihan"
 msgid "Dmitry V. Levin"
 msgstr "Dmitry V. Levin"
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Penggunaan: %s [PILIHAN]... BERKAS...\n"
@@ -8260,8 +8379,7 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 "  -m, --canonicalize-missing    canonicalize dengan mengikuti setiap symlink "
 "dalam\n"
@@ -8295,7 +8413,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 
@@ -8313,41 +8431,42 @@ msgstr "%s: descend ke write-protected direktori %s? "
 msgid "%s: descend into directory %s? "
 msgstr "%s: berlanjut ke direktori %s? "
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr "%s: menghapus write-protected %s %s? "
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, c-format
 msgid "%s: remove %s %s? "
 msgstr "%s: menghapus %s %s? "
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, c-format
 msgid "removed directory: %s\n"
 msgstr "menghapus direktori: %s\n"
 
-#: src/remove.c:444
-#, c-format
-msgid "cannot remove directory: %s"
-msgstr "tidak dapat menghapus direktori: %s"
+#: src/remove.c:447
+#, fuzzy, c-format
+msgid "refusing to remove %s or %s directory: skipping %s"
+msgstr "tidak dapat menghapus %s direktori %s"
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr "melewatkan %s, karena ini ada di perangkat berbeda"
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, c-format
 msgid "traversal failed: %s"
 msgstr "traversal gagal: %s"
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -8376,15 +8495,16 @@ msgstr ""
 "  -i                    tanya setiap akan menghapus\n"
 
 #: src/rm.c:142
+#, fuzzy
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 "  -I                    tanya sekali sebelum menghapus lebih dari tiga "
 "berkas, atau\n"
@@ -8467,14 +8587,18 @@ msgstr ""
 "benar benar tidak dapat diselamatkan, pertimbangkan menggunakan shred.\n"
 
 #: src/rm.c:342
-#, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr "%s: hapus seluruh argumen rekursif? "
+#, fuzzy, c-format
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] "%s: hapus seluruh argumen rekursif? "
+msgstr[1] "%s: hapus seluruh argumen rekursif? "
 
-#: src/rm.c:343
-#, c-format
-msgid "%s: remove all arguments? "
-msgstr "%s: hapus seluruh argumen? "
+#: src/rm.c:345
+#, fuzzy, c-format
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] "%s: hapus seluruh argumen? "
+msgstr[1] "%s: hapus seluruh argumen? "
 
 #: src/rmdir.c:134 src/rmdir.c:233
 #, c-format
@@ -8532,7 +8656,7 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
 
@@ -8593,41 +8717,46 @@ msgstr "anda harus menspesifikasikan -c, -t, -u, -l, -r, atau konteks"
 msgid "no command specified"
 msgstr "tidak ada perintah yang dispesifikasikan"
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr "%s mungkin hanya bisa digunakan dalam kernel SELinux"
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, c-format
 msgid "failed to compute a new context"
 msgstr "gagal untuk menghitung konteks baru"
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, c-format
 msgid "failed to set new user %s"
 msgstr "gagal untuk menset pengguna baru %s"
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, c-format
 msgid "failed to set new type %s"
 msgstr "gagal untuk menset tipe baru %s"
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, c-format
 msgid "failed to set new range %s"
 msgstr "gagal untuk menset jangkauan baru %s"
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, c-format
 msgid "failed to set new role %s"
 msgstr "gagal untuk menset peran baru %s"
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, c-format
 msgid "unable to set security context %s"
 msgstr "gagal untuk menset konteks keamanan %s"
 
+#: src/selinux.c:127 src/selinux.c:300
+#, fuzzy, c-format
+msgid "error canonicalizing %s"
+msgstr "gagal untuk menutup %s"
+
 #: src/seq.c:68
 #, c-format
 msgid ""
@@ -8660,10 +8789,13 @@ msgstr ""
 "nol\n"
 
 #: src/seq.c:86
+#, fuzzy
 msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
@@ -8678,7 +8810,7 @@ msgstr ""
 "PENINGKATAN biasanya positif jika PERTAMA lebih kecil dari TERAKHIR, dan\n"
 "PENINGKATAN biasanya negatif jika PERTAMA lebih besar dari TERAKHIR.\n"
 
-#: src/seq.c:94
+#: src/seq.c:96
 #, fuzzy
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
@@ -8690,93 +8822,29 @@ msgstr ""
 "bilangan bulat desimal dengam maksimal presisi PREC, dan sampai %g jika "
 "tidak.\n"
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, c-format
 msgid "invalid floating point argument: %s"
 msgstr "argumen floating point tidak valid: %s"
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr "format %s memiliki %%%c direktif tidak diketahui"
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr ""
 "format string mungkin tidak dispesifikasikan ketika menampilkan string "
 "dengan lebar sama"
 
-#: src/setuidgid.c:49
-#, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-"Penggunaan: %s [PILIHAN-PENDEK]... PERINTAH PENGGUNA [ARGUMEN]...\n"
-"  atau:     %s PILIHAN-PANJANG\n"
-
-#: src/setuidgid.c:55
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-"Tinggalkan grup tambahan apapun, asumsikan ID pengguna dan ID grup dari yang "
-"dispesifikasikan\n"
-"PENGGUNA (ID numerik atau nama pengguna), dan jalankan PERINTAH dengan "
-"spesifikasi ARGUMEN.\n"
-"Keluar dengan status 111 jika tidak dapat mengasumsikan ID pengguna dan grup "
-"yang dibutuhkan.\n"
-"Jika tidak, keluar dengan status keluar dari PERINTAH.\n"
-"Aplikasi ini hanya berguna ketika dijalankan oleh root (ID pengguna nol).\n"
-"\n"
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-"  -g GID[,GID1...]  juga menset ID grup utama ke GID numerik, dan\n"
-"                    (jika dispesifikasikan) tambahkan ID grup ke GID1, ...\n"
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr "ID pengguna tidak diketahui: %s"
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr ""
-"untuk menggunakan ID pengguna %s anda juga harus menggunakan pilihan -g"
-
-#: src/setuidgid.c:190
-#, c-format
-msgid "failed to set supplemental group(s)"
-msgstr "gagal untuk menset grup tambahan"
-
-#: src/setuidgid.c:200
-#, c-format
-msgid "cannot set group-ID to %lu"
-msgstr "tidak dapat menset ID grup ke %lu"
-
-#: src/setuidgid.c:204
-#, c-format
-msgid "cannot set user-ID to %lu"
-msgstr "tidak dapat menset ID pengguna ke %lu"
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr "Colin Plumb"
 
-#: src/shred.c:148
+#: src/shred.c:170
 #, fuzzy
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
@@ -8787,7 +8855,7 @@ msgstr ""
 "untuk bahkan perangkat mahal probing untuk menyelematkan data.\n"
 "\n"
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -8801,9 +8869,10 @@ msgstr ""
 "  -s, --size=N   shred sebanyak bytes ini (akhiran seperti K, M, G "
 "diterima)\n"
 
-#: src/shred.c:161
+#: src/shred.c:183
+#, fuzzy
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
@@ -8816,15 +8885,20 @@ msgstr ""
 "  -z, --zero     tambahkan sebuah akhir paksa tulis dengan nol untuk "
 "menyembunyikan shredding\n"
 
-#: src/shred.c:170
+#: src/shred.c:192
+#, fuzzy
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 "\n"
@@ -8839,7 +8913,7 @@ msgstr ""
 "umum, kebanyakan orang menggunakan pilihan --remove.\n"
 "\n"
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -8858,7 +8932,7 @@ msgstr ""
 "berkas:\n"
 "\n"
 
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -8881,7 +8955,7 @@ msgstr ""
 "server\n"
 "\n"
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -8895,7 +8969,7 @@ msgstr ""
 "* sistem berkas terkompres\n"
 "\n"
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -8918,7 +8992,7 @@ msgstr ""
 "seperti yang terdokumentasi dalam halaman manual mount (man mount).\n"
 "\n"
 
-#: src/shred.c:215
+#: src/shred.c:241
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
 "of the file that cannot be removed, and that will allow a shredded file\n"
@@ -8930,127 +9004,127 @@ msgstr ""
 "berkas yang tershred untuk\n"
 "diselamatkan nanti.\n"
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, c-format
 msgid "%s: fdatasync failed"
 msgstr "%s: fdatasync gagal"
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr "%s: fsync gagal"
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr "%s: gagal rewind"
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr "%s: tahap %lu/%lu (%s)..."
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, c-format
 msgid "%s: error writing at offset %s"
 msgstr "%s: error menulis di ofset %s"
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s: lseek gagal"
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, c-format
 msgid "%s: file too large"
 msgstr "%s: berkas terlalu besar"
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr "%s: tahap %lu/%lu (%s)...%s"
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr "%s: tahap %lu/%lu (%s)...%s/%s %d%%"
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, c-format
 msgid "%s: fstat failed"
 msgstr "%s: fstat gagal"
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, c-format
 msgid "%s: invalid file type"
 msgstr "%s: tipe berkas tidak valid"
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr "%s: berkas memilik ukuran negatif"
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, c-format
 msgid "%s: error truncating"
 msgstr "%s: error memotong"
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, c-format
 msgid "%s: fcntl failed"
 msgstr "%s: fcntl gagal"
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr "%s: tidak dapat menshred tambah-saja berkas deskripsi"
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr "%s: menghapus"
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, c-format
 msgid "%s: renamed to %s"
 msgstr "%s: diubah namanya menjadi %s"
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, c-format
 msgid "%s: failed to remove"
 msgstr "%s: gagal untuk menghapus"
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr "%s: dihapus"
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, c-format
 msgid "%s: failed to close"
 msgstr "%s: gagal untuk menutup"
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, c-format
 msgid "%s: failed to open for writing"
 msgstr "%s: gagal untuk membuka untuk menulis"
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, c-format
 msgid "%s: invalid number of passes"
 msgstr "%s: jumlah tahap tidak valid"
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, c-format
 msgid "multiple random sources specified"
 msgstr "banyak sumber random dispesifikasikan"
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, c-format
 msgid "%s: invalid file size"
 msgstr "%s: ukuran berkas tidak valid"
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -9061,14 +9135,15 @@ msgstr ""
 "  atau:     %s -e [PILIHAN]... [ARG]...\n"
 "  atau:     %s -i LO-HI [PILIHAN]...\n"
 
-#: src/shuf.c:54
+#: src/shuf.c:67
 #, fuzzy
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr ""
 "Tulis sebuah permutasi random dari baris masukan ke standar keluaran.\n"
 "\n"
 
-#: src/shuf.c:60
+#: src/shuf.c:73
+#, fuzzy
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
 "  -i, --input-range=LO-HI   treat each number LO through HI as an input "
@@ -9076,7 +9151,7 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
 msgstr ""
 "  -e, --echo                perlakukan setiap ARG sebagai sebuah baris "
 "masukan\n"
@@ -9087,31 +9162,41 @@ msgstr ""
 "      --random-source=FILE  dapatkan random bytes dari BERKAS\n"
 "  -z, --zero-terminated     akhir baris dengan 0 byte, bukan baris baru\n"
 
-#: src/shuf.c:244
+#: src/shuf.c:228
+#, fuzzy, c-format
+msgid "too many input lines"
+msgstr "terlalu banyak pengulangan baris"
+
+#: src/shuf.c:431
 #, c-format
 msgid "multiple -i options specified"
 msgstr "banyak pilihan -i dispesifikasikan"
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, c-format
 msgid "invalid input range %s"
 msgstr "jangkauan masukan %s tidak valid"
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, c-format
 msgid "invalid line count %s"
 msgstr "jumlah baris %s tidak valid"
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, c-format
 msgid "multiple output files specified"
 msgstr "banyak berkas keluaran dispesifikasikan"
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, c-format
 msgid "cannot combine -e and -i options"
 msgstr "tidak dapat mengkombinasikan pilihan -e dan -i"
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr ""
+
 #: src/sleep.c:44
 #, fuzzy, c-format
 msgid ""
@@ -9137,24 +9222,24 @@ msgstr ""
 "yang dispesifikasikan oleh jumlah dari nilainya.\n"
 "\n"
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, c-format
 msgid "invalid time interval %s"
 msgstr "jangka waktu %s tidak valid"
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr "tidak dapat membaca realtime clock"
 
-#: src/sort.c:399
+#: src/sort.c:427
 #, fuzzy
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr ""
 "Tulis concatenation terurut dari seluruh BERKAS ke standar keluaran.\n"
 "\n"
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
@@ -9162,7 +9247,7 @@ msgstr ""
 "Pilihan pengurutan:\n"
 "\n"
 
-#: src/sort.c:409
+#: src/sort.c:437
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
 "  -d, --dictionary-order      consider only blanks and alphanumeric "
@@ -9174,7 +9259,7 @@ msgstr ""
 "dan angka\n"
 "  -f, --ignore-case            ubah karakter huruf kecil ke huruf besar\n"
 
-#: src/sort.c:415
+#: src/sort.c:443
 #, fuzzy
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
@@ -9187,14 +9272,14 @@ msgstr ""
 "  -M, --month-sort            bandingkan (tidak diketahui) < `JAN' < ... < "
 "`DEC'\n"
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 "  -h, --human-numeric-sort    bandingkan dengan angka yang mudah dibaca "
 "(seperti, 2K 1G)\n"
 
-#: src/sort.c:423
+#: src/sort.c:451
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
 "  -R, --random-sort           sort by random hash of keys\n"
@@ -9206,7 +9291,7 @@ msgstr ""
 "      --random-source=BERKAS  dapatkan random bytes dari BERKAS\n"
 "  -r, --reverse               balik hasil dari komparasi\n"
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -9222,7 +9307,7 @@ msgstr ""
 "  -V, --version-sort          urutan alami dari nomor versi dalam teks\n"
 "\n"
 
-#: src/sort.c:437
+#: src/sort.c:465
 msgid ""
 "Other options:\n"
 "\n"
@@ -9230,7 +9315,7 @@ msgstr ""
 "Pilihan lain:\n"
 "\n"
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
@@ -9238,7 +9323,7 @@ msgstr ""
 "      --batch-size=NMERGE    gabungkan di NMERGE masukan dalam satu waktu;\n"
 "                             untuk penggunaan lebih berkas sementara\n"
 
-#: src/sort.c:445
+#: src/sort.c:473
 #, fuzzy
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
@@ -9257,7 +9342,7 @@ msgstr ""
 "oleh\n"
 "                            nama yang diakhiri NUL dalam berkas F\n"
 
-#: src/sort.c:452
+#: src/sort.c:480
 #, fuzzy
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
@@ -9276,7 +9361,7 @@ msgstr ""
 "oleh\n"
 "                            nama yang diakhiri NUL dalam berkas F\n"
 
-#: src/sort.c:459
+#: src/sort.c:487
 #, fuzzy
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
@@ -9288,7 +9373,7 @@ msgstr ""
 "  -m, --merge               gabungkan berkas yang sudah diurutkan, jangan "
 "urutkan\n"
 
-#: src/sort.c:463
+#: src/sort.c:491
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "  -s, --stable              stabilize sort by disabling last-resort "
@@ -9301,7 +9386,7 @@ msgstr ""
 "perbandingan terakhir\n"
 "  -S, --buffer-size=SIZE    gunakan SIZE untuk buffer memori utama\n"
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, fuzzy, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -9325,12 +9410,7 @@ msgstr ""
 "                            tanpa -c, keluarkan hanya pertama dari sebuah "
 "jalan pertama\n"
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr ""
-"  -z, --zero-terminated     akhir baris dengan 0 byte, bukan baris baru\n"
-
-#: src/sort.c:483
+#: src/sort.c:511
 #, fuzzy
 msgid ""
 "\n"
@@ -9363,7 +9443,7 @@ msgstr ""
 "\n"
 "UKURAN mungkin diikuti dengan akhiran pengali berikut:\n"
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -9384,258 +9464,243 @@ msgstr ""
 "Set LC_ALL=C untuk memperoleh cara pengurutan tradisional yang menggunakan\n"
 "nilai  byte asli.\n"
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, c-format
 msgid "waiting for %s [-d]"
 msgstr "menunggu untuk %s [-d]"
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr "%s [-d] berakhir secara tidak normal"
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, c-format
 msgid "cannot create temporary file in %s"
 msgstr "tidak dapat membuat berkas sementara dalam %s"
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr "gagal membuka"
 
-#: src/sort.c:970
+#: src/sort.c:998
 msgid "fflush failed"
 msgstr "fflush gagal"
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr "gagal menutup"
 
-#: src/sort.c:986
-#, c-format
-msgid "dup2 failed"
-msgstr "dup2 gagal"
-
-#: src/sort.c:1103
-#, c-format
-msgid "couldn't execute %s"
-msgstr "tidak dapat menjalankan %s"
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 msgid "couldn't create temporary file"
 msgstr "tidak dapat membuat berkas sementara"
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, c-format
 msgid "couldn't create process for %s -d"
 msgstr "tidak dapat membuat proses untuk %s -d"
 
-#: src/sort.c:1161
-#, c-format
-msgid "couldn't execute %s -d"
-msgstr "tidak dapat menjalankan %s -d"
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, c-format
 msgid "warning: cannot remove: %s"
 msgstr "peringatan: tidak dapat menghapus: %s"
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, c-format
 msgid "invalid --%s argument %s"
 msgstr "argumen --%s tidak valid %s"
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, c-format
 msgid "minimum --%s argument is %s"
 msgstr "argumen %s minimum --%s"
 
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, c-format
 msgid "--%s argument %s too large"
 msgstr "--%s argumen %s terlalu besar"
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr "maksimal --%s argumen dengan rlimit sekarang adalah %s"
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr ""
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr "stat gagal"
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr "baca gagal"
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, c-format
 msgid "string transformation failed"
 msgstr "Transformasi string gagal"
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, c-format
 msgid "the untransformed string was %s"
 msgstr "untransformasi string adalah %s"
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr ""
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr ""
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr ""
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr ""
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr ""
 
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, fuzzy, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
-msgstr[0] "pilihan `-%s' tidak kompatibel"
-msgstr[1] "pilihan `-%s' tidak kompatibel"
+msgstr[0] "%s: pilihan '%s' adalah ambigu\n"
+msgstr[1] "%s: pilihan '%s' adalah ambigu\n"
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr ""
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr "tulis gagal"
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr "%s: %s:%s: tidak terurut: "
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr "standar error"
 
-#: src/sort.c:3698
+#: src/sort.c:3738
 #, fuzzy
 msgid "cannot read"
 msgstr "%s: gagal rewind"
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, c-format
 msgid "%s: invalid field specification %s"
 msgstr "%s: spesifikasi field %s tidak valid"
 
-#: src/sort.c:3987
+#: src/sort.c:4028
 #, fuzzy, c-format
 msgid "options '-%s' are incompatible"
 msgstr "pilihan `-%s' tidak kompatibel"
 
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, c-format
 msgid "%s: invalid count at start of %s"
 msgstr "%s: jumlah tidak valid di awal dari %s"
 
-#: src/sort.c:4295
+#: src/sort.c:4336
 #, fuzzy
 msgid "invalid number after '-'"
 msgstr "jumlah tidak valid setelah `-'"
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 #, fuzzy
 msgid "invalid number after '.'"
 msgstr "jumlah tidak valid setelah `.'"
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr "karakter sisa dalam spesifikasi field"
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, c-format
 msgid "multiple compress programs specified"
 msgstr "banyak aplikasi kompresi dispesifikasikan"
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
 msgstr "jumlah tidak valid di awal field"
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
 msgstr "jumlah field adalah nol"
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr "karakter ofset adalah nol"
 
-#: src/sort.c:4407
+#: src/sort.c:4448
 #, fuzzy
 msgid "invalid number after ','"
 msgstr "jumlah tidak valid setelah `,'"
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr "empty tab"
 
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, c-format
 msgid "cannot read file names from %s"
 msgstr "tidak dapat membaca nama berkas dari %s"
 
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr "%s:%lu: nama berkas panjang-nol tidak valid"
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, c-format
 msgid "no input from %s"
 msgstr "tidak ada masukan masukan dari %s"
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr ""
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr ""
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr "kelebihan operan %s tidak dibolehkan dengan -%c"
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr ""
 
-#: src/split.c:204
+#: src/split.c:203
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr "Penggunaan: %s [PILIHAN]... [MASUKAN [PREFIX]]\n"
 
-#: src/split.c:208
+#: src/split.c:207
 #, fuzzy
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
@@ -9650,32 +9715,25 @@ msgstr ""
 "adalah -, baca standar masukan.\n"
 "\n"
 
-#: src/split.c:216
-#, fuzzy, c-format
+#: src/split.c:215
+#, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
-"  -a, --suffix-length=N   gunakan akhiran dengan panjang N (default %d)\n"
-"  -b, --bytes=SIZE        pakai UKURAN bytes untuk setiap berkas keluaran\n"
-"  -C, --line-bytes=SIZE   pakai di hampis UKURAN bytes dari baris setiap "
-"berkas keluaran\n"
-"  -d, --numeric-suffixes  gunakan akhiran numerik daripada alphabet\n"
-"  -l, --lines=NUMBER      pakai JUMLAH baris setiap berkas keluaran\n"
 
-#: src/split.c:229
+#: src/split.c:228
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
 "                            output file is opened\n"
@@ -9683,7 +9741,7 @@ msgstr ""
 "      --verbose           tampilkan sebuah diagnosa tepat sebelum setiap\n"
 "                            berkas keluaran dibuka\n"
 
-#: src/split.c:236
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -9695,191 +9753,191 @@ msgid ""
 "r/K/N   likewise but only output Kth of N to stdout\n"
 msgstr ""
 
-#: src/split.c:354
+#: src/split.c:353
 #, c-format
 msgid "output file suffixes exhausted"
 msgstr "Kehabisan akhiran berkas keluaran"
 
-#: src/split.c:366
+#: src/split.c:365
 #, c-format
 msgid "creating file %s\n"
 msgstr "membuat berkas %s\n"
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr ""
 
-#: src/split.c:391
+#: src/split.c:390
 #, fuzzy, c-format
 msgid "failed to set FILE environment variable"
 msgstr "gagal untuk memperbarui lingkungan dengan %s"
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr ""
 
-#: src/split.c:395
+#: src/split.c:394
 #, fuzzy, c-format
 msgid "failed to create pipe"
 msgstr "gagal untuk menghapus %s"
 
-#: src/split.c:409
+#: src/split.c:408
 #, fuzzy, c-format
 msgid "closing prior pipe"
 msgstr "menutup direktori %s"
 
-#: src/split.c:411
+#: src/split.c:410
 #, fuzzy, c-format
 msgid "closing output pipe"
 msgstr "menutup berkas keluaran %s"
 
-#: src/split.c:415
+#: src/split.c:414
 #, fuzzy, c-format
 msgid "moving input pipe"
 msgstr "menutup berkas masukan %s"
 
-#: src/split.c:417
+#: src/split.c:416
 #, fuzzy, c-format
 msgid "closing input pipe"
 msgstr "menutup berkas masukan %s"
 
-#: src/split.c:422
+#: src/split.c:421
 #, fuzzy, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr "gagal menjalankan perintah %s"
 
-#: src/split.c:428
+#: src/split.c:427
 #, fuzzy, c-format
 msgid "failed to close input pipe"
 msgstr "gagal menutup direktori %s"
 
-#: src/split.c:464
+#: src/split.c:463
 #, fuzzy, c-format
 msgid "waiting for child process"
 msgstr "menunggu untuk strip"
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr ""
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr ""
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr "status dari perintah (0x%X) tidak diketahui"
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr "tidak dapat memisahkan lebih dari satu cara"
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, fuzzy, c-format
 msgid "%s: invalid number of chunks"
 msgstr "%s: jumlah detik tidak valid"
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, fuzzy, c-format
 msgid "%s: invalid chunk number"
 msgstr "%s: nomor tidak valid"
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr "%s: panjang akhiran tidak valid"
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr "%s: jumlah dari bytes tidak valid"
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr "%s: jumlah dari baris tidak valid"
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, c-format
 msgid "line count option -%s%c... is too large"
 msgstr "jumlah baris pilihan -%s%c... terlalu besar"
 
-#: src/split.c:1248
+#: src/split.c:1298
 #, fuzzy, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr "awalan nomor baris: %s tidak valid"
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, fuzzy, c-format
 msgid "%s: invalid IO block size"
 msgstr "%s: ukuran berkas tidak valid"
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr ""
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr ""
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, fuzzy, c-format
 msgid "%s: cannot determine file size"
 msgstr "tidak dapat menentukan nama host"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr "Michael Meskes"
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, fuzzy, c-format
 msgid "failed to canonicalize %s"
 msgstr "gagal untuk menutup %s"
 
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, fuzzy, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr "peringatan: escape tidak dikenal `\\%c'"
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, c-format
 msgid "%s: invalid directive"
 msgstr "%s: direktif tidak valid"
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, c-format
 msgid "warning: backslash at end of format"
 msgstr "peringatan: backslash di akhir dari format"
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr ""
 "menggunakan %s untuk mengatakan standar masukan tidak bekerja dalam mode "
 "sistem berkas"
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, c-format
 msgid "cannot read file system information for %s"
 msgstr "tidak dapat membaca informasi sistem berkas untuk %s"
 
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, c-format
 msgid "cannot stat standard input"
 msgstr "tidak dapat memperoleh statistik standar masukan"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -9890,7 +9948,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -9898,30 +9956,30 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, fuzzy, c-format
 msgid "Context: %C\n"
 msgstr " konteks=%s"
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -9929,11 +9987,11 @@ msgid ""
 " Birth: %w\n"
 msgstr ""
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
 msgstr ""
 
-#: src/stat.c:1356
+#: src/stat.c:1418
 #, fuzzy
 msgid ""
 "  -L, --dereference     follow links\n"
@@ -9945,14 +10003,14 @@ msgstr ""
 "  -f, --file-system     tampilkan status sistem berkas dari pada status "
 "berkas\n"
 
-#: src/stat.c:1360
+#: src/stat.c:1422
 #, fuzzy
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 "  -c, --format=FORMAT   gunakan spesifikasi FORMAT daripada default;\n"
@@ -9966,7 +10024,7 @@ msgstr ""
 "FORMAT.\n"
 "  -t, --terse           tampilkan informasi dalam format lengkap\n"
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 #, fuzzy
 msgid ""
 "\n"
@@ -9987,7 +10045,7 @@ msgstr ""
 "  %B   Jumlah dalam bytes untuk setiap blok yang dilaporkan oleh %b\n"
 "  %C   String konteks keamanan SELinux\n"
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 #, fuzzy
 msgid ""
 "  %d   device number in decimal\n"
@@ -10004,7 +10062,7 @@ msgstr ""
 "  %g   Grup ID dari pemilik\n"
 "  %G   Nama ID dari pemilik\n"
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 #, fuzzy
 msgid ""
 "  %h   number of hard links\n"
@@ -10014,8 +10072,8 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 "  %h   Jumlah dari hard links\n"
 "  %i   Jumlah dari inode\n"
@@ -10026,7 +10084,7 @@ msgstr ""
 "  %t   Tipe perangkat major dalam heksadesimal\n"
 "  %T   Tipe perangkat minor dalam heksadesimal\n"
 
-#: src/stat.c:1399
+#: src/stat.c:1461
 #, fuzzy
 msgid ""
 "  %u   user ID of owner\n"
@@ -10035,10 +10093,10 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 "  %u   ID Pengguna dari pemilik\n"
@@ -10050,7 +10108,7 @@ msgstr ""
 "  %z   Waktu terakhir diubah\n"
 "  %Z   Waktu terakhir diubah sebagai detik sejak Epoch\n"
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 #, fuzzy
 msgid ""
 "Valid format sequences for file systems:\n"
@@ -10070,7 +10128,7 @@ msgstr ""
 "  %f   Blok bebas dalam sistem berkas\n"
 "  %C   String konteks keamanan SELinux\n"
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 #, fuzzy
 msgid ""
 "  %i   file system ID in hex\n"
@@ -10172,22 +10230,27 @@ msgstr ""
 "gunakan aliran untuk I/O,\n"
 "dan sehingga tidak terpengaruh oleh konfigurasi `stdbuf'.\n"
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, fuzzy, c-format
 msgid "failed to find %s"
 msgstr "gagal untuk membuka %s"
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, c-format
 msgid "failed to update the environment with %s"
 msgstr "gagal untuk memperbarui lingkungan dengan %s"
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr "baris penyangga stdin tidak berarti"
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, fuzzy, c-format
+msgid "you must specify a buffering mode option"
+msgstr "anda harus menspesifikasikan satu dari %s atau %s"
+
+#: src/stty.c:516
 #, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -10198,11 +10261,11 @@ msgstr ""
 "  atau:     %s [-F PERANGKAT] [--file=PERANGKAT] [-a|-all]\n"
 "  atau:     %s [-F PERANGKAT] [--file=PERANGKAT] [-g|--save]\n"
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
 msgstr ""
 
-#: src/stty.c:525
+#: src/stty.c:528
 #, fuzzy
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
@@ -10218,7 +10281,7 @@ msgstr ""
 "  -F, --file=DEVICE  buka dan gunakan PERANGKAT yang dispesifikasikan "
 "daripada stdin\n"
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
@@ -10230,7 +10293,7 @@ msgstr ""
 "non-POSIX. Sistem yang berjalan mendefinisikan dimana konfigurasi yang "
 "tersedia.\n"
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -10246,7 +10309,7 @@ msgstr ""
 "masukan)\n"
 "   eof CHAR      CHAR akan akhir dari baris\n"
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -10259,7 +10322,7 @@ msgstr ""
 "   intr CHAR     CHAR akan mengirim sinyal interupsi\n"
 "   kill CHAR     CHAR akan menghapus baris sekarang\n"
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -10271,7 +10334,7 @@ msgstr ""
 " * rprnt CHAR    CHAR akan menggambar ulang baris sekarang\n"
 "   start CHAR    CHAR akan mengulang keluaran setelah menyetopnya\n"
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -10283,7 +10346,7 @@ msgstr ""
 " * swtch CHAR    CHAR akan mengubah ke lapisan shell yang berbeda\n"
 " * werase CHAR   CHAR akan menghapus kata terakhir yang diketik\n"
 
-#: src/stty.c:562
+#: src/stty.c:565
 msgid ""
 "\n"
 "Special settings:\n"
@@ -10297,7 +10360,7 @@ msgstr ""
 " * cols N         beritahu kernel bahwa terminal memilik N kolom\n"
 " * columns N      sama seperti cols N\n"
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -10311,7 +10374,7 @@ msgstr ""
 "pembacaan selesai\n"
 "   ospeed N      set kecepatan keluaran ke N\n"
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -10326,7 +10389,7 @@ msgstr ""
 "   time N        Dengan -icanon, set timeout baca untuk N persepuluh dari "
 "detik\n"
 
-#: src/stty.c:581
+#: src/stty.c:584
 #, fuzzy
 msgid ""
 "\n"
@@ -10344,7 +10407,7 @@ msgstr ""
 " * [-]crtscts    aktifkan RTS/CTS handshaking\n"
 "   csN           set ukuran karakter ke N bits, N dalam [5..8]\n"
 
-#: src/stty.c:590
+#: src/stty.c:593
 #, fuzzy
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
@@ -10353,6 +10416,7 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 "   [-]cstopb     gunakan dua stop bit per karakter (satu dengan `-')\n"
 "   [-]hup        kirim sebuah sinyal hangup ketika proses terakhir tutup "
@@ -10362,7 +10426,7 @@ msgstr ""
 "dalam masukan\n"
 "   [-]parodd     set odd parity (bahkan dengan `-')\n"
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -10378,7 +10442,7 @@ msgstr ""
 "   [-]ignbrk     abaikan karakter break\n"
 "   [-]igncr      abaikan carriage return\n"
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -10393,12 +10457,12 @@ msgstr ""
 "   [-]inpck      aktifkan pengecheckan masukan parity\n"
 "   [-]istrip     hapus atas (ke 8) bit dari karakter masukan\n"
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr ""
 " * [-]iutf8      asumsikan karakter masukan adalah terenkode dalam UTF-8\n"
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -10415,7 +10479,7 @@ msgstr ""
 "   [-]parmrk     tandai parity error (dengan sebuah urutan 255-0-karakter)\n"
 "   [-]tandem     sama seperti [-]ixoff\n"
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -10431,10 +10495,11 @@ msgstr ""
 " * ffN           gaya form feed delay, N dalam [0..1]\n"
 " * nlN           gayal baris baru delay, N dalam [0..1]\n"
 
-#: src/stty.c:631
+#: src/stty.c:635
+#, fuzzy
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
@@ -10448,7 +10513,7 @@ msgstr ""
 " * [-]onlcr      translasikan baris baru ke carriage return-baris baru\n"
 " * [-]onlret     baris baru menperformasikan sebuah carriage return\n"
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -10464,7 +10529,7 @@ msgstr ""
 " * -tabs         sama seperti tab3\n"
 " * vtN           gaya vertikal tab delay, N dalam [0..1]\n"
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -10480,7 +10545,7 @@ msgstr ""
 " * -crtkill      hapus seluruh baris dengan mengikuti konfigurasi echoctl "
 "dan echok\n"
 
-#: src/stty.c:654
+#: src/stty.c:658
 #, fuzzy
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
@@ -10495,7 +10560,7 @@ msgstr ""
 "   [-]echoe      sama seperti [-]crterase\n"
 "   [-]echok      echo sebuah baris baru sesudah karakter hapus\n"
 
-#: src/stty.c:661
+#: src/stty.c:665
 #, fuzzy
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
@@ -10510,7 +10575,7 @@ msgstr ""
 "   [-]icanon     aktifkan erase, kill, werase, dan rprnt karakter spesial\n"
 "   [-]iexten     aktifkan karakter spesial non-POSIX\n"
 
-#: src/stty.c:668
+#: src/stty.c:672
 #, fuzzy
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
@@ -10529,7 +10594,7 @@ msgstr ""
 " * [-]xcase      dengan icanon, escape dengan `\\' untuk karakter huruf "
 "besar\n"
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -10543,7 +10608,7 @@ msgstr ""
 "   cbreak        sama seperti -icanon\n"
 "   -cbreak       sama seperti icanon\n"
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -10555,7 +10620,7 @@ msgstr ""
 "   -cooked       sama seperti mentah\n"
 "   crt           sama seperti echoe echoctl echoke\n"
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -10569,7 +10634,7 @@ msgstr ""
 "   ek            erase dan kill karakter ke nilai defaultnya\n"
 "   evenp         sama seperti parenb -parodd cs7\n"
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -10585,7 +10650,7 @@ msgstr ""
 "   nl            sama seperti -icrnl -onlcr\n"
 "   -nl           sama seperti icrnl -inlcr -igncr onlcr -ocrnl -onlret\n"
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -10599,7 +10664,7 @@ msgstr ""
 "   pass8         sama seperti -parenb -istrip cs8\n"
 "   -pass8        sama seperti parenb istrip cs7\n"
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -10612,7 +10677,7 @@ msgstr ""
 "                 -imaxbel -opost -isig -icanon -xcase min 1 time 0\n"
 "   -raw          sama seperti cooked\n"
 
-#: src/stty.c:716
+#: src/stty.c:720
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
 "                 -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n"
@@ -10629,7 +10694,7 @@ msgstr ""
 "                 -xcase -tostop -echoprt echoctl echoke, semua karakter\n"
 "                 spesial ke nilai defaultnya.\n"
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -10645,12 +10710,12 @@ msgstr ""
 "127; nilai spesial ^- atau undef digunakan untuk menonaktifkan karakter "
 "spesial.\n"
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, c-format
 msgid "only one device may be specified"
 msgstr "hanya sebuah perangkat yang dispesifikasikan"
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
@@ -10659,43 +10724,43 @@ msgstr ""
 "pilihan untuk gaya verbose dan stty-readable keluaran adalah\n"
 "mutualy exclusive"
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr "ketika menspesifikasikan gaya keluaran, mode mungkin tidak diset"
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr "%s: tidak dapat mereset mode non-blocking"
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, c-format
 msgid "invalid argument %s"
 msgstr "argumen tidak valid %s"
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, c-format
 msgid "missing argument to %s"
 msgstr "argumen ke %s hilang"
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, c-format
 msgid "invalid line discipline %s"
 msgstr "baris disiplin %s tidak valid"
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr "%s: tidak dapat melakukan seluruh operasi yang diminta"
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr "%s: tidak ada informasi ukuran untuk perangkat ini"
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, c-format
 msgid "invalid integer argument %s"
 msgstr "integer argumen %s tidak valid"
@@ -10752,7 +10817,7 @@ msgstr "      --help     tampilkan bantuan ini dan keluar\n"
 msgid "      --version  output version information and exit\n"
 msgstr "      --version  keluarkan informasi versi dan keluar\n"
 
-#: src/system.h:544
+#: src/system.h:543
 #, fuzzy
 msgid ""
 "\n"
@@ -10760,15 +10825,15 @@ msgid ""
 msgstr ""
 "Argumen wajib untuk pilihan panjang adalah wajib untuk pilihan pendek juga.\n"
 
-#: src/system.h:552
+#: src/system.h:551
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -10783,35 +10848,33 @@ msgstr ""
 "Jika tidak, satuan baku ke 1024 bytes (atau 512 jika POSIXLY_CORRECT "
 "diset).\n"
 
-#: src/system.h:571
-#, c-format
+#: src/system.h:570
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
-msgstr ""
-"\n"
-"Laporkan %s bugs ke %s\n"
+"%s online help: <%s>\n"
+msgstr "%s halaman rumah: <%s>\n"
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr "Laporkan %s bugs terjemahan ke <http://translationproject.org/team/>\n"
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr "Untuk dokumentasi lengkap, jalankan: info coreutils '%s pemanggilan'\n"
 
-#: src/system.h:596
+#: src/system.h:591
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Coba `%s --help' untuk informasi lebih lanjut.\n"
 
-#: src/system.h:628
+#: src/system.h:633
 #, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -10913,11 +10976,10 @@ msgstr ""
 "\n"
 
 #: src/tail.c:270
+#, fuzzy
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
 "  -c, --bytes=K            keluarkan K bytes terakhir; alternatif, gunakan -"
 "c +K untuk\n"
@@ -10925,11 +10987,11 @@ msgstr ""
 "setiap berkas\n"
 
 #: src/tail.c:274
+#, fuzzy
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 "  -f, --follow[={name|descriptor}]\n"
@@ -10939,18 +11001,17 @@ msgstr ""
 "                          sama\n"
 "  -F                      sama seperti --follow=name --retry\n"
 
-#: src/tail.c:281
+#: src/tail.c:280
 #, fuzzy, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
 "  -n, --lines=K            keluarkan baris K terakhir, daripada terakhir "
 "%d;\n"
@@ -10964,13 +11025,12 @@ msgstr ""
 "diubah nama\n"
 "                           (ini biasa untuk berkas log terotasi)\n"
 
-#: src/tail.c:294
+#: src/tail.c:293
+#, fuzzy
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 "      --pid=PID            dengan -f, akhiri setelah proses ID, PID selesai\n"
 "  -q, --quiet, --silent    jangan mengeluarkan header diberikan nama berkas\n"
@@ -10980,20 +11040,20 @@ msgstr ""
 "mengikuti\n"
 "                           nama, contoh, dengan --follow=name\n"
 
-#: src/tail.c:301
+#: src/tail.c:298
 #, fuzzy
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 "  -s, --sleep-interval=N   dengan -f, tidur untuk kira-kira N detik\n"
 "                           (baku 1.0) diantara interasi.\n"
 "  -v, --verbose            selalu mengeluarkan header diberikan nama berkas\n"
 
-#: src/tail.c:310
+#: src/tail.c:307
 #, fuzzy
 msgid ""
 "\n"
@@ -11014,7 +11074,7 @@ msgstr ""
 "GB 1000*1000*1000, G 1024*1024*1024, dan seterusnya untuk T, P, E, Z, Y.\n"
 "\n"
 
-#: src/tail.c:319
+#: src/tail.c:316
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
 "means that even if a tail'ed file is renamed, tail will continue to track\n"
@@ -11035,166 +11095,172 @@ msgstr ""
 "telah dihapus dan\n"
 "dibuat kembali oleh aplikasi lain.\n"
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr "menutup %s (fd=%d)"
 
-#: src/tail.c:453
-#, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr "%s: tidak dapat mencari ofset relatif %s"
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr "%s: tidak dapat mencari ofset akhir-relatif %s"
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr "tidak dapat menentukan lokasi dari %s. kembali ke polling"
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
 "reverting to polling"
 msgstr ""
 
-#: src/tail.c:963
+#: src/tail.c:965
+#, fuzzy, c-format
+msgid "%s has been replaced with a symbolic link. giving up on this name"
+msgstr ""
+"%s telah digantikan dengan sebuah berkas 'remote'; menyerah untuk nama ini"
+
+#: src/tail.c:980
 #, c-format
 msgid "%s has become inaccessible"
 msgstr "%s telah menjadi tidak dapat diakses"
 
-#: src/tail.c:980
+#: src/tail.c:997
 #, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr ""
 "%s telah diganti dengan berkas yang tidak dapat ditail; menyerah untuk nama "
 "ini"
 
-#: src/tail.c:989
+#: src/tail.c:1006
 #, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr ""
 "%s telah digantikan dengan sebuah berkas 'remote'; menyerah untuk nama ini"
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, c-format
 msgid "%s has become accessible"
 msgstr "%s telah menjadi dapat diakses"
 
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr "%s telah muncul;  mengikuti akhir dari berkas baru"
 
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr "%s telah diganti; mengikuti akhir dari berkas baru"
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr "%s: tidak dapat mengubah mode nonblocking"
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr "%s: berkas terpotong"
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr "tidak ada berkas tersisa"
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, c-format
 msgid "cannot watch parent directory of %s"
 msgstr "tidak dapat mengamati direktori atas dari %s"
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, fuzzy, c-format
 msgid "inotify resources exhausted"
 msgstr "Kehabisan akhiran berkas keluaran"
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, c-format
 msgid "cannot watch %s"
 msgstr "tidak dapat mengamati %s"
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr "error mengamati inotify event"
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, c-format
 msgid "error reading inotify event"
 msgstr "error membaca inotify event"
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr ""
 "%s: tidak dapat mengikuti akhir dari berkas tipe ini; menyerah di nama ini"
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, c-format
 msgid "number in %s is too large"
 msgstr "angka dalam %s terlalu besar"
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr ""
 "%s: jumlah maksimal dari statistik tidak diubah tidak valid diantar buka"
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr "%s: PID tidak valid"
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr "%s: jumlah detik tidak valid"
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr "pilihan yang digunakan tidak valid dalam konteks -- %c"
 
-#: src/tail.c:2034
+#: src/tail.c:2096
+#, fuzzy, c-format
+msgid "warning: --retry ignored; --retry is useful only when following"
+msgstr "peringatan: PID diabaikan; --pid=PID hanya berguna ketika mengikuti"
+
+#: src/tail.c:2100
 #, c-format
-msgid "warning: --retry is useful mainly when following by name"
-msgstr "peringatan: --retry hanya berguna ketik diikuti dengan nama"
+msgid "warning: --retry only effective for the initial open"
+msgstr ""
 
-#: src/tail.c:2038
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
 msgstr "peringatan: PID diabaikan; --pid=PID hanya berguna ketika mengikuti"
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr "peringata: --pid=PID tidak didukung dalam sistem ini"
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, c-format
 msgid "cannot follow %s by name"
 msgstr "tidak dapat mengikuti %s dengan nama"
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr ""
 "peringatan: mengikuti standar masukan secara tak terhingga adalah tidak "
 "efektif"
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr "inotify tidak dapat digunakan, kembali ke polling"
@@ -11473,17 +11539,17 @@ msgstr "kelebihan argumen %s"
 msgid "warning: sigprocmask"
 msgstr ""
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr ""
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr ""
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
@@ -11492,32 +11558,29 @@ msgstr ""
 "Penggunaan: %s [PILIHAN] NEWROOT [PERINTAH [ARG]...]\n"
 "  atau:     %s PILIHAN\n"
 
-#: src/timeout.c:229
-#, fuzzy
+#: src/timeout.c:232
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
 msgstr ""
-"Argumen wajib untuk pilihan panjang adalah wajib untuk pilihan pendek juga.\n"
 
-#: src/timeout.c:235
+#: src/timeout.c:238
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 #, fuzzy
 msgid ""
 "\n"
@@ -11530,7 +11593,7 @@ msgstr ""
 "`h' untuk jam atau `d' untuk hari.\n"
 "\n"
 
-#: src/timeout.c:259
+#: src/timeout.c:262
 #, fuzzy
 msgid ""
 "\n"
@@ -11551,17 +11614,17 @@ msgstr ""
 "ini mungkin perlu menggunakan sinyal KILL(9), karena sinyal ini tidak dapat\n"
 "ditangkap.\n"
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr ""
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, c-format
 msgid "error waiting for command"
 msgstr "error dalam menunggu perintah"
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr ""
@@ -11989,7 +12052,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 "  -r, --reference=BERKAS gunakan ukuran BERKAS ini\n"
 "  -s, --size=SIZE        gunakan UKURAN ini\n"
@@ -12082,12 +12145,12 @@ msgstr ""
 "Tanpa BERKAS, atau ketika BERKAS adalah -, baca standar masukan.\n"
 "\n"
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr "%s: masukan berisi sebuah angka ganjil dari tokens"
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr "%s: masukan berisi sebuah loop:"
@@ -12188,12 +12251,12 @@ msgstr "tabs terlalu jauh dipisahkan"
 msgid "tab stop value is too large"
 msgstr "nilai tab stop terlalu besar"
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr "Penggunaan: %s [PILIHAN]... [INPUT [OUTPUT]]\n"
 
-#: src/uniq.c:138
+#: src/uniq.c:174
 #, fuzzy
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
@@ -12208,41 +12271,46 @@ msgstr ""
 "pertama.\n"
 "\n"
 
-#: src/uniq.c:147
+#: src/uniq.c:183
+#, fuzzy
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
 msgstr ""
 "  -c, --count           awali baris dengan jumlah kejadian\n"
 "  -d, --repeated        hanya menampilkan baris duplikasi\n"
 
-#: src/uniq.c:151
-#, fuzzy
+#: src/uniq.c:187
+msgid ""
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
+msgstr ""
+
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr ""
+
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
+msgstr ""
+
+#: src/uniq.c:199
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
 "  -i, --ignore-case     ignore differences in case when comparing\n"
 "  -s, --skip-chars=N    avoid comparing the first N characters\n"
 "  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
-msgstr ""
-"  -D, --all-repeated[=delimit-method]  menampilkan seluruh baris duplikasi\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting selesai dengan baris kosong.\n"
-"  -f, --skip-fields=N   hindari membandingkan bagian N pertama\n"
-"  -i, --ignore-case     abaikan perbedaan dalam case dalam membandingkan\n"
-"  -s, --skip-chars=N    hindari perbandingan karakter N pertama\n"
-"  -u, --unique          hanya menampilkan baris unik\n"
-"  -z, --zero-termintaed akhir baris dengan 0 byte, bukan baris baru\n"
-
-#: src/uniq.c:161
+msgstr ""
+
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr ""
 "  -w, --check-chars=N   bandingkan tidak lebih dari N karakter dalam baris\n"
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 msgid ""
 "\n"
 "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n"
@@ -12253,7 +12321,7 @@ msgstr ""
 "bukan-kosong\n"
 "karakter. Fields dilewati sebelum karakter.\n"
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 #, fuzzy
 msgid ""
 "\n"
@@ -12268,24 +12336,36 @@ msgstr ""
 "Juga, perbandingan menghargain aturan yang dispesifikasikan oleh "
 "`LC_COLLATE'.\n"
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, c-format
 msgid "too many repeated lines"
 msgstr "terlalu banyak pengulangan baris"
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
 msgstr "jumlah bagian yang dilewati tidak valid"
 
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
 msgstr "jumlah bytes yang dilewati tidak valid"
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
 msgstr "jumlah bytes yang dibandingkan tidak valid"
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr ""
+
+#: src/uniq.c:652
+#, fuzzy, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr ""
+"menampilkan seluruh baris duplikat dan jumlah pengulangan adalah tidak "
+"berarti"
+
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr ""
@@ -12309,11 +12389,6 @@ msgstr ""
 "Panggil fungsi unlink untuk menghapus BERKAS yang dispesifikasikan.\n"
 "\n"
 
-#: src/unlink.c:86
-#, c-format
-msgid "cannot unlink %s"
-msgstr "tidak dapat unlink %s"
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -12358,7 +12433,7 @@ msgstr[1] "%lu pengguna"
 msgid ",  load average: %.2f"
 msgstr ",  beban rata-rata: %.2f"
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -12369,7 +12444,7 @@ msgstr ""
 "jumlah pengguna dari sistem, dan jumlah rata-rata pekerjaan\n"
 "dalam antrian pekerjaan lebih dari terakhir 1, 5 dan 15 menit."
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
@@ -12379,12 +12454,12 @@ msgstr ""
 "sebuah keadaan tidur tidak dapat diinterupsi juga berkontribusi terhada "
 "beban kerja.\n"
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr "\n"
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
@@ -12628,207 +12703,217 @@ msgstr ""
 "atau `y'.\n"
 "\n"
 
-#~ msgid "using single-precision arithmetic"
-#~ msgstr "menggunakan aritmetik single-precision"
-
-#~ msgid "using arbitrary-precision arithmetic"
-#~ msgstr "menggunakan aritmetik arbitrary-precision"
-
 #, fuzzy
-#~ msgid "  returning value: '%s'\n"
-#~ msgstr "membuat berkas %s\n"
+#~ msgid "cannot create pipe"
+#~ msgstr "tidak dapat membuat link %s"
 
 #, fuzzy
-#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n"
-#~ msgstr "Penggunaan: %s [PILIHAN] NAMA...\n"
+#~ msgid "%s subprocess failed"
+#~ msgstr "%s: gagal mencari"
 
 #, fuzzy
-#~ msgid "no valid suffix found\n"
-#~ msgstr "%s: panjang akhiran tidak valid"
+#~ msgid "_open_osfhandle failed"
+#~ msgstr "gagal membuka"
 
-#~ msgid ""
-#~ "\n"
-#~ "Examples:\n"
-#~ "  %s /usr/bin/sort       Output \"sort\".\n"
-#~ "  %s include/stdio.h .h  Output \"stdio\".\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Contoh:\n"
-#~ "  %s /usr/bin/sort       Keluaran \"sort\".\n"
-#~ "  %s include/stdio.h     Keluaran \"stdio\".\n"
+#~ msgid "failed to set additional groups"
+#~ msgstr "gagal untuk menset grup tambahan"
 
-#~ msgid "reading %s"
-#~ msgstr "membaca %s"
+#~ msgid "failed to get file system create context"
+#~ msgstr "gagal memperoleh file sysmte create context"
 
-#~ msgid "writing %s"
-#~ msgstr "menulis %s"
+#, fuzzy
+#~ msgid "warning: "
+#~ msgstr "Peringatan: "
 
-#~ msgid "closing %s"
-#~ msgstr "menutup %s"
+#~ msgid "%s: cannot lseek back to original position"
+#~ msgstr "%s: tidak dapat lseek ke posisi original"
 
-#~ msgid "accessing %s"
-#~ msgstr "mengakses %s"
+#, fuzzy
+#~ msgid "%s: failed to reset file pointer"
+#~ msgstr "%s: gagal untuk menghapus"
 
-#~ msgid "opening %s"
-#~ msgstr "membuka %s"
+#~ msgid "cannot reposition file pointer for %s"
+#~ msgstr "tidak dapat mereposisi berkas penunjuk untuk %s"
+
+#~ msgid "Usage: %s [OPTION]... [USERNAME]\n"
+#~ msgstr "Penggunaan: %s [PILIHAN]... [NAMA PENGGUNA]\n"
 
 #~ msgid ""
-#~ "Usage: %s NAME\n"
-#~ "  or:  %s OPTION\n"
+#~ "      --preserve-context  preserve SELinux security context\n"
+#~ "  -Z, --context=CONTEXT  set SELinux security context of files and "
+#~ "directories\n"
 #~ msgstr ""
-#~ "Penggunaan: %s NAMA\n"
-#~ "  atau:     %s PILIHAN\n"
+#~ "      --preserve-context  jaga SELinux konteks keamanan\n"
+#~ "  -Z, --context=CONTEXT   set SELinux konteks keamanan dari berkas dan "
+#~ "direktori\n"
 
-#, fuzzy
 #~ msgid ""
-#~ "  -x, --one-file-system    skip directories on different file systems\n"
-#~ "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
-#~ "      --exclude=PATTERN    exclude files that match PATTERN\n"
-#~ "  -d, --max-depth=N     print the total for a directory (or file, with --"
-#~ "all)\n"
-#~ "                          only if it is N or fewer levels below the "
-#~ "command\n"
-#~ "                          line argument;  --max-depth=0 is the same as\n"
-#~ "                          --summarize\n"
+#~ "  -Z, --context=CTX  set the SELinux security context of each NAME to "
+#~ "CTX\n"
 #~ msgstr ""
-#~ "  -x, --one-filesystem  lewati direktori di sistem berkas berbeda\n"
-#~ "  -X, --exclude-from=BERKAS Exclude berkas yang cocok dari pola apapun "
-#~ "dalam BERKAS.\n"
-#~ "      --exclude=POLA    Exclude berkas yang cocok dengan POLA.\n"
-#~ "      --max-depth=N     menampilkan total untuk sebuah direktori (atau "
-#~ "berkas, dengan --all)\n"
-#~ "                        hanya jika ini adalah N atau level lebih kecil "
-#~ "dibawah perintah\n"
-#~ "                        argumen baris; --max-depth=0 sama seperti dalam\n"
-#~ "                        --summarize\n"
+#~ "  -Z, --context=CTX  set konteks keamanan SELinux dari setiap NAMA ke "
+#~ "CTX\n"
 
-#, fuzzy
 #~ msgid ""
-#~ "  none, off       never make backups (even if --backup is given)\n"
-#~ "  numbered, t     make numbered backups\n"
-#~ "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
-#~ "  simple, never   always make simple backups\n"
-#~ "\n"
+#~ "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
 #~ msgstr ""
-#~ "  none, off       tidak pernah membuat backup (walaupun jika --backup "
-#~ "diberikan)\n"
-#~ "  numbered, t     buat backup bernomor\n"
-#~ "  existing, nil   bernomor jika backup bernomor ada, simple jika tidak\n"
-#~ "  simple, never   selalu membuat backup sederhana\n"
+#~ "  -Z, --context=CTX  set konteks keamanan SELinux dari NAMA ke CTX\n"
+
+#~ msgid "failed to redirect stderr to /dev/null"
+#~ msgstr "gagal untuk mengarahkan stderr ke /dev/null"
 
+#, fuzzy
+#~ msgid "invalid number: '%s'"
+#~ msgstr "nomor %s tidak valid"
+
+#, fuzzy
+#~ msgid "--padding cannot be combined with --format"
+#~ msgstr "berkas operand tidak dapat dikombinasikan dengan --files0-from."
+
+#, fuzzy
 #~ msgid ""
-#~ "WARNING: --page-increment is deprecated; use --line-increment instead"
+#~ "\n"
+#~ "With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
 #~ msgstr ""
-#~ "PERINGATAN: --page-increment sudah ditinggalkan; lebih baik gunakan --"
-#~ "line-increment"
+#~ "\n"
+#~ "Dengan tanpa BERKAS atau jika BERKAS adalah -, baca Standar Masukan. `-"
+#~ "F /' secara default.\n"
 
-#~ msgid "All arguments to long options are mandatory for short options.\n"
+#~ msgid "cannot remove directory: %s"
+#~ msgstr "tidak dapat menghapus direktori: %s"
+
+#~ msgid ""
+#~ "Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
+#~ "  or:  %s LONG-OPTION\n"
 #~ msgstr ""
-#~ "Semua argumen ke pilihan panjang adalah wajib untuk pilihan pendek.\n"
+#~ "Penggunaan: %s [PILIHAN-PENDEK]... PERINTAH PENGGUNA [ARGUMEN]...\n"
+#~ "  atau:     %s PILIHAN-PANJANG\n"
 
 #~ msgid ""
+#~ "Drop any supplemental groups, assume the user-ID and group-ID of the "
+#~ "specified\n"
+#~ "USER (numeric ID or user name), and run COMMAND with any specified "
+#~ "ARGUMENTs.\n"
+#~ "Exit with status 111 if unable to assume the required user and group ID.\n"
+#~ "Otherwise, exit with the exit status of COMMAND.\n"
+#~ "This program is useful only when run by root (user ID zero).\n"
 #~ "\n"
-#~ "RADIX is d for decimal, o for octal, x for hexadecimal or n for none.\n"
-#~ "BYTES is hexadecimal with 0x or 0X prefix, and may have a multiplier "
-#~ "suffix:\n"
-#~ "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
-#~ "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n"
-#~ "Adding a z suffix to any type displays printable characters at the end of "
-#~ "each\n"
-#~ "output line.\n"
 #~ msgstr ""
+#~ "Tinggalkan grup tambahan apapun, asumsikan ID pengguna dan ID grup dari "
+#~ "yang dispesifikasikan\n"
+#~ "PENGGUNA (ID numerik atau nama pengguna), dan jalankan PERINTAH dengan "
+#~ "spesifikasi ARGUMEN.\n"
+#~ "Keluar dengan status 111 jika tidak dapat mengasumsikan ID pengguna dan "
+#~ "grup yang dibutuhkan.\n"
+#~ "Jika tidak, keluar dengan status keluar dari PERINTAH.\n"
+#~ "Aplikasi ini hanya berguna ketika dijalankan oleh root (ID pengguna "
+#~ "nol).\n"
 #~ "\n"
-#~ "RADIX adalah d untuk desimal, o untuk oktal, x untuk heksadesimal atau n "
-#~ "untuk kosong.\n"
-#~ "BYTES adalah heksadesimal dengan awalan 0x atau 0X, dan mungkin memiliki "
-#~ "sebuah akhiran pengali:\n"
-#~ "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
-#~ "GB 1000*1000*1000, G 1024*1024*1024, dan seterusnya untuk T, P, E, Z, Y.\n"
-#~ "Menambahkan sebuah akhiran z untuk semua type karakter yang bisa "
-#~ "ditampilkan di akhir dari setiap\n"
-#~ "baris keluaran.\n"
 
 #~ msgid ""
-#~ "Option --string without a number implies 3; option --width without a "
-#~ "number\n"
-#~ "implies 32.  By default, od uses -A o -t oS -w16.\n"
+#~ "  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, "
+#~ "and\n"
+#~ "                    (if specified) supplemental group IDs to GID1, ...\n"
 #~ msgstr ""
-#~ "--string tanpa sebuah nomor mengindikasikan 3. --width tanpa sebuah "
-#~ "nomor\n"
-#~ "mengindikasikan 32. Secara default, od menggunakan -A o -t oS -w16.\n"
+#~ "  -g GID[,GID1...]  juga menset ID grup utama ke GID numerik, dan\n"
+#~ "                    (jika dispesifikasikan) tambahkan ID grup ke "
+#~ "GID1, ...\n"
 
-#~ msgid "Usage: %s [OPTION]... FILE\n"
-#~ msgstr "Penggunaan: %s [PILIHAN]... BERKAS\n"
+#~ msgid "unknown user-ID: %s"
+#~ msgstr "ID pengguna tidak diketahui: %s"
 
-#~ msgid "Password:"
-#~ msgstr "Kata sandi:"
+#~ msgid "to use user-ID %s you need to use -g too"
+#~ msgstr ""
+#~ "untuk menggunakan ID pengguna %s anda juga harus menggunakan pilihan -g"
 
-#~ msgid "getpass: cannot open /dev/tty"
-#~ msgstr "getpass: tidak dapat membuka /dev/tty"
+#~ msgid "cannot set group-ID to %lu"
+#~ msgstr "tidak dapat menset ID grup ke %lu"
 
-#~ msgid "cannot set groups"
-#~ msgstr "tidak dapat menset grup"
+#~ msgid "cannot set user-ID to %lu"
+#~ msgstr "tidak dapat menset ID pengguna ke %lu"
 
-#~ msgid "cannot set group id"
-#~ msgstr "tidak dapat menset id grup"
+#~ msgid "dup2 failed"
+#~ msgstr "dup2 gagal"
 
-#~ msgid "cannot set user id"
-#~ msgstr "tidak dapat menset id pengguna"
+#~ msgid "couldn't execute %s"
+#~ msgstr "tidak dapat menjalankan %s"
 
-#~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n"
-#~ msgstr "Penggunaan: %s [PILIHAN]... [-] [PENGGUNA [ARG]...]\n"
+#~ msgid "couldn't execute %s -d"
+#~ msgstr "tidak dapat menjalankan %s -d"
 
 #~ msgid ""
-#~ "Change the effective user id and group id to that of USER.\n"
 #~ "\n"
-#~ "  -, -l, --login               make the shell a login shell\n"
-#~ "  -c, --command=COMMAND        pass a single COMMAND to the shell with -"
-#~ "c\n"
-#~ "  -f, --fast                   pass -f to the shell (for csh or tcsh)\n"
-#~ "  -m, --preserve-environment   do not reset environment variables\n"
-#~ "  -p                           same as -m\n"
-#~ "  -s, --shell=SHELL            run SHELL if /etc/shells allows it\n"
+#~ "Report %s bugs to %s\n"
 #~ msgstr ""
-#~ "Ubah efektif id pengguna dan id grup ke PENGGUNA.\n"
 #~ "\n"
-#~ "  -, -l, --login               buat shell sebagai sebuah login shell\n"
-#~ "  -c, --command=COMMAND        lewatkan sebuah PERINTAH tunggak ke shell "
-#~ "dengan -c\n"
-#~ "  -f, --fast                   lewatkan -f ke shell (untuk csh dan tcsh)\n"
-#~ "  -m, --preserve-environment   jangan mereset variabel lingkungan\n"
-#~ "  -p                           sama seperti -m\n"
-#~ "  -s, --shell=SHELL            jalankan SHELL jika /etc/shells "
-#~ "membolehkannya\n"
+#~ "Laporkan %s bugs ke %s\n"
+
+#~ msgid "warning: --retry is useful mainly when following by name"
+#~ msgstr "peringatan: --retry hanya berguna ketik diikuti dengan nama"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
+#~ "                        delimit-method={none(default),prepend,separate}\n"
+#~ "                        Delimiting is done with blank lines\n"
+#~ "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+#~ "  -i, --ignore-case     ignore differences in case when comparing\n"
+#~ "  -s, --skip-chars=N    avoid comparing the first N characters\n"
+#~ "  -u, --unique          only print unique lines\n"
+#~ "  -z, --zero-terminated  end lines with 0 byte, not newline\n"
+#~ msgstr ""
+#~ "  -D, --all-repeated[=delimit-method]  menampilkan seluruh baris "
+#~ "duplikasi\n"
+#~ "                        delimit-method={none(default),prepend,separate}\n"
+#~ "                        Delimiting selesai dengan baris kosong.\n"
+#~ "  -f, --skip-fields=N   hindari membandingkan bagian N pertama\n"
+#~ "  -i, --ignore-case     abaikan perbedaan dalam case dalam membandingkan\n"
+#~ "  -s, --skip-chars=N    hindari perbandingan karakter N pertama\n"
+#~ "  -u, --unique          hanya menampilkan baris unik\n"
+#~ "  -z, --zero-termintaed akhir baris dengan 0 byte, bukan baris baru\n"
 
 #~ msgid ""
+#~ "  -w, --wrap=COLS       Wrap encoded lines after COLS character (default "
+#~ "76).\n"
+#~ "                        Use 0 to disable line wrapping.\n"
+#~ "\n"
+#~ "  -d, --decode          Decode data.\n"
+#~ "  -i, --ignore-garbage  When decoding, ignore non-alphabet characters.\n"
 #~ "\n"
-#~ "A mere - implies -l.   If USER not given, assume root.\n"
 #~ msgstr ""
+#~ "  -w, --wrap=COLS       Wrap baris yang terenkode setelah COLS karakter "
+#~ "(default 76).\n"
+#~ "                        Gunakan 0 untuk menonaktifkan wrapping baris.\n"
+#~ "\n"
+#~ "  -d, --decode          Dekode data.\n"
+#~ "  -i, --ignore-garbage  Ketika mendekode, abaikan karakter bukan "
+#~ "alphabet.\n"
 #~ "\n"
-#~ "Sebuah - mengindikasikan -l. Jika PENGGUNA tidak diberikan, asumsikan "
-#~ "root.\n"
-
-#~ msgid "user %s does not exist"
-#~ msgstr "pengguna %s tidak ada"
-
-#~ msgid "incorrect password"
-#~ msgstr "kata kunci tidak benar"
 
-#~ msgid "using restricted shell %s"
-#~ msgstr "menggunakan shell %s terbatas"
+#~ msgid ""
+#~ "\n"
+#~ "Examples:\n"
+#~ "  %s /usr/bin/sort       Output \"sort\".\n"
+#~ "  %s include/stdio.h .h  Output \"stdio\".\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Contoh:\n"
+#~ "  %s /usr/bin/sort       Keluaran \"sort\".\n"
+#~ "  %s include/stdio.h     Keluaran \"stdio\".\n"
 
-#~ msgid "warning: cannot change directory to %s"
-#~ msgstr "peringatan: tidak dapat pindah ke direktori %s"
+#~ msgid "%s"
+#~ msgstr "%s"
 
-#, fuzzy
 #~ msgid ""
 #~ "Change the group of each FILE to GROUP.\n"
 #~ "With --reference, change the group of each FILE to that of RFILE.\n"
 #~ "\n"
 #~ "  -c, --changes          like verbose but report only when a change is "
 #~ "made\n"
-#~ "  -f, --silent, --quiet  suppress most error messages\n"
-#~ "  -v, --verbose          output a diagnostic for every file processed\n"
+#~ "      --dereference      affect the referent of each symbolic link (this "
+#~ "is\n"
+#~ "                         the default), rather than the symbolic link "
+#~ "itself\n"
 #~ msgstr ""
 #~ "Ubah grup dari setiap BERKAS ke GRUP.\n"
 #~ "Dengan --reference, ubah grup dari setiap BERKAS ke RFILE.\n"
@@ -12839,13 +12924,6 @@ msgstr ""
 #~ "                         default), daripada link simbolik itu sendiri\n"
 
 #~ msgid ""
-#~ "      --no-preserve-root  do not treat `/' specially (the default)\n"
-#~ "      --preserve-root     fail to operate recursively on `/'\n"
-#~ msgstr ""
-#~ "      --no-preserve-root  jangan perlakukan `/' secara spesial (default)\n"
-#~ "      --preserve-root     gagal untuk beroperasi secara rekursif di `/'\n"
-
-#~ msgid ""
 #~ "  -f, --silent, --quiet  suppress most error messages\n"
 #~ "      --reference=RFILE  use RFILE's group rather than specifying a\n"
 #~ "                         GROUP value\n"
@@ -12875,6 +12953,13 @@ msgstr ""
 #~ "ada perubahan terjadi\n"
 
 #~ msgid ""
+#~ "      --no-preserve-root  do not treat `/' specially (the default)\n"
+#~ "      --preserve-root     fail to operate recursively on `/'\n"
+#~ msgstr ""
+#~ "      --no-preserve-root  jangan perlakukan `/' secara spesial (default)\n"
+#~ "      --preserve-root     gagal untuk beroperasi secara rekursif di `/'\n"
+
+#~ msgid ""
 #~ "  -f, --silent, --quiet   suppress most error messages\n"
 #~ "  -v, --verbose           output a diagnostic for every file processed\n"
 #~ "      --reference=RFILE   use RFILE's mode instead of MODE values\n"
@@ -12924,6 +13009,21 @@ msgstr ""
 #~ "berkas yang diproses\n"
 #~ "\n"
 
+#~ msgid "reading %s"
+#~ msgstr "membaca %s"
+
+#~ msgid "writing %s"
+#~ msgstr "menulis %s"
+
+#~ msgid "closing %s"
+#~ msgstr "menutup %s"
+
+#~ msgid "accessing %s"
+#~ msgstr "mengakses %s"
+
+#~ msgid "invalid format precision"
+#~ msgstr "format presisi tidak valid"
+
 #~ msgid ""
 #~ "Display the current time in the given FORMAT, or set the system date.\n"
 #~ "\n"
@@ -12938,45 +13038,46 @@ msgstr ""
 #~ "  -f, --file=DATEFILE       seperti --date sekali untuk setiap baris dari "
 #~ "DATEFILE\n"
 
+#~ msgid "opening %s"
+#~ msgstr "membuka %s"
+
 #~ msgid ""
-#~ "\n"
-#~ "SIZE may be (or may be an integer optionally followed by) one of "
-#~ "following:\n"
-#~ "KB 1000, K 1024, MB 1000*1000, M 1024*1024, and so on for G, T, P, E, Z, "
-#~ "Y.\n"
+#~ "Usage: %s NAME\n"
+#~ "  or:  %s OPTION\n"
 #~ msgstr ""
-#~ "\n"
-#~ "BESAR mungkin (atau mungkin sebuah integer dan opsional diikuti oleh) "
-#~ "satu dari berikut:\n"
-#~ "KB 1000, K 1024, MB 1000*1000, M 1024*1024, dan selanjutnya untuk G, T, "
-#~ "P, E, Z, Y.\n"
+#~ "Penggunaan: %s NAMA\n"
+#~ "  atau:     %s PILIHAN\n"
 
 #~ msgid ""
-#~ "  -w, --wrap=COLS       Wrap encoded lines after COLS character (default "
-#~ "76).\n"
-#~ "                        Use 0 to disable line wrapping.\n"
-#~ "\n"
-#~ "  -d, --decode          Decode data.\n"
-#~ "  -i, --ignore-garbage  When decoding, ignore non-alphabet characters.\n"
 #~ "\n"
+#~ "Examples:\n"
+#~ "  %s /usr/bin/sort  Output \"/usr/bin\".\n"
+#~ "  %s stdio.h        Output \".\".\n"
 #~ msgstr ""
-#~ "  -w, --wrap=COLS       Wrap baris yang terenkode setelah COLS karakter "
-#~ "(default 76).\n"
-#~ "                        Gunakan 0 untuk menonaktifkan wrapping baris.\n"
-#~ "\n"
-#~ "  -d, --decode          Dekode data.\n"
-#~ "  -i, --ignore-garbage  Ketika mendekode, abaikan karakter bukan "
-#~ "alphabet.\n"
 #~ "\n"
+#~ "Contoh:\n"
+#~ "  %s /usr/bin/sort Keluar \"/usr/bin\".\n"
+#~ "  %s stdio.h       Keluar \".\".\n"
 
-#~ msgid "%s"
-#~ msgstr "%s"
+#~ msgid ""
+#~ "  -B, --block-size=SIZE  use SIZE-byte blocks\n"
+#~ "  -b, --bytes           equivalent to `--apparent-size --block-size=1'\n"
+#~ "  -c, --total           produce a grand total\n"
+#~ "  -D, --dereference-args  dereference only symlinks that are listed on "
+#~ "the\n"
+#~ "                          command line\n"
+#~ msgstr ""
+#~ "  -B, --block-size=SIZE  gunakan SIZE-byte blok\n"
+#~ "  -b, --bytes            sama seperti `--apparent-size --block-size=1'\n"
+#~ "  -c, --total            menghasilkan jumlah total\n"
+#~ "  -D, --dereference-args dereference hanya symlink yang terdaftar di\n"
+#~ "                         baris perintah\n"
 
-#~ msgid "cannot create link %s"
-#~ msgstr "tidak dapat membuat link %s"
+#~ msgid "using arbitrary-precision arithmetic"
+#~ msgstr "menggunakan aritmetik arbitrary-precision"
 
-#~ msgid "invalid format precision"
-#~ msgstr "format presisi tidak valid"
+#~ msgid "using single-precision arithmetic"
+#~ msgstr "menggunakan aritmetik single-precision"
 
 #~ msgid ""
 #~ "WARNING: --preserve_context is deprecated; use --preserve-context instead"
@@ -12996,12 +13097,72 @@ msgstr ""
 #~ msgid "creating hard link %s => %s"
 #~ msgstr "membuat link keras %s => %s"
 
+#~ msgid ""
+#~ "WARNING: --page-increment is deprecated; use --line-increment instead"
+#~ msgstr ""
+#~ "PERINGATAN: --page-increment sudah ditinggalkan; lebih baik gunakan --"
+#~ "line-increment"
+
+#~ msgid "All arguments to long options are mandatory for short options.\n"
+#~ msgstr ""
+#~ "Semua argumen ke pilihan panjang adalah wajib untuk pilihan pendek.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "RADIX is d for decimal, o for octal, x for hexadecimal or n for none.\n"
+#~ "BYTES is hexadecimal with 0x or 0X prefix, and may have a multiplier "
+#~ "suffix:\n"
+#~ "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
+#~ "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n"
+#~ "Adding a z suffix to any type displays printable characters at the end of "
+#~ "each\n"
+#~ "output line.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "RADIX adalah d untuk desimal, o untuk oktal, x untuk heksadesimal atau n "
+#~ "untuk kosong.\n"
+#~ "BYTES adalah heksadesimal dengan awalan 0x atau 0X, dan mungkin memiliki "
+#~ "sebuah akhiran pengali:\n"
+#~ "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
+#~ "GB 1000*1000*1000, G 1024*1024*1024, dan seterusnya untuk T, P, E, Z, Y.\n"
+#~ "Menambahkan sebuah akhiran z untuk semua type karakter yang bisa "
+#~ "ditampilkan di akhir dari setiap\n"
+#~ "baris keluaran.\n"
+
+#~ msgid ""
+#~ "Option --string without a number implies 3; option --width without a "
+#~ "number\n"
+#~ "implies 32.  By default, od uses -A o -t oS -w16.\n"
+#~ msgstr ""
+#~ "--string tanpa sebuah nomor mengindikasikan 3. --width tanpa sebuah "
+#~ "nomor\n"
+#~ "mengindikasikan 32. Secara default, od menggunakan -A o -t oS -w16.\n"
+
+#~ msgid "Usage: %s [OPTION]... FILE\n"
+#~ msgstr "Penggunaan: %s [PILIHAN]... BERKAS\n"
+
 #~ msgid "extra operand %s\n"
 #~ msgstr "ekstra operand %s\n"
 
 #~ msgid "both SI and IEC prefixes present on units"
 #~ msgstr "baik awalan SI dan IEC ada dalam satuan"
 
+#~ msgid ""
+#~ "  -a, --suffix-length=N   use suffixes of length N (default %d)\n"
+#~ "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
+#~ "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output "
+#~ "file\n"
+#~ "  -d, --numeric-suffixes  use numeric suffixes instead of alphabetic\n"
+#~ "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
+#~ msgstr ""
+#~ "  -a, --suffix-length=N   gunakan akhiran dengan panjang N (default %d)\n"
+#~ "  -b, --bytes=SIZE        pakai UKURAN bytes untuk setiap berkas "
+#~ "keluaran\n"
+#~ "  -C, --line-bytes=SIZE   pakai di hampis UKURAN bytes dari baris setiap "
+#~ "berkas keluaran\n"
+#~ "  -d, --numeric-suffixes  gunakan akhiran numerik daripada alphabet\n"
+#~ "  -l, --lines=NUMBER      pakai JUMLAH baris setiap berkas keluaran\n"
+
 #~ msgid "invalid number of lines: 0"
 #~ msgstr "jumlah baris tidak valid: 0"
 
@@ -13012,6 +13173,76 @@ msgstr ""
 #~ "pilihan --context (-Z) adalah kadaluarsa dan akan dihilangkan\n"
 #~ "dalam release selanjutnya"
 
+#~ msgid "Password:"
+#~ msgstr "Kata sandi:"
+
+#~ msgid "getpass: cannot open /dev/tty"
+#~ msgstr "getpass: tidak dapat membuka /dev/tty"
+
+#~ msgid "cannot set groups"
+#~ msgstr "tidak dapat menset grup"
+
+#~ msgid "cannot set group id"
+#~ msgstr "tidak dapat menset id grup"
+
+#~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n"
+#~ msgstr "Penggunaan: %s [PILIHAN]... [-] [PENGGUNA [ARG]...]\n"
+
+#~ msgid ""
+#~ "Change the effective user id and group id to that of USER.\n"
+#~ "\n"
+#~ "  -, -l, --login               make the shell a login shell\n"
+#~ "  -c, --command=COMMAND        pass a single COMMAND to the shell with -"
+#~ "c\n"
+#~ "  -f, --fast                   pass -f to the shell (for csh or tcsh)\n"
+#~ "  -m, --preserve-environment   do not reset environment variables\n"
+#~ "  -p                           same as -m\n"
+#~ "  -s, --shell=SHELL            run SHELL if /etc/shells allows it\n"
+#~ msgstr ""
+#~ "Ubah efektif id pengguna dan id grup ke PENGGUNA.\n"
+#~ "\n"
+#~ "  -, -l, --login               buat shell sebagai sebuah login shell\n"
+#~ "  -c, --command=COMMAND        lewatkan sebuah PERINTAH tunggak ke shell "
+#~ "dengan -c\n"
+#~ "  -f, --fast                   lewatkan -f ke shell (untuk csh dan tcsh)\n"
+#~ "  -m, --preserve-environment   jangan mereset variabel lingkungan\n"
+#~ "  -p                           sama seperti -m\n"
+#~ "  -s, --shell=SHELL            jalankan SHELL jika /etc/shells "
+#~ "membolehkannya\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "A mere - implies -l.   If USER not given, assume root.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Sebuah - mengindikasikan -l. Jika PENGGUNA tidak diberikan, asumsikan "
+#~ "root.\n"
+
+#~ msgid "user %s does not exist"
+#~ msgstr "pengguna %s tidak ada"
+
+#~ msgid "incorrect password"
+#~ msgstr "kata kunci tidak benar"
+
+#~ msgid "using restricted shell %s"
+#~ msgstr "menggunakan shell %s terbatas"
+
+#~ msgid "warning: cannot change directory to %s"
+#~ msgstr "peringatan: tidak dapat pindah ke direktori %s"
+
+#~ msgid ""
+#~ "\n"
+#~ "SIZE may be (or may be an integer optionally followed by) one of "
+#~ "following:\n"
+#~ "KB 1000, K 1024, MB 1000*1000, M 1024*1024, and so on for G, T, P, E, Z, "
+#~ "Y.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "BESAR mungkin (atau mungkin sebuah integer dan opsional diikuti oleh) "
+#~ "satu dari berikut:\n"
+#~ "KB 1000, K 1024, MB 1000*1000, M 1024*1024, dan selanjutnya untuk G, T, "
+#~ "P, E, Z, Y.\n"
+
 #~ msgid ""
 #~ "Usage: %s [OPTION] NUMBER[SUFFIX] COMMAND [ARG]...\n"
 #~ "  or:  %s [OPTION]\n"
@@ -13196,9 +13427,6 @@ msgstr ""
 #~ msgid "FATAL: cannot return to .. from %s"
 #~ msgstr "FATAL: tidak dapat kembali ke .. dari %s"
 
-#~ msgid "cannot remove %s directory %s"
-#~ msgstr "tidak dapat menghapus %s direktori %s"
-
 #~ msgid "cannot remove root directory %s"
 #~ msgstr "tidak dapat menghapus root direktori %s"
 
diff --git a/po/it.gmo b/po/it.gmo
index 78432bfb..0d772098 100644
--- a/po/it.gmo
+++ b/po/it.gmo
diff --git a/po/it.po b/po/it.po
index a49ac9a5..54785c72 100644
--- a/po/it.po
+++ b/po/it.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU coreutils 8.14-pre1\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
 "PO-Revision-Date: 2011-10-09 10:15+0100\n"
 "Last-Translator: Giorgio Catanzaro <catanzag@gmail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -47,76 +47,124 @@ msgstr "Sono argomenti validi:"
 msgid "error closing file"
 msgstr "errore nel chiudere il file"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "errore di scrittura"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "preservazione dei permessi per %s"
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "Errore di sistema sconosciuto"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "file regolare vuoto"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "file regolare"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "directory"
 
-#: lib/file-type.c:44
-msgid "block special file"
-msgstr "file speciale a blocchi"
-
-#: lib/file-type.c:47
-msgid "character special file"
-msgstr "file speciale a caratteri"
-
-#: lib/file-type.c:50
-msgid "fifo"
-msgstr "fifo"
-
-#: lib/file-type.c:53
+#: lib/file-type.c:46
 msgid "symbolic link"
 msgstr "collegamento simbolico"
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "socket"
-
-#: lib/file-type.c:59
+#: lib/file-type.c:52
 msgid "message queue"
 msgstr "coda di messaggi"
 
-#: lib/file-type.c:62
+#: lib/file-type.c:55
 msgid "semaphore"
 msgstr "semaforo"
 
-#: lib/file-type.c:65
+#: lib/file-type.c:58
 msgid "shared memory object"
 msgstr "oggetto di memoria condivisa"
 
-#: lib/file-type.c:68
+#: lib/file-type.c:61
 msgid "typed memory object"
 msgstr "oggetto di memoria tipizzata"
 
-#: lib/file-type.c:70
+#: lib/file-type.c:66
+msgid "block special file"
+msgstr "file speciale a blocchi"
+
+#: lib/file-type.c:69
+msgid "character special file"
+msgstr "file speciale a caratteri"
+
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr ""
+
+#: lib/file-type.c:75
+msgid "fifo"
+msgstr "fifo"
+
+#: lib/file-type.c:78
+msgid "door"
+msgstr ""
+
+#: lib/file-type.c:81
+#, fuzzy
+msgid "multiplexed block special file"
+msgstr "file speciale a blocchi"
+
+#: lib/file-type.c:84
+#, fuzzy
+msgid "multiplexed character special file"
+msgstr "file speciale a caratteri"
+
+#: lib/file-type.c:87
+#, fuzzy
+msgid "multiplexed file"
+msgstr "ruoli multipli"
+
+#: lib/file-type.c:90
+#, fuzzy
+msgid "named file"
+msgstr "file strano"
+
+#: lib/file-type.c:93
+#, fuzzy
+msgid "network special file"
+msgstr "file speciale a blocchi"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr ""
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr ""
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr ""
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "socket"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr ""
+
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "file strano"
 
@@ -251,18 +299,18 @@ msgstr "%s: l'opzione «-W %s» non accetta alcun argomento\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: l'opzione «-W %s» richiede un argomento\n"
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr "impossibile cambiare i permessi di %s"
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "impossibile creare la directory %s"
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr "memoria esaurita"
@@ -379,7 +427,7 @@ msgstr "Espressione regolare troppo grande"
 msgid "Unmatched ) or \\)"
 msgstr ") o \\) non accoppiata"
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 msgid "No previous regular expression"
 msgstr "Nessuna espressione regolare precedente"
 
@@ -404,7 +452,7 @@ msgstr "usare --no-preserve-root per scavalcare questa protezione"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[sSyY]"
 
@@ -414,11 +462,11 @@ msgstr "^[sSyY]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, c-format
 msgid "setting permissions for %s"
 msgstr "impostazione dei permessi per %s"
@@ -596,18 +644,6 @@ msgstr "Mancanza alimentazione elettrica"
 msgid "Resource lost"
 msgstr "Risorsa persa"
 
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, fuzzy, c-format
-msgid "cannot create pipe"
-msgstr "impossibile creare il fifo %s"
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, fuzzy, c-format
-msgid "%s subprocess failed"
-msgstr "%s: seek non riuscito"
-
 #: lib/strsignal.c:114
 #, c-format
 msgid "Real-time signal %d"
@@ -819,7 +855,7 @@ msgstr ""
 msgid "Report %s bugs to: %s\n"
 msgstr "Segnalare i bug di %s a: <%s>\n"
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Sito web di %s: <%s>\n"
@@ -829,31 +865,11 @@ msgstr "Sito web di %s: <%s>\n"
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr "Sito web di %s: <http://www.gnu.org/software/%s/>\n"
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr ""
 "Aiuto sull'uso del software GNU in generale: <http://www.gnu.org/gethelp/>\n"
 
-#: lib/w32spawn.h:43
-#, fuzzy, c-format
-msgid "_open_osfhandle failed"
-msgstr "open non riuscita"
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr ""
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr ""
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr ""
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr "stdin"
@@ -875,7 +891,7 @@ msgstr "flusso sconosciuto"
 msgid "failed to reopen %s with mode %s"
 msgstr "riapertura di %s con il modo %s non riuscita"
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr "confronto tra stringhe non riuscito"
@@ -945,7 +961,7 @@ msgstr ""
 "                          Usare 0 per disabilitare l'andata a capo\n"
 "\n"
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -967,48 +983,47 @@ msgstr ""
 "aggiunta ai byte di un formale alfabeto base64. Usare --ignore-garbage per\n"
 "tentare di continuare dopo altri byte non alfabetici nel flusso codificato.\n"
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "errore di lettura"
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, c-format
 msgid "invalid input"
 msgstr "input non valido"
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, c-format
 msgid "invalid wrap size: %s"
 msgstr "dimensione di ritorno a capo non valida: %s"
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, c-format
 msgid "extra operand %s"
 msgstr "operando %s in più"
 
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, c-format
 msgid "closing standard input"
 msgstr "chiusura dello standard input"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -1039,8 +1054,8 @@ msgstr ""
 #: src/basename.c:60
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/basename.c:67
@@ -1054,32 +1069,31 @@ msgid ""
 "  %s -a any/str1 any/str2   -> \"str1\" followed by \"str2\"\n"
 msgstr ""
 
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, c-format
 msgid "missing operand"
 msgstr "operando mancante"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr "Torbjorn Granlund"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 msgid "Richard M. Stallman"
 msgstr "Richard M. Stallman"
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1138,7 +1152,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr "impossibile eseguire ioctl su %s"
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr "standard output"
@@ -1155,14 +1169,14 @@ msgstr "Russell Coker"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 msgid "Jim Meyering"
 msgstr "Jim Meyering"
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, c-format
 msgid "failed to create security context: %s"
 msgstr "creazione del contesto di sicurezza %s non riuscita"
@@ -1173,8 +1187,8 @@ msgid "failed to set %s security context component to %s"
 msgstr ""
 "impostazione del componente del contesto di sicurezza %s in %s non riuscita"
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, c-format
 msgid "failed to get security context of %s"
 msgstr "recupero del contesto di sicurezza di %s non riuscito"
@@ -1185,18 +1199,18 @@ msgid "can't apply partial context to unlabeled file %s"
 msgstr ""
 "non è possibile applicare un contesto parziale al file non etichettato %s"
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, c-format
 msgid "failed to change context of %s to %s"
 msgstr "cambio del contesto di %s in %s non riuscito"
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
 msgstr "impossibile accedere a %s"
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, c-format
 msgid "cannot read directory %s"
 msgstr "impossibile leggere la directory %s"
@@ -1206,13 +1220,14 @@ msgstr "impossibile leggere la directory %s"
 msgid "changing security context of %s\n"
 msgstr "cambio del contesto di sicurezza di %s\n"
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, c-format
 msgid "fts_read failed"
 msgstr "fts_read non riuscita"
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, c-format
 msgid "fts_close failed"
 msgstr "fts_close non riuscita"
@@ -1232,7 +1247,7 @@ msgstr ""
 #: src/chcon.c:357
 #, fuzzy
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
@@ -1269,7 +1284,7 @@ msgstr ""
 "destinazione\n"
 "\n"
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 #, fuzzy
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
@@ -1331,36 +1346,37 @@ msgstr ""
 "(predefinito)\n"
 "\n"
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr "-R --dereference richiede -H o -L"
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr "-R -h richiede -P"
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, c-format
 msgid "missing operand after %s"
 msgstr "manca l'operando dopo %s"
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, c-format
 msgid "invalid context: %s"
 msgstr "contesto non valido: %s"
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr "forniti specificatori di contesto di sicurezza in conflitto"
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, c-format
 msgid "failed to get attributes of %s"
 msgstr "recupero degli attributi di %s non riuscito"
@@ -1393,7 +1409,7 @@ msgstr ""
 "  -h, --no-dereference   interessa i collegamenti simbolici invece di ogni "
 "file referenziato\n"
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
@@ -1433,49 +1449,49 @@ msgstr ""
 "  %s -hR staff /u  Cambia il gruppo di /u e dei file contenuti in esso in "
 "\"staff\".\n"
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
 msgstr "recupero dei nuovi attributi di %s"
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr ""
 "né il collegamento simbolico %s né il file di riferimento sono cambiati\n"
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr "il modo di %s è stato cambiato da %04lo (%s) in %04lo (%s)\n"
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr "cambio del modo di %s da %04lo (%s) in %04lo (%s) non riuscito\n"
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr "il modo di %s è stato mantenuto pari a %04lo (%s)\n"
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr ""
 "impossibile operare sul collegamento simbolico con obiettivo non esistente %s"
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, c-format
 msgid "changing permissions of %s"
 msgstr "cambio dei permessi di %s"
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr "%s: i nuovi permessi sono %s, non %s"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1486,7 +1502,7 @@ msgstr ""
 "  o: %s [OPZIONE]... MODO-OTTALE FILE...\n"
 "  o: %s [OPZIONE]... --reference=RFILE FILE...\n"
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 #, fuzzy
 msgid ""
 "Change the mode of each FILE to MODE.\n"
@@ -1500,21 +1516,15 @@ msgstr ""
 "  -h, --no-dereference   interessa i collegamenti simbolici invece di ogni "
 "file referenziato\n"
 
-#: src/chmod.c:391
-#, fuzzy
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
-"      --reference=RFILE  usa il contesto di sicurezza di RFILE invece di "
-"specificare\n"
-"                         un valore CONTESTO\n"
-"  -R, --recursive        opera ricorsivamente su file e directory\n"
-"  -v, --verbose          mostra una diagnostica per ogni file elaborato\n"
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr ""
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 #, fuzzy
 msgid ""
 "\n"
@@ -1523,12 +1533,12 @@ msgstr ""
 "\n"
 "Ogni MODO è nella forma \"[ugoa]*([-+=]([rwxXst]*|[ugo]))+\".\n"
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr "non è possibile combinare i modi e le opzioni --reference"
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, c-format
 msgid "invalid mode: %s"
 msgstr "modo non valido: %s"
@@ -1674,26 +1684,21 @@ msgstr ""
 "\"root\".\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr "Roland McGrath"
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr "gruppo %s non valido"
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, c-format
 msgid "invalid group list %s"
 msgstr "elenco dei gruppi %s non valido"
 
-#: src/chroot.c:117
-#, c-format
-msgid "failed to set additional groups"
-msgstr "impostazione dei gruppi supplementari non riuscita"
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
@@ -1702,7 +1707,7 @@ msgstr ""
 "Uso: %s [OPZIONE] NUOVAROOT [COMANDO [ARG]...]\n"
 "  o: %s OPZIONE\n"
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
@@ -1710,7 +1715,7 @@ msgstr ""
 "Esegue il COMANDO con la root directory impostata a NUOVAROOT.\n"
 "\n"
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
@@ -1719,7 +1724,7 @@ msgstr ""
 "da usare\n"
 "  --groups=ELENCO_G      specifica i gruppi supplementari come g1,g2,..,gN\n"
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 #, fuzzy
 msgid ""
 "\n"
@@ -1728,28 +1733,42 @@ msgstr ""
 "\n"
 "Se non è dato alcun comando, esegue «${SHELL} -i» (predefinita: /bin/sh).\n"
 
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, c-format
 msgid "cannot change root directory to %s"
 msgstr "impossibile cambiare la root directory a %s"
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, c-format
 msgid "cannot chdir to root directory"
 msgstr "impossibile fare chdir alla root directory"
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr ""
+
+#: src/chroot.c:383
+#, fuzzy, c-format
+msgid "failed to get supplemental groups"
+msgstr "impostazione del gruppo supplementare non riuscita"
+
+#: src/chroot.c:395
+#, fuzzy, c-format
+msgid "failed to %s supplemental groups"
+msgstr "impostazione del gruppo supplementare non riuscita"
+
+#: src/chroot.c:402
 #, c-format
 msgid "failed to set group-ID"
 msgstr "impostazione dell'id di gruppo non riuscita"
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, c-format
 msgid "failed to set user-ID"
 msgstr "impostazione dell'id utente non riuscita"
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, c-format
 msgid "failed to run command %s"
 msgstr "impossibile eseguire il comando %s"
@@ -1781,7 +1800,7 @@ msgstr ""
 "Stampa il checksum CRC e la dimensione in byte di ogni FILE.\n"
 "\n"
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr "Uso: %s [OPZIONE]... FILE1 FILE2\n"
@@ -1870,305 +1889,340 @@ msgstr "specificati delimitatori multipli"
 msgid "empty %s not allowed"
 msgstr "%s vuoto non permesso"
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr "errore leggendo %s"
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, c-format
 msgid "cannot lseek %s"
 msgstr "impossibile fare lseek in %s"
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr "errore scrivendo %s"
 
 #  http://it.wikipedia.org/wiki/Extent
 #  http://it.wikipedia.org/wiki/Ext4#Extent
-#: src/copy.c:313
+#: src/copy.c:323
 #, c-format
 msgid "%s: failed to get extents info"
 msgstr "%s: recupero delle informazioni degli extent non riuscito"
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, c-format
 msgid "%s: write failed"
 msgstr "%s: scrittura non riuscita"
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, c-format
 msgid "failed to extend %s"
 msgstr "creazione dell'extent di %s non riuscita"
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, c-format
 msgid "clearing permissions for %s"
 msgstr "azzeramento dei permessi per %s"
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "impossibile preservare il proprietario di %s"
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
 msgstr "lookup del file %s non riuscito"
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, c-format
 msgid "failed to preserve authorship for %s"
 msgstr "preservazione dei diritti di %s non riuscita"
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
+#, c-format
+msgid "failed to set default file creation context to %s"
+msgstr ""
+"impostazione del contesto predefinito di creazione dei file in %s non "
+"riuscita"
+
+#: src/copy.c:820
+#, fuzzy, c-format
+msgid "failed to set default file creation context for %s"
+msgstr ""
+"impostazione del contesto predefinito di creazione dei file in %s non "
+"riuscita"
+
+#: src/copy.c:846
+#, fuzzy, c-format
+msgid "failed to set the security context of %s"
+msgstr "impostazione del contesto di sicurezza di %s in %s non riuscita"
+
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
 msgid "cannot open %s for reading"
 msgstr "impossibile aprire %s per la lettura"
 
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, c-format
 msgid "cannot fstat %s"
 msgstr "impossibile fare fstat di %s"
 
-#: src/copy.c:820
+#: src/copy.c:935
 #, c-format
 msgid "skipping file %s, as it was replaced while being copied"
 msgstr "file %s saltato perché è stato sostituito mentre veniva copiato"
 
-#: src/copy.c:850
-#, c-format
-msgid "failed to get file system create context"
-msgstr "recupero del contesto di creazione del file system non riuscito"
-
-#: src/copy.c:864
-#, c-format
-msgid "failed to set the security context of %s to %s"
-msgstr "impostazione del contesto di sicurezza di %s in %s non riuscita"
-
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
 msgid "cannot remove %s"
 msgstr "impossibile rimuovere %s"
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
 msgstr "%s rimosso\n"
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr ""
 "non è possibile scrivere attraverso il collegamento simbolico con obiettivo "
 "non esistente %s"
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, c-format
 msgid "cannot create regular file %s"
 msgstr "impossibile creare il file regolare %s"
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, c-format
 msgid "failed to clone %s from %s"
 msgstr "clonazione di %s da %s non riuscita"
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr "preservati gli orari di %s"
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
 #, fuzzy, c-format
 msgid "failed to close %s"
 msgstr "apertura di %s non riuscita"
 
-#: src/copy.c:1471
-#, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
+#: src/copy.c:1580
+#, fuzzy, c-format
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
 msgstr "%s: provare a sovrascrivere %s, ignorando il modo %04lo (%s)? "
 
-#: src/copy.c:1478
+#: src/copy.c:1581
+#, c-format
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr ""
+
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
 msgstr "%s: sovrascrivere %s? "
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr " (backup: %s)"
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr "ripristino del contesto predefinito di creazione dei file non riuscito"
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, c-format
 msgid "cannot create hard link %s to %s"
 msgstr "impossibile creare il collegamento fisico %s a %s"
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, c-format
 msgid "cannot stat %s"
 msgstr "impossibile eseguire stat di %s"
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, c-format
 msgid "omitting directory %s"
 msgstr "directory %s omessa"
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr "attenzione: il file di origine %s è stato specificato più di una volta"
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
 msgstr "%s e %s sono lo stesso file"
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr "impossibile sovrascrivere la non-directory %s con la directory %s"
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr "%s appena creato non sarà sovrascritto da %s"
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr "impossibile sovrascrivere la directory %s con una non-directory"
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr "impossibile spostare una directory in una non-directory: %s -> %s"
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr "il backup di %s distruggerebbe l'origine; %s non spostato"
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr "il backup di %s distruggerebbe l'origine; %s non copiato"
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
 msgstr "impossibile fare il backup di %s"
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr ""
 "non sarà copiato %s attraverso il collegamento simbolico %s appena creato"
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr "impossibile copiare una directory, %s, dentro sé stessa, %s"
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr "impossibile creare il collegamento fisico %s alla directory %s"
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr "impossibile spostare %s in una sottodirectory di sé stessa, %s"
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, c-format
 msgid "cannot move %s to %s"
 msgstr "impossibile spostare %s in %s"
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr ""
 "spostamento tra dispositivi non riuscito: %s in %s; impossibile rimuovere\n"
 "la destinazione"
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, c-format
-msgid "failed to set default file creation context to %s"
-msgstr ""
-"impostazione del contesto predefinito di creazione dei file in %s non "
-"riuscita"
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr "impossibile copiare il collegamento simbolico ciclico %s"
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr ""
 "%s: è possibile creare collegamenti simbolici relativi solo nella directory "
 "corrente"
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr "impossibile creare il collegamento simbolico %s a %s"
 
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, c-format
 msgid "cannot create fifo %s"
 msgstr "impossibile creare il fifo %s"
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, c-format
 msgid "cannot create special file %s"
 msgstr "impossibile creare il file speciale %s"
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, c-format
 msgid "cannot read symbolic link %s"
 msgstr "impossibile leggere il collegamento simbolico %s"
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, c-format
 msgid "cannot create symbolic link %s"
 msgstr "impossibile creare il collegamento simbolico %s"
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
 msgstr "%s presenta un tipo di file sconosciuto"
 
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, c-format
 msgid "cannot un-backup %s"
 msgstr "impossibile annullare il backup di %s"
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr "%s -> %s (annullamento backup)\n"
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr ""
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr ""
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, fuzzy, c-format
+msgid "unknown program %s"
+msgstr "flusso sconosciuto"
+
+#: src/cp.c:157 src/mv.c:288
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -2179,14 +2233,14 @@ msgstr ""
 "  o: %s [OPZIONE]... ORIGINE... DIRECTORY\n"
 "  o: %s [OPZIONE]... -t DIRECTORY ORIGINE...\n"
 
-#: src/cp.c:162
+#: src/cp.c:163
 #, fuzzy
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 "Copia ORIGINE su DEST, od ORIGINI multiple su DIRECTORY.\n"
 "\n"
 
-#: src/cp.c:168
+#: src/cp.c:169
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
 "      --attributes-only        don't copy the file data, just the "
@@ -2209,7 +2263,7 @@ msgstr ""
 "contenuto dei file speciali\n"
 "  -d                           come --no-dereference --preserve=links\n"
 
-#: src/cp.c:177
+#: src/cp.c:178
 #, fuzzy
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
@@ -2232,7 +2286,7 @@ msgstr ""
 "  -H                           segue i collegamenti simbolici sulla riga di "
 "comando in ORIGINE\n"
 
-#: src/cp.c:186
+#: src/cp.c:187
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
 "  -L, --dereference            always follow symbolic links in SOURCE\n"
@@ -2242,7 +2296,7 @@ msgstr ""
 "  -L, --dereference            segue sempre i collegamenti simbolici in "
 "ORIGINE\n"
 
-#: src/cp.c:190
+#: src/cp.c:191
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
 "                                 a previous -i option)\n"
@@ -2254,7 +2308,7 @@ msgstr ""
 "  -P, --no-dereference         non segue mai i collegamenti simbolici in "
 "ORIGINE\n"
 
-#: src/cp.c:195
+#: src/cp.c:196
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
 "      --preserve[=ATTR_LIST]   preserve the specified attributes (default:\n"
@@ -2270,7 +2324,7 @@ msgstr ""
 "                                 gli attributi addizionali: context, links, "
 "xattr, all\n"
 
-#: src/cp.c:203
+#: src/cp.c:204
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                use full source file name under DIRECTORY\n"
@@ -2279,7 +2333,7 @@ msgstr ""
 "      --parents                utilizza il nome completo della sorgente "
 "sotto DIRECTORY\n"
 
-#: src/cp.c:207
+#: src/cp.c:208
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
 "      --reflink[=WHEN]         control clone/CoW copies. See below\n"
@@ -2294,7 +2348,7 @@ msgstr ""
 "                                 prima di cercare di aprirlo (al contrario\n"
 "                                 con --force)\n"
 
-#: src/cp.c:213
+#: src/cp.c:214
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
 "      --strip-trailing-slashes  remove any trailing slashes from each "
@@ -2307,7 +2361,7 @@ msgstr ""
 "parametro\n"
 "                                 ORIGINE\n"
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -2321,7 +2375,7 @@ msgstr ""
 "      --target-directory=DIRECTORY  copia ogni ORIGINE in DIRECTORY\n"
 "  -T, --no-target-directory    tratta DEST come un file normale\n"
 
-#: src/cp.c:224
+#: src/cp.c:225
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
 "                                 than the destination file or when the\n"
@@ -2334,7 +2388,15 @@ msgstr ""
 "  -v, --verbose                spiega cosa sta facendo\n"
 "  -x, --one-file-system        rimane su questo file system\n"
 
-#: src/cp.c:233
+#: src/cp.c:232
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/cp.c:240
 msgid ""
 "\n"
 "By default, sparse SOURCE files are detected by a crude heuristic and the\n"
@@ -2362,7 +2424,7 @@ msgstr ""
 "la copia\n"
 "fallisce o, se è specificato --reflink=auto, ritorna a una copia standard.\n"
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 #, fuzzy
 msgid ""
 "\n"
@@ -2380,7 +2442,7 @@ msgstr ""
 "sono:\n"
 "\n"
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2392,7 +2454,7 @@ msgstr ""
 "  existing, nil   numerati se esistono backup numerati, altrimenti semplici\n"
 "  simple, never   fa sempre backup semplici\n"
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2405,93 +2467,105 @@ msgstr ""
 "force e backup e ORIGINE e DEST sono lo stesso nome di un file regolare già\n"
 "esistente.\n"
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, c-format
 msgid "failed to preserve times for %s"
 msgstr "impossibile preservare gli orari di %s"
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, c-format
 msgid "failed to preserve permissions for %s"
 msgstr "impossibile preservare i permessi di %s"
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, c-format
 msgid "cannot make directory %s"
 msgstr "impossibile creare la directory %s"
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr "%s esiste ma non è una directory"
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
 #, fuzzy, c-format
 msgid "failed to access %s"
 msgstr "apertura di %s non riuscita"
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, c-format
 msgid "missing file operand"
 msgstr "manca il file operando"
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, c-format
 msgid "missing destination file operand after %s"
 msgstr "manca l'operando per il file di destinazione dopo %s"
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr ""
 "impossibile combinare --target-directory (-t) e --no-target-directory (-T)"
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, c-format
 msgid "target %s is not a directory"
 msgstr "l'obiettivo %s non è una directory"
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr "con --parents, la destinazione deve essere una directory"
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, c-format
 msgid "multiple target directories specified"
 msgstr "specificate directory multiple di destinazione"
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, fuzzy, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr ""
+"ATTENZIONE: ignorato --context (-Z); questo non è un kernel con SELinux "
+"abilitato"
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr "impossibile creare contemporaneamente collegamenti fisici e simbolici"
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr "le opzioni --backup e --no-clobber sono mutualmente esclusive"
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr "--reflink può essere usato solo con --sparse=auto"
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr "tipo di backup"
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, fuzzy, c-format
+msgid "cannot set target context and preserve it"
+msgstr "impossibile forzare il contesto destinazione in %s e preservarlo"
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr ""
 "impossibile preservare un contesto di sicurezza senza un kernel con SELinux "
 "abilitato"
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr ""
@@ -2499,131 +2573,131 @@ msgstr ""
 "per xattr"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr "Stuart Kemp"
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr "l'input è scomparso"
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr "%s: numero di riga fuori dall'intervallo"
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, c-format
 msgid "%s: %s: line number out of range"
 msgstr "%s: %s: numero di riga fuori dall'intervallo"
 
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, c-format
 msgid " on repetition %s\n"
 msgstr " su ripetizione %s\n"
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, c-format
 msgid "%s: %s: match not found"
 msgstr "%s: %s: corrispondenza non trovata"
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr "errore nella ricerca con espressione regolare"
 
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, c-format
 msgid "write error for %s"
 msgstr "errore di scrittura per %s"
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, c-format
 msgid "%s: integer expected after delimiter"
 msgstr "%s: intero atteso dopo il delimitatore"
 
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, fuzzy, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr "%s: \"}\" è richiesto nel conteggio delle ripetizioni"
 
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, fuzzy, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr "%s}: intero richiesto tra \"{\" e \"}\""
 
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, fuzzy, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr "%s: manca il delimitatore di chiusura \"%c\""
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr "%s: espressione regolare non valida: %s"
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr "%s: modello non valido"
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr "%s: il numero di riga deve essere maggiore di zero"
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr "il numero di riga %s è più piccolo del numero di riga precedente, %s"
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr "attenzione: il numero di riga %s è lo stesso del precedente"
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr "manca lo specificatore di conversione nel suffisso"
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr "specificatore di conversione non valido nel suffisso: %c"
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr "specificatore di conversione non valido nel suffisso: \\%.3o"
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr "flag non validi nella specifica di conversione: %%%c%c"
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr "troppe specifiche di conversione %% nel suffisso"
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr "manca la specifica di conversione %% nel suffisso"
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr "%s: numero non valido"
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr "Uso: %s [OPZIONE]... FILE MODELLO...\n"
 
-#: src/csplit.c:1455
+#: src/csplit.c:1483
 #, fuzzy
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
@@ -2634,7 +2708,7 @@ msgstr ""
 "e stampa su stdout la dimensione in byte di ogni parte.\n"
 "\n"
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, fuzzy, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2646,7 +2720,11 @@ msgstr ""
 "  -f, --prefix=PREFISSO      usa PREFISSO invece di \"xx\"\n"
 "  -k, --keep-files           non rimuove i file di uscita in caso di errori\n"
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr ""
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
@@ -2658,7 +2736,7 @@ msgstr ""
 "file di output\n"
 "  -z, --elide-empty-files    rimuove i file di output vuoti\n"
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
@@ -2666,7 +2744,7 @@ msgstr ""
 "\n"
 "Legge da standard input se FILE è -. Ogni MODELLO può essere:\n"
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 #, fuzzy
 msgid ""
 "\n"
@@ -2696,23 +2774,19 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr "David M. Ihnat"
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr "campi e posizioni sono numerati da 1"
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr "Uso: %s [OPZIONE]... [FILE]...\n"
 
-#: src/cut.c:193
+#: src/cut.c:176
 #, fuzzy
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr ""
 "Stampa le parti di riga selezionate da ogni FILE sullo standard ouput.\n"
 "\n"
 
-#: src/cut.c:199
+#: src/cut.c:182
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
 "  -c, --characters=LIST   select only these characters\n"
@@ -2723,7 +2797,7 @@ msgstr ""
 "  -d, --delimiter=DELIM   usa DELIM invece di TAB come delimitatore di "
 "campo\n"
 
-#: src/cut.c:204
+#: src/cut.c:187
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
 "                            that contains no delimiter character, unless\n"
@@ -2737,7 +2811,7 @@ msgstr ""
 "                            meno che non sia specificata l'opzione -s\n"
 "  -n (ignorato)\n"
 
-#: src/cut.c:210
+#: src/cut.c:193
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
 "                            or fields\n"
@@ -2745,7 +2819,7 @@ msgstr ""
 "      --complement        complementa l'insieme dei byte, caratteri\n"
 "                            o campi selezionati\n"
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
@@ -2757,7 +2831,7 @@ msgstr ""
 "                            il comportamento predefinito è di utilizzare il "
 "delimitatore di input\n"
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2770,7 +2844,7 @@ msgstr ""
 "o da più intervalli separati da virgole. I dati selezionati in ingresso\n"
 "sono scritti soltanto una volta nello stesso ordine in cui sono letti.\n"
 
-#: src/cut.c:227
+#: src/cut.c:210
 msgid ""
 "Each range is one of:\n"
 "\n"
@@ -2790,49 +2864,53 @@ msgstr ""
 "\n"
 "Senza FILE, o quando FILE è -, legge lo standard input.\n"
 
-#: src/cut.c:367 src/cut.c:493
+#: src/cut.c:300 src/cut.c:394
 #, fuzzy
 msgid "invalid byte, character or field list"
 msgstr "elenco di campi o byte non valido"
 
-#: src/cut.c:387
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr "campi e posizioni sono numerati da 1"
+
+#: src/cut.c:320
 msgid "invalid range with no endpoint: -"
 msgstr "intervallo non valido senza punto finale: -"
 
-#: src/cut.c:403
+#: src/cut.c:334
 msgid "invalid decreasing range"
 msgstr "intervallo decrescente non valido"
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, c-format
 msgid "byte offset %s is too large"
 msgstr "l'offset in byte %s è troppo grande"
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, c-format
 msgid "field number %s is too large"
 msgstr "il numero di campo %s è troppo grande"
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr "può essere specificato solo un tipo di elenco"
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr "il delimitatore deve essere un singolo carattere"
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr "è necessario specificare una elenco di byte, caratteri o campi"
 
-#: src/cut.c:850
+#: src/cut.c:790
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr ""
 "è possibile specificare un delimitatore di input solo quando si opera sui "
 "campi"
 
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
@@ -2840,11 +2918,11 @@ msgstr ""
 "eliminare le righe non delimitate ha senso\n"
 "\tsolo quando si sta operando sui campi"
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr "manca l'elenco dei campi"
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr "manca l'elenco delle posizioni"
 
@@ -2891,7 +2969,7 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 "      --rfc-3339=TIMESPEC   stampa data e ora nel formato RFC 3339.\n"
 "                            TIMESPEC=\"date\", \"seconds\", o \"ns\" per\n"
@@ -3117,10 +3195,10 @@ msgstr ""
 "degli USA\n"
 "  $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n"
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr "standard input"
@@ -3164,7 +3242,7 @@ msgstr ""
 msgid "cannot set date"
 msgstr "impossibile impostare la data"
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, c-format
 msgid "time %s is out of range"
 msgstr "l'orario %s è fuori dal limite"
@@ -3175,7 +3253,7 @@ msgstr "l'orario %s è fuori dal limite"
 msgid "Paul Rubin"
 msgstr "Paul Rubin"
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
@@ -3184,7 +3262,7 @@ msgstr ""
 "Uso: %s [OPERANDO]...\n"
 "  o: %s OPZIONE\n"
 
-#: src/dd.c:526
+#: src/dd.c:532
 #, fuzzy
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
@@ -3204,7 +3282,7 @@ msgstr ""
 "  count=BLOCCHI   copia dall'input solo BLOCCHI blocchi\n"
 "  ibs=BYTE        legge BYTE byte per volta (predefinito: 512)\n"
 
-#: src/dd.c:535
+#: src/dd.c:541
 #, fuzzy
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
@@ -3228,7 +3306,7 @@ msgstr ""
 "dell'input\n"
 "  status=noxfer   nasconde le statistiche di trasferimento\n"
 
-#: src/dd.c:546
+#: src/dd.c:552
 #, fuzzy
 msgid ""
 "\n"
@@ -3248,7 +3326,7 @@ msgstr ""
 "Ogni simbolo CONV può essere:\n"
 "\n"
 
-#: src/dd.c:555
+#: src/dd.c:561
 #, fuzzy
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
@@ -3276,7 +3354,7 @@ msgstr ""
 "  sync      riempie ogni blocco in input con NUL sino a ibs; se usato\n"
 "            con block o unblock, riempie con spazi invece che con NUL\n"
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -3292,7 +3370,7 @@ msgstr ""
 "  fdatasync  scrive fisicamente i dati del file di output prima di finire\n"
 "  fsync     similmente, ma scrive anche i metadati\n"
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -3306,75 +3384,75 @@ msgstr ""
 "  append    modalità append (ha senso solo per l'output; suggerito "
 "conv=notrunc)\n"
 
-#: src/dd.c:583
+#: src/dd.c:589
 msgid "  cio       use concurrent I/O for data\n"
 msgstr "  cio       utilizza I/O concorrente per i dati\n"
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr "  direct    utilizza I/O diretto per i dati\n"
 
-#: src/dd.c:587
+#: src/dd.c:593
 msgid "  directory  fail unless a directory\n"
 msgstr "  directory  fallisce a meno che non sia una directory\n"
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr "  dsync     utilizza I/O sincronizzato per i dati\n"
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr "  sync      similmente, ma anche per metadati\n"
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr "  fullblock  accumula blocchi pieni di input (solo iflag)\n"
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr "  nonblock  utilizza I/O non bloccante\n"
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr "  noatime   non aggiorna l'orario di accesso\n"
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr "  nocache   scarta i dati nella cache\n"
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr "  noctty    non assegna il controllo del terminale da file\n"
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr "  nofollow  non segue i collegamenti simbolici\n"
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr "  nolinks   fallisce per collegamenti multipli\n"
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr "  binary    utilizza I/O binario per i dati\n"
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr "  text      utilizza I/O testuale per i dati\n"
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr ""
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3403,7 +3481,17 @@ msgstr ""
 "Le opzioni sono:\n"
 "\n"
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr "memoria esaurita da un buffer di input di dimensione %zu byte (%s)"
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr "memoria esaurita da un buffer di output di dimensione %zu byte (%s)"
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
@@ -3412,21 +3500,21 @@ msgstr ""
 "%<PRIuMAX>+%<PRIuMAX> record dentro\n"
 "%<PRIuMAX>+%<PRIuMAX> record fuori\n"
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
 msgstr[0] "%<PRIuMAX> record troncato\n"
 msgstr[1] "%<PRIuMAX> record troncati\n"
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
 msgstr[0] "%<PRIuMAX> byte (%s) copiato"
 msgstr[1] "%<PRIuMAX> byte (%s) copiati"
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr "B illimitato"
 
@@ -3440,83 +3528,83 @@ msgstr "B illimitato"
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
 msgstr ", %g s, %s/s\n"
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, c-format
 msgid "closing input file %s"
 msgstr "chiusura del file di input %s"
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr "chiusura del file di output %s"
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr "disattivazione di O_DIRECT non riuscita: %s"
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, c-format
 msgid "writing to %s"
 msgstr "scrittura di %s"
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, c-format
 msgid "unrecognized operand %s"
 msgstr "operando %s non riconosciuto"
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 msgid "invalid conversion"
 msgstr "conversione non valida"
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 msgid "invalid input flag"
 msgstr "flag di input non valido"
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 msgid "invalid output flag"
 msgstr "flag di output non valido"
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 msgid "invalid status flag"
 msgstr "flag di stato non valido"
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, c-format
 msgid "invalid number %s"
 msgstr "numero %s non valido"
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr "non è possibile combinare qualunque coppia di {ascii,ebcdic,ibm}"
 
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, c-format
 msgid "cannot combine block and unblock"
 msgstr "non è possibile combinare block e unblock"
 
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, c-format
 msgid "cannot combine lcase and ucase"
 msgstr "non è possibile combinare lcase e ucase"
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, c-format
 msgid "cannot combine excl and nocreat"
 msgstr "non è possibile combinare excl e nocreat"
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, c-format
 msgid "cannot combine direct and nocache"
 msgstr "non è possibile combinare direct e nocache"
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
@@ -3525,72 +3613,62 @@ msgstr ""
 "attenzione: si sta aggirando il bug del kernel di lseek per il file (%s)\n"
 "  di mt_type=0x%0lx -- consultare <sys/mtio.h> per l'elenco dei tipi"
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, c-format
 msgid "%s: cannot skip"
 msgstr "%s: impossibile saltare"
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, c-format
 msgid "%s: cannot seek"
 msgstr "%s: impossibile fare il seek"
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr "offset eccessivo leggendo il file %s"
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr "attenzione: offset di file non valido dopo una lettura non riuscita"
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr "non si può aggirare il bug del kernel, dopo tutto"
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, c-format
 msgid "setting flags for %s"
 msgstr "impostazione dei flag %s"
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr "memoria esaurita da un buffer di input di dimensione %zu byte (%s)"
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr "memoria esaurita da un buffer di output di dimensione %zu byte (%s)"
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr "%s: impossibile saltare all'offset specificato"
 
-#: src/dd.c:2133
+#: src/dd.c:2172
 #, fuzzy, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
 msgstr "interruzione a %<PRIuMAX> byte nel file di output %s non riuscita"
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr "fdatasync non riuscita per %s"
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
 msgstr "fsync non riuscita per %s"
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, c-format
 msgid "failed to open %s"
 msgstr "apertura di %s non riuscita"
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
@@ -3599,96 +3677,105 @@ msgstr ""
 "offset troppo grande: impossibile interrompere a una lunghezza di seek="
 "%<PRIuMAX> (%lu-byte) blocchi"
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr "interruzione a %<PRIuMAX> byte nel file di output %s non riuscita"
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, c-format
 msgid "failed to discard cache for: %s"
 msgstr "scarto della cache per %s non riuscito"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr "Paul Eggert"
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr "File system"
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr "Tipo"
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr "blocchi"
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr "Usati"
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr "Disponib."
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr "Uso%"
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr "Inode"
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr "IUsati"
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr "ILiberi"
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr "IUso%"
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr "Montato su"
 
-#: src/df.c:383
-#, c-format
-msgid "option --output: field '%s' unknown"
+#: src/df.c:207
+msgid "File"
 msgstr ""
 
-#: src/df.c:390
+#: src/df.c:387
 #, fuzzy, c-format
-msgid "option --output: field '%s' used more than once"
+msgid "option --output: field %s unknown"
+msgstr "chiusura del file di output %s"
+
+#: src/df.c:394
+#, fuzzy, c-format
+msgid "option --output: field %s used more than once"
 msgstr "attenzione: il file di origine %s è stato specificato più di una volta"
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr "Dim."
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr "Dispon."
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr "Capacità"
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
 msgstr ""
 
-#: src/df.c:1210
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr ""
+
+#: src/df.c:1384
 #, fuzzy
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
@@ -3699,17 +3786,18 @@ msgstr ""
 "\n"
 
 # (ndt) ho tolto il punto finale in -B per uniformità
-#: src/df.c:1217
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
 #, fuzzy
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
 "  -a, --all             include i file system lunghi 0 blocchi (dummy)\n"
 "  -B, --block-size=DIM  scala le dimensioni di DIM prima di stamparle. Ad "
@@ -3723,7 +3811,7 @@ msgstr ""
 "  -H, --si              similmente, ma usa multipli di 1000 invece che di "
 "1024\n"
 
-#: src/df.c:1227
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -3738,7 +3826,7 @@ msgstr ""
 "      --no-sync         non fa sync prima di recuperare le informazioni "
 "(predefinito)\n"
 
-#: src/df.c:1234
+#: src/df.c:1409
 #, fuzzy
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
@@ -3759,42 +3847,33 @@ msgstr ""
 "  -x, --exclude-type=TIPO   limita l'elenco ai file system non di tipo TIPO\n"
 "  -v                    (ignorato)\n"
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
 
-#: src/df.c:1285
+#: src/df.c:1460
 #, fuzzy, c-format
 msgid "options %s and %s are mutually exclusive"
 msgstr "le opzioni --compare (-C) e --strip sono mutualmente esclusive"
 
-#: src/df.c:1335
-#, fuzzy
-msgid "warning: "
-msgstr "Attenzione: "
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr ""
-
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr "il tipo di file system %s è stato sia selezionato che escluso"
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr "Attenzione: "
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 msgid "cannot read table of mounted file systems"
 msgstr "impossibile leggere la tabella dei file system montati"
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr "nessun file system elaborato"
@@ -3804,7 +3883,7 @@ msgstr "nessun file system elaborato"
 msgid "H. Peter Anvin"
 msgstr "H. Peter Anvin"
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr "Uso: %s [OPZIONE]... [FILE]...\n"
@@ -3895,7 +3974,7 @@ msgstr ""
 
 #: src/dirname.c:59
 #, fuzzy
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
 msgstr ""
 "  -0, --null     termina ogni riga con il byte 0 invece del ritorno a capo\n"
 
@@ -3913,7 +3992,7 @@ msgstr ""
 "  %s /usr/bin/      stampa \"/usr\".\n"
 "  %s stdio.h        stampa \".\".\n"
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -3922,18 +4001,17 @@ msgstr ""
 "Uso: %s [OPZIONE]... [FILE]...\n"
 "  o: %s [OPZIONE]... --files0-from=F\n"
 
-#: src/du.c:274
+#: src/du.c:285
 #, fuzzy
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr ""
 "Riassume l'uso del disco di ogni FILE, ricorsivamente per le directory.\n"
 "\n"
 
-#: src/du.c:280
+#: src/du.c:291
 #, fuzzy
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3952,12 +4030,12 @@ msgstr ""
 "                          interna, blocchi indiretti e simili.\n"
 
 # (ndt) anche qui ho tolto il punto finale in -B per uniformità
-#: src/du.c:289
+#: src/du.c:300
 #, fuzzy
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3979,15 +4057,16 @@ msgstr ""
 "sono elencati\n"
 "                          sulla riga di comando\n"
 
-#: src/du.c:302
+#: src/du.c:313
 #, fuzzy
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
 "      --files0-from=F   riassume l'uso del disco dei file specificati\n"
 "                           nel file F (terminati con NUL);\n"
@@ -3997,7 +4076,7 @@ msgstr ""
 "234M 2G)\n"
 "      --si              come -h, ma usa potenze di 1000 non 1024\n"
 
-#: src/du.c:310
+#: src/du.c:322
 #, fuzzy
 msgid ""
 "  -k                    like --block-size=1K\n"
@@ -4010,12 +4089,13 @@ msgstr ""
 "collegamenti fisici\n"
 "  -m                    come --block-size=1M\n"
 
-#: src/du.c:316
+#: src/du.c:328
 #, fuzzy
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
@@ -4027,7 +4107,7 @@ msgstr ""
 "  -S, --separate-dirs   non include la dimensione delle sottodirectory\n"
 "  -s, --summarize       mostra solo il totale di ogni argomento\n"
 
-#: src/du.c:322
+#: src/du.c:334
 #, fuzzy
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
@@ -4037,9 +4117,9 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
 msgstr ""
 "      --time            mostra l'orario dell'ultima modifica di ogni file "
 "nella\n"
@@ -4051,74 +4131,74 @@ msgstr ""
 "                          full-iso, long-iso, iso, +FORMATO\n"
 "                          FORMATO è interpretato come «date»\n"
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
 "  -x, --one-file-system    skip directories on different file systems\n"
 msgstr ""
 
-#: src/du.c:386
+#: src/du.c:398
 #, fuzzy
 msgid "Infinity"
 msgstr "B illimitato"
 
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr ""
-
-#: src/du.c:624
+#: src/du.c:636
 #, c-format
 msgid "fts_read failed: %s"
 msgstr "fts_read non riuscita: %s"
 
-#: src/du.c:780
+#: src/du.c:787
 #, c-format
 msgid "invalid maximum depth %s"
 msgstr "profondità massima %s non valida"
 
-#: src/du.c:809
+#: src/du.c:816
 #, fuzzy, c-format
 msgid "invalid --threshold argument '-0'"
 msgstr "l'argomento %2$s di --%1$s non è valido"
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr "impossibile riassumere e contemporaneamente mostrare tutte le voci"
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr "attenzione: riassumere è lo stesso che usare --max-depth=0"
 
-#: src/du.c:900
+#: src/du.c:911
 #, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr "attenzione: riassumere è in conflitto con --max-depth=%lu"
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 msgid "file operands cannot be combined with --files0-from"
 msgstr "gli operandi dei file non possono essere combinati con --files0-from"
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr "%s: errore di lettura"
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr ""
 "quando i nomi dei file sono letti dallo stdin, un nome come %s non è permesso"
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 msgid "invalid zero-length file name"
 msgstr "nome di file di lunghezza zero non valido"
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr "totale"
 
@@ -4231,7 +4311,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
 "Imposta nell'ambiente ogni NOME a VALORE ed esegue COMANDO.\n"
@@ -4318,16 +4398,16 @@ msgid "input line is too long"
 msgstr "la riga di input è troppo lunga"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr "Mike Parker"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr "James Youngman"
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
@@ -4336,7 +4416,7 @@ msgstr ""
 "Uso: %s ESPRESSIONE\n"
 " o:  %s OPZIONE\n"
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -4356,7 +4436,7 @@ msgstr ""
 "\n"
 "  ARG1 & ARG2       ARG1 se nessun argomento è nullo o 0, altrimenti 0\n"
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -4374,7 +4454,7 @@ msgstr ""
 "  ARG1 >= ARG2      ARG1 è maggiore o uguale ad ARG2\n"
 "  ARG1 > ARG2       ARG1 è maggiore di ARG2\n"
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
@@ -4384,7 +4464,7 @@ msgstr ""
 "  ARG1 + ARG2       somma aritmetica di ARG1 e ARG2\n"
 "  ARG1 - ARG2       differenza aritmetica di ARG1 e ARG2\n"
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -4397,7 +4477,7 @@ msgstr ""
 "  ARG1 / ARG2       quoziente aritmetico di ARG1 diviso ARG2\n"
 "  ARG1 % ARG2       resto aritmetico di ARG1 diviso ARG2\n"
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -4416,7 +4496,7 @@ msgstr ""
 "                             trovato, o 0\n"
 "  length STRINGA             lunghezza della STRINGA\n"
 
-#: src/expr.c:251
+#: src/expr.c:250
 #, fuzzy
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
@@ -4431,7 +4511,7 @@ msgstr ""
 "\n"
 "  ( ESPRESSIONE )            valore dell'ESPRESSIONE\n"
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -4449,7 +4529,7 @@ msgstr ""
 "corrispondenti\n"
 "oppure 0.\n"
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -4462,32 +4542,32 @@ msgstr ""
 "oppure 0, 2 se ESPRESSIONE non è valida sintatticamente e 3 se è avvenuto un "
 "errore.\n"
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, c-format
 msgid "syntax error"
 msgstr "errore di sintassi"
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, c-format
 msgid "error in regular expression matcher"
 msgstr "errore nel controllo dell'espressione regolare"
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, c-format
 msgid "non-integer argument"
 msgstr "argomento non intero"
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr "divisione per zero"
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr "impostare LC_ALL='C' per aggirare il problema"
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, c-format
 msgid "the strings compared were %s and %s"
 msgstr "le stringhe confrontate erano %s e %s"
@@ -4497,27 +4577,27 @@ msgstr "le stringhe confrontate erano %s e %s"
 msgid "Niels Moller"
 msgstr ""
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
 msgstr ""
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
 msgstr ""
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, c-format
 msgid "%s is not a valid positive integer"
 msgstr "%s non è un intero positivo valido"
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr "%s è troppo grande"
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
@@ -4526,7 +4606,7 @@ msgstr ""
 "Uso: %s [NUMERO]...\n"
 " o:  %s OPZIONE\n"
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
 "are specified on the command line, read them from standard input.\n"
@@ -4640,17 +4720,17 @@ msgid "invalid number of columns: %s"
 msgstr "numero di colonne non valido: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr "Padraig Brady"
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, c-format
 msgid "Usage: %s\n"
 msgstr "Uso: %s\n"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
@@ -4659,12 +4739,12 @@ msgstr ""
 "script di shell.\n"
 "\n"
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, c-format
 msgid "failed to get groups for user %s"
 msgstr "recupero dei gruppi per l'utente %s non riuscito"
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, c-format
 msgid "failed to get groups for the current process"
 msgstr "recupero dei gruppi per il processo corrente non riuscito"
@@ -4690,23 +4770,23 @@ msgstr ""
 "sul processo corrente (che potrebbe essere diverso se il database dei gruppi "
 "è cambiato).\n"
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, fuzzy, c-format
 msgid "cannot get real UID"
 msgstr "impossibile impostare l'id utente"
 
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, fuzzy, c-format
 msgid "cannot get effective GID"
 msgstr "impossibile dereferenziare %s"
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, fuzzy, c-format
 msgid "cannot get real GID"
 msgstr "impossibile impostare l'id utente"
 
 # (ndt) messa la minuscola dopo i : per uniformità
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, fuzzy, c-format
 msgid "%s: no such user"
 msgstr "%s: questo utente non esiste"
@@ -4763,58 +4843,48 @@ msgstr ""
 "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
 "GB 1000*1000*1000, G 1024*1024*1024, e così via per T, P, E, Z, Y.\n"
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr "%s: il file si è ridotto eccessivamente"
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, c-format
 msgid "%s: number of bytes is too large"
 msgstr "%s: il numero di byte è troppo grande"
 
-#: src/head.c:440
-#, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr "%s: impossibile fare lseek alla posizione originale"
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr "%s: impossibile posizionarsi all'offset %s"
 
-#: src/head.c:673
-#, fuzzy, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "%s: rimozione non riuscita"
-
-#: src/head.c:798
+#: src/head.c:423 src/tail.c:457
 #, c-format
-msgid "cannot reposition file pointer for %s"
-msgstr "impossibile reimpostare la posizione del file per %s"
+msgid "%s: cannot seek to relative offset %s"
+msgstr "%s: impossibile posizionarsi all'offset relativo %s"
 
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr "%s: %s è così grande che è impossibile rappresentarlo"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr "numero di righe"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr "numero di byte"
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr "numero di righe non valido"
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr "numero di byte non valido"
 
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, c-format
 msgid "invalid trailing option -- %c"
 msgstr "opzione finale non valida -- %c"
@@ -4860,27 +4930,34 @@ msgid "cannot determine hostname"
 msgstr "impossibile determinare il nome host"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr "Arnold Robbins"
 
-#: src/id.c:81
-#, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
-msgstr "Uso: %s [OPZIONE]... [NOMEUTENTE]\n"
+#: src/id.c:84
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]... [USER]\n"
+msgstr "Uso: %s [OPZIONE]... [UTENTE]...\n"
 
-#: src/id.c:82
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
+msgstr ""
+
+#: src/id.c:90
+#, fuzzy
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
 msgstr ""
 "Stampa informazioni sull'utente e sul gruppo di NOMEUTENTE o (se\n"
 "NOMEUTENTE è omesso) dell'utente corrente.\n"
@@ -4893,7 +4970,7 @@ msgstr ""
 "  -r, --real      stampa l'id reale invece dell'id efficace, con -ugG\n"
 "  -u, --user      stampa solo l'id efficace dell'utente\n"
 
-#: src/id.c:96
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
@@ -4901,119 +4978,130 @@ msgstr ""
 "\n"
 "Senza alcuna OPZIONE, stampa alcune utili informazioni identificative.\n"
 
-#: src/id.c:140
+#: src/id.c:151
+#, fuzzy, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr "--context (-Z) funziona solo su un kernel con SELinux abilitato"
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr "--context (-Z) funziona solo su un kernel con SELinux abilitato"
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr ""
 "impossibile stampare il contesto di sicurezza quando si specifica un utente"
 
 # (ndt) es. id -u -g - Giorgio
-#: src/id.c:178
+#: src/id.c:198
 #, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr "impossibile stampare \"solo\" più di una scelta"
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr ""
 "impossibile stampare solo i nomi o gli id reali nel formato predefinito"
 
-#: src/id.c:199
+#: src/id.c:209
+#, fuzzy, c-format
+msgid "option --zero not permitted in default format"
+msgstr ""
+"impossibile stampare solo i nomi o gli id reali nel formato predefinito"
+
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
 msgstr "impossibile recuperare il contesto del processo"
 
-#: src/id.c:224
+#: src/id.c:265
 #, fuzzy, c-format
 msgid "cannot get effective UID"
 msgstr "impossibile dereferenziare %s"
 
-#: src/id.c:311
+#: src/id.c:354
 #, fuzzy, c-format
 msgid "cannot find name for user ID %s"
 msgstr "impossibile trovare il nome dell'utente con id %lu"
 
-#: src/id.c:329
+#: src/id.c:372
 #, fuzzy, c-format
 msgid "uid=%s"
 msgstr "uid=%lu"
 
-#: src/id.c:334
+#: src/id.c:377
 #, fuzzy, c-format
 msgid " gid=%s"
 msgstr " gid=%lu"
 
-#: src/id.c:341
+#: src/id.c:384
 #, fuzzy, c-format
 msgid " euid=%s"
 msgstr " euid=%lu"
 
-#: src/id.c:349
+#: src/id.c:392
 #, fuzzy, c-format
 msgid " egid=%s"
 msgstr " egid=%lu"
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr " gruppi="
 
-#: src/id.c:393
+#: src/id.c:437
 #, c-format
 msgid " context=%s"
 msgstr " contesto=%s"
 
-#: src/install.c:373
+#: src/install.c:376
 #, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr "attenzione: %s: cambio del contesto in %s non riuscito"
 
-#: src/install.c:414
+#: src/install.c:417
 #, c-format
 msgid "creating directory %s"
 msgstr "creazione della directory %s"
 
-#: src/install.c:482
+#: src/install.c:485
 #, c-format
 msgid "cannot change ownership of %s"
 msgstr "impossibile cambiare il proprietario di %s"
 
-#: src/install.c:506
+#: src/install.c:509
 #, c-format
 msgid "cannot set time stamps for %s"
 msgstr "impossibile impostare l'orario di %s"
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, c-format
 msgid "fork system call failed"
 msgstr "chiamata di sistema fork non riuscita"
 
-#: src/install.c:531
+#: src/install.c:535
 #, c-format
 msgid "cannot run %s"
 msgstr "impossibile eseguire %s"
 
-#: src/install.c:535
+#: src/install.c:539
 #, c-format
 msgid "waiting for strip"
 msgstr "in attesa dello strip"
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr "processo di strip terminato in modo anomalo"
 
-#: src/install.c:558
+#: src/install.c:565
 #, c-format
 msgid "invalid user %s"
 msgstr "utente %s non valido"
 
-#: src/install.c:594
+#: src/install.c:601
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -5026,7 +5114,7 @@ msgstr ""
 " o:  %s [OPZIONE]... -t DIRECTORY ORIGINE...\n"
 " o:  %s [OPZIONE]... -d DIRECTORY...\n"
 
-#: src/install.c:601
+#: src/install.c:608
 #, fuzzy
 msgid ""
 "\n"
@@ -5054,7 +5142,7 @@ msgstr ""
 "Nella quarta forma, crea tutti i componenti per ogni DIRECTORY indicata.\n"
 "\n"
 
-#: src/install.c:615
+#: src/install.c:622
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
 "  -b                  like --backup but does not accept an argument\n"
@@ -5076,7 +5164,7 @@ msgstr ""
 "crea\n"
 "                        tutti i componenti delle directory specificate\n"
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -5096,7 +5184,7 @@ msgstr ""
 "  -o, --owner=PROPRIETARIO   imposta il PROPRIETARIO (solo per "
 "l'amministratore di sistema)\n"
 
-#: src/install.c:631
+#: src/install.c:638
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
 "files\n"
@@ -5120,17 +5208,21 @@ msgstr ""
 "  -T, --no-target-directory  tratta DEST come un file normale\n"
 "  -v, --verbose       stampa il nome di ogni directory creata\n"
 
-#: src/install.c:641
+#: src/install.c:648
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
-"      --preserve-context  preserva il contesto di sicurezza SELinux\n"
-"  -Z, --context=CONTEXT  imposta il contesto di sicurezza SELinux di file e "
-"directory\n"
 
-#: src/install.c:859
+#: src/install.c:696 src/unlink.c:86
+#, c-format
+msgid "cannot unlink %s"
+msgstr "impossibile scollegare %s"
+
+#: src/install.c:877
 #, c-format
 msgid ""
 "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
@@ -5138,54 +5230,42 @@ msgstr ""
 "ATTENZIONE: ignorato --preserve-context; questo non è un kernel con SELinux "
 "abilitato"
 
-#: src/install.c:869
-#, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
-msgstr ""
-"ATTENZIONE: ignorato --context (-Z); questo non è un kernel con SELinux "
-"abilitato"
-
-#: src/install.c:886
+#: src/install.c:917
 #, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr "l'opzione strip non può essere usata per installare una directory"
 
-#: src/install.c:889
+#: src/install.c:920
 #, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr ""
 "la directory di destinazione non è permessa durante l'installazione di una "
 "directory"
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr "impossibile forzare il contesto destinazione in %s e preservarlo"
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, c-format
 msgid "invalid mode %s"
 msgstr "modo %s non valido"
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr ""
 "ATTENZIONE: l'opzione --strip-program è ignorata non essendo stata "
 "specificata l'opzione -s"
 
-#: src/install.c:959
+#: src/install.c:1001
 #, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr ""
 "le opzioni --compare (-C) e --preserve-timestamps sono mutualmente esclusive"
 
-#: src/install.c:966
+#: src/install.c:1008
 #, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr "le opzioni --compare (-C) e --strip sono mutualmente esclusive"
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -5199,7 +5279,7 @@ msgstr ""
 msgid "Mike Haertel"
 msgstr "Mike Haertel"
 
-#: src/join.c:191
+#: src/join.c:195
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
 "standard output.  The default join field is the first, delimited\n"
@@ -5219,7 +5299,7 @@ msgstr ""
 "                      NUMFILE è 1 o 2. corrispondente a FILE1 o FILE2\n"
 "  -e VUOTO          sostuituisce i campi di input mancanti con VUOTO\n"
 
-#: src/join.c:200
+#: src/join.c:204
 #, fuzzy
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
@@ -5233,7 +5313,7 @@ msgstr ""
 "  -o FORMATO        rispetta il FORMATO mentre costruisce la riga di output\n"
 "  -t CAR            usa CAR come separatore dei campi di input e output\n"
 
-#: src/join.c:206
+#: src/join.c:210
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
 "  -1 FIELD          join on this FIELD of file 1\n"
@@ -5254,7 +5334,14 @@ msgstr ""
 "dei campi,\n"
 "                      stampandole senza provare ad accoppiarle\n"
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+#, fuzzy
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr ""
+"  -z, --zero-terminated     termina le righe con il byte 0, invece del "
+"ritorno a capo\n"
+
+#: src/join.c:225
 #, fuzzy
 msgid ""
 "\n"
@@ -5293,47 +5380,47 @@ msgstr ""
 "Se l'input non è ordinato e alcune righe non possono essere unite, verrà\n"
 "restituito un messaggio di avviso.\n"
 
-#: src/join.c:403
+#: src/join.c:410
 #, fuzzy, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
 msgstr "%s:%ju: non è ordinato: %.*s"
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, c-format
 msgid "invalid field number: %s"
 msgstr "numero di campo non valido: %s"
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, c-format
 msgid "invalid field specifier: %s"
 msgstr "specificatore di campo non valido: %s"
 
-#: src/join.c:877
+#: src/join.c:884
 #, c-format
 msgid "invalid file number in field spec: %s"
 msgstr "numero di file non valido nello specificatore di campo: %s"
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr "campi di unione incompatibili %lu, %lu"
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr "conflitto fra le stringhe di sostituzione per i campi vuoti"
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, c-format
 msgid "multi-character tab %s"
 msgstr "tabulatore multicarattere %s"
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr "tabulatori incompatibili"
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr "entrambi i file non possono essere lo standard input"
@@ -5457,47 +5544,47 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr "impossibile creare il collegamento %s a %s"
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr "%s: non è possibile fare un collegamento fisico a una directory"
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, c-format
 msgid "%s: cannot overwrite directory"
 msgstr "%s: impossibile sovrascrivere una directory"
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
 msgstr "%s: sostituire %s? "
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, c-format
 msgid "failed to create symbolic link %s"
 msgstr "creazione del collegamento simbolico %s non riuscita"
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr "creazione del collegamento simbolico %s a %s non riuscita"
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr "creazione del collegamento fisico a %.0s%s non riuscita"
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, c-format
 msgid "failed to create hard link %s"
 msgstr "creazione del collegamento fisico %s non riuscita"
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, c-format
 msgid "failed to create hard link %s => %s"
 msgstr "creazione del collegamento fisico %s a %s non riuscita"
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -5510,7 +5597,7 @@ msgstr ""
 " o:  %s [OPZIONE]... DEST... DIRECTORY     (3a forma)\n"
 " o:  %s [OPZIONE]... -t DIRECTORY DEST...  (4a forma)\n"
 
-#: src/ln.c:381
+#: src/ln.c:398
 #, fuzzy
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
@@ -5535,7 +5622,7 @@ msgstr ""
 "interpretato in relazione alla sua directory padre.\n"
 "\n"
 
-#: src/ln.c:394
+#: src/ln.c:411
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
 "file\n"
@@ -5557,7 +5644,7 @@ msgstr ""
 "                                può fallire anche all'amministratore)\n"
 "  -f, --force                 rimuove i file di destinazione esistenti\n"
 
-#: src/ln.c:402
+#: src/ln.c:419
 #, fuzzy
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
@@ -5581,7 +5668,7 @@ msgstr ""
 "  -s, --symbolic              crea collegamenti simbolici invece di "
 "collegamenti fisici\n"
 
-#: src/ln.c:411
+#: src/ln.c:428
 #, fuzzy
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
@@ -5597,7 +5684,7 @@ msgstr ""
 "  -T, --no-target-directory   tratta NOME_COLL come un file normale\n"
 "  -v, --verbose               stampa il nome di ciascun file collegato\n"
 
-#: src/ln.c:433
+#: src/ln.c:450
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -5610,13 +5697,13 @@ msgstr ""
 "predefinendolo a %s.\n"
 "\n"
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr ""
 "impossibile utilizzare sia --target-directory che --no-target-directory"
 
-#: src/ln.c:588
+#: src/ln.c:605
 #, fuzzy, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr "impossibile creare il collegamento simbolico %s"
@@ -5649,7 +5736,7 @@ msgstr "nome di accesso inesistente"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 msgid "%b %e  %Y"
 msgstr "%e %b  %Y"
 
@@ -5658,99 +5745,99 @@ msgstr "%e %b  %Y"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 msgid "%b %e %H:%M"
 msgstr "%e %b %H.%M"
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr ""
 "ignorato il valore non valido della variabile di ambiente QUOTING_STYLE: %s"
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr ""
 "ignorata la larghezza non valida nella variabile di ambiente COLUMNS: %s"
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr ""
 "ignorata la larghezza del tabulatore non valida nella variabile di ambiente "
 "TABSIZE: %s"
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, c-format
 msgid "invalid line width: %s"
 msgstr "larghezza della riga non valida: %s"
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, c-format
 msgid "invalid tab size: %s"
 msgstr "dimensioni di tabulazione non valide: %s"
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, c-format
 msgid "invalid time style format %s"
 msgstr "formato dello stile dell'ora %s non valido"
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 #, fuzzy
 msgid "Valid arguments are:\n"
 msgstr "Sono argomenti validi:"
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr ""
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr "errore di inizializzazione delle stringhe dei mesi"
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, c-format
 msgid "unrecognized prefix: %s"
 msgstr "prefisso non riconosciuto: %s"
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr "valore non interpretabile nella variabile di ambiente LS_COLORS"
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, c-format
 msgid "cannot open directory %s"
 msgstr "impossibile aprire la directory %s"
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, c-format
 msgid "cannot determine device and inode of %s"
 msgstr "impossibile determinare device e inode di %s"
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, c-format
 msgid "%s: not listing already-listed directory"
 msgstr "non viene elencata la directory già elencata: %s"
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, c-format
 msgid "reading directory %s"
 msgstr "lettura della directory %s"
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, c-format
 msgid "closing directory %s"
 msgstr "chiusura della directory %s"
 
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, c-format
 msgid "cannot compare file names %s and %s"
 msgstr "impossibile confrontare i nomi dei file %s e %s"
 
-#: src/ls.c:4721
+#: src/ls.c:4781
 #, fuzzy
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
@@ -5761,7 +5848,7 @@ msgstr ""
 "sort.\n"
 "\n"
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
 "  -A, --almost-all           do not list implied . and ..\n"
@@ -5776,18 +5863,18 @@ msgstr ""
 "grafici\n"
 
 # (ndt) anche qui ho tolto il punto finale alla -B per uniformità
-#: src/ls.c:4734
+#: src/ls.c:4794
 #, fuzzy
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
 "  -B, --block-size=DIM       scala le dimensioni di DIM prima di stamparle. "
@@ -5805,16 +5892,15 @@ msgstr ""
 "                               altrimenti: ordina secondo il ctime, prima il "
 "più recente\n"
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 #, fuzzy
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 "  -C                         elenca le voci per colonne\n"
@@ -5827,7 +5913,7 @@ msgstr ""
 "                               e non segue i collegamenti simbolici\n"
 "  -D, --dired                genera un output adatto al modo dired di Emacs\n"
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 #, fuzzy
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
@@ -5846,15 +5932,17 @@ msgstr ""
 "                               single-column -1, verbose -l, vertical -C\n"
 "      --full-time            come -l --time-style=full-iso\n"
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr "  -g                         come -l, ma non elenca il proprietario\n"
 
-#: src/ls.c:4763
+#: src/ls.c:4823
+#, fuzzy
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 "      --group-directories-first\n"
@@ -5863,10 +5951,11 @@ msgstr ""
 "                               di --sort=none (-U) disabilita il "
 "raggruppamento\n"
 
-#: src/ls.c:4769
+#: src/ls.c:4829
+#, fuzzy
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
@@ -5877,14 +5966,15 @@ msgstr ""
 "                               (es.: 1K 234M 2G)\n"
 "      --si                   similmente, ma usa multipli di 1000, non 1024\n"
 
-#: src/ls.c:4775
+#: src/ls.c:4835
+#, fuzzy
 msgid ""
 "  -H, --dereference-command-line\n"
 "                             follow symbolic links listed on the command "
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
@@ -5900,7 +5990,7 @@ msgstr ""
 "della shell\n"
 "                               (annullato da -a o -A)\n"
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 #, fuzzy
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
@@ -5910,7 +6000,7 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 "      --indicator-style=TIPO accoda ai nomi delle voci l'indicatore con lo "
 "stile TIPO:\n"
@@ -5921,7 +6011,7 @@ msgstr ""
 "della shell\n"
 "  -k                         come --block-size=1K\n"
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -5938,7 +6028,7 @@ msgstr ""
 "                               riferisce invece che sul collegamento stesso\n"
 "  -m                         elenca le voci separandole con virgole\n"
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -5956,12 +6046,12 @@ msgstr ""
 "  -p, --indicator-style=slash\n"
 "                             appende / come indicatore alle directory\n"
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 #, fuzzy
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -5978,7 +6068,7 @@ msgstr ""
 "                               literal, locale, shell, shell-always, c, "
 "escape\n"
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
 "  -R, --recursive            list subdirectories recursively\n"
@@ -5990,16 +6080,19 @@ msgstr ""
 "  -s, --size                 stampa la dimensione allocata in blocchi di "
 "ogni file\n"
 
-#: src/ls.c:4825
+#: src/ls.c:4886
+#, fuzzy
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 "  -S                         ordina secondo le dimensioni dei file\n"
 "      --sort=TIPO            ordina per TIPO invece che per nome: none -U,\n"
@@ -6012,17 +6105,19 @@ msgstr ""
 "specificato come\n"
 "                             chiave di ordinamento\n"
 
-#: src/ls.c:4835
+#: src/ls.c:4896
 #, fuzzy
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
 msgstr ""
 "      --time-style=STILE     con -l mostra gli orari usando lo STILE "
 "specificato:\n"
@@ -6036,7 +6131,7 @@ msgstr ""
 "effetto\n"
 "                             solo fuori dal locale POSIX\n"
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 msgid ""
 "  -t                         sort by modification time, newest first\n"
 "  -T, --tabsize=COLS         assume tab stops at each COLS instead of 8\n"
@@ -6046,10 +6141,11 @@ msgstr ""
 "  -T, --tabsize=COL          assume che le tabulazioni siano ad ogni COL "
 "invece di 8\n"
 
-#: src/ls.c:4848
+#: src/ls.c:4912
+#, fuzzy
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
@@ -6065,13 +6161,13 @@ msgstr ""
 "  -v                         ordina naturalmente secondo i numeri (di "
 "versione) nel testo\n"
 
-#: src/ls.c:4855
+#: src/ls.c:4919
+#, fuzzy
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 "  -w, --width=COL            considera lo schermo largo COL invece del "
@@ -6083,7 +6179,7 @@ msgstr ""
 "file\n"
 "  -1                         elenca un file per riga\n"
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -6101,7 +6197,7 @@ msgstr ""
 "può cambiare queste impostazioni. Usare il comando dircolors per "
 "impostarla.\n"
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -6177,11 +6273,14 @@ msgid "  -t, --text           read in text mode (default)\n"
 msgstr "  -t, --text           legge in modalità testo (predefinito)\n"
 
 #: src/md5sum.c:195
+#, fuzzy
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
@@ -6195,14 +6294,7 @@ msgstr ""
 "codice di controllo\n"
 "\n"
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-"      --strict         con --check, esce con errore per ogni input non "
-"valido\n"
-
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -6219,52 +6311,52 @@ msgstr ""
 "per binario, spazio per\n"
 "testo) e il nome per ogni FILE.\n"
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, c-format
 msgid "%s: too many checksum lines"
 msgstr "%s: troppe righe del codice di controllo"
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr ""
 "%s: %<PRIuMAX>: riga del codice di controllo %s non formattata correttamente"
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr "%s: apertura o lettura NON RIUSCITA\n"
 
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr "NON RIUSCITO"
 
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr "OK"
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr ""
 "%s: non è stata trovata alcuna riga del codice di controllo %s formattata "
 "correttamente"
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
 msgstr[0] "ATTENZIONE: %<PRIuMAX> riga non formattata correttamente"
 msgstr[1] "ATTENZIONE: %<PRIuMAX> righe non formattate correttamente"
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
 msgstr[0] "ATTENZIONE: %<PRIuMAX> file elencato non può essere letto"
 msgstr[1] "ATTENZIONE: %<PRIuMAX> file elencati non possono essere letti"
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
@@ -6273,19 +6365,19 @@ msgstr[0] ""
 msgstr[1] ""
 "ATTENZIONE: %<PRIuMAX> codici di controllo calcolati NON corrispondono"
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
 msgstr ""
 
-#: src/md5sum.c:766
+#: src/md5sum.c:770
 #, fuzzy, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr ""
 "l'opzione --status ha significato solo quando si stanno verificando i codici "
 "di controllo"
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
@@ -6293,53 +6385,52 @@ msgstr ""
 "le opzioni --binary e --text non hanno significato quando si stanno "
 "verificando i codici di controllo"
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr ""
 "l'opzione --status ha significato solo quando si stanno verificando i codici "
 "di controllo"
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr ""
 "l'opzione --warn ha significato solo quando si stanno verificando i codici "
 "di controllo"
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr ""
 "l'opzione --quiet ha significato solo quando si stanno verificando i codici "
 "di controllo"
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr ""
 "l'opzione --strict ha significato solo quando si stanno verificando i codici "
 "di controllo"
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr "Uso: %s [OPZIONE]... DIRECTORY...\n"
 
-#: src/mkdir.c:57
+#: src/mkdir.c:59
 #, fuzzy
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
 msgstr ""
 "Crea le DIRECTORY, se non esistono già.\n"
 "\n"
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
+#, fuzzy
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 "  -m, --mode=MODO   imposta i permessi (come in chmod), non a=rwx - umask\n"
 "  -p, --parents     nessun errore se esiste, crea la directory padre se "
@@ -6349,66 +6440,94 @@ msgstr ""
 "directory\n"
 "                      creata a CTX\n"
 
-#: src/mkdir.c:168
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/mkdir.c:127 src/mkdir.c:172
+#, fuzzy, c-format
+msgid "failed to set default creation context for %s"
+msgstr ""
+"impostazione del contesto predefinito di creazione dei file in %s non "
+"riuscita"
+
+#: src/mkdir.c:191
+#, fuzzy, c-format
+msgid "failed to restore context for %s"
+msgstr "impossibile preservare gli orari di %s"
+
+#: src/mkdir.c:231
 #, c-format
 msgid "created directory %s"
 msgstr "directory %s creata"
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, fuzzy, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr ""
+"ATTENZIONE: ignorato --context (-Z); questo non è un kernel con SELinux "
+"abilitato"
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr "Uso: %s [OPZIONE]... NOME...\n"
 
-#: src/mkfifo.c:52
+#: src/mkfifo.c:54
 #, fuzzy
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
 msgstr ""
 "Crea pipe con nome (FIFO) per ogni NOME dato.\n"
 "\n"
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
 msgstr ""
 "  -m, --mode=MODO    imposta i bit dei permessi del file come MODO, non a=rw "
 "- umask\n"
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
-"  -Z, --context=CTX  imposta il contesto di sicurezza SELinux di ciascun "
-"NOME in CTX\n"
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, c-format
 msgid "invalid mode"
 msgstr "modo non valido"
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr "il modo deve specificare solo i bit di permesso del file"
 
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
+#, fuzzy, c-format
+msgid "cannot set permissions of %s"
+msgstr "impossibile cambiare i permessi di %s"
+
+#: src/mknod.c:54
 #, c-format
 msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr "Uso: %s [OPZIONE]... NOME TIPO [MAJOR MINOR]\n"
 
-#: src/mknod.c:54
+#: src/mknod.c:56
 #, fuzzy
 msgid "Create the special file NAME of the given TYPE.\n"
 msgstr ""
 "Crea il file speciale NOME del TIPO dato.\n"
 "\n"
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr ""
-"  -Z, --context=CTX  imposta il contesto di sicurezza SELinux di NOME in "
-"CTX\n"
-
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -6422,7 +6541,7 @@ msgstr ""
 "è interpretato come esadecimale; altrimenti, se inizia con 0, come ottale;\n"
 "altrimenti, come decimale. TIPO può essere:\n"
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 msgid ""
 "\n"
 "  b      create a block (buffered) special file\n"
@@ -6434,55 +6553,55 @@ msgstr ""
 "  c, u   crea un file speciale a caratteri (non bufferizzato)\n"
 "  p      crea un FIFO\n"
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 msgid "Special files require major and minor device numbers."
 msgstr "I file speciali richiedono i numeri major e minor del dispositivo"
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 msgid "Fifos do not have major and minor device numbers."
 msgstr "I fifo non hanno i numeri major e minor del dispositivo"
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, c-format
 msgid "block special files not supported"
 msgstr "i file speciali a blocchi non sono supportati"
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, c-format
 msgid "character special files not supported"
 msgstr "i file speciali a caratteri non sono supportati"
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, c-format
 msgid "invalid major device number %s"
 msgstr "major number del dispositivo %s non valido"
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, c-format
 msgid "invalid minor device number %s"
 msgstr "minor number del dispositivo %s non valido"
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, c-format
 msgid "invalid device %s %s"
 msgstr "dispositivo %s %s non valido"
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, c-format
 msgid "invalid device type %s"
 msgstr "tipo del dispositivo %s non valido"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr "Eric Blake"
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr "Uso: %s [OPZIONE]... [MODELLO]\n"
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 #, fuzzy
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
@@ -6494,14 +6613,14 @@ msgstr ""
 "MODELLO deve contenere almeno tre \"X\" consecutive nell'ultima parte.\n"
 "Se MODELLO non è specificato, usa tmp.XXXXXXXXXX e --tmpdir è implicita.\n"
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
 "I file sono creati u+rw e le directory u+rwx, a meno di restrizioni di "
 "umask.\n"
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
@@ -6512,24 +6631,26 @@ msgstr ""
 "  -q, --quiet         sopprime la diagnostica su fallimenti di creazione "
 "file/dir\n"
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
+#, fuzzy
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
 "      --suffix=SUFF   appende SUFF al MODELLO. SUFF non deve contenere "
 "slash.\n"
 "                        Questa opzione è implicita se MODELLO non termina "
 "con X.\n"
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
+#, fuzzy
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
 "      --tmpdir[=DIR]  interpreta MODELLO relativo a DIR. Se DIR non\n"
@@ -6541,9 +6662,9 @@ msgstr ""
 "\" (slash), ma\n"
 "                        mktemp crea solo la parte finale\n"
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
+#, fuzzy
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
@@ -6556,59 +6677,54 @@ msgstr ""
 "                        directory specificata con -p, altrimenti /tmp "
 "[deprecato]\n"
 
-#: src/mktemp.c:223
-#, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr "reindirizzamento dello stderr in /dev/null non riuscito"
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, c-format
 msgid "too many templates"
 msgstr "troppi modelli"
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr "con --suffix, il modello %s deve terminare con X"
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr "suffisso %s non valido, contiene separatori di directory"
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr "poche X nel modello %s"
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr "modello non valido, %s, contiene separatori di directory"
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr "modello non valido, %s; con --tmpdir non può essere assoluto"
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, c-format
 msgid "failed to create directory via template %s"
 msgstr "creazione della directory con il modello %s non riuscita"
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, c-format
 msgid "failed to create file via template %s"
 msgstr "creazione del file con il modello %s non riuscita"
 
-#: src/mv.c:292
+#: src/mv.c:294
 #, fuzzy
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 "Rinomina ORIGINE in DEST o sposta ORIGINE nella DIRECTORY.\n"
 "\n"
 
-#: src/mv.c:298
+#: src/mv.c:300
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
 "file\n"
@@ -6629,7 +6745,7 @@ msgstr ""
 "  -n, --no-clobber             non sovrascrive un file esistente\n"
 "Se viene specificato più di uno tra -i, -f, -n, solo l'ultimo ha effetto.\n"
 
-#: src/mv.c:307
+#: src/mv.c:309
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
@@ -6641,7 +6757,8 @@ msgstr ""
 "                                 ORIGINE\n"
 "  -S, --suffix=SUFFISSO        cambia il normale suffisso dei backup\n"
 
-#: src/mv.c:312
+#: src/mv.c:314
+#, fuzzy
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
 "DIRECTORY\n"
@@ -6650,6 +6767,8 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
 "  --target-directory=DIRECTORY      sposta ogni ORIGINE nella DIRECTORY\n"
 "  -T, --no-target-directory    considera DEST come un file normale\n"
@@ -6957,99 +7076,94 @@ msgid "%s: invalid number to ignore"
 msgstr "%s: numero di esclusioni non valido"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
 msgstr ""
 
-#: src/numfmt.c:676
+#: src/numfmt.c:659
 #, fuzzy, c-format
-msgid "value too large to be converted: '%s'"
+msgid "value too large to be converted: %s"
 msgstr "%s: valore non completamente convertito"
 
-#: src/numfmt.c:680
+#: src/numfmt.c:663
 #, fuzzy, c-format
-msgid "invalid number: '%s'"
+msgid "invalid number: %s"
 msgstr "numero %s non valido"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
+msgid "rejecting suffix in input: %s (consider using --from)"
 msgstr ""
 
 # (ndt) - es: df -B 2a - Giorgio
-#: src/numfmt.c:688
+#: src/numfmt.c:671
 #, fuzzy, c-format
-msgid "invalid suffix in input: '%s'"
+msgid "invalid suffix in input: %s"
 msgstr "il suffisso nell'argomento «%3$s» di %1$s%2$s non è valido"
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
 msgstr ""
 
-#: src/numfmt.c:723
+#: src/numfmt.c:722 src/numfmt.c:768
 #, fuzzy, c-format
 msgid "failed to prepare value '%Lf' for printing"
 msgstr "%s: apertura per la scrittura non riuscita"
 
-#: src/numfmt.c:787
+#: src/numfmt.c:791
 #, fuzzy, c-format
-msgid "invalid unit size: '%s'"
+msgid "invalid unit size: %s"
 msgstr "dimensioni di tabulazione non valide: %s"
 
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
-#, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr ""
-
-#: src/numfmt.c:813
+#: src/numfmt.c:814
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
 msgstr "Uso: %s [OPZIONE]... [UTENTE]...\n"
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
 msgstr ""
 
-#: src/numfmt.c:820
+#: src/numfmt.c:821
 #, fuzzy
 msgid "      --debug          print warnings about invalid input\n"
 msgstr ""
 "      --strict         con --check, esce con errore per ogni input non "
 "valido\n"
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
 msgstr ""
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
 "                         see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr ""
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
@@ -7057,19 +7171,19 @@ msgid ""
 "locale)\n"
 msgstr ""
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
 msgstr ""
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
 msgstr ""
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -7079,30 +7193,30 @@ msgid ""
 "                         is found\n"
 msgstr ""
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
 "nearest\n"
 msgstr ""
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
 msgstr ""
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr ""
 
-#: src/numfmt.c:877
+#: src/numfmt.c:878
 #, fuzzy
 msgid ""
 "\n"
@@ -7111,11 +7225,11 @@ msgstr ""
 "Altre opzioni:\n"
 "\n"
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr ""
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -7124,7 +7238,7 @@ msgid ""
 "               1Mi = 1048576,\n"
 msgstr ""
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
@@ -7132,7 +7246,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
@@ -7140,7 +7254,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
@@ -7148,18 +7262,18 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:905
+#: src/numfmt.c:906
 #, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -7171,7 +7285,7 @@ msgid ""
 "errors are not diagnosed and the exit status is 0.\n"
 msgstr ""
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -7192,113 +7306,113 @@ msgid ""
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 msgstr ""
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, c-format
 msgid "format %s has no %% directive"
 msgstr "il formato %s non ha una direttiva %%"
 
-#: src/numfmt.c:990
+#: src/numfmt.c:1003
 #, fuzzy, c-format
 msgid "invalid format %s (width overflow)"
 msgstr "formato di data %s non valido"
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr ""
+
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr "il formato %s termina in %%"
 
-#: src/numfmt.c:1010
+#: src/numfmt.c:1030
 #, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
 msgstr ""
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr "il formato %s ha troppe direttive %%"
 
 # (ndt) - es: df -B 2a - Giorgio
-#: src/numfmt.c:1070
+#: src/numfmt.c:1081
 #, fuzzy, c-format
-msgid "invalid suffix in input '%s': '%s'"
+msgid "invalid suffix in input %s: %s"
 msgstr "il suffisso nell'argomento «%3$s» di %1$s%2$s non è valido"
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
 msgstr ""
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
 msgstr ""
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
+msgid "large input value %s: possible precision loss"
 msgstr ""
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
 
-#: src/numfmt.c:1388
+#: src/numfmt.c:1403
 #, fuzzy, c-format
-msgid "invalid padding value '%s'"
+msgid "invalid padding value %s"
 msgstr "intervallo di pagine non valido %s"
 
-#: src/numfmt.c:1401
+#: src/numfmt.c:1417
 #, fuzzy, c-format
-msgid "invalid field value '%s'"
+msgid "invalid field value %s"
 msgstr "numero di campo non valido: %s"
 
-#: src/numfmt.c:1430
+#: src/numfmt.c:1447
 #, fuzzy, c-format
-msgid "invalid header value '%s'"
+msgid "invalid header value %s"
 msgstr "data %s non valida"
 
-#: src/numfmt.c:1456
+#: src/numfmt.c:1473
 #, fuzzy, c-format
 msgid "--grouping cannot be combined with --format"
 msgstr "gli operandi dei file non possono essere combinati con --files0-from"
 
-#: src/numfmt.c:1458
-#, fuzzy, c-format
-msgid "--padding cannot be combined with --format"
-msgstr "gli operandi dei file non possono essere combinati con --files0-from"
-
-#: src/numfmt.c:1463
+#: src/numfmt.c:1478
 #, fuzzy, c-format
 msgid "no conversion option specified"
 msgstr "specificate opzioni -i multiple"
 
-#: src/numfmt.c:1471
+#: src/numfmt.c:1486
 #, fuzzy, c-format
 msgid "grouping cannot be combined with --to"
 msgstr "gli operandi dei file non possono essere combinati con --files0-from"
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
 msgstr ""
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
 msgstr ""
 
-#: src/numfmt.c:1511
+#: src/numfmt.c:1526
 #, fuzzy, c-format
 msgid "error reading input"
 msgstr "errore leggendo %s"
 
-#: src/numfmt.c:1520
+#: src/numfmt.c:1535
 #, fuzzy, c-format
 msgid "failed to convert some of the input numbers"
 msgstr "rendere inutilizzabile lo standard input non riuscito"
 
-#: src/od.c:294
+#: src/od.c:320
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -7311,7 +7425,7 @@ msgstr ""
 "  o:  %s --traditional [OPZIONE]... [FILE] [[+]OFFSET[.][b] [+][ETICH][.]"
 "[b]]\n"
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -7328,7 +7442,7 @@ msgstr ""
 "Senza FILE, o quando FILE è -, legge lo standard input.\n"
 "\n"
 
-#: src/od.c:307
+#: src/od.c:333
 #, fuzzy
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
@@ -7348,26 +7462,25 @@ msgstr ""
 "Per OFFSET e ETICH, un prefisso 0x o 0X significa esadecimale;\n"
 "i suffissi possono essere . per ottale e b per multipli di 512.\n"
 
-#: src/od.c:318
-#, fuzzy
+#: src/od.c:344
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
-"  -A, --address-radix=RADICE  decide come gli offset del file sono stampati\n"
-"  -j, --skip-bytes=BYTE       salta BYTE input prima\n"
 
-#: src/od.c:323
+#: src/od.c:350
 #, fuzzy
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
@@ -7381,7 +7494,7 @@ msgstr ""
 "      --traditional           accetta gli argomenti nella forma "
 "tradizionale\n"
 
-#: src/od.c:336
+#: src/od.c:363
 #, fuzzy
 msgid ""
 "\n"
@@ -7389,7 +7502,7 @@ msgid ""
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 "\n"
@@ -7401,7 +7514,7 @@ msgstr ""
 "  -c   come -t c,  seleziona caratteri ASCII o protetti da backslash\n"
 "  -d   come -t u2, seleziona unità da due byte decimali senza segno\n"
 
-#: src/od.c:345
+#: src/od.c:372
 msgid ""
 "  -f   same as -t fF, select floats\n"
 "  -i   same as -t dI, select decimal ints\n"
@@ -7417,14 +7530,14 @@ msgstr ""
 "  -s   come -t d2, seleziona unità da 2 byte decimali\n"
 "  -x   come -t x2, seleziona unità da 2 byte esadecimali\n"
 
-#: src/od.c:353
+#: src/od.c:380
 #, fuzzy
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 "\n"
 "TIPO è composto di una o più di queste specifiche:\n"
@@ -7432,7 +7545,7 @@ msgstr ""
 "  a          carattere con nome, ignorando il bit più alto\n"
 "  c          carattere ASCII o protetto da backslash\n"
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -7446,7 +7559,7 @@ msgstr ""
 "  u[DIM]     decimale senza segno, DIM byte per intero\n"
 "  x[DIM]     esadecimale, DIM byte per intero\n"
 
-#: src/od.c:367
+#: src/od.c:394
 #, fuzzy
 msgid ""
 "\n"
@@ -7461,14 +7574,14 @@ msgstr ""
 "sizeof(long). Se TIPO è f, DIM può essere F per sizeof(float), D\n"
 "per sizeof(double) o L per sizeof(long double).\n"
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
 "each output line.\n"
 msgstr ""
 
-#: src/od.c:379
+#: src/od.c:406
 #, fuzzy
 msgid ""
 "\n"
@@ -7486,13 +7599,13 @@ msgstr ""
 "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
 "GB 1000*1000*1000, G 1024*1024*1024, e così via per T, P, E, Z, Y.\n"
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, c-format
 msgid "invalid type string %s"
 msgstr "stringa di tipo non valida: %s"
 
 # (ndt) error generated by «od -t3 filename»
-#: src/od.c:649
+#: src/od.c:690
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7501,7 +7614,7 @@ msgstr ""
 "stringa di tipo non valida %s;\n"
 "questo sistema non fornisce un tipo intero a %lu byte"
 
-#: src/od.c:770
+#: src/od.c:811
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7510,38 +7623,38 @@ msgstr ""
 "stringa di tipo non valida %s;\n"
 "questo sistema non fornisce un tipo a virgola mobile a %lu byte"
 
-#: src/od.c:828
+#: src/od.c:869
 #, fuzzy, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr "carattere \"%c\" non valido nella stringa di tipo %s"
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr "impossibile saltare oltre la fine di un input combinato"
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, fuzzy, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr ""
 "radice dell'indirizzo di output \"%c\" non valida; deve essere un carattere "
 "tra [doxn]"
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr "nessun tipo può essere specificato mentre si stampano le stringhe"
 
-#: src/od.c:1810
+#: src/od.c:1863
 msgid "compatibility mode supports at most one file"
 msgstr "la modalità compatibile supporta al massimo un file"
 
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr "il numero di byte saltati + byte letti è troppo grande"
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr "attenzione: larghezza %lu non valida; usare invece %d"
@@ -7709,12 +7822,12 @@ msgstr "Quando"
 msgid "Where"
 msgstr "Dove"
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr "Uso: %s [OPZIONE]... [UTENTE]...\n"
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -7730,7 +7843,7 @@ msgstr ""
 "  -p              omette il file del piano dell'utente nel formato lungo\n"
 "  -s              usa il formato breve, è l'opzione predefinita\n"
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -7744,7 +7857,7 @@ msgstr ""
 "  -q              omette il nome completo, l'host remoto e il tempo di\n"
 "                  inattività nel formato breve\n"
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -7755,7 +7868,7 @@ msgstr ""
 "Una versione leggera di «finger»; stampa informazioni sugli utenti.\n"
 "Il file utmp sarà %s.\n"
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr ""
@@ -7984,11 +8097,13 @@ msgstr ""
 "                    omette l'avviso quando un file non può essere aperto\n"
 
 #: src/pr.c:2820
+#, fuzzy
 msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
@@ -8002,7 +8117,7 @@ msgstr ""
 "impostato -w\n"
 
 # (ndt) messa la minuscola dopo i : per uniformità
-#: src/pr.c:2827
+#: src/pr.c:2828
 #, fuzzy
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
@@ -8020,7 +8135,7 @@ msgstr ""
 "opzioni delle colonne\n"
 "  -t, --omit-header  omette intestazioni e piè di pagina\n"
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 msgid ""
 "  -T, --omit-pagination\n"
 "                    omit page headers and trailers, eliminate any "
@@ -8046,7 +8161,7 @@ msgstr ""
 "                    output multipli testo-colonna, -s[char] la disattiva "
 "(72)\n"
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
 "                    set page width to PAGE_WIDTH (72) characters always,\n"
@@ -8061,7 +8176,7 @@ msgstr ""
 "l'opzione -J,\n"
 "                    non interferisce con -S o -s\n"
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 msgid ""
 "\n"
 "-t is implied if PAGE_LENGTH <= 10.  With no FILE, or when FILE is -, read\n"
@@ -8085,7 +8200,8 @@ msgstr ""
 "\n"
 
 #: src/printenv.c:69
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+#, fuzzy
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr ""
 "  -0, --null     termina ogni riga con il byte 0 invece del ritorno a capo\n"
 
@@ -8210,12 +8326,12 @@ msgstr ""
 msgid "F. Pinard"
 msgstr "François Pinard"
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, c-format
 msgid "%s (for regexp %s)"
 msgstr "%s (per regexp %s)"
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
@@ -8224,7 +8340,7 @@ msgstr ""
 "Uso: %s [OPZIONE]... [INPUT]...   (senza -G)\n"
 "  o:  %s -G [OPZIONE]... [INPUT [OUTPUT]]\n"
 
-#: src/ptx.c:1821
+#: src/ptx.c:1824
 #, fuzzy
 msgid ""
 "Output a permuted index, including context, of the words in the input "
@@ -8234,7 +8350,7 @@ msgstr ""
 "di input.\n"
 "\n"
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 #, fuzzy
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
@@ -8247,7 +8363,7 @@ msgstr ""
 "  -F, --flag-truncation=STRINGA  usa STRINGA per indicare il troncamento di "
 "riga\n"
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 #, fuzzy
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
@@ -8263,7 +8379,7 @@ msgstr ""
 "  -S, --sentence-regexp=REGEXP   per fine riga o fine frase\n"
 "  -T, --format=tex               genera l'output come direttive TeX\n"
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -8284,7 +8400,7 @@ msgstr ""
 "  -o, --only-file=FILE           legge l'elenco delle parole da considerare "
 "da questo FILE\n"
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -8297,17 +8413,16 @@ msgstr ""
 "  -w, --width=NUMERO             stampa la larghezza in colonne, esclusi i "
 "riferimenti\n"
 
-#: src/ptx.c:1854
+#: src/ptx.c:1857
 #, fuzzy
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
 "\n"
-"Se FILE non è specificato o se FILE è -, legge lo standard input. «-F /» è "
-"il predefinito.\n"
+"Senza FILE, o quando FILE è -, legge lo standard input.\n"
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, c-format
 msgid "invalid gap width: %s"
 msgstr "larghezza dello spazio non valida: %s"
@@ -8329,22 +8444,28 @@ msgstr ""
 "simbolici\n"
 "  -P, --physical  evita tutti i collegamenti simbolici\n"
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+
+#: src/pwd.c:169
 #, c-format
 msgid "failed to chdir to %s"
 msgstr "cambio della directory in %s non riuscito"
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, c-format
 msgid "failed to stat %s"
 msgstr "stat di %s non riuscito"
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr "impossibile trovare la directory in %s con l'i-node corrispondente"
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, c-format
 msgid "ignoring non-option arguments"
 msgstr "gli argomenti che non sono opzioni sono stati ignorati"
@@ -8354,8 +8475,8 @@ msgstr "gli argomenti che non sono opzioni sono stati ignorati"
 msgid "Dmitry V. Levin"
 msgstr "Dmitry V. Levin"
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Uso: %s [OPZIONE]... FILE...\n"
@@ -8403,8 +8524,7 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 "  -m, --canonicalize-missing    mette in forma canonica seguendo ogni "
 "collegamento simbolico\n"
@@ -8440,7 +8560,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 
@@ -8459,41 +8579,42 @@ msgid "%s: descend into directory %s? "
 msgstr "%s: entrare nella directory %s? "
 
 # (ndt) va bene per i file (maschile) ma per le directory "rm: rimuovere il directory protetto dalla scrittura `pippo'?" - Giorgio
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr "%s: rimuovere il %s protetto dalla scrittura %s? "
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, c-format
 msgid "%s: remove %s %s? "
 msgstr "%s: rimuovere %s %s? "
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, c-format
 msgid "removed directory: %s\n"
 msgstr "directory rimossa: %s\n"
 
-#: src/remove.c:444
-#, c-format
-msgid "cannot remove directory: %s"
-msgstr "impossibile rimuovere la directory: %s"
+#: src/remove.c:447
+#, fuzzy, c-format
+msgid "refusing to remove %s or %s directory: skipping %s"
+msgstr "rimozione della directory %s non riuscita"
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr "saltato %s, dato che è su un dispositivo diverso"
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, c-format
 msgid "traversal failed: %s"
 msgstr "traversamento non riuscito: %s"
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -8522,15 +8643,16 @@ msgstr ""
 "  -i                    chiede conferma prima di ogni rimozione\n"
 
 #: src/rm.c:142
+#, fuzzy
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 "  -I                    chiede una volta prima di rimuovere più di tre file, "
 "o\n"
@@ -8613,14 +8735,18 @@ msgstr ""
 "che il contenuto sia veramente irrecuperabile, si valuti l'uso di shred.\n"
 
 #: src/rm.c:342
-#, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr "%s: rimuovere ricorsivamente tutti gli argomenti? "
+#, fuzzy, c-format
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] "%s: rimuovere ricorsivamente tutti gli argomenti? "
+msgstr[1] "%s: rimuovere ricorsivamente tutti gli argomenti? "
 
-#: src/rm.c:343
-#, c-format
-msgid "%s: remove all arguments? "
-msgstr "%s: rimuovere tutti gli argomenti? "
+#: src/rm.c:345
+#, fuzzy, c-format
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] "%s: rimuovere tutti gli argomenti? "
+msgstr[1] "%s: rimuovere tutti gli argomenti? "
 
 #: src/rmdir.c:134 src/rmdir.c:233
 #, c-format
@@ -8676,7 +8802,7 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
 
@@ -8738,41 +8864,47 @@ msgstr "deve essere specificato -c, -t, -u, -l, -r, o il contesto"
 msgid "no command specified"
 msgstr "nessun comando specificato"
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr "%s può essere usato solo su un kernel SElinux"
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, c-format
 msgid "failed to compute a new context"
 msgstr "calcolo di un nuovo contesto non riuscito"
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, c-format
 msgid "failed to set new user %s"
 msgstr "impostazione del nuovo utente %s non riuscita"
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, c-format
 msgid "failed to set new type %s"
 msgstr "impostazione del nuovo tipo %s non riuscita"
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, c-format
 msgid "failed to set new range %s"
 msgstr "impostazione del nuovo intervallo %s non riuscita"
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, c-format
 msgid "failed to set new role %s"
 msgstr "impostazione del nuovo ruolo %s non riuscita"
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, c-format
 msgid "unable to set security context %s"
 msgstr "impossibile impostare il contesto di sicurezza %s"
 
+# (ndt) ???
+#: src/selinux.c:127 src/selinux.c:300
+#, fuzzy, c-format
+msgid "error canonicalizing %s"
+msgstr "trasformazione di %s in forma canonica non riuscita"
+
 #: src/seq.c:68
 #, c-format
 msgid ""
@@ -8804,10 +8936,13 @@ msgstr ""
 "iniziali\n"
 
 #: src/seq.c:86
+#, fuzzy
 msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
@@ -8820,7 +8955,7 @@ msgstr ""
 "INCREMENTO è normalmente positivo se PRIMO è minore di ULTIMO, e\n"
 "INCREMENTO è normalmente negativo se PRIMO è maggiore di ULTIMO.\n"
 
-#: src/seq.c:94
+#: src/seq.c:96
 #, fuzzy
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
@@ -8831,17 +8966,17 @@ msgstr ""
 "è predefinito a %.PRECf se PRIMO, INCREMENTO e ULTIMO sono tutti numeri\n"
 "decimali a virgola fissa con la precisione massima PREC, altrimenti a %g.\n"
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, c-format
 msgid "invalid floating point argument: %s"
 msgstr "argomento in virgola mobile non valido: %s"
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr "il formato %s ha una direttiva %%%c sconosciuta"
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr ""
@@ -8849,77 +8984,12 @@ msgstr ""
 "stringhe\n"
 "di larghezza uguale"
 
-#: src/setuidgid.c:49
-#, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-"Uso: %s [OPZIONE-CORTA]... UTENTE COMANDO [ARGOMENTO]...\n"
-"  o:  %s OPZIONE-LUNGA\n"
-
-#: src/setuidgid.c:55
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-"Scarta ogni gruppo supplementare, assume l'id utente e di gruppo dell'UTENTE "
-"specificato\n"
-"(id numerico o nome utente), ed esegue COMANDO con ciascun ARGOMENTO "
-"specificato.\n"
-"Esce con lo stato 111 se incapace di assumere gli id utente e di gruppo "
-"richiesti.\n"
-"Altrimenti, esce con lo stato di uscita di COMANDO.\n"
-"Questo programma è utile solo se eseguito da root (id utente zero).\n"
-"\n"
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-"  -g GID[,GID1...]  imposta anche l'id di gruppo primario come il numero "
-"GID, e\n"
-"                    (se specificati) gli ID dei gruppi supplementari come "
-"GID1, ...\n"
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr "id utente sconosciuto: %s"
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr "per usare l'id utente %s bisogna usare anche -g"
-
-#: src/setuidgid.c:190
-#, c-format
-msgid "failed to set supplemental group(s)"
-msgstr "impostazione del gruppo supplementare non riuscita"
-
-#: src/setuidgid.c:200
-#, c-format
-msgid "cannot set group-ID to %lu"
-msgstr "impossibile impostare l'id di gruppo a %lu"
-
-#: src/setuidgid.c:204
-#, c-format
-msgid "cannot set user-ID to %lu"
-msgstr "impossibile impostare l'id utente a %lu"
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr "Colin Plumb"
 
-#: src/shred.c:148
+#: src/shred.c:170
 #, fuzzy
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
@@ -8930,7 +9000,7 @@ msgstr ""
 "recuperare i dati anche con indagini hardware molto costose.\n"
 "\n"
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -8945,9 +9015,10 @@ msgstr ""
 "  -s, --size=N   distrugge solo N byte (sono accettati suffissi come K, M e "
 "G)\n"
 
-#: src/shred.c:161
+#: src/shred.c:183
+#, fuzzy
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
@@ -8961,15 +9032,20 @@ msgstr ""
 "  -z, --zero     aggiunge una sovrascrittura finale con zeri per nascondere\n"
 "                 la distruzione\n"
 
-#: src/shred.c:170
+#: src/shred.c:192
+#, fuzzy
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 "\n"
@@ -8983,7 +9059,7 @@ msgstr ""
 "persone usano l'opzione --remove.\n"
 "\n"
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -9000,7 +9076,7 @@ msgstr ""
 "garantito che sia efficace:\n"
 "\n"
 
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -9022,7 +9098,7 @@ msgstr ""
 "  Appliance\n"
 "\n"
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -9036,7 +9112,7 @@ msgstr ""
 "* file system compressi\n"
 "\n"
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -9059,7 +9135,7 @@ msgstr ""
 "come documentato nella pagina del manuale di mount (man mount).\n"
 "\n"
 
-#: src/shred.c:215
+#: src/shred.c:241
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
 "of the file that cannot be removed, and that will allow a shredded file\n"
@@ -9069,127 +9145,127 @@ msgstr ""
 "del file impossibili da rimuovere e che permetterebbero di recuperare un\n"
 "file distrutto.\n"
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, c-format
 msgid "%s: fdatasync failed"
 msgstr "%s: fdatasync non riuscito"
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr "%s: fsync non riuscito"
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr "%s: impossibile riavvolgere"
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr "%s: passo %lu/%lu (%s)..."
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, c-format
 msgid "%s: error writing at offset %s"
 msgstr "%s: errore di scrittura all'offset %s"
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s: lseek non riuscito"
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, c-format
 msgid "%s: file too large"
 msgstr "%s: file troppo grande"
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr "%s: passo %lu/%lu (%s)...%s"
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr "%s: passo %lu/%lu (%s)...%s/%s %d%%"
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, c-format
 msgid "%s: fstat failed"
 msgstr "%s: fstat non riuscito"
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, c-format
 msgid "%s: invalid file type"
 msgstr "%s: tipo di file non valido"
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr "%s: il file ha dimensioni negative"
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, c-format
 msgid "%s: error truncating"
 msgstr "%s: errore durante il troncamento"
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, c-format
 msgid "%s: fcntl failed"
 msgstr "%s: fcntl non riuscito"
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr "%s: impossibile distruggere un descrittore di file append only"
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr "%s: rimozione"
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, c-format
 msgid "%s: renamed to %s"
 msgstr "%s: rinominato in %s"
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, c-format
 msgid "%s: failed to remove"
 msgstr "%s: rimozione non riuscita"
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr "%s: rimosso"
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, c-format
 msgid "%s: failed to close"
 msgstr "%s: chiusura non riuscita"
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, c-format
 msgid "%s: failed to open for writing"
 msgstr "%s: apertura per la scrittura non riuscita"
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, c-format
 msgid "%s: invalid number of passes"
 msgstr "%s: numero di passi non valido"
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, c-format
 msgid "multiple random sources specified"
 msgstr "sono state specificate sorgenti casuali multiple"
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, c-format
 msgid "%s: invalid file size"
 msgstr "%s: dimensione del file non valida"
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -9200,7 +9276,7 @@ msgstr ""
 "  o:  %s -e [OPZIONE]... [ARG]...\n"
 "  o:  %s -i BASSO-ALTO [OPZIONE]...\n"
 
-#: src/shuf.c:54
+#: src/shuf.c:67
 #, fuzzy
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr ""
@@ -9208,7 +9284,8 @@ msgstr ""
 "output.\n"
 "\n"
 
-#: src/shuf.c:60
+#: src/shuf.c:73
+#, fuzzy
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
 "  -i, --input-range=LO-HI   treat each number LO through HI as an input "
@@ -9216,7 +9293,7 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
 msgstr ""
 "  -e, --echo                tratta ciascun ARG come riga di input\n"
 "  -i, --input-range=BASSO-ALTO   tratta ciascun numero da BASSO ad ALTO come "
@@ -9228,31 +9305,41 @@ msgstr ""
 "  -z, --zero-terminated     termina le righe con il byte 0, non con il "
 "ritorno a capo\n"
 
-#: src/shuf.c:244
+#: src/shuf.c:228
+#, fuzzy, c-format
+msgid "too many input lines"
+msgstr "troppe righe ripetute"
+
+#: src/shuf.c:431
 #, c-format
 msgid "multiple -i options specified"
 msgstr "specificate opzioni -i multiple"
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, c-format
 msgid "invalid input range %s"
 msgstr "intervallo di input %s non valido"
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, c-format
 msgid "invalid line count %s"
 msgstr "numero di riga %s non valido"
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, c-format
 msgid "multiple output files specified"
 msgstr "è stato specificato più di un file di output"
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, c-format
 msgid "cannot combine -e and -i options"
 msgstr "non è possibile combinare le opzioni -e e -i"
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr ""
+
 #: src/sleep.c:44
 #, fuzzy, c-format
 msgid ""
@@ -9278,24 +9365,24 @@ msgstr ""
 "quantità di tempo data dalla somma dei loro valori.\n"
 "\n"
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, c-format
 msgid "invalid time interval %s"
 msgstr "intervallo di tempo non valido: %s"
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr "impossibile leggere l'orologio realtime"
 
-#: src/sort.c:399
+#: src/sort.c:427
 #, fuzzy
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr ""
 "Scrive una concatenazione ordinata di tutti i FILE sullo standard output.\n"
 "\n"
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
@@ -9303,7 +9390,7 @@ msgstr ""
 "Opzioni di ordinamento:\n"
 "\n"
 
-#: src/sort.c:409
+#: src/sort.c:437
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
 "  -d, --dictionary-order      consider only blanks and alphanumeric "
@@ -9315,7 +9402,7 @@ msgstr ""
 "  -f, --ignore-case           ignora le differenze tra caratteri minuscoli e "
 "maiuscoli\n"
 
-#: src/sort.c:415
+#: src/sort.c:443
 #, fuzzy
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
@@ -9327,14 +9414,14 @@ msgstr ""
 "  -M, --month-sort            confronta (sconosciuto) < \"GEN\" < ... < \"DIC"
 "\"\n"
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 "  -h, --human-numeric-sort    confronta numeri in formato leggibile umano "
 "(es.: 2K 1G)\n"
 
-#: src/sort.c:423
+#: src/sort.c:451
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
 "  -R, --random-sort           sort by random hash of keys\n"
@@ -9348,7 +9435,7 @@ msgstr ""
 "  -r, --reverse               inverte il risultato dei confronti\n"
 "\n"
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -9365,7 +9452,7 @@ msgstr ""
 "versione) nel testo\n"
 "\n"
 
-#: src/sort.c:437
+#: src/sort.c:465
 msgid ""
 "Other options:\n"
 "\n"
@@ -9373,7 +9460,7 @@ msgstr ""
 "Altre opzioni:\n"
 "\n"
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
@@ -9381,7 +9468,7 @@ msgstr ""
 "      --batch-size=NUM      unisce al massimo NUM input contemporaneamente;\n"
 "                            per un numero maggiore usare file temporanei\n"
 
-#: src/sort.c:445
+#: src/sort.c:473
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
 "  -C, --check=quiet, --check=silent  like -c, but do not report first bad "
@@ -9397,7 +9484,7 @@ msgstr ""
 "                              li decomprime con PROG -d\n"
 
 # (ndt) idee su questionable???
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -9411,7 +9498,7 @@ msgstr ""
 "                            dai nomi nel file F (terminati con NUL);\n"
 "                            se F è -, legge i nomi dallo standard input\n"
 
-#: src/sort.c:459
+#: src/sort.c:487
 #, fuzzy
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
@@ -9423,7 +9510,7 @@ msgstr ""
 "di POS in basso\n"
 "  -m, --merge               unisce file già ordinati; non ordina\n"
 
-#: src/sort.c:463
+#: src/sort.c:491
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "  -s, --stable              stabilize sort by disabling last-resort "
@@ -9436,7 +9523,7 @@ msgstr ""
 "\"last-resort\"\n"
 "  -S, --buffer-size=DIM     usa DIM per il buffer della memoria principale\n"
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -9462,13 +9549,7 @@ msgstr ""
 "                              senza -c, mostra solo il primo di una sequenza "
 "uguale\n"
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr ""
-"  -z, --zero-terminated     termina le righe con il byte 0, invece del "
-"ritorno a capo\n"
-
-#: src/sort.c:483
+#: src/sort.c:511
 #, fuzzy
 msgid ""
 "\n"
@@ -9500,7 +9581,7 @@ msgstr ""
 "\n"
 "DIM può essere seguita dai seguenti suffissi moltiplicativi:\n"
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -9521,260 +9602,245 @@ msgstr ""
 "Impostare LC_ALL=C per avere l'ordinamento tradizionale che usa\n"
 "i valori nativi dei byte.\n"
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, c-format
 msgid "waiting for %s [-d]"
 msgstr "attesa di %s [-d]"
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr "%s [-d] terminato in modo anomalo"
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, c-format
 msgid "cannot create temporary file in %s"
 msgstr "impossibile creare il file temporaneo in %s"
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr "open non riuscita"
 
-#: src/sort.c:970
+#: src/sort.c:998
 msgid "fflush failed"
 msgstr "fflush non riuscita"
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr "close non riuscita"
 
-#: src/sort.c:986
-#, c-format
-msgid "dup2 failed"
-msgstr "dup2 non riuscita"
-
-#: src/sort.c:1103
-#, c-format
-msgid "couldn't execute %s"
-msgstr "impossibile eseguire %s"
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 msgid "couldn't create temporary file"
 msgstr "impossibile creare il file temporaneo"
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, c-format
 msgid "couldn't create process for %s -d"
 msgstr "impossibile creare il processo per %s -d"
 
-#: src/sort.c:1161
-#, c-format
-msgid "couldn't execute %s -d"
-msgstr "impossibile eseguire %s -d"
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, c-format
 msgid "warning: cannot remove: %s"
 msgstr "attenzione: impossibile rimuovere %s"
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, c-format
 msgid "invalid --%s argument %s"
 msgstr "l'argomento %2$s di --%1$s non è valido"
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, c-format
 msgid "minimum --%s argument is %s"
 msgstr "il minimo dell'argomento --%s è %s"
 
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, c-format
 msgid "--%s argument %s too large"
 msgstr "l'argomento %2$s di --%1$s è troppo grande"
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr "il massimo dell'argomento --%s con l'attuale rlimit è %s"
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr "numero in parallelo non deve essere zero"
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr "stat non riuscita"
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr "read non riuscita"
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, c-format
 msgid "string transformation failed"
 msgstr "trasformazione stringa non riuscita"
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, c-format
 msgid "the untransformed string was %s"
 msgstr "la stringa non trasformata era %s"
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr "^ nessuna corrispondenza per la chiave\n"
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, fuzzy, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr "usata la chiave obsoleta \"%s\"; considerare invece \"%s\""
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr "la chiave %lu ha dimensione zero e sarà ignorata"
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, fuzzy, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr ""
 "gli spazi iniziali sono significativi nella chiave %lu; considerare di "
 "specificare anche «b»"
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr "la chiave %lu è numerica e si estende su più campi"
 
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, fuzzy, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
 msgstr[0] "l'opzione «-%s» è ignorata"
 msgstr[1] "le opzioni «-%s» sono ignorate"
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, fuzzy, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr "l'opzione «-r» si applica solo con il confronto \"last-resort\""
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr "write non riuscita"
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr "%s: %s:%s: fuori ordine: "
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr "standard error"
 
-#: src/sort.c:3698
+#: src/sort.c:3738
 #, fuzzy
 msgid "cannot read"
 msgstr "%s: impossibile riavvolgere"
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, c-format
 msgid "%s: invalid field specification %s"
 msgstr "%s: specifica di campo %s non valida"
 
-#: src/sort.c:3987
+#: src/sort.c:4028
 #, fuzzy, c-format
 msgid "options '-%s' are incompatible"
 msgstr "le opzioni «-%s» sono incompatibili"
 
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, c-format
 msgid "%s: invalid count at start of %s"
 msgstr "%s: conteggio non valido all'inizio di %s"
 
-#: src/sort.c:4295
+#: src/sort.c:4336
 #, fuzzy
 msgid "invalid number after '-'"
 msgstr "numero non valido dopo \"-\""
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 #, fuzzy
 msgid "invalid number after '.'"
 msgstr "numero non valido dopo \".\""
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr "carattere estraneo nella specifica del campo"
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, c-format
 msgid "multiple compress programs specified"
 msgstr "è stato specificato più di un programma di compressione"
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
 msgstr "numero non valido all'inizio del campo"
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
 msgstr "il numero del campo è zero"
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr "l'offset del carattere è zero"
 
-#: src/sort.c:4407
+#: src/sort.c:4448
 #, fuzzy
 msgid "invalid number after ','"
 msgstr "numero non valido dopo \",\""
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr "tabulatore vuoto"
 
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, c-format
 msgid "cannot read file names from %s"
 msgstr "impossibile leggere i nomi dei file da %s"
 
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr "%s:%lu: nome di file di lunghezza nulla non valido"
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, c-format
 msgid "no input from %s"
 msgstr "nessun input da %s"
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr "usate le regole di ordinamento %s"
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr "usato il confronto a singolo byte"
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr "operando %s in più non permesso con -%c"
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr "la lunghezza del suffisso deve essere almeno %zu"
 
-#: src/split.c:204
+#: src/split.c:203
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr "Uso: %s [OPZIONE]... [INPUT [PREFISSO]]\n"
 
-#: src/split.c:208
+#: src/split.c:207
 #, fuzzy
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
@@ -9789,22 +9855,21 @@ msgstr ""
 "è -, legge dallo standard input.\n"
 "\n"
 
-#: src/split.c:216
+#: src/split.c:215
 #, fuzzy, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
 "  -a, --suffix-length=N   usa suffissi di lunghezza N (predefinito %d)\n"
@@ -9820,7 +9885,7 @@ msgstr ""
 "  -u, --unbuffered        copia immediatamente l'input in output con «-n "
 "r/...»\n"
 
-#: src/split.c:229
+#: src/split.c:228
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
 "                            output file is opened\n"
@@ -9828,7 +9893,7 @@ msgstr ""
 "      --verbose           stampa una diagnostica prima\n"
 "                            dell'apertura di ciascun file di output\n"
 
-#: src/split.c:236
+#: src/split.c:235
 #, fuzzy
 msgid ""
 "\n"
@@ -9849,192 +9914,192 @@ msgstr ""
 "r/N     come \"l\" ma usa la distribuzione a turno (round robin)\n"
 "r/K/N   similmente, ma scrive sullo stdout solo il K-esimo di N\n"
 
-#: src/split.c:354
+#: src/split.c:353
 #, c-format
 msgid "output file suffixes exhausted"
 msgstr "i suffissi dei file di output sono esauriti"
 
-#: src/split.c:366
+#: src/split.c:365
 #, c-format
 msgid "creating file %s\n"
 msgstr "creazione di %s\n"
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr ""
 
-#: src/split.c:391
+#: src/split.c:390
 #, c-format
 msgid "failed to set FILE environment variable"
 msgstr "impostazione della variabile di ambiente FILE non riuscita"
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr "esecuzione con FILE=%s\n"
 
-#: src/split.c:395
+#: src/split.c:394
 #, c-format
 msgid "failed to create pipe"
 msgstr "creazione della pipe non riuscita"
 
-#: src/split.c:409
+#: src/split.c:408
 #, c-format
 msgid "closing prior pipe"
 msgstr "chiusura della pipe precedente"
 
-#: src/split.c:411
+#: src/split.c:410
 #, c-format
 msgid "closing output pipe"
 msgstr "chiusura della pipe di output"
 
-#: src/split.c:415
+#: src/split.c:414
 #, c-format
 msgid "moving input pipe"
 msgstr "spostamento della pipe di input"
 
-#: src/split.c:417
+#: src/split.c:416
 #, c-format
 msgid "closing input pipe"
 msgstr "chiusura della pipe di input"
 
-#: src/split.c:422
+#: src/split.c:421
 #, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr "impossibile eseguire il comando: «%s -c %s»"
 
-#: src/split.c:428
+#: src/split.c:427
 #, c-format
 msgid "failed to close input pipe"
 msgstr "chiusura della pipe di input non riuscita"
 
-#: src/split.c:464
+#: src/split.c:463
 #, c-format
 msgid "waiting for child process"
 msgstr "in attesa del processo figlio"
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr "con FILE=%s, segnale %s dal comando: %s"
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr "con FILE=%s, uscita %d dal comando: %s"
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr "stato sconosciuto dal comando (0x%X)"
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr "impossibile suddividere in più di un modo"
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, c-format
 msgid "%s: invalid number of chunks"
 msgstr "%s: numero di parti non valido"
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, c-format
 msgid "%s: invalid chunk number"
 msgstr "%s: numero di parte non valido"
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr "%s: lunghezza del suffisso non valida"
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr "%s: numero di byte non valido"
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr "%s: numero di righe non valido"
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, c-format
 msgid "line count option -%s%c... is too large"
 msgstr "l'opzione per il conteggio delle righe -%s%c... è troppo grande"
 
-#: src/split.c:1248
+#: src/split.c:1298
 #, fuzzy, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr "numero di riga iniziale non valido: %s"
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, c-format
 msgid "%s: invalid IO block size"
 msgstr "%s: dimensione del blocco di IO non valida"
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr "--filter non processa una parte estratta in stdout"
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr ""
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, c-format
 msgid "%s: cannot determine file size"
 msgstr "%s: impossibile determinare la dimensione del file"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr "Michael Meskes"
 
 # (ndt) ???
-#: src/stat.c:857
+#: src/stat.c:887
 #, c-format
 msgid "failed to canonicalize %s"
 msgstr "trasformazione di %s in forma canonica non riuscita"
 
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, fuzzy, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr "attenzione: sequenza di escape «\\%c» non riconosciuta"
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, c-format
 msgid "%s: invalid directive"
 msgstr "%s: direttiva non valida"
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, c-format
 msgid "warning: backslash at end of format"
 msgstr "attenzione: backslash alla fine del formato"
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr ""
 "usare %s per indicare che lo standard input non lavora in modalità file "
 "system"
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, c-format
 msgid "cannot read file system information for %s"
 msgstr "impossibile leggere le informazioni del file system per %s"
 
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, c-format
 msgid "cannot stat standard input"
 msgstr "impossibile effettuare lo stat dello standard input"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -10050,7 +10115,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -10060,30 +10125,30 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr "Device: %Dh/%dd\tInode: %-10i  Coll.: %-5h Tipo device: %t,%T\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr "Device: %Dh/%dd\tInode: %-10i  Coll.: %h\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr "Accesso: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, c-format
 msgid "Context: %C\n"
 msgstr "Contesto: %C\n"
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -10095,11 +10160,11 @@ msgstr ""
 "Cambio   : %z\n"
 "Creazione: %w\n"
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
 msgstr ""
 
-#: src/stat.c:1356
+#: src/stat.c:1418
 #, fuzzy
 msgid ""
 "  -L, --dereference     follow links\n"
@@ -10111,13 +10176,14 @@ msgstr ""
 "  -f, --file-system     visualizza lo stato del file system invece di quello "
 "del file\n"
 
-#: src/stat.c:1360
+#: src/stat.c:1422
+#, fuzzy
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 "  -c  --format=FORMATO   usa il FORMATO specificato invece di quello "
@@ -10132,7 +10198,7 @@ msgstr ""
 "FORMATO\n"
 "  -t, --terse           stampa le informazioni in modo conciso\n"
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 #, fuzzy
 msgid ""
 "\n"
@@ -10153,7 +10219,7 @@ msgstr ""
 "  %B   La dimensione in byte di ciascun blocco riportata da %b\n"
 "  %C   Stringa del contesto di sicurezza SELinux\n"
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 #, fuzzy
 msgid ""
 "  %d   device number in decimal\n"
@@ -10170,7 +10236,7 @@ msgstr ""
 "  %g   Id del gruppo del proprietario\n"
 "  %G   Nome del gruppo del proprietario\n"
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 #, fuzzy
 msgid ""
 "  %h   number of hard links\n"
@@ -10180,8 +10246,8 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 "  %h   Numero di collegamenti fisici\n"
 "  %i   Numero dell'inode\n"
@@ -10194,7 +10260,7 @@ msgstr ""
 "  %t   Major number del device in esadecimale\n"
 "  %T   Minor number del device in esadecimale\n"
 
-#: src/stat.c:1399
+#: src/stat.c:1461
 #, fuzzy
 msgid ""
 "  %u   user ID of owner\n"
@@ -10203,10 +10269,10 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 "  %u   Id utente del proprietario\n"
@@ -10221,7 +10287,7 @@ msgstr ""
 "  %Z   Orario dell'ultimo cambiamento in secondi dall'Epoca\n"
 "\n"
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 #, fuzzy
 msgid ""
 "Valid format sequences for file systems:\n"
@@ -10240,7 +10306,7 @@ msgstr ""
 "  %d   Numero di inode liberi nel file system\n"
 "  %f   Numero di blocchi liberi file system\n"
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 #, fuzzy
 msgid ""
 "  %i   file system ID in hex\n"
@@ -10340,22 +10406,27 @@ msgstr ""
 "Inoltre alcuni filtri (come «dd», «cat» etc.) non usano i flussi per l'I/O,\n"
 "e così non sono interessati dalle impostazioni di «stdbuf».\n"
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, c-format
 msgid "failed to find %s"
 msgstr "ricerca di %s non riuscita"
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, c-format
 msgid "failed to update the environment with %s"
 msgstr "aggiornamento dell'ambiente con %s non riuscito"
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr "il buffering di righe su stdin non ha significato"
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, fuzzy, c-format
+msgid "you must specify a buffering mode option"
+msgstr "è necessario specificare un %s relativo con %s"
+
+#: src/stty.c:516
 #, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -10366,11 +10437,11 @@ msgstr ""
 " or: %s [-F DEVICE] | --file=DEVICE] [-a|--all]\n"
 " or: %s [-F DEVICE] | --file=DEVICE] [-g|--save]\n"
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
 msgstr ""
 
-#: src/stty.c:525
+#: src/stty.c:528
 #, fuzzy
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
@@ -10385,7 +10456,7 @@ msgstr ""
 "                       leggibile da stty\n"
 "  -F, --file=DEVICE  apre e usa il DEVICE specificato invece di stdin\n"
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
@@ -10396,7 +10467,7 @@ msgstr ""
 "impostazioni non POSIX. Il sistema sottostante definisce quali impostazioni\n"
 "sono disponibili.\n"
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -10411,7 +10482,7 @@ msgstr ""
 "   eof CAR       CAR invierà un fine file (termina l'input)\n"
 "   eol CAR       CAR terminerà la riga\n"
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -10423,7 +10494,7 @@ msgstr ""
 "   intr CAR      CAR invierà un segnale di interrupt\n"
 "   kill CAR      CAR cancellerà la riga corrente\n"
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -10435,7 +10506,7 @@ msgstr ""
 " * rprnt CAR     CAR ridisegnerà la riga corrente\n"
 "   start CAR     CAR farà ripartire l'output dopo averlo fermato\n"
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -10447,7 +10518,7 @@ msgstr ""
 " * swtch CAR     CAR passerà ad un diverso livello di shell\n"
 " * werase CAR    CAR cancellerà l'ultima parola digitata\n"
 
-#: src/stty.c:562
+#: src/stty.c:565
 msgid ""
 "\n"
 "Special settings:\n"
@@ -10461,7 +10532,7 @@ msgstr ""
 " * cols N        dice al kernel che il terminale ha N colonne\n"
 " * columns N     come cols N\n"
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -10475,7 +10546,7 @@ msgstr ""
 "lettura completa\n"
 "  ospeed N       imposta a N la velocità di output\n"
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -10489,7 +10560,7 @@ msgstr ""
 "   time N        con -icanon, imposta a N decimi di secondo il timeout in "
 "lettura\n"
 
-#: src/stty.c:581
+#: src/stty.c:584
 #, fuzzy
 msgid ""
 "\n"
@@ -10508,7 +10579,7 @@ msgstr ""
 " * [-]crtscts    abilita l'handshaking RTS/CTS\n"
 "   csN           imposta a N bit la dimensione dei caratteri, N tra 5 e 8\n"
 
-#: src/stty.c:590
+#: src/stty.c:593
 #, fuzzy
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
@@ -10517,6 +10588,7 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 "   [-]cstopb     usa due bit di stop per carattere (uno con \"-\")\n"
 "   [-]hup        invia un signal di hangup quando l'ultimo processo chiude "
@@ -10526,7 +10598,7 @@ msgstr ""
 "parità in input\n"
 "   [-]parodd     imposta la parità dispari (pari con \"-\")\n"
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -10543,7 +10615,7 @@ msgstr ""
 "   [-]ignbrk     ignora i caratteri di break\n"
 "   [-]igncr      ignora i ritorno carrello\n"
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -10558,12 +10630,12 @@ msgstr ""
 "   [-]inpck      abilita il controllo di parità sull'input\n"
 "   [-]istrip     azzera il bit più alto (l'ottavo) dei caratteri di input\n"
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr ""
 " * [-]iutf8      assume che i caratteri in ingresso siano codificati UTF-8\n"
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -10581,7 +10653,7 @@ msgstr ""
 "carattere)\n"
 "   [-]tandem     come [-]ixoff\n"
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -10597,10 +10669,11 @@ msgstr ""
 " * ffN           stile del ritardo dell'avanzamento pagina, N in [0..1]\n"
 " * nlN           stile del ritardo del ritorno a capo, N in [0..1]\n"
 
-#: src/stty.c:631
+#: src/stty.c:635
+#, fuzzy
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
@@ -10614,7 +10687,7 @@ msgstr ""
 " * [-]onlcr      converte ritorno a capo in ritorno carrello-ritorno a capo\n"
 " * [-]onlret     ritorno a capo esegue un ritorno carrello\n"
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -10630,7 +10703,7 @@ msgstr ""
 " * -tabs         come tab3\n"
 " * vtN           stile del ritardo del tabulatore verticale, N in [0..1]\n"
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -10647,7 +10720,7 @@ msgstr ""
 " * -crtkill      cancella tutte le righe obbedendo alle impostazioni\n"
 "                 echoctl e echok\n"
 
-#: src/stty.c:654
+#: src/stty.c:658
 #, fuzzy
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
@@ -10663,7 +10736,7 @@ msgstr ""
 "   [-]echoe      come [-]crterase\n"
 "   [-]echok      fa l'echo di un ritorno a capo dopo un carattere di kill\n"
 
-#: src/stty.c:661
+#: src/stty.c:665
 #, fuzzy
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
@@ -10680,7 +10753,7 @@ msgstr ""
 "   [-]icanon     abilita i caratteri speciali erase, kill, werase, e rprnt\n"
 "   [-]iexten     abilita i caratteri speciali non POSIX\n"
 
-#: src/stty.c:668
+#: src/stty.c:672
 #, fuzzy
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
@@ -10699,7 +10772,7 @@ msgstr ""
 " * [-]xcase      con icanon, fa l'escape con \"\\\" per i caratteri "
 "maiuscoli\n"
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -10713,7 +10786,7 @@ msgstr ""
 "   cbreak        come -icanon\n"
 "   -cbreak       come icanon\n"
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -10725,7 +10798,7 @@ msgstr ""
 "   -cooked       come raw\n"
 "   crt           come echoe echoctl echoke\n"
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -10739,7 +10812,7 @@ msgstr ""
 "   ek            caratteri di erase e kill ai loro valori predefiniti\n"
 "   evenp         come parenb -parodd cs7\n"
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -10755,7 +10828,7 @@ msgstr ""
 "   nl            come -icrnl -onlcr\n"
 "   -nl           come icrnl -inlcr -igncr onlcr -ocrnl -onlret\n"
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -10769,7 +10842,7 @@ msgstr ""
 "   pass8         come -parenb -istrip cs8\n"
 "   -pass8        come parenb istrip cs7\n"
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -10781,7 +10854,7 @@ msgstr ""
 "                 -imaxbel -opost -isig -icanon -xcase min 1 time 0\n"
 "   -raw          come cooked\n"
 
-#: src/stty.c:716
+#: src/stty.c:720
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
 "                 -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n"
@@ -10797,7 +10870,7 @@ msgstr ""
 "                 -xcase -tostop -echoprt echoctl echoke, tutti i caratteri\n"
 "                 speciali ai loro valori predefiniti\n"
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -10812,12 +10885,12 @@ msgstr ""
 "o 127; i valori speciali ^- o undef sono usati per disabilitare i caratteri\n"
 "speciali.\n"
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, c-format
 msgid "only one device may be specified"
 msgstr "può essere specificato un solo dispositivo"
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
@@ -10826,44 +10899,44 @@ msgstr ""
 "le opzioni per gli stili dell'output \"verbose\" e \"stty-readable\" sono "
 "mutualmente esclusive"
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr ""
 "quando si specifica uno stile dell'output, non si possono impostare i modi"
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr "%s: impossibile azzerare il modo non bloccante"
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, c-format
 msgid "invalid argument %s"
 msgstr "argomento %s non valido"
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, c-format
 msgid "missing argument to %s"
 msgstr "manca l'argomento per %s"
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, c-format
 msgid "invalid line discipline %s"
 msgstr "disciplina di riga non valida %s"
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr "%s: impossibile eseguire tutte le operazioni richieste"
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr "%s: non ci sono informazioni sulle dimensioni di questo dispositivo"
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, c-format
 msgid "invalid integer argument %s"
 msgstr "argomento intero %s non valido"
@@ -10920,7 +10993,7 @@ msgstr "      --help     mostra questo aiuto ed esce\n"
 msgid "      --version  output version information and exit\n"
 msgstr "      --version  stampa le informazioni sulla versione ed esce\n"
 
-#: src/system.h:544
+#: src/system.h:543
 #, fuzzy
 msgid ""
 "\n"
@@ -10929,15 +11002,15 @@ msgstr ""
 "Gli argomenti obbligatori per le opzioni lunghe lo sono anche per quelle "
 "brevi.\n"
 
-#: src/system.h:552
+#: src/system.h:551
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -10952,37 +11025,34 @@ msgstr ""
 "Altrimenti, le unità sono predefinite a 1024 byte (o 512 se è impostata "
 "POSIXLY_CORRECT).\n"
 
-# (ndt) - aggiunte le <> per uniformità alle successive
-#: src/system.h:571
-#, c-format
+#: src/system.h:570
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
-msgstr ""
-"\n"
-"Segnalare i bug di %s a <%s>\n"
+"%s online help: <%s>\n"
+msgstr "Sito web di %s: <%s>\n"
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr "Segnalare i bug di traduzione di %s a <tp@lists.linux.it>\n"
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr ""
 "Per la documentazione completa, eseguire: info coreutils \"%s invocation\"\n"
 
-#: src/system.h:596
+#: src/system.h:591
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Usare «%s --help» per ulteriori informazioni.\n"
 
-#: src/system.h:628
+#: src/system.h:633
 #, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -11083,11 +11153,10 @@ msgstr ""
 "\n"
 
 #: src/tail.c:270
+#, fuzzy
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
 "  -c, --bytes=K            stampa gli ultimi K byte; alternativamente, usare "
 "-c +K per\n"
@@ -11095,11 +11164,11 @@ msgstr ""
 "ciascun file\n"
 
 #: src/tail.c:274
+#, fuzzy
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 "  -f, --follow[={name|descriptor}]\n"
@@ -11110,18 +11179,17 @@ msgstr ""
 "  -F                       lo stesso di --follow=name --retry\n"
 
 # (ndt) ho tolto il punto finale in -max-unchanged-stats per uniformità
-#: src/tail.c:281
-#, c-format
+#: src/tail.c:280
+#, fuzzy, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
 "  -n, --lines=K            stampa le ultime K righe, invece delle ultime %d\n"
 "                           o usa -n +K per stampare le righe dalla K-esima\n"
@@ -11134,13 +11202,12 @@ msgstr ""
 "ruotano).\n"
 "                           Con inotify, questa opzione è raramente utile\n"
 
-#: src/tail.c:294
+#: src/tail.c:293
+#, fuzzy
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 "      --pid=PID            con -f, termina dopo che termina il processo PID\n"
 "  -q, --quiet, --silent    non stampa mai le intestazioni fornendo i nomi "
@@ -11151,12 +11218,13 @@ msgstr ""
 "follow=nome\n"
 
 # (ndt) ho tolto il punto finale in -s per uniformità
-#: src/tail.c:301
+#: src/tail.c:298
+#, fuzzy
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 "  -s, --sleep-interval=N   con -f, si ferma per circa N secondi\n"
@@ -11166,7 +11234,7 @@ msgstr ""
 "  -v, --verbose            stampa sempre le intestazioni fornendo i nomi dei "
 "file\n"
 
-#: src/tail.c:310
+#: src/tail.c:307
 #, fuzzy
 msgid ""
 "\n"
@@ -11187,7 +11255,7 @@ msgstr ""
 "GB 1000*1000*1000, G 1024*1024*1024, e così via per T, P, E, Z, Y.\n"
 "\n"
 
-#: src/tail.c:319
+#: src/tail.c:316
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
 "means that even if a tail'ed file is renamed, tail will continue to track\n"
@@ -11208,167 +11276,174 @@ msgstr ""
 "conto\n"
 "di operazione di rinomina, rimozione e creazione.\n"
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr "chiusura di %s (fd=%d)"
 
-#: src/tail.c:453
-#, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr "%s: impossibile posizionarsi all'offset relativo %s"
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr "%s: impossibile posizionarsi all'offset %s relativo alla fine"
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr "impossibile determinare la posizione di %s, ritorno al polling"
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
 "reverting to polling"
 msgstr ""
 
-#: src/tail.c:963
+#: src/tail.c:965
+#, fuzzy, c-format
+msgid "%s has been replaced with a symbolic link. giving up on this name"
+msgstr ""
+"%s è stato sostituito con un file remoto; operazione annullata per questo "
+"nome"
+
+#: src/tail.c:980
 #, c-format
 msgid "%s has become inaccessible"
 msgstr "%s è diventato inaccessibile"
 
-#: src/tail.c:980
+#: src/tail.c:997
 #, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr ""
 "%s è stato sostituito con un file su cui non è possibile eseguire tail; "
 "operazione annullata per questo nome"
 
-#: src/tail.c:989
+#: src/tail.c:1006
 #, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr ""
 "%s è stato sostituito con un file remoto; operazione annullata per questo "
 "nome"
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, c-format
 msgid "%s has become accessible"
 msgstr "%s è divenuto accessibile"
 
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr "%s è comparso; si sta seguendo la fine del nuovo file"
 
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr "%s è stato sostituito; si sta seguendo la fine del nuovo file"
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr "%s: impossibile cambiare il modo non bloccante"
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr "%s: file troncato"
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr "nessun file rimasto"
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, c-format
 msgid "cannot watch parent directory of %s"
 msgstr "impossibile controllare la directory padre di %s"
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, c-format
 msgid "inotify resources exhausted"
 msgstr "risorse inotify esaurite"
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, c-format
 msgid "cannot watch %s"
 msgstr "impossibile controllare %s"
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr "errore monitorando l'evento inotify"
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, c-format
 msgid "error reading inotify event"
 msgstr "errore leggendo l'evento inotify"
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr ""
 "%s: non si può continuare fino alla fine di questo tipo di file; "
 "elaborazione terminata per questo nome"
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, c-format
 msgid "number in %s is too large"
 msgstr "il numero in %s è troppo grande"
 
 # (ndt) sono esecuzioni ripetute della chiamata _stat_, non stati - Giorgio
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr "%s: numero massimo di stat non cambiate tra le aperture non valido"
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr "%s: PID non valido"
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr "%s: numero di secondi non valido"
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr "opzione usata in un contesto non valido -- %c"
 
-#: src/tail.c:2034
+#: src/tail.c:2096
+#, fuzzy, c-format
+msgid "warning: --retry ignored; --retry is useful only when following"
+msgstr "attenzione: PID ignorato; --pid=PID è utile solo seguendo"
+
+#: src/tail.c:2100
 #, c-format
-msgid "warning: --retry is useful mainly when following by name"
-msgstr "attenzione: --retry è utile principalmente se seguito da un nome"
+msgid "warning: --retry only effective for the initial open"
+msgstr ""
 
-#: src/tail.c:2038
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
 msgstr "attenzione: PID ignorato; --pid=PID è utile solo seguendo"
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr "attenzione: --pid=PID non è supportato su questo sistema"
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, c-format
 msgid "cannot follow %s by name"
 msgstr "impossibile seguire %s per nome"
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr ""
 "attenzione: seguire lo standard input in modo indefinito non è efficace"
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr "inotify non può essere usato, ritorno al polling"
@@ -11641,17 +11716,17 @@ msgstr "argomento %s in più"
 msgid "warning: sigprocmask"
 msgstr "attenzione: timer_create"
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr "attenzione: timer_settime"
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr "attenzione: timer_create"
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
@@ -11660,7 +11735,7 @@ msgstr ""
 "Uso: %s [OPZIONE] DURATA COMANDO [ARG]...\n"
 "  o: %s [OPZIONE]\n"
 
-#: src/timeout.c:229
+#: src/timeout.c:232
 #, fuzzy
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
 msgstr ""
@@ -11669,24 +11744,23 @@ msgstr ""
 "Gli argomenti obbligatori per le opzioni lunghe lo sono anche per quelle "
 "brevi.\n"
 
-#: src/timeout.c:235
+#: src/timeout.c:238
 #, fuzzy
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
 "      --foreground\n"
 "                 Quando non si esegue timeout direttamente dalla riga di "
@@ -11704,7 +11778,7 @@ msgstr ""
 "                 SEGNALE può essere un nome come \"HUP\" o un numero.\n"
 "                 Consultare «kill -l» per l'elenco dei segnali\n"
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 #, fuzzy
 msgid ""
 "\n"
@@ -11717,7 +11791,7 @@ msgstr ""
 "\"s\" per secondi (predefinito), \"m\" per minuti, \"h\" per ore o \"d\" per "
 "giorni.\n"
 
-#: src/timeout.c:259
+#: src/timeout.c:262
 #, fuzzy
 msgid ""
 "\n"
@@ -11737,17 +11811,17 @@ msgstr ""
 "usare il segnale KILL (9), dato che questo segnale non può essere "
 "catturato.\n"
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr "attenzione: disabilitazione dei dump di core non riuscita"
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, c-format
 msgid "error waiting for command"
 msgstr "errore aspettando il comando"
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr ""
@@ -12168,9 +12242,10 @@ msgstr ""
 "di byte\n"
 
 #: src/truncate.c:115
+#, fuzzy
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 "  -r, --reference=RFILE  basa la dimensione su RFILE\n"
 "  -s, --size=DIM         imposta o modifica la dimensione del file a questa "
@@ -12264,12 +12339,12 @@ msgstr ""
 "Senza FILE, o quando FILE è -, legge lo standard input.\n"
 "\n"
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr "%s: l'input contiene un numero dispari di token"
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr "%s: l'input contiene un ciclo:"
@@ -12372,12 +12447,12 @@ msgstr "i tabulatori sono troppo grandi"
 msgid "tab stop value is too large"
 msgstr "il valore della posizione del tabulatore è troppo grande"
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr "Uso: %s [OPZIONE]... [INPUT [OUTPUT]]\n"
 
-#: src/uniq.c:138
+#: src/uniq.c:174
 #, fuzzy
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
@@ -12391,42 +12466,46 @@ msgstr ""
 "Senza opzioni, le righe corrispondenti sono unite alla prima occorrenza.\n"
 "\n"
 
-#: src/uniq.c:147
+#: src/uniq.c:183
+#, fuzzy
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
 msgstr ""
 "  -c, --count           mostra il numero di occorrenze all'inizio di ogni "
 "riga\n"
 "  -d, --repeated        stampa solo le righe duplicate\n"
 
-#: src/uniq.c:151
+#: src/uniq.c:187
+msgid ""
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
+msgstr ""
+
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr ""
+
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
+msgstr ""
+
+#: src/uniq.c:199
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
 "  -i, --ignore-case     ignore differences in case when comparing\n"
 "  -s, --skip-chars=N    avoid comparing the first N characters\n"
 "  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
-msgstr ""
-"  -D, --all-repeated[=delimit-method] stampa tutte le righe duplicate\n"
-"                        delimit-method={none(predefinito),prepend,separate}\n"
-"                        la delimitazione viene fatta con righe vuote\n"
-"  -f, --skip-fields=N   evita di confrontare i primi N campi\n"
-"  -i, --ignore-case     ignora le differenze tra maiuscole e minuscole nel "
-"confronto\n"
-"  -s, --skip-chars=N    evita di confrontare i primi N caratteri\n"
-"  -u, --unique          stampa solo le righe uniche\n"
-"  -z, --zero-terminated  termina le righe con il byte \"0\", non con il "
-"ritorno a capo\n"
+msgstr ""
 
-#: src/uniq.c:161
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr "  -w, --check-chars=N   non confronta più di N caratteri nelle righe\n"
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 msgid ""
 "\n"
 "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n"
@@ -12437,7 +12516,7 @@ msgstr ""
 "caratteri\n"
 "non spazi. I campi vengono saltati prima dei caratteri.\n"
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 #, fuzzy
 msgid ""
 "\n"
@@ -12450,24 +12529,35 @@ msgstr ""
 "Si consiglia di ordinare prima l'input o di usare «sort -u» senza «uniq».\n"
 "Inoltre, i confronti rispettano le regole specificate da \"LC_COLLATE\".\n"
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, c-format
 msgid "too many repeated lines"
 msgstr "troppe righe ripetute"
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
 msgstr "numero di campi da saltare non valido"
 
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
 msgstr "numero di byte da saltare non valido"
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
 msgstr "numero di byte da confrontare non valido"
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr ""
+
+#: src/uniq.c:652
+#, fuzzy, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr ""
+"è senza senso stampare tutte le righe duplicate e il numero delle ripetizioni"
+
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr ""
@@ -12490,11 +12580,6 @@ msgstr ""
 "Chiama la funzione unlink per rimuovere il FILE indicato.\n"
 "\n"
 
-#: src/unlink.c:86
-#, c-format
-msgid "cannot unlink %s"
-msgstr "impossibile scollegare %s"
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -12539,7 +12624,7 @@ msgstr[1] "%lu utenti"
 msgid ",  load average: %.2f"
 msgstr ",  carico medio: %.2f"
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -12552,7 +12637,7 @@ msgstr ""
 "ultimi\n"
 "1, 5 e 15 minuti."
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
@@ -12561,12 +12646,12 @@ msgstr ""
 "  Anche i processi in\n"
 "uno stato non interrompibile di riposo contribuiscono al carico medio.\n"
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr "\n"
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
@@ -12805,24 +12890,6 @@ msgstr ""
 "Stampa in continuazione una riga con ogni STRINGA specificata oppure \"y\".\n"
 "\n"
 
-#~ msgid "using single-precision arithmetic"
-#~ msgstr "è in uso l'aritmetica con precisione singola"
-
-#~ msgid "using arbitrary-precision arithmetic"
-#~ msgstr "è in uso l'aritmetica con precisione arbitraria"
-
-#, fuzzy
-#~ msgid "  returning value: '%s'\n"
-#~ msgstr "creazione di %s\n"
-
-#, fuzzy
-#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n"
-#~ msgstr "Uso: %s [OPZIONE]... [UTENTE]...\n"
-
-#, fuzzy
-#~ msgid "no valid suffix found\n"
-#~ msgstr "%s: lunghezza del suffisso non valida"
-
 #~ msgid ""
 #~ "\n"
 #~ "Examples:\n"
@@ -12834,18 +12901,147 @@ msgstr ""
 #~ "  %s /usr/bin/sort      Stampa \"sort\".\n"
 #~ "  %s include/stdio.h .h Stampa \"stdio\".\n"
 
+#~ msgid ""
+#~ "Change the group of each FILE to GROUP.\n"
+#~ "With --reference, change the group of each FILE to that of RFILE.\n"
+#~ "\n"
+#~ "  -c, --changes          like verbose but report only when a change is "
+#~ "made\n"
+#~ "      --dereference      affect the referent of each symbolic link (this "
+#~ "is\n"
+#~ "                         the default), rather than the symbolic link "
+#~ "itself\n"
+#~ msgstr ""
+#~ "Cambia l'appartenenza al gruppo di ogni FILE in GRUPPO.\n"
+#~ "Con --reference, cambia l'appartenenza al gruppo di ogni FILE col gruppo "
+#~ "di RFILE.\n"
+#~ "\n"
+#~ "  -c, --changes           come verbose ma segnala solo i cambiamenti\n"
+#~ "      --dereference       agisce sul file a cui si riferisce ogni "
+#~ "collegamento\n"
+#~ "                          simbolico (predefinito) invece che sul "
+#~ "collegamento stesso\n"
+
+#~ msgid ""
+#~ "  -f, --silent, --quiet  suppress most error messages\n"
+#~ "      --reference=RFILE  use RFILE's group rather than specifying a\n"
+#~ "                         GROUP value\n"
+#~ "  -R, --recursive        operate on files and directories recursively\n"
+#~ "  -v, --verbose          output a diagnostic for every file processed\n"
+#~ "\n"
+#~ msgstr ""
+#~ "  -f, --silent, --quiet   sopprime la maggior parte dei messaggi di "
+#~ "errore\n"
+#~ "      --reference=RFILE   usa il gruppo di RFILE piuttosto che "
+#~ "specificare GRUPPO\n"
+#~ "  -R, --recursive         opera ricorsivamente su file e directory\n"
+#~ "  -v, --verbose           mostra una diagnostica per ogni file elaborato\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Change the mode of each FILE to MODE.\n"
+#~ "\n"
+#~ "  -c, --changes           like verbose but report only when a change is "
+#~ "made\n"
+#~ msgstr ""
+#~ "Cambia il modo di ogni FILE in MODE.\n"
+#~ "\n"
+#~ "  -c, --changes           come \"verbose\" ma segnala solo quando viene "
+#~ "effettuato un cambiamento\n"
+
+#~ msgid ""
+#~ "      --no-preserve-root  do not treat `/' specially (the default)\n"
+#~ "      --preserve-root     fail to operate recursively on `/'\n"
+#~ msgstr ""
+#~ "      --no-preserve-root  non considera \"/\" in modo speciale "
+#~ "(predefinito)\n"
+#~ "      --preserve-root     fallisce operando ricorsivamente su \"/\"\n"
+
+#~ msgid ""
+#~ "  -f, --silent, --quiet   suppress most error messages\n"
+#~ "  -v, --verbose           output a diagnostic for every file processed\n"
+#~ "      --reference=RFILE   use RFILE's mode instead of MODE values\n"
+#~ "  -R, --recursive         change files and directories recursively\n"
+#~ msgstr ""
+#~ "  -f, --silent, --quiet   nasconde la maggior parte dei messaggi "
+#~ "d'errore\n"
+#~ "  -v, --verbose           mostra una diagnostica per ogni file elaborato\n"
+#~ "      --reference=RFILE   utilizza il modo di RFILE anziché i valori di "
+#~ "MODE\n"
+#~ "  -R, --recursive         cambia i file e le cartelle ricorsivamente\n"
+
+#~ msgid ""
+#~ "Change the owner and/or group of each FILE to OWNER and/or GROUP.\n"
+#~ "With --reference, change the owner and group of each FILE to those of "
+#~ "RFILE.\n"
+#~ "\n"
+#~ "  -c, --changes          like verbose but report only when a change is "
+#~ "made\n"
+#~ "      --dereference      affect the referent of each symbolic link (this "
+#~ "is\n"
+#~ "                         the default), rather than the symbolic link "
+#~ "itself\n"
+#~ msgstr ""
+#~ "Cambia il proprietario o il gruppo di ogni FILE in PROPRIETARIO o "
+#~ "GRUPPO.\n"
+#~ "Con --reference, cambia il proprietario e il gruppo di ciascun FILE con "
+#~ "quello di RFILE.\n"
+#~ "\n"
+#~ "  -c, --changes          come \"verbose\" ma segnala solo quando viene "
+#~ "effettuato un cambiamento\n"
+#~ "      --dereference      agisce sul file a cui si riferisce ogni "
+#~ "collegamento\n"
+#~ "                         simbolico (predefinito) invece che sul "
+#~ "collegamento stesso\n"
+
+#~ msgid ""
+#~ "  -f, --silent, --quiet  suppress most error messages\n"
+#~ "      --reference=RFILE  use RFILE's owner and group rather than\n"
+#~ "                         specifying OWNER:GROUP values\n"
+#~ "  -R, --recursive        operate on files and directories recursively\n"
+#~ "  -v, --verbose          output a diagnostic for every file processed\n"
+#~ "\n"
+#~ msgstr ""
+#~ "  -f, --silent, --quiet  sopprime la maggior parte dei messaggi di "
+#~ "errore\n"
+#~ "      --reference=RFILE  usa il proprietario e gruppo di RFILE piuttosto "
+#~ "che\n"
+#~ "                         specificare i valori PROPRIETARIO:GRUPPO\n"
+#~ "  -R, --recursive        opera ricorsivamente su file e directory\n"
+#~ "  -v, --verbose          mostra una diagnostica per ogni file elaborato\n"
+#~ "\n"
+
+#~ msgid "failed to set additional groups"
+#~ msgstr "impostazione dei gruppi supplementari non riuscita"
+
 #~ msgid "reading %s"
 #~ msgstr "lettura di %s"
 
 #~ msgid "writing %s"
 #~ msgstr "scrittura di %s"
 
+#~ msgid "failed to get file system create context"
+#~ msgstr "recupero del contesto di creazione del file system non riuscito"
+
 #~ msgid "closing %s"
 #~ msgstr "chiusura di %s"
 
 #~ msgid "accessing %s"
 #~ msgstr "accesso a %s"
 
+#~ msgid ""
+#~ "Display the current time in the given FORMAT, or set the system date.\n"
+#~ "\n"
+#~ "  -d, --date=STRING         display time described by STRING, not `now'\n"
+#~ "  -f, --file=DATEFILE       like --date once for each line of DATEFILE\n"
+#~ msgstr ""
+#~ "Visualizza l'orario corrente nel FORMATO dato, o imposta la data di "
+#~ "sistema.\n"
+#~ "\n"
+#~ "  -d, --date=STRINGA        visualizza l'orario specificato da STRINGA, "
+#~ "non \"adesso\"\n"
+#~ "  -f, --file=FILEDATA       come --date una per ogni riga di FILEDATA\n"
+
 #~ msgid "opening %s"
 #~ msgstr "apertura di %s"
 
@@ -12878,19 +13074,45 @@ msgstr ""
 #~ "                        di comando; --max-depth=0 è lo stesso che --"
 #~ "summarize\n"
 
-#, fuzzy
+#~ msgid "using arbitrary-precision arithmetic"
+#~ msgstr "è in uso l'aritmetica con precisione arbitraria"
+
+#~ msgid "using single-precision arithmetic"
+#~ msgstr "è in uso l'aritmetica con precisione singola"
+
+#~ msgid "%s: cannot lseek back to original position"
+#~ msgstr "%s: impossibile fare lseek alla posizione originale"
+
+#~ msgid "cannot reposition file pointer for %s"
+#~ msgstr "impossibile reimpostare la posizione del file per %s"
+
+#~ msgid "Usage: %s [OPTION]... [USERNAME]\n"
+#~ msgstr "Uso: %s [OPZIONE]... [NOMEUTENTE]\n"
+
 #~ msgid ""
-#~ "  none, off       never make backups (even if --backup is given)\n"
-#~ "  numbered, t     make numbered backups\n"
-#~ "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
-#~ "  simple, never   always make simple backups\n"
-#~ "\n"
+#~ "      --preserve-context  preserve SELinux security context\n"
+#~ "  -Z, --context=CONTEXT  set SELinux security context of files and "
+#~ "directories\n"
 #~ msgstr ""
-#~ "  none, off       non fa mai backup (anche se è specificato --backup)\n"
-#~ "  numbered, t     fa backup numerati\n"
-#~ "  existing, nil   numerati se esistono backup numerati, altrimenti "
-#~ "semplici\n"
-#~ "  simple, never   fa sempre backup semplici\n"
+#~ "      --preserve-context  preserva il contesto di sicurezza SELinux\n"
+#~ "  -Z, --context=CONTEXT  imposta il contesto di sicurezza SELinux di file "
+#~ "e directory\n"
+
+#~ msgid ""
+#~ "  -Z, --context=CTX  set the SELinux security context of each NAME to "
+#~ "CTX\n"
+#~ msgstr ""
+#~ "  -Z, --context=CTX  imposta il contesto di sicurezza SELinux di ciascun "
+#~ "NOME in CTX\n"
+
+#~ msgid ""
+#~ "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
+#~ msgstr ""
+#~ "  -Z, --context=CTX  imposta il contesto di sicurezza SELinux di NOME in "
+#~ "CTX\n"
+
+#~ msgid "failed to redirect stderr to /dev/null"
+#~ msgstr "reindirizzamento dello stderr in /dev/null non riuscito"
 
 #~ msgid ""
 #~ "WARNING: --page-increment is deprecated; use --line-increment instead"
@@ -12903,6 +13125,14 @@ msgstr ""
 #~ "corte.\n"
 
 #~ msgid ""
+#~ "  -A, --address-radix=RADIX   decide how file offsets are printed\n"
+#~ "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
+#~ msgstr ""
+#~ "  -A, --address-radix=RADICE  decide come gli offset del file sono "
+#~ "stampati\n"
+#~ "  -j, --skip-bytes=BYTE       salta BYTE input prima\n"
+
+#~ msgid ""
 #~ "\n"
 #~ "RADIX is d for decimal, o for octal, x for hexadecimal or n for none.\n"
 #~ "BYTES is hexadecimal with 0x or 0X prefix, and may have a multiplier "
@@ -12933,9 +13163,78 @@ msgstr ""
 #~ "numero\n"
 #~ "implica 32. In modo predefinito, od usa -A o -t d2 -w16.\n"
 
+#~ msgid ""
+#~ "\n"
+#~ "With no FILE or if FILE is -, read Standard Input.  `-F /' by default.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Se FILE non è specificato o se FILE è -, legge lo standard input. «-F /» "
+#~ "è il predefinito.\n"
+
 #~ msgid "Usage: %s [OPTION]... FILE\n"
 #~ msgstr "Uso: %s [OPZIONE]... FILE\n"
 
+#~ msgid "cannot remove directory: %s"
+#~ msgstr "impossibile rimuovere la directory: %s"
+
+#~ msgid ""
+#~ "Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
+#~ "  or:  %s LONG-OPTION\n"
+#~ msgstr ""
+#~ "Uso: %s [OPZIONE-CORTA]... UTENTE COMANDO [ARGOMENTO]...\n"
+#~ "  o:  %s OPZIONE-LUNGA\n"
+
+#~ msgid ""
+#~ "Drop any supplemental groups, assume the user-ID and group-ID of the "
+#~ "specified\n"
+#~ "USER (numeric ID or user name), and run COMMAND with any specified "
+#~ "ARGUMENTs.\n"
+#~ "Exit with status 111 if unable to assume the required user and group ID.\n"
+#~ "Otherwise, exit with the exit status of COMMAND.\n"
+#~ "This program is useful only when run by root (user ID zero).\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Scarta ogni gruppo supplementare, assume l'id utente e di gruppo "
+#~ "dell'UTENTE specificato\n"
+#~ "(id numerico o nome utente), ed esegue COMANDO con ciascun ARGOMENTO "
+#~ "specificato.\n"
+#~ "Esce con lo stato 111 se incapace di assumere gli id utente e di gruppo "
+#~ "richiesti.\n"
+#~ "Altrimenti, esce con lo stato di uscita di COMANDO.\n"
+#~ "Questo programma è utile solo se eseguito da root (id utente zero).\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, "
+#~ "and\n"
+#~ "                    (if specified) supplemental group IDs to GID1, ...\n"
+#~ msgstr ""
+#~ "  -g GID[,GID1...]  imposta anche l'id di gruppo primario come il numero "
+#~ "GID, e\n"
+#~ "                    (se specificati) gli ID dei gruppi supplementari come "
+#~ "GID1, ...\n"
+
+#~ msgid "unknown user-ID: %s"
+#~ msgstr "id utente sconosciuto: %s"
+
+#~ msgid "to use user-ID %s you need to use -g too"
+#~ msgstr "per usare l'id utente %s bisogna usare anche -g"
+
+#~ msgid "cannot set group-ID to %lu"
+#~ msgstr "impossibile impostare l'id di gruppo a %lu"
+
+#~ msgid "cannot set user-ID to %lu"
+#~ msgstr "impossibile impostare l'id utente a %lu"
+
+#~ msgid "dup2 failed"
+#~ msgstr "dup2 non riuscita"
+
+#~ msgid "couldn't execute %s"
+#~ msgstr "impossibile eseguire %s"
+
+#~ msgid "couldn't execute %s -d"
+#~ msgstr "impossibile eseguire %s -d"
+
 #~ msgid "Password:"
 #~ msgstr "Password:"
 
@@ -12948,9 +13247,6 @@ msgstr ""
 #~ msgid "cannot set group id"
 #~ msgstr "impossibile impostare l'id del gruppo"
 
-#~ msgid "cannot set user id"
-#~ msgstr "impossibile impostare l'id utente"
-
 #~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n"
 #~ msgstr "Uso: %s [OPZIONE]... [-] [UTENTE [ARG]...]\n"
 
@@ -12994,139 +13290,50 @@ msgstr ""
 #~ msgid "warning: cannot change directory to %s"
 #~ msgstr "attenzione: impossibile cambiare la directory in %s"
 
-#, fuzzy
 #~ msgid ""
-#~ "Change the group of each FILE to GROUP.\n"
-#~ "With --reference, change the group of each FILE to that of RFILE.\n"
-#~ "\n"
-#~ "  -c, --changes          like verbose but report only when a change is "
-#~ "made\n"
-#~ "  -f, --silent, --quiet  suppress most error messages\n"
-#~ "  -v, --verbose          output a diagnostic for every file processed\n"
-#~ msgstr ""
-#~ "Cambia l'appartenenza al gruppo di ogni FILE in GRUPPO.\n"
-#~ "Con --reference, cambia l'appartenenza al gruppo di ogni FILE col gruppo "
-#~ "di RFILE.\n"
 #~ "\n"
-#~ "  -c, --changes           come verbose ma segnala solo i cambiamenti\n"
-#~ "      --dereference       agisce sul file a cui si riferisce ogni "
-#~ "collegamento\n"
-#~ "                          simbolico (predefinito) invece che sul "
-#~ "collegamento stesso\n"
-
-#~ msgid ""
-#~ "      --no-preserve-root  do not treat `/' specially (the default)\n"
-#~ "      --preserve-root     fail to operate recursively on `/'\n"
-#~ msgstr ""
-#~ "      --no-preserve-root  non considera \"/\" in modo speciale "
-#~ "(predefinito)\n"
-#~ "      --preserve-root     fallisce operando ricorsivamente su \"/\"\n"
-
-#~ msgid ""
-#~ "  -f, --silent, --quiet  suppress most error messages\n"
-#~ "      --reference=RFILE  use RFILE's group rather than specifying a\n"
-#~ "                         GROUP value\n"
-#~ "  -R, --recursive        operate on files and directories recursively\n"
-#~ "  -v, --verbose          output a diagnostic for every file processed\n"
-#~ "\n"
-#~ msgstr ""
-#~ "  -f, --silent, --quiet   sopprime la maggior parte dei messaggi di "
-#~ "errore\n"
-#~ "      --reference=RFILE   usa il gruppo di RFILE piuttosto che "
-#~ "specificare GRUPPO\n"
-#~ "  -R, --recursive         opera ricorsivamente su file e directory\n"
-#~ "  -v, --verbose           mostra una diagnostica per ogni file elaborato\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Change the mode of each FILE to MODE.\n"
-#~ "\n"
-#~ "  -c, --changes           like verbose but report only when a change is "
-#~ "made\n"
-#~ msgstr ""
-#~ "Cambia il modo di ogni FILE in MODE.\n"
-#~ "\n"
-#~ "  -c, --changes           come \"verbose\" ma segnala solo quando viene "
-#~ "effettuato un cambiamento\n"
-
-#~ msgid ""
-#~ "  -f, --silent, --quiet   suppress most error messages\n"
-#~ "  -v, --verbose           output a diagnostic for every file processed\n"
-#~ "      --reference=RFILE   use RFILE's mode instead of MODE values\n"
-#~ "  -R, --recursive         change files and directories recursively\n"
-#~ msgstr ""
-#~ "  -f, --silent, --quiet   nasconde la maggior parte dei messaggi "
-#~ "d'errore\n"
-#~ "  -v, --verbose           mostra una diagnostica per ogni file elaborato\n"
-#~ "      --reference=RFILE   utilizza il modo di RFILE anziché i valori di "
-#~ "MODE\n"
-#~ "  -R, --recursive         cambia i file e le cartelle ricorsivamente\n"
-
-#~ msgid ""
-#~ "Change the owner and/or group of each FILE to OWNER and/or GROUP.\n"
-#~ "With --reference, change the owner and group of each FILE to those of "
-#~ "RFILE.\n"
-#~ "\n"
-#~ "  -c, --changes          like verbose but report only when a change is "
-#~ "made\n"
-#~ "      --dereference      affect the referent of each symbolic link (this "
-#~ "is\n"
-#~ "                         the default), rather than the symbolic link "
-#~ "itself\n"
+#~ "SIZE may be (or may be an integer optionally followed by) one of "
+#~ "following:\n"
+#~ "KB 1000, K 1024, MB 1000*1000, M 1024*1024, and so on for G, T, P, E, Z, "
+#~ "Y.\n"
 #~ msgstr ""
-#~ "Cambia il proprietario o il gruppo di ogni FILE in PROPRIETARIO o "
-#~ "GRUPPO.\n"
-#~ "Con --reference, cambia il proprietario e il gruppo di ciascun FILE con "
-#~ "quello di RFILE.\n"
 #~ "\n"
-#~ "  -c, --changes          come \"verbose\" ma segnala solo quando viene "
-#~ "effettuato un cambiamento\n"
-#~ "      --dereference      agisce sul file a cui si riferisce ogni "
-#~ "collegamento\n"
-#~ "                         simbolico (predefinito) invece che sul "
-#~ "collegamento stesso\n"
+#~ "DIM può essere uno dei seguenti (o opzionalmente un intero seguito da):\n"
+#~ "KB 1000, K 1024, MB 1000*1000, M 1024*1024, e così via per G, T, P, E, Z "
+#~ "e Y.\n"
 
+# (ndt) - aggiunte le <> per uniformità alle successive
 #~ msgid ""
-#~ "  -f, --silent, --quiet  suppress most error messages\n"
-#~ "      --reference=RFILE  use RFILE's owner and group rather than\n"
-#~ "                         specifying OWNER:GROUP values\n"
-#~ "  -R, --recursive        operate on files and directories recursively\n"
-#~ "  -v, --verbose          output a diagnostic for every file processed\n"
 #~ "\n"
+#~ "Report %s bugs to %s\n"
 #~ msgstr ""
-#~ "  -f, --silent, --quiet  sopprime la maggior parte dei messaggi di "
-#~ "errore\n"
-#~ "      --reference=RFILE  usa il proprietario e gruppo di RFILE piuttosto "
-#~ "che\n"
-#~ "                         specificare i valori PROPRIETARIO:GRUPPO\n"
-#~ "  -R, --recursive        opera ricorsivamente su file e directory\n"
-#~ "  -v, --verbose          mostra una diagnostica per ogni file elaborato\n"
 #~ "\n"
+#~ "Segnalare i bug di %s a <%s>\n"
 
-#~ msgid ""
-#~ "Display the current time in the given FORMAT, or set the system date.\n"
-#~ "\n"
-#~ "  -d, --date=STRING         display time described by STRING, not `now'\n"
-#~ "  -f, --file=DATEFILE       like --date once for each line of DATEFILE\n"
-#~ msgstr ""
-#~ "Visualizza l'orario corrente nel FORMATO dato, o imposta la data di "
-#~ "sistema.\n"
-#~ "\n"
-#~ "  -d, --date=STRINGA        visualizza l'orario specificato da STRINGA, "
-#~ "non \"adesso\"\n"
-#~ "  -f, --file=FILEDATA       come --date una per ogni riga di FILEDATA\n"
+#~ msgid "warning: --retry is useful mainly when following by name"
+#~ msgstr "attenzione: --retry è utile principalmente se seguito da un nome"
 
 #~ msgid ""
-#~ "\n"
-#~ "SIZE may be (or may be an integer optionally followed by) one of "
-#~ "following:\n"
-#~ "KB 1000, K 1024, MB 1000*1000, M 1024*1024, and so on for G, T, P, E, Z, "
-#~ "Y.\n"
+#~ "  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
+#~ "                        delimit-method={none(default),prepend,separate}\n"
+#~ "                        Delimiting is done with blank lines\n"
+#~ "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+#~ "  -i, --ignore-case     ignore differences in case when comparing\n"
+#~ "  -s, --skip-chars=N    avoid comparing the first N characters\n"
+#~ "  -u, --unique          only print unique lines\n"
+#~ "  -z, --zero-terminated  end lines with 0 byte, not newline\n"
 #~ msgstr ""
-#~ "\n"
-#~ "DIM può essere uno dei seguenti (o opzionalmente un intero seguito da):\n"
-#~ "KB 1000, K 1024, MB 1000*1000, M 1024*1024, e così via per G, T, P, E, Z "
-#~ "e Y.\n"
+#~ "  -D, --all-repeated[=delimit-method] stampa tutte le righe duplicate\n"
+#~ "                        delimit-method={none(predefinito),prepend,"
+#~ "separate}\n"
+#~ "                        la delimitazione viene fatta con righe vuote\n"
+#~ "  -f, --skip-fields=N   evita di confrontare i primi N campi\n"
+#~ "  -i, --ignore-case     ignora le differenze tra maiuscole e minuscole "
+#~ "nel confronto\n"
+#~ "  -s, --skip-chars=N    evita di confrontare i primi N caratteri\n"
+#~ "  -u, --unique          stampa solo le righe uniche\n"
+#~ "  -z, --zero-terminated  termina le righe con il byte \"0\", non con il "
+#~ "ritorno a capo\n"
 
 #~ msgid "cannot create link %s"
 #~ msgstr "impossibile creare il collegamento %s"
diff --git a/po/ja.gmo b/po/ja.gmo
index be439979..7600b378 100644
--- a/po/ja.gmo
+++ b/po/ja.gmo
diff --git a/po/ja.po b/po/ja.po
index e8c99452..d88a8754 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU coreutils 8.14\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
 "PO-Revision-Date: 2011-10-28 09:23+0900\n"
 "Last-Translator: Yasuaki Taniguchi <yasuakit@gmail.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -38,76 +38,124 @@ msgstr "有効�引数:"
 msgid "error closing file"
 msgstr "ファイルクローズエラー"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "書�込�エラー"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "%s �パーミッションを�存�����"
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "�明�システムエラー"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "通常�空ファイル"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "通常ファイル"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "ディレクトリ"
 
-#: lib/file-type.c:44
-msgid "block special file"
-msgstr "ブロックスペシャルファイル"
-
-#: lib/file-type.c:47
-msgid "character special file"
-msgstr "キャラクタスペシャルファイル"
-
-#: lib/file-type.c:50
-msgid "fifo"
-msgstr "fifo"
-
-#: lib/file-type.c:53
+#: lib/file-type.c:46
 msgid "symbolic link"
 msgstr "シンボリックリンク"
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "ソケット"
-
-#: lib/file-type.c:59
+#: lib/file-type.c:52
 msgid "message queue"
 msgstr "メッセージキュー"
 
-#: lib/file-type.c:62
+#: lib/file-type.c:55
 msgid "semaphore"
 msgstr "セマフォ"
 
-#: lib/file-type.c:65
+#: lib/file-type.c:58
 msgid "shared memory object"
 msgstr "共有メモリオブジェクト"
 
-#: lib/file-type.c:68
+#: lib/file-type.c:61
 msgid "typed memory object"
 msgstr "型付メモリオブジェクト"
 
-#: lib/file-type.c:70
+#: lib/file-type.c:66
+msgid "block special file"
+msgstr "ブロックスペシャルファイル"
+
+#: lib/file-type.c:69
+msgid "character special file"
+msgstr "キャラクタスペシャルファイル"
+
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr ""
+
+#: lib/file-type.c:75
+msgid "fifo"
+msgstr "fifo"
+
+#: lib/file-type.c:78
+msgid "door"
+msgstr ""
+
+#: lib/file-type.c:81
+#, fuzzy
+msgid "multiplexed block special file"
+msgstr "ブロックスペシャルファイル"
+
+#: lib/file-type.c:84
+#, fuzzy
+msgid "multiplexed character special file"
+msgstr "キャラクタスペシャルファイル"
+
+#: lib/file-type.c:87
+#, fuzzy
+msgid "multiplexed file"
+msgstr "複数�ロール"
+
+#: lib/file-type.c:90
+#, fuzzy
+msgid "named file"
+msgstr "�明�ファイル"
+
+#: lib/file-type.c:93
+#, fuzzy
+msgid "network special file"
+msgstr "ブロックスペシャルファイル"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr ""
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr ""
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr ""
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "ソケット"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr ""
+
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "�明�ファイル"
 
@@ -242,18 +290,18 @@ msgstr "%s: オプション '-W %s' �引数を�る�������ん\n
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: オプション '-W %s' �引数�必���\n"
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr "%s �パーミッションを変更����ん"
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "ディレクトリ %s を作�����ん"
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr "メモリを使�果�����"
@@ -370,7 +418,7 @@ msgstr "正�表��大�����"
 msgid "Unmatched ) or \\)"
 msgstr ") ��� \\) ��一致��"
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 msgid "No previous regular expression"
 msgstr "以��正�表���り��ん"
 
@@ -396,7 +444,7 @@ msgstr ""
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[yY]"
 
@@ -406,11 +454,11 @@ msgstr "^[yY]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, c-format
 msgid "setting permissions for %s"
 msgstr "%s �パーミッションを設定���"
@@ -551,18 +599,6 @@ msgstr "電�エラー"
 msgid "Resource lost"
 msgstr "リソース�無��り���"
 
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, fuzzy, c-format
-msgid "cannot create pipe"
-msgstr "fifo %s を作�����ん"
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, fuzzy, c-format
-msgid "%s subprocess failed"
-msgstr "%s: ファイル探査 (seek) �失敗����"
-
 #: lib/strsignal.c:114
 #, c-format
 msgid "Real-time signal %d"
@@ -773,7 +809,7 @@ msgstr ""
 msgid "Report %s bugs to: %s\n"
 msgstr "%s ��グ� <%s> �報告������。\n"
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s �ホームページ: <%s>\n"
@@ -783,31 +819,11 @@ msgstr "%s �ホームページ: <%s>\n"
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr "%s �ホームページ: <http://www.gnu.org/software/%s/>\n"
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr ""
 "GNU ソフトウェアを使用�る際�一般的�ヘルプ: <http://www.gnu.org/gethelp/>\n"
 
-#: lib/w32spawn.h:43
-#, fuzzy, c-format
-msgid "_open_osfhandle failed"
-msgstr "オープン�失敗����"
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr ""
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr ""
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr ""
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr "標準入力"
@@ -829,7 +845,7 @@ msgstr "�明�ストリーム"
 msgid "failed to reopen %s with mode %s"
 msgstr "%s をモード %s ��度開����失敗����"
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr "文字列�比較�失敗"
@@ -895,7 +911,7 @@ msgstr ""
 "                          0 を指定��場��改行を行���\n"
 "\n"
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -917,48 +933,47 @@ msgstr ""
 "場���り��。入力ストリーム�他��英字�イト���れ���回復\n"
 "���場�� --ignore-garbage を使用������。\n"
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "読�込�エラー"
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, c-format
 msgid "invalid input"
 msgstr "無効�入力"
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, c-format
 msgid "invalid wrap size: %s"
 msgstr "無効�折り返�列数: %s"
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, c-format
 msgid "extra operand %s"
 msgstr "余分�演算� %s"
 
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, c-format
 msgid "closing standard input"
 msgstr "標準入力を閉�����"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -989,8 +1004,8 @@ msgstr ""
 #: src/basename.c:60
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/basename.c:67
@@ -1004,32 +1019,31 @@ msgid ""
 "  %s -a any/str1 any/str2   -> \"str1\" followed by \"str2\"\n"
 msgstr ""
 
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, c-format
 msgid "missing operand"
 msgstr "オペランド��り��ん"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr "Torbjorn Granlund"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 msgid "Richard M. Stallman"
 msgstr "Richard M. Stallman"
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1088,7 +1102,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr "%s � ioctl を実行����ん"
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr "標準出力"
@@ -1105,14 +1119,14 @@ msgstr "Russell Coker"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 msgid "Jim Meyering"
 msgstr "Jim Meyering"
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, c-format
 msgid "failed to create security context: %s"
 msgstr "セキュリティコンテキスト�作��失敗����: %s"
@@ -1122,8 +1136,8 @@ msgstr "セキュリティコンテキスト�作��失敗����: %s"
 msgid "failed to set %s security context component to %s"
 msgstr "%s セキュリティコンテキストコン�ー�ントを %s �設定出���ん���"
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, c-format
 msgid "failed to get security context of %s"
 msgstr "%s �セキュリティコンテキストを�得����ん���"
@@ -1134,18 +1148,18 @@ msgid "can't apply partial context to unlabeled file %s"
 msgstr ""
 "ラベル�付�られ����ファイル %s �部分的�コンテキストを�用����ん"
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, c-format
 msgid "failed to change context of %s to %s"
 msgstr "%s �コンテキストを %s �変更����ん"
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
 msgstr "%s �アクセス����ん"
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, c-format
 msgid "cannot read directory %s"
 msgstr "ディレクトリ %s を読�込���ん"
@@ -1155,13 +1169,14 @@ msgstr "ディレクトリ %s を読�込���ん"
 msgid "changing security context of %s\n"
 msgstr "%s �セキュリティコンテキストを変更�����\n"
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, c-format
 msgid "fts_read failed"
 msgstr "fts_read �失敗����"
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, c-format
 msgid "fts_close failed"
 msgstr "fts_close �失敗����"
@@ -1180,7 +1195,7 @@ msgstr ""
 #: src/chcon.c:357
 #, fuzzy
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
@@ -1217,7 +1232,7 @@ msgstr ""
 "                         RANGE �設定�る\n"
 "\n"
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 #, fuzzy
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
@@ -1272,36 +1287,37 @@ msgstr ""
 "  -P                     シンボリックリンクを辿ら�� (デフォルト)\n"
 "\n"
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr "-R --dereference � -H ��� -L ���れ��必���"
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr "-R -h � -P �必���"
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, c-format
 msgid "missing operand after %s"
 msgstr "%s �後�オペランド��り��ん"
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, c-format
 msgid "invalid context: %s"
 msgstr "無効�コンテキスト: %s"
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr "与�られ�セキュリティコンテキスト指定�競������"
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, c-format
 msgid "failed to get attributes of %s"
 msgstr "%s �属性情報を�得����ん���"
@@ -1334,7 +1350,7 @@ msgstr ""
 "  -h, --no-dereference   �照先�ファイル�代�り�シンボリックリンク��用�"
 "ã‚‹\n"
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
@@ -1371,47 +1387,47 @@ msgstr ""
 "  %s -hR staff /u  /u �よ����下�ファイル�グループを \"staff\"\n"
 "                   �変更�る。\n"
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
 msgstr "%s �新��属性情報を�得中"
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr "シンボリックリンク %s も���照先も変更�れ��ん���\n"
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr "%s �モードを %04lo (%s) �ら %04lo (%s) �変更����\n"
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr "%s �モードを %04lo (%s) �ら %04lo (%s) �変更����ん���\n"
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr "%s �モード� %04lo (%s) ����留�れ���\n"
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr "�照先���シンボリックリンク %s を�作����ん"
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, c-format
 msgid "changing permissions of %s"
 msgstr "%s �パーミッションを変更�����"
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr "%s: 新�パーミッション� %s ��。%s ���り��ん。"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1422,7 +1438,7 @@ msgstr ""
 "���: %s [OPTION]... OCTAL-MODE FILE...\n"
 "���: %s [OPTION]... --reference=RFILE FILE...\n"
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 #, fuzzy
 msgid ""
 "Change the mode of each FILE to MODE.\n"
@@ -1436,20 +1452,15 @@ msgstr ""
 "  -h, --no-dereference   �照先�ファイル�代�り�シンボリックリンク��用�"
 "ã‚‹\n"
 
-#: src/chmod.c:391
-#, fuzzy
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
-"      --reference=RFILE  CONTEXT �値を指定�る��代��� RFILE �\n"
-"                         セキュリティコンテキストを使用�る\n"
-"  -R, --recursive        ファイル�ディレクトリを�帰的��作�る\n"
-"  -v, --verbose          �ファイルを処���時�診断を出力�る\n"
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr ""
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 #, fuzzy
 msgid ""
 "\n"
@@ -1458,12 +1469,12 @@ msgstr ""
 "\n"
 "� MODE � `[ugoa]*([-+=]([rwxXst]*|[ugo]))+' �形���。\n"
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr "モード� --reference オプションを�時�使用����ん"
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, c-format
 msgid "invalid mode: %s"
 msgstr "無効�モード: %s"
@@ -1610,26 +1621,21 @@ msgstr ""
 "  %s -hR root /u    /u �下�ファイル�所有者を \"root\" �変更���。\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr "Roland McGrath"
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr "無効�グループ %s"
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, c-format
 msgid "invalid group list %s"
 msgstr "無効�グループリスト %s"
 
-#: src/chroot.c:117
-#, c-format
-msgid "failed to set additional groups"
-msgstr "追加�グループを設定����ん���"
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
@@ -1638,7 +1644,7 @@ msgstr ""
 "使用法: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
 "���: %s OPTION\n"
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
@@ -1646,7 +1652,7 @@ msgstr ""
 "ルートディレクトリを NEWROOT �設定��コマンドを実行���。\n"
 "\n"
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
@@ -1655,7 +1661,7 @@ msgstr ""
 "定���\n"
 "  --groups=G_LIST        g1,g2,..,gN 形��追加�グループを指定���\n"
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 #, fuzzy
 msgid ""
 "\n"
@@ -1665,28 +1671,42 @@ msgstr ""
 "COMMAND �与�られ��場��``${SHELL} -i'' (デフォルト: /bin/sh) を実行��"
 "�。\n"
 
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, c-format
 msgid "cannot change root directory to %s"
 msgstr "ルートディレクトリを %s �変更����ん"
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, c-format
 msgid "cannot chdir to root directory"
 msgstr "ルートディレクトリ�移動����ん"
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr ""
+
+#: src/chroot.c:383
+#, fuzzy, c-format
+msgid "failed to get supplemental groups"
+msgstr "追加グループ�設定�失敗����"
+
+#: src/chroot.c:395
+#, fuzzy, c-format
+msgid "failed to %s supplemental groups"
+msgstr "追加グループ�設定�失敗����"
+
+#: src/chroot.c:402
 #, c-format
 msgid "failed to set group-ID"
 msgstr "グループ ID �設定�失敗����"
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, c-format
 msgid "failed to set user-ID"
 msgstr "ユーザー ID �設定�失敗����"
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, c-format
 msgid "failed to run command %s"
 msgstr "コマンド %s �実行�失敗����"
@@ -1718,7 +1738,7 @@ msgstr ""
 "� FILE � CRC �ェックサム�よ��イト数を表示���。\n"
 "\n"
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr "使用法: %s [OPTION]... FILE1 FILE2\n"
@@ -1805,297 +1825,330 @@ msgstr "複数�区切り文字�指定�れ���"
 msgid "empty %s not allowed"
 msgstr "空� %s �許��れ����ん"
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr "%s �読�込�エラー"
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, c-format
 msgid "cannot lseek %s"
 msgstr "lseek %s を�る�������ん"
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr "%s �書�込�エラー"
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, c-format
 msgid "%s: failed to get extents info"
 msgstr "%s: エクステント情報��得�失敗����"
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, c-format
 msgid "%s: write failed"
 msgstr "%s: 書�込��失敗����"
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, c-format
 msgid "failed to extend %s"
 msgstr "%s �拡張�失敗����"
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, c-format
 msgid "clearing permissions for %s"
 msgstr "%s �パーミッションを消去�����"
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "%s �所有者��護�失敗����"
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
 msgstr "ファイル %s �見��り��ん���"
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, c-format
 msgid "failed to preserve authorship for %s"
 msgstr "%s �作�者��護�失敗����"
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
+#, c-format
+msgid "failed to set default file creation context to %s"
+msgstr "デフォルト�ファイル作�コンテキストを %s �設定����ん���"
+
+#: src/copy.c:820
+#, fuzzy, c-format
+msgid "failed to set default file creation context for %s"
+msgstr "デフォルト�ファイル作�コンテキストを %s �設定����ん���"
+
+#: src/copy.c:846
+#, fuzzy, c-format
+msgid "failed to set the security context of %s"
+msgstr "%s �セキュリティコンテキストを %s �設定����ん���"
+
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
 msgid "cannot open %s for reading"
 msgstr "%s を 読�込�用�開����出���ん"
 
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, c-format
 msgid "cannot fstat %s"
 msgstr "%s を fstat �る�������ん"
 
-#: src/copy.c:820
+#: src/copy.c:935
 #, c-format
 msgid "skipping file %s, as it was replaced while being copied"
 msgstr "コピー中�移動�れ����ファイル %s をスキップ�����"
 
-#: src/copy.c:850
-#, c-format
-msgid "failed to get file system create context"
-msgstr "ファイルシステム作�コンテキスト��得�失敗����"
-
-#: src/copy.c:864
-#, c-format
-msgid "failed to set the security context of %s to %s"
-msgstr "%s �セキュリティコンテキストを %s �設定����ん���"
-
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
 msgid "cannot remove %s"
 msgstr "%s を削除����ん"
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
 msgstr "%s を削除����\n"
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr "�照先�無�シンボリックリンク %s を通��書�込む�������ん"
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, c-format
 msgid "cannot create regular file %s"
 msgstr "通常ファイル %s を作�����ん"
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, c-format
 msgid "failed to clone %s from %s"
 msgstr "%2$s �ら %1$s ��複製�失敗����"
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr "%s �タイムスタンプを�存中"
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
 #, fuzzy, c-format
 msgid "failed to close %s"
 msgstr "%s を開���ん���"
 
-#: src/copy.c:1471
-#, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
+#: src/copy.c:1580
+#, fuzzy, c-format
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
 msgstr ""
 "%s: %s を上書��よ�������。モード %04lo (%s) を上書�����? "
 
-#: src/copy.c:1478
+#: src/copy.c:1581
+#, c-format
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr ""
+
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
 msgstr "%s: %s を上書�����? "
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr " (�ックアップ: %s)"
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr "デフォルト�ファイル作�コンテキスト�復元�失敗����"
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, c-format
 msgid "cannot create hard link %s to %s"
 msgstr "%s �ら %s ���ードリンクを作�����ん"
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, c-format
 msgid "cannot stat %s"
 msgstr "%s を stat ����ん"
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, c-format
 msgid "omitting directory %s"
 msgstr "ディレクトリ %s を�略�����"
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr "警告: コピー元ファイル %s �複数指定�れ���"
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
 msgstr "%s � %s ���ファイル��"
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr "ディレクトリ���� %s をディレクトリ %s �上書��る�������ん"
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr "���今作��� %s �� %s �上書����ん"
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr "ディレクトリ %s をディレクトリ以外�上書�����ん"
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr "ディレクトリをディレクトリ以外�移動����ん: %s -> %s"
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr "%s を�ックアップ�る�元ファイル�壊れ�� -- %s を移動���ん���"
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr ""
 "%s を�ックアップ�る�元ファイル�壊れ�� -- %s をコピー���ん���"
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
 msgstr "%s を�ックアップ����ん"
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr ""
 "���今作���シンボリックリンク %2$s を通�� %1$s をコピー����ん"
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr "ディレクトリ %s を自分自身 %s �コピー����ん"
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr "%s �らディレクトリ %s ���ードリンクを作�����ん"
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr "%s を自分自身�サブディレクトリ %s �移動����ん"
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, c-format
 msgid "cannot move %s to %s"
 msgstr "%s �ら %s �移動����ん"
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr "デ�イス間移動失敗: %s �ら %s 。移動先を削除����ん"
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, c-format
-msgid "failed to set default file creation context to %s"
-msgstr "デフォルト�ファイル作�コンテキストを %s �設定����ん���"
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr "循環�るシンボリックリンク %s �コピー����ん"
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr "%s: カレントディレクトリ上���相対シンボリックリンク�����"
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr "%s �ら %s ��シンボリックリンクを作�����ん"
 
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, c-format
 msgid "cannot create fifo %s"
 msgstr "fifo %s を作�����ん"
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, c-format
 msgid "cannot create special file %s"
 msgstr "特殊ファイル %s を作�����ん"
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, c-format
 msgid "cannot read symbolic link %s"
 msgstr "シンボリックリンク %s を読�込���ん"
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, c-format
 msgid "cannot create symbolic link %s"
 msgstr "シンボリックリンク %s を作�����ん"
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
 msgstr "%s �ファイルタイプ��明��"
 
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, c-format
 msgid "cannot un-backup %s"
 msgstr "%s を復元����ん"
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr "%s -> %s (復元)\n"
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr ""
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr ""
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, fuzzy, c-format
+msgid "unknown program %s"
+msgstr "�明�ストリーム"
+
+#: src/cp.c:157 src/mv.c:288
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -2106,14 +2159,14 @@ msgstr ""
 "���: %s [OPTION]... SOURCE... DIRECTORY\n"
 "���: %s [OPTION]... -t DIRECTORY SOURCE...\n"
 
-#: src/cp.c:162
+#: src/cp.c:163
 #, fuzzy
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 "SOURCE �ら DEST �����複数� SOURCE を DIRECTORY �コピー���。\n"
 "\n"
 
-#: src/cp.c:168
+#: src/cp.c:169
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
 "      --attributes-only        don't copy the file data, just the "
@@ -2135,7 +2188,7 @@ msgstr ""
 "      --copy-contents          �帰時�特殊ファイル�内容をコピー�る\n"
 "  -d                           --no-dereference --preserve=links ��様\n"
 
-#: src/cp.c:177
+#: src/cp.c:178
 #, fuzzy
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
@@ -2159,7 +2212,7 @@ msgstr ""
 "  -H                           SOURCE ��るコマンド行�シンボリックリンクを"
 "��る\n"
 
-#: src/cp.c:186
+#: src/cp.c:187
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
 "  -L, --dereference            always follow symbolic links in SOURCE\n"
@@ -2168,7 +2221,7 @@ msgstr ""
 "ã‚‹\n"
 "  -L, --dereference            SOURCE ��るシンボリックリンクを常���る\n"
 
-#: src/cp.c:190
+#: src/cp.c:191
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
 "                                 a previous -i option)\n"
@@ -2179,7 +2232,7 @@ msgstr ""
 "  -P, --no-dereference         SOURCE ��るシンボリックリンクを決����ら"
 "��\n"
 
-#: src/cp.c:195
+#: src/cp.c:196
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
 "      --preserve[=ATTR_LIST]   preserve the specified attributes (default:\n"
@@ -2195,7 +2248,7 @@ msgstr ""
 "links, \n"
 "                                 xattr, all\n"
 
-#: src/cp.c:203
+#: src/cp.c:204
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                use full source file name under DIRECTORY\n"
@@ -2204,7 +2257,7 @@ msgstr ""
 "      --parents                DIRECTORY �下� SOURCE ファイル�フルパス�を"
 "使用�る\n"
 
-#: src/cp.c:207
+#: src/cp.c:208
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
 "      --reflink[=WHEN]         control clone/CoW copies. See below\n"
@@ -2218,7 +2271,7 @@ msgstr ""
 "�る\n"
 "                                 (--force �対照的)\n"
 
-#: src/cp.c:213
+#: src/cp.c:214
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
 "      --strip-trailing-slashes  remove any trailing slashes from each "
@@ -2230,7 +2283,7 @@ msgstr ""
 "除\n"
 "                                 �る\n"
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -2244,7 +2297,7 @@ msgstr ""
 "ã‚‹\n"
 "  -T, --no-target-directory    DEST を通常ファイル���扱�\n"
 
-#: src/cp.c:224
+#: src/cp.c:225
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
 "                                 than the destination file or when the\n"
@@ -2258,7 +2311,15 @@ msgstr ""
 "  -v, --verbose                実行���る��を説明�る\n"
 "  -x, --one-file-system        ��ファイルシステム���実行�る\n"
 
-#: src/cp.c:233
+#: src/cp.c:232
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/cp.c:240
 msgid ""
 "\n"
 "By default, sparse SOURCE files are detected by a crude heuristic and the\n"
@@ -2286,7 +2347,7 @@ msgstr ""
 "場����� --reflink=auto �指定�れ�場��通常�コピー�フェイル\n"
 "�ック�れ��。\n"
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 #, fuzzy
 msgid ""
 "\n"
@@ -2304,7 +2365,7 @@ msgstr ""
 "を通���択����。以下���際�値��:\n"
 "\n"
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2317,7 +2378,7 @@ msgstr ""
 "                      �����れ��simple �作��る\n"
 "  simple, never   常�簡易�ックアップを作�\n"
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2328,222 +2389,236 @@ msgstr ""
 "特別�場�����cp � -f � -b オプション�与�られ�SOURCE � DEST �\n"
 "�一ファイル��る時��SOURCE ��ックアップを作����。\n"
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, c-format
 msgid "failed to preserve times for %s"
 msgstr "%s �タイムスタンプ��護�失敗����"
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, c-format
 msgid "failed to preserve permissions for %s"
 msgstr "%s �パーミッション��護�失敗����"
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, c-format
 msgid "cannot make directory %s"
 msgstr "ディレクトリ %s を作�����ん"
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr "%s �存在����ディレクトリ���り��ん"
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
 #, fuzzy, c-format
 msgid "failed to access %s"
 msgstr "%s を開���ん���"
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, c-format
 msgid "missing file operand"
 msgstr "ファイルオペランド��り��ん"
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, c-format
 msgid "missing destination file operand after %s"
 msgstr "%s �後�宛先�ファイルオペランド��り��ん"
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr ""
 "--target-directory (-t) � --no-target-directory (-T) を�時�指定����ん"
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, c-format
 msgid "target %s is not a directory"
 msgstr "宛先� %s �ディレクトリ���り��ん"
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr "--parents ��る場��宛先�ディレクトリ���れ��り��ん"
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, c-format
 msgid "multiple target directories specified"
 msgstr "複数�宛先ディレクトリ�指定�れ����"
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, fuzzy, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr ""
+"警告: --context (-Z) �無視�れ���。カー�ル� SELinux �有効���り��"
+"ã‚“"
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr "�ードリンクもシンボリックリンクも作�����ん"
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr "オプション --backup � --no-clobber �相互排他的��"
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr "--reflink � --sparse=auto �������使用����"
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr "�ックアップタイプ"
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, fuzzy, c-format
+msgid "cannot set target context and preserve it"
+msgstr ""
+"ターゲット�コンテキストを %s �強制的�設定����ん。����維�\n"
+"�れ��"
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr ""
 "SELinux �有効�カー�ル以外��セキュリティコンテキストを�護����ん"
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr "拡張属性を�護����ん。cp � xattr サ�ート���作��れ����"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr "Stuart Kemp"
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr "入力�無��り���"
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr "%s: 範囲外�行番�"
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, c-format
 msgid "%s: %s: line number out of range"
 msgstr "%s: %s: 範囲外�行番�"
 
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, c-format
 msgid " on repetition %s\n"
 msgstr " 繰り返� %s 回目\n"
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, c-format
 msgid "%s: %s: match not found"
 msgstr "%s: %s: 一致���るも��見��り��ん"
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr "正�表��よる検索中�エラー"
 
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, c-format
 msgid "write error for %s"
 msgstr "%s ��書�込�エラー"
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, c-format
 msgid "%s: integer expected after delimiter"
 msgstr "%s: 区切り文字�後��整数�予期�れ��"
 
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, fuzzy, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr "%s: 繰り返�カウント�� `}' �必���"
 
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, fuzzy, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr "%s}: `{' � `}' �間��整数値�必���"
 
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, fuzzy, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr "%s: 終了�区切り文字 `%c' ��り��ん"
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr "%s: 無効�正�表���: %s"
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr "%s: 無効�パターン指定��"
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr "%s: 行番��ゼロより大��数���れ��り��ん"
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr "行番� %s ���出���行番� %s より���値��"
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr "警告: 行番� %s ���出���行番����値��"
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr "末尾�変�修飾��指定�れ����ん"
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr "末尾�変�修飾��無効��: %c"
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr "末尾�変�修飾��無効��: \\%.3o"
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr "変�修飾��無効�フラグ��り��: %%%c%c"
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr "末尾� %% 変�修飾��多����"
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr "末尾� %% 変�修飾��無効��"
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr "%s: 無効�番���"
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr "使用法: %s [OPTION]... FILE PATTERN...\n"
 
-#: src/csplit.c:1455
+#: src/csplit.c:1483
 #, fuzzy
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
@@ -2552,7 +2627,7 @@ msgstr ""
 "PATTERN �よ��区切られ�ファイル�断片をファイル `xx00'� `xx01'� ...\n"
 "�出力���断片��イト数を標準出力�表示���。\n"
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, fuzzy, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2563,7 +2638,11 @@ msgstr ""
 "  -f, --prefix=PREFIX        接頭辞��� `xx' �代�り� PREFIX を使用�る\n"
 "  -k, --keep-files           エラー発生時�出力ファイルを削除���\n"
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr ""
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
@@ -2573,7 +2652,7 @@ msgstr ""
 "  -s, --quiet, --silent      出力ファイル�大��を表示���\n"
 "  -z, --elide-empty-files    空�出力ファイルを削除�る\n"
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
@@ -2582,7 +2661,7 @@ msgstr ""
 "ファイル� - �ら�標準入力�ら読�込���。 �々�パターン�\n"
 "次�よ���り��:\n"
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 #, fuzzy
 msgid ""
 "\n"
@@ -2608,23 +2687,19 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr "David M. Ihnat"
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr "フィールド��置�1�ら始�る番���"
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr "使用法: %s OPTION... [FILE]...\n"
 
-#: src/cut.c:193
+#: src/cut.c:176
 #, fuzzy
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr ""
 "ファイル��行�ら�択��部分��を切り出��標準出力�表示���。\n"
 "\n"
 
-#: src/cut.c:199
+#: src/cut.c:182
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
 "  -c, --characters=LIST   select only these characters\n"
@@ -2635,7 +2710,7 @@ msgstr ""
 "  -d, --delimiter=DELIM   フィールド�区切り文字��� TAB �代�り� DELIM\n"
 "                            を使用�る \n"
 
-#: src/cut.c:204
+#: src/cut.c:187
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
 "                            that contains no delimiter character, unless\n"
@@ -2647,7 +2722,7 @@ msgstr ""
 "                            �る\n"
 "  -n                      (無視�れる)\n"
 
-#: src/cut.c:210
+#: src/cut.c:193
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
 "                            or fields\n"
@@ -2655,7 +2730,7 @@ msgstr ""
 "      --complement        �択�れ��イト数�文字数���フィールド数�\n"
 "                            組を補足�る\n"
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
@@ -2665,7 +2740,7 @@ msgstr ""
 "      --output-delimiter=STRING  出力�区切り文字��� STRING を使用\n"
 "                            デフォルト��入力�区切り文字を使用\n"
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2677,7 +2752,7 @@ msgstr ""
 "LIST �コンマ�区切られ��一���複数�範囲�構��れ��。�択\n"
 "��入力�読�込�れ�順番���一度��出力�れ��。\n"
 
-#: src/cut.c:227
+#: src/cut.c:210
 msgid ""
 "Each range is one of:\n"
 "\n"
@@ -2696,47 +2771,51 @@ msgstr ""
 "\n"
 "FILE �無���� - �場��標準入力�ら読�込���。\n"
 
-#: src/cut.c:367 src/cut.c:493
+#: src/cut.c:300 src/cut.c:394
 #, fuzzy
 msgid "invalid byte, character or field list"
 msgstr "無効��イト���フィールド指定��"
 
-#: src/cut.c:387
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr "フィールド��置�1�ら始�る番���"
+
+#: src/cut.c:320
 msgid "invalid range with no endpoint: -"
 msgstr "端点�無�無効�範囲��: -"
 
-#: src/cut.c:403
+#: src/cut.c:334
 msgid "invalid decreasing range"
 msgstr "無効��順�範囲��"
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, c-format
 msgid "byte offset %s is too large"
 msgstr "�イトオフセット %s �大�����"
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, c-format
 msgid "field number %s is too large"
 msgstr "フィールド番� %s �大�����"
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr "切り出�方���指定��る�� 1 種類����"
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr "区切り文字�指定��る�� 1 文字����"
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr "�イト, 文字, も���フィールド�リストを指定������"
 
-#: src/cut.c:850
+#: src/cut.c:790
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr "フィールドを�作�る場���入力区切り文字を指定����"
 
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
@@ -2744,11 +2823,11 @@ msgstr ""
 "区切られ����行�抑制�有効���, \n"
 "\tフィールドを�作�る場�����"
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr "フィールド�リスト��り��ん"
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr "�置指定リスト��り��ん"
 
@@ -2794,7 +2873,7 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 "      --rfc-3339=TIMESPEC   RFC 3339 形��日付�時刻を出力�る\n"
 "                            TIMESPEC=`date', `seconds' ��� `ns' �\n"
@@ -3009,10 +3088,10 @@ msgstr ""
 "ローカル時間�次�金曜日��9時を米国西海岸�タイムゾーン�表示�る場�\n"
 "  $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n"
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr "標準入力"
@@ -3053,7 +3132,7 @@ msgstr ""
 msgid "cannot set date"
 msgstr "日時を設定����ん"
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, c-format
 msgid "time %s is out of range"
 msgstr "時間 %s �範囲外��"
@@ -3064,7 +3143,7 @@ msgstr "時間 %s �範囲外��"
 msgid "Paul Rubin"
 msgstr "Paul Rubin"
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
@@ -3073,7 +3152,7 @@ msgstr ""
 "使用法: %s [OPERAND]...\n"
 "���: %s OPTION\n"
 
-#: src/dd.c:526
+#: src/dd.c:532
 #, fuzzy
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
@@ -3092,7 +3171,7 @@ msgstr ""
 "  count=BLOCKS    入力ブロック BLOCKS 個分��コピー�る\n"
 "  ibs=BYTES       一回� BYTES �イト��読�込む (デフォルト: 512)\n"
 
-#: src/dd.c:535
+#: src/dd.c:541
 #, fuzzy
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
@@ -3116,7 +3195,7 @@ msgstr ""
 "ã‚‹\n"
 "  status=noxfer   転�ステータス表示を抑止�る\n"
 
-#: src/dd.c:546
+#: src/dd.c:552
 #, fuzzy
 msgid ""
 "\n"
@@ -3135,7 +3214,7 @@ msgstr ""
 "� CONV シンボル�以下�通り��:\n"
 "\n"
 
-#: src/dd.c:555
+#: src/dd.c:561
 #, fuzzy
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
@@ -3162,7 +3241,7 @@ msgstr ""
 "            ��� unblock �一緒�利用�れ�場� NUL ���スペース�埋�"
 "ã‚‹\n"
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -3178,7 +3257,7 @@ msgstr ""
 "  fdatasync  終了��出力ファイルデータを物�的�書�込む\n"
 "  fsync     上��様��メタデータ�対��も使用�る\n"
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -3191,75 +3270,75 @@ msgstr ""
 "\n"
 "  append    追加モード (出力�対�����味��る。 conv=notrunc を推奨)\n"
 
-#: src/dd.c:583
+#: src/dd.c:589
 msgid "  cio       use concurrent I/O for data\n"
 msgstr "  cio       データ�対���時 I/O を使用�る\n"
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr "  direct    データ�対��直接 I/O を使用�る\n"
 
-#: src/dd.c:587
+#: src/dd.c:593
 msgid "  directory  fail unless a directory\n"
 msgstr "  directory  ディレクトリ�無�場��失敗��る\n"
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr "  dsync     データ�対���期 I/O を使用�る\n"
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr "  sync      上��様��メタデータ�対��も使用�る\n"
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr "  fullblock  入力�ブロック�������る��蓄��る (iflag ��)\n"
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr "  nonblock  �ブロック I/O を使用�る\n"
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr "  noatime   アクセス時間を更新���\n"
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr "  nocache   キャッシュデータを破棄�る\n"
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr "  noctty    ファイル�ら�制御端末を割り当���\n"
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr "  nofollow  シンボリックリンクを��ら��\n"
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr "  nolinks   複数リンク�れ��る場��失敗��る\n"
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr "  binary    データ�対���イナリー I/O を使用�る\n"
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr "  text      データ�対��テキスト I/O を使用�る\n"
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr ""
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3288,7 +3367,17 @@ msgstr ""
 "オプション�次�通り��:\n"
 "\n"
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr "大�� %zu �イト�入力�ッファ�よりメモリを使�果����� (%s)"
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr "大�� %zu �イト�出力�ッファ�よりメモリを使�果����� (%s)"
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
@@ -3297,19 +3386,19 @@ msgstr ""
 "%<PRIuMAX>+%<PRIuMAX> レコード入力\n"
 "%<PRIuMAX>+%<PRIuMAX> レコード出力\n"
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
 msgstr[0] "%<PRIuMAX> 切り詰�られ�レコード\n"
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
 msgstr[0] "%<PRIuMAX> �イト (%s) コピー�れ���"
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr "無� B"
 
@@ -3323,83 +3412,83 @@ msgstr "無� B"
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
 msgstr "� %g 秒� %s/秒\n"
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, c-format
 msgid "closing input file %s"
 msgstr "入力ファイル %s を閉�����"
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr "出力ファイル %s を閉�����"
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr "O_DIRECT をオフ�����ん��� : %s"
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, c-format
 msgid "writing to %s"
 msgstr "%s �書�込�中��"
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, c-format
 msgid "unrecognized operand %s"
 msgstr "%s : �識����オペランド��"
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 msgid "invalid conversion"
 msgstr "無効�変���"
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 msgid "invalid input flag"
 msgstr "無効�入力フラグ��"
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 msgid "invalid output flag"
 msgstr "無効�出力フラグ��"
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 msgid "invalid status flag"
 msgstr "無効�ステータスフラグ��"
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, c-format
 msgid "invalid number %s"
 msgstr "%s : 無効�数字��"
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr "ascii�ebcdic�ibm ���2個も組����る�������ん"
 
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, c-format
 msgid "cannot combine block and unblock"
 msgstr "block � unblock を組����る�������ん"
 
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, c-format
 msgid "cannot combine lcase and ucase"
 msgstr "lcase � ucase を組����る�������ん"
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, c-format
 msgid "cannot combine excl and nocreat"
 msgstr "excl � nocreat を組����る�������ん"
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, c-format
 msgid "cannot combine direct and nocache"
 msgstr "direct � nocache を組����る�������ん"
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
@@ -3408,72 +3497,62 @@ msgstr ""
 "警告: lseek �カー�ル�グ�対処���。\n"
 "   ファイル (%s) � mt_type=0x%0lx -- <sys/mtio.h> �タイプリストを見�下��"
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, c-format
 msgid "%s: cannot skip"
 msgstr "%s: スキップ����ん"
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, c-format
 msgid "%s: cannot seek"
 msgstr "%s: seek ����ん"
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr "ファイル %s を読�込�中�オフセット�オー�ーフロー����"
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr "警告: 読�込�失敗後�無効�ファイルオフセット��"
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr "最終的�カー�ル�グを回�����ん"
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, c-format
 msgid "setting flags for %s"
 msgstr "%s �フラグを設定中"
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr "大�� %zu �イト�入力�ッファ�よりメモリを使�果����� (%s)"
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr "大�� %zu �イト�出力�ッファ�よりメモリを使�果����� (%s)"
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr "%s: 指定�れ�オフセット��スキップ����ん"
 
-#: src/dd.c:2133
+#: src/dd.c:2172
 #, fuzzy, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
 msgstr "%<PRIuMAX> �イト�出力ファイル %s を切り詰�る���失敗����"
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr "%s �対�る fdatasync �失敗����"
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
 msgstr "%s �対�る fsync �失敗����"
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, c-format
 msgid "failed to open %s"
 msgstr "%s を開���ん���"
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
@@ -3482,96 +3561,105 @@ msgstr ""
 "オフセット�大: seek=%<PRIuMAX> (%lu �イト) ブロック�長���切り詰�る��"
 "�����ん"
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr "%<PRIuMAX> �イト�出力ファイル %s を切り詰�る���失敗����"
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, c-format
 msgid "failed to discard cache for: %s"
 msgstr "キャッシュ破棄�失敗����: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr "Paul Eggert"
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr "ファイルシス"
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr "タイプ"
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr "ブロック"
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr "使用"
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr "使用�"
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr "使用%"
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr "Iノード"
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr "I使用"
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr "I残り"
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr "I使用%"
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr "マウント�置"
 
-#: src/df.c:383
-#, c-format
-msgid "option --output: field '%s' unknown"
+#: src/df.c:207
+msgid "File"
 msgstr ""
 
-#: src/df.c:390
+#: src/df.c:387
+#, fuzzy, c-format
+msgid "option --output: field %s unknown"
+msgstr "出力ファイル %s を閉�����"
+
+#: src/df.c:394
 #, fuzzy, c-format
-msgid "option --output: field '%s' used more than once"
+msgid "option --output: field %s used more than once"
 msgstr "警告: コピー元ファイル %s �複数指定�れ���"
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr "サイズ"
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr "残り"
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr "容�"
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
 msgstr ""
 
-#: src/df.c:1210
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr ""
+
+#: src/df.c:1384
 #, fuzzy
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
@@ -3581,17 +3669,18 @@ msgstr ""
 "����デフォルト��全��ファイルシステム����表示���。\n"
 "\n"
 
-#: src/df.c:1217
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
 #, fuzzy
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
 "  -a, --all             サイズ� 0 �ダミーファイルシステムを��る\n"
 "  -B, --block-size=SIZE  SIZE ��数���表示�る。例: `-BM' �表示�る時"
@@ -3602,7 +3691,7 @@ msgstr ""
 "2G)\n"
 "  -H, --si              �様���1024 ����� 1000 ��値を使用�る\n"
 
-#: src/df.c:1227
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -3615,7 +3704,7 @@ msgstr ""
 "  -l, --local           ローカルファイルシステム��表示�るよ��制��る\n"
 "      --no-sync         使用��情報を得る�� sync を行��� (デフォルト)\n"
 
-#: src/df.c:1234
+#: src/df.c:1409
 #, fuzzy
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
@@ -3636,42 +3725,33 @@ msgstr ""
 "ã‚‹\n"
 "  -v                    (無視�れる)\n"
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
 
-#: src/df.c:1285
+#: src/df.c:1460
 #, fuzzy, c-format
 msgid "options %s and %s are mutually exclusive"
 msgstr "オプション --compare (-C) �よ� --strip �排他的��"
 
-#: src/df.c:1335
-#, fuzzy
-msgid "warning: "
-msgstr "警告: "
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr ""
-
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr "%s 形�ファイルシステム��択/��択�両方�指定�れ���"
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr "警告: "
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 msgid "cannot read table of mounted file systems"
 msgstr "マウント�れ��るファイルシステム�テーブルを読���ん"
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr "ファイルシステム�処��れ��ん���"
@@ -3681,7 +3761,7 @@ msgstr "ファイルシステム�処��れ��ん���"
 msgid "H. Peter Anvin"
 msgstr "H. Peter Anvin"
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr "使用法: %s [OPTION]... [FILE]\n"
@@ -3772,7 +3852,7 @@ msgstr ""
 
 #: src/dirname.c:59
 #, fuzzy
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
 msgstr "  -0, --null     出力行�最後�改行文字���� NULL 文字を付加�る\n"
 
 #: src/dirname.c:64
@@ -3789,7 +3869,7 @@ msgstr ""
 "  %s /usr/bin/      出力  \"/usr\"\n"
 "  %s stdio.h        出力  \".\"\n"
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -3798,18 +3878,17 @@ msgstr ""
 "使用法: %s [OPTION]... [FILE]...\n"
 "���: %s [OPTION]... --files0-from=F\n"
 
-#: src/du.c:274
+#: src/du.c:285
 #, fuzzy
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr ""
 "�ファイル�ディスク使用�を集計���。ディレクトリ��帰的�処����。\n"
 "\n"
 
-#: src/du.c:280
+#: src/du.c:291
 #, fuzzy
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3827,12 +3906,12 @@ msgstr ""
 "ã‚‹\n"
 "                          ��も�る。\n"
 
-#: src/du.c:289
+#: src/du.c:300
 #, fuzzy
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3851,15 +3930,16 @@ msgstr ""
 "  -D, --dereference-args  コマンドライン�指定�れ�シンボリック\n"
 "                          ��を��る\n"
 
-#: src/du.c:302
+#: src/du.c:313
 #, fuzzy
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
 "      --files0-from=F   F �中�指定�れ� NUL �区切られ����ファイル�"
 "ら\n"
@@ -3871,7 +3951,7 @@ msgstr ""
 "      --si              -h ��様���1024 ����� 1000 ��値を使用�"
 "ã‚‹\n"
 
-#: src/du.c:310
+#: src/du.c:322
 #, fuzzy
 msgid ""
 "  -k                    like --block-size=1K\n"
@@ -3883,12 +3963,13 @@ msgstr ""
 "  -l, --count-links     �ードリンク�れ�場���個数分サイズを数�る\n"
 "  -m                    --block-size=1M ��様\n"
 
-#: src/du.c:316
+#: src/du.c:328
 #, fuzzy
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
@@ -3899,7 +3980,7 @@ msgstr ""
 "  -S, --separate-dirs   �ディレクトリ�サイズを����\n"
 "  -s, --summarize       �引数��計容���表示�る\n"
 
-#: src/du.c:322
+#: src/du.c:334
 #, fuzzy
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
@@ -3909,9 +3990,9 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
 msgstr ""
 "      --time           ディレクトリ������ディレクトリ���れる全�\n"
 "                          �ファイル�最終更新時間を表示�る\n"
@@ -3923,74 +4004,74 @@ msgstr ""
 "                          full-iso�long-iso�iso�+FORMAT\n"
 "                          FORMAT � `date' ��様�解釈�れる\n"
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
 "  -x, --one-file-system    skip directories on different file systems\n"
 msgstr ""
 
-#: src/du.c:386
+#: src/du.c:398
 #, fuzzy
 msgid "Infinity"
 msgstr "無� B"
 
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr ""
-
-#: src/du.c:624
+#: src/du.c:636
 #, c-format
 msgid "fts_read failed: %s"
 msgstr "fts_read �失敗����: %s"
 
-#: src/du.c:780
+#: src/du.c:787
 #, c-format
 msgid "invalid maximum depth %s"
 msgstr "無効�最大�深� %s ��"
 
-#: src/du.c:809
+#: src/du.c:816
 #, fuzzy, c-format
 msgid "invalid --threshold argument '-0'"
 msgstr "--%s �引数 %s �無効��"
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr "�計�全エントリ�表示�両方を�一度�指定�る�������ん"
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr "警告: 統計(-s)� --max-depth=0 ���用法��"
 
-#: src/du.c:900
+#: src/du.c:911
 #, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr "警告: 統計(-s)� --max-depth=%lu �指定�競������"
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 msgid "file operands cannot be combined with --files0-from"
 msgstr "ファイルオペランド� --files0-from を�時�使用����ん"
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr "%s: 読�込�エラー"
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr ""
 "ファイル�を標準入力�ら読�込ん��る場���ファイル� %s を指定����ん"
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 msgid "invalid zero-length file name"
 msgstr "無効�長��0�ファイル���"
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr "�計"
 
@@ -4099,7 +4180,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
 "環境変数 NAME を VALUE �設定�� COMMAND を実行���\n"
@@ -4181,16 +4262,16 @@ msgid "input line is too long"
 msgstr "入力ファイル�長����"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr "Mike Parker"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr "James Youngman"
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
@@ -4199,7 +4280,7 @@ msgstr ""
 "使用法: %s EXPRESSION\n"
 "���: %s OPTION\n"
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -4217,7 +4298,7 @@ msgstr ""
 "\n"
 "  ARG1 & ARG2       両方�引数� null, 0 �無�場�� ARG1 �����れ� 0\n"
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -4235,7 +4316,7 @@ msgstr ""
 "  ARG1 >= ARG2      ARG1 � ARG2 より大���等��\n"
 "  ARG1 > ARG2       ARG1 � ARG2 より大��\n"
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
@@ -4245,7 +4326,7 @@ msgstr ""
 "  ARG1 + ARG2       ARG1 � ARG2 �足�算\n"
 "  ARG1 - ARG2       ARG1 � ARG2 �引�算\n"
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -4258,7 +4339,7 @@ msgstr ""
 "  ARG1 / ARG2       ARG1 � ARG2 �よる割り算\n"
 "  ARG1 % ARG2       ARG1 � ARG2 �よる割り算���り\n"
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -4277,7 +4358,7 @@ msgstr ""
 "                               見��ら��れ� 0\n"
 "  length STRING              STRING �長�\n"
 
-#: src/expr.c:251
+#: src/expr.c:250
 #, fuzzy
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
@@ -4290,7 +4371,7 @@ msgstr ""
 "\n"
 "  ( � )                     ��値\n"
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -4305,7 +4386,7 @@ msgstr ""
 "より行�れ��. パターン照��, \\( � \\) �間, も���ヌル文字�一致��\n"
 "文字列を返���. \\( � \\) を使���場��一致�る文字数� 0 を返���.\n"
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -4317,32 +4398,32 @@ msgstr ""
 "�場��1。\n"
 "EXPRESSION �構文エラー�場�� 2。��他�エラー�発生��場�� 3。\n"
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, c-format
 msgid "syntax error"
 msgstr "構文エラー"
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, c-format
 msgid "error in regular expression matcher"
 msgstr "正�表�検索中�エラー"
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, c-format
 msgid "non-integer argument"
 msgstr "整数���引数"
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr "ゼロ��割り算"
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr "�題を回��る��� LC_ALL='C' を指定������。"
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, c-format
 msgid "the strings compared were %s and %s"
 msgstr "比較��文字列� %s � %s ��"
@@ -4352,27 +4433,27 @@ msgstr "比較��文字列� %s � %s ��"
 msgid "Niels Moller"
 msgstr ""
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
 msgstr ""
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
 msgstr ""
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, c-format
 msgid "%s is not a valid positive integer"
 msgstr "%s �有効�正�整数���り��ん"
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr "%s �長����"
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
@@ -4381,7 +4462,7 @@ msgstr ""
 "使用法: %s [NUMBER]...\n"
 "���: %s OPTION\n"
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
 "are specified on the command line, read them from standard input.\n"
@@ -4492,17 +4573,17 @@ msgid "invalid number of columns: %s"
 msgstr "無効�列数��: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr "Padraig Brady"
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, c-format
 msgid "Usage: %s\n"
 msgstr "使用法: %s\n"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
@@ -4511,12 +4592,12 @@ msgstr ""
 "�。\n"
 "\n"
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, c-format
 msgid "failed to get groups for user %s"
 msgstr "ユーザー %s �グループ�得�失敗����"
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, c-format
 msgid "failed to get groups for the current process"
 msgstr "�在�プロセス�グループ�得�失敗����"
@@ -4541,22 +4622,22 @@ msgstr ""
 "�在�プロセス (�れ�グループデータベース�変更�れ�場���異�る場�\n"
 "��り��) �関��表示���。\n"
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, fuzzy, c-format
 msgid "cannot get real UID"
 msgstr "ユーザ ID を設定����ん"
 
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, fuzzy, c-format
 msgid "cannot get effective GID"
 msgstr "%s を�照����ん"
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, fuzzy, c-format
 msgid "cannot get real GID"
 msgstr "ユーザ ID を設定����ん"
 
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, fuzzy, c-format
 msgid "%s: no such user"
 msgstr "%s: ��よ��ユーザ�存在���ん"
@@ -4613,58 +4694,48 @@ msgstr ""
 "b =512�kB =1000�K =1024�MB =1000*1000�M =1024*1024\n"
 "GB =1000*1000*1000�G =1024*1024*1024��よ� T�P�E�Z�Y ����。\n"
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr "%s: ファイル����縮�られ������"
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, c-format
 msgid "%s: number of bytes is too large"
 msgstr "%s: �イト数�大�����"
 
-#: src/head.c:440
-#, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr "%s: 元��置� lseek �戻る�������ん"
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr "%s: オフセット %s �� seek ����ん"
 
-#: src/head.c:673
-#, fuzzy, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "%s: 削除�失敗����"
-
-#: src/head.c:798
+#: src/head.c:423 src/tail.c:457
 #, c-format
-msgid "cannot reposition file pointer for %s"
-msgstr "%s �対�るファイル�インタを��置����ん"
+msgid "%s: cannot seek to relative offset %s"
+msgstr "%s: 相対オフセット %s ��探査 (seek) ����ん"
 
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr "%s: %s �大����表示����ん"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr "行数"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr "�イト数"
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr "無効�行数��"
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr "無効��イト数��"
 
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, c-format
 msgid "invalid trailing option -- %c"
 msgstr "無効�後続�オプション�� -- %c"
@@ -4710,27 +4781,34 @@ msgid "cannot determine hostname"
 msgstr "ホスト�を特定����ん"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr "Arnold Robbins"
 
-#: src/id.c:81
-#, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
-msgstr "使用法: %s [OPTION]... [USERNAME]\n"
+#: src/id.c:84
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]... [USER]\n"
+msgstr "使用法: %s [OPTION]... [USER]...\n"
 
-#: src/id.c:82
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
+msgstr ""
+
+#: src/id.c:90
+#, fuzzy
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
 msgstr ""
 "USERNAME �指定�れ�ユーザー�グループ�情報を表示���。USERNAME �指定�"
 "れ��\n"
@@ -4744,7 +4822,7 @@ msgstr ""
 "  -r, --real      -ugG �実効 ID �代�り�実 IDを表示�る\n"
 "  -u, --user      実効ユーザー ID ��表示�る\n"
 
-#: src/id.c:96
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
@@ -4752,116 +4830,126 @@ msgstr ""
 "\n"
 "OPTION �指定�れ��場��識別情報���有用�物を表示���。\n"
 
-#: src/id.c:140
+#: src/id.c:151
+#, fuzzy, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr "--context (-Z) � SELinux �有効�カー�ル��動作���"
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr "--context (-Z) � SELinux �有効�カー�ル��動作���"
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr "ユーザー�指定�れ�時�セキュリティコンテキストを表示����ん"
 
-#: src/id.c:178
+#: src/id.c:198
 #, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr "�一項目��表示�るオプションを複数指定����ん"
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr "標準�形���, ����� ID ��を表示�る�������ん"
 
-#: src/id.c:199
+#: src/id.c:209
+#, fuzzy, c-format
+msgid "option --zero not permitted in default format"
+msgstr "標準�形���, ����� ID ��を表示�る�������ん"
+
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
 msgstr "プロセス�コンテキストを�得����ん"
 
-#: src/id.c:224
+#: src/id.c:265
 #, fuzzy, c-format
 msgid "cannot get effective UID"
 msgstr "%s を�照����ん"
 
-#: src/id.c:311
+#: src/id.c:354
 #, fuzzy, c-format
 msgid "cannot find name for user ID %s"
 msgstr "ユーザー ID %lu �対�るユーザー��見��り��ん"
 
-#: src/id.c:329
+#: src/id.c:372
 #, fuzzy, c-format
 msgid "uid=%s"
 msgstr "uid=%lu"
 
-#: src/id.c:334
+#: src/id.c:377
 #, fuzzy, c-format
 msgid " gid=%s"
 msgstr " gid=%lu"
 
-#: src/id.c:341
+#: src/id.c:384
 #, fuzzy, c-format
 msgid " euid=%s"
 msgstr " euid=%lu"
 
-#: src/id.c:349
+#: src/id.c:392
 #, fuzzy, c-format
 msgid " egid=%s"
 msgstr " egid=%lu"
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr " groups="
 
-#: src/id.c:393
+#: src/id.c:437
 #, c-format
 msgid " context=%s"
 msgstr " context=%s"
 
-#: src/install.c:373
+#: src/install.c:376
 #, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr "警告: %s: コンテキスト %s ��変更�失敗����"
 
-#: src/install.c:414
+#: src/install.c:417
 #, c-format
 msgid "creating directory %s"
 msgstr "ディレクトリ %s を作������"
 
-#: src/install.c:482
+#: src/install.c:485
 #, c-format
 msgid "cannot change ownership of %s"
 msgstr "%s �所有権を変更����ん"
 
-#: src/install.c:506
+#: src/install.c:509
 #, c-format
 msgid "cannot set time stamps for %s"
 msgstr "%s �時刻を設定����ん"
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, c-format
 msgid "fork system call failed"
 msgstr "fork システムコール�失敗����"
 
-#: src/install.c:531
+#: src/install.c:535
 #, c-format
 msgid "cannot run %s"
 msgstr "%s を実行����ん"
 
-#: src/install.c:535
+#: src/install.c:539
 #, c-format
 msgid "waiting for strip"
 msgstr "strip を待�����"
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr "strip プロセス�異常終了����"
 
-#: src/install.c:558
+#: src/install.c:565
 #, c-format
 msgid "invalid user %s"
 msgstr "無効�ユーザー: %s"
 
-#: src/install.c:594
+#: src/install.c:601
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -4874,7 +4962,7 @@ msgstr ""
 "���: %s [OPTION]... -t DIRECTORY SOURCE...\n"
 "���: %s [OPTION]... -d DIRECTORY...\n"
 
-#: src/install.c:601
+#: src/install.c:608
 #, fuzzy
 msgid ""
 "\n"
@@ -4900,7 +4988,7 @@ msgstr ""
 "4番目�形��指定�れ� DIRECTORY 全��構��素を作����。\n"
 "\n"
 
-#: src/install.c:615
+#: src/install.c:622
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
 "  -b                  like --backup but does not accept an argument\n"
@@ -4923,7 +5011,7 @@ msgstr ""
 "リ\n"
 "                        �構��素を全�作��る\n"
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -4944,7 +5032,7 @@ msgstr ""
 "                        指定方法) �設定�る\n"
 "  -o, --owner=OWNER   所有権を設定�る (スーパーユーザー��)\n"
 
-#: src/install.c:631
+#: src/install.c:638
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
 "files\n"
@@ -4968,17 +5056,21 @@ msgstr ""
 "  -T, --no-target-directory  DEST を通常ファイル���扱�\n"
 "  -v, --verbose       ディレクトリを作����������を表示�る\n"
 
-#: src/install.c:641
+#: src/install.c:648
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
-"      --preserve-context  SELinux セキュリティコンテキストを���る\n"
-"  -Z, --context=CONTEXT  ファイル�よ�ディレクトリ� SELinux セキュリティ\n"
-"                           コンテキストを CONTEXT �設定�る\n"
 
-#: src/install.c:859
+#: src/install.c:696 src/unlink.c:86
+#, c-format
+msgid "cannot unlink %s"
+msgstr "%s を削除 (unlink) ����ん"
+
+#: src/install.c:877
 #, c-format
 msgid ""
 "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
@@ -4986,54 +5078,40 @@ msgstr ""
 "警告: --preserve-context �無視�れ���。カー�ル� SELinux �有効���り"
 "��ん"
 
-#: src/install.c:869
-#, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
-msgstr ""
-"警告: --context (-Z) �無視�れ���。カー�ル� SELinux �有効���り��"
-"ã‚“"
-
-#: src/install.c:886
+#: src/install.c:917
 #, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr "strip オプション�ディレクトリをインストール�る際��使用����ん"
 
-#: src/install.c:889
+#: src/install.c:920
 #, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr ""
 "ディレクトリをインストール�る際�ターゲットディレクトリを指定����ん"
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr ""
-"ターゲット�コンテキストを %s �強制的�設定����ん。����維�\n"
-"�れ��"
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, c-format
 msgid "invalid mode %s"
 msgstr "無効�モード: %s"
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr ""
 "警告: -s オプション�指定�れ������ --strip-program オプション�\n"
 "無視�れ��"
 
-#: src/install.c:959
+#: src/install.c:1001
 #, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr "オプション --compare (-C) �よ� --preserve-timestamps �排他的��"
 
-#: src/install.c:966
+#: src/install.c:1008
 #, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr "オプション --compare (-C) �よ� --strip �排他的��"
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -5047,7 +5125,7 @@ msgstr ""
 msgid "Mike Haertel"
 msgstr "Mike Haertel"
 
-#: src/join.c:191
+#: src/join.c:195
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
 "standard output.  The default join field is the first, delimited\n"
@@ -5069,7 +5147,7 @@ msgstr ""
 "                      ��� FILE2 を表�\n"
 "  -e EMPTY          入力フィールド�存在���場� EMPTY �置���る\n"
 
-#: src/join.c:200
+#: src/join.c:204
 #, fuzzy
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
@@ -5082,7 +5160,7 @@ msgstr ""
 "  -o FORMAT         出力行生�時� FORMAT �従�\n"
 "  -t CHAR           入出力区切り文字��� CHAR を使用�る\n"
 
-#: src/join.c:206
+#: src/join.c:210
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
 "  -1 FIELD          join on this FIELD of file 1\n"
@@ -5102,7 +5180,13 @@ msgstr ""
 "  --header          �ファイル�1行目をヘッダ���扱�������\n"
 "                      表示を行�\n"
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+#, fuzzy
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr ""
+"  -z, --zero-terminated     文字列�最後�改行��� NULL 文字を付加�る\n"
+
+#: src/join.c:225
 #, fuzzy
 msgid ""
 "\n"
@@ -5145,47 +5229,47 @@ msgstr ""
 "ジ�\n"
 "表示�れ��。\n"
 
-#: src/join.c:403
+#: src/join.c:410
 #, fuzzy, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
 msgstr "%s:%ju: ソート�れ����ん: %.*s"
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, c-format
 msgid "invalid field number: %s"
 msgstr "無効�フィールド番���: %s"
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, c-format
 msgid "invalid field specifier: %s"
 msgstr "無効�フィールド指定��: %s"
 
-#: src/join.c:877
+#: src/join.c:884
 #, c-format
 msgid "invalid file number in field spec: %s"
 msgstr "フィールド指定��ファイル番��無効��: %s"
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr "���るフィールド��完全�� %lu�%lu"
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr "空�文字列を置��る文字列�競������"
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, c-format
 msgid "multi-character tab %s"
 msgstr "複数文字�タブ %s"
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr "互�性���タブ��"
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr "両方�ファイルを標準入力������ん"
@@ -5303,48 +5387,48 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr "%2$s ��リンク %1$s を作�����ん"
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr "%s: ディレクトリ�対�る�ードリンク�許��れ����ん"
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, c-format
 msgid "%s: cannot overwrite directory"
 msgstr "%s: ディレクトリを上書��る�������ん"
 
 # %s: ersetze `%s'?
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
 msgstr "%s: %s を置������(yes/no)? "
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, c-format
 msgid "failed to create symbolic link %s"
 msgstr "シンボリックリンク %s �作��失敗����"
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr "%s �ら %s ��シンボリックリンク�作��失敗����"
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr "%.0s%s ���ードリンク�作��失敗����"
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, c-format
 msgid "failed to create hard link %s"
 msgstr "�ードリンク %s �作��失敗����"
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, c-format
 msgid "failed to create hard link %s => %s"
 msgstr "%s �ら %s ���ードリンク�作��失敗����"
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -5357,7 +5441,7 @@ msgstr ""
 "���: %s [OPTION]... TARGET... DIRECTORY     (3番目�形�)\n"
 "���: %s [OPTION]... -t DIRECTORY TARGET...  (4番目�形�)\n"
 
-#: src/ln.c:381
+#: src/ln.c:398
 #, fuzzy
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
@@ -5380,7 +5464,7 @@ msgstr ""
 "�。\n"
 "\n"
 
-#: src/ln.c:394
+#: src/ln.c:411
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
 "file\n"
@@ -5403,7 +5487,7 @@ msgstr ""
 "ã‚‹)\n"
 "  -f, --force                 対象ファイル�存在�る時�削除�る\n"
 
-#: src/ln.c:402
+#: src/ln.c:419
 #, fuzzy
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
@@ -5427,7 +5511,7 @@ msgstr ""
 "  -s, --symbolic              �ードリンク�代�り�シンボリックリンクを作�"
 "�る\n"
 
-#: src/ln.c:411
+#: src/ln.c:428
 #, fuzzy
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
@@ -5444,7 +5528,7 @@ msgstr ""
 "  -T, --no-target-directory   LINK_NAME を通常ファイル���扱�\n"
 "  -v, --verbose               リンクを作���時�ファイル�を表示�る\n"
 
-#: src/ln.c:433
+#: src/ln.c:450
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -5457,13 +5541,13 @@ msgstr ""
 "��。\n"
 "\n"
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr ""
 "--target-directory �よ� --no-target-directory �組�����使用����ん"
 
-#: src/ln.c:588
+#: src/ln.c:605
 #, fuzzy, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr "シンボリックリンク %s を作�����ん"
@@ -5494,7 +5578,7 @@ msgstr "ログイン���り��ん"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
@@ -5503,95 +5587,95 @@ msgstr "%b %e  %Y"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 msgid "%b %e %H:%M"
 msgstr "%b %e %H:%M"
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr "環境変数 QUOTING_STYLE �値(%s)���切���無視���"
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr "環境変数 COLUMNS �値(%s) ���切�行幅���無視���"
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr "環境変数 TABSIZE �値(%s) ���切�タブサイズ���無視���"
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, c-format
 msgid "invalid line width: %s"
 msgstr "無効�行幅��: %s"
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, c-format
 msgid "invalid tab size: %s"
 msgstr "無効�タブ幅��: %s"
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, c-format
 msgid "invalid time style format %s"
 msgstr "無効�時刻書���: %s"
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 #, fuzzy
 msgid "Valid arguments are:\n"
 msgstr "有効�引数:"
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr ""
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr "月�文字列�期化時�エラー�発生����"
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, c-format
 msgid "unrecognized prefix: %s"
 msgstr "�識����接頭辞��: %s"
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr "環境変数 LS_COLORS �値を解釈����ん"
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, c-format
 msgid "cannot open directory %s"
 msgstr "ディレクトリ %s を開����出���ん"
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, c-format
 msgid "cannot determine device and inode of %s"
 msgstr "%s �デ�イス� i ノードを決定����ん"
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, c-format
 msgid "%s: not listing already-listed directory"
 msgstr "%s: 既�一覧表示��ディレクトリ���一覧表示���ん"
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, c-format
 msgid "reading directory %s"
 msgstr "ディレクトリ %s を読�込ん����"
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, c-format
 msgid "closing directory %s"
 msgstr "ディレクトリ %s を閉�����"
 
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, c-format
 msgid "cannot compare file names %s and %s"
 msgstr "ファイル� %s �よ� %s を比較����ん"
 
-#: src/ls.c:4721
+#: src/ls.c:4781
 #, fuzzy
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
@@ -5602,7 +5686,7 @@ msgstr ""
 "られ��。\n"
 "\n"
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
 "  -A, --almost-all           do not list implied . and ..\n"
@@ -5617,18 +5701,18 @@ msgstr ""
 "  -b, --escape               表示��能�文字�場�� C 形��エスケープ文字"
 "を表示�る\n"
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 #, fuzzy
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
 "      --block-size=SIZE      SIZE ��数���表示�る。例: `--block-size=M' "
@@ -5644,16 +5728,15 @@ msgstr ""
 "示�る\n"
 "                               �れ以外: ctime �新��順�並�替�る\n"
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 #, fuzzy
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 "  -C                         �素を列���並�る\n"
@@ -5666,7 +5749,7 @@ msgstr ""
 "  -D, --dired                Emacs � dired モード用�設計�れ�出力を生��"
 "ã‚‹\n"
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 #, fuzzy
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
@@ -5687,15 +5770,17 @@ msgstr ""
 "vertical � -C\n"
 "      --full-time            -l --time-style=full-iso ��様\n"
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr "  -g                         -l ��様��ファイル所有者を表示���\n"
 
-#: src/ls.c:4763
+#: src/ls.c:4823
+#, fuzzy
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 "      --group-directories-first\n"
@@ -5705,10 +5790,11 @@ msgstr ""
 "                               --sort=none (-U) �併�����グループ化��"
 "�\n"
 
-#: src/ls.c:4769
+#: src/ls.c:4829
+#, fuzzy
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
@@ -5719,14 +5805,15 @@ msgstr ""
 "      --si                   上��様��乗数���� 1024 �代�り� 1000 を"
 "使用�る\n"
 
-#: src/ls.c:4775
+#: src/ls.c:4835
+#, fuzzy
 msgid ""
 "  -H, --dereference-command-line\n"
 "                             follow symbolic links listed on the command "
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
@@ -5742,7 +5829,7 @@ msgstr ""
 "�\n"
 "                               (-a ��� -A �上書��れる)\n"
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 #, fuzzy
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
@@ -5752,7 +5839,7 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 "      --indicator-style=WORD  �素���� WORD 形��識別�を加�る:\n"
 "                               none (デフォルト)� slash (-p)�\n"
@@ -5762,7 +5849,7 @@ msgstr ""
 "�\n"
 "  -k                         --block-size=1K ��様\n"
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -5778,7 +5865,7 @@ msgstr ""
 "                               情報を表示�る\n"
 "  -m                         �素�リストをカンマ�区切り�一行�詰�込む\n"
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -5795,12 +5882,12 @@ msgstr ""
 "  -p, --indicator-style=slash\n"
 "                             ディレクトリ�対��識別� / を加��表示�る\n"
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 #, fuzzy
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -5816,7 +5903,7 @@ msgstr ""
 "                               literal, locale, shell, shell-always, c, "
 "escape\n"
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
 "  -R, --recursive            list subdirectories recursively\n"
@@ -5827,16 +5914,19 @@ msgstr ""
 "  -R, --recursive            �ディレクトリを�帰的�一覧表示�る\n"
 "  -s, --size                 ブロック����ファイルサイズを表示�る\n"
 
-#: src/ls.c:4825
+#: src/ls.c:4886
+#, fuzzy
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 "  -S                         ファイルサイズ順�ソート�る\n"
 "      --sort=WORD            ��順�代�り�次� WORD �指定��順�ソート�"
@@ -5850,17 +5940,19 @@ msgstr ""
 "                             --sort=time を指定��場��ソート�キー���\n"
 "                             指定��時間�使用�れる\n"
 
-#: src/ls.c:4835
+#: src/ls.c:4896
 #, fuzzy
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
 msgstr ""
 "      --time-style=STYLE     -l �併��使用��次� STYLE 形��時間を表示�"
 "ã‚‹:\n"
@@ -5874,7 +5966,7 @@ msgstr ""
 "� POSIX ロケール\n"
 "                             ��無�場����効果��る\n"
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 msgid ""
 "  -t                         sort by modification time, newest first\n"
 "  -T, --tabsize=COLS         assume tab stops at each COLS instead of 8\n"
@@ -5882,10 +5974,11 @@ msgstr ""
 "  -t                         ファイル更新時間�新��順�ソート�る\n"
 "  -T, --tabsize=COLS         タブ幅を 8 �代�り� COLS ��る\n"
 
-#: src/ls.c:4848
+#: src/ls.c:4912
+#, fuzzy
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
@@ -5898,13 +5991,13 @@ msgstr ""
 "�表示�る\n"
 "  -v                         自然� (�ージョン) 数字順�ソート�る\n"
 
-#: src/ls.c:4855
+#: src/ls.c:4919
+#, fuzzy
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 "  -w, --width=COLS           スクリーン幅����在�値�代�り� COLS を使用"
@@ -5915,7 +6008,7 @@ msgstr ""
 "表示�る\n"
 "  -1                         1 ファイル 1 行�表示�る\n"
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -5931,7 +6024,7 @@ msgstr ""
 "�れ��る場���カラーコードを出力���。LS_COLORS 環境変数�よ��動作\n"
 "を設定����。LS_COLORS を設定�る場�� dircolors を使用������。\n"
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -6006,11 +6099,14 @@ msgid "  -t, --text           read in text mode (default)\n"
 msgstr "  -t, --text           テキストモード�読�込む (デフォルト)\n"
 
 #: src/md5sum.c:195
+#, fuzzy
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
@@ -6022,14 +6118,7 @@ msgstr ""
 "  -w, --warn           �ェックサム行�書���正�場��警告を行�\n"
 "\n"
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-"      --strict         --check �併��使用��無効�入力��る場�� 0 以外"
-"�終了�る\n"
-
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -6045,107 +6134,106 @@ msgstr ""
 "�ェックサム�入力モード��(�イナリ�� `*', テキスト�� ` ')� \n"
 "�よ�ファイル�を表示���。\n"
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, c-format
 msgid "%s: too many checksum lines"
 msgstr "%s: �ェックサム行�多����"
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr "%s: %<PRIuMAX>: %s �ェックサム行�����切�書���"
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr "%s: オープン���読�込��失敗����\n"
 
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr "失敗"
 
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr "完了"
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr "%s: %s �ェックサム����切�書��行��り��ん���"
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
 msgstr[0] "警告: 書����切�行� %<PRIuMAX> 行�り��"
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
 msgstr[0] "警告: 一覧��る %<PRIuMAX> 個�ファイル�読�込���ん���"
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
 msgstr[0] "警告: %<PRIuMAX> 個�計算���ェックサム�一致���ん���"
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
 msgstr ""
 
-#: src/md5sum.c:766
+#: src/md5sum.c:770
 #, fuzzy, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr "--status オプション��ェックサム�照�時���味を����"
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
 msgstr "�ェックサム�照�時�� --binary �よ� --text オプション�無�味��"
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr "--status オプション��ェックサム�照�時���味を����"
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr "--warn オプション��ェックサム�照�時���味を����"
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr "--quiet オプション��ェックサム�照�時���味を����"
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr "--strict オプション��ェックサム�照�時���味を����"
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr "使用法: %s [OPTION]... DIRECTORY...\n"
 
-#: src/mkdir.c:57
+#: src/mkdir.c:59
 #, fuzzy
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
 msgstr ""
 "ディレクトリ�存在���場���ディレクトリを作����。\n"
 "\n"
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
+#, fuzzy
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 "  -m, --mode=MODE   ファイル�パーミッションを a=rwx - umask �����"
 "(chmod �よ��) MODE �設定�る\n"
@@ -6156,66 +6244,92 @@ msgstr ""
 "ト CTX \n"
 "                    を設定�る\n"
 
-#: src/mkdir.c:168
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/mkdir.c:127 src/mkdir.c:172
+#, fuzzy, c-format
+msgid "failed to set default creation context for %s"
+msgstr "デフォルト�ファイル作�コンテキストを %s �設定����ん���"
+
+#: src/mkdir.c:191
+#, fuzzy, c-format
+msgid "failed to restore context for %s"
+msgstr "%s �タイムスタンプ��護�失敗����"
+
+#: src/mkdir.c:231
 #, c-format
 msgid "created directory %s"
 msgstr "ディレクトリ %s を作�����"
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, fuzzy, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr ""
+"警告: --context (-Z) �無視�れ���。カー�ル� SELinux �有効���り��"
+"ã‚“"
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr "使用法: %s [OPTION]... NAME...\n"
 
-#: src/mkfifo.c:52
+#: src/mkfifo.c:54
 #, fuzzy
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
 msgstr ""
 "NAME ��������付�パイプ (FIFO) を作����。\n"
 "\n"
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
 msgstr ""
 "  -m, --mode=MODE   ファイル�パーミッションを a=rw - umask �����(chmod "
 "�よ��) MODE �設定�る\n"
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
-"  -Z, --context=CTX  作���� NAME � SELinux セキュリティコンテキスト CTX "
-"を設定�る\n"
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, c-format
 msgid "invalid mode"
 msgstr "無効�モード"
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr "モード��ファイルパーミッション�ビット��指定����"
 
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
+#, fuzzy, c-format
+msgid "cannot set permissions of %s"
+msgstr "%s �パーミッションを変更����ん"
+
+#: src/mknod.c:54
 #, c-format
 msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr "使用法: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 
-#: src/mknod.c:54
+#: src/mknod.c:56
 #, fuzzy
 msgid "Create the special file NAME of the given TYPE.\n"
 msgstr ""
 "スペシャルファイル NAME をタイプ TYPE �作����。\n"
 "\n"
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr ""
-"  -Z, --context=CTX  作��� NAME � SELinux セキュリティコンテキスト CTX を"
-"設定�る\n"
-
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -6232,7 +6346,7 @@ msgstr ""
 "解釈\n"
 "�れ��。 TYPE �次�通り��:\n"
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 msgid ""
 "\n"
 "  b      create a block (buffered) special file\n"
@@ -6244,57 +6358,57 @@ msgstr ""
 "  c, u   キャラクタ型(�ッファリング�れ��)スペシャルファイルを作�\n"
 "  p      ����パイプを作�\n"
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 msgid "Special files require major and minor device numbers."
 msgstr ""
 "スペシャルファイルを作��る時��MAJOR �よ� MINOR デ�イス番�を\n"
 "指定���れ��り��ん。"
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 msgid "Fifos do not have major and minor device numbers."
 msgstr "FIFO � MAJOR �よ� MINOR デ�イス番�を指定�������ん。"
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, c-format
 msgid "block special files not supported"
 msgstr "ブロックスペシャルファイル�サ�ート�れ����ん"
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, c-format
 msgid "character special files not supported"
 msgstr "キャラクタスペシャルファイル�サ�ート�れ����ん"
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, c-format
 msgid "invalid major device number %s"
 msgstr "無効� MAJOR デ�イス番���: %s"
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, c-format
 msgid "invalid minor device number %s"
 msgstr "無効� MINOR デ�イス番���: %s"
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, c-format
 msgid "invalid device %s %s"
 msgstr "無効�デ�イス番���: %s %s"
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, c-format
 msgid "invalid device type %s"
 msgstr "無効�デ�イスタイプ��: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr "Eric Blake"
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr "使用法: %s [OPTION]... [TEMPLATE]\n"
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 #, fuzzy
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
@@ -6307,14 +6421,14 @@ msgstr ""
 "れ��\n"
 "場��tmp.XXXXXXXXXX �使用�れ� --tmpdir �暗黙的�値��り��。\n"
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
 "ファイル� u+rw �ら umask �設定を差�引��も��作��れ��。\n"
 "ディレクトリ� u+rwx �ら umask �設定を差�引��も��作��れ��。\n"
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
@@ -6325,12 +6439,13 @@ msgstr ""
 "  -q, --quiet         ファイル���ディレクトリ作�失敗�メッセージを抑止�"
 "ã‚‹\n"
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
+#, fuzzy
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
 "      --suffix=SUFF   TEMPLATE � SUFF を追加�る。 SUFF �スラッシュ (/) �"
 "��れ��\n"
@@ -6338,12 +6453,13 @@ msgstr ""
 "�れ���\n"
 "                        ��暗黙的�仮定�れる。\n"
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
+#, fuzzy
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
 "      --tmpdir[=DIR]  TEMPLATE を DIR �対�る相対パス���扱�。DIR �指"
@@ -6360,9 +6476,9 @@ msgstr ""
 "ã‚’\n"
 "                        作����。\n"
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
+#, fuzzy
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
@@ -6375,62 +6491,57 @@ msgstr ""
 "ス��一\n"
 "                        ファイル��素���解釈�る (�推奨)\n"
 
-#: src/mktemp.c:223
-#, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr "標準エラー出力を /dev/null �リダイレクト出���ん���"
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, c-format
 msgid "too many templates"
 msgstr "TEMPLATE �多����"
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr ""
 "--suffix を使用�る場��テンプレート %s � X �終了���れ�����ん"
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr "%s: 無効�接尾辞��。ディレクトリ区切り文字���れ����"
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr "テンプレート %s ���れ��る X �数�少�����"
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr "%s: 無効�テンプレート��。ディレクトリ区切り文字���れ����"
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr ""
 "%s: 無効�テンプレート��。 --tmpdir を使用�る場��絶対パス�無��も�れ"
 "��ん"
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, c-format
 msgid "failed to create directory via template %s"
 msgstr "テンプレート %s �らディレクトリを作�����ん"
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, c-format
 msgid "failed to create file via template %s"
 msgstr "テンプレート %s �らファイルを作�����ん"
 
-#: src/mv.c:292
+#: src/mv.c:294
 #, fuzzy
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 "ファイル��変更�も���複数�ファイルをディレクトリ�移動���。\n"
 "\n"
 
-#: src/mv.c:298
+#: src/mv.c:300
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
 "file\n"
@@ -6450,7 +6561,7 @@ msgstr ""
 "  -n, --no-clobber             既存�ファイルを上書����\n"
 "-i, -f, -n を一�以上使用��場��最後�オプション�使用�れ��。\n"
 
-#: src/mv.c:307
+#: src/mv.c:309
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
@@ -6462,7 +6573,8 @@ msgstr ""
 "  -S, --suffix=SUFFIX          通常��ックアップ接尾辞を SUFFIX �上書��"
 "ã‚‹\n"
 
-#: src/mv.c:312
+#: src/mv.c:314
+#, fuzzy
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
 "DIRECTORY\n"
@@ -6471,6 +6583,8 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
 "  -t, --target-directory=DIRECTORY  全�� SOURCE 引数を DIRECTORY �移動�"
 "ã‚‹\n"
@@ -6773,98 +6887,93 @@ msgid "%s: invalid number to ignore"
 msgstr "%s: 無視�る数�無効��"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
 msgstr ""
 
-#: src/numfmt.c:676
+#: src/numfmt.c:659
 #, fuzzy, c-format
-msgid "value too large to be converted: '%s'"
+msgid "value too large to be converted: %s"
 msgstr "%s: 値�完全��変��れ����ん"
 
-#: src/numfmt.c:680
+#: src/numfmt.c:663
 #, fuzzy, c-format
-msgid "invalid number: '%s'"
+msgid "invalid number: %s"
 msgstr "%s : 無効�数字��"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
+msgid "rejecting suffix in input: %s (consider using --from)"
 msgstr ""
 
-#: src/numfmt.c:688
+#: src/numfmt.c:671
 #, fuzzy, c-format
-msgid "invalid suffix in input: '%s'"
+msgid "invalid suffix in input: %s"
 msgstr "引数 `%3$s' �対��無効�接尾辞 %1$s%2$s ��"
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
 msgstr ""
 
-#: src/numfmt.c:723
+#: src/numfmt.c:722 src/numfmt.c:768
 #, fuzzy, c-format
 msgid "failed to prepare value '%Lf' for printing"
 msgstr "%s: 書�込�用�開����失敗����"
 
-#: src/numfmt.c:787
+#: src/numfmt.c:791
 #, fuzzy, c-format
-msgid "invalid unit size: '%s'"
+msgid "invalid unit size: %s"
 msgstr "無効�タブ幅��: %s"
 
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
-#, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr ""
-
-#: src/numfmt.c:813
+#: src/numfmt.c:814
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
 msgstr "使用法: %s [OPTION]... [USER]...\n"
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
 msgstr ""
 
-#: src/numfmt.c:820
+#: src/numfmt.c:821
 #, fuzzy
 msgid "      --debug          print warnings about invalid input\n"
 msgstr ""
 "      --strict         --check �併��使用��無効�入力��る場�� 0 以外"
 "�終了�る\n"
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
 msgstr ""
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
 "                         see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr ""
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
@@ -6872,19 +6981,19 @@ msgid ""
 "locale)\n"
 msgstr ""
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
 msgstr ""
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
 msgstr ""
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -6894,30 +7003,30 @@ msgid ""
 "                         is found\n"
 msgstr ""
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
 "nearest\n"
 msgstr ""
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
 msgstr ""
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr ""
 
-#: src/numfmt.c:877
+#: src/numfmt.c:878
 #, fuzzy
 msgid ""
 "\n"
@@ -6926,11 +7035,11 @@ msgstr ""
 "�����オプション:\n"
 "\n"
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr ""
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -6939,7 +7048,7 @@ msgid ""
 "               1Mi = 1048576,\n"
 msgstr ""
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
@@ -6947,7 +7056,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
@@ -6955,7 +7064,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
@@ -6963,18 +7072,18 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:905
+#: src/numfmt.c:906
 #, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -6986,7 +7095,7 @@ msgid ""
 "errors are not diagnosed and the exit status is 0.\n"
 msgstr ""
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -7007,112 +7116,112 @@ msgid ""
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 msgstr ""
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, c-format
 msgid "format %s has no %% directive"
 msgstr "FORMAT %s � %% 指定��り��ん"
 
-#: src/numfmt.c:990
+#: src/numfmt.c:1003
 #, fuzzy, c-format
 msgid "invalid format %s (width overflow)"
 msgstr "無効�書�幅��"
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr ""
+
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr "FORMAT %s � %% �終了�����"
 
-#: src/numfmt.c:1010
+#: src/numfmt.c:1030
 #, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
 msgstr ""
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr "FORMAT %s � %% 指定�多����"
 
-#: src/numfmt.c:1070
+#: src/numfmt.c:1081
 #, fuzzy, c-format
-msgid "invalid suffix in input '%s': '%s'"
+msgid "invalid suffix in input %s: %s"
 msgstr "引数 `%3$s' �対��無効�接尾辞 %1$s%2$s ��"
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
 msgstr ""
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
 msgstr ""
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
+msgid "large input value %s: possible precision loss"
 msgstr ""
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
 
-#: src/numfmt.c:1388
+#: src/numfmt.c:1403
 #, fuzzy, c-format
-msgid "invalid padding value '%s'"
+msgid "invalid padding value %s"
 msgstr "無効�ページ範囲�� %s"
 
-#: src/numfmt.c:1401
+#: src/numfmt.c:1417
 #, fuzzy, c-format
-msgid "invalid field value '%s'"
+msgid "invalid field value %s"
 msgstr "無効�フィールド番���: %s"
 
-#: src/numfmt.c:1430
+#: src/numfmt.c:1447
 #, fuzzy, c-format
-msgid "invalid header value '%s'"
+msgid "invalid header value %s"
 msgstr "%s �無効�日付��"
 
-#: src/numfmt.c:1456
+#: src/numfmt.c:1473
 #, fuzzy, c-format
 msgid "--grouping cannot be combined with --format"
 msgstr "ファイルオペランド� --files0-from を�時�使用����ん"
 
-#: src/numfmt.c:1458
-#, fuzzy, c-format
-msgid "--padding cannot be combined with --format"
-msgstr "ファイルオペランド� --files0-from を�時�使用����ん"
-
-#: src/numfmt.c:1463
+#: src/numfmt.c:1478
 #, fuzzy, c-format
 msgid "no conversion option specified"
 msgstr "複数� -i オプション�指定�れ����"
 
-#: src/numfmt.c:1471
+#: src/numfmt.c:1486
 #, fuzzy, c-format
 msgid "grouping cannot be combined with --to"
 msgstr "ファイルオペランド� --files0-from を�時�使用����ん"
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
 msgstr ""
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
 msgstr ""
 
-#: src/numfmt.c:1511
+#: src/numfmt.c:1526
 #, fuzzy, c-format
 msgid "error reading input"
 msgstr "%s �読�込�エラー"
 
-#: src/numfmt.c:1520
+#: src/numfmt.c:1535
 #, fuzzy, c-format
 msgid "failed to convert some of the input numbers"
 msgstr "標準入力�使用�������り込む���失敗����"
 
-#: src/od.c:294
+#: src/od.c:320
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -7125,7 +7234,7 @@ msgstr ""
 "���: %s --traditional [OPTION]... [FILE] [[+]OFFSET[.][b] [+][LABEL][.]"
 "[b]]\n"
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -7140,7 +7249,7 @@ msgstr ""
 "を指定����� - �場��標準入力�ら読�込���。\n"
 "\n"
 
-#: src/od.c:307
+#: src/od.c:333
 #, fuzzy
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
@@ -7158,26 +7267,25 @@ msgstr ""
 "OFFSET �よ� LABEL � 0x ��� 0X 接頭辞を��る��六進数を表���。\n"
 "接尾� . �八進数を表���。接尾� b � 512 �を表���。\n"
 
-#: src/od.c:318
-#, fuzzy
+#: src/od.c:344
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
-"  -A, --address-radix=RADIX   ファイルオフセット�表示形�を指定�る\n"
-"  -j, --skip-bytes=BYTES      ファイル�先頭より BYTES 分スキップ�る\n"
 
-#: src/od.c:323
+#: src/od.c:350
 #, fuzzy
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
@@ -7189,7 +7297,7 @@ msgstr ""
 "  -w, --width[=BYTES]         一行��り�出力�イト数を BYTES �イト��る\n"
 "      --traditional           �� POSIX �形��引数を��付�る\n"
 
-#: src/od.c:336
+#: src/od.c:363
 #, fuzzy
 msgid ""
 "\n"
@@ -7197,7 +7305,7 @@ msgid ""
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 "\n"
@@ -7207,7 +7315,7 @@ msgstr ""
 "  -c   -t c ��様。 ASCII 文字��� \\ エスケープ文字�表示�る\n"
 "  -d   -t u2��様。符����進数2�イト�表示�る\n"
 
-#: src/od.c:345
+#: src/od.c:372
 msgid ""
 "  -f   same as -t fF, select floats\n"
 "  -i   same as -t dI, select decimal ints\n"
@@ -7223,14 +7331,14 @@ msgstr ""
 "  -s   -t d2��様。�進数2�イト�表示�る\n"
 "  -x   -t x2��様。�六進数2�イト�表示�る\n"
 
-#: src/od.c:353
+#: src/od.c:380
 #, fuzzy
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 "\n"
 "TYPE �次���れ�一�以上を指定���:\n"
@@ -7238,7 +7346,7 @@ msgstr ""
 "  a          文字�。最上�ビット�無視�れる\n"
 "  c          ASCII 文字��� \\ エスケープ文字\n"
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -7252,7 +7360,7 @@ msgstr ""
 "  u[サイズ]    符���10進数  1 整数(integer)�サイズ指定\n"
 "  x[サイズ]    16進数          1 整数(integer)�サイズ指定\n"
 
-#: src/od.c:367
+#: src/od.c:394
 #, fuzzy
 msgid ""
 "\n"
@@ -7268,14 +7376,14 @@ msgstr ""
 "F � sizeof(float) ���, D � sizeof(double) ���, ��� \n"
 "L � sizeof(long double) ���指定����.\n"
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
 "each output line.\n"
 msgstr ""
 
-#: src/od.c:379
+#: src/od.c:406
 #, fuzzy
 msgid ""
 "\n"
@@ -7293,12 +7401,12 @@ msgstr ""
 "b =512�kB =1000�K =1024�MB =1000*1000�M =1024*1024\n"
 "GB =1000*1000*1000�G =1024*1024*1024��よ� T�P�E�Z�Y ����。\n"
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, c-format
 msgid "invalid type string %s"
 msgstr "無効� TYPE 指定文字列��: %s"
 
-#: src/od.c:649
+#: src/od.c:690
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7307,7 +7415,7 @@ msgstr ""
 "無効� TYPE 指定文字列��: %s;\n"
 "��システム�� %lu �イト整数型を扱���ん"
 
-#: src/od.c:770
+#: src/od.c:811
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7316,38 +7424,38 @@ msgstr ""
 "無効� TYPE 指定文字列��: %s;\n"
 "��システム�� %lu �イト浮動�数点型を扱���ん"
 
-#: src/od.c:828
+#: src/od.c:869
 #, fuzzy, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr "型指定文字列 %2$s �無効�文字 `%1$c' ���れ����"
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr "入力�終端を越��読����事�����ん"
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, fuzzy, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr ""
 "無効�出力アドレス�基数 `%c' �指定�れ���\n"
 "             -- doxn ���れ�を指定������"
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr "文字列ダンプ時�型�指定����ん"
 
-#: src/od.c:1810
+#: src/od.c:1863
 msgid "compatibility mode supports at most one file"
 msgstr "互�モード�� 1 個�ファイル��使用����ん"
 
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr "スキップ�イト数�読�込��イト数�和�大�����"
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr "警告: 幅 %lu �無効�値��。代�り� %d を使用���"
@@ -7511,12 +7619,12 @@ msgstr "開始時刻"
 msgid "Where"
 msgstr "ログイン元"
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr "使用法: %s [OPTION]... [USER]...\n"
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -7532,7 +7640,7 @@ msgstr ""
 "  -p              長形��ユーザ�プランファイルを�略\n"
 "  -s              短形��出力 (標準)\n"
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -7546,7 +7654,7 @@ msgstr ""
 "  -q              短形��ユーザ�フル�ーム, ログイン元�よ�待機時間を�"
 "ç•¥\n"
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -7557,7 +7665,7 @@ msgstr ""
 "軽� `finger' プログラム��。ユーザ情報を表示���。\n"
 "utmp ファイル� %s �使用�れ��。\n"
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr ""
@@ -7778,11 +7886,13 @@ msgstr ""
 "                    ファイルを開��������警告を表示���\n"
 
 #: src/pr.c:2820
+#, fuzzy
 msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
@@ -7797,7 +7907,7 @@ msgstr ""
 "ã‚Šè©°\n"
 "                    ��無効��る\n"
 
-#: src/pr.c:2827
+#: src/pr.c:2828
 #, fuzzy
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
@@ -7815,7 +7925,7 @@ msgstr ""
 "                    列オプション��影響を�����\n"
 "  -t, --omit-header  ページ�ヘッダー�フッターを表示���\n"
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 msgid ""
 "  -T, --omit-pagination\n"
 "                    omit page headers and trailers, eliminate any "
@@ -7837,7 +7947,7 @@ msgstr ""
 "                    複数列�出力時��ページ幅を PAGE_WIDTH (72)\n"
 "                    文字�設定�る。 -s[char] �無効��る\n"
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
 "                    set page width to PAGE_WIDTH (72) characters always,\n"
@@ -7850,7 +7960,7 @@ msgstr ""
 "                    PAGE_WIDTH (72) 文字�設定��行を切り詰�る。-S �\n"
 "                    �� -s オプション��影響���\n"
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 msgid ""
 "\n"
 "-t is implied if PAGE_LENGTH <= 10.  With no FILE, or when FILE is -, read\n"
@@ -7876,7 +7986,8 @@ msgstr ""
 "\n"
 
 #: src/printenv.c:69
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+#, fuzzy
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr "  -0, --null     出力行�最後�改行文字���� NULL 文字を付加�る\n"
 
 #: src/printf.c:79
@@ -7993,12 +8104,12 @@ msgstr "警告: %s �始�る余計�引数�無視�れ��"
 msgid "F. Pinard"
 msgstr "F. Pinard"
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, c-format
 msgid "%s (for regexp %s)"
 msgstr "%s (正�表� %s)"
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
@@ -8007,7 +8118,7 @@ msgstr ""
 "使用法: %s [OPTION]... [INPUT]...   (-G ��)\n"
 "���: %s -G [OPTION]... [INPUT [OUTPUT]]\n"
 
-#: src/ptx.c:1821
+#: src/ptx.c:1824
 #, fuzzy
 msgid ""
 "Output a permuted index, including context, of the words in the input "
@@ -8016,7 +8127,7 @@ msgstr ""
 "入力ファイル���れる�語�索引を並�替���後を���出力���。\n"
 "\n"
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 #, fuzzy
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
@@ -8027,7 +8138,7 @@ msgstr ""
 "  -G, --traditional              System V � `ptx' �より近�動作を行�\n"
 "  -F, --flag-truncation=STRING   行�切り詰��目�� STRING を使用�る\n"
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 #, fuzzy
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
@@ -8042,7 +8153,7 @@ msgstr ""
 "  -S, --sentence-regexp=REGEXP   行末���文末を表��る正�表�を指定\n"
 "  -T, --format=tex               TeX 命令�出力を生�\n"
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -8058,7 +8169,7 @@ msgstr ""
 "  -i, --ignore-file=FILE         FILE �ら無視�る�語一覧を読�込む\n"
 "  -o, --only-file=FILE           �� FILE �ら�語一覧��を読�込む\n"
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -8069,16 +8180,16 @@ msgstr ""
 "  -t, --typeset-mode               - 未実装 -\n"
 "  -w, --width=NUMBER             列�出力幅を指定. �照文を除��数�る\n"
 
-#: src/ptx.c:1854
+#: src/ptx.c:1857
 #, fuzzy
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
 "\n"
-"FILE を指定������� FILE � - �場��標準入力�ら読�込�れ��。\n"
+"ファイル�指定�����り, - ����場�, 標準入力�ら読�込���.\n"
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, c-format
 msgid "invalid gap width: %s"
 msgstr "無効�隙間�幅��: %s"
@@ -8100,22 +8211,28 @@ msgstr ""
 "                  ����使用�る\n"
 "  -P, --physical  全��シンボリックリンクを辿る\n"
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+
+#: src/pwd.c:169
 #, c-format
 msgid "failed to chdir to %s"
 msgstr "%s �ディレクトリを変更 (chdir) ����ん���"
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, c-format
 msgid "failed to stat %s"
 msgstr "%s �属性情報を�得 (stat) ����ん���"
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr "%s �中� i ノード�一致���るディレクトリ�見��り��ん"
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, c-format
 msgid "ignoring non-option arguments"
 msgstr "�オプション引数を無視���"
@@ -8125,8 +8242,8 @@ msgstr "�オプション引数を無視���"
 msgid "Dmitry V. Levin"
 msgstr "Dmitry V. Levin"
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "使用法: %s [OPTION]... FILE...\n"
@@ -8173,8 +8290,7 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 "  -m, --canonicalize-missing    与�られ�����素中�存在�るシンボリック"
 "リンクを\n"
@@ -8206,7 +8322,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 
@@ -8224,41 +8340,42 @@ msgstr "%s: 書ã��è¾¼ã�¿ä¿�è­·ã�•ã‚Œã�Ÿãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª %s é…�下を削除ã�—ã
 msgid "%s: descend into directory %s? "
 msgstr "%s: ディレクトリ %s �下�入り���? "
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr "%s: 書�込��護�れ�ファイル %s %s を削除����?"
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, c-format
 msgid "%s: remove %s %s? "
 msgstr "%s: %s %s を削除����? "
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, c-format
 msgid "removed directory: %s\n"
 msgstr "ディレクトリを削除����: %s\n"
 
-#: src/remove.c:444
-#, c-format
-msgid "cannot remove directory: %s"
-msgstr "ディレクトリを削除����ん: %s"
+#: src/remove.c:447
+#, fuzzy, c-format
+msgid "refusing to remove %s or %s directory: skipping %s"
+msgstr "ディレクトリ %s �削除�失敗����"
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr "異�るデ�イス上��る�� %s をスキップ���"
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, c-format
 msgid "traversal failed: %s"
 msgstr "横断失敗: %s"
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -8287,15 +8404,16 @@ msgstr ""
 "  -i                    削除を行����確�を行�\n"
 
 #: src/rm.c:142
+#, fuzzy
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 "  -I                    3 個を超�るファイルを削除�る��ディレクトリを�帰"
 "的�\n"
@@ -8375,14 +8493,16 @@ msgstr ""
 "�。\n"
 
 #: src/rm.c:342
-#, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr "%s: 全��引数を�帰的�削除����? "
+#, fuzzy, c-format
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] "%s: 全��引数を�帰的�削除����? "
 
-#: src/rm.c:343
-#, c-format
-msgid "%s: remove all arguments? "
-msgstr "%s: 全��引数を削除����? "
+#: src/rm.c:345
+#, fuzzy, c-format
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] "%s: 全��引数を削除����? "
 
 #: src/rmdir.c:134 src/rmdir.c:233
 #, c-format
@@ -8436,7 +8556,7 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
 
@@ -8498,41 +8618,46 @@ msgstr "-c, -t, -u, -l, -r, ã�¾ã�Ÿã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆã‚’指定ã�—ã�ªã�‘ã‚Œã�°ã
 msgid "no command specified"
 msgstr "コマンド�指定�れ����ん"
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr "%s � SELinux kernel ���使用����"
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, c-format
 msgid "failed to compute a new context"
 msgstr "新��コンテキストを計算����ん���"
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, c-format
 msgid "failed to set new user %s"
 msgstr "新��ユーザ %s �設定����ん���"
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, c-format
 msgid "failed to set new type %s"
 msgstr "新��タイプ %s �設定����ん���"
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, c-format
 msgid "failed to set new range %s"
 msgstr "新��レンジ %s �設定����ん���"
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, c-format
 msgid "failed to set new role %s"
 msgstr "新��ロール %s �設定����ん���"
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, c-format
 msgid "unable to set security context %s"
 msgstr "セキュリティコンテキスト %s を設定����ん"
 
+#: src/selinux.c:127 src/selinux.c:300
+#, fuzzy, c-format
+msgid "error canonicalizing %s"
+msgstr "%s �正�化�失敗����"
+
 #: src/seq.c:68
 #, c-format
 msgid ""
@@ -8563,10 +8688,13 @@ msgstr ""
 "  -w, --equal-width        先頭を 0 �埋��幅�等���るよ���る\n"
 
 #: src/seq.c:86
+#, fuzzy
 msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
@@ -8579,7 +8707,7 @@ msgstr ""
 "FIRST � LAST より���場��通常 INCREMENT を正����。���\n"
 "FIRST � LAST より大��場��通常 INCREMENT を府����。\n"
 
-#: src/seq.c:94
+#: src/seq.c:96
 #, fuzzy
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
@@ -8591,90 +8719,28 @@ msgstr ""
 "��\n"
 "デフォルト� %.PRECf ��り��。�れ以外� %g ��り��。\n"
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, c-format
 msgid "invalid floating point argument: %s"
 msgstr "引数�浮動�数�無効��: %s"
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr "FORMAT %s ��明� %%%c 指定��り��"
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr ""
 "等��幅�文字列を表示�る��� FORMAT 文字列を指定�����も�れ��ん"
 
-#: src/setuidgid.c:49
-#, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-"使用法: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"���: %s LONG-OPTION\n"
-
-#: src/setuidgid.c:55
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-"補助グループ�権�を無���ユーザID �よ�グループ ID を指定�� USER (数"
-"値\n"
-"��ID ���ユーザ�) �も���� COMMAND を 指定��引数 ARGUMENT �実行\n"
-"���。終了ステータス�ユーザID�よ�グループID�使用����場�� 111 �"
-"�。\n"
-"�れ以外�場��終了ステータス� COMMAND �終了ステータス��り��。\n"
-"��プログラム� root (ユーザID � 0) �実行��場����役�立���。\n"
-"\n"
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-"  -g GID[,GID1...]  主グループ ID を数値 GID �設定�る。追加グループ ID を\n"
-"                    GID1, ... �設定�る (指定�れ���場�)\n"
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr "�明�ユーザ ID ��: %s"
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr "ユーザ ID %s を使用�る場��� -g も使用�る必���り��"
-
-#: src/setuidgid.c:190
-#, c-format
-msgid "failed to set supplemental group(s)"
-msgstr "追加グループ�設定�失敗����"
-
-#: src/setuidgid.c:200
-#, c-format
-msgid "cannot set group-ID to %lu"
-msgstr "グループ ID を %lu �設定����ん"
-
-#: src/setuidgid.c:204
-#, c-format
-msgid "cannot set user-ID to %lu"
-msgstr "ユーザ ID を %lu �設定����ん"
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr "Colin Plumb"
 
-#: src/shred.c:148
+#: src/shred.c:170
 #, fuzzy
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
@@ -8684,7 +8750,7 @@ msgstr ""
 "データ復元�為�調査を行�事��常�困難��るよ�����。\n"
 "\n"
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -8699,9 +8765,10 @@ msgstr ""
 "�\n"
 "                 �使用�能)\n"
 
-#: src/shred.c:161
+#: src/shred.c:183
+#, fuzzy
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
@@ -8713,15 +8780,20 @@ msgstr ""
 "                   ファイル以外���れ�デフォルト�動作\n"
 "  -z, --zero     shred を行����を隠����最後� 0 �上書��る\n"
 
-#: src/shred.c:170
+#: src/shred.c:192
+#, fuzzy
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 "\n"
@@ -8733,7 +8805,7 @@ msgstr ""
 "�作�る時����ん��人� --remove オプションを使用���。\n"
 "\n"
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -8750,7 +8822,7 @@ msgstr ""
 "�モード� shred �効果的��る��を�証����ファイルシステム�例��。\n"
 "\n"
 
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -8770,7 +8842,7 @@ msgstr ""
 "ム\n"
 "\n"
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -8784,7 +8856,7 @@ msgstr ""
 "* 圧縮ファイルシステム\n"
 "\n"
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -8806,7 +8878,7 @@ msgstr ""
 "�記述�れ��。詳細�マニュアル (man mount) �記述�れ����。\n"
 "\n"
 
-#: src/shred.c:215
+#: src/shred.c:241
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
 "of the file that cannot be removed, and that will allow a shredded file\n"
@@ -8816,127 +8888,127 @@ msgstr ""
 "ファイル�コピー���れ��る場���り��。�れ�より shred ��ファイル\n"
 "�後�復元��る�も�れ��ん。\n"
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, c-format
 msgid "%s: fdatasync failed"
 msgstr "%s: ファイルデータ�期 (fdatasync) �失敗����"
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr "%s: ファイル�期 (fsync) �失敗����"
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr "%s: 巻�戻�����ん"
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr "%s: 経� %lu/%lu (%s)..."
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, c-format
 msgid "%s: error writing at offset %s"
 msgstr "%s: オフセット %s �書�込�エラー�発生����"
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s: ファイル走査 (lseek) �失敗����"
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, c-format
 msgid "%s: file too large"
 msgstr "%s: ファイル�大�����"
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr "%s: 経� %lu/%lu (%s)...%s"
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr "%s: 経� %lu/%lu (%s)...%s/%s %d%%"
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, c-format
 msgid "%s: fstat failed"
 msgstr "%s: ファイル状態�得 (fstat) �失敗����"
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, c-format
 msgid "%s: invalid file type"
 msgstr "%s: 無効�ファイル�種類��"
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr "%s: ファイル�負�大���������"
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, c-format
 msgid "%s: error truncating"
 msgstr "%s: ファイル切り詰�時�エラー�発生����"
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, c-format
 msgid "%s: fcntl failed"
 msgstr "%s: ファイル記述��作 (fcntl) �失敗����"
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr "%s: 追加用ファイル記述��� shred ����ん"
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr "%s: 削除�����"
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, c-format
 msgid "%s: renamed to %s"
 msgstr "%s: %s ����変更�れ���"
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, c-format
 msgid "%s: failed to remove"
 msgstr "%s: 削除�失敗����"
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr "%s: 削除����"
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, c-format
 msgid "%s: failed to close"
 msgstr "%s: 閉�る��失敗����"
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, c-format
 msgid "%s: failed to open for writing"
 msgstr "%s: 書�込�用�開����失敗����"
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, c-format
 msgid "%s: invalid number of passes"
 msgstr "%s: 無効�繰り返�回数��"
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, c-format
 msgid "multiple random sources specified"
 msgstr "複数�ランダムソース�指定�れ���"
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, c-format
 msgid "%s: invalid file size"
 msgstr "%s: 無効�ファイルサイズ��"
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -8947,14 +9019,15 @@ msgstr ""
 "���: %s -e [OPTION]... [ARG]...\n"
 "���: %s -i LO-HI [OPTION]...\n"
 
-#: src/shuf.c:54
+#: src/shuf.c:67
 #, fuzzy
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr ""
 "入力行をランダム�並�替��標準出力�書�込���。\n"
 "\n"
 
-#: src/shuf.c:60
+#: src/shuf.c:73
+#, fuzzy
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
 "  -i, --input-range=LO-HI   treat each number LO through HI as an input "
@@ -8962,7 +9035,7 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
 msgstr ""
 "  -e, --echo                � ARG を入力行���扱�\n"
 "  -i, --input-range=LO-HI   LO �ら HI ����数を入力行���扱�\n"
@@ -8971,31 +9044,41 @@ msgstr ""
 "      --random-source=FILE  ランダム�イト�ソースを FILE ��る\n"
 "  -z, --zero-terminated     行末を改行文字���� NULL 文字��る\n"
 
-#: src/shuf.c:244
+#: src/shuf.c:228
+#, fuzzy, c-format
+msgid "too many input lines"
+msgstr "�複��行�多����"
+
+#: src/shuf.c:431
 #, c-format
 msgid "multiple -i options specified"
 msgstr "複数� -i オプション�指定�れ����"
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, c-format
 msgid "invalid input range %s"
 msgstr "%s: 無効�入力範囲��"
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, c-format
 msgid "invalid line count %s"
 msgstr "%s: 無効�行数��"
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, c-format
 msgid "multiple output files specified"
 msgstr "複数�出力ファイル�指定�れ����"
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, c-format
 msgid "cannot combine -e and -i options"
 msgstr "-e � -i オプションを�時�使用�る�������ん"
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr ""
+
 #: src/sleep.c:44
 #, fuzzy, c-format
 msgid ""
@@ -9018,17 +9101,17 @@ msgstr ""
 "�止���。\n"
 "\n"
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, c-format
 msgid "invalid time interval %s"
 msgstr "%s: 無効�時間間隔��"
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr "実時間�時計を読��る�������ん"
 
-#: src/sort.c:399
+#: src/sort.c:427
 #, fuzzy
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr ""
@@ -9037,7 +9120,7 @@ msgstr ""
 "連���出力���。\n"
 "\n"
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
@@ -9045,7 +9128,7 @@ msgstr ""
 "並�替�オプション:\n"
 "\n"
 
-#: src/sort.c:409
+#: src/sort.c:437
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
 "  -d, --dictionary-order      consider only blanks and alphanumeric "
@@ -9056,7 +9139,7 @@ msgstr ""
 "  -d, --dictionary-order      空白�よ�英数字����れ��る�仮定�る\n"
 "  -f, --ignore-case           大文字・�文字を区別���\n"
 
-#: src/sort.c:415
+#: src/sort.c:443
 #, fuzzy
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
@@ -9067,14 +9150,14 @@ msgstr ""
 "  -i, --ignore-nonprinting    表示�能�文字��比較を行�\n"
 "  -M, --month-sort            月��ソート�る (�明) < `JAN' < ... < `DEC'\n"
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 "  -h, --human-numeric-sort    人間�読む�����る形��数値を比較�る "
 "(例: 2K 1G)\n"
 
-#: src/sort.c:423
+#: src/sort.c:451
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
 "  -R, --random-sort           sort by random hash of keys\n"
@@ -9086,7 +9169,7 @@ msgstr ""
 "      --random-source=FILE    ランダムソースを FILE �設定�る\n"
 "  -r, --reverse               逆順�ソートを行�\n"
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -9103,7 +9186,7 @@ msgstr ""
 "  -V, --version-sort          自然� (�ージョン) 数字順�ソート�る\n"
 "\n"
 
-#: src/sort.c:437
+#: src/sort.c:465
 msgid ""
 "Other options:\n"
 "\n"
@@ -9111,7 +9194,7 @@ msgstr ""
 "�����オプション:\n"
 "\n"
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
@@ -9120,7 +9203,7 @@ msgstr ""
 "�\n"
 "                            �一時ファイル�使用�れる\n"
 
-#: src/sort.c:445
+#: src/sort.c:473
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
 "  -C, --check=quiet, --check=silent  like -c, but do not report first bad "
@@ -9138,7 +9221,7 @@ msgstr ""
 "ã‚’\n"
 "                              使用��展開�る\n"
 
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -9158,7 +9241,7 @@ msgstr ""
 "ファ\n"
 "                            イル�を標準入力�ら読�込む\n"
 
-#: src/sort.c:459
+#: src/sort.c:487
 #, fuzzy
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
@@ -9171,7 +9254,7 @@ msgstr ""
 "  -m, --merge               ソート�れ�ファイルを併��る。ソート自体�行�"
 "��\n"
 
-#: src/sort.c:463
+#: src/sort.c:491
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "  -s, --stable              stabilize sort by disabling last-resort "
@@ -9182,7 +9265,7 @@ msgstr ""
 "  -s, --stable              ��比較�果�頼ら��安定的�並�替�を行�\n"
 "  -S, --buffer-size=SIZE    主記憶��ッファ�大����� SIZE を使用�る\n"
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -9208,12 +9291,7 @@ msgstr ""
 "c を付�\n"
 "                              ��使用��場��最���一行��出力�る\n"
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr ""
-"  -z, --zero-terminated     文字列�最後�改行��� NULL 文字を付加�る\n"
-
-#: src/sort.c:483
+#: src/sort.c:511
 #, fuzzy
 msgid ""
 "\n"
@@ -9247,7 +9325,7 @@ msgstr ""
 "SIZE �後��以下��数��を指定�る接尾辞を続�る���出���:\n"
 "\n"
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -9267,259 +9345,244 @@ msgstr ""
 "本���イト���値を使用���統的�並�替�順����場��\n"
 "LC_ALL=C を指定������。\n"
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, c-format
 msgid "waiting for %s [-d]"
 msgstr "%s [-d] を待�����"
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr "%s [-d] �異常終了����"
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, c-format
 msgid "cannot create temporary file in %s"
 msgstr "一時ファイルを %s 内�作�����ん"
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr "オープン�失敗����"
 
-#: src/sort.c:970
+#: src/sort.c:998
 msgid "fflush failed"
 msgstr "fflush �失敗����"
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr "クローズ�失敗����"
 
-#: src/sort.c:986
-#, c-format
-msgid "dup2 failed"
-msgstr "dup2 �失敗����"
-
-#: src/sort.c:1103
-#, c-format
-msgid "couldn't execute %s"
-msgstr "%s を実行�る���出���ん���"
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 msgid "couldn't create temporary file"
 msgstr "一時ファイルを作��る���出���ん���"
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, c-format
 msgid "couldn't create process for %s -d"
 msgstr "プロセス %s -d を作��る���出���ん���"
 
-#: src/sort.c:1161
-#, c-format
-msgid "couldn't execute %s -d"
-msgstr "%s -d を実行�る���出���ん���"
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, c-format
 msgid "warning: cannot remove: %s"
 msgstr "待機中: 削除����ん: %s"
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, c-format
 msgid "invalid --%s argument %s"
 msgstr "--%s �引数 %s �無効��"
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, c-format
 msgid "minimum --%s argument is %s"
 msgstr "--%s �引数�最�値� %s ��。"
 
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, c-format
 msgid "--%s argument %s too large"
 msgstr "--%s �引数�値 %s �大�����"
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr "�在� rlimit �基��� --%s �引数�最大値� %s ��"
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr "parallel �引数� 0 ������ん"
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr "状態�得 (stat) �失敗����"
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr "読�込��失敗����"
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, c-format
 msgid "string transformation failed"
 msgstr "文字列�変��失敗����"
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, c-format
 msgid "the untransformed string was %s"
 msgstr "変���文字列� %s ��"
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr "キー�対�� ^ �一致���ん\n"
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, fuzzy, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr "�推奨�キー `%s' �使用�れ����。代�り� `%s' を使用������"
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr "キー %lu �幅� 0 ���無視�れ��"
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, fuzzy, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr ""
 "キー %lu ����先頭�空白類文字��味を����。`b' も指定�る��を検討�"
 "�����"
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr "キー %lu �数値���複数�フィールド�展開�れ��"
 
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, fuzzy, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
 msgstr[0] "オプション `-%s' �無視�れ��"
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, fuzzy, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr "オプション `-r' �最後�比較����用�れ��"
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr "書�込��失敗����"
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr "%s: %s:%s: 順����則: "
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr "標準エラー"
 
-#: src/sort.c:3698
+#: src/sort.c:3738
 #, fuzzy
 msgid "cannot read"
 msgstr "%s: 巻�戻�����ん"
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, c-format
 msgid "%s: invalid field specification %s"
 msgstr "%s: 無効�フィールド指定��: %s"
 
-#: src/sort.c:3987
+#: src/sort.c:4028
 #, fuzzy, c-format
 msgid "options '-%s' are incompatible"
 msgstr "オプション `-%s' �両立���ん"
 
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, c-format
 msgid "%s: invalid count at start of %s"
 msgstr "%s: %s �開始番��無効��"
 
-#: src/sort.c:4295
+#: src/sort.c:4336
 #, fuzzy
 msgid "invalid number after '-'"
 msgstr "`-' �後�数字�正���り��ん"
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 #, fuzzy
 msgid "invalid number after '.'"
 msgstr "`.' �後�数字�正���り��ん"
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr "フィールド指定�使���文字��り��"
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, c-format
 msgid "multiple compress programs specified"
 msgstr "複数�圧縮プログラム�指定�れ����"
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
 msgstr "フィールド開始番��無効��"
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
 msgstr "フィールド番��ゼロ��"
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr "文字�オフセット�ゼロ��"
 
-#: src/sort.c:4407
+#: src/sort.c:4448
 #, fuzzy
 msgid "invalid number after ','"
 msgstr "`,' �後�数字�正���り��ん"
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr "タブ�空��"
 
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, c-format
 msgid "cannot read file names from %s"
 msgstr "ファイル�を %s �ら読�込む���出���ん"
 
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr "%s:%lu: 長�� 0 �ファイル��無効��"
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, c-format
 msgid "no input from %s"
 msgstr "%s �ら�入力��り��ん"
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr "%s ソートルールを使用�����"
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr "��る�イト比較を使用�����"
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr "追加�オペランド %s � -%c �併��使用����ん"
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr "接尾辞�長��最低 %zu 必���"
 
-#: src/split.c:204
+#: src/split.c:203
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr "使用法: %s [OPTION]... [INPUT [PREFIX]]\n"
 
-#: src/split.c:208
+#: src/split.c:207
 #, fuzzy
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
@@ -9531,22 +9594,21 @@ msgstr ""
 "デフォルト�大��� 1000 行��。デフォルト� PREFIX � `x' ��。 INPUT\n"
 "�指定�れ����INPUT � - を指定��場��標準入力�ら読�込�れ��。\n"
 
-#: src/split.c:216
+#: src/split.c:215
 #, fuzzy, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
 "  -a, --suffix-length=N   接尾辞�長�を N ��る (デフォルト: %d)\n"
@@ -9563,7 +9625,7 @@ msgstr ""
 "  -u, --unbuffered        `-n r/...' を使用��時����入力を出力�コピー�"
 "ã‚‹\n"
 
-#: src/split.c:229
+#: src/split.c:228
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
 "                            output file is opened\n"
@@ -9571,7 +9633,7 @@ msgstr ""
 "      --verbose           �出力ファイルを開���診断メッセージを\n"
 "                            表示�る\n"
 
-#: src/split.c:236
+#: src/split.c:235
 #, fuzzy
 msgid ""
 "\n"
@@ -9592,190 +9654,190 @@ msgstr ""
 "r/N     `l' ��様��ラウンドロビン分割を�る\n"
 "r/K/N   上記��様�� N 個中 K 番目を標準出力�出力�る\n"
 
-#: src/split.c:354
+#: src/split.c:353
 #, c-format
 msgid "output file suffixes exhausted"
 msgstr "出力ファイル�接尾辞を使�果�����"
 
-#: src/split.c:366
+#: src/split.c:365
 #, c-format
 msgid "creating file %s\n"
 msgstr "ファイル %s を作������\n"
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr ""
 
-#: src/split.c:391
+#: src/split.c:390
 #, c-format
 msgid "failed to set FILE environment variable"
 msgstr "環境変数 FILE �設定�失敗����"
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr "FILE=%s �実行�����\n"
 
-#: src/split.c:395
+#: src/split.c:394
 #, c-format
 msgid "failed to create pipe"
 msgstr "パイプ�作��失敗����"
 
-#: src/split.c:409
+#: src/split.c:408
 #, c-format
 msgid "closing prior pipe"
 msgstr "以��パイプを閉�����"
 
-#: src/split.c:411
+#: src/split.c:410
 #, c-format
 msgid "closing output pipe"
 msgstr "出力パイプを閉�����"
 
-#: src/split.c:415
+#: src/split.c:414
 #, c-format
 msgid "moving input pipe"
 msgstr "入力パイプを移動�����"
 
-#: src/split.c:417
+#: src/split.c:416
 #, c-format
 msgid "closing input pipe"
 msgstr "入力パイプを閉�����"
 
-#: src/split.c:422
+#: src/split.c:421
 #, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr "コマンド実行�失敗����: \"%s -c %s\""
 
-#: src/split.c:428
+#: src/split.c:427
 #, c-format
 msgid "failed to close input pipe"
 msgstr "入力パイプを閉�る��失敗����"
 
-#: src/split.c:464
+#: src/split.c:463
 #, c-format
 msgid "waiting for child process"
 msgstr "�プロセスを待機�����"
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr "FILE=%s �次�コマンド�らシグナル %s を���り���: %s"
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr "FILE=%s � 次�コマンド�終了ステータス %d �終了����: %s"
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr "�明�コマンド�終了ステータス�� (0x%X)"
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr "複数�分割方法�指定����ん"
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, c-format
 msgid "%s: invalid number of chunks"
 msgstr "%s: 無効�塊�数��"
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, c-format
 msgid "%s: invalid chunk number"
 msgstr "%s: 無効�塊�番���"
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr "%s: 接尾辞�長��正���り��ん"
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr "%s: 無効��イト数表記��"
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr "%s: 無効�行数表記��"
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, c-format
 msgid "line count option -%s%c... is too large"
 msgstr "行数を指定�るオプション -%s%c �大�����"
 
-#: src/split.c:1248
+#: src/split.c:1298
 #, fuzzy, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr "開始行番��正���り��ん: %s"
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, c-format
 msgid "%s: invalid IO block size"
 msgstr "%s: 無効� IO ブロックサイズ��"
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr "--filter �標準出力�出力�れ�塊を処����ん"
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr ""
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, c-format
 msgid "%s: cannot determine file size"
 msgstr "%s: ファイルサイズを決定����ん"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr "Michael Meskes"
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, c-format
 msgid "failed to canonicalize %s"
 msgstr "%s �正�化�失敗����"
 
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, fuzzy, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr "警告: �識����エスケープ��: `\\%c'"
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, c-format
 msgid "%s: invalid directive"
 msgstr "%s: 無効�指定��"
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, c-format
 msgid "warning: backslash at end of format"
 msgstr "警告: 書�文字列�終端��ックスラッシュ��り��"
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr ""
 "ファイルシステムモード�� %s を使用��標準入力を指定�る�������ん"
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, c-format
 msgid "cannot read file system information for %s"
 msgstr "%s �関�るファイルシステム情報を読�込む�������ん"
 
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, c-format
 msgid "cannot stat standard input"
 msgstr "標準入力�情報を�得 (stat) �る�������ん"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -9791,7 +9853,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -9801,30 +9863,30 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, c-format
 msgid "Context: %C\n"
 msgstr "Context: %C\n"
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -9836,11 +9898,11 @@ msgstr ""
 "Change: %z\n"
 " Birth: %w\n"
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
 msgstr ""
 
-#: src/stat.c:1356
+#: src/stat.c:1418
 #, fuzzy
 msgid ""
 "  -L, --dereference     follow links\n"
@@ -9852,13 +9914,14 @@ msgstr ""
 "  -f, --file-system     ファイル情報�代�り�ファイルシステム情報を表示�"
 "ã‚‹\n"
 
-#: src/stat.c:1360
+#: src/stat.c:1422
+#, fuzzy
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 "  -c  --format=FORMAT   デフォルト�代�り� FORMAT �指定��書��表示�"
@@ -9871,7 +9934,7 @@ msgstr ""
 "                          FORMAT � \\n を��る必���る\n"
 "  -t, --terse           簡潔�形��情報を表示�る\n"
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 #, fuzzy
 msgid ""
 "\n"
@@ -9892,7 +9955,7 @@ msgstr ""
 "  %B   %b �よ��報告�れ��ブロック��イト数\n"
 "  %C   SELinux �セキュリティコンテキスト文字列\n"
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 #, fuzzy
 msgid ""
 "  %d   device number in decimal\n"
@@ -9909,7 +9972,7 @@ msgstr ""
 "  %g   所有者�グループ ID\n"
 "  %G   所有者�グループ�\n"
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 #, fuzzy
 msgid ""
 "  %h   number of hard links\n"
@@ -9919,8 +9982,8 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 "  %h   �ードリンク�数\n"
 "  %i   i ノード番�\n"
@@ -9932,7 +9995,7 @@ msgstr ""
 "  %t   メジャーデ�イス番���六進数表記\n"
 "  %T   マイナーデ�イス番���六進数表記\n"
 
-#: src/stat.c:1399
+#: src/stat.c:1461
 #, fuzzy
 msgid ""
 "  %u   user ID of owner\n"
@@ -9941,10 +10004,10 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 "  %u   所有者�ユーザ ID\n"
@@ -9959,7 +10022,7 @@ msgstr ""
 "  %Z   最終変更日時 (Epoch �ら�秒数)\n"
 "\n"
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 #, fuzzy
 msgid ""
 "Valid format sequences for file systems:\n"
@@ -9978,7 +10041,7 @@ msgstr ""
 "  %d   ファイルシステム�空�ファイルノード数\n"
 "  %f   ファイルシステム�空�ブロック数\n"
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 #, fuzzy
 msgid ""
 "  %i   file system ID in hex\n"
@@ -10075,22 +10138,27 @@ msgstr ""
 "(`dd', `cat' 等) �入出力�ストリームを使用������ `stdbuf' 設定�影響\n"
 "を����ん。\n"
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, c-format
 msgid "failed to find %s"
 msgstr "%s �見��り��ん���"
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, c-format
 msgid "failed to update the environment with %s"
 msgstr "環境を %s �更新�る�������ん���"
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr "標準入力�対�る行モード��ッファ設定��味��り��ん"
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, fuzzy, c-format
+msgid "you must specify a buffering mode option"
+msgstr "%2$s �併��相対的� %1$s を指定���れ�����ん"
+
+#: src/stty.c:516
 #, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -10101,11 +10169,11 @@ msgstr ""
 "���: %s [-F DEVICE | --file=DEVICE] [-a|--all]\n"
 "���: %s [-F DEVICE | --file=DEVICE] [-g|--save]\n"
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
 msgstr ""
 
-#: src/stty.c:525
+#: src/stty.c:528
 #, fuzzy
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
@@ -10119,7 +10187,7 @@ msgstr ""
 "  -F, --file=DEVICE  標準入力�代�り� DEVICE �指定�れ�デ�イスを使用�"
 "ã‚‹\n"
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
@@ -10132,7 +10200,7 @@ msgstr ""
 "�決�り��。\n"
 "\n"
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -10146,7 +10214,7 @@ msgstr ""
 "   eof CHAR      CHAR �ファイル終端を�信 (入力�終了)\n"
 "   eol CHAR      CHAR �行末\n"
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -10158,7 +10226,7 @@ msgstr ""
 "   intr CHAR     CHAR �割り込�シグナルを�信\n"
 "   kill CHAR     CHAR ��在�行を削除\n"
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -10170,7 +10238,7 @@ msgstr ""
 " * rprnt CHAR    CHAR ��在�行を�表示\n"
 "   start CHAR    CHAR ��止��出力を�開\n"
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -10182,7 +10250,7 @@ msgstr ""
 " * swtch CHAR    CHAR �別�シェル層�切り替�\n"
 " * werase CHAR   CHAR �最後�タイプ�れ��語を削除\n"
 
-#: src/stty.c:562
+#: src/stty.c:565
 msgid ""
 "\n"
 "Special settings:\n"
@@ -10196,7 +10264,7 @@ msgstr ""
 " * cols N        ターミナル� N ���る��をカー�ル�通知\n"
 " * columns N     cols N ���\n"
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -10209,7 +10277,7 @@ msgstr ""
 "   min N         -icanon �共�使�, 完全�読込��対��最低 N 文字を設定\n"
 "   ospeed N      出力速度を N �設定\n"
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -10223,7 +10291,7 @@ msgstr ""
 "   time N        -icanon �共�使�, 読込��タイムアウトを 10 分� N 秒�設"
 "定\n"
 
-#: src/stty.c:581
+#: src/stty.c:584
 #, fuzzy
 msgid ""
 "\n"
@@ -10241,7 +10309,7 @@ msgstr ""
 " * [-]crtscts    RTS/CTS �ンドシェイクを有効�\n"
 "   csN           文字�大��を N ビット�設定, N �範囲� [5..8]\n"
 
-#: src/stty.c:590
+#: src/stty.c:593
 #, fuzzy
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
@@ -10250,6 +10318,7 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 "   [-]cstopb     1文字��り 2ストップビットを使用 (1 �場�� `-' を付�"
 "ã‚‹)\n"
@@ -10258,7 +10327,7 @@ msgstr ""
 "   [-]parenb     パリティビットを出力�, 入力�パリティビット��る��る\n"
 "   [-]parodd     奇パリティを設定 (�� `-')\n"
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -10274,7 +10343,7 @@ msgstr ""
 "   [-]ignbrk     ブレイク文字を無視\n"
 "   [-]igncr      復帰 (CR) を無視\n"
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -10288,11 +10357,11 @@ msgstr ""
 "   [-]inpck      入力パリティ��ェックを�能�\n"
 "   [-]istrip     入力文字�最上� (第8) ビットを���\n"
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr " * [-]iutf8      入力文字を UTF-8 �見��\n"
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -10308,7 +10377,7 @@ msgstr ""
 "   [-]parmrk     パリティーエラーをマーク (255-0 文字�シーケンス�)\n"
 "   [-]tandem     [-]ixoff ���\n"
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -10324,10 +10393,11 @@ msgstr ""
 " * ffN           用紙�り�延スタイル. N �範囲� [0..1]\n"
 " * nlN           改行 (LF) �延スタイル. N �範囲� [0..1]\n"
 
-#: src/stty.c:631
+#: src/stty.c:635
+#, fuzzy
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
@@ -10340,7 +10410,7 @@ msgstr ""
 " * [-]onlcr      改行 (LF) を復帰改行 (CR-LF) �翻訳\n"
 " * [-]onlret     改行 (LF) �復帰 (CR) ���振舞�\n"
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -10356,7 +10426,7 @@ msgstr ""
 " * -tabs         tab3 ���\n"
 " * vtN           垂直タブ�延スタイル. N �範囲� [0..1]\n"
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -10370,7 +10440,7 @@ msgstr ""
 " * crtkill       echoprt � echoe �設定������全��行を削除\n"
 " * -crtkill      echoctl � echok �設定������全��行を削除\n"
 
-#: src/stty.c:654
+#: src/stty.c:658
 #, fuzzy
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
@@ -10385,7 +10455,7 @@ msgstr ""
 "   [-]echoe      [-]crterase ���\n"
 "   [-]echok      削除文字�後�改行をエコー\n"
 
-#: src/stty.c:661
+#: src/stty.c:665
 #, fuzzy
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
@@ -10400,7 +10470,7 @@ msgstr ""
 "   [-]icanon     erase, kill, werase �よ� rprnt 特殊文字を使用�能�\n"
 "   [-]iexten     � POSIX 特殊文字を使用�能�\n"
 
-#: src/stty.c:668
+#: src/stty.c:672
 #, fuzzy
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
@@ -10418,7 +10488,7 @@ msgstr ""
 " * [-]tostop     端末�書�込も���る�ックグラウンドジョブを�止\n"
 " * [-]xcase      icanon �共�使�, 大文字�対�� `\\' �エスケープ\n"
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -10432,7 +10502,7 @@ msgstr ""
 "   cbreak        -icanon ���\n"
 "   -cbreak       icanon ���\n"
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -10444,7 +10514,7 @@ msgstr ""
 "   -cooked       raw ���\n"
 "   crt           echoe echoctl echoke ���\n"
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -10458,7 +10528,7 @@ msgstr ""
 "   ek            erase � kill 文字を標準�値�\n"
 "   evenp         parenb -parodd cs7 ���\n"
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -10474,7 +10544,7 @@ msgstr ""
 "   nl            -icrnl -onlcr ���\n"
 "   -nl           icrnl -inlcr -igncr onlcr -ocrnl -onlret ���\n"
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -10488,7 +10558,7 @@ msgstr ""
 "   pass8         -parenb -istrip cs8 ���\n"
 "   -pass8        parenb istrip cs7 ���\n"
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -10500,7 +10570,7 @@ msgstr ""
 "                 -imaxbel -opost -isig -icanon -xcase min 1 time 0 ���\n"
 "   -raw          cooked ���\n"
 
-#: src/stty.c:716
+#: src/stty.c:720
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
 "                 -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n"
@@ -10516,7 +10586,7 @@ msgstr ""
 "                 -xcase -tostop -echoprt echoctl echoke ���,\n"
 "                 全��特殊文字�標準�値.\n"
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -10531,55 +10601,55 @@ msgstr ""
 "�よ��コード化�れ��。特別�値 ^- ��� undef �特殊文字を無効�\n"
 "�る��使用�れ��。\n"
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, c-format
 msgid "only one device may be specified"
 msgstr "DEVICE �一���指定����"
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
 "mutually exclusive"
 msgstr "冗長出力� stty �解釈��る出力形��オプション�排他的��"
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr "出力形�を指定��場��モードを設定�������ん"
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr "%s: �ブロッキングモードを�設定����ん���"
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, c-format
 msgid "invalid argument %s"
 msgstr "%s: 無効�引数��"
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, c-format
 msgid "missing argument to %s"
 msgstr "%s �対�る引数��り��ん"
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, c-format
 msgid "invalid line discipline %s"
 msgstr "%s: 無効�回線制御�則��"
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr "%s: �求�れ�処��全�を実行�る�������ん"
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr "%s: ��デ�イス�サイズ情報��り��ん"
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, c-format
 msgid "invalid integer argument %s"
 msgstr "%s: 無効�整数�引数��"
@@ -10639,22 +10709,22 @@ msgstr "      --help     ��使�方を表示��終了�る\n"
 msgid "      --version  output version information and exit\n"
 msgstr "      --version  �ージョン情報を表示��終了�る\n"
 
-#: src/system.h:544
+#: src/system.h:543
 #, fuzzy
 msgid ""
 "\n"
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "長�オプション�必須�引数�短�オプション�も必須��。\n"
 
-#: src/system.h:552
+#: src/system.h:551
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -10671,39 +10741,37 @@ msgstr ""
 "�\n"
 "イト)。\n"
 
-#: src/system.h:571
-#, c-format
+#: src/system.h:570
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
-msgstr ""
-"\n"
-"%s ��グを発見��場�� %s �報告������。\n"
+"%s online help: <%s>\n"
+msgstr "%s �ホームページ: <%s>\n"
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr ""
 "%s �翻訳�関�る�グ� <http://translationproject.org/team/ja.html> �連絡�"
 "�����。\n"
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr ""
 "完全�文書を�照�る場�� info coreutils '%s invocation' を実行�����"
 "�。\n"
 
-#: src/system.h:596
+#: src/system.h:591
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "詳��� `%s --help' を実行��下��。\n"
 
-#: src/system.h:628
+#: src/system.h:633
 #, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -10800,11 +10868,10 @@ msgstr ""
 "FILE � - �場���標準入力�ら読�込�れ��。\n"
 
 #: src/tail.c:270
+#, fuzzy
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
 "  -c, --bytes=K            最後� K �イトを出力�る。-c +K ���形��指定"
 "��\n"
@@ -10812,11 +10879,11 @@ msgstr ""
 "力�る\n"
 
 #: src/tail.c:274
+#, fuzzy
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 "  -f, --follow[={name|descriptor}]\n"
@@ -10826,18 +10893,17 @@ msgstr ""
 "                           �等価��る\n"
 "  -F                       --follow=name --retry �等価\n"
 
-#: src/tail.c:281
-#, c-format
+#: src/tail.c:280
+#, fuzzy, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
 "  -n, --lines=K            最後� %d 行���� K 行を出力�る。-n +K ���"
 "形��指定\n"
@@ -10855,13 +10921,12 @@ msgstr ""
 "                           inotify �併��使用��場����ん�有効���"
 "�\n"
 
-#: src/tail.c:294
+#: src/tail.c:293
+#, fuzzy
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 "      --pid=PID            -f �併��使用��PID �プロセス�終了��後�終"
 "了�る\n"
@@ -10872,12 +10937,13 @@ msgstr ""
 "��\n"
 "                             ファイル��追跡�る���役�立�\n"
 
-#: src/tail.c:301
+#: src/tail.c:298
+#, fuzzy
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 "  -s, --sleep-interval=N   -f �併��使用��繰り返��間隔を約 N 秒\n"
@@ -10886,7 +10952,7 @@ msgstr ""
 "                             最低 N 秒間� 1 回�プロセス P �確�を行�。\n"
 "  -v, --verbose            ファイル�を表�ヘッダを常�出力�る\n"
 
-#: src/tail.c:310
+#: src/tail.c:307
 #, fuzzy
 msgid ""
 "\n"
@@ -10906,7 +10972,7 @@ msgstr ""
 "G 1024*1024*1024, ��他 T, P, E, Z, Y ��。\n"
 "\n"
 
-#: src/tail.c:319
+#: src/tail.c:316
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
 "means that even if a tail'ed file is renamed, tail will continue to track\n"
@@ -10923,165 +10989,172 @@ msgstr ""
 "用������。�れ�より���変更�削除�作��������������\n"
 "ファイル�末尾を追跡�るよ���り��。\n"
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr "%s (fd=%d) を閉�����"
 
-#: src/tail.c:453
-#, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr "%s: 相対オフセット %s ��探査 (seek) ����ん"
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr "%s: ファイル終端�ら�相対オフセット %s ��探査 (seek) ����ん"
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr "%s ��置�決定����ん。�ーリング�戻り��"
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
 "reverting to polling"
 msgstr ""
 
-#: src/tail.c:963
+#: src/tail.c:965
+#, fuzzy, c-format
+msgid "%s has been replaced with a symbolic link. giving up on this name"
+msgstr ""
+"%s �リモートファイル�置���られ���。��ファイル������処�を終了"
+"���"
+
+#: src/tail.c:980
 #, c-format
 msgid "%s has become inaccessible"
 msgstr "%s �アクセス�能��り���"
 
-#: src/tail.c:980
+#: src/tail.c:997
 #, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr ""
 "%s �終端を追跡����ファイル�置���られ���。��ファイル������"
 "処�を終了���"
 
-#: src/tail.c:989
+#: src/tail.c:1006
 #, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr ""
 "%s �リモートファイル�置���られ���。��ファイル������処�を終了"
 "���"
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, c-format
 msgid "%s has become accessible"
 msgstr "%s �アクセス�能��り���"
 
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr "%s ��れ���。新��ファイル�終端を追跡���"
 
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr "%s �置���られ���。新��ファイル�終端を追跡���"
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr "%s: �ブロッキングモード�変更����ん���"
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr "%s: ファイル�切り詰�られ���"
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr "ファイル�全�残�����ん"
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, c-format
 msgid "cannot watch parent directory of %s"
 msgstr "%s �親ディレクトリを監視����ん"
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, c-format
 msgid "inotify resources exhausted"
 msgstr "inotify 資�を使�果�����"
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, c-format
 msgid "cannot watch %s"
 msgstr "%s を監視����ん"
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr "inotify イベントを監視中�エラー�発生����"
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, c-format
 msgid "error reading inotify event"
 msgstr "inotify イベント�読�込�中�エラー�発生����"
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr ""
 "%s: ��種類�ファイル終端を追跡����ん。��ファイル������処�を終"
 "了���"
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, c-format
 msgid "number in %s is too large"
 msgstr "%s ���れる番��大�����"
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr "%s: 無変化�状態�最大数�無効��"
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr "%s: 無効�プロセス番���"
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr "%s: 無効�秒数��"
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr "無効�コンテキスト�オプション�使用�れ��� -- %c"
 
-#: src/tail.c:2034
+#: src/tail.c:2096
+#, fuzzy, c-format
+msgid "warning: --retry ignored; --retry is useful only when following"
+msgstr "警告: PID �無視�れ���。--pid=PID �追跡を���る����有効��"
+
+#: src/tail.c:2100
 #, c-format
-msgid "warning: --retry is useful mainly when following by name"
-msgstr "warning: --retry �主����追跡を���る����有効��"
+msgid "warning: --retry only effective for the initial open"
+msgstr ""
 
-#: src/tail.c:2038
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
 msgstr "警告: PID �無視�れ���。--pid=PID �追跡を���る����有効��"
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr "警告: --pid=PID ���システム��サ�ート�れ����ん"
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, c-format
 msgid "cannot follow %s by name"
 msgstr "%s を���追跡����ん"
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr "警告: 標準入力を永久�追跡�る���効果的���り��ん"
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr "inotify を使用����ん。�ーリング�戻り��"
@@ -11355,17 +11428,17 @@ msgstr "%s: 余分�引数��"
 msgid "warning: sigprocmask"
 msgstr "警告: timer_create"
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr "警告: timer_settime"
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr "警告: timer_create"
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
@@ -11374,7 +11447,7 @@ msgstr ""
 "使用法: %s [OPTION] DURATION COMMAND [ARG]...\n"
 "���: %s [OPTION]\n"
 
-#: src/timeout.c:229
+#: src/timeout.c:232
 #, fuzzy
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
 msgstr ""
@@ -11382,24 +11455,23 @@ msgstr ""
 "\n"
 "長�オプション�必須�引数�短�オプション�も必須��。\n"
 
-#: src/timeout.c:235
+#: src/timeout.c:238
 #, fuzzy
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
 "      --foreground\n"
 "                 timeout をシェルプロンプト�ら直接実行�����時�"
@@ -11418,7 +11490,7 @@ msgstr ""
 "                   �`HUP' �よ�����番�を使用�る。シグナル\n"
 "                   一覧����� `kill -l` を�照\n"
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 #, fuzzy
 msgid ""
 "\n"
@@ -11430,7 +11502,7 @@ msgstr ""
 "DURATION �浮動�数�指定��次�接尾辞を追加����:\n"
 "`s' �秒 (デフォルト)� `m' �分�`h' �時�`d' �日。\n"
 
-#: src/timeout.c:259
+#: src/timeout.c:262
 #, fuzzy
 msgid ""
 "\n"
@@ -11448,17 +11520,17 @@ msgstr ""
 "��プロセス�ブロック����れ���りプロセスを終了����。TERM �終\n"
 "了����プロセスを終了��る���� KILL (9) シグナル�必���。\n"
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr "警告: コアダンプ�無効化�失敗����"
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, c-format
 msgid "error waiting for command"
 msgstr "コマンド待機中�エラー�発生����"
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr ""
@@ -11871,9 +11943,10 @@ msgstr ""
 "  -o, --io-blocks        SIZE を�イト���� I/O ブロック���扱�\n"
 
 #: src/truncate.c:115
+#, fuzzy
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 "  -r, --reference=RFILE   サイズ��� RFILE �サイズを使用�る\n"
 "  -s, --size=SIZE        ファイルサイズを SIZE �設定・調整�る\n"
@@ -11968,12 +12041,12 @@ msgstr ""
 "FILE �指定�れ����- �場��標準入力�ら読�込���。\n"
 "\n"
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr "%s: 入力��素数�奇数�項目���れ����"
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr "%s: 入力�ループ���れ����:"
@@ -12074,12 +12147,12 @@ msgstr "タブ�離れ������"
 msgid "tab stop value is too large"
 msgstr "タブ幅�大�����"
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr "使用法: %s [OPTION]... [INPUT [OUTPUT]]\n"
 
-#: src/uniq.c:138
+#: src/uniq.c:174
 #, fuzzy
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
@@ -12093,39 +12166,45 @@ msgstr ""
 "オプション�指定�れ��場����行�一�����られ��。\n"
 "\n"
 
-#: src/uniq.c:147
+#: src/uniq.c:183
+#, fuzzy
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
 msgstr ""
 "  -c, --count           行���発生回数を出力�る\n"
 "  -d, --repeated        �複��行��出力�る\n"
 
-#: src/uniq.c:151
+#: src/uniq.c:187
+msgid ""
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
+msgstr ""
+
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr ""
+
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
+msgstr ""
+
+#: src/uniq.c:199
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
 "  -i, --ignore-case     ignore differences in case when comparing\n"
 "  -s, --skip-chars=N    avoid comparing the first N characters\n"
 "  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
-msgstr ""
-"  -D, --all-repeated[=delimit-method]  全���複��行を出力�る\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        空白行�区切る\n"
-"  -f, --skip-fields=N   最�� N 個�フィールドを比較���\n"
-"  -i, --ignore-case     比較�大文字��文字���を無視�る\n"
-"  -s, --skip-chars=N    最�� N 文字�比較���\n"
-"  -u, --unique          �複�����行��出力�る\n"
-"  -z, --zero-terminated  行�終�りを (改行����)  0 ��る\n"
-
-#: src/uniq.c:161
+msgstr ""
+
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr "  -w, --check-chars=N   行�中� N 文字以上を比較���\n"
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 msgid ""
 "\n"
 "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n"
@@ -12136,7 +12215,7 @@ msgstr ""
 "空白類文字\n"
 "��るも���。文字���フィールド�スキップ�れ��。\n"
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 #, fuzzy
 msgid ""
 "\n"
@@ -12150,24 +12229,34 @@ msgstr ""
 "も����。���比較�優先順�� `LC_COLLATE' �指定�れ��則�\n"
 "基����。\n"
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, c-format
 msgid "too many repeated lines"
 msgstr "�複��行�多����"
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
 msgstr "スキップ�るフィールド数�指定�無効��"
 
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
 msgstr "スキップ�る�イト数�指定�無効��"
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
 msgstr "比較�る�イト数�指定�無効��"
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr ""
+
+#: src/uniq.c:652
+#, fuzzy, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr "全���複行�繰り返�回数を表示�る����味��り��ん"
+
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr "全���複行�繰り返�回数を表示�る����味��り��ん"
@@ -12189,11 +12278,6 @@ msgstr ""
 "指定�� FILE を削除�る��� unlink 関数を呼�出���。\n"
 "\n"
 
-#: src/unlink.c:86
-#, c-format
-msgid "cannot unlink %s"
-msgstr "%s を削除 (unlink) ����ん"
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -12236,7 +12320,7 @@ msgstr[0] "%lu ユーザ"
 msgid ",  load average: %.2f"
 msgstr ",  平�負�率: %.2f"
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -12246,7 +12330,7 @@ msgstr ""
 "�在時刻�システム起動�ら�時間�システム上��るユーザ数��よ�\n"
 "直近1�5�15分間�実行キュー�存在�るジョブ�平�数を表示���。"
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
@@ -12255,12 +12339,12 @@ msgstr ""
 "平�\n"
 "負�率��割り込���能� sleep 状態��るプロセス数も影響���。\n"
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr "\n"
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
@@ -12493,24 +12577,6 @@ msgstr ""
 "指定�れ�全�� STRING ��� `y' �ら�る行を繰り返�出力���。\n"
 "\n"
 
-#~ msgid "using single-precision arithmetic"
-#~ msgstr "固定制度�演算を使用���"
-
-#~ msgid "using arbitrary-precision arithmetic"
-#~ msgstr "任�精度�演算を使用���"
-
-#, fuzzy
-#~ msgid "  returning value: '%s'\n"
-#~ msgstr "ファイル %s を作������\n"
-
-#, fuzzy
-#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n"
-#~ msgstr "使用法: %s [OPTION]... [USER]...\n"
-
-#, fuzzy
-#~ msgid "no valid suffix found\n"
-#~ msgstr "%s: 接尾辞�長��正���り��ん"
-
 #~ msgid ""
 #~ "\n"
 #~ "Examples:\n"
@@ -12522,18 +12588,139 @@ msgstr ""
 #~ "  %s /usr/bin/sort       出力 \"sort\"。\n"
 #~ "  %s include/stdio.h .h  出力 \"stdio\"。\n"
 
+#~ msgid ""
+#~ "Change the group of each FILE to GROUP.\n"
+#~ "With --reference, change the group of each FILE to that of RFILE.\n"
+#~ "\n"
+#~ "  -c, --changes          like verbose but report only when a change is "
+#~ "made\n"
+#~ "      --dereference      affect the referent of each symbolic link (this "
+#~ "is\n"
+#~ "                         the default), rather than the symbolic link "
+#~ "itself\n"
+#~ msgstr ""
+#~ "� FILE �グループを GROUP �変更���。\n"
+#~ "--reference ��る場���ファイル�グループを RFILE �も��変更��"
+#~ "�。\n"
+#~ "\n"
+#~ "  -c, --changes          冗長出力�よ���る��変更時���出力�る\n"
+#~ "      --dereference      シンボリックリンク自身�����シンボリックリン"
+#~ "ク�\n"
+#~ "                         �照先�影響を���(�れ�デフォルト)。\n"
+
+#~ msgid ""
+#~ "  -f, --silent, --quiet  suppress most error messages\n"
+#~ "      --reference=RFILE  use RFILE's group rather than specifying a\n"
+#~ "                         GROUP value\n"
+#~ "  -R, --recursive        operate on files and directories recursively\n"
+#~ "  -v, --verbose          output a diagnostic for every file processed\n"
+#~ "\n"
+#~ msgstr ""
+#~ "  -f, --silent, --quiet  ��ん��エラーメッセージを抑制�る\n"
+#~ "      --reference=RFILE  GROUP を指定�る代�り� RFILE �グループを\n"
+#~ "                         使用�る\n"
+#~ "  -R, --recursive        ファイル�よ�ディレクトリを�帰的��作�る\n"
+#~ "  -v, --verbose          ファイル�処��れる���診断メッセージを表示�"
+#~ "ã‚‹\n"
+
+#~ msgid ""
+#~ "Change the mode of each FILE to MODE.\n"
+#~ "\n"
+#~ "  -c, --changes           like verbose but report only when a change is "
+#~ "made\n"
+#~ msgstr ""
+#~ "� FILE �モードを MODE �変更�る\n"
+#~ "\n"
+#~ "  -c, --changes           冗長出力�よ���る��変更時���出力�る\n"
+
+#~ msgid ""
+#~ "      --no-preserve-root  do not treat `/' specially (the default)\n"
+#~ "      --preserve-root     fail to operate recursively on `/'\n"
+#~ msgstr ""
+#~ "      --no-preserve-root  `/' を特別�も����扱��� (デフォルト)\n"
+#~ "      --preserve-root     `/' �対�る�帰的��作を失敗��る\n"
+
+#~ msgid ""
+#~ "  -f, --silent, --quiet   suppress most error messages\n"
+#~ "  -v, --verbose           output a diagnostic for every file processed\n"
+#~ "      --reference=RFILE   use RFILE's mode instead of MODE values\n"
+#~ "  -R, --recursive         change files and directories recursively\n"
+#~ msgstr ""
+#~ "  -f, --silent, --quiet   ��ん��エラーメッセージを抑制�る\n"
+#~ "  -v, --verbose           �ファイルを処��る���診断メッセージを出力�"
+#~ "ã‚‹\n"
+#~ "      --reference=RFILE   MODE �値�代�り� RFILE �モードを利用�る\n"
+#~ "  -R, --recursive         ファイル�よ�ディレクトリを�帰的�変更�る\n"
+
+#~ msgid ""
+#~ "Change the owner and/or group of each FILE to OWNER and/or GROUP.\n"
+#~ "With --reference, change the owner and group of each FILE to those of "
+#~ "RFILE.\n"
+#~ "\n"
+#~ "  -c, --changes          like verbose but report only when a change is "
+#~ "made\n"
+#~ "      --dereference      affect the referent of each symbolic link (this "
+#~ "is\n"
+#~ "                         the default), rather than the symbolic link "
+#~ "itself\n"
+#~ msgstr ""
+#~ "� FILE �所有者�よ�グループを OWNER �よ� GROUP �変更���。\n"
+#~ "--reference ��る場��� FILE �所有者�よ�グループを RFILE �も��変"
+#~ "æ›´\n"
+#~ "���。\n"
+#~ "\n"
+#~ "  -c, --changes          冗長出力�よ���る��変更時���出力�る\n"
+#~ "      --dereference      シンボリック自体������シンボリックリンク"
+#~ "�\n"
+#~ "                         �照先�効果を与�る (デフォルト)\n"
+
+#~ msgid ""
+#~ "  -f, --silent, --quiet  suppress most error messages\n"
+#~ "      --reference=RFILE  use RFILE's owner and group rather than\n"
+#~ "                         specifying OWNER:GROUP values\n"
+#~ "  -R, --recursive        operate on files and directories recursively\n"
+#~ "  -v, --verbose          output a diagnostic for every file processed\n"
+#~ "\n"
+#~ msgstr ""
+#~ "  -f, --silent, --quiet  ��ん��エラーメッセージを抑制�る\n"
+#~ "      --reference=RFILE  OWNER:GROUP を指定�る代�り��RFILE \n"
+#~ "                         �所有者�よ�グループを使用�る\n"
+#~ "  -R, --recursive        ファイル�よ�ディレクトリを�帰的��作�る\n"
+#~ "  -v, --verbose          �ファイル�処��れる���診断メッセージを出力"
+#~ "�る\n"
+
+#~ msgid "failed to set additional groups"
+#~ msgstr "追加�グループを設定����ん���"
+
 #~ msgid "reading %s"
 #~ msgstr "%s を読�込ん����"
 
 #~ msgid "writing %s"
 #~ msgstr "%s を書�込ん����"
 
+#~ msgid "failed to get file system create context"
+#~ msgstr "ファイルシステム作�コンテキスト��得�失敗����"
+
 #~ msgid "closing %s"
 #~ msgstr "%s を閉�����"
 
 #~ msgid "accessing %s"
 #~ msgstr "%s �アクセス中"
 
+#~ msgid ""
+#~ "Display the current time in the given FORMAT, or set the system date.\n"
+#~ "\n"
+#~ "  -d, --date=STRING         display time described by STRING, not `now'\n"
+#~ "  -f, --file=DATEFILE       like --date once for each line of DATEFILE\n"
+#~ msgstr ""
+#~ "与�られ� FORMAT ��在時刻を表示���。���システム時刻を設定��"
+#~ "�。\n"
+#~ "\n"
+#~ "  -d, --date=STRING         �在時刻���� STRING �記述�れ�時刻を表示"
+#~ "�る\n"
+#~ "  -f, --file=DATEFILE       DATEFILE ��行�対�� --date ��様�動作�"
+#~ "ã‚‹\n"
+
 #~ msgid "opening %s"
 #~ msgstr "%s を開�����"
 
@@ -12566,19 +12753,46 @@ msgstr ""
 #~ "��る)。\n"
 #~ "                          --max-depth=0 � --summarize �等価��る\n"
 
-#, fuzzy
+#~ msgid "using arbitrary-precision arithmetic"
+#~ msgstr "任�精度�演算を使用���"
+
+#~ msgid "using single-precision arithmetic"
+#~ msgstr "固定制度�演算を使用���"
+
+#~ msgid "%s: cannot lseek back to original position"
+#~ msgstr "%s: 元��置� lseek �戻る�������ん"
+
+#~ msgid "cannot reposition file pointer for %s"
+#~ msgstr "%s �対�るファイル�インタを��置����ん"
+
+#~ msgid "Usage: %s [OPTION]... [USERNAME]\n"
+#~ msgstr "使用法: %s [OPTION]... [USERNAME]\n"
+
 #~ msgid ""
-#~ "  none, off       never make backups (even if --backup is given)\n"
-#~ "  numbered, t     make numbered backups\n"
-#~ "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
-#~ "  simple, never   always make simple backups\n"
-#~ "\n"
+#~ "      --preserve-context  preserve SELinux security context\n"
+#~ "  -Z, --context=CONTEXT  set SELinux security context of files and "
+#~ "directories\n"
+#~ msgstr ""
+#~ "      --preserve-context  SELinux セキュリティコンテキストを���る\n"
+#~ "  -Z, --context=CONTEXT  ファイル�よ�ディレクトリ� SELinux セキュリ"
+#~ "ティ\n"
+#~ "                           コンテキストを CONTEXT �設定�る\n"
+
+#~ msgid ""
+#~ "  -Z, --context=CTX  set the SELinux security context of each NAME to "
+#~ "CTX\n"
+#~ msgstr ""
+#~ "  -Z, --context=CTX  作���� NAME � SELinux セキュリティコンテキスト "
+#~ "CTX を設定�る\n"
+
+#~ msgid ""
+#~ "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
 #~ msgstr ""
-#~ "  none, off       �ックアップを作���� (--backup を付��時�も)\n"
-#~ "  numbered, t     番�付��ックアップを作��る\n"
-#~ "  existing, nil   番�付��ックアップ��れ�番�付��\n"
-#~ "                      �����れ��simple �作��る\n"
-#~ "  simple, never   常�簡易�ックアップを作�\n"
+#~ "  -Z, --context=CTX  作��� NAME � SELinux セキュリティコンテキスト "
+#~ "CTX を設定�る\n"
+
+#~ msgid "failed to redirect stderr to /dev/null"
+#~ msgstr "標準エラー出力を /dev/null �リダイレクト出���ん���"
 
 #~ msgid ""
 #~ "WARNING: --page-increment is deprecated; use --line-increment instead"
@@ -12589,6 +12803,13 @@ msgstr ""
 #~ msgstr "長�オプション�必須�引数�短�オプション�も必須��。\n"
 
 #~ msgid ""
+#~ "  -A, --address-radix=RADIX   decide how file offsets are printed\n"
+#~ "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
+#~ msgstr ""
+#~ "  -A, --address-radix=RADIX   ファイルオフセット�表示形�を指定�る\n"
+#~ "  -j, --skip-bytes=BYTES      ファイル�先頭より BYTES 分スキップ�る\n"
+
+#~ msgid ""
 #~ "\n"
 #~ "RADIX is d for decimal, o for octal, x for hexadecimal or n for none.\n"
 #~ "BYTES is hexadecimal with 0x or 0X prefix, and may have a multiplier "
@@ -12623,9 +12844,76 @@ msgstr ""
 #~ "ション�\n"
 #~ "使用�れ��。\n"
 
+#~ msgid ""
+#~ "\n"
+#~ "With no FILE or if FILE is -, read Standard Input.  `-F /' by default.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "FILE を指定������� FILE � - �場��標準入力�ら読�込�れ��。\n"
+
 #~ msgid "Usage: %s [OPTION]... FILE\n"
 #~ msgstr "使用法: %s [OPTION]... FILE\n"
 
+#~ msgid "cannot remove directory: %s"
+#~ msgstr "ディレクトリを削除����ん: %s"
+
+#~ msgid ""
+#~ "Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
+#~ "  or:  %s LONG-OPTION\n"
+#~ msgstr ""
+#~ "使用法: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
+#~ "���: %s LONG-OPTION\n"
+
+#~ msgid ""
+#~ "Drop any supplemental groups, assume the user-ID and group-ID of the "
+#~ "specified\n"
+#~ "USER (numeric ID or user name), and run COMMAND with any specified "
+#~ "ARGUMENTs.\n"
+#~ "Exit with status 111 if unable to assume the required user and group ID.\n"
+#~ "Otherwise, exit with the exit status of COMMAND.\n"
+#~ "This program is useful only when run by root (user ID zero).\n"
+#~ "\n"
+#~ msgstr ""
+#~ "補助グループ�権�を無���ユーザID �よ�グループ ID を指定�� USER (数"
+#~ "値\n"
+#~ "��ID ���ユーザ�) �も���� COMMAND を 指定��引数 ARGUMENT �実"
+#~ "行\n"
+#~ "���。終了ステータス�ユーザID�よ�グループID�使用����場�� 111 "
+#~ "��。\n"
+#~ "�れ以外�場��終了ステータス� COMMAND �終了ステータス��り��。\n"
+#~ "��プログラム� root (ユーザID � 0) �実行��場����役�立���。\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, "
+#~ "and\n"
+#~ "                    (if specified) supplemental group IDs to GID1, ...\n"
+#~ msgstr ""
+#~ "  -g GID[,GID1...]  主グループ ID を数値 GID �設定�る。追加グループ ID "
+#~ "ã‚’\n"
+#~ "                    GID1, ... �設定�る (指定�れ���場�)\n"
+
+#~ msgid "unknown user-ID: %s"
+#~ msgstr "�明�ユーザ ID ��: %s"
+
+#~ msgid "to use user-ID %s you need to use -g too"
+#~ msgstr "ユーザ ID %s を使用�る場��� -g も使用�る必���り��"
+
+#~ msgid "cannot set group-ID to %lu"
+#~ msgstr "グループ ID を %lu �設定����ん"
+
+#~ msgid "cannot set user-ID to %lu"
+#~ msgstr "ユーザ ID を %lu �設定����ん"
+
+#~ msgid "dup2 failed"
+#~ msgstr "dup2 �失敗����"
+
+#~ msgid "couldn't execute %s"
+#~ msgstr "%s を実行�る���出���ん���"
+
+#~ msgid "couldn't execute %s -d"
+#~ msgstr "%s -d を実行�る���出���ん���"
+
 #~ msgid "Password:"
 #~ msgstr "パスワード:"
 
@@ -12638,9 +12926,6 @@ msgstr ""
 #~ msgid "cannot set group id"
 #~ msgstr "グループ ID を設定����ん"
 
-#~ msgid "cannot set user id"
-#~ msgstr "ユーザ ID を設定����ん"
-
 #~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n"
 #~ msgstr "使用法: %s [OPTION]... [-] [USER [ARG]...]\n"
 
@@ -12685,131 +12970,46 @@ msgstr ""
 #~ msgid "warning: cannot change directory to %s"
 #~ msgstr "注�: ディレクトリ %s �移動����ん"
 
-#, fuzzy
-#~ msgid ""
-#~ "Change the group of each FILE to GROUP.\n"
-#~ "With --reference, change the group of each FILE to that of RFILE.\n"
-#~ "\n"
-#~ "  -c, --changes          like verbose but report only when a change is "
-#~ "made\n"
-#~ "  -f, --silent, --quiet  suppress most error messages\n"
-#~ "  -v, --verbose          output a diagnostic for every file processed\n"
-#~ msgstr ""
-#~ "� FILE �グループを GROUP �変更���。\n"
-#~ "--reference ��る場���ファイル�グループを RFILE �も��変更��"
-#~ "�。\n"
-#~ "\n"
-#~ "  -c, --changes          冗長出力�よ���る��変更時���出力�る\n"
-#~ "      --dereference      シンボリックリンク自身�����シンボリックリン"
-#~ "ク�\n"
-#~ "                         �照先�影響を���(�れ�デフォルト)。\n"
-
-#~ msgid ""
-#~ "      --no-preserve-root  do not treat `/' specially (the default)\n"
-#~ "      --preserve-root     fail to operate recursively on `/'\n"
-#~ msgstr ""
-#~ "      --no-preserve-root  `/' を特別�も����扱��� (デフォルト)\n"
-#~ "      --preserve-root     `/' �対�る�帰的��作を失敗��る\n"
-
-#~ msgid ""
-#~ "  -f, --silent, --quiet  suppress most error messages\n"
-#~ "      --reference=RFILE  use RFILE's group rather than specifying a\n"
-#~ "                         GROUP value\n"
-#~ "  -R, --recursive        operate on files and directories recursively\n"
-#~ "  -v, --verbose          output a diagnostic for every file processed\n"
-#~ "\n"
-#~ msgstr ""
-#~ "  -f, --silent, --quiet  ��ん��エラーメッセージを抑制�る\n"
-#~ "      --reference=RFILE  GROUP を指定�る代�り� RFILE �グループを\n"
-#~ "                         使用�る\n"
-#~ "  -R, --recursive        ファイル�よ�ディレクトリを�帰的��作�る\n"
-#~ "  -v, --verbose          ファイル�処��れる���診断メッセージを表示�"
-#~ "ã‚‹\n"
-
 #~ msgid ""
-#~ "Change the mode of each FILE to MODE.\n"
 #~ "\n"
-#~ "  -c, --changes           like verbose but report only when a change is "
-#~ "made\n"
+#~ "SIZE may be (or may be an integer optionally followed by) one of "
+#~ "following:\n"
+#~ "KB 1000, K 1024, MB 1000*1000, M 1024*1024, and so on for G, T, P, E, Z, "
+#~ "Y.\n"
 #~ msgstr ""
-#~ "� FILE �モードを MODE �変更�る\n"
 #~ "\n"
-#~ "  -c, --changes           冗長出力�よ���る��変更時���出力�る\n"
-
-#~ msgid ""
-#~ "  -f, --silent, --quiet   suppress most error messages\n"
-#~ "  -v, --verbose           output a diagnostic for every file processed\n"
-#~ "      --reference=RFILE   use RFILE's mode instead of MODE values\n"
-#~ "  -R, --recursive         change files and directories recursively\n"
-#~ msgstr ""
-#~ "  -f, --silent, --quiet   ��ん��エラーメッセージを抑制�る\n"
-#~ "  -v, --verbose           �ファイルを処��る���診断メッセージを出力�"
-#~ "ã‚‹\n"
-#~ "      --reference=RFILE   MODE �値�代�り� RFILE �モードを利用�る\n"
-#~ "  -R, --recursive         ファイル�よ�ディレクトリを�帰的�変更�る\n"
+#~ "SIZE �次����一��� (整数�後�付加�れる�も�れ��ん):\n"
+#~ "KB 1000, K 1024, MB 1000*1000, M 1024*1024, ��他 G, T, P, E, Z, Y �"
+#~ "�。\n"
 
 #~ msgid ""
-#~ "Change the owner and/or group of each FILE to OWNER and/or GROUP.\n"
-#~ "With --reference, change the owner and group of each FILE to those of "
-#~ "RFILE.\n"
 #~ "\n"
-#~ "  -c, --changes          like verbose but report only when a change is "
-#~ "made\n"
-#~ "      --dereference      affect the referent of each symbolic link (this "
-#~ "is\n"
-#~ "                         the default), rather than the symbolic link "
-#~ "itself\n"
+#~ "Report %s bugs to %s\n"
 #~ msgstr ""
-#~ "� FILE �所有者�よ�グループを OWNER �よ� GROUP �変更���。\n"
-#~ "--reference ��る場��� FILE �所有者�よ�グループを RFILE �も��変"
-#~ "æ›´\n"
-#~ "���。\n"
-#~ "\n"
-#~ "  -c, --changes          冗長出力�よ���る��変更時���出力�る\n"
-#~ "      --dereference      シンボリック自体������シンボリックリンク"
-#~ "�\n"
-#~ "                         �照先�効果を与�る (デフォルト)\n"
-
-#~ msgid ""
-#~ "  -f, --silent, --quiet  suppress most error messages\n"
-#~ "      --reference=RFILE  use RFILE's owner and group rather than\n"
-#~ "                         specifying OWNER:GROUP values\n"
-#~ "  -R, --recursive        operate on files and directories recursively\n"
-#~ "  -v, --verbose          output a diagnostic for every file processed\n"
 #~ "\n"
-#~ msgstr ""
-#~ "  -f, --silent, --quiet  ��ん��エラーメッセージを抑制�る\n"
-#~ "      --reference=RFILE  OWNER:GROUP を指定�る代�り��RFILE \n"
-#~ "                         �所有者�よ�グループを使用�る\n"
-#~ "  -R, --recursive        ファイル�よ�ディレクトリを�帰的��作�る\n"
-#~ "  -v, --verbose          �ファイル�処��れる���診断メッセージを出力"
-#~ "�る\n"
+#~ "%s ��グを発見��場�� %s �報告������。\n"
 
-#~ msgid ""
-#~ "Display the current time in the given FORMAT, or set the system date.\n"
-#~ "\n"
-#~ "  -d, --date=STRING         display time described by STRING, not `now'\n"
-#~ "  -f, --file=DATEFILE       like --date once for each line of DATEFILE\n"
-#~ msgstr ""
-#~ "与�られ� FORMAT ��在時刻を表示���。���システム時刻を設定��"
-#~ "�。\n"
-#~ "\n"
-#~ "  -d, --date=STRING         �在時刻���� STRING �記述�れ�時刻を表示"
-#~ "�る\n"
-#~ "  -f, --file=DATEFILE       DATEFILE ��行�対�� --date ��様�動作�"
-#~ "ã‚‹\n"
+#~ msgid "warning: --retry is useful mainly when following by name"
+#~ msgstr "warning: --retry �主����追跡を���る����有効��"
 
 #~ msgid ""
-#~ "\n"
-#~ "SIZE may be (or may be an integer optionally followed by) one of "
-#~ "following:\n"
-#~ "KB 1000, K 1024, MB 1000*1000, M 1024*1024, and so on for G, T, P, E, Z, "
-#~ "Y.\n"
+#~ "  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
+#~ "                        delimit-method={none(default),prepend,separate}\n"
+#~ "                        Delimiting is done with blank lines\n"
+#~ "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+#~ "  -i, --ignore-case     ignore differences in case when comparing\n"
+#~ "  -s, --skip-chars=N    avoid comparing the first N characters\n"
+#~ "  -u, --unique          only print unique lines\n"
+#~ "  -z, --zero-terminated  end lines with 0 byte, not newline\n"
 #~ msgstr ""
-#~ "\n"
-#~ "SIZE �次����一��� (整数�後�付加�れる�も�れ��ん):\n"
-#~ "KB 1000, K 1024, MB 1000*1000, M 1024*1024, ��他 G, T, P, E, Z, Y �"
-#~ "�。\n"
+#~ "  -D, --all-repeated[=delimit-method]  全���複��行を出力�る\n"
+#~ "                        delimit-method={none(default),prepend,separate}\n"
+#~ "                        空白行�区切る\n"
+#~ "  -f, --skip-fields=N   最�� N 個�フィールドを比較���\n"
+#~ "  -i, --ignore-case     比較�大文字��文字���を無視�る\n"
+#~ "  -s, --skip-chars=N    最�� N 文字�比較���\n"
+#~ "  -u, --unique          �複�����行��出力�る\n"
+#~ "  -z, --zero-terminated  行�終�りを (改行����)  0 ��る\n"
 
 #~ msgid "cannot create link %s"
 #~ msgstr "リンク %s を作�����ん"
diff --git a/po/kk.gmo b/po/kk.gmo
index 6a5b3113..0c3bc3fc 100644
--- a/po/kk.gmo
+++ b/po/kk.gmo
diff --git a/po/kk.po b/po/kk.po
index 2bf5fd39..adacd388 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU coreutils 8.7\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
 "PO-Revision-Date: 2010-11-18 14:19+0600\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
 "Language-Team: Kazakh <kk_KZ@googlegroups.com>\n"
@@ -38,80 +38,123 @@ msgstr ""
 msgid "error closing file"
 msgstr "Файлды жабу қате�і: %s"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "жазу қате�і"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, c-format
 msgid "preserving permissions for %s"
 msgstr ""
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "Белгі�із жүйелік қате"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "қалыпты бо� файл"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "қалыпты файл"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 #, fuzzy
 msgid "directory"
 msgstr "бума"
 
-#: lib/file-type.c:44
+#: lib/file-type.c:46
+#, fuzzy
+msgid "symbolic link"
+msgstr "�имволдық �ілтеме"
+
+#: lib/file-type.c:52
+msgid "message queue"
+msgstr ""
+
+#: lib/file-type.c:55
+msgid "semaphore"
+msgstr ""
+
+#: lib/file-type.c:58
+msgid "shared memory object"
+msgstr ""
+
+#: lib/file-type.c:61
+msgid "typed memory object"
+msgstr ""
+
+#: lib/file-type.c:66
 msgid "block special file"
 msgstr ""
 
-#: lib/file-type.c:47
+#: lib/file-type.c:69
 msgid "character special file"
 msgstr ""
 
-#: lib/file-type.c:50
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr ""
+
+#: lib/file-type.c:75
 #, fuzzy
 msgid "fifo"
 msgstr "FIFO"
 
-#: lib/file-type.c:53
-#, fuzzy
-msgid "symbolic link"
-msgstr "�имволдық �ілтеме"
+#: lib/file-type.c:78
+msgid "door"
+msgstr ""
 
-#: lib/file-type.c:56
-#, fuzzy
-msgid "socket"
-msgstr "�окет"
+#: lib/file-type.c:81
+msgid "multiplexed block special file"
+msgstr ""
 
-#: lib/file-type.c:59
-msgid "message queue"
+#: lib/file-type.c:84
+msgid "multiplexed character special file"
 msgstr ""
 
-#: lib/file-type.c:62
-msgid "semaphore"
+#: lib/file-type.c:87
+msgid "multiplexed file"
 msgstr ""
 
-#: lib/file-type.c:65
-msgid "shared memory object"
+#: lib/file-type.c:90
+msgid "named file"
 msgstr ""
 
-#: lib/file-type.c:68
-msgid "typed memory object"
+#: lib/file-type.c:93
+msgid "network special file"
+msgstr ""
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
 msgstr ""
 
-#: lib/file-type.c:70
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr ""
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr ""
+
+#: lib/file-type.c:105
+#, fuzzy
+msgid "socket"
+msgstr "�окет"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr ""
+
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr ""
 
@@ -248,18 +291,18 @@ msgstr ""
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr ""
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr ""
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, fuzzy, c-format
 msgid "cannot create directory %s"
 msgstr "%s: %s бума�ын жа�ау мүкін еме�\n"
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr ""
@@ -378,7 +421,7 @@ msgstr ""
 msgid "Unmatched ) or \\)"
 msgstr ""
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 msgid "No previous regular expression"
 msgstr ""
 
@@ -403,7 +446,7 @@ msgstr ""
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr ""
 
@@ -413,11 +456,11 @@ msgstr ""
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr ""
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, c-format
 msgid "setting permissions for %s"
 msgstr ""
@@ -564,18 +607,6 @@ msgstr ""
 msgid "Resource lost"
 msgstr ""
 
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, fuzzy, c-format
-msgid "cannot create pipe"
-msgstr "%s: %s бума�ын жа�ау мүкін еме�\n"
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, fuzzy, c-format
-msgid "%s subprocess failed"
-msgstr "жабу �әт�із"
-
 #: lib/strsignal.c:114
 #, c-format
 msgid "Real-time signal %d"
@@ -759,7 +790,7 @@ msgstr ""
 msgid "Report %s bugs to: %s\n"
 msgstr ""
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr ""
@@ -769,30 +800,10 @@ msgstr ""
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr ""
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr ""
 
-#: lib/w32spawn.h:43
-#, c-format
-msgid "_open_osfhandle failed"
-msgstr ""
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr ""
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr ""
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr ""
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr ""
@@ -814,7 +825,7 @@ msgstr ""
 msgid "failed to reopen %s with mode %s"
 msgstr ""
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr ""
@@ -871,7 +882,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -886,48 +897,47 @@ msgid ""
 "from any other non-alphabet bytes in the encoded stream.\n"
 msgstr ""
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr ""
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, fuzzy, c-format
 msgid "invalid input"
 msgstr "Енгізу қате"
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, c-format
 msgid "invalid wrap size: %s"
 msgstr ""
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, c-format
 msgid "extra operand %s"
 msgstr ""
 
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, c-format
 msgid "closing standard input"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -952,8 +962,8 @@ msgstr ""
 #: src/basename.c:60
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/basename.c:67
@@ -967,32 +977,31 @@ msgid ""
 "  %s -a any/str1 any/str2   -> \"str1\" followed by \"str2\"\n"
 msgstr ""
 
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, c-format
 msgid "missing operand"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 msgid "Richard M. Stallman"
 msgstr ""
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1032,7 +1041,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr ""
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr ""
@@ -1049,14 +1058,14 @@ msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 msgid "Jim Meyering"
 msgstr ""
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, c-format
 msgid "failed to create security context: %s"
 msgstr ""
@@ -1066,8 +1075,8 @@ msgstr ""
 msgid "failed to set %s security context component to %s"
 msgstr ""
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, c-format
 msgid "failed to get security context of %s"
 msgstr ""
@@ -1077,18 +1086,18 @@ msgstr ""
 msgid "can't apply partial context to unlabeled file %s"
 msgstr ""
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, c-format
 msgid "failed to change context of %s to %s"
 msgstr ""
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
 msgstr ""
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, c-format
 msgid "cannot read directory %s"
 msgstr ""
@@ -1098,13 +1107,14 @@ msgstr ""
 msgid "changing security context of %s\n"
 msgstr ""
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, c-format
 msgid "fts_read failed"
 msgstr ""
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, c-format
 msgid "fts_close failed"
 msgstr ""
@@ -1119,7 +1129,7 @@ msgstr ""
 
 #: src/chcon.c:357
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
@@ -1140,7 +1150,7 @@ msgid ""
 "  -l, --range=RANGE      set range RANGE in the target security context\n"
 msgstr ""
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
 "      --preserve-root    fail to operate recursively on '/'\n"
@@ -1176,36 +1186,37 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr ""
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr ""
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, c-format
 msgid "missing operand after %s"
 msgstr ""
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, c-format
 msgid "invalid context: %s"
 msgstr ""
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr ""
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, c-format
 msgid "failed to get attributes of %s"
 msgstr ""
@@ -1229,7 +1240,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
@@ -1257,47 +1268,47 @@ msgid ""
 "  %s -hR staff /u  Change the group of /u and subfiles to \"staff\".\n"
 msgstr ""
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
 msgstr ""
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr ""
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr ""
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr ""
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr ""
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr ""
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, c-format
 msgid "changing permissions of %s"
 msgstr ""
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr ""
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1305,33 +1316,33 @@ msgid ""
 "  or:  %s [OPTION]... --reference=RFILE FILE...\n"
 msgstr ""
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 msgid ""
 "Change the mode of each FILE to MODE.\n"
 "With --reference, change the mode of each FILE to that of RFILE.\n"
 "\n"
 msgstr ""
 
-#: src/chmod.c:391
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr ""
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 msgid ""
 "\n"
 "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n"
 msgstr ""
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr ""
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, c-format
 msgid "invalid mode: %s"
 msgstr ""
@@ -1457,72 +1468,81 @@ msgid ""
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr ""
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr ""
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, c-format
 msgid "invalid group list %s"
 msgstr ""
 
-#: src/chroot.c:117
-#, c-format
-msgid "failed to set additional groups"
-msgstr ""
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
 "  or:  %s OPTION\n"
 msgstr ""
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
 msgstr ""
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
 msgstr ""
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 msgid ""
 "\n"
 "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n"
 msgstr ""
 
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, c-format
 msgid "cannot change root directory to %s"
 msgstr ""
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, c-format
 msgid "cannot chdir to root directory"
 msgstr ""
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr ""
+
+#: src/chroot.c:383
+#, fuzzy, c-format
+msgid "failed to get supplemental groups"
+msgstr "\"%s\" ашу �әт�із а�қталды "
+
+#: src/chroot.c:395
+#, fuzzy, c-format
+msgid "failed to %s supplemental groups"
+msgstr "\"%s\" ашу �әт�із а�қталды "
+
+#: src/chroot.c:402
 #, c-format
 msgid "failed to set group-ID"
 msgstr ""
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, c-format
 msgid "failed to set user-ID"
 msgstr ""
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, c-format
 msgid "failed to run command %s"
 msgstr ""
@@ -1550,7 +1570,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr ""
@@ -1617,294 +1637,327 @@ msgstr ""
 msgid "empty %s not allowed"
 msgstr ""
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, fuzzy, c-format
 msgid "error reading %s"
 msgstr "%s: %s: оқу қате�і: %s\n"
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, c-format
 msgid "cannot lseek %s"
 msgstr ""
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, fuzzy, c-format
 msgid "error writing %s"
 msgstr "\"%s\" жазу қате�і: %s"
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, fuzzy, c-format
 msgid "%s: failed to get extents info"
 msgstr "%s: %s өшіру �әт�із а�қталды\n"
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, fuzzy, c-format
 msgid "%s: write failed"
 msgstr "жабу �әт�із"
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, fuzzy, c-format
 msgid "failed to extend %s"
 msgstr "\"%s\" ашу �әт�із а�қталды "
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, c-format
 msgid "clearing permissions for %s"
 msgstr ""
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr ""
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
 msgstr ""
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, c-format
 msgid "failed to preserve authorship for %s"
 msgstr ""
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
 #, c-format
-msgid "cannot open %s for reading"
+msgid "failed to set default file creation context to %s"
 msgstr ""
 
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:820
 #, c-format
-msgid "cannot fstat %s"
+msgid "failed to set default file creation context for %s"
 msgstr ""
 
-#: src/copy.c:820
+#: src/copy.c:846
 #, c-format
-msgid "skipping file %s, as it was replaced while being copied"
+msgid "failed to set the security context of %s"
 msgstr ""
 
-#: src/copy.c:850
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
-msgid "failed to get file system create context"
+msgid "cannot open %s for reading"
 msgstr ""
 
-#: src/copy.c:864
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, c-format
-msgid "failed to set the security context of %s to %s"
+msgid "cannot fstat %s"
 msgstr ""
 
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:935
+#, c-format
+msgid "skipping file %s, as it was replaced while being copied"
+msgstr ""
+
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
 msgid "cannot remove %s"
 msgstr ""
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
 msgstr ""
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr ""
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, c-format
 msgid "cannot create regular file %s"
 msgstr ""
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, fuzzy, c-format
 msgid "failed to clone %s from %s"
 msgstr "\"%s\" ашу �әт�із а�қталды "
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr ""
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
 #, fuzzy, c-format
 msgid "failed to close %s"
 msgstr "\"%s\" ашу �әт�із а�қталды "
 
-#: src/copy.c:1471
+#: src/copy.c:1580
 #, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
 msgstr ""
 
-#: src/copy.c:1478
+#: src/copy.c:1581
+#, c-format
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr ""
+
+#: src/copy.c:1588
 #, fuzzy, c-format
 msgid "%s: overwrite %s? "
 msgstr "Ү�тінен жазу ма?"
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr ""
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr ""
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, c-format
 msgid "cannot create hard link %s to %s"
 msgstr ""
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, c-format
 msgid "cannot stat %s"
 msgstr ""
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, c-format
 msgid "omitting directory %s"
 msgstr ""
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr ""
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
 msgstr ""
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr ""
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr ""
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr ""
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr ""
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr ""
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr ""
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
 msgstr ""
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr ""
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr ""
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr ""
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr ""
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, c-format
 msgid "cannot move %s to %s"
 msgstr ""
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr ""
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, c-format
-msgid "failed to set default file creation context to %s"
-msgstr ""
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr ""
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr ""
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr ""
 
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, c-format
 msgid "cannot create fifo %s"
 msgstr ""
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, c-format
 msgid "cannot create special file %s"
 msgstr ""
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, c-format
 msgid "cannot read symbolic link %s"
 msgstr ""
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, c-format
 msgid "cannot create symbolic link %s"
 msgstr ""
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
 msgstr ""
 
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, c-format
 msgid "cannot un-backup %s"
 msgstr ""
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr ""
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr ""
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr ""
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, fuzzy, c-format
+msgid "unknown program %s"
+msgstr "Белгі�із қате"
+
+#: src/cp.c:157 src/mv.c:288
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -1912,11 +1965,11 @@ msgid ""
 "  or:  %s [OPTION]... -t DIRECTORY SOURCE...\n"
 msgstr ""
 
-#: src/cp.c:162
+#: src/cp.c:163
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 
-#: src/cp.c:168
+#: src/cp.c:169
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
 "      --attributes-only        don't copy the file data, just the "
@@ -1930,7 +1983,7 @@ msgid ""
 "  -d                           same as --no-dereference --preserve=links\n"
 msgstr ""
 
-#: src/cp.c:177
+#: src/cp.c:178
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
 "                                 opened, remove it and try again (this "
@@ -1943,20 +1996,20 @@ msgid ""
 "  -H                           follow command-line symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:186
+#: src/cp.c:187
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
 "  -L, --dereference            always follow symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:190
+#: src/cp.c:191
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
 "                                 a previous -i option)\n"
 "  -P, --no-dereference         never follow symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:195
+#: src/cp.c:196
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
 "      --preserve[=ATTR_LIST]   preserve the specified attributes (default:\n"
@@ -1966,13 +2019,13 @@ msgid ""
 "                                 all\n"
 msgstr ""
 
-#: src/cp.c:203
+#: src/cp.c:204
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                use full source file name under DIRECTORY\n"
 msgstr ""
 
-#: src/cp.c:207
+#: src/cp.c:208
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
 "      --reflink[=WHEN]         control clone/CoW copies. See below\n"
@@ -1981,7 +2034,7 @@ msgid ""
 "force)\n"
 msgstr ""
 
-#: src/cp.c:213
+#: src/cp.c:214
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
 "      --strip-trailing-slashes  remove any trailing slashes from each "
@@ -1989,7 +2042,7 @@ msgid ""
 "                                 argument\n"
 msgstr ""
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -1998,7 +2051,7 @@ msgid ""
 "  -T, --no-target-directory    treat DEST as a normal file\n"
 msgstr ""
 
-#: src/cp.c:224
+#: src/cp.c:225
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
 "                                 than the destination file or when the\n"
@@ -2007,7 +2060,15 @@ msgid ""
 "  -x, --one-file-system        stay on this file system\n"
 msgstr ""
 
-#: src/cp.c:233
+#: src/cp.c:232
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/cp.c:240
 msgid ""
 "\n"
 "By default, sparse SOURCE files are detected by a crude heuristic and the\n"
@@ -2023,7 +2084,7 @@ msgid ""
 "fails, or if --reflink=auto is specified, fall back to a standard copy.\n"
 msgstr ""
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 msgid ""
 "\n"
 "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n"
@@ -2033,7 +2094,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2041,7 +2102,7 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2049,226 +2110,236 @@ msgid ""
 "regular file.\n"
 msgstr ""
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, c-format
 msgid "failed to preserve times for %s"
 msgstr ""
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, c-format
 msgid "failed to preserve permissions for %s"
 msgstr ""
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, c-format
 msgid "cannot make directory %s"
 msgstr ""
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr ""
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
 #, fuzzy, c-format
 msgid "failed to access %s"
 msgstr "\"%s\" ашу �әт�із а�қталды "
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, c-format
 msgid "missing file operand"
 msgstr ""
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, c-format
 msgid "missing destination file operand after %s"
 msgstr ""
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr ""
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, fuzzy, c-format
 msgid "target %s is not a directory"
 msgstr "%s мақ�аты бума еме�\n"
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr ""
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, c-format
 msgid "multiple target directories specified"
 msgstr ""
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr ""
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr ""
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr ""
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr ""
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr ""
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, c-format
+msgid "cannot set target context and preserve it"
+msgstr ""
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr ""
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr ""
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr ""
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr ""
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, c-format
 msgid "%s: %s: line number out of range"
 msgstr ""
 
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, c-format
 msgid " on repetition %s\n"
 msgstr ""
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, c-format
 msgid "%s: %s: match not found"
 msgstr ""
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr ""
 
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, c-format
 msgid "write error for %s"
 msgstr ""
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, c-format
 msgid "%s: integer expected after delimiter"
 msgstr ""
 
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr ""
 
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr ""
 
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr ""
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr ""
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr ""
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr ""
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr ""
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr ""
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr ""
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr ""
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr ""
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr ""
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr ""
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr ""
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr ""
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr ""
 
-#: src/csplit.c:1455
+#: src/csplit.c:1483
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
 "and output byte counts of each piece to standard output.\n"
 msgstr ""
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2276,20 +2347,24 @@ msgid ""
 "  -k, --keep-files           do not remove output files on errors\n"
 msgstr ""
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr ""
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
 "  -z, --elide-empty-files    remove empty output files\n"
 msgstr ""
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
 msgstr ""
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 msgid ""
 "\n"
 "  INTEGER            copy up to but not including specified line number\n"
@@ -2306,27 +2381,23 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr ""
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr ""
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr ""
 
-#: src/cut.c:193
+#: src/cut.c:176
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr ""
 
-#: src/cut.c:199
+#: src/cut.c:182
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
 "  -c, --characters=LIST   select only these characters\n"
 "  -d, --delimiter=DELIM   use DELIM instead of TAB for field delimiter\n"
 msgstr ""
 
-#: src/cut.c:204
+#: src/cut.c:187
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
 "                            that contains no delimiter character, unless\n"
@@ -2334,20 +2405,20 @@ msgid ""
 "  -n                      (ignored)\n"
 msgstr ""
 
-#: src/cut.c:210
+#: src/cut.c:193
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
 "                            or fields\n"
 msgstr ""
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
 "                            the default is to use the input delimiter\n"
 msgstr ""
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2355,7 +2426,7 @@ msgid ""
 "in the same order that it is read, and is written exactly once.\n"
 msgstr ""
 
-#: src/cut.c:227
+#: src/cut.c:210
 msgid ""
 "Each range is one of:\n"
 "\n"
@@ -2367,56 +2438,60 @@ msgid ""
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
 
-#: src/cut.c:367 src/cut.c:493
+#: src/cut.c:300 src/cut.c:394
 msgid "invalid byte, character or field list"
 msgstr ""
 
-#: src/cut.c:387
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr ""
+
+#: src/cut.c:320
 msgid "invalid range with no endpoint: -"
 msgstr ""
 
-#: src/cut.c:403
+#: src/cut.c:334
 msgid "invalid decreasing range"
 msgstr ""
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, c-format
 msgid "byte offset %s is too large"
 msgstr ""
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, c-format
 msgid "field number %s is too large"
 msgstr ""
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr ""
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr ""
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr ""
 
-#: src/cut.c:850
+#: src/cut.c:790
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr ""
 
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
 msgstr ""
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr ""
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr ""
 
@@ -2456,7 +2531,7 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 
 #: src/date.c:158
@@ -2588,10 +2663,10 @@ msgid ""
 "  $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n"
 msgstr ""
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr ""
@@ -2629,7 +2704,7 @@ msgstr ""
 msgid "cannot set date"
 msgstr ""
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, c-format
 msgid "time %s is out of range"
 msgstr ""
@@ -2640,14 +2715,14 @@ msgstr ""
 msgid "Paul Rubin"
 msgstr ""
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
 "  or:  %s OPTION\n"
 msgstr ""
 
-#: src/dd.c:526
+#: src/dd.c:532
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
 "\n"
@@ -2658,7 +2733,7 @@ msgid ""
 "  ibs=BYTES       read up to BYTES bytes at a time (default: 512)\n"
 msgstr ""
 
-#: src/dd.c:535
+#: src/dd.c:541
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
 "  iflag=FLAGS     read as per the comma separated symbol list\n"
@@ -2671,7 +2746,7 @@ msgid ""
 "                  'noxfer' suppresses transfer stats, 'none' suppresses all\n"
 msgstr ""
 
-#: src/dd.c:546
+#: src/dd.c:552
 msgid ""
 "\n"
 "N and BYTES may be followed by the following multiplicative suffixes:\n"
@@ -2682,7 +2757,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dd.c:555
+#: src/dd.c:561
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
 "  ebcdic    from ASCII to EBCDIC\n"
@@ -2697,7 +2772,7 @@ msgid ""
 "            with block or unblock, pad with spaces rather than NULs\n"
 msgstr ""
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -2707,7 +2782,7 @@ msgid ""
 "  fsync     likewise, but also write metadata\n"
 msgstr ""
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -2716,75 +2791,75 @@ msgid ""
 "suggested)\n"
 msgstr ""
 
-#: src/dd.c:583
+#: src/dd.c:589
 msgid "  cio       use concurrent I/O for data\n"
 msgstr ""
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr ""
 
-#: src/dd.c:587
+#: src/dd.c:593
 msgid "  directory  fail unless a directory\n"
 msgstr ""
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr ""
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr ""
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr ""
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr ""
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr ""
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr ""
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr ""
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr ""
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr ""
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr ""
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr ""
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, c-format
 msgid ""
 "\n"
@@ -2801,28 +2876,38 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
 "%<PRIuMAX>+%<PRIuMAX> records out\n"
 msgstr ""
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr ""
 
@@ -2836,269 +2921,269 @@ msgstr ""
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
 msgstr ""
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, c-format
 msgid "closing input file %s"
 msgstr ""
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr ""
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr ""
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, c-format
 msgid "writing to %s"
 msgstr ""
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, c-format
 msgid "unrecognized operand %s"
 msgstr ""
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 msgid "invalid conversion"
 msgstr ""
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 msgid "invalid input flag"
 msgstr ""
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 msgid "invalid output flag"
 msgstr ""
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 msgid "invalid status flag"
 msgstr ""
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, c-format
 msgid "invalid number %s"
 msgstr ""
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr ""
 
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, c-format
 msgid "cannot combine block and unblock"
 msgstr ""
 
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, c-format
 msgid "cannot combine lcase and ucase"
 msgstr ""
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, c-format
 msgid "cannot combine excl and nocreat"
 msgstr ""
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, c-format
 msgid "cannot combine direct and nocache"
 msgstr ""
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
 "  of mt_type=0x%0lx -- see <sys/mtio.h> for the list of types"
 msgstr ""
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, c-format
 msgid "%s: cannot skip"
 msgstr ""
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, c-format
 msgid "%s: cannot seek"
 msgstr ""
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr ""
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr ""
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr ""
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, c-format
 msgid "setting flags for %s"
 msgstr ""
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr ""
 
-#: src/dd.c:2133
+#: src/dd.c:2172
 #, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
 msgstr ""
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr ""
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
 msgstr ""
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, fuzzy, c-format
 msgid "failed to open %s"
 msgstr "\"%s\" ашу �әт�із а�қталды "
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
 "blocks"
 msgstr ""
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr ""
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, fuzzy, c-format
 msgid "failed to discard cache for: %s"
 msgstr "%s: %s өшіру �әт�із а�қталды\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr ""
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr "Файлдық жүйе"
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr "Түрі"
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr "блок"
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr "Қолд"
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr "Қолжетерлік"
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr "Пайд%"
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr ""
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr ""
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr ""
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr ""
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr "Тіркелген жері"
 
-#: src/df.c:383
+#: src/df.c:207
+msgid "File"
+msgstr ""
+
+#: src/df.c:387
 #, c-format
-msgid "option --output: field '%s' unknown"
+msgid "option --output: field %s unknown"
 msgstr ""
 
-#: src/df.c:390
+#: src/df.c:394
 #, c-format
-msgid "option --output: field '%s' used more than once"
+msgid "option --output: field %s used more than once"
 msgstr ""
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr "Өлшемі"
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr "Қолж"
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr "Сыйымдылығы"
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
 msgstr ""
 
-#: src/df.c:1210
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr ""
+
+#: src/df.c:1384
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
 "or all file systems by default.\n"
 msgstr ""
 
-#: src/df.c:1217
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
 
-#: src/df.c:1227
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -3107,7 +3192,7 @@ msgid ""
 "(default)\n"
 msgstr ""
 
-#: src/df.c:1234
+#: src/df.c:1409
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
 "                               or print all fields if FIELD_LIST is "
@@ -3120,42 +3205,33 @@ msgid ""
 "  -v                    (ignored)\n"
 msgstr ""
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
 
-#: src/df.c:1285
+#: src/df.c:1460
 #, c-format
 msgid "options %s and %s are mutually exclusive"
 msgstr ""
 
-#: src/df.c:1335
-#, fuzzy
-msgid "warning: "
-msgstr "Е�керту:"
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr ""
-
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr ""
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr "Е�керту:"
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 msgid "cannot read table of mounted file systems"
 msgstr ""
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr ""
@@ -3165,7 +3241,7 @@ msgstr ""
 msgid "H. Peter Anvin"
 msgstr ""
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr ""
@@ -3232,7 +3308,7 @@ msgid ""
 msgstr ""
 
 #: src/dirname.c:59
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/dirname.c:64
@@ -3245,21 +3321,20 @@ msgid ""
 "  %s stdio.h            -> \".\"\n"
 msgstr ""
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
 "  or:  %s [OPTION]... --files0-from=F\n"
 msgstr ""
 
-#: src/du.c:274
+#: src/du.c:285
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr ""
 
-#: src/du.c:280
+#: src/du.c:291
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3268,11 +3343,11 @@ msgid ""
 "                          fragmentation, indirect blocks, and the like\n"
 msgstr ""
 
-#: src/du.c:289
+#: src/du.c:300
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3284,17 +3359,18 @@ msgid ""
 "                          --summarize\n"
 msgstr ""
 
-#: src/du.c:302
+#: src/du.c:313
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
 
-#: src/du.c:310
+#: src/du.c:322
 msgid ""
 "  -k                    like --block-size=1K\n"
 "  -L, --dereference     dereference all symbolic links\n"
@@ -3302,16 +3378,17 @@ msgid ""
 "  -m                    like --block-size=1M\n"
 msgstr ""
 
-#: src/du.c:316
+#: src/du.c:328
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
 
-#: src/du.c:322
+#: src/du.c:334
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
 "                          or entries greater than SIZE if negative\n"
@@ -3320,77 +3397,77 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
 msgstr ""
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
 "  -x, --one-file-system    skip directories on different file systems\n"
 msgstr ""
 
-#: src/du.c:386
+#: src/du.c:398
 msgid "Infinity"
 msgstr ""
 
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr ""
-
-#: src/du.c:624
+#: src/du.c:636
 #, c-format
 msgid "fts_read failed: %s"
 msgstr ""
 
-#: src/du.c:780
+#: src/du.c:787
 #, c-format
 msgid "invalid maximum depth %s"
 msgstr ""
 
-#: src/du.c:809
+#: src/du.c:816
 #, c-format
 msgid "invalid --threshold argument '-0'"
 msgstr ""
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr ""
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr ""
 
-#: src/du.c:900
+#: src/du.c:911
 #, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr ""
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 msgid "file operands cannot be combined with --files0-from"
 msgstr ""
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr ""
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr ""
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 msgid "invalid zero-length file name"
 msgstr ""
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 #, fuzzy
 msgid "total"
 msgstr "Жалпы"
@@ -3475,7 +3552,7 @@ msgstr ""
 #: src/env.c:61
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
 
@@ -3543,23 +3620,23 @@ msgid "input line is too long"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr ""
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
 "  or:  %s OPTION\n"
 msgstr ""
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -3570,7 +3647,7 @@ msgid ""
 "  ARG1 & ARG2       ARG1 if neither argument is null or 0, otherwise 0\n"
 msgstr ""
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -3581,14 +3658,14 @@ msgid ""
 "  ARG1 > ARG2       ARG1 is greater than ARG2\n"
 msgstr ""
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
 "  ARG1 - ARG2       arithmetic difference of ARG1 and ARG2\n"
 msgstr ""
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -3597,7 +3674,7 @@ msgid ""
 "  ARG1 % ARG2       arithmetic remainder of ARG1 divided by ARG2\n"
 msgstr ""
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -3608,7 +3685,7 @@ msgid ""
 "  length STRING              length of STRING\n"
 msgstr ""
 
-#: src/expr.c:251
+#: src/expr.c:250
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
 "                               keyword like 'match' or an operator like '/'\n"
@@ -3616,7 +3693,7 @@ msgid ""
 "  ( EXPRESSION )             value of EXPRESSION\n"
 msgstr ""
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -3626,7 +3703,7 @@ msgid ""
 "0.\n"
 msgstr ""
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -3634,32 +3711,32 @@ msgid ""
 "or 0, 2 if EXPRESSION is syntactically invalid, and 3 if an error occurred.\n"
 msgstr ""
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, c-format
 msgid "syntax error"
 msgstr ""
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, c-format
 msgid "error in regular expression matcher"
 msgstr ""
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, c-format
 msgid "non-integer argument"
 msgstr ""
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr ""
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr ""
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, c-format
 msgid "the strings compared were %s and %s"
 msgstr ""
@@ -3669,34 +3746,34 @@ msgstr ""
 msgid "Niels Moller"
 msgstr ""
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
 msgstr ""
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
 msgstr ""
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, c-format
 msgid "%s is not a valid positive integer"
 msgstr ""
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr ""
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
 "  or:  %s OPTION\n"
 msgstr ""
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
 "are specified on the command line, read them from standard input.\n"
@@ -3783,28 +3860,28 @@ msgid "invalid number of columns: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr ""
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, fuzzy, c-format
 msgid "Usage: %s\n"
 msgstr "Қолданылуы:"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
 msgstr ""
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, c-format
 msgid "failed to get groups for user %s"
 msgstr ""
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, c-format
 msgid "failed to get groups for the current process"
 msgstr ""
@@ -3826,22 +3903,22 @@ msgid ""
 "the current process (which may differ if the groups database has changed).\n"
 msgstr ""
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, c-format
 msgid "cannot get real UID"
 msgstr ""
 
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, c-format
 msgid "cannot get effective GID"
 msgstr ""
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, c-format
 msgid "cannot get real GID"
 msgstr ""
 
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, fuzzy, c-format
 msgid "%s: no such user"
 msgstr "Ондай пайдаланушы жоқ."
@@ -3877,58 +3954,48 @@ msgid ""
 "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n"
 msgstr ""
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr ""
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, c-format
 msgid "%s: number of bytes is too large"
 msgstr ""
 
-#: src/head.c:440
-#, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr ""
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr ""
 
-#: src/head.c:673
-#, fuzzy, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "%s: %s өшіру �әт�із а�қталды\n"
-
-#: src/head.c:798
+#: src/head.c:423 src/tail.c:457
 #, c-format
-msgid "cannot reposition file pointer for %s"
+msgid "%s: cannot seek to relative offset %s"
 msgstr ""
 
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr ""
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr ""
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr ""
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr ""
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr ""
 
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, c-format
 msgid "invalid trailing option -- %c"
 msgstr ""
@@ -3966,146 +4033,162 @@ msgid "cannot determine hostname"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr ""
 
-#: src/id.c:81
+#: src/id.c:84
 #, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
+msgid "Usage: %s [OPTION]... [USER]\n"
 msgstr ""
 
-#: src/id.c:82
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
 msgstr ""
 
-#: src/id.c:96
+#: src/id.c:90
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
+msgstr ""
+
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
 msgstr ""
 
-#: src/id.c:140
+#: src/id.c:151
+#, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr ""
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr ""
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr ""
 
-#: src/id.c:178
+#: src/id.c:198
 #, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr ""
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr ""
 
-#: src/id.c:199
+#: src/id.c:209
+#, c-format
+msgid "option --zero not permitted in default format"
+msgstr ""
+
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
 msgstr ""
 
-#: src/id.c:224
+#: src/id.c:265
 #, c-format
 msgid "cannot get effective UID"
 msgstr ""
 
-#: src/id.c:311
+#: src/id.c:354
 #, c-format
 msgid "cannot find name for user ID %s"
 msgstr ""
 
-#: src/id.c:329
+#: src/id.c:372
 #, c-format
 msgid "uid=%s"
 msgstr ""
 
-#: src/id.c:334
+#: src/id.c:377
 #, c-format
 msgid " gid=%s"
 msgstr ""
 
-#: src/id.c:341
+#: src/id.c:384
 #, c-format
 msgid " euid=%s"
 msgstr ""
 
-#: src/id.c:349
+#: src/id.c:392
 #, c-format
 msgid " egid=%s"
 msgstr ""
 
-#: src/id.c:377
+#: src/id.c:421
 #, fuzzy
 msgid " groups="
 msgstr " топтар="
 
-#: src/id.c:393
+#: src/id.c:437
 #, c-format
 msgid " context=%s"
 msgstr ""
 
-#: src/install.c:373
+#: src/install.c:376
 #, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr ""
 
-#: src/install.c:414
+#: src/install.c:417
 #, fuzzy, c-format
 msgid "creating directory %s"
 msgstr "'%s' бума�ын жа�ау"
 
-#: src/install.c:482
+#: src/install.c:485
 #, c-format
 msgid "cannot change ownership of %s"
 msgstr ""
 
-#: src/install.c:506
+#: src/install.c:509
 #, c-format
 msgid "cannot set time stamps for %s"
 msgstr ""
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, c-format
 msgid "fork system call failed"
 msgstr ""
 
-#: src/install.c:531
+#: src/install.c:535
 #, c-format
 msgid "cannot run %s"
 msgstr ""
 
-#: src/install.c:535
+#: src/install.c:539
 #, c-format
 msgid "waiting for strip"
 msgstr ""
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr ""
 
-#: src/install.c:558
+#: src/install.c:565
 #, c-format
 msgid "invalid user %s"
 msgstr ""
 
-#: src/install.c:594
+#: src/install.c:601
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -4114,7 +4197,7 @@ msgid ""
 "  or:  %s [OPTION]... -d DIRECTORY...\n"
 msgstr ""
 
-#: src/install.c:601
+#: src/install.c:608
 msgid ""
 "\n"
 "This install program copies files (often just compiled) into destination\n"
@@ -4128,7 +4211,7 @@ msgid ""
 "In the 4th form, create all components of the given DIRECTORY(ies).\n"
 msgstr ""
 
-#: src/install.c:615
+#: src/install.c:622
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
 "  -b                  like --backup but does not accept an argument\n"
@@ -4140,7 +4223,7 @@ msgid ""
 "                        components of the specified directories\n"
 msgstr ""
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -4152,7 +4235,7 @@ msgid ""
 "  -o, --owner=OWNER   set ownership (super-user only)\n"
 msgstr ""
 
-#: src/install.c:631
+#: src/install.c:638
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
 "files\n"
@@ -4166,60 +4249,57 @@ msgid ""
 "  -v, --verbose       print the name of each directory as it is created\n"
 msgstr ""
 
-#: src/install.c:641
+#: src/install.c:648
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
 
-#: src/install.c:859
+#: src/install.c:696 src/unlink.c:86
 #, c-format
-msgid ""
-"WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
+msgid "cannot unlink %s"
 msgstr ""
 
-#: src/install.c:869
+#: src/install.c:877
 #, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
+msgid ""
+"WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
 msgstr ""
 
-#: src/install.c:886
+#: src/install.c:917
 #, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr ""
 
-#: src/install.c:889
+#: src/install.c:920
 #, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr ""
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr ""
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, c-format
 msgid "invalid mode %s"
 msgstr ""
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr ""
 
-#: src/install.c:959
+#: src/install.c:1001
 #, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr ""
 
-#: src/install.c:966
+#: src/install.c:1008
 #, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr ""
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -4231,7 +4311,7 @@ msgstr ""
 msgid "Mike Haertel"
 msgstr ""
 
-#: src/join.c:191
+#: src/join.c:195
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
 "standard output.  The default join field is the first, delimited\n"
@@ -4242,7 +4322,7 @@ msgid ""
 "  -e EMPTY          replace missing input fields with EMPTY\n"
 msgstr ""
 
-#: src/join.c:200
+#: src/join.c:204
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
 "  -j FIELD          equivalent to '-1 FIELD -2 FIELD'\n"
@@ -4250,7 +4330,7 @@ msgid ""
 "  -t CHAR           use CHAR as input and output field separator\n"
 msgstr ""
 
-#: src/join.c:206
+#: src/join.c:210
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
 "  -1 FIELD          join on this FIELD of file 1\n"
@@ -4262,7 +4342,11 @@ msgid ""
 "                      print them without trying to pair them\n"
 msgstr ""
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr ""
+
+#: src/join.c:225
 msgid ""
 "\n"
 "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n"
@@ -4281,47 +4365,47 @@ msgid ""
 "warning message will be given.\n"
 msgstr ""
 
-#: src/join.c:403
+#: src/join.c:410
 #, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
 msgstr ""
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, c-format
 msgid "invalid field number: %s"
 msgstr ""
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, c-format
 msgid "invalid field specifier: %s"
 msgstr ""
 
-#: src/join.c:877
+#: src/join.c:884
 #, c-format
 msgid "invalid file number in field spec: %s"
 msgstr ""
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr ""
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr ""
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, c-format
 msgid "multi-character tab %s"
 msgstr ""
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr ""
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr ""
@@ -4423,47 +4507,47 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr ""
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr ""
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, c-format
 msgid "%s: cannot overwrite directory"
 msgstr ""
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, fuzzy, c-format
 msgid "%s: replace %s? "
 msgstr "�_лма�тыру"
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, fuzzy, c-format
 msgid "failed to create symbolic link %s"
 msgstr "\"%s\" �имволдық �ілтеме�ін жа�ау �әт�із а�қталды"
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, fuzzy, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr "\"%s\" �имволдық �ілтеме�ін жа�ау �әт�із а�қталды"
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr ""
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, c-format
 msgid "failed to create hard link %s"
 msgstr ""
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, c-format
 msgid "failed to create hard link %s => %s"
 msgstr ""
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -4472,7 +4556,7 @@ msgid ""
 "  or:  %s [OPTION]... -t DIRECTORY TARGET...  (4th form)\n"
 msgstr ""
 
-#: src/ln.c:381
+#: src/ln.c:398
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
 "In the 2nd form, create a link to TARGET in the current directory.\n"
@@ -4484,7 +4568,7 @@ msgid ""
 "interpreted in relation to its parent directory.\n"
 msgstr ""
 
-#: src/ln.c:394
+#: src/ln.c:411
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
 "file\n"
@@ -4497,7 +4581,7 @@ msgid ""
 "  -f, --force                 remove existing destination files\n"
 msgstr ""
 
-#: src/ln.c:402
+#: src/ln.c:419
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
 "  -L, --logical               dereference TARGETs that are symbolic links\n"
@@ -4509,7 +4593,7 @@ msgid ""
 "  -s, --symbolic              make symbolic links instead of hard links\n"
 msgstr ""
 
-#: src/ln.c:411
+#: src/ln.c:428
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
 "  -t, --target-directory=DIRECTORY  specify the DIRECTORY in which to "
@@ -4519,7 +4603,7 @@ msgid ""
 "  -v, --verbose               print name of each linked file\n"
 msgstr ""
 
-#: src/ln.c:433
+#: src/ln.c:450
 #, c-format
 msgid ""
 "\n"
@@ -4527,12 +4611,12 @@ msgid ""
 "behavior when a TARGET is a symbolic link, defaulting to %s.\n"
 msgstr ""
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr ""
 
-#: src/ln.c:588
+#: src/ln.c:605
 #, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr ""
@@ -4563,7 +4647,7 @@ msgstr ""
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
@@ -4572,100 +4656,100 @@ msgstr "%b %e  %Y"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 msgid "%b %e %H:%M"
 msgstr "%b %e %H:%M"
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr ""
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr ""
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr ""
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, c-format
 msgid "invalid line width: %s"
 msgstr ""
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, c-format
 msgid "invalid tab size: %s"
 msgstr ""
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, c-format
 msgid "invalid time style format %s"
 msgstr ""
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 msgid "Valid arguments are:\n"
 msgstr ""
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr ""
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr ""
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, c-format
 msgid "unrecognized prefix: %s"
 msgstr ""
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr ""
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, c-format
 msgid "cannot open directory %s"
 msgstr ""
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, c-format
 msgid "cannot determine device and inode of %s"
 msgstr ""
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, c-format
 msgid "%s: not listing already-listed directory"
 msgstr ""
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, c-format
 msgid "reading directory %s"
 msgstr ""
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, c-format
 msgid "closing directory %s"
 msgstr ""
 
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, c-format
 msgid "cannot compare file names %s and %s"
 msgstr ""
 
-#: src/ls.c:4721
+#: src/ls.c:4781
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
 "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n"
 msgstr ""
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
 "  -A, --almost-all           do not list implied . and ..\n"
@@ -4674,33 +4758,32 @@ msgid ""
 "characters\n"
 msgstr ""
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
 "  -F, --classify             append indicator (one of */=>@|) to entries\n"
@@ -4710,40 +4793,41 @@ msgid ""
 "      --full-time            like -l --time-style=full-iso\n"
 msgstr ""
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr ""
 
-#: src/ls.c:4763
+#: src/ls.c:4823
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 
-#: src/ls.c:4769
+#: src/ls.c:4829
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
 
-#: src/ls.c:4775
+#: src/ls.c:4835
 msgid ""
 "  -H, --dereference-command-line\n"
 "                             follow symbolic links listed on the command "
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
 msgstr ""
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
 "names:\n"
@@ -4752,10 +4836,10 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -4765,7 +4849,7 @@ msgid ""
 "entries\n"
 msgstr ""
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -4776,11 +4860,11 @@ msgid ""
 "                             append / indicator to directories\n"
 msgstr ""
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -4788,7 +4872,7 @@ msgid ""
 "escape\n"
 msgstr ""
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
 "  -R, --recursive            list subdirectories recursively\n"
@@ -4796,56 +4880,59 @@ msgid ""
 "blocks\n"
 msgstr ""
 
-#: src/ls.c:4825
+#: src/ls.c:4886
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 
-#: src/ls.c:4835
+#: src/ls.c:4896
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
 msgstr ""
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 msgid ""
 "  -t                         sort by modification time, newest first\n"
 "  -T, --tabsize=COLS         assume tab stops at each COLS instead of 8\n"
 msgstr ""
 
-#: src/ls.c:4848
+#: src/ls.c:4912
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
 msgstr ""
 
-#: src/ls.c:4855
+#: src/ls.c:4919
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -4854,7 +4941,7 @@ msgid ""
 "variable can change the settings.  Use the dircolors command to set it.\n"
 msgstr ""
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -4918,19 +5005,16 @@ msgstr ""
 #: src/md5sum.c:195
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, c-format
 msgid ""
 "\n"
@@ -4940,156 +5024,182 @@ msgid ""
 "space for text), and name for each FILE.\n"
 msgstr ""
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, c-format
 msgid "%s: too many checksum lines"
 msgstr ""
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr ""
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr ""
 
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 #, fuzzy
 msgid "FAILED"
 msgstr "Сәт�із а�қталды!"
 
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 #, fuzzy
 msgid "OK"
 msgstr "ОК"
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr ""
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
 msgstr[0] ""
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
 msgstr[0] ""
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
 msgstr[0] ""
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
 msgstr ""
 
-#: src/md5sum.c:766
+#: src/md5sum.c:770
 #, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr ""
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
 msgstr ""
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr ""
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr ""
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr ""
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr ""
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr ""
 
-#: src/mkdir.c:57
+#: src/mkdir.c:59
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
 msgstr ""
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 
-#: src/mkdir.c:168
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/mkdir.c:127 src/mkdir.c:172
+#, c-format
+msgid "failed to set default creation context for %s"
+msgstr ""
+
+#: src/mkdir.c:191
+#, fuzzy, c-format
+msgid "failed to restore context for %s"
+msgstr "%s: %s өшіру �әт�із а�қталды\n"
+
+#: src/mkdir.c:231
 #, c-format
 msgid "created directory %s"
 msgstr ""
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr ""
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr ""
 
-#: src/mkfifo.c:52
+#: src/mkfifo.c:54
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
 msgstr ""
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
 msgstr ""
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, c-format
 msgid "invalid mode"
 msgstr ""
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr ""
 
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
 #, c-format
-msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
+msgid "cannot set permissions of %s"
 msgstr ""
 
 #: src/mknod.c:54
-msgid "Create the special file NAME of the given TYPE.\n"
+#, c-format
+msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr ""
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
+#: src/mknod.c:56
+msgid "Create the special file NAME of the given TYPE.\n"
 msgstr ""
 
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -5098,7 +5208,7 @@ msgid ""
 "otherwise, as decimal.  TYPE may be:\n"
 msgstr ""
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 msgid ""
 "\n"
 "  b      create a block (buffered) special file\n"
@@ -5106,148 +5216,142 @@ msgid ""
 "  p      create a FIFO\n"
 msgstr ""
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 msgid "Special files require major and minor device numbers."
 msgstr ""
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 msgid "Fifos do not have major and minor device numbers."
 msgstr ""
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, c-format
 msgid "block special files not supported"
 msgstr ""
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, c-format
 msgid "character special files not supported"
 msgstr ""
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, c-format
 msgid "invalid major device number %s"
 msgstr ""
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, c-format
 msgid "invalid minor device number %s"
 msgstr ""
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, fuzzy, c-format
 msgid "invalid device %s %s"
 msgstr "Қате құрылғы"
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, c-format
 msgid "invalid device type %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr ""
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr ""
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
 "TEMPLATE must contain at least 3 consecutive 'X's in last component.\n"
 "If TEMPLATE is not specified, use tmp.XXXXXXXXXX, and --tmpdir is implied.\n"
 msgstr ""
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
 "  -q, --quiet         suppress diagnostics about file/dir-creation failure\n"
 msgstr ""
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
 msgstr ""
 
-#: src/mktemp.c:223
-#, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr ""
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, c-format
 msgid "too many templates"
 msgstr ""
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr ""
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr ""
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr ""
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr ""
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr ""
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, c-format
 msgid "failed to create directory via template %s"
 msgstr ""
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, c-format
 msgid "failed to create file via template %s"
 msgstr ""
 
-#: src/mv.c:292
+#: src/mv.c:294
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 
-#: src/mv.c:298
+#: src/mv.c:300
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
 "file\n"
@@ -5260,7 +5364,7 @@ msgid ""
 "effect.\n"
 msgstr ""
 
-#: src/mv.c:307
+#: src/mv.c:309
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
@@ -5268,7 +5372,7 @@ msgid ""
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
 msgstr ""
 
-#: src/mv.c:312
+#: src/mv.c:314
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
 "DIRECTORY\n"
@@ -5277,6 +5381,8 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
 
 #: src/nice.c:72
@@ -5515,95 +5621,90 @@ msgid "%s: invalid number to ignore"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
 msgstr ""
 
-#: src/numfmt.c:676
+#: src/numfmt.c:659
 #, c-format
-msgid "value too large to be converted: '%s'"
+msgid "value too large to be converted: %s"
 msgstr ""
 
-#: src/numfmt.c:680
+#: src/numfmt.c:663
 #, fuzzy, c-format
-msgid "invalid number: '%s'"
+msgid "invalid number: %s"
 msgstr "%s: '%s' күні қате\n"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
+msgid "rejecting suffix in input: %s (consider using --from)"
 msgstr ""
 
-#: src/numfmt.c:688
+#: src/numfmt.c:671
 #, fuzzy, c-format
-msgid "invalid suffix in input: '%s'"
+msgid "invalid suffix in input: %s"
 msgstr "Енгізу қате"
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
 msgstr ""
 
-#: src/numfmt.c:723
+#: src/numfmt.c:722 src/numfmt.c:768
 #, fuzzy, c-format
 msgid "failed to prepare value '%Lf' for printing"
 msgstr "Жазу үшін '%s' ашу �әт�із: %s"
 
-#: src/numfmt.c:787
+#: src/numfmt.c:791
 #, fuzzy, c-format
-msgid "invalid unit size: '%s'"
+msgid "invalid unit size: %s"
 msgstr "%s: '%s' күні қате\n"
 
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
-#, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr ""
-
-#: src/numfmt.c:813
+#: src/numfmt.c:814
 #, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
 msgstr ""
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
 msgstr ""
 
-#: src/numfmt.c:820
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
 msgstr ""
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
 msgstr ""
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
 "                         see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr ""
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
@@ -5611,19 +5712,19 @@ msgid ""
 "locale)\n"
 msgstr ""
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
 msgstr ""
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
 msgstr ""
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -5633,30 +5734,30 @@ msgid ""
 "                         is found\n"
 msgstr ""
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
 "nearest\n"
 msgstr ""
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
 msgstr ""
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr ""
 
-#: src/numfmt.c:877
+#: src/numfmt.c:878
 #, fuzzy
 msgid ""
 "\n"
@@ -5665,11 +5766,11 @@ msgstr ""
 "Ба�қа опци�лар:\n"
 "\n"
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr ""
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -5678,7 +5779,7 @@ msgid ""
 "               1Mi = 1048576,\n"
 msgstr ""
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
@@ -5686,7 +5787,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
@@ -5694,7 +5795,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
@@ -5702,18 +5803,18 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:905
+#: src/numfmt.c:906
 #, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -5725,7 +5826,7 @@ msgid ""
 "errors are not diagnosed and the exit status is 0.\n"
 msgstr ""
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -5746,112 +5847,112 @@ msgid ""
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 msgstr ""
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, c-format
 msgid "format %s has no %% directive"
 msgstr ""
 
-#: src/numfmt.c:990
+#: src/numfmt.c:1003
 #, c-format
 msgid "invalid format %s (width overflow)"
 msgstr ""
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1008
 #, c-format
-msgid "format %s ends in %%"
+msgid "--format padding overridding --padding"
 msgstr ""
 
-#: src/numfmt.c:1010
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
+msgid "format %s ends in %%"
 msgstr ""
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1030
 #, c-format
-msgid "format %s has too many %% directives"
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
 msgstr ""
 
-#: src/numfmt.c:1070
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
-msgid "invalid suffix in input '%s': '%s'"
+msgid "format %s has too many %% directives"
 msgstr ""
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1081
+#, fuzzy, c-format
+msgid "invalid suffix in input %s: %s"
+msgstr "Енгізу қате"
+
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
 msgstr ""
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
 msgstr ""
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
+msgid "large input value %s: possible precision loss"
 msgstr ""
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
 
-#: src/numfmt.c:1388
+#: src/numfmt.c:1403
 #, fuzzy, c-format
-msgid "invalid padding value '%s'"
+msgid "invalid padding value %s"
 msgstr "%s: '%s' күні қате\n"
 
-#: src/numfmt.c:1401
+#: src/numfmt.c:1417
 #, fuzzy, c-format
-msgid "invalid field value '%s'"
+msgid "invalid field value %s"
 msgstr "%s: '%s' күні қате\n"
 
-#: src/numfmt.c:1430
+#: src/numfmt.c:1447
 #, fuzzy, c-format
-msgid "invalid header value '%s'"
+msgid "invalid header value %s"
 msgstr "%s: '%s' күні қате\n"
 
-#: src/numfmt.c:1456
+#: src/numfmt.c:1473
 #, c-format
 msgid "--grouping cannot be combined with --format"
 msgstr ""
 
-#: src/numfmt.c:1458
-#, c-format
-msgid "--padding cannot be combined with --format"
-msgstr ""
-
-#: src/numfmt.c:1463
+#: src/numfmt.c:1478
 #, fuzzy, c-format
 msgid "no conversion option specified"
 msgstr "Команда көр�етілмеген"
 
-#: src/numfmt.c:1471
+#: src/numfmt.c:1486
 #, c-format
 msgid "grouping cannot be combined with --to"
 msgstr ""
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
 msgstr ""
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
 msgstr ""
 
-#: src/numfmt.c:1511
+#: src/numfmt.c:1526
 #, fuzzy, c-format
 msgid "error reading input"
 msgstr "%s: %s: оқу қате�і: %s\n"
 
-#: src/numfmt.c:1520
-#, fuzzy, c-format
+#: src/numfmt.c:1535
+#, c-format
 msgid "failed to convert some of the input numbers"
-msgstr "\"%s\" ашу �әт�із а�қталды "
+msgstr ""
 
-#: src/od.c:294
+#: src/od.c:320
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -5860,7 +5961,7 @@ msgid ""
 "[b]]\n"
 msgstr ""
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -5870,7 +5971,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/od.c:307
+#: src/od.c:333
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
 "if the last operand begins with + or (if there are 2 operands) a digit.\n"
@@ -5880,38 +5981,40 @@ msgid ""
 "suffixes may be . for octal and b for multiply by 512.\n"
 msgstr ""
 
-#: src/od.c:318
+#: src/od.c:344
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
 
-#: src/od.c:323
+#: src/od.c:350
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
 
-#: src/od.c:336
+#: src/od.c:363
 msgid ""
 "\n"
 "\n"
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 
-#: src/od.c:345
+#: src/od.c:372
 msgid ""
 "  -f   same as -t fF, select floats\n"
 "  -i   same as -t dI, select decimal ints\n"
@@ -5921,16 +6024,16 @@ msgid ""
 "  -x   same as -t x2, select hexadecimal 2-byte units\n"
 msgstr ""
 
-#: src/od.c:353
+#: src/od.c:380
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -5939,7 +6042,7 @@ msgid ""
 "  x[SIZE]    hexadecimal, SIZE bytes per integer\n"
 msgstr ""
 
-#: src/od.c:367
+#: src/od.c:394
 msgid ""
 "\n"
 "SIZE is a number.  For TYPE in [doux], SIZE may also be C for\n"
@@ -5948,14 +6051,14 @@ msgid ""
 "for sizeof(double) or L for sizeof(long double).\n"
 msgstr ""
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
 "each output line.\n"
 msgstr ""
 
-#: src/od.c:379
+#: src/od.c:406
 msgid ""
 "\n"
 "\n"
@@ -5968,55 +6071,55 @@ msgid ""
 "and so on for G, T, P, E, Z, Y.\n"
 msgstr ""
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, c-format
 msgid "invalid type string %s"
 msgstr ""
 
-#: src/od.c:649
+#: src/od.c:690
 #, c-format
 msgid ""
 "invalid type string %s;\n"
 "this system doesn't provide a %lu-byte integral type"
 msgstr ""
 
-#: src/od.c:770
+#: src/od.c:811
 #, c-format
 msgid ""
 "invalid type string %s;\n"
 "this system doesn't provide a %lu-byte floating point type"
 msgstr ""
 
-#: src/od.c:828
+#: src/od.c:869
 #, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr ""
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr ""
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr ""
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr ""
 
-#: src/od.c:1810
+#: src/od.c:1863
 msgid "compatibility mode supports at most one file"
 msgstr ""
 
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr ""
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr ""
@@ -6171,12 +6274,12 @@ msgstr "Қашан"
 msgid "Where"
 msgstr ""
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr ""
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -6186,7 +6289,7 @@ msgid ""
 "  -s              do short format output, this is the default\n"
 msgstr ""
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -6195,7 +6298,7 @@ msgid ""
 "                  in short format\n"
 msgstr ""
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, c-format
 msgid ""
 "\n"
@@ -6203,7 +6306,7 @@ msgid ""
 "The utmp file will be %s.\n"
 msgstr ""
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr ""
@@ -6370,12 +6473,13 @@ msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
 
-#: src/pr.c:2827
+#: src/pr.c:2828
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
 "                    separate columns by STRING,\n"
@@ -6385,7 +6489,7 @@ msgid ""
 "  -t, --omit-header  omit page headers and trailers\n"
 msgstr ""
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 msgid ""
 "  -T, --omit-pagination\n"
 "                    omit page headers and trailers, eliminate any "
@@ -6399,7 +6503,7 @@ msgid ""
 "(72)\n"
 msgstr ""
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
 "                    set page width to PAGE_WIDTH (72) characters always,\n"
@@ -6408,7 +6512,7 @@ msgid ""
 "                    with -S or -s\n"
 msgstr ""
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 msgid ""
 "\n"
 "-t is implied if PAGE_LENGTH <= 10.  With no FILE, or when FILE is -, read\n"
@@ -6425,7 +6529,7 @@ msgid ""
 msgstr ""
 
 #: src/printenv.c:69
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/printf.c:79
@@ -6521,32 +6625,32 @@ msgstr ""
 msgid "F. Pinard"
 msgstr ""
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, c-format
 msgid "%s (for regexp %s)"
 msgstr ""
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
 "  or:  %s -G [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr ""
 
-#: src/ptx.c:1821
+#: src/ptx.c:1824
 msgid ""
 "Output a permuted index, including context, of the words in the input "
 "files.\n"
 msgstr ""
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
 "  -G, --traditional              behave more like System V 'ptx'\n"
 "  -F, --flag-truncation=STRING   use STRING for flagging line truncations\n"
 msgstr ""
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
 "  -O, --format=roff              generate output as roff directives\n"
@@ -6555,7 +6659,7 @@ msgid ""
 "  -T, --format=tex               generate output as TeX directives\n"
 msgstr ""
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -6565,7 +6669,7 @@ msgid ""
 "  -o, --only-file=FILE           read only word list from this FILE\n"
 msgstr ""
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -6573,13 +6677,13 @@ msgid ""
 "excluded\n"
 msgstr ""
 
-#: src/ptx.c:1854
+#: src/ptx.c:1857
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, c-format
 msgid "invalid gap width: %s"
 msgstr ""
@@ -6596,22 +6700,28 @@ msgid ""
 "  -P, --physical  avoid all symlinks\n"
 msgstr ""
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+
+#: src/pwd.c:169
 #, c-format
 msgid "failed to chdir to %s"
 msgstr ""
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, c-format
 msgid "failed to stat %s"
 msgstr ""
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr ""
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, c-format
 msgid "ignoring non-option arguments"
 msgstr ""
@@ -6621,8 +6731,8 @@ msgstr ""
 msgid "Dmitry V. Levin"
 msgstr ""
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr ""
@@ -6656,8 +6766,7 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/readlink.c:152
@@ -6682,7 +6791,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 
@@ -6700,41 +6809,42 @@ msgstr ""
 msgid "%s: descend into directory %s? "
 msgstr ""
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr ""
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, fuzzy, c-format
 msgid "%s: remove %s %s? "
 msgstr "Өшіру"
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, c-format
 msgid "removed directory: %s\n"
 msgstr ""
 
-#: src/remove.c:444
+#: src/remove.c:447
 #, c-format
-msgid "cannot remove directory: %s"
+msgid "refusing to remove %s or %s directory: skipping %s"
 msgstr ""
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr ""
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, c-format
 msgid "traversal failed: %s"
 msgstr ""
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -6759,12 +6869,12 @@ msgstr ""
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 
 #: src/rm.c:149
@@ -6812,13 +6922,15 @@ msgstr ""
 
 #: src/rm.c:342
 #, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr ""
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] ""
 
-#: src/rm.c:343
-#, c-format
-msgid "%s: remove all arguments? "
-msgstr ""
+#: src/rm.c:345
+#, fuzzy, c-format
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] "Өшіру"
 
 #: src/rmdir.c:134 src/rmdir.c:233
 #, c-format
@@ -6861,7 +6973,7 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
 
@@ -6911,41 +7023,46 @@ msgstr ""
 msgid "no command specified"
 msgstr "Команда көр�етілмеген"
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr ""
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, c-format
 msgid "failed to compute a new context"
 msgstr ""
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, c-format
 msgid "failed to set new user %s"
 msgstr ""
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, c-format
 msgid "failed to set new type %s"
 msgstr ""
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, c-format
 msgid "failed to set new range %s"
 msgstr ""
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, c-format
 msgid "failed to set new role %s"
 msgstr ""
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, c-format
 msgid "unable to set security context %s"
 msgstr ""
 
+#: src/selinux.c:127 src/selinux.c:300
+#, fuzzy, c-format
+msgid "error canonicalizing %s"
+msgstr "%s: %s: оқу қате�і: %s\n"
+
 #: src/seq.c:68
 #, c-format
 msgid ""
@@ -6970,95 +7087,47 @@ msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
 msgstr ""
 
-#: src/seq.c:94
+#: src/seq.c:96
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
 "it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n"
 "decimal numbers with maximum precision PREC, and to %g otherwise.\n"
 msgstr ""
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, c-format
 msgid "invalid floating point argument: %s"
 msgstr ""
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr ""
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr ""
 
-#: src/setuidgid.c:49
-#, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-
-#: src/setuidgid.c:55
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr ""
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr ""
-
-#: src/setuidgid.c:190
-#, c-format
-msgid "failed to set supplemental group(s)"
-msgstr ""
-
-#: src/setuidgid.c:200
-#, c-format
-msgid "cannot set group-ID to %lu"
-msgstr ""
-
-#: src/setuidgid.c:204
-#, c-format
-msgid "cannot set user-ID to %lu"
-msgstr ""
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr ""
 
-#: src/shred.c:148
+#: src/shred.c:170
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
 "for even very expensive hardware probing to recover the data.\n"
 msgstr ""
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -7067,28 +7136,32 @@ msgid ""
 "  -s, --size=N   shred this many bytes (suffixes like K, M, G accepted)\n"
 msgstr ""
 
-#: src/shred.c:161
+#: src/shred.c:183
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
 "  -z, --zero     add a final overwrite with zeros to hide shredding\n"
 msgstr ""
 
-#: src/shred.c:170
+#: src/shred.c:192
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -7099,7 +7172,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -7111,7 +7184,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -7120,7 +7193,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -7132,134 +7205,134 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:215
+#: src/shred.c:241
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
 "of the file that cannot be removed, and that will allow a shredded file\n"
 "to be recovered later.\n"
 msgstr ""
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, c-format
 msgid "%s: fdatasync failed"
 msgstr ""
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr ""
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr ""
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr ""
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, c-format
 msgid "%s: error writing at offset %s"
 msgstr ""
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, c-format
 msgid "%s: lseek failed"
 msgstr ""
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, c-format
 msgid "%s: file too large"
 msgstr ""
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr ""
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr ""
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, c-format
 msgid "%s: fstat failed"
 msgstr ""
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, c-format
 msgid "%s: invalid file type"
 msgstr ""
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr ""
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, c-format
 msgid "%s: error truncating"
 msgstr ""
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, c-format
 msgid "%s: fcntl failed"
 msgstr ""
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr ""
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, fuzzy, c-format
 msgid "%s: removing"
 msgstr "Өшірілуде %1..."
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, c-format
 msgid "%s: renamed to %s"
 msgstr ""
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, fuzzy, c-format
 msgid "%s: failed to remove"
 msgstr "%s: %s өшіру �әт�із а�қталды\n"
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr ""
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, c-format
 msgid "%s: failed to close"
 msgstr ""
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, fuzzy, c-format
 msgid "%s: failed to open for writing"
 msgstr "Жазу үшін '%s' ашу �әт�із: %s"
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, c-format
 msgid "%s: invalid number of passes"
 msgstr ""
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, c-format
 msgid "multiple random sources specified"
 msgstr ""
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, c-format
 msgid "%s: invalid file size"
 msgstr ""
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -7267,11 +7340,11 @@ msgid ""
 "  or:  %s -i LO-HI [OPTION]...\n"
 msgstr ""
 
-#: src/shuf.c:54
+#: src/shuf.c:67
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr ""
 
-#: src/shuf.c:60
+#: src/shuf.c:73
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
 "  -i, --input-range=LO-HI   treat each number LO through HI as an input "
@@ -7279,34 +7352,44 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
+msgstr ""
+
+#: src/shuf.c:228
+#, c-format
+msgid "too many input lines"
 msgstr ""
 
-#: src/shuf.c:244
+#: src/shuf.c:431
 #, c-format
 msgid "multiple -i options specified"
 msgstr ""
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, c-format
 msgid "invalid input range %s"
 msgstr ""
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, c-format
 msgid "invalid line count %s"
 msgstr ""
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, c-format
 msgid "multiple output files specified"
 msgstr ""
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, c-format
 msgid "cannot combine -e and -i options"
 msgstr ""
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr ""
+
 #: src/sleep.c:44
 #, c-format
 msgid ""
@@ -7321,27 +7404,27 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, c-format
 msgid "invalid time interval %s"
 msgstr ""
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr ""
 
-#: src/sort.c:399
+#: src/sort.c:427
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr ""
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
 msgstr ""
 
-#: src/sort.c:409
+#: src/sort.c:437
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
 "  -d, --dictionary-order      consider only blanks and alphanumeric "
@@ -7349,19 +7432,19 @@ msgid ""
 "  -f, --ignore-case           fold lower case to upper case characters\n"
 msgstr ""
 
-#: src/sort.c:415
+#: src/sort.c:443
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
 "  -i, --ignore-nonprinting    consider only printable characters\n"
 "  -M, --month-sort            compare (unknown) < 'JAN' < ... < 'DEC'\n"
 msgstr ""
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 
-#: src/sort.c:423
+#: src/sort.c:451
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
 "  -R, --random-sort           sort by random hash of keys\n"
@@ -7369,7 +7452,7 @@ msgid ""
 "  -r, --reverse               reverse the result of comparisons\n"
 msgstr ""
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -7379,7 +7462,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/sort.c:437
+#: src/sort.c:465
 msgid ""
 "Other options:\n"
 "\n"
@@ -7387,13 +7470,13 @@ msgstr ""
 "Ба�қа опци�лар:\n"
 "\n"
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
 msgstr ""
 
-#: src/sort.c:445
+#: src/sort.c:473
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
 "  -C, --check=quiet, --check=silent  like -c, but do not report first bad "
@@ -7402,7 +7485,7 @@ msgid ""
 "                              decompress them with PROG -d\n"
 msgstr ""
 
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -7411,13 +7494,13 @@ msgid ""
 "                            If F is - then read names from standard input\n"
 msgstr ""
 
-#: src/sort.c:459
+#: src/sort.c:487
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
 "  -m, --merge               merge already sorted files; do not sort\n"
 msgstr ""
 
-#: src/sort.c:463
+#: src/sort.c:491
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "  -s, --stable              stabilize sort by disabling last-resort "
@@ -7425,7 +7508,7 @@ msgid ""
 "  -S, --buffer-size=SIZE    use SIZE for main memory buffer\n"
 msgstr ""
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -7440,11 +7523,7 @@ msgid ""
 "run\n"
 msgstr ""
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr ""
-
-#: src/sort.c:483
+#: src/sort.c:511
 msgid ""
 "\n"
 "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is "
@@ -7463,7 +7542,7 @@ msgid ""
 "SIZE may be followed by the following multiplicative suffixes:\n"
 msgstr ""
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -7475,256 +7554,241 @@ msgid ""
 "native byte values.\n"
 msgstr ""
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, c-format
 msgid "waiting for %s [-d]"
 msgstr ""
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr ""
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, c-format
 msgid "cannot create temporary file in %s"
 msgstr ""
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr ""
 
-#: src/sort.c:970
+#: src/sort.c:998
 msgid "fflush failed"
 msgstr ""
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr "жабу �әт�із"
 
-#: src/sort.c:986
-#, c-format
-msgid "dup2 failed"
-msgstr ""
-
-#: src/sort.c:1103
-#, c-format
-msgid "couldn't execute %s"
-msgstr ""
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 msgid "couldn't create temporary file"
 msgstr ""
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, c-format
 msgid "couldn't create process for %s -d"
 msgstr ""
 
-#: src/sort.c:1161
-#, c-format
-msgid "couldn't execute %s -d"
-msgstr ""
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, c-format
 msgid "warning: cannot remove: %s"
 msgstr ""
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, c-format
 msgid "invalid --%s argument %s"
 msgstr ""
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, c-format
 msgid "minimum --%s argument is %s"
 msgstr ""
 
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, c-format
 msgid "--%s argument %s too large"
 msgstr ""
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr ""
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr ""
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr ""
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr ""
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, c-format
 msgid "string transformation failed"
 msgstr ""
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, c-format
 msgid "the untransformed string was %s"
 msgstr ""
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr ""
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr ""
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr ""
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr ""
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr ""
 
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
 msgstr[0] ""
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr ""
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr ""
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr ""
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr ""
 
-#: src/sort.c:3698
+#: src/sort.c:3738
 msgid "cannot read"
 msgstr ""
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, c-format
 msgid "%s: invalid field specification %s"
 msgstr ""
 
-#: src/sort.c:3987
+#: src/sort.c:4028
 #, c-format
 msgid "options '-%s' are incompatible"
 msgstr ""
 
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, c-format
 msgid "%s: invalid count at start of %s"
 msgstr ""
 
-#: src/sort.c:4295
+#: src/sort.c:4336
 #, fuzzy
 msgid "invalid number after '-'"
 msgstr "%s: '%s' күні қате\n"
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 #, fuzzy
 msgid "invalid number after '.'"
 msgstr "%s: '%s' күні қате\n"
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr ""
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, c-format
 msgid "multiple compress programs specified"
 msgstr ""
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
 msgstr ""
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
 msgstr ""
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr ""
 
-#: src/sort.c:4407
+#: src/sort.c:4448
 #, fuzzy
 msgid "invalid number after ','"
 msgstr "%s: '%s' күні қате\n"
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr ""
 
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, c-format
 msgid "cannot read file names from %s"
 msgstr ""
 
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr ""
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, c-format
 msgid "no input from %s"
 msgstr ""
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr ""
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr ""
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr ""
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr ""
 
-#: src/split.c:204
+#: src/split.c:203
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr ""
 
-#: src/split.c:208
+#: src/split.c:207
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
 "size is 1000 lines, and default PREFIX is 'x'.  With no INPUT, or when "
@@ -7732,32 +7796,31 @@ msgid ""
 "is -, read standard input.\n"
 msgstr ""
 
-#: src/split.c:216
+#: src/split.c:215
 #, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
 
-#: src/split.c:229
+#: src/split.c:228
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
 "                            output file is opened\n"
 msgstr ""
 
-#: src/split.c:236
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -7769,189 +7832,189 @@ msgid ""
 "r/K/N   likewise but only output Kth of N to stdout\n"
 msgstr ""
 
-#: src/split.c:354
+#: src/split.c:353
 #, c-format
 msgid "output file suffixes exhausted"
 msgstr ""
 
-#: src/split.c:366
+#: src/split.c:365
 #, c-format
 msgid "creating file %s\n"
 msgstr ""
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr ""
 
-#: src/split.c:391
+#: src/split.c:390
 #, c-format
 msgid "failed to set FILE environment variable"
 msgstr ""
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr ""
 
-#: src/split.c:395
+#: src/split.c:394
 #, fuzzy, c-format
 msgid "failed to create pipe"
 msgstr "%s: %s өшіру �әт�із а�қталды\n"
 
-#: src/split.c:409
+#: src/split.c:408
 #, c-format
 msgid "closing prior pipe"
 msgstr ""
 
-#: src/split.c:411
+#: src/split.c:410
 #, c-format
 msgid "closing output pipe"
 msgstr ""
 
-#: src/split.c:415
+#: src/split.c:414
 #, c-format
 msgid "moving input pipe"
 msgstr ""
 
-#: src/split.c:417
+#: src/split.c:416
 #, c-format
 msgid "closing input pipe"
 msgstr ""
 
-#: src/split.c:422
+#: src/split.c:421
 #, fuzzy, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr "\"%s\" �имволдық �ілтеме�ін жа�ау �әт�із а�қталды"
 
-#: src/split.c:428
+#: src/split.c:427
 #, fuzzy, c-format
 msgid "failed to close input pipe"
 msgstr "\"%s\" ашу �әт�із а�қталды "
 
-#: src/split.c:464
+#: src/split.c:463
 #, c-format
 msgid "waiting for child process"
 msgstr ""
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr ""
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr ""
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr ""
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr ""
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, c-format
 msgid "%s: invalid number of chunks"
 msgstr ""
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, c-format
 msgid "%s: invalid chunk number"
 msgstr ""
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr ""
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr ""
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr ""
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, c-format
 msgid "line count option -%s%c... is too large"
 msgstr ""
 
-#: src/split.c:1248
+#: src/split.c:1298
 #, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr ""
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, c-format
 msgid "%s: invalid IO block size"
 msgstr ""
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr ""
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr ""
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, c-format
 msgid "%s: cannot determine file size"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr ""
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, c-format
 msgid "failed to canonicalize %s"
 msgstr ""
 
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr ""
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, c-format
 msgid "%s: invalid directive"
 msgstr ""
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, c-format
 msgid "warning: backslash at end of format"
 msgstr ""
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr ""
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, c-format
 msgid "cannot read file system information for %s"
 msgstr ""
 
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, c-format
 msgid "cannot stat standard input"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -7962,7 +8025,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -7970,30 +8033,30 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, c-format
 msgid "Context: %C\n"
 msgstr ""
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -8001,27 +8064,27 @@ msgid ""
 " Birth: %w\n"
 msgstr ""
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
 msgstr ""
 
-#: src/stat.c:1356
+#: src/stat.c:1418
 msgid ""
 "  -L, --dereference     follow links\n"
 "  -f, --file-system     display file system status instead of file status\n"
 msgstr ""
 
-#: src/stat.c:1360
+#: src/stat.c:1422
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 msgid ""
 "\n"
 "The valid format sequences for files (without --file-system):\n"
@@ -8033,7 +8096,7 @@ msgid ""
 "  %C   SELinux security context string\n"
 msgstr ""
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 msgid ""
 "  %d   device number in decimal\n"
 "  %D   device number in hex\n"
@@ -8043,7 +8106,7 @@ msgid ""
 "  %G   group name of owner\n"
 msgstr ""
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 msgid ""
 "  %h   number of hard links\n"
 "  %i   inode number\n"
@@ -8052,11 +8115,11 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 
-#: src/stat.c:1399
+#: src/stat.c:1461
 msgid ""
 "  %u   user ID of owner\n"
 "  %U   user name of owner\n"
@@ -8064,14 +8127,14 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 msgid ""
 "Valid format sequences for file systems:\n"
 "\n"
@@ -8082,7 +8145,7 @@ msgid ""
 "  %f   free blocks in file system\n"
 msgstr ""
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 msgid ""
 "  %i   file system ID in hex\n"
 "  %l   maximum length of filenames\n"
@@ -8143,22 +8206,27 @@ msgid ""
 "and are thus unaffected by 'stdbuf' settings.\n"
 msgstr ""
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, fuzzy, c-format
 msgid "failed to find %s"
 msgstr "\"%s\" ашу �әт�із а�қталды "
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, c-format
 msgid "failed to update the environment with %s"
 msgstr ""
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr ""
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, c-format
+msgid "you must specify a buffering mode option"
+msgstr ""
+
+#: src/stty.c:516
 #, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -8166,25 +8234,25 @@ msgid ""
 "  or:  %s [-F DEVICE | --file=DEVICE] [-g|--save]\n"
 msgstr ""
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
 msgstr ""
 
-#: src/stty.c:525
+#: src/stty.c:528
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
 "  -g, --save         print all current settings in a stty-readable form\n"
 "  -F, --file=DEVICE  open and use the specified DEVICE instead of stdin\n"
 msgstr ""
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
 "settings.  The underlying system defines which settings are available.\n"
 msgstr ""
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -8193,7 +8261,7 @@ msgid ""
 "   eol CHAR      CHAR will end the line\n"
 msgstr ""
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -8201,7 +8269,7 @@ msgid ""
 "   kill CHAR     CHAR will erase the current line\n"
 msgstr ""
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -8209,7 +8277,7 @@ msgid ""
 "   start CHAR    CHAR will restart the output after stopping it\n"
 msgstr ""
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -8217,7 +8285,7 @@ msgid ""
 " * werase CHAR   CHAR will erase the last word typed\n"
 msgstr ""
 
-#: src/stty.c:562
+#: src/stty.c:565
 msgid ""
 "\n"
 "Special settings:\n"
@@ -8226,7 +8294,7 @@ msgid ""
 " * columns N     same as cols N\n"
 msgstr ""
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -8235,7 +8303,7 @@ msgid ""
 "   ospeed N      set the output speed to N\n"
 msgstr ""
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -8244,7 +8312,7 @@ msgid ""
 "   time N        with -icanon, set read timeout of N tenths of a second\n"
 msgstr ""
 
-#: src/stty.c:581
+#: src/stty.c:584
 msgid ""
 "\n"
 "Control settings:\n"
@@ -8255,7 +8323,7 @@ msgid ""
 "   csN           set character size to N bits, N in [5..8]\n"
 msgstr ""
 
-#: src/stty.c:590
+#: src/stty.c:593
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
 "   [-]hup        send a hangup signal when the last process closes the tty\n"
@@ -8263,9 +8331,10 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -8275,7 +8344,7 @@ msgid ""
 "   [-]igncr      ignore carriage return\n"
 msgstr ""
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -8284,11 +8353,11 @@ msgid ""
 "   [-]istrip     clear high (8th) bit of input characters\n"
 msgstr ""
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr ""
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -8298,7 +8367,7 @@ msgid ""
 "   [-]tandem     same as [-]ixoff\n"
 msgstr ""
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -8308,17 +8377,17 @@ msgid ""
 " * nlN           newline delay style, N in [0..1]\n"
 msgstr ""
 
-#: src/stty.c:631
+#: src/stty.c:635
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
 " * [-]onlret     newline performs a carriage return\n"
 msgstr ""
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -8328,7 +8397,7 @@ msgid ""
 " * vtN           vertical tab delay style, N in [0..1]\n"
 msgstr ""
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -8337,7 +8406,7 @@ msgid ""
 " * -crtkill      kill all line by obeying the echoctl and echok settings\n"
 msgstr ""
 
-#: src/stty.c:654
+#: src/stty.c:658
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
 "   [-]echo       echo input characters\n"
@@ -8346,7 +8415,7 @@ msgid ""
 "   [-]echok      echo a newline after a kill character\n"
 msgstr ""
 
-#: src/stty.c:661
+#: src/stty.c:665
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
 "   [-]echonl     echo newline even if not echoing other characters\n"
@@ -8355,7 +8424,7 @@ msgid ""
 "   [-]iexten     enable non-POSIX special characters\n"
 msgstr ""
 
-#: src/stty.c:668
+#: src/stty.c:672
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
 "   [-]noflsh     disable flushing after interrupt and quit special "
@@ -8365,7 +8434,7 @@ msgid ""
 " * [-]xcase      with icanon, escape with '\\' for uppercase characters\n"
 msgstr ""
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -8374,7 +8443,7 @@ msgid ""
 "   -cbreak       same as icanon\n"
 msgstr ""
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -8382,7 +8451,7 @@ msgid ""
 "   crt           same as echoe echoctl echoke\n"
 msgstr ""
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -8391,7 +8460,7 @@ msgid ""
 "   evenp         same as parenb -parodd cs7\n"
 msgstr ""
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -8401,7 +8470,7 @@ msgid ""
 "   -nl           same as icrnl -inlcr -igncr onlcr -ocrnl -onlret\n"
 msgstr ""
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -8410,7 +8479,7 @@ msgid ""
 "   -pass8        same as parenb istrip cs7\n"
 msgstr ""
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -8418,7 +8487,7 @@ msgid ""
 "   -raw          same as cooked\n"
 msgstr ""
 
-#: src/stty.c:716
+#: src/stty.c:720
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
 "                 -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n"
@@ -8428,7 +8497,7 @@ msgid ""
 "                 characters to their default values\n"
 msgstr ""
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -8437,55 +8506,55 @@ msgid ""
 "127; special values ^- or undef used to disable special characters.\n"
 msgstr ""
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, c-format
 msgid "only one device may be specified"
 msgstr ""
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
 "mutually exclusive"
 msgstr ""
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr ""
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr ""
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, c-format
 msgid "invalid argument %s"
 msgstr ""
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, c-format
 msgid "missing argument to %s"
 msgstr ""
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, c-format
 msgid "invalid line discipline %s"
 msgstr ""
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr ""
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr ""
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, c-format
 msgid "invalid integer argument %s"
 msgstr ""
@@ -8531,21 +8600,21 @@ msgstr ""
 msgid "      --version  output version information and exit\n"
 msgstr ""
 
-#: src/system.h:544
+#: src/system.h:543
 msgid ""
 "\n"
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/system.h:552
+#: src/system.h:551
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -8554,33 +8623,33 @@ msgid ""
 "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n"
 msgstr ""
 
-#: src/system.h:571
+#: src/system.h:570
 #, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
+"%s online help: <%s>\n"
 msgstr ""
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr ""
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr ""
 
-#: src/system.h:596
+#: src/system.h:591
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Көбірек білу үшін \"%s --help\" көріңіз."
 
-#: src/system.h:628
+#: src/system.h:633
 #, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -8663,54 +8732,48 @@ msgstr ""
 
 #: src/tail.c:270
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
 
 #: src/tail.c:274
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 
-#: src/tail.c:281
+#: src/tail.c:280
 #, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
 
-#: src/tail.c:294
+#: src/tail.c:293
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 
-#: src/tail.c:301
+#: src/tail.c:298
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 
-#: src/tail.c:310
+#: src/tail.c:307
 msgid ""
 "\n"
 "If the first character of K (the number of bytes or lines) is a '+',\n"
@@ -8721,7 +8784,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/tail.c:319
+#: src/tail.c:316
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
 "means that even if a tail'ed file is renamed, tail will continue to track\n"
@@ -8731,159 +8794,164 @@ msgid ""
 "named file in a way that accommodates renaming, removal and creation.\n"
 msgstr ""
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr ""
 
-#: src/tail.c:453
-#, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr ""
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr ""
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr ""
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
 "reverting to polling"
 msgstr ""
 
-#: src/tail.c:963
+#: src/tail.c:965
 #, c-format
-msgid "%s has become inaccessible"
+msgid "%s has been replaced with a symbolic link. giving up on this name"
 msgstr ""
 
 #: src/tail.c:980
 #, c-format
+msgid "%s has become inaccessible"
+msgstr ""
+
+#: src/tail.c:997
+#, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr ""
 
-#: src/tail.c:989
+#: src/tail.c:1006
 #, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr ""
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, c-format
 msgid "%s has become accessible"
 msgstr ""
 
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr ""
 
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr ""
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr ""
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr ""
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr ""
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, c-format
 msgid "cannot watch parent directory of %s"
 msgstr ""
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, c-format
 msgid "inotify resources exhausted"
 msgstr ""
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, c-format
 msgid "cannot watch %s"
 msgstr ""
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr ""
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, c-format
 msgid "error reading inotify event"
 msgstr ""
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr ""
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, c-format
 msgid "number in %s is too large"
 msgstr ""
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr ""
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr ""
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr ""
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr ""
 
-#: src/tail.c:2034
+#: src/tail.c:2096
 #, c-format
-msgid "warning: --retry is useful mainly when following by name"
+msgid "warning: --retry ignored; --retry is useful only when following"
 msgstr ""
 
-#: src/tail.c:2038
+#: src/tail.c:2100
+#, c-format
+msgid "warning: --retry only effective for the initial open"
+msgstr ""
+
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
 msgstr ""
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr ""
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, c-format
 msgid "cannot follow %s by name"
 msgstr ""
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr ""
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr ""
@@ -9088,47 +9156,46 @@ msgstr ""
 msgid "warning: sigprocmask"
 msgstr ""
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr ""
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr ""
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
 "  or:  %s [OPTION]\n"
 msgstr ""
 
-#: src/timeout.c:229
+#: src/timeout.c:232
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
 msgstr ""
 
-#: src/timeout.c:235
+#: src/timeout.c:238
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 msgid ""
 "\n"
 "DURATION is a floating point number with an optional suffix:\n"
@@ -9136,7 +9203,7 @@ msgid ""
 "days.\n"
 msgstr ""
 
-#: src/timeout.c:259
+#: src/timeout.c:262
 msgid ""
 "\n"
 "If the command times out, and --preserve-status is not set, then exit with\n"
@@ -9147,17 +9214,17 @@ msgid ""
 "case the exit status is 128+9 rather than 124.\n"
 msgstr ""
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr ""
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, c-format
 msgid "error waiting for command"
 msgstr ""
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr ""
@@ -9467,7 +9534,7 @@ msgstr ""
 #: src/truncate.c:115
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 
 #: src/truncate.c:121
@@ -9547,12 +9614,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr ""
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr ""
@@ -9624,12 +9691,12 @@ msgstr ""
 msgid "tab stop value is too large"
 msgstr ""
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr ""
 
-#: src/uniq.c:138
+#: src/uniq.c:174
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
 "writing to OUTPUT (or standard output).\n"
@@ -9637,36 +9704,49 @@ msgid ""
 "With no options, matching lines are merged to the first occurrence.\n"
 msgstr ""
 
-#: src/uniq.c:147
+#: src/uniq.c:183
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
+msgstr ""
+
+#: src/uniq.c:187
+msgid ""
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
+msgstr ""
+
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr ""
+
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
 msgstr ""
 
-#: src/uniq.c:151
+#: src/uniq.c:199
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
 "  -i, --ignore-case     ignore differences in case when comparing\n"
 "  -s, --skip-chars=N    avoid comparing the first N characters\n"
 "  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
 msgstr ""
 
-#: src/uniq.c:161
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr ""
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 msgid ""
 "\n"
 "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n"
 "characters.  Fields are skipped before chars.\n"
 msgstr ""
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 msgid ""
 "\n"
 "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n"
@@ -9674,24 +9754,34 @@ msgid ""
 "Also, comparisons honor the rules specified by 'LC_COLLATE'.\n"
 msgstr ""
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, c-format
 msgid "too many repeated lines"
 msgstr ""
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
 msgstr ""
 
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
 msgstr ""
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
 msgstr ""
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr ""
+
+#: src/uniq.c:652
+#, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr ""
+
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr ""
@@ -9709,11 +9799,6 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/unlink.c:86
-#, c-format
-msgid "cannot unlink %s"
-msgstr ""
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -9757,7 +9842,7 @@ msgstr[0] "%lu пайдаланушы"
 msgid ",  load average: %.2f"
 msgstr ""
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -9765,19 +9850,19 @@ msgid ""
 "in the run queue over the last 1, 5 and 15 minutes."
 msgstr ""
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
 "an uninterruptible sleep state also contribute to the load average.\n"
 msgstr ""
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr ""
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
diff --git a/po/ko.gmo b/po/ko.gmo
index 09a26396..8918d2a5 100644
--- a/po/ko.gmo
+++ b/po/ko.gmo
diff --git a/po/ko.po b/po/ko.po
index 7721c963..90924cdb 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU textutils 2.0.22\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
 "PO-Revision-Date: 2002-07-22 20:02+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <translation-team-ko@lists.sourceforge.net>\n"
@@ -35,77 +35,124 @@ msgstr "올바른 ��는:"
 msgid "error closing file"
 msgstr "파� `%s'�(를) 만듦\n"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "쓰기 오류"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, fuzzy, c-format
 msgid "preserving permissions for %s"
 msgstr "%s� 허가를 바꿀 수 없습니다"
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "알 수 없는 시스템 오류"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "�반 빈 파�"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "�반 파�"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "디렉토리"
 
-#: lib/file-type.c:44
-msgid "block special file"
-msgstr "블� 특수 파�"
-
-#: lib/file-type.c:47
-msgid "character special file"
-msgstr "문� 특수 파�"
-
-#: lib/file-type.c:50
-msgid "fifo"
-msgstr "FIFO"
-
-#: lib/file-type.c:53
+#: lib/file-type.c:46
 msgid "symbolic link"
 msgstr "심볼릭 ��"
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "소켓"
-
-#: lib/file-type.c:59
+#: lib/file-type.c:52
 msgid "message queue"
 msgstr "메세지 �"
 
-#: lib/file-type.c:62
+#: lib/file-type.c:55
 msgid "semaphore"
 msgstr "세마�어"
 
-#: lib/file-type.c:65
+#: lib/file-type.c:58
 msgid "shared memory object"
 msgstr "공유 메모리 오브�트"
 
-#: lib/file-type.c:68
+#: lib/file-type.c:61
 #, fuzzy
 msgid "typed memory object"
 msgstr "공유 메모리 오브�트"
 
-#: lib/file-type.c:70
+#: lib/file-type.c:66
+msgid "block special file"
+msgstr "블� 특수 파�"
+
+#: lib/file-type.c:69
+msgid "character special file"
+msgstr "문� 특수 파�"
+
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr ""
+
+#: lib/file-type.c:75
+msgid "fifo"
+msgstr "FIFO"
+
+#: lib/file-type.c:78
+msgid "door"
+msgstr ""
+
+#: lib/file-type.c:81
+#, fuzzy
+msgid "multiplexed block special file"
+msgstr "블� 특수 파�"
+
+#: lib/file-type.c:84
+#, fuzzy
+msgid "multiplexed character special file"
+msgstr "문� 특수 파�"
+
+#: lib/file-type.c:87
+msgid "multiplexed file"
+msgstr ""
+
+#: lib/file-type.c:90
+#, fuzzy
+msgid "named file"
+msgstr "괴�한 파�"
+
+#: lib/file-type.c:93
+#, fuzzy
+msgid "network special file"
+msgstr "블� 특수 파�"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr ""
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr ""
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr ""
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "소켓"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr ""
+
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "괴�한 파�"
 
@@ -245,18 +292,18 @@ msgstr "%s: `-W %s' 옵션� �수를 허용하지 않습니다\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: `%s' 옵션� �수가 필요합니다\n"
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr "%s� 허가를 바꿀 수 없습니다"
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "%s 디렉토리를 만들 수 없습니다"
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr "메모리가 바닥남"
@@ -379,7 +426,7 @@ msgstr "정규� �색� 오류 발�"
 msgid "Unmatched ) or \\)"
 msgstr ""
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 #, fuzzy
 msgid "No previous regular expression"
 msgstr "정규� �색� 오류 발�"
@@ -405,7 +452,7 @@ msgstr ""
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[yY]"
 
@@ -415,11 +462,11 @@ msgstr "^[yY]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, fuzzy, c-format
 msgid "setting permissions for %s"
 msgstr "%s� 허가를 바꿀 수 없습니다"
@@ -567,18 +614,6 @@ msgstr "파� 열기 실패"
 msgid "Resource lost"
 msgstr ""
 
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, fuzzy, c-format
-msgid "cannot create pipe"
-msgstr "%s 디렉토리를 만들 수 없습니다"
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, fuzzy, c-format
-msgid "%s subprocess failed"
-msgstr "파� 닫기 실패"
-
 #: lib/strsignal.c:114
 #, c-format
 msgid "Real-time signal %d"
@@ -768,7 +803,7 @@ msgstr ""
 "\n"
 "<%s>(으)로 버그를 알려 주십시오.\n"
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr ""
@@ -778,30 +813,10 @@ msgstr ""
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr ""
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr ""
 
-#: lib/w32spawn.h:43
-#, fuzzy, c-format
-msgid "_open_osfhandle failed"
-msgstr "파� 열기 실패"
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr ""
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr ""
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr ""
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr ""
@@ -824,7 +839,7 @@ msgstr "알 수 없는 시스템 오류"
 msgid "failed to reopen %s with mode %s"
 msgstr "%s� 그룹� %s로 바꾸는� 실패했습니다\n"
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr "문�열 비�가 실패했습니다"
@@ -865,15 +880,11 @@ msgid "Simon Josefsson"
 msgstr ""
 
 #: src/base64.c:60
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
 "Base64 encode or decode FILE, or standard input, to standard output.\n"
 msgstr ""
-"사용법: %s [<옵션>] [<파�>]...\n"
-" 혹�:  %s [<옵션>] --check [<파�>]\n"
-"%s (%d비트) 체�섬� 표시하거나 검사합니다.\n"
-"<파�>� 주어지지 않거나, <파�>� `-'�면, 표준 입력� �습니다.\n"
 
 #: src/base64.c:67
 msgid ""
@@ -885,7 +896,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -902,48 +913,47 @@ msgid ""
 "from any other non-alphabet bytes in the encoded stream.\n"
 msgstr ""
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "�기 오류"
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, fuzzy, c-format
 msgid "invalid input"
 msgstr "부�절한 숫�"
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, fuzzy, c-format
 msgid "invalid wrap size: %s"
 msgstr "부�절한 타입� 문�열 `%s'"
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, fuzzy, c-format
 msgid "extra operand %s"
 msgstr "불필요한 피연산� `%s'"
 
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, fuzzy, c-format
 msgid "closing standard input"
 msgstr "표준 입력"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -971,8 +981,8 @@ msgstr ""
 #: src/basename.c:60
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/basename.c:67
@@ -986,33 +996,32 @@ msgid ""
 "  %s -a any/str1 any/str2   -> \"str1\" followed by \"str2\"\n"
 msgstr ""
 
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, fuzzy, c-format
 msgid "missing operand"
 msgstr "%s: `%c' 뒤� 정수가 와야함"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 #, fuzzy
 msgid "Richard M. Stallman"
 msgstr "Torbjorn Granlund 그리고 Richard M. Stallman"
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1065,7 +1074,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr "`%s'�서 ioctl� 할 수 없습니다"
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr "표준 출력"
@@ -1082,15 +1091,15 @@ msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 #, fuzzy
 msgid "Jim Meyering"
 msgstr "Mike Haertel 그리고 Paul Eggert"
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, fuzzy, c-format
 msgid "failed to create security context: %s"
 msgstr "%s� 시간� 유지합니다"
@@ -1100,8 +1109,8 @@ msgstr "%s� 시간� 유지합니다"
 msgid "failed to set %s security context component to %s"
 msgstr ""
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, fuzzy, c-format
 msgid "failed to get security context of %s"
 msgstr "%s� 시간� 유지합니다"
@@ -1111,18 +1120,18 @@ msgstr "%s� 시간� 유지합니다"
 msgid "can't apply partial context to unlabeled file %s"
 msgstr ""
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, fuzzy, c-format
 msgid "failed to change context of %s to %s"
 msgstr "%s� 허가를 바꿀 수 없습니다"
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, fuzzy, c-format
 msgid "cannot access %s"
 msgstr "`%s'� chown� 실행할 수 없습니다"
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, fuzzy, c-format
 msgid "cannot read directory %s"
 msgstr "%s 디렉토리를 만들 수 없습니다"
@@ -1132,13 +1141,14 @@ msgstr "%s 디렉토리를 만들 수 없습니다"
 msgid "changing security context of %s\n"
 msgstr "%s� 허가를 바꿀 수 없습니다"
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, fuzzy, c-format
 msgid "fts_read failed"
 msgstr "파� �기 실패"
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, fuzzy, c-format
 msgid "fts_close failed"
 msgstr "파� 닫기 실패"
@@ -1156,7 +1166,7 @@ msgstr ""
 
 #: src/chcon.c:357
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
@@ -1177,7 +1187,7 @@ msgid ""
 "  -l, --range=RANGE      set range RANGE in the target security context\n"
 msgstr ""
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
 "      --preserve-root    fail to operate recursively on '/'\n"
@@ -1213,36 +1223,37 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr ""
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr ""
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, fuzzy, c-format
 msgid "missing operand after %s"
 msgstr "%s: `%c' 뒤� 정수가 와야함"
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, fuzzy, c-format
 msgid "invalid context: %s"
 msgstr "부�절한 � 옵션 `%s'"
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr ""
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, fuzzy, c-format
 msgid "failed to get attributes of %s"
 msgstr "%s� 시간� 유지합니다"
@@ -1268,12 +1279,26 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
+#, fuzzy
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
 "  -v, --verbose          output a diagnostic for every file processed\n"
 msgstr ""
+"� FILE� 모드를 MODE로 변경합니다.\n"
+"\n"
+"  -c, --changes           verbose와 같지만 변경할때만 알립니다\n"
+"  -f, --silent, --quiet   대부분� �러메시지를 내지 않게 합니다\n"
+"  -v, --verbose           처리�는 모든 파�� 대해 진단 메시지를 출력합니"
+"다\n"
+"      --reference=RFILE   MODE 값 대신 RFILE� 모드값� 사용합니다\n"
+"  -R, --recursive         파�과 서브디렉토리까지 변경합니다\n"
+"      --help              � �움�� 표시하고 종료합니다\n"
+"      --version           버전 정보를 표시하고 종료합니다\n"
+"\n"
+"� MODE는 하나 ��� u,g,o,a문� 다�� +,-,=중� 하나� 기호와\n"
+"그 다�� r,w,x,X,s,t,u,g,o중 하나� 문�로 구성�니다.\n"
 
 #: src/chgrp.c:128 src/chown.c:99
 #, fuzzy
@@ -1301,47 +1326,47 @@ msgid ""
 "  %s -hR staff /u  Change the group of /u and subfiles to \"staff\".\n"
 msgstr ""
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, fuzzy, c-format
 msgid "getting new attributes of %s"
 msgstr "%s� 시간� 유지합니다"
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr "심볼릭 �� %s�, �를 가리치는 �래 파�� 변경�지 않았습니다\n"
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, fuzzy, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr "%s� 모드를 %04lo(%s)으로 변경하였습니다\n"
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, fuzzy, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr "%s� 모드를 %04lo(%s)으로 변경하는� 실패하였습니다\n"
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr "%s� 모드를 %04lo(%s)으로 유지하였습니다\n"
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, fuzzy, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr "%s 디렉토리를 만들 수 없습니다"
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, fuzzy, c-format
 msgid "changing permissions of %s"
 msgstr "%s� 허가를 바꿀 수 없습니다"
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, fuzzy, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr "%s� 허가를 바꿀 수 없습니다"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1352,33 +1377,33 @@ msgstr ""
 "  �는: %s [옵션]... 8진수-MODE FILE...\n"
 "  �는: %s [옵션]... --reference=RFILE FILE...\n"
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 msgid ""
 "Change the mode of each FILE to MODE.\n"
 "With --reference, change the mode of each FILE to that of RFILE.\n"
 "\n"
 msgstr ""
 
-#: src/chmod.c:391
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr ""
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 msgid ""
 "\n"
 "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n"
 msgstr ""
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr ""
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, fuzzy, c-format
 msgid "invalid mode: %s"
 msgstr "부�절한 �: `%s'"
@@ -1506,26 +1531,21 @@ msgid ""
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr ""
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, fuzzy, c-format
 msgid "invalid group %s"
 msgstr "잘못� 그룹"
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, fuzzy, c-format
 msgid "invalid group list %s"
 msgstr "잘못� 그룹"
 
-#: src/chroot.c:117
-#, fuzzy, c-format
-msgid "failed to set additional groups"
-msgstr "%s� 시간� 유지합니다"
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
@@ -1534,46 +1554,60 @@ msgstr ""
 "사용법: %s [<파�>]...\n"
 " 혹�:  %s [<옵션>]\n"
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
 msgstr ""
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
 msgstr ""
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 msgid ""
 "\n"
 "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n"
 msgstr ""
 
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, fuzzy, c-format
 msgid "cannot change root directory to %s"
 msgstr "%s 디렉토리로 chdir할 수 없습니다"
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, fuzzy, c-format
 msgid "cannot chdir to root directory"
 msgstr "%s 디렉토리로 chdir할 수 없습니다"
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr ""
+
+#: src/chroot.c:383
+#, fuzzy, c-format
+msgid "failed to get supplemental groups"
+msgstr "null 그룹으로 바꿀 수 없습니다"
+
+#: src/chroot.c:395
+#, fuzzy, c-format
+msgid "failed to %s supplemental groups"
+msgstr "null 그룹으로 바꿀 수 없습니다"
+
+#: src/chroot.c:402
 #, fuzzy, c-format
 msgid "failed to set group-ID"
 msgstr "사용�와 그룹� 모� �략할 수는 없습니다"
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, c-format
 msgid "failed to set user-ID"
 msgstr ""
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, fuzzy, c-format
 msgid "failed to run command %s"
 msgstr "%s� 시간� 유지합니다"
@@ -1605,7 +1639,7 @@ msgstr ""
 "� <파�>� 대해 CRC 체�섬과 바�트 개수를 출력합니다.\n"
 "\n"
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr "사용법: %s [<옵션>]... <파�1> <파�2>\n"
@@ -1678,294 +1712,327 @@ msgstr ""
 msgid "empty %s not allowed"
 msgstr ""
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr "%s�(를) �는 �중 오류 발�"
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, fuzzy, c-format
 msgid "cannot lseek %s"
 msgstr "%s: 오프셋 %s%s로(으로) 갈 수 없습니다"
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr "%s� 쓰는 �중 오류 발�"
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, fuzzy, c-format
 msgid "%s: failed to get extents info"
 msgstr "%s� 시간� 유지합니다"
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, fuzzy, c-format
 msgid "%s: write failed"
 msgstr "파� 쓰기 실패"
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, fuzzy, c-format
 msgid "failed to extend %s"
 msgstr "%s� 시간� 유지합니다"
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, fuzzy, c-format
 msgid "clearing permissions for %s"
 msgstr "%s� 허가를 바꿀 수 없습니다"
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, fuzzy, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "%s� 소유권� 유지합니다"
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, fuzzy, c-format
 msgid "failed to lookup file %s"
 msgstr "%s� 시간� 유지합니다"
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, fuzzy, c-format
 msgid "failed to preserve authorship for %s"
 msgstr "%s� 소유권� 유지합니다"
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
+#, fuzzy, c-format
+msgid "failed to set default file creation context to %s"
+msgstr "%s� 시간� 유지합니다"
+
+#: src/copy.c:820
+#, fuzzy, c-format
+msgid "failed to set default file creation context for %s"
+msgstr "%s� 시간� 유지합니다"
+
+#: src/copy.c:846
+#, fuzzy, c-format
+msgid "failed to set the security context of %s"
+msgstr "%s� 시간� 유지합니다"
+
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, fuzzy, c-format
 msgid "cannot open %s for reading"
 msgstr "`%s'를 `%s'로 ��할 수 없습니다"
 
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, fuzzy, c-format
 msgid "cannot fstat %s"
 msgstr "`%s'� 정보(stat)를 얻� 수 없습니다"
 
-#: src/copy.c:820
+#: src/copy.c:935
 #, c-format
 msgid "skipping file %s, as it was replaced while being copied"
 msgstr ""
 
-#: src/copy.c:850
-#, c-format
-msgid "failed to get file system create context"
-msgstr ""
-
-#: src/copy.c:864
-#, fuzzy, c-format
-msgid "failed to set the security context of %s to %s"
-msgstr "%s� 그룹� %s로 바꾸는� 실패했습니다\n"
-
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, fuzzy, c-format
 msgid "cannot remove %s"
 msgstr "%s 디렉토리를 만들 수 없습니다"
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, fuzzy, c-format
 msgid "removed %s\n"
 msgstr "%s를 지�니다\n"
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr ""
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, fuzzy, c-format
 msgid "cannot create regular file %s"
 msgstr "임시 파�� 만들 수 없습니다"
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, fuzzy, c-format
 msgid "failed to clone %s from %s"
 msgstr "%s� 그룹� %s로 바꾸는� 실패했습니다\n"
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr "%s� 시간� 유지합니다"
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
 #, fuzzy, c-format
 msgid "failed to close %s"
 msgstr "%s� 시간� 유지합니다"
 
-#: src/copy.c:1471
+#: src/copy.c:1580
 #, fuzzy, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
 msgstr "%s: `%s'� 모드 %04lo으로 겹�쓰겠습니까? "
 
-#: src/copy.c:1478
+#: src/copy.c:1581
+#, c-format
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr ""
+
+#: src/copy.c:1588
 #, fuzzy, c-format
 msgid "%s: overwrite %s? "
 msgstr "%s: `%s'를 겹��니까? "
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr " (백업: %s)"
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr ""
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, fuzzy, c-format
 msgid "cannot create hard link %s to %s"
 msgstr "%s 디렉토리를 만들 수 없습니다"
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, fuzzy, c-format
 msgid "cannot stat %s"
 msgstr "%s 디렉토리를 만들 수 없습니다"
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, fuzzy, c-format
 msgid "omitting directory %s"
 msgstr "%s 디렉토리를 만들 수 없습니다"
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr ""
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, fuzzy, c-format
 msgid "%s and %s are the same file"
 msgstr "`%s'와 `%s'는 같� 파�입니다"
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, fuzzy, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr "%s 디렉토리로 chdir할 수 없습니다"
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, fuzzy, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr "%s: 디렉토리가 아닌 곳� 디렉토리를 겹�쓸 수 없습니다"
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, fuzzy, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr "%s 디렉토리를 만들 수 없습니다"
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, fuzzy, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr "%s 디렉토리로 chdir할 수 없습니다"
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, fuzzy, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr "`%s'� 백업� �래 파�� ��할 것입니다; `%s'는 ���지 않습니다"
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, fuzzy, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr "`%s'� 백업� �래 파�� ��할 것입니다; `%s'는 복사�지 않습니다"
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, fuzzy, c-format
 msgid "cannot backup %s"
 msgstr "`%s'를 백업할 수 없습니다"
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, fuzzy, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr "%s: 디렉토리가 아닌 곳� 디렉토리를 겹�쓸 수 없습니다"
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, fuzzy, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr "%s 디렉토리를 만들 수 없습니다"
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, fuzzy, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr "%s 디렉토리로 chdir할 수 없습니다"
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, fuzzy, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr "%s 디렉토리로 chdir할 수 없습니다"
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, fuzzy, c-format
 msgid "cannot move %s to %s"
 msgstr "`%s'�서 ioctl� 할 수 없습니다"
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr ""
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, fuzzy, c-format
-msgid "failed to set default file creation context to %s"
-msgstr "%s� 시간� 유지합니다"
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, fuzzy, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr "%s: 심볼릭 ��� 사��� 복사할 수 없습니다"
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr "%s: 현재 디렉토리 안�서만 �대�� 심볼릭 ��를 만들 수 있습니다"
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, fuzzy, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr "%s 디렉토리를 만들 수 없습니다"
 
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, fuzzy, c-format
 msgid "cannot create fifo %s"
 msgstr "%s 디렉토리를 만들 수 없습니다"
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, fuzzy, c-format
 msgid "cannot create special file %s"
 msgstr "문� 특수 파�"
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, fuzzy, c-format
 msgid "cannot read symbolic link %s"
 msgstr "심볼릭 ��"
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, fuzzy, c-format
 msgid "cannot create symbolic link %s"
 msgstr "%s 디렉토리를 만들 수 없습니다"
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, fuzzy, c-format
 msgid "%s has unknown file type"
 msgstr "%s: 알 수 없는 파�형"
 
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, fuzzy, c-format
 msgid "cannot un-backup %s"
 msgstr "`%s'� 백업� ��릴 수 없습니다"
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr "%s -> %s (백업 해제)\n"
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr ""
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr ""
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, c-format
+msgid "unknown program %s"
+msgstr ""
+
+#: src/cp.c:157 src/mv.c:288
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -1976,11 +2043,11 @@ msgstr ""
 "  �는: %s [OPTION]... SOURCE... DIRECTORY\n"
 "  �는: %s -d [OPTION]... --target-directory=DIRECTORY SOURCE...\n"
 
-#: src/cp.c:162
+#: src/cp.c:163
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 
-#: src/cp.c:168
+#: src/cp.c:169
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
 "      --attributes-only        don't copy the file data, just the "
@@ -1994,7 +2061,7 @@ msgid ""
 "  -d                           same as --no-dereference --preserve=links\n"
 msgstr ""
 
-#: src/cp.c:177
+#: src/cp.c:178
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
 "                                 opened, remove it and try again (this "
@@ -2007,20 +2074,20 @@ msgid ""
 "  -H                           follow command-line symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:186
+#: src/cp.c:187
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
 "  -L, --dereference            always follow symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:190
+#: src/cp.c:191
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
 "                                 a previous -i option)\n"
 "  -P, --no-dereference         never follow symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:195
+#: src/cp.c:196
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
 "      --preserve[=ATTR_LIST]   preserve the specified attributes (default:\n"
@@ -2030,13 +2097,13 @@ msgid ""
 "                                 all\n"
 msgstr ""
 
-#: src/cp.c:203
+#: src/cp.c:204
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                use full source file name under DIRECTORY\n"
 msgstr ""
 
-#: src/cp.c:207
+#: src/cp.c:208
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
 "      --reflink[=WHEN]         control clone/CoW copies. See below\n"
@@ -2045,7 +2112,7 @@ msgid ""
 "force)\n"
 msgstr ""
 
-#: src/cp.c:213
+#: src/cp.c:214
 #, fuzzy
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
@@ -2091,7 +2158,7 @@ msgstr ""
 "--sparse=never�고 지정하면 성긴 파�� �성하지 못하게 합니다.\n"
 "\n"
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -2100,7 +2167,7 @@ msgid ""
 "  -T, --no-target-directory    treat DEST as a normal file\n"
 msgstr ""
 
-#: src/cp.c:224
+#: src/cp.c:225
 #, fuzzy
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
@@ -2127,7 +2194,15 @@ msgstr ""
 "      --version                버전 정보를 표시하고 종료합니다\n"
 "\n"
 
-#: src/cp.c:233
+#: src/cp.c:232
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/cp.c:240
 #, fuzzy
 msgid ""
 "\n"
@@ -2181,7 +2256,7 @@ msgstr ""
 "--sparse=never�고 지정하면 성긴 파�� �성하지 못하게 합니다.\n"
 "\n"
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 #, fuzzy
 msgid ""
 "\n"
@@ -2202,7 +2277,7 @@ msgstr ""
 "                  단순하게 합니다\n"
 "  simple, never   항� 단순 백업� 합니다\n"
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 #, fuzzy
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
@@ -2221,7 +2296,7 @@ msgstr ""
 "                  단순하게 합니다\n"
 "  simple, never   항� 단순 백업� 합니다\n"
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2232,220 +2307,230 @@ msgstr ""
 "특별한 경우로, 강제와 백업 옵션� 주어지며 SOURCE와 DEST가 �름� 같고,\n"
 "존재하는 �반 파�� 때 cp는 SOURCE� 백업� 만듭니다.\n"
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, fuzzy, c-format
 msgid "failed to preserve times for %s"
 msgstr "%s� 시간� 유지합니다"
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, fuzzy, c-format
 msgid "failed to preserve permissions for %s"
 msgstr "%s� 허가를 바꿀 수 없습니다"
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, fuzzy, c-format
 msgid "cannot make directory %s"
 msgstr "%s 디렉토리를 만들 수 없습니다"
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr "%s�(가) 존재하지만 디렉토리가 아닙니다"
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
 #, fuzzy, c-format
 msgid "failed to access %s"
-msgstr "%s� 시간� 유지합니다"
+msgstr "`%s'� chown� 실행할 수 없습니다"
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, fuzzy, c-format
 msgid "missing file operand"
 msgstr "�수를 건너 뜀"
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, fuzzy, c-format
 msgid "missing destination file operand after %s"
 msgstr "필드� 목�� 빠졌�"
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, fuzzy, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr "%s 디렉토리로 chdir할 수 없습니다"
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, fuzzy, c-format
 msgid "target %s is not a directory"
 msgstr "%s�(가) 존재하지만 디렉토리가 아닙니다"
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, fuzzy, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr "패스를 유지할 때 마지막 �수는 디렉토리여야 합니다"
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, c-format
 msgid "multiple target directories specified"
 msgstr ""
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr ""
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr "하드��와 심볼릭 ��를 �시� 만들 수 없습니다"
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, fuzzy, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr "--string과 --check 옵션� �호 배타�입니다"
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr ""
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr "백업 종류"
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, c-format
+msgid "cannot set target context and preserve it"
+msgstr ""
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr ""
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr ""
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr "입력� 사��"
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr "%s: 범위를 벗어난 행 번호"
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, fuzzy, c-format
 msgid "%s: %s: line number out of range"
 msgstr "%s: `%s': 범위를 벗어난 행 번호"
 
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, fuzzy, c-format
 msgid " on repetition %s\n"
 msgstr " %d 번째 반복중\n"
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, fuzzy, c-format
 msgid "%s: %s: match not found"
 msgstr "%s: `%s': 맞는 �� 찾지 못했�"
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr "정규� �색� 오류 발�"
 
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, fuzzy, c-format
 msgid "write error for %s"
 msgstr "`%s'� 쓰기 오류"
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, fuzzy, c-format
 msgid "%s: integer expected after delimiter"
 msgstr "%s: `%c' 뒤� 정수가 와야함"
 
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, fuzzy, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr "%s: 반복 횟수� `}'가 필요합니다"
 
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, fuzzy, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr "%s}: `{'과 `}' 사�� 정수가 필요함"
 
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, fuzzy, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr "%s: 닫는 구분� `%c'�(가) 없습니다"
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr "%s: 부�절한 정규�: %s"
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr "%s: 부�절한 패턴"
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr "%s: 행번호는 �보다 커야 합니다"
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, fuzzy, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr "행번호 `%s'�(가) 앞선 행번호 %s보다 작습니다"
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, fuzzy, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr "경고: 행번호 `%s'�(가) 앞선 행번호와 같습니다"
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr "접미사� 변환 지정�가 빠졌�"
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr "접미사� 부�절한 변환 지정�: %c"
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr "접미사� 부�절한 변환 지정�: \\%.3o"
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, fuzzy, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr "접미사� 부�절한 변환 지정�: %c"
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr "접미사� %% 변환 지정�가 너무 많�"
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr "접미사� %% 변환 지정�가 빠졌�"
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr "%s: 부�절한 숫�"
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr "사용법: %s [<옵션>]... <파�> <패턴>...\n"
 
-#: src/csplit.c:1455
+#: src/csplit.c:1483
 #, fuzzy
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
@@ -2455,7 +2540,7 @@ msgstr ""
 "ì—�\n"
 "출력하고, � 조�들� 바�트 수를 표준 출력으로 출력합니다.\n"
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, fuzzy, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2466,7 +2551,11 @@ msgstr ""
 "  -f, --prefix=<접�어>      `xx' 대신� <접�어>를 �니다\n"
 "  -k, --keep-files           오류 발�시�� 출력 파�들� 지우지 않습니다\n"
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr ""
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
@@ -2476,7 +2565,7 @@ msgstr ""
 "  -s, --quiet, --silent      출력 파�� �기를 표시하지 않습니다\n"
 "  -z, --elide-empty-files    빈 출력 파�� 지�니다\n"
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
@@ -2485,7 +2574,7 @@ msgstr ""
 "<파�>� `-'�면 표준 입력� �습니다.  � <패턴>�는 다�� 쓸 수 있습니"
 "다:\n"
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 #, fuzzy
 msgid ""
 "\n"
@@ -2511,23 +2600,19 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr ""
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr ""
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, fuzzy, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr "사용법: %s [<옵션>]... [<파�>]...\n"
 
-#: src/cut.c:193
+#: src/cut.c:176
 #, fuzzy
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr ""
 "� <파�>�서 선�한 줄들만 표준 출력� 표시합니다.\n"
 "\n"
 
-#: src/cut.c:199
+#: src/cut.c:182
 #, fuzzy
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
@@ -2538,7 +2623,7 @@ msgstr ""
 "  -c, --characters=<리스트>  � 문�들만� 표시합니다\n"
 "  -d, --delimiter=<구분�>  필드 구분�로 탭 대신� <구분�>를 �니다\n"
 
-#: src/cut.c:204
+#: src/cut.c:187
 #, fuzzy
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
@@ -2551,7 +2636,7 @@ msgstr ""
 "                            출력합니다\n"
 "  -n                      (무시�)\n"
 
-#: src/cut.c:210
+#: src/cut.c:193
 #, fuzzy
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
@@ -2561,7 +2646,7 @@ msgstr ""
 "로\n"
 "                            출력합니다\n"
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
@@ -2571,7 +2656,7 @@ msgstr ""
 "      --output-delimiter=<문�열>  <문�열>� 출력 구분�로 사용합니다\n"
 "                            기본값� 입력 구분�로 사용하는 것입니다\n"
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2579,7 +2664,7 @@ msgid ""
 "in the same order that it is read, and is written exactly once.\n"
 msgstr ""
 
-#: src/cut.c:227
+#: src/cut.c:210
 #, fuzzy
 msgid ""
 "Each range is one of:\n"
@@ -2602,50 +2687,54 @@ msgstr ""
 "\n"
 "<파�>� 주어지지 않거나, <파�>� `-'�면, 표준 입력� �습니다.\n"
 
-#: src/cut.c:367 src/cut.c:493
+#: src/cut.c:300 src/cut.c:394
 #, fuzzy
 msgid "invalid byte, character or field list"
 msgstr "부�절한 바�트나 필드 목�"
 
-#: src/cut.c:387
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr ""
+
+#: src/cut.c:320
 #, fuzzy
 msgid "invalid range with no endpoint: -"
 msgstr "부�절한 � 옵션 `%s'"
 
-#: src/cut.c:403
+#: src/cut.c:334
 #, fuzzy
 msgid "invalid decreasing range"
 msgstr "부�절한 타입� 문�열 `%s'"
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, fuzzy, c-format
 msgid "byte offset %s is too large"
 msgstr "%s�(는) 너무 �니다"
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, fuzzy, c-format
 msgid "field number %s is too large"
 msgstr "필드 개수가 0입니다"
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr "오� 한가지 형태� 목�만� 지정� 수 있습니다"
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr "구� 문�는 단� 문�여야 합니다"
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr "바�트, 문�, �는 필드로 � 목�� 지정해야 합니다"
 
-#: src/cut.c:850
+#: src/cut.c:790
 #, fuzzy
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr "필드� 대해 연산할 때�만 구� 문�가 지정� 수 있습니다"
 
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
@@ -2653,11 +2742,11 @@ msgstr ""
 "구분�가 없는 줄� 무시하는 것�\n"
 "\t필드� 관해 �작하는 경우�만 �치� 맞습니다"
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr "필드� 목�� 빠졌�"
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr "위치� 목�� 빠졌�"
 
@@ -2697,7 +2786,7 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 
 #: src/date.c:158
@@ -2829,10 +2918,10 @@ msgid ""
 "  $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n"
 msgstr ""
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr "표준 입력"
@@ -2870,7 +2959,7 @@ msgstr ""
 msgid "cannot set date"
 msgstr "`%s'� 정보(stat)를 얻� 수 없습니다"
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, fuzzy, c-format
 msgid "time %s is out of range"
 msgstr "%s: 범위를 벗어난 행 번호"
@@ -2881,7 +2970,7 @@ msgstr "%s: 범위를 벗어난 행 번호"
 msgid "Paul Rubin"
 msgstr ""
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
@@ -2890,7 +2979,7 @@ msgstr ""
 "사용법: %s [<파�>]...\n"
 " 혹�:  %s [<옵션>]\n"
 
-#: src/dd.c:526
+#: src/dd.c:532
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
 "\n"
@@ -2901,7 +2990,7 @@ msgid ""
 "  ibs=BYTES       read up to BYTES bytes at a time (default: 512)\n"
 msgstr ""
 
-#: src/dd.c:535
+#: src/dd.c:541
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
 "  iflag=FLAGS     read as per the comma separated symbol list\n"
@@ -2914,7 +3003,7 @@ msgid ""
 "                  'noxfer' suppresses transfer stats, 'none' suppresses all\n"
 msgstr ""
 
-#: src/dd.c:546
+#: src/dd.c:552
 msgid ""
 "\n"
 "N and BYTES may be followed by the following multiplicative suffixes:\n"
@@ -2925,7 +3014,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dd.c:555
+#: src/dd.c:561
 #, fuzzy
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
@@ -2950,7 +3039,7 @@ msgstr ""
 "  swab      입력하는 � 바�트� 순서를 바꿉니다\n"
 "  sync      ibs�기� 입력 레코드를 �기가 맞지 않으면 NUL로 채�니다\n"
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -2966,7 +3055,7 @@ msgstr ""
 "  fdatasync  physically write output file data before finishing\n"
 "  fsync     likewise, but also write metadata\n"
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -2975,76 +3064,76 @@ msgid ""
 "suggested)\n"
 msgstr ""
 
-#: src/dd.c:583
+#: src/dd.c:589
 msgid "  cio       use concurrent I/O for data\n"
 msgstr ""
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr ""
 
-#: src/dd.c:587
+#: src/dd.c:593
 #, fuzzy
 msgid "  directory  fail unless a directory\n"
 msgstr "%s�(가) 존재하지만 디렉토리가 아닙니다"
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr ""
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr ""
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr ""
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr ""
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr ""
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr ""
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr ""
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr ""
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr ""
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr ""
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr ""
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, c-format
 msgid ""
 "\n"
@@ -3061,28 +3150,38 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
 "%<PRIuMAX>+%<PRIuMAX> records out\n"
 msgstr ""
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, fuzzy, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
 msgstr[0] "잘린 레코드"
 msgstr[1] "잘린 레코드"
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr ""
 
@@ -3096,273 +3195,273 @@ msgstr ""
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
 msgstr ""
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, fuzzy, c-format
 msgid "closing input file %s"
 msgstr "파� `%s'�(를) 만듦\n"
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, fuzzy, c-format
 msgid "closing output file %s"
 msgstr "%s를 지�니다\n"
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr ""
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, fuzzy, c-format
 msgid "writing to %s"
 msgstr "%s� 쓰는 �중 오류 발�"
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, fuzzy, c-format
 msgid "unrecognized operand %s"
 msgstr "��할 수 없는 옵션 `-%c'"
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 #, fuzzy
 msgid "invalid conversion"
 msgstr "부�절한 � 옵션 `%s'"
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 #, fuzzy
 msgid "invalid input flag"
 msgstr "필드 처�� 부�절한 숫�"
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 #, fuzzy
 msgid "invalid output flag"
 msgstr "잘못� 그룹"
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 #, fuzzy
 msgid "invalid status flag"
 msgstr "잘못� 사용�"
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, fuzzy, c-format
 msgid "invalid number %s"
 msgstr "부�절한 숫�"
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr ""
 
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, fuzzy, c-format
 msgid "cannot combine block and unblock"
 msgstr "사용�와 그룹� 모� �략할 수는 없습니다"
 
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, fuzzy, c-format
 msgid "cannot combine lcase and ucase"
 msgstr "비�한 문�열� %s과(와) %s입니다."
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, fuzzy, c-format
 msgid "cannot combine excl and nocreat"
 msgstr "%s� 대한 파� ��터를 재위치할 수 없습니다"
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, fuzzy, c-format
 msgid "cannot combine direct and nocache"
 msgstr "%s� 대한 파� ��터를 재위치할 수 없습니다"
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
 "  of mt_type=0x%0lx -- see <sys/mtio.h> for the list of types"
 msgstr ""
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, fuzzy, c-format
 msgid "%s: cannot skip"
 msgstr "%s: �아갈 수 없습니다"
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, fuzzy, c-format
 msgid "%s: cannot seek"
 msgstr "%s: 지울 수 없습니다"
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr ""
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, fuzzy, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr "경고: 부�절한 � %lu; 대신 %d�(를) 사용함"
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr ""
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, fuzzy, c-format
 msgid "setting flags for %s"
 msgstr "%s� 시간� 유지합니다"
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, fuzzy, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr "%s: �대 오프셋 %s%s로(으로) 갈 수 없습니다"
 
-#: src/dd.c:2133
+#: src/dd.c:2172
 #, fuzzy, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
 msgstr "%s를 지�니다\n"
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr ""
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
 msgstr ""
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, fuzzy, c-format
 msgid "failed to open %s"
 msgstr "%s� 시간� 유지합니다"
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
 "blocks"
 msgstr ""
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, fuzzy, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr "%s를 지�니다\n"
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, fuzzy, c-format
 msgid "failed to discard cache for: %s"
 msgstr "%s� 시간� 유지합니다"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr ""
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr ""
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr ""
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr ""
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr ""
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr ""
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr ""
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr ""
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr ""
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr ""
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr ""
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr ""
 
-#: src/df.c:383
-#, c-format
-msgid "option --output: field '%s' unknown"
+#: src/df.c:207
+msgid "File"
 msgstr ""
 
-#: src/df.c:390
+#: src/df.c:387
+#, fuzzy, c-format
+msgid "option --output: field %s unknown"
+msgstr "%s를 지�니다\n"
+
+#: src/df.c:394
 #, c-format
-msgid "option --output: field '%s' used more than once"
+msgid "option --output: field %s used more than once"
 msgstr ""
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr ""
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr ""
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr ""
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
 msgstr ""
 
-#: src/df.c:1210
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr ""
+
+#: src/df.c:1384
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
 "or all file systems by default.\n"
 msgstr ""
 
-#: src/df.c:1217
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
 
-#: src/df.c:1227
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -3371,7 +3470,7 @@ msgid ""
 "(default)\n"
 msgstr ""
 
-#: src/df.c:1234
+#: src/df.c:1409
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
 "                               or print all fields if FIELD_LIST is "
@@ -3384,43 +3483,34 @@ msgid ""
 "  -v                    (ignored)\n"
 msgstr ""
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
 
-#: src/df.c:1285
+#: src/df.c:1460
 #, fuzzy, c-format
 msgid "options %s and %s are mutually exclusive"
 msgstr "--string과 --check 옵션� �호 배타�입니다"
 
-#: src/df.c:1335
-#, fuzzy
-msgid "warning: "
-msgstr "경고: "
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr ""
-
-#: src/df.c:1442
+#: src/df.c:1610
 #, fuzzy, c-format
 msgid "file system type %s both selected and excluded"
 msgstr "파�시스템 `%s'를 �시� 선�하고 제외할 수 없습니다"
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr "경고: "
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 #, fuzzy
 msgid "cannot read table of mounted file systems"
 msgstr "%s: 마운트� 파�시스템� 테�블� �� 수 없습니다"
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr ""
@@ -3430,7 +3520,7 @@ msgstr ""
 msgid "H. Peter Anvin"
 msgstr ""
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr "사용법: %s [<옵션>]... [<파�>]...\n"
@@ -3514,7 +3604,7 @@ msgstr ""
 
 #: src/dirname.c:59
 #, fuzzy
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
 msgstr "  -z, --zero-terminated     줄� �� 줄바꿈 대신 바�트 0� �니다\n"
 
 #: src/dirname.c:64
@@ -3527,7 +3617,7 @@ msgid ""
 "  %s stdio.h            -> \".\"\n"
 msgstr ""
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -3536,14 +3626,13 @@ msgstr ""
 "사용법: %s [<옵션>]... [<파�>]...\n"
 "  �는: %s --traditional [<파�>] [[+]<옵셋> [[+]<레�블>]]\n"
 
-#: src/du.c:274
+#: src/du.c:285
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr ""
 
-#: src/du.c:280
+#: src/du.c:291
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3552,11 +3641,11 @@ msgid ""
 "                          fragmentation, indirect blocks, and the like\n"
 msgstr ""
 
-#: src/du.c:289
+#: src/du.c:300
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3568,17 +3657,18 @@ msgid ""
 "                          --summarize\n"
 msgstr ""
 
-#: src/du.c:302
+#: src/du.c:313
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
 
-#: src/du.c:310
+#: src/du.c:322
 msgid ""
 "  -k                    like --block-size=1K\n"
 "  -L, --dereference     dereference all symbolic links\n"
@@ -3586,16 +3676,17 @@ msgid ""
 "  -m                    like --block-size=1M\n"
 msgstr ""
 
-#: src/du.c:316
+#: src/du.c:328
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
 
-#: src/du.c:322
+#: src/du.c:334
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
 "                          or entries greater than SIZE if negative\n"
@@ -3604,78 +3695,78 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
 msgstr ""
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
 "  -x, --one-file-system    skip directories on different file systems\n"
 msgstr ""
 
-#: src/du.c:386
+#: src/du.c:398
 msgid "Infinity"
 msgstr ""
 
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr ""
-
-#: src/du.c:624
+#: src/du.c:636
 #, fuzzy, c-format
 msgid "fts_read failed: %s"
 msgstr "파� �기 실패"
 
-#: src/du.c:780
+#: src/du.c:787
 #, fuzzy, c-format
 msgid "invalid maximum depth %s"
 msgstr "부�절한 �: `%s'"
 
-#: src/du.c:809
+#: src/du.c:816
 #, fuzzy, c-format
 msgid "invalid --threshold argument '-0'"
-msgstr "%2$s� 대해 부�절한 �� %1$s"
+msgstr "부�절한 행번호 �가: `%s'"
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr "모든 디렉토리 내용� 표시하면서 요약할 수는 없습니다"
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr "경고: 요약� --max-depth=0� 사용하는 것과 같습니다"
 
-#: src/du.c:900
+#: src/du.c:911
 #, fuzzy, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr "경고: --max-depth=%d는 요약 옵션과 충�합니다"
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 msgid "file operands cannot be combined with --files0-from"
 msgstr ""
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr "%s: �기 오류"
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr ""
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 #, fuzzy
 msgid "invalid zero-length file name"
 msgstr "잘못� 그룹"
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr "합계"
 
@@ -3762,7 +3853,7 @@ msgstr ""
 #: src/env.c:61
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
 
@@ -3838,16 +3929,16 @@ msgid "input line is too long"
 msgstr "%s: 파�� 너무 �니다"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr ""
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, fuzzy, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
@@ -3856,7 +3947,7 @@ msgstr ""
 "사용법: %s [<파�>]...\n"
 " 혹�:  %s [<옵션>]\n"
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -3867,7 +3958,7 @@ msgid ""
 "  ARG1 & ARG2       ARG1 if neither argument is null or 0, otherwise 0\n"
 msgstr ""
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -3878,14 +3969,14 @@ msgid ""
 "  ARG1 > ARG2       ARG1 is greater than ARG2\n"
 msgstr ""
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
 "  ARG1 - ARG2       arithmetic difference of ARG1 and ARG2\n"
 msgstr ""
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -3894,7 +3985,7 @@ msgid ""
 "  ARG1 % ARG2       arithmetic remainder of ARG1 divided by ARG2\n"
 msgstr ""
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -3905,7 +3996,7 @@ msgid ""
 "  length STRING              length of STRING\n"
 msgstr ""
 
-#: src/expr.c:251
+#: src/expr.c:250
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
 "                               keyword like 'match' or an operator like '/'\n"
@@ -3913,7 +4004,7 @@ msgid ""
 "  ( EXPRESSION )             value of EXPRESSION\n"
 msgstr ""
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -3923,7 +4014,7 @@ msgid ""
 "0.\n"
 msgstr ""
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -3931,32 +4022,32 @@ msgid ""
 "or 0, 2 if EXPRESSION is syntactically invalid, and 3 if an error occurred.\n"
 msgstr ""
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, fuzzy, c-format
 msgid "syntax error"
 msgstr "표준 오류"
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, fuzzy, c-format
 msgid "error in regular expression matcher"
 msgstr "정규� �색� 오류 발�"
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, fuzzy, c-format
 msgid "non-integer argument"
 msgstr "�수 제한"
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr ""
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, fuzzy, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr "� 문제를 피해 가려면 LC_ALL='C'하십시오."
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, fuzzy, c-format
 msgid "the strings compared were %s and %s"
 msgstr "비�한 문�열� %s과(와) %s입니다."
@@ -3966,27 +4057,27 @@ msgstr "비�한 문�열� %s과(와) %s입니다."
 msgid "Niels Moller"
 msgstr ""
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
 msgstr ""
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
 msgstr ""
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, fuzzy, c-format
 msgid "%s is not a valid positive integer"
 msgstr "%s: 부�절한 패턴"
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr "%s�(는) 너무 �니다"
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
@@ -3995,7 +4086,7 @@ msgstr ""
 "사용법: %s [<파�>]...\n"
 " 혹�:  %s [<옵션>]\n"
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
 "are specified on the command line, read them from standard input.\n"
@@ -4103,28 +4194,28 @@ msgid "invalid number of columns: %s"
 msgstr "부�절한 열� 개수: `%s'"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr ""
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, fuzzy, c-format
 msgid "Usage: %s\n"
 msgstr "사용법: %s [<옵션>] [<파�>]...\n"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
 msgstr ""
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, fuzzy, c-format
 msgid "failed to get groups for user %s"
 msgstr "%s� 그룹� %s로 바꾸는� 실패했습니다\n"
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, fuzzy, c-format
 msgid "failed to get groups for the current process"
 msgstr "%s� 그룹� %s로 바꾸는� 실패했습니다\n"
@@ -4146,25 +4237,25 @@ msgid ""
 "the current process (which may differ if the groups database has changed).\n"
 msgstr ""
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, fuzzy, c-format
 msgid "cannot get real UID"
 msgstr "사용�와 그룹� 모� �략할 수는 없습니다"
 
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, fuzzy, c-format
 msgid "cannot get effective GID"
-msgstr "%s 디렉토리를 만들 수 없습니다"
+msgstr "한 가지 ��� 방법으로 분할할 수 없습니다"
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, fuzzy, c-format
 msgid "cannot get real GID"
 msgstr "사용�와 그룹� 모� �략할 수는 없습니다"
 
-#: src/groups.c:128 src/id.c:206
-#, fuzzy, c-format
+#: src/groups.c:128 src/id.c:246
+#, c-format
 msgid "%s: no such user"
-msgstr "%s: 부�절한 숫�"
+msgstr ""
 
 #: src/head.c:109
 #, fuzzy
@@ -4206,58 +4297,48 @@ msgid ""
 "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n"
 msgstr ""
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr ""
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, fuzzy, c-format
 msgid "%s: number of bytes is too large"
 msgstr "비�할 바�트� 개수가 부�절합니다"
 
-#: src/head.c:440
-#, fuzzy, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr "%s: �대 오프셋 %s%s로(으로) 갈 수 없습니다"
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, fuzzy, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr "%s: 오프셋 %s%s로(으로) 갈 수 없습니다"
 
-#: src/head.c:673
+#: src/head.c:423 src/tail.c:457
 #, fuzzy, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "%s: 파�� 너무 �니다"
-
-#: src/head.c:798
-#, c-format
-msgid "cannot reposition file pointer for %s"
-msgstr "%s� 대한 파� ��터를 재위치할 수 없습니다"
+msgid "%s: cannot seek to relative offset %s"
+msgstr "%s: �대 오프셋 %s%s로(으로) 갈 수 없습니다"
 
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr "%s: %s�(는) 너무 커서 표시할 수 없습니다"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr "행� 개수"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr "바�트 수"
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr "부�절한 행� 개수"
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr "%s: 부�절한 바�트 수"
 
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, fuzzy, c-format
 msgid "invalid trailing option -- %c"
 msgstr "%s: 부�절한 옵션 -- %c\n"
@@ -4295,145 +4376,161 @@ msgid "cannot determine hostname"
 msgstr "%s: �아갈 수 없습니다"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr ""
 
-#: src/id.c:81
+#: src/id.c:84
 #, fuzzy, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
-msgstr "사용법: %s [<옵션>]... <집합1> [<집합2>]\n"
+msgid "Usage: %s [OPTION]... [USER]\n"
+msgstr "사용법: %s [<옵션>]... [<파�>]...\n"
 
-#: src/id.c:82
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
 msgstr ""
 
-#: src/id.c:96
+#: src/id.c:90
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
+msgstr ""
+
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
 msgstr ""
 
-#: src/id.c:140
+#: src/id.c:151
+#, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr ""
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr ""
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr ""
 
-#: src/id.c:178
+#: src/id.c:198
 #, fuzzy, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr "한 가지 ��� 방법으로 분할할 수 없습니다"
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr ""
 
-#: src/id.c:199
+#: src/id.c:209
+#, c-format
+msgid "option --zero not permitted in default format"
+msgstr ""
+
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
 msgstr ""
 
-#: src/id.c:224
+#: src/id.c:265
 #, fuzzy, c-format
 msgid "cannot get effective UID"
-msgstr "%s 디렉토리를 만들 수 없습니다"
+msgstr "한 가지 ��� 방법으로 분할할 수 없습니다"
 
-#: src/id.c:311
+#: src/id.c:354
 #, fuzzy, c-format
 msgid "cannot find name for user ID %s"
 msgstr "%s� 소유� 그리고/혹� 그룹� 바꿀 수 없습니다"
 
-#: src/id.c:329
+#: src/id.c:372
 #, c-format
 msgid "uid=%s"
 msgstr ""
 
-#: src/id.c:334
+#: src/id.c:377
 #, c-format
 msgid " gid=%s"
 msgstr ""
 
-#: src/id.c:341
+#: src/id.c:384
 #, c-format
 msgid " euid=%s"
 msgstr ""
 
-#: src/id.c:349
+#: src/id.c:392
 #, c-format
 msgid " egid=%s"
 msgstr ""
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr ""
 
-#: src/id.c:393
+#: src/id.c:437
 #, c-format
 msgid " context=%s"
 msgstr ""
 
-#: src/install.c:373
+#: src/install.c:376
 #, fuzzy, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr "%s 디렉토리를 만들 수 없습니다"
 
-#: src/install.c:414
+#: src/install.c:417
 #, fuzzy, c-format
 msgid "creating directory %s"
 msgstr "%s 디렉토리를 만들 수 없습니다"
 
-#: src/install.c:482
+#: src/install.c:485
 #, fuzzy, c-format
 msgid "cannot change ownership of %s"
 msgstr "%s� 허가를 바꿀 수 없습니다"
 
-#: src/install.c:506
+#: src/install.c:509
 #, fuzzy, c-format
 msgid "cannot set time stamps for %s"
 msgstr "%s 디렉토리를 만들 수 없습니다"
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, fuzzy, c-format
 msgid "fork system call failed"
 msgstr "블� 특수 파�"
 
-#: src/install.c:531
+#: src/install.c:535
 #, fuzzy, c-format
 msgid "cannot run %s"
 msgstr "`%s'�서 ioctl� 할 수 없습니다"
 
-#: src/install.c:535
+#: src/install.c:539
 #, fuzzy, c-format
 msgid "waiting for strip"
 msgstr "%s� 쓰는 �중 오류 발�"
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr ""
 
-#: src/install.c:558
+#: src/install.c:565
 #, fuzzy, c-format
 msgid "invalid user %s"
 msgstr "잘못� 사용�"
 
-#: src/install.c:594
+#: src/install.c:601
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -4445,7 +4542,7 @@ msgstr ""
 "  �는: %s [OPTION]... SOURCE... DIRECTORY\n"
 "  �는: %s -d [OPTION]... --target-directory=DIRECTORY SOURCE...\n"
 
-#: src/install.c:601
+#: src/install.c:608
 msgid ""
 "\n"
 "This install program copies files (often just compiled) into destination\n"
@@ -4459,7 +4556,7 @@ msgid ""
 "In the 4th form, create all components of the given DIRECTORY(ies).\n"
 msgstr ""
 
-#: src/install.c:615
+#: src/install.c:622
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
 "  -b                  like --backup but does not accept an argument\n"
@@ -4471,7 +4568,7 @@ msgid ""
 "                        components of the specified directories\n"
 msgstr ""
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -4483,7 +4580,7 @@ msgid ""
 "  -o, --owner=OWNER   set ownership (super-user only)\n"
 msgstr ""
 
-#: src/install.c:631
+#: src/install.c:638
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
 "files\n"
@@ -4497,60 +4594,57 @@ msgid ""
 "  -v, --verbose       print the name of each directory as it is created\n"
 msgstr ""
 
-#: src/install.c:641
+#: src/install.c:648
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
 
-#: src/install.c:859
+#: src/install.c:696 src/unlink.c:86
+#, fuzzy, c-format
+msgid "cannot unlink %s"
+msgstr "`%s'�서 ioctl� 할 수 없습니다"
+
+#: src/install.c:877
 #, c-format
 msgid ""
 "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
 msgstr ""
 
-#: src/install.c:869
-#, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
-msgstr ""
-
-#: src/install.c:886
+#: src/install.c:917
 #, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr "strip옵션� 디렉토리를 설치할 때는 쓸 수 없습니다"
 
-#: src/install.c:889
+#: src/install.c:920
 #, fuzzy, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr "strip옵션� 디렉토리를 설치할 때는 쓸 수 없습니다"
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr ""
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, fuzzy, c-format
 msgid "invalid mode %s"
 msgstr "부�절한 �: `%s'"
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr ""
 
-#: src/install.c:959
+#: src/install.c:1001
 #, fuzzy, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr "--string과 --check 옵션� �호 배타�입니다"
 
-#: src/install.c:966
+#: src/install.c:1008
 #, fuzzy, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr "--string과 --check 옵션� �호 배타�입니다"
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -4564,7 +4658,7 @@ msgid "Mike Haertel"
 msgstr "Mike Haertel 그리고 Paul Eggert"
 
 # -a SIDE, -e EMPTY 재고려
-#: src/join.c:191
+#: src/join.c:195
 #, fuzzy
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
@@ -4583,7 +4677,7 @@ msgstr ""
 "  -a <사�드>       <사�드> 파��서 �� 지울 수 없는 줄� 출력합니다\n"
 "  -e <엠프티>       입력 필드가 없는 곳� <엠프티>를 �니다.\n"
 
-#: src/join.c:200
+#: src/join.c:204
 #, fuzzy
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
@@ -4598,7 +4692,7 @@ msgstr ""
 "  -o <형�>         출력 줄� 만들 때 <형�>� 따릅니다\n"
 "  -t <문�>         입력 � 출력 필드 구분�로 <문�>를 사용합니다\n"
 
-#: src/join.c:206
+#: src/join.c:210
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
 "  -1 FIELD          join on this FIELD of file 1\n"
@@ -4610,7 +4704,12 @@ msgid ""
 "                      print them without trying to pair them\n"
 msgstr ""
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+#, fuzzy
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr "  -z, --zero-terminated     줄� �� 줄바꿈 대신 바�트 0� �니다\n"
+
+#: src/join.c:225
 #, fuzzy
 msgid ""
 "\n"
@@ -4638,47 +4737,47 @@ msgstr ""
 "<형�> 출력으로, join 필드, <파�1>� 남아 있는 필드, <파�2>� 남아 있는 \n"
 "필드� 순서대로 ��� <문�>� 구분�어 출력�니다.\n"
 
-#: src/join.c:403
+#: src/join.c:410
 #, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
 msgstr ""
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, fuzzy, c-format
 msgid "invalid field number: %s"
 msgstr "부�절한 필드 번호: `%s'"
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, fuzzy, c-format
 msgid "invalid field specifier: %s"
 msgstr "부�절한 필드 지정�: `%s'"
 
-#: src/join.c:877
+#: src/join.c:884
 #, fuzzy, c-format
 msgid "invalid file number in field spec: %s"
 msgstr "필드 지정� 부�절한 파� 번호: `%s'"
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr ""
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr ""
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, fuzzy, c-format
 msgid "multi-character tab %s"
 msgstr "여러 문�로 � 탭 `%s'"
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr ""
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr "� 파�� 모� 표준 입력�면 안 �니다"
@@ -4782,47 +4881,47 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr "%s 디렉토리를 만들 수 없습니다"
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr "%s: 디렉토리는 하드��할 수 없습니다"
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, fuzzy, c-format
 msgid "%s: cannot overwrite directory"
 msgstr "%s 디렉토리를 만들 수 없습니다"
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, fuzzy, c-format
 msgid "%s: replace %s? "
 msgstr "%s: `%s'를 바꿀까요? "
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, fuzzy, c-format
 msgid "failed to create symbolic link %s"
 msgstr "%s 디렉토리를 만들 수 없습니다"
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, fuzzy, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr "%s 디렉토리를 만들 수 없습니다"
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, fuzzy, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr "%s 디렉토리를 만들 수 없습니다"
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, fuzzy, c-format
 msgid "failed to create hard link %s"
 msgstr "%s 디렉토리를 만들 수 없습니다"
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, fuzzy, c-format
 msgid "failed to create hard link %s => %s"
 msgstr "%s 디렉토리를 만들 수 없습니다"
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -4834,7 +4933,7 @@ msgstr ""
 "  �는: %s [OPTION]... SOURCE... DIRECTORY   (�번째 형�)\n"
 "  �는: %s -d [OPTION]... DIRECTORY...       (세번째 형�)\n"
 
-#: src/ln.c:381
+#: src/ln.c:398
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
 "In the 2nd form, create a link to TARGET in the current directory.\n"
@@ -4846,7 +4945,7 @@ msgid ""
 "interpreted in relation to its parent directory.\n"
 msgstr ""
 
-#: src/ln.c:394
+#: src/ln.c:411
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
 "file\n"
@@ -4859,7 +4958,7 @@ msgid ""
 "  -f, --force                 remove existing destination files\n"
 msgstr ""
 
-#: src/ln.c:402
+#: src/ln.c:419
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
 "  -L, --logical               dereference TARGETs that are symbolic links\n"
@@ -4871,7 +4970,7 @@ msgid ""
 "  -s, --symbolic              make symbolic links instead of hard links\n"
 msgstr ""
 
-#: src/ln.c:411
+#: src/ln.c:428
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
 "  -t, --target-directory=DIRECTORY  specify the DIRECTORY in which to "
@@ -4881,7 +4980,7 @@ msgid ""
 "  -v, --verbose               print name of each linked file\n"
 msgstr ""
 
-#: src/ln.c:433
+#: src/ln.c:450
 #, c-format
 msgid ""
 "\n"
@@ -4889,12 +4988,12 @@ msgid ""
 "behavior when a TARGET is a symbolic link, defaulting to %s.\n"
 msgstr ""
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, fuzzy, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr "%s�(가) 존재하지만 디렉토리가 아닙니다"
 
-#: src/ln.c:588
+#: src/ln.c:605
 #, fuzzy, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr "%s 디렉토리를 만들 수 없습니다"
@@ -4925,7 +5024,7 @@ msgstr "%s: 부�절한 숫�"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 #, fuzzy
 msgid "%b %e  %Y"
 msgstr " %Y %b %e %H:%M"
@@ -4935,102 +5034,102 @@ msgstr " %Y %b %e %H:%M"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 #, fuzzy
 msgid "%b %e %H:%M"
 msgstr " %Y %b %e %H:%M"
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, fuzzy, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr "환경변수 COLUMNS� 값� 다�� 잘못� �� 지정�었습니다: %s"
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr "환경변수 COLUMNS� 값� 다�� 잘못� �� 지정�었습니다: %s"
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr "환경변수 TABSIZE� 값� 다�� 잘못� 탭 �기가 지정�었습니다: %s"
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, fuzzy, c-format
 msgid "invalid line width: %s"
 msgstr "부�절한 �: `%s'"
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, fuzzy, c-format
 msgid "invalid tab size: %s"
 msgstr "부�절한 타입� 문�열 `%s'"
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, fuzzy, c-format
 msgid "invalid time style format %s"
 msgstr "%2$s� 대해 부�절한 �� %1$s"
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 #, fuzzy
 msgid "Valid arguments are:\n"
 msgstr "올바른 ��는:"
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr ""
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr ""
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, fuzzy, c-format
 msgid "unrecognized prefix: %s"
 msgstr "��할 수 없는 옵션 `-%c'"
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr "LS_COLORS환경변수� 해�할 수 없는 값"
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, fuzzy, c-format
 msgid "cannot open directory %s"
 msgstr "%s 디렉토리를 만들 수 없습니다"
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, fuzzy, c-format
 msgid "cannot determine device and inode of %s"
 msgstr "%s� 대한 파� ��터를 재위치할 수 없습니다"
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, fuzzy, c-format
 msgid "%s: not listing already-listed directory"
 msgstr "%s 디렉토리를 만들 수 없습니다"
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, fuzzy, c-format
 msgid "reading directory %s"
 msgstr "%s 디렉토리를 만들 수 없습니다"
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, fuzzy, c-format
 msgid "closing directory %s"
 msgstr "%s 디렉토리로 chdir할 수 없습니다"
 
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, fuzzy, c-format
 msgid "cannot compare file names %s and %s"
 msgstr "비�한 문�열� %s과(와) %s입니다."
 
-#: src/ls.c:4721
+#: src/ls.c:4781
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
 "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n"
 msgstr ""
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
 "  -A, --almost-all           do not list implied . and ..\n"
@@ -5039,33 +5138,32 @@ msgid ""
 "characters\n"
 msgstr ""
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
 "  -F, --classify             append indicator (one of */=>@|) to entries\n"
@@ -5075,40 +5173,41 @@ msgid ""
 "      --full-time            like -l --time-style=full-iso\n"
 msgstr ""
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr ""
 
-#: src/ls.c:4763
+#: src/ls.c:4823
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 
-#: src/ls.c:4769
+#: src/ls.c:4829
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
 
-#: src/ls.c:4775
+#: src/ls.c:4835
 msgid ""
 "  -H, --dereference-command-line\n"
 "                             follow symbolic links listed on the command "
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
 msgstr ""
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
 "names:\n"
@@ -5117,10 +5216,10 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -5130,7 +5229,7 @@ msgid ""
 "entries\n"
 msgstr ""
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -5141,12 +5240,12 @@ msgid ""
 "                             append / indicator to directories\n"
 msgstr ""
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 #, fuzzy
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -5184,7 +5283,7 @@ msgstr ""
 "  -R, --recursive            서브디렉토리까지 출력합니다\n"
 "  -s, --size                 � 파�� 블� �기를 출력합니다\n"
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
 "  -R, --recursive            list subdirectories recursively\n"
@@ -5192,53 +5291,56 @@ msgid ""
 "blocks\n"
 msgstr ""
 
-#: src/ls.c:4825
+#: src/ls.c:4886
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 
-#: src/ls.c:4835
+#: src/ls.c:4896
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
 msgstr ""
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 msgid ""
 "  -t                         sort by modification time, newest first\n"
 "  -T, --tabsize=COLS         assume tab stops at each COLS instead of 8\n"
 msgstr ""
 
-#: src/ls.c:4848
+#: src/ls.c:4912
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
 msgstr ""
 
-#: src/ls.c:4855
+#: src/ls.c:4919
 #, fuzzy
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 "  -f, --fields=<리스트>   � 필드만� 출력합니다; � -s 옵션� 사용�지\n"
@@ -5246,7 +5348,7 @@ msgstr ""
 "                            출력합니다\n"
 "  -n                      (무시�)\n"
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -5255,7 +5357,7 @@ msgid ""
 "variable can change the settings.  Use the dircolors command to set it.\n"
 msgstr ""
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -5329,9 +5431,11 @@ msgstr ""
 #, fuzzy
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
@@ -5341,12 +5445,7 @@ msgstr ""
 "  -w, --warn              틀린 형�� 체�섬 줄� 대해 경고합니다\n"
 "\n"
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -5361,108 +5460,106 @@ msgstr ""
 "나타내는 문� (�진 파�� `*', 문서 파�� ` '), 그리고 � <파�>� \n"
 "�름입니다.\n"
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, fuzzy, c-format
 msgid "%s: too many checksum lines"
 msgstr "%s: 올바른 형�� 갖춘 %s 체�섬 행� 찾지 못했�"
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, fuzzy, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr "%s: %lu: 올바르지 않� 형�� 갖춘 %s 체�섬 행"
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr "%s: 열기 �는 �기 실패\n"
 
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr "실패"
 
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr "성공"
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr "%s: 올바른 형�� 갖춘 %s 체�섬 행� 찾지 못했�"
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, fuzzy, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
 msgstr[0] "경고: 열거� %2$d개� %3$s 중�서 %1$d개를 �� 수 없습니다"
 msgstr[1] "경고: 열거� %2$d개� %3$s 중�서 %1$d개를 �� 수 없습니다"
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, fuzzy, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
 msgstr[0] "경고: 계산� %2$d개� %3$s 중�서 %1$d 개가 서로 �치하지 않습니다"
 msgstr[1] "경고: 계산� %2$d개� %3$s 중�서 %1$d 개가 서로 �치하지 않습니다"
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
 msgstr ""
 
-#: src/md5sum.c:766
+#: src/md5sum.c:770
 #, fuzzy, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr "--status 옵션� 오� 체�섬� 검사할 때만 �미가 있습니다"
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
 msgstr "--binary와 --text 옵션� 오� 체�섬� 검사할 때만 �미가 있습니다"
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr "--status 옵션� 오� 체�섬� 검사할 때만 �미가 있습니다"
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr "--warn 옵션� 오� 체�섬� 검사할 때만 �미가 있습니다"
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, fuzzy, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr "--status 옵션� 오� 체�섬� 검사할 때만 �미가 있습니다"
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, fuzzy, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr "--status 옵션� 오� 체�섬� 검사할 때만 �미가 있습니다"
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr "사용법: %s [<옵션>]... [<파�>]...\n"
 
-#: src/mkdir.c:57
+#: src/mkdir.c:59
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
 msgstr ""
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
 #, fuzzy
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 "존재하지 않는 경우 디렉토리를 만듭니다.\n"
 "\n"
@@ -5473,21 +5570,46 @@ msgstr ""
 "      --help        � �움�� 표시하고 종료합니다\n"
 "      --version     버전 정보를 표시하고 종료합니다\n"
 
-#: src/mkdir.c:168
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/mkdir.c:127 src/mkdir.c:172
+#, fuzzy, c-format
+msgid "failed to set default creation context for %s"
+msgstr "%s� 시간� 유지합니다"
+
+#: src/mkdir.c:191
+#, fuzzy, c-format
+msgid "failed to restore context for %s"
+msgstr "%s� 시간� 유지합니다"
+
+#: src/mkdir.c:231
 #, fuzzy, c-format
 msgid "created directory %s"
 msgstr "%s 디렉토리를 만들 수 없습니다"
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr ""
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr "사용법: %s [<옵션>]... [<파�>]...\n"
 
-#: src/mkfifo.c:52
+#: src/mkfifo.c:54
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
 msgstr ""
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 #, fuzzy
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
@@ -5498,35 +5620,38 @@ msgstr ""
 "      --help        � �움�� 표시하고 종료합니다\n"
 "      --version     버전 정보를 표시하고 종료합니다\n"
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, fuzzy, c-format
 msgid "invalid mode"
 msgstr "부�절한 숫�"
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr ""
 
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
+#, fuzzy, c-format
+msgid "cannot set permissions of %s"
+msgstr "%s� 허가를 바꿀 수 없습니다"
+
+#: src/mknod.c:54
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr "사용법: %s [<옵션>]... <집합1> [<집합2>]\n"
 
-#: src/mknod.c:54
+#: src/mknod.c:56
 msgid "Create the special file NAME of the given TYPE.\n"
 msgstr ""
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr ""
-
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -5535,7 +5660,7 @@ msgid ""
 "otherwise, as decimal.  TYPE may be:\n"
 msgstr ""
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 #, fuzzy
 msgid ""
 "\n"
@@ -5556,152 +5681,146 @@ msgstr ""
 "  c, u   �릭터(버�� 없는) 특별 파�� 만듭니다.\n"
 "  p      FIFO를 만듭니다\n"
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 #, fuzzy
 msgid "Special files require major and minor device numbers."
 msgstr ""
 "블럭 특별 파�� 만들 때�는, major와 minor장치 번호를\n"
 "지정해야 합니다"
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 #, fuzzy
 msgid "Fifos do not have major and minor device numbers."
 msgstr "부�절한 시작 행번호: `%s'"
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, fuzzy, c-format
 msgid "block special files not supported"
 msgstr "블� 특수 파�"
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, fuzzy, c-format
 msgid "character special files not supported"
 msgstr "문� 특수 파�"
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, fuzzy, c-format
 msgid "invalid major device number %s"
 msgstr "부�절한 시작 행번호: `%s'"
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, fuzzy, c-format
 msgid "invalid minor device number %s"
 msgstr "부�절한 시작 행번호: `%s'"
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, fuzzy, c-format
 msgid "invalid device %s %s"
 msgstr "%2$s� 대해 부�절한 �� %1$s"
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, fuzzy, c-format
 msgid "invalid device type %s"
 msgstr "%2$s� 대해 부�절한 �� %1$s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr ""
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr "사용법: %s [<옵션>]... [<파�>]...\n"
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
 "TEMPLATE must contain at least 3 consecutive 'X's in last component.\n"
 "If TEMPLATE is not specified, use tmp.XXXXXXXXXX, and --tmpdir is implied.\n"
 msgstr ""
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
 "  -q, --quiet         suppress diagnostics about file/dir-creation failure\n"
 msgstr ""
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
 msgstr ""
 
-#: src/mktemp.c:223
-#, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr ""
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, fuzzy, c-format
 msgid "too many templates"
 msgstr "�수가 너무 많�"
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr ""
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr ""
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr ""
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr ""
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr ""
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, fuzzy, c-format
 msgid "failed to create directory via template %s"
 msgstr "%s 디렉토리를 만들 수 없습니다"
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, fuzzy, c-format
 msgid "failed to create file via template %s"
 msgstr "%s� 시간� 유지합니다"
 
-#: src/mv.c:292
+#: src/mv.c:294
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 
-#: src/mv.c:298
+#: src/mv.c:300
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
 "file\n"
@@ -5714,7 +5833,7 @@ msgid ""
 "effect.\n"
 msgstr ""
 
-#: src/mv.c:307
+#: src/mv.c:309
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
@@ -5722,7 +5841,7 @@ msgid ""
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
 msgstr ""
 
-#: src/mv.c:312
+#: src/mv.c:314
 #, fuzzy
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
@@ -5732,6 +5851,8 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
 "SOURCE를 DEST로 �름� 바꾸거나 SOURCE를 DIRECTORY로 옮�니다.\n"
 "\n"
@@ -6026,95 +6147,90 @@ msgid "%s: invalid number to ignore"
 msgstr "%s: 부�절한 행� 개수"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
 msgstr ""
 
-#: src/numfmt.c:676
+#: src/numfmt.c:659
 #, c-format
-msgid "value too large to be converted: '%s'"
+msgid "value too large to be converted: %s"
 msgstr ""
 
-#: src/numfmt.c:680
+#: src/numfmt.c:663
 #, fuzzy, c-format
-msgid "invalid number: '%s'"
+msgid "invalid number: %s"
 msgstr "부�절한 숫�"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
+msgid "rejecting suffix in input: %s (consider using --from)"
 msgstr ""
 
-#: src/numfmt.c:688
+#: src/numfmt.c:671
 #, fuzzy, c-format
-msgid "invalid suffix in input: '%s'"
-msgstr "부�절한 행번호 �가: `%s'"
+msgid "invalid suffix in input: %s"
+msgstr "부�절한 �: `%s'"
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
 msgstr ""
 
-#: src/numfmt.c:723
+#: src/numfmt.c:722 src/numfmt.c:768
 #, fuzzy, c-format
 msgid "failed to prepare value '%Lf' for printing"
-msgstr "%s: 파�� 너무 �니다"
+msgstr "%s� 시간� 유지합니다"
 
-#: src/numfmt.c:787
+#: src/numfmt.c:791
 #, fuzzy, c-format
-msgid "invalid unit size: '%s'"
+msgid "invalid unit size: %s"
 msgstr "부�절한 타입� 문�열 `%s'"
 
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
-#, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr ""
-
-#: src/numfmt.c:813
+#: src/numfmt.c:814
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
 msgstr "사용법: %s [<옵션>]... [<파�>]...\n"
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
 msgstr ""
 
-#: src/numfmt.c:820
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
 msgstr ""
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
 msgstr ""
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
 "                         see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr ""
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
@@ -6122,19 +6238,19 @@ msgid ""
 "locale)\n"
 msgstr ""
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
 msgstr ""
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
 msgstr ""
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -6144,40 +6260,40 @@ msgid ""
 "                         is found\n"
 msgstr ""
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
 "nearest\n"
 msgstr ""
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
 msgstr ""
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr ""
 
-#: src/numfmt.c:877
+#: src/numfmt.c:878
 msgid ""
 "\n"
 "UNIT options:\n"
 msgstr ""
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr ""
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -6186,7 +6302,7 @@ msgid ""
 "               1Mi = 1048576,\n"
 msgstr ""
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
@@ -6194,7 +6310,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
@@ -6202,7 +6318,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
@@ -6210,18 +6326,18 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:905
+#: src/numfmt.c:906
 #, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -6233,7 +6349,7 @@ msgid ""
 "errors are not diagnosed and the exit status is 0.\n"
 msgstr ""
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -6254,112 +6370,112 @@ msgid ""
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 msgstr ""
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, c-format
 msgid "format %s has no %% directive"
 msgstr ""
 
-#: src/numfmt.c:990
+#: src/numfmt.c:1003
 #, fuzzy, c-format
 msgid "invalid format %s (width overflow)"
 msgstr "%2$s� 대해 부�절한 �� %1$s"
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr ""
+
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr ""
 
-#: src/numfmt.c:1010
+#: src/numfmt.c:1030
 #, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
 msgstr ""
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr ""
 
-#: src/numfmt.c:1070
+#: src/numfmt.c:1081
 #, fuzzy, c-format
-msgid "invalid suffix in input '%s': '%s'"
-msgstr "부�절한 행번호 �가: `%s'"
+msgid "invalid suffix in input %s: %s"
+msgstr "부�절한 �: `%s'"
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
 msgstr ""
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
 msgstr ""
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
+msgid "large input value %s: possible precision loss"
 msgstr ""
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
 
-#: src/numfmt.c:1388
+#: src/numfmt.c:1403
 #, fuzzy, c-format
-msgid "invalid padding value '%s'"
-msgstr "부�절한 타입� 문�열 `%s'"
+msgid "invalid padding value %s"
+msgstr "부�절한 �: `%s'"
 
-#: src/numfmt.c:1401
+#: src/numfmt.c:1417
 #, fuzzy, c-format
-msgid "invalid field value '%s'"
+msgid "invalid field value %s"
 msgstr "부�절한 필드 번호: `%s'"
 
-#: src/numfmt.c:1430
+#: src/numfmt.c:1447
 #, fuzzy, c-format
-msgid "invalid header value '%s'"
+msgid "invalid header value %s"
 msgstr "부�절한 �: `%s'"
 
-#: src/numfmt.c:1456
+#: src/numfmt.c:1473
 #, c-format
 msgid "--grouping cannot be combined with --format"
 msgstr ""
 
-#: src/numfmt.c:1458
-#, c-format
-msgid "--padding cannot be combined with --format"
-msgstr ""
-
-#: src/numfmt.c:1463
+#: src/numfmt.c:1478
 #, fuzzy, c-format
 msgid "no conversion option specified"
-msgstr "오� 한 개� �수만 지정할 수 있습니다"
+msgstr "접미사� 변환 지정�가 빠졌�"
 
-#: src/numfmt.c:1471
+#: src/numfmt.c:1486
 #, c-format
 msgid "grouping cannot be combined with --to"
 msgstr ""
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
 msgstr ""
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
 msgstr ""
 
-#: src/numfmt.c:1511
+#: src/numfmt.c:1526
 #, fuzzy, c-format
 msgid "error reading input"
 msgstr "%s�(를) �는 �중 오류 발�"
 
-#: src/numfmt.c:1520
-#, fuzzy, c-format
+#: src/numfmt.c:1535
+#, c-format
 msgid "failed to convert some of the input numbers"
-msgstr "� 파�� 모� 표준 입력�면 안 �니다"
+msgstr ""
 
-#: src/od.c:294
+#: src/od.c:320
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -6370,7 +6486,7 @@ msgstr ""
 "사용법: %s [<옵션>]... [<파�>]...\n"
 "  �는: %s --traditional [<파�>] [[+]<옵셋> [[+]<레�블>]]\n"
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -6387,7 +6503,7 @@ msgstr ""
 "\n"
 
 # 8진수 suffix� 대해서 좀 ��하다
-#: src/od.c:307
+#: src/od.c:333
 #, fuzzy
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
@@ -6409,26 +6525,25 @@ msgstr ""
 "  a          문� �름\n"
 "  c          ASCII 문� 혹� 백슬래쉬 �스케�프\n"
 
-#: src/od.c:318
-#, fuzzy
+#: src/od.c:344
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
-"  -A, --address-radix=<기수>  파� 오프셋� 출력하는 방법� 지정합니다\n"
-"  -j, --skip-bytes=<바�트>   입력� 첫 번째 <바�트> 바�트를 건너 �니다\n"
 
-#: src/od.c:323
+#: src/od.c:350
 #, fuzzy
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
@@ -6441,7 +6556,7 @@ msgstr ""
 "  -w, --width[=<바�트>]      출력� 한 줄� <바�트> 바�트를 출력합니다\n"
 "      --traditional           고전�� 형�으로 ��를 받습니다\n"
 
-#: src/od.c:336
+#: src/od.c:363
 #, fuzzy
 msgid ""
 "\n"
@@ -6449,7 +6564,7 @@ msgid ""
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 "\n"
@@ -6459,7 +6574,7 @@ msgstr ""
 "  -c   `-t c'와 ��하고, ASCII 문� 혹� 백슬래쉬 �스케�프로 지정합니다\n"
 "  -d   `-t u2'와 ��하고, 10진수 unsigned short로 지정합니다\n"
 
-#: src/od.c:345
+#: src/od.c:372
 #, fuzzy
 msgid ""
 "  -f   same as -t fF, select floats\n"
@@ -6476,16 +6591,16 @@ msgstr ""
 "  -o   -t o2와 ��하고, 8진수 short를 선�합니다\n"
 "  -x   -t x2와 ��하고, 16진수 short를 선�합니다\n"
 
-#: src/od.c:353
+#: src/od.c:380
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -6499,7 +6614,7 @@ msgstr ""
 "  u[<�기>]  부호없는 10진수, � 숫�마다 <�기> 바�트\n"
 "  x[<�기>]  16진수, � 숫�마다 <�기> 바�트\n"
 
-#: src/od.c:367
+#: src/od.c:394
 #, fuzzy
 msgid ""
 "\n"
@@ -6514,14 +6629,14 @@ msgstr ""
 "<타입>� f� 경우 <�기>는 sizeof(float)� �고, D는 sizeof(double), L�\n"
 "(long double)� �니다.\n"
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
 "each output line.\n"
 msgstr ""
 
-#: src/od.c:379
+#: src/od.c:406
 msgid ""
 "\n"
 "\n"
@@ -6534,12 +6649,12 @@ msgid ""
 "and so on for G, T, P, E, Z, Y.\n"
 msgstr ""
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, fuzzy, c-format
 msgid "invalid type string %s"
 msgstr "부�절한 타입� 문�열 `%s'"
 
-#: src/od.c:649
+#: src/od.c:690
 #, fuzzy, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -6548,7 +6663,7 @@ msgstr ""
 "부�절한 형 문�열 `%s';\n"
 "� 시스템� %lu 바�트 정수형� 제공하지 않습니다"
 
-#: src/od.c:770
+#: src/od.c:811
 #, fuzzy, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -6557,39 +6672,39 @@ msgstr ""
 "부�절한 형 문�열 `%s';\n"
 "� 시스템� %lu 바�트 부�소수�형� 제공하지 않습니다"
 
-#: src/od.c:828
+#: src/od.c:869
 #, fuzzy, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr "부�절한 문� %c' -- 형 문�열 `%s'"
 
 # combined input 번역 개선
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr "결합� 입력� �� 넘어갈 수는 없습니다."
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, fuzzy, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr ""
 "출력 주소 기수 `%c'�(가) 부�절합니다; [odxn]중� 하나� 문��어야 합니다"
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr "문�열� �프할 때�는 타입� 지정�면 안�니다"
 
-#: src/od.c:1810
+#: src/od.c:1863
 #, fuzzy
 msgid "compatibility mode supports at most one file"
 msgstr "호환 모드�서는 최대 셋까지� �수만� 지정할 수 있습니다"
 
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr ""
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr "경고: 부�절한 � %lu; 대신 %d�(를) 사용함"
@@ -6749,12 +6864,12 @@ msgstr ""
 msgid "Where"
 msgstr ""
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr "사용법: %s [<옵션>]... [<파�>]...\n"
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -6764,7 +6879,7 @@ msgid ""
 "  -s              do short format output, this is the default\n"
 msgstr ""
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -6773,7 +6888,7 @@ msgid ""
 "                  in short format\n"
 msgstr ""
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, c-format
 msgid ""
 "\n"
@@ -6781,7 +6896,7 @@ msgid ""
 "The utmp file will be %s.\n"
 msgstr ""
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, fuzzy, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr "--string� 사용할 � 파�� 지정� 수 없습니다"
@@ -7009,7 +7124,8 @@ msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
@@ -7021,7 +7137,7 @@ msgstr ""
 "                    -s[<문�>]는 모든 3열 옵션들� (-<열>|-a -<열>|-m) \n"
 "                    넘어가는 줄 �르기 기능� (-w가 없으면) �니다.\n"
 
-#: src/pr.c:2827
+#: src/pr.c:2828
 #, fuzzy
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
@@ -7037,7 +7153,7 @@ msgstr ""
 "                    (-S\" \"와 ��). 열 관련 옵션� �향� 주지 않습니다\n"
 "  -t, --omit-header 페�지 헤�와 트레�러를 �략합니다\n"
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 #, fuzzy
 msgid ""
 "  -T, --omit-pagination\n"
@@ -7061,7 +7177,7 @@ msgstr ""
 "                    �스트-열 출력�서, -s[<문�>]를 쓰지 않았� 경우�\n"
 "                    페�지 �� <페�지_�>(72)으로 합니다\n"
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 #, fuzzy
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
@@ -7076,7 +7192,7 @@ msgstr ""
 "ë©´, \n"
 "                    -S나 -s� �향� 받지 않습니다.\n"
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 #, fuzzy
 msgid ""
 "\n"
@@ -7097,7 +7213,7 @@ msgstr ""
 
 #: src/printenv.c:69
 #, fuzzy
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr "  -z, --zero-terminated     줄� �� 줄바꿈 대신 바�트 0� �니다\n"
 
 #: src/printf.c:79
@@ -7195,12 +7311,12 @@ msgstr ""
 msgid "F. Pinard"
 msgstr ""
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, fuzzy, c-format
 msgid "%s (for regexp %s)"
 msgstr "%s (정규� `%s'� 대해)"
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
@@ -7210,7 +7326,7 @@ msgstr ""
 " 혹�:  %s -G [<옵션>]... [<입력> [<출력>]]\n"
 "\n"
 
-#: src/ptx.c:1821
+#: src/ptx.c:1824
 #, fuzzy
 msgid ""
 "Output a permuted index, including context, of the words in the input "
@@ -7219,7 +7335,7 @@ msgstr ""
 "입력 파�� 들어 있는 단어들� permuated ��스를 그 문맥과 함께 출력합니다\n"
 "\n"
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 #, fuzzy
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
@@ -7231,7 +7347,7 @@ msgstr ""
 "  -G, --traditional              System V `ptx'와 � 비슷하게 �작합니다\n"
 "  -F, --flag-truncation=<문�열> 넘어간 줄� �를때 <문�열>로 표시합니다\n"
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 #, fuzzy
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
@@ -7247,7 +7363,7 @@ msgstr ""
 "  -S, --sentence-regexp=<정규�> 줄� ��나 문�� �� 나타내는 정규�\n"
 "  -T, --format=tex               출력� TeX으로 합니다\n"
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -7264,7 +7380,7 @@ msgstr ""
 "  -i, --ignore-file=<파�>       � <파�>� 들어 있는 단어들� 무시합니다\n"
 "  -o, --only-file=<파�>         � <파�>� 들어 있는 단어들만 �습니다\n"
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -7275,17 +7391,16 @@ msgstr ""
 "  -t, --typeset-mode               - 구현�지 않았� -\n"
 "  -w, --width=<개수>             출력할 열� � (참조는 제외하고)\n"
 
-#: src/ptx.c:1854
+#: src/ptx.c:1857
 #, fuzzy
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
 "\n"
-"<파�>� 주어지지 않거나, <파�>� `-'�면, 표준 입력� �습니다.  `-F /'가 "
-"기본값입니다.\n"
+"<파�>� 주어지지 않거나 - �면 표준 입력� �습니다.\n"
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, fuzzy, c-format
 msgid "invalid gap width: %s"
 msgstr "부�절한 �: `%s'"
@@ -7302,22 +7417,28 @@ msgid ""
 "  -P, --physical  avoid all symlinks\n"
 msgstr ""
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+
+#: src/pwd.c:169
 #, fuzzy, c-format
 msgid "failed to chdir to %s"
 msgstr "%s� 그룹� %s로 바꾸는� 실패했습니다\n"
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, fuzzy, c-format
 msgid "failed to stat %s"
 msgstr "%s� 시간� 유지합니다"
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr ""
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, fuzzy, c-format
 msgid "ignoring non-option arguments"
 msgstr "옵션아닌 �수가 너무 많�"
@@ -7327,8 +7448,8 @@ msgstr "옵션아닌 �수가 너무 많�"
 msgid "Dmitry V. Levin"
 msgstr ""
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "사용법: %s [<옵션>]... [<파�>]...\n"
@@ -7362,8 +7483,7 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/readlink.c:152
@@ -7388,7 +7508,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 
@@ -7406,41 +7526,42 @@ msgstr "%s 디렉토리를 만들 수 없습니다"
 msgid "%s: descend into directory %s? "
 msgstr "%s 디렉토리로 chdir할 수 없습니다"
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, fuzzy, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr "%s: 쓰기 보호� `%s'파�� 지울까요? "
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, fuzzy, c-format
 msgid "%s: remove %s %s? "
 msgstr "%s: `%s'를 지울까요? "
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, fuzzy, c-format
 msgid "removed directory: %s\n"
 msgstr "%s 디렉토리를 만들 수 없습니다"
 
-#: src/remove.c:444
-#, fuzzy, c-format
-msgid "cannot remove directory: %s"
-msgstr "%s 디렉토리를 만들 수 없습니다"
+#: src/remove.c:447
+#, c-format
+msgid "refusing to remove %s or %s directory: skipping %s"
+msgstr ""
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr ""
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, fuzzy, c-format
 msgid "traversal failed: %s"
 msgstr "파� �기 실패"
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -7465,12 +7586,12 @@ msgstr ""
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 
 #: src/rm.c:149
@@ -7518,13 +7639,17 @@ msgstr ""
 
 #: src/rm.c:342
 #, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr ""
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/rm.c:343
+#: src/rm.c:345
 #, fuzzy, c-format
-msgid "%s: remove all arguments? "
-msgstr "%s: `%s'를 지울까요? "
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] "%s: `%s'를 지울까요? "
+msgstr[1] "%s: `%s'를 지울까요? "
 
 #: src/rmdir.c:134 src/rmdir.c:233
 #, fuzzy, c-format
@@ -7578,7 +7703,7 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
 
@@ -7628,41 +7753,46 @@ msgstr ""
 msgid "no command specified"
 msgstr "오� 한 개� �수만 지정할 수 있습니다"
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr ""
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, c-format
 msgid "failed to compute a new context"
 msgstr ""
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, fuzzy, c-format
 msgid "failed to set new user %s"
 msgstr "%s� 시간� 유지합니다"
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, fuzzy, c-format
 msgid "failed to set new type %s"
 msgstr "%s� 시간� 유지합니다"
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, fuzzy, c-format
 msgid "failed to set new range %s"
 msgstr "%s� 시간� 유지합니다"
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, fuzzy, c-format
 msgid "failed to set new role %s"
 msgstr "%s� 시간� 유지합니다"
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, fuzzy, c-format
 msgid "unable to set security context %s"
 msgstr "%s� 허가를 바꿀 수 없습니다"
 
+#: src/selinux.c:127 src/selinux.c:300
+#, fuzzy, c-format
+msgid "error canonicalizing %s"
+msgstr "%s�(를) �는 �중 오류 발�"
+
 #: src/seq.c:68
 #, fuzzy, c-format
 msgid ""
@@ -7690,97 +7820,47 @@ msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
 msgstr ""
 
-#: src/seq.c:94
+#: src/seq.c:96
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
 "it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n"
 "decimal numbers with maximum precision PREC, and to %g otherwise.\n"
 msgstr ""
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, fuzzy, c-format
 msgid "invalid floating point argument: %s"
 msgstr "부�절한 시작 행번호: `%s'"
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, fuzzy, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr "%s: 알 수 없는 파�형"
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, fuzzy, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr "문�열� �프할 때�는 타입� 지정�면 안�니다"
 
-#: src/setuidgid.c:49
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-"사용법: %s [<파�>]...\n"
-" 혹�:  %s [<옵션>]\n"
-
-#: src/setuidgid.c:55
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr ""
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr ""
-
-#: src/setuidgid.c:190
-#, fuzzy, c-format
-msgid "failed to set supplemental group(s)"
-msgstr "null 그룹으로 바꿀 수 없습니다"
-
-#: src/setuidgid.c:200
-#, fuzzy, c-format
-msgid "cannot set group-ID to %lu"
-msgstr "사용�와 그룹� 모� �략할 수는 없습니다"
-
-#: src/setuidgid.c:204
-#, fuzzy, c-format
-msgid "cannot set user-ID to %lu"
-msgstr "사용�와 그룹� 모� �략할 수는 없습니다"
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr ""
 
-#: src/shred.c:148
+#: src/shred.c:170
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
 "for even very expensive hardware probing to recover the data.\n"
 msgstr ""
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -7789,28 +7869,32 @@ msgid ""
 "  -s, --size=N   shred this many bytes (suffixes like K, M, G accepted)\n"
 msgstr ""
 
-#: src/shred.c:161
+#: src/shred.c:183
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
 "  -z, --zero     add a final overwrite with zeros to hide shredding\n"
 msgstr ""
 
-#: src/shred.c:170
+#: src/shred.c:192
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -7821,7 +7905,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -7833,7 +7917,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -7842,7 +7926,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -7854,134 +7938,134 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:215
+#: src/shred.c:241
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
 "of the file that cannot be removed, and that will allow a shredded file\n"
 "to be recovered later.\n"
 msgstr ""
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, fuzzy, c-format
 msgid "%s: fdatasync failed"
 msgstr "stat 실패"
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr ""
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr "%s: �아갈 수 없습니다"
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr "%s: 진행중 %lu/%lu (%s)..."
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, fuzzy, c-format
 msgid "%s: error writing at offset %s"
 msgstr "%s� 쓰는 �중 오류 발�"
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, fuzzy, c-format
 msgid "%s: lseek failed"
 msgstr "파� 닫기 실패"
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, fuzzy, c-format
 msgid "%s: file too large"
 msgstr "%s: 파�� 너무 �니다"
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr "%s: 진행중 %lu/%lu (%s)...%s"
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, fuzzy, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr "%s: 진행중 %lu/%lu (%s)...%s/%s"
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, fuzzy, c-format
 msgid "%s: fstat failed"
 msgstr "stat 실패"
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, fuzzy, c-format
 msgid "%s: invalid file type"
 msgstr "%s: 부�절한 접미어 길�"
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr "%s: 파�� �� �기를 갖습니다"
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, fuzzy, c-format
 msgid "%s: error truncating"
 msgstr "%s: 파�� 잘렸�"
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, fuzzy, c-format
 msgid "%s: fcntl failed"
 msgstr "stat 실패"
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr "%s: 쓰기 전용 파� 디스�립터는 파기할 수 없습니다"
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr "%s: 삭제중"
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, fuzzy, c-format
 msgid "%s: renamed to %s"
 msgstr "%s: �기 오류"
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, fuzzy, c-format
 msgid "%s: failed to remove"
 msgstr "%s: 파�� 너무 �니다"
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr "%s: 삭제�었�"
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, fuzzy, c-format
 msgid "%s: failed to close"
 msgstr "%s: 파�� 너무 �니다"
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, fuzzy, c-format
 msgid "%s: failed to open for writing"
 msgstr "%s: 파�� 너무 �니다"
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, fuzzy, c-format
 msgid "%s: invalid number of passes"
 msgstr "%s: 부�절한 초"
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, c-format
 msgid "multiple random sources specified"
 msgstr ""
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, fuzzy, c-format
 msgid "%s: invalid file size"
 msgstr "%s: 부�절한 접미어 길�"
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -7992,14 +8076,11 @@ msgstr ""
 " 혹�:  %s -G [<옵션>]... [<입력> [<출력>]]\n"
 "\n"
 
-#: src/shuf.c:54
-#, fuzzy
+#: src/shuf.c:67
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr ""
-"� <파�>�서 선�한 줄들만 표준 출력� 표시합니다.\n"
-"\n"
 
-#: src/shuf.c:60
+#: src/shuf.c:73
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
 "  -i, --input-range=LO-HI   treat each number LO through HI as an input "
@@ -8007,34 +8088,44 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
 msgstr ""
 
-#: src/shuf.c:244
+#: src/shuf.c:228
+#, fuzzy, c-format
+msgid "too many input lines"
+msgstr "옵션아닌 �수가 너무 많�"
+
+#: src/shuf.c:431
 #, c-format
 msgid "multiple -i options specified"
 msgstr ""
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, fuzzy, c-format
 msgid "invalid input range %s"
 msgstr "부�절한 숫�"
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, fuzzy, c-format
 msgid "invalid line count %s"
 msgstr "부�절한 �: `%s'"
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, fuzzy, c-format
 msgid "multiple output files specified"
 msgstr "%s를 지�니다\n"
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, fuzzy, c-format
 msgid "cannot combine -e and -i options"
 msgstr "%s� 대한 파� ��터를 재위치할 수 없습니다"
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr ""
+
 #: src/sleep.c:44
 #, c-format
 msgid ""
@@ -8049,17 +8140,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, fuzzy, c-format
 msgid "invalid time interval %s"
 msgstr "부�절한 필드 번호: `%s'"
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, fuzzy, c-format
 msgid "cannot read realtime clock"
 msgstr "�� `%s'를 만들 수 없습니다"
 
-#: src/sort.c:399
+#: src/sort.c:427
 #, fuzzy
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr ""
@@ -8068,13 +8159,13 @@ msgstr ""
 "정렬 옵션� 다�과 같습니다:\n"
 "\n"
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
 msgstr ""
 
-#: src/sort.c:409
+#: src/sort.c:437
 #, fuzzy
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
@@ -8086,7 +8177,7 @@ msgstr ""
 "  -d, --dictionary-order      공백, 알파벳, 숫�만� 고려합니다\n"
 "  -f, --ignore-case           소문�와 대문�를 구별하지 않습니다\n"
 
-#: src/sort.c:415
+#: src/sort.c:443
 #, fuzzy
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
@@ -8100,12 +8191,12 @@ msgstr ""
 "  -r, --reverse               비�� 결과를 뒤바꿉니다\n"
 "\n"
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 
-#: src/sort.c:423
+#: src/sort.c:451
 #, fuzzy
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
@@ -8120,7 +8211,7 @@ msgstr ""
 "  -r, --reverse               비�� 결과를 뒤바꿉니다\n"
 "\n"
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -8130,19 +8221,19 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/sort.c:437
+#: src/sort.c:465
 msgid ""
 "Other options:\n"
 "\n"
 msgstr ""
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
 msgstr ""
 
-#: src/sort.c:445
+#: src/sort.c:473
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
 "  -C, --check=quiet, --check=silent  like -c, but do not report first bad "
@@ -8151,7 +8242,7 @@ msgid ""
 "                              decompress them with PROG -d\n"
 msgstr ""
 
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -8160,14 +8251,14 @@ msgid ""
 "                            If F is - then read names from standard input\n"
 msgstr ""
 
-#: src/sort.c:459
+#: src/sort.c:487
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
 "  -m, --merge               merge already sorted files; do not sort\n"
 msgstr ""
 
 # last-resort comparison?
-#: src/sort.c:463
+#: src/sort.c:491
 #, fuzzy
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
@@ -8188,7 +8279,7 @@ msgstr ""
 "다\n"
 "  -S, --buffer-size=<�기>  메� 메모리 버�를 <�기>만� �니다\n"
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, fuzzy, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -8212,11 +8303,7 @@ msgstr ""
 "다:\n"
 "                              ��한 것중 첫 번째만 출력합니다\n"
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr "  -z, --zero-terminated     줄� �� 줄바꿈 대신 바�트 0� �니다\n"
-
-#: src/sort.c:483
+#: src/sort.c:511
 #, fuzzy
 msgid ""
 "\n"
@@ -8243,7 +8330,7 @@ msgstr ""
 "\n"
 "<�기> 다��는 다� 곱하기 접미어가 따�올 수 있습니다:\n"
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -8264,262 +8351,247 @@ msgstr ""
 "바�트값� 따� 정렬� 전통�� 정렬 방�� �한다면 \"LC_ALL=C\"로\n"
 "환경변수를 세팅하십시오\n"
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, fuzzy, c-format
 msgid "waiting for %s [-d]"
 msgstr "%s� 쓰는 �중 오류 발�"
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr ""
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, fuzzy, c-format
 msgid "cannot create temporary file in %s"
 msgstr "임시 파�� 만들 수 없습니다"
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr "파� 열기 실패"
 
-#: src/sort.c:970
+#: src/sort.c:998
 #, fuzzy
 msgid "fflush failed"
 msgstr "파� 닫기 실패"
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr "파� 닫기 실패"
 
-#: src/sort.c:986
-#, fuzzy, c-format
-msgid "dup2 failed"
-msgstr "파� 열기 실패"
-
-#: src/sort.c:1103
-#, fuzzy, c-format
-msgid "couldn't execute %s"
-msgstr "%s 디렉토리를 만들 수 없습니다"
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 #, fuzzy
 msgid "couldn't create temporary file"
 msgstr "임시 파�� 만들 수 없습니다"
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, fuzzy, c-format
 msgid "couldn't create process for %s -d"
 msgstr "%s 디렉토리를 만들 수 없습니다"
 
-#: src/sort.c:1161
-#, fuzzy, c-format
-msgid "couldn't execute %s -d"
-msgstr "%s 디렉토리를 만들 수 없습니다"
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, fuzzy, c-format
 msgid "warning: cannot remove: %s"
 msgstr "%s 디렉토리를 만들 수 없습니다"
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, fuzzy, c-format
 msgid "invalid --%s argument %s"
 msgstr "%2$s� 대해 부�절한 �� %1$s"
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, fuzzy, c-format
 msgid "minimum --%s argument is %s"
 msgstr "%2$s� 대해 애매한 �� %1$s"
 
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, fuzzy, c-format
 msgid "--%s argument %s too large"
 msgstr "%s: �련번호 `%.*s'�(는) 너무 �니다"
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr ""
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr ""
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr "stat 실패"
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr "파� �기 실패"
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, fuzzy, c-format
 msgid "string transformation failed"
 msgstr "문�열 비�가 실패했습니다"
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, c-format
 msgid "the untransformed string was %s"
 msgstr ""
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr ""
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr ""
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr ""
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr ""
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr ""
 
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, fuzzy, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
-msgstr[0] "%s: `%s'�(는) 모호한 옵션입니다\n"
-msgstr[1] "%s: `%s'�(는) 모호한 옵션입니다\n"
+msgstr[0] "%s: `-W %s'�(는) 모호한 옵션입니다\n"
+msgstr[1] "%s: `-W %s'�(는) 모호한 옵션입니다\n"
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr ""
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr "파� 쓰기 실패"
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr "%s: %s:%s: 순서가 맞지 않�: "
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr "표준 오류"
 
-#: src/sort.c:3698
+#: src/sort.c:3738
 #, fuzzy
 msgid "cannot read"
 msgstr "fork() 할 수 없습니다"
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, fuzzy, c-format
 msgid "%s: invalid field specification %s"
 msgstr "%s: 부�절한 필드 지정 `%s'"
 
-#: src/sort.c:3987
-#, fuzzy, c-format
+#: src/sort.c:4028
+#, c-format
 msgid "options '-%s' are incompatible"
-msgstr "%s: `%s'�(는) 모호한 옵션입니다\n"
+msgstr ""
 
 # count?
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, fuzzy, c-format
 msgid "%s: invalid count at start of %s"
 msgstr "%s: `%s' 시작 부분� 부�절한 갯수"
 
-#: src/sort.c:4295
+#: src/sort.c:4336
 #, fuzzy
 msgid "invalid number after '-'"
 msgstr "`-' 다�� 부�절한 숫�"
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 #, fuzzy
 msgid "invalid number after '.'"
 msgstr "`.' 다�� 부�절한 숫�"
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr "필드 스펙� 벗어난 문�"
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, c-format
 msgid "multiple compress programs specified"
 msgstr ""
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
 msgstr "필드 처�� 부�절한 숫�"
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
 msgstr "필드 개수가 0입니다"
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr "문� 오프셋� 0입니다"
 
-#: src/sort.c:4407
+#: src/sort.c:4448
 #, fuzzy
 msgid "invalid number after ','"
 msgstr "`,' 다�� 부�절한 숫�"
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr ""
 
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, fuzzy, c-format
 msgid "cannot read file names from %s"
 msgstr "비�한 문�열� %s과(와) %s입니다."
 
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, fuzzy, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr "%s: 부�절한 접미어 길�"
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, fuzzy, c-format
 msgid "no input from %s"
 msgstr "파� `%s'�(를) 만듦\n"
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr ""
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr ""
 
 # extra operand? 뭔 소리야?
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, fuzzy, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr "-c 옵션�서는 추가 피연산� `%s'�(를) 쓸 수 없습니다"
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr ""
 
-#: src/split.c:204
+#: src/split.c:203
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr "사용법: %s [<옵션>] [<입력> [<접�어>]]\n"
 
-#: src/split.c:208
+#: src/split.c:207
 #, fuzzy
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
@@ -8533,26 +8605,25 @@ msgstr ""
 "�\n"
 "�습니다.\n"
 
-#: src/split.c:216
+#: src/split.c:215
 #, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
 
-#: src/split.c:229
+#: src/split.c:228
 #, fuzzy
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
@@ -8562,7 +8633,7 @@ msgstr ""
 "로\n"
 "                            출력합니다\n"
 
-#: src/split.c:236
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -8574,189 +8645,189 @@ msgid ""
 "r/K/N   likewise but only output Kth of N to stdout\n"
 msgstr ""
 
-#: src/split.c:354
+#: src/split.c:353
 #, fuzzy, c-format
 msgid "output file suffixes exhausted"
 msgstr "출력파� 접미어를 다 �습니다"
 
-#: src/split.c:366
+#: src/split.c:365
 #, fuzzy, c-format
 msgid "creating file %s\n"
 msgstr "파� `%s'�(를) 만듦\n"
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr ""
 
-#: src/split.c:391
+#: src/split.c:390
 #, fuzzy, c-format
 msgid "failed to set FILE environment variable"
 msgstr "LS_COLORS환경변수� 해�할 수 없는 값"
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr ""
 
-#: src/split.c:395
+#: src/split.c:394
 #, fuzzy, c-format
 msgid "failed to create pipe"
 msgstr "%s� 시간� 유지합니다"
 
-#: src/split.c:409
+#: src/split.c:408
 #, fuzzy, c-format
 msgid "closing prior pipe"
 msgstr "%s 디렉토리로 chdir할 수 없습니다"
 
-#: src/split.c:411
+#: src/split.c:410
 #, fuzzy, c-format
 msgid "closing output pipe"
 msgstr "%s를 지�니다\n"
 
-#: src/split.c:415
+#: src/split.c:414
 #, fuzzy, c-format
 msgid "moving input pipe"
 msgstr "파� `%s'�(를) 만듦\n"
 
-#: src/split.c:417
+#: src/split.c:416
 #, fuzzy, c-format
 msgid "closing input pipe"
 msgstr "파� `%s'�(를) 만듦\n"
 
-#: src/split.c:422
+#: src/split.c:421
 #, fuzzy, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr "%s� 그룹� %s로 바꾸는� 실패했습니다\n"
 
-#: src/split.c:428
+#: src/split.c:427
 #, c-format
 msgid "failed to close input pipe"
 msgstr ""
 
-#: src/split.c:464
+#: src/split.c:463
 #, c-format
 msgid "waiting for child process"
 msgstr ""
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr ""
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr ""
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr ""
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr "한 가지 ��� 방법으로 분할할 수 없습니다"
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, fuzzy, c-format
 msgid "%s: invalid number of chunks"
 msgstr "%s: 부�절한 초"
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, fuzzy, c-format
 msgid "%s: invalid chunk number"
 msgstr "%s: 부�절한 숫�"
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr "%s: 부�절한 접미어 길�"
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr "%s: 부�절한 바�트� 개수"
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr "%s: 부�절한 행� 개수"
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, fuzzy, c-format
 msgid "line count option -%s%c... is too large"
 msgstr "%s: �련번호 `%.*s'�(는) 너무 �니다"
 
-#: src/split.c:1248
+#: src/split.c:1298
 #, fuzzy, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr "부�절한 시작 행번호: `%s'"
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, fuzzy, c-format
 msgid "%s: invalid IO block size"
 msgstr "%s: 부�절한 접미어 길�"
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr ""
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr ""
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, fuzzy, c-format
 msgid "%s: cannot determine file size"
 msgstr "%s: �아갈 수 없습니다"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr ""
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, c-format
 msgid "failed to canonicalize %s"
 msgstr ""
 
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, fuzzy, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr "%s: ��할 수 없는 옵션 `%c%s'\n"
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, fuzzy, c-format
 msgid "%s: invalid directive"
 msgstr "%s: 부�절한 패턴"
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, fuzzy, c-format
 msgid "warning: backslash at end of format"
 msgstr "문�열 �� 부�절한 역슬래쉬 �스케�프"
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr ""
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, fuzzy, c-format
 msgid "cannot read file system information for %s"
 msgstr "%s� 대한 파� ��터를 재위치할 수 없습니다"
 
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, fuzzy, c-format
 msgid "cannot stat standard input"
 msgstr "표준 입력"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -8767,7 +8838,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -8775,30 +8846,30 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, c-format
 msgid "Context: %C\n"
 msgstr ""
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -8806,27 +8877,27 @@ msgid ""
 " Birth: %w\n"
 msgstr ""
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
 msgstr ""
 
-#: src/stat.c:1356
+#: src/stat.c:1418
 msgid ""
 "  -L, --dereference     follow links\n"
 "  -f, --file-system     display file system status instead of file status\n"
 msgstr ""
 
-#: src/stat.c:1360
+#: src/stat.c:1422
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 msgid ""
 "\n"
 "The valid format sequences for files (without --file-system):\n"
@@ -8838,7 +8909,7 @@ msgid ""
 "  %C   SELinux security context string\n"
 msgstr ""
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 msgid ""
 "  %d   device number in decimal\n"
 "  %D   device number in hex\n"
@@ -8848,7 +8919,7 @@ msgid ""
 "  %G   group name of owner\n"
 msgstr ""
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 msgid ""
 "  %h   number of hard links\n"
 "  %i   inode number\n"
@@ -8857,11 +8928,11 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 
-#: src/stat.c:1399
+#: src/stat.c:1461
 msgid ""
 "  %u   user ID of owner\n"
 "  %U   user name of owner\n"
@@ -8869,14 +8940,14 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 msgid ""
 "Valid format sequences for file systems:\n"
 "\n"
@@ -8887,7 +8958,7 @@ msgid ""
 "  %f   free blocks in file system\n"
 msgstr ""
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 msgid ""
 "  %i   file system ID in hex\n"
 "  %l   maximum length of filenames\n"
@@ -8948,22 +9019,27 @@ msgid ""
 "and are thus unaffected by 'stdbuf' settings.\n"
 msgstr ""
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, c-format
 msgid "failed to find %s"
 msgstr ""
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, c-format
 msgid "failed to update the environment with %s"
 msgstr ""
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr ""
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, c-format
+msgid "you must specify a buffering mode option"
+msgstr ""
+
+#: src/stty.c:516
 #, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -8971,25 +9047,25 @@ msgid ""
 "  or:  %s [-F DEVICE | --file=DEVICE] [-g|--save]\n"
 msgstr ""
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
 msgstr ""
 
-#: src/stty.c:525
+#: src/stty.c:528
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
 "  -g, --save         print all current settings in a stty-readable form\n"
 "  -F, --file=DEVICE  open and use the specified DEVICE instead of stdin\n"
 msgstr ""
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
 "settings.  The underlying system defines which settings are available.\n"
 msgstr ""
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -8998,7 +9074,7 @@ msgid ""
 "   eol CHAR      CHAR will end the line\n"
 msgstr ""
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -9006,7 +9082,7 @@ msgid ""
 "   kill CHAR     CHAR will erase the current line\n"
 msgstr ""
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -9014,7 +9090,7 @@ msgid ""
 "   start CHAR    CHAR will restart the output after stopping it\n"
 msgstr ""
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -9022,7 +9098,7 @@ msgid ""
 " * werase CHAR   CHAR will erase the last word typed\n"
 msgstr ""
 
-#: src/stty.c:562
+#: src/stty.c:565
 msgid ""
 "\n"
 "Special settings:\n"
@@ -9031,7 +9107,7 @@ msgid ""
 " * columns N     same as cols N\n"
 msgstr ""
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -9040,7 +9116,7 @@ msgid ""
 "   ospeed N      set the output speed to N\n"
 msgstr ""
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -9049,7 +9125,7 @@ msgid ""
 "   time N        with -icanon, set read timeout of N tenths of a second\n"
 msgstr ""
 
-#: src/stty.c:581
+#: src/stty.c:584
 msgid ""
 "\n"
 "Control settings:\n"
@@ -9060,7 +9136,7 @@ msgid ""
 "   csN           set character size to N bits, N in [5..8]\n"
 msgstr ""
 
-#: src/stty.c:590
+#: src/stty.c:593
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
 "   [-]hup        send a hangup signal when the last process closes the tty\n"
@@ -9068,9 +9144,10 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -9080,7 +9157,7 @@ msgid ""
 "   [-]igncr      ignore carriage return\n"
 msgstr ""
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -9089,11 +9166,11 @@ msgid ""
 "   [-]istrip     clear high (8th) bit of input characters\n"
 msgstr ""
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr ""
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -9103,7 +9180,7 @@ msgid ""
 "   [-]tandem     same as [-]ixoff\n"
 msgstr ""
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -9113,17 +9190,17 @@ msgid ""
 " * nlN           newline delay style, N in [0..1]\n"
 msgstr ""
 
-#: src/stty.c:631
+#: src/stty.c:635
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
 " * [-]onlret     newline performs a carriage return\n"
 msgstr ""
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -9133,7 +9210,7 @@ msgid ""
 " * vtN           vertical tab delay style, N in [0..1]\n"
 msgstr ""
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -9142,7 +9219,7 @@ msgid ""
 " * -crtkill      kill all line by obeying the echoctl and echok settings\n"
 msgstr ""
 
-#: src/stty.c:654
+#: src/stty.c:658
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
 "   [-]echo       echo input characters\n"
@@ -9151,7 +9228,7 @@ msgid ""
 "   [-]echok      echo a newline after a kill character\n"
 msgstr ""
 
-#: src/stty.c:661
+#: src/stty.c:665
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
 "   [-]echonl     echo newline even if not echoing other characters\n"
@@ -9160,7 +9237,7 @@ msgid ""
 "   [-]iexten     enable non-POSIX special characters\n"
 msgstr ""
 
-#: src/stty.c:668
+#: src/stty.c:672
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
 "   [-]noflsh     disable flushing after interrupt and quit special "
@@ -9170,7 +9247,7 @@ msgid ""
 " * [-]xcase      with icanon, escape with '\\' for uppercase characters\n"
 msgstr ""
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -9179,7 +9256,7 @@ msgid ""
 "   -cbreak       same as icanon\n"
 msgstr ""
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -9187,7 +9264,7 @@ msgid ""
 "   crt           same as echoe echoctl echoke\n"
 msgstr ""
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -9196,7 +9273,7 @@ msgid ""
 "   evenp         same as parenb -parodd cs7\n"
 msgstr ""
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -9206,7 +9283,7 @@ msgid ""
 "   -nl           same as icrnl -inlcr -igncr onlcr -ocrnl -onlret\n"
 msgstr ""
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -9215,7 +9292,7 @@ msgid ""
 "   -pass8        same as parenb istrip cs7\n"
 msgstr ""
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -9223,7 +9300,7 @@ msgid ""
 "   -raw          same as cooked\n"
 msgstr ""
 
-#: src/stty.c:716
+#: src/stty.c:720
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
 "                 -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n"
@@ -9233,7 +9310,7 @@ msgid ""
 "                 characters to their default values\n"
 msgstr ""
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -9242,55 +9319,55 @@ msgid ""
 "127; special values ^- or undef used to disable special characters.\n"
 msgstr ""
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, fuzzy, c-format
 msgid "only one device may be specified"
 msgstr "오� 한 개� �수만 지정할 수 있습니다"
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, fuzzy, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
 "mutually exclusive"
 msgstr "--string과 --check 옵션� �호 배타�입니다"
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr ""
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr ""
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, fuzzy, c-format
 msgid "invalid argument %s"
 msgstr "%2$s� 대해 부�절한 �� %1$s"
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, fuzzy, c-format
 msgid "missing argument to %s"
 msgstr "%2$s� 대해 애매한 �� %1$s"
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, fuzzy, c-format
 msgid "invalid line discipline %s"
 msgstr "부�절한 �: `%s'"
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr ""
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr ""
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, fuzzy, c-format
 msgid "invalid integer argument %s"
 msgstr "부�절한 행번호 �가: `%s'"
@@ -9342,22 +9419,22 @@ msgstr "      --help     � �움�� 표시하고 �냅니다\n"
 msgid "      --version  output version information and exit\n"
 msgstr "      --version  버전 정보를 출력하고 �냅니다\n"
 
-#: src/system.h:544
+#: src/system.h:543
 #, fuzzy
 msgid ""
 "\n"
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "긴 옵션�서 꼭 필요한 �수는 짧� 옵션�� 꼭 필요합니다.\n"
 
-#: src/system.h:552
+#: src/system.h:551
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -9366,35 +9443,33 @@ msgid ""
 "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n"
 msgstr ""
 
-#: src/system.h:571
-#, fuzzy, c-format
+#: src/system.h:570
+#, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
+"%s online help: <%s>\n"
 msgstr ""
-"\n"
-"<%s>(으)로 버그를 알려 주십시오.\n"
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr ""
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr ""
 
-#: src/system.h:596
+#: src/system.h:591
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "� 많� 정보를 보려면 `%s --help' 하십시오.\n"
 
-#: src/system.h:628
+#: src/system.h:633
 #, fuzzy, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -9451,7 +9526,7 @@ msgstr "임시 파�� 만들 수 없습니다"
 #: src/tac.c:458
 #, fuzzy, c-format
 msgid "failed to open %s for writing"
-msgstr "%s: 파�� 너무 �니다"
+msgstr "`%s'를 `%s'로 ��할 수 없습니다"
 
 #: src/tac.c:475
 #, fuzzy, c-format
@@ -9494,18 +9569,16 @@ msgstr ""
 
 #: src/tail.c:270
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
 
 #: src/tail.c:274
+#, fuzzy
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 "  -f, --follow[={name|descriptor}]\n"
@@ -9514,18 +9587,17 @@ msgstr ""
 "                           같� 기능� 합니다\n"
 "  -F                       --follow=name --retry와 같습니다\n"
 
-#: src/tail.c:281
+#: src/tail.c:280
 #, fuzzy, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
 "  -n, --lines=N            마지막 N줄� (마지막 %d줄 대신) 출력합니다\n"
 "      --max-unchanged-stats=N\n"
@@ -9535,14 +9607,12 @@ msgstr ""
 "다\n"
 "                           (회전� 로그 파�� 경우 �러합니다)\n"
 
-#: src/tail.c:294
+#: src/tail.c:293
 #, fuzzy
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 "      --pid=PID            -f와 같� 쓰여, 프로세스 ID PID가 죽으면 �납니"
 "다\n"
@@ -9551,16 +9621,16 @@ msgstr ""
 "                           S초(기본값 1초)만� 지���� 합니다\n"
 "  -v, --verbose            언제나 파��름� 들어 있는 헤�를 출력합니다\n"
 
-#: src/tail.c:301
+#: src/tail.c:298
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 
-#: src/tail.c:310
+#: src/tail.c:307
 #, fuzzy
 msgid ""
 "\n"
@@ -9577,7 +9647,7 @@ msgstr ""
 "표시합니다.  N 뒤� 곱하기 접미어가 올 수 있습니다: b는 512, k는 1024, m� \n"
 "1048576 (1메가)입니다.\n"
 
-#: src/tail.c:319
+#: src/tail.c:316
 #, fuzzy
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
@@ -9594,168 +9664,176 @@ msgstr ""
 "파�� 다시 열어 지워졌거나 다른 프로그램� �해 다시 만들어 졌는지 여부를 \n"
 "검사하게 �  것입니다.\n"
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr "%s(fd=%d)�(를) 닫습니다 "
 
-#: src/tail.c:453
-#, fuzzy, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr "%s: �대 오프셋 %s%s로(으로) 갈 수 없습니다"
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, fuzzy, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr "%s: � �대 오프셋 %s%s로(으로) 갈 수 없습니다"
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr ""
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
 "reverting to polling"
 msgstr ""
 
-#: src/tail.c:963
+# 좀 � �연스럽게
+#: src/tail.c:965
+#, fuzzy, c-format
+msgid "%s has been replaced with a symbolic link. giving up on this name"
+msgstr ""
+"`%s'�(가) tail� 실행할 수 없는 파�로 대체�었습니다; � �름� �기합니다"
+
+#: src/tail.c:980
 #, fuzzy, c-format
 msgid "%s has become inaccessible"
 msgstr "`%s'�(가) 접근 불가능하게 �었습니다"
 
 # 좀 � �연스럽게
-#: src/tail.c:980
+#: src/tail.c:997
 #, fuzzy, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr ""
 "`%s'�(가) tail� 실행할 수 없는 파�로 대체�었습니다; � �름� �기합니다"
 
 # 좀 � �연스럽게
-#: src/tail.c:989
+#: src/tail.c:1006
 #, fuzzy, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr ""
 "`%s'�(가) tail� 실행할 수 없는 파�로 대체�었습니다; � �름� �기합니다"
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, fuzzy, c-format
 msgid "%s has become accessible"
 msgstr "`%s'�(가) 접근 가능하게 �었습니다"
 
 # 좀 � �연스럽게
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, fuzzy, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr "`%s'�(가) 나타났습니다;  새로운 파�� �� �어서 나타났습니다"
 
 # 좀 � �연스럽게
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, fuzzy, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr "`%s'�(가) 대체�었습니다;  새로운 파�� �� �어서 대체�었습니다"
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, fuzzy, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr "%s� 소유� 그리고/혹� 그룹� 바꿀 수 없습니다"
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr "%s: 파�� 잘렸�"
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr "파�� 남아 있지 않습니다"
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, fuzzy, c-format
 msgid "cannot watch parent directory of %s"
 msgstr "%s 디렉토리를 만들 수 없습니다"
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, fuzzy, c-format
 msgid "inotify resources exhausted"
 msgstr "메모리가 바닥남"
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, fuzzy, c-format
 msgid "cannot watch %s"
 msgstr "%s 디렉토리를 만들 수 없습니다"
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr ""
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, fuzzy, c-format
 msgid "error reading inotify event"
 msgstr "%s�(를) �는 �중 오류 발�"
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr ""
 "`%s'�(는) �런 종류� 파� 뒤� �어서 나올 수 없습니다; � �름� �기합니"
 "다"
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, fuzzy, c-format
 msgid "number in %s is too large"
 msgstr "%s�(는) 너무 �니다"
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr "%s: 열기중� 바뀌지 않� stat� 최대 개수가 부�절합니다"
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr "%s: 부�절한 PID"
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr "%s: 부�절한 초"
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr ""
 
-#: src/tail.c:2034
+#: src/tail.c:2096
 #, fuzzy, c-format
-msgid "warning: --retry is useful mainly when following by name"
-msgstr "경고: --retry는 --follow=name 옵션� 사용했� 경우만 유효합니다"
+msgid "warning: --retry ignored; --retry is useful only when following"
+msgstr ""
+"경고: PID 무시; `--pid=PID'는 --follow 옵션과 같� 사용했� 경우만 유효합니다"
 
-#: src/tail.c:2038
+#: src/tail.c:2100
+#, c-format
+msgid "warning: --retry only effective for the initial open"
+msgstr ""
+
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
 msgstr ""
 "경고: PID 무시; `--pid=PID'는 --follow 옵션과 같� 사용했� 경우만 유효합니다"
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr "경고: `--pid=PID'는 � 시스템�서 지�하지 않습니다"
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, fuzzy, c-format
 msgid "cannot follow %s by name"
 msgstr "임시 파�� 만들 수 없습니다"
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr ""
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr ""
@@ -9953,9 +10031,8 @@ msgid "Matthew Bradburn"
 msgstr ""
 
 #: src/test.c:858
-#, fuzzy
 msgid "missing ']'"
-msgstr "%s: `%c' 뒤� 정수가 와야함"
+msgstr ""
 
 #: src/test.c:872
 #, fuzzy, c-format
@@ -9967,17 +10044,17 @@ msgstr "�수가 너무 많�"
 msgid "warning: sigprocmask"
 msgstr ""
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr ""
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr ""
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
@@ -9986,31 +10063,29 @@ msgstr ""
 "사용법: %s [<파�>]...\n"
 " 혹�:  %s [<옵션>]\n"
 
-#: src/timeout.c:229
-#, fuzzy
+#: src/timeout.c:232
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
-msgstr "긴 옵션�서 꼭 필요한 �수는 짧� 옵션�� 꼭 필요합니다.\n"
+msgstr ""
 
-#: src/timeout.c:235
+#: src/timeout.c:238
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 msgid ""
 "\n"
 "DURATION is a floating point number with an optional suffix:\n"
@@ -10018,7 +10093,7 @@ msgid ""
 "days.\n"
 msgstr ""
 
-#: src/timeout.c:259
+#: src/timeout.c:262
 msgid ""
 "\n"
 "If the command times out, and --preserve-status is not set, then exit with\n"
@@ -10029,17 +10104,17 @@ msgid ""
 "case the exit status is 128+9 rather than 124.\n"
 msgstr ""
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr ""
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, fuzzy, c-format
 msgid "error waiting for command"
 msgstr "%s� 쓰는 �중 오류 발�"
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr ""
@@ -10400,7 +10475,7 @@ msgstr ""
 #: src/truncate.c:115
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 
 #: src/truncate.c:121
@@ -10484,12 +10559,12 @@ msgstr ""
 "<파�>� 주어지지 않거나, <파�>� `-'�면, 표준 입력� �습니다.\n"
 "\n"
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, fuzzy, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr "%s: 입력� 루프가 들어가 있습니다 loop:"
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr "%s: 입력� 루프가 들어가 있습니다 loop:"
@@ -10568,12 +10643,12 @@ msgstr ""
 msgid "tab stop value is too large"
 msgstr "%s�(는) 너무 �니다"
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr "사용법: %s [옵션]... [<입력> [<출력>]]\n"
 
-#: src/uniq.c:138
+#: src/uniq.c:174
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
 "writing to OUTPUT (or standard output).\n"
@@ -10581,40 +10656,46 @@ msgid ""
 "With no options, matching lines are merged to the first occurrence.\n"
 msgstr ""
 
-#: src/uniq.c:147
+#: src/uniq.c:183
+#, fuzzy
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
 msgstr ""
 "  -c, --count           줄 앞� 반복� 회수를 �니다\n"
 "  -d, --repeated        반복� 줄만 표시합니다\n"
 
-#: src/uniq.c:151
-#, fuzzy
+#: src/uniq.c:187
+msgid ""
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
+msgstr ""
+
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr ""
+
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
+msgstr ""
+
+#: src/uniq.c:199
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
 "  -i, --ignore-case     ignore differences in case when comparing\n"
 "  -s, --skip-chars=N    avoid comparing the first N characters\n"
 "  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
 msgstr ""
-"  -D, --all-repeated[=delimit-method] 모든 반복� 줄� 표시합니다\n"
-"                        delimit-method={none(기본값),prepend,separate)}\n"
-"                        빈 줄� 기준으로 구분합니다.\n"
-"  -f, --skip-fields=N   첫번째 N개� 필드를 비�하지 않습니다\n"
-"  -i, --ignore-case     비�할 때 대소문�� 차�를 무시합니다\n"
-"  -s, --skip-chars=N    첫번째 N개� 문�를 비�하지 않습니다\n"
-"  -u, --unique          유�한 줄만� 표시합니다\n"
 
-#: src/uniq.c:161
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr "  -w, --check-chars=N   한 줄� N개� 문�까지만 비�합니다\n"
 
 # ??
-#: src/uniq.c:166
+#: src/uniq.c:212
 #, fuzzy
 msgid ""
 "\n"
@@ -10625,7 +10706,7 @@ msgstr ""
 "한 필드는 공백��고, 그 다�� 공백문�가 아닌 문�들� 있습니다.\n"
 "문�가 나오기 전� 필드는 건너 �니다\n"
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 msgid ""
 "\n"
 "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n"
@@ -10633,24 +10714,34 @@ msgid ""
 "Also, comparisons honor the rules specified by 'LC_COLLATE'.\n"
 msgstr ""
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, fuzzy, c-format
 msgid "too many repeated lines"
 msgstr "�수가 너무 많�"
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
 msgstr "건너 뛸 필드� 개수가 부�절합니다"
 
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
 msgstr "건너 뛸 바�트 수가 부�절합니다"
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
 msgstr "비�할 바�트� 개수가 부�절합니다"
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr ""
+
+#: src/uniq.c:652
+#, fuzzy, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr "반복� 줄� 표시하고 회수를 세는 것� 무�미합니다"
+
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr "반복� 줄� 표시하고 회수를 세는 것� 무�미합니다"
@@ -10670,11 +10761,6 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/unlink.c:86
-#, fuzzy, c-format
-msgid "cannot unlink %s"
-msgstr "`%s'�서 ioctl� 할 수 없습니다"
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -10719,7 +10805,7 @@ msgstr[1] "잘못� 사용�"
 msgid ",  load average: %.2f"
 msgstr ""
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -10727,19 +10813,19 @@ msgid ""
 "in the run queue over the last 1, 5 and 15 minutes."
 msgstr ""
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
 "an uninterruptible sleep state also contribute to the load average.\n"
 msgstr ""
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr ""
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
@@ -10935,151 +11021,6 @@ msgid ""
 "\n"
 msgstr ""
 
-#, fuzzy
-#~ msgid "  returning value: '%s'\n"
-#~ msgstr "파� `%s'�(를) 만듦\n"
-
-#, fuzzy
-#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n"
-#~ msgstr "사용법: %s [<옵션>] [<파�>]...\n"
-
-#, fuzzy
-#~ msgid "no valid suffix found\n"
-#~ msgstr "%s: 부�절한 접미어 길�"
-
-#~ msgid "Try `%s --help' for more information.\n"
-#~ msgstr "� 많� 정보를 보려면 `%s --help' 하십시오.\n"
-
-#, fuzzy
-#~ msgid "reading %s"
-#~ msgstr "%s�(를) �는 �중 오류 발�"
-
-#, fuzzy
-#~ msgid "writing %s"
-#~ msgstr "%s� 쓰는 �중 오류 발�"
-
-#, fuzzy
-#~ msgid "closing %s"
-#~ msgstr "%s(fd=%d)�(를) 닫습니다 "
-
-#, fuzzy
-#~ msgid "accessing %s"
-#~ msgstr "%s를 지�니다\n"
-
-#, fuzzy
-#~ msgid "opening %s"
-#~ msgstr "%s�(를) �는 �중 오류 발�"
-
-#, fuzzy
-#~ msgid ""
-#~ "Usage: %s NAME\n"
-#~ "  or:  %s OPTION\n"
-#~ msgstr ""
-#~ "사용법: %s [<파�>]...\n"
-#~ " 혹�:  %s [<옵션>]\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "  none, off       never make backups (even if --backup is given)\n"
-#~ "  numbered, t     make numbered backups\n"
-#~ "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
-#~ "  simple, never   always make simple backups\n"
-#~ "\n"
-#~ msgstr ""
-#~ "--suffix나 SIMPLE_BACKUP_SUFFIX환경변수� 지정하지 않으면 백업 접미사는\n"
-#~ "~입니다.\n"
-#~ "버전 제어는 --backup옵션�나 VERSION_CONTROL환경변수로 지정하며, \n"
-#~ "다�과 같습니다:\n"
-#~ "\n"
-#~ "  none, off       백업� 하지 않습니다(--backup� 주어�)\n"
-#~ "  numbered, t     번호가 주어진 백업� 만듭니다\n"
-#~ "  existing, nil   번호가 주어진 백업� 있으면 번호를 주고, 그렇지 않으면\n"
-#~ "                  단순하게 합니다\n"
-#~ "  simple, never   항� 단순 백업� 합니다\n"
-
-#~ msgid "All arguments to long options are mandatory for short options.\n"
-#~ msgstr "긴 옵션� �수는 짧� 옵션�� 꼭 필요합니다.\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "RADIX is d for decimal, o for octal, x for hexadecimal or n for none.\n"
-#~ "BYTES is hexadecimal with 0x or 0X prefix, and may have a multiplier "
-#~ "suffix:\n"
-#~ "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
-#~ "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n"
-#~ "Adding a z suffix to any type displays printable characters at the end of "
-#~ "each\n"
-#~ "output line.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "<기수>는 십진수� 경우 d, 8진수는 o, 16진수는 x, 아무것� 아니면 n입니"
-#~ "다.\n"
-#~ "<바�트>는 0x나 0X를 붙� 16진수�며, b 접미어가 붙으면, 512가 곱해 지"
-#~ "ê³ ,\n"
-#~ "k는 1024, m� 1048576� 곱해 집니다.  어떤 타입��� z 접미어를 �붙�"
-#~ "ë©´\n"
-#~ "출력 줄� �� 표시 가능한 문�들� 표시하게 �니다.  "
-
-#, fuzzy
-#~ msgid ""
-#~ "Option --string without a number implies 3; option --width without a "
-#~ "number\n"
-#~ "implies 32.  By default, od uses -A o -t oS -w16.\n"
-#~ msgstr ""
-#~ "-string� 숫� 없� 쓰면 3��고 가정합니다.  --width를 숫� 없� 쓰면 32"
-#~ "를\n"
-#~ "가정합니다.  기본값으로 od는 `-A -o -t d2 -w 16'� �니다.\n"
-
-#, fuzzy
-#~ msgid "Usage: %s [OPTION]... FILE\n"
-#~ msgstr "사용법: %s [<옵션>]... [<파�>]...\n"
-
-#, fuzzy
-#~ msgid "getpass: cannot open /dev/tty"
-#~ msgstr "`%s'디렉토리를 지울 수 없습니다"
-
-#, fuzzy
-#~ msgid "cannot set groups"
-#~ msgstr "사용�와 그룹� 모� �략할 수는 없습니다"
-
-#, fuzzy
-#~ msgid "cannot set group id"
-#~ msgstr "사용�와 그룹� 모� �략할 수는 없습니다"
-
-#, fuzzy
-#~ msgid "cannot set user id"
-#~ msgstr "사용�와 그룹� 모� �략할 수는 없습니다"
-
-#, fuzzy
-#~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n"
-#~ msgstr "사용법: %s [<옵션>]... [<파�>]...\n"
-
-#, fuzzy
-#~ msgid "warning: cannot change directory to %s"
-#~ msgstr "%s 디렉토리를 만들 수 없습니다"
-
-#, fuzzy
-#~ msgid ""
-#~ "  -f, --silent, --quiet   suppress most error messages\n"
-#~ "  -v, --verbose           output a diagnostic for every file processed\n"
-#~ "      --reference=RFILE   use RFILE's mode instead of MODE values\n"
-#~ "  -R, --recursive         change files and directories recursively\n"
-#~ msgstr ""
-#~ "� FILE� 모드를 MODE로 변경합니다.\n"
-#~ "\n"
-#~ "  -c, --changes           verbose와 같지만 변경할때만 알립니다\n"
-#~ "  -f, --silent, --quiet   대부분� �러메시지를 내지 않게 합니다\n"
-#~ "  -v, --verbose           처리�는 모든 파�� 대해 진단 메시지를 출력합니"
-#~ "다\n"
-#~ "      --reference=RFILE   MODE 값 대신 RFILE� 모드값� 사용합니다\n"
-#~ "  -R, --recursive         파�과 서브디렉토리까지 변경합니다\n"
-#~ "      --help              � �움�� 표시하고 종료합니다\n"
-#~ "      --version           버전 정보를 표시하고 종료합니다\n"
-#~ "\n"
-#~ "� MODE는 하나 ��� u,g,o,a문� 다�� +,-,=중� 하나� 기호와\n"
-#~ "그 다�� r,w,x,X,s,t,u,g,o중 하나� 문�로 구성�니다.\n"
-
 #~ msgid "program error"
 #~ msgstr "프로그램 오류"
 
@@ -11111,6 +11052,9 @@ msgstr ""
 #~ "�품성�나 특정 목�� 대한 �합성� 비롯하여, 어떠한 보�� 하지 않습니"
 #~ "다.\n"
 
+#~ msgid "Try `%s --help' for more information.\n"
+#~ msgstr "� 많� 정보를 보려면 `%s --help' 하십시오.\n"
+
 #~ msgid "too few arguments"
 #~ msgstr "�수가 너무 ��"
 
@@ -11135,6 +11079,18 @@ msgstr ""
 #~ msgstr "사용법: %s [<옵션>]... <왼쪽_파�> <오른쪽_파�>\n"
 
 #, fuzzy
+#~ msgid "reading %s"
+#~ msgstr "%s�(를) �는 �중 오류 발�"
+
+#, fuzzy
+#~ msgid "writing %s"
+#~ msgstr "%s� 쓰는 �중 오류 발�"
+
+#, fuzzy
+#~ msgid "closing %s"
+#~ msgstr "%s(fd=%d)�(를) 닫습니다 "
+
+#, fuzzy
 #~ msgid "cannot overwrite directory %s"
 #~ msgstr "%s 디렉토리를 만들 수 없습니다"
 
@@ -11171,6 +11127,10 @@ msgstr ""
 #~ msgstr "�수가 너무 ��"
 
 #, fuzzy
+#~ msgid "accessing %s"
+#~ msgstr "%s를 지�니다\n"
+
+#, fuzzy
 #~ msgid "%s: specified target is not a directory"
 #~ msgstr "%s�(가) 존재하지만 디렉토리가 아닙니다"
 
@@ -11231,6 +11191,10 @@ msgstr ""
 #~ "{ascii,ebcdic,ibm}, {lcase,ucase}, {block,unblock}, {unblock,sync}중� 하"
 #~ "나� conv만 가능합니다"
 
+#, fuzzy
+#~ msgid "opening %s"
+#~ msgstr "%s�(를) �는 �중 오류 발�"
+
 #~ msgid ""
 #~ "no FILE arguments may be used with the option to output\n"
 #~ "dircolors' internal database"
@@ -11279,6 +11243,9 @@ msgstr ""
 #~ "<�기>� 접미어로 그 단위를 나타낼 수 있습니다; b는 512, k는 1킬로, m� 1"
 #~ "메가입니다.\n"
 
+#~ msgid "cannot reposition file pointer for %s"
+#~ msgstr "%s� 대한 파� ��터를 재위치할 수 없습니다"
+
 #~ msgid "unrecognized option `-%c'"
 #~ msgstr "��할 수 없는 옵션 `-%c'"
 
@@ -11328,9 +11295,6 @@ msgstr ""
 #~ msgid "invalid field number for file 2: `%s'"
 #~ msgstr "파� 2� 대한 필드 번호로 부�절함: `%s'"
 
-#~ msgid "too many non-option arguments"
-#~ msgstr "옵션아닌 �수가 너무 많�"
-
 #~ msgid "too few non-option arguments"
 #~ msgstr "옵션아닌 �수가 너무 ��"
 
@@ -11422,10 +11386,6 @@ msgstr ""
 #~ msgstr "major와 minor장치번호는 fifo파��는 설정할 수 없습니다"
 
 #, fuzzy
-#~ msgid "cannot set permissions of %s"
-#~ msgstr "%s� 허가를 바꿀 수 없습니다"
-
-#, fuzzy
 #~ msgid "Mike Parker, David MacKenzie, and Jim Meyering"
 #~ msgstr "David Ihnat, David MacKenzie, 그리고 Jim Meyering"
 
@@ -11451,6 +11411,43 @@ msgstr ""
 #~ msgid "Scott Bartram and David MacKenzie"
 #~ msgstr "Scott Bartram 그리고 David MacKenzie"
 
+#~ msgid "All arguments to long options are mandatory for short options.\n"
+#~ msgstr "긴 옵션� �수는 짧� 옵션�� 꼭 필요합니다.\n"
+
+#~ msgid ""
+#~ "  -A, --address-radix=RADIX   decide how file offsets are printed\n"
+#~ "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
+#~ msgstr ""
+#~ "  -A, --address-radix=<기수>  파� 오프셋� 출력하는 방법� 지정합니다\n"
+#~ "  -j, --skip-bytes=<바�트>   입력� 첫 번째 <바�트> 바�트를 건너 �니"
+#~ "다\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "RADIX is d for decimal, o for octal, x for hexadecimal or n for none.\n"
+#~ "BYTES is hexadecimal with 0x or 0X prefix, it is multiplied by 512\n"
+#~ "with b suffix, by 1024 with k and by 1048576 with m.  Adding a z suffix "
+#~ "to\n"
+#~ "any type adds a display of printable characters to the end of each line\n"
+#~ "of output.  "
+#~ msgstr ""
+#~ "\n"
+#~ "<기수>는 십진수� 경우 d, 8진수는 o, 16진수는 x, 아무것� 아니면 n입니"
+#~ "다.\n"
+#~ "<바�트>는 0x나 0X를 붙� 16진수�며, b 접미어가 붙으면, 512가 곱해 지"
+#~ "ê³ ,\n"
+#~ "k는 1024, m� 1048576� 곱해 집니다.  어떤 타입��� z 접미어를 �붙�"
+#~ "ë©´\n"
+#~ "출력 줄� �� 표시 가능한 문�들� 표시하게 �니다.  "
+
+#~ msgid ""
+#~ "--string without a number implies 3.  --width without a number\n"
+#~ "implies 32.  By default, od uses -A o -t d2 -w 16.\n"
+#~ msgstr ""
+#~ "-string� 숫� 없� 쓰면 3��고 가정합니다.  --width를 숫� 없� 쓰면 32"
+#~ "를\n"
+#~ "가정합니다.  기본값으로 od는 `-A -o -t d2 -w 16'� �니다.\n"
+
 #~ msgid "old-style offset"
 #~ msgstr "옛날 방�� 옵셋"
 
@@ -11532,6 +11529,14 @@ msgstr ""
 #~ msgstr "%s: 부�절한 패턴"
 
 #~ msgid ""
+#~ "\n"
+#~ "With no FILE or if FILE is -, read Standard Input.  `-F /' by default.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "<파�>� 주어지지 않거나, <파�>� `-'�면, 표준 입력� �습니다.  `-"
+#~ "F /'가 기본값입니다.\n"
+
+#~ msgid ""
 #~ "This program is free software; you can redistribute it and/or modify\n"
 #~ "it under the terms of the GNU General Public License as published by\n"
 #~ "the Free Software Foundation; either version 2, or (at your option)\n"
@@ -11646,6 +11651,18 @@ msgstr ""
 #~ msgid "Usage: %s [OPTION] FILE...\n"
 #~ msgstr "사용법: %s [<옵션>] [<파�>]...\n"
 
+#, fuzzy
+#~ msgid "getpass: cannot open /dev/tty"
+#~ msgstr "`%s'디렉토리를 지울 수 없습니다"
+
+#, fuzzy
+#~ msgid "cannot set group id"
+#~ msgstr "사용�와 그룹� 모� �략할 수는 없습니다"
+
+#, fuzzy
+#~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n"
+#~ msgstr "사용법: %s [<옵션>]... [<파�>]...\n"
+
 #~ msgid "Jay Lepreau and David MacKenzie"
 #~ msgstr "Jay Lepreau 그리고 David MacKenzie"
 
@@ -11710,6 +11727,9 @@ msgstr ""
 #~ msgid "%s: invalid maximum number of consecutive size changes"
 #~ msgstr "%s: 지��� �기 변화� 최대 개수가 부�절합니다"
 
+#~ msgid "warning: --retry is useful only when following by name"
+#~ msgstr "경고: --retry는 --follow=name 옵션� 사용했� 경우만 유효합니다"
+
 #, fuzzy
 #~ msgid "Mike Parker, Richard M. Stallman, and David MacKenzie"
 #~ msgstr "Richard Stallman 그리고 David MacKenzie"
@@ -11790,6 +11810,23 @@ msgstr ""
 #~ "모� 지워서 <출력>(혹� 표준 출력)� �니다.\n"
 #~ "\n"
 
+#~ msgid ""
+#~ "  -D, --all-repeated[=delimit-method] print all duplicate lines\n"
+#~ "                        delimit-method={none(default),prepend,separate}\n"
+#~ "                        Delimiting is done with blank lines.\n"
+#~ "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+#~ "  -i, --ignore-case     ignore differences in case when comparing\n"
+#~ "  -s, --skip-chars=N    avoid comparing the first N characters\n"
+#~ "  -u, --unique          only print unique lines\n"
+#~ msgstr ""
+#~ "  -D, --all-repeated[=delimit-method] 모든 반복� 줄� 표시합니다\n"
+#~ "                        delimit-method={none(기본값),prepend,separate)}\n"
+#~ "                        빈 줄� 기준으로 구분합니다.\n"
+#~ "  -f, --skip-fields=N   첫번째 N개� 필드를 비�하지 않습니다\n"
+#~ "  -i, --ignore-case     비�할 때 대소문�� 차�를 무시합니다\n"
+#~ "  -s, --skip-chars=N    첫번째 N개� 문�를 비�하지 않습니다\n"
+#~ "  -u, --unique          유�한 줄만� 표시합니다\n"
+
 #~ msgid "`-%lu' option is obsolete; use `-f %lu'"
 #~ msgstr "`-%lu' 옵션� 없어졌습니다; `-f %lu'�(를) 사용하십시오"
 
diff --git a/po/lg.gmo b/po/lg.gmo
index 955fa18a..9714b5d1 100644
--- a/po/lg.gmo
+++ b/po/lg.gmo
diff --git a/po/lg.po b/po/lg.po
index 15580557..a4bd2626 100644
--- a/po/lg.po
+++ b/po/lg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: coreutils 8.7\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
 "PO-Revision-Date: 2011-02-15 20:47+0000\n"
 "Last-Translator: Kizito Birabwa <kbirabwa@yahoo.co.uk>\n"
 "Language-Team: Luganda <kbirabwa@yahoo.co.uk>\n"
@@ -37,76 +37,124 @@ msgstr "Augumenti z'oyinza okuwa ziri:"
 msgid "error closing file"
 msgstr "wazzewo kiremya mu kubikka fayiro"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "Wazzewo kiremya mu kuwandika mu fayiro"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "endukusa ez'oku %s tezikyusidwa"
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "Wazzewo kiremya atategeerese mu sisitemu"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "fayiro eyabulijjo etaliimu kantu"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "fayiro eya bulijjo"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "lino tterekero"
 
-#: lib/file-type.c:44
-msgid "block special file"
-msgstr "ffayiro ey'enjawulo eya kika kya buloka"
-
-#: lib/file-type.c:47
-msgid "character special file"
-msgstr "fayiro ey'enjawulo ey'ekika kya nnukuta"
-
-#: lib/file-type.c:50
-msgid "fifo"
-msgstr "FIFO"
-
-#: lib/file-type.c:53
+#: lib/file-type.c:46
 msgid "symbolic link"
 msgstr "(fayiro) enyunzi ey'eyawudde"
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "soketi"
-
-#: lib/file-type.c:59
+#: lib/file-type.c:52
 msgid "message queue"
 msgstr "ddiindiro erya bubaka"
 
-#: lib/file-type.c:62
+#: lib/file-type.c:55
 msgid "semaphore"
 msgstr "semafora"
 
-#: lib/file-type.c:65
+#: lib/file-type.c:58
 msgid "shared memory object"
 msgstr "kisibe kya mu ggwanika ery'awamu"
 
-#: lib/file-type.c:68
+#: lib/file-type.c:61
 msgid "typed memory object"
 msgstr "kyetongole eky'omuggwanika ekikazidwako ekika"
 
-#: lib/file-type.c:70
+#: lib/file-type.c:66
+msgid "block special file"
+msgstr "ffayiro ey'enjawulo eya kika kya buloka"
+
+#: lib/file-type.c:69
+msgid "character special file"
+msgstr "fayiro ey'enjawulo ey'ekika kya nnukuta"
+
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr ""
+
+#: lib/file-type.c:75
+msgid "fifo"
+msgstr "FIFO"
+
+#: lib/file-type.c:78
+msgid "door"
+msgstr ""
+
+#: lib/file-type.c:81
+#, fuzzy
+msgid "multiplexed block special file"
+msgstr "ffayiro ey'enjawulo eya kika kya buloka"
+
+#: lib/file-type.c:84
+#, fuzzy
+msgid "multiplexed character special file"
+msgstr "fayiro ey'enjawulo ey'ekika kya nnukuta"
+
+#: lib/file-type.c:87
+#, fuzzy
+msgid "multiplexed file"
+msgstr "amatuluba g'abakozesa gasukka ku limu"
+
+#: lib/file-type.c:90
+#, fuzzy
+msgid "named file"
+msgstr "fayiro etategeereka"
+
+#: lib/file-type.c:93
+#, fuzzy
+msgid "network special file"
+msgstr "ffayiro ey'enjawulo eya kika kya buloka"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr ""
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr ""
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr ""
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "soketi"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr ""
+
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "fayiro etategeereka"
 
@@ -267,18 +315,18 @@ msgstr "%s: akawayiro '-W %s' tekabeerako agumenti\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: akawayiro '-W %s' kateekwa okubaako agumenti\n"
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr "nnemedwa okukyusa obuyinza obw'oku %s"
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "nnemedwa okukolawo tterekero %s"
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr "ggwanika lijjudde"
@@ -397,7 +445,7 @@ msgstr "Emboozi enoonya ebifaanagana eyitiridde obunene"
 msgid "Unmatched ) or \\)"
 msgstr "Waliwo ) oba \\) ebulako ginne wa yo"
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 msgid "No previous regular expression"
 msgstr "Emabega tewali yo mboozi enoonya ebifaanagana"
 
@@ -423,7 +471,7 @@ msgstr "bw'obanga toyagala ekitaakiriza kino kikole, kozesa --no-preserve-root"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[yY]"
 
@@ -433,11 +481,11 @@ msgstr "^[yY]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, c-format
 msgid "setting permissions for %s"
 msgstr "ntegeka endukusa ez'oku %s"
@@ -636,18 +684,6 @@ msgstr ""
 "                  singa fayiro gye kikozesa erekerawo okugaana emirimu\n"
 "                  emirala okugikozesa mu kiseera kyekimu nayo"
 
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, fuzzy, c-format
-msgid "cannot create pipe"
-msgstr "sisobola okukolawo fifo %s"
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, fuzzy, c-format
-msgid "%s subprocess failed"
-msgstr "%s: tekisobose kutereeza aw'okusoma mu fayiro"
-
 #: lib/strsignal.c:114
 #, c-format
 msgid "Real-time signal %d"
@@ -860,7 +896,7 @@ msgstr ""
 msgid "Report %s bugs to: %s\n"
 msgstr "Bw'osangamu ebitali butuufu mu %s, tegeeza: %s\n"
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Enfo ey'oku neti eya %s esangibwa ku: <%s>\n"
@@ -870,32 +906,12 @@ msgstr "Enfo ey'oku neti eya %s esangibwa ku: <%s>\n"
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr "Enfo eya %s esanngibwa ku: <http://www.gnu.org/software/%s/>\n"
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr ""
 "Osobola okufuna ebikuyamba okutegeera enkozesa\n"
 "eya sofutiweya owa GNU ku: <http://www.gnu.org/gethelp/>\n"
 
-#: lib/w32spawn.h:43
-#, fuzzy, c-format
-msgid "_open_osfhandle failed"
-msgstr "sisobodde okubikkula fayiro"
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr ""
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr ""
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr ""
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr "stdin"
@@ -917,7 +933,7 @@ msgstr "ekifo ekitamanyidwa"
 msgid "failed to reopen %s with mode %s"
 msgstr "nnemedwa okuddamu okubikkula %s nga nkozesa ndukusa %s"
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr "okugerageranya ebigambo kugaanye"
@@ -983,7 +999,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -1008,48 +1024,47 @@ msgstr ""
 "Data bw'eba nga eyinz'okubaamu obubonero obutali bwa mu walifu obulala\n"
 "osobola okussaako akawayiro --ignore-garbage buleme okugutawanya.\n"
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "wazzewo kiremya mu kusoma"
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, c-format
 msgid "invalid input"
 msgstr "ebiyingizibwa tebikkirizibwa"
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, c-format
 msgid "invalid wrap size: %s"
 msgstr "ebifo by'ogambye ekiragiro okuwandika mu nnyiriri tebisoboka: %s"
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, c-format
 msgid "extra operand %s"
 msgstr "waliwo ekifuulibwa eky'enfissi %s"
 
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, c-format
 msgid "closing standard input"
 msgstr "nsibako awayingizibwa awa bulijjo"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -1081,8 +1096,8 @@ msgstr ""
 #: src/basename.c:60
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/basename.c:67
@@ -1096,32 +1111,31 @@ msgid ""
 "  %s -a any/str1 any/str2   -> \"str1\" followed by \"str2\"\n"
 msgstr ""
 
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, c-format
 msgid "missing operand"
 msgstr "kubulako ekifuulibwa"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr "Torbjorn Granlund"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 msgid "Richard M. Stallman"
 msgstr "Richard M. Stallman"
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1192,7 +1206,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr "nemedwa okukola ioctl ku %s"
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr "awateekebwa ebiva mu zipulogulamu awa bulijjo"
@@ -1209,14 +1223,14 @@ msgstr "Russell Coker"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 msgid "Jim Meyering"
 msgstr "Jim Meyering"
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, c-format
 msgid "failed to create security context: %s"
 msgstr "nnemedwa okukolawo endukusa eza SELinux: %s"
@@ -1226,8 +1240,8 @@ msgstr "nnemedwa okukolawo endukusa eza SELinux: %s"
 msgid "failed to set %s security context component to %s"
 msgstr "nnemedwa okutegeka olukusa olwa %s olwa SELinux lubeere %s"
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, c-format
 msgid "failed to get security context of %s"
 msgstr "nnemedwa okukebera endukusa eza SELinux eza %s"
@@ -1239,20 +1253,20 @@ msgstr ""
 "sisobola okutegeka olukusa olwa SELinux olutalaga\n"
 "gwe lukwatako ku fayiro etannalambibwa %s"
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, c-format
 msgid "failed to change context of %s to %s"
 msgstr ""
 "nnemedwa okukyusa endukusa eza\n"
 "SELinux ez'oku %s zifuuke %s"
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
 msgstr "nnemedwa okubikkula %s"
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, c-format
 msgid "cannot read directory %s"
 msgstr "nemedwa okusoma mu tterekero %s"
@@ -1262,13 +1276,14 @@ msgstr "nemedwa okusoma mu tterekero %s"
 msgid "changing security context of %s\n"
 msgstr "nkyusa endukusa eza SELinux ez'oku %s\n"
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, c-format
 msgid "fts_read failed"
 msgstr "fts_read eremedwa okuzuula ebikwata ku fayiro"
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, c-format
 msgid "fts_close failed"
 msgstr "omulimu 'fts_close' gugaanye"
@@ -1287,7 +1302,7 @@ msgstr ""
 #: src/chcon.c:357
 #, fuzzy
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
@@ -1330,7 +1345,7 @@ msgstr ""
 "                         ekikola ku lubu ne kiba LUBU\n"
 "\n"
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 #, fuzzy
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
@@ -1394,40 +1409,41 @@ msgstr ""
 "                         ez'eyawudde (y'enkola eya bulijjo)\n"
 "\n"
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr ""
 "Akawayiro aka '-R' oba '--dereference' tekakola\n"
 "okugyako nga kuliko n'aka '-H' oba aka '-L'"
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr ""
 "Obuwayiro obwa '-R' ne '-h' tebukola\n"
 "okujjako nga kuliko n'aka '-P'"
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, c-format
 msgid "missing operand after %s"
 msgstr "kubulako ekifuulibwa luvanyuma lwa %s"
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, c-format
 msgid "invalid context: %s"
 msgstr "luno olukusa ssi lutuufu: %s"
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr "owaddeyo ebitundu eby'endukusa ebitakolagana"
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, c-format
 msgid "failed to get attributes of %s"
 msgstr "nemedwa okufuna atiributo eza %s"
@@ -1463,7 +1479,7 @@ msgstr ""
 " kizikolako naye fayiro ze ziggukako zo kizereka nga\n"
 "bwe zibadde.\n"
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
@@ -1503,49 +1519,49 @@ msgstr ""
 "  %s -hR sitaafu /u  Ekyo kyo kikusa guluupu ey'etterekero /u ne\n"
 "                     fayiro zaamu n'eba \"sitaafu\".\n"
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
 msgstr "nnona atiributo empya eza %s"
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr "ku nyunzi ey'eyawudde %s ne fayiro kw'egguka tekuli kikyusidwa\n"
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, fuzzy, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr "ndukusa ez'oku %s zikyusidwa zibe %04lo (%s)\n"
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, fuzzy, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr "nnemedwa okukyusa ndukusa ez'oku %s zibe %04lo (%s)\n"
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr "ndukusa ez'oku %s zirekedwawo nga ziri %04lo (%s)\n"
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr ""
 "fayiro ennyunzi ey'ewaudde %s terina\n"
 "kw'egguka, sisobola okugikolako"
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, c-format
 msgid "changing permissions of %s"
 msgstr "nkyusa obuyinza obw'oku %s"
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr "%s: endukusa empya ziri %s, ssi %s"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1556,7 +1572,7 @@ msgstr ""
 "  oba.  %s [KAWAYIRO]... NDUKUSA-MU-OKITA FAYIRO...\n"
 "  oba. %s [KAWAYIRO]... --reference=RFAYIRO FAYIRO... \n"
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 #, fuzzy
 msgid ""
 "Change the mode of each FILE to MODE.\n"
@@ -1573,22 +1589,15 @@ msgstr ""
 " kizikolako naye fayiro ze ziggukako zo kizereka nga\n"
 "bwe zibadde.\n"
 
-#: src/chmod.c:391
-#, fuzzy
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
-"      --reference=RFAYIRO  Akawayiro kano kakireetera okufuula endukusa\n"
-"                         ez'oku fayiro zibe ze zimu n'ezoku RFAYIRO\n"
-"  -R, --recursive        Bw'oteekawo kam ku buno ekiragiro bwe kikola ku\n"
-"                         tterekero, ne fayiro ezilirimu kizikolako\n"
-"  -v, --verbose          Buno bwo bukireetera okuwandika ebiva mu kukola ku\n"
-"                         buli fayiro\n"
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr ""
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 #, fuzzy
 msgid ""
 "\n"
@@ -1598,14 +1607,14 @@ msgstr ""
 "Buli LUKUSA lulagibwa ne nukuta ezirondedwa mu u,g,o ne a, emu ku bubonero\n"
 "+,-,= , ko n'ennukuta ezirondedwa mu r,w,x,X,s,t,u,g ne o.\n"
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr ""
 "bw'okozesa akawayiro aka '--reference'\n"
 "tosobola ate okutegeka ndukusa obutereevu"
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, c-format
 msgid "invalid mode: %s"
 msgstr "olukusa %s telukkirizibwa"
@@ -1753,26 +1762,21 @@ msgstr ""
 "                     fayiro zaamu.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr "Roland McGrath"
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr "tewali guluupu eyitibwa %s"
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, c-format
 msgid "invalid group list %s"
 msgstr "olukalala lwa guluupu, %s, ssi lutuufu"
 
-#: src/chroot.c:117
-#, c-format
-msgid "failed to set additional groups"
-msgstr "nnemedwa okutegeka guluupu ez'ennyongeza"
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
@@ -1781,7 +1785,7 @@ msgstr ""
 "Enkozesa entuufu eri: %s [KAWAYIRO] MUSINGIMUPYA [KIRAGIRO.[AGUMENTI]...]\n"
 "  oba:  %s KAWAYIRO\n"
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
@@ -1790,7 +1794,7 @@ msgstr ""
 "ery'oku musingi liri MUSINGIMUPYA.\n"
 "\n"
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
@@ -1801,7 +1805,7 @@ msgstr ""
 "  --groups=ZI-GULUUPU    Kano ko kaleetera ekiragiro okukola nga ekiyisidwa\n"
 "                         omukozesa alina guluupu ez'enyongeza g1,g2,..,gN\n"
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 #, fuzzy
 msgid ""
 "\n"
@@ -1813,28 +1817,42 @@ msgstr ""
 "eya\n"
 "bulijjo ye: /bin/sh).\n"
 
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, c-format
 msgid "cannot change root directory to %s"
 msgstr "etterekero %s nemedwa okulifuula ery'oku musingi"
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, c-format
 msgid "cannot chdir to root directory"
 msgstr "nnemedwa kukyusa okugenda ku tterekero ery'oku musingi"
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr ""
+
+#: src/chroot.c:383
+#, fuzzy, c-format
+msgid "failed to get supplemental groups"
+msgstr "tekisobose okwongerako guluupu ey'enyongeza"
+
+#: src/chroot.c:395
+#, fuzzy, c-format
+msgid "failed to %s supplemental groups"
+msgstr "tekisobose okwongerako guluupu ey'enyongeza"
+
+#: src/chroot.c:402
 #, c-format
 msgid "failed to set group-ID"
 msgstr "nnemedwa okutegeka namba ya guluupu"
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, c-format
 msgid "failed to set user-ID"
 msgstr "nnemedwa okutegeka namba ya mukozesa"
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, c-format
 msgid "failed to run command %s"
 msgstr "nnemedwa okutandika ekiragiro %s"
@@ -1867,7 +1885,7 @@ msgstr ""
 "ey'ekika kya CRC n'obungi obwa bayiti ezigirimu.\n"
 "\n"
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... FAYIRO1 .FAYIRO2\n"
@@ -1971,266 +1989,270 @@ msgstr "tokkirizibwa kutegeka ebyawuluzangana nkumbo ebisukka mu kimu"
 msgid "empty %s not allowed"
 msgstr "%s tekikkirizibwa kulekebwa kyereere"
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr "wazzewo kiremya mu kusoma %s"
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, c-format
 msgid "cannot lseek %s"
 msgstr "nnemedwa okukola lseek ku %s"
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr "wazzewo kiremya nga mpandikira mu %s"
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, fuzzy, c-format
 msgid "%s: failed to get extents info"
 msgstr "nnemedwa okutegeera endukusa eza SELinux ezisangidwawo"
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, fuzzy, c-format
 msgid "%s: write failed"
 msgstr "sisobode okuwandika"
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, fuzzy, c-format
 msgid "failed to extend %s"
 msgstr "nemedwa okubikkula %s"
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, c-format
 msgid "clearing permissions for %s"
 msgstr "nziramu endukusa ez'oku %s"
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "nnemedwa okukuuma obwa nannyini ku %s"
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
 msgstr "nemedwa okuzuula fayiro %s"
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, c-format
 msgid "failed to preserve authorship for %s"
 msgstr "nnemedwa okusigaza obuwandisi obw'oku %s"
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
+#, c-format
+msgid "failed to set default file creation context to %s"
+msgstr ""
+"%s nnemedwa okugitegekera endukusa eza SELinux ezo\n"
+"ezitegekebwa bulijjo ku fayiro ezakakolebwawo"
+
+#: src/copy.c:820
+#, fuzzy, c-format
+msgid "failed to set default file creation context for %s"
+msgstr ""
+"%s nnemedwa okugitegekera endukusa eza SELinux ezo\n"
+"ezitegekebwa bulijjo ku fayiro ezakakolebwawo"
+
+#: src/copy.c:846
+#, fuzzy, c-format
+msgid "failed to set the security context of %s"
+msgstr "nnemedwa okutegeka endukusa eza SELinux ez'oku %s zibe %s"
+
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
 msgid "cannot open %s for reading"
 msgstr "sisobodde okubikkula %s kugisoma"
 
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, c-format
 msgid "cannot fstat %s"
 msgstr "fstat eremedwa okuzuula ebikwata ku %s"
 
-#: src/copy.c:820
+#: src/copy.c:935
 #, c-format
 msgid "skipping file %s, as it was replaced while being copied"
 msgstr ""
 "fayiro %s ngibuuka kubanga eyo yawanyisidwamu endala bwe yabadde ekoppebwa"
 
-#: src/copy.c:850
-#, c-format
-msgid "failed to get file system create context"
-msgstr ""
-"nnemedwa okutegeera endukusa eza SELinux\n"
-"ezitegekebwa bulijjo ku bintu ebipya\n"
-"ebikoledwawo ku sisitemu eya fayiro"
-
-#: src/copy.c:864
-#, c-format
-msgid "failed to set the security context of %s to %s"
-msgstr "nnemedwa okutegeka endukusa eza SELinux ez'oku %s zibe %s"
-
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
 msgid "cannot remove %s"
 msgstr "sisobola okuggyawo %s"
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
 msgstr "%s egyidwawo\n"
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr "ennyunzi ey'eyawudde %s tewali kigenda kuwandikibwayo"
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, c-format
 msgid "cannot create regular file %s"
 msgstr "nnemedwa okukolawo fayiro eya bulijjo %s"
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, fuzzy, c-format
 msgid "failed to clone %s from %s"
 msgstr "nnemedwa okugya koppi mu %s"
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr "essawa %s z'ebadde erambidwa nazo zigenda okusigazibwa"
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
 #, fuzzy, c-format
 msgid "failed to close %s"
-msgstr "nemedwa okubikkula %s"
+msgstr "nnemedwa okugya koppi mu %s"
 
-#: src/copy.c:1471
-#, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
+#: src/copy.c:1580
+#, fuzzy, c-format
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
 msgstr ""
 "%s: oyagala okugezako okuwandika ku %s, enkola eya %04lo (%s) nga "
 "tegobererwa?"
 
-#: src/copy.c:1478
+#: src/copy.c:1581
+#, c-format
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr ""
+
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
 msgstr "%s: %s ngiwandikeko ng'empya? "
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr " (kkopi ey'okwerinda: %s)"
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr ""
 "fayiro nnemedwa okugizzako endukusa eza SELinux ezo\n"
 "ezitegekebwa bulijjo ku fayiro ezakakolebwawo"
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, c-format
 msgid "cannot create hard link %s to %s"
 msgstr "sisobola okukolawo enyunzi et'eyawudde %s egguka ku %s"
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, c-format
 msgid "cannot stat %s"
 msgstr "stat eremedwa okuzuula ebikwata ku fayiro %s"
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, c-format
 msgid "omitting directory %s"
 msgstr "etterekero %s ndibuuka"
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr "kulabula: fayiro ey'ensibuko %s eweredwa emirundi egisukka mu gumu"
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
 msgstr "fayiro %s ne %s fayiro y'emu"
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr ""
 "%s ssi tterekero, n'olw'ekyo sisobola okugiwandikako ebiri mu tterekero %s"
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr "%s eyakakolebwawo sijja okugiwandikako ebiri mu %s"
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr "%s tterekero, sisobola okugiwandikako ebivudde mu etali tterekero"
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr "sisobola okusimbuliza tterekero ku etali tterekero: %s -> %s"
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr ""
 "okuggya kkopi ey'okwerinda mu %s kujja ate yo\n"
 "  okugisaanyawo; %s tesimbulizidwa"
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr ""
 "okuggya kkopi ey'okwerinda mu %s kujja ate yo okugisaanya wo;  %s tekoppedwa"
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
 msgstr "%s nnemedwa okugiggyamu kkopi ey'okwerinda"
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr "fayiro %s eggukibwako ennyunzi ey'eyawudde %s tegenda kugyibwamu kkopi"
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr ""
 "tosobola okukoppa etterekero, %s, libeere ne kkopi, %s, eya yo munda mwa yo"
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr "sijja okukolawo enyunzi et'eyawudde %s egguka ku tterekero %s"
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr "sisobola okusimbuliza %s efuuke ate tterekero %s munda mwa yo"
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, c-format
 msgid "cannot move %s to %s"
 msgstr "sisobola okusimbuliza %s egende ku %s"
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr ""
 "okusimbuliza wakati w'ebyuma kulemye: wakati wa %s ne %s;\n"
 "nemedwa okuggyawo ekisangidwawo ku kigenderwa"
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, c-format
-msgid "failed to set default file creation context to %s"
-msgstr ""
-"%s nnemedwa okugitegekera endukusa eza SELinux ezo\n"
-"ezitegekebwa bulijjo ku fayiro ezakakolebwawo"
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr "sisobola okuggya kkopi mu nyunzi ey'eyawudde eyeggukako %s"
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr ""
@@ -2238,47 +2260,75 @@ msgstr ""
 "ga fayiro kwe zigguka gajja okulaga etterekero lino nga\n"
 "y'entandikwa yago"
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr "sisobola okukolawo enyunzi eyeyawudde %s egguka ku %s"
 
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, c-format
 msgid "cannot create fifo %s"
 msgstr "sisobola okukolawo fifo %s"
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, c-format
 msgid "cannot create special file %s"
 msgstr "sisobola okukolawo fayiro ey'enjawulo %s"
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, c-format
 msgid "cannot read symbolic link %s"
 msgstr "sisobola okusoma enyunzi eyeyawudde %s"
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, c-format
 msgid "cannot create symbolic link %s"
 msgstr "sisobola okukolawo enyunzi eyeyawudde %s"
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
 msgstr "fayiro %s ya kika ekitamanyidwa"
 
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, c-format
 msgid "cannot un-backup %s"
 msgstr "sisobola okuggyawo kkopi ey'okwerinda eya %s"
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr "%s -> %s (ggyawo kkopi ey'okwerinda)\n"
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr ""
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr ""
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, fuzzy, c-format
+msgid "unknown program %s"
+msgstr "ekifo ekitamanyidwa"
+
+#: src/cp.c:157 src/mv.c:288
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -2289,7 +2339,7 @@ msgstr ""
 "                 oba: %s [KAWAYIRO]... NNONO... TTEREKERO\n"
 "                 oba: %s [KAWAYIRO]... -t TTEREKERO NNONO...\n"
 
-#: src/cp.c:162
+#: src/cp.c:163
 #, fuzzy
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
 msgstr ""
@@ -2297,7 +2347,7 @@ msgstr ""
 "NNONO bwe zisukka mu emu koppi zaazo ziteekebwe mu TTEREKERO.\n"
 "\n"
 
-#: src/cp.c:168
+#: src/cp.c:169
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
 "      --attributes-only        don't copy the file data, just the "
@@ -2329,7 +2379,7 @@ msgstr ""
 "  -d                           Bw'ossawo kano obeera nga eyataddewo\n"
 "                               '--no-deference --preserve=links'\n"
 
-#: src/cp.c:177
+#: src/cp.c:178
 #, fuzzy
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
@@ -2352,7 +2402,7 @@ msgstr ""
 "                               ez'eyawudde singa amannya gaazo gaba mu\n"
 "                               agumenti yakyo\n"
 
-#: src/cp.c:186
+#: src/cp.c:187
 #, fuzzy
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
@@ -2363,7 +2413,7 @@ msgstr ""
 "  -L, --dereference            Kamu ku buno bwe kabaako kilondoola enyunzi\n"
 "                               ez'eyawudde\n"
 
-#: src/cp.c:190
+#: src/cp.c:191
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
 "                                 a previous -i option)\n"
@@ -2376,7 +2426,7 @@ msgstr ""
 "                               kkopi mu fayiro ennyunzi eziri mu NNONO kwe\n"
 "                               zigguka\n"
 
-#: src/cp.c:195
+#: src/cp.c:196
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
 "      --preserve[=ATTR_LIST]   preserve the specified attributes (default:\n"
@@ -2394,7 +2444,7 @@ msgstr ""
 "                               '--preserve=mode,ownership,timestamps')\n"
 "                               atiributi endala ziri: links, xattr, all\n"
 
-#: src/cp.c:203
+#: src/cp.c:204
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                use full source file name under DIRECTORY\n"
@@ -2404,7 +2454,7 @@ msgstr ""
 "      --parents                Kano kakireetera okusoosako ekkubo erigguka\n"
 "                               ku nsibuko ku linnya lya TTEREKERO\n"
 
-#: src/cp.c:207
+#: src/cp.c:208
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
 "      --reflink[=WHEN]         control clone/CoW copies. See below\n"
@@ -2424,7 +2474,7 @@ msgstr ""
 "                               kigigyawobugya koppi n'eddawo nga fayiro "
 "empya\n"
 
-#: src/cp.c:213
+#: src/cp.c:214
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
 "      --strip-trailing-slashes  remove any trailing slashes from each "
@@ -2438,7 +2488,7 @@ msgstr ""
 "                               ndagiriro za fayiro eza NNONO ezisangibwa\n"
 "                               mu agumenti\n"
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -2459,7 +2509,7 @@ msgstr ""
 "KIGENDERWA\n"
 "                               fayiro bufayiro sso ssi tterekero\n"
 
-#: src/cp.c:224
+#: src/cp.c:225
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
 "                                 than the destination file or when the\n"
@@ -2479,7 +2529,15 @@ msgstr ""
 "eya\n"
 "                               fayiro eno kwe kiyisidwa yokka\n"
 
-#: src/cp.c:233
+#: src/cp.c:232
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/cp.c:240
 msgid ""
 "\n"
 "By default, sparse SOURCE files are detected by a crude heuristic and the\n"
@@ -2510,7 +2568,7 @@ msgstr ""
 "'cp' gugaana. Singa enyunzi eyo tesoboka ate nga wataddeko akawayiro aka\n"
 "'--reflink=auto', 'cp' kikolawo koppi ennetongovu.\n"
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 #, fuzzy
 msgid ""
 "\n"
@@ -2531,7 +2589,7 @@ msgstr ""
 "otegeka ekigambo ekikongozzi VERSION_CONTROL.\n"
 "Obwayiro n'ebigambo ebyo bisobola okubeera bino ebiddako:\n"
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2553,7 +2611,7 @@ msgstr ""
 "   simple, never               Buno bukireetera kkopi ez'okwerinda\n"
 "                               butaziteekangako nnamba\n"
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2565,93 +2623,107 @@ msgstr ""
 "ate erinya erya NNONO ne liba limu n'erya  KOPPI nga ezo fayiro za bulijjo,\n"
 "'cp' kisooka okuggya kkopi ey'okwerinda mu NNONO.\n"
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, c-format
 msgid "failed to preserve times for %s"
 msgstr "nemedwa okukuuma `saawa' ez'oku %s"
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, c-format
 msgid "failed to preserve permissions for %s"
 msgstr "nemedwa okukuuma endukusa ez'oku %s"
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, c-format
 msgid "cannot make directory %s"
 msgstr "sisobola okukolawo etterekero %s"
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr "%s gy'eri nayi ssi tterekero"
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
 #, fuzzy, c-format
 msgid "failed to access %s"
-msgstr "nemedwa okubikkula %s"
+msgstr "nnemedwa okugya koppi mu %s"
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, c-format
 msgid "missing file operand"
 msgstr "kubulako fayiro ey'okukolako"
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, c-format
 msgid "missing destination file operand after %s"
 msgstr "%s yetaaga kugobererwa fayiro egendererwa"
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr ""
 "tekisoboka kukozesa --target-directory (-t) awamu ne --no-target-directory (-"
 "T)"
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, c-format
 msgid "target %s is not a directory"
 msgstr "ekigenderwa %s ssi tterekero"
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr "bwe kubaako aka --parents, ekigenderwa kiteekwa kuba tterekero"
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, c-format
 msgid "multiple target directories specified"
 msgstr "olaze ekigenderwa eky'amaterekero agasukka mu limu"
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, fuzzy, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr ""
+"KULABULA: aka --context (-Z) tekagenda kukolerwako; ennombe ya kuno\n"
+"tetegeera SELinux"
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr ""
 "sisobola okukola bika bya nyunzi byombi awamu - ezit'eyawudde n'ez'eyawudde"
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr "obuwayiro --backup ne --no-clobber bukontana"
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr "okukozesa --reflink oteekwa n'okukozesa --sparse=auto"
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr "ekika ekya kkopi ey'okwerinda"
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, fuzzy, c-format
+msgid "cannot set target context and preserve it"
+msgstr ""
+"tekisoboka okukaka endukusa eza SELinux ez'okukikolebwako zifuuke %s ne "
+"zikala"
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr "sisobola kukuuma endukusa eza SELinux nga ennombe temanyi SELinux"
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr ""
@@ -2659,141 +2731,141 @@ msgstr ""
 "sisobola kukuuma atiributo ez'enyongeza"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr "Stuart Kemp"
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr "ennono ebuzewo"
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr "%s: eno namba esinga obungi bw'ennyiriri mu fayiro"
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, c-format
 msgid "%s: %s: line number out of range"
 msgstr "%s: %s: eno namba esinga obungi bw'ennyiriri mu fayiro"
 
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, c-format
 msgid " on repetition %s\n"
 msgstr " ku miku egiddinngana %s\n"
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, c-format
 msgid "%s: %s: match not found"
 msgstr "%s: nnoonyezza %s ne sigiraba"
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr "emboozi enoonya zinnewayo egudde ku kiremya"
 
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, c-format
 msgid "write error for %s"
 msgstr "%s ezzeko kiremya mu kuwandika"
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, c-format
 msgid "%s: integer expected after delimiter"
 msgstr "%s: akabonero ak'awuzi kateekwa okuddibwako ennamba enzijjuvu"
 
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, fuzzy, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr "%s: kubulako '}' ku namba gy'owadde nga ey'emiku gy'oyagala nkole"
 
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, fuzzy, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr "%s}: wateekwa okubaawo ennamba enzijjuvu wakati wa '{' ne '}'"
 
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, fuzzy, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr "%s: kubulako akabonero ak'awuzi '%c' akaggalawo"
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr "%s: eno emboozi enoonya ebifaanagana tekola: %s"
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr "%s: kino ekigambo tekikola"
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr "%s: ennamba ey'olunnyiriri eteekwa okusukka ku zeero"
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr "namba y'olunyiriri %s ntono ku egikulemera, %s"
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr "kulabula: namba y'olunyiri %s y'emu n'egikulembedde"
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr ""
 "ekiweredwa nga akafundikwa kibuzeeko\n"
 "akabonero akalaga kye kinaafuulibwa"
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr ""
 "akafundikwa kalimu akabonero akalaga\n"
 "kye kanaafuulibwa akatakola: %c"
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr ""
 "akafundikwa kalimu akabonero akalaga\n"
 "kye kanaafuulibwa akatakola: \\%.3o"
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr "ekigambo ekifuga okufuulibwa kirimu obubonero obutakola: %%%c%c"
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr ""
 "akafundikwa kalimu obubonero obulaga\n"
 "kye kanaafuulibwa %% obuyitiridde obungi"
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr ""
 "akafundikwa kabulamu akabonero akalaga\n"
 "kye kanaafuulibwa %%"
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr "%s: eno namba tekola wano"
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... FAYIRO KIGAMBO...\n"
 
-#: src/csplit.c:1455
+#: src/csplit.c:1483
 #, fuzzy
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
@@ -2804,7 +2876,7 @@ msgstr ""
 "Era kiwandika, awateekebwa ebivaamu ebya zipulogulamu mu ebya bulijjo,\n"
 "obungi bwa bayiti eziri mu buli kitundu.\n"
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, fuzzy, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2819,7 +2891,11 @@ msgstr ""
 "  -k, --keep-files                Buno bwo bukireetera butagyawo fayiro ze\n"
 "                                  kyakakolawo bwe waba nga wazzewo kiremya\n"
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr ""
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
@@ -2834,7 +2910,7 @@ msgstr ""
 "  -z, --elide-empty-files         Buno bwo bukireetera okugyawo fayiro ze\n"
 "                                  kikozewo bwe ziba njereere\n"
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
@@ -2843,7 +2919,7 @@ msgstr ""
 "FAYIRO bwe kiba - , ekiragiro kisoma ebiva ku nnono eya\n"
 "bulijjo. Zi KIGAMBO zisobola okubeera:\n"
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 #, fuzzy
 msgid ""
 "\n"
@@ -2880,23 +2956,19 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr "David M. Ihnat"
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr "ennamba za firidi n'ebifo mu nnyiriri zitandikira ku 1"
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr "Enkozesa entuufu eri: %s KAWAYIRO... [FAYIRO]...\n"
 
-#: src/cut.c:193
+#: src/cut.c:176
 #, fuzzy
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr ""
 "'cut' kiwandikawo ebitundu ebirondemu ebya mu nnyiriri eza mu buli\n"
 "FAYIRO awateekebwa ebivaamu ebya zipulogulamu mu ebya bulijjo.\n"
 
-#: src/cut.c:199
+#: src/cut.c:182
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
 "  -c, --characters=LIST   select only these characters\n"
@@ -2909,7 +2981,7 @@ msgstr ""
 "  -d, --delimiter=K'AWULUZI  Ebitundu eby'emoboozi kikozese K'AWULUZI \n"
 "                             okubyawuluzaamu mu kifo eky'oluseetuka\n"
 
-#: src/cut.c:204
+#: src/cut.c:187
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
 "                            that contains no delimiter character, unless\n"
@@ -2922,7 +2994,7 @@ msgstr ""
 "                             okuggyako nga akawayiro -s kwekali\n"
 "  -n                         (Kano tekalina kye kakola)\n"
 
-#: src/cut.c:210
+#: src/cut.c:193
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
 "                            or fields\n"
@@ -2930,7 +3002,7 @@ msgstr ""
 "      --complement           Kano kaleetera ekiragiro okukola ku bayiti,\n"
 "                             bubonero oba firidi ebitali ebyo ebikiragidwa\n"
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
@@ -2944,7 +3016,7 @@ msgstr ""
 "                              kweyambisa akabonero akakozesedwa mu ebiva ku\n"
 "                              nnono\n"
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2956,7 +3028,7 @@ msgstr ""
 "olubu, oba embu z'obubonero nga z'awuludwa zi kkoma. Ekiragiro kiwandika\n"
 "ebivaamu mu nsengeka y'emu n'y'ebiyingizibwa.\n"
 
-#: src/cut.c:227
+#: src/cut.c:210
 msgid ""
 "Each range is one of:\n"
 "\n"
@@ -2982,50 +3054,54 @@ msgstr ""
 "Bw'oba towadde FAYIRO, oba FAYIRO bw'eba '-' , 'cut' esoma okuva\n"
 "ku nyingiza eya bulijjo.\n"
 
-#: src/cut.c:367 src/cut.c:493
+#: src/cut.c:300 src/cut.c:394
 #, fuzzy
 msgid "invalid byte, character or field list"
 msgstr "olukalala olwa bayiti oba ebitundu eby'emboozi ssi lutuufu"
 
-#: src/cut.c:387
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr "ennamba za firidi n'ebifo mu nnyiriri zitandikira ku 1"
+
+#: src/cut.c:320
 msgid "invalid range with no endpoint: -"
 msgstr "olubu olutaliko kkomo terukkirizibwa: -"
 
-#: src/cut.c:403
+#: src/cut.c:334
 msgid "invalid decreasing range"
 msgstr "olubu olw'ebigenda bikendeera terukkirizibwa"
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, c-format
 msgid "byte offset %s is too large"
 msgstr "bayiti ey'okutandikirako %s eyitiridde okubeera ewala"
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, c-format
 msgid "field number %s is too large"
 msgstr "ekitundu eky'emboozi eky'okutandikirako %s kiyitiridde okubeera ewala"
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr "okkirizibwa okulagira ekika eky'olukalala kimu kyokka"
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr "akabonero akaawuluzi kateekwa okubeera ennukuta emu"
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr ""
 "oteekwa okuwayo olukalala olwa bayiti, ennukuta, oba ebitundu eby'emboozi"
 
-#: src/cut.c:850
+#: src/cut.c:790
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr ""
 "tokkirizibwa okutegeka akabonero akaawuluzi mu biyingizibwa\n"
 "okuggyako nga ogenda kukola ku firidi"
 
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
@@ -3033,11 +3109,11 @@ msgstr ""
 "tekigassa okulagira enyiriri ezit'awuluzidwamu zireme okulagibwa,\n"
 "okuggyako nga okola ku firidi"
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr "kubuzzeeko olukalala lwa firidi"
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr "kubuzzeeko olukalala olw'ebifo"
 
@@ -3085,7 +3161,7 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 "      --rfc-3339=TTUUSO     Kano kakireetera okuwandika budde mu mpandika\n"
 "                            eya RFC-3339.\n"
@@ -3354,10 +3430,10 @@ msgid ""
 "  $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n"
 msgstr ""
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr "ennono eya bulijjo"
@@ -3402,7 +3478,7 @@ msgstr ""
 msgid "cannot set date"
 msgstr "nemedwa okuteeka ennaku"
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, c-format
 msgid "time %s is out of range"
 msgstr "obudde %s tebumanyidwa"
@@ -3413,7 +3489,7 @@ msgstr "obudde %s tebumanyidwa"
 msgid "Paul Rubin"
 msgstr "Paul Rubin"
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
@@ -3422,7 +3498,7 @@ msgstr ""
 "Enkozesa entuufu eri: %s [EKIKOLEBWAKO]...\n"
 "  oba: %s KAWAYIRO\n"
 
-#: src/dd.c:526
+#: src/dd.c:532
 #, fuzzy
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
@@ -3453,7 +3529,7 @@ msgstr ""
 "  ibs=BAYITI                Kano kakireetera okusomanga bayiti BAYITI ku\n"
 "                            buli muku\n"
 
-#: src/dd.c:535
+#: src/dd.c:541
 #, fuzzy
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
@@ -3486,7 +3562,7 @@ msgstr ""
 "  status=noxfer             Kano kakireetera butalaga bifa ku mulimu\n"
 "                            ogw'okukola koppi\n"
 
-#: src/dd.c:546
+#: src/dd.c:552
 #, fuzzy
 msgid ""
 "\n"
@@ -3505,7 +3581,7 @@ msgstr ""
 "BIGAMBO_BYAWULE bisobola okubeera:\n"
 "\n"
 
-#: src/dd.c:555
+#: src/dd.c:561
 #, fuzzy
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
@@ -3539,7 +3615,7 @@ msgstr ""
 "                      'block' oba 'unblock', kikozeseemu\n"
 "                      mabangirizi mu kifo ekya zi NUL\n"
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -3560,7 +3636,7 @@ msgstr ""
 "                      zzibizi nga kigenda kumala omulimu. Kigattako\n"
 "                      n'okukaza meta-data wakwo.\n"
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -3576,27 +3652,27 @@ msgstr ""
 "                      Tekagasa ku mirimu egikola ku biyingizibwa.\n"
 "                      Kusaana kubaako n'akawayiro conv=notrunc.\n"
 
-#: src/dd.c:583
+#: src/dd.c:589
 msgid "  cio       use concurrent I/O for data\n"
 msgstr ""
 "  cio                 Emirimu egy'okusoma n'okuwandika\n"
 "                      tebigaana omulimu ogubileesewo ate\n"
 "                      kukola n'ebirala mu kiseera kye kimu\n"
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr ""
 "  direct              Kano kasobozesa ebiyingizibwa\n"
 "                      n'ebivaamu butasooka kugendako\n"
 "                      mu ggwanika zzibizi\n"
 
-#: src/dd.c:587
+#: src/dd.c:593
 msgid "  directory  fail unless a directory\n"
 msgstr ""
 " directory            Kano kaleetera omulimu okugaana\n"
 "                      ekikolebwako bwe litaba tterekero\n"
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr ""
 "  dsync               Kano kaleetera data okukolebwako\n"
@@ -3605,20 +3681,20 @@ msgstr ""
 "                      oba ebiwandikibwa lwe biggwa mu\n"
 "                      ggwanika zzibizi\n"
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr ""
 "  sync                Kano kakola nga dsync ne kagattako\n"
 "                      nti ne meta-data etwalibwamu\n"
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr ""
 "  fullblock           Kano kakola nga kuliko n'aka 'iflag'.\n"
 "                      Kaleetera ekiragiro kumalanga kuweza buloka\n"
 "                      nzijjuvu ey'ebiyingizibwa eryoke ebikoleko\n"
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr ""
 "  nonblock            Kano kaleetera data okukolebwako\n"
@@ -3626,7 +3702,7 @@ msgstr ""
 "                      birala nga ebisomebwa oba ebiwandikibwa\n"
 "                      tebinnaba kuggwa mu ggwanika zzibizi\n"
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr ""
 "  noatime             Kano kaleetera omulimu\n"
@@ -3635,25 +3711,25 @@ msgstr ""
 "                      ebiraga obudde lwe\n"
 "                      byasemba kukeberwa\n"
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr ""
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr ""
 "  noctty              Kano kakola nga ekikolebwako kiwandikiro.\n"
 "                      Kaleetera ekiragiro butakkiriza\n"
 "                      ekiwandikiro ekyo kukifuga\n"
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr ""
 "  nofollow            Kano kakireetera kukola ku\n"
 "                      nnyunzi naye ne kitakola ku\n"
 "                      fayiro kw'egguka\n"
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr ""
 "  nolinks             Kano kaleetera omulimu kugaana\n"
@@ -3661,31 +3737,31 @@ msgstr ""
 "                      egguka ku fayiro ezisukka mu\n"
 "                      emu nga tez'eyawuddeko\n"
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr ""
 "  binary              Kano kakireetera kuyisa data\n"
 "                      nga ebya binariyo\n"
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr ""
 "  text                Kano kakireetera kuyisa data\n"
 "                      nga ebitegeereka bantu\n"
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr ""
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3716,7 +3792,17 @@ msgstr ""
 "Obuwayiro buno bwe bukkirizibwa:\n"
 "\n"
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
@@ -3725,21 +3811,21 @@ msgstr ""
 "ebiwandise %<PRIuMAX>+%<PRIuMAX> bisomedwa\n"
 "ebiwandise %<PRIuMAX>+%<PRIuMAX> biwandikidwa\n"
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
 msgstr[0] "ekiwandise %<PRIuMAX> kitemedwamu\n"
 msgstr[1] "ebiwandise %<PRIuMAX> bitemedwamu\n"
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
 msgstr[0] "bayiti %<PRIuMAX> (%s) ekoppedwa"
 msgstr[1] "bayiti %<PRIuMAX> (%s) zikoppedwa"
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr "Infinity B"
 
@@ -3753,83 +3839,83 @@ msgstr "Infinity B"
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
 msgstr ", %g s, %s/s\n"
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, c-format
 msgid "closing input file %s"
 msgstr "mbikka fayiro egyibwamu ebiyingizibwa %s"
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr "mbikka fayiro egenzemu ebizzibwa %s"
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr "nnemedwa okuyimiriza O_DIRECT: %s"
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, c-format
 msgid "writing to %s"
 msgstr "mpandika mu %s"
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, c-format
 msgid "unrecognized operand %s"
 msgstr "ekikolebwako %s tekimanyidwa"
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 msgid "invalid conversion"
 msgstr "okufuula kuno tekukkirizibwa"
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 msgid "invalid input flag"
 msgstr "akatuuti akafuga ebiyingizibwa tekakkirizibwa"
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 msgid "invalid output flag"
 msgstr "akatuuti akafuga ebivaamu tekakkirizibwa"
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 msgid "invalid status flag"
 msgstr "akatuuti akalaga embeera tekakkirizibwa"
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, c-format
 msgid "invalid number %s"
 msgstr "namba %s tekkirizibwa"
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr "tekisoboka okugattika ebibiri ku {ascii,ebcdic,ibm}"
 
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, c-format
 msgid "cannot combine block and unblock"
 msgstr "tekisoboka okugattika block ne unblock"
 
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, c-format
 msgid "cannot combine lcase and ucase"
 msgstr "tekisoboka kugattika lcase ne ucase"
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, c-format
 msgid "cannot combine excl and nocreat"
 msgstr "tekisoboka kugattika excl ne nocreat"
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, fuzzy, c-format
 msgid "cannot combine direct and nocache"
 msgstr "tekisoboka kugattika excl ne nocreat"
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
@@ -3839,78 +3925,68 @@ msgstr ""
 "ya lseek ku fayiro (%s)  ey'ekika kya mt_type=0x%0lx -- kebera <sys/mtio.h>\n"
 "okulaba olukalala olwa zi mt_type"
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, c-format
 msgid "%s: cannot skip"
 msgstr "%s: sisobola kubuuka"
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, c-format
 msgid "%s: cannot seek"
 msgstr "%s: sisobola kufuna aw'okutandika kusoma"
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr ""
 "ennamba eraga ow'okutandika okusoma fayiro %s tejja mu ggwanika zzibizi"
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr ""
 "kulabula: oluvanyuma lw'okulemererwa okusoma\n"
 "wazzewo n'ennamba eraga aw'okusoma etasoboka"
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr "tekisobose okuvvuunuka ekitali kituufu mu nnombe"
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, c-format
 msgid "setting flags for %s"
 msgstr "ntegeka obutuuti obwa %s"
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr ""
 "%s: tekisobose okugenda ennamba\n"
 "eraga aw'okusoma w'egamba"
 
-#: src/dd.c:2133
+#: src/dd.c:2172
 #, fuzzy, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
 msgstr ""
 "ogw'okutemamu kutuuka ku bayiti %<PRIuMAX> gugaanye ku fayiro ey'ebivaamu %s"
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr "ku %s enkola eya fdatasync egaanye"
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
 msgstr "ku %s enkola eya sync egaanye"
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, c-format
 msgid "failed to open %s"
 msgstr "nemedwa okubikkula %s"
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
@@ -3919,97 +3995,106 @@ msgstr ""
 "ennamba eraga aw'okusoma eyitiridde obunene: sisobola kutemamu okutuuka ku\n"
 "buloka eya seek=%<PRIuMAX> (bayiti-%lu)"
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr ""
 "ogw'okutemamu kutuuka ku bayiti %<PRIuMAX> gugaanye ku fayiro ey'ebivaamu %s"
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, fuzzy, c-format
 msgid "failed to discard cache for: %s"
 msgstr "nnemedwa kukyusa kudda mu tterekero %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr "Paul Eggert"
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr "Sisitemu eya fayiro"
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr "Kika"
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr "buloka"
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr "Awakozese"
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr "Awate"
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr "Enkozesa%"
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr "Inodi"
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr "Ezikozesedwa"
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr "Ente"
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr "Enkozesa%"
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr "Kiwangidwa ku"
 
-#: src/df.c:383
-#, c-format
-msgid "option --output: field '%s' unknown"
+#: src/df.c:207
+msgid "File"
 msgstr ""
 
-#: src/df.c:390
+#: src/df.c:387
+#, fuzzy, c-format
+msgid "option --output: field %s unknown"
+msgstr "mbikka fayiro egenzemu ebizzibwa %s"
+
+#: src/df.c:394
 #, fuzzy, c-format
-msgid "option --output: field '%s' used more than once"
+msgid "option --output: field %s used more than once"
 msgstr "kulabula: fayiro ey'ensibuko %s eweredwa emirundi egisukka mu gumu"
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr "Bunene"
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr "Awate"
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr "eziriwo"
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
 msgstr ""
 
-#: src/df.c:1210
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr ""
+
+#: src/df.c:1384
 #, fuzzy
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
@@ -4019,17 +4104,18 @@ msgstr ""
 "oba ebifa ku sistemu eza fayiro zonna.\n"
 "\n"
 
-#: src/df.c:1217
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
 #, fuzzy
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
 "  -a, --all                 Obuwayiro uno bukireetera okukola ne ku sistemu "
 "eza\n"
@@ -4051,7 +4137,7 @@ msgstr ""
 "mu\n"
 "                            kifo kya bya 1024\n"
 
-#: src/df.c:1227
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -4069,7 +4155,7 @@ msgstr ""
 "'sync',\n"
 "                            (eno y'enkola eya bulijjo)\n"
 
-#: src/df.c:1234
+#: src/df.c:1409
 #, fuzzy
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
@@ -4094,44 +4180,35 @@ msgstr ""
 "                            fayiro zo zokka ezitali za kika kya KIKA\n"
 "  -v                        (Kano tekakolebwako)\n"
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
 
-#: src/df.c:1285
+#: src/df.c:1460
 #, fuzzy, c-format
 msgid "options %s and %s are mutually exclusive"
 msgstr "obuwayiro --compare (-C) ne --strip tebukolagana"
 
-#: src/df.c:1335
-#, fuzzy
-msgid "warning: "
-msgstr "Kulabula: "
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr ""
-
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr ""
 "sisitemu eya fayiro ey'ekika %s elondedwa nga\n"
 "mu kiseera kye kikimu egyidwamu"
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr "Kulabula: "
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 msgid "cannot read table of mounted file systems"
 msgstr "nnemedwa okusoma endagiriro eya sistemu eza fayiro eziwangidwa"
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr "tewali sisitemu eya fayiro ekoledwako"
@@ -4141,7 +4218,7 @@ msgstr "tewali sisitemu eya fayiro ekoledwako"
 msgid "H. Peter Anvin"
 msgstr "H. Peter Anvin"
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... [FAYIRO]\n"
@@ -4240,7 +4317,7 @@ msgstr ""
 
 #: src/dirname.c:59
 #, fuzzy
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
 msgstr ""
 "  -0, --null     Bw'ossawo kamu ku buno bukireetera okussawo bayiti eya 0 "
 "ku\n"
@@ -4261,7 +4338,7 @@ msgstr ""
 "  %s /usr/bin/      kivaamu \"/usr\".\n"
 "  %s stdio.h        kivaamu \".\".\n"
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -4270,7 +4347,7 @@ msgstr ""
 "Enkozesa entuufu eri: %s [KAWAYIRO]... [FAYIRO]...\n"
 "                oba:  %s [KAWAYIRO]... --files0-from=F\n"
 
-#: src/du.c:274
+#: src/du.c:285
 #, fuzzy
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr ""
@@ -4278,11 +4355,10 @@ msgstr ""
 "FAYIRO ky'emalawo. Bwe liba ttereko ekiragiro kikebera ne fayiro ezilirimu.\n"
 "\n"
 
-#: src/du.c:280
+#: src/du.c:291
 #, fuzzy
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -4299,12 +4375,12 @@ msgstr ""
 "                          ky'etwala. Wabula ku fayiro ez'empewo buyinza\n"
 "                          okuba nga bwe businga.\n"
 
-#: src/du.c:289
+#: src/du.c:300
 #, fuzzy
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -4326,15 +4402,16 @@ msgstr ""
 "  -c, --total             Kiraga omugatte\n"
 "  -D, --dereference-args  Ku nyunzi ez'eyawudde, kizzawo makubo genyini\n"
 
-#: src/du.c:302
+#: src/du.c:313
 #, fuzzy
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
 "      --files0-from=F     Kano kaleetera ekiragiro okukola ku fayiro eziri\n"
 "                          ku lukalala mu fayiro F. Mu lukalala olwo, "
@@ -4350,7 +4427,7 @@ msgstr ""
 "      --si                Kano kakola nga -h naye emirengo gib gya 1000 mu\n"
 "                          kifo kya 1024\n"
 
-#: src/du.c:310
+#: src/du.c:322
 #, fuzzy
 msgid ""
 "  -k                    like --block-size=1K\n"
@@ -4363,12 +4440,13 @@ msgstr ""
 "                          nga fayiro ezisoba mu emu\n"
 "  -m                      Kye kimu ne --block-size=1M\n"
 
-#: src/du.c:316
+#: src/du.c:328
 #, fuzzy
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
@@ -4386,7 +4464,7 @@ msgstr ""
 "fayiro\n"
 "                          ezimenyedwa mu agumenti\n"
 
-#: src/du.c:322
+#: src/du.c:334
 #, fuzzy
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
@@ -4396,9 +4474,9 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
 msgstr ""
 "      --time              Kano kakireetera okulaga obudde lwe wasemba\n"
 "                          okubawo fayiro ekyusibwako mu tterekero n'ago\n"
@@ -4413,77 +4491,77 @@ msgstr ""
 "                          EMPANDIKA kikitegeera nga ekiragiro 'date' bwe\n"
 "                          kikitegeera\n"
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
 "  -x, --one-file-system    skip directories on different file systems\n"
 msgstr ""
 
-#: src/du.c:386
+#: src/du.c:398
 #, fuzzy
 msgid "Infinity"
 msgstr "Infinity B"
 
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr ""
-
-#: src/du.c:624
+#: src/du.c:636
 #, fuzzy, c-format
 msgid "fts_read failed: %s"
 msgstr "fts_read eremedwa okuzuula ebikwata ku fayiro"
 
-#: src/du.c:780
+#: src/du.c:787
 #, c-format
 msgid "invalid maximum depth %s"
 msgstr "tekikkirizibwa okukka ku mutendera %s gw'oyagala"
 
-#: src/du.c:809
+#: src/du.c:816
 #, fuzzy, c-format
 msgid "invalid --threshold argument '-0'"
 msgstr "agumenti eya --%s, %s tekkirizibwa"
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr ""
 "tekisoboka okulaga mu bufunze ate mu kiseera kye kimu okulaga mu bujjuvu"
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr "Kulabula: okufunza kye kimu n'okukozesa --max-depth=0"
 
-#: src/du.c:900
+#: src/du.c:911
 #, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr "Kulabula: okulagira kuwandika mu bufunze kikontana ne --max-depth=%lu"
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 msgid "file operands cannot be combined with --files0-from"
 msgstr ""
 "tosobola okussawo aka --files0-from ate n'oteekawo ne fayiro ez'okukolako"
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr "%s: wazzewo kiremya mu kusoma"
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr ""
 "ekiragiro bwe kiba nga kya kusoma amannya aga fayiro akova ku stdin,\n"
 "erinnya %s terikkirizibwamu"
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 msgid "invalid zero-length file name"
 msgstr "erinnya lya fayiro terikkirizibwa kusigala lyereere"
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr "omugatte"
 
@@ -4607,7 +4685,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
 "Kino mu enviromenti, kitegekamu KIGAMBO kigongojje EKIKONGOJJEDWA,\n"
@@ -4710,16 +4788,16 @@ msgid "input line is too long"
 msgstr "ebiyingizibwa birimu olunyiriri oluyitiridde obuwanvu"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr "Mike Parker"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr "James Youngman"
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
@@ -4728,7 +4806,7 @@ msgstr ""
 "Enkozesa entuufu eri: %s MBOOZI\n"
 "  oba:  %s KAWAYIRO\n"
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -4751,7 +4829,7 @@ msgstr ""
 "Ekiragiro bwe kisanga obubonero | ne & mu mboozi y'emu, kisooka okukola ku "
 "&\n"
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -4780,7 +4858,7 @@ msgstr ""
 "Ekiragiro kisooka okukola ku bubonero <, <=, =, !=, >=, oba > bwe kibusanga\n"
 "mu mboozi y'emu ne | ne & .\n"
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
@@ -4793,7 +4871,7 @@ msgstr ""
 "Ekiragiro kisooka okukola ku bubonero buno obuddako bwe kibusanga mu mboozi\n"
 "y'emu n'obwo obukulembedde mu lakalala\n"
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -4812,7 +4890,7 @@ msgstr ""
 "Ekiragiro kisooka okukola ku bubonero buno obuddako bwe kibusanga\n"
 "mu mboozi y'emu n'obwo bwonna obukulembedde mu lakalala\n"
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -4838,7 +4916,7 @@ msgstr ""
 "                               ku BUBONERO obwo, kivaamu 0\n"
 "  length KIGAMBO               Ekiragiro kiraga obuwanvu obwa KIGAMBO\n"
 
-#: src/expr.c:251
+#: src/expr.c:250
 #, fuzzy
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
@@ -4853,7 +4931,7 @@ msgstr ""
 "\n"
 "  ( EMBOOZI )                 Ekivaamu kya EMBOOZI\n"
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -4877,7 +4955,7 @@ msgstr ""
 "obw'obubonero obufaanaganyizidwa. Bwe wabulawo akabonero konna akazuulidwa\n"
 "ekivaamu kibeera 0.\n"
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -4891,32 +4969,32 @@ msgstr ""
 "gutuukako\n"
 "kiremya emmala y'omulimu eba 3.\n"
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, c-format
 msgid "syntax error"
 msgstr "Waliwo ekimenye amateeka ag'empandiika ey'ebiragiro"
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, c-format
 msgid "error in regular expression matcher"
 msgstr "emboozi enoonya zinnewayo erimu ensobi"
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, c-format
 msgid "non-integer argument"
 msgstr "agumenti ssi namba nzijjuvu"
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr "waliwo okugabiza mu zero"
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr "okuvvuunuka kiremy'ono, tegeka nti LC_ALL='C'"
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, c-format
 msgid "the strings compared were %s and %s"
 msgstr "ebigambo ebigerageranyizidwa biri %s ne %s."
@@ -4926,27 +5004,27 @@ msgstr "ebigambo ebigerageranyizidwa biri %s ne %s."
 msgid "Niels Moller"
 msgstr ""
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
 msgstr ""
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
 msgstr ""
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, c-format
 msgid "%s is not a valid positive integer"
 msgstr "%s tekkirizibwa nga ennamba esukka ku 0 etakolebwa ndala"
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr "%s: kiyitiridde obunene"
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
@@ -4955,7 +5033,7 @@ msgstr ""
 "Enkozesa entuufu eri: %s [NAMBA]\n"
 "  oba:  %s KAWAYIRO\n"
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
 "are specified on the command line, read them from standard input.\n"
@@ -5085,28 +5163,28 @@ msgid "invalid number of columns: %s"
 msgstr "obungi obw'ebifo: %s tebukkirizibwa"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr "Padraig Brady"
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, c-format
 msgid "Usage: %s\n"
 msgstr "Enkozesa entuufu eri: %s\n"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
 msgstr ""
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, c-format
 msgid "failed to get groups for user %s"
 msgstr "nnemedwa okufuna guluupu ez'omukozesa %s"
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, c-format
 msgid "failed to get groups for the current process"
 msgstr "nnemedwa okufuna guluupu ez'omulimu ogubindabinda"
@@ -5137,22 +5215,22 @@ msgstr ""
 "nga lubadde lukalala lw'abakozesa olukiragidwa. Olwo kiddamu kusoma\n"
 "fayiro ekwata ebifa ku bakozesa.\n"
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, fuzzy, c-format
 msgid "cannot get real UID"
 msgstr "nnemedwa okutegeka ennamba ey'omukozesa"
 
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, fuzzy, c-format
 msgid "cannot get effective GID"
 msgstr "nnemedwa okukola ku fayiro %s kw'egguka"
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, fuzzy, c-format
 msgid "cannot get real GID"
 msgstr "nnemedwa okutegeka ennamba ey'omukozesa"
 
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, fuzzy, c-format
 msgid "%s: no such user"
 msgstr "%s: omukozesa ono taliyo"
@@ -5214,60 +5292,50 @@ msgstr ""
 "b 512, kB 1000, K 1024, MB 1,000,000, M 1024*1024,\n"
 "GB 1000*1000*1000, G 1024*1024*1024, ko ne T, P, E, Z, Y bwebutyo.\n"
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr "%s: fayiro ekendedde ekiyitiridde"
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, c-format
 msgid "%s: number of bytes is too large"
 msgstr "%s: bayiti ziyitiridde obungi"
 
-#: src/head.c:440
-#, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr "%s: nnemedwa okukola lseek okudda awatandikidwa"
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr "%s: nnemedwa okukola lseek okudda ku awandikirwa awajjulule %s"
 
-#: src/head.c:673
-#, fuzzy, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "nnemedwa okugyawo %s"
-
-#: src/head.c:798
+#: src/head.c:423 src/tail.c:457
 #, c-format
-msgid "cannot reposition file pointer for %s"
+msgid "%s: cannot seek to relative offset %s"
 msgstr ""
-"sisobola kukyusa kifo ekikongojjedwa mu kigambo ekikwata ekifo mu fayiro "
-"kifuuke %s"
+"%s: tekisobose okutandikira mulimu nnyiriri %s okuva awanditandidwa mu bya "
+"bulijjo"
 
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr "%s: olw'obunene bwayo obusukkiridde, %s tesobola okulagibwa"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr "obungi bw'ennyiriri"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr "obungi obwa bayiti"
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr "obungi obw'ennyiriri tebukkirizibwa"
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr "obungi obwa bayiti tebukkirizibwa"
 
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, c-format
 msgid "invalid trailing option -- %c"
 msgstr "akawayiro -%c tekategreese"
@@ -5316,27 +5384,34 @@ msgid "cannot determine hostname"
 msgstr "sisobodde okuzuula erinnya erya kompyuta ennyunge"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr "Arnold Robbins"
 
-#: src/id.c:81
-#, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
-msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... [MUKOZESA]\n"
+#: src/id.c:84
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]... [USER]\n"
+msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... [AKOZESA]...\n"
 
-#: src/id.c:82
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
+msgstr ""
+
+#: src/id.c:90
+#, fuzzy
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
 msgstr ""
 "Ekiragiro kino kiwandika ebikwata ku MUKOZESA, oba ku oyo aba akiyisizza.\n"
 "\n"
@@ -5360,7 +5435,7 @@ msgstr ""
 "  -u, --user       Buno bukireetera okuwandikako nnamba y'omukozesa\n"
 "                   gy'afaanana okuba nayo yokka\n"
 
-#: src/id.c:96
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
@@ -5371,19 +5446,24 @@ msgstr ""
 "ey'ennono\n"
 "omukozesa gy'alimu ko n'eza guluupu z'afaananabufaananyi okubeeramu.\n"
 
-#: src/id.c:140
+#: src/id.c:151
+#, fuzzy, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr "akawayiro --context (oba -Z) k'etaaga ennombe nga etegeera SELinux"
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr "akawayiro --context (oba -Z) k'etaaga ennombe nga etegeera SELinux"
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr ""
 "sisobola okuwandikawo endukusa eza SELinux ekiragiro\n"
 "bw'okiwerako n'erinnya lya mukozesa"
 
-#: src/id.c:178
+#: src/id.c:198
 #, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr ""
@@ -5391,103 +5471,110 @@ msgstr ""
 "ennamba ya mukozesa gy'afaanana okuba nga y'akiyisizza\n"
 "tekakola bw'obanga owaddeyo amannya agasukka mu limu"
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr ""
 "sisobola okuwandika mannya gokka oba ennamba ez'ennono\n"
 "zokka mu ntereeza eya bulijjo"
 
-#: src/id.c:199
+#: src/id.c:209
+#, fuzzy, c-format
+msgid "option --zero not permitted in default format"
+msgstr ""
+"sisobola okuwandika mannya gokka oba ennamba ez'ennono\n"
+"zokka mu ntereeza eya bulijjo"
+
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
 msgstr "omulimu nnemedwa okutegeera endukusa eza SELinux zagwo"
 
-#: src/id.c:224
+#: src/id.c:265
 #, fuzzy, c-format
 msgid "cannot get effective UID"
 msgstr "nnemedwa okukola ku fayiro %s kw'egguka"
 
-#: src/id.c:311
+#: src/id.c:354
 #, fuzzy, c-format
 msgid "cannot find name for user ID %s"
 msgstr "erinnya ery'omukozesa ow'ennamba %lu linnemye okuzuula"
 
-#: src/id.c:329
+#: src/id.c:372
 #, fuzzy, c-format
 msgid "uid=%s"
 msgstr "ennamba y'omukozesa=%lu"
 
-#: src/id.c:334
+#: src/id.c:377
 #, fuzzy, c-format
 msgid " gid=%s"
 msgstr "ennamba ya guluupu=%lu"
 
-#: src/id.c:341
+#: src/id.c:384
 #, fuzzy, c-format
 msgid " euid=%s"
 msgstr "ennamba omukozesa gyakolerako=%lu"
 
-#: src/id.c:349
+#: src/id.c:392
 #, fuzzy, c-format
 msgid " egid=%s"
 msgstr "ennamba eya guluupu ekolerwako=%lu"
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr " guluupu="
 
-#: src/id.c:393
+#: src/id.c:437
 #, c-format
 msgid " context=%s"
 msgstr " olukusa olwa SELinux=%s"
 
-#: src/install.c:373
+#: src/install.c:376
 #, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr "kulabula: %s: nnemedwa okukyusa olukusa lwa SELinux lufuuke %s"
 
-#: src/install.c:414
+#: src/install.c:417
 #, c-format
 msgid "creating directory %s"
 msgstr "nkolawo etterekero %s"
 
-#: src/install.c:482
+#: src/install.c:485
 #, c-format
 msgid "cannot change ownership of %s"
 msgstr "sisobola okukyusa obwanannyini ku %s"
 
-#: src/install.c:506
+#: src/install.c:509
 #, c-format
 msgid "cannot set time stamps for %s"
 msgstr "sisobola okuteeka wo ebilambe ebiraga %s we yakolebwawo"
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, c-format
 msgid "fork system call failed"
 msgstr "ekiragiro ekya sisitemu ekya \"fork\" kigaanye"
 
-#: src/install.c:531
+#: src/install.c:535
 #, c-format
 msgid "cannot run %s"
 msgstr "nnemedwa okutandika ogwa %s"
 
-#: src/install.c:535
+#: src/install.c:539
 #, c-format
 msgid "waiting for strip"
 msgstr "nnindirira mulimu ogwa strip"
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr "omulimu ogwa strip gukomye mu ngeri etali ya bulijjo"
 
-#: src/install.c:558
+#: src/install.c:565
 #, c-format
 msgid "invalid user %s"
 msgstr "tewali akozesa gwe bayita %s"
 
-#: src/install.c:594
+#: src/install.c:601
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -5500,7 +5587,7 @@ msgstr ""
 "               oba:   %s [KAWAYIRO]... -t TTEREKERO NNONO...\n"
 "               oba:   %s [KAWAYIRO]... -d TTEREKERO...\n"
 
-#: src/install.c:601
+#: src/install.c:608
 #, fuzzy
 msgid ""
 "\n"
@@ -5528,7 +5615,7 @@ msgstr ""
 "empya ezikoledwawo. Mu mpandika eyokuna, kikolawo (ma)TTEREKERO ne fayiro\n"
 "zonna ezinalibeera/gabeera mu\n"
 
-#: src/install.c:615
+#: src/install.c:622
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
 "  -b                  like --backup but does not accept an argument\n"
@@ -5557,7 +5644,7 @@ msgstr ""
 "                                 kikolawo amaterekero agamenyedwa wano, ko\n"
 "                                 ne fayiro ezaamu\n"
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -5583,7 +5670,7 @@ msgstr ""
 "                                 (muteesiteesi yekka y'asobola okweyambisa\n"
 "                                 akawayiro kano ne kakola)\n"
 
-#: src/install.c:631
+#: src/install.c:638
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
 "files\n"
@@ -5617,20 +5704,21 @@ msgstr ""
 "  -v, --verbose                  Buno bukireetera okuwandika mannya\n"
 "                                 g'amaterekero ge kikolawo\n"
 
-#: src/install.c:641
+#: src/install.c:648
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
-"      --preserve-context         Kano kakireetera okutegeka ndukusa eza\n"
-"                                 SELinux ez'oku koppi ze kikolawo nga\n"
-"                                 ze zimu n'ez'oku fayiro ez'omu NNONO\n"
-"  -Z, --context=NDUKUSA          Buno bwo bukireetera okutegeka ndukusa\n"
-"                                 eza SELinux ez'oku koppi ze kikolawo\n"
-"                                 zibe NDUKUSA\n"
 
-#: src/install.c:859
+#: src/install.c:696 src/unlink.c:86
+#, c-format
+msgid "cannot unlink %s"
+msgstr "tekisobose okugya %s mu nkalala eza whatis"
+
+#: src/install.c:877
 #, c-format
 msgid ""
 "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
@@ -5638,55 +5726,41 @@ msgstr ""
 "KULABULA: aka -preserve-context tekagenda kukolerwako; ennombe ya kuno\n"
 "tetegeera SELinux"
 
-#: src/install.c:869
-#, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
-msgstr ""
-"KULABULA: aka --context (-Z) tekagenda kukolerwako; ennombe ya kuno\n"
-"tetegeera SELinux"
-
-#: src/install.c:886
+#: src/install.c:917
 #, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr "bw'obeera owanga tterekero, akawayiro strip tekakola"
 
-#: src/install.c:889
+#: src/install.c:920
 #, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr ""
 "tokkirizibwa okutegeeza ekiragiro etterekero mwe kiba kiteeka\n"
 "ekintu ssing ekintu ekyo kiba nga nakyo tterekero"
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr ""
-"tekisoboka okukaka endukusa eza SELinux ez'okukikolebwako zifuuke %s ne "
-"zikala"
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, c-format
 msgid "invalid mode %s"
 msgstr "enkola %s wano teja wo"
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr ""
 "KULABULA: akawayiro --strip-program tekajjakukolebwako kubanga tewataddeko\n"
 "n'aka -s"
 
-#: src/install.c:959
+#: src/install.c:1001
 #, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr "obuwayiro --compare (-C) ne --preserve-timestamps tebukolagana"
 
-#: src/install.c:966
+#: src/install.c:1008
 #, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr "obuwayiro --compare (-C) ne --strip tebukolagana"
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -5700,7 +5774,7 @@ msgstr ""
 msgid "Mike Haertel"
 msgstr "Mike Haertel"
 
-#: src/join.c:191
+#: src/join.c:195
 #, fuzzy
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
@@ -5726,7 +5800,7 @@ msgstr ""
 "  -e KABONERO         Kano kakireetera okuteekeewo KABONERO buli awabula\n"
 "                      bitundu by'ennyiriri eziyingizibwa ebyandikoledwako\n"
 
-#: src/join.c:200
+#: src/join.c:204
 #, fuzzy
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
@@ -5743,7 +5817,7 @@ msgstr ""
 "  -t NUKUTA           Kano kakireetera okubala NUKUTA ng'ekyawuluza mu\n"
 "                      bitundu bya nnyiriri eziyingizibwa n'ez'omu bivaamu\n"
 
-#: src/join.c:206
+#: src/join.c:210
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
 "  -1 FIELD          join on this FIELD of file 1\n"
@@ -5769,7 +5843,16 @@ msgstr ""
 "                      ku buli lupapula nga emitwe gy'ebitundu, era\n"
 "                      tegigeza okuzigatta na ndala\n"
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+#, fuzzy
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr ""
+" -z, --zero-terminated     Obuwayiro buno bugamba ekiragiro okuva ku\n"
+"                           kusengeka nnyiriri kisengekeemu ebintu\n"
+"                           ebyawulaganidwa akabonero akategeeza\n"
+"                           bayiti 0\n"
+
+#: src/join.c:225
 #, fuzzy
 msgid ""
 "\n"
@@ -5813,50 +5896,50 @@ msgstr ""
 "Fayiro ezikolebwako bwe ziba nga tezaasengekebwa, ekiragiro ne kisangamu\n"
 "ennyiriri ezitasobola okukwataganyizibwa, kiwandikawo okulabula.\n"
 
-#: src/join.c:403
+#: src/join.c:410
 #, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
 msgstr ""
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, c-format
 msgid "invalid field number: %s"
 msgstr "ennamba ey'ekitundu eky'olunyiriri ekikolebwako: `%s', tekola"
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, c-format
 msgid "invalid field specifier: %s"
 msgstr "ekigambo ekifuga ekitundu eky'olunyiriri ekikolebwako: %s, tekikola"
 
-#: src/join.c:877
+#: src/join.c:884
 #, c-format
 msgid "invalid file number in field spec: %s"
 msgstr ""
 "ekigambo ekifuga ekitundu eky'olunyiriri ekikolebwako\n"
 "kirimu ennamba etakola: %s"
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr "ebitundu eby'ennyiriri %lu ne %lu tebisobola kukozesebwa kugatta"
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr "embigambo ebiy'okujuza mu bitundu eby'ennyiriri ebyereere tebikolagana"
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, c-format
 msgid "multi-character tab %s"
 msgstr ""
 "ekikozesebwa mu kifo eky'oluseetuka, %s, kirimu obubonero obusukka mu kimu"
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr "akabonero ak'awuzi kasobaganye"
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr "awayingizibwa awa bulijjo tewasobola okubeera ennono eya fayiro zombi"
@@ -5986,48 +6069,48 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr "sisobola okukolawo nyunzi %s egguke ate ku %s"
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr "%s:tekikkirizibwa okukolawo nyunzi et'eyawudde nga egguka ku tterekero"
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, c-format
 msgid "%s: cannot overwrite directory"
 msgstr "%s: sisobola okuwandika ku tterekero elisangidwawo"
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
 msgstr "%s: %s ngigyewo nteekewo ekipya? "
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, c-format
 msgid "failed to create symbolic link %s"
 msgstr "nnemedwa okukolawo enyunzi eyeyawudde %s"
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr "nnemedwa okukolawo enyunzi eyeyawudde %s egguka ku %s"
 
 # c-format
-#: src/ln.c:348
+#: src/ln.c:365
 #, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr "nnemedwa okukolawo nnyunzi et'eyawudde egguka ku %.0s%s"
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, c-format
 msgid "failed to create hard link %s"
 msgstr "nnemedwa okukolawo enyunzi et'eyawudde %s"
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, c-format
 msgid "failed to create hard link %s => %s"
 msgstr "nnemedwa okukolawo enyunzi et'eyawudde %s => %s"
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -6044,7 +6127,7 @@ msgstr ""
 "                oba:  %s [KAWAYIRO]... -t TTEREKERO KIGENDERWA  (empandika "
 "4)\n"
 
-#: src/ln.c:381
+#: src/ln.c:398
 #, fuzzy
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
@@ -6070,7 +6153,7 @@ msgstr ""
 "kukola kasita fayiro eyo emala n'ekolebwawo.\n"
 "\n"
 
-#: src/ln.c:394
+#: src/ln.c:411
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
 "file\n"
@@ -6097,7 +6180,7 @@ msgstr ""
 "zidde\n"
 "                              mu kifo kyazo\n"
 
-#: src/ln.c:402
+#: src/ln.c:419
 #, fuzzy
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
@@ -6126,7 +6209,7 @@ msgstr ""
 "  -s, --symbolic              Buno bwo bukireetera okukolawo nyunzi\n"
 "                              ez'eyawudde mu kifo eky'ezit'eyawudde\n"
 
-#: src/ln.c:411
+#: src/ln.c:428
 #, fuzzy
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
@@ -6148,7 +6231,7 @@ msgstr ""
 "                              enyunzi, kisooka kuwandika linnya lya fayiro\n"
 "                              kw'egguka\n"
 
-#: src/ln.c:433
+#: src/ln.c:450
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -6162,12 +6245,12 @@ msgstr ""
 "kikola nga eyataddewo aka %s.\n"
 "\n"
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr "tekisoboka kugatta --target-director ne --no-target-directoy"
 
-#: src/ln.c:588
+#: src/ln.c:605
 #, fuzzy, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr "sisobola okukolawo enyunzi eyeyawudde %s"
@@ -6200,7 +6283,7 @@ msgstr "Tewali linnya ery'okwewandisaako"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
@@ -6209,101 +6292,101 @@ msgstr "%b %e  %Y"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 msgid "%b %e %H:%M"
 msgstr "%b %e %H:%M"
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr ""
 "ekikongojjedwa mu kigambo ekya mu enviromenti QUOTING_STYLE tekikkirizibwa \n"
 "era sigenda okukikozesa: %s"
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr ""
 "omuwendo ogukongojjedwa mu kigambo COLUMNS tegukkirizibwa: %s era tegugenda\n"
 "kukozesebwa"
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr ""
 "omuwendo ogukongojjedwa mu kigambo TABSIZE tegukkirizibwa: %s era tegugenda\n"
 "kukozesebwa"
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, c-format
 msgid "invalid line width: %s"
 msgstr "obuwanvu obw'emboozi obuweeredwa: %s tebukkirizibwa"
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, c-format
 msgid "invalid tab size: %s"
 msgstr "obuwanvu obw'oluseetuka obuweeredwa: %s tebukkirizibwa"
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, c-format
 msgid "invalid time style format %s"
 msgstr "entereeza ey'okulaga obudde eweredwa, %s, tekkirizibwa"
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 #, fuzzy
 msgid "Valid arguments are:\n"
 msgstr "Augumenti z'oyinza okuwa ziri:"
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr ""
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr "wazzewo kiremya mu kutegeka mannya g'emyezi"
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, c-format
 msgid "unrecognized prefix: %s"
 msgstr "akakulembera: %s tekategerekese"
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr "ekikongojjedwa mu kigambo LS_COLORS tekivvunulika"
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, c-format
 msgid "cannot open directory %s"
 msgstr "nemedwa okubikkula tterekero %s"
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, c-format
 msgid "cannot determine device and inode of %s"
 msgstr "nemedwa okulaba kyuma %s kw'eri ne \"inodi\" yayo ennemye okuzuula"
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, c-format
 msgid "%s: not listing already-listed directory"
 msgstr "%s: etterekero lino limaz'okukolebwako, terijjakuddimwamu"
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, c-format
 msgid "reading directory %s"
 msgstr "nsoma mu etterekero %s"
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, c-format
 msgid "closing directory %s"
 msgstr "mbikka tterekero %s"
 
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, c-format
 msgid "cannot compare file names %s and %s"
 msgstr "tekisobose okunoonya njawulo wakati wa mannya aga fayiro gano:%s ne %s"
 
-#: src/ls.c:4721
+#: src/ls.c:4781
 #, fuzzy
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
@@ -6316,7 +6399,7 @@ msgstr ""
 "mannya ga fayiro ezo nga egoberera walifu.\n"
 "\n"
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
 "  -A, --almost-all           do not list implied . and ..\n"
@@ -6335,18 +6418,18 @@ msgstr ""
 "                             obw'enkola eyomu lulimi lwa C obufuga enneyisa\n"
 "                             ey'obubonero obutalabika\n"
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 #, fuzzy
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
 "      --block-size=BUNENE    Buno bukireetera okukozesa buloka ezirimu\n"
@@ -6371,16 +6454,15 @@ msgstr ""
 "ge\n"
 "                             gasooka\n"
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 #, fuzzy
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 "  -C                         Akawayiro kano kakireetera amannya okugalagira\n"
@@ -6394,7 +6476,7 @@ msgstr ""
 "                             etabagana ne Emacs  ekolera mu nkola yayo\n"
 "                             eya \"dired\"\n"
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 #, fuzzy
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
@@ -6425,17 +6507,19 @@ msgstr ""
 "                            'vertical' kyekimu n'akawayiro -C\n"
 "      --full-time            Kyekimu ne -l --time-style=full-iso\n"
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr ""
 "  -g                         Kano kakola nga aka -l okugyako nti tekalaga\n"
 "                             bannyini fayiro\n"
 
-#: src/ls.c:4763
+#: src/ls.c:4823
+#, fuzzy
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 "      --group-directories-first\n"
@@ -6448,10 +6532,11 @@ msgstr ""
 "                             ekiragiro n'eby'okusooka kuwandika materekero\n"
 "                             tekibikola\n"
 
-#: src/ls.c:4769
+#: src/ls.c:4829
+#, fuzzy
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
@@ -6462,14 +6547,15 @@ msgstr ""
 "readable',\n"
 "                             naye nga birengo bya 1000 mu kifo ekya 1024\n"
 
-#: src/ls.c:4775
+#: src/ls.c:4835
+#, fuzzy
 msgid ""
 "  -H, --dereference-command-line\n"
 "                             follow symbolic links listed on the command "
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
@@ -6492,7 +6578,7 @@ msgstr ""
 "                             aka -a oba -A, ekiragiro fayiro ezo ate "
 "kiziraga\n"
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 #, fuzzy
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
@@ -6502,7 +6588,7 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 "      --indicator-style=KIGAMBO Kano kakireetera okuwayira ku mannya\n"
 "                             agali mu lukalala  obubonero obw'engeri\n"
@@ -6516,7 +6602,7 @@ msgstr ""
 "                             kigambo eky'omu nzivvuunuzi KIGAMBO\n"
 "  -k                         Kye kimu ne --block-size=1K\n"
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -6532,7 +6618,7 @@ msgstr ""
 "                             ekiwandikiro ate nga amannya aga fayiro\n"
 "                             g'awulibwa zi \",\"\n"
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -6554,12 +6640,12 @@ msgstr ""
 "                             Buno bukireetera okuwayira akabonero aka / ku\n"
 "                             mannya ag'amaterekero ge kiba kiwandisewo\n"
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 #, fuzzy
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -6579,7 +6665,7 @@ msgstr ""
 "                             literal, locale, shell, shell-always, c, ne "
 "escape\n"
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
 "  -R, --recursive            list subdirectories recursively\n"
@@ -6593,16 +6679,19 @@ msgstr ""
 "  -s, --size                 Buno bukireetera okulaga buloka buli\n"
 "                             fayiro gye kisanga ze kikozesa\n"
 
-#: src/ls.c:4825
+#: src/ls.c:4886
+#, fuzzy
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 "  -S                         Kano kakireetera okusengeka amannya okusinzira\n"
 "                             ku bunene bwa fayiro\n"
@@ -6627,17 +6716,19 @@ msgstr ""
 "                             kakireetera n'okusengeka amannya okusinzira\n"
 "                             ku fayiro esinga okubeera n'obudde obw'okumpi\n"
 
-#: src/ls.c:4835
+#: src/ls.c:4896
 #, fuzzy
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
 msgstr ""
 "      --time-style=MUSONO    Kano kakireetera okulaga obudde mu musono "
 "MUSONO.\n"
@@ -6656,7 +6747,7 @@ msgstr ""
 "MUSONO\n"
 "                             tekikola ku ebyo ebitali mu lokale eya POSIX\n"
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 #, fuzzy
 msgid ""
 "  -t                         sort by modification time, newest first\n"
@@ -6667,10 +6758,11 @@ msgstr ""
 "  -T, --tabsize=BIFO         Buno bukireetera okubala nti oluseetuka\n"
 "                             lumalawo ebifo BIFO, sso ssi  8\n"
 
-#: src/ls.c:4848
+#: src/ls.c:4912
+#, fuzzy
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
@@ -6689,13 +6781,13 @@ msgstr ""
 "                             fayiro ezirin'amannya agalimu ennamba mu ngeri\n"
 "                             egoberera ennamba ezo\n"
 
-#: src/ls.c:4855
+#: src/ls.c:4919
+#, fuzzy
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 "  -w, --width=KOL            Buno bukireetera okubala nti obugazi\n"
@@ -6710,7 +6802,7 @@ msgstr ""
 "  -1                         Kano kakireetera okuwandika buli linnya lya\n"
 "                             fayiro ku lunyiriri lwa lyo\n"
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -6729,7 +6821,7 @@ msgstr ""
 "y'ekiragiro ku nsonga ya kuwandika mu langi. Ekiragiro ekya 'dircolors' kye\n"
 "kitegeka ekigambo kino\n"
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -6826,9 +6918,11 @@ msgstr ""
 #, fuzzy
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
@@ -6845,12 +6939,7 @@ msgstr ""
 "                          zaazo enkuumi\n"
 "\n"
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -6868,68 +6957,68 @@ msgstr ""
 "bantu),\n"
 "n'erinnya erya FAYIRO\n"
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, c-format
 msgid "%s: too many checksum lines"
 msgstr "%s: ennyiriri mu namba enkuumi zisukkiridde obungi"
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr ""
 "%s: %<PRIuMAX>: ennamba enkuumi ey'ekika kya %s erimu\n"
 "olunyiriri olwandikidwa bubi"
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr "%s: okubikkula oba okusoma KUGAANYE\n"
 
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr "KIGAANYE"
 
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr "KALE"
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr "%s: ennyiriri ez'ennamba enkuumi eza %s zonna zitereezedwa bubi"
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
 msgstr[0] "KULABULA: olunyiriri %<PRIuMAX> lulimu ensobi mu mpandika ya lwo"
 msgstr[1] "KULABULA: ennyiriri %<PRIuMAX> zirimu ensobi mu mpandika ya zo"
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
 msgstr[0] "KULABULA: fayiro %<PRIuMAX> mu lukalala tesomese"
 msgstr[1] "KULABULA: fayiro %<PRIuMAX> mu lukalala tezisomese"
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
 msgstr[0] "KULABULA: ennamba enkuumi %<PRIuMAX> ebalidwa ssi ntuufu"
 msgstr[1] "KULABULA: ennamba enkuumi %<PRIuMAX> ezibalidwa ssi ntuufu"
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
 msgstr ""
 
-#: src/md5sum.c:766
+#: src/md5sum.c:770
 #, fuzzy, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr "omugaso ogw'akawayiro --status gukoma ku kukakasa ennamba enkuumi"
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
@@ -6937,45 +7026,44 @@ msgstr ""
 "bw'obeera okukakasabukakasa ennamba enkuumi, obuwayiro --binary ne --text\n"
 "tebulina kye bukolawo"
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr "omugaso ogw'akawayiro --status gukoma ku kukakasa ennamba enkuumi"
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr "omugaso ogw'akawayiro --warn gukoma ku kukakasa ennamba enkuumi"
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr "akawayiro --quiet kagasa mu kukakasa nnamba nkuumi wokka"
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, fuzzy, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr "omugaso ogw'akawayiro --status gukoma ku kukakasa ennamba enkuumi"
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... TTEREKERO...\n"
 
-#: src/mkdir.c:57
+#: src/mkdir.c:59
 #, fuzzy
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
 msgstr ""
 "Ekiragiro kino kikolawo (ma)TTEREKERO, bwe kitagasanga nga gaakolebwawodda\n"
 "\n"
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
+#, fuzzy
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 "  -m, --mode=NDUKUSA   Bw'ossawo kamu ku buwayiro buno, kakireetera\n"
 "                       okutegeka ndukusa (nga empandika eya NDUKUSA y'emu\n"
@@ -6988,17 +7076,46 @@ msgstr ""
 "  -Z, --context=NDUKUSA Buno bukireetera okutegeka ndukusa eza SELinux\n"
 "                       ez'oku buli tterekero erikolebwawo zibe NDUKUSA\n"
 
-#: src/mkdir.c:168
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/mkdir.c:127 src/mkdir.c:172
+#, fuzzy, c-format
+msgid "failed to set default creation context for %s"
+msgstr ""
+"%s nnemedwa okugitegekera endukusa eza SELinux ezo\n"
+"ezitegekebwa bulijjo ku fayiro ezakakolebwawo"
+
+#: src/mkdir.c:191
+#, fuzzy, c-format
+msgid "failed to restore context for %s"
+msgstr "nemedwa okukuuma `saawa' ez'oku %s"
+
+#: src/mkdir.c:231
 #, c-format
 msgid "created directory %s"
 msgstr "nkozewo tterekero eliyitibwa %s"
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, fuzzy, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr ""
+"KULABULA: aka --context (-Z) tekagenda kukolerwako; ennombe ya kuno\n"
+"tetegeera SELinux"
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... LINNYA...\n"
 
-#: src/mkfifo.c:52
+#: src/mkfifo.c:54
 #, fuzzy
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
 msgstr ""
@@ -7007,7 +7124,7 @@ msgstr ""
 "omukutu omutume\n"
 "\n"
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
 msgstr ""
@@ -7015,29 +7132,34 @@ msgstr ""
 "                        okutegeka ndukusa (nga empandika eya NDUKUSA y'emu\n"
 "                        n'ekozesebwa ku kiragiro ekya 'chmod')\n"
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
-"  -Z, --context=NDUKUSA Buno bukireetera okutegeka ndukusa eza SELinux\n"
-"                        ku buli LINNYA zibe NDUKUSA\n"
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, c-format
 msgid "invalid mode"
 msgstr "enkola eno tekkirizibwa"
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr "eno attiributo eteekwa kukoma ku kutegeka bbiti ezikola ku ndukusa"
 
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
+#, fuzzy, c-format
+msgid "cannot set permissions of %s"
+msgstr "nnemedwa okukyusa obuyinza obw'oku %s"
+
+#: src/mknod.c:54
 #, c-format
 msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... LINNYA KIKA [NKULU NTO]\n"
 
-#: src/mknod.c:54
+#: src/mknod.c:56
 #, fuzzy
 msgid "Create the special file NAME of the given TYPE.\n"
 msgstr ""
@@ -7045,12 +7167,7 @@ msgstr ""
 "KIKA.\n"
 "\n"
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr ""
-"  -Z, --context=NDUKUSA  Buno butegeka ndukusa eza SELinux zibe NDUKUSA\n"
-
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -7066,7 +7183,7 @@ msgstr ""
 "n'ekirala kyonna kitwalibwa nga ennamba eya bulijjo (eya mu dekanariyo).\n"
 "KIKA kisobola okuba:\n"
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 msgid ""
 "\n"
 "  b      create a block (buffered) special file\n"
@@ -7080,55 +7197,55 @@ msgstr ""
 "         nukututa (ekisangibwamu  kye kisomebwa)\n"
 "  p      Kano kaireetera okuolawo FIFO\n"
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 msgid "Special files require major and minor device numbers."
 msgstr "Fayiro enjawulemu z'etaagako ennamba y'ekyuma enkulu n'ento"
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 msgid "Fifos do not have major and minor device numbers."
 msgstr "FIFO tezibaako nnamba ya kyuma nkulu n'ento."
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, c-format
 msgid "block special files not supported"
 msgstr "fayiro ez'enjawulo eza kika kya bulooka tezikola wano"
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, c-format
 msgid "character special files not supported"
 msgstr "fayiro ez'enjawulo eza kika kya nukuta tezikola wano"
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, c-format
 msgid "invalid major device number %s"
 msgstr "ennamba y'ekyuma enkulu %s tekkirizibwa"
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, c-format
 msgid "invalid minor device number %s"
 msgstr "ennamba y'ekyuma ento %s tekkirizibwa"
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, c-format
 msgid "invalid device %s %s"
 msgstr "ekyuma %s %s tekikkirizibwa"
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, c-format
 msgid "invalid device type %s"
 msgstr "ekika eky'ekyuma %s tekikkirizibwa"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr "Erik Blake"
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr "Enlozesa entuufu eri: %s [KAWAYIRO]... [LUTIBA]\n"
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 #, fuzzy
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
@@ -7142,12 +7259,12 @@ msgstr ""
 "Bw'obanga tolina kyewategese mu kigambo ekikongozzi 'LUTIBA', fayiro\n"
 "oba etterekero eyo kigituma erinnya ery'enkula ya 'tmp.XXXXXXXXXX'\n"
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
@@ -7161,12 +7278,13 @@ msgstr ""
 "  -q, --quiet         Bw'ossawo kamu ku buno, ekiragiro tekikubuulira lwe\n"
 "                      kiremwa kukolawo fayiro oba tterekero\n"
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
+#, fuzzy
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
 "      --suffix=KATANDIKWA    Kano kakireetera 'LUTIBA' okukisoosaako\n"
 "                      KATANDIKWA (ekiteekwa butabaamu obusaze).\n"
@@ -7174,12 +7292,13 @@ msgstr ""
 "                      ekiragiro kino kikola nga gwe eyataddewo akawayiro "
 "kano.\n"
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
+#, fuzzy
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
 "  --tmpdir[=TEREKERO] Akawayiro kano kakireetera fayiro oba etterekero\n"
@@ -7200,9 +7319,9 @@ msgstr ""
 "                      ekitundu ekisembayo kyokka - ekidda ku kasaze\n"
 "                      ak'akaddanyuma akasembayo.\n"
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
+#, fuzzy
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
@@ -7225,34 +7344,29 @@ msgstr ""
 "                      ate nga n'ekigambo eky'omu nviromenti TMPDIR nakyo\n"
 "                      tekitegekedwa.\n"
 
-#: src/mktemp.c:223
-#, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr "nnemedwa okusindika ebyandigenze ku stderr ku /dev/null"
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, c-format
 msgid "too many templates"
 msgstr ""
 "ebigambo ebifuga entuma ya fayiro\n"
 "ezikolebwawo biyitiridde obungi"
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr "bw'obanga otaddewo aka '--suffix', olutiba %s kiteekwa okusembyayo 'X'"
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr "akafundikwa %s kasobu, kalimu akasaze"
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr "'X' eziri mu kigambo %s ziyitiridde obungi"
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr ""
@@ -7261,7 +7375,7 @@ msgstr ""
 "ak'awula wakati w'amannya ag'amaterekero\n"
 "(akasaze ak'akaddanyuma)"
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr ""
@@ -7269,21 +7383,21 @@ msgstr ""
 "bw'obanga otaddewo n'akawayiro aka --tmpdir. Ekikigaanisa?\n"
 "Kuba nga kkubo eritandikira ku tterekero ery'okumusingi"
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, c-format
 msgid "failed to create directory via template %s"
 msgstr ""
 "nnemedwa okukolawo tterekero nga n'eyambisa\n"
 "ekigambo ekifuga entuma ya fayiro %s"
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, c-format
 msgid "failed to create file via template %s"
 msgstr ""
 "nnemedwa okukolawo fayiro nga n'eyambisa\n"
 "ekigambo ekifuga entuma ya fayiro %s"
 
-#: src/mv.c:292
+#: src/mv.c:294
 #, fuzzy
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
 msgstr ""
@@ -7291,7 +7405,7 @@ msgstr ""
 "Era kisimbuliza NONO e/zirage mu TTEREKERO.\n"
 "\n"
 
-#: src/mv.c:298
+#: src/mv.c:300
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
 "file\n"
@@ -7320,7 +7434,7 @@ msgstr ""
 "Bw'oteekawo akasoba mu kamu ku buwayiro -i, -n ne -f k'osembyayo\n"
 "kokka ke kakola.\n"
 
-#: src/mv.c:307
+#: src/mv.c:309
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
@@ -7335,7 +7449,8 @@ msgstr ""
 "                               ku linnya lyya kkopi ey'okwerinda, mu kifo\n"
 "                               eky'aka bulijjo\n"
 
-#: src/mv.c:312
+#: src/mv.c:314
+#, fuzzy
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
 "DIRECTORY\n"
@@ -7344,6 +7459,8 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
 "  -t, --target-directory=TTEREKERO  Buno bukireetera okusimbuliza fayiro\n"
 "                               zonna ezimenyedwa mu  NNONO zigende mu "
@@ -7693,95 +7810,90 @@ msgid "%s: invalid number to ignore"
 msgstr "%s: tekigasa kubuukako ebitundu ebibazi ebyenkana awo"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
 msgstr ""
 
-#: src/numfmt.c:676
+#: src/numfmt.c:659
 #, fuzzy, c-format
-msgid "value too large to be converted: '%s'"
+msgid "value too large to be converted: %s"
 msgstr "%s: obubonero bumu bwokka bwe bukoledwako"
 
-#: src/numfmt.c:680
+#: src/numfmt.c:663
 #, fuzzy, c-format
-msgid "invalid number: '%s'"
+msgid "invalid number: %s"
 msgstr "namba %s tekkirizibwa"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
+msgid "rejecting suffix in input: %s (consider using --from)"
 msgstr ""
 
-#: src/numfmt.c:688
+#: src/numfmt.c:671
 #, fuzzy, c-format
-msgid "invalid suffix in input: '%s'"
+msgid "invalid suffix in input: %s"
 msgstr "agumenti %s%s erina akatandikwa '%s' akatakoler'awo"
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
 msgstr ""
 
-#: src/numfmt.c:723
+#: src/numfmt.c:722 src/numfmt.c:768
 #, fuzzy, c-format
 msgid "failed to prepare value '%Lf' for printing"
 msgstr "%s nnemedwa okugibikkula kugiwandikamu"
 
-#: src/numfmt.c:787
+#: src/numfmt.c:791
 #, fuzzy, c-format
-msgid "invalid unit size: '%s'"
+msgid "invalid unit size: %s"
 msgstr "obuwanvu obw'oluseetuka obuweeredwa: %s tebukkirizibwa"
 
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
-#, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr ""
-
-#: src/numfmt.c:813
+#: src/numfmt.c:814
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
 msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... [AKOZESA]...\n"
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
 msgstr ""
 
-#: src/numfmt.c:820
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
 msgstr ""
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
 msgstr ""
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
 "                         see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr ""
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
@@ -7789,19 +7901,19 @@ msgid ""
 "locale)\n"
 msgstr ""
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
 msgstr ""
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
 msgstr ""
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -7811,30 +7923,30 @@ msgid ""
 "                         is found\n"
 msgstr ""
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
 "nearest\n"
 msgstr ""
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
 msgstr ""
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr ""
 
-#: src/numfmt.c:877
+#: src/numfmt.c:878
 #, fuzzy
 msgid ""
 "\n"
@@ -7843,11 +7955,11 @@ msgstr ""
 "Obuwayiro obulala:\n"
 "\n"
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr ""
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -7856,7 +7968,7 @@ msgid ""
 "               1Mi = 1048576,\n"
 msgstr ""
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
@@ -7864,7 +7976,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
@@ -7872,7 +7984,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
@@ -7880,18 +7992,18 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:905
+#: src/numfmt.c:906
 #, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -7903,7 +8015,7 @@ msgid ""
 "errors are not diagnosed and the exit status is 0.\n"
 msgstr ""
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -7924,115 +8036,114 @@ msgid ""
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 msgstr ""
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, c-format
 msgid "format %s has no %% directive"
 msgstr "empandika %s ebulako ekitundu ekya %%"
 
-#: src/numfmt.c:990
+#: src/numfmt.c:1003
 #, fuzzy, c-format
 msgid "invalid format %s (width overflow)"
 msgstr "entereeza ey'obudde, %s, tekkirizibwa"
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr ""
+
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr "empandika %s ekomekkerezedwa %%"
 
-#: src/numfmt.c:1010
+#: src/numfmt.c:1030
 #, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
 msgstr ""
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr "empandika %s erimu ebitundu ebya %% ebiyitiridde obungi"
 
-#: src/numfmt.c:1070
+#: src/numfmt.c:1081
 #, fuzzy, c-format
-msgid "invalid suffix in input '%s': '%s'"
+msgid "invalid suffix in input %s: %s"
 msgstr "agumenti %s%s erina akatandikwa '%s' akatakoler'awo"
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
 msgstr ""
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
 msgstr ""
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
+msgid "large input value %s: possible precision loss"
 msgstr ""
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
 
-#: src/numfmt.c:1388
+#: src/numfmt.c:1403
 #, fuzzy, c-format
-msgid "invalid padding value '%s'"
+msgid "invalid padding value %s"
 msgstr "olubu lw'empapula %s terusoboka"
 
-#: src/numfmt.c:1401
+#: src/numfmt.c:1417
 #, fuzzy, c-format
-msgid "invalid field value '%s'"
+msgid "invalid field value %s"
 msgstr "ennamba ey'ekitundu eky'olunyiriri ekikolebwako: `%s', tekola"
 
-#: src/numfmt.c:1430
+#: src/numfmt.c:1447
 #, fuzzy, c-format
-msgid "invalid header value '%s'"
+msgid "invalid header value %s"
 msgstr "obudde, %s, tebukkirizibwa"
 
-#: src/numfmt.c:1456
+#: src/numfmt.c:1473
 #, fuzzy, c-format
 msgid "--grouping cannot be combined with --format"
 msgstr ""
 "tosobola okussawo aka --files0-from ate n'oteekawo ne fayiro ez'okukolako"
 
-#: src/numfmt.c:1458
-#, fuzzy, c-format
-msgid "--padding cannot be combined with --format"
-msgstr ""
-"tosobola okussawo aka --files0-from ate n'oteekawo ne fayiro ez'okukolako"
-
-#: src/numfmt.c:1463
+#: src/numfmt.c:1478
 #, fuzzy, c-format
 msgid "no conversion option specified"
 msgstr "obuwayiro obwa -i buyitiridde obungi"
 
-#: src/numfmt.c:1471
+#: src/numfmt.c:1486
 #, fuzzy, c-format
 msgid "grouping cannot be combined with --to"
 msgstr ""
 "tosobola okussawo aka --files0-from ate n'oteekawo ne fayiro ez'okukolako"
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
 msgstr ""
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
 msgstr ""
 
-#: src/numfmt.c:1511
+#: src/numfmt.c:1526
 #, fuzzy, c-format
 msgid "error reading input"
 msgstr "wazzewo kiremya mu kusoma %s"
 
-#: src/numfmt.c:1520
+#: src/numfmt.c:1535
 #, fuzzy, c-format
 msgid "failed to convert some of the input numbers"
 msgstr "sisobodde okulemesa bintu kuva awayingizibwa awa bulijjo"
 
-#: src/od.c:294
+#: src/od.c:320
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -8045,7 +8156,7 @@ msgstr ""
 "  oba:  %s --traditional [FAYIRO] [FAYIRO] [[+]AWATANDIKIRWA[.][b] [+]"
 "[KIPANDE][.][b]]\n"
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -8066,7 +8177,7 @@ msgstr ""
 "kibifuna okuva awayingizibwa awa bulijjo.\n"
 "\n"
 
-#: src/od.c:307
+#: src/od.c:333
 #, fuzzy
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
@@ -8089,34 +8200,25 @@ msgstr ""
 "'.' ekitegeeza ntibinaabalibwa mu okitariyo, oba 'b', ekitegeeza nti\n"
 "ennamba zikubisibwamu 512.\n"
 
-#: src/od.c:318
-#, fuzzy
+#: src/od.c:344
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
-"  -A, --address-radix=RADIKISI   Bw'ossaako kamu ku buwayiro buno, kategeka\n"
-"                                 ebirengo ebinaakozesebwa mu kuwandika "
-"nnamba\n"
-"                                 eziraga awatandikirwa mu fayiro - ennamba\n"
-"                                 kiziwandika ne radikisi eya RADIKISI\n"
-"  -j, --skip-bytes=BAYITI        Buno bukireetera bayiti BAYITI ezisooka ku\n"
-"                                 nnyiriri ezisomebwa mu ebiva ku nnono\n"
-"                                 butazibala nga eby'okukolebwako. Ezo ze\n"
-"                                 zikola ennamba eziraga olunyiriri we\n"
-"                                 lutandikira mu fayiro\n"
 
-#: src/od.c:323
+#: src/od.c:350
 #, fuzzy
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
@@ -8139,7 +8241,7 @@ msgstr ""
 "      --traditional              Kano kakireetera okukolera ne ku agumenti\n"
 "                                 ez'enkola eyasookawo\n"
 
-#: src/od.c:336
+#: src/od.c:363
 #, fuzzy
 msgid ""
 "\n"
@@ -8147,7 +8249,7 @@ msgid ""
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 "\n"
@@ -8162,7 +8264,7 @@ msgstr ""
 "  -d      Kye kimu ne -t u2, kano kakireetera okukozesa nnamba eza\n"
 "          dekanariyo enfunze\n"
 
-#: src/od.c:345
+#: src/od.c:372
 msgid ""
 "  -f   same as -t fF, select floats\n"
 "  -i   same as -t dI, select decimal ints\n"
@@ -8182,14 +8284,14 @@ msgstr ""
 "  -x      Kyekimu ne -t x2, kaleetera ekiragiro okuwandika ennamba mu\n"
 "          mpandiika eya namba enzijjuvu enfunda eza mu hekisadekanariyo\n"
 
-#: src/od.c:353
+#: src/od.c:380
 #, fuzzy
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 "\n"
 "KIKA kirimu kimu, oba bimu ku:\n"
@@ -8199,7 +8301,7 @@ msgstr ""
 "akasumulula\n"
 "              ebikagoberera okuva mu nkola yaabyo eya bulijjo\n"
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -8219,7 +8321,7 @@ msgstr ""
 "  x[BUNGI]    Ennamba eya hekisadekanariyo. Buli digiti ya mu etwala bayiti\n"
 "              BUNGI\n"
 
-#: src/od.c:367
+#: src/od.c:394
 #, fuzzy
 msgid ""
 "\n"
@@ -8231,22 +8333,22 @@ msgstr ""
 "\n"
 "BUNGI eba namba. KIKA bwe kiba kimu ku d, o, u, ne x, BUNGI olwo\n"
 "esobola okubeera C - ekirina amakulu ge gamu ne sizeof(char), S - ekirina\n"
-"amakulu ge gamu ne sizeof(short), I - ekirina amakulu gegamu ne sizeof"
-"(int),\n"
+"amakulu ge gamu ne sizeof(short), I - ekirina amakulu gegamu ne "
+"sizeof(int),\n"
 "oba L - ekirina amakulu ge gamu ne sizeof(long). KIKA bwe kiba f, olwo\n"
 "BUNGI esobola okubeera F - kirina amakulu ge gamu ne sizeof(float), D -\n"
 "ekirina amakulu gegamu ne sizeof(double), oba L - ekirina amakulu ge gamu "
 "ne\n"
 "sizeof(long double).\n"
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
 "each output line.\n"
 msgstr ""
 
-#: src/od.c:379
+#: src/od.c:406
 #, fuzzy
 msgid ""
 "\n"
@@ -8264,12 +8366,12 @@ msgstr ""
 "b 512, kB 1000, K 1024, MB 1,000,000, M 1024*1024,\n"
 "GB 1000*1000*1000, G 1024*1024*1024, ko ne T, P, E, Z, Y bwebutyo.\n"
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, c-format
 msgid "invalid type string %s"
 msgstr "%s tekikkirizibwa kukola ng'ekigambo ekifuga 'kika'"
 
-#: src/od.c:649
+#: src/od.c:690
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -8278,7 +8380,7 @@ msgstr ""
 "%s tekikkirizibwa kukola ng'ekiganbo ekifuga 'kika';\n"
 "anti sisitemu eno tekozesa namba nzijuvu eza bayiti %lu"
 
-#: src/od.c:770
+#: src/od.c:811
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -8287,19 +8389,19 @@ msgstr ""
 "%s tekikkirizibwa kukola ng'ekiganbo ekifuga 'kika';\n"
 "anti sisitemu eno tekozesa namba nzijuvu eza bayiti %lu"
 
-#: src/od.c:828
+#: src/od.c:869
 #, fuzzy, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr ""
 "akabonero '%c' mu kigambo %s ekifuga empandika ey'ebivaamu tekakkirizibwa"
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr ""
 "bayiti z'ondagidde okubuuka zisinga obunene obwa fayiro z'ompadde okukolako"
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, fuzzy, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr ""
@@ -8307,27 +8409,27 @@ msgstr ""
 "fayiro\n"
 "kw'etandikira; kozesa kamu ku buno obubonero obuna: d o x n"
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr ""
 "bw'okozesa akawayiro '-S' oba '--strings' tokkirizibwa kukozesa n'ate '-t'\n"
 "oba '--format'"
 
-#: src/od.c:1810
+#: src/od.c:1863
 msgid "compatibility mode supports at most one file"
 msgstr ""
 "'od' bw'ebeera egoberera enkola mpya n'enkadde awamu,\n"
 "esobolako fayiro emu yokka"
 
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr ""
 "bwogatta bayiti ezisook'okubuukibwa ne bayiti eziba zikolebwako,\n"
 "ekivaamu kisinga bunene bw'ebigenda kukolebwako"
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr "kulabula: obuwanvu %lu tebusoboka; 'od' egenda kukozesaamu %d"
@@ -8511,12 +8613,12 @@ msgstr "Ddi"
 msgid "Where"
 msgstr "Wa"
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... [AKOZESA]...\n"
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -8540,7 +8642,7 @@ msgstr ""
 "                     MUKOZESA mu bufunze, eno y'enkola yakyo eya bulijjo ne\n"
 "                     bw'otateekawo akawayiro kano\n"
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -8564,7 +8666,7 @@ msgstr ""
 "                     n'obudde bw'amaze ng'asirikiriridde bwe kiba nga\n"
 "                     kiwandika eby'omubufunze\n"
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8576,7 +8678,7 @@ msgstr ""
 "ewandikawo ebikwata ku bakazosa abali ku sisitemu. Ekozesa fayiro\n"
 "egoberera abayingira n'abava mu sistemu esangibwa ku %s.\n"
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr ""
@@ -8893,11 +8995,13 @@ msgstr ""
 "                      kiremedwa okuggula FAYIRO\n"
 
 #: src/pr.c:2820
+#, fuzzy
 msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
@@ -8920,7 +9024,7 @@ msgstr ""
 "                      okuzigyisa mu nkumbo. Bwe kubaako n'aka -w ate\n"
 "                      ekiragiro kisigala ennyiriri kizitemamu\n"
 
-#: src/pr.c:2827
+#: src/pr.c:2828
 #, fuzzy
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
@@ -8940,7 +9044,7 @@ msgstr ""
 "  -t, --omit-header   Buno bwo bukireetera butawandikawo mitwe n'obugambo\n"
 "                      obuba ku nkomerero ez'empapula\n"
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 msgid ""
 "  -T, --omit-pagination\n"
 "                    omit page headers and trailers, eliminate any "
@@ -8972,7 +9076,7 @@ msgstr ""
 "Olukumbo\n"
 "                      bwe luba lumu obuwayiro buno tebulina kye bukolawo\n"
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
 "                    set page width to PAGE_WIDTH (72) characters always,\n"
@@ -8995,7 +9099,7 @@ msgstr ""
 "                      ekiragoro ennyiriri tekizitemamu. Bwo obuwayiro '-s'\n"
 "                      ne '-S' tebulina kye bukyusa ku nkola eya buno\n"
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 msgid ""
 "\n"
 "-t is implied if PAGE_LENGTH <= 10.  With no FILE, or when FILE is -, read\n"
@@ -9024,7 +9128,8 @@ msgstr ""
 "\n"
 
 #: src/printenv.c:69
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+#, fuzzy
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr ""
 "  -0, --null     Bw'ossawo kamu ku buno bukireetera okussawo bayiti eya 0 "
 "ku\n"
@@ -9156,12 +9261,12 @@ msgstr "kulabula: agumenti ez'enfissi, okuva ku %s, tezigenda kukolerwako"
 msgid "F. Pinard"
 msgstr "F. Pinard"
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, c-format
 msgid "%s (for regexp %s)"
 msgstr "%s (ku mboozi enoonya zinnewayo %s)"
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
@@ -9170,7 +9275,7 @@ msgstr ""
 "Enkozesa entuufu eri: %s [KAWAYIRO]... [EBY'OKUKOLAKO]... (nga tokozesa -G)\n"
 "  oba: %s -G [KAWAYIRO]... [EBY'OKUKOLAKO [EBIVAAMU]]\n"
 
-#: src/ptx.c:1821
+#: src/ptx.c:1824
 #, fuzzy
 msgid ""
 "Output a permuted index, including context, of the words in the input "
@@ -9197,7 +9302,7 @@ msgstr ""
 "   omosonso nnungi sso/         mese   nsolima ssi nnungi naye mese ey'\n"
 "\n"
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 #, fuzzy
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
@@ -9216,7 +9321,7 @@ msgstr ""
 "                                 we kiba kitemyemu olunyiriri "
 "olw'ebikolebwako\n"
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 #, fuzzy
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
@@ -9251,7 +9356,7 @@ msgstr ""
 "                                 bisobole okukozesebwa mu puloguramu eya "
 "'TeX'\n"
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -9301,7 +9406,7 @@ msgstr ""
 "tekikikolako\n"
 "                                 era mu lukalala olukolebwawo tekibaamu\n"
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -9322,18 +9427,17 @@ msgstr ""
 "                                 obukola ebigambo ebikozesebwa okulamba\n"
 "                                 ennyiriri ezo\n"
 
-#: src/ptx.c:1854
+#: src/ptx.c:1857
 #, fuzzy
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
 "\n"
-"Ekiragiro kino bw'okiyisa nga tolaze FAYIRO oba bw'oteekawo ka - awali\n"
-"FAYIRO kirinda kusoma ebiva awayingizibwa awa bulijjo. Ekiragiro kikola\n"
-"nga eyataddewo akawayiro '-F /' okugyako ng'otaddewo ekirala.\n"
+"Bw'oba towadde FAYIRO, oba nga FAYIRO ogiwadde nga '-', ekiragiro kisoma\n"
+"ebiva ku nnono eya bulijjo.\n"
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, c-format
 msgid "invalid gap width: %s"
 msgstr "obunene obw'ekibangirizi, %s, tebukkirizibwa"
@@ -9357,22 +9461,28 @@ msgstr ""
 "  -P, --physical  Bw'okozesa kamu ku buno, ekkubo kiriwandika mu ngeri\n"
 "                  nti teribaamu nnyunzi\n"
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+
+#: src/pwd.c:169
 #, c-format
 msgid "failed to chdir to %s"
 msgstr "nnemedwa kukyusa kudda mu tterekero %s"
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, c-format
 msgid "failed to stat %s"
 msgstr "nnemedwa okufuna ebifa ku %s"
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr "nnemedwa okuzuula ekiri mu tterekero %s ekikwatagana ne i-nodi"
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, c-format
 msgid "ignoring non-option arguments"
 msgstr "agumenti ezitafuula eneyisa ey'ebiragiro tezikoledwako"
@@ -9382,8 +9492,8 @@ msgstr "agumenti ezitafuula eneyisa ey'ebiragiro tezikoledwako"
 msgid "Dmitry V. Levin"
 msgstr "Dmitry V. Levin"
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... FAYIRO...\n"
@@ -9438,8 +9548,7 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 "  -m, --canonicalize-missing    Buno bwo buleetera ekiragiro okuwandika\n"
 "                                erinnya mu bujjuvu nga ekkubo lyonna okuva "
@@ -9483,7 +9592,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 
@@ -9501,41 +9610,42 @@ msgstr "%s: nyingire mu tterekero %s etakkirizibwa okuwandikibwa mu? "
 msgid "%s: descend into directory %s? "
 msgstr "%s: nyingire mu tterekero %s? "
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr "%s: nzigyewo %s %s etakkirizibwa okuwandikibwa mu? "
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, c-format
 msgid "%s: remove %s %s? "
 msgstr "%s: nzigyewo %s %s? "
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, c-format
 msgid "removed directory: %s\n"
 msgstr "tterekero %s ligyidwa wo\n"
 
-#: src/remove.c:444
-#, c-format
-msgid "cannot remove directory: %s"
-msgstr "nemedwa okugyawo tterekero: %s"
+#: src/remove.c:447
+#, fuzzy, c-format
+msgid "refusing to remove %s or %s directory: skipping %s"
+msgstr "nnemedwa okugyawo tterekero %s"
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr "%s ngibuuka kubanga eri ku kyuma kirala"
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, c-format
 msgid "traversal failed: %s"
 msgstr "wazzewo kiremya mu kukebera tterekero: %s"
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -9568,15 +9678,16 @@ msgstr ""
 "                         buli lwe kibeera kigenda okuggyawo fayiro\n"
 
 #: src/rm.c:142
+#, fuzzy
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 "  -I                    Akawayiro kano kakireetera okusooka kwebuuza wa\n"
 "                        mukozesa bwe kiba nga kya kugyawo fayiro ezisoba\n"
@@ -9667,14 +9778,18 @@ msgstr ""
 "kukozesa ekiragiro ekya shred.\n"
 
 #: src/rm.c:342
-#, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr "%s: ameterekero agali mu agumenti n'ebigalimu mbigyewo? "
+#, fuzzy, c-format
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] "%s: ameterekero agali mu agumenti n'ebigalimu mbigyewo? "
+msgstr[1] "%s: ameterekero agali mu agumenti n'ebigalimu mbigyewo? "
 
-#: src/rm.c:343
-#, c-format
-msgid "%s: remove all arguments? "
-msgstr "%s: byonna ebimenyedwa mu agumenti mbigyewo? "
+#: src/rm.c:345
+#, fuzzy, c-format
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] "%s: byonna ebimenyedwa mu agumenti mbigyewo? "
+msgstr[1] "%s: byonna ebimenyedwa mu agumenti mbigyewo? "
 
 #: src/rmdir.c:134 src/rmdir.c:233
 #, c-format
@@ -9735,7 +9850,7 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
 
@@ -9803,41 +9918,46 @@ msgstr ""
 msgid "no command specified"
 msgstr "totaddewo kiragiro"
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr "%s kyetaagisa ennombe ebe nga etegeera SELinux"
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, c-format
 msgid "failed to compute a new context"
 msgstr "nnemedwa okuzuula endukusa eza SELinux empya"
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, c-format
 msgid "failed to set new user %s"
 msgstr "nnemedwa okutegeka omukozesa omupya %s"
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, c-format
 msgid "failed to set new type %s"
 msgstr "nnemedwa okutegeka ettuluba ery'ebikolebwako eppya %s"
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, c-format
 msgid "failed to set new range %s"
 msgstr "nnemedwa okutegeka olubu olupya %s"
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, c-format
 msgid "failed to set new role %s"
 msgstr "nnemedwa okutegeka ettuluba ly'abakozesa eppya %s"
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, c-format
 msgid "unable to set security context %s"
 msgstr "nnemedwa okutegeka endukusa eza SELinux %s"
 
+#: src/selinux.c:127 src/selinux.c:300
+#, fuzzy, c-format
+msgid "error canonicalizing %s"
+msgstr "nnemedwa okuzza %s mu mpandika eya bulijjo"
+
 #: src/seq.c:68
 #, c-format
 msgid ""
@@ -9879,10 +9999,13 @@ msgstr ""
 "gazo\n"
 
 #: src/seq.c:86
+#, fuzzy
 msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
@@ -9898,7 +10021,7 @@ msgstr ""
 "EKYONGERWAKO kitera okubeera ya positifu, ate ESOOKA bw'ebeera nga\n"
 "y'ennene ku ESEMBAYO EKYONGERWAKO kitera okubeera ya negatifu.\n"
 
-#: src/seq.c:94
+#: src/seq.c:96
 #, fuzzy
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
@@ -9913,18 +10036,18 @@ msgstr ""
 "eritasussa\n"
 "TTUUSO, ekiragiro kikozesaamu empandika %g.\n"
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, c-format
 msgid "invalid floating point argument: %s"
 msgstr ""
 "agument: %s tekkirizibwa ku nnamba ey'ekika ekifunzidwa mu bitundu bisatu"
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr "empandika %s erimu ekitundu %%%c ekitategeereka"
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr ""
@@ -9932,80 +10055,12 @@ msgstr ""
 "obungi bwa digiti tekikukkiriza ate okwongerako obuwayiro obulala obufuga\n"
 "empandika yazo"
 
-#: src/setuidgid.c:49
-#, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-"Enkozesa entuufu eri: %s [KAWAYIRO-KAFUNZE]... MUKOZESA KIRAGIRO "
-"[AGUMENTI]...\n"
-"  oba:  %s KAWAYIRO-KAJJUVU\n"
-
-#: src/setuidgid.c:55
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-"Ekiragiro kino kisobozesa omukozesa omu okweyambisa KIRAGIRO,\n"
-"ne AGUMENTI, nekikola nga kiringa ekiyisidwa omukozesa omulala,\n"
-"MUKOZESA. Ku olwo abeera nga alina ennamba-ya-mukozesa\n"
-"n'ennamba-ya-guluupu eby'oyo MUKOZESA. Bwe kitasoboka kufuna\n"
-"ennamba-ya-mukozesa n'ennamba-ya-guluupu ebyo, ekiragiro kikoma\n"
-"ne kifuna emmala y'omulimu nga eri 111. Bwe biyitamu, emmala\n"
-"y'omulimu ey'ekiragiro kino eba y'emu n'eya KIRAGIRO. Ekiragiro\n"
-"kino tekigasa okugyako nga root (muteesiteesi, ow'ennamba-ya-\n"
-"mukozesa=0) y'akiyisizza.\n"
-"\n"
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-"  -g NG[,NG1... ]   Akawayiro kano kakutegekera ennamba ya guluupu enkulu\n"
-"n'eba NG, ate bw'oba nazo ozetaaze, ennamba eza guluupu ez'enyongeza\n"
-"kazikutegekera ne ziba NG1, ...\n"
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr "ennamba-ya-mukozesa eno sigimanyi: %s"
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr ""
-"okusobola okukolera ku nnamba ya mukozesa %s,\n"
-"wetaaga okwongerako akawayiro aka '-g'"
-
-#: src/setuidgid.c:190
-#, c-format
-msgid "failed to set supplemental group(s)"
-msgstr "tekisobose okwongerako guluupu ey'enyongeza"
-
-#: src/setuidgid.c:200
-#, c-format
-msgid "cannot set group-ID to %lu"
-msgstr "tekisobose okukola ennamba-ya-guluupu ebe %lu"
-
-#: src/setuidgid.c:204
-#, c-format
-msgid "cannot set user-ID to %lu"
-msgstr "tekisobose okukola namba-ya-mukozesa eba %lu"
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr "Colin Plumb"
 
-#: src/shred.c:148
+#: src/shred.c:170
 #, fuzzy
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
@@ -10015,7 +10070,7 @@ msgstr ""
 "kibeere kizibu nnyo okuzikomyawo, ne bwe babeera bakozesezza\n"
 "sofitiweya eyenkana wa.\n"
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -10034,9 +10089,10 @@ msgstr ""
 "                      okussaako obukulembekkereza obulaga ebirengo,\n"
 "                      nga K, M, ne G)\n"
 
-#: src/shred.c:161
+#: src/shred.c:183
+#, fuzzy
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
@@ -10055,15 +10111,20 @@ msgstr ""
 "                       w'ebadde kiwandikawo mazero, waleme okulabika nga we\n"
 "                       bakozesezza ekiragiro ekya shred ekyo. Ebivaamu\n"
 
-#: src/shred.c:170
+#: src/shred.c:192
+#, fuzzy
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 "\n"
@@ -10077,7 +10138,7 @@ msgstr ""
 "bakola ku fayiro eza bulijjo.\n"
 "\n"
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -10095,7 +10156,7 @@ msgstr ""
 "ku ezo shred kwayinza obutabeera na mugaso:\n"
 "\n"
 
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -10118,7 +10179,7 @@ msgstr ""
 "  ekiwereza ekya NFS ekikolebwa ba Network Appliance\n"
 "\n"
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -10132,7 +10193,7 @@ msgstr ""
 "* sisitemu eza fayiro ezifunzidwa\n"
 "\n"
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -10155,7 +10216,7 @@ msgstr ""
 "mount).\n"
 "\n"
 
-#: src/shred.c:215
+#: src/shred.c:241
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
 "of the file that cannot be removed, and that will allow a shredded file\n"
@@ -10166,129 +10227,129 @@ msgstr ""
 "eya fayiro gy'oyagala okukolako shred. Olwo fayiro eyo ebeera\n"
 "ekyayinza okukomezebwawo.\n"
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, c-format
 msgid "%s: fdatasync failed"
 msgstr "ku %s enkola eya fdatasync egaanye"
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr "ku %s enkola eya fsync egaanye"
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr "%s: sisobola okudda mabega"
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr "%s: muku %lu/%lu (%s)..."
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, c-format
 msgid "%s: error writing at offset %s"
 msgstr "%s: kiremya mu kuwandikira ku bujjulule obwa %s"
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, c-format
 msgid "%s: lseek failed"
 msgstr "ku %s enkola eya lseek egaanye"
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, c-format
 msgid "%s: file too large"
 msgstr "%s: fayiro eyitiridde obunene"
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr "%s: muku %lu/%lu (%s)...%s"
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr "%s: muku %lu/%lu (%s)...%s/%s %d%%"
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, c-format
 msgid "%s: fstat failed"
 msgstr "%s: fstat eremedwa okugikebera ebigikwatako"
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, c-format
 msgid "%s: invalid file type"
 msgstr "%s: kino ekika kya fayiro tekikkirizibwa"
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr "%s: obunene obwa fayiro eno buli wansi wa zero"
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, c-format
 msgid "%s: error truncating"
 msgstr "%s: wazzewo kiremya mu kusalako fayiro"
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, c-format
 msgid "%s: fcntl failed"
 msgstr "%s: emirimu egya 'fcntl' gizzeko kiremya"
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr ""
 "%s: sisobola okukola shred ku ndagiriro ekutuusa ku fayiro eyongerwako "
 "bwongerwa embikkule"
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr "%s: ngigyawo"
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, c-format
 msgid "%s: renamed to %s"
 msgstr "%s: erinnya lyayo ndikyusiza libeere %s"
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, c-format
 msgid "%s: failed to remove"
 msgstr "nnemedwa okugyawo %s"
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr "%s: egyidwawo"
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, c-format
 msgid "%s: failed to close"
 msgstr "nnemedwa okubika %s"
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, c-format
 msgid "%s: failed to open for writing"
 msgstr "%s nnemedwa okugibikkula kugiwandikamu"
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, c-format
 msgid "%s: invalid number of passes"
 msgstr "%s: obwo obungi bw'emiku tebusoboka"
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, c-format
 msgid "multiple random sources specified"
 msgstr "otegese ennono eza data eya muwawa ezisoba mu emu"
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, c-format
 msgid "%s: invalid file size"
 msgstr "%s: buno obunene bwa fayiro tebukkirizibwa"
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -10299,7 +10360,7 @@ msgstr ""
 "                oba:  %s -e [KAWAYIRO]... [AGU]..\n"
 "                oba:  %s -i ESOOKA-ESEMBA [KAWAYIRO]...\n"
 
-#: src/shuf.c:54
+#: src/shuf.c:67
 #, fuzzy
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr ""
@@ -10307,7 +10368,8 @@ msgstr ""
 "kikyusakyusizza engobereragana yazo mu ngeri eya muwawa.\n"
 "\n"
 
-#: src/shuf.c:60
+#: src/shuf.c:73
+#, fuzzy
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
 "  -i, --input-range=LO-HI   treat each number LO through HI as an input "
@@ -10315,7 +10377,7 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
 msgstr ""
 "  -e, --echo                Bw'ossaawo kamu ku buwayiro buno, ekiragiro "
 "buli\n"
@@ -10350,31 +10412,41 @@ msgstr ""
 "                            eya zero eyo mu kifo eky'akabonero aka bulijjo\n"
 "                            akalaga enkomerero y'olunyiriri\n"
 
-#: src/shuf.c:244
+#: src/shuf.c:228
+#, fuzzy, c-format
+msgid "too many input lines"
+msgstr "ennyiriri ezifaanagana ziyitiridde obungi"
+
+#: src/shuf.c:431
 #, c-format
 msgid "multiple -i options specified"
 msgstr "obuwayiro obwa -i buyitiridde obungi"
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, c-format
 msgid "invalid input range %s"
 msgstr "olubu lw'ebiyingizibwa %s terukkirizibwa"
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, c-format
 msgid "invalid line count %s"
 msgstr "obungi bw'ennyiriri %s tebusoboka"
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, c-format
 msgid "multiple output files specified"
 msgstr "ebivaamu bigambidwa okugenda mu fayiro ezisukka mu emu"
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, c-format
 msgid "cannot combine -e and -i options"
 msgstr "obuwayiro -e ne -i tebukolagana"
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr ""
+
 #: src/sleep.c:44
 #, fuzzy, c-format
 msgid ""
@@ -10404,17 +10476,17 @@ msgstr ""
 "ne bubeera obudde enzivvunuzi bw'en'esirikirira.\n"
 "\n"
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, c-format
 msgid "invalid time interval %s"
 msgstr "ekiseera %s tekisoboka"
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr "nnemedwa okusoma essawa ebalirawo"
 
-#: src/sort.c:399
+#: src/sort.c:427
 #, fuzzy
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr ""
@@ -10422,7 +10494,7 @@ msgstr ""
 "mu ngeri ensengeke awateekebwa ebivaamu awa bulijjo.\n"
 "\n"
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
@@ -10430,7 +10502,7 @@ msgstr ""
 "Buno bwe buwayiro obufuga engeri gye kisengekamu ennyiriri ezo:\n"
 "\n"
 
-#: src/sort.c:409
+#: src/sort.c:437
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
 "  -d, --dictionary-order      consider only blanks and alphanumeric "
@@ -10449,7 +10521,7 @@ msgstr ""
 "  -f, --ignore-case           Buno bukireetera obutawula mu nnukuta nnene\n"
 "                              n'entono bwe kiba kisengeka\n"
 
-#: src/sort.c:415
+#: src/sort.c:443
 #, fuzzy
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
@@ -10474,7 +10546,7 @@ msgstr ""
 "engobereragana\n"
 "                              y'emyezi < 'JAN' < .. < 'DES'\n"
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
@@ -10496,7 +10568,7 @@ msgstr ""
 "                              y'olunyiriri, olwo kirutwala ng'olutandise ne\n"
 "                              nnamba 0\n"
 
-#: src/sort.c:423
+#: src/sort.c:451
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
 "  -R, --random-sort           sort by random hash of keys\n"
@@ -10526,7 +10598,7 @@ msgstr ""
 "ya\n"
 "                              bye kimaz'okusengeka\n"
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -10545,7 +10617,7 @@ msgstr ""
 "                              ntandikwa yazo\n"
 "\n"
 
-#: src/sort.c:437
+#: src/sort.c:465
 msgid ""
 "Other options:\n"
 "\n"
@@ -10553,7 +10625,7 @@ msgstr ""
 "Obuwayiro obulala:\n"
 "\n"
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
@@ -10563,7 +10635,7 @@ msgstr ""
 "                             nga tekyetaaze kukolawo fayiro "
 "ez'ekiseerabuseera\n"
 
-#: src/sort.c:445
+#: src/sort.c:473
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
 "  -C, --check=quiet, --check=silent  like -c, but do not report first bad "
@@ -10585,7 +10657,7 @@ msgstr ""
 "                            puloguramu PULOG. Kizipakuluza ekiragiro kya\n"
 "                           'PULOG -d'\n"
 
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -10606,7 +10678,7 @@ msgstr ""
 "awayingizibwa\n"
 "                            awa bulijjo\n"
 
-#: src/sort.c:459
+#: src/sort.c:487
 #, fuzzy
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
@@ -10627,7 +10699,7 @@ msgstr ""
 "                            Ebivaamu bibeera wamu nga ebivudde mu fayiro\n"
 "                            emu.\n"
 
-#: src/sort.c:463
+#: src/sort.c:491
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "  -s, --stable              stabilize sort by disabling last-resort "
@@ -10644,7 +10716,7 @@ msgstr ""
 "                            ggwanika lya kompyuta ekiragiro mwe kisobola\n"
 "                            okuteraka bye kikolako\n"
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, fuzzy, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -10681,15 +10753,7 @@ msgstr ""
 "                           fayiro nesengeke n'okulaba oba mulimu ennyiriri\n"
 "                           ezifaanagana\n"
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr ""
-" -z, --zero-terminated     Obuwayiro buno bugamba ekiragiro okuva ku\n"
-"                           kusengeka nnyiriri kisengekeemu ebintu\n"
-"                           ebyawulaganidwa akabonero akategeeza\n"
-"                           bayiti 0\n"
-
-#: src/sort.c:483
+#: src/sort.c:511
 #, fuzzy
 msgid ""
 "\n"
@@ -10725,7 +10789,7 @@ msgstr ""
 "Ku namba 'BUNENE' osobola okusembyako kamu ku bukomekkereza buno\n"
 "obuddako:\n"
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -10756,267 +10820,252 @@ msgstr ""
 "gifuule\n"
 "eya C (mu enviromenti LC_ALL=C).\n"
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, c-format
 msgid "waiting for %s [-d]"
 msgstr "nninda %s [-d]"
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr "%s [-d] gukomye mu ngeri etali ya bulijjo"
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, c-format
 msgid "cannot create temporary file in %s"
 msgstr "sisobola okukolawo fayiro ey'ekiseerabuseera mu %s"
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr "sisobodde okubikkula fayiro"
 
-#: src/sort.c:970
+#: src/sort.c:998
 msgid "fflush failed"
 msgstr "ogwa fflush gugaanye"
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr "sisobodde okubikka fayiro"
 
-#: src/sort.c:986
-#, c-format
-msgid "dup2 failed"
-msgstr "ogwa dup2 gugaanye"
-
-#: src/sort.c:1103
-#, c-format
-msgid "couldn't execute %s"
-msgstr "nnemedwa okutandika ogwa %s"
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 msgid "couldn't create temporary file"
 msgstr "nnemedwa okukolawo fayiro ey'ekiseerabuseera"
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, c-format
 msgid "couldn't create process for %s -d"
 msgstr "nnemedwa okutandika omulimu ogwa %s -d"
 
-#: src/sort.c:1161
-#, c-format
-msgid "couldn't execute %s -d"
-msgstr "nnemedwa okutandika ogwa %s -d"
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, c-format
 msgid "warning: cannot remove: %s"
 msgstr "kulabula: sisobola kuggyawo %s"
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, c-format
 msgid "invalid --%s argument %s"
 msgstr "agumenti eya --%s, %s tekkirizibwa"
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, c-format
 msgid "minimum --%s argument is %s"
 msgstr "agumenti eya --%s esembayo obutono ekkirizibwa eri %s"
 
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, c-format
 msgid "--%s argument %s too large"
 msgstr "agumenti eya --%s, %s, eyitiridde obunene"
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr ""
 "ekkomo erya rlimit eririwo terikkiriza\n"
 "agumenti eya --%s esukka %s obunene"
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr ""
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr "stat tesobode okuzza ebifa ku fayiro"
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr "sisobodde okusoma fayiro"
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, c-format
 msgid "string transformation failed"
 msgstr "waliwo ekigambo ekitafuulise"
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, c-format
 msgid "the untransformed string was %s"
 msgstr "%s kye kyagaanye okufuulibwa"
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr ""
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr ""
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr ""
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr ""
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr ""
 
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, fuzzy, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
 msgstr[0] "akawayiro '-%s' puloguramu tekafaako"
 msgstr[1] "obuwayiro '-%s' puloguramu tebufaako"
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr ""
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr "sisobode okuwandika"
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr "%s: %s:%s: wano ssi nsengeke"
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr "awateekebwa ebivaamu awa bulijjo"
 
-#: src/sort.c:3698
+#: src/sort.c:3738
 #, fuzzy
 msgid "cannot read"
 msgstr "%s: sisobola okudda mabega"
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, c-format
 msgid "%s: invalid field specification %s"
 msgstr "%s: %s tekisobola kukozesebwa okulaga ekitundu ky'olunyiriri"
 
-#: src/sort.c:3987
+#: src/sort.c:4028
 #, fuzzy, c-format
 msgid "options '-%s' are incompatible"
 msgstr "obuwayiro '-%s' tebukolagana"
 
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, c-format
 msgid "%s: invalid count at start of %s"
 msgstr "%s: entandikwa ya %s eriko ennamba etakkirizibwa"
 
-#: src/sort.c:4295
+#: src/sort.c:4336
 #, fuzzy
 msgid "invalid number after '-'"
 msgstr "ennamba eddirira '-' tekkirizibwa"
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 #, fuzzy
 msgid "invalid number after '.'"
 msgstr "ennamba eddirira '.' tekkirizibwa"
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr ""
 "ebiraga ekitundu eky'ennyiriri ekiba kikolebwako\n"
 "birimu akabonero akatandibaddemu"
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, c-format
 msgid "multiple compress programs specified"
 msgstr "otegese puloguramu ezipakirisibwa ezisukka mu emu"
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
 msgstr ""
 "ekitundu eky'olunyiriri kiriko ennamba etakkirizibwa ku ntandikwa yakyo"
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
 msgstr "ennamba ey'ekitundu ky'olunyiriri eri zero"
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr ""
 "ogambye okutandikira ku kabonero namba 0 -\n"
 "akasembayo mu kitundu ekitandikirwako"
 
-#: src/sort.c:4407
+#: src/sort.c:4448
 #, fuzzy
 msgid "invalid number after ','"
 msgstr "ennamba eddirira ',' tekkirizibwa"
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr "tewalaze kabonero ak'awuzi akaba kadda mu kifo eky'akabulijjo"
 
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, c-format
 msgid "cannot read file names from %s"
 msgstr "sisbola okusoma amannya aga fayiro okuva mu %s"
 
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr "%s:%lu: tekisoboka kuba na linnya lya fayiro eritalina buwanvu"
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, c-format
 msgid "no input from %s"
 msgstr "tewali biyingizibwa biva ku %s"
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr ""
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr ""
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr ""
 "kuliko ekikolebwako eky'enyongeza, %s.\n"
 "Kino tekikkirizibwa nga okozesezza akawayiro -%c"
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr ""
 
-#: src/split.c:204
+#: src/split.c:203
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... [EBIKOLEBWAKO [KATANDIKWA]]\n"
 
-#: src/split.c:208
+#: src/split.c:207
 #, fuzzy
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
@@ -11033,39 +11082,25 @@ msgstr ""
 "kikola ku by'owandika awayingizibwa awa bulijjo.\n"
 "\n"
 
-#: src/split.c:216
-#, fuzzy, c-format
+#: src/split.c:215
+#, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
-"  -a, --suffix-length=N   Bw'osaawo kamu ku buwayiro buno, ekiragiro\n"
-"                          obukulembekkereza kikolawo\n"
-"                          obulimu ennukuta N (mu bya bulijjo ziba %d)\n"
-"  -b, --bytes=BUNGI       buno bwo buleetera ekiragiro okukola zi-fayiro\n"
-"                          nga tekuli zisukka bayiti BUNGI obunene\n"
-"  -C, --line-bytes=BUWANVU Buno buleetera ekiragiro okukola zi-fayiro nga\n"
-"                          enyiriri zaamu temuli esukka mu bayiti\n"
-"                          BUWANVU obuwanvu\n"
-"  -d, --numeric-suffixes  Obuwayiro buno buleetera ekiragiro okukozesa\n"
-"                          namba mu kifo kya nukuta mu bukomekkereza\n"
-"                          obw'oku zi-fayiro ze kikolawo\n"
-"  -l, --lines=BUNGI       Buno ate bwe buleetera ekiragiro buli fayiro gye\n"
-"                          kikolawo butasukka mu nnyiriri BUNGI obuwanvu\n"
-
-#: src/split.c:229
+
+#: src/split.c:228
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
 "                            output file is opened\n"
@@ -11074,7 +11109,7 @@ msgstr ""
 "                          ebikwata ku mulimu buli lwe kiba kigenda\n"
 "                          kutandika fayiro ey'ekikoledwa empya\n"
 
-#: src/split.c:236
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -11086,194 +11121,194 @@ msgid ""
 "r/K/N   likewise but only output Kth of N to stdout\n"
 msgstr ""
 
-#: src/split.c:354
+#: src/split.c:353
 #, c-format
 msgid "output file suffixes exhausted"
 msgstr "Obukomekkereza bwakuteeka ku zi-fayiro ze nkolawo buweddeyo"
 
-#: src/split.c:366
+#: src/split.c:365
 #, c-format
 msgid "creating file %s\n"
 msgstr "nkolawo fayiro %s\n"
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr ""
 
-#: src/split.c:391
+#: src/split.c:390
 #, fuzzy, c-format
 msgid "failed to set FILE environment variable"
 msgstr "nnemedwa okwongera %s ku nviromenti"
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr ""
 
-#: src/split.c:395
+#: src/split.c:394
 #, fuzzy, c-format
 msgid "failed to create pipe"
 msgstr "nnemedwa okukolawo enyunzi et'eyawudde %s"
 
-#: src/split.c:409
+#: src/split.c:408
 #, fuzzy, c-format
 msgid "closing prior pipe"
 msgstr "mbikka tterekero %s"
 
-#: src/split.c:411
+#: src/split.c:410
 #, fuzzy, c-format
 msgid "closing output pipe"
 msgstr "mbikka fayiro egenzemu ebizzibwa %s"
 
-#: src/split.c:415
+#: src/split.c:414
 #, fuzzy, c-format
 msgid "moving input pipe"
 msgstr "mbikka fayiro egyibwamu ebiyingizibwa %s"
 
-#: src/split.c:417
+#: src/split.c:416
 #, fuzzy, c-format
 msgid "closing input pipe"
 msgstr "mbikka fayiro egyibwamu ebiyingizibwa %s"
 
-#: src/split.c:422
+#: src/split.c:421
 #, fuzzy, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr "nnemedwa okutandika ekiragiro %s"
 
-#: src/split.c:428
+#: src/split.c:427
 #, fuzzy, c-format
 msgid "failed to close input pipe"
 msgstr "nnemedwa okugya koppi mu %s"
 
-#: src/split.c:464
+#: src/split.c:463
 #, fuzzy, c-format
 msgid "waiting for child process"
 msgstr "nnindirira mulimu ogwa strip"
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr ""
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr ""
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr "ekiragiro kiraze ennamba y'embeera etategeereka (0x%X)"
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr "tekisoboka okumenyamu mu ngeri esukka mu emu"
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, fuzzy, c-format
 msgid "%s: invalid number of chunks"
 msgstr "%s: buno obungi bwa sikonda tebukkirizibwa"
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, fuzzy, c-format
 msgid "%s: invalid chunk number"
 msgstr "%s: eno namba tekola wano"
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr "%s: akafundikwa tekakkirizibwa kwenkan'awo"
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr "%s: obwo obungi bwa bayiti tebusoboka"
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr "%s: obwo obungi bw'ennyiriri tebusoboka"
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, c-format
 msgid "line count option -%s%c... is too large"
 msgstr "akawayiro -%s%c... kateeka nyiriri eziyitiridde obungi"
 
-#: src/split.c:1248
+#: src/split.c:1298
 #, fuzzy, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr "ennamba ey'olunyiriri tekkirizibwa: %s"
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, fuzzy, c-format
 msgid "%s: invalid IO block size"
 msgstr "%s: buno obunene bwa fayiro tebukkirizibwa"
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr ""
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr ""
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, fuzzy, c-format
 msgid "%s: cannot determine file size"
 msgstr "sisobodde okuzuula erinnya erya kompyuta ennyunge"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr "Michael Meskes"
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, c-format
 msgid "failed to canonicalize %s"
 msgstr "nnemedwa okuzza %s mu mpandika eya bulijjo"
 
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, fuzzy, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr ""
 "kulabula: akabonero akufuula enneyisa ya bunnaako, '\\%c', tekategeerekese"
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, c-format
 msgid "%s: invalid directive"
 msgstr "%s: okulagira kuno tekukola"
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, c-format
 msgid "warning: backslash at end of format"
 msgstr ""
 "kulabula: ekigambo ekifuga empandika\n"
 "kikomekkerezedwa akasaze ak'akaddanyuma"
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr ""
 "ekiragiro bwe kiba nga kikola ku sisitemu za fayiro mu kifo kya fayiro\n"
 "zennyini, %s kiba tekitegeeza awayingizibwa awa bulijjo"
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, c-format
 msgid "cannot read file system information for %s"
 msgstr "sisbola okusoma embuulire ekwata ku %s mu sisitemu eya fayiro"
 
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, c-format
 msgid "cannot stat standard input"
 msgstr "stat tesobola okuzuula ebifa ku awayingizibwa awa bulijjo"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -11284,7 +11319,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -11292,30 +11327,30 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, c-format
 msgid "Context: %C\n"
 msgstr "Olukusa lwa SELinux: %C\n"
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -11323,11 +11358,11 @@ msgid ""
 " Birth: %w\n"
 msgstr ""
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
 msgstr ""
 
-#: src/stat.c:1356
+#: src/stat.c:1418
 #, fuzzy
 msgid ""
 "  -L, --dereference     follow links\n"
@@ -11341,13 +11376,14 @@ msgstr ""
 "                          embeera eya fayiro, ekiragiro kiraga eya sisitemu\n"
 "                          eya fayiro yonna\n"
 
-#: src/stat.c:1360
+#: src/stat.c:1422
+#, fuzzy
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 "  -c  --format=MPANDIKA   Bw'ossawo kamu ku buwayiro buno, ekiragiro "
@@ -11367,7 +11403,7 @@ msgstr ""
 "Ate kamu ku buno bwe kabaako, ekiragiro ebivaamu\n"
 "                          kibwandika mu bufunze\n"
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 #, fuzzy
 msgid ""
 "\n"
@@ -11390,7 +11426,7 @@ msgstr ""
 "       bayiti\n"
 "  %C - Kirage n'endukusa eza SELinux\n"
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 #, fuzzy
 msgid ""
 "  %d   device number in decimal\n"
@@ -11407,7 +11443,7 @@ msgstr ""
 "  %g - ID eya guluupu nanyini gy'ali mu\n"
 "  %G - Linnya lya guluupu nanyini gy'ali mu\n"
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 #, fuzzy
 msgid ""
 "  %h   number of hard links\n"
@@ -11417,8 +11453,8 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 "  %h - Obungi obwa nyunzi ezit'eyawudde\n"
 "  %i - Muwendo owga inodi\n"
@@ -11431,7 +11467,7 @@ msgstr ""
 "  %t - Kika ekikulu ekya kyuma, mu ki-hekisi\n"
 "  %T - Kika ekito ekya kyuma, mu ki-hekisi\n"
 
-#: src/stat.c:1399
+#: src/stat.c:1461
 #, fuzzy
 msgid ""
 "  %u   user ID of owner\n"
@@ -11440,10 +11476,10 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 "  %u - ID-ya-akozesa eay nanyini\n"
@@ -11462,7 +11498,7 @@ msgstr ""
 "       okukyuka mu\n"
 "\n"
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 #, fuzzy
 msgid ""
 "Valid format sequences for file systems:\n"
@@ -11484,7 +11520,7 @@ msgstr ""
 "  %d - Obungi obwa nodi ezitannakozesebwa eziri mu sistemu eya fayiro\n"
 "  %f - Obungi obwa buloka ezitannakozesebwa eziri mu sisitemu eya fayiro\n"
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 #, fuzzy
 msgid ""
 "  %i   file system ID in hex\n"
@@ -11592,17 +11628,17 @@ msgstr ""
 "mu\n"
 "ggwanika zzibizi n'olumu. Olw'ensonga eyo 'stdbuf' terina ky'egikolako.\n"
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, fuzzy, c-format
 msgid "failed to find %s"
 msgstr "nemedwa okubikkula %s"
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, c-format
 msgid "failed to update the environment with %s"
 msgstr "nnemedwa okwongera %s ku nviromenti"
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr ""
@@ -11610,7 +11646,12 @@ msgstr ""
 " awa bulijjo bisigalenga mu ggwanika zzibizi okutuusa\n"
 "lwe muyingiramu bayiti etegeeza nti nkomerero y'olunyiriri"
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, fuzzy, c-format
+msgid "you must specify a buffering mode option"
+msgstr "oteekwa okutegekawo %s awali %s"
+
+#: src/stty.c:516
 #, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -11621,11 +11662,11 @@ msgstr ""
 "                oba:  %s [-F KYUMA | --file=KYUMA] [-a|--all]\n"
 "                oba:  %s [-F KYUMA | --file=KYUMA] [-g|--save]\n"
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
 msgstr ""
 
-#: src/stty.c:525
+#: src/stty.c:528
 #, fuzzy
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
@@ -11644,7 +11685,7 @@ msgstr ""
 "                     KYUUMA mu kifo eky'ekiwandikiro oba omutwe ogwa\n"
 "                     bulijjo\n"
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
@@ -11660,7 +11701,7 @@ msgstr ""
 "z'osobola kulonda kisinzira ku sisitemu ey'oku kompyuta yo\n"
 "\n"
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -11686,7 +11727,7 @@ msgstr ""
 "                    kifuga, KABONERO ke kalaga awali enkomerero "
 "y'olunyiriri\n"
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -11705,7 +11746,7 @@ msgstr ""
 "   kill KABONERO    Bino bitegeka nti bw'oyingiza KABONERO, olunyiriri\n"
 "                    lw'oliko lwonna lugibwawo\n"
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -11723,7 +11764,7 @@ msgstr ""
 "                    mu mulimu ogwa pulogulamu efugibwa ekiwandikiro kyo,\n"
 "                    bw'oyingiza KABONERO ebivaamu ebyo biddamu okukolebwa\n"
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -11742,7 +11783,7 @@ msgstr ""
 " * werase KABONERO  Bino byo bitegeka nti bw'oyingiza KABONERO, ekigambo\n"
 "                    kyewasembye kuwandika kigibwawo\n"
 
-#: src/stty.c:562
+#: src/stty.c:565
 msgid ""
 "\n"
 "Special settings:\n"
@@ -11759,7 +11800,7 @@ msgstr ""
 "                    bikolera ku nkumbo N\n"
 " * columns N        Kino kyekimu ne cols N\n"
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -11778,7 +11819,7 @@ msgstr ""
 "   ospeed N         Kino kitegeka nti ekiwandikiro oba omutwe biwereza\n"
 "                    ebivaamu ku bwangu obwa N\n"
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -11799,7 +11840,7 @@ msgstr ""
 "                    nga tekinnawerezebwa bubonero obulala, bwe kirinawo\n"
 "                    kibusindika ku kigendererwa kya bwo\n"
 
-#: src/stty.c:581
+#: src/stty.c:584
 #, fuzzy
 msgid ""
 "\n"
@@ -11820,7 +11861,7 @@ msgstr ""
 "   csN              kino kitegeka nti obubonero bunaabangamu biti N. N\n"
 "                    esobola okubeera kimu ku 5, 6, 7 oba 8\n"
 
-#: src/stty.c:590
+#: src/stty.c:593
 #, fuzzy
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
@@ -11829,6 +11870,7 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 "   [-]cstopb        Kino kitegeka nti buli kabonero akawerezebwa "
 "kagenderako\n"
@@ -11847,7 +11889,7 @@ msgstr ""
 "                    ezikozesebwa kukakasa obutuufu bwabyo zigifuula\n"
 "                    etagabanizika mu bbiri\n"
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -11870,7 +11912,7 @@ msgstr ""
 "   [-]igncr         Kino kitegeka nti tty tegoberera kiragiro eky'akabonero\n"
 "                    akalagira akasonga okudda ku ntandikwa y'olunyiriri\n"
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -11897,14 +11939,14 @@ msgstr ""
 "                    bigyamu biti ey'omanaana ey'oku buli kabonero\n"
 "                    akabiwerezebwa\n"
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr ""
 " * [-]iutf8         Akawayiro kano kaleetera ekiragiro okukitwala\n"
 "                    nti obubonero bwonna bwe kikolako bwa mpandika eya "
 "UTF-8\n"
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -11935,7 +11977,7 @@ msgstr ""
 "                    endala bbiri ez'okukalamba\n"
 "   [-]tandem        Kino kyekimu ne [-]ixoff\n"
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -11970,10 +12012,11 @@ msgstr ""
 "kikasindika\n"
 "                    ku kigenderwa ekirala. N esobola okuba 0 oba 1\n"
 
-#: src/stty.c:631
+#: src/stty.c:635
+#, fuzzy
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
@@ -12004,7 +12047,7 @@ msgstr ""
 "                    lunyiriri lupya kava ku nkola eyo ne kaba nga kalagira\n"
 "                    akasonga kudda ku ntandikwa y'olunyiriri\n"
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -12032,7 +12075,7 @@ msgstr ""
 "                    olw'omubusimba ne lwe kituukiriza ekiragiro ekyo oba\n"
 "                    akabonero ne kikasindika. N esobola kuba 0 oba 1\n"
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -12053,7 +12096,7 @@ msgstr ""
 "                    olunyiriri lwonna kituukirizibwa ku nkola eleetebwawo\n"
 "                    'echoctl' ne 'echok'\n"
 
-#: src/stty.c:654
+#: src/stty.c:658
 #, fuzzy
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
@@ -12076,7 +12119,7 @@ msgstr ""
 "akalagira\n"
 "                    kutandika lunyiriri lupya\n"
 
-#: src/stty.c:661
+#: src/stty.c:665
 #, fuzzy
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
@@ -12101,7 +12144,7 @@ msgstr ""
 "   [-]iexten        Kino kyo kitegeka nti osobola okukozesa obubonero\n"
 "                    obutagoberera mutindo ogwa POSIX\n"
 
-#: src/stty.c:668
+#: src/stty.c:672
 #, fuzzy
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
@@ -12129,7 +12172,7 @@ msgstr ""
 "                    okozesa obubonero `\\' okukyusa enkola y'obubonero\n"
 "                    obukozesa ennukuta ennene okuva ku eya bulijjo\n"
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -12143,7 +12186,7 @@ msgstr ""
 "   cbreak           Kino kikola kimu ne '-icanon'\n"
 "   -cbreak          Kino kikola kimu ne 'icanon'\n"
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -12158,7 +12201,7 @@ msgstr ""
 "   -cooked          Kino kikola kimu ne 'raw'\n"
 "   crt              Kino kikola ng'eyagattise 'echoe echoctl echoke'\n"
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -12176,7 +12219,7 @@ msgstr ""
 "                    obubireetawo obwa bulijjo\n"
 "   evenp            Kino kikola ng'eyagattise 'parenb -parodd cs7'\n"
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -12193,7 +12236,7 @@ msgstr ""
 "   -nl              Kino kikola ng'eyagattise 'icrnl -inlcr -igncr onlcr\n"
 "                    -ocrnl -onlret'\n"
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -12207,7 +12250,7 @@ msgstr ""
 "   pass8            Kino kikola ng'eyagattise '-parenb -istrip cs8'\n"
 "   -pass8           Kino kikola ng'eyagattise 'parenb istrip cs7'\n"
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -12220,7 +12263,7 @@ msgstr ""
 "                    -imaxbel -opost -isig -icanon -xcase min 1 time 0'\n"
 "   -raw             Kino kikola kimu ne 'cooked'\n"
 
-#: src/stty.c:716
+#: src/stty.c:720
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
 "                 -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n"
@@ -12237,7 +12280,7 @@ msgstr ""
 "                 ate kizz'ebiragiro ebirala ebireetebwa ku bubonero\n"
 "                 obwayawulwamu ku bubonero bwa byo obwa bulijjo.\n"
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -12264,12 +12307,12 @@ msgstr ""
 "Okugeza 'eof ^-' oba 'eof undef' bitegeeza nti mu kiwandikiro ekyo tewali\n"
 "kabonero akategeeza nti enkomerero eya fayiro etuukidwako.\n"
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, c-format
 msgid "only one device may be specified"
 msgstr "Oteekangawo linnya lya kyuma kimu kyokka"
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
@@ -12278,47 +12321,47 @@ msgstr ""
 "akawayiro ak'okuwandika mu ngeri etegeereka bantu n'ak'okuwandika\n"
 "mu ngeri esobola okukozesebwa nga agumenti tebukukozesebwa wamu"
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr ""
 "mu kiragiro ekifuga ebivaamu eby'ekiwandikiro,\n"
 "tokkirizibwa ate kutgeka ensindika n'enfuna y'ekiwandikiro"
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr ""
 "%s: tekisobose okuzza kiwandikiro ku nkola ey'okusindika n'okufunira\n"
 "mu bitole"
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, c-format
 msgid "invalid argument %s"
 msgstr "agumenti %s tekola wano"
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, c-format
 msgid "missing argument to %s"
 msgstr "agumenti %s tekola wano"
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, c-format
 msgid "invalid line discipline %s"
 msgstr "entegeka ey'ebisindikibwa, %s, tekola"
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr "%s: tekisobose okukola emikolo gyonna egisabidwa"
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr "%s: tewali biraga ebifa ku bunene obw'ekyuma kino"
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, c-format
 msgid "invalid integer argument %s"
 msgstr "'%s' tekkirizibwa nga agumenti ey'ekika kya nnamba enzijivu"
@@ -12389,7 +12432,7 @@ msgstr ""
 "      --version  Kano ko kakireetera okukoma ku kulaga ebifa ku mutindo gwa "
 "kyo\n"
 
-#: src/system.h:544
+#: src/system.h:543
 #, fuzzy
 msgid ""
 "\n"
@@ -12398,15 +12441,15 @@ msgstr ""
 "Agumenti ezibeera ez'etteeka ku buwayiro obujjuvu era ziba za tteeka ne\n"
 "ku buwayiro obufunze.\n"
 
-#: src/system.h:552
+#: src/system.h:551
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -12422,38 +12465,36 @@ msgstr ""
 "mu birengo ebya bayiti 1024 (biba bya bayiti 512 bw'obanga mu nviromenti yo\n"
 "wategeseemu ekigambo ekya 'POSIXLY_CORRECT')\n"
 
-#: src/system.h:571
-#, c-format
+#: src/system.h:570
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
-msgstr ""
-"\n"
-"Bw'osangamu ebitali bituufu ku %s, tegeeza %s\n"
+"%s online help: <%s>\n"
+msgstr "Enfo ey'oku neti eya %s esangibwa ku: <%s>\n"
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr ""
 "Bw'osanga ebitali bituufu %s, tegeeza <http://translationproject.org/team/>\n"
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr ""
 "Ekiragiro info coreutils '%s invocation' kikubikkulira ebiwandiko\n"
 "ebinnyonyola kiragiro kino mu bujjuvu\n"
 
-#: src/system.h:596
+#: src/system.h:591
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Wandika '%s --help' oyongere okuwebwa amagezi.\n"
 
-#: src/system.h:628
+#: src/system.h:633
 #, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -12572,11 +12613,10 @@ msgstr ""
 "\n"
 
 #: src/tail.c:270
+#, fuzzy
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
 "  -c, --bytes=K            Bw'ossawo kamu ku buno, ku buli fayiro "
 "kiwandikako\n"
@@ -12586,11 +12626,11 @@ msgstr ""
 "                           ebigirimu okuva awo\n"
 
 #: src/tail.c:274
+#, fuzzy
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 "  -f, --follow[={name|descriptor}]\n"
@@ -12608,18 +12648,17 @@ msgstr ""
 "                           kyeyongere okukikolako. Kino kye kimu n'okussawo\n"
 "                           --follow=name --retry\n"
 
-#: src/tail.c:281
+#: src/tail.c:280
 #, fuzzy, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
 "  -n, --lines=K            Buno bukireetera okuwandikawo ennyiriri K\n"
 "                           ezisembayo mukifo kya %d. Ennamba K\n"
@@ -12636,13 +12675,12 @@ msgstr ""
 "                           linnya, oba, bw'eba nga nnyunzi kw'ebadde egguka\n"
 "                           evuddewo.\n"
 
-#: src/tail.c:294
+#: src/tail.c:293
+#, fuzzy
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 "      --pid=PID            Kano bw'okagatta ku aka -f, kaleetera ekiragiro\n"
 "                           okumala kasita omulimu oguliko ennamba PID nagwo\n"
@@ -12656,13 +12694,13 @@ msgstr ""
 "                           bw'egira n'eba nga evuddewoko. Kano tekagasa\n"
 "                           okugyako nga kuliko n'akawayiro '--follow=name'\n"
 
-#: src/tail.c:301
+#: src/tail.c:298
 #, fuzzy
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 "  -s, --sleep-interval=N   Bw'ogattika kano n'aka -f, ekiragiro\n"
@@ -12673,7 +12711,7 @@ msgstr ""
 "                           okuwandikangawo emitwe egiraga zifayiro\n"
 "                           ebintu mwe biva\n"
 
-#: src/tail.c:310
+#: src/tail.c:307
 #, fuzzy
 msgid ""
 "\n"
@@ -12696,7 +12734,7 @@ msgstr ""
 "n'obubonero T, P, E, Z, Y bweyongera mu ngeri eyo.\n"
 "\n"
 
-#: src/tail.c:319
+#: src/tail.c:316
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
 "means that even if a tail'ed file is renamed, tail will continue to track\n"
@@ -12712,176 +12750,181 @@ msgstr ""
 "fayiro kigera ebiseera ne kigibikka ate ne kiddamu okugibikkula kisobola\n"
 "okutegeera oba erinnya eryo litwalidwa ku fayiro endala.\n"
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr "mbikka %s (fd=%d)"
 
-#: src/tail.c:453
-#, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr ""
-"%s: tekisobose okutandikira mulimu nnyiriri %s okuva awanditandidwa mu bya "
-"bulijjo"
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr "%s: tekisobose okutandikira nnyiriri %s okuva ku nkomerero ya fayiro"
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr "%s sigirabye. kati ngirindirira okulabika"
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
 "reverting to polling"
 msgstr ""
 
-#: src/tail.c:963
+#: src/tail.c:965
+#, fuzzy, c-format
+msgid "%s has been replaced with a symbolic link. giving up on this name"
+msgstr ""
+"erinnya %s ligenze ku fayiro eteri ku sistemu eno; erinnya lino ndekedd'awo "
+"kulikolako"
+
+#: src/tail.c:980
 #, c-format
 msgid "%s has become inaccessible"
 msgstr "%s tekyatuukikako"
 
-#: src/tail.c:980
+#: src/tail.c:997
 #, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr ""
 "erinnya %s ligenze ku fayiro etasomeka; erinnya lino ndekedd'awo kulikolako"
 
-#: src/tail.c:989
+#: src/tail.c:1006
 #, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr ""
 "erinnya %s ligenze ku fayiro eteri ku sistemu eno; erinnya lino ndekedd'awo "
 "kulikolako"
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, c-format
 msgid "%s has become accessible"
 msgstr "%s tekyatuukikako"
 
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr "%s erabise; ntadise kugoberera ebigyongerwako"
 
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr ""
 "erinnya %s ligenze ku fayiro ndala; ntandise kugoberera ebyongerwa ku\n"
 "fayiro empya eyo"
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr ""
 "%s: tekisoboka kukkiriza omulimu ogutandise\n"
 "tail kukola birala tail nga ekyakola"
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr "%s: fayiro eno ekendezedwa"
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr "fayiro zonna zivuddewo"
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, c-format
 msgid "cannot watch parent directory of %s"
 msgstr "tekisoboka kugoberera etterekero omuli %s"
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, c-format
 msgid "inotify resources exhausted"
 msgstr "Omulimu ogwa inotify bye gukozesa biweddey"
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, c-format
 msgid "cannot watch %s"
 msgstr "%s tegobererekaS"
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr "omulimu ogw'okulindirira okubagguliza okwa 'inotify' kuzzemu kiremya"
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, c-format
 msgid "error reading inotify event"
 msgstr "wazzewo kiremya mu kusoma okubagguliza okwa 'inotify'"
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr ""
 "%s: tekisoboka okugoberera ebyongerwa mu fayiro ez'ekika kino;\n"
 "erinnya lino ndekedd'awo kulikolako"
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, c-format
 msgid "number in %s is too large"
 msgstr "%s erimu ennamba eyitiridde obunene"
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr "%s: tekikkirizibwa kukebera fayiro emirundi gino"
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr "%s: eno ennamba y'omulimu tekkirizibwa"
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr "%s: buno obungi bwa sikonda tebukkirizibwa"
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr "akawayiro %c kakozesebwa we katajjirawo"
 
-#: src/tail.c:2034
+#: src/tail.c:2096
+#, fuzzy, c-format
+msgid "warning: --retry ignored; --retry is useful only when following"
+msgstr ""
+"kulabula: ekya PID tekigyakukolebwako; anti akawyiro --pid=PID\n"
+"tekagasa okugyako nga tail esigala egoberera ebyongerwa ku fayiro"
+
+#: src/tail.c:2100
 #, c-format
-msgid "warning: --retry is useful mainly when following by name"
+msgid "warning: --retry only effective for the initial open"
 msgstr ""
-"kulabula: tekigasa kuteekawo akawayiro --retry okugyako\n"
-"nga tail egoberera fayiro nga yesigamye ku linnya"
 
-#: src/tail.c:2038
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
 msgstr ""
 "kulabula: ekya PID tekigyakukolebwako; anti akawyiro --pid=PID\n"
 "tekagasa okugyako nga tail esigala egoberera ebyongerwa ku fayiro"
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr "kulabula: akawayiro --pid=PID tekakola ku sisitemu eno"
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, c-format
 msgid "cannot follow %s by name"
 msgstr "tekisobose kugoberera %s nga n'esigamye ku linnya"
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr ""
 "kulabula: tekigasa kusigala nga ogoberera ebiteekebwa\n"
 "awayingizibwa awa bulijjo"
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr ""
@@ -13225,17 +13268,17 @@ msgstr "%s agumenti ya nfissi"
 msgid "warning: sigprocmask"
 msgstr ""
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr ""
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr ""
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
@@ -13244,7 +13287,7 @@ msgstr ""
 "Enkozesa entuufu eri: %s [KAWAYIRO] KISEERA KIRAGIRO [AGUMENTI]...]\n"
 "  oba: %s [KAWAYIRO]\n"
 
-#: src/timeout.c:229
+#: src/timeout.c:232
 #, fuzzy
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
 msgstr ""
@@ -13254,24 +13297,23 @@ msgstr ""
 "Agumenti ezibeera ez'etteeka ku buwayiro obujjuvu era ziba za tteeka ne\n"
 "ku buwayiro obufunze.\n"
 
-#: src/timeout.c:235
+#: src/timeout.c:238
 #, fuzzy
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
 "  -k, --kill-after=KISEERA\n"
 "                   Bw'ossaako kamu ku buwayiro buno, timeout bw'eraba nga\n"
@@ -13291,7 +13333,7 @@ msgstr ""
 "                   Ob'oyagala kulaba olukalala lw'ebiragiro ebya sisitemu,\n"
 "                   tandika omulimu ogwa 'kill -l'.\n"
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 #, fuzzy
 msgid ""
 "\n"
@@ -13309,7 +13351,7 @@ msgstr ""
 "Bw'otossawo KATANDIKWA, KISEERA ziba sikonda.\n"
 "\n"
 
-#: src/timeout.c:259
+#: src/timeout.c:262
 #, fuzzy
 msgid ""
 "\n"
@@ -13326,17 +13368,17 @@ msgstr ""
 "terinnatuuka, emmala yagwo eba yagwo eya bulijjo. Emirimu egimu\n"
 "tegiwulira 'TERM' era gyo gyetaaga kugisindikira ekya KILL (9).\n"
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr ""
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, c-format
 msgid "error waiting for command"
 msgstr "wazzewo kiremya mu kulindirira kiragiro"
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr ""
@@ -13854,9 +13896,10 @@ msgstr ""
 "                         kigitwala nga obungi bwa buloka mu kifo kya bayiti\n"
 
 #: src/truncate.c:115
+#, fuzzy
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 "  -r, --reference=FAYIRO   Buno bukireetera okutegeka\n"
 "                         obunene obwa fayiro ne bwenkana\n"
@@ -13970,12 +14013,12 @@ msgstr ""
 "ekiragiro kikola ku bye kiraba awayingizibwa awa bulijjo.\n"
 "\n"
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr "%s: mu biyingizibwa mulimu ekigambo ekitaliko kinne wa kyo"
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr ""
@@ -14109,12 +14152,12 @@ msgstr "enseetuka ziyitiridde okwesuulagana"
 msgid "tab stop value is too large"
 msgstr "obuwanvu bw'enseetuka buyitiridde obunene"
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... [EBIYINGIZIBWA [EBIVAAMU]]\n"
 
-#: src/uniq.c:138
+#: src/uniq.c:174
 #, fuzzy
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
@@ -14131,10 +14174,11 @@ msgstr ""
 "ng'ate ziriraanaganye ekiragiro kiwandikako koppi emu yokka.\n"
 "\n"
 
-#: src/uniq.c:147
+#: src/uniq.c:183
+#, fuzzy
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
 msgstr ""
 "  -c, --count           Bw'ossaako kamu ku buwayiro buno, ku ntandikwa ya\n"
 "                        buli lunyiriri lwe kiwandika, kiwandikawo n'obungi "
@@ -14143,50 +14187,32 @@ msgstr ""
 "  -d, --repeated        Ate bw'ossawo kamu ku buno ekiragiro tekiwandika\n"
 "                        nnyiriri ezitalina zifaanagana nazo eziriraanaganye\n"
 
-#: src/uniq.c:151
+#: src/uniq.c:187
+msgid ""
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
+msgstr ""
+
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr ""
+
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
+msgstr ""
+
+#: src/uniq.c:199
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
 "  -i, --ignore-case     ignore differences in case when comparing\n"
 "  -s, --skip-chars=N    avoid comparing the first N characters\n"
 "  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
-msgstr ""
-"  -D, --all-repeated[=engeri-gye-z'awulaganidwa] Bw'ossaawo kami ku buno\n"
-"                        ekiragiro kiwandikako ennyiriri ezifaanagana\n"
-"                        eziriraanaganye 'engeri-gye-z'awulaganidwa' kye\n"
-"                        kigambo ekifuga kiki ekiwandikibwawo wakati\n"
-"                        w'ennyiri ez'en'enjawulo ezifaanagana mu ebivaamu.\n"
-"                        'engeri-gye-z'awulagandiwa' bwe kiba 'none', \n"
-"                        ennyiriri ezo zonna ziwandikibwa kumu nga tewali\n"
-"                        kiz'awulagana. Bwe kiba 'prepend' ekiragiro kisooka\n"
-"                        kussawo olunyiriri olutaliko kantu ne kiryoka\n"
-"                        kiwandikawo ekibinja ky'ennyiriri ezifaanagana. Bwe\n"
-"                        kiba 'separate' olwo bwe kimala ekibinja ekimu\n"
-"                        kissawo olunyiriri olutaliko kantu ne kiryoka\n"
-"                        kiwandika ekibinja ekiddako. Enkola yakyo eya\n"
-"                        bulijjo bwe butayawula bibinja by'ennyiriri ezo.\n"
-"  -f, --skip-fields=N   bw'oteekawo kamu ku buno, N nga gwo muwendo,\n"
-"                        ekiragiro bwe kiba gerageranya nnyiriri okulaba\n"
-"                        oba nga zifaanagana tekifa ku firidi zaamu N\n"
-"                        ezisooka\n"
-"  -i, --ignore-case     kamu ku buno bwe kabaako ekiragiro tekirabawo\n"
-"                        njawulo wakati w'ennukuta ennene n'entono\n"
-"  -s, --skip-chars=N    bw'oteekawo kamu ku buno, N nga gwo muwendo,\n"
-"                        ekiragiro bwe kiba gerageranya nnyiriri\n"
-"                        okulaba oba nga zifaanagana tekifa ku\n"
-"                        bubonero bwazo N obusooka\n"
-"  -u, --unique          ate bw'oteekawo kamu ku buno ekiragiro kiwandikawo\n"
-"                        ezo ennyiriri zokka ezitafaanagana n'ezo bwe\n"
-"                        ziriraanaganye\n"
-"  -z, --zero-terminated Bw'ossawo kamu ku buno, ekiragiro ku nkomeroro\n"
-"                        ez'ennyiriri mu kifo eky'okussawo akabanero "
-"akalagira\n"
-"                        kutandika lupya, kiteekawo bayiti eya 0.\n"
+msgstr ""
 
-#: src/uniq.c:161
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr ""
 "  -w, --check-chars=N   Bw'oba otaddewo kamu ku buno obuwayiro,\n"
@@ -14194,7 +14220,7 @@ msgstr ""
 "                        N obusooka ku buli lunyiriri bwe kiba\n"
 "                        kizigerageranya\n"
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 msgid ""
 "\n"
 "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n"
@@ -14207,7 +14233,7 @@ msgstr ""
 "ekimu, ne bwe biba nga byegasse bingi. Bino tekibikozesa bwe kiba nga\n"
 "kigerageranya nnyiriri.\n"
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 #, fuzzy
 msgid ""
 "\n"
@@ -14224,24 +14250,37 @@ msgstr ""
 "Ekiragiro kino bwe kiba gerageranya ennyiriri, kigoberera ensengeka\n"
 "etegekedwa mu kigambo eky'omunviromenti 'LC_COLLATE'.\n"
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, c-format
 msgid "too many repeated lines"
 msgstr "ennyiriri ezifaanagana ziyitiridde obungi"
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
 msgstr "tekisoboka okubuukamu firidi ez'enkan'awo obungi"
 
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
 msgstr "tekisoboka okubuukamu bayiti ez'enkan'awo obungi"
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
 msgstr "tekisoboka okugerageranyako bayiti ez'enkan'awo obungi"
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr ""
+
+#: src/uniq.c:652
+#, fuzzy, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr ""
+"okugamba ekiragiro kiwandike koppi zonna ez'ennyiriri ezifaanagana\n"
+"nga ate ziriraanagnye ate era buli lumu kiruwandikeko obungi bwa koppi\n"
+"zalwo eziriwo tekirina mugaso"
+
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr ""
@@ -14267,11 +14306,6 @@ msgstr ""
 "FAYIRO mu nkalala eza pulogulamu whatis\n"
 "\n"
 
-#: src/unlink.c:86
-#, c-format
-msgid "cannot unlink %s"
-msgstr "tekisobose okugya %s mu nkalala eza whatis"
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -14316,7 +14350,7 @@ msgstr[1] "kuliko abakozesa %lu"
 msgid ",  load average: %.2f"
 msgstr ",  emirimu egibadde gibindabinda: %.2f"
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -14327,7 +14361,7 @@ msgstr ""
 "sisitemu bukya ekoleezebwa, obungi bw'abagiriko n'obungi bw'emirimu\n"
 "egibadde gibindabindira mu ddakiika 1, 5 ne 15 ezaakayita."
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
@@ -14338,12 +14372,12 @@ msgstr ""
 "tekinnatuuka\n"
 "kigibaliramu.\n"
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr "\n"
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
@@ -14619,27 +14653,6 @@ msgstr ""
 "Kino kigenda nga kiddinngana okuwandika KIGMABO oba BIGAMBO ku lunyiriri\n"
 "olupya. Bw'obeera towadde KIGMABO oba BIGMABO, kiwandikamu 'y'.\n"
 
-#~ msgid "using single-precision arithmetic"
-#~ msgstr "nkozesa ennamba ezikongojjebwa mu bbiti 32"
-
-#~ msgid "using arbitrary-precision arithmetic"
-#~ msgstr ""
-#~ "nkozesa okubala okweyambisa ettuuso\n"
-#~ "erikomezebwako obunene bw'eggwanika\n"
-#~ "lya kompyuta bwokka"
-
-#, fuzzy
-#~ msgid "  returning value: '%s'\n"
-#~ msgstr "nkolawo fayiro %s\n"
-
-#, fuzzy
-#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n"
-#~ msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... [AKOZESA]...\n"
-
-#, fuzzy
-#~ msgid "no valid suffix found\n"
-#~ msgstr "%s: akafundikwa tekakkirizibwa kwenkan'awo"
-
 #~ msgid ""
 #~ "\n"
 #~ "Examples:\n"
@@ -14651,18 +14664,188 @@ msgstr ""
 #~ "  %s /usr/bin/sort        Ebivaamu: \"sort\".\n"
 #~ "  %s include/stdio.h .h   Ebivaamu: \"stdio\".\n"
 
+#~ msgid ""
+#~ "Change the group of each FILE to GROUP.\n"
+#~ "With --reference, change the group of each FILE to that of RFILE.\n"
+#~ "\n"
+#~ "  -c, --changes          like verbose but report only when a change is "
+#~ "made\n"
+#~ "      --dereference      affect the referent of each symbolic link (this "
+#~ "is\n"
+#~ "                         the default), rather than the symbolic link "
+#~ "itself\n"
+#~ msgstr ""
+#~ "Ekiragiro kino kikyusa obwa memba obwa guluupu obwa buli FAYIRO bubeere "
+#~ "bwa\n"
+#~ "mu GULUUPU.\n"
+#~ "Bwe kubeera ko n'akawayiro --reference, kikyusa obwa memba obwa guluupu "
+#~ "obwa\n"
+#~ "buli FAYIRO bufaanagane n'obwa RFAYIRO.\n"
+#~ "\n"
+#~ "  -c, --changes          Obuwayiro buno bukola nga verbose naye tebuzza\n"
+#~ "                         bubaka bwe wataba bikyusidwa\n"
+#~ "      --dereference      Kano bwe kabaako ekiragiro tekikwata ku nyunzi\n"
+#~ "                         eyeyawudde yennyinyi, wabula kikola ku fayiro\n"
+#~ "                         gy'eggukako\n"
+
+#~ msgid ""
+#~ "  -f, --silent, --quiet  suppress most error messages\n"
+#~ "      --reference=RFILE  use RFILE's group rather than specifying a\n"
+#~ "                         GROUP value\n"
+#~ "  -R, --recursive        operate on files and directories recursively\n"
+#~ "  -v, --verbose          output a diagnostic for every file processed\n"
+#~ "\n"
+#~ msgstr ""
+#~ " -f, --silent, --quiet   Buno buleetera ekiragiro oukikisa obubaka "
+#~ "obwogera\n"
+#~ "                         ku kiremya obusinga obungi\n"
+#~ "     --reference=RFAYIRO Kano kaleetera ekiragiro okukozeseemu guluupu "
+#~ "eya\n"
+#~ "                         RFAYIRO mu kifo ekya eyo ekongojedwa mu GULUUPU\n"
+#~ "  -R, --recursive        Buno bukireetera okukola ne ku fayiro "
+#~ "n'amaterekero\n"
+#~ "                         eziri munda mwa zinazo\n"
+#~ "  -v, --verbose          Buno bwo bukireetera okuwandika ebiva mu "
+#~ "kukebera\n"
+#~ "                         buli fayiro ekolebwako\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Change the mode of each FILE to MODE.\n"
+#~ "\n"
+#~ "  -c, --changes           like verbose but report only when a change is "
+#~ "made\n"
+#~ msgstr ""
+#~ "Ekiragiro kino kikyusa endukusa ez'oku buli FAYIRO zibeere NDUKUSA.\n"
+#~ "\n"
+#~ "   -c, --changes          Akawayiro kano kakola nga aka '--verbose' naye\n"
+#~ "                          wano ekiragiro tekizza bubaka bwe wataba\n"
+#~ "                          bikyusidwa\n"
+
+#~ msgid ""
+#~ "      --no-preserve-root  do not treat `/' specially (the default)\n"
+#~ "      --preserve-root     fail to operate recursively on `/'\n"
+#~ msgstr ""
+#~ "      --no-preserve-root  Kano bw'okassako ekiragiro etterekero ery'oku\n"
+#~ "                          musungi,'/', tekiliyisa mu ngeri ey'enjawulo\n"
+#~ "                          (y'enkola eya bulijjo)\n"
+#~ "      --preserve-root     Kano ko kaleetera ekiragiro etterekero erya ku\n"
+#~ "                          musingi, '/', obutakola ku biliri munda\n"
+
+#~ msgid ""
+#~ "  -f, --silent, --quiet   suppress most error messages\n"
+#~ "  -v, --verbose           output a diagnostic for every file processed\n"
+#~ "      --reference=RFILE   use RFILE's mode instead of MODE values\n"
+#~ "  -R, --recursive         change files and directories recursively\n"
+#~ msgstr ""
+#~ "  -f, silent, --quiet     Buno buleetera ekiragiro okukisa obubaka "
+#~ "obwogera\n"
+#~ "                          ku kiremya asinga obungi\n"
+#~ "   -v, --verbose          Buno bwo buleetera ekiragiro okuwandika ebiva "
+#~ "mu\n"
+#~ "                          kukebera buli fayiro ekolebwako\n"
+#~ "     --reference=RFAYIRO  Kano kaleetera ekiragiro okukozesaamu enkola\n"
+#~ "                          elagidwa mu RFAYIRO mu kifo eky'eyo "
+#~ "ekongojedwa\n"
+#~ "                          mu NDUKUSA\n"
+#~ "   -R, --recursive        Buno bwo buleetera ekiragiro okukola ne ku "
+#~ "fayiro\n"
+#~ "                          n'amaterekero ebiri munda mwa binnabyo\n"
+
+#~ msgid ""
+#~ "Change the owner and/or group of each FILE to OWNER and/or GROUP.\n"
+#~ "With --reference, change the owner and group of each FILE to those of "
+#~ "RFILE.\n"
+#~ "\n"
+#~ "  -c, --changes          like verbose but report only when a change is "
+#~ "made\n"
+#~ "      --dereference      affect the referent of each symbolic link (this "
+#~ "is\n"
+#~ "                         the default), rather than the symbolic link "
+#~ "itself\n"
+#~ msgstr ""
+#~ "Ekiragiro kino kikyusa obwa nanyini ne/oba guluupu eya buli FAYIRO "
+#~ "bibeere\n"
+#~ "NANYINI ne/oba GULUUPU. Bwe kubeera ko n'akawayiro --reference, kikyusa\n"
+#~ "nannyini n'obwa memba obwa guluupu obwa buli FAYIRO bifaanagane n'obwa\n"
+#~ "RFAYIRO.\n"
+#~ "\n"
+#~ "  -c, --changes          Obuwayiro buno bufuula enkola y'ekiragiro mu\n"
+#~ "                         ngeri y'emu n'aka '--verbose' naye wano\n"
+#~ "                         tekizza bubaka bwe wataba bikyusidwa\n"
+#~ "      --dereference      Kano ko kaleetera ekiragiro obutakwata ku "
+#~ "nyunzi\n"
+#~ "                         ey'eyawudde yennyinyi, wabula kikola ku fayiro\n"
+#~ "                         kw'egguka\n"
+
+#~ msgid ""
+#~ "  -f, --silent, --quiet  suppress most error messages\n"
+#~ "      --reference=RFILE  use RFILE's owner and group rather than\n"
+#~ "                         specifying OWNER:GROUP values\n"
+#~ "  -R, --recursive        operate on files and directories recursively\n"
+#~ "  -v, --verbose          output a diagnostic for every file processed\n"
+#~ "\n"
+#~ msgstr ""
+#~ "-f, silent, --quiet      Buno buleetera ekiragiro okukisa obubaka "
+#~ "obwogera\n"
+#~ "                         ku kiremya asinga obungi\n"
+#~ " --reference=RFAYIRO     Kano kaleetera ekiragio okukozesamu nannyini\n"
+#~ "                         ne guluupu ebya RFAYIRO mu kifo ekya\n"
+#~ "                         ebikongojedwa mu NANYINI:GULUUPU\n"
+#~ " -R, --recursive         Buno bwo buleetera ekiragiro okukola ne ku\n"
+#~ "                         fayiro n'amaterekero ebiri munda mwa binnabyo\n"
+#~ " -v, --verbose           Buno buleetera ekiragiro okuwandika ebiva mu\n"
+#~ "                         kukebera buli fayiro ekolebwako\n"
+
+#~ msgid "failed to set additional groups"
+#~ msgstr "nnemedwa okutegeka guluupu ez'ennyongeza"
+
+#~ msgid "failed to get file system create context"
+#~ msgstr ""
+#~ "nnemedwa okutegeera endukusa eza SELinux\n"
+#~ "ezitegekebwa bulijjo ku bintu ebipya\n"
+#~ "ebikoledwawo ku sisitemu eya fayiro"
+
 #~ msgid "reading %s"
 #~ msgstr "nsoma %s"
 
 #~ msgid "writing %s"
 #~ msgstr "mpandikira mu %s"
 
+#~ msgid "truncating %s"
+#~ msgstr "%s ngikolako omulimu ogwa 'truncate'"
+
 #~ msgid "closing %s"
 #~ msgstr "mbikka %s"
 
+#~ msgid "cannot create link %s"
+#~ msgstr "sisobola okukolawo enyunzi %s"
+
 #~ msgid "accessing %s"
 #~ msgstr "n'etuusako %s"
 
+#~ msgid ""
+#~ "Display the current time in the given FORMAT, or set the system date.\n"
+#~ "\n"
+#~ "  -d, --date=STRING         display time described by STRING, not `now'\n"
+#~ "  -f, --file=DATEFILE       like --date once for each line of DATEFILE\n"
+#~ msgstr ""
+#~ "Ekiragiro kino kiwandika essaawa nga ziwandikidwa mu MPANDIKA. Era "
+#~ "kyeyambisibwa okutegeka obudde n'ennaku sisitemu by'ekolerako.\n"
+#~ "\n"
+#~ "  -d, --date=BUDDE          Buno bukireetera okuwandika BUDDE mukifo "
+#~ "ekya \n"
+#~ "                            obwa kakati (singa BUDDE kiba 'now' "
+#~ "ekiragiro\n"
+#~ "                            kiwandika obudde obwa kakano)\n"
+#~ "  -f, --file=FAYIRO         Buno bukireetera okusoma FAYIRO kiryoke "
+#~ "kiwandike\n"
+#~ "                            obudde obuwandikidwa ku buli lunyiriri lwa "
+#~ "yo.\n"
+#~ "                            FAYIRO bw'ebeera - , kisoma ebiva ku nnono "
+#~ "eya\n"
+#~ "                            bulijjo\n"
+
 #~ msgid "opening %s"
 #~ msgstr "mbikkula %s"
 
@@ -14703,31 +14886,58 @@ msgstr ""
 #~ "                          Okussawo '--max-depth=0' kye kimu n'okussawo\n"
 #~ "                         '--summarize'\n"
 
-#, fuzzy
+#~ msgid "using arbitrary-precision arithmetic"
+#~ msgstr ""
+#~ "nkozesa okubala okweyambisa ettuuso\n"
+#~ "erikomezebwako obunene bw'eggwanika\n"
+#~ "lya kompyuta bwokka"
+
+#~ msgid "using single-precision arithmetic"
+#~ msgstr "nkozesa ennamba ezikongojjebwa mu bbiti 32"
+
+#~ msgid "%s: cannot lseek back to original position"
+#~ msgstr "%s: nnemedwa okukola lseek okudda awatandikidwa"
+
+#~ msgid "cannot reposition file pointer for %s"
+#~ msgstr ""
+#~ "sisobola kukyusa kifo ekikongojjedwa mu kigambo ekikwata ekifo mu fayiro "
+#~ "kifuuke %s"
+
+#~ msgid "Usage: %s [OPTION]... [USERNAME]\n"
+#~ msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... [MUKOZESA]\n"
+
 #~ msgid ""
-#~ "  none, off       never make backups (even if --backup is given)\n"
-#~ "  numbered, t     make numbered backups\n"
-#~ "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
-#~ "  simple, never   always make simple backups\n"
-#~ "\n"
+#~ "WARNING: --preserve_context is deprecated; use --preserve-context instead"
 #~ msgstr ""
-#~ "   none, off                   Bw'ossawo kamu ku buwayiro buno, "
-#~ "ekiragiro\n"
-#~ "                               tekikola kkopi ez'okwerinda\n"
-#~ "                               (yadde nga waliwo n'aka '--backup')\n"
-#~ "   numbered, t                 Buno bukireetera kukolangawo kkopi "
-#~ "ez'okwerinda\n"
-#~ "                               ne kiziteekako nnamba eziraga oluwandika "
-#~ "lwa zo\n"
-#~ "   existing, nil               Bwe kubaako kamu ku buno,empandika za "
-#~ "kkopi\n"
-#~ "                               ez'okwerinda eziriwo bwe zibaako ennamba,\n"
-#~ "                               empya nazo zibaako nnamba, eziriwo bwe\n"
-#~ "                               zitabaako nnamba empya nazo "
-#~ "teziteekebwako\n"
-#~ "                               nnamba\n"
-#~ "   simple, never               Buno bukireetera kkopi ez'okwerinda\n"
-#~ "                               butaziteekangako nnamba\n"
+#~ "KULABULA: akawayiro --preserve_context kadibizidwa;\n"
+#~ "kozesaamu aka --preserve-context"
+
+#~ msgid ""
+#~ "      --preserve-context  preserve SELinux security context\n"
+#~ "  -Z, --context=CONTEXT  set SELinux security context of files and "
+#~ "directories\n"
+#~ msgstr ""
+#~ "      --preserve-context         Kano kakireetera okutegeka ndukusa eza\n"
+#~ "                                 SELinux ez'oku koppi ze kikolawo nga\n"
+#~ "                                 ze zimu n'ez'oku fayiro ez'omu NNONO\n"
+#~ "  -Z, --context=NDUKUSA          Buno bwo bukireetera okutegeka ndukusa\n"
+#~ "                                 eza SELinux ez'oku koppi ze kikolawo\n"
+#~ "                                 zibe NDUKUSA\n"
+
+#~ msgid ""
+#~ "  -Z, --context=CTX  set the SELinux security context of each NAME to "
+#~ "CTX\n"
+#~ msgstr ""
+#~ "  -Z, --context=NDUKUSA Buno bukireetera okutegeka ndukusa eza SELinux\n"
+#~ "                        ku buli LINNYA zibe NDUKUSA\n"
+
+#~ msgid ""
+#~ "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
+#~ msgstr ""
+#~ "  -Z, --context=NDUKUSA  Buno butegeka ndukusa eza SELinux zibe NDUKUSA\n"
+
+#~ msgid "failed to redirect stderr to /dev/null"
+#~ msgstr "nnemedwa okusindika ebyandigenze ku stderr ku /dev/null"
 
 #~ msgid ""
 #~ "WARNING: --page-increment is deprecated; use --line-increment instead"
@@ -14741,6 +14951,24 @@ msgstr ""
 #~ "buwayiro obufunze.\n"
 
 #~ msgid ""
+#~ "  -A, --address-radix=RADIX   decide how file offsets are printed\n"
+#~ "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
+#~ msgstr ""
+#~ "  -A, --address-radix=RADIKISI   Bw'ossaako kamu ku buwayiro buno, "
+#~ "kategeka\n"
+#~ "                                 ebirengo ebinaakozesebwa mu kuwandika "
+#~ "nnamba\n"
+#~ "                                 eziraga awatandikirwa mu fayiro - "
+#~ "ennamba\n"
+#~ "                                 kiziwandika ne radikisi eya RADIKISI\n"
+#~ "  -j, --skip-bytes=BAYITI        Buno bukireetera bayiti BAYITI ezisooka "
+#~ "ku\n"
+#~ "                                 nnyiriri ezisomebwa mu ebiva ku nnono\n"
+#~ "                                 butazibala nga eby'okukolebwako. Ezo ze\n"
+#~ "                                 zikola ennamba eziraga olunyiriri we\n"
+#~ "                                 lutandikira mu fayiro\n"
+
+#~ msgid ""
 #~ "\n"
 #~ "RADIX is d for decimal, o for octal, x for hexadecimal or n for none.\n"
 #~ "BYTES is hexadecimal with 0x or 0X prefix, and may have a multiplier "
@@ -14774,9 +15002,110 @@ msgstr ""
 #~ "Ekiragiro kino 'od' bwe kutabeerako akawayiro, kikola ng'eyataddewo\n"
 #~ " '-A o -t d2 -w 16'.\n"
 
+#~ msgid ""
+#~ "\n"
+#~ "With no FILE or if FILE is -, read Standard Input.  `-F /' by default.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Ekiragiro kino bw'okiyisa nga tolaze FAYIRO oba bw'oteekawo ka - awali\n"
+#~ "FAYIRO kirinda kusoma ebiva awayingizibwa awa bulijjo. Ekiragiro kikola\n"
+#~ "nga eyataddewo akawayiro '-F /' okugyako ng'otaddewo ekirala.\n"
+
 #~ msgid "Usage: %s [OPTION]... FILE\n"
 #~ msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... FAYIRO\n"
 
+#~ msgid "cannot remove directory: %s"
+#~ msgstr "nemedwa okugyawo tterekero: %s"
+
+#~ msgid ""
+#~ "Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
+#~ "  or:  %s LONG-OPTION\n"
+#~ msgstr ""
+#~ "Enkozesa entuufu eri: %s [KAWAYIRO-KAFUNZE]... MUKOZESA KIRAGIRO "
+#~ "[AGUMENTI]...\n"
+#~ "  oba:  %s KAWAYIRO-KAJJUVU\n"
+
+#~ msgid ""
+#~ "Drop any supplemental groups, assume the user-ID and group-ID of the "
+#~ "specified\n"
+#~ "USER (numeric ID or user name), and run COMMAND with any specified "
+#~ "ARGUMENTs.\n"
+#~ "Exit with status 111 if unable to assume the required user and group ID.\n"
+#~ "Otherwise, exit with the exit status of COMMAND.\n"
+#~ "This program is useful only when run by root (user ID zero).\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Ekiragiro kino kisobozesa omukozesa omu okweyambisa KIRAGIRO,\n"
+#~ "ne AGUMENTI, nekikola nga kiringa ekiyisidwa omukozesa omulala,\n"
+#~ "MUKOZESA. Ku olwo abeera nga alina ennamba-ya-mukozesa\n"
+#~ "n'ennamba-ya-guluupu eby'oyo MUKOZESA. Bwe kitasoboka kufuna\n"
+#~ "ennamba-ya-mukozesa n'ennamba-ya-guluupu ebyo, ekiragiro kikoma\n"
+#~ "ne kifuna emmala y'omulimu nga eri 111. Bwe biyitamu, emmala\n"
+#~ "y'omulimu ey'ekiragiro kino eba y'emu n'eya KIRAGIRO. Ekiragiro\n"
+#~ "kino tekigasa okugyako nga root (muteesiteesi, ow'ennamba-ya-\n"
+#~ "mukozesa=0) y'akiyisizza.\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, "
+#~ "and\n"
+#~ "                    (if specified) supplemental group IDs to GID1, ...\n"
+#~ msgstr ""
+#~ "  -g NG[,NG1... ]   Akawayiro kano kakutegekera ennamba ya guluupu "
+#~ "enkulu\n"
+#~ "n'eba NG, ate bw'oba nazo ozetaaze, ennamba eza guluupu ez'enyongeza\n"
+#~ "kazikutegekera ne ziba NG1, ...\n"
+
+#~ msgid "unknown user-ID: %s"
+#~ msgstr "ennamba-ya-mukozesa eno sigimanyi: %s"
+
+#~ msgid "to use user-ID %s you need to use -g too"
+#~ msgstr ""
+#~ "okusobola okukolera ku nnamba ya mukozesa %s,\n"
+#~ "wetaaga okwongerako akawayiro aka '-g'"
+
+#~ msgid "cannot set group-ID to %lu"
+#~ msgstr "tekisobose okukola ennamba-ya-guluupu ebe %lu"
+
+#~ msgid "cannot set user-ID to %lu"
+#~ msgstr "tekisobose okukola namba-ya-mukozesa eba %lu"
+
+#~ msgid "dup2 failed"
+#~ msgstr "ogwa dup2 gugaanye"
+
+#~ msgid "couldn't execute %s"
+#~ msgstr "nnemedwa okutandika ogwa %s"
+
+#~ msgid "couldn't execute %s -d"
+#~ msgstr "nnemedwa okutandika ogwa %s -d"
+
+#~ msgid ""
+#~ "  -a, --suffix-length=N   use suffixes of length N (default %d)\n"
+#~ "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
+#~ "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output "
+#~ "file\n"
+#~ "  -d, --numeric-suffixes  use numeric suffixes instead of alphabetic\n"
+#~ "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
+#~ msgstr ""
+#~ "  -a, --suffix-length=N   Bw'osaawo kamu ku buwayiro buno, ekiragiro\n"
+#~ "                          obukulembekkereza kikolawo\n"
+#~ "                          obulimu ennukuta N (mu bya bulijjo ziba %d)\n"
+#~ "  -b, --bytes=BUNGI       buno bwo buleetera ekiragiro okukola zi-fayiro\n"
+#~ "                          nga tekuli zisukka bayiti BUNGI obunene\n"
+#~ "  -C, --line-bytes=BUWANVU Buno buleetera ekiragiro okukola zi-fayiro "
+#~ "nga\n"
+#~ "                          enyiriri zaamu temuli esukka mu bayiti\n"
+#~ "                          BUWANVU obuwanvu\n"
+#~ "  -d, --numeric-suffixes  Obuwayiro buno buleetera ekiragiro okukozesa\n"
+#~ "                          namba mu kifo kya nukuta mu bukomekkereza\n"
+#~ "                          obw'oku zi-fayiro ze kikolawo\n"
+#~ "  -l, --lines=BUNGI       Buno ate bwe buleetera ekiragiro buli fayiro "
+#~ "gye\n"
+#~ "                          kikolawo butasukka mu nnyiriri BUNGI obuwanvu\n"
+
+#~ msgid "invalid number of lines: 0"
+#~ msgstr "buno obungi bw'ennyiriri tebukkirizibwa: 0"
+
 #~ msgid "Password:"
 #~ msgstr "Kigambo ekikuumi:"
 
@@ -14789,9 +15118,6 @@ msgstr ""
 #~ msgid "cannot set group id"
 #~ msgstr "nnemedwa okutegeka ennamba eya guluupu"
 
-#~ msgid "cannot set user id"
-#~ msgstr "nnemedwa okutegeka ennamba ey'omukozesa"
-
 #~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n"
 #~ msgstr ""
 #~ "Enkozesa entuufu eri: %s [KAWAYIRO]... [-] [MUKOZESA [AGUMENTI]...]\n"
@@ -14868,160 +15194,6 @@ msgstr ""
 #~ msgid "warning: cannot change directory to %s"
 #~ msgstr "kulabula: sisobala okubuuka kuyingira mu tterekero %s"
 
-#, fuzzy
-#~ msgid ""
-#~ "Change the group of each FILE to GROUP.\n"
-#~ "With --reference, change the group of each FILE to that of RFILE.\n"
-#~ "\n"
-#~ "  -c, --changes          like verbose but report only when a change is "
-#~ "made\n"
-#~ "  -f, --silent, --quiet  suppress most error messages\n"
-#~ "  -v, --verbose          output a diagnostic for every file processed\n"
-#~ msgstr ""
-#~ "Ekiragiro kino kikyusa obwa memba obwa guluupu obwa buli FAYIRO bubeere "
-#~ "bwa\n"
-#~ "mu GULUUPU.\n"
-#~ "Bwe kubeera ko n'akawayiro --reference, kikyusa obwa memba obwa guluupu "
-#~ "obwa\n"
-#~ "buli FAYIRO bufaanagane n'obwa RFAYIRO.\n"
-#~ "\n"
-#~ "  -c, --changes          Obuwayiro buno bukola nga verbose naye tebuzza\n"
-#~ "                         bubaka bwe wataba bikyusidwa\n"
-#~ "      --dereference      Kano bwe kabaako ekiragiro tekikwata ku nyunzi\n"
-#~ "                         eyeyawudde yennyinyi, wabula kikola ku fayiro\n"
-#~ "                         gy'eggukako\n"
-
-#~ msgid ""
-#~ "      --no-preserve-root  do not treat `/' specially (the default)\n"
-#~ "      --preserve-root     fail to operate recursively on `/'\n"
-#~ msgstr ""
-#~ "      --no-preserve-root  Kano bw'okassako ekiragiro etterekero ery'oku\n"
-#~ "                          musungi,'/', tekiliyisa mu ngeri ey'enjawulo\n"
-#~ "                          (y'enkola eya bulijjo)\n"
-#~ "      --preserve-root     Kano ko kaleetera ekiragiro etterekero erya ku\n"
-#~ "                          musingi, '/', obutakola ku biliri munda\n"
-
-#~ msgid ""
-#~ "  -f, --silent, --quiet  suppress most error messages\n"
-#~ "      --reference=RFILE  use RFILE's group rather than specifying a\n"
-#~ "                         GROUP value\n"
-#~ "  -R, --recursive        operate on files and directories recursively\n"
-#~ "  -v, --verbose          output a diagnostic for every file processed\n"
-#~ "\n"
-#~ msgstr ""
-#~ " -f, --silent, --quiet   Buno buleetera ekiragiro oukikisa obubaka "
-#~ "obwogera\n"
-#~ "                         ku kiremya obusinga obungi\n"
-#~ "     --reference=RFAYIRO Kano kaleetera ekiragiro okukozeseemu guluupu "
-#~ "eya\n"
-#~ "                         RFAYIRO mu kifo ekya eyo ekongojedwa mu GULUUPU\n"
-#~ "  -R, --recursive        Buno bukireetera okukola ne ku fayiro "
-#~ "n'amaterekero\n"
-#~ "                         eziri munda mwa zinazo\n"
-#~ "  -v, --verbose          Buno bwo bukireetera okuwandika ebiva mu "
-#~ "kukebera\n"
-#~ "                         buli fayiro ekolebwako\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Change the mode of each FILE to MODE.\n"
-#~ "\n"
-#~ "  -c, --changes           like verbose but report only when a change is "
-#~ "made\n"
-#~ msgstr ""
-#~ "Ekiragiro kino kikyusa endukusa ez'oku buli FAYIRO zibeere NDUKUSA.\n"
-#~ "\n"
-#~ "   -c, --changes          Akawayiro kano kakola nga aka '--verbose' naye\n"
-#~ "                          wano ekiragiro tekizza bubaka bwe wataba\n"
-#~ "                          bikyusidwa\n"
-
-#~ msgid ""
-#~ "  -f, --silent, --quiet   suppress most error messages\n"
-#~ "  -v, --verbose           output a diagnostic for every file processed\n"
-#~ "      --reference=RFILE   use RFILE's mode instead of MODE values\n"
-#~ "  -R, --recursive         change files and directories recursively\n"
-#~ msgstr ""
-#~ "  -f, silent, --quiet     Buno buleetera ekiragiro okukisa obubaka "
-#~ "obwogera\n"
-#~ "                          ku kiremya asinga obungi\n"
-#~ "   -v, --verbose          Buno bwo buleetera ekiragiro okuwandika ebiva "
-#~ "mu\n"
-#~ "                          kukebera buli fayiro ekolebwako\n"
-#~ "     --reference=RFAYIRO  Kano kaleetera ekiragiro okukozesaamu enkola\n"
-#~ "                          elagidwa mu RFAYIRO mu kifo eky'eyo "
-#~ "ekongojedwa\n"
-#~ "                          mu NDUKUSA\n"
-#~ "   -R, --recursive        Buno bwo buleetera ekiragiro okukola ne ku "
-#~ "fayiro\n"
-#~ "                          n'amaterekero ebiri munda mwa binnabyo\n"
-
-#~ msgid ""
-#~ "Change the owner and/or group of each FILE to OWNER and/or GROUP.\n"
-#~ "With --reference, change the owner and group of each FILE to those of "
-#~ "RFILE.\n"
-#~ "\n"
-#~ "  -c, --changes          like verbose but report only when a change is "
-#~ "made\n"
-#~ "      --dereference      affect the referent of each symbolic link (this "
-#~ "is\n"
-#~ "                         the default), rather than the symbolic link "
-#~ "itself\n"
-#~ msgstr ""
-#~ "Ekiragiro kino kikyusa obwa nanyini ne/oba guluupu eya buli FAYIRO "
-#~ "bibeere\n"
-#~ "NANYINI ne/oba GULUUPU. Bwe kubeera ko n'akawayiro --reference, kikyusa\n"
-#~ "nannyini n'obwa memba obwa guluupu obwa buli FAYIRO bifaanagane n'obwa\n"
-#~ "RFAYIRO.\n"
-#~ "\n"
-#~ "  -c, --changes          Obuwayiro buno bufuula enkola y'ekiragiro mu\n"
-#~ "                         ngeri y'emu n'aka '--verbose' naye wano\n"
-#~ "                         tekizza bubaka bwe wataba bikyusidwa\n"
-#~ "      --dereference      Kano ko kaleetera ekiragiro obutakwata ku "
-#~ "nyunzi\n"
-#~ "                         ey'eyawudde yennyinyi, wabula kikola ku fayiro\n"
-#~ "                         kw'egguka\n"
-
-#~ msgid ""
-#~ "  -f, --silent, --quiet  suppress most error messages\n"
-#~ "      --reference=RFILE  use RFILE's owner and group rather than\n"
-#~ "                         specifying OWNER:GROUP values\n"
-#~ "  -R, --recursive        operate on files and directories recursively\n"
-#~ "  -v, --verbose          output a diagnostic for every file processed\n"
-#~ "\n"
-#~ msgstr ""
-#~ "-f, silent, --quiet      Buno buleetera ekiragiro okukisa obubaka "
-#~ "obwogera\n"
-#~ "                         ku kiremya asinga obungi\n"
-#~ " --reference=RFAYIRO     Kano kaleetera ekiragio okukozesamu nannyini\n"
-#~ "                         ne guluupu ebya RFAYIRO mu kifo ekya\n"
-#~ "                         ebikongojedwa mu NANYINI:GULUUPU\n"
-#~ " -R, --recursive         Buno bwo buleetera ekiragiro okukola ne ku\n"
-#~ "                         fayiro n'amaterekero ebiri munda mwa binnabyo\n"
-#~ " -v, --verbose           Buno buleetera ekiragiro okuwandika ebiva mu\n"
-#~ "                         kukebera buli fayiro ekolebwako\n"
-
-#~ msgid ""
-#~ "Display the current time in the given FORMAT, or set the system date.\n"
-#~ "\n"
-#~ "  -d, --date=STRING         display time described by STRING, not `now'\n"
-#~ "  -f, --file=DATEFILE       like --date once for each line of DATEFILE\n"
-#~ msgstr ""
-#~ "Ekiragiro kino kiwandika essaawa nga ziwandikidwa mu MPANDIKA. Era "
-#~ "kyeyambisibwa okutegeka obudde n'ennaku sisitemu by'ekolerako.\n"
-#~ "\n"
-#~ "  -d, --date=BUDDE          Buno bukireetera okuwandika BUDDE mukifo "
-#~ "ekya \n"
-#~ "                            obwa kakati (singa BUDDE kiba 'now' "
-#~ "ekiragiro\n"
-#~ "                            kiwandika obudde obwa kakano)\n"
-#~ "  -f, --file=FAYIRO         Buno bukireetera okusoma FAYIRO kiryoke "
-#~ "kiwandike\n"
-#~ "                            obudde obuwandikidwa ku buli lunyiriri lwa "
-#~ "yo.\n"
-#~ "                            FAYIRO bw'ebeera - , kisoma ebiva ku nnono "
-#~ "eya\n"
-#~ "                            bulijjo\n"
-
 #~ msgid ""
 #~ "\n"
 #~ "SIZE may be (or may be an integer optionally followed by) one of "
@@ -15037,17 +15209,60 @@ msgstr ""
 #~ "omuwendo ogutali mu butundutundu - okugeza 15kB oba 2M naye ssi\n"
 #~ "5.5M.\n"
 
-#~ msgid "truncating %s"
-#~ msgstr "%s ngikolako omulimu ogwa 'truncate'"
+#~ msgid ""
+#~ "\n"
+#~ "Report %s bugs to %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Bw'osangamu ebitali bituufu ku %s, tegeeza %s\n"
 
-#~ msgid "cannot create link %s"
-#~ msgstr "sisobola okukolawo enyunzi %s"
+#~ msgid "warning: --retry is useful mainly when following by name"
+#~ msgstr ""
+#~ "kulabula: tekigasa kuteekawo akawayiro --retry okugyako\n"
+#~ "nga tail egoberera fayiro nga yesigamye ku linnya"
 
 #~ msgid ""
-#~ "WARNING: --preserve_context is deprecated; use --preserve-context instead"
+#~ "  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
+#~ "                        delimit-method={none(default),prepend,separate}\n"
+#~ "                        Delimiting is done with blank lines\n"
+#~ "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+#~ "  -i, --ignore-case     ignore differences in case when comparing\n"
+#~ "  -s, --skip-chars=N    avoid comparing the first N characters\n"
+#~ "  -u, --unique          only print unique lines\n"
+#~ "  -z, --zero-terminated  end lines with 0 byte, not newline\n"
 #~ msgstr ""
-#~ "KULABULA: akawayiro --preserve_context kadibizidwa;\n"
-#~ "kozesaamu aka --preserve-context"
-
-#~ msgid "invalid number of lines: 0"
-#~ msgstr "buno obungi bw'ennyiriri tebukkirizibwa: 0"
+#~ "  -D, --all-repeated[=engeri-gye-z'awulaganidwa] Bw'ossaawo kami ku buno\n"
+#~ "                        ekiragiro kiwandikako ennyiriri ezifaanagana\n"
+#~ "                        eziriraanaganye 'engeri-gye-z'awulaganidwa' kye\n"
+#~ "                        kigambo ekifuga kiki ekiwandikibwawo wakati\n"
+#~ "                        w'ennyiri ez'en'enjawulo ezifaanagana mu "
+#~ "ebivaamu.\n"
+#~ "                        'engeri-gye-z'awulagandiwa' bwe kiba 'none', \n"
+#~ "                        ennyiriri ezo zonna ziwandikibwa kumu nga tewali\n"
+#~ "                        kiz'awulagana. Bwe kiba 'prepend' ekiragiro "
+#~ "kisooka\n"
+#~ "                        kussawo olunyiriri olutaliko kantu ne kiryoka\n"
+#~ "                        kiwandikawo ekibinja ky'ennyiriri ezifaanagana. "
+#~ "Bwe\n"
+#~ "                        kiba 'separate' olwo bwe kimala ekibinja ekimu\n"
+#~ "                        kissawo olunyiriri olutaliko kantu ne kiryoka\n"
+#~ "                        kiwandika ekibinja ekiddako. Enkola yakyo eya\n"
+#~ "                        bulijjo bwe butayawula bibinja by'ennyiriri ezo.\n"
+#~ "  -f, --skip-fields=N   bw'oteekawo kamu ku buno, N nga gwo muwendo,\n"
+#~ "                        ekiragiro bwe kiba gerageranya nnyiriri okulaba\n"
+#~ "                        oba nga zifaanagana tekifa ku firidi zaamu N\n"
+#~ "                        ezisooka\n"
+#~ "  -i, --ignore-case     kamu ku buno bwe kabaako ekiragiro tekirabawo\n"
+#~ "                        njawulo wakati w'ennukuta ennene n'entono\n"
+#~ "  -s, --skip-chars=N    bw'oteekawo kamu ku buno, N nga gwo muwendo,\n"
+#~ "                        ekiragiro bwe kiba gerageranya nnyiriri\n"
+#~ "                        okulaba oba nga zifaanagana tekifa ku\n"
+#~ "                        bubonero bwazo N obusooka\n"
+#~ "  -u, --unique          ate bw'oteekawo kamu ku buno ekiragiro "
+#~ "kiwandikawo\n"
+#~ "                        ezo ennyiriri zokka ezitafaanagana n'ezo bwe\n"
+#~ "                        ziriraanaganye\n"
+#~ "  -z, --zero-terminated Bw'ossawo kamu ku buno, ekiragiro ku nkomeroro\n"
+#~ "                        ez'ennyiriri mu kifo eky'okussawo akabanero "
+#~ "akalagira\n"
+#~ "                        kutandika lupya, kiteekawo bayiti eya 0.\n"
diff --git a/po/lt.gmo b/po/lt.gmo
index 6f548f7f..644324c5 100644
--- a/po/lt.gmo
+++ b/po/lt.gmo
diff --git a/po/lt.po b/po/lt.po
index 00988676..792c7b91 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: coreutils-7.1\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
 "PO-Revision-Date: 2009-03-25 17:13+0200\n"
 "Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -37,76 +37,123 @@ msgstr "Galimi argumentai:"
 msgid "error closing file"
 msgstr "klaida užveriant failą"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "rašymo klaida"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, c-format
 msgid "preserving permissions for %s"
 msgstr ""
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "Nežinoma sistemos klaida"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "paprastas tuš�ias failas"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "paprastas failas"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "aplankas"
 
-#: lib/file-type.c:44
-msgid "block special file"
-msgstr "blokinis specialus failas"
-
-#: lib/file-type.c:47
-msgid "character special file"
-msgstr "specialus simbolinis failas"
-
-#: lib/file-type.c:50
-msgid "fifo"
-msgstr "fifo"
-
-#: lib/file-type.c:53
+#: lib/file-type.c:46
 msgid "symbolic link"
 msgstr "simbolinÄ— nuoroda"
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "lizdas"
-
-#: lib/file-type.c:59
+#: lib/file-type.c:52
 msgid "message queue"
 msgstr "pranešimų eilė"
 
-#: lib/file-type.c:62
+#: lib/file-type.c:55
 msgid "semaphore"
 msgstr "semaforas"
 
-#: lib/file-type.c:65
+#: lib/file-type.c:58
 msgid "shared memory object"
 msgstr "bendrosios atmintinÄ—s objektas"
 
-#: lib/file-type.c:68
+#: lib/file-type.c:61
 msgid "typed memory object"
 msgstr "tipizuotos atmintinÄ—s objektas"
 
-#: lib/file-type.c:70
+#: lib/file-type.c:66
+msgid "block special file"
+msgstr "blokinis specialus failas"
+
+#: lib/file-type.c:69
+msgid "character special file"
+msgstr "specialus simbolinis failas"
+
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr ""
+
+#: lib/file-type.c:75
+msgid "fifo"
+msgstr "fifo"
+
+#: lib/file-type.c:78
+msgid "door"
+msgstr ""
+
+#: lib/file-type.c:81
+#, fuzzy
+msgid "multiplexed block special file"
+msgstr "blokinis specialus failas"
+
+#: lib/file-type.c:84
+#, fuzzy
+msgid "multiplexed character special file"
+msgstr "specialus simbolinis failas"
+
+#: lib/file-type.c:87
+msgid "multiplexed file"
+msgstr ""
+
+#: lib/file-type.c:90
+#, fuzzy
+msgid "named file"
+msgstr "keistas failas"
+
+#: lib/file-type.c:93
+#, fuzzy
+msgid "network special file"
+msgstr "blokinis specialus failas"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr ""
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr ""
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr ""
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "lizdas"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr ""
+
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "keistas failas"
 
@@ -241,18 +288,18 @@ msgstr "%s: parametras „-W %s“ neleidžia argumento\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: parametrui „%s“ reikia argumento\n"
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr "neįmanoma pakeisti %s teisių"
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "neįmanoma sukurti %s aplanko"
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr "baigÄ—si atmintis"
@@ -369,7 +416,7 @@ msgstr ""
 msgid "Unmatched ) or \\)"
 msgstr "Nesuderintas ) arba \\)"
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 msgid "No previous regular expression"
 msgstr ""
 
@@ -394,7 +441,7 @@ msgstr "NorÄ—dami apeiti Å¡iÄ… apsaugÄ… naudokite --no-preserve-root"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[yYtT]"
 
@@ -404,11 +451,11 @@ msgstr "^[yYtT]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, c-format
 msgid "setting permissions for %s"
 msgstr "nustatomos %s teisÄ—s"
@@ -550,18 +597,6 @@ msgstr ""
 msgid "Resource lost"
 msgstr ""
 
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, fuzzy, c-format
-msgid "cannot create pipe"
-msgstr "negalima sukūrti fifo %s"
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, fuzzy, c-format
-msgid "%s subprocess failed"
-msgstr "%s: rašymo klaida"
-
 #: lib/strsignal.c:114
 #, c-format
 msgid "Real-time signal %d"
@@ -772,7 +807,7 @@ msgstr ""
 "\n"
 "Apie %s klaidas praneškite adresu %s\n"
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, fuzzy, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Naudojimas: %s\n"
@@ -782,30 +817,10 @@ msgstr "Naudojimas: %s\n"
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr ""
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr ""
 
-#: lib/w32spawn.h:43
-#, c-format
-msgid "_open_osfhandle failed"
-msgstr ""
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr ""
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr ""
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr ""
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr ""
@@ -827,7 +842,7 @@ msgstr "nežinomas srautas"
 msgid "failed to reopen %s with mode %s"
 msgstr "nepavyko pašalinti %s"
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr "nepavyko eilu�ių palyginimas"
@@ -886,7 +901,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -903,48 +918,47 @@ msgid ""
 "from any other non-alphabet bytes in the encoded stream.\n"
 msgstr ""
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "skaitymo klaida"
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, c-format
 msgid "invalid input"
 msgstr "netinkama įvestis"
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, c-format
 msgid "invalid wrap size: %s"
 msgstr ""
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, c-format
 msgid "extra operand %s"
 msgstr "papildomas operandas %s"
 
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, c-format
 msgid "closing standard input"
 msgstr "užveriama standartinė įvestis"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -975,8 +989,8 @@ msgstr ""
 #: src/basename.c:60
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/basename.c:67
@@ -990,32 +1004,31 @@ msgid ""
 "  %s -a any/str1 any/str2   -> \"str1\" followed by \"str2\"\n"
 msgstr ""
 
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, c-format
 msgid "missing operand"
 msgstr "trūksta operando"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr "Torbjorn Granlund"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 msgid "Richard M. Stallman"
 msgstr "Richard M. Stallman"
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1063,7 +1076,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr "negaliu įvykdyti ioctl %s"
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr "standartinė išvestis"
@@ -1080,14 +1093,14 @@ msgstr "Russell Coker"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 msgid "Jim Meyering"
 msgstr "Jim Meyering"
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, c-format
 msgid "failed to create security context: %s"
 msgstr ""
@@ -1097,8 +1110,8 @@ msgstr ""
 msgid "failed to set %s security context component to %s"
 msgstr ""
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, c-format
 msgid "failed to get security context of %s"
 msgstr ""
@@ -1108,18 +1121,18 @@ msgstr ""
 msgid "can't apply partial context to unlabeled file %s"
 msgstr ""
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, c-format
 msgid "failed to change context of %s to %s"
 msgstr ""
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
 msgstr "negaliu pasiekti %s"
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, c-format
 msgid "cannot read directory %s"
 msgstr "negaliu perskaityti %s aplanko turinio"
@@ -1129,13 +1142,14 @@ msgstr "negaliu perskaityti %s aplanko turinio"
 msgid "changing security context of %s\n"
 msgstr "kei�iamos %s teisės"
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, c-format
 msgid "fts_read failed"
 msgstr "nepavyko fts_read"
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, fuzzy, c-format
 msgid "fts_close failed"
 msgstr "nepavyko fts_read"
@@ -1150,7 +1164,7 @@ msgstr ""
 
 #: src/chcon.c:357
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
@@ -1171,7 +1185,7 @@ msgid ""
 "  -l, --range=RANGE      set range RANGE in the target security context\n"
 msgstr ""
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
 "      --preserve-root    fail to operate recursively on '/'\n"
@@ -1217,36 +1231,37 @@ msgstr ""
 "  -P be simbolinių nuorodų pakeitimų (nutylint)\n"
 "\n"
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr "-R --dereference reikalauja bent -H arba -L"
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr "-R -h reikalauja -P"
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, c-format
 msgid "missing operand after %s"
 msgstr "po %s trūksta operando"
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, c-format
 msgid "invalid context: %s"
 msgstr ""
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr ""
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, c-format
 msgid "failed to get attributes of %s"
 msgstr "nepavyko gauti %s parametrų"
@@ -1270,7 +1285,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
@@ -1302,47 +1317,47 @@ msgstr ""
 "  %s staff /u            Grupės /u pakeitimas į „staff“.\n"
 "  %s -hR staff /u        Grupės /u ir jos pofailių pakeitimas į „staff“.\n"
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
 msgstr "gaunami nauji %s parametrai"
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr "nei simbolinÄ— nuoroda %s nei referentas nebuvo pakeisti\n"
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, fuzzy, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr "%s teisės buvo pakeistos į %04lo (%s)\n"
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, fuzzy, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr "nepavyko pakeisti %s teisių į %04lo (%s)\n"
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr "%s teisės išlaikytos kaip %04lo (%s)\n"
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr ""
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, c-format
 msgid "changing permissions of %s"
 msgstr "kei�iamos %s teisės"
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr "%s: naujos teisÄ—s yra %s, o ne %s"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1353,33 +1368,33 @@ msgstr ""
 "    arba: %s [PARAMETRAS]... AŠTUNT_BŪSENA FAILAS...\n"
 "    arba: %s [PARAMETRAS]... --reference=NUOR_FAILAS FAILAS...\n"
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 msgid ""
 "Change the mode of each FILE to MODE.\n"
 "With --reference, change the mode of each FILE to that of RFILE.\n"
 "\n"
 msgstr ""
 
-#: src/chmod.c:391
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr ""
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 msgid ""
 "\n"
 "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n"
 msgstr ""
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr "nepavyksta suderinti režimo ir --reference parametro"
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, c-format
 msgid "invalid mode: %s"
 msgstr "netinkamas režimas: %s"
@@ -1518,26 +1533,21 @@ msgstr ""
 "  %s -hR root /u    Pakeisti valdytoją /u ir pofailius į \"root\".\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr "Roland McGrath"
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr "netinkama grupÄ— %s"
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, fuzzy, c-format
 msgid "invalid group list %s"
 msgstr "netinkama grupÄ— %s"
 
-#: src/chroot.c:117
-#, fuzzy, c-format
-msgid "failed to set additional groups"
-msgstr "nepavyko užverti aplanko %s"
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
@@ -1546,7 +1556,7 @@ msgstr ""
 "Naudojimas: %s NAUJAÅ AKNIS [KOMANDA...]\n"
 "arba: %s NUSTATYMAS\n"
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
@@ -1554,13 +1564,13 @@ msgstr ""
 "Įvykdyti KOMANDĄ su šakniniu aplanku, kuris nustatytas į NAUJAŠAKNIS\n"
 "\n"
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
 msgstr ""
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 #, fuzzy
 msgid ""
 "\n"
@@ -1569,28 +1579,42 @@ msgstr ""
 "\n"
 "Jei nenurodyta komanda, vykdyti ``${SHELL} -i'' (numatytasis: /bin/sh).\n"
 
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, c-format
 msgid "cannot change root directory to %s"
 msgstr "nepavyko pakeisti šakninio aplanko į %s"
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, c-format
 msgid "cannot chdir to root directory"
 msgstr "nepavyko atverti Å¡akninio aplanko"
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr ""
+
+#: src/chroot.c:383
+#, fuzzy, c-format
+msgid "failed to get supplemental groups"
+msgstr "Nepavyko pakeisti %s grupės į %s\n"
+
+#: src/chroot.c:395
+#, fuzzy, c-format
+msgid "failed to %s supplemental groups"
+msgstr "nepavyko atverti %s"
+
+#: src/chroot.c:402
 #, fuzzy, c-format
 msgid "failed to set group-ID"
 msgstr "nepavyko atverti %s"
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, fuzzy, c-format
 msgid "failed to set user-ID"
 msgstr "nepavyko atverti %s"
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, fuzzy, c-format
 msgid "failed to run command %s"
 msgstr "nepavyko įvykdyti komandos %s"
@@ -1622,7 +1646,7 @@ msgstr ""
 "Išrašo patikrinimo sumą CRC ir kiekvieno FAILO baitų skai�ių.\n"
 "\n"
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr "Naudojimas: %s [PARAMETRAS]... FAILAS1 FAILAS2\n"
@@ -1690,295 +1714,328 @@ msgstr ""
 msgid "empty %s not allowed"
 msgstr "neleidžiamas tuš�ias %s"
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr "klaida skaitant %s"
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, c-format
 msgid "cannot lseek %s"
 msgstr "nepavyko įvykdyti lseek failui %s"
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr "klaida rašant %s"
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, fuzzy, c-format
 msgid "%s: failed to get extents info"
 msgstr "nepavyko gauti %s parametrų"
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, fuzzy, c-format
 msgid "%s: write failed"
 msgstr "%s: rašymo klaida"
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, fuzzy, c-format
 msgid "failed to extend %s"
 msgstr "nepavyko atverti %s"
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, c-format
 msgid "clearing permissions for %s"
 msgstr ""
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "nepavyko išlaikyti %s savininko"
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
 msgstr "nepavyko rasti failo %s"
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, c-format
 msgid "failed to preserve authorship for %s"
 msgstr "nepavyko išlaikyti %s autoriaus"
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
+#, c-format
+msgid "failed to set default file creation context to %s"
+msgstr ""
+
+#: src/copy.c:820
+#, fuzzy, c-format
+msgid "failed to set default file creation context for %s"
+msgstr "nepavyko užverti aplanko %s"
+
+#: src/copy.c:846
+#, fuzzy, c-format
+msgid "failed to set the security context of %s"
+msgstr "kei�iamos %s teisės"
+
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
 msgid "cannot open %s for reading"
 msgstr "nepavyksta atverti skaitymui %s"
 
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, c-format
 msgid "cannot fstat %s"
 msgstr "nepavyksta įvykdyti fstat %s"
 
-#: src/copy.c:820
+#: src/copy.c:935
 #, c-format
 msgid "skipping file %s, as it was replaced while being copied"
 msgstr "failas %s praleidžiamas, jis buvo pakeistas, kol buvo kopijuojamas"
 
-#: src/copy.c:850
-#, c-format
-msgid "failed to get file system create context"
-msgstr ""
-
-#: src/copy.c:864
-#, c-format
-msgid "failed to set the security context of %s to %s"
-msgstr ""
-
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
 msgid "cannot remove %s"
 msgstr "nepavyko pašalinti %s"
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
 msgstr "pašalintas %s\n"
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr ""
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, c-format
 msgid "cannot create regular file %s"
 msgstr "nepavyko sukurti paprasto failo %s"
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, fuzzy, c-format
 msgid "failed to clone %s from %s"
 msgstr "nepavyko užverti aplanko %s"
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr "išlaikomos %s datos"
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
 #, fuzzy, c-format
 msgid "failed to close %s"
 msgstr "nepavyko atverti %s"
 
-#: src/copy.c:1471
+#: src/copy.c:1580
 #, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
 msgstr ""
 
-#: src/copy.c:1478
+#: src/copy.c:1581
+#, c-format
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr ""
+
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
 msgstr "%s: perrašyti %s? "
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr " (atsarginÄ— kopija: %s)"
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr ""
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, c-format
 msgid "cannot create hard link %s to %s"
 msgstr "nepavyko sukurti kietosios nuorodos %s į %s"
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, c-format
 msgid "cannot stat %s"
 msgstr "nepavyksta patikrinti %s"
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, c-format
 msgid "omitting directory %s"
 msgstr "praleidžiamas aplankas %s"
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr "perspėjimas: išeities failas %s nurodytas kelis kartus"
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
 msgstr "%s ir %s yra tas pats failas"
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr "nepavyksta perrašyti ne aplanką %s naudojant aplanką %s"
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr "nebus perrašoma, tik sukuriama %s su %s"
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr "nepavyko pakeisti aplanko %s su ne aplanku"
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr "nepavyko perkelti aplanko ant ne aplanko: %s -> %s"
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr "saugojant %s būtų sunaikinta šaltinis; %s neperkelta"
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr "saugojant %s būtų sunaikintas šaltinis; %s nenukopijuota"
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
 msgstr "nepavyko padaryti atsarginÄ—s %s kopijos"
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr ""
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr "negalima kopijuoti aplanko %s į patį save, %s"
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr "nepavyko sukurti kietosios nuorodos %s į aplanką %s"
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr "nepavyko perkelti %s į žemiau esantį savo aplanką, %s"
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, c-format
 msgid "cannot move %s to %s"
 msgstr "negaliu perkelti %s į %s"
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr ""
 "nepavyko perkėlimas tarp įrenginių: %s į %s; nepavyksta pašalinti tikslo"
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, c-format
-msgid "failed to set default file creation context to %s"
-msgstr ""
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr "negalima nukopijuoti cikliškos simbolines nuorodos %s"
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr "%s: galima daryti simbolines nuorodas tik dabartiniame aplanke"
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr "nepavyksta susieti %s su %s"
 
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, c-format
 msgid "cannot create fifo %s"
 msgstr "negalima sukūrti fifo %s"
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, c-format
 msgid "cannot create special file %s"
 msgstr "nepavyksta sukurti specialaus failo %s"
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, c-format
 msgid "cannot read symbolic link %s"
 msgstr "negaliu perskaityti simbolinÄ—s nuorodos %s"
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, c-format
 msgid "cannot create symbolic link %s"
 msgstr "negaliu sukurti simbolinÄ—s nuorodos %s"
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
 msgstr "%s yra nežinomo tipo failas"
 
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, c-format
 msgid "cannot un-backup %s"
 msgstr "nepavyko atkurti %s"
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr "%s -> %s (atkurti)\n"
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr ""
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr ""
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, fuzzy, c-format
+msgid "unknown program %s"
+msgstr "nežinomas srautas"
+
+#: src/cp.c:157 src/mv.c:288
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -1986,11 +2043,11 @@ msgid ""
 "  or:  %s [OPTION]... -t DIRECTORY SOURCE...\n"
 msgstr ""
 
-#: src/cp.c:162
+#: src/cp.c:163
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 
-#: src/cp.c:168
+#: src/cp.c:169
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
 "      --attributes-only        don't copy the file data, just the "
@@ -2004,7 +2061,7 @@ msgid ""
 "  -d                           same as --no-dereference --preserve=links\n"
 msgstr ""
 
-#: src/cp.c:177
+#: src/cp.c:178
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
 "                                 opened, remove it and try again (this "
@@ -2017,20 +2074,20 @@ msgid ""
 "  -H                           follow command-line symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:186
+#: src/cp.c:187
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
 "  -L, --dereference            always follow symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:190
+#: src/cp.c:191
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
 "                                 a previous -i option)\n"
 "  -P, --no-dereference         never follow symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:195
+#: src/cp.c:196
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
 "      --preserve[=ATTR_LIST]   preserve the specified attributes (default:\n"
@@ -2040,13 +2097,13 @@ msgid ""
 "                                 all\n"
 msgstr ""
 
-#: src/cp.c:203
+#: src/cp.c:204
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                use full source file name under DIRECTORY\n"
 msgstr ""
 
-#: src/cp.c:207
+#: src/cp.c:208
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
 "      --reflink[=WHEN]         control clone/CoW copies. See below\n"
@@ -2055,7 +2112,7 @@ msgid ""
 "force)\n"
 msgstr ""
 
-#: src/cp.c:213
+#: src/cp.c:214
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
 "      --strip-trailing-slashes  remove any trailing slashes from each "
@@ -2063,7 +2120,7 @@ msgid ""
 "                                 argument\n"
 msgstr ""
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -2072,7 +2129,7 @@ msgid ""
 "  -T, --no-target-directory    treat DEST as a normal file\n"
 msgstr ""
 
-#: src/cp.c:224
+#: src/cp.c:225
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
 "                                 than the destination file or when the\n"
@@ -2081,7 +2138,15 @@ msgid ""
 "  -x, --one-file-system        stay on this file system\n"
 msgstr ""
 
-#: src/cp.c:233
+#: src/cp.c:232
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/cp.c:240
 msgid ""
 "\n"
 "By default, sparse SOURCE files are detected by a crude heuristic and the\n"
@@ -2097,7 +2162,7 @@ msgid ""
 "fails, or if --reflink=auto is specified, fall back to a standard copy.\n"
 msgstr ""
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 msgid ""
 "\n"
 "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n"
@@ -2107,7 +2172,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2115,7 +2180,7 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2123,222 +2188,232 @@ msgid ""
 "regular file.\n"
 msgstr ""
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, c-format
 msgid "failed to preserve times for %s"
 msgstr "nepavyko išlaikyti %s laikų"
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, c-format
 msgid "failed to preserve permissions for %s"
 msgstr "nepavyko išlaikyti %s teisių"
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, c-format
 msgid "cannot make directory %s"
 msgstr "negalima sukerti %s aplanko"
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr "%s jau yra, bet nÄ—ra aplankas"
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
 #, fuzzy, c-format
 msgid "failed to access %s"
 msgstr "nepavyko atverti %s"
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, c-format
 msgid "missing file operand"
 msgstr "trūksta failo operando"
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, c-format
 msgid "missing destination file operand after %s"
 msgstr "trūksta paskirties failo operando po %s"
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, fuzzy, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr ""
 "Negalima suderinti --target-directory (-t) ir --no-target-directory (-T)"
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, c-format
 msgid "target %s is not a directory"
 msgstr "paskirties vieta %s yra ne aplankas"
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr "naudojant --parents parametrą, paskirties vieta privalo būti aplankas"
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, c-format
 msgid "multiple target directories specified"
 msgstr "nurodyta keletas tikslo aplankų"
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr ""
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr "nepavyksta sukurti simbolinių bei kietųjų saitų"
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr "parametrai --backup ir --no-clobber negali būti naudojami kartu"
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr ""
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr "atsarginÄ—s kopijos tipas"
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, c-format
+msgid "cannot set target context and preserve it"
+msgstr ""
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr ""
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr "Stuart Kemp"
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr ""
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr "%s: eilutės numeris už ribų"
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, c-format
 msgid "%s: %s: line number out of range"
 msgstr "%s: %s: eilutės numeris už ribų"
 
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, c-format
 msgid " on repetition %s\n"
 msgstr ""
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, c-format
 msgid "%s: %s: match not found"
 msgstr "%s: %s: nerasta atitikimų"
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr ""
 
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, c-format
 msgid "write error for %s"
 msgstr "%s rašymo klaida"
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, c-format
 msgid "%s: integer expected after delimiter"
 msgstr "%s: po skirtuko tikimasi rasti sveikąjį skai�ių"
 
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, fuzzy, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr "%s: „}“ yra privalomas kartojimo skai�iavime"
 
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, fuzzy, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr "%s}: tarp „{“ ir „}“ reikalingas sveikas skai�ius"
 
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, fuzzy, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr "%s: trūksta „%c“ uždaran�iojo skirtuko"
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr "%s: netaisyklinga paprasta išraiška: %s"
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr "%s: netaisyklingas Å¡ablonas"
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr "%s: eilutės numeris turi būti didesnis už nulį"
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr "eilutės numeris %s mažesnis už prieš ją esan�ios eilutės numeris %s"
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr ""
 "perspėjimas: eilutės numeris %s yra toks pats, kaip prieš ją esan�ios eilutės"
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr ""
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr ""
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr ""
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr ""
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr ""
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr ""
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr "%s: netaisyklingas skai�ius"
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr "Naudojimas: %s [PARAMETRAS]... FAILŲ ŠABLONAS...\n"
 
-#: src/csplit.c:1455
+#: src/csplit.c:1483
 #, fuzzy
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
@@ -2348,7 +2423,7 @@ msgstr ""
 "ir į standartinę išvestį išvedamas baitų skai�ius kiekvienoje dalyje.\n"
 "\n"
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2356,7 +2431,11 @@ msgid ""
 "  -k, --keep-files           do not remove output files on errors\n"
 msgstr ""
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr ""
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
@@ -2366,7 +2445,7 @@ msgstr ""
 "  -s, --quiet, --silent      nerodyti baitų skai�iaus paskirties failuose\n"
 "  -z, --elide-empty-files    pašalinti tuš�ius paskirties failus\n"
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
@@ -2374,7 +2453,7 @@ msgstr ""
 "\n"
 "Jeigu FAILAS yra -, skaityti iš standartinės įvesties. Galimi ŠABLONAI:\n"
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 #, fuzzy
 msgid ""
 "\n"
@@ -2404,23 +2483,19 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr "David M. Ihnat"
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr ""
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr "Naudojimas: %s PARAMETRAS... [FAILAS]...\n"
 
-#: src/cut.c:193
+#: src/cut.c:176
 #, fuzzy
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr ""
 "Spausdinti pasirinktas eilutes ekrane iš kiekvieno FAILO.\n"
 "\n"
 
-#: src/cut.c:199
+#: src/cut.c:182
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
 "  -c, --characters=LIST   select only these characters\n"
@@ -2431,7 +2506,7 @@ msgstr ""
 "  -d, --delimiter=SKIRTUKAS panaudoti SKIRTUKĄ vietoj TABo kaip laukų "
 "skirtukÄ….\n"
 
-#: src/cut.c:204
+#: src/cut.c:187
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
 "                            that contains no delimiter character, unless\n"
@@ -2444,7 +2519,7 @@ msgstr ""
 "                            -s parametras yra apibrėžtas\n"
 "  -n                      (ignoruojama)\n"
 
-#: src/cut.c:210
+#: src/cut.c:193
 #, fuzzy
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
@@ -2453,14 +2528,14 @@ msgstr ""
 "      --complement rinkinio papildymas pasirinktais baitais, ženklais\n"
 "                             arba laukais\n"
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
 "                            the default is to use the input delimiter\n"
 msgstr ""
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2468,7 +2543,7 @@ msgid ""
 "in the same order that it is read, and is written exactly once.\n"
 msgstr ""
 
-#: src/cut.c:227
+#: src/cut.c:210
 msgid ""
 "Each range is one of:\n"
 "\n"
@@ -2480,47 +2555,51 @@ msgid ""
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
 
-#: src/cut.c:367 src/cut.c:493
+#: src/cut.c:300 src/cut.c:394
 #, fuzzy
 msgid "invalid byte, character or field list"
 msgstr "turite pateikti baitų, ženklų ar laukų sąrašą"
 
-#: src/cut.c:387
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr ""
+
+#: src/cut.c:320
 msgid "invalid range with no endpoint: -"
 msgstr ""
 
-#: src/cut.c:403
+#: src/cut.c:334
 msgid "invalid decreasing range"
 msgstr ""
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, c-format
 msgid "byte offset %s is too large"
 msgstr ""
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, c-format
 msgid "field number %s is too large"
 msgstr "laukelio numeris %s per didelis"
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr "gali būti nurodytas tik vienas sąrašo tipas"
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr "skirtukas turi būti vienas simbolis"
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr "turite pateikti baitų, ženklų ar laukų sąrašą"
 
-#: src/cut.c:850
+#: src/cut.c:790
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr "skirtukas gali būti pateiktas tik operacijoms su laukais"
 
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
@@ -2528,11 +2607,11 @@ msgstr ""
 "linijų be skirtukų rodymo blokavimas yra prasmingas\n"
 "\ttik operacijoms su laukais"
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr "trūksta laukų sąrašo"
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr "trūksta pozicijų sąrašo"
 
@@ -2574,7 +2653,7 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 
 #: src/date.c:158
@@ -2735,10 +2814,10 @@ msgid ""
 "  $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n"
 msgstr ""
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr "standartinė įvestis"
@@ -2776,7 +2855,7 @@ msgstr ""
 msgid "cannot set date"
 msgstr "negalima nustatyti datos"
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, c-format
 msgid "time %s is out of range"
 msgstr ""
@@ -2787,14 +2866,14 @@ msgstr ""
 msgid "Paul Rubin"
 msgstr "Paul Rubin"
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
 "  or:  %s OPTION\n"
 msgstr ""
 
-#: src/dd.c:526
+#: src/dd.c:532
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
 "\n"
@@ -2805,7 +2884,7 @@ msgid ""
 "  ibs=BYTES       read up to BYTES bytes at a time (default: 512)\n"
 msgstr ""
 
-#: src/dd.c:535
+#: src/dd.c:541
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
 "  iflag=FLAGS     read as per the comma separated symbol list\n"
@@ -2818,7 +2897,7 @@ msgid ""
 "                  'noxfer' suppresses transfer stats, 'none' suppresses all\n"
 msgstr ""
 
-#: src/dd.c:546
+#: src/dd.c:552
 msgid ""
 "\n"
 "N and BYTES may be followed by the following multiplicative suffixes:\n"
@@ -2829,7 +2908,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dd.c:555
+#: src/dd.c:561
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
 "  ebcdic    from ASCII to EBCDIC\n"
@@ -2844,7 +2923,7 @@ msgid ""
 "            with block or unblock, pad with spaces rather than NULs\n"
 msgstr ""
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -2854,7 +2933,7 @@ msgid ""
 "  fsync     likewise, but also write metadata\n"
 msgstr ""
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -2863,75 +2942,75 @@ msgid ""
 "suggested)\n"
 msgstr ""
 
-#: src/dd.c:583
+#: src/dd.c:589
 msgid "  cio       use concurrent I/O for data\n"
 msgstr ""
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr ""
 
-#: src/dd.c:587
+#: src/dd.c:593
 msgid "  directory  fail unless a directory\n"
 msgstr ""
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr ""
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr ""
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr ""
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr ""
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr ""
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr ""
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr ""
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr ""
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr ""
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr ""
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr ""
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, c-format
 msgid ""
 "\n"
@@ -2948,28 +3027,38 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
 "%<PRIuMAX>+%<PRIuMAX> records out\n"
 msgstr ""
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr ""
 
@@ -2983,273 +3072,273 @@ msgstr ""
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
 msgstr ""
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, c-format
 msgid "closing input file %s"
 msgstr ""
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr ""
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, fuzzy, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr "nepavyko pašalinti %s"
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, c-format
 msgid "writing to %s"
 msgstr "rašoma į %s"
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, c-format
 msgid "unrecognized operand %s"
 msgstr ""
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 #, fuzzy
 msgid "invalid conversion"
 msgstr "nesamas naudotojas"
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 #, fuzzy
 msgid "invalid input flag"
 msgstr "klaidinga data %s"
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 #, fuzzy
 msgid "invalid output flag"
 msgstr "nesama grupÄ—"
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 #, fuzzy
 msgid "invalid status flag"
 msgstr "klaidinga data %s"
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, c-format
 msgid "invalid number %s"
 msgstr ""
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr ""
 
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, c-format
 msgid "cannot combine block and unblock"
 msgstr ""
 
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, c-format
 msgid "cannot combine lcase and ucase"
 msgstr ""
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, c-format
 msgid "cannot combine excl and nocreat"
 msgstr ""
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, fuzzy, c-format
 msgid "cannot combine direct and nocache"
 msgstr "nepavyksta suderinti režimo ir --reference parametro"
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
 "  of mt_type=0x%0lx -- see <sys/mtio.h> for the list of types"
 msgstr ""
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, c-format
 msgid "%s: cannot skip"
 msgstr "%s: nepavyksta praleisti"
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, c-format
 msgid "%s: cannot seek"
 msgstr ""
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr ""
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr ""
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr ""
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, c-format
 msgid "setting flags for %s"
 msgstr ""
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr ""
 
-#: src/dd.c:2133
+#: src/dd.c:2172
 #, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
 msgstr ""
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr ""
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
 msgstr ""
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, c-format
 msgid "failed to open %s"
 msgstr "nepavyko atverti %s"
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
 "blocks"
 msgstr ""
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr ""
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, fuzzy, c-format
 msgid "failed to discard cache for: %s"
 msgstr "nepavyko išlaikyti %s laikų"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr "Paul Eggert"
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr "Failų sistema"
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr "Tipas"
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr "blokų"
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr "Naud"
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr "Laisva"
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr "Nd %"
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr "Inodes"
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr "INaud"
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr "ILsv"
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr "INd %"
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr "Prijungta prie"
 
-#: src/df.c:383
+#: src/df.c:207
+msgid "File"
+msgstr ""
+
+#: src/df.c:387
 #, c-format
-msgid "option --output: field '%s' unknown"
+msgid "option --output: field %s unknown"
 msgstr ""
 
-#: src/df.c:390
+#: src/df.c:394
 #, fuzzy, c-format
-msgid "option --output: field '%s' used more than once"
+msgid "option --output: field %s used more than once"
 msgstr "perspėjimas: išeities failas %s nurodytas kelis kartus"
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr ""
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr "Laisva"
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr ""
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
 msgstr ""
 
-#: src/df.c:1210
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr ""
+
+#: src/df.c:1384
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
 "or all file systems by default.\n"
 msgstr ""
 
-#: src/df.c:1217
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
 
-#: src/df.c:1227
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -3258,7 +3347,7 @@ msgid ""
 "(default)\n"
 msgstr ""
 
-#: src/df.c:1234
+#: src/df.c:1409
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
 "                               or print all fields if FIELD_LIST is "
@@ -3271,42 +3360,33 @@ msgid ""
 "  -v                    (ignored)\n"
 msgstr ""
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
 
-#: src/df.c:1285
+#: src/df.c:1460
 #, fuzzy, c-format
 msgid "options %s and %s are mutually exclusive"
 msgstr "parametrai specifikuojantys datas spausdinimui išskiria vieni kitus"
 
-#: src/df.c:1335
-#, fuzzy
-msgid "warning: "
-msgstr "DÄ—mesio: "
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr ""
-
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr ""
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr "DÄ—mesio: "
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 msgid "cannot read table of mounted file systems"
 msgstr ""
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr ""
@@ -3316,7 +3396,7 @@ msgstr ""
 msgid "H. Peter Anvin"
 msgstr "H. Peter Anvin"
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr "Naudojimas: %s [PARAMETRAS]... [FAILAS]\n"
@@ -3383,11 +3463,11 @@ msgid ""
 msgstr ""
 
 #: src/dirname.c:59
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/dirname.c:64
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Examples:\n"
@@ -3395,26 +3475,21 @@ msgid ""
 "  %s dir1/str dir2/str  -> \"dir1\" followed by \"dir2\"\n"
 "  %s stdio.h            -> \".\"\n"
 msgstr ""
-"\n"
-"Pavyzdžiai:\n"
-"  %s /usr/bin/sort         Išvedimas „sort“.\n"
-"  %s include/stdio.h .h    Išvedimas „stdio“.\n"
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
 "  or:  %s [OPTION]... --files0-from=F\n"
 msgstr ""
 
-#: src/du.c:274
+#: src/du.c:285
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr ""
 
-#: src/du.c:280
+#: src/du.c:291
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3423,11 +3498,11 @@ msgid ""
 "                          fragmentation, indirect blocks, and the like\n"
 msgstr ""
 
-#: src/du.c:289
+#: src/du.c:300
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3439,17 +3514,18 @@ msgid ""
 "                          --summarize\n"
 msgstr ""
 
-#: src/du.c:302
+#: src/du.c:313
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
 
-#: src/du.c:310
+#: src/du.c:322
 msgid ""
 "  -k                    like --block-size=1K\n"
 "  -L, --dereference     dereference all symbolic links\n"
@@ -3457,16 +3533,17 @@ msgid ""
 "  -m                    like --block-size=1M\n"
 msgstr ""
 
-#: src/du.c:316
+#: src/du.c:328
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
 
-#: src/du.c:322
+#: src/du.c:334
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
 "                          or entries greater than SIZE if negative\n"
@@ -3475,77 +3552,77 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
 msgstr ""
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
 "  -x, --one-file-system    skip directories on different file systems\n"
 msgstr ""
 
-#: src/du.c:386
+#: src/du.c:398
 msgid "Infinity"
 msgstr ""
 
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr ""
-
-#: src/du.c:624
+#: src/du.c:636
 #, fuzzy, c-format
 msgid "fts_read failed: %s"
 msgstr "nepavyko fts_read"
 
-#: src/du.c:780
+#: src/du.c:787
 #, c-format
 msgid "invalid maximum depth %s"
 msgstr ""
 
-#: src/du.c:809
+#: src/du.c:816
 #, fuzzy, c-format
 msgid "invalid --threshold argument '-0'"
 msgstr "netinkamas argumentas %s"
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr ""
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr ""
 
-#: src/du.c:900
+#: src/du.c:911
 #, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr ""
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 msgid "file operands cannot be combined with --files0-from"
 msgstr ""
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr "%s: skaitymo klaida"
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr ""
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 msgid "invalid zero-length file name"
 msgstr ""
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr "viso"
 
@@ -3631,7 +3708,7 @@ msgstr ""
 #: src/env.c:61
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
 
@@ -3702,23 +3779,23 @@ msgid "input line is too long"
 msgstr "įvesties eilutė per ilga"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr "Mike Parker"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr "James Youngman"
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
 "  or:  %s OPTION\n"
 msgstr ""
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -3729,7 +3806,7 @@ msgid ""
 "  ARG1 & ARG2       ARG1 if neither argument is null or 0, otherwise 0\n"
 msgstr ""
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -3740,14 +3817,14 @@ msgid ""
 "  ARG1 > ARG2       ARG1 is greater than ARG2\n"
 msgstr ""
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
 "  ARG1 - ARG2       arithmetic difference of ARG1 and ARG2\n"
 msgstr ""
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -3756,7 +3833,7 @@ msgid ""
 "  ARG1 % ARG2       arithmetic remainder of ARG1 divided by ARG2\n"
 msgstr ""
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -3767,7 +3844,7 @@ msgid ""
 "  length STRING              length of STRING\n"
 msgstr ""
 
-#: src/expr.c:251
+#: src/expr.c:250
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
 "                               keyword like 'match' or an operator like '/'\n"
@@ -3775,7 +3852,7 @@ msgid ""
 "  ( EXPRESSION )             value of EXPRESSION\n"
 msgstr ""
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -3785,7 +3862,7 @@ msgid ""
 "0.\n"
 msgstr ""
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -3793,32 +3870,32 @@ msgid ""
 "or 0, 2 if EXPRESSION is syntactically invalid, and 3 if an error occurred.\n"
 msgstr ""
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, c-format
 msgid "syntax error"
 msgstr "sintaksÄ—s klaida"
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, c-format
 msgid "error in regular expression matcher"
 msgstr ""
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, fuzzy, c-format
 msgid "non-integer argument"
 msgstr "ne skaitinis argumentas"
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr "dalyba iš nulio"
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr "nustatykite LC_ALL='C', kad išvengtumėte problemos"
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, c-format
 msgid "the strings compared were %s and %s"
 msgstr "buvo palygintos eilutÄ—s %s ir %s"
@@ -3828,27 +3905,27 @@ msgstr "buvo palygintos eilutÄ—s %s ir %s"
 msgid "Niels Moller"
 msgstr ""
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
 msgstr ""
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
 msgstr ""
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, c-format
 msgid "%s is not a valid positive integer"
 msgstr ""
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr "%s yra per didelis"
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
@@ -3857,7 +3934,7 @@ msgstr ""
 "Naudojimas: %s [SKAIÄŒIUS]...\n"
 "  arba:  %s PARAMETRAS\n"
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
 "are specified on the command line, read them from standard input.\n"
@@ -3944,28 +4021,28 @@ msgid "invalid number of columns: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr "Padraig Brady"
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, c-format
 msgid "Usage: %s\n"
 msgstr "Naudojimas: %s\n"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
 msgstr ""
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, c-format
 msgid "failed to get groups for user %s"
 msgstr ""
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, fuzzy, c-format
 msgid "failed to get groups for the current process"
 msgstr "Nepavyko pakeisti %s grupės į %s\n"
@@ -3987,22 +4064,22 @@ msgid ""
 "the current process (which may differ if the groups database has changed).\n"
 msgstr ""
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, fuzzy, c-format
 msgid "cannot get real UID"
 msgstr "negalima nustatyti datos"
 
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, fuzzy, c-format
 msgid "cannot get effective GID"
 msgstr "negalima nuimti rodyklÄ—s nuo %s"
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, fuzzy, c-format
 msgid "cannot get real GID"
 msgstr "negalima nustatyti datos"
 
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, fuzzy, c-format
 msgid "%s: no such user"
 msgstr "%s: nÄ—ra tokio naudotojo"
@@ -4038,58 +4115,48 @@ msgid ""
 "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n"
 msgstr ""
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr ""
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, c-format
 msgid "%s: number of bytes is too large"
 msgstr ""
 
-#: src/head.c:440
-#, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr ""
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr ""
 
-#: src/head.c:673
-#, fuzzy, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "nepavyko pašalinti %s"
-
-#: src/head.c:798
+#: src/head.c:423 src/tail.c:457
 #, c-format
-msgid "cannot reposition file pointer for %s"
+msgid "%s: cannot seek to relative offset %s"
 msgstr ""
 
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr ""
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr "eilu�ių skai�ius"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr "baitų skai�ius"
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr ""
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr ""
 
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, c-format
 msgid "invalid trailing option -- %c"
 msgstr ""
@@ -4127,146 +4194,162 @@ msgid "cannot determine hostname"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr ""
 
-#: src/id.c:81
-#, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
-msgstr "Naudojimas: %s [PARAMETRAS]... [NAUDOTOJOVARDAS]\n"
+#: src/id.c:84
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]... [USER]\n"
+msgstr "Naudojimas: %s [PARAMETRAS]... [NAUDOTOJAS]...\n"
 
-#: src/id.c:82
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
 msgstr ""
 
-#: src/id.c:96
+#: src/id.c:90
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
+msgstr ""
+
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
 msgstr ""
 
-#: src/id.c:140
+#: src/id.c:151
+#, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr ""
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr ""
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr ""
 
-#: src/id.c:178
+#: src/id.c:198
 #, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr ""
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr ""
 
-#: src/id.c:199
+#: src/id.c:209
+#, c-format
+msgid "option --zero not permitted in default format"
+msgstr ""
+
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
 msgstr ""
 
-#: src/id.c:224
+#: src/id.c:265
 #, fuzzy, c-format
 msgid "cannot get effective UID"
 msgstr "negalima nuimti rodyklÄ—s nuo %s"
 
-#: src/id.c:311
+#: src/id.c:354
 #, fuzzy, c-format
 msgid "cannot find name for user ID %s"
 msgstr "negalima palyginti failų vardų %s ir %s"
 
-#: src/id.c:329
+#: src/id.c:372
 #, fuzzy, c-format
 msgid "uid=%s"
 msgstr "uid=%lu"
 
-#: src/id.c:334
+#: src/id.c:377
 #, c-format
 msgid " gid=%s"
 msgstr ""
 
-#: src/id.c:341
+#: src/id.c:384
 #, fuzzy, c-format
 msgid " euid=%s"
 msgstr "uid=%lu"
 
-#: src/id.c:349
+#: src/id.c:392
 #, c-format
 msgid " egid=%s"
 msgstr ""
 
-#: src/id.c:377
+#: src/id.c:421
 #, fuzzy
 msgid " groups="
 msgstr " grupÄ—s="
 
-#: src/id.c:393
+#: src/id.c:437
 #, fuzzy, c-format
 msgid " context=%s"
 msgstr "nepavyksta įvykdyti %s"
 
-#: src/install.c:373
+#: src/install.c:376
 #, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr ""
 
-#: src/install.c:414
+#: src/install.c:417
 #, c-format
 msgid "creating directory %s"
 msgstr "kuriamas aplankas %s"
 
-#: src/install.c:482
+#: src/install.c:485
 #, c-format
 msgid "cannot change ownership of %s"
 msgstr ""
 
-#: src/install.c:506
+#: src/install.c:509
 #, c-format
 msgid "cannot set time stamps for %s"
 msgstr ""
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, c-format
 msgid "fork system call failed"
 msgstr ""
 
-#: src/install.c:531
+#: src/install.c:535
 #, c-format
 msgid "cannot run %s"
 msgstr "nepavyksta paleisti %s"
 
-#: src/install.c:535
+#: src/install.c:539
 #, c-format
 msgid "waiting for strip"
 msgstr ""
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr ""
 
-#: src/install.c:558
+#: src/install.c:565
 #, c-format
 msgid "invalid user %s"
 msgstr "netinkamas naudotojas %s"
 
-#: src/install.c:594
+#: src/install.c:601
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -4275,7 +4358,7 @@ msgid ""
 "  or:  %s [OPTION]... -d DIRECTORY...\n"
 msgstr ""
 
-#: src/install.c:601
+#: src/install.c:608
 msgid ""
 "\n"
 "This install program copies files (often just compiled) into destination\n"
@@ -4289,7 +4372,7 @@ msgid ""
 "In the 4th form, create all components of the given DIRECTORY(ies).\n"
 msgstr ""
 
-#: src/install.c:615
+#: src/install.c:622
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
 "  -b                  like --backup but does not accept an argument\n"
@@ -4301,7 +4384,7 @@ msgid ""
 "                        components of the specified directories\n"
 msgstr ""
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -4313,7 +4396,7 @@ msgid ""
 "  -o, --owner=OWNER   set ownership (super-user only)\n"
 msgstr ""
 
-#: src/install.c:631
+#: src/install.c:638
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
 "files\n"
@@ -4327,60 +4410,57 @@ msgid ""
 "  -v, --verbose       print the name of each directory as it is created\n"
 msgstr ""
 
-#: src/install.c:641
+#: src/install.c:648
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
 
-#: src/install.c:859
+#: src/install.c:696 src/unlink.c:86
 #, c-format
-msgid ""
-"WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
+msgid "cannot unlink %s"
 msgstr ""
 
-#: src/install.c:869
+#: src/install.c:877
 #, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
+msgid ""
+"WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
 msgstr ""
 
-#: src/install.c:886
+#: src/install.c:917
 #, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr ""
 
-#: src/install.c:889
+#: src/install.c:920
 #, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr ""
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr ""
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, c-format
 msgid "invalid mode %s"
 msgstr "netinkamos teisÄ—s %s"
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr ""
 
-#: src/install.c:959
+#: src/install.c:1001
 #, fuzzy, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr "parametrai specifikuojantys datas spausdinimui išskiria vieni kitus"
 
-#: src/install.c:966
+#: src/install.c:1008
 #, fuzzy, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr "parametrai specifikuojantys datas spausdinimui išskiria vieni kitus"
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -4392,7 +4472,7 @@ msgstr ""
 msgid "Mike Haertel"
 msgstr "Mike Haertel"
 
-#: src/join.c:191
+#: src/join.c:195
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
 "standard output.  The default join field is the first, delimited\n"
@@ -4403,7 +4483,7 @@ msgid ""
 "  -e EMPTY          replace missing input fields with EMPTY\n"
 msgstr ""
 
-#: src/join.c:200
+#: src/join.c:204
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
 "  -j FIELD          equivalent to '-1 FIELD -2 FIELD'\n"
@@ -4411,7 +4491,7 @@ msgid ""
 "  -t CHAR           use CHAR as input and output field separator\n"
 msgstr ""
 
-#: src/join.c:206
+#: src/join.c:210
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
 "  -1 FIELD          join on this FIELD of file 1\n"
@@ -4423,7 +4503,11 @@ msgid ""
 "                      print them without trying to pair them\n"
 msgstr ""
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr ""
+
+#: src/join.c:225
 msgid ""
 "\n"
 "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n"
@@ -4442,47 +4526,47 @@ msgid ""
 "warning message will be given.\n"
 msgstr ""
 
-#: src/join.c:403
+#: src/join.c:410
 #, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
 msgstr ""
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, c-format
 msgid "invalid field number: %s"
 msgstr ""
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, c-format
 msgid "invalid field specifier: %s"
 msgstr ""
 
-#: src/join.c:877
+#: src/join.c:884
 #, c-format
 msgid "invalid file number in field spec: %s"
 msgstr ""
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr ""
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr ""
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, c-format
 msgid "multi-character tab %s"
 msgstr ""
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr ""
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr ""
@@ -4584,47 +4668,47 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr ""
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr ""
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, c-format
 msgid "%s: cannot overwrite directory"
 msgstr "%s: nepavyksta perrašyti aplanko"
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
 msgstr "%s: pakeisti %s? "
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, fuzzy, c-format
 msgid "failed to create symbolic link %s"
 msgstr "negaliu sukurti simbolinÄ—s nuorodos %s"
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, fuzzy, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr "nepavyksta susieti %s su %s"
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, fuzzy, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr "nepavyko sukurti kietosios nuorodos %s į %s"
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, fuzzy, c-format
 msgid "failed to create hard link %s"
 msgstr "nepavyko sukurti kietosios nuorodos %s į %s"
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, fuzzy, c-format
 msgid "failed to create hard link %s => %s"
 msgstr "nepavyko sukurti kietosios nuorodos %s į %s"
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -4633,7 +4717,7 @@ msgid ""
 "  or:  %s [OPTION]... -t DIRECTORY TARGET...  (4th form)\n"
 msgstr ""
 
-#: src/ln.c:381
+#: src/ln.c:398
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
 "In the 2nd form, create a link to TARGET in the current directory.\n"
@@ -4645,7 +4729,7 @@ msgid ""
 "interpreted in relation to its parent directory.\n"
 msgstr ""
 
-#: src/ln.c:394
+#: src/ln.c:411
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
 "file\n"
@@ -4658,7 +4742,7 @@ msgid ""
 "  -f, --force                 remove existing destination files\n"
 msgstr ""
 
-#: src/ln.c:402
+#: src/ln.c:419
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
 "  -L, --logical               dereference TARGETs that are symbolic links\n"
@@ -4670,7 +4754,7 @@ msgid ""
 "  -s, --symbolic              make symbolic links instead of hard links\n"
 msgstr ""
 
-#: src/ln.c:411
+#: src/ln.c:428
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
 "  -t, --target-directory=DIRECTORY  specify the DIRECTORY in which to "
@@ -4680,7 +4764,7 @@ msgid ""
 "  -v, --verbose               print name of each linked file\n"
 msgstr ""
 
-#: src/ln.c:433
+#: src/ln.c:450
 #, c-format
 msgid ""
 "\n"
@@ -4688,13 +4772,13 @@ msgid ""
 "behavior when a TARGET is a symbolic link, defaulting to %s.\n"
 msgstr ""
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, fuzzy, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr ""
 "Negalima suderinti --target-directory (-t) ir --no-target-directory (-T)"
 
-#: src/ln.c:588
+#: src/ln.c:605
 #, fuzzy, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr "negaliu sukurti simbolinÄ—s nuorodos %s"
@@ -4727,7 +4811,7 @@ msgstr ""
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 msgid "%b %e  %Y"
 msgstr "%Y-%m-%d"
 
@@ -4736,101 +4820,101 @@ msgstr "%Y-%m-%d"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 msgid "%b %e %H:%M"
 msgstr "%Y-%m-%d %H:%M"
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr ""
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr ""
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr ""
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, c-format
 msgid "invalid line width: %s"
 msgstr ""
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, c-format
 msgid "invalid tab size: %s"
 msgstr ""
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, c-format
 msgid "invalid time style format %s"
 msgstr ""
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 #, fuzzy
 msgid "Valid arguments are:\n"
 msgstr "Galimi argumentai:"
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr ""
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr ""
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, c-format
 msgid "unrecognized prefix: %s"
 msgstr "neatpažintas priešdėlis: %s"
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr ""
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, c-format
 msgid "cannot open directory %s"
 msgstr "nepavyko atverti aplanko %s"
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, c-format
 msgid "cannot determine device and inode of %s"
 msgstr ""
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, c-format
 msgid "%s: not listing already-listed directory"
 msgstr ""
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, c-format
 msgid "reading directory %s"
 msgstr "skaitomas aplankas %s"
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, c-format
 msgid "closing directory %s"
 msgstr "užveriamas aplankas %s"
 
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, c-format
 msgid "cannot compare file names %s and %s"
 msgstr "negalima palyginti failų vardų %s ir %s"
 
-#: src/ls.c:4721
+#: src/ls.c:4781
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
 "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n"
 msgstr ""
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
 "  -A, --almost-all           do not list implied . and ..\n"
@@ -4839,33 +4923,32 @@ msgid ""
 "characters\n"
 msgstr ""
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
 "  -F, --classify             append indicator (one of */=>@|) to entries\n"
@@ -4875,40 +4958,41 @@ msgid ""
 "      --full-time            like -l --time-style=full-iso\n"
 msgstr ""
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr ""
 
-#: src/ls.c:4763
+#: src/ls.c:4823
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 
-#: src/ls.c:4769
+#: src/ls.c:4829
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
 
-#: src/ls.c:4775
+#: src/ls.c:4835
 msgid ""
 "  -H, --dereference-command-line\n"
 "                             follow symbolic links listed on the command "
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
 msgstr ""
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
 "names:\n"
@@ -4917,10 +5001,10 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -4930,7 +5014,7 @@ msgid ""
 "entries\n"
 msgstr ""
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -4941,11 +5025,11 @@ msgid ""
 "                             append / indicator to directories\n"
 msgstr ""
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -4953,7 +5037,7 @@ msgid ""
 "escape\n"
 msgstr ""
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
 "  -R, --recursive            list subdirectories recursively\n"
@@ -4961,56 +5045,59 @@ msgid ""
 "blocks\n"
 msgstr ""
 
-#: src/ls.c:4825
+#: src/ls.c:4886
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 
-#: src/ls.c:4835
+#: src/ls.c:4896
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
 msgstr ""
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 msgid ""
 "  -t                         sort by modification time, newest first\n"
 "  -T, --tabsize=COLS         assume tab stops at each COLS instead of 8\n"
 msgstr ""
 
-#: src/ls.c:4848
+#: src/ls.c:4912
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
 msgstr ""
 
-#: src/ls.c:4855
+#: src/ls.c:4919
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -5019,7 +5106,7 @@ msgid ""
 "variable can change the settings.  Use the dircolors command to set it.\n"
 msgstr ""
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -5085,19 +5172,16 @@ msgstr ""
 #: src/md5sum.c:195
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, c-format
 msgid ""
 "\n"
@@ -5107,35 +5191,35 @@ msgid ""
 "space for text), and name for each FILE.\n"
 msgstr ""
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, c-format
 msgid "%s: too many checksum lines"
 msgstr ""
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr ""
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr ""
 
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr "NEPAVYKO"
 
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr "OK"
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr ""
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
@@ -5143,7 +5227,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
@@ -5151,7 +5235,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
@@ -5159,108 +5243,134 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
 msgstr ""
 
-#: src/md5sum.c:766
+#: src/md5sum.c:770
 #, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr ""
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
 msgstr ""
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr ""
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr ""
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr ""
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr ""
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr "Naudojimas: %s [PARAMETRAS]... APLANKAS...\n"
 
-#: src/mkdir.c:57
+#: src/mkdir.c:59
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
 msgstr ""
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 
-#: src/mkdir.c:168
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/mkdir.c:127 src/mkdir.c:172
+#, fuzzy, c-format
+msgid "failed to set default creation context for %s"
+msgstr "nepavyko gauti %s parametrų"
+
+#: src/mkdir.c:191
+#, fuzzy, c-format
+msgid "failed to restore context for %s"
+msgstr "nepavyko išlaikyti %s laikų"
+
+#: src/mkdir.c:231
 #, c-format
 msgid "created directory %s"
 msgstr "sukurtas aplankas %s"
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr ""
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr "Naudojimas: %s [PARAMETRAS]... PAVADINIMAS?...\n"
 
-#: src/mkfifo.c:52
+#: src/mkfifo.c:54
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
 msgstr ""
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
 msgstr ""
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, c-format
 msgid "invalid mode"
 msgstr "netaisyklinga veiksena"
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr ""
 
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
+#, fuzzy, c-format
+msgid "cannot set permissions of %s"
+msgstr "neįmanoma pakeisti %s teisių"
+
+#: src/mknod.c:54
 #, c-format
 msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr ""
 
-#: src/mknod.c:54
+#: src/mknod.c:56
 msgid "Create the special file NAME of the given TYPE.\n"
 msgstr ""
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr ""
-
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -5269,7 +5379,7 @@ msgid ""
 "otherwise, as decimal.  TYPE may be:\n"
 msgstr ""
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 msgid ""
 "\n"
 "  b      create a block (buffered) special file\n"
@@ -5277,148 +5387,142 @@ msgid ""
 "  p      create a FIFO\n"
 msgstr ""
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 msgid "Special files require major and minor device numbers."
 msgstr ""
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 msgid "Fifos do not have major and minor device numbers."
 msgstr ""
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, c-format
 msgid "block special files not supported"
 msgstr ""
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, c-format
 msgid "character special files not supported"
 msgstr ""
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, c-format
 msgid "invalid major device number %s"
 msgstr ""
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, c-format
 msgid "invalid minor device number %s"
 msgstr ""
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, c-format
 msgid "invalid device %s %s"
 msgstr ""
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, c-format
 msgid "invalid device type %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr ""
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr "Naudojimas: %s [PARAMETRAS]... [Å ABLONAS]\n"
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
 "TEMPLATE must contain at least 3 consecutive 'X's in last component.\n"
 "If TEMPLATE is not specified, use tmp.XXXXXXXXXX, and --tmpdir is implied.\n"
 msgstr ""
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
 "  -q, --quiet         suppress diagnostics about file/dir-creation failure\n"
 msgstr ""
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
 msgstr ""
 
-#: src/mktemp.c:223
-#, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr ""
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, c-format
 msgid "too many templates"
 msgstr "per daug šablonų"
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr ""
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr ""
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr ""
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr ""
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr ""
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, c-format
 msgid "failed to create directory via template %s"
 msgstr ""
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, c-format
 msgid "failed to create file via template %s"
 msgstr ""
 
-#: src/mv.c:292
+#: src/mv.c:294
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 
-#: src/mv.c:298
+#: src/mv.c:300
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
 "file\n"
@@ -5431,7 +5535,7 @@ msgid ""
 "effect.\n"
 msgstr ""
 
-#: src/mv.c:307
+#: src/mv.c:309
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
@@ -5439,7 +5543,7 @@ msgid ""
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
 msgstr ""
 
-#: src/mv.c:312
+#: src/mv.c:314
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
 "DIRECTORY\n"
@@ -5448,6 +5552,8 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
 
 #: src/nice.c:72
@@ -5691,95 +5797,90 @@ msgid "%s: invalid number to ignore"
 msgstr "%s: netaisyklingas skai�ius"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
 msgstr ""
 
-#: src/numfmt.c:676
+#: src/numfmt.c:659
 #, c-format
-msgid "value too large to be converted: '%s'"
+msgid "value too large to be converted: %s"
 msgstr ""
 
-#: src/numfmt.c:680
+#: src/numfmt.c:663
 #, fuzzy, c-format
-msgid "invalid number: '%s'"
+msgid "invalid number: %s"
 msgstr "netinkamas naudotojas %s"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
+msgid "rejecting suffix in input: %s (consider using --from)"
 msgstr ""
 
-#: src/numfmt.c:688
+#: src/numfmt.c:671
 #, fuzzy, c-format
-msgid "invalid suffix in input: '%s'"
+msgid "invalid suffix in input: %s"
 msgstr "netinkama įvestis"
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
 msgstr ""
 
-#: src/numfmt.c:723
+#: src/numfmt.c:722 src/numfmt.c:768
 #, fuzzy, c-format
 msgid "failed to prepare value '%Lf' for printing"
-msgstr "nepavyksta atverti %s rašymui"
+msgstr "nepavyko išlaikyti %s laikų"
 
-#: src/numfmt.c:787
+#: src/numfmt.c:791
 #, fuzzy, c-format
-msgid "invalid unit size: '%s'"
+msgid "invalid unit size: %s"
 msgstr "netinkamas naudotojas %s"
 
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
-#, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr ""
-
-#: src/numfmt.c:813
+#: src/numfmt.c:814
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
 msgstr "Naudojimas: %s [PARAMETRAS]... [NAUDOTOJAS]...\n"
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
 msgstr ""
 
-#: src/numfmt.c:820
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
 msgstr ""
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
 msgstr ""
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
 "                         see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr ""
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
@@ -5787,19 +5888,19 @@ msgid ""
 "locale)\n"
 msgstr ""
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
 msgstr ""
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
 msgstr ""
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -5809,40 +5910,40 @@ msgid ""
 "                         is found\n"
 msgstr ""
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
 "nearest\n"
 msgstr ""
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
 msgstr ""
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr ""
 
-#: src/numfmt.c:877
+#: src/numfmt.c:878
 msgid ""
 "\n"
 "UNIT options:\n"
 msgstr ""
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr ""
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -5851,7 +5952,7 @@ msgid ""
 "               1Mi = 1048576,\n"
 msgstr ""
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
@@ -5859,7 +5960,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
@@ -5867,7 +5968,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
@@ -5875,18 +5976,18 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:905
+#: src/numfmt.c:906
 #, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -5898,7 +5999,7 @@ msgid ""
 "errors are not diagnosed and the exit status is 0.\n"
 msgstr ""
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -5919,112 +6020,112 @@ msgid ""
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 msgstr ""
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, c-format
 msgid "format %s has no %% directive"
 msgstr "formatas %s neturi %% direktyvos"
 
-#: src/numfmt.c:990
+#: src/numfmt.c:1003
 #, fuzzy, c-format
 msgid "invalid format %s (width overflow)"
 msgstr "netaisyklingas datos formatas %s"
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1008
 #, c-format
-msgid "format %s ends in %%"
+msgid "--format padding overridding --padding"
 msgstr ""
 
-#: src/numfmt.c:1010
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
+msgid "format %s ends in %%"
 msgstr ""
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1030
 #, c-format
-msgid "format %s has too many %% directives"
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
 msgstr ""
 
-#: src/numfmt.c:1070
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
-msgid "invalid suffix in input '%s': '%s'"
+msgid "format %s has too many %% directives"
 msgstr ""
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1081
+#, fuzzy, c-format
+msgid "invalid suffix in input %s: %s"
+msgstr "netaisyklingas argumentas %s %s"
+
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
 msgstr ""
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
 msgstr ""
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
+msgid "large input value %s: possible precision loss"
 msgstr ""
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
 
-#: src/numfmt.c:1388
+#: src/numfmt.c:1403
 #, fuzzy, c-format
-msgid "invalid padding value '%s'"
+msgid "invalid padding value %s"
 msgstr "netinkamas argumentas %s"
 
-#: src/numfmt.c:1401
+#: src/numfmt.c:1417
 #, fuzzy, c-format
-msgid "invalid field value '%s'"
+msgid "invalid field value %s"
 msgstr "klaidinga data %s"
 
-#: src/numfmt.c:1430
+#: src/numfmt.c:1447
 #, fuzzy, c-format
-msgid "invalid header value '%s'"
+msgid "invalid header value %s"
 msgstr "klaidinga data %s"
 
-#: src/numfmt.c:1456
+#: src/numfmt.c:1473
 #, c-format
 msgid "--grouping cannot be combined with --format"
 msgstr ""
 
-#: src/numfmt.c:1458
-#, c-format
-msgid "--padding cannot be combined with --format"
-msgstr ""
-
-#: src/numfmt.c:1463
+#: src/numfmt.c:1478
 #, c-format
 msgid "no conversion option specified"
 msgstr ""
 
-#: src/numfmt.c:1471
+#: src/numfmt.c:1486
 #, c-format
 msgid "grouping cannot be combined with --to"
 msgstr ""
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
 msgstr ""
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
 msgstr ""
 
-#: src/numfmt.c:1511
+#: src/numfmt.c:1526
 #, fuzzy, c-format
 msgid "error reading input"
 msgstr "klaida skaitant %s"
 
-#: src/numfmt.c:1520
-#, fuzzy, c-format
+#: src/numfmt.c:1535
+#, c-format
 msgid "failed to convert some of the input numbers"
-msgstr "nepavyko užverti aplanko %s"
+msgstr ""
 
-#: src/od.c:294
+#: src/od.c:320
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -6033,7 +6134,7 @@ msgid ""
 "[b]]\n"
 msgstr ""
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -6043,7 +6144,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/od.c:307
+#: src/od.c:333
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
 "if the last operand begins with + or (if there are 2 operands) a digit.\n"
@@ -6053,38 +6154,40 @@ msgid ""
 "suffixes may be . for octal and b for multiply by 512.\n"
 msgstr ""
 
-#: src/od.c:318
+#: src/od.c:344
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
 
-#: src/od.c:323
+#: src/od.c:350
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
 
-#: src/od.c:336
+#: src/od.c:363
 msgid ""
 "\n"
 "\n"
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 
-#: src/od.c:345
+#: src/od.c:372
 msgid ""
 "  -f   same as -t fF, select floats\n"
 "  -i   same as -t dI, select decimal ints\n"
@@ -6094,16 +6197,16 @@ msgid ""
 "  -x   same as -t x2, select hexadecimal 2-byte units\n"
 msgstr ""
 
-#: src/od.c:353
+#: src/od.c:380
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -6112,7 +6215,7 @@ msgid ""
 "  x[SIZE]    hexadecimal, SIZE bytes per integer\n"
 msgstr ""
 
-#: src/od.c:367
+#: src/od.c:394
 msgid ""
 "\n"
 "SIZE is a number.  For TYPE in [doux], SIZE may also be C for\n"
@@ -6121,14 +6224,14 @@ msgid ""
 "for sizeof(double) or L for sizeof(long double).\n"
 msgstr ""
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
 "each output line.\n"
 msgstr ""
 
-#: src/od.c:379
+#: src/od.c:406
 msgid ""
 "\n"
 "\n"
@@ -6141,55 +6244,55 @@ msgid ""
 "and so on for G, T, P, E, Z, Y.\n"
 msgstr ""
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, c-format
 msgid "invalid type string %s"
 msgstr ""
 
-#: src/od.c:649
+#: src/od.c:690
 #, c-format
 msgid ""
 "invalid type string %s;\n"
 "this system doesn't provide a %lu-byte integral type"
 msgstr ""
 
-#: src/od.c:770
+#: src/od.c:811
 #, c-format
 msgid ""
 "invalid type string %s;\n"
 "this system doesn't provide a %lu-byte floating point type"
 msgstr ""
 
-#: src/od.c:828
+#: src/od.c:869
 #, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr ""
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr ""
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr ""
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr ""
 
-#: src/od.c:1810
+#: src/od.c:1863
 msgid "compatibility mode supports at most one file"
 msgstr ""
 
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr ""
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr ""
@@ -6340,12 +6443,12 @@ msgstr "Kada"
 msgid "Where"
 msgstr "Kur"
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr "Naudojimas: %s [PARAMETRAS]... [NAUDOTOJAS]...\n"
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -6355,7 +6458,7 @@ msgid ""
 "  -s              do short format output, this is the default\n"
 msgstr ""
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -6364,7 +6467,7 @@ msgid ""
 "                  in short format\n"
 msgstr ""
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, c-format
 msgid ""
 "\n"
@@ -6372,7 +6475,7 @@ msgid ""
 "The utmp file will be %s.\n"
 msgstr ""
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr ""
@@ -6539,12 +6642,13 @@ msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
 
-#: src/pr.c:2827
+#: src/pr.c:2828
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
 "                    separate columns by STRING,\n"
@@ -6554,7 +6658,7 @@ msgid ""
 "  -t, --omit-header  omit page headers and trailers\n"
 msgstr ""
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 msgid ""
 "  -T, --omit-pagination\n"
 "                    omit page headers and trailers, eliminate any "
@@ -6568,7 +6672,7 @@ msgid ""
 "(72)\n"
 msgstr ""
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
 "                    set page width to PAGE_WIDTH (72) characters always,\n"
@@ -6577,7 +6681,7 @@ msgid ""
 "                    with -S or -s\n"
 msgstr ""
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 #, fuzzy
 msgid ""
 "\n"
@@ -6597,7 +6701,7 @@ msgid ""
 msgstr ""
 
 #: src/printenv.c:69
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/printf.c:79
@@ -6701,32 +6805,32 @@ msgstr ""
 msgid "F. Pinard"
 msgstr "F. Pinard"
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, c-format
 msgid "%s (for regexp %s)"
 msgstr ""
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
 "  or:  %s -G [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr ""
 
-#: src/ptx.c:1821
+#: src/ptx.c:1824
 msgid ""
 "Output a permuted index, including context, of the words in the input "
 "files.\n"
 msgstr ""
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
 "  -G, --traditional              behave more like System V 'ptx'\n"
 "  -F, --flag-truncation=STRING   use STRING for flagging line truncations\n"
 msgstr ""
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
 "  -O, --format=roff              generate output as roff directives\n"
@@ -6735,7 +6839,7 @@ msgid ""
 "  -T, --format=tex               generate output as TeX directives\n"
 msgstr ""
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -6745,7 +6849,7 @@ msgid ""
 "  -o, --only-file=FILE           read only word list from this FILE\n"
 msgstr ""
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -6753,16 +6857,16 @@ msgid ""
 "excluded\n"
 msgstr ""
 
-#: src/ptx.c:1854
+#: src/ptx.c:1857
 #, fuzzy
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
 "\n"
 "Kai nenurodytas FAILAS, arba FAILAS yra -, nuskaityti standartinę įvestį.\n"
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, c-format
 msgid "invalid gap width: %s"
 msgstr ""
@@ -6779,22 +6883,28 @@ msgid ""
 "  -P, --physical  avoid all symlinks\n"
 msgstr ""
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+
+#: src/pwd.c:169
 #, c-format
 msgid "failed to chdir to %s"
 msgstr ""
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, c-format
 msgid "failed to stat %s"
 msgstr ""
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr ""
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, c-format
 msgid "ignoring non-option arguments"
 msgstr ""
@@ -6804,8 +6914,8 @@ msgstr ""
 msgid "Dmitry V. Levin"
 msgstr "Dmitry V. Levin"
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Naudojimas: %s [PARAMETRAS]... FAILAS...\n"
@@ -6839,8 +6949,7 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/readlink.c:152
@@ -6865,7 +6974,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 
@@ -6883,41 +6992,42 @@ msgstr ""
 msgid "%s: descend into directory %s? "
 msgstr ""
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr "%s: pašalinti apsaugotą nuo rašymo %s %s? "
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, c-format
 msgid "%s: remove %s %s? "
 msgstr "%s: pašalinti %s %s? "
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, c-format
 msgid "removed directory: %s\n"
 msgstr "Å¡alinamas aplankas: %s\n"
 
-#: src/remove.c:444
+#: src/remove.c:447
 #, fuzzy, c-format
-msgid "cannot remove directory: %s"
-msgstr "nepavyko pašalinti aplanko %s"
+msgid "refusing to remove %s or %s directory: skipping %s"
+msgstr "nepavyksta pašalinti %s aplanko %s"
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr ""
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, fuzzy, c-format
 msgid "traversal failed: %s"
 msgstr "nepavyko fts_read"
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -6942,12 +7052,12 @@ msgstr ""
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 
 #: src/rm.c:149
@@ -6994,14 +7104,20 @@ msgid ""
 msgstr ""
 
 #: src/rm.c:342
-#, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr "%s: rekursyviai pašalinti visus argumentus? "
+#, fuzzy, c-format
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] "%s: rekursyviai pašalinti visus argumentus? "
+msgstr[1] "%s: rekursyviai pašalinti visus argumentus? "
+msgstr[2] "%s: rekursyviai pašalinti visus argumentus? "
 
-#: src/rm.c:343
-#, c-format
-msgid "%s: remove all arguments? "
-msgstr "%s: pašalinti visus argumentus? "
+#: src/rm.c:345
+#, fuzzy, c-format
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] "%s: pašalinti visus argumentus? "
+msgstr[1] "%s: pašalinti visus argumentus? "
+msgstr[2] "%s: pašalinti visus argumentus? "
 
 #: src/rmdir.c:134 src/rmdir.c:233
 #, c-format
@@ -7044,7 +7160,7 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
 
@@ -7094,41 +7210,46 @@ msgstr ""
 msgid "no command specified"
 msgstr ""
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr ""
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, c-format
 msgid "failed to compute a new context"
 msgstr ""
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, c-format
 msgid "failed to set new user %s"
 msgstr ""
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, c-format
 msgid "failed to set new type %s"
 msgstr ""
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, c-format
 msgid "failed to set new range %s"
 msgstr ""
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, c-format
 msgid "failed to set new role %s"
 msgstr ""
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, c-format
 msgid "unable to set security context %s"
 msgstr ""
 
+#: src/selinux.c:127 src/selinux.c:300
+#, fuzzy, c-format
+msgid "error canonicalizing %s"
+msgstr "klaida skaitant %s"
+
 #: src/seq.c:68
 #, c-format
 msgid ""
@@ -7153,97 +7274,47 @@ msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
 msgstr ""
 
-#: src/seq.c:94
+#: src/seq.c:96
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
 "it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n"
 "decimal numbers with maximum precision PREC, and to %g otherwise.\n"
 msgstr ""
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, c-format
 msgid "invalid floating point argument: %s"
 msgstr ""
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr "formatas %s turi nežinomą %%%c direktyvą"
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr ""
 
-#: src/setuidgid.c:49
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-"Naudojimas: %s KOMANDA [ARG]...\n"
-"  arba:  %s PARAMETRAS\n"
-
-#: src/setuidgid.c:55
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr "nežinomas naudotojo-ID: %s"
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr ""
-
-#: src/setuidgid.c:190
-#, c-format
-msgid "failed to set supplemental group(s)"
-msgstr ""
-
-#: src/setuidgid.c:200
-#, c-format
-msgid "cannot set group-ID to %lu"
-msgstr ""
-
-#: src/setuidgid.c:204
-#, c-format
-msgid "cannot set user-ID to %lu"
-msgstr ""
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr "Colin Plumb"
 
-#: src/shred.c:148
+#: src/shred.c:170
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
 "for even very expensive hardware probing to recover the data.\n"
 msgstr ""
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -7252,28 +7323,32 @@ msgid ""
 "  -s, --size=N   shred this many bytes (suffixes like K, M, G accepted)\n"
 msgstr ""
 
-#: src/shred.c:161
+#: src/shred.c:183
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
 "  -z, --zero     add a final overwrite with zeros to hide shredding\n"
 msgstr ""
 
-#: src/shred.c:170
+#: src/shred.c:192
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -7284,7 +7359,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -7296,7 +7371,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -7305,7 +7380,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -7317,134 +7392,134 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:215
+#: src/shred.c:241
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
 "of the file that cannot be removed, and that will allow a shredded file\n"
 "to be recovered later.\n"
 msgstr ""
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, c-format
 msgid "%s: fdatasync failed"
 msgstr ""
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr ""
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr ""
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr ""
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, c-format
 msgid "%s: error writing at offset %s"
 msgstr ""
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, c-format
 msgid "%s: lseek failed"
 msgstr ""
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, c-format
 msgid "%s: file too large"
 msgstr "%s: failas per didelis"
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr ""
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr ""
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, c-format
 msgid "%s: fstat failed"
 msgstr ""
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, c-format
 msgid "%s: invalid file type"
 msgstr ""
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr ""
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, c-format
 msgid "%s: error truncating"
 msgstr ""
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, c-format
 msgid "%s: fcntl failed"
 msgstr ""
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr ""
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr "%s: Å¡alinama"
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, c-format
 msgid "%s: renamed to %s"
 msgstr ""
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, c-format
 msgid "%s: failed to remove"
 msgstr ""
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr "%s: pašalinta"
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, c-format
 msgid "%s: failed to close"
 msgstr ""
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, c-format
 msgid "%s: failed to open for writing"
 msgstr ""
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, c-format
 msgid "%s: invalid number of passes"
 msgstr ""
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, c-format
 msgid "multiple random sources specified"
 msgstr ""
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, c-format
 msgid "%s: invalid file size"
 msgstr "%s: blogas failo dydis"
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -7452,11 +7527,11 @@ msgid ""
 "  or:  %s -i LO-HI [OPTION]...\n"
 msgstr ""
 
-#: src/shuf.c:54
+#: src/shuf.c:67
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr ""
 
-#: src/shuf.c:60
+#: src/shuf.c:73
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
 "  -i, --input-range=LO-HI   treat each number LO through HI as an input "
@@ -7464,34 +7539,44 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
 msgstr ""
 
-#: src/shuf.c:244
+#: src/shuf.c:228
+#, fuzzy, c-format
+msgid "too many input lines"
+msgstr "per daug šablonų"
+
+#: src/shuf.c:431
 #, c-format
 msgid "multiple -i options specified"
 msgstr ""
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, c-format
 msgid "invalid input range %s"
 msgstr ""
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, c-format
 msgid "invalid line count %s"
 msgstr ""
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, c-format
 msgid "multiple output files specified"
 msgstr ""
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, c-format
 msgid "cannot combine -e and -i options"
 msgstr ""
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr ""
+
 #: src/sleep.c:44
 #, c-format
 msgid ""
@@ -7506,30 +7591,30 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, c-format
 msgid "invalid time interval %s"
 msgstr ""
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr ""
 
-#: src/sort.c:399
+#: src/sort.c:427
 #, fuzzy
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr ""
 "Spausdinti pasirinktas eilutes ekrane iš kiekvieno FAILO.\n"
 "\n"
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
 msgstr ""
 
-#: src/sort.c:409
+#: src/sort.c:437
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
 "  -d, --dictionary-order      consider only blanks and alphanumeric "
@@ -7537,19 +7622,19 @@ msgid ""
 "  -f, --ignore-case           fold lower case to upper case characters\n"
 msgstr ""
 
-#: src/sort.c:415
+#: src/sort.c:443
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
 "  -i, --ignore-nonprinting    consider only printable characters\n"
 "  -M, --month-sort            compare (unknown) < 'JAN' < ... < 'DEC'\n"
 msgstr ""
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 
-#: src/sort.c:423
+#: src/sort.c:451
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
 "  -R, --random-sort           sort by random hash of keys\n"
@@ -7557,7 +7642,7 @@ msgid ""
 "  -r, --reverse               reverse the result of comparisons\n"
 msgstr ""
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -7567,19 +7652,19 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/sort.c:437
+#: src/sort.c:465
 msgid ""
 "Other options:\n"
 "\n"
 msgstr ""
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
 msgstr ""
 
-#: src/sort.c:445
+#: src/sort.c:473
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
 "  -C, --check=quiet, --check=silent  like -c, but do not report first bad "
@@ -7588,7 +7673,7 @@ msgid ""
 "                              decompress them with PROG -d\n"
 msgstr ""
 
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -7597,13 +7682,13 @@ msgid ""
 "                            If F is - then read names from standard input\n"
 msgstr ""
 
-#: src/sort.c:459
+#: src/sort.c:487
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
 "  -m, --merge               merge already sorted files; do not sort\n"
 msgstr ""
 
-#: src/sort.c:463
+#: src/sort.c:491
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "  -s, --stable              stabilize sort by disabling last-resort "
@@ -7611,7 +7696,7 @@ msgid ""
 "  -S, --buffer-size=SIZE    use SIZE for main memory buffer\n"
 msgstr ""
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -7626,11 +7711,7 @@ msgid ""
 "run\n"
 msgstr ""
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr ""
-
-#: src/sort.c:483
+#: src/sort.c:511
 msgid ""
 "\n"
 "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is "
@@ -7649,7 +7730,7 @@ msgid ""
 "SIZE may be followed by the following multiplicative suffixes:\n"
 msgstr ""
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -7661,259 +7742,244 @@ msgid ""
 "native byte values.\n"
 msgstr ""
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, c-format
 msgid "waiting for %s [-d]"
 msgstr ""
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr ""
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, fuzzy, c-format
 msgid "cannot create temporary file in %s"
 msgstr "nepavyksta sukurti laikino failo %s"
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr ""
 
-#: src/sort.c:970
+#: src/sort.c:998
 msgid "fflush failed"
 msgstr ""
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr ""
 
-#: src/sort.c:986
-#, c-format
-msgid "dup2 failed"
-msgstr ""
-
-#: src/sort.c:1103
-#, c-format
-msgid "couldn't execute %s"
-msgstr "nepavyksta įvykdyti %s"
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 msgid "couldn't create temporary file"
 msgstr ""
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, c-format
 msgid "couldn't create process for %s -d"
 msgstr ""
 
-#: src/sort.c:1161
-#, c-format
-msgid "couldn't execute %s -d"
-msgstr "nepavyksta įvykdyti %s -d"
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, c-format
 msgid "warning: cannot remove: %s"
 msgstr ""
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, fuzzy, c-format
 msgid "invalid --%s argument %s"
 msgstr "netinkamas argumentas %s"
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, fuzzy, c-format
 msgid "minimum --%s argument is %s"
 msgstr "dviprasmis argumentas %s %s"
 
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, fuzzy, c-format
 msgid "--%s argument %s too large"
 msgstr "%s yra per didelis"
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr ""
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr ""
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr ""
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr ""
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, c-format
 msgid "string transformation failed"
 msgstr ""
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, c-format
 msgid "the untransformed string was %s"
 msgstr ""
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr ""
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr ""
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr ""
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr ""
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr ""
 
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, fuzzy, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
-msgstr[0] "%s: parametras `%s' dviprasmis\n"
-msgstr[1] "%s: parametras `%s' dviprasmis\n"
-msgstr[2] "%s: parametras `%s' dviprasmis\n"
+msgstr[0] "%s: parametras „-W %s“ dviprasmis\n"
+msgstr[1] "%s: parametras „-W %s“ dviprasmis\n"
+msgstr[2] "%s: parametras „-W %s“ dviprasmis\n"
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr ""
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr ""
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr ""
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr "standartinÄ— klaida"
 
-#: src/sort.c:3698
+#: src/sort.c:3738
 #, fuzzy
 msgid "cannot read"
 msgstr "negalima nustatyti datos"
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, c-format
 msgid "%s: invalid field specification %s"
 msgstr ""
 
-#: src/sort.c:3987
-#, fuzzy, c-format
+#: src/sort.c:4028
+#, c-format
 msgid "options '-%s' are incompatible"
-msgstr "%s: parametras `%s' dviprasmis\n"
+msgstr ""
 
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, c-format
 msgid "%s: invalid count at start of %s"
 msgstr ""
 
-#: src/sort.c:4295
+#: src/sort.c:4336
 #, fuzzy
 msgid "invalid number after '-'"
 msgstr "%s: netaisyklingas skai�ius"
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 #, fuzzy
 msgid "invalid number after '.'"
 msgstr "%s: netaisyklingas skai�ius"
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr ""
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, c-format
 msgid "multiple compress programs specified"
 msgstr ""
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
 msgstr ""
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
 msgstr ""
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr ""
 
-#: src/sort.c:4407
+#: src/sort.c:4448
 #, fuzzy
 msgid "invalid number after ','"
 msgstr "%s: netaisyklingas skai�ius"
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr ""
 
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, c-format
 msgid "cannot read file names from %s"
 msgstr ""
 
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr ""
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, c-format
 msgid "no input from %s"
 msgstr ""
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr ""
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr ""
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr ""
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr ""
 
-#: src/split.c:204
+#: src/split.c:203
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr "Naudojimas: %s [PARAMETRAS]... [ĮVESTIS [PRIEŠDĖLIS]]\n"
 
-#: src/split.c:208
+#: src/split.c:207
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
 "size is 1000 lines, and default PREFIX is 'x'.  With no INPUT, or when "
@@ -7921,26 +7987,25 @@ msgid ""
 "is -, read standard input.\n"
 msgstr ""
 
-#: src/split.c:216
+#: src/split.c:215
 #, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
 
-#: src/split.c:229
+#: src/split.c:228
 #, fuzzy
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
@@ -7949,7 +8014,7 @@ msgstr ""
 "      --complement rinkinio papildymas pasirinktais baitais, ženklais\n"
 "                             arba laukais\n"
 
-#: src/split.c:236
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -7961,189 +8026,189 @@ msgid ""
 "r/K/N   likewise but only output Kth of N to stdout\n"
 msgstr ""
 
-#: src/split.c:354
+#: src/split.c:353
 #, c-format
 msgid "output file suffixes exhausted"
 msgstr ""
 
-#: src/split.c:366
+#: src/split.c:365
 #, c-format
 msgid "creating file %s\n"
 msgstr "kuriamas failas %s\n"
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr ""
 
-#: src/split.c:391
+#: src/split.c:390
 #, c-format
 msgid "failed to set FILE environment variable"
 msgstr ""
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr ""
 
-#: src/split.c:395
+#: src/split.c:394
 #, fuzzy, c-format
 msgid "failed to create pipe"
 msgstr "nepavyko pašalinti %s"
 
-#: src/split.c:409
+#: src/split.c:408
 #, fuzzy, c-format
 msgid "closing prior pipe"
 msgstr "užveriamas aplankas %s"
 
-#: src/split.c:411
+#: src/split.c:410
 #, c-format
 msgid "closing output pipe"
 msgstr ""
 
-#: src/split.c:415
+#: src/split.c:414
 #, c-format
 msgid "moving input pipe"
 msgstr ""
 
-#: src/split.c:417
+#: src/split.c:416
 #, fuzzy, c-format
 msgid "closing input pipe"
 msgstr "užveriama standartinė įvestis"
 
-#: src/split.c:422
+#: src/split.c:421
 #, fuzzy, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr "nepavyko įvykdyti komandos %s"
 
-#: src/split.c:428
+#: src/split.c:427
 #, fuzzy, c-format
 msgid "failed to close input pipe"
 msgstr "nepavyko užverti aplanko %s"
 
-#: src/split.c:464
+#: src/split.c:463
 #, c-format
 msgid "waiting for child process"
 msgstr ""
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr ""
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr ""
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr ""
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr ""
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, fuzzy, c-format
 msgid "%s: invalid number of chunks"
 msgstr "%s: netaisyklingas skai�ius"
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, fuzzy, c-format
 msgid "%s: invalid chunk number"
 msgstr "%s: netaisyklingas skai�ius"
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr ""
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr ""
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr ""
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, c-format
 msgid "line count option -%s%c... is too large"
 msgstr ""
 
-#: src/split.c:1248
+#: src/split.c:1298
 #, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr ""
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, fuzzy, c-format
 msgid "%s: invalid IO block size"
 msgstr "%s: blogas failo dydis"
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr ""
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr ""
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, fuzzy, c-format
 msgid "%s: cannot determine file size"
 msgstr "nepavyko sukurti paprasto failo %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr "Michael Meskes"
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, fuzzy, c-format
 msgid "failed to canonicalize %s"
 msgstr "nepavyko atverti %s"
 
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, fuzzy, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr "%s: neatpažintas argumentas „%c%s“\n"
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, c-format
 msgid "%s: invalid directive"
 msgstr "%s: netinkama direktyva"
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, c-format
 msgid "warning: backslash at end of format"
 msgstr ""
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr ""
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, c-format
 msgid "cannot read file system information for %s"
 msgstr ""
 
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, fuzzy, c-format
 msgid "cannot stat standard input"
 msgstr "užveriama standartinė įvestis"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -8154,7 +8219,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -8162,30 +8227,30 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, fuzzy, c-format
 msgid "Context: %C\n"
 msgstr "nepavyksta įvykdyti %s"
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -8193,27 +8258,27 @@ msgid ""
 " Birth: %w\n"
 msgstr ""
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
 msgstr ""
 
-#: src/stat.c:1356
+#: src/stat.c:1418
 msgid ""
 "  -L, --dereference     follow links\n"
 "  -f, --file-system     display file system status instead of file status\n"
 msgstr ""
 
-#: src/stat.c:1360
+#: src/stat.c:1422
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 msgid ""
 "\n"
 "The valid format sequences for files (without --file-system):\n"
@@ -8225,7 +8290,7 @@ msgid ""
 "  %C   SELinux security context string\n"
 msgstr ""
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 msgid ""
 "  %d   device number in decimal\n"
 "  %D   device number in hex\n"
@@ -8235,7 +8300,7 @@ msgid ""
 "  %G   group name of owner\n"
 msgstr ""
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 msgid ""
 "  %h   number of hard links\n"
 "  %i   inode number\n"
@@ -8244,11 +8309,11 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 
-#: src/stat.c:1399
+#: src/stat.c:1461
 msgid ""
 "  %u   user ID of owner\n"
 "  %U   user name of owner\n"
@@ -8256,14 +8321,14 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 msgid ""
 "Valid format sequences for file systems:\n"
 "\n"
@@ -8274,7 +8339,7 @@ msgid ""
 "  %f   free blocks in file system\n"
 msgstr ""
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 msgid ""
 "  %i   file system ID in hex\n"
 "  %l   maximum length of filenames\n"
@@ -8335,22 +8400,27 @@ msgid ""
 "and are thus unaffected by 'stdbuf' settings.\n"
 msgstr ""
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, fuzzy, c-format
 msgid "failed to find %s"
 msgstr "nepavyko atverti %s"
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, fuzzy, c-format
 msgid "failed to update the environment with %s"
 msgstr "nepavyko pašalinti %s"
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr ""
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, fuzzy, c-format
+msgid "you must specify a buffering mode option"
+msgstr "privalote nurodyti vieną iš %s arba %s"
+
+#: src/stty.c:516
 #, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -8358,25 +8428,25 @@ msgid ""
 "  or:  %s [-F DEVICE | --file=DEVICE] [-g|--save]\n"
 msgstr ""
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
 msgstr ""
 
-#: src/stty.c:525
+#: src/stty.c:528
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
 "  -g, --save         print all current settings in a stty-readable form\n"
 "  -F, --file=DEVICE  open and use the specified DEVICE instead of stdin\n"
 msgstr ""
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
 "settings.  The underlying system defines which settings are available.\n"
 msgstr ""
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -8385,7 +8455,7 @@ msgid ""
 "   eol CHAR      CHAR will end the line\n"
 msgstr ""
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -8393,7 +8463,7 @@ msgid ""
 "   kill CHAR     CHAR will erase the current line\n"
 msgstr ""
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -8401,7 +8471,7 @@ msgid ""
 "   start CHAR    CHAR will restart the output after stopping it\n"
 msgstr ""
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -8409,7 +8479,7 @@ msgid ""
 " * werase CHAR   CHAR will erase the last word typed\n"
 msgstr ""
 
-#: src/stty.c:562
+#: src/stty.c:565
 msgid ""
 "\n"
 "Special settings:\n"
@@ -8418,7 +8488,7 @@ msgid ""
 " * columns N     same as cols N\n"
 msgstr ""
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -8427,7 +8497,7 @@ msgid ""
 "   ospeed N      set the output speed to N\n"
 msgstr ""
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -8436,7 +8506,7 @@ msgid ""
 "   time N        with -icanon, set read timeout of N tenths of a second\n"
 msgstr ""
 
-#: src/stty.c:581
+#: src/stty.c:584
 msgid ""
 "\n"
 "Control settings:\n"
@@ -8447,7 +8517,7 @@ msgid ""
 "   csN           set character size to N bits, N in [5..8]\n"
 msgstr ""
 
-#: src/stty.c:590
+#: src/stty.c:593
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
 "   [-]hup        send a hangup signal when the last process closes the tty\n"
@@ -8455,9 +8525,10 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -8467,7 +8538,7 @@ msgid ""
 "   [-]igncr      ignore carriage return\n"
 msgstr ""
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -8476,11 +8547,11 @@ msgid ""
 "   [-]istrip     clear high (8th) bit of input characters\n"
 msgstr ""
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr ""
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -8490,7 +8561,7 @@ msgid ""
 "   [-]tandem     same as [-]ixoff\n"
 msgstr ""
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -8500,17 +8571,17 @@ msgid ""
 " * nlN           newline delay style, N in [0..1]\n"
 msgstr ""
 
-#: src/stty.c:631
+#: src/stty.c:635
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
 " * [-]onlret     newline performs a carriage return\n"
 msgstr ""
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -8520,7 +8591,7 @@ msgid ""
 " * vtN           vertical tab delay style, N in [0..1]\n"
 msgstr ""
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -8529,7 +8600,7 @@ msgid ""
 " * -crtkill      kill all line by obeying the echoctl and echok settings\n"
 msgstr ""
 
-#: src/stty.c:654
+#: src/stty.c:658
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
 "   [-]echo       echo input characters\n"
@@ -8538,7 +8609,7 @@ msgid ""
 "   [-]echok      echo a newline after a kill character\n"
 msgstr ""
 
-#: src/stty.c:661
+#: src/stty.c:665
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
 "   [-]echonl     echo newline even if not echoing other characters\n"
@@ -8547,7 +8618,7 @@ msgid ""
 "   [-]iexten     enable non-POSIX special characters\n"
 msgstr ""
 
-#: src/stty.c:668
+#: src/stty.c:672
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
 "   [-]noflsh     disable flushing after interrupt and quit special "
@@ -8557,7 +8628,7 @@ msgid ""
 " * [-]xcase      with icanon, escape with '\\' for uppercase characters\n"
 msgstr ""
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -8566,7 +8637,7 @@ msgid ""
 "   -cbreak       same as icanon\n"
 msgstr ""
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -8574,7 +8645,7 @@ msgid ""
 "   crt           same as echoe echoctl echoke\n"
 msgstr ""
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -8583,7 +8654,7 @@ msgid ""
 "   evenp         same as parenb -parodd cs7\n"
 msgstr ""
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -8593,7 +8664,7 @@ msgid ""
 "   -nl           same as icrnl -inlcr -igncr onlcr -ocrnl -onlret\n"
 msgstr ""
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -8602,7 +8673,7 @@ msgid ""
 "   -pass8        same as parenb istrip cs7\n"
 msgstr ""
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -8610,7 +8681,7 @@ msgid ""
 "   -raw          same as cooked\n"
 msgstr ""
 
-#: src/stty.c:716
+#: src/stty.c:720
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
 "                 -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n"
@@ -8620,7 +8691,7 @@ msgid ""
 "                 characters to their default values\n"
 msgstr ""
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -8629,55 +8700,55 @@ msgid ""
 "127; special values ^- or undef used to disable special characters.\n"
 msgstr ""
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, c-format
 msgid "only one device may be specified"
 msgstr ""
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
 "mutually exclusive"
 msgstr ""
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr ""
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr ""
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, c-format
 msgid "invalid argument %s"
 msgstr "netinkamas argumentas %s"
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, c-format
 msgid "missing argument to %s"
 msgstr ""
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, c-format
 msgid "invalid line discipline %s"
 msgstr ""
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr ""
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr ""
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, c-format
 msgid "invalid integer argument %s"
 msgstr ""
@@ -8723,21 +8794,21 @@ msgstr "      --help     parodyti šią pagalbą ir išeiti\n"
 msgid "      --version  output version information and exit\n"
 msgstr "      --version  išvesti informaciją apie versiją ir išeiti\n"
 
-#: src/system.h:544
+#: src/system.h:543
 msgid ""
 "\n"
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/system.h:552
+#: src/system.h:551
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -8746,35 +8817,33 @@ msgid ""
 "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n"
 msgstr ""
 
-#: src/system.h:571
+#: src/system.h:570
 #, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
+"%s online help: <%s>\n"
 msgstr ""
-"\n"
-"Apie %s klaidas praneškite adresu %s\n"
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr ""
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr ""
 
-#: src/system.h:596
+#: src/system.h:591
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Bandykite „%s –help“, jei norite išsamesnės informacijos.\n"
 
-#: src/system.h:628
+#: src/system.h:633
 #, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -8860,54 +8929,48 @@ msgstr ""
 
 #: src/tail.c:270
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
 
 #: src/tail.c:274
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 
-#: src/tail.c:281
+#: src/tail.c:280
 #, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
 
-#: src/tail.c:294
+#: src/tail.c:293
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 
-#: src/tail.c:301
+#: src/tail.c:298
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 
-#: src/tail.c:310
+#: src/tail.c:307
 msgid ""
 "\n"
 "If the first character of K (the number of bytes or lines) is a '+',\n"
@@ -8918,7 +8981,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/tail.c:319
+#: src/tail.c:316
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
 "means that even if a tail'ed file is renamed, tail will continue to track\n"
@@ -8928,159 +8991,164 @@ msgid ""
 "named file in a way that accommodates renaming, removal and creation.\n"
 msgstr ""
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr ""
 
-#: src/tail.c:453
-#, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr ""
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr ""
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr ""
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
 "reverting to polling"
 msgstr ""
 
-#: src/tail.c:963
+#: src/tail.c:965
 #, c-format
-msgid "%s has become inaccessible"
+msgid "%s has been replaced with a symbolic link. giving up on this name"
 msgstr ""
 
 #: src/tail.c:980
 #, c-format
+msgid "%s has become inaccessible"
+msgstr ""
+
+#: src/tail.c:997
+#, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr ""
 
-#: src/tail.c:989
+#: src/tail.c:1006
 #, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr ""
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, c-format
 msgid "%s has become accessible"
 msgstr ""
 
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr ""
 
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr ""
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr ""
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr ""
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr "nebeliko failų"
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, fuzzy, c-format
 msgid "cannot watch parent directory of %s"
 msgstr "neįmanoma sukurti %s aplanko"
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, fuzzy, c-format
 msgid "inotify resources exhausted"
 msgstr "baigÄ—si atmintis"
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, fuzzy, c-format
 msgid "cannot watch %s"
 msgstr "nepavyksta patikrinti %s"
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr ""
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, fuzzy, c-format
 msgid "error reading inotify event"
 msgstr "klaida skaitant %s"
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr ""
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, c-format
 msgid "number in %s is too large"
 msgstr ""
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr ""
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr ""
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr ""
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr ""
 
-#: src/tail.c:2034
+#: src/tail.c:2096
+#, c-format
+msgid "warning: --retry ignored; --retry is useful only when following"
+msgstr ""
+
+#: src/tail.c:2100
 #, c-format
-msgid "warning: --retry is useful mainly when following by name"
+msgid "warning: --retry only effective for the initial open"
 msgstr ""
 
-#: src/tail.c:2038
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
 msgstr ""
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr ""
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, c-format
 msgid "cannot follow %s by name"
 msgstr ""
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr ""
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr ""
@@ -9285,17 +9353,17 @@ msgstr ""
 msgid "warning: sigprocmask"
 msgstr ""
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr ""
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr ""
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
@@ -9304,30 +9372,29 @@ msgstr ""
 "Naudojimas: %s KOMANDA [ARG]...\n"
 "  arba:  %s PARAMETRAS\n"
 
-#: src/timeout.c:229
+#: src/timeout.c:232
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
 msgstr ""
 
-#: src/timeout.c:235
+#: src/timeout.c:238
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 msgid ""
 "\n"
 "DURATION is a floating point number with an optional suffix:\n"
@@ -9335,7 +9402,7 @@ msgid ""
 "days.\n"
 msgstr ""
 
-#: src/timeout.c:259
+#: src/timeout.c:262
 msgid ""
 "\n"
 "If the command times out, and --preserve-status is not set, then exit with\n"
@@ -9346,17 +9413,17 @@ msgid ""
 "case the exit status is 128+9 rather than 124.\n"
 msgstr ""
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr ""
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, fuzzy, c-format
 msgid "error waiting for command"
 msgstr "klaida rašant %s"
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr ""
@@ -9666,7 +9733,7 @@ msgstr ""
 #: src/truncate.c:115
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 
 #: src/truncate.c:121
@@ -9746,12 +9813,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr ""
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr "%s: įvestis turi ciklą:"
@@ -9825,12 +9892,12 @@ msgstr ""
 msgid "tab stop value is too large"
 msgstr ""
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr "Naudojimas: %s [PARAMETRAS]... [ĮVESTIS [IŠVESTIS]]\n"
 
-#: src/uniq.c:138
+#: src/uniq.c:174
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
 "writing to OUTPUT (or standard output).\n"
@@ -9838,36 +9905,49 @@ msgid ""
 "With no options, matching lines are merged to the first occurrence.\n"
 msgstr ""
 
-#: src/uniq.c:147
+#: src/uniq.c:183
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
+msgstr ""
+
+#: src/uniq.c:187
+msgid ""
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
+msgstr ""
+
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr ""
+
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
 msgstr ""
 
-#: src/uniq.c:151
+#: src/uniq.c:199
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
 "  -i, --ignore-case     ignore differences in case when comparing\n"
 "  -s, --skip-chars=N    avoid comparing the first N characters\n"
 "  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
 msgstr ""
 
-#: src/uniq.c:161
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr ""
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 msgid ""
 "\n"
 "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n"
 "characters.  Fields are skipped before chars.\n"
 msgstr ""
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 msgid ""
 "\n"
 "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n"
@@ -9875,24 +9955,34 @@ msgid ""
 "Also, comparisons honor the rules specified by 'LC_COLLATE'.\n"
 msgstr ""
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, c-format
 msgid "too many repeated lines"
 msgstr ""
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
 msgstr ""
 
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
 msgstr ""
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
 msgstr ""
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr ""
+
+#: src/uniq.c:652
+#, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr ""
+
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr ""
@@ -9910,11 +10000,6 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/unlink.c:86
-#, c-format
-msgid "cannot unlink %s"
-msgstr ""
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -9961,7 +10046,7 @@ msgstr[2] "%lu naudotojų"
 msgid ",  load average: %.2f"
 msgstr ",  vidutinÄ— apkrova: %.2f"
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -9969,19 +10054,19 @@ msgid ""
 "in the run queue over the last 1, 5 and 15 minutes."
 msgstr ""
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
 "an uninterruptible sleep state also contribute to the load average.\n"
 msgstr ""
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr "\n"
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
@@ -10172,13 +10257,11 @@ msgstr ""
 "Pakartotinai išvesti  eilutę su nurodyta EILUTĖ(�ių) reikšme, arba `y'.\n"
 "\n"
 
-#, fuzzy
-#~ msgid "  returning value: '%s'\n"
-#~ msgstr "kuriamas failas %s\n"
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: neleistinas parametras – %c\n"
 
-#, fuzzy
-#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n"
-#~ msgstr "Naudojimas: %s [PARAMETRAS]... [NAUDOTOJAS]...\n"
+#~ msgid "invalid argument: %s"
+#~ msgstr "netinkamas argumentas: %s"
 
 #~ msgid ""
 #~ "\n"
@@ -10191,6 +10274,20 @@ msgstr ""
 #~ "  %s /usr/bin/sort         Išvedimas „sort“.\n"
 #~ "  %s include/stdio.h .h    Išvedimas „stdio“.\n"
 
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid ""
+#~ "Change the mode of each FILE to MODE.\n"
+#~ "\n"
+#~ "  -c, --changes           like verbose but report only when a change is "
+#~ "made\n"
+#~ msgstr ""
+#~ "Teisių pakeitimas kiekvienam FAILAUI į TEISES.\n"
+#~ "\n"
+#~ "  -c, --changes           kaip verbose, bet pranešti tik kai atliktas "
+#~ "pakeitimas\n"
+
 #~ msgid "reading %s"
 #~ msgstr "skaitoma %s"
 
@@ -10200,9 +10297,24 @@ msgstr ""
 #~ msgid "closing %s"
 #~ msgstr "uždaroma %s"
 
+#~ msgid "cannot create link %s"
+#~ msgstr "negaliu sukurti nuorodos %s"
+
 #~ msgid "accessing %s"
 #~ msgstr "dirbama su %s"
 
+#, fuzzy
+#~ msgid ""
+#~ "Display the current time in the given FORMAT, or set the system date.\n"
+#~ "\n"
+#~ "  -d, --date=STRING         display time described by STRING, not `now'\n"
+#~ "  -f, --file=DATEFILE       like --date once for each line of DATEFILE\n"
+#~ msgstr ""
+#~ "Parodo dabartinį laiką duotu FORMATU, arba nustatyti sisteminį laiką\n"
+#~ "  -d, --date=STRING parodo laiką apibrėžtą STRINGU, ne dabartinį (now)\n"
+#~ "  -f, --file=DATAFILE kaip --date, vienÄ… kartÄ… kiekvienai linijai "
+#~ "DATAFILE faile\n"
+
 #~ msgid "opening %s"
 #~ msgstr "atveriamas %s"
 
@@ -10213,14 +10325,32 @@ msgstr ""
 #~ "Naudojimas: %s PAVADINIMAS\n"
 #~ "  arba:  %s PARAMETRAS\n"
 
-#, fuzzy
-#~ msgid ""
-#~ "WARNING: --page-increment is deprecated; use --line-increment instead"
-#~ msgstr "--reply parametras nebenaudojamas; vietoj jo naudokite -i arba -f"
+#~ msgid "Usage: %s [OPTION]... [USERNAME]\n"
+#~ msgstr "Naudojimas: %s [PARAMETRAS]... [NAUDOTOJOVARDAS]\n"
 
 #~ msgid "Usage: %s [OPTION]... FILE\n"
 #~ msgstr "Naudojimas: %s [PARAMETRAS]... FAILAS\n"
 
+#~ msgid "cannot remove directory %s"
+#~ msgstr "nepavyko pašalinti aplanko %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
+#~ "  or:  %s LONG-OPTION\n"
+#~ msgstr ""
+#~ "Naudojimas: %s KOMANDA [ARG]...\n"
+#~ "  arba:  %s PARAMETRAS\n"
+
+#~ msgid "unknown user-ID: %s"
+#~ msgstr "nežinomas naudotojo-ID: %s"
+
+#~ msgid "couldn't execute %s"
+#~ msgstr "nepavyksta įvykdyti %s"
+
+#~ msgid "couldn't execute %s -d"
+#~ msgstr "nepavyksta įvykdyti %s -d"
+
 #~ msgid "Password:"
 #~ msgstr "Slaptažodis:"
 
@@ -10236,44 +10366,6 @@ msgstr ""
 #~ msgid "warning: cannot change directory to %s"
 #~ msgstr "dėmesio: nepavyko pakeisti aplanko į %s"
 
-#~ msgid ""
-#~ "Change the mode of each FILE to MODE.\n"
-#~ "\n"
-#~ "  -c, --changes           like verbose but report only when a change is "
-#~ "made\n"
-#~ msgstr ""
-#~ "Teisių pakeitimas kiekvienam FAILAUI į TEISES.\n"
-#~ "\n"
-#~ "  -c, --changes           kaip verbose, bet pranešti tik kai atliktas "
-#~ "pakeitimas\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Display the current time in the given FORMAT, or set the system date.\n"
-#~ "\n"
-#~ "  -d, --date=STRING         display time described by STRING, not `now'\n"
-#~ "  -f, --file=DATEFILE       like --date once for each line of DATEFILE\n"
-#~ msgstr ""
-#~ "Parodo dabartinį laiką duotu FORMATU, arba nustatyti sisteminį laiką\n"
-#~ "  -d, --date=STRING parodo laiką apibrėžtą STRINGU, ne dabartinį (now)\n"
-#~ "  -f, --file=DATAFILE kaip --date, vienÄ… kartÄ… kiekvienai linijai "
-#~ "DATAFILE faile\n"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: neleistinas parametras – %c\n"
-
-#~ msgid "invalid argument: %s"
-#~ msgstr "netinkamas argumentas: %s"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#~ msgid "cannot create link %s"
-#~ msgstr "negaliu sukurti nuorodos %s"
-
-#~ msgid "cannot remove %s directory %s"
-#~ msgstr "nepavyksta pašalinti %s aplanko %s"
-
 #~ msgid "creating %s"
 #~ msgstr "kuriamas %s"
 
@@ -10287,6 +10379,9 @@ msgstr ""
 #~ msgid "Usage: %s [OPTION] [FILE]...\n"
 #~ msgstr "Naudojimas: %s [PARAMETRAS] [FAILAS]...\n"
 
+#~ msgid "the --reply option is deprecated; use -i or -f instead"
+#~ msgstr "--reply parametras nebenaudojamas; vietoj jo naudokite -i arba -f"
+
 #~ msgid "Usage: %s [OPTIONS] FILE [...]\n"
 #~ msgstr "Naudojimas: %s [PARAMETRAI] FAILAS [...]\n"
 
diff --git a/po/ms.gmo b/po/ms.gmo
index b5f24750..b2e9327a 100644
--- a/po/ms.gmo
+++ b/po/ms.gmo
diff --git a/po/ms.po b/po/ms.po
index 813a0128..dd4bbeec 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  coreutils 5.0.90\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
 "PO-Revision-Date: 2003-08-10 16:00+0800\n"
 "Last-Translator: Hasbullah Bin Pit <sebol@ikhlas.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -34,77 +34,124 @@ msgstr "Hujah sah adalah:"
 msgid "error closing file"
 msgstr "menutup fail input %s"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "ralat menulis"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, fuzzy, c-format
 msgid "preserving permissions for %s"
 msgstr "menetapkan keizinan pada %s"
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "Ralat sistem yang tidak diketahui"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "fail kosong biasa"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "fail biasa"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "direktori"
 
-#: lib/file-type.c:44
+#: lib/file-type.c:46
+msgid "symbolic link"
+msgstr "pautan simbolik"
+
+#: lib/file-type.c:52
+msgid "message queue"
+msgstr "giliran mesej"
+
+#: lib/file-type.c:55
+msgid "semaphore"
+msgstr ""
+
+#: lib/file-type.c:58
+msgid "shared memory object"
+msgstr "objek memori terkongsi"
+
+#: lib/file-type.c:61
+#, fuzzy
+msgid "typed memory object"
+msgstr "objek memori terkongsi"
+
+#: lib/file-type.c:66
 msgid "block special file"
 msgstr "fail istimewa blok"
 
-#: lib/file-type.c:47
+#: lib/file-type.c:69
 msgid "character special file"
 msgstr "fail istimewa aksara"
 
-#: lib/file-type.c:50
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr ""
+
+#: lib/file-type.c:75
 msgid "fifo"
 msgstr "fifo"
 
-#: lib/file-type.c:53
-msgid "symbolic link"
-msgstr "pautan simbolik"
+#: lib/file-type.c:78
+msgid "door"
+msgstr ""
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "soket"
+#: lib/file-type.c:81
+#, fuzzy
+msgid "multiplexed block special file"
+msgstr "fail istimewa blok"
 
-#: lib/file-type.c:59
-msgid "message queue"
-msgstr "giliran mesej"
+#: lib/file-type.c:84
+#, fuzzy
+msgid "multiplexed character special file"
+msgstr "fail istimewa aksara"
 
-#: lib/file-type.c:62
-msgid "semaphore"
+#: lib/file-type.c:87
+msgid "multiplexed file"
 msgstr ""
 
-#: lib/file-type.c:65
-msgid "shared memory object"
-msgstr "objek memori terkongsi"
+#: lib/file-type.c:90
+#, fuzzy
+msgid "named file"
+msgstr "fail pelik"
 
-#: lib/file-type.c:68
+#: lib/file-type.c:93
 #, fuzzy
-msgid "typed memory object"
-msgstr "objek memori terkongsi"
+msgid "network special file"
+msgstr "fail istimewa blok"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr ""
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr ""
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr ""
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "soket"
 
-#: lib/file-type.c:70
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr ""
+
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "fail pelik"
 
@@ -244,18 +291,18 @@ msgstr "%s: opsyen `-W %s' tidak mengizinkan hujan\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: opsyen  `%s' memerlukan hujah\n"
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr "tak dapat menukar keizinan %s"
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "tak dapat mencipta direktori %s"
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr "memori keletihan"
@@ -378,7 +425,7 @@ msgstr "ralat pada carian ungkapan biasa (regexp)"
 msgid "Unmatched ) or \\)"
 msgstr ""
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 #, fuzzy
 msgid "No previous regular expression"
 msgstr "ralat pada carian ungkapan biasa (regexp)"
@@ -404,7 +451,7 @@ msgstr ""
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[yY]"
 
@@ -414,11 +461,11 @@ msgstr "^[yY]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[tT]"
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, c-format
 msgid "setting permissions for %s"
 msgstr "menetapkan keizinan pada %s"
@@ -564,18 +611,6 @@ msgstr "pembukaan gagal"
 msgid "Resource lost"
 msgstr ""
 
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, fuzzy, c-format
-msgid "cannot create pipe"
-msgstr "tak boleh mencipta fifo %s"
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, fuzzy, c-format
-msgid "%s subprocess failed"
-msgstr "fail istimewa blok"
-
 #: lib/strsignal.c:114
 #, c-format
 msgid "Real-time signal %d"
@@ -764,7 +799,7 @@ msgstr ""
 "\n"
 "Lapor pepijat ke <%s>.\n"
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr ""
@@ -774,30 +809,10 @@ msgstr ""
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr ""
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr ""
 
-#: lib/w32spawn.h:43
-#, fuzzy, c-format
-msgid "_open_osfhandle failed"
-msgstr "pembukaan gagal"
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr ""
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr ""
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr ""
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr ""
@@ -820,7 +835,7 @@ msgstr "Ralat sistem yang tidak diketahui"
 msgid "failed to reopen %s with mode %s"
 msgstr "gagal mengekalkan masa bagi %s"
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr "perbandingan rentetan gagal"
@@ -861,13 +876,11 @@ msgid "Simon Josefsson"
 msgstr ""
 
 #: src/base64.c:60
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
 "Base64 encode or decode FILE, or standard input, to standard output.\n"
 msgstr ""
-"\n"
-"Dengan tiada FAIL, atau bila FAIL adalah -, baca input piawai.\n"
 
 #: src/base64.c:67
 msgid ""
@@ -879,7 +892,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -896,48 +909,47 @@ msgid ""
 "from any other non-alphabet bytes in the encoded stream.\n"
 msgstr ""
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "ralat membaca"
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, fuzzy, c-format
 msgid "invalid input"
 msgstr "pengguna tidak sah"
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, fuzzy, c-format
 msgid "invalid wrap size: %s"
 msgstr "saiz tab tidak sah: %s"
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, fuzzy, c-format
 msgid "extra operand %s"
 msgstr "gagal mengekalkan masa bagi %s"
 
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, c-format
 msgid "closing standard input"
 msgstr "menutup input piawai"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -968,8 +980,8 @@ msgstr ""
 #: src/basename.c:60
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/basename.c:67
@@ -983,33 +995,32 @@ msgid ""
 "  %s -a any/str1 any/str2   -> \"str1\" followed by \"str2\"\n"
 msgstr ""
 
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, fuzzy, c-format
 msgid "missing operand"
 msgstr "kehilangan hujah fail"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 #, fuzzy
 msgid "Richard M. Stallman"
 msgstr "Torbjorn Granlund and Richard M. Stallman"
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1053,7 +1064,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr "tak dapat ioctl pada  `%s'"
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr "output standard"
@@ -1070,14 +1081,14 @@ msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 msgid "Jim Meyering"
 msgstr ""
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, fuzzy, c-format
 msgid "failed to create security context: %s"
 msgstr "gagal mendapatkan atribut bagi %s"
@@ -1087,8 +1098,8 @@ msgstr "gagal mendapatkan atribut bagi %s"
 msgid "failed to set %s security context component to %s"
 msgstr ""
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, fuzzy, c-format
 msgid "failed to get security context of %s"
 msgstr "gagal mendapatkan atribut bagi %s"
@@ -1098,18 +1109,18 @@ msgstr "gagal mendapatkan atribut bagi %s"
 msgid "can't apply partial context to unlabeled file %s"
 msgstr ""
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, fuzzy, c-format
 msgid "failed to change context of %s to %s"
 msgstr "gagal menukar hakmilik %s ke %s\n"
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
 msgstr "Tak dapat mengakses %s"
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, c-format
 msgid "cannot read directory %s"
 msgstr "tak dapat membaca direktori %s"
@@ -1119,13 +1130,14 @@ msgstr "tak dapat membaca direktori %s"
 msgid "changing security context of %s\n"
 msgstr "menukar keizinan %s"
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, fuzzy, c-format
 msgid "fts_read failed"
 msgstr "fail biasa"
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, fuzzy, c-format
 msgid "fts_close failed"
 msgstr "fail istimewa blok"
@@ -1143,7 +1155,7 @@ msgstr ""
 
 #: src/chcon.c:357
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
@@ -1164,24 +1176,18 @@ msgid ""
 "  -l, --range=RANGE      set range RANGE in the target security context\n"
 msgstr ""
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
 "      --preserve-root    fail to operate recursively on '/'\n"
 msgstr ""
 
 #: src/chcon.c:379
-#, fuzzy
 msgid ""
 "      --reference=RFILE  use RFILE's security context rather than "
 "specifying\n"
 "                         a CONTEXT value\n"
 msgstr ""
-"  -f, --silent, --quiet  sorok mesej ralat\n"
-"      --reference=RFAIL  guna pemilik dan kumpulan RFAIL dan bukannya\n"
-"                         nilai yg dinyatakan PEMILIK:KUMPULAN\n"
-"  -R, --recursive        beroperasi pada fail dan direktori secara rekursif\n"
-"  -v, --verbose          output  diagnostik bagi setiap fail yg diproses\n"
 
 #: src/chcon.c:383 src/chgrp.c:140 src/chown.c:118
 msgid "  -R, --recursive        operate on files and directories recursively\n"
@@ -1206,36 +1212,37 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr ""
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr ""
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, fuzzy, c-format
 msgid "missing operand after %s"
 msgstr "kehilangan hujah fail"
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, fuzzy, c-format
 msgid "invalid context: %s"
 msgstr "penukaran tidak sah: %s"
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr ""
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, c-format
 msgid "failed to get attributes of %s"
 msgstr "gagal mendapatkan atribut bagi %s"
@@ -1261,7 +1268,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
@@ -1294,47 +1301,47 @@ msgid ""
 "  %s -hR staff /u  Change the group of /u and subfiles to \"staff\".\n"
 msgstr ""
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
 msgstr "mendapatkan atribut baru untuk %s"
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr "kedua-duanya pautan simbolik %s dan rujukan telah berubah\n"
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, fuzzy, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr "mod %s berubah kepada %04lo (%s)\n"
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, fuzzy, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr "gagal menukar mod %s kepada %04lo (%s)\n"
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr "mod %s kekal sebagai %04lo (%s)\n"
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, fuzzy, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr "tak dapat mencipta pautan simbolik %s"
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, c-format
 msgid "changing permissions of %s"
 msgstr "menukar keizinan %s"
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, fuzzy, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr "menetapkan keizinan pada %s"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1345,39 +1352,33 @@ msgstr ""
 "    atau:  %s [OPTION]... OCTAL-MODE FILE...\n"
 "    atau:  %s [OPTION]... --reference=RFILE FILE...\n"
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 msgid ""
 "Change the mode of each FILE to MODE.\n"
 "With --reference, change the mode of each FILE to that of RFILE.\n"
 "\n"
 msgstr ""
 
-#: src/chmod.c:391
-#, fuzzy
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
-"  -f, --silent, --quiet  sorok mesej ralat\n"
-"      --reference=RFAIL  guna pemilik dan kumpulan RFAIL dan bukannya\n"
-"                         nilai yg dinyatakan PEMILIK:KUMPULAN\n"
-"  -R, --recursive        beroperasi pada fail dan direktori secara rekursif\n"
-"  -v, --verbose          output  diagnostik bagi setiap fail yg diproses\n"
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr ""
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 msgid ""
 "\n"
 "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n"
 msgstr ""
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr ""
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, fuzzy, c-format
 msgid "invalid mode: %s"
 msgstr "mod tak sah %s"
@@ -1505,26 +1506,21 @@ msgid ""
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr ""
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr "kumpulan tidak sah %s"
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, fuzzy, c-format
 msgid "invalid group list %s"
 msgstr "kumpulan tidak sah %s"
 
-#: src/chroot.c:117
-#, fuzzy, c-format
-msgid "failed to set additional groups"
-msgstr "gagal mendapatkan atribut bagi %s"
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
@@ -1533,7 +1529,7 @@ msgstr ""
 "Pengunaan: %s ROOTBARU [ARAHAN...]\n"
 "    atau: %s OPSYEN\n"
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
@@ -1541,40 +1537,54 @@ msgstr ""
 "Laksana ARAHAN dengan direktori root ditetapkan ke ROOTBARU.\n"
 "\n"
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
 msgstr ""
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 msgid ""
 "\n"
 "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n"
 msgstr ""
 
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, c-format
 msgid "cannot change root directory to %s"
 msgstr "Gagal menukar direktori root ke %s "
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, c-format
 msgid "cannot chdir to root directory"
 msgstr "tak dapat chdir ke direktori root"
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr ""
+
+#: src/chroot.c:383
+#, fuzzy, c-format
+msgid "failed to get supplemental groups"
+msgstr "tak dapat perolehi senarai kumpulan tambahan"
+
+#: src/chroot.c:395
+#, fuzzy, c-format
+msgid "failed to %s supplemental groups"
+msgstr "tak dapat perolehi senarai kumpulan tambahan"
+
+#: src/chroot.c:402
 #, fuzzy, c-format
 msgid "failed to set group-ID"
 msgstr "tak dapat menukar ke kumpulan null"
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, fuzzy, c-format
 msgid "failed to set user-ID"
 msgstr "gagal mengekalkan masa bagi %s"
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, fuzzy, c-format
 msgid "failed to run command %s"
 msgstr "takboleh nyahpaut %s"
@@ -1604,7 +1614,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr "Penggunaan: %s [OPSYEN]...FAIL1 FAIL2\n"
@@ -1671,294 +1681,327 @@ msgstr "%s: banyak isyarat dinyatakan"
 msgid "empty %s not allowed"
 msgstr ""
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, fuzzy, c-format
 msgid "error reading %s"
 msgstr "membaca %s"
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, c-format
 msgid "cannot lseek %s"
 msgstr "tak dapat lseek %s"
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, fuzzy, c-format
 msgid "error writing %s"
 msgstr "menulis %s"
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, fuzzy, c-format
 msgid "%s: failed to get extents info"
 msgstr "gagal mendapatkan atribut bagi %s"
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, fuzzy, c-format
 msgid "%s: write failed"
 msgstr "fail pelik"
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, fuzzy, c-format
 msgid "failed to extend %s"
 msgstr "gagal mengekalkan masa bagi %s"
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, fuzzy, c-format
 msgid "clearing permissions for %s"
 msgstr "menetapkan keizinan pada %s"
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "gagal mengekalkan hakmilik bagi %s"
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
 msgstr "gagal mencari fail %s"
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, c-format
 msgid "failed to preserve authorship for %s"
 msgstr "gagal mengekalkan hakmilik bagi %s"
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
+#, fuzzy, c-format
+msgid "failed to set default file creation context to %s"
+msgstr "gagal mendapatkan atribut bagi %s"
+
+#: src/copy.c:820
+#, fuzzy, c-format
+msgid "failed to set default file creation context for %s"
+msgstr "gagal mendapatkan atribut bagi %s"
+
+#: src/copy.c:846
+#, fuzzy, c-format
+msgid "failed to set the security context of %s"
+msgstr "gagal mendapatkan atribut bagi %s"
+
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
 msgid "cannot open %s for reading"
 msgstr "tak dapat buka %s untuk dibaca"
 
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, c-format
 msgid "cannot fstat %s"
 msgstr "tak dapat fstat %s"
 
-#: src/copy.c:820
+#: src/copy.c:935
 #, c-format
 msgid "skipping file %s, as it was replaced while being copied"
 msgstr ""
 
-#: src/copy.c:850
-#, c-format
-msgid "failed to get file system create context"
-msgstr ""
-
-#: src/copy.c:864
-#, fuzzy, c-format
-msgid "failed to set the security context of %s to %s"
-msgstr "gagal menukar kumpulan %s ke %s\n"
-
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
 msgid "cannot remove %s"
 msgstr "tak dapat membuang %s"
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
 msgstr "%s dibuang \n"
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr ""
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, c-format
 msgid "cannot create regular file %s"
 msgstr "tak dapat memcipta fail biasa %s"
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, fuzzy, c-format
 msgid "failed to clone %s from %s"
 msgstr "gagal mengekalkan masa bagi %s"
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr "mengekalkan masa pada %s"
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
 #, fuzzy, c-format
 msgid "failed to close %s"
 msgstr "gagal mengekalkan masa bagi %s"
 
-#: src/copy.c:1471
+#: src/copy.c:1580
 #, fuzzy, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
 msgstr "%s: menindih %s, menindih mod %04lo? "
 
-#: src/copy.c:1478
+#: src/copy.c:1581
+#, c-format
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr ""
+
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
 msgstr "%s: tindih %s? "
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr " (backup: %s)"
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr ""
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, c-format
 msgid "cannot create hard link %s to %s"
 msgstr "tak dapat mencipta pautan keras %s ke %s"
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, c-format
 msgid "cannot stat %s"
 msgstr "tak dapat stat %s"
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, c-format
 msgid "omitting directory %s"
 msgstr ""
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr "Amaran: fail sumber %s dinyatakan lebih drpd sekali"
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
 msgstr "%s dan %s adalah fail yang sama"
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr "tak boleh menindih bukan-direktori %s dengan direktori %s"
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr "tak akan menindih baru-dicipta %s dengan %s"
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr "tak boleh menindih direktori %s dengan direktori"
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr "tak dapat pindah direktori ke bukan-direktori: %s -> %s"
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr "backup %s akan memusnahkan sumber; %s tidak dipindahkan"
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr "backup %s akan memusnahkan sumber; %s tidak disalin"
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
 msgstr "tak dapat backup %s"
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, fuzzy, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr "tak akan menindih baru-dicipta %s dengan %s"
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr "tak dapat salin direktori, %s ke dirinya, %s"
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr "tidak akan mencipta pautan keras %s ke direktori %s"
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr "tak dapat pindahkan %s ke subdirektori dirinya, %s"
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, c-format
 msgid "cannot move %s to %s"
 msgstr "tak dapat pindahkan %s ke %s"
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr "pindahan antara-peranti gagak: %s ke %s; tak dapat memindah sasaran"
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, fuzzy, c-format
-msgid "failed to set default file creation context to %s"
-msgstr "gagal mendapatkan atribut bagi %s"
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr "tak boleh salin pautan simbolik cyclic %s"
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr "%s: hanya boleh membuat pautan simbolik relatif pada direktori semasa"
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr "tak dapat mencipta pautan simbolik %s ke %s"
 
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, c-format
 msgid "cannot create fifo %s"
 msgstr "tak boleh mencipta fifo %s"
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, c-format
 msgid "cannot create special file %s"
 msgstr "tak boleh mencipta fail istimewa %s"
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, c-format
 msgid "cannot read symbolic link %s"
 msgstr "tak dapat membaca pautan simbolik %s"
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, c-format
 msgid "cannot create symbolic link %s"
 msgstr "tak dapat mencipta pautan simbolik %s"
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
 msgstr "%s mempunyai jenis fail yang tidak diketahui"
 
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, c-format
 msgid "cannot un-backup %s"
 msgstr "tak dapat nyahbackup %s"
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr "%s -> %s (nyahbackup)\n"
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr ""
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr ""
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, c-format
+msgid "unknown program %s"
+msgstr ""
+
+#: src/cp.c:157 src/mv.c:288
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -1969,14 +2012,14 @@ msgstr ""
 "   atau:  %s [OPSYEN]... SUMBER... DIREKTORI\n"
 "   atau:  %s [OPSYEN]... --target-directory=DIREKTORI SUMBER...\n"
 
-#: src/cp.c:162
+#: src/cp.c:163
 #, fuzzy
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 "Salin SUMBER ke DEST, atau banyak SUMBER ke DIREKTORI.\n"
 "\n"
 
-#: src/cp.c:168
+#: src/cp.c:169
 #, fuzzy
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
@@ -1998,7 +2041,7 @@ msgstr ""
 "  -d                           sama seperti --no-dereference --"
 "preserve=link\n"
 
-#: src/cp.c:177
+#: src/cp.c:178
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
 "                                 opened, remove it and try again (this "
@@ -2011,20 +2054,20 @@ msgid ""
 "  -H                           follow command-line symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:186
+#: src/cp.c:187
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
 "  -L, --dereference            always follow symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:190
+#: src/cp.c:191
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
 "                                 a previous -i option)\n"
 "  -P, --no-dereference         never follow symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:195
+#: src/cp.c:196
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
 "      --preserve[=ATTR_LIST]   preserve the specified attributes (default:\n"
@@ -2034,13 +2077,13 @@ msgid ""
 "                                 all\n"
 msgstr ""
 
-#: src/cp.c:203
+#: src/cp.c:204
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                use full source file name under DIRECTORY\n"
 msgstr ""
 
-#: src/cp.c:207
+#: src/cp.c:208
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
 "      --reflink[=WHEN]         control clone/CoW copies. See below\n"
@@ -2049,7 +2092,7 @@ msgid ""
 "force)\n"
 msgstr ""
 
-#: src/cp.c:213
+#: src/cp.c:214
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
 "      --strip-trailing-slashes  remove any trailing slashes from each "
@@ -2057,7 +2100,7 @@ msgid ""
 "                                 argument\n"
 msgstr ""
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -2066,7 +2109,7 @@ msgid ""
 "  -T, --no-target-directory    treat DEST as a normal file\n"
 msgstr ""
 
-#: src/cp.c:224
+#: src/cp.c:225
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
 "                                 than the destination file or when the\n"
@@ -2075,7 +2118,15 @@ msgid ""
 "  -x, --one-file-system        stay on this file system\n"
 msgstr ""
 
-#: src/cp.c:233
+#: src/cp.c:232
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/cp.c:240
 msgid ""
 "\n"
 "By default, sparse SOURCE files are detected by a crude heuristic and the\n"
@@ -2091,7 +2142,7 @@ msgid ""
 "fails, or if --reflink=auto is specified, fall back to a standard copy.\n"
 msgstr ""
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 msgid ""
 "\n"
 "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n"
@@ -2101,7 +2152,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2109,7 +2160,7 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2117,226 +2168,236 @@ msgid ""
 "regular file.\n"
 msgstr ""
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, c-format
 msgid "failed to preserve times for %s"
 msgstr "gagal mengekalkan masa bagi %s"
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, c-format
 msgid "failed to preserve permissions for %s"
 msgstr "gagal mengekalkan  keizinan bagi %s"
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, c-format
 msgid "cannot make directory %s"
 msgstr "tak dapat cipta direktori %s"
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr "%s wujud tapi ianya bukan direktori"
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
 #, fuzzy, c-format
 msgid "failed to access %s"
 msgstr "gagal mengekalkan masa bagi %s"
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, fuzzy, c-format
 msgid "missing file operand"
 msgstr "kehilangan hujah fail"
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, fuzzy, c-format
 msgid "missing destination file operand after %s"
 msgstr "kehilangan fail destinasi"
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, fuzzy, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr "tak dapat pindah direktori ke bukan-direktori: %s -> %s"
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, fuzzy, c-format
 msgid "target %s is not a directory"
 msgstr "Sasaran yang dinyatakan, %s adalah bukan direktori"
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, fuzzy, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr "bila mengekalkan path, destinasi mestilah direktori"
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, fuzzy, c-format
 msgid "multiple target directories specified"
 msgstr "banyak opsyen -l or -t dinyatakan"
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr ""
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr "tak dapat buat kecua-dua pautan simbolik dan keras"
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, fuzzy, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr "opseyn untuk menyatakan tarikh untuk dicetak adalah eksklusif"
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr ""
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr "jenis backup"
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, c-format
+msgid "cannot set target context and preserve it"
+msgstr ""
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr ""
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr ""
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr "input menghilang"
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr "%s: bilangan baris di luar julat"
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, fuzzy, c-format
 msgid "%s: %s: line number out of range"
 msgstr "%s: `%s': bilangan baris di luar julat"
 
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, fuzzy, c-format
 msgid " on repetition %s\n"
 msgstr " pada ulangan %d\n"
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, fuzzy, c-format
 msgid "%s: %s: match not found"
 msgstr "%s: `%s': padanan tak dijumpai"
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr "ralat pada carian ungkapan biasa (regexp)"
 
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, fuzzy, c-format
 msgid "write error for %s"
 msgstr "ralat menulis bagi `%s'"
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, fuzzy, c-format
 msgid "%s: integer expected after delimiter"
 msgstr "%s: integer dijangka selepas `%c'"
 
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, fuzzy, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr "%s: `}'  diperluka untuk kiraan ulangan"
 
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, fuzzy, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr "%s}: integer diperlukan diantara `{' dan `}'"
 
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, fuzzy, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr "%s: pemisah penutup `%c' hilang"
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr "%s: ungkapan biasa (regexp) tidak sah: %s"
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr "%s: corak tidak sah"
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr "%s: bilangan baris mesti lebih besar drpd sifar"
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr ""
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr ""
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr ""
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr "Pengspesifikasi penukaran tidak sah pada suffiks: %c"
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr "pengspesifikasi penukaran tidak sah pada suffiks: \\%.3o"
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, fuzzy, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr "Pengspesifikasi penukaran tidak sah pada suffiks: %c"
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr "terlalu banyak spesifikasi penukaran %% pada suffiks"
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr "kehilangan spesifikasi penukaran %% pada suffiks"
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr "%s: nombor tidak sah"
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr "Penggunaan: %s [OPSYEN]... FAIL CORAK...\n"
 
-#: src/csplit.c:1455
+#: src/csplit.c:1483
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
 "and output byte counts of each piece to standard output.\n"
 msgstr ""
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2344,20 +2405,24 @@ msgid ""
 "  -k, --keep-files           do not remove output files on errors\n"
 msgstr ""
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr ""
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
 "  -z, --elide-empty-files    remove empty output files\n"
 msgstr ""
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
 msgstr ""
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 msgid ""
 "\n"
 "  INTEGER            copy up to but not including specified line number\n"
@@ -2374,30 +2439,26 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr ""
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr ""
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, fuzzy, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr "Penggunaan: %s [OPSYEN]...[FAIL]...\n"
 
-#: src/cut.c:193
+#: src/cut.c:176
 #, fuzzy
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr ""
 "Cetak bahagian ibaris dipilih drpd setiap FAIL ke output piawai.\n"
 "\n"
 
-#: src/cut.c:199
+#: src/cut.c:182
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
 "  -c, --characters=LIST   select only these characters\n"
 "  -d, --delimiter=DELIM   use DELIM instead of TAB for field delimiter\n"
 msgstr ""
 
-#: src/cut.c:204
+#: src/cut.c:187
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
 "                            that contains no delimiter character, unless\n"
@@ -2405,20 +2466,20 @@ msgid ""
 "  -n                      (ignored)\n"
 msgstr ""
 
-#: src/cut.c:210
+#: src/cut.c:193
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
 "                            or fields\n"
 msgstr ""
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
 "                            the default is to use the input delimiter\n"
 msgstr ""
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2426,7 +2487,7 @@ msgid ""
 "in the same order that it is read, and is written exactly once.\n"
 msgstr ""
 
-#: src/cut.c:227
+#: src/cut.c:210
 msgid ""
 "Each range is one of:\n"
 "\n"
@@ -2438,59 +2499,63 @@ msgid ""
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
 
-#: src/cut.c:367 src/cut.c:493
+#: src/cut.c:300 src/cut.c:394
 #, fuzzy
 msgid "invalid byte, character or field list"
 msgstr "byte atau senarai medan tidak sah"
 
-#: src/cut.c:387
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr ""
+
+#: src/cut.c:320
 #, fuzzy
 msgid "invalid range with no endpoint: -"
 msgstr "opsyen lebar tidak sah: `%s'"
 
-#: src/cut.c:403
+#: src/cut.c:334
 #, fuzzy
 msgid "invalid decreasing range"
 msgstr "rentetan mod tidak sah: %s"
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, fuzzy, c-format
 msgid "byte offset %s is too large"
 msgstr "%s adalah terlalu besar"
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, fuzzy, c-format
 msgid "field number %s is too large"
 msgstr "nombor tidak sah %s"
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr "hanya satu jenis senarai boleh dinyatakan"
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr "pemisah mestilah aksara tunggal"
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr "anda mesti nyatakan senarai byte, aksara, atau medan"
 
-#: src/cut.c:850
+#: src/cut.c:790
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr ""
 
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
 msgstr ""
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr "kehilangan senarai medan"
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr "kehilangan senarai posisi"
 
@@ -2551,7 +2616,7 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 
 #: src/date.c:158
@@ -2720,10 +2785,10 @@ msgid ""
 "  $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n"
 msgstr ""
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr "input piawai"
@@ -2764,7 +2829,7 @@ msgstr ""
 msgid "cannot set date"
 msgstr "tak dapat menetapkan tarikh"
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, fuzzy, c-format
 msgid "time %s is out of range"
 msgstr "aksara di luar julat"
@@ -2775,7 +2840,7 @@ msgstr "aksara di luar julat"
 msgid "Paul Rubin"
 msgstr ""
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
@@ -2784,7 +2849,7 @@ msgstr ""
 "Pengunaan: %s [NOMBOR]...\n"
 "    atau: %s OPSYEN\n"
 
-#: src/dd.c:526
+#: src/dd.c:532
 #, fuzzy
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
@@ -2803,7 +2868,7 @@ msgstr ""
 "  count=BLOK     salin hanya  BLOK blok input\n"
 "  ibs=BAIT       baca BAIT bait dlm satu masa\n"
 
-#: src/dd.c:535
+#: src/dd.c:541
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
 "  iflag=FLAGS     read as per the comma separated symbol list\n"
@@ -2816,8 +2881,7 @@ msgid ""
 "                  'noxfer' suppresses transfer stats, 'none' suppresses all\n"
 msgstr ""
 
-#: src/dd.c:546
-#, fuzzy
+#: src/dd.c:552
 msgid ""
 "\n"
 "N and BYTES may be followed by the following multiplicative suffixes:\n"
@@ -2827,12 +2891,8 @@ msgid ""
 "Each CONV symbol may be:\n"
 "\n"
 msgstr ""
-"\n"
-"SAIZ boleh jadi (atau boleh jadi intege diikuti dengan berikut) satu drpd "
-"berikut:\n"
-"kB 1000, K 1024, MB 1,000,000, M 1,048,576, dan lagi bagi G, T, P, E, Z, Y.\n"
 
-#: src/dd.c:555
+#: src/dd.c:561
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
 "  ebcdic    from ASCII to EBCDIC\n"
@@ -2847,7 +2907,7 @@ msgid ""
 "            with block or unblock, pad with spaces rather than NULs\n"
 msgstr ""
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -2857,7 +2917,7 @@ msgid ""
 "  fsync     likewise, but also write metadata\n"
 msgstr ""
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -2866,76 +2926,76 @@ msgid ""
 "suggested)\n"
 msgstr ""
 
-#: src/dd.c:583
+#: src/dd.c:589
 msgid "  cio       use concurrent I/O for data\n"
 msgstr ""
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr ""
 
-#: src/dd.c:587
+#: src/dd.c:593
 #, fuzzy
 msgid "  directory  fail unless a directory\n"
 msgstr "%s: Direktori sasaran yang dinyatakan adalah bukan direktori"
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr ""
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr ""
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr ""
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr ""
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr ""
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr ""
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr ""
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr ""
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr ""
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr ""
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr ""
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, c-format
 msgid ""
 "\n"
@@ -2952,28 +3012,38 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
 "%<PRIuMAX>+%<PRIuMAX> records out\n"
 msgstr ""
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr ""
 
@@ -2987,279 +3057,273 @@ msgstr ""
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
 msgstr ""
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, c-format
 msgid "closing input file %s"
 msgstr "menutup fail input %s"
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr "menutup fail output %s"
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr ""
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, c-format
 msgid "writing to %s"
 msgstr "Menulis  ke %s."
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, fuzzy, c-format
 msgid "unrecognized operand %s"
 msgstr "opsyen tidak dikenali %s"
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 #, fuzzy
 msgid "invalid conversion"
 msgstr "penukaran tidak sah: %s"
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 #, fuzzy
 msgid "invalid input flag"
 msgstr "nombor tidak sah %s"
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 #, fuzzy
 msgid "invalid output flag"
 msgstr "kumpulan tidak sah"
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 #, fuzzy
 msgid "invalid status flag"
 msgstr "pengguna tidak sah %s"
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, c-format
 msgid "invalid number %s"
 msgstr "nombor tidak sah %s"
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr ""
 
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, fuzzy, c-format
 msgid "cannot combine block and unblock"
 msgstr "tak dapat omit kedua-dua pengguna dan kumpulan"
 
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, fuzzy, c-format
 msgid "cannot combine lcase and ucase"
 msgstr "tak boleh banding nama fail %s dan %s"
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, fuzzy, c-format
 msgid "cannot combine excl and nocreat"
 msgstr "tak boleh gabungkan isyarat dengan -l atau -t"
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, fuzzy, c-format
 msgid "cannot combine direct and nocache"
 msgstr "tak dapat menentukan peranti dan inod bagi %s"
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
 "  of mt_type=0x%0lx -- see <sys/mtio.h> for the list of types"
 msgstr ""
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, fuzzy, c-format
 msgid "%s: cannot skip"
 msgstr "%s: tak dapat buang"
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, fuzzy, c-format
 msgid "%s: cannot seek"
 msgstr "%s: tak dapat buang"
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr ""
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr ""
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr ""
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, fuzzy, c-format
 msgid "setting flags for %s"
 msgstr "menetapkan masa untuk %s"
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, fuzzy, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr "tak boleh mencipta fifo %s"
 
-#: src/dd.c:2133
+#: src/dd.c:2172
 #, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
 msgstr ""
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr ""
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, fuzzy, c-format
 msgid "fsync failed for %s"
 msgstr "gagal mengekalkan masa bagi %s"
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, fuzzy, c-format
 msgid "failed to open %s"
 msgstr "gagal mengekalkan masa bagi %s"
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
 "blocks"
 msgstr ""
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr ""
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, fuzzy, c-format
 msgid "failed to discard cache for: %s"
 msgstr "gagal mengekalkan masa bagi %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr ""
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr "Sistem fail"
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr "Jenis"
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr "blok"
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr "Diguna"
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr "Ada"
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr "Guna%"
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr "Inod"
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr "IDiguna"
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr "IBebas"
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr "IGuna%"
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr "Dilekapkan pada"
 
-#: src/df.c:383
-#, c-format
-msgid "option --output: field '%s' unknown"
+#: src/df.c:207
+msgid "File"
 msgstr ""
 
-#: src/df.c:390
+#: src/df.c:387
 #, fuzzy, c-format
-msgid "option --output: field '%s' used more than once"
+msgid "option --output: field %s unknown"
+msgstr "menutup fail output %s"
+
+#: src/df.c:394
+#, fuzzy, c-format
+msgid "option --output: field %s used more than once"
 msgstr "Amaran: fail sumber %s dinyatakan lebih drpd sekali"
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr "Saiz"
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr "Ada"
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr "Kapasiti"
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
 msgstr ""
 
-#: src/df.c:1210
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr ""
+
+#: src/df.c:1384
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
 "or all file systems by default.\n"
 msgstr ""
 
-#: src/df.c:1217
-#, fuzzy
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
-"  -a, --all             termasuk sistemfail yang mempunyai 0 blok\n"
-"  -B, --block-size=SIZE guna blok SIZE-byte\n"
-"  -h, --human-readable  cetak saiz dalam format bolehdibaca manusia (e.g., "
-"1K 234M 2G)\n"
-"  -H, --si              sebaliknya, guna kuasa 1000 bukannya 1024\n"
 
-#: src/df.c:1227
+#: src/df.c:1402
 #, fuzzy
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
@@ -3274,7 +3338,7 @@ msgstr ""
 "      --no-sync         jangan panggil sync sebelum mendapat maklumat "
 "penggunaan (default)\n"
 
-#: src/df.c:1234
+#: src/df.c:1409
 #, fuzzy
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
@@ -3296,43 +3360,34 @@ msgstr ""
 "JENIS\n"
 "  -v                    (diabaikan)\n"
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
 
-#: src/df.c:1285
+#: src/df.c:1460
 #, fuzzy, c-format
 msgid "options %s and %s are mutually exclusive"
 msgstr "opseyn untuk menyatakan tarikh untuk dicetak adalah eksklusif"
 
-#: src/df.c:1335
-#, fuzzy
-msgid "warning: "
-msgstr "Amaran: "
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr ""
-
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr ""
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr "Amaran: "
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 #, fuzzy
 msgid "cannot read table of mounted file systems"
 msgstr "%stak dapat membaca jadual sistemfail dilekapkan"
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr ""
@@ -3342,7 +3397,7 @@ msgstr ""
 msgid "H. Peter Anvin"
 msgstr ""
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr "Penggunaan: %s [OPSYEN]...[FAIL]...\n"
@@ -3417,7 +3472,7 @@ msgid ""
 msgstr ""
 
 #: src/dirname.c:59
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/dirname.c:64
@@ -3430,7 +3485,7 @@ msgid ""
 "  %s stdio.h            -> \".\"\n"
 msgstr ""
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -3439,17 +3494,16 @@ msgstr ""
 "Penggunaan: %s [OPTION]... GROUP FILE...\n"
 "      atau:  %s [OPTION]... --reference=RFILE FILE...\n"
 
-#: src/du.c:274
+#: src/du.c:285
 #, fuzzy
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr ""
 "Ringkasan penggunaan cakera bagi setiap FAIL, rekursif bagi direktori.\n"
 "\n"
 
-#: src/du.c:280
+#: src/du.c:291
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3458,12 +3512,11 @@ msgid ""
 "                          fragmentation, indirect blocks, and the like\n"
 msgstr ""
 
-#: src/du.c:289
-#, fuzzy
+#: src/du.c:300
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3474,27 +3527,19 @@ msgid ""
 "                          line argument;  --max-depth=0 is the same as\n"
 "                          --summarize\n"
 msgstr ""
-"      --block-size=SAIZ      guna blok SAIZ-byte\n"
-"  -B, --ignore-backups       jangan senarai kemasukan berakhir dengan ~\n"
-"  -c                         dengan -lt: isih dengan, dan papar, ctime "
-"(masa\n"
-"                               terkahir diubahsuai drpd maklumat status "
-"fail)\n"
-"                               dengan -l: papar ctime dan isih mengikut "
-"nama\n"
-"                               sebaliknya: isih mengikut ctime\n"
 
-#: src/du.c:302
+#: src/du.c:313
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
 
-#: src/du.c:310
+#: src/du.c:322
 msgid ""
 "  -k                    like --block-size=1K\n"
 "  -L, --dereference     dereference all symbolic links\n"
@@ -3502,16 +3547,17 @@ msgid ""
 "  -m                    like --block-size=1M\n"
 msgstr ""
 
-#: src/du.c:316
+#: src/du.c:328
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
 
-#: src/du.c:322
+#: src/du.c:334
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
 "                          or entries greater than SIZE if negative\n"
@@ -3520,78 +3566,78 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
 msgstr ""
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
 "  -x, --one-file-system    skip directories on different file systems\n"
 msgstr ""
 
-#: src/du.c:386
+#: src/du.c:398
 msgid "Infinity"
 msgstr ""
 
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr ""
-
-#: src/du.c:624
+#: src/du.c:636
 #, fuzzy, c-format
 msgid "fts_read failed: %s"
 msgstr "fail biasa"
 
-#: src/du.c:780
+#: src/du.c:787
 #, c-format
 msgid "invalid maximum depth %s"
 msgstr "Kedalaman maksimum %s"
 
-#: src/du.c:809
+#: src/du.c:816
 #, fuzzy, c-format
 msgid "invalid --threshold argument '-0'"
 msgstr "hujah tidak sah %s bagi %s"
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr "tak dapat meringkaskan dan menunjukkan semua kemasukan"
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr "amaran: peringkasan sama seperti menggunakan --max-depth=0"
 
-#: src/du.c:900
+#: src/du.c:911
 #, fuzzy, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr "amaran: peringkasan konflik dengan --max-depth=%d"
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 msgid "file operands cannot be combined with --files0-from"
 msgstr ""
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr "%s: ralat penulisan"
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr ""
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 #, fuzzy
 msgid "invalid zero-length file name"
 msgstr "nama kumpulan tak dah %s"
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr "jumlah"
 
@@ -3678,7 +3724,7 @@ msgstr ""
 #: src/env.c:61
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
 
@@ -3749,16 +3795,16 @@ msgid "input line is too long"
 msgstr "%s: fail terlalu panjang"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr ""
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
@@ -3767,7 +3813,7 @@ msgstr ""
 "Pengunaan: %s UNGKAPAN\n"
 "    atau: %s OPSYEN\n"
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -3778,7 +3824,7 @@ msgid ""
 "  ARG1 & ARG2       ARG1 if neither argument is null or 0, otherwise 0\n"
 msgstr ""
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -3789,14 +3835,14 @@ msgid ""
 "  ARG1 > ARG2       ARG1 is greater than ARG2\n"
 msgstr ""
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
 "  ARG1 - ARG2       arithmetic difference of ARG1 and ARG2\n"
 msgstr ""
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -3805,7 +3851,7 @@ msgid ""
 "  ARG1 % ARG2       arithmetic remainder of ARG1 divided by ARG2\n"
 msgstr ""
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -3816,7 +3862,7 @@ msgid ""
 "  length STRING              length of STRING\n"
 msgstr ""
 
-#: src/expr.c:251
+#: src/expr.c:250
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
 "                               keyword like 'match' or an operator like '/'\n"
@@ -3824,7 +3870,7 @@ msgid ""
 "  ( EXPRESSION )             value of EXPRESSION\n"
 msgstr ""
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -3834,7 +3880,7 @@ msgid ""
 "0.\n"
 msgstr ""
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -3842,32 +3888,32 @@ msgid ""
 "or 0, 2 if EXPRESSION is syntactically invalid, and 3 if an error occurred.\n"
 msgstr ""
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, c-format
 msgid "syntax error"
 msgstr "Ralat sintaks"
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, fuzzy, c-format
 msgid "error in regular expression matcher"
 msgstr "ralat pada carian ungkapan biasa (regexp)"
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, fuzzy, c-format
 msgid "non-integer argument"
 msgstr "hujah bukan-numerik"
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr "dibahagi dengan sifar"
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, fuzzy, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr "Tetapkan LC_ALL='C' untuk mengatasi masalah."
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, fuzzy, c-format
 msgid "the strings compared were %s and %s"
 msgstr "Rentetan dibandingkan adalah %s dan %s."
@@ -3877,27 +3923,27 @@ msgstr "Rentetan dibandingkan adalah %s dan %s."
 msgid "Niels Moller"
 msgstr ""
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
 msgstr ""
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
 msgstr ""
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, fuzzy, c-format
 msgid "%s is not a valid positive integer"
 msgstr "`%s' adalah bukan integer positif yang sah"
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr "%s adalah terlalu besar"
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
@@ -3906,7 +3952,7 @@ msgstr ""
 "Pengunaan: %s [NOMBOR]...\n"
 "    atau: %s OPSYEN\n"
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 #, fuzzy
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
@@ -4001,28 +4047,28 @@ msgid "invalid number of columns: %s"
 msgstr "bilangan kolum tidak sah: `%s'"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr ""
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, fuzzy, c-format
 msgid "Usage: %s\n"
 msgstr "Pengunan: %s [OPSYEN]\n"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
 msgstr ""
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, fuzzy, c-format
 msgid "failed to get groups for user %s"
 msgstr "gagal menukar kumpulan %s ke %s\n"
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, fuzzy, c-format
 msgid "failed to get groups for the current process"
 msgstr "gagal menukar kumpulan %s ke %s\n"
@@ -4044,35 +4090,32 @@ msgid ""
 "the current process (which may differ if the groups database has changed).\n"
 msgstr ""
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, fuzzy, c-format
 msgid "cannot get real UID"
 msgstr "tak dapat stat %s"
 
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, fuzzy, c-format
 msgid "cannot get effective GID"
-msgstr "tak dapat membuang %s"
+msgstr "Tak dapat perolehi masa bagi hari"
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, fuzzy, c-format
 msgid "cannot get real GID"
 msgstr "tak dapat stat %s"
 
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, fuzzy, c-format
 msgid "%s: no such user"
 msgstr "%s: Tiada pengguna sebegitu"
 
 #: src/head.c:109
-#, fuzzy
 msgid ""
 "Print the first 10 lines of each FILE to standard output.\n"
 "With more than one FILE, precede each with a header giving the file name.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
-"\n"
-"Dengan tiada FAIL, atau bila FAIL adalah -, baca input piawai.\n"
 
 #: src/head.c:117
 msgid ""
@@ -4105,58 +4148,48 @@ msgstr ""
 "berikut:\n"
 "kB 1000, K 1024, MB 1,000,000, M 1,048,576, dan lagi bagi G, T, P, E, Z, Y.\n"
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr ""
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, fuzzy, c-format
 msgid "%s: number of bytes is too large"
 msgstr "nombor tidak sah %s"
 
-#: src/head.c:440
-#, fuzzy, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr "tak boleh mencipta fifo %s"
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, fuzzy, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr "tak dapat lseek %s"
 
-#: src/head.c:673
-#, fuzzy, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "%s: tak dapat buang"
-
-#: src/head.c:798
+#: src/head.c:423 src/tail.c:457
 #, fuzzy, c-format
-msgid "cannot reposition file pointer for %s"
-msgstr "tak memperolehi setem masa bagi %s"
+msgid "%s: cannot seek to relative offset %s"
+msgstr "tak boleh mencipta fifo %s"
 
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr "%s: %s adalah terlalu besar dan tak boleh diperwakilkan"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr "bilangan baris"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr "bilangan byte"
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr "bilangan baris tidak sah"
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr "bilangan byte tidak sah"
 
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, fuzzy, c-format
 msgid "invalid trailing option -- %c"
 msgstr "opsyen tidak sah -- %c"
@@ -4202,28 +4235,34 @@ msgid "cannot determine hostname"
 msgstr "tak dapat menentukan namahos"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr ""
 
-#: src/id.c:81
-#, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
-msgstr "Penggunaan: %s [OPSYEN]...[NAMAPENGGUNA]\n"
+#: src/id.c:84
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]... [USER]\n"
+msgstr "Penggunaan: %s [OPSYEN]...[FAIL]...\n"
 
-#: src/id.c:82
-#, fuzzy
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
+msgstr ""
+
+#: src/id.c:90
+#, fuzzy
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
 msgstr ""
 "Cetak maklumat bagu NAMAPENGGUNA, atau pengguna semasa.\n"
 "\n"
@@ -4234,7 +4273,7 @@ msgstr ""
 "  -r, --real      cetak ID sebenar selain drpd ID efektif, dengan -ugG\n"
 "  -u, --user      cetak hanya ID pengguna efektif\n"
 
-#: src/id.c:96
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
@@ -4243,116 +4282,126 @@ msgstr ""
 "Tanpa sebarang OPSYEN, cetak semua set berguna bagi maklumat yg "
 "dikenalpasti.\n"
 
-#: src/id.c:140
+#: src/id.c:151
+#, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr ""
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr ""
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr ""
 
-#: src/id.c:178
+#: src/id.c:198
 #, fuzzy, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr "tak boleh nyatakan masa lebih daripada satu sumber"
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr "tak dapat cetak hanya nama atau ID sebenar dlm format default"
 
-#: src/id.c:199
+#: src/id.c:209
+#, fuzzy, c-format
+msgid "option --zero not permitted in default format"
+msgstr "tak dapat cetak hanya nama atau ID sebenar dlm format default"
+
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
 msgstr ""
 
-#: src/id.c:224
+#: src/id.c:265
 #, fuzzy, c-format
 msgid "cannot get effective UID"
-msgstr "tak dapat membuang %s"
+msgstr "Tak dapat perolehi masa bagi hari"
 
-#: src/id.c:311
+#: src/id.c:354
 #, fuzzy, c-format
 msgid "cannot find name for user ID %s"
 msgstr "tak dapat menjumpai nama bagi ID pengguna %u"
 
-#: src/id.c:329
+#: src/id.c:372
 #, c-format
 msgid "uid=%s"
 msgstr ""
 
-#: src/id.c:334
+#: src/id.c:377
 #, c-format
 msgid " gid=%s"
 msgstr ""
 
-#: src/id.c:341
+#: src/id.c:384
 #, c-format
 msgid " euid=%s"
 msgstr ""
 
-#: src/id.c:349
+#: src/id.c:392
 #, c-format
 msgid " egid=%s"
 msgstr ""
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr " kumpulan="
 
-#: src/id.c:393
+#: src/id.c:437
 #, c-format
 msgid " context=%s"
 msgstr ""
 
-#: src/install.c:373
+#: src/install.c:376
 #, fuzzy, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr "Gagal menukar direktori %s "
 
-#: src/install.c:414
+#: src/install.c:417
 #, c-format
 msgid "creating directory %s"
 msgstr "mencipta direktori %s"
 
-#: src/install.c:482
+#: src/install.c:485
 #, fuzzy, c-format
 msgid "cannot change ownership of %s"
 msgstr "tak dapat menukar keizinan %s"
 
-#: src/install.c:506
+#: src/install.c:509
 #, c-format
 msgid "cannot set time stamps for %s"
 msgstr "Tak dapat tetapkan setem masa bagi %s"
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, c-format
 msgid "fork system call failed"
 msgstr "panggilan sistem fork() gagal"
 
-#: src/install.c:531
+#: src/install.c:535
 #, fuzzy, c-format
 msgid "cannot run %s"
 msgstr "takboleh nyahpaut %s"
 
-#: src/install.c:535
+#: src/install.c:539
 #, fuzzy, c-format
 msgid "waiting for strip"
 msgstr "Menulis  ke %s."
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr ""
 
-#: src/install.c:558
+#: src/install.c:565
 #, c-format
 msgid "invalid user %s"
 msgstr "pengguna tidak sah %s"
 
-#: src/install.c:594
+#: src/install.c:601
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -4364,7 +4413,7 @@ msgstr ""
 "   atau:  %s [OPSYEN]... SUMBER... DIREKTORI\n"
 "   atau:  %s [OPSYEN]... --target-directory=DIREKTORI SUMBER...\n"
 
-#: src/install.c:601
+#: src/install.c:608
 #, fuzzy
 msgid ""
 "\n"
@@ -4384,7 +4433,7 @@ msgstr ""
 "Pada format ke tiga, cipta semua komponen bagi DIREKTORI yg diberi.\n"
 "\n"
 
-#: src/install.c:615
+#: src/install.c:622
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
 "  -b                  like --backup but does not accept an argument\n"
@@ -4396,7 +4445,7 @@ msgid ""
 "                        components of the specified directories\n"
 msgstr ""
 
-#: src/install.c:624
+#: src/install.c:631
 #, fuzzy
 msgid ""
 "  -D                  create all leading components of DEST except the "
@@ -4418,7 +4467,7 @@ msgstr ""
 "drpd rwxr-xr-x\n"
 "  -o, --owner=PEMILIK  tetapkan pemilikan (super-user sahaja)\n"
 
-#: src/install.c:631
+#: src/install.c:638
 #, fuzzy
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
@@ -4439,60 +4488,57 @@ msgstr ""
 "  -S, --suffix=SUFFIKS tindih suffiks backup biasa\n"
 "  -v, --verbose        cetak nama bagi setiap direktori bila ianya diipta\n"
 
-#: src/install.c:641
+#: src/install.c:648
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
 
-#: src/install.c:859
+#: src/install.c:696 src/unlink.c:86
 #, c-format
-msgid ""
-"WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
-msgstr ""
+msgid "cannot unlink %s"
+msgstr "takboleh nyahpaut %s"
 
-#: src/install.c:869
+#: src/install.c:877
 #, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
+msgid ""
+"WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
 msgstr ""
 
-#: src/install.c:886
+#: src/install.c:917
 #, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr "opsyen dikikis tak boleh digunakan bila memasang direktori"
 
-#: src/install.c:889
+#: src/install.c:920
 #, fuzzy, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr "opsyen dikikis tak boleh digunakan bila memasang direktori"
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr ""
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, c-format
 msgid "invalid mode %s"
 msgstr "mod tak sah %s"
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr ""
 
-#: src/install.c:959
+#: src/install.c:1001
 #, fuzzy, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr "opseyn untuk menyatakan tarikh untuk dicetak adalah eksklusif"
 
-#: src/install.c:966
+#: src/install.c:1008
 #, fuzzy, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr "opseyn untuk menyatakan tarikh untuk dicetak adalah eksklusif"
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -4504,7 +4550,7 @@ msgstr ""
 msgid "Mike Haertel"
 msgstr ""
 
-#: src/join.c:191
+#: src/join.c:195
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
 "standard output.  The default join field is the first, delimited\n"
@@ -4515,7 +4561,7 @@ msgid ""
 "  -e EMPTY          replace missing input fields with EMPTY\n"
 msgstr ""
 
-#: src/join.c:200
+#: src/join.c:204
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
 "  -j FIELD          equivalent to '-1 FIELD -2 FIELD'\n"
@@ -4523,7 +4569,7 @@ msgid ""
 "  -t CHAR           use CHAR as input and output field separator\n"
 msgstr ""
 
-#: src/join.c:206
+#: src/join.c:210
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
 "  -1 FIELD          join on this FIELD of file 1\n"
@@ -4535,7 +4581,11 @@ msgid ""
 "                      print them without trying to pair them\n"
 msgstr ""
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr ""
+
+#: src/join.c:225
 msgid ""
 "\n"
 "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n"
@@ -4554,47 +4604,47 @@ msgid ""
 "warning message will be given.\n"
 msgstr ""
 
-#: src/join.c:403
+#: src/join.c:410
 #, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
 msgstr ""
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, fuzzy, c-format
 msgid "invalid field number: %s"
 msgstr "bilangan medan tidak sah: `%s'"
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, fuzzy, c-format
 msgid "invalid field specifier: %s"
 msgstr "pengspesifikasi medan tidak sah: `%s'"
 
-#: src/join.c:877
+#: src/join.c:884
 #, fuzzy, c-format
 msgid "invalid file number in field spec: %s"
 msgstr "nombor tidak sah %s"
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr ""
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr ""
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, fuzzy, c-format
 msgid "multi-character tab %s"
 msgstr "aksara tidak sah pada %s pada rentetan mod %s"
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr ""
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr "kedua-dua fail tak boleh menjadi input piawai"
@@ -4707,47 +4757,47 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr "tak dapat mencipta pautan %s ke %s"
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr "%s: pautan keras tidak diizinkan bagi direktori"
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, c-format
 msgid "%s: cannot overwrite directory"
 msgstr "%s: tak dapat menindih direktori"
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
 msgstr "%s: mengganti %s? "
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, fuzzy, c-format
 msgid "failed to create symbolic link %s"
 msgstr "tak dapat mencipta pautan simbolik %s"
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, fuzzy, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr "tak dapat mencipta pautan simbolik %s ke %s"
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, fuzzy, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr "tak dapat mencipta pautan keras %s ke %s"
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, fuzzy, c-format
 msgid "failed to create hard link %s"
 msgstr "tak dapat mencipta pautan keras %s ke %s"
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, fuzzy, c-format
 msgid "failed to create hard link %s => %s"
 msgstr "tak dapat mencipta pautan keras %s ke %s"
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -4759,7 +4809,7 @@ msgstr ""
 "  atau:  %s [OPSYEN]... SUMBER... DIREKTORI   (format ke dua)\n"
 "  atau:  %s -d [OPSYEN]... DIREKTORI...       (format ke tiga)\n"
 
-#: src/ln.c:381
+#: src/ln.c:398
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
 "In the 2nd form, create a link to TARGET in the current directory.\n"
@@ -4771,7 +4821,7 @@ msgid ""
 "interpreted in relation to its parent directory.\n"
 msgstr ""
 
-#: src/ln.c:394
+#: src/ln.c:411
 #, fuzzy
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
@@ -4792,7 +4842,7 @@ msgstr ""
 "  -d                           sama seperti --no-dereference --"
 "preserve=link\n"
 
-#: src/ln.c:402
+#: src/ln.c:419
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
 "  -L, --logical               dereference TARGETs that are symbolic links\n"
@@ -4804,7 +4854,7 @@ msgid ""
 "  -s, --symbolic              make symbolic links instead of hard links\n"
 msgstr ""
 
-#: src/ln.c:411
+#: src/ln.c:428
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
 "  -t, --target-directory=DIRECTORY  specify the DIRECTORY in which to "
@@ -4814,7 +4864,7 @@ msgid ""
 "  -v, --verbose               print name of each linked file\n"
 msgstr ""
 
-#: src/ln.c:433
+#: src/ln.c:450
 #, c-format
 msgid ""
 "\n"
@@ -4822,12 +4872,12 @@ msgid ""
 "behavior when a TARGET is a symbolic link, defaulting to %s.\n"
 msgstr ""
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, fuzzy, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr "%s: Direktori sasaran yang dinyatakan adalah bukan direktori"
 
-#: src/ln.c:588
+#: src/ln.c:605
 #, fuzzy, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr "tak dapat mencipta pautan simbolik %s"
@@ -4860,7 +4910,7 @@ msgstr "%s: tiada nama logmasuk\n"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
@@ -4869,97 +4919,97 @@ msgstr "%b %e  %Y"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 msgid "%b %e %H:%M"
 msgstr "%b %e %H:%M"
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr ""
 "mengabai nilai pembolehubah persekitaran QUOTING_STYLE yang tidak sah: %s"
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr "mengabai lebar yg. tak sah pada pembolehubah persekitaran COLUMNS: %s"
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr ""
 "mengabai saiz tab yg. tak sah pada pembolehubah persekitaran TABSIZE: %s"
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, c-format
 msgid "invalid line width: %s"
 msgstr "lebar baris tidak sah: %s"
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, c-format
 msgid "invalid tab size: %s"
 msgstr "saiz tab tidak sah: %s"
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, c-format
 msgid "invalid time style format %s"
 msgstr "format gaya tarikh tidak sah %s"
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 #, fuzzy
 msgid "Valid arguments are:\n"
 msgstr "Hujah sah adalah:"
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr ""
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr ""
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, c-format
 msgid "unrecognized prefix: %s"
 msgstr "prefix tidak dikenali: %s"
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr "nilai pembolehubah persekitaran LS_COLORS tidak boleh dihantar"
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, c-format
 msgid "cannot open directory %s"
 msgstr "tak dapat membuka direktori %s"
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, c-format
 msgid "cannot determine device and inode of %s"
 msgstr "tak dapat menentukan peranti dan inod bagi %s"
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, fuzzy, c-format
 msgid "%s: not listing already-listed directory"
 msgstr "tak dapat menyenaraikan direktori tersedia-tersenarai: %s"
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, c-format
 msgid "reading directory %s"
 msgstr "membaca direktori %s"
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, fuzzy, c-format
 msgid "closing directory %s"
 msgstr "mencipta direktori %s"
 
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, c-format
 msgid "cannot compare file names %s and %s"
 msgstr "tak boleh banding nama fail %s dan %s"
 
-#: src/ls.c:4721
+#: src/ls.c:4781
 #, fuzzy
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
@@ -4969,7 +5019,7 @@ msgstr ""
 "Inih semasukan mengikut abjad jika tiada  -cftuSUX atau --sort.\n"
 "\n"
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 #, fuzzy
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
@@ -4983,18 +5033,18 @@ msgstr ""
 "      --author               cetak penulis bagi setiap fail\n"
 "  -b, --escape               cetak escape oktal bagi aksara bukangrafik\n"
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 #, fuzzy
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
 "      --block-size=SAIZ      guna blok SAIZ-byte\n"
@@ -5007,16 +5057,15 @@ msgstr ""
 "nama\n"
 "                               sebaliknya: isih mengikut ctime\n"
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 #, fuzzy
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 "  -C                         senarai kemasukan mengikut kolum\n"
@@ -5027,7 +5076,7 @@ msgstr ""
 "kandungannya\n"
 "  -D, --dired                jana output direka untuk mod dired Emacs\n"
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 #, fuzzy
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
@@ -5043,23 +5092,24 @@ msgstr ""
 "                               kolum-tunggal -1, verbose -l, menegak -C\n"
 "      --full-time            seperti -l --time-style=full-iso\n"
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr ""
 
-#: src/ls.c:4763
+#: src/ls.c:4823
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 
-#: src/ls.c:4769
+#: src/ls.c:4829
 #, fuzzy
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
@@ -5069,20 +5119,20 @@ msgstr ""
 "1K 234M 2G)\n"
 "  -H, --si              sebaliknya, guna kuasa 1000 bukannya 1024\n"
 
-#: src/ls.c:4775
+#: src/ls.c:4835
 msgid ""
 "  -H, --dereference-command-line\n"
 "                             follow symbolic links listed on the command "
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
 msgstr ""
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
 "names:\n"
@@ -5091,10 +5141,10 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -5104,7 +5154,7 @@ msgid ""
 "entries\n"
 msgstr ""
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -5115,11 +5165,11 @@ msgid ""
 "                             append / indicator to directories\n"
 msgstr ""
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -5127,7 +5177,7 @@ msgid ""
 "escape\n"
 msgstr ""
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 #, fuzzy
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
@@ -5139,56 +5189,59 @@ msgstr ""
 "  -R, --recursive            senarai subdirektori secara rekursif\n"
 "  -s, --size                 cetak saiz bagi setiap fail, dalam blok\n"
 
-#: src/ls.c:4825
+#: src/ls.c:4886
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 
-#: src/ls.c:4835
+#: src/ls.c:4896
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
 msgstr ""
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 msgid ""
 "  -t                         sort by modification time, newest first\n"
 "  -T, --tabsize=COLS         assume tab stops at each COLS instead of 8\n"
 msgstr ""
 
-#: src/ls.c:4848
+#: src/ls.c:4912
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
 msgstr ""
 
-#: src/ls.c:4855
+#: src/ls.c:4919
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -5197,7 +5250,7 @@ msgid ""
 "variable can change the settings.  Use the dircolors command to set it.\n"
 msgstr ""
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -5268,19 +5321,16 @@ msgstr ""
 #: src/md5sum.c:195
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, c-format
 msgid ""
 "\n"
@@ -5290,130 +5340,153 @@ msgid ""
 "space for text), and name for each FILE.\n"
 msgstr ""
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, c-format
 msgid "%s: too many checksum lines"
 msgstr ""
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr ""
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr ""
 
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr "GAGAL"
 
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr "OK"
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr ""
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
 msgstr ""
 
-#: src/md5sum.c:766
+#: src/md5sum.c:770
 #, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr ""
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
 msgstr ""
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr ""
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr ""
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr ""
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr ""
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr "Penggunaan: %s [OPSYEN]... DIREKTORI...\n"
 
-#: src/mkdir.c:57
+#: src/mkdir.c:59
 #, fuzzy
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
 msgstr ""
 "Cipta DIREKTORI, jika ia belum wujud.\n"
 "\n"
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 
-#: src/mkdir.c:168
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/mkdir.c:127 src/mkdir.c:172
+#, fuzzy, c-format
+msgid "failed to set default creation context for %s"
+msgstr "gagal mendapatkan atribut bagi %s"
+
+#: src/mkdir.c:191
+#, fuzzy, c-format
+msgid "failed to restore context for %s"
+msgstr "gagal mengekalkan masa bagi %s"
+
+#: src/mkdir.c:231
 #, c-format
 msgid "created directory %s"
 msgstr "direktori %s dicipta"
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr ""
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr "Penggunaan: %s [OPSYEN] NAMA...\n"
 
-#: src/mkfifo.c:52
+#: src/mkfifo.c:54
 #, fuzzy
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
 msgstr ""
 "Cipta paip bernama (FIFO) dengan NAMA diberi.\n"
 "\n"
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 #, fuzzy
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
@@ -5421,38 +5494,41 @@ msgstr ""
 "  -m, --mode=MOD    tetapkan mod keizinan (seperti dlm chmod), bukan umask "
 "a=rw\n"
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, c-format
 msgid "invalid mode"
 msgstr "mod tak sah"
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr ""
 
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
+#, c-format
+msgid "cannot set permissions of %s"
+msgstr "tak dapat menetapkan keizinan bagi %s"
+
+#: src/mknod.c:54
 #, c-format
 msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr "Penggunaan: %s [OPSYEN]... NAMA JENIS [MAJOR MINOR]\n"
 
-#: src/mknod.c:54
+#: src/mknod.c:56
 #, fuzzy
 msgid "Create the special file NAME of the given TYPE.\n"
 msgstr ""
 "Cipta NAMA fail istimewa bagi JENIS diberi.\n"
 "\n"
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr ""
-
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -5461,7 +5537,7 @@ msgid ""
 "otherwise, as decimal.  TYPE may be:\n"
 msgstr ""
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 msgid ""
 "\n"
 "  b      create a block (buffered) special file\n"
@@ -5469,155 +5545,149 @@ msgid ""
 "  p      create a FIFO\n"
 msgstr ""
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 #, fuzzy
 msgid "Special files require major and minor device numbers."
 msgstr ""
 "bila mencipta fail istimewa blok, nombor peranti major\n"
 " dan minor mesti dinyatakan"
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 #, fuzzy
 msgid "Fifos do not have major and minor device numbers."
 msgstr "nombor peranti minor tidak sah %s"
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, c-format
 msgid "block special files not supported"
 msgstr "fail istimewa blok tidak disokong"
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, c-format
 msgid "character special files not supported"
 msgstr "fail istimewa aksara tidak disokong"
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, c-format
 msgid "invalid major device number %s"
 msgstr "nombor peranti major tidak sah %s"
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, c-format
 msgid "invalid minor device number %s"
 msgstr "nombor peranti minor tidak sah %s"
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, c-format
 msgid "invalid device %s %s"
 msgstr "peranti tidak sah %s %s"
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, fuzzy, c-format
 msgid "invalid device type %s"
 msgstr "peranti tidak sah %s %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr ""
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr "Penggunaan: %s [OPSYEN]...[FAIL]...\n"
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
 "TEMPLATE must contain at least 3 consecutive 'X's in last component.\n"
 "If TEMPLATE is not specified, use tmp.XXXXXXXXXX, and --tmpdir is implied.\n"
 msgstr ""
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
 "  -q, --quiet         suppress diagnostics about file/dir-creation failure\n"
 msgstr ""
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
 msgstr ""
 
-#: src/mktemp.c:223
-#, fuzzy, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr "menutup output piawai"
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, fuzzy, c-format
 msgid "too many templates"
 msgstr "terlalu banyak hujah"
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr ""
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr ""
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr ""
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr ""
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr ""
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, fuzzy, c-format
 msgid "failed to create directory via template %s"
 msgstr "tak dapat mencipta direktori %s"
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, fuzzy, c-format
 msgid "failed to create file via template %s"
 msgstr "gagal mengekalkan masa bagi %s"
 
-#: src/mv.c:292
+#: src/mv.c:294
 #, fuzzy
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 "Tukarnama SUMBER ke DEST, atau pindahkan SUMBER ke DIREKTORI.\n"
 "\n"
 
-#: src/mv.c:298
+#: src/mv.c:300
 #, fuzzy
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
@@ -5638,7 +5708,7 @@ msgstr ""
 "  -d                           sama seperti --no-dereference --"
 "preserve=link\n"
 
-#: src/mv.c:307
+#: src/mv.c:309
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
@@ -5646,7 +5716,7 @@ msgid ""
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
 msgstr ""
 
-#: src/mv.c:312
+#: src/mv.c:314
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
 "DIRECTORY\n"
@@ -5655,6 +5725,8 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
 
 #: src/nice.c:72
@@ -5898,95 +5970,90 @@ msgid "%s: invalid number to ignore"
 msgstr "nombor tidak sah %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
 msgstr ""
 
-#: src/numfmt.c:676
+#: src/numfmt.c:659
 #, c-format
-msgid "value too large to be converted: '%s'"
+msgid "value too large to be converted: %s"
 msgstr ""
 
-#: src/numfmt.c:680
+#: src/numfmt.c:663
 #, fuzzy, c-format
-msgid "invalid number: '%s'"
+msgid "invalid number: %s"
 msgstr "nombor tidak sah %s"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
+msgid "rejecting suffix in input: %s (consider using --from)"
 msgstr ""
 
-#: src/numfmt.c:688
+#: src/numfmt.c:671
 #, fuzzy, c-format
-msgid "invalid suffix in input: '%s'"
-msgstr "hujah tidak sah %s bagi %s"
+msgid "invalid suffix in input: %s"
+msgstr "lebar baris tidak sah: %s"
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
 msgstr ""
 
-#: src/numfmt.c:723
+#: src/numfmt.c:722 src/numfmt.c:768
 #, fuzzy, c-format
 msgid "failed to prepare value '%Lf' for printing"
-msgstr "%s: fail terlalu panjang"
+msgstr "gagal mengekalkan masa bagi %s"
 
-#: src/numfmt.c:787
+#: src/numfmt.c:791
 #, fuzzy, c-format
-msgid "invalid unit size: '%s'"
+msgid "invalid unit size: %s"
 msgstr "saiz tab tidak sah: %s"
 
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
-#, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr ""
-
-#: src/numfmt.c:813
+#: src/numfmt.c:814
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
 msgstr "Penggunaan: %s [OPSYEN]...[FAIL]...\n"
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
 msgstr ""
 
-#: src/numfmt.c:820
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
 msgstr ""
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
 msgstr ""
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
 "                         see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr ""
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
@@ -5994,19 +6061,19 @@ msgid ""
 "locale)\n"
 msgstr ""
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
 msgstr ""
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
 msgstr ""
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -6016,40 +6083,40 @@ msgid ""
 "                         is found\n"
 msgstr ""
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
 "nearest\n"
 msgstr ""
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
 msgstr ""
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr ""
 
-#: src/numfmt.c:877
+#: src/numfmt.c:878
 msgid ""
 "\n"
 "UNIT options:\n"
 msgstr ""
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr ""
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -6058,7 +6125,7 @@ msgid ""
 "               1Mi = 1048576,\n"
 msgstr ""
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
@@ -6066,7 +6133,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
@@ -6074,7 +6141,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
@@ -6082,18 +6149,18 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:905
+#: src/numfmt.c:906
 #, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -6105,7 +6172,7 @@ msgid ""
 "errors are not diagnosed and the exit status is 0.\n"
 msgstr ""
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -6126,112 +6193,112 @@ msgid ""
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 msgstr ""
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, c-format
 msgid "format %s has no %% directive"
 msgstr ""
 
-#: src/numfmt.c:990
+#: src/numfmt.c:1003
 #, fuzzy, c-format
 msgid "invalid format %s (width overflow)"
 msgstr "format tarikh tidak sah %s"
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr ""
+
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr ""
 
-#: src/numfmt.c:1010
+#: src/numfmt.c:1030
 #, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
 msgstr ""
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr ""
 
-#: src/numfmt.c:1070
+#: src/numfmt.c:1081
 #, fuzzy, c-format
-msgid "invalid suffix in input '%s': '%s'"
-msgstr "hujah tidak sah %s bagi %s"
+msgid "invalid suffix in input %s: %s"
+msgstr "lebar baris tidak sah: %s"
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
 msgstr ""
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
 msgstr ""
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
+msgid "large input value %s: possible precision loss"
 msgstr ""
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
 
-#: src/numfmt.c:1388
+#: src/numfmt.c:1403
 #, fuzzy, c-format
-msgid "invalid padding value '%s'"
-msgstr "jenis rentetan m tidak sah `%s'"
+msgid "invalid padding value %s"
+msgstr "tarikh tak sah `%s'"
 
-#: src/numfmt.c:1401
+#: src/numfmt.c:1417
 #, fuzzy, c-format
-msgid "invalid field value '%s'"
+msgid "invalid field value %s"
 msgstr "bilangan medan tidak sah: `%s'"
 
-#: src/numfmt.c:1430
+#: src/numfmt.c:1447
 #, fuzzy, c-format
-msgid "invalid header value '%s'"
-msgstr "tarikh tak sah `%s'"
+msgid "invalid header value %s"
+msgstr "bilangan medan tidak sah: `%s'"
 
-#: src/numfmt.c:1456
+#: src/numfmt.c:1473
 #, fuzzy, c-format
 msgid "--grouping cannot be combined with --format"
 msgstr "tak boleh gabungkan isyarat dengan -l atau -t"
 
-#: src/numfmt.c:1458
-#, fuzzy, c-format
-msgid "--padding cannot be combined with --format"
-msgstr "tak boleh gabungkan isyarat dengan -l atau -t"
-
-#: src/numfmt.c:1463
+#: src/numfmt.c:1478
 #, fuzzy, c-format
 msgid "no conversion option specified"
-msgstr "banyak opsyen -l or -t dinyatakan"
+msgstr "tiada ID proses dinyatakan"
 
-#: src/numfmt.c:1471
+#: src/numfmt.c:1486
 #, fuzzy, c-format
 msgid "grouping cannot be combined with --to"
 msgstr "tak boleh gabungkan isyarat dengan -l atau -t"
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
 msgstr ""
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
 msgstr ""
 
-#: src/numfmt.c:1511
+#: src/numfmt.c:1526
 #, fuzzy, c-format
 msgid "error reading input"
 msgstr "membaca %s"
 
-#: src/numfmt.c:1520
-#, fuzzy, c-format
+#: src/numfmt.c:1535
+#, c-format
 msgid "failed to convert some of the input numbers"
-msgstr "menutup output piawai"
+msgstr ""
 
-#: src/od.c:294
+#: src/od.c:320
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -6242,7 +6309,7 @@ msgstr ""
 "Penggunaan: %s [OPTION]... GROUP FILE...\n"
 "      atau:  %s [OPTION]... --reference=RFILE FILE...\n"
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -6252,7 +6319,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/od.c:307
+#: src/od.c:333
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
 "if the last operand begins with + or (if there are 2 operands) a digit.\n"
@@ -6262,38 +6329,40 @@ msgid ""
 "suffixes may be . for octal and b for multiply by 512.\n"
 msgstr ""
 
-#: src/od.c:318
+#: src/od.c:344
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
 
-#: src/od.c:323
+#: src/od.c:350
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
 
-#: src/od.c:336
+#: src/od.c:363
 msgid ""
 "\n"
 "\n"
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 
-#: src/od.c:345
+#: src/od.c:372
 msgid ""
 "  -f   same as -t fF, select floats\n"
 "  -i   same as -t dI, select decimal ints\n"
@@ -6303,16 +6372,16 @@ msgid ""
 "  -x   same as -t x2, select hexadecimal 2-byte units\n"
 msgstr ""
 
-#: src/od.c:353
+#: src/od.c:380
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -6321,7 +6390,7 @@ msgid ""
 "  x[SIZE]    hexadecimal, SIZE bytes per integer\n"
 msgstr ""
 
-#: src/od.c:367
+#: src/od.c:394
 msgid ""
 "\n"
 "SIZE is a number.  For TYPE in [doux], SIZE may also be C for\n"
@@ -6330,14 +6399,14 @@ msgid ""
 "for sizeof(double) or L for sizeof(long double).\n"
 msgstr ""
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
 "each output line.\n"
 msgstr ""
 
-#: src/od.c:379
+#: src/od.c:406
 #, fuzzy
 msgid ""
 "\n"
@@ -6355,55 +6424,55 @@ msgstr ""
 "berikut:\n"
 "kB 1000, K 1024, MB 1,000,000, M 1,048,576, dan lagi bagi G, T, P, E, Z, Y.\n"
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, fuzzy, c-format
 msgid "invalid type string %s"
 msgstr "jenis rentetan m tidak sah `%s'"
 
-#: src/od.c:649
+#: src/od.c:690
 #, c-format
 msgid ""
 "invalid type string %s;\n"
 "this system doesn't provide a %lu-byte integral type"
 msgstr ""
 
-#: src/od.c:770
+#: src/od.c:811
 #, c-format
 msgid ""
 "invalid type string %s;\n"
 "this system doesn't provide a %lu-byte floating point type"
 msgstr ""
 
-#: src/od.c:828
+#: src/od.c:869
 #, fuzzy, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr "aksara tidak sah pada %s pada rentetan mod %s"
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr ""
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr ""
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr ""
 
-#: src/od.c:1810
+#: src/od.c:1863
 msgid "compatibility mode supports at most one file"
 msgstr ""
 
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr ""
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr ""
@@ -6419,14 +6488,11 @@ msgid "standard input is closed"
 msgstr "input piawai"
 
 #: src/paste.c:439
-#, fuzzy
 msgid ""
 "Write lines consisting of the sequentially corresponding lines from\n"
 "each FILE, separated by TABs, to standard output.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
-"\n"
-"Dengan tiada FAIL, atau bila FAIL adalah -, baca input piawai.\n"
 
 #: src/paste.c:447
 msgid ""
@@ -6558,12 +6624,12 @@ msgstr ""
 msgid "Where"
 msgstr ""
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr "Penggunaan: %s [OPSYEN]...[FAIL]...\n"
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -6573,7 +6639,7 @@ msgid ""
 "  -s              do short format output, this is the default\n"
 msgstr ""
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -6582,7 +6648,7 @@ msgid ""
 "                  in short format\n"
 msgstr ""
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, c-format
 msgid ""
 "\n"
@@ -6590,7 +6656,7 @@ msgid ""
 "The utmp file will be %s.\n"
 msgstr ""
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr ""
@@ -6757,12 +6823,13 @@ msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
 
-#: src/pr.c:2827
+#: src/pr.c:2828
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
 "                    separate columns by STRING,\n"
@@ -6772,7 +6839,7 @@ msgid ""
 "  -t, --omit-header  omit page headers and trailers\n"
 msgstr ""
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 msgid ""
 "  -T, --omit-pagination\n"
 "                    omit page headers and trailers, eliminate any "
@@ -6786,7 +6853,7 @@ msgid ""
 "(72)\n"
 msgstr ""
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
 "                    set page width to PAGE_WIDTH (72) characters always,\n"
@@ -6795,7 +6862,7 @@ msgid ""
 "                    with -S or -s\n"
 msgstr ""
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 #, fuzzy
 msgid ""
 "\n"
@@ -6815,7 +6882,7 @@ msgid ""
 msgstr ""
 
 #: src/printenv.c:69
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/printf.c:79
@@ -6913,32 +6980,32 @@ msgstr ""
 msgid "F. Pinard"
 msgstr ""
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, c-format
 msgid "%s (for regexp %s)"
 msgstr ""
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
 "  or:  %s -G [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr ""
 
-#: src/ptx.c:1821
+#: src/ptx.c:1824
 msgid ""
 "Output a permuted index, including context, of the words in the input "
 "files.\n"
 msgstr ""
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
 "  -G, --traditional              behave more like System V 'ptx'\n"
 "  -F, --flag-truncation=STRING   use STRING for flagging line truncations\n"
 msgstr ""
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
 "  -O, --format=roff              generate output as roff directives\n"
@@ -6947,7 +7014,7 @@ msgid ""
 "  -T, --format=tex               generate output as TeX directives\n"
 msgstr ""
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -6957,7 +7024,7 @@ msgid ""
 "  -o, --only-file=FILE           read only word list from this FILE\n"
 msgstr ""
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -6965,16 +7032,16 @@ msgid ""
 "excluded\n"
 msgstr ""
 
-#: src/ptx.c:1854
+#: src/ptx.c:1857
 #, fuzzy
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
 "\n"
 "Dengan tiada FAIL, atau bila FAIL adalah -, baca input piawai.\n"
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, fuzzy, c-format
 msgid "invalid gap width: %s"
 msgstr "lebar tidak sah: `%s'"
@@ -6991,22 +7058,28 @@ msgid ""
 "  -P, --physical  avoid all symlinks\n"
 msgstr ""
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+
+#: src/pwd.c:169
 #, fuzzy, c-format
 msgid "failed to chdir to %s"
 msgstr "gagal mengekalkan masa bagi %s"
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, fuzzy, c-format
 msgid "failed to stat %s"
 msgstr "gagal mengekalkan masa bagi %s"
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr ""
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, fuzzy, c-format
 msgid "ignoring non-option arguments"
 msgstr "mengabaikan segala hujah"
@@ -7016,8 +7089,8 @@ msgstr "mengabaikan segala hujah"
 msgid "Dmitry V. Levin"
 msgstr ""
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Penggunaan: %s [OPSYEN]... FAIL...\n"
@@ -7051,8 +7124,7 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/readlink.c:152
@@ -7077,7 +7149,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 
@@ -7095,41 +7167,42 @@ msgstr "%s: buang direktori write-protected %s? "
 msgid "%s: descend into directory %s? "
 msgstr ""
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr "%s: buang write-protected %s %s? "
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, c-format
 msgid "%s: remove %s %s? "
 msgstr "%s: buang %s %s? "
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, c-format
 msgid "removed directory: %s\n"
 msgstr "direktori dibuang: %s\n"
 
-#: src/remove.c:444
-#, fuzzy, c-format
-msgid "cannot remove directory: %s"
-msgstr "tak dapat membuang direktori %s"
+#: src/remove.c:447
+#, c-format
+msgid "refusing to remove %s or %s directory: skipping %s"
+msgstr ""
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr ""
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, fuzzy, c-format
 msgid "traversal failed: %s"
 msgstr "fail biasa"
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -7154,12 +7227,12 @@ msgstr ""
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 
 #: src/rm.c:149
@@ -7207,13 +7280,17 @@ msgstr ""
 
 #: src/rm.c:342
 #, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr ""
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/rm.c:343
+#: src/rm.c:345
 #, fuzzy, c-format
-msgid "%s: remove all arguments? "
-msgstr "%s: buang %s %s? "
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] "%s: buang %s %s? "
+msgstr[1] "%s: buang %s %s? "
 
 #: src/rmdir.c:134 src/rmdir.c:233
 #, c-format
@@ -7267,7 +7344,7 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
 
@@ -7317,41 +7394,46 @@ msgstr ""
 msgid "no command specified"
 msgstr "tiada ID proses dinyatakan"
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr ""
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, fuzzy, c-format
 msgid "failed to compute a new context"
 msgstr "gagal mengekalkan masa bagi %s"
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, fuzzy, c-format
 msgid "failed to set new user %s"
 msgstr "gagal mengekalkan masa bagi %s"
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, fuzzy, c-format
 msgid "failed to set new type %s"
 msgstr "gagal mengekalkan masa bagi %s"
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, fuzzy, c-format
 msgid "failed to set new range %s"
 msgstr "gagal mengekalkan masa bagi %s"
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, fuzzy, c-format
 msgid "failed to set new role %s"
 msgstr "gagal mengekalkan masa bagi %s"
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, c-format
 msgid "unable to set security context %s"
 msgstr ""
 
+#: src/selinux.c:127 src/selinux.c:300
+#, fuzzy, c-format
+msgid "error canonicalizing %s"
+msgstr "membaca %s"
+
 #: src/seq.c:68
 #, fuzzy, c-format
 msgid ""
@@ -7379,97 +7461,47 @@ msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
 msgstr ""
 
-#: src/seq.c:94
+#: src/seq.c:96
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
 "it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n"
 "decimal numbers with maximum precision PREC, and to %g otherwise.\n"
 msgstr ""
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, fuzzy, c-format
 msgid "invalid floating point argument: %s"
 msgstr "format tarikh tidak sah %s"
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, fuzzy, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr "%s mempunyai jenis fail yang tidak diketahui"
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr ""
 
-#: src/setuidgid.c:49
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-"Pengunaan: %s FAIL\n"
-"    atau: %s OPSYEN\n"
-
-#: src/setuidgid.c:55
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr ""
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr ""
-
-#: src/setuidgid.c:190
-#, fuzzy, c-format
-msgid "failed to set supplemental group(s)"
-msgstr "tak dapat perolehi senarai kumpulan tambahan"
-
-#: src/setuidgid.c:200
-#, fuzzy, c-format
-msgid "cannot set group-ID to %lu"
-msgstr "tak dapat menukar ke kumpulan null"
-
-#: src/setuidgid.c:204
-#, fuzzy, c-format
-msgid "cannot set user-ID to %lu"
-msgstr "tak dapat stat %s"
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr ""
 
-#: src/shred.c:148
+#: src/shred.c:170
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
 "for even very expensive hardware probing to recover the data.\n"
 msgstr ""
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, fuzzy, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -7481,28 +7513,32 @@ msgstr ""
 "  -n, --iterations=N  Tindih sebanyak  N kali selain drpd  default (%d)\n"
 "  -s, --size=N   lunyai ia berapa byte (suffiks seperti K, M, G diterima)\n"
 
-#: src/shred.c:161
+#: src/shred.c:183
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
 "  -z, --zero     add a final overwrite with zeros to hide shredding\n"
 msgstr ""
 
-#: src/shred.c:170
+#: src/shred.c:192
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -7513,7 +7549,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -7525,7 +7561,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -7534,7 +7570,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -7546,134 +7582,134 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:215
+#: src/shred.c:241
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
 "of the file that cannot be removed, and that will allow a shredded file\n"
 "to be recovered later.\n"
 msgstr ""
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, fuzzy, c-format
 msgid "%s: fdatasync failed"
 msgstr "fail istimewa blok"
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, fuzzy, c-format
 msgid "%s: fsync failed"
 msgstr "fail istimewa blok"
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr ""
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr ""
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, c-format
 msgid "%s: error writing at offset %s"
 msgstr ""
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, fuzzy, c-format
 msgid "%s: lseek failed"
 msgstr "fail istimewa blok"
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, c-format
 msgid "%s: file too large"
 msgstr ""
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr ""
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr ""
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, fuzzy, c-format
 msgid "%s: fstat failed"
 msgstr "stat gagal"
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, c-format
 msgid "%s: invalid file type"
 msgstr "%s: jenis fail tidak sah"
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr "%s: fail mempunya saiz negatif"
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, c-format
 msgid "%s: error truncating"
 msgstr ""
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, fuzzy, c-format
 msgid "%s: fcntl failed"
 msgstr "fail istimewa blok"
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr ""
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr "%s: membuang"
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, c-format
 msgid "%s: renamed to %s"
 msgstr "%s: ditukarnama ke %s"
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, fuzzy, c-format
 msgid "%s: failed to remove"
 msgstr "%s: tak dapat buang"
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr "%s: dibuang"
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, fuzzy, c-format
 msgid "%s: failed to close"
 msgstr "%s: fail terlalu panjang"
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, fuzzy, c-format
 msgid "%s: failed to open for writing"
 msgstr "%s: fail terlalu panjang"
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, c-format
 msgid "%s: invalid number of passes"
 msgstr ""
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, fuzzy, c-format
 msgid "multiple random sources specified"
 msgstr "banyak opsyen -l or -t dinyatakan"
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, c-format
 msgid "%s: invalid file size"
 msgstr "%s: fail saiz tidak sah"
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -7684,14 +7720,11 @@ msgstr ""
 "   atau:  %s [OPSYEN]... SUMBER... DIREKTORI\n"
 "   atau:  %s [OPSYEN]... --target-directory=DIREKTORI SUMBER...\n"
 
-#: src/shuf.c:54
-#, fuzzy
+#: src/shuf.c:67
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr ""
-"Cetak bahagian ibaris dipilih drpd setiap FAIL ke output piawai.\n"
-"\n"
 
-#: src/shuf.c:60
+#: src/shuf.c:73
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
 "  -i, --input-range=LO-HI   treat each number LO through HI as an input "
@@ -7699,34 +7732,44 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
 msgstr ""
 
-#: src/shuf.c:244
+#: src/shuf.c:228
+#, fuzzy, c-format
+msgid "too many input lines"
+msgstr "terlalu banyak hujah bukan-opsyen"
+
+#: src/shuf.c:431
 #, fuzzy, c-format
 msgid "multiple -i options specified"
 msgstr "banyak opsyen -l or -t dinyatakan"
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, fuzzy, c-format
 msgid "invalid input range %s"
 msgstr "nombor tidak sah %s"
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, fuzzy, c-format
 msgid "invalid line count %s"
 msgstr "lebar baris tidak sah: %s"
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, fuzzy, c-format
 msgid "multiple output files specified"
 msgstr "banyak opsyen -l or -t dinyatakan"
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, fuzzy, c-format
 msgid "cannot combine -e and -i options"
 msgstr "tak boleh gabungkan isyarat dengan -l atau -t"
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr ""
+
 #: src/sleep.c:44
 #, c-format
 msgid ""
@@ -7741,30 +7784,30 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, fuzzy, c-format
 msgid "invalid time interval %s"
 msgstr "format gaya tarikh tidak sah %s"
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, fuzzy, c-format
 msgid "cannot read realtime clock"
 msgstr "tak boleh mencipta pautan %s"
 
-#: src/sort.c:399
+#: src/sort.c:427
 #, fuzzy
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr ""
 "Cetak bahagian ibaris dipilih drpd setiap FAIL ke output piawai.\n"
 "\n"
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
 msgstr ""
 
-#: src/sort.c:409
+#: src/sort.c:437
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
 "  -d, --dictionary-order      consider only blanks and alphanumeric "
@@ -7772,19 +7815,19 @@ msgid ""
 "  -f, --ignore-case           fold lower case to upper case characters\n"
 msgstr ""
 
-#: src/sort.c:415
+#: src/sort.c:443
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
 "  -i, --ignore-nonprinting    consider only printable characters\n"
 "  -M, --month-sort            compare (unknown) < 'JAN' < ... < 'DEC'\n"
 msgstr ""
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 
-#: src/sort.c:423
+#: src/sort.c:451
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
 "  -R, --random-sort           sort by random hash of keys\n"
@@ -7792,7 +7835,7 @@ msgid ""
 "  -r, --reverse               reverse the result of comparisons\n"
 msgstr ""
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -7802,19 +7845,19 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/sort.c:437
+#: src/sort.c:465
 msgid ""
 "Other options:\n"
 "\n"
 msgstr ""
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
 msgstr ""
 
-#: src/sort.c:445
+#: src/sort.c:473
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
 "  -C, --check=quiet, --check=silent  like -c, but do not report first bad "
@@ -7823,7 +7866,7 @@ msgid ""
 "                              decompress them with PROG -d\n"
 msgstr ""
 
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -7832,13 +7875,13 @@ msgid ""
 "                            If F is - then read names from standard input\n"
 msgstr ""
 
-#: src/sort.c:459
+#: src/sort.c:487
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
 "  -m, --merge               merge already sorted files; do not sort\n"
 msgstr ""
 
-#: src/sort.c:463
+#: src/sort.c:491
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "  -s, --stable              stabilize sort by disabling last-resort "
@@ -7846,7 +7889,7 @@ msgid ""
 "  -S, --buffer-size=SIZE    use SIZE for main memory buffer\n"
 msgstr ""
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -7861,11 +7904,7 @@ msgid ""
 "run\n"
 msgstr ""
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr ""
-
-#: src/sort.c:483
+#: src/sort.c:511
 msgid ""
 "\n"
 "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is "
@@ -7884,7 +7923,7 @@ msgid ""
 "SIZE may be followed by the following multiplicative suffixes:\n"
 msgstr ""
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -7896,268 +7935,253 @@ msgid ""
 "native byte values.\n"
 msgstr ""
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, fuzzy, c-format
 msgid "waiting for %s [-d]"
 msgstr "Menulis  ke %s."
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr ""
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, fuzzy, c-format
 msgid "cannot create temporary file in %s"
 msgstr "tak dapat memcipta fail biasa %s"
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr "pembukaan gagal"
 
-#: src/sort.c:970
+#: src/sort.c:998
 #, fuzzy
 msgid "fflush failed"
 msgstr "fail istimewa blok"
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 #, fuzzy
 msgid "close failed"
 msgstr "fail istimewa blok"
 
-#: src/sort.c:986
-#, fuzzy, c-format
-msgid "dup2 failed"
-msgstr "pembukaan gagal"
-
-#: src/sort.c:1103
-#, c-format
-msgid "couldn't execute %s"
-msgstr ""
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 #, fuzzy
 msgid "couldn't create temporary file"
 msgstr "tak dapat memcipta fail biasa %s"
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, fuzzy, c-format
 msgid "couldn't create process for %s -d"
 msgstr "tak dapat mencipta direktori %s"
 
-#: src/sort.c:1161
-#, c-format
-msgid "couldn't execute %s -d"
-msgstr ""
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, fuzzy, c-format
 msgid "warning: cannot remove: %s"
 msgstr "tak dapat membuang %s"
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, fuzzy, c-format
 msgid "invalid --%s argument %s"
 msgstr "hujah tidak sah %s bagi %s"
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, fuzzy, c-format
 msgid "minimum --%s argument is %s"
 msgstr "hujah ambiguous %s bagi %s"
 
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, fuzzy, c-format
 msgid "--%s argument %s too large"
 msgstr "%s adalah terlalu besar"
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr ""
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr ""
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr "stat gagal"
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 #, fuzzy
 msgid "read failed"
 msgstr "fail biasa"
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, fuzzy, c-format
 msgid "string transformation failed"
 msgstr "perbandingan rentetan gagal"
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, c-format
 msgid "the untransformed string was %s"
 msgstr ""
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr ""
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr ""
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr ""
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr ""
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr ""
 
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, fuzzy, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
-msgstr[0] "%s: opsyen `%s' adalah ambiguous\n"
-msgstr[1] "%s: opsyen `%s' adalah ambiguous\n"
+msgstr[0] "%s: opsyen `-W %s' adalah ambiguous\n"
+msgstr[1] "%s: opsyen `-W %s' adalah ambiguous\n"
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr ""
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 #, fuzzy
 msgid "write failed"
 msgstr "fail pelik"
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr ""
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 #, fuzzy
 msgid "standard error"
 msgstr "output standard"
 
-#: src/sort.c:3698
+#: src/sort.c:3738
 #, fuzzy
 msgid "cannot read"
 msgstr "tak dapat menetapkan tarikh"
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, fuzzy, c-format
 msgid "%s: invalid field specification %s"
 msgstr "%s: fail saiz tidak sah"
 
-#: src/sort.c:3987
-#, fuzzy, c-format
+#: src/sort.c:4028
+#, c-format
 msgid "options '-%s' are incompatible"
-msgstr "%s: opsyen `%s' adalah ambiguous\n"
+msgstr ""
 
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, fuzzy, c-format
 msgid "%s: invalid count at start of %s"
 msgstr "hujah tidak sah %s bagi %s"
 
-#: src/sort.c:4295
+#: src/sort.c:4336
 #, fuzzy
 msgid "invalid number after '-'"
 msgstr "nombor tidak sah %s"
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 #, fuzzy
 msgid "invalid number after '.'"
 msgstr "nombor tidak sah %s"
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 #, fuzzy
 msgid "stray character in field spec"
 msgstr "fail istimewa aksara"
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, fuzzy, c-format
 msgid "multiple compress programs specified"
 msgstr "banyak opsyen -l or -t dinyatakan"
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 #, fuzzy
 msgid "invalid number at field start"
 msgstr "nombor tidak sah %s"
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 #, fuzzy
 msgid "field number is zero"
 msgstr "nombor tidak sah %s"
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 #, fuzzy
 msgid "character offset is zero"
 msgstr "fail istimewa aksara"
 
-#: src/sort.c:4407
+#: src/sort.c:4448
 #, fuzzy
 msgid "invalid number after ','"
 msgstr "nombor tidak sah %s"
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr ""
 
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, fuzzy, c-format
 msgid "cannot read file names from %s"
 msgstr "tak boleh banding nama fail %s dan %s"
 
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, fuzzy, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr "%s: jenis fail tidak sah"
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, fuzzy, c-format
 msgid "no input from %s"
 msgstr "menutup fail input %s"
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr ""
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr ""
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr ""
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr ""
 
-#: src/split.c:204
+#: src/split.c:203
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr "Penggunaan: %s [OPSYEN]...[FAIL]...\n"
 
-#: src/split.c:208
+#: src/split.c:207
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
 "size is 1000 lines, and default PREFIX is 'x'.  With no INPUT, or when "
@@ -8165,32 +8189,31 @@ msgid ""
 "is -, read standard input.\n"
 msgstr ""
 
-#: src/split.c:216
+#: src/split.c:215
 #, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
 
-#: src/split.c:229
+#: src/split.c:228
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
 "                            output file is opened\n"
 msgstr ""
 
-#: src/split.c:236
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -8202,189 +8225,189 @@ msgid ""
 "r/K/N   likewise but only output Kth of N to stdout\n"
 msgstr ""
 
-#: src/split.c:354
+#: src/split.c:353
 #, c-format
 msgid "output file suffixes exhausted"
 msgstr ""
 
-#: src/split.c:366
+#: src/split.c:365
 #, fuzzy, c-format
 msgid "creating file %s\n"
 msgstr "mencipta %s"
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr ""
 
-#: src/split.c:391
+#: src/split.c:390
 #, fuzzy, c-format
 msgid "failed to set FILE environment variable"
 msgstr "nilai pembolehubah persekitaran LS_COLORS tidak boleh dihantar"
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr ""
 
-#: src/split.c:395
+#: src/split.c:394
 #, fuzzy, c-format
 msgid "failed to create pipe"
 msgstr "gagal mengekalkan masa bagi %s"
 
-#: src/split.c:409
+#: src/split.c:408
 #, fuzzy, c-format
 msgid "closing prior pipe"
 msgstr "menutup fail input %s"
 
-#: src/split.c:411
+#: src/split.c:410
 #, fuzzy, c-format
 msgid "closing output pipe"
 msgstr "menutup fail output %s"
 
-#: src/split.c:415
+#: src/split.c:414
 #, fuzzy, c-format
 msgid "moving input pipe"
 msgstr "menutup fail input %s"
 
-#: src/split.c:417
+#: src/split.c:416
 #, fuzzy, c-format
 msgid "closing input pipe"
 msgstr "menutup fail input %s"
 
-#: src/split.c:422
+#: src/split.c:421
 #, fuzzy, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr "takboleh nyahpaut %s"
 
-#: src/split.c:428
+#: src/split.c:427
 #, fuzzy, c-format
 msgid "failed to close input pipe"
 msgstr "gagal mengekalkan masa bagi %s"
 
-#: src/split.c:464
+#: src/split.c:463
 #, c-format
 msgid "waiting for child process"
 msgstr ""
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr ""
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr ""
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr ""
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, fuzzy, c-format
 msgid "cannot split in more than one way"
 msgstr "tak boleh nyatakan masa lebih daripada satu sumber"
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, fuzzy, c-format
 msgid "%s: invalid number of chunks"
 msgstr "nombor tidak sah %s"
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, fuzzy, c-format
 msgid "%s: invalid chunk number"
 msgstr "%s: nombor tidak sah"
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, fuzzy, c-format
 msgid "%s: invalid suffix length"
 msgstr "%s: fail saiz tidak sah"
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, fuzzy, c-format
 msgid "%s: invalid number of bytes"
 msgstr "nombor tidak sah %s"
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, fuzzy, c-format
 msgid "%s: invalid number of lines"
 msgstr "nombor tidak sah %s"
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, c-format
 msgid "line count option -%s%c... is too large"
 msgstr ""
 
-#: src/split.c:1248
+#: src/split.c:1298
 #, fuzzy, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr "nombor baris permulaan tidak sah `%s'"
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, fuzzy, c-format
 msgid "%s: invalid IO block size"
 msgstr "%s: fail saiz tidak sah"
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr ""
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr ""
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, fuzzy, c-format
 msgid "%s: cannot determine file size"
 msgstr "tak dapat menentukan namahos"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr ""
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, fuzzy, c-format
 msgid "failed to canonicalize %s"
 msgstr "gagal mengekalkan masa bagi %s"
 
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, fuzzy, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr "%s: opensyen tidak dikenali `%c%s'\n"
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, fuzzy, c-format
 msgid "%s: invalid directive"
 msgstr "%s: fail saiz tidak sah"
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, fuzzy, c-format
 msgid "warning: backslash at end of format"
 msgstr "aksara tidak sah pada %s pada rentetan mod %s"
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr ""
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, c-format
 msgid "cannot read file system information for %s"
 msgstr "tak dapat membaca maklumat sistem fail bagi %s"
 
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, fuzzy, c-format
 msgid "cannot stat standard input"
 msgstr "menutup input piawai"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -8395,7 +8418,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -8403,30 +8426,30 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, c-format
 msgid "Context: %C\n"
 msgstr ""
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -8434,27 +8457,27 @@ msgid ""
 " Birth: %w\n"
 msgstr ""
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
 msgstr ""
 
-#: src/stat.c:1356
+#: src/stat.c:1418
 msgid ""
 "  -L, --dereference     follow links\n"
 "  -f, --file-system     display file system status instead of file status\n"
 msgstr ""
 
-#: src/stat.c:1360
+#: src/stat.c:1422
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 msgid ""
 "\n"
 "The valid format sequences for files (without --file-system):\n"
@@ -8466,7 +8489,7 @@ msgid ""
 "  %C   SELinux security context string\n"
 msgstr ""
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 msgid ""
 "  %d   device number in decimal\n"
 "  %D   device number in hex\n"
@@ -8476,7 +8499,7 @@ msgid ""
 "  %G   group name of owner\n"
 msgstr ""
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 msgid ""
 "  %h   number of hard links\n"
 "  %i   inode number\n"
@@ -8485,11 +8508,11 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 
-#: src/stat.c:1399
+#: src/stat.c:1461
 msgid ""
 "  %u   user ID of owner\n"
 "  %U   user name of owner\n"
@@ -8497,14 +8520,14 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 msgid ""
 "Valid format sequences for file systems:\n"
 "\n"
@@ -8515,7 +8538,7 @@ msgid ""
 "  %f   free blocks in file system\n"
 msgstr ""
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 msgid ""
 "  %i   file system ID in hex\n"
 "  %l   maximum length of filenames\n"
@@ -8576,22 +8599,27 @@ msgid ""
 "and are thus unaffected by 'stdbuf' settings.\n"
 msgstr ""
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, fuzzy, c-format
 msgid "failed to find %s"
 msgstr "gagal mengekalkan masa bagi %s"
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, c-format
 msgid "failed to update the environment with %s"
 msgstr ""
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr ""
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, c-format
+msgid "you must specify a buffering mode option"
+msgstr ""
+
+#: src/stty.c:516
 #, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -8599,25 +8627,25 @@ msgid ""
 "  or:  %s [-F DEVICE | --file=DEVICE] [-g|--save]\n"
 msgstr ""
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
 msgstr ""
 
-#: src/stty.c:525
+#: src/stty.c:528
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
 "  -g, --save         print all current settings in a stty-readable form\n"
 "  -F, --file=DEVICE  open and use the specified DEVICE instead of stdin\n"
 msgstr ""
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
 "settings.  The underlying system defines which settings are available.\n"
 msgstr ""
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -8626,7 +8654,7 @@ msgid ""
 "   eol CHAR      CHAR will end the line\n"
 msgstr ""
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -8634,7 +8662,7 @@ msgid ""
 "   kill CHAR     CHAR will erase the current line\n"
 msgstr ""
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -8642,7 +8670,7 @@ msgid ""
 "   start CHAR    CHAR will restart the output after stopping it\n"
 msgstr ""
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -8650,7 +8678,7 @@ msgid ""
 " * werase CHAR   CHAR will erase the last word typed\n"
 msgstr ""
 
-#: src/stty.c:562
+#: src/stty.c:565
 msgid ""
 "\n"
 "Special settings:\n"
@@ -8659,7 +8687,7 @@ msgid ""
 " * columns N     same as cols N\n"
 msgstr ""
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -8668,7 +8696,7 @@ msgid ""
 "   ospeed N      set the output speed to N\n"
 msgstr ""
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -8677,7 +8705,7 @@ msgid ""
 "   time N        with -icanon, set read timeout of N tenths of a second\n"
 msgstr ""
 
-#: src/stty.c:581
+#: src/stty.c:584
 msgid ""
 "\n"
 "Control settings:\n"
@@ -8688,7 +8716,7 @@ msgid ""
 "   csN           set character size to N bits, N in [5..8]\n"
 msgstr ""
 
-#: src/stty.c:590
+#: src/stty.c:593
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
 "   [-]hup        send a hangup signal when the last process closes the tty\n"
@@ -8696,9 +8724,10 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -8708,7 +8737,7 @@ msgid ""
 "   [-]igncr      ignore carriage return\n"
 msgstr ""
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -8717,11 +8746,11 @@ msgid ""
 "   [-]istrip     clear high (8th) bit of input characters\n"
 msgstr ""
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr ""
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -8731,7 +8760,7 @@ msgid ""
 "   [-]tandem     same as [-]ixoff\n"
 msgstr ""
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -8741,17 +8770,17 @@ msgid ""
 " * nlN           newline delay style, N in [0..1]\n"
 msgstr ""
 
-#: src/stty.c:631
+#: src/stty.c:635
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
 " * [-]onlret     newline performs a carriage return\n"
 msgstr ""
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -8761,7 +8790,7 @@ msgid ""
 " * vtN           vertical tab delay style, N in [0..1]\n"
 msgstr ""
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -8770,7 +8799,7 @@ msgid ""
 " * -crtkill      kill all line by obeying the echoctl and echok settings\n"
 msgstr ""
 
-#: src/stty.c:654
+#: src/stty.c:658
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
 "   [-]echo       echo input characters\n"
@@ -8779,7 +8808,7 @@ msgid ""
 "   [-]echok      echo a newline after a kill character\n"
 msgstr ""
 
-#: src/stty.c:661
+#: src/stty.c:665
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
 "   [-]echonl     echo newline even if not echoing other characters\n"
@@ -8788,7 +8817,7 @@ msgid ""
 "   [-]iexten     enable non-POSIX special characters\n"
 msgstr ""
 
-#: src/stty.c:668
+#: src/stty.c:672
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
 "   [-]noflsh     disable flushing after interrupt and quit special "
@@ -8798,7 +8827,7 @@ msgid ""
 " * [-]xcase      with icanon, escape with '\\' for uppercase characters\n"
 msgstr ""
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -8807,7 +8836,7 @@ msgid ""
 "   -cbreak       same as icanon\n"
 msgstr ""
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -8815,7 +8844,7 @@ msgid ""
 "   crt           same as echoe echoctl echoke\n"
 msgstr ""
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -8824,7 +8853,7 @@ msgid ""
 "   evenp         same as parenb -parodd cs7\n"
 msgstr ""
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -8834,7 +8863,7 @@ msgid ""
 "   -nl           same as icrnl -inlcr -igncr onlcr -ocrnl -onlret\n"
 msgstr ""
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -8843,7 +8872,7 @@ msgid ""
 "   -pass8        same as parenb istrip cs7\n"
 msgstr ""
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -8851,7 +8880,7 @@ msgid ""
 "   -raw          same as cooked\n"
 msgstr ""
 
-#: src/stty.c:716
+#: src/stty.c:720
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
 "                 -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n"
@@ -8861,7 +8890,7 @@ msgid ""
 "                 characters to their default values\n"
 msgstr ""
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -8870,55 +8899,55 @@ msgid ""
 "127; special values ^- or undef used to disable special characters.\n"
 msgstr ""
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, c-format
 msgid "only one device may be specified"
 msgstr ""
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
 "mutually exclusive"
 msgstr ""
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr "bila menyatakan gaya output, mod tak boleh ditetapkan"
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr ""
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, fuzzy, c-format
 msgid "invalid argument %s"
 msgstr "hujah tidak sah %s bagi %s"
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, fuzzy, c-format
 msgid "missing argument to %s"
 msgstr "kehilangan hujah fail"
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, fuzzy, c-format
 msgid "invalid line discipline %s"
 msgstr "lebar baris tidak sah: %s"
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr ""
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr "%s: tiada maklumat saiz bagi peranti ini"
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, fuzzy, c-format
 msgid "invalid integer argument %s"
 msgstr "hujah tidak sah %s bagi %s"
@@ -8965,7 +8994,7 @@ msgstr ""
 msgid "      --version  output version information and exit\n"
 msgstr ""
 
-#: src/system.h:544
+#: src/system.h:543
 #, fuzzy
 msgid ""
 "\n"
@@ -8974,15 +9003,15 @@ msgstr ""
 "Hujah mandatori kepada opsyen panjang andalah mandatori bagi opsyen pendek "
 "juga.\n"
 
-#: src/system.h:552
+#: src/system.h:551
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -8991,35 +9020,33 @@ msgid ""
 "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n"
 msgstr ""
 
-#: src/system.h:571
-#, fuzzy, c-format
+#: src/system.h:570
+#, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
+"%s online help: <%s>\n"
 msgstr ""
-"\n"
-"Lapor pepijat ke <%s>.\n"
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr ""
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr ""
 
-#: src/system.h:596
+#: src/system.h:591
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Cuba `%s --help' untuk maklumat lanjut .\n"
 
-#: src/system.h:628
+#: src/system.h:633
 #, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -9068,7 +9095,7 @@ msgstr "tak dapat memcipta fail biasa %s"
 #: src/tac.c:458
 #, fuzzy, c-format
 msgid "failed to open %s for writing"
-msgstr "%s: fail terlalu panjang"
+msgstr "gagal mengekalkan masa bagi %s"
 
 #: src/tac.c:475
 #, fuzzy, c-format
@@ -9096,66 +9123,57 @@ msgid "Ian Lance Taylor"
 msgstr ""
 
 #: src/tail.c:262
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Print the last %d lines of each FILE to standard output.\n"
 "With more than one FILE, precede each with a header giving the file name.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
-"\n"
-"Dengan tiada FAIL, atau bila FAIL adalah -, baca input piawai.\n"
 
 #: src/tail.c:270
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
 
 #: src/tail.c:274
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 
-#: src/tail.c:281
+#: src/tail.c:280
 #, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
 
-#: src/tail.c:294
+#: src/tail.c:293
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 
-#: src/tail.c:301
+#: src/tail.c:298
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 
-#: src/tail.c:310
-#, fuzzy
+#: src/tail.c:307
 msgid ""
 "\n"
 "If the first character of K (the number of bytes or lines) is a '+',\n"
@@ -9165,12 +9183,8 @@ msgid ""
 "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n"
 "\n"
 msgstr ""
-"\n"
-"SAIZ boleh jadi (atau boleh jadi intege diikuti dengan berikut) satu drpd "
-"berikut:\n"
-"kB 1000, K 1024, MB 1,000,000, M 1,048,576, dan lagi bagi G, T, P, E, Z, Y.\n"
 
-#: src/tail.c:319
+#: src/tail.c:316
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
 "means that even if a tail'ed file is renamed, tail will continue to track\n"
@@ -9180,159 +9194,164 @@ msgid ""
 "named file in a way that accommodates renaming, removal and creation.\n"
 msgstr ""
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, fuzzy, c-format
 msgid "closing %s (fd=%d)"
 msgstr "menutup %s"
 
-#: src/tail.c:453
-#, fuzzy, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr "tak boleh mencipta fifo %s"
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, fuzzy, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr "tak boleh mencipta fifo %s"
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr ""
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
 "reverting to polling"
 msgstr ""
 
-#: src/tail.c:963
+#: src/tail.c:965
+#, c-format
+msgid "%s has been replaced with a symbolic link. giving up on this name"
+msgstr ""
+
+#: src/tail.c:980
 #, fuzzy, c-format
 msgid "%s has become inaccessible"
 msgstr "`%s' menjadi tidak boleh diakses"
 
-#: src/tail.c:980
+#: src/tail.c:997
 #, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr ""
 
-#: src/tail.c:989
+#: src/tail.c:1006
 #, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr ""
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, fuzzy, c-format
 msgid "%s has become accessible"
 msgstr "`%s' menjadi boleh diakses"
 
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr ""
 
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr ""
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, fuzzy, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr "tak dapat menukar ke kumpulan null"
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr ""
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, fuzzy, c-format
 msgid "no files remaining"
 msgstr "kehilangan hujah fail"
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, fuzzy, c-format
 msgid "cannot watch parent directory of %s"
 msgstr "tak dapat mencipta direktori %s"
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, fuzzy, c-format
 msgid "inotify resources exhausted"
 msgstr "memori keletihan"
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, fuzzy, c-format
 msgid "cannot watch %s"
 msgstr "tak dapat stat %s"
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr ""
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, fuzzy, c-format
 msgid "error reading inotify event"
 msgstr "membaca %s"
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr ""
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, fuzzy, c-format
 msgid "number in %s is too large"
 msgstr "nombor tidak sah %s"
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr ""
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, fuzzy, c-format
 msgid "%s: invalid PID"
 msgstr "%s: fail saiz tidak sah"
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, fuzzy, c-format
 msgid "%s: invalid number of seconds"
 msgstr "nombor tidak sah %s"
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr ""
 
-#: src/tail.c:2034
+#: src/tail.c:2096
 #, c-format
-msgid "warning: --retry is useful mainly when following by name"
+msgid "warning: --retry ignored; --retry is useful only when following"
 msgstr ""
 
-#: src/tail.c:2038
+#: src/tail.c:2100
+#, c-format
+msgid "warning: --retry only effective for the initial open"
+msgstr ""
+
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
 msgstr ""
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, fuzzy, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr "pautan simbolik tidak disokong pada sistem ini"
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, fuzzy, c-format
 msgid "cannot follow %s by name"
 msgstr "tak dapat perolehi nama sistem"
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr ""
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr ""
@@ -9537,9 +9556,8 @@ msgid "Matthew Bradburn"
 msgstr ""
 
 #: src/test.c:858
-#, fuzzy
 msgid "missing ']'"
-msgstr "kehilangan hujah fail"
+msgstr ""
 
 #: src/test.c:872
 #, fuzzy, c-format
@@ -9551,17 +9569,17 @@ msgstr "terlalu banyak hujah"
 msgid "warning: sigprocmask"
 msgstr ""
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr ""
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr ""
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
@@ -9570,33 +9588,29 @@ msgstr ""
 "Pengunaan: %s FAIL\n"
 "    atau: %s OPSYEN\n"
 
-#: src/timeout.c:229
-#, fuzzy
+#: src/timeout.c:232
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
 msgstr ""
-"Hujah mandatori kepada opsyen panjang andalah mandatori bagi opsyen pendek "
-"juga.\n"
 
-#: src/timeout.c:235
+#: src/timeout.c:238
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 msgid ""
 "\n"
 "DURATION is a floating point number with an optional suffix:\n"
@@ -9604,7 +9618,7 @@ msgid ""
 "days.\n"
 msgstr ""
 
-#: src/timeout.c:259
+#: src/timeout.c:262
 msgid ""
 "\n"
 "If the command times out, and --preserve-status is not set, then exit with\n"
@@ -9615,17 +9629,17 @@ msgid ""
 "case the exit status is 128+9 rather than 124.\n"
 msgstr ""
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr ""
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, fuzzy, c-format
 msgid "error waiting for command"
 msgstr "menulis %s"
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr ""
@@ -9943,7 +9957,7 @@ msgstr ""
 #: src/truncate.c:115
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 
 #: src/truncate.c:121
@@ -10023,12 +10037,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, fuzzy, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr "nombor tidak sah %s"
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr ""
@@ -10108,12 +10122,12 @@ msgstr ""
 msgid "tab stop value is too large"
 msgstr "%s adalah terlalu besar"
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr "Penggunaan: %s [OPSYEN]...[FAIL]...\n"
 
-#: src/uniq.c:138
+#: src/uniq.c:174
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
 "writing to OUTPUT (or standard output).\n"
@@ -10121,36 +10135,49 @@ msgid ""
 "With no options, matching lines are merged to the first occurrence.\n"
 msgstr ""
 
-#: src/uniq.c:147
+#: src/uniq.c:183
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
+msgstr ""
+
+#: src/uniq.c:187
+msgid ""
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
+msgstr ""
+
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr ""
+
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
 msgstr ""
 
-#: src/uniq.c:151
+#: src/uniq.c:199
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
 "  -i, --ignore-case     ignore differences in case when comparing\n"
 "  -s, --skip-chars=N    avoid comparing the first N characters\n"
 "  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
 msgstr ""
 
-#: src/uniq.c:161
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr ""
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 msgid ""
 "\n"
 "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n"
 "characters.  Fields are skipped before chars.\n"
 msgstr ""
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 msgid ""
 "\n"
 "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n"
@@ -10158,27 +10185,37 @@ msgid ""
 "Also, comparisons honor the rules specified by 'LC_COLLATE'.\n"
 msgstr ""
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, fuzzy, c-format
 msgid "too many repeated lines"
 msgstr "terlalu banyak hujah"
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 #, fuzzy
 msgid "invalid number of fields to skip"
 msgstr "nombor tidak sah %s"
 
-#: src/uniq.c:530
+#: src/uniq.c:613
 #, fuzzy
 msgid "invalid number of bytes to skip"
 msgstr "nombor tidak sah %s"
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 #, fuzzy
 msgid "invalid number of bytes to compare"
 msgstr "nombor tidak sah %s"
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr ""
+
+#: src/uniq.c:652
+#, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr ""
+
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr ""
@@ -10198,11 +10235,6 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/unlink.c:86
-#, c-format
-msgid "cannot unlink %s"
-msgstr "takboleh nyahpaut %s"
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -10247,7 +10279,7 @@ msgstr[1] "pengguna tidak sah"
 msgid ",  load average: %.2f"
 msgstr ",  purata muatan: %.2f"
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -10255,19 +10287,19 @@ msgid ""
 "in the run queue over the last 1, 5 and 15 minutes."
 msgstr ""
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
 "an uninterruptible sleep state also contribute to the load average.\n"
 msgstr ""
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr ""
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
@@ -10457,92 +10489,55 @@ msgid ""
 "\n"
 msgstr ""
 
-#, fuzzy
-#~ msgid "  returning value: '%s'\n"
-#~ msgstr "mencipta %s"
-
-#, fuzzy
-#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n"
-#~ msgstr "Penggunaan: %s [OPSYEN] NAMA...\n"
-
-#, fuzzy
-#~ msgid "no valid suffix found\n"
-#~ msgstr "%s: fail saiz tidak sah"
-
-#~ msgid "reading %s"
-#~ msgstr "membaca %s"
-
-#~ msgid "writing %s"
-#~ msgstr "menulis %s"
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: opsyen tidak dibenarkan -- %c\n"
 
-#~ msgid "closing %s"
-#~ msgstr "menutup %s"
+#~ msgid "block size"
+#~ msgstr "saiz blok"
 
-#~ msgid "accessing %s"
-#~ msgstr "mengakses %s"
+#~ msgid "cannot change owner and/or group of %s"
+#~ msgstr "tak dapat menukar hakmilik dan/atau kumpulan %s"
 
-#~ msgid "opening %s"
-#~ msgstr "Membuka %s"
+#~ msgid "cannot chdir to directory %s"
+#~ msgstr "tak dapat chdir ke direktori %s"
 
-#~ msgid ""
-#~ "Usage: %s NAME\n"
-#~ "  or:  %s OPTION\n"
-#~ msgstr ""
-#~ "Pengunaan: %s FAIL\n"
-#~ "    atau: %s OPSYEN\n"
+#~ msgid "cannot get the login group of a numeric UID"
+#~ msgstr "tak boleh mendapatkan kumpulan logmasuk untuk UID numerik"
 
 #, fuzzy
-#~ msgid "All arguments to long options are mandatory for short options.\n"
+#~ msgid ""
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
 #~ msgstr ""
-#~ "Hujah mandatori kepada opsyen panjang andalah mandatori bagi opsyen "
-#~ "pendek juga.\n"
-
-#, fuzzy
-#~ msgid "Usage: %s [OPTION]... FILE\n"
-#~ msgstr "Penggunaan: %s [OPSYEN]...[FAIL]...\n"
-
-#~ msgid "Password:"
-#~ msgstr "Katalaluan:"
-
-#, fuzzy
-#~ msgid "getpass: cannot open /dev/tty"
-#~ msgstr "tak dapat membuka direktori %s"
-
-#, fuzzy
-#~ msgid "cannot set groups"
-#~ msgstr "tak dapat stat %s"
-
-#, fuzzy
-#~ msgid "cannot set group id"
-#~ msgstr "tak dapat menukar ke kumpulan null"
+#~ "Ini adalah perisian bebas; lihat sumber untuk keadaan menyalin.  Tiada\n"
+#~ "waranti; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
 
-#, fuzzy
-#~ msgid "cannot set user id"
-#~ msgstr "tak dapat stat %s"
+#~ msgid "too few arguments"
+#~ msgstr "terlalu sedikit hujah"
 
-#, fuzzy
-#~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n"
-#~ msgstr "Penggunaan: %s [OPSYEN]...[FAIL]...\n"
+#~ msgid "Usage: %s [OPTION] [FILE]...\n"
+#~ msgstr "Penggunaan: %s [OPSYEN] [FAIL]...\n"
 
-#~ msgid "user %s does not exist"
-#~ msgstr "pengguna %s tidak wujud"
+#~ msgid "closing standard output"
+#~ msgstr "menutup output piawai"
 
-#~ msgid "incorrect password"
-#~ msgstr "katalaluan salah"
+#~ msgid "group number"
+#~ msgstr "nombor kumpulan"
 
-#, fuzzy
-#~ msgid "warning: cannot change directory to %s"
-#~ msgstr "Gagal menukar direktori %s "
+#~ msgid "invalid group number %s"
+#~ msgstr "nombor kumpulan tak sah %s"
 
-#, fuzzy
 #~ msgid ""
-#~ "Change the group of each FILE to GROUP.\n"
-#~ "With --reference, change the group of each FILE to that of RFILE.\n"
+#~ "Change the group membership of each FILE to GROUP.\n"
 #~ "\n"
 #~ "  -c, --changes          like verbose but report only when a change is "
 #~ "made\n"
-#~ "  -f, --silent, --quiet  suppress most error messages\n"
-#~ "  -v, --verbose          output a diagnostic for every file processed\n"
+#~ "      --dereference      affect the referent of each symbolic link, "
+#~ "rather\n"
+#~ "                         than the symbolic link itself\n"
 #~ msgstr ""
 #~ "Tukar keahlian kumpulan bagi setiap FAIL ke KUMPULAN.\n"
 #~ "\n"
@@ -10551,48 +10546,14 @@ msgstr ""
 #~ "      --dereference      meliputi rujukan bagi setiap pautan simbolik\n"
 #~ "                         bukannya pautan simbolik itu sendiri\n"
 
-#, fuzzy
-#~ msgid ""
-#~ "  -f, --silent, --quiet  suppress most error messages\n"
-#~ "      --reference=RFILE  use RFILE's group rather than specifying a\n"
-#~ "                         GROUP value\n"
-#~ "  -R, --recursive        operate on files and directories recursively\n"
-#~ "  -v, --verbose          output a diagnostic for every file processed\n"
-#~ "\n"
-#~ msgstr ""
-#~ "  -f, --silent, --quiet  sorok mesej ralat\n"
-#~ "      --reference=RFAIL  guna pemilik dan kumpulan RFAIL dan bukannya\n"
-#~ "                         nilai yg dinyatakan PEMILIK:KUMPULAN\n"
-#~ "  -R, --recursive        beroperasi pada fail dan direktori secara "
-#~ "rekursif\n"
-#~ "  -v, --verbose          output  diagnostik bagi setiap fail yg diproses\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "  -f, --silent, --quiet   suppress most error messages\n"
-#~ "  -v, --verbose           output a diagnostic for every file processed\n"
-#~ "      --reference=RFILE   use RFILE's mode instead of MODE values\n"
-#~ "  -R, --recursive         change files and directories recursively\n"
-#~ msgstr ""
-#~ "  -f, --silent, --quiet  sorok mesej ralat\n"
-#~ "      --reference=RFAIL  guna pemilik dan kumpulan RFAIL dan bukannya\n"
-#~ "                         nilai yg dinyatakan PEMILIK:KUMPULAN\n"
-#~ "  -R, --recursive        beroperasi pada fail dan direktori secara "
-#~ "rekursif\n"
-#~ "  -v, --verbose          output  diagnostik bagi setiap fail yg diproses\n"
-
-#, fuzzy
 #~ msgid ""
 #~ "Change the owner and/or group of each FILE to OWNER and/or GROUP.\n"
-#~ "With --reference, change the owner and group of each FILE to those of "
-#~ "RFILE.\n"
 #~ "\n"
 #~ "  -c, --changes          like verbose but report only when a change is "
 #~ "made\n"
-#~ "      --dereference      affect the referent of each symbolic link (this "
-#~ "is\n"
-#~ "                         the default), rather than the symbolic link "
-#~ "itself\n"
+#~ "      --dereference      affect the referent of each symbolic link, "
+#~ "rather\n"
+#~ "                         than the symbolic link itself\n"
 #~ msgstr ""
 #~ "Tukar pemilik  dan/atau kumpulan bagi setiap FAIL ke PEMILIH dan/atau "
 #~ "KUMPULAN.\n"
@@ -10602,14 +10563,12 @@ msgstr ""
 #~ "      --dereference      melibatkan rujukan bagi setiap pautan simbolik,\n"
 #~ "                         bukannya pautan smbolik itu sendiri.\n"
 
-#, fuzzy
 #~ msgid ""
 #~ "  -f, --silent, --quiet  suppress most error messages\n"
 #~ "      --reference=RFILE  use RFILE's owner and group rather than\n"
-#~ "                         specifying OWNER:GROUP values\n"
+#~ "                         the specified OWNER:GROUP values\n"
 #~ "  -R, --recursive        operate on files and directories recursively\n"
 #~ "  -v, --verbose          output a diagnostic for every file processed\n"
-#~ "\n"
 #~ msgstr ""
 #~ "  -f, --silent, --quiet  sorok mesej ralat\n"
 #~ "      --reference=RFAIL  guna pemilik dan kumpulan RFAIL dan bukannya\n"
@@ -10618,67 +10577,21 @@ msgstr ""
 #~ "rekursif\n"
 #~ "  -v, --verbose          output  diagnostik bagi setiap fail yg diproses\n"
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "SIZE may be (or may be an integer optionally followed by) one of "
-#~ "following:\n"
-#~ "KB 1000, K 1024, MB 1000*1000, M 1024*1024, and so on for G, T, P, E, Z, "
-#~ "Y.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "SAIZ boleh jadi (atau boleh jadi intege diikuti dengan berikut) satu drpd "
-#~ "berikut:\n"
-#~ "kB 1000, K 1024, MB 1,000,000, M 1,048,576, dan lagi bagi G, T, P, E, Z, "
-#~ "Y.\n"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: opsyen tidak dibenarkan -- %c\n"
-
-#~ msgid "block size"
-#~ msgstr "saiz blok"
-
-#~ msgid "cannot change owner and/or group of %s"
-#~ msgstr "tak dapat menukar hakmilik dan/atau kumpulan %s"
-
-#~ msgid "cannot chdir to directory %s"
-#~ msgstr "tak dapat chdir ke direktori %s"
-
-#~ msgid "cannot get the login group of a numeric UID"
-#~ msgstr "tak boleh mendapatkan kumpulan logmasuk untuk UID numerik"
-
-#, fuzzy
-#~ msgid ""
-#~ "This is free software; see the source for copying conditions.  There is "
-#~ "NO\n"
-#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
-#~ "PURPOSE.\n"
-#~ msgstr ""
-#~ "Ini adalah perisian bebas; lihat sumber untuk keadaan menyalin.  Tiada\n"
-#~ "waranti; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
-#~ "PURPOSE.\n"
-
-#~ msgid "too few arguments"
-#~ msgstr "terlalu sedikit hujah"
-
-#~ msgid "Usage: %s [OPTION] [FILE]...\n"
-#~ msgstr "Penggunaan: %s [OPSYEN] [FAIL]...\n"
-
-#~ msgid "closing standard output"
-#~ msgstr "menutup output piawai"
-
-#~ msgid "group number"
-#~ msgstr "nombor kumpulan"
-
-#~ msgid "invalid group number %s"
-#~ msgstr "nombor kumpulan tak sah %s"
-
 #~ msgid "Richard Stallman and David MacKenzie"
 #~ msgstr "Richard Stallman dan David MacKenzie"
 
 #~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n"
 #~ msgstr "Penggunaan: %s [OPSYEN]...FAIL_KIRI FAIL_KANAN\n"
 
+#~ msgid "reading %s"
+#~ msgstr "membaca %s"
+
+#~ msgid "writing %s"
+#~ msgstr "menulis %s"
+
+#~ msgid "closing %s"
+#~ msgstr "menutup %s"
+
 #~ msgid "cannot overwrite directory %s"
 #~ msgstr "tak boleh menindih direktori %s"
 
@@ -10688,6 +10601,9 @@ msgstr ""
 #~ msgid "Torbjorn Granlund, David MacKenzie, and Jim Meyering"
 #~ msgstr "Torbjorn Granlund, David MacKenzie, dan Jim Meyering"
 
+#~ msgid "accessing %s"
+#~ msgstr "mengakses %s"
+
 #~ msgid "%s: specified destination directory does not exist"
 #~ msgstr "%s: Direktori destinasi dinyatakan tidak wujud"
 
@@ -10744,6 +10660,9 @@ msgstr ""
 #~ msgid "unrecognized option %s=%s"
 #~ msgstr "opsyen tidak dikenali %s=%s"
 
+#~ msgid "opening %s"
+#~ msgstr "Membuka %s"
+
 #~ msgid "Torbjorn Granlund, David MacKenzie, Larry McVoy, and Paul Eggert"
 #~ msgstr "Torbjorn Granlund, David MacKenzie, Larry McVoy, and Paul Eggert"
 
@@ -10799,6 +10718,14 @@ msgstr ""
 #~ msgid "%s: number of bytes is large"
 #~ msgstr "bilangan byte"
 
+#, fuzzy
+#~ msgid "%s: cannot lseek back to original position"
+#~ msgstr "tak boleh mencipta fifo %s"
+
+#, fuzzy
+#~ msgid "cannot reposition file pointer for %s"
+#~ msgstr "tak memperolehi setem masa bagi %s"
+
 #~ msgid "unrecognized option `-%c'"
 #~ msgstr "opsyen tidak dikenali `%c'"
 
@@ -10811,9 +10738,6 @@ msgstr ""
 #~ msgid "cannot print only user and only group"
 #~ msgstr "tak dapat cetak hanya pengguna dan hanya kumpulan"
 
-#~ msgid "cannot get supplemental group list"
-#~ msgstr "tak dapat perolehi senarai kumpulan tambahan"
-
 #~ msgid "installing multiple files, but last argument, %s is not a directory"
 #~ msgstr ""
 #~ "memasang pelbagai fail, tetapi hujah terakhir, %s adalah bukan direktori"
@@ -10832,9 +10756,6 @@ msgstr ""
 #~ msgid "invalid field number for file 2: `%s'"
 #~ msgstr "nombor tidak sah %s"
 
-#~ msgid "too many non-option arguments"
-#~ msgstr "terlalu banyak hujah bukan-opsyen"
-
 #~ msgid "too few non-option arguments"
 #~ msgstr "terlalu sedikit hujah bukan-opsyen"
 
@@ -10916,9 +10837,6 @@ msgstr ""
 #~ msgid "major and minor device numbers may not be specified for fifo files"
 #~ msgstr "nombor peranti major dan minor tak boleh dinyatakan pada fail fifo"
 
-#~ msgid "cannot set permissions of %s"
-#~ msgstr "tak dapat menetapkan keizinan bagi %s"
-
 #~ msgid "Mike Parker, David MacKenzie, and Jim Meyering"
 #~ msgstr "Mike Parker, David MacKenzie, dan Jim Meyering"
 
@@ -10943,6 +10861,12 @@ msgstr ""
 #~ msgid "Scott Bartram and David MacKenzie"
 #~ msgstr "Mike Parker and David MacKenzie"
 
+#, fuzzy
+#~ msgid "All arguments to long options are mandatory for short options.\n"
+#~ msgstr ""
+#~ "Hujah mandatori kepada opsyen panjang andalah mandatori bagi opsyen "
+#~ "pendek juga.\n"
+
 #~ msgid "skip argument"
 #~ msgstr "Langkah hujah"
 
@@ -10972,6 +10896,10 @@ msgstr ""
 #~ msgid "Page %d"
 #~ msgstr "Halaman %d"
 
+#, fuzzy
+#~ msgid "Usage: %s [OPTION]... FILE\n"
+#~ msgstr "Penggunaan: %s [OPSYEN]...[FAIL]...\n"
+
 #~ msgid "cannot chdir from %s to .."
 #~ msgstr "tak dapat chdir daripada %s ke ..."
 
@@ -10995,6 +10923,18 @@ msgstr ""
 #~ msgid "invalid format string: `%s'"
 #~ msgstr "rentetan mod tidak sah: %s"
 
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s USERNAME COMMAND [ARGUMENT]...\n"
+#~ "  or:  %s OPTION\n"
+#~ msgstr ""
+#~ "Pengunaan: %s FAIL\n"
+#~ "    atau: %s OPSYEN\n"
+
+#, fuzzy
+#~ msgid "cannot set user-ID to %ld"
+#~ msgstr "tak dapat stat %s"
+
 #~ msgid "Usage: %s [OPTIONS] FILE [...]\n"
 #~ msgstr "Penggunaan: %s [OPSYEN] FAIL [...]\n"
 
@@ -11012,6 +10952,31 @@ msgstr ""
 #~ msgid "new_mode: mode\n"
 #~ msgstr "new_mode: mod\n"
 
+#~ msgid "Password:"
+#~ msgstr "Katalaluan:"
+
+#, fuzzy
+#~ msgid "getpass: cannot open /dev/tty"
+#~ msgstr "tak dapat membuka direktori %s"
+
+#, fuzzy
+#~ msgid "cannot set groups"
+#~ msgstr "tak dapat stat %s"
+
+#, fuzzy
+#~ msgid "cannot set group id"
+#~ msgstr "tak dapat menukar ke kumpulan null"
+
+#, fuzzy
+#~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n"
+#~ msgstr "Penggunaan: %s [OPSYEN]...[FAIL]...\n"
+
+#~ msgid "user %s does not exist"
+#~ msgstr "pengguna %s tidak wujud"
+
+#~ msgid "incorrect password"
+#~ msgstr "katalaluan salah"
+
 #, fuzzy
 #~ msgid "Jay Lepreau and David MacKenzie"
 #~ msgstr "Mike Parker and David MacKenzie"
diff --git a/po/nb.gmo b/po/nb.gmo
index 5c195a0e..9d5362de 100644
--- a/po/nb.gmo
+++ b/po/nb.gmo
diff --git a/po/nb.po b/po/nb.po
index 219cc886..bcf40988 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,276 +1,314 @@
-# Norwegian messages for GNU textutils (bokmål dialect)
+# Norwegian bokmål translation of GNU coreutils
 # Copyright (C) 1996 Free Software Foundation, Inc.
+# This file is distributed under the same license as the coreutils package.
 # Eivind Tagseth <eivindt@multinet.no>, 1996, 1997, 1999.
+# Ã…ka Sikrom <a4@hush.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU textutils 2.0.20\n"
+"Project-Id-Version: coreutils-8.23-pre1\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
-"PO-Revision-Date: 2002-01-27 21:35+0100\n"
-"Last-Translator: Eivind Tagseth <eivindt@multinet.no>\n"
-"Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
+"PO-Revision-Date: 2014-07-18 11:36+0100\n"
+"Last-Translator: Ã…ka Sikrom <a4@hush.com>\n"
+"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
 "Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.5.4\n"
 
 #: lib/argmatch.c:133
 #, c-format
 msgid "invalid argument %s for %s"
-msgstr "ugyldig argument %s for %s"
+msgstr "argumentet %s er ugyldig for %s"
 
 #: lib/argmatch.c:134
 #, c-format
 msgid "ambiguous argument %s for %s"
-msgstr "flertydig argument %s for %s"
+msgstr "argumentet %s er tvetydig for %s"
 
 #: lib/argmatch.c:153
 msgid "Valid arguments are:"
-msgstr "Gyldige argument er:"
+msgstr "Følgende argumenter er gyldige:"
 
 #: lib/closein.c:100
-#, fuzzy
 msgid "error closing file"
-msgstr "lager filen «%s»\n"
-
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+msgstr "feil ved lukking av fil"
+
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "feil ved skriving"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
-#, fuzzy, c-format
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
+#, c-format
 msgid "preserving permissions for %s"
-msgstr "kan ikke endre rettigheter til %s"
+msgstr "bevarer rettigheter for %s"
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "Ukjent systemfeil"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
-msgstr ""
+msgstr "vanlig, tom fil"
 
-#: lib/file-type.c:38
-#, fuzzy
+#: lib/file-type.c:40
 msgid "regular file"
-msgstr "feil ved lesing"
+msgstr "vanlig fil"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
-msgstr ""
+msgstr "mappe"
+
+#: lib/file-type.c:46
+msgid "symbolic link"
+msgstr "symbolsk lenke"
+
+#: lib/file-type.c:52
+msgid "message queue"
+msgstr "meldingskø"
+
+#: lib/file-type.c:55
+msgid "semaphore"
+msgstr "semafor"
+
+#: lib/file-type.c:58
+msgid "shared memory object"
+msgstr "delt minneobjekt"
+
+#: lib/file-type.c:61
+msgid "typed memory object"
+msgstr "typebestemt minneobjekt"
 
-#: lib/file-type.c:44
-#, fuzzy
+#: lib/file-type.c:66
 msgid "block special file"
-msgstr "blokkstørrelse"
+msgstr "blokk-spesiell fil"
 
-#: lib/file-type.c:47
-#, fuzzy
+#: lib/file-type.c:69
 msgid "character special file"
-msgstr "tegn-posisjon er null"
+msgstr "spesial-tegnfil"
 
-#: lib/file-type.c:50
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr "sammenhengende data"
+
+#: lib/file-type.c:75
 msgid "fifo"
-msgstr ""
+msgstr "fifo"
 
-#: lib/file-type.c:53
-msgid "symbolic link"
-msgstr ""
+#: lib/file-type.c:78
+msgid "door"
+msgstr "dør"
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr ""
+#: lib/file-type.c:81
+msgid "multiplexed block special file"
+msgstr "multipleksert blokk-spesialfil"
 
-#: lib/file-type.c:59
-msgid "message queue"
-msgstr ""
+#: lib/file-type.c:84
+msgid "multiplexed character special file"
+msgstr "multipleksert tegn-spesialfil"
 
-#: lib/file-type.c:62
-msgid "semaphore"
-msgstr ""
+#: lib/file-type.c:87
+msgid "multiplexed file"
+msgstr "multipleksert fil"
 
-#: lib/file-type.c:65
-msgid "shared memory object"
-msgstr ""
+#: lib/file-type.c:90
+msgid "named file"
+msgstr "navngitt fil"
 
-#: lib/file-type.c:68
-msgid "typed memory object"
-msgstr ""
+#: lib/file-type.c:93
+msgid "network special file"
+msgstr "spesiell nettverksfil"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr "flyttet fil med data"
 
-#: lib/file-type.c:70
-#, fuzzy
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr "flyttet fil uten data"
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr "port"
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "sokkel"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr "korrektur"
+
+#: lib/file-type.c:110
 msgid "weird file"
-msgstr "feil ved lesing"
+msgstr "rar fil"
 
 #: lib/gai_strerror.c:57
 msgid "Address family for hostname not supported"
-msgstr ""
+msgstr "Vertsnavnets adressefamilie støttes ikke"
 
 #: lib/gai_strerror.c:58
 msgid "Temporary failure in name resolution"
-msgstr ""
+msgstr "Midlertidig feil i navneoppslag"
 
 #: lib/gai_strerror.c:59
 msgid "Bad value for ai_flags"
-msgstr ""
+msgstr "«ai_flags» har ugyldig verdi"
 
 #: lib/gai_strerror.c:60
 msgid "Non-recoverable failure in name resolution"
-msgstr ""
+msgstr "Ugjenopprettelig feil i navneoppslag"
 
 #: lib/gai_strerror.c:61
-#, fuzzy
 msgid "ai_family not supported"
-msgstr "blokkstørrelse"
+msgstr "«ai_family» støttes ikke"
 
 #: lib/gai_strerror.c:62
 msgid "Memory allocation failure"
-msgstr ""
+msgstr "Minnetildelingsfeil"
 
 #: lib/gai_strerror.c:63
 msgid "No address associated with hostname"
-msgstr ""
+msgstr "Ingen adresse tilhører vertsnavnet"
 
 #: lib/gai_strerror.c:64
 msgid "Name or service not known"
-msgstr ""
+msgstr "Navnet eller tjenesten er ukjent"
 
 #: lib/gai_strerror.c:65
 msgid "Servname not supported for ai_socktype"
-msgstr ""
+msgstr "Tjenestenavnet støttes ikke for «ai_socktype»"
 
 #: lib/gai_strerror.c:66
-#, fuzzy
 msgid "ai_socktype not supported"
-msgstr "blokkstørrelse"
+msgstr "«ai_socktype» støttes ikke"
 
 #: lib/gai_strerror.c:67
-#, fuzzy
 msgid "System error"
-msgstr "feil ved skriving"
+msgstr "Systemfeil"
 
 #: lib/gai_strerror.c:68
 msgid "Argument buffer too small"
-msgstr ""
+msgstr "Mellomlageret for argumenter er for lite"
 
 #: lib/gai_strerror.c:70
 msgid "Processing request in progress"
-msgstr ""
+msgstr "Forespørselen er under behandling"
 
 #: lib/gai_strerror.c:71
 msgid "Request canceled"
-msgstr ""
+msgstr "Forespørselen ble avbrutt"
 
 #: lib/gai_strerror.c:72
 msgid "Request not canceled"
-msgstr ""
+msgstr "Forespørselen ble ikke avbrutt"
 
 #: lib/gai_strerror.c:73
 msgid "All requests done"
-msgstr ""
+msgstr "Alle forespørsler er utført"
 
 #: lib/gai_strerror.c:74
 msgid "Interrupted by a signal"
-msgstr ""
+msgstr "Avbrutt av signal"
 
 #: lib/gai_strerror.c:75
 msgid "Parameter string not correctly encoded"
-msgstr ""
+msgstr "Parameterstreng er feilkodet"
 
 #: lib/gai_strerror.c:87
-#, fuzzy
 msgid "Unknown error"
-msgstr "Ukjent systemfeil"
+msgstr "Ukjent feil"
 
 #: lib/getopt.c:547 lib/getopt.c:576
-#, fuzzy, c-format
+#, c-format
 msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: flagget «%s» er flertydig\n"
+msgstr "%s: valget «%s» er tvetydig. Mulige valg:"
 
 #: lib/getopt.c:624 lib/getopt.c:628
-#, fuzzy, c-format
+#, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: flagget «--%s» trenger et argument\n"
+msgstr "%s: valget «--%s» tillater ikke argumenter\n"
 
 #: lib/getopt.c:637 lib/getopt.c:642
-#, fuzzy, c-format
+#, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: flagget «%c%s» trenger et argument\n"
+msgstr "%s: valget «%c%s» tillater ikke argumenter\n"
 
 #: lib/getopt.c:685 lib/getopt.c:704
-#, fuzzy, c-format
+#, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: flagget «%s» trenger et argument\n"
+msgstr "%s: valget «--%s» krever et argument\n"
 
 #: lib/getopt.c:742 lib/getopt.c:745
-#, fuzzy, c-format
+#, c-format
 msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: ukjent flagg «--%s»\n"
+msgstr "%s: valget «--%s» er ukjent\n"
 
 #: lib/getopt.c:753 lib/getopt.c:756
-#, fuzzy, c-format
+#, c-format
 msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: ukjent flagg «%c%s»\n"
+msgstr "%s: valget «%c%s» er ukjent\n"
 
 #: lib/getopt.c:805 lib/getopt.c:808
-#, fuzzy, c-format
+#, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: ukjent flagg -- %c\n"
+msgstr "%s: valget -- «%c» er ugyldig\n"
 
 #: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106
-#, fuzzy, c-format
+#, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: flagget trenger et argument -- %c\n"
+msgstr "%s: valget -- «%c» krever et argument\n"
 
 #: lib/getopt.c:934 lib/getopt.c:950
-#, fuzzy, c-format
+#, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: flagget «-W %s» er flertydig\n"
+msgstr "%s: valget «-W %s» er tvetydig\n"
 
 #: lib/getopt.c:974 lib/getopt.c:992
-#, fuzzy, c-format
+#, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: flagget «-W %s» tillater ikke et argument\n"
+msgstr "%s: valget «-W %s» tillater ikke argumenter\n"
 
 #: lib/getopt.c:1013 lib/getopt.c:1031
-#, fuzzy, c-format
+#, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: flagget «%s» trenger et argument\n"
+msgstr "%s: valget «-W %s» krever et argument\n"
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
-msgstr "kan ikke endre rettigheter til %s"
+msgstr "klarte ikke å endre rettigheter for «%s»"
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
-msgstr "kan ikke opprette katalog %s"
+msgstr "klarte ikke å opprette mappa «%s»"
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
-msgstr "virtuelt minne oppbrukt"
+msgstr "minnet er oppbrukt"
 
 #: lib/openat-die.c:38
-#, fuzzy, c-format
+#, c-format
 msgid "unable to record current working directory"
-msgstr "kan ikke opprette katalog %s"
+msgstr "klarte ikke å hente gjeldende arbeidsmappe"
 
 #: lib/openat-die.c:57 src/find-mount-point.c:107
 #, c-format
 msgid "failed to return to initial working directory"
-msgstr ""
+msgstr "klarte ikke å gå tilbake til opprinnelig arbeidsmappe"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
@@ -302,103 +340,96 @@ msgid "'"
 msgstr "»"
 
 #: lib/randread.c:128
-#, fuzzy, c-format
+#, c-format
 msgid "%s: end of file"
-msgstr "%s: lesefeil"
+msgstr "%s: slutt på fil"
 
 #: lib/regcomp.c:131
 msgid "Success"
-msgstr ""
+msgstr "Fullført"
 
 #: lib/regcomp.c:134
 msgid "No match"
-msgstr ""
+msgstr "Ingen treff"
 
 #: lib/regcomp.c:137
-#, fuzzy
 msgid "Invalid regular expression"
-msgstr "%s: ugyldig regulært uttrykk: %s"
+msgstr "Ugyldig regulært uttrykk"
 
 #: lib/regcomp.c:140
 msgid "Invalid collation character"
-msgstr ""
+msgstr "Ugyldig sammenligningstegn"
 
 #: lib/regcomp.c:143
-#, fuzzy
 msgid "Invalid character class name"
-msgstr "ugyldig tegn-klasse «%s»"
+msgstr "Ugyldig navn på tegnklasse"
 
 #: lib/regcomp.c:146
 msgid "Trailing backslash"
-msgstr ""
+msgstr "Etterfølgende skråstrek"
 
 #: lib/regcomp.c:149
 msgid "Invalid back reference"
-msgstr ""
+msgstr "Ugyldig tilbakereferanse"
 
 #: lib/regcomp.c:152
 msgid "Unmatched [ or [^"
-msgstr ""
+msgstr "Ingen treff på «[» eller «[^»"
 
 #: lib/regcomp.c:155
 msgid "Unmatched ( or \\("
-msgstr ""
+msgstr "Ingen treff på  «(» eller «\\(»"
 
 #: lib/regcomp.c:158
 msgid "Unmatched \\{"
-msgstr ""
+msgstr "Ingen treff på «\\{»"
 
 #: lib/regcomp.c:161
 msgid "Invalid content of \\{\\}"
-msgstr ""
+msgstr "Ugyldig innhold i «\\{\\}»"
 
 #: lib/regcomp.c:164
 msgid "Invalid range end"
-msgstr ""
+msgstr "Ugyldig slutt på utvalg"
 
 #: lib/regcomp.c:167
-#, fuzzy
 msgid "Memory exhausted"
-msgstr "virtuelt minne oppbrukt"
+msgstr "Minnet er fullt"
 
 #: lib/regcomp.c:170
-#, fuzzy
 msgid "Invalid preceding regular expression"
-msgstr "%s: ugyldig regulært uttrykk: %s"
+msgstr "Ugyldig forestående regulært uttrykk"
 
 #: lib/regcomp.c:173
-#, fuzzy
 msgid "Premature end of regular expression"
-msgstr "feil i søk med regulært uttrykk"
+msgstr "For tidlig slutt på regulært uttrykk"
 
 #: lib/regcomp.c:176
-#, fuzzy
 msgid "Regular expression too big"
-msgstr "feil i søk med regulært uttrykk"
+msgstr "Regulært uttrykk er for stort"
 
 #: lib/regcomp.c:179
 msgid "Unmatched ) or \\)"
-msgstr ""
+msgstr "Ubalansert ) eller \\)"
 
-#: lib/regcomp.c:704
-#, fuzzy
+#: lib/regcomp.c:707
 msgid "No previous regular expression"
-msgstr "feil i søk med regulært uttrykk"
+msgstr "Intet tidligere regulært uttrykk"
 
 #: lib/root-dev-ino.h:37
 #, c-format
 msgid "it is dangerous to operate recursively on %s"
-msgstr ""
+msgstr "det er farlig å jobbe rekursivt på %s"
 
 #: lib/root-dev-ino.h:41
 #, c-format
 msgid "it is dangerous to operate recursively on %s (same as %s)"
-msgstr ""
+msgstr "det er farlig å jobbe rekursivt på %s (samme som %s)"
 
 #: lib/root-dev-ino.h:43
 #, c-format
 msgid "use --no-preserve-root to override this failsafe"
-msgstr ""
+msgstr "bruk «--no-preserve-root» for å oppheve denne sikkerhetsmekanismen"
 
 #. TRANSLATORS: A regular expression testing for an affirmative answer
 #. (english: "yes").  Testing the first character may be sufficient.
@@ -406,8 +437,7 @@ msgstr ""
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
-#, fuzzy
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[jJ]"
 
@@ -417,202 +447,182 @@ msgstr "^[jJ]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
-#, fuzzy, c-format
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
+#, c-format
 msgid "setting permissions for %s"
-msgstr "kan ikke endre rettigheter til %s"
+msgstr "angir rettigheter til %s"
 
 #: lib/siglist.h:31
 msgid "Hangup"
-msgstr ""
+msgstr "Legg på"
 
 #: lib/siglist.h:34
 msgid "Interrupt"
-msgstr ""
+msgstr "Avbryt"
 
 #: lib/siglist.h:37
 msgid "Quit"
-msgstr ""
+msgstr "Avslutt"
 
 #: lib/siglist.h:40
 msgid "Illegal instruction"
-msgstr ""
+msgstr "Ugyldig instruksjon"
 
 #: lib/siglist.h:43
 msgid "Trace/breakpoint trap"
-msgstr ""
+msgstr "Sporings-/stoppunktsfelle"
 
 #: lib/siglist.h:46
 msgid "Aborted"
-msgstr ""
+msgstr "Avbrutt"
 
 #: lib/siglist.h:49
 msgid "Floating point exception"
-msgstr ""
+msgstr "Unntakstilfelle ved flyttallsoperasjon"
 
 #: lib/siglist.h:52
 msgid "Killed"
-msgstr ""
+msgstr "Drept"
 
 #: lib/siglist.h:55
-#, fuzzy
 msgid "Bus error"
-msgstr "standard feilkanal"
+msgstr "Bussfeil"
 
 #: lib/siglist.h:58
 msgid "Segmentation fault"
-msgstr ""
+msgstr "Segmenteringsfeil"
 
 #: lib/siglist.h:61
 msgid "Broken pipe"
-msgstr ""
+msgstr "Ødelagt rør"
 
 #: lib/siglist.h:64
 msgid "Alarm clock"
-msgstr ""
+msgstr "Alarmklokke"
 
 #: lib/siglist.h:67
 msgid "Terminated"
-msgstr ""
+msgstr "Avsluttet"
 
 #: lib/siglist.h:70
 msgid "Urgent I/O condition"
-msgstr ""
+msgstr "Kritisk I/O-tilstand"
 
 #: lib/siglist.h:73
 msgid "Stopped (signal)"
-msgstr ""
+msgstr "Stoppet (signal)"
 
 #: lib/siglist.h:76
 msgid "Stopped"
-msgstr ""
+msgstr "Stoppet"
 
 #: lib/siglist.h:79
 msgid "Continued"
-msgstr ""
+msgstr "Fortsetter"
 
 #: lib/siglist.h:82
 msgid "Child exited"
-msgstr ""
+msgstr "Underprosess avsluttet"
 
 #: lib/siglist.h:85
 msgid "Stopped (tty input)"
-msgstr ""
+msgstr "Stoppet (tty-inndata)"
 
 #: lib/siglist.h:88
 msgid "Stopped (tty output)"
-msgstr ""
+msgstr "Stoppet (tty-utdata)"
 
 #: lib/siglist.h:91
 msgid "I/O possible"
-msgstr ""
+msgstr "I/O mulig"
 
 #: lib/siglist.h:94
 msgid "CPU time limit exceeded"
-msgstr ""
+msgstr "Overskredet begrensning av CPU-tid"
 
 #: lib/siglist.h:97
 msgid "File size limit exceeded"
-msgstr ""
+msgstr "Filstørrelsesgrense er overskredet"
 
 #: lib/siglist.h:100
 msgid "Virtual timer expired"
-msgstr ""
+msgstr "Virtuell tidsgrense er overskredet"
 
 #: lib/siglist.h:103
 msgid "Profiling timer expired"
-msgstr ""
+msgstr "Profileringstiden tok slutt"
 
 #: lib/siglist.h:106
 msgid "Window changed"
-msgstr ""
+msgstr "Vinduet er endret"
 
 #: lib/siglist.h:109
-#, fuzzy
 msgid "User defined signal 1"
-msgstr "%s: ugyldig prosess-id"
+msgstr "Brukerdefinert signal 1"
 
 #: lib/siglist.h:112
-#, fuzzy
 msgid "User defined signal 2"
-msgstr "%s: ugyldig prosess-id"
+msgstr "Brukerdefinert signal 2"
 
 #: lib/siglist.h:117
 msgid "EMT trap"
-msgstr ""
+msgstr "EMT-felle"
 
 #: lib/siglist.h:120
-#, fuzzy
 msgid "Bad system call"
-msgstr "blokkstørrelse"
+msgstr "Ugyldig systemkall"
 
 #: lib/siglist.h:123
 msgid "Stack fault"
-msgstr ""
+msgstr "Stabelfeil"
 
 #: lib/siglist.h:126
 msgid "Information request"
-msgstr ""
+msgstr "Informasjonsforespørsel"
 
 #: lib/siglist.h:128
-#, fuzzy
 msgid "Power failure"
-msgstr "Ã¥pning av fil feilet"
+msgstr "Strømmen gikk"
 
 #: lib/siglist.h:131
 msgid "Resource lost"
-msgstr ""
-
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, fuzzy, c-format
-msgid "cannot create pipe"
-msgstr "kan ikke opprette katalog %s"
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, fuzzy, c-format
-msgid "%s subprocess failed"
-msgstr "feil ved lukking av fil"
+msgstr "Tapt ressurs"
 
 #: lib/strsignal.c:114
 #, c-format
 msgid "Real-time signal %d"
-msgstr ""
+msgstr "Sanntidssignal %d"
 
 #: lib/strsignal.c:118
 #, c-format
 msgid "Unknown signal %d"
-msgstr ""
+msgstr "Signalet «%d» er ukjent"
 
 #: lib/unicodeio.c:102
-#, fuzzy
 msgid "iconv function not usable"
-msgstr "kan ikke skrive ut U+%04X: iconv-funksjonen er ikke brukbar"
+msgstr "iconv-funksjon er ubrukelig"
 
 #: lib/unicodeio.c:104
-#, fuzzy
 msgid "iconv function not available"
-msgstr "kan ikke skrive ut U+%04X: iconv-funksjon er ikke tilgjengelig"
+msgstr "iconv-funksjon er ikke tilgjengelig"
 
 #: lib/unicodeio.c:111
-#, fuzzy
 msgid "character out of range"
-msgstr "U+%04X: tegn utenfor tillatte verdier"
+msgstr "tegn utenfor tillatte verdier"
 
 #: lib/unicodeio.c:181
 #, c-format
 msgid "cannot convert U+%04X to local character set"
-msgstr "kan ikke konvertere U+%04X til lokalt tegnsett"
+msgstr "klarte ikke å konvertere U+%04X til lokalt tegnsett"
 
 #: lib/unicodeio.c:183
-#, fuzzy, c-format
+#, c-format
 msgid "cannot convert U+%04X to local character set: %s"
-msgstr "kan ikke konvertere U+%04X til lokalt tegnsett"
+msgstr "klarte ikke å konvertere U+%04X til lokalt tegnsett. %s"
 
 #: lib/userspec.c:106
 msgid "invalid user"
@@ -623,31 +633,30 @@ msgid "invalid group"
 msgstr "ugyldig gruppe"
 
 #: lib/userspec.c:108
-#, fuzzy
 msgid "invalid spec"
-msgstr "ugyldig bruker"
+msgstr "ugyldig spesifikasjon"
 
 #: lib/verror.c:73
 #, c-format
 msgid "unable to display error message"
-msgstr ""
+msgstr "klarte ikke å vise feilmelding"
 
 #: lib/version-etc.c:74
 #, c-format
 msgid "Packaged by %s (%s)\n"
-msgstr ""
+msgstr "Pakket av %s (%s)\n"
 
 #: lib/version-etc.c:77
 #, c-format
 msgid "Packaged by %s\n"
-msgstr ""
+msgstr "Pakket av %s\n"
 
 #. TRANSLATORS: Translate "(C)" to the copyright symbol
 #. (C-in-a-circle), if this symbol is available in the user's
 #. locale.  Otherwise, do not translate "(C)"; leave it as-is.
 #: lib/version-etc.c:84
 msgid "(C)"
-msgstr ""
+msgstr "©"
 
 #: lib/version-etc.c:86
 msgid ""
@@ -658,6 +667,12 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 "\n"
 msgstr ""
+"\n"
+"Lisens GPLv3+: GNU GPL versjon 3 eller senere <http://gnu.org/licenses/gpl."
+"html>.\n"
+"Dette er fri programvare. Du kan endre den og dele den videre.\n"
+"Det stilles INGEN GARANTI, så langt aktuelt lovverk tillater det.\n"
+"\n"
 
 #. TRANSLATORS: %s denotes an author name.
 #: lib/version-etc.c:102
@@ -667,35 +682,39 @@ msgstr "Skrevet av %s.\n"
 
 #. TRANSLATORS: Each %s denotes an author name.
 #: lib/version-etc.c:106
-#, fuzzy, c-format
+#, c-format
 msgid "Written by %s and %s.\n"
-msgstr "Skrevet av %s.\n"
+msgstr "Skrevet av %s og %s.\n"
 
 #. TRANSLATORS: Each %s denotes an author name.
 #: lib/version-etc.c:110
-#, fuzzy, c-format
+#, c-format
 msgid "Written by %s, %s, and %s.\n"
-msgstr "Skrevet av %s.\n"
+msgstr "Skrevet av %s, %s og %s.\n"
 
 #. TRANSLATORS: Each %s denotes an author name.
 #. You can use line breaks, estimating that each author name occupies
 #. ca. 16 screen columns and that a screen line has ca. 80 columns.
 #: lib/version-etc.c:117
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Written by %s, %s, %s,\n"
 "and %s.\n"
-msgstr "Skrevet av %s.\n"
+msgstr ""
+"Skrevet av %s, %s, %s\n"
+"og %s.\n"
 
 #. TRANSLATORS: Each %s denotes an author name.
 #. You can use line breaks, estimating that each author name occupies
 #. ca. 16 screen columns and that a screen line has ca. 80 columns.
 #: lib/version-etc.c:124
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Written by %s, %s, %s,\n"
 "%s, and %s.\n"
-msgstr "Skrevet av %s.\n"
+msgstr ""
+"Skrevet av %s, %s, %s,\n"
+"%s og %s.\n"
 
 #. TRANSLATORS: Each %s denotes an author name.
 #. You can use line breaks, estimating that each author name occupies
@@ -706,6 +725,8 @@ msgid ""
 "Written by %s, %s, %s,\n"
 "%s, %s, and %s.\n"
 msgstr ""
+"Skrevet av %s, %s, %s,\n"
+"%s, %s og %s.\n"
 
 #. TRANSLATORS: Each %s denotes an author name.
 #. You can use line breaks, estimating that each author name occupies
@@ -716,6 +737,8 @@ msgid ""
 "Written by %s, %s, %s,\n"
 "%s, %s, %s, and %s.\n"
 msgstr ""
+"Skrevet av %s, %s, %s,\n"
+"%s, %s, %s og %s.\n"
 
 #. TRANSLATORS: Each %s denotes an author name.
 #. You can use line breaks, estimating that each author name occupies
@@ -727,6 +750,9 @@ msgid ""
 "%s, %s, %s, %s,\n"
 "and %s.\n"
 msgstr ""
+"Skrevet av %s, %s, %s,\n"
+"%s, %s, %s, %s\n"
+"og %s.\n"
 
 #. TRANSLATORS: Each %s denotes an author name.
 #. You can use line breaks, estimating that each author name occupies
@@ -738,6 +764,9 @@ msgid ""
 "%s, %s, %s, %s,\n"
 "%s, and %s.\n"
 msgstr ""
+"Skrevet av %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s og %s.\n"
 
 #. TRANSLATORS: Each %s denotes an author name.
 #. You can use line breaks, estimating that each author name occupies
@@ -749,92 +778,73 @@ msgid ""
 "%s, %s, %s, %s,\n"
 "%s, %s, and others.\n"
 msgstr ""
+"Skrevet av %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s og andre.\n"
 
 #. TRANSLATORS: The placeholder indicates the bug-reporting address
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
 #: lib/version-etc.c:245
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Report bugs to: %s\n"
 msgstr ""
 "\n"
-"Rapportér feil til <bug-textutils@gnu.org>."
+"Rapporter feil til: %s\n"
 
 #: lib/version-etc.c:247
-#, fuzzy, c-format
+#, c-format
 msgid "Report %s bugs to: %s\n"
-msgstr ""
-"\n"
-"Rapportér feil til <bug-textutils@gnu.org>."
+msgstr "Rapporter feil som oppstår med %s til: %s\n"
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
-msgstr ""
+msgstr "Nettside for %s: <%s>\n"
 
 #: lib/version-etc.c:253
 #, c-format
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
-msgstr ""
+msgstr "Nettside for %s: <http://www.gnu.org/software/%s/>\n"
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr ""
-
-#: lib/w32spawn.h:43
-#, fuzzy, c-format
-msgid "_open_osfhandle failed"
-msgstr "Ã¥pning av fil feilet"
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr ""
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr ""
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr ""
+"Generell hjelp til å bruke GNU-programmer: <http://www.gnu.org/gethelp/>\n"
 
 #: lib/xfreopen.c:35
 msgid "stdin"
-msgstr ""
+msgstr "standard innkanal"
 
 #: lib/xfreopen.c:36
 msgid "stdout"
-msgstr ""
+msgstr "standard utkanal"
 
 #: lib/xfreopen.c:37
 msgid "stderr"
-msgstr ""
+msgstr "standardfeil"
 
 #: lib/xfreopen.c:38
-#, fuzzy
 msgid "unknown stream"
-msgstr "Ukjent systemfeil"
+msgstr "ukjent strøm"
 
 #: lib/xfreopen.c:39
-#, fuzzy, c-format
+#, c-format
 msgid "failed to reopen %s with mode %s"
-msgstr "kan ikke endre rettigheter til %s"
+msgstr "klarte ikke å åpne %s på nytt med modus %s"
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
-msgstr "strengsammenligning feilet"
+msgstr "strengsammenligning mislyktes"
 
 #: lib/xmemcoll.c:40
 #, c-format
 msgid "Set LC_ALL='C' to work around the problem."
-msgstr "Sett LC_ALL='C' for å omgå problemet."
+msgstr "Velg LC_ALL='C' for å omgå problemet."
 
 #: lib/xmemcoll.c:42
 #, c-format
@@ -844,38 +854,37 @@ msgstr "Strengene som ble sammenlignet var «%s» og «%s»."
 #: lib/xprintf.c:50 lib/xprintf.c:76
 #, c-format
 msgid "cannot perform formatted output"
-msgstr ""
+msgstr "klarte ikke å formatere utdata"
 
 #: lib/xstrtol-error.c:63
-#, fuzzy, c-format
+#, c-format
 msgid "invalid %s%s argument '%s'"
-msgstr "ugyldig argument %s for %s"
+msgstr "%s%s-argumentet «%s» er ugyldig"
 
 #: lib/xstrtol-error.c:68
-#, fuzzy, c-format
+#, c-format
 msgid "invalid suffix in %s%s argument '%s'"
-msgstr "ugyldig linjenummer-økning: «%s»"
+msgstr "ugyldig suffiks i %s%s-argument «%s»"
 
 #: lib/xstrtol-error.c:72
-#, fuzzy, c-format
+#, c-format
 msgid "%s%s argument '%s' too large"
-msgstr "%s: tall «%.*s» for stort"
+msgstr "%s%s-argumentet «%s» er for stort/langt"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/base64.c:40
 msgid "Simon Josefsson"
-msgstr ""
+msgstr "Simon Josefsson"
 
 #: src/base64.c:60
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
 "Base64 encode or decode FILE, or standard input, to standard output.\n"
 msgstr ""
-"Bruk:  %s [FLAGG] [FIL]...\n"
-"eller: %s [FLAGG] --check [FIL]\n"
-"Skriv eller sjekk %s-sjekksummer (%d-bit).\n"
-"Dersom ingen FIL er spesifisert eller FIL er -, leses det fra standard inn.\n"
+"Bruk: %s [VALG] … [FIL]\n"
+"Konverter FIL eller inndata til eller fra base64-format, og send til "
+"standardutdata.\n"
 
 #: src/base64.c:67
 msgid ""
@@ -886,14 +895,21 @@ msgid ""
 "                          Use 0 to disable line wrapping\n"
 "\n"
 msgstr ""
+"  -d, --decode          dekode data\n"
+"  -i, --ignore-garbage  ignorer tall og spesialtegn ved dekoding\n"
+"  -w, --wrap=KOLONNER       bryt kodede linjer etter angitt antall KOLONNER "
+"(standard: 76).\n"
+"                          Bruk 0 for å deaktivere linjekutting\n"
+"\n"
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
 "\n"
-"Når ingen FIL eller når FIL er -, les fra standard inn.\n"
+"Hvis ingen FIL er valgt, eller hvis FIL er «-», leser programmet fra "
+"standard inndata.\n"
 
 #: src/base64.c:79
 msgid ""
@@ -903,79 +919,88 @@ msgid ""
 "the formal base64 alphabet.  Use --ignore-garbage to attempt to recover\n"
 "from any other non-alphabet bytes in the encoded stream.\n"
 msgstr ""
+"\n"
+"Dataen kodes som beskrevet for base64-alfabetet i RFC 3548. Ved dekoding\n"
+"kan inndata inneholde linjeskift i tillegg til tegnene i det formelle\n"
+"base64-alfabetet. Bruk «--ignore-garbage» for å forsøke å ignorere ikke-\n"
+"alfabetiske tegn i den kodede datastrømmen.\n"
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "lesefeil"
 
-#: src/base64.c:230
-#, fuzzy, c-format
+#: src/base64.c:231
+#, c-format
 msgid "invalid input"
-msgstr "ugyldig antall"
+msgstr "ugyldig inndata"
 
-#: src/base64.c:267
-#, fuzzy, c-format
+#: src/base64.c:268
+#, c-format
 msgid "invalid wrap size: %s"
-msgstr "ugyldig type-streng «%s»"
-
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
-#, fuzzy, c-format
+msgstr "«%s» er en ugyldig linjebruddsstørrelse"
+
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
+#, c-format
 msgid "extra operand %s"
-msgstr "ekstra operator «%s»"
+msgstr "ekstra operand %s"
 
-#: src/base64.c:318 src/cat.c:781
-#, fuzzy, c-format
+#: src/base64.c:319 src/cat.c:781
+#, c-format
 msgid "closing standard input"
-msgstr "standard inn"
+msgstr "lukker standard inndata"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
 #: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51
 #: src/who.c:49 src/yes.c:32
-#, fuzzy
 msgid "David MacKenzie"
-msgstr "Paul Rubin og David MacKenzie"
+msgstr "David MacKenzie"
 
 #: src/basename.c:48
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s NAME [SUFFIX]\n"
 "  or:  %s OPTION... NAME...\n"
 msgstr ""
-"Bruk:  %s [FIL]...\n"
-"eller: %s [FLAGG]\n"
+"Bruk: %s NAVN [SUFFIKS]\n"
+"  eller:  %s VALG… NAVN…\n"
 
 #: src/basename.c:53
 msgid ""
 "Print NAME with any leading directory components removed.\n"
 "If specified, also remove a trailing SUFFIX.\n"
 msgstr ""
+"Skriv ut NAVN uten evt. ledende mappekomponent(er).\n"
+"SUFFIKS kan også fjernes.\n"
 
 #: src/basename.c:60
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
+"  -a, --multiple       slå på støtte for flere argumenter og behandle alle "
+"som NAVN\n"
+"  -s, --suffix=SUFFIKS  fjern et avsluttende SUFFIKS\n"
+"  -z, --zero           separat utskrift med NUL i stedet for ny linje\n"
 
 #: src/basename.c:67
 #, c-format
@@ -987,41 +1012,44 @@ msgid ""
 "  %s -s .h include/stdio.h  -> \"stdio\"\n"
 "  %s -a any/str1 any/str2   -> \"str1\" followed by \"str2\"\n"
 msgstr ""
+"\n"
+"Eksempler:\n"
+"  %s /usr/bin/sort          -> «sort»\n"
+"  %s include/stdio.h .h     -> «stdio»\n"
+"  %s -s .h include/stdio.h  -> «stdio»\n"
+"  %s -a any/str1 any/str2   -> «str1» etterfulgt av «str2»\n"
 
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
-#, fuzzy, c-format
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
+#, c-format
 msgid "missing operand"
-msgstr "%s: heltall forventet etter «%c»"
+msgstr "mangler operand"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
-msgstr ""
+msgstr "Torbjorn Granlund"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
-#, fuzzy
 msgid "Richard M. Stallman"
-msgstr "Torbjorn Granlund og Richard M. Stallman"
+msgstr "Richard M. Stallman"
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
-msgstr "Bruk: %s [FLAGG]... [FIL]...\n"
+msgstr "Bruk: %s [VALG] … [FIL] …\n"
 
 #: src/cat.c:92
-#, fuzzy
 msgid ""
 "Concatenate FILE(s), or standard input, to standard output.\n"
 "\n"
@@ -1032,14 +1060,15 @@ msgid ""
 "  -n, --number             number all output lines\n"
 "  -s, --squeeze-blank      suppress repeated empty output lines\n"
 msgstr ""
-"Føy sammen FIL(er) eller standard inn til standard ut.\n"
+"Slå sammen FIL(er), eller standard inndata til standardutdata.\n"
 "\n"
-"  -A, --show-all           samme som -vET\n"
-"  -b, --number-nonblank    nummerer ikke-blanke ut-linjer\n"
-"  -e                       samme som -vE\n"
-"  -E, --show-ends          skriv $ på slutten av hver linje\n"
-"  -n, --number             nummerer alle ut-linjer\n"
-"  -s, --squeeze-blank      aldri mer enn én blank linje\n"
+"  -A, --show-all           tilsvarer «-vET»\n"
+"  -b, --number-nonblank    nummerer linjer som ikke er tomme (overstyrer «-"
+"n»)\n"
+"  -e                       tilsvarer «-vE»\n"
+"  -E, --show-ends          vis $ i slutten av hver linje\n"
+"  -n, --number             nummerer alle linjer\n"
+"  -s, --squeeze-blank      ikke skriv ut flere tomme linjer på rad\n"
 
 #: src/cat.c:102
 msgid ""
@@ -1048,7 +1077,7 @@ msgid ""
 "  -u                       (ignored)\n"
 "  -v, --show-nonprinting   use ^ and M- notation, except for LFD and TAB\n"
 msgstr ""
-"  -t                       samme som -vT\n"
+"  -t                       tilsvarer -vT\n"
 "  -T, --show-tabs          vis tabulatortegn som ^I\n"
 "  -u                       (ignorert)\n"
 "  -v, --show-nonprinting   bruk ^ og M-notasjon, unntatt for LFD og TAB\n"
@@ -1061,106 +1090,115 @@ msgid ""
 "  %s f - g  Output f's contents, then standard input, then g's contents.\n"
 "  %s        Copy standard input to standard output.\n"
 msgstr ""
+"\n"
+"Eksempler:\n"
+"  %s f - g  Skriv innholdet av f, deretter standard input, og til slutt\n"
+"            innholdet av g.\n"
+"  %s        Kopier standard inndata til standard utdata.\n"
 
 #: src/cat.c:326
-#, fuzzy, c-format
+#, c-format
 msgid "cannot do ioctl on %s"
-msgstr "kan ikke utføre ioctl på «%s»"
+msgstr "klarte ikke å utføre ioctl på %s"
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
-msgstr "standard ut"
+msgstr "standard utdata"
 
 #: src/cat.c:716
 #, c-format
 msgid "%s: input file is output file"
-msgstr "%s: innfil er utfil"
+msgstr "%s: inndatafil er utdatafil"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:36 src/runcon.c:62
 msgid "Russell Coker"
-msgstr ""
+msgstr "Russell Coker"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
-#, fuzzy
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 msgid "Jim Meyering"
-msgstr "Mike Haertel og Paul Eggert"
+msgstr "Jim Meyering"
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
-#, fuzzy, c-format
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
+#, c-format
 msgid "failed to create security context: %s"
-msgstr "kan ikke endre rettigheter til %s"
+msgstr "klarte ikke å opprette sikkerhetskontekst: %s"
 
 #: src/chcon.c:112
 #, c-format
 msgid "failed to set %s security context component to %s"
-msgstr ""
+msgstr "klarte ikke å velge %s-sikkerhetskontekst %s"
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
-#, fuzzy, c-format
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
+#, c-format
 msgid "failed to get security context of %s"
-msgstr "kan ikke endre rettigheter til %s"
+msgstr "klarte ikke å hente sikkerhetskontekst fra %s"
 
 #: src/chcon.c:166
 #, c-format
 msgid "can't apply partial context to unlabeled file %s"
-msgstr ""
+msgstr "klarte ikke å bruke delkontekst på umarkert fil %s"
 
-#: src/chcon.c:193
-#, fuzzy, c-format
+#: src/chcon.c:190
+#, c-format
 msgid "failed to change context of %s to %s"
-msgstr "kan ikke endre rettigheter til %s"
+msgstr "klarte ikke å endre kontekst på %s til %s"
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
-msgstr ""
+msgstr "klarte ikke å åpne %s"
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
-#, fuzzy, c-format
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
+#, c-format
 msgid "cannot read directory %s"
-msgstr "kan ikke opprette katalog %s"
+msgstr "klarte ikke å lese mappa «%s»"
 
 #: src/chcon.c:292
-#, fuzzy, c-format
+#, c-format
 msgid "changing security context of %s\n"
-msgstr "kan ikke endre rettigheter til %s"
+msgstr "endrer sikkerhetskontekst for %s\n"
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
-#, fuzzy, c-format
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
+#, c-format
 msgid "fts_read failed"
-msgstr "feil ved lesing"
+msgstr "fts_read mislyktes"
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
-#, fuzzy, c-format
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
+#, c-format
 msgid "fts_close failed"
-msgstr "feil ved lukking av fil"
+msgstr "fts_close mislyktes"
 
 #: src/chcon.c:351
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... CONTEXT FILE...\n"
 "  or:  %s [OPTION]... [-u USER] [-r ROLE] [-l RANGE] [-t TYPE] FILE...\n"
 "  or:  %s [OPTION]... --reference=RFILE FILE...\n"
 msgstr ""
-"Bruk:      %s [FLAGG]... [FIL]...\n"
-"  eller:   %s --traditional [FIL] [[+]POSISJON [[+]MERKE]]\n"
+"Bruk:    %s [VALG] … KONTEKST FIL …\n"
+"  eller: %s [VALG] … [-u BRUKER] [-r ROLLE] [-l OMRÅDE] [-t TYPE] FIL …\n"
+"  eller: %s [VALG] … --reference=RFIL FIL …\n"
 
 #: src/chcon.c:357
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
+"Endre sikkerhetskontekst for hver FIL til ønsket KONTEKST.\n"
+"Sikkerhetskontekt for hver FIL kan, ved bruk av «--reference», endres til "
+"RFIL.\n"
 
 #: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94
 msgid ""
@@ -1169,6 +1207,9 @@ msgid ""
 "  -h, --no-dereference   affect symbolic links instead of any referenced "
 "file\n"
 msgstr ""
+"      --dereference      endre lenkemål i stedet for symbolske lenker "
+"(standard)\n"
+"  -h, --no-dereference   endre symbolske lenker i stedet for lenkemål\n"
 
 #: src/chcon.c:369
 msgid ""
@@ -1177,12 +1218,19 @@ msgid ""
 "  -t, --type=TYPE        set type TYPE in the target security context\n"
 "  -l, --range=RANGE      set range RANGE in the target security context\n"
 msgstr ""
+"  -u, --user=BRUKER        angi brukeren BRUKER i målets sikkerhetskontekst\n"
+"  -r, --role=ROLLE        angi rollen ROLLE i målets sikkerhetskontekst\n"
+"  -t, --type=TYPE        angi typen TYPE i målets sikkerhetskontekst\n"
+"  -l, --range=RVIDDE      angi rekkevidden RVIDDE i målets "
+"sikkerhetskontekst\n"
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
 "      --preserve-root    fail to operate recursively on '/'\n"
 msgstr ""
+"      --no-preserve-root  ikke gi «/» spesialbehandling (standard)\n"
+"      --preserve-root    avvis rekursiv behandling på stien «/»\n"
 
 #: src/chcon.c:379
 msgid ""
@@ -1190,14 +1238,17 @@ msgid ""
 "specifying\n"
 "                         a CONTEXT value\n"
 msgstr ""
+"      --reference=RFIL  bruk sikkerhetskontekst for RFIL, i stedet for å "
+"angi\n"
+"                         en KONTEKSTverdi\n"
 
 #: src/chcon.c:383 src/chgrp.c:140 src/chown.c:118
 msgid "  -R, --recursive        operate on files and directories recursively\n"
-msgstr ""
+msgstr "  -R, --recursive        behandle filer og mapper rekursivt\n"
 
 #: src/chcon.c:386
 msgid "  -v, --verbose          output a diagnostic for every file processed\n"
-msgstr ""
+msgstr "  -v, --verbose          skriv ut diagnostikk for behandlede filer\n"
 
 #: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121
 msgid ""
@@ -1213,54 +1264,67 @@ msgid ""
 "  -P                     do not traverse any symbolic links (default)\n"
 "\n"
 msgstr ""
+"\n"
+"Følgende valg avgjør hvordan et hierarki blir gjennomgått når valget «-R»\n"
+"brukes. Hvis du gjør flere enn ett valg, er det bare\n"
+"det siste som gjelder.\n"
+"\n"
+"  -H                     hvis et argument er en symbolsk lenke\n"
+"                         som peker til en mappe, skal mappa gjennomgås\n"
+"  -L                     gå gjennom hver symbolske lenke som\n"
+"                         dukker opp, og som peker til en mappe\n"
+"  -P                     ikke gå gjennom symbolske lenkemål (standard)\n"
+"\n"
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr ""
+"valget «-R» («--dereference») krever at du også velger enten «-H» eller «-L»"
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
-msgstr ""
+msgstr "valget «-R -h» krever at du også bruker «-P»"
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
-#, fuzzy, c-format
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
+#, c-format
 msgid "missing operand after %s"
-msgstr "%s: heltall forventet etter «%c»"
+msgstr "mangler operand etter %s"
 
-#: src/chcon.c:562 src/runcon.c:251
-#, fuzzy, c-format
+#: src/chcon.c:560 src/runcon.c:250
+#, c-format
 msgid "invalid context: %s"
-msgstr "ugyldig breddespesifikasjon «%s»"
+msgstr "ugyldig kontekst: %s"
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
-msgstr ""
+msgstr "valgte spesifikasjoner av sikkerhetskontekster samsvarer ikke"
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, c-format
 msgid "failed to get attributes of %s"
-msgstr ""
+msgstr "klarte ikke å hente attributtene til %s"
 
 #: src/chgrp.c:92
-#, fuzzy, c-format
+#, c-format
 msgid "invalid group: %s"
-msgstr "ugyldig gruppe"
+msgstr "gruppa «%s» er ugyldig"
 
 #: src/chgrp.c:108
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... GROUP FILE...\n"
 "  or:  %s [OPTION]... --reference=RFILE FILE...\n"
 msgstr ""
-"Bruk:      %s [FLAGG]... [FIL]...\n"
-"  eller:   %s --traditional [FIL] [[+]POSISJON [[+]MERKE]]\n"
+"Bruk: %s [VALG] … GRUPPE FIL …\n"
+"eller: %s [VALG] … --reference=RFIL FIL …\n"
 
 #: src/chgrp.c:113
 msgid ""
@@ -1268,27 +1332,35 @@ msgid ""
 "With --reference, change the group of each FILE to that of RFILE.\n"
 "\n"
 msgstr ""
+"Endre gruppetilhørighet for hver FIL til GRUPPE.\n"
+"Bruk --reference for å endre gruppa for hver FIL i henhold til RFIL.\n"
+"\n"
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
 "  -v, --verbose          output a diagnostic for every file processed\n"
 msgstr ""
+"  -c, --changes          tilsvarer «verbose», men rapporterer kun endringer\n"
+"  -f, --silent, --quiet  la være å skrive ut de fleste typer feilmeldinger\n"
+"  -v, --verbose          skriv ut diagnostikk for behandlede filer\n"
 
 #: src/chgrp.c:128 src/chown.c:99
-#, fuzzy
 msgid ""
 "                         (useful only on systems that can change the\n"
 "                         ownership of a symlink)\n"
 msgstr ""
-"  +N                    samme som -s N (avleggs, vil bli tilbaketrukket)\n"
+"                         (dette er bare nyttig på systemer som kan endre\n"
+"                         eierskap til symbolske lenker)\n"
 
 #: src/chgrp.c:136
 msgid ""
 "      --reference=RFILE  use RFILE's group rather than specifying a\n"
 "                         GROUP value\n"
 msgstr ""
+"      --reference=RFIL  hent gruppetilhørighet fra RFIL,\n"
+"                          i stedet for å angi en GRUPPEverdi\n"
 
 #: src/chgrp.c:158
 #, c-format
@@ -1298,164 +1370,179 @@ msgid ""
 "  %s staff /u      Change the group of /u to \"staff\".\n"
 "  %s -hR staff /u  Change the group of /u and subfiles to \"staff\".\n"
 msgstr ""
+"\n"
+"Eksempler:\n"
+"  %s stab /u       Endre gruppeeierskapet for mappa «/u» til «stab».\n"
+"  %s -hR stab /u   Endre gruppeeierskapet for mappa «/u», og innholdet, til "
+"«stab».\n"
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
-msgstr ""
+msgstr "henter nye attributter for %s"
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
-msgstr ""
+msgstr "hverken den symbolske lenka «%s» eller målet den peker til er endret\n"
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
-msgstr ""
+msgstr "%s har endret modus fra %04lo (%s) til %04lo (%s)\n"
 
-#: src/chmod.c:166
-#, fuzzy, c-format
+#: src/chmod.c:168
+#, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
-msgstr "kan ikke endre rettigheter til %s"
+msgstr "klarte ikke å endre %s-modus fra %04lo (%s) til %04lo (%s)\n"
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
-msgstr ""
+msgstr "modus for %s er fremdeles %04lo (%s)\n"
 
-#: src/chmod.c:236
-#, fuzzy, c-format
+#: src/chmod.c:238
+#, c-format
 msgid "cannot operate on dangling symlink %s"
-msgstr "kan ikke opprette katalog %s"
+msgstr ""
+"klarte ikke å jobbe med den symbolsk lenka «%s», som har ugyldig lenkemål"
 
-#: src/chmod.c:276
-#, fuzzy, c-format
+#: src/chmod.c:278
+#, c-format
 msgid "changing permissions of %s"
-msgstr "kan ikke endre rettigheter til %s"
+msgstr "endrer rettigheter til %s"
 
-#: src/chmod.c:311
-#, fuzzy, c-format
+#: src/chmod.c:314
+#, c-format
 msgid "%s: new permissions are %s, not %s"
-msgstr "kan ikke endre rettigheter til %s"
+msgstr "%s: nye rettigheter er %s, ikke %s"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
 "  or:  %s [OPTION]... OCTAL-MODE FILE...\n"
 "  or:  %s [OPTION]... --reference=RFILE FILE...\n"
 msgstr ""
+"Bruk:  %s [VALG] … MODUS[,MODUS] … FIL …\n"
+"eller: %s [VALG] … OKTALMODUS FIL …\n"
+"eller: %s [VALG] … --reference=RFILE FIL …\n"
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 msgid ""
 "Change the mode of each FILE to MODE.\n"
 "With --reference, change the mode of each FILE to that of RFILE.\n"
 "\n"
 msgstr ""
+"Endre modus for hver FIL til MODUS.\n"
+"Bruk --reference for å endre modus for hver FIL i henhold til RFIL.\n"
+"\n"
 
-#: src/chmod.c:391
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
+"      --reference=RFIL  bruk modus ihht. RFIL i stedet for MODUS-verdier\n"
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
-msgstr ""
+msgstr "  -R, --recursive        behandle filer og mapper rekursivt\n"
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 msgid ""
 "\n"
 "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n"
 msgstr ""
+"\n"
+"Hver MODUS formuleres slik: «[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+».\n"
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
-msgstr ""
+msgstr "du kan ikke velge modus samtidig som du bruker valget «--reference»"
 
-#: src/chmod.c:544
-#, fuzzy, c-format
+#: src/chmod.c:547
+#, c-format
 msgid "invalid mode: %s"
-msgstr "ugyldig bredde: «%s»"
+msgstr "modus «%s» er ugyldig"
 
 #: src/chown-core.c:158
-#, fuzzy, c-format
+#, c-format
 msgid "changed ownership of %s from %s to %s\n"
-msgstr "kan ikke endre rettigheter til %s"
+msgstr "eier av «%s» er endret fra %s til %s\n"
 
 #: src/chown-core.c:159
-#, fuzzy, c-format
+#, c-format
 msgid "changed group of %s from %s to %s\n"
-msgstr "kan ikke skifte til katalog, %s"
+msgstr "gruppeeierskapet til «%s» er endret fra %s til %s\n"
 
 #: src/chown-core.c:160
-#, fuzzy, c-format
+#, c-format
 msgid "no change to ownership of %s\n"
-msgstr "kan ikke endre rettigheter til %s"
+msgstr "eierskapet til «%s» er uendret\n"
 
 #: src/chown-core.c:165
-#, fuzzy, c-format
+#, c-format
 msgid "failed to change ownership of %s from %s to %s\n"
-msgstr "kan ikke endre rettigheter til %s"
+msgstr "klarte ikke å skifte eier av «%s» fra %s til %s\n"
 
 #: src/chown-core.c:166
-#, fuzzy, c-format
+#, c-format
 msgid "failed to change group of %s from %s to %s\n"
-msgstr "kan ikke endre rettigheter til %s"
+msgstr "klarte ikke å endre gruppeeierskapet til «%s» fra %s til %s\n"
 
 #: src/chown-core.c:167 src/chown-core.c:173
-#, fuzzy, c-format
+#, c-format
 msgid "failed to change ownership of %s\n"
-msgstr "kan ikke endre rettigheter til %s"
+msgstr "klarte ikke å endre eier av «%s»\n"
 
 #: src/chown-core.c:171
-#, fuzzy, c-format
+#, c-format
 msgid "failed to change ownership of %s to %s\n"
-msgstr "kan ikke endre rettigheter til %s"
+msgstr "klarte ikke å endre eier av «%s» til %s\n"
 
 #: src/chown-core.c:172
 #, c-format
 msgid "failed to change group of %s to %s\n"
-msgstr ""
+msgstr "klarte ikke å endre gruppe for «%s» til %s\n"
 
 #: src/chown-core.c:180
 #, c-format
 msgid "ownership of %s retained as %s\n"
-msgstr ""
+msgstr "eier av «%s» er fremdeles %s\n"
 
 #: src/chown-core.c:181
 #, c-format
 msgid "group of %s retained as %s\n"
-msgstr ""
+msgstr "gruppetilhørighet for «%s» er fremdeles %s\n"
 
 #: src/chown-core.c:182
 #, c-format
 msgid "ownership of %s retained\n"
-msgstr ""
+msgstr "eier av «%s» er ikke endret\n"
 
 #: src/chown-core.c:379
-#, fuzzy, c-format
+#, c-format
 msgid "cannot dereference %s"
-msgstr "kan ikke opprette katalog %s"
+msgstr "klarte ikke å følge lenka «%s»"
 
 #: src/chown-core.c:467
 #, c-format
 msgid "changing ownership of %s"
-msgstr ""
+msgstr "endrer eier av %s"
 
 #: src/chown-core.c:468
-#, fuzzy, c-format
+#, c-format
 msgid "changing group of %s"
-msgstr "kan ikke endre eier og/eller gruppe for %s"
+msgstr "endrer gruppetilhørighet for %s"
 
 #: src/chown.c:79
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... [OWNER][:[GROUP]] FILE...\n"
 "  or:  %s [OPTION]... --reference=RFILE FILE...\n"
 msgstr ""
-"Bruk:      %s [FLAGG]... [FIL]...\n"
-"  eller:   %s --traditional [FIL] [[+]POSISJON [[+]MERKE]]\n"
+"Bruk: %s [VALG] … [EIER][:[GRUPPE]] FIL …\n"
+"eller:  %s [VALG] … --reference=RFIL FIL …\n"
 
 #: src/chown.c:84
 msgid ""
@@ -1464,6 +1551,11 @@ msgid ""
 "RFILE.\n"
 "\n"
 msgstr ""
+"Endre eieren og/eller gruppetilhørigheten for hver FIL til EIER og/eller "
+"GRUPPE.\n"
+"Bruk --reference for å endre eier og gruppetilhørighet for FILene i henhold "
+"til RFIL.\n"
+"\n"
 
 #: src/chown.c:103
 msgid ""
@@ -1475,12 +1567,23 @@ msgid ""
 "match\n"
 "                         is not required for the omitted attribute\n"
 msgstr ""
+"      --from=GJELDENDE_EIER:GJELDENDE_GRUPPE\n"
+"                         eierskap til hver fil blir bare endret hvis "
+"gjeldende\n"
+"                         eier og/eller gruppe samsvarer med de som er "
+"angitt\n"
+"                         her. Du kan utelate en av verdiene, slik at det "
+"bare\n"
+"                         kreves samsvar med enten gjeldende gruppe eller "
+"eier\n"
 
 #: src/chown.c:114
 msgid ""
 "      --reference=RFILE  use RFILE's owner and group rather than\n"
 "                         specifying OWNER:GROUP values\n"
 msgstr ""
+"      --reference=RFIL  bruk eier og gruppe ihht. RFIL i stedet for å\n"
+"                         angi EIER:GRUPPE-verdier\n"
 
 #: src/chown.c:136
 msgid ""
@@ -1489,6 +1592,13 @@ msgid ""
 "to login group if implied by a ':' following a symbolic OWNER.\n"
 "OWNER and GROUP may be numeric as well as symbolic.\n"
 msgstr ""
+"\n"
+"Eier forblir uendret hvis dette mangler. Det samme gjelder "
+"gruppetilhørighet, men\n"
+"sistnevnte endres til innloggingsgruppe hvis det impliseres av et «:» og "
+"deretter\n"
+"en symbolsk EIER. BÃ¥de EIER and GRUPPE kan angis med tall- eller "
+"symbolverdier.\n"
 
 #: src/chown.c:142
 #, c-format
@@ -1499,89 +1609,114 @@ msgid ""
 "  %s root:staff /u  Likewise, but also change its group to \"staff\".\n"
 "  %s -hR root /u    Change the owner of /u and subfiles to \"root\".\n"
 msgstr ""
+"\n"
+"Eksempler:\n"
+"  %s root /u        Endrer eierskapet på mappa «/u» til brukeren «root».\n"
+"  %s root:stab /u   Som over, men endrer også gruppeeierskapet til gruppa\n"
+"                    «stab»\n"
+"  %s -hR root /u    Endre eierskapet på mappa «/u», og alle filer og mapper "
+"inni\n"
+"                    «/u», til brukeren «root».\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
-msgstr ""
+msgstr "Roland McGrath"
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
-#, fuzzy, c-format
+#: src/chroot.c:135 src/install.c:583
+#, c-format
 msgid "invalid group %s"
-msgstr "ugyldig gruppe"
+msgstr "gruppa «%s» er ugyldig"
 
-#: src/chroot.c:109
-#, fuzzy, c-format
+#: src/chroot.c:150
+#, c-format
 msgid "invalid group list %s"
-msgstr "ugyldig gruppe"
+msgstr "gruppelista «%s» er ugyldig"
 
-#: src/chroot.c:117
+#: src/chroot.c:186
 #, c-format
-msgid "failed to set additional groups"
-msgstr ""
-
-#: src/chroot.c:132
-#, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
 "  or:  %s OPTION\n"
 msgstr ""
-"Bruk:  %s [FIL]...\n"
-"eller: %s [FLAGG]\n"
+"Bruk: %s [VALG] NYROT [KOMMANDO [ARG]…]\n"
+"  eller:  %s VALG\n"
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
 msgstr ""
+"Kjør KOMMANDO med NYROT som rotmappe.\n"
+"\n"
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
 msgstr ""
+"  --userspec=BRUKER:GRUPPE  velg bruker og gruppe (uttrykt med ID eller "
+"navn) som skal brukes\n"
+"  --groups=G_LIST        velg tilleggsgrupper, som f.eks. g1, g2,…gN\n"
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 msgid ""
 "\n"
 "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n"
 msgstr ""
+"\n"
+"Hvis du ikke velger en kommando, kjøres «${SHELL} -i» (standard:  «/bin/sh -"
+"i»).\n"
 
-#: src/chroot.c:202
-#, fuzzy, c-format
+#: src/chroot.c:311
+#, c-format
 msgid "cannot change root directory to %s"
-msgstr "kan ikke skifte til katalog, %s"
+msgstr "klarte ikke å bytte rotmappe til %s"
 
-#: src/chroot.c:206
-#, fuzzy, c-format
+#: src/chroot.c:315
+#, c-format
 msgid "cannot chdir to root directory"
-msgstr "kan ikke skifte til katalog, %s"
+msgstr "klarte ikke å bytte til rotmappe"
+
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr "ingen gruppe er valgt for %d, som er en ukjent uid"
+
+#: src/chroot.c:383
+#, c-format
+msgid "failed to get supplemental groups"
+msgstr "klarte ikk å hente tilleggsgrupper"
+
+#: src/chroot.c:395
+#, c-format
+msgid "failed to %s supplemental groups"
+msgstr "klarte ikke å kjøre %s på tilleggsgrupper"
 
-#: src/chroot.c:247
-#, fuzzy, c-format
+#: src/chroot.c:402
+#, c-format
 msgid "failed to set group-ID"
-msgstr "kan ikke utelate både bruker og gruppe"
+msgstr "klarte ikke å velge gruppe-ID"
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, c-format
 msgid "failed to set user-ID"
-msgstr ""
+msgstr "klarte ikke å velge bruker-ID"
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, c-format
 msgid "failed to run command %s"
-msgstr ""
+msgstr "klarte ikke å kjøre kommandoen «%s»"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cksum.c:40
 msgid "Q. Frank Xia"
-msgstr ""
+msgstr "Q. Frank Xia"
 
 #: src/cksum.c:216
 #, c-format
 msgid "%s: file too long"
-msgstr "%s: fil for lang"
+msgstr "%s: fila er for lang"
 
 #: src/cksum.c:263
 #, c-format
@@ -1589,25 +1724,25 @@ msgid ""
 "Usage: %s [FILE]...\n"
 "  or:  %s [OPTION]\n"
 msgstr ""
-"Bruk:  %s [FIL]...\n"
-"eller: %s [FLAGG]\n"
+"Bruk:  %s [FIL] …\n"
+"eller: %s [VALG]\n"
 
 #: src/cksum.c:268
 msgid ""
 "Print CRC checksum and byte counts of each FILE.\n"
 "\n"
 msgstr ""
-"Skriv CRC-sjekksum og oktett-antall for hver FIL.\n"
+"Skriv ut CRC-sjekksum og antall byte per FIL.\n"
 "\n"
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
-msgstr "Bruk: %s [FLAGG]... FIL1 FIL2\n"
+msgstr "Bruk: %s [VALG] … FIL1 FIL2\n"
 
 #: src/comm.c:107
 msgid "Compare sorted files FILE1 and FILE2 line by line.\n"
-msgstr ""
+msgstr "Sammenlign de sorterte filene FIL1 og FIL2, linje for linje.\n"
 
 #: src/comm.c:110
 msgid ""
@@ -1616,20 +1751,22 @@ msgid ""
 "lines unique to FILE1, column two contains lines unique to FILE2,\n"
 "and column three contains lines common to both files.\n"
 msgstr ""
+"\n"
+"Uten valg produseres utdata med tre kolonner. Kolonne en inneholder linjene\n"
+"som er unike for FIL1, kolonne to inneholder linjene som er unike for FIL2,\n"
+"mens kolonne tre inneholder linjene som er felles for begge filene.\n"
 
 #: src/comm.c:116
-#, fuzzy
 msgid ""
 "\n"
 "  -1              suppress column 1 (lines unique to FILE1)\n"
 "  -2              suppress column 2 (lines unique to FILE2)\n"
 "  -3              suppress column 3 (lines that appear in both files)\n"
 msgstr ""
-"Sammenlign de sorterte filene VENSTREFIL og HØYREFIL linje for linje.\n"
 "\n"
-"  -1              se bort fra linjer som bare finnes i den venstre filen\n"
-"  -2              se bort fra linjer som bare finnes i den høyre filen\n"
-"  -3              se bort fra linjer som finnes i begge filer\n"
+"  -1              utelat kolonne 1 (linjer som kun finnes i FIL1)\n"
+"  -2              utelat kolonne 2 (linjer som kun finnes i FIL2)\n"
+"  -3              utelat kolonne 2 (linjer som finnes i begge filer)\n"
 
 #: src/comm.c:122
 msgid ""
@@ -1638,16 +1775,22 @@ msgid ""
 "                      if all input lines are pairable\n"
 "  --nocheck-order   do not check that the input is correctly sorted\n"
 msgstr ""
+"\n"
+"  --check-order sjekker om inndata er korrekt sortert,\n"
+"                      selv om alle inndatalinjer kan pares\n"
+"  --nocheck-order sjekker ikke om inndata er korrekt sortert\n"
 
 #: src/comm.c:128
 msgid "  --output-delimiter=STR  separate columns with STR\n"
-msgstr ""
+msgstr "  --output-delimiter=STR skiller kolonner med STR\n"
 
 #: src/comm.c:133
 msgid ""
 "\n"
 "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n"
 msgstr ""
+"\n"
+"Merk at sammenligningsprosessen følger reglene som velges av «LC_COLLATE».\n"
 
 #: src/comm.c:137
 #, c-format
@@ -1657,324 +1800,372 @@ msgid ""
 "  %s -12 file1 file2  Print only lines present in both file1 and file2.\n"
 "  %s -3 file1 file2  Print lines in file1 not in file2, and vice versa.\n"
 msgstr ""
+"\n"
+"Eksempler:\n"
+"  %s -12 fil1 fil2  Bare skriv ut linjer som finnes i både fil1 og fil2.\n"
+"  %s -3 fil1 fil2  Bare skriv ut linjer som ikke finnes i begge filer.\n"
 
 #: src/comm.c:222
 #, c-format
 msgid "file %d is not in sorted order"
-msgstr ""
+msgstr "fila «%d» er ikke sortert"
 
 #: src/comm.c:407
 #, c-format
 msgid "multiple delimiters specified"
-msgstr ""
+msgstr "flere skilletegn er valgt"
 
 #: src/comm.c:411
 #, c-format
 msgid "empty %s not allowed"
-msgstr ""
+msgstr "«%s» kan ikke være tom"
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
-msgstr "feil ved lesing av %s"
+msgstr "det oppstod en feil ved lesing av %s"
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
-#, fuzzy, c-format
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
+#, c-format
 msgid "cannot lseek %s"
-msgstr "%s: kan ikke søke til posisjon %s%s"
+msgstr "kan ikke søke til posisjon %s med lseek"
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
-msgstr "feil ved skriving til %s"
+msgstr "det oppstod en feil ved skriving av %s"
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, c-format
 msgid "%s: failed to get extents info"
-msgstr ""
+msgstr "%s: klarte ikke å hente info om omfang"
 
-#: src/copy.c:373
-#, fuzzy, c-format
+#: src/copy.c:383
+#, c-format
 msgid "%s: write failed"
-msgstr "feil ved skriving"
+msgstr "%s: klarte ikke å skrive"
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, c-format
 msgid "failed to extend %s"
-msgstr ""
+msgstr "klarte ikke å utvide «%s»"
 
-#: src/copy.c:662
-#, fuzzy, c-format
+#: src/copy.c:687
+#, c-format
 msgid "clearing permissions for %s"
-msgstr "kan ikke endre rettigheter til %s"
+msgstr "fjerner rettigheter for %s"
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, c-format
 msgid "failed to preserve ownership for %s"
-msgstr ""
+msgstr "klarte ikke å beholde eierskap til %s"
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
-msgstr ""
+msgstr "klarte ikke å finne fila «%s»"
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, c-format
 msgid "failed to preserve authorship for %s"
-msgstr ""
+msgstr "klarte ikke å beholde forfatterskap for %s"
+
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
+#, c-format
+msgid "failed to set default file creation context to %s"
+msgstr "klarte ikke å velge «%s» som standard opprettelseskontekst for filer"
+
+#: src/copy.c:820
+#, c-format
+msgid "failed to set default file creation context for %s"
+msgstr "klarte ikke å velge standard opprettelseskontekst for filer på «%s»"
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:846
+#, c-format
+msgid "failed to set the security context of %s"
+msgstr "klarte ikke å gi %s ny sikkerhetskontekst"
+
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
 msgid "cannot open %s for reading"
-msgstr ""
+msgstr "klarte ikke å lese %s"
 
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, c-format
 msgid "cannot fstat %s"
-msgstr ""
+msgstr "klarte ikke å bruke fstat på %s"
 
-#: src/copy.c:820
+#: src/copy.c:935
 #, c-format
 msgid "skipping file %s, as it was replaced while being copied"
-msgstr ""
+msgstr "hopper over fila «%s», fordi den ble byttet ut mens den ble kopiert"
 
-#: src/copy.c:850
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
-msgid "failed to get file system create context"
-msgstr ""
-
-#: src/copy.c:864
-#, fuzzy, c-format
-msgid "failed to set the security context of %s to %s"
-msgstr "kan ikke endre rettigheter til %s"
-
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
-#, fuzzy, c-format
 msgid "cannot remove %s"
-msgstr "kan ikke opprette katalog %s"
+msgstr "klarte ikke å fjerne %s"
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
-msgstr ""
+msgstr "%s er fjernet\n"
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
-msgstr ""
+msgstr "skriver ikke gjennom den symbolsk lenka «%s», som har ugyldig lenkemål"
 
-#: src/copy.c:964
-#, fuzzy, c-format
+#: src/copy.c:1070
+#, c-format
 msgid "cannot create regular file %s"
-msgstr "kan ikke opprette midlertidig fil"
+msgstr "klarte ikke å opprette den vanlige fila «%s»"
 
-#: src/copy.c:985
-#, fuzzy, c-format
+#: src/copy.c:1091
+#, c-format
 msgid "failed to clone %s from %s"
-msgstr "kan ikke endre rettigheter til %s"
+msgstr "klarte ikke å klone «%s» fra «%s»"
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
-msgstr ""
+msgstr "beholder tidsstempel for %s"
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
-#, fuzzy, c-format
+#, c-format
 msgid "failed to close %s"
-msgstr "%s: fil for lang"
+msgstr "klarte ikke å lukke %s"
 
-#: src/copy.c:1471
+#: src/copy.c:1580
 #, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
-msgstr ""
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
+msgstr "%s: vil du prøve å overskrive %s og overstyre modus %04lo (%s)? "
+
+#: src/copy.c:1581
+#, c-format
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr "%s: %s kan ikke skrives til (modus %04lo, %s). Vil du prøve likevel? "
 
-#: src/copy.c:1478
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
-msgstr ""
+msgstr "%s: vil du overskrive «%s»? "
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
-msgstr ""
+msgstr " (sikkerhetskopi: %s)"
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
-msgstr ""
+msgstr "klarte ikke å gjenopprette standard opprettingskontekst for filer"
 
-#: src/copy.c:1589
-#, fuzzy, c-format
+#: src/copy.c:1706
+#, c-format
 msgid "cannot create hard link %s to %s"
-msgstr "kan ikke opprette katalog %s"
+msgstr "klarte ikke å lage den harde lenka «%s» med lenkemål «%s»"
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
-#, fuzzy, c-format
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
+#, c-format
 msgid "cannot stat %s"
-msgstr "kan ikke opprette katalog %s"
+msgstr "klarte ikke å hente informasjon om %s"
 
-#: src/copy.c:1650
-#, fuzzy, c-format
+#: src/copy.c:1777
+#, c-format
 msgid "omitting directory %s"
-msgstr "kan ikke opprette katalog %s"
+msgstr "hopper over mappa «%s»"
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
-msgstr ""
+msgstr "advarsel: kildefila «%s» er valgt flere ganger."
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
-msgstr ""
+msgstr "«%s» og «%s» er samme fil"
 
-#: src/copy.c:1811
-#, fuzzy, c-format
+#: src/copy.c:1939
+#, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
-msgstr "kan ikke skifte til katalog, %s"
+msgstr ""
+"klarte ikke å overskrive «%s» med «%s», fordi førstnevnte ikke er en mappe"
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, c-format
 msgid "will not overwrite just-created %s with %s"
-msgstr ""
+msgstr "den nyopprettede %s blir ikke overskrevet av %s"
 
-#: src/copy.c:1847
-#, fuzzy, c-format
+#: src/copy.c:1975
+#, c-format
 msgid "cannot overwrite directory %s with non-directory"
-msgstr "kan ikke opprette katalog %s"
+msgstr "klarte ikke å overskrive mappa «%s» med noe som ikke er en mappe"
 
-#: src/copy.c:1861
-#, fuzzy, c-format
+#: src/copy.c:1989
+#, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
-msgstr "kan ikke skifte til katalog, %s"
+msgstr "klarte ikke å flytte «%s» til «%s», fordi førstnevnte ikke er en mappe"
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr ""
+"sikkerhetskopiering av «%s» ville ha ødelagt kilden. «%s» er ikke flyttet"
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr ""
+"sikkerhetskopiering av «%s» ville ha ødelagt kilden. «%s» er ikke kopiert"
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
-msgstr ""
+msgstr "klarte ikke å sikkerhetskopiere «%s»"
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, c-format
 msgid "will not copy %s through just-created symlink %s"
-msgstr ""
+msgstr "«%s» kopieres ikke via den nyopprettede symbolske lenka «%s»"
 
-#: src/copy.c:2056
-#, fuzzy, c-format
+#: src/copy.c:2184
+#, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
-msgstr "kan ikke opprette katalog %s"
+msgstr "du kan ikke kopiere mappa «%s» til seg selv («%s»)"
 
-#: src/copy.c:2073
-#, fuzzy, c-format
+#: src/copy.c:2201
+#, c-format
 msgid "will not create hard link %s to directory %s"
-msgstr "kan ikke skifte til katalog, %s"
+msgstr "den harde lenka «%s» til mappa «%s» blir ikke opprettet"
 
-#: src/copy.c:2123
-#, fuzzy, c-format
+#: src/copy.c:2258
+#, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
-msgstr "kan ikke skifte til katalog, %s"
+msgstr "du kan ikke flytte «%s» til en undermappe av seg selv («%s»)"
 
-#: src/copy.c:2166
-#, fuzzy, c-format
+#: src/copy.c:2301
+#, c-format
 msgid "cannot move %s to %s"
-msgstr "kan ikke utføre ioctl på «%s»"
+msgstr "klarte ikke å flytte «%s» til «%s»"
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr ""
+"flytting mellom enheter (%s til %s) mislyktes. Klarte ikke å fjerne målet"
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, c-format
-msgid "failed to set default file creation context to %s"
-msgstr ""
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
-msgstr ""
+msgstr "klarte ikke å kopiere den symbolske lenka «%s», som peker til seg selv"
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr ""
+"%s: relative symbolske lenker må ta utgangspunkt i mappa du befinner deg i"
 
-#: src/copy.c:2362
-#, fuzzy, c-format
+#: src/copy.c:2484
+#, c-format
 msgid "cannot create symbolic link %s to %s"
-msgstr "kan ikke opprette katalog %s"
+msgstr "klarte ikke å lage symbolsk lenke med navnet «%s» og lenkemålet «%s»"
 
-#: src/copy.c:2416 src/mkfifo.c:132
-#, fuzzy, c-format
+#: src/copy.c:2536 src/mkfifo.c:169
+#, c-format
 msgid "cannot create fifo %s"
-msgstr "kan ikke opprette katalog %s"
+msgstr "klarte ikke å lage fifo %s"
 
-#: src/copy.c:2425
-#, fuzzy, c-format
+#: src/copy.c:2545
+#, c-format
 msgid "cannot create special file %s"
-msgstr "tegn-posisjon er null"
+msgstr "klarte ikke å lage spesialfil «%s»"
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
-#, fuzzy, c-format
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
+#, c-format
 msgid "cannot read symbolic link %s"
-msgstr "kan ikke utføre ioctl på «%s»"
+msgstr "klarte ikke å lese den symbolske lenka «%s»"
 
-#: src/copy.c:2463
-#, fuzzy, c-format
+#: src/copy.c:2583
+#, c-format
 msgid "cannot create symbolic link %s"
-msgstr "kan ikke opprette katalog %s"
+msgstr "klarte ikke å lage symbolsk lenke med navnet «%s»"
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
-msgstr ""
+msgstr "%s er av ukjent filtype"
 
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, c-format
 msgid "cannot un-backup %s"
-msgstr ""
+msgstr "klarte ikke å reversere sikkerhetskopien «%s»"
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
+msgstr "%s -> %s (reverser sikkerhetskopi)\n"
+
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr "Alex Deymo"
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr "Bruk: %s --coreutils-prog=PROGRAMNAVN [PARAMETRE] … \n"
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+"Kjør innebygd PROGRAMNAVN med valgte PARAMETRE.\n"
+"\n"
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
 msgstr ""
+"\n"
+"Skriv «%s --coreutils-prog=PROGRAMNAVN --help» for hjelp med "
+"enkeltprogrammer.\n"
 
-#: src/cp.c:156 src/mv.c:286
-#, fuzzy, c-format
+#: src/coreutils.c:178 src/coreutils.c:202
+#, c-format
+msgid "unknown program %s"
+msgstr "programmet «%s» er ukjent"
+
+#: src/cp.c:157 src/mv.c:288
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
 "  or:  %s [OPTION]... SOURCE... DIRECTORY\n"
 "  or:  %s [OPTION]... -t DIRECTORY SOURCE...\n"
 msgstr ""
-"Bruk : %s [FLAGG]... [INN]... (uten -G)\n"
-"eller: %s -G [FLAGG]... [INN [UT]]\n"
+"Bruk:  %s [VALG]… [-T] KILDE MÅL\n"
+"  eller: %s [VALG]… KILDE … MAPPE\n"
+"  eller: %s [VALG] … -t MAPPE KILDE …\n"
 
-#: src/cp.c:162
+#: src/cp.c:163
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
-msgstr ""
+msgstr "Kopier KILDE til MÅL, eller flere KILDE(r) til ønsket MAPPE.\n"
 
-#: src/cp.c:168
+#: src/cp.c:169
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
 "      --attributes-only        don't copy the file data, just the "
@@ -1987,8 +2178,17 @@ msgid ""
 "recursive\n"
 "  -d                           same as --no-dereference --preserve=links\n"
 msgstr ""
+"  -a, --archive                tilsvarer «-dR --preserve=all»\n"
+"      --attributes-only        ikke kopier fildataene, bare attributtene\n"
+"      --backup[=CONTROL]       lag en sikkerhetskopi av hver målfil\n"
+"  -b                           samme som «--backup», men kan ikke brukes med "
+"argumenter\n"
+"      --copy-contents          kopier innholdet i spesialfiler når "
+"operasjonen kjører rekursivt\n"
+"  -d                           tilsvarer «--no-dereference --"
+"preserve=links»\n"
 
-#: src/cp.c:177
+#: src/cp.c:178
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
 "                                 opened, remove it and try again (this "
@@ -2000,21 +2200,35 @@ msgid ""
 "                                  option)\n"
 "  -H                           follow command-line symbolic links in SOURCE\n"
 msgstr ""
+"  -f, --force                  fjern eksisterende målfil hvis den ikke kan\n"
+"                                 åpnes, og prøv på nytt (dette valget "
+"ignoreres\n"
+"                                 hvis valget «-n» brukes i tillegg)\n"
+"  -i, --interactive            spør om bekreftelse før fil(er) overskrives "
+"(overstyrer evt. \n"
+"                                  bruk av valget «-n»)\n"
+"  -H                           følg kommandolinje-symbolske lenker lenker i "
+"KILDEn\n"
 
-#: src/cp.c:186
+#: src/cp.c:187
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
 "  -L, --dereference            always follow symbolic links in SOURCE\n"
 msgstr ""
+"  -l, --link                   lag harde lenker i stedet for å kopiere\n"
+"  -L, --dereference            følg alltid symbolske lenker i KILDEn\n"
 
-#: src/cp.c:190
+#: src/cp.c:191
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
 "                                 a previous -i option)\n"
 "  -P, --no-dereference         never follow symbolic links in SOURCE\n"
 msgstr ""
+"  -n, --no-clobber             ikke erstatt eksisterende filer (overstyrer\n"
+"                                 eventuelt bruk av «-i»)\n"
+"  -P, --no-dereference         følg aldri symbolske lenker i KILDEn\n"
 
-#: src/cp.c:195
+#: src/cp.c:196
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
 "      --preserve[=ATTR_LIST]   preserve the specified attributes (default:\n"
@@ -2023,14 +2237,21 @@ msgid ""
 "xattr,\n"
 "                                 all\n"
 msgstr ""
+"  -p tilsvarer «--preserve=mode,ownership,timestamps»\n"
+"      --preserve[=ATTR_LIST] bevarer de spesifiserte attributtene\n"
+"                                 (standardverdi: mode,ownership,timestamps), "
+"og om mulig attributtene:\n"
+"                                 context, links, xattr, all\n"
 
-#: src/cp.c:203
+#: src/cp.c:204
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                use full source file name under DIRECTORY\n"
 msgstr ""
+"      --no-preserve=ATTRLISTE  ikke bevar valgte attributter\n"
+"      --parents                bruk fullstendig kildefilnavn under MAPPE\n"
 
-#: src/cp.c:207
+#: src/cp.c:208
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
 "      --reflink[=WHEN]         control clone/CoW copies. See below\n"
@@ -2038,16 +2259,26 @@ msgid ""
 "                                 attempting to open it (contrast with --"
 "force)\n"
 msgstr ""
+"  -R, -r, --recursive          kopier (under-)mapper rekursivt\n"
+"      --reflink[=WHEN]         kontroller klone-/CoW-kopier. Se nedenfor\n"
+"      --remove-destination     fjern alle filer som finnes allerede før\n"
+"                                 de blir forsøkt åpnet (i motsetning til «--"
+"force»)\n"
 
-#: src/cp.c:213
+#: src/cp.c:214
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
 "                                 argument\n"
 msgstr ""
+"      --sparse=WHEN            kontroller oppretting av ikke-sammenhengende "
+"filer. Se nedenfor\n"
+"      --strip-trailing-slashes  fjern evt. avsluttende skråstreker fra hvert "
+"KILDE-\n"
+"                                 argument\n"
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -2055,8 +2286,13 @@ msgid ""
 "DIRECTORY\n"
 "  -T, --no-target-directory    treat DEST as a normal file\n"
 msgstr ""
+"  -s, --symbolic-link          lag symbolske lenker i stedet for å kopiere\n"
+"  -S, --suffix=ETTERN         overstyr standard filetternavn på "
+"sikkerhetskopier\n"
+"  -t, --target-directory=MAPPE  kopier alle KILDEargumenter til MAPPE\n"
+"  -T, --no-target-directory    behandle MÃ…L som en normal fil\n"
 
-#: src/cp.c:224
+#: src/cp.c:225
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
 "                                 than the destination file or when the\n"
@@ -2064,8 +2300,26 @@ msgid ""
 "  -v, --verbose                explain what is being done\n"
 "  -x, --one-file-system        stay on this file system\n"
 msgstr ""
+"  -u, --update                 bare kopier når KILDE-fila er nyere enn "
+"målfila\n"
+"                               eller når målfila mangler\n"
+"  -v, --verbose                forklar hva som blir gjort\n"
+"  -x, --one-file-system        forbli på dette filsystemet\n"
+
+#: src/cp.c:232
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+"  -Z                           bruk standard type SELinux-sikkerhetskontekst"
+"\\n                                 på målfil\n"
+"      --context[=KON]          tilsvarer -Z, (eller, hvis CTX er valgt,\n"
+"                                 bruk KON som SELinux- eller SMACK-"
+"sikkerhetskontekst)\n"
 
-#: src/cp.c:233
+#: src/cp.c:240
 msgid ""
 "\n"
 "By default, sparse SOURCE files are detected by a crude heuristic and the\n"
@@ -2080,8 +2334,21 @@ msgid ""
 "copy\n"
 "fails, or if --reflink=auto is specified, fall back to a standard copy.\n"
 msgstr ""
+"\n"
+"Ikke-sammenhengende KILDEfiler oppdages som standard av en\n"
+"enkel heuristisk metode, og MÅLfilene blir - hvis aktuelt - også\n"
+"ikke-sammenhengende. Denne oppførselen velges av «--sparse=auto».\n"
+"Velg «--sparse=always» for å lage en ikke-sammenhengende MÅLfil\n"
+"når KILDEfila inneholder en viss sekvens av tomme byte.\n"
+"Bruk «--sparse=never» for å deaktivere oppretting av slike filer.\n"
+"\n"
+"Hvis «--reflink[=always]» er valgt, kopieres datablokkene\n"
+"kun når de har blitt endret.  Hvis dette ikke er mulig,\n"
+"vil koperingen feile, med mindre «if --reflink=auto»\n"
+"er angitt. I sistnevnte tilfelle tilbakefaller kopieringen\n"
+"på standard modus.\n"
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 msgid ""
 "\n"
 "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n"
@@ -2090,276 +2357,318 @@ msgid ""
 "the VERSION_CONTROL environment variable.  Here are the values:\n"
 "\n"
 msgstr ""
+"\n"
+"Suffikset for sikkerhetskopierte filer er «~», med mindre du velger noe "
+"annet med --suffix eller SIMPLE_BACKUP_SUFFIX.\n"
+"Metoden for versjonskontroll kan velges med --backup eller via\n"
+"miljøvariabelen VERSION_CONTROL. Følgende verdier er gyldige:\n"
+"\n"
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
 "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
 "  simple, never   always make simple backups\n"
 msgstr ""
+"  none, off       ikke lag sikkerhetskopier (ikke engang med --backup)\n"
+"  numbered, t     lag nummererte sikkerhetskopier\n"
+"  existing, nil   nummererte sikkerhetskopier hvis det allerede finnes, "
+"enkle\n"
+"                  (simple) ellers\n"
+"  simple, never   alltid lag enkle sikkerhetskopier\n"
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
 "options are given and SOURCE and DEST are the same name for an existing,\n"
 "regular file.\n"
 msgstr ""
+"\n"
+"Som et spesialtilfelle vil cp lage sikkerhetskopi av KILDE hvis både --"
+"force\n"
+"og --backup er valgt, og både KILDE og MÅL er det samme navnet på en vanlig "
+"fil.\n"
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, c-format
 msgid "failed to preserve times for %s"
-msgstr ""
+msgstr "klarte ikke å bevare tidstempel på %s"
 
-#: src/cp.c:348
-#, fuzzy, c-format
+#: src/cp.c:355
+#, c-format
 msgid "failed to preserve permissions for %s"
-msgstr "kan ikke endre rettigheter til %s"
+msgstr "klarte ikke å bevare rettigheter til %s"
 
-#: src/cp.c:475
-#, fuzzy, c-format
+#: src/cp.c:482
+#, c-format
 msgid "cannot make directory %s"
-msgstr "kan ikke opprette katalog %s"
+msgstr "klarte ikke å lage mappa «%s»"
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
-msgstr "%s eksisterer men er ikke en katalog"
+msgstr "«%s» eksisterer, men er ikke en mappe"
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
-#, fuzzy, c-format
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
+#, c-format
 msgid "failed to access %s"
-msgstr "kan ikke opprette katalog %s"
+msgstr "fikk ikke tilgang til %s"
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
-#, fuzzy, c-format
+#, c-format
 msgid "missing file operand"
-msgstr "hopp over argument"
+msgstr "mangler fil-operand"
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
-#, fuzzy, c-format
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
+#, c-format
 msgid "missing destination file operand after %s"
-msgstr "feltliste mangler"
+msgstr "mangler målfil-operand etter «%s»"
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
-#, fuzzy, c-format
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
+#, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
-msgstr "kan ikke skifte til katalog, %s"
+msgstr ""
+"du kan ikke kombinere valgene «--target-directory» (-t) og «--no-target-"
+"directory» (-T)"
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
-#, fuzzy, c-format
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
+#, c-format
 msgid "target %s is not a directory"
-msgstr "%s eksisterer men er ikke en katalog"
+msgstr "målet «%s» er ikke en mappe"
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, c-format
 msgid "with --parents, the destination must be a directory"
-msgstr ""
+msgstr "målet må være en mappe når «--parents» er valgt"
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, c-format
 msgid "multiple target directories specified"
+msgstr "flere målmapper er valgt"
+
+#: src/cp.c:1116 src/install.c:903
+#, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
 msgstr ""
+"advarsel: «--context» ignoreres, fordi det krever en kjerne som støtter "
+"SELinux"
 
-#: src/cp.c:1110
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
-msgstr ""
+msgstr "du kan ikke lage både hard og symbolsk lenke samtidig"
 
-#: src/cp.c:1117 src/mv.c:466
-#, fuzzy, c-format
+#: src/cp.c:1144 src/mv.c:480
+#, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
-msgstr "flaggene --string og --check kan ikke brukes samtidig"
+msgstr "valgene «--backup» og «--no-clobber» kan ikke kombineres"
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
-msgstr ""
+msgstr "«--reflink» kan bare brukes når du har valgt «--sparse=auto»"
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
+msgstr "sikkerhetskopi-type"
+
+#: src/cp.c:1186 src/install.c:944
+#, c-format
+msgid "cannot set target context and preserve it"
 msgstr ""
+"du kan ikke både velge ny sikkerhetskontekst og bevare gjeldende kontekst "
+"samtidig"
 
-#: src/cp.c:1156
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr ""
+"du kan ikke bevare sikkerhetskontekster uten å bruke en kjerne som støtter "
+"SELinux"
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr ""
+"klarte ikke å bevare utvidede attributer, fordi denne installasjonen av cp "
+"ble bygget uten «xattr»-støtte"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
-msgstr ""
+msgstr "Stuart Kemp"
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr "input forsvant"
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
-msgstr "%s: linjenummer utenfor tillatte verdier"
+msgstr "%s: linjenummeret er utenfor tillatt tallrekkevidde"
 
-#: src/csplit.c:700
-#, fuzzy, c-format
+#: src/csplit.c:713
+#, c-format
 msgid "%s: %s: line number out of range"
-msgstr "%s: «%s»: linjenummer utenfor tillatte verdier"
+msgstr "%s: %s: linjenummeret er utenfor tillatt rekkevidde"
 
-#: src/csplit.c:703 src/csplit.c:752
-#, fuzzy, c-format
+#: src/csplit.c:716 src/csplit.c:772
+#, c-format
 msgid " on repetition %s\n"
-msgstr " ved %d. repetisjon\n"
+msgstr " ved repetisjon %s\n"
 
-#: src/csplit.c:746
-#, fuzzy, c-format
+#: src/csplit.c:766
+#, c-format
 msgid "%s: %s: match not found"
-msgstr "%s: «%s»: ingen treff funnet"
+msgstr "%s: %s: ingen treff"
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr "feil i søk med regulært uttrykk"
 
-#: src/csplit.c:983
-#, fuzzy, c-format
+#: src/csplit.c:1006
+#, c-format
 msgid "write error for %s"
-msgstr "skrivefeil for «%s»"
+msgstr "skrivefeil for %s"
 
-#: src/csplit.c:1059
-#, fuzzy, c-format
+#: src/csplit.c:1082
+#, c-format
 msgid "%s: integer expected after delimiter"
-msgstr "%s: heltall forventet etter «%c»"
+msgstr "%s: forventet heltall etter skilletegn"
 
-#: src/csplit.c:1075
-#, fuzzy, c-format
+#: src/csplit.c:1098
+#, c-format
 msgid "%s: '}' is required in repeat count"
-msgstr "%s: «}» er nødvendig i gjentagelsesantall"
+msgstr "%s: «}» er obligatorisk i gjentagelsesteller"
 
-#: src/csplit.c:1085
-#, fuzzy, c-format
+#: src/csplit.c:1108
+#, c-format
 msgid "%s}: integer required between '{' and '}'"
-msgstr "%s}: heltall kreves mellom «{» og «}»"
+msgstr "%s}: du må oppgi et heltall mellom «{» og «}»"
 
-#: src/csplit.c:1112
-#, fuzzy, c-format
+#: src/csplit.c:1135
+#, c-format
 msgid "%s: closing delimiter '%c' missing"
-msgstr "%s: avsluttende skilletegn «%c» mangler"
+msgstr "%s: mangler avsluttende skilletegn «%c»"
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
-msgstr "%s: ugyldig regulært uttrykk: %s"
+msgstr "%s: det regulære uttrykket «%s» er ugyldig"
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr "%s: ugyldig mønster"
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
-msgstr "%s: linjenummeret må være større enn null"
+msgstr "%s: linjenummeret må være høyere enn null"
 
-#: src/csplit.c:1171
-#, fuzzy, c-format
+#: src/csplit.c:1194
+#, c-format
 msgid "line number %s is smaller than preceding line number, %s"
-msgstr "linjenummer «%s» er mindre enn foregående linjenummer, %s"
+msgstr "linjenummer %s er lavere enn forrige linjenummer (%s)"
 
-#: src/csplit.c:1177
-#, fuzzy, c-format
+#: src/csplit.c:1200
+#, c-format
 msgid "warning: line number %s is the same as preceding line number"
-msgstr "advarsel: linjenummer «%s» er det samme som foregående"
+msgstr "advarsel: linjenummer %s er det samme som forrige linjenummer"
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
-msgstr "manglende konverteringsspesifikator i suffiks"
+msgstr "suffiks mangler konverteringsspesifikasjon"
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
-msgstr "ugyldig konvertingsspesifikator i suffiks: %c"
+msgstr "suffiks bruker ugyldig konverteringsspesifikasjon («%c»)"
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
-msgstr "ugyldig konverteringsspesifikator i suffiks: \\%.3o"
+msgstr "suffiks bruker ugyldig konverteringsspesifikasjon («\\%.3o»)"
 
-#: src/csplit.c:1269
-#, fuzzy, c-format
+#: src/csplit.c:1292
+#, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
-msgstr "ugyldig konvertingsspesifikator i suffiks: %c"
+msgstr "ugyldige flagg i konverteringsspesifikasjon («%%%c%c»)"
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
-msgstr "for mange %%-konverteringsspesifikasjoner i suffiks"
+msgstr "suffikset bruker for mange %%-konverteringsspesifikasjoner"
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
-msgstr "manglende %%-konverteringsspesifikasjon i suffiks"
+msgstr "suffiks mangler %%-konverteringsspesifikasjon"
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
-msgstr "%s: ugyldig nummer"
+msgstr "%s: ugyldig tall"
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
-msgstr "Bruk: %s [FLAGG]... FIL MØNSTER...\n"
+msgstr "Bruk: %s [VALG] … FIL MØNSTER …\n"
 
-#: src/csplit.c:1455
-#, fuzzy
+#: src/csplit.c:1483
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
 "and output byte counts of each piece to standard output.\n"
 msgstr ""
-"Skriv ut deler av FIL skilt av MØNSTER til filene «xx01», «xx02», ...\n"
-"og skriv ut antall oktetter for hver del til standard ut.\n"
+"Skriv ut deler av FIL, adskilt med MØNSTER(e) til filene «xx00», «xx01», "
+"osv.,\n"
+"og skriv ut antall byte for hver del til standardutdata.\n"
 
-#: src/csplit.c:1462
-#, fuzzy, c-format
+#: src/csplit.c:1490
+#, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
 "  -f, --prefix=PREFIX        use PREFIX instead of 'xx'\n"
 "  -k, --keep-files           do not remove output files on errors\n"
 msgstr ""
-"  -b, --suffix-format=FORMAT bruk sprintf-FORMAT isteden for %d\n"
-"  -f, --prefix=PREFIX        bruk PREFIX isteden for «xx»\n"
-"  -k, --keep-files           ikke fjern utfiler ved feil\n"
+"  -b, --suffix-format=FORMAT  bruk sprintf-FORMAT i stedet for %02d\n"
+"  -f, --prefix=PREFIKS        bruk PREFIKS i stedet for «xx»\n"
+"  -k, --keep-files           ikke slett opprettede filer ved feil\n"
+
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr ""
+"  -m, --suppress-matched     utelat linjer som samsvarer med valgt MØNSTER\n"
 
-#: src/csplit.c:1467
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
 "  -z, --elide-empty-files    remove empty output files\n"
 msgstr ""
-"  -n, --digits=SIFFER        bruk spesifisert antall siffer isteden for 2\n"
-"  -s, --quiet, --silent      ikke skriv ut utfil-størrelser\n"
+"  -n, --digits=SIFFER        bruk valgt antall siffer isteden for 2\n"
+"  -s, --quiet, --silent      ikke skriv ut utdata-filstørrelser\n"
 "  -z, --elide-empty-files    fjern tomme ut-filer\n"
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
 msgstr ""
 "\n"
-"Les standard inn hvis FIL er -.  Hvert MØNSTER må være:\n"
+"Les standard inndata hvis FIL er «-».  Hvert MØNSTER må baseres på en av "
+"følgende:\n"
 
-#: src/csplit.c:1478
-#, fuzzy
+#: src/csplit.c:1509
 msgid ""
 "\n"
 "  INTEGER            copy up to but not including specified line number\n"
@@ -2371,87 +2680,89 @@ msgid ""
 "A line OFFSET is a required '+' or '-' followed by a positive integer.\n"
 msgstr ""
 "\n"
-"  HELTALL            kopiér opp til, men ikke inkludert spesifisert "
+"  INTEGER            kopier frem til - men ikke inkludert - angitt "
 "linjenummer\n"
-"  /REGEXP/[POSISJON] kopiér opp til, men ikke inkludert passende linje\n"
-"  %REGEXP%[POSISJON] hopp over fram til, men ikke inkludert passende linje\n"
-"  {HELTALL}          gjenta forrige mønster spesifisert antall ganger\n"
+"  /REGEXP/[OFFSET]   kopier frem til - men ikke inkludert - en samsvarende "
+"linje\n"
+"  %REGEXP%[OFFSET]   hopp frem til - men ikke inkludert - en samsvarende "
+"linje\n"
+"  {INTEGER}          gjenta forrige mønster et gitt antall ganger\n"
 "  {*}                gjenta forrige mønster så mange ganger som mulig\n"
 "\n"
-"En linje-POSISJON er en «+» eller «-» fulgt av et positivt heltall.\n"
+"En OFFSET (linjeforskyvning) er et obligatorisk «+»- eller «-»-tegn, "
+"etterfulgt av et heltall.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cut.c:44 src/paste.c:52
 msgid "David M. Ihnat"
-msgstr ""
-
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr ""
+msgstr "David M. Ihnat"
 
-#: src/cut.c:189
-#, fuzzy, c-format
+#: src/cut.c:172
+#, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
-msgstr "Bruk: %s [FLAGG]... [FIL]...\n"
+msgstr "Bruk: %s VALG … [FIL] …\n"
 
-#: src/cut.c:193
-#, fuzzy
+#: src/cut.c:176
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr ""
-"Skriv ut valgte deler av linjer fra hver FIL til standard ut.\n"
-"\n"
+"Skriv ut utvalgte deler av linjer fra hver valgt FIL til standard utdata.\n"
 
-#: src/cut.c:199
-#, fuzzy
+#: src/cut.c:182
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
 "  -c, --characters=LIST   select only these characters\n"
 "  -d, --delimiter=DELIM   use DELIM instead of TAB for field delimiter\n"
 msgstr ""
-"  -b, --bytes=LISTE       skriv bare ut disse oktettene\n"
-"  -c, --characters=LISTE  skriv bare ut disse tegnene\n"
-"  -d, --delimiter=SKILLE  bruk SKILLE isteden for TAB som skilletegn\n"
+"  -b, --bytes=LISTE       bare velg disse bytene\n"
+"  -c, --characters=LISTE  bare velg disse tegnene\n"
+"  -d, --delimiter=SKILLE  bruk valgt SKILLEtegn i stedet for TAB\n"
 
-#: src/cut.c:204
-#, fuzzy
+#: src/cut.c:187
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
 "                            that contains no delimiter character, unless\n"
 "                            the -s option is specified\n"
 "  -n                      (ignored)\n"
 msgstr ""
-"  -f, --fields=LISTE      skriv bare ut disse feltene.  Skriv også ut\n"
-"                            linjer som ikke inneholder noen skilletegn,\n"
-"                            med mindre flagget -s er spesifisert\n"
+"  -f, --fields=LISTE      bare skriv ut disse feltene. Skriv også ut\n"
+"                          linjer som ikke inneholder noen skilletegn,\n"
+"                          med mindre «-s» er valgt\n"
 "  -n                      (ignorert)\n"
 
-#: src/cut.c:210
+#: src/cut.c:193
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
 "                            or fields\n"
 msgstr ""
+"      --complement        fyll ut valgte byte, tegn\n"
+"                            eller felter\n"
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
 "                            the default is to use the input delimiter\n"
 msgstr ""
-"  -s, --only-delimited    skriv ikke ut linjer som ikke inneholder "
+"  -s, --only-delimited    ikke skriv ut linjer som ikke inneholder "
 "skilletegn\n"
-"      --output-delimiter=STRENG  bruk STRENG som ut-skilletegn\n"
-"                            forvalgt er å bruke inn-skilletegnet\n"
+"      --output-delimiter=STRENG  bruk STRENG som skilletegn i utdata\n"
+"                            (inndata-skilletegnet brukes som standard)\n"
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
 "range, or many ranges separated by commas.  Selected input is written\n"
 "in the same order that it is read, and is written exactly once.\n"
 msgstr ""
+"\n"
+"Bare bruk ett av valgene «-b», «-c» eller «-f». Hver LISTE er satt \n"
+"sammen av et område, eller mange områder adskilt med komma. Valgt inndata "
+"er\n"
+"skrevet i samme rekkefølge som det blir lest, og blir skrevet nøyaktig én "
+"gang.\n"
 
-#: src/cut.c:227
-#, fuzzy
+#: src/cut.c:210
 msgid ""
 "Each range is one of:\n"
 "\n"
@@ -2462,73 +2773,71 @@ msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
+"Hvert område er en av følgende:\n"
+"  N     N'te byte, tegn eller felt, talt fra 1\n"
+"  N-    fra N'te byte, tegn eller felt, til slutten av linja\n"
+"  N-M   fra N'te til M'te (inklusive) byte, tegn eller felt\n"
+"  -M    fra første til M'te (inklusive) byte, tegn eller felt\n"
 "\n"
-"Bruk en og bare en av -b, -c eller -f.  Hver LISTE er bygd opp av\n"
-"et område, eller flere områder skilt av komma.  Hver område er en av:\n"
-"\n"
-"  N     N'te oktett, tegn eller felt, telt fra 1\n"
-"  N-    fra N'te oktett, tegn eller felt, til slutten av linjen\n"
-"  N-M   fra N'te til M'te (inklusive) oktett, tegn eller felt\n"
-"  -M    fra første til M'te (inklusive) oktett, tegn eller felt\n"
-"\n"
-"Uten FIL, eller når FIL er -, leses fra standard inn.\n"
+"Hvis ingen FIL er valgt, eller hvis FIL er «-», leser programmet fra "
+"standard inndata.\n"
 
-#: src/cut.c:367 src/cut.c:493
-#, fuzzy
+#: src/cut.c:300 src/cut.c:394
 msgid "invalid byte, character or field list"
-msgstr "ugyldig byte- eller felt-liste"
+msgstr "byte-, tegn- eller feltlista er ugyldig"
 
-#: src/cut.c:387
-#, fuzzy
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr "felter og posisjoner er nummerert fra 1"
+
+#: src/cut.c:320
 msgid "invalid range with no endpoint: -"
-msgstr "ugyldig breddespesifikasjon «%s»"
+msgstr "ugyldig område uten endepunkt: -"
 
-#: src/cut.c:403
-#, fuzzy
+#: src/cut.c:334
 msgid "invalid decreasing range"
-msgstr "ugyldig type-streng «%s»"
+msgstr "ugyldig minkende område"
 
-#: src/cut.c:482
-#, fuzzy, c-format
+#: src/cut.c:383
+#, c-format
 msgid "byte offset %s is too large"
-msgstr "%s er for stor"
+msgstr "byte-forskyvninga «%s» er for stor"
 
-#: src/cut.c:485
-#, fuzzy, c-format
+#: src/cut.c:386
+#, c-format
 msgid "field number %s is too large"
-msgstr "felt-nummer er null"
+msgstr "feltnummer %s er for høyt"
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
-msgstr "bare en liste-type kan spesifiseres"
+msgstr "du kan bare velge én listetype"
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr "skilletegnet må være ett enkelt tegn"
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
-msgstr "du må spesifisere en liste av bytes, tegn eller felt"
+msgstr "du må spesifisere en liste over bytes, tegn eller felt"
 
-#: src/cut.c:850
-#, fuzzy
+#: src/cut.c:790
 msgid "an input delimiter may be specified only when operating on fields"
-msgstr "et skilletegn kan bare spesifiseres når en opererer med felt"
+msgstr "et skilletegn kan bare settes under behandling av felt"
 
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
 msgstr ""
-"fjerning av linjer uten skilletegn er meningsløst dersom en ikke opererer\n"
-"\tmed felt"
+"det er meningsløst å fjerne linjer uten skilletegn hvis du ikke\n"
+"\tbehandler felt"
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr "feltliste mangler"
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr "posisjonsliste mangler"
 
@@ -2538,10 +2847,12 @@ msgid ""
 "Usage: %s [OPTION]... [+FORMAT]\n"
 "  or:  %s [-u|--utc|--universal] [MMDDhhmm[[CC]YY][.ss]]\n"
 msgstr ""
+"Bruk: %s [VALG] … [+FORMAT]\n"
+"  eller:  %s [-u|--utc|--universal] [MMDDhhmm[[CC]YY][.ss]]\n"
 
 #: src/date.c:128
 msgid "Display the current time in the given FORMAT, or set the system date.\n"
-msgstr ""
+msgstr "Vis nåværende tid i valgt FORMAT, eller still systemklokka.\n"
 
 #: src/date.c:134
 msgid ""
@@ -2552,6 +2863,17 @@ msgid ""
 "                            'hours', 'minutes', 'seconds', or 'ns' for date\n"
 "                            and time to the indicated precision.\n"
 msgstr ""
+"  -d, --date=STRENG         vis tid som beskrevet i STRENG, ikke som i "
+"«now»\n"
+"  -f, --file=DATOFIL       tilsvarer bruk av «--date» én gang per linje i "
+"DATOFIL\n"
+"  -I[TIDSSPES], --iso-8601[=TIDSSPES]  skriv ut dato/tid i ISO 8601-format.\n"
+"                            TIDSSPES=«date» for å bare skrive ut dato "
+"(standard),\n"
+"                           «hours» (timer), «minutes» (minutter), "
+"«seconds» (sekunder),\n"
+"                            eller «ns» for tid of dato med angitt "
+"presisjon.\n"
 
 #: src/date.c:142
 msgid ""
@@ -2559,6 +2881,9 @@ msgid ""
 "  -R, --rfc-2822            output date and time in RFC 2822 format.\n"
 "                            Example: Mon, 07 Aug 2006 12:34:56 -0600\n"
 msgstr ""
+"  -r, --reference=FIL       vis når aktuell FIL ble endret sist\n"
+"  -R, --rfc-2822            skriv ut dato og klokkeslett i RFC 2822-format.\n"
+"                            Eksempel: Mon, 07 Aug 2006 12:34:56 +0200\n"
 
 #: src/date.c:147
 msgid ""
@@ -2568,8 +2893,18 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
+"      --rfc-3339=TIDSPES   skriv ut dato og klokkeslett i RFC 3339-format.\n"
+"                            Erstatt TIDSPES med «date», «seconds» eller «ns» "
+"for\n"
+"                            å velge presisjonsgrad.\n"
+"                            Tids- og datokomponenter holdes adskilt med\n"
+"                            et enkelt mellomrom. Eksempel: 2006-08-07 "
+"12:34:56-06:00\n"
+"  -s, --set=STRENG          still klokka i henhold til STRENG\n"
+"  -u, --utc, --universal    skriv ut eller still klokka etter UTC "
+"(Coordinated Universal Time)\n"
 
 #: src/date.c:158
 msgid ""
@@ -2579,6 +2914,11 @@ msgid ""
 "  %%   a literal %\n"
 "  %a   locale's abbreviated weekday name (e.g., Sun)\n"
 msgstr ""
+"\n"
+"FORMAT styrer utskriften. Følgende sekvenser tolkes:\n"
+"\n"
+"  %%   et rent %-tegn (prosenttegn)\n"
+"  %a   forkortet lokalt ukedagsnavn (f.eks. «Søn»)\n"
 
 #: src/date.c:165
 msgid ""
@@ -2587,6 +2927,11 @@ msgid ""
 "  %B   locale's full month name (e.g., January)\n"
 "  %c   locale's date and time (e.g., Thu Mar  3 23:05:25 2005)\n"
 msgstr ""
+"  %A   regiontilpasset, fullstendig ukenavn (f.eks.: søndag)\n"
+"  %b   regiontilpasset, forkortet månedsnavn (f.eks.: jan.)\n"
+"  %B   regiontilpasset, fullstendig månedsnavn (f.eks.: januar)\n"
+"  %c   regiontilpasset dato og klokkeslett (f.eks.: \n"
+"         to. 03. mars 2005 kl. 23.05 +0100)\n"
 
 #: src/date.c:171
 msgid ""
@@ -2595,6 +2940,10 @@ msgid ""
 "  %D   date; same as %m/%d/%y\n"
 "  %e   day of month, space padded; same as %_d\n"
 msgstr ""
+"  %C   århundre. Likner %Y, men utelater de to siste tallene (f.eks. 20)\n"
+"  %d   månedsdag (f.eks. 01)\n"
+"  %D   dato. Samme som «%m/%d/%y»\n"
+"  %e   månedsdag, med mellomrom (tilsvarer «%_d»)\n"
 
 #: src/date.c:177
 msgid ""
@@ -2602,6 +2951,10 @@ msgid ""
 "  %g   last two digits of year of ISO week number (see %G)\n"
 "  %G   year of ISO week number (see %V); normally useful only with %V\n"
 msgstr ""
+"  %F   fullstendig dato (tilsvarer «%Y-%m-%d»)\n"
+"  %g   siste to sifre i årstall etter ISO-ukenummer (se «%G» under)\n"
+"  %G   år etter ISO-ukenummer. Dette er vanligvis bare nyttig sammen med "
+"«%V»\n"
 
 #: src/date.c:182
 msgid ""
@@ -2610,6 +2963,10 @@ msgid ""
 "  %I   hour (01..12)\n"
 "  %j   day of year (001..366)\n"
 msgstr ""
+"  %h   tilsvarer «%b»\n"
+"  %H   time (00 … 23)\n"
+"  %l   time (01 … 12)\n"
+"  %j   dag i året (001 … 366)\n"
 
 #: src/date.c:188
 msgid ""
@@ -2618,6 +2975,10 @@ msgid ""
 "  %m   month (01..12)\n"
 "  %M   minute (00..59)\n"
 msgstr ""
+"  %k   time, med mellomrom ( 0 … 23). Tilsvarer «%_H»\n"
+"  %l   time, med mellomrom ( 1 … 12). Tilsvarer «%_I»\n"
+"  %m   måned (01 … 12)\n"
+"  %M   minutt (00 … 59)\n"
 
 #: src/date.c:194
 msgid ""
@@ -2629,6 +2990,13 @@ msgid ""
 "  %R   24-hour hour and minute; same as %H:%M\n"
 "  %s   seconds since 1970-01-01 00:00:00 UTC\n"
 msgstr ""
+"  %n   et linjeskift\n"
+"  %N   nanosekunder (000000000 … 999999999)\n"
+"  %p   regiontilpasset variant av AM eller PM; blank hvis ukjent\n"
+"  %P   samme som %p, men med små bokstaver\n"
+"  %r   regiontilpasset 12-timers klokkeslett (f.eks. 11:11:04)\n"
+"  %R   24-timers timer og minutter (tilsvarer «%H:%M»)\n"
+"  %s   sekunder siden 1970-01-01 00:00:00 UTC\n"
 
 #: src/date.c:203
 msgid ""
@@ -2637,6 +3005,10 @@ msgid ""
 "  %T   time; same as %H:%M:%S\n"
 "  %u   day of week (1..7); 1 is Monday\n"
 msgstr ""
+"  %S   sekund (00 … 60)\n"
+"  %t   tabulatortegn\n"
+"  %T   klokkeslett (tilsvarer «%H:%M:%S»)\n"
+"  %u   ukedag (1… 7; «1» betyr mandag)\n"
 
 #: src/date.c:209
 msgid ""
@@ -2645,6 +3017,10 @@ msgid ""
 "  %w   day of week (0..6); 0 is Sunday\n"
 "  %W   week number of year, with Monday as first day of week (00..53)\n"
 msgstr ""
+"  %U   ukenummer i året, med søndag som første ukedag (00 … 53)\n"
+"  %V   ISO-ukenummer, med mandag som første ukedag (01 … 53)\n"
+"  %w   ukedag (0 … 6; «0» betyr søndag)\n"
+"  %W   ukenummer i året, med mandag som første ukedag (00 … 53)\n"
 
 #: src/date.c:215
 msgid ""
@@ -2653,6 +3029,10 @@ msgid ""
 "  %y   last two digits of year (00..99)\n"
 "  %Y   year\n"
 msgstr ""
+"  %x   regiontilpasset datovisning (f.eks. 12. aug. 1999)\n"
+"  %X   regiontilpasset klokkeslett (f.eks. kl. 23.13 +0200)\n"
+"  %y   siste to sifre i årstall (00 … 99)\n"
+"  %Y   årstall\n"
 
 #: src/date.c:221
 msgid ""
@@ -2665,6 +3045,14 @@ msgid ""
 "\n"
 "By default, date pads numeric fields with zeroes.\n"
 msgstr ""
+"  %z   +hhmm numerisk tidssone (f.eks. -0400)\n"
+"  %:z  +hh:mm numerisk tidssone (f.eks. -04:00)\n"
+"  %::z  +hh:mm:ss numerisk tidssone (f.eks. -04:00:00)\n"
+"  %:::z  numerisk tidssone med «:» for å velge presisjon (f.eks. -04, "
+"+05:30)\n"
+"  %Z   alfabetisk forkortet navn på tidssonen (f.eks. CET)\n"
+"\n"
+"Date legger til nuller i ensifrede tidsverdier som standard.\n"
 
 #: src/date.c:230
 msgid ""
@@ -2676,6 +3064,13 @@ msgid ""
 "  ^  use upper case if possible\n"
 "  #  use opposite case if possible\n"
 msgstr ""
+"Du kan bruke flagg med tegnet «%», etterfulgt av et av følgende:\n"
+"\n"
+"  -  (bindestrek) ikke gi feltet ekstra mellomrom\n"
+"  _  (understrek) bruk mellomrom\n"
+"  0  (zero) bruk ledende nulltegn ved ensifrede verdier\n"
+"  ^  bruk store bokstaver, hvis mulig\n"
+"  #  bruk omvendt bokstavstørrelse, hvis mulig\n"
 
 #: src/date.c:239
 msgid ""
@@ -2685,6 +3080,11 @@ msgid ""
 "E to use the locale's alternate representations if available, or\n"
 "O to use the locale's alternate numeric symbols if available.\n"
 msgstr ""
+"\n"
+"Du kan velge bredde etter et valg med desimaltall,\n"
+"etterfulgt av en eventuell endring som enten er\n"
+"«E» for å bruke evt. regiontilpassede datoformat, eller\n"
+"«O» for å bruke evt. regiontilpassede tallformat.\n"
 
 #: src/date.c:246
 msgid ""
@@ -2699,34 +3099,45 @@ msgid ""
 "Show the local time for 9AM next Friday on the west coast of the US\n"
 "  $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n"
 msgstr ""
+"\n"
+"Eksempler:\n"
+"Konverter antall sekunder siden Unix-epokens start (1970-01-01 UTC) til en "
+"dato\n"
+"  $ date --date='@2147483647'\n"
+"\n"
+"Vis klokkeslett på vestkysten i USA (bruk tzselect(1) for å finne tidssone)\n"
+"  $ TZ='America/Los_Angeles' date\n"
+"\n"
+"Vis lokal tid for kl. 09:00 neste fredag på vestkysten i USA\n"
+"  $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n"
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
-msgstr "standard inn"
+msgstr "standard inndata"
 
 #: src/date.c:307 src/date.c:527
-#, fuzzy, c-format
+#, c-format
 msgid "invalid date %s"
-msgstr "ugyldig bredde: «%s»"
+msgstr "datoen «%s» er ugyldig"
 
 #: src/date.c:418 src/date.c:452
 #, c-format
 msgid "multiple output formats specified"
-msgstr ""
+msgstr "du har valgt flere visningsformat"
 
 #: src/date.c:430
-#, fuzzy, c-format
+#, c-format
 msgid "the options to specify dates for printing are mutually exclusive"
-msgstr "flaggene --string og --check kan ikke brukes samtidig"
+msgstr "du kan bare velge ett dato-utskriftsformat av gangen"
 
 #: src/date.c:437
 #, c-format
 msgid "the options to print and set the time may not be used together"
-msgstr ""
+msgstr "du kan ikke både skrive ut og stille dato/klokkeslett samtidig"
 
 #: src/date.c:458
 #, c-format
@@ -2735,33 +3146,36 @@ msgid ""
 "when using an option to specify date(s), any non-option\n"
 "argument must be a format string beginning with '+'"
 msgstr ""
+"argumentet «%s» mangler et ledende «+»-tegn.\n"
+"Alle argumentstrenger som ikke er «date»-komnandovalg \n"
+"må være formatstrenger og begynne med «+»"
 
 #: src/date.c:535
 #, c-format
 msgid "cannot set date"
-msgstr ""
+msgstr "klarte ikke å stille dato/klokkeslett"
 
-#: src/date.c:558 src/du.c:371
-#, fuzzy, c-format
+#: src/date.c:558 src/du.c:383
+#, c-format
 msgid "time %s is out of range"
-msgstr "%s: linjenummer utenfor tillatte verdier"
+msgstr "tid «%s» er utenfor tilatt område"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/dd.c:44 src/factor.c:109 src/rm.c:41 src/tail.c:69 src/touch.c:41
 #: src/wc.c:50
 msgid "Paul Rubin"
-msgstr ""
+msgstr "Paul Rubin"
 
-#: src/dd.c:521
-#, fuzzy, c-format
+#: src/dd.c:527
+#, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
 "  or:  %s OPTION\n"
 msgstr ""
-"Bruk:  %s [FIL]...\n"
-"eller: %s [FLAGG]\n"
+"Bruk:  %s [OPERAND] …\n"
+"eller: %s VALG\n"
 
-#: src/dd.c:526
+#: src/dd.c:532
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
 "\n"
@@ -2771,8 +3185,15 @@ msgid ""
 "  count=N         copy only N input blocks\n"
 "  ibs=BYTES       read up to BYTES bytes at a time (default: 512)\n"
 msgstr ""
+"Kopier en fil med konvertering og formatering i henhold til operand.\n"
+"\n"
+"  bs=BYTE        les og skriv opptil et gitt antall BYTE om gangen\n"
+"  cbs=BYTE       konverter et gitt antall BYTE om gangen\n"
+"  conv=KONV      konverter fila i henhold til en kommaseparert symbolliste\n"
+"  count=N         bare kopier N antall inndatablokker\n"
+"  ibs=BYTE       les opptil et gitt antall BYTE om gangen (standard: 512)\n"
 
-#: src/dd.c:535
+#: src/dd.c:541
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
 "  iflag=FLAGS     read as per the comma separated symbol list\n"
@@ -2784,8 +3205,19 @@ msgid ""
 "  status=WHICH    WHICH info to suppress outputting to stderr;\n"
 "                  'noxfer' suppresses transfer stats, 'none' suppresses all\n"
 msgstr ""
+"  if=FIL         les fra FIL i stedet for standard innkanal\n"
+"  iflag=FLAGG     les i henhold til den kommaseparerte symbollista\n"
+"  obs=BYTE       skriv angitt antall BYTE av gangen (standard: 512)\n"
+"  of=FIL         skriv til en FIL, i stedet for standard utkanal\n"
+"  oflag=FLAGG     skriv i henhold til den kommaseparerte symbollista\n"
+"  seek=N          hopp over N antall obs-blokker når utskriften starter\n"
+"  skip=N          hopp over N antall ibs-blokker når lesing av inndata "
+"starter\n"
+"  status=HVA    HVA skal utelates av informasjon til standardfeilkanal.\n"
+"                  «noxfer» utelater overføringsstatistikk, og «none» "
+"utelater all info\n"
 
-#: src/dd.c:546
+#: src/dd.c:552
 msgid ""
 "\n"
 "N and BYTES may be followed by the following multiplicative suffixes:\n"
@@ -2795,8 +3227,15 @@ msgid ""
 "Each CONV symbol may be:\n"
 "\n"
 msgstr ""
+"\n"
+"N og BYTE kan etterfølges av følgende multipliserende suffiks:\n"
+"c =1, w =2, b =512, kB =1000, K =1024, MB =1000*1000, M =1024*1024, xM =M\n"
+"GB =1000*1000*1000, G =1024*1024*1024 og så videre for T, P, E, Z, Y.\n"
+"\n"
+"Hvert CONV-symbol kan være som følgende:\n"
+"\n"
 
-#: src/dd.c:555
+#: src/dd.c:561
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
 "  ebcdic    from ASCII to EBCDIC\n"
@@ -2810,8 +3249,23 @@ msgid ""
 "  sync      pad every input block with NULs to ibs-size; when used\n"
 "            with block or unblock, pad with spaces rather than NULs\n"
 msgstr ""
-
-#: src/dd.c:568
+"  ascii     fra EBCDIC til ASCII\n"
+"  ebcdic    fra ASCII til EBCDIC\n"
+"  ibm       fra ASCII til alternativ EBCDIC\n"
+"  block     skyv oppføringer som avslutter med ny linje, med cbs-"
+"dimensjonert mellomrom\n"
+"  unblock   erstatt avsluttende mellomrom i cbs-dimensjonerte oppføringer "
+"med en ny linje\n"
+"  lcase     erstatt versaler med minuskler\n"
+"  ucase     erstatt minuskler med versaler\n"
+"  sparse    prøv å søke i stedet for å faktisk skrive ut NUL- (tomme) "
+"blokker\n"
+"  swab      bytt om hvert par med inngangsbyte\n"
+"  sync      forskyv hver inngangsblokk med NUL-ler til ibs-størrelse.\n"
+"            NÃ¥r dette brukes med block eller unblock, skyves blokkene med "
+"mellomrom i stedet for NUL-ler\n"
+
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -2820,8 +3274,14 @@ msgid ""
 "  fdatasync  physically write output file data before finishing\n"
 "  fsync     likewise, but also write metadata\n"
 msgstr ""
+"  excl      avbryt hvis målfila eksisterer allerede\n"
+"  nocreat   ikke opprett målfil\n"
+"  notrunc   ikke forkort målfil\n"
+"  noerror   fortsett selv om det oppstår lesefeil\n"
+"  fdatasync  ikke avslutt før utdata er fysisk ferdigstilt\n"
+"  fsync     som ovenfor, men skriv metadata i tillegg\n"
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -2829,77 +3289,81 @@ msgid ""
 "  append    append mode (makes sense only for output; conv=notrunc "
 "suggested)\n"
 msgstr ""
+"\n"
+"Hvert tegn i FLAGG kan være et av følgende:\n"
+"\n"
+"  append    tilføyingsmodus (gir kun mening for utdata; conv=notrunc "
+"foreslått)\n"
 
-#: src/dd.c:583
+#: src/dd.c:589
 msgid "  cio       use concurrent I/O for data\n"
-msgstr ""
+msgstr "  cio bruk sammenfallende inn- og utkanal for data\n"
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
-msgstr ""
+msgstr "  direct    benytt direkte inn- og utkanal for data\n"
 
-#: src/dd.c:587
-#, fuzzy
+#: src/dd.c:593
 msgid "  directory  fail unless a directory\n"
-msgstr "%s eksisterer men er ikke en katalog"
+msgstr "  directory  avslutt med feil, med mindre det er en mappe\n"
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
-msgstr ""
+msgstr "  dsync     bruk synkronisert inn- og utkanal for data\n"
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
-msgstr ""
+msgstr "  sync      som dsync, men også for metadata\n"
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
-msgstr ""
+msgstr "  fullblock  samle opp fulle inndata-blokker (kun iflag)\n"
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
-msgstr ""
+msgstr "  nonblock  benytt ikke-blokkerende inn- og utkanal\n"
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
-msgstr ""
+msgstr "  noatime   ikke oppdater tilgangstidsstempel\n"
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
-msgstr ""
+msgstr "  nocache   forkast hurtiglagret data\n"
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
-msgstr ""
+msgstr "  noctty    ikke tildel kontrollerende terminal fra fil\n"
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
-msgstr ""
+msgstr "  nofollow  ikke følg symbolske lenker\n"
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
-msgstr ""
+msgstr "  nolinks   avbryt hvis flerkoblet\n"
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
-msgstr ""
+msgstr "  binary    bruk binær inn- og utkanal for data\n"
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
-msgstr ""
+msgstr "  text      bruk tekstbasert inn- og utkanal for data\n"
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
-msgstr ""
+msgstr "  count_bytes  behandle «count=N» som et antall byte (kun iflag)\n"
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
-msgstr ""
+msgstr "  skip_bytes  behandle «skip=N» som et antall byte (kun iflag)\n"
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
-msgstr ""
+msgstr "  seek_bytes  behandle «seek=N» som et antall byte (kun oflag)\n"
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, c-format
 msgid ""
 "\n"
@@ -2915,31 +3379,60 @@ msgid ""
 "Options are:\n"
 "\n"
 msgstr ""
+"\n"
+"En pågående «dd»-prosess skriver ut inn- og utstatistikk til "
+"standardfeilkanal\n"
+"og fortsetter kopiering når den mottar et %s-signal.\n"
+"\n"
+"  $ dd if=/dev/zero of=/dev/null& pid=$!\n"
+"  $ kill -%s $pid; sleep 1; kill $pid\n"
+"  18335302+0 records in\n"
+"  18335302+0 records out\n"
+"  9387674624 bytes (9.4 GB) copied, 34.6279 seconds, 271 MB/s\n"
+"\n"
+"Mulige valg:\n"
+"\n"
+
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr ""
+"minnet er oppbrukt av mellomlager for inndata, med en størrelse på %zu byte "
+"(%s)"
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr ""
+"minnet er oppbrukt av mellomlager for utdata, med en størrelse på %zu byte "
+"(%s)"
 
-#: src/dd.c:683
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
 "%<PRIuMAX>+%<PRIuMAX> records out\n"
 msgstr ""
+"%<PRIuMAX>+%<PRIuMAX> oppføringer inn\n"
+"%<PRIuMAX>+%<PRIuMAX> oppføringer ut\n"
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%<PRIuMAX> forkortet oppføring\n"
+msgstr[1] "%<PRIuMAX> forkortede oppføringer\n"
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%<PRIuMAX> byte (%s) kopiert"
+msgstr[1] "%<PRIuMAX> byte (%s) kopiert"
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
-msgstr ""
+msgstr "Uendelig B"
 
 #. TRANSLATORS: The two instances of "s" in this string are the SI
 #. symbol "s" (meaning second), and should not be translated.
@@ -2951,273 +3444,288 @@ msgstr ""
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
-msgstr ""
+msgstr ", %g s, %s/s\n"
 
-#: src/dd.c:812
-#, fuzzy, c-format
+#: src/dd.c:877
+#, c-format
 msgid "closing input file %s"
-msgstr "lager filen «%s»\n"
+msgstr "lukker inndatafil «%s»"
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
-msgstr ""
+msgstr "lukker utdatafil «%s»"
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, c-format
 msgid "failed to turn off O_DIRECT: %s"
-msgstr ""
+msgstr "klarte ikke å skru av «O_DIRECT». %s"
 
-#: src/dd.c:1093 src/dd.c:1942
-#, fuzzy, c-format
+#: src/dd.c:1160 src/dd.c:1976
+#, c-format
 msgid "writing to %s"
-msgstr "feil ved skriving til %s"
+msgstr "skriver til «%s»"
 
-#: src/dd.c:1207 src/dd.c:1261
-#, fuzzy, c-format
+#: src/dd.c:1274 src/dd.c:1328
+#, c-format
 msgid "unrecognized operand %s"
-msgstr "ukjent flagg «-%c»"
+msgstr "operand «%s» er ukjent"
 
-#: src/dd.c:1218
-#, fuzzy
+#: src/dd.c:1285
 msgid "invalid conversion"
-msgstr "ugyldig breddespesifikasjon «%s»"
+msgstr "ugyldig konvertering"
 
-#: src/dd.c:1221 src/dd.c:1297
-#, fuzzy
+#: src/dd.c:1288 src/dd.c:1364
 msgid "invalid input flag"
-msgstr "ugyldig tall i feltstart"
+msgstr "ugyldig inndataflagg"
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
-#, fuzzy
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 msgid "invalid output flag"
-msgstr "ugyldig gruppe"
+msgstr "ugyldig utdataflagg"
 
-#: src/dd.c:1227
-#, fuzzy
+#: src/dd.c:1294
 msgid "invalid status flag"
-msgstr "ugyldig bruker"
+msgstr "ugyldig statusflagg"
 
-#: src/dd.c:1266 src/truncate.c:310
-#, fuzzy, c-format
+#: src/dd.c:1333 src/truncate.c:310
+#, c-format
 msgid "invalid number %s"
-msgstr "ugyldig antall"
+msgstr "tallet %s er ugyldig"
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
-msgstr ""
+msgstr "du kan ikke kombinere to av disse: {ascii,ebcdic,ibm}"
 
-#: src/dd.c:1350
-#, fuzzy, c-format
+#: src/dd.c:1417
+#, c-format
 msgid "cannot combine block and unblock"
-msgstr "kan ikke utelate både bruker og gruppe"
+msgstr "du kan ikke kombinere valgene «block» og «unblock»"
 
-#: src/dd.c:1352
-#, fuzzy, c-format
+#: src/dd.c:1419
+#, c-format
 msgid "cannot combine lcase and ucase"
-msgstr "Strengene som ble sammenlignet var «%s» og «%s»."
+msgstr ""
+"du kan ikke velge både «lcase» (konverter til små bokstaver) og "
+"«ucase» (konverter til store bokstaver)"
 
-#: src/dd.c:1354
-#, fuzzy, c-format
+#: src/dd.c:1421
+#, c-format
 msgid "cannot combine excl and nocreat"
-msgstr "kan ikke opprette katalog %s"
+msgstr "du kan ikke kombinere valgene «excl» og «nocreat»"
 
-#: src/dd.c:1357
-#, fuzzy, c-format
+#: src/dd.c:1424
+#, c-format
 msgid "cannot combine direct and nocache"
-msgstr "kan ikke opprette katalog %s"
+msgstr "du kan ikke kombinere valgene «direct» og «nocache»"
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
 "  of mt_type=0x%0lx -- see <sys/mtio.h> for the list of types"
 msgstr ""
+"advarsel: jobber rundt lseek-kjernefeil for fil (%s)\n"
+"  med mt_type=0x%0lx . Se lista <sys/mtio.h> over typer dette gjelder"
 
-#: src/dd.c:1601
-#, fuzzy, c-format
+#: src/dd.c:1670
+#, c-format
 msgid "%s: cannot skip"
-msgstr "%s: kan ikke søke til posisjon %s%s"
+msgstr "%s: klarte ikke å hoppe over"
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
-#, fuzzy, c-format
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
+#, c-format
 msgid "%s: cannot seek"
-msgstr "%s: kan ikke søke til posisjon %s%s"
+msgstr "%s: klarte ikke å søke"
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
-msgstr ""
+msgstr "for stor forskyvning ved lesing av fila «%s»"
 
-#: src/dd.c:1675
-#, fuzzy, c-format
+#: src/dd.c:1756
+#, c-format
 msgid "warning: invalid file offset after failed read"
-msgstr "advarsel: ugyldig bredde %lu; bruker %d istedet"
+msgstr "advarsel: ugyldig forskyvning i fil etter mislykket lesing"
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
-msgstr ""
+msgstr "klarte ikke å jobbe rundt kjernefeil likevel"
 
-#: src/dd.c:1822
-#, fuzzy, c-format
-msgid "setting flags for %s"
-msgstr "kan ikke endre rettigheter til %s"
-
-#: src/dd.c:1875
+#: src/dd.c:1903
 #, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr ""
+msgid "setting flags for %s"
+msgstr "velger flagg for «%s»"
 
-#: src/dd.c:1889
+#: src/dd.c:1957
 #, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1922
-#, fuzzy, c-format
 msgid "%s: cannot skip to specified offset"
-msgstr "%s: kan ikke søke til relativ posisjon %s%s"
+msgstr "%s: klarte ikke å hoppe til valgt forskyvning"
 
-#: src/dd.c:2133
+#: src/dd.c:2172
 #, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
-msgstr ""
+msgstr "klarte ikke å korte ned til %<PRIdMAX> byte i utdatafil «%s»"
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
-msgstr ""
+msgstr "fdatasync mislyktes med «%s»"
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
-msgstr ""
+msgstr "fsync mislyktes med «%s»"
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, c-format
 msgid "failed to open %s"
-msgstr ""
+msgstr "klarte ikke å åpne «%s»"
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
 "blocks"
 msgstr ""
+"forskyvningen er for stor. Du kan ikke forkorte til en lengde av seek="
+"%<PRIuMAX> (%lu-byte) blokker"
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
-msgstr ""
+msgstr "klarte ikke å forkorte til  %<PRIuMAX> byte i utdatafil «%s»"
 
-#: src/dd.c:2283 src/dd.c:2289
-#, fuzzy, c-format
+#: src/dd.c:2322 src/dd.c:2328
+#, c-format
 msgid "failed to discard cache for: %s"
-msgstr "kan ikke endre rettigheter til %s"
+msgstr "klarte ikke å tømme mellomlageret for «%s»"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
-msgstr ""
+msgstr "Paul Eggert"
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
-msgstr ""
+msgstr "Filsystem"
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
-msgstr ""
+msgstr "Type"
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
-msgstr ""
+msgstr "blokker"
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
-msgstr ""
+msgstr "Brukt"
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
-msgstr ""
+msgstr "Tilgjengelig"
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
-msgstr ""
+msgstr "Bruk%"
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
-msgstr ""
+msgstr "Inodes"
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
-msgstr ""
+msgstr "IUsed"
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
-msgstr ""
+msgstr "IFree"
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
-msgstr ""
+msgstr "IUse%"
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
-msgstr ""
+msgstr "Montert på"
+
+#: src/df.c:207
+msgid "File"
+msgstr "Fil"
 
-#: src/df.c:383
+#: src/df.c:387
 #, c-format
-msgid "option --output: field '%s' unknown"
-msgstr ""
+msgid "option --output: field %s unknown"
+msgstr "«--output»-valg: felt «%s» er ukjent"
 
-#: src/df.c:390
+#: src/df.c:394
 #, c-format
-msgid "option --output: field '%s' used more than once"
-msgstr ""
+msgid "option --output: field %s used more than once"
+msgstr "«--output»-valg: felt «%s» er brukt flere ganger"
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
-msgstr ""
+msgstr "Størrelse"
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
-msgstr ""
+msgstr "Tilgj."
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
-msgstr ""
+msgstr "Kapasitet"
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
-msgstr ""
+msgstr "%s-%s"
 
-#: src/df.c:1210
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr "fikk ikke tilgang til %s, som er overmontert av en annen enhet"
+
+#: src/df.c:1384
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
 "or all file systems by default.\n"
 msgstr ""
+"Vis informasjon om filsystemet som hver FIL ligger på,\n"
+"eller - som standard - alle filsystemer.\n"
 
-#: src/df.c:1217
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
-msgstr ""
-
-#: src/df.c:1227
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
+msgstr ""
+"  -a, --all             ta med liksom-filsystemer\n"
+"  -B, --block-size=STØRR  skalerer størrelser etter valgt STØRRelsesenhet "
+"før de skrives ut.\n"
+"                           «-BM» skriver f.eks. ut størrelser i 1 048 576 "
+"byte-enheter.\n"
+"                           Les mer om STØRRelsesformat nedenfor.\n"
+"      --total           regn ut en totalsum\n"
+"  -h, --human-readable  skriv ut størrelser i menneskelig lesbart format (f."
+"eks. 1K 234M 2G)\n"
+"  -H, --si              som ovenfor, men regner 1 kilobyte som 1000 byte i "
+"stedet for 1024 byte\n"
+
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -3225,8 +3733,13 @@ msgid ""
 "      --no-sync         do not invoke sync before getting usage info "
 "(default)\n"
 msgstr ""
+"  -i, --inodes          vis informasjon om inoder i stedet for blokker\n"
+"  -k                    tilsvarer «--block-size=1K»\n"
+"  -l, --local           bare vis lokale filsystemer\n"
+"      --no-sync         ikke kall sync før bruksinformasjon hentes "
+"(standard)\n"
 
-#: src/df.c:1234
+#: src/df.c:1409
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
 "                               or print all fields if FIELD_LIST is "
@@ -3238,56 +3751,63 @@ msgid ""
 "  -x, --exclude-type=TYPE   limit listing to file systems not of type TYPE\n"
 "  -v                    (ignored)\n"
 msgstr ""
+"      --output[=FELTLISTE]  bruk utskriftsformat slik det er definert i "
+"FETLISTE,\n"
+"                               eller skriv ut alle felt hvis FELTLISTE "
+"utelates.\n"
+"  -P, --portability     bruk utskriftsformatet POSIX\n"
+"      --sync            start synkronisering før bruksinfo hentes\n"
+"  -t, --type=TYPE       begrens oppføringer til angitt TYPE filsystemer\n"
+"  -T, --print-type      skriv ut filsystemtype\n"
+"  -x, --exclude-type=TYPE   begrens oppføringer til filsystemer som ikke er "
+"av angitt TYPE\n"
+"  -v                    (ignoreres)\n"
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
+"\n"
+"FELTLISTE er en kommaseparert liste over kolonner som skal tas med. \n"
+"Gyldige feltnavn er «source», «fstype», «itotal», «iused», «iavail», "
+"«ipcent»,\n"
+"«size», «used», «avail», «pcent» og «target» (les mer på infosiden).\n"
 
-#: src/df.c:1285
-#, fuzzy, c-format
+#: src/df.c:1460
+#, c-format
 msgid "options %s and %s are mutually exclusive"
-msgstr "flaggene --string og --check kan ikke brukes samtidig"
-
-#: src/df.c:1335
-msgid "warning: "
-msgstr ""
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr ""
+msgstr "du kan ikke velge både «%s» og «%s» samtidig"
 
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
-msgstr ""
+msgstr "filsystemtype «%s» er både valgt og utelatt"
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
-msgstr ""
+msgstr "Advarsel: "
 
-#: src/df.c:1502 src/stat.c:814
-#, fuzzy
+#: src/df.c:1670 src/stat.c:842
 msgid "cannot read table of mounted file systems"
-msgstr "kan ikke opprette midlertidig fil"
+msgstr "klarte ikke å lese tabell over monterte filsystemer"
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
-msgstr ""
+msgstr "ingen filsystemer ble behandlet"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/dircolors.c:35
 msgid "H. Peter Anvin"
-msgstr ""
+msgstr "H. Peter Anvin"
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
-#, fuzzy, c-format
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
+#, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
-msgstr "Bruk: %s [FLAGG]... [FIL]...\n"
+msgstr "Bruk: %s [VALG] … [FIL]\n"
 
 #: src/dircolors.c:98
 msgid ""
@@ -3298,6 +3818,12 @@ msgid ""
 "  -c, --csh, --c-shell        output C shell code to set LS_COLORS\n"
 "  -p, --print-database        output defaults\n"
 msgstr ""
+"Viser kommandoer som gir miljøvariabelen LS_COLORS en verdi.\n"
+"\n"
+"Velg visningsformat:\n"
+"  -b, --sh, --bourne-shell vis Bourne shell-kode for å angi LS_COLORS\n"
+"  -c, --csh, --c-shell vis C shell-kode for å angi LS_COLORS\n"
+"  -p,, --print-database vis standardverdier\n"
 
 #: src/dircolors.c:108
 msgid ""
@@ -3306,41 +3832,49 @@ msgid ""
 "file types and extensions.  Otherwise, a precompiled database is used.\n"
 "For details on the format of these files, run 'dircolors --print-database'.\n"
 msgstr ""
+"\n"
+"Hvis du velger FIL, blir den lest for å avgjøre hvilke farger som skal "
+"brukes\n"
+"på ulike filtyper og utvidelser.  Ellers blir en database med "
+"forhåndsdefinerte verdier brukt.\n"
+"Kjør «dircolors --print-database» for å se detaljer om hvordan slike filer "
+"skal formateres.\n"
 
 #: src/dircolors.c:286
-#, fuzzy, c-format
+#, c-format
 msgid "%s:%lu: invalid line;  missing second token"
-msgstr "%s: ugyldig antall sekunder"
+msgstr "%s:%lu: ugyldig linje. Mangler parameter nummer to"
 
 #: src/dircolors.c:358
-#, fuzzy, c-format
+#, c-format
 msgid "%s:%lu: unrecognized keyword %s"
-msgstr "%s: ukjent flagg «%c%s»\n"
+msgstr "%s:%lu: kjenner ikke igjen nøkkelordet «%s»"
 
 #: src/dircolors.c:359
 msgid "<internal>"
-msgstr ""
+msgstr "<internal>"
 
 #: src/dircolors.c:440
 #, c-format
 msgid ""
 "the options to output dircolors' internal database and\n"
 "to select a shell syntax are mutually exclusive"
-msgstr ""
+msgstr "du kan ikke både vise intern database og velge skallsyntaks samtidig"
 
 #: src/dircolors.c:450
 msgid "file operands cannot be combined with --print-database (-p)"
 msgstr ""
+"du kan ikke kombinere operand-er for fila med valget «--print-database» (-p)"
 
 #: src/dircolors.c:473
 #, c-format
 msgid "no SHELL environment variable, and no shell type option given"
-msgstr ""
+msgstr "du har hverken angitt en SHELL-miljøvariabel eller valgt skalltype"
 
 #: src/dirname.c:50
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: %s [OPTION] NAME...\n"
-msgstr "Bruk: %s [FLAGG] [FIL]...\n"
+msgstr "Bruk: %s [VALG] NAVN …\n"
 
 #: src/dirname.c:54
 msgid ""
@@ -3349,12 +3883,15 @@ msgid ""
 "directory).\n"
 "\n"
 msgstr ""
+"Skriv ut hvert NAVN med dets siste del uten skråstrek, og fjern\n"
+"avsluttende skråstrek. Hvis NAVNet ikke inneholder «/», skriv ut «.» (som "
+"betyr gjeldende arbeidsmappe)\n"
+"\n"
 
 #: src/dirname.c:59
-#, fuzzy
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
 msgstr ""
-"  -z, --zero-terminated     avslutt linjer med en 0-oktett, ikke linjeskift\n"
+"  -z, --zero     avslutt hver utskriftslinje med NUL i stedet for ny linje\n"
 
 #: src/dirname.c:64
 #, c-format
@@ -3365,24 +3902,28 @@ msgid ""
 "  %s dir1/str dir2/str  -> \"dir1\" followed by \"dir2\"\n"
 "  %s stdio.h            -> \".\"\n"
 msgstr ""
+"\n"
+"Eksempler:\n"
+"  %s /usr/bin/          -> «/usr»\n"
+"  %s dir1/str dir2/str  -> «dir1» etterfulgt av «dir2»\n"
+"  %s stdio.h            -> «.»\n"
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
-#, fuzzy, c-format
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
 "  or:  %s [OPTION]... --files0-from=F\n"
 msgstr ""
-"Bruk:      %s [FLAGG]... [FIL]...\n"
-"  eller:   %s --traditional [FIL] [[+]POSISJON [[+]MERKE]]\n"
+"Bruk: %s [VALG] … [FIL] …\n"
+"  eller: %s [VALG] … --files0-from=F\n"
 
-#: src/du.c:274
+#: src/du.c:285
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
-msgstr ""
+msgstr "Oppsummer diskplassen som hver FIL tar (rekursivt for mapper).\n"
 
-#: src/du.c:280
+#: src/du.c:291
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3390,12 +3931,19 @@ msgid ""
 "                          larger due to holes in ('sparse') files, internal\n"
 "                          fragmentation, indirect blocks, and the like\n"
 msgstr ""
+"  -0, --null            avslutt hver utskriftslinje med 0 byte, i stedet for "
+"linjeskift\n"
+"  -a, --all             vis størrelsen på alle filer, ikke bare mapper\n"
+"      --apparent-size   skriv ut tilsynelatende størrelser\n"
+"                          (selv om denne verdien ofte er mindre, kan den\n"
+"                          også være større for hullete filer, ved intern\n"
+"                          fragmentering, indirekte blokker, og lignende)\n"
 
-#: src/du.c:289
+#: src/du.c:300
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3406,35 +3954,67 @@ msgid ""
 "                          line argument;  --max-depth=0 is the same as\n"
 "                          --summarize\n"
 msgstr ""
-
-#: src/du.c:302
-msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"  -B, --block-size=STØRR  skaler størrelser etter valgt STØRR før de skrives "
+"ut.\n"
+"                           «-BM» skriver f.eks. ut i 1 048 576 byte-"
+"enheter.\n"
+"                           Les mer om STØRRelsesformat nedenfor.\n"
+"  -b, --bytes           tilsvarer «--apparent-size --block-size=1»\n"
+"  -c, --total           regn ut en totalsum\n"
+"  -D, --dereference-args  følg bare symbolske lenker hvis de er\n"
+"                          valgt på kommandolinja\n"
+"  -d, --max-depth=N     skriv ut totalsum for en mappe (eller fil med «--"
+"all»)\n"
+"                          kun hvis den er N eller færre nivå under "
+"kommandolinje-argumentet\n"
+"                          («--max-depth=0» tilsvarer --summarize)\n"
+
+#: src/du.c:313
+msgid ""
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
+"      --files0-from=F   summer plassbruk for tomrom-avsluttede filnavn som\n"
+"                          er spesifisert i fila F\n"
+"                          (navn leses fra standardinndata hvis F er «-»)\n"
+"  -H                    tilsvarer «--dereference-args» og «-D»\n"
+"  -h, --human-readable  skriv ut størrelser i menneskelig lesbart format (f."
+"eks. 1K 234M 2G)\n"
+"      --inodes          vis inode-bruksinformasjon i stedet for blokkbruk\n"
 
-#: src/du.c:310
+#: src/du.c:322
 msgid ""
 "  -k                    like --block-size=1K\n"
 "  -L, --dereference     dereference all symbolic links\n"
 "  -l, --count-links     count sizes many times if hard linked\n"
 "  -m                    like --block-size=1M\n"
 msgstr ""
+"  -k                    tilsvarer «--block-size=1K»\n"
+"  -L, --dereference     følg alle symbolske lenker\n"
+"  -l, --count-links     beregn størrelser mange ganger for harde lenker\n"
+"  -m                    tilsvarer «--block-size=1M»\n"
 
-#: src/du.c:316
+#: src/du.c:328
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
+"  -P, --no-dereference  ikke følg symbolske lenker (dette er standard)\n"
+"  -S, --separate-dirs   ikke ta med størrelser på undermapper\n"
+"      --si              ligner «-h», men regner enheter i 1000 i stedet for "
+"1024\n"
+"  -s, --summarize       bare vis en totalsum for hvert argument\n"
 
-#: src/du.c:322
+#: src/du.c:334
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
 "                          or entries greater than SIZE if negative\n"
@@ -3443,99 +4023,116 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
-msgstr ""
-
-#: src/du.c:333
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
+msgstr ""
+"  -t, --threshold=STØRR  utelat oppføringer som er mindre enn valgt "
+"STØRRelse\n"
+"                          hvis verdien er positiv, eller større hvis STØRR "
+"er negativ\n"
+"      --time            vis tidspunkt for forrige endring av filer i mappa, "
+"eller undermapper\n"
+"      --time=ORD       vis tid av typen ORD, i stedet for "
+"endringstidspunkt:\n"
+"                          «atime», «access», «use», «ctime» eller «status»\n"
+"      --time-style=STIL  vis tider med angitt STIL:\n"
+"                          «full-iso», «long-iso», «iso» eller +FORMAT\n"
+"                          FORMAT tolkes som i programmet «date»\n"
+
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
 "  -x, --one-file-system    skip directories on different file systems\n"
 msgstr ""
+"  -X, --exclude-from=FIL  utelat filer som samsvarer med et mønster i FIL\n"
+"      --exclude=MØNSTER    utelat filer som samsvarer med MØNSTER\n"
+"  -x, --one-file-system    hopp over mapper på ulike filsystemer\n"
 
-#: src/du.c:386
+#: src/du.c:398
 msgid "Infinity"
-msgstr ""
+msgstr "Uendelighet"
 
-#: src/du.c:507
+#: src/du.c:636
 #, c-format
-msgid "mount point %s already traversed"
-msgstr ""
-
-#: src/du.c:624
-#, fuzzy, c-format
 msgid "fts_read failed: %s"
-msgstr "feil ved lesing"
+msgstr "fts_read mislykket. %s"
 
-#: src/du.c:780
-#, fuzzy, c-format
+#: src/du.c:787
+#, c-format
 msgid "invalid maximum depth %s"
-msgstr "ugyldig bredde: «%s»"
+msgstr "maksimaldybden «%s» er ugyldig"
 
-#: src/du.c:809
-#, fuzzy, c-format
+#: src/du.c:816
+#, c-format
 msgid "invalid --threshold argument '-0'"
-msgstr "ugyldig argument %s for %s"
+msgstr "argumentet «-0» er ugyldig for «--threshold»"
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
-msgstr ""
+msgstr "du kan ikke både summere og vise alle oppføringer"
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
-msgstr ""
+msgstr "advarsel: valget «--max-depth=0» tilsvarer «-s»"
 
-#: src/du.c:900
+#: src/du.c:911
 #, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
+msgstr "advarsel: konflikt mellom summering og valget «--max-depth=%lu»"
+
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
 msgstr ""
+"advarsel: valgene «--apparent-size» og «-b» er ugyldige når også «--inodes» "
+"er valgt"
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 msgid "file operands cannot be combined with --files0-from"
-msgstr ""
+msgstr "Du kan ikke kombinere filparametre med «--files0-from»"
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr "%s: lesefeil"
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr ""
+"du kan ikke bruke filnavn som %s når filnavn leses fra standard innkanal"
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
-#, fuzzy
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 msgid "invalid zero-length file name"
-msgstr "ugyldig gruppe"
+msgstr "filnavn med null i lengde er ugyldig"
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr "totalt"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/echo.c:26
 msgid "Brian Fox"
-msgstr ""
+msgstr "Brian Fox"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/echo.c:27
 msgid "Chet Ramey"
-msgstr ""
+msgstr "Chet Ramey"
 
 #: src/echo.c:41
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s [SHORT-OPTION]... [STRING]...\n"
 "  or:  %s LONG-OPTION\n"
 msgstr ""
-"Bruk:  %s [FIL]...\n"
-"eller: %s [FLAGG]\n"
+"Bruk: %s [KORT-VALG] … [STRENG] …\n"
+"  eller: %s LANGT-VALG\n"
 
 #: src/echo.c:45
 msgid ""
@@ -3543,18 +4140,25 @@ msgid ""
 "\n"
 "  -n             do not output the trailing newline\n"
 msgstr ""
+"Gjenta STRENG(er) til standard utdata.\n"
+"\n"
+"  -n             ikke avslutt siste linje med linjeskift\n"
 
 #: src/echo.c:51
 msgid ""
 "  -e             enable interpretation of backslash escapes (default)\n"
 "  -E             disable interpretation of backslash escapes\n"
 msgstr ""
+"  -e             slå på tolkning av skiftetegn (standard)\n"
+"  -E             slå av tolkning av skiftetegn\n"
 
 #: src/echo.c:54
 msgid ""
 "  -e             enable interpretation of backslash escapes\n"
 "  -E             disable interpretation of backslash escapes (default)\n"
 msgstr ""
+"  -e             slå på tolkning av skiftetegn\n"
+"  -E             slå av tolkning av skiftetegn (standard)\n"
 
 #: src/echo.c:60
 msgid ""
@@ -3562,6 +4166,9 @@ msgid ""
 "If -e is in effect, the following sequences are recognized:\n"
 "\n"
 msgstr ""
+"\n"
+"Følgende skiftesekvenser er gyldige hvis du velger «-e»:\n"
+"\n"
 
 #: src/echo.c:65 src/printf.c:105
 msgid ""
@@ -3576,75 +4183,93 @@ msgid ""
 "  \\t      horizontal tab\n"
 "  \\v      vertical tab\n"
 msgstr ""
+"  \\\\      speilvendt skråstrek\n"
+"  \\a      alarm (BEL)\n"
+"  \\b      visk ut\n"
+"  \\c      ikke skriv ut noe mer\n"
+"  \\e      escape\n"
+"  \\f      form feed\n"
+"  \\n      ny linje\n"
+"  \\r      linjeskift\n"
+"  \\t      horisontal tabulator\n"
+"  \\v      vertikal tabulator\n"
 
 #: src/echo.c:77
 msgid ""
 "  \\0NNN   byte with octal value NNN (1 to 3 digits)\n"
 "  \\xHH    byte with hexadecimal value HH (1 to 2 digits)\n"
 msgstr ""
+"  \\0NNN   byte med oktal verdi NNN (1 til 3 siffer)\n"
+"  \\xHH    byte med heksadesimal verdi HH (1 til 2 siffer)\n"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/env.c:32 src/printenv.c:45 src/whoami.c:35
-#, fuzzy
 msgid "Richard Mlynarik"
-msgstr "Richard Stallman og David MacKenzie"
+msgstr "Richard Mlynarik"
 
 #: src/env.c:52
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n"
-msgstr "Bruk: %s [FLAGG]... [FIL]...\n"
+msgstr "Bruk: %s [VALG] … [-] [NAVN=VERDI] … [KOMMANDO [ARG] …]\n"
 
 #: src/env.c:55
 msgid "Set each NAME to VALUE in the environment and run COMMAND.\n"
-msgstr ""
+msgstr "Gi en VERDI til hvert NAVN i mijøet, og kjør KOMMANDO.\n"
 
 #: src/env.c:61
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
+"  -i, --ignore-environment  start med et tomt miljø\n"
+"  -0, --null           avslutt hver utskriftslinje med 0 byte i stedet for "
+"linjeskift\n"
+"  -u, --unset=NAVN     fjern NAVNgitt variabel fra miljøet\n"
 
 #: src/env.c:68
 msgid ""
 "\n"
 "A mere - implies -i.  If no COMMAND, print the resulting environment.\n"
 msgstr ""
+"\n"
+"En ren «-» betyr implisitt «-i».  Hvis ingen KOMMANDO er valgt, skrives "
+"gjeldende miljø ut.\n"
 
 #: src/env.c:124
-#, fuzzy, c-format
+#, c-format
 msgid "cannot unset %s"
-msgstr "kan ikke utføre ioctl på «%s»"
+msgstr "klarte ikke å fjerne «%s»"
 
 #: src/env.c:135
-#, fuzzy, c-format
+#, c-format
 msgid "cannot set %s"
-msgstr "kan ikke opprette katalog %s"
+msgstr "klarte ikke å gi «%s» en verdi"
 
 #: src/env.c:152
 #, c-format
 msgid "cannot specify --null (-0) with command"
-msgstr ""
+msgstr "«--null» (-0) kan ikke velges med kommando"
 
 #: src/expand.c:107
-#, fuzzy
 msgid ""
 "Convert tabs in each FILE to spaces, writing to standard output.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
-"Konverter tabulatorer i hver FIL til mellomrom, skriv til standard ut.\n"
-"Dersom ingen FIL er spesifisert, eller FIL er -, leses det fra standard "
-"inn.\n"
-"\n"
+"Konverter tabulatorer til mellomrom i FIL(er), og skriv resultatet til "
+"standard utdata.\n"
+"Hvis ingen FIL er valgt, eller hvis FIL er «-», leser programmet standard "
+"inndata.\n"
 
 #: src/expand.c:114
-#, fuzzy
 msgid ""
 "  -i, --initial       do not convert tabs after non blanks\n"
 "  -t, --tabs=NUMBER   have tabs NUMBER characters apart, not 8\n"
 msgstr ""
-"  -i, --initial       ikke konverter tabulatorer etter ikke-blanke tegn\n"
-"  -t, --tabs=TALL     ha tabulatorer TALL tegn fra hverandre, ikke 8\n"
+"  -i, --initial       ikke konverter tabulatorer etter første ikke-"
+"mellomrom\n"
+"  -t, --tabs=ANTALL   sett inn tabulatorer angitt ANTALL tegn fra hverandre "
+"(8 er standard)\n"
 
 #: src/expand.c:118
 msgid ""
@@ -3652,19 +4277,19 @@ msgid ""
 msgstr "  -t, --tabs=LISTE    bruk komma-separert LISTE med tab-posisjoner\n"
 
 #: src/expand.c:171 src/unexpand.c:190
-#, fuzzy, c-format
+#, c-format
 msgid "tab stop is too large %s"
-msgstr "%s er for stor"
+msgstr "tabulatorlengden %s er for stor"
 
 #: src/expand.c:179 src/unexpand.c:198
-#, fuzzy, c-format
+#, c-format
 msgid "tab size contains invalid character(s): %s"
-msgstr "tabulatorstørrelse inneholder et ugyldig tegn"
+msgstr "tabulatorstørrelsen «%s» inneholder ugyldig(e) tegn"
 
 #: src/expand.c:205 src/unexpand.c:224
 #, c-format
 msgid "tab size cannot be 0"
-msgstr "tabulatorstørrelse kan ikke være 0"
+msgstr "tabulatorstørrelsen kan ikke være 0"
 
 #: src/expand.c:207 src/unexpand.c:226
 #, c-format
@@ -3672,30 +4297,30 @@ msgid "tab sizes must be ascending"
 msgstr "tabulatorstørrelser må være stigende"
 
 #: src/expand.c:325 src/expand.c:344 src/unexpand.c:373 src/unexpand.c:418
-#, fuzzy, c-format
+#, c-format
 msgid "input line is too long"
-msgstr "%s: fil for lang"
+msgstr "inndatalinje er for lang"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
-msgstr ""
+msgstr "Mike Parker"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
-msgstr ""
+msgstr "James Youngman"
 
-#: src/expr.c:203
-#, fuzzy, c-format
+#: src/expr.c:202
+#, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
 "  or:  %s OPTION\n"
 msgstr ""
-"Bruk:  %s [FIL]...\n"
-"eller: %s [FLAGG]\n"
+"Bruk:  %s UTRYKK\n"
+"  eller: %s VALG\n"
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -3705,8 +4330,16 @@ msgid ""
 "\n"
 "  ARG1 & ARG2       ARG1 if neither argument is null or 0, otherwise 0\n"
 msgstr ""
+"\n"
+"Skriv ut verdien av UTTRYKK til standard utdata. En tom linje under skiller\n"
+"grupper med økende presedens.  UTTRYKK kan være:\n"
+"\n"
+"  ARG1 | ARG2       ARG1 hvis den hverken er null eller 0. Ellers ARG2.\n"
+"\n"
+"  ARG1 & ARG2       ARG1 hvis ingen av argumentene er null eller 0. Ellers "
+"0.\n"
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -3716,15 +4349,25 @@ msgid ""
 "  ARG1 >= ARG2      ARG1 is greater than or equal to ARG2\n"
 "  ARG1 > ARG2       ARG1 is greater than ARG2\n"
 msgstr ""
+"\n"
+"  ARG1 < ARG2       ARG1 er mindre enn ARG2\n"
+"  ARG1 <= ARG2      ARG1 er mindre enn eller lik ARG2\n"
+"  ARG1 = ARG2       ARG1 er lik ARG2\n"
+"  ARG1 != ARG2      ARG1 er ulik ARG2\n"
+"  ARG1 >= ARG2      ARG1 er større enn eller lik ARG2\n"
+"  ARG1 > ARG2       ARG1 er større enn ARG2\n"
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
 "  ARG1 - ARG2       arithmetic difference of ARG1 and ARG2\n"
 msgstr ""
+"\n"
+"  ARG1 + ARG2       den aritmetiske summen mellom ARG1 og ARG2\n"
+"  ARG1 - ARG2       den aritmetiske differansen mellom ARG1 og ARG2\n"
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -3732,8 +4375,12 @@ msgid ""
 "  ARG1 / ARG2       arithmetic quotient of ARG1 divided by ARG2\n"
 "  ARG1 % ARG2       arithmetic remainder of ARG1 divided by ARG2\n"
 msgstr ""
+"\n"
+"  ARG1 * ARG2       det aritmetiske produktet av ARG1 og ARG2\n"
+"  ARG1 / ARG2       den aritmetiske kvotienten av ARG1 delt på ARG2\n"
+"  ARG1 % ARG2       den aritmetiske resten av ARG1 delt på ARG2\n"
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -3743,16 +4390,31 @@ msgid ""
 "  index STRING CHARS         index in STRING where any CHARS is found, or 0\n"
 "  length STRING              length of STRING\n"
 msgstr ""
+"\n"
+"  STRENG : REGEXP    forankret mønstersøk med REGEXP i STRENG\n"
+"\n"
+"  match STRENG REGEXP        samme som STRENG : REGEXP\n"
+"  substr STRENG POS LENGDE   delstreng av STRENG, POS teller fra 1\n"
+"  index STRENG TEGN          indeks i STRENG hvor man finner et av tegnene "
+"i \n"
+"                               TEGN, eller 0\n"
+"  length STRENG              lengden av STRENG\n"
 
-#: src/expr.c:251
+#: src/expr.c:250
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
 "                               keyword like 'match' or an operator like '/'\n"
 "\n"
 "  ( EXPRESSION )             value of EXPRESSION\n"
 msgstr ""
+"  + SYMBOL                    tolk SYMBOL som en tekststreng, også hvis den "
+"er et\n"
+"                               nøkkelord, som f.eks. «match», eller en "
+"operatør som «/»\n"
+"\n"
+"  ( UTTRYKK )             verdi av UTTRYKK\n"
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -3761,147 +4423,164 @@ msgid ""
 "\\( and \\) are not used, they return the number of characters matched or "
 "0.\n"
 msgstr ""
+"\n"
+"Vær oppmerksom på at mange operatører må vernes eller siteres for skall.\n"
+"Sammenligninger er aritmetiske hvis begge ARG er tall, ellers "
+"leksikografisk.\n"
+"Treff på mønster returnerer strengen mellom \\( og \\) eller null. Hvis\n"
+"\\( og \\) ikke er brukt, returneres antall tegn som passet mønsteret, eller "
+"0.\n"
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
 "null\n"
 "or 0, 2 if EXPRESSION is syntactically invalid, and 3 if an error occurred.\n"
 msgstr ""
+"\n"
+"Avslutningskode er 0 hvis UTTRYKK verken er null eller 0, 1 hvis UTTRYKK "
+"er \n"
+"null eller 0, 2 hvis UTTRYKK er syntaktisk ugyldig, og 3 hvis en feil "
+"oppstår.\n"
 
-#: src/expr.c:278
-#, fuzzy, c-format
+#: src/expr.c:277
+#, c-format
 msgid "syntax error"
-msgstr "standard feilkanal"
+msgstr "syntaksfeil"
 
-#: src/expr.c:599 src/ptx.c:283
-#, fuzzy, c-format
+#: src/expr.c:591 src/ptx.c:284
+#, c-format
 msgid "error in regular expression matcher"
-msgstr "feil i søk med regulært uttrykk"
+msgstr "feil i regulæruttrykk-utlikning"
 
-#: src/expr.c:791 src/expr.c:828
-#, fuzzy, c-format
+#: src/expr.c:783 src/expr.c:820
+#, c-format
 msgid "non-integer argument"
-msgstr "begrens argument"
+msgstr "du har brukt et argument som ikke er heltall"
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
-msgstr ""
+msgstr "du har forsøkt å dele på null"
 
-#: src/expr.c:887 src/sort.c:2044
-#, fuzzy, c-format
+#: src/expr.c:879 src/sort.c:2077
+#, c-format
 msgid "set LC_ALL='C' to work around the problem"
-msgstr "Sett LC_ALL='C' for å omgå problemet."
+msgstr "bruk miljøvariabel «LC_ALL='C'» for å omgå problemet"
 
-#: src/expr.c:889
-#, fuzzy, c-format
+#: src/expr.c:881
+#, c-format
 msgid "the strings compared were %s and %s"
-msgstr "Strengene som ble sammenlignet var «%s» og «%s»."
+msgstr "tekststrengene som ble sammenlignet var «%s» og «%s»"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/factor.c:111
 msgid "Niels Moller"
-msgstr ""
+msgstr "Niels Moller"
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
-msgstr ""
+msgstr "Feil under Lucas-primærtest. Dette skal ikke skje"
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
-msgstr ""
+msgstr "squfof-køen er full"
 
-#: src/factor.c:2419
-#, fuzzy, c-format
+#: src/factor.c:2403
+#, c-format
 msgid "%s is not a valid positive integer"
-msgstr "%s: ugyldig mønster"
+msgstr "%s er ikke et gyldig positivt heltall"
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
-msgstr "%s er for stor"
+msgstr "%s er for stort"
 
-#: src/factor.c:2454
-#, fuzzy, c-format
+#: src/factor.c:2438
+#, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
 "  or:  %s OPTION\n"
 msgstr ""
-"Bruk:  %s [FIL]...\n"
-"eller: %s [FLAGG]\n"
+"Bruk:  %s [TALL] …\n"
+"eller: %s VALG\n"
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
 "are specified on the command line, read them from standard input.\n"
 "\n"
 msgstr ""
+"Skriv ut primtallet for hvert spesifiserte helTALL.\n"
+"Hvis ingen tall står spesifisert på kommandolinjen, leser programmet fra "
+"standard inndata.\n"
+"\n"
 
 #: src/find-mount-point.c:40
-#, fuzzy, c-format
+#, c-format
 msgid "cannot get current directory"
-msgstr "kan ikke opprette katalog %s"
+msgstr "klarte ikke å hente gjeldende mappe"
 
 #: src/find-mount-point.c:50 src/find-mount-point.c:64
 #: src/find-mount-point.c:92
-#, fuzzy, c-format
+#, c-format
 msgid "cannot change to directory %s"
-msgstr "kan ikke skifte til katalog, %s"
+msgstr "klarte ikke å bytte til mappa «%s»"
 
 #: src/find-mount-point.c:70
-#, fuzzy, c-format
+#, c-format
 msgid "cannot stat current directory (now %s)"
-msgstr "kan ikke opprette katalog %s"
+msgstr "klarte ikke å hente informasjon om gjeldende mappe («%s»)"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/fmt.c:38
 msgid "Ross Paterson"
-msgstr ""
+msgstr "Ross Paterson"
 
 #: src/fmt.c:270
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n"
-msgstr "Bruk: %s [-SIFFER] [FLAGG]... [FIL]...\n"
+msgstr "Bruk: %s [-BREDDE] [VALG] … [FIL] …\n"
 
 #: src/fmt.c:271
-#, fuzzy
 msgid ""
 "Reformat each paragraph in the FILE(s), writing to standard output.\n"
 "The option -WIDTH is an abbreviated form of --width=DIGITS.\n"
 msgstr ""
-"Omformattér hvert avsnitt i FILEN(e), skriv til standard ut.\n"
-"Dersom ingen FIL er spesifisert, eller FIL er -, leses det fra standard "
-"inn.\n"
+"Omformater hvert avsnitt i FIL(ene), og skriv ut resultatet til "
+"standardutdata.\n"
+"Valget -BREDDE er en forkortet vairant av «--width=TALL».\n"
 
 #: src/fmt.c:278
-#, fuzzy
 msgid ""
 "  -c, --crown-margin        preserve indentation of first two lines\n"
 "  -p, --prefix=STRING       reformat only lines beginning with STRING,\n"
 "                              reattaching the prefix to reformatted lines\n"
 "  -s, --split-only          split long lines, but do not refill\n"
 msgstr ""
-"  -c, --crown-margin        behold innrykket til de første to linjene\n"
-"  -p, --prefix=STRENG       sett kun sammen linjer som har STRENG som\n"
-"                            forstavelse\n"
-"  -s, --split-only          del opp lange linjer, men ikke fyll opp\n"
+"  -c, --crown-margin        bevar innrykkene på de to første linjene\n"
+"  -p, --prefix=STRENG       bare omformater linjer som begynner med STRENG\n"
+"                              og legg til prefikset igjen på de "
+"omformaterte\n"
+"                              linjene\n"
+"  -s, --split-only          del opp lange linjer, men ikke fyll igjen\n"
 
 #: src/fmt.c:287
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "  -t, --tagged-paragraph    indentation of first line different from second\n"
 "  -u, --uniform-spacing     one space between words, two after sentences\n"
 "  -w, --width=WIDTH         maximum line width (default of 75 columns)\n"
 "  -g, --goal=WIDTH          goal width (default of 93% of width)\n"
 msgstr ""
-"  -t, --tagged-paragraph    innrykket til første linje er forskjellig fra "
-"neste\n"
-"  -u, --uniform-spacing     ett mellomrom mellom ord, to etter setninger\n"
-"  -w, --width=TALL          maksimal linjelengde (ellers 75 kolonner)\n"
+"  -t, --tagged-paragraph    første linje skal ha annet innrykk enn andre "
+"linje\n"
+"  -u, --uniform-spacing     ett mellomrom mellom ord, to mellom setninger\n"
+"  -w, --width=BREDDE        maks linjebredde (standard er 75 kolonner)\n"
+"  -g, --goal=BREDDE         målbredde (standard er 93% av hele bredden)\n"
 
 #: src/fmt.c:359
 #, c-format
@@ -3909,20 +4588,22 @@ msgid ""
 "invalid option -- %c; -WIDTH is recognized only when it is the first\n"
 "option; use -w N instead"
 msgstr ""
+"valget «-- %c» er ugyldig. «-BREDDE» kjennes bare igjen som første\n"
+"valg i kommandoen. Bruk «-w N» i stedet"
 
 #: src/fmt.c:405 src/fmt.c:416
-#, fuzzy, c-format
+#, c-format
 msgid "invalid width: %s"
-msgstr "ugyldig bredde: «%s»"
+msgstr "«%s» er en ugyldig bredde"
 
 #: src/fold.c:70
-#, fuzzy
 msgid ""
 "Wrap input lines in each FILE (standard input by default), writing to\n"
 "standard output.\n"
 msgstr ""
-"Brekk om linjene i hver FIL (standard inn), skriv til standard ut\n"
-"\n"
+"Pakk sammen inndatalinjer i FIL (eller standardinndata hvis FIL ikke er "
+"valgt),\n"
+"og skriv ut resultatet til standardutdata.\n"
 
 #: src/fold.c:77
 msgid ""
@@ -3930,51 +4611,54 @@ msgid ""
 "  -s, --spaces        break at spaces\n"
 "  -w, --width=WIDTH   use WIDTH columns instead of 80\n"
 msgstr ""
-"  -b, --bytes         tell bytes istedet for kolonner\n"
-"  -s, --spaces        brekk om ved mellomrom\n"
-"  -w, --width=BREDDE  bruk BREDDE kolonner istedet for 80\n"
+"  -b, --bytes         tell byte i stedet for kolonner\n"
+"  -s, --spaces        bryt ved mellomrom\n"
+"  -w, --width=BREDDE  bruk BREDDE antall kolonner i stedet for 80\n"
 
 #: src/fold.c:288 src/pr.c:832
-#, fuzzy, c-format
+#, c-format
 msgid "invalid number of columns: %s"
-msgstr "ugyldig antall kolonner: «%s»"
+msgstr "«%s» er et ugyldig kolonneantall"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
-msgstr ""
+msgstr "Padraig Brady"
 
-#: src/getlimits.c:65
-#, fuzzy, c-format
+#: src/getlimits.c:66
+#, c-format
 msgid "Usage: %s\n"
-msgstr "Bruk: %s [FLAGG] [FIL]...\n"
+msgstr "Bruk: %s\n"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
 msgstr ""
+"Skriv ut plattformavhengige begrensninger i et format som kan brukes i "
+"skallskript.\n"
+"\n"
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
-#, fuzzy, c-format
+#: src/group-list.c:69 src/id.c:412
+#, c-format
 msgid "failed to get groups for user %s"
-msgstr "kan ikke endre rettigheter til %s"
+msgstr "klarte ikke å hente grupper for brukeren %s"
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, c-format
 msgid "failed to get groups for the current process"
-msgstr ""
+msgstr "klarte ikke å hente grupper for gjeldende prosess"
 
 #: src/group-list.c:114
-#, fuzzy, c-format
+#, c-format
 msgid "cannot find name for group ID %lu"
-msgstr "kan ikke endre eier og/eller gruppe for %s"
+msgstr "finner ikke navn på gruppa med gruppe-ID %lu"
 
 #: src/groups.c:53
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: %s [OPTION]... [USERNAME]...\n"
-msgstr "Bruk: %s [FLAGG]... SETT1 [SETT2]\n"
+msgstr "Bruk: %s [VALG] … [BRUKERNAVN] …\n"
 
 #: src/groups.c:54
 msgid ""
@@ -3982,39 +4666,41 @@ msgid ""
 "for\n"
 "the current process (which may differ if the groups database has changed).\n"
 msgstr ""
+"Skriv ut gruppemedlemskap for hvert BRUKERNAVN, eller, hvis BRUKERNAVN ikke "
+"er oppgitt,\n"
+"for den gjeldende prosessen (kan avvike hvis gruppedatabasen er endret).\n"
 
-#: src/groups.c:105 src/id.c:233
-#, fuzzy, c-format
+#: src/groups.c:105 src/id.c:274
+#, c-format
 msgid "cannot get real UID"
-msgstr "kan ikke utelate både bruker og gruppe"
+msgstr "klarte ikke å hente reell UID"
 
-#: src/groups.c:110 src/id.c:241
-#, fuzzy, c-format
+#: src/groups.c:110 src/id.c:282
+#, c-format
 msgid "cannot get effective GID"
-msgstr "kan ikke opprette katalog %s"
+msgstr "klarte ikke å hente effektiv GID"
 
-#: src/groups.c:115 src/id.c:246
-#, fuzzy, c-format
+#: src/groups.c:115 src/id.c:287
+#, c-format
 msgid "cannot get real GID"
-msgstr "kan ikke utelate både bruker og gruppe"
+msgstr "klarte ikke å hente reell GID"
 
-#: src/groups.c:128 src/id.c:206
-#, fuzzy, c-format
+#: src/groups.c:128 src/id.c:246
+#, c-format
 msgid "%s: no such user"
-msgstr "%s: ugyldig nummer"
+msgstr "brukeren «%s» finnes ikke"
 
 #: src/head.c:109
-#, fuzzy
 msgid ""
 "Print the first 10 lines of each FILE to standard output.\n"
 "With more than one FILE, precede each with a header giving the file name.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
-"Skriv de første 10 linjene av hver FIL til standard ut.\n"
-"Med mer enn en FIL er angitt, skriv ut filnavnet før hver FIL.\n"
-"Dersom ingen FIL er spesifisert, eller FIL er -, leses det fra standard "
-"inn.\n"
-"\n"
+"Skriv ut de første 10 linjene i hver FIL til standardutdata.\n"
+"Hvis flere enn én FIL behandles, lages det en overskrift per fil med "
+"filnavnet.\n"
+"Hvis ingen FIL er valgt, eller hvis FIL er «-», leser programmet standard "
+"inndata.\n"
 
 #: src/head.c:117
 msgid ""
@@ -4025,14 +4711,21 @@ msgid ""
 "                             with the leading '-', print all but the last\n"
 "                             K lines of each file\n"
 msgstr ""
+"  -c, --bytes=[-]K         skriv ut de første K antall byte fra hver fil\n"
+"                             (ved bruk av «-» vises alle byte unntatt de\n"
+"                             siste K antall fra hver fil)\n"
+"  -n, --lines=[-]K         skriv ut de første K antall linjene i stedet for "
+"de første 10\n"
+"                             (ved bruk av «-» vises alle linjer unntatt de\n"
+"                             siste K antall fra hver fil)\n"
 
 #: src/head.c:125
 msgid ""
 "  -q, --quiet, --silent    never print headers giving file names\n"
 "  -v, --verbose            always print headers giving file names\n"
 msgstr ""
-"  -q, --quiet, --silent    ikke skriv ut filnavnene først\n"
-"  -v, --verbose            skriv alltid filnavnene først\n"
+"  -q, --quiet, --silent    ikke ta med filnavn i toppen\n"
+"  -v, --verbose            ta med filnavn i toppen uansett type inndata\n"
 
 #: src/head.c:131
 msgid ""
@@ -4041,62 +4734,56 @@ msgid ""
 "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
 "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n"
 msgstr ""
+"\n"
+"K kan brukes med et multiplikasjonssuffiks, f.eks. slik:\n"
+"b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
+"GB 1000*1000*1000, G 1024*1024*1024, og så videre for T, P, E, Z, Y.\n"
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
-msgstr ""
+msgstr "fila «%s» har krympet for mye"
 
-#: src/head.c:227 src/head.c:1051
-#, fuzzy, c-format
+#: src/head.c:237 src/head.c:1052
+#, c-format
 msgid "%s: number of bytes is too large"
-msgstr "ugyldig antall oktetter å sammenligne"
-
-#: src/head.c:440
-#, fuzzy, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr "%s: kan ikke søke til relativ posisjon %s%s"
+msgstr "%s: for mange byte"
 
-#: src/head.c:612 src/head.c:691 src/tail.c:449
-#, fuzzy, c-format
+#: src/head.c:422 src/tail.c:453
+#, c-format
 msgid "%s: cannot seek to offset %s"
-msgstr "%s: kan ikke søke til posisjon %s%s"
+msgstr "%s: klarte ikke å søke til posisjon %s"
 
-#: src/head.c:673
-#, fuzzy, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "%s: fil for lang"
-
-#: src/head.c:798
-#, fuzzy, c-format
-msgid "cannot reposition file pointer for %s"
-msgstr "kan ikke opprette katalog %s"
+#: src/head.c:423 src/tail.c:457
+#, c-format
+msgid "%s: cannot seek to relative offset %s"
+msgstr "%s: fant ikke frem til relativ posisjon %s"
 
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
-msgstr "%s: %s er så stor at den ikke kan representeres"
+msgstr "%s: «%s» er så stor at den ikke kan vises"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr "antall linjer"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
-msgstr "antall bytes"
+msgstr "antall byte"
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr "ugyldig antall linjer"
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
-msgstr "ugyldig antall bytes"
+msgstr "ugyldig antall byte"
 
-#: src/head.c:981 src/head.c:1039
-#, fuzzy, c-format
+#: src/head.c:982 src/head.c:1040
+#, c-format
 msgid "invalid trailing option -- %c"
-msgstr "%s: ukjent flagg -- %c\n"
+msgstr "avsluttende valg -- «%c» er ugyldig"
 
 #: src/hostid.c:42
 #, c-format
@@ -4105,6 +4792,10 @@ msgid ""
 "Print the numeric identifier (in hexadecimal) for the current host.\n"
 "\n"
 msgstr ""
+"Bruk: %s [VALG]\n"
+"Skriv ut den numeriske identiteten (i heksadesimaler) for gjeldende "
+"vertsmaskin.\n"
+"\n"
 
 #: src/hostname.c:56
 #, c-format
@@ -4114,173 +4805,210 @@ msgid ""
 "Print or set the hostname of the current system.\n"
 "\n"
 msgstr ""
+"Bruk:  %s [NAVN]\n"
+"eller: %s VALG\n"
+"Skriv ut eller endre vertsnavnet på gjeldende system.\n"
+"\n"
 
 #: src/hostname.c:94
-#, fuzzy, c-format
+#, c-format
 msgid "cannot set name to %s"
-msgstr "kan ikke utføre ioctl på «%s»"
+msgstr "klarte ikke å endre navn til «%s»"
 
 #: src/hostname.c:97
 #, c-format
 msgid "cannot set hostname; this system lacks the functionality"
-msgstr ""
+msgstr "klarte ikke å endre vertsnavn fordi systemet mangler denne funksjonen"
 
 #: src/hostname.c:105
 #, c-format
 msgid "cannot determine hostname"
-msgstr ""
+msgstr "klarte ikke å finne vertsnavn"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
-msgstr ""
+msgstr "Arnold Robbins"
 
-#: src/id.c:81
-#, fuzzy, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
-msgstr "Bruk: %s [FLAGG]... SETT1 [SETT2]\n"
+#: src/id.c:84
+#, c-format
+msgid "Usage: %s [OPTION]... [USER]\n"
+msgstr "Bruk: %s [VALG] … [BRUKER]\n"
 
-#: src/id.c:82
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
+"\n"
+msgstr ""
+"Skriv ut bruker- og gruppeinformasjon for valgt BRUKER,\n"
+"eller - når BRUKER utelates - for gjeldende bruker.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
+
+#: src/id.c:90
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
 msgstr ""
+"  -a              ignoreres (kun for kompatiblitet med tidligere versjoner)\n"
+"  -Z, --context   bare skriv ut sikkerhetskontekst for gjeldende bruker\n"
+"  -g, --group     bare skriv ut effektiv gruppe-ID\n"
+"  -G, --groups    skriv ut alle gruppe-ID-er\n"
+"  -n, --name      skriv ut et navn i stedet for et nummer (gjelder -ugG)\n"
+"  -r, --real      skriv ut reell ID i stedet for effektiv ID (gjelder -ugG)\n"
+"  -u, --user      bare skriv ut effektiv bruker-ID\n"
 
-#: src/id.c:96
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
 msgstr ""
+"\n"
+"Hvis ingenting er VALGt, skriver programmet ut nyttig "
+"identitetsinformasjon.\n"
 
-#: src/id.c:140
+#: src/id.c:151
 #, c-format
-msgid "--context (-Z) works only on an SELinux-enabled kernel"
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
 msgstr ""
+"valget «--context» («-Z») fungerer bare på SELinux-/SMACK-aktiverte kjerner"
+
+#: src/id.c:156
+#, c-format
+msgid "--context (-Z) works only on an SELinux-enabled kernel"
+msgstr "valget «--context» («-Z») fungerer bare på SELinux-aktiverte kjerner"
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr ""
+"du kan ikke skrive ut sikkerhetskontekst når du velger en bestemt bruker"
 
-#: src/id.c:178
-#, fuzzy, c-format
+#: src/id.c:198
+#, c-format
 msgid "cannot print \"only\" of more than one choice"
-msgstr "kan ikke dele opp på mer enn én måte"
+msgstr "du kan ikke bruke flere «bare skriv ut»-valg på én gang"
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
-msgstr ""
+msgstr "du kan ikke bare skrive ut navn eller reelle ID-er i standardformat"
+
+#: src/id.c:209
+#, c-format
+msgid "option --zero not permitted in default format"
+msgstr "valget «--zero» tillates ikke i standardformat"
 
-#: src/id.c:199
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
-msgstr ""
+msgstr "klarte ikke å hente prosesskontekst"
 
-#: src/id.c:224
-#, fuzzy, c-format
+#: src/id.c:265
+#, c-format
 msgid "cannot get effective UID"
-msgstr "kan ikke opprette katalog %s"
+msgstr "klarte ikke å hente effektiv UID"
 
-#: src/id.c:311
-#, fuzzy, c-format
+#: src/id.c:354
+#, c-format
 msgid "cannot find name for user ID %s"
-msgstr "kan ikke endre eier og/eller gruppe for %s"
+msgstr "fant ikke navn på bruker med ID %s"
 
-#: src/id.c:329
+#: src/id.c:372
 #, c-format
 msgid "uid=%s"
-msgstr ""
+msgstr "uid=%s"
 
-#: src/id.c:334
+#: src/id.c:377
 #, c-format
 msgid " gid=%s"
-msgstr ""
+msgstr " gid=%s"
 
-#: src/id.c:341
+#: src/id.c:384
 #, c-format
 msgid " euid=%s"
-msgstr ""
+msgstr " euid=%s"
 
-#: src/id.c:349
+#: src/id.c:392
 #, c-format
 msgid " egid=%s"
-msgstr ""
+msgstr " egid=%s"
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
-msgstr ""
+msgstr " grupper="
 
-#: src/id.c:393
+#: src/id.c:437
 #, c-format
 msgid " context=%s"
-msgstr ""
+msgstr " kontekst=%s"
 
-#: src/install.c:373
-#, fuzzy, c-format
+#: src/install.c:376
+#, c-format
 msgid "warning: %s: failed to change context to %s"
-msgstr "kan ikke opprette katalog %s"
+msgstr "advarsel: %s: klarte ikke å bytte kontekst til «%s»"
 
-#: src/install.c:414
-#, fuzzy, c-format
+#: src/install.c:417
+#, c-format
 msgid "creating directory %s"
-msgstr "kan ikke opprette katalog %s"
+msgstr "oppretter mappa «%s»"
 
-#: src/install.c:482
-#, fuzzy, c-format
+#: src/install.c:485
+#, c-format
 msgid "cannot change ownership of %s"
-msgstr "kan ikke endre rettigheter til %s"
+msgstr "klarte ikke å endre eier av «%s»"
 
-#: src/install.c:506
-#, fuzzy, c-format
+#: src/install.c:509
+#, c-format
 msgid "cannot set time stamps for %s"
-msgstr "kan ikke opprette katalog %s"
+msgstr "klarte ikke å gi «%s» et tidsstempel"
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
-#, fuzzy, c-format
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
+#, c-format
 msgid "fork system call failed"
-msgstr "blokkstørrelse"
+msgstr "systemkallet «fork» mislyktes"
 
-#: src/install.c:531
-#, fuzzy, c-format
+#: src/install.c:535
+#, c-format
 msgid "cannot run %s"
-msgstr "kan ikke utføre ioctl på «%s»"
+msgstr "klarte ikke å kjøre «%s»"
 
-#: src/install.c:535
-#, fuzzy, c-format
+#: src/install.c:539
+#, c-format
 msgid "waiting for strip"
-msgstr "feil ved skriving til %s"
+msgstr "venter på «strip»"
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
-msgstr ""
+msgstr "«strip»-prosessen avsluttet på en unormal måte"
 
-#: src/install.c:558
-#, fuzzy, c-format
+#: src/install.c:565
+#, c-format
 msgid "invalid user %s"
-msgstr "ugyldig bruker"
+msgstr "«%s» er en ugyldig bruker"
 
-#: src/install.c:594
-#, fuzzy, c-format
+#: src/install.c:601
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
 "  or:  %s [OPTION]... SOURCE... DIRECTORY\n"
 "  or:  %s [OPTION]... -t DIRECTORY SOURCE...\n"
 "  or:  %s [OPTION]... -d DIRECTORY...\n"
 msgstr ""
-"Bruk : %s [FLAGG]... [INN]... (uten -G)\n"
-"eller: %s -G [FLAGG]... [INN [UT]]\n"
+"Bruk:  %s [VALG] … [-T] KILDE MÅL\n"
+"eller: %s [VALG] … KILDE … MAPPE\n"
+"eller: %s [VALG] … -t MAPPE KILDE …\n"
+"eller: %s [VALG] … -d MAPPE …\n"
 
-#: src/install.c:601
+#: src/install.c:608
 msgid ""
 "\n"
 "This install program copies files (often just compiled) into destination\n"
@@ -4293,8 +5021,17 @@ msgid ""
 "the existing DIRECTORY, while setting permission modes and owner/group.\n"
 "In the 4th form, create all components of the given DIRECTORY(ies).\n"
 msgstr ""
+"\n"
+"Dette installasjonsprogrammet kopierer filer (gjerne nykompilerte) til\n"
+"valgt(e) mål. Hvis du vil laste ned og installere en programpakke som\n"
+"er klar til bruk på et GNU/Linux-system, bør du bruke et pakkeverktøy\n"
+"som yum(1) eller apt-get(1) i stedet.\n"
+"\n"
+"Med de tre første metodene kopieres KILDE til MÅL, eller flere KILDE(r) til\n"
+"eksisterende MAPPE, mens tillatelser og (gruppe-)eierskap stilles inn.\n"
+"Med den fjerde metoden opprettes alle komponentene i angitt(e) MAPPE(r).\n"
 
-#: src/install.c:615
+#: src/install.c:622
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
 "  -b                  like --backup but does not accept an argument\n"
@@ -4305,8 +5042,18 @@ msgid ""
 "  -d, --directory     treat all arguments as directory names; create all\n"
 "                        components of the specified directories\n"
 msgstr ""
+"      --backup[=CONTROL]  lag en sikkerhetskopi av filer i målmappa som "
+"eksisterer allerede\n"
+"  -b                  fungerer som --backup, men kan ikke brukes med "
+"argumenter\n"
+"  -c                  (ignoreres)\n"
+"  -C, --compare       sammenlign kilde- og målfiler, og\n"
+"                        ikke endre målet i det hele tatt i enkelte "
+"tilfeller\n"
+"  -d, --directory     behandle alle argumenter som mappenavn.\n"
+"                        Lag alle komponenter i de spesifiserte mappene\n"
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -4317,8 +5064,16 @@ msgid ""
 "x\n"
 "  -o, --owner=OWNER   set ownership (super-user only)\n"
 msgstr ""
+"  -D                  opprett alle ledende komponentene av MÃ…L bortsett "
+"fra \n"
+"                        den siste, og kopier deretter KILDE til MÃ…L\n"
+"  -g, --group=GRUPPE  velg gruppeeierskap istedenfor prosessens gjeldende "
+"gruppe\n"
+"  -m, --mode=MODUS     velg rettighetsmodus (som med chmod), i stedet for "
+"«rwxr-xr-x»\n"
+"  -o, --owner=EIER    velg eier (kun for superbruker)\n"
 
-#: src/install.c:631
+#: src/install.c:638
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
 "files\n"
@@ -4331,75 +5086,94 @@ msgid ""
 "  -T, --no-target-directory  treat DEST as a normal file\n"
 "  -v, --verbose       print the name of each directory as it is created\n"
 msgstr ""
+"  -p, --preserve-timestamps   skriv tilgangs- og/eller endringstidspunktet "
+"fra KILDEfiler\n"
+"                        til respektive målfiler\n"
+"  -s, --strip         tøm symboltabeller\n"
+"      --strip-program=PROGRAM  program som skal brukes til å tømme "
+"binærfiler\n"
+"  -S, --suffix=SUFFIX  overstyr normal suffiks for sikkerhetskopier\n"
+"  -t, --target-directory=DIRECTORY  kopier alle KILDEargumenter til MAPPA\n"
+"  -T, --no-target-directory  behandle MÃ…L som en normal fil\n"
+"  -v, --verbose       skriv ut navnet på hver mappe etterhvert som de "
+"opprettes\n"
 
-#: src/install.c:641
+#: src/install.c:648
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
+"      --preserve-context  bevar SELinux-sikkerhetskontekst\n"
+"  -Z                      gi målfila standard type SELinux-"
+"sikkerhetskontekst\n"
+"      --context[=CTX]     velg CTX som SELinux- eller SMACK-"
+"sikkerhetskontekst\n"
+"                            (tilsvarer «-Z» hvis CTX ikke er angitt)\n"
 
-#: src/install.c:859
+#: src/install.c:696 src/unlink.c:86
 #, c-format
-msgid ""
-"WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
-msgstr ""
+msgid "cannot unlink %s"
+msgstr "klarte ikke å fjerne lenke til «%s»"
 
-#: src/install.c:869
+#: src/install.c:877
 #, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
+msgid ""
+"WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
 msgstr ""
+"ADVARSEL: «--preserve-context» ignoreres, fordi kjernen du kjører på ikke er "
+"klargjort for SELinux"
 
-#: src/install.c:886
+#: src/install.c:917
 #, c-format
 msgid "the strip option may not be used when installing a directory"
-msgstr ""
+msgstr "«strip»-valget kan ikke brukes ved installasjon av mapper"
 
-#: src/install.c:889
-#, fuzzy, c-format
+#: src/install.c:920
+#, c-format
 msgid "target directory not allowed when installing a directory"
-msgstr "%s eksisterer men er ikke en katalog"
+msgstr "du kan ikke velge målmappe når du installerer en mappe"
 
-#: src/install.c:893
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr ""
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
-#, fuzzy, c-format
 msgid "invalid mode %s"
-msgstr "ugyldig bredde: «%s»"
+msgstr "«%s» er en ugyldig modus"
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr ""
+"ADVARSEL: «--strip-program»-valget ignoreres, fordi du ikke har valgt «-s»"
 
-#: src/install.c:959
-#, fuzzy, c-format
+#: src/install.c:1001
+#, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
-msgstr "flaggene --string og --check kan ikke brukes samtidig"
+msgstr ""
+"du kan ikke både velge «--compare» («-C») og «--preserve-timestamps» på én "
+"gang"
 
-#: src/install.c:966
-#, fuzzy, c-format
+#: src/install.c:1008
+#, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
-msgstr "flaggene --string og --check kan ikke brukes samtidig"
+msgstr "du kan ikke både velge «--compare» («-C») og «--strip» på én gang"
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
 "permission bits"
 msgstr ""
+"valget «--compare» («-C») ignoreres når du velger en modus uten "
+"tillatelsesbiter"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/join.c:40 src/sort.c:66
-#, fuzzy
 msgid "Mike Haertel"
-msgstr "Mike Haertel og Paul Eggert"
+msgstr "Mike Haertel"
 
-#: src/join.c:191
-#, fuzzy
+#: src/join.c:195
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
 "standard output.  The default join field is the first, delimited\n"
@@ -4409,31 +5183,30 @@ msgid ""
 "                      FILENUM is 1 or 2, corresponding to FILE1 or FILE2\n"
 "  -e EMPTY          replace missing input fields with EMPTY\n"
 msgstr ""
-"For hvert par av inn-linjer med like sammenføyningsfelt, skriv en linje til\n"
-"standard ut. Det forvalgte sammenføyningsfeltet er det første\n"
-"feltet, avgrenset av «blanke» tegn. Dersom FIL1 eller FIL2 (ikke begge)\n"
-"er -, leses det fra standard inn.\n"
+"Skriv én linje til standardutdata for hvert inndata-linjepar som inneholder\n"
+"identiske sammenføyningsfelter. Første sammenføyningsfelt er\n"
+"standardfelt, og avsluttes med tomrom. NÃ¥r FIL1 eller FIL2 (ikke begge)\n"
+"er «-», leser programmet fra standard inndata.\n"
 "\n"
-"  -a SIDE           skriv ut linjer som ikke kan parres som fra fil SIDE\n"
-"  -e TOM            erstatt manglende inn-felt med TOM\n"
+"  -a FILNUM        skriv også ut ikke-kombinerbare linjer fra fila FILNUM,\n"
+"                      der FILNUM er 1 or 2 og korresponderer med FIL1 eller "
+"FIL2\n"
+"  -e TOM          erstatt manglende inndatafelter med TOM\n"
 
-#: src/join.c:200
-#, fuzzy
+#: src/join.c:204
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
 "  -j FIELD          equivalent to '-1 FIELD -2 FIELD'\n"
 "  -o FORMAT         obey FORMAT while constructing output line\n"
 "  -t CHAR           use CHAR as input and output field separator\n"
 msgstr ""
-"  -i, --ignore-case ignorer forskjeller i store/små bokstaver ved\n"
-"                    sammenligning av felt\n"
-"  -j FELT           (avleggs) samme som «-1 FELT -2 FELT»\n"
-"  -j1 FELT          (avleggs) samme som «-1 FELT»\n"
-"  -j2 FELT          (avleggs) samme som «-2 FELT»\n"
-"  -o FORMAT         følg FORMAT når utlinjen lages\n"
-"  -t TEGN           bruk TEGN som feltseparator for inn og ut\n"
+"  -i, --ignore-case  ignorer forskjell på store og små bokstaver når felter "
+"sammenlignes\n"
+"  -j FELT          tilsvarer «-1 FELT -2 FELT»\n"
+"  -o FORMAT         bruk FORMAT ved oppbygging av utskriftslinje\n"
+"  -t TEGN           bruk TEGN som skilletegn mellom inn- og utskriftsfelt\n"
 
-#: src/join.c:206
+#: src/join.c:210
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
 "  -1 FIELD          join on this FIELD of file 1\n"
@@ -4444,9 +5217,23 @@ msgid ""
 "  --header          treat the first line in each file as field headers,\n"
 "                      print them without trying to pair them\n"
 msgstr ""
+"  -v FILNUM        likner «-a FILNUM», men tar ikke med sammenføyde "
+"utskriftslinjer\n"
+"  -1 FELT          sammenføyning på dette feltet i fil 1\n"
+"  -2 FELT          sammenføyning på dette feltet i fil 1\n"
+"  --check-order     kontroller at inndata er sortert korrekt,\n"
+"                       selv når alle inndatalinjer kan sammenkobles\n"
+"  --nocheck-order   ikke kontroller at inndata er sortert korrekt\n"
+"  --header          behandle første linje i hver fil som felthoder,\n"
+"                      og ikke forsøk å sammenkoble dem når de skrives ut\n"
+
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr ""
+"  -z, --zero-terminated     skill mellom linjer med NUL i stedet for "
+"linjeskift\n"
 
-#: src/join.c:218
-#, fuzzy
+#: src/join.c:225
 msgid ""
 "\n"
 "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n"
@@ -4465,58 +5252,69 @@ msgid ""
 "warning message will be given.\n"
 msgstr ""
 "\n"
-"Dersom -t TEGN ikke er angitt, er «ledende blanke» feltseparator, og "
-"ignoreres,\n"
-"ellers er felt skilt av TEGN. Hvert FELT er et feltnummer telt fra 1.\n"
-"FORMAT er en eller flere komma- eller blank-separerte spesifikasjoner, der\n"
-"hver er «SIDE.FELT» eller «0». Det forvalgte FORMATet skriver ut\n"
-"sammenføyningsfeltet, resten av feltene fra FIL1 og resten av feltene fra\n"
-"FIL2, alle skilt med TEGN.\n"
+"Skillende felt i form av tomrom blir ignorert, med mindre du bruker -t "
+"TEGN.\n"
+"I sistnevnte tilfelle skilles felt fra hverandre med TEGN.  Alle FELT har et "
+"nummer,\n"
+"og telles fra 1.  FORMAT er én eller flere spesifikasjoner, adskilt med "
+"komma\n"
+"eller mellomrom. Hver av dem skal være enten 'FILNUM.FELT', eller '0'.\n"
+"Standard-FORMAT skriver ut sammenføyningsfeltet, gjenstående felter\n"
+"i fil FIL1, og gjenstående felter i FIL2. Disse holdes adskilt med TEGN.\n"
+"Hvis FORMAT er nøkkelordet «auto», avgjøres antall felt per linje\n"
+"av første linje i hver FIL.\n"
+"\n"
+"Merk: FIL1 og FIL2 må sorteres i sammenføyningsfeltene.\n"
+"Bruk f.eks. «sort -k 1b,1» hvis «join» ikke har noen valg,\n"
+"eller «join -t » hvis «sort» ikke har noen valg.\n"
+"Sammenligninger gjøres i henhold til regler som angis av «LC_COLLATE».\n"
+"Hvis datakilden is er sortert, og enkelte linjer ikke kan sammenføyes,\n"
+"gir programmet en advarsel.\n"
 
-#: src/join.c:403
+#: src/join.c:410
 #, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
-msgstr ""
+msgstr "%s:%<PRIuMAX>: er ikke sortert: %.*s"
 
-#: src/join.c:840 src/join.c:1038
-#, fuzzy, c-format
+#: src/join.c:847 src/join.c:1045
+#, c-format
 msgid "invalid field number: %s"
-msgstr "ugyldig felt-nummer: «%s»"
+msgstr "«%s» er et ugyldig feltnummer"
 
-#: src/join.c:861 src/join.c:870
-#, fuzzy, c-format
+#: src/join.c:868 src/join.c:877
+#, c-format
 msgid "invalid field specifier: %s"
-msgstr "ugyldig felt-spesifikator: «%s»"
+msgstr "«%s» er en ugyldig feltspesifikasjon"
 
-#: src/join.c:877
-#, fuzzy, c-format
+#: src/join.c:884
+#, c-format
 msgid "invalid file number in field spec: %s"
-msgstr "ugyldig filnummer i felt-spesifikator: «%s»"
+msgstr "«%s» er et ugyldig filnummer feltspesifikasjon"
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
-msgstr ""
+msgstr "sammenføyningsfelt «%lu» og «%lu» er uforenlige"
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
-msgstr ""
+msgstr "strenger for tomme felt er i konflikt med hverandre"
 
-#: src/join.c:1101 src/sort.c:4468
-#, fuzzy, c-format
+#: src/join.c:1108 src/sort.c:4509
+#, c-format
 msgid "multi-character tab %s"
-msgstr "flertegnstabulator «%s»"
+msgstr "tabulator «%s» består av flere tegn"
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
-msgstr ""
+msgstr "uforenlige tabulatorer"
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
-msgstr "begge filene kan ikke være standard inn"
+msgstr "du kan ikke velge begge filene som standard inndata"
 
 #: src/kill.c:76
 #, c-format
@@ -4525,10 +5323,13 @@ msgid ""
 "  or:  %s -l [SIGNAL]...\n"
 "  or:  %s -t [SIGNAL]...\n"
 msgstr ""
+"Bruk:  %s [-s SIGNAL | -SIGNAL] PID …\n"
+"eller: %s -l [SIGNAL] …\n"
+"eller: %s -t [SIGNAL] …\n"
 
 #: src/kill.c:82
 msgid "Send signals to processes, or list signals.\n"
-msgstr ""
+msgstr "Send signaler til prosesser, eller vis tilgjengelige signaler.\n"
 
 #: src/kill.c:88
 msgid ""
@@ -4538,6 +5339,10 @@ msgid ""
 "numbers\n"
 "  -t, --table      print a table of signal information\n"
 msgstr ""
+"  -s, --signal=SIGNAL, -SIGNAL\n"
+"                   velg navn eller nummer på signalet som skal sendes\n"
+"  -l, --list       vis signalnavn eller konverterer signalnavn til/fra tall\n"
+"  -t, --table      skriv ut en tabell med informasjon om signaler\n"
 
 #: src/kill.c:96
 msgid ""
@@ -4546,118 +5351,127 @@ msgid ""
 "or the exit status of a process terminated by a signal.\n"
 "PID is an integer; if negative it identifies a process group.\n"
 msgstr ""
+"\n"
+"SIGNAL kan være et signanavn, som f.eks. «HUP», et signalnummer, som f.eks. "
+"«1»,\n"
+"eller avslutningsstatus fra en prosess som stoppes av et signal.\n"
+"«PID» er et heltall. Hvis tallet er negativt, betegner det en "
+"prosessgruppe.\n"
 
 #: src/kill.c:205
-#, fuzzy, c-format
+#, c-format
 msgid "%s: invalid process id"
-msgstr "%s: ugyldig mønster"
+msgstr "%s: ugyldig prosess-ID"
 
 #: src/kill.c:259
-#, fuzzy, c-format
+#, c-format
 msgid "invalid option -- %c"
-msgstr "%s: ukjent flagg -- %c\n"
+msgstr "valget «-- %c» er ugyldig"
 
 #: src/kill.c:268
 #, c-format
 msgid "%s: multiple signals specified"
-msgstr ""
+msgstr "%s: flere signal er valgt"
 
 #: src/kill.c:282
 #, c-format
 msgid "multiple -l or -t options specified"
-msgstr ""
+msgstr "du har brukt flere «-l»- og/eller «-t»-valg på én gang"
 
 #: src/kill.c:299
 #, c-format
 msgid "cannot combine signal with -l or -t"
-msgstr ""
+msgstr "du kan ikke kombinere signaler med «-l» eller «-t»"
 
 #: src/kill.c:305
 #, c-format
 msgid "no process ID specified"
-msgstr ""
+msgstr "ingen prosess-ID valgt"
 
 #: src/libstdbuf.c:109
 #, c-format
 msgid "failed to allocate a %<PRIuMAX> byte stdio buffer\n"
-msgstr ""
+msgstr "klarte ikke å tildele et stdio-mellomlager på %<PRIuMAX>\n"
 
 #: src/libstdbuf.c:116
-#, fuzzy, c-format
+#, c-format
 msgid "invalid buffering mode %s for %s\n"
-msgstr "ugyldig argument %s for %s"
+msgstr "mellomlagermodus «%s» er ugyldig for «%s»\n"
 
 #: src/libstdbuf.c:124
 #, c-format
 msgid "could not set buffering of %s to mode %s\n"
-msgstr ""
+msgstr "klarte ikke å endre mellomlagermodus for «%s» til «%s»\n"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/link.c:36 src/unlink.c:36 src/who.c:50
 msgid "Michael Stone"
-msgstr ""
+msgstr "Michael Stone"
 
 #: src/link.c:45
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s FILE1 FILE2\n"
 "  or:  %s OPTION\n"
 msgstr ""
-"Bruk:  %s [FIL]...\n"
-"eller: %s [FLAGG]\n"
+"Bruk:  %s FIL1 FIL2\n"
+"eller: %s VALG\n"
 
 #: src/link.c:48
 msgid ""
 "Call the link function to create a link named FILE2 to an existing FILE1.\n"
 "\n"
 msgstr ""
+"Kall «link»-funksjonen for å opprette en lenke med navn FIL2 til en\n"
+"eksisterende FIL1\n"
+"\n"
 
 #: src/link.c:90
-#, fuzzy, c-format
+#, c-format
 msgid "cannot create link %s to %s"
-msgstr "kan ikke opprette katalog %s"
+msgstr "klarte ikke å opprette en lenke fra «%s» til «%s»"
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
-msgstr ""
+msgstr "%s: harde lenker er ikke tillatt med mapper som mål"
 
-#: src/ln.c:255
-#, fuzzy, c-format
+#: src/ln.c:271
+#, c-format
 msgid "%s: cannot overwrite directory"
-msgstr "kan ikke opprette katalog %s"
+msgstr "%s: klarte ikke å overskrive mappa"
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
-msgstr ""
+msgstr "%s: vil du erstatte %s? "
 
-#: src/ln.c:345
-#, fuzzy, c-format
+#: src/ln.c:362
+#, c-format
 msgid "failed to create symbolic link %s"
-msgstr "kan ikke opprette katalog %s"
+msgstr "klarte ikke å lage den symbolske lenka «%s»"
 
-#: src/ln.c:346
-#, fuzzy, c-format
+#: src/ln.c:363
+#, c-format
 msgid "failed to create symbolic link %s -> %s"
-msgstr "kan ikke opprette katalog %s"
+msgstr "klarte ikke å lage den symbolske lenka «%s» -> «%s»"
 
-#: src/ln.c:348
-#, fuzzy, c-format
+#: src/ln.c:365
+#, c-format
 msgid "failed to create hard link to %.0s%s"
-msgstr "kan ikke opprette katalog %s"
+msgstr "klarte ikke å lage hard lenke til %.0s%s"
 
-#: src/ln.c:351
-#, fuzzy, c-format
+#: src/ln.c:368
+#, c-format
 msgid "failed to create hard link %s"
-msgstr "kan ikke opprette katalog %s"
+msgstr "klarte ikke å lage hard lenke «%s»"
 
-#: src/ln.c:352
-#, fuzzy, c-format
+#: src/ln.c:369
+#, c-format
 msgid "failed to create hard link %s => %s"
-msgstr "kan ikke opprette katalog %s"
+msgstr "klarte ikke å lage hard lenke «%s» => «%s»"
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -4665,8 +5479,12 @@ msgid ""
 "  or:  %s [OPTION]... TARGET... DIRECTORY     (3rd form)\n"
 "  or:  %s [OPTION]... -t DIRECTORY TARGET...  (4th form)\n"
 msgstr ""
+"Bruk:  %s [VALG] … [-T] MÅL LENKENAVN        (første metode)\n"
+"eller: %s [VALG] … MÅL                       (andre metode)\n"
+"eller: %s [VALG] … MÅL … MAPPE            (tredje metode)\n"
+"eller: %s [VALG] … -t MAPPE MÅL …         (fjerde metode)\n"
 
-#: src/ln.c:381
+#: src/ln.c:398
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
 "In the 2nd form, create a link to TARGET in the current directory.\n"
@@ -4677,8 +5495,17 @@ msgid ""
 "can hold arbitrary text; if later resolved, a relative link is\n"
 "interpreted in relation to its parent directory.\n"
 msgstr ""
+"Med 1. metode lages det en lenke til MÃ…Let med navnet LENKENAVN.\n"
+"Med 2. metode lages det en lenke til MÃ…Let i gjeldende mappe.\n"
+"Med 3. og 4. metode lages lenker til hvert MÃ…L i MAPPa.\n"
+"Programmet lager harde lenker som standard, og symbolske lenker med «--"
+"symbolic».\n"
+"Målfiler (navn på nye lenker) skal ikke eksistere allerede. \n"
+"Hvert MÅL må eksistere for harde lenker. Symbolske lenker\n"
+"kan inneholde vilkårlig tekst. Hvis sistnevnte blir en gyldig lenke senere,\n"
+"tolkes en relativ lenke ut i fra foreldermappa.\n"
 
-#: src/ln.c:394
+#: src/ln.c:411
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
 "file\n"
@@ -4690,8 +5517,16 @@ msgid ""
 "superuser)\n"
 "  -f, --force                 remove existing destination files\n"
 msgstr ""
+"      --backup[=KONTROLL]     opprett en sikkerhetskopi for hver målfil\n"
+"  -b                          som --backup, men godtar ikke argumenter\n"
+"  -d, -F, --directory         tillat superbrukeren å lage faste lenker\n"
+"                                til mapper (obs: dette vil sannsynligvis gå "
+"galt pga.\n"
+"                                systemrestriksjoner, selv for "
+"superbrukeren)\n"
+"  -f, --force                 fjern eksisterende målfiler\n"
 
-#: src/ln.c:402
+#: src/ln.c:419
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
 "  -L, --logical               dereference TARGETs that are symbolic links\n"
@@ -4702,8 +5537,17 @@ msgid ""
 "location\n"
 "  -s, --symbolic              make symbolic links instead of hard links\n"
 msgstr ""
+"  -i, --interactive           spør brukeren om målfiler skal fjernes\n"
+"  -L, --logical               følg symbolske lenker i MÅLfiler\n"
+"  -n, --no-dereference        behandle LENKENAVN som en normal fil\n"
+"                                hvis den er symbolsk og peker til en mappe\n"
+"  -P, --physical              lag harde lenker som peker direkte til "
+"symbolske lenker\n"
+"  -r, --relative              lag symbolske lenker ut i fra lenkeplassering\n"
+"  -s, --symbolic              lag symbolske lenker i stedet for harde "
+"lenker\n"
 
-#: src/ln.c:411
+#: src/ln.c:428
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
 "  -t, --target-directory=DIRECTORY  specify the DIRECTORY in which to "
@@ -4712,157 +5556,170 @@ msgid ""
 "  -T, --no-target-directory   treat LINK_NAME as a normal file always\n"
 "  -v, --verbose               print name of each linked file\n"
 msgstr ""
+"  -S, --suffix=SUFFIKS         overstyr standard sikkerhetskopi-suffiks\n"
+"  -t, --target-directory=MAPPE  velg hvor lenkene skal legges\n"
+"  -T, --no-target-directory   behandle alltid LINK_NAME som en normal fil\n"
+"  -v, --verbose               skriv ut navn på hver lenkede fil\n"
 
-#: src/ln.c:433
+#: src/ln.c:450
 #, c-format
 msgid ""
 "\n"
 "Using -s ignores -L and -P.  Otherwise, the last option specified controls\n"
 "behavior when a TARGET is a symbolic link, defaulting to %s.\n"
 msgstr ""
+"\n"
+"Ved bruk av «-s», ignoreres evt. valgene «-L» og «-P». Ellers, når MÅL er en "
+"symbolsk lenke, \n"
+"kjører programmet i henhold til det sist brukte valget med «%s» som "
+"standard.\n"
 
-#: src/ln.c:554
-#, fuzzy, c-format
+#: src/ln.c:571
+#, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
-msgstr "%s eksisterer men er ikke en katalog"
+msgstr "du kan ikke velge både «--target-directory» og «--no-target-directory»"
 
-#: src/ln.c:588
-#, fuzzy, c-format
+#: src/ln.c:605
+#, c-format
 msgid "cannot do --relative without --symbolic"
-msgstr "kan ikke opprette katalog %s"
+msgstr "du kan ikke velge «--relative» uten å bruke «--symbolic»"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/logname.c:30
 msgid "FIXME: unknown"
-msgstr ""
+msgstr "FIXME: ukjent"
 
 #: src/logname.c:39 src/sync.c:40
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: %s [OPTION]\n"
-msgstr "Bruk: %s [FLAGG] [FIL]...\n"
+msgstr "Bruk: %s [VALG]\n"
 
 #: src/logname.c:40
 msgid ""
 "Print the name of the current user.\n"
 "\n"
 msgstr ""
+"Skriv ut navnet på gjeldende bruker.\n"
+"\n"
 
 #: src/logname.c:84
-#, fuzzy, c-format
+#, c-format
 msgid "no login name"
-msgstr "%s: ugyldig nummer"
+msgstr "intet brukernavn"
 
 #. TRANSLATORS: ls output needs to be aligned for ease of reading,
 #. so be wary of using variable width fields from the locale.
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
-#, fuzzy
+#: src/ls.c:734
 msgid "%b %e  %Y"
-msgstr "%b %e %H:%M %Y"
+msgstr "%b %e  %Y"
 
 #. TRANSLATORS: ls output needs to be aligned for ease of reading,
 #. so be wary of using variable width fields from the locale.
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
-#, fuzzy
+#: src/ls.c:747
 msgid "%b %e %H:%M"
-msgstr "%b %e %H:%M %Y"
+msgstr "%b %e %H:%M"
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr ""
+"verdien «%s» er ugyldig for miljøvariabelen «QUOTING_STYLE», og ignoreres"
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
-msgstr ""
+msgstr "bredden «%s» er ugyldig for miljøvariabelen «COLUMNS», og ignoreres"
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr ""
+"tabulatorlengden «%s» er ugyldig for miljøvariabelen «TABSIZE», og ignoreres"
 
-#: src/ls.c:1750 src/ptx.c:1975
-#, fuzzy, c-format
+#: src/ls.c:1760 src/ptx.c:1978
+#, c-format
 msgid "invalid line width: %s"
-msgstr "ugyldig bredde: «%s»"
+msgstr "«%s» er en ugyldig linjebredde"
 
-#: src/ls.c:1824
-#, fuzzy, c-format
+#: src/ls.c:1834
+#, c-format
 msgid "invalid tab size: %s"
-msgstr "ugyldig type-streng «%s»"
+msgstr "«%s» er en ugyldig tabulatorlengde"
 
-#: src/ls.c:2033
-#, fuzzy, c-format
+#: src/ls.c:2043
+#, c-format
 msgid "invalid time style format %s"
-msgstr "ugyldig argument %s for %s"
+msgstr "«%s» er et ugyldig tidsformat"
 
-#: src/ls.c:2057
-#, fuzzy
+#: src/ls.c:2067
 msgid "Valid arguments are:\n"
-msgstr "Gyldige argument er:"
+msgstr "Følgende argumenter er gyldige:\n"
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
-msgstr ""
+msgstr "  - +FORMAT (f.eks. «+%H:%M») for å få et format à la «date»\n"
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
-msgstr ""
+msgstr "feil ved klargjøring av månedsstrenger"
 
-#: src/ls.c:2407
-#, fuzzy, c-format
+#: src/ls.c:2450
+#, c-format
 msgid "unrecognized prefix: %s"
-msgstr "ukjent flagg «-%c»"
+msgstr "prefikset «%s» er ukjent"
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
-msgstr ""
+msgstr "verdien av miljøvariablen «LS_COLORS» kan ikke tolkes"
 
-#: src/ls.c:2514 src/pwd.c:161
-#, fuzzy, c-format
+#: src/ls.c:2557 src/pwd.c:164
+#, c-format
 msgid "cannot open directory %s"
-msgstr "kan ikke opprette katalog %s"
+msgstr "klarte ikke å åpne mappa «%s»"
 
-#: src/ls.c:2529
-#, fuzzy, c-format
+#: src/ls.c:2572
+#, c-format
 msgid "cannot determine device and inode of %s"
-msgstr "kan ikke opprette katalog %s"
+msgstr "fant ikke enhet og inode for «%s»"
 
-#: src/ls.c:2538
-#, fuzzy, c-format
+#: src/ls.c:2581
+#, c-format
 msgid "%s: not listing already-listed directory"
-msgstr "kan ikke opprette katalog %s"
+msgstr "%s: lar være å vise en mappe som allerede ligger i lista"
 
-#: src/ls.c:2615 src/pwd.c:229
-#, fuzzy, c-format
+#: src/ls.c:2658 src/pwd.c:232
+#, c-format
 msgid "reading directory %s"
-msgstr "kan ikke opprette katalog %s"
+msgstr "leser mappa «%s»"
 
-#: src/ls.c:2630
-#, fuzzy, c-format
+#: src/ls.c:2673
+#, c-format
 msgid "closing directory %s"
-msgstr "kan ikke opprette katalog %s"
+msgstr "lukker mappa «%s»"
 
-#: src/ls.c:3302
-#, fuzzy, c-format
+#: src/ls.c:3362
+#, c-format
 msgid "cannot compare file names %s and %s"
-msgstr "Strengene som ble sammenlignet var «%s» og «%s»."
+msgstr "klarte ikke å sammenlikne filnavnene «%s» og «%s»"
 
-#: src/ls.c:4721
+#: src/ls.c:4781
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
 "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n"
 msgstr ""
+"Vis en liste over FILer (standard er å vise alle filer i gjeldende mappe).\n"
+"Oppføringene sorteres alfabetisk hvis ingen av valgene -cftuvSUX eller --"
+"sort brukes.\n"
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
 "  -A, --almost-all           do not list implied . and ..\n"
@@ -4870,34 +5727,60 @@ msgid ""
 "  -b, --escape               print C-style escapes for nongraphic "
 "characters\n"
 msgstr ""
+"  -a, --all                  ikke ignorer oppføringer som starter med .\n"
+"  -A, --almost-all           ikke ta med impliserte «.» og/eller «..»\n"
+"      --author               ved bruk sammen med «-l» inkluderes forfatter "
+"per fil\n"
+"  -b, --escape               skriv ut skiftetegn («escapes») i C-stil for "
+"ikke-grafiske tegn\n"
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
-
-#: src/ls.c:4744
+"      --block-size=STØRR      skaler størrelser etter valgt STØRRelsesenhet "
+"før de skrives ut.\n"
+"                               «--block-size=M» skriver f.eks. ut størrelser "
+"i\n"
+"                               1 048 576 byte-enheter. Les mer om "
+"STØRRELSEsformat nedenfor.\n"
+"  -B, --ignore-backups       ikke vis impliserte oppføringer med «~»\n"
+"  -c                         med «-lt»: sorter etter og vis «ctime»\n"
+"                               (tidspunkt for forrige endring av filstatus)\n"
+"                               med «-l»: vis «ctime», sorter etter navn.\n"
+"                               ellers: sorter etter «ctime», i aldrende "
+"rekkefølge.\n"
+
+#: src/ls.c:4804
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
+"  -C                         vis oppføringer i kolonner\n"
+"      --color[=NÃ…R]         fargelegg utskriften.  Standardverdien av NÃ…R er "
+"«always» (alltid).\n"
+"                               Den kan også være «never» (aldri) eller "
+"«auto».\n"
+"  -d, --directory            vis mappeoppføringer i stedet for innhold,\n"
+"                               og ikke følg symbolske lenkemål\n"
+"  -D, --dired                lag utskrift for Emacs-programmets «dired»-"
+"modus\n"
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
 "  -F, --classify             append indicator (one of */=>@|) to entries\n"
@@ -4906,41 +5789,71 @@ msgid ""
 "                               single-column -1, verbose -l, vertical -C\n"
 "      --full-time            like -l --time-style=full-iso\n"
 msgstr ""
+"  -f                         ikke sorter, slå på -aU, slå av -ls --color\n"
+"  -F, --classify             legg til indikator (ett av tegnene */=>@|) i "
+"oppføringer\n"
+"      --file-type            som ovenfor, bortsett fra at «*» ikke legges "
+"til\n"
+"      --format=ORD          på tvers -x, kommaer -m, horisontal -x, lang -"
+"l,\n"
+"                               enkeltkolonne -1, deltaljert -l, vertikal -C\n"
+"      --full-time            tilsvarer «-l --time-style=full-iso»\n"
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
-msgstr ""
+msgstr "  -g                         likner «-l», men ikke vis eier\n"
 
-#: src/ls.c:4763
+#: src/ls.c:4823
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
+"      --group-directories-first\n"
+"                             grupperer mapper før filer.\n"
+"                               Bruk gjerne sammen med et «--sort»-valg, men\n"
+"                               all bruk av «--sort=none (-U)» deaktiverer "
+"gruppering.\n"
 
-#: src/ls.c:4769
+#: src/ls.c:4829
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
+"  -G, --no-group             ikke vis gruppenavn i en oppføring som tar stor "
+"plass\n"
+"  -h, --human-readable       med «-l», viser størrelser i et "
+"menneskevennlig \n"
+"                               format (f.eks. 1K, 234M, 2G)\n"
+"      --si                   som over, men bruker 1000 som faktor i stedet "
+"for 1024\n"
 
-#: src/ls.c:4775
+#: src/ls.c:4835
 msgid ""
 "  -H, --dereference-command-line\n"
 "                             follow symbolic links listed on the command "
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
 msgstr ""
+"  -H, --dereference-command-line\n"
+"                             følg symbolske lenker som inngår på "
+"kommandolinja\n"
+"      --dereference-command-line-symlink-to-dir\n"
+"                             følg hver symbolsk lenke som inngår på\n"
+"                             kommandolinja og peker til en mappe \n"
+"      --hide=MØNSTER         ikke vis oppføringer som passer skall-MØNSTER\n"
+"                               (overstyres av -a eller -A)\n"
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
 "names:\n"
@@ -4949,10 +5862,17 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
+"      --indicator-style=ORD  legg til stil-ORD i navn:\n"
+"                               ingen (standard), skråstrek (-p),\n"
+"                               filtype (--file-type), klassifiser (-F)\n"
+"  -i, --inode                skriv ut indeksnummeret for hver fil\n"
+"  -I, --ignore=MØNSTER       ikke vis implikasjoner som samsvarer med "
+"MØNSTER\n"
+"  -k, --kibibytes            bruk 1024 byte-blokkformat som standard\n"
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -4961,8 +5881,12 @@ msgid ""
 "  -m                         fill width with a comma separated list of "
 "entries\n"
 msgstr ""
+"  -l                         bruk langt visningsformat\n"
+"  -L, --dereference          vis informasjon om symbolske lenkemål,\n"
+"                               i stedet for lenkene i seg selv\n"
+"  -m                         fyll bredde med en kommaseparert liste\n"
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -4972,82 +5896,139 @@ msgid ""
 "  -p, --indicator-style=slash\n"
 "                             append / indicator to directories\n"
 msgstr ""
+"  -n, --numeric-uid-gid      likner «-l», men viser numeriske bruker- og "
+"gruppe-IDer\n"
+"  -N, --literal              viser rå oppføringsnavn (ikke behandle f.eks.\n"
+"                               kontrolltegn spesielt)\n"
+"  -o                         som -l, men ikke vis gruppeinformasjon\n"
+"  -p, --indicator-style=slash\n"
+"                             legg til «/»-indikator i mappenavn\n"
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
 "                               literal, locale, shell, shell-always, c, "
 "escape\n"
 msgstr ""
+"  -q, --hide-control-chars   skriv ut «?» i stedet for ikke-grafiske tegn\n"
+"      --show-control-chars   vis ikke-grafiske tegn slik de er (standard,\n"
+"                             med mindre programmet er «ls» og utkanal er en "
+"terminal)\n"
+"  -Q, --quote-name           bruk doble anførselstegn på navn\n"
+"      --quoting-style=ORD   bruk anførselsstilen ORD på navn:\n"
+"                               «literal», «locale», «shell», «shell-always», "
+"«c», eller «escape»\n"
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
 "  -R, --recursive            list subdirectories recursively\n"
 "  -s, --size                 print the allocated size of each file, in "
 "blocks\n"
 msgstr ""
+"  -r, --reverse              sorter omvendt\n"
+"  -R, --recursive            vis alle undermapper\n"
+"  -s, --size                 skriv ut tidelt størrelse for hver fil, i "
+"blokker\n"
 
-#: src/ls.c:4825
+#: src/ls.c:4886
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
-msgstr ""
-
-#: src/ls.c:4835
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
+msgstr ""
+"  -S                         sorter etter filstørrelse\n"
+"      --sort=ORD             sorter etter ORD i stedet for navn: none -U,\n"
+"                             etternavn -X, størrelse -S, tid -t, versjon -v\n"
+"      --time=ORD             sammen med -l, viser tidspunkt som ORD i "
+"stedet\n"
+"                             for endringstid: tilg.tid -u, tilgang -u,\n"
+"                             bruk -u, ctid -c, eller status -c. Valgt tid\n"
+"                             brukes som sorteringsnøkkel hvis «--sort=time»\n"
+
+#: src/ls.c:4896
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
-msgstr ""
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
+msgstr ""
+"      --time-style=STIL     ved bruk av «-l» vises tider med spesifisert "
+"STIL:\n"
+"                             «full-iso», «long-iso», «iso», «locale», eller "
+"«+FORMAT».\n"
+"                             FORMAT tolkes som i programmet «date». Hvis "
+"FORMAT er\n"
+"                             «FORMAT1<ny linje>FORMAT2», gjelder FORMAT1 "
+"for\n"
+"                             ikke-nylige filer, og FORMAT2 for nylige "
+"filer.\n"
+"                             Hvis STIL starter med «posix-», gjelder STIL\n"
+"                             kun utenfor POSIX-lokaliteten.\n"
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 msgid ""
 "  -t                         sort by modification time, newest first\n"
 "  -T, --tabsize=COLS         assume tab stops at each COLS instead of 8\n"
 msgstr ""
+"  -t                         sorter etter endringstid, i synkende "
+"rekkefølge\n"
+"  -T, --tabsize=KOL         legg til grunn at fanen stopper ved oppgitt "
+"antall KOLonner i stedet for 8\n"
 
-#: src/ls.c:4848
+#: src/ls.c:4912
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
 msgstr ""
+"  -u                         ved bruk sammen med «-lt»: sorter etter og vis "
+"tilgangstid\n"
+"                               ved bruk sammen med «-l»: vis tilgangstid, og "
+"sorter etter navn\n"
+"                               ellers: sorter etter tilgangstid\n"
+"  -U                         vis oppføringer i henhold til mappetilhørighet, "
+"og ikke sorter for øvrig\n"
+"  -v                         sorter etter evt. versionsnummer i tekst\n"
 
-#: src/ls.c:4855
-#, fuzzy
+#: src/ls.c:4919
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
-"  -f, --fields=LISTE      skriv bare ut disse feltene.  Skriv også ut\n"
-"                            linjer som ikke inneholder noen skilletegn,\n"
-"                            med mindre flagget -s er spesifisert\n"
-"  -n                      (ignorert)\n"
+"  -w, --width=KOL           bruk valgt skjermbredde i stedet for gjeldende "
+"verdi\n"
+"  -x                         vis oppføringer etter linjer i stedet for "
+"kolonner\n"
+"  -X                         sorter etter filetternavn\n"
+"  -Z, --context              skriv evt. ut SELinux-sikkerhetskontekst for "
+"hver fil\n"
+"  -1                         vis én fil per linje\n"
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -5055,8 +6036,14 @@ msgid ""
 "standard output is connected to a terminal.  The LS_COLORS environment\n"
 "variable can change the settings.  Use the dircolors command to set it.\n"
 msgstr ""
+"\n"
+"Farger som indikerer filtyper er deaktivert, både som standard og hvis\n"
+"«--color=never» brukes.  ls gir bare fargekoder hvis du både bruker\n"
+"«--color=auto», og standardutdata er koblet til en terminal.  "
+"Miljøvariabelen\n"
+"LS_COLORS kan endre fargene.  Bruk kommandoen «dircolors» for å endre den.\n"
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -5064,90 +6051,97 @@ msgid ""
 " 1  if minor problems (e.g., cannot access subdirectory),\n"
 " 2  if serious trouble (e.g., cannot access command-line argument).\n"
 msgstr ""
+"\n"
+"Avslutningsstatus:\n"
+" 0  hvis OK,\n"
+" 1  ved små problemer (f.eks. manglende tilgang til en undermappe), eller\n"
+" 2  ved alvorlige problemer (f.eks. manglende tilgang til "
+"kommandoargument).\n"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/md5sum.c:94 src/seq.c:39
-#, fuzzy
 msgid "Ulrich Drepper"
-msgstr "Ulrich Drepper og Scott Miller"
+msgstr "Ulrich Drepper"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/md5sum.c:95
 msgid "Scott Miller"
-msgstr ""
+msgstr "Scott Miller"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/md5sum.c:96
 msgid "David Madore"
-msgstr ""
+msgstr "David Madore"
 
 #: src/md5sum.c:164
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
 "Print or check %s (%d-bit) checksums.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 "\n"
 msgstr ""
-"Bruk:  %s [FLAGG] [FIL]...\n"
-"eller: %s [FLAGG] --check [FIL]\n"
-"Skriv eller sjekk %s-sjekksummer (%d-bit).\n"
-"Dersom ingen FIL er spesifisert eller FIL er -, leses det fra standard inn.\n"
+"Bruk: %s [VALG] … [FIL] …\n"
+"Skriv ut eller kontroller %s- (%d-bit-) -kontrollsummer.\n"
+"Hvis ingen FIL er valgt, eller hvis FIL er «-», leser programmet standard "
+"inndata.\n"
+"\n"
 
 #: src/md5sum.c:174
 msgid ""
 "  -b, --binary         read in binary mode (default unless reading tty "
 "stdin)\n"
 msgstr ""
+"  -b, --binary         les i binærmodus (standard, med mindre standard "
+"inndata leses fra tty)\n"
 
 #: src/md5sum.c:178
-#, fuzzy
 msgid "  -b, --binary         read in binary mode\n"
-msgstr ""
-"\n"
-"  -B, --binary             skriv binært til konsollenheten.\n"
-"\n"
+msgstr "  -b, --binary         les i binærmodus\n"
 
 #: src/md5sum.c:181
 #, c-format
 msgid "  -c, --check          read %s sums from the FILEs and check them\n"
-msgstr ""
+msgstr "  -c, --check          les %s-summer fra FILEne, og kontroller dem\n"
 
 #: src/md5sum.c:184
 msgid "      --tag            create a BSD-style checksum\n"
-msgstr ""
+msgstr "      --tag            lag en kontrollsum i BSD-stil\n"
 
 #: src/md5sum.c:188
 msgid ""
 "  -t, --text           read in text mode (default if reading tty stdin)\n"
 msgstr ""
+"  -t, --text           les i tekstmodus (standard hvis inndata leses fra "
+"tty)\n"
 
 #: src/md5sum.c:192
 msgid "  -t, --text           read in text mode (default)\n"
-msgstr ""
+msgstr "  -t, --text           les i tekstmodus (standard)\n"
 
 #: src/md5sum.c:195
-#, fuzzy
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
-"De følgende to flaggene brukes kun ved sjekking av sjekksummer:\n"
-"      --status          ikke skriv ut noe, statuskode angir resultat\n"
-"  -w, --warn            advar mot feilformatterte MD5-sjekksum-linjer\n"
+"\n"
+"Følgende tre valg er bare nyttige ved sjekk av kontrollsummer:\n"
+"      --quiet          ikke skriv ut OK for hver fil som blir verifisert\n"
+"      --status         ikke skriv ut noenting (bruk statuskode som "
+"indikasjon)\n"
+"      --strict         avslutt med feilkode ved feilformatert(e) "
+"sjekksumlinje(r)\n"
+"  -w, --warn           advar mot feilformaterte kontrollsumlinjer\n"
 "\n"
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-
-#: src/md5sum.c:208
-#, fuzzy, c-format
+#: src/md5sum.c:206
+#, c-format
 msgid ""
 "\n"
 "The sums are computed as described in %s.  When checking, the input\n"
@@ -5156,163 +6150,204 @@ msgid ""
 "space for text), and name for each FILE.\n"
 msgstr ""
 "\n"
-"Summene blir beregnet som beskrevet i %s. Ved sjekking skal\n"
-"inndata være tidligere utdata fra dette programmet.  Forvalgt \n"
-"modus er å skrive ut en linje med sjekksum, et tegn som indikerer\n"
-"type («*» for binær, « » for tekst), og navnet til hver FIL\n"
+"Summene beregnes som beskrevet i %s.  Ved kontroll bør inndata\n"
+"bestå av tidligere utdata fra programmet.  Programmet skriver ut en linje\n"
+"med kontrollsum, et tegn som indikerer lesemodus («*» betyr binær,\n"
+"mellomrom betyr tekst) samt et filnavn per FIL.\n"
 
-#: src/md5sum.c:523
-#, fuzzy, c-format
+#: src/md5sum.c:521
+#, c-format
 msgid "%s: too many checksum lines"
-msgstr "%s: ingen riktig formatterte %s-sjekksumlinjer funnet"
+msgstr "%s: for mange kontrollsumlinjer"
 
-#: src/md5sum.c:547
-#, fuzzy, c-format
+#: src/md5sum.c:545
+#, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
-msgstr "%s: %lu: ukorrekt formattert %s-sjekksumlinje"
+msgstr "%s: %<PRIuMAX>: en %s-kontrollsumlinje er feilformatert"
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr "%s: FEIL ved åpning eller lesing\n"
 
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
-msgstr "FEIL"
+msgstr "MISLYKTES"
 
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr "OK"
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
-msgstr "%s: ingen riktig formatterte %s-sjekksumlinjer funnet"
+msgstr "%s: fant ingen korrekt formaterte %s-kontrollsumlinjer"
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ADVARSEL: %<PRIuMAX> linje er feilformatert"
+msgstr[1] "ADVARSEL: %<PRIuMAX> linjer er feilformatert"
 
-#: src/md5sum.c:639
-#, fuzzy, c-format
+#: src/md5sum.c:637
+#, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
-msgstr[0] "ADVARSEL: %d av %d oppførte %s kunne ikke leses"
-msgstr[1] "ADVARSEL: %d av %d oppførte %s kunne ikke leses"
+msgstr[0] "ADVARSEL: klarte ikke å lese %<PRIuMAX> oppført fil"
+msgstr[1] "ADVARSEL: klarte ikke å lese %<PRIuMAX> oppførte filer"
 
-#: src/md5sum.c:647
-#, fuzzy, c-format
+#: src/md5sum.c:645
+#, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
-msgstr[0] "ADVARSEL: %d av %d beregnede %s stemte IKKE overens"
-msgstr[1] "ADVARSEL: %d av %d beregnede %s stemte IKKE overens"
+msgstr[0] "ADVARSEL: %<PRIuMAX> kontrollsum stemmer ikke"
+msgstr[1] "ADVARSEL: %<PRIuMAX> kontrollsummer stemmer ikke"
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
-msgstr ""
+msgstr "«--tag» støtter ikke «--text»-modus"
 
-#: src/md5sum.c:766
-#, fuzzy, c-format
+#: src/md5sum.c:770
+#, c-format
 msgid "the --tag option is meaningless when verifying checksums"
-msgstr "flagget --status har bare betydning ved sjekking av sjekksummer"
+msgstr "valget «--tag» er ubrukelig til å bekrefte kontrollsummer"
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
 msgstr ""
-"flaggene --binary og --text er meningsløse ved verifisering av sjekksummer"
+"valgene «--binary» og «--text» er ubrukelige til sjekk av kontrollsummer"
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
-msgstr "flagget --status har bare betydning ved sjekking av sjekksummer"
+msgstr "valget «--status» er bare nyttig ved sjekk av kontrollsummer"
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
-msgstr "flagget --warn har bare betydning ved sjekking av sjekksummer"
+msgstr "valget «--warn» er bare nyttig ved sjekk av kontrollsummer"
 
-#: src/md5sum.c:795
-#, fuzzy, c-format
+#: src/md5sum.c:799
+#, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
-msgstr "flagget --status har bare betydning ved sjekking av sjekksummer"
+msgstr "valget «--quiet» er bare nyttig ved sjekk av kontrollsummer"
 
-#: src/md5sum.c:802
-#, fuzzy, c-format
+#: src/md5sum.c:806
+#, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
-msgstr "flagget --status har bare betydning ved sjekking av sjekksummer"
+msgstr "valget «--strict» er bare nyttig ved sjekk av kontrollsummer"
 
-#: src/mkdir.c:56 src/rmdir.c:164
-#, fuzzy, c-format
+#: src/mkdir.c:58 src/rmdir.c:164
+#, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
-msgstr "Bruk: %s [FLAGG]... [FIL]...\n"
+msgstr "Bruk: %s [VALG] … MAPPE …\n"
 
-#: src/mkdir.c:57
+#: src/mkdir.c:59
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
-msgstr ""
+msgstr "Lag MAPPE(r), hvis de(n) ikke finnes allerede.\n"
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
+"  -m, --mode=MODUS   velg filmodus som med chmod (ikke en u-maske som med "
+"«a=rwx»)\n"
+"  -p, --parents     ok hvis mappa eksisterer, og opprett overmapper ved "
+"behov\n"
+"  -v, --verbose     skriv ut en melding for hver mappe som blir laget\n"
 
-#: src/mkdir.c:168
-#, fuzzy, c-format
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+"  -Z, --context=CTX  velg CTX som SELinux-sikkerhetskontekst\n"
+"      --context[=CTX]  likner «-Z», men hvis CTX er valgt,\n"
+"                         gjelder konteksten også for SMACK\n"
+
+#: src/mkdir.c:127 src/mkdir.c:172
+#, c-format
+msgid "failed to set default creation context for %s"
+msgstr "klarte ikke å velge standard opprettelseskontekst for «%s»"
+
+#: src/mkdir.c:191
+#, c-format
+msgid "failed to restore context for %s"
+msgstr "klarte ikke å gjenopprette kontekst for «%s»"
+
+#: src/mkdir.c:231
+#, c-format
 msgid "created directory %s"
-msgstr "kan ikke opprette katalog %s"
+msgstr "mappa «%s» er opprettet"
+
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr ""
+"advarsel: ignorerer valget «--context», fordi systemkjernen mangler SELinux-/"
+"SMACK-funksjonalitet"
 
-#: src/mkfifo.c:51 src/pathchk.c:89
-#, fuzzy, c-format
+#: src/mkfifo.c:53 src/pathchk.c:89
+#, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
-msgstr "Bruk: %s [FLAGG]... [FIL]...\n"
+msgstr "Bruk: %s [VALG] … NAVN …\n"
 
-#: src/mkfifo.c:52
+#: src/mkfifo.c:54
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
-msgstr ""
+msgstr "Lag datarør (FIFO-er) med valgt(e) NAVN.\n"
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
 msgstr ""
+"  -m, --mode=MODUS    velg MODUS for filrettigheter, i stedet for en u-maske "
+"som «a=rw»\n"
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
+"  -Z, --context=CTX  velg CTX som SELinux-sikkerhetskontekst for hvert NAVN\n"
+"      --context[=CTX]  likner «-Z», men hvis CTX er valgt,\n"
+"                         gjelder konteksten også for SMACK\n"
 
-#: src/mkfifo.c:121 src/mknod.c:127
-#, fuzzy, c-format
+#: src/mkfifo.c:153 src/mknod.c:150
+#, c-format
 msgid "invalid mode"
-msgstr "ugyldig antall"
+msgstr "ugyldig modus"
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
-msgstr ""
+msgstr "modus kan bare velge filrettighetsbiter"
 
-#: src/mknod.c:52
-#, fuzzy, c-format
-msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
-msgstr "Bruk: %s [FLAGG]... SETT1 [SETT2]\n"
+#: src/mkfifo.c:174 src/mknod.c:269
+#, c-format
+msgid "cannot set permissions of %s"
+msgstr "klarte ikke å velge tilgangsrettigheter til «%s»"
 
 #: src/mknod.c:54
-msgid "Create the special file NAME of the given TYPE.\n"
-msgstr ""
+#, c-format
+msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
+msgstr "Bruk: %s [VALG] … NAVN TYPE [ØVRE NEDRE]\n"
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr ""
+#: src/mknod.c:56
+msgid "Create the special file NAME of the given TYPE.\n"
+msgstr "Lag spesialfilNAVNet av ønsket TYPE.\n"
 
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -5320,159 +6355,189 @@ msgid ""
 "it is interpreted as hexadecimal; otherwise, if it begins with 0, as octal;\n"
 "otherwise, as decimal.  TYPE may be:\n"
 msgstr ""
+"\n"
+"Både ØVRE og NEDRE må velges når TYPE er b, c eller u,\n"
+"og de må utelates når TYPE er p.  Hvis ØVRE eller NEDRE begynner med 0x "
+"eller 0X,\n"
+"tolkes de som heksadesimaler. Hvis de begynner med 0, tolkes de som "
+"oktaler,\n"
+"og ellers som desimaler. TYPE kan være følgende:\n"
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 msgid ""
 "\n"
 "  b      create a block (buffered) special file\n"
 "  c, u   create a character (unbuffered) special file\n"
 "  p      create a FIFO\n"
 msgstr ""
+"\n"
+"  b      lag en (mellomlagret) blokk-spesialfil\n"
+"  c, u   lag en (ikke mellomlagret) tegn-spesialfil\n"
+"  p      lag FIFO\n"
 
-#: src/mknod.c:150
-#, fuzzy
+#: src/mknod.c:175
 msgid "Special files require major and minor device numbers."
-msgstr "ugyldig startlinjenummer: «%s»"
+msgstr "Spesialfiler krever øvre og nedre enhetsnumre."
 
-#: src/mknod.c:160
-#, fuzzy
+#: src/mknod.c:185
 msgid "Fifos do not have major and minor device numbers."
-msgstr "ugyldig startlinjenummer: «%s»"
+msgstr "FIFO-er har ikke øvre og nedre enhetsnumre."
 
-#: src/mknod.c:176
-#, fuzzy, c-format
+#: src/mknod.c:210
+#, c-format
 msgid "block special files not supported"
-msgstr "blokkstørrelse"
+msgstr "blokk-spesialfiler støttes ikke"
 
-#: src/mknod.c:185
-#, fuzzy, c-format
+#: src/mknod.c:219
+#, c-format
 msgid "character special files not supported"
-msgstr "tegn-posisjon er null"
+msgstr "tegn-spesialfiler støttes ikke"
 
-#: src/mknod.c:201
-#, fuzzy, c-format
+#: src/mknod.c:235
+#, c-format
 msgid "invalid major device number %s"
-msgstr "ugyldig startlinjenummer: «%s»"
+msgstr "«%s» er et ugyldig øvre enhetsnummer"
 
-#: src/mknod.c:206
-#, fuzzy, c-format
+#: src/mknod.c:240
+#, c-format
 msgid "invalid minor device number %s"
-msgstr "ugyldig startlinjenummer: «%s»"
+msgstr "«%s» er et ugyldig nedre enhetsnummer"
 
-#: src/mknod.c:211
-#, fuzzy, c-format
+#: src/mknod.c:245
+#, c-format
 msgid "invalid device %s %s"
-msgstr "ugyldig argument %s for %s"
+msgstr "«%s %s» er en ugyldig enhet"
 
-#: src/mknod.c:225
-#, fuzzy, c-format
+#: src/mknod.c:264
+#, c-format
 msgid "invalid device type %s"
-msgstr "ugyldig argument %s for %s"
+msgstr "«%s» er en ugyldig enhetstype"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
-msgstr ""
+msgstr "Eric Blake"
 
-#: src/mktemp.c:68
-#, fuzzy, c-format
+#: src/mktemp.c:66
+#, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
-msgstr "Bruk: %s [FLAGG]... [FIL]...\n"
+msgstr "Bruk: %s [VALG] … [MAL]\n"
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
 "TEMPLATE must contain at least 3 consecutive 'X's in last component.\n"
 "If TEMPLATE is not specified, use tmp.XXXXXXXXXX, and --tmpdir is implied.\n"
 msgstr ""
+"Lag en midlertidig, trygg fil eller mappe, og skriv ut navnet på den.\n"
+"MAL må inneholde minst tre «X»-er på rad i siste komponent.\n"
+"Hvis MAL ikke velges, brukes «tmp.XXXXXXXXXX» som implisitt valg av «--"
+"tmpdir».\n"
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
+"Filer lages med u+rw, og mapper med u+rwx, fratrukket umask-restriksjoner.\n"
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
 "  -q, --quiet         suppress diagnostics about file/dir-creation failure\n"
 msgstr ""
+"  -d, --directory     lag mappe i stedet for fil\n"
+"  -u, --dry-run       ikke lag noe, men bare skriv ut et navn (usikkert)\n"
+"  -q, --quiet         ikke gi diagnotiske meldinger om feil ved oppretting "
+"av filer eller mapper\n"
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
+"      --suffix=SUFF   legg til SUFF i MAL.  SUFF kan ikke inneholde "
+"skråstrek(er).\n"
+"                        Dette valget brukes implisitt hvis MAL ikke slutter "
+"på X.\n"
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
+"  -p DIR, --tmpdir[=MAPPE]  tolk MAL innenfor MAPPE. Hvis MAPPE ikke er\n"
+"                        angitt, brukes $TMPDIR hvis den har en verdi. Ellers "
+"brukes /tmp.\n"
+"                        MAL kan ikke være et absolutt navn med dette "
+"valget.\n"
+"                        MAL kan inneholde skråstrek her, i motsetning til -"
+"t, men\n"
+"                        mktemp lager bare den endelige komponenten\n"
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
 msgstr ""
+"  -t                  tolk MAL som en enkeltfilkomponent,\n"
+"                        innenfor en mappe. Her brukes $TMPDIR hvis den har "
+"en verdi,\n"
+"                        evt. mappa som er gitt via «-p». Ellers brukes «/"
+"tmp» [foreldet funksjon]\n"
 
-#: src/mktemp.c:223
+#: src/mktemp.c:210
 #, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr ""
-
-#: src/mktemp.c:229
-#, fuzzy, c-format
 msgid "too many templates"
-msgstr "for mange argumenter"
+msgstr "for mange maler"
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
-msgstr ""
+msgstr "malen «%s» må slutte på X ved bruk av «--suffix»"
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, c-format
 msgid "invalid suffix %s, contains directory separator"
-msgstr ""
+msgstr "suffikset «%s» er ugyldig, fordi det inneholder mappeskilletegn"
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
-msgstr ""
+msgstr "malen «%s» har for få X-er"
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
-msgstr ""
+msgstr "malen «%s» er ugyldig, fordi den inneholder mappeskilletegn"
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr ""
+"malen «%s» er ugyldig. Den kan ikke være absolutt når «--tmpdir» brukes"
 
-#: src/mktemp.c:326
-#, fuzzy, c-format
+#: src/mktemp.c:311
+#, c-format
 msgid "failed to create directory via template %s"
-msgstr "kan ikke opprette katalog %s"
+msgstr "klarte ikke å lage mappe via malen «%s»"
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, c-format
 msgid "failed to create file via template %s"
-msgstr ""
+msgstr "klarte ikke å lage fil via malen «%s»"
 
-#: src/mv.c:292
+#: src/mv.c:294
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
-msgstr ""
+msgstr "Gi en KILDE nytt MÃ…Lnavn, eller flytt KILDE(r) til en MAPPE.\n"
 
-#: src/mv.c:298
+#: src/mv.c:300
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
 "file\n"
@@ -5484,16 +6549,30 @@ msgid ""
 "If you specify more than one of -i, -f, -n, only the final one takes "
 "effect.\n"
 msgstr ""
+"      --backup[=KONTROLL]       lag sikkerhetskopi av målfiler som "
+"eksisterer allerede\n"
+"  -b                           likner «--backup», men kan ikke brukes med "
+"argumenter\n"
+"  -f, --force                  ikke spør om bekreftelse før noe overskrives\n"
+"  -i, --interactive            spør om bekreftelse før noe overskrives\n"
+"  -n, --no-clobber             ikke overskriv eksisterende filer\n"
+"Hvis du velger både «-i», «-f» og/eller «-n», gjelder kun det siste du "
+"velger.\n"
 
-#: src/mv.c:307
+#: src/mv.c:309
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
 "                                 argument\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
 msgstr ""
+"      --strip-trailing-slashes  fjern avsluttende skråstrek fra hvert "
+"KILDE-\n"
+"                                 argument\n"
+"  -S, --suffix=SUFFIKS          overstyr normalt suffiks for "
+"sikkerhetskopier\n"
 
-#: src/mv.c:312
+#: src/mv.c:314
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
 "DIRECTORY\n"
@@ -5502,12 +6581,21 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
+"  -t, --target-directory=MAPPE  flytt alle valgte KILDER til MAPPE\n"
+"  -T, --no-target-directory    behandle MÃ…L som en normal fil\n"
+"  -u, --update                 flytt kun når KILDEfila er nyere\n"
+"                                 enn målfila, eller når målfila mangler\n"
+"  -v, --verbose                forklar hva som skjer\n"
+"  -Z, --context                gi målfil(er) standard SELinux-"
+"sikkerhetskontekst-type\n"
 
 #: src/nice.c:72
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: %s [OPTION] [COMMAND [ARG]...]\n"
-msgstr "Bruk: %s [FLAGG] [FIL]...\n"
+msgstr ""
 
 #: src/nice.c:73
 #, c-format
@@ -5522,9 +6610,9 @@ msgid "  -n, --adjustment=N   add integer N to the niceness (default 10)\n"
 msgstr ""
 
 #: src/nice.c:172
-#, fuzzy, c-format
+#, c-format
 msgid "invalid adjustment %s"
-msgstr "ugyldig argument %s for %s"
+msgstr ""
 
 #: src/nice.c:181
 #, c-format
@@ -5532,14 +6620,14 @@ msgid "a command must be given with an adjustment"
 msgstr ""
 
 #: src/nice.c:188 src/nice.c:199
-#, fuzzy, c-format
+#, c-format
 msgid "cannot get niceness"
-msgstr "kan ikke opprette midlertidig fil"
+msgstr ""
 
 #: src/nice.c:205
-#, fuzzy, c-format
+#, c-format
 msgid "cannot set niceness"
-msgstr "kan ikke utelate både bruker og gruppe"
+msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/nl.c:40
@@ -5547,15 +6635,10 @@ msgid "Scott Bartram"
 msgstr ""
 
 #: src/nl.c:179
-#, fuzzy
 msgid ""
 "Write each FILE to standard output, with line numbers added.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
-"Skriv hver fil til standard ut, med linjenummer lagt til.\n"
-"Dersom ingen FIL er spesifisert, eller FIL er -, leses det fra standard "
-"inn.\n"
-"\n"
 
 #: src/nl.c:186
 msgid ""
@@ -5563,12 +6646,8 @@ msgid ""
 "  -d, --section-delimiter=CC      use CC for separating logical pages\n"
 "  -f, --footer-numbering=STYLE    use STYLE for numbering footer lines\n"
 msgstr ""
-"  -b, --body-numbering=STIL       bruk STIL for nummerering\n"
-"  -d, --section-delimiter=CC      bruk CC for å skille logiske sider\n"
-"  -f, --footer-numbering=STIL     bruk STIL for å nummerere bunntekst\n"
 
 #: src/nl.c:191
-#, fuzzy
 msgid ""
 "  -h, --header-numbering=STYLE    use STYLE for numbering header lines\n"
 "  -i, --line-increment=NUMBER     line number increment at each line\n"
@@ -5579,23 +6658,12 @@ msgid ""
 "pages\n"
 "  -s, --number-separator=STRING   add STRING after (possible) line number\n"
 msgstr ""
-"  -h, --header-numbering=STIL     bruk STIL for å nummerere topptekst\n"
-"  -i, --page-increment=ANTALL     linjenummerøkning for hver linje\n"
-"  -l, --join-blank-lines=ANTALL   ANTALL tomme linjer som teller som en\n"
-"  -n, --number-format=FORMAT      sett inn linjenummer etter FORMAT\n"
-"  -p, --no-renumber               ikke begynn linjenumre på nytt ved "
-"logiske\n"
-"                                  sider\n"
-"  -s, --number-separator=STRENG   legg til STRENG etter (mulig) linjenummer\n"
 
 #: src/nl.c:199
-#, fuzzy
 msgid ""
 "  -v, --starting-line-number=NUMBER  first line number on each logical page\n"
 "  -w, --number-width=NUMBER       use NUMBER columns for line numbers\n"
 msgstr ""
-"  -v, --first-page=ANTALL         første linjenummer på hver logiske side\n"
-"  -w, --number-width=ANTALL       bruk ANTALL kolonner for linjenummerering\n"
 
 #: src/nl.c:205
 msgid ""
@@ -5604,13 +6672,8 @@ msgid ""
 "two delimiter characters for separating logical pages, a missing\n"
 "second character implies :.  Type \\\\ for \\.  STYLE is one of:\n"
 msgstr ""
-"\n"
-"Forvalgt er -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn.  CC er\n"
-"to skilletegn for å skille logiske sider, et manglende andretegn\n"
-"impliserer «:». Bruk \\\\ for \\. STIL er en av:\n"
 
 #: src/nl.c:211
-#, fuzzy
 msgid ""
 "\n"
 "  a         number all lines\n"
@@ -5626,72 +6689,58 @@ msgid ""
 "  rz   right justified, leading zeros\n"
 "\n"
 msgstr ""
-"\n"
-"  a         nummerer alle linjer\n"
-"  t         nummerer bare ikke-tomme linjer\n"
-"  n         nummerer ingen linjer\n"
-"  pREGEXP   nummerer bare linjer som passer REGEXP\n"
-"\n"
-"FORMAT er et av følgende:\n"
-"\n"
-"  ln   venstrejustert, ingen ledende nuller\n"
-"  rn   høyrejustert, ingen ledende nuller\n"
-"  rz   høyrejustert, ledende nuller\n"
-"\n"
 
 #: src/nl.c:278
-#, fuzzy, c-format
+#, c-format
 msgid "line number overflow"
-msgstr "felt-nummer er null"
+msgstr ""
 
 #: src/nl.c:478
-#, fuzzy, c-format
+#, c-format
 msgid "invalid header numbering style: %s"
-msgstr "ugyldig felt-nummer: «%s»"
+msgstr ""
 
 #: src/nl.c:486
-#, fuzzy, c-format
+#, c-format
 msgid "invalid body numbering style: %s"
-msgstr "ugyldig antall"
+msgstr ""
 
 #: src/nl.c:494
-#, fuzzy, c-format
+#, c-format
 msgid "invalid footer numbering style: %s"
-msgstr "ugyldig filnummer i felt-spesifikator: «%s»"
+msgstr ""
 
 #: src/nl.c:503
-#, fuzzy, c-format
+#, c-format
 msgid "invalid starting line number: %s"
-msgstr "ugyldig startlinjenummer: «%s»"
+msgstr ""
 
 #: src/nl.c:512
-#, fuzzy, c-format
+#, c-format
 msgid "invalid line number increment: %s"
-msgstr "ugyldig linjenummer-økning: «%s»"
+msgstr ""
 
 #: src/nl.c:524
-#, fuzzy, c-format
+#, c-format
 msgid "invalid number of blank lines: %s"
-msgstr "ugyldig antall blanke linjer: «%s»"
+msgstr ""
 
 #: src/nl.c:538
-#, fuzzy, c-format
+#, c-format
 msgid "invalid line number field width: %s"
-msgstr "ugyldig linjenummer-feltbredde: «%s»"
+msgstr ""
 
 #: src/nl.c:557
-#, fuzzy, c-format
+#, c-format
 msgid "invalid line numbering format: %s"
-msgstr "ugyldig linjenummer-økning: «%s»"
+msgstr ""
 
 #: src/nohup.c:53
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s COMMAND [ARG]...\n"
 "  or:  %s OPTION\n"
 msgstr ""
-"Bruk:  %s [FIL]...\n"
-"eller: %s [FLAGG]\n"
 
 #: src/nohup.c:59
 msgid ""
@@ -5711,14 +6760,14 @@ msgid ""
 msgstr ""
 
 #: src/nohup.c:127
-#, fuzzy, c-format
+#, c-format
 msgid "failed to render standard input unusable"
-msgstr "begge filene kan ikke være standard inn"
+msgstr ""
 
 #: src/nohup.c:131
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring input"
-msgstr "for mange argumenter"
+msgstr ""
 
 #: src/nohup.c:175
 #, c-format
@@ -5726,9 +6775,9 @@ msgid "ignoring input and appending output to %s"
 msgstr ""
 
 #: src/nohup.c:176
-#, fuzzy, c-format
+#, c-format
 msgid "appending output to %s"
-msgstr "kan ikke endre eier og/eller gruppe for %s"
+msgstr ""
 
 #: src/nohup.c:193
 #, c-format
@@ -5756,9 +6805,9 @@ msgid "Giuseppe Scrivano"
 msgstr ""
 
 #: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: %s [OPTION]...\n"
-msgstr "Bruk: %s [FLAGG] [FIL]...\n"
+msgstr ""
 
 #: src/nproc.c:58
 msgid ""
@@ -5774,100 +6823,95 @@ msgid ""
 msgstr ""
 
 #: src/nproc.c:107
-#, fuzzy, c-format
+#, c-format
 msgid "%s: invalid number to ignore"
-msgstr "%s: ugyldig antall linjer"
+msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
 msgstr ""
 
-#: src/numfmt.c:676
+#: src/numfmt.c:659
 #, c-format
-msgid "value too large to be converted: '%s'"
+msgid "value too large to be converted: %s"
 msgstr ""
 
-#: src/numfmt.c:680
-#, fuzzy, c-format
-msgid "invalid number: '%s'"
-msgstr "ugyldig antall"
+#: src/numfmt.c:663
+#, c-format
+msgid "invalid number: %s"
+msgstr ""
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
+msgid "rejecting suffix in input: %s (consider using --from)"
 msgstr ""
 
-#: src/numfmt.c:688
-#, fuzzy, c-format
-msgid "invalid suffix in input: '%s'"
-msgstr "ugyldig linjenummer-økning: «%s»"
+#: src/numfmt.c:671
+#, c-format
+msgid "invalid suffix in input: %s"
+msgstr ""
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
 msgstr ""
 
-#: src/numfmt.c:723
-#, fuzzy, c-format
+#: src/numfmt.c:722 src/numfmt.c:768
+#, c-format
 msgid "failed to prepare value '%Lf' for printing"
-msgstr "%s: fil for lang"
-
-#: src/numfmt.c:787
-#, fuzzy, c-format
-msgid "invalid unit size: '%s'"
-msgstr "ugyldig type-streng «%s»"
+msgstr ""
 
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
+#: src/numfmt.c:791
 #, c-format
-msgid "out of memory (requested %zu bytes)"
+msgid "invalid unit size: %s"
 msgstr ""
 
-#: src/numfmt.c:813
-#, fuzzy, c-format
+#: src/numfmt.c:814
+#, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
-msgstr "Bruk: %s [FLAGG]... [FIL]...\n"
+msgstr ""
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
 msgstr ""
 
-#: src/numfmt.c:820
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
 msgstr ""
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
 msgstr ""
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
 "                         see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr ""
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
@@ -5875,19 +6919,19 @@ msgid ""
 "locale)\n"
 msgstr ""
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
 msgstr ""
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
 msgstr ""
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -5897,40 +6941,40 @@ msgid ""
 "                         is found\n"
 msgstr ""
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
 "nearest\n"
 msgstr ""
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
 msgstr ""
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr ""
 
-#: src/numfmt.c:877
+#: src/numfmt.c:878
 msgid ""
 "\n"
 "UNIT options:\n"
 msgstr ""
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr ""
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -5939,7 +6983,7 @@ msgid ""
 "               1Mi = 1048576,\n"
 msgstr ""
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
@@ -5947,7 +6991,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
@@ -5955,7 +6999,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
@@ -5963,18 +7007,18 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:905
+#: src/numfmt.c:906
 #, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -5986,7 +7030,7 @@ msgid ""
 "errors are not diagnosed and the exit status is 0.\n"
 msgstr ""
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -6007,123 +7051,121 @@ msgid ""
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 msgstr ""
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, c-format
 msgid "format %s has no %% directive"
 msgstr ""
 
-#: src/numfmt.c:990
-#, fuzzy, c-format
+#: src/numfmt.c:1003
+#, c-format
 msgid "invalid format %s (width overflow)"
-msgstr "ugyldig argument %s for %s"
+msgstr ""
+
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr ""
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr ""
 
-#: src/numfmt.c:1010
+#: src/numfmt.c:1030
 #, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
 msgstr ""
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr ""
 
-#: src/numfmt.c:1070
-#, fuzzy, c-format
-msgid "invalid suffix in input '%s': '%s'"
-msgstr "ugyldig linjenummer-økning: «%s»"
+#: src/numfmt.c:1081
+#, c-format
+msgid "invalid suffix in input %s: %s"
+msgstr ""
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
 msgstr ""
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
 msgstr ""
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
+msgid "large input value %s: possible precision loss"
 msgstr ""
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
 
-#: src/numfmt.c:1388
-#, fuzzy, c-format
-msgid "invalid padding value '%s'"
-msgstr "ugyldig type-streng «%s»"
-
-#: src/numfmt.c:1401
-#, fuzzy, c-format
-msgid "invalid field value '%s'"
-msgstr "ugyldig felt-nummer: «%s»"
+#: src/numfmt.c:1403
+#, c-format
+msgid "invalid padding value %s"
+msgstr ""
 
-#: src/numfmt.c:1430
-#, fuzzy, c-format
-msgid "invalid header value '%s'"
-msgstr "ugyldig bredde: «%s»"
+#: src/numfmt.c:1417
+#, c-format
+msgid "invalid field value %s"
+msgstr ""
 
-#: src/numfmt.c:1456
+#: src/numfmt.c:1447
 #, c-format
-msgid "--grouping cannot be combined with --format"
+msgid "invalid header value %s"
 msgstr ""
 
-#: src/numfmt.c:1458
+#: src/numfmt.c:1473
 #, c-format
-msgid "--padding cannot be combined with --format"
+msgid "--grouping cannot be combined with --format"
 msgstr ""
 
-#: src/numfmt.c:1463
-#, fuzzy, c-format
+#: src/numfmt.c:1478
+#, c-format
 msgid "no conversion option specified"
-msgstr "kun ett argument kan spesifiseres"
+msgstr ""
 
-#: src/numfmt.c:1471
+#: src/numfmt.c:1486
 #, c-format
 msgid "grouping cannot be combined with --to"
 msgstr ""
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
 msgstr ""
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
 msgstr ""
 
-#: src/numfmt.c:1511
-#, fuzzy, c-format
+#: src/numfmt.c:1526
+#, c-format
 msgid "error reading input"
-msgstr "feil ved lesing av %s"
+msgstr ""
 
-#: src/numfmt.c:1520
-#, fuzzy, c-format
+#: src/numfmt.c:1535
+#, c-format
 msgid "failed to convert some of the input numbers"
-msgstr "begge filene kan ikke være standard inn"
+msgstr ""
 
-#: src/od.c:294
-#, fuzzy, c-format
+#: src/od.c:320
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
 "  or:  %s [-abcdfilosx]... [FILE] [[+]OFFSET[.][b]]\n"
 "  or:  %s --traditional [OPTION]... [FILE] [[+]OFFSET[.][b] [+][LABEL][.]"
 "[b]]\n"
 msgstr ""
-"Bruk:      %s [FLAGG]... [FIL]...\n"
-"  eller:   %s --traditional [FIL] [[+]POSISJON [[+]MERKE]]\n"
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -6132,14 +7174,8 @@ msgid ""
 "With no FILE, or when FILE is -, read standard input.\n"
 "\n"
 msgstr ""
-"\n"
-"Skriv en entydig representasjon, oktale bytes forvalgt, av FIL\n"
-"til standard ut. Dersom ingen FIL er spesifisert, eller FIL er -,\n"
-"leses det fra standard inn.\n"
-"\n"
 
-#: src/od.c:307
-#, fuzzy
+#: src/od.c:333
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
 "if the last operand begins with + or (if there are 2 operands) a digit.\n"
@@ -6148,70 +7184,41 @@ msgid ""
 "For OFFSET and LABEL, a 0x or 0X prefix indicates hexadecimal;\n"
 "suffixes may be . for octal and b for multiply by 512.\n"
 msgstr ""
-"\n"
-"For eldre syntaks («second call format»), betyr POSISJON -j POSISJON. \n"
-"MERKE er pseudoadressen til den første uskrevne byten, som økes mens\n"
-"utskriften pågår. For POSISJON og MERKE, indikerer en 0x- eller \n"
-"0X-forstavelse hexadesimalt tallformat.  Endelser kan være . for oktal,\n"
-"og b for blokker på 512 bytes.\n"
-"\n"
-"TYPE er laget av en eller flere av følgende:\n"
-"\n"
-"  a            et navngitt tegn\n"
-"  c            ASCII-tegn eller backslash-notasjon\n"
 
-#: src/od.c:318
-#, fuzzy
+#: src/od.c:344
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
-"  -A, --address-radix=RADIX   bestem hvordan filoffset'er skrives\n"
-"  -j, --skip-bytes=BYTES      hopp over første BYTES fra hver fil\n"
 
-#: src/od.c:323
-#, fuzzy
+#: src/od.c:350
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
-"  -N, --read-bytes=BYTES      begrens oppgaven til første BYTES fra hver "
-"fil\n"
-"  -s, --strings[=BYTES]       skriv ut strenger med minst BYTES grafiske "
-"tegn\n"
-"  -t, --format=TYPE           velg utformat(er)\n"
-"  -v, --output-duplicates     ikke bruk * for å markere linjefjerning\n"
-"  -w, --width[=BYTES]         skriv BYTES bytes per utlinje\n"
 
-#: src/od.c:336
-#, fuzzy
+#: src/od.c:363
 msgid ""
 "\n"
 "\n"
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
-"\n"
-"Før-POSIX-argumenter kan blandes, de er:\n"
-"  -a   samme som -t a,  velg navngitte tegn\n"
-"  -b   samme som -t oC, velg oktalbytes\n"
-"  -c   samme som -t c,  velg ASCII-tegn eller backslash-notasjon\n"
-"  -d   samme som -t u2, velg korte desimaler uten fortegn\n"
-"\n"
 
-#: src/od.c:345
-#, fuzzy
+#: src/od.c:372
 msgid ""
 "  -f   same as -t fF, select floats\n"
 "  -i   same as -t dI, select decimal ints\n"
@@ -6220,23 +7227,17 @@ msgid ""
 "  -s   same as -t d2, select decimal 2-byte units\n"
 "  -x   same as -t x2, select hexadecimal 2-byte units\n"
 msgstr ""
-"  -f   samme som -t fF, velg flyttall\n"
-"  -h   samme som -t x2, velg korte hexadesimale\n"
-"  -i   samme som -t d2, velg korte desimaler\n"
-"  -l   samme som -t d4, velg lange desimaler\n"
-"  -o   samme som -t o2, velg korte oktaler\n"
-"  -x   samme som -t x2, velg korte hexadesimaler\n"
 
-#: src/od.c:353
+#: src/od.c:380
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -6244,14 +7245,8 @@ msgid ""
 "  u[SIZE]    unsigned decimal, SIZE bytes per integer\n"
 "  x[SIZE]    hexadecimal, SIZE bytes per integer\n"
 msgstr ""
-"  d[STØRRELSE] desimal med fortegn, STØRRELSE bytes per tall\n"
-"  f[STØRRELSE] flyttall, STØRRELSE bytes per tall\n"
-"  o[STØRRELSE] oktal, STØRRELSE bytes per tall\n"
-"  u[STØRRELSE] desimal uten fortegn, STØRRELSE bytes per tall\n"
-"  x[STØRRELSE] hexadesimal, STØRRELSE bytes per tall\n"
 
-#: src/od.c:367
-#, fuzzy
+#: src/od.c:394
 msgid ""
 "\n"
 "SIZE is a number.  For TYPE in [doux], SIZE may also be C for\n"
@@ -6259,20 +7254,15 @@ msgid ""
 "sizeof(long).  If TYPE is f, SIZE may also be F for sizeof(float), D\n"
 "for sizeof(double) or L for sizeof(long double).\n"
 msgstr ""
-"\n"
-"STØRRELSE er et tall. For TYPE lik d, o, u eller x, kan STØRRELSE også være\n"
-"C for sizeof(char), S for sizeof(short), I for sizeof(int) eller L for \n"
-"sizeof(long).  Når TYPE er f, kan STØRRELSE være F for sizeof(float), \n"
-"D for sizeof(double) eller L for sizeof(long double).\n"
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
 "each output line.\n"
 msgstr ""
 
-#: src/od.c:379
+#: src/od.c:406
 msgid ""
 "\n"
 "\n"
@@ -6285,94 +7275,81 @@ msgid ""
 "and so on for G, T, P, E, Z, Y.\n"
 msgstr ""
 
-#: src/od.c:639 src/od.c:759
-#, fuzzy, c-format
+#: src/od.c:680 src/od.c:800
+#, c-format
 msgid "invalid type string %s"
-msgstr "ugyldig type-streng «%s»"
+msgstr ""
 
-#: src/od.c:649
-#, fuzzy, c-format
+#: src/od.c:690
+#, c-format
 msgid ""
 "invalid type string %s;\n"
 "this system doesn't provide a %lu-byte integral type"
 msgstr ""
-"ugyldig type-streng «%s»;\n"
-"dette systemet støtter ikke en %lu-byte heltallstype"
 
-#: src/od.c:770
-#, fuzzy, c-format
+#: src/od.c:811
+#, c-format
 msgid ""
 "invalid type string %s;\n"
 "this system doesn't provide a %lu-byte floating point type"
 msgstr ""
-"ugyldig type-streng «%s»;\n"
-"dette systemet støtter ikke en %lu-byte flyttallstype"
 
-#: src/od.c:828
-#, fuzzy, c-format
+#: src/od.c:869
+#, c-format
 msgid "invalid character '%c' in type string %s"
-msgstr "ugyldig tegn «%c» i type-streng «%s»"
+msgstr ""
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
-msgstr "kan ikke hoppe til bak slutten av kombinert inndata"
+msgstr ""
 
-#: src/od.c:1609
-#, fuzzy, c-format
+#: src/od.c:1650
+#, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
-msgstr "ugyldig ut-adresse radix «%c»; det må være ett av tegnene [doxn]"
+msgstr ""
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
-msgstr "ingen type kan spesifiseres ved dumping av strenger"
+msgstr ""
 
-#: src/od.c:1810
-#, fuzzy
+#: src/od.c:1863
 msgid "compatibility mode supports at most one file"
-msgstr "kompatibilitetsmodus støtter maksimum tre argumenter"
+msgstr ""
 
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr ""
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
-msgstr "advarsel: ugyldig bredde %lu; bruker %d istedet"
+msgstr ""
 
 #: src/operand2sig.c:69
-#, fuzzy, c-format
+#, c-format
 msgid "%s: invalid signal"
-msgstr "%s: ugyldig prosess-id"
+msgstr ""
 
 #: src/paste.c:220
 #, c-format
 msgid "standard input is closed"
-msgstr "standard inn er lukket"
+msgstr ""
 
 #: src/paste.c:439
-#, fuzzy
 msgid ""
 "Write lines consisting of the sequentially corresponding lines from\n"
 "each FILE, separated by TABs, to standard output.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
-"Skriv linjer som består av de sekvensielt tilsvarende linjene fra hver\n"
-"FIL separert med tabulatorer til standard ut.\n"
-"Dersom ingen FIL er spesifisert, eller FIL er -, leses det fra standard "
-"inn.\n"
-"\n"
 
 #: src/paste.c:447
 msgid ""
 "  -d, --delimiters=LIST   reuse characters from LIST instead of TABs\n"
 "  -s, --serial            paste one file at a time instead of in parallel\n"
 msgstr ""
-"  -d, --delimiters=LISTE  bruk tegn fra LISTE istedet for tabulatorer\n"
-"  -s, --serial            ta en fil om gangen i steder for i parallell\n"
 
 #: src/paste.c:508
 #, c-format
@@ -6394,9 +7371,9 @@ msgid "leading '-' in a component of file name %s"
 msgstr ""
 
 #: src/pathchk.c:196
-#, fuzzy, c-format
+#, c-format
 msgid "nonportable character %s in file name %s"
-msgstr "ugyldig tegn «%c» i type-streng «%s»"
+msgstr ""
 
 #: src/pathchk.c:272
 #, c-format
@@ -6420,9 +7397,8 @@ msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/pinky.c:36 src/uptime.c:45 src/users.c:35 src/who.c:48
-#, fuzzy
 msgid "Joseph Arceneaux"
-msgstr "Jay Lepreau og David MacKenzie"
+msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/pinky.c:38 src/uptime.c:47
@@ -6498,12 +7474,12 @@ msgstr ""
 msgid "Where"
 msgstr ""
 
-#: src/pinky.c:493
-#, fuzzy, c-format
+#: src/pinky.c:495
+#, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
-msgstr "Bruk: %s [FLAGG]... [FIL]...\n"
+msgstr ""
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -6513,7 +7489,7 @@ msgid ""
 "  -s              do short format output, this is the default\n"
 msgstr ""
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -6522,7 +7498,7 @@ msgid ""
 "                  in short format\n"
 msgstr ""
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, c-format
 msgid ""
 "\n"
@@ -6530,10 +7506,10 @@ msgid ""
 "The utmp file will be %s.\n"
 msgstr ""
 
-#: src/pinky.c:595
-#, fuzzy, c-format
+#: src/pinky.c:597
+#, c-format
 msgid "no username specified; at least one must be specified when using -l"
-msgstr "ingen filer kan spesifiseres når flagget --string brukes"
+msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/pr.c:330
@@ -6542,64 +7518,63 @@ msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/pr.c:331
-#, fuzzy
 msgid "Roland Huebner"
-msgstr "Pete TerMaat og Roland Huebner"
+msgstr ""
 
 #: src/pr.c:908
-#, fuzzy, c-format
+#, c-format
 msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument"
-msgstr "«--pages=FØRSTE_SIZE[:SISTE_SIDE]» mangler argument"
+msgstr ""
 
 #: src/pr.c:910
-#, fuzzy, c-format
+#, c-format
 msgid "invalid page range %s"
-msgstr "ugyldig type-streng «%s»"
+msgstr ""
 
 #: src/pr.c:975
-#, fuzzy, c-format
+#, c-format
 msgid "'-l PAGE_LENGTH' invalid number of lines: %s"
-msgstr "«-l SIDE_LENGDE» igyldig antall linjer: «%s»"
+msgstr ""
 
 #: src/pr.c:999
-#, fuzzy, c-format
+#, c-format
 msgid "'-N NUMBER' invalid starting line number: %s"
-msgstr "«-N TALL» ugyldig start-linjenummer: «%s»"
+msgstr ""
 
 #: src/pr.c:1011
-#, fuzzy, c-format
+#, c-format
 msgid "'-o MARGIN' invalid line offset: %s"
-msgstr "«-o MARG» ugyldig linje-offset: «%s»"
+msgstr ""
 
 #: src/pr.c:1052
-#, fuzzy, c-format
+#, c-format
 msgid "'-w PAGE_WIDTH' invalid number of characters: %s"
-msgstr "«-w SIDE_BREDDE» igyldig antall tegn: «%s»"
+msgstr ""
 
 #: src/pr.c:1066
-#, fuzzy, c-format
+#, c-format
 msgid "'-W PAGE_WIDTH' invalid number of characters: %s"
-msgstr "«-W SIDE_BREDDE» ugyldig antall tegn: «%s»"
+msgstr ""
 
 #: src/pr.c:1096
-#, fuzzy, c-format
+#, c-format
 msgid "cannot specify number of columns when printing in parallel"
-msgstr "Kan ikke spesifisere antall kolonner når det skrives i parallell."
+msgstr ""
 
 #: src/pr.c:1100
-#, fuzzy, c-format
+#, c-format
 msgid "cannot specify both printing across and printing in parallel"
-msgstr "Kan ikke spesifisere både skriving i kryss og skriving i parallell"
+msgstr ""
 
 #: src/pr.c:1196
-#, fuzzy, c-format
+#, c-format
 msgid "'-%c' extra characters or invalid number in the argument: %s"
-msgstr "«-%c» ekstra tegn eller ugyldig tall i argumentet: «%s»"
+msgstr ""
 
 #: src/pr.c:1293
 #, c-format
 msgid "page width too narrow"
-msgstr "sidebredde for smal"
+msgstr ""
 
 #: src/pr.c:2353
 #, c-format
@@ -6607,9 +7582,9 @@ msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>"
 msgstr ""
 
 #: src/pr.c:2380
-#, fuzzy, c-format
+#, c-format
 msgid "page number overflow"
-msgstr "felt-nummer er null"
+msgstr ""
 
 #: src/pr.c:2385
 #, c-format
@@ -6617,14 +7592,10 @@ msgid "Page %<PRIuMAX>"
 msgstr ""
 
 #: src/pr.c:2757
-#, fuzzy
 msgid "Paginate or columnate FILE(s) for printing.\n"
 msgstr ""
-"Paginér eller kolumnér FIL(er) for utskrift.\n"
-"\n"
 
 #: src/pr.c:2763
-#, fuzzy
 msgid ""
 "  +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n"
 "                    begin [stop] printing with page FIRST_[LAST_]PAGE\n"
@@ -6633,13 +7604,6 @@ msgid ""
 "                    unless -a is used. Balance number of lines in the\n"
 "                    columns on each page\n"
 msgstr ""
-"  +FØRSTE_SIDE[:SISTE_SIDE], --pages=FØRSTE_SIDE[:SISTE_SIDE]\n"
-"                    begynn [stopp] utskrift med side FØRSTE_[SISTE_]SIDE\n"
-"  -KOLONNE, --columns=COLONNE\n"
-"                    lag KOLONNE-kolonners utskrift og skriv kolonner "
-"nedover,\n"
-"                    med mindre -a brukes.  Balansér antall linjer i\n"
-"                    kolonnene på hver side\n"
 
 #: src/pr.c:2771
 msgid ""
@@ -6650,13 +7614,6 @@ msgid ""
 "  -d, --double-space\n"
 "                    double space the output\n"
 msgstr ""
-"  -a, --across      skriv kolonner på tvers isteden for nedover, brukes "
-"sammen\n"
-"                    med -KOLONNE\n"
-"  -c, --show-control-chars\n"
-"                    bruk hatt-notasjon (^G) og oktal backslah-notasjon\n"
-"  -d, --double-space\n"
-"                    bruk dobbel linjeavstand\n"
 
 #: src/pr.c:2779
 msgid ""
@@ -6669,17 +7626,8 @@ msgid ""
 "                    (by a 3-line page header with -F or a 5-line header\n"
 "                    and trailer without -F)\n"
 msgstr ""
-"  -D, --date-format=FORMAT\n"
-"                    bruk FORMAT for topptekst-dato\n"
-"  -e[TEGN[BREDDE]], --expand-tabs[=TEGN[BREDDE]]\n"
-"                    ekspander inn-TEGN (TAB) til tabulator-BREDDE (8)\n"
-"  -F, -f, --form-feed\n"
-"                    bruk sideskift isteden for linjeskift for å separere\n"
-"                    sider. (ved en 3-linjers topptekst med -F eller en\n"
-"                    5-linjers topptekst og bunntekst uten -F)\n"
 
 #: src/pr.c:2789
-#, fuzzy
 msgid ""
 "  -h, --header=HEADER\n"
 "                    use a centered HEADER instead of filename in page "
@@ -6691,19 +7639,8 @@ msgid ""
 "column\n"
 "                    alignment, --sep-string[=STRING] sets separators\n"
 msgstr ""
-"  -h TOPPTEKST, --header=TOPPTEKST\n"
-"                    bruk en sentrert TOPPTEKST isteden for filnavn i\n"
-"                    toppteksten. -h \"\" skriver en blank linje, ikke bruk\n"
-"                    -h\"\"\n"
-"  -i[TEGN[BREDDE], --output-tabs[=TEGN[BREDDE]]\n"
-"                    erstatt mellomrom med TEGN (TAB) til tabulator-BREDDE"
-"(8)\n"
-"  -J, --join-lines  flett sammen hele linjer.  Skrur av -W-linje-"
-"trunkering,\n"
-"                    ingen kolonnejustering, -S[STRENG] setter skilletegn\n"
 
 #: src/pr.c:2798
-#, fuzzy
 msgid ""
 "  -l, --length=PAGE_LENGTH\n"
 "                    set the page length to PAGE_LENGTH (66) lines\n"
@@ -6711,14 +7648,8 @@ msgid ""
 "  -m, --merge       print all files in parallel, one in each column,\n"
 "                    truncate lines, but join lines of full length with -J\n"
 msgstr ""
-"  -l SIDE_LENDGE, --length=SIDE_LENDGE\n"
-"                    setter sidelengden til SIDE_LENDGE (66) linjer\n"
-"                    (forvalgt antall linjer med tekst er 56, og med -F 63)\n"
-"  -m, --merge       skriv alle filer i parallell, en i hver kolonne,\n"
-"                    trunker linjer, men flett sammen hele linjer med -J\n"
 
 #: src/pr.c:2805
-#, fuzzy
 msgid ""
 "  -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n"
 "                    number lines, use DIGITS (5) digits, then SEP (TAB),\n"
@@ -6727,15 +7658,8 @@ msgid ""
 "                    start counting with NUMBER at 1st line of first\n"
 "                    page printed (see +FIRST_PAGE)\n"
 msgstr ""
-"  -n[SKILL[SIFFER]], --number-linjes[=SKILL[SIFFER]]\n"
-"                    antall linjer, bruk SIFFER (5) siffer, så SKILL (TAB),\n"
-"                    forvalgt starter telling med første linje av innfil\n"
-"  -N NUMMER, --first-linje-number=NUMMER\n"
-"                    start telling med NUMMER ved første linje av første\n"
-"                    side skrevet ut (se +FØRSTE_SIDE)\n"
 
 #: src/pr.c:2813
-#, fuzzy
 msgid ""
 "  -o, --indent=MARGIN\n"
 "                    offset each line with MARGIN (zero) spaces, do not\n"
@@ -6743,31 +7667,19 @@ msgid ""
 "  -r, --no-file-warnings\n"
 "                    omit warning when a file cannot be opened\n"
 msgstr ""
-"  -o MARG, --indent=MARG\n"
-"                    posisjonér hver linje med MARG (0) mellomrom,\n"
-"                    påvirker ikke -w eller -W. MARG vil adderes til "
-"SIDE_BREDDE\n"
-"  -r, --no-file-warnings\n"
-"                    ikke advar når fil ikke kan åpnes\n"
 
 #: src/pr.c:2820
-#, fuzzy
 msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
-"  -s[TEGN], --separator[=CHAR]\n"
-"                    skill kolonner med et enkelt tegn, forvalgt TEGNS\n"
-"                    er TAB-tegnet med -w og ingen tegn ved -W\n"
-"                    -s[TEGN] skrur av linjetrunkering av alle 3 kolonne-\n"
-"                    flaggene (-KOLONNE|-a -KOLONNE|-m) hvis ikke -w er satt\n"
 
-#: src/pr.c:2827
-#, fuzzy
+#: src/pr.c:2828
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
 "                    separate columns by STRING,\n"
@@ -6776,16 +7688,8 @@ msgid ""
 "options\n"
 "  -t, --omit-header  omit page headers and trailers\n"
 msgstr ""
-"  -S[STRENG], --sep-string[=STRENG]\n"
-"                    skill kolonner med en STRENG.  Ikke bruk -S \"STRENG\".\n"
-"                    Bare -S: Ikke noe skilletegn (samme som -S\"\").\n"
-"                    Uten -S: Fovalgt skilletegn TAB med -J og SPACE\n"
-"                    ellers (samme som -S\" \"), ingen effekt på kolonne-"
-"flagg\n"
-"  -t, --omit-header ikke ta med topptekst og bunntekst\n"
 
-#: src/pr.c:2834
-#, fuzzy
+#: src/pr.c:2835
 msgid ""
 "  -T, --omit-pagination\n"
 "                    omit page headers and trailers, eliminate any "
@@ -6798,18 +7702,8 @@ msgid ""
 "                    multiple text-column output only, -s[char] turns off "
 "(72)\n"
 msgstr ""
-"  -T, --omit-pagination\n"
-"                    ikke ta med topp- og bunntekst, eliminer evt. "
-"paginering\n"
-"                    av sideskift satt i inn-filer\n"
-"  -v, --show-non-printing\n"
-"                    bruk backslash-notasjon\n"
-"  -w SIDEBREDDE, --with=SIDEBREDDE\n"
-"                    sett sidebredde til SIDEBREDDE (72) tegn for\n"
-"                    flerkolonners tekstutskrift. -s[tegn] skrur av (72)\n"
-
-#: src/pr.c:2844
-#, fuzzy
+
+#: src/pr.c:2845
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
 "                    set page width to PAGE_WIDTH (72) characters always,\n"
@@ -6817,20 +7711,13 @@ msgid ""
 "interference\n"
 "                    with -S or -s\n"
 msgstr ""
-"  -W SIDEBREDDE, --page-width=SIDEBREDDE\n"
-"                    sett sidebredde til SIDEBREDDE (72) tegn\n"
-"                    trunkér linjer hvis ikke -J er satt.  Ingen påvirkning\n"
-"                    med -S eller -s\n"
 
-#: src/pr.c:2852
-#, fuzzy
+#: src/pr.c:2853
 msgid ""
 "\n"
 "-t is implied if PAGE_LENGTH <= 10.  With no FILE, or when FILE is -, read\n"
 "standard input.\n"
 msgstr ""
-"\n"
-"Når ingen FIL eller når FIL er -, les fra standard inn.\n"
 
 #: src/printenv.c:62
 #, c-format
@@ -6842,10 +7729,8 @@ msgid ""
 msgstr ""
 
 #: src/printenv.c:69
-#, fuzzy
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr ""
-"  -z, --zero-terminated     avslutt linjer med en 0-oktett, ikke linjeskift\n"
 
 #: src/printf.c:79
 #, c-format
@@ -6854,13 +7739,11 @@ msgid ""
 msgstr ""
 
 #: src/printf.c:88
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s FORMAT [ARGUMENT]...\n"
 "  or:  %s OPTION\n"
 msgstr ""
-"Bruk:  %s [FIL]...\n"
-"eller: %s [FLAGG]\n"
 
 #: src/printf.c:93
 msgid ""
@@ -6910,24 +7793,24 @@ msgid "missing hexadecimal number in escape"
 msgstr ""
 
 #: src/printf.c:286
-#, fuzzy, c-format
+#, c-format
 msgid "invalid universal character name \\%c%0*x"
-msgstr "ugyldig tegn-klasse «%s»"
+msgstr ""
 
 #: src/printf.c:547
-#, fuzzy, c-format
+#, c-format
 msgid "invalid field width: %s"
-msgstr "ugyldig bredde: «%s»"
+msgstr ""
 
 #: src/printf.c:582
-#, fuzzy, c-format
+#, c-format
 msgid "invalid precision: %s"
-msgstr "ugyldig breddespesifikasjon «%s»"
+msgstr ""
 
 #: src/printf.c:609
-#, fuzzy, c-format
+#, c-format
 msgid "%.*s: invalid conversion specification"
-msgstr "%s: ugyldig feltspesifikasjon «%s»"
+msgstr ""
 
 #: src/printf.c:692
 #, c-format
@@ -6942,43 +7825,32 @@ msgstr ""
 msgid "F. Pinard"
 msgstr ""
 
-#: src/ptx.c:419
-#, fuzzy, c-format
+#: src/ptx.c:420
+#, c-format
 msgid "%s (for regexp %s)"
-msgstr "%s (for regexp «%s»)"
+msgstr ""
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
 "  or:  %s -G [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr ""
-"Bruk : %s [FLAGG]... [INN]... (uten -G)\n"
-"eller: %s -G [FLAGG]... [INN [UT]]\n"
 
-#: src/ptx.c:1821
-#, fuzzy
+#: src/ptx.c:1824
 msgid ""
 "Output a permuted index, including context, of the words in the input "
 "files.\n"
 msgstr ""
-"Skriv ut en permutert indeks, inkludert kontekst, av ordene i innfilene\n"
-"\n"
 
-#: src/ptx.c:1827
-#, fuzzy
+#: src/ptx.c:1830
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
 "  -G, --traditional              behave more like System V 'ptx'\n"
 "  -F, --flag-truncation=STRING   use STRING for flagging line truncations\n"
 msgstr ""
-"  -A, --auto-reference           skriv ut automatisk genererte referanser\n"
-"  -C, --copyright                vis Copyright og kopieringsbetingelser\n"
-"  -G, --traditional              vær mer som System Vs «ptx»\n"
-"  -F, --flag-truncation=STRENG   bruk STRENG for å markere linjetrunkering\n"
 
-#: src/ptx.c:1832
-#, fuzzy
+#: src/ptx.c:1835
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
 "  -O, --format=roff              generate output as roff directives\n"
@@ -6986,15 +7858,8 @@ msgid ""
 "  -S, --sentence-regexp=REGEXP   for end of lines or end of sentences\n"
 "  -T, --format=tex               generate output as TeX directives\n"
 msgstr ""
-"  -M, --macro-name=STRENG        makronavn å bruke istedenfor «xx»\n"
-"  -O, --format=roff              generer utskrift som roff-direktiver\n"
-"  -R, --right-side-refs          plassér referansene på høyre side, ikke\n"
-"                                 telt med i -w\n"
-"  -S, --sentence-regexp=REGEXP   for slutten av linjer eller slutten av\n"
-"                                 setninger\n"
-"  -T, --format=tex               generer utskrift som TeX-direktiver\n"
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -7003,44 +7868,25 @@ msgid ""
 "  -i, --ignore-file=FILE         read ignore word list from FILE\n"
 "  -o, --only-file=FILE           read only word list from this FILE\n"
 msgstr ""
-"  -W, --word-regexp=REGEXP       bruk REGEXP for å treffe hvert nøkkelord\n"
-"  -b, --break-file=FIL           tegn for orddeling i denne FILen\n"
-"  -f, --ignore-case              gjør om små bokstaver til store for "
-"sortering\n"
-"  -g, --gap-size=TALL            størrelse på mellomrom mellom spalter i "
-"utfelt\n"
-"  -i, --ignore-file=FIL          les liste over ord som skal ignoreres fra "
-"FIL\n"
-"  -o, --only-file=FIL            les liste over ord som *ikke* skal "
-"ignoreres\n"
-"                                 fra FIL\n"
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
 "  -w, --width=NUMBER             output width in columns, reference "
 "excluded\n"
 msgstr ""
-"  -r, --references               første felt av hver linje er en referanse\n"
-"  -t, --typeset-mode               - ikke implementert -\n"
-"  -w, --width=BREDDE             utskriftbredde for spalter, eksklusive\n"
-"                                 referanser\n"
 
-#: src/ptx.c:1854
-#, fuzzy
+#: src/ptx.c:1857
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
-"\n"
-"Ved ingen FIL eller hvis FIL er -, leses det fra standard inn.  «-F /» er\n"
-"forvalgt.\n"
 
-#: src/ptx.c:1948
-#, fuzzy, c-format
+#: src/ptx.c:1951
+#, c-format
 msgid "invalid gap width: %s"
-msgstr "ugyldig bredde: «%s»"
+msgstr ""
 
 #: src/pwd.c:57
 msgid ""
@@ -7054,36 +7900,42 @@ msgid ""
 "  -P, --physical  avoid all symlinks\n"
 msgstr ""
 
-#: src/pwd.c:166
-#, fuzzy, c-format
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+
+#: src/pwd.c:169
+#, c-format
 msgid "failed to chdir to %s"
-msgstr "kan ikke endre rettigheter til %s"
+msgstr ""
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
-#, fuzzy, c-format
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
+#, c-format
 msgid "failed to stat %s"
-msgstr "kan ikke opprette katalog %s"
+msgstr ""
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr ""
 
-#: src/pwd.c:362
-#, fuzzy, c-format
+#: src/pwd.c:367
+#, c-format
 msgid "ignoring non-option arguments"
-msgstr "for mange ikke-flagg-argumenter"
+msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/readlink.c:32
 msgid "Dmitry V. Levin"
 msgstr ""
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
-#, fuzzy, c-format
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
+#, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
-msgstr "Bruk: %s [FLAGG]... [FIL]...\n"
+msgstr ""
 
 #: src/readlink.c:63
 msgid ""
@@ -7114,14 +7966,13 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/readlink.c:152
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring --no-newline with multiple arguments"
-msgstr "for mange ikke-flagg-argumenter"
+msgstr ""
 
 #: src/realpath.c:72
 msgid ""
@@ -7140,7 +7991,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 
@@ -7149,50 +8000,51 @@ msgid "generating relative path"
 msgstr ""
 
 #: src/remove.c:273
-#, fuzzy, c-format
+#, c-format
 msgid "%s: descend into write-protected directory %s? "
-msgstr "kan ikke opprette katalog %s"
+msgstr ""
 
 #: src/remove.c:274
-#, fuzzy, c-format
+#, c-format
 msgid "%s: descend into directory %s? "
-msgstr "kan ikke skifte til katalog, %s"
+msgstr ""
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr ""
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, c-format
 msgid "%s: remove %s %s? "
 msgstr ""
 
-#: src/remove.c:374
-#, fuzzy, c-format
+#: src/remove.c:375
+#, c-format
 msgid "removed directory: %s\n"
-msgstr "kan ikke opprette katalog %s"
+msgstr ""
 
-#: src/remove.c:444
-#, fuzzy, c-format
-msgid "cannot remove directory: %s"
-msgstr "kan ikke opprette katalog %s"
+#: src/remove.c:447
+#, c-format
+msgid "refusing to remove %s or %s directory: skipping %s"
+msgstr ""
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr ""
 
-#: src/remove.c:520
-#, fuzzy, c-format
+#: src/remove.c:525
+#, c-format
 msgid "traversal failed: %s"
-msgstr "feil ved lesing"
+msgstr ""
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -7217,12 +8069,12 @@ msgstr ""
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 
 #: src/rm.c:149
@@ -7270,23 +8122,27 @@ msgstr ""
 
 #: src/rm.c:342
 #, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr ""
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/rm.c:343
-#, fuzzy, c-format
-msgid "%s: remove all arguments? "
-msgstr "for mange argumenter"
+#: src/rm.c:345
+#, c-format
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] ""
+msgstr[1] ""
 
 #: src/rmdir.c:134 src/rmdir.c:233
-#, fuzzy, c-format
+#, c-format
 msgid "removing directory, %s"
-msgstr "kan ikke opprette katalog %s"
+msgstr ""
 
 #: src/rmdir.c:148
-#, fuzzy, c-format
+#, c-format
 msgid "failed to remove directory %s"
-msgstr "kan ikke opprette katalog %s"
+msgstr ""
 
 #: src/rmdir.c:165
 msgid ""
@@ -7306,9 +8162,9 @@ msgid ""
 msgstr ""
 
 #: src/rmdir.c:242
-#, fuzzy, c-format
+#, c-format
 msgid "failed to remove %s"
-msgstr "kan ikke opprette katalog %s"
+msgstr ""
 
 #: src/runcon.c:83
 #, c-format
@@ -7319,7 +8175,7 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
 
@@ -7365,54 +8221,57 @@ msgid "you must specify -c, -t, -u, -l, -r, or context"
 msgstr ""
 
 #: src/runcon.c:195
-#, fuzzy, c-format
+#, c-format
 msgid "no command specified"
-msgstr "kun ett argument kan spesifiseres"
+msgstr ""
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr ""
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, c-format
 msgid "failed to compute a new context"
 msgstr ""
 
-#: src/runcon.c:241
-#, fuzzy, c-format
+#: src/runcon.c:240
+#, c-format
 msgid "failed to set new user %s"
-msgstr "kan ikke endre rettigheter til %s"
+msgstr ""
 
-#: src/runcon.c:243
-#, fuzzy, c-format
+#: src/runcon.c:242
+#, c-format
 msgid "failed to set new type %s"
-msgstr "kan ikke endre rettigheter til %s"
+msgstr ""
 
-#: src/runcon.c:245
-#, fuzzy, c-format
+#: src/runcon.c:244
+#, c-format
 msgid "failed to set new range %s"
-msgstr "%s: linjenummer utenfor tillatte verdier"
+msgstr ""
 
-#: src/runcon.c:247
-#, fuzzy, c-format
+#: src/runcon.c:246
+#, c-format
 msgid "failed to set new role %s"
-msgstr "kan ikke endre rettigheter til %s"
+msgstr ""
 
-#: src/runcon.c:255
-#, fuzzy, c-format
+#: src/runcon.c:254
+#, c-format
 msgid "unable to set security context %s"
-msgstr "kan ikke endre rettigheter til %s"
+msgstr ""
+
+#: src/selinux.c:127 src/selinux.c:300
+#, c-format
+msgid "error canonicalizing %s"
+msgstr ""
 
 #: src/seq.c:68
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... LAST\n"
 "  or:  %s [OPTION]... FIRST LAST\n"
 "  or:  %s [OPTION]... FIRST INCREMENT LAST\n"
 msgstr ""
-"Bruk : %s [FLAGG]... [INN]... (uten -G)\n"
-"eller: %s -G [FLAGG]... [INN [UT]]\n"
 
 #: src/seq.c:73
 msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n"
@@ -7430,97 +8289,47 @@ msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
 msgstr ""
 
-#: src/seq.c:94
+#: src/seq.c:96
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
 "it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n"
 "decimal numbers with maximum precision PREC, and to %g otherwise.\n"
 msgstr ""
 
-#: src/seq.c:140
-#, fuzzy, c-format
-msgid "invalid floating point argument: %s"
-msgstr "ugyldig startlinjenummer: «%s»"
-
-#: src/seq.c:232
+#: src/seq.c:142
 #, c-format
-msgid "format %s has unknown %%%c directive"
-msgstr ""
-
-#: src/seq.c:555
-#, fuzzy, c-format
-msgid "format string may not be specified when printing equal width strings"
-msgstr "ingen type kan spesifiseres ved dumping av strenger"
-
-#: src/setuidgid.c:49
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-"Bruk:  %s [FIL]...\n"
-"eller: %s [FLAGG]\n"
-
-#: src/setuidgid.c:55
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
+msgid "invalid floating point argument: %s"
 msgstr ""
 
-#: src/setuidgid.c:173
+#: src/seq.c:234
 #, c-format
-msgid "to use user-ID %s you need to use -g too"
+msgid "format %s has unknown %%%c directive"
 msgstr ""
 
-#: src/setuidgid.c:190
+#: src/seq.c:557
 #, c-format
-msgid "failed to set supplemental group(s)"
+msgid "format string may not be specified when printing equal width strings"
 msgstr ""
 
-#: src/setuidgid.c:200
-#, fuzzy, c-format
-msgid "cannot set group-ID to %lu"
-msgstr "kan ikke utelate både bruker og gruppe"
-
-#: src/setuidgid.c:204
-#, fuzzy, c-format
-msgid "cannot set user-ID to %lu"
-msgstr "kan ikke utelate både bruker og gruppe"
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr ""
 
-#: src/shred.c:148
+#: src/shred.c:170
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
 "for even very expensive hardware probing to recover the data.\n"
 msgstr ""
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -7529,28 +8338,32 @@ msgid ""
 "  -s, --size=N   shred this many bytes (suffixes like K, M, G accepted)\n"
 msgstr ""
 
-#: src/shred.c:161
+#: src/shred.c:183
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
 "  -z, --zero     add a final overwrite with zeros to hide shredding\n"
 msgstr ""
 
-#: src/shred.c:170
+#: src/shred.c:192
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -7561,7 +8374,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -7573,7 +8386,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -7582,7 +8395,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -7594,151 +8407,146 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:215
+#: src/shred.c:241
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
 "of the file that cannot be removed, and that will allow a shredded file\n"
 "to be recovered later.\n"
 msgstr ""
 
-#: src/shred.c:295
-#, fuzzy, c-format
+#: src/shred.c:340
+#, c-format
 msgid "%s: fdatasync failed"
-msgstr "stat feilet"
+msgstr ""
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr ""
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr ""
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr ""
 
-#: src/shred.c:452
-#, fuzzy, c-format
+#: src/shred.c:529
+#, c-format
 msgid "%s: error writing at offset %s"
-msgstr "feil ved skriving til %s"
+msgstr ""
 
-#: src/shred.c:470
-#, fuzzy, c-format
+#: src/shred.c:549
+#, c-format
 msgid "%s: lseek failed"
-msgstr "feil ved lukking av fil"
+msgstr ""
 
-#: src/shred.c:481
-#, fuzzy, c-format
+#: src/shred.c:561
+#, c-format
 msgid "%s: file too large"
-msgstr "%s: fil for lang"
+msgstr ""
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr ""
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr ""
 
-#: src/shred.c:767
-#, fuzzy, c-format
+#: src/shred.c:859
+#, c-format
 msgid "%s: fstat failed"
-msgstr "stat feilet"
+msgstr ""
 
-#: src/shred.c:778
-#, fuzzy, c-format
+#: src/shred.c:870
+#, c-format
 msgid "%s: invalid file type"
-msgstr "%s: ugyldig antall linjer"
+msgstr ""
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr ""
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
-#, fuzzy, c-format
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
+#, c-format
 msgid "%s: error truncating"
-msgstr "%s: fil trunkert"
+msgstr ""
 
-#: src/shred.c:880
-#, fuzzy, c-format
+#: src/shred.c:989
+#, c-format
 msgid "%s: fcntl failed"
-msgstr "stat feilet"
+msgstr ""
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr ""
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr ""
 
-#: src/shred.c:991
-#, fuzzy, c-format
+#: src/shred.c:1102
+#, c-format
 msgid "%s: renamed to %s"
-msgstr "%s: lesefeil"
+msgstr ""
 
-#: src/shred.c:1013
-#, fuzzy, c-format
+#: src/shred.c:1124
+#, c-format
 msgid "%s: failed to remove"
-msgstr "%s: fil for lang"
+msgstr ""
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr ""
 
-#: src/shred.c:1024 src/shred.c:1067
-#, fuzzy, c-format
+#: src/shred.c:1135 src/shred.c:1178
+#, c-format
 msgid "%s: failed to close"
-msgstr "%s: fil for lang"
+msgstr ""
 
-#: src/shred.c:1060
-#, fuzzy, c-format
+#: src/shred.c:1171
+#, c-format
 msgid "%s: failed to open for writing"
-msgstr "%s: fil for lang"
+msgstr ""
 
-#: src/shred.c:1125
-#, fuzzy, c-format
+#: src/shred.c:1236
+#, c-format
 msgid "%s: invalid number of passes"
-msgstr "%s: ugyldig antall sekunder"
+msgstr ""
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, c-format
 msgid "multiple random sources specified"
 msgstr ""
 
-#: src/shred.c:1148
-#, fuzzy, c-format
+#: src/shred.c:1264
+#, c-format
 msgid "%s: invalid file size"
-msgstr "%s: ugyldig antall linjer"
+msgstr ""
 
-#: src/shuf.c:48
-#, fuzzy, c-format
+#: src/shuf.c:61
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
 "  or:  %s -e [OPTION]... [ARG]...\n"
 "  or:  %s -i LO-HI [OPTION]...\n"
 msgstr ""
-"Bruk : %s [FLAGG]... [INN]... (uten -G)\n"
-"eller: %s -G [FLAGG]... [INN [UT]]\n"
 
-#: src/shuf.c:54
-#, fuzzy
+#: src/shuf.c:67
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr ""
-"Skriv ut valgte deler av linjer fra hver FIL til standard ut.\n"
-"\n"
 
-#: src/shuf.c:60
+#: src/shuf.c:73
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
 "  -i, --input-range=LO-HI   treat each number LO through HI as an input "
@@ -7746,33 +8554,43 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
+msgstr ""
+
+#: src/shuf.c:228
+#, c-format
+msgid "too many input lines"
 msgstr ""
 
-#: src/shuf.c:244
+#: src/shuf.c:431
 #, c-format
 msgid "multiple -i options specified"
 msgstr ""
 
-#: src/shuf.c:264
-#, fuzzy, c-format
+#: src/shuf.c:452
+#, c-format
 msgid "invalid input range %s"
-msgstr "ugyldig antall"
+msgstr ""
 
-#: src/shuf.c:277
-#, fuzzy, c-format
+#: src/shuf.c:465
+#, c-format
 msgid "invalid line count %s"
-msgstr "ugyldig bredde: «%s»"
+msgstr ""
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, c-format
 msgid "multiple output files specified"
 msgstr ""
 
-#: src/shuf.c:310
-#, fuzzy, c-format
+#: src/shuf.c:502
+#, c-format
 msgid "cannot combine -e and -i options"
-msgstr "kan ikke opprette katalog %s"
+msgstr ""
+
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr ""
 
 #: src/sleep.c:44
 #, c-format
@@ -7788,78 +8606,55 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/sleep.c:135 src/timeout.c:320
-#, fuzzy, c-format
+#: src/sleep.c:135 src/timeout.c:323
+#, c-format
 msgid "invalid time interval %s"
-msgstr "ugyldig felt-nummer: «%s»"
+msgstr ""
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr ""
 
-#: src/sort.c:399
-#, fuzzy
+#: src/sort.c:427
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr ""
-"Skriv en sortert konkatenering av alle FIL(er) til standard ut.\n"
-"\n"
-"Sorteringsflagg:\n"
-"\n"
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
 msgstr ""
 
-#: src/sort.c:409
-#, fuzzy
+#: src/sort.c:437
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
 "  -d, --dictionary-order      consider only blanks and alphanumeric "
 "characters\n"
 "  -f, --ignore-case           fold lower case to upper case characters\n"
 msgstr ""
-"  -b, --ignore-leading-blanks ignorer ledende blanke\n"
-"  -d, --dictionary-order      behandle bare blanke og alfanumeriske tegn\n"
-"  -f, --ignore-case           konverter små bokstaver til store\n"
 
-#: src/sort.c:415
-#, fuzzy
+#: src/sort.c:443
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
 "  -i, --ignore-nonprinting    consider only printable characters\n"
 "  -M, --month-sort            compare (unknown) < 'JAN' < ... < 'DEC'\n"
 msgstr ""
-"  -g, --general-numeric-sort  sammenlign i henhold til vanlige nummériske\n"
-"                              verdier\n"
-"  -i, --ignore-nonprinting    behandle bare skrivbare tegn\n"
-"  -M, --month-sort            sammenlign (ukjent) < 'JAN' < ... < 'DEC'\n"
-"  -n, --numeric-sort          sammenlign i henhold til nummériske verdier\n"
-"  -r, --reverse               reversér resultatet av sammenligningene\n"
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 
-#: src/sort.c:423
-#, fuzzy
+#: src/sort.c:451
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
 "  -R, --random-sort           sort by random hash of keys\n"
 "      --random-source=FILE    get random bytes from FILE\n"
 "  -r, --reverse               reverse the result of comparisons\n"
 msgstr ""
-"  -g, --general-numeric-sort  sammenlign i henhold til vanlige nummériske\n"
-"                              verdier\n"
-"  -i, --ignore-nonprinting    behandle bare skrivbare tegn\n"
-"  -M, --month-sort            sammenlign (ukjent) < 'JAN' < ... < 'DEC'\n"
-"  -n, --numeric-sort          sammenlign i henhold til nummériske verdier\n"
-"  -r, --reverse               reversér resultatet av sammenligningene\n"
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -7869,19 +8664,19 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/sort.c:437
+#: src/sort.c:465
 msgid ""
 "Other options:\n"
 "\n"
 msgstr ""
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
 msgstr ""
 
-#: src/sort.c:445
+#: src/sort.c:473
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
 "  -C, --check=quiet, --check=silent  like -c, but do not report first bad "
@@ -7890,7 +8685,7 @@ msgid ""
 "                              decompress them with PROG -d\n"
 msgstr ""
 
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -7899,35 +8694,22 @@ msgid ""
 "                            If F is - then read names from standard input\n"
 msgstr ""
 
-#: src/sort.c:459
+#: src/sort.c:487
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
 "  -m, --merge               merge already sorted files; do not sort\n"
 msgstr ""
 
-#: src/sort.c:463
-#, fuzzy
+#: src/sort.c:491
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "  -s, --stable              stabilize sort by disabling last-resort "
 "comparison\n"
 "  -S, --buffer-size=SIZE    use SIZE for main memory buffer\n"
 msgstr ""
-"Andre flagg:\n"
-"\n"
-"  -c, --check               sjekk om inndata er sortert; ikke sortér\n"
-"  -k, --key=POS1[,POS2]     start en nøkkel ved POS1, avslutt ved POS2 (fra "
-"1)\n"
-"  -m, --merge               flett sammen allerede sorterte filer; ikke "
-"sortér\n"
-"  -o, --output=FIL          skriv resultater til FIL isteden for standard "
-"ut\n"
-"  -s, --stable              stabiliser sortering ved å slå av siste-utvei-\n"
-"                            sammenligning\n"
-"  -S, --buffer-size=STØRR   bruk STØRRelse stort minne-buffer\n"
 
-#: src/sort.c:469
-#, fuzzy, c-format
+#: src/sort.c:497
+#, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
 "transition\n"
@@ -7940,21 +8722,8 @@ msgid ""
 "                              without -c, output only the first of an equal "
 "run\n"
 msgstr ""
-"  -t, --field-separator=SKILL bruk SKILL isteden for ikke- til -tomrom-"
-"overgang\n"
-"  -T, --temporary-directory=KAT bruk KATalog for midlertidige filer, ikke\n"
-"                              $TMPDIR eller %s.  Kan gjentas for å\n"
-"                              spesifisere flere kataloger\n"
-"  -u, --unique              med -c: sjekk for streng sortering\n"
-"                              ellers, bare skriv ut det første av to like\n"
-
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr ""
-"  -z, --zero-terminated     avslutt linjer med en 0-oktett, ikke linjeskift\n"
 
-#: src/sort.c:483
-#, fuzzy
+#: src/sort.c:511
 msgid ""
 "\n"
 "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is "
@@ -7972,15 +8741,8 @@ msgid ""
 "\n"
 "SIZE may be followed by the following multiplicative suffixes:\n"
 msgstr ""
-"\n"
-"POS er F[.C][OPTS], hvor F er feltnummeret og C er tegnposisjonen\n"
-"i feltet.  OPTS er en eller flere enbokstav-sorteringflagg, som\n"
-"overstyrer globale sorteringsflagg for den nøkkelen.  Hvis ingen nøkkel\n"
-"er oppgitt, bruk hele linjen som nøkkel.\n"
-"\n"
-"STØRRELSE kan være fulgt av de følgende multiplikator-endelsene:\n"
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -7991,308 +8753,272 @@ msgid ""
 "Set LC_ALL=C to get the traditional sort order that uses\n"
 "native byte values.\n"
 msgstr ""
-"% 1% av minne, b 1, K 1024 (forvalgt) og så videre for M, G, T, P, E, Z, Y.\n"
-"\n"
-"Dersom ingen FIL er oppgitt eller FIL er -, leses det fra standard inn.\n"
-"\n"
-"*** ADVARSEL ***\n"
-"Lokalet spesifisert av miljøet påvirker sorteringsrekkefølge.\n"
-"Sett LC_ALL=C for å få den tradisjonelle sorteringsrekkefølgen som\n"
-"bruker negative oktett-verdier.\n"
 
-#: src/sort.c:697
-#, fuzzy, c-format
+#: src/sort.c:725
+#, c-format
 msgid "waiting for %s [-d]"
-msgstr "feil ved skriving til %s"
+msgstr ""
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr ""
 
-#: src/sort.c:856
-#, fuzzy, c-format
+#: src/sort.c:884
+#, c-format
 msgid "cannot create temporary file in %s"
-msgstr "kan ikke opprette midlertidig fil"
+msgstr ""
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
-msgstr "Ã¥pning av fil feilet"
+msgstr ""
 
-#: src/sort.c:970
-#, fuzzy
+#: src/sort.c:998
 msgid "fflush failed"
-msgstr "feil ved lukking av fil"
+msgstr ""
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
-msgstr "feil ved lukking av fil"
-
-#: src/sort.c:986
-#, fuzzy, c-format
-msgid "dup2 failed"
-msgstr "Ã¥pning av fil feilet"
-
-#: src/sort.c:1103
-#, fuzzy, c-format
-msgid "couldn't execute %s"
-msgstr "kan ikke opprette katalog %s"
+msgstr ""
 
-#: src/sort.c:1110
-#, fuzzy
+#: src/sort.c:1140
 msgid "couldn't create temporary file"
-msgstr "kan ikke opprette midlertidig fil"
+msgstr ""
 
-#: src/sort.c:1149
-#, fuzzy, c-format
+#: src/sort.c:1179
+#, c-format
 msgid "couldn't create process for %s -d"
-msgstr "kan ikke opprette katalog %s"
-
-#: src/sort.c:1161
-#, fuzzy, c-format
-msgid "couldn't execute %s -d"
-msgstr "kan ikke opprette katalog %s"
+msgstr ""
 
-#: src/sort.c:1220
-#, fuzzy, c-format
+#: src/sort.c:1252
+#, c-format
 msgid "warning: cannot remove: %s"
-msgstr "kan ikke opprette katalog %s"
+msgstr ""
 
-#: src/sort.c:1306
-#, fuzzy, c-format
+#: src/sort.c:1338
+#, c-format
 msgid "invalid --%s argument %s"
-msgstr "ugyldig argument %s for %s"
+msgstr ""
 
-#: src/sort.c:1309
-#, fuzzy, c-format
+#: src/sort.c:1341
+#, c-format
 msgid "minimum --%s argument is %s"
-msgstr "flertydig argument %s for %s"
+msgstr ""
 
-#: src/sort.c:1324
-#, fuzzy, c-format
+#: src/sort.c:1356
+#, c-format
 msgid "--%s argument %s too large"
-msgstr "%s: tall «%.*s» for stort"
+msgstr ""
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr ""
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr ""
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
-msgstr "stat feilet"
+msgstr ""
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
-msgstr "feil ved lesing"
+msgstr ""
 
-#: src/sort.c:2043
-#, fuzzy, c-format
+#: src/sort.c:2076
+#, c-format
 msgid "string transformation failed"
-msgstr "strengsammenligning feilet"
+msgstr ""
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, c-format
 msgid "the untransformed string was %s"
 msgstr ""
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr ""
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr ""
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr ""
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr ""
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr ""
 
-#: src/sort.c:2451
-#, fuzzy, c-format
+#: src/sort.c:2484
+#, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
-msgstr[0] "%s: flagget «%s» er flertydig\n"
-msgstr[1] "%s: flagget «%s» er flertydig\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr ""
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
-msgstr "feil ved skriving"
+msgstr ""
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
-msgstr "%s: %s:%s: uorden: "
+msgstr ""
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
-msgstr "standard feilkanal"
+msgstr ""
 
-#: src/sort.c:3698
-#, fuzzy
+#: src/sort.c:3738
 msgid "cannot read"
-msgstr "kan ikke opprette katalog %s"
+msgstr ""
 
-#: src/sort.c:3976
-#, fuzzy, c-format
+#: src/sort.c:4017
+#, c-format
 msgid "%s: invalid field specification %s"
-msgstr "%s: ugyldig feltspesifikasjon «%s»"
+msgstr ""
 
-#: src/sort.c:3987
-#, fuzzy, c-format
+#: src/sort.c:4028
+#, c-format
 msgid "options '-%s' are incompatible"
-msgstr "%s: flagget «%s» er flertydig\n"
+msgstr ""
 
-#: src/sort.c:4038
-#, fuzzy, c-format
+#: src/sort.c:4079
+#, c-format
 msgid "%s: invalid count at start of %s"
-msgstr "%s: ugyldig tall på starten av «%s»"
+msgstr ""
 
-#: src/sort.c:4295
-#, fuzzy
+#: src/sort.c:4336
 msgid "invalid number after '-'"
-msgstr "ugyldig tall etter «-»"
+msgstr ""
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
-#, fuzzy
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 msgid "invalid number after '.'"
-msgstr "ugyldig tall etter «.»"
+msgstr ""
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
-msgstr "ugyldig tegn i feltspesifikasjon"
+msgstr ""
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, c-format
 msgid "multiple compress programs specified"
 msgstr ""
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
-msgstr "ugyldig tall i feltstart"
+msgstr ""
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
-msgstr "felt-nummer er null"
+msgstr ""
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
-msgstr "tegn-posisjon er null"
+msgstr ""
 
-#: src/sort.c:4407
-#, fuzzy
+#: src/sort.c:4448
 msgid "invalid number after ','"
-msgstr "ugyldig tall etter «,»"
+msgstr ""
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr ""
 
-#: src/sort.c:4550 src/wc.c:692
-#, fuzzy, c-format
+#: src/sort.c:4591 src/wc.c:692
+#, c-format
 msgid "cannot read file names from %s"
-msgstr "Strengene som ble sammenlignet var «%s» og «%s»."
+msgstr ""
 
-#: src/sort.c:4572
-#, fuzzy, c-format
+#: src/sort.c:4613
+#, c-format
 msgid "%s:%lu: invalid zero-length file name"
-msgstr "%s: ugyldig antall linjer"
+msgstr ""
 
-#: src/sort.c:4578
-#, fuzzy, c-format
+#: src/sort.c:4619
+#, c-format
 msgid "no input from %s"
-msgstr "lager filen «%s»\n"
+msgstr ""
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr ""
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr ""
 
-#: src/sort.c:4658
-#, fuzzy, c-format
+#: src/sort.c:4699
+#, c-format
 msgid "extra operand %s not allowed with -%c"
-msgstr "ekstra operator «%s» ikke tillatt med -c"
+msgstr ""
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr ""
 
-#: src/split.c:204
-#, fuzzy, c-format
+#: src/split.c:203
+#, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
-msgstr "Bruk: %s [FLAGG] [INPUT [PREFIKS]]\n"
+msgstr ""
 
-#: src/split.c:208
-#, fuzzy
+#: src/split.c:207
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
 "size is 1000 lines, and default PREFIX is 'x'.  With no INPUT, or when "
 "INPUT\n"
 "is -, read standard input.\n"
 msgstr ""
-"Skriv stykker av fast størrelse av INPUT til PREFIKSaa, PREFIKSab, ...;\n"
-"Forvalgt PREFIKS er `x'. Dersom ingen INPUT er spesifisert, eller INPUT er "
-"-,\n"
-"leses det fra standard inn.\n"
-"\n"
 
-#: src/split.c:216
+#: src/split.c:215
 #, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
 
-#: src/split.c:229
+#: src/split.c:228
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
 "                            output file is opened\n"
 msgstr ""
 
-#: src/split.c:236
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -8304,189 +9030,189 @@ msgid ""
 "r/K/N   likewise but only output Kth of N to stdout\n"
 msgstr ""
 
-#: src/split.c:354
+#: src/split.c:353
 #, c-format
 msgid "output file suffixes exhausted"
 msgstr ""
 
-#: src/split.c:366
-#, fuzzy, c-format
+#: src/split.c:365
+#, c-format
 msgid "creating file %s\n"
-msgstr "lager filen «%s»\n"
+msgstr ""
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr ""
 
-#: src/split.c:391
+#: src/split.c:390
 #, c-format
 msgid "failed to set FILE environment variable"
 msgstr ""
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr ""
 
-#: src/split.c:395
+#: src/split.c:394
 #, c-format
 msgid "failed to create pipe"
 msgstr ""
 
-#: src/split.c:409
-#, fuzzy, c-format
+#: src/split.c:408
+#, c-format
 msgid "closing prior pipe"
-msgstr "lager filen «%s»\n"
+msgstr ""
 
-#: src/split.c:411
-#, fuzzy, c-format
+#: src/split.c:410
+#, c-format
 msgid "closing output pipe"
-msgstr "lager filen «%s»\n"
+msgstr ""
 
-#: src/split.c:415
-#, fuzzy, c-format
+#: src/split.c:414
+#, c-format
 msgid "moving input pipe"
-msgstr "lager filen «%s»\n"
+msgstr ""
 
-#: src/split.c:417
-#, fuzzy, c-format
+#: src/split.c:416
+#, c-format
 msgid "closing input pipe"
-msgstr "lager filen «%s»\n"
+msgstr ""
 
-#: src/split.c:422
+#: src/split.c:421
 #, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr ""
 
-#: src/split.c:428
+#: src/split.c:427
 #, c-format
 msgid "failed to close input pipe"
 msgstr ""
 
-#: src/split.c:464
+#: src/split.c:463
 #, c-format
 msgid "waiting for child process"
 msgstr ""
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr ""
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr ""
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr ""
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
-msgstr "kan ikke dele opp på mer enn én måte"
+msgstr ""
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
-#, fuzzy, c-format
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
+#, c-format
 msgid "%s: invalid number of chunks"
-msgstr "%s: ugyldig antall sekunder"
+msgstr ""
 
-#: src/split.c:1069
-#, fuzzy, c-format
+#: src/split.c:1119
+#, c-format
 msgid "%s: invalid chunk number"
-msgstr "%s: ugyldig nummer"
+msgstr ""
 
-#: src/split.c:1119
-#, fuzzy, c-format
+#: src/split.c:1169
+#, c-format
 msgid "%s: invalid suffix length"
-msgstr "%s: ugyldig antall linjer"
+msgstr ""
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
-msgstr "%s: ugyldig antall bytes"
+msgstr ""
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
-msgstr "%s: ugyldig antall linjer"
+msgstr ""
 
-#: src/split.c:1236
-#, fuzzy, c-format
+#: src/split.c:1286
+#, c-format
 msgid "line count option -%s%c... is too large"
-msgstr "%s: tall «%.*s» for stort"
+msgstr ""
 
-#: src/split.c:1248
-#, fuzzy, c-format
+#: src/split.c:1298
+#, c-format
 msgid "%s: invalid start value for numerical suffix"
-msgstr "ugyldig startlinjenummer: «%s»"
+msgstr ""
 
-#: src/split.c:1276
-#, fuzzy, c-format
+#: src/split.c:1326
+#, c-format
 msgid "%s: invalid IO block size"
-msgstr "%s: ugyldig antall linjer"
+msgstr ""
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr ""
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr ""
 
-#: src/split.c:1369
-#, fuzzy, c-format
+#: src/split.c:1419
+#, c-format
 msgid "%s: cannot determine file size"
-msgstr "kan ikke opprette midlertidig fil"
+msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr ""
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, c-format
 msgid "failed to canonicalize %s"
 msgstr ""
 
-#: src/stat.c:1069
-#, fuzzy, c-format
+#: src/stat.c:1129
+#, c-format
 msgid "warning: unrecognized escape '\\%c'"
-msgstr "%s: ukjent flagg «%c%s»\n"
+msgstr ""
 
-#: src/stat.c:1124
-#, fuzzy, c-format
+#: src/stat.c:1184
+#, c-format
 msgid "%s: invalid directive"
-msgstr "%s: ugyldig mønster"
+msgstr ""
 
-#: src/stat.c:1170
-#, fuzzy, c-format
+#: src/stat.c:1231
+#, c-format
 msgid "warning: backslash at end of format"
-msgstr "ugyldig backslash-beskyttelse ved slutten av streng"
+msgstr ""
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr ""
 
-#: src/stat.c:1208
-#, fuzzy, c-format
+#: src/stat.c:1269
+#, c-format
 msgid "cannot read file system information for %s"
-msgstr "kan ikke opprette katalog %s"
+msgstr ""
 
-#: src/stat.c:1228
-#, fuzzy, c-format
+#: src/stat.c:1290
+#, c-format
 msgid "cannot stat standard input"
-msgstr "standard inn"
+msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -8497,7 +9223,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -8505,30 +9231,30 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, c-format
 msgid "Context: %C\n"
 msgstr ""
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -8536,27 +9262,27 @@ msgid ""
 " Birth: %w\n"
 msgstr ""
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
 msgstr ""
 
-#: src/stat.c:1356
+#: src/stat.c:1418
 msgid ""
 "  -L, --dereference     follow links\n"
 "  -f, --file-system     display file system status instead of file status\n"
 msgstr ""
 
-#: src/stat.c:1360
+#: src/stat.c:1422
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 msgid ""
 "\n"
 "The valid format sequences for files (without --file-system):\n"
@@ -8568,7 +9294,7 @@ msgid ""
 "  %C   SELinux security context string\n"
 msgstr ""
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 msgid ""
 "  %d   device number in decimal\n"
 "  %D   device number in hex\n"
@@ -8578,7 +9304,7 @@ msgid ""
 "  %G   group name of owner\n"
 msgstr ""
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 msgid ""
 "  %h   number of hard links\n"
 "  %i   inode number\n"
@@ -8587,11 +9313,11 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 
-#: src/stat.c:1399
+#: src/stat.c:1461
 msgid ""
 "  %u   user ID of owner\n"
 "  %U   user name of owner\n"
@@ -8599,14 +9325,14 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 msgid ""
 "Valid format sequences for file systems:\n"
 "\n"
@@ -8617,7 +9343,7 @@ msgid ""
 "  %f   free blocks in file system\n"
 msgstr ""
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 msgid ""
 "  %i   file system ID in hex\n"
 "  %l   maximum length of filenames\n"
@@ -8629,9 +9355,9 @@ msgid ""
 msgstr ""
 
 #: src/stdbuf.c:90
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: %s OPTION... COMMAND\n"
-msgstr "Bruk: %s [FLAGG] [FIL]...\n"
+msgstr ""
 
 #: src/stdbuf.c:91
 msgid ""
@@ -8678,22 +9404,27 @@ msgid ""
 "and are thus unaffected by 'stdbuf' settings.\n"
 msgstr ""
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, c-format
 msgid "failed to find %s"
 msgstr ""
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, c-format
 msgid "failed to update the environment with %s"
 msgstr ""
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr ""
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, c-format
+msgid "you must specify a buffering mode option"
+msgstr ""
+
+#: src/stty.c:516
 #, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -8701,25 +9432,25 @@ msgid ""
 "  or:  %s [-F DEVICE | --file=DEVICE] [-g|--save]\n"
 msgstr ""
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
 msgstr ""
 
-#: src/stty.c:525
+#: src/stty.c:528
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
 "  -g, --save         print all current settings in a stty-readable form\n"
 "  -F, --file=DEVICE  open and use the specified DEVICE instead of stdin\n"
 msgstr ""
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
 "settings.  The underlying system defines which settings are available.\n"
 msgstr ""
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -8728,7 +9459,7 @@ msgid ""
 "   eol CHAR      CHAR will end the line\n"
 msgstr ""
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -8736,7 +9467,7 @@ msgid ""
 "   kill CHAR     CHAR will erase the current line\n"
 msgstr ""
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -8744,7 +9475,7 @@ msgid ""
 "   start CHAR    CHAR will restart the output after stopping it\n"
 msgstr ""
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -8752,7 +9483,7 @@ msgid ""
 " * werase CHAR   CHAR will erase the last word typed\n"
 msgstr ""
 
-#: src/stty.c:562
+#: src/stty.c:565
 msgid ""
 "\n"
 "Special settings:\n"
@@ -8761,7 +9492,7 @@ msgid ""
 " * columns N     same as cols N\n"
 msgstr ""
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -8770,7 +9501,7 @@ msgid ""
 "   ospeed N      set the output speed to N\n"
 msgstr ""
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -8779,7 +9510,7 @@ msgid ""
 "   time N        with -icanon, set read timeout of N tenths of a second\n"
 msgstr ""
 
-#: src/stty.c:581
+#: src/stty.c:584
 msgid ""
 "\n"
 "Control settings:\n"
@@ -8790,7 +9521,7 @@ msgid ""
 "   csN           set character size to N bits, N in [5..8]\n"
 msgstr ""
 
-#: src/stty.c:590
+#: src/stty.c:593
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
 "   [-]hup        send a hangup signal when the last process closes the tty\n"
@@ -8798,9 +9529,10 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -8810,7 +9542,7 @@ msgid ""
 "   [-]igncr      ignore carriage return\n"
 msgstr ""
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -8819,11 +9551,11 @@ msgid ""
 "   [-]istrip     clear high (8th) bit of input characters\n"
 msgstr ""
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr ""
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -8833,7 +9565,7 @@ msgid ""
 "   [-]tandem     same as [-]ixoff\n"
 msgstr ""
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -8843,17 +9575,17 @@ msgid ""
 " * nlN           newline delay style, N in [0..1]\n"
 msgstr ""
 
-#: src/stty.c:631
+#: src/stty.c:635
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
 " * [-]onlret     newline performs a carriage return\n"
 msgstr ""
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -8863,7 +9595,7 @@ msgid ""
 " * vtN           vertical tab delay style, N in [0..1]\n"
 msgstr ""
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -8872,7 +9604,7 @@ msgid ""
 " * -crtkill      kill all line by obeying the echoctl and echok settings\n"
 msgstr ""
 
-#: src/stty.c:654
+#: src/stty.c:658
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
 "   [-]echo       echo input characters\n"
@@ -8881,7 +9613,7 @@ msgid ""
 "   [-]echok      echo a newline after a kill character\n"
 msgstr ""
 
-#: src/stty.c:661
+#: src/stty.c:665
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
 "   [-]echonl     echo newline even if not echoing other characters\n"
@@ -8890,7 +9622,7 @@ msgid ""
 "   [-]iexten     enable non-POSIX special characters\n"
 msgstr ""
 
-#: src/stty.c:668
+#: src/stty.c:672
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
 "   [-]noflsh     disable flushing after interrupt and quit special "
@@ -8900,7 +9632,7 @@ msgid ""
 " * [-]xcase      with icanon, escape with '\\' for uppercase characters\n"
 msgstr ""
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -8909,7 +9641,7 @@ msgid ""
 "   -cbreak       same as icanon\n"
 msgstr ""
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -8917,7 +9649,7 @@ msgid ""
 "   crt           same as echoe echoctl echoke\n"
 msgstr ""
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -8926,7 +9658,7 @@ msgid ""
 "   evenp         same as parenb -parodd cs7\n"
 msgstr ""
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -8936,7 +9668,7 @@ msgid ""
 "   -nl           same as icrnl -inlcr -igncr onlcr -ocrnl -onlret\n"
 msgstr ""
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -8945,7 +9677,7 @@ msgid ""
 "   -pass8        same as parenb istrip cs7\n"
 msgstr ""
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -8953,7 +9685,7 @@ msgid ""
 "   -raw          same as cooked\n"
 msgstr ""
 
-#: src/stty.c:716
+#: src/stty.c:720
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
 "                 -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n"
@@ -8963,7 +9695,7 @@ msgid ""
 "                 characters to their default values\n"
 msgstr ""
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -8972,77 +9704,71 @@ msgid ""
 "127; special values ^- or undef used to disable special characters.\n"
 msgstr ""
 
-#: src/stty.c:796
-#, fuzzy, c-format
+#: src/stty.c:800
+#, c-format
 msgid "only one device may be specified"
-msgstr "kun ett argument kan spesifiseres"
+msgstr ""
 
-#: src/stty.c:826
-#, fuzzy, c-format
+#: src/stty.c:830
+#, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
 "mutually exclusive"
-msgstr "flaggene --string og --check kan ikke brukes samtidig"
+msgstr ""
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr ""
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr ""
 
-#: src/stty.c:892 src/stty.c:1002
-#, fuzzy, c-format
+#: src/stty.c:896 src/stty.c:1006
+#, c-format
 msgid "invalid argument %s"
-msgstr "ugyldig argument %s for %s"
+msgstr ""
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
-#, fuzzy, c-format
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
+#, c-format
 msgid "missing argument to %s"
-msgstr "flertydig argument %s for %s"
+msgstr ""
 
-#: src/stty.c:983
-#, fuzzy, c-format
+#: src/stty.c:987
+#, c-format
 msgid "invalid line discipline %s"
-msgstr "ugyldig bredde: «%s»"
+msgstr ""
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr ""
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr ""
 
-#: src/stty.c:1920
-#, fuzzy, c-format
+#: src/stty.c:1924
+#, c-format
 msgid "invalid integer argument %s"
-msgstr "ugyldig linjenummer-økning: «%s»"
+msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/sum.c:37
-#, fuzzy
 msgid "Kayvan Aghaiepour"
-msgstr "Kayvan Aghaiepour og David MacKenzie"
+msgstr ""
 
 #: src/sum.c:62
-#, fuzzy
 msgid ""
 "Print checksum and block counts for each FILE.\n"
 "\n"
 "  -r              use BSD sum algorithm, use 1K blocks\n"
 "  -s, --sysv      use System V sum algorithm, use 512 bytes blocks\n"
 msgstr ""
-"Skriv ut sjekksum og block-antall for hver FIL.\n"
-"\n"
-"  -r              bruk BSD-sum-algoritme, bruk 1K-blokker\n"
-"  -s, --sysv      bruk SystemV-sum-algoritme, bruk 512 byte-blokker\n"
 
 #: src/sync.c:41
 msgid ""
@@ -9051,9 +9777,9 @@ msgid ""
 msgstr ""
 
 #: src/sync.c:69
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring all arguments"
-msgstr "for mange argumenter"
+msgstr ""
 
 #: src/system.h:343
 #, c-format
@@ -9066,29 +9792,27 @@ msgstr ""
 
 #: src/system.h:349
 msgid "      --help     display this help and exit\n"
-msgstr "      --help     vis denne hjelpteksten og avslutt\n"
+msgstr ""
 
 #: src/system.h:351
 msgid "      --version  output version information and exit\n"
-msgstr "      --version  vis programversjon og avslutt\n"
+msgstr ""
 
-#: src/system.h:544
-#, fuzzy
+#: src/system.h:543
 msgid ""
 "\n"
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
-"Obligatoriske argmenter til lange flagg er obligatoriske også for korte.\n"
 
-#: src/system.h:552
+#: src/system.h:551
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -9097,35 +9821,33 @@ msgid ""
 "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n"
 msgstr ""
 
-#: src/system.h:571
-#, fuzzy, c-format
+#: src/system.h:570
+#, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
+"%s online help: <%s>\n"
 msgstr ""
-"\n"
-"Rapportér feil til <bug-textutils@gnu.org>."
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr ""
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr ""
 
-#: src/system.h:596
-#, fuzzy, c-format
+#: src/system.h:591
+#, c-format
 msgid "Try '%s --help' for more information.\n"
-msgstr "Prøv med «%s --help» for mer informasjon.\n"
+msgstr ""
 
-#: src/system.h:628
+#: src/system.h:633
 #, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -9141,66 +9863,57 @@ msgid "Jay Lepreau"
 msgstr ""
 
 #: src/tac.c:137
-#, fuzzy
 msgid ""
 "Write each FILE to standard output, last line first.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
-"Skriv hver FIL til standard ut, siste linje først.\n"
-"Dersom ingen FIL er spesifisert, eller FIL er -, leses det fra standard "
-"inn.\n"
-"\n"
 
 #: src/tac.c:144
-#, fuzzy
 msgid ""
 "  -b, --before             attach the separator before instead of after\n"
 "  -r, --regex              interpret the separator as a regular expression\n"
 "  -s, --separator=STRING   use STRING as the separator instead of newline\n"
 msgstr ""
-"  -b, --before             føy til separator før istedet for etter\n"
-"  -r, --regex              tolk separatoren som et regulært uttrykk\n"
-"  -s, --separator=STRENG   bruk STRENG som separator istedet for linjeskift\n"
 
 #: src/tac.c:234 src/tac.c:335
-#, fuzzy, c-format
+#, c-format
 msgid "%s: seek failed"
-msgstr "feil ved lukking av fil"
+msgstr ""
 
 #: src/tac.c:263
-#, fuzzy, c-format
+#, c-format
 msgid "record too large"
-msgstr "%s: fil for lang"
+msgstr ""
 
 #: src/tac.c:450
-#, fuzzy, c-format
+#, c-format
 msgid "failed to create temporary file in %s"
-msgstr "kan ikke opprette midlertidig fil"
+msgstr ""
 
 #: src/tac.c:458
-#, fuzzy, c-format
+#, c-format
 msgid "failed to open %s for writing"
-msgstr "%s: fil for lang"
+msgstr ""
 
 #: src/tac.c:475
-#, fuzzy, c-format
+#, c-format
 msgid "failed to rewind stream for %s"
-msgstr "kan ikke opprette katalog %s"
+msgstr ""
 
 #: src/tac.c:511 src/tac.c:518
-#, fuzzy, c-format
+#, c-format
 msgid "%s: write error"
-msgstr "feil ved skriving"
+msgstr ""
 
 #: src/tac.c:571
-#, fuzzy, c-format
+#, c-format
 msgid "failed to open %s for reading"
-msgstr "%s: fil for lang"
+msgstr ""
 
 #: src/tac.c:629
 #, c-format
 msgid "separator cannot be empty"
-msgstr "separatoren kan ikke være tom"
+msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/tail.c:71
@@ -9208,87 +9921,57 @@ msgid "Ian Lance Taylor"
 msgstr ""
 
 #: src/tail.c:262
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Print the last %d lines of each FILE to standard output.\n"
 "With more than one FILE, precede each with a header giving the file name.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
-"Skriv de siste %d linjene av hver FIL til standard ut.\n"
-"Med mer enn én FIL, innled hver med en topptekst med filnavnet.\n"
-"Med ingen FILer eller hvis FIL er -, les fra standard inn.\n"
-"\n"
 
 #: src/tail.c:270
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
 
 #: src/tail.c:274
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
-"  -f, --follow[={name|descriptor}]\n"
-"                           skriv ut mer data etter hvert som filen vokser;\n"
-"                           -f, --follow og --follow=descriptot er de samme\n"
-"  -F                       samme som --follow=name --retry\n"
 
-#: src/tail.c:281
-#, fuzzy, c-format
+#: src/tail.c:280
+#, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
-"  -n, --lines=N            skriv ut de siste N linjene, isteden for de siste "
-"%d\n"
-"      --max-unchanged-stats=N\n"
-"                           med --follow=name, åpne en FIL på nytt hvis den\n"
-"                           ikke har endret størrelse etter N (forvalgt %d)\n"
-"                           runder for å se om den har blitt fjernet eller\n"
-"                           skiftet navn\n"
-"                           (dette er det vanlige tilfellet for roterte\n"
-"                           logg-filer\n"
 
-#: src/tail.c:294
-#, fuzzy
+#: src/tail.c:293
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
-"      --pid=PID            med -f, terminer etter at prosess PID dør\n"
-"  -q, --quiet, --silent    ikke skriv ut topptekster med filnavn\n"
-"  -s, --sleep-interval=S   med -f, hver runde varer circa S (forvalgt 1) "
-"sekunder\n"
-"  -v, --verbose            skriv alltid topptekster med filnavn\n"
 
-#: src/tail.c:301
+#: src/tail.c:298
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 
-#: src/tail.c:310
-#, fuzzy
+#: src/tail.c:307
 msgid ""
 "\n"
 "If the first character of K (the number of bytes or lines) is a '+',\n"
@@ -9298,14 +9981,8 @@ msgid ""
 "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n"
 "\n"
 msgstr ""
-"\n"
-"Hvis det første tegnet av N (antall oktetter eller linjer) er en «+»,\n"
-"begynn å skriv ut med det Nte elementet fra starten av hver linje, ellers\n"
-"skriv de siste N elementene i filen.  N kan ha multiplikatorendelse:\n"
-"b for 512, k for 1024, m for 1048576 (1 Meg).  "
 
-#: src/tail.c:319
-#, fuzzy
+#: src/tail.c:316
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
 "means that even if a tail'ed file is renamed, tail will continue to track\n"
@@ -9314,169 +9991,165 @@ msgid ""
 "rotation).  Use --follow=name in that case.  That causes tail to track the\n"
 "named file in a way that accommodates renaming, removal and creation.\n"
 msgstr ""
-"Denne forvalgte oppførselen er ikke ønskelig når det du virkelige vil\n"
-"gjøre er å følge selve filnavnet og ikke fildeskriptoren (f.eks. logg-\n"
-"rotering).  Bruk --follow=name i det tilfellet.  Dette fører til at\n"
-"tail følger den navngitte filen ved å gjenåpne filen periodisk for å se om\n"
-"den har blitt fjernet og gjenopprettet av et annet program.\n"
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
-msgstr "lukker %s (fd=%d)"
-
-#: src/tail.c:453
-#, fuzzy, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr "%s: kan ikke søke til relativ posisjon %s%s"
+msgstr ""
 
-#: src/tail.c:457
-#, fuzzy, c-format
+#: src/tail.c:461
+#, c-format
 msgid "%s: cannot seek to end-relative offset %s"
-msgstr "%s: kan ikke søke til posisjon %s%s relativ til slutten"
+msgstr ""
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr ""
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
 "reverting to polling"
 msgstr ""
 
-#: src/tail.c:963
-#, fuzzy, c-format
-msgid "%s has become inaccessible"
-msgstr "«%s» har blitt utilgjengelig"
+#: src/tail.c:965
+#, c-format
+msgid "%s has been replaced with a symbolic link. giving up on this name"
+msgstr ""
 
 #: src/tail.c:980
-#, fuzzy, c-format
+#, c-format
+msgid "%s has become inaccessible"
+msgstr ""
+
+#: src/tail.c:997
+#, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr ""
-"«%s» har blitt erstattet av en ikke-tailbar fil; gir opp dette filnavnet"
 
-#: src/tail.c:989
-#, fuzzy, c-format
+#: src/tail.c:1006
+#, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr ""
-"«%s» har blitt erstattet av en ikke-tailbar fil; gir opp dette filnavnet"
 
-#: src/tail.c:1010
-#, fuzzy, c-format
+#: src/tail.c:1027
+#, c-format
 msgid "%s has become accessible"
-msgstr "«%s» har blitt utilgjengelig"
+msgstr ""
 
-#: src/tail.c:1018
-#, fuzzy, c-format
+#: src/tail.c:1035
+#, c-format
 msgid "%s has appeared;  following end of new file"
-msgstr "«%s» har blitt opprettet.  Følger etter slutten av ny fil"
+msgstr ""
 
-#: src/tail.c:1029
-#, fuzzy, c-format
+#: src/tail.c:1046
+#, c-format
 msgid "%s has been replaced;  following end of new file"
-msgstr "«%s» har blitt erstattet.  Følger etter slutten av ny fil"
+msgstr ""
 
-#: src/tail.c:1130
-#, fuzzy, c-format
+#: src/tail.c:1163
+#, c-format
 msgid "%s: cannot change nonblocking mode"
-msgstr "kan ikke endre eier og/eller gruppe for %s"
+msgstr ""
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
-msgstr "%s: fil trunkert"
+msgstr ""
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
-msgstr "ingen filer igjen"
+msgstr ""
 
-#: src/tail.c:1369
-#, fuzzy, c-format
+#: src/tail.c:1424
+#, c-format
 msgid "cannot watch parent directory of %s"
-msgstr "kan ikke opprette katalog %s"
+msgstr ""
 
-#: src/tail.c:1372 src/tail.c:1387
-#, fuzzy, c-format
+#: src/tail.c:1427 src/tail.c:1442
+#, c-format
 msgid "inotify resources exhausted"
-msgstr "virtuelt minne oppbrukt"
+msgstr ""
 
-#: src/tail.c:1390 src/tail.c:1519
-#, fuzzy, c-format
+#: src/tail.c:1445 src/tail.c:1577
+#, c-format
 msgid "cannot watch %s"
-msgstr "kan ikke opprette katalog %s"
+msgstr ""
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr ""
 
-#: src/tail.c:1493
-#, fuzzy, c-format
+#: src/tail.c:1549
+#, c-format
 msgid "error reading inotify event"
-msgstr "feil ved lesing av %s"
+msgstr ""
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
-msgstr "%s: kan ikke følge slutten av en fil av denne typen; gir opp denne"
+msgstr ""
 
-#: src/tail.c:1903
-#, fuzzy, c-format
+#: src/tail.c:1961
+#, c-format
 msgid "number in %s is too large"
-msgstr "%s er for stor"
+msgstr ""
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr ""
-"%s: ugyldig maksimum antall av uendrete resultat av kall til stat() mellom "
-"kall til open()"
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
-msgstr "%s: ugyldig prosess-id"
+msgstr ""
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
-msgstr "%s: ugyldig antall sekunder"
+msgstr ""
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr ""
 
-#: src/tail.c:2034
-#, fuzzy, c-format
-msgid "warning: --retry is useful mainly when following by name"
-msgstr "advarsel:  --retry er nyttig kun når en følger ved navn"
+#: src/tail.c:2096
+#, c-format
+msgid "warning: --retry ignored; --retry is useful only when following"
+msgstr ""
+
+#: src/tail.c:2100
+#, c-format
+msgid "warning: --retry only effective for the initial open"
+msgstr ""
 
-#: src/tail.c:2038
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
-msgstr "advarsel: PID ignoreres; --pid=PID er bare nyttid når man følger"
+msgstr ""
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
-msgstr "advarsel: --pid=PID er ikke støttet på dette systemet"
+msgstr ""
 
-#: src/tail.c:2142
-#, fuzzy, c-format
+#: src/tail.c:2209
+#, c-format
 msgid "cannot follow %s by name"
-msgstr "kan ikke opprette midlertidig fil"
+msgstr ""
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr ""
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr ""
@@ -9490,23 +10163,20 @@ msgid ""
 msgstr ""
 
 #: src/tee.c:71
-#, fuzzy
 msgid ""
 "\n"
 "If a FILE is -, copy again to standard output.\n"
 msgstr ""
-"\n"
-"Når ingen FIL eller når FIL er -, les fra standard inn.\n"
 
 #: src/test.c:123
-#, fuzzy, c-format
+#, c-format
 msgid "missing argument after %s"
-msgstr "flertydig argument %s for %s"
+msgstr ""
 
 #: src/test.c:159
-#, fuzzy, c-format
+#, c-format
 msgid "invalid integer %s"
-msgstr "ugyldig antall"
+msgstr ""
 
 #: src/test.c:241
 msgid "')' expected"
@@ -9535,17 +10205,15 @@ msgid "-ot does not accept -l"
 msgstr ""
 
 #: src/test.c:367
-#, fuzzy
 msgid "unknown binary operator"
-msgstr "Ukjent systemfeil"
+msgstr ""
 
 #: src/test.c:646
-#, fuzzy, c-format
+#, c-format
 msgid "%s: binary operator expected"
-msgstr "Ukjent systemfeil"
+msgstr ""
 
 #: src/test.c:704
-#, fuzzy
 msgid ""
 "Usage: test EXPRESSION\n"
 "  or:  test\n"
@@ -9553,8 +10221,6 @@ msgid ""
 "  or:  [ ]\n"
 "  or:  [ OPTION\n"
 msgstr ""
-"Bruk:  %s [FIL]...\n"
-"eller: %s [FLAGG]\n"
 
 #: src/test.c:711
 msgid ""
@@ -9674,65 +10340,59 @@ msgid "Matthew Bradburn"
 msgstr ""
 
 #: src/test.c:858
-#, fuzzy
 msgid "missing ']'"
-msgstr "%s: heltall forventet etter «%c»"
+msgstr ""
 
 #: src/test.c:872
-#, fuzzy, c-format
+#, c-format
 msgid "extra argument %s"
-msgstr "for mange argumenter"
+msgstr ""
 
 #: src/timeout.c:112
 #, c-format
 msgid "warning: sigprocmask"
 msgstr ""
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr ""
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr ""
 
-#: src/timeout.c:225
-#, fuzzy, c-format
+#: src/timeout.c:228
+#, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
 "  or:  %s [OPTION]\n"
 msgstr ""
-"Bruk:  %s [FIL]...\n"
-"eller: %s [FLAGG]\n"
 
-#: src/timeout.c:229
-#, fuzzy
+#: src/timeout.c:232
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
 msgstr ""
-"Obligatoriske argmenter til lange flagg er obligatoriske også for korte.\n"
 
-#: src/timeout.c:235
+#: src/timeout.c:238
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 msgid ""
 "\n"
 "DURATION is a floating point number with an optional suffix:\n"
@@ -9740,7 +10400,7 @@ msgid ""
 "days.\n"
 msgstr ""
 
-#: src/timeout.c:259
+#: src/timeout.c:262
 msgid ""
 "\n"
 "If the command times out, and --preserve-status is not set, then exit with\n"
@@ -9751,17 +10411,17 @@ msgid ""
 "case the exit status is 128+9 rather than 124.\n"
 msgstr ""
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr ""
 
-#: src/timeout.c:471
-#, fuzzy, c-format
+#: src/timeout.c:474
+#, c-format
 msgid "error waiting for command"
-msgstr "feil ved skriving til %s"
+msgstr ""
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr ""
@@ -9777,14 +10437,14 @@ msgid "Randy Smith"
 msgstr ""
 
 #: src/touch.c:115 src/touch.c:309
-#, fuzzy, c-format
+#, c-format
 msgid "invalid date format %s"
-msgstr "ugyldig argument %s for %s"
+msgstr ""
 
 #: src/touch.c:191
-#, fuzzy, c-format
+#, c-format
 msgid "cannot touch %s"
-msgstr "kan ikke utføre ioctl på «%s»"
+msgstr ""
 
 #: src/touch.c:197
 #, c-format
@@ -9835,23 +10495,22 @@ msgid ""
 msgstr ""
 
 #: src/touch.c:335
-#, fuzzy, c-format
+#, c-format
 msgid "cannot specify times from more than one source"
-msgstr "kan ikke dele opp på mer enn én måte"
+msgstr ""
 
 #: src/touch.c:409
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'"
-msgstr "advarsel: «sort %s» er avleggs; bruk «sort -k»"
+msgstr ""
 
 #: src/tr.c:286
 #, c-format
 msgid "Usage: %s [OPTION]... SET1 [SET2]\n"
-msgstr "Bruk: %s [FLAGG]... SETT1 [SETT2]\n"
+msgstr ""
 
 #: src/tr.c:290
-#, fuzzy
 msgid ""
 "Translate, squeeze, and/or delete characters from standard input,\n"
 "writing to standard output.\n"
@@ -9864,13 +10523,6 @@ msgid ""
 "                            of that character\n"
 "  -t, --truncate-set1     first truncate SET1 to length of SET2\n"
 msgstr ""
-"Oversett, klem sammen og/eller fjern tegn fra standard inn,\n"
-"skriv ut til standard ut.\n"
-"\n"
-"  -c, --complement        først komplementer SETT1\n"
-"  -d, --delete            slett tegn i SETT1, ikke oversett\n"
-"  -s, --squeeze-repeats   erstatt rekke av tegn med ett\n"
-"  -t, --truncate-set1     forkort først SETT1 til lengden til SETT2\n"
 
 #: src/tr.c:303
 msgid ""
@@ -9887,18 +10539,6 @@ msgid ""
 "  \\r              return\n"
 "  \\t              horizontal tab\n"
 msgstr ""
-"\n"
-"SETT er spesifisert med strenger av tegn.  De fleste tegnene står for seg\n"
-"selv.  Følgende sekvenser tolkes spesielt:\n"
-"\n"
-"  \\NNN            tegn med oktalverdi NNN (1 til 3 oktale siffer)\n"
-"  \\\\              backslash\n"
-"  \\a              beep\n"
-"  \\b              backspace\n"
-"  \\f              sideskift (FF)\n"
-"  \\n              linjeskift (LF)\n"
-"  \\r              vognretur (CR)\n"
-"  \\t              horisontal tabulator\n"
 
 #: src/tr.c:317
 msgid ""
@@ -9912,16 +10552,6 @@ msgid ""
 "  [:cntrl:]       all control characters\n"
 "  [:digit:]       all digits\n"
 msgstr ""
-"  \\v              vertikal tabulator\n"
-"  TEGN1-TEGN2     alle tegn fra TEGN1 til TEGN2, stigende\n"
-"  [TEGN1-TEGN2]   samme som TEGN1-TEGN2, dersom begge sett bruker dette\n"
-"  [TEGN*]         i SETT2, kopier av TEGN inntil samme lengde til SETT1\n"
-"  [TEGN*ANT]      ANT kopier av TEGN, ANT er oktal, hvis det begynner med 0\n"
-"  [:alnum:]       alle bokstaver og tall\n"
-"  [:alpha:]       alle bokstaver\n"
-"  [:blank:]       alle horisontale blanke tegn\n"
-"  [:cntrl:]       alle kontrolltegn\n"
-"  [:digit:]       alle siffer\n"
 
 #: src/tr.c:328
 msgid ""
@@ -9934,14 +10564,6 @@ msgid ""
 "  [:xdigit:]      all hexadecimal digits\n"
 "  [=CHAR=]        all characters which are equivalent to CHAR\n"
 msgstr ""
-"  [:graph:]       alle skrivbare tegn, unntatt blanke tegn\n"
-"  [:lower:]       alle små bokstaver\n"
-"  [:print:]       alle skrivbare tegn, inkludert blanke tegn\n"
-"  [:punct:]       alle tegnsettingstegn\n"
-"  [:space:]       alle horisontale og vertikale blanke tegn\n"
-"  [:upper:]       alle store bokstaver\n"
-"  [:xdigit:]      alle hexadesimale siffer\n"
-"  [=TEGN=]        alle tegn som er like TEGN\n"
 
 #: src/tr.c:338
 msgid ""
@@ -9957,13 +10579,11 @@ msgid ""
 msgstr ""
 
 #: src/tr.c:509
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "warning: the ambiguous octal escape \\%c%c%c is being\n"
 "\tinterpreted as the 2-byte sequence \\0%c%c, %c"
 msgstr ""
-"advarsel: den flertydige oktal-beskyttelsen \\%c%c%c blir tolket som \n"
-"\t2-byte-sekvensen \\0%c%c, «%c»"
 
 #: src/tr.c:518
 #, c-format
@@ -9971,44 +10591,44 @@ msgid "warning: an unescaped backslash at end of string is not portable"
 msgstr ""
 
 #: src/tr.c:673
-#, fuzzy, c-format
+#, c-format
 msgid "range-endpoints of '%s-%s' are in reverse collating sequence order"
-msgstr "rekke-sluttpunkt i «%s-%s» er i omvendt sorteringsrekkefølge"
+msgstr ""
 
 #: src/tr.c:829
-#, fuzzy, c-format
+#, c-format
 msgid "invalid repeat count %s in [c*n] construct"
-msgstr "ugyldig gjentagelsesteller «%s» i [c*n]-konstruksjon"
+msgstr ""
 
 #: src/tr.c:910
-#, fuzzy, c-format
+#, c-format
 msgid "missing character class name '[::]'"
-msgstr "mangler tegn-klassenavn «[::]»"
+msgstr ""
 
 #: src/tr.c:913
-#, fuzzy, c-format
+#, c-format
 msgid "missing equivalence class character '[==]'"
-msgstr "mangler ekvivalensklassetegn «[==]»"
+msgstr ""
 
 #: src/tr.c:928
-#, fuzzy, c-format
+#, c-format
 msgid "invalid character class %s"
-msgstr "ugyldig tegn-klasse «%s»"
+msgstr ""
 
 #: src/tr.c:947
 #, c-format
 msgid "%s: equivalence class operand must be a single character"
-msgstr "%s: ekvivalensklasseoperanden må være et enkelt tegn"
+msgstr ""
 
 #: src/tr.c:1229
 #, c-format
 msgid "misaligned [:upper:] and/or [:lower:] construct"
-msgstr "feilplassert [:upper:]- og/eller [:lower:]-konstruksjon"
+msgstr ""
 
 #: src/tr.c:1335
-#, fuzzy, c-format
+#, c-format
 msgid "too many characters in set"
-msgstr "ugyldig tegn i feltspesifikasjon"
+msgstr ""
 
 #: src/tr.c:1420
 #, c-format
@@ -10020,31 +10640,29 @@ msgstr ""
 #: src/tr.c:1480
 #, c-format
 msgid "the [c*] repeat construct may not appear in string1"
-msgstr "gjentagelseskonstruktet [c*] kan ikke opptre i streng1"
+msgstr ""
 
 #: src/tr.c:1490
 #, c-format
 msgid "only one [c*] repeat construct may appear in string2"
-msgstr "kun ett [c*] gjentagelseskonstrukt kan opptre i streng2"
+msgstr ""
 
 #: src/tr.c:1498
 #, c-format
 msgid "[=c=] expressions may not appear in string2 when translating"
-msgstr "[=c=]-uttrykk kan ikke opptre i streng2 under oversetting"
+msgstr ""
 
 #: src/tr.c:1505
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "when translating, the only character classes that may appear in\n"
 "string2 are 'upper' and 'lower'"
 msgstr ""
-"ved oversetting er de eneste tegnklassene som kan være i streng2\n"
-"«upper» og «lower»"
 
 #: src/tr.c:1520
 #, c-format
 msgid "when not truncating set1, string2 must be non-empty"
-msgstr "når sett1 ikke blir forkortet, kan ikke streng2 være tom"
+msgstr ""
 
 #: src/tr.c:1529
 #, c-format
@@ -10052,39 +10670,30 @@ msgid ""
 "when translating with complemented character classes,\n"
 "string2 must map all characters in the domain to one"
 msgstr ""
-"når det oversettes med komlementerte tegnklasser\n"
-"må streng2 mappe alle tegn i domenet til én"
 
 #: src/tr.c:1538
 #, c-format
 msgid "the [c*] construct may appear in string2 only when translating"
-msgstr "[c*]-konstruktet kan bare opptre i streng2 ved oversetting"
+msgstr ""
 
 #: src/tr.c:1788
-#, fuzzy
 msgid "Two strings must be given when both deleting and squeezing repeats."
 msgstr ""
-"to strenger må være gitt ved både sletting og sammenklemming av gjentagelser"
 
 #: src/tr.c:1790
-#, fuzzy
 msgid "Two strings must be given when translating."
-msgstr "to strenger må være gitt ved oversetting"
+msgstr ""
 
 #: src/tr.c:1800
-#, fuzzy
 msgid "Only one string may be given when deleting without squeezing repeats."
 msgstr ""
-"kun én streng kan oppgis når det slettes uten sammenklemming av gjentagelser"
 
 #: src/true.c:38
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s [ignored command line arguments]\n"
 "  or:  %s OPTION\n"
 msgstr ""
-"Bruk:  %s [FIL]...\n"
-"eller: %s [FLAGG]\n"
 
 #: src/true.c:45
 msgid "Exit with a status code indicating success."
@@ -10095,9 +10704,9 @@ msgid "Exit with a status code indicating failure."
 msgstr ""
 
 #: src/truncate.c:96
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: %s OPTION... FILE...\n"
-msgstr "Bruk: %s [FLAGG]... [FIL]...\n"
+msgstr ""
 
 #: src/truncate.c:97
 msgid ""
@@ -10122,7 +10731,7 @@ msgstr ""
 #: src/truncate.c:115
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 
 #: src/truncate.c:121
@@ -10144,9 +10753,9 @@ msgid "%s has unusable, apparently negative size"
 msgstr ""
 
 #: src/truncate.c:183 src/truncate.c:384
-#, fuzzy, c-format
+#, c-format
 msgid "cannot get the size of %s"
-msgstr "kan ikke dele opp på mer enn én måte"
+msgstr ""
 
 #: src/truncate.c:205
 #, c-format
@@ -10169,9 +10778,9 @@ msgid "multiple relative modifiers specified"
 msgstr ""
 
 #: src/truncate.c:333
-#, fuzzy, c-format
+#, c-format
 msgid "you must specify either %s or %s"
-msgstr "du må spesifisere en liste av bytes, tegn eller felt"
+msgstr ""
 
 #: src/truncate.c:340
 #, c-format
@@ -10184,9 +10793,9 @@ msgid "%s was specified but %s was not"
 msgstr ""
 
 #: src/truncate.c:404
-#, fuzzy, c-format
+#, c-format
 msgid "cannot open %s for writing"
-msgstr "kan ikke utføre ioctl på «%s»"
+msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/tsort.c:40
@@ -10201,20 +10810,16 @@ msgid ""
 "With no FILE, or when FILE is -, read standard input.\n"
 "\n"
 msgstr ""
-"Bruk: %s [FLAGG] [FIL]\n"
-"Skriv en fullstendig sortert liste konsistent med den delvise sorteringen\n"
-"i FIL.  Hvis ingen FIL eller hvis FIL er -, leses fra standard inn.\n"
-"\n"
 
-#: src/tsort.c:472
-#, fuzzy, c-format
+#: src/tsort.c:471
+#, c-format
 msgid "%s: input contains an odd number of tokens"
-msgstr "%s: inndata inneholder en løkke:"
+msgstr ""
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
-msgstr "%s: inndata inneholder en løkke:"
+msgstr ""
 
 #: src/tty.c:65
 msgid ""
@@ -10254,34 +10859,23 @@ msgid ""
 msgstr ""
 
 #: src/uname.c:286
-#, fuzzy, c-format
+#, c-format
 msgid "cannot get system name"
-msgstr "kan ikke opprette midlertidig fil"
+msgstr ""
 
 #: src/unexpand.c:117
-#, fuzzy
 msgid ""
 "Convert blanks in each FILE to tabs, writing to standard output.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
-"Konverter mellomrom i hver FIL til tabulatorer, skriv ut til standard ut.\n"
-"Dersom ingen FIL er spesifisert, eller FIL er -, leses det fra standard "
-"inn.\n"
-"\n"
 
 #: src/unexpand.c:124
-#, fuzzy
 msgid ""
 "  -a, --all        convert all blanks, instead of just initial blanks\n"
 "      --first-only  convert only leading sequences of blanks (overrides -a)\n"
 "  -t, --tabs=N     have tabs N characters apart instead of 8 (enables -a)\n"
 "  -t, --tabs=LIST  use comma separated LIST of tab positions (enables -a)\n"
 msgstr ""
-"  -a, --all           konverter alle blanke tegn, istedet for bare "
-"innledende\n"
-"  -t, --tabs=ANTALL   ha tabulatorer ANTALL tegn fra hverandre istedet for "
-"8\n"
-"  -t, --tabs=LISTE    bruk komma-separert LISTE med tabulatorposisjoner.\n"
 
 #: src/unexpand.c:152
 #, c-format
@@ -10289,16 +10883,16 @@ msgid "tabs are too far apart"
 msgstr ""
 
 #: src/unexpand.c:504
-#, fuzzy, c-format
+#, c-format
 msgid "tab stop value is too large"
-msgstr "%s er for stor"
+msgstr ""
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
-msgstr "Bruk: %s [FLAGG]... [INN [UT]]\n"
+msgstr ""
 
-#: src/uniq.c:138
+#: src/uniq.c:174
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
 "writing to OUTPUT (or standard output).\n"
@@ -10306,51 +10900,49 @@ msgid ""
 "With no options, matching lines are merged to the first occurrence.\n"
 msgstr ""
 
-#: src/uniq.c:147
+#: src/uniq.c:183
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
+msgstr ""
+
+#: src/uniq.c:187
+msgid ""
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
+msgstr ""
+
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
 msgstr ""
-"  -c, --count           begynn linjer med antall forekomster\n"
-"  -d, --repeated        skriv bare ut linjer det er flere av\n"
 
-#: src/uniq.c:151
-#, fuzzy
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
+msgstr ""
+
+#: src/uniq.c:199
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
 "  -i, --ignore-case     ignore differences in case when comparing\n"
 "  -s, --skip-chars=N    avoid comparing the first N characters\n"
 "  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
 msgstr ""
-"  -D, --all-repeated[=delimit-method] skriv alle linjer det er flere av\n"
-"                        delimit-method={none(forvalgt),prepend,separate}\n"
-"  -f, --skip-fields=N   ikke sammenlign de første N feltene\n"
-"  -i, --ignore-case     ignorer forskjeller med store/små bokstaver\n"
-"  -s, --skip-chars=N    ikke sammenlign de første N tegnene\n"
-"  -u, --unique          skriv bare ut unike linjer\n"
 
-#: src/uniq.c:161
-#, fuzzy
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr ""
-"  -w, --check-chars=N   ikke sammenlign mer enn N tegn per linje\n"
-"  -N                    samme som -f N\n"
 
-#: src/uniq.c:166
-#, fuzzy
+#: src/uniq.c:212
 msgid ""
 "\n"
 "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n"
 "characters.  Fields are skipped before chars.\n"
 msgstr ""
-"\n"
-"Et felt er en rekke blanke tegn, så andre tegn.  Felt hoppes over før tegn.\n"
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 msgid ""
 "\n"
 "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n"
@@ -10358,37 +10950,44 @@ msgid ""
 "Also, comparisons honor the rules specified by 'LC_COLLATE'.\n"
 msgstr ""
 
-#: src/uniq.c:358
-#, fuzzy, c-format
+#: src/uniq.c:428
+#, c-format
 msgid "too many repeated lines"
-msgstr "for mange argumenter"
+msgstr ""
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
-msgstr "ugyldig antall felt å hoppe over"
+msgstr ""
 
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
-msgstr "ugyldig antall oktetter å hoppe over"
+msgstr ""
 
-#: src/uniq.c:539
-#, fuzzy
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
-msgstr "ugyldig antall oktetter å sammenligne"
+msgstr ""
+
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr ""
+
+#: src/uniq.c:652
+#, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr ""
 
-#: src/uniq.c:558
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
-msgstr "å skrive alle dupliserte linjer *og* gjentagelsesantall er meningsløst"
+msgstr ""
 
 #: src/unlink.c:45
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s FILE\n"
 "  or:  %s OPTION\n"
 msgstr ""
-"Bruk:  %s [FIL]...\n"
-"eller: %s [FLAGG]\n"
 
 #: src/unlink.c:48
 msgid ""
@@ -10396,11 +10995,6 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/unlink.c:86
-#, fuzzy, c-format
-msgid "cannot unlink %s"
-msgstr "kan ikke utføre ioctl på «%s»"
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -10434,18 +11028,18 @@ msgid "up  %2d:%02d,  "
 msgstr ""
 
 #: src/uptime.c:151
-#, fuzzy, c-format
+#, c-format
 msgid "%lu user"
 msgid_plural "%lu users"
-msgstr[0] "ugyldig bruker"
-msgstr[1] "ugyldig bruker"
+msgstr[0] ""
+msgstr[1] ""
 
 #: src/uptime.c:161
 #, c-format
 msgid ",  load average: %.2f"
 msgstr ""
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -10453,19 +11047,19 @@ msgid ""
 "in the run queue over the last 1, 5 and 15 minutes."
 msgstr ""
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
 "an uninterruptible sleep state also contribute to the load average.\n"
 msgstr ""
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr ""
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
@@ -10481,7 +11075,6 @@ msgid ""
 msgstr ""
 
 #: src/wc.c:117
-#, fuzzy
 msgid ""
 "Print newline, word, and byte counts for each FILE, and a total line if\n"
 "more than one FILE is specified.  With no FILE, or when FILE is -,\n"
@@ -10493,12 +11086,6 @@ msgid ""
 "  -m, --chars            print the character counts\n"
 "  -l, --lines            print the newline counts\n"
 msgstr ""
-"Skriv ut antall linjer, ord og bytes for hver FIL, og en total-linje\n"
-"dersom mer enn én FIL er spesifisert.  Dersom ingen FIL er spesifisert,\n"
-"eller FIL er -, leses det fra standard inn.\n"
-"  -c, --bytes            skriv ut antall oktetter\n"
-"  -m, --chars            skriv ut antall tegn\n"
-"  -l, --lines            skriv ut antall linjer.\n"
 
 #: src/wc.c:128
 msgid ""
@@ -10565,9 +11152,8 @@ msgid "TIME"
 msgstr ""
 
 #: src/who.c:559
-#, fuzzy
 msgid "IDLE"
-msgstr "FEIL"
+msgstr ""
 
 #: src/who.c:560
 msgid "PID"
@@ -10582,9 +11168,9 @@ msgid "EXIT"
 msgstr ""
 
 #: src/who.c:640
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n"
-msgstr "Bruk: %s [FLAGG]... FIL1 FIL2\n"
+msgstr ""
 
 #: src/who.c:641
 msgid "Print information about users who are currently logged in.\n"
@@ -10642,18 +11228,16 @@ msgid ""
 msgstr ""
 
 #: src/whoami.c:91
-#, fuzzy, c-format
+#, c-format
 msgid "%s: cannot find name for user ID %lu\n"
-msgstr "kan ikke endre eier og/eller gruppe for %s"
+msgstr ""
 
 #: src/yes.c:41
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s [STRING]...\n"
 "  or:  %s OPTION\n"
 msgstr ""
-"Bruk:  %s [FIL]...\n"
-"eller: %s [FLAGG]\n"
 
 #: src/yes.c:47
 msgid ""
@@ -10661,756 +11245,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#, fuzzy
-#~ msgid "  returning value: '%s'\n"
-#~ msgstr "lager filen «%s»\n"
-
-#, fuzzy
-#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n"
-#~ msgstr "Bruk: %s [FLAGG] [FIL]...\n"
-
-#, fuzzy
-#~ msgid "no valid suffix found\n"
-#~ msgstr "%s: ugyldig antall linjer"
-
-#, fuzzy
-#~ msgid "reading %s"
-#~ msgstr "feil ved lesing av %s"
-
-#, fuzzy
-#~ msgid "writing %s"
-#~ msgstr "feil ved skriving til %s"
-
-#, fuzzy
-#~ msgid "closing %s"
-#~ msgstr "lukker %s (fd=%d)"
-
-#, fuzzy
-#~ msgid "opening %s"
-#~ msgstr "feil ved lesing av %s"
-
-#, fuzzy
-#~ msgid ""
-#~ "Usage: %s NAME\n"
-#~ "  or:  %s OPTION\n"
-#~ msgstr ""
-#~ "Bruk:  %s [FIL]...\n"
-#~ "eller: %s [FLAGG]\n"
-
-#, fuzzy
-#~ msgid "All arguments to long options are mandatory for short options.\n"
-#~ msgstr ""
-#~ "Obligatoriske argmenter til lange flagg er obligatoriske også for korte.\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "RADIX is d for decimal, o for octal, x for hexadecimal or n for none.\n"
-#~ "BYTES is hexadecimal with 0x or 0X prefix, and may have a multiplier "
-#~ "suffix:\n"
-#~ "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
-#~ "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n"
-#~ "Adding a z suffix to any type displays printable characters at the end of "
-#~ "each\n"
-#~ "output line.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "RADIX er d for desimal, o for oktal, x for hexadesimal eller n for "
-#~ "ingen.\n"
-#~ "BYTES er hexadesimal med 0x- eller 0X-prefix, multipliseres med 512\n"
-#~ "med endelse b, med 1024 med endelse k og med 1048576 med endelse m. \n"
-#~ "En z-endelse for en hvilken som helst type viser skrivbare tegn til "
-#~ "slutten\n"
-#~ "av hver linje av utskriften.  "
-
-#, fuzzy
-#~ msgid ""
-#~ "Option --string without a number implies 3; option --width without a "
-#~ "number\n"
-#~ "implies 32.  By default, od uses -A o -t oS -w16.\n"
-#~ msgstr ""
-#~ "-s uten et tall impliserer 3. -w uten et tall impliserer 32.\n"
-#~ "Forvalgt er at od bruker -A o -t d2 -w 16.\n"
-
-#, fuzzy
-#~ msgid "Usage: %s [OPTION]... FILE\n"
-#~ msgstr "Bruk: %s [FLAGG]... [FIL]...\n"
-
-#, fuzzy
-#~ msgid "cannot set groups"
-#~ msgstr "kan ikke utelate både bruker og gruppe"
-
-#, fuzzy
-#~ msgid "cannot set group id"
-#~ msgstr "kan ikke utelate både bruker og gruppe"
-
-#, fuzzy
-#~ msgid "cannot set user id"
-#~ msgstr "kan ikke utelate både bruker og gruppe"
-
-#, fuzzy
-#~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n"
-#~ msgstr "Bruk: %s [FLAGG]... [FIL]...\n"
-
-#, fuzzy
-#~ msgid "warning: cannot change directory to %s"
-#~ msgstr "kan ikke opprette katalog %s"
-
-#, fuzzy
-#~ msgid "program error"
-#~ msgstr "lesefeil"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: ukjent flagg -- %c\n"
-
-#~ msgid "block size"
-#~ msgstr "blokkstørrelse"
-
-#~ msgid "cannot change owner and/or group of %s"
-#~ msgstr "kan ikke endre eier og/eller gruppe for %s"
-
-#, fuzzy
-#~ msgid "cannot chdir to directory %s"
-#~ msgstr "kan ikke skifte til katalog, %s"
-
-#~ msgid "cannot get the login group of a numeric UID"
-#~ msgstr "kan ikke finne login-gruppen til en numerisk bruker-ID"
-
-#~ msgid ""
-#~ "This is free software; see the source for copying conditions.  There is "
-#~ "NO\n"
-#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
-#~ "PURPOSE.\n"
-#~ msgstr ""
-#~ "Dette er fri programvare. Se kildekoden for kopieringsbetingelser.\n"
-#~ "Det er ingen garantier, ikke engang for SALGBARHET eller EGNETHET\n"
-#~ "TIL NOEN SPESIELL OPPGAVE.\n"
-
-#~ msgid "too few arguments"
-#~ msgstr "for få argumenter"
-
-#~ msgid "Usage: %s [OPTION] [FILE]...\n"
-#~ msgstr "Bruk: %s [FLAGG] [FIL]...\n"
-
-#, fuzzy
-#~ msgid "closing standard output"
-#~ msgstr "standard ut"
-
-#, fuzzy
-#~ msgid "invalid group number %s"
-#~ msgstr "ugyldig antall"
-
-#~ msgid "Richard Stallman and David MacKenzie"
-#~ msgstr "Richard Stallman og David MacKenzie"
-
-#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n"
-#~ msgstr "Bruk: %s [FLAGG]... VENSTRE_FIL HØYRE_FIL\n"
-
-#, fuzzy
-#~ msgid "cannot overwrite directory %s"
-#~ msgstr "kan ikke opprette katalog %s"
-
-#, fuzzy
-#~ msgid "cannot create link %s"
-#~ msgstr "kan ikke opprette katalog %s"
-
-#, fuzzy
-#~ msgid "Torbjorn Granlund, David MacKenzie, and Jim Meyering"
-#~ msgstr "David Ihnat, David MacKenzie og Jim Meyering"
-
-#, fuzzy
-#~ msgid "missing file arguments"
-#~ msgstr "for få argumenter"
-
-#, fuzzy
-#~ msgid "%s: specified target is not a directory"
-#~ msgstr "%s eksisterer men er ikke en katalog"
-
-#, fuzzy
-#~ msgid "symbolic links are not supported on this system"
-#~ msgstr "advarsel: --pid=PID er ikke støttet på dette systemet"
-
-#~ msgid "Stuart Kemp and David MacKenzie"
-#~ msgstr "Stuart Kemp og David MacKenzie"
-
-#~ msgid "%s: `+' or `-' expected after delimeter"
-#~ msgstr "%s: «+» eller «-» ventet etter skilletegn"
-
-#~ msgid "David Ihnat, David MacKenzie, and Jim Meyering"
-#~ msgstr "David Ihnat, David MacKenzie og Jim Meyering"
-
-#, fuzzy
-#~ msgid "too many non-option arguments: %s%s"
-#~ msgstr "for mange ikke-flagg-argumenter"
-
-#, fuzzy
-#~ msgid ""
-#~ "a format string may not be specified when using the --rfc-822 (-R) option"
-#~ msgstr "ingen filer kan spesifiseres når flagget --string brukes"
-
-#, fuzzy
-#~ msgid "Paul Rubin, David MacKenzie, and Stuart Kemp"
-#~ msgstr "Paul Rubin og David MacKenzie"
-
-#, fuzzy
-#~ msgid "unrecognized option %s=%s"
-#~ msgstr "ukjent flagg «-%c»"
-
-#, fuzzy
-#~ msgid "David MacKenzie and Jim Meyering"
-#~ msgstr "David Ihnat, David MacKenzie og Jim Meyering"
-
-#, fuzzy
-#~ msgid "cannot change to `..' from directory %s"
-#~ msgstr "kan ikke skifte til katalog, %s"
-
-#, fuzzy
-#~ msgid "Usage: %s [OPTION]... [STRING]...\n"
-#~ msgstr "Bruk: %s [FLAGG]... [FIL]...\n"
-
-#, fuzzy
-#~ msgid "`-LIST' option is obsolete; use `-t LIST'"
-#~ msgstr "advarsel: «sort %s» er avleggs; bruk «sort -k»"
-
-#~ msgid ""
-#~ "\n"
-#~ "In -wNUMBER, the letter `w' may be omitted.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Ved -wTALL kan «w» utelates.\n"
-
-#, fuzzy
-#~ msgid "`%s' option is obsolete; use `%s'"
-#~ msgstr "advarsel: «sort %s» er avleggs; bruk «sort -k»"
-
-#~ msgid ""
-#~ "  -c, --bytes=SIZE         print first SIZE bytes\n"
-#~ "  -n, --lines=NUMBER       print first NUMBER lines instead of first 10\n"
-#~ msgstr ""
-#~ "  -c, --bytes=STØRRELSE    skriv ut første STØRRELSE bytes\n"
-#~ "  -n, --lines=ANTALL       skriv ut første ANTALL tegn istedet for 10\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "SIZE may have a multiplier suffix: b for 512, k for 1K, m for 1 Meg.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "STØRRELSE kan ha en multiplikatorendelse: b for 512, k for 1K eller\n"
-#~ " m for 1 Meg.\n"
-
-#~ msgid "unrecognized option `-%c'"
-#~ msgstr "ukjent flagg «-%c»"
-
-#, fuzzy
-#~ msgid "`-%s' option is obsolete; use `-%c %.*s%.*s%s'"
-#~ msgstr "advarsel: «sort %s» er avleggs; bruk «sort -k»"
-
-#, fuzzy
-#~ msgid "Arnold Robbins and David MacKenzie"
-#~ msgstr "Paul Rubin og David MacKenzie"
-
-#, fuzzy
-#~ msgid "cannot print only user and only group"
-#~ msgstr "kan ikke utelate både bruker og gruppe"
-
-#, fuzzy
-#~ msgid "%s is a directory"
-#~ msgstr "%s eksisterer men er ikke en katalog"
-
-#, fuzzy
-#~ msgid "cannot obtain time stamps for %s"
-#~ msgstr "kan ikke opprette katalog %s"
-
-#, fuzzy
-#~ msgid "strip failed"
-#~ msgstr "stat feilet"
-
-#~ msgid ""
-#~ "  -v SIDE           like -a SIDE, but suppress joined output lines\n"
-#~ "  -1 FIELD          join on this FIELD of file 1\n"
-#~ "  -2 FIELD          join on this FIELD of file 2\n"
-#~ msgstr ""
-#~ "  -v SIDE           som -a SIDE, men dropp sammenføyde ut-linjer\n"
-#~ "  -1 FELT           sammenføy ved dette FELTet fra fil 1\n"
-#~ "  -2 FELT           sammenføy ved dette FELTet fra fil 2\n"
-
-#~ msgid "invalid field number for file 1: `%s'"
-#~ msgstr "ugyldig feltnummer for fil 1: «%s»"
-
-#~ msgid "invalid field number for file 2: `%s'"
-#~ msgstr "ugyldig feltnummer for fil 2: «%s»"
-
-#~ msgid "too many non-option arguments"
-#~ msgstr "for mange ikke-flagg-argumenter"
-
-#~ msgid "too few non-option arguments"
-#~ msgstr "for få ikke-flagg-argumenter"
-
-#, fuzzy
-#~ msgid "Mike Parker and David MacKenzie"
-#~ msgstr "Scott Bartram og David MacKenzie"
-
-#~ msgid ""
-#~ "\n"
-#~ "  -b, --binary            read files in binary mode (default on DOS/"
-#~ "Windows)\n"
-#~ "  -c, --check             check %s sums against given list\n"
-#~ "  -t, --text              read files in text mode (default)\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "  -b, --binary          les filene i binærmodus (forvalg i DOS/Windows)\n"
-#~ "  -c, --check           sjekk %s-summene mot angitt liste\n"
-#~ "  -t, --text            les filene i tekstmodus (forvalgt)\n"
-#~ "\n"
-
-#~ msgid "file"
-#~ msgstr "fil"
-
-#~ msgid "files"
-#~ msgstr "filer"
-
-#~ msgid "checksum"
-#~ msgstr "sjekksum"
-
-#~ msgid "checksums"
-#~ msgstr "sjekksummer"
-
-#~ msgid "no files may be specified when using --string"
-#~ msgstr "ingen filer kan spesifiseres når flagget --string brukes"
-
-#~ msgid "only one argument may be specified when using --check"
-#~ msgstr "kun ett argument kan spesifiseres ved bruk av --check"
-
-#, fuzzy
-#~ msgid "Usage: %s [OPTION] DIRECTORY...\n"
-#~ msgstr "Bruk: %s [FLAGG] [FIL]...\n"
-
-#, fuzzy
-#~ msgid "cannot set permissions of directory %s"
-#~ msgstr "kan ikke endre rettigheter til %s"
-
-#, fuzzy
-#~ msgid "cannot set permissions of fifo %s"
-#~ msgstr "kan ikke endre rettigheter til %s"
-
-#, fuzzy
-#~ msgid "wrong number of arguments"
-#~ msgstr "for få argumenter"
+#~ msgid "cannot create pipe"
+#~ msgstr "klarte ikke å opprette rør"
 
-#, fuzzy
-#~ msgid "cannot set permissions of %s"
-#~ msgstr "kan ikke endre rettigheter til %s"
+#~ msgid "%s subprocess failed"
+#~ msgstr "Underprosessen «%s» mislyktes"
 
-#, fuzzy
-#~ msgid "Mike Parker, David MacKenzie, and Jim Meyering"
-#~ msgstr "David Ihnat, David MacKenzie og Jim Meyering"
+#~ msgid "_open_osfhandle failed"
+#~ msgstr "_open_osfhandle mislyktes"
 
-#, fuzzy
-#~ msgid "invalid option `%s'"
-#~ msgstr "ugyldig breddespesifikasjon «%s»"
+#~ msgid "cannot restore fd %d: dup2 failed"
+#~ msgstr "klarte ikke å gjenopprette fd %d. dup2 mislyktes"
 
-#, fuzzy
-#~ msgid "invalid priority `%s'"
-#~ msgstr "ugyldig bredde: «%s»"
+#~ msgid "%s subprocess"
+#~ msgstr "underprosess %s"
 
-#, fuzzy
-#~ msgid "cannot get priority"
-#~ msgstr "kan ikke opprette katalog %s"
-
-#, fuzzy
-#~ msgid "cannot set priority"
-#~ msgstr "kan ikke opprette katalog %s"
-
-#~ msgid "Scott Bartram and David MacKenzie"
-#~ msgstr "Scott Bartram og David MacKenzie"
-
-#~ msgid "old-style offset"
-#~ msgstr "posisjon på gammel stil"
-
-#~ msgid "skip argument"
-#~ msgstr "hopp over argument"
-
-#~ msgid "limit argument"
-#~ msgstr "begrens argument"
-
-#~ msgid "minimum string length"
-#~ msgstr "minimal strenglengde"
-
-#~ msgid "width specification"
-#~ msgstr "breddespesifikasjon"
-
-#~ msgid "invalid second operand in compatibility mode `%s'"
-#~ msgstr "ugyldig andre-operand i kompatibilitetsmodus «%s»"
-
-#~ msgid "in compatibility mode, the last two arguments must be offsets"
-#~ msgstr "i kompatibilitetsmodus må de siste to argumentene være posisjoner"
-
-#~ msgid "%d: fmt=\"%s\" width=%d\n"
-#~ msgstr "%d: fmt=\"%s\" bredde=%d\n"
-
-#~ msgid "David M. Ihnat and David MacKenzie"
-#~ msgstr "David M. Ihnat og David MacKenzie"
-
-#, fuzzy
-#~ msgid "path `%s' contains nonportable character `%c'"
-#~ msgstr "tabulatorstørrelse inneholder et ugyldig tegn"
-
-#, fuzzy
-#~ msgid "`%s' is not a directory"
-#~ msgstr "%s eksisterer men er ikke en katalog"
-
-#~ msgid "`--pages' invalid range of page numbers: `%s'"
-#~ msgstr "«--pages» ugyldig område med sidenummer: «%s»"
-
-#~ msgid "`--pages' invalid starting page number: `%s'"
-#~ msgstr "«--pages» ugyldig start-sidenummer: «%s»"
-
-#~ msgid "`--pages' invalid ending page number: `%s'"
-#~ msgstr "«--pages» ugyldig slutt-sidenummer: «%s»"
-
-#~ msgid "`--pages' starting page number is larger than ending page number"
-#~ msgstr "«--pages» start-sidenummeret er større enn slutt-sidenummeret"
-
-#~ msgid "`--columns=COLUMN' invalid number of columns: `%s'"
-#~ msgstr "«--columns=SPALTER» ugyldig antall kolonner: «%s»"
-
-#~ msgid "%b %e %H:%M %Y"
-#~ msgstr "%b %e %H:%M %Y"
-
-#~ msgid "starting page number larger than total number of pages: `%d'"
-#~ msgstr "start-sidenummeret er større enn totalt antall sider: «%d»"
-
-#~ msgid "Page %d"
-#~ msgstr "Side %d"
-
-#~ msgid ""
-#~ "\n"
-#~ "-T implied by -l nn when nn <= 10 or <= 3 with -F. With no FILE, or when\n"
-#~ "FILE is -, read standard input.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "-T impliseres av -l nn når nn <= 10 eller <= 3 med -F.  Dersom FIL ikke\n"
-#~ "er oppgitt, eller når FIL er -, leses det fra standard inn.\n"
-
-#, fuzzy
-#~ msgid "David MacKenzie and Richard Mlynarik"
-#~ msgstr "David Ihnat, David MacKenzie og Jim Meyering"
-
-#, fuzzy
-#~ msgid "\\%c: invalid escape"
-#~ msgstr "%s: ugyldig mønster"
-
-#~ msgid ""
-#~ "This program is free software; you can redistribute it and/or modify\n"
-#~ "it under the terms of the GNU General Public License as published by\n"
-#~ "the Free Software Foundation; either version 2, or (at your option)\n"
-#~ "any later version.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Dette programmet er fri programvare.  Du kan redistribueret det og/eller\n"
-#~ "modifisere det under betingelsene gitt av GNU General Public License som\n"
-#~ "distribuert av Free Software Foundation; enten versjon 2, eller (om du "
-#~ "vil)\n"
-#~ "en hvilken som helst senere versjon.\n"
-
-#~ msgid ""
-#~ "This program is distributed in the hope that it will be useful,\n"
-#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-#~ "GNU General Public License for more details.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Dette programmet er distribuert i ønsket om at det vil være nyttig,\n"
-#~ "men UTEN NOEN GARANTI, til og med uten noen implisert garanti om\n"
-#~ "SALGBARHET eller EGNETHET TIL NOEN SPESIELL BRUK.  Se GNU General\n"
-#~ "Public License for mer detaljer.\n"
-
-#~ msgid ""
-#~ "You should have received a copy of the GNU General Public License\n"
-#~ "along with this program; if not, write to the Free Software Foundation,\n"
-#~ "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
-#~ msgstr ""
-#~ "Du skulle ha mottatt en kopi av GNU General Public License\n"
-#~ "sammen med dette programmet.  Hvis ikke, skriv til Free Software "
-#~ "Foundation,\n"
-#~ "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
-
-#, fuzzy
-#~ msgid "cannot chdir from %s to .."
-#~ msgstr "kan ikke skifte til katalog, %s"
-
-#, fuzzy
-#~ msgid "invalid format string: `%s'"
-#~ msgstr "ugyldig type-streng «%s»"
-
-#, fuzzy
-#~ msgid "Usage: %s [OPTIONS] FILE [...]\n"
-#~ msgstr "Bruk: %s [FLAGG] [FIL]...\n"
-
-#~ msgid "sort size"
-#~ msgstr "sorteringsstørrelse"
-
-#, fuzzy
-#~ msgid ""
-#~ "  -a, --suffix-length=N   use suffixes of length N (default %d)\n"
-#~ "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
-#~ "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output "
-#~ "file\n"
-#~ "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-#~ msgstr ""
-#~ "  -ANTALL                    samme som -l ANTALL\n"
-#~ "  -b, --bytes=STØRRELSE      skriv STØRRELSE bytes i hver utfil\n"
-#~ "  -C, --line-bytes=STØRRELSE skriv maksimum STØRRELSE bytes med linjer "
-#~ "per\n"
-#~ "                             utfil\n"
-#~ "  -l, --lines=ANTALL         skriv ANTALL linjer i hver utfil\n"
-#~ "      --verbose              skriv en diagnostikk til standard error "
-#~ "rett\n"
-#~ "                             før hver utfil åpnes\n"
-
-#, fuzzy
-#~ msgid "`-%d' option is obsolete; use `-l %d'"
-#~ msgstr "advarsel: «sort %s» er avleggs; bruk «sort -k»"
-
-#, fuzzy
-#~ msgid "Usage: %s [OPTION] FILE...\n"
-#~ msgstr "Bruk: %s [FLAGG] [FIL]...\n"
-
-#~ msgid "Jay Lepreau and David MacKenzie"
-#~ msgstr "Jay Lepreau og David MacKenzie"
-
-#~ msgid "stdin: read error"
-#~ msgstr "stdin: lesefeil"
-
-#~ msgid ""
-#~ "      --retry              keep trying to open a file even if it is\n"
-#~ "                           inaccessible when tail starts or if it "
-#~ "becomes\n"
-#~ "                           inaccessible later -- useful only with -f\n"
-#~ "  -c, --bytes=N            output the last N bytes\n"
-#~ msgstr ""
-#~ "      --retry              fortsett å prøv å åpne en fil, selv om den\n"
-#~ "                           er utilgjengelig når tail starter eller hvis "
-#~ "den\n"
-#~ "                           blir utilgjengelig senere -- bare nyttig med -"
-#~ "f\n"
-#~ "  -c, --bytes=N            skriv ut de siste N oktettene\n"
-
-#~ msgid ""
-#~ "With --follow (-f), tail defaults to following the file descriptor, "
-#~ "which\n"
-#~ "means that even if a tail'ed file is renamed, tail will continue to "
-#~ "track\n"
-#~ "its end.  "
-#~ msgstr ""
-#~ "Med --follow (-f), vil tail forvalgt følge fildeskriptoren, som betyr\n"
-#~ "at selv om den tail'ede filen skifter navn vil tail fortsatt følge den"
-
-#~ msgid "%c: invalid suffix character in obsolescent option"
-#~ msgstr "%c: ugyldig suffiks-tegn i avleggs flagg"
-
-#~ msgid ""
-#~ "too many arguments;  When using tail's obsolescent option syntax (%s)\n"
-#~ "there may be no more than one file argument.  Use the equivalent -n or -"
-#~ "c\n"
-#~ "option instead."
-#~ msgstr ""
-#~ "for mange argumenter.  NÃ¥r tails gamle flagg-syntaks brukes (%s)\n"
-#~ "kan det ikke være mer enn ett filargument.  Bruk det tilsvarende -n "
-#~ "eller\n"
-#~ "-c-flagget isteden."
-
-#~ msgid ""
-#~ "Warning: it is not portable to use two or more file arguments with\n"
-#~ "tail's obsolescent option syntax (%s).  Use the equivalent -n or -c\n"
-#~ "option instead."
-#~ msgstr ""
-#~ "Advarsel: det er ikke portabelt å bruke to eller flere filargumenter med\n"
-#~ "tails gamle falggsyntaks (%s).  Bruk det tilsvarende -n eller -c-\n"
-#~ "flagget isteden."
-
-#, fuzzy
-#~ msgid "`%s' option is obsolete; use `%s-%c %.*s'"
-#~ msgstr "advarsel: «sort %s» er avleggs; bruk «sort -k»"
-
-#~ msgid "%s: is so large that it is not representable"
-#~ msgstr "%s: er så stor at den ikke kan representeres"
-
-#~ msgid "%s is larger than the maximum file size on this system"
-#~ msgstr "%s er større enn den maksimale filstørrelsen på dette systemet"
-
-#~ msgid "%s: invalid maximum number of consecutive size changes"
-#~ msgstr "%s: ugyldig maksimum antall etterfølgende endringer i størrelse"
-
-#, fuzzy
-#~ msgid "Mike Parker, Richard M. Stallman, and David MacKenzie"
-#~ msgstr "Richard Stallman og David MacKenzie"
-
-#, fuzzy
-#~ msgid "too many arguments\n"
-#~ msgstr "for mange argumenter"
-
-#, fuzzy
-#~ msgid "creating %s"
-#~ msgstr "lager filen «%s»\n"
-
-#, fuzzy
-#~ msgid "file arguments missing"
-#~ msgstr "for få argumenter"
-
-#~ msgid ""
-#~ "\n"
-#~ "Translation occurs if -d is not given and both SET1 and SET2 appear.\n"
-#~ "-t may be used only when translating.  SET2 is extended to length of\n"
-#~ "SET1 by repeating its last character as necessary.  "
-#~ msgstr ""
-#~ "\n"
-#~ "Oversettelse skjer dersom -d ikke er gitt, og både SETT1 og SETT2 er "
-#~ "der.\n"
-#~ "-t kan bare bli brukt ved oversetting. SETT2 blir utvidet til lengden av\n"
-#~ "SETT1 ved å repetere dets siste tegn som nødvendig.  "
-
-#~ msgid ""
-#~ "Excess characters\n"
-#~ "of SET2 are ignored.  Only [:lower:] and [:upper:] are guaranteed to\n"
-#~ "expand in ascending order; used in SET2 while translating, they may\n"
-#~ "only be used in pairs to specify case conversion.  "
-#~ msgstr ""
-#~ "Tegn til overs i \n"
-#~ "SETT2 ignoreres.  Bare [:lower:] og [:upper:] er garantert å ekspandere "
-#~ "i\n"
-#~ "stigende rekkefølge; brukt i SETT2 ved oversetting kan de bare brukes i "
-#~ "par\n"
-#~ "for å angi oversetting fra store/små til små/store bokstaver."
-
-#~ msgid ""
-#~ "-s uses SET1 if not\n"
-#~ "translating nor deleting; else squeezing uses SET2 and occurs after\n"
-#~ "translation or deletion.\n"
-#~ msgstr ""
-#~ " \n"
-#~ "-s bruker SETT1 hvis det ikke er oversetting eller sletting; ellers "
-#~ "bruker \n"
-#~ "sammenklemming SETT2 og skjer etter oversetting eller sletting.\n"
-
-#~ msgid "invalid backslash escape `\\%c'"
-#~ msgstr "ugyldig backslash-beskyttelse «\\%c»"
-
-#~ msgid "at least one string must be given when squeezing repeats"
-#~ msgstr "minst en streng må være gitt ved sammenklemming av gjentagelser"
-
-#~ msgid ""
-#~ "invalid identity mapping;  when translating, any [:lower:] or [:upper:]\n"
-#~ "construct in string1 must be aligned with a corresponding construct\n"
-#~ "([:upper:] or [:lower:], respectively) in string2"
-#~ msgstr ""
-#~ "ugyldig identidetsmapping; ved oversetting må evt. [:lower:]- eller\n"
-#~ "[:upper:]-konstruksjoner i streng1 være plassert i henhold til en\n"
-#~ "tilsvarende konstruksjon (henholdsvis [:upper:] eller [:lower:]) i\n"
-#~ "streng2"
-
-#~ msgid "only one argument may be specified"
-#~ msgstr "kun ett argument kan spesifiseres"
-
-#, fuzzy
-#~ msgid "`-LIST' option is obsolete; use `--first-only -t LIST'"
-#~ msgstr "advarsel: «sort %s» er avleggs; bruk «sort -k»"
-
-#~ msgid ""
-#~ "Discard all but one of successive identical lines from INPUT (or\n"
-#~ "standard input), writing to OUTPUT (or standard output).\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Fjern alle bortsett fra én identiske linjer fra INN\n"
-#~ "(eller standard inn), og skriv til UT (eller standard ut).\n"
-#~ "\n"
-
-# c-format
-#, fuzzy
-#~ msgid "`-%lu' option is obsolete; use `-f %lu'"
-#~ msgstr "advarsel: «uniq %s» er avleggs; bruk «uniq -s %s» istedet"
-
-#, fuzzy
-#~ msgid "Usage: %s [OPTION]... [ FILE ]\n"
-#~ msgstr "Bruk: %s [FLAGG]... [FIL]...\n"
-
-#~ msgid ""
-#~ "  -L, --max-line-length  print the length of the longest line\n"
-#~ "  -w, --words            print the word counts\n"
-#~ msgstr ""
-#~ "  -L, --max-line-length  skriv ut lengden av den lengste linjen.\n"
-#~ "  -w, --words            skriv ut antall ord\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "(obsolete) Instead of -t NUMBER or -t LIST, -NUMBER or -LIST may be "
-#~ "used.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Istedet for -t TALL eller -t LISTE kan -TALL eller -LISTE brukes.\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "(obsolete)  If -VALUE is used as first OPTION, same as -c VALUE when one "
-#~ "of\n"
-#~ "multipliers bkm follows concatenated, else same as -n VALUE.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "STØRRELSE kan ha en multiplikator-endelse: b for 512, k for 1K, m for "
-#~ "1Meg.\n"
-#~ "Hvis -VERDI brukes som første FLAGG, leses det som -c VERDI hvis en av\n"
-#~ "multiplikatorene bkm er bakerst, ellers leses -n VERDI.\n"
-
-#, fuzzy
-#~ msgid "warning: `od -s' is obsolete; use `od --strings'"
-#~ msgstr "advarsel: «sort %s» er avleggs; bruk «sort -k»"
-
-#, fuzzy
-#~ msgid "warning: `od -w' is obsolete; use `od --width'"
-#~ msgstr "advarsel: «sort %s» er avleggs; bruk «sort -k»"
-
-#, fuzzy
-#~ msgid "warning: `pr -S' is obsolete; use `pr --sep-string'"
-#~ msgstr "advarsel: «sort %s» er avleggs; bruk «sort -k»"
-
-#~ msgid ""
-#~ "  +POS1 [-POS2]             start a key at POS1, end it before POS2 "
-#~ "(origin 0)\n"
-#~ "                              Warning: this option is obsolete\n"
-#~ msgstr ""
-#~ "  +POS1 [-POS2]             start en nøkkel ved POS1, avslutt før POS2 "
-#~ "(fra 0)\n"
-#~ "                              Advarsel: dette flagget er avleggs\n"
-
-#, fuzzy
-#~ msgid "warning: `sort -y' is obsolete; omit `-y'"
-#~ msgstr "advarsel: «sort %s» er avleggs; bruk «sort -k»"
-
-#~ msgid ""
-#~ "A first OPTION of -VALUE\n"
-#~ "is treated like -n VALUE unless VALUE has one of the [bkm] suffix\n"
-#~ "multipliers, in which case it is treated like -c VALUE.\n"
-#~ msgstr ""
-#~ "Et første FLAGG som -VERDI\n"
-#~ "behandles som -n VERDI med mindre VERDI har en av [bkm]-endingene,\n"
-#~ "isåfall behandles det som -v VERDI.\n"
-
-#~ msgid ""
-#~ "A first option of +VALUE is treated like -+VALUE, but this usage is "
-#~ "obsolete\n"
-#~ "and support for it will be withdrawn.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Et første flagg som +VERDI behandles som -+VERDI, men denne anvendelsen "
-#~ "er\n"
-#~ "avleggs og støtte for den vil bli trukket tilbake.\n"
-
-#~ msgid "warning: `tail %s' is obsolete; use -n or -c instead"
-#~ msgstr "advarsel: «tail %s» er avleggs; bruker -n eller -c istedet"
-
-# c-format
-#~ msgid "warning: `uniq %s' is obsolete; use `uniq -s %s' instead"
-#~ msgstr "advarsel: «uniq %s» er avleggs; bruk «uniq -s %s» istedet"
+#~ msgid "%s subprocess got fatal signal %d"
+#~ msgstr "Underprosessen %s fikk kritisk signal %d"
diff --git a/po/nl.gmo b/po/nl.gmo
index abcbe76a..ff4b7bb3 100644
--- a/po/nl.gmo
+++ b/po/nl.gmo
diff --git a/po/nl.po b/po/nl.po
index b33f4916..a4272376 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,19 +1,21 @@
 # Dutch translations for GNU coreutils.
-# Copyright (C) 2013 Free Software Foundation, Inc.
+# Copyright (C) 2014 Free Software Foundation, Inc.
 # This file is distributed under the same license as the coreutils package.
 #
-# "Non vi sed amore."
+# « Kontraŭ neesto ne helpas protesto. »
 #
-# Benno Schulenberg <benno@vertaalt.nl>, 2008, 2010, 2011, 2012, 2013.
+# Docstrings in derde persoon; optieomschrijvingen in infinitief.
+#
+# Benno Schulenberg <benno@vertaalt.nl>, 2008, 2010, 2011, 2012, 2013, 2014.
 # Freek de Kruijf <f.de.kruijf@gmail.com>, 2004, 2005, 2006, 2007, 2008, 2009, 2010.
 # Ivo Timmermans <ivo@o2w.nl>, 2000.
 # Erick Branderhorst <branderh@debian.org>, 1996.
 msgid ""
 msgstr ""
-"Project-Id-Version: coreutils 8.20-pre2\n"
+"Project-Id-Version: coreutils 8.23-pre1\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
-"PO-Revision-Date: 2013-02-10 09:37+0100\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
+"PO-Revision-Date: 2014-07-17 23:01+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
@@ -41,76 +43,119 @@ msgstr "Geldige argumenten zijn:"
 msgid "error closing file"
 msgstr "fout bij sluiten van bestand"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "fout bij schrijven"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "behouden van toegangsrechten van %s"
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "Onbekende systeemfout"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "leeg normaal bestand"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "normaal bestand"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "map"
 
-#: lib/file-type.c:44
-msgid "block special file"
-msgstr "blok-apparaat"
-
-#: lib/file-type.c:47
-msgid "character special file"
-msgstr "byte-apparaat"
-
-#: lib/file-type.c:50
-msgid "fifo"
-msgstr "fifo"
-
-#: lib/file-type.c:53
+#: lib/file-type.c:46
 msgid "symbolic link"
 msgstr "symbolische koppeling"
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "socket"
-
-#: lib/file-type.c:59
+#: lib/file-type.c:52
 msgid "message queue"
 msgstr "berichtenwachtrij"
 
-#: lib/file-type.c:62
+#: lib/file-type.c:55
 msgid "semaphore"
 msgstr "semafoor"
 
-#: lib/file-type.c:65
+#: lib/file-type.c:58
 msgid "shared memory object"
 msgstr "gedeeld geheugenobject"
 
-#: lib/file-type.c:68
+#: lib/file-type.c:61
 msgid "typed memory object"
 msgstr "zelfstandig geheugenobject"
 
-#: lib/file-type.c:70
+#: lib/file-type.c:66
+msgid "block special file"
+msgstr "blok-apparaat"
+
+#: lib/file-type.c:69
+msgid "character special file"
+msgstr "byte-apparaat"
+
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr "aaneengesloten gegevens"
+
+#: lib/file-type.c:75
+msgid "fifo"
+msgstr "fifo"
+
+#: lib/file-type.c:78
+msgid "door"
+msgstr "door"
+
+#: lib/file-type.c:81
+msgid "multiplexed block special file"
+msgstr "gemultiplexed blok-apparaat"
+
+#: lib/file-type.c:84
+msgid "multiplexed character special file"
+msgstr "gemultiplexed byte-apparaat"
+
+#: lib/file-type.c:87
+msgid "multiplexed file"
+msgstr "gemultiplexed bestand"
+
+#: lib/file-type.c:90
+msgid "named file"
+msgstr "benoemd bestand"
+
+#: lib/file-type.c:93
+msgid "network special file"
+msgstr "netwerkapparaat"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr "gemigreerd bestand met gegevens"
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr "gemigreerd bestand zonder gegevens"
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr "poort"
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "socket"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr "whiteout"
+
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "merkwaardig bestand"
 
@@ -245,18 +290,18 @@ msgstr "%s: optie '-W %s' staat geen argument toe\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: optie '-W %s' vereist een argument\n"
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr "kan de toegangsrechten van %s niet veranderen"
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "kan map %s niet aanmaken"
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr "onvoldoende geheugen beschikbaar"
@@ -374,7 +419,7 @@ msgstr "Reguliere expressie is te groot"
 msgid "Unmatched ) or \\)"
 msgstr "Ongepaarde ) of \\)"
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 msgid "No previous regular expression"
 msgstr "Geen eerdere reguliere expressie"
 
@@ -399,7 +444,7 @@ msgstr "gebruik '--no-preserve-root' om deze drempel te omzeilen"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[jJyY]"
 
@@ -409,11 +454,11 @@ msgstr "^[jJyY]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, c-format
 msgid "setting permissions for %s"
 msgstr "instellen van toegangsrechten van %s"
@@ -557,18 +602,6 @@ msgstr "Stroomstoring"
 msgid "Resource lost"
 msgstr "Hulpbron verloren"
 
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, c-format
-msgid "cannot create pipe"
-msgstr "kan geen pijp aanmaken"
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, c-format
-msgid "%s subprocess failed"
-msgstr "subproces %s is mislukt"
-
 #: lib/strsignal.c:114
 #, c-format
 msgid "Real-time signal %d"
@@ -781,7 +814,7 @@ msgstr ""
 "Rapporteer gebreken in het programma '%s' aan <%s>;\n"
 "meld fouten in de vertaling aan <vertaling@vrijschrift.org>.\n"
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Webpagina van %s: <%s>\n"
@@ -791,31 +824,11 @@ msgstr "Webpagina van %s: <%s>\n"
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr "Webpagina van %s: <http://www.gnu.org/software/%s/>\n"
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr ""
 "Algemene hulp bij gebruik van GNU-software: <http://www.gnu.org/gethelp/>\n"
 
-#: lib/w32spawn.h:43
-#, c-format
-msgid "_open_osfhandle failed"
-msgstr "_open_osfhandle() is mislukt"
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr "kan bestandsdescriptor %d niet herstellen: dup2() is mislukt"
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr "subproces %s"
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr "subproces %s ontving het fatale signaal %d"
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr "standaardinvoer"
@@ -837,7 +850,7 @@ msgstr "onbekende gegevensstroom"
 msgid "failed to reopen %s with mode %s"
 msgstr "opnieuw openen van %s in modus %s is mislukt"
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr "vergelijken van tekenreeksen is mislukt"
@@ -905,7 +918,7 @@ msgstr ""
 "regel\n"
 "\n"
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -930,48 +943,47 @@ msgstr ""
 "over andere niet-alfabetische tekens in de gecodeerde reeks bytes te "
 "stappen.\n"
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "fout bij lezen"
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, c-format
 msgid "invalid input"
 msgstr "ongeldige invoer"
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, c-format
 msgid "invalid wrap size: %s"
 msgstr "ongeldige waarde van optie '-w'/'--wrap': %s"
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, c-format
 msgid "extra operand %s"
 msgstr "overtollig argument: %s"
 
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, c-format
 msgid "closing standard input"
 msgstr "sluiten van standaardinvoer"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -1001,13 +1013,13 @@ msgstr ""
 #: src/basename.c:60
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
-"  -a, --multiple       meerdere argumenten toestaan en elk als NAAM "
+"  -a, --multiple        meerdere argumenten toestaan en elk als NAAM "
 "behandelen\n"
-"  -s, --suffix=AVGSL   dit achtervoegsel verwijderen\n"
-"  -z, --zero           elke regel afsluiten met 0-byte, niet met "
+"  -s, --suffix=VOEGSEL  dit achtervoegsel verwijderen; impliceert '-a'\n"
+"  -z, --zero            elke regel afsluiten met 0-byte, niet met "
 "nieuweregel\n"
 
 #: src/basename.c:67
@@ -1027,32 +1039,31 @@ msgstr ""
 "  %s -s .h include/stdio.h  -> \"stdio\"\n"
 "  %s -a een/rks1 een/rks2   -> \"rks1\" gevolgd door \"rks2\"\n"
 
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, c-format
 msgid "missing operand"
 msgstr "ontbrekend argument"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr "Torbjörn Granlund"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 msgid "Richard M. Stallman"
 msgstr "Richard M. Stallman"
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1094,7 +1105,6 @@ msgstr ""
 "  -u                       (genegeerde optie)\n"
 "  -v, --show-nonprinting   notatie met ^ en M- gebruiken, behalve voor LF/"
 "TAB\n"
-"\n"
 
 #: src/cat.c:114
 #, c-format
@@ -1115,7 +1125,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr "kan geen ioctl() doen op %s"
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr "standaarduitvoer"
@@ -1132,14 +1142,14 @@ msgstr "Russell Coker"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 msgid "Jim Meyering"
 msgstr "Jim Meyering"
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, c-format
 msgid "failed to create security context: %s"
 msgstr "kan beveiligingscontext %s niet aanmaken"
@@ -1149,8 +1159,8 @@ msgstr "kan beveiligingscontext %s niet aanmaken"
 msgid "failed to set %s security context component to %s"
 msgstr "kan component %s van beveiligingscontext niet instellen op %s"
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, c-format
 msgid "failed to get security context of %s"
 msgstr "kan de beveiligingscontext van %s niet verkrijgen"
@@ -1160,18 +1170,18 @@ msgstr "kan de beveiligingscontext van %s niet verkrijgen"
 msgid "can't apply partial context to unlabeled file %s"
 msgstr "kan gedeeltelijke context niet toepassen op ongelabeld bestand %s"
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, c-format
 msgid "failed to change context of %s to %s"
 msgstr "kan de context van %s niet veranderen naar %s"
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
 msgstr "kan geen toegang krijgen tot %s"
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, c-format
 msgid "cannot read directory %s"
 msgstr "kan map %s niet lezen"
@@ -1181,13 +1191,14 @@ msgstr "kan map %s niet lezen"
 msgid "changing security context of %s\n"
 msgstr "veranderen van beveiligingscontext van %s\n"
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, c-format
 msgid "fts_read failed"
 msgstr "fts_read() is mislukt"
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, c-format
 msgid "fts_close failed"
 msgstr "fts_close() is mislukt"
@@ -1207,11 +1218,12 @@ msgstr ""
 
 #: src/chcon.c:357
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
-"Verandert de beveiligingscontext van elk gegeven BESTAND naar CONTEXT.\n"
+"Verandert de SELinux-beveiligingscontext van elk gegeven BESTAND naar "
+"CONTEXT.\n"
 "\n"
 "Als '--reference' gegeven is, dan wordt de beveiligingscontext van elk "
 "BESTAND\n"
@@ -1225,10 +1237,9 @@ msgid ""
 "file\n"
 msgstr ""
 "      --dereference      niet de symbolische koppelingen bewerken maar\n"
-"\"                         de bestanden waarnaar ze verwijzen (standaard)\n"
-"\"  -h, --no-dereference   de symbolische koppelingen zelf bewerken in "
-"plaats\n"
-"                         van de bestanden waarnaar ze verwijzen\n"
+"                           de bestanden waarnaar ze verwijzen (standaard)\n"
+"  -h, --no-dereference   de symbolische koppelingen zelf bewerken in plaats\n"
+"                           van de bestanden waarnaar ze verwijzen\n"
 
 #: src/chcon.c:369
 msgid ""
@@ -1244,7 +1255,7 @@ msgstr ""
 "  -l, --range=BEREIK     dit bereik instellen in de doel-"
 "beveiligingscontext\n"
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
 "      --preserve-root    fail to operate recursively on '/'\n"
@@ -1260,7 +1271,7 @@ msgid ""
 msgstr ""
 "      --reference=REFBESTAND  de beveiligingscontext van REFBESTAND "
 "gebruiken\n"
-"                              in plaats van een CONTEXT-waarde\n"
+"                                in plaats van een CONTEXT-waarde\n"
 
 #: src/chcon.c:383 src/chgrp.c:140 src/chown.c:118
 msgid "  -R, --recursive        operate on files and directories recursively\n"
@@ -1295,36 +1306,37 @@ msgstr ""
 "  -P      symbolische koppelingen niet volgen (standaard)\n"
 "\n"
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr "de combinatie '-R --dereference' vereist of '-H' of '-L'"
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr "de combinatie '-R -h' vereist '-P'"
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, c-format
 msgid "missing operand after %s"
 msgstr "ontbrekend argument na %s"
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, c-format
 msgid "invalid context: %s"
 msgstr "ongeldige context: %s"
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr "conflicterende specificaties voor beveiligingscontext gegeven"
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, c-format
 msgid "failed to get attributes of %s"
 msgstr "kan de eigenschappen van %s niet verkrijgen"
@@ -1355,7 +1367,7 @@ msgstr ""
 "veranderen naar die van REFERENTIEBESTAND.\n"
 "\n"
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
@@ -1395,48 +1407,48 @@ msgstr ""
 "  %s team /w       Verandert de groep van /w naar \"team\".\n"
 "  %s -hR team /w   Verandert de groep van /w en subbestanden naar \"team\".\n"
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
 msgstr "verkrijgen van nieuwe eigenschappen van %s"
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr ""
 "noch de symbolische koppeling %s noch waar deze naar verwijst is veranderd\n"
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr "modus van %s is veranderd van %04lo (%s) naar %04lo (%s)\n"
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr "kan modus van %s niet veranderen van %04lo (%s) naar %04lo (%s)\n"
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr "modus van %s blijft %04lo (%s)\n"
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr "kan niet werken op loze symbolische koppeling %s"
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, c-format
 msgid "changing permissions of %s"
 msgstr "veranderen van toegangsrechten van %s"
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr "%s: nieuwe toegangsrechten zijn %s, niet %s"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1448,7 +1460,7 @@ msgstr ""
 "     of:  %s [OPTIE...] --reference=REFERENTIEBESTAND BESTAND...\n"
 "\n"
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 msgid ""
 "Change the mode of each FILE to MODE.\n"
 "With --reference, change the mode of each FILE to that of RFILE.\n"
@@ -1459,17 +1471,17 @@ msgstr ""
 "veranderen naar die van REFERENTIEBESTAND.\n"
 "\n"
 
-#: src/chmod.c:391
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
 "      --reference=RFBSTND  modus van RFBSTND gebruiken i.p.v. een MODUS-"
 "waarde\n"
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr "  -R, --recursive        bestanden en mappen recursief behandelen\n"
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 msgid ""
 "\n"
 "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n"
@@ -1477,12 +1489,12 @@ msgstr ""
 "\n"
 "Iedere MODUS is van de vorm '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n"
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr "een expliciete modus gaat niet samen met optie '--reference'"
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, c-format
 msgid "invalid mode: %s"
 msgstr "ongeldige modus: %s"
@@ -1635,26 +1647,21 @@ msgstr ""
 "\".\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr "Roland McGrath"
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr "ongeldige groep: %s"
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, c-format
 msgid "invalid group list %s"
 msgstr "ongeldige groepslijst: %s"
 
-#: src/chroot.c:117
-#, c-format
-msgid "failed to set additional groups"
-msgstr "instellen van aanvullende groepen is mislukt"
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
@@ -1663,15 +1670,15 @@ msgstr ""
 "Gebruik:  %s [OPTIE] DOELMAP [COMMANDO [ARGUMENT...]]\n"
 "     of:  %s OPTIE\n"
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
 msgstr ""
-"Het gegeven COMMANDO (plus ARGUMENTEN) uitvoeren met DOELMAP als basismap.\n"
+"Voert het gegeven COMMANDO (plus ARGUMENTEN) uit, met DOELMAP als basismap.\n"
 "\n"
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
@@ -1679,7 +1686,7 @@ msgstr ""
 "  --userspec=GEBRUIKER:GROEP  te gebruiken gebruiker en groep (ID of naam)\n"
 "  --groups=GROEPENLIJST       extra groepen (kommagescheiden lijst)\n"
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 msgid ""
 "\n"
 "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n"
@@ -1688,28 +1695,43 @@ msgstr ""
 "Als geen commando gegeven is, dan '${SHELL} -i' uitvoeren (standaard: /bin/"
 "sh).\n"
 
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, c-format
 msgid "cannot change root directory to %s"
 msgstr "kan '%s' niet als basismap instellen"
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, c-format
 msgid "cannot chdir to root directory"
 msgstr "kan hoofdmap niet als huidige map instellen"
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr "geen groep opgegeven voor onbekend UID: %d"
+
+#: src/chroot.c:383
+#, c-format
+msgid "failed to get supplemental groups"
+msgstr "kan aanvullende groepen niet achterhalen"
+
+# FIXME: don't use fill-in words
+#: src/chroot.c:395
+#, c-format
+msgid "failed to %s supplemental groups"
+msgstr "kan aanvullende groepen niet «%s»"
+
+#: src/chroot.c:402
 #, c-format
 msgid "failed to set group-ID"
 msgstr "instellen van groeps-ID is mislukt"
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, c-format
 msgid "failed to set user-ID"
 msgstr "instellen van gebruikers-ID is mislukt"
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, c-format
 msgid "failed to run command %s"
 msgstr "kan commando %s niet uitvoeren"
@@ -1739,10 +1761,10 @@ msgid ""
 "Print CRC checksum and byte counts of each FILE.\n"
 "\n"
 msgstr ""
-"De CRC-controlesom en het aantal bytes tonen van elk gegeven BESTAND.\n"
+"Toont de CRC-controlesom en het aantal bytes van elk gegeven BESTAND.\n"
 "\n"
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr ""
@@ -1752,7 +1774,7 @@ msgstr ""
 #: src/comm.c:107
 msgid "Compare sorted files FILE1 and FILE2 line by line.\n"
 msgstr ""
-"De gesorteerde bestanden BESTAND1 en BESTAND2 regel voor regel vergelijken.\n"
+"Vergelijkt de gesorteerde bestanden BESTAND1 en BESTAND2 regel voor regel.\n"
 
 #: src/comm.c:110
 msgid ""
@@ -1776,7 +1798,7 @@ msgid ""
 msgstr ""
 "\n"
 "  -1    regels die alleen in BESTAND1 voorkomen weglaten\n"
-"  -2    regels die alleen in BESTAND1 voorkomen weglaten\n"
+"  -2    regels die alleen in BESTAND2 voorkomen weglaten\n"
 "  -3    regels die in beide bestanden voorkomen weglaten\n"
 
 #: src/comm.c:122
@@ -1836,299 +1858,337 @@ msgstr "meer dan één scheiding gegeven"
 msgid "empty %s not allowed"
 msgstr "een lege %s is niet toegestaan"
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr "fout bij lezen van %s"
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, c-format
 msgid "cannot lseek %s"
 msgstr "kan geen 'lseek' doen op %s"
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr "fout bij schrijven van %s"
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, c-format
 msgid "%s: failed to get extents info"
 msgstr "%s: kan 'extents'-informatie niet verkrijgen"
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, c-format
 msgid "%s: write failed"
 msgstr "%s: schrijven is mislukt"
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, c-format
 msgid "failed to extend %s"
 msgstr "kan %s niet uitbreiden"
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, c-format
 msgid "clearing permissions for %s"
 msgstr "wissen van toegangsrechten van %s"
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "behouden van eigenaar van %s is mislukt"
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
 msgstr "kan bestand %s niet vinden"
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, c-format
 msgid "failed to preserve authorship for %s"
 msgstr "behouden van het auteurschap van %s is mislukt"
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
+#, c-format
+msgid "failed to set default file creation context to %s"
+msgstr "kan de standaard aanmaakcontext niet instellen op %s"
+
+#: src/copy.c:820
+#, c-format
+msgid "failed to set default file creation context for %s"
+msgstr "kan de standaard aanmaakcontext niet instellen op %s"
+
+#: src/copy.c:846
+#, c-format
+msgid "failed to set the security context of %s"
+msgstr "kan de beveiligingscontext van %s niet instellen"
+
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
 msgid "cannot open %s for reading"
 msgstr "kan %s niet openen om te lezen"
 
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, c-format
 msgid "cannot fstat %s"
 msgstr "kan status van %s niet opvragen"
 
-#: src/copy.c:820
+#: src/copy.c:935
 #, c-format
 msgid "skipping file %s, as it was replaced while being copied"
 msgstr ""
 "bestand %s wordt overgeslagen, omdat het werd vervangen tijdens het kopiëren"
 
-#: src/copy.c:850
-#, c-format
-msgid "failed to get file system create context"
-msgstr "kan de aanmaakcontext van het bestandssysteem niet verkrijgen"
-
-#: src/copy.c:864
-#, c-format
-msgid "failed to set the security context of %s to %s"
-msgstr "kan de beveiligingscontext van %s niet naar %s veranderen"
-
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
 msgid "cannot remove %s"
 msgstr "kan %s niet verwijderen"
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
 msgstr "%s is verwijderd\n"
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr "zal niet schrijven via loze symbolische koppeling %s"
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, c-format
 msgid "cannot create regular file %s"
 msgstr "kan het normale bestand %s niet aanmaken"
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, c-format
 msgid "failed to clone %s from %s"
 msgstr "kan %2$s niet klonen naar %1$s"
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr "behouden van tijdsstempels van %s"
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
 #, c-format
 msgid "failed to close %s"
 msgstr "sluiten van %s is mislukt"
 
-#: src/copy.c:1471
+#: src/copy.c:1580
+#, c-format
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
+msgstr "%s: %s toch vervangen, modus %04lo (%s) negeren? "
+
+#: src/copy.c:1581
 #, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
-msgstr "%s: toch proberen om %s te overschrijven, modus %04lo (%s) negeren? "
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr "%s: %s is onschrijfbaar (modus %04lo, %s); toch proberen? "
 
-#: src/copy.c:1478
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
 msgstr "%s: %s overschrijven? "
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr " (reservekopie: %s)"
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr "kan de standaard aanmaakcontext niet herstellen"
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, c-format
 msgid "cannot create hard link %s to %s"
 msgstr "kan geen harde koppeling %s maken naar %s"
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, c-format
 msgid "cannot stat %s"
 msgstr "kan status van %s niet opvragen"
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, c-format
 msgid "omitting directory %s"
 msgstr "map %s wordt overgeslagen"
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr "waarschuwing: bronbestand %s is meerdere keren opgegeven"
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
 msgstr "%s en %s zijn hetzelfde bestand"
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr "kan niet-map %s niet overschrijven met map %s"
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr "zal zojuist aangemaakte %s niet overschrijven met %s"
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr "kan map %s niet overschrijven met een niet-map"
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr "kan een map niet verplaatsen naar een niet-map: %s -> %s"
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr ""
 "een reservekopie van %s zou de bron vernietigen;  %s is niet verplaatst"
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr ""
 "een reservekopie van %s zou de bron vernietigen;  %s is niet gekopieerd"
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
 msgstr "kan geen reservekopie maken van %s"
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr "zal %s niet kopiëren via zojuist gemaakte symbolische koppeling %s"
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr "kan map %s niet kopiëren naar binnen zichzelf (%s)"
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr "zal geen harde koppeling %s maken naar map %s"
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr "kan %s niet verplaatsen naar een submap van zichzelf, %s"
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, c-format
 msgid "cannot move %s to %s"
 msgstr "kan %s niet verplaatsen naar %s"
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr ""
 "verplaatsing tussen apparaten is mislukt: %s naar %s;  kan het doel niet "
 "verwijderen"
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, c-format
-msgid "failed to set default file creation context to %s"
-msgstr "kan de standaard aanmaakcontext niet instellen op %s"
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr "kan cyclische symbolische koppeling %s niet kopiëren"
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr "%s: kan relatieve symbolische koppelingen alleen in huidige map maken"
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr "kan symbolische koppeling %s naar %s niet aanmaken"
 
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, c-format
 msgid "cannot create fifo %s"
 msgstr "kan fifo %s niet aanmaken"
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, c-format
 msgid "cannot create special file %s"
 msgstr "kan speciaal bestand %s niet aanmaken"
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, c-format
 msgid "cannot read symbolic link %s"
 msgstr "kan symbolische koppeling %s niet lezen"
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, c-format
 msgid "cannot create symbolic link %s"
 msgstr "kan symbolische koppeling %s niet aanmaken"
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
 msgstr "%s heeft onbekend bestandstype"
 
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, c-format
 msgid "cannot un-backup %s"
 msgstr "kan %s niet uit reservekopie herstellen"
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr "%s -> %s (uit reservekopie hersteld)\n"
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr "Alex Deymo"
+
+# FIXME: singular PARAM, dots within
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr "Gebruik: %s --coreutils-prog=PROGRAMMA [ARGUMENTEN]\n"
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+"Voert het gegeven ingebouwde PROGRAMMA uit met de gegeven ARGUMENTEN.\n"
+"\n"
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+"\n"
+"Typ '%s --coreutils-prog=PROGRAMMANAAM --help' voor hulp bij een programma.\n"
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, c-format
+msgid "unknown program %s"
+msgstr "onbekend programma %s"
+
+#: src/cp.c:157 src/mv.c:288
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -2140,11 +2200,11 @@ msgstr ""
 "     of:  %s [OPTIE...] -t MAP BRON...\n"
 "\n"
 
-#: src/cp.c:162
+#: src/cp.c:163
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
 msgstr "Kopieert een BRON naar een BESTEMMING, of BRON(nen) naar een MAP.\n"
 
-#: src/cp.c:168
+#: src/cp.c:169
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
 "      --attributes-only        don't copy the file data, just the "
@@ -2169,7 +2229,7 @@ msgstr ""
 "  -d                        hetzelfde als '--no-dereference --"
 "preserve=links'\n"
 
-#: src/cp.c:177
+#: src/cp.c:178
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
 "                                 opened, remove it and try again (this "
@@ -2191,7 +2251,7 @@ msgstr ""
 "                              (gaat boven een eerdere optie '-n')\n"
 "  -H                        gegeven symbolische koppelingen in BRON volgen\n"
 
-#: src/cp.c:186
+#: src/cp.c:187
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
 "  -L, --dereference            always follow symbolic links in SOURCE\n"
@@ -2199,7 +2259,7 @@ msgstr ""
 "  -l, --link                harde koppelingen maken in plaats van kopieën\n"
 "  -L, --dereference         symbolische koppelingen in BRON altijd volgen\n"
 
-#: src/cp.c:190
+#: src/cp.c:191
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
 "                                 a previous -i option)\n"
@@ -2209,7 +2269,7 @@ msgstr ""
 "                              (gaat boven een eerdere optie '-i')\n"
 "  -P, --no-dereference      geen symbolische koppelingen in BRON volgen\n"
 
-#: src/cp.c:195
+#: src/cp.c:196
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
 "      --preserve[=ATTR_LIST]   preserve the specified attributes (default:\n"
@@ -2228,7 +2288,7 @@ msgstr ""
 "                              mogelijkheden zijn: context, links, xattr, "
 "all)\n"
 
-#: src/cp.c:203
+#: src/cp.c:204
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                use full source file name under DIRECTORY\n"
@@ -2237,7 +2297,7 @@ msgstr ""
 "      --parents             volledige naam gebruiken van bronbestand onder "
 "MAP\n"
 
-#: src/cp.c:207
+#: src/cp.c:208
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
 "      --reflink[=WHEN]         control clone/CoW copies. See below\n"
@@ -2251,7 +2311,7 @@ msgstr ""
 "                                 u deze probeert te openen (anders dan '--"
 "force')\n"
 
-#: src/cp.c:213
+#: src/cp.c:214
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
 "      --strip-trailing-slashes  remove any trailing slashes from each "
@@ -2263,7 +2323,7 @@ msgstr ""
 "      --strip-trailing-slashes  schuine strepen achter elk BRON-argument\n"
 "                                  verwijderen\n"
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -2278,7 +2338,7 @@ msgstr ""
 "  -T, --no-target-directory     BESTEMMING behandelen als een normaal "
 "bestand\n"
 
-#: src/cp.c:224
+#: src/cp.c:225
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
 "                                 than the destination file or when the\n"
@@ -2291,9 +2351,21 @@ msgstr ""
 "                              of wanneer dit bestand niet bestaat\n"
 "  -v, --verbose             tonen wat er gedaan wordt\n"
 "  -x, --one-file-system     binnen dit bestandssysteem blijven\n"
-"\n"
 
-#: src/cp.c:233
+#: src/cp.c:232
+#, fuzzy
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+"  -Z, --context[=CNTXT]     de SELinux-beveiligingscontext van doelbestand "
+"op\n"
+"                              standaard instellen (of op CNTXT indien "
+"gegeven)\n"
+
+#: src/cp.c:240
 msgid ""
 "\n"
 "By default, sparse SOURCE files are detected by a crude heuristic and the\n"
@@ -2326,7 +2398,7 @@ msgstr ""
 "gespecificeerd, wordt\n"
 "teruggevallen op standaard kopiëren.\n"
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 msgid ""
 "\n"
 "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n"
@@ -2344,7 +2416,7 @@ msgstr ""
 "dit zijn de mogelijke waarden (methodes):\n"
 "\n"
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2356,7 +2428,7 @@ msgstr ""
 "  existing, nil    genummerde reserves maken als er al zijn, anders simpele\n"
 "  simple, never    altijd simpele reservekopieën maken\n"
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2368,92 +2440,104 @@ msgstr ""
 "'--force' en '--backup' gegeven zijn én BRON en BESTEMMING dezelfde\n"
 "naam van een bestaand gewoon bestand zijn.\n"
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, c-format
 msgid "failed to preserve times for %s"
 msgstr "behouden van de tijdsstempels van %s is mislukt"
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, c-format
 msgid "failed to preserve permissions for %s"
 msgstr "behouden van de toegangsrechten van %s is mislukt"
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, c-format
 msgid "cannot make directory %s"
 msgstr "kan map %s niet aanmaken"
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr "%s bestaat maar is geen map"
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
 #, c-format
 msgid "failed to access %s"
 msgstr "kan geen toegang krijgen tot %s"
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, c-format
 msgid "missing file operand"
 msgstr "geen bestand opgegeven"
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, c-format
 msgid "missing destination file operand after %s"
 msgstr "ontbrekende bestemming na %s"
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr ""
 "opties '--target-directory' (-t) en '--no-target-directory' (-T) gaan niet "
 "samen"
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, c-format
 msgid "target %s is not a directory"
 msgstr "doel %s is geen map"
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr "met '--parents' moet de bestemming een map zijn"
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, c-format
 msgid "multiple target directories specified"
 msgstr "meer dan één bestemmingsmap opgegeven"
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr ""
+"Waarschuwing: optie '--context' (-Z) wordt genegeerd;\n"
+"het vereist een kernel met SELinux."
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr "kan niet zowel harde als symbolische koppelingen maken"
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr "de opties '--backup' en '--no-clobber' sluiten elkaar uit"
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr "optie '--reflink' kan alleen worden gebruikt met '--sparse=auto'"
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr "reservekopiemethode"
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, c-format
+msgid "cannot set target context and preserve it"
+msgstr "kan doelcontext niet zowel instellen als behouden"
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr "kan beveiligingscontext niet behouden zonder een kernel met SELinux"
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr ""
@@ -2461,133 +2545,133 @@ msgstr ""
 "'cp' is gecompileerd zonder ondersteuning voor 'xattr'"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr "Stuart Kemp"
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr "invoer is verdwenen"
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr "%s: regelnummer valt buiten bereik"
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, c-format
 msgid "%s: %s: line number out of range"
 msgstr "%s: %s: regelnummer valt buiten bereik"
 
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, c-format
 msgid " on repetition %s\n"
 msgstr " tijdens herhaling %s\n"
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, c-format
 msgid "%s: %s: match not found"
 msgstr "%s: %s: geen overeenkomst gevonden"
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr "fout in zoeken met reguliere expressie"
 
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, c-format
 msgid "write error for %s"
 msgstr "fout bij schrijven naar %s"
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, c-format
 msgid "%s: integer expected after delimiter"
 msgstr "%s: geheel getal verwacht na scheidingsteken"
 
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr "%s: '}' is vereist bij een herhalingsaantal"
 
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr "%s}: geheel getal is vereist tussen '{' en '}'"
 
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr "%s: afsluitend scheidingsteken '%c' ontbreekt"
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr "%s: ongeldige reguliere expressie: %s"
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr "%s: ongeldig patroon"
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr "%s: regelnummer moet groter zijn dan nul"
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr "regelnummer %s is kleiner dan het voorgaande regelnummer, %s"
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr "waarschuwing: regelnummer %s is gelijk aan het voorgaande regelnummer"
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr "specificatie voor conversie ontbreekt in achtervoegsel"
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr "ongeldige conversiespecificatie in achtervoegsel: %c"
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr "ongeldige conversiespecificatie in achtervoegsel: \\%.3o"
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr "ongeldige vlaggen in conversiespecificatie: %%%c%c"
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr "te veel specificaties voor %%-conversie in achtervoegsel"
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr "ontbrekende specificatie voor %%-conversie in achtervoegsel"
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr "%s: ongeldig getal"
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr ""
 "Gebruik:  %s [OPTIE...] BESTAND PATROON...\n"
 "\n"
 
-#: src/csplit.c:1455
+#: src/csplit.c:1483
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
 "and output byte counts of each piece to standard output.\n"
@@ -2597,7 +2681,7 @@ msgstr ""
 "patronen, schrijft de delen naar de bestanden 'xx00', 'xx01', 'xx02', enz.,\n"
 "en toont het aantal bytes van elk deel op standaarduitvoer.\n"
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2609,7 +2693,13 @@ msgstr ""
 "  -f, --prefix=VOORVOEGSEL    te gebruiken voorvoegsel in plaats van 'xx'\n"
 "  -k, --keep-files            uitvoerbestanden niet verwijderen bij fouten\n"
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr ""
+"  -m, --suppress-matched      regels die overeenkomen met PATROON "
+"onderdrukken\n"
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
@@ -2618,9 +2708,8 @@ msgstr ""
 "  -n, --digits=AANTAL         te gebruiken aantal cijfers in plaats van 2\n"
 "  -s, --quiet, --silent       de lengte van de uitvoerbestanden niet tonen\n"
 "  -z, --elide-empty-files     lege uitvoerbestanden verwijderen\n"
-"\n"
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
@@ -2630,7 +2719,7 @@ msgstr ""
 "\n"
 "Elk PATROON mag zijn:\n"
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 msgid ""
 "\n"
 "  INTEGER            copy up to but not including specified line number\n"
@@ -2656,24 +2745,20 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr "David M. Ihnat"
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr "velden en posities worden genummerd vanaf 1"
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr ""
 "Gebruik:  %s OPTIE... [BESTAND...]\n"
 "\n"
 
-#: src/cut.c:193
+#: src/cut.c:176
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr ""
-"De geselecteerde delen van regels uit elk BESTAND naar standaarduitvoer "
-"sturen.\n"
+"Stuurt de geselecteerde delen van regels uit elk BESTAND naar "
+"standaarduitvoer.\n"
 
-#: src/cut.c:199
+#: src/cut.c:182
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
 "  -c, --characters=LIST   select only these characters\n"
@@ -2684,7 +2769,7 @@ msgstr ""
 "  -d, --delimiter=TEKEN   dit veldscheidingsteken gebruiken in plaats van "
 "TAB\n"
 
-#: src/cut.c:204
+#: src/cut.c:187
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
 "                            that contains no delimiter character, unless\n"
@@ -2697,7 +2782,7 @@ msgstr ""
 "gegeven\n"
 "  -n                      (genegeerde optie)\n"
 
-#: src/cut.c:210
+#: src/cut.c:193
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
 "                            or fields\n"
@@ -2705,7 +2790,7 @@ msgstr ""
 "      --complement        het complement maken van de set van geselecteerde\n"
 "                            bytes, tekens of velden\n"
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
@@ -2714,9 +2799,8 @@ msgstr ""
 "  -s, --only-delimited    alleen regels tonen die scheidingstekens bevatten\n"
 "      --output-delimiter=TEKST  deze tekst als uitvoerscheiding gebruiken;\n"
 "                                  standaard het invoerscheidingsteken\n"
-"\n"
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2730,7 +2814,7 @@ msgstr ""
 "in dezelfde volgorde als ze gelezen werd en slechts precies één keer.\n"
 "\n"
 
-#: src/cut.c:227
+#: src/cut.c:210
 msgid ""
 "Each range is one of:\n"
 "\n"
@@ -2750,47 +2834,51 @@ msgstr ""
 "\n"
 "Zonder BESTAND, of wanneer BESTAND - is, wordt standaardinvoer gelezen.\n"
 
-#: src/cut.c:367 src/cut.c:493
+#: src/cut.c:300 src/cut.c:394
 msgid "invalid byte, character or field list"
 msgstr "ongeldige lijst van bytes of velden"
 
-#: src/cut.c:387
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr "velden en posities worden genummerd vanaf 1"
+
+#: src/cut.c:320
 msgid "invalid range with no endpoint: -"
 msgstr "ongeldig bereik zonder eindpunt: -"
 
-#: src/cut.c:403
+#: src/cut.c:334
 msgid "invalid decreasing range"
 msgstr "ongeldig aflopend bereik"
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, c-format
 msgid "byte offset %s is too large"
 msgstr "byte-positie %s is te groot"
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, c-format
 msgid "field number %s is too large"
 msgstr "veldnummer %s is te groot"
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr "er mag slechts één soort lijst worden opgegeven"
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr "het scheidingsteken moet een enkel teken zijn"
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr "u moet een lijst van bytes, tekens, of velden geven"
 
-#: src/cut.c:850
+#: src/cut.c:790
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr ""
 "een scheidingsteken mag alleen gegeven worden als met velden gewerkt wordt"
 
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
@@ -2798,11 +2886,11 @@ msgstr ""
 "het onderdrukken van onbegrensde regels heeft\n"
 "     alleen zin als met velden gewerkt wordt"
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr "ontbrekende lijst van velden"
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr "ontbrekende lijst van posities"
 
@@ -2863,7 +2951,7 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 "      --rfc-3339=SOORT         datum en tijd in RFC 3339-opmaak tonen;\n"
 "                                 'date' toont alleen de datum, 'seconds' "
@@ -2873,8 +2961,7 @@ msgstr ""
 "                                 componenten worden gescheiden door één "
 "spatie\n"
 "  -s, --set=DATUMTIJD          deze tijd en/of datum instellen\n"
-"  -u, --utc, --universal       de standaard wereldtijd gebruiken\n"
-"\n"
+"  -u, --utc, --universal       de standaard wereldtijd (UTC) gebruiken\n"
 
 #: src/date.c:158
 msgid ""
@@ -3085,10 +3172,10 @@ msgstr ""
 "aan de westkust van de Verenigde Staten:\n"
 "  $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n"
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr "standaardinvoer"
@@ -3130,7 +3217,7 @@ msgstr ""
 msgid "cannot set date"
 msgstr "kan datum niet instellen"
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, c-format
 msgid "time %s is out of range"
 msgstr "tijd %s valt buiten bereik"
@@ -3141,7 +3228,7 @@ msgstr "tijd %s valt buiten bereik"
 msgid "Paul Rubin"
 msgstr "Paul Rubin"
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
@@ -3151,7 +3238,7 @@ msgstr ""
 "     of:  %s OPTIE\n"
 "\n"
 
-#: src/dd.c:526
+#: src/dd.c:532
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
 "\n"
@@ -3170,7 +3257,7 @@ msgstr ""
 "  count=BLOKKEN    slechts dit aantal invoerblokken kopiëren\n"
 "  ibs=BYTES        aantal tegelijk te lezen bytes (standaard: 512)\n"
 
-#: src/dd.c:535
+#: src/dd.c:541
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
 "  iflag=FLAGS     read as per the comma separated symbol list\n"
@@ -3196,7 +3283,7 @@ msgstr ""
 
 # Het getal N komt niet voor in mijn vertaling
 # (en BLOCKS niet meer in het origineel).
-#: src/dd.c:546
+#: src/dd.c:552
 msgid ""
 "\n"
 "N and BYTES may be followed by the following multiplicative suffixes:\n"
@@ -3214,7 +3301,7 @@ msgstr ""
 "\n"
 "Mogelijke CONVERSIES zijn:\n"
 
-#: src/dd.c:555
+#: src/dd.c:561
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
 "  ebcdic    from ASCII to EBCDIC\n"
@@ -3244,7 +3331,7 @@ msgstr ""
 "wanneer\n"
 "               samen met 'block' of 'unblock', dan uitvullen met spaties\n"
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -3260,7 +3347,7 @@ msgstr ""
 "  fdatasync  het uitvoerbestand fysiek naar schijf schrijven vóór afsluiten\n"
 "  fsync      idem, maar ook de metagegevens schrijven\n"
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -3274,79 +3361,79 @@ msgstr ""
 "  append     achtervoegen (alleen zinvol bij uitvoer; suggestie: "
 "conv=notrunc)\n"
 
-#: src/dd.c:583
+#: src/dd.c:589
 msgid "  cio       use concurrent I/O for data\n"
 msgstr "  cio        gelijktijdige I/O gebruiken voor de gegevens\n"
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr "  direct     directe I/O gebruiken voor de gegevens\n"
 
-#: src/dd.c:587
+#: src/dd.c:593
 msgid "  directory  fail unless a directory\n"
 msgstr "  directory  weigeren als het geen map is\n"
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr "  dsync      gesynchroniseerde I/O gebruiken voor de gegevens\n"
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr "  sync       idem, maar ook voor de metagegevens\n"
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr ""
 "  fullblock  volledige blokken invoer verzamelen (alleen bij 'iflag')\n"
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr "  nonblock   niet-blokkerende I/O gebruiken\n"
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr "  noatime    toegangstijdsstempels niet wijzigen\n"
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr "  nocache    gecachte gegevens verwerpen\n"
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr "  noctty     bestand is geen besturende terminal\n"
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr "  nofollow   symbolische koppelingen niet volgen\n"
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr "  nolinks    weigeren als bestand meer dan één harde koppeling heeft\n"
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr "  binary     binaire I/O gebruiken voor de gegevens\n"
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr "  text       tekst-I/O gebruiken voor de gegevens\n"
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr ""
 "  count_bytes  'count=N' als een byte-aantal begrijpen (alleen 'iflag')\n"
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr ""
 "  skip_bytes   'skip=N' als een byte-aantal begrijpen (alleen 'iflag')\n"
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr ""
 "  seek_bytes   'seek=N' als een byte-aantal begrijpen (alleen 'oflag')\n"
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, c-format
 msgid ""
 "\n"
@@ -3376,7 +3463,17 @@ msgstr ""
 "Opties zijn:\n"
 "\n"
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr "onvoldoende geheugen beschikbaar voor invoerbuffer van %zu bytes (%s)"
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr "onvoldoende geheugen beschikbaar voor uitvoerbuffer van %zu bytes (%s)"
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
@@ -3385,21 +3482,21 @@ msgstr ""
 "%<PRIuMAX>+%<PRIuMAX> records gelezen\n"
 "%<PRIuMAX>+%<PRIuMAX> records geschreven\n"
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
 msgstr[0] "%<PRIuMAX> afgebroken record\n"
 msgstr[1] "%<PRIuMAX> afgebroken records\n"
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
 msgstr[0] "%<PRIuMAX> byte (%s) gekopieerd"
 msgstr[1] "%<PRIuMAX> bytes (%s) gekopieerd"
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr "oneindig"
 
@@ -3413,83 +3510,83 @@ msgstr "oneindig"
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
 msgstr ", %g s, %s/s\n"
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, c-format
 msgid "closing input file %s"
 msgstr "sluiten van invoerbestand %s"
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr "sluiten van uitvoerbestand %s"
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr "uitschakelen van O_DIRECT is mislukt: %s"
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, c-format
 msgid "writing to %s"
 msgstr "schrijven naar %s"
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, c-format
 msgid "unrecognized operand %s"
 msgstr "niet-herkend argument: %s"
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 msgid "invalid conversion"
 msgstr "ongeldige conversie"
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 msgid "invalid input flag"
 msgstr "ongeldige invoervlag"
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 msgid "invalid output flag"
 msgstr "ongeldige uitvoervlag"
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 msgid "invalid status flag"
 msgstr "ongeldige statusvlag"
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, c-format
 msgid "invalid number %s"
 msgstr "ongeldig getal: %s"
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr "slechts één van {ascii,ebcdic,ibm} is mogelijk"
 
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, c-format
 msgid "cannot combine block and unblock"
 msgstr "'block' en 'unblock' gaan niet samen"
 
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, c-format
 msgid "cannot combine lcase and ucase"
 msgstr "'lcase' en 'ucase' gaan niet samen"
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, c-format
 msgid "cannot combine excl and nocreat"
 msgstr "'excl' en 'nocreat' gaan niet samen"
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, c-format
 msgid "cannot combine direct and nocache"
 msgstr "'direct' en 'nocache' gaan niet samen"
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
@@ -3498,73 +3595,63 @@ msgstr ""
 "waarschuwing: er wordt om de 'lseek'-kernelfout heen gewerkt voor bestand\n"
 "%s met mt_type=0x%0lx -- zie <sys/mtio.h> voor de lijst met typen"
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, c-format
 msgid "%s: cannot skip"
 msgstr "%s: kan niet overslaan"
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, c-format
 msgid "%s: cannot seek"
 msgstr "%s: kan geen 'seek' doen"
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr "positie werd te groot tijdens lezen van bestand %s"
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr ""
 "waarschuwing: positie in bestand klopt niet meer na mislukte leesopdracht"
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr "kan toch niet om de kernelfout heen werken"
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, c-format
 msgid "setting flags for %s"
 msgstr "instellen van vlaggen voor %s"
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr "onvoldoende geheugen beschikbaar voor invoerbuffer van %zu bytes (%s)"
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr "onvoldoende geheugen beschikbaar voor uitvoerbuffer van %zu bytes (%s)"
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr "%s: kan niet naar de gegeven positie springen"
 
-#: src/dd.c:2133
+#: src/dd.c:2172
 #, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
 msgstr "afkorten op %<PRIdMAX> bytes van uitvoerbestand %s is mislukt"
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr "'fdatasync' is mislukt voor %s"
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
 msgstr "'fsync' is mislukt voor %s"
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, c-format
 msgid "failed to open %s"
 msgstr "openen van %s is mislukt"
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
@@ -3573,97 +3660,108 @@ msgstr ""
 "positie is te groot: kan niet afkorten tot een lengte van seek=%<PRIuMAX> "
 "(%lu-byte) blokken"
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr "afkorten op %<PRIuMAX> bytes van uitvoerbestand %s is mislukt"
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, c-format
 msgid "failed to discard cache for: %s"
 msgstr "verwerpen van cache voor %s is mislukt"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr "Paul Eggert"
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr "Bestandssysteem"
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr "Type"
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr "blokken"
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr "Gebruikt"
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr "Beschikbaar"
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr "Geb%"
 
 # Het aantal minuten inactiviteit; maximaal 6 tekens.
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr "I-nodes"
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr "IGebr"
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr "IVrij"
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr "IGeb%"
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr "Aangekoppeld op"
 
-#: src/df.c:383
+#: src/df.c:207
+msgid "File"
+msgstr "Bestand"
+
+#: src/df.c:387
 #, c-format
-msgid "option --output: field '%s' unknown"
-msgstr "optie '--output': veld '%s' is onbekend"
+msgid "option --output: field %s unknown"
+msgstr "optie '--output': veld %s is onbekend"
 
-#: src/df.c:390
+#: src/df.c:394
 #, c-format
-msgid "option --output: field '%s' used more than once"
-msgstr "optie '--output': veld '%s' is meerdere keren opgegeven"
+msgid "option --output: field %s used more than once"
+msgstr "optie '--output': veld %s is meerdere keren opgegeven"
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr "Grootte"
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr "Besch"
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr "Vulgraad"
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
 msgstr "%s-%s"
 
-#: src/df.c:1210
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr ""
+"kan geen toegang krijgen tot %s: een ander apparaat is eroverheen "
+"aangekoppeld"
+
+#: src/df.c:1384
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
 "or all file systems by default.\n"
@@ -3672,16 +3770,17 @@ msgstr ""
 "bestandssystemen,\n"
 "of van de bestandssystemen waarop de gegeven BESTANDen zich bevinden.\n"
 
-#: src/df.c:1217
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
 "  -a, --all                 ook pseudobestandssystemen tonen\n"
 "  -B, --block-size=GROOTTE  de te tonen groottes schalen naar deze waarde;\n"
@@ -3690,12 +3789,10 @@ msgstr ""
 "                              van 1.048.576 bytes; zie hieronder voor meer "
 "info\n"
 "      --total               een eindtotaal tonen\n"
-"  -h, --human-readable      groottes in leesbare vorm tonen (bijv. 1K, 234M, "
-"2G)\n"
-"  -H, --si                  idem, maar machten van 1000 i.p.v. 1024 "
-"gebruiken\n"
+"  -h, --human-readable      groottes in machten van 1024 tonen (bijv. 234M)\n"
+"  -H, --si                  groottes in machten van 1000 tonen (bijv. 245M)\n"
 
-#: src/df.c:1227
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -3711,8 +3808,7 @@ msgstr ""
 "      --no-sync             geen 'sync' doen vóór ophalen van info "
 "(standaard)\n"
 
-#: src/df.c:1234
-#, fuzzy
+#: src/df.c:1409
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
 "                               or print all fields if FIELD_LIST is "
@@ -3724,6 +3820,9 @@ msgid ""
 "  -x, --exclude-type=TYPE   limit listing to file systems not of type TYPE\n"
 "  -v                    (ignored)\n"
 msgstr ""
+"      --output[=VELDENLIJST]    de gegeven uitvoeropmaak gebruiken, of\n"
+"                                  alle velden tonen als VELDENLIJST "
+"ontbreekt\n"
 "  -P, --portability         de POSIX-uitvoeropmaak gebruiken\n"
 "      --sync                een 'sync' doen vóór het ophalen van "
 "gebruiksinfo\n"
@@ -3731,43 +3830,38 @@ msgstr ""
 "  -T, --print-type          van elk bestandssysteem ook het type tonen\n"
 "  -x, --exclude-type=TYPE   bestandssystemen van dit type niet tonen\n"
 "  -v                        (genegeerde optie)\n"
-"\n"
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
+"\n"
+"VELDENLIJST is een kommagescheiden lijst van te tonen kolommen.  Geldige\n"
+"veldnamen zijn: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
+"'size', 'used', 'avail', 'pcent', 'file' en 'target' (zie de Info-pagina).\n"
 
-#: src/df.c:1285
+#: src/df.c:1460
 #, c-format
 msgid "options %s and %s are mutually exclusive"
 msgstr "de opties '%s' en '%s' sluiten elkaar uit"
 
-#: src/df.c:1335
-msgid "warning: "
-msgstr "waarschuwing: "
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr "de lange optie '--megabytes' is verouderd en wordt binnenkort ongeldig"
-
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr "bestandssysteemtype %s is zowel gekozen als uitgesloten"
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr "Waarschuwing: "
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 msgid "cannot read table of mounted file systems"
 msgstr "kan tabel van aangekoppelde bestandssystemen niet lezen"
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr "geen bestandssystemen verwerkt"
@@ -3777,7 +3871,7 @@ msgstr "geen bestandssystemen verwerkt"
 msgid "H. Peter Anvin"
 msgstr "H. Peter Anvin"
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr ""
@@ -3793,12 +3887,11 @@ msgid ""
 "  -c, --csh, --c-shell        output C shell code to set LS_COLORS\n"
 "  -p, --print-database        output defaults\n"
 msgstr ""
-"De commando's voor het instellen van de omgevingsvariabele LS_COLOR tonen.\n"
+"Toont de commando's voor het instellen van de omgevingsvariabele LS_COLOR.\n"
 "\n"
 "  -b, --sh, --bourne-shell    Bourne shell-code tonen\n"
 "  -c, --csh, --c-shell        C shell-code tonen\n"
 "  -p, --print-database        de standaard kleurenlijst tonen\n"
-"\n"
 
 #: src/dircolors.c:108
 msgid ""
@@ -3858,12 +3951,12 @@ msgid ""
 "directory).\n"
 "\n"
 msgstr ""
-"Elke gegeven NAAM tonen zonder het laatste '/...'-element;\n"
-"als NAAM geen '/' bevat, dan '.' tonen (de huidige map).\n"
+"Toont elke gegeven NAAM zonder het laatste '/...'-element;\n"
+"als NAAM geen '/' bevat, dan '.' (de huidige map) tonen.\n"
 "\n"
 
 #: src/dirname.c:59
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
 msgstr ""
 "  -z, --zero     elke regel afsluiten met 0-byte, niet met nieuweregel\n"
 
@@ -3882,7 +3975,7 @@ msgstr ""
 "  %s map1/rks map2/rks  -> \"map1\" gevolgd door \"map2\"\n"
 "  %s stdio.h            -> \".\"\n"
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -3892,15 +3985,14 @@ msgstr ""
 "     of:  %s [OPTIE...] --files0-from=LIJSTBESTAND\n"
 "\n"
 
-#: src/du.c:274
+#: src/du.c:285
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr ""
 "Vat het schijfgebruik samen van elk gegeven BESTAND, recursief voor mappen.\n"
 
-#: src/du.c:280
+#: src/du.c:291
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3908,7 +4000,8 @@ msgid ""
 "                          larger due to holes in ('sparse') files, internal\n"
 "                          fragmentation, indirect blocks, and the like\n"
 msgstr ""
-"  -0, --null              regels afsluiten met 0-byte, niet met nieuweregel\n"
+"  -0, --null              elke regel afsluiten met 0-byte, niet met "
+"nieuweregel\n"
 "  -a, --all               waardes tonen voor alle bestanden, niet alleen "
 "mappen\n"
 "      --apparent-size     werkelijke groottes tonen in plaats van "
@@ -3921,12 +4014,11 @@ msgstr ""
 "interne\n"
 "                          fragmentatie, indirecte blokken en dergelijke\n"
 
-#: src/du.c:289
-#, fuzzy
+#: src/du.c:300
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3946,15 +4038,22 @@ msgstr ""
 "  -c, --total             een eindtotaal tonen\n"
 "  -D, --dereference-args  alleen direct gegeven symbolische koppelingen "
 "volgen\n"
+"  -d, --max-depth=N       het totaal voor een map (of een bestand, met '--"
+"all')\n"
+"                            alleen tonen als deze N of minder niveaus onder "
+"het\n"
+"                            opdrachtregelargument ligt;\n"
+"                            '--max-depth=0' is hetzelfde als '--summarize'\n"
 
-#: src/du.c:302
+#: src/du.c:313
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
 "      --files0-from=LST   het schijfgebruik tonen van de bestanden die "
 "opgesomd\n"
@@ -3965,8 +4064,10 @@ msgstr ""
 "  -H                      hetzelfde als '--dereference-args' (-D)\n"
 "  -h, --human-readable    groottes in leesbare vorm tonen (bijv. 15K, 234M, "
 "2G)\n"
+"      --inodes            informatie over inode-gebruik i.p.v. blokgebruik "
+"tonen\n"
 
-#: src/du.c:310
+#: src/du.c:322
 msgid ""
 "  -k                    like --block-size=1K\n"
 "  -L, --dereference     dereference all symbolic links\n"
@@ -3978,22 +4079,23 @@ msgstr ""
 "  -l, --count-links       de grootte tellen voor elke harde koppeling\n"
 "  -m                      hetzelfde als '--block-size=1M'\n"
 
-#: src/du.c:316
+#: src/du.c:328
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
 "  -P, --no-dereference    symbolische koppelingen niet volgen (standaard)\n"
-"  -S, --separate-dirs     de grootte van submappen niet meetellen\n"
+"  -S, --separate-dirs     bij mappen de grootte van submappen niet "
+"meetellen\n"
 "      --si                als '-h', maar machten van 1000 i.p.v. 1024 "
 "gebruiken\n"
 "  -s, --summarize         voor elk gegeven argument alleen een totaal tonen\n"
 
-#: src/du.c:322
-#, fuzzy
+#: src/du.c:334
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
 "                          or entries greater than SIZE if negative\n"
@@ -4002,10 +4104,13 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
 msgstr ""
+"  -t, --threshold=GROOTTE   items weglaten die kleiner zijn dan GROOTTE "
+"indien\n"
+"                            positief, of groter dan GROOTTE indien negatief\n"
 "      --time              tijden van laatste wijziging tonen\n"
 "      --time=SOORT        te tonen soort tijd in plaats van wijzigingstijd;\n"
 "                          mogelijke waarden zijn 'atime', 'access', 'use',\n"
@@ -4014,74 +4119,80 @@ msgstr ""
 "                          waarden zijn 'iso', 'long-iso', 'full-iso', of\n"
 "                          '+OPMAAK' (zie bij 'date' voor de mogelijkheden)\n"
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
 "  -x, --one-file-system    skip directories on different file systems\n"
 msgstr ""
+"  -X, --exclude-from=BESTAND   bestanden weglaten die overeenkomen met een\n"
+"                               patroon in BESTAND\n"
+"      --exclude=PATROON    bestanden weglaten die overeenkomen met PATROON\n"
+"  -x, --one-file-system    mappen op andere bestandssystemen overslaan\n"
 
-#: src/du.c:386
+#: src/du.c:398
 msgid "Infinity"
 msgstr "oneindig"
 
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr "aankoppelingspunt %s is al doorlopen"
-
-#: src/du.c:624
+#: src/du.c:636
 #, c-format
 msgid "fts_read failed: %s"
 msgstr "fts_read() is mislukt: %s"
 
-#: src/du.c:780
+#: src/du.c:787
 #, c-format
 msgid "invalid maximum depth %s"
 msgstr "ongeldige maximum diepte %s"
 
-#: src/du.c:809
+#: src/du.c:816
 #, c-format
 msgid "invalid --threshold argument '-0'"
 msgstr "ongeldig argument van '--threshold': '-0'"
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr "kan niet zowel alleen totalen tonen als alle items tonen"
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr "opmerking: totalen tonen is hetzelfde als '--max-depth=0'"
 
-#: src/du.c:900
+#: src/du.c:911
 #, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr "fout: totalen tonen gaat niet samen met '--max-depth=%lu'"
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+"waarschuwing: de opties '--apparent-size' en '-b' hebben geen effect samen "
+"met '--inodes'"
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 msgid "file operands cannot be combined with --files0-from"
 msgstr "bestandsargumenten gaan niet samen met de optie '--files0-from'"
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr "%s: fout bij lezen"
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr ""
 "bij het lezen van bestandsnamen van standaardinvoer is bestandsnaam %s niet "
 "toegestaan"
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 msgid "invalid zero-length file name"
 msgstr "ongeldige bestandsnaam (lengte nul)"
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr "totaal"
 
@@ -4110,7 +4221,7 @@ msgid ""
 "\n"
 "  -n             do not output the trailing newline\n"
 msgstr ""
-"De gegeven TEKENREEKS(en) naar standaarduitvoer sturen.\n"
+"Stuurt de gegeven TEKENREEKS(en) naar standaarduitvoer.\n"
 "\n"
 "  -n    geen nieuweregel-teken achtervoegen\n"
 
@@ -4121,7 +4232,6 @@ msgid ""
 msgstr ""
 "  -e    interpretatie van onderstaande codes inschakelen (standaard)\n"
 "  -E    interpretatie van onderstaande codes uitschakelen\n"
-"\n"
 
 #: src/echo.c:54
 msgid ""
@@ -4194,7 +4304,7 @@ msgstr ""
 #: src/env.c:61
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
 "  -i, --ignore-environment   alle ongenoemde omgevingsvariabelen "
@@ -4250,7 +4360,6 @@ msgid ""
 "  -t, --tabs=LIST     use comma separated list of explicit tab positions\n"
 msgstr ""
 "  -t, --tabs=LIJST    kommagescheiden lijst met te gebruiken tab-posities\n"
-"\n"
 
 #: src/expand.c:171 src/unexpand.c:190
 #, c-format
@@ -4278,16 +4387,16 @@ msgid "input line is too long"
 msgstr "invoerregel is te lang"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr "Mike Parker"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr "James Youngman"
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
@@ -4296,7 +4405,7 @@ msgstr ""
 "Gebruik:  %s EXPRESSIE\n"
 "     of:  %s OPTIE\n"
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -4315,7 +4424,7 @@ msgstr ""
 "  ARG1 & ARG2       ARG1 als beide argumenten noch leeg noch 0 zijn, anders "
 "0\n"
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -4333,7 +4442,7 @@ msgstr ""
 "  ARG1 >= ARG2      1 als ARG1 groter of gelijk is aan ARG2, anders 0\n"
 "  ARG1 > ARG2       1 als ARG1 groter is dan ARG2, anders 0\n"
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
@@ -4343,7 +4452,7 @@ msgstr ""
 "  ARG1 + ARG2       rekenkundige som van ARG1 en ARG2\n"
 "  ARG1 - ARG2       rekenkundig verschil van ARG1 en ARG2\n"
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -4356,7 +4465,7 @@ msgstr ""
 "  ARG1 / ARG2       rekenkundig quotient van ARG1 gedeeld door ARG2\n"
 "  ARG1 % ARG2       rekenkundige rest van ARG1 gedeeld door ARG2\n"
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -4378,7 +4487,7 @@ msgstr ""
 "                                    uit TEKENS gevonden is, anders 0\n"
 "  length TEKENREEKS                 de lengte van de TEKENREEKS\n"
 
-#: src/expr.c:251
+#: src/expr.c:250
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
 "                               keyword like 'match' or an operator like '/'\n"
@@ -4391,7 +4500,7 @@ msgstr ""
 "\n"
 "  ( EXPRESSIE )         waarde van EXPRESSIE\n"
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -4410,7 +4519,7 @@ msgstr ""
 "zonder\n"
 "\\( en \\) geven ze het aantal overeenkomende tekens terug, of 0.\n"
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -4423,32 +4532,32 @@ msgstr ""
 "of 0 is, 2 als EXPRESSIE syntactisch ongeldig is, en 3 als er een fout "
 "optrad.\n"
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, c-format
 msgid "syntax error"
 msgstr "syntaxfout"
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, c-format
 msgid "error in regular expression matcher"
 msgstr "fout in zoeken met reguliere expressie"
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, c-format
 msgid "non-integer argument"
 msgstr "argument is geen geheel getal"
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr "deling door nul"
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr "zet LC_ALL='C' om het probleem te omzeilen"
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, c-format
 msgid "the strings compared were %s and %s"
 msgstr "de te vergelijken tekenreeksen waren %s en %s"
@@ -4458,27 +4567,27 @@ msgstr "de te vergelijken tekenreeksen waren %s en %s"
 msgid "Niels Moller"
 msgstr "Niels Moller"
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
 msgstr "De Lucas-priemgetaltest is mislukt.  Dit hoort niet te gebeuren."
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
 msgstr "wachtrij-overloop in SQUFOF"
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, c-format
 msgid "%s is not a valid positive integer"
 msgstr "%s is geen geldig positief geheel getal"
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr "%s is te groot"
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
@@ -4488,13 +4597,13 @@ msgstr ""
 "     of:  %s OPTIE\n"
 "\n"
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
 "are specified on the command line, read them from standard input.\n"
 "\n"
 msgstr ""
-"De priemgetallen tonen waaruit elk gegeven GETAL is opgebouwd.\n"
+"Toont de priemgetallen waaruit elk gegeven GETAL is opgebouwd.\n"
 "Als geen GETAL gegeven is, dan worden getallen gelezen van standaardinvoer.\n"
 "\n"
 
@@ -4597,7 +4706,6 @@ msgstr ""
 "  -b, --bytes         bytes tellen in plaats van tekens\n"
 "  -s, --spaces        bij voorkeur afbreken op spaties\n"
 "  -w, --width=GETAL   te gebruiken afbreekbreedte in plaats van 80\n"
-"\n"
 
 #: src/fold.c:288 src/pr.c:832
 #, c-format
@@ -4605,32 +4713,32 @@ msgid "invalid number of columns: %s"
 msgstr "ongeldige afbreekbreedte: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr "Pádraig Brady"
 
 # Deze commando's kennen alleen de opties --help en --version.
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, c-format
 msgid "Usage: %s\n"
 msgstr "Gebruik:  %s\n"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
 msgstr ""
-"Platformafhankelijke limieten tonen in een opmaak die bruikbaar is in shell-"
+"Toont platformafhankelijke limieten in een opmaak die bruikbaar is in shell-"
 "scripts.\n"
 "\n"
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, c-format
 msgid "failed to get groups for user %s"
 msgstr "kan de groepen van gebruiker %s niet verkrijgen"
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, c-format
 msgid "failed to get groups for the current process"
 msgstr "kan de groepen van het huidige proces niet verkrijgen"
@@ -4654,22 +4762,22 @@ msgstr ""
 "Voor elke GEBRUIKERSNAAM de groepen tonen waar deze lid van is.  Als\n"
 "geen naam gegeven is, dan de groepen van het huidige proces tonen.\n"
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, c-format
 msgid "cannot get real UID"
 msgstr "kan werkelijke UID niet verkrijgen"
 
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, c-format
 msgid "cannot get effective GID"
 msgstr "kan effectieve GID niet verkrijgen"
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, c-format
 msgid "cannot get real GID"
 msgstr "kan werkelijke GID niet verkrijgen"
 
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, c-format
 msgid "%s: no such user"
 msgstr "%s: onbekende gebruiker"
@@ -4708,7 +4816,6 @@ msgid ""
 msgstr ""
 "  -q, --quiet, --silent    geen bestandsnaamkopjes tonen\n"
 "  -v, --verbose            altijd bestandsnaamkopjes tonen\n"
-"\n"
 
 #: src/head.c:131
 msgid ""
@@ -4722,58 +4829,48 @@ msgstr ""
 "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
 "GB 1000*1000*1000, G 1024*1024*1024, en zo verder voor T, P, E, Z en Y.\n"
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr "%s: bestand is te veel geslonken"
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, c-format
 msgid "%s: number of bytes is too large"
 msgstr "%s: aantal bytes is te groot"
 
-#: src/head.c:440
-#, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr "%s: kan niet terugspringen naar de originele positie"
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr "%s: kan niet naar positie %s springen"
 
-#: src/head.c:673
-#, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "%s: resetten van bestandspositieaanduider is mislukt"
-
-#: src/head.c:798
+#: src/head.c:423 src/tail.c:457
 #, c-format
-msgid "cannot reposition file pointer for %s"
-msgstr "kan de bestandspositieaanduider van %s niet verplaatsen"
+msgid "%s: cannot seek to relative offset %s"
+msgstr "%s: kan niet naar relatieve positie %s springen"
 
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr "%s: %s is zo groot dat het niet weergegeven kan worden"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr "aantal regels"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr "aantal bytes"
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr "ongeldig aantal regels"
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr "ongeldig aantal bytes"
 
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, c-format
 msgid "invalid trailing option -- %c"
 msgstr "ongeldige optie aan het eind: %c"
@@ -4787,7 +4884,7 @@ msgid ""
 msgstr ""
 "Gebruik:  %s [OPTIE]\n"
 "\n"
-"De numerieke aanduiding (in hexadecimaal) van de huidige host tonen.\n"
+"Toont de numerieke aanduiding (in hexadecimaal) van de huidige host.\n"
 "\n"
 
 #: src/hostname.c:56
@@ -4801,7 +4898,7 @@ msgstr ""
 "Gebruik:  %s [NAAM]\n"
 "     of:  %s OPTIE\n"
 "\n"
-"De hostnaam van het huidige systeem tonen of instellen.\n"
+"Toont de hostnaam van het huidige systeem of stelt deze in.\n"
 "\n"
 
 #: src/hostname.c:94
@@ -4821,33 +4918,38 @@ msgid "cannot determine hostname"
 msgstr "kan de hostnaam niet achterhalen"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr "Arnold Robbins"
 
-#: src/id.c:81
+#: src/id.c:84
 #, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
-msgstr ""
-"Gebruik:  %s [OPTIE...] [GEBRUIKERSNAAM]\n"
-"\n"
+msgid "Usage: %s [OPTION]... [USER]\n"
+msgstr "Gebruik:  %s [OPTIE...] [GEBRUIKER]\n"
 
-#: src/id.c:82
+# XXX -- Please add an 'is' before 'omitted'.
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
 msgstr ""
-"Gebruikers- en groepsinformatie tonen van GEBRUIKERSNAAM,\n"
-"of (zonder GEBRUIKERSNAAM) die van de huidige gebruiker tonen.\n"
+"Toont gebruikers- en groepsinformatie voor de gegeven GEBRUIKER\n"
+"of (als geen GEBRUIKER gegeven is) voor de huidige gebruiker.\n"
 "\n"
+
+#: src/id.c:90
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
+msgstr ""
 "  -a              (genegeerde optie, voor compatibiliteit met andere "
 "versies)\n"
 "  -g, --group     alleen het groeps-ID tonen\n"
@@ -4856,10 +4958,11 @@ msgstr ""
 "  -r, --real      echte ID in plaats van effectieve ID tonen (bij -g, -G of -"
 "u)\n"
 "  -u, --user      alleen het gebruikers-ID tonen\n"
-"  -Z, --context   alleen de beveiligingscontext van huidige gebruiker tonen\n"
-"\n"
+"  -Z, --context   alleen de beveiligingscontext van het proces tonen\n"
+"  -z, --zero      items scheiden met een 0-byte, niet met witruimte;\n"
+"                    (niet toegestaan in standaardopmaak)\n"
 
-#: src/id.c:96
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
@@ -4867,117 +4970,127 @@ msgstr ""
 "\n"
 "Zonder enige OPTIE wordt een nuttige set identificatie-informatie getoond.\n"
 
-#: src/id.c:140
+#: src/id.c:151
+#, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr "optie '--context' (-Z) werkt alleen in een kernel met SELinux of SMACK"
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr "optie '--context' (-Z) werkt alleen in een kernel met SELinux"
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr "kan beveiligingscontext niet tonen als een gebruikersnaam gegeven is"
 
-#: src/id.c:178
+#: src/id.c:198
 #, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr "kan niet meer dan één ding \"alleen\" tonen"
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr ""
 "kan in standaardinformatie niet alleen namen noch alleen echte ID's tonen"
 
-#: src/id.c:199
+#: src/id.c:209
+#, c-format
+msgid "option --zero not permitted in default format"
+msgstr "optie '--zero' is niet toegestaan bij standaardopmaak"
+
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
 msgstr "kan de context van het proces niet verkrijgen"
 
-#: src/id.c:224
+#: src/id.c:265
 #, c-format
 msgid "cannot get effective UID"
 msgstr "kan effectieve UID niet verkrijgen"
 
-#: src/id.c:311
+#: src/id.c:354
 #, c-format
 msgid "cannot find name for user ID %s"
 msgstr "kan geen naam vinden bij gebruikers-ID %s"
 
-#: src/id.c:329
+#: src/id.c:372
 #, c-format
 msgid "uid=%s"
 msgstr "UID=%s"
 
-#: src/id.c:334
+#: src/id.c:377
 #, c-format
 msgid " gid=%s"
 msgstr " GID=%s"
 
-#: src/id.c:341
+#: src/id.c:384
 #, c-format
 msgid " euid=%s"
 msgstr " EUID=%s"
 
-#: src/id.c:349
+#: src/id.c:392
 #, c-format
 msgid " egid=%s"
 msgstr " EGID=%s"
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr " groepen="
 
-#: src/id.c:393
+#: src/id.c:437
 #, c-format
 msgid " context=%s"
 msgstr " context=%s"
 
-#: src/install.c:373
+#: src/install.c:376
 #, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr "waarschuwing: %s: kan beveiligingscontext niet veranderen naar %s"
 
-#: src/install.c:414
+#: src/install.c:417
 #, c-format
 msgid "creating directory %s"
 msgstr "aanmaken van map %s"
 
-#: src/install.c:482
+#: src/install.c:485
 #, c-format
 msgid "cannot change ownership of %s"
 msgstr "kan de eigenaar van %s niet veranderen"
 
-#: src/install.c:506
+#: src/install.c:509
 #, c-format
 msgid "cannot set time stamps for %s"
 msgstr "kan de tijdsstempels van %s niet instellen"
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, c-format
 msgid "fork system call failed"
 msgstr "kan geen nieuw proces starten"
 
-#: src/install.c:531
+#: src/install.c:535
 #, c-format
 msgid "cannot run %s"
 msgstr "kan %s niet uitvoeren"
 
-#: src/install.c:535
+#: src/install.c:539
 #, c-format
 msgid "waiting for strip"
 msgstr "wachten op 'strip'"
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr "het proces 'strip' is abnormaal afgesloten"
 
-#: src/install.c:558
+#: src/install.c:565
 #, c-format
 msgid "invalid user %s"
 msgstr "ongeldige gebruiker: %s"
 
-#: src/install.c:594
+#: src/install.c:601
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -4989,9 +5102,8 @@ msgstr ""
 "     of:  %s [OPTIE...] BRON... MAP\n"
 "     of:  %s [OPTIE...] -t MAP BRON...\n"
 "     of:  %s [OPTIE...] -d MAP...\n"
-"\n"
 
-#: src/install.c:601
+#: src/install.c:608
 msgid ""
 "\n"
 "This install program copies files (often just compiled) into destination\n"
@@ -5017,7 +5129,7 @@ msgstr ""
 "Bij de vierde vorm worden alle componenten van de gegeven MAP(pen) "
 "aangemaakt.\n"
 
-#: src/install.c:615
+#: src/install.c:622
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
 "  -b                  like --backup but does not accept an argument\n"
@@ -5037,7 +5149,7 @@ msgstr ""
 "  -d, --directory         alle argumenten als mapnamen behandelen;\n"
 "                            van de gegeven mappen alle componenten aanmaken\n"
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -5057,7 +5169,7 @@ msgstr ""
 "  -o, --owner=GEBRUIKER   deze eigenaar instellen (alleen voor "
 "systeembeheerder)\n"
 
-#: src/install.c:631
+#: src/install.c:638
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
 "files\n"
@@ -5081,18 +5193,26 @@ msgstr ""
 "  -T, --no-target-directory   DOEL als een normaal bestand behandelen\n"
 "  -v, --verbose               de naam van elke aangemaakte map tonen\n"
 
-#: src/install.c:641
+#: src/install.c:648
+#, fuzzy
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
 "      --preserve-context  de SELinux-beveiligingscontext behouden\n"
-"  -Z, --context=CONTEXT   beveiligingscontext van bestanden en mappen "
-"instellen\n"
-"\n"
+"  -Z, --context[=CNTXT]   de SELinux-beveiligingscontext van doelbestand op\n"
+"                            standaard instellen (of op CNTXT indien "
+"gegeven)\n"
+
+#: src/install.c:696 src/unlink.c:86
+#, c-format
+msgid "cannot unlink %s"
+msgstr "kan %s niet verwijderen"
 
-#: src/install.c:859
+#: src/install.c:877
 #, c-format
 msgid ""
 "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
@@ -5100,53 +5220,41 @@ msgstr ""
 "Waarschuwing: optie '--preserve-context' wordt genegeerd;\n"
 "deze kernel heeft geen SELinux."
 
-#: src/install.c:869
-#, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
-msgstr ""
-"Waarschuwing: optie '--context' (-Z) wordt genegeerd;\n"
-"deze kernel heeft geen SELinux."
-
-#: src/install.c:886
+#: src/install.c:917
 #, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr ""
 "de strip-optie mag niet gebruikt worden bij het installeren van een map"
 
-#: src/install.c:889
+#: src/install.c:920
 #, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr "een doelmap is niet toegestaan bij het installeren van een map"
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr "kan doelcontext niet zowel behouden als op %s instellen"
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, c-format
 msgid "invalid mode %s"
 msgstr "ongeldige modus %s"
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr ""
 "Waarschuwing: optie '--strip-program' wordt genegeerd\n"
 "want optie '-s' is niet gegeven"
 
-#: src/install.c:959
+#: src/install.c:1001
 #, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr ""
 "de opties '--compare' (-C) en '--preserve-timestamps' sluiten elkaar uit"
 
-#: src/install.c:966
+#: src/install.c:1008
 #, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr "de opties '--compare' (-C) en '--strip' sluiten elkaar uit"
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -5160,7 +5268,7 @@ msgstr ""
 msgid "Mike Haertel"
 msgstr "Mike Haertel"
 
-#: src/join.c:191
+#: src/join.c:195
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
 "standard output.  The default join field is the first, delimited\n"
@@ -5180,7 +5288,7 @@ msgstr ""
 "                       1 of 2 is, overeenkomend met BESTAND1 of BESTAND2\n"
 "  -e TEKST           ontbrekende invoervelden vervangen door \"TEKST\"\n"
 
-#: src/join.c:200
+#: src/join.c:204
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
 "  -j FIELD          equivalent to '-1 FIELD -2 FIELD'\n"
@@ -5193,7 +5301,7 @@ msgstr ""
 "  -t TEKEN           te gebruiken veldscheidingsteken voor invoer en "
 "uitvoer\n"
 
-#: src/join.c:206
+#: src/join.c:210
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
 "  -1 FIELD          join on this FIELD of file 1\n"
@@ -5216,7 +5324,13 @@ msgstr ""
 "behandelen;\n"
 "                       deze samenvoegen zonder proberen ze te paren\n"
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr ""
+"  -z, --zero-terminated      regels afsluiten met 0-byte, niet met "
+"nieuweregel\n"
+
+#: src/join.c:225
 msgid ""
 "\n"
 "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n"
@@ -5261,47 +5375,47 @@ msgstr ""
 "Als de invoer niet gesorteerd is en sommige regels niet samengevoegd kunnen\n"
 "worden, dan wordt er een waarschuwing gegeven.\n"
 
-#: src/join.c:403
+#: src/join.c:410
 #, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
 msgstr "%s:%<PRIuMAX>: is niet gesorteerd: %.*s"
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, c-format
 msgid "invalid field number: %s"
 msgstr "ongeldig veldnummer: %s"
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, c-format
 msgid "invalid field specifier: %s"
 msgstr "ongeldige veldspecificatie: %s"
 
-#: src/join.c:877
+#: src/join.c:884
 #, c-format
 msgid "invalid file number in field spec: %s"
 msgstr "ongeldig bestandsnummer in veldspecificatie: %s"
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr "incompatibele join-velden: %lu, %lu"
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr "conflicterende vervangingstekenreeksen voor lege velden"
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, c-format
 msgid "multi-character tab %s"
 msgstr "meerdere tekens in scheidingsteken %s"
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr "incompatibele scheidingstekens"
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr "niet beide bestanden mogen de standaardinvoer zijn"
@@ -5418,7 +5532,7 @@ msgid ""
 "Call the link function to create a link named FILE2 to an existing FILE1.\n"
 "\n"
 msgstr ""
-"Een harde koppeling maken met de naam BESTAND2 naar bestaand BESTAND1.\n"
+"Maakt een harde koppeling met de naam BESTAND2 naar bestaand BESTAND1.\n"
 "\n"
 
 #: src/link.c:90
@@ -5426,47 +5540,47 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr "kan de koppeling %s naar %s niet aanmaken"
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr "%s: een harde koppeling naar een map is niet toegestaan"
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, c-format
 msgid "%s: cannot overwrite directory"
 msgstr "%s: kan een map niet overschrijven"
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
 msgstr "%s: %s vervangen? "
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, c-format
 msgid "failed to create symbolic link %s"
 msgstr "kan geen symbolische koppeling %s aanmaken"
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr "kan geen symbolische koppeling %s naar %s aanmaken"
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr "kan geen harde koppeling naar %.0s%s aanmaken"
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, c-format
 msgid "failed to create hard link %s"
 msgstr "kan geen harde koppeling %s aanmaken"
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, c-format
 msgid "failed to create hard link %s => %s"
 msgstr "kan geen harde koppeling %s naar %s aanmaken"
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -5480,7 +5594,7 @@ msgstr ""
 "     of:  %s [OPTIE...] -t MAP DOEL...             (4de vorm)\n"
 "\n"
 
-#: src/ln.c:381
+#: src/ln.c:398
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
 "In the 2nd form, create a link to TARGET in the current directory.\n"
@@ -5502,7 +5616,7 @@ msgstr ""
 "wordt een relatieve koppeling geïnterpreteerd in relatie tot haar ouder-"
 "map.\n"
 
-#: src/ln.c:394
+#: src/ln.c:411
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
 "file\n"
@@ -5526,7 +5640,7 @@ msgstr ""
 "systeembeperkingen)\n"
 "  -f, --force                 bestaande bestemmingsbestanden verwijderen\n"
 
-#: src/ln.c:402
+#: src/ln.c:419
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
 "  -L, --logical               dereference TARGETs that are symbolic links\n"
@@ -5552,7 +5666,7 @@ msgstr ""
 "  -s, --symbolic              symbolische in plaats van harde koppelingen "
 "maken\n"
 
-#: src/ln.c:411
+#: src/ln.c:428
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
 "  -t, --target-directory=DIRECTORY  specify the DIRECTORY in which to "
@@ -5570,7 +5684,7 @@ msgstr ""
 "  -v, --verbose               naam en doel van elke gemaakte koppeling "
 "tonen\n"
 
-#: src/ln.c:433
+#: src/ln.c:450
 #, c-format
 msgid ""
 "\n"
@@ -5582,12 +5696,12 @@ msgstr ""
 "het\n"
 "gedrag wanneer de bron een symbolische koppeling is; standaard is dit '%s'.\n"
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr "opties '--target-directory' en '--no-target-directory' gaan niet samen"
 
-#: src/ln.c:588
+#: src/ln.c:605
 #, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr "optie '--relative' kan niet zonder '--symbolic'"
@@ -5610,7 +5724,7 @@ msgid ""
 "Print the name of the current user.\n"
 "\n"
 msgstr ""
-"De naam van de huidige gebruiker tonen.\n"
+"Toont de naam van de huidige gebruiker.\n"
 "\n"
 
 #: src/logname.c:84
@@ -5623,7 +5737,7 @@ msgstr "geen inlognaam"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 msgid "%b %e  %Y"
 msgstr "%e %b  %Y"
 
@@ -5632,94 +5746,94 @@ msgstr "%e %b  %Y"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 msgid "%b %e %H:%M"
 msgstr "%e %b %H:%M"
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr "genegeerd: ongeldige waarde %s van omgevingsvariabele QUOTING_STYLE"
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr "genegeerd: ongeldige breedte %s in omgevingsvariabele COLUMNS"
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr "genegeerd: ongeldige tab-grootte %s in omgevingsvariabele TABSIZE"
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, c-format
 msgid "invalid line width: %s"
 msgstr "ongeldige regelbreedte: %s"
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, c-format
 msgid "invalid tab size: %s"
 msgstr "ongeldige tab-grootte: %s"
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, c-format
 msgid "invalid time style format %s"
 msgstr "ongeldige opmaakstijl %s voor de tijd"
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 msgid "Valid arguments are:\n"
 msgstr "Geldige argumenten zijn:\n"
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr "  - +OPMAAK (bijvoorbeeld: +%H:%M) voor een opmaak zoals met 'date'\n"
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr "fout bij het initialiseren van maand-tekenreeksen"
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, c-format
 msgid "unrecognized prefix: %s"
 msgstr "niet-herkend voorvoegsel: %s"
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr "niet-ontleedbare waarde in omgevingsvariabele LS_COLORS"
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, c-format
 msgid "cannot open directory %s"
 msgstr "kan map %s niet openen"
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, c-format
 msgid "cannot determine device and inode of %s"
 msgstr "kan het apparaat en de inode van %s niet bepalen"
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, c-format
 msgid "%s: not listing already-listed directory"
 msgstr "reeds getoonde map %s wordt niet opnieuw getoond"
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, c-format
 msgid "reading directory %s"
 msgstr "lezen van map %s"
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, c-format
 msgid "closing directory %s"
 msgstr "sluiten van map %s"
 
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, c-format
 msgid "cannot compare file names %s and %s"
 msgstr "kan bestandsnamen %s en %s niet vergelijken"
 
-#: src/ls.c:4721
+#: src/ls.c:4781
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
 "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n"
@@ -5729,7 +5843,7 @@ msgstr ""
 "De items worden alfabetisch gesorteerd als geen van de opties '-cftuvSUX'\n"
 "noch '--sort' gegeven is.\n"
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
 "  -A, --almost-all           do not list implied . and ..\n"
@@ -5739,27 +5853,27 @@ msgid ""
 msgstr ""
 "  -a, --all                  ook de namen tonen die beginnen met een '.'\n"
 "  -A, --almost-all           als '-a', maar de items '.' en '..' weglaten\n"
-"      --author               met '-l': de auteur van elk bestand tonen\n"
+"      --author               (met '-l') de auteur van elk bestand tonen\n"
 "  -b, --escape               niet-grafische tekens tonen als codes in C-"
 "stijl\n"
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
-"      --block-size=GROOTTE  de te tonen groottes schalen naar deze waarde;\n"
-"                              '--block-size=M' bijvoorbeeld toont de "
+"      --block-size=GROOTTE   de te tonen groottes schalen naar deze waarde;\n"
+"                               '--block-size=M' bijvoorbeeld toont de "
 "groottes\n"
-"                              in eenheden van 1.048.576 bytes; zie "
+"                               in eenheden van 1.048.576 bytes; zie "
 "hieronder\n"
 "  -B, --ignore-backups       geen namen tonen die eindigen op '~'\n"
 "  -c                         met '-lt': op 'ctime' sorteren en deze tonen "
@@ -5769,15 +5883,14 @@ msgstr ""
 "                               met '-l': op naam sorteren en 'ctime' tonen;\n"
 "                               anders: op 'ctime' sorteren, recentste eerst\n"
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 "  -C                         de items in kolommen presenteren\n"
@@ -5786,12 +5899,12 @@ msgstr ""
 "'never' (nooit),\n"
 "                               of 'auto' (uitvoerapparaatafhankelijk);\n"
 "                               zie hieronder voor meer informatie\n"
-"  -d, --directory            de mappen zelf tonen in plaats van hun inhoud,\n"
+"  -d, --directory            alleen mapnamen tonen, niet hun inhoud,\n"
 "                               en symbolische koppelingen niet volgen\n"
 "  -D, --dired                uitvoer produceren voor de 'dired'-modus van "
 "Emacs\n"
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
 "  -F, --classify             append indicator (one of */=>@|) to entries\n"
@@ -5812,15 +5925,16 @@ msgstr ""
 "column' (-1)\n"
 "      --full-time            hetzelfde als '-l --time-style=full-iso'\n"
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr "  -g                         als '-l', maar geen eigenaar tonen\n"
 
-#: src/ls.c:4763
+#: src/ls.c:4823
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 "      --group-directories-first\n"
@@ -5828,28 +5942,28 @@ msgstr ""
 "                               worden met een '--sort', maar gebruik van\n"
 "                               '--sort=none' of '-U' deactiveert groepering\n"
 
-#: src/ls.c:4769
+#: src/ls.c:4829
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
 "  -G, --no-group             bij een uitgebreide lijst geen groepsnaam "
 "tonen\n"
-"  -h, --human-readable       groottes in leesbare vorm tonen (bijv. 15K, "
-"234M)\n"
+"  -h, --human-readable       groottes in leesbare vorm tonen (samen met -l/-"
+"s))\n"
 "      --si                   idem, maar machten van 1000 i.p.v. 1024 "
 "gebruiken\n"
 
-#: src/ls.c:4775
+#: src/ls.c:4835
 msgid ""
 "  -H, --dereference-command-line\n"
 "                             follow symbolic links listed on the command "
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
@@ -5864,7 +5978,7 @@ msgstr ""
 "      --hide=PATROON         de namen die voldoen aan PATROON niet tonen\n"
 "                                 (geldt niet samen met '-a' of '-A')\n"
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
 "names:\n"
@@ -5873,19 +5987,19 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 "      --indicator-style=WIJZE  op deze wijze achter elk item het type "
 "aanduiden;\n"
 "                               WIJZE kan zijn: 'none' (standaard), 'slash' (-"
 "p),\n"
 "                               'file-type' (--file-type) of 'classify' (-F)\n"
-"  -i, --inode                met '-l': het indexnummer van elk bestand "
-"tonen\n"
+"  -i, --inode                het indexnummer van elk bestand tonen\n"
 "  -I, --ignore=PATROON       de namen die voldoen aan PATROON niet tonen\n"
-"  -k, --kibibytes            blokken van 1024 bytes gebruiken\n"
+"  -k, --kibibytes            blokken van 1024 bytes gebruiken bij "
+"schijfgebruik\n"
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -5903,7 +6017,7 @@ msgstr ""
 "                               in plaats van over de koppeling zelf\n"
 "  -m                         geen kolommen maar kommagescheiden lijst tonen\n"
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -5921,11 +6035,11 @@ msgstr ""
 "  -p, --indicator-style=slash\n"
 "                             een '/'-indicator achter mapnamen toevoegen\n"
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -5937,13 +6051,13 @@ msgstr ""
 "      --show-control-chars   niet-grafische tekens tonen zoals ze zijn\n"
 "                               (standaard, tenzij uitvoer naar terminal "
 "gaat)\n"
-"  -Q, --quote-name           items omsluiten met aanhalingstekens\n"
+"  -Q, --quote-name           itemnamen omsluiten met aanhalingstekens\n"
 "      --quoting-style=STIJL  te gebruiken aanhalingsstijl voor items;\n"
 "                               STIJL kan zijn: 'literal' (-N), 'locale',\n"
 "                               'shell', 'shell-always', 'c' (-Q), 'escape' (-"
 "b)\n"
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
 "  -R, --recursive            list subdirectories recursively\n"
@@ -5955,37 +6069,42 @@ msgstr ""
 "  -s, --size                 toegewezen aantal blokken tonen voor ieder "
 "bestand\n"
 
-#: src/ls.c:4825
+#: src/ls.c:4886
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 "  -S                         op bestandsgrootte sorteren\n"
-"      --sort=WIJZE           te gebruiken sorteerwijze; WIJZE kan zijn:\n"
-"                               'size' (-S), 'time' (-t), 'none' (-U),\n"
-"                               'version' (-v), 'extension' (-X)\n"
-"      --time=SOORT           met '-l': te tonen soort tijd; SOORT kan zijn:\n"
-"                               'atime' of 'access' of 'use' (-u),\n"
-"                               'ctime' of 'status' (-c)\n"
+"      --sort=WIJZE           te gebruiken sorteerwijze;\n"
+"                               WIJZE kan zijn: 'size' (-S), 'time' (-t),\n"
+"                               'none' (-U), 'version' (-v), 'extension' (-"
+"X)\n"
+"      --time=SOORT           (met '-l') te tonen soort tijd;\n"
+"                               SOORT kan zijn: 'ctime' of 'status' (-c),\n"
+"                               'atime' of 'access' of 'use' (-u)\n"
 
-#: src/ls.c:4835
+#: src/ls.c:4896
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
-msgstr ""
-"      --time-style=STIJL     met '-l': tijden volgens deze stijl tonen;\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
+msgstr ""
+"      --time-style=STIJL     (met '-l') tijden volgens deze stijl tonen;\n"
 "                               STIJL kan zijn: 'iso', 'long-iso', 'full-"
 "iso',\n"
 "                               'locale',  of '+OPMAAK';\n"
@@ -5999,7 +6118,7 @@ msgstr ""
 "dan\n"
 "                               geldt deze alleen buiten de POSIX-taalregio\n"
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 msgid ""
 "  -t                         sort by modification time, newest first\n"
 "  -T, --tabsize=COLS         assume tab stops at each COLS instead of 8\n"
@@ -6007,10 +6126,10 @@ msgstr ""
 "  -t                         op de tijd van laatste wijziging sorteren\n"
 "  -T, --tabsize=AANTAL       te gebruiken tabbreedte in plaats van 8\n"
 
-#: src/ls.c:4848
+#: src/ls.c:4912
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
@@ -6024,24 +6143,22 @@ msgstr ""
 "plaatsingsvolgorde\n"
 "  -v                         logisch sorteren op (versie)nummers in de naam\n"
 
-#: src/ls.c:4855
+#: src/ls.c:4919
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 "  -w, --width=BREEDTE        te gebruiken schermbreedte i.p.v. huidige "
 "waarde\n"
 "  -x                         de items per regel tonen i.p.v. in kolommen\n"
 "  -X                         alfabetisch sorteren op bestandsextensie\n"
-"  -Z, --context              SELinux-beveiligingscontexten tonen\n"
+"  -Z, --context              beveiligingscontext van elk bestand tonen\n"
 "  -1                         één item per regel tonen\n"
-"\n"
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -6056,7 +6173,7 @@ msgstr ""
 "Omgevingsvariabele LS_COLORS kan deze instellingen wijzigen.  Gebruik\n"
 "het commando 'dircolors' om deze variabele in te stellen.\n"
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -6137,30 +6254,27 @@ msgstr "  -t, --text      in tekstmodus lezen (standaard)\n"
 #: src/md5sum.c:195
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
 "\n"
-"De volgende drie opties gelden alleen bij het controleren van "
+"De volgende vier opties gelden alleen bij het controleren van "
 "controlesommen:\n"
 "      --quiet     geen 'goed' tonen voor elk met succes gecontroleerd "
 "bestand\n"
 "      --status    niets naar de uitvoer sturen; de afsluitwaarde toont "
 "succes\n"
-"  -w, --warn      waarschuwen bij verkeerd opgemaakte controlesomregels\n"
+"      --strict    niet-nul afsluiten bij onjuist opgemaakte "
+"controlesomregels\n"
+"  -w, --warn      waarschuwen bij onjuist opgemaakte controlesomregels\n"
 "\n"
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-"      --strict    met '--check': met foutcode afsluiten bij ongeldige "
-"invoer\n"
-
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, c-format
 msgid ""
 "\n"
@@ -6177,42 +6291,42 @@ msgstr ""
 "type\n"
 "aangeeft ('*' voor binair, ' ' voor tekst), en de naam van het bestand.\n"
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, c-format
 msgid "%s: too many checksum lines"
 msgstr "%s: te veel regels met controlesommen"
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr "%s: %<PRIuMAX>: onjuist opgemaakte regel met %s-controlesom"
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr "%s: openen of lezen is MISLUKT\n"
 
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr "VERKEERD"
 
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr "goed"
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr "%s: geen correct opgemaakte regels met %s-controlesommen gevonden"
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
 msgstr[0] "WAARSCHUWING: %<PRIuMAX> regel is onjuist opgemaakt"
 msgstr[1] "WAARSCHUWING: %<PRIuMAX> regels zijn onjuist opgemaakt"
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
@@ -6220,7 +6334,7 @@ msgstr[0] "WAARSCHUWING: %<PRIuMAX> getoond bestand kan niet gelezen worden"
 msgstr[1] ""
 "WAARSCHUWING: %<PRIuMAX> getoonde bestanden kunnen niet gelezen worden"
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
@@ -6228,17 +6342,17 @@ msgstr[0] "WAARSCHUWING: %<PRIuMAX> berekende controlesom komt NIET overeen"
 msgstr[1] ""
 "WAARSCHUWING: %<PRIuMAX> berekende controlesommen komen NIET overeen"
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
 msgstr "optie '--tag' gaat niet samen met '--text'"
 
-#: src/md5sum.c:766
+#: src/md5sum.c:770
 #, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr "de optie '--tag' geldt niet voor het verifiëren van controlesommen"
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
@@ -6246,112 +6360,145 @@ msgstr ""
 "de opties '--binary' en '--text' gelden niet voor het verifiëren van "
 "controlesommen"
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr ""
 "de optie '--status' geldt alleen voor het verifiëren van controlesommen"
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr "de optie '--warn' geldt alleen voor het verifiëren van controlesommen"
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr "de optie '--quiet' geldt alleen voor het verifiëren van controlesommen"
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr ""
 "de optie '--strict' geldt alleen voor het verifiëren van controlesommen"
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr ""
 "Gebruik:  %s [OPTIE...] MAP...\n"
 "\n"
 
-#: src/mkdir.c:57
+#: src/mkdir.c:59
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
 msgstr "Maakt de gegeven MAP(pen) aan (als ze nog niet bestaan).\n"
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 "  -m, --mode=MODUS   in te stellen rechten (zie 'chmod'), i.p.v. 'a=rwx - "
 "umask'\n"
 "  -p, --parents      bovenliggende mappen aanmaken, indien nodig;\n"
 "                       en geen fout melden als een map al bestaat\n"
 "  -v, --verbose      een melding geven voor elke aangemaakte map\n"
-"  -Z, --context=CTX  te gebruiken beveiligingscontext voor elke aangemaakte "
+
+#: src/mkdir.c:70
+#, fuzzy
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+"  -Z, --context[=CNTXT]  de SELinux-beveiligingscontext van elke gemaakte "
 "map\n"
-"\n"
+"                           op standaard instellen (of op CNTXT indien "
+"gegeven)\n"
 
-#: src/mkdir.c:168
+#: src/mkdir.c:127 src/mkdir.c:172
+#, c-format
+msgid "failed to set default creation context for %s"
+msgstr "kan de standaard aanmaakcontext voor %s niet instellen"
+
+#: src/mkdir.c:191
+#, c-format
+msgid "failed to restore context for %s"
+msgstr "kan de context voor %s niet herstellen"
+
+#: src/mkdir.c:231
 #, c-format
 msgid "created directory %s"
 msgstr "map %s is aangemaakt"
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr ""
+"Waarschuwing: optie '--context' (-Z) wordt genegeerd;\n"
+"het vereist een kernel met SELinux of SMACK."
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr ""
 "Gebruik:  %s [OPTIE...] NAAM...\n"
 "\n"
 
-#: src/mkfifo.c:52
+#: src/mkfifo.c:54
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
 msgstr "Maakt voor elke gegeven NAAM een benoemde pijp (FIFO) aan.\n"
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
 msgstr ""
 "  -m, --mode=MODUS   in te stellen rechten (zie 'chmod'), i.p.v. 'a=rw - "
 "umask'\n"
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
+#, fuzzy
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
-"  -Z, --context=CTX  te gebruiken beveiligingscontext voor elke aangemaakte "
-"pijp\n"
+"  -Z, --context[=CNTXT]  de SELinux-beveiligingscontext van elke gemaakte "
+"map\n"
+"                           op standaard instellen (of op CNTXT indien "
+"gegeven)\n"
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, c-format
 msgid "invalid mode"
 msgstr "ongeldige modus"
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr "de modus mag alleen bestandstoegangsrechten bevatten"
 
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
+#, c-format
+msgid "cannot set permissions of %s"
+msgstr "kan de toegangsrechten van %s niet instellen"
+
+#: src/mknod.c:54
 #, c-format
 msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr ""
 "Gebruik:  %s [OPTIE...] NAAM TYPE [HOOFDNUMMER SUBNUMMER]\n"
 "\n"
 
-#: src/mknod.c:54
+#: src/mknod.c:56
 msgid "Create the special file NAME of the given TYPE.\n"
 msgstr "Maakt het speciale bestand NAAM aan van het gegeven TYPE.\n"
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr "  -Z, --context=CTX  te gebruiken beveiligingscontext voor NAAM\n"
-
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -6367,7 +6514,7 @@ msgstr ""
 "0,\n"
 "octaal; anders decimaal.  TYPE mag zijn:\n"
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 msgid ""
 "\n"
 "  b      create a block (buffered) special file\n"
@@ -6379,57 +6526,57 @@ msgstr ""
 "  c, u   een byte-apparaatbestand aanmaken (ongebufferd)\n"
 "  p      een FIFO aanmaken\n"
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 msgid "Special files require major and minor device numbers."
 msgstr "Speciale bestanden vereisen hoofd- en subapparaatnummers."
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 msgid "Fifos do not have major and minor device numbers."
 msgstr "FIFO's hebben geen hoofd- en subapparaatnummers."
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, c-format
 msgid "block special files not supported"
 msgstr "blok-apparaatbestanden worden niet ondersteund"
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, c-format
 msgid "character special files not supported"
 msgstr "byte-apparaatbestanden worden niet ondersteund"
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, c-format
 msgid "invalid major device number %s"
 msgstr "ongeldig hoofdapparaatnummer %s"
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, c-format
 msgid "invalid minor device number %s"
 msgstr "ongeldig subapparaatnummer %s"
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, c-format
 msgid "invalid device %s %s"
 msgstr "ongeldig apparaat %s %s"
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, c-format
 msgid "invalid device type %s"
 msgstr "ongeldig apparaattype %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr "Eric Blake"
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr ""
 "Gebruik:  %s [OPTIE...] [SJABLOON]\n"
 "\n"
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
 "TEMPLATE must contain at least 3 consecutive 'X's in last component.\n"
@@ -6443,14 +6590,14 @@ msgstr ""
 "tmpdir'\n"
 "impliciet.\n"
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
 "Bestanden worden aangemaakt met de toegangsrechten u+rw,\n"
 "en mappen met u+rwx, minus de 'umask'-restricties.\n"
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
@@ -6460,12 +6607,12 @@ msgstr ""
 "  -u, --dry-run       niets aanmaken; enkel een naam tonen (onveilig)\n"
 "  -q, --quiet         foutmeldingen over mislukte aanmakingen onderdrukken\n"
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
 "      --suffix=VGSL   dit achtervoegsel achter SJABLOON plakken; VGSL mag "
 "geen\n"
@@ -6473,15 +6620,16 @@ msgstr ""
 "als\n"
 "                        SJABLOON niet op een X eindigt\n"
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
-"      --tmpdir[=MAP]  SJABLOON relatief ten opzichte van MAP interpreteren;\n"
+"  -p MAP, --tmpdir[=MAP]  SJABLOON relatief ten opzichte van MAP "
+"interpreteren;\n"
 "                        als geen MAP gegeven is, dan $TMPDIR gebruiken "
 "indien\n"
 "                        ingesteld, anders /tmp; met deze optie mag SJABLOON "
@@ -6491,70 +6639,62 @@ msgstr ""
 "                        maar 'mktemp' zal slechts de laatste component "
 "aanmaken\n"
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
 msgstr ""
-"  -p MAP              deze MAP als voorvoegsel gebruiken; impliceert '-t'\n"
-"                        [deze optie is verouderd en wordt ontraden]\n"
 "  -t                  SJABLOON als een enkele bestandsnaamcomponent\n"
 "                        gebruiken, relatief ten opzichte een map: $TMPDIR,\n"
 "                        indien ingesteld; anders de map gegeven via '-p';\n"
 "                        anders /tmp [verouderd]\n"
 
-#: src/mktemp.c:223
-#, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr "kan standaardfoutuitvoer niet omleiden naar /dev/null"
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, c-format
 msgid "too many templates"
 msgstr "te veel sjablonen"
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr "met '--suffix' moet sjabloon %s eindigen op een X"
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr "ongeldig achtervoegsel %s; het bevat een mapscheidingsteken"
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr "te weinig X'en in sjabloon %s"
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr "ongeldig sjabloon %s; het bevat een mapscheidingsteken"
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr "ongeldig sjabloon %s; met '--tmpdir' mag deze niet absoluut zijn"
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, c-format
 msgid "failed to create directory via template %s"
 msgstr "kan geen map aanmaken via sjabloon %s"
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, c-format
 msgid "failed to create file via template %s"
 msgstr "kan geen bestand aanmaken via sjabloon %s"
 
-#: src/mv.c:292
+#: src/mv.c:294
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
 msgstr "Hernoemt BRON naar BESTEMMING, of verplaatst BRON(nen) naar MAP.\n"
 
-#: src/mv.c:298
+#: src/mv.c:300
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
 "file\n"
@@ -6576,7 +6716,7 @@ msgstr ""
 "Als u meer dan één van -i, -f, -n specificeert dan is alleen de laatste "
 "effectief.\n"
 
-#: src/mv.c:307
+#: src/mv.c:309
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
@@ -6588,7 +6728,7 @@ msgstr ""
 "  -S, --suffix=ACHTERVOEGSEL   te gebruiken achtervoegsel voor "
 "reservekopieën\n"
 
-#: src/mv.c:312
+#: src/mv.c:314
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
 "DIRECTORY\n"
@@ -6597,6 +6737,8 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
 "  -t, --target-directory=MAP   alle BRON-argumenten naar deze map "
 "verplaatsen\n"
@@ -6606,7 +6748,9 @@ msgstr ""
 "de\n"
 "                                 bestemming of wanneer deze niet bestaat\n"
 "  -v, --verbose                tonen wat er gedaan wordt\n"
-"\n"
+"  -Z, --context                de SELinux-beveiligingscontext van "
+"doelbestand\n"
+"                                 op standaardtype instellen\n"
 
 #: src/nice.c:72
 #, c-format
@@ -6814,7 +6958,7 @@ msgid ""
 "Run COMMAND, ignoring hangup signals.\n"
 "\n"
 msgstr ""
-"Het gegeven COMMANDO uitvoeren, 'hangup'-signalen negerend.\n"
+"Voert het gegeven COMMANDO uit, 'hangup'-signalen negerend.\n"
 "\n"
 
 #: src/nohup.c:65
@@ -6896,7 +7040,7 @@ msgid ""
 "which may be less than the number of online processors\n"
 "\n"
 msgstr ""
-"Het aantal processoreenheden tonen dat beschikbaar is voor het huidige "
+"Toont het aantal processoreenheden dat beschikbaar is voor het huidige "
 "proces;\n"
 "dit kan minder zijn dan het aantal processoren dat online is.\n"
 "\n"
@@ -6915,119 +7059,131 @@ msgid "%s: invalid number to ignore"
 msgstr "%s: ongeldig aantal om uit te sluiten"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
 msgstr "Assaf Gordon"
 
-#: src/numfmt.c:676
+#: src/numfmt.c:659
 #, c-format
-msgid "value too large to be converted: '%s'"
-msgstr "waarde is te groot om geconverteerd te kunnen worden: '%s'"
+msgid "value too large to be converted: %s"
+msgstr "waarde is te groot om geconverteerd te kunnen worden: %s"
 
-#: src/numfmt.c:680
+#: src/numfmt.c:663
 #, c-format
-msgid "invalid number: '%s'"
-msgstr "ongeldig getal: '%s'"
+msgid "invalid number: %s"
+msgstr "ongeldig getal: %s"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
+msgid "rejecting suffix in input: %s (consider using --from)"
 msgstr ""
+"afgewezen achtervoegsel in invoer: %s (overweeg om '--from' te gebruiken)"
 
-#: src/numfmt.c:688
+#: src/numfmt.c:671
 #, c-format
-msgid "invalid suffix in input: '%s'"
-msgstr "ongeldig achtervoegsel in invoer: '%s'"
+msgid "invalid suffix in input: %s"
+msgstr "ongeldig achtervoegsel in invoer: %s"
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
-msgstr ""
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
+msgstr "ontbrekend achtervoegsel 'i' in invoer: %s (bijvoorbeeld Ki/Mi/Gi)"
 
-#: src/numfmt.c:723
+#: src/numfmt.c:722 src/numfmt.c:768
 #, c-format
 msgid "failed to prepare value '%Lf' for printing"
 msgstr "voorbereiden van waarde '%Lf' voor tonen is mislukt"
 
-#: src/numfmt.c:787
+#: src/numfmt.c:791
 #, c-format
-msgid "invalid unit size: '%s'"
+msgid "invalid unit size: %s"
 msgstr "ongeldige eenheidsgrootte: %s"
 
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
+#: src/numfmt.c:814
 #, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr "onvoldoende geheugen beschikbaar (%zu bytes werden gevraagd)"
-
-#: src/numfmt.c:813
-#, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
-msgstr "Gebruik:  %s [OPTIE...] [GEBRUIKER...]\n"
+msgstr ""
+"Gebruik:  %s [OPTIE...] [GETAL...]\n"
+"\n"
 
-#: src/numfmt.c:816
-#, fuzzy
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
-msgstr "xxx"
+msgstr ""
+"Maakt gegeven GETAL(len) opnieuw op,\n"
+"of de getallen van standaardinvoer als er geen gegeven zijn.\n"
+"\n"
 
-#: src/numfmt.c:820
-#, fuzzy
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
-msgstr ""
-"      --strict    met '--check': met foutcode afsluiten bij ongeldige "
-"invoer\n"
+msgstr "      --debug          waarschuwingen tonen bij ongeldige invoer\n"
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
+"  -d, --delimiter=X    te gebruiken scheidingsteken (in plaats van "
+"witruimte)\n"
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
+"      --field=NUMMER   het getal in veld met dit nummer (standaard 1) "
+"vervangen\n"
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
 msgstr ""
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
 "                         see UNIT below\n"
 msgstr ""
+"      --from=EENHEID   invoergetallen herschalen naar deze EENHEID (zie "
+"onder);\n"
+"                         standaard is 'none'\n"
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr ""
+"      --from-unit=GETAL  de grootte van de invoereenheid (in plaats van 1)\n"
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
 "                         (which means it has no effect in the C/POSIX "
 "locale)\n"
 msgstr ""
+"      --grouping       door de taalregio bepaalde cijfergroepering "
+"gebruiken\n"
+"                         (heeft dus geen effect in C- of POSIX-taalregio)\n"
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
 msgstr ""
+"      --header[=N]     de eerste N kopregels zonder converteren tonen;\n"
+"                         N is 1 wanneer niet opgegeven\n"
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
 msgstr ""
+"      --invalid=MODUS  wat te doen bij ongeldige getallen; MODUS kan zijn:\n"
+"                         'abort' (standaard), 'fail', 'warn', 'ignore'\n"
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -7036,42 +7192,59 @@ msgid ""
 "whitespace\n"
 "                         is found\n"
 msgstr ""
+"      --padding=GETAL  de uitvoer uitvullen tot dit aantal tekens; een "
+"positief\n"
+"                         getal lijnt rechts uit, een negatief getal links;\n"
+"                         uitvulling wordt genegeerd als de uitvoer breder "
+"is;\n"
+"                         standaard wordt uitgevuld als witruimte gevonden "
+"wordt\n"
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
 "nearest\n"
 msgstr ""
+"      --round=METHODE  te gebruiken afrondingsmethode bij herschalen;\n"
+"                         METHODE kan zijn: 'up', 'down',\n"
+"                         'from-zero' (standaard), 'towards-zero', 'nearest'\n"
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
 msgstr ""
+"      --suffix=SUFFIX  dit achtervoegsel toevoegen aan uitvoergetallen,\n"
+"                         en accepteren bij invoergetallen\n"
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
+"      --to=EENHEID     uitvoergetallen herschalen naar deze EENHEID (zie "
+"onder)\n"
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr ""
+"      --to-unit=GETAL  de grootte van de uitvoereenheid (in plaats van 1)\n"
 
-#: src/numfmt.c:877
-#, fuzzy
+#: src/numfmt.c:878
 msgid ""
 "\n"
 "UNIT options:\n"
-msgstr "Andere opties:\n"
+msgstr ""
+"\n"
+"Mogelijkheden voor EENHEID zijn:\n"
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr ""
+"  none       geen automatische herschaling; achtervoegsels geven een fout\n"
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -7079,43 +7252,52 @@ msgid ""
 "               1M = 1000000,\n"
 "               1Mi = 1048576,\n"
 msgstr ""
+"  auto       een optioneel achtervoegsel van één of twee letters "
+"accepteren:\n"
+"               1K = 1000, 1Ki = 1024, 1M = 1000000, 1Mi = 1048576, ...\n"
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
 "               1M = 1000000,\n"
 "               ...\n"
 msgstr ""
+"  si         een optioneel achtervoegsel van één letter accepteren:\n"
+"               1K = 1000, 1M = 1000000, ...\n"
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
 "               1M = 1048576,\n"
 "               ...\n"
 msgstr ""
+"  iec        een optioneel achtervoegsel van één letter accepteren:\n"
+"               1K = 1024, 1M = 1048576, ...\n"
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
 "               1Mi = 1048576,\n"
 "               ...\n"
 msgstr ""
+"  iec-i      een optioneel achtervoegsel van twee letters accepteren:\n"
+"               1Ki = 1024, 1Mi = 1048576, ...\n"
 
-#: src/numfmt.c:905
+#: src/numfmt.c:906
 #, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -7127,7 +7309,7 @@ msgid ""
 "errors are not diagnosed and the exit status is 0.\n"
 msgstr ""
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -7147,114 +7329,135 @@ msgid ""
 "  $ ls -lh | %s --header --field 5 --from=iec --padding=10\n"
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 msgstr ""
+"\n"
+"Voorbeelden:\n"
+"  $ %s --to=si 1000\n"
+"            -> \"1.0K\"\n"
+"  $ %s --to=iec 2048\n"
+"           -> \"2.0K\"\n"
+"  $ %s --to=iec-i 4096\n"
+"           -> \"4.0Ki\"\n"
+"  $ echo 1K | %s --from=si\n"
+"           -> \"1000\"\n"
+"  $ echo 1K | %s --from=iec\n"
+"           -> \"1024\"\n"
+"  $ df | %s --header --field 2 --to=si\n"
+"  $ ls -l | %s --header --field 5 --to=iec\n"
+"  $ ls -lh | %s --header --field 5 --from=iec --padding=10\n"
+"  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, c-format
 msgid "format %s has no %% directive"
 msgstr "opmaakspecificatie %s bevat geen '%%'"
 
-#: src/numfmt.c:990
+#: src/numfmt.c:1003
 #, c-format
 msgid "invalid format %s (width overflow)"
 msgstr "ongeldige opmaak %s (breedte is te groot)"
 
-#: src/numfmt.c:1007 src/seq.c:229
+# FIXME: typo
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr "de opvulling van --format overtroeft --padding"
+
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr "opmaakspecificatie %s eindigt in '%%'"
 
-#: src/numfmt.c:1010
+#: src/numfmt.c:1030
 #, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
-msgstr ""
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
+msgstr "ongeldige opmaak %s; een opmaakspecificatie moet %%[0]['][-][N]f zijn"
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr "opmaakspecificatie %s bevat te veel '%%'"
 
-#: src/numfmt.c:1070
+#: src/numfmt.c:1081
 #, c-format
-msgid "invalid suffix in input '%s': '%s'"
-msgstr "ongeldig achtervoegsel in invoer '%s': '%s'"
+msgid "invalid suffix in input %s: %s"
+msgstr "ongeldig achtervoegsel in invoer %s: %s"
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
 msgstr ""
+"waarde is te groot om weer te kunnen geven: '%Lg' (overweeg om '--to' te "
+"gebruiken)"
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
 msgstr ""
+"waarde is te groot om weer te kunnen geven: '%Lg' (kan geen waardes > 999Y "
+"aan)"
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
-msgstr "groote invoerwaarde '%s': mogelijk verlies van precisie"
+msgid "large input value %s: possible precision loss"
+msgstr "grote invoerwaarde %s: mogelijk verlies van precisie"
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
 "invoerregel is te lang; geen getallen gevonden om te converteren in veld %ld"
 
-#: src/numfmt.c:1388
+#: src/numfmt.c:1403
 #, c-format
-msgid "invalid padding value '%s'"
-msgstr "ongeldige opvulwaarde '%s'"
+msgid "invalid padding value %s"
+msgstr "ongeldige opvulwaarde %s"
 
-#: src/numfmt.c:1401
+#: src/numfmt.c:1417
 #, c-format
-msgid "invalid field value '%s'"
-msgstr "ongeldige veldwaarde '%s'"
+msgid "invalid field value %s"
+msgstr "ongeldige veldwaarde %s"
 
-#: src/numfmt.c:1430
+#: src/numfmt.c:1447
 #, c-format
-msgid "invalid header value '%s'"
-msgstr "ongeldige kopregelwaarde '%s'"
+msgid "invalid header value %s"
+msgstr "ongeldige kopregelwaarde %s"
 
-#: src/numfmt.c:1456
+#: src/numfmt.c:1473
 #, c-format
 msgid "--grouping cannot be combined with --format"
 msgstr "de opties '--grouping' en '--format' gaan niet samen"
 
-#: src/numfmt.c:1458
-#, c-format
-msgid "--padding cannot be combined with --format"
-msgstr "de opties '--padding' en '--format' gaan niet samen"
-
-#: src/numfmt.c:1463
+#: src/numfmt.c:1478
 #, c-format
 msgid "no conversion option specified"
 msgstr "geen conversie-optie gegeven"
 
-#: src/numfmt.c:1471
+#: src/numfmt.c:1486
 #, c-format
 msgid "grouping cannot be combined with --to"
 msgstr "groepering gaat niet samen met optie '--to'"
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
 msgstr "groepering heeft geen effect in deze taalregio"
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
 msgstr "optie '--header' wordt genegeerd met invoer op de opdrachtregel"
 
-#: src/numfmt.c:1511
+#: src/numfmt.c:1526
 #, c-format
 msgid "error reading input"
 msgstr "fout bij lezen van invoer"
 
-#: src/numfmt.c:1520
+#: src/numfmt.c:1535
 #, c-format
 msgid "failed to convert some of the input numbers"
 msgstr "enkele van de invoergetallen zijn niet geconverteerd"
 
-#: src/od.c:294
+#: src/od.c:320
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -7267,7 +7470,7 @@ msgstr ""
 "     of:  %s --traditional [OPTIES] [BSTND] [[+]POSITIE[.][b] [+][LABEL][.]"
 "[b]]\n"
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -7277,14 +7480,14 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Een eenduidige representatie (standaard octale bytes) van het gegeven\n"
-"BESTAND naar standaarduitvoer sturen.  Bij meer dan één BESTAND, deze\n"
-"in de gegeven volgorde achter elkaar plakken om de invoer te vormen.\n"
+"Stuurt een eenduidige representatie (standaard in octale bytes) van het\n"
+"gegeven BESTAND naar standaarduitvoer.  Bij meer dan één BESTAND, plakt\n"
+"het deze in de gegeven volgorde achter elkaar om de invoer te vormen.\n"
 "\n"
 "Zonder BESTAND, of wanneer BESTAND - is, wordt standaardinvoer gelezen.\n"
 "\n"
 
-#: src/od.c:307
+#: src/od.c:333
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
 "if the last operand begins with + or (if there are 2 operands) a digit.\n"
@@ -7304,59 +7507,64 @@ msgstr ""
 "Voor POSITIE en LABEL betekenen een voorgevoegde '0x' of '0X' hexadecimaal;\n"
 "het achtervoegsel '.' betekent octaal en 'b' vermenigvuldiging met 512.\n"
 
-#: src/od.c:318
-#, fuzzy
+#: src/od.c:344
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
-"  -A, --address-radix=GROND  te gebruiken grondtal voor adressen (o, d, x, "
-"n)\n"
-"  -j, --skip-bytes=AANTAL    dit aantal bytes aan begin van invoer "
+"  -A, --address-radix=GROND  te gebruiken grondtal voor adressen; 'x' voor "
+"hex,\n"
+"                               'd' voor decimaal, 'o' voor octaal, 'n' voor "
+"geen\n"
+"      --endian={big|little}  invoerbytes verwisselen volgens aangeven "
+"volgorde\n"
+"  -j, --skip-bytes=BYTES     dit aantal bytes aan begin van invoer "
 "overslaan\n"
 
-#: src/od.c:323
+#: src/od.c:350
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
-"  -N, --read-bytes=AANTAL    uitvoer beperken tot dit aantal bytes van "
+"  -N, --read-bytes=BYTES     de uitvoer beperken tot dit aantal bytes van "
 "invoer\n"
-"  -S, --strings[=AANTAL]     alleen symboolnamen tonen, van minstens deze "
+"  -S, --strings[=LENGTE]     alleen symboolnamen tonen, van minstens deze "
 "lengte\n"
 "  -t, --format=TYPE          te gebruiken type opmaak voor de uitvoer\n"
 "  -v, --output-duplicates    duplicaten tonen, i.p.v. '*' voor "
 "regelweglating\n"
-"  -w, --width[=AANTAL]       aantal te tonen bytes per uitvoerregel\n"
+"  -w, --width[=GETAL]        aantal te tonen bytes per uitvoerregel\n"
 "      --traditional          ook argumenten in traditionele vorm accepteren\n"
 
-#: src/od.c:336
+#: src/od.c:363
 msgid ""
 "\n"
 "\n"
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 "\n"
-"\n"
-"Traditionele opmaakspecificaties mogen ook gebruikt worden; zij tellen op:\n"
+"Traditionele opmaakspecificaties mogen ook gebruikt worden; zij "
+"accumuleren:\n"
 "  -a   als '-t a',  tekennamen tonen, het hoogste bit negerend\n"
 "  -b   als '-t o1', octale getallen van 1 byte tonen\n"
-"  -c   als '-t c',  ASCII-tekens of backslash-codes tonen\n"
+"  -c   als '-t c',  afdrukbare tekens of backslash-codes tonen\n"
 "  -d   als '-t u2', decimale getallen van 2 bytes zonder teken tonen\n"
 
-#: src/od.c:345
+#: src/od.c:372
 msgid ""
 "  -f   same as -t fF, select floats\n"
 "  -i   same as -t dI, select decimal ints\n"
@@ -7372,21 +7580,20 @@ msgstr ""
 "  -s   als '-t d2', decimale getallen van 2 bytes tonen\n"
 "  -x   als '-t x2', hexadecimale getallen van 2 bytes tonen\n"
 
-#: src/od.c:353
+#: src/od.c:380
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 "\n"
-"\n"
 "TYPE bestaat uit één of meer van de volgende aanduidigen:\n"
 "  a          tekennaam, het hoogste bit negerend\n"
 "  c          ASCII-teken of backslash-code\n"
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -7398,10 +7605,10 @@ msgstr ""
 "getal\n"
 "  f[AANTAL]  drijvendekommagetal, met AANTAL bytes per getal\n"
 "  o[AANTAL]  octaal getal, met AANTAL bytes per getal\n"
-"  u[AANTAl]  decimaal getal zonder teken, met AANTAL bytes per getal\n"
+"  u[AANTAL]  decimaal getal zonder teken, met AANTAL bytes per getal\n"
 "  x[AANTAL]  hexadecimaal getal, met AANTAL bytes per getal\n"
 
-#: src/od.c:367
+#: src/od.c:394
 msgid ""
 "\n"
 "SIZE is a number.  For TYPE in [doux], SIZE may also be C for\n"
@@ -7417,15 +7624,17 @@ msgstr ""
 "machineafhankelijke\n"
 "functie sizeof() geeft de lengte in bytes aan van de gegeven eenheid.)\n"
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
 "each output line.\n"
 msgstr ""
+"\n"
+"Met het achtervoegsel 'z' achter een TYPE, worden aan het eind\n"
+"van elke uitvoerregel als extra de afdrukbare tekens getoond.\n"
 
-#: src/od.c:379
-#, fuzzy
+#: src/od.c:406
 msgid ""
 "\n"
 "\n"
@@ -7438,16 +7647,17 @@ msgid ""
 "and so on for G, T, P, E, Z, Y.\n"
 msgstr ""
 "\n"
-"Getal N mag gevolgd worden door een vermenigvuldigingsachtervoegsel:\n"
-"b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
-"GB 1000*1000*1000, G 1024*1024*1024, en zo verder voor T, P, E, Z en Y.\n"
+"Het getal BYTES kan hexadecimaal zijn met met voorvoegsel '0x' of '0X'\n"
+"en mag gevolgd worden door een vermenigvuldigingsachtervoegsel:\n"
+"b = 512, kB = 1000, K = 1024, MB = 1000*1000, M = 1024*1024,\n"
+"GB = 1000*1000*1000, G = 1024*1024*1024, en zo verder voor T, P, E, Z en Y.\n"
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, c-format
 msgid "invalid type string %s"
 msgstr "ongeldig type: %s"
 
-#: src/od.c:649
+#: src/od.c:690
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7456,7 +7666,7 @@ msgstr ""
 "ongeldig type: %s;\n"
 "dit systeem kent geen geheelgetaltype van %lu bytes "
 
-#: src/od.c:770
+#: src/od.c:811
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7465,37 +7675,37 @@ msgstr ""
 "ongeldig type: %s;\n"
 "dit systeem kent geen drijvendekommagetal van %lu bytes "
 
-#: src/od.c:828
+#: src/od.c:869
 #, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr "ongeldig teken '%c' in opmaakreeks %s"
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr "kan niet voorbij het einde van de gecombineerde invoer springen"
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr "ongeldige grondtalcode '%c' voor adressen; kies een teken uit [doxn]"
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr "er mag geen opmaaktype gegeven worden als symboolnamen getoond worden"
 
-#: src/od.c:1810
+#: src/od.c:1863
 msgid "compatibility mode supports at most one file"
 msgstr "compatibiliteitsmodus mag met hooguit één bestand"
 
 # Dit gaat om niet-representeerbaarheid in een beperkt aantal bits.
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr "de som van de argumenten van '-j' en '-N' is te groot"
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr "waarschuwing: ongeldige breedte %lu; zal %d gebruiken"
@@ -7529,7 +7739,6 @@ msgid ""
 msgstr ""
 "  -d, --delimiters=LIJST  te gebruiken scheidingstekens in plaats van tabs\n"
 "  -s, --serial            de bestanden als rijen samenvoegen\n"
-"\n"
 
 #: src/paste.c:508
 #, c-format
@@ -7666,12 +7875,12 @@ msgstr "Ingelogd"
 msgid "Where"
 msgstr "Waar"
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr "Gebruik:  %s [OPTIE...] [GEBRUIKER...]\n"
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -7687,7 +7896,7 @@ msgstr ""
 "  -p    het planbestand weglaten in de lange uitvoer\n"
 "  -s    de korte uitvoer tonen (standaard)\n"
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -7700,9 +7909,8 @@ msgstr ""
 "  -i    de volledige naam en de externe host weglaten in de korte uitvoer\n"
 "  -q    volledige naam, externe host en inactief weglaten in de korte "
 "uitvoer\n"
-"\n"
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, c-format
 msgid ""
 "\n"
@@ -7713,7 +7921,7 @@ msgstr ""
 "Een lichtgewicht 'finger'-programma dat gebruikersinformatie toont.\n"
 "Het geraadpleegde 'utmp'-bestand is %s.\n"
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr ""
@@ -7941,12 +8149,14 @@ msgstr ""
 "                    geen waarschuwing geven als bestand niet geopend kan "
 "worden\n"
 
+# FIXME: use semicolon
 #: src/pr.c:2820
 msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
@@ -7958,7 +8168,7 @@ msgstr ""
 "                    drie kolomopties ('-KOLOMMEN'|'-a -KOLOMMEN'|'-m')\n"
 "                    behalve als ook '-w' gegeven is\n"
 
-#: src/pr.c:2827
+#: src/pr.c:2828
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
 "                    separate columns by STRING,\n"
@@ -7976,7 +8186,7 @@ msgstr ""
 "kolomopties\n"
 "  -t, --omit-header  paginakop- en voetteksten weglaten\n"
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 msgid ""
 "  -T, --omit-pagination\n"
 "                    omit page headers and trailers, eliminate any "
@@ -8000,7 +8210,7 @@ msgstr ""
 "                    tekstkolommen; -s[TEKEN] schakelt de standaardbreedte "
 "uit\n"
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
 "                    set page width to PAGE_WIDTH (72) characters always,\n"
@@ -8013,7 +8223,7 @@ msgstr ""
 "                    lange regels afkappen, tenzij '-J' gegeven is;\n"
 "                    '-S' en '-s' hebben geen invloed\n"
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 msgid ""
 "\n"
 "-t is implied if PAGE_LENGTH <= 10.  With no FILE, or when FILE is -, read\n"
@@ -8033,13 +8243,13 @@ msgid ""
 msgstr ""
 "Gebruik:  %s [OPTIE...] [VARIABELE...]\n"
 "\n"
-"De waarde van de gegeven omgevingsvariabele(n) weergeven.\n"
+"Toont de waarde van de gegeven omgevingsvariabele(n).\n"
 "\n"
-"Zonder VARIABELE, de waarden van alle omgevingsvariabelen tonen.\n"
+"Zonder VARIABELE toont het de waarden van alle omgevingsvariabelen.\n"
 "\n"
 
 #: src/printenv.c:69
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr ""
 "  -0, --null     elke regel afsluiten met 0-byte, niet met nieuweregel\n"
 
@@ -8064,7 +8274,7 @@ msgid ""
 "Print ARGUMENT(s) according to FORMAT, or execute according to OPTION:\n"
 "\n"
 msgstr ""
-"De gegeven OPMAAK gebruiken om eventuele ARGUMENTen weer te geven.\n"
+"Toont de ARGUMENTen volgens de gegeven OPMAAK.\n"
 "\n"
 
 #: src/printf.c:99
@@ -8159,12 +8369,12 @@ msgstr "waarschuwing: overbodige argumenten worden genegeerd, beginnend bij %s"
 msgid "F. Pinard"
 msgstr "François Pinard"
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, c-format
 msgid "%s (for regexp %s)"
 msgstr "%s (voor reguliere expressie %s)"
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
@@ -8174,7 +8384,7 @@ msgstr ""
 "     of:  %s -G [OPTIE...] [INVOER [UITVOER]]\n"
 "\n"
 
-#: src/ptx.c:1821
+#: src/ptx.c:1824
 msgid ""
 "Output a permuted index, including context, of the words in the input "
 "files.\n"
@@ -8182,7 +8392,7 @@ msgstr ""
 "Produceert een gepermuteerde index, inclusief context,\n"
 "van de woorden in de invoerbestanden.\n"
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
 "  -G, --traditional              behave more like System V 'ptx'\n"
@@ -8192,7 +8402,7 @@ msgstr ""
 "  -G, --traditional              meer zoals de oude 'ptx' van System V\n"
 "  -F, --flag-truncation=TEKST    tekenreeks die zinsafbrekingen aangeeft\n"
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
 "  -O, --format=roff              generate output as roff directives\n"
@@ -8207,7 +8417,7 @@ msgstr ""
 "zinnen\n"
 "  -T, --format=tex               als uitvoer 'TeX'-directieven produceren\n"
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -8223,7 +8433,7 @@ msgstr ""
 "  -i, --ignore-file=BESTAND      BESTAND met woorden die niet meedoen\n"
 "  -o, --only-file=BESTAND        BESTAND met woorden die alleen meedoen\n"
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -8235,18 +8445,17 @@ msgstr ""
 "  -t, --typeset-mode             (niet geïmplementeerd)\n"
 "  -w, --width=GETAL              uitvoerbreedte in kolommen, zonder "
 "referentie\n"
-"\n"
 
-#: src/ptx.c:1854
+#: src/ptx.c:1857
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
 "\n"
 "Zonder BESTAND, of wanneer BESTAND - is, wordt standaardinvoer gelezen.\n"
 "Optie '-F /' is standaard.\n"
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, c-format
 msgid "invalid gap width: %s"
 msgstr "ongeldige breedte van tussenruimte: %s"
@@ -8256,7 +8465,7 @@ msgid ""
 "Print the full filename of the current working directory.\n"
 "\n"
 msgstr ""
-"De volledige bestandsnaam van de huidige werkmap tonen.\n"
+"Toont de volledige bestandsnaam van de huidige werkmap.\n"
 "\n"
 
 #: src/pwd.c:61
@@ -8268,22 +8477,30 @@ msgstr ""
 "                    koppelingen bevat\n"
 "  -P, --physical  alle symbolische koppelingen vermijden\n"
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+"\n"
+"Als geen optie gegeven is, dan wordt '-P' aangenomen.\n"
+
+#: src/pwd.c:169
 #, c-format
 msgid "failed to chdir to %s"
 msgstr "kan niet naar map %s gaan"
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, c-format
 msgid "failed to stat %s"
 msgstr "kan status van %s niet opvragen"
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr "kan geen mapitem vinden in %s met een overeenkomende inode"
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, c-format
 msgid "ignoring non-option arguments"
 msgstr "argumenten die geen optie zijn worden genegeerd"
@@ -8293,8 +8510,8 @@ msgstr "argumenten die geen optie zijn worden genegeerd"
 msgid "Dmitry V. Levin"
 msgstr "Dmitry V. Levin"
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr ""
@@ -8306,7 +8523,7 @@ msgid ""
 "Print value of a symbolic link or canonical file name\n"
 "\n"
 msgstr ""
-"De waarde van een symbolische koppeling of echte naam tonen\n"
+"Toont de waarde van een symbolische koppeling of een canonieke naam.\n"
 "\n"
 
 #: src/readlink.c:65
@@ -8329,7 +8546,6 @@ msgstr ""
 "                                alle componenten moeten bestaan\n"
 
 #: src/readlink.c:75
-#, fuzzy
 msgid ""
 "  -m, --canonicalize-missing    canonicalize by following every symlink in\n"
 "                                every component of the given name "
@@ -8340,18 +8556,16 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 "  -m, --canonicalize-missing    canoniek maken door elke koppeling in elke\n"
 "                                component van het pad recursief te volgen;\n"
 "                                geen van de componenten hoeft te bestaan\n"
-"\n"
-"  -n, --no-newline   geen nieuweregel-teken achtervoegen\n"
+"  -n, --no-newline   geen scheidingsteken achtervoegen\n"
 "  -q, --quiet        de meeste foutmeldingen onderdrukken\n"
 "  -s, --silent       de meeste foutmeldingen onderdrukken\n"
 "  -v, --verbose      meer foutmeldingen tonen\n"
-"\n"
+"  -z, --zero         elke regel afsluiten met 0-byte, niet met nieuweregel\n"
 
 #: src/readlink.c:152
 #, c-format
@@ -8364,7 +8578,7 @@ msgid ""
 "all but the last component must exist\n"
 "\n"
 msgstr ""
-"De herleide absolute bestandsnaam tonen;\n"
+"Toont de herleide absolute bestandsnaam;\n"
 "alleen de laatste component hoeft niet te bestaan.\n"
 "\n"
 
@@ -8378,7 +8592,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 "  -e, --canonicalize-existing  alle componenten van het pad moeten bestaan\n"
@@ -8393,8 +8607,8 @@ msgstr ""
 "      --relative-base=MAP      absolute paden tonen behalve wanneer onder "
 "MAP\n"
 "  -s, --strip, --no-symlinks   symbolische koppelingen niet herleiden\n"
-"  -z, --zero                   uitvoer met NUL-tekens scheiden i.p.v. LF-"
-"tekens\n"
+"  -z, --zero                   regels afsluiten met 0-byte, niet met "
+"nieuweregel\n"
 "\n"
 
 #: src/relpath.c:130
@@ -8411,41 +8625,42 @@ msgstr "%s: afdalen in voor schrijven beschermde map %s? "
 msgid "%s: descend into directory %s? "
 msgstr "%s: afdalen in map %s? "
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr "%s: %s %s (schrijfbeveiligd) verwijderen? "
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, c-format
 msgid "%s: remove %s %s? "
 msgstr "%s: %s %s verwijderen? "
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, c-format
 msgid "removed directory: %s\n"
 msgstr "map %s is verwijderd\n"
 
-#: src/remove.c:444
+#: src/remove.c:447
 #, c-format
-msgid "cannot remove directory: %s"
-msgstr "kan map %s niet verwijderen"
+msgid "refusing to remove %s or %s directory: skipping %s"
+msgstr "zal de mappen %s en %s niet verwijderen;  %s wordt overgeslagen"
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr "%s wordt overgeslagen, omdat deze zich op een ander apparaat bevindt"
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, c-format
 msgid "traversal failed: %s"
 msgstr "doorlopen is mislukt: %s"
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -8467,7 +8682,7 @@ msgid ""
 "prompt\n"
 "  -i                    prompt before every removal\n"
 msgstr ""
-"Gegeven BESTAND(en) verwijderen.\n"
+"Verwijdert de gegeven BESTAND(en).\n"
 "\n"
 "  -f, --force             niet-bestaande argumenten negeren, geen vragen "
 "stellen\n"
@@ -8477,12 +8692,12 @@ msgstr ""
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 "  -I                      voor het verwijderen van meer dan drie bestanden, "
 "of\n"
@@ -8563,13 +8778,17 @@ msgstr ""
 
 #: src/rm.c:342
 #, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr "%s: alle argumenten recursief verwijderen? "
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] "%s: %zu argument recursief verwijderen? "
+msgstr[1] "%s: %zu argumenten recursief verwijderen? "
 
-#: src/rm.c:343
+#: src/rm.c:345
 #, c-format
-msgid "%s: remove all arguments? "
-msgstr "%s: alle argumenten verwijderen? "
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] "%s: %zu argument verwijderen? "
+msgstr[1] "%s: %zu argumenten verwijderen? "
 
 #: src/rmdir.c:134 src/rmdir.c:233
 #, c-format
@@ -8589,7 +8808,7 @@ msgid ""
 "                  ignore each failure that is solely because a directory\n"
 "                    is non-empty\n"
 msgstr ""
-"De gegeven MAP(pen) verwijderen, als ze leeg zijn.\n"
+"Verwijdert de gegeven MAP(pen), als ze leeg zijn.\n"
 "\n"
 "      --ignore-fail-on-non-empty\n"
 "                  fouten waarvan enkel een niet-lege map de oorzaak is "
@@ -8625,16 +8844,14 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
-"Voert het gegeven COMMANDO in een andere beveiligingscontext uit.\n"
+"Voert het gegeven COMMANDO in een andere SELinux-beveiligingscontext uit.\n"
 "\n"
 "Zonder CONTEXT of COMMANDO, wordt de huidige beveiligingscontext getoond.\n"
-"CONTEXT is een volledige SELinux-beveiligingscontext.\n"
 
 #: src/runcon.c:94
-#, fuzzy
 msgid ""
 "  CONTEXT            Complete security context\n"
 "  -c, --compute      compute process transition context before modifying\n"
@@ -8644,6 +8861,8 @@ msgid ""
 "  -l, --range=RANGE  levelrange\n"
 "\n"
 msgstr ""
+"CONTEXT is een volledige SELinux-beveiligingscontext.\n"
+"\n"
 "  -c, --compute         procesovergangscontext berekenen vóór het wijzigen\n"
 "  -l, --range=BEREIK    te gebruiken niveaubereik\n"
 "  -r, --role=ROL        te gebruiken rol\n"
@@ -8686,41 +8905,46 @@ msgstr "u moet -c, -l, -r, -t, -u, of een context opgeven"
 msgid "no command specified"
 msgstr "geen commando gegeven"
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr "%s kan alleen worden gebruikt in een SELinux-kernel"
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, c-format
 msgid "failed to compute a new context"
 msgstr "kan geen nieuwe context berekenen"
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, c-format
 msgid "failed to set new user %s"
 msgstr "kan nieuwe gebruiker %s niet instellen"
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, c-format
 msgid "failed to set new type %s"
 msgstr "kan nieuw type %s niet instellen"
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, c-format
 msgid "failed to set new range %s"
 msgstr "kan nieuw bereik %s niet instellen"
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, c-format
 msgid "failed to set new role %s"
 msgstr "kan nieuwe rol %s niet instellen"
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, c-format
 msgid "unable to set security context %s"
 msgstr "kan beveiligingscontext %s niet instellen"
 
+#: src/selinux.c:127 src/selinux.c:300
+#, c-format
+msgid "error canonicalizing %s"
+msgstr "fout bij canoniseren van %s"
+
 #: src/seq.c:68
 #, c-format
 msgid ""
@@ -8754,6 +8978,8 @@ msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
@@ -8761,12 +8987,14 @@ msgstr ""
 "\n"
 "Als EERSTE of STAP weggelaten wordt, dan wordt 1 gebruikt.  Dat betekent\n"
 "dat een weggelaten STAP ook 1 is als LAATSTE kleiner is dan EERSTE.\n"
+"De rij getallen eindigt wanneer de som van het huidige getal plus de STAP\n"
+"groter zou zijn dan LAATSTE.\n"
 "EERSTE, STAP en LAATSTE worden geïnterpreteerd als drijvendekommagetallen.\n"
 "STAP zal gewoonlijk positief zijn als EERSTE kleiner is dan LAATSTE,\n"
 "en negatief als EERSTE kleiner is dan LAATSTE.\n"
 "\n"
 
-#: src/seq.c:94
+#: src/seq.c:96
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
 "it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n"
@@ -8777,93 +9005,27 @@ msgstr ""
 "de standaardopmaak is %.PRECf als EERSTE, STAP en LAATSTE allemaal decimale\n"
 "vastekommagetallen zijn met een maximale precisie PREC, anders %g.\n"
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, c-format
 msgid "invalid floating point argument: %s"
 msgstr "ongeldig drijvendekomma-argument: %s"
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr "opmaakspecificatie %s bevat onbekende '%%%c'"
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr "een opmaak gaat niet samen met uitvoer van gelijke breedte"
 
-#: src/setuidgid.c:49
-#, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-"Gebruik:  %s [KORTE_OPTIE...] GEBRUIKERSNAAM COMMANDO [ARGUMENT...]\n"
-"     of:  %s LANGE_OPTIE\n"
-
-#: src/setuidgid.c:55
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-"Alle aanvullende groepen vergeten, gebruikers-ID en groeps-ID van de "
-"gegeven\n"
-"GEBRUIKERSNAAM (naam of numeriek) aannemen, en het gegeven COMMANDO "
-"uitvoeren\n"
-"met de eventuele ARGUMENTen.\n"
-"De afsluitwaarde is 111 als gevraagde gebruikers-ID en groeps-ID niet "
-"ingesteld\n"
-"konden worden, anders is het de afsluitwaarde van het COMMANDO.\n"
-"Dit programma is alleen nuttig voor root (gebruikers-ID nul).\n"
-"\n"
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-"  -g GID[,GID1...]  primaire groeps-ID instellen op gegeven numeriek GID, "
-"en\n"
-"                      (indien gegeven) aanvullende groeps-ID's op GID1,...\n"
-"\n"
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr "onbekend gebruikers-ID: %s"
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr "om gebruikers-ID %s te kunnen gebruiken moet u ook '-g' gebruiken"
-
-#: src/setuidgid.c:190
-#, c-format
-msgid "failed to set supplemental group(s)"
-msgstr "kan geen aanvullende groep(en) instellen"
-
-#: src/setuidgid.c:200
-#, c-format
-msgid "cannot set group-ID to %lu"
-msgstr "kan groeps-ID niet op %lu instellen"
-
-#: src/setuidgid.c:204
-#, c-format
-msgid "cannot set user-ID to %lu"
-msgstr "kan gebruikers-ID niet op %lu instellen"
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr "Colin Plumb"
 
-#: src/shred.c:148
+#: src/shred.c:170
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
 "for even very expensive hardware probing to recover the data.\n"
@@ -8871,7 +9033,7 @@ msgstr ""
 "Overschrijft gegeven BESTAND(en) meerdere malen, om het zelfs voor heel\n"
 "dure apparatuur moeilijk te maken de inhoud ervan te herstellen.\n"
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -8887,35 +9049,40 @@ msgstr ""
 "  -s, --size=N   dit aantal bytes vernietigen (achtervoegsels als K, M, G "
 "mogen)\n"
 
-#: src/shred.c:161
+#: src/shred.c:183
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
 "  -z, --zero     add a final overwrite with zeros to hide shredding\n"
 msgstr ""
-"  -u, --remove   het bestand na het overschrijven afkappen en verwijderen\n"
+"  -u, --remove[=HOE]  na het overschrijven het bestand afkappen en "
+"verwijderen;\n"
+"                        zie hieronder voor een uitleg van de optionele HOE\n"
 "  -v, --verbose  tonen wat er gedaan wordt\n"
 "  -x, --exact    bestandslengtes niet naar boven op een vol blok afronden;\n"
 "                   dit is standaard voor niet-reguliere bestanden\n"
 "  -z, --zero     tot slot met nullen overschrijven om vernietiging te "
 "verhullen\n"
-"\n"
 
-#: src/shred.c:170
+#: src/shred.c:192
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 "\n"
-"Als BESTAND - is, dan standaarduitvoer shredden.\n"
+"Als BESTAND - is, dan wordt standaarduitvoer ge-shred.\n"
 "\n"
 "Als '--remove' (-u) gegeven is, worden de gegeven BESTANDen verwijderd.\n"
 "Standaard worden bestanden niet verwijderd omdat 'shred' vaak toegepast "
@@ -8924,8 +9091,14 @@ msgstr ""
 "worden.  Wanneer 'shred' toegepast wordt op gewone bestanden, gebruiken de\n"
 "meeste mensen de optie '--remove'.\n"
 "\n"
+"De parameter HOE geeft aan hoe een item uit een map verwijderd moet worden:\n"
+"  'unlink' => een standaard unlink()-aanroep gebruiken;.\n"
+"  'wipe' => ook eerst de bytes van de naam verdoezelen;\n"
+"  'wipesync' => ook elke verdoezelde byte naar schijf schrijven.\n"
+"De standaardmodus is 'wipesync', maar merk op dat dit \"duur\" kan zijn.\n"
+"\n"
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -8942,7 +9115,7 @@ msgstr ""
 "niet gegarandeerd dat het werkt in elke modus van het bestandssysteem:\n"
 "\n"
 
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -8964,7 +9137,7 @@ msgstr ""
 "Appliance\n"
 "\n"
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -8978,7 +9151,7 @@ msgstr ""
 "* gecomprimeerde bestandssystemen\n"
 "\n"
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -9003,7 +9176,7 @@ msgstr ""
 "zoals gedocumenteerd in de man-pagina van mount ('man mount').\n"
 "\n"
 
-#: src/shred.c:215
+#: src/shred.c:241
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
 "of the file that cannot be removed, and that will allow a shredded file\n"
@@ -9013,129 +9186,129 @@ msgstr ""
 "vernietigde bestanden bevatten die door 'shred' niet gezien worden, zodat\n"
 "het dus mogelijk is dat de bestanden later toch hersteld worden.\n"
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, c-format
 msgid "%s: fdatasync failed"
 msgstr ""
 "%s: synchronisatie van data in geheugen en op schijf (fdatasync) is mislukt"
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr ""
 "%s: synchronisatie van data in geheugen en op schijf (fsync) is mislukt"
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr "%s: kan niet terugspoelen"
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr "%s: doorloop %lu/%lu (%s)..."
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, c-format
 msgid "%s: error writing at offset %s"
 msgstr "%s: fout tijdens schrijven op positie %s"
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s: 'lseek' is mislukt"
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, c-format
 msgid "%s: file too large"
 msgstr "%s: bestand is te groot"
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr "%s: doorloop %lu/%lu (%s)...%s"
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr "%s: doorloop %lu/%lu (%s)...%s/%s %d%%"
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, c-format
 msgid "%s: fstat failed"
 msgstr "%s: opvragen van bestandsstatus is mislukt"
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, c-format
 msgid "%s: invalid file type"
 msgstr "%s: ongeldig bestandstype"
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr "%s: bestand heeft een negatieve grootte"
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, c-format
 msgid "%s: error truncating"
 msgstr "%s: fout bij inkorten"
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, c-format
 msgid "%s: fcntl failed"
 msgstr "%s: manipuleren van bestandsdescriptor is mislukt"
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr "%s: kan een alleen-toevoegen-bestand niet vernietigen"
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr "verwijderen van %s"
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, c-format
 msgid "%s: renamed to %s"
 msgstr "%s is hernoemd tot %s"
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, c-format
 msgid "%s: failed to remove"
 msgstr "verwijderen van %s is mislukt"
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr "%s is verwijderd"
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, c-format
 msgid "%s: failed to close"
 msgstr "sluiten van %s is mislukt"
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, c-format
 msgid "%s: failed to open for writing"
 msgstr "openen voor schrijven van %s is mislukt"
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, c-format
 msgid "%s: invalid number of passes"
 msgstr "ongeldig aantal doorlopen: %s"
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, c-format
 msgid "multiple random sources specified"
 msgstr "meer dan één bron van willekeurige bytes gegeven"
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, c-format
 msgid "%s: invalid file size"
 msgstr "ongeldige bestandsgrootte: %s"
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -9147,13 +9320,13 @@ msgstr ""
 "     of:  %s -i LAAG-HOOG [OPTIE...]\n"
 "\n"
 
-#: src/shuf.c:54
+#: src/shuf.c:67
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr ""
 "Stuurt een willekeurige husseling van de invoerregels naar "
 "standaarduitvoer.\n"
 
-#: src/shuf.c:60
+#: src/shuf.c:73
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
 "  -i, --input-range=LO-HI   treat each number LO through HI as an input "
@@ -9161,7 +9334,7 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
 msgstr ""
 "  -e, --echo                 gegeven ARGUMENTen als invoerregels gebruiken\n"
 "  -i, --input-range=LG-HG    getallenreeks van LG tot HG als invoerregels "
@@ -9170,34 +9343,43 @@ msgstr ""
 "  -o, --output=BESTAND       uitvoer naar BESTAND i.p.v. naar "
 "standaarduitvoer\n"
 "      --random-source=BSTND  bestand BSTND is bron van willekeurige bytes\n"
-"  -z, --zero-terminated      regels afsluiten met 0-byte, niet met "
-"nieuweregel\n"
+"  -r, --repeat               uitvoerregels mogen herhaald worden\n"
 
-#: src/shuf.c:244
+#: src/shuf.c:228
+#, c-format
+msgid "too many input lines"
+msgstr "te veel invoerregels"
+
+#: src/shuf.c:431
 #, c-format
 msgid "multiple -i options specified"
 msgstr "meer dan één optie '-i' gegeven"
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, c-format
 msgid "invalid input range %s"
 msgstr "ongeldig invoerbereik: %s"
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, c-format
 msgid "invalid line count %s"
 msgstr "ongeldig aantal regels: %s"
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, c-format
 msgid "multiple output files specified"
 msgstr "meer dan één uitvoerbestand gegeven"
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, c-format
 msgid "cannot combine -e and -i options"
 msgstr "opties '-e' en '-i' gaan niet samen"
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr "geen regels om te herhalen"
+
 #: src/sleep.c:44
 #, c-format
 msgid ""
@@ -9214,7 +9396,7 @@ msgstr ""
 "Gebruik:  %s AANTAL[ACHTERVOEGSEL]...\n"
 "     of:  %s OPTIE\n"
 "\n"
-"Gedurende het gegeven AANTAL seconden pauzeren.\n"
+"Pauzeert gedurende het gegeven AANTAL seconden.\n"
 "\n"
 "Het ACHTERVOEGSEL mag respectievelijk 's' zijn voor seconden (standaard),\n"
 "'m' voor minuten, 'h' voor uren, of 'd' voor dagen.  Het AANTAL mag een\n"
@@ -9222,29 +9404,29 @@ msgstr ""
 "er gepauzeerd gedurende een tijd die de som is van de waarden.\n"
 "\n"
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, c-format
 msgid "invalid time interval %s"
 msgstr "ongeldig tijdsinterval: %s"
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr "kan de realtime-klok niet lezen"
 
-#: src/sort.c:399
+#: src/sort.c:427
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr ""
 "Stuurt gegeven BESTAND(en samengevoegd en) gesorteerd naar "
 "standaarduitvoer.\n"
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
 msgstr "Sorteeropties:\n"
 
-#: src/sort.c:409
+#: src/sort.c:437
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
 "  -d, --dictionary-order      consider only blanks and alphanumeric "
@@ -9256,7 +9438,7 @@ msgstr ""
 "beschouwen\n"
 "  -f, --ignore-case           kleine letters als hoofdletters beschouwen\n"
 
-#: src/sort.c:415
+#: src/sort.c:443
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
 "  -i, --ignore-nonprinting    consider only printable characters\n"
@@ -9267,13 +9449,13 @@ msgstr ""
 "  -i, --ignore-nonprinting    alleen afdrukbare tekens beschouwen\n"
 "  -M, --month-sort            ordenen: (onbekend) < 'JAN' < ... < 'DEC'\n"
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 "  -h, --human-numeric-sort    leesbare getallen vergelijken (bijv.: 2K 1G)\n"
 
-#: src/sort.c:423
+#: src/sort.c:451
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
 "  -R, --random-sort           sort by random hash of keys\n"
@@ -9285,7 +9467,7 @@ msgstr ""
 "      --random-source=BSTND   willekeurige bytes uit dit bestand halen\n"
 "  -r, --reverse               het resultaat van de vergelijking omkeren\n"
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -9304,13 +9486,13 @@ msgstr ""
 "sorteren\n"
 "\n"
 
-#: src/sort.c:437
+#: src/sort.c:465
 msgid ""
 "Other options:\n"
 "\n"
 msgstr "Andere opties:\n"
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
@@ -9319,7 +9501,7 @@ msgstr ""
 "samenvoegen;\n"
 "                               bij meer, tijdelijke bestanden gebruiken\n"
 
-#: src/sort.c:445
+#: src/sort.c:473
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
 "  -C, --check=quiet, --check=silent  like -c, but do not report first bad "
@@ -9334,7 +9516,7 @@ msgstr ""
 "      --compress-program=PROG  tijdelijke bestanden met PROG comprimeren;\n"
 "                                 decomprimeren met 'PROG -d'\n"
 
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -9352,7 +9534,7 @@ msgstr ""
 "                               '-' is, dan de namen van standaardinvoer "
 "lezen\n"
 
-#: src/sort.c:459
+#: src/sort.c:487
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
 "  -m, --merge               merge already sorted files; do not sort\n"
@@ -9363,7 +9545,7 @@ msgstr ""
 "  -m, --merge                gesorteerde bestanden samenvoegen; niet "
 "sorteren\n"
 
-#: src/sort.c:463
+#: src/sort.c:491
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "  -s, --stable              stabilize sort by disabling last-resort "
@@ -9377,7 +9559,7 @@ msgstr ""
 "                               noodvergelijking als niets werkt\n"
 "  -S, --buffer-size=GROOTTE  te gebruiken grootte voor hoofdgeheugenbuffer\n"
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -9403,14 +9585,7 @@ msgstr ""
 "tonen;\n"
 "                               met '-c': op strikte ordening controleren\n"
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr ""
-"  -z, --zero-terminated      regels afsluiten met 0-byte, niet met "
-"nieuweregel\n"
-"\n"
-
-#: src/sort.c:483
+#: src/sort.c:511
 msgid ""
 "\n"
 "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is "
@@ -9447,7 +9622,7 @@ msgstr ""
 "\n"
 "GROOTTE mag gevolgd worden door een vermenigvuldigingsachtervoegsel:\n"
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -9466,255 +9641,240 @@ msgstr ""
 "sorteervolgorde.  Stel 'LC_ALL=C' in voor de traditionele sorteervolgorde\n"
 "die de gewone bytewaarde gebruikt.\n"
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, c-format
 msgid "waiting for %s [-d]"
 msgstr "wachten op %s [-d]"
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr "%s [-d] is niet normaal geëindigd"
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, c-format
 msgid "cannot create temporary file in %s"
 msgstr "kan tijdelijk bestand %s niet aanmaken"
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr "openen is mislukt"
 
-#: src/sort.c:970
+#: src/sort.c:998
 msgid "fflush failed"
 msgstr "alles naar schijf wegschrijven (fflush) is mislukt"
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr "sluiten is mislukt"
 
-#: src/sort.c:986
-#, c-format
-msgid "dup2 failed"
-msgstr "dup2() is mislukt"
-
-#: src/sort.c:1103
-#, c-format
-msgid "couldn't execute %s"
-msgstr "kan %s niet uitvoeren"
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 msgid "couldn't create temporary file"
 msgstr "kan geen tijdelijk bestand aanmaken"
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, c-format
 msgid "couldn't create process for %s -d"
 msgstr "kan geen proces voor '%s -d' aanmaken"
 
-#: src/sort.c:1161
-#, c-format
-msgid "couldn't execute %s -d"
-msgstr "kan '%s -d' niet uitvoeren"
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, c-format
 msgid "warning: cannot remove: %s"
 msgstr "waarschuwing: kan %s niet verwijderen"
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, c-format
 msgid "invalid --%s argument %s"
 msgstr "ongeldig argument van '--%s': %s"
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, c-format
 msgid "minimum --%s argument is %s"
 msgstr "minimum argument van '--%s' is %s"
 
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, c-format
 msgid "--%s argument %s too large"
 msgstr "argument %2$s van '--%1$s' is te groot"
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr "met huidige 'rlimit' is maximum argument van '--%s': %s"
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr "maximaal aantal parallelle processen mag niet nul zijn"
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr "opvragen van bestandsstatus is mislukt"
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr "lezen is mislukt"
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, c-format
 msgid "string transformation failed"
 msgstr "transformatie van tekenreeks is mislukt"
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, c-format
 msgid "the untransformed string was %s"
 msgstr "de niet-getransformeerde tekenreeks was %s"
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr "^ geen overeenkomst voor sleutel\n"
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr "verouderde sleutel %s is gebruikt; gebruik liever %s"
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr "sleutel %lu heeft breedte nul en wordt genegeerd"
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr ""
 "leidende witruimte is significant in sleutel %lu; misschien ook '-b' opgeven?"
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr "sleutel %lu is numeriek en beslaat meerdere velden"
 
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
 msgstr[0] "optie '-%s' wordt genegeerd"
 msgstr[1] "opties '-%s' worden genegeerd"
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr "optie '-r' betreft alleen de noodvergelijking"
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr "schrijven is mislukt"
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr "%s: %s:%s: wanorde: "
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr "standaardfoutuitvoer"
 
-#: src/sort.c:3698
+#: src/sort.c:3738
 msgid "cannot read"
 msgstr "kan niet lezen"
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, c-format
 msgid "%s: invalid field specification %s"
 msgstr "%s: ongeldige veldspecificatie %s"
 
-#: src/sort.c:3987
+#: src/sort.c:4028
 #, c-format
 msgid "options '-%s' are incompatible"
 msgstr "opties '-%s' gaan niet samen"
 
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, c-format
 msgid "%s: invalid count at start of %s"
 msgstr "%s: ongeldig aantal bij het begin van %s"
 
-#: src/sort.c:4295
+#: src/sort.c:4336
 msgid "invalid number after '-'"
 msgstr "ongeldig getal na '-'"
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 msgid "invalid number after '.'"
 msgstr "ongeldig getal na '.'"
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr "verdwaald teken in veldspecificatie"
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, c-format
 msgid "multiple compress programs specified"
 msgstr "meer dan één compressieprogramma opgegeven"
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
 msgstr "ongeldig getal aan het begin van een veld"
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
 msgstr "veldnummer is nul"
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr "tekenpositie is nul"
 
-#: src/sort.c:4407
+#: src/sort.c:4448
 msgid "invalid number after ','"
 msgstr "ongeldig getal na ','"
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr "lege tab"
 
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, c-format
 msgid "cannot read file names from %s"
 msgstr "kan geen bestandsnamen uit %s lezen"
 
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr "%s:%lu: ongeldige bestandsnaam (lengte nul)"
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, c-format
 msgid "no input from %s"
 msgstr "geen invoer van %s"
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr "sorteerregels van %s worden gebruikt"
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr "eenvoudige byte-vergelijking wordt gebruikt"
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr "extra argument %s is niet toegestaan bij optie '-%c'"
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr "de lengte van het achtervoegsel moet minstens %zu zijn"
 
-#: src/split.c:204
+#: src/split.c:203
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr "Gebruik:  %s [OPTIE...] [INVOER [VOORVOEGSEL]]\n"
 
-#: src/split.c:208
+#: src/split.c:207
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
 "size is 1000 lines, and default PREFIX is 'x'.  With no INPUT, or when "
@@ -9727,22 +9887,21 @@ msgstr ""
 "\n"
 "Zonder INVOER, of wanneer INVOER - is, wordt standaardinvoer gelezen.\n"
 
-#: src/split.c:216
+#: src/split.c:215
 #, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
 "  -a, --suffix-length=L   achtervoegsels gebruiken met deze lengte "
@@ -9765,16 +9924,15 @@ msgstr ""
 "  -u, --unbuffered        invoer direct naar uitvoer kopiëren met '-n "
 "r/...'\n"
 
-#: src/split.c:229
+#: src/split.c:228
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
 "                            output file is opened\n"
 msgstr ""
 "      --verbose           een melding tonen vóór openen van elk "
 "uitvoerbestand\n"
-"\n"
 
-#: src/split.c:236
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -9795,192 +9953,192 @@ msgstr ""
 "r/N     als 'l/N' maar roundrobin-verdeling gebruiken\n"
 "r/K/N   als 'r/N' maar alleen de K-de uit N naar standaarduitvoer sturen\n"
 
-#: src/split.c:354
+#: src/split.c:353
 #, c-format
 msgid "output file suffixes exhausted"
 msgstr "achtervoegsels voor uitvoerbestanden zijn verbruikt"
 
-#: src/split.c:366
+#: src/split.c:365
 #, c-format
 msgid "creating file %s\n"
 msgstr "aanmaken van bestand %s\n"
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr "%s zou invoer overschrijven -- gestopt"
 
-#: src/split.c:391
+#: src/split.c:390
 #, c-format
 msgid "failed to set FILE environment variable"
 msgstr "instellen van omgevingsvariabele FILE is mislukt"
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr "wordt uitgevoerd met FILE=%s\n"
 
-#: src/split.c:395
+#: src/split.c:394
 #, c-format
 msgid "failed to create pipe"
 msgstr "aanmaken van pijp is mislukt"
 
-#: src/split.c:409
+#: src/split.c:408
 #, c-format
 msgid "closing prior pipe"
 msgstr "sluiten van eerdere pijp"
 
-#: src/split.c:411
+#: src/split.c:410
 #, c-format
 msgid "closing output pipe"
 msgstr "sluiten van uitvoerpijp"
 
-#: src/split.c:415
+#: src/split.c:414
 #, c-format
 msgid "moving input pipe"
 msgstr "verplaatsen van invoerpijp"
 
-#: src/split.c:417
+#: src/split.c:416
 #, c-format
 msgid "closing input pipe"
 msgstr "sluiten van invoerpijp"
 
-#: src/split.c:422
+#: src/split.c:421
 #, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr "kan commando \"%s -c %s\" niet uitvoeren"
 
-#: src/split.c:428
+#: src/split.c:427
 #, c-format
 msgid "failed to close input pipe"
 msgstr "kan invoerpijp niet sluiten"
 
-#: src/split.c:464
+#: src/split.c:463
 #, c-format
 msgid "waiting for child process"
 msgstr "wachten op dochterproces"
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr "met FILE=%s, signaal %s van commando: %s"
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr "met FILE=%s, afsluitwaarde %d van commando: %s"
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr "onbekende afsluitwaarde (0x%X) van commando"
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr "kan niet op meerdere manieren splitsen"
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, c-format
 msgid "%s: invalid number of chunks"
 msgstr "ongeldig aantal brokken: %s"
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, c-format
 msgid "%s: invalid chunk number"
 msgstr "ongeldig broknummer: %s"
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr "ongeldige lengte voor achtervoegsel: %s"
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr "ongeldig aantal bytes: %s"
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr "ongeldig aantal regels: %s"
 
 # Engelse foutmelding is onduidelijk.
-#: src/split.c:1236
+#: src/split.c:1286
 #, c-format
 msgid "line count option -%s%c... is too large"
 msgstr "regelaantal '-%s%c...' is te groot"
 
-#: src/split.c:1248
+#: src/split.c:1298
 #, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr "%s: ongeldige startwaarde voor numeriek achtervoegsel"
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, c-format
 msgid "%s: invalid IO block size"
 msgstr "ongeldige IO-blokgrootte: %s"
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr "optie '--filter' bewerkt geen brokken die naar standaarduitvoer gaan"
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr "numerieke startwaarde is te groot voor lengte van achtervoegsel"
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, c-format
 msgid "%s: cannot determine file size"
 msgstr "%s: kan de bestandsgrootte niet achterhalen"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr "Michael Meskes"
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, c-format
 msgid "failed to canonicalize %s"
 msgstr "canoniseren van %s is mislukt"
 
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr "waarschuwing: onbekende stuurcode '\\%c'"
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, c-format
 msgid "%s: invalid directive"
 msgstr "%s: ongeldige directief"
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, c-format
 msgid "warning: backslash at end of format"
 msgstr "waarschuwing: backslash aan eind van opmaakaanduiding"
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr ""
 "gebruik van %s om standaardinvoer aan te duiden werkt niet in "
 "bestandssysteem-modus"
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, c-format
 msgid "cannot read file system information for %s"
 msgstr "kan informatie in bestandssysteem niet lezen voor %s"
 
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, c-format
 msgid "cannot stat standard input"
 msgstr "kan 'stat' niet toepassen op standaardinvoer"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -9996,7 +10154,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -10006,31 +10164,31 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr ""
 "Apparaat: %Dh/%dd   Inode: %-10i   Koppelingen: %-5h   Apparaattype: %t,%T\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr "Apparaat: %Dh/%dd   Inode: %-10i   Koppelingen: %h\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr "Toegang: (%04a/%10.10A)   UID: (%5u/%8U)   GID: (%5g/%8G)\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, c-format
 msgid "Context: %C\n"
 msgstr "Context:   %C\n"
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -10042,11 +10200,11 @@ msgstr ""
 "Veranderd: %z\n"
 "Ontstaan:  %w\n"
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
 msgstr "Toont de status van een bestand (of van een bestandssysteem).\n"
 
-#: src/stat.c:1356
+#: src/stat.c:1418
 msgid ""
 "  -L, --dereference     follow links\n"
 "  -f, --file-system     display file system status instead of file status\n"
@@ -10054,13 +10212,13 @@ msgstr ""
 "  -L, --dereference     symbolische koppelingen volgen\n"
 "  -f, --file-system     status tonen van bestandssysteem i.p.v. van bestand\n"
 
-#: src/stat.c:1360
+#: src/stat.c:1422
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 "  -c  --format=OPMAAK   te gebruiken opmaak in plaats van de "
@@ -10070,9 +10228,8 @@ msgstr ""
 "                          en geen automatische nieuweregel toevoegen; als u\n"
 "                          een nieuweregel wilt, voeg dan \\n toe in OPMAAK\n"
 "  -t, --terse           de informatie in beknopte vorm tonen\n"
-"\n"
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 msgid ""
 "\n"
 "The valid format sequences for files (without --file-system):\n"
@@ -10092,7 +10249,7 @@ msgstr ""
 "  %B   de grootte in bytes van elk blok gerapporteerd door %b\n"
 "  %C   SELinux-beveiligingscontext-tekenreeks\n"
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 msgid ""
 "  %d   device number in decimal\n"
 "  %D   device number in hex\n"
@@ -10108,7 +10265,7 @@ msgstr ""
 "  %g   groeps-ID van eigenaar\n"
 "  %G   groepsnaam van eigenaar\n"
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 msgid ""
 "  %h   number of hard links\n"
 "  %i   inode number\n"
@@ -10117,8 +10274,8 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 "  %h   aantal harde koppelingen\n"
 "  %i   inode-nummer\n"
@@ -10127,10 +10284,10 @@ msgstr ""
 "  %N   aangehaalde bestandsnaam (plus doel bij een symbolische koppeling)\n"
 "  %o   hint voor optimale blokgrootte voor invoer/uitvoer\n"
 "  %s   totale grootte, in bytes\n"
-"  %t   hoofdapparaattype in hex\n"
-"  %T   subapparaattype in hex\n"
+"  %t   hoofdapparaattype in hex (voor apparaatbestanden)\n"
+"  %T   subapparaattype in hex (voor apparaatbestanden)\n"
 
-#: src/stat.c:1399
+#: src/stat.c:1461
 msgid ""
 "  %u   user ID of owner\n"
 "  %U   user name of owner\n"
@@ -10138,10 +10295,10 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 "  %u   gebruikers-ID van eigenaar\n"
@@ -10150,13 +10307,13 @@ msgstr ""
 "  %W   tijdstip van ontstaan, in seconden sinds Epoch, of 0 als onbekend\n"
 "  %x   tijdstip van laatste toegang\n"
 "  %X   tijdstip van laatste toegang, in seconden sinds Epoch\n"
-"  %y   tijdstip van laatste wijziging\n"
-"  %Y   tijdstip van laatste wijziging, in seconden sinds Epoch\n"
-"  %z   tijdstip van laatste verandering\n"
-"  %Z   tijdstip van laatste verandering, in seconden sinds Epoch\n"
+"  %y   tijdstip van laatste gegevenswijziging\n"
+"  %Y   tijdstip van laatste gegevenswijziging, in seconden sinds Epoch\n"
+"  %z   tijdstip van laatste statusverandering\n"
+"  %Z   tijdstip van laatste statusverandering, in seconden sinds Epoch\n"
 "\n"
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 msgid ""
 "Valid format sequences for file systems:\n"
 "\n"
@@ -10174,7 +10331,7 @@ msgstr ""
 "  %d   aantal vrije inodes in bestandssysteem\n"
 "  %f   aantal vrije blokken in bestandssysteem\n"
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 msgid ""
 "  %i   file system ID in hex\n"
 "  %l   maximum length of filenames\n"
@@ -10265,22 +10422,27 @@ msgstr ""
 "enzovoort) gebruiken geen streams voor invoer/uitvoer, en worden dus niet\n"
 "beïnvloed door instellingen van 'stdbuf'.\n"
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, c-format
 msgid "failed to find %s"
 msgstr "kan %s niet vinden"
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, c-format
 msgid "failed to update the environment with %s"
 msgstr "het bijwerken van de omgeving met %s is mislukt"
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr "regelbuffering van standaardinvoer is zinloos"
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, c-format
+msgid "you must specify a buffering mode option"
+msgstr "u moet een bufferingsmodusoptie opgeven "
+
+#: src/stty.c:516
 #, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -10291,11 +10453,11 @@ msgstr ""
 "     of:  %s [-F APPARAAT | --file=APPARAAT] [-a|--all]\n"
 "     of:  %s [-F APPARAAT | --file=APPARAAT] [-g|--save]\n"
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
 msgstr "Toont terminalkarakteristieken of stelt ze in.\n"
 
-#: src/stty.c:525
+#: src/stty.c:528
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
 "  -g, --save         print all current settings in a stty-readable form\n"
@@ -10305,7 +10467,7 @@ msgstr ""
 "  -g, --save           alle huidige instellingen in herbruikbare vorm tonen\n"
 "  -F, --file=APPARAAT  te gebruiken apparaat in plaats van standaardinvoer\n"
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
@@ -10316,7 +10478,7 @@ msgstr ""
 "Niet-POSIX-instellingen zijn met een '*' gemarkeerd.  Het hangt van het\n"
 "onderliggende systeem af welke instellingen beschikbaar zijn.\n"
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -10331,7 +10493,7 @@ msgstr ""
 "   eof TEKEN     TEKEN zendt een einde van bestand (beëindigt de invoer)\n"
 "   eol TEKEN     TEKEN beëindigt de regel\n"
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -10343,7 +10505,7 @@ msgstr ""
 "   intr TEKEN    TEKEN zendt een interruptsignaal\n"
 "   kill TEKEN    TEKEN verwijdert de huidige regel\n"
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -10355,7 +10517,7 @@ msgstr ""
 " * rprnt TEKEN   TEKEN herschrijft de huidige regel\n"
 "   start TEKEN   TEKEN herstart de uitvoer nadat deze is gestopt\n"
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -10367,7 +10529,7 @@ msgstr ""
 " * swtch TEKEN   TEKEN schakelt naar een andere shell-laag\n"
 " * werase TEKE   TEKEN verwijdert het laatst getypte woord\n"
 
-#: src/stty.c:562
+#: src/stty.c:565
 msgid ""
 "\n"
 "Special settings:\n"
@@ -10381,7 +10543,7 @@ msgstr ""
 " * cols N        de kernel laten weten dat de terminal N kolommen heeft\n"
 " * columns N     hetzelfde als 'cols N'\n"
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -10395,7 +10557,7 @@ msgstr ""
 "tekens\n"
 "   ospeed N      de uitvoersnelheid op N zetten\n"
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -10409,7 +10571,7 @@ msgstr ""
 "   time N        met '-icanon': leestijdslimiet op N tiende seconde "
 "instellen\n"
 
-#: src/stty.c:581
+#: src/stty.c:584
 msgid ""
 "\n"
 "Control settings:\n"
@@ -10427,7 +10589,7 @@ msgstr ""
 " * [-]cdtrdsr    DTR/DSR-handshake inschakelen\n"
 "   csN           tekengrootte op N bits instellen; N in [5..8]\n"
 
-#: src/stty.c:590
+#: src/stty.c:593
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
 "   [-]hup        send a hangup signal when the last process closes the tty\n"
@@ -10435,6 +10597,7 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 "   [-]cstopb     twee stopbits per teken gebruiken (één met '-')\n"
 "   [-]hup        'opgehangen'-signaal sturen wanneer laatste proces de TTY "
@@ -10442,8 +10605,9 @@ msgstr ""
 "   [-]hupcl      hetzelfde als '[-]hup'\n"
 "   [-]parenb     pariteitsbit in uitvoer genereren en in invoer verwachten\n"
 "   [-]parodd     oneven pariteit instellen (of even pariteit met '-')\n"
+" * [-]cmspar     \"stick\"-pariteit (altijd aan of uit) gebruiken\n"
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -10460,7 +10624,7 @@ msgstr ""
 "   [-]ignbrk     break-tekens negeren\n"
 "   [-]igncr      CR-tekens negeren\n"
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -10476,11 +10640,11 @@ msgstr ""
 "   [-]inpck      controle op invoerpariteit inschakelen\n"
 "   [-]istrip     hoogste bit (het achtste) van invoertekens nul maken\n"
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr " * [-]iutf8      aannemen dat invoertekens in UTF-8 gecodeerd zijn\n"
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -10497,7 +10661,7 @@ msgstr ""
 "   [-]parmrk     pariteitsfouten markeren (met een 255-0-tekencombinatie)\n"
 "   [-]tandem     hetzelfde als '[-]ixoff'\n"
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -10513,10 +10677,10 @@ msgstr ""
 " * ffN           'form feed'-vertragingsstijl; N in [0..1]\n"
 " * nlN           nieuweregel-vertragingsstijl; N in [0..1]\n"
 
-#: src/stty.c:631
+#: src/stty.c:635
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
@@ -10533,7 +10697,7 @@ msgstr ""
 "regelbegin)\n"
 " * [-]onlret     'nieuweregel' voert ook een 'naar regelbegin' uit\n"
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -10550,7 +10714,7 @@ msgstr ""
 " * -tabs         hetzelfde als 'tab3'\n"
 " * vtN           vertragingsstijl voor verticale tab; N in [0..1]\n"
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -10564,7 +10728,7 @@ msgstr ""
 " * crtkill       gehele regel verwijderen via 'echoprt' en 'echoe'\n"
 " * -crtkill      gehele regel verwijderen via 'echoctl' en 'echok'\n"
 
-#: src/stty.c:654
+#: src/stty.c:658
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
 "   [-]echo       echo input characters\n"
@@ -10578,7 +10742,7 @@ msgstr ""
 "   [-]echoe      hetzelfde als '[-]crterase'\n"
 "   [-]echok      een nieuweregel-teken echoën na een kill-teken\n"
 
-#: src/stty.c:661
+#: src/stty.c:665
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
 "   [-]echonl     echo newline even if not echoing other characters\n"
@@ -10594,7 +10758,7 @@ msgstr ""
 "inschakelen\n"
 "   [-]iexten     niet-POSIX speciale tekens inschakelen\n"
 
-#: src/stty.c:668
+#: src/stty.c:672
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
 "   [-]noflsh     disable flushing after interrupt and quit special "
@@ -10611,7 +10775,7 @@ msgstr ""
 "schrijven\n"
 " * [-]xcase      met 'icanon': '\\' voor kleine letter maakt hoofdletter\n"
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -10625,7 +10789,7 @@ msgstr ""
 "   cbreak        hetzelfde als '-icanon'\n"
 "   -cbreak       hetzelfde als 'icanon'\n"
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -10637,7 +10801,7 @@ msgstr ""
 "   -cooked       hetzelfde als 'raw'\n"
 "   crt           hetzelfde als 'echoe echoctl echoke'\n"
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -10651,7 +10815,7 @@ msgstr ""
 "   ek            de erase- en kill-tekens op hun standaardwaarden zetten\n"
 "   evenp         hetzelfde als 'parenb -parodd cs7'\n"
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -10667,7 +10831,7 @@ msgstr ""
 "   nl            hetzelfde als '-icrnl -onlcr\n"
 "   -nl           hetzelfde als 'icrnl -inlcr -igncr onlcr -ocrnl -onlret'\n"
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -10681,7 +10845,7 @@ msgstr ""
 "   pass8         hetzelfde als '-parenb -istrip cs8'\n"
 "   -pass8        hetzelfde als 'parenb istrip cs7'\n"
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -10693,7 +10857,7 @@ msgstr ""
 "                   -imaxbel -opost -isig -icanon -xcase min 1 time 0'\n"
 "   -raw          hetzelfde als 'cooked'\n"
 
-#: src/stty.c:716
+#: src/stty.c:720
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
 "                 -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n"
@@ -10710,7 +10874,7 @@ msgstr ""
 "                   -xcase -tostop -echoprt echoctl echoke', met\n"
 "                   alle speciale tekens op hun standaardwaarden\n"
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -10727,12 +10891,12 @@ msgstr ""
 "0177 of 127; de speciale waarden '^-' of 'undef' kunnen gebruikt worden om\n"
 "speciale tekens inactief te maken.\n"
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, c-format
 msgid "only one device may be specified"
 msgstr "er mag slechts één apparaat gegeven worden"
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
@@ -10740,43 +10904,43 @@ msgid ""
 msgstr ""
 "de opties voor duidelijke en voor 'stty'-leesbare uitvoer gaan niet samen"
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr "als een uitvoerstijl gegeven is mogen geen modussen ingesteld worden"
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr "%s: kan niet-blokkerende modus niet herstellen"
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, c-format
 msgid "invalid argument %s"
 msgstr "ongeldig argument: %s"
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, c-format
 msgid "missing argument to %s"
 msgstr "ontbrekend argument bij %s"
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, c-format
 msgid "invalid line discipline %s"
 msgstr "ongeldig lijnprotocol: %s"
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr "%s: kan niet alle gevraagde acties uitvoeren"
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr "%s: er is geen grootte-informatie voor dit apparaat"
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, c-format
 msgid "invalid integer argument %s"
 msgstr "ongeldig geheelgetal-argument: %s"
@@ -10804,7 +10968,7 @@ msgid ""
 "Force changed blocks to disk, update the super block.\n"
 "\n"
 msgstr ""
-"Veranderde blokken naar schijf schrijven, het superblok bijwerken.\n"
+"Schrijft veranderde blokken naar schijf, en werkt het superblok bij.\n"
 "\n"
 
 #: src/sync.c:69
@@ -10833,7 +10997,7 @@ msgstr "      --help      deze hulptekst tonen en stoppen\n"
 msgid "      --version  output version information and exit\n"
 msgstr "      --version   programmaversie tonen en stoppen\n"
 
-#: src/system.h:544
+#: src/system.h:543
 msgid ""
 "\n"
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -10841,21 +11005,20 @@ msgstr ""
 "\n"
 "(Een verplicht argument bij een lange optie geldt ook voor de korte vorm.)\n"
 
-#: src/system.h:552
+#: src/system.h:551
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 "\n"
-"GROOTTE is een geheel getal met een optionele eenheid.  Mogelijke eenheden "
-"zijn:\n"
-"K, M, G, T, P, E, Z, Y (machten van 1024) of KB, MB, ... (machten van "
-"1000).\n"
-"Bijvoorbeeld: 10M is 10*1024*1024.\n"
+"GROOTTE is een geheel getal met een optionele eenheid (bijv. 10K is "
+"10*1024).\n"
+"Mogelijke eenheden zijn: K, M, G, T, P, E, Z, Y (machten van 1024)\n"
+"of KB, MB, ... (machten van 1000).  Bijvoorbeeld: 10MB is 10*1000*1000.\n"
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -10869,36 +11032,36 @@ msgstr ""
 "BLOCKSIZE.  Anders is de eenheid standaard 1024 bytes (of 512 als\n"
 "POSIXLY_CORRECT gezet is).\n"
 
-#: src/system.h:571
+#: src/system.h:570
 #, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
+"%s online help: <%s>\n"
 msgstr ""
 "\n"
-"Rapporteer gebreken in '%s' aan <%s>.\n"
+"Online hulp bij %s: <%s>\n"
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr "Meld vertalingsfouten in '%s' aan <vertaling@vrijschrift.org>.\n"
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr ""
 "Voor volledige documentatie, gebruik:  info coreutils '%s invocation'\n"
 
-#: src/system.h:596
+#: src/system.h:591
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Typ '%s --help' voor meer informatie.\n"
 
-#: src/system.h:628
+#: src/system.h:633
 #, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -10936,7 +11099,6 @@ msgstr ""
 "  -b, --before            scheider vóór i.p.v. achter de regel plaatsen\n"
 "  -r, --regex             scheider als reguliere expressie interpreteren\n"
 "  -s, --separator=TEKST   deze scheider gebruiken in plaats van nieuweregel\n"
-"\n"
 
 #: src/tac.c:234 src/tac.c:335
 #, c-format
@@ -10999,10 +11161,8 @@ msgstr ""
 
 #: src/tail.c:270
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
 "  -c, --bytes=K            de laatste K bytes uitvoeren; bij '-c +K' worden "
 "de\n"
@@ -11013,29 +11173,27 @@ msgstr ""
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           toegevoegde gegevens tonen terwijl bestand "
 "groeit;\n"
-"                             '-f', '--follow' en '--follow=descriptor' zijn\n"
-"                             equivalent\n"
+"                             '--follow' is hetzelfde als '--"
+"follow=descriptor'\n"
 "  -F                       hetzelfde als '--follow=name --retry'\n"
 
-#: src/tail.c:281
+#: src/tail.c:280
 #, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
 "  -n, --lines=K            de laatste K regels tonen i.p.v. de laatste %d;\n"
 "                             '-n +K' toont de regels vanaf de Kde\n"
@@ -11049,13 +11207,11 @@ msgstr ""
 "                             (gebruikelijk bij roterende logbestanden);\n"
 "                             met 'inotify' is deze optie zelden nuttig\n"
 
-#: src/tail.c:294
+#: src/tail.c:293
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 "      --pid=PID            met '-f': afsluiten wanneer proces PID eindigt\n"
 "  -q, --quiet, --silent    geen bestandsnaamkopjes tonen\n"
@@ -11065,12 +11221,12 @@ msgstr ""
 "op\n"
 "                             naam gevolgd wordt (bij '--follow=name' dus)\n"
 
-#: src/tail.c:301
+#: src/tail.c:298
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 "  -s, --sleep-interval=N   met '-f': tussen twee iteraties ongeveer\n"
@@ -11079,7 +11235,7 @@ msgstr ""
 "                             minstens eens per N seconden controleren\n"
 "  -v, --verbose            altijd bestandsnaamkopjes tonen\n"
 
-#: src/tail.c:310
+#: src/tail.c:307
 msgid ""
 "\n"
 "If the first character of K (the number of bytes or lines) is a '+',\n"
@@ -11098,7 +11254,7 @@ msgstr ""
 "GB 1000*1000*1000, G 1024*1024*1024, en zo verder voor T, P, E, Z, Y.\n"
 "\n"
 
-#: src/tail.c:319
+#: src/tail.c:316
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
 "means that even if a tail'ed file is renamed, tail will continue to track\n"
@@ -11118,27 +11274,22 @@ msgstr ""
 "houdt\n"
 "met hernoemen, verwijderen en opnieuw aanmaken.\n"
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr "sluiten van %s (bestandsdescriptor=%d)"
 
-#: src/tail.c:453
-#, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr "%s: kan niet naar relatieve positie %s springen"
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr "%s: kan niet naar eind-relatieve positie %s springen"
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr "kan de locatie van '%s' niet bepalen; teruggevallen op polsen"
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
@@ -11148,140 +11299,154 @@ msgstr ""
 "rapporteer dit a.u.b. aan %s;\n"
 "teruggevallen op polsen"
 
-#: src/tail.c:963
+#: src/tail.c:965
+#, c-format
+msgid "%s has been replaced with a symbolic link. giving up on this name"
+msgstr ""
+"%s is vervangen door een symbolische koppeling;\n"
+"gestopt met volgen van deze naam"
+
+#: src/tail.c:980
 #, c-format
 msgid "%s has become inaccessible"
 msgstr "%s is ontoegankelijk geworden"
 
-#: src/tail.c:980
+#: src/tail.c:997
 #, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr ""
 "%s is vervangen door een bestand dat niet gevolgd kan worden;\n"
 "gestopt met volgen van deze naam"
 
-#: src/tail.c:989
+#: src/tail.c:1006
 #, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr ""
 "%s is vervangen door een bestand op afstand;\n"
 "gestopt met volgen van deze naam"
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, c-format
 msgid "%s has become accessible"
 msgstr "%s is toegankelijk geworden"
 
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr "%s is verschenen;  het einde van het nieuwe bestand wordt gevolgd"
 
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr "%s is vervangen;  het einde van het nieuwe bestand wordt gevolgd"
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr "%s: kan niet-blokkerende modus niet wijzigen"
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr "%s: bestand is ingekort"
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr "geen bestanden meer over"
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, c-format
 msgid "cannot watch parent directory of %s"
 msgstr "kan de bovenliggende map van %s niet monitoren"
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, c-format
 msgid "inotify resources exhausted"
 msgstr "onvoldoende hulpbronnen beschikbaar voor 'inotify'"
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, c-format
 msgid "cannot watch %s"
 msgstr "kan %s niet monitoren"
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr "fout bij monitoren van 'inotify'-gebeurtenis"
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, c-format
 msgid "error reading inotify event"
 msgstr "fout bij lezen van 'inotify'-gebeurtenis"
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr ""
 "%s: kan het einde van dit type bestand niet volgen;\n"
 "gestopt met volgen van deze naam"
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, c-format
 msgid "number in %s is too large"
 msgstr "getal in %s is te groot"
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr "ongeldig maximum aantal onveranderde statusopvragingen: %s"
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr "ongeldig procesnummer: %s"
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr "ongeldig aantal seconden: %s"
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr "optie is gebruikt in een ongeldige context -- %c"
 
-#: src/tail.c:2034
+#: src/tail.c:2096
 #, c-format
-msgid "warning: --retry is useful mainly when following by name"
-msgstr "waarschuwing: '--retry' is gewoonlijk alleen nuttig bij volgen op naam"
+msgid "warning: --retry ignored; --retry is useful only when following"
+msgstr ""
+"waarschuwing: '--retry' wordt genegeerd;\n"
+"optie '--retry' is alleen zinvol bij volgen"
+
+#: src/tail.c:2100
+#, c-format
+msgid "warning: --retry only effective for the initial open"
+msgstr "waarschuwing: '--retry' is alleen effectief bij de initiële opening"
 
-#: src/tail.c:2038
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
 msgstr ""
 "waarschuwing: procesnummer is genegeerd;\n"
 "'--pid=PID' is alleen zinvol bij volgen"
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr "waarschuwing: '--pid=PID' wordt niet ondersteund op dit systeem"
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, c-format
 msgid "cannot follow %s by name"
 msgstr "kan %s niet op naam volgen"
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr "waarschuwing: het onbeperkt volgen van standaardinvoer is ineffectief"
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr "'inotify' kan niet worden gebruikt; teruggevallen op polsen"
@@ -11293,12 +11458,11 @@ msgid ""
 "  -a, --append              append to the given FILEs, do not overwrite\n"
 "  -i, --ignore-interrupts   ignore interrupt signals\n"
 msgstr ""
-"Standaardinvoer naar elk gegeven BESTAND kopiëren, én naar "
+"Kopieert standaardinvoer naar elk gegeven BESTAND, én naar "
 "standaarduitvoer.\n"
 "\n"
 "  -a, --append              aan BESTAND(en) toevoegen, niet overschrijven\n"
 "  -i, --ignore-interrupts   interruptsignalen negeren\n"
-"\n"
 
 #: src/tee.c:71
 msgid ""
@@ -11373,7 +11537,7 @@ msgid ""
 "Exit with the status determined by EXPRESSION.\n"
 "\n"
 msgstr ""
-"Eindigen met de afsluitwaarde die bepaald wordt door de gegeven EXPRESSIE.\n"
+"Eindigt met de afsluitwaarde die bepaald wordt door de gegeven EXPRESSIE.\n"
 "\n"
 
 #: src/test.c:717
@@ -11552,21 +11716,21 @@ msgid "extra argument %s"
 msgstr "overtollig argument: %s"
 
 #: src/timeout.c:112
-#, fuzzy, c-format
+#, c-format
 msgid "warning: sigprocmask"
-msgstr "Waarschuwing: kan timer niet aanmaken"
+msgstr "waarschuwing: kan signaal niet deblokkeren"
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr "Waarschuwing: kan timertijd niet instellen"
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr "Waarschuwing: kan timer niet aanmaken"
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
@@ -11575,30 +11739,32 @@ msgstr ""
 "Gebruik:  %s [OPTIE] DUUR COMMANDO [ARGUMENT...]\n"
 "     of:  %s [OPTIE]\n"
 
-#: src/timeout.c:229
+#: src/timeout.c:232
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
 msgstr ""
 "Start het gegeven COMMANDO, en beëindigt het als het na DUUR nog actief is.\n"
 
-#: src/timeout.c:235
-#, fuzzy
+#: src/timeout.c:238
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
+"      --preserve-status\n"
+"                   altijd eindigen met de afsluitwaarde van COMMANDO, ook "
+"als\n"
+"                   het commando de tijdsduur overschrijdt\n"
 "      --foreground\n"
 "                   wanneer niet direct vanaf een shell-prompt aangeroepen, "
 "het\n"
@@ -11616,7 +11782,7 @@ msgstr ""
 "                   SIGNAAL kan een naam zijn als 'HUP' of een nummer;\n"
 "                   zie 'kill -l` voor een lijst van mogelijke signalen\n"
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 msgid ""
 "\n"
 "DURATION is a floating point number with an optional suffix:\n"
@@ -11627,7 +11793,7 @@ msgstr ""
 "DUUR is een drijvendekommagetal met een optioneel achtervoegsel: 's' voor\n"
 "seconden (standaard), 'm' voor minuten, 'h' voor uren, 'd' voor dagen.\n"
 
-#: src/timeout.c:259
+#: src/timeout.c:262
 msgid ""
 "\n"
 "If the command times out, and --preserve-status is not set, then exit with\n"
@@ -11651,17 +11817,17 @@ msgstr ""
 "128+9\n"
 "in plaats van 124.\n"
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr "waarschuwing: uitschakelen van geheugendumps is mislukt"
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, c-format
 msgid "error waiting for command"
 msgstr "fout bij het wachten op commando"
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr "het gemonitorde commando heeft een geheugendump gemaakt"
@@ -11753,7 +11919,6 @@ msgstr ""
 "zijn:\n"
 "                        'access', 'atime' of 'use': hetzelfde als '-a';\n"
 "                        'modify' of 'mtime': hetzelfde als '-m'\n"
-"\n"
 
 #: src/touch.c:246
 msgid ""
@@ -11798,16 +11963,14 @@ msgid ""
 "                            of that character\n"
 "  -t, --truncate-set1     first truncate SET1 to length of SET2\n"
 msgstr ""
-"Tekens van standaardinvoer omzetten, samendrukken en/of verwijderen, en "
-"naar\n"
-"standaarduitvoer sturen.\n"
+"Zet tekens van standaardinvoer om, drukt ze samen of verwijdert ze,\n"
+"en schrijft het resultaat naar standaarduitvoer.\n"
 "\n"
 "  -c, -C, --complement    het complement van SET1 gebruiken \n"
 "  -d, --delete            tekens in SET1 verwijderen, niet omzetten\n"
 "  -s, --squeeze-repeats   herhalingen van een teken uit SET1 vervangen door\n"
 "                            slechts één zo'n teken\n"
 "  -t, --truncate-set1     SET1 eerst afkappen tot de lengte van SET2\n"
-"\n"
 
 #: src/tr.c:303
 msgid ""
@@ -12042,11 +12205,11 @@ msgstr ""
 
 #: src/true.c:45
 msgid "Exit with a status code indicating success."
-msgstr "Eindigen met de afsluitwaarde die succes aangeeft."
+msgstr "Eindigt met de afsluitwaarde die succes aangeeft."
 
 #: src/true.c:46
 msgid "Exit with a status code indicating failure."
-msgstr "Eindigen met de afsluitwaarde die mislukking aangeeft."
+msgstr "Eindigt met de afsluitwaarde die mislukking aangeeft."
 
 #: src/truncate.c:96
 #, c-format
@@ -12085,7 +12248,7 @@ msgstr ""
 #: src/truncate.c:115
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 "  -r, --reference=BESTAND  de grootte van dit BESTAND gebruiken\n"
 "  -s, --size=GROOTTE     deze GROOTTE gebruiken\n"
@@ -12173,18 +12336,18 @@ msgid ""
 msgstr ""
 "Gebruik:  %s [OPTIE] [BESTAND]\n"
 "\n"
-"Een volledig, topologisch gesorteerde lijst produceren,\n"
+"Produceert een volledig, topologisch gesorteerde lijst,\n"
 "overeenkomend met de gegeven bestaande volgorde.\n"
 "\n"
 "Zonder BESTAND, of wanneer BESTAND - is, wordt standaardinvoer gelezen.\n"
 "\n"
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr "%s: invoer bevat een oneven aantal elementen"
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr "%s: invoer bevat een lus:"
@@ -12195,11 +12358,10 @@ msgid ""
 "\n"
 "  -s, --silent, --quiet   print nothing, only return an exit status\n"
 msgstr ""
-"De bestandsnaam tonen van de terminal die verbonden is met standaardinvoer.\n"
+"Toont de bestandsnaam van de terminal die verbonden is met standaardinvoer.\n"
 "\n"
 "  -s, --silent, --quiet    niets tonen, alleen een afsluitwaarde "
 "retourneren\n"
-"\n"
 
 #: src/tty.c:120
 msgid "not a tty"
@@ -12215,11 +12377,11 @@ msgid ""
 "  -n, --nodename           print the network node hostname\n"
 "  -r, --kernel-release     print the kernel release\n"
 msgstr ""
-"Bepaalde systeeminformatie tonen.  Geen OPTIE is hetzelfde als '-s'.\n"
+"Toont bepaalde systeeminformatie.  Geen OPTIE betekent hetzelfde als '-s'.\n"
 "\n"
-"  -a, --all                alle informatie in de onderstaande volgorde "
+"  -a, --all                alle informatie in onderstaande optiesvolgorde "
 "tonen\n"
-"                             (maar '-p' en '-i' welaten als deze onbekend "
+"                             (maar '-p' en '-i' weglaten als deze onbekend "
 "zijn)\n"
 "  -s, --kernel-name        het soort kernel tonen\n"
 "  -n, --nodename           de hostnaam van de machine tonen\n"
@@ -12238,14 +12400,13 @@ msgstr ""
 "  -p, --processor          de processornaam tonen (of \"unknown\")\n"
 "  -i, --hardware-platform  het hardwareplatform tonen (of \"unknown\")\n"
 "  -o, --operating-system   het soort besturingssysteem tonen\n"
-"\n"
 
 #: src/uname.c:143
 msgid ""
 "Print machine architecture.\n"
 "\n"
 msgstr ""
-"De machinearchitectuur tonen.\n"
+"Toont de machinearchitectuur.\n"
 "\n"
 
 #: src/uname.c:286
@@ -12277,7 +12438,6 @@ msgstr ""
 "a')\n"
 "  -t, --tabs=LIJST    kommagescheiden lijst van te gebruiken tabposities "
 "(idem)\n"
-"\n"
 
 #: src/unexpand.c:152
 #, c-format
@@ -12289,14 +12449,14 @@ msgstr "tabposities zijn te ver uit elkaar"
 msgid "tab stop value is too large"
 msgstr "tabpositie is te groot"
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr ""
 "Gebruik:  %s [OPTIE...] [INVOER [UITVOER]]\n"
 "\n"
 
-#: src/uniq.c:138
+#: src/uniq.c:174
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
 "writing to OUTPUT (or standard output).\n"
@@ -12308,25 +12468,20 @@ msgstr ""
 "\n"
 "Zonder opties worden identieke regels samengedrukt tot één voorkomen.\n"
 
-#: src/uniq.c:147
+#: src/uniq.c:183
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
 msgstr ""
 "  -c, --count            het aantal gelijke regels vooraan de regel zetten\n"
 "  -d, --repeated         alleen de regels tonen die meerdere keren "
 "voorkomen\n"
 
-#: src/uniq.c:151
+#: src/uniq.c:187
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
-"  -i, --ignore-case     ignore differences in case when comparing\n"
-"  -s, --skip-chars=N    avoid comparing the first N characters\n"
-"  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
 msgstr ""
 "  -D, --all-repeated[=SCHEIDINGSMETHODE]\n"
 "                         alle regels tonen die meerdere keren voorkomen;\n"
@@ -12334,19 +12489,41 @@ msgstr ""
 "standaard),\n"
 "                         'prepend' (voorvoegen) of 'separate' (gescheiden);\n"
 "                         het scheiden wordt gedaan een blanco regel\n"
-"  -f, --skip-fields=N    de eerste N velden niet vergelijken\n"
+
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr "  -f, --skip-fields=N    de eerste N velden niet vergelijken\n"
+
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
+msgstr ""
+"      --group[=SCHEIDINGSMETHODE]\n"
+"                          alle items tonen; regels scheiden met blanco "
+"regel;\n"
+"                          SCHEIDINGSMETHODE: 'separate' (gescheiden, "
+"standaard),\n"
+"                          'prepend' (voorvoegen), 'append' (achtervoegen),\n"
+"                          of 'both' (beide, zowel voor- als achtervoegen)\n"
+
+#: src/uniq.c:199
+msgid ""
+"  -i, --ignore-case     ignore differences in case when comparing\n"
+"  -s, --skip-chars=N    avoid comparing the first N characters\n"
+"  -u, --unique          only print unique lines\n"
+msgstr ""
 "  -i, --ignore-case      verschil tussen hoofd- en kleine letters negeren\n"
 "  -s, --skip-chars=N     de eerste N tekens niet vergelijken\n"
 "  -u, --unique           alleen unieke regels tonen\n"
-"  -z, --zero-terminated  regels afsluiten met 0-byte, niet met nieuweregel\n"
 
-#: src/uniq.c:161
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr ""
 "  -w, --check-chars=N    niet meer dan N tekens per regel vergelijken\n"
-"\n"
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 msgid ""
 "\n"
 "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n"
@@ -12356,7 +12533,7 @@ msgstr ""
 "Een veld is witruimte (gewoonlijk spaties en/of tabs), daarna tekens die\n"
 "geen witruimte zijn.  Eerst worden velden overgeslagen, dan tekens.\n"
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 msgid ""
 "\n"
 "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n"
@@ -12370,24 +12547,34 @@ msgstr ""
 "'uniq'.\n"
 "Verder volgt de vergelijking de regels gespecificeerd door 'LC_COLLATE'.\n"
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, c-format
 msgid "too many repeated lines"
 msgstr "te veel herhaalde regels"
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
 msgstr "ongeldig aantal velden om over te slaan"
 
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
 msgstr "ongeldig aantal bytes om over te slaan"
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
 msgstr "ongeldig aantal bytes om te vergelijken"
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr "optie '--group' gaat niet samen met '-c', '-d', '-D' en '-u'"
+
+#: src/uniq.c:652
+#, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr "groeperen én de herhalingsaantallen tonen is onzin"
+
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr "alle herhaalde regels én de herhalingsaantallen tonen is onzin"
@@ -12410,11 +12597,6 @@ msgstr ""
 "Verwijdert het gegeven BESTAND via de unlink()-functie.\n"
 "\n"
 
-#: src/unlink.c:86
-#, c-format
-msgid "cannot unlink %s"
-msgstr "kan %s niet verwijderen"
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -12459,7 +12641,7 @@ msgstr[1] "%lu gebruikers"
 msgid ",  load average: %.2f"
 msgstr ",  gemiddelde belasting: %.2f"
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -12472,7 +12654,7 @@ msgstr ""
 "werd\n"
 "in de laatste 1, 5 en 15 minuten."
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
@@ -12482,12 +12664,12 @@ msgstr ""
 "een niet-onderbreekbare slaapstatus dragen ook bij aan het "
 "belastingsgemiddelde.\n"
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr "\n"
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
@@ -12695,7 +12877,6 @@ msgstr ""
 "  -u, --users       de ingelogde gebruikers tonen\n"
 "      --message     hetzelfde als '-T'\n"
 "      --writable    hetzelfde als '-T'\n"
-"\n"
 
 #: src/who.c:673
 #, c-format
@@ -12744,6 +12925,170 @@ msgstr ""
 "Produceert voortdurend een regel met de gegeven TEKST (of anders 'y').\n"
 "\n"
 
+#~ msgid "cannot create pipe"
+#~ msgstr "kan geen pijp aanmaken"
+
+#~ msgid "%s subprocess failed"
+#~ msgstr "subproces %s is mislukt"
+
+#~ msgid "_open_osfhandle failed"
+#~ msgstr "_open_osfhandle() is mislukt"
+
+#~ msgid "cannot restore fd %d: dup2 failed"
+#~ msgstr "kan bestandsdescriptor %d niet herstellen: dup2() is mislukt"
+
+#~ msgid "%s subprocess"
+#~ msgstr "subproces %s"
+
+#~ msgid "%s subprocess got fatal signal %d"
+#~ msgstr "subproces %s ontving het fatale signaal %d"
+
+#~ msgid "failed to set additional groups"
+#~ msgstr "instellen van aanvullende groepen is mislukt"
+
+#~ msgid "mount point %s already traversed"
+#~ msgstr "aankoppelingspunt %s is al doorlopen"
+
+#~ msgid "%s: cannot lseek back to original position"
+#~ msgstr "%s: kan niet terugspringen naar de originele positie"
+
+#~ msgid "%s: failed to reset file pointer"
+#~ msgstr "%s: resetten van bestandspositieaanduider is mislukt"
+
+#~ msgid "cannot reposition file pointer for %s"
+#~ msgstr "kan de bestandspositieaanduider van %s niet verplaatsen"
+
+#~ msgid ""
+#~ "  -Z, --context[=CTX]  set the SELinux security context of each NAME to\n"
+#~ "                         default type, or CTX if specified\n"
+#~ msgstr ""
+#~ "  -Z, --context[=CNTXT]  de SELinux-beveiligingscontext voor elke NAAM "
+#~ "op\n"
+#~ "                           standaard instellen (of op CNTXT indien "
+#~ "gegeven)\n"
+
+#~ msgid ""
+#~ "  -Z, --context[=CTX]  set the SELinux security context of NAME to\n"
+#~ "                         default type, or to CTX if specified\n"
+#~ msgstr ""
+#~ "  -Z, --context[=CNTXT]  de SELinux-beveiligingscontext voor NAAM op\n"
+#~ "                           standaard instellen (of op CNTXT indien "
+#~ "gegeven)\n"
+
+#~ msgid "out of memory (requested %zu bytes)"
+#~ msgstr "onvoldoende geheugen beschikbaar (%zu bytes werden gevraagd)"
+
+#~ msgid "--padding cannot be combined with --format"
+#~ msgstr "de opties '--padding' en '--format' gaan niet samen"
+
+#~ msgid ""
+#~ "Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
+#~ "  or:  %s LONG-OPTION\n"
+#~ msgstr ""
+#~ "Gebruik:  %s [KORTE_OPTIE...] GEBRUIKERSNAAM COMMANDO [ARGUMENT...]\n"
+#~ "     of:  %s LANGE_OPTIE\n"
+
+#~ msgid ""
+#~ "Drop any supplemental groups, assume the user-ID and group-ID of the "
+#~ "specified\n"
+#~ "USER (numeric ID or user name), and run COMMAND with any specified "
+#~ "ARGUMENTs.\n"
+#~ "Exit with status 111 if unable to assume the required user and group ID.\n"
+#~ "Otherwise, exit with the exit status of COMMAND.\n"
+#~ "This program is useful only when run by root (user ID zero).\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Alle aanvullende groepen vergeten, gebruikers-ID en groeps-ID van de "
+#~ "gegeven\n"
+#~ "GEBRUIKERSNAAM (naam of numeriek) aannemen, en het gegeven COMMANDO "
+#~ "uitvoeren\n"
+#~ "met de eventuele ARGUMENTen.\n"
+#~ "De afsluitwaarde is 111 als gevraagde gebruikers-ID en groeps-ID niet "
+#~ "ingesteld\n"
+#~ "konden worden, anders is het de afsluitwaarde van het COMMANDO.\n"
+#~ "Dit programma is alleen nuttig voor root (gebruikers-ID nul).\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, "
+#~ "and\n"
+#~ "                      (if specified) supplemental group IDs to GID1, ...\n"
+#~ msgstr ""
+#~ "  -g GID[,GID1...]  primaire groeps-ID instellen op gegeven numeriek GID, "
+#~ "en\n"
+#~ "                      (indien gegeven) aanvullende groeps-ID's op "
+#~ "GID1,...\n"
+
+#~ msgid "unknown user-ID: %s"
+#~ msgstr "onbekend gebruikers-ID: %s"
+
+#~ msgid "to use user-ID %s you need to use -g too"
+#~ msgstr "om gebruikers-ID %s te kunnen gebruiken moet u ook '-g' gebruiken"
+
+#~ msgid "cannot set group-ID to %lu"
+#~ msgstr "kan groeps-ID niet op %lu instellen"
+
+#~ msgid "cannot set user-ID to %lu"
+#~ msgstr "kan gebruikers-ID niet op %lu instellen"
+
+#~ msgid "failed to get file system create context"
+#~ msgstr "kan de aanmaakcontext van het bestandssysteem niet verkrijgen"
+
+#~ msgid "warning: "
+#~ msgstr "waarschuwing: "
+
+#~ msgid "long option '--megabytes' is deprecated and will soon be removed"
+#~ msgstr ""
+#~ "de lange optie '--megabytes' is verouderd en wordt binnenkort ongeldig"
+
+#~ msgid "Usage: %s [OPTION]... [USERNAME]\n"
+#~ msgstr ""
+#~ "Gebruik:  %s [OPTIE...] [GEBRUIKERSNAAM]\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "      --strict         with --check, exit non-zero for any invalid input\n"
+#~ msgstr ""
+#~ "      --strict    met '--check': met foutcode afsluiten bij ongeldige "
+#~ "invoer\n"
+
+#~ msgid "failed to redirect stderr to /dev/null"
+#~ msgstr "kan standaardfoutuitvoer niet omleiden naar /dev/null"
+
+#~ msgid "invalid number: '%s'"
+#~ msgstr "ongeldig getal: '%s'"
+
+#~ msgid ""
+#~ "\n"
+#~ "With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Zonder BESTAND, of wanneer BESTAND - is, wordt standaardinvoer gelezen.\n"
+#~ "Optie '-F /' is standaard.\n"
+
+#~ msgid "cannot remove directory: %s"
+#~ msgstr "kan map %s niet verwijderen"
+
+#~ msgid "dup2 failed"
+#~ msgstr "dup2() is mislukt"
+
+#~ msgid "couldn't execute %s"
+#~ msgstr "kan %s niet uitvoeren"
+
+#~ msgid "couldn't execute %s -d"
+#~ msgstr "kan '%s -d' niet uitvoeren"
+
+#~ msgid ""
+#~ "\n"
+#~ "Report %s bugs to %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Rapporteer gebreken in '%s' aan <%s>.\n"
+
+#~ msgid "warning: --retry is useful mainly when following by name"
+#~ msgstr ""
+#~ "waarschuwing: '--retry' is gewoonlijk alleen nuttig bij volgen op naam"
+
 #~ msgid "using single-precision arithmetic"
 #~ msgstr "berekening met enkelvoudige precisie wordt gebruikt"
 
@@ -12854,11 +13199,6 @@ msgstr ""
 #~ "Optie '--string' zonder een getal betekent 3; '--width' zonder een getal\n"
 #~ "betekent 32.  Standaard voor 'od' is '-A o -t oS -w16'.\n"
 
-#~ msgid "Usage: %s [OPTION]... FILE\n"
-#~ msgstr ""
-#~ "Gebruik:  %s [OPTIE...] KOPPELINGSNAAM\n"
-#~ "\n"
-
 #~ msgid "Password:"
 #~ msgstr "Wachtwoord:"
 
diff --git a/po/pl.gmo b/po/pl.gmo
index 787b6b09..2bdd8746 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
diff --git a/po/pl.po b/po/pl.po
index a4f29744..8c5fbd83 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,8 +1,8 @@
 # Polish translation of GNU coreutils messages
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
 # This file is distributed under the same license as the coreutils package.
 # Contributions:
-# Rafał Maszkowski <rzm@icm.edu.pl> 1996-2001, 2003-2013.
+# Rafał Maszkowski <rzm@icm.edu.pl> 1996-2001, 2003-2014.
 # ptx: Paweł Krawczyk <kravietz@pipeta.chemia.pk.edu.pl>, 1996.
 # sh-utils: Paweł Krawczyk <kravietz@ceti.pl>, 1997, 1998, 1999.
 # fileutils: Thanks for help to Marta Bartnicka, 1999.
@@ -14,10 +14,10 @@
 # 2 format strings: Jakub Bogusz <qboosh@pld-linux.org>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: coreutils 8.20-pre3\n"
+"Project-Id-Version: coreutils 8.23-pre1\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
-"PO-Revision-Date: 2013-02-13 15:30+0100\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
+"PO-Revision-Date: 2014-07-15 00:15+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
@@ -45,76 +45,119 @@ msgstr "Prawidłowe argumenty to:"
 msgid "error closing file"
 msgstr "błąd zamknięcia pliku"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "błąd zapisu"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "zachowanie uprawnień %s"
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "Nieznany błąd systemu"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "pusty zwykły plik"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "zwykły plik"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "katalog"
 
-#: lib/file-type.c:44
-msgid "block special file"
-msgstr "blokowy plik specjalny"
-
-#: lib/file-type.c:47
-msgid "character special file"
-msgstr "znakowy plik specjalny"
-
-#: lib/file-type.c:50
-msgid "fifo"
-msgstr "potok"
-
-#: lib/file-type.c:53
+#: lib/file-type.c:46
 msgid "symbolic link"
 msgstr "dowiÄ…zanie symboliczne"
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "gniazdo"
-
-#: lib/file-type.c:59
+#: lib/file-type.c:52
 msgid "message queue"
 msgstr "kolejka komunikatów"
 
-#: lib/file-type.c:62
+#: lib/file-type.c:55
 msgid "semaphore"
 msgstr "semafor"
 
-#: lib/file-type.c:65
+#: lib/file-type.c:58
 msgid "shared memory object"
 msgstr "obiekt w pamięci współdzielonej"
 
-#: lib/file-type.c:68
+#: lib/file-type.c:61
 msgid "typed memory object"
 msgstr "obiekt z typem w pamięci"
 
-#: lib/file-type.c:70
+#: lib/file-type.c:66
+msgid "block special file"
+msgstr "blokowy plik specjalny"
+
+#: lib/file-type.c:69
+msgid "character special file"
+msgstr "znakowy plik specjalny"
+
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr "dane ciągłe"
+
+#: lib/file-type.c:75
+msgid "fifo"
+msgstr "potok"
+
+#: lib/file-type.c:78
+msgid "door"
+msgstr "drzwi"
+
+#: lib/file-type.c:81
+msgid "multiplexed block special file"
+msgstr "plik specjalny blokowy multipleksowany"
+
+#: lib/file-type.c:84
+msgid "multiplexed character special file"
+msgstr "plik specjalny znakowy multipleksowany"
+
+#: lib/file-type.c:87
+msgid "multiplexed file"
+msgstr "plik multipleksowany"
+
+#: lib/file-type.c:90
+msgid "named file"
+msgstr "plik z nazwÄ…"
+
+#: lib/file-type.c:93
+msgid "network special file"
+msgstr "sieciowy plik specjalny"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr "przemigrowany plik z danymi"
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr "przemigrowany plik bez danych"
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr "port"
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "gniazdo"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr "wybielenie"
+
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "dziwny plik"
 
@@ -249,18 +292,18 @@ msgstr "%s: opcja „-W %s� nie może mieć argumentu\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: opcja „-W %s� wymaga argumentu\n"
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr "nie można zmienić uprawnień do %s"
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "nie można utworzyć katalogu %s"
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr "brak pamięci"
@@ -378,7 +421,7 @@ msgstr "Za duże wyrażenie regularne"
 msgid "Unmatched ) or \\)"
 msgstr "Niesparowany ) lub \\)"
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 msgid "No previous regular expression"
 msgstr "Brak poprzedniego wyrażenia regularnego"
 
@@ -403,7 +446,7 @@ msgstr "użyj --no-preserve-root do wyłączenia tego zabezpieczenia"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[yYtT]"
 
@@ -413,11 +456,11 @@ msgstr "^[yYtT]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, c-format
 msgid "setting permissions for %s"
 msgstr "nie można ustawić uprawnień do %s"
@@ -558,18 +601,6 @@ msgstr "Brak zasilania"
 msgid "Resource lost"
 msgstr "Utracony zasób"
 
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, c-format
-msgid "cannot create pipe"
-msgstr "nie można utworzyć potoku"
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, c-format
-msgid "%s subprocess failed"
-msgstr "%s: błąd procesu potomnego"
-
 #: lib/strsignal.c:114
 #, c-format
 msgid "Real-time signal %d"
@@ -779,7 +810,7 @@ msgstr ""
 msgid "Report %s bugs to: %s\n"
 msgstr "Raporty o błędach %s wysyłaj do %s\n"
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "strona domowa %s: %s\n"
@@ -789,30 +820,10 @@ msgstr "strona domowa %s: %s\n"
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr "strona domowa %s: http://www.gnu.org/software/%s/\n"
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr "Pomoc w używaniu oprogramowania GNU: http://www.gnu.org/gethelp/\n"
 
-#: lib/w32spawn.h:43
-#, c-format
-msgid "_open_osfhandle failed"
-msgstr "błąd _open_osfhandle"
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr "nie można odtworzyć deskryptora %d: błąd dup2"
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr "proces potomny %s"
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr "proces potomny %s otrzymał fatalny sygnał %d"
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr "stdin"
@@ -834,7 +845,7 @@ msgstr "nieznany strumień"
 msgid "failed to reopen %s with mode %s"
 msgstr "nie udało się ponownie otworzyć %s z uprawnieniami %s"
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr "nie udało się porównanie napisów"
@@ -901,7 +912,7 @@ msgstr ""
 "                        76), 0 wyłącza zawijanie\n"
 "\n"
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -925,48 +936,47 @@ msgstr ""
 "będzie\n"
 "próbował opuścić jakiekolwiek inne znaki nie z alfabetu base64.\n"
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "błąd czytania"
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, c-format
 msgid "invalid input"
 msgstr "błędne dane wejściowe"
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, c-format
 msgid "invalid wrap size: %s"
 msgstr "błędny rozmiar zawijania: %s"
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, c-format
 msgid "extra operand %s"
 msgstr "nadmiarowy argument %s"
 
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, c-format
 msgid "closing standard input"
 msgstr "zamknięcie standardowego wejścia"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -995,13 +1005,13 @@ msgstr ""
 #: src/basename.c:60
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
 "  -a, --multiple       traktowanie każdego z wielu argumentów jako NAZWY\n"
-"  -s, --suffix=PRZYROSTEK  usunięcie PRZYROSTKA z końca\n"
-"  -z, --zero           oddzielanie danych wyjściowych znakiem NUL, a nie\n"
-"                         znakiem nowej linii\n"
+"  -s, --suffix=PRZYROSTEK  usunięcie PRZYROSTKA z końca; implikuje -a\n"
+"  -z, --zero           zakończenie każdej linii na wyjściu znakiem\n"
+"                         NUL, a nie znakiem nowej linii\n"
 
 #: src/basename.c:67
 #, c-format
@@ -1020,32 +1030,31 @@ msgstr ""
 "  %s -s .h include/stdio.h  -> \"stdio\"\n"
 "  %s -a any/str1 any/str2   -> \"str1\", a po nim \"str2\"\n"
 
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, c-format
 msgid "missing operand"
 msgstr "brakujÄ…cy argument"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr "Torbjorn Granlund"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 msgid "Richard M. Stallman"
 msgstr "Richard M. Stallman"
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1065,7 +1074,8 @@ msgstr ""
 "Połączenie PLIKU(ÓW) albo standardowego wejścia i przekazanie na wyjście.\n"
 "\n"
 "  -A, --show-all           równoważne -vET\n"
-"  -b, --number-nonblank    numerowanie niepustych linii na wyjściu\n"
+"  -b, --number-nonblank    numerowanie niepustych linii na wyjściu,\n"
+"                             wyłącza -n\n"
 "  -e                       równoważne -vE\n"
 "  -E, --show-ends          wypisanie $ na końcu każdej linii\n"
 "  -n, --number             numerowanie wszystkich linii na wyjściu\n"
@@ -1102,7 +1112,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr "nie można wykonać ioctl na %s"
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr "standardowe wyjście"
@@ -1119,14 +1129,14 @@ msgstr "Russell Coker"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 msgid "Jim Meyering"
 msgstr "Jim Meyering"
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, c-format
 msgid "failed to create security context: %s"
 msgstr "błąd tworzenia kontekstu bezpieczeństwa: %s"
@@ -1136,8 +1146,8 @@ msgstr "błąd tworzenia kontekstu bezpieczeństwa: %s"
 msgid "failed to set %s security context component to %s"
 msgstr "błąd przy ustawiania kontekstu bezpieczeństwa %s jako %s"
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, c-format
 msgid "failed to get security context of %s"
 msgstr "nie udało się odczytać kontekstu bezpieczeństwa %s"
@@ -1147,18 +1157,18 @@ msgstr "nie udało się odczytać kontekstu bezpieczeństwa %s"
 msgid "can't apply partial context to unlabeled file %s"
 msgstr "nie można zastosować częściowego kontekstu do pliku %s bez etykiety"
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, c-format
 msgid "failed to change context of %s to %s"
 msgstr "nie można zmienić konteksty %s na %s"
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
 msgstr "nie ma dostępu do %s"
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, c-format
 msgid "cannot read directory %s"
 msgstr "nie można przeczytać katalogu %s"
@@ -1168,13 +1178,14 @@ msgstr "nie można przeczytać katalogu %s"
 msgid "changing security context of %s\n"
 msgstr "zmiana kontekstu bezpieczeństwa %s\n"
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, c-format
 msgid "fts_read failed"
 msgstr "błąd fts_read"
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, c-format
 msgid "fts_close failed"
 msgstr "błąd fts_close"
@@ -1193,11 +1204,11 @@ msgstr ""
 
 #: src/chcon.c:357
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
-"Zmiana kontekstu bezpieczeństwa każdego PLIKU na KONTEKST. Z opcją --"
+"Zmiana kontekstu bezpieczeństwa SELinux każdego PLIKU na KONTEKST. Z opcją --"
 "reference:\n"
 "zmiana kontekstu bezpieczeństwa każdego PLIKU na taki jaki ma PLIK_WZ.\n"
 "\n"
@@ -1233,7 +1244,7 @@ msgstr ""
 "  -l, --range=ZAKRES     ustawienie ZAKRESU w docelowym kontekscie\n"
 "                         bezpieczeństwa\n"
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
 "      --preserve-root    fail to operate recursively on '/'\n"
@@ -1285,36 +1296,37 @@ msgstr ""
 "(domyślnie)\n"
 "\n"
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr "-R --dereference wymaga -H albo -L"
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr "-R -h wymagajÄ… podania -P"
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, c-format
 msgid "missing operand after %s"
 msgstr "brakujÄ…cy argument po %s"
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, c-format
 msgid "invalid context: %s"
 msgstr "błędny kontekst: %s"
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr "podano sprzeczne specyfikacje kontekstów bezpieczeństwa"
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, c-format
 msgid "failed to get attributes of %s"
 msgstr "nie udało się odczytać atrybutów %s"
@@ -1342,7 +1354,7 @@ msgstr ""
 "Zmiana grupy każdego PLIKU na GRUPĘ.\n"
 "Z opcją --reference zmiana grupy każdego PLIKU na taką, jaką ma PLIK_WZ.\n"
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
@@ -1382,50 +1394,50 @@ msgstr ""
 "  %s staff /u      Zmiana grupy /u na \"staff\".\n"
 "  %s -hR staff /u  Zmiana grupy /u i zawartości na \"staff\".\n"
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
 msgstr "pobranie nowych atrybutów %s"
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr ""
 "nie zostało zmienione ani dowiązanie symboliczne %s ani wskazywany plik\n"
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr "uprawnienia do %s zmienione z %04lo (%s) na %04lo (%s)\n"
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr "nie udało się zmienić uprawnień do %s z %04lo (%s) na %04lo (%s)\n"
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr "uprawnienia do %s zachowane jako %04lo (%s)\n"
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr ""
 "operacji nie można wykonać na dowiązaniu symbolicznym %s, które nie wskazuje "
 "na istniejÄ…cy plik"
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, c-format
 msgid "changing permissions of %s"
 msgstr "nie można zmienić uprawnień do %s"
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr "%s: nowe uprawnienia to %s, nie %s"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1436,7 +1448,7 @@ msgstr ""
 "    albo: %s [OPCJA]... UPRAWN_ÓS PLIK...\n"
 "    albo: %s [OPCJA]... --reference=PLIK_WZ PLIK...\n"
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 msgid ""
 "Change the mode of each FILE to MODE.\n"
 "With --reference, change the mode of each FILE to that of RFILE.\n"
@@ -1447,18 +1459,18 @@ msgstr ""
 "PLIK_WZ.\n"
 "\n"
 
-#: src/chmod.c:391
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
 "      --reference=PLIK_WZ użycie uprawnień pliku PLIK_WZ zamiast wartości "
 "UPRAWN\n"
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr ""
 "  -R, --recursive         zmiany też w katalogach i plikach w podkatalogach\n"
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 msgid ""
 "\n"
 "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n"
@@ -1466,12 +1478,12 @@ msgstr ""
 "\n"
 "UPRAWNIENIA mają formę „[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+�.\n"
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr "nie można równocześnie podawać uprawnień i opcji --reference"
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, c-format
 msgid "invalid mode: %s"
 msgstr "błędne uprawnienia %s"
@@ -1625,26 +1637,21 @@ msgstr ""
 "  %s -hR root /u    Zmiana właściciela /u i zawartości na \"root\".\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr "Roland McGrath"
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr "błędna grupa %s"
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, c-format
 msgid "invalid group list %s"
 msgstr "błędna lista grup %s"
 
-#: src/chroot.c:117
-#, c-format
-msgid "failed to set additional groups"
-msgstr "nie udało się ustawić grup dodatkowych"
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
@@ -1653,7 +1660,7 @@ msgstr ""
 "Składnia: %s [OPCJA] NOWY_ROOT [POLECENIE [ARGUMENT]...]\n"
 "    albo: %s OPCJA\n"
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
@@ -1661,7 +1668,7 @@ msgstr ""
 "Uruchomienie polecenia w katalogiem root ustawionym na NOWY_ROOT.\n"
 "\n"
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
@@ -1670,7 +1677,7 @@ msgstr ""
 "                           nazwÄ™)\n"
 "  --groups=LISTA_GRUP    podanie grup dodatkowych w postaci g1,g2,..,gN\n"
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 msgid ""
 "\n"
 "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n"
@@ -1679,28 +1686,42 @@ msgstr ""
 "Jeżeli nie jest podane żadne polecenie, uruchamiany jest „${SHELL} -i�\n"
 "(domyślnie: „/bin/sh -i�).\n"
 
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, c-format
 msgid "cannot change root directory to %s"
 msgstr "nie można zmienić katalogu root na %s"
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, c-format
 msgid "cannot chdir to root directory"
 msgstr "nie można przejść do katalogu root"
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr "brak podanej grupy dla nieznanego uid: %d"
+
+#: src/chroot.c:383
+#, c-format
+msgid "failed to get supplemental groups"
+msgstr "nie udało się pobrać informacji o grupach dodatkowych"
+
+#: src/chroot.c:395
+#, c-format
+msgid "failed to %s supplemental groups"
+msgstr "nie udało się %s grup dodatkowych"
+
+#: src/chroot.c:402
 #, c-format
 msgid "failed to set group-ID"
 msgstr "nie udało się ustawić identyfikatora grupy"
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, c-format
 msgid "failed to set user-ID"
 msgstr "nie udało się ustawić identyfikatora użytkownika"
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, c-format
 msgid "failed to run command %s"
 msgstr "nie udało się uruchomić polecenia %s"
@@ -1730,7 +1751,7 @@ msgid ""
 "\n"
 msgstr "Wypisanie sumy CRC i liczby bajtów każdego PLIKU.\n"
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr "Składnia: %s [OPCJA]... PLIK1 PLIK2\n"
@@ -1821,305 +1842,343 @@ msgstr "podano wiele ograniczników"
 msgid "empty %s not allowed"
 msgstr "pusty %s nie jest dozwolony"
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr "błąd czytania %s"
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, c-format
 msgid "cannot lseek %s"
 msgstr "nie można wykonać lseek na %s"
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr "błąd zapisu %s"
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, c-format
 msgid "%s: failed to get extents info"
 msgstr "%s: nie udało się odczytać informacji o rozszerzeniach"
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, c-format
 msgid "%s: write failed"
 msgstr "%s: błąd zapisu"
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, c-format
 msgid "failed to extend %s"
 msgstr "nie udało się rozszerzyć %s"
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, c-format
 msgid "clearing permissions for %s"
 msgstr "kasowanie uprawnień dla %s"
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "nie udało się zachować własności %s"
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
 msgstr "nie udało się znaleźć pliku %s"
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, c-format
 msgid "failed to preserve authorship for %s"
 msgstr "nie udało się zachować autorstwa %s"
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
+#, c-format
+msgid "failed to set default file creation context to %s"
+msgstr "nie udało się ustawić domyślnego kontekstu tworzenia pliku %s"
+
+#: src/copy.c:820
+#, c-format
+msgid "failed to set default file creation context for %s"
+msgstr "nie udało się ustawić domyślnego kontekstu tworzenia pliku %s"
+
+#: src/copy.c:846
+#, c-format
+msgid "failed to set the security context of %s"
+msgstr "nie udało się ustawić kontekstu bezpieczeństwa %s"
+
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
 msgid "cannot open %s for reading"
 msgstr "nie można otworzyć %s do czytania"
 
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, c-format
 msgid "cannot fstat %s"
 msgstr "nie można wykonać fstat na %s"
 
-#: src/copy.c:820
+#: src/copy.c:935
 #, c-format
 msgid "skipping file %s, as it was replaced while being copied"
 msgstr "plik %s został ominięty, bo został zmieniony w trakcie kopiowania"
 
-#: src/copy.c:850
-#, c-format
-msgid "failed to get file system create context"
-msgstr "nie udało się odczytać kontekstu utworzenia systemu plików"
-
-#: src/copy.c:864
-#, c-format
-msgid "failed to set the security context of %s to %s"
-msgstr "nie udało się ustawić kontekstu bezpieczeństwa %s jako %s"
-
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
 msgid "cannot remove %s"
 msgstr "nie można usunąć %s"
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
 msgstr "usunięty %s\n"
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr ""
 "bez zapisu przez dowiązanie symboliczne %s, które nie wskazuje na istniejący "
 "plik"
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, c-format
 msgid "cannot create regular file %s"
 msgstr "nie można utworzyć zwykłego pliku %s"
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, c-format
 msgid "failed to clone %s from %s"
 msgstr "nie udało się sklonować %s z %s"
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr "zachowanie czasu %s"
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
 #, c-format
 msgid "failed to close %s"
 msgstr "nie udało się zamknąć %s"
 
-#: src/copy.c:1471
+#: src/copy.c:1580
 #, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
-msgstr "%s: zamazywanie %s, obejść uprawnienia %04lo (%s)? "
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
+msgstr "%s: zastępowanie %s, obejść uprawnienia %04lo (%s)? "
 
-#: src/copy.c:1478
+#: src/copy.c:1581
+#, c-format
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr "%s: niezapisywalny %s (uprawnienia %04lo, %s); jednak spróbować? "
+
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
 msgstr "%s: zamazać %s? "
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr " (kopia zapasowa: %s)"
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr ""
 "nie udało się odtworzyć domyślnego kontekstu bezpieczeństwa tworzenia pliku"
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, c-format
 msgid "cannot create hard link %s to %s"
 msgstr "nie można utworzyć dowiązania zwykłego %s do %s"
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, c-format
 msgid "cannot stat %s"
 msgstr "nie można wykonać stat na %s"
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, c-format
 msgid "omitting directory %s"
 msgstr "katalog %s został pominięty"
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr "uwaga: plik źródłowy %s pojawił się więcej niż raz"
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
 msgstr "%s i %s to ten sam plik"
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr "nie można zamazać nie-katalogu %s katalogiem %s"
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr "nie można zamazać właśnie utworzonego %s plikiem %s"
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr "nie można zamazać katalogu %s nie-katalogiem"
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr "nie można przenieść katalogu do nie-katalogu: %s -> %s"
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr ""
 "utworzenie kopii zapasowej %s zniszczyłoby żródło;  %s nie został "
 "przeniesiony"
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr ""
 "utworzenie kopii zapasowej %s zniszczyłoby żródło;  %s nie został skopiowany"
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
 msgstr "nie można utworzyć kopii zapasowej %s"
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr ""
 "plik %s nie będzie skopiowany poprzez właśnie utworzone dowiązanie "
 "symboliczne %s"
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr "nie można skopiować katalogu %s do siebie samego %s"
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr "nie można utworzyć dowiązania zwykłego %s do katalogu %s"
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr "nie można przenieść %s do własnego podkatalogu %s"
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, c-format
 msgid "cannot move %s to %s"
 msgstr "nie można przenieść %s do %s"
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr ""
 "nie udało się przeniesienie między urządzeniami: %s do %s; nie udało się "
 "usunać pliku docelowego"
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, c-format
-msgid "failed to set default file creation context to %s"
-msgstr "nie udało się ustawić domyślnego kontekstu tworzenia pliku %s"
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr "nie można skopiować cyklicznego dowiązania symbolicznego %s"
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr ""
 "%s: można zrobić tylko względne dowiązanie symboliczne w bieżącym katalogu"
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr "nie można utworzyć dowiązania symbolicznego %s do %s"
 
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, c-format
 msgid "cannot create fifo %s"
 msgstr "nie można utworzyć potoku %s"
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, c-format
 msgid "cannot create special file %s"
 msgstr "nie można utworzyć pliku specjalnego %s"
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, c-format
 msgid "cannot read symbolic link %s"
 msgstr "nie można przeczytać dowiązania symbolicznego %s"
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, c-format
 msgid "cannot create symbolic link %s"
 msgstr "nie można utworzyć dowiązania symbolicznego %s"
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
 msgstr "%s to nieznany typ pliku"
 
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, c-format
 msgid "cannot un-backup %s"
 msgstr "nie można przywrócić kopii zapasowej %s"
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr "%s -> %s (przywrócenie kopii zapasowej)\n"
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr "Alex Deymo"
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr "Składnia: %s --coreutils-prog=NAZWA_PROGRAMU [PARAMETRY]... \n"
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+"Uruchomienie wbudowanego programu NAZWA_PROGRAMU z podanymi PAREMATERAMI.\n"
+"\n"
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+"\n"
+"Wywołaj „%s --coreutils-prog=NAZWA_PROGRAMU --help� żeby przeczytać\n"
+"informacje o podanym programie.\n"
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, c-format
+msgid "unknown program %s"
+msgstr "nieznany program %s"
+
+#: src/cp.c:157 src/mv.c:288
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -2130,11 +2189,11 @@ msgstr ""
 "    albo: %s [OPCJA]... ŹRÓD�O... KATALOG\n"
 "    albo: %s [OPCJA]... -t KATALOG ŹRÓD�O...\n"
 
-#: src/cp.c:162
+#: src/cp.c:163
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
 msgstr "Skopiowanie ŹRÓD�A do CELU lub ŹRÓD�A/ŹRÓDE� do KATALOGU.\n"
 
-#: src/cp.c:168
+#: src/cp.c:169
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
 "      --attributes-only        don't copy the file data, just the "
@@ -2157,7 +2216,7 @@ msgstr ""
 "                               przypadku rekursji\n"
 "  -d                           to samo co --no-dereference --preserve=links\n"
 
-#: src/cp.c:177
+#: src/cp.c:178
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
 "                                 opened, remove it and try again (this "
@@ -2177,7 +2236,7 @@ msgstr ""
 "  -H                           podążanie za dowiązaniami symbolicznymi w\n"
 "                                 ŹRÓDLE podanymi jako argumenty polecenia\n"
 
-#: src/cp.c:186
+#: src/cp.c:187
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
 "  -L, --dereference            always follow symbolic links in SOURCE\n"
@@ -2186,7 +2245,7 @@ msgstr ""
 "  -L, --dereference            podążanie za wszystkimi dowiązaniami\n"
 "                                 symbolicznymi w ŹRÓDLE\n"
 
-#: src/cp.c:190
+#: src/cp.c:191
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
 "                                 a previous -i option)\n"
@@ -2199,7 +2258,7 @@ msgstr ""
 "w\n"
 "                                 ŹRÓDLE\n"
 
-#: src/cp.c:195
+#: src/cp.c:196
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
 "      --preserve[=ATTR_LIST]   preserve the specified attributes (default:\n"
@@ -2221,7 +2280,7 @@ msgstr ""
 "atrybuty),\n"
 "                                 all (wszystkie)\n"
 
-#: src/cp.c:203
+#: src/cp.c:204
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                use full source file name under DIRECTORY\n"
@@ -2229,7 +2288,7 @@ msgstr ""
 "      --no-preserve=LISTA_ATR  bez zachowania podanych atrybutów\n"
 "      --parents                użycie pełnej ścieżki źródłowej KATALOG\n"
 
-#: src/cp.c:207
+#: src/cp.c:208
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
 "      --reflink[=WHEN]         control clone/CoW copies. See below\n"
@@ -2244,7 +2303,7 @@ msgstr ""
 "docelowego\n"
 "                                 przed próbą jego otwarcia (por. z --force)\n"
 
-#: src/cp.c:213
+#: src/cp.c:214
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
 "      --strip-trailing-slashes  remove any trailing slashes from each "
@@ -2258,7 +2317,7 @@ msgstr ""
 "z\n"
 "                                 nazw argumentów ŹRÓD�OWYCH\n"
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -2271,7 +2330,7 @@ msgstr ""
 "  -t, --target-directory=KATALOG  skopiowanie wszystkich ŹRÓDE� do KATALOGU\n"
 "  -T, --no-target-directory    traktowanie CELU jak zwykłego pliku\n"
 
-#: src/cp.c:224
+#: src/cp.c:225
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
 "                                 than the destination file or when the\n"
@@ -2285,7 +2344,21 @@ msgstr ""
 "  -x, --one-file-system        pozostanie w jednym systemie plików\n"
 "\n"
 
-#: src/cp.c:233
+#: src/cp.c:232
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+"  -Z                           ustawienie kontekstu bezpieczeństwa podanego\n"
+"                                 pliku jako typu domyślnego\n"
+"      --context=[KONTEKST]     jak -Z, ale jeżeli jest podany KONTEKST,\n"
+"                                 ustawienie kontekstu bezpieczeństwa "
+"SELinux\n"
+"                                 albo SMACK jako KONTEKSTU\n"
+
+#: src/cp.c:240
 msgid ""
 "\n"
 "By default, sparse SOURCE files are detected by a crude heuristic and the\n"
@@ -2318,7 +2391,7 @@ msgstr ""
 "niemożności wykonania lekkiego kopiowania zostanie wykonane kopiowanie "
 "zwykłe.\n"
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 msgid ""
 "\n"
 "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n"
@@ -2336,7 +2409,7 @@ msgstr ""
 "Możliwe wartości:\n"
 "\n"
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2350,7 +2423,7 @@ msgstr ""
 "  existing, nil   numerowane jeżeli takie już istnieją, jeżeli nie - proste\n"
 "  simple, never   tworzenie zawsze prostych kopii zapasowych\n"
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2362,93 +2435,104 @@ msgstr ""
 "opcje force i backup, a ŹRÓD�O i CEL są tą samą nazwą istniejącego pliku\n"
 "zwykłego\n"
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, c-format
 msgid "failed to preserve times for %s"
 msgstr "nie udało się zachować czasu %s"
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, c-format
 msgid "failed to preserve permissions for %s"
 msgstr "nie udało się zachować uprawnień do %s"
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, c-format
 msgid "cannot make directory %s"
 msgstr "nie można utworzyć katalogu %s"
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr "%s istnieje, ale nie jest katalogiem"
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
 #, c-format
 msgid "failed to access %s"
 msgstr "nie udało się uzyskać dostępu do %s"
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, c-format
 msgid "missing file operand"
 msgstr "brakujÄ…cy argument plikowy"
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, c-format
 msgid "missing destination file operand after %s"
 msgstr "brakujÄ…cy plik docelowy po %s"
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr ""
 "nie można używać razem --target-directory (-t) i --no-target-directory (-T)"
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, c-format
 msgid "target %s is not a directory"
 msgstr "cel %s nie jest katalogiem"
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr "z opcją --parents cel musi być katalogiem"
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, c-format
 msgid "multiple target directories specified"
 msgstr "podano wiele katalogów docelowych"
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr ""
+"uwaga: zignorowana opcja --context; wymaga jądra z włączonym SELinuksem"
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr "nie można zrobić dowiązania symbolicznego i zwykłego równocześnie"
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr "opcje --backup i --no-clobber wzajemnie siÄ™ wykluczajÄ…"
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr "opcji --reflink można użyć tylko ze --sparse=auto"
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr "rodzaj kopii zapasowej"
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, c-format
+msgid "cannot set target context and preserve it"
+msgstr "nie można wymusić ustawienia kontekstu pliku docelowego i go zachować"
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr ""
 "nie można zachować kontekstu bezpieczeństwa bez jądra systemu z włączonym "
 "SELinuksem"
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr ""
@@ -2456,131 +2540,131 @@ msgstr ""
 "xattr"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr "Stuart Kemp"
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr "dane wejściowe zniknęły"
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr "%s: numer linii spoza zakresu"
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, c-format
 msgid "%s: %s: line number out of range"
 msgstr "%s: %s: numer linii spoza zakresu"
 
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, c-format
 msgid " on repetition %s\n"
 msgstr " przy powtórzeniu %s\n"
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, c-format
 msgid "%s: %s: match not found"
 msgstr "%s: %s: nie pasuje"
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr "błąd szukania wyrażenia regularnego"
 
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, c-format
 msgid "write error for %s"
 msgstr "błąd pisania dla %s"
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, c-format
 msgid "%s: integer expected after delimiter"
 msgstr "%s: po ograniczniku powinna być liczba całkowita"
 
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr "%s: „}� jest wymagany w liczniku powtórzeń"
 
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr "%s}: między „{� a „}� musi być liczba całkowita"
 
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr "%s: brak zamykającego ogranicznika „%c�"
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr "%s: błędne wyrażenie regularne: %s"
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr "%s: błędny wzorzec"
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr "%s: numer linii musi być większy od zera"
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr "numer linii %s jest mniejszy niż numer linii poprzedzającej, %s"
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr "uwaga: numer linii %s jest taki sam jak numer linii poprzedzajÄ…cej"
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr "brak określenia konwersji w rozszerzeniu"
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr "błędne określenie konwersji w rozszerzeniu: %c"
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr "błędne określenie konwersji w rozszerzeniu: \\%.3o"
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr "błędne flagi w specyfikacji przekształcenia: %%%c%c"
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr "za dużo określeń konwersji %% w rozszerzeniu"
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr "brak określenia konwersji %% w rozszerzeniu"
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr "%s: błędna liczba"
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr "Składnia: %s [OPCJA]... PLIK WZORZEC...\n"
 
-#: src/csplit.c:1455
+#: src/csplit.c:1483
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
 "and output byte counts of each piece to standard output.\n"
@@ -2589,7 +2673,7 @@ msgstr ""
 "„xx02,�\n"
 "..., i podanie na standardowym wyjściu liczby bajtów w każdym kawałku.\n"
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2601,7 +2685,11 @@ msgstr ""
 "  -k, --keep-files           bez kasowania plików wyjściowych w razie "
 "błędów\n"
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr "  -m, --suppress-matched     pominięcie linii pasujących do WZORCA\n"
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
@@ -2612,7 +2700,7 @@ msgstr ""
 "wyjściowych\n"
 "  -z, --elide-empty-files    usunięcie pustych plików wyjściowych\n"
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
@@ -2621,7 +2709,7 @@ msgstr ""
 "Jeżeli PLIK jest podany jako -, czytane jest standardowe wejście.\n"
 "Możliwe WZORCE:\n"
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 msgid ""
 "\n"
 "  INTEGER            copy up to but not including specified line number\n"
@@ -2651,21 +2739,17 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr "David M. Ihnat"
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr "pola i pozycje sÄ… numerowane od 1"
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr "Składnia: %s OPCJA... [PLIK]...\n"
 
-#: src/cut.c:193
+#: src/cut.c:176
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr ""
 "Wypisywanie wybranych części linii z każdego PLIKU na standardowe wyjście.\n"
 
-#: src/cut.c:199
+#: src/cut.c:182
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
 "  -c, --characters=LIST   select only these characters\n"
@@ -2676,7 +2760,7 @@ msgstr ""
 "  -d, --delimiter=OGRANICZNIK  użycie OGRANICZNIKA zamiast TABa jako "
 "separatora\n"
 
-#: src/cut.c:204
+#: src/cut.c:187
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
 "                            that contains no delimiter character, unless\n"
@@ -2689,7 +2773,7 @@ msgstr ""
 "                            opcja -s\n"
 "  -n                      (ignorowane)\n"
 
-#: src/cut.c:210
+#: src/cut.c:193
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
 "                            or fields\n"
@@ -2698,7 +2782,7 @@ msgstr ""
 "znaków\n"
 "                            albo pól\n"
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
@@ -2710,7 +2794,7 @@ msgstr ""
 "                            wyjściowych, domyślnie używany jest separator\n"
 "                            danych wejściowych\n"
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2723,7 +2807,7 @@ msgstr ""
 "dane wejściowe są wypisywane w tym samym porządku, w jakim są czytane i są\n"
 "wypisywane tylko raz.\n"
 
-#: src/cut.c:227
+#: src/cut.c:210
 msgid ""
 "Each range is one of:\n"
 "\n"
@@ -2744,46 +2828,50 @@ msgstr ""
 "Jeżeli PLIK nie jest podany albo podany jako -, czytane jest\n"
 "standardowe wejście.\n"
 
-#: src/cut.c:367 src/cut.c:493
+#: src/cut.c:300 src/cut.c:394
 msgid "invalid byte, character or field list"
 msgstr "błędna lista bajtów, znaków lub pól"
 
-#: src/cut.c:387
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr "pola i pozycje sÄ… numerowane od 1"
+
+#: src/cut.c:320
 msgid "invalid range with no endpoint: -"
 msgstr "błędny zakres bez podania końca: -"
 
-#: src/cut.c:403
+#: src/cut.c:334
 msgid "invalid decreasing range"
 msgstr "błędny zakres od większego do mniejszego"
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, c-format
 msgid "byte offset %s is too large"
 msgstr "przesunięcie bajtowe %s jest za duże"
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, c-format
 msgid "field number %s is too large"
 msgstr "numer pola %s jest za duży"
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr "można podać tylko jeden typ listy"
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr "ogranicznik musi być pojedynczym znakiem"
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr "musisz podać listę bajtów, znaków albo pól"
 
-#: src/cut.c:850
+#: src/cut.c:790
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr "ogranicznik może być podany tylko dla operacji na polach"
 
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
@@ -2791,11 +2879,11 @@ msgstr ""
 "blokowanie wyświetlania linii bez ograniczników jest sensowne\n"
 "\ttylko dla operacji na polach"
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr "brakująca lista pól"
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr "brakujÄ…ca lista pozycji"
 
@@ -2852,7 +2940,7 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 "      --rfc-3339=CZAS       wypisuje data i czas w formacie RFC 3339.\n"
 "                            Dla osiągnięcia żądanej dokładności należy\n"
@@ -2860,7 +2948,8 @@ msgstr ""
 "                            Składniki data i czas są oddzielone przez\n"
 "                            pojedynczÄ… spacjÄ™: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=SPECYFIKACJA    ustawia czas podany w SPECYFIKACJI\n"
-"  -u, --utc, --universal    wyświetla lub ustawia czas uniwersalny\n"
+"  -u, --utc, --universal    wyświetla lub ustawia uniwersalny czas\n"
+"                            koordynowany (UTC)\n"
 
 #: src/date.c:158
 msgid ""
@@ -3070,10 +3159,10 @@ msgstr ""
 "USA:\n"
 "  $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n"
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr "standardowe wejście"
@@ -3114,7 +3203,7 @@ msgstr ""
 msgid "cannot set date"
 msgstr "ustawienie daty niemożliwe"
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, c-format
 msgid "time %s is out of range"
 msgstr "czas %s jest spoza zakresu"
@@ -3125,7 +3214,7 @@ msgstr "czas %s jest spoza zakresu"
 msgid "Paul Rubin"
 msgstr "Paul Rubin"
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
@@ -3134,7 +3223,7 @@ msgstr ""
 "Składnia: %s [ARGUMENT]...\n"
 "    albo: %s OPCJA\n"
 
-#: src/dd.c:526
+#: src/dd.c:532
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
 "\n"
@@ -3154,7 +3243,7 @@ msgstr ""
 "  count=ILE       skopiowanie tylko ILU bloków z wejścia\n"
 "  ibs=BAJTÓW      czytanie tylu BAJTÓW naraz (domyślnie: 512)\n"
 
-#: src/dd.c:535
+#: src/dd.c:541
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
 "  iflag=FLAGS     read as per the comma separated symbol list\n"
@@ -3179,7 +3268,7 @@ msgstr ""
 "                    wyjście błędu: „noxfer� - bez statystyki kopiowania,\n"
 "                    „none� - żadnych informacji\n"
 
-#: src/dd.c:546
+#: src/dd.c:552
 msgid ""
 "\n"
 "N and BYTES may be followed by the following multiplicative suffixes:\n"
@@ -3197,7 +3286,7 @@ msgstr ""
 "Każde S�OWO_KL może być:\n"
 "\n"
 
-#: src/dd.c:555
+#: src/dd.c:561
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
 "  ebcdic    from ASCII to EBCDIC\n"
@@ -3227,7 +3316,7 @@ msgstr ""
 "            jeżeli użyte z block albo unblock, dopełnienie spacjami zamiast\n"
 "            NULami\n"
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -3243,7 +3332,7 @@ msgstr ""
 "  fdatasync  wymuszenie fizycznego zapisu danych przed zakończeniem\n"
 "  fsync     jak fdatasync, ale też dla metadanych\n"
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -3256,75 +3345,75 @@ msgstr ""
 "\n"
 "  append    tryb dopisywania (ma sens tylko dla wyjścia)\n"
 
-#: src/dd.c:583
+#: src/dd.c:589
 msgid "  cio       use concurrent I/O for data\n"
 msgstr "  cio       użycie równoległego I/O dla danych\n"
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr "  direct    dane zapisywane przez bezpośrednie I/O\n"
 
-#: src/dd.c:587
+#: src/dd.c:593
 msgid "  directory  fail unless a directory\n"
 msgstr "  directory  błąd jeżeli nie katalog\n"
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr "  dsync     dane zapisywane przez synchronizowane I/O\n"
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr "  sync      podobnie, ale też dla metadanych\n"
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr "  fullblock  odczekiwanie na pełne bloki na wejściu (tylko iflag)\n"
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr "  nonblock  użycie nie blokującego I/O\n"
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr "  noatime   bez aktualizacji czasu dostępu\n"
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr "  nocache   skasowanie pamięci podręcznej\n"
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr "  noctty    bez przyporzÄ…dkowywania terminala sterujÄ…cego - pliku\n"
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr "  nofollow  bez rozwijania dowiązań symbolicznych\n"
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr "  nolinks   błąd jeżeli wielokrotnie dołączony\n"
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr "  binary    użycie binarnego I/O dla danych\n"
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr "  text      użycie tekstowego I/O dla danych\n"
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr "  count_bytes  traktowanie „count=N� jak liczby najtów (tylko iflag)\n"
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr "  skip_bytes  traktowanie „skip=N� jak liczby bajtów (tylko iflag)\n"
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr "  seek_bytes  traktowanie „seek=N� jak liczby bajtów (tylko oflag)\n"
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, c-format
 msgid ""
 "\n"
@@ -3352,7 +3441,17 @@ msgstr ""
 "  9387674624 bytes (9.4 GB) copied, 34.6279 seconds, 271 MB/s\n"
 "\n"
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr "pamieć wyczerpana przez bufor wejściowy o rozmiarze %zu bajtów (%s)"
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr "pamieć wyczerpana przez bufor wyjściowy o rozmiarze %zu bajtów (%s)"
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
@@ -3361,7 +3460,7 @@ msgstr ""
 "%<PRIuMAX>+%<PRIuMAX> przeczytanych recordów\n"
 "%<PRIuMAX>+%<PRIuMAX> zapisanych recordów\n"
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
@@ -3369,7 +3468,7 @@ msgstr[0] "%<PRIuMAX> obcięty rekord\n"
 msgstr[1] "%<PRIuMAX> obcięte rekordy\n"
 msgstr[2] "%<PRIuMAX> obciętych rekordów\n"
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
@@ -3377,7 +3476,7 @@ msgstr[0] "skopiowany %<PRIuMAX> bajt (%s)"
 msgstr[1] "skopiowane %<PRIuMAX> bajty (%s)"
 msgstr[2] "skopiowane %<PRIuMAX> bajtów (%s)"
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr "nieskończenie wiele B"
 
@@ -3391,83 +3490,83 @@ msgstr "nieskończenie wiele B"
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
 msgstr ", %g s, %s/s\n"
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, c-format
 msgid "closing input file %s"
 msgstr "zamykanie pliku wejściowego %s"
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr "zamknięcie pliku wyjściowego %s"
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr "nie udało się wyłączyć O_DIRECT: %s"
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, c-format
 msgid "writing to %s"
 msgstr "zapis do %s"
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, c-format
 msgid "unrecognized operand %s"
 msgstr "nierozpoznany argument %s"
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 msgid "invalid conversion"
 msgstr "błędna konwersja"
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 msgid "invalid input flag"
 msgstr "błędna flaga wejściowa"
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 msgid "invalid output flag"
 msgstr "błędna flaga wyjściowa"
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 msgid "invalid status flag"
 msgstr "błędna flaga stanu"
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, c-format
 msgid "invalid number %s"
 msgstr "błędna liczba %s"
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr "nie można podawać równocześnie ascii, ebcdic, ibm"
 
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, c-format
 msgid "cannot combine block and unblock"
 msgstr "nie można użyć block i unblock równocześnie"
 
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, c-format
 msgid "cannot combine lcase and ucase"
 msgstr "nie można użyć razem lcase i ucase"
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, c-format
 msgid "cannot combine excl and nocreat"
 msgstr "nie można użyć razem excl i nocreat"
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, c-format
 msgid "cannot combine direct and nocache"
 msgstr "nie można użyć razem direct i nocache"
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
@@ -3476,72 +3575,62 @@ msgstr ""
 "uwaga: ominięcie błędu działania lseek w jądrze dla pliku (%s)\n"
 "  o mt_type=0x%0lx - zobacz listę typów w <sys/mtio.h>"
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, c-format
 msgid "%s: cannot skip"
 msgstr "%s: nie przeskoczyć na wejściu"
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, c-format
 msgid "%s: cannot seek"
 msgstr "%s: nie można ustawić pozycji na wyjściu"
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr "przepełnienie licznika pozycji w czasie czytanie pliku %s"
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr "uwaga: błędna pozycja w pliku po nieudanym czytaniu"
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr "nie udało się obejść błędu jądra"
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, c-format
 msgid "setting flags for %s"
 msgstr "ustawienie flag dla %s"
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr "pamieć wyczerpana przez bufor wejściowy o rozmiarze %zu bajtów (%s)"
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr "pamieć wyczerpana przez bufor wyjściowy o rozmiarze %zu bajtów (%s)"
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr "%s: nie można przeskoczyć do podanej pozycji na wejściu"
 
-#: src/dd.c:2133
+#: src/dd.c:2172
 #, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
 msgstr "nie udało się obciąć pliku do %<PRIdMAX> bajtów w pliku wyjściowym %s"
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr "nieudany fdatasync dla %s"
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
 msgstr "nieudany fsync dla %s"
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, c-format
 msgid "failed to open %s"
 msgstr "nie udało się otworzyć %s"
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
@@ -3550,96 +3639,105 @@ msgstr ""
 "za duża wartośc pozycji w pliku: nie można obciąć pliku do długości seek="
 "%<PRIuMAX> (%lu bajtowych) bloków"
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr "nie udało się obciąć pliku do %<PRIuMAX> bajtów w pliku wyjściowym %s"
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, c-format
 msgid "failed to discard cache for: %s"
 msgstr "nie udało się skasować pamięci podręcznej dla %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr "Paul Eggert"
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr "System plików"
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr "Typ"
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr "bl"
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr "użyte"
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr "dostępne"
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr "%uż."
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr "iwęzły"
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr "użyteI"
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr "wolneI"
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr "%uż.I"
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr "zamont. na"
 
-#: src/df.c:383
+#: src/df.c:207
+msgid "File"
+msgstr "Plik"
+
+#: src/df.c:387
 #, c-format
-msgid "option --output: field '%s' unknown"
-msgstr "opcja --output: nieznane pole „%s�"
+msgid "option --output: field %s unknown"
+msgstr "opcja --output: nieznane pole %s"
 
-#: src/df.c:390
+#: src/df.c:394
 #, c-format
-msgid "option --output: field '%s' used more than once"
-msgstr "opcja --output: pole „%s� pojawiło się więcej niż raz"
+msgid "option --output: field %s used more than once"
+msgstr "opcja --output: pole %s użyte więcej niż raz"
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr "rozm."
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr "dost."
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr "pojemność"
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
 msgstr "%s-%s"
 
-#: src/df.c:1210
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr "nie ma dostępu do %s: nad-montowany przez inne urządzenie"
+
+#: src/df.c:1384
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
 "or all file systems by default.\n"
@@ -3648,27 +3746,27 @@ msgstr ""
 "domyślnie\n"
 "o wszystkich systemach plików.\n"
 
-#: src/df.c:1217
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
 "  -a, --all             pokazanie też specjalnych systemów plików\n"
-"  -B, --block-size=ROZMIAR  Skala rozmiarów, np. „-BM� powoduje wypisanie\n"
-"                           rozmiarów w jednostkach po 1048576 bajtów.\n"
-"                           Zobacz infomacje o formacie ROZMIARÓW poniżej.\n"
+"  -B, --block-size=ROZMIAR  skala rozmiarów; np. „-BM� powoduje wypisanie\n"
+"                           rozmiarów w jednostkach po 1048576 bajtów;\n"
+"                           zobacz infomacje o formacie ROZMIARÓW poniżej\n"
 "      --total           wypisanie podsumowania całości\n"
-"  -h, --human-readable  rozmiary w formacie czytelnym dla ludzi (np. 1K 234M "
-"2G)\n"
-"  -H, --si              podobnie, ale z użyciem potęg 1000, nie 1024\n"
+"  -h, --human-readable  rozmiary jako potęgi 1024 (np. 1023M)\n"
+"  -H, --si              rozmiary jako potęgi 1000 (np. 1.1G)\n"
 
-#: src/df.c:1227
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -3682,7 +3780,7 @@ msgstr ""
 "      --no-sync         bez wywołania sync przed pobraniem informacji o\n"
 "                        systemach plików (domyślnie)\n"
 
-#: src/df.c:1234
+#: src/df.c:1409
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
 "                               or print all fields if FIELD_LIST is "
@@ -3705,45 +3803,38 @@ msgstr ""
 "  -x, --exclude-type=TYP   pokazanie tylko systemów plików nie tego TYPU\n"
 "  -v                    (ignorowane)\n"
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
 "\n"
 "LISTA_PÓL zawiera oddzielone przecinaki nazwy pól do uwzględnienia. Możliwe\n"
 "nazwy pól to „source�, „fstype�, „itotal�, „iused�, „iavail�, „ipcent�,\n"
-"„size�, „used�, „avail�, „pcent� i „target� (zobacz dokumentację info).\n"
+"„size�, „used�, „avail�, „pcent�, „file� i „target� (zobacz dokumentację "
+"info).\n"
 
-#: src/df.c:1285
+#: src/df.c:1460
 #, c-format
 msgid "options %s and %s are mutually exclusive"
 msgstr "opcje %s i %s wzajemnie siÄ™ wykluczajÄ…"
 
-#: src/df.c:1335
-msgid "warning: "
-msgstr "uwaga: "
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr "długa opcja „--megabytes� jest przestarzała i wkrótce będzie usunięta"
-
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr "typ systemu plików %s równocześnie wybrany i wykluczony"
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr "Uwaga: "
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 msgid "cannot read table of mounted file systems"
 msgstr "nie można przeczytać tablicy zamontowanych systemów plików"
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr "nie zostały przetworzone żadne systemy plików"
@@ -3753,7 +3844,7 @@ msgstr "nie zostały przetworzone żadne systemy plików"
 msgid "H. Peter Anvin"
 msgstr "H. Peter Anvin"
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr "Składnia: %s [OPCJA]... [PLIK]\n"
@@ -3838,10 +3929,10 @@ msgstr ""
 "\n"
 
 #: src/dirname.c:59
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
 msgstr ""
-"  -z, --zero     oddzielanie danych wyjściowych znakiem NUL zamiast znakiem\n"
-"                    nowej linii\n"
+"  -z, --zero     zakończenie każdej linii na wyjściu znakiem\n"
+"                   NUL, a nie znakiem nowej linii\n"
 
 #: src/dirname.c:64
 #, c-format
@@ -3858,7 +3949,7 @@ msgstr ""
 "  %s dir1/str dir2/str  -> \"dir1\", a po nim \"dir2\"\n"
 "  %s stdio.h        Wynik: \".\".\n"
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -3867,15 +3958,14 @@ msgstr ""
 "Składnia: %s [OPCJA]... [PLIK]...\n"
 "    albo: %s [OPCJA]... --files0-from=P\n"
 
-#: src/du.c:274
+#: src/du.c:285
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr ""
 "Podsumowuje zajętość dysku przez każdy PLIK, rekursywnie dla katalogów.\n"
 
-#: src/du.c:280
+#: src/du.c:291
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3883,7 +3973,7 @@ msgid ""
 "                          larger due to holes in ('sparse') files, internal\n"
 "                          fragmentation, indirect blocks, and the like\n"
 msgstr ""
-"  -0, --null            zakończenie każdej linii na wyjściu bajtem 0 "
+"  -0, --null            zakończenie każdej linii na wyjściu znakiem NUL "
 "zamiast\n"
 "                          znakiem nowej linii\n"
 "  -a, --all             podanie podliczenia dla plików, nie samych "
@@ -3891,16 +3981,15 @@ msgstr ""
 "      --apparent-size   podanie rozmiarów pozornych zamiast zużycia dysku;\n"
 "                          chociaż rozmiar pozorny jest zwykle mniejszy, "
 "może\n"
-"                          być też większy z powodu dziur (plików rzadkich -\n"
-"                          sparse), wewnętrznej fragmentacji, bloków "
-"pośrednich\n"
-"                          itp.\n"
+"                          być też większy z powodu dziur w plikach rzadkich\n"
+"                          (sparse), wewnętrznej fragmentacji, bloków\n"
+"                          pośrednich itp.\n"
 
-#: src/du.c:289
+#: src/du.c:300
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3911,9 +4000,9 @@ msgid ""
 "                          line argument;  --max-depth=0 is the same as\n"
 "                          --summarize\n"
 msgstr ""
-"  -B, --block-size=ROZMIAR  Skala rozmiarów, np. „-BM� powoduje wypisanie\n"
-"                           rozmiarów w jednostkach po 1048576 bajtów.\n"
-"                           Zobacz infomacje o formacie ROZMIARÓW poniżej.\n"
+"  -B, --block-size=ROZMIAR  skala rozmiarów; np. „-BM� powoduje wypisanie\n"
+"                           rozmiarów w jednostkach po 1048576 bajtów;\n"
+"                           zobacz infomacje o formacie ROZMIARÓW poniżej\n"
 "  -b, --bytes           równoważne „--apparent-size --block-size=1�\n"
 "  -c, --total           wypisanie podsumowania całości\n"
 "  -D, --dereference-args  rozwijanie dowiązań symbolicznych podanych jako\n"
@@ -3924,26 +4013,28 @@ msgstr ""
 "równoważne\n"
 "                          --summarize\n"
 
-#: src/du.c:302
+#: src/du.c:313
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
 "      --files0-from=PLIK  podsumowanie zajętości dysku przez pliki podane w\n"
-"                          PLIKU (nazwy zakończone przez NUL)\n"
-"                          Jeżeli PLIK to -, nazwy czytane są ze "
+"                          PLIKU (nazwy zakończone przez NUL);\n"
+"                          jeżeli PLIK to -, nazwy czytane są ze "
 "standardowego\n"
 "                          wejścia\n"
 "  -H                    to samo co --dereference-args (-D)\n"
 "  -h, --human-readable  rozmiary w formacie czytelnym dla ludzi (np. 1K "
 "234M\n"
 "                          2G)\n"
+"      --inodes          informacja o zużyciu inode'ów zamiast bloków\n"
 
-#: src/du.c:310
+#: src/du.c:322
 msgid ""
 "  -k                    like --block-size=1K\n"
 "  -L, --dereference     dereference all symbolic links\n"
@@ -3956,11 +4047,12 @@ msgstr ""
 "                          dowiązania zwykłe\n"
 "  -m                    jak dla --block-size=1M\n"
 
-#: src/du.c:316
+#: src/du.c:328
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
@@ -3969,7 +4061,7 @@ msgstr ""
 "      --si              jak -h, ale z użyciem potęg 1000 nie 1024\n"
 "  -s, --summarize       wypisanie tylko podsumowań dla każdego argumentu\n"
 
-#: src/du.c:322
+#: src/du.c:334
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
 "                          or entries greater than SIZE if negative\n"
@@ -3978,9 +4070,9 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
 msgstr ""
 "  -t, --threshold=ROZMIAR  wykluczenie elementów mniejszych niż ROZMIAR, "
 "jeżeli\n"
@@ -3993,11 +4085,11 @@ msgstr ""
 "katalogu\n"
 "      --time=S�OWO      zamiast czasu modyfikacji pokazuje czas wg S�OWA:\n"
 "                          atime, access, use, ctime albo status\n"
-"      --time-style=STYL  pokazanie czasu w STYLU:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
+"      --time-style=STYL  pokazanie czasu w jednym ze STYLÓW:\n"
+"                          full-iso, long-iso, iso, +FORMAT;\n"
 "                          FORMAT jest interpretowany jak dla „date�\n"
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
@@ -4008,66 +4100,68 @@ msgstr ""
 "  -x, --one-file-system    ominięcie katalogów będących w innych systemach\n"
 "                           plików\n"
 
-#: src/du.c:386
+#: src/du.c:398
 msgid "Infinity"
 msgstr "nieskończoność"
 
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr "punkt montowania %s był już odwiedzony"
-
-#: src/du.c:624
+#: src/du.c:636
 #, c-format
 msgid "fts_read failed: %s"
 msgstr "błąd fts_read %s"
 
-#: src/du.c:780
+#: src/du.c:787
 #, c-format
 msgid "invalid maximum depth %s"
 msgstr "błędny maksymalny poziom zagłębienia %s"
 
-#: src/du.c:809
+#: src/du.c:816
 #, c-format
 msgid "invalid --threshold argument '-0'"
 msgstr "błędny argument opcji --threshold: „-0�"
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr "nie można równocześnie tylko podsumować i wypisać wszystkich danych"
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr "uwaga: --summarize jest tym samym co --max-depth=0"
 
-#: src/du.c:900
+#: src/du.c:911
 #, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr "uwaga: --summarize nie może być użyte razem z --max-depth=%lu"
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+"warning: opcje --apparent-size i -b nie działają jeżeli jest włączona opcja "
+"--inodes"
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 msgid "file operands cannot be combined with --files0-from"
 msgstr ""
 "nie można podawać argumentów plikowych i opcji --files0-from równocześnie"
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr "%s: błąd odczytu"
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr "przy czytaniu nazw na wejściu plik nie może mieć nazwy %s"
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 msgid "invalid zero-length file name"
 msgstr "błędna nazwa pliku o zerowej długości"
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr "razem"
 
@@ -4180,12 +4274,13 @@ msgstr ""
 #: src/env.c:61
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
 "  -i, --ignore-environment  zaczęcie z pustym środowiskiem\n"
-"  -0, --null           każda linia wyjściowa zakończona bajtem 0, a nie\n"
-"                         znakiem nowej linii\n"
+"  -0, --null           kończenie każdej linii danych wyjściowych znakiem "
+"NUL,\n"
+"                         a nie znakiem nowej linii\n"
 "  -u, --unset=NAZWA    usunięcie zmiennej ze środowiska\n"
 
 #: src/env.c:68
@@ -4264,16 +4359,16 @@ msgid "input line is too long"
 msgstr "za długa linia wejściowa"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr "Mike Parker"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr "James Youngman"
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
@@ -4282,7 +4377,7 @@ msgstr ""
 "Składnia: %s WYRAŻENIE\n"
 "    albo: %s OPCJA\n"
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -4301,7 +4396,7 @@ msgstr ""
 "  ARG1 & ARG2       ARG1 jeśli żaden argument nie jest pusty ani 0, inaczej "
 "0\n"
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -4319,7 +4414,7 @@ msgstr ""
 "  ARG1 >= ARG2      ARG1 jest większy lub równy ARG2\n"
 "  ARG1 > ARG2       ARG1 jest większy od ARG2\n"
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
@@ -4329,7 +4424,7 @@ msgstr ""
 "  ARG1 + ARG2       arytmetyczna suma ARG1 i ARG2\n"
 "  ARG1 - ARG2       arytmetyczna różnica ARG1 i ARG2\n"
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -4342,7 +4437,7 @@ msgstr ""
 "  ARG1 / ARG2       arytmetyczny iloraz ARG1 przez ARG2\n"
 "  ARG1 % ARG2       arytmetyczna reszta z dzielenia ARG1 przez ARG2\n"
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -4360,7 +4455,7 @@ msgstr ""
 "  index NAPIS ZNAKI\t        położenie jednego ze ZNAKÓW w NAPISIE, lub 0\n"
 "  length NAPIS               długość NAPISU\n"
 
-#: src/expr.c:251
+#: src/expr.c:250
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
 "                               keyword like 'match' or an operator like '/'\n"
@@ -4373,7 +4468,7 @@ msgstr ""
 "\n"
 "  ( WYRAŻENIE )              wartość WYRAŻENIA\n"
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -4391,7 +4486,7 @@ msgstr ""
 "zgodnych\n"
 "znaków lub 0.\n"
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -4405,32 +4500,32 @@ msgstr ""
 "składni,\n"
 "3 - jeżeli został wykryty inny błąd\n"
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, c-format
 msgid "syntax error"
 msgstr "błąd składni"
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, c-format
 msgid "error in regular expression matcher"
 msgstr "błąd procedury dopasowywania wyrażeń regularnych"
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, c-format
 msgid "non-integer argument"
 msgstr "argument niecałkowity"
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr "dzielenie przez zero"
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr "Ustaw LC_ALL=C żeby obejść problem"
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, c-format
 msgid "the strings compared were %s and %s"
 msgstr "Porównywane napisy %s i %s."
@@ -4440,27 +4535,27 @@ msgstr "Porównywane napisy %s i %s."
 msgid "Niels Moller"
 msgstr "Niels Moller"
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
 msgstr "Błąd testu Lucasa na liczby pierwsze. To nie powinno się było zdarzyć"
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
 msgstr "przepełnienie kolejki squfof"
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, c-format
 msgid "%s is not a valid positive integer"
 msgstr "%s nie jest poprawną dodatnią liczbą całkowitą"
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr "%s jest za duża"
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
@@ -4469,7 +4564,7 @@ msgstr ""
 "Składnia: %s [LICZBA]...\n"
 "    albo: %s OPCJA\n"
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
 "are specified on the command line, read them from standard input.\n"
@@ -4581,17 +4676,17 @@ msgid "invalid number of columns: %s"
 msgstr "błędna liczba kolumn: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr "Padraig Brady"
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, c-format
 msgid "Usage: %s\n"
 msgstr "Składnia: %s\n"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
@@ -4600,12 +4695,12 @@ msgstr ""
 "powłoki.\n"
 "\n"
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, c-format
 msgid "failed to get groups for user %s"
 msgstr "nie udało się odczytać grupy użytkownika %s"
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, c-format
 msgid "failed to get groups for the current process"
 msgstr "nie udało się odczytać grupy bieżącego procesu"
@@ -4630,22 +4725,22 @@ msgstr ""
 "jest podany - dla bieżącego procesu (po zmianach bazy danych grup mogą\n"
 "wystąpić różnice).\n"
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, c-format
 msgid "cannot get real UID"
 msgstr "nie można ustalić prawdziwego identyfikatora użytkownika"
 
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, c-format
 msgid "cannot get effective GID"
 msgstr "nie można ustalić efektywnego identyfikatora grupy"
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, c-format
 msgid "cannot get real GID"
 msgstr "nie można ustalić prawdziwego identyfikatora grupy"
 
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, c-format
 msgid "%s: no such user"
 msgstr "%s: nie ma takiego użytkownika"
@@ -4697,58 +4792,48 @@ msgstr ""
 "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
 "GB 1000*1000*1000, G 1024*1024*1024, itd. dla T, P, E, Z, Y.\n"
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr "%s: plik się za bardzo zmniejszył"
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, c-format
 msgid "%s: number of bytes is too large"
 msgstr "%s: ilość bajtów jest za duża"
 
-#: src/head.c:440
-#, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr "%s: nie można ustawić pozycji wyjściowej"
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr "%s: nie można ustawić pozycji %s"
 
-#: src/head.c:673
-#, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "%s: błąd przy ustawianiu wskaźnika do pliku"
-
-#: src/head.c:798
+#: src/head.c:423 src/tail.c:457
 #, c-format
-msgid "cannot reposition file pointer for %s"
-msgstr "nie można zmienić pozycji w pliku %s"
+msgid "%s: cannot seek to relative offset %s"
+msgstr "%s: nie można ustawić pozycji względnej %s"
 
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr "%s: %s jest tak duża, że nie może zostać wyrażona"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr "liczba linii"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr "liczba bajtów"
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr "błędna liczba linii"
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr "błędna liczba bajtów"
 
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, c-format
 msgid "invalid trailing option -- %c"
 msgstr "błędna opcja na końcu -- %c"
@@ -4794,42 +4879,49 @@ msgid "cannot determine hostname"
 msgstr "uzyskanie nazwy systemu jest niemożliwe"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr "Arnold Robbins"
 
-#: src/id.c:81
+#: src/id.c:84
 #, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
+msgid "Usage: %s [OPTION]... [USER]\n"
 msgstr "Składnia: %s [OPCJA]... [UŻYTKOWNIK]\n"
 
-#: src/id.c:82
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
 msgstr ""
-"Wyświetla informację o UŻYTKOWNIKU lub o aktualnym użytkowniku albo\n"
-"o bieżącym użytkowniku, jeżeli nie podano identyfikatora.\n"
+"Wyświetla informację o podanym UŻYTKOWNIKU albo o bieżącym użytkowniku,\n"
+"jeżeli nie podano identyfikatora.\n"
 "\n"
-"  -a              ignorowane, dla zachowania kompatybilności z innymi "
+
+#: src/id.c:90
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
+msgstr ""
+"  -a             ignorowane, dla zachowania kompatybilności z innymi "
 "wersjami\n"
-"  -Z, --context   wypisanie tylko kontekstu bezpieczeństwa bieżącego "
-"użytkownika\n"
-"  -g, --group     wypisanie tylko efektywnego identyfikatora grupy\n"
-"  -G, --groups    wypisanie pełnej listy grup\n"
-"  -n, --name      wypisanie nazw zamiast numerów, dla -ugG\n"
-"  -r, --real      wypisanie rzeczywistego ID zamiast efektywnego, dla -ugG\n"
-"  -u, --user      wypisanie tylko efektywnego identyfikatora użytkownika\n"
+"  -Z, --context  wypisanie tylko kontekstu bezpieczeństwa zadania\n"
+"  -g, --group    wypisanie tylko efektywnego identyfikatora grupy\n"
+"  -G, --groups   wypisanie pełnej listy grup\n"
+"  -n, --name     wypisanie nazw zamiast numerów, dla -ugG\n"
+"  -r, --real     wypisanie rzeczywistego ID zamiast efektywnego, dla -ugG\n"
+"  -u, --user     wypisanie tylko efektywnego identyfikatora użytkownika\n"
+"  -z, --zero     oddzielenie danych znakami NUL zamiast odstępami;\n"
+"                   niedozwolone w domyślnym formacie\n"
 
-#: src/id.c:96
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
@@ -4838,119 +4930,131 @@ msgstr ""
 "Bez żadnych OPCJI wyświetla zestaw użytecznych informacji, które udało się\n"
 "zidentyfikować.\n"
 
-#: src/id.c:140
+#: src/id.c:151
+#, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr ""
+"opcja --context (-Z) działa tylko z jądrem systemu z włączonym SELinuksem "
+"lub SMACK-iem."
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr ""
 "opcja --context (-Z) działa tylko z jądrem systemu z włączonym SELinuksem."
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr ""
 "nie można wypisać kontekstu bezpieczeństwa gdy został podany użytkownik"
 
-#: src/id.c:178
+#: src/id.c:198
 #, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr "wybrano więcej niż jedną z wyłączających się opcji"
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr ""
 "nie da się wypisać tylko nazw lub rzeczywistych ID w domyślnym formacie"
 
-#: src/id.c:199
+#: src/id.c:209
+#, c-format
+msgid "option --zero not permitted in default format"
+msgstr "opcja --zero nie jest dozwolona w domyślnym formacie"
+
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
 msgstr "nie można odczytać kontekstu bezpieczeństwa procesu"
 
-#: src/id.c:224
+#: src/id.c:265
 #, c-format
 msgid "cannot get effective UID"
 msgstr "nie można ustalić efektywnego identyfikatora użytkownika"
 
-#: src/id.c:311
+#: src/id.c:354
 #, c-format
 msgid "cannot find name for user ID %s"
 msgstr "nie można znaleźć nazwy użytkownika o ID %s"
 
-#: src/id.c:329
+#: src/id.c:372
 #, c-format
 msgid "uid=%s"
 msgstr "uid=%s"
 
-#: src/id.c:334
+#: src/id.c:377
 #, c-format
 msgid " gid=%s"
 msgstr " gid=%s"
 
-#: src/id.c:341
+#: src/id.c:384
 #, c-format
 msgid " euid=%s"
 msgstr " euid=%s"
 
-#: src/id.c:349
+#: src/id.c:392
 #, c-format
 msgid " egid=%s"
 msgstr " egid=%s"
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr " grupy="
 
-#: src/id.c:393
+#: src/id.c:437
 #, c-format
 msgid " context=%s"
 msgstr " kontekst=%s"
 
-#: src/install.c:373
+#: src/install.c:376
 #, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr "uwaga: %s: nie udało się zmienić kontekstu na %s"
 
-#: src/install.c:414
+#: src/install.c:417
 #, c-format
 msgid "creating directory %s"
 msgstr "tworzenie katalogu %s"
 
-#: src/install.c:482
+#: src/install.c:485
 #, c-format
 msgid "cannot change ownership of %s"
 msgstr "nie można zmienić właściciela na %s"
 
-#: src/install.c:506
+#: src/install.c:509
 #, c-format
 msgid "cannot set time stamps for %s"
 msgstr "nie można ustawić czasów %s"
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, c-format
 msgid "fork system call failed"
 msgstr "nie powiodło się wywołanie systemowe fork"
 
-#: src/install.c:531
+#: src/install.c:535
 #, c-format
 msgid "cannot run %s"
 msgstr "nie udało się uruchomić programu %s"
 
-#: src/install.c:535
+#: src/install.c:539
 #, c-format
 msgid "waiting for strip"
 msgstr "czekanie na program strip"
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr "program strip zakończony nieprawidłowo"
 
-#: src/install.c:558
+#: src/install.c:565
 #, c-format
 msgid "invalid user %s"
 msgstr "błędny użytkownik %s"
 
-#: src/install.c:594
+#: src/install.c:601
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -4963,7 +5067,7 @@ msgstr ""
 "    albo: %s [OPCJA]... -t KATALOG ŹRóD�O...\n"
 "    albo: %s [OPCJA]... -d KATALOG...\n"
 
-#: src/install.c:601
+#: src/install.c:608
 msgid ""
 "\n"
 "This install program copies files (often just compiled) into destination\n"
@@ -4992,7 +5096,7 @@ msgstr ""
 "W czwartym formacie tworzone są wszystkie katalogi składowe podanej ścieżki\n"
 "KATALOGU/ÓW.\n"
 
-#: src/install.c:615
+#: src/install.c:622
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
 "  -b                  like --backup but does not accept an argument\n"
@@ -5013,7 +5117,7 @@ msgstr ""
 "katalogów;\n"
 "                        tworzenie katalogów składowych podanych katalogów\n"
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -5031,7 +5135,7 @@ msgstr ""
 "xr-x\n"
 "  -o, --owner=W�AŚCICIEL   ustawienie W�AŚCICIELA (tylko super-user)\n"
 
-#: src/install.c:631
+#: src/install.c:638
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
 "files\n"
@@ -5053,17 +5157,27 @@ msgstr ""
 "  -T, --no-target-directory  traktowanie CELU jak zwykłego pliku\n"
 "  -v, --verbose       wypisanie nazwy każdego tworzonego katalogu\n"
 
-#: src/install.c:641
+#: src/install.c:648
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
 "      --preserve-context  zachowanie kontekstu bezpieczeństwa SELinux\n"
-"  -Z, --context=KONTEKST  ustawienie kontekstu bezpieczeństwa SELinux dla\n"
-"                          plików i katalogów\n"
+"  -Z                      ustawienie kontekstu bezpieczeństwa podanego\n"
+"                            pliku jako typu domyślnego\n"
+"      --context=[KONTEKST]  jak -Z, ale jeżeli jest podany KONTEKST,\n"
+"                            ustawienie kontekstu bezpieczeństwa SELinux\n"
+"                            albo SMACK jako KONTEKSTU\n"
 
-#: src/install.c:859
+#: src/install.c:696 src/unlink.c:86
+#, c-format
+msgid "cannot unlink %s"
+msgstr "nie można usunąć %s"
+
+#: src/install.c:877
 #, c-format
 msgid ""
 "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
@@ -5071,51 +5185,39 @@ msgstr ""
 "UWAGA: zignorowana opcja --preserve-context, to jądro nie ma włączonego "
 "SELinuksa"
 
-#: src/install.c:869
-#, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
-msgstr ""
-"UWAGA: zignorowana opcja --context (-Z), to jądro nie ma włączonego SELinuksa"
-
-#: src/install.c:886
+#: src/install.c:917
 #, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr "opcja obcinania (strip) nie może być użyta przy instalowaniu katalogu"
 
-#: src/install.c:889
+#: src/install.c:920
 #, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr "katalog docelowy nie może być podany przy instalowaniu katalogu"
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr ""
-"nie można wymusić ustawienia kontekstu pliku docelowego na %s i go zachować"
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, c-format
 msgid "invalid mode %s"
 msgstr "błędne uprawnienia %s"
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr ""
 "UWAGA: opcja --strip-program została zignorowana, bo nie została podana "
 "opcja -s"
 
-#: src/install.c:959
+#: src/install.c:1001
 #, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr "opcje --compare (-C) i --preserve-timestamps wzajemnie siÄ™ wykluczajÄ…"
 
-#: src/install.c:966
+#: src/install.c:1008
 #, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr "opcje --compare (-C) i --strip wzajemnie siÄ™ wykluczajÄ…"
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -5129,7 +5231,7 @@ msgstr ""
 msgid "Mike Haertel"
 msgstr "Mike Haertel"
 
-#: src/join.c:191
+#: src/join.c:195
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
 "standard output.  The default join field is the first, delimited\n"
@@ -5149,7 +5251,7 @@ msgstr ""
 "                      PLIKOWI2\n"
 "  -e PUSTE          zamiana brakujących pól na wejściu na PUSTE\n"
 
-#: src/join.c:200
+#: src/join.c:204
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
 "  -j FIELD          equivalent to '-1 FIELD -2 FIELD'\n"
@@ -5163,7 +5265,7 @@ msgstr ""
 "  -o FORMAT         zachowanie FORMATU przy tworzeniu linii wyjściowej\n"
 "  -t ZNAK           użycie ZNAKU jako separatora pól linii wej. i wyj.\n"
 
-#: src/join.c:206
+#: src/join.c:210
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
 "  -1 FIELD          join on this FIELD of file 1\n"
@@ -5186,7 +5288,13 @@ msgstr ""
 "  --header          traktowanie pierwszych linii plików jako nagłówków, bez\n"
 "                      prób ich sparowania\n"
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr ""
+"  -z, --zero-terminated     separatorem linii jest znak NUL, nie znak nowej\n"
+"                              linii\n"
+
+#: src/join.c:225
 msgid ""
 "\n"
 "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n"
@@ -5222,47 +5330,47 @@ msgstr ""
 "Jeżeli dane wejściowe nie są posortowane i niektóre linie nie mogą być\n"
 "połączone, zostanie wypisane ostrzeżenie.\n"
 
-#: src/join.c:403
+#: src/join.c:410
 #, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
 msgstr "%s:%<PRIuMAX>: nie jest posortowany: %.*s"
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, c-format
 msgid "invalid field number: %s"
 msgstr "błędny numer pola: %s"
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, c-format
 msgid "invalid field specifier: %s"
 msgstr "błędna specyfikacja pola: %s"
 
-#: src/join.c:877
+#: src/join.c:884
 #, c-format
 msgid "invalid file number in field spec: %s"
 msgstr "błędny numer pliku w specyfikacji pola: %s"
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr "niekompatybilne pola Å‚Ä…czenia %lu, %lu"
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr "konflikt napisów zastępujących puste pola"
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, c-format
 msgid "multi-character tab %s"
 msgstr "wieloznakowy TAB %s"
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr "niekompatybilne TABy"
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr "oba pliki nie mogą być standardowym wejściem"
@@ -5381,47 +5489,47 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr "nie można utworzyć dowiązania %s do %s"
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr "%s: nie można zrobić dowiązania zwykłego do katalogu"
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, c-format
 msgid "%s: cannot overwrite directory"
 msgstr "%s: nie można zamazać katalogu"
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
 msgstr "%s: zastąpić %s? "
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, c-format
 msgid "failed to create symbolic link %s"
 msgstr "nie udało się utworzyć dowiązania symbolicznego %s"
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr "nie udało się utworzyć dowiązania symbolicznego %s -> %s"
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr "nie udało się utworzyć dowiązania zwykłego do %.0s%s"
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, c-format
 msgid "failed to create hard link %s"
 msgstr "nie udało się utworzyć dowiązania zwykłego %s"
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, c-format
 msgid "failed to create hard link %s => %s"
 msgstr "nie udało się utworzyć dowiązania zwykłego %s => %s"
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -5434,7 +5542,7 @@ msgstr ""
 "    albo: %s [OPCJA]... CEL... KATALOG        (format trzeci)\n"
 "    albo: %s [OPCJA]... -t KATALOG... CEL...  (format czwarty)\n"
 
-#: src/ln.c:381
+#: src/ln.c:398
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
 "In the 2nd form, create a link to TARGET in the current directory.\n"
@@ -5457,7 +5565,7 @@ msgstr ""
 "dowiązanie ze ścieżką względną jest interpretowane względem katalogu, w\n"
 "którym się znajduje.\n"
 
-#: src/ln.c:394
+#: src/ln.c:411
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
 "file\n"
@@ -5478,7 +5586,7 @@ msgstr ""
 "administratora)\n"
 "  -f, --force                 skasowanie istniejących CELÓW bez pytania\n"
 
-#: src/ln.c:402
+#: src/ln.c:419
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
 "  -L, --logical               dereference TARGETs that are symbolic links\n"
@@ -5501,7 +5609,7 @@ msgstr ""
 "  -s, --symbolic              tworzenie dowiązań symbolicznych zamiast "
 "zwykłych\n"
 
-#: src/ln.c:411
+#: src/ln.c:428
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
 "  -t, --target-directory=DIRECTORY  specify the DIRECTORY in which to "
@@ -5518,7 +5626,7 @@ msgstr ""
 "                                zwykłego pliku\n"
 "  -v, --verbose               wypisanie nazw plików przed dowiązaniem\n"
 
-#: src/ln.c:433
+#: src/ln.c:450
 #, c-format
 msgid ""
 "\n"
@@ -5530,13 +5638,13 @@ msgstr ""
 "przypadku ostatnia podana opcja wpływa na zachowanie programu kiedy CELEM\n"
 "jest dowiązanie symboliczne, domyślnie jest to %s.\n"
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr ""
 "nie można używać równocześnie --target-directory i --no-target-directory"
 
-#: src/ln.c:588
+#: src/ln.c:605
 #, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr "nie można użyć --relative bez --symbolic"
@@ -5571,7 +5679,7 @@ msgstr "brak nazwy użytkownika"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 msgid "%b %e  %Y"
 msgstr "%Y-%m-%d "
 
@@ -5582,94 +5690,94 @@ msgstr "%Y-%m-%d "
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 msgid "%b %e %H:%M"
 msgstr "%m-%d %H:%M"
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr "ignoruję błędny rozmiar zmiennej środowiskowej QUOTING_STYLE: %s"
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr "ignoruję błędną długość w zmiennej środowiskowej COLUMNS: %s"
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr "ignoruję błędny rozmiar tab-a w zmiennej środowiska TABSIZE: %s"
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, c-format
 msgid "invalid line width: %s"
 msgstr "błędna szerokość linii: %s"
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, c-format
 msgid "invalid tab size: %s"
 msgstr "błędny rozmiar TAB-a: %s"
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, c-format
 msgid "invalid time style format %s"
 msgstr "błędny format stylu czasu %s"
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 msgid "Valid arguments are:\n"
 msgstr "Prawidłowe argumenty to:\n"
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr "  - +FORMAT (np., +%H:%M) żeby podać format w stylu „date�\n"
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr "błąd inicjalizacji nazw miesięcy"
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, c-format
 msgid "unrecognized prefix: %s"
 msgstr "nierozpoznany prefiks: %s"
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr "niezrozumiała wartość zmiennej środowiska LS_COLORS"
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, c-format
 msgid "cannot open directory %s"
 msgstr "nie można otworzyć katalogu %s"
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, c-format
 msgid "cannot determine device and inode of %s"
 msgstr "nie można ustalić urządzenia i i-węzła %s"
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, c-format
 msgid "%s: not listing already-listed directory"
 msgstr "%s: nie będzie wylistowany katalog już wylistowany poprzednio"
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, c-format
 msgid "reading directory %s"
 msgstr "czytanie katalogu %s"
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, c-format
 msgid "closing directory %s"
 msgstr "zamykanie katalogu %s"
 
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, c-format
 msgid "cannot compare file names %s and %s"
 msgstr "nie można porównać nazw plików %s i %s"
 
-#: src/ls.c:4721
+#: src/ls.c:4781
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
 "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n"
@@ -5677,7 +5785,7 @@ msgstr ""
 "Wypisanie informacji o PLIKACH (domyślnie w katalogu bieżącym). Sortowane\n"
 "alfabetyczne, jeżeli nie jest podana żadna z opcji -cftuvSUX ani --sort.\n"
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
 "  -A, --almost-all           do not list implied . and ..\n"
@@ -5692,53 +5800,49 @@ msgstr ""
 "stylu\n"
 "                               języka C, np. \\012)\n"
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
-"      --block-size=ROZMIAR   Skala rozmiarów, np. „--block-size=M� powoduje\n"
+"      --block-size=ROZMIAR   skala rozmiarów; np. „--block-size=M� powoduje\n"
 "                               wypisanie rozmiarów w jednostkach po 1048576\n"
-"                               bajtów.\n"
-"                               Zobacz infomacje o formacie ROZMIARÓW "
+"                               bajtów;\n"
+"                               zobacz infomacje o formacie ROZMIARÓW "
 "poniżej.\n"
 "  -B, --ignore-backups       bez pokazania plików kończących się na ~\n"
 "  -c                         z -lt: sortowanie wg i wypisanie ctime (czasu\n"
-"                               ostatniej modyfikacji danych o pliku)\n"
-"                               z -l: wypisanie ctime i sortowanie wg nazw\n"
+"                               ostatniej modyfikacji danych o pliku);\n"
+"                               z -l: wypisanie ctime i sortowanie wg nazw;\n"
 "                               w przeciwnym przypadku: sortowanie wg ctime,\n"
 "                               najnowsze pliki na poczÄ…tku\n"
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 "  -C                         wypisanie plików w kolumnach\n"
-"      --color[=GDY]          kolorowanie informacji. GDY to domyslnie "
-"„always�\n"
-"                               (zawsze), może być też „never� (nigdy), albo\n"
-"                               „auto� (automatyczne)\n"
-"  -d, --directory            pokazanie katalogów zamiast ich zawartości, "
-"bez\n"
-"                               rozwiązywania dowiązań symbolicznych\n"
+"      --color[=GDY]          kolorowanie informacji. GDY może być „never�\n"
+"                             (nigdy), „auto� (automatycznie) albo „always\n"
+"                             (zawsze, domyślnie); więcej informacji poniżej\n"
+"  -d, --directory            pokazanie katalogów zamiast ich zawartości\n"
 "  -D, --dired                dane wyjściowe dla trybu dired Emacsa\n"
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
 "  -F, --classify             append indicator (one of */=>@|) to entries\n"
@@ -5760,15 +5864,16 @@ msgstr ""
 "                               kolumnach) -C\n"
 "      --full-time            jak -l --time-style=full-iso\n"
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr "  -g                         jak -l, ale nie pokazuje właściciela\n"
 
-#: src/ls.c:4763
+#: src/ls.c:4823
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 "      --group-directories-first\n"
@@ -5776,27 +5881,26 @@ msgstr ""
 "                               ta opcja może być uzupełniona opcją --sort,\n"
 "                               ale wyłącza ją użycie opcji --sort=none (-U)\n"
 
-#: src/ls.c:4769
+#: src/ls.c:4829
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
 "  -G, --no-group             bez pokazania informacji o grupach\n"
-"  -h, --human-readable       z opcjÄ… -l podaje rozmiary w formacie "
-"czytelnym\n"
-"                               dla ludzi (np. 1K 234M 2G)\n"
+"  -h, --human-readable       z opcjÄ… -l lub -s podaje rozmiary w formacie\n"
+"                               czytelnym dla ludzi (np. 1K 234M 2G)\n"
 "      --si                   podobnie, ale z użyciem potęg 1000, nie 1024\n"
 
-#: src/ls.c:4775
+#: src/ls.c:4835
 msgid ""
 "  -H, --dereference-command-line\n"
 "                             follow symbolic links listed on the command "
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
@@ -5810,7 +5914,7 @@ msgstr ""
 "      --hide=WZÓR            bez wypisywania nazw pasujących do WZORU\n"
 "                               (wyłączane przez -a albo -A)\n"
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
 "names:\n"
@@ -5819,7 +5923,7 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 "      --indicator-style=S�OWO  dodanie wskaźników typów plików w stylu "
 "S�OWO:\n"
@@ -5828,9 +5932,10 @@ msgstr ""
 "  -i, --inode                pokazywanie numeru i-węzła każdego pliku\n"
 "  -I, --ignore=WZÓR          bez pokazywania plików pasujących do shellowego "
 "WZORU\n"
-"  -k, --kibibytes            użycie bloków o rozmiarze 1024 bajtów\n"
+"  -k, --kibibytes            zużycie dysku w blokach o rozmiarze 1024 "
+"bajtów\n"
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -5846,7 +5951,7 @@ msgstr ""
 "  -m                         pisanie do pełnej szerokości, oddzielanie "
 "przecinkami\n"
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -5862,11 +5967,11 @@ msgstr ""
 "  -o                         jak -l, ale bez informacji o grupie\n"
 "  -p, --indicator-style=slash  dodanie / do nazw katalogów\n"
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -5884,7 +5989,7 @@ msgstr ""
 "                               literal, locale, shell, shell-always, c, "
 "escape\n"
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
 "  -R, --recursive            list subdirectories recursively\n"
@@ -5896,63 +6001,71 @@ msgstr ""
 "  -s, --size                 wypisanie liczby bloków zajętych przez każdy "
 "plik\n"
 
-#: src/ls.c:4825
+#: src/ls.c:4886
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 "  -S                         sortowanie według rozmiaru\n"
-"      --sort=S�OWO           sortowanie wg S�OWA zamiast wg nazw: none -U\n"
-"                             (wcale), extension -X (rozszerzenia), size -S\n"
-"                             (rozmiaru), time -t (czasu), version -v "
-"(wersji)\n"
-"      --time=S�OWO           z opcją -l: pokazanie czasu określonego S�OWEM, "
-"a\n"
-"                             nie czasu modyfikacji: czas odczytu - atime,\n"
-"                             access, use - -u, czas zmiany informacji o "
-"pliku\n"
-"                             - ctime, status - -c; użycie podanego czasu do\n"
-"                             sortowania gdy podano --sort=time\n"
-
-#: src/ls.c:4835
+"      --sort=S�OWO           sortowanie wg S�OWA zamiast wg nazw: none (-U,\n"
+"                               wcale), size (-S, rozmiaru), time (-t, "
+"czasu),\n"
+"                               version (-v, wersji), extension (-X,\n"
+"                               rozszerzenia)\n"
+"      --time=S�OWO           z opcją -l - zamiast domyslnego czasu "
+"modyfikacji\n"
+"                               pokazanie czasu określonego S�OWEM "
+"domyślnie:\n"
+"                               czas odczytu - atime, access, use (-u),\n"
+"                               czas zmiany informacji o pliku - ctime,\n"
+"                               status (-c); także użycie podanego czasu do\n"
+"                               sortowania gdy podano --sort=time\n"
+
+#: src/ls.c:4896
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
 msgstr ""
 "      --time-style=STYL      z opcją -l: pokazanie czasu przy użyciu STYLU:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT\n"
-"                             FORMAT jest interpretowany jak w „date�. "
-"Jeżeli\n"
-"                             FORMAT to FORMAT1<znak nowej linii>FORMAT2,\n"
-"                             FORMAT1 dotyczy dawniejszych plików, FORMAT2\n"
-"                             nowszych. Jeżeli STYL zaczyna się od „posix-�,\n"
-"                             STYL jest używany tylko dla locale nie POSIX\n"
+"                               full-iso, long-iso, iso, locale albo "
+"+FORMAT;\n"
+"                               FORMAT jest interpretowany jak w „date�; "
+"jeżeli\n"
+"                               FORMAT to FORMAT1<znak nowej linii>FORMAT2,\n"
+"                               FORMAT1 dotyczy dawniejszych plików, FORMAT2\n"
+"                               nowszych; jeżeli STYL zaczyna się od "
+"„posix-�,\n"
+"                               STYL jest używany tylko dla locale nie POSIX\n"
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 msgid ""
 "  -t                         sort by modification time, newest first\n"
 "  -T, --tabsize=COLS         assume tab stops at each COLS instead of 8\n"
 msgstr ""
 "  -t                         sortowanie wg czasu modyfikacji, najnowsze\n"
 "                                na poczÄ…tku\n"
-"  -T, --tabsize=KOLUMNA      TAB co tyle KOLUMN, zamiast co 8\n"
+"  -T, --tabsize=KOLUMNA      TAB co tyle KOLUMN zamiast co 8\n"
 
-#: src/ls.c:4848
+#: src/ls.c:4912
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
@@ -5966,13 +6079,12 @@ msgstr ""
 "  -v                         sortowanie wg liczb (numerów wersji) zawartych\n"
 "                               w nazwach plików\n"
 
-#: src/ls.c:4855
+#: src/ls.c:4919
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 "  -w, --width=KOLUMNY        przyjęcie takiej szerokości ekranu zamiast\n"
@@ -5980,10 +6092,11 @@ msgstr ""
 "  -x                         wypisanie nazw w kolejnych liniach, nie "
 "kolumnach\n"
 "  -X                         sortowanie alfabetyczne wg rozszerzeń\n"
-"  -Z, --context              wypisanie kontekstu bezpieczeństwa SELinuksa\n"
-"  -1                         listowanie po jednym pliku w linii\n"
+"  -Z, --context              wypisanie kontekstu bezpieczeństwa pliku/"
+"plików\n"
+"  -1                         ypisywanie po jednym pliku w linii\n"
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -5998,7 +6111,7 @@ msgstr ""
 "środowiskowa LS_COLORS może zmienić te ustawienia. Można ją ustawić\n"
 "przy pomocy polecenia dircolors.\n"
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -6075,9 +6188,11 @@ msgstr ""
 #: src/md5sum.c:195
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
@@ -6087,18 +6202,14 @@ msgstr ""
 "                         zweryfikowanego pliku\n"
 "      --status         bez wypisywania niczego, kod wyjścia przekazuje "
 "wynik\n"
+"      --strict         zakończenie z niezerowym kodem przy sprawdzaniu\n"
+"                         niepoprawnie sformatowanych sprawdzanych liniach\n"
+"                         z sumami kontrolnymi\n"
 "  -w, --warn           ostrzeganie o niepoprawnie sformatowanych liniach "
 "sum\n"
 "\n"
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-"      --strict         z --check będzie zwracany niezerowy status wyjścia\n"
-"                         jeżeli dane wejściowe są błędne\n"
-
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, c-format
 msgid ""
 "\n"
@@ -6113,35 +6224,35 @@ msgstr ""
 "wypisanie linii z sumą kontrolną, znaku wskazującego typ („*� - binarny,\n"
 "spacja - tekstowy) i nazwy każdego PLIKU.\n"
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, c-format
 msgid "%s: too many checksum lines"
 msgstr "%s: za dużo linii z sumami kontrolnymi"
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr "%s: %<PRIuMAX>: nieprawidłowo sformatowana linia sumy kontrolnej %s"
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr "%s: NIEPOWODZENIE otwarcia lub odczytu\n"
 
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr "NIEPOWODZENIE"
 
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr "DOBRZE"
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr "%s: brak poprawnie sformatowanych linii sumy kontrolnej %s"
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
@@ -6149,7 +6260,7 @@ msgstr[0] "UWAGA: %<PRIuMAX> linia jest nieprawidłowo sformatowana"
 msgstr[1] "UWAGA: %<PRIuMAX> linie są nieprawidłowo sformatowane"
 msgstr[2] "UWAGA: %<PRIuMAX> linii jest nieprawidłowo sformatowanych"
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
@@ -6157,7 +6268,7 @@ msgstr[0] "UWAGA: %<PRIuMAX> podany plik nie mógł być odczytany"
 msgstr[1] "UWAGA: %<PRIuMAX> podane pliki nie mogły być odczytane"
 msgstr[2] "UWAGA: %<PRIuMAX> podanych plików nie mogło być odczytane"
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
@@ -6165,17 +6276,17 @@ msgstr[0] "UWAGA: %<PRIuMAX> policzona suma siÄ™ NIE zgadza"
 msgstr[1] "UWAGA: %<PRIuMAX> policzone sumy siÄ™ NIE zgadzajÄ…"
 msgstr[2] "UWAGA: %<PRIuMAX> policzonych sum siÄ™ NIE zgadza"
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
 msgstr "--tag nie może być łączony z trybem --text"
 
-#: src/md5sum.c:766
+#: src/md5sum.c:770
 #, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr "opcja --tag nie ma znaczenia przy weryfikacji sum kontrolnych"
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
@@ -6183,102 +6294,134 @@ msgstr ""
 "opcje --binary i --text nie majÄ… znaczenia przy weryfikacji sum\n"
 "kontrolnych"
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr "opcja --status ma znaczenie tylko przy weryfikacji sum kontrolnych"
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr "opcja --warn ma znaczenie tylko przy weryfikacji sum kontrolnych"
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr "opcja --quiet ma znaczenie tylko przy weryfikacji sum kontrolnych"
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr "opcja --strict ma znaczenie tylko przy weryfikacji sum kontrolnych"
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr "Składnia: %s [OPCJA]... KATALOG...\n"
 
-#: src/mkdir.c:57
+#: src/mkdir.c:59
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
 msgstr "Utworzenie KATALOGU/ÓW, jeżeli jeszcze nie istnieją.\n"
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 "  -m, --mode=UPRAWN ustawienie uprawnień (jak w chmod), nie a=rwx - umask\n"
 "  -p, --parents     bez błędu gdy istnieje, utworzenie całej ścieżki "
 "katalogów\n"
 "  -v, --verbose     wypisanie komunikatu o każdym utworzonym katalogu\n"
-"  -Z, --context=KONT  ustawienie kontekstu bezpieczeństwa SELinuksa dla\n"
-"                      każdego tworzonego katalogu\n"
 
-#: src/mkdir.c:168
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+"  -Z                   ustawienie kontekstu bezpieczeństwa podanego\n"
+"                         pliku jako typu domyślnego\n"
+"      --context=[KONTEKST]  jak -Z, ale jeżeli jest podany KONTEKST,\n"
+"                         ustawienie kontekstu bezpieczeństwa SELinux\n"
+"                         albo SMACK jako KONTEKSTU\n"
+
+#: src/mkdir.c:127 src/mkdir.c:172
+#, c-format
+msgid "failed to set default creation context for %s"
+msgstr "nie udało się ustawić domyślnego kontekstu tworzenia dla %s"
+
+#: src/mkdir.c:191
+#, c-format
+msgid "failed to restore context for %s"
+msgstr "nie udało się odtworzyć kontekstu dla %s"
+
+#: src/mkdir.c:231
 #, c-format
 msgid "created directory %s"
 msgstr "utworzony katalog %s"
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr ""
+"uwaga: zignorowana opcja --context; wymaga jądra z włączonym SELinuksem lub "
+"SMACK-iem."
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr "Składnia: %s [OPCJA]... NAZWA...\n"
 
-#: src/mkfifo.c:52
+#: src/mkfifo.c:54
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
 msgstr "Tworzenie nazwanych potoków (pipes, FIFOs) o podanych NAZWACH.\n"
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
 msgstr "  -m, --mode=UPRAWN  ustawienie UPRAWNIEŃ zamiast a=rw - umask\n"
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
-"  -Z, --context=KONT ustawienie kontekstu bezpieczeństwa SELinux dla każdej\n"
-"                     NAZWY jako KONT\n"
+"  -Z                   ustawienie kontekstu bezpieczeństwa jako typu\n"
+"                         domyślnego\n"
+"      --context=[KONTEKST]  jak -Z, ale jeżeli jest podany KONTEKST,\n"
+"                         ustawienie kontekstu bezpieczeństwa SELinux\n"
+"                         albo SMACK jako KONTEKSTU\n"
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, c-format
 msgid "invalid mode"
 msgstr "błędne uprawnienia"
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr "mogą być podane ylko bity uprawnień"
 
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
+#, c-format
+msgid "cannot set permissions of %s"
+msgstr "nie można ustawić uprawnień do %s"
+
+#: src/mknod.c:54
 #, c-format
 msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr "Składnia: %s [OPCJA]... NAZWA TYP [WIĘKSZY MNIEJSZY]\n"
 
-#: src/mknod.c:54
+#: src/mknod.c:56
 msgid "Create the special file NAME of the given TYPE.\n"
 msgstr "Utworzenie pliku specjalnego o podanej NAZWIE i TYPIE.\n"
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr ""
-"  -Z, --context=KONT ustawienie kontekstu bezpieczeństwa SELinux dla\n"
-"                     NAZWY jako KONT\n"
-
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -6293,7 +6436,7 @@ msgstr ""
 "szesnastkowa. Jeżeli zaczyna się od 0 - jako ósemkowa. W innych wypadkach -\n"
 "jako dzięsiątkowa. TYP może być:\n"
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 msgid ""
 "\n"
 "  b      create a block (buffered) special file\n"
@@ -6305,56 +6448,56 @@ msgstr ""
 "  c, u   specjalny plik znakowy (niebuforowany)\n"
 "  p      potok (FIFO)\n"
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 msgid "Special files require major and minor device numbers."
 msgstr ""
 "Plik specjalny powinien mieć podane większy i mniejszy numer urządzenia"
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 msgid "Fifos do not have major and minor device numbers."
 msgstr "Potoki nie mają numerów większych ani mniejszych."
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, c-format
 msgid "block special files not supported"
 msgstr "specjalne pliki blokowe nie są obsługiwane"
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, c-format
 msgid "character special files not supported"
 msgstr "specjalne pliki znakowe nie są obsługiwane"
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, c-format
 msgid "invalid major device number %s"
 msgstr "błędny większy numer urządzenia %s"
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, c-format
 msgid "invalid minor device number %s"
 msgstr "błędny mniejszy numer urządzenia %s"
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, c-format
 msgid "invalid device %s %s"
 msgstr "błędne urządzenie %s %s"
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, c-format
 msgid "invalid device type %s"
 msgstr "błędne typ urządzenia %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr "Eric Blake"
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr "Składnia: %s [OPCJA]... [WZORZEC]\n"
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
 "TEMPLATE must contain at least 3 consecutive 'X's in last component.\n"
@@ -6368,7 +6511,7 @@ msgstr ""
 "domyślna\n"
 "wartość --tmpdir .\n"
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
@@ -6376,7 +6519,7 @@ msgstr ""
 "uprawnienia\n"
 "umask.\n"
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
@@ -6388,104 +6531,95 @@ msgstr ""
 "  -q, --quiet         wyłączenie komunikatów o błędach tworzenia\n"
 "                        plików/katalogów\n"
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
-"      --suffix=PRZYR  dodanie PRZYROSTKA do WZORCA. PRZYROSTEK nie może\n"
-"                        zawierać ukośnika. Ta opcja jest domyślnie używana\n"
-"                        gdy WZORZEC nie kończy się znakiem X.\n"
+"      --suffix=PRZYR  dodanie PRZYROSTKA do WZORCA; PRZYROSTEK nie może\n"
+"                        zawierać ukośnika; ta opcja jest domyślnie używana\n"
+"                        gdy WZORZEC nie kończy się znakiem X\n"
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
-"  --tmpdir[=KATALOG]  WZORZEC będzie interpretowany względem KATALOGU. "
-"Jeżeli\n"
-"                        KATALOG nie jest podany, zostanie użyty $TMPDIR, a\n"
-"                        jeżeli ta zmienna nie jest ustawiona - /tmp. Jeżeli\n"
-"                        jest użyta ta opcja, WZORZEC nie może być ścieżką\n"
-"                        bezwzględną. Inaczej niż przy użyciu opcji -t, "
-"WZORZEC\n"
-"                        może zawierać ukośniki, ale mktemp i tak tworzy "
-"tylko\n"
-"                        ostatni składnik nazwy.\n"
+"  -p KATALOG, --tmpdir[=KATALOG]  WZORZEC będzie interpretowany względem\n"
+"                          KATALOGU; jeżeli KATALOG nie jest podany, "
+"zostanie\n"
+"                          użyty $TMPDIR, a jeżeli ta zmienna nie jest\n"
+"                          ustawiona - /tmp; jeżeli jest użyta ta opcja,\n"
+"                          WZORZEC nie może być ścieżką bezwzględną; inaczej\n"
+"                          niż przy użyciu opcji -t, WZORZEC może zawierać\n"
+"                          ukośniki, ale mktemp i tak tworzy tylko ostatni\n"
+"                          składnik nazwy\n"
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
 msgstr ""
-"  -p KATALOG          użycie KATALOGU jako przedrostka, włącza opcję -t\n"
-"                        [przestarzałą]\n"
 "  -t                  interpretowanie WZORCA jako nazwy podanej względem\n"
 "                        katalogu $TMPDIR, a jeżeli nie jest ustawiony,\n"
 "                        katalogu podanego przez opcjÄ™ -p, w innym przypadku\n"
 "                        - /tmp [przestarzałe]\n"
 
-#: src/mktemp.c:223
-#, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr "nie udało się przekierować standardowego wyjścia błędów do /dev/null"
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, c-format
 msgid "too many templates"
 msgstr "za dużo wzorców"
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr "przy ożyciu opcjia --suffix wzorzec %s musi kończyć się znakiem X"
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr "błędny przyrostek %s - zawiera separator nazw podkatalogów"
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr "za mało X-ów we wzorcu %s"
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr "błędny wzorzec %s - zawiera separator nazw podkatalogów"
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr ""
 "błędny wzorzec %s; nie może być ścieżką bezwzględną jeżeli została użyta "
 "opcja --tmpdir"
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, c-format
 msgid "failed to create directory via template %s"
 msgstr "nie udało się utworzyć katalogu przy pomocy wzorca %s"
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, c-format
 msgid "failed to create file via template %s"
 msgstr "nie udało się utworzyć pliki przy pomocy wzorca %s"
 
-#: src/mv.c:292
+#: src/mv.c:294
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 "Przemianowanie ŹRÓD�A na CEL albo przeniesienie jednego lub wielu ŹRÓDE�\n"
 "do KATALOGU.\n"
 
-#: src/mv.c:298
+#: src/mv.c:300
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
 "file\n"
@@ -6505,7 +6639,7 @@ msgstr ""
 "  -i, --interactive            pytanie przed zamazaniem\n"
 "  -n, --no-clobber             bez nadpisywania istniejących plików\n"
 
-#: src/mv.c:307
+#: src/mv.c:309
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
@@ -6517,7 +6651,7 @@ msgstr ""
 "  -S, --suffix=ROZSZERZ        zmiana domyślnego rozszerzenia kopii "
 "zapasowej\n"
 
-#: src/mv.c:312
+#: src/mv.c:314
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
 "DIRECTORY\n"
@@ -6526,6 +6660,8 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
 "  -t, --target-directory=KATALOG  przeniesienie wszystkich argumentów\n"
 "                                  ŹRÓD�OWYCH do KATALOGU\n"
@@ -6533,6 +6669,9 @@ msgstr ""
 "  -u, --update                 przenoszenie tylko gdy ŹRÓD�O jest nowsze od\n"
 "                                 CELU albo nie ma CELU\n"
 "  -v, --verbose                wyjaśnianie co się dzieje\n"
+"  -Z, --contex                 ustawienie domyślnego kontekstu "
+"bezpieczeństwa\n"
+"                                 SELinux\n"
 
 #: src/nice.c:72
 #, c-format
@@ -6828,56 +6967,51 @@ msgid "%s: invalid number to ignore"
 msgstr "%s: błędna liczba do zignorowania"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
 msgstr "Assaf Gordon"
 
-#: src/numfmt.c:676
+#: src/numfmt.c:659
 #, c-format
-msgid "value too large to be converted: '%s'"
-msgstr "wartość za duża żeby mogła być przekształcona: „%s�"
+msgid "value too large to be converted: %s"
+msgstr "wartość za duża żeby mogła być przekształcona: %s"
 
-#: src/numfmt.c:680
+#: src/numfmt.c:663
 #, c-format
-msgid "invalid number: '%s'"
-msgstr "błędna liczba „%s�"
+msgid "invalid number: %s"
+msgstr "błędna liczba: %s"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
-msgstr "odrzucony przyrostek na wejściu: „%s� (rozważ użycie --from)"
+msgid "rejecting suffix in input: %s (consider using --from)"
+msgstr "odrzucony przyrostek na wejściu: %s (rozważ użycie --from)"
 
-#: src/numfmt.c:688
+#: src/numfmt.c:671
 #, c-format
-msgid "invalid suffix in input: '%s'"
-msgstr "błędny przyrostek na wejściu: „%s�"
+msgid "invalid suffix in input: %s"
+msgstr "błędny przyrostek na wejściu: %s"
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
-msgstr "brakujący przyrostek „i� na wejściu: „%s� (np. Ki/Mi/Gi)"
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
+msgstr "brakujący przyrostek „i� na wejściu: %s (np. Ki/Mi/Gi)"
 
-#: src/numfmt.c:723
+#: src/numfmt.c:722 src/numfmt.c:768
 #, c-format
 msgid "failed to prepare value '%Lf' for printing"
 msgstr "błąd przygotowania wartości „%Lf� do drukowania"
 
-#: src/numfmt.c:787
+#: src/numfmt.c:791
 #, c-format
-msgid "invalid unit size: '%s'"
-msgstr "błędny rozmiar jednostki: „%s�"
+msgid "invalid unit size: %s"
+msgstr "błędny rozmiar jednostki: %s"
 
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
-#, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr "brak pamięci (żądano %zu bajtów)"
-
-#: src/numfmt.c:813
+#: src/numfmt.c:814
 #, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
 msgstr "Składnia: %s [OPCJA]... [LICZBA]...\n"
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
@@ -6885,23 +7019,23 @@ msgstr ""
 "Przeformatowanie LICZB/Y ze standardowego wejścia albo podanych jako "
 "argumenty.\n"
 
-#: src/numfmt.c:820
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
 msgstr ""
 "      --debug          wypisywanie ostrzeżeń o błędnych danych wejściowych\n"
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr "  -d, --delimiter=X    użycie X zamiast spacji jako separatora pól\n"
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
 "      --field=N        zastępowanie liczby w wejściowym polu N (zamiast 1)\n"
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
@@ -6909,7 +7043,7 @@ msgstr ""
 "      --format=FORMAT  użycie FORMATU w stylu zmiennoprzecinkowego formatu\n"
 "                         funkcji printf. Szczegóły w opisie FORMATÓW niżej\n"
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
@@ -6920,14 +7054,14 @@ msgstr ""
 "spis\n"
 "                         JEDNOSTEK poniżej.\n"
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr ""
 "      --from-unit=N    rozmiar jednostki wejściowej (zamiast domyślnego 1).\n"
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
@@ -6937,7 +7071,7 @@ msgstr ""
 "      --grouping       grupowanie cyfr wg ustawień regionalnych (np.\n"
 "                       1.000.000). (więc nie działa dla ustawień C/POSIX)\n"
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
@@ -6945,7 +7079,7 @@ msgstr ""
 "      --header[=N]    pierwsze N linii zostanie przepisanych bez konwersji.\n"
 "                        Jeżeli N nie jest podane, domyslnie jedna.\n"
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
@@ -6954,7 +7088,7 @@ msgstr ""
 "                         abort (zakończ; domyślnie), fail (błąd),\n"
 "                         warn (ostrzeżenie), ignore (ignorowanie)\n"
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -6971,7 +7105,7 @@ msgstr ""
 "automatyczne,\n"
 "                        jeżeli napotkane są odstępy\n"
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
@@ -6983,7 +7117,7 @@ msgstr ""
 "zero\n"
 "                         (w kierunku zera), nearest (najbliższa)\n"
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
@@ -6992,20 +7126,20 @@ msgstr ""
 "                         akceptowanie opcjonalnego PRZYROSTKA w liczbach\n"
 "                         wejściowych\n"
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
 "            --to=JEDNOSTKI   samoczynne przeskalowanie liczb wyjściowych do\n"
 "                             JEDNOSTEK. Zobacz opis JEDNOSTEK poniżej.\n"
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr ""
 "      --to-unit=N      rozmiar jednostki wyjściowej (zamiast domyślnego 1).\n"
 
-#: src/numfmt.c:877
+#: src/numfmt.c:878
 msgid ""
 "\n"
 "UNIT options:\n"
@@ -7013,12 +7147,12 @@ msgstr ""
 "\n"
 "Inne opcje:\n"
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr ""
 "  none       bez automatycznego skalowania; przyrostki spowodują błąd\n"
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -7032,7 +7166,7 @@ msgstr ""
 "               1M = 1000000,\n"
 "               1Mi = 1048576,\n"
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
@@ -7044,7 +7178,7 @@ msgstr ""
 "               1M = 1000000,\n"
 "               ...\n"
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
@@ -7056,7 +7190,7 @@ msgstr ""
 "               1M = 1048576,\n"
 "               ...\n"
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
@@ -7068,25 +7202,25 @@ msgstr ""
 "               1Mi = 1048576,\n"
 "               ...\n"
 
-#: src/numfmt.c:905
+#: src/numfmt.c:906
 #, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
 "\n"
 "FORMAT musi umożliwiać wypisanie jednego argumentu zmiennoprzecinkowego\n"
 "„%f�. Opcjonalny cudzysłów (%'f) włączy --grouping (grupowanie; jeżeli\n"
 "umożliwiają to bieżące ustawienia regionalne). Opcjonalna szerokość (%10f)\n"
-"dopełni dane wyjściowe spacjami. Opcjonalna ujemna szerokość (%-10f) "
-"dopełni\n"
-"spacjami od lewej.\n"
+"dopełni dane wyjściowe spacjami. Opcjonalna szerokość zer (%010f) dopełni\n"
+"liczbę zerami. Opcjonalna ujemna szerokość (%-10f) dopełni spacjami od "
+"lewej.\n"
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -7108,7 +7242,7 @@ msgstr ""
 "--invalid=ignore nie są podawane informacje diagnostyczne, stan wyjściowy\n"
 "wynosi 0.\n"
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -7145,117 +7279,119 @@ msgstr ""
 "  $ ls -lh | %s --header --field 5 --from=iec --padding=10\n"
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, c-format
 msgid "format %s has no %% directive"
 msgstr "format %s nie ma dyrektywy %%"
 
-#: src/numfmt.c:990
+#: src/numfmt.c:1003
 #, c-format
 msgid "invalid format %s (width overflow)"
 msgstr "błędny format %s (przepełnienie szerokości)"
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr ""
+"dopełnianie w opcji --format zastępuje ustawienia podane przez opcję --"
+"padding"
+
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr "format %s kończy się %%"
 
-#: src/numfmt.c:1010
+#: src/numfmt.c:1030
 #, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
-msgstr "błędny format %s, dyrektywa powinna być w postaci %%['][-][N]f"
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
+msgstr "błędny format %s, dyrektywa powinna być w postaci %%[0]['][-][N]f"
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr "format %s ma za dużo dyrektyw %%"
 
-#: src/numfmt.c:1070
+#: src/numfmt.c:1081
 #, c-format
-msgid "invalid suffix in input '%s': '%s'"
-msgstr "błędny przyrostek na wejściu „%s�: „%s�"
+msgid "invalid suffix in input %s: %s"
+msgstr "błędny przyrostek na wejściu %s: %s"
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
 msgstr "wartość zbyt duża żeby ją wypisać: „%Lg� (rozważ użycie --to)"
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
 msgstr ""
 "wartość zbyt duża żeby ją wypisać: „%Lg� (program nie przetwarza wartości > "
 "999Y)"
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
-msgstr "duża wartość wejściowa „%s�: możliwa utrata precyzji"
+msgid "large input value %s: possible precision loss"
+msgstr "duża wartość wejściowa %s: możliwa utrata precyzji"
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
 "za krótka linia na wejściu, w polu %ld nie znaleziono liczb do "
 "przekształcenia"
 
-#: src/numfmt.c:1388
+#: src/numfmt.c:1403
 #, c-format
-msgid "invalid padding value '%s'"
-msgstr "błędna wartość wypełniania „%s�"
+msgid "invalid padding value %s"
+msgstr "błędna wartość wypełniania %s"
 
-#: src/numfmt.c:1401
+#: src/numfmt.c:1417
 #, c-format
-msgid "invalid field value '%s'"
-msgstr "błędny numer pola: „%s�"
+msgid "invalid field value %s"
+msgstr "błędna wartość pola: %s"
 
-#: src/numfmt.c:1430
+#: src/numfmt.c:1447
 #, c-format
-msgid "invalid header value '%s'"
-msgstr "błędna zawartość nagłówka „%s�"
+msgid "invalid header value %s"
+msgstr "błędna zawartość nagłówka %s"
 
-#: src/numfmt.c:1456
+#: src/numfmt.c:1473
 #, c-format
 msgid "--grouping cannot be combined with --format"
 msgstr "opcja --grouping nie może być użyta razem z --format"
 
-#: src/numfmt.c:1458
-#, c-format
-msgid "--padding cannot be combined with --format"
-msgstr "opcja --padding nie może być użyta razem z --format"
-
-#: src/numfmt.c:1463
+#: src/numfmt.c:1478
 #, c-format
 msgid "no conversion option specified"
 msgstr "nie podano opcji przekształcenia"
 
-#: src/numfmt.c:1471
+#: src/numfmt.c:1486
 #, c-format
 msgid "grouping cannot be combined with --to"
 msgstr "opcja --grouping nie może być użyta razem z --to"
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
 msgstr "grupowanie nie działa dla tych ustawień regionalnych"
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
 msgstr ""
 "opcja --header zignorowana w obeności danych wejściowych w linii polecenia"
 
-#: src/numfmt.c:1511
+#: src/numfmt.c:1526
 #, c-format
 msgid "error reading input"
 msgstr "błąd czytania danych wejściowych"
 
-#: src/numfmt.c:1520
+#: src/numfmt.c:1535
 #, c-format
 msgid "failed to convert some of the input numbers"
 msgstr "nie udało się przekształcić niektórych liczb wejściowych"
 
-#: src/od.c:294
+#: src/od.c:320
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -7268,7 +7404,7 @@ msgstr ""
 "    albo: %s --traditional [OPCJA]... [PLIK] [[+]PRZESUNIĘCIE[.][b]\n"
 "             [[+]ETYKIETA]]\n"
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -7283,7 +7419,7 @@ msgstr ""
 "czytane jest standardowe wejście.\n"
 "\n"
 
-#: src/od.c:307
+#: src/od.c:333
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
 "if the last operand begins with + or (if there are 2 operands) a digit.\n"
@@ -7304,52 +7440,56 @@ msgstr ""
 "przyrostek\n"
 "b oznacza wielokrotność 512.\n"
 
-#: src/od.c:318
+#: src/od.c:344
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
-"  -A, --address-radix=BAZA    postać wypisywania pozycji w pliku. BAZA to\n"
+"  -A, --address-radix=BAZA    postać wypisywania pozycji w pliku; BAZA to\n"
 "                                jedno z [doxn] dla bazy dziesiętnej,\n"
 "                                ósemkowej, szestnastkowej albo żadnej\n"
+"      --endian={big|little}   zamiana bajtów na wejściu zgodnie z podanym\n"
+"                                porzÄ…dkiem\n"
 "  -j, --skip-bytes=BAJTY      ominięcie tylu początkowych BAJTÓW każdego "
 "pliku\n"
 
-#: src/od.c:323
+#: src/od.c:350
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
 "  -N, --read-bytes=BAJTY      ograniczenie wielkości do BAJTÓW\n"
 "  -S BAJTY, --strings[=BAJTY]  wypisanie przynajmniej tylu BAJTÓW znaków\n"
-"                                 graficznych. Trzech, jeżeli nie jest "
+"                                 graficznych; trzech, jeżeli nie jest "
 "podana\n"
 "                                 liczba BAJTÓW.\n"
 "  -t, --format=TYP            wybranie formatu/formatów danych wyjściowych\n"
 "  -v, --output-duplicates     bez używania * do zaznaczania powtórzonych "
 "linii\n"
 "  -w, --width[=BAJTY]         wypisanie tylu BAJTÓW w każdej linii "
-"wyjściowej.\n"
-"                                Jeżeli liczba BAJTÓW jest pominięta: 32\n"
+"wyjściowej;\n"
+"                                jeżeli liczba BAJTÓW jest pominięta: 32\n"
 "      --traditional           akceptowanie argumentów w tradycyjnym "
 "formacie\n"
 
-#: src/od.c:336
+#: src/od.c:363
 msgid ""
 "\n"
 "\n"
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 "\n"
@@ -7357,10 +7497,11 @@ msgstr ""
 "Tradycyjne specyfikacje formatu mogą być mieszane, akumulują się:\n"
 "  -a   to samo co -t a,  nazwy znaków po zignorowaniu najstarszego bitu\n"
 "  -b   to samo co -t o1, bajty ósemkowo\n"
-"  -c   to samo co -t c,  znaki ASCII lub kody znaków z ukośnikiem odwrotnym\n"
+"  -c   to samo co -t c,  znaki drukowalne lub kody znaków z ukośnikiem\n"
+"         odwrotnym\n"
 "  -d   to samo co -t u2, dziesiętnie liczby 2-bajtowe bez znaku\n"
 
-#: src/od.c:345
+#: src/od.c:372
 msgid ""
 "  -f   same as -t fF, select floats\n"
 "  -i   same as -t dI, select decimal ints\n"
@@ -7376,21 +7517,21 @@ msgstr ""
 "  -s   to samo co -t d2, dziesiętnie 2-bajtowo\n"
 "  -x   to samo co -t x2, szesnastkowo 2-bajtowo\n"
 
-#: src/od.c:353
+#: src/od.c:380
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 "\n"
 "\n"
 "TYP składa się z jednej lub więcej następujących specyfikacji:\n"
-"  a           nazwy znaków po zignorowaniu najstarszego bitu\n"
-"  c           znaki ASCII lub kody znaków z ukośnikiem odwrotnym\n"
+"  a          nazwy znaków po zignorowaniu najstarszego bitu\n"
+"  c          znaki drukowalne lub kody znaków z ukośnikiem odwrotnym\n"
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -7404,7 +7545,7 @@ msgstr ""
 "  u[ROZMIAR]  dziesiętny bez znaku, liczba o takim ROZMIARZE w bajtach\n"
 "  x[ROZMIAR]  szesnastkowy, liczba o takim ROZMIARZE w bajtach\n"
 
-#: src/od.c:367
+#: src/od.c:394
 msgid ""
 "\n"
 "SIZE is a number.  For TYPE in [doux], SIZE may also be C for\n"
@@ -7418,7 +7559,7 @@ msgstr ""
 "sizeof(long). Jeżeli TYP to f, ROZMIAR może być też F dla sizeof(float), D\n"
 "dla sizeof(double) albo L dla sizeof(long double).\n"
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
@@ -7428,7 +7569,7 @@ msgstr ""
 "Dodanie przyrostka do dowolnego typu powoduje pokazanie drukowalnych znaków\n"
 "na końcu każdej linii danych wyjściowych.\n"
 
-#: src/od.c:379
+#: src/od.c:406
 msgid ""
 "\n"
 "\n"
@@ -7451,12 +7592,12 @@ msgstr ""
 "  M    1024*1024\n"
 "i tak dalej dla G, T, P, E, Z, Y.\n"
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, c-format
 msgid "invalid type string %s"
 msgstr "błędna specyfikacja typu %s"
 
-#: src/od.c:649
+#: src/od.c:690
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7465,7 +7606,7 @@ msgstr ""
 "błędna specyfikacja typu %s;\n"
 "ten system nie ma %lu-bajtowych liczb całkowitych"
 
-#: src/od.c:770
+#: src/od.c:811
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7474,37 +7615,37 @@ msgstr ""
 "błędna specyfikacja typu %s;\n"
 "ten system nie ma %lu-bajtowych liczb zmiennoprzecinkowych"
 
-#: src/od.c:828
+#: src/od.c:869
 #, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr "błędny znak „%c� w specyfikacji typu %s"
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr "nie można przeskoczyć poza koniec połączonych danych wejściowych"
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr ""
 "błędna baza danych wyjściowych „%c�; musi to być jeden ze znaków [doxn]"
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr "nie można podawać typu przy wypisywaniu napisów"
 
-#: src/od.c:1810
+#: src/od.c:1863
 msgid "compatibility mode supports at most one file"
 msgstr "tryb zgodny ze starą wersją może mieć podany najwyżej jeden plik"
 
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr "za duże  skip-bytes + read-bytes"
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr "uwaga: błędna szerokość %lu; używam %d zamiast"
@@ -7667,12 +7808,12 @@ msgstr "Kiedy"
 msgid "Where"
 msgstr "SkÄ…d"
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr "Składnia: %s [OPCJA]... [UŻYTKOWNIK]...\n"
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -7689,7 +7830,7 @@ msgstr ""
 "  -p              pominięcie planu użytkownika w formacie szczegółowym\n"
 "  -s              wyświetlenie informacji w formacie skróconym (domyślnie)\n"
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -7705,7 +7846,7 @@ msgstr ""
 "bezczynności\n"
 "                  w formacie skróconym\n"
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, c-format
 msgid ""
 "\n"
@@ -7716,7 +7857,7 @@ msgstr ""
 "Uproszczona wersja programu „finger�. Wyświetla informacje o użytkownikach.\n"
 "Ścieżka do pliku utmp: %s .\n"
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr ""
@@ -7818,8 +7959,8 @@ msgid ""
 msgstr ""
 "  +PIERWSZA_STRONA[:OSTATNIA_STRONA], --pages=PIERWSZA_STRONA[:"
 "OSTATNIA_STRONA]\n"
-"                    zaczęcie [zakończenie] od strony PIERWSZA_[OSTATNIA_]"
-"STRONA\n"
+"                    zaczęcie [zakończenie] od strony "
+"PIERWSZA_[OSTATNIA_]STRONA\n"
 "  -COLUMN, --columns=KOLUMNY\n"
 "                    wypisywanie danych w tylu KOLUMNACH i drukowanie kolumn "
 "od\n"
@@ -7943,19 +8084,20 @@ msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
 "  -s[ZNAK], --separator[=ZNAK]\n"
 "                    oddzielanie kolumn pojedynczym ZNAKIEM, domyślnie "
 "TABem,\n"
-"                    jeżeli bez opcji -w, „no char� z opcją -w\n"
+"                    jeżeli bez opcji -w, „no char� z opcją -w.\n"
 "                    -s[ZNAK] wyłącza obcinanie linii we wszystkich 3 "
 "układach\n"
 "                    kolumn (-COLUMN|-a -COLUMN|-m), chyba że użyto opcji -w\n"
 
-#: src/pr.c:2827
+#: src/pr.c:2828
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
 "                    separate columns by STRING,\n"
@@ -7972,7 +8114,7 @@ msgstr ""
 "                    kolumn\n"
 "  -t, --omit-header  bez wypisywania nagłówków i stopek stron\n"
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 msgid ""
 "  -T, --omit-pagination\n"
 "                    omit page headers and trailers, eliminate any "
@@ -7997,7 +8139,7 @@ msgstr ""
 "                    wydruku wielokolumnowego, -s[ZNAK] wyłącza wartość\n"
 "                    domyślną (72)\n"
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
 "                    set page width to PAGE_WIDTH (72) characters always,\n"
@@ -8012,7 +8154,7 @@ msgstr ""
 "nie\n"
 "                    przeszkadza opcjom -S ani -s.\n"
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 msgid ""
 "\n"
 "-t is implied if PAGE_LENGTH <= 10.  With no FILE, or when FILE is -, read\n"
@@ -8037,9 +8179,10 @@ msgstr ""
 "\n"
 
 #: src/printenv.c:69
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr ""
-"  -0, --null     zakończenie linii bajtem 0 zamiast znakiem nowej linii\n"
+"  -0, --null     zakończenie każdej linii znakiem NUL zamiast znakiem nowej\n"
+"                   linii\n"
 
 #: src/printf.c:79
 #, c-format
@@ -8154,12 +8297,12 @@ msgstr "uwaga: nadmiarowe argumenty począwszy od %s zostały zignorowane"
 msgid "F. Pinard"
 msgstr "F. Pinard"
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, c-format
 msgid "%s (for regexp %s)"
 msgstr "%s (dla wyr. regularnego %s)"
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
@@ -8168,13 +8311,13 @@ msgstr ""
 "Składnia: %s [OPCJA]... [WEJŚCIE]... (bez -G)\n"
 "    albo: %s -G [OPCJA]... [WEJÅšCIE [WYJÅšCIE]]\n"
 
-#: src/ptx.c:1821
+#: src/ptx.c:1824
 msgid ""
 "Output a permuted index, including context, of the words in the input "
 "files.\n"
 msgstr "Pokazanie indeksu słów z plików wejściowych razem z kontekstem.\n"
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
 "  -G, --traditional              behave more like System V 'ptx'\n"
@@ -8187,7 +8330,7 @@ msgstr ""
 "  -F, --flag-truncation=NAPIS    użycie NAPISU do zaznaczania wyciętych "
 "linii\n"
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
 "  -O, --format=roff              generate output as roff directives\n"
@@ -8204,7 +8347,7 @@ msgstr ""
 "  -T, --format=tex               generowanie wyjścia w postaci dyrektyw TeX-"
 "a\n"
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -8223,7 +8366,7 @@ msgstr ""
 "  -i, --ignore-file=PLIK         czytanie listy ignorowanych słów z PLIKU\n"
 "  -o, --only-file=FILE           uwzględnienie tylko słów z PLIKU\n"
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -8236,16 +8379,16 @@ msgstr ""
 "  -w, --width=NUMBER             szerokość wyjścia w kolumnach, bez "
 "odnośników\n"
 
-#: src/ptx.c:1854
+#: src/ptx.c:1857
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
 "\n"
-"Jeżeli PLIK nie jest podany albo podany jako -, czytane jest standardowe\n"
-"wejście. Domyślnie użyta jest opcja „-F /�.\n"
+"Jeżeli nie został podany PLIK albo podany jest jako -, czytane jest\n"
+"standardowe wejście. Domyślnie używana jest opcja „-F /�.\n"
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, c-format
 msgid "invalid gap width: %s"
 msgstr "błędna szerokość odstępu: %s"
@@ -8267,22 +8410,30 @@ msgstr ""
 "                    zawiera dowiÄ…zania symboliczne\n"
 "  -P, --physical  unikanie dowiązań symbolicznych\n"
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+"\n"
+"Jeżeli nie jest podana żadna opcja, opcja -P jest domyślna.\n"
+
+#: src/pwd.c:169
 #, c-format
 msgid "failed to chdir to %s"
 msgstr "nie udało się chdir do %s"
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, c-format
 msgid "failed to stat %s"
 msgstr "nie udało się stat %s"
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr "w %s nie można odnaleźć katalogu z pasującym i-węzłem"
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, c-format
 msgid "ignoring non-option arguments"
 msgstr "zignorowano argumenty nie będące opcjami"
@@ -8292,8 +8443,8 @@ msgstr "zignorowano argumenty nie będące opcjami"
 msgid "Dmitry V. Levin"
 msgstr "Dmitry V. Levin"
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Składnia: %s [OPCJA]... PLIK...\n"
@@ -8340,8 +8491,7 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 "  -m, --canonicalize-missing    doprowadzenie do postaci kanonicznej przez\n"
 "                                rekursywne rozwiązanie wszystkich dowiązań\n"
@@ -8352,8 +8502,8 @@ msgstr ""
 "  -q, --quiet,\n"
 "  -s, --silent                  wyłączenie większości komunikatów o błędach\n"
 "  -v, --verbose                 wypisywanie komunikatów o błędach\n"
-"  -z, --zero                    zakończenie linii wyjściowych znakiem NUL\n"
-"                                zamiast znakiem nowej linii\n"
+"  -z, --zero                    zakończenie każdej linii na wyjściu znakiem\n"
+"                                   NUL, a nie znakiem nowej linii\n"
 
 #: src/readlink.c:152
 #, c-format
@@ -8379,7 +8529,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 "  -e, --canonicalize-existing  wszystkie elementy ścieżki musza istnieć\n"
@@ -8396,8 +8546,8 @@ msgstr ""
 "      --relative-base=PLIK     wypisanie ścieżek bezwzględnych, chyba że są\n"
 "                               poniżej ścieżki PLIKU\n"
 "  -s, --strip, --no-symlinks   bez rozwijania dowiązań symbolicznych\n"
-"  -z, --zero                   separatorem wyjścia ma być NUL, nie znak\n"
-"                               nowej linii\n"
+"  -z, --zero                   zakończenie każdej linii na wyjściu znakiem\n"
+"                                 NUL, a nie znakiem nowej linii\n"
 "\n"
 
 #: src/relpath.c:130
@@ -8414,41 +8564,42 @@ msgstr "%s: wejść w katalog %s, zabezpieczony przed zapisem? "
 msgid "%s: descend into directory %s? "
 msgstr "%s: przejść do katalogu %s? "
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr "%s: usunąć zabezpieczony przed zapisem %s %s? "
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, c-format
 msgid "%s: remove %s %s? "
 msgstr "%s: usunąć %s %s? "
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, c-format
 msgid "removed directory: %s\n"
 msgstr "usunięty katalog %s\n"
 
-#: src/remove.c:444
+#: src/remove.c:447
 #, c-format
-msgid "cannot remove directory: %s"
-msgstr "nie można usunąć katalogu: %s"
+msgid "refusing to remove %s or %s directory: skipping %s"
+msgstr "odmowa usunięcia katalogu %s albo %s: pominięcie %s"
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr "pominięto %s, bo jest na innym urządzeniu"
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, c-format
 msgid "traversal failed: %s"
 msgstr "błąd przeglądania: %s"
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -8480,20 +8631,20 @@ msgstr ""
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 "  -I                    pojedyncze pytanie przez usunięciem więcej niż "
 "trzech\n"
-"                          plików przy usuwaniu rekursywnym. Mniej\n"
+"                          plików przy usuwaniu rekursywnym; mniej\n"
 "                          przeszkadzające niż -i, ale nadal zabezpieczające\n"
 "                          przed większością błędów\n"
 "      --interactive[=KIEDY]  pytania zależnie od KIEDY: never (nigdy), once\n"
-"                          (raz, -I) albo always (zawsze, -i). Bez KIEDY "
+"                          (raz, -I) albo always (zawsze, -i); bez KIEDY "
 "zawsze\n"
 "                          jest zadawane pytanie\n"
 
@@ -8567,13 +8718,19 @@ msgstr ""
 
 #: src/rm.c:342
 #, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr "%s: usunąć wszystkie argumenty rekursywnie? "
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] "%s: usunąć %zu argument rekursywnie? "
+msgstr[1] "%s: usunąć %zu argumenty rekursywnie? "
+msgstr[2] "%s: usunąć %zu argumentów rekursywnie? "
 
-#: src/rm.c:343
+#: src/rm.c:345
 #, c-format
-msgid "%s: remove all arguments? "
-msgstr "%s: usunąć wszystkie argumenty? "
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] "%s: usunąć %zu argument? "
+msgstr[1] "%s: usunąć %zu argumenty? "
+msgstr[2] "%s: usunąć %zu argumentów? "
 
 #: src/rmdir.c:134 src/rmdir.c:233
 #, c-format
@@ -8631,10 +8788,10 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
-"Uruchomienie programu w innym kontekscie bezpieczeństwa\n"
+"Uruchomienie programu w innym kontekscie bezpieczeństwa SELinux.\n"
 "Bez KONTEKSTU ani POLECENIA - wypisanie bieżącego kontekstu bezpieczeństwa.\n"
 
 #: src/runcon.c:94
@@ -8692,41 +8849,46 @@ msgstr "musisz użyć -c, -t -u, -l, -r albo kontekstu"
 msgid "no command specified"
 msgstr "brak polecenia"
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr "%s może być użyty tylko z jądrem SELinux"
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, c-format
 msgid "failed to compute a new context"
 msgstr "nie udało się obliczyć nowego kontekstu"
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, c-format
 msgid "failed to set new user %s"
 msgstr "nie udało się ustawić nowego użytkownika %s"
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, c-format
 msgid "failed to set new type %s"
 msgstr "nie udało się ustawić nowego typu %s"
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, c-format
 msgid "failed to set new range %s"
 msgstr "nie udało się ustawić nowego zakresu %s"
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, c-format
 msgid "failed to set new role %s"
 msgstr "nie udało się ustawić nowej roli %s"
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, c-format
 msgid "unable to set security context %s"
 msgstr "nie udało się ustawić kontekstu bezpieczeństwa %s"
 
+#: src/selinux.c:127 src/selinux.c:300
+#, c-format
+msgid "error canonicalizing %s"
+msgstr "błąd kanonizowania %s"
+
 #: src/seq.c:68
 #, c-format
 msgid ""
@@ -8759,6 +8921,8 @@ msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
@@ -8766,12 +8930,13 @@ msgstr ""
 "\n"
 "Jeżeli PIERWSZA lub KROK są pominięte, mają domyślną wartość 1. Tzn. jeżeli\n"
 "KROK jest pominięty, domyślnie ma wartość 1, nawet jeżeli OSTATNIA jest\n"
-"mniejsza od PIERWSZEJ. PIERWSZA, KROK i OSTATNIA sÄ… interpretowane jako\n"
-"liczby zmiennoprzecinkowe. KROK zwykle jest dodatni, jeśli PIERWSZA jest\n"
-"mniejsza od OSTATNIEJ, KROK jest zwykle ujemny, jeśli PIERWSZA jest większa\n"
-"od OSTATNIEJ.\n"
+"mniejsza od PIERWSZEJ. Sekwencja liczb kończy się gdy bieżąca liczba po\n"
+"dodaniu KROKU będzie większa niż OSTATNIA.\n"
+"PIERWSZA, KROK i OSTATNIA sÄ… interpretowane jako liczby zmiennoprzecinkowe.\n"
+"KROK zwykle jest dodatni, jeśli PIERWSZA liczba jest mniejsza od OSTATNIEJ,\n"
+"KROK jest zwykle ujemny, jeśli PIERWSZA jest większa od OSTATNIEJ.\n"
 
-#: src/seq.c:94
+#: src/seq.c:96
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
 "it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n"
@@ -8781,90 +8946,28 @@ msgstr ""
 "jest to %.DOK�f jeżeli PIERWSZA, KROK i OSTATNIA są wszystkie całkowite, z\n"
 "maksymalną dokładnością DOK� albo %g w przeciwnym przypadku.\n"
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, c-format
 msgid "invalid floating point argument: %s"
 msgstr "błędny argument zmiennoprzecinkowy: %s"
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr "format %s zawiera nieznanÄ… dyrektywÄ™ %%%c"
 
 # ? - rzm
-#: src/seq.c:555
+#: src/seq.c:557
 #, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr "nie można podawać formatu, gdy wypisywane są napisy o równej długości"
 
-#: src/setuidgid.c:49
-#, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-"Składnia: %s [KRÓTKA-OPCJA]... UŻYTKOWNIK POLECENIE [ARGUMENT]...\n"
-"    albo: %s D�UGA-OPCJA\n"
-
-#: src/setuidgid.c:55
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-"Pozbycie się wszystkich dodatkowych grup, przyjęcie identyfikatora i grupy\n"
-"UŻYTKOWNIKA (numerycznego albo nazwy) i wykonanie POLECENIA z podanymi\n"
-"ARGUMENTAMI. Wyjście ze statusem 111, jeżeli nie da się przyjąć wymaganych\n"
-"identyfikatorów użytkownika i grupy. W przeciwnym przypadku wyjście ze\n"
-"statusem wyjściowym POLECENIA. Ten program jest przydatny tylko jeżeli jest\n"
-"uruchomiony przez roota (użytkownika o identyfikatorze zero)\n"
-"\n"
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-"  -g GID[,GID1...]  również ustawienie identyfikatora grupy głównej zgodnie\n"
-"                    z numerycznym GID, a identyfikatorów dodatkowych grup -\n"
-"                    jeżeli podane - jako GID1, ...\n"
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr "nieznany identyfikator użytkownika %s"
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr "żeby użyć identyfikatora użytkownika %s trzeba użyć też opcji -g"
-
-#: src/setuidgid.c:190
-#, c-format
-msgid "failed to set supplemental group(s)"
-msgstr "nie udało się ustawić grup dodatkowych"
-
-#: src/setuidgid.c:200
-#, c-format
-msgid "cannot set group-ID to %lu"
-msgstr "nie można ustawić identyfikatora grupy %lu"
-
-#: src/setuidgid.c:204
-#, c-format
-msgid "cannot set user-ID to %lu"
-msgstr "nie można ustawić identyfikatora użytkownika %lu"
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr "Colin Plumb"
 
-#: src/shred.c:148
+#: src/shred.c:170
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
 "for even very expensive hardware probing to recover the data.\n"
@@ -8872,7 +8975,7 @@ msgstr ""
 "Wielokrotne zamazanie podanego PLIKU w celu utrudnienia odzyskania jego\n"
 "zawartości nawet przy użyciu drogich urządzeń do odzyskiwania danych.\n"
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -8886,30 +8989,34 @@ msgstr ""
 "  -s, --size=N   zamazanie N bajtów (można używać przyrostków takich jak K,\n"
 "                   M, G)\n"
 
-#: src/shred.c:161
+#: src/shred.c:183
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
 "  -z, --zero     add a final overwrite with zeros to hide shredding\n"
 msgstr ""
-"  -u, --remove   skrócenie i skasowanie pliku po zamazaniu\n"
+"  -u, --remove[=JAK]  skrócenie i skasowanie pliku po zamazaniu; zob. niżej\n"
 "  -v, --verbose  pokazywanie przebiegu zamazywania\n"
 "  -x, --exact    bez zaokrąglania rozmiarów plików w górę do pełnych "
 "bloków,\n"
 "                   domyślnie dla plików innych niż zwykłe\n"
 "  -z, --zero     dodatkowe zamazanie zerami, aby ukryć zamazywanie\n"
 
-#: src/shred.c:170
+#: src/shred.c:192
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 "\n"
@@ -8917,11 +9024,14 @@ msgstr ""
 "\n"
 "Jeżeli podana jest opcja --remove (-u) PLIK jest kasowany. Domyślnie PLIK\n"
 "nie jest kasowany, ponieważ często operacje dotyczą plików urządzeń, jak\n"
-"/dev/hda, a takie pliki zwykle nie powinny być usuwane. Przy zamazywaniu\n"
-"zwykłych plików zwykle używa się opcji --remove.\n"
-"\n"
+"/dev/hda, a takie pliki zwykle nie powinny być usuwane.\n"
+"Opcjonalny parametr wskazuje JAK usunąć nazwę:\n"
+"„unlink� => użycie standadowej funkcji unlink.\n"
+"„wipe� => łącznie z uprzednim zamazaniem bajtów w nazwie.\n"
+"„wipesync� => dodatkowo z użyciem sync po zamazaniu każdego bajtu.\n"
+"Domyślny sposób to „wipesync�, ale może być kosztowny.\n"
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -8939,7 +9049,7 @@ msgstr ""
 "gwarancji, że działa efektywnie we wszystkich trybach pracy systemu plików:\n"
 "\n"
 
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -8960,7 +9070,7 @@ msgstr ""
 "* które zapisują stan chwilowy, jak serwer NFS Network Appliance\n"
 "\n"
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -8973,7 +9083,7 @@ msgstr ""
 "* kompresowanymi\n"
 "\n"
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -8996,7 +9106,7 @@ msgstr ""
 "(man mount)\n"
 "\n"
 
-#: src/shred.c:215
+#: src/shred.c:241
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
 "of the file that cannot be removed, and that will allow a shredded file\n"
@@ -9007,127 +9117,127 @@ msgstr ""
 "które nie mogą zostać usunięte i plik zamazany schredem może zostać\n"
 "odtworzony.\n"
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, c-format
 msgid "%s: fdatasync failed"
 msgstr "%s: błąd fdatasync"
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr "%s: błąd fsync"
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr "%s: nie można przewinąć"
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr "%s: przebieg %lu/%lu (%s)..."
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, c-format
 msgid "%s: error writing at offset %s"
 msgstr "%s: błąd zapisu na pozycji %s"
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s: nie udało się ustawienie pozycji lseek"
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, c-format
 msgid "%s: file too large"
 msgstr "%s: plik jest za duży"
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr "%s: przebieg %lu/%lu (%s)...%s"
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr "%s: przebieg %lu/%lu (%s)...%s/%s %d%%"
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, c-format
 msgid "%s: fstat failed"
 msgstr "%s: błąd fstat"
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, c-format
 msgid "%s: invalid file type"
 msgstr "%s: błędny typ pliku"
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr "%s: plik ma ujemny rozmiar"
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, c-format
 msgid "%s: error truncating"
 msgstr "%s: błąd obcinania"
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, c-format
 msgid "%s: fcntl failed"
 msgstr "%s: błąd fcntl"
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr "%s: nie można zamazywać pliku tylko do dopisywania"
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr "%s: usuwanie"
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, c-format
 msgid "%s: renamed to %s"
 msgstr "%s: przemianowany na %s"
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, c-format
 msgid "%s: failed to remove"
 msgstr "%s: błąd przy kasowaniu pliku"
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr "%s: skasowany"
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, c-format
 msgid "%s: failed to close"
 msgstr "%s: błąd przy zamykaniu pliku"
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, c-format
 msgid "%s: failed to open for writing"
 msgstr "%s: błąd przy otwieraniu do zapisu"
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, c-format
 msgid "%s: invalid number of passes"
 msgstr "%s: błędna liczba przebiegów"
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, c-format
 msgid "multiple random sources specified"
 msgstr "podano wiele źródeł losowych bajtów"
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, c-format
 msgid "%s: invalid file size"
 msgstr "%s: błędny rozmiar pliku"
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -9138,12 +9248,12 @@ msgstr ""
 "    albo: %s -e [OPCJA]... [ARGUMENT]\n"
 "    albo: %s -i LO-HI [OPCJA]...\n"
 
-#: src/shuf.c:54
+#: src/shuf.c:67
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr ""
 "Wypisanie losowej permutacji linii wejściowych na standardowym wyjściu.\n"
 
-#: src/shuf.c:60
+#: src/shuf.c:73
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
 "  -i, --input-range=LO-HI   treat each number LO through HI as an input "
@@ -9151,7 +9261,7 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
 msgstr ""
 "  -e, --echo                traktowanie każdego argumentu jako linii\n"
 "                              wejściowej\n"
@@ -9163,34 +9273,43 @@ msgstr ""
 "  -o, --output=PLIK         zapis wyników do PLIKU zamiast do standardowego\n"
 "                              wyjścia\n"
 "      --random-source=PLIK  pobranie losowych bajtów z PLIKU\n"
-"  -z, --zero-terminated     zakończenie linii przez bajt 0, nie przez znak\n"
-"                              nowej linii\n"
+"  -r, --repeat              dozwolone powtórzenia linii wyjściowych\n"
 
-#: src/shuf.c:244
+#: src/shuf.c:228
+#, c-format
+msgid "too many input lines"
+msgstr "za wiele linii wejściowych"
+
+#: src/shuf.c:431
 #, c-format
 msgid "multiple -i options specified"
 msgstr "podano wiele opcji -i"
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, c-format
 msgid "invalid input range %s"
 msgstr "błędny zakres wejściowy: %s"
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, c-format
 msgid "invalid line count %s"
 msgstr "błędna liczba linii %s"
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, c-format
 msgid "multiple output files specified"
 msgstr "podano wiele plików wyjściowych"
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, c-format
 msgid "cannot combine -e and -i options"
 msgstr "nie można łączyć ustawiania opcji -e i -i"
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr "nie ma linii do powtórzenia"
+
 #: src/sleep.c:44
 #, c-format
 msgid ""
@@ -9215,23 +9334,23 @@ msgstr ""
 "więcej argumenty, przerwa trwa tyle ile suma ich wartości.\n"
 "\n"
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, c-format
 msgid "invalid time interval %s"
 msgstr "błędny odstęp czasowy %s"
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr "nie można odczytać zegara systemowego"
 
-#: src/sort.c:399
+#: src/sort.c:427
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr ""
 "Wypisanie posortowanego połączenia wszystkich PLIK(ÓW) na standardowym "
 "wyjściu\n"
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
@@ -9239,7 +9358,7 @@ msgstr ""
 "Opcje porzÄ…dkowania:\n"
 "\n"
 
-#: src/sort.c:409
+#: src/sort.c:437
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
 "  -d, --dictionary-order      consider only blanks and alphanumeric "
@@ -9251,7 +9370,7 @@ msgstr ""
 "                                alfanumerycznych\n"
 "  -f, --ignore-case           traktowanie małych liter jak wielkich\n"
 
-#: src/sort.c:415
+#: src/sort.c:443
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
 "  -i, --ignore-nonprinting    consider only printable characters\n"
@@ -9261,13 +9380,13 @@ msgstr ""
 "  -i, --ignore-nonprinting    branie pod uwagę tylko znaków drukowalnych\n"
 "  -M, --month-sort            porządek: (nieznany) < „JAN� < ... < „DEC�\n"
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 "  -h, --human-numeric-sort    porównanie liczb z przyrostkami (np. 2K 1G)\n"
 
-#: src/sort.c:423
+#: src/sort.c:451
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
 "  -R, --random-sort           sort by random hash of keys\n"
@@ -9280,7 +9399,7 @@ msgstr ""
 "      --random-source=PLIK    losowe bajty z PLIKU\n"
 "  -r, --reverse               odwrotny porzÄ…dek sortowania\n"
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -9299,7 +9418,7 @@ msgstr ""
 "zawartych\n"
 "                                w tekście\n"
 
-#: src/sort.c:437
+#: src/sort.c:465
 msgid ""
 "Other options:\n"
 "\n"
@@ -9307,7 +9426,7 @@ msgstr ""
 "Inne opcje:\n"
 "\n"
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
@@ -9316,7 +9435,7 @@ msgstr ""
 "                            naraz; dla większej liczby użyte będą pliki\n"
 "                            tymczasowe\n"
 
-#: src/sort.c:445
+#: src/sort.c:473
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
 "  -C, --check=quiet, --check=silent  like -c, but do not report first bad "
@@ -9332,7 +9451,7 @@ msgstr ""
 "PROG;\n"
 "                              dekompresowanie przez PROG -d\n"
 
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -9348,7 +9467,7 @@ msgstr ""
 "                              Jeżeli PLIK to -, nazwy czytane są ze\n"
 "                              standardowego wejścia\n"
 
-#: src/sort.c:459
+#: src/sort.c:487
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
 "  -m, --merge               merge already sorted files; do not sort\n"
@@ -9357,7 +9476,7 @@ msgstr ""
 "  -m, --merge               połączenie już posortowanych plików, bez "
 "sortowania\n"
 
-#: src/sort.c:463
+#: src/sort.c:491
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "  -s, --stable              stabilize sort by disabling last-resort "
@@ -9371,7 +9490,7 @@ msgstr ""
 "                              porównania końcowego\n"
 "  -S, --buffer-size=ROZM    ROZMIAR głównego bufora pamięci\n"
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -9395,14 +9514,7 @@ msgstr ""
 "                              wypisanie tylko pierwszej z identycznych "
 "linii\n"
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr ""
-"  -z, --zero-terminated     zakończenie linii bajtem 0 zamiast znakiem "
-"nowej\n"
-"                              linii\n"
-
-#: src/sort.c:483
+#: src/sort.c:511
 msgid ""
 "\n"
 "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is "
@@ -9435,7 +9547,7 @@ msgstr ""
 "\n"
 "ROZMIAR może być uzupełniony o następujące mnożniki:\n"
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -9456,133 +9568,118 @@ msgstr ""
 "Ustaw LC_ALL=C żeby przywrócić tradycyjny porządek sortowania, który używa\n"
 "dosłownych wartości bajtów.\n"
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, c-format
 msgid "waiting for %s [-d]"
 msgstr "czekanie na %s [-d]"
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr "%s [-d] zakończone nieprawidłowo"
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, c-format
 msgid "cannot create temporary file in %s"
 msgstr "nie można utworzyć pliku tymczasowego w %s"
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr "błąd otwierania pliku"
 
-#: src/sort.c:970
+#: src/sort.c:998
 msgid "fflush failed"
 msgstr "błąd fflush"
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr "błąd zamykania pliku"
 
-#: src/sort.c:986
-#, c-format
-msgid "dup2 failed"
-msgstr "błąd dup2"
-
-#: src/sort.c:1103
-#, c-format
-msgid "couldn't execute %s"
-msgstr "nie udało się uruchomić %s"
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 msgid "couldn't create temporary file"
 msgstr "nie udało się utworzyć pliku tymczasowego"
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, c-format
 msgid "couldn't create process for %s -d"
 msgstr "nie udało się uruchomić procesu %s -d"
 
-#: src/sort.c:1161
-#, c-format
-msgid "couldn't execute %s -d"
-msgstr "nie udało się uruchomić %s -d"
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, c-format
 msgid "warning: cannot remove: %s"
 msgstr "uwaga: nie udało się usunąć %s"
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, c-format
 msgid "invalid --%s argument %s"
 msgstr "błędny argument opcji --%s: %s"
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, c-format
 msgid "minimum --%s argument is %s"
 msgstr "minimalna wartość argumentu opcji --%s to %s"
 
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, c-format
 msgid "--%s argument %s too large"
 msgstr "opcja --%s ma za duży argument %s"
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr "przy aktualnej wartości rlimit maksymalny argument opcji --%s to %s"
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr "liczba równoległych sortowań (parallel) musi byc niezerowy"
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr "błąd stat"
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr "błąd czytania"
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, c-format
 msgid "string transformation failed"
 msgstr "nie udało się przekształcenie napisu"
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, c-format
 msgid "the untransformed string was %s"
 msgstr "nieprzekształconym napisem był %s"
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr "^ brak dopasowania klucza\n"
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr ""
 "został użyty zdezaktualizowany klucz %s, rozważ użycie %s zamiast niego"
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr "klucz %lu ma zerową długość i będzie zignorowany"
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr "początkowe odstępy są znaczące w kluczu %lu, rozważ podanie „b�"
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr "klucz %lu jest numeryczny i rozciąga się na wiele pól"
 
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
@@ -9590,122 +9687,122 @@ msgstr[0] "opcja „-%s� została zignorowana"
 msgstr[1] "opcje „-%s� zostały zignorowane"
 msgstr[2] "opcji „-%s� zostało zignorowanych"
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr "opcja „-r� ma zastosowanie tylko do porównań ostatniej szansy"
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr "błąd zapisu"
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr "%s: %s:%s: nieuporzÄ…dkowanie: "
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr "standardowe wyjście błędów"
 
-#: src/sort.c:3698
+#: src/sort.c:3738
 msgid "cannot read"
 msgstr "nie można przeczytać"
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, c-format
 msgid "%s: invalid field specification %s"
 msgstr "%s: błędna specyfikacja pola %s"
 
-#: src/sort.c:3987
+#: src/sort.c:4028
 #, c-format
 msgid "options '-%s' are incompatible"
 msgstr "opcje „-%s� nie pasują do siebie"
 
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, c-format
 msgid "%s: invalid count at start of %s"
 msgstr "%s: błędna liczba na początku %s"
 
-#: src/sort.c:4295
+#: src/sort.c:4336
 msgid "invalid number after '-'"
 msgstr "błędna liczba po „-�"
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 msgid "invalid number after '.'"
 msgstr "błędna liczba po „.�"
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr "nieprawidłowy znak w specyfikacji pola"
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, c-format
 msgid "multiple compress programs specified"
 msgstr "podano wiele programów kompresujących"
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
 msgstr "błędna liczba na początku pola"
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
 msgstr "numer pola wynosi zero"
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr "numer znaku wynosi zero"
 
-#: src/sort.c:4407
+#: src/sort.c:4448
 msgid "invalid number after ','"
 msgstr "błędna liczba po „,�"
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr "pusty TAB"
 
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, c-format
 msgid "cannot read file names from %s"
 msgstr "nie można wczytać nazw plików z %s"
 
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr "%s:%lu: błędna nazwa pliku - o zerowej długości"
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, c-format
 msgid "no input from %s"
 msgstr "brak danych z %s"
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr "użycie reguł sortowania %s"
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr "użycie prostego porównywania bajtów"
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr "dodatkowy argument %s nie może być użyty z opcją -%c"
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr "przystek musi mieć co najmniej %zu znaków"
 
-#: src/split.c:204
+#: src/split.c:203
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr "Składnia: %s [OPCJA]... [PLIK [PRZEDROSTEK]]\n"
 
-#: src/split.c:208
+#: src/split.c:207
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
 "size is 1000 lines, and default PREFIX is 'x'.  With no INPUT, or when "
@@ -9717,22 +9814,21 @@ msgstr ""
 "nie\n"
 "jest podany albo podany jako -, czytane jest standardowe wejście\n"
 
-#: src/split.c:216
+#: src/split.c:215
 #, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
 "  -a, --suffix-length=N   tworzenie przyrostków o długości N (domyślnie %d)\n"
@@ -9740,17 +9836,18 @@ msgstr ""
 "  -b, --bytes=ROZMIAR     zapisanie po ROZMIAR bajtów do plików wyjściowych\n"
 "  -C, --line-bytes=ROZMIAR  zapisanie najwyżej ROZMIAR bajtów pełnych linii\n"
 "  -d, --numeric-suffixes[=OD]  użycie przyrostków liczbowych zamiast\n"
-"                            literowych, OD zmienia wartość początkową\n"
+"                            literowych; OD zmienia wartość początkową\n"
 "                            (domyślnie 0)\n"
 "  -e, --elide-empty-files  nie generowanie pustych plików przy opcji „-n�\n"
 "      --filter=POLECENIE  pisanie do POLECENIA powłoki; nazwa pliku to "
 "$FILE\n"
 "  -l, --lines=ILE         zapis po ILE linii do każdego pliku wyjściowego\n"
-"  -n, --number=CZĘŚCI     podzielenie na tyle CZĘŚCI. Zob. poniżej\n"
+"  -n, --number=CZĘŚCI     podzielenie na tyle CZĘŚCI; zobacz wyjaśnienie\n"
+"                            poniżej\n"
 "  -u, --unbuffered        natychmiastowe kopiowanie wejścia na wyjście po\n"
 "                            użyciu „-n r/...�\n"
 
-#: src/split.c:229
+#: src/split.c:228
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
 "                            output file is opened\n"
@@ -9759,7 +9856,7 @@ msgstr ""
 "komunikatów\n"
 "                            diagnostycznych\n"
 
-#: src/split.c:236
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -9781,192 +9878,192 @@ msgstr ""
 "r/K/N   jak wyżej, ale tylko K-ta część N wysłana na standardowe\n"
 "          wyjście\n"
 
-#: src/split.c:354
+#: src/split.c:353
 #, c-format
 msgid "output file suffixes exhausted"
 msgstr "zabrakło przyrostków plików wyjściowych"
 
-#: src/split.c:366
+#: src/split.c:365
 #, c-format
 msgid "creating file %s\n"
 msgstr "tworzenie pliku %s\n"
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr "%s nadpisałby dane wejściowe; zatrzymanie pracy"
 
-#: src/split.c:391
+#: src/split.c:390
 #, c-format
 msgid "failed to set FILE environment variable"
 msgstr "nie udało się ustawić zmiennej środowiskowej FILE"
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr "wykonywanie z FILE=%s\n"
 
-#: src/split.c:395
+#: src/split.c:394
 #, c-format
 msgid "failed to create pipe"
 msgstr "nie udało się utworzyć potoku"
 
-#: src/split.c:409
+#: src/split.c:408
 #, c-format
 msgid "closing prior pipe"
 msgstr "zamykanie potoku"
 
-#: src/split.c:411
+#: src/split.c:410
 #, c-format
 msgid "closing output pipe"
 msgstr "zamknięcie potoku wyjściowego"
 
-#: src/split.c:415
+#: src/split.c:414
 #, c-format
 msgid "moving input pipe"
 msgstr "zamykanie potoku wejściowego"
 
-#: src/split.c:417
+#: src/split.c:416
 #, c-format
 msgid "closing input pipe"
 msgstr "zamykanie potoku wejściowego"
 
-#: src/split.c:422
+#: src/split.c:421
 #, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr "nie udało się uruchomić polecenia \"%s -c %s\""
 
-#: src/split.c:428
+#: src/split.c:427
 #, c-format
 msgid "failed to close input pipe"
 msgstr "nie udało się zamknąć potoku wejściowego"
 
-#: src/split.c:464
+#: src/split.c:463
 #, c-format
 msgid "waiting for child process"
 msgstr "czekanie na proces potomny"
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr "podczas gdy FILE=%s, sygnał %s z polecenia %s"
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr "podczas gdy FILE=%s, status wyjścia %d polecenia %s"
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr "nieznany kod wyjściowe polecenia (0x%X)"
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr "nie można podzielić na więcej niż jeden sposób"
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, c-format
 msgid "%s: invalid number of chunks"
 msgstr "%s: błędna liczba części"
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, c-format
 msgid "%s: invalid chunk number"
 msgstr "%s: błędny numer części"
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr "%s: błędna długość przyrostka"
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr "%s: błędna liczba bajtów"
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr "%s: błędna liczba linii"
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, c-format
 msgid "line count option -%s%c... is too large"
 msgstr "za duża ilość linii w opcji -%s%c..."
 
-#: src/split.c:1248
+#: src/split.c:1298
 #, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr "%s: błędna początkowa wartość przyrostka liczbowego"
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, c-format
 msgid "%s: invalid IO block size"
 msgstr "%s: błędny rozmiar bloku IO"
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr "--filter nie przekazał przetworzonego fragmentu do wyjścia"
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr ""
 "początkowa wartość przyrostka liczbowego jest za duża jak na jego długość"
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, c-format
 msgid "%s: cannot determine file size"
 msgstr "%s: niemożliwe ustalenie rozmiaru pliku"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr "Michael Meskes"
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, c-format
 msgid "failed to canonicalize %s"
 msgstr "nie udało się kanonizować %s"
 
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr "uwaga: nierozpoznana sekwencja „\\%c�"
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, c-format
 msgid "%s: invalid directive"
 msgstr "%s: błędna dyrektywa"
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, c-format
 msgid "warning: backslash at end of format"
 msgstr "uwaga: ukośnik odwrotny na końcu formatu"
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr ""
 "użycie %s jako oznaczenia standardowego wejścia nie działa w trybie systemu "
 "plików"
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, c-format
 msgid "cannot read file system information for %s"
 msgstr "nie można przeczytać informacji systemowych o %s"
 
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, c-format
 msgid "cannot stat standard input"
 msgstr "nie można pobrać informacji o standardowym wejściu"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -9982,7 +10079,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -9992,30 +10089,30 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr "Urządzenie: %Dh/%dd\tinody: %-10i  dowiązań: %-5h typ: %t,%T\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr "Urządzenie: %Dh/%dd\tinody: %-10i  dowiązań: %h\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr "Dostęp: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, c-format
 msgid "Context: %C\n"
 msgstr "Kontekst: %C\n"
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -10027,11 +10124,11 @@ msgstr ""
 "Zmiana:      %z\n"
 "Utworzenie:  %w\n"
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
 msgstr "Wypisanie stanu pliku albo systemu plików\n"
 
-#: src/stat.c:1356
+#: src/stat.c:1418
 msgid ""
 "  -L, --dereference     follow links\n"
 "  -f, --file-system     display file system status instead of file status\n"
@@ -10040,13 +10137,13 @@ msgstr ""
 "  -L, --dereference     podążanie za dowiązaniami symbolicznymi\n"
 "  -f, --file-system     pokazanie danych systemu plików, a nie pliku\n"
 
-#: src/stat.c:1360
+#: src/stat.c:1422
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 "  -c  --format=FORMAT   użycie podanego FORMATU zamiast domyślnego; po\n"
@@ -10056,10 +10153,10 @@ msgstr ""
 "      --printf=FORMAT   jak --format, ale z interpretacjÄ… sekwencji z\n"
 "                          ukośnikiem odwrotnym i bez wypisywania znaku "
 "nowej\n"
-"                          linii. Żeby go wypisać użyj \\n w FORMACIE.\n"
+"                          linii; żeby go wypisać użyj \\n w FORMACIE.\n"
 "  -t, --terse           wypisywanie informacji w skróconej formie\n"
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 msgid ""
 "\n"
 "The valid format sequences for files (without --file-system):\n"
@@ -10079,7 +10176,7 @@ msgstr ""
 "  %B   rozmiar w bajtach każdego bloku podanego przez %b\n"
 "  %C   kontekst bezpieczeństwa SELinuksa\n"
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 msgid ""
 "  %d   device number in decimal\n"
 "  %D   device number in hex\n"
@@ -10095,7 +10192,7 @@ msgstr ""
 "  %g   numer grupy właściciela pliku\n"
 "  %G   nazwa grupy właściciela pliku\n"
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 msgid ""
 "  %h   number of hard links\n"
 "  %i   inode number\n"
@@ -10104,8 +10201,8 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 "  %h   liczba dowiązań zwykłych\n"
 "  %i   numer i-węzła\n"
@@ -10114,10 +10211,12 @@ msgstr ""
 "  %N   nazwa pliku w cudzysłowach, rozwiązana jeżeli dowiązanie symboliczne\n"
 "  %o   optymalny rozmiar rozmiar wiekości transferu wejścia/wyjścia\n"
 "  %s   całkowity rozmiar w bajtach\n"
-"  %t   większy numer urządzenia szesnastkowo\n"
-"  %T   mniejszy numer urzÄ…dzenia szesnastkowo\n"
+"  %t   pliki specjalne urządzeń znakowych/blokowych - większy numer\n"
+"          urzÄ…dzenia szesnastkowo\n"
+"  %T   pliki specjalne urządzeń znakowych/blokowych - mniejszy numer\n"
+"         urzÄ…dzenia szesnastkowo\n"
 
-#: src/stat.c:1399
+#: src/stat.c:1461
 msgid ""
 "  %u   user ID of owner\n"
 "  %U   user name of owner\n"
@@ -10125,10 +10224,10 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 "  %u   identyfikator właściciela\n"
@@ -10137,13 +10236,13 @@ msgstr ""
 "  %W   czas utworzenia pliku w sekundach od Epoki albo - jeżeli nieznany\n"
 "  %x   czytelny dla człowieka czas ostatniego czytania\n"
 "  %X   czas ostatniego czytania w sekundach od Epoki\n"
-"  %y   czytelny dla człowieka czas ostatniej modyfikacji\n"
-"  %Y   czas ostatniej modyfikacji w sekundach od Epoki\n"
-"  %z   czytelny dla człowieka czas ostatniej zmiany czasu\n"
-"  %Z   czas ostatniej zmiany czasu w sekundach od Epoki\n"
+"  %y   czytelny dla człowieka czas ostatniej modyfikacji danych\n"
+"  %Y   czas ostatniej modyfikacji danych w sekundach od Epoki\n"
+"  %z   czytelny dla człowieka czas ostatniej zmiany stanu\n"
+"  %Z   czas ostatniej zmiany stanu w sekundach od Epoki\n"
 "\n"
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 msgid ""
 "Valid format sequences for file systems:\n"
 "\n"
@@ -10161,7 +10260,7 @@ msgstr ""
 "  %d   liczba wolnych i-węzłów w systemie plików\n"
 "  %f   liczba wolnych bloków w systemie plików\n"
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 msgid ""
 "  %i   file system ID in hex\n"
 "  %l   maximum length of filenames\n"
@@ -10249,22 +10348,27 @@ msgstr ""
 "„stdbuf�. Niektóre filtry (jak „dd�, „cat� itp.) nie używają strumienia dla\n"
 "operacji wejścia/wyjścia i ich parametry nie bedą zmienione przez „stdbuf�.\n"
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, c-format
 msgid "failed to find %s"
 msgstr "nie udało się znaleźć %s"
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, c-format
 msgid "failed to update the environment with %s"
 msgstr "nie udało się zaktualizować środowiska %s"
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr "buforowanie liniowe standardowego wejścia nie ma znaczenia"
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, c-format
+msgid "you must specify a buffering mode option"
+msgstr "musisz podać opcję trybu buforowania"
+
+#: src/stty.c:516
 #, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -10275,11 +10379,11 @@ msgstr ""
 "    albo: %s [-F URZÄ„DZENIE] [--file=URZÄ„DZENIE] [-a|--all]\n"
 "    albo: %s [-F URZÄ„DZENIE] [--file=URZÄ„DZENIE] [-g|--save]\n"
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
 msgstr "Wypisanie lub zmiana ustawień terminala.\n"
 
-#: src/stty.c:525
+#: src/stty.c:528
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
 "  -g, --save         print all current settings in a stty-readable form\n"
@@ -10292,7 +10396,7 @@ msgstr ""
 "  -F, --file=URZĄDZENIE  otwarcie i używanie podanego URZĄDZENIA zamiast\n"
 "                     standardowego wejścia\n"
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
@@ -10302,7 +10406,7 @@ msgstr ""
 "Opcjonalny minus przed USTAWIENIEM oznacza zaprzeczenie. Gwiazdka * oznacza\n"
 "ustawienia spoza POSIX. System sam określa, które ustawienia są dostępne.\n"
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -10317,7 +10421,7 @@ msgstr ""
 "   eof ZNAK      ZNAK wysyła znak końca pliku (końca wejścia)\n"
 "   eol ZNAK      ZNAK wysyła znak końca linii\n"
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -10329,7 +10433,7 @@ msgstr ""
 "   intr ZNAK     ZNAK wysyła sygnał przerwania\n"
 "   kill ZNAK     ZNAK kasuje bieżącą linię\n"
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -10341,7 +10445,7 @@ msgstr ""
 " * rprnt ZNAK    ZNAK powtarza bieżącą linię\n"
 "   start ZNAK    ZNAK wznawia wyświetlanie\n"
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -10353,7 +10457,7 @@ msgstr ""
 " * swtch ZNAK    ZNAK włącza inną warstwę powłoki\n"
 " * werase ZNAK   ZNAK kasuje ostatnie wprowadzone słowo\n"
 
-#: src/stty.c:562
+#: src/stty.c:565
 msgid ""
 "\n"
 "Special settings:\n"
@@ -10367,7 +10471,7 @@ msgstr ""
 " * cols N        ustawienie szerokości terminala na N kolumn\n"
 " * columns N     to samo co  cols N\n"
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -10380,7 +10484,7 @@ msgstr ""
 "   min N         z -icanon ustawienie minimum N znaków pełnego odczytu\n"
 "   ospeed N      ustawienie prędkości wyjściowej na N\n"
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -10393,7 +10497,7 @@ msgstr ""
 "   speed         wyświetlenie prędkości terminala\n"
 "   time N        z -icanon ustawienie timeout na N dziesiÄ…tych sekundy\n"
 
-#: src/stty.c:581
+#: src/stty.c:584
 msgid ""
 "\n"
 "Control settings:\n"
@@ -10411,7 +10515,7 @@ msgstr ""
 " * [-]cdtrdsr    włączenie sterowania przepływem przez DTR/DSR\n"
 "   csN           ustawienie wielkości znaku na N bitów, N w zakresie [5..8]\n"
 
-#: src/stty.c:590
+#: src/stty.c:593
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
 "   [-]hup        send a hangup signal when the last process closes the tty\n"
@@ -10419,6 +10523,7 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 "   [-]cstopb     użycie dwóch bitów stopu na znak (jeden z „-�)\n"
 "   [-]hup        wysłanie sygnału rozłączenia gdy ostatni proces zamknie\n"
@@ -10426,8 +10531,9 @@ msgstr ""
 "   [-]hupcl      to samo co  [-]hup\n"
 "   [-]parenb     włączenie ustawiania i sprawdzania bitu parzystości\n"
 "   [-]parodd     włączenie parzystości nieparzystej (parzystej z „-�)\n"
+" * [-]cmspar     użycie „przylepnej� parzystości (mark/space)\n"
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -10443,7 +10549,7 @@ msgstr ""
 "   [-]ignbrk     ignorowanie znaku break\n"
 "   [-]igncr      ignorowanie znaku CR\n"
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -10458,12 +10564,12 @@ msgstr ""
 "   [-]inpck      włączenie kontroli parzystości na wejściu\n"
 "   [-]istrip     zerowanie najstarszego (ósmego) bitu znaków na wejściu\n"
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr ""
 " * [-]iutf8      program zakłada, że znaki wejściowe są zakodowane w UTF-8\n"
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -10479,7 +10585,7 @@ msgstr ""
 "   [-]parmrk     zaznaczanie błędów parzystości sekwencją 255-0-znak\n"
 "   [-]tandem     to samo co  [-]ixoff\n"
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -10495,10 +10601,10 @@ msgstr ""
 " * ffN           styl opóźnienia po znaku FF, N w zakresie [0..1]\n"
 " * nlN           styl opóźnienia po znaku NL, N w zakresie [0..1]\n"
 
-#: src/stty.c:631
+#: src/stty.c:635
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
@@ -10511,7 +10617,7 @@ msgstr ""
 " * [-]onlcr      zamienianie znaków NL na sekwencje CR-NL\n"
 " * [-]onlret     znak NL powoduje powrót karetki (carriage return)\n"
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -10529,7 +10635,7 @@ msgstr ""
 " * vtN           styl opóźnienia po tabulatorze pionowym, N w zakresie "
 "[0..1]\n"
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -10545,7 +10651,7 @@ msgstr ""
 " * -crtkill      kasowanie całej linii zgodnie z ustawieniami echoctl i "
 "echok\n"
 
-#: src/stty.c:654
+#: src/stty.c:658
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
 "   [-]echo       echo input characters\n"
@@ -10559,7 +10665,7 @@ msgstr ""
 "   [-]echoe      to samo co  [-]crterase\n"
 "   [-]echok      wyświetlanie znaku nowej linii po znaku kill\n"
 
-#: src/stty.c:661
+#: src/stty.c:665
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
 "   [-]echonl     echo newline even if not echoing other characters\n"
@@ -10573,7 +10679,7 @@ msgstr ""
 "   [-]icanon     wyświetlanie znaków erase, kill, werase i rprnt\n"
 "   [-]iexten     wyświetlanie znaków spoza specyfikacji POSIX\n"
 
-#: src/stty.c:668
+#: src/stty.c:672
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
 "   [-]noflsh     disable flushing after interrupt and quit special "
@@ -10589,7 +10695,7 @@ msgstr ""
 "terminal\n"
 " * [-]xcase      z icanon: wyświetlanie wielkich liter jako „\\mała-litera�\n"
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -10603,7 +10709,7 @@ msgstr ""
 "   cbreak        jak -icanon\n"
 "   -cbreak       jak icanon\n"
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -10615,7 +10721,7 @@ msgstr ""
 "   -cooked       jak raw\n"
 "   crt           jak echoe echoctl echoke\n"
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -10629,7 +10735,7 @@ msgstr ""
 "   ek            ustawienie znaków erase i kill na wartości domyślne\n"
 "   evenp         jak parenb -parodd cs7\n"
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -10645,7 +10751,7 @@ msgstr ""
 "   nl            jak -icrnl -onlcr\n"
 "   -nl           jak icrnl -inlcr -igncr onlcr -ocrnl -onlret\n"
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -10659,7 +10765,7 @@ msgstr ""
 "   pass8         jak -parenb -istrip cs8\n"
 "   -pass8        jak parenb istrip cs7\n"
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -10671,7 +10777,7 @@ msgstr ""
 "                 -imaxbel -opost -isig -icanon -xcase min 1 time 0\n"
 "   -raw          jak cooked\n"
 
-#: src/stty.c:716
+#: src/stty.c:720
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
 "                 -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n"
@@ -10687,7 +10793,7 @@ msgstr ""
 "                 -xcase -tostop -echoprt echoctl echoke, wszystkie znaki\n"
 "                 specjalne przybierają standardowe wartości\n"
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -10702,55 +10808,55 @@ msgstr ""
 "zakodowany np. ^c, 0x37, 0177 lub 127; wartość ^- lub słowo undef są\n"
 "używane do wyłączania znaków specjalnych.\n"
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, c-format
 msgid "only one device may be specified"
 msgstr "może być podane tylko jedno urządzenie"
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
 "mutually exclusive"
 msgstr "opcje --all i --save wzajemnie siÄ™ wykluczajÄ…"
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr "tryb nie może być ustawiany, gdy podany jest format wyjścia"
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr "%s: zresetowanie trybu nie blokującego nie było możliwe"
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, c-format
 msgid "invalid argument %s"
 msgstr "błędny argument %s"
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, c-format
 msgid "missing argument to %s"
 msgstr "brakujÄ…cy argument %s"
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, c-format
 msgid "invalid line discipline %s"
 msgstr "błędna dyscyplina linii: %s"
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr "%s: wykonanie wszystkich żądanych operacji było niemożliwe"
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr "%s: brak informacji o wielkości tego urządzenia"
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, c-format
 msgid "invalid integer argument %s"
 msgstr "błędny argument całkowity %s"
@@ -10806,7 +10912,7 @@ msgstr "      --help     wyświetlenie tego opisu i zakończenie\n"
 msgid "      --version  output version information and exit\n"
 msgstr "      --version  wyświetlenie informacji o wersji i zakończenie\n"
 
-#: src/system.h:544
+#: src/system.h:543
 msgid ""
 "\n"
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -10814,21 +10920,20 @@ msgstr ""
 "\n"
 "Argumenty obowiązkowe dla opcji długich obowiązują również dla krótkich.\n"
 
-#: src/system.h:552
+#: src/system.h:551
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 "\n"
-"ROZMIAR jest liczbą całkowitą z dodaną opcjonalnie jednostką (przykład: 10M "
-"to\n"
-"10*1024*1024). Jednostki to K, M, G, T, P, E, Z, Y (potęgi 1024) albo KB, "
-"MB,\n"
-"... (potęgi 1000).\n"
+"Argument ROZMIAR jest liczbą całkowitą z dodaną opcjonalnie jednostką\n"
+"(przykład: 10K to 10*1024). Jednostki to K, M, G, T, P, E, Z, Y (potęgi "
+"1024)\n"
+"albo KB, MB, ... (potęgi 1000).\n"
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -10843,39 +10948,39 @@ msgstr ""
 "bajty\n"
 "albo 512 bajtów jeżeli ustawiona jest zmienna POSIXLY_CORRECT.\n"
 
-#: src/system.h:571
+#: src/system.h:570
 #, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
+"%s online help: <%s>\n"
 msgstr ""
 "\n"
-"Raporty o błędach %s wysyłaj do %s\n"
+"Pomoc do %s w sieci: %s\n"
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr ""
 "O błędach tłumaczenia %s poinformuj przez http://translationproject.org/"
 "team/\n"
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr ""
 "Żeby przeczytać kompletną dokumentację uruchom: info coreutils „%s "
 "invocation�\n"
 
-#: src/system.h:596
+#: src/system.h:591
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Napisz „%s --help� dla uzyskania informacji.\n"
 
-#: src/system.h:628
+#: src/system.h:633
 #, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -10974,85 +11079,79 @@ msgstr ""
 
 #: src/tail.c:270
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
-"  -c, --bytes=N            wypisanie ostatnich N bajtów; alternatywnie użyj\n"
-"                           -c +K aby wypisać od N-tego bajtu z każdego z\n"
-"                           plików\n"
+"  -c, --bytes=N            wypisanie ostatnich N bajtów; albo użyj -c +K "
+"aby\n"
+"                             wypisać od K-tego bajtu z każdego z plików\n"
 
 #: src/tail.c:274
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           wypisywanie nowych danych kiedy plik rośnie;\n"
-"                           -f, --follow  i  --follow=descriptor sÄ…\n"
-"                           równoważne\n"
+"                             brakujący argument oznacza „descriptor�\n"
 "  -F                       to samo co  --follow=name --retry\n"
 
-#: src/tail.c:281
+#: src/tail.c:280
 #, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
-"  -n, --lines=K            wypisanie ostatnich K linii zamiast ostatnich %d\n"
+"  -n, --lines=K            wypisanie ostatnich K linii zamiast ostatnich "
+"%d;\n"
 "                             albo użyj -n +K dla wypisania linii od N-tej\n"
 "      --max-unchanged-stats=N\n"
 "                           z --follow=name powoduje ponowne otwieranie "
 "PLIKU,\n"
-"                           który nie zmienił rozmiaru po N (domyślnie %d)\n"
-"                           iteracjach, dla sprawdzenia czy został usunięty\n"
-"                           albo przemianowany (częsty przypadek dla logów)\n"
-"                           Ta opcja jest rzadko przydatna jeżeli dostępne\n"
-"                           jest inotify\n"
+"                             który nie zmienił rozmiaru po N (domyślnie %d)\n"
+"                             iteracjach, dla sprawdzenia czy został "
+"usunięty\n"
+"                             albo przemianowany (częsty przypadek dla "
+"logów);\n"
+"                             ta opcja jest rzadko przydatna jeżeli dostępne\n"
+"                             jest inotify\n"
 
-#: src/tail.c:294
+#: src/tail.c:293
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 "      --pid=PID            z -f - zakończenie pracy po zakończeniu procesu "
 "o\n"
 "                           numerze PID\n"
 "  -q, --quiet, --silent    bez wypisywania nagłówków z nazwami plików\n"
 "      --retry              stałe ponawianie próby otwierania pliku, nawet\n"
-"                             jeżeli jest niedostępny albo staje się\n"
-"                             niedostępny później; użyteczne do śledzenia wg\n"
-"                             nazwy, np. z --follow=name\n"
+"                             jeżeli jest niedostępny\n"
 
-#: src/tail.c:301
+#: src/tail.c:298
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 "  -s, --sleep-interval=N   z -f - odczekanie po N sekund (domyślnie 1,0 s)\n"
-"                             między iteracjami\n"
-"                             Z inotify i --pid=P - sprawdzanie procesu P co\n"
-"                             najmniej co N sekund.\n"
+"                             między iteracjami;\n"
+"                             z inotify i --pid=P - sprawdzanie procesu P co\n"
+"                             najmniej co N sekund\n"
 "  -v, --verbose            wypisywanie zawsze nagłówków z nazwami plików\n"
 
-#: src/tail.c:310
+#: src/tail.c:307
 msgid ""
 "\n"
 "If the first character of K (the number of bytes or lines) is a '+',\n"
@@ -11070,7 +11169,7 @@ msgstr ""
 "GB 1000*1000*1000, G 1024*1024*1024 itd. dla T, P, E, Z, Y.\n"
 "\n"
 
-#: src/tail.c:319
+#: src/tail.c:316
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
 "means that even if a tail'ed file is renamed, tail will continue to track\n"
@@ -11089,27 +11188,22 @@ msgstr ""
 "jakiś czas ponownie, żeby sprawdzić, czy nie został przemianowany albo\n"
 "usunięty i ponownie utworzony przez jakiś inny program.\n"
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr "zamykanie %s (fd=%d)"
 
-#: src/tail.c:453
-#, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr "%s: nie można ustawić pozycji względnej %s"
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr "%s: nie można ustawić pozycji %s względem końca pliku"
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr "nie można odszukać %s; powrót do cyklicznego sprawdzania"
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
@@ -11118,136 +11212,148 @@ msgstr ""
 "nierozpoznany system pliów typu 0x%08lx w %s; proszę wysłać raport do %s; "
 "powrót do cyklicznego sprawdzania"
 
-#: src/tail.c:963
+#: src/tail.c:965
+#, c-format
+msgid "%s has been replaced with a symbolic link. giving up on this name"
+msgstr "%s został zamieniony na łącze symboliczne; koniec śledzenia tej nazwy"
+
+#: src/tail.c:980
 #, c-format
 msgid "%s has become inaccessible"
 msgstr "%s stał się niedostępny"
 
-#: src/tail.c:980
+#: src/tail.c:997
 #, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr ""
 "%s został zamieniony na plik, którego nie można śledzić tailem; koniec "
 "śledzenia"
 
-#: src/tail.c:989
+#: src/tail.c:1006
 #, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr "%s został zamieniony na plik zdalny. koniec śledzenia tej nazwy"
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, c-format
 msgid "%s has become accessible"
 msgstr "%s stał się dostępny"
 
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr "%s pojawił się; śledzenie końca nowego pliku"
 
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr "%s został podmieniony; śledzenie końca nowego pliku"
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr "%s: zresetowanie trybu nie blokującego nie było możliwe"
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr "%s: plik obcięty"
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr "nie ma więcej plików"
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, c-format
 msgid "cannot watch parent directory of %s"
 msgstr "nie można śledzić katalogu nadrzędnego %s"
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, c-format
 msgid "inotify resources exhausted"
 msgstr "zabrakło zasobów inotify"
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, c-format
 msgid "cannot watch %s"
 msgstr "nie można śledzić %s"
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr "błąd monitorowanie zdarzenia inotify"
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, c-format
 msgid "error reading inotify event"
 msgstr "błąd czytania zdarzenia inotify"
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr "%s: pliku tego typu nie można śledzić"
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, c-format
 msgid "number in %s is too large"
 msgstr "liczba w %s jest za duża"
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr ""
 "%s: błędna maksymalna liczba braków zmian stanów między otwarciami pliku"
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr "%s: błędny PID"
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr "%s: błędna liczba sekund"
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr "opcja użyta w błędnym kontekście -- %c"
 
-#: src/tail.c:2034
+#: src/tail.c:2096
+#, c-format
+msgid "warning: --retry ignored; --retry is useful only when following"
+msgstr ""
+"uwaga: zignorowana opcja --retry; ta opcja jest przydatna tylko przy "
+"śledzeniu"
+
+#: src/tail.c:2100
 #, c-format
-msgid "warning: --retry is useful mainly when following by name"
-msgstr "uwaga: opcja --retry jest przydatna głównie przy śledzeniu nazwy"
+msgid "warning: --retry only effective for the initial open"
+msgstr "warning: --retry działa tylko w momencie początkowego otwarcia"
 
-#: src/tail.c:2038
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
 msgstr ""
 "uwaga: zignorowany PID; opcja --pid=PID jest przydatna tylko przy śledzeniu"
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr "uwaga: opcja --pid=PID nie działa w tym systemie"
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, c-format
 msgid "cannot follow %s by name"
 msgstr "nie można pokazywać pliku %s wg nazwy"
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr "warning: stałe podążanie za standardowym wejściem może sie nie udać"
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr "nie można użyć inotify, powrót do cyklicznego sprawdzania"
@@ -11520,17 +11626,17 @@ msgstr "nadmiarowy argument: %s"
 msgid "warning: sigprocmask"
 msgstr "uwaga: sigprocmask"
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr "uwaga: timer_settime"
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr "uwaga: timer_create"
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
@@ -11539,47 +11645,47 @@ msgstr ""
 "Składnia: %s [OPCJA] CZAS POLECENIE [ARGUMENT]...\n"
 "    albo: %s [OPCJA]\n"
 
-#: src/timeout.c:229
+#: src/timeout.c:232
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
 msgstr ""
 "Uruchomienie POLECENIA i zabicie go, jeżeli nadal działa po podanym\n"
 "okresie CZASU.\n"
 
-#: src/timeout.c:235
+#: src/timeout.c:238
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
 "      --preserve-status\n"
 "                 zakończenie z podaniem statusu POLECENIA, nawet jeżeli\n"
 "                   polecenie przekroczy czas\n"
 "      --foreground\n"
-"                 Gdy polecenie timeout nie jest uruchomione bezpośrednio\n"
-"                 z interaktywnej powłoki, pozwolenie POLECENIU na czytanie\n"
-"                 z TTY i odbierania sygnałów TTY. W tym trybie procesy\n"
-"                 potomne POLECENIA nie bedą podlegać ograniczeniu czasu.\n"
+"                 gdy polecenie timeout nie jest uruchomione bezpośrednio\n"
+"                   z interaktywnej powłoki, pozwolenie POLECENIU na "
+"czytanie\n"
+"                   z TTY i odbierania sygnałów TTY; w tym trybie procesy\n"
+"                   potomne POLECENIA nie bedą podlegać ograniczeniu czasu\n"
 "  -k, --kill-after=CZAS\n"
-"                 wysłanie również sygnału KILL (zabij) jeżeli POLECENIE\n"
-"                 nadal działa po wysłaniu pierwszego sygnału\n"
+"                   wysłanie również sygnału KILL (zabij) jeżeli POLECENIE\n"
+"                   nadal działa po wysłaniu pierwszego sygnału\n"
 "  -s, --signal=SYGNA�\n"
-"                 podanie sygnału do wysłania po upływie CZASU.\n"
-"                 SYGNA� może być podany przez nazwę, jak „HUP�, albo\n"
-"                 przez numer. Lista sygnałów: „kill -l�\n"
+"                   podanie sygnału do wysłania po upływie CZASU;\n"
+"                   SYGNA� może być podany przez nazwę, jak „HUP�, albo\n"
+"                   przez numer; lista sygnałów: „kill -l�\n"
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 msgid ""
 "\n"
 "DURATION is a floating point number with an optional suffix:\n"
@@ -11590,7 +11696,7 @@ msgstr ""
 "CZAS jest liczbÄ… rzeczywistÄ… z opcjonalnym przyrostkiem:\n"
 "to „s� dla sekund (domyślnie), „m� dla minut, „h� dla godzin, „d� dla dni.\n"
 
-#: src/timeout.c:259
+#: src/timeout.c:262
 msgid ""
 "\n"
 "If the command times out, and --preserve-status is not set, then exit with\n"
@@ -11610,17 +11716,17 @@ msgstr ""
 "być konieczne użycie sygnału KILL (9), który nie może być przechwycony. Po\n"
 "wysłaniu sygnału KILL (9), kod wyjścia to 128+9, a nie 124.\n"
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr "uwaga: nie udało się wyłączenie zrzutów pamięci"
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, c-format
 msgid "error waiting for command"
 msgstr "błąd zapisu w czasie czekania na polecenie"
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr "monitowane polecenie zrobiło zrzut pamięci"
@@ -12031,10 +12137,10 @@ msgstr ""
 #: src/truncate.c:115
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 "  -r, --reference=PLIKODN  użycie rozmiaru tego PLIKU ODNIESIENIA\n"
-"  -s, --size=ROZMIAR     użycie tego ROZMIARU\n"
+"  -s, --size=ROZMIAR     użycie tego ROZMIARU w bajtach\n"
 
 #: src/truncate.c:121
 msgid ""
@@ -12092,7 +12198,7 @@ msgstr "musisz podać albo %s albo %s"
 #: src/truncate.c:340
 #, c-format
 msgid "you must specify a relative %s with %s"
-msgstr "musisz podać względy %s z %s"
+msgstr "musisz podać względny %s z %s"
 
 #: src/truncate.c:347
 #, c-format
@@ -12123,12 +12229,12 @@ msgstr ""
 "wejście.\n"
 "\n"
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr "%s: dane wejściowe zawierają nieparzystą liczbę elementów"
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr "%s: dane wejściowe zawierają pętlę:"
@@ -12226,12 +12332,12 @@ msgstr "znaki tabulacji zbyt odległe od siebie"
 msgid "tab stop value is too large"
 msgstr "za duża wartość pozycji końca TABów"
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr "Składnia: %s [OPCJA]... [WEJŚCIE [WYJŚCIE]]\n"
 
-#: src/uniq.c:138
+#: src/uniq.c:174
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
 "writing to OUTPUT (or standard output).\n"
@@ -12245,43 +12351,59 @@ msgstr ""
 "Jeżeli nie są podane żadne opcje, pozostawiana jest tylko pierwsza z\n"
 "identycznych linii.\n"
 
-#: src/uniq.c:147
+#: src/uniq.c:183
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
 msgstr ""
 "  -c, --count           poprzedzenie linii liczbą powtórzeń\n"
-"  -d, --repeated        wypisanie tylko powtórzonych linii\n"
+"  -d, --repeated        wypisanie tylko powtórzonych linii, jednej dla\n"
+"                          każdej grupy\n"
+
+#: src/uniq.c:187
+msgid ""
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
+msgstr ""
+"  -D, --all-repeated[=METODA]  wypisanie wszystkich powtarzajÄ…cych siÄ™ "
+"linii;\n"
+"                          grupy mogą być oddzielone przez pustą linię;\n"
+"                          METODA={none(domyślna),prepend,separate}\n"
+"                          (żadna, przed, pomiędzy).\n"
+
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr "  -f, --skip-fields=N   bez porównania pierwszych N pól\n"
 
-#: src/uniq.c:151
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
+msgstr ""
+"      --group[=METODA]  wypisanie wszystkich elementów z odseparowaniem "
+"grup\n"
+"                          pustÄ… liniÄ…\n"
+"                          METODA={separate(domyślna),prepend,append,both}\n"
+"                          (pomiędzy, przed, po, obie)\n"
+
+#: src/uniq.c:199
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
 "  -i, --ignore-case     ignore differences in case when comparing\n"
 "  -s, --skip-chars=N    avoid comparing the first N characters\n"
 "  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
-msgstr ""
-"  -D, --all-repeated[=metoda-oddzielenia]  wypisanie wszystkich\n"
-"                        powtarzajÄ…cych siÄ™ linii.\n"
-"                        metoda-oddzielenia={none(domyślna),prepend,"
-"separate}\n"
-"                        (żadna, przed, pomiędzy).\n"
-"                        Do oddzielania używane są puste linie.\n"
-"  -f, --skip-fields=N   bez porównania pierwszych N pól\n"
+msgstr ""
 "  -i, --ignore-case     ignorowanie różnic między małymi i wielkimi "
 "literami\n"
 "  -s, --skip-chars=N    bez porównania pierwszych N znaków\n"
 "  -u, --unique          wypisanie tylko linii unikalnych\n"
-"  -z, --zero-terminated  na końcach linii bajty 0, nie znak nowej linii\n"
 
-#: src/uniq.c:161
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr "  -w, --check-chars=N   porównanie najwyżej N znaków w liniach\n"
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 msgid ""
 "\n"
 "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n"
@@ -12293,7 +12415,7 @@ msgstr ""
 "przeskakiwaniem\n"
 "znaków.\n"
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 msgid ""
 "\n"
 "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n"
@@ -12306,26 +12428,37 @@ msgstr ""
 "zamiast „uniq�. Porównania odbywają się zgodnie z regułami podanymi przez\n"
 "„LC_COLLATE�.\n"
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, c-format
 msgid "too many repeated lines"
 msgstr "za dużo powtórzonych linii"
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
 msgstr "błędna liczba pól do przeskoczenia"
 
 # bytes to skip? we were talking about chars? - rzm
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
 msgstr "błędna liczba bajtów do przeskoczenia"
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
 msgstr "błędna liczba bajtów do porównania"
 
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr "--group wyklucza siÄ™ wzajemnie z -c/-d/-D/-u"
+
+# ? rzm
+#: src/uniq.c:652
+#, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr "łączenie w grupy i wypisywanie liczby powtórzeń nie ma sensu"
+
 # ? rzm
-#: src/uniq.c:558
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr ""
@@ -12348,11 +12481,6 @@ msgstr ""
 "Wywołanie funkcji unlink (usuń) aby usunąć podany PLIK.\n"
 "\n"
 
-#: src/unlink.c:86
-#, c-format
-msgid "cannot unlink %s"
-msgstr "nie można usunąć %s"
-
 # pola tabelki wymagaja poprawienia szerokosci -pk
 #: src/uptime.c:125
 #, c-format
@@ -12401,7 +12529,7 @@ msgstr[2] "%lu użytkowników"
 msgid ",  load average: %.2f"
 msgstr ",  średnie obciążenie: %.2f"
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -12412,7 +12540,7 @@ msgstr ""
 "użytkowników zalogowanych w systemie oraz średniej liczby\n"
 "procesów uruchamianych w ciągu ostatnich 1, 5 i 15 minut."
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
@@ -12421,12 +12549,12 @@ msgstr ""
 "  Procesy w\n"
 "stanie nieprzrywalnego snu też wpływają na średnie obciążenie.\n"
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr "\n"
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
diff --git a/po/pt.gmo b/po/pt.gmo
index 07a3a161..c8b1f426 100644
--- a/po/pt.gmo
+++ b/po/pt.gmo
diff --git a/po/pt.po b/po/pt.po
index b4b4092d..8873edd9 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: coreutils 6.11\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
 "PO-Revision-Date: 2008-04-23 00:02+0100\n"
 "Last-Translator: Helder Correia <helder.pereira.correia@gmail.com>\n"
 "Language-Team: Portuguese <translation-team-pt@lists.sourceforge.net>\n"
@@ -36,76 +36,124 @@ msgstr "Argumentos válidos:"
 msgid "error closing file"
 msgstr "erro ao fechar o ficheiro"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "erro de escrita"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "a preservar as permissões de %s"
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "Erro de sistema desconhecido"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "ficheiro regular vazio"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "ficheiro regular"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "pasta"
 
-#: lib/file-type.c:44
-msgid "block special file"
-msgstr "ficheiro especial de blocos"
-
-#: lib/file-type.c:47
-msgid "character special file"
-msgstr "ficheiro especial de caracteres"
-
-#: lib/file-type.c:50
-msgid "fifo"
-msgstr "fifo"
-
-#: lib/file-type.c:53
+#: lib/file-type.c:46
 msgid "symbolic link"
 msgstr "ligação simbólica"
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "socket"
-
-#: lib/file-type.c:59
+#: lib/file-type.c:52
 msgid "message queue"
 msgstr "fila de mensagens"
 
-#: lib/file-type.c:62
+#: lib/file-type.c:55
 msgid "semaphore"
 msgstr "semáforo"
 
-#: lib/file-type.c:65
+#: lib/file-type.c:58
 msgid "shared memory object"
 msgstr "objecto de memória partilhada"
 
-#: lib/file-type.c:68
+#: lib/file-type.c:61
 msgid "typed memory object"
 msgstr "objecto de memória tipada"
 
-#: lib/file-type.c:70
+#: lib/file-type.c:66
+msgid "block special file"
+msgstr "ficheiro especial de blocos"
+
+#: lib/file-type.c:69
+msgid "character special file"
+msgstr "ficheiro especial de caracteres"
+
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr ""
+
+#: lib/file-type.c:75
+msgid "fifo"
+msgstr "fifo"
+
+#: lib/file-type.c:78
+msgid "door"
+msgstr ""
+
+#: lib/file-type.c:81
+#, fuzzy
+msgid "multiplexed block special file"
+msgstr "ficheiro especial de blocos"
+
+#: lib/file-type.c:84
+#, fuzzy
+msgid "multiplexed character special file"
+msgstr "ficheiro especial de caracteres"
+
+#: lib/file-type.c:87
+#, fuzzy
+msgid "multiplexed file"
+msgstr "múltiplos papéis"
+
+#: lib/file-type.c:90
+#, fuzzy
+msgid "named file"
+msgstr "ficheiro estranho"
+
+#: lib/file-type.c:93
+#, fuzzy
+msgid "network special file"
+msgstr "ficheiro especial de blocos"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr ""
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr ""
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr ""
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "socket"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr ""
+
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "ficheiro estranho"
 
@@ -240,18 +288,18 @@ msgstr "%s: a opção '-W %s' não permite um argumento\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: a opção '%s' requere um argumento\n"
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr "impossível alterar as permissões de %s"
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "impossível criar a pasta %s"
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr "memória esgotada"
@@ -368,7 +416,7 @@ msgstr "Expressão regular demasiado grande"
 msgid "Unmatched ) or \\)"
 msgstr ") ou \\) não correspondido"
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 msgid "No previous regular expression"
 msgstr "Nenhuma expressão regular anterior"
 
@@ -393,7 +441,7 @@ msgstr "use --no-preserve-root para contornar esta segurança contra falhas"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[yY]"
 
@@ -403,11 +451,11 @@ msgstr "^[yY]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, c-format
 msgid "setting permissions for %s"
 msgstr "a definir as permissões de %s"
@@ -554,18 +602,6 @@ msgstr "erro de open"
 msgid "Resource lost"
 msgstr ""
 
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, fuzzy, c-format
-msgid "cannot create pipe"
-msgstr "impossível criar fifo %s"
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, fuzzy, c-format
-msgid "%s subprocess failed"
-msgstr "%s: erro de seek"
-
 #: lib/strsignal.c:114
 #, fuzzy, c-format
 msgid "Real-time signal %d"
@@ -777,7 +813,7 @@ msgstr ""
 "\n"
 "Comunique erros através de <%s>.\n"
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr ""
@@ -787,30 +823,10 @@ msgstr ""
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr ""
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr ""
 
-#: lib/w32spawn.h:43
-#, fuzzy, c-format
-msgid "_open_osfhandle failed"
-msgstr "erro de open"
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr ""
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr ""
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr ""
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr ""
@@ -833,7 +849,7 @@ msgstr "Erro de sistema desconhecido"
 msgid "failed to reopen %s with mode %s"
 msgstr "erro ao remover %s"
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr "erro na comparação de expressões"
@@ -894,7 +910,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -917,48 +933,47 @@ msgstr ""
 "do alfabeto base64 formal. Use --ignore-garbage para tentar recuperar\n"
 "de quaisquer outros caracteres não alfabéticos nos dados codificados.\n"
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "erro de leitura"
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, c-format
 msgid "invalid input"
 msgstr "dados de entrada inválidos"
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, c-format
 msgid "invalid wrap size: %s"
 msgstr "comprimento de partição inválido: %s"
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, c-format
 msgid "extra operand %s"
 msgstr "operando extra %s"
 
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, c-format
 msgid "closing standard input"
 msgstr "a fechar a entrada padrão"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -989,8 +1004,8 @@ msgstr ""
 #: src/basename.c:60
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/basename.c:67
@@ -1004,32 +1019,31 @@ msgid ""
 "  %s -a any/str1 any/str2   -> \"str1\" followed by \"str2\"\n"
 msgstr ""
 
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, c-format
 msgid "missing operand"
 msgstr "operando em falta"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 msgid "Richard M. Stallman"
 msgstr ""
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1087,7 +1101,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr "erro ao executar ioctl em %s"
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr "canal de saída padrão (stdout)"
@@ -1104,14 +1118,14 @@ msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 msgid "Jim Meyering"
 msgstr ""
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, c-format
 msgid "failed to create security context: %s"
 msgstr "erro ao criar contexto de segurança: %s"
@@ -1121,8 +1135,8 @@ msgstr "erro ao criar contexto de segurança: %s"
 msgid "failed to set %s security context component to %s"
 msgstr "erro ao definir o contexto de segurança de %s para %s"
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, c-format
 msgid "failed to get security context of %s"
 msgstr "erro ao obter contexto de segurança de %s"
@@ -1132,18 +1146,18 @@ msgstr "erro ao obter contexto de segurança de %s"
 msgid "can't apply partial context to unlabeled file %s"
 msgstr "impossível aplicar contexto parcial ao ficheiro não etiquetado %s"
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, c-format
 msgid "failed to change context of %s to %s"
 msgstr "erro ao alterar contexto de %s para %s"
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
 msgstr "impossível aceder a %s"
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, c-format
 msgid "cannot read directory %s"
 msgstr "impossível ler a pasta %s"
@@ -1153,13 +1167,14 @@ msgstr "impossível ler a pasta %s"
 msgid "changing security context of %s\n"
 msgstr "a alterar contexto de segurança de %s"
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, c-format
 msgid "fts_read failed"
 msgstr "fts_read falhou"
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, fuzzy, c-format
 msgid "fts_close failed"
 msgstr "erro de close"
@@ -1179,7 +1194,7 @@ msgstr ""
 #: src/chcon.c:357
 #, fuzzy
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
@@ -1192,12 +1207,20 @@ msgstr ""
 "  -h, --no-dereference   afectar lig. simbólicas e não fich. referenciados\n"
 
 #: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94
+#, fuzzy
 msgid ""
 "      --dereference      affect the referent of each symbolic link (this is\n"
 "                         the default), rather than the symbolic link itself\n"
 "  -h, --no-dereference   affect symbolic links instead of any referenced "
 "file\n"
 msgstr ""
+"Mudar o contexto de segurança de cada FICHEIRO para CONTEXTO.\n"
+"Com --reference, mudar cont. de segurança de cada FICHEIRO para o de "
+"FICHREF.\n"
+"\n"
+"  -c, --changes          como verboso mas comunicar apenas quando há "
+"mudança\n"
+"  -h, --no-dereference   afectar lig. simbólicas e não fich. referenciados\n"
 
 #: src/chcon.c:369
 #, fuzzy
@@ -1213,7 +1236,7 @@ msgstr ""
 "  -l, --range=ALCANCE    definir ALCANCE no contexto de segurança alvo\n"
 "\n"
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 #, fuzzy
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
@@ -1271,36 +1294,37 @@ msgstr ""
 "  -P                     não percorrer ligações simbólicas (predefinido)\n"
 "\n"
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr "-R --dereference requere -H ou -L"
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr "-R -h requere -P"
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, c-format
 msgid "missing operand after %s"
 msgstr "operando em falta após %s"
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, c-format
 msgid "invalid context: %s"
 msgstr "contexto inválido: %s"
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr "especificadores de contexto de segurança em conflito"
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, c-format
 msgid "failed to get attributes of %s"
 msgstr "erro ao obter os atributos de %s"
@@ -1320,21 +1344,13 @@ msgstr ""
 "  ou:       %s [OPÇÃO]... --reference=FICHREF FICHEIRO...\n"
 
 #: src/chgrp.c:113
-#, fuzzy
 msgid ""
 "Change the group of each FILE to GROUP.\n"
 "With --reference, change the group of each FILE to that of RFILE.\n"
 "\n"
 msgstr ""
-"Mudar o contexto de segurança de cada FICHEIRO para CONTEXTO.\n"
-"Com --reference, mudar cont. de segurança de cada FICHEIRO para o de "
-"FICHREF.\n"
-"\n"
-"  -c, --changes          como verboso mas comunicar apenas quando há "
-"mudança\n"
-"  -h, --no-dereference   afectar lig. simbólicas e não fich. referenciados\n"
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
@@ -1371,47 +1387,47 @@ msgstr ""
 "  %s staff /u      Mudar o grupo de /u para \"staff\".\n"
 "  %s -hR staff /u  Mudar o grupo de /u e sub-ficheiros para \"staff\".\n"
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
 msgstr "a obter os novos atributos de %s"
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr "ligação simbólica %s e referência inalteradas\n"
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, fuzzy, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr "modo de %s alterado para %04lo (%s)\n"
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, fuzzy, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr "erro ao alterar o modo de %s para %04lo (%s)\n"
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr "modo de %s mantido como %04lo (%s)\n"
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr "impossível operar sobre ligação simbólica %s"
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, c-format
 msgid "changing permissions of %s"
 msgstr "a alterar as permissões de %s"
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr "%s: as novas permissões são %s, não %s"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1422,36 +1438,22 @@ msgstr ""
 "  ou:       %s [OPÇÃO]... MODO-OCTAL FICHEIRO...\n"
 "  ou:       %s [OPÇÃO]... --reference=FICHREF FICHEIRO...\n"
 
-#: src/chmod.c:377
-#, fuzzy
+#: src/chmod.c:380
 msgid ""
 "Change the mode of each FILE to MODE.\n"
 "With --reference, change the mode of each FILE to that of RFILE.\n"
 "\n"
 msgstr ""
-"Mudar o contexto de segurança de cada FICHEIRO para CONTEXTO.\n"
-"Com --reference, mudar cont. de segurança de cada FICHEIRO para o de "
-"FICHREF.\n"
-"\n"
-"  -c, --changes          como verboso mas comunicar apenas quando há "
-"mudança\n"
-"  -h, --no-dereference   afectar lig. simbólicas e não fich. referenciados\n"
 
-#: src/chmod.c:391
-#, fuzzy
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
-"      --reference=FICHREF  usar contexto de segurança de FICHREF em vez de\n"
-"                           especificar um valor de CONTEXTO\n"
-"  -R, --recursive          operar em ficheiros e pastas recursivamente\n"
-"  -v, --verbose            despejar um diagnóstico para cada ficheiro "
-"processado\n"
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr ""
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 #, fuzzy
 msgid ""
 "\n"
@@ -1460,12 +1462,12 @@ msgstr ""
 "\n"
 "Cada MODO tem a forma '[ugoa]*([-+=]([rwxXst]*|[ugo]))+'.\n"
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr "impossível combinar opções de modo e --reference"
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, c-format
 msgid "invalid mode: %s"
 msgstr "modo inválido: %s"
@@ -1610,26 +1612,21 @@ msgstr ""
 "  %s -hR root /u    Mudar o dono de /u e sub-ficheiros para \"root\".\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr ""
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr "grupo %s inválido"
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, fuzzy, c-format
 msgid "invalid group list %s"
 msgstr "grupo %s inválido"
 
-#: src/chroot.c:117
-#, fuzzy, c-format
-msgid "failed to set additional groups"
-msgstr "erro ao definir grupo(s) adicional(is)"
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
@@ -1638,7 +1635,7 @@ msgstr ""
 "Utilização: %s OPÇÃO UTILIZADOR COMANDO [ARGUMENTO]...\n"
 "  ou:       %s OPÇÃO\n"
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
@@ -1646,13 +1643,13 @@ msgstr ""
 "Executar COMANDO como pasta raiz definida como NOVARAIZ.\n"
 "\n"
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
 msgstr ""
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 #, fuzzy
 msgid ""
 "\n"
@@ -1662,28 +1659,42 @@ msgstr ""
 "Se nenhum comando for dado, executar ``${SHELL} -i'' (predefinido: /bin/"
 "sh).\n"
 
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, c-format
 msgid "cannot change root directory to %s"
 msgstr "impossível alterar a pasta raiz para %s"
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, c-format
 msgid "cannot chdir to root directory"
 msgstr "impossível mudar para a pasta raiz"
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr ""
+
+#: src/chroot.c:383
+#, fuzzy, c-format
+msgid "failed to get supplemental groups"
+msgstr "erro ao definir grupo(s) adicional(is)"
+
+#: src/chroot.c:395
+#, fuzzy, c-format
+msgid "failed to %s supplemental groups"
+msgstr "erro ao definir grupo(s) adicional(is)"
+
+#: src/chroot.c:402
 #, fuzzy, c-format
 msgid "failed to set group-ID"
 msgstr "erro ao definir o novo papel %s"
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, fuzzy, c-format
 msgid "failed to set user-ID"
 msgstr "erro ao definir o novo utilizador %s"
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, fuzzy, c-format
 msgid "failed to run command %s"
 msgstr "impossível executar o comando %s"
@@ -1715,7 +1726,7 @@ msgstr ""
 "Exibir o CRC e contagem de bytes de cada FICHEIRO.\n"
 "\n"
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr "Utilização: %s [OPÇÃO]... FICHEIRO1 FICHEIRO2\n"
@@ -1799,294 +1810,327 @@ msgstr "múltiplas opções -i especificadas"
 msgid "empty %s not allowed"
 msgstr ""
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr "erro ao ler %s"
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, c-format
 msgid "cannot lseek %s"
 msgstr "impossível alterar o posicionamento dentro do ficheiro %s"
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr "erro ao escrever %s"
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, fuzzy, c-format
 msgid "%s: failed to get extents info"
 msgstr "erro ao obter o contexto actual"
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, fuzzy, c-format
 msgid "%s: write failed"
 msgstr "erro de escrita"
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, fuzzy, c-format
 msgid "failed to extend %s"
 msgstr "erro ao abrir %s"
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, c-format
 msgid "clearing permissions for %s"
 msgstr "a limpar as permissões de %s"
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "erro ao preservar o dono de %s"
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
 msgstr "ficheiro %s não encontrado"
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, c-format
 msgid "failed to preserve authorship for %s"
 msgstr "erro ao preservar o criador de %s"
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
+#, c-format
+msgid "failed to set default file creation context to %s"
+msgstr "erro ao alterar contexto padrão de criação de ficheiros %s"
+
+#: src/copy.c:820
+#, fuzzy, c-format
+msgid "failed to set default file creation context for %s"
+msgstr "erro ao alterar contexto padrão de criação de ficheiros %s"
+
+#: src/copy.c:846
+#, fuzzy, c-format
+msgid "failed to set the security context of %s"
+msgstr "erro ao alterar o contexto de segurança de %s para %s"
+
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
 msgid "cannot open %s for reading"
 msgstr "impossível abrir %s para leitura"
 
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, c-format
 msgid "cannot fstat %s"
 msgstr "impossível obter o estado de %s"
 
-#: src/copy.c:820
+#: src/copy.c:935
 #, c-format
 msgid "skipping file %s, as it was replaced while being copied"
 msgstr "a saltar o ficheiro %s, uma vez que foi substituído ao ser copiado"
 
-#: src/copy.c:850
-#, c-format
-msgid "failed to get file system create context"
-msgstr "erro ao obter o contexto de criação do sistema de ficheiros"
-
-#: src/copy.c:864
-#, c-format
-msgid "failed to set the security context of %s to %s"
-msgstr "erro ao alterar o contexto de segurança de %s para %s"
-
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
 msgid "cannot remove %s"
 msgstr "impossível remover %s"
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
 msgstr "%s removido\n"
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr "a não escrever através da ligação simbólica %s"
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, c-format
 msgid "cannot create regular file %s"
 msgstr "impossível criar o ficheiro regular %s"
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, fuzzy, c-format
 msgid "failed to clone %s from %s"
 msgstr "erro ao fechar a pasta %s"
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr "a preservar os dados de tempo de %s"
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
 #, fuzzy, c-format
 msgid "failed to close %s"
 msgstr "erro ao abrir %s"
 
-#: src/copy.c:1471
-#, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
+#: src/copy.c:1580
+#, fuzzy, c-format
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
 msgstr "%s: tentar sobrescrever %s, cancelando o modo %04lo (%s)? "
 
-#: src/copy.c:1478
+#: src/copy.c:1581
+#, c-format
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr ""
+
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
 msgstr "%s: sobrescrever %s? "
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr " (salvaguarda: %s)"
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr "erro ao restaurar o context de criação de ficheiros predefinido"
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, c-format
 msgid "cannot create hard link %s to %s"
 msgstr "impossível criar a ligação persistente %s para %s"
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, c-format
 msgid "cannot stat %s"
 msgstr "impossível analisar %s"
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, c-format
 msgid "omitting directory %s"
 msgstr "a omitir a pasta %s"
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr "aviso: ficheiro de origem %s especificado mais de uma vez"
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
 msgstr "%s e %s são o mesmo ficheiro"
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr "impossível sobrescrever a não-pasta %s com a pasta %s"
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr "recém-criado %s não será sobrescrito com %s"
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr "impossível sobrescrever a pasta %s com não-pasta"
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr "impossível mover a pasta para a não pasta: %s -> %s"
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr "salvaguardar %s destruiria a origem; %s não movido"
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr "salvaguardar %s destruiria a origem; %s não copiado"
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
 msgstr "impossível salvaguardar %s"
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr "%s não será copiado através da ligação simbólica recém-criada %s"
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr "impossível copiar uma pasta, %s, para si própria, %s"
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr "a ligação persistente %s não será copiada para a pasta %s"
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr "impossível mover %s para uma própria sub-pasta, %s"
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, c-format
 msgid "cannot move %s to %s"
 msgstr "impossível mover %s para %s"
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr "erro ao mover entre dispositivos: %s para %s; impossível remover alvo"
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, c-format
-msgid "failed to set default file creation context to %s"
-msgstr "erro ao alterar contexto padrão de criação de ficheiros %s"
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr "impossível copiar a ligação simbólica cíclica %s"
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr "%s: ligações simbólicas relativas possíveis apenas na pasta actual"
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr "impossível criar a ligação simbólica %s para %s"
 
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, c-format
 msgid "cannot create fifo %s"
 msgstr "impossível criar fifo %s"
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, c-format
 msgid "cannot create special file %s"
 msgstr "impossível criar o ficheiro especial %s"
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, c-format
 msgid "cannot read symbolic link %s"
 msgstr "impossível ler a ligação simbólica %s"
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, c-format
 msgid "cannot create symbolic link %s"
 msgstr "impossível criar a ligação simbólica %s"
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
 msgstr "%s é um tipo de ficheiro desconhecido"
 
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, c-format
 msgid "cannot un-backup %s"
 msgstr "impossível recuperar %s"
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr "%s -> %s (recuperação)\n"
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr ""
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr ""
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, fuzzy, c-format
+msgid "unknown program %s"
+msgstr "ID de utilizador desconhecido: %s"
+
+#: src/cp.c:157 src/mv.c:288
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -2097,14 +2141,14 @@ msgstr ""
 "  ou:       %s [OPÇÃO]... FONTE... PASTA\n"
 "  ou:       %s [OPÇÃO]... -t PASTA FONTE...\n"
 
-#: src/cp.c:162
+#: src/cp.c:163
 #, fuzzy
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 "Copiar FONTE para DESTINO, ou múltiplas FONTE(s) pasta PASTA.\n"
 "\n"
 
-#: src/cp.c:168
+#: src/cp.c:169
 #, fuzzy
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
@@ -2127,7 +2171,7 @@ msgstr ""
 "  -d                           o mesmo que --no-dereference --"
 "preserve=links\n"
 
-#: src/cp.c:177
+#: src/cp.c:178
 #, fuzzy
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
@@ -2147,7 +2191,7 @@ msgstr ""
 "  -H                           seguir as ligações simbólicas da linha de "
 "comandos em ORIGEM\n"
 
-#: src/cp.c:186
+#: src/cp.c:187
 #, fuzzy
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
@@ -2156,7 +2200,7 @@ msgstr ""
 "  -l, --link                   ligar ficheiros em vez de copiar\n"
 "  -L, --dereference            seguir sempre ligações simbólicas em ORIGEM\n"
 
-#: src/cp.c:190
+#: src/cp.c:191
 #, fuzzy
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
@@ -2170,7 +2214,7 @@ msgstr ""
 "  -H                           seguir as ligações simbólicas da linha de "
 "comandos em ORIGEM\n"
 
-#: src/cp.c:195
+#: src/cp.c:196
 #, fuzzy
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
@@ -2187,7 +2231,7 @@ msgstr ""
 "                                 mode,ownership,timestamps), se possível\n"
 "                                 atributos adicionais: context, links, all\n"
 
-#: src/cp.c:203
+#: src/cp.c:204
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                use full source file name under DIRECTORY\n"
@@ -2196,7 +2240,7 @@ msgstr ""
 "      --parents                 usar nome completo de ficheiro de origem em "
 "PASTA\n"
 
-#: src/cp.c:207
+#: src/cp.c:208
 #, fuzzy
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
@@ -2210,7 +2254,7 @@ msgstr ""
 "antes\n"
 "                                 de tentar abri-lo (oposto a --force)\n"
 
-#: src/cp.c:213
+#: src/cp.c:214
 #, fuzzy
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
@@ -2222,7 +2266,7 @@ msgstr ""
 "      --strip-trailing-slashes  remover as 'barras' de cada argumento de\n"
 "                                 ORIGEM\n"
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -2236,7 +2280,7 @@ msgstr ""
 "PASTA\n"
 "  -T, --no-target-directory    tratar DESTINO como um ficheiro normal\n"
 
-#: src/cp.c:224
+#: src/cp.c:225
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
 "                                 than the destination file or when the\n"
@@ -2250,7 +2294,15 @@ msgstr ""
 "  -v, --verbose                explicar o que está a ser feito\n"
 "  -x, --one-file-system        permanecer neste sistema de ficheiros\n"
 
-#: src/cp.c:233
+#: src/cp.c:232
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/cp.c:240
 #, fuzzy
 msgid ""
 "\n"
@@ -2277,7 +2329,7 @@ msgstr ""
 "Use --sparse=never para inibir a criação de ficheiros esparsos.\n"
 "\n"
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 #, fuzzy
 msgid ""
 "\n"
@@ -2294,7 +2346,7 @@ msgstr ""
 "variável de ambiente VERSION_CONTROL. Eis os valores:\n"
 "\n"
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2307,7 +2359,7 @@ msgstr ""
 "simples\n"
 "  simple, never   efectuar sempre salvaguardas simples\n"
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2319,224 +2371,234 @@ msgstr ""
 "'backup' são dadas e ORIGEM e DESTINO têm o mesmo nome para um ficheiro\n"
 "existente e regular.\n"
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, c-format
 msgid "failed to preserve times for %s"
 msgstr "erro ao preservar os tempos de %s"
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, c-format
 msgid "failed to preserve permissions for %s"
 msgstr "erro ao preservar permissões de %s"
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, c-format
 msgid "cannot make directory %s"
 msgstr "impossível criar a pasta %s"
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr "%s existe mas não é uma pasta"
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
 #, fuzzy, c-format
 msgid "failed to access %s"
 msgstr "erro ao abrir %s"
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, c-format
 msgid "missing file operand"
 msgstr "operando de ficheiro em falta"
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, c-format
 msgid "missing destination file operand after %s"
 msgstr "operando de ficheiro de destino em falta após %s"
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, fuzzy, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr ""
 "Impossível combinar --target-directory (-t) e --no-target-directory (-T)"
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, c-format
 msgid "target %s is not a directory"
 msgstr "o destino %s não é uma pasta"
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr "com --parents, o destino deve ser uma pasta"
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, c-format
 msgid "multiple target directories specified"
 msgstr "múltiplas pastas de destino especificadas"
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, fuzzy, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr "Aviso: a ignorar --context (-Z); SELinux não activado."
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr "impossível criar ligações simbólicas e persistentes"
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, fuzzy, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr ""
 "as opções para especificar datas para impressão são mutuamente exclusivas"
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr ""
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr "tipo de salvaguarda"
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, fuzzy, c-format
+msgid "cannot set target context and preserve it"
+msgstr "impossível forçar contexto alvo a %s e preservá-lo"
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr ""
 "impossível preservar contexto de segurança sem um sistema operativo com "
 "suporte SELinux"
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr ""
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr "a entrada desapareceu"
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr "%s: número de linha fora de alcance"
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, c-format
 msgid "%s: %s: line number out of range"
 msgstr "%s: %s: número de linha fora de alcance"
 
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, c-format
 msgid " on repetition %s\n"
 msgstr "em repetição %s\n"
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, c-format
 msgid "%s: %s: match not found"
 msgstr "%s: %s: correspondência não encontrada"
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr "erro na pesquisa de expressão regular"
 
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, c-format
 msgid "write error for %s"
 msgstr "erro de escrita para %s"
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, c-format
 msgid "%s: integer expected after delimiter"
 msgstr "%s: inteiro esperado após delimitador"
 
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, fuzzy, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr "%s: '}' é requerido na contagem de repetição"
 
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, fuzzy, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr "%s}: inteiro requerido entre '{' e '}'"
 
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, fuzzy, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr "%s: delimitador de fecho '%c' em falta"
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr "%s: expressão regular inválida: %s"
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr "%s: padrão inválido"
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr "%s: número de linha deve ser maior que zero"
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr "o número de linha %s é inferior ao precedente, %s"
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr "aviso: o número de linha %s é igual ao precedente"
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr "especificador de conversão em falta no sufixo"
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr "especificação de conversão inválida no sufixo: %c"
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr "especificação de conversão inválida no sufixo: \\%.3o"
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, fuzzy, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr "%.*s: especificação de conversão inválida"
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr "demasiadas especificações de conversão %% no sufixo"
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr "especificação de conversão %% inválida no sufixo"
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr "%s: número inválido"
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr "Utilização: %s [OPÇÃO]... FICHEIRO PADRÃO...\n"
 
-#: src/csplit.c:1455
+#: src/csplit.c:1483
 #, fuzzy
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
@@ -2546,7 +2608,7 @@ msgstr ""
 "'xx00',\n"
 "'xx01', ..., e exibir contagem de bytes de cada parte.\n"
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, fuzzy, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2557,7 +2619,11 @@ msgstr ""
 "  -f, --prefix=PREFIXO       usar PREFIXO em vez de `xx'\n"
 "  -k, --keep-files           preservar ficheiros de saída após erro\n"
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr ""
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
@@ -2567,7 +2633,7 @@ msgstr ""
 "  -s, --quiet, --silent      não exibir tamanhos dos ficheiros de saída\n"
 "  -z, --elide-empty-files    remover ficheiros de saída vazios\n"
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
@@ -2575,7 +2641,7 @@ msgstr ""
 "\n"
 "Ler a entrada padrão se FICHEIRO for -. Cada PADRÃO pode ser:\n"
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 #, fuzzy
 msgid ""
 "\n"
@@ -2602,23 +2668,19 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr ""
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr "campos e posições são numerados a partir de 1"
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr "Utilização: %s OPÇÃO... [FICHEIRO]...\n"
 
-#: src/cut.c:193
+#: src/cut.c:176
 #, fuzzy
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr ""
 "Mostrar partes seleccionadas de linhas de cada FICHEIRO.\n"
 "\n"
 
-#: src/cut.c:199
+#: src/cut.c:182
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
 "  -c, --characters=LIST   select only these characters\n"
@@ -2628,7 +2690,7 @@ msgstr ""
 "  -c, --characters=LISTA  escolher apenas estes caracteres\n"
 "  -d, --delimiter=DELIM   usar DELIM em vez de TAB para delimitar campos\n"
 
-#: src/cut.c:204
+#: src/cut.c:187
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
 "                            that contains no delimiter character, unless\n"
@@ -2642,7 +2704,7 @@ msgstr ""
 "                            seja especificada\n"
 "  -n                      (ignorado)\n"
 
-#: src/cut.c:210
+#: src/cut.c:193
 #, fuzzy
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
@@ -2651,7 +2713,7 @@ msgstr ""
 "      --complement        complementar o conjunto de bytes escolhidos,\n"
 "                            caracteres ou campos.\n"
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
@@ -2662,7 +2724,7 @@ msgstr ""
 "                            o modo predefinido é usar o delimitador de "
 "entrada\n"
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2674,7 +2736,7 @@ msgstr ""
 "ou vários alcances separados por vírgula. Entrada seleccionada é escrita\n"
 "na mesma ordem de leitura e exactamente uma vez.\n"
 
-#: src/cut.c:227
+#: src/cut.c:210
 msgid ""
 "Each range is one of:\n"
 "\n"
@@ -2694,47 +2756,51 @@ msgstr ""
 "\n"
 "Sem FICHEIRO, ou quando FICHEIRO é -, ler a entrada padrão.\n"
 
-#: src/cut.c:367 src/cut.c:493
+#: src/cut.c:300 src/cut.c:394
 #, fuzzy
 msgid "invalid byte, character or field list"
 msgstr "byte ou lista de campo inválido"
 
-#: src/cut.c:387
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr "campos e posições são numerados a partir de 1"
+
+#: src/cut.c:320
 msgid "invalid range with no endpoint: -"
 msgstr "intervalo inválido sem fim: -"
 
-#: src/cut.c:403
+#: src/cut.c:334
 msgid "invalid decreasing range"
 msgstr "intervalo decrescente inválido"
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, c-format
 msgid "byte offset %s is too large"
 msgstr "posição de byte %s demasiado grande"
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, c-format
 msgid "field number %s is too large"
 msgstr "número de campo %s demasiado grande"
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr "apenas um tipo de lista pode ser especificado"
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr "o delimitador deve ser um único carácter"
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr "deve especificar uma lista de bytes, caracteres ou campos"
 
-#: src/cut.c:850
+#: src/cut.c:790
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr "um delimitador de entrada deve ser especificado apenas para campos"
 
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
@@ -2742,11 +2808,11 @@ msgstr ""
 "suprimir linhas não delimitadas faz sentido\n"
 "\tapenas para campos"
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr "lista de campos ausente"
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr "lista de posições ausente"
 
@@ -2793,7 +2859,7 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 "      --rfc-3339=ESPECTEMPO exibir data e hora no formato RFC 3339.\n"
 "                            ESPECTEMPO='date', 'seconds' ou 'ns' para\n"
@@ -3004,10 +3070,10 @@ msgid ""
 "  $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n"
 msgstr ""
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr "canal de entrada por omissão (stdin)"
@@ -3049,7 +3115,7 @@ msgstr ""
 msgid "cannot set date"
 msgstr "impossível alterar a data"
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, c-format
 msgid "time %s is out of range"
 msgstr "o tempo %s está fora de alcance"
@@ -3060,7 +3126,7 @@ msgstr "o tempo %s está fora de alcance"
 msgid "Paul Rubin"
 msgstr ""
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
@@ -3069,7 +3135,7 @@ msgstr ""
 "Utilização: %s [OPERANDO]...\n"
 "  ou:       %s OPÇÃO\n"
 
-#: src/dd.c:526
+#: src/dd.c:532
 #, fuzzy
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
@@ -3088,7 +3154,7 @@ msgstr ""
 "  count=BLOCOS    copiar apenas BLOCOS blocos de entrada\n"
 "  ibs=BYTES       ler BYTES bytes de cada vez\n"
 
-#: src/dd.c:535
+#: src/dd.c:541
 #, fuzzy
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
@@ -3110,7 +3176,7 @@ msgstr ""
 "  skip=BLOCOS     saltar BLOCOS blocos de tamanho ibs no início da entrada\n"
 "  status=noxfer   suprimir estatísticas de transferência\n"
 
-#: src/dd.c:546
+#: src/dd.c:552
 #, fuzzy
 msgid ""
 "\n"
@@ -3129,7 +3195,7 @@ msgstr ""
 "Cadda símbolo CONV pode ser:\n"
 "\n"
 
-#: src/dd.c:555
+#: src/dd.c:561
 #, fuzzy
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
@@ -3157,7 +3223,7 @@ msgstr ""
 "  sync      encher cada bloco de entrada com ibs NULs; quando usado\n"
 "            com block ou unblock, encher com espaços em vez de NULs\n"
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -3174,7 +3240,7 @@ msgstr ""
 "terminar\n"
 "  fsync     da mesma forma, mas escrever igualmente os meta-dados\n"
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -3187,77 +3253,77 @@ msgstr ""
 "\n"
 "  append    modo acrescentar (sentido só para saída; conv=notrunc sugerido)\n"
 
-#: src/dd.c:583
+#: src/dd.c:589
 #, fuzzy
 msgid "  cio       use concurrent I/O for data\n"
 msgstr "  text      usar E/S de texto para dados\n"
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr "  direct    usar E/S directas para dados\n"
 
-#: src/dd.c:587
+#: src/dd.c:593
 #, fuzzy
 msgid "  directory  fail unless a directory\n"
 msgstr "  erro de pasta a menos que seja uma pasta\n"
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr "  dsync     usar E/S sincronizadas para dados\n"
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr "  sync      da mesma forma, mas também para meta-dados\n"
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr "  nonblock  usar E/S não-bloquantes\n"
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr "  noatime   não actualizar o tempo de acesso\n"
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr ""
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr "  noctty    não atribuir terminal de controlo do ficheiro\n"
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr "  nofollow  não seguir ligações simbólicas\n"
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr "  nolinks   falhar se multiplamente ligado\n"
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr "  binary    usar E/S binárias para dados\n"
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr "  text      usar E/S de texto para dados\n"
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr ""
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3286,7 +3352,17 @@ msgstr ""
 "Opções são:\n"
 "\n"
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
@@ -3295,21 +3371,21 @@ msgstr ""
 "%<PRIuMAX>+%<PRIuMAX> registos dentro\n"
 "%<PRIuMAX>+%<PRIuMAX> registos fora\n"
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
 msgstr[0] "%<PRIuMAX> registo truncado\n"
 msgstr[1] "%<PRIuMAX> registos truncados\n"
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
 msgstr[0] "%<PRIuMAX> byte (%s) copiado"
 msgstr[1] "%<PRIuMAX> bytes (%s) copiados"
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr "Infinitivo B"
 
@@ -3323,83 +3399,83 @@ msgstr "Infinitivo B"
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
 msgstr ", %g s, %s/s\n"
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, c-format
 msgid "closing input file %s"
 msgstr "a fechar o ficheiro de entrada %s"
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr "a apagar o ficheiro de saída %s"
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, fuzzy, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr "erro ao entrar na pasta %s"
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, c-format
 msgid "writing to %s"
 msgstr "a escrever em %s"
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, c-format
 msgid "unrecognized operand %s"
 msgstr "operando desconhecido %s"
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 msgid "invalid conversion"
 msgstr "conversão inválida"
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 msgid "invalid input flag"
 msgstr "opção de entrada inválida"
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 msgid "invalid output flag"
 msgstr "opção de saída inválida"
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 msgid "invalid status flag"
 msgstr "opção de estado inválida"
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, c-format
 msgid "invalid number %s"
 msgstr "número inválido %s"
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr "impossível combinar quaisquer dois de {ascii,ebcdic,ibm}"
 
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, c-format
 msgid "cannot combine block and unblock"
 msgstr "impossível combinar bloquear e desbloquear"
 
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, c-format
 msgid "cannot combine lcase and ucase"
 msgstr "impossível combinar letras minúsculas e maiúsculas"
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, c-format
 msgid "cannot combine excl and nocreat"
 msgstr "impossível combinar excl e nocreat"
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, fuzzy, c-format
 msgid "cannot combine direct and nocache"
 msgstr "impossível combinar excl e nocreat"
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
@@ -3408,72 +3484,62 @@ msgstr ""
 "aviso: a contornar erro de lseek do kernel para o ficheiro (%s)\n"
 "  de mt_type=0x%0lx -- ver <sys/mtio.h> para a lista de tipos"
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, fuzzy, c-format
 msgid "%s: cannot skip"
 msgstr "%s: impossível indexar"
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, c-format
 msgid "%s: cannot seek"
 msgstr "%s: impossível indexar"
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr "erro de excesso de índice ao ler o ficheiro %s"
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr "aviso: índice de ficheiro inválido após erro de leitura"
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr "impossível contornar erro do kernel"
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, c-format
 msgid "setting flags for %s"
 msgstr "a definir opções para %s"
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, fuzzy, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr "%s: impossível mover para a posição relativa %s"
 
-#: src/dd.c:2133
+#: src/dd.c:2172
 #, fuzzy, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
 msgstr "a truncar aos %<PRIuMAX> bytes no ficheiro de saída %s"
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr "erro de fdatasync para %s"
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
 msgstr "erro de fsync para %s"
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, c-format
 msgid "failed to open %s"
 msgstr "erro ao abrir %s"
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
@@ -3481,96 +3547,105 @@ msgid ""
 msgstr ""
 "índice muito alto: erro ao truncar para seek=%<PRIuMAX> blocos (de %lu bytes)"
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, fuzzy, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr "a truncar aos %<PRIuMAX> bytes no ficheiro de saída %s"
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, fuzzy, c-format
 msgid "failed to discard cache for: %s"
 msgstr "erro ao entrar na pasta %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr ""
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr "Sist.fichs"
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr "Tipo"
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr "blocos"
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr "Ocup"
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr "Livres"
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr "Uso%"
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr "Inodes"
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr "IOcup"
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr "ILivr"
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr "UsoI%"
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr "Montado em"
 
-#: src/df.c:383
-#, c-format
-msgid "option --output: field '%s' unknown"
+#: src/df.c:207
+msgid "File"
 msgstr ""
 
-#: src/df.c:390
+#: src/df.c:387
+#, fuzzy, c-format
+msgid "option --output: field %s unknown"
+msgstr "a apagar o ficheiro de saída %s"
+
+#: src/df.c:394
 #, fuzzy, c-format
-msgid "option --output: field '%s' used more than once"
+msgid "option --output: field %s used more than once"
 msgstr "aviso: ficheiro de origem %s especificado mais de uma vez"
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr "Tama"
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr "Livre"
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr "Capacida"
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
 msgstr ""
 
-#: src/df.c:1210
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr ""
+
+#: src/df.c:1384
 #, fuzzy
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
@@ -3581,25 +3656,20 @@ msgstr ""
 "ou todos os sistemas de ficheiros por omissão.\n"
 "\n"
 
-#: src/df.c:1217
-#, fuzzy
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
-"  -a, --all             incluir sistemas de ficheiros manequins\n"
-"  -B, --block-size=TAMANHO  usar blocos de TAMANHO bytes\n"
-"  -h, --human-readable  tamanhos em formato para humanos (ex., 1K 234M 2G)\n"
-"  -H, --si              da mesma forma, mas usar potências de 1000, não "
-"1024\n"
 
-#: src/df.c:1227
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -3613,7 +3683,7 @@ msgstr ""
 "      --no-sync         não invocar sync antes de obter informação "
 "(predef.)\n"
 
-#: src/df.c:1234
+#: src/df.c:1409
 #, fuzzy
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
@@ -3634,43 +3704,34 @@ msgstr ""
 "TIPO\n"
 "  -v                    (ignorado)\n"
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
 
-#: src/df.c:1285
+#: src/df.c:1460
 #, fuzzy, c-format
 msgid "options %s and %s are mutually exclusive"
 msgstr ""
 "as opções para especificar datas para impressão são mutuamente exclusivas"
 
-#: src/df.c:1335
-#, fuzzy
-msgid "warning: "
-msgstr "Aviso: "
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr ""
-
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr "sistema de ficheiros de tipo %s simultaneamente escolhido e excluído"
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr "Aviso: "
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 msgid "cannot read table of mounted file systems"
 msgstr "impossível ler a tabela de sistemas de ficheiros montados"
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr "nenhum sistema de ficheiros processado"
@@ -3680,7 +3741,7 @@ msgstr "nenhum sistema de ficheiros processado"
 msgid "H. Peter Anvin"
 msgstr ""
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr "Utilização: %s [OPÇÃO]... [FICHEIRO]\n"
@@ -3772,12 +3833,12 @@ msgstr ""
 
 #: src/dirname.c:59
 #, fuzzy
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
 msgstr ""
 "  -z, --zero-terminated     terminar linhas com byte 0, não nova linha\n"
 
 #: src/dirname.c:64
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Examples:\n"
@@ -3785,12 +3846,8 @@ msgid ""
 "  %s dir1/str dir2/str  -> \"dir1\" followed by \"dir2\"\n"
 "  %s stdio.h            -> \".\"\n"
 msgstr ""
-"\n"
-"Exemplos:\n"
-"  %s /usr/bin/sort  Mostrar \"/usr/bin\".\n"
-"  %s stdio.h        Mostrar \".\".\n"
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -3799,18 +3856,17 @@ msgstr ""
 "Utilização: %s [OPÇÃO]... [FICHEIRO]...\n"
 "  ou:       %s [OPÇÃO]... --files0-from=F\n"
 
-#: src/du.c:274
+#: src/du.c:285
 #, fuzzy
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr ""
 "Resumir utilização de disco de cada FICHEIRO, recursivamente para pastas.\n"
 "\n"
 
-#: src/du.c:280
+#: src/du.c:291
 #, fuzzy
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3828,12 +3884,12 @@ msgstr ""
 "(esparsos),\n"
 "                          fragmentação interna, blocos indirectos e afins\n"
 
-#: src/du.c:289
+#: src/du.c:300
 #, fuzzy
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3844,21 +3900,27 @@ msgid ""
 "                          line argument;  --max-depth=0 is the same as\n"
 "                          --summarize\n"
 msgstr ""
-"  -B, --block-size=TAMANHO  usar blocos de TAMANHO bytes\n"
-"  -b, --bytes           equivalente a '--apparent-size --block-size=1'\n"
-"  -c, --total           produzir um grande total\n"
-"  -D, --dereference-args  desreferenciar só ligações simbólicas listadas na\n"
-"                          linha de comandos\n"
+"  -x, --one-file-system  saltar pastas em sistemas de ficheiros diferentes\n"
+"  -X FILE, --exclude-from=FICH  Excluir ficheiros com qualquer padrão em "
+"FICH.\n"
+"      --exclude=PATTERN  Exclude files that match PATTERN.\n"
+"      --max-depth=N     mostrar o total de uma pasta (ou ficheiro, com --"
+"all)\n"
+"                          só se estiver N ou menos níveis abaixo do "
+"argumento\n"
+"                          da linha de comando; --max-depth=0 é o mesmo que\n"
+"                          --summarize\n"
 
-#: src/du.c:302
+#: src/du.c:313
 #, fuzzy
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
 "      --files0-from=F   resumir util. de disco dos nomes de ficheiro "
 "terminados\n"
@@ -3869,7 +3931,7 @@ msgstr ""
 "  -h, --human-readable  mostrar tamanhos para humanos (ex., 1K 234M 2G)\n"
 "      --si              como -h, mas usar potências de 1000, não 1024\n"
 
-#: src/du.c:310
+#: src/du.c:322
 #, fuzzy
 msgid ""
 "  -k                    like --block-size=1K\n"
@@ -3882,12 +3944,13 @@ msgstr ""
 "persistentemente\n"
 "  -m                    como --block-size=1M\n"
 
-#: src/du.c:316
+#: src/du.c:328
 #, fuzzy
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
@@ -3897,7 +3960,7 @@ msgstr ""
 "  -S, --separate-dirs   não incuir tamanhos das pastas\n"
 "  -s, --summarize       mostrar apenas um total para cada argumento\n"
 
-#: src/du.c:322
+#: src/du.c:334
 #, fuzzy
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
@@ -3907,9 +3970,9 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
 msgstr ""
 "      --time            mostrar tempo da última modificação de cada "
 "ficheiro\n"
@@ -3921,74 +3984,74 @@ msgstr ""
 "                          full-iso, long-iso, iso, +FORMATO\n"
 "                          FORMATO é interpretado como 'date'\n"
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
 "  -x, --one-file-system    skip directories on different file systems\n"
 msgstr ""
 
-#: src/du.c:386
+#: src/du.c:398
 #, fuzzy
 msgid "Infinity"
 msgstr "Infinitivo B"
 
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr ""
-
-#: src/du.c:624
+#: src/du.c:636
 #, fuzzy, c-format
 msgid "fts_read failed: %s"
 msgstr "fts_read falhou"
 
-#: src/du.c:780
+#: src/du.c:787
 #, c-format
 msgid "invalid maximum depth %s"
 msgstr "profundidade máxima %s inválida"
 
-#: src/du.c:809
+#: src/du.c:816
 #, fuzzy, c-format
 msgid "invalid --threshold argument '-0'"
-msgstr "argumento inválido %s"
+msgstr "argumento %s%s inválido '%s'"
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr "impossível resumir e mostrar todas as entradas ao mesmo tempo"
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr "aviso: resumo é o mesmo que usar --max-depth=0"
 
-#: src/du.c:900
+#: src/du.c:911
 #, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr "aviso: resumo conflicte com --max-depth=%lu"
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 #, fuzzy
 msgid "file operands cannot be combined with --files0-from"
 msgstr "Operandos ficheiros não podem ser combinados com --files0-from."
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr "%s: erro de leitura"
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr "ao ler nomes de ficheiros de stdln, nome de %s não permitido"
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 msgid "invalid zero-length file name"
 msgstr "nome de ficheiro vazio inválido'"
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr "total"
 
@@ -4092,7 +4155,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
 "Alterar cada NOME para VALOR no ambiente e correr o COMANDO.\n"
@@ -4173,16 +4236,16 @@ msgid "input line is too long"
 msgstr "linha de entrada demasiado grande"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr ""
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
@@ -4191,7 +4254,7 @@ msgstr ""
 "Utilização: %s EXPRESSÃO\n"
 "        ou: %s OPÇÃO\n"
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -4209,7 +4272,7 @@ msgstr ""
 "\n"
 "  ARG1 & ARG2       ARG1 se nenhum argumento for nulo ou 0, senão 0\n"
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -4227,7 +4290,7 @@ msgstr ""
 "  ARG1 >= ARG2      ARG1 é maior ou igual a ARG2\n"
 "  ARG1 > ARG2       ARG1 é maior que ARG2\n"
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
@@ -4237,7 +4300,7 @@ msgstr ""
 "  ARG1 + ARG2       soma aritmética de ARG1 e ARG2\n"
 "  ARG1 - ARG2       diferença aritmética de ARG1 e ARG2\n"
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -4250,7 +4313,7 @@ msgstr ""
 "  ARG1 / ARG2       quociente aritmético de ARG1 dividido por ARG2\n"
 "  ARG1 % ARG2       resto aritmético de ARG1 dividido por ARG2\n"
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -4270,7 +4333,7 @@ msgstr ""
 "0\n"
 "  length EXPR                comprimento de EXPR\n"
 
-#: src/expr.c:251
+#: src/expr.c:250
 #, fuzzy
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
@@ -4284,7 +4347,7 @@ msgstr ""
 "\n"
 "  ( EXPRESSÃO )              valor de EXPRESSÃO\n"
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -4300,7 +4363,7 @@ msgstr ""
 "lexicográficas. Padrões retornam a expressão entre \\( e \\) ou nula; se\n"
 "\\( e \\) não são usados, retornam o número de caracteres combinados ou 0.\n"
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -4312,32 +4375,32 @@ msgstr ""
 "nula\n"
 "ou 0, 2 se EXPRESSÃO for sintacticamente inválida e 3 se um erro ocorrer.\n"
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, c-format
 msgid "syntax error"
 msgstr "erro de sintaxe"
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, c-format
 msgid "error in regular expression matcher"
 msgstr "erro no analisador de expressões regulares"
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, fuzzy, c-format
 msgid "non-integer argument"
 msgstr "argumento não numérico"
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr "divisão por zero"
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, fuzzy, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr "Defina LC_ALL='C' para contornar o problema."
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, fuzzy, c-format
 msgid "the strings compared were %s and %s"
 msgstr "As expressões comparadas foram %s e %s."
@@ -4347,27 +4410,27 @@ msgstr "As expressões comparadas foram %s e %s."
 msgid "Niels Moller"
 msgstr ""
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
 msgstr ""
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
 msgstr ""
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, c-format
 msgid "%s is not a valid positive integer"
 msgstr "%s não é um inteiro positivo válido"
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr "%s é muito grande"
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
@@ -4376,7 +4439,7 @@ msgstr ""
 "Utilização: %s [NÚMERO]...\n"
 "  ou:       %s OPÇÃO\n"
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 #, fuzzy
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
@@ -4491,28 +4554,28 @@ msgid "invalid number of columns: %s"
 msgstr "número inválido de colunas: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr ""
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, fuzzy, c-format
 msgid "Usage: %s\n"
 msgstr "Utilização: %s [OPÇÃO]\n"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
 msgstr ""
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, c-format
 msgid "failed to get groups for user %s"
 msgstr "erro ao obter os grupos do utilizador %s"
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, c-format
 msgid "failed to get groups for the current process"
 msgstr "erro ao obter os grupos do processo corrente"
@@ -4537,22 +4600,22 @@ msgstr ""
 "Mostrar informação para UTILIZADOR ou, sem UTILIZADOR especificado,\n"
 "o processo corrente (diferente se base de dados de grupos foi alterada).\n"
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, fuzzy, c-format
 msgid "cannot get real UID"
 msgstr "impossível alterar o ID do utilizador"
 
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, fuzzy, c-format
 msgid "cannot get effective GID"
 msgstr "impossível desreferenciar %s"
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, fuzzy, c-format
 msgid "cannot get real GID"
 msgstr "impossível alterar o ID do utilizador"
 
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, fuzzy, c-format
 msgid "%s: no such user"
 msgstr "%s: Utilizador inexistente"
@@ -4608,58 +4671,48 @@ msgstr ""
 "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
 "GB 1000*1000*1000, G 1024*1024*1024 e assim por diante para T, P, E, Z, Y.\n"
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr "%s: o ficheiro encolheu demasiado"
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, c-format
 msgid "%s: number of bytes is too large"
 msgstr "%s: número de bytes muito grande"
 
-#: src/head.c:440
-#, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr "%s: impossível retornar à posição original"
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr "%s: impossível deslocar para a posição %s"
 
-#: src/head.c:673
-#, fuzzy, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "%s: impossível remover"
-
-#: src/head.c:798
+#: src/head.c:423 src/tail.c:457
 #, c-format
-msgid "cannot reposition file pointer for %s"
-msgstr "impossível reposicionar apontador de ficheiro para %s"
+msgid "%s: cannot seek to relative offset %s"
+msgstr "%s: impossível mover para a posição relativa %s"
 
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr "%s: %s é tão grande que não é representável"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr "número de linhas"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr "número de bytes"
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr "número de linhas inválido"
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr "número de bytes inválido"
 
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, c-format
 msgid "invalid trailing option -- %c"
 msgstr "opção final inválida -- %c"
@@ -4705,28 +4758,34 @@ msgid "cannot determine hostname"
 msgstr "impossível determinar o nome da máquina"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr ""
 
-#: src/id.c:81
-#, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
-msgstr "Utilização: %s [OPÇÃO]... [UTILIZADOR]\n"
+#: src/id.c:84
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]... [USER]\n"
+msgstr "Utilização: %s [OPÇÃO]... [UTILIZADOR]...\n"
 
-#: src/id.c:82
-#, fuzzy
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
+msgstr ""
+
+#: src/id.c:90
+#, fuzzy
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
 msgstr ""
 "Exibir informação de UTILIZADOR, ou o utilizador actual.\n"
 "\n"
@@ -4739,7 +4798,7 @@ msgstr ""
 "  -u, --user      mostrar só o ID do utilizador\n"
 "\n"
 
-#: src/id.c:96
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
@@ -4747,117 +4806,127 @@ msgstr ""
 "\n"
 "Sem qualquer OPÇÃO, mostrar alguma informação útil identificada.\n"
 
-#: src/id.c:140
+#: src/id.c:151
+#, fuzzy, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr "--context (-Z) apenas funciona com SELinux"
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr "--context (-Z) apenas funciona com SELinux"
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr ""
 "impossível mostrar contexto de segurança quando especificado pelo utilizador"
 
-#: src/id.c:178
+#: src/id.c:198
 #, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr "impossível mostrar \"apenas\" de mais de uma escolha"
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr "impossível exibir apenas nomes ou IDs reais no formato predefinido"
 
-#: src/id.c:199
+#: src/id.c:209
+#, fuzzy, c-format
+msgid "option --zero not permitted in default format"
+msgstr "impossível exibir apenas nomes ou IDs reais no formato predefinido"
+
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
 msgstr "impossível obter contexto do processo"
 
-#: src/id.c:224
+#: src/id.c:265
 #, fuzzy, c-format
 msgid "cannot get effective UID"
 msgstr "impossível desreferenciar %s"
 
-#: src/id.c:311
+#: src/id.c:354
 #, fuzzy, c-format
 msgid "cannot find name for user ID %s"
 msgstr "impossível encontrar o nome do utilizador com ID %lu"
 
-#: src/id.c:329
+#: src/id.c:372
 #, c-format
 msgid "uid=%s"
 msgstr ""
 
-#: src/id.c:334
+#: src/id.c:377
 #, c-format
 msgid " gid=%s"
 msgstr ""
 
-#: src/id.c:341
+#: src/id.c:384
 #, c-format
 msgid " euid=%s"
 msgstr ""
 
-#: src/id.c:349
+#: src/id.c:392
 #, c-format
 msgid " egid=%s"
 msgstr ""
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr " grupos="
 
-#: src/id.c:393
+#: src/id.c:437
 #, fuzzy, c-format
 msgid " context=%s"
 msgstr "contexto inválido: %s"
 
-#: src/install.c:373
+#: src/install.c:376
 #, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr "aviso: %s: erro ao alterar contexto para %s"
 
-#: src/install.c:414
+#: src/install.c:417
 #, c-format
 msgid "creating directory %s"
 msgstr "a criar a pasta %s"
 
-#: src/install.c:482
+#: src/install.c:485
 #, c-format
 msgid "cannot change ownership of %s"
 msgstr "impossível alterar o dono de %s"
 
-#: src/install.c:506
+#: src/install.c:509
 #, c-format
 msgid "cannot set time stamps for %s"
 msgstr "impossível alterar marcas de tempo de %s"
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, c-format
 msgid "fork system call failed"
 msgstr "erro na chamada de sistema fork"
 
-#: src/install.c:531
+#: src/install.c:535
 #, fuzzy, c-format
 msgid "cannot run %s"
 msgstr "impossível correr strip"
 
-#: src/install.c:535
+#: src/install.c:539
 #, c-format
 msgid "waiting for strip"
 msgstr "a aguardar por strip"
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr "o processo strip terminou anormalmente"
 
-#: src/install.c:558
+#: src/install.c:565
 #, c-format
 msgid "invalid user %s"
 msgstr "utilizador inválido %s"
 
-#: src/install.c:594
+#: src/install.c:601
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -4870,7 +4939,7 @@ msgstr ""
 "  ou:       %s [OPÇÃO]... -t PASTA ORIGEM...\n"
 "  ou:       %s [OPÇÃO]... -d PASTA...\n"
 
-#: src/install.c:601
+#: src/install.c:608
 #, fuzzy
 msgid ""
 "\n"
@@ -4889,7 +4958,7 @@ msgstr ""
 "Na quarta forma, criar todos os componentes da(s) PASTA(s) dada(s).\n"
 "\n"
 
-#: src/install.c:615
+#: src/install.c:622
 #, fuzzy
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
@@ -4908,7 +4977,7 @@ msgstr ""
 "os\n"
 "                        componentes das pastas especificadas\n"
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -4927,7 +4996,7 @@ msgstr ""
 "  -m, --mode=MODO     alterar permissões (como em chmod), não rwxr-xr-x\n"
 "  -o, --owner=DONO    alterar dono (apenas superutilizador)\n"
 
-#: src/install.c:631
+#: src/install.c:638
 #, fuzzy
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
@@ -4941,8 +5010,8 @@ msgid ""
 "  -T, --no-target-directory  treat DEST as a normal file\n"
 "  -v, --verbose       print the name of each directory as it is created\n"
 msgstr ""
-"  -p, --preserve-timestamps   aplicar tempos de acesso/modif. de ORIGEM"
-"(ens)\n"
+"  -p, --preserve-timestamps   aplicar tempos de acesso/modif. de "
+"ORIGEM(ens)\n"
 "                        para ficheiros de destino correspondentes\n"
 "  -s, --strip         remover tabelas de símbolos\n"
 "  -S, --suffix=SUFIXO  redefinir o sufixo de salvaguarda habitual\n"
@@ -4951,67 +5020,61 @@ msgstr ""
 "  -T, --no-target-directory  tratar DESTINO como um ficheiro normal\n"
 "  -v, --verbose       mostrar o nome de cada pasta assim que criadas\n"
 
-#: src/install.c:641
+#: src/install.c:648
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
-"      --preserve-context  preservar contexto de segurança SELinux\n"
-"  -Z, --context=CONTEXTO  alterar cont. de segurança SELinux de fich. e "
-"pastas\n"
 
-#: src/install.c:859
+#: src/install.c:696 src/unlink.c:86
+#, c-format
+msgid "cannot unlink %s"
+msgstr "impossível executar sobre %s"
+
+#: src/install.c:877
 #, fuzzy, c-format
 msgid ""
 "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
 msgstr ""
 "Aviso: a ignorar --preserve-context; este sistema tem SELinux desactivado."
 
-#: src/install.c:869
-#, fuzzy, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
-msgstr "Aviso: a ignorar --context (-Z); SELinux não activado."
-
-#: src/install.c:886
+#: src/install.c:917
 #, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr "a opção strip não pode ser usada ao instalar uma pasta"
 
-#: src/install.c:889
+#: src/install.c:920
 #, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr "pasta de destino não permitida ao instalar uma pasta"
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr "impossível forçar contexto alvo a %s e preservá-lo"
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, c-format
 msgid "invalid mode %s"
 msgstr "modo inválido %s"
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr ""
 
-#: src/install.c:959
+#: src/install.c:1001
 #, fuzzy, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr ""
 "as opções para saída em modo verboso e estilos de saída legíveis\n"
 "pelo stty são mutuamente exclusivas"
 
-#: src/install.c:966
+#: src/install.c:1008
 #, fuzzy, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr ""
 "as opções para especificar datas para impressão são mutuamente exclusivas"
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -5023,7 +5086,7 @@ msgstr ""
 msgid "Mike Haertel"
 msgstr ""
 
-#: src/join.c:191
+#: src/join.c:195
 #, fuzzy
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
@@ -5042,7 +5105,7 @@ msgstr ""
 "                      NUMFICH é 1 ou 2, correspondente a FICH1 ou FICH2\n"
 "  -e VAZIO          substituir campos de entrada em falta com VAZIO\n"
 
-#: src/join.c:200
+#: src/join.c:204
 #, fuzzy
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
@@ -5055,7 +5118,7 @@ msgstr ""
 "  -o FORMATO        obedecer FORMATO ao construir linha de saída\n"
 "  -t CAR            usar CAR como separador de campo de entrada e saída\n"
 
-#: src/join.c:206
+#: src/join.c:210
 #, fuzzy
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
@@ -5075,7 +5138,13 @@ msgstr ""
 "                      entrada estejam em pares\n"
 "  --nocheck-order   não verificar ordenação da entrada\n"
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+#, fuzzy
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr ""
+"  -z, --zero-terminated     terminar linhas com byte 0, não nova linha\n"
+
+#: src/join.c:225
 #, fuzzy
 msgid ""
 "\n"
@@ -5111,47 +5180,47 @@ msgstr ""
 "uma\n"
 "mensagem de aviso será mostrada.\n"
 
-#: src/join.c:403
+#: src/join.c:410
 #, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
 msgstr ""
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, c-format
 msgid "invalid field number: %s"
 msgstr "número de campo inválido: %s"
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, c-format
 msgid "invalid field specifier: %s"
 msgstr "especificador de campo inválido: %s"
 
-#: src/join.c:877
+#: src/join.c:884
 #, c-format
 msgid "invalid file number in field spec: %s"
 msgstr "número de ficheiro inválido no especificador de campo: %s"
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr "campos de junção inválidos %lu, %lu"
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr "expressões de substituição de campo vazio em conflicto"
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, c-format
 msgid "multi-character tab %s"
 msgstr "tabulador multi-carácter %s"
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr "tabuladores incompatíveis"
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr "ambos os ficheiros não podem ser a entrada padrão"
@@ -5272,47 +5341,47 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr "impossível criar ligação %s para %s"
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr "%s: ligação persistente não autorizada para a pasta"
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, c-format
 msgid "%s: cannot overwrite directory"
 msgstr "%s: impossível sobrescrever a pasta"
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
 msgstr "%s: substituir %s? "
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, fuzzy, c-format
 msgid "failed to create symbolic link %s"
 msgstr "impossível criar a ligação simbólica %s"
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, fuzzy, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr "impossível criar a ligação simbólica %s para %s"
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, fuzzy, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr "a criar ligação persistente para %.0s%s"
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, fuzzy, c-format
 msgid "failed to create hard link %s"
 msgstr "impossível criar a ligação persistente %s para %s"
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, fuzzy, c-format
 msgid "failed to create hard link %s => %s"
 msgstr "impossível criar a ligação persistente %s para %s"
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -5325,7 +5394,7 @@ msgstr ""
 "  ou:       %s [OPÇÃO]... DESTINO... PASTA          (3o formato)\n"
 "  ou:       %s [OPÇÃO]... -t PASTA DESTINO...       (4o formato)\n"
 
-#: src/ln.c:381
+#: src/ln.c:398
 #, fuzzy
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
@@ -5345,7 +5414,7 @@ msgstr ""
 "Ao criar ligações persistentes, cada DESTINO deve existir.\n"
 "\n"
 
-#: src/ln.c:394
+#: src/ln.c:411
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
 "file\n"
@@ -5368,8 +5437,7 @@ msgstr ""
 "util.)\n"
 "  -f, --force                 remover ficheiros de destino existentes\n"
 
-#: src/ln.c:402
-#, fuzzy
+#: src/ln.c:419
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
 "  -L, --logical               dereference TARGETs that are symbolic links\n"
@@ -5380,14 +5448,8 @@ msgid ""
 "location\n"
 "  -s, --symbolic              make symbolic links instead of hard links\n"
 msgstr ""
-"  -n, --no-dereference        tratar destinos que são ligações simbólicas\n"
-"                                para uma pasta como se fossem um fich. "
-"normal\n"
-"  -i, --interactive           perguntar antes de remover destinos\n"
-"  -s, --symbolic              criar ligações simbólicas em vez de "
-"persistentes\n"
 
-#: src/ln.c:411
+#: src/ln.c:428
 #, fuzzy
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
@@ -5403,7 +5465,7 @@ msgstr ""
 "  -T, --no-target-directory   tratar NOME_LIGAÇÃO como um ficheiro normal\n"
 "  -v, --verbose               mostrar o nome de cada ficheiro ligado\n"
 
-#: src/ln.c:433
+#: src/ln.c:450
 #, c-format
 msgid ""
 "\n"
@@ -5411,12 +5473,12 @@ msgid ""
 "behavior when a TARGET is a symbolic link, defaulting to %s.\n"
 msgstr ""
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, fuzzy, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr "Impossível combinar --target-directory e --no-target-directory"
 
-#: src/ln.c:588
+#: src/ln.c:605
 #, fuzzy, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr "impossível criar a ligação simbólica %s"
@@ -5449,7 +5511,7 @@ msgstr "sem nome de utilizador"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
@@ -5458,95 +5520,95 @@ msgstr "%b %e  %Y"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 msgid "%b %e %H:%M"
 msgstr "%b %e %H:%M"
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr "a ignorar valor inválido da variável de ambiente QUOTING_STYLE: %s"
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr "a ignorar largura inválida na variável de ambiente COLUMNS: %s"
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr "a ignorar tamanho de tab inválido na variável de ambiente TABSIZE: %s"
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, c-format
 msgid "invalid line width: %s"
 msgstr "largura de linha inválida: %s"
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, c-format
 msgid "invalid tab size: %s"
 msgstr "tamanho de tabulação inválido: %s"
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, c-format
 msgid "invalid time style format %s"
 msgstr "formato de estilo de tempo inválido %s"
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 #, fuzzy
 msgid "Valid arguments are:\n"
 msgstr "Argumentos válidos:"
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr ""
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr ""
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, c-format
 msgid "unrecognized prefix: %s"
 msgstr "prefixo desconhecido: %s"
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr "a variável de ambiente LS_COLORS tem um valor ilegível"
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, c-format
 msgid "cannot open directory %s"
 msgstr "impossível abrir a pasta %s"
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, c-format
 msgid "cannot determine device and inode of %s"
 msgstr "impossível obter o dispositivo e inode de %s"
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, c-format
 msgid "%s: not listing already-listed directory"
 msgstr "%s: a não listar pasta já listada"
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, c-format
 msgid "reading directory %s"
 msgstr "a ler a pasta %s"
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, c-format
 msgid "closing directory %s"
 msgstr "a fechar a pasta %s"
 
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, c-format
 msgid "cannot compare file names %s and %s"
 msgstr "impossível comparar os nomes de ficheiro %s e %s"
 
-#: src/ls.c:4721
+#: src/ls.c:4781
 #, fuzzy
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
@@ -5556,7 +5618,7 @@ msgstr ""
 "Ordenar entradas alfabeticamente se nenhuma de -cftuvSUX e --sort.\n"
 "\n"
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 #, fuzzy
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
@@ -5571,18 +5633,18 @@ msgstr ""
 "  -b, --escape               mostrar sinal. octais para caract. não "
 "gráficos\n"
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 #, fuzzy
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
 "      --block-size=TAMANHO   usar blocos de TAMANHO bytes\n"
@@ -5592,16 +5654,15 @@ msgstr ""
 "                               com -l: mostrar ctime e ordenar por nome\n"
 "                               senão: ordenar por ctime\n"
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 #, fuzzy
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 "  -C                         listar entradas por colunas\n"
@@ -5615,7 +5676,7 @@ msgstr ""
 "  -D, --dired                gerar saída desenhada para o modo de pastas "
 "Emacs\n"
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 #, fuzzy
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
@@ -5635,15 +5696,17 @@ msgstr ""
 "                               uma coluna -1, verboso -l, vertical -C\n"
 "      --full-time            como -l --time-style=full-iso\n"
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr "  -g                         como -l, mas não listar o dono\n"
 
-#: src/ls.c:4763
+#: src/ls.c:4823
+#, fuzzy
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 "      --group-directories-first\n"
@@ -5652,10 +5715,11 @@ msgstr ""
 "                               uso de --sort=none (-U) desactiva "
 "agrupamento\n"
 
-#: src/ls.c:4769
+#: src/ls.c:4829
+#, fuzzy
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
@@ -5665,14 +5729,15 @@ msgstr ""
 "                               (ex., 1K 234M 2G)\n"
 "      --si                   igual, mas usar potências de 1000, não 1024\n"
 
-#: src/ls.c:4775
+#: src/ls.c:4835
+#, fuzzy
 msgid ""
 "  -H, --dereference-command-line\n"
 "                             follow symbolic links listed on the command "
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
@@ -5685,7 +5750,7 @@ msgstr ""
 "      --hide=PADRÃO          não listar entradas que correspondam ao PADRÃO\n"
 "                               (redefinido por -a ou -A)\n"
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 #, fuzzy
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
@@ -5695,7 +5760,7 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 "      --indicator-style=PAL   adicionar indicador com estilo PAL às "
 "entradas:\n"
@@ -5705,7 +5770,7 @@ msgstr ""
 "  -I, --ignore=PADRÃO        não listar entradas que correspondam ao PADRÃO\n"
 "  -k                         como --block-size=1K\n"
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -5722,7 +5787,7 @@ msgstr ""
 "                               vez da própria ligação\n"
 "  -m                         encher largura com entradas separadas por ,\n"
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -5741,12 +5806,12 @@ msgstr ""
 "  -p, --indicator-style=slash\n"
 "                             acrescentar indicador / a pastas\n"
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 #, fuzzy
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -5761,7 +5826,7 @@ msgstr ""
 "                               literal, locale, shell, shell-always, c, "
 "escape\n"
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 #, fuzzy
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
@@ -5773,16 +5838,19 @@ msgstr ""
 "  -R, --recursive            listar subpastas recursivamente\n"
 "  -s, --size                 mostrar o tamanho de cada ficheiro, em blocos\n"
 
-#: src/ls.c:4825
+#: src/ls.c:4886
+#, fuzzy
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 "  -S                         ordenar por tamanho de ficheiro\n"
 "      --sort=PAL             ordenar por PAL em vez de nome: none -U,\n"
@@ -5794,17 +5862,19 @@ msgstr ""
 "chave\n"
 "                             de ordenação se --sort=time\n"
 
-#: src/ls.c:4835
+#: src/ls.c:4896
 #, fuzzy
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
 msgstr ""
 "      --time-style=ESTILO    com -l, mostrat tempos usando o ESTILO:\n"
 "                             full-iso, long-iso, iso, locale, +FORMATO.\n"
@@ -5818,7 +5888,7 @@ msgstr ""
 "toma\n"
 "                             efeito apenas fora da localização POSIX\n"
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 #, fuzzy
 msgid ""
 "  -t                         sort by modification time, newest first\n"
@@ -5827,11 +5897,11 @@ msgstr ""
 "  -t                         ordenar por tempo de modificação\n"
 "  -T, --tabsize=COLS         assumir TABs de COLS espaços em vez de 8\n"
 
-#: src/ls.c:4848
+#: src/ls.c:4912
 #, fuzzy
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
@@ -5844,13 +5914,13 @@ msgstr ""
 "  -U                         não ordenar; listar entradas na ordem da pasta\n"
 "  -v                         ordenar por versão\n"
 
-#: src/ls.c:4855
+#: src/ls.c:4919
+#, fuzzy
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 "  -w, --width=COLS           assumir largura de ecrã em vez do valor actual\n"
@@ -5859,7 +5929,7 @@ msgstr ""
 "  -Z, --context              mostrar contextos de segurança SELinux\n"
 "  -1                         listar um ficheiro por linha\n"
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -5868,7 +5938,7 @@ msgid ""
 "variable can change the settings.  Use the dircolors command to set it.\n"
 msgstr ""
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -5945,9 +6015,11 @@ msgstr "  -t, --text              ler em modo de texto (predefinido)\n"
 #, fuzzy
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
@@ -5957,12 +6029,7 @@ msgstr ""
 "  -w, --warn              avisar linhas de somas de controlo mal formatadas\n"
 "\n"
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -5979,111 +6046,110 @@ msgstr ""
 "soma de controlo, um carácter indicando o tipo ('*' para binário, ' ' para\n"
 "texto) e nome para cada FICHEIRO.\n"
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, c-format
 msgid "%s: too many checksum lines"
 msgstr "%s: demasiadas linhas de somas de controlo"
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr "%s: %<PRIuMAX>: linha de soma de controlo %s mal formatada"
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr "%s: ERRO de abertura ou leitura\n"
 
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr "ERRO"
 
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr "OK"
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr "%s: encontradas linhas de somas de controlo %s mal formatadas"
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, fuzzy, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
 msgstr[0] "%s: %<PRIuMAX>: linha de soma de controlo %s mal formatada"
 msgstr[1] "%s: %<PRIuMAX>: linha de soma de controlo %s mal formatada"
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, fuzzy, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
 msgstr[0] "AVISO: %<PRIuMAX> de %<PRIuMAX> ficheiro listado não lido"
 msgstr[1] "AVISO: %<PRIuMAX> de %<PRIuMAX> ficheiros listados não lidos"
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, fuzzy, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
 msgstr[0] "AVISO: %<PRIuMAX> de %<PRIuMAX> soma de controlo não corresponde"
 msgstr[1] "AVISO: %<PRIuMAX> de %<PRIuMAX> somas de controlo não correspondem"
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
 msgstr ""
 
-#: src/md5sum.c:766
+#: src/md5sum.c:770
 #, fuzzy, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr "a opção --status apenas faz sentido ao verificar somas de controlo"
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
 msgstr ""
 "as opções --binary e --text não têm sentido ao verificar somas de controlo"
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr "a opção --status apenas faz sentido ao verificar somas de controlo"
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr "a opção --warn  apenas faz sentido ao verificar somas de controlo"
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, fuzzy, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr "a opção --status apenas faz sentido ao verificar somas de controlo"
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, fuzzy, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr "a opção --status apenas faz sentido ao verificar somas de controlo"
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr "Utilização: %s [OPÇÃO]... PASTA...\n"
 
-#: src/mkdir.c:57
+#: src/mkdir.c:59
 #, fuzzy
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
 msgstr ""
 "Criar as PASTA(s),caso ainda não existam.\n"
 "\n"
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
+#, fuzzy
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 "  -m, --mode=MODO   alterar modo do ficheiro (como chmod), não a=rwx - "
 "umask\n"
@@ -6093,63 +6159,89 @@ msgstr ""
 "  -Z, --context=CTX  alterar o context de segurança SELinux de cada pasta\n"
 "                      criada para CTX\n"
 
-#: src/mkdir.c:168
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/mkdir.c:127 src/mkdir.c:172
+#, fuzzy, c-format
+msgid "failed to set default creation context for %s"
+msgstr "erro ao alterar contexto padrão de criação de ficheiros %s"
+
+#: src/mkdir.c:191
+#, fuzzy, c-format
+msgid "failed to restore context for %s"
+msgstr "erro ao preservar os tempos de %s"
+
+#: src/mkdir.c:231
 #, c-format
 msgid "created directory %s"
 msgstr "pasta %s criada"
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, fuzzy, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr "Aviso: a ignorar --context (-Z); SELinux não activado."
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr "Utilização: %s [OPÇÃO]... NOME...\n"
 
-#: src/mkfifo.c:52
+#: src/mkfifo.c:54
 #, fuzzy
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
 msgstr ""
 "Criar pipes nomeados (FIFOs) com os NOMEs dados.\n"
 "\n"
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 #, fuzzy
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
 msgstr "  -m, --mode=MODO   alterar permissões para MODO, não a=rw - umask\n"
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
-"  -Z, --context=CTX  alterar cont. segur. SELinux de cada NOME para CTX\n"
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, c-format
 msgid "invalid mode"
 msgstr "modo inválido"
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr "modo deve especificar apenas bits de permissão de ficheiro"
 
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
+#, fuzzy, c-format
+msgid "cannot set permissions of %s"
+msgstr "impossível alterar as permissões de %s"
+
+#: src/mknod.c:54
 #, c-format
 msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr "Utilização: %s [OPÇÃO]... NOME TIPO [MAIOR MENOR]\n"
 
-#: src/mknod.c:54
+#: src/mknod.c:56
 #, fuzzy
 msgid "Create the special file NAME of the given TYPE.\n"
 msgstr ""
 "Criar o ficheiro especial NOME com o TIPO dado.\n"
 "\n"
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr ""
-"  -Z, --context=CTX  alterar contexto de segur. SELinux de NOME para CTX\n"
-
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -6164,7 +6256,7 @@ msgstr ""
 "é interpretado como hexadecimal; senão, se começarem por 0, como octal;\n"
 "senão, como decimal. TIPO pode ser:\n"
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 msgid ""
 "\n"
 "  b      create a block (buffered) special file\n"
@@ -6176,55 +6268,55 @@ msgstr ""
 "  c, u   criar um ficheiro especial de caracteres (não protegido)\n"
 "  p      criar um FIFO\n"
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 msgid "Special files require major and minor device numbers."
 msgstr "Ficheiros especiais requerem números maior e menor do dispositivo."
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 msgid "Fifos do not have major and minor device numbers."
 msgstr "Fifos não possuem números maior e menor de dispositivo."
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, c-format
 msgid "block special files not supported"
 msgstr "ficheiros especiais de tipo bloco não suportados"
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, c-format
 msgid "character special files not supported"
 msgstr "ficheiros especiais de tipo caracter não suportados"
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, c-format
 msgid "invalid major device number %s"
 msgstr "número maior de dispositivo inválido %s"
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, c-format
 msgid "invalid minor device number %s"
 msgstr "número menor de dispositivo inválido %s"
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, c-format
 msgid "invalid device %s %s"
 msgstr "dispositivo inválido %s %s"
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, c-format
 msgid "invalid device type %s"
 msgstr "tipo de dispositivo inválido %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr ""
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr "Utilização: %s [OPÇÃO]... [MOLDE]\n"
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 #, fuzzy
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
@@ -6234,33 +6326,33 @@ msgstr ""
 "Criar um ficheiro ou pasta temporários de forma segura e mostrar o nome.\n"
 "Se MOLDE não for especificado, usar tmp.XXXXXXXXXX.\n"
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
 "  -q, --quiet         suppress diagnostics about file/dir-creation failure\n"
 msgstr ""
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
 #, fuzzy
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
 "  --tmpdir[=PASTA] interpretar MOLDE relativamente a PASTA. Se PASTA não "
@@ -6271,10 +6363,9 @@ msgstr ""
 "ainda\n"
 "                     assim mktemp cria apenas a componente final.\n"
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
 #, fuzzy
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
@@ -6284,59 +6375,54 @@ msgstr ""
 "                     relativo a uma pasta: $TMPDIR, se definida; senão a\n"
 "                     pasta especificada via -p; senão /tmp [obsoleto]\n"
 
-#: src/mktemp.c:223
-#, fuzzy, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr "erro ao redireccionar o canal de erro padrão"
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, c-format
 msgid "too many templates"
 msgstr "demasiados moldes (templates)"
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr ""
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, fuzzy, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr "molde (template) inválido, %s, contém separador de pastas"
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr "muito poucos X's no molde (template) %s"
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr "molde (template) inválido, %s, contém separador de pastas"
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr "molde (template) inválido, %s; com --tmpdir, pode não ser absoluto"
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, c-format
 msgid "failed to create directory via template %s"
 msgstr "erro ao criar pasta via molde (template) %s"
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, c-format
 msgid "failed to create file via template %s"
 msgstr "erro ao criar ficheiro via molde (template) %s"
 
-#: src/mv.c:292
+#: src/mv.c:294
 #, fuzzy
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 "Renomear ORIGEM para DESTINO ou mover ORIGEM(ns) para PASTA.\n"
 "\n"
 
-#: src/mv.c:298
+#: src/mv.c:300
 #, fuzzy
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
@@ -6355,7 +6441,7 @@ msgstr ""
 "  -f, --force                  não perguntar antes de sobrescrever\n"
 "  -i, --interactive            perguntar antes de sobrescrever\n"
 
-#: src/mv.c:307
+#: src/mv.c:309
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
@@ -6366,7 +6452,8 @@ msgstr ""
 "                                 de ORIGEM\n"
 "  -S, --suffix=SUFIXO          redefinir o sufixo de salvaguarda habitual\n"
 
-#: src/mv.c:312
+#: src/mv.c:314
+#, fuzzy
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
 "DIRECTORY\n"
@@ -6375,6 +6462,8 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
 "  -t, --target-directory=PASTA mover todas as ORIGEM(ns) para a PASTA\n"
 "  -T, --no-target-directory    tratar DESTINO como um ficheiro normal\n"
@@ -6676,95 +6765,90 @@ msgid "%s: invalid number to ignore"
 msgstr "%s: número de linhas inválido"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
 msgstr ""
 
-#: src/numfmt.c:676
+#: src/numfmt.c:659
 #, fuzzy, c-format
-msgid "value too large to be converted: '%s'"
+msgid "value too large to be converted: %s"
 msgstr "%s: valor não convertido na totalidade"
 
-#: src/numfmt.c:680
+#: src/numfmt.c:663
 #, fuzzy, c-format
-msgid "invalid number: '%s'"
+msgid "invalid number: %s"
 msgstr "número inválido %s"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
+msgid "rejecting suffix in input: %s (consider using --from)"
 msgstr ""
 
-#: src/numfmt.c:688
+#: src/numfmt.c:671
 #, fuzzy, c-format
-msgid "invalid suffix in input: '%s'"
+msgid "invalid suffix in input: %s"
 msgstr "sufixo inválido no argumento %s%s '%s'"
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
 msgstr ""
 
-#: src/numfmt.c:723
+#: src/numfmt.c:722 src/numfmt.c:768
 #, fuzzy, c-format
 msgid "failed to prepare value '%Lf' for printing"
 msgstr "%s: erro ao abrir para escrita"
 
-#: src/numfmt.c:787
+#: src/numfmt.c:791
 #, fuzzy, c-format
-msgid "invalid unit size: '%s'"
+msgid "invalid unit size: %s"
 msgstr "tamanho de tabulação inválido: %s"
 
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
-#, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr ""
-
-#: src/numfmt.c:813
+#: src/numfmt.c:814
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
 msgstr "Utilização: %s [OPÇÃO]... [UTILIZADOR]...\n"
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
 msgstr ""
 
-#: src/numfmt.c:820
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
 msgstr ""
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
 msgstr ""
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
 "                         see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr ""
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
@@ -6772,19 +6856,19 @@ msgid ""
 "locale)\n"
 msgstr ""
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
 msgstr ""
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
 msgstr ""
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -6794,43 +6878,40 @@ msgid ""
 "                         is found\n"
 msgstr ""
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
 "nearest\n"
 msgstr ""
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
 msgstr ""
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr ""
 
-#: src/numfmt.c:877
-#, fuzzy
+#: src/numfmt.c:878
 msgid ""
 "\n"
 "UNIT options:\n"
 msgstr ""
-"Opções de ordenação:\n"
-"\n"
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr ""
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -6839,7 +6920,7 @@ msgid ""
 "               1Mi = 1048576,\n"
 msgstr ""
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
@@ -6847,7 +6928,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
@@ -6855,7 +6936,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
@@ -6863,18 +6944,18 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:905
+#: src/numfmt.c:906
 #, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -6886,7 +6967,7 @@ msgid ""
 "errors are not diagnosed and the exit status is 0.\n"
 msgstr ""
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -6907,112 +6988,112 @@ msgid ""
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 msgstr ""
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, fuzzy, c-format
 msgid "format %s has no %% directive"
 msgstr "o destino %s não é uma pasta"
 
-#: src/numfmt.c:990
+#: src/numfmt.c:1003
 #, fuzzy, c-format
 msgid "invalid format %s (width overflow)"
 msgstr "formato de largura inválido"
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr ""
+
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr ""
 
-#: src/numfmt.c:1010
+#: src/numfmt.c:1030
 #, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
 msgstr ""
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr ""
 
-#: src/numfmt.c:1070
+#: src/numfmt.c:1081
 #, fuzzy, c-format
-msgid "invalid suffix in input '%s': '%s'"
+msgid "invalid suffix in input %s: %s"
 msgstr "sufixo inválido no argumento %s%s '%s'"
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
 msgstr ""
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
 msgstr ""
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
+msgid "large input value %s: possible precision loss"
 msgstr ""
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
 
-#: src/numfmt.c:1388
+#: src/numfmt.c:1403
 #, fuzzy, c-format
-msgid "invalid padding value '%s'"
-msgstr "Alcance de página inválido %s"
+msgid "invalid padding value %s"
+msgstr "data inválida %s"
 
-#: src/numfmt.c:1401
+#: src/numfmt.c:1417
 #, fuzzy, c-format
-msgid "invalid field value '%s'"
+msgid "invalid field value %s"
 msgstr "número de campo inválido: %s"
 
-#: src/numfmt.c:1430
+#: src/numfmt.c:1447
 #, fuzzy, c-format
-msgid "invalid header value '%s'"
+msgid "invalid header value %s"
 msgstr "data inválida %s"
 
-#: src/numfmt.c:1456
+#: src/numfmt.c:1473
 #, fuzzy, c-format
 msgid "--grouping cannot be combined with --format"
 msgstr "Operandos ficheiros não podem ser combinados com --files0-from."
 
-#: src/numfmt.c:1458
-#, fuzzy, c-format
-msgid "--padding cannot be combined with --format"
-msgstr "Operandos ficheiros não podem ser combinados com --files0-from."
-
-#: src/numfmt.c:1463
+#: src/numfmt.c:1478
 #, fuzzy, c-format
 msgid "no conversion option specified"
 msgstr "múltiplas opções -i especificadas"
 
-#: src/numfmt.c:1471
+#: src/numfmt.c:1486
 #, fuzzy, c-format
 msgid "grouping cannot be combined with --to"
 msgstr "Operandos ficheiros não podem ser combinados com --files0-from."
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
 msgstr ""
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
 msgstr ""
 
-#: src/numfmt.c:1511
+#: src/numfmt.c:1526
 #, fuzzy, c-format
 msgid "error reading input"
 msgstr "erro ao ler %s"
 
-#: src/numfmt.c:1520
+#: src/numfmt.c:1535
 #, fuzzy, c-format
 msgid "failed to convert some of the input numbers"
-msgstr "erro ao redireccionar o canal de erro padrão"
+msgstr "erro ao alterar contexto de %s para %s"
 
-#: src/od.c:294
+#: src/od.c:320
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -7025,7 +7106,7 @@ msgstr ""
 "  ou:       %s --traditional [OPÇÃO]... [FICHEIRO] [[+]POSIÇÃO[.][b] [+]"
 "[ETIQUETA][.][b]]\n"
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -7041,7 +7122,7 @@ msgstr ""
 "Sem FICHEIRO ou quando FILE é -, ler a entrada padrão.\n"
 "\n"
 
-#: src/od.c:307
+#: src/od.c:333
 #, fuzzy
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
@@ -7060,26 +7141,25 @@ msgstr ""
 "Para �NDICE e ETIQUETA, um prefixo 0x ou 0X indica hexadecimal;\n"
 "sufixos podem ser . para octal e b para multiplicar por 512.\n"
 
-#: src/od.c:318
-#, fuzzy
+#: src/od.c:344
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
-"  -A, --address-radix=RADICAL decidir como exibir índices de ficheiros\n"
-"  -j, --skip-bytes=BYTES      saltar BYTES bytes de entrada iniciais\n"
 
-#: src/od.c:323
+#: src/od.c:350
 #, fuzzy
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
@@ -7091,7 +7171,7 @@ msgstr ""
 "  -w, --width[=BYTES]         despejar BYTES bytes por linha de saída\n"
 "      --traditional           aceitar argumentos na forma tradicional\n"
 
-#: src/od.c:336
+#: src/od.c:363
 #, fuzzy
 msgid ""
 "\n"
@@ -7099,7 +7179,7 @@ msgid ""
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 "\n"
@@ -7110,7 +7190,7 @@ msgstr ""
 "sinalizadas\n"
 "  -d   como -t u2, seleccionar unidades de 2 bytes decimais positivas\n"
 
-#: src/od.c:345
+#: src/od.c:372
 msgid ""
 "  -f   same as -t fF, select floats\n"
 "  -i   same as -t dI, select decimal ints\n"
@@ -7126,14 +7206,14 @@ msgstr ""
 "  -s   como -t d2, seleccionar unidades decimais de 2 bytes\n"
 "  -x   como -t x2, seleccionar unidades hexadeciamis de 2 bytes\n"
 
-#: src/od.c:353
+#: src/od.c:380
 #, fuzzy
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 "\n"
 "TIPO é feito de uma ou mais destas especificações:\n"
@@ -7141,7 +7221,7 @@ msgstr ""
 "  a          carácter nomeado, ignorando o bit de alta ordem\n"
 "  c          carácter ASCII ou barra invertida sinalizada\n"
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -7155,7 +7235,7 @@ msgstr ""
 "  u[TAMANHO] decimal sem sinal, TAMANHO bytes por inteiro\n"
 "  x[TAMANHO] hexadecimal, TAMANHO bytes por inteiro\n"
 
-#: src/od.c:367
+#: src/od.c:394
 #, fuzzy
 msgid ""
 "\n"
@@ -7170,14 +7250,14 @@ msgstr ""
 "sizeof(long). Se TIPO é f, TAMANHO pode também ser F para sizeof(float), D\n"
 "para sizeof(double) ou L para sizeof(long double).\n"
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
 "each output line.\n"
 msgstr ""
 
-#: src/od.c:379
+#: src/od.c:406
 #, fuzzy
 msgid ""
 "\n"
@@ -7195,12 +7275,12 @@ msgstr ""
 "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
 "GB 1000*1000*1000, G 1024*1024*1024 e assim por diante para T, P, E, Z, Y.\n"
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, c-format
 msgid "invalid type string %s"
 msgstr "expressão inválida %s"
 
-#: src/od.c:649
+#: src/od.c:690
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7209,7 +7289,7 @@ msgstr ""
 "expressão de tipo inválida %s;\n"
 "este sistema não providencia um tipo integral de %lu bytes"
 
-#: src/od.c:770
+#: src/od.c:811
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7218,38 +7298,38 @@ msgstr ""
 "expressão de tipo inválida %s;\n"
 "este sistema não providencia um tipo de vírgula flutuante de %lu bytes"
 
-#: src/od.c:828
+#: src/od.c:869
 #, fuzzy, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr "carácter inválido '%c' na expressão de tipo %s"
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr "impossível slatar depois do fim da entrada combinada"
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, fuzzy, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr ""
 "radical de endereço de saída '%c' inválido; tem de ser um carácter de [doxn]"
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr "nenhum tipo pode ser especificado ao despejar expressões"
 
-#: src/od.c:1810
+#: src/od.c:1863
 #, fuzzy
 msgid "compatibility mode supports at most one file"
 msgstr "Modo de compatibilidade suporta no máximo um ficheiro."
 
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr "skip-bytes + read-bytes é demasiado grande"
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr "aviso: largura inválida %lu; a usar %d ao invés"
@@ -7416,12 +7496,12 @@ msgstr "Quando"
 msgid "Where"
 msgstr "Onde"
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr "Utilização: %s [OPÇÃO]... [UTILIZADOR]...\n"
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -7439,7 +7519,7 @@ msgstr ""
 "  -p              omitir o ficheiro de plano do utilizador em formato longo\n"
 "  -s              produzir saída curta (predefinido)\n"
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -7455,7 +7535,7 @@ msgstr ""
 "tempo\n"
 "                  de inactividade em formato curto\n"
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -7466,7 +7546,7 @@ msgstr ""
 "Um programa 'finger' leve; exibir informação de utilizador.\n"
 "O ficheiro utmp será %s.\n"
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr "nenhum utilizador especificado; pelo menos um deve sê-lo com -l"
@@ -7696,7 +7776,8 @@ msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
@@ -7708,7 +7789,7 @@ msgstr ""
 "opções\n"
 "                    de colunas (-COLUNAS|-a -COLUNAS|-m), excepto com -w\n"
 
-#: src/pr.c:2827
+#: src/pr.c:2828
 #, fuzzy
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
@@ -7724,7 +7805,7 @@ msgstr ""
 "                    (o mesmo que -S\" \"), não afecta opções de colunas\n"
 "  -t, --omit-header  omitir cabeçalhos e reboques de página\n"
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 #, fuzzy
 msgid ""
 "  -T, --omit-pagination\n"
@@ -7750,7 +7831,7 @@ msgstr ""
 "                    para saída de múlt. cols. de texto, -s[char] desactiva "
 "(72)\n"
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 #, fuzzy
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
@@ -7765,7 +7846,7 @@ msgstr ""
 "interferência\n"
 "                    com -S ou -s\n"
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 #, fuzzy
 msgid ""
 "\n"
@@ -7791,7 +7872,7 @@ msgstr ""
 
 #: src/printenv.c:69
 #, fuzzy
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr ""
 "  -z, --zero-terminated     terminar linhas com byte 0, não nova linha\n"
 
@@ -7913,12 +7994,12 @@ msgstr "aviso: a ignorar argumentos excessivos, a começar por %s"
 msgid "F. Pinard"
 msgstr "F. Pinard"
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, c-format
 msgid "%s (for regexp %s)"
 msgstr "%s (para expressão regular %s)"
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
@@ -7927,7 +8008,7 @@ msgstr ""
 "Utilização: %s [OPÇÃO]... [ENTRADA]...   (sem -G)\n"
 "  ou:       %s -G [OPÇÃO]... [ENTRADA [SA�DA]]\n"
 
-#: src/ptx.c:1821
+#: src/ptx.c:1824
 #, fuzzy
 msgid ""
 "Output a permuted index, including context, of the words in the input "
@@ -7937,7 +8018,7 @@ msgstr ""
 "de entrada.\n"
 "\n"
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 #, fuzzy
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
@@ -7949,7 +8030,7 @@ msgstr ""
 "  -G, --traditional              actuar mais de acordo com o 'ptx' System V\n"
 "  -F, --flag-truncation=EXPR     usar EXPR para marcar truncagens de linhas\n"
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 #, fuzzy
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
@@ -7964,7 +8045,7 @@ msgstr ""
 "  -S, --sentence-regexp=EXPREG   para fins de linhas ou frases\n"
 "  -T, --format=tex               gerar saída como directivas TeX\n"
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -7982,7 +8063,7 @@ msgstr ""
 "  -i, --ignore-file=FICHEIRO     ler lista palavras a ignorar de FICHEIRO\n"
 "  -o, --only-file=FICHEIRO       ler lista palavras únicas de FICHEIRO\n"
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -7995,16 +8076,16 @@ msgstr ""
 "  -w, --width=NÚMERO             largura saída em colunas, referência "
 "excluída\n"
 
-#: src/ptx.c:1854
+#: src/ptx.c:1857
 #, fuzzy
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
 "\n"
-"Sem FICHEIRO ou se FICHEIRO é -, ler a entrada padrão. '-F /' por omissão.\n"
+"Sem FICHEIRO, ou quando FICHEIRO é -, ler entrada padrão.\n"
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, c-format
 msgid "invalid gap width: %s"
 msgstr "largura de espaço inválida: %s"
@@ -8023,22 +8104,28 @@ msgid ""
 "  -P, --physical  avoid all symlinks\n"
 msgstr ""
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+
+#: src/pwd.c:169
 #, c-format
 msgid "failed to chdir to %s"
 msgstr "erro ao entrar na pasta %s"
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, c-format
 msgid "failed to stat %s"
 msgstr "erro ao analisar %s"
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr "entrada de pasta não encontrada em %s com i-node correspondente"
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, c-format
 msgid "ignoring non-option arguments"
 msgstr "a ignorar argumentos não-opção"
@@ -8048,8 +8135,8 @@ msgstr "a ignorar argumentos não-opção"
 msgid "Dmitry V. Levin"
 msgstr ""
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Utilização: %s [OPÇÃO]... FICHEIRO...\n"
@@ -8098,8 +8185,7 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 "  -m, --canonicalize-missing    canonizar seguindo todas as ligações "
 "simbólicas\n"
@@ -8134,7 +8220,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 
@@ -8152,41 +8238,42 @@ msgstr "%s: entrar na pasta protegida contra escrita %s? "
 msgid "%s: descend into directory %s? "
 msgstr "%s: entrar na pasta %s? "
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr "%s: remover %s %s protegido contra escrita?"
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, c-format
 msgid "%s: remove %s %s? "
 msgstr "%s: remover %s %s? "
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, c-format
 msgid "removed directory: %s\n"
 msgstr "pasta removida: %s\n"
 
-#: src/remove.c:444
+#: src/remove.c:447
 #, fuzzy, c-format
-msgid "cannot remove directory: %s"
-msgstr "impossível remover a pasta %s"
+msgid "refusing to remove %s or %s directory: skipping %s"
+msgstr "erro ao remover a pasta %s"
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr "a saltar %s, uma vez que se encontra noutro dispositivo"
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, fuzzy, c-format
 msgid "traversal failed: %s"
 msgstr "erro de read"
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -8213,15 +8300,16 @@ msgstr ""
 "  -i                    perguntar antes de cada remoção\n"
 
 #: src/rm.c:142
+#, fuzzy
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 "  -I                    perguntar uma vez antes de remover mais de 3 "
 "ficheiros\n"
@@ -8300,14 +8388,18 @@ msgstr ""
 "realmente irrecuperáveis, considere a utilização de shred.\n"
 
 #: src/rm.c:342
-#, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr "%s: remover todos os argumentos recursivamente? "
+#, fuzzy, c-format
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] "%s: remover todos os argumentos recursivamente? "
+msgstr[1] "%s: remover todos os argumentos recursivamente? "
 
-#: src/rm.c:343
-#, c-format
-msgid "%s: remove all arguments? "
-msgstr "%s: remover todos os argumentos? "
+#: src/rm.c:345
+#, fuzzy, c-format
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] "%s: remover todos os argumentos? "
+msgstr[1] "%s: remover todos os argumentos? "
 
 #: src/rmdir.c:134 src/rmdir.c:233
 #, c-format
@@ -8363,7 +8455,7 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
 
@@ -8424,41 +8516,46 @@ msgstr "deve especificar -c, -t, -u, -l, -r ou contexto"
 msgid "no command specified"
 msgstr "nenhum comando especificado"
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, fuzzy, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr "runcon apenas pode ser usado com SELinux activado"
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, c-format
 msgid "failed to compute a new context"
 msgstr "erro ao computar um novo contexto"
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, c-format
 msgid "failed to set new user %s"
 msgstr "erro ao definir o novo utilizador %s"
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, c-format
 msgid "failed to set new type %s"
 msgstr "erro ao definir o novo tipo %s"
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, c-format
 msgid "failed to set new range %s"
 msgstr "erro ao definir o novo intervalo %s"
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, c-format
 msgid "failed to set new role %s"
 msgstr "erro ao definir o novo papel %s"
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, c-format
 msgid "unable to set security context %s"
 msgstr "erro ao definir o context de segurança %s"
 
+#: src/selinux.c:127 src/selinux.c:300
+#, fuzzy, c-format
+msgid "error canonicalizing %s"
+msgstr "erro ao ler %s"
+
 #: src/seq.c:68
 #, c-format
 msgid ""
@@ -8490,10 +8587,13 @@ msgstr ""
 "  -w, --equal-width        equalizar largura preenchendo zeros iniciais\n"
 
 #: src/seq.c:86
+#, fuzzy
 msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
@@ -8505,7 +8605,7 @@ msgstr ""
 "INCREMENTO é habitualmente positivo se PRIMEIRO é menor que ÚLTIMO, e\n"
 "INCREMENTO é habitualmente negativo se PRIMEIRO é maior que ÚLTIMO.\n"
 
-#: src/seq.c:94
+#: src/seq.c:96
 #, fuzzy
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
@@ -8516,92 +8616,29 @@ msgstr ""
 "predefinido como %.PRECf se PRIMEIRO, INCREMENTO e ÚLTIMO são todos números\n"
 "decimais de ponto fixo com precisão máxima PREC, seno como %g.\n"
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, c-format
 msgid "invalid floating point argument: %s"
 msgstr "argumento em vírgula flutuante inválido: %s"
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, fuzzy, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr "%s é um tipo de ficheiro desconhecido"
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr ""
 "a expressão de formatação não deve ser especificada ao mostrar expressões da "
 "mesma largura"
 
-#: src/setuidgid.c:49
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-"Utilização: %s OPÇÃO UTILIZADOR COMANDO [ARGUMENTO]...\n"
-"  ou:       %s OPÇÃO\n"
-
-#: src/setuidgid.c:55
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-"Descartar grupos suplementares, assumir IDs de utilizador e grupo do "
-"UTILIZADOR\n"
-"especificado (ID numérico ou nome) e executar COMANDO com ARGUMENTOs.\n"
-"Sair com estado 111 se incapaz de assumir IDs de utilizador e grupo "
-"requeridos.\n"
-"Caso contrário, sair com o estado de saída de COMANDO.\n"
-"Este programa é útil apenas quando executado pelo superutilizador (ID "
-"zero).\n"
-"\n"
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-"  -g GID[,GID1...]  definir também o ID de grupo primário como GID numérico\n"
-"                    e (se pedido) IDs de grupo suplementares como GID1, ...\n"
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr "ID de utilizador desconhecido: %s"
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr "para usar o ID de utilizador %s necessita usar -g também"
-
-#: src/setuidgid.c:190
-#, c-format
-msgid "failed to set supplemental group(s)"
-msgstr "erro ao definir grupo(s) adicional(is)"
-
-#: src/setuidgid.c:200
-#, c-format
-msgid "cannot set group-ID to %lu"
-msgstr "impossível alterar o identificador de grupo para %lu"
-
-#: src/setuidgid.c:204
-#, c-format
-msgid "cannot set user-ID to %lu"
-msgstr "impossível alterar o identificador de utilizador para %lu"
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr ""
 
-#: src/shred.c:148
+#: src/shred.c:170
 #, fuzzy
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
@@ -8611,7 +8648,7 @@ msgstr ""
 "ainda mais difícil recuperar os dados mesmo para equipamento muito caro.\n"
 "\n"
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, fuzzy, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -8624,9 +8661,10 @@ msgstr ""
 "      --random-source=FICH  obter bytes aleatórios de FICH (/dev/urandom)\n"
 "  -s, --size=N   destruir N bytes (sufixos como K, M e G são aceites)\n"
 
-#: src/shred.c:161
+#: src/shred.c:183
+#, fuzzy
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
@@ -8639,15 +8677,20 @@ msgstr ""
 "  -z, --zero     adicionar zeros no final da escrita para esconder "
 "destruição\n"
 
-#: src/shred.c:170
+#: src/shred.c:192
+#, fuzzy
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 "\n"
@@ -8660,7 +8703,7 @@ msgstr ""
 "regulares, a opção mais comum é --remove option.\n"
 "\n"
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -8678,7 +8721,7 @@ msgstr ""
 "não é garantido que seja eficaz em todos os modos do sistema de ficheiros:\n"
 "\n"
 
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -8700,7 +8743,7 @@ msgstr ""
 "* sistemas com imagens instantâneas, como Network Appliance's NFS server\n"
 "\n"
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -8714,7 +8757,7 @@ msgstr ""
 "* sistemas de ficheiros com compressão\n"
 "\n"
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -8737,7 +8780,7 @@ msgstr ""
 "como documentado na página de manual mount (man mount).\n"
 "\n"
 
-#: src/shred.c:215
+#: src/shred.c:241
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
 "of the file that cannot be removed, and that will allow a shredded file\n"
@@ -8749,127 +8792,127 @@ msgstr ""
 "um\n"
 "ficheiro destruído seja recuperado mais tarde.\n"
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, c-format
 msgid "%s: fdatasync failed"
 msgstr "%s: error de fdatasync"
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr "%s: error de fsync"
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr "%s: impossível retroceder"
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr "%s: pass %lu/%lu (%s)..."
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, c-format
 msgid "%s: error writing at offset %s"
 msgstr "%s: erro ao escrever na posição %s"
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s: erro de lseek"
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, c-format
 msgid "%s: file too large"
 msgstr "%s: ficheiro demasiado grande"
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr "%s: pass %lu/%lu (%s)...%s"
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, c-format
 msgid "%s: fstat failed"
 msgstr "%s: erro de fstat"
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, c-format
 msgid "%s: invalid file type"
 msgstr "%s: tipo de ficheiro inválido"
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr "%s: ficheiro tem tamanho negativo"
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, c-format
 msgid "%s: error truncating"
 msgstr "%s: erro de truncagem"
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, c-format
 msgid "%s: fcntl failed"
 msgstr "%s: erro de fcntl"
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr "%s: impossível destruir ficheiro (apenas se pode acrescentar)"
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr "%s: a remover"
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, c-format
 msgid "%s: renamed to %s"
 msgstr "%s: renomeado para %s"
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, c-format
 msgid "%s: failed to remove"
 msgstr "%s: impossível remover"
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr "%s: removido"
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, c-format
 msgid "%s: failed to close"
 msgstr "%s: erro ao fechar"
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, c-format
 msgid "%s: failed to open for writing"
 msgstr "%s: erro ao abrir para escrita"
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, c-format
 msgid "%s: invalid number of passes"
 msgstr "%s: número de passagens inválido"
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, c-format
 msgid "multiple random sources specified"
 msgstr "múltiplas origens aleatórias especificadas"
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, c-format
 msgid "%s: invalid file size"
 msgstr "%s: tamanho de ficheiro inválido"
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -8880,14 +8923,14 @@ msgstr ""
 "  ou:       %s -e [OPÇÃO]... [ARG]...\n"
 "  ou:       %s -i BAIXO-ALTO [OPÇÃO]...\n"
 
-#: src/shuf.c:54
+#: src/shuf.c:67
 #, fuzzy
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr ""
 "Escrever uma permutação aleatória das linhas de entrada na saída padrão.\n"
 "\n"
 
-#: src/shuf.c:60
+#: src/shuf.c:73
 #, fuzzy
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
@@ -8896,7 +8939,7 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
 msgstr ""
 "  -e, --echo                tratar cada ARG com ouma linha de entrada\n"
 "  -i, --input-range=BAIXO-ALTO   tratar cada núm. BAIXO a ALTO como entrada\n"
@@ -8906,31 +8949,41 @@ msgstr ""
 "      --random-source=FICH  obter bytes aleatórios de FICH (/dev/urandom)\n"
 "  -z, --zero-terminated     terminar linhas com byte zero, não nova linha\n"
 
-#: src/shuf.c:244
+#: src/shuf.c:228
+#, fuzzy, c-format
+msgid "too many input lines"
+msgstr "demasiados linhas repetidas"
+
+#: src/shuf.c:431
 #, c-format
 msgid "multiple -i options specified"
 msgstr "múltiplas opções -i especificadas"
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, c-format
 msgid "invalid input range %s"
 msgstr "intervalo de entrada inválido %s"
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, c-format
 msgid "invalid line count %s"
 msgstr "contagem de linhas inválida %s"
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, c-format
 msgid "multiple output files specified"
 msgstr "múltiplos ficheiros de saída especificados"
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, c-format
 msgid "cannot combine -e and -i options"
 msgstr "impossível combinar as opções -e e -i"
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr ""
+
 #: src/sleep.c:44
 #, fuzzy, c-format
 msgid ""
@@ -8954,24 +9007,24 @@ msgstr ""
 "pela soma dos seus valores.\n"
 "\n"
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, c-format
 msgid "invalid time interval %s"
 msgstr "intervalo de tempo inválido %s"
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr "impossível consultar relógio de tempo real"
 
-#: src/sort.c:399
+#: src/sort.c:427
 #, fuzzy
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr ""
 "Escrever concatenação ordenada de todos os FICHEIROs na saída padrão.\n"
 "\n"
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
@@ -8979,7 +9032,7 @@ msgstr ""
 "Opções de ordenação:\n"
 "\n"
 
-#: src/sort.c:409
+#: src/sort.c:437
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
 "  -d, --dictionary-order      consider only blanks and alphanumeric "
@@ -8991,19 +9044,19 @@ msgstr ""
 "alfanuméricos\n"
 "  -f, --ignore-case           ignorar capitalização de letras\n"
 
-#: src/sort.c:415
+#: src/sort.c:443
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
 "  -i, --ignore-nonprinting    consider only printable characters\n"
 "  -M, --month-sort            compare (unknown) < 'JAN' < ... < 'DEC'\n"
 msgstr ""
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 
-#: src/sort.c:423
+#: src/sort.c:451
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
 "  -R, --random-sort           sort by random hash of keys\n"
@@ -9011,7 +9064,7 @@ msgid ""
 "  -r, --reverse               reverse the result of comparisons\n"
 msgstr ""
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -9021,7 +9074,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/sort.c:437
+#: src/sort.c:465
 #, fuzzy
 msgid ""
 "Other options:\n"
@@ -9030,13 +9083,13 @@ msgstr ""
 "Opções de ordenação:\n"
 "\n"
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
 msgstr ""
 
-#: src/sort.c:445
+#: src/sort.c:473
 #, fuzzy
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
@@ -9057,7 +9110,7 @@ msgstr ""
 "1)\n"
 "  -m, --merge               combinar ficheiros já ordenados; não ordenar\n"
 
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -9066,13 +9119,13 @@ msgid ""
 "                            If F is - then read names from standard input\n"
 msgstr ""
 
-#: src/sort.c:459
+#: src/sort.c:487
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
 "  -m, --merge               merge already sorted files; do not sort\n"
 msgstr ""
 
-#: src/sort.c:463
+#: src/sort.c:491
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "  -s, --stable              stabilize sort by disabling last-resort "
@@ -9083,7 +9136,7 @@ msgstr ""
 "  -s, --stable              estabilizar desactivando comparações de recurso\n"
 "  -S, --buffer-size=TAMANHO usar TAMANHO para memória principal temporária\n"
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, fuzzy, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -9104,12 +9157,7 @@ msgstr ""
 "  -u, --unique              com -c, verificar ordenação estricta;\n"
 "                              sem -c, mostrar só primeiro de iguais\n"
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr ""
-"  -z, --zero-terminated     terminar linhas com byte 0, não nova linha\n"
-
-#: src/sort.c:483
+#: src/sort.c:511
 #, fuzzy
 msgid ""
 "\n"
@@ -9139,7 +9187,7 @@ msgstr ""
 "\n"
 "TAMANHO pode ser seguido pelos seguintes sufixos multiplicativos:\n"
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -9160,258 +9208,243 @@ msgstr ""
 "Defina LC_ALL=C para obter a ordenação tradicional que utiliza valores\n"
 "de byte nativos.\n"
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, c-format
 msgid "waiting for %s [-d]"
 msgstr "a aguardar por %s [-d]"
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr "%s [-d] terminou de forma anormal"
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, fuzzy, c-format
 msgid "cannot create temporary file in %s"
 msgstr "impossível criar a pasta temporária %s"
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr "erro de open"
 
-#: src/sort.c:970
+#: src/sort.c:998
 msgid "fflush failed"
 msgstr "erro de fflush"
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr "erro de close"
 
-#: src/sort.c:986
-#, c-format
-msgid "dup2 failed"
-msgstr "erro de dup2"
-
-#: src/sort.c:1103
-#, c-format
-msgid "couldn't execute %s"
-msgstr "impossível executar %s"
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 msgid "couldn't create temporary file"
 msgstr "impossível criar o ficheiro temporário"
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, c-format
 msgid "couldn't create process for %s -d"
 msgstr "impossível criar o processo para %s -d"
 
-#: src/sort.c:1161
-#, c-format
-msgid "couldn't execute %s -d"
-msgstr "impossível executar %s -d"
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, c-format
 msgid "warning: cannot remove: %s"
 msgstr "aviso: impossível remover: %s"
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, fuzzy, c-format
 msgid "invalid --%s argument %s"
 msgstr "argumento inválido %s"
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, fuzzy, c-format
 msgid "minimum --%s argument is %s"
 msgstr "argumento %s%s inválido '%s'"
 
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, fuzzy, c-format
 msgid "--%s argument %s too large"
 msgstr "argumento %s%s '%s' demasiado grande"
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr ""
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr ""
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr "error de stat"
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr "erro de read"
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, c-format
 msgid "string transformation failed"
 msgstr "erro na transformação de expressões"
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, fuzzy, c-format
 msgid "the untransformed string was %s"
 msgstr "a expressão não transformada era %s."
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr ""
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr ""
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr ""
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr ""
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr ""
 
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, fuzzy, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
-msgstr[0] "%s: a opção '%s' é ambígua\n"
-msgstr[1] "%s: a opção '%s' é ambígua\n"
+msgstr[0] "%s: a opção '-W %s' é ambígua\n"
+msgstr[1] "%s: a opção '-W %s' é ambígua\n"
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr ""
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr "erro de escrita"
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr "%s: %s:%s: desordem: "
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr "erro padrão"
 
-#: src/sort.c:3698
+#: src/sort.c:3738
 #, fuzzy
 msgid "cannot read"
 msgstr "%s: impossível retroceder"
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, c-format
 msgid "%s: invalid field specification %s"
 msgstr "%s: especificação de campo inválida %s"
 
-#: src/sort.c:3987
+#: src/sort.c:4028
 #, fuzzy, c-format
 msgid "options '-%s' are incompatible"
 msgstr "as opções '-%s' são incompatíveis"
 
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, c-format
 msgid "%s: invalid count at start of %s"
 msgstr "%s: contagem inválida no início de %s"
 
-#: src/sort.c:4295
+#: src/sort.c:4336
 #, fuzzy
 msgid "invalid number after '-'"
 msgstr "número inválido após '-'"
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 #, fuzzy
 msgid "invalid number after '.'"
 msgstr "número inválido após '.'"
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr "carácter solto na especificação de campo"
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, c-format
 msgid "multiple compress programs specified"
 msgstr "múltiplos programas de compressão especificados"
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
 msgstr "número inválido no início do campo"
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
 msgstr "número de campo é zero"
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr "índice de carácter é zero"
 
-#: src/sort.c:4407
+#: src/sort.c:4448
 #, fuzzy
 msgid "invalid number after ','"
 msgstr "número inválido após ','"
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr "TAB vazio"
 
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, c-format
 msgid "cannot read file names from %s"
 msgstr "impossível ler os nomes de ficheiros a partir %s"
 
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, fuzzy, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr "nome de ficheiro vazio inválido'"
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, fuzzy, c-format
 msgid "no input from %s"
 msgstr "a fechar o ficheiro de entrada %s"
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr ""
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr ""
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr "operando extra %s não permitido com -%c"
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr ""
 
-#: src/split.c:204
+#: src/split.c:203
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr "Utilização: %s [OPÇÃO] [ENTRADA [PREFIXO]]\n"
 
-#: src/split.c:208
+#: src/split.c:207
 #, fuzzy
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
@@ -9424,32 +9457,25 @@ msgstr ""
 "ENTRADA é -, ler a entrada padrão.\n"
 "\n"
 
-#: src/split.c:216
-#, fuzzy, c-format
+#: src/split.c:215
+#, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
-"  -a, --suffix-length=N   usar sufixos de comprimento N (predefinido %d)\n"
-"  -b, --bytes=TAMANHO     colocar TAMANHO bytes por ficheiro de saída\n"
-"  -C, --line-bytes=TAMANHO colocar no máximo TAMANHO bytes de linhas por "
-"fich.\n"
-"  -d, --numeric-suffixes  usar sufixos numéricos em vez de alfabéticos\n"
-"  -l, --lines=NÚMERO      colocar NÚMERO linhas por ficheiro de saída\n"
 
-#: src/split.c:229
+#: src/split.c:228
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
 "                            output file is opened\n"
@@ -9458,7 +9484,7 @@ msgstr ""
 "cada\n"
 "                            ficheiro ser aberto\n"
 
-#: src/split.c:236
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -9470,189 +9496,189 @@ msgid ""
 "r/K/N   likewise but only output Kth of N to stdout\n"
 msgstr ""
 
-#: src/split.c:354
+#: src/split.c:353
 #, fuzzy, c-format
 msgid "output file suffixes exhausted"
 msgstr "Sufixos de ficheiro de saída esgotados"
 
-#: src/split.c:366
+#: src/split.c:365
 #, c-format
 msgid "creating file %s\n"
 msgstr "a criar o ficheiro %s\n"
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr ""
 
-#: src/split.c:391
+#: src/split.c:390
 #, fuzzy, c-format
 msgid "failed to set FILE environment variable"
 msgstr "erro ao definir o novo papel %s"
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr ""
 
-#: src/split.c:395
+#: src/split.c:394
 #, fuzzy, c-format
 msgid "failed to create pipe"
 msgstr "erro ao remover %s"
 
-#: src/split.c:409
+#: src/split.c:408
 #, fuzzy, c-format
 msgid "closing prior pipe"
 msgstr "a fechar a pasta %s"
 
-#: src/split.c:411
+#: src/split.c:410
 #, fuzzy, c-format
 msgid "closing output pipe"
 msgstr "a apagar o ficheiro de saída %s"
 
-#: src/split.c:415
+#: src/split.c:414
 #, fuzzy, c-format
 msgid "moving input pipe"
 msgstr "a fechar o ficheiro de entrada %s"
 
-#: src/split.c:417
+#: src/split.c:416
 #, fuzzy, c-format
 msgid "closing input pipe"
 msgstr "a fechar o ficheiro de entrada %s"
 
-#: src/split.c:422
+#: src/split.c:421
 #, fuzzy, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr "erro ao alterar contexto de %s para %s"
 
-#: src/split.c:428
+#: src/split.c:427
 #, fuzzy, c-format
 msgid "failed to close input pipe"
 msgstr "erro ao fechar a pasta %s"
 
-#: src/split.c:464
+#: src/split.c:463
 #, fuzzy, c-format
 msgid "waiting for child process"
 msgstr "a aguardar por strip"
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr ""
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr ""
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr ""
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr "impossível dividir em mais do que uma forma"
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, fuzzy, c-format
 msgid "%s: invalid number of chunks"
 msgstr "%s: número de segundos inválido"
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, fuzzy, c-format
 msgid "%s: invalid chunk number"
 msgstr "%s: número inválido"
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr "%s: comprimento de sufixo inválido"
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr "%s: número de bytes inválido"
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr "%s: número de linhas inválido"
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, c-format
 msgid "line count option -%s%c... is too large"
 msgstr "opção de contagem de linha -%s%c... é demasiado grande"
 
-#: src/split.c:1248
+#: src/split.c:1298
 #, fuzzy, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr "número de linha inicial inválido: %s"
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, fuzzy, c-format
 msgid "%s: invalid IO block size"
 msgstr "%s: tamanho de ficheiro inválido"
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr ""
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr ""
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, fuzzy, c-format
 msgid "%s: cannot determine file size"
 msgstr "impossível determinar o nome da máquina"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr ""
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, fuzzy, c-format
 msgid "failed to canonicalize %s"
 msgstr "erro ao abrir %s"
 
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, fuzzy, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr "aviso: código de escape '\\%c' desconhecido"
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, c-format
 msgid "%s: invalid directive"
 msgstr "%s: directiva inválida"
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, c-format
 msgid "warning: backslash at end of format"
 msgstr "aviso: barra invertida no final do formato"
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr ""
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, c-format
 msgid "cannot read file system information for %s"
 msgstr "impossível ler a informação do sistema de ficheiros para %s"
 
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, fuzzy, c-format
 msgid "cannot stat standard input"
 msgstr "a fechar a entrada padrão"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -9663,7 +9689,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -9671,30 +9697,30 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, c-format
 msgid "Context: %C\n"
 msgstr ""
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -9702,11 +9728,11 @@ msgid ""
 " Birth: %w\n"
 msgstr ""
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
 msgstr ""
 
-#: src/stat.c:1356
+#: src/stat.c:1418
 #, fuzzy
 msgid ""
 "  -L, --dereference     follow links\n"
@@ -9717,14 +9743,14 @@ msgstr ""
 "  -L, --dereference     seguir ligações simbólicas\n"
 "  -f, --file-system     estado do sistema de ficheiros em vez de ficheiro\n"
 
-#: src/stat.c:1360
+#: src/stat.c:1422
 #, fuzzy
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 "  -c  --format=FORMATO  usar o FORMATO especificado em vez do predefinido;\n"
@@ -9735,7 +9761,7 @@ msgstr ""
 "                          Se quiser um, inclua \\n em FORMATO.\n"
 "  -t, --terse           mostrar a informação em forma resumida\n"
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 #, fuzzy
 msgid ""
 "\n"
@@ -9756,7 +9782,7 @@ msgstr ""
 "  %B   Tamanho em bytes de cada bloco relatado por %b\n"
 "  %C   Expressão de contexto de segurança SELinux\n"
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 #, fuzzy
 msgid ""
 "  %d   device number in decimal\n"
@@ -9773,7 +9799,7 @@ msgstr ""
 "  %g   ID de grupo do dono\n"
 "  %G   Nome de grupo do dono\n"
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 #, fuzzy
 msgid ""
 "  %h   number of hard links\n"
@@ -9783,8 +9809,8 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 "  %h   Número de ligações persistentes\n"
 "  %i   Número de inode\n"
@@ -9795,7 +9821,7 @@ msgstr ""
 "  %t   Tipo de dispositivo maior, em hexadecimal\n"
 "  %T   Tipo de dispositivo menor, em hexadecimal\n"
 
-#: src/stat.c:1399
+#: src/stat.c:1461
 #, fuzzy
 msgid ""
 "  %u   user ID of owner\n"
@@ -9804,10 +9830,10 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 "  %u   ID de utilizador do dono\n"
@@ -9820,7 +9846,7 @@ msgstr ""
 "  %Z   Tempo da última alteração em segundos desde Epoch\n"
 "\n"
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 #, fuzzy
 msgid ""
 "Valid format sequences for file systems:\n"
@@ -9840,7 +9866,7 @@ msgstr ""
 "  %f   Blocos livres no sistema de ficheiros\n"
 "  %C   Expressão de contexto de segurança SELinux\n"
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 #, fuzzy
 msgid ""
 "  %i   file system ID in hex\n"
@@ -9909,22 +9935,27 @@ msgid ""
 "and are thus unaffected by 'stdbuf' settings.\n"
 msgstr ""
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, fuzzy, c-format
 msgid "failed to find %s"
 msgstr "erro ao abrir %s"
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, fuzzy, c-format
 msgid "failed to update the environment with %s"
 msgstr "erro ao alterar o contexto de segurança de %s para %s"
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr ""
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, c-format
+msgid "you must specify a buffering mode option"
+msgstr ""
+
+#: src/stty.c:516
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -9935,11 +9966,11 @@ msgstr ""
 "  or:       %s [-F DISPOSITIVO] [--file=DISPOSITIVO] [-a|--all]\n"
 "  or:       %s [-F DISPOSITIVO] [--file=DISPOSITIVO] [-g|--save]\n"
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
 msgstr ""
 
-#: src/stty.c:525
+#: src/stty.c:528
 #, fuzzy
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
@@ -9952,7 +9983,7 @@ msgstr ""
 "  -g, --save         mostrar preferências legíveis por stty\n"
 "  -F, --file=DISPOSITIVO  abrir e usar o DISPOSITIVO em vez de stdin\n"
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
@@ -9962,7 +9993,7 @@ msgstr ""
 "Opcional - antes de PREFERÊNCIA indica negação. Um * marca preferências\n"
 "não-POSIX. O sistema base define quais as preferências disponíveis.\n"
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -9976,7 +10007,7 @@ msgstr ""
 "   eof CAR       CAR enviará um fim de ficheiro (terminar a entrada)\n"
 "   eol CAR       CAR terminará a linha\n"
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -9988,7 +10019,7 @@ msgstr ""
 "   intr CAR      CAR enviará um sinal de interrupção\n"
 "   kill CAR      CAR apagará a linha actual\n"
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -10000,7 +10031,7 @@ msgstr ""
 " * rprnt CAR     CAR redesenhará a linha actual\n"
 "   start CAR     CAR reiniciará a saída após pará-la\n"
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -10012,7 +10043,7 @@ msgstr ""
 " * swtch CHAR    CHAR mudará para uma camada de shell diferente\n"
 " * werase CHAR   CHAR apagará a última palavra inserida\n"
 
-#: src/stty.c:562
+#: src/stty.c:565
 #, fuzzy
 msgid ""
 "\n"
@@ -10027,7 +10058,7 @@ msgstr ""
 " * cols N        dizer ao sistema operativo que o terminal tem N colunas\n"
 " * columns N     o mesmo que cols N\n"
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -10041,7 +10072,7 @@ msgstr ""
 "completa\n"
 "   ospeed N      alterar a taxa de saída para N\n"
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -10056,7 +10087,7 @@ msgstr ""
 "   time N        com -icanon, definir limite de leitura N décimos de "
 "segundo\n"
 
-#: src/stty.c:581
+#: src/stty.c:584
 #, fuzzy
 msgid ""
 "\n"
@@ -10074,7 +10105,7 @@ msgstr ""
 " * [-]crtscts    activar cumprimento RTS/CTS\n"
 "   csN           definir tamanho de carácter N bits, N em [5..8]\n"
 
-#: src/stty.c:590
+#: src/stty.c:593
 #, fuzzy
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
@@ -10083,6 +10114,7 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 "   [-]cstopb     usar dois bits de paragem por carácter (um com '-')\n"
 "   [-]hup        enviar sinal de espera quando o último processo fechar a "
@@ -10091,7 +10123,7 @@ msgstr ""
 "   [-]parenb     gerar bit de paridade na saída e esperar por um na entrada\n"
 "   [-]parodd     definir paridade ímpar (mesmo com '-')\n"
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -10107,7 +10139,7 @@ msgstr ""
 "   [-]ignbrk     ignorar caracteres de paragem\n"
 "   [-]igncr      ignorar carriage return\n"
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -10122,11 +10154,11 @@ msgstr ""
 "   [-]inpck      activar verificação de paridade da entrada\n"
 "   [-]istrip     limpar o bit alto (8) de caracteres de entrada\n"
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr " * [-]iutf8      assumir caracteres de entrada em UTF-8\n"
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -10144,7 +10176,7 @@ msgstr ""
 "0)\n"
 "   [-]tandem     o mesmo que [-]ixoff\n"
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -10160,10 +10192,11 @@ msgstr ""
 " * ffN           estilo de atraso de form feed, N em [0..1]\n"
 " * nlN           estilo de atraso de nova linha, N em [0..1]\n"
 
-#: src/stty.c:631
+#: src/stty.c:635
+#, fuzzy
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
@@ -10176,7 +10209,7 @@ msgstr ""
 " * [-]onlcr      traduzir nova linha para carriage return-nova linha\n"
 " * [-]onlret     nova linha executa um carriage return\n"
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -10192,7 +10225,7 @@ msgstr ""
 " * -tabs         o mesmo que tab3\n"
 " * vtN           estilo de atraso de tab vertical, N em [0..1]\n"
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -10207,7 +10240,7 @@ msgstr ""
 " * crtkill       kill all line by obeying the echoprt and echoe settings\n"
 " * -crtkill      kill all line by obeying the echoctl and echok settings\n"
 
-#: src/stty.c:654
+#: src/stty.c:658
 #, fuzzy
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
@@ -10222,7 +10255,7 @@ msgstr ""
 "   [-]echoe      o mesmo que [-]crterase\n"
 "   [-]echok      ecoar uma nova linha após um carácter de término\n"
 
-#: src/stty.c:661
+#: src/stty.c:665
 #, fuzzy
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
@@ -10238,7 +10271,7 @@ msgstr ""
 "   [-]icanon     activar caracteres especiais erase, kill, werase e rprnt\n"
 "   [-]iexten     activar caracteres especiais não-POSIX\n"
 
-#: src/stty.c:668
+#: src/stty.c:672
 #, fuzzy
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
@@ -10255,7 +10288,7 @@ msgstr ""
 " * [-]tostop     parar processos em fundo que tentem escrever no terminal\n"
 " * [-]xcase      com icanon, escape com '\\' para maiúsculas\n"
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -10269,7 +10302,7 @@ msgstr ""
 "   cbreak        o mesmo que -icanon\n"
 "   -cbreak       o mesmo que icanon\n"
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -10281,7 +10314,7 @@ msgstr ""
 "   -cooked       o mesmo que raw\n"
 "   crt           o mesmo que echoe echoctl echoke\n"
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -10295,7 +10328,7 @@ msgstr ""
 "   ek            erase e kill nos seus valores predefinidos\n"
 "   evenp         o mesmo que parenb -parodd cs7\n"
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -10311,7 +10344,7 @@ msgstr ""
 "   nl            o mesmo que -icrnl -onlcr\n"
 "   -nl           o mesmo que icrnl -inlcr -igncr onlcr -ocrnl -onlret\n"
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -10325,7 +10358,7 @@ msgstr ""
 "   pass8         o memso que -parenb -istrip cs8\n"
 "   -pass8        o memso que parenb istrip cs7\n"
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -10337,7 +10370,7 @@ msgstr ""
 "                 -imaxbel -opost -isig -icanon -xcase min 1 time 0\n"
 "   -raw          o mesmo que cooked\n"
 
-#: src/stty.c:716
+#: src/stty.c:720
 #, fuzzy
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
@@ -10355,7 +10388,7 @@ msgstr ""
 "                 -xcase -tostop -echoprt echoctl echoke, todos caracteres\n"
 "                 especiais nos seus valores predefinidos.\n"
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -10371,12 +10404,12 @@ msgstr ""
 "0x37, 0177 ou 127; valores especiais ^- ou undef são utilizados para anular\n"
 "caracteres especiais.\n"
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, c-format
 msgid "only one device may be specified"
 msgstr "apenas um dispositivo deve ser especificado"
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
@@ -10385,43 +10418,43 @@ msgstr ""
 "as opções para saída em modo verboso e estilos de saída legíveis\n"
 "pelo stty são mutuamente exclusivas"
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr "ao especificar um modo de saída, não pode alterar um modo"
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr "%s: impossível desactivar modo não-bloqueante"
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, c-format
 msgid "invalid argument %s"
 msgstr "argumento inválido %s"
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, c-format
 msgid "missing argument to %s"
 msgstr "argumento em falta para %s"
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, c-format
 msgid "invalid line discipline %s"
 msgstr "disciplina de linha inválida %s"
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr "%s: impossível realizar todas as operações pedidas"
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr "%s: nenhuma informação de tamanho para este dispositivo"
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, c-format
 msgid "invalid integer argument %s"
 msgstr "argumento inteiro inválido %s"
@@ -10478,7 +10511,7 @@ msgstr "      --help     exibir esta ajuda e sair\n"
 msgid "      --version  output version information and exit\n"
 msgstr "      --version  mostrar a informação de versão e sair\n"
 
-#: src/system.h:544
+#: src/system.h:543
 #, fuzzy
 msgid ""
 "\n"
@@ -10487,15 +10520,15 @@ msgstr ""
 "Argumentos mandatórios para opções longas são mandatórios para opções curtas "
 "também.\n"
 
-#: src/system.h:552
+#: src/system.h:551
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -10504,35 +10537,33 @@ msgid ""
 "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n"
 msgstr ""
 
-#: src/system.h:571
-#, fuzzy, c-format
+#: src/system.h:570
+#, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
+"%s online help: <%s>\n"
 msgstr ""
-"\n"
-"Comunique erros através de <%s>.\n"
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr ""
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr ""
 
-#: src/system.h:596
+#: src/system.h:591
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Tente '%s --help' para mais informações.\n"
 
-#: src/system.h:628
+#: src/system.h:633
 #, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -10632,18 +10663,16 @@ msgstr ""
 
 #: src/tail.c:270
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
 
 #: src/tail.c:274
+#, fuzzy
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 "  -f, --follow[={name|descriptor}]\n"
@@ -10653,18 +10682,17 @@ msgstr ""
 "                           equivalentes\n"
 "  -F                       o mesmo que --follow=name --retry\n"
 
-#: src/tail.c:281
+#: src/tail.c:280
 #, fuzzy, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
 "  -n, --lines=N            despejar últimas N linhas em vez das últimas %d;\n"
 "                           ou use +N para despejar linhas a partir da N-"
@@ -10676,14 +10704,12 @@ msgstr ""
 "                           para ver se se foi removido ou renomeado\n"
 "                           (este é o caso habitual de logs rotativos)\n"
 
-#: src/tail.c:294
+#: src/tail.c:293
 #, fuzzy
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 "      --pid=PID            com -f, terminar após ID de processo, PID morre\n"
 "  -q, --quiet, --silent    nunca despejar cabeçalhos com nomes de ficheiros\n"
@@ -10692,16 +10718,16 @@ msgstr ""
 "  -v, --verbose            despejar sempre cabeçalhos com nomes de "
 "ficheiros\n"
 
-#: src/tail.c:301
+#: src/tail.c:298
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 
-#: src/tail.c:310
+#: src/tail.c:307
 #, fuzzy
 msgid ""
 "\n"
@@ -10721,7 +10747,7 @@ msgstr ""
 "GB 1000*1000*1000, G 1024*1024*1024 e assim por diante para T, P, E, Z, Y.\n"
 "\n"
 
-#: src/tail.c:319
+#: src/tail.c:316
 #, fuzzy
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
@@ -10740,159 +10766,164 @@ msgstr ""
 "recriado\n"
 "por qualquer outro programa.\n"
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr "a fechar %s (fd=%d)"
 
-#: src/tail.c:453
-#, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr "%s: impossível mover para a posição relativa %s"
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr "%s: impossível mover para a posição relativa ao fim %s"
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr ""
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
 "reverting to polling"
 msgstr ""
 
-#: src/tail.c:963
+#: src/tail.c:965
+#, fuzzy, c-format
+msgid "%s has been replaced with a symbolic link. giving up on this name"
+msgstr "%s foi substituído por um ficheiro não analisável; a desistir do nome"
+
+#: src/tail.c:980
 #, c-format
 msgid "%s has become inaccessible"
 msgstr "%s tornou-se inacessível"
 
-#: src/tail.c:980
+#: src/tail.c:997
 #, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr "%s foi substituído por um ficheiro não analisável; a desistir do nome"
 
-#: src/tail.c:989
+#: src/tail.c:1006
 #, fuzzy, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr "%s foi substituído por um ficheiro não analisável; a desistir do nome"
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, c-format
 msgid "%s has become accessible"
 msgstr "%s tornou-se acessível"
 
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr "%s apareceu; a seguir fim do novo ficheiro"
 
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr "%s foi substituído; a seguir fim do novo ficheiro"
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr "%s: impossível alterar modo de desbloqueamento"
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr "%s: ficheiro truncado"
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr "nenhum ficheiro em falta"
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, fuzzy, c-format
 msgid "cannot watch parent directory of %s"
 msgstr "impossível obter a pasta actual (agora %s)"
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, fuzzy, c-format
 msgid "inotify resources exhausted"
 msgstr "memória esgotada"
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, fuzzy, c-format
 msgid "cannot watch %s"
 msgstr "impossível executar sobre %s"
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr ""
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, fuzzy, c-format
 msgid "error reading inotify event"
 msgstr "erro ao ler %s"
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr "%s: impossível seguir fim de ficheiro deste tipo; a desistir"
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, c-format
 msgid "number in %s is too large"
 msgstr "número em %s é demasiado grande"
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr "%s: número máximo de estados inalterados entre aberturas inválido"
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr "%s: número de processo inválido (PID)"
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr "%s: número de segundos inválido"
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr "opção usada em contexto inválido -- %c"
 
-#: src/tail.c:2034
+#: src/tail.c:2096
+#, fuzzy, c-format
+msgid "warning: --retry ignored; --retry is useful only when following"
+msgstr "aviso: PID ignorado; --pid=PID é útil quando se persegue"
+
+#: src/tail.c:2100
 #, c-format
-msgid "warning: --retry is useful mainly when following by name"
-msgstr "aviso: --retry é útil quando se persegue por nome"
+msgid "warning: --retry only effective for the initial open"
+msgstr ""
 
-#: src/tail.c:2038
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
 msgstr "aviso: PID ignorado; --pid=PID é útil quando se persegue"
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr "aviso: --pid=PID não é suportado neste sistema"
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, c-format
 msgid "cannot follow %s by name"
 msgstr "impossível perseguir %s pelo nome"
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr "aviso: perseguir a entrada padrão indefinidamente não tem efeito"
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr ""
@@ -11164,17 +11195,17 @@ msgstr "argumento extra %s"
 msgid "warning: sigprocmask"
 msgstr ""
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr ""
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr ""
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
@@ -11183,33 +11214,29 @@ msgstr ""
 "Utilização: %s OPÇÃO UTILIZADOR COMANDO [ARGUMENTO]...\n"
 "  ou:       %s OPÇÃO\n"
 
-#: src/timeout.c:229
-#, fuzzy
+#: src/timeout.c:232
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
 msgstr ""
-"Argumentos mandatórios para opções longas são mandatórios para opções curtas "
-"também.\n"
 
-#: src/timeout.c:235
+#: src/timeout.c:238
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 msgid ""
 "\n"
 "DURATION is a floating point number with an optional suffix:\n"
@@ -11217,7 +11244,7 @@ msgid ""
 "days.\n"
 msgstr ""
 
-#: src/timeout.c:259
+#: src/timeout.c:262
 msgid ""
 "\n"
 "If the command times out, and --preserve-status is not set, then exit with\n"
@@ -11228,17 +11255,17 @@ msgid ""
 "case the exit status is 128+9 rather than 124.\n"
 msgstr ""
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr ""
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, fuzzy, c-format
 msgid "error waiting for command"
 msgstr "erro ao escrever %s"
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr ""
@@ -11630,7 +11657,7 @@ msgstr ""
 #: src/truncate.c:115
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 
 #: src/truncate.c:121
@@ -11715,12 +11742,12 @@ msgstr ""
 "Sem FICHEIRO, ou quando FICHEIRO é -, ler a entrada padrão.\n"
 "\n"
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr "%s: entrada contém um número mpar de símbolos"
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr "%s: entrada contém um ciclo:"
@@ -11818,12 +11845,12 @@ msgstr "TABs demasiado separados"
 msgid "tab stop value is too large"
 msgstr "valor de paragem de TAB demasiado grande"
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr "Utilização: %s [OPÇÃO]... [ENTRADA [SA�DA]]\n"
 
-#: src/uniq.c:138
+#: src/uniq.c:174
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
 "writing to OUTPUT (or standard output).\n"
@@ -11831,41 +11858,46 @@ msgid ""
 "With no options, matching lines are merged to the first occurrence.\n"
 msgstr ""
 
-#: src/uniq.c:147
+#: src/uniq.c:183
+#, fuzzy
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
 msgstr ""
 "  -c, --count           prefixar linhas com o número de ocorrências\n"
 "  -d, --repeated        exibir apenas linhas duplicadas\n"
 
-#: src/uniq.c:151
-#, fuzzy
+#: src/uniq.c:187
+msgid ""
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
+msgstr ""
+
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr ""
+
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
+msgstr ""
+
+#: src/uniq.c:199
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
 "  -i, --ignore-case     ignore differences in case when comparing\n"
 "  -s, --skip-chars=N    avoid comparing the first N characters\n"
 "  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
-msgstr ""
-"  -D, --all-repeated[=método-delimit]  mostrar todas as linhas duplicadas\n"
-"                        método-delimit={none(predefinido),prepend,separate}\n"
-"                        Delimitação é feita com linhas vazias.\n"
-"  -f, --skip-fields=N   evitar comparar os primeiros N campos\n"
-"  -i, --ignore-case     ignorar capitalização ao comparar\n"
-"  -s, --skip-chars=N    evitar comparar os primeiros N caracteres\n"
-"  -u, --unique          apenas mostrar linhas únicas\n"
-"  -z, --zero-terminated  terminlr linhas com byte zero, não nova linha\n"
-
-#: src/uniq.c:161
+msgstr ""
+
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr ""
 "  -w, --check-chars=N   comparar não mais que N caracteres nas linhas\n"
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 #, fuzzy
 msgid ""
 "\n"
@@ -11877,7 +11909,7 @@ msgstr ""
 "espaço.\n"
 "Campos são saltados antes de caracteres.\n"
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 #, fuzzy
 msgid ""
 "\n"
@@ -11889,24 +11921,34 @@ msgstr ""
 "Nota: 'uniq' não afecta linhas repetidas a menos que são adjacentes.\n"
 "Pode querer ordenar a entrada primeiro, ou utilizar 'sort -u' sem `uniq'.\n"
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, c-format
 msgid "too many repeated lines"
 msgstr "demasiados linhas repetidas"
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
 msgstr "número inválido de campos a ignorar"
 
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
 msgstr "número inválido de bytes a ignorar"
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
 msgstr "número inválido de bytes a comparar"
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr ""
+
+#: src/uniq.c:652
+#, fuzzy, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr "mostrar linhas duplicadas e contagens de repetidas não faz sentido"
+
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr "mostrar linhas duplicadas e contagens de repetidas não faz sentido"
@@ -11928,11 +11970,6 @@ msgstr ""
 "Invocar a função unlink para remover o FICHEIRO especificado.\n"
 "\n"
 
-#: src/unlink.c:86
-#, c-format
-msgid "cannot unlink %s"
-msgstr "impossível executar sobre %s"
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -11977,7 +12014,7 @@ msgstr[1] "%lu utilizadores"
 msgid ",  load average: %.2f"
 msgstr ",  carga média: %.2f"
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, fuzzy, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -11990,19 +12027,19 @@ msgstr ""
 "Se FICHEIRO não for especificado, usar %s. %s como FICHIRO é comum.\n"
 "\n"
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
 "an uninterruptible sleep state also contribute to the load average.\n"
 msgstr ""
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr ""
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, fuzzy, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
@@ -12243,202 +12280,64 @@ msgstr ""
 "'y'.\n"
 "\n"
 
-#, fuzzy
-#~ msgid "  returning value: '%s'\n"
-#~ msgstr "a criar o ficheiro %s\n"
-
-#, fuzzy
-#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n"
-#~ msgstr "Utilização: %s [OPÇÃO] NOME...\n"
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: opção ilegal -- %c\n"
 
-#, fuzzy
-#~ msgid "no valid suffix found\n"
-#~ msgstr "%s: comprimento de sufixo inválido"
+#~ msgid "invalid argument: %s"
+#~ msgstr "argumento inválido: %s"
 
 #~ msgid ""
+#~ "  -w, --wrap=COLS       Wrap encoded lines after COLS character (default "
+#~ "76).\n"
+#~ "                        Use 0 to disable line wrapping.\n"
 #~ "\n"
-#~ "Examples:\n"
-#~ "  %s /usr/bin/sort       Output \"sort\".\n"
-#~ "  %s include/stdio.h .h  Output \"stdio\".\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Exemplos:\n"
-#~ "  %s /usr/bin/sort       Mostrar \"sort\".\n"
-#~ "  %s include/stdio.h .h  Mostrar \"stdio\".\n"
-
-#~ msgid "reading %s"
-#~ msgstr "a ler %s"
-
-#~ msgid "writing %s"
-#~ msgstr "a escrever %s"
-
-#~ msgid "closing %s"
-#~ msgstr "a fechar %s"
-
-#~ msgid "accessing %s"
-#~ msgstr "a aceder a %s"
-
-#~ msgid "opening %s"
-#~ msgstr "a abrir %s"
-
-#~ msgid ""
-#~ "Usage: %s NAME\n"
-#~ "  or:  %s OPTION\n"
-#~ msgstr ""
-#~ "Utilização: %s NOME\n"
-#~ "  ou:       %s OPÇÃO\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "  -x, --one-file-system    skip directories on different file systems\n"
-#~ "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
-#~ "      --exclude=PATTERN    exclude files that match PATTERN\n"
-#~ "  -d, --max-depth=N     print the total for a directory (or file, with --"
-#~ "all)\n"
-#~ "                          only if it is N or fewer levels below the "
-#~ "command\n"
-#~ "                          line argument;  --max-depth=0 is the same as\n"
-#~ "                          --summarize\n"
-#~ msgstr ""
-#~ "  -x, --one-file-system  saltar pastas em sistemas de ficheiros "
-#~ "diferentes\n"
-#~ "  -X FILE, --exclude-from=FICH  Excluir ficheiros com qualquer padrão em "
-#~ "FICH.\n"
-#~ "      --exclude=PATTERN  Exclude files that match PATTERN.\n"
-#~ "      --max-depth=N     mostrar o total de uma pasta (ou ficheiro, com --"
-#~ "all)\n"
-#~ "                          só se estiver N ou menos níveis abaixo do "
-#~ "argumento\n"
-#~ "                          da linha de comando; --max-depth=0 é o mesmo "
-#~ "que\n"
-#~ "                          --summarize\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "  none, off       never make backups (even if --backup is given)\n"
-#~ "  numbered, t     make numbered backups\n"
-#~ "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
-#~ "  simple, never   always make simple backups\n"
+#~ "  -d, --decode          Decode data.\n"
+#~ "  -i, --ignore-garbage  When decoding, ignore non-alphabet characters.\n"
 #~ "\n"
 #~ msgstr ""
-#~ "  none, off       nunca efectuar salvaguardas (mesmo se usado com --"
-#~ "backup)\n"
-#~ "  numbered, t     efectuar salvaguardas numeradas\n"
-#~ "  existing, nil   numeradas se existirem salvaguardas numeradas, senão "
-#~ "simples\n"
-#~ "  simple, never   efectuar sempre salvaguardas simples\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "WARNING: --page-increment is deprecated; use --line-increment instead"
-#~ msgstr "a opção --megabytes está obsoleta; use -m ao invés"
-
-#~ msgid "All arguments to long options are mandatory for short options.\n"
-#~ msgstr ""
-#~ "Todos os argumentos de opções longas são mandatórios para opções curtas.\n"
-
-#, fuzzy
-#~ msgid ""
+#~ "  -w, --wrap=COLS       Partir linhas codificadas após COLS caracteres "
+#~ "(76).\n"
+#~ "                        Usar 0 para desactivar partição de linhas.\n"
 #~ "\n"
-#~ "RADIX is d for decimal, o for octal, x for hexadecimal or n for none.\n"
-#~ "BYTES is hexadecimal with 0x or 0X prefix, and may have a multiplier "
-#~ "suffix:\n"
-#~ "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
-#~ "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n"
-#~ "Adding a z suffix to any type displays printable characters at the end of "
-#~ "each\n"
-#~ "output line.\n"
-#~ msgstr ""
+#~ "  -d, --decode          Descodificar os dados.\n"
+#~ "  -i, --ignore-garbage  Ao descodificar, ignorar caracteres não "
+#~ "alfabéticos.\n"
 #~ "\n"
-#~ "RAIZ é d para decimal, o para octal, x para hexadecimal ou n para "
-#~ "nenhum.\n"
-#~ "BYTES é hexadecimal com prefixo 0x ou 0X, e pode ter um sufixo "
-#~ "multiplicador:\n"
-#~ "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
-#~ "GB 1000*1000*1000, G 1024*1024*1024, e por aí fora para T, P, E, Z, Y.\n"
-#~ "Adicionando um sufixo z a qualquer tipo mostra caracteres exibíveis no "
-#~ "fim de\n"
-#~ "cada linha de saída.  "
 
-#, fuzzy
 #~ msgid ""
-#~ "Option --string without a number implies 3; option --width without a "
-#~ "number\n"
-#~ "implies 32.  By default, od uses -A o -t oS -w16.\n"
-#~ msgstr ""
-#~ "--string sem um número implica 3. --width sem um número\n"
-#~ "implica 32. Por omissão, od usa -A o -t d2 -w16.\n"
-
-#~ msgid "Usage: %s [OPTION]... FILE\n"
-#~ msgstr "Utilização: %s [OPÇÃO]... FICHEIRO\n"
-
-#~ msgid "Password:"
-#~ msgstr "Senha:"
-
-#~ msgid "getpass: cannot open /dev/tty"
-#~ msgstr "getpass: impossível abrir /dev/tty"
-
-#~ msgid "cannot set groups"
-#~ msgstr "impossível definir grupos"
-
-#~ msgid "cannot set group id"
-#~ msgstr "impossível alterar a identificação de grupo"
-
-#~ msgid "cannot set user id"
-#~ msgstr "impossível alterar o ID do utilizador"
-
-#~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n"
-#~ msgstr "Utilização: %s [OPÇÃO]... [-] [UTILIZADOR [ARGUMENTO]...]\n"
-
-#~ msgid ""
-#~ "Change the effective user id and group id to that of USER.\n"
-#~ "\n"
-#~ "  -, -l, --login               make the shell a login shell\n"
-#~ "  -c, --command=COMMAND        pass a single COMMAND to the shell with -"
-#~ "c\n"
-#~ "  -f, --fast                   pass -f to the shell (for csh or tcsh)\n"
-#~ "  -m, --preserve-environment   do not reset environment variables\n"
-#~ "  -p                           same as -m\n"
-#~ "  -s, --shell=SHELL            run SHELL if /etc/shells allows it\n"
+#~ "      --help            Display this help and exit.\n"
+#~ "      --version         Output version information and exit.\n"
 #~ msgstr ""
-#~ "Alterar as identificações de utilizador e de grupo efectivas do "
-#~ "UTILIZADOR.\n"
-#~ "\n"
-#~ "  -, -l, --login               tornar a shell numa shell de login\n"
-#~ "  -c, --command=COMANDO        enviar um único COMANDO à shell com -c\n"
-#~ "  -f, --fast                   enviar -f à shell (para csh ou tcsh)\n"
-#~ "  -m, --preserver-environment  preservar as variáveis do ambiente\n"
-#~ "  -p                           o mesmo que -m\n"
-#~ "  -s, --shell=SHELL            correr SHELL se /etc/shells o permitir\n"
+#~ "      --help            Mostrar esta ajuda e sair.\n"
+#~ "      --version         Exibir a informação de versão e sair.\n"
 
 #~ msgid ""
 #~ "\n"
-#~ "A mere - implies -l.   If USER not given, assume root.\n"
+#~ "Examples:\n"
+#~ "  %s /usr/bin/sort       Output \"sort\".\n"
+#~ "  %s include/stdio.h .h  Output \"stdio\".\n"
 #~ msgstr ""
 #~ "\n"
-#~ "Um simples - implica -l. Sem UTILIZADOR, assumir root.\n"
-
-#~ msgid "user %s does not exist"
-#~ msgstr "o utilizador %s não existe"
-
-#~ msgid "incorrect password"
-#~ msgstr "senha incorrecta"
+#~ "Exemplos:\n"
+#~ "  %s /usr/bin/sort       Mostrar \"sort\".\n"
+#~ "  %s include/stdio.h .h  Mostrar \"stdio\".\n"
 
-#~ msgid "using restricted shell %s"
-#~ msgstr "a usar a shell restrita %s"
+#~ msgid "Usage: %s [OPTION] [FILE]...\n"
+#~ msgstr "Utilização: %s [OPÇÃO] [FICHEIRO]...\n"
 
-#~ msgid "warning: cannot change directory to %s"
-#~ msgstr "aviso: impossível mudar para a pasta %s"
+#~ msgid "%s"
+#~ msgstr "%s"
 
-#, fuzzy
 #~ msgid ""
 #~ "Change the group of each FILE to GROUP.\n"
 #~ "With --reference, change the group of each FILE to that of RFILE.\n"
 #~ "\n"
 #~ "  -c, --changes          like verbose but report only when a change is "
 #~ "made\n"
-#~ "  -f, --silent, --quiet  suppress most error messages\n"
-#~ "  -v, --verbose          output a diagnostic for every file processed\n"
+#~ "      --dereference      affect the referent of each symbolic link (this "
+#~ "is\n"
+#~ "                         the default), rather than the symbolic link "
+#~ "itself\n"
 #~ msgstr ""
 #~ "Mudar o grupo de cada FICHEIRO para GRUPO.\n"
 #~ "Com --reference, mudar o grupo de cada FICHEIRO para o mesmo de FICHREF.\n"
@@ -12450,13 +12349,6 @@ msgstr ""
 #~ "                         omissão) em vez da própria ligação simbólica\n"
 
 #~ msgid ""
-#~ "      --no-preserve-root  do not treat `/' specially (the default)\n"
-#~ "      --preserve-root     fail to operate recursively on `/'\n"
-#~ msgstr ""
-#~ "      --no-preserve-root  não tratar '/' de forma especial (predefinido)\n"
-#~ "      --preserve-root     não operar recursivamente em '/'\n"
-
-#~ msgid ""
 #~ "  -f, --silent, --quiet  suppress most error messages\n"
 #~ "      --reference=RFILE  use RFILE's group rather than specifying a\n"
 #~ "                         GROUP value\n"
@@ -12484,6 +12376,13 @@ msgstr ""
 #~ "alteração\n"
 
 #~ msgid ""
+#~ "      --no-preserve-root  do not treat `/' specially (the default)\n"
+#~ "      --preserve-root     fail to operate recursively on `/'\n"
+#~ msgstr ""
+#~ "      --no-preserve-root  não tratar '/' de forma especial (predefinido)\n"
+#~ "      --preserve-root     não operar recursivamente em '/'\n"
+
+#~ msgid ""
 #~ "  -f, --silent, --quiet   suppress most error messages\n"
 #~ "  -v, --verbose           output a diagnostic for every file processed\n"
 #~ "      --reference=RFILE   use RFILE's mode instead of MODE values\n"
@@ -12535,76 +12434,24 @@ msgstr ""
 #~ "\n"
 
 #~ msgid ""
-#~ "Display the current time in the given FORMAT, or set the system date.\n"
-#~ "\n"
-#~ "  -d, --date=STRING         display time described by STRING, not `now'\n"
-#~ "  -f, --file=DATEFILE       like --date once for each line of DATEFILE\n"
-#~ msgstr ""
-#~ "Exibir o tempo actual no FORMATO dado, ou alterar a data do sistema.\n"
-#~ "\n"
-#~ "   -d, --date=EXPR          mostrar o tempo descrito por EXPR, não o "
-#~ "actual\n"
-#~ "   -f, --file=FICHEIRO      como --date mas uma vez para cada linha de "
-#~ "FICHEIRO\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "SIZE may be (or may be an integer optionally followed by) one of "
-#~ "following:\n"
-#~ "KB 1000, K 1024, MB 1000*1000, M 1024*1024, and so on for G, T, P, E, Z, "
-#~ "Y.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "TAMANHO pode ser (ou um inteiro opcionalmente seguido de) um dos "
-#~ "seguintes:\n"
-#~ "kB 1000, K 1024, MB 1000*1000, M 1024*1024 e por aí fora para G, T, P, E, "
-#~ "Z, Y.\n"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: opção ilegal -- %c\n"
-
-#~ msgid "invalid argument: %s"
-#~ msgstr "argumento inválido: %s"
-
-#~ msgid ""
-#~ "  -w, --wrap=COLS       Wrap encoded lines after COLS character (default "
-#~ "76).\n"
-#~ "                        Use 0 to disable line wrapping.\n"
-#~ "\n"
-#~ "  -d, --decode          Decode data.\n"
-#~ "  -i, --ignore-garbage  When decoding, ignore non-alphabet characters.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "  -w, --wrap=COLS       Partir linhas codificadas após COLS caracteres "
-#~ "(76).\n"
-#~ "                        Usar 0 para desactivar partição de linhas.\n"
-#~ "\n"
-#~ "  -d, --decode          Descodificar os dados.\n"
-#~ "  -i, --ignore-garbage  Ao descodificar, ignorar caracteres não "
-#~ "alfabéticos.\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "      --help            Display this help and exit.\n"
-#~ "      --version         Output version information and exit.\n"
-#~ msgstr ""
-#~ "      --help            Mostrar esta ajuda e sair.\n"
-#~ "      --version         Exibir a informação de versão e sair.\n"
-
-#~ msgid "Usage: %s [OPTION] [FILE]...\n"
-#~ msgstr "Utilização: %s [OPÇÃO] [FICHEIRO]...\n"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#~ msgid ""
 #~ "Usage: %s NEWROOT [COMMAND...]\n"
 #~ "  or:  %s OPTION\n"
 #~ msgstr ""
 #~ "Utilização: %s NOVARAIZ [COMANDO...]\n"
 #~ "  ou:       %s OPÇÃO\n"
 
+#~ msgid "failed to get file system create context"
+#~ msgstr "erro ao obter o contexto de criação do sistema de ficheiros"
+
+#~ msgid "reading %s"
+#~ msgstr "a ler %s"
+
+#~ msgid "writing %s"
+#~ msgstr "a escrever %s"
+
+#~ msgid "closing %s"
+#~ msgstr "a fechar %s"
+
 #~ msgid "cannot create link %s"
 #~ msgstr "impossível criar a ligação %s"
 
@@ -12629,6 +12476,9 @@ msgstr ""
 #~ "atravé da variável de ambiente VERSION_CONTROL. Eis os valores:\n"
 #~ "\n"
 
+#~ msgid "accessing %s"
+#~ msgstr "a aceder a %s"
+
 #~ msgid "the --reply option is deprecated; use -i or -f instead"
 #~ msgstr "a opção --reply está obsoleta; use -i ou -f ao invés"
 
@@ -12636,12 +12486,91 @@ msgstr ""
 #~ msgstr "formato de precisão inválido"
 
 #~ msgid ""
+#~ "Display the current time in the given FORMAT, or set the system date.\n"
+#~ "\n"
+#~ "  -d, --date=STRING         display time described by STRING, not `now'\n"
+#~ "  -f, --file=DATEFILE       like --date once for each line of DATEFILE\n"
+#~ msgstr ""
+#~ "Exibir o tempo actual no FORMATO dado, ou alterar a data do sistema.\n"
+#~ "\n"
+#~ "   -d, --date=EXPR          mostrar o tempo descrito por EXPR, não o "
+#~ "actual\n"
+#~ "   -f, --file=FICHEIRO      como --date mas uma vez para cada linha de "
+#~ "FICHEIRO\n"
+
+#~ msgid "opening %s"
+#~ msgstr "a abrir %s"
+
+#~ msgid ""
+#~ "  -a, --all             include dummy file systems\n"
+#~ "  -B, --block-size=SIZE  use SIZE-byte blocks\n"
+#~ "  -h, --human-readable  print sizes in human readable format (e.g., 1K "
+#~ "234M 2G)\n"
+#~ "  -H, --si              likewise, but use powers of 1000 not 1024\n"
+#~ msgstr ""
+#~ "  -a, --all             incluir sistemas de ficheiros manequins\n"
+#~ "  -B, --block-size=TAMANHO  usar blocos de TAMANHO bytes\n"
+#~ "  -h, --human-readable  tamanhos em formato para humanos (ex., 1K 234M "
+#~ "2G)\n"
+#~ "  -H, --si              da mesma forma, mas usar potências de 1000, não "
+#~ "1024\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "SIZE may be (or may be an integer optionally followed by) one of "
+#~ "following:\n"
+#~ "kB 1000, K 1024, MB 1000*1000, M 1024*1024, and so on for G, T, P, E, Z, "
+#~ "Y.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "TAMANHO pode ser (ou um inteiro opcionalmente seguido de) um dos "
+#~ "seguintes:\n"
+#~ "kB 1000, K 1024, MB 1000*1000, M 1024*1024 e por aí fora para G, T, P, E, "
+#~ "Z, Y.\n"
+
+#~ msgid ""
+#~ "Usage: %s NAME\n"
+#~ "  or:  %s OPTION\n"
+#~ msgstr ""
+#~ "Utilização: %s NOME\n"
+#~ "  ou:       %s OPÇÃO\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Examples:\n"
+#~ "  %s /usr/bin/sort  Output \"/usr/bin\".\n"
+#~ "  %s stdio.h        Output \".\".\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Exemplos:\n"
+#~ "  %s /usr/bin/sort  Mostrar \"/usr/bin\".\n"
+#~ "  %s stdio.h        Mostrar \".\".\n"
+
+#~ msgid ""
+#~ "  -B, --block-size=SIZE  use SIZE-byte blocks\n"
+#~ "  -b, --bytes           equivalent to `--apparent-size --block-size=1'\n"
+#~ "  -c, --total           produce a grand total\n"
+#~ "  -D, --dereference-args  dereference only symlinks that are listed on "
+#~ "the\n"
+#~ "                          command line\n"
+#~ msgstr ""
+#~ "  -B, --block-size=TAMANHO  usar blocos de TAMANHO bytes\n"
+#~ "  -b, --bytes           equivalente a '--apparent-size --block-size=1'\n"
+#~ "  -c, --total           produzir um grande total\n"
+#~ "  -D, --dereference-args  desreferenciar só ligações simbólicas listadas "
+#~ "na\n"
+#~ "                          linha de comandos\n"
+
+#~ msgid ""
 #~ "WARNING: use --si, not -H; the meaning of the -H option will soon\n"
 #~ "change to be the same as that of --dereference-args (-D)"
 #~ msgstr ""
 #~ "AVISO: use --si, não -H; o significado da opção -H mudará em breve\n"
 #~ "para ser o mesmo de --dereference-args (-D)"
 
+#~ msgid "the --megabytes option is deprecated; use -m instead"
+#~ msgstr "a opção --megabytes está obsoleta; use -m ao invés"
+
 #~ msgid "Usage: %s [OPTION]... [STRING]...\n"
 #~ msgstr "Utilização: %s [OPÇÃO]... [EXPRESSÃO]...\n"
 
@@ -12669,6 +12598,12 @@ msgstr ""
 #~ "Exibir os factores primos de cada NÚMERO.\n"
 #~ "\n"
 
+#~ msgid "%s: cannot lseek back to original position"
+#~ msgstr "%s: impossível retornar à posição original"
+
+#~ msgid "cannot reposition file pointer for %s"
+#~ msgstr "impossível reposicionar apontador de ficheiro para %s"
+
 #~ msgid ""
 #~ "cannot display context when selinux not enabled or when displaying the "
 #~ "id\n"
@@ -12677,6 +12612,15 @@ msgstr ""
 #~ "impossível exibir contexto com SELinux desactivado ou ao mostrar o ID\n"
 #~ "de outro utilizador"
 
+#~ msgid ""
+#~ "      --preserve-context  preserve SELinux security context\n"
+#~ "  -Z, --context=CONTEXT  set SELinux security context of files and "
+#~ "directories\n"
+#~ msgstr ""
+#~ "      --preserve-context  preservar contexto de segurança SELinux\n"
+#~ "  -Z, --context=CONTEXTO  alterar cont. de segurança SELinux de fich. e "
+#~ "pastas\n"
+
 #~ msgid "%s: warning: making a hard link to a symbolic link is not portable"
 #~ msgstr ""
 #~ "%s: aviso: criar uma ligação persistente para simbólica não é portável"
@@ -12694,6 +12638,20 @@ msgstr ""
 #~ msgstr "a criar ligação persistente %s => %s"
 
 #~ msgid ""
+#~ "  -n, --no-dereference        treat destination that is a symlink to a\n"
+#~ "                                directory as if it were a normal file\n"
+#~ "  -i, --interactive           prompt whether to remove destinations\n"
+#~ "  -s, --symbolic              make symbolic links instead of hard links\n"
+#~ msgstr ""
+#~ "  -n, --no-dereference        tratar destinos que são ligações "
+#~ "simbólicas\n"
+#~ "                                para uma pasta como se fossem um fich. "
+#~ "normal\n"
+#~ "  -i, --interactive           perguntar antes de remover destinos\n"
+#~ "  -s, --symbolic              criar ligações simbólicas em vez de "
+#~ "persistentes\n"
+
+#~ msgid ""
 #~ "\n"
 #~ "By default, color is not used to distinguish types of files.  That is\n"
 #~ "equivalent to using --color=none.  Using the --color option without the\n"
@@ -12727,6 +12685,17 @@ msgstr ""
 #~ msgstr "Utilização: %s [OPÇÃO] PASTA...\n"
 
 #~ msgid ""
+#~ "  -Z, --context=CTX  set the SELinux security context of each NAME to "
+#~ "CTX\n"
+#~ msgstr ""
+#~ "  -Z, --context=CTX  alterar cont. segur. SELinux de cada NOME para CTX\n"
+
+#~ msgid ""
+#~ "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
+#~ msgstr ""
+#~ "  -Z, --context=CTX  alterar contexto de segur. SELinux de NOME para CTX\n"
+
+#~ msgid ""
 #~ "  -q, --quiet      suppress diagnostics about file/dir-creation failure\n"
 #~ msgstr ""
 #~ "  -q, --quiet      sem relatos de erros de criacao de ficheiros/pastas\n"
@@ -12740,6 +12709,46 @@ msgstr ""
 #~ msgstr ""
 #~ "  -p PASTA         usar PASTA como um prefixo; implica -t [obsoleto]\n"
 
+#~ msgid "All arguments to long options are mandatory for short options.\n"
+#~ msgstr ""
+#~ "Todos os argumentos de opções longas são mandatórios para opções curtas.\n"
+
+#~ msgid ""
+#~ "  -A, --address-radix=RADIX   decide how file offsets are printed\n"
+#~ "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
+#~ msgstr ""
+#~ "  -A, --address-radix=RADICAL decidir como exibir índices de ficheiros\n"
+#~ "  -j, --skip-bytes=BYTES      saltar BYTES bytes de entrada iniciais\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "RADIX is d for decimal, o for octal, x for hexadecimal or n for none.\n"
+#~ "BYTES is hexadecimal with 0x or 0X prefix, and may have a multiplier "
+#~ "suffix:\n"
+#~ "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
+#~ "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n"
+#~ "Adding a z suffix to any type displays printable characters at the end of "
+#~ "each\n"
+#~ "output line.  "
+#~ msgstr ""
+#~ "\n"
+#~ "RAIZ é d para decimal, o para octal, x para hexadecimal ou n para "
+#~ "nenhum.\n"
+#~ "BYTES é hexadecimal com prefixo 0x ou 0X, e pode ter um sufixo "
+#~ "multiplicador:\n"
+#~ "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
+#~ "GB 1000*1000*1000, G 1024*1024*1024, e por aí fora para T, P, E, Z, Y.\n"
+#~ "Adicionando um sufixo z a qualquer tipo mostra caracteres exibíveis no "
+#~ "fim de\n"
+#~ "cada linha de saída.  "
+
+#~ msgid ""
+#~ "--string without a number implies 3.  --width without a number\n"
+#~ "implies 32.  By default, od uses -A o -t d2 -w16.\n"
+#~ msgstr ""
+#~ "--string sem um número implica 3. --width sem um número\n"
+#~ "implica 32. Por omissão, od usa -A o -t d2 -w16.\n"
+
 #~ msgid "%d: fmt=\"%s\" width=%d\n"
 #~ msgstr "%d: fmt=\"%s\" largr=%d\n"
 
@@ -12768,6 +12777,17 @@ msgstr ""
 #~ "  \\t      tabulador horizontal\n"
 #~ "  \\v      tabulador vertical\n"
 
+#~ msgid ""
+#~ "\n"
+#~ "With no FILE or if FILE is -, read Standard Input.  `-F /' by default.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Sem FICHEIRO ou se FICHEIRO é -, ler a entrada padrão. '-F /' por "
+#~ "omissão.\n"
+
+#~ msgid "Usage: %s [OPTION]... FILE\n"
+#~ msgstr "Utilização: %s [OPÇÃO]... FICHEIRO\n"
+
 #~ msgid "FATAL: failed to close directory %s"
 #~ msgstr "FATAL: erro ao fechar a pasta %s"
 
@@ -12786,6 +12806,9 @@ msgstr ""
 #~ msgid "FATAL: just-changed-to directory %s changed dev/ino"
 #~ msgstr "FATAL: pasta acabada de entrar %s mudou dev/ino"
 
+#~ msgid "cannot remove directory %s"
+#~ msgstr "impossível remover a pasta %s"
+
 #~ msgid "FATAL: cannot return to .. from %s"
 #~ msgstr "FATAL: impossível retornar a .. a partir de %s"
 
@@ -12807,6 +12830,45 @@ msgstr ""
 #~ msgid "invalid format string: %s"
 #~ msgstr "expressão de formatação inválida: %s"
 
+#~ msgid ""
+#~ "Drop any supplemental groups, assume the user-ID and group-ID of the "
+#~ "specified\n"
+#~ "USER (numeric ID or user name), and run COMMAND with any specified "
+#~ "ARGUMENTs.\n"
+#~ "Exit with status 111 if unable to assume the required user and group ID.\n"
+#~ "Otherwise, exit with the exit status of COMMAND.\n"
+#~ "This program is useful only when run by root (user ID zero).\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Descartar grupos suplementares, assumir IDs de utilizador e grupo do "
+#~ "UTILIZADOR\n"
+#~ "especificado (ID numérico ou nome) e executar COMANDO com ARGUMENTOs.\n"
+#~ "Sair com estado 111 se incapaz de assumir IDs de utilizador e grupo "
+#~ "requeridos.\n"
+#~ "Caso contrário, sair com o estado de saída de COMANDO.\n"
+#~ "Este programa é útil apenas quando executado pelo superutilizador (ID "
+#~ "zero).\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, "
+#~ "and\n"
+#~ "                    (if specified) supplemental group IDs to GID1, ...\n"
+#~ msgstr ""
+#~ "  -g GID[,GID1...]  definir também o ID de grupo primário como GID "
+#~ "numérico\n"
+#~ "                    e (se pedido) IDs de grupo suplementares como "
+#~ "GID1, ...\n"
+
+#~ msgid "to use user-ID %s you need to use -g too"
+#~ msgstr "para usar o ID de utilizador %s necessita usar -g também"
+
+#~ msgid "cannot set group-ID to %lu"
+#~ msgstr "impossível alterar o identificador de grupo para %lu"
+
+#~ msgid "cannot set user-ID to %lu"
+#~ msgstr "impossível alterar o identificador de utilizador para %lu"
+
 #~ msgid "Usage: %s [OPTIONS] FILE [...]\n"
 #~ msgstr "Utilização: %s [OPÇÕES]... FICHEIRO [...]\n"
 
@@ -12850,9 +12912,33 @@ msgstr ""
 #~ msgid "cannot create temporary file"
 #~ msgstr "impossível criar ficheiro temporário"
 
+#~ msgid "dup2 failed"
+#~ msgstr "erro de dup2"
+
+#~ msgid "couldn't execute %s"
+#~ msgstr "impossível executar %s"
+
 #~ msgid "couldn't open temporary file"
 #~ msgstr "impossível abrir o ficheiro temporário"
 
+#~ msgid "couldn't execute %s -d"
+#~ msgstr "impossível executar %s -d"
+
+#~ msgid ""
+#~ "  -a, --suffix-length=N   use suffixes of length N (default %d)\n"
+#~ "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
+#~ "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output "
+#~ "file\n"
+#~ "  -d, --numeric-suffixes  use numeric suffixes instead of alphabetic\n"
+#~ "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
+#~ msgstr ""
+#~ "  -a, --suffix-length=N   usar sufixos de comprimento N (predefinido %d)\n"
+#~ "  -b, --bytes=TAMANHO     colocar TAMANHO bytes por ficheiro de saída\n"
+#~ "  -C, --line-bytes=TAMANHO colocar no máximo TAMANHO bytes de linhas por "
+#~ "fich.\n"
+#~ "  -d, --numeric-suffixes  usar sufixos numéricos em vez de alfabéticos\n"
+#~ "  -l, --lines=NÚMERO      colocar NÚMERO linhas por ficheiro de saída\n"
+
 #~ msgid ""
 #~ "\n"
 #~ "SIZE may have a multiplier suffix:\n"
@@ -12873,6 +12959,61 @@ msgstr ""
 #~ msgid "new_mode: mode\n"
 #~ msgstr "modo_novo: modo\n"
 
+#~ msgid "Password:"
+#~ msgstr "Senha:"
+
+#~ msgid "getpass: cannot open /dev/tty"
+#~ msgstr "getpass: impossível abrir /dev/tty"
+
+#~ msgid "cannot set groups"
+#~ msgstr "impossível definir grupos"
+
+#~ msgid "cannot set group id"
+#~ msgstr "impossível alterar a identificação de grupo"
+
+#~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n"
+#~ msgstr "Utilização: %s [OPÇÃO]... [-] [UTILIZADOR [ARGUMENTO]...]\n"
+
+#~ msgid ""
+#~ "Change the effective user id and group id to that of USER.\n"
+#~ "\n"
+#~ "  -, -l, --login               make the shell a login shell\n"
+#~ "  -c, --command=COMMAND        pass a single COMMAND to the shell with -"
+#~ "c\n"
+#~ "  -f, --fast                   pass -f to the shell (for csh or tcsh)\n"
+#~ "  -m, --preserve-environment   do not reset environment variables\n"
+#~ "  -p                           same as -m\n"
+#~ "  -s, --shell=SHELL            run SHELL if /etc/shells allows it\n"
+#~ msgstr ""
+#~ "Alterar as identificações de utilizador e de grupo efectivas do "
+#~ "UTILIZADOR.\n"
+#~ "\n"
+#~ "  -, -l, --login               tornar a shell numa shell de login\n"
+#~ "  -c, --command=COMANDO        enviar um único COMANDO à shell com -c\n"
+#~ "  -f, --fast                   enviar -f à shell (para csh ou tcsh)\n"
+#~ "  -m, --preserver-environment  preservar as variáveis do ambiente\n"
+#~ "  -p                           o mesmo que -m\n"
+#~ "  -s, --shell=SHELL            correr SHELL se /etc/shells o permitir\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "A mere - implies -l.   If USER not given, assume root.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Um simples - implica -l. Sem UTILIZADOR, assumir root.\n"
+
+#~ msgid "user %s does not exist"
+#~ msgstr "o utilizador %s não existe"
+
+#~ msgid "incorrect password"
+#~ msgstr "senha incorrecta"
+
+#~ msgid "using restricted shell %s"
+#~ msgstr "a usar a shell restrita %s"
+
+#~ msgid "warning: cannot change directory to %s"
+#~ msgstr "aviso: impossível mudar para a pasta %s"
+
 #~ msgid ""
 #~ "      --retry              keep trying to open a file even if it is\n"
 #~ "                           inaccessible when tail starts or if it "
@@ -12908,6 +13049,9 @@ msgstr ""
 #~ "que mesmo que um ficheiro aberto com tail seja renomeado, o seu fim será\n"
 #~ "monitorizado na mesma.  "
 
+#~ msgid "warning: --retry is useful mainly when following by name"
+#~ msgstr "aviso: --retry é útil quando se persegue por nome"
+
 #~ msgid "creating %s"
 #~ msgstr "a criar %s"
 
@@ -12951,6 +13095,27 @@ msgstr ""
 #~ "entrada padrão), escrevendo na SA�DA (ou saída padrão).\n"
 #~ "\n"
 
+#~ msgid ""
+#~ "  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
+#~ "                        delimit-method={none(default),prepend,separate}\n"
+#~ "                        Delimiting is done with blank lines.\n"
+#~ "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+#~ "  -i, --ignore-case     ignore differences in case when comparing\n"
+#~ "  -s, --skip-chars=N    avoid comparing the first N characters\n"
+#~ "  -u, --unique          only print unique lines\n"
+#~ "  -z, --zero-terminated  end lines with 0 byte, not newline\n"
+#~ msgstr ""
+#~ "  -D, --all-repeated[=método-delimit]  mostrar todas as linhas "
+#~ "duplicadas\n"
+#~ "                        método-delimit={none(predefinido),prepend,"
+#~ "separate}\n"
+#~ "                        Delimitação é feita com linhas vazias.\n"
+#~ "  -f, --skip-fields=N   evitar comparar os primeiros N campos\n"
+#~ "  -i, --ignore-case     ignorar capitalização ao comparar\n"
+#~ "  -s, --skip-chars=N    evitar comparar os primeiros N caracteres\n"
+#~ "  -u, --unique          apenas mostrar linhas únicas\n"
+#~ "  -z, --zero-terminated  terminlr linhas com byte zero, não nova linha\n"
+
 #~ msgid "am"
 #~ msgstr "am"
 
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index f90ebad0..a530103f 100644
--- a/po/pt_BR.gmo
+++ b/po/pt_BR.gmo
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 224325ea..7b80b069 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: coreutils-8.18-pre1\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
 "PO-Revision-Date: 2012-06-24 16:47-0300\n"
 "Last-Translator: Rodolfo Ribeiro Gomes <rodolforg@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
@@ -40,76 +40,124 @@ msgstr "Os argumentos válidos são:"
 msgid "error closing file"
 msgstr "erro ao fechar o arquivo"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "erro de gravação"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "preservando permissões para %s"
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "Erro desconhecido de sistema"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "arquivo comum vazio"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "arquivo comum"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "diretório"
 
-#: lib/file-type.c:44
-msgid "block special file"
-msgstr "arquivo especial de bloco"
-
-#: lib/file-type.c:47
-msgid "character special file"
-msgstr "arquivo especial de caractere"
-
-#: lib/file-type.c:50
-msgid "fifo"
-msgstr "fifo"
-
-#: lib/file-type.c:53
+#: lib/file-type.c:46
 msgid "symbolic link"
 msgstr "ligação simbólica"
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "soquete"
-
-#: lib/file-type.c:59
+#: lib/file-type.c:52
 msgid "message queue"
 msgstr "fila de mensagens"
 
-#: lib/file-type.c:62
+#: lib/file-type.c:55
 msgid "semaphore"
 msgstr "semáforo"
 
-#: lib/file-type.c:65
+#: lib/file-type.c:58
 msgid "shared memory object"
 msgstr "objeto de memória compartilhada"
 
-#: lib/file-type.c:68
+#: lib/file-type.c:61
 msgid "typed memory object"
 msgstr "objeto de memória tipificada"
 
-#: lib/file-type.c:70
+#: lib/file-type.c:66
+msgid "block special file"
+msgstr "arquivo especial de bloco"
+
+#: lib/file-type.c:69
+msgid "character special file"
+msgstr "arquivo especial de caractere"
+
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr ""
+
+#: lib/file-type.c:75
+msgid "fifo"
+msgstr "fifo"
+
+#: lib/file-type.c:78
+msgid "door"
+msgstr ""
+
+#: lib/file-type.c:81
+#, fuzzy
+msgid "multiplexed block special file"
+msgstr "arquivo especial de bloco"
+
+#: lib/file-type.c:84
+#, fuzzy
+msgid "multiplexed character special file"
+msgstr "arquivo especial de caractere"
+
+#: lib/file-type.c:87
+#, fuzzy
+msgid "multiplexed file"
+msgstr "múltiplas regras"
+
+#: lib/file-type.c:90
+#, fuzzy
+msgid "named file"
+msgstr "arquivo estranho"
+
+#: lib/file-type.c:93
+#, fuzzy
+msgid "network special file"
+msgstr "arquivo especial de bloco"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr ""
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr ""
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr ""
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "soquete"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr ""
+
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "arquivo estranho"
 
@@ -244,18 +292,18 @@ msgstr "%s: a opção \"-W %s\" não admite argumentos\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: a opção \"-W %s\" exige um argumento\n"
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr "é impossível mudar as permissões de %s"
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "é impossível criar o diretório %s"
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr "memória esgotada"
@@ -372,7 +420,7 @@ msgstr "Expressão regular grande demais"
 msgid "Unmatched ) or \\)"
 msgstr ") ou \\) sem correspondente"
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 msgid "No previous regular expression"
 msgstr "Nenhuma expressão regular anterior"
 
@@ -397,7 +445,7 @@ msgstr "use --no-preserve-root para contornar esta segurança"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[sS]"
 
@@ -407,11 +455,11 @@ msgstr "^[sS]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, c-format
 msgid "setting permissions for %s"
 msgstr "definindo permissões para %s"
@@ -552,18 +600,6 @@ msgstr "Falha de energia"
 msgid "Resource lost"
 msgstr "Recurso perdido"
 
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, c-format
-msgid "cannot create pipe"
-msgstr "não foi possível criar duto"
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, c-format
-msgid "%s subprocess failed"
-msgstr "subprocesso de %s falhou"
-
 #: lib/strsignal.c:114
 #, c-format
 msgid "Real-time signal %d"
@@ -772,7 +808,7 @@ msgstr ""
 msgid "Report %s bugs to: %s\n"
 msgstr "Relate os problemas de %s para: %s\n"
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "página de %s: <%s>\n"
@@ -782,30 +818,10 @@ msgstr "página de %s: <%s>\n"
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr "página de %s: <http://www.gnu.org/software/%s/>\n"
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr "Ajuda geral sobre uso de software GNU: <http://www.gnu.org/gethelp/>\n"
 
-#: lib/w32spawn.h:43
-#, c-format
-msgid "_open_osfhandle failed"
-msgstr "_open_osfhandle falhou"
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr "não foi possível restaurar o descritor de arquivo %d: dup2 falhou"
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr "subprocesso de %s"
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr "subprocesso de %s recebeu o sinal fatal %d"
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr "entrada padrão"
@@ -827,7 +843,7 @@ msgstr "fluxo desconhecido"
 msgid "failed to reopen %s with mode %s"
 msgstr "falhou em reabrir %s com modo %s"
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr "a comparação dos textos falhou"
@@ -894,7 +910,7 @@ msgstr ""
 "                          Use 0 para desabilitar\n"
 "\n"
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -916,48 +932,47 @@ msgstr ""
 "bytes do alfabeto base64 formal. Use --ignore-garbage para tentar se\n"
 "recuperar de quaisquer outros bytes fora do alfabeto no fluxo codificado.\n"
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "erro de leitura"
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, c-format
 msgid "invalid input"
 msgstr "entrada inválida"
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, c-format
 msgid "invalid wrap size: %s"
 msgstr "tamanho inválido para quebra: %s"
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, c-format
 msgid "extra operand %s"
 msgstr "operando extra %s"
 
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, c-format
 msgid "closing standard input"
 msgstr "fechando entrada padrão"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -986,10 +1001,11 @@ msgstr ""
 "\n"
 
 #: src/basename.c:60
+#, fuzzy
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
 "  -a, --multiple       dá suporte a múltiplos argumentos e trata cada um "
 "como um\n"
@@ -1015,32 +1031,31 @@ msgstr ""
 "  %s -s .h include/stdio.h  -> \"stdio\"\n"
 "  %s -a algo/txt1 algo/txt2 -> \"txt1\" seguido de \"txt2\"\n"
 
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, c-format
 msgid "missing operand"
 msgstr "falta operando"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr "Torbjorn Granlund"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 msgid "Richard M. Stallman"
 msgstr "Richard M. Stallman"
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1100,7 +1115,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr "é impossível executar a função \"ioctl\" em %s"
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr "saída padrão"
@@ -1117,14 +1132,14 @@ msgstr "Russell Coker"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 msgid "Jim Meyering"
 msgstr "Jim Meyering"
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, c-format
 msgid "failed to create security context: %s"
 msgstr "falhou em criar contexto de segurança: %s"
@@ -1134,8 +1149,8 @@ msgstr "falhou em criar contexto de segurança: %s"
 msgid "failed to set %s security context component to %s"
 msgstr "falhou em definir o componente %s do contexto de segurança para %s"
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, c-format
 msgid "failed to get security context of %s"
 msgstr "falhou em obter o contexto de segurança de %s"
@@ -1145,18 +1160,18 @@ msgstr "falhou em obter o contexto de segurança de %s"
 msgid "can't apply partial context to unlabeled file %s"
 msgstr "não pode aplicar o contexto parcial para o arquivo não-rotulado %s"
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, c-format
 msgid "failed to change context of %s to %s"
 msgstr "falhou em alterar o contexto de %s para %s"
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
 msgstr "não é possível acessar %s"
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, c-format
 msgid "cannot read directory %s"
 msgstr "não é possível ler diretório %s"
@@ -1166,13 +1181,14 @@ msgstr "não é possível ler diretório %s"
 msgid "changing security context of %s\n"
 msgstr "alterando o contexto de segurança de %s\n"
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, c-format
 msgid "fts_read failed"
 msgstr "fts_read falhou"
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, c-format
 msgid "fts_close failed"
 msgstr "fts_close falhou"
@@ -1191,7 +1207,7 @@ msgstr ""
 #: src/chcon.c:357
 #, fuzzy
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
@@ -1227,7 +1243,7 @@ msgstr ""
 "  -t, --type=TIPO        define o tipo TIPO no contexto de segurança alvo\n"
 "  -l, --range=FAIXA      define a faixa FAIXA no contexto de segurança alvo\n"
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
 "      --preserve-root    fail to operate recursively on '/'\n"
@@ -1280,36 +1296,37 @@ msgstr ""
 "  -P                     não percorra ligações simbólicas (padrão)\n"
 "\n"
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr "-R --dereference exige -H ou -L"
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr "-R -h exige -P"
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, c-format
 msgid "missing operand after %s"
 msgstr "falta operando depois de %s"
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, c-format
 msgid "invalid context: %s"
 msgstr "contexto inválido: %s"
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr "foram fornecidos especificadores de contexto de segurança conflitantes"
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, c-format
 msgid "failed to get attributes of %s"
 msgstr "falhou em obter os atributos de %s"
@@ -1339,7 +1356,7 @@ msgstr ""
 "ARQUIVOREF.\n"
 "\n"
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
@@ -1380,47 +1397,47 @@ msgstr ""
 "  %s equipe /u      Muda o grupo de /u para \"equipe\".\n"
 "  %s -hR equipe /u  Muda o grupo de /u e seus arquivos para \"equipe\".\n"
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
 msgstr "obtendo novos atributos de %s"
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr "ligação simbólica %s e referência inalterados\n"
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr "modo de %s alterado de %04lo (%s) para %04lo (%s)\n"
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr "falhou em alterar o modo de %s de %04lo (%s) para %04lo (%s)\n"
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr "modo de %s mantido como %04lo (%s)\n"
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr "impossível operar na ligação simbólica quebrada %s"
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, c-format
 msgid "changing permissions of %s"
 msgstr "alterando permissões de %s"
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr "%s: as novas permissões são %s, e não %s"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1431,7 +1448,7 @@ msgstr ""
 " ou:  %s [OPÇÃO]... MODO-OCTAL ARQUIVO...\n"
 " ou:  %s [OPÇÃO]... --reference=ARQREF ARQUIVO...\n"
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 msgid ""
 "Change the mode of each FILE to MODE.\n"
 "With --reference, change the mode of each FILE to that of RFILE.\n"
@@ -1441,16 +1458,16 @@ msgstr ""
 "Com --reference, altera o modo de cada ARQUIVO para o mesmo de ARQREF.\n"
 "\n"
 
-#: src/chmod.c:391
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr "      --reference=ARQR   usa o modo de ARQR em vez dos valores MODO\n"
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr ""
 "  -R, --recursive        altera os arquivos e diretórios recursivamente\n"
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 msgid ""
 "\n"
 "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n"
@@ -1458,12 +1475,12 @@ msgstr ""
 "\n"
 "Cada MODO é da forma \"[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+\".\n"
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr "é impossível combinar as opções MODO e --reference"
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, c-format
 msgid "invalid mode: %s"
 msgstr "modo inválido: %s"
@@ -1610,26 +1627,21 @@ msgstr ""
 "  %s -hR root /u     Altera o dono de /u e seus arquivos para \"root\".\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr "Roland McGrath"
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr "grupo inválido %s"
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, c-format
 msgid "invalid group list %s"
 msgstr "lista de grupo inválido %s"
 
-#: src/chroot.c:117
-#, c-format
-msgid "failed to set additional groups"
-msgstr "falhou em estabelecer grupo(s) adicional(ais)"
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
@@ -1638,7 +1650,7 @@ msgstr ""
 "Uso: %s [OPÇÃO] NOVORAIZ [COMANDO [ARGUMENTO]...]\n"
 " ou: %s OPÇÃO\n"
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
@@ -1646,13 +1658,13 @@ msgstr ""
 "Executa COMANDO com o diretório raiz modificado para NOVORAIZ.\n"
 "\n"
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
 msgstr ""
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 msgid ""
 "\n"
 "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n"
@@ -1661,28 +1673,42 @@ msgstr ""
 "Se nenhum COMANDO for dado, executa \"`${SHELL} -i'\" (padrão: \"/bin/sh -i"
 "\").\n"
 
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, c-format
 msgid "cannot change root directory to %s"
 msgstr "não foi possível mudar o diretório raiz para %s"
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, c-format
 msgid "cannot chdir to root directory"
 msgstr "não foi possível ir para o diretório raiz"
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr ""
+
+#: src/chroot.c:383
+#, fuzzy, c-format
+msgid "failed to get supplemental groups"
+msgstr "falhou em estabelecer grupo(s) suplementar(es)"
+
+#: src/chroot.c:395
+#, fuzzy, c-format
+msgid "failed to %s supplemental groups"
+msgstr "falhou em estabelecer grupo(s) suplementar(es)"
+
+#: src/chroot.c:402
 #, c-format
 msgid "failed to set group-ID"
 msgstr "falhou em definir o ID de grupo"
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, c-format
 msgid "failed to set user-ID"
 msgstr "falhou em definir o ID de usuário"
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, c-format
 msgid "failed to run command %s"
 msgstr "falhou em executar o comando %s"
@@ -1714,7 +1740,7 @@ msgstr ""
 "Exibe a soma de verificação CRC e o total de bytes de cada ARQUIVO.\n"
 "\n"
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr "Uso: %s [OPÇÃO]... ARQUIVO1 ARQUIVO2\n"
@@ -1793,298 +1819,331 @@ msgstr "foram especificados múltiplos delimitadores"
 msgid "empty %s not allowed"
 msgstr ""
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr "erro lendo %s"
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, c-format
 msgid "cannot lseek %s"
 msgstr "impossível fazer \"lseek\" em %s"
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr "erro escrevendo %s"
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, fuzzy, c-format
 msgid "%s: failed to get extents info"
 msgstr "falhou em obter o contexto atual"
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, c-format
 msgid "%s: write failed"
 msgstr "%s: falhou em escrever"
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, fuzzy, c-format
 msgid "failed to extend %s"
 msgstr "falhou em abrir %s"
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, c-format
 msgid "clearing permissions for %s"
 msgstr "apagando as permissões para %s"
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "falhou em preservar o dono para %s"
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
 msgstr "falhou em localizar o arquivo %s"
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, c-format
 msgid "failed to preserve authorship for %s"
 msgstr "falhou em preservar a autoria para %s"
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
+#, c-format
+msgid "failed to set default file creation context to %s"
+msgstr "falhou em definir o contexto padrão de criação de arquivo para %s"
+
+#: src/copy.c:820
+#, fuzzy, c-format
+msgid "failed to set default file creation context for %s"
+msgstr "falhou em definir o contexto padrão de criação de arquivo para %s"
+
+#: src/copy.c:846
+#, fuzzy, c-format
+msgid "failed to set the security context of %s"
+msgstr "falhou em definir o contexto de segurança de %s para %s"
+
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
 msgid "cannot open %s for reading"
 msgstr "não foi possível abrir %s para leitura"
 
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, c-format
 msgid "cannot fstat %s"
 msgstr "não foi possível obter o estado de %s"
 
-#: src/copy.c:820
+#: src/copy.c:935
 #, c-format
 msgid "skipping file %s, as it was replaced while being copied"
 msgstr "ignorando o arquivo %s; ele foi substituído durante a cópia"
 
-#: src/copy.c:850
-#, c-format
-msgid "failed to get file system create context"
-msgstr "falhou em obter o contexto de criação do sistema de arquivos"
-
-#: src/copy.c:864
-#, c-format
-msgid "failed to set the security context of %s to %s"
-msgstr "falhou em definir o contexto de segurança de %s para %s"
-
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
 msgid "cannot remove %s"
 msgstr "não foi possível remover %s"
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
 msgstr "removido %s\n"
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr "não se escreve através de uma ligação simbólica quebrada: %s"
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, c-format
 msgid "cannot create regular file %s"
 msgstr "não foi possível criar arquivo comum %s"
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, c-format
 msgid "failed to clone %s from %s"
 msgstr "falhou em clonar %s a partir de %s"
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr "preservando horário para %s"
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
 #, fuzzy, c-format
 msgid "failed to close %s"
 msgstr "falhou em abrir %s"
 
-#: src/copy.c:1471
-#, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
+#: src/copy.c:1580
+#, fuzzy, c-format
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
 msgstr "%s: tentar sobrescrever %s, desobedecendo o modo %04lo (%s)? "
 
-#: src/copy.c:1478
+#: src/copy.c:1581
+#, c-format
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr ""
+
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
 msgstr "%s: sobrescrever %s? "
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr " (cópia de segurança: %s)"
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr "falhou em restaurar o contexto padrão de criação de arquivo"
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, c-format
 msgid "cannot create hard link %s to %s"
 msgstr "não foi possível criar ligação absoluta %s para %s"
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, c-format
 msgid "cannot stat %s"
 msgstr "impossível obter estado de %s"
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, c-format
 msgid "omitting directory %s"
 msgstr "omitindo o diretório %s"
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr "aviso: o arquivo de origem %s foi especificado mais de uma vez"
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
 msgstr "%s e %s são o mesmo arquivo"
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr "é impossível sobrescrever o não-diretório %s com o diretório %s"
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr "não sobrescreverá o recém-criado %s com %s"
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr "é impossível sobrescrever diretório %s com um não-diretório"
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr "é impossível mover diretório para não-diretório: %s -> %s"
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr ""
 "fazer cópia de segurança de %s destruiria o original; %s não foi movido"
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr ""
 "fazer cópia de segurança de %s destruiria o original; %s não foi copiado"
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
 msgstr "não foi possível fazer cópia de segurança de %s"
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr "não copiará %s através da ligação simbólica recém-criada %s"
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr "é impossível copiar um diretório, %s, para si próprio, %s"
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr "não criará ligação absoluta %s para o diretório %s"
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr "é impossível mover %s para um subdiretório de si mesmo, %s"
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, c-format
 msgid "cannot move %s to %s"
 msgstr "não foi possível mover %s para %s"
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr ""
 "falhou ao mover entre dispositivos: %s para %s: impossível remover destino"
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, c-format
-msgid "failed to set default file creation context to %s"
-msgstr "falhou em definir o contexto padrão de criação de arquivo para %s"
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr "é impossível copiar ligação simbólica cíclica %s"
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr ""
 "%s: só é possível fazer ligações simbólicas relativas no diretório atual"
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr "não foi possível criar ligação simbólica %s para %s"
 
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, c-format
 msgid "cannot create fifo %s"
 msgstr "não foi possível criar fifo %s"
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, c-format
 msgid "cannot create special file %s"
 msgstr "não foi possível criar arquivo especial %s"
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, c-format
 msgid "cannot read symbolic link %s"
 msgstr "não foi possível ler ligação simbólica %s"
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, c-format
 msgid "cannot create symbolic link %s"
 msgstr "não foi possível criar ligação simbólica %s"
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
 msgstr "%s tem um tipo desconhecido de arquivo"
 
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, c-format
 msgid "cannot un-backup %s"
 msgstr "não foi possível restaurar a cópia de segurança %s"
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr "%s -> %s (cópia de segurança restaurada)\n"
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr ""
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr ""
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, fuzzy, c-format
+msgid "unknown program %s"
+msgstr "fluxo desconhecido"
+
+#: src/cp.c:157 src/mv.c:288
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -2095,14 +2154,14 @@ msgstr ""
 " ou: %s [OPÇÃO]... ORIGEM... DIRETÓRIO\n"
 " ou: %s [OPÇÃO]... -t DIRETÓRIO ORIGEM...\n"
 
-#: src/cp.c:162
+#: src/cp.c:163
 #, fuzzy
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 "Copia ORIGEM para DESTINO, ou múltiplas ORIGENs para DIRETÓRIO.\n"
 "\n"
 
-#: src/cp.c:168
+#: src/cp.c:169
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
 "      --attributes-only        don't copy the file data, just the "
@@ -2126,7 +2185,7 @@ msgstr ""
 "  -d                           o mesmo que --no-dereference --"
 "preserve=links\n"
 
-#: src/cp.c:177
+#: src/cp.c:178
 #, fuzzy
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
@@ -2148,7 +2207,7 @@ msgstr ""
 "  -H                           segue as ligações simbólicas da linha de\n"
 "                                 comando em ORIGEM\n"
 
-#: src/cp.c:186
+#: src/cp.c:187
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
 "  -L, --dereference            always follow symbolic links in SOURCE\n"
@@ -2157,7 +2216,7 @@ msgstr ""
 "                                 copiá-los\n"
 "  -L, --dereference            sempre segue ligações simbólicas em ORIGEM\n"
 
-#: src/cp.c:190
+#: src/cp.c:191
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
 "                                 a previous -i option)\n"
@@ -2168,7 +2227,7 @@ msgstr ""
 "                                 uma opção -i anterior)\n"
 "  -P, --no-dereference         nunca segue uma ligação simbólica em ORIGEM\n"
 
-#: src/cp.c:195
+#: src/cp.c:196
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
 "      --preserve[=ATTR_LIST]   preserve the specified attributes (default:\n"
@@ -2191,7 +2250,7 @@ msgstr ""
 "                                 context (contexto), links (ligações),\n"
 "                                 xattr (estendidos) e all (tudo)\n"
 
-#: src/cp.c:203
+#: src/cp.c:204
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                use full source file name under DIRECTORY\n"
@@ -2200,7 +2259,7 @@ msgstr ""
 "      --parents                usa o nome completo do arquivo fonte sob\n"
 "                                 DIRETÓRIO\n"
 
-#: src/cp.c:207
+#: src/cp.c:208
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
 "      --reflink[=WHEN]         control clone/CoW copies. See below\n"
@@ -2214,7 +2273,7 @@ msgstr ""
 "antes\n"
 "                                 de tentar abri-lo (contrasta com --force)\n"
 
-#: src/cp.c:213
+#: src/cp.c:214
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
 "      --strip-trailing-slashes  remove any trailing slashes from each "
@@ -2226,7 +2285,7 @@ msgstr ""
 "      --strip-trailing-slashes  remove as barras finais de cada argumento\n"
 "                                 ORIGEM\n"
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -2240,7 +2299,7 @@ msgstr ""
 "                                 diretório DIR\n"
 "  -T, --no-target-directory    trata DESTINO como um arquivo normal\n"
 
-#: src/cp.c:224
+#: src/cp.c:225
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
 "                                 than the destination file or when the\n"
@@ -2255,7 +2314,15 @@ msgstr ""
 "  -v, --verbose                explica o que está sendo feito\n"
 "  -x, --one-file-system        permanece neste sistema de arquivos\n"
 
-#: src/cp.c:233
+#: src/cp.c:232
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/cp.c:240
 msgid ""
 "\n"
 "By default, sparse SOURCE files are detected by a crude heuristic and the\n"
@@ -2283,7 +2350,7 @@ msgstr ""
 "for possível, a cópia falha. Em outro caso, se --reflink=auto for especi-\n"
 "ficado, recai para a cópia padrão.\n"
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 msgid ""
 "\n"
 "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n"
@@ -2301,7 +2368,7 @@ msgstr ""
 "são:\n"
 "\n"
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2315,7 +2382,7 @@ msgstr ""
 "                    simples em caso contrário\n"
 "  simple, never   sempre faz cópias de segurança simples\n"
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2327,223 +2394,235 @@ msgstr ""
 "opções force e backup são fornecidas e ORIGEM e DESTINO são iguais ao nome\n"
 "de um arquivo comum já existente.\n"
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, c-format
 msgid "failed to preserve times for %s"
 msgstr "falhou em preservar horário para %s"
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, c-format
 msgid "failed to preserve permissions for %s"
 msgstr "falhou em preservar permissões para %s"
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, c-format
 msgid "cannot make directory %s"
 msgstr "não foi possível criar diretório %s"
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr "%s existe, mas não é um diretório"
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
 #, fuzzy, c-format
 msgid "failed to access %s"
 msgstr "falhou em abrir %s"
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, c-format
 msgid "missing file operand"
 msgstr "falta o operando arquivo"
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, c-format
 msgid "missing destination file operand after %s"
 msgstr "falta o operando arquivo de destino após %s"
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr ""
 "é impossível combinar --target-directory (-t) com --no-target-directory (-T)"
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, c-format
 msgid "target %s is not a directory"
 msgstr "o alvo %s não é um diretório"
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr "com --parents, o destino tem que ser um diretório"
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, c-format
 msgid "multiple target directories specified"
 msgstr "foram especificados múltiplos diretórios-alvo"
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, fuzzy, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr ""
+"Aviso: ignorando --context (-Z); este Kernel não é habilitado com SELinux."
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr "é impossível fazer ligações absolutas e simbólicas simultaneamente"
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr "as opções que --backup e --no-clobber são mutuamente exclusivas"
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr ""
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr "tipo de cópia de segurança"
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, fuzzy, c-format
+msgid "cannot set target context and preserve it"
+msgstr ""
+"é impossível forçar o contexto alvo para %s e preservá-lo ao mesmo tempo"
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr ""
 "é impossível preservar o contexto de segurança sem um kernel habilitado com\n"
 "SELinux"
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr "Stuart Kemp"
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr "a entrada desapareceu"
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr "%s: número de linha fora dos limites"
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, c-format
 msgid "%s: %s: line number out of range"
 msgstr "%s: %s: número de linha fora dos limites"
 
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, c-format
 msgid " on repetition %s\n"
 msgstr " na repetição %s\n"
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, c-format
 msgid "%s: %s: match not found"
 msgstr "%s: %s: ocorrência não encontrada"
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr "erro na busca da expressão regular"
 
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, c-format
 msgid "write error for %s"
 msgstr "erro ao escrever em %s"
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, c-format
 msgid "%s: integer expected after delimiter"
 msgstr "%s: espera-se um número inteiro depois do delimitador"
 
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr "%s: exige-se uma \"}\" depois do número de repetições"
 
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr "%s}: deve se especificar um número inteiro entre \"{\" e \"}\""
 
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr "%s: falta o delimitador de fechamento \"%c\""
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr "%s: expressão regular inválida: %s"
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr "%s: padrão inválido"
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr "%s: o número de linha deve ser maior que zero"
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr "número de linha %s é menor do que o número de linha precedente, %s"
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr "atenção: o número de linha %s é igual ao número de linha anterior"
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr "falta especificador de conversão no sufixo"
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr "especificador de conversão no sufixo é inválido: %c"
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr "especificador de conversão no sufixo é inválido: \\%.3o"
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr "sinalizadores inválidos na especificação de conversão: %%%c%c"
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr "muitos especificadores %% de conversão no sufixo"
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr "falta especificador %% de conversão no sufixo"
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr "%s: número inválido"
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr "Uso: %s [OPÇÃO]... ARQUIVO PADRÃO...\n"
 
-#: src/csplit.c:1455
+#: src/csplit.c:1483
 #, fuzzy
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
@@ -2554,7 +2633,7 @@ msgstr ""
 "\"xx01\", ..., e emite o total de bytes de cada pedaço na saída padrão.\n"
 "\n"
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2568,7 +2647,11 @@ msgstr ""
 "  -k, --keep-files           não remove arquivo de saída mesmo caso haja "
 "erros\n"
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr ""
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
@@ -2579,7 +2662,7 @@ msgstr ""
 "  -s, --quiet, --silent      não emite o tamanho dos arquivos de saída\n"
 "  -z, --elide-empty-files    remove arquivos de saída vazios\n"
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
@@ -2587,7 +2670,7 @@ msgstr ""
 "\n"
 "Lê a entrada padrão se ARQUIVO for -. Cada PADRÃO pode ser:\n"
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 msgid ""
 "\n"
 "  INTEGER            copy up to but not including specified line number\n"
@@ -2616,23 +2699,19 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr "David M. Ihnat"
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr "campos e posições são numerados a partir do número 1"
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr "Uso: %s OPÇÃO... [ARQUIVO]...\n"
 
-#: src/cut.c:193
+#: src/cut.c:176
 #, fuzzy
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr ""
 "Emite as partes selecionadas das linhas de cada ARQUIVO na saída padrão.\n"
 "\n"
 
-#: src/cut.c:199
+#: src/cut.c:182
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
 "  -c, --characters=LIST   select only these characters\n"
@@ -2642,7 +2721,7 @@ msgstr ""
 "  -c, --characters=LISTA  seleciona apenas estes caracteres\n"
 "  -d, --delimiter=DELIM   usa DELIM em vez de TAB como delimitador de campo\n"
 
-#: src/cut.c:204
+#: src/cut.c:187
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
 "                            that contains no delimiter character, unless\n"
@@ -2656,7 +2735,7 @@ msgstr ""
 "                            menos que a opção -s esteja especificada\n"
 "  -n                      (sem efeito)\n"
 
-#: src/cut.c:210
+#: src/cut.c:193
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
 "                            or fields\n"
@@ -2664,7 +2743,7 @@ msgstr ""
 "      --complement        complementa o conjunto dos bytes, caracteres ou\n"
 "                            campos selecionados\n"
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
@@ -2674,7 +2753,7 @@ msgstr ""
 "      --output-delimiter=TEXTO  usa TEXTO como delimitador da saída\n"
 "                                  o padrão é usar o delimitador de entrada\n"
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2687,7 +2766,7 @@ msgstr ""
 "selecionada\n"
 "é escrita na mesma ordem que é lida, e é escrita uma única vez.\n"
 
-#: src/cut.c:227
+#: src/cut.c:210
 msgid ""
 "Each range is one of:\n"
 "\n"
@@ -2708,48 +2787,52 @@ msgstr ""
 "\n"
 "Se ARQUIVO não for especificado ou for -, lê a entrada padrão.\n"
 
-#: src/cut.c:367 src/cut.c:493
+#: src/cut.c:300 src/cut.c:394
 #, fuzzy
 msgid "invalid byte, character or field list"
 msgstr "lista inválida de bytes ou campos"
 
-#: src/cut.c:387
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr "campos e posições são numerados a partir do número 1"
+
+#: src/cut.c:320
 msgid "invalid range with no endpoint: -"
 msgstr "não é valido um intervalo sem especificar limite: -"
 
-#: src/cut.c:403
+#: src/cut.c:334
 msgid "invalid decreasing range"
 msgstr "não é válido um intervalo decrescente"
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, c-format
 msgid "byte offset %s is too large"
 msgstr "deslocamento de byte %s é muito grande"
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, c-format
 msgid "field number %s is too large"
 msgstr "o número de campo %s é muito grande"
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr "somente um tipo de lista pode ser especificado"
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr "o delimitador deve ser um único caractere"
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr "deve-se especificar uma lista de bytes, caracteres ou campos"
 
-#: src/cut.c:850
+#: src/cut.c:790
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr ""
 "um delimitador de entrada só pode ser especificado quando se processa campos"
 
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
@@ -2757,11 +2840,11 @@ msgstr ""
 "suprimir as linhas não delimitadas só tem sentido\n"
 "\tquando se processa campos"
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr "falta lista de campos"
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr "falta lista de posições"
 
@@ -2807,7 +2890,7 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 "      --rfc-3339=TIMESPEC   emite a data e hora no formato da RFC 3339.\n"
 "                              TIMESPEC=\"date\", \"seconds\" ou \"ns\" para\n"
@@ -3018,10 +3101,10 @@ msgid ""
 "  $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n"
 msgstr ""
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr "entrada padrão"
@@ -3063,7 +3146,7 @@ msgstr ""
 msgid "cannot set date"
 msgstr "não foi possível ajustar data"
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, c-format
 msgid "time %s is out of range"
 msgstr "hora %s fora do intervalo permitido"
@@ -3074,7 +3157,7 @@ msgstr "hora %s fora do intervalo permitido"
 msgid "Paul Rubin"
 msgstr "Paul Rubin"
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
@@ -3083,7 +3166,7 @@ msgstr ""
 "Uso: %s [OPERANDO]...\n"
 " ou: %s OPÇÃO\n"
 
-#: src/dd.c:526
+#: src/dd.c:532
 #, fuzzy
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
@@ -3104,7 +3187,7 @@ msgstr ""
 "  count=BLOCOS    copia somente BLOCOS blocos de entrada\n"
 "  ibs=BYTES       lê BYTES bytes de uma vez\n"
 
-#: src/dd.c:535
+#: src/dd.c:541
 #, fuzzy
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
@@ -3131,7 +3214,7 @@ msgstr ""
 "                    da entrada\n"
 "  status=noxfer   suprime as estatísticas da transferência\n"
 
-#: src/dd.c:546
+#: src/dd.c:552
 #, fuzzy
 msgid ""
 "\n"
@@ -3151,7 +3234,7 @@ msgstr ""
 "Cada símbolo CONV pode ser:\n"
 "\n"
 
-#: src/dd.c:555
+#: src/dd.c:561
 #, fuzzy
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
@@ -3175,7 +3258,7 @@ msgstr ""
 "              por caractere de nova-linha\n"
 "  lcase     altera as maiúsculas para minúsculas\n"
 
-#: src/dd.c:568
+#: src/dd.c:574
 #, fuzzy
 msgid ""
 "  excl      fail if the output file already exists\n"
@@ -3193,7 +3276,7 @@ msgstr ""
 "concluir\n"
 "  fsync     similar, mas também escreve metadados\n"
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -3206,75 +3289,75 @@ msgstr ""
 "\n"
 "  append    modo anexar (só faz sentido para saída; sugere-se conv=notrunc)\n"
 
-#: src/dd.c:583
+#: src/dd.c:589
 msgid "  cio       use concurrent I/O for data\n"
 msgstr "  cio       usa E/S concorrente para dados\n"
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr "  direct    usa E/S direta para dados\n"
 
-#: src/dd.c:587
+#: src/dd.c:593
 msgid "  directory  fail unless a directory\n"
 msgstr "  directory  falha a menos que seja um diretório\n"
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr "  dsync     usa E/S sincronizada para dados\n"
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr "  sync      similar, mas também para metadados\n"
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr "  nonblock  usa E/S não-bloqueante\n"
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr "  noatime   não atualiza o horário de acesso\n"
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr ""
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr "  noctty    não designa o terminal de controle do arquivo\n"
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr "  nofollow  não segue ligações simbólicas\n"
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr "  nolinks   falha se ligado múltiplas vezes\n"
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr "  binary    usa E/S binária para dados\n"
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr "  text      usa E/S textual para dados\n"
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr ""
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, c-format
 msgid ""
 "\n"
@@ -3303,7 +3386,17 @@ msgstr ""
 "As opções são:\n"
 "\n"
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
@@ -3312,21 +3405,21 @@ msgstr ""
 "%<PRIuMAX>+%<PRIuMAX> registros de entrada\n"
 "%<PRIuMAX>+%<PRIuMAX> registros de saída\n"
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
 msgstr[0] "%<PRIuMAX> registro truncado\n"
 msgstr[1] "%<PRIuMAX> registros truncados\n"
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
 msgstr[0] "%<PRIuMAX> byte (%s) copiado"
 msgstr[1] "%<PRIuMAX> bytes (%s) copiados"
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr "Banda infinita"
 
@@ -3340,83 +3433,83 @@ msgstr "Banda infinita"
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
 msgstr ", %g s, %s/s\n"
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, c-format
 msgid "closing input file %s"
 msgstr "fechando arquivo de entrada %s"
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr "fechando arquivo de saída %s"
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr "falhou em desativar O_DIRECT: %s"
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, c-format
 msgid "writing to %s"
 msgstr "escrevendo em %s"
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, c-format
 msgid "unrecognized operand %s"
 msgstr "operando desconhecido %s"
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 msgid "invalid conversion"
 msgstr "conversão inválida"
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 msgid "invalid input flag"
 msgstr "sinalizador inválido de entrada"
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 msgid "invalid output flag"
 msgstr "sinalizador inválido de saída"
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 msgid "invalid status flag"
 msgstr "sinalizador inválido de estado"
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, c-format
 msgid "invalid number %s"
 msgstr "número inválido %s"
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr "é impossível qualquer combinação entre {ascii,ebcdic,ibm}"
 
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, c-format
 msgid "cannot combine block and unblock"
 msgstr "é impossível combinar \"block\" com \"unblock\""
 
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, c-format
 msgid "cannot combine lcase and ucase"
 msgstr "é impossível combinar \"lcase\" com \"ucase\""
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, c-format
 msgid "cannot combine excl and nocreat"
 msgstr "é impossível combinar \"excl\" com \"nocreat\""
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, c-format
 msgid "cannot combine direct and nocache"
 msgstr "é impossível combinar \"direct\" com \"nocache\""
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
@@ -3425,72 +3518,62 @@ msgstr ""
 "aviso: contornando o bug no kernel de \"lseek\" para arquivo (%s)\n"
 "  de mt_type=0x%0lx -- veja <sys/mtio.h> para a lista de tipos"
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, c-format
 msgid "%s: cannot skip"
 msgstr "%s: não foi possível ignorar"
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, c-format
 msgid "%s: cannot seek"
 msgstr "%s: não foi possível buscar (\"seek\")"
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr "estouro de deslocamento enquanto lia o arquivo %s"
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr "aviso: deslocamento inválido de arquivo após falha de leitura"
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr "não foi possível contornar o bug no kernel"
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, c-format
 msgid "setting flags for %s"
 msgstr "ajustando sinalizadores para %s"
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr "%s: não foi possível ignorar até o deslocamento especificado"
 
-#: src/dd.c:2133
+#: src/dd.c:2172
 #, fuzzy, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
 msgstr "falhou em truncar aos %<PRIuMAX> bytes no arquivo de saída %s"
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr "\"fdatasync\" falhou para %s"
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
 msgstr "\"fsync\" falhou para %s"
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, c-format
 msgid "failed to open %s"
 msgstr "falhou em abrir %s"
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
@@ -3499,96 +3582,105 @@ msgstr ""
 "deslocamento muito grande: é impossível truncar para um comprimento de busca="
 "%<PRIuMAX> (%lu-byte) blocos"
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr "falhou em truncar aos %<PRIuMAX> bytes no arquivo de saída %s"
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, c-format
 msgid "failed to discard cache for: %s"
 msgstr "falhou em descartar o cache para: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr "Paul Eggert"
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr "Sist. Arq."
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr "Tipo"
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr "blocos"
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr "Usado"
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr "Disponível"
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr "Uso%"
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr ""
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr "IUsado"
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr ""
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr "IUso%"
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr "Montado em"
 
-#: src/df.c:383
-#, c-format
-msgid "option --output: field '%s' unknown"
+#: src/df.c:207
+msgid "File"
 msgstr ""
 
-#: src/df.c:390
+#: src/df.c:387
+#, fuzzy, c-format
+msgid "option --output: field %s unknown"
+msgstr "fechando arquivo de saída %s"
+
+#: src/df.c:394
 #, fuzzy, c-format
-msgid "option --output: field '%s' used more than once"
+msgid "option --output: field %s used more than once"
 msgstr "aviso: o arquivo de origem %s foi especificado mais de uma vez"
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr "Tam."
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr "Disp."
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr "Capacid."
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
 msgstr ""
 
-#: src/df.c:1210
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr ""
+
+#: src/df.c:1384
 #, fuzzy
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
@@ -3598,16 +3690,18 @@ msgstr ""
 "reside ou, por padrão, sobre todos os sistemas de arquivos.\n"
 "\n"
 
-#: src/df.c:1217
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
+#, fuzzy
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
 "  -a, --all             inclui sistemas de arquivo fictícios\n"
 "  -B, --block-size=TAM  o tamanho considera blocos de TAM bytes. Exemplo:\n"
@@ -3620,7 +3714,7 @@ msgstr ""
 "                          (por exemplo, 1K 234M 2G)\n"
 "  -H, --si              similar, mas usa potências de 1000, e não de 1024\n"
 
-#: src/df.c:1227
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -3634,7 +3728,7 @@ msgstr ""
 "      --no-sync         não invocar \"sync\" ao obter informações de uso "
 "(padrão)\n"
 
-#: src/df.c:1234
+#: src/df.c:1409
 #, fuzzy
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
@@ -3656,43 +3750,34 @@ msgstr ""
 "                              sejam do tipo TIPO\n"
 "  -v                    (sem efeito)\n"
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
 
-#: src/df.c:1285
+#: src/df.c:1460
 #, fuzzy, c-format
 msgid "options %s and %s are mutually exclusive"
 msgstr ""
 "as opções que especificam datas para exibição são mutuamente exclusivas"
 
-#: src/df.c:1335
-#, fuzzy
-msgid "warning: "
-msgstr "Aviso: "
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr ""
-
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr "sistema de arquivos de tipo %s selecionado e excluído"
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr "Aviso: "
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 msgid "cannot read table of mounted file systems"
 msgstr "não foi possível ler a tabela dos sistemas de arquivo montados"
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr "nenhum sistema de arquivo foi processado"
@@ -3702,7 +3787,7 @@ msgstr "nenhum sistema de arquivo foi processado"
 msgid "H. Peter Anvin"
 msgstr "H. Peter Anvin"
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr "Uso: %s [OPÇÃO]... [ARQUIVO]\n"
@@ -3797,7 +3882,7 @@ msgstr ""
 
 #: src/dirname.c:59
 #, fuzzy
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
 msgstr "  -z, --zero     termina linhas com byte 0, e não com \"nova-linha\"\n"
 
 #: src/dirname.c:64
@@ -3815,7 +3900,7 @@ msgstr ""
 "  %s dir1/str dir2/str  -> \"dir1\" seguido de \"dir2\"\n"
 "  %s stdio.h            -> \".\"\n"
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -3824,18 +3909,17 @@ msgstr ""
 "Uso: %s [OPÇÃO]... [ARQUIVO]...\n"
 " ou: %s [OPÇÃO]... --files0-from=A\n"
 
-#: src/du.c:274
+#: src/du.c:285
 #, fuzzy
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr ""
 "Resume o uso do disco de cada ARQUIVO, recursivamente para diretórios.\n"
 "\n"
 
-#: src/du.c:280
+#: src/du.c:291
 #, fuzzy
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3852,12 +3936,12 @@ msgstr ""
 "                          esparsos, fragmentação interna, blocos indiretos\n"
 "                          e outros afins\n"
 
-#: src/du.c:289
+#: src/du.c:300
 #, fuzzy
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3874,15 +3958,16 @@ msgstr ""
 "  -D, --dereference-args  interpreta apenas as ligações simbólicas listadas\n"
 "                          na linha de comando\n"
 
-#: src/du.c:302
+#: src/du.c:313
 #, fuzzy
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
 "      --files0-from=A   resume o uso de disco do arquivos de nomes "
 "terminados\n"
@@ -3895,7 +3980,7 @@ msgstr ""
 "                          (por exemplo: 1K 234M 2G)\n"
 "      --si              similar a -h, mas usa potências de 1000 e não 1024\n"
 
-#: src/du.c:310
+#: src/du.c:322
 #, fuzzy
 msgid ""
 "  -k                    like --block-size=1K\n"
@@ -3908,12 +3993,13 @@ msgstr ""
 "                          absoluta\n"
 "  -m                    o mesmo que --block-size=1M\n"
 
-#: src/du.c:316
+#: src/du.c:328
 #, fuzzy
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
@@ -3924,7 +4010,7 @@ msgstr ""
 "  -S, --separate-dirs   não inclui o tamanho de subdiretórios\n"
 "  -s, --summarize       mostra somente um total para cada argumento\n"
 
-#: src/du.c:322
+#: src/du.c:334
 #, fuzzy
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
@@ -3934,9 +4020,9 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
 msgstr ""
 "      --time            mostra a hora da última modificação de todos os\n"
 "                          arquivos no diretório ou quaisquer uns de seus\n"
@@ -3950,76 +4036,76 @@ msgstr ""
 "                             full-iso, long-iso, iso, +FORMATO\n"
 "                             FORMATO é interpretado como em \"date\"\n"
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
 "  -x, --one-file-system    skip directories on different file systems\n"
 msgstr ""
 
-#: src/du.c:386
+#: src/du.c:398
 #, fuzzy
 msgid "Infinity"
 msgstr "Banda infinita"
 
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr ""
-
-#: src/du.c:624
+#: src/du.c:636
 #, fuzzy, c-format
 msgid "fts_read failed: %s"
 msgstr "fts_read falhou"
 
-#: src/du.c:780
+#: src/du.c:787
 #, c-format
 msgid "invalid maximum depth %s"
 msgstr "profundidade máxima inválida %s"
 
-#: src/du.c:809
+#: src/du.c:816
 #, fuzzy, c-format
 msgid "invalid --threshold argument '-0'"
 msgstr "argumento inválido %s"
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr "é impossível resumir e detalhar todas as entradas ao mesmo tempo"
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr "aviso: resumir é o mesmo que usar --max-depth=0"
 
-#: src/du.c:900
+#: src/du.c:911
 #, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr "aviso: resumir conflita com --max-depth=%lu"
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 #, fuzzy
 msgid "file operands cannot be combined with --files0-from"
 msgstr "Operandos tipo arquivo não podem ser combinados com --files0-from."
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr "%s: erro de leitura"
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr ""
 "ao ler nomes de arquivo da entrada padrão, não é permitido nenhum nome de "
 "arquivo ser %s"
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 msgid "invalid zero-length file name"
 msgstr "é inválido um nome de arquivo de comprimento nulo"
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr "total"
 
@@ -4123,7 +4209,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
 "Define cada NOME como VALOR no ambiente e executa o COMANDO.\n"
@@ -4208,16 +4294,16 @@ msgid "input line is too long"
 msgstr "linha de entrada é muito longa"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr "Mike Parker"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr "James Youngman"
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
@@ -4226,7 +4312,7 @@ msgstr ""
 "Uso: %s EXPRESSÃO\n"
 " ou: %s OPÇÃO\n"
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -4244,7 +4330,7 @@ msgstr ""
 "\n"
 "  ARG1 & ARG2       ARG1 se nenhum dos argumentos for nulo ou 0; senão, 0\n"
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -4262,7 +4348,7 @@ msgstr ""
 "  ARG1 >= ARG2      ARG1 é maior ou igual a ARG2\n"
 "  ARG1 > ARG2       ARG1 é maior que ARG2\n"
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
@@ -4272,7 +4358,7 @@ msgstr ""
 "  ARG1 + ARG2       soma aritmética de ARG1 com ARG2\n"
 "  ARG1 - ARG2       ARG1 subtraído aritmeticamente de ARG2\n"
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -4285,7 +4371,7 @@ msgstr ""
 "  ARG1 / ARG2       quociente da divisão aritmética de ARG1 por ARG2\n"
 "  ARG1 % ARG2       resto da divisão aritmética de ARG1 por ARG2\n"
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -4305,7 +4391,7 @@ msgstr ""
 "                               encontrados; ou 0\n"
 "  length TEXTO               comprimento do TEXTO\n"
 
-#: src/expr.c:251
+#: src/expr.c:250
 #, fuzzy
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
@@ -4320,7 +4406,7 @@ msgstr ""
 "\n"
 "  ( EXPRESSÃO )             valor de EXPRESSÃO\n"
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -4339,7 +4425,7 @@ msgstr ""
 "se \\( e \\) não forem usados, elas retornarão o número de caracteres\n"
 "coincidentes ou 0.\n"
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -4352,32 +4438,32 @@ msgstr ""
 "for nula ou 0; será 2 se EXPRESSÃO for sintaticamente inválida; e será 3 se\n"
 "um erro ocorreu.\n"
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, c-format
 msgid "syntax error"
 msgstr "erro de sintaxe"
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, c-format
 msgid "error in regular expression matcher"
 msgstr "erro na busca da expressão regular"
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, fuzzy, c-format
 msgid "non-integer argument"
 msgstr "argumento não-numérico"
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr "divisão por zero"
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, fuzzy, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr "Defina LC_ALL='C' para contornar o problema."
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, fuzzy, c-format
 msgid "the strings compared were %s and %s"
 msgstr "Os textos comparados foram %s e %s."
@@ -4387,27 +4473,27 @@ msgstr "Os textos comparados foram %s e %s."
 msgid "Niels Moller"
 msgstr ""
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
 msgstr ""
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
 msgstr ""
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, c-format
 msgid "%s is not a valid positive integer"
 msgstr "%s não é um inteiro positivo válido"
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr "%s é muito grande"
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
@@ -4416,7 +4502,7 @@ msgstr ""
 "Uso: %s [NÚMERO]...\n"
 " ou: %s OPÇÃO\n"
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 #, fuzzy
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
@@ -4532,28 +4618,28 @@ msgid "invalid number of columns: %s"
 msgstr "o número de colunas não é válido: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr "Padraig Brady"
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, c-format
 msgid "Usage: %s\n"
 msgstr "Uso: %s\n"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
 msgstr ""
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, c-format
 msgid "failed to get groups for user %s"
 msgstr "falhou em obter os grupos do usuário %s"
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, c-format
 msgid "failed to get groups for the current process"
 msgstr "falhou em obter os grupos do usuário para o processo atual"
@@ -4579,22 +4665,22 @@ msgstr ""
 "sobre o processo atual (que é diferente se o banco de dados de grupo foi\n"
 "alterado).\n"
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, fuzzy, c-format
 msgid "cannot get real UID"
 msgstr "não foi possível definir id de usuário"
 
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, fuzzy, c-format
 msgid "cannot get effective GID"
 msgstr "não foi possível obter o alvo referenciado por %s"
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, fuzzy, c-format
 msgid "cannot get real GID"
 msgstr "não foi possível definir id de usuário"
 
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, fuzzy, c-format
 msgid "%s: no such user"
 msgstr "%s: Usuário inexistente"
@@ -4654,58 +4740,48 @@ msgstr ""
 "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
 "GB 1000*1000*1000, G 1024*1024*1024, e assim por diante com T, P, E, Z, Y.\n"
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr "%s: arquivo pequeno demais"
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, c-format
 msgid "%s: number of bytes is too large"
 msgstr "%s: número de bytes é muito grande"
 
-#: src/head.c:440
-#, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr "%s: não foi possível fazer \"lseek\" para a posição original"
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr "%s: não foi possível ir à posição %s"
 
-#: src/head.c:673
-#, fuzzy, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "%s: falhou em remover"
-
-#: src/head.c:798
+#: src/head.c:423 src/tail.c:457
 #, c-format
-msgid "cannot reposition file pointer for %s"
-msgstr "não foi possível reposicionar ponteiro de arquivo para %s"
+msgid "%s: cannot seek to relative offset %s"
+msgstr "%s: não foi possível buscar (\"seek\") pela posição relativa %s"
 
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr "%s: %s é tão grande que não pode ser representado"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr "número de linhas"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr "número de bytes"
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr "número inválido de linhas"
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr "número inválido de bytes"
 
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, c-format
 msgid "invalid trailing option -- %c"
 msgstr "opção inválida -- %c"
@@ -4752,28 +4828,34 @@ msgid "cannot determine hostname"
 msgstr "não foi possível determinar o nome da máquina"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr "Arnold Robbins"
 
-#: src/id.c:81
-#, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
-msgstr "Uso: %s [OPÇÃO]... [NOMEDOUSU�RIO]\n"
+#: src/id.c:84
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]... [USER]\n"
+msgstr "Uso: %s [OPÇÃO]... [USU�RIO]...\n"
 
-#: src/id.c:82
-#, fuzzy
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
+msgstr ""
+
+#: src/id.c:90
+#, fuzzy
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
 msgstr ""
 "Exibe as informações de NOMEDOUSU�RIO, ou do usuário atual.\n"
 "\n"
@@ -4785,7 +4867,7 @@ msgstr ""
 "  -r, --read      exibe a ID real em vez da ID efetiva, para -ugG\n"
 "  -u, --user      exibe apenas a ID do usuário efetivo\n"
 
-#: src/id.c:96
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
@@ -4793,118 +4875,128 @@ msgstr ""
 "\n"
 "Sem OPÇÃO alguma, exibe um conjunto útil de informações de identificação.\n"
 
-#: src/id.c:140
+#: src/id.c:151
+#, fuzzy, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr "--context (-Z) só funciona em Kernel habilitado com SELinux"
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr "--context (-Z) só funciona em Kernel habilitado com SELinux"
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr ""
 "é impossível emitir o contexto de segurança quando usário é especificado"
 
-#: src/id.c:178
+#: src/id.c:198
 #, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr ""
 "é impossível a combinação de mais de uma opção do tipo \"emite apenas\""
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr "é impossível emitir apenas nomes ou ID reais no formato padrão"
 
-#: src/id.c:199
+#: src/id.c:209
+#, fuzzy, c-format
+msgid "option --zero not permitted in default format"
+msgstr "é impossível emitir apenas nomes ou ID reais no formato padrão"
+
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
 msgstr "é impossível obter o contexto do processo"
 
-#: src/id.c:224
+#: src/id.c:265
 #, fuzzy, c-format
 msgid "cannot get effective UID"
 msgstr "não foi possível obter o alvo referenciado por %s"
 
-#: src/id.c:311
+#: src/id.c:354
 #, fuzzy, c-format
 msgid "cannot find name for user ID %s"
 msgstr "não foi possível encontrar o nome para a ID de usuário %lu"
 
-#: src/id.c:329
+#: src/id.c:372
 #, fuzzy, c-format
 msgid "uid=%s"
 msgstr "uid=%lu"
 
-#: src/id.c:334
+#: src/id.c:377
 #, fuzzy, c-format
 msgid " gid=%s"
 msgstr " gid=%lu"
 
-#: src/id.c:341
+#: src/id.c:384
 #, fuzzy, c-format
 msgid " euid=%s"
 msgstr " euid=%lu"
 
-#: src/id.c:349
+#: src/id.c:392
 #, fuzzy, c-format
 msgid " egid=%s"
 msgstr " egid=%lu"
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr " grupos="
 
-#: src/id.c:393
+#: src/id.c:437
 #, fuzzy, c-format
 msgid " context=%s"
 msgstr "contexto inválido: %s"
 
-#: src/install.c:373
+#: src/install.c:376
 #, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr "aviso: %s: falhou em alterar o contexto para %s"
 
-#: src/install.c:414
+#: src/install.c:417
 #, c-format
 msgid "creating directory %s"
 msgstr "criando o diretório %s"
 
-#: src/install.c:482
+#: src/install.c:485
 #, c-format
 msgid "cannot change ownership of %s"
 msgstr "não foi possível mudar a posse de %s"
 
-#: src/install.c:506
+#: src/install.c:509
 #, c-format
 msgid "cannot set time stamps for %s"
 msgstr "não foi possível alterar o horário de %s"
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, c-format
 msgid "fork system call failed"
 msgstr "a chamada de sistema \"fork\" falhou"
 
-#: src/install.c:531
+#: src/install.c:535
 #, fuzzy, c-format
 msgid "cannot run %s"
 msgstr "não foi possível executar \"strip\""
 
-#: src/install.c:535
+#: src/install.c:539
 #, c-format
 msgid "waiting for strip"
 msgstr "esperando por \"strip\""
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr "o processo \"strip\" terminou anormalmente"
 
-#: src/install.c:558
+#: src/install.c:565
 #, c-format
 msgid "invalid user %s"
 msgstr "usuário inválido %s"
 
-#: src/install.c:594
+#: src/install.c:601
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -4917,7 +5009,7 @@ msgstr ""
 " ou:  %s [OPÇÃO]... -t DIRETÓRIO ORIGEM...\n"
 " ou:  %s [OPÇÃO]... -d DIRETÓRIO...\n"
 
-#: src/install.c:601
+#: src/install.c:608
 #, fuzzy
 msgid ""
 "\n"
@@ -4936,7 +5028,7 @@ msgstr ""
 "o DIRETÓRIO existente, enquanto define os modos de permissão e dono/grupo.\n"
 "Na quarta forma, cria todos os componentes do(s) DIRETÓRIO(s) fornecido(s).\n"
 
-#: src/install.c:615
+#: src/install.c:622
 #, fuzzy
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
@@ -4956,7 +5048,7 @@ msgstr ""
 "                        cria todos os componentes dos diretórios "
 "especificados\n"
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -4976,7 +5068,7 @@ msgstr ""
 "xr-x\n"
 "  -o, --owner=DONO    define o dono (somente para super-usuário)\n"
 
-#: src/install.c:631
+#: src/install.c:638
 #, fuzzy
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
@@ -5001,18 +5093,21 @@ msgstr ""
 "  -v, --verbose       emite o nome de cada diretório à medida que for "
 "criado\n"
 
-#: src/install.c:641
+#: src/install.c:648
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
-"      --preserve-context  preserva o contexto de segurança SELinux\n"
-"  -Z, --context=CONTEXTO  define o contexto de segurança SELinux dos "
-"arquivos\n"
-"                            e diretórios\n"
 
-#: src/install.c:859
+#: src/install.c:696 src/unlink.c:86
+#, c-format
+msgid "cannot unlink %s"
+msgstr "não foi possível remover %s"
+
+#: src/install.c:877
 #, fuzzy, c-format
 msgid ""
 "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
@@ -5020,52 +5115,40 @@ msgstr ""
 "Aviso: ignorando --preserve-context; este Kernel não é habilitado com "
 "SELinux."
 
-#: src/install.c:869
-#, fuzzy, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
-msgstr ""
-"Aviso: ignorando --context (-Z); este Kernel não é habilitado com SELinux."
-
-#: src/install.c:886
+#: src/install.c:917
 #, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr "a opção --strip não pode ser usada em instalação de diretório"
 
-#: src/install.c:889
+#: src/install.c:920
 #, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr "não é permitido --target-directory em instalação de diretório"
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr ""
-"é impossível forçar o contexto alvo para %s e preservá-lo ao mesmo tempo"
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, c-format
 msgid "invalid mode %s"
 msgstr "modo inválido %s"
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr ""
 
-#: src/install.c:959
+#: src/install.c:1001
 #, fuzzy, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr ""
 "as opções para estilo de saída detalhado e inteligível ao stty\n"
 "são mutuamente exclusivas"
 
-#: src/install.c:966
+#: src/install.c:1008
 #, fuzzy, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr ""
 "as opções que especificam datas para exibição são mutuamente exclusivas"
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -5077,7 +5160,7 @@ msgstr ""
 msgid "Mike Haertel"
 msgstr "Mike Haertel"
 
-#: src/join.c:191
+#: src/join.c:195
 #, fuzzy
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
@@ -5101,7 +5184,7 @@ msgstr ""
 "                      ARQUIVO2)\n"
 "  -e VAZIO          substitui os campos de entrada ausentes com VAZIO\n"
 
-#: src/join.c:200
+#: src/join.c:204
 #, fuzzy
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
@@ -5115,7 +5198,7 @@ msgstr ""
 "  -t CARACTERE      usa CARACTERE como separador de campo de entrada e "
 "saída\n"
 
-#: src/join.c:206
+#: src/join.c:210
 #, fuzzy
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
@@ -5136,7 +5219,14 @@ msgstr ""
 "                      todas as linhas de entrada forem pareáveis\n"
 "  --nocheck-order   não verifica se a entrada está ordenada corretamente\n"
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+#, fuzzy
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr ""
+"  -z, --zero-terminated     termina linhas com byte 0, e não com \"nova-linha"
+"\"\n"
+
+#: src/join.c:225
 #, fuzzy
 msgid ""
 "\n"
@@ -5170,47 +5260,47 @@ msgstr ""
 "é\n"
 "emitida um mensagem de aviso.\n"
 
-#: src/join.c:403
+#: src/join.c:410
 #, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
 msgstr ""
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, c-format
 msgid "invalid field number: %s"
 msgstr "número inválido de campo: %s"
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, c-format
 msgid "invalid field specifier: %s"
 msgstr "especificação inválida do campo: %s"
 
-#: src/join.c:877
+#: src/join.c:884
 #, c-format
 msgid "invalid file number in field spec: %s"
 msgstr "número inválido de arquivo na especificação do campo: %s"
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr "campos de junção incompatíveis %lu, %lu"
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr "conflito entre textos de substituição de campos vazios"
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, c-format
 msgid "multi-character tab %s"
 msgstr "tabulação multicaractere %s"
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr "tabulações incompatíveis"
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr "ambos os arquivos não podem ser a entrada padrão"
@@ -5336,47 +5426,47 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr "não foi possível criar a ligação %s para %s"
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr "%s: não são permitidas ligações absolutas para diretórios"
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, c-format
 msgid "%s: cannot overwrite directory"
 msgstr "%s: é impossível sobrescrever diretórios"
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
 msgstr "%s: substituir %s? "
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, fuzzy, c-format
 msgid "failed to create symbolic link %s"
 msgstr "não foi possível criar ligação simbólica %s"
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, fuzzy, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr "não foi possível criar ligação simbólica %s para %s"
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, fuzzy, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr "criando ligação absoluta para %.0s%s"
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, fuzzy, c-format
 msgid "failed to create hard link %s"
 msgstr "não foi possível criar ligação absoluta %s para %s"
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, fuzzy, c-format
 msgid "failed to create hard link %s => %s"
 msgstr "não foi possível criar ligação absoluta %s para %s"
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -5389,7 +5479,7 @@ msgstr ""
 " ou: %s [OPÇÃO]... ALVO... DIRETÓRIO       (3ª forma)\n"
 " ou: %s [OPÇÃO]... -t DIRETÓRIO ALVO...    (4ª forma)\n"
 
-#: src/ln.c:381
+#: src/ln.c:398
 #, fuzzy
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
@@ -5408,7 +5498,7 @@ msgstr ""
 "Ao criar ligações absolutas, é obrigatória a existência de cada ALVO.\n"
 "\n"
 
-#: src/ln.c:394
+#: src/ln.c:411
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
 "file\n"
@@ -5432,7 +5522,7 @@ msgstr ""
 "                                super-usuário)\n"
 "  -f, --force                 remove arquivos de destino existentes\n"
 
-#: src/ln.c:402
+#: src/ln.c:419
 #, fuzzy
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
@@ -5451,7 +5541,7 @@ msgstr ""
 "  -i, --interactive           pergunta se é para remover destinos\n"
 "  -s, --symbolic              cria ligações simbólicas em vez de absolutas\n"
 
-#: src/ln.c:411
+#: src/ln.c:428
 #, fuzzy
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
@@ -5468,7 +5558,7 @@ msgstr ""
 "  -T, --no-target-directory   trata NOME_LIGAÇÃO como arquivo normal\n"
 "  -v, --verbose               emite o nome de cada arquivo ligado\n"
 
-#: src/ln.c:433
+#: src/ln.c:450
 #, c-format
 msgid ""
 "\n"
@@ -5476,12 +5566,12 @@ msgid ""
 "behavior when a TARGET is a symbolic link, defaulting to %s.\n"
 msgstr ""
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, fuzzy, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr "É impossível combinar --target-directory com --no-target-directory"
 
-#: src/ln.c:588
+#: src/ln.c:605
 #, fuzzy, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr "não foi possível criar ligação simbólica %s"
@@ -5514,7 +5604,7 @@ msgstr "nenhum nome de usuário"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
@@ -5523,96 +5613,96 @@ msgstr "%b %e  %Y"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 msgid "%b %e %H:%M"
 msgstr "%b %e %H:%M"
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr "ignorando valor inválido da variável de ambiente QUOTING_STYLE: %s"
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr "ignorando largura inválida na variável de ambiente COLUMNS: %s"
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr ""
 "ignorando tamanho inválido de tabulação na variável de ambiente TABSIZE: %s"
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, c-format
 msgid "invalid line width: %s"
 msgstr "largura inválida de linha: %s"
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, c-format
 msgid "invalid tab size: %s"
 msgstr "tamanho inválido de tabulação: %s"
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, c-format
 msgid "invalid time style format %s"
 msgstr "formato inválido de estilo de hora %s"
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 #, fuzzy
 msgid "Valid arguments are:\n"
 msgstr "Os argumentos válidos são:"
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr ""
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr ""
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, c-format
 msgid "unrecognized prefix: %s"
 msgstr "prefixo desconhecido: %s"
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr "o valor da variável de ambiente LS_COLORS não pode ser analisado"
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, c-format
 msgid "cannot open directory %s"
 msgstr "não foi possível abrir o diretório %s"
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, c-format
 msgid "cannot determine device and inode of %s"
 msgstr "não foi possível determinar o dispositivo e o inode de %s"
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, c-format
 msgid "%s: not listing already-listed directory"
 msgstr "%s: não listando o diretório já listado"
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, c-format
 msgid "reading directory %s"
 msgstr "lendo o diretório %s"
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, c-format
 msgid "closing directory %s"
 msgstr "fechando o diretório %s"
 
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, c-format
 msgid "cannot compare file names %s and %s"
 msgstr "não foi possível comparar os nomes de arquivo %s e %s"
 
-#: src/ls.c:4721
+#: src/ls.c:4781
 #, fuzzy
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
@@ -5624,7 +5714,7 @@ msgstr ""
 "nem --sort.\n"
 "\n"
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 #, fuzzy
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
@@ -5639,18 +5729,18 @@ msgstr ""
 "  -b, --escape               emite escapes em octal para caracteres não-\n"
 "                               gráficos\n"
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 #, fuzzy
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
 "      --block-size=TAMANHO   usa blocos de TAMANHO bytes\n"
@@ -5663,16 +5753,15 @@ msgstr ""
 "                               com -l: mostra o ctime e ordena por nome\n"
 "                               demais casos: ordena por ctime\n"
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 #, fuzzy
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 "  -C                         lista as entradas em colunas\n"
@@ -5687,7 +5776,7 @@ msgstr ""
 "  -D, --dired                gera a saída projetada para modo \"dired\" do "
 "Emacs\n"
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 #, fuzzy
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
@@ -5707,15 +5796,17 @@ msgstr ""
 "                                \"verbose\" (-l), \"vertical\" (-C)\n"
 "      --full-time            o mesmo que -l --time-style=full-iso\n"
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr "  -g                         o mesmo que -l, mas não lista o dono\n"
 
-#: src/ls.c:4763
+#: src/ls.c:4823
+#, fuzzy
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 "      --group-directories-first\n"
@@ -5725,10 +5816,11 @@ msgstr ""
 "                               --sort=none (-U) desabilita o agrupamento de\n"
 "                               diretórios\n"
 
-#: src/ls.c:4769
+#: src/ls.c:4829
+#, fuzzy
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
@@ -5740,14 +5832,15 @@ msgstr ""
 "      --si                   similar, mas usa potências de 1000, e não de "
 "1024\n"
 
-#: src/ls.c:4775
+#: src/ls.c:4835
+#, fuzzy
 msgid ""
 "  -H, --dereference-command-line\n"
 "                             follow symbolic links listed on the command "
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
@@ -5766,7 +5859,7 @@ msgstr ""
 "usa\n"
 "                              -a ou -A)\n"
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 #, fuzzy
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
@@ -5776,7 +5869,7 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 "      --indicator-style=PALAVRA  anexa o indicador de tipo no estilo "
 "PALAVRA\n"
@@ -5790,7 +5883,7 @@ msgstr ""
 "                                com o PADRÃO (em sintaxe shell)\n"
 "  -k                         o mesmo que --block-size=1K\n"
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -5808,7 +5901,7 @@ msgstr ""
 "entradas\n"
 "                               separadas por vírgula\n"
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -5829,12 +5922,12 @@ msgstr ""
 "  -p, --indicator-style=slash\n"
 "                             anexa o indicador / aos diretórios\n"
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 #, fuzzy
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -5853,7 +5946,7 @@ msgstr ""
 "                                literal, locale, shell, shell-always, c, "
 "escape\n"
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 #, fuzzy
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
@@ -5865,16 +5958,19 @@ msgstr ""
 "  -R, --recursive            lista os subdiretórios recursivamente\n"
 "  -s, --size                 emite o tamanho de cada arquivo, em blocos\n"
 
-#: src/ls.c:4825
+#: src/ls.c:4886
+#, fuzzy
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 "  -S                         ordena por tamanho de arquivo\n"
 "      --sort=PALAVRA         ordena por PALAVRA em vez de pelo nome: none -"
@@ -5888,17 +5984,19 @@ msgstr ""
 "                               usa o horário especificado como chave de\n"
 "                               ordenação se --sort=time\n"
 
-#: src/ls.c:4835
+#: src/ls.c:4896
 #, fuzzy
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
 msgstr ""
 "      --time-style=ESTILO    com -l, emite os horários usando o estilo "
 "ESTILO:\n"
@@ -5913,7 +6011,7 @@ msgstr ""
 "ESTILO\n"
 "                               só faz efeito fora da localidade POSIX\n"
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 #, fuzzy
 msgid ""
 "  -t                         sort by modification time, newest first\n"
@@ -5923,11 +6021,11 @@ msgstr ""
 "  -T, --tabsize=COLS         assume paradas de tabulação a cada COLS em vez\n"
 "                               de 8\n"
 
-#: src/ls.c:4848
+#: src/ls.c:4912
 #, fuzzy
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
@@ -5940,13 +6038,13 @@ msgstr ""
 "  -U                         não ordena; lista na ordem do diretório\n"
 "  -v                         ordena por versão\n"
 
-#: src/ls.c:4855
+#: src/ls.c:4919
+#, fuzzy
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 "  -w, --width=COLS           assume a largura da tela como COLS\n"
@@ -5959,7 +6057,7 @@ msgstr ""
 "                               cada arquivo\n"
 "  -1                         lista um arquivo por linha\n"
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -5968,7 +6066,7 @@ msgid ""
 "variable can change the settings.  Use the dircolors command to set it.\n"
 msgstr ""
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -6047,9 +6145,11 @@ msgstr "  -t, --text              lê em modo texto (padrão)\n"
 #, fuzzy
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
@@ -6062,12 +6162,7 @@ msgstr ""
 "                            de maneira imprópria\n"
 "\n"
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -6084,39 +6179,39 @@ msgstr ""
 "caractere\n"
 "indicando o tipo (\"*\" para binário, \" \"para texto) e o nome do arquivo.\n"
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, c-format
 msgid "%s: too many checksum lines"
 msgstr "%s: muitas linhas de soma de verificação"
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr ""
 "%s: %<PRIuMAX>: linha de soma de verificação %s formatada de maneira "
 "imprópria"
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr "%s: FALHOU na abertura ou na leitura\n"
 
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr "FALHOU"
 
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr "SUCESSO"
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr ""
 "%s: foram encontradas linhas de soma de verificação %s com formatação "
 "imprópria"
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, fuzzy, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
@@ -6127,36 +6222,36 @@ msgstr[1] ""
 "%s: %<PRIuMAX>: linha de soma de verificação %s formatada de maneira "
 "imprópria"
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, fuzzy, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
 msgstr[0] "AVISO: %<PRIuMAX> de %<PRIuMAX> arquivo listado não pôde ser lido"
 msgstr[1] ""
-"AVISO: %<PRIuMAX> dos %<PRIuMAX> arquivos listados não pôde(puderam) ser lido"
-"(s)"
+"AVISO: %<PRIuMAX> dos %<PRIuMAX> arquivos listados não pôde(puderam) ser "
+"lido(s)"
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, fuzzy, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
 msgstr[0] ""
 "AVISO: %<PRIuMAX> de %<PRIuMAX> soma de verificação calculada NÃO coincide"
 msgstr[1] ""
-"AVISO: %<PRIuMAX> das %<PRIuMAX> somas de verificação calculadas NÃO coincide"
-"(m)"
+"AVISO: %<PRIuMAX> das %<PRIuMAX> somas de verificação calculadas NÃO "
+"coincide(m)"
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
 msgstr ""
 
-#: src/md5sum.c:766
+#: src/md5sum.c:770
 #, fuzzy, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr "a opção --status só faz sentido ao conferir as somas de verificação"
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
@@ -6164,45 +6259,44 @@ msgstr ""
 "as opções --binary e --text não fazem sentido ao conferir as somas de "
 "verificação"
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr "a opção --status só faz sentido ao conferir as somas de verificação"
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr "a opção --warn só faz sentido ao conferir as somas de verificação"
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, fuzzy, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr "a opção --status só faz sentido ao conferir as somas de verificação"
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, fuzzy, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr "a opção --status só faz sentido ao conferir as somas de verificação"
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr "Uso: %s [OPÇÃO]... DIRETÓRIO...\n"
 
-#: src/mkdir.c:57
+#: src/mkdir.c:59
 #, fuzzy
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
 msgstr ""
 "Cria o(s) DIRETÓRIO(s), se eles já não existirem.\n"
 "\n"
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
+#, fuzzy
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 "  -m, --mode=MODO   define as permissões como MODO (como no chmod) em vez "
 "de\n"
@@ -6214,24 +6308,50 @@ msgstr ""
 "diretório\n"
 "                       criado como CTX\n"
 
-#: src/mkdir.c:168
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/mkdir.c:127 src/mkdir.c:172
+#, fuzzy, c-format
+msgid "failed to set default creation context for %s"
+msgstr "falhou em definir o contexto padrão de criação de arquivo para %s"
+
+#: src/mkdir.c:191
+#, fuzzy, c-format
+msgid "failed to restore context for %s"
+msgstr "falhou em preservar horário para %s"
+
+#: src/mkdir.c:231
 #, c-format
 msgid "created directory %s"
 msgstr "foi criado o diretório %s"
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, fuzzy, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr ""
+"Aviso: ignorando --context (-Z); este Kernel não é habilitado com SELinux."
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr "Uso: %s [OPÇÃO]... NOME...\n"
 
-#: src/mkfifo.c:52
+#: src/mkfifo.c:54
 #, fuzzy
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
 msgstr ""
 "Cria arquivos de pipe (\"named pipes\" ou FIFOs) com os NOMEs fornecidos.\n"
 "\n"
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 #, fuzzy
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
@@ -6239,42 +6359,41 @@ msgstr ""
 "  -m, --mode=MODO   define os bits de permissões de arquivo para MODO (como\n"
 "                      no chmod), e não a=rw - umask\n"
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
-"  -Z, --context=CTX  define o contexto de segurança SELinux de cada NOME\n"
-"                       como CTX\n"
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, c-format
 msgid "invalid mode"
 msgstr "modo inválido"
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr "o modo deve especificar apenas os bits de permissão de arquivo"
 
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
+#, fuzzy, c-format
+msgid "cannot set permissions of %s"
+msgstr "é impossível mudar as permissões de %s"
+
+#: src/mknod.c:54
 #, c-format
 msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr "Uso: %s [OPÇÃO]... NOME TIPO [MAIOR MENOR]\n"
 
-#: src/mknod.c:54
+#: src/mknod.c:56
 #, fuzzy
 msgid "Create the special file NAME of the given TYPE.\n"
 msgstr ""
 "Cria o arquivo especial NOME do TIPO fornecido.\n"
 "\n"
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr ""
-"  -Z, --context=CTX  define o contexto de segurança SELinux de NOME como "
-"CTX\n"
-
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -6291,7 +6410,7 @@ msgstr ""
 "em caso contrário, como decimal.\n"
 "TIPO pode ser:\n"
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 msgid ""
 "\n"
 "  b      create a block (buffered) special file\n"
@@ -6303,55 +6422,55 @@ msgstr ""
 "  c, u    cria um arquivo especial de tipo caractere (não \"buffered\")\n"
 "  p       cria uma \"FIFO\"\n"
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 msgid "Special files require major and minor device numbers."
 msgstr "Arquivos especiais exigem os números maior e menor do dispositivo."
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 msgid "Fifos do not have major and minor device numbers."
 msgstr "Fifos não têm números maior e menor de dispositivo."
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, c-format
 msgid "block special files not supported"
 msgstr "não há suporte para arquivos especiais de bloco"
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, c-format
 msgid "character special files not supported"
 msgstr "não há suporte para arquivos especiais de caractere"
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, c-format
 msgid "invalid major device number %s"
 msgstr "número maior de dispostivo é inválido %s"
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, c-format
 msgid "invalid minor device number %s"
 msgstr "número menor de dispostivo é inválido %s"
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, c-format
 msgid "invalid device %s %s"
 msgstr "dispositivo inválido %s %s"
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, c-format
 msgid "invalid device type %s"
 msgstr "tipo inválido de dispositivo %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr "Eric Blake"
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr "Uso: %s [OPÇÃO]... [MODELO]\n"
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 #, fuzzy
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
@@ -6362,33 +6481,33 @@ msgstr ""
 "nome.\n"
 "Se MODELO não for especificado, usa tmp.XXXXXXXXXX.\n"
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
 "  -q, --quiet         suppress diagnostics about file/dir-creation failure\n"
 msgstr ""
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
 #, fuzzy
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
 "  --tmpdir[=DIR]   interpreta MODELO relativo ao DIR. Se DIR não for\n"
@@ -6402,10 +6521,9 @@ msgstr ""
 "final\n"
 "                     (o arquivo ou o diretório temporário).\n"
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
 #, fuzzy
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
@@ -6416,59 +6534,54 @@ msgstr ""
 "                     senão, usa o diretório especificado via -p; senão, usa\n"
 "                     /tmp [obsoleto]\n"
 
-#: src/mktemp.c:223
-#, fuzzy, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr "falhou em redirecionar o erro padrão"
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, c-format
 msgid "too many templates"
 msgstr "muitos modelos"
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr ""
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, fuzzy, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr "modelo inválido, %s; contém separador de diretório"
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr "poucos Xs no modelo %s"
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr "modelo inválido, %s; contém separador de diretório"
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr "modelo inválido, %s; com --tmpdir, não pode usar caminho absoluto"
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, c-format
 msgid "failed to create directory via template %s"
 msgstr "falhou em criar o diretório via modelo %s"
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, c-format
 msgid "failed to create file via template %s"
 msgstr "falhou em criar o arquivo via modelo %s"
 
-#: src/mv.c:292
+#: src/mv.c:294
 #, fuzzy
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 "Renomeia ORIGEM para DESTINO ou move ORIGEM(ns) para DIRETÓRIO.\n"
 "\n"
 
-#: src/mv.c:298
+#: src/mv.c:300
 #, fuzzy
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
@@ -6488,7 +6601,7 @@ msgstr ""
 "  -f, --force                  não pergunta antes de sobrescrever\n"
 "  -i, --interactive            pergunta antes de sobrescrever\n"
 
-#: src/mv.c:307
+#: src/mv.c:309
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
@@ -6500,7 +6613,8 @@ msgstr ""
 "  -S, --suffix=SUFIXO          redefine o sufixo costumeiro de cópia de\n"
 "                                 segurança\n"
 
-#: src/mv.c:312
+#: src/mv.c:314
+#, fuzzy
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
 "DIRECTORY\n"
@@ -6509,6 +6623,8 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
 "  -t, --target-directory=DIR   move todos os argumentos ORIGEM para o\n"
 "                                 diretório DIR\n"
@@ -6820,95 +6936,90 @@ msgid "%s: invalid number to ignore"
 msgstr "%s: número inválido de linhas"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
 msgstr ""
 
-#: src/numfmt.c:676
+#: src/numfmt.c:659
 #, fuzzy, c-format
-msgid "value too large to be converted: '%s'"
+msgid "value too large to be converted: %s"
 msgstr "%s: valor não foi convertido totalmente"
 
-#: src/numfmt.c:680
+#: src/numfmt.c:663
 #, fuzzy, c-format
-msgid "invalid number: '%s'"
+msgid "invalid number: %s"
 msgstr "número inválido %s"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
+msgid "rejecting suffix in input: %s (consider using --from)"
 msgstr ""
 
-#: src/numfmt.c:688
+#: src/numfmt.c:671
 #, fuzzy, c-format
-msgid "invalid suffix in input: '%s'"
+msgid "invalid suffix in input: %s"
 msgstr "sufixo inválido no argumento para %s%s: \"%s\""
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
 msgstr ""
 
-#: src/numfmt.c:723
+#: src/numfmt.c:722 src/numfmt.c:768
 #, fuzzy, c-format
 msgid "failed to prepare value '%Lf' for printing"
 msgstr "%s: falhou em abrir para escrita"
 
-#: src/numfmt.c:787
+#: src/numfmt.c:791
 #, fuzzy, c-format
-msgid "invalid unit size: '%s'"
+msgid "invalid unit size: %s"
 msgstr "tamanho inválido de tabulação: %s"
 
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
-#, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr ""
-
-#: src/numfmt.c:813
+#: src/numfmt.c:814
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
 msgstr "Uso: %s [OPÇÃO]... [USU�RIO]...\n"
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
 msgstr ""
 
-#: src/numfmt.c:820
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
 msgstr ""
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
 msgstr ""
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
 "                         see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr ""
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
@@ -6916,19 +7027,19 @@ msgid ""
 "locale)\n"
 msgstr ""
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
 msgstr ""
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
 msgstr ""
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -6938,30 +7049,30 @@ msgid ""
 "                         is found\n"
 msgstr ""
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
 "nearest\n"
 msgstr ""
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
 msgstr ""
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr ""
 
-#: src/numfmt.c:877
+#: src/numfmt.c:878
 #, fuzzy
 msgid ""
 "\n"
@@ -6970,11 +7081,11 @@ msgstr ""
 "Opções de ordenação:\n"
 "\n"
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr ""
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -6983,7 +7094,7 @@ msgid ""
 "               1Mi = 1048576,\n"
 msgstr ""
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
@@ -6991,7 +7102,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
@@ -6999,7 +7110,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
@@ -7007,18 +7118,18 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:905
+#: src/numfmt.c:906
 #, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -7030,7 +7141,7 @@ msgid ""
 "errors are not diagnosed and the exit status is 0.\n"
 msgstr ""
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -7051,112 +7162,112 @@ msgid ""
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 msgstr ""
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, fuzzy, c-format
 msgid "format %s has no %% directive"
 msgstr "o alvo %s não é um diretório"
 
-#: src/numfmt.c:990
+#: src/numfmt.c:1003
 #, fuzzy, c-format
 msgid "invalid format %s (width overflow)"
 msgstr "largura inválida do formato"
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr ""
+
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr ""
 
-#: src/numfmt.c:1010
+#: src/numfmt.c:1030
 #, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
 msgstr ""
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr ""
 
-#: src/numfmt.c:1070
+#: src/numfmt.c:1081
 #, fuzzy, c-format
-msgid "invalid suffix in input '%s': '%s'"
+msgid "invalid suffix in input %s: %s"
 msgstr "sufixo inválido no argumento para %s%s: \"%s\""
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
 msgstr ""
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
 msgstr ""
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
+msgid "large input value %s: possible precision loss"
 msgstr ""
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
 
-#: src/numfmt.c:1388
+#: src/numfmt.c:1403
 #, fuzzy, c-format
-msgid "invalid padding value '%s'"
+msgid "invalid padding value %s"
 msgstr "intervalo inválido de página %s"
 
-#: src/numfmt.c:1401
+#: src/numfmt.c:1417
 #, fuzzy, c-format
-msgid "invalid field value '%s'"
+msgid "invalid field value %s"
 msgstr "número inválido de campo: %s"
 
-#: src/numfmt.c:1430
+#: src/numfmt.c:1447
 #, fuzzy, c-format
-msgid "invalid header value '%s'"
+msgid "invalid header value %s"
 msgstr "data inválida %s"
 
-#: src/numfmt.c:1456
+#: src/numfmt.c:1473
 #, fuzzy, c-format
 msgid "--grouping cannot be combined with --format"
 msgstr "Operandos tipo arquivo não podem ser combinados com --files0-from."
 
-#: src/numfmt.c:1458
-#, fuzzy, c-format
-msgid "--padding cannot be combined with --format"
-msgstr "Operandos tipo arquivo não podem ser combinados com --files0-from."
-
-#: src/numfmt.c:1463
+#: src/numfmt.c:1478
 #, fuzzy, c-format
 msgid "no conversion option specified"
 msgstr "foram especificadas múltiplas opções -i"
 
-#: src/numfmt.c:1471
+#: src/numfmt.c:1486
 #, fuzzy, c-format
 msgid "grouping cannot be combined with --to"
 msgstr "Operandos tipo arquivo não podem ser combinados com --files0-from."
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
 msgstr ""
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
 msgstr ""
 
-#: src/numfmt.c:1511
+#: src/numfmt.c:1526
 #, fuzzy, c-format
 msgid "error reading input"
 msgstr "erro lendo %s"
 
-#: src/numfmt.c:1520
+#: src/numfmt.c:1535
 #, fuzzy, c-format
 msgid "failed to convert some of the input numbers"
 msgstr "falhou em redirecionar o erro padrão"
 
-#: src/od.c:294
+#: src/od.c:320
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -7169,7 +7280,7 @@ msgstr ""
 " ou: %s --traditional [OPÇÃO]... [ARQUIVO] [[+]DESLOCAMENTO[.][b] [+][RÓTULO]"
 "[.][b]]\n"
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -7185,7 +7296,7 @@ msgstr ""
 "Se ARQUIVO não for especificado ou for -, lê a entrada padrão.\n"
 "\n"
 
-#: src/od.c:307
+#: src/od.c:333
 #, fuzzy
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
@@ -7209,27 +7320,25 @@ msgstr ""
 "hexadecimal;\n"
 "sufixos possíveis são . para octal e b para multiplicação por 512.\n"
 
-#: src/od.c:318
-#, fuzzy
+#: src/od.c:344
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
-"  -A, --address-radix=BASE    decide como o deslocamento do arquivo é "
-"exibido\n"
-"  -j, --skip-bytes=QTD        pula os primeiros QTD bytes de entrada\n"
 
-#: src/od.c:323
+#: src/od.c:350
 #, fuzzy
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
@@ -7241,7 +7350,7 @@ msgstr ""
 "  -w, --width[=QTD]           emite QTD bytes por linha de saída\n"
 "      --traditional           aceita argumentos na forma tradicional\n"
 
-#: src/od.c:336
+#: src/od.c:363
 #, fuzzy
 msgid ""
 "\n"
@@ -7249,7 +7358,7 @@ msgid ""
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 "\n"
@@ -7263,7 +7372,7 @@ msgstr ""
 "         invertida\n"
 "  -d   o mesmo que -t u2, seleciona decimais sem sinal de 2-bytes\n"
 
-#: src/od.c:345
+#: src/od.c:372
 msgid ""
 "  -f   same as -t fF, select floats\n"
 "  -i   same as -t dI, select decimal ints\n"
@@ -7279,14 +7388,14 @@ msgstr ""
 "  -s   o mesmo que -t d2, seleciona números em decimal de 2 bytes\n"
 "  -x   o mesmo que -t x2, seleciona números em hexadecimal de 2 bytes\n"
 
-#: src/od.c:353
+#: src/od.c:380
 #, fuzzy
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 "\n"
 "TIPO é constituído de uma ou mais destas especificações:\n"
@@ -7294,7 +7403,7 @@ msgstr ""
 "  a          caractere com nome, ignorando o bit mais significativo\n"
 "  c          caractere ASCII ou escape por barra invertida\n"
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -7308,7 +7417,7 @@ msgstr ""
 "  u[TAM]     decimal sem sinal (natural), TAM bytes por número\n"
 "  x[TAM]     hexadecimal, TAM bytes por número\n"
 
-#: src/od.c:367
+#: src/od.c:394
 #, fuzzy
 msgid ""
 "\n"
@@ -7318,8 +7427,8 @@ msgid ""
 "for sizeof(double) or L for sizeof(long double).\n"
 msgstr ""
 "\n"
-"TAM é um número. Se TIPO é um dos \"doux\", TAM pode ser C para sizeof"
-"(char),\n"
+"TAM é um número. Se TIPO é um dos \"doux\", TAM pode ser C para "
+"sizeof(char),\n"
 "S para sizeof(short), I para sizeof(int), ou L para sizeof(long). Se TIPO "
 "for\n"
 "f, TAM também pode ser F para sizeof(float), D para sizeof(double) ou L "
@@ -7328,14 +7437,14 @@ msgstr ""
 "de\n"
 "programação C que indica o número de bytes para o tipo de variável.\n"
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
 "each output line.\n"
 msgstr ""
 
-#: src/od.c:379
+#: src/od.c:406
 #, fuzzy
 msgid ""
 "\n"
@@ -7353,12 +7462,12 @@ msgstr ""
 "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
 "GB 1000*1000*1000, G 1024*1024*1024, e assim por diante com T, P, E, Z, Y.\n"
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, c-format
 msgid "invalid type string %s"
 msgstr "texto de tipo inválido %s"
 
-#: src/od.c:649
+#: src/od.c:690
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7367,7 +7476,7 @@ msgstr ""
 "texto de tipo inválido %s;\n"
 "este sistema não provê um tipo de inteiro com %lu-bytes"
 
-#: src/od.c:770
+#: src/od.c:811
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7376,39 +7485,39 @@ msgstr ""
 "texto de tipo inválido %s;\n"
 "este sistema não provê um tipo de ponto-flutuante com %lu-bytes"
 
-#: src/od.c:828
+#: src/od.c:869
 #, fuzzy, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr "caractere inválido \"%c\" no texto de tipo %s"
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr "é impossível acessar além da entrada combinada"
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, fuzzy, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr ""
 "base numérica inválida de endereço de saída \"%c\"; deve ser um dos "
 "caracteres [doxn]"
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr "não se pode especificar um tipo ao despejar textos"
 
-#: src/od.c:1810
+#: src/od.c:1863
 #, fuzzy
 msgid "compatibility mode supports at most one file"
 msgstr "Em modo de compatibilidade só há suporte a um arquivo no máximo."
 
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr "bytes-a-pular + bytes-a-ler é um valor muito grande"
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr "aviso: largura %lu inválida; será usada %d em seu lugar"
@@ -7577,12 +7686,12 @@ msgstr "Quando"
 msgid "Where"
 msgstr "Onde"
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr "Uso: %s [OPÇÃO]... [USU�RIO]...\n"
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -7592,8 +7701,8 @@ msgid ""
 "  -s              do short format output, this is the default\n"
 msgstr ""
 "\n"
-"  -l              produz uma saída de formatação longa sobre o(s) USU�RIO"
-"(s)\n"
+"  -l              produz uma saída de formatação longa sobre o(s) "
+"USU�RIO(s)\n"
 "  -b              omite o diretório pessoal do usuário e o shell em "
 "formatação\n"
 "                    longa\n"
@@ -7601,7 +7710,7 @@ msgstr ""
 "  -p              omite o arquivo de plano do usuário em formatação longa\n"
 "  -s              produz uma saída de formatação curta; este é o padrão\n"
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -7618,7 +7727,7 @@ msgstr ""
 "tempo\n"
 "                    ocioso em formatação curta\n"
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -7629,7 +7738,7 @@ msgstr ""
 "Um programa \"finger\" mais leve; emite as informações do usuário.\n"
 "O arquivo utmp será %s.\n"
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr ""
@@ -7868,7 +7977,8 @@ msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
@@ -7881,7 +7991,7 @@ msgstr ""
 "                      as 3 opções de colunas (-COLUNA|-a COLUNA|-m), exceto\n"
 "                      quando -w estiver definida\n"
 
-#: src/pr.c:2827
+#: src/pr.c:2828
 #, fuzzy
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
@@ -7898,7 +8008,7 @@ msgstr ""
 "                      nas opções de coluna\n"
 "  -t, --omit-header  omite os cabeçalho e rodapés de páginas\n"
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 #, fuzzy
 msgid ""
 "  -T, --omit-pagination\n"
@@ -7922,11 +8032,11 @@ msgstr ""
 "  -w LARGURA_P�G, --width=LARGURA_P�G\n"
 "                    define a largura da página como LARGURA_P�G (72) "
 "caracteres\n"
-"                      para saída em múltiplas colunas de texto, -s"
-"[CARACTERE]\n"
+"                      para saída em múltiplas colunas de texto, -"
+"s[CARACTERE]\n"
 "                      desativa (72)\n"
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 #, fuzzy
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
@@ -7941,7 +8051,7 @@ msgstr ""
 "                      sempre, trunca linhas, exceto se a opção -J estiver\n"
 "                      definida; nenhuma interferência com -S ou -s\n"
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 #, fuzzy
 msgid ""
 "\n"
@@ -7967,7 +8077,7 @@ msgstr ""
 
 #: src/printenv.c:69
 #, fuzzy
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr ""
 "  -z, --zero-terminated     termina linhas com byte 0, e não com \"nova-linha"
 "\"\n"
@@ -8093,12 +8203,12 @@ msgstr "aviso: ignorando argumentos em excesso, começando com %s"
 msgid "F. Pinard"
 msgstr "François Pinard"
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, c-format
 msgid "%s (for regexp %s)"
 msgstr "%s (para expressão regular %s)"
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
@@ -8107,7 +8217,7 @@ msgstr ""
 "Uso: %s [OPÇÃO]... [ENTRADA]...   (sem a opção -G)\n"
 " ou: %s -G [OPÇÃO]... [ENTRADA [SA�DA]]\n"
 
-#: src/ptx.c:1821
+#: src/ptx.c:1824
 #, fuzzy
 msgid ""
 "Output a permuted index, including context, of the words in the input "
@@ -8118,7 +8228,7 @@ msgstr ""
 "entrada.\n"
 "\n"
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 #, fuzzy
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
@@ -8132,7 +8242,7 @@ msgstr ""
 "  -F, --flag-truncation=TEXTO    usa TEXTO para sinalizar truncamento de "
 "linha\n"
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 #, fuzzy
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
@@ -8148,7 +8258,7 @@ msgstr ""
 "  -S, --sentence-regexp=EXPREG   para fim de linhas ou de sentenças\n"
 "  -T, --format=tex               gera saída como diretivas TeX\n"
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -8169,7 +8279,7 @@ msgstr ""
 "  -o, --only-file=ARQUIVO        lê somente a lista de palavras deste "
 "ARQUIVO\n"
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -8182,17 +8292,16 @@ msgstr ""
 "  -w, --width=NÚMERO             a largura de saída em colunas, referências\n"
 "                                   excluídas\n"
 
-#: src/ptx.c:1854
+#: src/ptx.c:1857
 #, fuzzy
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
 "\n"
-"Se ARQUIVO não for fornecido ou se for -, lê a entrada padrão.\n"
-"\"-F /\" por padrão.\n"
+"Se ARQUIVO não for especificado ou for -, lê a entrada padrão.\n"
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, c-format
 msgid "invalid gap width: %s"
 msgstr "largura inválida de espaçamento: %s"
@@ -8211,23 +8320,29 @@ msgid ""
 "  -P, --physical  avoid all symlinks\n"
 msgstr ""
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+
+#: src/pwd.c:169
 #, c-format
 msgid "failed to chdir to %s"
 msgstr "falhou em mudar para o diretório %s"
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, c-format
 msgid "failed to stat %s"
 msgstr "falhou em obter o estado de %s"
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr ""
 "não pôde encontrar a entrada de diretório em %s coincidente com o i-node"
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, c-format
 msgid "ignoring non-option arguments"
 msgstr "ignorando argumentos que não são opções"
@@ -8237,8 +8352,8 @@ msgstr "ignorando argumentos que não são opções"
 msgid "Dmitry V. Levin"
 msgstr "Dmitry V. Levin"
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Uso: %s [OPÇÃO]... ARQUIVO...\n"
@@ -8287,8 +8402,7 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 "  -m, --canonicalize-missing    coloca na forma canônica interpretando toda\n"
 "                                  ligação simbólica em cada componente do "
@@ -8322,7 +8436,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 
@@ -8340,41 +8454,42 @@ msgstr "%s: entrar no diretório protegido contra escrita %s? "
 msgid "%s: descend into directory %s? "
 msgstr "%s: entrar no diretório %s? "
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr "%s: remover %s %s protegido contra escrita? "
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, c-format
 msgid "%s: remove %s %s? "
 msgstr "%s: remover %s %s? "
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, c-format
 msgid "removed directory: %s\n"
 msgstr "removeu o diretório: %s\n"
 
-#: src/remove.c:444
+#: src/remove.c:447
 #, fuzzy, c-format
-msgid "cannot remove directory: %s"
-msgstr "não foi possível remover o diretório %s"
+msgid "refusing to remove %s or %s directory: skipping %s"
+msgstr "falhou em remover o diretório %s"
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr "ignorando %s, já que está em um dispositivo diferente"
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, fuzzy, c-format
 msgid "traversal failed: %s"
 msgstr "falhou na leitura"
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -8401,15 +8516,16 @@ msgstr ""
 "  -i                    questiona antes de cada remoção\n"
 
 #: src/rm.c:142
+#, fuzzy
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 "  -I                    questiona uma vez antes de remover mais que três\n"
 "                          arquivos ou ao remover recursivamente.\n"
@@ -8487,14 +8603,18 @@ msgstr ""
 "de fato irrecuperável, considere usar shred.\n"
 
 #: src/rm.c:342
-#, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr "%s: remover todos os argumentos recursivamente? "
+#, fuzzy, c-format
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] "%s: remover todos os argumentos recursivamente? "
+msgstr[1] "%s: remover todos os argumentos recursivamente? "
 
-#: src/rm.c:343
-#, c-format
-msgid "%s: remove all arguments? "
-msgstr "%s: remover todos os argumentos? "
+#: src/rm.c:345
+#, fuzzy, c-format
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] "%s: remover todos os argumentos? "
+msgstr[1] "%s: remover todos os argumentos? "
 
 #: src/rmdir.c:134 src/rmdir.c:233
 #, c-format
@@ -8548,7 +8668,7 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
 
@@ -8610,41 +8730,46 @@ msgstr "você deve especificar -c, -t, -u, -l, -r ou contexto"
 msgid "no command specified"
 msgstr "nenhum comando foi especificado"
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, fuzzy, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr "runcon só pode ser usado em um Kernel SELinux"
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, c-format
 msgid "failed to compute a new context"
 msgstr "falhou em computar o novo contexto"
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, c-format
 msgid "failed to set new user %s"
 msgstr "falhou em definir o novo usuário %s"
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, c-format
 msgid "failed to set new type %s"
 msgstr "falhou em definir o novo tipo %s"
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, c-format
 msgid "failed to set new range %s"
 msgstr "falhou em definir a nova faixa %s"
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, c-format
 msgid "failed to set new role %s"
 msgstr "falhou em definir a nova regra %s"
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, c-format
 msgid "unable to set security context %s"
 msgstr "incapaz de definir o contexto de segurança %s"
 
+#: src/selinux.c:127 src/selinux.c:300
+#, fuzzy, c-format
+msgid "error canonicalizing %s"
+msgstr "falhou em abrir %s"
+
 #: src/seq.c:68
 #, c-format
 msgid ""
@@ -8676,10 +8801,13 @@ msgstr ""
 "esquerda\n"
 
 #: src/seq.c:86
+#, fuzzy
 msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
@@ -8692,7 +8820,7 @@ msgstr ""
 "INCREMENTO normalmente é positivo se PRIMEIRO for menor que ÚLTIMO, e\n"
 "negativo caso contrário.\n"
 
-#: src/seq.c:94
+#: src/seq.c:96
 #, fuzzy
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
@@ -8705,92 +8833,29 @@ msgstr ""
 "forem números decimais de ponto fixo com precisão máxima PREC, e é %g caso\n"
 "contrário.\n"
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, c-format
 msgid "invalid floating point argument: %s"
 msgstr "argumento inválido de ponto flutuante: %s"
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, fuzzy, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr "%s tem um tipo desconhecido de arquivo"
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr ""
 "o texto de formatação não pode ser especificado quando escrevendo textos de "
 "larguras iguais"
 
-#: src/setuidgid.c:49
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-"Uso: %s OPÇÃO USU�RIO COMANDO [ARGUMENTO]...\n"
-" ou: %s OPÇÃO\n"
-
-#: src/setuidgid.c:55
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-"Descarta quaisquer grupos suplementares, assume a ID de usuário e de grupo "
-"do\n"
-"USU�RIO especificado (ID numérica ou nome de usuário) e executa COMANDO com\n"
-"os ARGUMENTOs especificados.\n"
-"Sai com o estado 111 se for incapaz de assumir a ID de usuário e de grupo\n"
-"solicitada. Em caso contrário, sai com o estado de saída de COMANDO.\n"
-"Este programa só é útil quando executado pelo super-usuário (ID de usuário "
-"0).\n"
-"\n"
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-"  -g GID[,GID1...]  também define a ID primária de grupo para GID e, se\n"
-"                      se especificadas, as IDs suplementares para GID1, ...\n"
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr "ID desconhecida do usuário: %s"
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr "para usar a ID do usuário %s, você precisa usar -g também"
-
-#: src/setuidgid.c:190
-#, c-format
-msgid "failed to set supplemental group(s)"
-msgstr "falhou em estabelecer grupo(s) suplementar(es)"
-
-#: src/setuidgid.c:200
-#, c-format
-msgid "cannot set group-ID to %lu"
-msgstr "não foi possível estabelecer ID de grupo para %lu"
-
-#: src/setuidgid.c:204
-#, c-format
-msgid "cannot set user-ID to %lu"
-msgstr "não foi possível estabelecer ID de usuário para %lu"
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr "Colin Plumb"
 
-#: src/shred.c:148
+#: src/shred.c:170
 #, fuzzy
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
@@ -8802,7 +8867,7 @@ msgstr ""
 "Esse procedimento também é chamado de formatação física.\n"
 "\n"
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, fuzzy, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -8818,9 +8883,10 @@ msgstr ""
 "K,\n"
 "                   M e G)\n"
 
-#: src/shred.c:161
+#: src/shred.c:183
+#, fuzzy
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
@@ -8834,15 +8900,20 @@ msgstr ""
 "formatação\n"
 "                   física\n"
 
-#: src/shred.c:170
+#: src/shred.c:192
+#, fuzzy
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 "\n"
@@ -8856,7 +8927,7 @@ msgstr ""
 "a maioria das pessoas usam a opção --remove.\n"
 "\n"
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -8875,7 +8946,7 @@ msgstr ""
 "do sistema de arquivos:\n"
 "\n"
 
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -8896,7 +8967,7 @@ msgstr ""
 " Appliance's NFS\n"
 "\n"
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -8911,7 +8982,7 @@ msgstr ""
 "* sistemas de arquivos comprimidos\n"
 "\n"
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -8933,7 +9004,7 @@ msgstr ""
 "arquivo /etc/fstab como documentado no manual de mount (man mount).\n"
 "\n"
 
-#: src/shred.c:215
+#: src/shred.c:241
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
 "of the file that cannot be removed, and that will allow a shredded file\n"
@@ -8944,129 +9015,129 @@ msgstr ""
 "conter cópias do arquivo que não são possíveis de serem removidos e que\n"
 "permitirá um arquivo formatado fisicamente ser recuperado mais tarde.\n"
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, c-format
 msgid "%s: fdatasync failed"
 msgstr "%s: \"fdatasync\" falhou"
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr "%s: \"fsync\" falhou"
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr "%s: não foi possível voltar ao início"
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr "%s: passagem %lu/%lu (%s)..."
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, c-format
 msgid "%s: error writing at offset %s"
 msgstr "%s: erro escrevendo na posição %s"
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s: \"lseek\" falhou"
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, c-format
 msgid "%s: file too large"
 msgstr "%s: arquivo muito grande"
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr "%s: passagem %lu/%lu (%s)...%s"
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr "%s: passagem %lu/%lu (%s)...%s/%s %d%%"
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, c-format
 msgid "%s: fstat failed"
 msgstr "%s: \"fstat\" falhou"
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, c-format
 msgid "%s: invalid file type"
 msgstr "%s: tipo inválido de arquivo"
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr "%s: arquivo tem tamanho negativo"
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, c-format
 msgid "%s: error truncating"
 msgstr "%s: erro ao truncar"
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, c-format
 msgid "%s: fcntl failed"
 msgstr "%s: \"fcntl\" falhou"
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr ""
 "%s: é impossível formatar fisicamente um descritor de arquivo \"apenas-anexa"
 "\" (\"append-only\")"
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr "%s: removendo"
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, c-format
 msgid "%s: renamed to %s"
 msgstr "%s: renomeado como %s"
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, c-format
 msgid "%s: failed to remove"
 msgstr "%s: falhou em remover"
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr "%s: removido"
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, c-format
 msgid "%s: failed to close"
 msgstr "%s: falhou em fechar"
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, c-format
 msgid "%s: failed to open for writing"
 msgstr "%s: falhou em abrir para escrita"
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, c-format
 msgid "%s: invalid number of passes"
 msgstr "%s: número inválido de passagens"
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, c-format
 msgid "multiple random sources specified"
 msgstr "foram especificadas múltiplas fontes de aleatoriedade"
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, c-format
 msgid "%s: invalid file size"
 msgstr "%s: tamanho inválido de arquivo"
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -9077,14 +9148,14 @@ msgstr ""
 " ou: %s -e [OPÇÃO]... [ARGUMENTO]...\n"
 " ou: %s -i MENOR-MAIOR [OPÇÃO]...\n"
 
-#: src/shuf.c:54
+#: src/shuf.c:67
 #, fuzzy
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr ""
 "Escreve uma permutação aleatória das linhas de entrada para a saída padrão.\n"
 "\n"
 
-#: src/shuf.c:60
+#: src/shuf.c:73
 #, fuzzy
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
@@ -9093,7 +9164,7 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
 msgstr ""
 "  -e, --echo                trata cada ARGUMENTO como uma linha de entrada\n"
 "  -i, --input-range=MENOR-MAIOR  trata desde o número MENOR ao MAIOR como\n"
@@ -9107,31 +9178,41 @@ msgstr ""
 "  -z, --zero-terminated     termina as linhas com byte 0, e não com nova-"
 "linha\n"
 
-#: src/shuf.c:244
+#: src/shuf.c:228
+#, fuzzy, c-format
+msgid "too many input lines"
+msgstr "muitas linhas repetidas"
+
+#: src/shuf.c:431
 #, c-format
 msgid "multiple -i options specified"
 msgstr "foram especificadas múltiplas opções -i"
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, c-format
 msgid "invalid input range %s"
 msgstr "intervalo inválido de entrada %s"
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, c-format
 msgid "invalid line count %s"
 msgstr "quantidade inválida de linhas %s"
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, c-format
 msgid "multiple output files specified"
 msgstr "foram especificados múltiplos arquivos de saída"
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, c-format
 msgid "cannot combine -e and -i options"
 msgstr "é impossível combinar as opções -e e -i"
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr ""
+
 #: src/sleep.c:44
 #, fuzzy, c-format
 msgid ""
@@ -9156,24 +9237,24 @@ msgstr ""
 "obtida pela soma de seus valores.\n"
 "\n"
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, c-format
 msgid "invalid time interval %s"
 msgstr "intervalo inválido de tempo %s"
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr "não foi possível ler relógio de tempo real"
 
-#: src/sort.c:399
+#: src/sort.c:427
 #, fuzzy
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr ""
 "Escreve de forma ordenada a concatenação do(s) ARQUIVO(s) na saída padrão.\n"
 "\n"
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
@@ -9181,7 +9262,7 @@ msgstr ""
 "Opções de ordenação:\n"
 "\n"
 
-#: src/sort.c:409
+#: src/sort.c:437
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
 "  -d, --dictionary-order      consider only blanks and alphanumeric "
@@ -9194,19 +9275,19 @@ msgstr ""
 "  -f, --ignore-case           ignora diferença entre maiúsculas e "
 "minúsculas\n"
 
-#: src/sort.c:415
+#: src/sort.c:443
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
 "  -i, --ignore-nonprinting    consider only printable characters\n"
 "  -M, --month-sort            compare (unknown) < 'JAN' < ... < 'DEC'\n"
 msgstr ""
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 
-#: src/sort.c:423
+#: src/sort.c:451
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
 "  -R, --random-sort           sort by random hash of keys\n"
@@ -9214,7 +9295,7 @@ msgid ""
 "  -r, --reverse               reverse the result of comparisons\n"
 msgstr ""
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -9224,7 +9305,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/sort.c:437
+#: src/sort.c:465
 #, fuzzy
 msgid ""
 "Other options:\n"
@@ -9233,13 +9314,13 @@ msgstr ""
 "Opções de ordenação:\n"
 "\n"
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
 msgstr ""
 
-#: src/sort.c:445
+#: src/sort.c:473
 #, fuzzy
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
@@ -9261,7 +9342,7 @@ msgstr ""
 "                              (origem é 1)\n"
 "  -m, --merge               mescla os arquivos já ordenados; não ordena\n"
 
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -9270,13 +9351,13 @@ msgid ""
 "                            If F is - then read names from standard input\n"
 msgstr ""
 
-#: src/sort.c:459
+#: src/sort.c:487
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
 "  -m, --merge               merge already sorted files; do not sort\n"
 msgstr ""
 
-#: src/sort.c:463
+#: src/sort.c:491
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "  -s, --stable              stabilize sort by disabling last-resort "
@@ -9291,7 +9372,7 @@ msgstr ""
 "  -S, --buffer-size=TAM     usa TAManho para o \"buffer\" de memória "
 "principal\n"
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, fuzzy, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -9315,13 +9396,7 @@ msgstr ""
 "                              sem -c, emite apenas a primeira linha de uma\n"
 "                              seqüência repetida\n"
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr ""
-"  -z, --zero-terminated     termina linhas com byte 0, e não com \"nova-linha"
-"\"\n"
-
-#: src/sort.c:483
+#: src/sort.c:511
 #, fuzzy
 msgid ""
 "\n"
@@ -9353,7 +9428,7 @@ msgstr ""
 "\n"
 "TAMANHO pode ser seguido pelos seguintes sufixos multiplicadores:\n"
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -9376,258 +9451,243 @@ msgstr ""
 "de\n"
 "bytes.\n"
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, c-format
 msgid "waiting for %s [-d]"
 msgstr "escrevendo em %s [-d]"
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr "%s [-d] terminado anormalmente"
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, fuzzy, c-format
 msgid "cannot create temporary file in %s"
 msgstr "não foi possível criar arquivo temporário %s"
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr "erro abrindo arquivo"
 
-#: src/sort.c:970
+#: src/sort.c:998
 msgid "fflush failed"
 msgstr "erro liberando dados no arquivo (\"fflush\")"
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr "erro fechando arquivo"
 
-#: src/sort.c:986
-#, c-format
-msgid "dup2 failed"
-msgstr "erro na duplicação de descritor de arquivo (\"dup2\")"
-
-#: src/sort.c:1103
-#, c-format
-msgid "couldn't execute %s"
-msgstr "não pôde executar %s"
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 msgid "couldn't create temporary file"
 msgstr "não pôde criar arquivo temporário"
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, c-format
 msgid "couldn't create process for %s -d"
 msgstr "não pôde criar processo para %s -d"
 
-#: src/sort.c:1161
-#, c-format
-msgid "couldn't execute %s -d"
-msgstr "não pôde executar %s -d"
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, c-format
 msgid "warning: cannot remove: %s"
 msgstr "aviso: não foi possível remover: %s"
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, fuzzy, c-format
 msgid "invalid --%s argument %s"
 msgstr "argumento inválido %s"
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, fuzzy, c-format
 msgid "minimum --%s argument is %s"
 msgstr "argumento inválido para %s%s: \"%s\""
 
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, fuzzy, c-format
 msgid "--%s argument %s too large"
 msgstr "%s%s: argumento \"%s\" muito grande"
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr ""
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr ""
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr "falhou no \"stat\""
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr "falhou na leitura"
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, c-format
 msgid "string transformation failed"
 msgstr "a transformação do texto falhou"
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, fuzzy, c-format
 msgid "the untransformed string was %s"
 msgstr "O texto não transformado era %s."
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr ""
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr ""
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr ""
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr ""
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr ""
 
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, fuzzy, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
 msgstr[0] "%s: a opção \"%s\" está ambígua\n"
 msgstr[1] "%s: a opção \"%s\" está ambígua\n"
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr ""
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr "erro de escrita"
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr "%s: %s:%s: desordenado: "
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr "erro padrão"
 
-#: src/sort.c:3698
+#: src/sort.c:3738
 #, fuzzy
 msgid "cannot read"
 msgstr "%s: não foi possível voltar ao início"
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, c-format
 msgid "%s: invalid field specification %s"
 msgstr "%s: especificação inválida de campo %s"
 
-#: src/sort.c:3987
+#: src/sort.c:4028
 #, fuzzy, c-format
 msgid "options '-%s' are incompatible"
 msgstr "as opções \"-%s\" são incompatíveis"
 
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, c-format
 msgid "%s: invalid count at start of %s"
 msgstr "%s: contagem inválida no início de %s"
 
-#: src/sort.c:4295
+#: src/sort.c:4336
 #, fuzzy
 msgid "invalid number after '-'"
 msgstr "número inválido após \"-\""
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 #, fuzzy
 msgid "invalid number after '.'"
 msgstr "número inválido após \".\""
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr "caractere no lugar errado no campo spec"
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, c-format
 msgid "multiple compress programs specified"
 msgstr "foram especificados múltiplos programas de compressão"
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
 msgstr "número inválido no início do campo"
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
 msgstr "o número do campo é zero"
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr "o deslocamento de caracteres é zero"
 
-#: src/sort.c:4407
+#: src/sort.c:4448
 #, fuzzy
 msgid "invalid number after ','"
 msgstr "número inválido após \",\""
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr "tabulação vazia"
 
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, c-format
 msgid "cannot read file names from %s"
 msgstr "não foi possível ler nomes de arquivos de %s"
 
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, fuzzy, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr "é inválido um nome de arquivo de comprimento nulo"
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, fuzzy, c-format
 msgid "no input from %s"
 msgstr "fechando arquivo de entrada %s"
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr ""
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr ""
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr "operando extra %s não é permitido com -%c"
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr ""
 
-#: src/split.c:204
+#: src/split.c:203
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr "Uso: %s [OPÇÃO] [ENTRADA [PREFIXO]]\n"
 
-#: src/split.c:208
+#: src/split.c:207
 #, fuzzy
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
@@ -9641,26 +9701,25 @@ msgstr ""
 "for especificada ou for -, lê a entrada padrão.\n"
 "\n"
 
-#: src/split.c:216
+#: src/split.c:215
 #, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
 
-#: src/split.c:229
+#: src/split.c:228
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
 "                            output file is opened\n"
@@ -9668,7 +9727,7 @@ msgstr ""
 "      --verbose           mostra um diagnóstico logo antes de abrir cada\n"
 "                            arquivo de saída\n"
 
-#: src/split.c:236
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -9680,189 +9739,189 @@ msgid ""
 "r/K/N   likewise but only output Kth of N to stdout\n"
 msgstr ""
 
-#: src/split.c:354
+#: src/split.c:353
 #, fuzzy, c-format
 msgid "output file suffixes exhausted"
 msgstr "Esgotaram-se os sufixos de arquivos de saída"
 
-#: src/split.c:366
+#: src/split.c:365
 #, c-format
 msgid "creating file %s\n"
 msgstr "criando arquivo %s\n"
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr ""
 
-#: src/split.c:391
+#: src/split.c:390
 #, fuzzy, c-format
 msgid "failed to set FILE environment variable"
 msgstr "falhou em definir o contexto de segurança de %s para %s"
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr ""
 
-#: src/split.c:395
+#: src/split.c:394
 #, fuzzy, c-format
 msgid "failed to create pipe"
 msgstr "não foi possível criar ligação absoluta %s para %s"
 
-#: src/split.c:409
+#: src/split.c:408
 #, fuzzy, c-format
 msgid "closing prior pipe"
 msgstr "fechando o diretório %s"
 
-#: src/split.c:411
+#: src/split.c:410
 #, fuzzy, c-format
 msgid "closing output pipe"
 msgstr "fechando arquivo de saída %s"
 
-#: src/split.c:415
+#: src/split.c:414
 #, fuzzy, c-format
 msgid "moving input pipe"
 msgstr "fechando arquivo de entrada %s"
 
-#: src/split.c:417
+#: src/split.c:416
 #, fuzzy, c-format
 msgid "closing input pipe"
 msgstr "fechando arquivo de entrada %s"
 
-#: src/split.c:422
+#: src/split.c:421
 #, fuzzy, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr "falhou em executar o comando %s"
 
-#: src/split.c:428
+#: src/split.c:427
 #, fuzzy, c-format
 msgid "failed to close input pipe"
 msgstr "falhou em fechar o diretório %s"
 
-#: src/split.c:464
+#: src/split.c:463
 #, fuzzy, c-format
 msgid "waiting for child process"
 msgstr "esperando por \"strip\""
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr ""
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr ""
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr ""
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr "é impossível subdividir em mais de uma forma"
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, fuzzy, c-format
 msgid "%s: invalid number of chunks"
 msgstr "%s: número inválido de segundos"
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, fuzzy, c-format
 msgid "%s: invalid chunk number"
 msgstr "%s: número inválido"
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr "%s: comprimento inválido de sufixo"
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr "%s: número inválido de bytes"
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr "%s: número inválido de linhas"
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, c-format
 msgid "line count option -%s%c... is too large"
 msgstr "a opção de contagem de linha -%s%c... está muito grande"
 
-#: src/split.c:1248
+#: src/split.c:1298
 #, fuzzy, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr "número inválido para linha inicial: %s"
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, fuzzy, c-format
 msgid "%s: invalid IO block size"
 msgstr "%s: tamanho inválido de arquivo"
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr ""
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr ""
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, fuzzy, c-format
 msgid "%s: cannot determine file size"
 msgstr "não foi possível determinar o nome da máquina"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr "Michael Meskes"
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, fuzzy, c-format
 msgid "failed to canonicalize %s"
 msgstr "falhou em abrir %s"
 
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, fuzzy, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr "aviso: escape desconhecido \"\\%c\""
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, c-format
 msgid "%s: invalid directive"
 msgstr "%s: diretiva inválida"
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, c-format
 msgid "warning: backslash at end of format"
 msgstr "aviso: barra invertida no final da formatação"
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr ""
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, c-format
 msgid "cannot read file system information for %s"
 msgstr "não foi possível ler informações do sistema de arquivos para %s"
 
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, fuzzy, c-format
 msgid "cannot stat standard input"
 msgstr "fechando entrada padrão"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -9873,7 +9932,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -9881,30 +9940,30 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, c-format
 msgid "Context: %C\n"
 msgstr ""
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -9912,11 +9971,11 @@ msgid ""
 " Birth: %w\n"
 msgstr ""
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
 msgstr ""
 
-#: src/stat.c:1356
+#: src/stat.c:1418
 #, fuzzy
 msgid ""
 "  -L, --dereference     follow links\n"
@@ -9928,14 +9987,14 @@ msgstr ""
 "  -f, --file-system     mostra o estado do sistema de arquivos, em vez de o\n"
 "                          estado do arquivo\n"
 
-#: src/stat.c:1360
+#: src/stat.c:1422
 #, fuzzy
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 "  -c  --format=FORMATO  usa o FORMATO especificado, em vez do padrão;\n"
@@ -9946,7 +10005,7 @@ msgstr ""
 "                          Se quiser a nova-linha, inclua \\n no FORMATO.\n"
 "  -t, --terse           emite as informações de forma sucinta\n"
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 #, fuzzy
 msgid ""
 "\n"
@@ -9967,7 +10026,7 @@ msgstr ""
 "  %B   O tamanho em bytes de cada bloco relatado por %b\n"
 "  %C   Texto de contexto de segurança SELinux\n"
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 #, fuzzy
 msgid ""
 "  %d   device number in decimal\n"
@@ -9984,7 +10043,7 @@ msgstr ""
 "  %g   ID de grupo do dono\n"
 "  %G   Nome de grupo do dono\n"
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 #, fuzzy
 msgid ""
 "  %h   number of hard links\n"
@@ -9994,8 +10053,8 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 "  %h   Quantidade de ligações absolutas\n"
 "  %i   Número do inode\n"
@@ -10006,7 +10065,7 @@ msgstr ""
 "  %t   Tipo maior de dispositivo em hexadecimal\n"
 "  %T   Tipo menor de dispositivo em hexadecimal\n"
 
-#: src/stat.c:1399
+#: src/stat.c:1461
 #, fuzzy
 msgid ""
 "  %u   user ID of owner\n"
@@ -10015,10 +10074,10 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 "  %u   ID de usuário do dono\n"
@@ -10031,7 +10090,7 @@ msgstr ""
 "  %Z   Horário da última alteração do estado em segundos desde Epoch\n"
 "\n"
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 #, fuzzy
 msgid ""
 "Valid format sequences for file systems:\n"
@@ -10051,7 +10110,7 @@ msgstr ""
 "  %f   Blocos livres no sistema de arquivos\n"
 "  %C   Texto de contexto de segurança SELinux\n"
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 #, fuzzy
 msgid ""
 "  %i   file system ID in hex\n"
@@ -10120,22 +10179,27 @@ msgid ""
 "and are thus unaffected by 'stdbuf' settings.\n"
 msgstr ""
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, fuzzy, c-format
 msgid "failed to find %s"
 msgstr "falhou em abrir %s"
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, fuzzy, c-format
 msgid "failed to update the environment with %s"
 msgstr "falhou em definir o contexto de segurança de %s para %s"
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr ""
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, fuzzy, c-format
+msgid "you must specify a buffering mode option"
+msgstr "deve-se especificar uma lista de bytes, caracteres ou campos"
+
+#: src/stty.c:516
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -10146,11 +10210,11 @@ msgstr ""
 " ou: %s [-F DISPOSITIVO] [--file=DISPOSITIVO] [-a|--all]\n"
 " ou: %s [-F DISPOSITIVO] [--file=DISPOSITIVO] [-g|--save]\n"
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
 msgstr ""
 
-#: src/stty.c:525
+#: src/stty.c:528
 #, fuzzy
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
@@ -10166,7 +10230,7 @@ msgstr ""
 "  -F, --file=DISPOSIVO  abre e usa o DISPOSItivo especificado em vez da\n"
 "                        entrada padrão\n"
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
@@ -10178,7 +10242,7 @@ msgstr ""
 "determina\n"
 "quais são as características disponíveis.\n"
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -10193,7 +10257,7 @@ msgstr ""
 "   eof CARAC      CARAC enviará um fim-de-arquivo (termina a entrada)\n"
 "   eol CARAC      CARAC terminará a linha\n"
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -10205,7 +10269,7 @@ msgstr ""
 "   intr CARAC    CARAC enviará um sinal de interrupção\n"
 "   kill CARAC    CARAC apagará a linha atual\n"
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -10217,7 +10281,7 @@ msgstr ""
 " * rprnt CARAC   CARAC redesenhará a linha atual\n"
 "   start CARAC   CARAC reiniciará a saída depois de pará-la\n"
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -10229,7 +10293,7 @@ msgstr ""
 " * swtch CARAC    CARAC trocará para uma camada diferente de shell\n"
 " * werase CARAC   CARAC apagará a última palavra digitada\n"
 
-#: src/stty.c:562
+#: src/stty.c:565
 #, fuzzy
 msgid ""
 "\n"
@@ -10244,7 +10308,7 @@ msgstr ""
 " * cols N        informa ao Kernel que o terminal tem N colunas\n"
 " * columns N     o mesmo que cols N\n"
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -10259,7 +10323,7 @@ msgstr ""
 "                   completa\n"
 "   ospeed N      configura a velocidade de saída para N bauds\n"
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -10274,7 +10338,7 @@ msgstr ""
 "décimos\n"
 "                   de segundo\n"
 
-#: src/stty.c:581
+#: src/stty.c:584
 #, fuzzy
 msgid ""
 "\n"
@@ -10292,7 +10356,7 @@ msgstr ""
 " * [-]crtscts    permite negociação RTS/CTS\n"
 "   csN           define o tamanho do caractere para N bits, N em [5..8]\n"
 
-#: src/stty.c:590
+#: src/stty.c:593
 #, fuzzy
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
@@ -10301,6 +10365,7 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 "   [-]cstopb     usa dois bits de parada por caractere (um com \"-\")\n"
 "   [-]hup        envia um sinal de desligar quando o último processo fechar\n"
@@ -10311,7 +10376,7 @@ msgstr ""
 "                   na entrada\n"
 "   [-]parodd     define a paridade como ímpar (par com \"-\")\n"
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -10327,7 +10392,7 @@ msgstr ""
 "   [-]ignbrk     ignora caracteres \"break\"\n"
 "   [-]igncr      ignora retorno de carro\n"
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -10343,13 +10408,13 @@ msgstr ""
 "   [-]istrip     zera o bit mais significativo (8) dos caracteres de "
 "entrada\n"
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr ""
 " * [-]iutf8      assume que os caracteres de entrada estão na codificação "
 "UTF-8\n"
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -10367,7 +10432,7 @@ msgstr ""
 "caractere)\n"
 "   [-]tandem     o mesmo que [-]ixoff\n"
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -10383,10 +10448,11 @@ msgstr ""
 " * ffN           estilo do atraso do caractere de nova-página, N em [0..1]\n"
 " * nlN           estilo do atraso do caractere de nova-linha, N em [0..1]\n"
 
-#: src/stty.c:631
+#: src/stty.c:635
+#, fuzzy
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
@@ -10400,7 +10466,7 @@ msgstr ""
 " * [-]onlcr      traduz nova-linha para retorno de carro-nova-linha\n"
 " * [-]onlret     nova-linha provoca um retorno de carro\n"
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -10416,7 +10482,7 @@ msgstr ""
 " * -tabs         o mesmo que tab3\n"
 " * vtN           estilo do atraso da tabulação vertical, N em [0..1]\n"
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -10434,7 +10500,7 @@ msgstr ""
 "e\n"
 "                   echok\n"
 
-#: src/stty.c:654
+#: src/stty.c:658
 #, fuzzy
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
@@ -10450,7 +10516,7 @@ msgstr ""
 "   [-]echoe      o mesmo que [-]crterase\n"
 "   [-]echok      ecoa uma nova-linha depois de um caractere de \"kill\"\n"
 
-#: src/stty.c:661
+#: src/stty.c:665
 #, fuzzy
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
@@ -10467,7 +10533,7 @@ msgstr ""
 "                   (matar), werase (apagar palavra) e rprnt\n"
 "   [-]iexten     habilita caracteres especiais não-POSIX\n"
 
-#: src/stty.c:668
+#: src/stty.c:672
 #, fuzzy
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
@@ -10487,7 +10553,7 @@ msgstr ""
 "                   terminal\n"
 " * [-]xcase      com icanon, escapa com \"\\\" caracteres em maiúsculas\n"
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -10501,7 +10567,7 @@ msgstr ""
 "   cbreak        o mesmo que -icanon\n"
 "   -cbreak       o mesmo que icanon\n"
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -10513,7 +10579,7 @@ msgstr ""
 "   -cooked       o mesmo que raw\n"
 "   crt           o mesmo que echoe echoctl echoke\n"
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -10527,7 +10593,7 @@ msgstr ""
 "   ek            caracteres \"erase\" e \"kill\" nos seus valores padrão\n"
 "   evenp         o mesmo que parenb -parodd cs7\n"
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -10543,7 +10609,7 @@ msgstr ""
 "   nl            o mesmo que -icrnl -onlcr\n"
 "   -nl           o mesmo que icrnl -inlcr -igncr onlcr -ocrnl -onlret\n"
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -10557,7 +10623,7 @@ msgstr ""
 "   pass8         o mesmo que -parenb -istrip cs8\n"
 "   -pass8        o mesmo que parenb istrip cs7\n"
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -10569,7 +10635,7 @@ msgstr ""
 "                   -imaxbel -opost -isig -icanon -xcase min 1 time 0\n"
 "   -raw          o mesmo que \"cooked\"\n"
 
-#: src/stty.c:716
+#: src/stty.c:720
 #, fuzzy
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
@@ -10588,7 +10654,7 @@ msgstr ""
 "caracteres\n"
 "                   especiais com seus valores padrão.\n"
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -10606,12 +10672,12 @@ msgstr ""
 "\"\n"
 " (indefinido) são utilizados para desabilitar caracteres especiais.\n"
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, c-format
 msgid "only one device may be specified"
 msgstr "somente um dispositivo pode ser especificado"
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
@@ -10620,43 +10686,43 @@ msgstr ""
 "as opções para estilo de saída detalhado e inteligível ao stty\n"
 "são mutuamente exclusivas"
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr "ao especificar um estilo de saída, não se pode definir um modo"
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr "%s: não foi possível reiniciar modo não-bloqueante"
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, c-format
 msgid "invalid argument %s"
 msgstr "argumento inválido %s"
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, c-format
 msgid "missing argument to %s"
 msgstr "faltando argumento para %s"
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, c-format
 msgid "invalid line discipline %s"
 msgstr "disciplina inválida de linha %s"
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr "%s: incapaz de realizar todas as operações solicitadas"
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr "%s: sem informação de tamanho para este dispositivo"
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, c-format
 msgid "invalid integer argument %s"
 msgstr "argumento inválido para inteiro %s"
@@ -10717,7 +10783,7 @@ msgstr "      --help     mostra esta ajuda e finaliza\n"
 msgid "      --version  output version information and exit\n"
 msgstr "      --version  informa a versão e finaliza\n"
 
-#: src/system.h:544
+#: src/system.h:543
 #, fuzzy
 msgid ""
 "\n"
@@ -10725,15 +10791,15 @@ msgid ""
 msgstr ""
 "Argumentos obrigatórios para opções longas também o são para opções curtas.\n"
 
-#: src/system.h:552
+#: src/system.h:551
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -10742,35 +10808,33 @@ msgid ""
 "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n"
 msgstr ""
 
-#: src/system.h:571
+#: src/system.h:570
 #, fuzzy, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
-msgstr ""
-"\n"
-"Relate os problemas para <%s>.\n"
+"%s online help: <%s>\n"
+msgstr "página de %s: <%s>\n"
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr ""
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr ""
 
-#: src/system.h:596
+#: src/system.h:591
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Experimente \"%s --help\" para mais informações.\n"
 
-#: src/system.h:628
+#: src/system.h:633
 #, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -10874,18 +10938,16 @@ msgstr ""
 
 #: src/tail.c:270
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
 
 #: src/tail.c:274
+#, fuzzy
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 "  -f, --follow[={name|descriptor}]\n"
@@ -10896,18 +10958,17 @@ msgstr ""
 "                             equivalentes\n"
 "  -F                       o mesmo que --follow=name --retry\n"
 
-#: src/tail.c:281
+#: src/tail.c:280
 #, fuzzy, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
 "  -n, --lines=N            emite as N últimas linhas, em vez das %d "
 "últimas;\n"
@@ -10921,14 +10982,12 @@ msgstr ""
 "                             (uma situação comum para arquivos de log "
 "rotativo)\n"
 
-#: src/tail.c:294
+#: src/tail.c:293
 #, fuzzy
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 "      --pid=PID            com -f, termina depois do processo de PID morrer\n"
 "  -q, --quiet, --silent    nunca emite cabeçalhos com os nomes dos ARQUIVOs\n"
@@ -10937,13 +10996,13 @@ msgstr ""
 "  -v, --verbose            sempre emite cabeçalhos com os nomes dos "
 "ARQUIVOs\n"
 
-#: src/tail.c:301
+#: src/tail.c:298
 #, fuzzy
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 "      --pid=PID            com -f, termina depois do processo de PID morrer\n"
@@ -10953,7 +11012,7 @@ msgstr ""
 "  -v, --verbose            sempre emite cabeçalhos com os nomes dos "
 "ARQUIVOs\n"
 
-#: src/tail.c:310
+#: src/tail.c:307
 #, fuzzy
 msgid ""
 "\n"
@@ -10973,7 +11032,7 @@ msgstr ""
 "GB 1000*1000*1000, G 1024*1024*1024, e assim por diante com T, P, E, Z, Y.\n"
 "\n"
 
-#: src/tail.c:319
+#: src/tail.c:316
 #, fuzzy
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
@@ -10992,166 +11051,173 @@ msgstr ""
 "algum\n"
 "outro programa.\n"
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr "fechando %s (fd=%d)"
 
-#: src/tail.c:453
-#, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr "%s: não foi possível buscar (\"seek\") pela posição relativa %s"
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr "%s: não foi possível buscar (\"seek\") pela posição relativa ao fim %s"
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr ""
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
 "reverting to polling"
 msgstr ""
 
-#: src/tail.c:963
+#: src/tail.c:965
+#, fuzzy, c-format
+msgid "%s has been replaced with a symbolic link. giving up on this name"
+msgstr ""
+"%s foi substituido por um arquivo que não pode ter seu fim monitorado; "
+"desistindo desse nome"
+
+#: src/tail.c:980
 #, c-format
 msgid "%s has become inaccessible"
 msgstr "%s se tornou inacessível"
 
-#: src/tail.c:980
+#: src/tail.c:997
 #, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr ""
 "%s foi substituido por um arquivo que não pode ter seu fim monitorado; "
 "desistindo desse nome"
 
-#: src/tail.c:989
+#: src/tail.c:1006
 #, fuzzy, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr ""
 "%s foi substituido por um arquivo que não pode ter seu fim monitorado; "
 "desistindo desse nome"
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, c-format
 msgid "%s has become accessible"
 msgstr "%s se tornou acessível"
 
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr "%s apareceu; monitorando o fim do novo arquivo"
 
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr "%s foi substituido; monitorando o fim do novo arquivo"
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr "%s: não foi possível alterar o modo não-bloqueante"
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr "%s: arquivo truncado"
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr "nenhum aquivo restante"
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, fuzzy, c-format
 msgid "cannot watch parent directory of %s"
 msgstr "não foi possível realizar \"stat\" no diretório atual (agora %s)"
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, fuzzy, c-format
 msgid "inotify resources exhausted"
 msgstr "memória esgotada"
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, fuzzy, c-format
 msgid "cannot watch %s"
 msgstr "não foi possível tocar %s"
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr ""
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, fuzzy, c-format
 msgid "error reading inotify event"
 msgstr "erro lendo %s"
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr ""
 "%s: é impossivel monitorar o final deste arquivo; desistindo desse nome"
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, c-format
 msgid "number in %s is too large"
 msgstr "o número em %s é muito grande"
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr ""
 "%s: número inválido para máximo de estados inalterados entre aberturas do "
 "arquivo"
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr "%s: PID inválido"
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr "%s: número inválido de segundos"
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr "opção usada em um contexto inválido -- %c"
 
-#: src/tail.c:2034
+#: src/tail.c:2096
+#, fuzzy, c-format
+msgid "warning: --retry ignored; --retry is useful only when following"
+msgstr "aviso: PID ignorado; --pid=PID é útil somente quando monitorando"
+
+#: src/tail.c:2100
 #, c-format
-msgid "warning: --retry is useful mainly when following by name"
-msgstr "aviso: --retry é mais usado quando monitorando pelo nome"
+msgid "warning: --retry only effective for the initial open"
+msgstr ""
 
-#: src/tail.c:2038
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
 msgstr "aviso: PID ignorado; --pid=PID é útil somente quando monitorando"
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr "aviso: não há suporte para--pid=PID neste sistema"
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, c-format
 msgid "cannot follow %s by name"
 msgstr "é impossível monitorar %s pelo nome"
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr "aviso: monitorar indefinidamente a entrada padrão não funciona"
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr ""
@@ -11432,17 +11498,17 @@ msgstr "argumento extra %s"
 msgid "warning: sigprocmask"
 msgstr ""
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr ""
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr ""
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
@@ -11451,32 +11517,31 @@ msgstr ""
 "Uso: %s OPÇÃO USU�RIO COMANDO [ARGUMENTO]...\n"
 " ou: %s OPÇÃO\n"
 
-#: src/timeout.c:229
+#: src/timeout.c:232
 #, fuzzy
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
 msgstr ""
 "Argumentos obrigatórios para opções longas também o são para opções curtas.\n"
 
-#: src/timeout.c:235
+#: src/timeout.c:238
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 msgid ""
 "\n"
 "DURATION is a floating point number with an optional suffix:\n"
@@ -11484,7 +11549,7 @@ msgid ""
 "days.\n"
 msgstr ""
 
-#: src/timeout.c:259
+#: src/timeout.c:262
 msgid ""
 "\n"
 "If the command times out, and --preserve-status is not set, then exit with\n"
@@ -11495,17 +11560,17 @@ msgid ""
 "case the exit status is 128+9 rather than 124.\n"
 msgstr ""
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr ""
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, fuzzy, c-format
 msgid "error waiting for command"
 msgstr "erro escrevendo %s"
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr ""
@@ -11911,7 +11976,7 @@ msgstr ""
 #: src/truncate.c:115
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 
 #: src/truncate.c:121
@@ -11996,12 +12061,12 @@ msgstr ""
 "Se ARQUIVO não for especificado ou for -, lê a entrada padrão.\n"
 "\n"
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr "%s: a entrada contém um número ímpar de termos"
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr "%s: a entrada contém um ciclo:"
@@ -12107,12 +12172,12 @@ msgstr "as tabulações estão muito longínquas"
 msgid "tab stop value is too large"
 msgstr "o valor da parada de tabulação é muito grande"
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr "Uso: %s [OPÇÃO]... [ENTRADA [SA�DA]]\n"
 
-#: src/uniq.c:138
+#: src/uniq.c:174
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
 "writing to OUTPUT (or standard output).\n"
@@ -12120,43 +12185,45 @@ msgid ""
 "With no options, matching lines are merged to the first occurrence.\n"
 msgstr ""
 
-#: src/uniq.c:147
+#: src/uniq.c:183
+#, fuzzy
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
 msgstr ""
 "  -c, --count           prefixa as linhas com a quantidade de ocorrências\n"
 "  -d, --repeated        só emite as linhas duplicadas (um exemplar de cada)\n"
 
-#: src/uniq.c:151
-#, fuzzy
+#: src/uniq.c:187
+msgid ""
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
+msgstr ""
+
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr ""
+
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
+msgstr ""
+
+#: src/uniq.c:199
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
 "  -i, --ignore-case     ignore differences in case when comparing\n"
 "  -s, --skip-chars=N    avoid comparing the first N characters\n"
 "  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
-msgstr ""
-"  -D, --all-repeated[=método-delimit] emite todas as linhas repetidas "
-"(apenas)\n"
-"                          método-delimit={none(padrão),prepend,separate}\n"
-"                            none: nenhum, prepend: antes, separate: separar\n"
-"                          A delimitação é feita com linhas em branco.\n"
-"  -f, --skip-fields=N   evita comparar os N primeiros campos\n"
-"  -i, --ignore-case     ignora as diferenças entre maiúsculas e minúsculas\n"
-"  -s, --skip-chars=N    evita comparar os N primeiros caracteres\n"
-"  -u, --unique          emite apenas as linhas únicas\n"
-"  -z, --zero-terminated  termina as linhas com o byte 0, e não com nova-"
-"linha\n"
+msgstr ""
 
-#: src/uniq.c:161
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr "  -w, --check-chars=N   compara no máximo N caracteres por linha\n"
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 msgid ""
 "\n"
 "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n"
@@ -12167,7 +12234,7 @@ msgstr ""
 "tabulações) seguidos por caracteres que não sejam espaços-brancos.\n"
 "Os campos são ignorados antes de caracteres.\n"
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 #, fuzzy
 msgid ""
 "\n"
@@ -12180,24 +12247,36 @@ msgstr ""
 "Talvez você prefira ordenar a entrada primeiro, ou usar \"sort -u\" sem "
 "\"uniq\".\n"
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, c-format
 msgid "too many repeated lines"
 msgstr "muitas linhas repetidas"
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
 msgstr "quantidade inválida de campos para ignorar"
 
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
 msgstr "quantidade inválida de bytes para ignorar"
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
 msgstr "quantidade inválida de bytes para comparar"
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr ""
+
+#: src/uniq.c:652
+#, fuzzy, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr ""
+"não faz sentido emitir todas as linhas duplicadas e contagens de repetição "
+"simultaneamente"
+
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr ""
@@ -12222,11 +12301,6 @@ msgstr ""
 "especificado.\n"
 "\n"
 
-#: src/unlink.c:86
-#, c-format
-msgid "cannot unlink %s"
-msgstr "não foi possível remover %s"
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -12271,7 +12345,7 @@ msgstr[1] "%lu usuários"
 msgid ",  load average: %.2f"
 msgstr ", carga média: %.2f"
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, fuzzy, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -12284,19 +12358,19 @@ msgstr ""
 "Se ARQUIVO não for especificado, usa-se %s. É costume usar %s como ARQUIVO.\n"
 "\n"
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
 "an uninterruptible sleep state also contribute to the load average.\n"
 msgstr ""
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr "\n"
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, fuzzy, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
@@ -12536,17 +12610,26 @@ msgstr ""
 "Emite repetidamente uma linha com todos os TEXTOs especificados ou \"y\".\n"
 "\n"
 
-#, fuzzy
-#~ msgid "  returning value: '%s'\n"
-#~ msgstr "criando arquivo %s\n"
+#~ msgid "cannot create pipe"
+#~ msgstr "não foi possível criar duto"
 
-#, fuzzy
-#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n"
-#~ msgstr "Uso: %s [OPÇÃO] NOME...\n"
+#~ msgid "%s subprocess failed"
+#~ msgstr "subprocesso de %s falhou"
 
-#, fuzzy
-#~ msgid "no valid suffix found\n"
-#~ msgstr "%s: comprimento inválido de sufixo"
+#~ msgid "_open_osfhandle failed"
+#~ msgstr "_open_osfhandle falhou"
+
+#~ msgid "cannot restore fd %d: dup2 failed"
+#~ msgstr "não foi possível restaurar o descritor de arquivo %d: dup2 falhou"
+
+#~ msgid "%s subprocess"
+#~ msgstr "subprocesso de %s"
+
+#~ msgid "%s subprocess got fatal signal %d"
+#~ msgstr "subprocesso de %s recebeu o sinal fatal %d"
+
+#~ msgid "failed to set additional groups"
+#~ msgstr "falhou em estabelecer grupo(s) adicional(ais)"
 
 #~ msgid "reading %s"
 #~ msgstr "lendo %s"
@@ -12554,6 +12637,9 @@ msgstr ""
 #~ msgid "writing %s"
 #~ msgstr "escrevendo %s"
 
+#~ msgid "failed to get file system create context"
+#~ msgstr "falhou em obter o contexto de criação do sistema de arquivos"
+
 #~ msgid "closing %s"
 #~ msgstr "fechando %s"
 
@@ -12588,6 +12674,25 @@ msgstr ""
 #~ "depth=0 é\n"
 #~ "                          equivalente a --summarize\n"
 
+#~ msgid "%s: cannot lseek back to original position"
+#~ msgstr "%s: não foi possível fazer \"lseek\" para a posição original"
+
+#~ msgid "cannot reposition file pointer for %s"
+#~ msgstr "não foi possível reposicionar ponteiro de arquivo para %s"
+
+#~ msgid "Usage: %s [OPTION]... [USERNAME]\n"
+#~ msgstr "Uso: %s [OPÇÃO]... [NOMEDOUSU�RIO]\n"
+
+#~ msgid ""
+#~ "      --preserve-context  preserve SELinux security context\n"
+#~ "  -Z, --context=CONTEXT  set SELinux security context of files and "
+#~ "directories\n"
+#~ msgstr ""
+#~ "      --preserve-context  preserva o contexto de segurança SELinux\n"
+#~ "  -Z, --context=CONTEXTO  define o contexto de segurança SELinux dos "
+#~ "arquivos\n"
+#~ "                            e diretórios\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "  none, off       never make backups (even if --backup is given)\n"
@@ -12604,6 +12709,23 @@ msgstr ""
 #~ "                    simples em caso contrário\n"
 #~ "  simple, never   sempre faz cópias de segurança simples\n"
 
+#~ msgid ""
+#~ "  -Z, --context=CTX  set the SELinux security context of each NAME to "
+#~ "CTX\n"
+#~ msgstr ""
+#~ "  -Z, --context=CTX  define o contexto de segurança SELinux de cada NOME\n"
+#~ "                       como CTX\n"
+
+#~ msgid ""
+#~ "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
+#~ msgstr ""
+#~ "  -Z, --context=CTX  define o contexto de segurança SELinux de NOME como "
+#~ "CTX\n"
+
+#, fuzzy
+#~ msgid "failed to redirect stderr to /dev/null"
+#~ msgstr "falhou em redirecionar o erro padrão"
+
 #, fuzzy
 #~ msgid ""
 #~ "WARNING: --page-increment is deprecated; use --line-increment instead"
@@ -12614,6 +12736,14 @@ msgstr ""
 #~ "Todos os argumentos para opções longas são obrigatórias para opções "
 #~ "curtas.\n"
 
+#~ msgid ""
+#~ "  -A, --address-radix=RADIX   decide how file offsets are printed\n"
+#~ "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
+#~ msgstr ""
+#~ "  -A, --address-radix=BASE    decide como o deslocamento do arquivo é "
+#~ "exibido\n"
+#~ "  -j, --skip-bytes=QTD        pula os primeiros QTD bytes de entrada\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "\n"
@@ -12648,9 +12778,82 @@ msgstr ""
 #~ "--string sem um número implica em 3. --width sem um número\n"
 #~ "implica em 32. Por padrão, od usa -A o -t d2 -w16.\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Se ARQUIVO não for fornecido ou se for -, lê a entrada padrão.\n"
+#~ "\"-F /\" por padrão.\n"
+
 #~ msgid "Usage: %s [OPTION]... FILE\n"
 #~ msgstr "Uso: %s [OPÇÃO]... ARQUIVO\n"
 
+#, fuzzy
+#~ msgid "cannot remove directory: %s"
+#~ msgstr "não foi possível remover o diretório %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
+#~ "  or:  %s LONG-OPTION\n"
+#~ msgstr ""
+#~ "Uso: %s OPÇÃO USU�RIO COMANDO [ARGUMENTO]...\n"
+#~ " ou: %s OPÇÃO\n"
+
+#~ msgid ""
+#~ "Drop any supplemental groups, assume the user-ID and group-ID of the "
+#~ "specified\n"
+#~ "USER (numeric ID or user name), and run COMMAND with any specified "
+#~ "ARGUMENTs.\n"
+#~ "Exit with status 111 if unable to assume the required user and group ID.\n"
+#~ "Otherwise, exit with the exit status of COMMAND.\n"
+#~ "This program is useful only when run by root (user ID zero).\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Descarta quaisquer grupos suplementares, assume a ID de usuário e de "
+#~ "grupo do\n"
+#~ "USU�RIO especificado (ID numérica ou nome de usuário) e executa COMANDO "
+#~ "com\n"
+#~ "os ARGUMENTOs especificados.\n"
+#~ "Sai com o estado 111 se for incapaz de assumir a ID de usuário e de "
+#~ "grupo\n"
+#~ "solicitada. Em caso contrário, sai com o estado de saída de COMANDO.\n"
+#~ "Este programa só é útil quando executado pelo super-usuário (ID de "
+#~ "usuário 0).\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, "
+#~ "and\n"
+#~ "                    (if specified) supplemental group IDs to GID1, ...\n"
+#~ msgstr ""
+#~ "  -g GID[,GID1...]  também define a ID primária de grupo para GID e, se\n"
+#~ "                      se especificadas, as IDs suplementares para "
+#~ "GID1, ...\n"
+
+#~ msgid "unknown user-ID: %s"
+#~ msgstr "ID desconhecida do usuário: %s"
+
+#~ msgid "to use user-ID %s you need to use -g too"
+#~ msgstr "para usar a ID do usuário %s, você precisa usar -g também"
+
+#~ msgid "cannot set group-ID to %lu"
+#~ msgstr "não foi possível estabelecer ID de grupo para %lu"
+
+#~ msgid "cannot set user-ID to %lu"
+#~ msgstr "não foi possível estabelecer ID de usuário para %lu"
+
+#~ msgid "dup2 failed"
+#~ msgstr "erro na duplicação de descritor de arquivo (\"dup2\")"
+
+#~ msgid "couldn't execute %s"
+#~ msgstr "não pôde executar %s"
+
+#~ msgid "couldn't execute %s -d"
+#~ msgstr "não pôde executar %s -d"
+
 #~ msgid "Password:"
 #~ msgstr "Senha:"
 
@@ -12710,6 +12913,42 @@ msgstr ""
 #~ msgid "warning: cannot change directory to %s"
 #~ msgstr "aviso: não foi possível mudar para o diretório %s"
 
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Report %s bugs to %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Relate os problemas para <%s>.\n"
+
+#~ msgid "warning: --retry is useful mainly when following by name"
+#~ msgstr "aviso: --retry é mais usado quando monitorando pelo nome"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
+#~ "                        delimit-method={none(default),prepend,separate}\n"
+#~ "                        Delimiting is done with blank lines\n"
+#~ "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+#~ "  -i, --ignore-case     ignore differences in case when comparing\n"
+#~ "  -s, --skip-chars=N    avoid comparing the first N characters\n"
+#~ "  -u, --unique          only print unique lines\n"
+#~ "  -z, --zero-terminated  end lines with 0 byte, not newline\n"
+#~ msgstr ""
+#~ "  -D, --all-repeated[=método-delimit] emite todas as linhas repetidas "
+#~ "(apenas)\n"
+#~ "                          método-delimit={none(padrão),prepend,separate}\n"
+#~ "                            none: nenhum, prepend: antes, separate: "
+#~ "separar\n"
+#~ "                          A delimitação é feita com linhas em branco.\n"
+#~ "  -f, --skip-fields=N   evita comparar os N primeiros campos\n"
+#~ "  -i, --ignore-case     ignora as diferenças entre maiúsculas e "
+#~ "minúsculas\n"
+#~ "  -s, --skip-chars=N    evita comparar os N primeiros caracteres\n"
+#~ "  -u, --unique          emite apenas as linhas únicas\n"
+#~ "  -z, --zero-terminated  termina as linhas com o byte 0, e não com nova-"
+#~ "linha\n"
+
 #~ msgid ""
 #~ "\n"
 #~ "Examples:\n"
diff --git a/po/ro.gmo b/po/ro.gmo
index 4a52fe72..6cf0c701 100644
--- a/po/ro.gmo
+++ b/po/ro.gmo
diff --git a/po/ro.po b/po/ro.po
index 7e9d94f9..769a89fd 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU coreutils 8.4\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
 "PO-Revision-Date: 2010-01-24 17:20+0200\n"
 "Last-Translator: Sergiu Bivol <sergiu@ase.md>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -36,76 +36,123 @@ msgstr "Argumente valide sînt:"
 msgid "error closing file"
 msgstr "eroare la închiderea fișierului"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "eroare de scriere"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "se păstrează permisiunile pentru %s"
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "Eroare de sistem necunoscută"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "fișier gol obișnuit"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "fișier obișnuit"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "dosar"
 
-#: lib/file-type.c:44
+#: lib/file-type.c:46
+msgid "symbolic link"
+msgstr "legătură simbolică"
+
+#: lib/file-type.c:52
+msgid "message queue"
+msgstr "coadă de mesaje"
+
+#: lib/file-type.c:55
+msgid "semaphore"
+msgstr "semafor"
+
+#: lib/file-type.c:58
+msgid "shared memory object"
+msgstr "obiect de memorie partajată"
+
+#: lib/file-type.c:61
+msgid "typed memory object"
+msgstr ""
+
+#: lib/file-type.c:66
 msgid "block special file"
 msgstr "fișier bloc special"
 
-#: lib/file-type.c:47
+#: lib/file-type.c:69
 msgid "character special file"
 msgstr "fișier caracterial special"
 
-#: lib/file-type.c:50
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr ""
+
+#: lib/file-type.c:75
 msgid "fifo"
 msgstr "fifo"
 
-#: lib/file-type.c:53
-msgid "symbolic link"
-msgstr "legătură simbolică"
+#: lib/file-type.c:78
+msgid "door"
+msgstr ""
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "soclu"
+#: lib/file-type.c:81
+#, fuzzy
+msgid "multiplexed block special file"
+msgstr "fișier bloc special"
 
-#: lib/file-type.c:59
-msgid "message queue"
-msgstr "coadă de mesaje"
+#: lib/file-type.c:84
+#, fuzzy
+msgid "multiplexed character special file"
+msgstr "fișier caracterial special"
 
-#: lib/file-type.c:62
-msgid "semaphore"
-msgstr "semafor"
+#: lib/file-type.c:87
+msgid "multiplexed file"
+msgstr ""
 
-#: lib/file-type.c:65
-msgid "shared memory object"
-msgstr "obiect de memorie partajată"
+#: lib/file-type.c:90
+#, fuzzy
+msgid "named file"
+msgstr "fișier ciudat"
 
-#: lib/file-type.c:68
-msgid "typed memory object"
+#: lib/file-type.c:93
+#, fuzzy
+msgid "network special file"
+msgstr "fișier bloc special"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr ""
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
 msgstr ""
 
-#: lib/file-type.c:70
+#: lib/file-type.c:102
+msgid "port"
+msgstr ""
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "soclu"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr ""
+
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "fișier ciudat"
 
@@ -240,18 +287,18 @@ msgstr "%s: opțiunea „-W %s� nu permite un argument\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: opțiunea „%s� cere un argument\n"
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr "permisiunile %s nu se pot modifica"
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "dosarul %s nu poate fi creat"
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr "memorie epuizată"
@@ -368,7 +415,7 @@ msgstr "Expresie regulată prea mare"
 msgid "Unmatched ) or \\)"
 msgstr ") sau \\) fără pereche"
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 msgid "No previous regular expression"
 msgstr "Nicio expresie regulată anterioară"
 
@@ -394,7 +441,7 @@ msgstr ""
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[dDyY]"
 
@@ -404,11 +451,11 @@ msgstr "^[dDyY]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, c-format
 msgid "setting permissions for %s"
 msgstr "se stabilesc permisiunile pentru %s"
@@ -549,18 +596,6 @@ msgstr "Pană de curent"
 msgid "Resource lost"
 msgstr "Resursă pierdută"
 
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, fuzzy, c-format
-msgid "cannot create pipe"
-msgstr "legătura %s nu poate fi creată"
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, fuzzy, c-format
-msgid "%s subprocess failed"
-msgstr "scriere eșuată"
-
 #: lib/strsignal.c:114
 #, c-format
 msgid "Real-time signal %d"
@@ -770,7 +805,7 @@ msgstr ""
 msgid "Report %s bugs to: %s\n"
 msgstr "Raportați erorile %s la: %s\n"
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Pagina oficială %s: <%s>\n"
@@ -780,31 +815,11 @@ msgstr "Pagina oficială %s: <%s>\n"
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr "Pagina oficială %s: <http://wwwgnu.org/software/%s/>\n"
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr ""
 "Ajutor general la utilizarea aplicațiilor GNU: <http://wwwgnu.org/gethelp/>\n"
 
-#: lib/w32spawn.h:43
-#, fuzzy, c-format
-msgid "_open_osfhandle failed"
-msgstr "deschidere eșuată"
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr ""
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr ""
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr ""
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr "intrarea standard"
@@ -826,7 +841,7 @@ msgstr "flux necunoscut"
 msgid "failed to reopen %s with mode %s"
 msgstr "deschiderea %s în regimul %s a eșuat"
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr "compararea șirurilor a eșuat"
@@ -887,7 +902,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -904,48 +919,47 @@ msgid ""
 "from any other non-alphabet bytes in the encoded stream.\n"
 msgstr ""
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "eroare de citire"
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, c-format
 msgid "invalid input"
 msgstr "intrare nevalidă"
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, c-format
 msgid "invalid wrap size: %s"
 msgstr ""
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, c-format
 msgid "extra operand %s"
 msgstr "operand %s în plus"
 
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, c-format
 msgid "closing standard input"
 msgstr "se închide intrarea standard"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -972,8 +986,8 @@ msgstr ""
 #: src/basename.c:60
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/basename.c:67
@@ -987,32 +1001,31 @@ msgid ""
 "  %s -a any/str1 any/str2   -> \"str1\" followed by \"str2\"\n"
 msgstr ""
 
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, c-format
 msgid "missing operand"
 msgstr "operand lipsă"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr "Torbjorn Granlund"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 msgid "Richard M. Stallman"
 msgstr "Richard M. Stallman"
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1071,7 +1084,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr "nu se poate face ioctl asupra %s"
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr "ieșirea standard"
@@ -1088,14 +1101,14 @@ msgstr "Russell Coker"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 msgid "Jim Meyering"
 msgstr "Jim Meyering"
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, c-format
 msgid "failed to create security context: %s"
 msgstr "eșec la crearea contextului de securitate: %s"
@@ -1105,8 +1118,8 @@ msgstr "eșec la crearea contextului de securitate: %s"
 msgid "failed to set %s security context component to %s"
 msgstr ""
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, c-format
 msgid "failed to get security context of %s"
 msgstr "eșec la obținerea contextului de securitate al %s"
@@ -1116,18 +1129,18 @@ msgstr "eșec la obținerea contextului de securitate al %s"
 msgid "can't apply partial context to unlabeled file %s"
 msgstr "nu se poate aplica context parțial asupra fișierului ne-etichetat %s"
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, c-format
 msgid "failed to change context of %s to %s"
 msgstr "eșec la schimbarea contextului %s în %s"
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
 msgstr "%s nu poate fi accesat"
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, c-format
 msgid "cannot read directory %s"
 msgstr "dosarul %s nu poate fi citit"
@@ -1137,13 +1150,14 @@ msgstr "dosarul %s nu poate fi citit"
 msgid "changing security context of %s\n"
 msgstr "se schimbă contextul de securitate al %s\n"
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, c-format
 msgid "fts_read failed"
 msgstr "fts_read a eșuat"
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, c-format
 msgid "fts_close failed"
 msgstr "fts_close a eșuat"
@@ -1158,7 +1172,7 @@ msgstr ""
 
 #: src/chcon.c:357
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
@@ -1179,7 +1193,7 @@ msgid ""
 "  -l, --range=RANGE      set range RANGE in the target security context\n"
 msgstr ""
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 #, fuzzy
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
@@ -1231,36 +1245,37 @@ msgstr ""
 "  -P                     nu traversa nicio legătură simbolică (implicit)\n"
 "\n"
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr "-R --dereference necesită fie -H, fie -L"
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr "-R -h cere -P"
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, c-format
 msgid "missing operand after %s"
 msgstr "operand lipsă după %s"
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, c-format
 msgid "invalid context: %s"
 msgstr "context nevalid: %s"
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr ""
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, c-format
 msgid "failed to get attributes of %s"
 msgstr "eșec la obținerea atributelor %s"
@@ -1286,7 +1301,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
@@ -1318,47 +1333,47 @@ msgstr ""
 "  %s staff /u      Schimbă grupul lui /u la „staff�.\n"
 "  %s -hR staff /u  Schimbă grupul lui /u și al subdosarelor la „staff�.\n"
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
 msgstr "se obțin noile atribute ale %s"
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr ""
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, fuzzy, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr "regimul %s schimbat la %04lo (%s)\n"
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, fuzzy, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr "eșec la modificarea regimului %s în %04lo (%s)\n"
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr "regimul %s reținut ca %04lo (%s)\n"
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr ""
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, c-format
 msgid "changing permissions of %s"
 msgstr "se modifică permisiunile %s"
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr "%s: noile permisiuni sînt %s, nu %s"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1369,22 +1384,22 @@ msgstr ""
 "     sau:  %s [OPȚIUNE]... REGIM-OCTAL FIȘIER...\n"
 "     sau:  %s [OPȚIUNE]... --reference=FIȘIER-REF FIȘIER...\n"
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 msgid ""
 "Change the mode of each FILE to MODE.\n"
 "With --reference, change the mode of each FILE to that of RFILE.\n"
 "\n"
 msgstr ""
 
-#: src/chmod.c:391
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr ""
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 #, fuzzy
 msgid ""
 "\n"
@@ -1393,12 +1408,12 @@ msgstr ""
 "\n"
 "Fiecare REGIM are forma „[ugoa]*([-+=]([rwxXst]*|[ugo]))+�.\n"
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr "opțiunile regimului și ale --reference nu pot fi combinate"
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, c-format
 msgid "invalid mode: %s"
 msgstr "regim nevalid: %s"
@@ -1532,26 +1547,21 @@ msgstr ""
 "„root�.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr "Roland McGrath"
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr "grup %s nevalid"
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, c-format
 msgid "invalid group list %s"
 msgstr "listă de grupuri %s nevalidă"
 
-#: src/chroot.c:117
-#, c-format
-msgid "failed to set additional groups"
-msgstr "eșec la stabilirea grupurilor suplimentare"
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
@@ -1560,7 +1570,7 @@ msgstr ""
 "Utilizare: %s [OPÈšIUNE] RÄ‚DÄ‚CINÄ‚NOUÄ‚ [COMANDÄ‚ [ARG]...]\n"
 "     sau:  %s OPÈšIUNE\n"
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
@@ -1568,7 +1578,7 @@ msgstr ""
 "Rulează COMANDĂ cu dosarul rădăcină stabilit la RĂDĂCINĂNOUĂ.\n"
 "\n"
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
@@ -1577,7 +1587,7 @@ msgstr ""
 "de utilizat\n"
 "  --groups=LISTĂ_G            specifică grupuri suplimentare ca g1,g2,..,gN\n"
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 #, fuzzy
 msgid ""
 "\n"
@@ -1586,28 +1596,42 @@ msgstr ""
 "\n"
 "Dacă nu este dată nicio comandă, execută „${SHELL} -i� (implicit: /bin/sh).\n"
 
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, c-format
 msgid "cannot change root directory to %s"
 msgstr "dosarul rădăcină nu poate fi schimbat la %s"
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, c-format
 msgid "cannot chdir to root directory"
 msgstr "nu se poate schimba la dosarul rădăcină"
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr ""
+
+#: src/chroot.c:383
+#, fuzzy, c-format
+msgid "failed to get supplemental groups"
+msgstr "eșec la stabilirea grupurilor suplimentare"
+
+#: src/chroot.c:395
+#, fuzzy, c-format
+msgid "failed to %s supplemental groups"
+msgstr "eșec la stabilirea ID-grup"
+
+#: src/chroot.c:402
 #, c-format
 msgid "failed to set group-ID"
 msgstr "eșec la stabilirea ID-grup"
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, c-format
 msgid "failed to set user-ID"
 msgstr "eșec la stabilirea ID-utilizator"
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, c-format
 msgid "failed to run command %s"
 msgstr "eșec la rularea comenzii %s"
@@ -1639,7 +1663,7 @@ msgstr ""
 "Tipărește suma de verificare CRC și numărul de octeți al fiecărui FIȘIER.\n"
 "\n"
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr "Utilizare: %s [OPȚIUNE]... FIȘIER1 FIȘIER2\n"
@@ -1709,294 +1733,327 @@ msgstr "delimitatori multipli specificați"
 msgid "empty %s not allowed"
 msgstr "%s gol interzis"
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr "eroare la citirea %s"
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, c-format
 msgid "cannot lseek %s"
 msgstr "nu se poate face lseek %s"
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr "eroare la scrierea %s"
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, fuzzy, c-format
 msgid "%s: failed to get extents info"
 msgstr "%s: eșec la eliminare"
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, fuzzy, c-format
 msgid "%s: write failed"
 msgstr "scriere eșuată"
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, fuzzy, c-format
 msgid "failed to extend %s"
 msgstr "eșec la deschiderea %s"
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, c-format
 msgid "clearing permissions for %s"
 msgstr "se curăță permisiunile pentru %s"
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "păstrarea apartenenței pentru %s a eșuat"
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
 msgstr "găsirea fișierului %s a eșuat"
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, c-format
 msgid "failed to preserve authorship for %s"
 msgstr ""
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
+#, c-format
+msgid "failed to set default file creation context to %s"
+msgstr "eșec la stabilirea contextului implicit de creare a fișierelor la %s"
+
+#: src/copy.c:820
+#, fuzzy, c-format
+msgid "failed to set default file creation context for %s"
+msgstr "eșec la stabilirea contextului implicit de creare a fișierelor la %s"
+
+#: src/copy.c:846
+#, fuzzy, c-format
+msgid "failed to set the security context of %s"
+msgstr "eșec la obținerea contextului de securitate al %s"
+
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
 msgid "cannot open %s for reading"
 msgstr "%s nu poate fi deschis pentru citire"
 
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, c-format
 msgid "cannot fstat %s"
 msgstr "nu se poate face fstat %s"
 
-#: src/copy.c:820
+#: src/copy.c:935
 #, c-format
 msgid "skipping file %s, as it was replaced while being copied"
 msgstr "se sare fișierul %s, întrucît a fost înlocuit în timpul copierii"
 
-#: src/copy.c:850
-#, c-format
-msgid "failed to get file system create context"
-msgstr ""
-
-#: src/copy.c:864
-#, c-format
-msgid "failed to set the security context of %s to %s"
-msgstr ""
-
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
 msgid "cannot remove %s"
 msgstr "%s nu poate fi eliminat"
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
 msgstr "eliminat %s\n"
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr ""
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, c-format
 msgid "cannot create regular file %s"
 msgstr "fișierul obișnuit %s nu poate fi creat"
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, fuzzy, c-format
 msgid "failed to clone %s from %s"
 msgstr "eșec la clonarea %s"
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr "se păstrează timpii pentru %s"
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
 #, fuzzy, c-format
 msgid "failed to close %s"
-msgstr "eșec la deschiderea %s"
+msgstr "eșec la clonarea %s"
 
-#: src/copy.c:1471
+#: src/copy.c:1580
 #, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
 msgstr ""
 
-#: src/copy.c:1478
+#: src/copy.c:1581
+#, c-format
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr ""
+
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
 msgstr "%s: suprascrieți %s? "
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr " (rezervă: %s)"
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr ""
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, c-format
 msgid "cannot create hard link %s to %s"
 msgstr ""
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, c-format
 msgid "cannot stat %s"
 msgstr "nu se poate face stat %s"
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, c-format
 msgid "omitting directory %s"
 msgstr "se omite dosarul %s"
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr "atenție: fișierul-sursă %s specificat mai mult decît o dată"
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
 msgstr "%s și %s sînt unul și același fișier"
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr "nu se poate suprascrie non-dosarul %s cu dosarul %s"
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr ""
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr "nu se poate suprascrie dosarul %s cu non-dosar"
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr ""
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr ""
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr "copierea de rezervă %s ar distruge sursa; %s nu este copiat"
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
 msgstr "%s nu poate fi copiat de rezervă"
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr ""
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr "nu se poate copia un dosar, %s, în el însuși, %s"
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr ""
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr "%s nu poate fi mutat într-un subdosar al său, %s"
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, c-format
 msgid "cannot move %s to %s"
 msgstr "nu se poate muta %s la %s"
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr ""
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, c-format
-msgid "failed to set default file creation context to %s"
-msgstr "eșec la stabilirea contextului implicit de creare a fișierelor la %s"
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr "nu se poate copia legătura simbolică ciclică %s"
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr ""
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr "nu se poate crea legătura simbolică %s la %s"
 
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, c-format
 msgid "cannot create fifo %s"
 msgstr ""
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, c-format
 msgid "cannot create special file %s"
 msgstr "fișierul special %s nu poate fi creat"
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, c-format
 msgid "cannot read symbolic link %s"
 msgstr "legătura simbolică %s nu poate fi citită"
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, c-format
 msgid "cannot create symbolic link %s"
 msgstr "legătura simbolică %s nu poate fi creată"
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
 msgstr "%s are un tip de fișier necunoscut"
 
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, c-format
 msgid "cannot un-backup %s"
 msgstr ""
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr ""
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr ""
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr ""
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, fuzzy, c-format
+msgid "unknown program %s"
+msgstr "flux necunoscut"
+
+#: src/cp.c:157 src/mv.c:288
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -2007,14 +2064,14 @@ msgstr ""
 "     sau:  %s [OPÈšIUNE]... SURSÄ‚... DOSAR\n"
 "     sau:  %s [OPÈšIUNE]... -t DOSAR SURSÄ‚...\n"
 
-#: src/cp.c:162
+#: src/cp.c:163
 #, fuzzy
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 "Copiază SURSĂ la DESTINAȚIE, sau multiple SURSE în DOSAR.\n"
 "\n"
 
-#: src/cp.c:168
+#: src/cp.c:169
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
 "      --attributes-only        don't copy the file data, just the "
@@ -2028,7 +2085,7 @@ msgid ""
 "  -d                           same as --no-dereference --preserve=links\n"
 msgstr ""
 
-#: src/cp.c:177
+#: src/cp.c:178
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
 "                                 opened, remove it and try again (this "
@@ -2041,20 +2098,20 @@ msgid ""
 "  -H                           follow command-line symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:186
+#: src/cp.c:187
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
 "  -L, --dereference            always follow symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:190
+#: src/cp.c:191
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
 "                                 a previous -i option)\n"
 "  -P, --no-dereference         never follow symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:195
+#: src/cp.c:196
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
 "      --preserve[=ATTR_LIST]   preserve the specified attributes (default:\n"
@@ -2064,13 +2121,13 @@ msgid ""
 "                                 all\n"
 msgstr ""
 
-#: src/cp.c:203
+#: src/cp.c:204
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                use full source file name under DIRECTORY\n"
 msgstr ""
 
-#: src/cp.c:207
+#: src/cp.c:208
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
 "      --reflink[=WHEN]         control clone/CoW copies. See below\n"
@@ -2079,7 +2136,7 @@ msgid ""
 "force)\n"
 msgstr ""
 
-#: src/cp.c:213
+#: src/cp.c:214
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
 "      --strip-trailing-slashes  remove any trailing slashes from each "
@@ -2087,7 +2144,7 @@ msgid ""
 "                                 argument\n"
 msgstr ""
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -2096,7 +2153,7 @@ msgid ""
 "  -T, --no-target-directory    treat DEST as a normal file\n"
 msgstr ""
 
-#: src/cp.c:224
+#: src/cp.c:225
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
 "                                 than the destination file or when the\n"
@@ -2105,7 +2162,15 @@ msgid ""
 "  -x, --one-file-system        stay on this file system\n"
 msgstr ""
 
-#: src/cp.c:233
+#: src/cp.c:232
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/cp.c:240
 msgid ""
 "\n"
 "By default, sparse SOURCE files are detected by a crude heuristic and the\n"
@@ -2121,7 +2186,7 @@ msgid ""
 "fails, or if --reflink=auto is specified, fall back to a standard copy.\n"
 msgstr ""
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 msgid ""
 "\n"
 "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n"
@@ -2131,7 +2196,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2139,7 +2204,7 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2147,227 +2212,237 @@ msgid ""
 "regular file.\n"
 msgstr ""
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, c-format
 msgid "failed to preserve times for %s"
 msgstr "păstrarea timpilor pentru %s a eșuat"
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, c-format
 msgid "failed to preserve permissions for %s"
 msgstr "păstrarea permisiunilor pentru %s a eșuat"
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, c-format
 msgid "cannot make directory %s"
 msgstr "dosarul %s nu poate fi făcut"
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr "%s există dar nu este un dosar"
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
 #, fuzzy, c-format
 msgid "failed to access %s"
-msgstr "eșec la deschiderea %s"
+msgstr "eșec la clonarea %s"
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, c-format
 msgid "missing file operand"
 msgstr "lipsă operand fișier"
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, c-format
 msgid "missing destination file operand after %s"
 msgstr "lipsă operand fișier destinație după %s"
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr ""
 "nu se pot combina --target-directory (-t) și --no-target-directory (-T)"
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, c-format
 msgid "target %s is not a directory"
 msgstr "ținta %s nu este un dosar"
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr "cu --parents, destinația trebuie să fie un dosar"
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, c-format
 msgid "multiple target directories specified"
 msgstr "multiple dosare-țintă specificate"
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr ""
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr ""
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr "opțiunile --backup și --no-clobber se exclud reciproc"
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr "--reflink poate fi utilizat numai cu --sparse=auto"
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr "tip copie de siguranță"
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, c-format
+msgid "cannot set target context and preserve it"
+msgstr ""
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr ""
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr "Stuart Kemp"
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr "intrarea a dispărut"
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr "%s: număr linie în afara intervalului"
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, c-format
 msgid "%s: %s: line number out of range"
 msgstr "%s: %s: număr linie în afara intervalului"
 
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, c-format
 msgid " on repetition %s\n"
 msgstr ""
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, c-format
 msgid "%s: %s: match not found"
 msgstr "%s: %s: nicio potrivire găsită"
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr ""
 
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, c-format
 msgid "write error for %s"
 msgstr "eroare de scriere pentru %s"
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, c-format
 msgid "%s: integer expected after delimiter"
 msgstr "%s: se așteaptă întreg după delimitator"
 
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr ""
 
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr ""
 
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr ""
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr "%s: expresie regulată nevalidă: %s"
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr "%s: model nevalid"
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr "%s: numărul liniei trebuie să fie mai mare ca zero"
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr "numărul de linie %s e mai mic decît numărul liniei precedente, %s"
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr "atenție: numărul de linie %s e același ca și numărul liniei precedente"
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr ""
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr ""
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr ""
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, fuzzy, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr "%.*s: specificare de conversie nevalidă"
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr ""
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr ""
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr "%s: număr nevalid"
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr "Utilizare: %s [OPȚIUNE]... FIȘIER MODEL...\n"
 
-#: src/csplit.c:1455
+#: src/csplit.c:1483
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
 "and output byte counts of each piece to standard output.\n"
 msgstr ""
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2375,20 +2450,24 @@ msgid ""
 "  -k, --keep-files           do not remove output files on errors\n"
 msgstr ""
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr ""
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
 "  -z, --elide-empty-files    remove empty output files\n"
 msgstr ""
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
 msgstr ""
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 msgid ""
 "\n"
 "  INTEGER            copy up to but not including specified line number\n"
@@ -2405,29 +2484,25 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr "David M. Ihnat"
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr "cîmpurile și pozițiile sînt numerotate începînd cu 1"
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr "Utilizare: %s OPȚIUNE... [FIȘIER]...\n"
 
-#: src/cut.c:193
+#: src/cut.c:176
 #, fuzzy
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr ""
 "Tipărește fragmente alese de linie din fiecare FIȘIER pe ieșirea standard.\n"
 
-#: src/cut.c:199
+#: src/cut.c:182
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
 "  -c, --characters=LIST   select only these characters\n"
 "  -d, --delimiter=DELIM   use DELIM instead of TAB for field delimiter\n"
 msgstr ""
 
-#: src/cut.c:204
+#: src/cut.c:187
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
 "                            that contains no delimiter character, unless\n"
@@ -2435,20 +2510,20 @@ msgid ""
 "  -n                      (ignored)\n"
 msgstr ""
 
-#: src/cut.c:210
+#: src/cut.c:193
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
 "                            or fields\n"
 msgstr ""
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
 "                            the default is to use the input delimiter\n"
 msgstr ""
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2456,7 +2531,7 @@ msgid ""
 "in the same order that it is read, and is written exactly once.\n"
 msgstr ""
 
-#: src/cut.c:227
+#: src/cut.c:210
 msgid ""
 "Each range is one of:\n"
 "\n"
@@ -2468,57 +2543,61 @@ msgid ""
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
 
-#: src/cut.c:367 src/cut.c:493
+#: src/cut.c:300 src/cut.c:394
 #, fuzzy
 msgid "invalid byte, character or field list"
 msgstr "trebuie să specificați o listă de octeți, caractere sau cîmpuri"
 
-#: src/cut.c:387
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr "cîmpurile și pozițiile sînt numerotate începînd cu 1"
+
+#: src/cut.c:320
 msgid "invalid range with no endpoint: -"
 msgstr ""
 
-#: src/cut.c:403
+#: src/cut.c:334
 msgid "invalid decreasing range"
 msgstr ""
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, c-format
 msgid "byte offset %s is too large"
 msgstr ""
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, c-format
 msgid "field number %s is too large"
 msgstr "numărul de cîmp %s e prea mare"
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr "poate fi specificat numai un tip de listă"
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr "delimitatorul trebuie să fie un singur caracter"
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr "trebuie să specificați o listă de octeți, caractere sau cîmpuri"
 
-#: src/cut.c:850
+#: src/cut.c:790
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr ""
 
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
 msgstr ""
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr "lipsește lista de cîmpuri"
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr "lipsește lista de poziții"
 
@@ -2560,7 +2639,7 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 
 #: src/date.c:158
@@ -2701,10 +2780,10 @@ msgid ""
 "  $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n"
 msgstr ""
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr "intrarea standard"
@@ -2742,7 +2821,7 @@ msgstr ""
 msgid "cannot set date"
 msgstr "nu se poate stabili data"
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, c-format
 msgid "time %s is out of range"
 msgstr "ora %s este în afara intervalului"
@@ -2753,7 +2832,7 @@ msgstr "ora %s este în afara intervalului"
 msgid "Paul Rubin"
 msgstr "Paul Rubin"
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
@@ -2762,7 +2841,7 @@ msgstr ""
 "Utilizare: %s [OPERAND]...\n"
 "     sau:  %s OPÈšIUNE\n"
 
-#: src/dd.c:526
+#: src/dd.c:532
 #, fuzzy
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
@@ -2782,7 +2861,7 @@ msgstr ""
 "  count=BLOCURI    copiază numai BLOCURI blocuri de intrare\n"
 "  ibs=OCTEȚI       citește OCTEȚI octeți odată (implicit: 512)\n"
 
-#: src/dd.c:535
+#: src/dd.c:541
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
 "  iflag=FLAGS     read as per the comma separated symbol list\n"
@@ -2795,7 +2874,7 @@ msgid ""
 "                  'noxfer' suppresses transfer stats, 'none' suppresses all\n"
 msgstr ""
 
-#: src/dd.c:546
+#: src/dd.c:552
 #, fuzzy
 msgid ""
 "\n"
@@ -2815,7 +2894,7 @@ msgstr ""
 "Fiecare simbol CONV poate fi:\n"
 "\n"
 
-#: src/dd.c:555
+#: src/dd.c:561
 #, fuzzy
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
@@ -2841,7 +2920,7 @@ msgstr ""
 "  sync      pad every input block with NULs to ibs-size; when used\n"
 "            with block or unblock, pad with spaces rather than NULs\n"
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -2857,7 +2936,7 @@ msgstr ""
 "  fdatasync  physically write output file data before finishing\n"
 "  fsync     likewise, but also write metadata\n"
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -2866,75 +2945,75 @@ msgid ""
 "suggested)\n"
 msgstr ""
 
-#: src/dd.c:583
+#: src/dd.c:589
 msgid "  cio       use concurrent I/O for data\n"
 msgstr "  cio       utilizează I/E concurentă pentru date\n"
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr "  direct    utilizează I/E directă pentru date\n"
 
-#: src/dd.c:587
+#: src/dd.c:593
 msgid "  directory  fail unless a directory\n"
 msgstr ""
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr ""
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr ""
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr ""
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr ""
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr ""
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr ""
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr "  nofollow  nu urma legăturile simbolice\n"
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr ""
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr "  binary    utilizează I/E binară pentru date\n"
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr "  text      utilizează I/E textuală pentru date\n"
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr ""
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, c-format
 msgid ""
 "\n"
@@ -2951,7 +3030,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
@@ -2960,7 +3049,7 @@ msgstr ""
 "%<PRIuMAX>+%<PRIuMAX> înregistrări citite\n"
 "%<PRIuMAX>+%<PRIuMAX> înregistrări scrise\n"
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
@@ -2968,7 +3057,7 @@ msgstr[0] "%<PRIuMAX> înregistrare trunchiată\n"
 msgstr[1] "%<PRIuMAX> înregistrări trunchiate\n"
 msgstr[2] "%<PRIuMAX> de înregistrări trunchiate\n"
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
@@ -2976,7 +3065,7 @@ msgstr[0] "%<PRIuMAX> octet (%s) copiat"
 msgstr[1] "%<PRIuMAX> octeți (%s) copiați"
 msgstr[2] "%<PRIuMAX> de octeți (%s) copiați"
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr ""
 
@@ -2990,251 +3079,250 @@ msgstr ""
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
 msgstr ", %g s, %s/s\n"
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, c-format
 msgid "closing input file %s"
 msgstr "se închide fișierul de intrare %s"
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr "se închide fișierul de ieșire %s"
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr ""
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, c-format
 msgid "writing to %s"
 msgstr "se scrie în %s"
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, c-format
 msgid "unrecognized operand %s"
 msgstr "operand %s necunoscut"
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 msgid "invalid conversion"
 msgstr "conversie nevalidă"
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 msgid "invalid input flag"
 msgstr "fanion de intrare nevalid"
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 msgid "invalid output flag"
 msgstr "fanion de ieșire nevalid"
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 msgid "invalid status flag"
 msgstr "fanion de stare nevalid"
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, c-format
 msgid "invalid number %s"
 msgstr "număr nevalid %s"
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr ""
 
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, c-format
 msgid "cannot combine block and unblock"
 msgstr "block și unblock nu se pot combina"
 
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, c-format
 msgid "cannot combine lcase and ucase"
 msgstr "lcase și ucase nu se pot combina"
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, c-format
 msgid "cannot combine excl and nocreat"
 msgstr "excl și nocreat nu se pot combina"
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, fuzzy, c-format
 msgid "cannot combine direct and nocache"
 msgstr "excl și nocreat nu se pot combina"
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
 "  of mt_type=0x%0lx -- see <sys/mtio.h> for the list of types"
 msgstr ""
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, c-format
 msgid "%s: cannot skip"
 msgstr "%s: nu se poate sări"
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, c-format
 msgid "%s: cannot seek"
 msgstr "%s: nu se poate căuta"
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr ""
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr ""
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr ""
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, c-format
 msgid "setting flags for %s"
 msgstr "se stabilesc fanioane pentru %s"
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr "%s: nu se poate sări la decalajul specificat"
 
-#: src/dd.c:2133
+#: src/dd.c:2172
 #, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
 msgstr ""
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr "fdatasync eșuat pentru %s"
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
 msgstr "fsync eșuat pentru %s"
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, c-format
 msgid "failed to open %s"
 msgstr "eșec la deschiderea %s"
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
 "blocks"
 msgstr ""
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr ""
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, fuzzy, c-format
 msgid "failed to discard cache for: %s"
 msgstr "nu s-a putut face chdir în %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr "Paul Eggert"
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr "Sistem de fișiere"
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr "Tip"
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr "blocuri"
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr "Utilizat"
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr "Disponibil"
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr "Uz%"
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr "Inoduri"
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr "IUtilizat"
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr "ILiber"
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr "IUz%"
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr "Montat pe"
 
-#: src/df.c:383
-#, c-format
-msgid "option --output: field '%s' unknown"
+#: src/df.c:207
+msgid "File"
 msgstr ""
 
-#: src/df.c:390
+#: src/df.c:387
 #, fuzzy, c-format
-msgid "option --output: field '%s' used more than once"
+msgid "option --output: field %s unknown"
+msgstr "se închide fișierul de ieșire %s"
+
+#: src/df.c:394
+#, fuzzy, c-format
+msgid "option --output: field %s used more than once"
 msgstr "atenție: fișierul-sursă %s specificat mai mult decît o dată"
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr "Dimens"
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr "Liber"
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr "Capacitate"
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
 msgstr ""
 
-#: src/df.c:1210
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr ""
+
+#: src/df.c:1384
 #, fuzzy
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
@@ -3244,19 +3332,20 @@ msgstr ""
 "sau implicit toate sistemele de fișiere.\n"
 "\n"
 
-#: src/df.c:1217
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
 
-#: src/df.c:1227
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -3265,7 +3354,7 @@ msgid ""
 "(default)\n"
 msgstr ""
 
-#: src/df.c:1234
+#: src/df.c:1409
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
 "                               or print all fields if FIELD_LIST is "
@@ -3278,42 +3367,33 @@ msgid ""
 "  -v                    (ignored)\n"
 msgstr ""
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
 
-#: src/df.c:1285
+#: src/df.c:1460
 #, fuzzy, c-format
 msgid "options %s and %s are mutually exclusive"
 msgstr "opțiunile --backup și --no-clobber se exclud reciproc"
 
-#: src/df.c:1335
-#, fuzzy
-msgid "warning: "
-msgstr "Atenție: "
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr ""
-
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr ""
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr "Atenție: "
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 msgid "cannot read table of mounted file systems"
 msgstr "tabelul sistemelor de fișiere montate nu poate fi citit"
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr "niciun sistem de fișiere prelucrat"
@@ -3323,7 +3403,7 @@ msgstr "niciun sistem de fișiere prelucrat"
 msgid "H. Peter Anvin"
 msgstr "H. Peter Anvin"
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr "Utilizare: %s [OPȚIUNE]... [FIȘIER]\n"
@@ -3390,7 +3470,7 @@ msgid ""
 msgstr ""
 
 #: src/dirname.c:59
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/dirname.c:64
@@ -3403,7 +3483,7 @@ msgid ""
 "  %s stdio.h            -> \".\"\n"
 msgstr ""
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -3412,7 +3492,7 @@ msgstr ""
 "Utilizare: %s [OPȚIUNE]... [FIȘIER]...\n"
 "     sau:  %s [OPÈšIUNE]... --files0-from=F\n"
 
-#: src/du.c:274
+#: src/du.c:285
 #, fuzzy
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr ""
@@ -3420,10 +3500,9 @@ msgstr ""
 "dosare.\n"
 "\n"
 
-#: src/du.c:280
+#: src/du.c:291
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3432,11 +3511,11 @@ msgid ""
 "                          fragmentation, indirect blocks, and the like\n"
 msgstr ""
 
-#: src/du.c:289
+#: src/du.c:300
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3448,17 +3527,18 @@ msgid ""
 "                          --summarize\n"
 msgstr ""
 
-#: src/du.c:302
+#: src/du.c:313
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
 
-#: src/du.c:310
+#: src/du.c:322
 msgid ""
 "  -k                    like --block-size=1K\n"
 "  -L, --dereference     dereference all symbolic links\n"
@@ -3466,16 +3546,17 @@ msgid ""
 "  -m                    like --block-size=1M\n"
 msgstr ""
 
-#: src/du.c:316
+#: src/du.c:328
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
 
-#: src/du.c:322
+#: src/du.c:334
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
 "                          or entries greater than SIZE if negative\n"
@@ -3484,78 +3565,78 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
 msgstr ""
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
 "  -x, --one-file-system    skip directories on different file systems\n"
 msgstr ""
 
-#: src/du.c:386
+#: src/du.c:398
 msgid "Infinity"
 msgstr ""
 
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr ""
-
-#: src/du.c:624
+#: src/du.c:636
 #, fuzzy, c-format
 msgid "fts_read failed: %s"
 msgstr "fts_read a eșuat"
 
-#: src/du.c:780
+#: src/du.c:787
 #, c-format
 msgid "invalid maximum depth %s"
 msgstr ""
 
-#: src/du.c:809
+#: src/du.c:816
 #, fuzzy, c-format
 msgid "invalid --threshold argument '-0'"
 msgstr "argument %s%s nevalid „%s�"
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr ""
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr ""
 
-#: src/du.c:900
+#: src/du.c:911
 #, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr ""
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 msgid "file operands cannot be combined with --files0-from"
 msgstr ""
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr "%s: eroare de citire"
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr ""
 "la citirea denumirilor de fișiere din stdin, denumirea %s nu este permisă"
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 msgid "invalid zero-length file name"
 msgstr "denumire fișier de lungime zero nevalidă"
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr "total"
 
@@ -3645,7 +3726,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
 "Stabilește fiecare NUME la VALOARE în mediu și rulează COMANDĂ.\n"
@@ -3722,16 +3803,16 @@ msgid "input line is too long"
 msgstr "linie de intrare prea lungă"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr "Mike Parker"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr "James Youngman"
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
@@ -3740,7 +3821,7 @@ msgstr ""
 "Utilizare: %s EXPRESIE\n"
 "     sau:  %s OPÈšIUNE\n"
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -3751,7 +3832,7 @@ msgid ""
 "  ARG1 & ARG2       ARG1 if neither argument is null or 0, otherwise 0\n"
 msgstr ""
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -3762,14 +3843,14 @@ msgid ""
 "  ARG1 > ARG2       ARG1 is greater than ARG2\n"
 msgstr ""
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
 "  ARG1 - ARG2       arithmetic difference of ARG1 and ARG2\n"
 msgstr ""
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -3778,7 +3859,7 @@ msgid ""
 "  ARG1 % ARG2       arithmetic remainder of ARG1 divided by ARG2\n"
 msgstr ""
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -3789,7 +3870,7 @@ msgid ""
 "  length STRING              length of STRING\n"
 msgstr ""
 
-#: src/expr.c:251
+#: src/expr.c:250
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
 "                               keyword like 'match' or an operator like '/'\n"
@@ -3797,7 +3878,7 @@ msgid ""
 "  ( EXPRESSION )             value of EXPRESSION\n"
 msgstr ""
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -3807,7 +3888,7 @@ msgid ""
 "0.\n"
 msgstr ""
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -3815,32 +3896,32 @@ msgid ""
 "or 0, 2 if EXPRESSION is syntactically invalid, and 3 if an error occurred.\n"
 msgstr ""
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, c-format
 msgid "syntax error"
 msgstr "eroare de sintaxă"
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, c-format
 msgid "error in regular expression matcher"
 msgstr ""
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, fuzzy, c-format
 msgid "non-integer argument"
 msgstr "argument non-numeric"
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr "împărțire la zero"
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr "stabiliți LC_ALL='C' pentru a evita problema"
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, c-format
 msgid "the strings compared were %s and %s"
 msgstr "șirurile comparate au fost %s și %s"
@@ -3850,27 +3931,27 @@ msgstr "șirurile comparate au fost %s și %s"
 msgid "Niels Moller"
 msgstr ""
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
 msgstr ""
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
 msgstr ""
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, c-format
 msgid "%s is not a valid positive integer"
 msgstr "%s nu este un întreg pozitiv valid"
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr "%s este prea mare"
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
@@ -3879,7 +3960,7 @@ msgstr ""
 "Utilizare: %s [NUMÄ‚R]...\n"
 "     sau:  %s OPÈšIUNE\n"
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
 "are specified on the command line, read them from standard input.\n"
@@ -3966,28 +4047,28 @@ msgid "invalid number of columns: %s"
 msgstr "număr nevalid de coloane: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr "Padraig Brady"
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, c-format
 msgid "Usage: %s\n"
 msgstr "Utilizare: %s\n"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
 msgstr ""
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, c-format
 msgid "failed to get groups for user %s"
 msgstr "eșec la obținerea grupurilor pentru utilizatorul %s"
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, c-format
 msgid "failed to get groups for the current process"
 msgstr "eșec la obținerea grupurilor pentru procesul curent"
@@ -4009,22 +4090,22 @@ msgid ""
 "the current process (which may differ if the groups database has changed).\n"
 msgstr ""
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, fuzzy, c-format
 msgid "cannot get real UID"
 msgstr "nu se poate stabili data"
 
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, fuzzy, c-format
 msgid "cannot get effective GID"
 msgstr "%s nu poate fi dereferențiat"
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, fuzzy, c-format
 msgid "cannot get real GID"
 msgstr "nu se poate stabili data"
 
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, fuzzy, c-format
 msgid "%s: no such user"
 msgstr "%s: Nu există un asemenea utilizator"
@@ -4060,58 +4141,48 @@ msgid ""
 "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n"
 msgstr ""
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr ""
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, c-format
 msgid "%s: number of bytes is too large"
 msgstr "%s: numărul de octeți e prea mare"
 
-#: src/head.c:440
-#, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr ""
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr "%s: nu se poate căuta la decalajul %s"
 
-#: src/head.c:673
-#, fuzzy, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "%s: eșec la eliminare"
-
-#: src/head.c:798
+#: src/head.c:423 src/tail.c:457
 #, c-format
-msgid "cannot reposition file pointer for %s"
+msgid "%s: cannot seek to relative offset %s"
 msgstr ""
 
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr "%s: %s este atît de mare încît nu poate fi reprezentat"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr "număr de linii"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr "număr de octeți"
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr "număr de linii nevalid"
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr "număr de octeți nevalid"
 
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, c-format
 msgid "invalid trailing option -- %c"
 msgstr "opțiune finală nevalidă -- %c"
@@ -4156,145 +4227,161 @@ msgid "cannot determine hostname"
 msgstr "numele gazdei nu se poate determina"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr "Arnold Robbins"
 
-#: src/id.c:81
-#, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
-msgstr "Utilizare: %s [OPÈšIUNE]... [UTILIZATOR]\n"
+#: src/id.c:84
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]... [USER]\n"
+msgstr "Utilizare: %s [OPÈšIUNE]... [UTILIZATOR]...\n"
 
-#: src/id.c:82
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
 msgstr ""
 
-#: src/id.c:96
+#: src/id.c:90
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
+msgstr ""
+
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
 msgstr ""
 
-#: src/id.c:140
+#: src/id.c:151
+#, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr ""
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr ""
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr ""
 
-#: src/id.c:178
+#: src/id.c:198
 #, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr ""
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr ""
 
-#: src/id.c:199
+#: src/id.c:209
+#, c-format
+msgid "option --zero not permitted in default format"
+msgstr ""
+
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
 msgstr "contextul procesului nu poate fi obținut"
 
-#: src/id.c:224
+#: src/id.c:265
 #, fuzzy, c-format
 msgid "cannot get effective UID"
 msgstr "%s nu poate fi dereferențiat"
 
-#: src/id.c:311
+#: src/id.c:354
 #, fuzzy, c-format
 msgid "cannot find name for user ID %s"
 msgstr "numele nu poate fi stabilit la %s"
 
-#: src/id.c:329
+#: src/id.c:372
 #, fuzzy, c-format
 msgid "uid=%s"
 msgstr "uid=%lu"
 
-#: src/id.c:334
+#: src/id.c:377
 #, fuzzy, c-format
 msgid " gid=%s"
 msgstr " gid=%lu"
 
-#: src/id.c:341
+#: src/id.c:384
 #, fuzzy, c-format
 msgid " euid=%s"
 msgstr " euid=%lu"
 
-#: src/id.c:349
+#: src/id.c:392
 #, fuzzy, c-format
 msgid " egid=%s"
 msgstr " egid=%lu"
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr " grupuri="
 
-#: src/id.c:393
+#: src/id.c:437
 #, c-format
 msgid " context=%s"
 msgstr " context=%s"
 
-#: src/install.c:373
+#: src/install.c:376
 #, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr ""
 
-#: src/install.c:414
+#: src/install.c:417
 #, c-format
 msgid "creating directory %s"
 msgstr "se creează dosarul %s"
 
-#: src/install.c:482
+#: src/install.c:485
 #, c-format
 msgid "cannot change ownership of %s"
 msgstr "apartenența %s nu poate fi schimbată"
 
-#: src/install.c:506
+#: src/install.c:509
 #, c-format
 msgid "cannot set time stamps for %s"
 msgstr ""
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, c-format
 msgid "fork system call failed"
 msgstr ""
 
-#: src/install.c:531
+#: src/install.c:535
 #, c-format
 msgid "cannot run %s"
 msgstr "nu se poate rula %s"
 
-#: src/install.c:535
+#: src/install.c:539
 #, c-format
 msgid "waiting for strip"
 msgstr ""
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr ""
 
-#: src/install.c:558
+#: src/install.c:565
 #, c-format
 msgid "invalid user %s"
 msgstr "utilizator nevalid %s"
 
-#: src/install.c:594
+#: src/install.c:601
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -4303,7 +4390,7 @@ msgid ""
 "  or:  %s [OPTION]... -d DIRECTORY...\n"
 msgstr ""
 
-#: src/install.c:601
+#: src/install.c:608
 msgid ""
 "\n"
 "This install program copies files (often just compiled) into destination\n"
@@ -4317,7 +4404,7 @@ msgid ""
 "In the 4th form, create all components of the given DIRECTORY(ies).\n"
 msgstr ""
 
-#: src/install.c:615
+#: src/install.c:622
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
 "  -b                  like --backup but does not accept an argument\n"
@@ -4329,7 +4416,7 @@ msgid ""
 "                        components of the specified directories\n"
 msgstr ""
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -4341,7 +4428,7 @@ msgid ""
 "  -o, --owner=OWNER   set ownership (super-user only)\n"
 msgstr ""
 
-#: src/install.c:631
+#: src/install.c:638
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
 "files\n"
@@ -4355,60 +4442,57 @@ msgid ""
 "  -v, --verbose       print the name of each directory as it is created\n"
 msgstr ""
 
-#: src/install.c:641
+#: src/install.c:648
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
 
-#: src/install.c:859
+#: src/install.c:696 src/unlink.c:86
 #, c-format
-msgid ""
-"WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
+msgid "cannot unlink %s"
 msgstr ""
 
-#: src/install.c:869
+#: src/install.c:877
 #, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
+msgid ""
+"WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
 msgstr ""
 
-#: src/install.c:886
+#: src/install.c:917
 #, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr ""
 
-#: src/install.c:889
+#: src/install.c:920
 #, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr ""
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr ""
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, c-format
 msgid "invalid mode %s"
 msgstr "regim nevalid %s"
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr ""
 
-#: src/install.c:959
+#: src/install.c:1001
 #, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr ""
 
-#: src/install.c:966
+#: src/install.c:1008
 #, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr ""
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -4420,7 +4504,7 @@ msgstr ""
 msgid "Mike Haertel"
 msgstr "Mike Haertel"
 
-#: src/join.c:191
+#: src/join.c:195
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
 "standard output.  The default join field is the first, delimited\n"
@@ -4431,7 +4515,7 @@ msgid ""
 "  -e EMPTY          replace missing input fields with EMPTY\n"
 msgstr ""
 
-#: src/join.c:200
+#: src/join.c:204
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
 "  -j FIELD          equivalent to '-1 FIELD -2 FIELD'\n"
@@ -4439,7 +4523,7 @@ msgid ""
 "  -t CHAR           use CHAR as input and output field separator\n"
 msgstr ""
 
-#: src/join.c:206
+#: src/join.c:210
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
 "  -1 FIELD          join on this FIELD of file 1\n"
@@ -4451,7 +4535,11 @@ msgid ""
 "                      print them without trying to pair them\n"
 msgstr ""
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr ""
+
+#: src/join.c:225
 msgid ""
 "\n"
 "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n"
@@ -4470,47 +4558,47 @@ msgid ""
 "warning message will be given.\n"
 msgstr ""
 
-#: src/join.c:403
+#: src/join.c:410
 #, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
 msgstr ""
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, c-format
 msgid "invalid field number: %s"
 msgstr "număr de cîmp nevalid: %s"
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, c-format
 msgid "invalid field specifier: %s"
 msgstr "specificator de cîmp nevalid: %s"
 
-#: src/join.c:877
+#: src/join.c:884
 #, c-format
 msgid "invalid file number in field spec: %s"
 msgstr ""
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr ""
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr ""
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, c-format
 msgid "multi-character tab %s"
 msgstr ""
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr ""
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr "ambele fișiere nu pot fi intrarea standard"
@@ -4620,47 +4708,47 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr "nu se poate crea legătura %s la %s"
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr ""
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, c-format
 msgid "%s: cannot overwrite directory"
 msgstr "%s: dosarul nu se poate suprascrie"
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
 msgstr "%s: înlocuiți %s? "
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, fuzzy, c-format
 msgid "failed to create symbolic link %s"
 msgstr "legătura simbolică %s nu poate fi creată"
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, fuzzy, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr "nu se poate crea legătura simbolică %s la %s"
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, fuzzy, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr "nu s-a putut face chdir în %s"
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, fuzzy, c-format
 msgid "failed to create hard link %s"
 msgstr "eșec la crearea contextului de securitate: %s"
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, fuzzy, c-format
 msgid "failed to create hard link %s => %s"
 msgstr "nu se poate crea legătura %s la %s"
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -4669,7 +4757,7 @@ msgid ""
 "  or:  %s [OPTION]... -t DIRECTORY TARGET...  (4th form)\n"
 msgstr ""
 
-#: src/ln.c:381
+#: src/ln.c:398
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
 "In the 2nd form, create a link to TARGET in the current directory.\n"
@@ -4681,7 +4769,7 @@ msgid ""
 "interpreted in relation to its parent directory.\n"
 msgstr ""
 
-#: src/ln.c:394
+#: src/ln.c:411
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
 "file\n"
@@ -4694,7 +4782,7 @@ msgid ""
 "  -f, --force                 remove existing destination files\n"
 msgstr ""
 
-#: src/ln.c:402
+#: src/ln.c:419
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
 "  -L, --logical               dereference TARGETs that are symbolic links\n"
@@ -4706,7 +4794,7 @@ msgid ""
 "  -s, --symbolic              make symbolic links instead of hard links\n"
 msgstr ""
 
-#: src/ln.c:411
+#: src/ln.c:428
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
 "  -t, --target-directory=DIRECTORY  specify the DIRECTORY in which to "
@@ -4716,7 +4804,7 @@ msgid ""
 "  -v, --verbose               print name of each linked file\n"
 msgstr ""
 
-#: src/ln.c:433
+#: src/ln.c:450
 #, c-format
 msgid ""
 "\n"
@@ -4724,12 +4812,12 @@ msgid ""
 "behavior when a TARGET is a symbolic link, defaulting to %s.\n"
 msgstr ""
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr "nu se pot combina --target-directory și --no-target-directory"
 
-#: src/ln.c:588
+#: src/ln.c:605
 #, fuzzy, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr "legătura simbolică %s nu poate fi creată"
@@ -4762,7 +4850,7 @@ msgstr ""
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
@@ -4771,101 +4859,101 @@ msgstr "%b %e  %Y"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 msgid "%b %e %H:%M"
 msgstr "%b %e %H:%M"
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr ""
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr ""
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr ""
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, c-format
 msgid "invalid line width: %s"
 msgstr "lățime linie nevalidă: %s"
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, c-format
 msgid "invalid tab size: %s"
 msgstr ""
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, c-format
 msgid "invalid time style format %s"
 msgstr ""
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 #, fuzzy
 msgid "Valid arguments are:\n"
 msgstr "Argumente valide sînt:"
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr ""
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr "eroare la inițializarea șirurilor lunii"
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, c-format
 msgid "unrecognized prefix: %s"
 msgstr "prefix necunoscut: %s"
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr "valoarea pentru variabila de mediu LS_COLORS nu poate fi parcursă"
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, c-format
 msgid "cannot open directory %s"
 msgstr "dosarul %s nu poate fi deschis"
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, c-format
 msgid "cannot determine device and inode of %s"
 msgstr "dispozitivul și inodul pentru %s nu pot fi determinate"
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, c-format
 msgid "%s: not listing already-listed directory"
 msgstr "%s: nu se face lista dosarului deja făcută"
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, c-format
 msgid "reading directory %s"
 msgstr "se citește dosarul %s"
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, c-format
 msgid "closing directory %s"
 msgstr "se închide dosarul %s"
 
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, c-format
 msgid "cannot compare file names %s and %s"
 msgstr "denumirile de fișier %s și %s nu se pot compara"
 
-#: src/ls.c:4721
+#: src/ls.c:4781
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
 "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n"
 msgstr ""
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
 "  -A, --almost-all           do not list implied . and ..\n"
@@ -4874,33 +4962,32 @@ msgid ""
 "characters\n"
 msgstr ""
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
 "  -F, --classify             append indicator (one of */=>@|) to entries\n"
@@ -4910,40 +4997,41 @@ msgid ""
 "      --full-time            like -l --time-style=full-iso\n"
 msgstr ""
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr ""
 
-#: src/ls.c:4763
+#: src/ls.c:4823
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 
-#: src/ls.c:4769
+#: src/ls.c:4829
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
 
-#: src/ls.c:4775
+#: src/ls.c:4835
 msgid ""
 "  -H, --dereference-command-line\n"
 "                             follow symbolic links listed on the command "
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
 msgstr ""
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
 "names:\n"
@@ -4952,10 +5040,10 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -4965,7 +5053,7 @@ msgid ""
 "entries\n"
 msgstr ""
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -4976,11 +5064,11 @@ msgid ""
 "                             append / indicator to directories\n"
 msgstr ""
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -4988,7 +5076,7 @@ msgid ""
 "escape\n"
 msgstr ""
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
 "  -R, --recursive            list subdirectories recursively\n"
@@ -4996,56 +5084,59 @@ msgid ""
 "blocks\n"
 msgstr ""
 
-#: src/ls.c:4825
+#: src/ls.c:4886
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 
-#: src/ls.c:4835
+#: src/ls.c:4896
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
 msgstr ""
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 msgid ""
 "  -t                         sort by modification time, newest first\n"
 "  -T, --tabsize=COLS         assume tab stops at each COLS instead of 8\n"
 msgstr ""
 
-#: src/ls.c:4848
+#: src/ls.c:4912
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
 msgstr ""
 
-#: src/ls.c:4855
+#: src/ls.c:4919
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -5054,7 +5145,7 @@ msgid ""
 "variable can change the settings.  Use the dircolors command to set it.\n"
 msgstr ""
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -5122,19 +5213,16 @@ msgstr "  -t, --text              citește în regim textual (implicit)\n"
 #: src/md5sum.c:195
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, c-format
 msgid ""
 "\n"
@@ -5144,35 +5232,35 @@ msgid ""
 "space for text), and name for each FILE.\n"
 msgstr ""
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, c-format
 msgid "%s: too many checksum lines"
 msgstr ""
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr ""
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr ""
 
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr "EȘUAT"
 
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr "OK"
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr ""
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
@@ -5180,7 +5268,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
@@ -5188,7 +5276,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
@@ -5196,114 +5284,140 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
 msgstr ""
 
-#: src/md5sum.c:766
+#: src/md5sum.c:770
 #, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr ""
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
 msgstr ""
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr ""
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr ""
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr ""
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr ""
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr "Utilizare: %s [OPÈšIUNE]... DOSAR...\n"
 
-#: src/mkdir.c:57
+#: src/mkdir.c:59
 #, fuzzy
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
 msgstr ""
 "Creează DOSAR(ele), dacă acestea nu există deja.\n"
 "\n"
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 
-#: src/mkdir.c:168
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/mkdir.c:127 src/mkdir.c:172
+#, fuzzy, c-format
+msgid "failed to set default creation context for %s"
+msgstr "eșec la stabilirea contextului implicit de creare a fișierelor la %s"
+
+#: src/mkdir.c:191
+#, fuzzy, c-format
+msgid "failed to restore context for %s"
+msgstr "păstrarea timpilor pentru %s a eșuat"
+
+#: src/mkdir.c:231
 #, c-format
 msgid "created directory %s"
 msgstr "creat dosarul %s"
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr ""
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr "Utilizare: %s [OPÈšIUNE]... DENUMIRE...\n"
 
-#: src/mkfifo.c:52
+#: src/mkfifo.c:54
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
 msgstr ""
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
 msgstr ""
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, c-format
 msgid "invalid mode"
 msgstr "regim nevalid"
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr ""
 
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
+#, fuzzy, c-format
+msgid "cannot set permissions of %s"
+msgstr "permisiunile %s nu se pot modifica"
+
+#: src/mknod.c:54
 #, c-format
 msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr "Utilizare: %s [OPÈšIUNE]... DENUMIRE TIP [MAJOR MINOR]\n"
 
-#: src/mknod.c:54
+#: src/mknod.c:56
 #, fuzzy
 msgid "Create the special file NAME of the given TYPE.\n"
 msgstr ""
 "Creează fișierul special DENUMIRE de tip TIP.\n"
 "\n"
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr ""
-
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -5312,7 +5426,7 @@ msgid ""
 "otherwise, as decimal.  TYPE may be:\n"
 msgstr ""
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 msgid ""
 "\n"
 "  b      create a block (buffered) special file\n"
@@ -5320,151 +5434,145 @@ msgid ""
 "  p      create a FIFO\n"
 msgstr ""
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 msgid "Special files require major and minor device numbers."
 msgstr "Fișierele speciale necesită numere de dispozitiv majore și minore."
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 msgid "Fifos do not have major and minor device numbers."
 msgstr ""
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, c-format
 msgid "block special files not supported"
 msgstr ""
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, c-format
 msgid "character special files not supported"
 msgstr ""
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, c-format
 msgid "invalid major device number %s"
 msgstr ""
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, c-format
 msgid "invalid minor device number %s"
 msgstr ""
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, c-format
 msgid "invalid device %s %s"
 msgstr "dispozitiv nevalid %s %s"
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, c-format
 msgid "invalid device type %s"
 msgstr "tip de dispozitiv nevalid %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr ""
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr "Utilizare: %s [OPȚIUNE]... [ȘABLON]\n"
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
 "TEMPLATE must contain at least 3 consecutive 'X's in last component.\n"
 "If TEMPLATE is not specified, use tmp.XXXXXXXXXX, and --tmpdir is implied.\n"
 msgstr ""
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
 "  -q, --quiet         suppress diagnostics about file/dir-creation failure\n"
 msgstr ""
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
 msgstr ""
 
-#: src/mktemp.c:223
-#, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr "eșec la redirecționarea stderr spre /dev/null"
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, c-format
 msgid "too many templates"
 msgstr "prea multe șabloane"
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr ""
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, fuzzy, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr "șablonul nevalid, %s, conține separator de dosare"
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr "prea puțini X în șablonul %s"
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr "șablonul nevalid, %s, conține separator de dosare"
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr "șablon nevalid, %s; cu --tmpdir, poate să nu fie absolut"
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, c-format
 msgid "failed to create directory via template %s"
 msgstr "eșec la crearea dosarului prin șablonul %s"
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, c-format
 msgid "failed to create file via template %s"
 msgstr "eșec la crearea fișierului prin șablonul %s"
 
-#: src/mv.c:292
+#: src/mv.c:294
 #, fuzzy
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 "Redenumește SURSĂ în DEST, sau mută SURSĂ în DOSAR.\n"
 "\n"
 
-#: src/mv.c:298
+#: src/mv.c:300
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
 "file\n"
@@ -5477,7 +5585,7 @@ msgid ""
 "effect.\n"
 msgstr ""
 
-#: src/mv.c:307
+#: src/mv.c:309
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
@@ -5485,7 +5593,7 @@ msgid ""
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
 msgstr ""
 
-#: src/mv.c:312
+#: src/mv.c:314
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
 "DIRECTORY\n"
@@ -5494,6 +5602,8 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
 
 #: src/nice.c:72
@@ -5737,95 +5847,90 @@ msgid "%s: invalid number to ignore"
 msgstr "%s: număr de linii nevalid"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
 msgstr ""
 
-#: src/numfmt.c:676
-#, c-format
-msgid "value too large to be converted: '%s'"
-msgstr ""
+#: src/numfmt.c:659
+#, fuzzy, c-format
+msgid "value too large to be converted: %s"
+msgstr "eșec la crearea contextului de securitate: %s"
 
-#: src/numfmt.c:680
+#: src/numfmt.c:663
 #, fuzzy, c-format
-msgid "invalid number: '%s'"
+msgid "invalid number: %s"
 msgstr "număr nevalid %s"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
+msgid "rejecting suffix in input: %s (consider using --from)"
 msgstr ""
 
-#: src/numfmt.c:688
+#: src/numfmt.c:671
 #, fuzzy, c-format
-msgid "invalid suffix in input: '%s'"
+msgid "invalid suffix in input: %s"
 msgstr "lățime linie nevalidă: %s"
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
 msgstr ""
 
-#: src/numfmt.c:723
+#: src/numfmt.c:722 src/numfmt.c:768
 #, fuzzy, c-format
 msgid "failed to prepare value '%Lf' for printing"
 msgstr "%s: eșec la deschiderea pentru scriere"
 
-#: src/numfmt.c:787
+#: src/numfmt.c:791
 #, fuzzy, c-format
-msgid "invalid unit size: '%s'"
+msgid "invalid unit size: %s"
 msgstr "utilizator nevalid %s"
 
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
-#, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr ""
-
-#: src/numfmt.c:813
+#: src/numfmt.c:814
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
 msgstr "Utilizare: %s [OPÈšIUNE]... [UTILIZATOR]...\n"
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
 msgstr ""
 
-#: src/numfmt.c:820
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
 msgstr ""
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
 msgstr ""
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
 "                         see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr ""
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
@@ -5833,19 +5938,19 @@ msgid ""
 "locale)\n"
 msgstr ""
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
 msgstr ""
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
 msgstr ""
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -5855,40 +5960,40 @@ msgid ""
 "                         is found\n"
 msgstr ""
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
 "nearest\n"
 msgstr ""
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
 msgstr ""
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr ""
 
-#: src/numfmt.c:877
+#: src/numfmt.c:878
 msgid ""
 "\n"
 "UNIT options:\n"
 msgstr ""
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr ""
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -5897,7 +6002,7 @@ msgid ""
 "               1Mi = 1048576,\n"
 msgstr ""
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
@@ -5905,7 +6010,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
@@ -5913,7 +6018,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
@@ -5921,18 +6026,18 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:905
+#: src/numfmt.c:906
 #, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -5944,7 +6049,7 @@ msgid ""
 "errors are not diagnosed and the exit status is 0.\n"
 msgstr ""
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -5965,112 +6070,112 @@ msgid ""
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 msgstr ""
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, c-format
 msgid "format %s has no %% directive"
 msgstr ""
 
-#: src/numfmt.c:990
+#: src/numfmt.c:1003
 #, fuzzy, c-format
 msgid "invalid format %s (width overflow)"
 msgstr "lățime nevalidă a formatului"
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr ""
+
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr ""
 
-#: src/numfmt.c:1010
+#: src/numfmt.c:1030
 #, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
 msgstr ""
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr ""
 
-#: src/numfmt.c:1070
+#: src/numfmt.c:1081
 #, fuzzy, c-format
-msgid "invalid suffix in input '%s': '%s'"
+msgid "invalid suffix in input %s: %s"
 msgstr "lățime linie nevalidă: %s"
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
 msgstr ""
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
 msgstr ""
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
+msgid "large input value %s: possible precision loss"
 msgstr ""
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
 
-#: src/numfmt.c:1388
+#: src/numfmt.c:1403
 #, fuzzy, c-format
-msgid "invalid padding value '%s'"
+msgid "invalid padding value %s"
 msgstr "interval de pagini nevalid %s"
 
-#: src/numfmt.c:1401
+#: src/numfmt.c:1417
 #, fuzzy, c-format
-msgid "invalid field value '%s'"
+msgid "invalid field value %s"
 msgstr "număr de cîmp nevalid: %s"
 
-#: src/numfmt.c:1430
+#: src/numfmt.c:1447
 #, fuzzy, c-format
-msgid "invalid header value '%s'"
+msgid "invalid header value %s"
 msgstr "dată nevalidă %s"
 
-#: src/numfmt.c:1456
+#: src/numfmt.c:1473
 #, fuzzy, c-format
 msgid "--grouping cannot be combined with --format"
 msgstr "semnalul nu se poate combina cu -l sau -t"
 
-#: src/numfmt.c:1458
-#, fuzzy, c-format
-msgid "--padding cannot be combined with --format"
-msgstr "semnalul nu se poate combina cu -l sau -t"
-
-#: src/numfmt.c:1463
+#: src/numfmt.c:1478
 #, fuzzy, c-format
 msgid "no conversion option specified"
 msgstr "niciun identificator de proces specificat"
 
-#: src/numfmt.c:1471
+#: src/numfmt.c:1486
 #, fuzzy, c-format
 msgid "grouping cannot be combined with --to"
 msgstr "semnalul nu se poate combina cu -l sau -t"
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
 msgstr ""
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
 msgstr ""
 
-#: src/numfmt.c:1511
+#: src/numfmt.c:1526
 #, fuzzy, c-format
 msgid "error reading input"
 msgstr "eroare la citirea %s"
 
-#: src/numfmt.c:1520
+#: src/numfmt.c:1535
 #, fuzzy, c-format
 msgid "failed to convert some of the input numbers"
 msgstr "redirijarea ieșirii standard a eșuat"
 
-#: src/od.c:294
+#: src/od.c:320
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -6083,7 +6188,7 @@ msgstr ""
 "     sau:  %s --traditional [OPȚIUNE]... [FIȘIER] [[+]DECALAJ[.][b] [+]"
 "[ETICHETÄ‚][.][b]]\n"
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -6093,7 +6198,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/od.c:307
+#: src/od.c:333
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
 "if the last operand begins with + or (if there are 2 operands) a digit.\n"
@@ -6103,38 +6208,40 @@ msgid ""
 "suffixes may be . for octal and b for multiply by 512.\n"
 msgstr ""
 
-#: src/od.c:318
+#: src/od.c:344
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
 
-#: src/od.c:323
+#: src/od.c:350
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
 
-#: src/od.c:336
+#: src/od.c:363
 msgid ""
 "\n"
 "\n"
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 
-#: src/od.c:345
+#: src/od.c:372
 msgid ""
 "  -f   same as -t fF, select floats\n"
 "  -i   same as -t dI, select decimal ints\n"
@@ -6144,16 +6251,16 @@ msgid ""
 "  -x   same as -t x2, select hexadecimal 2-byte units\n"
 msgstr ""
 
-#: src/od.c:353
+#: src/od.c:380
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -6162,7 +6269,7 @@ msgid ""
 "  x[SIZE]    hexadecimal, SIZE bytes per integer\n"
 msgstr ""
 
-#: src/od.c:367
+#: src/od.c:394
 msgid ""
 "\n"
 "SIZE is a number.  For TYPE in [doux], SIZE may also be C for\n"
@@ -6171,14 +6278,14 @@ msgid ""
 "for sizeof(double) or L for sizeof(long double).\n"
 msgstr ""
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
 "each output line.\n"
 msgstr ""
 
-#: src/od.c:379
+#: src/od.c:406
 msgid ""
 "\n"
 "\n"
@@ -6191,55 +6298,55 @@ msgid ""
 "and so on for G, T, P, E, Z, Y.\n"
 msgstr ""
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, c-format
 msgid "invalid type string %s"
 msgstr ""
 
-#: src/od.c:649
+#: src/od.c:690
 #, c-format
 msgid ""
 "invalid type string %s;\n"
 "this system doesn't provide a %lu-byte integral type"
 msgstr ""
 
-#: src/od.c:770
+#: src/od.c:811
 #, c-format
 msgid ""
 "invalid type string %s;\n"
 "this system doesn't provide a %lu-byte floating point type"
 msgstr ""
 
-#: src/od.c:828
+#: src/od.c:869
 #, fuzzy, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr "caracter neportabil %s în denumirea de fișier %s"
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr ""
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr ""
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr ""
 
-#: src/od.c:1810
+#: src/od.c:1863
 msgid "compatibility mode supports at most one file"
 msgstr "regimul de compatibilitate susține cel mult un fișier"
 
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr "skip-bytes + read-bytes este prea mare"
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr "atenție: lățime nevalidă %lu; se utilizează %d în loc"
@@ -6390,12 +6497,12 @@ msgstr "Cînd"
 msgid "Where"
 msgstr "Unde"
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr "Utilizare: %s [OPÈšIUNE]... [UTILIZATOR]...\n"
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -6405,7 +6512,7 @@ msgid ""
 "  -s              do short format output, this is the default\n"
 msgstr ""
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -6414,7 +6521,7 @@ msgid ""
 "                  in short format\n"
 msgstr ""
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, c-format
 msgid ""
 "\n"
@@ -6422,7 +6529,7 @@ msgid ""
 "The utmp file will be %s.\n"
 msgstr ""
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr ""
@@ -6589,12 +6696,13 @@ msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
 
-#: src/pr.c:2827
+#: src/pr.c:2828
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
 "                    separate columns by STRING,\n"
@@ -6604,7 +6712,7 @@ msgid ""
 "  -t, --omit-header  omit page headers and trailers\n"
 msgstr ""
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 msgid ""
 "  -T, --omit-pagination\n"
 "                    omit page headers and trailers, eliminate any "
@@ -6618,7 +6726,7 @@ msgid ""
 "(72)\n"
 msgstr ""
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
 "                    set page width to PAGE_WIDTH (72) characters always,\n"
@@ -6627,7 +6735,7 @@ msgid ""
 "                    with -S or -s\n"
 msgstr ""
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 #, fuzzy
 msgid ""
 "\n"
@@ -6647,7 +6755,7 @@ msgid ""
 msgstr ""
 
 #: src/printenv.c:69
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/printf.c:79
@@ -6745,12 +6853,12 @@ msgstr "atenție: se ignoră argumentele în exces, începînd cu %s"
 msgid "F. Pinard"
 msgstr "François Pinard"
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, c-format
 msgid "%s (for regexp %s)"
 msgstr ""
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
@@ -6759,20 +6867,20 @@ msgstr ""
 "Utilizare: %s [OPȚIUNE]... [INTRARE]...   (fără -G)\n"
 "     sau:  %s -G [OPȚIUNE]... [INTRARE [IEȘIRE]]\n"
 
-#: src/ptx.c:1821
+#: src/ptx.c:1824
 msgid ""
 "Output a permuted index, including context, of the words in the input "
 "files.\n"
 msgstr ""
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
 "  -G, --traditional              behave more like System V 'ptx'\n"
 "  -F, --flag-truncation=STRING   use STRING for flagging line truncations\n"
 msgstr ""
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
 "  -O, --format=roff              generate output as roff directives\n"
@@ -6781,7 +6889,7 @@ msgid ""
 "  -T, --format=tex               generate output as TeX directives\n"
 msgstr ""
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -6791,7 +6899,7 @@ msgid ""
 "  -o, --only-file=FILE           read only word list from this FILE\n"
 msgstr ""
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -6799,16 +6907,16 @@ msgid ""
 "excluded\n"
 msgstr ""
 
-#: src/ptx.c:1854
+#: src/ptx.c:1857
 #, fuzzy
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
 "\n"
 "Fără FIȘIER, sau cînd FIȘIER e -, citește intrarea standard.\n"
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, c-format
 msgid "invalid gap width: %s"
 msgstr ""
@@ -6827,22 +6935,28 @@ msgid ""
 "  -P, --physical  avoid all symlinks\n"
 msgstr ""
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+
+#: src/pwd.c:169
 #, c-format
 msgid "failed to chdir to %s"
 msgstr "nu s-a putut face chdir în %s"
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, c-format
 msgid "failed to stat %s"
 msgstr "nu s-a putut face stat %s"
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr ""
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, c-format
 msgid "ignoring non-option arguments"
 msgstr "se ignoră argumentele non-opțiune"
@@ -6852,8 +6966,8 @@ msgstr "se ignoră argumentele non-opțiune"
 msgid "Dmitry V. Levin"
 msgstr "Dmitrii V. Levin"
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Utilizare: %s [OPȚIUNE]... FIȘIER...\n"
@@ -6889,8 +7003,7 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/readlink.c:152
@@ -6915,7 +7028,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 
@@ -6933,41 +7046,42 @@ msgstr "%s: descindeți în dosarul protejat la scriere %s? "
 msgid "%s: descend into directory %s? "
 msgstr "%s: descindeți în dosarul %s? "
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr ""
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, c-format
 msgid "%s: remove %s %s? "
 msgstr "%s: eliminați %s %s? "
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, c-format
 msgid "removed directory: %s\n"
 msgstr "dosar eliminat: %s\n"
 
-#: src/remove.c:444
+#: src/remove.c:447
 #, fuzzy, c-format
-msgid "cannot remove directory: %s"
-msgstr "dosarul %s nu poate fi eliminat"
+msgid "refusing to remove %s or %s directory: skipping %s"
+msgstr "eșec la eliminarea dosarului %s"
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr "se sare %s, întrucît se află pe alt dispozitiv"
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, fuzzy, c-format
 msgid "traversal failed: %s"
 msgstr "citire eșuată"
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -6992,12 +7106,12 @@ msgstr ""
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 
 #: src/rm.c:149
@@ -7044,14 +7158,20 @@ msgid ""
 msgstr ""
 
 #: src/rm.c:342
-#, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr "%s: eliminați toate argumentele recursiv? "
+#, fuzzy, c-format
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] "%s: eliminați toate argumentele recursiv? "
+msgstr[1] "%s: eliminați toate argumentele recursiv? "
+msgstr[2] "%s: eliminați toate argumentele recursiv? "
 
-#: src/rm.c:343
-#, c-format
-msgid "%s: remove all arguments? "
-msgstr "%s: eliminați toate argumentele? "
+#: src/rm.c:345
+#, fuzzy, c-format
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] "%s: eliminați toate argumentele? "
+msgstr[1] "%s: eliminați toate argumentele? "
+msgstr[2] "%s: eliminați toate argumentele? "
 
 #: src/rmdir.c:134 src/rmdir.c:233
 #, c-format
@@ -7094,7 +7214,7 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
 
@@ -7144,41 +7264,46 @@ msgstr ""
 msgid "no command specified"
 msgstr "nicio comandă specificată"
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr ""
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, c-format
 msgid "failed to compute a new context"
 msgstr ""
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, c-format
 msgid "failed to set new user %s"
 msgstr ""
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, c-format
 msgid "failed to set new type %s"
 msgstr ""
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, c-format
 msgid "failed to set new range %s"
 msgstr ""
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, c-format
 msgid "failed to set new role %s"
 msgstr ""
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, c-format
 msgid "unable to set security context %s"
 msgstr ""
 
+#: src/selinux.c:127 src/selinux.c:300
+#, fuzzy, c-format
+msgid "error canonicalizing %s"
+msgstr "eroare la citirea %s"
+
 #: src/seq.c:68
 #, c-format
 msgid ""
@@ -7203,95 +7328,47 @@ msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
 msgstr ""
 
-#: src/seq.c:94
+#: src/seq.c:96
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
 "it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n"
 "decimal numbers with maximum precision PREC, and to %g otherwise.\n"
 msgstr ""
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, c-format
 msgid "invalid floating point argument: %s"
 msgstr ""
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr ""
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr ""
 
-#: src/setuidgid.c:49
-#, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-
-#: src/setuidgid.c:55
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr ""
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr ""
-
-#: src/setuidgid.c:190
-#, c-format
-msgid "failed to set supplemental group(s)"
-msgstr ""
-
-#: src/setuidgid.c:200
-#, c-format
-msgid "cannot set group-ID to %lu"
-msgstr ""
-
-#: src/setuidgid.c:204
-#, c-format
-msgid "cannot set user-ID to %lu"
-msgstr ""
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr "Colin Plumb"
 
-#: src/shred.c:148
+#: src/shred.c:170
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
 "for even very expensive hardware probing to recover the data.\n"
 msgstr ""
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -7300,28 +7377,32 @@ msgid ""
 "  -s, --size=N   shred this many bytes (suffixes like K, M, G accepted)\n"
 msgstr ""
 
-#: src/shred.c:161
+#: src/shred.c:183
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
 "  -z, --zero     add a final overwrite with zeros to hide shredding\n"
 msgstr ""
 
-#: src/shred.c:170
+#: src/shred.c:192
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -7332,7 +7413,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -7344,7 +7425,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -7353,7 +7434,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -7365,134 +7446,134 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:215
+#: src/shred.c:241
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
 "of the file that cannot be removed, and that will allow a shredded file\n"
 "to be recovered later.\n"
 msgstr ""
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, c-format
 msgid "%s: fdatasync failed"
 msgstr ""
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr ""
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr ""
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr ""
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, c-format
 msgid "%s: error writing at offset %s"
 msgstr ""
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, c-format
 msgid "%s: lseek failed"
 msgstr ""
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, c-format
 msgid "%s: file too large"
 msgstr "%s: fișier prea mare"
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr ""
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr ""
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, c-format
 msgid "%s: fstat failed"
 msgstr "%s: fstat eșuat"
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, c-format
 msgid "%s: invalid file type"
 msgstr "%s: tip de fișier nevalid"
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr "%s: fișierul are dimensiune nevalidă"
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, c-format
 msgid "%s: error truncating"
 msgstr "%s: eroare la trunchiere"
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, c-format
 msgid "%s: fcntl failed"
 msgstr "%s: fcntl eșuat"
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr ""
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr "%s: eliminare"
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, c-format
 msgid "%s: renamed to %s"
 msgstr "%s: redenumit în %s"
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, c-format
 msgid "%s: failed to remove"
 msgstr "%s: eșec la eliminare"
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr "%s: eliminat"
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, c-format
 msgid "%s: failed to close"
 msgstr "%s: eșec la închidere"
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, c-format
 msgid "%s: failed to open for writing"
 msgstr "%s: eșec la deschiderea pentru scriere"
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, c-format
 msgid "%s: invalid number of passes"
 msgstr ""
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, c-format
 msgid "multiple random sources specified"
 msgstr ""
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, c-format
 msgid "%s: invalid file size"
 msgstr "%s: dimensiune de fișier nevalidă"
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -7500,11 +7581,11 @@ msgid ""
 "  or:  %s -i LO-HI [OPTION]...\n"
 msgstr ""
 
-#: src/shuf.c:54
+#: src/shuf.c:67
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr ""
 
-#: src/shuf.c:60
+#: src/shuf.c:73
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
 "  -i, --input-range=LO-HI   treat each number LO through HI as an input "
@@ -7512,34 +7593,44 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
 msgstr ""
 
-#: src/shuf.c:244
+#: src/shuf.c:228
+#, fuzzy, c-format
+msgid "too many input lines"
+msgstr "prea multe linii repetate"
+
+#: src/shuf.c:431
 #, c-format
 msgid "multiple -i options specified"
 msgstr ""
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, c-format
 msgid "invalid input range %s"
 msgstr ""
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, c-format
 msgid "invalid line count %s"
 msgstr ""
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, c-format
 msgid "multiple output files specified"
 msgstr "multiple fișiere de ieșire specificate"
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, c-format
 msgid "cannot combine -e and -i options"
 msgstr ""
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr ""
+
 #: src/sleep.c:44
 #, c-format
 msgid ""
@@ -7554,23 +7645,23 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, c-format
 msgid "invalid time interval %s"
 msgstr ""
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr ""
 
-#: src/sort.c:399
+#: src/sort.c:427
 #, fuzzy
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr ""
 "Tipărește fragmente alese de linie din fiecare FIȘIER pe ieșirea standard.\n"
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
@@ -7578,7 +7669,7 @@ msgstr ""
 "Opțiuni de ordonare:\n"
 "\n"
 
-#: src/sort.c:409
+#: src/sort.c:437
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
 "  -d, --dictionary-order      consider only blanks and alphanumeric "
@@ -7586,19 +7677,19 @@ msgid ""
 "  -f, --ignore-case           fold lower case to upper case characters\n"
 msgstr ""
 
-#: src/sort.c:415
+#: src/sort.c:443
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
 "  -i, --ignore-nonprinting    consider only printable characters\n"
 "  -M, --month-sort            compare (unknown) < 'JAN' < ... < 'DEC'\n"
 msgstr ""
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 
-#: src/sort.c:423
+#: src/sort.c:451
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
 "  -R, --random-sort           sort by random hash of keys\n"
@@ -7606,7 +7697,7 @@ msgid ""
 "  -r, --reverse               reverse the result of comparisons\n"
 msgstr ""
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -7616,19 +7707,19 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/sort.c:437
+#: src/sort.c:465
 msgid ""
 "Other options:\n"
 "\n"
 msgstr ""
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
 msgstr ""
 
-#: src/sort.c:445
+#: src/sort.c:473
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
 "  -C, --check=quiet, --check=silent  like -c, but do not report first bad "
@@ -7637,7 +7728,7 @@ msgid ""
 "                              decompress them with PROG -d\n"
 msgstr ""
 
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -7646,13 +7737,13 @@ msgid ""
 "                            If F is - then read names from standard input\n"
 msgstr ""
 
-#: src/sort.c:459
+#: src/sort.c:487
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
 "  -m, --merge               merge already sorted files; do not sort\n"
 msgstr ""
 
-#: src/sort.c:463
+#: src/sort.c:491
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "  -s, --stable              stabilize sort by disabling last-resort "
@@ -7660,7 +7751,7 @@ msgid ""
 "  -S, --buffer-size=SIZE    use SIZE for main memory buffer\n"
 msgstr ""
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -7675,11 +7766,7 @@ msgid ""
 "run\n"
 msgstr ""
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr ""
-
-#: src/sort.c:483
+#: src/sort.c:511
 msgid ""
 "\n"
 "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is "
@@ -7698,7 +7785,7 @@ msgid ""
 "SIZE may be followed by the following multiplicative suffixes:\n"
 msgstr ""
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -7710,259 +7797,244 @@ msgid ""
 "native byte values.\n"
 msgstr ""
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, c-format
 msgid "waiting for %s [-d]"
 msgstr ""
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr ""
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, c-format
 msgid "cannot create temporary file in %s"
 msgstr ""
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr "deschidere eșuată"
 
-#: src/sort.c:970
+#: src/sort.c:998
 msgid "fflush failed"
 msgstr "fflush eșuat"
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr "închidere eșuată"
 
-#: src/sort.c:986
-#, c-format
-msgid "dup2 failed"
-msgstr "dup2 eșuat"
-
-#: src/sort.c:1103
-#, c-format
-msgid "couldn't execute %s"
-msgstr ""
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 msgid "couldn't create temporary file"
 msgstr "fișierul temporar nu a putut fi creat"
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, c-format
 msgid "couldn't create process for %s -d"
 msgstr ""
 
-#: src/sort.c:1161
-#, c-format
-msgid "couldn't execute %s -d"
-msgstr ""
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, c-format
 msgid "warning: cannot remove: %s"
 msgstr ""
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, c-format
 msgid "invalid --%s argument %s"
 msgstr ""
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, c-format
 msgid "minimum --%s argument is %s"
 msgstr ""
 
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, c-format
 msgid "--%s argument %s too large"
 msgstr ""
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr ""
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr ""
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr "stat eșuat"
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr "citire eșuată"
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, c-format
 msgid "string transformation failed"
 msgstr "transformarea șirului a eșuat"
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, c-format
 msgid "the untransformed string was %s"
 msgstr "șirul transformat a fost %s"
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr ""
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr ""
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr ""
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr ""
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr ""
 
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, fuzzy, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
-msgstr[0] "opțiunile „-%s� sînt incompatibile"
-msgstr[1] "opțiunile „-%s� sînt incompatibile"
-msgstr[2] "opțiunile „-%s� sînt incompatibile"
+msgstr[0] "%s: opțiunea „%s� e ambiguă\n"
+msgstr[1] "%s: opțiunea „%s� e ambiguă\n"
+msgstr[2] "%s: opțiunea „%s� e ambiguă\n"
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr ""
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr "scriere eșuată"
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr ""
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr "eroarea standard"
 
-#: src/sort.c:3698
+#: src/sort.c:3738
 #, fuzzy
 msgid "cannot read"
 msgstr "nu se poate stabili data"
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, c-format
 msgid "%s: invalid field specification %s"
 msgstr ""
 
-#: src/sort.c:3987
+#: src/sort.c:4028
 #, fuzzy, c-format
 msgid "options '-%s' are incompatible"
 msgstr "opțiunile „-%s� sînt incompatibile"
 
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, c-format
 msgid "%s: invalid count at start of %s"
 msgstr ""
 
-#: src/sort.c:4295
+#: src/sort.c:4336
 #, fuzzy
 msgid "invalid number after '-'"
 msgstr "număr nevalid după „-�"
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 #, fuzzy
 msgid "invalid number after '.'"
 msgstr "număr nevalid după „.�"
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr ""
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, c-format
 msgid "multiple compress programs specified"
 msgstr ""
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
 msgstr ""
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
 msgstr "numărul cîmpului e zero"
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr ""
 
-#: src/sort.c:4407
+#: src/sort.c:4448
 #, fuzzy
 msgid "invalid number after ','"
 msgstr "număr nevalid după „,�"
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr ""
 
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, c-format
 msgid "cannot read file names from %s"
 msgstr ""
 
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr ""
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, c-format
 msgid "no input from %s"
 msgstr ""
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr ""
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr ""
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr ""
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr ""
 
-#: src/split.c:204
+#: src/split.c:203
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr "Utilizare: %s [OPÈšIUNE]... [INTRARE [PREFIX]]\n"
 
-#: src/split.c:208
+#: src/split.c:207
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
 "size is 1000 lines, and default PREFIX is 'x'.  With no INPUT, or when "
@@ -7970,32 +8042,31 @@ msgid ""
 "is -, read standard input.\n"
 msgstr ""
 
-#: src/split.c:216
+#: src/split.c:215
 #, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
 
-#: src/split.c:229
+#: src/split.c:228
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
 "                            output file is opened\n"
 msgstr ""
 
-#: src/split.c:236
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -8007,189 +8078,189 @@ msgid ""
 "r/K/N   likewise but only output Kth of N to stdout\n"
 msgstr ""
 
-#: src/split.c:354
+#: src/split.c:353
 #, c-format
 msgid "output file suffixes exhausted"
 msgstr ""
 
-#: src/split.c:366
+#: src/split.c:365
 #, c-format
 msgid "creating file %s\n"
 msgstr "se creează fișierul %s\n"
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr ""
 
-#: src/split.c:391
+#: src/split.c:390
 #, fuzzy, c-format
 msgid "failed to set FILE environment variable"
 msgstr "valoarea pentru variabila de mediu LS_COLORS nu poate fi parcursă"
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr ""
 
-#: src/split.c:395
+#: src/split.c:394
 #, fuzzy, c-format
 msgid "failed to create pipe"
 msgstr "eșec la eliminarea %s"
 
-#: src/split.c:409
+#: src/split.c:408
 #, fuzzy, c-format
 msgid "closing prior pipe"
 msgstr "se închide dosarul %s"
 
-#: src/split.c:411
+#: src/split.c:410
 #, fuzzy, c-format
 msgid "closing output pipe"
 msgstr "se închide fișierul de ieșire %s"
 
-#: src/split.c:415
+#: src/split.c:414
 #, fuzzy, c-format
 msgid "moving input pipe"
 msgstr "se închide fișierul de intrare %s"
 
-#: src/split.c:417
+#: src/split.c:416
 #, fuzzy, c-format
 msgid "closing input pipe"
 msgstr "se închide fișierul de intrare %s"
 
-#: src/split.c:422
+#: src/split.c:421
 #, fuzzy, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr "eșec la rularea comenzii %s"
 
-#: src/split.c:428
+#: src/split.c:427
 #, fuzzy, c-format
 msgid "failed to close input pipe"
 msgstr "eșec la închiderea dosarului %s"
 
-#: src/split.c:464
+#: src/split.c:463
 #, c-format
 msgid "waiting for child process"
 msgstr ""
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr ""
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr ""
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr ""
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr ""
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, fuzzy, c-format
 msgid "%s: invalid number of chunks"
 msgstr "%s: număr de secunde nevalid"
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, fuzzy, c-format
 msgid "%s: invalid chunk number"
 msgstr "%s: număr nevalid"
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr ""
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr "%s: număr de octeți nevalid"
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr "%s: număr de linii nevalid"
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, c-format
 msgid "line count option -%s%c... is too large"
 msgstr ""
 
-#: src/split.c:1248
+#: src/split.c:1298
 #, fuzzy, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr "număr nevalid de linie inițială: %s"
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, fuzzy, c-format
 msgid "%s: invalid IO block size"
 msgstr "%s: dimensiune de fișier nevalidă"
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr ""
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr ""
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, fuzzy, c-format
 msgid "%s: cannot determine file size"
 msgstr "numele gazdei nu se poate determina"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr "Michael Meskes"
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, fuzzy, c-format
 msgid "failed to canonicalize %s"
 msgstr "eșec la clonarea %s"
 
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, fuzzy, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr "%s: opțiune necunoscută „%c%s�\n"
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, c-format
 msgid "%s: invalid directive"
 msgstr "%s: directivă nevalidă"
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, c-format
 msgid "warning: backslash at end of format"
 msgstr ""
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr ""
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, c-format
 msgid "cannot read file system information for %s"
 msgstr ""
 
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, fuzzy, c-format
 msgid "cannot stat standard input"
 msgstr "se închide intrarea standard"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -8200,7 +8271,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -8208,30 +8279,30 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, fuzzy, c-format
 msgid "Context: %C\n"
 msgstr " context=%s"
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -8239,27 +8310,27 @@ msgid ""
 " Birth: %w\n"
 msgstr ""
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
 msgstr ""
 
-#: src/stat.c:1356
+#: src/stat.c:1418
 msgid ""
 "  -L, --dereference     follow links\n"
 "  -f, --file-system     display file system status instead of file status\n"
 msgstr ""
 
-#: src/stat.c:1360
+#: src/stat.c:1422
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 msgid ""
 "\n"
 "The valid format sequences for files (without --file-system):\n"
@@ -8271,7 +8342,7 @@ msgid ""
 "  %C   SELinux security context string\n"
 msgstr ""
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 msgid ""
 "  %d   device number in decimal\n"
 "  %D   device number in hex\n"
@@ -8281,7 +8352,7 @@ msgid ""
 "  %G   group name of owner\n"
 msgstr ""
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 msgid ""
 "  %h   number of hard links\n"
 "  %i   inode number\n"
@@ -8290,11 +8361,11 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 
-#: src/stat.c:1399
+#: src/stat.c:1461
 msgid ""
 "  %u   user ID of owner\n"
 "  %U   user name of owner\n"
@@ -8302,14 +8373,14 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 msgid ""
 "Valid format sequences for file systems:\n"
 "\n"
@@ -8320,7 +8391,7 @@ msgid ""
 "  %f   free blocks in file system\n"
 msgstr ""
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 msgid ""
 "  %i   file system ID in hex\n"
 "  %l   maximum length of filenames\n"
@@ -8381,22 +8452,27 @@ msgid ""
 "and are thus unaffected by 'stdbuf' settings.\n"
 msgstr ""
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, fuzzy, c-format
 msgid "failed to find %s"
 msgstr "eșec la deschiderea %s"
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, c-format
 msgid "failed to update the environment with %s"
 msgstr ""
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr ""
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, c-format
+msgid "you must specify a buffering mode option"
+msgstr ""
+
+#: src/stty.c:516
 #, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -8404,25 +8480,25 @@ msgid ""
 "  or:  %s [-F DEVICE | --file=DEVICE] [-g|--save]\n"
 msgstr ""
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
 msgstr ""
 
-#: src/stty.c:525
+#: src/stty.c:528
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
 "  -g, --save         print all current settings in a stty-readable form\n"
 "  -F, --file=DEVICE  open and use the specified DEVICE instead of stdin\n"
 msgstr ""
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
 "settings.  The underlying system defines which settings are available.\n"
 msgstr ""
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -8431,7 +8507,7 @@ msgid ""
 "   eol CHAR      CHAR will end the line\n"
 msgstr ""
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -8439,7 +8515,7 @@ msgid ""
 "   kill CHAR     CHAR will erase the current line\n"
 msgstr ""
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -8447,7 +8523,7 @@ msgid ""
 "   start CHAR    CHAR will restart the output after stopping it\n"
 msgstr ""
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -8455,7 +8531,7 @@ msgid ""
 " * werase CHAR   CHAR will erase the last word typed\n"
 msgstr ""
 
-#: src/stty.c:562
+#: src/stty.c:565
 msgid ""
 "\n"
 "Special settings:\n"
@@ -8464,7 +8540,7 @@ msgid ""
 " * columns N     same as cols N\n"
 msgstr ""
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -8473,7 +8549,7 @@ msgid ""
 "   ospeed N      set the output speed to N\n"
 msgstr ""
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -8482,7 +8558,7 @@ msgid ""
 "   time N        with -icanon, set read timeout of N tenths of a second\n"
 msgstr ""
 
-#: src/stty.c:581
+#: src/stty.c:584
 msgid ""
 "\n"
 "Control settings:\n"
@@ -8493,7 +8569,7 @@ msgid ""
 "   csN           set character size to N bits, N in [5..8]\n"
 msgstr ""
 
-#: src/stty.c:590
+#: src/stty.c:593
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
 "   [-]hup        send a hangup signal when the last process closes the tty\n"
@@ -8501,9 +8577,10 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -8513,7 +8590,7 @@ msgid ""
 "   [-]igncr      ignore carriage return\n"
 msgstr ""
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -8522,11 +8599,11 @@ msgid ""
 "   [-]istrip     clear high (8th) bit of input characters\n"
 msgstr ""
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr ""
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -8536,7 +8613,7 @@ msgid ""
 "   [-]tandem     same as [-]ixoff\n"
 msgstr ""
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -8546,17 +8623,17 @@ msgid ""
 " * nlN           newline delay style, N in [0..1]\n"
 msgstr ""
 
-#: src/stty.c:631
+#: src/stty.c:635
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
 " * [-]onlret     newline performs a carriage return\n"
 msgstr ""
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -8566,7 +8643,7 @@ msgid ""
 " * vtN           vertical tab delay style, N in [0..1]\n"
 msgstr ""
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -8575,7 +8652,7 @@ msgid ""
 " * -crtkill      kill all line by obeying the echoctl and echok settings\n"
 msgstr ""
 
-#: src/stty.c:654
+#: src/stty.c:658
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
 "   [-]echo       echo input characters\n"
@@ -8584,7 +8661,7 @@ msgid ""
 "   [-]echok      echo a newline after a kill character\n"
 msgstr ""
 
-#: src/stty.c:661
+#: src/stty.c:665
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
 "   [-]echonl     echo newline even if not echoing other characters\n"
@@ -8593,7 +8670,7 @@ msgid ""
 "   [-]iexten     enable non-POSIX special characters\n"
 msgstr ""
 
-#: src/stty.c:668
+#: src/stty.c:672
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
 "   [-]noflsh     disable flushing after interrupt and quit special "
@@ -8603,7 +8680,7 @@ msgid ""
 " * [-]xcase      with icanon, escape with '\\' for uppercase characters\n"
 msgstr ""
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -8612,7 +8689,7 @@ msgid ""
 "   -cbreak       same as icanon\n"
 msgstr ""
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -8620,7 +8697,7 @@ msgid ""
 "   crt           same as echoe echoctl echoke\n"
 msgstr ""
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -8629,7 +8706,7 @@ msgid ""
 "   evenp         same as parenb -parodd cs7\n"
 msgstr ""
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -8639,7 +8716,7 @@ msgid ""
 "   -nl           same as icrnl -inlcr -igncr onlcr -ocrnl -onlret\n"
 msgstr ""
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -8648,7 +8725,7 @@ msgid ""
 "   -pass8        same as parenb istrip cs7\n"
 msgstr ""
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -8656,7 +8733,7 @@ msgid ""
 "   -raw          same as cooked\n"
 msgstr ""
 
-#: src/stty.c:716
+#: src/stty.c:720
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
 "                 -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n"
@@ -8666,7 +8743,7 @@ msgid ""
 "                 characters to their default values\n"
 msgstr ""
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -8675,55 +8752,55 @@ msgid ""
 "127; special values ^- or undef used to disable special characters.\n"
 msgstr ""
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, c-format
 msgid "only one device may be specified"
 msgstr ""
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
 "mutually exclusive"
 msgstr ""
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr ""
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr ""
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, c-format
 msgid "invalid argument %s"
 msgstr ""
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, c-format
 msgid "missing argument to %s"
 msgstr ""
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, c-format
 msgid "invalid line discipline %s"
 msgstr ""
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr ""
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr ""
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, c-format
 msgid "invalid integer argument %s"
 msgstr ""
@@ -8769,7 +8846,7 @@ msgstr ""
 msgid "      --version  output version information and exit\n"
 msgstr ""
 
-#: src/system.h:544
+#: src/system.h:543
 #, fuzzy
 msgid ""
 "\n"
@@ -8778,15 +8855,15 @@ msgstr ""
 "Argumentele obligatorii pentru opțiuni lungi sînt obligatorii și pentru "
 "opțiunile scurte.\n"
 
-#: src/system.h:552
+#: src/system.h:551
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -8795,35 +8872,33 @@ msgid ""
 "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n"
 msgstr ""
 
-#: src/system.h:571
-#, c-format
+#: src/system.h:570
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
-msgstr ""
-"\n"
-"Raportați erorile %s la %s\n"
+"%s online help: <%s>\n"
+msgstr "Pagina oficială %s: <%s>\n"
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr ""
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr ""
 
-#: src/system.h:596
+#: src/system.h:591
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Încercați „%s --help� pentru informații suplimentare.\n"
 
-#: src/system.h:628
+#: src/system.h:633
 #, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -8867,7 +8942,7 @@ msgstr "înregistrare prea mare"
 #: src/tac.c:450
 #, fuzzy, c-format
 msgid "failed to create temporary file in %s"
-msgstr "eșec la crearea contextului de securitate: %s"
+msgstr "fișierul temporar nu a putut fi creat"
 
 #: src/tac.c:458
 #, fuzzy, c-format
@@ -8909,54 +8984,48 @@ msgstr ""
 
 #: src/tail.c:270
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
 
 #: src/tail.c:274
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 
-#: src/tail.c:281
+#: src/tail.c:280
 #, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
 
-#: src/tail.c:294
+#: src/tail.c:293
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 
-#: src/tail.c:301
+#: src/tail.c:298
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 
-#: src/tail.c:310
+#: src/tail.c:307
 msgid ""
 "\n"
 "If the first character of K (the number of bytes or lines) is a '+',\n"
@@ -8967,7 +9036,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/tail.c:319
+#: src/tail.c:316
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
 "means that even if a tail'ed file is renamed, tail will continue to track\n"
@@ -8977,159 +9046,164 @@ msgid ""
 "named file in a way that accommodates renaming, removal and creation.\n"
 msgstr ""
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr "se închide %s (fd=%d)"
 
-#: src/tail.c:453
-#, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr ""
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr ""
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr ""
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
 "reverting to polling"
 msgstr ""
 
-#: src/tail.c:963
+#: src/tail.c:965
+#, c-format
+msgid "%s has been replaced with a symbolic link. giving up on this name"
+msgstr ""
+
+#: src/tail.c:980
 #, c-format
 msgid "%s has become inaccessible"
 msgstr "%s a devenit inaccesibil"
 
-#: src/tail.c:980
+#: src/tail.c:997
 #, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr ""
 
-#: src/tail.c:989
+#: src/tail.c:1006
 #, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr ""
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, c-format
 msgid "%s has become accessible"
 msgstr "%s a devenit accesibil"
 
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr ""
 
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr ""
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr ""
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr "%s: fișier trunchiat"
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr "niciun fișier rămas"
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, c-format
 msgid "cannot watch parent directory of %s"
 msgstr ""
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, fuzzy, c-format
 msgid "inotify resources exhausted"
 msgstr "memorie epuizată"
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, c-format
 msgid "cannot watch %s"
 msgstr "%s nu se poate urmări"
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr ""
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, c-format
 msgid "error reading inotify event"
 msgstr ""
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr ""
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, c-format
 msgid "number in %s is too large"
 msgstr "numărul din %s e prea mare"
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr ""
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr "%s: PID nevalid"
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr "%s: număr de secunde nevalid"
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr ""
 
-#: src/tail.c:2034
+#: src/tail.c:2096
 #, c-format
-msgid "warning: --retry is useful mainly when following by name"
+msgid "warning: --retry ignored; --retry is useful only when following"
 msgstr ""
 
-#: src/tail.c:2038
+#: src/tail.c:2100
+#, c-format
+msgid "warning: --retry only effective for the initial open"
+msgstr ""
+
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
 msgstr ""
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr ""
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, c-format
 msgid "cannot follow %s by name"
 msgstr ""
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr ""
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr ""
@@ -9334,17 +9408,17 @@ msgstr "argument în plus %s"
 msgid "warning: sigprocmask"
 msgstr ""
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr ""
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr ""
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
@@ -9353,33 +9427,29 @@ msgstr ""
 "Utilizare: %s [OPÈšIUNE] RÄ‚DÄ‚CINÄ‚NOUÄ‚ [COMANDÄ‚ [ARG]...]\n"
 "     sau:  %s OPÈšIUNE\n"
 
-#: src/timeout.c:229
-#, fuzzy
+#: src/timeout.c:232
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
 msgstr ""
-"Argumentele obligatorii pentru opțiuni lungi sînt obligatorii și pentru "
-"opțiunile scurte.\n"
 
-#: src/timeout.c:235
+#: src/timeout.c:238
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 msgid ""
 "\n"
 "DURATION is a floating point number with an optional suffix:\n"
@@ -9387,7 +9457,7 @@ msgid ""
 "days.\n"
 msgstr ""
 
-#: src/timeout.c:259
+#: src/timeout.c:262
 msgid ""
 "\n"
 "If the command times out, and --preserve-status is not set, then exit with\n"
@@ -9398,17 +9468,17 @@ msgid ""
 "case the exit status is 128+9 rather than 124.\n"
 msgstr ""
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr ""
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, c-format
 msgid "error waiting for command"
 msgstr ""
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr ""
@@ -9718,7 +9788,7 @@ msgstr ""
 #: src/truncate.c:115
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 
 #: src/truncate.c:121
@@ -9798,12 +9868,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr ""
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr ""
@@ -9879,12 +9949,12 @@ msgstr ""
 msgid "tab stop value is too large"
 msgstr ""
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr ""
 
-#: src/uniq.c:138
+#: src/uniq.c:174
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
 "writing to OUTPUT (or standard output).\n"
@@ -9892,36 +9962,49 @@ msgid ""
 "With no options, matching lines are merged to the first occurrence.\n"
 msgstr ""
 
-#: src/uniq.c:147
+#: src/uniq.c:183
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
 msgstr ""
 
-#: src/uniq.c:151
+#: src/uniq.c:187
+msgid ""
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
+msgstr ""
+
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr ""
+
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
+msgstr ""
+
+#: src/uniq.c:199
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
 "  -i, --ignore-case     ignore differences in case when comparing\n"
 "  -s, --skip-chars=N    avoid comparing the first N characters\n"
 "  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
 msgstr ""
 
-#: src/uniq.c:161
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr ""
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 msgid ""
 "\n"
 "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n"
 "characters.  Fields are skipped before chars.\n"
 msgstr ""
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 msgid ""
 "\n"
 "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n"
@@ -9929,24 +10012,34 @@ msgid ""
 "Also, comparisons honor the rules specified by 'LC_COLLATE'.\n"
 msgstr ""
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, c-format
 msgid "too many repeated lines"
 msgstr "prea multe linii repetate"
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
 msgstr ""
 
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
 msgstr ""
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
 msgstr ""
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr ""
+
+#: src/uniq.c:652
+#, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr ""
+
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr ""
@@ -9966,11 +10059,6 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/unlink.c:86
-#, c-format
-msgid "cannot unlink %s"
-msgstr ""
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -10017,7 +10105,7 @@ msgstr[2] "%lu de utilizatori"
 msgid ",  load average: %.2f"
 msgstr ", încărcare medie: %.2f"
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -10025,19 +10113,19 @@ msgid ""
 "in the run queue over the last 1, 5 and 15 minutes."
 msgstr ""
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
 "an uninterruptible sleep state also contribute to the load average.\n"
 msgstr ""
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr "\n"
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
@@ -10223,13 +10311,8 @@ msgid ""
 "\n"
 msgstr ""
 
-#, fuzzy
-#~ msgid "  returning value: '%s'\n"
-#~ msgstr "se creează fișierul %s\n"
-
-#, fuzzy
-#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n"
-#~ msgstr "Utilizare: %s [OPÈšIUNE]... [UTILIZATOR]...\n"
+#~ msgid "%s"
+#~ msgstr "%s"
 
 #~ msgid "reading %s"
 #~ msgstr "se citește %s"
@@ -10240,9 +10323,15 @@ msgstr ""
 #~ msgid "closing %s"
 #~ msgstr "se închide %s"
 
+#~ msgid "cannot create link %s"
+#~ msgstr "legătura %s nu poate fi creată"
+
 #~ msgid "accessing %s"
 #~ msgstr "se accesează %s"
 
+#~ msgid "invalid format precision"
+#~ msgstr "precizie nevalidă a formatului"
+
 #~ msgid "opening %s"
 #~ msgstr "se deschide %s"
 
@@ -10253,6 +10342,18 @@ msgstr ""
 #~ "Utilizare: %s DENUMIRE\n"
 #~ "     sau:  %s OPÈšIUNE\n"
 
+#~ msgid "Usage: %s [OPTION]... [USERNAME]\n"
+#~ msgstr "Utilizare: %s [OPÈšIUNE]... [UTILIZATOR]\n"
+
+#~ msgid "creating symbolic link %s"
+#~ msgstr "se creează legătura simbolică %s"
+
+#~ msgid "creating symbolic link %s -> %s"
+#~ msgstr "se creează legătura simbolică %s -> %s"
+
+#~ msgid "failed to redirect stderr to /dev/null"
+#~ msgstr "eșec la redirecționarea stderr spre /dev/null"
+
 #~ msgid ""
 #~ "WARNING: --page-increment is deprecated; use --line-increment instead"
 #~ msgstr ""
@@ -10267,6 +10368,16 @@ msgstr ""
 #~ msgid "Usage: %s [OPTION]... FILE\n"
 #~ msgstr "Utilizare: %s OPȚIUNE]... FIȘIER\n"
 
+#, fuzzy
+#~ msgid "cannot remove directory: %s"
+#~ msgstr "dosarul %s nu poate fi eliminat"
+
+#~ msgid "extra operand %s\n"
+#~ msgstr "operand în plus %s\n"
+
+#~ msgid "dup2 failed"
+#~ msgstr "dup2 eșuat"
+
 #~ msgid "Password:"
 #~ msgstr "Parolă:"
 
@@ -10291,20 +10402,12 @@ msgstr ""
 #~ msgid "warning: cannot change directory to %s"
 #~ msgstr "atenție: dosarul nu se poate schimba la %s"
 
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#~ msgid "invalid format precision"
-#~ msgstr "precizie nevalidă a formatului"
-
-#~ msgid "creating symbolic link %s"
-#~ msgstr "se creează legătura simbolică %s"
-
-#~ msgid "creating symbolic link %s -> %s"
-#~ msgstr "se creează legătura simbolică %s -> %s"
-
-#~ msgid "extra operand %s\n"
-#~ msgstr "operand în plus %s\n"
+#~ msgid ""
+#~ "\n"
+#~ "Report %s bugs to %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Raportați erorile %s la %s\n"
 
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: opțiune ilegală -- %c\n"
diff --git a/po/ru.gmo b/po/ru.gmo
index 88b34354..fb8a9ac6 100644
--- a/po/ru.gmo
+++ b/po/ru.gmo
diff --git a/po/ru.po b/po/ru.po
index 46723a35..e997e245 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,14 +5,14 @@
 #
 # Denis Perchine <dyp@perchine.com>, 1997-2002.
 # Oleg Tihonov <ost@tatnipi.ru>, 1999-2007.
-# Yuri Kozlov <yuray@komyakino.ru>, 2009, 2010, 2011, 2012, 2013.
+# Yuri Kozlov <yuray@komyakino.ru>, 2009, 2010, 2011, 2012, 2013, 2014.
 # Pavel Maryanov <acid@jack.kiev.ua>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: coreutils 8.20-pre3\n"
+"Project-Id-Version: coreutils 8.23-pre1\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
-"PO-Revision-Date: 2013-02-12 21:26+0400\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
+"PO-Revision-Date: 2014-07-18 20:18+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
 "Language: ru\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 1.4\n"
+"X-Generator: Lokalize 1.5\n"
 
 #: lib/argmatch.c:133
 #, c-format
@@ -41,76 +41,119 @@ msgstr "Допу�тимые аргументы:"
 msgid "error closing file"
 msgstr "ошибка закрыти� файла"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "ошибка запи�и"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "�охранение прав до�тупа дл� %s"
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "�еизве�тна� �и�темна� ошибка"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "пу�той обычный файл"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "обычный файл"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "каталог"
 
-#: lib/file-type.c:44
-msgid "block special file"
-msgstr "блочный �пециальный файл"
-
-#: lib/file-type.c:47
-msgid "character special file"
-msgstr "�имвольный �пециальный файл"
-
-#: lib/file-type.c:50
-msgid "fifo"
-msgstr "файл-очередь"
-
-#: lib/file-type.c:53
+#: lib/file-type.c:46
 msgid "symbolic link"
 msgstr "�имвольна� ��ылка"
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "�окет"
-
-#: lib/file-type.c:59
+#: lib/file-type.c:52
 msgid "message queue"
 msgstr "очередь �ообщений"
 
-#: lib/file-type.c:62
+#: lib/file-type.c:55
 msgid "semaphore"
 msgstr "�емафор"
 
-#: lib/file-type.c:65
+#: lib/file-type.c:58
 msgid "shared memory object"
 msgstr "объект раздел�емой пам�ти"
 
-#: lib/file-type.c:68
+#: lib/file-type.c:61
 msgid "typed memory object"
 msgstr "объект типизированной пам�ти"
 
-#: lib/file-type.c:70
+#: lib/file-type.c:66
+msgid "block special file"
+msgstr "блочный �пециальный файл"
+
+#: lib/file-type.c:69
+msgid "character special file"
+msgstr "�имвольный �пециальный файл"
+
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr "непрерывные данные"
+
+#: lib/file-type.c:75
+msgid "fifo"
+msgstr "файл-очередь"
+
+#: lib/file-type.c:78
+msgid "door"
+msgstr "дверь"
+
+#: lib/file-type.c:81
+msgid "multiplexed block special file"
+msgstr "мультиплек�ный блочный �пециальный файл"
+
+#: lib/file-type.c:84
+msgid "multiplexed character special file"
+msgstr "мультиплек�ный �имвольный �пециальный файл"
+
+#: lib/file-type.c:87
+msgid "multiplexed file"
+msgstr "мультиплек�ный файл"
+
+#: lib/file-type.c:90
+msgid "named file"
+msgstr "именованный файл"
+
+#: lib/file-type.c:93
+msgid "network special file"
+msgstr "�етевой �пециальный файл"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr "перено�ной файл � данными"
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr "перено�ной файл без данных"
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr "порт"
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "�окет"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr "замазка"
+
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "�транный файл"
 
@@ -245,18 +288,18 @@ msgstr "%s: ключ -W %s должен и�пользовать�� без ар
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: ключ -W %s должен и�пользовать�� � аргументом\n"
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr "невозможно изменить права до�тупа %s"
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "невозможно �оздать каталог %s"
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr "пам�ть и�черпана"
@@ -373,7 +416,7 @@ msgstr "Регул�рное выражение �лишком велико"
 msgid "Unmatched ) or \\)"
 msgstr "�епарна� ) или \\)"
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 msgid "No previous regular expression"
 msgstr "�ет предше�твующего регул�рного выражени�"
 
@@ -399,7 +442,7 @@ msgstr ""
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[ДдYy]"
 
@@ -409,11 +452,11 @@ msgstr "^[ДдYy]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[�нNn]"
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, c-format
 msgid "setting permissions for %s"
 msgstr "у�тановка прав до�тупа дл� %s"
@@ -554,18 +597,6 @@ msgstr "Отказ питани�"
 msgid "Resource lost"
 msgstr "Ре�ур� потер�н"
 
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, c-format
-msgid "cannot create pipe"
-msgstr "не удало�ь �оздать канал"
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, c-format
-msgid "%s subprocess failed"
-msgstr "подпроце�� %s завершил�� � ошибкой"
-
 #: lib/strsignal.c:114
 #, c-format
 msgid "Real-time signal %d"
@@ -644,7 +675,7 @@ msgstr ""
 "\n"
 "Лицензи� GPLv3+: GNU GPL вер�ии 3 или новее <http://gnu.org/licenses/gpl."
 "html>\n"
-"Это �вободное ПО: вы можете продавать и ра�про�тран�ть его.\n"
+"Это �вободное ПО: вы можете измен�ть и ра�про�тран�ть его.\n"
 "�ет �ИК�КИХ Г�Р��ТИЙ до �тепени, разрешённой законом.\n"
 "\n"
 
@@ -773,9 +804,9 @@ msgstr ""
 #: lib/version-etc.c:247
 #, c-format
 msgid "Report %s bugs to: %s\n"
-msgstr "Об ошибках в %s �ообщайте по адре�у %s\n"
+msgstr "Об ошибках в %s �ообщайте по адре�у <%s>\n"
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Домашн�� �траница %s: <%s>\n"
@@ -785,30 +816,10 @@ msgstr "Домашн�� �траница %s: <%s>\n"
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr "Домашн�� �траница %s: <http://www.gnu.org/software/%s/>\n"
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr "Справка по работе � программами GNU: <http://www.gnu.org/gethelp/>\n"
 
-#: lib/w32spawn.h:43
-#, c-format
-msgid "_open_osfhandle failed"
-msgstr "_open_osfhandle завершила�ь неудачно"
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr "не удало�ь во��тановить fd %d: dup2 завершила�ь неудачно"
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr "подпроце�� %s"
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr "подпроце�� %s получил �игнал завершени� %d"
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr "�тандартный ввод"
@@ -830,7 +841,7 @@ msgstr "неизве�тный поток"
 msgid "failed to reopen %s with mode %s"
 msgstr "не удало�ь повторно открыть %s в режиме %s"
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr "не удало�ь �равнить �троки"
@@ -897,7 +908,7 @@ msgstr ""
 "                        выключить перено�.\n"
 "\n"
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -919,48 +930,47 @@ msgstr ""
 "формального алфавита base64. И�пользуйте ключ --ignore-garbage, чтобы\n"
 "попытать�� проигнорировать неалфавитные �имволы в закодированном потоке.\n"
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "ошибка чтени�"
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, c-format
 msgid "invalid input"
 msgstr "неверный ввод"
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, c-format
 msgid "invalid wrap size: %s"
 msgstr "неверный размер перено�а: %s"
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, c-format
 msgid "extra operand %s"
 msgstr "лишний операнд %s"
 
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, c-format
 msgid "closing standard input"
 msgstr "закрытие �тандартного ввода"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -989,12 +999,13 @@ msgstr ""
 #: src/basename.c:60
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
 "  -a, --multiple       прин�ть не�колько аргументов и �читать каждый ИМЕ�ЕМ\n"
-"  -s, --suffix=СУФФИКС удалить завершающий СУФФИКС\n"
-"  -z, --zero           раздел�ть вывод NUL, а не �имволом новой �троки\n"
+"  -s, --suffix=СУФФИКС удалить завершающий СУФФИКС; подразумевает -a\n"
+"  -z, --zero           заканчивать каждую �троку результата NUL,\n"
+"                       а не �имволом новой �троки\n"
 
 #: src/basename.c:67
 #, c-format
@@ -1013,32 +1024,31 @@ msgstr ""
 "  %s -s .h include/stdio.h  -> «stdio»\n"
 "  %s -a any/str1 any/str2   -> за «str1» выведет�� «str2»\n"
 
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, c-format
 msgid "missing operand"
 msgstr "пропущен операнд"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr "Торбьёрн Гронлунд (Torbjorn Granlund)"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 msgid "Richard M. Stallman"
 msgstr "Ричард М. Столлман (Richard M. Stallman)"
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1096,7 +1106,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr "невозможно выполнить ioctl дл� %s"
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr "�тандартный вывод"
@@ -1113,14 +1123,14 @@ msgstr "Ра��ел Кокер (Russell Coker)"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 msgid "Jim Meyering"
 msgstr "Джим Мейеринг (Jim Meyering)"
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, c-format
 msgid "failed to create security context: %s"
 msgstr "не удало�ь �оздать контек�т безопа�но�ти: %s"
@@ -1130,8 +1140,8 @@ msgstr "не удало�ь �оздать контек�т безопа�но�
 msgid "failed to set %s security context component to %s"
 msgstr "не удало�ь у�тановить компонент контек�та безопа�но�ти %s равным %s"
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, c-format
 msgid "failed to get security context of %s"
 msgstr "не удало�ь получить контек�т безопа�но�ти %s"
@@ -1141,18 +1151,18 @@ msgstr "не удало�ь получить контек�т безопа�но
 msgid "can't apply partial context to unlabeled file %s"
 msgstr "не удало�ь применить ча�тичный контек�т к не помеченному файлу %s"
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, c-format
 msgid "failed to change context of %s to %s"
 msgstr "не удало�ь изменить контек�т безопа�но�ти %s на %s"
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
 msgstr "невозможно получить до�туп к %s"
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, c-format
 msgid "cannot read directory %s"
 msgstr "невозможно прочитать каталог %s"
@@ -1162,13 +1172,14 @@ msgstr "невозможно прочитать каталог %s"
 msgid "changing security context of %s\n"
 msgstr "изменение контек�та безопа�но�ти дл� %s\n"
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, c-format
 msgid "fts_read failed"
 msgstr "операци� fts_read завершила�ь неудачно"
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, c-format
 msgid "fts_close failed"
 msgstr "операци� fts_close завершила�ь неудачно"
@@ -1186,11 +1197,11 @@ msgstr ""
 
 #: src/chcon.c:357
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
-"Мен�ет КО�ТЕКСТ безопа�но�ти указанных Ф�ЙЛОВ.\n"
+"Мен�ет КО�ТЕКСТ безопа�но�ти SELinux указанных Ф�ЙЛОВ.\n"
 "При задании --reference, делает контек�т безопа�но�ти\n"
 "указанных Ф�ЙЛОВ таким же как у ЭФ�ЙЛ�.\n"
 
@@ -1220,7 +1231,7 @@ msgstr ""
 "  -l, --range=ДИ�П�ЗО�   задать ДИ�П�ЗО� в назначаемом контек�те "
 "безопа�но�ти\n"
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
 "      --preserve-root    fail to operate recursively on '/'\n"
@@ -1274,36 +1285,37 @@ msgstr ""
 "  -P                     не переходить по �имвольным ��ылкам (по умолчанию)\n"
 "\n"
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr "Комбинаци� ключей -R --dereference требует указать -H либо -L"
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr "-R -h требуют -P"
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, c-format
 msgid "missing operand after %s"
 msgstr "пропущен операнд по�ле %s"
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, c-format
 msgid "invalid context: %s"
 msgstr "неверный контек�т: %s"
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr "конфликт указанных параметров контек�та безопа�но�ти"
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, c-format
 msgid "failed to get attributes of %s"
 msgstr "ошибка получени� атрибутов %s"
@@ -1333,7 +1345,7 @@ msgstr ""
 "указанных Ф�ЙЛОВ как у ЭФ�ЙЛ�.\n"
 "\n"
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
@@ -1374,47 +1386,47 @@ msgstr ""
 "  %s staff /u      Мен�ет группу /u на staff.\n"
 "  %s -hR staff /u  Мен�ет группу /u и вложенных файлов на staff.\n"
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
 msgstr "получение новых атрибутов %s"
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr "ни �имвольна� ��ылка %s, ни то но что она указывает не были изменены\n"
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr "права до�тупа %s изменены � %04lo (%s) на %04lo (%s)\n"
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr "не удало�ь изменить права до�тупа %s � %04lo (%s) на %04lo (%s)\n"
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr "права до�тупа %s о�тавлены в виде %04lo (%s)\n"
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr "невозможно обработать пови�шую �имвольную ��ылку %s"
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, c-format
 msgid "changing permissions of %s"
 msgstr "изменение прав до�тупа дл� %s"
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr "%s: новые права до�тупа %s, а не %s"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1425,7 +1437,7 @@ msgstr ""
 "       или:    %s [КЛЮЧ]… ВОСЬМ-РЕЖИМ Ф�ЙЛ…\n"
 "       или:    %s [КЛЮЧ]… --reference=ОФ�ЙЛ Ф�ЙЛ…\n"
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 msgid ""
 "Change the mode of each FILE to MODE.\n"
 "With --reference, change the mode of each FILE to that of RFILE.\n"
@@ -1436,17 +1448,17 @@ msgstr ""
 "указанных Ф�ЙЛОВ как у ЭФ�ЙЛ�.\n"
 "\n"
 
-#: src/chmod.c:391
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
 "      --reference=ЭФ�ЙЛ  и�пользовать режим до�тупа ЭФ�ЙЛ�\n"
 "                         вме�то значений РЕЖИМ\n"
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr "  -R, --recursive        рекур�ивно измен�ть файлы и каталоги\n"
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 msgid ""
 "\n"
 "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n"
@@ -1455,12 +1467,12 @@ msgstr ""
 "Каждый РЕЖИМ задает�� в форме «[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=]"
 "[0-7]+».\n"
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr "нельз� �очетать ключи режима и --reference"
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, c-format
 msgid "invalid mode: %s"
 msgstr "неверный режим: %s"
@@ -1612,26 +1624,21 @@ msgstr ""
 "  %s -hR root /u    Мен�ет владельца /u и вложенных файлов на «root».\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr "Роланд МакГрат (Roland McGrath)"
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr "неверна� группа %s"
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, c-format
 msgid "invalid group list %s"
 msgstr "неверный �пи�ок групп %s"
 
-#: src/chroot.c:117
-#, c-format
-msgid "failed to set additional groups"
-msgstr "не удало�ь задать дополнительные группы"
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
@@ -1640,7 +1647,7 @@ msgstr ""
 "И�пользование: %s [КЛЮЧ] �ОВЫЙКОРЕ�Ь [КОМ��Д� [�РГ]…]\n"
 "       или:    %s КЛЮЧ\n"
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
@@ -1648,7 +1655,7 @@ msgstr ""
 "Выполн�ет КОМ��ДУ � указанным корневым каталогом.\n"
 "\n"
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
@@ -1657,7 +1664,7 @@ msgstr ""
 "  --groups=G_LIST          задать в�помогательные группы как гр1, гр2, .., "
 "грN\n"
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 msgid ""
 "\n"
 "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n"
@@ -1666,28 +1673,42 @@ msgstr ""
 "Е�ли команда не задана, выполн�ет «${SHELL} -i» (по умолчанию: «/bin/sh -"
 "i»).\n"
 
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, c-format
 msgid "cannot change root directory to %s"
 msgstr "не удало�ь �менить корневой каталог на %s"
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, c-format
 msgid "cannot chdir to root directory"
 msgstr "не удало�ь перейти в корневой каталог"
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr "дл� неизве�тного uid не указана группа: %d"
+
+#: src/chroot.c:383
+#, c-format
+msgid "failed to get supplemental groups"
+msgstr "не удало�ь получить дополнительную группу(ы)"
+
+#: src/chroot.c:395
+#, c-format
+msgid "failed to %s supplemental groups"
+msgstr "не удало�ь %s дополнительную группу(ы)"
+
+#: src/chroot.c:402
 #, c-format
 msgid "failed to set group-ID"
 msgstr "не удало�ь у�тановить group-ID"
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, c-format
 msgid "failed to set user-ID"
 msgstr "не удало�ь у�тановить user-ID"
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, c-format
 msgid "failed to run command %s"
 msgstr "не удало�ь выполнить команду %s"
@@ -1719,7 +1740,7 @@ msgstr ""
 "Печатает контрольную �умму (CRC) и чи�ло байт дл� каждого Ф�ЙЛ�.\n"
 "\n"
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr "И�пользование: %s [КЛЮЧ]… Ф�ЙЛ1 Ф�ЙЛ2\n"
@@ -1808,299 +1829,338 @@ msgstr "указано не�колько разделителей"
 msgid "empty %s not allowed"
 msgstr "пу�тое значение %s не разрешено"
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr "ошибка чтени� %s"
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, c-format
 msgid "cannot lseek %s"
 msgstr "невозможно выполнить lseek дл� %s"
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr "ошибка запи�и %s"
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, c-format
 msgid "%s: failed to get extents info"
 msgstr "%s: не удало�ь получить информацию об �к�тентах"
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, c-format
 msgid "%s: write failed"
 msgstr "%s: запи�ь завершила�ь неудачно"
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, c-format
 msgid "failed to extend %s"
 msgstr "не удало�ь ра�ширить %s"
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, c-format
 msgid "clearing permissions for %s"
 msgstr "очи�тка прав до�тупа дл� %s"
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "не удало�ь �охранить владельца %s"
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
 msgstr "не удало�ь найти файл %s"
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, c-format
 msgid "failed to preserve authorship for %s"
 msgstr "не удало�ь �охранить автора %s"
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
+#, c-format
+msgid "failed to set default file creation context to %s"
+msgstr "не удало�ь у�тановить контек�т �оздани� файла по умолчанию в %s"
+
+#: src/copy.c:820
+#, c-format
+msgid "failed to set default file creation context for %s"
+msgstr "не удало�ь у�тановить контек�т �оздани� файла по умолчанию дл� %s"
+
+#: src/copy.c:846
+#, c-format
+msgid "failed to set the security context of %s"
+msgstr "не удало�ь у�тановить контек�т безопа�но�ти у %s"
+
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
 msgid "cannot open %s for reading"
 msgstr "невозможно открыть %s дл� чтени�"
 
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, c-format
 msgid "cannot fstat %s"
 msgstr "невозможно выполнить fstat дл� %s"
 
-#: src/copy.c:820
+#: src/copy.c:935
 #, c-format
 msgid "skipping file %s, as it was replaced while being copied"
 msgstr "пропу�кает�� файл %s, так как он был заменён во врем� копировани�"
 
-#: src/copy.c:850
-#, c-format
-msgid "failed to get file system create context"
-msgstr "не удало�ь получить контек�т �оздани� файловой �и�темы"
-
-#: src/copy.c:864
-#, c-format
-msgid "failed to set the security context of %s to %s"
-msgstr "не удало�ь у�тановить контек�т безопа�но�ти дл� %s в %s"
-
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
 msgid "cannot remove %s"
 msgstr "невозможно удалить %s"
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
 msgstr "удалён %s\n"
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr "запи�ь через пови�шую ��ылку %s не выполн�ет��"
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, c-format
 msgid "cannot create regular file %s"
 msgstr "невозможно �оздать обычный файл %s"
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, c-format
 msgid "failed to clone %s from %s"
 msgstr "не удало�ь выполнить клонирование %s из %s"
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr "�охранение временной отметки %s"
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
 #, c-format
 msgid "failed to close %s"
 msgstr "не удало�ь закрыть %s"
 
-#: src/copy.c:1471
+#: src/copy.c:1580
 #, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
-msgstr "%s: попытать�� перезапи�ать %s, не�мотр� на права до�тупа %04lo (%s)? "
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
+msgstr "%s: заме�тить %s, не�мотр� на права до�тупа %04lo (%s)? "
 
-#: src/copy.c:1478
+#: src/copy.c:1581
+#, c-format
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr ""
+"%s: недо�тупен дл� запи�и %s (права %04lo, %s); попробовать в�ё равно? "
+
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
 msgstr "%s: перепи�ать %s? "
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr " (резервна� копи�: %s)"
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr "не удало�ь во��тановить контек�т �оздани� файла по умолчанию"
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, c-format
 msgid "cannot create hard link %s to %s"
 msgstr "невозможно �оздать жё�ткую ��ылку %s на %s"
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, c-format
 msgid "cannot stat %s"
 msgstr "не удало�ь выполнить stat дл� %s"
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, c-format
 msgid "omitting directory %s"
 msgstr "пропу�кает�� каталог %s"
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr "предупреждение: файл-и�точник %s указан более одного раза"
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
 msgstr "%s и %s - один и тот же файл"
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr ""
 "невозможно перезапи�ать поверх файла %s, не �вл�ющего�� каталогом, каталог %s"
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr "только что �озданный файл %s не будет перепи�ан в %s"
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr "невозможно перезапи�ать каталог %s файлом, не �вл�ющим�� каталогом"
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr ""
 "невозможно переименовать каталог в файл, не �вл�ющий�� каталогом: %s -> %s"
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr "�охранение запа�ной копии %s уничтожит оригинал; %s не перене�ён"
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr "�охранение запа�ной копии %s уничтожит оригинал; %s не �копирован"
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
 msgstr "невозможно �оздать резервную копию дл� %s"
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr "копирование %s через только что �озданную %s не выполн�ет��"
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr "невозможно �копировать каталог %s в �амого �еб�, %s"
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr "жё�тка� ��ылка %s на каталог %s не будет �оздана"
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr "невозможно перене�ти %s в �вой �об�твенный подкаталог, %s"
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, c-format
 msgid "cannot move %s to %s"
 msgstr "невозможно переме�тить %s в %s"
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr ""
 "не удало�ь перемещение � у�трой�тва %s на у�трой�тво %s: невозможно удалить "
 "назначение"
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, c-format
-msgid "failed to set default file creation context to %s"
-msgstr "не удало�ь у�тановить контек�т безопа�но�ти файла по умолчанию в %s"
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr "невозможно �копировать цикличе�кую �имвольную ��ылку %s"
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr ""
 "%s: отно�ительные �имвольные ��ылки можно �оздавать только в текущем каталоге"
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr "невозможно �оздать �имвольную ��ылку %s на %s"
 
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, c-format
 msgid "cannot create fifo %s"
 msgstr "невозможно �оздать очередь %s"
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, c-format
 msgid "cannot create special file %s"
 msgstr "невозможно �оздать �пециальный файл %s"
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, c-format
 msgid "cannot read symbolic link %s"
 msgstr "невозможно �читать �имвольную ��ылку %s"
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, c-format
 msgid "cannot create symbolic link %s"
 msgstr "невозможно �оздать �имвольную ��ылку %s"
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
 msgstr "неизве�тный тип файла %s"
 
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, c-format
 msgid "cannot un-backup %s"
 msgstr "невозможно во��тановить %s из резервной копии"
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr "%s -> %s (во��тановление)\n"
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr "Alex Deymo"
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr "И�пользование: %s --coreutils-prog=ИМЯ_ПРОГР�ММЫ [П�Р�МЕТРЫ]… \n"
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+"Выполн�ет в�троенную программу ИМЯ_ПРОГР�ММЫ � заданными П�Р�МЕТР�МИ.\n"
+"\n"
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+"\n"
+"И�пользование: «%s --coreutils-prog=ИМЯ_ПРОГР�ММЫ --help» дл� показа �правки "
+"по нужной программе.\n"
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, c-format
+msgid "unknown program %s"
+msgstr "неизве�тна� программа %s"
+
+#: src/cp.c:157 src/mv.c:288
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -2111,11 +2171,11 @@ msgstr ""
 "       или:    %s [КЛЮЧ]… ИСТОЧ�ИК… К�Т�ЛОГ\n"
 "       или:    %s [КЛЮЧ]… -t К�Т�ЛОГ ИСТОЧ�ИК…\n"
 
-#: src/cp.c:162
+#: src/cp.c:163
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
 msgstr "Копирует ИСТОЧ�ИК в ��З��ЧЕ�ИЕ, или не�колько ИСТОЧ�ИКОВ в К�Т�ЛОГ.\n"
 
-#: src/cp.c:168
+#: src/cp.c:169
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
 "      --attributes-only        don't copy the file data, just the "
@@ -2138,7 +2198,7 @@ msgstr ""
 "  -d                           то же, что и --no-dereference --"
 "preserve=link\n"
 
-#: src/cp.c:177
+#: src/cp.c:178
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
 "                                 opened, remove it and try again (this "
@@ -2160,7 +2220,7 @@ msgstr ""
 "                               ранее указанный ключ -n)\n"
 "  -H                           �ледовать по �имвольным ��ылкам в ИСТОЧ�ИКЕ\n"
 
-#: src/cp.c:186
+#: src/cp.c:187
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
 "  -L, --dereference            always follow symbolic links in SOURCE\n"
@@ -2169,7 +2229,7 @@ msgstr ""
 "  -L, --dereference            в�егда �ледовать �имвольным ��ылкам в "
 "ИСТОЧ�ИКЕ\n"
 
-#: src/cp.c:190
+#: src/cp.c:191
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
 "                                 a previous -i option)\n"
@@ -2181,7 +2241,7 @@ msgstr ""
 "  -P, --no-dereference         не �ледовать по �имвольным ��ылкам в "
 "ИСТОЧ�ИКЕ\n"
 
-#: src/cp.c:195
+#: src/cp.c:196
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
 "      --preserve[=ATTR_LIST]   preserve the specified attributes (default:\n"
@@ -2198,7 +2258,7 @@ msgstr ""
 "xattr,\n"
 "                               all\n"
 
-#: src/cp.c:203
+#: src/cp.c:204
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                use full source file name under DIRECTORY\n"
@@ -2206,7 +2266,7 @@ msgstr ""
 "      --no-preserve=СПИС_�ТТР  не �охран�ть указанные атрибуты\n"
 "      --parents                добавить и�ходный путь к К�Т�ЛОГУ\n"
 
-#: src/cp.c:207
+#: src/cp.c:208
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
 "      --reflink[=WHEN]         control clone/CoW copies. See below\n"
@@ -2219,7 +2279,7 @@ msgstr ""
 "      --remove-destination     удал�ть каждый файл назначени� перед\n"
 "                               попыткой его открыть (обратно к --force)\n"
 
-#: src/cp.c:213
+#: src/cp.c:214
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
 "      --strip-trailing-slashes  remove any trailing slashes from each "
@@ -2231,7 +2291,7 @@ msgstr ""
 "      --strip-trailing-slashes удал�ть в�е конечные ко�ые черты из каждого\n"
 "                               аргумента ИСТОЧ�ИК\n"
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -2246,7 +2306,7 @@ msgstr ""
 "      --target-directory=К�Т   �копировать в�е ИСТОЧ�ИКИ в К�Т�ЛОГ\n"
 "  -T, --no-target-directory    �читать ��З��ЧЕ�ИЕ обычным файлом\n"
 
-#: src/cp.c:224
+#: src/cp.c:225
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
 "                                 than the destination file or when the\n"
@@ -2260,7 +2320,21 @@ msgstr ""
 "  -v, --verbose                по��н�ть что будет �делано\n"
 "  -x, --one-file-system        о�тавать�� в пределах одной файловой �и�темы\n"
 
-#: src/cp.c:233
+#: src/cp.c:232
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+"  -Z                           у�тановить контек�т безопа�но�ти SELinux\n"
+"                               файла назначени� равным типу по умолчанию\n"
+"      --context[=CTX]          подобно -Z, или е�ли указан CTX, то "
+"у�тановить\n"
+"                               контек�т безопа�но�ти SELinux\n"
+"                               или SMACK равным CTX\n"
+
+#: src/cp.c:240
 msgid ""
 "\n"
 "By default, sparse SOURCE files are detected by a crude heuristic and the\n"
@@ -2289,7 +2363,7 @@ msgstr ""
 "блоки данных копируют�� только при изменении. Е�ли �то невозможно, или е�ли\n"
 "указано --reflink=auto, то и�пользует�� обычное копирование.\n"
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 msgid ""
 "\n"
 "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n"
@@ -2306,7 +2380,7 @@ msgstr ""
 "окружени� VERSION_CONTROL. Допу�тимые значени�:\n"
 "\n"
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2320,7 +2394,7 @@ msgstr ""
 "                  нумерованные иначе �оздавать про�тые\n"
 "  simple. never   в�егда �оздавать про�тые копии\n"
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2332,222 +2406,234 @@ msgstr ""
 "ключи -f и -b, а е�ли ИСТОЧ�ИК �овпадает � ��З��ЧЕ�ИЕМ, то cp �оздает\n"
 "резервную копию ��З��ЧЕ�ИЯ.\n"
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, c-format
 msgid "failed to preserve times for %s"
 msgstr "не удало�ь �охранить временные метки дл� %s"
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, c-format
 msgid "failed to preserve permissions for %s"
 msgstr "не удало�ь �охранить права до�тупа дл� %s"
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, c-format
 msgid "cannot make directory %s"
 msgstr "невозможно �оздать каталог %s"
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr "%s �уще�твует, но не �вл�ет�� каталогом"
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
 #, c-format
 msgid "failed to access %s"
 msgstr "не удало�ь получить до�туп к %s"
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, c-format
 msgid "missing file operand"
 msgstr "пропущен операнд, задающий файл"
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, c-format
 msgid "missing destination file operand after %s"
 msgstr "по�ле %s пропущен операнд, задающий целевой файл"
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr "нельз� �очетать --target-directory (-t) и --no-target-directory (-T)"
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, c-format
 msgid "target %s is not a directory"
 msgstr "указанна� цель %s не �вл�ет�� каталогом"
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr "при заданном --parents назначение должно быть каталогом"
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, c-format
 msgid "multiple target directories specified"
 msgstr "задано не�колько целевых каталогов"
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr ""
+"предупреждение: игнорирует�� ключ --context; он требует�� дл� �дра � "
+"включённым SELinux"
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr "невозможно �оздать жё�ткую и �имвольную ��ылку одновременно"
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr "ключи --backup и --no-clobber взаимно и�ключают друг друга"
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr "ключ --reflink можно и�пользовать только � --sparse=auto"
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr "тип резервной копии"
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, c-format
+msgid "cannot set target context and preserve it"
+msgstr "невозможно назначить контек�т цели и �охранить его"
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr ""
 "невозможно �охранить контек�т безопа�но�ти без �дра � поддержкой SELinux"
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr ""
 "невозможно �охранить ра�ширенные атрибуты; cp �обрана без поддержки xattr"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr "Стюарт Кемп (Stuart Kemp)"
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr "ввод �тал недо�тупен"
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr "%s: номер �троки вне допу�тимых пределов"
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, c-format
 msgid "%s: %s: line number out of range"
 msgstr "%s: %s: номер �троки вне допу�тимых пределов"
 
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, c-format
 msgid " on repetition %s\n"
 msgstr " при повторе %s\n"
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, c-format
 msgid "%s: %s: match not found"
 msgstr "%s: %s: �овпадение не найдено"
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr "ошибка пои�ка регул�рного выражени�"
 
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, c-format
 msgid "write error for %s"
 msgstr "ошибка запи�и дл� %s"
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, c-format
 msgid "%s: integer expected after delimiter"
 msgstr "%s: по�ле разделител� ожидает�� целое чи�ло"
 
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr "%s: при задании чи�ла повторов необходима «}»"
 
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr "%s}: между «{» и «}» должно быть целое чи�ло"
 
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr "%s: пропущен закрывающий разделитель «%c»"
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr "%s: недопу�тимое регул�рное выражение: %s"
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr "%s: недопу�тимый образец"
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr "%s: номер �троки должен быть больше нул�"
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr "номер �троки %s меньше номера предыдущей �троки, %s"
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr "предупреждение: номер �троки %s равен предыдущему номеру �троки"
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr "пропущен опи�атель преобразовани� в �уффик�е"
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr "неверный опи�атель преобразовани� в �уффик�е: %c"
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr "неверный опи�атель преобразовани� в �уффик�е: \\%.3o"
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr "некорректные флаги в �пецификации преобразовани�: %%%c%c"
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr "�лишком много опи�аний преобразовани� (%%) в �уффик�е"
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr "пропущено опи�ание преобразовани� (%%) в �уффик�е"
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr "%s: недопу�тимое чи�ло"
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr "И�пользование: %s [КЛЮЧ]… Ф�ЙЛ ОБР�ЗЕЦ…\n"
 
-#: src/csplit.c:1455
+#: src/csplit.c:1483
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
 "and output byte counts of each piece to standard output.\n"
@@ -2555,7 +2641,7 @@ msgstr ""
 "Выводит ча�ти Ф�ЙЛ�, разделённые ОБР�ЗЦОМ (ОБР�ЗЦ�МИ), в файлы «xx00»,\n"
 "«xx01», … и печатает чи�ло байт в каждой ча�ти на �тандартный вывод.\n"
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2566,7 +2652,12 @@ msgstr ""
 "  -f, --prefix=ПРЕФИКС       и�пользовать ПРЕФИКС вме�то «xx»\n"
 "  -k, --keep-files           не удал�ть выходные файлы при ошибке\n"
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr ""
+"  -m, --suppress-matched     не обрабатывать �троки, �овпадающие � Ш�БЛО�ОМ\n"
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
@@ -2576,7 +2667,7 @@ msgstr ""
 "  -s, --quiet, --silent      не печатать размеры выходных файлов\n"
 "  -z, --elide-empty-files    удал�ть пу�тые выходные файлы\n"
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
@@ -2585,7 +2676,7 @@ msgstr ""
 "Е�ли Ф�ЙЛ задан как -, читает �тандартный ввод.  ОБР�ЗЕЦ задает�� �ледующим\n"
 "образом:\n"
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 msgid ""
 "\n"
 "  INTEGER            copy up to but not including specified line number\n"
@@ -2614,21 +2705,17 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr "Д�вид М. Инат (David M. Ihnat)"
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr "пол� и позиции нумеруют�� � 1"
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr "И�пользование: %s КЛЮЧ… [Ф�ЙЛ]…\n"
 
-#: src/cut.c:193
+#: src/cut.c:176
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr ""
 "Печатает выбранные ча�ти �трок из каждого Ф�ЙЛ� на �тандартный вывод.\n"
 
-#: src/cut.c:199
+#: src/cut.c:182
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
 "  -c, --characters=LIST   select only these characters\n"
@@ -2640,7 +2727,7 @@ msgstr ""
 "Р�ЗДЕЛИТЕЛЬ\n"
 "                                 вме�то табул�ции\n"
 
-#: src/cut.c:204
+#: src/cut.c:187
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
 "                            that contains no delimiter character, unless\n"
@@ -2654,7 +2741,7 @@ msgstr ""
 "                                 только не задан ключ -s\n"
 "  -n                             (игнорирует��)\n"
 
-#: src/cut.c:210
+#: src/cut.c:193
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
 "                            or fields\n"
@@ -2663,7 +2750,7 @@ msgstr ""
 "�имволов\n"
 "                                 или полей\n"
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
@@ -2677,7 +2764,7 @@ msgstr ""
 "разделитель\n"
 "                                 дл� ввода\n"
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2690,7 +2777,7 @@ msgstr ""
 "Выбранные ча�ти входного файла печатают�� в том пор�дке, в котором они\n"
 "по�вл�ют�� на входе, и печатают�� ровно один раз.\n"
 
-#: src/cut.c:227
+#: src/cut.c:210
 msgid ""
 "Each range is one of:\n"
 "\n"
@@ -2710,47 +2797,51 @@ msgstr ""
 "\n"
 "Е�ли Ф�ЙЛ не задан или задан как -, читает �тандартный ввод.\n"
 
-#: src/cut.c:367 src/cut.c:493
+#: src/cut.c:300 src/cut.c:394
 msgid "invalid byte, character or field list"
 msgstr "неправильный байт, �имвол или �пи�ок полей"
 
-#: src/cut.c:387
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr "пол� и позиции нумеруют�� � 1"
+
+#: src/cut.c:320
 msgid "invalid range with no endpoint: -"
 msgstr "неверный диапазон без окончани�: -"
 
-#: src/cut.c:403
+#: src/cut.c:334
 msgid "invalid decreasing range"
 msgstr "неверный уменьшающий�� диапазон"
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, c-format
 msgid "byte offset %s is too large"
 msgstr "байтовое �мещение %s �лишком велико"
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, c-format
 msgid "field number %s is too large"
 msgstr "номер пол� %s �лишком велик"
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr "можно задать только один тип �пи�ка"
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr "разделитель должен быть одним �имволом"
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr "вы должны задать �пи�ок байт, �имволов или полей"
 
-#: src/cut.c:850
+#: src/cut.c:790
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr ""
 "разделитель дл� входных данных можно задавать только при обработке полей"
 
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
@@ -2758,11 +2849,11 @@ msgstr ""
 "запрещение вывода �трок, не �одержащих разделителей,\n"
 "имеет �мы�л только при работе � пол�ми"
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr "от�ут�твует �пи�ок полей"
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr "от�ут�твует �пи�ок позиций"
 
@@ -2818,7 +2909,7 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 "       --rfc-3339=СПЕЦ      выве�ти дату/врем� в формате RFC 3339\n"
 "                            СПЕЦ=«date», «seconds» или «ns» дл� получени�\n"
@@ -2827,7 +2918,7 @@ msgstr ""
 "                            пробелом: 2006-08-07 12:34:56-06:00\n"
 "  -s,  --set=СТРОК�         у�тановить врем�, опи�анное СТРОКОЙ\n"
 "  -u, --utc, --universal    показать или у�тановить универ�альное\n"
-"                            координированное врем�\n"
+"                            координированное врем� (UTC)\n"
 
 #: src/date.c:158
 msgid ""
@@ -3034,10 +3125,10 @@ msgstr ""
 "Показать ме�тное врем� 09:00 �ледующей п�тницы на западном побережье СШ�\n"
 "  $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n"
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr "�тандартный ввод"
@@ -3080,7 +3171,7 @@ msgstr ""
 msgid "cannot set date"
 msgstr "невозможно у�тановить дату"
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, c-format
 msgid "time %s is out of range"
 msgstr "врем� %s вне допу�тимого диапазона"
@@ -3091,7 +3182,7 @@ msgstr "врем� %s вне допу�тимого диапазона"
 msgid "Paul Rubin"
 msgstr "Поль Рубин (Paul Rubin)"
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
@@ -3100,7 +3191,7 @@ msgstr ""
 "И�пользование: %s [ОПЕР��Д]…\n"
 "       или:    %s П�Р�МЕТР\n"
 
-#: src/dd.c:526
+#: src/dd.c:532
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
 "\n"
@@ -3119,7 +3210,7 @@ msgstr ""
 "  count=ЧИСЛО     копировать только заданное ЧИСЛО входных блоков\n"
 "  ibs=ЧИСЛО       �читывать до ЧИСЛ� байт за раз (по умолчанию 512)\n"
 
-#: src/dd.c:535
+#: src/dd.c:541
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
 "  iflag=FLAGS     read as per the comma separated symbol list\n"
@@ -3146,7 +3237,7 @@ msgstr ""
 "                  «noxfer» — не выводить �тати�тику передачи\n"
 "                  «none»  — не выводить ничего\n"
 
-#: src/dd.c:546
+#: src/dd.c:552
 msgid ""
 "\n"
 "N and BYTES may be followed by the following multiplicative suffixes:\n"
@@ -3164,7 +3255,7 @@ msgstr ""
 "Каждый �имвол СПИСК� может быть:\n"
 "\n"
 
-#: src/dd.c:555
+#: src/dd.c:561
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
 "  ebcdic    from ASCII to EBCDIC\n"
@@ -3194,7 +3285,7 @@ msgstr ""
 "  sync      дополн�ть каждый входной блок NUL-ми до размера ibs; при\n"
 "            и�пользовании � block или unblock, дополн�ть пробелам, а не NUL\n"
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -3210,7 +3301,7 @@ msgstr ""
 "  fdatasync физиче�ки запи�ать выходной файл перед завершением\n"
 "  fsync     аналогично, но запи�ать также метаданные\n"
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -3224,75 +3315,75 @@ msgstr ""
 "  append    режим добавлени� (имеет �мы�л дл� вывода; рекомендует�� "
 "conv=notrunc)\n"
 
-#: src/dd.c:583
+#: src/dd.c:589
 msgid "  cio       use concurrent I/O for data\n"
 msgstr "  cio       и�пользовать конкурентный ввод/вывод дл� данных\n"
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr "  direct    и�пользовать пр�мой ввод/вывод дл� данных\n"
 
-#: src/dd.c:587
+#: src/dd.c:593
 msgid "  directory  fail unless a directory\n"
 msgstr "  directory выдавать ошибку, е�ли �то не каталог\n"
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr "  dsync     и�пользовать �инхронизированный ввод/вывод дл� данных\n"
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr "  sync      то же, но так же и дл� метаданных\n"
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr "  fullblock накапливать полные блоки входных данных (только iflag)\n"
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr "  nonblock  и�пользовать неблокирующий ввод/вывод\n"
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr "  noatime   не обновл�ть врем� по�леднего до�тупа\n"
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr "  nocache   отвергать к�шированные данные\n"
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr "  noctty    не назначать управл�ющий терминал из файла\n"
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr "  nofollow  не �ледовать по �имвольным ��ылкам\n"
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr "  nolinks   выдавать ошибку, е�ли найдено не�колько ��ылок\n"
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr "  binary    и�пользовать бинарный ввод/вывод дл� данных\n"
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr "  text      и�пользовать тек�товый ввод/вывод дл� данных\n"
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr "  count_bytes  �читать «count=N» как �чётчик байт (только � iflag)\n"
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr "  skip_bytes   �читать «skip=N» как �чётчик байт (только � iflag)\n"
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr "  seek_bytes   �читать «seek=N» как �чётчик байт (только � oflag)\n"
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, c-format
 msgid ""
 "\n"
@@ -3322,7 +3413,17 @@ msgstr ""
 "Ключи:\n"
 "\n"
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr "и�черпана пам�ть буфером ввода размера %zu байт (%s)"
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr "и�черпана пам�ть буфером вывода размера %zu байт (%s)"
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
@@ -3331,7 +3432,7 @@ msgstr ""
 "%<PRIuMAX>+%<PRIuMAX> запи�ей получено\n"
 "%<PRIuMAX>+%<PRIuMAX> запи�ей отправлено\n"
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
@@ -3339,7 +3440,7 @@ msgstr[0] "%<PRIuMAX> у�ечённа� запи�ь\n"
 msgstr[1] "%<PRIuMAX> у�ечённые запи�и\n"
 msgstr[2] "%<PRIuMAX> у�ечённых запи�ей\n"
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
@@ -3347,7 +3448,7 @@ msgstr[0] " �копирован %<PRIuMAX> байт (%s)"
 msgstr[1] " �копировано %<PRIuMAX> байта (%s)"
 msgstr[2] " �копировано %<PRIuMAX> байт (%s)"
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr "Бе�конечно�ть"
 
@@ -3361,83 +3462,83 @@ msgstr "Бе�конечно�ть"
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
 msgstr ", %g c, %s/c\n"
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, c-format
 msgid "closing input file %s"
 msgstr "закрытие входного файла %s"
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr "закрытие выходного файла %s"
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr "не удало�ь выключить O_DIRECT: %s"
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, c-format
 msgid "writing to %s"
 msgstr "запи�ь в %s"
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, c-format
 msgid "unrecognized operand %s"
 msgstr "операнд %s не ра�познан"
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 msgid "invalid conversion"
 msgstr "недопу�тимое преобразование"
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 msgid "invalid input flag"
 msgstr "недопу�тимый флаг ввода"
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 msgid "invalid output flag"
 msgstr "недопу�тимый флаг вывода"
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 msgid "invalid status flag"
 msgstr "недопу�тимый флаг �о�то�ни�"
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, c-format
 msgid "invalid number %s"
 msgstr "неверный номер %s"
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr "нельз� �очетать любые два из {ascii,ebcdic,ibm}"
 
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, c-format
 msgid "cannot combine block and unblock"
 msgstr "нельз� �овмещать block и unblock"
 
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, c-format
 msgid "cannot combine lcase and ucase"
 msgstr "нельз� �овмещать lcase и ucase"
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, c-format
 msgid "cannot combine excl and nocreat"
 msgstr "нельз� �овмещать excl и nocreat"
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, c-format
 msgid "cannot combine direct and nocache"
 msgstr "нельз� �овмещать direct и nocache"
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
@@ -3446,72 +3547,62 @@ msgstr ""
 "предупреждение: обходим ошибку lseek в �дре дл� файла (%s)\n"
 "  mt_type=0x%0lx -- �м. <sys/mtio.h> дл� �пи�ка типов"
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, c-format
 msgid "%s: cannot skip"
 msgstr "%s: невозможно пропу�тить"
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, c-format
 msgid "%s: cannot seek"
 msgstr "%s: невозможно �ме�тить��"
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr "переполнение �двига при чтении файла %s"
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr "предупреждение: �мещение файла �тало неверным по�ле ошибки чтени�"
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr "невозможно обойти ошибку �дра"
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, c-format
 msgid "setting flags for %s"
 msgstr "у�тановка флагов дл� %s"
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr "и�черпана пам�ть буфером ввода размера %zu байт (%s)"
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr "и�черпана пам�ть буфером вывода размера %zu байт (%s)"
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr "%s: невозможно пропу�тить до заданного �мещени�"
 
-#: src/dd.c:2133
+#: src/dd.c:2172
 #, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
 msgstr "не удало�ь выполнить от�ечение на %<PRIdMAX> байт в выходном файле %s"
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr "операци� fdatasync дл� %s завершила�ь неудачно"
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
 msgstr "операци� fsync дл� %s завершила�ь неудачно"
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, c-format
 msgid "failed to open %s"
 msgstr "не удало�ь открыть %s"
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
@@ -3520,96 +3611,105 @@ msgstr ""
 "�мещение �лишком велико: невозможно обрезать до величины seek=%<PRIuMAX> "
 "(%lu-байтных) блоков"
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr "не удало�ь выполнить от�ечение на %<PRIuMAX> байт в выходном файле %s"
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, c-format
 msgid "failed to discard cache for: %s"
 msgstr "�бой при отбра�ывании данных к�ша дл�: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr "Поль Эггерт (Paul Eggert)"
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr "Файлова� �и�тема"
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr "Тип"
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr "блоков"
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr "И�пользовано"
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr "До�тупно"
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr "И�пользовано%"
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr "Iнодов"
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr "IИ�пользовано"
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr "IСвободно"
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr "IИ�пользовано%"
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr "Cмонтировано в"
 
-#: src/df.c:383
+#: src/df.c:207
+msgid "File"
+msgstr "Файл"
+
+#: src/df.c:387
 #, c-format
-msgid "option --output: field '%s' unknown"
-msgstr "ключ --output: неизве�тное поле «%s»"
+msgid "option --output: field %s unknown"
+msgstr "ключ --output: неизве�тное поле %s"
 
-#: src/df.c:390
+#: src/df.c:394
 #, c-format
-msgid "option --output: field '%s' used more than once"
-msgstr "ключ --output: поле «%s» и�пользует�� более одного раза"
+msgid "option --output: field %s used more than once"
+msgstr "ключ --output: поле %s и�пользует�� более одного раза"
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr "Размер"
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr "До�т"
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr "Вме�тимо�ть"
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
 msgstr "%s-%s"
 
-#: src/df.c:1210
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr "невозможно получить до�туп к %s: перемонтировано другим у�трой�твом"
+
+#: src/df.c:1384
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
 "or all file systems by default.\n"
@@ -3617,28 +3717,29 @@ msgstr ""
 "Показывает �ведени� о файловой �и�теме, на которой ра�положен каждый\n"
 "из Ф�ЙЛОВ, или, по умолчанию, обо в�ех файловых �и�темах.\n"
 
-#: src/df.c:1217
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
 "  -a, --all               включать фиктивные файловые �и�темы\n"
-"  -B, --block-size=Р�ЗМЕР и�пользовать блоки указанного Р�ЗМЕР�. �апример,\n"
-"                          «-BM» выводит размеры в единицах, равных 1,048,576 "
-"байтам.\n"
-"                          См. формат Р�ЗМЕР� далее.\n"
+"  -B, --block-size=Р�ЗМЕР и�пользовать блоки указанного Р�ЗМЕР�; например,\n"
+"                          «-BM» выводит размеры в единицах, равных\n"
+"                          1048576 байтам; �м. формат Р�ЗМЕР� далее.\n"
 "      --total             выводить общий итог\n"
-"  -h, --human-readable    выводить размеры в удобном дл� человека виде\n"
-"                          (например, 1K 234M 2G)\n"
-"  -H, --si                то же, но и�пользовать �тепени 1000, а не 1024\n"
+"  -h, --human-readable    выводить размеры в �тепени 1024\n"
+"                          (например, 1023M)\n"
+"  -H, --si                то же, но и�пользовать �тепень 1000 (например, "
+"1.1Г)\n"
 
-#: src/df.c:1227
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -3654,7 +3755,7 @@ msgstr ""
 "      --no-sync           не вызывать sync перед получением информации об\n"
 "                          и�пользовании блоков (по умолчанию)\n"
 
-#: src/df.c:1234
+#: src/df.c:1409
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
 "                               or print all fields if FIELD_LIST is "
@@ -3679,46 +3780,39 @@ msgstr ""
 "  -x, --exclude-type=ТИП  и�ключить файловые �и�темы указанного ТИП�\n"
 "  -v                      (игнорирует��)\n"
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
 "\n"
 "Значение FIELD_LIST предо�тавл�ет �обой �пи�ок включаемых колонок,\n"
 "перечи�л�емых через зап�тую. Возможные имена полей:\n"
 "«source», «fstype», «itotal», «iused», «iavail», «ipcent»,\n"
-"«size», «used», «avail», «pcent» и «target» (�м. также �траницу info).\n"
+"«size», «used», «avail», «pcent», «file» и «target» (�м. также �траницу "
+"info).\n"
 
-#: src/df.c:1285
+#: src/df.c:1460
 #, c-format
 msgid "options %s and %s are mutually exclusive"
 msgstr "ключи %s и %s взаимно и�ключают друг друга"
 
-#: src/df.c:1335
-msgid "warning: "
-msgstr "предупреждение: "
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr "длинный параметр «--megabytes» у�тарел и �коро будет удален"
-
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr "файлова� �и�тема типа %s и выбрана, и и�ключена"
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr "Предупреждение: "
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 msgid "cannot read table of mounted file systems"
 msgstr "не удало�ь прочитать таблицу �монтированных файловых �и�тем"
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr "не обработано ни одной файловой �и�темы"
@@ -3728,7 +3822,7 @@ msgstr "не обработано ни одной файловой Ñ�иÑ�темÑ
 msgid "H. Peter Anvin"
 msgstr "Х. Питер Энвин (H. Peter Anvin)"
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr "И�пользование: %s [КЛЮЧ]… [Ф�ЙЛ]\n"
@@ -3814,8 +3908,10 @@ msgstr ""
 "\n"
 
 #: src/dirname.c:59
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
-msgstr "  -z, --zero       раздел�ть вывод NUL, а не �имволом новой �троки\n"
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
+msgstr ""
+"  -z, --zero       завершать каждую выводимую �троку NUL,\n"
+"                     а не �имволом новой �троки\n"
 
 #: src/dirname.c:64
 #, c-format
@@ -3832,7 +3928,7 @@ msgstr ""
 "  %s dir1/str dir2/str  -> за «dir1» выводит�� «dir2»\n"
 "  %s stdio.h            -> «.»\n"
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -3841,15 +3937,14 @@ msgstr ""
 "И�пользование: %s [КЛЮЧ]… [Ф�ЙЛ]…\n"
 "       или:    %s [КЛЮЧ]… --files0-from=Ф\n"
 
-#: src/du.c:274
+#: src/du.c:285
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr ""
 "Суммирует и�пользование ди�кового про�тран�тва каждого Ф�ЙЛ�, � каталогами.\n"
 
-#: src/du.c:280
+#: src/du.c:291
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3857,7 +3952,7 @@ msgid ""
 "                          larger due to holes in ('sparse') files, internal\n"
 "                          fragmentation, indirect blocks, and the like\n"
 msgstr ""
-"  -0, --null               заканчивать каждую выводимую �троку 0-м байтом,\n"
+"  -0, --null               заканчивать каждую выводимую �троку NUL,\n"
 "                           а не �имволом новой �троки\n"
 "  -a, --all                печатать объём дл� в�ех файлов, а не только\n"
 "                           каталогов\n"
@@ -3869,11 +3964,11 @@ msgstr ""
 "фрагментации,\n"
 "                           ко�венных блоков и тому подобного\n"
 
-#: src/du.c:289
+#: src/du.c:300
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3884,10 +3979,9 @@ msgid ""
 "                          line argument;  --max-depth=0 is the same as\n"
 "                          --summarize\n"
 msgstr ""
-"  -B, --block-size=Р�ЗМЕР  и�пользовать блоки указанного Р�ЗМЕР�. �апример,\n"
-"                           «-BM» выводит размеры в единицах, равных "
-"1,048,576 байтам.\n"
-"                           См. формат Р�ЗМЕР� далее.\n"
+"  -B, --block-size=Р�ЗМЕР  и�пользовать блоки указанного Р�ЗМЕР�; например,\n"
+"                           «-BM» выводит размеры в единицах, равных\n"
+"                           1048576 байтам; �м. формат Р�ЗМЕР� далее.\n"
 "  -b, --bytes              �квивалентно «--apparent-size --block-size=1»\n"
 "  -c, --total              выводить общий итог\n"
 "  -D, --dereference-args   �ледовать только по �имвольным ��ылкам,\n"
@@ -3898,24 +3992,26 @@ msgstr ""
 "                          значение --max-depth=0 аналогично\n"
 "                          указанию --summarize\n"
 
-#: src/du.c:302
+#: src/du.c:313
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
 "      --files0-from=Ф      выве�ти отчёт об и�пользовании ди�ка, чьи имена\n"
-"                           файлов (завершённые нулем) перечи�лены в файле Ф\n"
-"                           Е�ли Ф равно -, то читать имена файлов из\n"
+"                           файлов (завершённые нулем) перечи�лены в файле "
+"Ф;\n"
+"                           е�ли Ф равно -, то читать имена файлов из\n"
 "                           �тандартного ввода\n"
 "  -H                       �квивалентен ключу --dereference-args (-D)\n"
 "  -h, --human-readable     печатать размеры в удобном дл� человека виде\n"
 "                           (например, 1K 234M 2G)\n"
 
-#: src/du.c:310
+#: src/du.c:322
 msgid ""
 "  -k                    like --block-size=1K\n"
 "  -L, --dereference     dereference all symbolic links\n"
@@ -3928,22 +4024,23 @@ msgstr ""
 "                           ��ылок\n"
 "  -m                       �иноним --block-size=1M\n"
 
-#: src/du.c:316
+#: src/du.c:328
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
 "  -P, --no-dereference     не �ледовать по �имвольным ��ылкам (по "
 "умолчанию)\n"
-"  -S, --separate-dirs      не включать размер подкаталогов\n"
+"  -S, --separate-dirs      у каталогов не включать размер подкаталогов\n"
 "      --si                 как -h, но и�пользовать множитель 1000, а не "
 "1024\n"
 "  -s, --summarize          показывать только итог дл� каждого аргумента\n"
 
-#: src/du.c:322
+#: src/du.c:334
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
 "                          or entries greater than SIZE if negative\n"
@@ -3952,14 +4049,14 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
-msgstr ""
-"  -t, --threshold=Р�ЗМЕР   и�ключить �лементы, размер которых меньше "
-"Р�ЗМЕР�,\n"
-"                           е�ли значение положительно, или размер которых\n"
-"                           больше, е�ли значение отрицательно\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
+msgstr ""
+"  -t, --threshold=Р�ЗМЕР   и�ключить �лементы, которые меньше Р�ЗМЕР�,\n"
+"                           е�ли �то значение положительно, или размер "
+"которых\n"
+"                           больше, е�ли �то значение отрицательно\n"
 "      --time               показывать врем� по�леднего изменени� файлов\n"
 "                           в каталоге или во в�ех его подкаталогах\n"
 "      --time=СЛОВО         показывать указанное СЛОВОМ врем�, а не врем�\n"
@@ -3968,7 +4065,7 @@ msgstr ""
 "                           full-iso, long-iso, iso, +ФОРМ�Т\n"
 "                           ФОРМ�Т интерпретирует�� как в «date»\n"
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
@@ -3979,66 +4076,67 @@ msgstr ""
 "      --exclude=Ш�БЛО�     и�ключить файлы, �овпадающие � Ш�БЛО�ом\n"
 "  -x, --one-file-system    пропу�кать каталоги из других файловых �и�тем\n"
 
-#: src/du.c:386
+#: src/du.c:398
 msgid "Infinity"
 msgstr "Бе�конечно�ть"
 
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr "точка монтировани� %s уже пройдена"
-
-#: src/du.c:624
+#: src/du.c:636
 #, c-format
 msgid "fts_read failed: %s"
 msgstr "операци� fts_read завершила�ь � ошибкой: %s"
 
-#: src/du.c:780
+#: src/du.c:787
 #, c-format
 msgid "invalid maximum depth %s"
 msgstr "недопу�тима� мак�имальна� глубина %s"
 
-#: src/du.c:809
+#: src/du.c:816
 #, c-format
 msgid "invalid --threshold argument '-0'"
 msgstr "недопу�тимый дл� --threshold аргумент «-0»"
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr "невозможно одновременно подводить итог и показывать в�е �лементы"
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr "предупреждение: подведение итога �то то же �амое, что и --max-depth=0"
 
-#: src/du.c:900
+#: src/du.c:911
 #, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr "предупреждение: подведение итога конфликтует � --max-depth=%lu"
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+"предупреждение: ключи --apparent-size и -b не работают вме�те � --inodes"
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 msgid "file operands cannot be combined with --files0-from"
 msgstr "операнды-файлы нельз� �очетать � --files0-from"
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr "%s: ошибка чтени�"
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr ""
 "при чтении имён файлов �о �тандартного ввода, им� файла %s не допу�кает��"
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 msgid "invalid zero-length file name"
 msgstr "неверное им� файла нулевой длины"
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr "итого"
 
@@ -4150,11 +4248,11 @@ msgstr ""
 #: src/env.c:61
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
 "  -i, --ignore-environment   начать � пу�тым окружением\n"
-"  -0, --null                 завершать каждую выводимую �троку 0-м байтом,\n"
+"  -0, --null                 завершать каждую выводимую �троку NUL,\n"
 "                             a не �имволом новой �троки\n"
 "  -u, --unset=ИМЯ            удалить переменную � ИМЕ�ЕМ из окружени�\n"
 
@@ -4164,7 +4262,7 @@ msgid ""
 "A mere - implies -i.  If no COMMAND, print the resulting environment.\n"
 msgstr ""
 "\n"
-"Про�то «-» -- �иноним дл� «-i». Е�ли не задана КОМ��Д�, печатает "
+"Про�то «-» — �иноним дл� «-i». Е�ли не задана КОМ��Д�, печатает "
 "получившее��\n"
 "окружение.\n"
 
@@ -4235,16 +4333,16 @@ msgid "input line is too long"
 msgstr "входна� �трока �лишком велика"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr "Майк Паркер (Mike Parker)"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr "Джейм� Янгмен (James Youngman)"
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
@@ -4253,7 +4351,7 @@ msgstr ""
 "И�пользование: %s ВЫР�ЖЕ�ИЕ\n"
 "       или:    %s КЛЮЧ\n"
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -4271,7 +4369,7 @@ msgstr ""
 "\n"
 "  �РГ1 & �РГ2       �РГ1, е�ли оба отличны от нул�, иначе 0\n"
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -4289,7 +4387,7 @@ msgstr ""
 "  �РГ1 >= �РГ2      �РГ1 больше или равен �РГ2\n"
 "  �РГ1 > �РГ2       �РГ1 больше �РГ2\n"
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
@@ -4299,7 +4397,7 @@ msgstr ""
 "  �РГ1 + �РГ2       арифметиче�ка� �умма �РГ1 и �РГ2\n"
 "  �РГ1 - �РГ2       арифметиче�ка� разно�ть �РГ1 и �РГ2\n"
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -4312,7 +4410,7 @@ msgstr ""
 "  �РГ1 / �РГ2       арифметиче�кое ча�тное �РГ1 и �РГ2\n"
 "  �РГ1 % AРГ2       арифметиче�кий о�таток от делени� �РГ1 на �РГ2\n"
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -4331,7 +4429,7 @@ msgstr ""
 "                             СИМВОЛОВ, иначе 0\n"
 "  length СТРОК�              длина СТРОКИ\n"
 
-#: src/expr.c:251
+#: src/expr.c:250
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
 "                               keyword like 'match' or an operator like '/'\n"
@@ -4344,7 +4442,7 @@ msgstr ""
 "\n"
 "  ( ВЫР�ЖЕ�ИЕ )              значение ВЫР�ЖЕ�ИЯ\n"
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -4362,7 +4460,7 @@ msgstr ""
 "образцом возвращают �овпавшую �троку между \\( и \\) или пу�тую �троку;\n"
 "е�ли \\( и \\) не и�пользованы, то возвращает�� чи�ло �овпавших �имволов.\n"
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -4374,32 +4472,32 @@ msgstr ""
 "ВЫР�ЖЕ�ИЕ пу�то или 0; 2, е�ли ВЫР�ЖЕ�ИЕ �интак�иче�ки неверно; и 3,\n"
 "е�ли �лучит�� ошибка.\n"
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, c-format
 msgid "syntax error"
 msgstr "�интак�иче�ка� ошибка"
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, c-format
 msgid "error in regular expression matcher"
 msgstr "ошибка в �опо�тавителе регул�рных выражений"
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, c-format
 msgid "non-integer argument"
 msgstr "нецелочи�ленный аргумент"
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr "деление на ноль"
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr "чтобы обойти �ту проблему, у�тановите LC_ALL='C'"
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, c-format
 msgid "the strings compared were %s and %s"
 msgstr "�равнивали�ь �троки %s %s"
@@ -4409,27 +4507,27 @@ msgstr "�равнивали�ь �троки %s %s"
 msgid "Niels Moller"
 msgstr "�иль� Меллер (Niels Moller)"
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
 msgstr "�е пройден о�новной те�т Лука�а. Этого не должно �лучить��"
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
 msgstr "переполнение очереди squfof"
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, c-format
 msgid "%s is not a valid positive integer"
 msgstr "%s не �вл�ет�� допу�тимым целым положительным чи�лом"
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr "%s �лишком велик"
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
@@ -4438,7 +4536,7 @@ msgstr ""
 "И�пользование: %s [ЧИСЛО]…\n"
 "       или:    %s КЛЮЧ\n"
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
 "are specified on the command line, read them from standard input.\n"
@@ -4548,17 +4646,17 @@ msgid "invalid number of columns: %s"
 msgstr "неверное чи�ло �толбцов: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr "Падрайг Бр�ди (Padraig Brady)"
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, c-format
 msgid "Usage: %s\n"
 msgstr "И�пользование: %s\n"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
@@ -4567,12 +4665,12 @@ msgstr ""
 "�ценари�х командной �троки.\n"
 "\n"
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, c-format
 msgid "failed to get groups for user %s"
 msgstr "не удало�ь получить группы пользовател� %s"
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, c-format
 msgid "failed to get groups for the current process"
 msgstr "не удало�ь получить группы текущего проце��а"
@@ -4597,22 +4695,22 @@ msgstr ""
 "ИМЯ не задано, то по текущему проце��у (может различать��, е�ли база данных\n"
 "групп была изменена).\n"
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, c-format
 msgid "cannot get real UID"
 msgstr "невозможно получить реальный UID"
 
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, c-format
 msgid "cannot get effective GID"
 msgstr "невозможно получить �ффективный GID"
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, c-format
 msgid "cannot get real GID"
 msgstr "невозможно получить реальный GID"
 
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, c-format
 msgid "%s: no such user"
 msgstr "%s: такого пользовател� нет"
@@ -4664,58 +4762,48 @@ msgstr ""
 "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
 "GB 1000*1000*1000, G 1024*1024*1024 и так далее дл� T, P, E, Z, Y.\n"
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr "%s: файл �лишком �ократил��"
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, c-format
 msgid "%s: number of bytes is too large"
 msgstr "%s: чи�ло байт �лишком велико"
 
-#: src/head.c:440
-#, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr "%s: невозможно вернуть указатель файла на первоначальную позицию"
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr "%s: невозможно �ме�тить�� к позиции %s"
 
-#: src/head.c:673
-#, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "%s: не удало�ь �бро�ить (reset) файловый указатель"
-
-#: src/head.c:798
+#: src/head.c:423 src/tail.c:457
 #, c-format
-msgid "cannot reposition file pointer for %s"
-msgstr "невозможно переме�тить указатель файла дл� %s"
+msgid "%s: cannot seek to relative offset %s"
+msgstr "%s: невозможно переме�тить указатель позиции на %s"
 
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr "%s: %s на�только велико, что его невозможно машинно пред�тавить"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr "чи�ло �трок"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr "чи�ло байт"
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr "неверное чи�ло �трок"
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr "неверный чи�ло байт"
 
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, c-format
 msgid "invalid trailing option -- %c"
 msgstr "неверный завершающий ключ -- %c"
@@ -4762,42 +4850,48 @@ msgid "cannot determine hostname"
 msgstr "невозможно определить им� машины"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr "�рнольд Роббин� (Arnold Robbins)"
 
-#: src/id.c:81
+#: src/id.c:84
 #, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
+msgid "Usage: %s [OPTION]... [USER]\n"
 msgstr "И�пользование: %s [КЛЮЧ]… [ПОЛЬЗОВ�ТЕЛЬ]\n"
 
-#: src/id.c:82
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
 msgstr ""
-"Печатает информацию о пользователе и группе дл� заданного\n"
+"Выводит информацию о пользователе и группе дл� заданного\n"
 "ПОЛЬЗОВ�ТЕЛЯ, или о текущем пользователе (е�ли ничего не указано).\n"
 "\n"
-"  -a              игнорирует��, введено только дл� �овме�тимо�ти\n"
-"  -Z, --context   выве�ти только контек�т безопа�но�ти текущего "
-"пользовател�\n"
-"  -g, --group     печатать только �ффективный ID группы\n"
-"  -G, --groups    печатать в�е ID групп\n"
-"  -n, --name      печатать им� вме�то номера, дл� ключей -ugG\n"
-"  -r, --real      печатать дей�твительные, а не �ффективные ID, дл� ключей -"
-"ugG\n"
-"  -u, --user      печатать только �ффективный ID пользовател�\n"
 
-#: src/id.c:96
+#: src/id.c:90
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
+msgstr ""
+"  -a              игнорирует��, дл� �овме�тимо�ти � другими вер�и�ми\n"
+"  -Z, --context   выве�ти только контек�т безопа�но�ти проце��а\n"
+"  -g, --group     выве�ти только �ффективный ID группы\n"
+"  -G, --groups    выве�ти в�е ID групп\n"
+"  -n, --name      выве�ти им� вме�то номера, дл� ключей -ugG\n"
+"  -r, --real      выве�ти дей�твительные, а не �ффективные ID, дл� -ugG\n"
+"  -u, --user      выве�ти только �ффективный ID пользовател�\n"
+"  -z, --zero      раздел�ть запи�и �имволами NUL, а не пробельными;\n"
+"                  не допу�кает�� дл� формата по умолчанию\n"
+
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
@@ -4806,118 +4900,128 @@ msgstr ""
 "Е�ли КЛЮЧИ не заданы, печатает некоторый �тандартный набор полезных "
 "�ведений.\n"
 
-#: src/id.c:140
+#: src/id.c:151
+#, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr "--context (-Z) работает только дл� �дер � поддержкой SELinux/SMACK"
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr "--context (-Z) работает только дл� �дер � поддержкой SELinux"
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr "невозможно напечатать контек�т безопа�но�ти, е�ли указан пользователь"
 
-#: src/id.c:178
+#: src/id.c:198
 #, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr "невозможно печатать «только» более одного выбора"
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr ""
 "невозможно напечатать только имена или дей�твительные ID в формате по "
 "умолчанию"
 
-#: src/id.c:199
+#: src/id.c:209
+#, c-format
+msgid "option --zero not permitted in default format"
+msgstr "ключ --zero запрещён дл� формата по умолчанию"
+
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
 msgstr "не удало�ь получить контек�т проце��а"
 
-#: src/id.c:224
+#: src/id.c:265
 #, c-format
 msgid "cannot get effective UID"
 msgstr "невозможно получить �ффективный UID"
 
-#: src/id.c:311
+#: src/id.c:354
 #, c-format
 msgid "cannot find name for user ID %s"
 msgstr "невозможно определить им� пользовател� дл� ID %s"
 
-#: src/id.c:329
+#: src/id.c:372
 #, c-format
 msgid "uid=%s"
 msgstr "uid=%s"
 
-#: src/id.c:334
+#: src/id.c:377
 #, c-format
 msgid " gid=%s"
 msgstr " gid=%s"
 
-#: src/id.c:341
+#: src/id.c:384
 #, c-format
 msgid " euid=%s"
 msgstr " euid=%s"
 
-#: src/id.c:349
+#: src/id.c:392
 #, c-format
 msgid " egid=%s"
 msgstr " egid=%s"
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr " группы="
 
-#: src/id.c:393
+#: src/id.c:437
 #, c-format
 msgid " context=%s"
 msgstr " контек�т=%s"
 
-#: src/install.c:373
+#: src/install.c:376
 #, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr "предупреждение: %s: невозможно �менить контек�т на %s"
 
-#: src/install.c:414
+#: src/install.c:417
 #, c-format
 msgid "creating directory %s"
 msgstr "�оздание каталога %s"
 
-#: src/install.c:482
+#: src/install.c:485
 #, c-format
 msgid "cannot change ownership of %s"
 msgstr "невозможно изменить владельца %s"
 
-#: src/install.c:506
+#: src/install.c:509
 #, c-format
 msgid "cannot set time stamps for %s"
 msgstr "невозможно у�тановить временные отметки дл� %s"
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, c-format
 msgid "fork system call failed"
 msgstr "�и�темный вызов fork завершил�� неудачно"
 
-#: src/install.c:531
+#: src/install.c:535
 #, c-format
 msgid "cannot run %s"
 msgstr "невозможно запу�тить %s"
 
-#: src/install.c:535
+#: src/install.c:539
 #, c-format
 msgid "waiting for strip"
 msgstr "ожидание strip"
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr "проце�� strip завершил�� неудачно"
 
-#: src/install.c:558
+#: src/install.c:565
 #, c-format
 msgid "invalid user %s"
 msgstr "неверный пользователь %s"
 
-#: src/install.c:594
+#: src/install.c:601
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -4930,7 +5034,7 @@ msgstr ""
 "       или:    %s [КЛЮЧ]… -t К�Т�ЛОГ ИСТОЧ�ИК…\n"
 "       или:    %s [КЛЮЧ]… -d К�Т�ЛОГ…\n"
 
-#: src/install.c:601
+#: src/install.c:608
 msgid ""
 "\n"
 "This install program copies files (often just compiled) into destination\n"
@@ -4954,7 +5058,7 @@ msgstr ""
 "владельца/группу. В четвёртой форме �оздают�� в�е компоненты указанных\n"
 "К�Т�ЛОГОВ.\n"
 
-#: src/install.c:615
+#: src/install.c:622
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
 "  -b                  like --backup but does not accept an argument\n"
@@ -4976,7 +5080,7 @@ msgstr ""
 "�оздавать\n"
 "                           в�е компоненты указанных каталогов\n"
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -4996,7 +5100,7 @@ msgstr ""
 "  -o, --owner=ВЛ�ДЕЛЕЦ     у�танавливать ВЛ�ДЕЛЬЦ� (только дл�\n"
 "                           �уперпользовател�)\n"
 
-#: src/install.c:631
+#: src/install.c:638
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
 "files\n"
@@ -5021,17 +5125,27 @@ msgstr ""
 "  -T, --no-target-directory �читать ��З��ЧЕ�ИЕ обычным файлом\n"
 "  -v, --verbose            выводить название каждого �оздаваемого каталога\n"
 
-#: src/install.c:641
+#: src/install.c:648
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
 "      --preserve-context   �охран�ть контек�т безопа�но�ти SELinux\n"
-"  -Z, --context=КО�ТЕКСТ   задать контек�т безопа�но�ти SELinux файлам\n"
-"                           и каталогам\n"
+"  -Z                       у�тановить контек�т безопа�но�ти SELinux\n"
+"                           файла назначени� равным типу по умолчанию\n"
+"      --context[=CTX]      подобно -Z, или е�ли указан CTX, то у�тановить\n"
+"                           контек�т безопа�но�ти SELinux\n"
+"                           или SMACK равным CTX\n"
+
+#: src/install.c:696 src/unlink.c:86
+#, c-format
+msgid "cannot unlink %s"
+msgstr "невозможно удалить ��ылку %s"
 
-#: src/install.c:859
+#: src/install.c:877
 #, c-format
 msgid ""
 "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
@@ -5039,50 +5153,39 @@ msgstr ""
 "ПРЕДУПРЕЖДЕ�ИЕ: игнорирует�� ключ --preserve-context; �дро без поддержки "
 "SELinux"
 
-#: src/install.c:869
-#, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
-msgstr ""
-"ПРЕДУПРЕЖДЕ�ИЕ: игнорирует�� ключ --context (-Z); �дро без поддержки SELinux"
-
-#: src/install.c:886
+#: src/install.c:917
 #, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr "при у�тановке каталога нельз� примен�ть ключ strip"
 
-#: src/install.c:889
+#: src/install.c:920
 #, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr "при у�тановке каталога нельз� задавать целевой каталог"
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr "невозможно у�тановить контек�т цели в %s и �охранить его"
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, c-format
 msgid "invalid mode %s"
 msgstr "неверный режим %s"
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr ""
 "ПРЕДУПРЕЖДЕ�ИЕ: игнорирует�� ключ --strip-program, так как не указан ключ -s"
 
-#: src/install.c:959
+#: src/install.c:1001
 #, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr ""
 "ключи --compare (-C) и --preserve-timestamps взаимно и�ключают друг друга"
 
-#: src/install.c:966
+#: src/install.c:1008
 #, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr "ключи --compare (-C) и --strip взаимно и�ключают друг друга"
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -5096,7 +5199,7 @@ msgstr ""
 msgid "Mike Haertel"
 msgstr "Майк Гертель (Mike Haertel)"
 
-#: src/join.c:191
+#: src/join.c:195
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
 "standard output.  The default join field is the first, delimited\n"
@@ -5117,7 +5220,7 @@ msgstr ""
 "                     Ф�ЙЛУ1 и Ф�ЙЛУ2\n"
 "  -e СТРОК�          замещать при выводе пу�тые �троки указанной СТРОКОЙ\n"
 
-#: src/join.c:200
+#: src/join.c:204
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
 "  -j FIELD          equivalent to '-1 FIELD -2 FIELD'\n"
@@ -5130,7 +5233,7 @@ msgstr ""
 "  -t СИМ             и�пользовать СИМВОЛ как разделитель полей ввода и "
 "вывода\n"
 
-#: src/join.c:206
+#: src/join.c:210
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
 "  -1 FIELD          join on this FIELD of file 1\n"
@@ -5151,7 +5254,13 @@ msgstr ""
 "  --header           �читать первую �троку каждого файла названи�ми полей,\n"
 "                     выводить их без выполнени� пои�ка пары\n"
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr ""
+"  -z, --zero-terminated        разделитель �трок NUL, а не �имвол\n"
+"                               новой �троки\n"
+
+#: src/join.c:225
 msgid ""
 "\n"
 "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n"
@@ -5186,47 +5295,47 @@ msgstr ""
 "правила, задаваемые «LC_COLLATE». Е�ли ввод не от�ортирован и одинаковые\n"
 "�троки не объединены, то будет выдано предупреждающее �ообщение.\n"
 
-#: src/join.c:403
+#: src/join.c:410
 #, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
 msgstr "%s:%<PRIuMAX>: без �ортировки: %.*s"
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, c-format
 msgid "invalid field number: %s"
 msgstr "неверный номер пол�: %s"
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, c-format
 msgid "invalid field specifier: %s"
 msgstr "неверна� �пецификаци� пол�: %s"
 
-#: src/join.c:877
+#: src/join.c:884
 #, c-format
 msgid "invalid file number in field spec: %s"
 msgstr "неверный номер файла в �пецификации пол�: %s"
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr "пол� объединени� %lu, %lu не�овме�тимы"
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr "конфликтующие �троки замены дл� пу�того пол�"
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, c-format
 msgid "multi-character tab %s"
 msgstr "многознакова� табул�ци� %s"
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr "не�овме�тима� табул�ци�"
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr "оба файла не могут быть �тандартным вводом"
@@ -5346,47 +5455,47 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr "невозможно �оздать ��ылку %s на %s"
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr "%s: не допу�кает�� �оздавать жё�ткие ��ылки на каталоги"
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, c-format
 msgid "%s: cannot overwrite directory"
 msgstr "%s: невозможно перезапи�ать каталог"
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
 msgstr "%s: заменить %s? "
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, c-format
 msgid "failed to create symbolic link %s"
 msgstr "не удало�ь �оздать �имвольную ��ылку %s"
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr "не удало�ь �оздать �имвольную ��ылку %s на %s"
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr "не удало�ь �оздать жё�ткую ��ылку на %.0s%s"
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, c-format
 msgid "failed to create hard link %s"
 msgstr "не удало�ь �оздать жё�ткую ��ылку %s"
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, c-format
 msgid "failed to create hard link %s => %s"
 msgstr "не удало�ь �оздать жё�ткую ��ылку %s => %s"
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -5399,7 +5508,7 @@ msgstr ""
 "         или:  %s [КЛЮЧ]… ЦЕЛЬ... К�Т�ЛОГ        (3-� форма)\n"
 "         или:  %s [КЛЮЧ]… -t К�Т�ЛОГ ЦЕЛЬ…     (4-а� форма)\n"
 
-#: src/ln.c:381
+#: src/ln.c:398
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
 "In the 2nd form, create a link to TARGET in the current directory.\n"
@@ -5419,7 +5528,7 @@ msgstr ""
 "Символьные ��ылки могут �одержать произвольный тек�т; при разыменовании\n"
 "отно�ительна� ��ылка интерпретирует�� отно�ительно родитель�кого каталога.\n"
 
-#: src/ln.c:394
+#: src/ln.c:411
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
 "file\n"
@@ -5442,7 +5551,7 @@ msgstr ""
 "                           �уперпользовател�)\n"
 "  -f, --force              удал�ть �уще�твующие целевые файлы\n"
 
-#: src/ln.c:402
+#: src/ln.c:419
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
 "  -L, --logical               dereference TARGETs that are symbolic links\n"
@@ -5465,7 +5574,7 @@ msgstr ""
 "  -s, --symbolic           �оздавать �имвольные ��ылки, вме�то жё�тких "
 "��ылок\n"
 
-#: src/ln.c:411
+#: src/ln.c:428
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
 "  -t, --target-directory=DIRECTORY  specify the DIRECTORY in which to "
@@ -5479,7 +5588,7 @@ msgstr ""
 "  -T, --no-target-directory  в�егда �читать ИМЯ_ССЫЛКИ обычным файлом\n"
 "  -v, --verbose            печатать им� каждого файла при �оздании ��ылки\n"
 
-#: src/ln.c:433
+#: src/ln.c:450
 #, c-format
 msgid ""
 "\n"
@@ -5491,12 +5600,12 @@ msgstr ""
 "определ�ет поведение, когда ЦЕЛЬЮ �вл�ет�� �имвольна� ��ылка,\n"
 "по умолчанию %s.\n"
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr "нельз� �очетать --target-directory и --no-target-directory"
 
-#: src/ln.c:588
+#: src/ln.c:605
 #, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr "нельз� указывать --relative без --symbolic"
@@ -5529,7 +5638,7 @@ msgstr "реги�трационное им� от�ут�твует"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
@@ -5538,96 +5647,96 @@ msgstr "%b %e  %Y"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 msgid "%b %e %H:%M"
 msgstr "%b %e %H:%M"
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr ""
 "проигнорировано неверное значение переменной окружени� QUOTING_STYLE: %s"
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr "проигнорирована неверна� ширина в переменной окружени� COLUMNS: %s"
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr ""
 "проигнорирован неверный размер табул�ции в переменной окружени� TABSIZE: %s"
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, c-format
 msgid "invalid line width: %s"
 msgstr "неверна� ширина �троки: %s"
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, c-format
 msgid "invalid tab size: %s"
 msgstr "неверный размер табул�ции: %s"
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, c-format
 msgid "invalid time style format %s"
 msgstr "неверный формат времени %s"
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 msgid "Valid arguments are:\n"
 msgstr "Допу�тимые аргументы:\n"
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr "  - +ФОРМ�Т (например, +%H:%M) дл� формата в �тиле «date»\n"
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr "ошибка при инициализации �трок, задающих ме��цы"
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, c-format
 msgid "unrecognized prefix: %s"
 msgstr "не ра�познан префик�: %s"
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr "не анализируемое значение в переменной окружени� LS_COLORS"
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, c-format
 msgid "cannot open directory %s"
 msgstr "невозможно открыть каталог %s"
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, c-format
 msgid "cannot determine device and inode of %s"
 msgstr "невозможно определить у�трой�тво и inode дл� %s"
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, c-format
 msgid "%s: not listing already-listed directory"
 msgstr "%s: пропу�к уже перечи�ленного каталога"
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, c-format
 msgid "reading directory %s"
 msgstr "чтение каталога %s"
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, c-format
 msgid "closing directory %s"
 msgstr "закрытие каталога %s"
 
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, c-format
 msgid "cannot compare file names %s and %s"
 msgstr "невозможно �равнить имена файлов %s и %s"
 
-#: src/ls.c:4721
+#: src/ls.c:4781
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
 "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n"
@@ -5636,7 +5745,7 @@ msgstr ""
 "Сортирует в алфавитном пор�дке, е�ли не задан ни --sort, ни один из\n"
 "ключей -cftuvSUX.\n"
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
 "  -A, --almost-all           do not list implied . and ..\n"
@@ -5650,55 +5759,50 @@ msgstr ""
 "  -b, --escape               печатать �кранирующие по�ледовательно�ти\n"
 "                             в �тиле С дл� не графиче�ких �имволов\n"
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
-"      --block-size=Р�ЗМЕР    и�пользовать блоки указанного Р�ЗМЕР�. "
-"�апример,\n"
+"      --block-size=Р�ЗМЕР    и�пользовать блоки указанного Р�ЗМЕР�; "
+"например,\n"
 "                             «---block-size=M» выводит размеры в единицах,\n"
-"                             равных 1,048,576 байтам. См. формат Р�ЗМЕР� "
+"                             равных 1048576 байтам; �м. формат Р�ЗМЕР� "
 "далее.\n"
 "  -B, --ignore-backups       не выдавать файлы, оканчивающие�� на ~\n"
 "  -c                         � -lt: �ортировать и показывать по ctime "
 "(времени\n"
-"                             по�леднего изменени� файла)\n"
-"                             � -l: показывать ctime и �ортировать по имени\n"
+"                             по�леднего изменени� файла);\n"
+"                             � -l: показывать ctime и �ортировать по имени;\n"
 "                             иначе: �ортировать по ctime, �начала �амые "
 "новые\n"
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 "  -C                         выдавать �пи�ок в не�колько колонок\n"
-"      --color[=КОГД�]        указывает, нужно ли выдел�ть типы файлов "
-"цветом.\n"
-"                             КОГД� может быть «always» (по умолчанию), "
-"«never»\n"
-"                             или «auto». Подробней �м. ниже\n"
-"  -d, --directory            выдавать имена каталогов, а не их �одержимое, "
-"а\n"
-"                             также не �ледовать по �имвольным ��ылкам\n"
+"      --color[=КОГД�]        ра�цвечивать вывод;\n"
+"                             КОГД� может быть «always» (по умолчанию),\n"
+"                             «never» или «auto». Подробней �м. ниже\n"
+"  -d, --directory            выдавать имена каталогов, а не их �одержимое\n"
 "  -D, --dired                генерировать вывод дл� режима Emacs dired\n"
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
 "  -F, --classify             append indicator (one of */=>@|) to entries\n"
@@ -5707,53 +5811,53 @@ msgid ""
 "                               single-column -1, verbose -l, vertical -C\n"
 "      --full-time            like -l --time-style=full-iso\n"
 msgstr ""
-"  -f                         не �ортировать, включает -aU, выключает -ls --"
-"color\n"
-"  -F, --classify             добавл�ть к имени файла индикатор (один из */"
+"  -f                         не �ортировать, включает -aU,\n"
+"                             выключает -ls --color\n"
+"  -F, --classify             добавл�ть к �лементам индикатор (один из */"
 "=>@|)\n"
 "      --file-type            аналогично, но не добавл�ть «*»\n"
 "      --format=СЛОВО         across -x, commas -m, horizontal -x, long -l,\n"
 "                             single-column -1, verbose -l, vertical -C\n"
 "      --full-time            �иноним -l --time-style=full-iso\n"
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr "  -g                         как -l, но не выводить владельца\n"
 
-#: src/ls.c:4763
+#: src/ls.c:4823
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 "      --group-directories-first\n"
-"                             группировать каталоги перед файлами.\n"
-"                             дополн�ет�� ключом --sort, но любое "
-"и�пользование\n"
+"                             группировать каталоги раньше файлов;\n"
+"                             может дополн�ть�� ключом --sort,\n"
+"                             но любое и�пользование\n"
 "                             --sort=none (-U) выключает группировку\n"
 
-#: src/ls.c:4769
+#: src/ls.c:4829
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
 "  -G, --no-group             в длинном формате не печатать имена групп\n"
-"  -h, --human-readable       c -l, печатать размеры в удобном дл� человека "
-"виде\n"
-"                             (например, 1K 234M 2G)\n"
-"      --si                   то же, но и�пользовать �тепени 1000, а не 1024\n"
+"  -h, --human-readable       c -l и/или -s печатать размеры в удобном дл�\n"
+"                             человека виде (например, 1K 234M 2G)\n"
+"      --si                   то же, но и�пользовать �тепень 1000, а не 1024\n"
 
-#: src/ls.c:4775
+#: src/ls.c:4835
 msgid ""
 "  -H, --dereference-command-line\n"
 "                             follow symbolic links listed on the command "
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
@@ -5765,10 +5869,10 @@ msgstr ""
 "                             �ледовать по в�ем �имвольным ��ылкам в "
 "командной\n"
 "                             �троке, которые указывают на каталог\n"
-"      --hide=Ш�БЛО�          не показывать файлы, �оответ�твующие Ш�БЛО�У\n"
+"      --hide=Ш�БЛО�          не показывать запи�и, �оответ�твующие Ш�БЛО�У\n"
 "                             оболочки (отмен�ет�� ключами -a или -A)\n"
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
 "names:\n"
@@ -5777,19 +5881,19 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 "      --indicator-style=СТИЛЬ добавл�ть к именам �лементов индикатор �\n"
-"                             указанным СТИЛЕМ: none (по умолчанию), \n"
-"                             slash (-p), \n"
-"                             file-type (--file-type), \n"
-"                             classify (-F)\n"
-"  -i, --inode                показать индек� каждого файла\n"
-"  -I, --ignore=Ш�БЛО�        не показывать файлы, �оответ�твующие Ш�БЛО�У\n"
+"                             указанным СТИЛЕМ: none (по умолчанию),\n"
+"                             slash (-p), file-type (--file-type), classify (-"
+"F)\n"
+"  -i, --inode                показывать индек� каждого файла\n"
+"  -I, --ignore=Ш�БЛО�        не показывать запи�и, �оответ�твующие Ш�БЛО�У\n"
 "                             оболочки\n"
-"  -k                         и�пользовать блоки по 1024 байта\n"
+"  -k, --kibibytes            по умолчанию и�пользовать блоки по 1024 байта\n"
+"                             при показе и�пользовани� ди�ка\n"
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -5805,7 +5909,7 @@ msgstr ""
 "                             ��ылает��\n"
 "  -m                         выдавать �пи�ок на в�ю ширину через зап�тую\n"
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -5821,26 +5925,27 @@ msgstr ""
 "  -o                         как -l, но не выводить информацию о группе\n"
 "  -p,  --indicator-style=slash  добавл�ть индикатор / к каталогам\n"
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
 "                               literal, locale, shell, shell-always, c, "
 "escape\n"
 msgstr ""
-"  -q, --hide-control-chars   печатать ? вме�то не графиче�ких �имволов\n"
-"      --show-control-chars   показывать непечатаемые �имволы (по умолчанию\n"
-"                             е�ли программа не «ls» и вывод идет не на "
+"  -q, --hide-control-chars   выводить ? вме�то непечатных �имволов\n"
+"      --show-control-chars   показывать непечатные �имволы (по умолчанию,\n"
+"                             е�ли программа не «ls» и вывод не на "
 "терминал).\n"
-"  -Q, --quote-name           заключать им� файла в кавычки\n"
+"  -Q, --quote-name           заключать им� запи�ей в кавычки\n"
 "      --quoting-style=ТИП    и�пользовать тип заключени� в кавычки ТИП:\n"
-"                             literal, shell, shell-always, c, escape\n"
+"                             literal, locale, shell, shell-always, c, "
+"escape\n"
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
 "  -R, --recursive            list subdirectories recursively\n"
@@ -5851,53 +5956,56 @@ msgstr ""
 "  -R, --recursive            рекур�ивно показывать каталоги\n"
 "  -s, --size                 печатать размер каждого файла в блоках\n"
 
-#: src/ls.c:4825
+#: src/ls.c:4886
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 "  -S                         �ортировать по размеру файла\n"
 "      --sort=СЛОВО           �ортировать по СЛОВУ, а не по имени: \n"
-"                             none (без �ортировки) -U, \n"
-"                             extension (ра�ширение) -X, size (размер) -S,\n"
-"                             time (врем�) -t, version (вер�и�) -v\n"
-"      --time=СЛОВО           � ключом -l, показывать вме�то времени "
-"изменени�\n"
-"                             врем�, заданное СЛОВОМ: \n"
-"                             atime -u, access -u, use -u,\n"
-"                             ctime -c или status -c;\n"
+"                             none (без �ортировки) -U, size (размер) -S,\n"
+"                             time (врем�) -t, version (вер�и�) -v,\n"
+"                             extension (ра�ширение) -X\n"
+"                             \n"
+"      --time=СЛОВО           � ключом -l, показывать вме�то времени\n"
+"                             изменени� врем�, заданное СЛОВОМ: \n"
+"                             atime, access, use (-u),\n"
+"                             ctime, status (-c);\n"
 "                             е�ли --sort=time, и�пользовать указанное\n"
 "                             врем� в каче�тве ключа �ортировки\n"
 
-#: src/ls.c:4835
+#: src/ls.c:4896
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
-msgstr ""
-"      --time-style=СТИЛЬ     � -l, показывать врем� и�пользу� указанный "
-"СТИЛЬ:\n"
-"                             full-iso, long-iso, iso, locale, +ФОРМ�Т.\n"
-"                             ФОРМ�Т интерпретирует�� как в «date»; е�ли "
-"ФОРМ�Т\n"
-"                             -- �то ФОРМ�Т1<перевод-�троки>ФОРМ�Т2, ФОРМ�Т1\n"
-"                             примен�ет�� к �тарым файлам, а ФОРМ�Т2 к "
-"новым;\n"
-"                             е�ли к СТИЛЮ добавлен префик� «posix-», то он\n"
-"                             дей�твует только в локали, отличной от POSIX\n"
-
-#: src/ls.c:4844
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
+msgstr ""
+"      --time-style=СТИЛЬ     � -l, показывать врем� и�пользу� СТИЛЬ:\n"
+"                             full-iso, long-iso, iso, locale, +ФОРМ�Т;\n"
+"                             ФОРМ�Т интерпретирует�� как в «date»;\n"
+"                             е�ли ФОРМ�Т — �то\n"
+"                             ФОРМ�Т1<перевод-�троки>ФОРМ�Т2, то\n"
+"                             ФОРМ�Т1 примен�ет�� к �тарым файлам,\n"
+"                             а ФОРМ�Т2 к новым; е�ли к СТИЛЮ добавлен\n"
+"                             префик� «posix-», то он дей�твует только\n"
+"                             в локали, отличной от POSIX\n"
+
+#: src/ls.c:4908
 msgid ""
 "  -t                         sort by modification time, newest first\n"
 "  -T, --tabsize=COLS         assume tab stops at each COLS instead of 8\n"
@@ -5907,40 +6015,38 @@ msgstr ""
 "  -T, --tabsize=Р�ЗМЕР       и�пользовать табул�цию указанного Р�ЗМЕР�, а не "
 "8\n"
 
-#: src/ls.c:4848
+#: src/ls.c:4912
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
 msgstr ""
-"  -u                         � -lt: �ортировать и показывать врем� до�тупа\n"
-"                             c -l: показывать врем� до�тупа и �ортировать по "
-"имени\n"
-"                             иначе: �ортировать по времени до�тупа\n"
-"  -U                         не �ортировать; печатать в �оответ�твии �\n"
+"  -u                         � -lt: �ортировать и показывать врем� до�тупа;\n"
+"                             c -l: показывать врем� до�тупа и �ортировать\n"
+"                             по имени; иначе �ортировать по времени до�тупа\n"
+"  -U                         не �ортировать; выводить в �оответ�твии �\n"
 "                             физиче�ким ра�положением в каталоге\n"
 "  -v                         �ортировать по номерам (вер�ии) в тек�товом\n"
 "                             пред�тавлении\n"
 
-#: src/ls.c:4855
+#: src/ls.c:4919
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 "  -w, --width=ЧИСЛО          задает ширину �крана вме�то текущего значени�\n"
 "  -x                         перечи�л�ть по �трокам, а не по �толбцам\n"
 "  -X                         �ортировать по ра�ширению в алфавитном пор�дке\n"
-"  -Z, --context              печатать контек�т безопа�но�ти SELinux каждого\n"
+"  -Z, --context              печатать любой контек�т безопа�но�ти каждого\n"
 "                             файла\n"
 "  -1                         перечи�л�ть по одному файлу на �троке\n"
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -5956,7 +6062,7 @@ msgstr ""
 "�лужит дл� изменени� значений. Дл� её у�тановки и�пользуйте команду "
 "dircolors.\n"
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -6034,32 +6140,28 @@ msgstr "  -t, --text              читать в текÑ�товом режимÐ
 #: src/md5sum.c:195
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
 "\n"
-"Три �ледующих ключа полезны только при проверке контрольных �умм:\n"
+"Четыре �ледующих ключа полезны только при проверке контрольных �умм:\n"
 "      --quiet             не выводить OK дл� каждого у�пешно проверенного "
 "файла\n"
 "      --status            не производить вывод, выходное значение "
 "показывает\n"
 "                          у�пех проверки\n"
-"  -w, --warn              предупреждать о неправильно �о�тавленных �троках "
-"в\n"
-"                          �пи�ке контрольных �умм\n"
+"      --strict            ненулевое выходное значение, е�ли �троки\n"
+"                          контрольных �умм в некорректном формате\n"
+"  -w, --warn              предупреждать о неправильно �о�тавленных �троках\n"
+"                          контрольных �умм\n"
 "\n"
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-"      --strict            � --check завершить работу � ненулевым кодом при\n"
-"                          любых некорректных входных данных\n"
-
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, c-format
 msgid ""
 "\n"
@@ -6074,35 +6176,35 @@ msgstr ""
 "По умолчанию печатает �троку � контрольной �уммой, знак, показывающий\n"
 "режим ввода («*» дл� двоичных, пробел дл� тек�товых) и им� каждого Ф�ЙЛ�.\n"
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, c-format
 msgid "%s: too many checksum lines"
 msgstr "%s: �лишком много �трок контрольных �умм"
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr "%s: %<PRIuMAX>: неправильно �о�тавленна� �трока контрольной �уммы %s"
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr "%s: невозможно открыть или прочитать\n"
 
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr "ПОВРЕЖД��"
 
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr "ЦЕЛ"
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr "%s: не найдено верно �о�тавленных �трок контрольных �умм %s"
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
@@ -6110,7 +6212,7 @@ msgstr[0] "ПРЕДУПРЕЖДЕÐ�ИЕ: неправильный формат Ñ
 msgstr[1] "ПРЕДУПРЕЖДЕ�ИЕ: неправильный формат �трок %<PRIuMAX>"
 msgstr[2] "ПРЕДУПРЕЖДЕ�ИЕ: неправильный формат �трок %<PRIuMAX>"
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
@@ -6118,7 +6220,7 @@ msgstr[0] "ПРЕДУПРЕЖДЕ�ИЕ: не удало�ь прочитать
 msgstr[1] "ПРЕДУПРЕЖДЕ�ИЕ: не удало�ь прочитать %<PRIuMAX> файла из �пи�ка"
 msgstr[2] "ПРЕДУПРЕЖДЕ�ИЕ: не удало�ь прочитать %<PRIuMAX> файлов из �пи�ка"
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
@@ -6126,120 +6228,152 @@ msgstr[0] "ПРЕДУПРЕЖДЕ�ИЕ: �Е �овпала %<PRIuMAX> вычи
 msgstr[1] "ПРЕДУПРЕЖДЕ�ИЕ: �Е �овпали %<PRIuMAX> вычи�ленные контрольные �уммы"
 msgstr[2] "ПРЕДУПРЕЖДЕ�ИЕ: �Е �овпали %<PRIuMAX> вычи�ленных контрольных �умм"
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
 msgstr "--tag не поддерживает режим --text"
 
-#: src/md5sum.c:766
+#: src/md5sum.c:770
 #, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr "ключ --tag имеет �мы�л только при проверке контрольных �умм"
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
 msgstr "ключи --binary и --text бе��мы�ленны при проверке контрольных �умм"
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr "ключ --status имеет �мы�л только при проверке контрольных �умм"
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr "ключ --warn имеет �мы�л только при проверке контрольных �умм"
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr "ключ --quiet имеет �мы�л только при проверке контрольных �умм"
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr "ключ --strict имеет �мы�л только при проверке контрольных �умм"
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr "И�пользование: %s [КЛЮЧ]… К�Т�ЛОГ…\n"
 
-#: src/mkdir.c:57
+#: src/mkdir.c:59
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
 msgstr "Создает К�Т�ЛОГ(и), е�ли он ещё не �уще�твует.\n"
 
 # not a=rwx - umask ??? что за бред
-#: src/mkdir.c:63
+#: src/mkdir.c:65
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
-"  -m, --mode=РЕЖИМ   у�тановить код до�тупа (как в chmod)\n"
-"  -p, --parents      не выдавать ошибок е�ли �уще�твует, �оздавать\n"
-"                     родитель�кие каталоги е�ли необходимо\n"
+"  -m, --mode=РЕЖИМ   у�тановить права до�тупа к файлу (как в chmod),\n"
+"                     а не a=rwx - umask\n"
+"  -p, --parents      не выдавать ошибку, е�ли �уще�твует, �оздавать\n"
+"                     родитель�кие каталоги, е�ли необходимо\n"
 "  -v, --verbose      печатать �ообщение о каждом �озданном каталоге\n"
-"  -Z, --context=CTX  у�тановить контек�т безопа�но�ти SELinux дл� каждого\n"
-"                      �оздаваемого каталога равным CTX\n"
 
-#: src/mkdir.c:168
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+"  -Z                 у�тановить контек�т безопа�но�ти SELinux\n"
+"                     каждого �оздаваемого каталога равным типу по умолчанию\n"
+"      --context[=CTX]  подобно -Z, или е�ли указан CTX, то у�тановить\n"
+"                     контек�т безопа�но�ти SELinux\n"
+"                     или SMACK равным CTX\n"
+
+#: src/mkdir.c:127 src/mkdir.c:172
+#, c-format
+msgid "failed to set default creation context for %s"
+msgstr "не удало�ь у�тановить контек�т �оздани� по умолчанию дл� %s"
+
+#: src/mkdir.c:191
+#, c-format
+msgid "failed to restore context for %s"
+msgstr "не удало�ь во��тановить контек�т дл� %s"
+
+#: src/mkdir.c:231
 #, c-format
 msgid "created directory %s"
 msgstr "�оздан каталог %s"
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr ""
+"предупреждение: игнорирует�� ключ --context; �дро без поддержки SELinux/SMACK"
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr "И�пользование: %s [КЛЮЧ]… ИМЯ…\n"
 
-#: src/mkfifo.c:52
+#: src/mkfifo.c:54
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
 msgstr "Создаёт именованные каналы (FIFO) дл� заданного ИМЕ�И.\n"
 
 # not a=rwx - umask ??? что за бред
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
 msgstr "  -m, --mode=РЕЖИМ   у�тановить РЕЖИМ до�тупа\n"
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
-"  -Z, --context=CTX  у�тановить контек�т безопа�но�ти SELinux дл� каждого\n"
-"                      ИМЕ�И равным CTX\n"
+"  -Z                 у�тановить контек�т безопа�но�ти SELinux\n"
+"                     равным типу по умолчанию\n"
+"      --context[=CTX]  подобно -Z, или е�ли указан CTX, то у�тановить\n"
+"                     контек�т безопа�но�ти SELinux\n"
+"                     или SMACK равным CTX\n"
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, c-format
 msgid "invalid mode"
 msgstr "неверный режим"
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr "режим должен задавать только биты разрешений дл� файла"
 
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
+#, c-format
+msgid "cannot set permissions of %s"
+msgstr "невозможно задать права до�тупа %s"
+
+#: src/mknod.c:54
 #, c-format
 msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr "И�пользование: %s [КЛЮЧ]… ИМЯ ТИП [ОС�ОВ�ОЙ ВТОРОСТЕПЕ��ЫЙ]\n"
 
-#: src/mknod.c:54
+#: src/mknod.c:56
 msgid "Create the special file NAME of the given TYPE.\n"
 msgstr "Создаёт �пециальный файл � ИМЕ�ЕМ и ТИПОМ.\n"
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr ""
-"  -Z, --context=CTX  у�тановить контек�т безопа�но�ти SELinux дл�\n"
-"                      ИМЕ�И равным CTX\n"
-
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -6254,7 +6388,7 @@ msgstr ""
 "ше�тнадцатеричные чи�ла; е�ли начинают�� на 0, то как во�ьмеричные;\n"
 "иначе как де��тичные. ТИП может принимать �ледующие значени�:\n"
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 msgid ""
 "\n"
 "  b      create a block (buffered) special file\n"
@@ -6266,57 +6400,57 @@ msgstr ""
 "  c, u   �оздать файл �имвольного у�трой�тва (небуферизованный)\n"
 "  p      �оздать именованный канал\n"
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 msgid "Special files require major and minor device numbers."
 msgstr ""
 "Дл� �пециального файла должны быть указаны о�новной и второ�тепенный номера "
 "у�трой�тва."
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 msgid "Fifos do not have major and minor device numbers."
 msgstr "У файлов-очередей нет о�новного и второ�тепенного чи�ла у�трой�тва."
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, c-format
 msgid "block special files not supported"
 msgstr "блочные �пециальные файлы не поддерживают��"
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, c-format
 msgid "character special files not supported"
 msgstr "�пециальные �имвольные файлы не поддерживают��"
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, c-format
 msgid "invalid major device number %s"
 msgstr "неверное о�новное чи�ло у�трой�тва %s"
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, c-format
 msgid "invalid minor device number %s"
 msgstr "неверное второ�тепенное чи�ло у�трой�тва %s"
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, c-format
 msgid "invalid device %s %s"
 msgstr "неверное у�трой�тво %s %s"
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, c-format
 msgid "invalid device type %s"
 msgstr "неверный тип у�трой�тва %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr "Эрик Бл�йк (Eric Blake)"
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr "И�пользование: %s [КЛЮЧ]… [Ш�БЛО�]\n"
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
 "TEMPLATE must contain at least 3 consecutive 'X's in last component.\n"
@@ -6328,14 +6462,14 @@ msgstr ""
 "Е�ли Ш�БЛО� не указан, то и�пользует�� tmp.XXXXXXXXXX и\n"
 "подразумевает�� --tmpdir.\n"
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
 "Файлы �оздают�� � правами u+rw, а каталоги � правами u+rwx,\n"
 "мину� ограничени� umask.\n"
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
@@ -6347,99 +6481,92 @@ msgstr ""
 "  -q, --quiet        не выдавать диагно�тику об ошибках �оздани� файл/"
 "каталога\n"
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
-"      --suffix=СУФФ  добавл�ть СУФФик� к Ш�БЛО�У. СУФФик� не должен "
+"      --suffix=СУФФ  добавл�ть СУФФик� к Ш�БЛО�У; СУФФик� не должен "
 "�одержать\n"
 "                     �имволов ко�ой черты. Подразумевает��, что �тот ключ\n"
-"                     у�тановлен, е�ли Ш�БЛО� не заканчивает�� X.\n"
+"                     у�тановлен, е�ли Ш�БЛО� не заканчивает�� X\n"
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
-"  --tmpdir[=К�Т]     ра��матривать Ш�БЛО� отно�ительно К�Т. Е�ли К�Т не\n"
+"  -p К�Т, --tmpdir[=К�Т]\n"
+"                     ра��матривать Ш�БЛО� отно�ительно К�Т; е�ли К�Т не\n"
 "                     указан, и�пользовать $TMPDIR е�ли задана, иначе /tmp.\n"
-"                     С �тим ключом Ш�БЛО� не должен быть аб�олютным именем.\n"
-"                     В отличие от -t, Ш�БЛО� может �одержать ко�ые черты, "
+"                     С �тим ключом Ш�БЛО� не должен быть аб�олютным именем;\n"
+"                     в отличие от -t, Ш�БЛО� может �одержать ко�ые черты, "
 "но\n"
-"                     даже в �том �лучае, mktemp в�ё ещё �оздаёт только\n"
-"                     по�ледний компонент.\n"
+"                     даже в �том �лучае, mktemp �озда�т только\n"
+"                     по�ледний компонент\n"
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
 msgstr ""
-"  -p К�Т             и�пользовать К�Т в каче�тве префик�а;\n"
-"                     подразумевает -t (у�тарел)\n"
 "  -t                 ра��матривать Ш�БЛО� как одно им� файла,\n"
 "                     отно�ительно каталога: $TMPDIR, е�ли задан; иначе\n"
 "                     каталог задаёт�� через -p; иначе /tmp (у�тарел)\n"
 
-#: src/mktemp.c:223
-#, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr "не удало�ь перенаправить �тандартный поток ошибок в /dev/null"
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, c-format
 msgid "too many templates"
 msgstr "�лишком много шаблонов"
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr "При задании --suffix, шаблон %s должен оканчивать�� на X"
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr "неверный �уффик� %s, �одержит разделитель каталогов"
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr "�лишком мало X в шаблоне %s"
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr "неверный шаблон %s, �одержит разделитель каталогов"
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr "неверный шаблон %s; � --tmpdir в нём не может быть аб�олютного пути"
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, c-format
 msgid "failed to create directory via template %s"
 msgstr "не удало�ь �оздать каталог по шаблону %s"
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, c-format
 msgid "failed to create file via template %s"
 msgstr "не удало�ь �оздать файл по шаблону %s"
 
-#: src/mv.c:292
+#: src/mv.c:294
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 "Переименовывает ИСТОЧ�ИК в ��З��ЧЕ�ИЕ, или перемещает ИСТОЧ�ИК(и) в "
 "К�Т�ЛОГ.\n"
 
-#: src/mv.c:298
+#: src/mv.c:300
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
 "file\n"
@@ -6458,7 +6585,7 @@ msgstr ""
 "  -n, --no-clobber             не перепи�ывать �уще�твующий файл\n"
 "Е�ли указано более одного ключа -i, -f, -n, то и�пользует�� по�ледний.\n"
 
-#: src/mv.c:307
+#: src/mv.c:309
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
@@ -6470,7 +6597,7 @@ msgstr ""
 "  -S, --suffix=СУФФИКС         перекрывает обычный �уффик� дл� резервных "
 "копий\n"
 
-#: src/mv.c:312
+#: src/mv.c:314
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
 "DIRECTORY\n"
@@ -6479,13 +6606,17 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
 "  -t, --target-directory=К�Т�ЛОГ переме�тить в�е ИСТОЧ�ИКИ в К�Т�ЛОГ\n"
 "  -T, --no-target-directory    �читать ��З��ЧЕ�ИЕ обычным файлом\n"
-"  -u, --update                 перемещать только тогда когда ИСТОЧ�ИК\n"
+"  -u, --update                 перемещать только, е�ли ИСТОЧ�ИК\n"
 "                               новее чем файл назначени�, или когда файл\n"
 "                               назначени� от�ут�твует\n"
 "  -v, --verbose                по��н�ть производимые дей�тви�\n"
+"  -Z, --context                задать контек�т безопа�но�ти SELinux файлу\n"
+"                                 назначени� как у типа по умолчанию\n"
 
 #: src/nice.c:72
 #, c-format
@@ -6788,57 +6919,51 @@ msgid "%s: invalid number to ignore"
 msgstr "%s: неверное чи�ло дл� и�ключени�"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
 msgstr "���аф Гордон (Assaf Gordon)"
 
-#: src/numfmt.c:676
+#: src/numfmt.c:659
 #, c-format
-msgid "value too large to be converted: '%s'"
-msgstr "значение �лишком велико дл� преобразовани�: «%s»"
+msgid "value too large to be converted: %s"
+msgstr "значение �лишком велико дл� преобразовани�: %s"
 
-#: src/numfmt.c:680
+#: src/numfmt.c:663
 #, c-format
-msgid "invalid number: '%s'"
-msgstr "неверное чи�ло: «%s»"
+msgid "invalid number: %s"
+msgstr "неверный номер: %s"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
-msgstr ""
-"отбра�ывает�� �уффик� в входных данных: «%s» (попробуйте указать --from)"
+msgid "rejecting suffix in input: %s (consider using --from)"
+msgstr "отбра�ывает�� �уффик� в входных данных: %s (попробуйте указать --from)"
 
-#: src/numfmt.c:688
+#: src/numfmt.c:671
 #, c-format
-msgid "invalid suffix in input: '%s'"
-msgstr "неверный �уффик� в входных данных: «%s»"
+msgid "invalid suffix in input: %s"
+msgstr "неверный �уффик� в входных данных: %s"
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
-msgstr "от�ут�твующий �уффик� «i» в входных данных: «%s» (например Ki/Mi/Gi)"
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
+msgstr "от�ут�твующий �уффик� «i» в входных данных: %s (например Ki/Mi/Gi)"
 
-#: src/numfmt.c:723
+#: src/numfmt.c:722 src/numfmt.c:768
 #, c-format
 msgid "failed to prepare value '%Lf' for printing"
 msgstr "не удало�ь подготовить значение «%Lf» дл� вывода"
 
-#: src/numfmt.c:787
-#, c-format
-msgid "invalid unit size: '%s'"
-msgstr "неверный размер единицы �чёта: «%s»"
-
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
+#: src/numfmt.c:791
 #, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr "нехватка пам�ти (запрошено %zu байт)"
+msgid "invalid unit size: %s"
+msgstr "неверный размер единицы �чёта: %s"
 
-#: src/numfmt.c:813
+#: src/numfmt.c:814
 #, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
 msgstr "И�пользование: %s [КЛЮЧ]… [ЧИСЛО]…\n"
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
@@ -6846,25 +6971,25 @@ msgstr ""
 "Переформатирует ЧИСЛО(а), читаемое из �тандартного ввода, е�ли оно не "
 "указано в командной �троке.\n"
 
-#: src/numfmt.c:820
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
 msgstr ""
 "      --debug          показывать предупреждени� при некорректных входных\n"
 "                       данных\n"
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
 "  -d, --delimiter=X    и�пользовать X вме�то пробела как разделитель полей\n"
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
 "      --field=N        замен�ть чи�ло в входном поле N (по умолчанию 1)\n"
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
@@ -6872,7 +6997,7 @@ msgstr ""
 "      --format=ФОРМ�Т  и�пользовать ФОРМ�Т плавающей точки в �тиле printf;\n"
 "                       подробно�ти �мотрите в разделе ФОРМ�Т далее\n"
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
@@ -6883,7 +7008,7 @@ msgstr ""
 "                       изменени�; по умолчанию «none»; �мотрите ЕДИ�ИЦЫ "
 "далее\n"
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
@@ -6891,7 +7016,7 @@ msgstr ""
 "      --from-unit=N    задать размер единицы измерени� входных данных\n"
 "                       (вме�то значени� по умолчанию 1).\n"
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
@@ -6902,7 +7027,7 @@ msgstr ""
 "1,000,000)\n"
 "                       (ничего не делает�� в локал�х C/POSIX)\n"
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
@@ -6910,7 +7035,7 @@ msgstr ""
 "      --header[=N]     выводить (без преобразовани�) первые N �трок;\n"
 "                       е�ли N не задано, то значение равно 1\n"
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
@@ -6919,7 +7044,7 @@ msgstr ""
 "РЕЖИМ�:\n"
 "                       abort (по умолчанию), fail, warn, ignore\n"
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -6936,7 +7061,7 @@ msgstr ""
 "                       по умолчанию дополнение выполн�ет��, е�ли\n"
 "                       обнаруживает�� пробельный �имвол\n"
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
@@ -6946,7 +7071,7 @@ msgstr ""
 "                       значение МЕТОД�: up, down, from-zero (по умолчанию),\n"
 "                       towards-zero, nearest\n"
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
@@ -6954,21 +7079,21 @@ msgstr ""
 "      --suffix=СУФФИКС добавл�ть СУФФИКС к выходным значени�м и учитывать\n"
 "                       необ�зательный СУФФИКС у входных значений\n"
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
 "      --to=ЕДИ�ИЦ�     автома�штабирование выходные значени� к ЕДИ�ИЦЕ\n"
 "                       изменени�; �мотрите ЕДИ�ИЦ� далее\n"
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr ""
 "      --to-unit=N      размер единицы измерени� выходных данных\n"
 "                       (вме�то значени� по умолчанию 1)\n"
 
-#: src/numfmt.c:877
+#: src/numfmt.c:878
 msgid ""
 "\n"
 "UNIT options:\n"
@@ -6976,11 +7101,11 @@ msgstr ""
 "\n"
 "ЕДИ�ИЦЫ:\n"
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr "  none       отключить ма�штабирование; �уффик�ы привод�т к ошибке\n"
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -6994,7 +7119,7 @@ msgstr ""
 "               1M = 1000000,\n"
 "               1Mi = 1048576,\n"
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
@@ -7006,7 +7131,7 @@ msgstr ""
 "               1M = 1000000,\n"
 "               ...\n"
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
@@ -7018,7 +7143,7 @@ msgstr ""
 "               1M = 1048576,\n"
 "               ...\n"
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
@@ -7030,24 +7155,26 @@ msgstr ""
 "               1Mi = 1048576,\n"
 "               ...\n"
 
-#: src/numfmt.c:905
+#: src/numfmt.c:906
 #, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
 "\n"
 "Значение ФОРМ�Т� должно позвол�ть вывод одного аргумента � плавающей точкой\n"
 "«%f». �еоб�зательна� кавычка (%'f) включает --grouping (е�ли поддерживает��\n"
 "текущей локалью). При указании необ�зательного значени� ширины (%10f)\n"
-"производит�� дополнение вывода. При указании необ�зательного отрицательного\n"
-"значени� ширины (%-10f) производит�� дополнение �лева.\n"
+"производит�� дополнение вывода. При указании необ�зательной нулевой ширины\n"
+"(%010f) чи�ло дополн�ет�� нул�ми. При указании необ�зательного "
+"отрицательного\n"
+"значени� ширины (%-10f) производит�� выравнивание �лева.\n"
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -7067,7 +7194,7 @@ msgstr ""
 "но код завершени� равен 0. Е�ли указано --invalid=«ignore», то про ошибки\n"
 "преобразовани� не �ообщает�� и код завершени� равен 0.\n"
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -7104,115 +7231,115 @@ msgstr ""
 "  $ ls -lh | %s --header --field 5 --from=iec --padding=10\n"
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, c-format
 msgid "format %s has no %% directive"
 msgstr "в формате %s не указана директива %%"
 
-#: src/numfmt.c:990
+#: src/numfmt.c:1003
 #, c-format
 msgid "invalid format %s (width overflow)"
 msgstr "неверный формат %s (переполнение по ширине)"
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr "дополнение из --format замен�ет значение --padding"
+
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr "формат %s заканчивает�� на %%"
 
-#: src/numfmt.c:1010
+#: src/numfmt.c:1030
 #, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
-msgstr "неверный формат %s, директива должна быть %%['][-][N]f"
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
+msgstr "неверный формат %s, директива должна быть %%[0]['][-][N]f"
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr "в формате %s �одержит�� �лишком много директив %%"
 
-#: src/numfmt.c:1070
+#: src/numfmt.c:1081
 #, c-format
-msgid "invalid suffix in input '%s': '%s'"
-msgstr "неверный �уффик� в входных данных «%s»: «%s»"
+msgid "invalid suffix in input %s: %s"
+msgstr "неверный �уффик� в входных данных %s: %s"
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
 msgstr "значение �лишком велико дл� вывода: «%Lg» (попробуйте указать --to)"
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
 msgstr ""
 "значение �лишком велико дл� вывода: «%Lg» (обработка значений > 999Y "
 "невозможна)"
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
-msgstr "большое входное значение «%s»: возможна потер� точно�ти"
+msgid "large input value %s: possible precision loss"
+msgstr "большое входное значение %s: возможна потер� точно�ти"
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
 "входна� �трока �лишком коротка, нет чи�ел дл� преобразовани� в поле %ld"
 
-#: src/numfmt.c:1388
+#: src/numfmt.c:1403
 #, c-format
-msgid "invalid padding value '%s'"
-msgstr "неверное значение дополнени� «%s»"
+msgid "invalid padding value %s"
+msgstr "неверное значение дополнени� %s"
 
-#: src/numfmt.c:1401
+#: src/numfmt.c:1417
 #, c-format
-msgid "invalid field value '%s'"
-msgstr "неверное значение пол� «%s»"
+msgid "invalid field value %s"
+msgstr "неверное значение пол� %s"
 
-#: src/numfmt.c:1430
+#: src/numfmt.c:1447
 #, c-format
-msgid "invalid header value '%s'"
-msgstr "неверное значение заголовка «%s»"
+msgid "invalid header value %s"
+msgstr "неверное значение заголовка %s"
 
-#: src/numfmt.c:1456
+#: src/numfmt.c:1473
 #, c-format
 msgid "--grouping cannot be combined with --format"
 msgstr "--grouping нельз� �очетать � --format"
 
-#: src/numfmt.c:1458
-#, c-format
-msgid "--padding cannot be combined with --format"
-msgstr "--padding нельз� �очетать � --format"
-
-#: src/numfmt.c:1463
+#: src/numfmt.c:1478
 #, c-format
 msgid "no conversion option specified"
 msgstr "ключи преобразовани� не заданы"
 
-#: src/numfmt.c:1471
+#: src/numfmt.c:1486
 #, c-format
 msgid "grouping cannot be combined with --to"
 msgstr "группировку нельз� �очетать � --to"
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
 msgstr "группировка не имеет �мы�ла � �той локалью"
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
 msgstr "при указании в командной �троке --header игнорирует��"
 
-#: src/numfmt.c:1511
+#: src/numfmt.c:1526
 #, c-format
 msgid "error reading input"
 msgstr "ошибка чтени� входных данных"
 
-#: src/numfmt.c:1520
+#: src/numfmt.c:1535
 #, c-format
 msgid "failed to convert some of the input numbers"
 msgstr "не удало�ь преобразовать некоторые из входных чи�ел"
 
-#: src/od.c:294
+#: src/od.c:320
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -7225,7 +7352,7 @@ msgstr ""
 "       или:    %s --traditional [КЛЮЧ]… [Ф�ЙЛ] [[+]СМЕЩЕ�ИЕ[.][b] [+][МЕТК�]"
 "[.][b]]\n"
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -7242,7 +7369,7 @@ msgstr ""
 "ввод.\n"
 "\n"
 
-#: src/od.c:307
+#: src/od.c:333
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
 "if the last operand begins with + or (if there are 2 operands) a digit.\n"
@@ -7259,50 +7386,53 @@ msgstr ""
 "ше�тнадцатеричные чи�ла, �уффик� . — как во�ьмеричные, а �уффик� b\n"
 "умножает на 512.\n"
 
-#: src/od.c:318
+#: src/od.c:344
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
-"  -A, --address-radix=ОС�ОВ��ИЕ  выходной формат дл� файловых �мещений.\n"
-"                                 ОС�ОВ��ИЕ может быть [doxn], дл� Decimal, "
-"Octal,\n"
-"                                 Hex или None\n"
+"  -A, --address-radix=ОС�ОВ��ИЕ  выходной формат дл� файловых �мещений;\n"
+"                                 ОС�ОВ��ИЕ может быть [doxn] — Decimal,\n"
+"                                 Octal, Hex или None\n"
+"      --endian={big|little}      пере�тавл�ть ме�тами входные байты "
+"�огла�но\n"
+"                                 указанного пор�дку\n"
 "  -j, --skip-bytes=�             пропу�тить первые � байт\n"
 
-#: src/od.c:323
+#: src/od.c:350
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
 "  -N, --read-bytes=�             �читывать только � байт\n"
 "  -S �, --strings[=�]            выводить �троки длиной, по меньшей мере, �\n"
-"                                   графиче�ких �имволов. Е�ли � не задано, "
-"то\n"
-"                                 и�пользует�� значение 3\n"
+"                                 графиче�ких �имволов; е�ли � не задано,\n"
+"                                 от и�пользует�� значение 3\n"
 "  -t, --format=ТИП               выбирает формат или форматы вывода\n"
 "  -v, --output-duplicates        не помечать �имволом * невыводимые �троки\n"
-"  -w[�], --width[=�]             выводить � байт в каждой выходной �троке.\n"
-"                                 Е�ли � не задано, то и�пользует�� значение "
-"32.\n"
-"      --traditional              принимать аргументы в традиционной форме\n"
+"  -w[�], --width[=�]             выводить � байт в каждой выходной �троке;\n"
+"                                 е�ли � не задано, то и�пользует�� �=32\n"
+"      --traditional              принимать аргументы как в третьей форме "
+"выше\n"
 
-#: src/od.c:336
+#: src/od.c:363
 msgid ""
 "\n"
 "\n"
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 "\n"
@@ -7311,11 +7441,11 @@ msgstr ""
 "объедин�ют��:\n"
 "  -a   �иноним -t a,  именованные �имволы, �тарший бит игнорирует��\n"
 "  -b   �иноним -t o1, во�ьмеричные байты\n"
-"  -c   �иноним -t c,  ASCII-�имволы или управл�ющие по�ледовательно�ти\n"
+"  -c   �иноним -t c,  печатные �имволы или управл�ющие по�ледовательно�ти\n"
 "       � обратной ко�ой чертой\n"
 "  -d   �иноним -t u2, беззнаковые де��тичные двухбайтовые единицы\n"
 
-#: src/od.c:345
+#: src/od.c:372
 msgid ""
 "  -f   same as -t fF, select floats\n"
 "  -i   same as -t dI, select decimal ints\n"
@@ -7331,21 +7461,21 @@ msgstr ""
 "  -s   �иноним -t d2, де��тичные двухбайтовые единицы\n"
 "  -x   �иноним -t x2, ше�тнадцатеричные двухбайтовые единицы\n"
 
-#: src/od.c:353
+#: src/od.c:380
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 "\n"
 "\n"
 "ТИП �о�тавл�ет�� из одного или не�кольких �ледующих �пецификаций:\n"
 "  a          именованный �имвол, �тарший бит игнорирует��\n"
-"  c          ASCII-�имвол или управл�юща� по�ледовательно�ть\n"
+"  c          печатный �имвол или управл�юща� по�ледовательно�ть\n"
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -7359,7 +7489,7 @@ msgstr ""
 "  u[ЧИСЛО]   беззнаковое де��тичное целое размером заданное ЧИСЛО байт\n"
 "  x[ЧИСЛО]   ше�тнадцатеричное целое размером заданное ЧИСЛО байт\n"
 
-#: src/od.c:367
+#: src/od.c:394
 msgid ""
 "\n"
 "SIZE is a number.  For TYPE in [doux], SIZE may also be C for\n"
@@ -7373,7 +7503,7 @@ msgstr ""
 "ЧИСЛО также может быть F sizeof(float), D sizeof(double) или\n"
 "L sizeof(long double).\n"
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
@@ -7383,7 +7513,7 @@ msgstr ""
 "Добавл�ет �уффик� z к любым показываемым печатным �имволам\n"
 "в конце каждой выходной �троки.\n"
 
-#: src/od.c:379
+#: src/od.c:406
 msgid ""
 "\n"
 "\n"
@@ -7407,12 +7537,12 @@ msgstr ""
 "  M    1024*1024\n"
 "и так далее дл� G, T, P, E, Z, Y.\n"
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, c-format
 msgid "invalid type string %s"
 msgstr "неверна� �трока типа %s"
 
-#: src/od.c:649
+#: src/od.c:690
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7421,7 +7551,7 @@ msgstr ""
 "неверно задана �трока типа %s;\n"
 "данна� �и�тема не предо�тавл�ет %lu-байтного целого типа"
 
-#: src/od.c:770
+#: src/od.c:811
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7430,38 +7560,38 @@ msgstr ""
 "неверно задан тип %s;\n"
 "данна� �и�тема не предо�тавл�ет %lu-байтного типа � плавающей точкой"
 
-#: src/od.c:828
+#: src/od.c:869
 #, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr "неверный �имвол «%c» в �троке типа %s"
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr "невозможно �ме�тить�� за предел по�леднего входного файла"
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr ""
 "неверно задано о�нование �и�темы �чи�лени� «%c»,\n"
 "должно быть одним из �имволов [doxn]"
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr "при дампе �трок нельз� задавать тип"
 
-#: src/od.c:1810
+#: src/od.c:1863
 msgid "compatibility mode supports at most one file"
 msgstr "режим �овме�тимо�ти поддерживает�� только дл� одного файла"
 
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr "значение skip-bytes + read-bytes �лишком велико"
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr "предупреждение: неверна� ширина %lu; будет и�пользована %d"
@@ -7624,12 +7754,12 @@ msgstr "Когда"
 msgid "Where"
 msgstr "Где"
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr "И�пользование: %s [КЛЮЧ]… [ПОЛЬЗОВ�ТЕЛЬ]…\n"
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -7649,7 +7779,7 @@ msgstr ""
 "  -s              и�пользовать краткий формат вывода, принимает�� по "
 "умолчанию\n"
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -7664,7 +7794,7 @@ msgstr ""
 "  -q              опу�тить в кратком формате полное им� пользовател�, им�\n"
 "                  удаленной машины и врем� неактивно�ти\n"
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, c-format
 msgid ""
 "\n"
@@ -7675,7 +7805,7 @@ msgstr ""
 "Упрощённа� программа «finger»; печатает �ведени� о пользователе.\n"
 "В каче�тве файла utmp будет и�пользовать�� %s.\n"
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr ""
@@ -7779,8 +7909,8 @@ msgid ""
 msgstr ""
 "  +ПЕРВ�Я_СТР��ИЦ�[:ПОСЛЕД�ЯЯ_СТР��ИЦ�], \n"
 "      --pages=ПЕРВ�Я_СТР��ИЦ�[:ПОСЛЕД�ЯЯ_СТР��ИЦ�]\n"
-"                    начать [завершить] печать на ПЕРВОЙ_[ПОСЛЕД�ЕЙ_]"
-"СТР��ИЦЕ\n"
+"                    начать [завершить] печать на "
+"ПЕРВОЙ_[ПОСЛЕД�ЕЙ_]СТР��ИЦЕ\n"
 "  -ЧИСЛО, --columns=ЧИСЛО\n"
 "                    выводить заданное ЧИСЛО колонок и печатать их вниз, "
 "е�ли\n"
@@ -7905,19 +8035,20 @@ msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
 "  -s[СИМВОЛ],--separator[=СИМВОЛ]\n"
 "                    раздел�ть колонки одним �имволом, по умолчанию СИМВОЛ\n"
 "                    равен <TAB>, е�ли нет ключа -w, и пу�т, е�ли е�ть ключ\n"
-"                    -w, то -s[СИМВОЛ] выключает у�ечение �трок дл� в�ех "
-"трёх\n"
+"                    -w.\n"
+"                    -s[СИМВОЛ] выключает у�ечение �трок дл� в�ех трёх\n"
 "                    колонок ключей (-КОЛО�К�|-a -КОЛО�К�|-m), е�ли только\n"
 "                    нет ключа -w\n"
 
-#: src/pr.c:2827
+#: src/pr.c:2828
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
 "                    separate columns by STRING,\n"
@@ -7933,7 +8064,7 @@ msgstr ""
 "                    что -S\" \"); не вли�ет на ключи дл� колонок\n"
 "  -t, --omit-header не выводить заголовки �траниц\n"
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 msgid ""
 "  -T, --omit-pagination\n"
 "                    omit page headers and trailers, eliminate any "
@@ -7956,7 +8087,7 @@ msgstr ""
 "                    у�тановить ШИРИ�У_СТР��ИЦЫ (72) дл�\n"
 "                    вывода в не�колько колонок, -s[�имвол] выключает (72)\n"
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
 "                    set page width to PAGE_WIDTH (72) characters always,\n"
@@ -7968,7 +8099,7 @@ msgstr ""
 "                    у�тановить ШИРИ�У_СТР��ИЦЫ (72), у�екать �троки,\n"
 "                    е�ли нет ключа -J; не затрагивает�� ключами -S или -s\n"
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 msgid ""
 "\n"
 "-t is implied if PAGE_LENGTH <= 10.  With no FILE, or when FILE is -, read\n"
@@ -7993,9 +8124,9 @@ msgstr ""
 "\n"
 
 #: src/printenv.c:69
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr ""
-"  -0, --null       завершать каждую выводимую �троку 0-м байтом,\n"
+"  -0, --null       завершать каждую выводимую �троку NUL,\n"
 "                   a не �имволом новой �троки\n"
 
 #: src/printf.c:79
@@ -8116,12 +8247,12 @@ msgstr "предупреждение: избыточные аргументы п
 msgid "F. Pinard"
 msgstr "Ф. Пинард"
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, c-format
 msgid "%s (for regexp %s)"
 msgstr "%s (дл� регул�рного выражени� %s)"
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
@@ -8130,7 +8261,7 @@ msgstr ""
 "И�пользование: %s [КЛЮЧ]… [ВХОД]… (без -G)\n"
 "       или:    %s -G [КЛЮЧ]… [ВХОД [ВЫХОД]]\n"
 
-#: src/ptx.c:1821
+#: src/ptx.c:1824
 msgid ""
 "Output a permuted index, including context, of the words in the input "
 "files.\n"
@@ -8138,7 +8269,7 @@ msgstr ""
 "Печатает перемешанный алфавитный указатель �лов входных файлов, включа� "
 "контек�т.\n"
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
 "  -G, --traditional              behave more like System V 'ptx'\n"
@@ -8151,7 +8282,7 @@ msgstr ""
 "  -F, --flag-truncation=СТРОК�   и�пользовать СТРОКУ дл� пометки у�ечени� "
 "�трок\n"
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
 "  -O, --format=roff              generate output as roff directives\n"
@@ -8167,7 +8298,7 @@ msgstr ""
 "  -S, --sentence-regexp=РЕГВЫР   дл� конца �трок или конца предложений\n"
 "  -T, --format=tex               генерировать вывод в виде директив TeX\n"
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -8187,7 +8318,7 @@ msgstr ""
 "  -o, --only-file=Ф�ЙЛ           только �читать �пи�ок �лов из заданного "
 "Ф�ЙЛ�\n"
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -8199,16 +8330,16 @@ msgstr ""
 "  -t, --typeset-mode               - не реализовано -\n"
 "  -w, --width=ЧИСЛО              ширина вывода в �толбцах, не �чита� ��ылки\n"
 
-#: src/ptx.c:1854
+#: src/ptx.c:1857
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
 "\n"
 "Е�ли Ф�ЙЛ не задан или задан как -, читает �тандартный ввод.\n"
-"По умолчанию предполагает�� «-F /».\n"
+"По умолчанию — «-F /».\n"
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, c-format
 msgid "invalid gap width: %s"
 msgstr "неверна� ширина дырки: %s"
@@ -8230,22 +8361,30 @@ msgstr ""
 "                  �одержит �имвольные ��ылки\n"
 "  -P, --physical  избегать в�ех �имвольных ��ылок\n"
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+"\n"
+"Е�ли параметр не указан, то предполагает�� -P.\n"
+
+#: src/pwd.c:169
 #, c-format
 msgid "failed to chdir to %s"
 msgstr "ошибка изменени� каталога на %s"
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, c-format
 msgid "failed to stat %s"
 msgstr "ошибка получени� атрибутов %s"
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr "в %s не найдена запи�ь каталога � �оответ�твующим i-node"
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, c-format
 msgid "ignoring non-option arguments"
 msgstr "не �вл�ющие�� ключами аргументы проигнорированы"
@@ -8255,8 +8394,8 @@ msgstr "не �вл�ющие�� ключами аргументы проигн
 msgid "Dmitry V. Levin"
 msgstr "Дмитрий В. Левин (Dmitry V. Levin)"
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "И�пользование: %s [КЛЮЧ]… Ф�ЙЛ…\n"
@@ -8301,8 +8440,7 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 "  -m, --canonicalize-missing    получить канониче�кое им� файла путём\n"
 "                                рекур�ивного �ледовани� по в�ем �имвольным\n"
@@ -8313,8 +8451,8 @@ msgstr ""
 "  -s, --silent                  подавл�ть вывод большин�тва �ообщений об "
 "ошибках\n"
 "  -v, --verbose                 �ообщать об ошибках\n"
-"  -z, --zero                    и�пользовать при выводе разделитель NUL,\n"
-"                                а не �имвол новой �троки\n"
+"  -z, --zero                    завершать каждую выводимую �троку NUL,\n"
+"                                а не �имволом новой �троки\n"
 
 #: src/readlink.c:152
 #, c-format
@@ -8341,7 +8479,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 "  -e, --canonicalize-existing  в�е компоненты пути должны �уще�твовать\n"
@@ -8355,7 +8493,7 @@ msgstr ""
 "      --relative-base=Ф�ЙЛ     выводить аб�олютные пути, а не пути ниже "
 "Ф�ЙЛ�\n"
 "  -s, --strip, --no-symlinks   не ра�крывать �имвольные ��ылки\n"
-"  -z, --zero                   раздел�ть результат �имволом NUL,\n"
+"  -z, --zero                   завершать каждую выводимую �троку NUL,\n"
 "                               а не �имволом новой �троки\n"
 "\n"
 
@@ -8373,41 +8511,42 @@ msgstr "%s: Ñ�пуÑ�титьÑ�Ñ� в защищённый от запиÑ�и каÑ
 msgid "%s: descend into directory %s? "
 msgstr "%s: �пу�тить�� в каталог %s? "
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr "%s: удалить защищенный от запи�и %s %s? "
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, c-format
 msgid "%s: remove %s %s? "
 msgstr "%s: удалить %s %s? "
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, c-format
 msgid "removed directory: %s\n"
 msgstr "удален каталог: %s\n"
 
-#: src/remove.c:444
+#: src/remove.c:447
 #, c-format
-msgid "cannot remove directory: %s"
-msgstr "невозможно удалить каталог: %s"
+msgid "refusing to remove %s or %s directory: skipping %s"
+msgstr "отклонение удалени� %s или каталога %s: пропу�кает�� %s"
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr "пропу�кает�� %s, по�кольку он находит�� на другом у�трой�тве"
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, c-format
 msgid "traversal failed: %s"
 msgstr "обход завершил�� неудачно: %s"
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -8440,25 +8579,21 @@ msgstr ""
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
-msgstr ""
-"  -I                  запрашивать подтверждение один раз перед удалением "
-"более\n"
-"                        чем трех файлов или перед рекур�ивным удалением.  �е "
-"так\n"
-"                        назойливо, как -i, но в�е же предо�тавл�ет защиту "
-"от\n"
-"                        большин�тва ошибок.\n"
-"      --interactive[=КОГД�] запрашивать подтверждение, КОГД� указано: "
-"never \n"
-"                        (никогда), once (-I, один раз) или always (-i, "
-"в�егда).\n"
-"                        Е�ли КОГД� не задано, запрашивать в�егда.\n"
+"                          always (-i); without WHEN, prompt always\n"
+msgstr ""
+"  -I                  запрашивать подтверждение один раз перед удалением\n"
+"                      более трёх файлов или перед рекур�ивным удалением;\n"
+"                      не так назойливо, как � -i, но в�ё же защищает\n"
+"                      от большин�тва ошибок\n"
+"      --interactive[=КОГД�] запрашивать подтверждение в �оответ�твии\n"
+"                      � КОГД�: never (никогда), once (-I, один раз) или\n"
+"                      always (-i, в�егда);\n"
+"                      е�ли КОГД� не задано — запрашивать в�егда\n"
 
 #: src/rm.c:149
 msgid ""
@@ -8466,10 +8601,9 @@ msgid ""
 "                          directory that is on a file system different from\n"
 "                          that of the corresponding command line argument\n"
 msgstr ""
-"      --one-file-system  при рекур�ивном удалении иерархии, пропу�кать в�е \n"
-"                           каталоги, наход�щие�� не на той же файловой "
-"�и�теме,\n"
-"                           что и �оответ�твующий аргумент командной �троки\n"
+"      --one-file-system  при рекур�ивном удалении иерархии, пропу�кать в�е\n"
+"                      каталоги, наход�щие�� не на той же файловой �и�теме,\n"
+"                      что и �оответ�твующий аргумент командной �троки\n"
 
 #: src/rm.c:154
 msgid ""
@@ -8529,13 +8663,19 @@ msgstr ""
 
 #: src/rm.c:342
 #, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr "%s: удалить в�е аргументы рекур�ивно? "
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] "%s: удалить %zu аргумент рекур�ивно? "
+msgstr[1] "%s: удалить %zu аргумента рекур�ивно? "
+msgstr[2] "%s: удалить %zu аргументов рекур�ивно? "
 
-#: src/rm.c:343
+#: src/rm.c:345
 #, c-format
-msgid "%s: remove all arguments? "
-msgstr "%s: удалить в�е аргументы? "
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] "%s: удалить %zu аргумент? "
+msgstr[1] "%s: удалить %zu аргумента? "
+msgstr[2] "%s: удалить %zu аргументов? "
 
 #: src/rmdir.c:134 src/rmdir.c:233
 #, c-format
@@ -8591,10 +8731,10 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
-"Запу�кает программу в другом контек�те безопа�но�ти.\n"
+"Запу�кает программу в другом контек�те безопа�но�ти SELinux.\n"
 "Е�ли не указана КОМ��Д� или КО�ТЕКСТ, то выводит�� текущий контек�т\n"
 "безопа�но�ти.\n"
 
@@ -8651,41 +8791,46 @@ msgstr "вы должны указать -c, -t, -u, -l, -r или контекÑ
 msgid "no command specified"
 msgstr "не задана команда"
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr "%s может и�пользовать�� только � поддержкой SELinux в �дре"
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, c-format
 msgid "failed to compute a new context"
 msgstr "не удало�ь вычи�лить новый контек�т"
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, c-format
 msgid "failed to set new user %s"
 msgstr "не удало�ь у�тановить нового пользовател� %s"
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, c-format
 msgid "failed to set new type %s"
 msgstr "не удало�ь у�тановить новый тип %s"
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, c-format
 msgid "failed to set new range %s"
 msgstr "не удало�ь у�тановить новый диапазон %s"
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, c-format
 msgid "failed to set new role %s"
 msgstr "не удало�ь у�тановить новую роль %s"
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, c-format
 msgid "unable to set security context %s"
 msgstr "не удало�ь у�тановить контек�т безопа�но�ти %s"
 
+#: src/selinux.c:127 src/selinux.c:300
+#, c-format
+msgid "error canonicalizing %s"
+msgstr "ошибка канонизации %s"
+
 #: src/seq.c:68
 #, c-format
 msgid ""
@@ -8718,18 +8863,22 @@ msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
 msgstr ""
 "\n"
-"Е�ли не заданы ПЕРВЫЙ или ПРИРОСТ, по умолчанию и�пользует�� 1.  То\n"
+"Е�ли не заданы ПЕРВЫЙ или ПРИРОСТ, по умолчанию и�пользует�� 1. То\n"
 "е�ть ПРИРОСТ по умолчанию принимает�� за 1, даже е�ли ПОСЛЕД�ИЙ меньше\n"
-"ПЕРВОГО.  ПЕРВЫЙ, ПОСЛЕД�ИЙ и ПРИРОСТ интерпретируют�� как чи�ла �\n"
-"плавающей точкой.  ПРИРОСТ обычно положителен, е�ли ПЕРВЫЙ меньше\n"
+"ПЕРВОГО. По�ледовательно�ть чи�ел заканчивает��, когда �умма текущих\n"
+"чи�ел и ПРИРОСТ �тановит�� больше ПОСЛЕД�ЕГО.\n"
+"ПЕРВЫЙ, ПОСЛЕД�ИЙ и ПРИРОСТ интерпретируют�� как чи�ла �\n"
+"плавающей точкой. ПРИРОСТ обычно положителен, е�ли ПЕРВЫЙ меньше\n"
 "ПОСЛЕД�ЕГО, и отрицателен, е�ли ПЕРВЫЙ больше ПОСЛЕД�ЕГО.\n"
 
-#: src/seq.c:94
+#: src/seq.c:96
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
 "it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n"
@@ -8740,89 +8889,27 @@ msgstr ""
 "ПОСЛЕД�ИЙ в�е �вл�ют�� де��тичными чи�лами � фик�ированной точкой �\n"
 "мак�имальной точно�тью PREC, и %g в противном �лучае.\n"
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, c-format
 msgid "invalid floating point argument: %s"
 msgstr "неверный аргумент � плавающей точкой: %s"
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr "формат %s �одержит неизве�тную директиву %%%c"
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr "при выводе �трок одинаковой ширины формат можно не указывать"
 
-#: src/setuidgid.c:49
-#, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-"И�пользование: %s [КОРОТКИЙ-КЛЮЧ]… ИМЯ_ПОЛЬЗОВ�ТЕЛЯ КОМ��Д� [�РГУМЕ�Т]…\n"
-"       или:    %s ДЛИ��ЫЙ-КЛЮЧ\n"
-
-#: src/setuidgid.c:55
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-"Сбра�ывает в�е дополнительные группы, предполагает, что идентификаторы\n"
-"пользовател� и группы как у заданного ПОЛЬЗОВ�ТЕЛЯ (чи�ловой ID или им�)\n"
-"и запу�кает КОМ��ДУ � указанными �РГУМЕ�Т�МИ. Завершает�� �о �тату�ом 111,\n"
-"е�ли оказало�ь невозможно у�тановить нужные идентификаторы пользовател�\n"
-"и группы. В противном �лучае возвращает�� �тату� завершени� КОМ��ДЫ.\n"
-"Эта программа имеет �мы�л только дл� �уперпользовател� (UID=0).\n"
-"\n"
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-"  -g GID[,GID1…]  также задать первичную group-ID чи�ловым GID, и\n"
-"                    (е�ли указано) дополнительные ID групп в GID1, …\n"
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr "неизве�тный идентификатор пользовател�: %s"
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr ""
-"чтобы и�пользовать идентификатор пользовател� %s, вам нужно указать также -g"
-
-#: src/setuidgid.c:190
-#, c-format
-msgid "failed to set supplemental group(s)"
-msgstr "не удало�ь у�тановить дополнительную группу(ы)"
-
-#: src/setuidgid.c:200
-#, c-format
-msgid "cannot set group-ID to %lu"
-msgstr "невозможно у�тановить идентификатор группы равным %lu"
-
-#: src/setuidgid.c:204
-#, c-format
-msgid "cannot set user-ID to %lu"
-msgstr "невозможно у�тановить идентификатор пользовател� равным %lu"
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr "Колин Пламб (Colin Plumb)"
 
-#: src/shred.c:148
+#: src/shred.c:170
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
 "for even very expensive hardware probing to recover the data.\n"
@@ -8830,7 +8917,7 @@ msgstr ""
 "Перепи�ывает не�колько раз указанные файлы дл� того, чтобы �делать более\n"
 "�ложным во��тановление даже � и�пользованием очень дорогого оборудовани�.\n"
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -8844,43 +8931,50 @@ msgstr ""
 "                            (по умолчанию /dev/urandom)\n"
 "  -s, --size=N        очи�тить N байт (возможны �уффик�ы вида K, M, G)\n"
 
-#: src/shred.c:161
+#: src/shred.c:183
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
 "  -z, --zero     add a final overwrite with zeros to hide shredding\n"
 msgstr ""
-"  -u, --remove        обрезать и удал�ть файл по�ле перезапи�и\n"
-"  -v, --verbose       показывать прогре��\n"
-"  -x, --exact         не округл�ть размеры файлов до �ледующего целого "
-"блока;\n"
-"                      по умолчанию дл� необычных файлов\n"
-"  -z, --zero          перезапи�ать в конце нул�ми, чтобы �крыть "
-"перемешивание\n"
+"  -u, --remove[=К�К]  обрезать и удал�ть файл по�ле перезапи�и;\n"
+"                      �мотрите далее\n"
+"  -v, --verbose       показывать ход выполнени�\n"
+"  -x, --exact         не округл�ть размеры файлов до �ледующего целого\n"
+"                      блока; по умолчанию дл� не про�тых файлов\n"
+"  -z, --zero          перезапи�ать в конце нул�ми, чтобы �крыть измельчение\n"
 
-#: src/shred.c:170
+#: src/shred.c:192
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 "\n"
-"Е�ли Ф�ЙЛ задан как -, перемешивать �тандартный вывод.\n"
+"Е�ли Ф�ЙЛ задан как -, измельчать �тандартный вывод.\n"
 "\n"
 "Удал�ет Ф�ЙЛ(ы), е�ли указан --remove (-u).  По умолчанию файлы не\n"
 "удал�ют��, так как ча�то обрабатывают�� файлы-у�трой�тва вроде\n"
-"/dev/hda, а такие файлы не надо удал�ть.  При обработке обычных файлов\n"
-"большин�тво людей и�пользуют ключ --remove.\n"
+"/dev/hda, а такие файлы не надо удал�ть.\n"
+"�еоб�зательным параметром К�К задаёт�� �по�об удалени� каталога:\n"
+"«unlink» => и�пользовать �тандартный вызов unlink.\n"
+"«wipe» => также, �начала и�портить байты имени.\n"
+"«wipesync» => также, �инхронизировать каждый и�порченный байт на ди�ке.\n"
+"Режим по умолчанию — «wipesync», но заметим, что �то долго.\n"
 "\n"
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -8893,13 +8987,13 @@ msgstr ""
 "В�ИМ��ИЕ: Помните, что shred полагает�� на очень важное предположение:\n"
 "что ваша файлова� �и�тема перезапи�ывает файлы «на ме�те».\n"
 "Традиционно �то так и делает��, но многие �овременные файловые �и�темы\n"
-"не удовлетвор�ют �тому предположению.  Вот примеры файловых �и�тем, на\n"
+"не удовлетвор�ют �тому предположению. Вот примеры файловых �и�тем, на\n"
 "которых shred не �ффективен или не дает гарантии �ффективно�ти во в�ех\n"
 "режимах файловой �и�темы:\n"
 "\n"
 
 # log-structured???
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -8921,7 +9015,7 @@ msgstr ""
 "  NFS-�ервер от Network Appliance\n"
 "\n"
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -8935,7 +9029,7 @@ msgstr ""
 "* �жатые файловые �и�темы\n"
 "\n"
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -8956,7 +9050,7 @@ msgstr ""
 "�транице man дл� mount (man mount).\n"
 "\n"
 
-#: src/shred.c:215
+#: src/shred.c:241
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
 "of the file that cannot be removed, and that will allow a shredded file\n"
@@ -8966,128 +9060,128 @@ msgstr ""
 "�одержать копии файла, которые нельз� удалить, и которые позвол�т\n"
 "впо�лед�твии во��тановить уничтоженный файл.\n"
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, c-format
 msgid "%s: fdatasync failed"
 msgstr "%s: операци� fdatasync завершила�ь неу�пехом"
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr "%s: операци� fsync завершила�ь неудачно"
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr "%s: невозможно откатить��"
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr "%s: проход %lu/%lu (%s)…"
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, c-format
 msgid "%s: error writing at offset %s"
 msgstr "%s: ошибка запи�и по �мещению %s"
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s: операци� lseek завершила�ь неудачно"
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, c-format
 msgid "%s: file too large"
 msgstr "%s: файл �лишком велик"
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr "%s: проход %lu/%lu (%s)…%s"
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr "%s: проход %lu/%lu (%s)…%s/%s %d%%"
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, c-format
 msgid "%s: fstat failed"
 msgstr "%s: операци� fstat завершила�ь неу�пехом"
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, c-format
 msgid "%s: invalid file type"
 msgstr "%s: неверный тип файла"
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr "%s: у файла отрицательный размер"
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, c-format
 msgid "%s: error truncating"
 msgstr "%s: ошибка при у�ечении"
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, c-format
 msgid "%s: fcntl failed"
 msgstr "%s: операци� fcntl завершила�ь неу�пехом"
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr ""
 "%s: невозможно нарезать файловый де�криптор � только � правом добавлени�"
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr "%s: удаление"
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, c-format
 msgid "%s: renamed to %s"
 msgstr "%s: переименован в %s"
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, c-format
 msgid "%s: failed to remove"
 msgstr "%s: не удало�ь удалить"
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr "%s: удалён"
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, c-format
 msgid "%s: failed to close"
 msgstr "%s: не удало�ь закрыть"
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, c-format
 msgid "%s: failed to open for writing"
 msgstr "%s: не удало�ь открыть дл� чтени�"
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, c-format
 msgid "%s: invalid number of passes"
 msgstr "%s: неверное чи�ло проходов"
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, c-format
 msgid "multiple random sources specified"
 msgstr "задано не�колько и�точников �лучайных чи�ел"
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, c-format
 msgid "%s: invalid file size"
 msgstr "%s: неверный размер файла"
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -9098,11 +9192,11 @@ msgstr ""
 "       или:    %s -e [КЛЮЧ]… [�РГ]…\n"
 "       или:    %s -l ОТ-ДО [КЛЮЧ]…\n"
 
-#: src/shuf.c:54
+#: src/shuf.c:67
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr "Печатает �лучайную пере�тановку входных �трок на �тандартный вывод.\n"
 
-#: src/shuf.c:60
+#: src/shuf.c:73
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
 "  -i, --input-range=LO-HI   treat each number LO through HI as an input "
@@ -9110,42 +9204,51 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
 msgstr ""
 "  -e, --echo                �читать каждый �РГ входной �трокой\n"
 "  -i, --input-range=ОТ-ДО   �читать чи�ла ОТ и ДО входными �троками\n"
-"  -n, --head-lines=ЧИСЛО    выводить не более заданного ЧИСЛ� �трок\n"
+"  -n, --head-count=ЧИСЛО    выводить не более заданного ЧИСЛ� �трок\n"
 "  -o, --output=Ф�ЙЛ         запи�ать результат в Ф�ЙЛ, а не в �тандартный\n"
 "                            вывод\n"
-"      --random-source=Ф�ЙЛ  получать �лучайные чи�ла из Ф�ЙЛ�\n"
-"                            (по умолчанию /dev/urandom)\n"
-"  -z, --zero-terminated     завершать �троки нулем, а не переводом �троки\n"
+"      --random-source=Ф�ЙЛ  получать �лучайные байты из Ф�ЙЛ�\n"
+"  -r, --repeat              допу�кать повторение выходных �трок\n"
+
+#: src/shuf.c:228
+#, c-format
+msgid "too many input lines"
+msgstr "�лишком много входных �трок"
 
-#: src/shuf.c:244
+#: src/shuf.c:431
 #, c-format
 msgid "multiple -i options specified"
 msgstr "задано не�колько ключей -i"
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, c-format
 msgid "invalid input range %s"
 msgstr "недопу�тимый входной диапазон %s"
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, c-format
 msgid "invalid line count %s"
 msgstr "неверное чи�ло �трок: %s"
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, c-format
 msgid "multiple output files specified"
 msgstr "задано не�колько выходных файлов"
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, c-format
 msgid "cannot combine -e and -i options"
 msgstr "нельз� �очетать ключи -e и -i"
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr "нет �трок дл� повторени�"
+
 #: src/sleep.c:44
 #, c-format
 msgid ""
@@ -9169,21 +9272,21 @@ msgstr ""
 "аргументов, прио�танавливает на период, равный �умме их значений.\n"
 "\n"
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, c-format
 msgid "invalid time interval %s"
 msgstr "неверный временной интервал %s"
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr "невозможно прочитать таймер реального времени"
 
-#: src/sort.c:399
+#: src/sort.c:427
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr "Печатает �ортированное �ли�ние в�ех Ф�ЙЛ(ов) на �тандартный вывод.\n"
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
@@ -9191,7 +9294,7 @@ msgstr ""
 "Ключи, задающие пор�док:\n"
 "\n"
 
-#: src/sort.c:409
+#: src/sort.c:437
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
 "  -d, --dictionary-order      consider only blanks and alphanumeric "
@@ -9202,7 +9305,7 @@ msgstr ""
 "  -d, --dictionary-order      ра��матривать только пропу�ки, буквы и цифры\n"
 "  -f, --ignore-case           игнорировать реги�тр букв\n"
 
-#: src/sort.c:415
+#: src/sort.c:443
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
 "  -i, --ignore-nonprinting    consider only printable characters\n"
@@ -9213,14 +9316,14 @@ msgstr ""
 "  -i, --ignore-nonprinting    ра��матривать только печатные �имволы\n"
 "  -M, --month-sort            �равнивать (неизве�тно) < «JAN» < … < «DEC»\n"
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 "  -h, --human-numeric-sort    �равнивать чи�ла в удобном дл� человека виде\n"
 "                              (например, 2K 1G)\n"
 
-#: src/sort.c:423
+#: src/sort.c:451
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
 "  -R, --random-sort           sort by random hash of keys\n"
@@ -9232,7 +9335,7 @@ msgstr ""
 "      --random-source=Ф�ЙЛ    брать �лучайные чи�ла из Ф�ЙЛ�\n"
 "  -r, --reverse               обратить результаты �равнени�\n"
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -9248,7 +9351,7 @@ msgstr ""
 "  -V, --version-sort          �ортировать по номерам (вер�ии) в тек�товом\n"
 "                              пред�тавлении\n"
 
-#: src/sort.c:437
+#: src/sort.c:465
 msgid ""
 "Other options:\n"
 "\n"
@@ -9256,7 +9359,7 @@ msgstr ""
 "Другие ключи:\n"
 "\n"
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
@@ -9264,7 +9367,7 @@ msgstr ""
 "      --batch-size=NMERGE     объедин�ть не более чем NMERGE ввода за раз;\n"
 "                              дл� большего и�пользовать временные файлы\n"
 
-#: src/sort.c:445
+#: src/sort.c:473
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
 "  -C, --check=quiet, --check=silent  like -c, but do not report first bad "
@@ -9281,7 +9384,7 @@ msgstr ""
 "      --compress-program=ПРОГ  �жимать временные файлы командой ПРОГ;\n"
 "                               разжимать командой ПРОГ -d\n"
 
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -9298,7 +9401,7 @@ msgstr ""
 "                               Е�ли Ф равно -, то читать имена файлов из\n"
 "                               �тандартного ввода\n"
 
-#: src/sort.c:459
+#: src/sort.c:487
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
 "  -m, --merge               merge already sorted files; do not sort\n"
@@ -9308,7 +9411,7 @@ msgstr ""
 "  -m, --merge                  объединить уже �ортированные файлы,\n"
 "                               не �ортировать\n"
 
-#: src/sort.c:463
+#: src/sort.c:491
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "  -s, --stable              stabilize sort by disabling last-resort "
@@ -9324,7 +9427,7 @@ msgstr ""
 "указанного\n"
 "                               Р�ЗМЕР�\n"
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -9353,13 +9456,7 @@ msgstr ""
 "не�кольких\n"
 "                               равных\n"
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr ""
-"  -z, --zero-terminated        завершать �троки нулевым байтом, а не новой\n"
-"                               �трокой\n"
-
-#: src/sort.c:483
+#: src/sort.c:511
 msgid ""
 "\n"
 "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is "
@@ -9390,7 +9487,7 @@ msgstr ""
 "\n"
 "По�ле Р�ЗМЕР� можно пи�ать �ледующие �уффик�ы-мультипликаторы:\n"
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -9411,132 +9508,117 @@ msgstr ""
 "Чтобы получить традиционный пор�док, и�пользующий �и�темные значени� байт,\n"
 "у�тановите LC_ALL=C.\n"
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, c-format
 msgid "waiting for %s [-d]"
 msgstr "ожидание %s [-d]"
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr "%s [-d] завершил�� неудачно"
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, c-format
 msgid "cannot create temporary file in %s"
 msgstr "невозможно �оздать временный файл в %s"
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr "операци� открыти� завершила�ь неудачно"
 
-#: src/sort.c:970
+#: src/sort.c:998
 msgid "fflush failed"
 msgstr "операци� fflush завершила�ь неудачно"
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr "закрытие завершило�ь неудачно"
 
-#: src/sort.c:986
-#, c-format
-msgid "dup2 failed"
-msgstr "dup2 завершила�ь неудачно"
-
-#: src/sort.c:1103
-#, c-format
-msgid "couldn't execute %s"
-msgstr "невозможно выполнить %s"
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 msgid "couldn't create temporary file"
 msgstr "невозможно �оздать временный файл"
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, c-format
 msgid "couldn't create process for %s -d"
 msgstr "невозможно �оздать проце�� дл� %s -d"
 
-#: src/sort.c:1161
-#, c-format
-msgid "couldn't execute %s -d"
-msgstr "невозможно выполнить %s -d"
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, c-format
 msgid "warning: cannot remove: %s"
 msgstr "предупреждение, невозможно удалить: %s"
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, c-format
 msgid "invalid --%s argument %s"
 msgstr "--%s �одержит неверный аргумент %s"
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, c-format
 msgid "minimum --%s argument is %s"
 msgstr "минимальным аргументом --%s �вл�ет�� %s"
 
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, c-format
 msgid "--%s argument %s too large"
 msgstr "--%s имеет �лишком большой аргумент %s"
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr "мак�имальным аргументом --%s � текущим rlimit �вл�ет�� %s"
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr "количе�тво параллельных �ортировок должно быть ненулевым"
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr "операци� stat завершила�ь неудачно"
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr "чтение завершило�ь неудачно"
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, c-format
 msgid "string transformation failed"
 msgstr "не удало�ь выполнить преобразование �троки"
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, c-format
 msgid "the untransformed string was %s"
 msgstr "и�ходна� �трока была %s"
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr "^ не найдено �овпадений � ключом\n"
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr "указан у�таревший ключ %s; вме�то него и�пользуйте %s"
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr "ключ %lu нулевой ширины и будет проигнорирован"
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr "начальные пробелы в ключе %lu важны; укажите также «b»"
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr "ключ %lu �вл�ет�� чи�ловым и охватывает не�колько полей"
 
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
@@ -9544,122 +9626,122 @@ msgstr[0] "ключ «-%s» игнорирует��"
 msgstr[1] "ключа «-%s» игнорирует��"
 msgstr[2] "ключей «-%s» игнорирует��"
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr "ключ «-r» примен�ет�� только е�ли ничего не �овпало"
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr "запи�ь завершила�ь неудачно"
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr "%s: %s:%s: неправильный пор�док: "
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr "�тандартна� ошибка"
 
-#: src/sort.c:3698
+#: src/sort.c:3738
 msgid "cannot read"
 msgstr "не удало�ь прочитать"
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, c-format
 msgid "%s: invalid field specification %s"
 msgstr "%s: неверна� �пецификаци� пол� %s"
 
-#: src/sort.c:3987
+#: src/sort.c:4028
 #, c-format
 msgid "options '-%s' are incompatible"
 msgstr "ключи «-%s» не�овме�тимы"
 
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, c-format
 msgid "%s: invalid count at start of %s"
 msgstr "%s: неверный �четчик в начале %s"
 
-#: src/sort.c:4295
+#: src/sort.c:4336
 msgid "invalid number after '-'"
 msgstr "неверное чи�ло по�ле «-»"
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 msgid "invalid number after '.'"
 msgstr "неверное чи�ло по�ле «.»"
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr "лишний �имвол в �пецификации пол�"
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, c-format
 msgid "multiple compress programs specified"
 msgstr "заданы не�колько программ �жати�"
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
 msgstr "неверное чи�ло в начале пол�"
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
 msgstr "нулевой номер пол�"
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr "нулевой знаковый �двиг"
 
-#: src/sort.c:4407
+#: src/sort.c:4448
 msgid "invalid number after ','"
 msgstr "неверное чи�ло по�ле «,»"
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr "пу�та� табул�ци�"
 
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, c-format
 msgid "cannot read file names from %s"
 msgstr "невозможно прочитать имена файлов из %s"
 
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr "%s:%lu: неверное им� файла нулевой длины"
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, c-format
 msgid "no input from %s"
 msgstr "нет ввода из %s"
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr "правила, и�пользуемые дл� �ортировки: %s"
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr "и�пользует�� про�тое побайтовое �равнение"
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr "дополнительный операнд %s не допу�тим � -%c"
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr "длина �уффик�а должна быть не менее %zu"
 
-#: src/split.c:204
+#: src/split.c:203
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr "И�пользование: %s [КЛЮЧ]… [ВВОД [ПРЕФИКС]]\n"
 
-#: src/split.c:208
+#: src/split.c:207
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
 "size is 1000 lines, and default PREFIX is 'x'.  With no INPUT, or when "
@@ -9671,43 +9753,43 @@ msgstr ""
 "равен «x».  Е�ли Ф�ЙЛ не задан или задан как -, читает �тандартный\n"
 "ввод.\n"
 
-#: src/split.c:216
+#: src/split.c:215
 #, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
 "  -a, --suffix-length=�   и�пользовать �уффик�ы длиной � (по умолчанию %d)\n"
 "      --additional-suffix=СУФФИКС  прибавл�ть дополнительный СУФФИКС\n"
-"                          к именам файлов.\n"
+"                          к именам файлов\n"
 "  -b, --bytes=ЧИСЛО       запи�ывать в выходной файл заданное ЧИСЛО байт\n"
 "  -C, --line-bytes=ЧИСЛО  запи�ывать не более заданного ЧИСЛ� байт из "
 "�троки\n"
 "                          в выходной файл\n"
-"  -d, --numeric-suffixes[=ИЗ]  и�пользовать чи�ловые, а не буквенные "
-"�уффик�ы\n"
+"  -d, --numeric-suffixes[=ИЗ]  и�пользовать чи�ловые, а не буквенные\n"
+"                               �уффик�ы; ИЗ измен�ет начальное значение\n"
+"                               (по умолчанию 0)\n"
 "  -e, --elide-empty-files  не генерировать пу�тые выходные файлы,\n"
 "                          е�ли указан «-n»\n"
 "      --filter=КОМ��Д�    запи�ывать в КОМ��Ду оболочки; им� файла — $FILE\n"
 "  -l, --lines=ЧИСЛО       запи�ывать в каждый выходной файл заданное ЧИСЛО "
 "�трок\n"
-"  -n, --number=ПОРЦИИ     генерировать выходные файлы по ПОРЦИЯМ. См. далее\n"
+"  -n, --number=ПОРЦИИ     генерировать выходные файлы по ПОРЦИЯМ; �м. далее\n"
 "  -u, --unbuffered        �разу копировать ввод в вывод при указании «-n r/"
 "…»\n"
 
-#: src/split.c:229
+#: src/split.c:228
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
 "                            output file is opened\n"
@@ -9715,7 +9797,7 @@ msgstr ""
 "      --verbose           печатать диагно�тику перед открытием\n"
 "                          очередного выходного файла\n"
 
-#: src/split.c:236
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -9735,193 +9817,193 @@ msgstr ""
 "r/N     как «l», но и�пользовать цикличе�кий перебор\n"
 "r/K/N   аналогично, но выве�ти только K-ую порцию из N на �тандартный вывод\n"
 
-#: src/split.c:354
+#: src/split.c:353
 #, c-format
 msgid "output file suffixes exhausted"
 msgstr "и�черпаны �уффик�ы дл� выходных файлов"
 
-#: src/split.c:366
+#: src/split.c:365
 #, c-format
 msgid "creating file %s\n"
 msgstr "�оздаёт�� файл %s\n"
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr "%s перезапи�ал был начальные данные; прекращение выполнени�"
 
-#: src/split.c:391
+#: src/split.c:390
 #, c-format
 msgid "failed to set FILE environment variable"
 msgstr "не удало�ь задать переменную окружени� FILE"
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr "выполн�ет�� � FILE=%s\n"
 
-#: src/split.c:395
+#: src/split.c:394
 #, c-format
 msgid "failed to create pipe"
 msgstr "не удало�ь �оздать канал"
 
-#: src/split.c:409
+#: src/split.c:408
 #, c-format
 msgid "closing prior pipe"
 msgstr "закрытие предыдущего канала"
 
-#: src/split.c:411
+#: src/split.c:410
 #, c-format
 msgid "closing output pipe"
 msgstr "закрытие выходного канала"
 
-#: src/split.c:415
+#: src/split.c:414
 #, c-format
 msgid "moving input pipe"
 msgstr "перемещение входного канала"
 
-#: src/split.c:417
+#: src/split.c:416
 #, c-format
 msgid "closing input pipe"
 msgstr "закрытие входного канала"
 
-#: src/split.c:422
+#: src/split.c:421
 #, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr "не удало�ь выполнить команду: «%s -c %s»"
 
-#: src/split.c:428
+#: src/split.c:427
 #, c-format
 msgid "failed to close input pipe"
 msgstr "не удало�ь закрыть входной канал"
 
-#: src/split.c:464
+#: src/split.c:463
 #, c-format
 msgid "waiting for child process"
 msgstr "ожидание дочернего проце��а"
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr "при FILE=%s, �игнал %s от команды: %s"
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr "при FILE=%s, код возврата %d из команды: %s"
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr "неизве�тный код возврата команды (0x%X)"
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr "невозможно разбивать не�колькими методами �разу"
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, c-format
 msgid "%s: invalid number of chunks"
 msgstr "%s: неверное количе�тво порций"
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, c-format
 msgid "%s: invalid chunk number"
 msgstr "%s: неверный номер порции"
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr "%s: неверна� длина �уффик�а"
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr "%s: неверное чи�ло байт"
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr "%s: неверное чи�ло �трок"
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, c-format
 msgid "line count option -%s%c... is too large"
 msgstr "ключ чи�ла �трок -%s%c… �лишком велик"
 
-#: src/split.c:1248
+#: src/split.c:1298
 #, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr "%s: неверное начальное значение чи�лового �уффик�а"
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, c-format
 msgid "%s: invalid IO block size"
 msgstr "%s: неверный размер блока ввода-вывода"
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr "--filter не примен�ет�� к порци�м, извлекаемым в stdout"
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr ""
 "начальное значение чи�лового �уффик�а �лишком большое и превышает длину "
 "�уффик�а"
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, c-format
 msgid "%s: cannot determine file size"
 msgstr "%s: невозможно определить размер файла"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr "Майкл Ме�ке� (Michael Meskes)"
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, c-format
 msgid "failed to canonicalize %s"
 msgstr "не удало�ь выполнить канонизацию %s"
 
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr "предупреждение: управл�юща� по�ледовательно�ть «\\%c» не ра�познана"
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, c-format
 msgid "%s: invalid directive"
 msgstr "%s: неверна� директива"
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, c-format
 msgid "warning: backslash at end of format"
 msgstr "предупреждение: обратна� ко�а� черта в конце формата"
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr ""
 "и�пользуемое значение %s дл� обозначени� �тандартного ввода не работает в "
 "режиме файловой �и�темы"
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, c-format
 msgid "cannot read file system information for %s"
 msgstr "невозможно �читать информацию файловой �и�темы дл� %s"
 
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, c-format
 msgid "cannot stat standard input"
 msgstr "не удало�ь выполнить stat дл� �тандартного ввода"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -9937,7 +10019,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -9947,31 +10029,31 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr ""
 "У�трой�тво: %Dh/%dd\tInode: %-10i  С�ылки: %-5h Тип у�трой�тва: %t,%T\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr "У�трой�тво: %Dh/%dd\tInode: %-10i  С�ылки: %h\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr "До�туп: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, c-format
 msgid "Context: %C\n"
 msgstr "Контек�т: %C\n"
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -9983,11 +10065,11 @@ msgstr ""
 "Изменён: %z\n"
 " Создан: %w\n"
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
 msgstr "Отображает �о�то�ние файла или файловой �и�темы.\n"
 
-#: src/stat.c:1356
+#: src/stat.c:1418
 msgid ""
 "  -L, --dereference     follow links\n"
 "  -f, --file-system     display file system status instead of file status\n"
@@ -9995,25 +10077,26 @@ msgstr ""
 "  -L, --dereference     �ледовать по ��ылкам\n"
 "  -f, --file-system     показать �о�то�ние файловой �и�темы, а не файла\n"
 
-#: src/stat.c:1360
+#: src/stat.c:1422
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 "  -c  --format=ФОРМ�Т   и�пользовать указанный ФОРМ�Т, а не принимаемый по\n"
-"                        умолчанию; переводить �троку по�ле каждого\n"
-"                        и�пользовани� ФОРМ�Т�\n"
+"                        умолчанию; в�тавл�ть �имвол новой �троки по�ле\n"
+"                        каждого и�пользовани� ФОРМ�Т�\n"
 "      --printf=FORMAT   как --format, но интерпретировать �кранирующие\n"
-"                        по�ледовательно�ти и не переводить �троку в конце.\n"
-"                        Е�ли вам нужен перевод �троки, в�тавьте в ФОРМ�Т "
-"\\n.\n"
+"                        по�ледовательно�ти и не выводить �имвол новой "
+"�троки\n"
+"                        в конце; е�ли вам нужен �имвол новой �троки,\n"
+"                        в�тавьте в ФОРМ�Т \\n\n"
 "  -t, --terse           выводить информацию в компактной форме\n"
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 msgid ""
 "\n"
 "The valid format sequences for files (without --file-system):\n"
@@ -10033,7 +10116,7 @@ msgstr ""
 "  %B   размер блока, �ообщаемого %b, в байтах\n"
 "  %C   �трока контек�та безопа�но�ти SELinux\n"
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 msgid ""
 "  %d   device number in decimal\n"
 "  %D   device number in hex\n"
@@ -10049,7 +10132,7 @@ msgstr ""
 "  %g   ID группы-владельца\n"
 "  %G   им� группы-владельца\n"
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 msgid ""
 "  %h   number of hard links\n"
 "  %i   inode number\n"
@@ -10058,20 +10141,22 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 "  %h   количе�тво жё�тких ��ылок\n"
-"  %i   количе�тво Inode\n"
+"  %i   количе�тво inode\n"
 "  %m   точка монтировани�\n"
 "  %n   им� файла\n"
-"  %N   �кранированное им� файла, �имвольна� ��ылки разыменовывает��\n"
+"  %N   �кранированное им� файла, �имвольна� ��ылка разыменовывает��\n"
 "  %o   оптимальный размер блока ввода/вывода\n"
 "  %s   полный размер в байтах\n"
-"  %t   о�новной тип у�трой�тва, ше�тнадцатеричный формат\n"
-"  %T   второ�тепенный тип у�трой�тва, ше�тнадцатеричный формат\n"
+"  %t   о�новной тип у�трой�тва, ше�тнадцатеричный формат,\n"
+"        дл� �пециальных �имвольных/блочных у�трой�тв\n"
+"  %T   второ�тепенный тип у�трой�тва, ше�тнадцатеричный формат,\n"
+"       дл� �пециальных �имвольных/блочных у�трой�тв\n"
 
-#: src/stat.c:1399
+#: src/stat.c:1461
 msgid ""
 "  %u   user ID of owner\n"
 "  %U   user name of owner\n"
@@ -10079,10 +10164,10 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 "  %u   ID пользовател�-владельца\n"
@@ -10091,13 +10176,13 @@ msgstr ""
 "  %W   врем� �оздани� файла в �екундах � начала Эпохи; 0, е�ли неизве�тно\n"
 "  %x   врем� по�леднего до�тупа\n"
 "  %X   врем� по�леднего до�тупа в �екундах � начала Эпохи\n"
-"  %y   врем� по�ледней модификации\n"
-"  %Y   врем� по�ледней модификации в �екундах � начала Эпохи\n"
-"  %z   врем� по�леднего изменени�\n"
-"  %Z   врем� по�леднего изменени� в �екундах � начала Эпохи\n"
+"  %y   врем� по�ледней модификации данных\n"
+"  %Y   врем� по�ледней модификации данных в �екундах � начала Эпохи\n"
+"  %z   врем� по�леднего изменени� �о�то�ни�, в пон�тном человеку виде\n"
+"  %Z   врем� по�леднего изменени� �о�то�ни� в �екундах � начала Эпохи\n"
 "\n"
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 msgid ""
 "Valid format sequences for file systems:\n"
 "\n"
@@ -10115,7 +10200,7 @@ msgstr ""
 "  %d   количе�тво �вободных файловых нод в файловой �и�теме\n"
 "  %f   количе�тво �вободных блоков в файловой �и�теме\n"
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 msgid ""
 "  %i   file system ID in hex\n"
 "  %l   maximum length of filenames\n"
@@ -10208,22 +10293,27 @@ msgstr ""
 "Также некоторые фильтры (например «dd», «cat» и т.д.) не и�пользуют потоки\n"
 "ввода/вывода, и по�тому «stdbuf» не укажет на них никакого вли�ни�.\n"
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, c-format
 msgid "failed to find %s"
 msgstr "не удало�ь найти %s"
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, c-format
 msgid "failed to update the environment with %s"
 msgstr "не удало�ь обновить окружение � %s"
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr "�трокова� буферизаци� stdin бе��мы�ленна"
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, c-format
+msgid "you must specify a buffering mode option"
+msgstr "вы должны задать ключ режима буферизации"
+
+#: src/stty.c:516
 #, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -10234,11 +10324,11 @@ msgstr ""
 "       или:    %s [-F УСТРОЙСТВО] [--file=УСТРОЙСТВО] [-a|--all]\n"
 "       или:    %s [-F УСТРОЙСТВО] [--file=УСТРОЙСТВО] [-g|--save]\n"
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
 msgstr "Печатает или измен�ет на�тройки терминала.\n"
 
-#: src/stty.c:525
+#: src/stty.c:528
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
 "  -g, --save         print all current settings in a stty-readable form\n"
@@ -10253,7 +10343,7 @@ msgstr ""
 "                  открыть и и�пользовать указанное у�трой�тво вме�то\n"
 "                  �тандартного ввода\n"
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
@@ -10265,7 +10355,7 @@ msgstr ""
 "иной\n"
 "на�тройки определ�ет�� и�пользуемой �и�темой.\n"
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -10281,7 +10371,7 @@ msgstr ""
 "  eof СИМВОЛ      СИМВОЛ будет означать конец файла (прекращать ввод)\n"
 "  eol СИМВОЛ      СИМВОЛ будет означать конец �троки\n"
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -10293,7 +10383,7 @@ msgstr ""
 "  intr СИМВОЛ     СИМВОЛ будет по�ылать �игнал прерывани�\n"
 "  kill СИМВОЛ     СИМВОЛ будет �тирать текущую �троку\n"
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -10306,7 +10396,7 @@ msgstr ""
 "* rprnt СИМВОЛ    СИМВОЛ будет перери�овывать текущую �троку\n"
 "  start СИМВОЛ    СИМВОЛ будет возобновл�ть ввод\n"
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -10318,7 +10408,7 @@ msgstr ""
 "* swtch СИМВОЛ    СИМВОЛ будет переключать уровень вложенно�ти оболочки\n"
 "* werase СИМВОЛ   СИМВОЛ �тирать по�ледние введенное �лово\n"
 
-#: src/stty.c:562
+#: src/stty.c:565
 msgid ""
 "\n"
 "Special settings:\n"
@@ -10332,7 +10422,7 @@ msgstr ""
 "* cols �        �ообщить �дру, что терминал имеет � �толбцов\n"
 "* columns �     �иноним cols\n"
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -10346,7 +10436,7 @@ msgstr ""
 "                �имволов дл� завершени� операции чтени�\n"
 "  ospeed �      у�тановить �коро�ть вывода\n"
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -10360,7 +10450,7 @@ msgstr ""
 "  time �        и�пользует�� � -icanon, у�тановить временной предел дл�\n"
 "                операции чтени� равным � де��тым �екунды\n"
 
-#: src/stty.c:581
+#: src/stty.c:584
 msgid ""
 "\n"
 "Control settings:\n"
@@ -10378,7 +10468,7 @@ msgstr ""
 " * [-]cdtrdsr  включить квитирование по DTR/DSR\n"
 "  cs�           у�тановить размер �имвола равным � бит, � от 5 до 8\n"
 
-#: src/stty.c:590
+#: src/stty.c:593
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
 "   [-]hup        send a hangup signal when the last process closes the tty\n"
@@ -10386,18 +10476,18 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
-"  [-]cstopb     и�пользовать два раздел�ющих бита на �имвол (один, е�ли � "
-"«-»)\n"
+"  [-]cstopb     и�пользовать два �топ бита на �имвол (один, е�ли � «-»)\n"
 "  [-]hup        по�ылать �игнал обрыва терминальной линии, когда по�ледний\n"
 "                проце�� закрывает терминал\n"
 "  [-]hupcl      �иноним [-]hup\n"
-"  [-]parenb     генерировать при выводе бит четно�ти и ожидать бит четно�ти "
-"на\n"
-"                вводе\n"
-"  [-]parodd     у�тановить проверку на нечетно�ть (или даже чётно�ть � «-»)\n"
+"  [-]parenb     генерировать при выводе бит чётно�ти и ожидать бит чётно�ти\n"
+"                на вводе\n"
+"  [-]parodd     у�тановить проверку на нечётно�ть (или чётно�ть � «-»)\n"
+" * [-]cmspar    и�пользовать чётно�ть «stick» (mark/space)\n"
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -10413,7 +10503,7 @@ msgstr ""
 "  [-]ignbrk     игнорировать �имволы прерывани�\n"
 "  [-]igncr      игнорировать �имволы возврата каретки\n"
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -10429,11 +10519,11 @@ msgstr ""
 "  [-]inpck      и�пользовать проверку четно�ти ввода\n"
 "  [-]istrip     очищать �тарший (во�ьмой) бит вводимых �имволов\n"
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr " * [-]iutf8      предполагать, что входные �имволы в кодировке UTF-8\n"
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -10449,7 +10539,7 @@ msgstr ""
 "  [-]parmrk     отмечать ошибки четно�ти (по�ледовательно�тью из 255 нулей)\n"
 "  [-]tandem     �иноним [-]xioff\n"
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -10465,24 +10555,24 @@ msgstr ""
 "* ff�           значение паузы по�ле перевода �траницы, допу�тимые � [0..1]\n"
 "* nl�           значение паузы по�ле новой �троки, допу�тимые � [0..1]\n"
 
-#: src/stty.c:631
+#: src/stty.c:635
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
 " * [-]onlret     newline performs a carriage return\n"
 msgstr ""
 "* [-]ocrnl      преобразовывать возврат каретки в перевод �троки\n"
-"* [-]ofdel      и�пользовать �имволы �тирани� вме�то нулей дл� заполнени�\n"
+"* [-]ofdel      и�пользовать �имволы �тирани� вме�то NUL дл� заполнени�\n"
 "* [-]ofill      и�пользовать �имволы заполнени� дл� задержек\n"
 "* [-]olcuc      преобразовывать �трочные буквы в заглавные\n"
 "* [-]onlcr      преобразовывать перевод �троки в возврат каретки и новую "
 "�троку\n"
 "* [-]onlret     перевод �троки производит возврат каретки\n"
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -10500,7 +10590,7 @@ msgstr ""
 "* vt�           значение паузы по�ле вертикальной табул�ции, допу�тимые � "
 "[0..1]\n"
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -10514,7 +10604,7 @@ msgstr ""
 "* crtkill       �тирать в�ю �троку, подчин���ь у�тановкам echoprt и echoe\n"
 "* -crtkill      �тирать в�ю �троку, подчин���ь у�тановкам echoctl и echok\n"
 
-#: src/stty.c:654
+#: src/stty.c:658
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
 "   [-]echo       echo input characters\n"
@@ -10528,7 +10618,7 @@ msgstr ""
 "  [-]echoe      �иноним [-]crterase\n"
 "  [-]echok      отображать перевод �троки по�ле �имвола уничтожени�\n"
 
-#: src/stty.c:661
+#: src/stty.c:665
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
 "   [-]echonl     echo newline even if not echoing other characters\n"
@@ -10546,7 +10636,7 @@ msgstr ""
 "  [-]iexten     и�пользовать �пециальные �имволы, не опи�анные в �тандарте\n"
 "                POSIX\n"
 
-#: src/stty.c:668
+#: src/stty.c:672
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
 "   [-]noflsh     disable flushing after interrupt and quit special "
@@ -10563,7 +10653,7 @@ msgstr ""
 "                запи�ь на терминал\n"
 "* [-]xcase      отображать «\\» дл� заглавных букв, и�пользует�� � icanon\n"
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -10577,7 +10667,7 @@ msgstr ""
 "  cbreak        �иноним -icanon\n"
 "  -cbreak       �иноним icanon\n"
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -10589,7 +10679,7 @@ msgstr ""
 "  -cooked       �иноним raw\n"
 "  crt           �иноним echoe echoctl echoke\n"
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -10604,7 +10694,7 @@ msgstr ""
 "умолчанию\n"
 "  evenp         �иноним parenb -parodd cs7\n"
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -10620,7 +10710,7 @@ msgstr ""
 "  nl            �иноним -icrnl -onlcr\n"
 "  -nl           �иноним icrnl -inlcr -igncr onlcr -ocrnl -onlret\n"
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -10634,7 +10724,7 @@ msgstr ""
 "  pass8         �иноним -parenb -istrip cs8\n"
 "  -pass8        �иноним parenb istrip cs7\n"
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -10646,7 +10736,7 @@ msgstr ""
 "                -imaxbel -opost -isig -icanon -xcase min 1 time 0\n"
 "  -raw          �иноним cooked\n"
 
-#: src/stty.c:716
+#: src/stty.c:720
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
 "                 -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n"
@@ -10662,7 +10752,7 @@ msgstr ""
 "                -xcase -tostop -echoprt echoctl echoke, в�е �пециальные\n"
 "                �имволы у�тановлены в их значени� по умолчанию\n"
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -10678,12 +10768,12 @@ msgstr ""
 "или задают�� в как ^c, 0x37, 0177 или 127; дл� отмены �пециальных �имволов\n"
 "�лужат значени� ^- и undef.\n"
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, c-format
 msgid "only one device may be specified"
 msgstr "можно задать только одно у�трой�тво"
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
@@ -10692,43 +10782,43 @@ msgstr ""
 "ключи дл� вывода в виде, читаемом человеком и читаемом программой stty,\n"
 "взаимои�ключающие"
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr "при задании �тил� вывода нельз� у�танавливать режим"
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr "%s: невозможно переинициализировать неблокирующий режим"
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, c-format
 msgid "invalid argument %s"
 msgstr "неверный аргумент %s"
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, c-format
 msgid "missing argument to %s"
 msgstr "пропущен аргумент дл� %s"
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, c-format
 msgid "invalid line discipline %s"
 msgstr "неверные на�тройки линии (line discipline) %s"
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr "%s: невозможно произве�ти в�е запрошенные дей�тви�"
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr "%s: дл� �того у�трой�тва нет �ведений о размерах"
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, c-format
 msgid "invalid integer argument %s"
 msgstr "неверный целый аргумент %s"
@@ -10790,7 +10880,7 @@ msgstr ""
 "      --version  показать информацию о вер�ии и выйти\n"
 "\n"
 
-#: src/system.h:544
+#: src/system.h:543
 msgid ""
 "\n"
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -10798,19 +10888,19 @@ msgstr ""
 "\n"
 "�ргументы, об�зательные дл� длинных ключей, об�зательны и дл� коротких.\n"
 
-#: src/system.h:552
+#: src/system.h:551
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 "\n"
 "Р�ЗМЕР задаёт�� целым чи�лом и необ�зательной единицей изменени�\n"
-"(пример: 10M is 10*1024*1024). Единицы изменени�:\n"
+"(пример: 10K �то 10*1024). Единицы изменени�:\n"
 "K, M, G, T, P, E, Z, Y (�тепень 1024) или KB, MB, … (�тепень 1000).\n"
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -10824,36 +10914,36 @@ msgstr ""
 "Иначе, единицей по умолчанию �вл�ет�� 1024 байта (или 512, е�ли\n"
 "у�тановлена POSIXLY_CORRECT).\n"
 
-#: src/system.h:571
+#: src/system.h:570
 #, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
+"%s online help: <%s>\n"
 msgstr ""
 "\n"
-"Об ошибках в %s �ообщайте по адре�у %s.\n"
+"Оперативна� �правка %s: <%s>\n"
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr "Об ошибках в переводе �ообщений «%s» �ообщайте по адре�у <gnu@mx.ru>\n"
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr ""
 "Полна� документаци� до�тупна по команде: info coreutils '%s invocation'\n"
 
-#: src/system.h:596
+#: src/system.h:591
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "По команде «%s --help» можно получить дополнительную информацию.\n"
 
-#: src/system.h:628
+#: src/system.h:633
 #, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -10951,43 +11041,39 @@ msgstr ""
 
 #: src/tail.c:270
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
-"  -c, --bytes=�            показать по�ледние � байт; или же укажите -c +�,\n"
+"  -c, --bytes=�            показать по�ледние � байт; или укажите -c +�,\n"
 "                           чтобы начать вывод каждого файла � �-го байта\n"
 
 #: src/tail.c:274
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           выводить по�тупающие данные по мере ро�та файла;\n"
-"                           -f, --follow и --follow=descriptor �квивалентны\n"
+"                           при от�ут�твии ключа и�пользует�� «descriptor»\n"
 "  -F                       �квивалент --follow=name --retry\n"
 
-#: src/tail.c:281
+#: src/tail.c:280
 #, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
 "  -n, --lines=�            выводить по�ледние � �трок, а не по�ледние %d;\n"
-"                           или и�пользуйте -n +� дл� вывода �трок, начина� � "
-"�-ной\n"
+"                           или и�пользуйте -n +� дл� вывода, начина� � �-"
+"ной\n"
 "      --max-unchanged-stats=�\n"
 "                           c ключом --follow=name, повторно открывать Ф�ЙЛ,\n"
 "                           который не измен�л�� по�ледние � (по умолчанию "
@@ -10995,43 +11081,36 @@ msgstr ""
 "                           итераций, чтобы проверить, не был ли он удалён "
 "или\n"
 "                           переименован (такое обычно бывает при ротации\n"
-"                           �и�темных протокольных файлов). При "
-"и�пользовании\n"
-"                           механизма inotify �тот параметр не требует��.\n"
+"                           файлов �и�темных журналов); при и�пользовании\n"
+"                           механизма inotify �тот параметр не требует��\n"
 
-#: src/tail.c:294
+#: src/tail.c:293
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 "      --pid=PID            � ключом -f, прервать��, когда проце�� PID\n"
 "                           завершает работу\n"
 "  -q, --quiet, --silent    не выводить заголовки � именами файлов\n"
-"      --retry              продолжать пытать�� открыть файл даже когда он "
-"е�ть\n"
-"                           или �танет недо�тупным; полезно, когда "
-"указывает��\n"
-"                           им�, то е�ть, � --follow=name\n"
+"      --retry              продолжать пытать�� открыть файл даже когда он\n"
+"                           недо�тупен\n"
 
-#: src/tail.c:301
+#: src/tail.c:298
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 "  -s, --sleep-interval=С   � ключом -f, �пать между итераци�ми примерно\n"
-"                           С �екунд (по умолчанию 1.0). При и�пользовании\n"
-"                           механизма inotify и --pid=P, провер�ть проце�� P "
-"не\n"
-"                           чем раз в N �екунд.\n"
+"                           С �екунд (по умолчанию 1.0); при и�пользовании\n"
+"                           механизма inotify и --pid=P, провер�ть проце�� P\n"
+"                           не менее чем раз в С �екунд\n"
 "  -v, --verbose            в�егда выводить заголовки � именами файлов\n"
 
-#: src/tail.c:310
+#: src/tail.c:307
 msgid ""
 "\n"
 "If the first character of K (the number of bytes or lines) is a '+',\n"
@@ -11049,7 +11128,7 @@ msgstr ""
 "GB 1000*1000*1000, G 1024*1024*1024 и так далее дл� T, P, E, Z, Y.\n"
 "\n"
 
-#: src/tail.c:319
+#: src/tail.c:316
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
 "means that even if a tail'ed file is renamed, tail will continue to track\n"
@@ -11064,33 +11143,28 @@ msgstr ""
 "его\n"
 "концом. Это поведение, принимаемое по умолчанию, нежелательно, е�ли вы на\n"
 "�амом деле хотите �ледить за именем файла, а не за де�криптором\n"
-"(пример -- �двиг протокольных файлов). В таком �лучае и�пользуйте\n"
+"(например, �двиг протокольных файлов). В таком �лучае и�пользуйте\n"
 "--follow=name. Это за�тавит tail �ледовать за указанным файлом, повторно\n"
 "открыва� его периодиче�ки, чтобы узнать, не был ли он удален и заново "
 "�оздан\n"
 "какой-то другой программой.\n"
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr "закрытие %s (fd=%d)"
 
-#: src/tail.c:453
-#, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr "%s: невозможно переме�тить указатель позиции на %s"
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr "%s: невозможно переме�тить указатель позиции на %s отно�ительно конца"
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr "невозможно определить ра�положение %s, возвращаем�� к методу опро�ом"
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
@@ -11099,140 +11173,152 @@ msgstr ""
 "неизве�тный тип файловой �и�темы 0x%08lx дл� %s. Сообщите об �том в %s. "
 "Возвращаем�� к опро�у."
 
-#: src/tail.c:963
+#: src/tail.c:965
+#, c-format
+msgid "%s has been replaced with a symbolic link. giving up on this name"
+msgstr "%s был замещён �имвольной ��ылкой, конец вывода дл� �того имени"
+
+#: src/tail.c:980
 #, c-format
 msgid "%s has become inaccessible"
 msgstr "%s �тал недо�тупен"
 
-#: src/tail.c:980
+#: src/tail.c:997
 #, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr ""
-"%s был замещен файлом, дл� которого tail неприменим; конец вывода дл� �того "
+"%s был замещён файлом, дл� которого tail неприменим; конец вывода дл� �того "
 "имени"
 
-#: src/tail.c:989
+#: src/tail.c:1006
 #, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr "%s был замещён файлом удалённым файлом, конец вывода дл� �того имени"
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, c-format
 msgid "%s has become accessible"
 msgstr "%s �тал до�тупен"
 
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr "%s по�вил��; начат вывод дл� нового файла"
 
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr "%s был замещен; вывод продолжает�� дл� нового файла"
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr "%s: невозможно изменить неблокирующий режим"
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr "%s: файл у�ечен"
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr "больше нет файлов"
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, c-format
 msgid "cannot watch parent directory of %s"
 msgstr "невозможно наблюдать за родитель�ким каталогом %s"
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, c-format
 msgid "inotify resources exhausted"
 msgstr "и�черпаны ре�ур�ы inotify"
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, c-format
 msgid "cannot watch %s"
 msgstr "не удало�ь прове�ти наблюдение %s"
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr "ошибка от�леживани� �обыти� inotify"
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, c-format
 msgid "error reading inotify event"
 msgstr "ошибка чтени� �обыти� inotify"
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr ""
 "%s: невозможно �ледить за концом файла такого типа; вывод продолжает�� дл� "
 "нового файла"
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, c-format
 msgid "number in %s is too large"
 msgstr "чи�ло в %s �лишком велико"
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr ""
 "%s: неверное мак�имальное чи�ло не измен�вших�� параметров между открыти�ми"
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr "%s: неверный PID"
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr "%s: неверное чи�ло �екунд"
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr "ключ и�пользован в неверном контек�те -- %c"
 
-#: src/tail.c:2034
+#: src/tail.c:2096
 #, c-format
-msgid "warning: --retry is useful mainly when following by name"
+msgid "warning: --retry ignored; --retry is useful only when following"
 msgstr ""
-"предупреждение: ключ --retry обычно полезен при �ледовании по имени файла"
+"предупреждение: --retry игнорирует��; ключ --retry полезен только при "
+"�ледовании"
+
+#: src/tail.c:2100
+#, c-format
+msgid "warning: --retry only effective for the initial open"
+msgstr "предупреждение: --retry полезен только при первом открытии"
 
-#: src/tail.c:2038
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
 msgstr ""
-"предупреждение: PID игнорирован; ключ --pid=PID полезен только при �ледовании"
+"предупреждение: PID игнорирует��; ключ --pid=PID полезен только при "
+"�ледовании"
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr "предупреждение: --pid=PID не поддерживает�� на �той �и�теме"
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, c-format
 msgid "cannot follow %s by name"
 msgstr "невозможно �ледовать за %s по имени"
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr ""
 "предупреждение: бе�конечное �лежение за �тандартным вводом не�ффективно"
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr "невозможно и�пользовать inotify, возвращаем�� к методу опро�а"
@@ -11505,17 +11591,17 @@ msgstr "лишний аргумент %s"
 msgid "warning: sigprocmask"
 msgstr "предупреждение: sigprocmask"
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr "предупреждение: timer_settime"
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr "предупреждение: timer_create"
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
@@ -11524,50 +11610,48 @@ msgstr ""
 "И�пользование: %s [КЛЮЧ] ПРОДОЛЖИТЕЛЬ�ОСТЬ КОМ��Д� [�РГ]…\n"
 "       или:    %s [КЛЮЧ]\n"
 
-#: src/timeout.c:229
+#: src/timeout.c:232
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
 msgstr ""
 "Запу�кает КОМ��ДУ и завершает её по и�течении времени, задаваемого\n"
 "ПРОДОЛЖИТЕЛЬ�ОСТЬЮ.\n"
 
-#: src/timeout.c:235
+#: src/timeout.c:238
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
 "      --preserve-status\n"
-"                 завершить работу � тем же значением что и КОМ��Д�, даже "
-"е�ли\n"
-"                 и�тёк �рок выполнени� команды\n"
+"                 завершить работу � тем же значением что и КОМ��Д�, даже\n"
+"                 е�ли и�тёк �рок выполнени� команды\n"
 "      --foreground\n"
-"                 Е�ли запу�к timeout выполнен не из оболочки командной "
-"�троки,\n"
-"                 позволить КОМ��ДЕ чтение из TTY и приём �игналов TTY.\n"
-"                 В �том режиме на потомка КОМ��ДЫ таймаут не накладывает��.\n"
+"                 е�ли запу�к timeout выполнен не из оболочки командной\n"
+"                 �троки, позволить КОМ��ДЕ чтение из TTY и получение\n"
+"                 �игналов TTY; в �том режиме на потомка КОМ��ДЫ таймаут\n"
+"                 не накладывает��\n"
 "  -k, --kill-after=ПРОДОЛЖИТЕЛЬ�ОСТЬ\n"
-"                   также по�лать �игнал KILL, е�ли КОМ��Д� в�ё ещё работает\n"
+"                   также по�ылать �игнал KILL, е�ли КОМ��Д� в�ё ещё "
+"работает\n"
 "                   по и�течении указанного �рока по�ле отправки\n"
-"                   начального �игнала.\n"
+"                   начального �игнала\n"
 "  -s, --signal=СИГ��Л\n"
-"                   задать �игнал, который будет по�лан по таймауту.\n"
-"                   СИГ��Л может задавать�� именем, например «HUP» или "
-"номером.\n"
-"                   Спи�ок �игналов �м. по команде «kill -l»\n"
+"                   задать �игнал, который будет по�лан по таймауту;\n"
+"                   СИГ��Л может задавать�� именем, например «HUP» или\n"
+"                   номером; cпи�ок �игналов �м. по команде «kill -l»\n"
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 msgid ""
 "\n"
 "DURATION is a floating point number with an optional suffix:\n"
@@ -11579,7 +11663,7 @@ msgstr ""
 "�уффик�ом: «s» (по умолчанию) — �екунды, «m» — минуты, «h» — ча�ы\n"
 "или «d» — дни.\n"
 
-#: src/timeout.c:259
+#: src/timeout.c:262
 msgid ""
 "\n"
 "If the command times out, and --preserve-status is not set, then exit with\n"
@@ -11599,17 +11683,17 @@ msgstr ""
 "(9),\n"
 "то код завершени� равен 128+9, а не 124.\n"
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr "предупреждение: не удало�ь отключить �оздание core"
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, c-format
 msgid "error waiting for command"
 msgstr "ошибка ожидани� команды"
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr "от�леживаема� команда завершила�ь �озданием дампа"
@@ -12027,10 +12111,11 @@ msgstr ""
 #: src/truncate.c:115
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 "  -r, --reference=RФ�ЙЛ  базовый размер RФ�ЙЛ�\n"
-"  -s, --size=Р�ЗМЕР      у�тановить или подогнать размер файла под Р�ЗМЕР\n"
+"  -s, --size=Р�ЗМЕР      у�тановить или подогнать размер файла\n"
+"                         под Р�ЗМЕР байт\n"
 
 #: src/truncate.c:121
 msgid ""
@@ -12120,12 +12205,12 @@ msgstr ""
 "ввод.\n"
 "\n"
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr "%s: на входе �одержит�� нечётное чи�ло лек�ем"
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr "%s: на входе �одержит�� цикл:"
@@ -12227,12 +12312,12 @@ msgstr "позиции табулÑ�ции Ñ�лишком далеко друг Ð
 msgid "tab stop value is too large"
 msgstr "размер табул�ции �лишком велик"
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr "И�пользование: %s [КЛЮЧ]… [ВХОД [ВЫХОД]]\n"
 
-#: src/uniq.c:138
+#: src/uniq.c:174
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
 "writing to OUTPUT (or standard output).\n"
@@ -12244,42 +12329,54 @@ msgstr ""
 "\n"
 "Без ключей �овпавшие �троки объедин�ют�� � первым по�влением.\n"
 
-#: src/uniq.c:147
+#: src/uniq.c:183
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
 msgstr ""
 "  -c, --count           выводить чи�ло повторов в начале каждой �троки\n"
-"  -d, --repeated        выводить только повтор�ющие�� �троки\n"
+"  -d, --repeated        выводить только повтор�ющие�� �троки,\n"
+"                        одну дл� каждой группы\n"
+
+#: src/uniq.c:187
+msgid ""
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
+msgstr ""
+"  -D, --all-repeated[=МЕТОД]  выве�ти в�е повтор�ющие�� �троки;\n"
+"                          группы могут раздел�ть�� пу�той �трокой;\n"
+"                          МЕТОД={none(default),prepend,separate}\n"
 
-#: src/uniq.c:151
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr "  -f, --skip-fields=�   не �равнивать первые � полей\n"
+
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
+msgstr ""
+"      --group[=МЕТОД]  показать в�е �лементы, раздел�� группы пу�той "
+"�трокой\n"
+"                          МЕТОД={separate(default),prepend,append,both}\n"
+
+#: src/uniq.c:199
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
 "  -i, --ignore-case     ignore differences in case when comparing\n"
 "  -s, --skip-chars=N    avoid comparing the first N characters\n"
 "  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
-msgstr ""
-"  -D, --all-repeated[=delimit-method]\n"
-"                        напечатать в�е повтор�ющие�� �троки\n"
-"                        delimit-method={none(по умолчанию),prepend,"
-"separate)}\n"
-"                        Разделение делает�� пу�тыми �троками.\n"
-"  -f, --skip-fields=�   не �равнивать первые � полей\n"
+msgstr ""
 "  -i, --ignore-case     игнорировать реги�тр при �равнении\n"
 "  -s, --skip-chars=�    не �равнивать первые � �имволов\n"
 "  -u, --unique          выводить только неповтор�ющие�� �троки\n"
-"  -z, --zero-terminated �троки оканчивают�� байтом � 0, а не �имволом\n"
-"                        новой �троки\n"
 
-#: src/uniq.c:161
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr "  -w, --check-chars=�   �равнивать первые � �имволов �трок\n"
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 msgid ""
 "\n"
 "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n"
@@ -12290,7 +12387,7 @@ msgstr ""
 "и/или TAB), за которой �ледуют непробельные �имволы. Сначала пропу�кают��\n"
 "пол�, потом �имволы.\n"
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 msgid ""
 "\n"
 "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n"
@@ -12304,27 +12401,37 @@ msgstr ""
 "«uniq».\n"
 "Также, при �равнении учитывают�� правила задаваемые «LC_COLLATE».\n"
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, c-format
 msgid "too many repeated lines"
 msgstr "�лишком много повтор�ющих�� �трок"
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
 msgstr "неверное чи�ло пропу�каемых полей"
 
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
 msgstr "неверное чи�ло пропу�каемых байт"
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
 msgstr "неверное чи�ло �равниваемых байт"
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr "ключ --group взаимои�ключаем � -c/-d/-D/-u"
+
+#: src/uniq.c:652
+#, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr "группировка и вывод в�ех повторов не имеет �мы�ла"
+
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
-msgstr "печать в�ех повтор�ющих�� �ток и чи�ла повторений бе��мы�ленна"
+msgstr "вывод в�ех повтор�ющих�� �ток и чи�ла повторений не имеет �мы�ла"
 
 #: src/unlink.c:45
 #, c-format
@@ -12343,11 +12450,6 @@ msgstr ""
 "Вызывает функцию unlink дл� удалени� указанного Ф�ЙЛ�.\n"
 "\n"
 
-#: src/unlink.c:86
-#, c-format
-msgid "cannot unlink %s"
-msgstr "невозможно удалить ��ылку %s"
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -12394,7 +12496,7 @@ msgstr[2] "%lu пользователей"
 msgid ",  load average: %.2f"
 msgstr ", �редн�� загруженно�ть: %.2f"
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -12405,7 +12507,7 @@ msgstr ""
 "пользователей в �и�теме и �реднее чи�ло заданий в очереди запу�ка за\n"
 "по�ледние 1, 5 и 15 минут."
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
@@ -12414,12 +12516,12 @@ msgstr ""
 "  Проце��ы в\n"
 "�о�то�нии непрерывного �на также вли�ют на �реднюю загруженно�ть.\n"
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr "\n"
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
@@ -12453,14 +12555,13 @@ msgid ""
 "  -m, --chars            print the character counts\n"
 "  -l, --lines            print the newline counts\n"
 msgstr ""
-"Печатает количе�тво новых �трок, �лов и байт дл� каждого Ф�ЙЛ� и\n"
-"итоговую �троку, е�ли было задано не�колько Ф�ЙЛОВ. Е�ли Ф�ЙЛ не\n"
-"задан или задан как -, читает �тандартный ввод. Словом �читает��\n"
-"по�ледовательно�ть �имволов ненулевой длины, отделённа� пробельным "
-"�имволом.\n"
-"Показанными ниже параметрами можно задать выводимый �чётчик; они должны\n"
-"в�егда указывать�� в �ледующем пор�дке: новых �трок, �лов, �имволов, байт,\n"
-"мак�имальна� длина �троки.\n"
+"Печатает количе�тво �имволов новой �троки, �лов и байт дл� каждого Ф�ЙЛ� и\n"
+"итоговую �троку, е�ли было задано не�колько Ф�ЙЛОВ. Е�ли ни одного Ф�ЙЛ� не\n"
+"задано или задан как -, читает �тандартный ввод. Словом �читает��\n"
+"непу�та� по�ледовательно�ть �имволов, ограниченна� пробельными �имволами.\n"
+"Дл� выбора выводимых �чётчиков и�пользуют�� �ледующие параметры\n"
+"(�чётчики в�егда вывод�т�� в таком пор�дке: �имволы новой �троки,\n"
+"�лова, �имволы, байты, мак�имальна� длина �троки):\n"
 "  -c, --bytes            напечатать количе�тво байт\n"
 "  -m, --chars            напечатать количе�тво �имволов\n"
 "  -l, --lines            напечатать количе�тво новых �трок\n"
@@ -12660,6 +12761,168 @@ msgstr ""
 "�епрерывно печатает заданную СТРОКУ(и) или, е�ли СТРОК� не задана, то «y».\n"
 "\n"
 
+#~ msgid "cannot create pipe"
+#~ msgstr "не удало�ь �оздать канал"
+
+#~ msgid "%s subprocess failed"
+#~ msgstr "подпроце�� %s завершил�� � ошибкой"
+
+#~ msgid "_open_osfhandle failed"
+#~ msgstr "_open_osfhandle завершила�ь неудачно"
+
+#~ msgid "cannot restore fd %d: dup2 failed"
+#~ msgstr "не удало�ь во��тановить fd %d: dup2 завершила�ь неудачно"
+
+#~ msgid "%s subprocess"
+#~ msgstr "подпроце�� %s"
+
+#~ msgid "%s subprocess got fatal signal %d"
+#~ msgstr "подпроце�� %s получил �игнал завершени� %d"
+
+#~ msgid "failed to set additional groups"
+#~ msgstr "не удало�ь задать дополнительные группы"
+
+#~ msgid "mount point %s already traversed"
+#~ msgstr "точка монтировани� %s уже пройдена"
+
+#~ msgid "%s: cannot lseek back to original position"
+#~ msgstr "%s: невозможно вернуть указатель файла на первоначальную позицию"
+
+#~ msgid "%s: failed to reset file pointer"
+#~ msgstr "%s: не удало�ь �бро�ить (reset) файловый указатель"
+
+#~ msgid "cannot reposition file pointer for %s"
+#~ msgstr "невозможно переме�тить указатель файла дл� %s"
+
+#~ msgid ""
+#~ "  -Z, --context[=CTX]  set the SELinux security context of each NAME to\n"
+#~ "                         default type, or CTX if specified\n"
+#~ msgstr ""
+#~ "  -Z, --context=[CTX]  у�тановить контек�т безопа�но�ти SELinux дл� "
+#~ "каждого\n"
+#~ "                      ИМЕ�И � типом по умолчанию или равным CTX, е�ли "
+#~ "указано\n"
+
+#~ msgid ""
+#~ "  -Z, --context[=CTX]  set the SELinux security context of NAME to\n"
+#~ "                         default type, or to CTX if specified\n"
+#~ msgstr ""
+#~ "  -Z, --context=[CTX]\n"
+#~ "                      у�тановить контек�т безопа�но�ти SELinux дл�\n"
+#~ "                      ИМЕ�И � типом по умолчанию или равным CTX, е�ли "
+#~ "указано\n"
+
+#~ msgid "out of memory (requested %zu bytes)"
+#~ msgstr "нехватка пам�ти (запрошено %zu байт)"
+
+#~ msgid "--padding cannot be combined with --format"
+#~ msgstr "--padding нельз� �очетать � --format"
+
+#~ msgid ""
+#~ "Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
+#~ "  or:  %s LONG-OPTION\n"
+#~ msgstr ""
+#~ "И�пользование: %s [КОРОТКИЙ-КЛЮЧ]… ИМЯ_ПОЛЬЗОВ�ТЕЛЯ КОМ��Д� [�РГУМЕ�Т]…\n"
+#~ "       или:    %s ДЛИ��ЫЙ-КЛЮЧ\n"
+
+#~ msgid ""
+#~ "Drop any supplemental groups, assume the user-ID and group-ID of the "
+#~ "specified\n"
+#~ "USER (numeric ID or user name), and run COMMAND with any specified "
+#~ "ARGUMENTs.\n"
+#~ "Exit with status 111 if unable to assume the required user and group ID.\n"
+#~ "Otherwise, exit with the exit status of COMMAND.\n"
+#~ "This program is useful only when run by root (user ID zero).\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Сбра�ывает в�е дополнительные группы, предполагает, что идентификаторы\n"
+#~ "пользовател� и группы как у заданного ПОЛЬЗОВ�ТЕЛЯ (чи�ловой ID или им�)\n"
+#~ "и запу�кает КОМ��ДУ � указанными �РГУМЕ�Т�МИ. Завершает�� �о �тату�ом "
+#~ "111,\n"
+#~ "е�ли оказало�ь невозможно у�тановить нужные идентификаторы пользовател�\n"
+#~ "и группы. В противном �лучае возвращает�� �тату� завершени� КОМ��ДЫ.\n"
+#~ "Эта программа имеет �мы�л только дл� �уперпользовател� (UID=0).\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, "
+#~ "and\n"
+#~ "                      (if specified) supplemental group IDs to GID1, ...\n"
+#~ msgstr ""
+#~ "  -g GID[,GID1…]  также задать первичную group-ID чи�ловым GID и\n"
+#~ "                    (е�ли указано) дополнительные ID групп равными GID1, "
+#~ "…\n"
+
+#~ msgid "unknown user-ID: %s"
+#~ msgstr "неизве�тный идентификатор пользовател�: %s"
+
+#~ msgid "to use user-ID %s you need to use -g too"
+#~ msgstr ""
+#~ "чтобы и�пользовать идентификатор пользовател� %s, вам нужно указать также "
+#~ "-g"
+
+#~ msgid "cannot set group-ID to %lu"
+#~ msgstr "невозможно у�тановить идентификатор группы равным %lu"
+
+#~ msgid "cannot set user-ID to %lu"
+#~ msgstr "невозможно у�тановить идентификатор пользовател� равным %lu"
+
+#~ msgid "failed to get file system create context"
+#~ msgstr "не удало�ь получить контек�т �оздани� файловой �и�темы"
+
+#~ msgid "warning: "
+#~ msgstr "предупреждение: "
+
+#~ msgid "long option '--megabytes' is deprecated and will soon be removed"
+#~ msgstr "длинный параметр «--megabytes» у�тарел и �коро будет удален"
+
+#~ msgid "Usage: %s [OPTION]... [USERNAME]\n"
+#~ msgstr "И�пользование: %s [КЛЮЧ]… [ПОЛЬЗОВ�ТЕЛЬ]\n"
+
+#~ msgid ""
+#~ "      --strict         with --check, exit non-zero for any invalid input\n"
+#~ msgstr ""
+#~ "      --strict            � --check завершить работу � ненулевым кодом "
+#~ "при\n"
+#~ "                          любых некорректных входных данных\n"
+
+#~ msgid "failed to redirect stderr to /dev/null"
+#~ msgstr "не удало�ь перенаправить �тандартный поток ошибок в /dev/null"
+
+#~ msgid "invalid number: '%s'"
+#~ msgstr "неверное чи�ло: «%s»"
+
+#~ msgid ""
+#~ "\n"
+#~ "With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Е�ли Ф�ЙЛ не задан или задан как -, читает �тандартный ввод.\n"
+#~ "По умолчанию предполагает�� «-F /».\n"
+
+#~ msgid "cannot remove directory: %s"
+#~ msgstr "невозможно удалить каталог: %s"
+
+#~ msgid "dup2 failed"
+#~ msgstr "dup2 завершила�ь неудачно"
+
+#~ msgid "couldn't execute %s"
+#~ msgstr "невозможно выполнить %s"
+
+#~ msgid "couldn't execute %s -d"
+#~ msgstr "невозможно выполнить %s -d"
+
+#~ msgid ""
+#~ "\n"
+#~ "Report %s bugs to %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Об ошибках в %s �ообщайте по адре�у %s.\n"
+
+#~ msgid "warning: --retry is useful mainly when following by name"
+#~ msgstr ""
+#~ "предупреждение: ключ --retry обычно полезен при �ледовании по имени файла"
+
 #~ msgid "using single-precision arithmetic"
 #~ msgstr "и�пользует�� арифметика � одинарной точно�тью"
 
diff --git a/po/sk.gmo b/po/sk.gmo
index c3e5a825..eae113a4 100644
--- a/po/sk.gmo
+++ b/po/sk.gmo
diff --git a/po/sk.po b/po/sk.po
index 94842fcb..9e6ce2ea 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: coreutils 8.18-pre1\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
 "PO-Revision-Date: 2012-07-03 01:06+0100\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -37,76 +37,123 @@ msgstr "Platné argumenty sú:"
 msgid "error closing file"
 msgstr "chyba pri zatváraní súboru"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "chyba pri zápise"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "zachovávajú sa práva %s"
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "Neznáma systémová chyba"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "oby�ajný prázdny súbor"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "oby�ajný súbor"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "adresár"
 
-#: lib/file-type.c:44
-msgid "block special file"
-msgstr "blokový špeciálny súbor"
-
-#: lib/file-type.c:47
-msgid "character special file"
-msgstr "znakový špeciálny súbor"
-
-#: lib/file-type.c:50
-msgid "fifo"
-msgstr "fifo"
-
-#: lib/file-type.c:53
+#: lib/file-type.c:46
 msgid "symbolic link"
 msgstr "symbolický odkaz"
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "socket"
-
-#: lib/file-type.c:59
+#: lib/file-type.c:52
 msgid "message queue"
 msgstr "front správ"
 
-#: lib/file-type.c:62
+#: lib/file-type.c:55
 msgid "semaphore"
 msgstr "semafor"
 
-#: lib/file-type.c:65
+#: lib/file-type.c:58
 msgid "shared memory object"
 msgstr "zdieľaný pamäťový objekt"
 
-#: lib/file-type.c:68
+#: lib/file-type.c:61
 msgid "typed memory object"
 msgstr "typový pamäťový objekt"
 
-#: lib/file-type.c:70
+#: lib/file-type.c:66
+msgid "block special file"
+msgstr "blokový špeciálny súbor"
+
+#: lib/file-type.c:69
+msgid "character special file"
+msgstr "znakový špeciálny súbor"
+
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr ""
+
+#: lib/file-type.c:75
+msgid "fifo"
+msgstr "fifo"
+
+#: lib/file-type.c:78
+msgid "door"
+msgstr ""
+
+#: lib/file-type.c:81
+#, fuzzy
+msgid "multiplexed block special file"
+msgstr "blokový špeciálny súbor"
+
+#: lib/file-type.c:84
+#, fuzzy
+msgid "multiplexed character special file"
+msgstr "znakový špeciálny súbor"
+
+#: lib/file-type.c:87
+msgid "multiplexed file"
+msgstr ""
+
+#: lib/file-type.c:90
+#, fuzzy
+msgid "named file"
+msgstr "�udný súbor"
+
+#: lib/file-type.c:93
+#, fuzzy
+msgid "network special file"
+msgstr "blokový špeciálny súbor"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr ""
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr ""
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr ""
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "socket"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr ""
+
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "�udný súbor"
 
@@ -241,18 +288,18 @@ msgstr "%s: prepína� `-W %s' nepovoľuje argument\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: prepína� `%s' vyžaduje argument\n"
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr "nie je možné zmeniť práva %s"
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "nie je možné vytvoriť adresár %s"
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr "vy�erpaná pamäť"
@@ -369,7 +416,7 @@ msgstr "Tegulárny výraz je príliš veľký"
 msgid "Unmatched ) or \\)"
 msgstr ") alebo \\) bez náprotivku"
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 msgid "No previous regular expression"
 msgstr "Žiaden predošlý regulárny výraz"
 
@@ -394,7 +441,7 @@ msgstr "použite --no-preserve-root na vypnutie tejto bezpe�nostnej poistky"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[yYaAá�]"
 
@@ -404,11 +451,11 @@ msgstr "^[yYaAá�]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, c-format
 msgid "setting permissions for %s"
 msgstr "nastavujú sa práva %s"
@@ -556,18 +603,6 @@ msgstr "zlyhalo otvorenie"
 msgid "Resource lost"
 msgstr "Zdroj stratený"
 
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, fuzzy, c-format
-msgid "cannot create pipe"
-msgstr "nie je možné vytvoriť adresár %s"
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, fuzzy, c-format
-msgid "%s subprocess failed"
-msgstr "%s: zlyhalo posunutie v súbore"
-
 #: lib/strsignal.c:114
 #, fuzzy, c-format
 msgid "Real-time signal %d"
@@ -779,7 +814,7 @@ msgstr ""
 "\n"
 "Chyby v programe oznamujte tu: <%s>.\n"
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Domovská stránka %s: <%s>\n"
@@ -789,31 +824,11 @@ msgstr "Domovská stránka %s: <%s>\n"
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr "Domovská stránka %s: <http://www.gnu.org/software/%s/>\n"
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr ""
 "Všeobecná pomoc pri používaní softvéru GNU: <http://www.gnu.org/gethelp/>\n"
 
-#: lib/w32spawn.h:43
-#, fuzzy, c-format
-msgid "_open_osfhandle failed"
-msgstr "zlyhalo otvorenie"
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr "nemožno obnoviť fd %d: dup2 zlyhal"
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr "podproces %s"
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr "podproces %s dostal kritický signál %d"
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr "Å¡t. vstup"
@@ -836,7 +851,7 @@ msgstr "Neznáma systémová chyba"
 msgid "failed to reopen %s with mode %s"
 msgstr "nepodarilo sa odstrániť %s"
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr "porovnanie reťazcov zlyhalo"
@@ -903,7 +918,7 @@ msgstr ""
 "                          Použite 0 na zamedzenie zalamovania riadkov\n"
 "\n"
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -926,48 +941,47 @@ msgstr ""
 "pokus o zotavenie v prípade výskytu iných nealfabetických znakov\n"
 "v kódovanom toku.\n"
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "chyba pri �ítaní"
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, c-format
 msgid "invalid input"
 msgstr "neplatný vstup"
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, c-format
 msgid "invalid wrap size: %s"
 msgstr "neplatná veľkosť zalamovania: %s"
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, c-format
 msgid "extra operand %s"
 msgstr "nadbyto�ný operand %s"
 
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, c-format
 msgid "closing standard input"
 msgstr "zatvára sa štandardný vstup"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -996,10 +1010,11 @@ msgstr ""
 "\n"
 
 #: src/basename.c:60
+#, fuzzy
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
 "  -a, --multiple       zapne podporu viacerých argumentov a považuje každý "
 "za N�ZOV\n"
@@ -1023,32 +1038,31 @@ msgstr ""
 "  %s -s .h include/stdio.h  -> „stdio�\n"
 "  %s -a any/str1 any/str2   -> „str1� a následne „str2�\n"
 
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, c-format
 msgid "missing operand"
 msgstr "chýba operand"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr "Torbjorn Granlund"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 msgid "Richard M. Stallman"
 msgstr "Richard M. Stallman"
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1105,7 +1119,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr "nie je možné vykonať ioctl na %s"
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr "štandardný výstup"
@@ -1122,14 +1136,14 @@ msgstr "Russell Coker"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 msgid "Jim Meyering"
 msgstr "Jim Meyering"
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, c-format
 msgid "failed to create security context: %s"
 msgstr "nie je možné vytvoriť bezpe�nostný kontext: %s"
@@ -1139,8 +1153,8 @@ msgstr "nie je možné vytvoriť bezpe�nostný kontext: %s"
 msgid "failed to set %s security context component to %s"
 msgstr "nepodarilo sa nastaviť %s zložku bezpe�nostného kontextu na %s"
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, c-format
 msgid "failed to get security context of %s"
 msgstr "nepodarilo sa získať bezpe�nostný kontext %s"
@@ -1150,18 +1164,18 @@ msgstr "nepodarilo sa získať bezpe�nostný kontext %s"
 msgid "can't apply partial context to unlabeled file %s"
 msgstr "nie je možné použiť �iasto�ný kontext na súbor bez ozna�enia %s"
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, c-format
 msgid "failed to change context of %s to %s"
 msgstr "nepodarilo sa zmeniť bezpe�nostný kontext %s na %s"
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
 msgstr "nie je možné pristupovať k %s"
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, c-format
 msgid "cannot read directory %s"
 msgstr "nie je možné na�ítať adresár %s"
@@ -1171,13 +1185,14 @@ msgstr "nie je možné na�ítať adresár %s"
 msgid "changing security context of %s\n"
 msgstr "zmena bezpe�nostného kontextu %s\n"
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, c-format
 msgid "fts_read failed"
 msgstr "fts_read zlyhalo"
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, fuzzy, c-format
 msgid "fts_close failed"
 msgstr "zlyhalo zatvorenie súboru"
@@ -1196,7 +1211,7 @@ msgstr ""
 #: src/chcon.c:357
 #, fuzzy
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
@@ -1243,7 +1258,7 @@ msgstr ""
 "kontexte\n"
 "\n"
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
 "      --preserve-root    fail to operate recursively on '/'\n"
@@ -1295,36 +1310,37 @@ msgstr ""
 "  -P                     neprechádzať žiadne symbolické odkazy (štandardne)\n"
 "\n"
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr "-R --dereference vyžaduje bu� -H alebo -L"
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr "-R -h vyžaduje -P"
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, c-format
 msgid "missing operand after %s"
 msgstr "chýba operand po %s"
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, c-format
 msgid "invalid context: %s"
 msgstr "neplatný kontexxt: %s"
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr "boli zadané konflitné špecifikátory kontextu"
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, c-format
 msgid "failed to get attributes of %s"
 msgstr "nepodarilo sa zistiť atribúty %s"
@@ -1353,7 +1369,7 @@ msgstr ""
 "S parametrom --reference zmení skupinu každého súboru na skupinu RSÚBORu.\n"
 "\n"
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
@@ -1392,47 +1408,47 @@ msgstr ""
 "  %s staff /u      Zmeniť skupinu /u na „staff“.\n"
 "  %s -hR staff /u  Zmeniť skupinu /u a podsúborov na „staff“.\n"
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
 msgstr "zisťujem nové atribúty %s"
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr "symbolický odkaz %s ani odkazovaný súbor neboli zmenené\n"
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr "režim súboru %s sa zmenil z %04lo (%s) na  %04lo (%s)\n"
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr "zmena režimu súboru %s z %04lo (%s) na  %04lo (%s)\n"
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr "práva súboru %s zostali %04lo (%s)\n"
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr "nie je možné pracovať s visiacim symbolickým odkazom %s"
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, c-format
 msgid "changing permissions of %s"
 msgstr "menia sa práva %s"
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr "%s: nové práva sú %s, nie %s"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1443,7 +1459,7 @@ msgstr ""
 "  or:  %s [VOĽBA]... OSMIČ-REŽIM SÚBOR...\n"
 "  or:  %s [VOĽBA]... --reference=RSÚBOR SÚBOR...\n"
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 msgid ""
 "Change the mode of each FILE to MODE.\n"
 "With --reference, change the mode of each FILE to that of RFILE.\n"
@@ -1453,15 +1469,15 @@ msgstr ""
 "S parametrom --reference zmení skupinu každého súboru na skupinu RSÚBORu.\n"
 "\n"
 
-#: src/chmod.c:391
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr "  -R, --recursive        rekurzívne prechádzať adresármi a súbormi\n"
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 msgid ""
 "\n"
 "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n"
@@ -1469,12 +1485,12 @@ msgstr ""
 "\n"
 "každý REŽIM je v tvare „[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+“.\n"
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr "nie je možné kombinovať voľby režimu a --reference"
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, c-format
 msgid "invalid mode: %s"
 msgstr "neplatný režim: %s"
@@ -1610,26 +1626,21 @@ msgid ""
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr "Roland McGrath"
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr "neplatná skupina %s"
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, c-format
 msgid "invalid group list %s"
 msgstr "neplatný zoznam skupín %s"
 
-#: src/chroot.c:117
-#, fuzzy, c-format
-msgid "failed to set additional groups"
-msgstr "nie je možné nastaviť �alšie skupiny"
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
@@ -1638,46 +1649,60 @@ msgstr ""
 "Použitie: %s NOV�KOREŇ [PR�KAZ...]\n"
 "  alebo:  %s VOĽBA\n"
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
 msgstr ""
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
 msgstr ""
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 msgid ""
 "\n"
 "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n"
 msgstr ""
 
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, c-format
 msgid "cannot change root directory to %s"
 msgstr "nie je možné zmeniť koreňový adresár na %s"
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, c-format
 msgid "cannot chdir to root directory"
 msgstr "nie je možné vojsť do koreňového adresára"
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr ""
+
+#: src/chroot.c:383
+#, fuzzy, c-format
+msgid "failed to get supplemental groups"
+msgstr "nie je možné nastaviť �alšie skupiny"
+
+#: src/chroot.c:395
+#, fuzzy, c-format
+msgid "failed to %s supplemental groups"
+msgstr "nie je možné nastaviť �alšie skupiny"
+
+#: src/chroot.c:402
 #, fuzzy, c-format
 msgid "failed to set group-ID"
 msgstr "nepodarilo sa nastaviť novú rolu %s"
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, fuzzy, c-format
 msgid "failed to set user-ID"
 msgstr "nepodarilo sa nastaviť nového používateľa %s"
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, fuzzy, c-format
 msgid "failed to run command %s"
 msgstr "nie je možné vykonať príkaz %s"
@@ -1709,7 +1734,7 @@ msgstr ""
 "Vypísať kontrolný sú�et CRC a po�et bajtov každého SÚBORu.\n"
 "\n"
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr "Použitie: %s [PREP�NAČ]... SÚBOR1 SÚBOR2\n"
@@ -1797,297 +1822,330 @@ msgstr "uvedených viacero oddeľova�ov"
 msgid "empty %s not allowed"
 msgstr ""
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr "chyba pri �ítaní %s"
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, c-format
 msgid "cannot lseek %s"
 msgstr "nie je možné vykonať lseek %s"
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr "chyba pri zápise %s"
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, fuzzy, c-format
 msgid "%s: failed to get extents info"
 msgstr "nepodarilo sa zistiť aktuálny kontext"
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, fuzzy, c-format
 msgid "%s: write failed"
 msgstr "chyba pri zápise"
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, fuzzy, c-format
 msgid "failed to extend %s"
 msgstr "nepodarilo sa otvoriť %s"
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, c-format
 msgid "clearing permissions for %s"
 msgstr "�istia sa oprávnenia %s"
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "nepodarilo sa zachovať vlastníctvo %s"
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
 msgstr "nepodarilo sa vyhľadať súbor %s"
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, c-format
 msgid "failed to preserve authorship for %s"
 msgstr "nepodarilo sa zachovať autorstvo %s"
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
+#, fuzzy, c-format
+msgid "failed to set default file creation context to %s"
+msgstr "zisťujem atribúty %s"
+
+#: src/copy.c:820
+#, fuzzy, c-format
+msgid "failed to set default file creation context for %s"
+msgstr "zisťujem atribúty %s"
+
+#: src/copy.c:846
+#, fuzzy, c-format
+msgid "failed to set the security context of %s"
+msgstr "nie je možné nastaviť bezpe�nostný kontext %s na %s"
+
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
 msgid "cannot open %s for reading"
 msgstr "nie je možné otvoriť %s pre �ítanie"
 
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, c-format
 msgid "cannot fstat %s"
 msgstr "nie je možné vykonať fstat %s"
 
-#: src/copy.c:820
+#: src/copy.c:935
 #, c-format
 msgid "skipping file %s, as it was replaced while being copied"
 msgstr "preskakuje sa súbor %s, ke�že bol nahradený po�as kopírovania"
 
-#: src/copy.c:850
-#, c-format
-msgid "failed to get file system create context"
-msgstr "nepodarilo sa získať kontext vytvorenia súborového systému"
-
-#: src/copy.c:864
-#, c-format
-msgid "failed to set the security context of %s to %s"
-msgstr "nie je možné nastaviť bezpe�nostný kontext %s na %s"
-
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
 msgid "cannot remove %s"
 msgstr "nie je možné odstrániť %s"
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
 msgstr "odstránené %s\n"
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr "nezapisuje sa prostredníctvom visiaceho symbolického odkazu %s"
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, c-format
 msgid "cannot create regular file %s"
 msgstr "nie je možné vytvoriť oby�ajný súbor %s"
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, fuzzy, c-format
 msgid "failed to clone %s from %s"
 msgstr "nie je možné zatvoriť adresár %s"
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr "zachovávam �asy %s"
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
 #, fuzzy, c-format
 msgid "failed to close %s"
 msgstr "nepodarilo sa otvoriť %s"
 
-#: src/copy.c:1471
+#: src/copy.c:1580
 #, fuzzy, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
 msgstr "%s: prepísať %s bez ohľadu na práva %04lo? "
 
-#: src/copy.c:1478
+#: src/copy.c:1581
+#, c-format
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr ""
+
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
 msgstr "%s: prepísať %s? "
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr "(záloha: %s)"
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr "nepodarilo sa obnoviť štandardný kontext vytvorenia súborového systému"
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, fuzzy, c-format
 msgid "cannot create hard link %s to %s"
 msgstr "nie je možné vytvoriť adresár %s"
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, c-format
 msgid "cannot stat %s"
 msgstr "nie je možné stat() %s"
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, c-format
 msgid "omitting directory %s"
 msgstr "vynecháva sa adresár %s"
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr "upozornenie: zdrojový súbor %s uvedený viac ako jedenkrát"
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
 msgstr "%s a %s predstavujú ten istý súbor"
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr "nie je možné prepísať súbor %s (ktorý nie je adresár) adresárom %s"
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr "nie je možné prepísať práve vytvorený %s súborom %s"
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr "nie je možné prepísať adresár %s súborom (ktorý nie je adresár)"
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr "nie je možné presunúť adresár %s na súbor %s (ktorý nie je adresár)"
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr "vytvorenie záložnej kópie %s by zni�ilo zdroj; %s nebol presunutý"
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr "vytvorenie záložnej kópie %s by zni�ilo zdroj; %s nebol skopírovaný"
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
 msgstr "nie je možné zálohovať %s"
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr ""
 "nie je možné skopírovať súbor %s práve vytvoreným symbolickým odkazom %s"
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, fuzzy, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr "nie je možné vytvoriť adresár %s"
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, fuzzy, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr "nie je možné vojsť do adresára, %s"
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, fuzzy, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr "nie je možné vojsť do adresára, %s"
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, fuzzy, c-format
 msgid "cannot move %s to %s"
 msgstr "ioctl na `%s' nie je možné vykonať"
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr ""
 "presunutie medzi zariadeniami zlyhalo: %s na %s; nepodarilo sa odstrániť cieľ"
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, fuzzy, c-format
-msgid "failed to set default file creation context to %s"
-msgstr "zisťujem atribúty %s"
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr "nie je možné skopírovať zacyklený symbolický odkaz %s"
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr ""
 "%s: relatívne symbolické odkazy je možné vytvoriť iba v aktuálnom adresári"
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, fuzzy, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr "nie je možné vytvoriť adresár %s"
 
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, fuzzy, c-format
 msgid "cannot create fifo %s"
 msgstr "nie je možné vytvoriť adresár %s"
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, fuzzy, c-format
 msgid "cannot create special file %s"
 msgstr "pozícia znaku je nula"
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, fuzzy, c-format
 msgid "cannot read symbolic link %s"
 msgstr "ioctl na `%s' nie je možné vykonať"
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, fuzzy, c-format
 msgid "cannot create symbolic link %s"
 msgstr "nie je možné vytvoriť adresár %s"
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
 msgstr "%s je neznámy typ souboru"
 
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, fuzzy, c-format
 msgid "cannot un-backup %s"
 msgstr "nie je možné spustiť %s"
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr "%s -> %s (obnovenie zálohy)\n"
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr ""
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr ""
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, fuzzy, c-format
+msgid "unknown program %s"
+msgstr "Neznáma systémová chyba"
+
+#: src/cp.c:157 src/mv.c:288
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -2098,14 +2156,14 @@ msgstr ""
 "  alebo:  %s [VOĽBA]... ZAČIATOK KONIEC\n"
 "  alebo:  %s [VOĽBA]... ZAČIATOK KROK LAST\n"
 
-#: src/cp.c:162
+#: src/cp.c:163
 #, fuzzy
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 "Skopírovať ZDROJ na CIEĽ alebo viacero CIEĽOV do ADRES�Ra.\n"
 "\n"
 
-#: src/cp.c:168
+#: src/cp.c:169
 #, fuzzy
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
@@ -2128,7 +2186,7 @@ msgstr ""
 "  -d                           rovnaké ako --no-dereference --"
 "preserve=links\n"
 
-#: src/cp.c:177
+#: src/cp.c:178
 #, fuzzy
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
@@ -2147,7 +2205,7 @@ msgstr ""
 "  -H                           nasledovať symbolické odkazy z príkazového "
 "riadka v ZDROJi\n"
 
-#: src/cp.c:186
+#: src/cp.c:187
 #, fuzzy
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
@@ -2156,7 +2214,7 @@ msgstr ""
 "  -l, --link                   odkazovať na súbory namiesto kopírovania\n"
 "  -L, --dereference            vždy nasledovať symbolické odkazy v ZDROJi\n"
 
-#: src/cp.c:190
+#: src/cp.c:191
 #, fuzzy
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
@@ -2169,7 +2227,7 @@ msgstr ""
 "  -H                           nasledovať symbolické odkazy z príkazového "
 "riadka v ZDROJi\n"
 
-#: src/cp.c:195
+#: src/cp.c:196
 #, fuzzy
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
@@ -2185,7 +2243,7 @@ msgstr ""
 "                                 mode,ownership,timestamps), ak je to možné\n"
 "                                 �alšie atribúty: context, links, all\n"
 
-#: src/cp.c:203
+#: src/cp.c:204
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                use full source file name under DIRECTORY\n"
@@ -2194,7 +2252,7 @@ msgstr ""
 "      --parents                použiť v ADRES�RI plný názov zdrojového "
 "súboru\n"
 
-#: src/cp.c:207
+#: src/cp.c:208
 #, fuzzy
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
@@ -2208,7 +2266,7 @@ msgstr ""
 "súboru\n"
 "                                 ho odstrániť (na rozdiel od --force)\n"
 
-#: src/cp.c:213
+#: src/cp.c:214
 #, fuzzy
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
@@ -2239,7 +2297,7 @@ msgstr ""
 "--sparse=never zabráni tvoreniu nesúvislých súborov.\n"
 "\n"
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -2248,7 +2306,7 @@ msgid ""
 "  -T, --no-target-directory    treat DEST as a normal file\n"
 msgstr ""
 
-#: src/cp.c:224
+#: src/cp.c:225
 #, fuzzy
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
@@ -2274,7 +2332,15 @@ msgstr ""
 "      --version                vypísať informáciu o verzii a skon�iť\n"
 "\n"
 
-#: src/cp.c:233
+#: src/cp.c:232
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/cp.c:240
 #, fuzzy
 msgid ""
 "\n"
@@ -2313,7 +2379,7 @@ msgstr ""
 "--sparse=never zabráni tvoreniu nesúvislých súborov.\n"
 "\n"
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 #, fuzzy
 msgid ""
 "\n"
@@ -2336,7 +2402,7 @@ msgstr ""
 "                  existujú, inak tvoriť jednoduché\n"
 "  simple, never   vždy tvoriť jednoduché záložné kópie súborov \n"
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2350,7 +2416,7 @@ msgstr ""
 "                  existujú, inak tvoriť jednoduché\n"
 "  simple, never   vždy tvoriť jednoduché záložné kópie súborov \n"
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2361,227 +2427,237 @@ msgstr ""
 "Ako špeciálny prípad, cp tvorí záložné kópie ZDROJa, pokiaľ sú zadané voľby\n"
 "force a backup a ZDROJ a CIEĽ sú rovnakým menom pre existujúci bežný súbor.\n"
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, c-format
 msgid "failed to preserve times for %s"
 msgstr "nie je možné zachovať �asy %s"
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, c-format
 msgid "failed to preserve permissions for %s"
 msgstr "nie je možné zachovať práva %s"
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, c-format
 msgid "cannot make directory %s"
 msgstr "nie je možné vytvoriť adresár %s"
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr "%s existuje, ale nie je adresárom"
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
 #, fuzzy, c-format
 msgid "failed to access %s"
 msgstr "nepodarilo sa otvoriť %s"
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, c-format
 msgid "missing file operand"
 msgstr "chýba operand súboru"
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, c-format
 msgid "missing destination file operand after %s"
 msgstr "chýba operand cieľového súboru po %s"
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, fuzzy, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr "Nie je možné kombinovať --target-directory a --no-target-directory"
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, c-format
 msgid "target %s is not a directory"
 msgstr "cieľ %s nie je adresárom"
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr "pri použití voľby --parents cieľ musí byť adresárom"
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, c-format
 msgid "multiple target directories specified"
 msgstr "boli uvedené viaceré cieľové adresáre"
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr ""
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr "nie je možné zároveň vytvoriť pevný a symbolický odkaz"
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, fuzzy, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr "prepína�e --string a --check sa vzájomne vylu�ujú"
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr ""
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr "typ zálohy"
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, c-format
+msgid "cannot set target context and preserve it"
+msgstr ""
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr ""
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr "Stuart Kemp"
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr "vstup sa stratil"
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr "%s: �íslo riadku je mimo rozsah"
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, c-format
 msgid "%s: %s: line number out of range"
 msgstr "%s: %s: �íslo riadka je mimo rozsahu"
 
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, c-format
 msgid " on repetition %s\n"
 msgstr " v opakovaní %s\n"
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, c-format
 msgid "%s: %s: match not found"
 msgstr "%s: %s: zhoda nenájdená"
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr "chyba pri vyhľadávaní pomocou regulárneho výrazu"
 
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, c-format
 msgid "write error for %s"
 msgstr "chyba pri zápise do %s"
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, c-format
 msgid "%s: integer expected after delimiter"
 msgstr "%s: po oddeľova�i sa o�akáva celé �íslo"
 
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, fuzzy, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr "%s: '}' je požadovaná v po�ítadle opakovaní"
 
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, fuzzy, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr "%s}: medzi `{' a `}' musí byť celé �íslo"
 
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, fuzzy, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr "%s: chýba koncový oddeľova� „%c“"
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr "%s: chybný regulárny výraz: %s"
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr "%s: chybný vzor"
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr "%s: �íslo riadku musí byť vä�šie ako nula"
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr "�íslo riadka %s je menšie ako �íslo predchádzajúceho riadka, %s"
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr ""
 "upozornenie: �íslo riadka %s je rovnaké ako �íslo predcházajúceho riadka"
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr "v parametri prepína�a chýba ur�enie typu konverzie"
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr "chybne zadaný typ konverzie v parametri prepína�a: %c"
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr "chybne zadaný typ konverzie v parametri prepína�a: \\%.3o"
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, fuzzy, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr "%s: chybne zadaná položka `%s'"
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr "príliš mnoho typov konverzie %% v parametri prepína�a"
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr "v parametri prepína�a chýba zadanie typu konverzie pomocou %%"
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr "%s: chybné �íslo"
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr "Použitie: %s [PREP�NAČ]... SÚBOR VZOROV...\n"
 
-#: src/csplit.c:1455
+#: src/csplit.c:1483
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
 "and output byte counts of each piece to standard output.\n"
 msgstr ""
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2589,20 +2665,24 @@ msgid ""
 "  -k, --keep-files           do not remove output files on errors\n"
 msgstr ""
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr ""
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
 "  -z, --elide-empty-files    remove empty output files\n"
 msgstr ""
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
 msgstr ""
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 msgid ""
 "\n"
 "  INTEGER            copy up to but not including specified line number\n"
@@ -2619,27 +2699,23 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr "David M. Ihnat"
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr ""
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr "Použitie: %s [VOĽBA]... [SÚBOR]...\n"
 
-#: src/cut.c:193
+#: src/cut.c:176
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr ""
 
-#: src/cut.c:199
+#: src/cut.c:182
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
 "  -c, --characters=LIST   select only these characters\n"
 "  -d, --delimiter=DELIM   use DELIM instead of TAB for field delimiter\n"
 msgstr ""
 
-#: src/cut.c:204
+#: src/cut.c:187
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
 "                            that contains no delimiter character, unless\n"
@@ -2647,20 +2723,20 @@ msgid ""
 "  -n                      (ignored)\n"
 msgstr ""
 
-#: src/cut.c:210
+#: src/cut.c:193
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
 "                            or fields\n"
 msgstr ""
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
 "                            the default is to use the input delimiter\n"
 msgstr ""
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2668,7 +2744,7 @@ msgid ""
 "in the same order that it is read, and is written exactly once.\n"
 msgstr ""
 
-#: src/cut.c:227
+#: src/cut.c:210
 msgid ""
 "Each range is one of:\n"
 "\n"
@@ -2680,50 +2756,54 @@ msgid ""
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
 
-#: src/cut.c:367 src/cut.c:493
+#: src/cut.c:300 src/cut.c:394
 #, fuzzy
 msgid "invalid byte, character or field list"
 msgstr "chybný zoznam bajtov alebo položiek"
 
-#: src/cut.c:387
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr ""
+
+#: src/cut.c:320
 #, fuzzy
 msgid "invalid range with no endpoint: -"
 msgstr "chybný typ reťazca `%s'"
 
-#: src/cut.c:403
+#: src/cut.c:334
 #, fuzzy
 msgid "invalid decreasing range"
 msgstr "neplatné �íslo"
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, fuzzy, c-format
 msgid "byte offset %s is too large"
 msgstr "%s je príliš veľa"
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, fuzzy, c-format
 msgid "field number %s is too large"
 msgstr "�íslo položky je nula"
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr "môže byť zadaný iba jeden typ zoznamu"
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr "oddeľova� musí byť jediný znak"
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr "musíte zadat zoznam bajtov, znakov alebo položiek"
 
-#: src/cut.c:850
+#: src/cut.c:790
 #, fuzzy
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr "oddeľova� môže byť zadaný iba pri práci s položkami"
 
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
@@ -2731,11 +2811,11 @@ msgstr ""
 "potla�enie riadkov neobsahujúcich oddeľova�, má význam iba\n"
 "\tpri použití pracuje s poľami"
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr "chýba zoznam položiek"
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr "chýba zoznam pozícií"
 
@@ -2777,7 +2857,7 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 
 #: src/date.c:158
@@ -2909,10 +2989,10 @@ msgid ""
 "  $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n"
 msgstr ""
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr "štandardný vstup"
@@ -2953,7 +3033,7 @@ msgstr ""
 msgid "cannot set date"
 msgstr "nie je možné nastaviť dátum"
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, c-format
 msgid "time %s is out of range"
 msgstr "�as %s je mino rozsahu"
@@ -2964,7 +3044,7 @@ msgstr "�as %s je mino rozsahu"
 msgid "Paul Rubin"
 msgstr "Paul Rubin"
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
@@ -2973,7 +3053,7 @@ msgstr ""
 "Použitie: %s [SÚBOR]...\n"
 " alebo:   %s [VOĽBA]\n"
 
-#: src/dd.c:526
+#: src/dd.c:532
 #, fuzzy
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
@@ -2993,7 +3073,7 @@ msgstr ""
 "  count=BLOKOV    skopírovať iba BLOKOV vstupných blokov\n"
 "  ibs=BAJTOV      �ítať BAJTOV bajtov naraz\n"
 
-#: src/dd.c:535
+#: src/dd.c:541
 #, fuzzy
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
@@ -3016,7 +3096,7 @@ msgstr ""
 "  skip=BLOKOV     presko�iť BLOKOV s veľkosťou ibs na za�iatku vstupu\n"
 "  status=noxfer   potla�iť výpis štatistiky prenosu\n"
 
-#: src/dd.c:546
+#: src/dd.c:552
 #, fuzzy
 msgid ""
 "\n"
@@ -3035,7 +3115,7 @@ msgstr ""
 "Každý symbol KONV môže byť:\n"
 "\n"
 
-#: src/dd.c:555
+#: src/dd.c:561
 #, fuzzy
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
@@ -3063,7 +3143,7 @@ msgstr ""
 "            ke� sa použije s block alebo unblock, vyplniť medzerami namiesto "
 "NULL\n"
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -3079,7 +3159,7 @@ msgstr ""
 "  fdatasync  pred ukon�ením fyzicky zapísať údaje\n"
 "  fsync     podobne, ale zapísať aj metadáta\n"
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -3093,77 +3173,77 @@ msgstr ""
 "  append    režim pridávania (zmysluplné iba pre výstup; navrhuje sa "
 "conv=notrunc)\n"
 
-#: src/dd.c:583
+#: src/dd.c:589
 #, fuzzy
 msgid "  cio       use concurrent I/O for data\n"
 msgstr "  text      použiť pre dáta textový V/V\n"
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr "  direct    použiť pre dáta priamy V/V\n"
 
-#: src/dd.c:587
+#: src/dd.c:593
 #, fuzzy
 msgid "  directory  fail unless a directory\n"
 msgstr "%s existuje, ale nie je adresárom"
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr "  dsync     použiť pre dáta synchronizovaný V/V\n"
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr "  sync      podobne, ale aj pre metadáta\n"
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr "  nonblock  použiť neblokoujúci V/V\n"
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr "  noatime   neaktualizovať �as posledného prístupu\n"
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr ""
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr "  noctty    neprira�ovať zo súboru riadiaci terminál\n"
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr "  nofollow  nenasledovať symbolické odkazy\n"
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr "  nolinks   skon�iť neúspešne pri viacnásobnom odkaze\n"
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr "  binary    použiť pre dáta binárny V/V\n"
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr "  text      použiť pre dáta textový V/V\n"
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr ""
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3193,7 +3273,17 @@ msgstr ""
 "Voľby sú:\n"
 "\n"
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
@@ -3202,14 +3292,14 @@ msgstr ""
 "%<PRIuMAX>+%<PRIuMAX> záznamov pre�ítaných\n"
 "%<PRIuMAX>+%<PRIuMAX> záznamov zapísaných\n"
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, fuzzy, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
 msgstr[0] "skrátený záznam"
 msgstr[1] "skrátený záznam"
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
@@ -3217,7 +3307,7 @@ msgstr[0] "%<PRIuMAX> byte (%s) copied"
 msgstr[1] "%<PRIuMAX> skopírované bajty (%s)"
 msgstr[2] "%<PRIuMAX> skopírovaných bajtov (%s)"
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr "nekone�no B"
 
@@ -3231,87 +3321,87 @@ msgstr "nekone�no B"
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
 msgstr ", %g s, %s/s\n"
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, fuzzy, c-format
 msgid "closing input file %s"
 msgstr "vytváram súbor `%s'\n"
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr "zatváram výstupný súbor %s"
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, fuzzy, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr "zmena skupiny %s na %s zlyhala\n"
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, c-format
 msgid "writing to %s"
 msgstr "zápis do %s"
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, c-format
 msgid "unrecognized operand %s"
 msgstr "neznámy operand %s"
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 #, fuzzy
 msgid "invalid conversion"
 msgstr "neplatná konverzia: %s"
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 #, fuzzy
 msgid "invalid input flag"
 msgstr "neplatný vstupný prepína�: %s"
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 #, fuzzy
 msgid "invalid output flag"
 msgstr "neplatný výstupný prepína�: %sneplatná skupina"
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 #, fuzzy
 msgid "invalid status flag"
 msgstr "neplatný stavový prepína�: %s"
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, c-format
 msgid "invalid number %s"
 msgstr "neplatné �íslo %s"
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr "nie je možné skombinovať dve z {ascii,ebcdic,ibm}"
 
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, c-format
 msgid "cannot combine block and unblock"
 msgstr "nie je možné skombinovať  block a unblock"
 
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, c-format
 msgid "cannot combine lcase and ucase"
 msgstr "nie je možné skombinovať lcase a ucase"
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, c-format
 msgid "cannot combine excl and nocreat"
 msgstr "nie je možné skombinovať excl a nocreat"
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, fuzzy, c-format
 msgid "cannot combine direct and nocache"
 msgstr "nie je možné skombinovať excl a nocreat"
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
@@ -3320,72 +3410,62 @@ msgstr ""
 "upozornenie: obchádza sa chyba jadra vo funkcii lseek v súbore (%s)\n"
 "  mt_type=0x%0lx -- pozri zoznam typov v <sys/mtio.h>"
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, fuzzy, c-format
 msgid "%s: cannot skip"
 msgstr "%s: nie je možné vyhľadať"
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, c-format
 msgid "%s: cannot seek"
 msgstr "%s: nie je možné vyhľadať"
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr "prete�enie pozície pri �ítaní súboru %s"
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr "upozornenie: chybný ofset v súbore po neúspešnom �ítaní"
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr "nakoniec nie je možné obísť chybu jadra"
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, c-format
 msgid "setting flags for %s"
 msgstr "nastavujem príznaky %s"
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, fuzzy, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr "nie je možné vytvoriť adresár %s"
 
-#: src/dd.c:2133
+#: src/dd.c:2172
 #, fuzzy, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
 msgstr "presúvam sa za %s bajtov vo výstupnom súbore %s"
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr "fdatasync zlyhalo na %s"
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
 msgstr "fsync zlyhalo na %s"
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, c-format
 msgid "failed to open %s"
 msgstr "nepodarilo sa otvoriť %s"
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
@@ -3394,96 +3474,105 @@ msgstr ""
 "hodnota pozície je príliš veľká: nie je možné skrátiť na dĺžku seek="
 "%<PRIuMAX> (%lu-bajtových) blokov"
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, fuzzy, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr "presúvam sa za %s bajtov vo výstupnom súbore %s"
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, fuzzy, c-format
 msgid "failed to discard cache for: %s"
 msgstr "zmena skupiny %s na %s zlyhala\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr "Paul Eggert"
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr "Súborový systém"
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr "Typ"
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr "bloky"
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr "Použ"
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr "Dostupné"
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr "Pou%"
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr "I-uzly"
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr "IPouž"
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr "IVoľ"
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr "IPou%"
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr "Pripojený na"
 
-#: src/df.c:383
-#, c-format
-msgid "option --output: field '%s' unknown"
+#: src/df.c:207
+msgid "File"
 msgstr ""
 
-#: src/df.c:390
+#: src/df.c:387
 #, fuzzy, c-format
-msgid "option --output: field '%s' used more than once"
+msgid "option --output: field %s unknown"
+msgstr "zatváram výstupný súbor %s"
+
+#: src/df.c:394
+#, fuzzy, c-format
+msgid "option --output: field %s used more than once"
 msgstr "upozornenie: zdrojový súbor %s uvedený viac ako jedenkrát"
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr "Veľk"
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr "Dost"
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr "Kapacita"
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
 msgstr ""
 
-#: src/df.c:1210
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr ""
+
+#: src/df.c:1384
 #, fuzzy
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
@@ -3493,17 +3582,18 @@ msgstr ""
 "alebo štandardne o všetkých súborových systémoch.\n"
 "\n"
 
-#: src/df.c:1217
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
 #, fuzzy
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
 "  -a, --all             vrátane �isto logických súborových systémov\n"
 "  -B, --block-size=VEĽ   použiť bloky s veľkosťou VEĽ\n"
@@ -3511,7 +3601,7 @@ msgstr ""
 "(napr., 1K 234M 2G)\n"
 "  -H, --si              podobne, ale používať násobky 1000, nie 1024\n"
 
-#: src/df.c:1227
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -3526,7 +3616,7 @@ msgstr ""
 "      --no-sync         nevyvolávať sync pred získaním informácií o využití "
 "(Å¡tandardne)\n"
 
-#: src/df.c:1234
+#: src/df.c:1409
 #, fuzzy
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
@@ -3547,43 +3637,34 @@ msgstr ""
 "nie sú typu TYP\n"
 "  -v                    (ignoruje sa)\n"
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
 
-#: src/df.c:1285
+#: src/df.c:1460
 #, fuzzy, c-format
 msgid "options %s and %s are mutually exclusive"
 msgstr "prepína�e --string a --check sa vzájomne vylu�ujú"
 
-#: src/df.c:1335
-#, fuzzy
-msgid "warning: "
-msgstr "Upozornenie: "
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr ""
-
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr "súborový systém %s je zároveň vybratý a vylú�ený"
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr "Upozornenie: "
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 #, fuzzy
 msgid "cannot read table of mounted file systems"
 msgstr "%snie je možné pre�ítať tabuľku pripojených súborových systémov"
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr "neboli spracované žiadne súborové systémy"
@@ -3593,7 +3674,7 @@ msgstr "neboli spracované žiadne súborové systémy"
 msgid "H. Peter Anvin"
 msgstr "H. Peter Anvin"
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr "Použitie: %s [PREP�NAČ]... [SÚBOR]...\n"
@@ -3687,7 +3768,7 @@ msgstr ""
 "  --version   vypísať informáciu o verzii a skon�iť\n"
 
 #: src/dirname.c:59
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/dirname.c:64
@@ -3700,7 +3781,7 @@ msgid ""
 "  %s stdio.h            -> \".\"\n"
 msgstr ""
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -3709,7 +3790,7 @@ msgstr ""
 "Použitie: %s [VOĽBA]... [SÚBOR]...\n"
 "  or:  %s [VOĽBA]... --files0-from=F\n"
 
-#: src/du.c:274
+#: src/du.c:285
 #, fuzzy
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr ""
@@ -3717,11 +3798,10 @@ msgstr ""
 "adresáre.\n"
 "\n"
 
-#: src/du.c:280
+#: src/du.c:291
 #, fuzzy
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3739,12 +3819,12 @@ msgstr ""
 "vnútornej\n"
 "                          fragmentácii, nepriamym blokom a podobne\n"
 
-#: src/du.c:289
+#: src/du.c:300
 #, fuzzy
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3762,15 +3842,16 @@ msgstr ""
 "uvedené\n"
 "                          na príkazovom riadku\n"
 
-#: src/du.c:302
+#: src/du.c:313
 #, fuzzy
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
 "      --files0-from=F   summarizovať využitie disku súbormi uvedenými\n"
 "                          v súbore s názvami ukon�eným znakmi NULL\n"
@@ -3781,7 +3862,7 @@ msgstr ""
 "(napr., 1K 234M 2G)\n"
 "      --si              ako -h, ale použiť násobky 1000, nie 1024\n"
 
-#: src/du.c:310
+#: src/du.c:322
 #, fuzzy
 msgid ""
 "  -k                    like --block-size=1K\n"
@@ -3793,12 +3874,13 @@ msgstr ""
 "  -l, --count-links     po�ítať veľkosť viacnásobne pri pevných odkazoch\n"
 "  -m                    ako --block-size=1M\n"
 
-#: src/du.c:316
+#: src/du.c:328
 #, fuzzy
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
@@ -3809,7 +3891,7 @@ msgstr ""
 "  -S, --separate-dirs   nevypisovať veľkosti podadresárov\n"
 "  -s, --summarize       zobraziť iba zhrnutie pre každý z argumentov\n"
 
-#: src/du.c:322
+#: src/du.c:334
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
 "                          or entries greater than SIZE if negative\n"
@@ -3818,80 +3900,80 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
 msgstr ""
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
 "  -x, --one-file-system    skip directories on different file systems\n"
 msgstr ""
 
-#: src/du.c:386
+#: src/du.c:398
 #, fuzzy
 msgid "Infinity"
 msgstr "nekone�no B"
 
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr ""
-
-#: src/du.c:624
+#: src/du.c:636
 #, fuzzy, c-format
 msgid "fts_read failed: %s"
 msgstr "fts_read zlyhalo"
 
-#: src/du.c:780
+#: src/du.c:787
 #, fuzzy, c-format
 msgid "invalid maximum depth %s"
 msgstr "chybné �íslo položky: `%s'"
 
-#: src/du.c:809
+#: src/du.c:816
 #, fuzzy, c-format
 msgid "invalid --threshold argument '-0'"
 msgstr "chybný argument %s pre `%s'"
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr "nie je možné sú�asne sumarizovať a vypisovať všetky položky"
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr "upozornenie: sumarizácia je to isté ako --max-depth=0"
 
-#: src/du.c:900
+#: src/du.c:911
 #, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr "upozornenie: sumarizácia je v konflikte s --max-depth=%lu"
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 #, fuzzy
 msgid "file operands cannot be combined with --files0-from"
 msgstr "Operandy súboru nie je možné kombinovať s --print-database (-p)."
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr "%s: chyba pri �ítaní"
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr ""
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 #, fuzzy
 msgid "invalid zero-length file name"
 msgstr "neplatná skupina"
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr "celkom"
 
@@ -3978,7 +4060,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
 "Nastaviť v prostredí každú PREMENNÚ na HODNOTU a spustiť PR�KAZ.\n"
@@ -4055,16 +4137,16 @@ msgid "input line is too long"
 msgstr "vstupný riadok je príliš dlhý"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr "Mike Parker"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr "James Youngman"
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
@@ -4073,7 +4155,7 @@ msgstr ""
 "Použitie: %s V�RAZ...\n"
 " alebo:   %s VOĽBA\n"
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -4084,7 +4166,7 @@ msgid ""
 "  ARG1 & ARG2       ARG1 if neither argument is null or 0, otherwise 0\n"
 msgstr ""
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -4095,14 +4177,14 @@ msgid ""
 "  ARG1 > ARG2       ARG1 is greater than ARG2\n"
 msgstr ""
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
 "  ARG1 - ARG2       arithmetic difference of ARG1 and ARG2\n"
 msgstr ""
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -4111,7 +4193,7 @@ msgid ""
 "  ARG1 % ARG2       arithmetic remainder of ARG1 divided by ARG2\n"
 msgstr ""
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -4122,7 +4204,7 @@ msgid ""
 "  length STRING              length of STRING\n"
 msgstr ""
 
-#: src/expr.c:251
+#: src/expr.c:250
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
 "                               keyword like 'match' or an operator like '/'\n"
@@ -4130,7 +4212,7 @@ msgid ""
 "  ( EXPRESSION )             value of EXPRESSION\n"
 msgstr ""
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -4146,7 +4228,7 @@ msgstr ""
 "reťazec; pokiaľ\n"
 "\\( a \\) nie sú použité, vracia po�et vyhovujúcich znakov alebo 0.\n"
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -4154,32 +4236,32 @@ msgid ""
 "or 0, 2 if EXPRESSION is syntactically invalid, and 3 if an error occurred.\n"
 msgstr ""
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, c-format
 msgid "syntax error"
 msgstr "syntaktická chyba"
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, c-format
 msgid "error in regular expression matcher"
 msgstr "chyba pri vyhľadávaní pomocou regulárneho výrazu"
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, fuzzy, c-format
 msgid "non-integer argument"
 msgstr "ne�íselný argument"
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr "delenie nulou"
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr "nastavením LC_ALL='C' obídete tento problém"
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, fuzzy, c-format
 msgid "the strings compared were %s and %s"
 msgstr "Porovnávané reťazce boli %s a %s."
@@ -4189,27 +4271,27 @@ msgstr "Porovnávané reťazce boli %s a %s."
 msgid "Niels Moller"
 msgstr ""
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
 msgstr ""
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
 msgstr ""
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, c-format
 msgid "%s is not a valid positive integer"
 msgstr "%s nie je platné kladné celé �íslo"
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr "%s je príliš veľa"
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
@@ -4218,7 +4300,7 @@ msgstr ""
 "Použitie: %s [Č�SLO]...\n"
 " alebo:   %s VOĽBA\n"
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 #, fuzzy
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
@@ -4318,28 +4400,28 @@ msgid "invalid number of columns: %s"
 msgstr "neplatný po�et stĺpcov: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr ""
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, fuzzy, c-format
 msgid "Usage: %s\n"
 msgstr "Použitie: %s [VOĽBA]\n"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
 msgstr ""
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, fuzzy, c-format
 msgid "failed to get groups for user %s"
 msgstr "zmena skupiny %s na %s zlyhala\n"
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, fuzzy, c-format
 msgid "failed to get groups for the current process"
 msgstr "zmena skupiny %s na %s zlyhala\n"
@@ -4361,22 +4443,22 @@ msgid ""
 "the current process (which may differ if the groups database has changed).\n"
 msgstr ""
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, fuzzy, c-format
 msgid "cannot get real UID"
 msgstr "nie je možné nastaviť ID používateľa"
 
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, fuzzy, c-format
 msgid "cannot get effective GID"
 msgstr "súbor sa nedá rozdeliť viacerými spôsobmi"
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, fuzzy, c-format
 msgid "cannot get real GID"
 msgstr "nie je možné nastaviť ID používateľa"
 
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, fuzzy, c-format
 msgid "%s: no such user"
 msgstr "%s: Používateľ neexistuje"
@@ -4426,59 +4508,49 @@ msgstr ""
 "Každý symbol KONV môže byť:\n"
 "\n"
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr ""
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, c-format
 msgid "%s: number of bytes is too large"
 msgstr "%s: po�et bajtov je príliš veľký"
 
-#: src/head.c:440
-#, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr ""
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr "%s: nie je možné presunúť sa na pozíciu %s"
 
-#: src/head.c:673
+#: src/head.c:423 src/tail.c:457
 #, fuzzy, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "%s: nepodarilo sa odstrániť"
-
-#: src/head.c:798
-#, c-format
-msgid "cannot reposition file pointer for %s"
-msgstr "nie je možné zmeniť pozíciu ukazovateľa v súbore %s"
+msgid "%s: cannot seek to relative offset %s"
+msgstr "nie je možné vytvoriť adresár %s"
 
 # src/tail.c:968
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr "%s: %s je príliš veľký, preto nie je reprezentovateľný"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr "po�et riadkov"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr "po�et bajtov"
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr "chybný po�et riadkov"
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr "chybný po�et bajtov"
 
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, c-format
 msgid "invalid trailing option -- %c"
 msgstr "chybná posledná voľba -- %c"
@@ -4529,28 +4601,34 @@ msgid "cannot determine hostname"
 msgstr "nie je možné zistiť názov systému"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr "Arnold Robbins"
 
-#: src/id.c:81
+#: src/id.c:84
 #, fuzzy, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
-msgstr "Použitie: %s [PREP�NAČ]... MNOŽINA1 [MNOŽINA2]\n"
+msgid "Usage: %s [OPTION]... [USER]\n"
+msgstr "Použitie: %s [PREP�NAČ]... [SÚBOR]...\n"
 
-#: src/id.c:82
-#, fuzzy
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
+msgstr ""
+
+#: src/id.c:90
+#, fuzzy
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
 msgstr ""
 "Vypísať informáciu o POUŽ�VATEĽOVI, alebo o aktuálnom používateľovi.\n"
 "\n"
@@ -4563,122 +4641,132 @@ msgstr ""
 "      --help      vypísať túto pomoc a skon�iť\n"
 "      --version   vypísať informáciu o verzii a skon�iť\n"
 
-#: src/id.c:96
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
 msgstr ""
 
-#: src/id.c:140
+#: src/id.c:151
+#, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr ""
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr ""
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr ""
 
-#: src/id.c:178
+#: src/id.c:198
 #, fuzzy, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr "súbor sa nedá rozdeliť viacerými spôsobmi"
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr "v implicitnom formáte nie je možné vypísať iba mená alebo reálne ID"
 
-#: src/id.c:199
+#: src/id.c:209
+#, fuzzy, c-format
+msgid "option --zero not permitted in default format"
+msgstr "v implicitnom formáte nie je možné vypísať iba mená alebo reálne ID"
+
+#: src/id.c:225
 #, fuzzy, c-format
 msgid "can't get process context"
 msgstr "nie je možné zistiť typ procesora"
 
-#: src/id.c:224
+#: src/id.c:265
 #, fuzzy, c-format
 msgid "cannot get effective UID"
 msgstr "súbor sa nedá rozdeliť viacerými spôsobmi"
 
-#: src/id.c:311
+#: src/id.c:354
 #, fuzzy, c-format
 msgid "cannot find name for user ID %s"
 msgstr "nie je možné zistiť meno pre ID používateľa %u\n"
 
-#: src/id.c:329
+#: src/id.c:372
 #, fuzzy, c-format
 msgid "uid=%s"
 msgstr "uid=%lu"
 
-#: src/id.c:334
+#: src/id.c:377
 #, fuzzy, c-format
 msgid " gid=%s"
 msgstr " gid=%lu"
 
-#: src/id.c:341
+#: src/id.c:384
 #, fuzzy, c-format
 msgid " euid=%s"
 msgstr " euid=%lu"
 
-#: src/id.c:349
+#: src/id.c:392
 #, fuzzy, c-format
 msgid " egid=%s"
 msgstr " egid=%lu"
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr " skupiny="
 
-#: src/id.c:393
+#: src/id.c:437
 #, fuzzy, c-format
 msgid " context=%s"
 msgstr "neplatný kontexxt: %s"
 
-#: src/install.c:373
+#: src/install.c:376
 #, fuzzy, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr "nie je možné vytvoriť adresár %s"
 
-#: src/install.c:414
+#: src/install.c:417
 #, c-format
 msgid "creating directory %s"
 msgstr "vytvára sa adresár %s"
 
-#: src/install.c:482
+#: src/install.c:485
 #, fuzzy, c-format
 msgid "cannot change ownership of %s"
 msgstr "nie je možné zmeniť práva %s"
 
-#: src/install.c:506
+#: src/install.c:509
 #, fuzzy, c-format
 msgid "cannot set time stamps for %s"
 msgstr "nie je možné vytvoriť adresár %s"
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, fuzzy, c-format
 msgid "fork system call failed"
 msgstr "veľkosť bloku"
 
-#: src/install.c:531
+#: src/install.c:535
 #, fuzzy, c-format
 msgid "cannot run %s"
 msgstr "nie je možné spustiť %s"
 
-#: src/install.c:535
+#: src/install.c:539
 #, fuzzy, c-format
 msgid "waiting for strip"
 msgstr "chyba pri zápise %s"
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr ""
 
-#: src/install.c:558
+#: src/install.c:565
 #, c-format
 msgid "invalid user %s"
 msgstr "neplatný používateľ %s"
 
-#: src/install.c:594
+#: src/install.c:601
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -4690,7 +4778,7 @@ msgstr ""
 "  alebo:  %s [VOĽBA]... ZAČIATOK KONIEC\n"
 "  alebo:  %s [VOĽBA]... ZAČIATOK KROK LAST\n"
 
-#: src/install.c:601
+#: src/install.c:608
 msgid ""
 "\n"
 "This install program copies files (often just compiled) into destination\n"
@@ -4704,7 +4792,7 @@ msgid ""
 "In the 4th form, create all components of the given DIRECTORY(ies).\n"
 msgstr ""
 
-#: src/install.c:615
+#: src/install.c:622
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
 "  -b                  like --backup but does not accept an argument\n"
@@ -4716,7 +4804,7 @@ msgid ""
 "                        components of the specified directories\n"
 msgstr ""
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -4728,7 +4816,7 @@ msgid ""
 "  -o, --owner=OWNER   set ownership (super-user only)\n"
 msgstr ""
 
-#: src/install.c:631
+#: src/install.c:638
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
 "files\n"
@@ -4742,62 +4830,59 @@ msgid ""
 "  -v, --verbose       print the name of each directory as it is created\n"
 msgstr ""
 
-#: src/install.c:641
+#: src/install.c:648
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
 
-#: src/install.c:859
+#: src/install.c:696 src/unlink.c:86
 #, c-format
-msgid ""
-"WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
-msgstr ""
+msgid "cannot unlink %s"
+msgstr "nie je možné odpojiť (unlink) %s"
 
-#: src/install.c:869
+#: src/install.c:877
 #, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
+msgid ""
+"WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
 msgstr ""
 
-#: src/install.c:886
+#: src/install.c:917
 #, fuzzy, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr ""
 "formátovací reťazec nemôže byť použitý, pokiaľ je požadovaná rovnaká šírka"
 
-#: src/install.c:889
+#: src/install.c:920
 #, fuzzy, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr ""
 "formátovací reťazec nemôže byť použitý, pokiaľ je požadovaná rovnaká šírka"
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr ""
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, fuzzy, c-format
 msgid "invalid mode %s"
 msgstr "chybné �íslo položky: `%s'"
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr ""
 
-#: src/install.c:959
+#: src/install.c:1001
 #, fuzzy, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr "prepína�e --string a --check sa vzájomne vylu�ujú"
 
-#: src/install.c:966
+#: src/install.c:1008
 #, fuzzy, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr "prepína�e --string a --check sa vzájomne vylu�ujú"
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -4809,7 +4894,7 @@ msgstr ""
 msgid "Mike Haertel"
 msgstr "Mike Haertel"
 
-#: src/join.c:191
+#: src/join.c:195
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
 "standard output.  The default join field is the first, delimited\n"
@@ -4820,7 +4905,7 @@ msgid ""
 "  -e EMPTY          replace missing input fields with EMPTY\n"
 msgstr ""
 
-#: src/join.c:200
+#: src/join.c:204
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
 "  -j FIELD          equivalent to '-1 FIELD -2 FIELD'\n"
@@ -4828,7 +4913,7 @@ msgid ""
 "  -t CHAR           use CHAR as input and output field separator\n"
 msgstr ""
 
-#: src/join.c:206
+#: src/join.c:210
 #, fuzzy
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
@@ -4852,7 +4937,11 @@ msgstr ""
 "      --help      vypíše tuto nápovedu a skon�í\n"
 "      --version   vypíše ozna�enie verzie a skon�í\n"
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr ""
+
+#: src/join.c:225
 msgid ""
 "\n"
 "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n"
@@ -4871,47 +4960,47 @@ msgid ""
 "warning message will be given.\n"
 msgstr ""
 
-#: src/join.c:403
+#: src/join.c:410
 #, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
 msgstr ""
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, fuzzy, c-format
 msgid "invalid field number: %s"
 msgstr "chybné �íslo položky: `%s'"
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, fuzzy, c-format
 msgid "invalid field specifier: %s"
 msgstr "chybne zadaná položka: `%s'"
 
-#: src/join.c:877
+#: src/join.c:884
 #, fuzzy, c-format
 msgid "invalid file number in field spec: %s"
 msgstr "chybné �íslo súboru v popise položky: `%s'"
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr ""
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr ""
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, fuzzy, c-format
 msgid "multi-character tab %s"
 msgstr "viacznakový tabulátor `%s'"
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr "nekompatibilné tabulátory"
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr "obidva súbory nemôžu byť štandardným vstupom"
@@ -5033,47 +5122,47 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr "nie je možné vytvoriť odkaz z %s na %s"
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr "%s: na adresár nie je povolený pevný odkaz"
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, c-format
 msgid "%s: cannot overwrite directory"
 msgstr "%s: nie je možné prepísať adresár"
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
 msgstr "%s: prepísať %s? "
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, fuzzy, c-format
 msgid "failed to create symbolic link %s"
 msgstr "nie je možné vytvoriť adresár %s"
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, fuzzy, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr "nie je možné vytvoriť adresár %s"
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, fuzzy, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr "vytvára sa pevný odkaz na %.0s%s"
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, fuzzy, c-format
 msgid "failed to create hard link %s"
 msgstr "nie je možné vytvoriť adresár %s"
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, fuzzy, c-format
 msgid "failed to create hard link %s => %s"
 msgstr "nie je možné vytvoriť adresár %s"
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -5086,7 +5175,7 @@ msgstr ""
 "   alebo: %s [VOĽBA]... ZDROJ... ADRES�R         (3. tvar)\n"
 "   alebo: %s [VOĽBA]... -t ADRES�R CIEĽ...       (4. tvar)\n"
 
-#: src/ln.c:381
+#: src/ln.c:398
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
 "In the 2nd form, create a link to TARGET in the current directory.\n"
@@ -5098,7 +5187,7 @@ msgid ""
 "interpreted in relation to its parent directory.\n"
 msgstr ""
 
-#: src/ln.c:394
+#: src/ln.c:411
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
 "file\n"
@@ -5111,7 +5200,7 @@ msgid ""
 "  -f, --force                 remove existing destination files\n"
 msgstr ""
 
-#: src/ln.c:402
+#: src/ln.c:419
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
 "  -L, --logical               dereference TARGETs that are symbolic links\n"
@@ -5123,7 +5212,7 @@ msgid ""
 "  -s, --symbolic              make symbolic links instead of hard links\n"
 msgstr ""
 
-#: src/ln.c:411
+#: src/ln.c:428
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
 "  -t, --target-directory=DIRECTORY  specify the DIRECTORY in which to "
@@ -5133,7 +5222,7 @@ msgid ""
 "  -v, --verbose               print name of each linked file\n"
 msgstr ""
 
-#: src/ln.c:433
+#: src/ln.c:450
 #, c-format
 msgid ""
 "\n"
@@ -5141,12 +5230,12 @@ msgid ""
 "behavior when a TARGET is a symbolic link, defaulting to %s.\n"
 msgstr ""
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, fuzzy, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr "Nie je možné kombinovať --target-directory a --no-target-directory"
 
-#: src/ln.c:588
+#: src/ln.c:605
 #, fuzzy, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr "nie je možné vytvoriť adresár %s"
@@ -5177,7 +5266,7 @@ msgstr "žiadne prihlasovacie meno"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
@@ -5186,102 +5275,102 @@ msgstr "%b %e  %Y"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 msgid "%b %e %H:%M"
 msgstr "%b %e %H:%M"
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr "ignoruje sa neplatná hodnota premennej prostredia QUOTING_STYLE: %s"
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr "ignorujem chybnú šírku v premennej prostredia COLUMNS: %s"
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr ""
 "ignorujem chybný rozostup tabulátorov v premennej prostredia TABSIZE: %s"
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, c-format
 msgid "invalid line width: %s"
 msgstr "neplatná šírka riadka: %s"
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, c-format
 msgid "invalid tab size: %s"
 msgstr "neplatná veľkosť tabulátora: %s"
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, c-format
 msgid "invalid time style format %s"
 msgstr "neplatný formát �asu: %s"
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 #, fuzzy
 msgid "Valid arguments are:\n"
 msgstr "Platné argumenty sú:"
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr ""
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr ""
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, c-format
 msgid "unrecognized prefix: %s"
 msgstr "neznáma predpona: %s"
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr "nezrozumiteľná hodnota v premennej prostredia LS_COLORS"
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, c-format
 msgid "cannot open directory %s"
 msgstr "nie je možné otvoriť adresár %s"
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, c-format
 msgid "cannot determine device and inode of %s"
 msgstr "nie je možné ur�iť zariadenie a inode pre %s"
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, c-format
 msgid "%s: not listing already-listed directory"
 msgstr "%s: nevypisuje sa už vypísaný adresár"
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, c-format
 msgid "reading directory %s"
 msgstr "�íta sa adresár %s"
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, c-format
 msgid "closing directory %s"
 msgstr "zatvíra sa adresár %s"
 
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, c-format
 msgid "cannot compare file names %s and %s"
 msgstr "nie je možné porovnať názvy súborov %s a %s"
 
-#: src/ls.c:4721
+#: src/ls.c:4781
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
 "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n"
 msgstr ""
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
 "  -A, --almost-all           do not list implied . and ..\n"
@@ -5290,33 +5379,32 @@ msgid ""
 "characters\n"
 msgstr ""
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
 "  -F, --classify             append indicator (one of */=>@|) to entries\n"
@@ -5326,40 +5414,41 @@ msgid ""
 "      --full-time            like -l --time-style=full-iso\n"
 msgstr ""
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr ""
 
-#: src/ls.c:4763
+#: src/ls.c:4823
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 
-#: src/ls.c:4769
+#: src/ls.c:4829
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
 
-#: src/ls.c:4775
+#: src/ls.c:4835
 msgid ""
 "  -H, --dereference-command-line\n"
 "                             follow symbolic links listed on the command "
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
 msgstr ""
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
 "names:\n"
@@ -5368,10 +5457,10 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -5381,7 +5470,7 @@ msgid ""
 "entries\n"
 msgstr ""
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -5392,12 +5481,12 @@ msgid ""
 "                             append / indicator to directories\n"
 msgstr ""
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 #, fuzzy
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -5437,7 +5526,7 @@ msgstr ""
 "  -R, --recursive            vypísať adresáre rekurzívne\n"
 "  -s, --size                 vypísať veľkosť každého súboru v blokoch\n"
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 #, fuzzy
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
@@ -5446,56 +5535,59 @@ msgid ""
 "blocks\n"
 msgstr "  -R, --recursive            vypíše adresáre rekurzívne\n"
 
-#: src/ls.c:4825
+#: src/ls.c:4886
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 
-#: src/ls.c:4835
+#: src/ls.c:4896
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
 msgstr ""
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 msgid ""
 "  -t                         sort by modification time, newest first\n"
 "  -T, --tabsize=COLS         assume tab stops at each COLS instead of 8\n"
 msgstr ""
 
-#: src/ls.c:4848
+#: src/ls.c:4912
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
 msgstr ""
 
-#: src/ls.c:4855
+#: src/ls.c:4919
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -5504,7 +5596,7 @@ msgid ""
 "variable can change the settings.  Use the dircolors command to set it.\n"
 msgstr ""
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -5575,19 +5667,16 @@ msgstr "  -b, --binary            �ítať v binárnom režime\n"
 #: src/md5sum.c:195
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, c-format
 msgid ""
 "\n"
@@ -5597,35 +5686,35 @@ msgid ""
 "space for text), and name for each FILE.\n"
 msgstr ""
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, fuzzy, c-format
 msgid "%s: too many checksum lines"
 msgstr "%s: nenájdené správne sformátované riadky %s kontrolného sú�tu"
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, fuzzy, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr "%s: %lu: nesprávne sformátovaný riadok %s kontrolného sú�tu"
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr "%s: ZLYHALO otvorenie alebo �ítanie\n"
 
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr "CHYBN�"
 
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr "V PORIADKU"
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr "%s: nenájdené správne sformátované riadky %s kontrolného sú�tu"
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, fuzzy, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
@@ -5633,7 +5722,7 @@ msgstr[0] "%s: %lu: nesprávne sformátovaný riadok %s kontrolného sú�tu"
 msgstr[1] "%s: %lu: nesprávne sformátovaný riadok %s kontrolného sú�tu"
 msgstr[2] "%s: %lu: nesprávne sformátovaný riadok %s kontrolného sú�tu"
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
@@ -5641,7 +5730,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
@@ -5649,60 +5738,58 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
 msgstr ""
 
-#: src/md5sum.c:766
+#: src/md5sum.c:770
 #, fuzzy, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr "prepína� --status má význam iba pri overovaní kontrolných sú�tov"
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
 msgstr ""
 "prepína�e --binary a --text sú bezvýznamné pri overovaní kontrolných sú�tov"
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr "prepína� --status má význam iba pri overovaní kontrolných sú�tov"
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr "prepína� --warn má význam iba pri overovaní kontrolných sú�tov"
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, fuzzy, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr "prepína� --status má význam iba pri overovaní kontrolných sú�tov"
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, fuzzy, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr "prepína� --status má význam iba pri overovaní kontrolných sú�tov"
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr "Použitie: %s [VOĽBA... ADRES�R...\n"
 
-#: src/mkdir.c:57
+#: src/mkdir.c:59
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
 msgstr ""
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
 #, fuzzy
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 "  -m, --mode=PR�VA  nastaviť prístupové práva (ako s 'chmod'), nie rwxrwxrwx "
 "-\n"
@@ -5711,21 +5798,46 @@ msgstr ""
 "                    pokiaľ je to potrebné.\n"
 "  -v, --verbose     vypísať správu o každom vytváranom adresári\n"
 
-#: src/mkdir.c:168
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/mkdir.c:127 src/mkdir.c:172
+#, fuzzy, c-format
+msgid "failed to set default creation context for %s"
+msgstr "zisťujem atribúty %s"
+
+#: src/mkdir.c:191
+#, fuzzy, c-format
+msgid "failed to restore context for %s"
+msgstr "nie je možné zachovať �asy %s"
+
+#: src/mkdir.c:231
 #, c-format
 msgid "created directory %s"
 msgstr "bol vytvorený adresár %s"
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr ""
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr "Použitie: %s [VOĽBA]... N�ZOV...\n"
 
-#: src/mkfifo.c:52
+#: src/mkfifo.c:54
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
 msgstr ""
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 #, fuzzy
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
@@ -5733,35 +5845,38 @@ msgstr ""
 "  -m, --mode=PR�VA  nastaviť prístupové PR�VA (ako s „chmod“), nie a=rw - "
 "umask\n"
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, c-format
 msgid "invalid mode"
 msgstr "neplatný režim"
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr ""
 
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
+#, fuzzy, c-format
+msgid "cannot set permissions of %s"
+msgstr "nie je možné zmeniť práva %s"
+
+#: src/mknod.c:54
 #, c-format
 msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr "Použitie: %s [VOĽBA]... N�ZOV TYP [HLAVNÉ VEDĽAJŠIE]\n"
 
-#: src/mknod.c:54
+#: src/mknod.c:56
 msgid "Create the special file NAME of the given TYPE.\n"
 msgstr ""
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr ""
-
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -5770,7 +5885,7 @@ msgid ""
 "otherwise, as decimal.  TYPE may be:\n"
 msgstr ""
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 msgid ""
 "\n"
 "  b      create a block (buffered) special file\n"
@@ -5782,153 +5897,147 @@ msgstr ""
 "  c, u   vytvoriť znakový špeciálny súbor (bez bufera)\n"
 "  p      vytvoriť rúru (FIFO)\n"
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 msgid "Special files require major and minor device numbers."
 msgstr ""
 "Pri vytváraní špeciálneho blokového súboru musí byť zadané\n"
 "hlavné a vedľajšie �íslo zariadenia."
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 msgid "Fifos do not have major and minor device numbers."
 msgstr "FIFO nemajú hlavné a vedľajšie �ísla zariadenia."
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, c-format
 msgid "block special files not supported"
 msgstr "špeciálne blokové súbory nie sú podporované"
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, c-format
 msgid "character special files not supported"
 msgstr "špeciálne znakové súbory nie sú podporované"
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, c-format
 msgid "invalid major device number %s"
 msgstr "neplatné hlavné �íslo zariadenia %s"
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, c-format
 msgid "invalid minor device number %s"
 msgstr "neplatné vedľajšie �íslo zariadenia %s"
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, c-format
 msgid "invalid device %s %s"
 msgstr "neplatné zariadenie %s %s"
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, c-format
 msgid "invalid device type %s"
 msgstr "neplatný typ zariadenia %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr ""
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr "Použitie: %s [VOĽBA]... [ŠABLÓNA]...\n"
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
 "TEMPLATE must contain at least 3 consecutive 'X's in last component.\n"
 "If TEMPLATE is not specified, use tmp.XXXXXXXXXX, and --tmpdir is implied.\n"
 msgstr ""
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
 "  -q, --quiet         suppress diagnostics about file/dir-creation failure\n"
 msgstr ""
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
 msgstr ""
 
-#: src/mktemp.c:223
-#, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr ""
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, c-format
 msgid "too many templates"
 msgstr "príliš veľa šablón"
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr ""
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr ""
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr ""
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr ""
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr ""
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, c-format
 msgid "failed to create directory via template %s"
 msgstr "nie je možné vytvoriť adresár prostredníctvom šablóny %s"
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, c-format
 msgid "failed to create file via template %s"
 msgstr "nepodarilo sa vytvoriť súbor prostredníctvom šablóny %s"
 
-#: src/mv.c:292
+#: src/mv.c:294
 #, fuzzy
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 "Skopírovať ZDROJ na CIEĽ alebo viacero CIEĽOV do ADRES�Ra.\n"
 "\n"
 
-#: src/mv.c:298
+#: src/mv.c:300
 #, fuzzy
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
@@ -5950,7 +6059,7 @@ msgstr ""
 "  -d                           rovnaké ako --no-dereference --"
 "preserve=links\n"
 
-#: src/mv.c:307
+#: src/mv.c:309
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
@@ -5958,7 +6067,8 @@ msgid ""
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
 msgstr ""
 
-#: src/mv.c:312
+#: src/mv.c:314
+#, fuzzy
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
 "DIRECTORY\n"
@@ -5967,6 +6077,8 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
 "  -t, --target-directory=ADR   presunúť všetky ZDROJe do ADResára\n"
 "  -T, --no-target-directory    považovať CIEĽ za bežný súbor\n"
@@ -6220,95 +6332,90 @@ msgid "%s: invalid number to ignore"
 msgstr "%s: chybný po�et riadkov"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
 msgstr ""
 
-#: src/numfmt.c:676
+#: src/numfmt.c:659
 #, fuzzy, c-format
-msgid "value too large to be converted: '%s'"
+msgid "value too large to be converted: %s"
 msgstr "%s: hodnota nebola úplne prevedená"
 
-#: src/numfmt.c:680
+#: src/numfmt.c:663
 #, fuzzy, c-format
-msgid "invalid number: '%s'"
+msgid "invalid number: %s"
 msgstr "neplatné �íslo %s"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
+msgid "rejecting suffix in input: %s (consider using --from)"
 msgstr ""
 
-#: src/numfmt.c:688
+#: src/numfmt.c:671
 #, fuzzy, c-format
-msgid "invalid suffix in input: '%s'"
+msgid "invalid suffix in input: %s"
 msgstr "naplatná prípona v argumente %s%s „%s“"
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
 msgstr ""
 
-#: src/numfmt.c:723
+#: src/numfmt.c:722 src/numfmt.c:768
 #, fuzzy, c-format
 msgid "failed to prepare value '%Lf' for printing"
 msgstr "%s: nepodarilo sa otvoriť na zápis"
 
-#: src/numfmt.c:787
+#: src/numfmt.c:791
 #, fuzzy, c-format
-msgid "invalid unit size: '%s'"
+msgid "invalid unit size: %s"
 msgstr "neplatná veľkosť tabulátora: %s"
 
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
-#, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr ""
-
-#: src/numfmt.c:813
+#: src/numfmt.c:814
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
 msgstr "Použitie: %s [PREP�NAČ]... [SÚBOR]...\n"
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
 msgstr ""
 
-#: src/numfmt.c:820
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
 msgstr ""
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
 msgstr ""
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
 "                         see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr ""
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
@@ -6316,19 +6423,19 @@ msgid ""
 "locale)\n"
 msgstr ""
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
 msgstr ""
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
 msgstr ""
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -6338,40 +6445,40 @@ msgid ""
 "                         is found\n"
 msgstr ""
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
 "nearest\n"
 msgstr ""
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
 msgstr ""
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr ""
 
-#: src/numfmt.c:877
+#: src/numfmt.c:878
 msgid ""
 "\n"
 "UNIT options:\n"
 msgstr ""
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr ""
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -6380,7 +6487,7 @@ msgid ""
 "               1Mi = 1048576,\n"
 msgstr ""
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
@@ -6388,7 +6495,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
@@ -6396,7 +6503,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
@@ -6404,18 +6511,18 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:905
+#: src/numfmt.c:906
 #, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -6427,7 +6534,7 @@ msgid ""
 "errors are not diagnosed and the exit status is 0.\n"
 msgstr ""
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -6448,112 +6555,112 @@ msgid ""
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 msgstr ""
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, fuzzy, c-format
 msgid "format %s has no %% directive"
 msgstr "cieľ %s nie je adresárom"
 
-#: src/numfmt.c:990
+#: src/numfmt.c:1003
 #, fuzzy, c-format
 msgid "invalid format %s (width overflow)"
 msgstr "neplatná šírka vo formáte"
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr ""
+
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr ""
 
-#: src/numfmt.c:1010
+#: src/numfmt.c:1030
 #, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
 msgstr ""
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr ""
 
-#: src/numfmt.c:1070
+#: src/numfmt.c:1081
 #, fuzzy, c-format
-msgid "invalid suffix in input '%s': '%s'"
+msgid "invalid suffix in input %s: %s"
 msgstr "naplatná prípona v argumente %s%s „%s“"
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
 msgstr ""
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
 msgstr ""
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
+msgid "large input value %s: possible precision loss"
 msgstr ""
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
 
-#: src/numfmt.c:1388
+#: src/numfmt.c:1403
 #, fuzzy, c-format
-msgid "invalid padding value '%s'"
+msgid "invalid padding value %s"
 msgstr "chybný rozsah stránok %s"
 
-#: src/numfmt.c:1401
+#: src/numfmt.c:1417
 #, fuzzy, c-format
-msgid "invalid field value '%s'"
+msgid "invalid field value %s"
 msgstr "chybné �íslo položky: `%s'"
 
-#: src/numfmt.c:1430
+#: src/numfmt.c:1447
 #, fuzzy, c-format
-msgid "invalid header value '%s'"
+msgid "invalid header value %s"
 msgstr "neplatný dátum %s"
 
-#: src/numfmt.c:1456
+#: src/numfmt.c:1473
 #, fuzzy, c-format
 msgid "--grouping cannot be combined with --format"
 msgstr "Operandy súboru nie je možné kombinovať s --print-database (-p)."
 
-#: src/numfmt.c:1458
-#, fuzzy, c-format
-msgid "--padding cannot be combined with --format"
-msgstr "Operandy súboru nie je možné kombinovať s --print-database (-p)."
-
-#: src/numfmt.c:1463
+#: src/numfmt.c:1478
 #, fuzzy, c-format
 msgid "no conversion option specified"
 msgstr "uvedených viacero volieb -i"
 
-#: src/numfmt.c:1471
+#: src/numfmt.c:1486
 #, fuzzy, c-format
 msgid "grouping cannot be combined with --to"
 msgstr "Operandy súboru nie je možné kombinovať s --print-database (-p)."
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
 msgstr ""
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
 msgstr ""
 
-#: src/numfmt.c:1511
+#: src/numfmt.c:1526
 #, fuzzy, c-format
 msgid "error reading input"
 msgstr "chyba pri �ítaní %s"
 
-#: src/numfmt.c:1520
+#: src/numfmt.c:1535
 #, fuzzy, c-format
 msgid "failed to convert some of the input numbers"
 msgstr "obidva súbory nemôžu byť štandardným vstupom"
 
-#: src/od.c:294
+#: src/od.c:320
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -6566,7 +6673,7 @@ msgstr ""
 "  alebo:  %s --traditional [VOĽBA]... [SÚBOR] [[+]POSUN[.][b] [+][N�VESTIE]"
 "[.][b]]\n"
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -6576,7 +6683,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/od.c:307
+#: src/od.c:333
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
 "if the last operand begins with + or (if there are 2 operands) a digit.\n"
@@ -6586,38 +6693,40 @@ msgid ""
 "suffixes may be . for octal and b for multiply by 512.\n"
 msgstr ""
 
-#: src/od.c:318
+#: src/od.c:344
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
 
-#: src/od.c:323
+#: src/od.c:350
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
 
-#: src/od.c:336
+#: src/od.c:363
 msgid ""
 "\n"
 "\n"
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 
-#: src/od.c:345
+#: src/od.c:372
 msgid ""
 "  -f   same as -t fF, select floats\n"
 "  -i   same as -t dI, select decimal ints\n"
@@ -6627,16 +6736,16 @@ msgid ""
 "  -x   same as -t x2, select hexadecimal 2-byte units\n"
 msgstr ""
 
-#: src/od.c:353
+#: src/od.c:380
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -6645,7 +6754,7 @@ msgid ""
 "  x[SIZE]    hexadecimal, SIZE bytes per integer\n"
 msgstr ""
 
-#: src/od.c:367
+#: src/od.c:394
 msgid ""
 "\n"
 "SIZE is a number.  For TYPE in [doux], SIZE may also be C for\n"
@@ -6654,14 +6763,14 @@ msgid ""
 "for sizeof(double) or L for sizeof(long double).\n"
 msgstr ""
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
 "each output line.\n"
 msgstr ""
 
-#: src/od.c:379
+#: src/od.c:406
 #, fuzzy
 msgid ""
 "\n"
@@ -6682,12 +6791,12 @@ msgstr ""
 "Každý symbol KONV môže byť:\n"
 "\n"
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, c-format
 msgid "invalid type string %s"
 msgstr "neplatný reťazec typu %s"
 
-#: src/od.c:649
+#: src/od.c:690
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -6696,7 +6805,7 @@ msgstr ""
 "neplatný reťazec typu %s;\n"
 "tento systém neposkytuje %lu-bajtové celé �ísla"
 
-#: src/od.c:770
+#: src/od.c:811
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -6706,38 +6815,38 @@ msgstr ""
 "tento systém neposkytuje %lu-bajtové �ísla s plávajúcou desatinnou\n"
 "�iarkou"
 
-#: src/od.c:828
+#: src/od.c:869
 #, fuzzy, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr "neplatný znak „%c“ v reťazci typu „%s“"
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr "nemožno presko�iť koniec kombinovaného vstupu"
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, fuzzy, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr ""
 "chybný základ výstupnej adresy `%c'; musí to byť jeden zo znakov [doxn]"
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr "pri vypisovaní reťazcov nemožno zadať typ"
 
-#: src/od.c:1810
+#: src/od.c:1863
 #, fuzzy
 msgid "compatibility mode supports at most one file"
 msgstr "V kompatibilnom režime je podporovaný najviac jeden súbor."
 
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr ""
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr "upozornenie: chybná šírka %lu; namiesto nej sa použije %d"
@@ -6893,12 +7002,12 @@ msgstr "Kedy"
 msgid "Where"
 msgstr "Kde  "
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr "Použitie: %s [PREP�NAČ]... [SÚBOR]...\n"
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -6908,7 +7017,7 @@ msgid ""
 "  -s              do short format output, this is the default\n"
 msgstr ""
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -6917,7 +7026,7 @@ msgid ""
 "                  in short format\n"
 msgstr ""
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, c-format
 msgid ""
 "\n"
@@ -6925,7 +7034,7 @@ msgid ""
 "The utmp file will be %s.\n"
 msgstr ""
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr ""
@@ -7095,12 +7204,13 @@ msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
 
-#: src/pr.c:2827
+#: src/pr.c:2828
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
 "                    separate columns by STRING,\n"
@@ -7110,7 +7220,7 @@ msgid ""
 "  -t, --omit-header  omit page headers and trailers\n"
 msgstr ""
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 msgid ""
 "  -T, --omit-pagination\n"
 "                    omit page headers and trailers, eliminate any "
@@ -7124,7 +7234,7 @@ msgid ""
 "(72)\n"
 msgstr ""
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 #, fuzzy
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
@@ -7145,7 +7255,7 @@ msgstr ""
 "      --help      vypíše tuto nápovedu a skon�í\n"
 "      --version   vypíše ozna�enie verzie a skon�í\n"
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 #, fuzzy
 msgid ""
 "\n"
@@ -7168,7 +7278,7 @@ msgstr ""
 "Pokiaľ nie je zadaná PREMENN�, vypísať všetky.\n"
 
 #: src/printenv.c:69
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/printf.c:79
@@ -7268,12 +7378,12 @@ msgstr "upozornenie: nadbyto�né argumenty boli ignorované, za�ína sa s %s"
 msgid "F. Pinard"
 msgstr "F. Pinard"
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, fuzzy, c-format
 msgid "%s (for regexp %s)"
 msgstr "%s (pre regvýr `%s')"
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
@@ -7282,20 +7392,20 @@ msgstr ""
 "Použitie: %s [PREP�NAČ]... [VSTUP]... (bez -G)\n"
 "  alebo:  %s -G [PREP�NAČ]... [VSTUP [V�STUP]]\n"
 
-#: src/ptx.c:1821
+#: src/ptx.c:1824
 msgid ""
 "Output a permuted index, including context, of the words in the input "
 "files.\n"
 msgstr ""
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
 "  -G, --traditional              behave more like System V 'ptx'\n"
 "  -F, --flag-truncation=STRING   use STRING for flagging line truncations\n"
 msgstr ""
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
 "  -O, --format=roff              generate output as roff directives\n"
@@ -7304,7 +7414,7 @@ msgid ""
 "  -T, --format=tex               generate output as TeX directives\n"
 msgstr ""
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -7314,7 +7424,7 @@ msgid ""
 "  -o, --only-file=FILE           read only word list from this FILE\n"
 msgstr ""
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -7322,16 +7432,16 @@ msgid ""
 "excluded\n"
 msgstr ""
 
-#: src/ptx.c:1854
+#: src/ptx.c:1857
 #, fuzzy
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
 "\n"
 "Bez SÚBORu alebo ke� SÚBOR je - �íta zo štand. vstupu.\n"
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, fuzzy, c-format
 msgid "invalid gap width: %s"
 msgstr "chybné �íslo položky: `%s'"
@@ -7348,22 +7458,28 @@ msgid ""
 "  -P, --physical  avoid all symlinks\n"
 msgstr ""
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+
+#: src/pwd.c:169
 #, fuzzy, c-format
 msgid "failed to chdir to %s"
 msgstr "zmena skupiny %s na %s zlyhala\n"
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, c-format
 msgid "failed to stat %s"
 msgstr "zlyhalo stat() %s"
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr ""
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, c-format
 msgid "ignoring non-option arguments"
 msgstr "ignurujú sa argumenty, ktoré nie sú voľbami"
@@ -7373,8 +7489,8 @@ msgstr "ignurujú sa argumenty, ktoré nie sú voľbami"
 msgid "Dmitry V. Levin"
 msgstr "Dmitry V. Levin"
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Použitie: %s [VOĽBA]... [SÚBOR]...\n"
@@ -7408,8 +7524,7 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/readlink.c:152
@@ -7434,7 +7549,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 
@@ -7452,41 +7567,42 @@ msgstr "%s: zostúpiť do adresára chráneného vo�i zápisu %s? "
 msgid "%s: descend into directory %s? "
 msgstr "%s: zostúpiť do adresára %s? "
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr "%s: zmazať súbor chránený proti zápisu %s %s? "
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, c-format
 msgid "%s: remove %s %s? "
 msgstr "%s: zmazať %s %s? "
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, c-format
 msgid "removed directory: %s\n"
 msgstr "odstránený adresár: %s\n"
 
-#: src/remove.c:444
+#: src/remove.c:447
 #, fuzzy, c-format
-msgid "cannot remove directory: %s"
+msgid "refusing to remove %s or %s directory: skipping %s"
 msgstr "nie je možné odstrániť adresár %s"
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr ""
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, fuzzy, c-format
 msgid "traversal failed: %s"
 msgstr "zlyhalo �ítanie"
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -7511,12 +7627,12 @@ msgstr ""
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 
 #: src/rm.c:149
@@ -7563,14 +7679,20 @@ msgid ""
 msgstr ""
 
 #: src/rm.c:342
-#, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] "%s: odstrániť všetky argumenty? "
+msgstr[1] "%s: odstrániť všetky argumenty? "
+msgstr[2] "%s: odstrániť všetky argumenty? "
 
-#: src/rm.c:343
-#, c-format
-msgid "%s: remove all arguments? "
-msgstr "%s: odstrániť všetky argumenty? "
+#: src/rm.c:345
+#, fuzzy, c-format
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] "%s: odstrániť všetky argumenty? "
+msgstr[1] "%s: odstrániť všetky argumenty? "
+msgstr[2] "%s: odstrániť všetky argumenty? "
 
 #: src/rmdir.c:134 src/rmdir.c:233
 #, c-format
@@ -7618,7 +7740,7 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
 
@@ -7668,41 +7790,46 @@ msgstr ""
 msgid "no command specified"
 msgstr "nebol zadaný príkaz"
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr ""
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, c-format
 msgid "failed to compute a new context"
 msgstr "nepodarilo sa vypo�ítať nový kontext"
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, c-format
 msgid "failed to set new user %s"
 msgstr "nepodarilo sa nastaviť nového používateľa %s"
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, c-format
 msgid "failed to set new type %s"
 msgstr "nepodarilo sa nastaviť nový typ %s"
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, c-format
 msgid "failed to set new range %s"
 msgstr "nepodarilo sa nastaviť nový rozsah %s"
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, c-format
 msgid "failed to set new role %s"
 msgstr "nepodarilo sa nastaviť novú rolu %s"
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, c-format
 msgid "unable to set security context %s"
 msgstr "nie je možné nastaviť bezpe�nostný kontext %s"
 
+#: src/selinux.c:127 src/selinux.c:300
+#, fuzzy, c-format
+msgid "error canonicalizing %s"
+msgstr "nepodarilo sa otvoriť %s"
+
 #: src/seq.c:68
 #, c-format
 msgid ""
@@ -7731,6 +7858,8 @@ msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
@@ -7740,94 +7869,42 @@ msgstr ""
 "Pokiaľ je zadaný, FORM�T musí obsahovať práve jeden z výstupných\n"
 "printf-formátov pre �ísla v pohyblivej rádovej �iarke %%e, %%f alebo %%g.\n"
 
-#: src/seq.c:94
+#: src/seq.c:96
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
 "it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n"
 "decimal numbers with maximum precision PREC, and to %g otherwise.\n"
 msgstr ""
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, c-format
 msgid "invalid floating point argument: %s"
 msgstr "neplatný argument s plávajúcou desatinnou �iarkou: %s"
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, fuzzy, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr "%s je neznámy typ souboru"
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr ""
 "ke� sa tla�ia reťazce s rovnakou šírkou, formátovací reťazec nemusí byť "
 "zadaný"
 
-#: src/setuidgid.c:49
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-"Použitie: %s VOĽBA POUŽ�VATEĽ PR�KAZ [ARGUMENT]...\n"
-"  alebo:  %s VOĽBA\n"
-
-#: src/setuidgid.c:55
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr ""
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr ""
-
-#: src/setuidgid.c:190
-#, c-format
-msgid "failed to set supplemental group(s)"
-msgstr "nie je možné nastaviť �alšie skupiny"
-
-#: src/setuidgid.c:200
-#, c-format
-msgid "cannot set group-ID to %lu"
-msgstr "nie je možné nastaviť ID-skupiny na %lu"
-
-#: src/setuidgid.c:204
-#, c-format
-msgid "cannot set user-ID to %lu"
-msgstr "nie je možné nastaviť ID-používateľa na %lu"
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr "Colin Plumb"
 
-#: src/shred.c:148
+#: src/shred.c:170
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
 "for even very expensive hardware probing to recover the data.\n"
 msgstr ""
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -7836,28 +7913,32 @@ msgid ""
 "  -s, --size=N   shred this many bytes (suffixes like K, M, G accepted)\n"
 msgstr ""
 
-#: src/shred.c:161
+#: src/shred.c:183
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
 "  -z, --zero     add a final overwrite with zeros to hide shredding\n"
 msgstr ""
 
-#: src/shred.c:170
+#: src/shred.c:192
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -7868,7 +7949,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -7880,7 +7961,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -7889,7 +7970,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -7901,134 +7982,134 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:215
+#: src/shred.c:241
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
 "of the file that cannot be removed, and that will allow a shredded file\n"
 "to be recovered later.\n"
 msgstr ""
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, c-format
 msgid "%s: fdatasync failed"
 msgstr "%s: fdatasync zlyhalo"
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr "%s: fsync zlyhal"
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr "%s: nie je možné presunúť sa na za�iatok súboru"
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr "%s: prechod %lu/%lu (%s)..."
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, c-format
 msgid "%s: error writing at offset %s"
 msgstr "%s: chyba pri zápise na ofset %s"
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s: lseek zlyhal"
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, c-format
 msgid "%s: file too large"
 msgstr "%s: súbor je príliš veľký"
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr "%s: prechod %lu/%lu (%s)...%s"
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr "%s: prechod %lu/%lu (%s)...%s/%s %d%%"
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, c-format
 msgid "%s: fstat failed"
 msgstr "%s: fstat zlyhal"
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, c-format
 msgid "%s: invalid file type"
 msgstr "%s: neplatný typ súboru"
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr "%s: súbor má zápornú dĺžku"
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, c-format
 msgid "%s: error truncating"
 msgstr "%s: chyba pri skracovaní"
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, c-format
 msgid "%s: fcntl failed"
 msgstr "%s: fcntl zlyhalo"
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr "%s: nie je možné skartovať deskriptor ur�ený iba pre pridávanie"
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr "%s: maže sa"
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, c-format
 msgid "%s: renamed to %s"
 msgstr "%s: premenovaný na %s"
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, c-format
 msgid "%s: failed to remove"
 msgstr "%s: nepodarilo sa odstrániť"
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr "%s: zmazaný"
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, c-format
 msgid "%s: failed to close"
 msgstr "%s: nepodarilo sa zatvoriť"
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, c-format
 msgid "%s: failed to open for writing"
 msgstr "%s: nepodarilo sa otvoriť na zápis"
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, c-format
 msgid "%s: invalid number of passes"
 msgstr "%s: neplatný po�et prechodov"
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, c-format
 msgid "multiple random sources specified"
 msgstr "boli uvedené viaceré náhodné zdroje"
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, c-format
 msgid "%s: invalid file size"
 msgstr "%s: neplatná veľkosť súboru"
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -8039,11 +8120,11 @@ msgstr ""
 "  alebo:  %s -e [VOĽBA]... [ARG]...\n"
 "  alebo:  %s -i LO-HI [VOĽBA]...\n"
 
-#: src/shuf.c:54
+#: src/shuf.c:67
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr ""
 
-#: src/shuf.c:60
+#: src/shuf.c:73
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
 "  -i, --input-range=LO-HI   treat each number LO through HI as an input "
@@ -8051,34 +8132,44 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
 msgstr ""
 
-#: src/shuf.c:244
+#: src/shuf.c:228
+#, fuzzy, c-format
+msgid "too many input lines"
+msgstr "príliš veľa zopakovaných riadkov"
+
+#: src/shuf.c:431
 #, c-format
 msgid "multiple -i options specified"
 msgstr "uvedených viacero volieb -i"
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, c-format
 msgid "invalid input range %s"
 msgstr "neplatný rozash vstupu %s"
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, c-format
 msgid "invalid line count %s"
 msgstr "naplatný po�et riadkov %s"
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, c-format
 msgid "multiple output files specified"
 msgstr "uvedených viacero výstupných súborov"
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, c-format
 msgid "cannot combine -e and -i options"
 msgstr "nie je možné kombinovať voľby -e a -i"
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr ""
+
 #: src/sleep.c:44
 #, fuzzy, c-format
 msgid ""
@@ -8102,27 +8193,27 @@ msgstr ""
 "  --help      vypísať túto pomoc a skon�iť\n"
 "  --version   vypísať informáciu o verzii a skon�iť\n"
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, fuzzy, c-format
 msgid "invalid time interval %s"
 msgstr "chybné �íslo položky: `%s'"
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr "nie je možné pre�ítať hodiny reálneho �asu"
 
-#: src/sort.c:399
+#: src/sort.c:427
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr ""
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
 msgstr ""
 
-#: src/sort.c:409
+#: src/sort.c:437
 #, fuzzy
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
@@ -8144,19 +8235,19 @@ msgstr ""
 "  -n, --numeric-sort           porovná podľa reťazcovej veľkosti �ísiel\n"
 "  -r, --reverse                obrátený výsledok porovnávania\n"
 
-#: src/sort.c:415
+#: src/sort.c:443
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
 "  -i, --ignore-nonprinting    consider only printable characters\n"
 "  -M, --month-sort            compare (unknown) < 'JAN' < ... < 'DEC'\n"
 msgstr ""
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 
-#: src/sort.c:423
+#: src/sort.c:451
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
 "  -R, --random-sort           sort by random hash of keys\n"
@@ -8164,7 +8255,7 @@ msgid ""
 "  -r, --reverse               reverse the result of comparisons\n"
 msgstr ""
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -8174,19 +8265,19 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/sort.c:437
+#: src/sort.c:465
 msgid ""
 "Other options:\n"
 "\n"
 msgstr ""
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
 msgstr ""
 
-#: src/sort.c:445
+#: src/sort.c:473
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
 "  -C, --check=quiet, --check=silent  like -c, but do not report first bad "
@@ -8195,7 +8286,7 @@ msgid ""
 "                              decompress them with PROG -d\n"
 msgstr ""
 
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -8204,13 +8295,13 @@ msgid ""
 "                            If F is - then read names from standard input\n"
 msgstr ""
 
-#: src/sort.c:459
+#: src/sort.c:487
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
 "  -m, --merge               merge already sorted files; do not sort\n"
 msgstr ""
 
-#: src/sort.c:463
+#: src/sort.c:491
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "  -s, --stable              stabilize sort by disabling last-resort "
@@ -8218,7 +8309,7 @@ msgid ""
 "  -S, --buffer-size=SIZE    use SIZE for main memory buffer\n"
 msgstr ""
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -8233,11 +8324,7 @@ msgid ""
 "run\n"
 msgstr ""
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr ""
-
-#: src/sort.c:483
+#: src/sort.c:511
 #, fuzzy
 msgid ""
 "\n"
@@ -8268,7 +8355,7 @@ msgstr ""
 "\n"
 "VEĽKOSŤ môže byť nasledovaná nasledovnými príponami násobkov:\n"
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -8280,132 +8367,117 @@ msgid ""
 "native byte values.\n"
 msgstr ""
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, c-format
 msgid "waiting for %s [-d]"
 msgstr "4ak8 sa na %s [-d]"
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr ""
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, fuzzy, c-format
 msgid "cannot create temporary file in %s"
 msgstr "nie je možné vytvoriť do�asný súbor %s"
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr "zlyhalo otvorenie"
 
-#: src/sort.c:970
+#: src/sort.c:998
 msgid "fflush failed"
 msgstr "fflush zlyhalo"
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr "zlyhalo zatvorenie súboru"
 
-#: src/sort.c:986
-#, c-format
-msgid "dup2 failed"
-msgstr "dup2 zlyhalo"
-
-#: src/sort.c:1103
-#, c-format
-msgid "couldn't execute %s"
-msgstr "nebolo možné spustiť %s"
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 msgid "couldn't create temporary file"
 msgstr "nebolo možné vytvoriť do�asný súbor"
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, c-format
 msgid "couldn't create process for %s -d"
 msgstr "nie je možné vytvoriť proces pre %s -d"
 
-#: src/sort.c:1161
-#, c-format
-msgid "couldn't execute %s -d"
-msgstr "nebolo možné vykonať %s -d"
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, c-format
 msgid "warning: cannot remove: %s"
 msgstr "upozornenie: nie je možné odstrániť: %s"
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, fuzzy, c-format
 msgid "invalid --%s argument %s"
 msgstr "chybný argument %s pre `%s'"
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, fuzzy, c-format
 msgid "minimum --%s argument is %s"
 msgstr "neplatný %s%s argument „%s“"
 
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, fuzzy, c-format
 msgid "--%s argument %s too large"
 msgstr "%s%s argument „%s“ je príliš veľký"
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr ""
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr ""
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr "zlyhal stat"
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr "zlyhalo �ítanie"
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, c-format
 msgid "string transformation failed"
 msgstr "transformácia reťazca sa nepodarila"
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, c-format
 msgid "the untransformed string was %s"
 msgstr "netransformovaný reťazec bol %s"
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr ""
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr ""
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr ""
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr ""
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr ""
 
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, fuzzy, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
@@ -8413,126 +8485,126 @@ msgstr[0] "%s: prepína� `-W %s' nie je jednozna�ný\n"
 msgstr[1] "%s: prepína� `-W %s' nie je jednozna�ný\n"
 msgstr[2] "%s: prepína� `-W %s' nie je jednozna�ný\n"
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr ""
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr "chyba pri zápise"
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr "%s: %s:%s: nezotriediteľné: "
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr "štandardná chyba"
 
-#: src/sort.c:3698
+#: src/sort.c:3738
 #, fuzzy
 msgid "cannot read"
 msgstr "nie je možné spustiť %s"
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, fuzzy, c-format
 msgid "%s: invalid field specification %s"
 msgstr "%s: chybne zadaná položka `%s'"
 
-#: src/sort.c:3987
+#: src/sort.c:4028
 #, c-format
 msgid "options '-%s' are incompatible"
 msgstr ""
 
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, fuzzy, c-format
 msgid "%s: invalid count at start of %s"
 msgstr "%s: chybný po�et na za�iatku `%s'"
 
-#: src/sort.c:4295
+#: src/sort.c:4336
 #, fuzzy
 msgid "invalid number after '-'"
 msgstr "chybné �íslo za `-'"
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 #, fuzzy
 msgid "invalid number after '.'"
 msgstr "chybné �íslo za `.'"
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr "neo�akávaný znak v špecifikácii položky"
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, fuzzy, c-format
 msgid "multiple compress programs specified"
 msgstr "\\%c: neprípustná sekvencia"
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
 msgstr "chybné �íslo na za�iatku položky"
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
 msgstr "�íslo položky je nula"
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr "pozícia znaku je nula"
 
-#: src/sort.c:4407
+#: src/sort.c:4448
 #, fuzzy
 msgid "invalid number after ','"
 msgstr "chybné �íslo za `,'"
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr "prázdna záložka"
 
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, fuzzy, c-format
 msgid "cannot read file names from %s"
 msgstr "nie je možné vytvoriť odkaz %s"
 
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, fuzzy, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr "neplatná skupina"
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, fuzzy, c-format
 msgid "no input from %s"
 msgstr "vytváram súbor `%s'\n"
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr ""
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr ""
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, fuzzy, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr "nadbyto�ný operand `%s' nie je povolený, pokiaľ je použité -c"
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr ""
 
-#: src/split.c:204
+#: src/split.c:203
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr "Použitie: %s [PREP�NAČ] [SÚBOR [PREDPONA]]\n"
 
-#: src/split.c:208
+#: src/split.c:207
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
 "size is 1000 lines, and default PREFIX is 'x'.  With no INPUT, or when "
@@ -8540,32 +8612,31 @@ msgid ""
 "is -, read standard input.\n"
 msgstr ""
 
-#: src/split.c:216
+#: src/split.c:215
 #, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
 
-#: src/split.c:229
+#: src/split.c:228
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
 "                            output file is opened\n"
 msgstr ""
 
-#: src/split.c:236
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -8577,189 +8648,189 @@ msgid ""
 "r/K/N   likewise but only output Kth of N to stdout\n"
 msgstr ""
 
-#: src/split.c:354
+#: src/split.c:353
 #, c-format
 msgid "output file suffixes exhausted"
 msgstr ""
 
-#: src/split.c:366
+#: src/split.c:365
 #, c-format
 msgid "creating file %s\n"
 msgstr "vytvára sa súbor %s\n"
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr ""
 
-#: src/split.c:391
+#: src/split.c:390
 #, fuzzy, c-format
 msgid "failed to set FILE environment variable"
 msgstr "nepodarilo sa nastaviť novú rolu %s"
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr ""
 
-#: src/split.c:395
+#: src/split.c:394
 #, fuzzy, c-format
 msgid "failed to create pipe"
 msgstr "nepodarilo sa odstrániť %s"
 
-#: src/split.c:409
+#: src/split.c:408
 #, fuzzy, c-format
 msgid "closing prior pipe"
 msgstr "zatvíra sa adresár %s"
 
-#: src/split.c:411
+#: src/split.c:410
 #, fuzzy, c-format
 msgid "closing output pipe"
 msgstr "zatváram výstupný súbor %s"
 
-#: src/split.c:415
+#: src/split.c:414
 #, fuzzy, c-format
 msgid "moving input pipe"
 msgstr "vytváram súbor `%s'\n"
 
-#: src/split.c:417
+#: src/split.c:416
 #, fuzzy, c-format
 msgid "closing input pipe"
 msgstr "vytváram súbor `%s'\n"
 
-#: src/split.c:422
+#: src/split.c:421
 #, fuzzy, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr "nepodarilo sa zmeniť bezpe�nostný kontext %s na %s"
 
-#: src/split.c:428
+#: src/split.c:427
 #, fuzzy, c-format
 msgid "failed to close input pipe"
 msgstr "nie je možné zatvoriť adresár %s"
 
-#: src/split.c:464
+#: src/split.c:463
 #, fuzzy, c-format
 msgid "waiting for child process"
 msgstr "chyba pri zápise %s"
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr ""
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr ""
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr ""
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr "súbor sa nedá rozdeliť viacerými spôsobmi"
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, fuzzy, c-format
 msgid "%s: invalid number of chunks"
 msgstr "%s: neplatný po�et sekúnd"
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, fuzzy, c-format
 msgid "%s: invalid chunk number"
 msgstr "%s: chybné �íslo"
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr "%s: neplatná dĺžka prípony"
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr "%s: chybný po�et bajtov"
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr "%s: chybný po�et riadkov"
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, c-format
 msgid "line count option -%s%c... is too large"
 msgstr "voľba po�tu riadkov -%s%c... je príliš veľká"
 
-#: src/split.c:1248
+#: src/split.c:1298
 #, fuzzy, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr "neplatné po�iato�né �íslo riadka: %s"
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, fuzzy, c-format
 msgid "%s: invalid IO block size"
 msgstr "%s: neplatná veľkosť súboru"
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr ""
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr ""
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, fuzzy, c-format
 msgid "%s: cannot determine file size"
 msgstr "nie je možné zistiť názov systému"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr "Michael Meskes"
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, fuzzy, c-format
 msgid "failed to canonicalize %s"
 msgstr "nepodarilo sa otvoriť %s"
 
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, fuzzy, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr "upozornenie: nerozpoznaná úniková klauzula „\\%c“"
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, c-format
 msgid "%s: invalid directive"
 msgstr "%s: neplatná direktíva"
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, c-format
 msgid "warning: backslash at end of format"
 msgstr "upozornenie: spätná lomka na konci reťazca"
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr ""
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, c-format
 msgid "cannot read file system information for %s"
 msgstr "nie je možné na�ítať systémové informácie %s"
 
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, fuzzy, c-format
 msgid "cannot stat standard input"
 msgstr "zatvára sa štandardný vstup"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -8770,7 +8841,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -8778,30 +8849,30 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, fuzzy, c-format
 msgid "Context: %C\n"
 msgstr "neplatný kontexxt: %s"
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -8809,27 +8880,27 @@ msgid ""
 " Birth: %w\n"
 msgstr ""
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
 msgstr ""
 
-#: src/stat.c:1356
+#: src/stat.c:1418
 msgid ""
 "  -L, --dereference     follow links\n"
 "  -f, --file-system     display file system status instead of file status\n"
 msgstr ""
 
-#: src/stat.c:1360
+#: src/stat.c:1422
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 msgid ""
 "\n"
 "The valid format sequences for files (without --file-system):\n"
@@ -8841,7 +8912,7 @@ msgid ""
 "  %C   SELinux security context string\n"
 msgstr ""
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 msgid ""
 "  %d   device number in decimal\n"
 "  %D   device number in hex\n"
@@ -8851,7 +8922,7 @@ msgid ""
 "  %G   group name of owner\n"
 msgstr ""
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 msgid ""
 "  %h   number of hard links\n"
 "  %i   inode number\n"
@@ -8860,11 +8931,11 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 
-#: src/stat.c:1399
+#: src/stat.c:1461
 msgid ""
 "  %u   user ID of owner\n"
 "  %U   user name of owner\n"
@@ -8872,14 +8943,14 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 msgid ""
 "Valid format sequences for file systems:\n"
 "\n"
@@ -8890,7 +8961,7 @@ msgid ""
 "  %f   free blocks in file system\n"
 msgstr ""
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 msgid ""
 "  %i   file system ID in hex\n"
 "  %l   maximum length of filenames\n"
@@ -8956,22 +9027,27 @@ msgid ""
 "and are thus unaffected by 'stdbuf' settings.\n"
 msgstr ""
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, fuzzy, c-format
 msgid "failed to find %s"
 msgstr "nepodarilo sa otvoriť %s"
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, fuzzy, c-format
 msgid "failed to update the environment with %s"
 msgstr "nie je možné nastaviť bezpe�nostný kontext %s na %s"
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr ""
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, fuzzy, c-format
+msgid "you must specify a buffering mode option"
+msgstr "nie je možné nastaviť bezpe�nostný kontext %s na %s"
+
+#: src/stty.c:516
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -8982,11 +9058,11 @@ msgstr ""
 "  alebo:  %s [-F ZARIADENIE] [--file=ZARIADENIE] [-a|--all]\n"
 "  alebo:  %s [-F ZARIADENIE] [--file=ZARIADENIE] [-g|--save]\n"
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
 msgstr ""
 
-#: src/stty.c:525
+#: src/stty.c:528
 #, fuzzy
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
@@ -9002,14 +9078,14 @@ msgstr ""
 "  -F, --file=ZARIADENIE  otvoriť a používať zadané zariadenie namiesto\n"
 "                    štandardného vstupu\n"
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
 "settings.  The underlying system defines which settings are available.\n"
 msgstr ""
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -9018,7 +9094,7 @@ msgid ""
 "   eol CHAR      CHAR will end the line\n"
 msgstr ""
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -9026,7 +9102,7 @@ msgid ""
 "   kill CHAR     CHAR will erase the current line\n"
 msgstr ""
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -9034,7 +9110,7 @@ msgid ""
 "   start CHAR    CHAR will restart the output after stopping it\n"
 msgstr ""
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -9042,7 +9118,7 @@ msgid ""
 " * werase CHAR   CHAR will erase the last word typed\n"
 msgstr ""
 
-#: src/stty.c:562
+#: src/stty.c:565
 msgid ""
 "\n"
 "Special settings:\n"
@@ -9051,7 +9127,7 @@ msgid ""
 " * columns N     same as cols N\n"
 msgstr ""
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -9060,7 +9136,7 @@ msgid ""
 "   ospeed N      set the output speed to N\n"
 msgstr ""
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -9069,7 +9145,7 @@ msgid ""
 "   time N        with -icanon, set read timeout of N tenths of a second\n"
 msgstr ""
 
-#: src/stty.c:581
+#: src/stty.c:584
 msgid ""
 "\n"
 "Control settings:\n"
@@ -9080,7 +9156,7 @@ msgid ""
 "   csN           set character size to N bits, N in [5..8]\n"
 msgstr ""
 
-#: src/stty.c:590
+#: src/stty.c:593
 #, fuzzy
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
@@ -9089,6 +9165,7 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 "  [-]cstopb     používať dva stop bity (jeden s „-“)\n"
 "  [-]hup        poslať signál zavesenia, ke� posledný proces zatvorí "
@@ -9097,7 +9174,7 @@ msgstr ""
 "  [-]parenb     generovať paritný bit na výstupa a o�akávať ho na vstupe\n"
 "  [-]parodd     nastaviť nepárnu paritu (aj s „-“)\n"
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -9107,7 +9184,7 @@ msgid ""
 "   [-]igncr      ignore carriage return\n"
 msgstr ""
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -9116,11 +9193,11 @@ msgid ""
 "   [-]istrip     clear high (8th) bit of input characters\n"
 msgstr ""
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr ""
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -9130,7 +9207,7 @@ msgid ""
 "   [-]tandem     same as [-]ixoff\n"
 msgstr ""
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -9140,10 +9217,11 @@ msgid ""
 " * nlN           newline delay style, N in [0..1]\n"
 msgstr ""
 
-#: src/stty.c:631
+#: src/stty.c:635
+#, fuzzy
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
@@ -9157,7 +9235,7 @@ msgstr ""
 "* [-]onlcr      prekladať nové riadky na znaky návratu na za�iatok riadka\n"
 "* [-]onlret     znak nového riadku prejde na za�iatok riadka\n"
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -9167,7 +9245,7 @@ msgid ""
 " * vtN           vertical tab delay style, N in [0..1]\n"
 msgstr ""
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -9176,7 +9254,7 @@ msgid ""
 " * -crtkill      kill all line by obeying the echoctl and echok settings\n"
 msgstr ""
 
-#: src/stty.c:654
+#: src/stty.c:658
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
 "   [-]echo       echo input characters\n"
@@ -9185,7 +9263,7 @@ msgid ""
 "   [-]echok      echo a newline after a kill character\n"
 msgstr ""
 
-#: src/stty.c:661
+#: src/stty.c:665
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
 "   [-]echonl     echo newline even if not echoing other characters\n"
@@ -9194,7 +9272,7 @@ msgid ""
 "   [-]iexten     enable non-POSIX special characters\n"
 msgstr ""
 
-#: src/stty.c:668
+#: src/stty.c:672
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
 "   [-]noflsh     disable flushing after interrupt and quit special "
@@ -9204,7 +9282,7 @@ msgid ""
 " * [-]xcase      with icanon, escape with '\\' for uppercase characters\n"
 msgstr ""
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -9213,7 +9291,7 @@ msgid ""
 "   -cbreak       same as icanon\n"
 msgstr ""
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -9221,7 +9299,7 @@ msgid ""
 "   crt           same as echoe echoctl echoke\n"
 msgstr ""
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -9230,7 +9308,7 @@ msgid ""
 "   evenp         same as parenb -parodd cs7\n"
 msgstr ""
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -9240,7 +9318,7 @@ msgid ""
 "   -nl           same as icrnl -inlcr -igncr onlcr -ocrnl -onlret\n"
 msgstr ""
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -9249,7 +9327,7 @@ msgid ""
 "   -pass8        same as parenb istrip cs7\n"
 msgstr ""
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -9257,7 +9335,7 @@ msgid ""
 "   -raw          same as cooked\n"
 msgstr ""
 
-#: src/stty.c:716
+#: src/stty.c:720
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
 "                 -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n"
@@ -9267,7 +9345,7 @@ msgid ""
 "                 characters to their default values\n"
 msgstr ""
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -9282,55 +9360,55 @@ msgstr ""
 "^c, 0x37, 0177 alebo 127; pre zákaz špeciálneho znaku treba použiť\n"
 "^- alebo undef.\n"
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, c-format
 msgid "only one device may be specified"
 msgstr "môže byť zadané iba jedno zariadenie"
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, fuzzy, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
 "mutually exclusive"
 msgstr "prepína�e --string a --check sa vzájomne vylu�ujú"
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr "úri špecifikácii výstupného štýlu nemusia byť režimy nastavené"
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr "%s: nie je možné opustiť neblokovací režim"
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, fuzzy, c-format
 msgid "invalid argument %s"
 msgstr "chybný argument %s pre `%s'"
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, fuzzy, c-format
 msgid "missing argument to %s"
 msgstr "nejednozna�ný argument %s pre `%s'"
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, fuzzy, c-format
 msgid "invalid line discipline %s"
 msgstr "chybné �íslo položky: `%s'"
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr "%s: nie je možné vykonať všetky požadované operácie"
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr "%s: neexistuje informácia o veľkosti tohoto zariadenia"
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, c-format
 msgid "invalid integer argument %s"
 msgstr "neplatný celo�íselný argument %s"
@@ -9382,7 +9460,7 @@ msgstr "      --help     zobrazí tohto pomocníka a skon�í\n"
 msgid "      --version  output version information and exit\n"
 msgstr "      --version  vypíše informácie o verzii a skon�í\n"
 
-#: src/system.h:544
+#: src/system.h:543
 #, fuzzy
 msgid ""
 "\n"
@@ -9391,15 +9469,15 @@ msgstr ""
 "Povinné argumenty dlhých tvarov volieb sú taktiež povinné pre krátke tvary "
 "volieb.\n"
 
-#: src/system.h:552
+#: src/system.h:551
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -9408,35 +9486,33 @@ msgid ""
 "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n"
 msgstr ""
 
-#: src/system.h:571
+#: src/system.h:570
 #, fuzzy, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
-msgstr ""
-"\n"
-"Chyby v programe oznamujte tu: <%s>.\n"
+"%s online help: <%s>\n"
+msgstr "Domovská stránka %s: <%s>\n"
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr ""
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr ""
 
-#: src/system.h:596
+#: src/system.h:591
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Viac informácií získate príkazom `%s --help'.\n"
 
-#: src/system.h:628
+#: src/system.h:633
 #, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -9538,54 +9614,48 @@ msgstr ""
 
 #: src/tail.c:270
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
 
 #: src/tail.c:274
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 
-#: src/tail.c:281
+#: src/tail.c:280
 #, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
 
-#: src/tail.c:294
+#: src/tail.c:293
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 
-#: src/tail.c:301
+#: src/tail.c:298
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 
-#: src/tail.c:310
+#: src/tail.c:307
 msgid ""
 "\n"
 "If the first character of K (the number of bytes or lines) is a '+',\n"
@@ -9596,7 +9666,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/tail.c:319
+#: src/tail.c:316
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
 "means that even if a tail'ed file is renamed, tail will continue to track\n"
@@ -9606,165 +9676,171 @@ msgid ""
 "named file in a way that accommodates renaming, removal and creation.\n"
 msgstr ""
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr "zatvára sa %s (fd=%d)"
 
-#: src/tail.c:453
-#, fuzzy, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr "nie je možné vytvoriť adresár %s"
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr ""
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr ""
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
 "reverting to polling"
 msgstr ""
 
-#: src/tail.c:963
+#: src/tail.c:965
+#, fuzzy, c-format
+msgid "%s has been replaced with a symbolic link. giving up on this name"
+msgstr "súbor `%s' bol nahradený iným, neumožňujúcim sledovanie jeho konca."
+
+#: src/tail.c:980
 #, fuzzy, c-format
 msgid "%s has become inaccessible"
 msgstr "`%s' sa stal nedostupným"
 
-#: src/tail.c:980
+#: src/tail.c:997
 #, fuzzy, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr "súbor `%s' bol nahradený iným, neumožňujúcim sledovanie jeho konca."
 
-#: src/tail.c:989
+#: src/tail.c:1006
 #, fuzzy, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr "súbor `%s' bol nahradený iným, neumožňujúcim sledovanie jeho konca."
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, fuzzy, c-format
 msgid "%s has become accessible"
 msgstr "`%s' sa stal dostupným"
 
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, fuzzy, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr "súbor %s sa objavil. Sledovanie konca súboru pokra�uje."
 
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, fuzzy, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr ""
 "súbor %s bol nahradený iným. Sledovanie konca súboru\n"
 "pokra�uje."
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, fuzzy, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr "%s: nie je možné opustiť neblokovací režim"
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr "%s: súbor bol skrátený"
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr "už nezostávajú žiadne súbory"
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, fuzzy, c-format
 msgid "cannot watch parent directory of %s"
 msgstr "nie je možné stat() aktuálny adresár (%s)"
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, fuzzy, c-format
 msgid "inotify resources exhausted"
 msgstr "vy�erpaná pamäť"
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, fuzzy, c-format
 msgid "cannot watch %s"
 msgstr "nie je možné vykonať touch %s"
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr ""
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, fuzzy, c-format
 msgid "error reading inotify event"
 msgstr "chyba pri �ítaní %s"
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr ""
 "%s: nie je možné sledovať koniec tohoto typu súboru; zanechávam tento názov"
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, fuzzy, c-format
 msgid "number in %s is too large"
 msgstr "%s je príliš veľa"
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr ""
 "%s: neplatné �íslo maximálneho po�tu nezmenených výsledkov funkcie stat\n"
 "medzi otvoreniami"
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr "%s: chybné PID"
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr "%s: neplatný po�et sekúnd"
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr ""
 
-#: src/tail.c:2034
+#: src/tail.c:2096
+#, fuzzy, c-format
+msgid "warning: --retry ignored; --retry is useful only when following"
+msgstr ""
+"upozornenie: PID bol ignorovaný; --pid=PID je užito�né iba pri nasledovaní"
+
+#: src/tail.c:2100
 #, c-format
-msgid "warning: --retry is useful mainly when following by name"
-msgstr "upozornenie: --retry je užito�né najmä pri sledovaní podľa názvu"
+msgid "warning: --retry only effective for the initial open"
+msgstr ""
 
-#: src/tail.c:2038
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
 msgstr ""
 "upozornenie: PID bol ignorovaný; --pid=PID je užito�né iba pri nasledovaní"
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr "upozornenie: --pid=PID nie je na tomto systéme podporované"
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, fuzzy, c-format
 msgid "cannot follow %s by name"
 msgstr "nie je možné vytvoriť do�asný súbor"
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr ""
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr ""
@@ -10007,17 +10083,17 @@ msgstr "argument %s je naviac"
 msgid "warning: sigprocmask"
 msgstr ""
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr ""
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr ""
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
@@ -10026,33 +10102,32 @@ msgstr ""
 "Použitie: %s VOĽBA POUŽ�VATEĽ PR�KAZ [ARGUMENT]...\n"
 "  alebo:  %s VOĽBA\n"
 
-#: src/timeout.c:229
+#: src/timeout.c:232
 #, fuzzy
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
 msgstr ""
 "Povinné argumenty dlhých tvarov volieb sú taktiež povinné pre krátke tvary "
 "volieb.\n"
 
-#: src/timeout.c:235
+#: src/timeout.c:238
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 msgid ""
 "\n"
 "DURATION is a floating point number with an optional suffix:\n"
@@ -10060,7 +10135,7 @@ msgid ""
 "days.\n"
 msgstr ""
 
-#: src/timeout.c:259
+#: src/timeout.c:262
 msgid ""
 "\n"
 "If the command times out, and --preserve-status is not set, then exit with\n"
@@ -10071,17 +10146,17 @@ msgid ""
 "case the exit status is 128+9 rather than 124.\n"
 msgstr ""
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr ""
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, fuzzy, c-format
 msgid "error waiting for command"
 msgstr "chyba pri zápise %s"
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr ""
@@ -10429,7 +10504,7 @@ msgstr ""
 #: src/truncate.c:115
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 
 #: src/truncate.c:121
@@ -10514,12 +10589,12 @@ msgstr ""
 "  Pokiaľ nie je SÚBOR zadaný, na�íta sa štandardný vstup.\n"
 "\n"
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr "%s: vstup obsahuje nepárny po�et tokenov"
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr "%s: vstup obsahuje cyklus:"
@@ -10604,12 +10679,12 @@ msgstr ""
 msgid "tab stop value is too large"
 msgstr "hodnota tabulátora je príliš veľká"
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr "Použitie: %s [PREP�NAČ]... [VSTUP [V�STUP]]\n"
 
-#: src/uniq.c:138
+#: src/uniq.c:174
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
 "writing to OUTPUT (or standard output).\n"
@@ -10617,36 +10692,49 @@ msgid ""
 "With no options, matching lines are merged to the first occurrence.\n"
 msgstr ""
 
-#: src/uniq.c:147
+#: src/uniq.c:183
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
 msgstr ""
 
-#: src/uniq.c:151
+#: src/uniq.c:187
+msgid ""
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
+msgstr ""
+
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr ""
+
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
+msgstr ""
+
+#: src/uniq.c:199
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
 "  -i, --ignore-case     ignore differences in case when comparing\n"
 "  -s, --skip-chars=N    avoid comparing the first N characters\n"
 "  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
 msgstr ""
 
-#: src/uniq.c:161
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr ""
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 msgid ""
 "\n"
 "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n"
 "characters.  Fields are skipped before chars.\n"
 msgstr ""
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 msgid ""
 "\n"
 "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n"
@@ -10654,25 +10742,36 @@ msgid ""
 "Also, comparisons honor the rules specified by 'LC_COLLATE'.\n"
 msgstr ""
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, c-format
 msgid "too many repeated lines"
 msgstr "príliš veľa zopakovaných riadkov"
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
 msgstr "chybný po�et polí na presko�enie"
 
 # bytes to skip? we were talking about chars? - rzm
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
 msgstr "chybný po�et znakov na presko�enie"
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
 msgstr "chybný po�et znakov na porovnanie"
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr ""
+
+#: src/uniq.c:652
+#, fuzzy, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr ""
+"výpis všetkých opakujúcich sa riadkov a po�ítadla opakovania nemá zmysel"
+
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr ""
@@ -10693,11 +10792,6 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/unlink.c:86
-#, c-format
-msgid "cannot unlink %s"
-msgstr "nie je možné odpojiť (unlink) %s"
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -10744,7 +10838,7 @@ msgstr[2] "%lu používateľov"
 msgid ",  load average: %.2f"
 msgstr ",  priemerná záťaž: %.2f"
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, fuzzy, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -10757,19 +10851,19 @@ msgstr ""
 "Pokiaľ nie je zadaný SÚBOR, použiť %s. %s ako SÚBOR je obvyklý.\n"
 "\n"
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
 "an uninterruptible sleep state also contribute to the load average.\n"
 msgstr ""
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr ""
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, fuzzy, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
@@ -10987,16 +11081,29 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#~ msgid "  returning value: '%s'\n"
-#~ msgstr "vytvára sa súbor %s\n"
+#~ msgid "cannot create pipe"
+#~ msgstr "nie je možné vytvoriť adresár %s"
 
 #, fuzzy
-#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n"
-#~ msgstr "Použitie: %s [VOĽBA] N�ZOV...\n"
+#~ msgid "%s subprocess failed"
+#~ msgstr "%s: zlyhalo posunutie v súbore"
 
 #, fuzzy
-#~ msgid "no valid suffix found\n"
-#~ msgstr "%s: neplatná dĺžka prípony"
+#~ msgid "_open_osfhandle failed"
+#~ msgstr "zlyhalo otvorenie"
+
+#~ msgid "cannot restore fd %d: dup2 failed"
+#~ msgstr "nemožno obnoviť fd %d: dup2 zlyhal"
+
+#~ msgid "%s subprocess"
+#~ msgstr "podproces %s"
+
+#~ msgid "%s subprocess got fatal signal %d"
+#~ msgstr "podproces %s dostal kritický signál %d"
+
+#, fuzzy
+#~ msgid "failed to set additional groups"
+#~ msgstr "nie je možné nastaviť �alšie skupiny"
 
 #~ msgid "reading %s"
 #~ msgstr "�íta sa %s"
@@ -11004,6 +11111,9 @@ msgstr ""
 #~ msgid "writing %s"
 #~ msgstr "zapisuje sa %s"
 
+#~ msgid "failed to get file system create context"
+#~ msgstr "nepodarilo sa získať kontext vytvorenia súborového systému"
+
 #~ msgid "closing %s"
 #~ msgstr "zatvára sa %s"
 
@@ -11013,6 +11123,13 @@ msgstr ""
 #~ msgid "opening %s"
 #~ msgstr "otváram %s"
 
+#~ msgid "cannot reposition file pointer for %s"
+#~ msgstr "nie je možné zmeniť pozíciu ukazovateľa v súbore %s"
+
+#, fuzzy
+#~ msgid "Usage: %s [OPTION]... [USERNAME]\n"
+#~ msgstr "Použitie: %s [PREP�NAČ]... MNOŽINA1 [MNOŽINA2]\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "  none, off       never make backups (even if --backup is given)\n"
@@ -11028,9 +11145,44 @@ msgstr ""
 #~ "                  existujú, inak tvoriť jednoduché\n"
 #~ "  simple, never   vždy tvoriť jednoduché záložné kópie súborov \n"
 
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Bez SÚBORu alebo ke� SÚBOR je - �íta zo štand. vstupu.\n"
+
 #~ msgid "Usage: %s [OPTION]... FILE\n"
 #~ msgstr "Použitie: %s [VOĽBA]... [SÚBOR]\n"
 
+#, fuzzy
+#~ msgid "cannot remove directory: %s"
+#~ msgstr "nie je možné odstrániť adresár %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
+#~ "  or:  %s LONG-OPTION\n"
+#~ msgstr ""
+#~ "Použitie: %s VOĽBA POUŽ�VATEĽ PR�KAZ [ARGUMENT]...\n"
+#~ "  alebo:  %s VOĽBA\n"
+
+#~ msgid "cannot set group-ID to %lu"
+#~ msgstr "nie je možné nastaviť ID-skupiny na %lu"
+
+#~ msgid "cannot set user-ID to %lu"
+#~ msgstr "nie je možné nastaviť ID-používateľa na %lu"
+
+#~ msgid "dup2 failed"
+#~ msgstr "dup2 zlyhalo"
+
+#~ msgid "couldn't execute %s"
+#~ msgstr "nebolo možné spustiť %s"
+
+#~ msgid "couldn't execute %s -d"
+#~ msgstr "nebolo možné vykonať %s -d"
+
 #~ msgid "Password:"
 #~ msgstr "Heslo:"
 
@@ -11082,6 +11234,17 @@ msgstr ""
 #~ msgid "warning: cannot change directory to %s"
 #~ msgstr "upozornenie: nie je možné zmeniť adresár na %s"
 
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Report %s bugs to %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Chyby v programe oznamujte tu: <%s>.\n"
+
+#~ msgid "warning: --retry is useful mainly when following by name"
+#~ msgstr "upozornenie: --retry je užito�né najmä pri sledovaní podľa názvu"
+
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: nepovolený prepína� -- %c\n"
 
@@ -11309,10 +11472,6 @@ msgstr ""
 #~ msgid "FATAL: cannot return to .. from %s"
 #~ msgstr "KRITICK�: nie je možné sa vrátiť do .. z adresára %s"
 
-#, fuzzy
-#~ msgid "cannot remove %s directory %s"
-#~ msgstr "nie je možné odstrániť adresár %s"
-
 #~ msgid "cannot remove root directory %s"
 #~ msgstr "nie je možné odstrániť koreňový adresár %s"
 
@@ -11796,10 +11955,6 @@ msgstr ""
 #~ msgstr ""
 #~ "pre rúry nie je potrebné zadávať hlavné a vedľajšie �íslo zariadenia"
 
-#, fuzzy
-#~ msgid "cannot set permissions of %s"
-#~ msgstr "nie je možné zmeniť práva %s"
-
 #~ msgid "when moving multiple files, last argument must be a directory"
 #~ msgstr ""
 #~ "pri premiestňovaní viacerých súborov musí byť posledným argumentom adresár"
@@ -14668,8 +14823,8 @@ msgstr ""
 #~ "Nastránkuje alebo nastĺpcuje SÚBOR(y) pre tla�.\n"
 #~ "\n"
 #~ "  +PRV�_STRANA[:POSLEDN�_STRANA], --pages=PRV�_STRANA[:POSLEDN�_STRANA]\n"
-#~ "                    za�ne [skon�í] výpis na strane PRVN�_[POSLEDN�_]"
-#~ "STRANA\n"
+#~ "                    za�ne [skon�í] výpis na strane "
+#~ "PRVN�_[POSLEDN�_]STRANA\n"
 #~ "  -STĹPCOV, --columns=STĹPCOV\n"
 #~ "                    produkuje STĹPCOV-stĺpcový výstup. Riadky vypisuje\n"
 #~ "                    na stránku do stĺpcov, pokiaľ nie je špecifikovaná\n"
diff --git a/po/sl.gmo b/po/sl.gmo
index 0c5543f0..6ae15cd2 100644
--- a/po/sl.gmo
+++ b/po/sl.gmo
diff --git a/po/sl.po b/po/sl.po
index ccb2f79a..04fce34b 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,16 +1,16 @@
 # -*- mode: po; coding: utf-8; -*- Slovenian message catalog for GNU coreutils.
-# Copyright (C) 1996, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 # This file is distributed under the same license as the coreutils package.
-# Primož Peterlin <primozz.peterlin@gmail.com>, 1996, 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012.
+# Primož Peterlin <primozz.peterlin@gmail.com>, 1996, 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013.
 # Klemen Košir <klemen913@gmail.com>, 2011.
-# $Id: coreutils-8.20-pre1.sl.po,v 1.2 2012/10/28 21:27:44 peterlin Exp $
+# $Id: coreutils-8.22-pre41.sl.po,v 1.1 2013/12/09 21:09:17 peterlin Exp $
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU coreutils 8.20-pre1\n"
+"Project-Id-Version: GNU coreutils 8.22-pre4\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
-"PO-Revision-Date: 2012-10-28 22:27+0100\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
+"PO-Revision-Date: 2013-12-09 22:09+0100\n"
 "Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
 "Language: sl\n"
@@ -38,77 +38,125 @@ msgstr "Veljavni argumenti so:"
 msgid "error closing file"
 msgstr "napaka pri zapiranju datoteke"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "napaka pri pisanju"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, c-format
 msgid "preserving permissions for %s"
-msgstr "ohranjena dovoljenja za %s"
+msgstr "ohranjajo se dovoljenja za %s"
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "Neznana sistemska napaka"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "navadna prazna datoteka"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "navadna datoteka"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "imenik"
 
-#: lib/file-type.c:44
-msgid "block special file"
-msgstr "blo�na enota"
-
-#: lib/file-type.c:47
-msgid "character special file"
-msgstr "znakovna enota"
-
-#: lib/file-type.c:50
-msgid "fifo"
-msgstr "FIFO"
-
 # ! INEXACT
-#: lib/file-type.c:53
+#: lib/file-type.c:46
 msgid "symbolic link"
 msgstr "simbolna povezava"
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "vti�nica"
-
-#: lib/file-type.c:59
+#: lib/file-type.c:52
 msgid "message queue"
 msgstr "vrsta sporo�il"
 
-#: lib/file-type.c:62
+#: lib/file-type.c:55
 msgid "semaphore"
 msgstr "semafor"
 
-#: lib/file-type.c:65
+#: lib/file-type.c:58
 msgid "shared memory object"
 msgstr "deljen pomnilniški predmet"
 
-#: lib/file-type.c:68
+#: lib/file-type.c:61
 msgid "typed memory object"
 msgstr "tipiziran pomnilniški predmet"
 
-#: lib/file-type.c:70
+#: lib/file-type.c:66
+msgid "block special file"
+msgstr "blo�na enota"
+
+#: lib/file-type.c:69
+msgid "character special file"
+msgstr "znakovna enota"
+
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr ""
+
+#: lib/file-type.c:75
+msgid "fifo"
+msgstr "FIFO"
+
+#: lib/file-type.c:78
+msgid "door"
+msgstr ""
+
+#: lib/file-type.c:81
+#, fuzzy
+msgid "multiplexed block special file"
+msgstr "blo�na enota"
+
+#: lib/file-type.c:84
+#, fuzzy
+msgid "multiplexed character special file"
+msgstr "znakovna enota"
+
+#: lib/file-type.c:87
+#, fuzzy
+msgid "multiplexed file"
+msgstr "ve� vlog"
+
+#: lib/file-type.c:90
+#, fuzzy
+msgid "named file"
+msgstr "�udna datoteka"
+
+#: lib/file-type.c:93
+#, fuzzy
+msgid "network special file"
+msgstr "blo�na enota"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr ""
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr ""
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr ""
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "vti�nica"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr ""
+
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "�udna datoteka"
 
@@ -243,19 +291,19 @@ msgstr "%s: izbira »-W %s« ne dovoljuje argumenta\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: izbira »-W %s« zahteva argument\n"
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr "dovoljenj %s ni mogo�e spremeniti"
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "imenika %s ni mogo�e ustvariti"
 
 # ! INEXACT
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr "zmanjkalo pomnilnika"
@@ -373,7 +421,7 @@ msgstr "Regularni izraz je preobsežen"
 msgid "Unmatched ) or \\)"
 msgstr "Zaklepaj ) ali \\) brez para"
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 msgid "No previous regular expression"
 msgstr "Prejšnjega regularnega izraza ni"
 
@@ -398,7 +446,7 @@ msgstr "uporabite --no-preserve-root, da zaobidete to varovalko"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[jJdD]"
 
@@ -408,14 +456,14 @@ msgstr "^[jJdD]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, c-format
 msgid "setting permissions for %s"
-msgstr "nastavljena dovoljenja za %s"
+msgstr "nastavljajo se dovoljenja za %s"
 
 #: lib/siglist.h:31
 msgid "Hangup"
@@ -553,18 +601,6 @@ msgstr "Izpad toka"
 msgid "Resource lost"
 msgstr "Vir izgubljen"
 
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, c-format
-msgid "cannot create pipe"
-msgstr "ni mogo�e ustvariti cevovoda"
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, c-format
-msgid "%s subprocess failed"
-msgstr "podproces %s ni uspel"
-
 #: lib/strsignal.c:114
 #, c-format
 msgid "Real-time signal %d"
@@ -776,7 +812,7 @@ msgstr ""
 "Napake v programu %s sporo�ite na: %s\n"
 "Napake v prevodu sporo�ite na <translation-team-sl@lists.sourceforge.net>.\n"
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Doma�a stran %s: <%s>\n"
@@ -786,30 +822,10 @@ msgstr "Doma�a stran %s: <%s>\n"
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr "Spletna stran %s: <http://www.gnu.org/software/%s/>.\n"
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr "Splošna pomo� za rabo programja GNU: <http://www.gnu.org/gethelp/>.\n"
 
-#: lib/w32spawn.h:43
-#, c-format
-msgid "_open_osfhandle failed"
-msgstr "klic _open_osfhandle ni uspel"
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr "ni mogo�e obnoviti fd %d: klic dup2 ni uspel"
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr "podproces %s"
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr "podproces %s je prejel terminalni signal %d"
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr "standardni vhod"
@@ -831,7 +847,7 @@ msgstr "neznani tok"
 msgid "failed to reopen %s with mode %s"
 msgstr "ponovno odpiranje %s v na�inu %s ni uspelo"
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr "primerjanje nizov ni uspelo"
@@ -872,7 +888,7 @@ msgid "Simon Josefsson"
 msgstr "Simon Josefsson"
 
 #: src/base64.c:60
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
 "Base64 encode or decode FILE, or standard input, to standard output.\n"
@@ -880,7 +896,6 @@ msgstr ""
 "Uporaba: %s [IZBIRA]... [DATOTEKA]\n"
 "Base64 kodira ali dekodira DATOTEKO ali standardni vhod na standardni "
 "izhod.\n"
-"\n"
 
 #: src/base64.c:67
 msgid ""
@@ -897,7 +912,7 @@ msgstr ""
 "\\\n"
 "                          N=0 pomeni brez preloma vrstic\n"
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -922,48 +937,47 @@ msgstr ""
 "druge\n"
 "znake izven abecede base64.\n"
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "napaka pri branju"
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, c-format
 msgid "invalid input"
 msgstr "neveljavni vhod"
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, c-format
 msgid "invalid wrap size: %s"
 msgstr "neveljavna Å¡irina: %s"
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, c-format
 msgid "extra operand %s"
 msgstr "odve�ni operand %s"
 
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, c-format
 msgid "closing standard input"
-msgstr "zapiramo standardni vhod"
+msgstr "zapira se standardni vhod"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -982,19 +996,19 @@ msgstr ""
 "  ali:   %s IZBIRA... IME...\n"
 
 #: src/basename.c:53
-#, fuzzy
 msgid ""
 "Print NAME with any leading directory components removed.\n"
 "If specified, also remove a trailing SUFFIX.\n"
 msgstr ""
-"Izpišemo IME datoteke brez celotne poti do nje. Če je podana PRIPONA,\n"
-"izpišemo ime datoteke brez pripone.\n"
+"Izpiše se IME datoteke brez celotne poti do nje. Če je podana PRIPONA,\n"
+"se izpiše ime datoteke brez pripone.\n"
 
 #: src/basename.c:60
+#, fuzzy
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
 "  -a, --multiple       podpiraj ve� argumentov in obravnavaj vsakega kot "
 "IME\n"
@@ -1018,32 +1032,31 @@ msgstr ""
 "  %s -s .h include/stdio.h  -> »stdio«\n"
 "  %s -a nekaj/niz1 nekaj/niz2 -> »niz1« ki mu sledi »niz2«\n"
 
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, c-format
 msgid "missing operand"
 msgstr "manjkajo� operand"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr "Torbjorn Granlund"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 msgid "Richard M. Stallman"
 msgstr "Richard M. Stallman"
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1102,7 +1115,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr "ioctl na »%s« ni mogo�"
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr "standardni izhod"
@@ -1119,14 +1132,14 @@ msgstr "Russel Coker"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 msgid "Jim Meyering"
 msgstr "Jim Meyering"
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, c-format
 msgid "failed to create security context: %s"
 msgstr "ustvarjenje varnostnega konteksta ni uspelo: %s"
@@ -1136,8 +1149,8 @@ msgstr "ustvarjenje varnostnega konteksta ni uspelo: %s"
 msgid "failed to set %s security context component to %s"
 msgstr "nastavitev %s varnostnega konteksta na %s ni bila uspešna"
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, c-format
 msgid "failed to get security context of %s"
 msgstr "branje varnostnega konteksta %s ni uspelo"
@@ -1147,18 +1160,18 @@ msgstr "branje varnostnega konteksta %s ni uspelo"
 msgid "can't apply partial context to unlabeled file %s"
 msgstr "delnega konteksta ni mogo�e uporabiti na neozna�eni datoteki %s"
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, c-format
 msgid "failed to change context of %s to %s"
 msgstr "zamenava konteksta %s na %s ni uspela"
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
 msgstr "dostop do %s ni mogo�"
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, c-format
 msgid "cannot read directory %s"
 msgstr "imenika %s ni mogo�e prebrati"
@@ -1166,15 +1179,16 @@ msgstr "imenika %s ni mogo�e prebrati"
 #: src/chcon.c:292
 #, c-format
 msgid "changing security context of %s\n"
-msgstr "spreminjanje varnostnega konteksta %s\n"
+msgstr "spreminja se varnostni kontekst %s\n"
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, c-format
 msgid "fts_read failed"
 msgstr "fts_read ni uspel"
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, c-format
 msgid "fts_close failed"
 msgstr "fts_close ni uspel"
@@ -1192,16 +1206,15 @@ msgstr ""
 "  ali:   %s [IZBIRA]... --reference=ZGLED DATOTEKA...\n"
 
 #: src/chcon.c:357
-#, fuzzy
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
-"Navedenim DATOTEKAM spremenimo varnostni kontekst v KONTEKST.\n"
-"Z izbiro --reference spremenimo vsem DATOTEKAM varnostni kontekst v istega,\n"
+"Navedenim DATOTEKAM se spremeni varnostni kontekst SELinux v KONTEKST.\n"
+"Z izbiro --reference se spremeni vsem DATOTEKAM varnostni kontekst v "
+"istega,\n"
 "kot ga ima ZGLED.\n"
-"\n"
 
 #: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94
 msgid ""
@@ -1228,7 +1241,7 @@ msgstr ""
 "  -t, --type=TIP         nastavi TIP v ciljnem varnostnem kontekstu\n"
 "  -l, --range=OBSEG      nastavi OBSEG v ciljnem varnostnem kontekstu\n"
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
 "      --preserve-root    fail to operate recursively on '/'\n"
@@ -1281,36 +1294,37 @@ msgstr ""
 "  -P                     ne pre�eši nobene simbolne povezave (privzeto)\n"
 "\n"
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr "-R --dereference zahteva bodisi -H, bodisi -L"
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr "-R -h zahteva -P"
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, c-format
 msgid "missing operand after %s"
 msgstr "manjkajo� operand za %s"
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, c-format
 msgid "invalid context: %s"
 msgstr "neveljavni kontekst: %s"
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr "podana dolo�ila varnostnega konteksta si nasprotujejo"
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, c-format
 msgid "failed to get attributes of %s"
 msgstr "branje prilastkov (atributov) %s ni uspelo"
@@ -1335,13 +1349,12 @@ msgid ""
 "With --reference, change the group of each FILE to that of RFILE.\n"
 "\n"
 msgstr ""
-"Navedenim DATOTEKAM spremenimo varnostni kontekst v KONTEKST.\n"
-"Z izbiro --reference, spremenimo vsem DATOTEKAM varnostni kontekst v "
-"istega,\n"
-"kot ga ima ZGLED.\n"
+"Navedenim DATOTEKAM se spremeni varnostni kontekst v KONTEKST.\n"
+"Z izbiro --reference, se spremeni vsem DATOTEKAM varnostni kontekst v\n"
+"istega, kot ga ima ZGLED.\n"
 "\n"
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
@@ -1382,48 +1395,48 @@ msgstr ""
 "  %s staff /u      Spremeni skupino podimenika »/u« v »staff«.\n"
 "  %s -hR staff /u  Spremeni skupino podimenika »/u« s podimeniki v »staff«.\n"
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
-msgstr "beremo nove prilastke (atribute) %s"
+msgstr "berejo se novi prilastki (atributi) %s"
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr ""
 "tako simbolna povezava %s kot sklicevana datoteka/imenik sta nespremenjena\n"
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr "zaš�ita datoteke %s spremenjena z %04lo (%s) na %04lo (%s)\n"
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr "sprememba zaš�ite datoteke %s z %04lo (%s) na  %04lo (%s) ni uspela\n"
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr "zaš�ita datoteke %s ohranjena kot %04lo (%s)\n"
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr "delovanje na obviseni simbolni povezavi %s ni mogo�e"
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, c-format
 msgid "changing permissions of %s"
-msgstr "spreminjanje dovoljenj %s"
+msgstr "spreminjajo se dovoljenja %s"
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr "%s: nova dovoljenja so %s, ne %s"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1434,28 +1447,28 @@ msgstr ""
 "  ali:   %s [IZBIRA]... OKTALNA_KODA DATOTEKA...\n"
 "  ali:   %s [IZBIRA]... --reference=ZGLED DATOTEKA...\n"
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 msgid ""
 "Change the mode of each FILE to MODE.\n"
 "With --reference, change the mode of each FILE to that of RFILE.\n"
 "\n"
 msgstr ""
 "Navedenim DATOTEKAM spremenimo zaš�ito v navedeno ZAŠČITO.\n"
-"Z izbiro --reference spremenimo vsem DATOTEKAM zaš�ito v enako,\n"
+"Z izbiro --reference se spremeni vsem DATOTEKAM zaš�ita v enako,\n"
 "kot jo ima ZGLED.\n"
 "\n"
 
-#: src/chmod.c:391
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
 "      --reference=DATOTEKA  uporabi enako zaš�ito, kot jo ima navedena\n"
 "                         DATOTEKA, namesto da zaš�ito izrecno navajamo\n"
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr "  -R, --recursive        rekurzivno obdelaj datoteke in imenike\n"
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 msgid ""
 "\n"
 "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n"
@@ -1463,12 +1476,12 @@ msgstr ""
 "\n"
 "Vsaka ZAŠČITA ima obliko »[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+«.\n"
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr "ni mo� podati izbire --reference in še izrecno navesti ZAŠČITE"
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, c-format
 msgid "invalid mode: %s"
 msgstr "neveljavni na�in: %s"
@@ -1537,12 +1550,12 @@ msgstr "ni mogo�e slediti povezavi %s"
 #: src/chown-core.c:467
 #, c-format
 msgid "changing ownership of %s"
-msgstr "spreminjanje lastništva %s"
+msgstr "spreminja se lastništvo %s"
 
 #: src/chown-core.c:468
 #, c-format
 msgid "changing group of %s"
-msgstr "spreminjanje skupino %s"
+msgstr "spreminja se skupina %s"
 
 #: src/chown.c:79
 #, c-format
@@ -1622,26 +1635,21 @@ msgstr ""
 "  %s -hR root /u    Spremeni lastnika imenika »/u« in podimenikov v »root«.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr "Roland McGrath"
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr "neveljavno ime skupine %s"
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, c-format
 msgid "invalid group list %s"
 msgstr "neveljaven seznam skupin %s"
 
-#: src/chroot.c:117
-#, c-format
-msgid "failed to set additional groups"
-msgstr "dodatnih skupin ni uspelo nastaviti"
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
@@ -1650,15 +1658,15 @@ msgstr ""
 "Uporaba: %s [IZBIRA] NOVI_KOREN [UKAZ [ARGUMENT]...]\n"
 "  ali:   %s IZBIRA\n"
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
 msgstr ""
-"Izvedemo UKAZ tako, da korenski imenik postavimo na KOREN.\n"
+"Izvedemo UKAZ tako, da se korenski imenik postavi na KOREN.\n"
 "\n"
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
@@ -1666,7 +1674,7 @@ msgstr ""
 "  --userspec=UPORABNIK:SKUPINA  dolo�i uporabnika ali skupino (ID ali ime)\n"
 "  --groups=SEZNAM               dolo�i dodatne skupine (g1, g2,... gN)\n"
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 msgid ""
 "\n"
 "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n"
@@ -1674,28 +1682,42 @@ msgstr ""
 "\n"
 "Če UKAZ ni podan, izvedemo »${SHELL} -i« (privzeto »/bin/sh -i«).\n"
 
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, c-format
 msgid "cannot change root directory to %s"
 msgstr "korenskega imenika ni mogo�e prestaviti na %s"
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, c-format
 msgid "cannot chdir to root directory"
 msgstr "korenski imenik ni dosegljiv s chdir"
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr ""
+
+#: src/chroot.c:383
+#, fuzzy, c-format
+msgid "failed to get supplemental groups"
+msgstr "dodatne skupine ni mogo�e nastaviti"
+
+#: src/chroot.c:395
+#, fuzzy, c-format
+msgid "failed to %s supplemental groups"
+msgstr "dodatne skupine ni mogo�e nastaviti"
+
+#: src/chroot.c:402
 #, c-format
 msgid "failed to set group-ID"
 msgstr "nastavitev GID ni uspela"
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, c-format
 msgid "failed to set user-ID"
 msgstr "nastavitev UID ni uspela"
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, c-format
 msgid "failed to run command %s"
 msgstr "ukaza %s ni uspelo izvesti"
@@ -1727,7 +1749,7 @@ msgstr ""
 "Izpišemo nadzorno vsoto in dolžino v bajtih za vsako DATOTEKO.\n"
 "\n"
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr "Uporaba: %s [IZBIRA]... DATOTEKA1 DATOTEKA2\n"
@@ -1816,296 +1838,329 @@ msgstr "podanih je ve� razmejilnikov"
 msgid "empty %s not allowed"
 msgstr "prazen %s ni dovoljen"
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr "napaka pri branju %s"
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, c-format
 msgid "cannot lseek %s"
 msgstr "premikanje z lseek po %s ni mogo�e"
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr "napaka pri pisanju na %s"
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, c-format
 msgid "%s: failed to get extents info"
 msgstr "%s: branje informacij extents ni uspelo"
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, c-format
 msgid "%s: write failed"
 msgstr "%s: pisanje ni uspelo"
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, c-format
 msgid "failed to extend %s"
 msgstr "razširjanje %s ni uspelo"
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, c-format
 msgid "clearing permissions for %s"
-msgstr "brišemo dovoljenja za %s"
+msgstr "brišejo se dovoljenja za %s"
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "lastništvo za %s ni bilo ohranjeno"
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
 msgstr "vpogled v datoteko %s ni uspel"
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, c-format
 msgid "failed to preserve authorship for %s"
 msgstr "avtorstvo datoteke %s ni bilo ohranjeno"
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
+#, c-format
+msgid "failed to set default file creation context to %s"
+msgstr "nastavitev privzetega konteksta datoteke na %s ni uspela"
+
+#: src/copy.c:820
+#, c-format
+msgid "failed to set default file creation context for %s"
+msgstr "nastavitev privzetega konteksta datoteke za %s ni uspela"
+
+#: src/copy.c:846
+#, c-format
+msgid "failed to set the security context of %s"
+msgstr "nastavitev varnostnega konteksta %s ni uspela"
+
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
 msgid "cannot open %s for reading"
 msgstr "datotek %s ni mogo�e odpreti za branje"
 
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, c-format
 msgid "cannot fstat %s"
 msgstr "statusa %s ni mo� ugotoviti s fstat"
 
-#: src/copy.c:820
+#: src/copy.c:935
 #, c-format
 msgid "skipping file %s, as it was replaced while being copied"
-msgstr "datoteko %s izpustimo, ker je bila med prepisom zamenjana"
-
-#: src/copy.c:850
-#, c-format
-msgid "failed to get file system create context"
-msgstr "branje konteksta ustvarjenja datote�nega sistema ni uspelo"
-
-#: src/copy.c:864
-#, c-format
-msgid "failed to set the security context of %s to %s"
-msgstr "nastavitev varnostnega konteksta %s na %s ni uspela"
+msgstr "izpusti se datoteka %s, ker je bila med prepisom zamenjana"
 
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
 msgid "cannot remove %s"
 msgstr "ni mogo�e odstraniti %s"
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
 msgstr "odstranjena %s\n"
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
-msgstr "ne pišemo prek obvisene simbolne povezave %s"
+msgstr "ne piše se prek obvisene simbolne povezave %s"
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, c-format
 msgid "cannot create regular file %s"
 msgstr "ni mogo�e ustvariti navadne datoteke %s"
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, c-format
 msgid "failed to clone %s from %s"
 msgstr "ustvarjanje klona %s iz %s ni uspelo"
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
-msgstr "ohranjeni �asi za %s"
+msgstr "ohranjajo se �asi za %s"
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
-#, fuzzy, c-format
+#, c-format
 msgid "failed to close %s"
-msgstr "odpiranje %s ni uspelo"
+msgstr "zapiranje %s ni uspelo"
 
-#: src/copy.c:1471
-#, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
+#: src/copy.c:1580
+#, fuzzy, c-format
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
 msgstr "%s: naj pišemo prek %s navzlic zaš�iti %04lo (%s)? "
 
-#: src/copy.c:1478
+#: src/copy.c:1581
+#, c-format
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr ""
+
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
 msgstr "%s: naj pišemo prek %s? "
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr " (varnostna kopija: %s)"
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr "povrnitev privzetega konteksta ustvarjenja datoteke ni uspela"
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, c-format
 msgid "cannot create hard link %s to %s"
 msgstr "ni mogo�e ustvariti trde povezave %s na %s"
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, c-format
 msgid "cannot stat %s"
 msgstr "statusa %s ni mo� ugotoviti s stat"
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, c-format
 msgid "omitting directory %s"
-msgstr "izpuš�amo imenik %s"
+msgstr "izpuš�a se imenik %s"
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr "opozorilo: izvorna datoteka %s je podana ve� kot enkrat"
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
 msgstr "%s in %s sta ena in ista datoteka"
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr "prek ne-imenika %s ne moremo pisati imenika %s"
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr "prek pravkar ustvarjene datoteke %s ne moremo zapisati %s"
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr "prek imenika %s ne moremo zapisati ne-imenika"
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr "imenika ne moremo premakniti v ne-imenik: %s -> %s"
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr "varnostna kopija %s bi uni�ila izvirnik;  %s ni premaknjen"
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr "varnostna kopija %s bi uni�ila izvirnik;  %s ni prepisan"
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
 msgstr "ni mogo�e izdelati varnostne kopije %s"
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr "ne bomo prepisali %s prek pravkar ustvarjene simbolne povezave %s"
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr "imenika %s se ne da prepisati vase, v %s"
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr "ni mogo�e ustvariti trde povezave %s na imenik %s"
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr "imenika %s se ne da premakniti v %s, ki je podimenik prvega"
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, c-format
 msgid "cannot move %s to %s"
 msgstr "ni mogo�e premakniti %s v %s"
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr "premik med enotami ni uspel: %s v %s; cilja ni mo� odstraniti"
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, c-format
-msgid "failed to set default file creation context to %s"
-msgstr "nastavitev privzetega konteksta datoteke na %s ni uspela"
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr "ni mogo�e prepisati cikli�ne simbolne povezave %s"
 
 # ! INEXACT
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr "%s: relativne simbolne povezave so mogo�e samo znotraj imenika"
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr "ni mogo�e ustvariti simbolne povezave %s na %s"
 
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, c-format
 msgid "cannot create fifo %s"
 msgstr "ni mogo�e ustvariti FIFO %s"
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, c-format
 msgid "cannot create special file %s"
 msgstr "ni mogo�e ustvariti posebne datoteke %s"
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, c-format
 msgid "cannot read symbolic link %s"
 msgstr "ni mogo�e prebrati simbolne povezave %s"
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, c-format
 msgid "cannot create symbolic link %s"
 msgstr "ni mogo�e ustvariti simbolne povezave %s"
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
 msgstr "%s ima neznan tip datoteke"
 
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, c-format
 msgid "cannot un-backup %s"
 msgstr "ni mogo�e odstraniti varnostne kopije %s"
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr "%s -> %s (brez varnostne kopije)\n"
 
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr ""
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr ""
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, fuzzy, c-format
+msgid "unknown program %s"
+msgstr "neznani tok"
+
 # ! INEXACT
-#: src/cp.c:156 src/mv.c:286
+#: src/cp.c:157 src/mv.c:288
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -2116,15 +2171,12 @@ msgstr ""
 "  ali:   %s [IZBIRA]... IZVOR... IMENIK\n"
 "  ali:   %s [IZBIRA]... --target-directory=IMENIK IZVOR...\n"
 
-#: src/cp.c:162
-#, fuzzy
+#: src/cp.c:163
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
-msgstr ""
-"Prepišemo IZVOR v CILJ, ali ve� IZVOROV v IMENIK.\n"
-"\n"
+msgstr "IZVOR se prepiše v CILJ, ali ve� IZVOROV v IMENIK.\n"
 
 # ! INEXACT
-#: src/cp.c:168
+#: src/cp.c:169
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
 "      --attributes-only        don't copy the file data, just the "
@@ -2150,8 +2202,7 @@ msgstr ""
 "                                 posebnih datotek\n"
 "  -d                           isto kot --no-dereference --preserve=links\n"
 
-#: src/cp.c:177
-#, fuzzy
+#: src/cp.c:178
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
 "                                 opened, remove it and try again (this "
@@ -2163,34 +2214,35 @@ msgid ""
 "                                  option)\n"
 "  -H                           follow command-line symbolic links in SOURCE\n"
 msgstr ""
-"  -f, --force                  �e ciljne datoteke ni mogo�e odpreti, jo\n"
-"                                 odstranimo in poskusimo znova (nepotrebno,\n"
-"                                 �e je uporabljena izbira -n)\n"
+"  -f, --force                  �e ciljne datoteke ni mogo�e odpreti, se jo\n"
+"                                 odstrani in poskusi znova (ta izbira se\n"
+"                                 ne upošteva, �e je uporabljena izbira -n)\n"
 "  -i, --interactive            pred vsakim pisanjem prek obstoje�e datoteko\n"
-"                                 zahtevamo potrditev (prevlada nad izbiro -"
+"                                 se zahteva potrditev (prevlada nad izbiro -"
 "n)\n"
-"  -H                           sledimo simbolnim povezavam v VIRU\n"
+"  -H                           sledi se simbolnim povezavam v VIRU\n"
 
-#: src/cp.c:186
+#: src/cp.c:187
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
 "  -L, --dereference            always follow symbolic links in SOURCE\n"
 msgstr ""
-"  -l, --link                   ustvarimo trde povezave namesto kopij "
+"  -l, --link                   ustvarijo se trde povezave namesto kopij "
 "datotek\n"
-"  -L, --dereference            vedno sledimo simbolnim povezavam v VIRU\n"
+"  -L, --dereference            vedno se sledi simbolnim povezavam v VIRU\n"
 
-#: src/cp.c:190
+#: src/cp.c:191
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
 "                                 a previous -i option)\n"
 "  -P, --no-dereference         never follow symbolic links in SOURCE\n"
 msgstr ""
-"  -n, --no-clobber             ne pišemo prek obstoje�e datoteke (prevlada\n"
+"  -n, --no-clobber             ne piše se prek obstoje�e datoteke (prevlada\n"
 "                                 nad prejšnjo izbiro -i)\n"
-"  -P, --no-dereference         nikoli ne sledimo simbolnim povezavam v VIRU\n"
+"  -P, --no-dereference         nikoli se ne sledi simbolnim povezavam v "
+"VIRU\n"
 
-#: src/cp.c:195
+#: src/cp.c:196
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
 "      --preserve[=ATTR_LIST]   preserve the specified attributes (default:\n"
@@ -2201,22 +2253,22 @@ msgid ""
 msgstr ""
 "  -p                           isto kot --preserve=mode,ownership,"
 "timestamps\n"
-"      --preserve[=SEZN_PRIL]   �e je mogo�e, ohranimo navedene prilastke\n"
-"                                 (atribute) datotek (privzeto: mode, "
+"      --preserve[=SEZN_PRIL]   �e je mogo�e, se ohranijo navedeni prilastki\n"
+"                                 (atributi) datotek (privzeto: mode, "
 "ownership,\n"
 "                                 timestamps; dodatno: context, links, "
 "xattr,\n"
 "                                 all)\n"
 
-#: src/cp.c:203
+#: src/cp.c:204
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                use full source file name under DIRECTORY\n"
 msgstr ""
-"      --no-preserve=SEZN_PRIL  ne ohranimo navedenih prilastkov\n"
-"      --parents                pot do vira dodaj v IMENIK\n"
+"      --no-preserve=SEZN_PRIL  ne ohranijo se navedeni prilastki\n"
+"      --parents                pot do vira se doda v IMENIK\n"
 
-#: src/cp.c:207
+#: src/cp.c:208
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
 "      --reflink[=WHEN]         control clone/CoW copies. See below\n"
@@ -2224,25 +2276,24 @@ msgid ""
 "                                 attempting to open it (contrast with --"
 "force)\n"
 msgstr ""
-"  -R, -r, --recursive          imenike prepišemo rekurzivno\n"
+"  -R, -r, --recursive          imeniki se prepišejo rekurzivno\n"
 "      --reflink[=KDAJ]         nadzor kopij CoW/klon. Glejte spodaj.\n"
-"      --remove-destination     vsako ciljno datoteko vedno odstranimo pred\n"
+"      --remove-destination     vsaka ciljna datoteka se vedno odstrani pred\n"
 "                                 poskusom pisanja vanjo (prim. --force)\n"
 
-#: src/cp.c:213
+#: src/cp.c:214
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
 "                                 argument\n"
 msgstr ""
-"      --sparse=KDAJ            kdaj ustvarimo razpršene datoteke. Glejte "
+"      --sparse=KDAJ            kdaj se ustvarijo razpršene datoteke. Glejte "
 "spodaj.\n"
-"      --strip-trailing-slashes  odstrani zaklju�ne poševnice iz vseh "
-"podanih\n"
-"                                 IZVOROV\n"
+"      --strip-trailing-slashes  odstranijo se zaklju�ne poševnice iz vseh \n"
+"                                 podanih IZVOROV\n"
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -2250,12 +2301,12 @@ msgid ""
 "DIRECTORY\n"
 "  -T, --no-target-directory    treat DEST as a normal file\n"
 msgstr ""
-"  -s, --symbolic-link          ustvari simbolne povezave namesto kopij\n"
+"  -s, --symbolic-link          ustvarijo se simbolne povezave namesto kopij\n"
 "  -S, --suffix=PRIPONA         pripona varnostne kopije naj bo PRIPONA\n"
 "      --target-directory=IMENIK  vse IZVORE premakni v IMENIK\n"
-"  -T, --no-target-directory    obravnavaj CILJ kot navadno datoteko\n"
+"  -T, --no-target-directory    CILJ se obravnava kot navadna datoteka\n"
 
-#: src/cp.c:224
+#: src/cp.c:225
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
 "                                 than the destination file or when the\n"
@@ -2263,14 +2314,26 @@ msgid ""
 "  -v, --verbose                explain what is being done\n"
 "  -x, --one-file-system        stay on this file system\n"
 msgstr ""
-"  -u, --update                 prepiši samo. �e je IZVOR novejši od CILJA "
-"ali\n"
-"                                 kadar CILJ Å¡e ne obstaja\n"
+"  -u, --update                 prepiše se le. �e je IZVOR novejši od CILJA\n"
+"                                 ali kadar CILJ Å¡e ne obstaja\n"
 "  -v, --verbose                z razlago poteka\n"
-"  -x, --one-file-system        samo krajevni datote�ni sistem\n"
+"  -x, --one-file-system        dejanje omejeno na krajevni datote�ni sistem\n"
+
+#: src/cp.c:232
+#, fuzzy
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+"  -Z, --context[=KONTEKST]     varnostni kontekst SELinux za ciljno "
+"datoteko\n"
+"                                 se nastavi na privzeti tip, ali na "
+"KONTEKST\n"
 
 # ! INEXACT
-#: src/cp.c:233
+#: src/cp.c:240
 msgid ""
 "\n"
 "By default, sparse SOURCE files are detected by a crude heuristic and the\n"
@@ -2302,7 +2365,7 @@ msgstr ""
 "se \n"
 "uporabi standardno kopiranje.\n"
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 msgid ""
 "\n"
 "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n"
@@ -2313,11 +2376,11 @@ msgid ""
 msgstr ""
 "\n"
 "Varnostna kopija ima pripono »~«, razen �e ni z izbiro --suffix ali\n"
-"spremenljivko SIMPLE_BACKUP_SUFFIX nastavljeno druga�e. Vrsto varnostnih\n"
-"kopij lahko nastavimo z izbiro --backup ali spremenljivko\n"
+"spremenljivko SIMPLE_BACKUP_SUFFIX nastavljeno druga�e. Vrsta varnostnih\n"
+"kopij se lahko nastavi z izbiro --backup ali spremenljivko\n"
 "VERSION_CONTROL. Možnosti so:\n"
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2330,7 +2393,7 @@ msgstr ""
 "                  sicer enostavne\n"
 "  simple, never   vedno enostavne varnostne kopije\n"
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2343,223 +2406,232 @@ msgstr ""
 "--force in --backup, IZVOR in CILJ pa sta isto ime za obstoje�o navadno\n"
 "datoteko.\n"
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, c-format
 msgid "failed to preserve times for %s"
 msgstr "�asi za %s niso bili ohranjeni"
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, c-format
 msgid "failed to preserve permissions for %s"
 msgstr "dovoljenja datoteke %s niso ohranjena"
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, c-format
 msgid "cannot make directory %s"
 msgstr "ni mogo�e ustvariti imenika %s"
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr "%s obstaja, vendar ni imenik"
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
-#, fuzzy, c-format
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
+#, c-format
 msgid "failed to access %s"
-msgstr "odpiranje %s ni uspelo"
+msgstr "dostop do %s ni uspel"
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, c-format
 msgid "missing file operand"
 msgstr "manjkajo� operand datoteke"
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, c-format
 msgid "missing destination file operand after %s"
 msgstr "manjkajo� operand ciljne datoteke za %s"
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr ""
 "izbiri --target-directory (-t) in --no-target-directory (-T) se izklju�ujeta"
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, c-format
 msgid "target %s is not a directory"
 msgstr "cilj %s ni imenik"
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr "pri izbiri --parents mora biti cilj imenik"
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, c-format
 msgid "multiple target directories specified"
 msgstr "podanih je ve� ciljnih imenikov"
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr "OPOZORILO: izbira --context ni upoštevana; jedro ne podpira SELinux"
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr "hkratne trde in simbolne povezave niso mogo�e"
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr "izbiri --backup in --no-clobber se medsebojno izklju�ujeta"
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr "--reflink je mo� uporabiti le skupaj z --sparse=auto"
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr "vrsta varnostne kopije"
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, c-format
+msgid "cannot set target context and preserve it"
+msgstr "ni mogo�e nastaviti obenem ohraniti in nastaviti ciljnega konteksta"
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr "ohranitev varnostnega konteksta brez jedra s podporo SELinux ni mogo�a"
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr ""
 "razširjenih atributov ni mo� ohraniti, cp je zgrajen brez podpore za xattr"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr "Stuart Kemp"
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr "vhod je izginil"
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr "%s: Å¡tevilka vrstice izven razpona"
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, c-format
 msgid "%s: %s: line number out of range"
 msgstr "%s: %s: Å¡tevilka vrstice izven razpona"
 
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, c-format
 msgid " on repetition %s\n"
 msgstr " pri ponovitvi %s\n"
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, c-format
 msgid "%s: %s: match not found"
 msgstr "%s: %s: ujemanja ni"
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr "napaka pri iskanju z regularnimi izrazi"
 
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, c-format
 msgid "write error for %s"
 msgstr "napaka pri pisanju za %s"
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, c-format
 msgid "%s: integer expected after delimiter"
 msgstr "%s: za razmejilnikom pri�akovano celo število"
 
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr "%s: pri ponovitvah je zahtevan »}«"
 
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr "%s}: med »{« in »}« je zahtevano celo število"
 
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr "%s: manjkajo� zaklju�ni razmejilnik »%c«"
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr "%s: neveljavni regularni izraz: %s"
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr "%s: neveljavni vzorec"
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr "%s: Å¡tevilo vrstice mora biti pozitivno"
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr "številka vrstice %s je nižja od številke vrstice pred njo, %s"
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr "opozorilo: Å¡tevilka vrstice %s je ista kot tista pred njo"
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr "manjkajo�e dolo�ilo pretvorbe v priponi"
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr "neveljavno dolo�ilo pretvorbe v priponi: %c"
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr "neveljavno dolo�ilo pretvorbe v priponi: \\\\%.3o"
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr "neveljavna ozna�ba v dolo�ilu pretvorbe: %%%c%c"
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr "preve� dolo�il pretvorbe %% v priponi"
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr "manjkajo�e dolo�ilo pretvorbe %% v priponi"
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr "%s: neveljavno Å¡tevilo"
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr "Uporaba: %s [IZBIRA]... DATOTEKA VZOREC...\n"
 
-#: src/csplit.c:1455
-#, fuzzy
+#: src/csplit.c:1483
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
 "and output byte counts of each piece to standard output.\n"
@@ -2567,9 +2639,8 @@ msgstr ""
 "Izpišemo kose DATOTEKE, lo�ene z VZORCEM in zapišemo v datoteke »xx01«, "
 "»xx02«...,\n"
 "število bajtov v vsakem posami�nem kosu pa izpišemo na standardni izhod.\n"
-"\n"
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2581,7 +2652,11 @@ msgstr ""
 "  -k, --keep-files           ob napaki ne odstrani nepopolno zapisanih "
 "datotek\n"
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr "  -m, --suppress-matched     brez izpisa vrstic, ki ustrezajo VZORCU\n"
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
@@ -2592,15 +2667,15 @@ msgstr ""
 "  -s, --quiet, --silent      brez izpisa velikosti na standardni izhod\n"
 "  -z, --elide-empty-files    odstrani prazne izhodne datoteke\n"
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
 msgstr ""
 "\n"
-"ÄŒe je DATOTEKA -, beremo s standardnega vhoda. VZOREC je lahko eden od:\n"
+"ÄŒe je DATOTEKA -, se bere s standardnega vhoda. VZOREC je lahko eden od:\n"
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 msgid ""
 "\n"
 "  INTEGER            copy up to but not including specified line number\n"
@@ -2626,24 +2701,18 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr "David M. Ihnat"
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr "polja in pozicije se Å¡tejejo od 1 dalje"
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr "Uporaba: %s IZBIRA... [DATOTEKA]...\n"
 
-#: src/cut.c:193
-#, fuzzy
+#: src/cut.c:176
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr ""
 "Izbrane dele vrstic iz vsake od navedenih DATOTEK izpišemo na standardni "
 "izhod.\n"
-"\n"
 
-#: src/cut.c:199
+#: src/cut.c:182
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
 "  -c, --characters=LIST   select only these characters\n"
@@ -2653,7 +2722,7 @@ msgstr ""
 "  -c, --characters=SEZNAM izpiši samo navedene znake\n"
 "  -d, --delimiter=RAZMEJ  polja so razmejena z znakom RAZMEJ namesto s TAB\n"
 
-#: src/cut.c:204
+#: src/cut.c:187
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
 "                            that contains no delimiter character, unless\n"
@@ -2667,7 +2736,7 @@ msgstr ""
 "                            izbira -s\n"
 "  -n                      (se ne upošteva)\n"
 
-#: src/cut.c:210
+#: src/cut.c:193
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
 "                            or fields\n"
@@ -2675,7 +2744,7 @@ msgstr ""
 "      --complement        komplement množice izbranih bajtov, znakov ali "
 "polj\n"
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
@@ -2685,7 +2754,7 @@ msgstr ""
 "      --output-delimiter=NIZ  naj bo NIZ razmejilnik na izhodu\n"
 "                            privzeti izhodni razmejilnik je enak vhodnemu\n"
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2699,7 +2768,7 @@ msgstr ""
 "v\n"
 "istem vrstnem redu, kot je bil prebran, in je zapisan natanko enkrat.\n"
 
-#: src/cut.c:227
+#: src/cut.c:210
 msgid ""
 "Each range is one of:\n"
 "\n"
@@ -2719,47 +2788,50 @@ msgstr ""
 "\n"
 "Če DATOTEKA ni podana, ali �e je enaka - (minusu), se bere standardni vhod.\n"
 
-#: src/cut.c:367 src/cut.c:493
-#, fuzzy
+#: src/cut.c:300 src/cut.c:394
 msgid "invalid byte, character or field list"
-msgstr "neveljavni seznam bajtov ali polj"
+msgstr "neveljavni seznam bajtov, znakov ali polj"
+
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr "polja in pozicije se Å¡tejejo od 1 dalje"
 
-#: src/cut.c:387
+#: src/cut.c:320
 msgid "invalid range with no endpoint: -"
 msgstr "neveljavni razpon brez kon�ne to�ke: -"
 
-#: src/cut.c:403
+#: src/cut.c:334
 msgid "invalid decreasing range"
 msgstr "neveljavni padajo�i razpon"
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, c-format
 msgid "byte offset %s is too large"
 msgstr "odmik %s (v bajtih) je prevelik"
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, c-format
 msgid "field number %s is too large"
 msgstr "Å¡tevilka polja %s je prevelika"
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr "dolo�en je lahko samo en tip seznama"
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr "razmejilnik mora biti en sam znak"
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr "podati je treba seznam bajtov, znakov ali polj"
 
-#: src/cut.c:850
+#: src/cut.c:790
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr "vhodni razmejilnik se sme dolo�iti le, kadar delamo s polji"
 
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
@@ -2767,11 +2839,11 @@ msgstr ""
 "neizpisovanje vrstic, ki ne vsebujejo razmejilnika\n"
 "\tje smiselno le, kadar delamo s polji"
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr "seznam polj manjka"
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr "seznam položajev manjka"
 
@@ -2787,9 +2859,9 @@ msgstr ""
 #: src/date.c:128
 msgid "Display the current time in the given FORMAT, or set the system date.\n"
 msgstr ""
+"Izpišemo trenutni �as v podani OBLIKI, ali pa nastavimo sistemski �as.\n"
 
 #: src/date.c:134
-#, fuzzy
 msgid ""
 "  -d, --date=STRING         display time described by STRING, not 'now'\n"
 "  -f, --file=DATEFILE       like --date once for each line of DATEFILE\n"
@@ -2798,8 +2870,6 @@ msgid ""
 "                            'hours', 'minutes', 'seconds', or 'ns' for date\n"
 "                            and time to the indicated precision.\n"
 msgstr ""
-"Izpišemo trenutni �as v podani OBLIKI, ali pa nastavimo sistemski �as.\n"
-"\n"
 "  -d, --date=NIZ            izpiši �as podan v NIZU namesto trenutnega\n"
 "  -f, --file=DATOTEKA       enako kot --date za vsako vrstico v DATOTEKI\n"
 "  -I[SPEC], --iso-8601[=SPEC]  izpiši datum/uro skladno s standardom ISO "
@@ -2827,7 +2897,7 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 "      --rfc-3339=DOLOČILO   datum v obliki, skladni s priporo�ilom RFC-3339\n"
 "                            DOLOČILO je lahko »date«, »seconds« ali »ns«\n"
@@ -3044,10 +3114,10 @@ msgstr ""
 "Prikaži lokalni �as ob 9. uri zjutraj naslednji ponedeljek v New Yorku:\n"
 "  $ date --date='TZ=\"America/New_York\" 09:00 next Mon\n"
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr "standardni vhod"
@@ -3088,7 +3158,7 @@ msgstr ""
 msgid "cannot set date"
 msgstr "datuma ni mogo�e nastaviti"
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, c-format
 msgid "time %s is out of range"
 msgstr "�as %s je izven razpona"
@@ -3099,7 +3169,7 @@ msgstr "�as %s je izven razpona"
 msgid "Paul Rubin"
 msgstr "Paul Rubin"
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
@@ -3108,7 +3178,7 @@ msgstr ""
 "Uporaba: %s [OPERAND]...\n"
 "  ali:   %s IZBIRA\n"
 
-#: src/dd.c:526
+#: src/dd.c:532
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
 "\n"
@@ -3128,7 +3198,7 @@ msgstr ""
 "  count=BLOKOV    prepiši zgolj zahtevano število vhodnih BLOKOV\n"
 "  ibs=BAJTOV      beri po zahtevano Å¡tevilo BAJTOV naenkrat (privzeto 512)\n"
 
-#: src/dd.c:535
+#: src/dd.c:541
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
 "  iflag=FLAGS     read as per the comma separated symbol list\n"
@@ -3152,7 +3222,7 @@ msgstr ""
 "  status=IZPIS    omeji IZPIS na stderr; »noxfer« brez statistike prenosa,\n"
 "                    »none« brez vseh izpisov\n"
 
-#: src/dd.c:546
+#: src/dd.c:552
 msgid ""
 "\n"
 "N and BYTES may be followed by the following multiplicative suffixes:\n"
@@ -3170,7 +3240,7 @@ msgstr ""
 "PRETVORBA je lahko (ve� izbir lo�imo z vejico):\n"
 "\n"
 
-#: src/dd.c:555
+#: src/dd.c:561
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
 "  ebcdic    from ASCII to EBCDIC\n"
@@ -3198,7 +3268,7 @@ msgstr ""
 "              tudi block ali unblock, zapolni s presledki namesto z znaki "
 "NUL\n"
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -3214,7 +3284,7 @@ msgstr ""
 "  fdatasync fizi�no zapiši izhodno datoteko pred zaklju�kom dela\n"
 "  fsync     enako, vendar zapiši tudi metapodatke              \n"
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -3229,76 +3299,76 @@ msgstr ""
 "priporo�eno\n"
 "            conv=notrunc)\n"
 
-#: src/dd.c:583
+#: src/dd.c:589
 msgid "  cio       use concurrent I/O for data\n"
 msgstr "  cio       uporabi vzporedne vhodno-izhodne funkcije za podatke\n"
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr "  direct    uporabi neposredne vhodno-izhodne funkcije za podatke\n"
 
-#: src/dd.c:587
+#: src/dd.c:593
 msgid "  directory  fail unless a directory\n"
 msgstr "  directory  opusti, razen �e je imenik\n"
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr ""
 "  dsync     uporabi sinhronizirane vhodno-izhodne funkcije za podatke\n"
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr "  sync      enako, a tudi za metapodatke\n"
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr "  fullblock  naberi polne bloke na vhodu (zgolj iflag)\n"
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr "  nonblock  uporabi neblokirne vhodno-izhodne funkcije\n"
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr "  noatime   ne ažuriraj �asa zadnjega dostopa\n"
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr "  nocache   zavrzi medpomnjene podatke\n"
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr "  noctty    ne dolo�aj krmilnega terminala iz datoteke\n"
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr "  nofollow  ne sledi simbolnim povezavam\n"
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr "  nolinks   opusti, �e je datoteka ve�kratno povezana\n"
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr "  binary    uporabi binarne vhodno-izhodne funkcije za podatke\n"
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr "  text      uporabi besedilne vhodno-izhodne funkcije za podatke\n"
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr "  count_bytes  upoštevaj »count=N« kot šteto v bajtih (samo iflag)\n"
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr "  skip_bytes  upoštevaj »skip=N« kot šteto v bajtih (samo iflag)\n"
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr "  seek_bytes  upoštevaj »seek=N« kot šteto v bajtih (samo iflag)\n"
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, c-format
 msgid ""
 "\n"
@@ -3327,7 +3397,18 @@ msgstr ""
 "Izbire so:\n"
 "\n"
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr "pomnilnik porabljen z vhodnim medpomnilnikom velikosti %zu bajtov (%s)"
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr ""
+"pomnilnik porabljen z izhodnim medpomnilnikom velikosti %zu bajtov (%s)"
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
@@ -3337,7 +3418,7 @@ msgstr ""
 "%<PRIuMAX>+%<PRIuMAX> zapisov na izhodu\n"
 
 # ! INEXACT
-#: src/dd.c:689
+#: src/dd.c:754
 #, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
@@ -3346,7 +3427,7 @@ msgstr[1] "%<PRIuMAX> odrezan zapis\n"
 msgstr[2] "%<PRIuMAX> odrezana zapisa\n"
 msgstr[3] "%<PRIuMAX> odrezani zapisi\n"
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
@@ -3355,7 +3436,7 @@ msgstr[1] "%<PRIuMAX> bajt (%s) prepisan"
 msgstr[2] "%<PRIuMAX> bajta (%s) prepisana"
 msgstr[3] "%<PRIuMAX> bajti (%s) prepisani"
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr "neskon�no B"
 
@@ -3369,85 +3450,85 @@ msgstr "neskon�no B"
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
 msgstr ", %g s, %s/s\n"
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, c-format
 msgid "closing input file %s"
 msgstr "zapiramo vhodno datoteko %s"
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr "zapiramo izhodno datoteko %s"
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr "izklop O_DIRECT ni uspel: %s"
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, c-format
 msgid "writing to %s"
 msgstr "pišemo na %s"
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, c-format
 msgid "unrecognized operand %s"
 msgstr "neprepoznan operand %s"
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 msgid "invalid conversion"
 msgstr "neveljavna pretvorba"
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 msgid "invalid input flag"
 msgstr "neveljavna vhodna zastavica"
 
 # ! INEXACT
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 msgid "invalid output flag"
 msgstr "neveljavno izhodna zastavica"
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 msgid "invalid status flag"
 msgstr "neveljavna statusna zastavica"
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, c-format
 msgid "invalid number %s"
 msgstr "neveljavno Å¡tevilo %s"
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr "pretvorbe ascii, ebcdic in ibm se medsebojno izklju�ujejo"
 
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, c-format
 msgid "cannot combine block and unblock"
 msgstr "pretvorbi block in unblock se medsebojno izklju�ujeta"
 
 # ! INEXACT
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, c-format
 msgid "cannot combine lcase and ucase"
 msgstr "pretvorbi lcase in ucase se medsebojno izklju�ujeta"
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, c-format
 msgid "cannot combine excl and nocreat"
 msgstr "pretvorbi excl in nocreat se medsebojno izklju�ujeta"
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, c-format
 msgid "cannot combine direct and nocache"
 msgstr "izbiri direct in nocache se medsebojno izklju�ujeta"
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
@@ -3456,73 +3537,62 @@ msgstr ""
 "opozorilo: obvoz okoli napake lseek v jedru za datoteko (%s)\n"
 "   vrste mt_type=0x%0lx -- glejte <sys/mtio.h> za seznam zvrsti"
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, c-format
 msgid "%s: cannot skip"
 msgstr "%s: pri branju premik s »skip« ni mogo�"
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, c-format
 msgid "%s: cannot seek"
 msgstr "%s: pri pisanju premik s »seek« ni mogo�"
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr "prekora�itev odmika pri branju datoteke %s"
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr "opozorilo: neveljavni odmik datoteke po napaki pri branju"
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr "napake v jedru ni bilo mogo�e zaobiti"
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, c-format
 msgid "setting flags for %s"
 msgstr "nastavljanje zastavic za %s"
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr "pomnilnik porabljen z vhodnim medpomnilnikom velikosti %zu bajtov (%s)"
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr ""
-"pomnilnik porabljen z izhodnim medpomnilnikom velikosti %zu bajtov (%s)"
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr "%s: pri branju premik na zahtevani odmik ni mogo�"
 
-#: src/dd.c:2133
-#, fuzzy, c-format
+#: src/dd.c:2172
+#, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
-msgstr "obrezovanje na %<PRIuMAX> bajtov pri izhodni datoteki %s ni uspelo"
+msgstr "obrezovanje na %<PRIdMAX> bajtov pri izhodni datoteki %s ni uspelo"
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr "fdatasync ni uspel za %s"
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
 msgstr "fsync ni uspel za %s<"
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, c-format
 msgid "failed to open %s"
 msgstr "odpiranje %s ni uspelo"
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
@@ -3531,126 +3601,136 @@ msgstr ""
 "odmik prevelik: ni mo� odrezati na dolžino seek=%<PRIuMAX> (%lu-bajtnih) "
 "blokov"
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr "obrezovanje na %<PRIuMAX> bajtov pri izhodni datoteki %s ni uspelo"
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, c-format
 msgid "failed to discard cache for: %s"
 msgstr "neuspela zavržba medpomnjenih podatkov za: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr "Paul Eggert"
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr "Dat. sist."
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr "Tip"
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr "blokov"
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr "Upor."
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr "Na voljo"
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr "Upo%"
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr "Inodov"
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr "IUpor"
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr "IPros"
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr "IUpo%"
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
-msgstr "Priklopljeno na"
+msgstr "Priklop na"
+
+#: src/df.c:207
+msgid "File"
+msgstr "Datk"
 
-#: src/df.c:383
+#: src/df.c:387
 #, c-format
-msgid "option --output: field '%s' unknown"
-msgstr ""
+msgid "option --output: field %s unknown"
+msgstr "izbira --output: polje %s ni znano"
 
-#: src/df.c:390
-#, fuzzy, c-format
-msgid "option --output: field '%s' used more than once"
-msgstr "opozorilo: izvorna datoteka %s je podana ve� kot enkrat"
+#: src/df.c:394
+#, c-format
+msgid "option --output: field %s used more than once"
+msgstr "izbira --output: polje %s je uporabljeno ve� kot enkrat"
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr "Vel."
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr "Prost"
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr "Kapacit."
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
 msgstr "%s-%s"
 
-#: src/df.c:1210
-#, fuzzy
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr ""
+
+#: src/df.c:1384
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
 "or all file systems by default.\n"
 msgstr ""
 "Izpišemo informacije o datote�nem sistemu, na katerem se nahaja DATOTEKA,\n"
 "ali (privzeto) o vseh datote�nih sistemih.\n"
-"\n"
 
-#: src/df.c:1217
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
+#, fuzzy
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
 "  -a, --all             vklju�no s praznimi datote�nimi sistemi\n"
 "  -B, --block-size=N    uporabljamo N bajtov velike bloke; npr. »-BM« "
 "izpiše\n"
 "                          velikosti v enotah po 1.048.576 bajtov\n"
+"                          Glej obliko zapisa VELIKOSTI niže.\n"
 "      --total           izpis skupne porabe\n"
 "  -h, --human-readable  velikosti v �loveku umljivi obliki (npr. 1K 234M "
 "2G)\n"
 "  -H, --si              podobno kot -h, vendar z bazo 1000 namesto 1024\n"
 
-#: src/df.c:1227
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -3663,8 +3743,7 @@ msgstr ""
 "  -l, --local           omejimo seznam na lokalni datote�ni sistem\n"
 "      --no-sync         brez klica sync() pred izpisom porabe (privzeto)\n"
 
-#: src/df.c:1234
-#, fuzzy
+#: src/df.c:1409
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
 "                               or print all fields if FIELD_LIST is "
@@ -3676,6 +3755,10 @@ msgid ""
 "  -x, --exclude-type=TYPE   limit listing to file systems not of type TYPE\n"
 "  -v                    (ignored)\n"
 msgstr ""
+"      --output[=SEZNAM_POLJ]  uporabi format izpisa, dolo�en s "
+"SEZNAMOM_POLJ,\n"
+"                                ali izpiši vsa polja, �e SEZNAM_POLJ ni\n"
+"                                dolo�en.\n"
 "  -P, --portability     izhodni format POSIX\n"
 "      --sync            klic sync() pred izpisom porabe\n"
 "  -t, --type=TIP        samo datote�ni sistemi tipa TIP\n"
@@ -3683,42 +3766,39 @@ msgstr ""
 "  -x, --exclude-type=TIP     brez datote�nih sistemov tipa TIP\n"
 "  -v                    (se ne upošteva)\n"
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
+"\n"
+"SEZNAM_POLJ je z vejico lo�en seznam stolpcev, ki naj bodo izpisani. "
+"Veljavna\n"
+"imena polj so: »source«, »fstype«, »itotal«, »iused«, »iavail«, »ipcent«,\n"
+"»size«, »used«, »avail«, »pcent«, »file« in »target« (oglejte si stran "
+"info).\n"
 
-#: src/df.c:1285
-#, fuzzy, c-format
+#: src/df.c:1460
+#, c-format
 msgid "options %s and %s are mutually exclusive"
-msgstr "izbiri --compare (-C) in --strip se medsebojno izklju�ujeta"
-
-#: src/df.c:1335
-msgid "warning: "
-msgstr "opozorilo: "
+msgstr "izbiri %s in %s se medsebojno izklju�ujeta"
 
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr ""
-"raba dolge izbire »--megabytes« je odsvetovana, v kratkem bo izbira ukinjena"
-
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr "tip datote�nega sistema %s je obenem izbran in izlo�en"
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr "Opozorilo: "
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 msgid "cannot read table of mounted file systems"
 msgstr "tabele priklopljenih datote�nih sistemov ni mo� prebrati"
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr "obdelan ni bil noben datote�ni sistem"
@@ -3729,7 +3809,7 @@ msgid "H. Peter Anvin"
 msgstr "H. Peter Anvin"
 
 # ! INEXACT
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr "Uporaba: %s [IZBIRA]... [DATOTEKA]...\n"
@@ -3816,7 +3896,8 @@ msgstr ""
 "imenik).\n"
 
 #: src/dirname.c:59
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
+#, fuzzy
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
 msgstr "  -0, --null     vrstice naj se zaklju�ijo z znakom NUL, ne LF\n"
 
 #: src/dirname.c:64
@@ -3834,7 +3915,7 @@ msgstr ""
 "  %s dir1/str dir2/str  -> »dir1«, ki mu sledi »dir2«\n"
 "  %s stdio.h            -> ».«\n"
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -3843,18 +3924,15 @@ msgstr ""
 "Uporaba: %s [IZBIRA]... [DATOTEKA]...\n"
 "  ali:   %s [IZBIRA]... --files0-from=F\n"
 
-#: src/du.c:274
-#, fuzzy
+#: src/du.c:285
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr ""
 "Povzetek porabe diska za datoteko DATOTEKA, rekurzivno po podimenikih.\n"
-"\n"
 
-#: src/du.c:280
+#: src/du.c:291
 #, fuzzy
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3862,6 +3940,8 @@ msgid ""
 "                          larger due to holes in ('sparse') files, internal\n"
 "                          fragmentation, indirect blocks, and the like\n"
 msgstr ""
+"  -0, --null            vsako izhodno vrstico zaklju�i z znakom NUL namesto\n"
+"                          z znakom za novo vrstico\n"
 "  -a, --all             izpis za vse datoteke, ne le za imenike\n"
 "      --apparent-size   izpis navidezne dolžine namesto porabe diska; "
 "slednja \n"
@@ -3870,12 +3950,11 @@ msgstr ""
 "bloki\n"
 "                          ipd.) pa je lahko tudi manjša\n"
 
-#: src/du.c:289
-#, fuzzy
+#: src/du.c:300
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3886,23 +3965,29 @@ msgid ""
 "                          line argument;  --max-depth=0 is the same as\n"
 "                          --summarize\n"
 msgstr ""
-"  -B, --block-size=ENOTA  Å¡tejemo v ENOTA bajtov velikih blokih;\n"
+"  -B, --block-size=VELIKOST  enota bloka, v kateri se Å¡teje VELIKOST;\n"
 "                          npr. »-BM« izpiše velikost v enotah po 1.048.576\n"
-"                          bajtov.  Glejte spodaj za format podane ENOTE. \n"
+"                          bajtov.  Glejte spodaj za format podane "
+"VELIKOSTI.\n"
 "  -b, --bytes           isto kot »--apparent-size --block-size=1«\n"
 "  -c, --total           skupni povzetek\n"
 "  -D, --dereference-args  razrešimo le simbolne povezave, navedene v ukazni "
 "vrstici\n"
+"      --max-depth=N     skupni izpis samo za imenike (in datoteke pri\n"
+"                        izbiri --all), ki so N ali manj ravni pod v ukazni \n"
+"                        lupini navedenim imenikom; --max-depth=0 je isto "
+"kot\n"
+"                        --summarize\n"
 
-#: src/du.c:302
-#, fuzzy
+#: src/du.c:313
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
 "      --files0-from=S   poraba diska za datoteke, navedene v datoteki S;\n"
 "                          datoteke v seznamu morajo biti lo�ene z znakom "
@@ -3911,10 +3996,8 @@ msgstr ""
 "  -H                    isto kot --dereference-args (-D)\n"
 "  -h, --human-readable  velikosti v �loveku berljivem zapisu (npr. 1K 234M "
 "2G)\n"
-"      --si              podobno kot -h, vendar v bazi 1000 namesto 1024\n"
 
-#: src/du.c:310
-#, fuzzy
+#: src/du.c:322
 msgid ""
 "  -k                    like --block-size=1K\n"
 "  -L, --dereference     dereference all symbolic links\n"
@@ -3922,28 +4005,25 @@ msgid ""
 "  -m                    like --block-size=1M\n"
 msgstr ""
 "  -k                    isto kot --block-size=1K\n"
+"  -L, --dereference     s sledenjem vsem simbolnim povezavam\n"
 "  -l, --count-links     trde povezeva štejemo po ve�krat\n"
 "  -m                    isto kot --block-size=1M\n"
 
-#: src/du.c:316
-#, fuzzy
+#: src/du.c:328
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
-"  -L, --dereference     sledimo vsem simbolnim povezavam, Å¡tejemo ciljne "
-"datoteke\n"
-"  -P, --no-dereference  ne sledimo nobeni simbolni povezavi (privzeto)\n"
-"  -O, --null            vsako izhodno vrstico zaklju�imo z znakom NUL "
-"namesto NL\n"
-"  -S, --separate-dirs   brez velikosti podimenikov\n"
+"  -P, --no-dereference  brez sledenja simbolnim povezavam (privzeto)\n"
+"  -S, --separate-dirs   pri imenikih brez velikosti podimenikov\n"
+"      --si              kot -h, vendar v bazi 1000 namesto 1024\n"
 "  -s, --summarize       za vsak argument samo povzetek\n"
 
-#: src/du.c:322
-#, fuzzy
+#: src/du.c:334
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
 "                          or entries greater than SIZE if negative\n"
@@ -3952,86 +4032,94 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
 msgstr ""
+"  -t, --threshold=VELIKOST  izvzemi vnose manjše od VELIKOSTI, �e je ta \n"
+"                          pozitivna, oz ve�jih od VELIKOSTI, �e je "
+"negativna\n"
 "      --time            prikaži �as zadnje spremembe katerekoli datoteke v\n"
 "                          imeniku ali kateregakoli od podimenikov\n"
 "      --time=BESEDA     prikaži �as kot BESEDA namesto �asa zadnje "
 "spremembe:\n"
 "                          atime, access, use, ctime ali status\n"
-"      --time-style=SLOG prikaži �as z uporabo navedenega SLOGA\n"
+"      --time-style=SLOG prikaži �as z uporabo navedenega SLOGA, ki je "
+"lahko:\n"
 "                          full-iso, long-iso, iso, +FORMAT\n"
 "                          FORMAT se tolma�i kot pri ukazu »date«\n"
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
 "  -x, --one-file-system    skip directories on different file systems\n"
 msgstr ""
+"  -X  --exclude-from=DATOTEKA  izvzemi datoteke, ki jih pokrivajo vzorci, \n"
+"                        podani v DATOTEKI\n"
+"      --exclude=VZOREC  izvzemi datoteke, ki jih pokriva podani VZOREC\n"
+"  -x, --one-file-system  presko�i imenike na ostalih datote�nih sistemih\n"
 
-#: src/du.c:386
+#: src/du.c:398
 msgid "Infinity"
 msgstr "neskon�no"
 
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr "priklopna to�ka %s je bila že pre�esana"
-
-#: src/du.c:624
+#: src/du.c:636
 #, c-format
 msgid "fts_read failed: %s"
 msgstr "fts_read ni uspel: %s"
 
-#: src/du.c:780
+#: src/du.c:787
 #, c-format
 msgid "invalid maximum depth %s"
 msgstr "neveljavna najve�ja globina %s"
 
-#: src/du.c:809
-#, fuzzy, c-format
+#: src/du.c:816
+#, c-format
 msgid "invalid --threshold argument '-0'"
-msgstr "neveljavni --%s argument %s"
+msgstr "neveljavni --threshold argument '-0'"
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr "možnosti se izklju�ujeta - ali izpis vseh, ali povzetek"
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr "opozorilo: povzetek je isto kot izbira --max-depth=0"
 
-#: src/du.c:900
+#: src/du.c:911
 #, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr "opozorilo: povzetek se izklju�uje z --max-depth=%lu"
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr "opozorilo: izbiri --apparent-size in -b pri --inodes nimata vpliva"
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 msgid "file operands cannot be combined with --files0-from"
 msgstr "datote�nih operandov ni mogo�e kombinirati z izbiro --files0-from."
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr "%s: napaka pri branju"
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr "pri branju imen datotek s standardnega vhoda ime %s ni dovoljeno."
 
 # ! INEXACT
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 msgid "invalid zero-length file name"
 msgstr "neveljavno ime (dolžina ni�) datoteke"
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr "skupno"
 
@@ -4135,17 +4223,15 @@ msgstr "Uporaba: %s [IZBIRA]... [-] [IME=VREDNOST]... [UKAZ [ARGUMENT]...]\n"
 
 #: src/env.c:55
 msgid "Set each NAME to VALUE in the environment and run COMMAND.\n"
-msgstr ""
+msgstr "Dolo�i VREDNOST spremenljivki okolja z danim IMENOM in poženi UKAZ.\n"
 
 #: src/env.c:61
 #, fuzzy
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
-"Dolo�i VREDNOST spremenljivki okolja z danim IMENOM in poženi UKAZ.\n"
-"\n"
 "  -i, --ignore-environment   za�ni iz praznega okolja\n"
 "  -0, --null                 vsako izhodno vrstico zaklju�i z znakom NUL\n"
 "                               namesto z znakom za novo vrstico\n"
@@ -4176,7 +4262,6 @@ msgid "cannot specify --null (-0) with command"
 msgstr "ni mogo�e dolo�iti --null (-0) z ukazom"
 
 #: src/expand.c:107
-#, fuzzy
 msgid ""
 "Convert tabs in each FILE to spaces, writing to standard output.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -4185,7 +4270,6 @@ msgstr ""
 "na standardni izhod. Če DATOTEKA ni podana, ali �e je enaka - (minus), "
 "beremo\n"
 "s standardnega vhoda.\n"
-"\n"
 
 #: src/expand.c:114
 msgid ""
@@ -4228,16 +4312,16 @@ msgid "input line is too long"
 msgstr "vhodna vrstica je predolga"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr "Mike Parker"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr "James Youngman"
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
@@ -4246,7 +4330,7 @@ msgstr ""
 "Uporaba: %s IZRAZ\n"
 "  ali:   %s IZBIRA\n"
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -4265,7 +4349,7 @@ msgstr ""
 "                \n"
 "  ARG1 & ARG2       ARG1, �e ni noben argumentov prazen ali enak 0, sicer 0\n"
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -4283,7 +4367,7 @@ msgstr ""
 "  ARG1 >= ARG2      ARG1 je ve�ji ali enak ARG2\n"
 "  ARG1 > ARG2       ARG1 je ve�ji od ARG2\n"
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
@@ -4293,7 +4377,7 @@ msgstr ""
 "  ARG1 + ARG2       aritmeti�na vsota ARG1 in ARG2\n"
 "  ARG1 - ARG2       aritmeti�na razlika ARG1 in ARG2\n"
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -4306,7 +4390,7 @@ msgstr ""
 "  ARG1 / ARG2       aritmeti�ni koli�nik pri deljenju ARG1 z ARG2\n"
 "  ARG1 % ARG2       aritmeti�ni ostanek pri deljenju ARG1 z ARG2\n"
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -4325,7 +4409,7 @@ msgstr ""
 "0\n"
 "  length NIZ                    dožina NIZA\n"
 
-#: src/expr.c:251
+#: src/expr.c:250
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
 "                               keyword like 'match' or an operator like '/'\n"
@@ -4338,7 +4422,7 @@ msgstr ""
 "\n"
 "  ( IZRAZ )         vrednost IZRAZA\n"
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -4355,7 +4439,7 @@ msgstr ""
 "vzorcev vrne niz med oklepajema \\( in \\) ali pa prazen niz; �e \\( in \\)\n"
 "nista podana, vrne Å¡tevilo znakov, ki se ujemajo, ali 0.\n"
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -4367,32 +4451,32 @@ msgstr ""
 "ali 0;\n"
 "2, �e IZRAZ ni skladenjsko pravilen; 3, �e je prišlo do napake.\n"
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, c-format
 msgid "syntax error"
 msgstr "napaka v skladnji"
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, c-format
 msgid "error in regular expression matcher"
 msgstr "napaka v ujemalniku z regularnimi izrazi"
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, c-format
 msgid "non-integer argument"
 msgstr "ne-celoštevil�ni argument"
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr "deljenje z ni�"
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr "nastavite LC_ALL='C', da bi odpravili težavo."
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, c-format
 msgid "the strings compared were %s and %s"
 msgstr "primerjana niza sta bila %s in %s"
@@ -4402,27 +4486,27 @@ msgstr "primerjana niza sta bila %s in %s"
 msgid "Niels Moller"
 msgstr "Niels Möller"
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
 msgstr "Lucasov test praštevil ni uspel.  Do te napake ne bi smelo priti"
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
 msgstr "prekora�itev obsega za vrsto squfof"
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, c-format
 msgid "%s is not a valid positive integer"
 msgstr "%s ni veljavno pozitivno celo Å¡tevilo"
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr "%s je preveliko"
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
@@ -4431,7 +4515,7 @@ msgstr ""
 "Uporaba: %s [Å TEVILO]...\n"
 "  ali:   %s IZBIRA\n"
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
 "are specified on the command line, read them from standard input.\n"
@@ -4468,7 +4552,6 @@ msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n"
 msgstr "Uporaba: %s [-Å IRINA] [IZBIRA]... [DATOTEKA]...\n"
 
 #: src/fmt.c:271
-#, fuzzy
 msgid ""
 "Reformat each paragraph in the FILE(s), writing to standard output.\n"
 "The option -WIDTH is an abbreviated form of --width=DIGITS.\n"
@@ -4476,7 +4559,6 @@ msgstr ""
 "Vsak odstavek v DATOTEKI(-ah) preoblikujemo in izpišemo na standardni "
 "izhod.\n"
 "Izbira -ŠIRINA je okrajšava za --width=ŠTEVILO.\n"
-"\n"
 
 #: src/fmt.c:278
 msgid ""
@@ -4519,14 +4601,12 @@ msgid "invalid width: %s"
 msgstr "neveljavna Å¡irina: %s"
 
 #: src/fold.c:70
-#, fuzzy
 msgid ""
 "Wrap input lines in each FILE (standard input by default), writing to\n"
 "standard output.\n"
 msgstr ""
 "Vrstice v vsaki DATOTEKI na vhodu (privzet je standardni vhod) prelomimo\n"
 "in rezultat izpišemo na standardni izhod.\n"
-"\n"
 
 #: src/fold.c:77
 msgid ""
@@ -4544,17 +4624,17 @@ msgid "invalid number of columns: %s"
 msgstr "neveljavno Å¡tevilo stoplcev: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr "Padraig Brady"
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, c-format
 msgid "Usage: %s\n"
 msgstr "Uporaba: %s\n"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
@@ -4562,12 +4642,12 @@ msgstr ""
 "Izpis lokalnih omejitev v obliki, uporabne za skripte ukazne lupine.\n"
 "\n"
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, c-format
 msgid "failed to get groups for user %s"
 msgstr "branje skupine za uporabnika %s ni uspelo"
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, c-format
 msgid "failed to get groups for the current process"
 msgstr "branje skupine za trenutni proces ni uspelo"
@@ -4592,28 +4672,27 @@ msgstr ""
 "podan,\n"
 "za trenutni proces (ki je druga�en, �e se je baza groups vmes spremenila).\n"
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, c-format
 msgid "cannot get real UID"
 msgstr "pravega UID ni mogo�e ugotoviti"
 
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, c-format
 msgid "cannot get effective GID"
 msgstr "efektivnega GID ni mogo�e ugotoviti"
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, c-format
 msgid "cannot get real GID"
 msgstr "pravega GID ni mogo�e ugotoviti"
 
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, c-format
 msgid "%s: no such user"
 msgstr "%s: uporabnik ne obstaja"
 
 #: src/head.c:109
-#, fuzzy
 msgid ""
 "Print the first 10 lines of each FILE to standard output.\n"
 "With more than one FILE, precede each with a header giving the file name.\n"
@@ -4622,7 +4701,6 @@ msgstr ""
 "Izpišemo prvih 10 vrstic vsake od DATOTEK na standardni izhod.\n"
 "Če je podana ve� kot ena DATOTEKA, pred vsebino izpišemo še ime datoteke.\n"
 "Če DATOTEKA ni podana, ali �e je enaka -, beremo s standardnega vhoda.\n"
-"\n"
 
 #: src/head.c:117
 msgid ""
@@ -4663,58 +4741,48 @@ msgstr ""
 "b za množenje s 512, kB = 1000, K = 1024, MB = 1000×1000, M = 1024×1024,\n"
 "GB = 1000×1000×1000, G = 1024×1024×1024, in tako dalje za T, P, E, Z, Y.\n"
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr "%s: datoteka se je preve� skr�ila"
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, c-format
 msgid "%s: number of bytes is too large"
 msgstr "%s: Å¡tevilo bajtov je preveliko"
 
-#: src/head.c:440
-#, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr "%s: premik na za�etni položaj ni mogo�"
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr "%s: premik na odmik %s ni mogo�"
 
-#: src/head.c:673
-#, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "%s: ni mogo�e nastaviti datote�nega kazalca"
-
-#: src/head.c:798
+#: src/head.c:423 src/tail.c:457
 #, c-format
-msgid "cannot reposition file pointer for %s"
-msgstr "ni mogo�e premakniti datote�nega kazalca za %s"
+msgid "%s: cannot seek to relative offset %s"
+msgstr "%s: premik na relativni odmik %s ni mogo�"
 
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr "%s: %s je tako veliko, da ni predstavljivo"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr "Å¡tevilo vrstic"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr "Å¡tevilo bajtov"
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr "neveljavno Å¡tevilo vrstic"
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr "neveljavno Å¡tevilo bajtov"
 
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, c-format
 msgid "invalid trailing option -- %c"
 msgstr "neveljavna zaklju�na izbira -- %c"
@@ -4758,27 +4826,36 @@ msgid "cannot determine hostname"
 msgstr "imena ra�unalnika ni mogo�e ugotoviti"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr "Arnold Robbins"
 
-#: src/id.c:81
+#: src/id.c:84
 #, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
+msgid "Usage: %s [OPTION]... [USER]\n"
 msgstr "Uporaba: %s [IZBIRA]... [UPORABNIK]\n"
 
-#: src/id.c:82
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
+msgstr ""
+"Izpišejo se podatki o uporabniku in skupini za navedenega UPORABNIKA,\n"
+"ali (kadar UPORABNIK ni podan), za trenutnega uporabnika.\n"
+
+#: src/id.c:90
+#, fuzzy
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
 msgstr ""
 "Izpišemo podatke o uporabniku in skupini za navedenega UPORABNIKA.\n"
 "Če uporabnik ni naveden, se izpišejo podatki za trenutnega uporabnika.\n"
@@ -4790,8 +4867,11 @@ msgstr ""
 "  -n, --name      pri izbirah -ugG izpiši ime uporabnika namesto številke\n"
 "  -r, --real      izpiši pravi ID namesto efektivnega, skupaj z -ugG\n"
 "  -u, --user      izpiši le efektivno številko uporabnika (UID)\n"
+"  -z, --zero      lo�i vnose z znakom NUL namesto s presledkom; ni "
+"dovoljeno\n"
+"                    v privzetem zapisu\n"
 
-#: src/id.c:96
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
@@ -4799,117 +4879,127 @@ msgstr ""
 "\n"
 "Brez navedene IZBIRE izpišemo nekaj uporabnih identifikacijskih informacij.\n"
 
-#: src/id.c:140
+#: src/id.c:151
+#, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr "--context (-Z) deluje samo pri jedru s podporo SELinux/SMACK"
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr "--context (-Z) deluje samo pri jedru s podporo SELinux"
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr "izpis varnostnega konteksta ni mogo� ob podanem uporabniku"
 
-#: src/id.c:178
+#: src/id.c:198
 #, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr "ni mogo�e izpisati le ne�esa, �e je podanih ve� možnosti"
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr "v privzeti obliki ni možen izpis samo imen ali realnih ID"
 
-#: src/id.c:199
+#: src/id.c:209
+#, c-format
+msgid "option --zero not permitted in default format"
+msgstr "izbira --zero v privzetem zapisu ni dovoljena"
+
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
 msgstr "konteksta procesa ni mogo�e pridobiti"
 
-#: src/id.c:224
+#: src/id.c:265
 #, c-format
 msgid "cannot get effective UID"
 msgstr "efektivnega UID ni mogo�e ugotoviti"
 
-#: src/id.c:311
+#: src/id.c:354
 #, c-format
 msgid "cannot find name for user ID %s"
 msgstr "uporabniškega imena za UID %s ni mo� ugotoviti"
 
-#: src/id.c:329
+#: src/id.c:372
 #, c-format
 msgid "uid=%s"
 msgstr "uid=%s"
 
-#: src/id.c:334
+#: src/id.c:377
 #, c-format
 msgid " gid=%s"
 msgstr " gid=%s"
 
-#: src/id.c:341
+#: src/id.c:384
 #, c-format
 msgid " euid=%s"
 msgstr " euid=%s"
 
-#: src/id.c:349
+#: src/id.c:392
 #, c-format
 msgid " egid=%s"
 msgstr " egid=%s"
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr " skupine="
 
-#: src/id.c:393
+#: src/id.c:437
 #, c-format
 msgid " context=%s"
 msgstr " kontekst=%s"
 
-#: src/install.c:373
+#: src/install.c:376
 #, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr "opozorilo: %s: sprememba konteksta na %s ni uspela"
 
-#: src/install.c:414
+#: src/install.c:417
 #, c-format
 msgid "creating directory %s"
 msgstr "ustvarjanje imenik %s"
 
-#: src/install.c:482
+#: src/install.c:485
 #, c-format
 msgid "cannot change ownership of %s"
 msgstr "lastništva %s ni mogo�e spremeniti"
 
-#: src/install.c:506
+#: src/install.c:509
 #, c-format
 msgid "cannot set time stamps for %s"
 msgstr "datoteke %s ni mo� �asovno ozna�iti"
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, c-format
 msgid "fork system call failed"
 msgstr "vejitev ni mogo�a"
 
-#: src/install.c:531
+#: src/install.c:535
 #, c-format
 msgid "cannot run %s"
 msgstr "ni mogo�e pognati %s"
 
-#: src/install.c:535
+#: src/install.c:539
 #, c-format
 msgid "waiting for strip"
 msgstr "�akamo na »strip«"
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr "proces »strip« se je zaklju�il nenormalno"
 
-#: src/install.c:558
+#: src/install.c:565
 #, c-format
 msgid "invalid user %s"
 msgstr "neveljavno ime uporabnika %s"
 
 # ! INEXACT
-#: src/install.c:594
+#: src/install.c:601
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -4922,8 +5012,7 @@ msgstr ""
 "  ali:   %s [IZBIRA]... -t IMENIK IZVOR...\n"
 "  ali:   %s [IZBIRA]... -d IMENIK...\n"
 
-#: src/install.c:601
-#, fuzzy
+#: src/install.c:608
 msgid ""
 "\n"
 "This install program copies files (often just compiled) into destination\n"
@@ -4945,10 +5034,9 @@ msgstr ""
 "V prvih treh oblikah prepišemo IZVOR na CILJ ali ve� IZVOROV v IMENIK\n"
 "ter obenem nastavimo zaš�ito, lastnika in skupino. V �etrti obliki\n"
 "ustvarimo nov IMENIK ali ve� IMENIKOV s podanimi lastnostmi.\n"
-"\n"
 
 # ! INEXACT
-#: src/install.c:615
+#: src/install.c:622
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
 "  -b                  like --backup but does not accept an argument\n"
@@ -4970,7 +5058,7 @@ msgstr ""
 "ustvarimo\n"
 "                        vse komponente podanih imenikov\n"
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -4988,7 +5076,7 @@ msgstr ""
 "  -m, --mode=ZAŠČITA  zaš�ita (kot v chmod), namesto privzete rwxr-xr-x\n"
 "  -o, --owner=LASTNIK lastnik (samo superuporabnik)\n"
 
-#: src/install.c:631
+#: src/install.c:638
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
 "files\n"
@@ -5010,17 +5098,27 @@ msgstr ""
 "  -T, --no-target-directory  obravnavaj CILJ kot navadno datoteko\n"
 "  -v, --verbose       z izpisom imen vseh ustvarjenih imenikov\n"
 
-#: src/install.c:641
+#: src/install.c:648
+#, fuzzy
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
 "      --preserve-context  ohrani varnostni kontekst SELinux\n"
-"  -Z, --context=KONTEKST  nastavi varnostni kontekst SELinux datotek in "
-"imenikov\n"
+"  -Z, --context[=KONTEKST]  nastavi varnostni kontekst SELinux podane "
+"datoteke\n"
+"                              na privzeti tip, ali na KONTEKST, �e je ta "
+"podan\n"
+
+#: src/install.c:696 src/unlink.c:86
+#, c-format
+msgid "cannot unlink %s"
+msgstr "s klicem unlink ni mogo�e odstraniti %s"
 
-#: src/install.c:859
+#: src/install.c:877
 #, c-format
 msgid ""
 "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
@@ -5028,50 +5126,39 @@ msgstr ""
 "OPOZORILO: dolo�ilo --preserve-context ni upoštevano; jedro ne podpira "
 "SELinux."
 
-#: src/install.c:869
-#, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
-msgstr ""
-"OPOZORILO: izbira --context (-Z) ni upoštevana; jedro ne podpira SELinux"
-
-#: src/install.c:886
+#: src/install.c:917
 #, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr "opcija »strip« ni dovoljena pri namestitvi imenika"
 
-#: src/install.c:889
+#: src/install.c:920
 #, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr "navedba ciljnega imenika ni dovoljena pri namestitvi imenika"
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr "konteksta ni mogo�e nastaviti na %s in ga obenem ohraniti"
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, c-format
 msgid "invalid mode %s"
 msgstr "neveljavni na�in %s"
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr ""
 "OPOZORILO: izbira --strip-program se ne upošteva, ker ni podana izbira -s"
 
-#: src/install.c:959
+#: src/install.c:1001
 #, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr ""
 "izbiri --compare (-C) in --preserve-timestamps se medsebojno izklju�ujeta"
 
-#: src/install.c:966
+#: src/install.c:1008
 #, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr "izbiri --compare (-C) in --strip se medsebojno izklju�ujeta"
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -5085,7 +5172,7 @@ msgstr ""
 msgid "Mike Haertel"
 msgstr "Mike Haertel"
 
-#: src/join.c:191
+#: src/join.c:195
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
 "standard output.  The default join field is the first, delimited\n"
@@ -5108,7 +5195,7 @@ msgstr ""
 "                      1 ali 2, kar ustreza DATOTEKI1 in DATOTEKI2)\n"
 "  -e PRAZNO         manjkajo�e vhodno polje nadomestimo z nizom PRAZNO\n"
 
-#: src/join.c:200
+#: src/join.c:204
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
 "  -j FIELD          equivalent to '-1 FIELD -2 FIELD'\n"
@@ -5121,7 +5208,7 @@ msgstr ""
 "  -t ZNAK           navedeni ZNAK naj bo lo�ilo med polji na vhodu in "
 "izhodu\n"
 
-#: src/join.c:206
+#: src/join.c:210
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
 "  -1 FIELD          join on this FIELD of file 1\n"
@@ -5142,7 +5229,13 @@ msgstr ""
 "  --header          obravnavaj prvo vrstico vsake datoteke kot zaglavje;\n"
 "                      izpiši ga, ne da bi ga skušal vzporediti\n"
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+#, fuzzy
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr ""
+"  -z, --zero-terminated     vrstice naj se zaklju�ijo z znakom NUL, ne LF\n"
+
+#: src/join.c:225
 msgid ""
 "\n"
 "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n"
@@ -5178,47 +5271,47 @@ msgstr ""
 "Če vhod ni urejen in nekaterih vrstic ni mogo�e združiti, bo izpisano\n"
 "opozorilno sporo�ilo.\n"
 
-#: src/join.c:403
-#, fuzzy, c-format
+#: src/join.c:410
+#, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
-msgstr "%s:%ju: ni urejeno: %.*s"
+msgstr "%s:%<PRIuMAX>: ni urejeno: %.*s"
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, c-format
 msgid "invalid field number: %s"
 msgstr "neveljavna Å¡tevilka polja: %s"
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, c-format
 msgid "invalid field specifier: %s"
 msgstr "neveljavno dolo�ilo polja: %s"
 
-#: src/join.c:877
+#: src/join.c:884
 #, c-format
 msgid "invalid file number in field spec: %s"
 msgstr "neveljavna številka datoteke v dolo�ilu polja: %s"
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr "nezdružljivi združevalni polji %lu, %lu"
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr "nasprotujo�a si niza za nadomestitev praznega polja"
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, c-format
 msgid "multi-character tab %s"
 msgstr "ve�znakovni tabulator %s"
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr "nezdružljivi tabulatorji"
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr "obeh datotek ne moremo hkrati brati s standardnega vhoda"
@@ -5235,11 +5328,8 @@ msgstr ""
 "  ali:   %s -t [SIGNAL]...\n"
 
 #: src/kill.c:82
-#, fuzzy
 msgid "Send signals to processes, or list signals.\n"
-msgstr ""
-"Procesom pošljemo signale, ali pa izpišemo signale.\n"
-"\n"
+msgstr "Procesom pošljemo signale, ali pa izpišemo signale.\n"
 
 #: src/kill.c:88
 msgid ""
@@ -5340,48 +5430,48 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr "ni mogo�e ustvariti povezave %s na %s"
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr "%s: trda pozezava ni dovoljena za imenik"
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, c-format
 msgid "%s: cannot overwrite directory"
 msgstr "%s: ni mogo�e pisati prek imenika"
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
 msgstr "%s: naj nadomestimo %s? "
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, c-format
 msgid "failed to create symbolic link %s"
 msgstr "ni mogo�e ustvariti simbolne povezave %s"
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr "ni mogo�e ustvariti simbolne povezave %s -> %s"
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr "ni mogo�e ustvariti trde povezave %.0s%s"
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, c-format
 msgid "failed to create hard link %s"
 msgstr "ni mogo�e ustvariti trde povezave %s"
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, c-format
 msgid "failed to create hard link %s => %s"
 msgstr "ni mogo�e ustvariti trde povezave %s => %s"
 
 # ! INEXACT
-#: src/ln.c:374
+#: src/ln.c:391
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -5394,8 +5484,7 @@ msgstr ""
 "  ali:   %s [IZBIRA]... CILJ... IMENIK          (tretja oblika)\n"
 "  ali:   %s [IZBIRA]... -t IMENIK CILJ          (�etrta oblika)\n"
 
-#: src/ln.c:381
-#, fuzzy
+#: src/ln.c:398
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
 "In the 2nd form, create a link to TARGET in the current directory.\n"
@@ -5415,10 +5504,9 @@ msgstr ""
 "obstajati.  Simbolne povezave lahko vsebujejo poljubno besedilo;\n"
 "kasneje, ob razreševanju, se relativna povezava tolma�i glede na njen\n"
 "nadimenik.\n"
-"\n"
 
 # ! INEXACT
-#: src/ln.c:394
+#: src/ln.c:411
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
 "file\n"
@@ -5440,7 +5528,7 @@ msgstr ""
 "  -f, --force                  odstranimo morebitne obstoje�e ciljne "
 "datoteke\n"
 
-#: src/ln.c:402
+#: src/ln.c:419
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
 "  -L, --logical               dereference TARGETs that are symbolic links\n"
@@ -5461,7 +5549,7 @@ msgstr ""
 "                                 povezave\n"
 "  -s, --symbolic               ustvari simbolne povezave namesto trdih\n"
 
-#: src/ln.c:411
+#: src/ln.c:428
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
 "  -t, --target-directory=DIRECTORY  specify the DIRECTORY in which to "
@@ -5477,22 +5565,23 @@ msgstr ""
 "datoteko\n"
 "  -v, --verbose                z izpisom imen datotek, ki jih povezujemo\n"
 
-#: src/ln.c:433
-#, fuzzy, c-format
+#: src/ln.c:450
+#, c-format
 msgid ""
 "\n"
 "Using -s ignores -L and -P.  Otherwise, the last option specified controls\n"
 "behavior when a TARGET is a symbolic link, defaulting to %s.\n"
 msgstr ""
+"\n"
 "Uporaba -s prekli�e izbiri -L in -P. Sicer pa zadnja podana izbira dolo�a\n"
 "obnašanje, kadar je izvor simbolna povezava; privzeto je %s.\n"
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr "izbiri --target-directory in --no-target-directory se izklju�ujeta"
 
-#: src/ln.c:588
+#: src/ln.c:605
 #, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr "izbira --relative ni mogo�a brez izbire --symbolic"
@@ -5525,7 +5614,7 @@ msgstr "uporabniško ime manjka"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
@@ -5534,109 +5623,107 @@ msgstr "%b %e  %Y"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 msgid "%b %e %H:%M"
 msgstr "%b %e %H:%M"
 
 # ! INEXACT
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr "ne upoštevamo neveljavne vrednosti spremenljivke QUOTING_STYLE: %s"
 
 # ! INEXACT
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr "ne upoštevamo neveljavne širine v spremenljivki COLUMNS: %s"
 
 # ! INEXACT
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr "ne upoštevamo neveljavnega tabulatorja v spremenljivki TABSIZE: %s"
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, c-format
 msgid "invalid line width: %s"
 msgstr "neveljavna Å¡irina vrstice: %s"
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, c-format
 msgid "invalid tab size: %s"
 msgstr "neveljavni tabulator: %s"
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, c-format
 msgid "invalid time style format %s"
 msgstr "neveljavna oblika ure %s"
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 msgid "Valid arguments are:\n"
 msgstr "Veljavni argumenti so:\n"
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr "  - +FORMAT (npr. +%H:%M) za izpis v slogu »date«\n"
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr "napaka pri inicializaciji nizov za mesece"
 
 # ! INEXACT
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, c-format
 msgid "unrecognized prefix: %s"
 msgstr "neprepoznana predpona: %s"
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr "vrednosti v spremenljivki LS_COLORS ni mo� raztolma�iti"
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, c-format
 msgid "cannot open directory %s"
 msgstr "imenika %s ni mogo�e odpreti"
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, c-format
 msgid "cannot determine device and inode of %s"
 msgstr "ni mogo�e ugotoviti enote in inoda datoteke %s"
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, c-format
 msgid "%s: not listing already-listed directory"
 msgstr "%s: že izpisanega imenika ne podvajamo"
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, c-format
 msgid "reading directory %s"
 msgstr "beremo imenik %s"
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, c-format
 msgid "closing directory %s"
 msgstr "zapiramo imenik %s"
 
 # ! INEXACT
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, c-format
 msgid "cannot compare file names %s and %s"
 msgstr "ni mogo�e primerjati imen datotek %s in %s"
 
-#: src/ls.c:4721
-#, fuzzy
+#: src/ls.c:4781
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
 "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n"
 msgstr ""
 "Izpis informacij o DATOTEKAH (privzeto vse datoteke v trenutnem imeniku),\n"
 "urejenih po abecedi, �e ni podana nobena od izbir -cftuvSUX ali --sort.\n"
-"\n"
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
 "  -A, --almost-all           do not list implied . and ..\n"
@@ -5650,24 +5737,23 @@ msgstr ""
 "  -b, --escape               izpis C-jevske ubežne kode za neizpisljive "
 "znake\n"
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
-"      --block-size=ENOTA     merjeno v ENOTA bajtov velikih blokih;\n"
+"      --block-size=VELIKOST  enota bloka, v kateri se meri VELIKOST;\n"
 "                               npr. »--block-size=M« izpiše velikost v\n"
-"                               enotah po 1.048.576 bajtov.  Glejte spodaj "
-"za\n"
-"                               format podane ENOTE.\n"
+"                               enotah po 1.048.576 bajtov; glejte spodaj za\n"
+"                               format podane VELIKOSTI.\n"
 "  -B, --ignore-backups       ne izpisuj varnostnih kopij, ki se kon�ajo z ~\n"
 "  -c                         razvrš�eno po datumu zadnje spremembe;\n"
 "                             skupaj z -lt: prikaži �as zadnje spremembe "
@@ -5678,28 +5764,27 @@ msgstr ""
 "                               sicer: urejeno po ctime, za�enši z "
 "najnovejšim\n"
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 "  -C                         imena izpišemo v stolpcih\n"
 "      --color[=KDAJ]         kdaj se uporabijo barve za ozna�itev tipa "
-"datoteke\n"
-"                               Možnosti so »never«, »always« (privzeto) in \n"
-"                               »auto«; ve� informacij je spodaj\n"
+"datoteke;\n"
+"                               možnosti so »never«, »always« (privzeto) in \n"
+"                               »auto«; ve� informacij je nižje\n"
 "  -d, --directory            izpis imen imenika(-ov) namesto njihove "
 "vsebine,\n"
 "                               brez sledenja simbolnim povezavam\n"
 "  -D, --dired                izpis primeren za na�in »dired« v Emacsu\n"
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
 "  -F, --classify             append indicator (one of */=>@|) to entries\n"
@@ -5716,15 +5801,16 @@ msgstr ""
 "                               single-column -1, verbose -l, vertical -C\n"
 "      --full-time            kot -l --time-style=full-iso\n"
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr "  -g                         kot -l, vendar brez izpisa lastnika\n"
 
-#: src/ls.c:4763
+#: src/ls.c:4823
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 "      --group-directories-first\n"
@@ -5732,10 +5818,11 @@ msgstr ""
 "                               mogo�a je dopolnitev z izbiro --sort, raba\n"
 "                               --sort=none (-U) onemogo�i združevanje\n"
 
-#: src/ls.c:4769
+#: src/ls.c:4829
+#, fuzzy
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
@@ -5745,14 +5832,14 @@ msgstr ""
 "      --si                   podobno kot -h, vendar v bazi 1000 namesto "
 "1024\n"
 
-#: src/ls.c:4775
+#: src/ls.c:4835
 msgid ""
 "  -H, --dereference-command-line\n"
 "                             follow symbolic links listed on the command "
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
@@ -5765,7 +5852,7 @@ msgstr ""
 "                               ki kažejo na imenike\n"
 "      --hide=VZOREC          brez impliciranih vnosov, opisanih z VZORCEM\n"
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
 "names:\n"
@@ -5774,7 +5861,7 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 "      --indicator-style=BESEDA  imenom datotek pripnemo indikator: BESEDA "
 "sme\n"
@@ -5783,9 +5870,10 @@ msgstr ""
 "                               (--file-type) ali »classify« (-F)\n"
 "  -i, --inode                izpis inoda pri vsaki datoteki\n"
 "  -I, --ignore=VZOREC        pri izpisu izpusti imena, ki ustrezajo VZORCU\n"
-"  -k, --kibibytes            uporabljaj 1024-bajtne bloke\n"
+"  -k, --kibibytes            uporabljaj 1024-bajtne bloke za velikost na "
+"disku\n"
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -5800,7 +5888,7 @@ msgstr ""
 "  -m                         z vejicami lo�ena imena prek celotne širine "
 "vrstice\n"
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -5817,11 +5905,11 @@ msgstr ""
 "  -p, --indicator-style=slash  imenike ozna�imo s pripono »/«\n"
 
 # ! INEXACT
-#: src/ls.c:4811
+#: src/ls.c:4871
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -5831,13 +5919,13 @@ msgstr ""
 "  -q, --hide-control-chars   namesto krmilnih znakov izpišemo vprašaje (?)\n"
 "      --show-control-chars   neobdelan izpis krmilnih znakov (privzeta "
 "izbira,\n"
-"                             razen pri ukazu »ls« in izhodu na terminal)\n"
+"                               razen pri ukazu »ls« in izhodu na terminal)\n"
 "  -Q, --quote-name           imena izpišemo v dvojnih narekovajih\n"
 "      --quoting-style=BESEDA  slog izpisa; BESEDA je lahko »literal«, "
 "»locale«,\n"
-"                             »shell«, »shell-always«, »c« ali »escape«\n"
+"                               »shell«, »shell-always«, »c« ali »escape«\n"
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
 "  -R, --recursive            list subdirectories recursively\n"
@@ -5848,53 +5936,59 @@ msgstr ""
 "  -R, --recursive            rekurziven izpis podimenikov\n"
 "  -s, --size                 izpis velikosti datotek (v blokih)\n"
 
-#: src/ls.c:4825
+#: src/ls.c:4886
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 "  -S                         datoteke uredi po velikosti\n"
 "      --sort=BESEDA          namesto po imenu uredi po: brez urejanja \n"
-"                             (BESEDA=none), priponi (extension), �asu "
+"                               (BESEDA=none), priponi (extension), �asu "
 "nastanka\n"
-"                             (time) ali razli�ici (version)\n"
+"                               (time) ali razli�ici (version)\n"
 "      --time=BESEDA          skupaj z -l:  namesto �asa zadnje spremembe "
 "prikaži\n"
-"                             �as nastanka (BESEDA=ctime ali status) ali �as\n"
-"                             zadnjega dostopa (atime, access ali use); "
+"                               �as nastanka (BESEDA=ctime ali status) ali "
+"�as\n"
+"                               zadnjega dostopa (atime, access ali use); "
 "skupaj\n"
-"                             z izbiro --sort=time tudi uredi po izbranem "
+"                               z izbiro --sort=time tudi uredi po izbranem "
 "�asu\n"
 
-#: src/ls.c:4835
+#: src/ls.c:4896
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
 msgstr ""
 "      --time-style=SLOG      skupaj z -l: �as prikaži glede na slog, podan "
 "s \n"
-"                             SLOGOM: full-iso, iso, locale, posix-iso, "
+"                               SLOGOM: full-iso, iso, locale, posix-iso, "
 "+OBLIKA\n"
-"                             OBLIKO tolma�imo kot pri ukazu »date«; �e je\n"
-"                             OBLIKA enaka OBLIKA1<nova_vrstica>OBLIKA2, "
+"                               OBLIKO tolma�imo kot pri ukazu »date«; �e je\n"
+"                               OBLIKA enaka OBLIKA1<nova_vrstica>OBLIKA2, "
 "velja\n"
-"                             prva za stare datoteke, druga pa za nove;\n"
-"                             �e se SLOG za�ne s predpono »posix-«, velja\n"
-"                             podani slog samo izven krajevnega okolja POSIX\n"
+"                               prva za stare datoteke, druga pa za nove;\n"
+"                               �e se SLOG za�ne s predpono »posix-«, velja\n"
+"                               podani slog samo izven krajevnega okolja "
+"POSIX\n"
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 msgid ""
 "  -t                         sort by modification time, newest first\n"
 "  -T, --tabsize=COLS         assume tab stops at each COLS instead of 8\n"
@@ -5903,10 +5997,10 @@ msgstr ""
 "                             za�enši z najnovejšim �asom\n"
 "  -T, --tabsize=STOLPCEV     tabulator nastavljen na STOLPCEV namesto na 8\n"
 
-#: src/ls.c:4848
+#: src/ls.c:4912
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
@@ -5921,13 +6015,13 @@ msgstr ""
 "  -U                         brez urejanja; kot so v imeniku\n"
 "  -v                         urejanje po številki razli�ice\n"
 
-#: src/ls.c:4855
+#: src/ls.c:4919
+#, fuzzy
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 "  -w, --width=STOLPCEV       Å¡irina zaslova STOLPCEV namesto trenutne "
@@ -5938,7 +6032,7 @@ msgstr ""
 "datoteko\n"
 "  -1                         izpis po eno datoteko v vrstici\n"
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -5952,7 +6046,7 @@ msgstr ""
 "je standardni izhod povezan s terminalom. Spremenljivka okolja LS_COLORS\n"
 "lahko spremeni nastavitev. Nastavite jo z ukazom dircolors.\n"
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -6028,9 +6122,11 @@ msgstr "  -t, --text           beri besedilno (privzeto)\n"
 #: src/md5sum.c:195
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
@@ -6038,18 +6134,13 @@ msgstr ""
 "Naslednje tri izbire so uporabne le pri preverjanju nadzornih vsot:\n"
 "      --quiet          brez izpisa pri uspešno verificiranih datotekah\n"
 "      --status         brez izpisa, izhodna statusna koda kaže uspeh\n"
+"      --strict         izhod z napako za nepravilno oblikovane vrstice z\n"
+"                         nadzorno vsoto\n"
 "  -w, --warn           z opozorili pri nepravilno oblikovanih vrsticah\n"
 "                         z nadzornimi vsotami MD5\n"
 "\n"
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-"      --strict         (skupaj s --check) zaklju�i z napako za neveljaven "
-"vhod\n"
-
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, c-format
 msgid ""
 "\n"
@@ -6065,35 +6156,35 @@ msgstr ""
 "besedilne datoteke) in imenom DATOTEKE, za katero je bila izra�unana\n"
 "nadzorna vsota.\n"
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, c-format
 msgid "%s: too many checksum lines"
 msgstr "%s: preve� vrstic z nadzorno vsoto"
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr "%s: %<PRIuMAX>: nepravilno oblikovana vrstica z nadzorno vsoto %s"
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr "%s: NAPAKA pri odpiranju ali branju\n"
 
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr "NAPAKA"
 
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr "V REDU"
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr "%s: nobene pravilno oblikovane vrstice z nadzorno vsoto %s ni najti"
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
@@ -6102,7 +6193,7 @@ msgstr[1] "OPOZORILO: %<PRIuMAX> vrstica je nepravilno oblikovana"
 msgstr[2] "OPOZORILO: %<PRIuMAX> vrstici sta nepravilno oblikovani"
 msgstr[3] "OPOZORILO: %<PRIuMAX> vrstice so nepravilno oblikovane"
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
@@ -6111,7 +6202,7 @@ msgstr[1] "OPOZORILO: %<PRIuMAX> navedene datoteke ni mogo�e prebrati"
 msgstr[2] "OPOZORILO: %<PRIuMAX> navedenih datotek ni mogo�e prebrati"
 msgstr[3] "OPOZORILO: %<PRIuMAX> navedenih datotek ni mogo�e prebrati"
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
@@ -6120,129 +6211,146 @@ msgstr[1] "OPOZORILO: %<PRIuMAX> nadzorna vsota se NE ujema"
 msgstr[2] "OPOZORILO: %<PRIuMAX> nadzorni vsoti se NE ujemata"
 msgstr[3] "OPOZORILO: %<PRIuMAX> nadzorne vsote se NE ujemajo"
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
 msgstr "--tag ne podpira na�ina --text"
 
-#: src/md5sum.c:766
+#: src/md5sum.c:770
 #, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr "izbira --tag ni smiselna pri preverjanju nadzornih vsot"
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
 msgstr ""
 "izbiri --binary in --text nista smiselni pri preverjanju nadzornih vsot"
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr "izbira --status je smiselna samo pri preverjanju nadzornih vsot"
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr "izbira --warn je smiselna samo pri preverjanju nadzornih vsot"
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr "izbira --quiet je smiselna samo pri preverjanju nadzornih vsot"
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr "izbira --strict je smiselna samo pri preverjanju nadzornih vsot"
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr "Uporaba: %s [IZBIRA]... IMENIK...\n"
 
-#: src/mkdir.c:57
-#, fuzzy
+#: src/mkdir.c:59
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
-msgstr ""
-"Ustvari IMENIK (ali ve� imenikov), �e ta še ne obstaja.\n"
-"\n"
+msgstr "Ustvari IMENIK (ali ve� imenikov), �e ta še ne obstaja.\n"
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
+#, fuzzy
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 "  -m, --mode=ZAŠČITA  nastavi zaš�ito (kot pri chmod) namesto privzete\n"
 "                      a=rwx - umask\n"
 "  -p, --parents     brez opozorila �e imenik obstaja; po potrebi ustvari\n"
 "                      še starševske imenike\n"
 "  -v, --verbose     z obvestilom o vsakem ustvarjenem imeniku\n"
-"  -Z, --context=KONTEKST  nastavi varnostni kontekst za vsak ustvarjeni "
-"imenik\n"
-"                      na KONTEKST\n"
+"  -Z, --context[=KONTEKST]  nastavi varnostni kontekst za vsak ustvarjeni\n"
+"                      imenik na privzeti tip ali na KONTEKST, �e je ta "
+"podan\n"
 
-#: src/mkdir.c:168
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/mkdir.c:127 src/mkdir.c:172
+#, c-format
+msgid "failed to set default creation context for %s"
+msgstr "nastavitev privzetega konteksta datoteke za %s ni uspela"
+
+#: src/mkdir.c:191
+#, c-format
+msgid "failed to restore context for %s"
+msgstr "kontekst za %s ni bil uspešno obnovljen"
+
+#: src/mkdir.c:231
 #, c-format
 msgid "created directory %s"
 msgstr "ustvarjen imenik %s"
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr ""
+"opozorilo: izbira --context ni upoštevana; jedro ne podpira SELinux/SMACK"
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr "Uporaba: %s [IZBIRA]... IME...\n"
 
-#: src/mkfifo.c:52
-#, fuzzy
+#: src/mkfifo.c:54
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
-msgstr ""
-"Ustvarimo poimenovano cev (FIFO) z navedenim IMENOM.\n"
-"\n"
+msgstr "Ustvarimo poimenovano cev (FIFO) z navedenim IMENOM.\n"
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
 msgstr ""
 "  -m, --mode=ZAÅ ÄŒITA  nastavi bite ZAÅ ÄŒITE namesto privzete a=rw - umask\n"
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
-"  -Z, --context=CTX  za vsako IME nastavi varnostni kontekst SELinux na CTX\n"
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, c-format
 msgid "invalid mode"
 msgstr "napa�na zaš�ita"
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr "na�in mora dolo�iti le bite dovoljenja za dostop do datoteke"
 
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
+#, c-format
+msgid "cannot set permissions of %s"
+msgstr "ni mogo�e nastaviti dovoljenj za %s"
+
+#: src/mknod.c:54
 #, c-format
 msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr "Uporaba: %s [IZBIRA]...  IME TIP [GLAVNO POMOŽNO]\n"
 
-#: src/mknod.c:54
-#, fuzzy
+#: src/mknod.c:56
 msgid "Create the special file NAME of the given TYPE.\n"
-msgstr ""
-"Ustvarimo posebno datoteko navedenega TIPA z navedenim IMENOM.\n"
-"\n"
+msgstr "Ustvarimo posebno datoteko navedenega TIPA z navedenim IMENOM.\n"
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr ""
-"  -Z, --context=CTX  nastavi varnostni kontekst SELinux za IME na CTX\n"
-
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -6260,7 +6368,7 @@ msgstr ""
 "sicer pa kot desetiško število. TIP je lahko:\n"
 
 # ! INEXACT
-#: src/mknod.c:75
+#: src/mknod.c:79
 msgid ""
 "\n"
 "  b      create a block (buffered) special file\n"
@@ -6272,57 +6380,57 @@ msgstr ""
 "  c, u   ustvarimo znakovno enoto (brez izravnalnika)\n"
 "  p      ustvarimo FIFO\n"
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 msgid "Special files require major and minor device numbers."
 msgstr ""
 "Posebne datoteke zahtevajo, da sta podani glavno in pomožno število naprave"
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 msgid "Fifos do not have major and minor device numbers."
 msgstr "Poimenovane cevi nimajo glavnih in pomožnih števil naprave"
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, c-format
 msgid "block special files not supported"
 msgstr "blo�ne enote niso podprte"
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, c-format
 msgid "character special files not supported"
 msgstr "znakovne enote niso podprte"
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, c-format
 msgid "invalid major device number %s"
 msgstr "neveljavno GLAVNO Å¡tevilo enote %s"
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, c-format
 msgid "invalid minor device number %s"
 msgstr "neveljavno POMOŽNO število enote %s"
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, c-format
 msgid "invalid device %s %s"
 msgstr "neveljavna enota %s %s"
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, c-format
 msgid "invalid device type %s"
 msgstr "neveljavna vrsta naprave %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr "Eric Blake"
 
 # ! INEXACT
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr "Uporaba: %s [IZBIRA]... [PREDLOGA]\n"
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
 "TEMPLATE must contain at least 3 consecutive 'X's in last component.\n"
@@ -6332,7 +6440,7 @@ msgstr ""
 "PREDLOGA mora vsebovati vsaj 3 zaporedne znake X v zadnji komponenti imena.\n"
 "ÄŒe PREDLOGA ni podana, se uporabi tmp.XXXXXXXXXX in implicira --tmpdir.\n"
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
@@ -6340,7 +6448,7 @@ msgstr ""
 "omejitve\n"
 "umask.\n"
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
@@ -6351,25 +6459,25 @@ msgstr ""
 "  -q, --quiet         brez poro�ila o neuspelem ustvarjanju datoteke/"
 "imenika\n"
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
 "      --suffix=PRIPONA  podani PREDLOGI dodaj PRIPONO. PRIPONA ne sme "
 "vsebovati\n"
-"                        poševnice. Izbira implicira, da se PRIPONA ne "
+"                          poševnice. Izbira implicira, da se PRIPONA ne "
 "zaklju�i\n"
-"                        z znakom X.\n"
+"                          z znakom X\n"
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
 "      --tmpdir[=IMENIK]  tolma�i PREDLOGO relativno glede na IMENIK. Če "
@@ -6377,79 +6485,68 @@ msgstr ""
 "                        ni dolo�en, uporabi $TMPDIR, in �e ta ni "
 "nastavljen,\n"
 "                        /tmp. Pri tej izbiri PREDLOGA ne sme biti absolutna\n"
-"                        pot. Za razliko od -t lahko PREDLOGA vsebuje "
+"                        pot; za razliko od -t lahko PREDLOGA vsebuje "
 "poševnice,\n"
 "                        toda tudi tu mktemp ustvari samo zadnjo komponento.\n"
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
 msgstr ""
-"  -p IMENIK           uporabi IMENIK kot predpono; implicira -t "
-"(odsvetovano)\n"
 "  -t                  tolma�i PREDLOGO kot eno samo komponento imena "
 "datoteke,\n"
 "                       relativno glede na imenik: $TMPDIR, �e je "
 "nastavljen;\n"
 "                       imenik, dolo�en s -p; ali /tmp (odsvetovano).\n"
 
-#: src/mktemp.c:223
-#, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr "preusmeritev standardnega izhoda za napake na /dev/null ni uspela"
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, c-format
 msgid "too many templates"
 msgstr "preve� predlog"
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr "ob izbiri --suffix se mora vzorec %s kon�ati z X"
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr "neveljavna pripona %s, vsebuje lo�ilnik imenikov"
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr "premalo mest (X) v predlogi %s"
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr "neveljavna predloga, %s, vsebuje lo�ilnike imenikov"
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr "neveljavna predloga, %s; pri izbiri --tmpdir ne sme biti absolutna"
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, c-format
 msgid "failed to create directory via template %s"
 msgstr "ustvarjenje imenika s predlogo %s ni uspelo"
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, c-format
 msgid "failed to create file via template %s"
 msgstr "ustvarjenje datoteke s predlogo %s ni uspelo"
 
-#: src/mv.c:292
-#, fuzzy
+#: src/mv.c:294
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
-msgstr ""
-"Preimenujemo IZVOR v CILJ, ali ve� IZVOROV v IMENIK.\n"
-"\n"
+msgstr "IZVOR se preimenuje v CILJ, ali ve� IZVOROV premakne v IMENIK.\n"
 
 # ! INEXACT
-#: src/mv.c:298
+#: src/mv.c:300
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
 "file\n"
@@ -6473,7 +6570,7 @@ msgstr ""
 "  -n, --no-clobber             ne piši prek obstoje�ih datotek\n"
 "Ob hkratni navedbi izbir -i, -f in -n se upošteva zadnja od njih.\n"
 
-#: src/mv.c:307
+#: src/mv.c:309
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
@@ -6485,7 +6582,7 @@ msgstr ""
 "                                 IZVOROV\n"
 "  -S, --suffix=PRIPONA         izrecno navedena PRIPONA varnostnih kopij\n"
 
-#: src/mv.c:312
+#: src/mv.c:314
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
 "DIRECTORY\n"
@@ -6494,12 +6591,16 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
 "  -t, --target-directory=IMENIK  vse IZVORE premakni v navedeni IMENIK\n"
 "  -T, --no-target-directory    obravnavaj CILJ kot navadno datoteko\n"
 "  -u, --update                 datoteko premakni samo, �e je novejša od\n"
 "                                 obstoje�e ciljne ali �e ciljna ne obstaja\n"
 "  -v, --verbose                z razlago poteka\n"
+"  -Z, --context                nastavi varnostni kontekst SELinux za ciljno\n"
+"                                 datoteko na privzeti tip\n"
 
 #: src/nice.c:72
 #, c-format
@@ -6507,7 +6608,7 @@ msgid "Usage: %s [OPTION] [COMMAND [ARG]...]\n"
 msgstr "Uporaba: %s [IZBIRA]... [UKAZ [ARGUMENT]...]\n"
 
 #: src/nice.c:73
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Run COMMAND with an adjusted niceness, which affects process scheduling.\n"
 "With no COMMAND, print the current niceness.  Niceness values range from\n"
@@ -6518,12 +6619,10 @@ msgstr ""
 "Če UKAZ ni podan, izpiše trenutno raven prioritete. Vrednosti »nice« so "
 "med \n"
 "%d (najvišja prioriteta procesa) in %d (najnižja).\n"
-"\n"
-"  -n, --adjustment=POPRAVEK  pove�aj raven za POPRAVEK (privzeto 10)\n"
 
 #: src/nice.c:82
 msgid "  -n, --adjustment=N   add integer N to the niceness (default 10)\n"
-msgstr ""
+msgstr "  -n, --adjustment=POPRAVEK  pove�aj raven za POPRAVEK (privzeto 10)\n"
 
 #: src/nice.c:172
 #, c-format
@@ -6551,7 +6650,6 @@ msgid "Scott Bartram"
 msgstr "Scott Bartram"
 
 #: src/nl.c:179
-#, fuzzy
 msgid ""
 "Write each FILE to standard output, with line numbers added.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -6559,7 +6657,6 @@ msgstr ""
 "Vsako od DATOTEK prepišemo na standardni izhod in spotoma oštevil�imo "
 "vrstice.\n"
 "Če DATOTEKA ni podana, ali �e je enaka -, beremo s standardnega vhoda.\n"
-"\n"
 
 #: src/nl.c:186
 msgid ""
@@ -6804,118 +6901,130 @@ msgid "%s: invalid number to ignore"
 msgstr "%s: neveljavno število izlo�enih enot"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
-msgstr ""
+msgstr "Assaf Gordon"
 
-#: src/numfmt.c:676
-#, fuzzy, c-format
-msgid "value too large to be converted: '%s'"
-msgstr "%s: vrednost nepopolno pretvorjena"
+#: src/numfmt.c:659
+#, c-format
+msgid "value too large to be converted: %s"
+msgstr "vrednost je prevelika, da bi bila lahko pretvorjena: %s"
 
-#: src/numfmt.c:680
-#, fuzzy, c-format
-msgid "invalid number: '%s'"
-msgstr "neveljavno Å¡tevilo %s"
+#: src/numfmt.c:663
+#, c-format
+msgid "invalid number: %s"
+msgstr "neveljavno Å¡tevilo: %s"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
-msgstr ""
+msgid "rejecting suffix in input: %s (consider using --from)"
+msgstr "zavrnjena pripona na vhodu: %s (morda je rešitev --from)"
 
-#: src/numfmt.c:688
-#, fuzzy, c-format
-msgid "invalid suffix in input: '%s'"
-msgstr "neveljavna pripona pri %s%s argumentu '%s'"
+#: src/numfmt.c:671
+#, c-format
+msgid "invalid suffix in input: %s"
+msgstr "neveljavna pripona na vhodu: %s"
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
-msgstr ""
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
+msgstr "manjkajo�a pripona 'i' na vhodu: %s (npr. Ki/Mi/Gi)"
 
-#: src/numfmt.c:723
-#, fuzzy, c-format
+#: src/numfmt.c:722 src/numfmt.c:768
+#, c-format
 msgid "failed to prepare value '%Lf' for printing"
-msgstr "%s ni mogo�e odpreti za pisanje"
-
-#: src/numfmt.c:787
-#, fuzzy, c-format
-msgid "invalid unit size: '%s'"
-msgstr "neveljavni tabulator: %s"
+msgstr "vrednosti '%Lf' ni uspelo pripraviti za natis"
 
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
+#: src/numfmt.c:791
 #, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr ""
+msgid "invalid unit size: %s"
+msgstr "neveljavna velikost enote: %s"
 
-#: src/numfmt.c:813
-#, fuzzy, c-format
+#: src/numfmt.c:814
+#, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
-msgstr "Uporaba: %s [IZBIRA]... [UPORABNIK]...\n"
+msgstr "Uporaba: %s [IZBIRA]... [Å TEVILO]...\n"
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
 msgstr ""
+"Spremeni zapis podanih ŠTEVIL, ali števil s standardnega vhoda, �e ni "
+"podano\n"
+"nobeno Å¡tevilo.\n"
 
-#: src/numfmt.c:820
-#, fuzzy
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
 msgstr ""
-"      --strict         (skupaj s --check) zaklju�i z napako za neveljaven "
-"vhod\n"
+"      --debug          izpiši opozorila ob neveljavnih podatkih na vhodu\n"
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
+"  -d, --delimiter=X    uporabi znak X namesto presledka za razmejitev polj\n"
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
+"      --field=N        nadomesti Å¡tevilo v vhodnem polju Å¡t. N (privzeto 1)\n"
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
 msgstr ""
+"      --format=FORMAT  uporabi FORMAT za realna Å¡tevila v slogu printf;\n"
+"                         glej FORMAT spodaj za podrobnosti\n"
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
 "                         see UNIT below\n"
 msgstr ""
+"      --from=ENOTA     samodejno pretvori Å¡tevila na vhodu v ENOTO; "
+"privzeto\n"
+"                         je »none«; glej ENOTO spodaj\n"
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr ""
+"      --from-unit=N    dolo�i velikost enote za vhodne podatke (privzeto 1)\n"
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
 "                         (which means it has no effect in the C/POSIX "
 "locale)\n"
 msgstr ""
+"      --grouping       uporabi lokalizirano grupiranje Å¡tevk, npr. "
+"1.000.000\n"
+"                         (izbira nima u�inka v lokaliziranem okolju C/"
+"POSIX)\n"
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
 msgstr ""
+"      --header[=N]     brez pretvorbe izpiši prvih N vrstic zaglavja;\n"
+"                         �e ni dolo�eno druga�e, je N privzeto enak 1\n"
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
 msgstr ""
+"      --invalid=NAČIN  na�in obravnave neveljavnih števil; NAČIN je lahko:\n"
+"                         »abort« (privzeto),  »fail«,  »warn« ali  »ignore«\n"
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -6924,44 +7033,60 @@ msgid ""
 "whitespace\n"
 "                         is found\n"
 msgstr ""
+"      --padding=N      zapolni izhod do N znakov; pozitivne vrednosti N\n"
+"                         izhod desno poravnajo, negativne vrednosti N izhod\n"
+"                         levo poravnajo; polnilo se ne upošteva, �e je "
+"izhod\n"
+"                         širši od N; privzeto se zapolni samodejno, �e je\n"
+"                         med podatki presledek\n"
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
 "nearest\n"
 msgstr ""
+"      --round=METHOD   uporabi METODO zaokroževanja pri pretvorbi; METODA "
+"je\n"
+"                         lahko »up«, »down«, »from-zero« (privzeto),  \n"
+"                         »towards-zero« ali »nearest«\n"
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
 msgstr ""
+"      --suffix=PRIPONA izpisanim Å¡tevilom dodaj PRIPONO in sprejmi "
+"neobvezno\n"
+"                         PRIPONO pri Å¡tevilih na vhodu\n"
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
+"      --to=ENOTA       samodejno pretvori Å¡tevila na izhodu v ENOTO;\n"
+"                         glej ENOTO spodaj\n"
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr ""
+"      --to-unit=N      dolo�i velikost enote za izhodne podatke (privzeto "
+"1)\n"
 
-#: src/numfmt.c:877
-#, fuzzy
+#: src/numfmt.c:878
 msgid ""
 "\n"
 "UNIT options:\n"
 msgstr ""
-"Druge izbire:\n"
 "\n"
+"Izbire za ENOTO:\n"
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
-msgstr ""
+msgstr "  none       brez samodejnega pretvarjanja; pripone sprožijo napako\n"
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -6969,43 +7094,65 @@ msgid ""
 "               1M = 1000000,\n"
 "               1Mi = 1048576,\n"
 msgstr ""
+"  auto       sprejmi neobvezne eno- ali dvo�rkovne pripone:\n"
+"               1K = 1000,\n"
+"               1Ki = 1024,\n"
+"               1M = 1000000,\n"
+"               1Mi = 1048576,\n"
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
 "               1M = 1000000,\n"
 "               ...\n"
 msgstr ""
+"  si         sprejmi neobvezne eno�rkovne pripone:\n"
+"               1K = 1000,\n"
+"               1M = 1000000,\n"
+"               ...\n"
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
 "               1M = 1048576,\n"
 "               ...\n"
 msgstr ""
+"  iec        sprejmi neobvezne eno�rkovne pripone:\n"
+"               1K = 1024,\n"
+"               1M = 1048576,\n"
+"               ...\n"
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
 "               1Mi = 1048576,\n"
 "               ...\n"
 msgstr ""
+"  iec-i      sprejmi neobvezne dvo�rkovne pripone:\n"
+"               1Ki = 1024,\n"
+"               1Mi = 1048576,\n"
+"               ...\n"
 
-#: src/numfmt.c:905
-#, c-format
+#: src/numfmt.c:906
+#, fuzzy, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
+"\n"
+"FORMAT mora biti primeren za izpis enega realnoštevilskega argumenta '%f'.\n"
+"Neobvezni narekovaj (%'f) omogo�i --grouping, �e to podpira lokalizirano\n"
+"okolje. Neobvezna podana Å¡irina (%10f) zapolni izpis. Neobvezna negativna\n"
+"vrednost Å¡irine (%-10f) zapolni izpis tako, da je levo poravnan.\n"
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -7016,8 +7163,16 @@ msgid ""
 "diagnosed, but the exit status is 0.  With --invalid='ignore' conversion\n"
 "errors are not diagnosed and the exit status is 0.\n"
 msgstr ""
+"\n"
+"Izhodni status je 0, �e so bila vsa števila na vhodu uspešno pretvorjena.\n"
+"Privzeto se %s ustavi ob prvi napaki pri pretvorbi in izide z izhodno\n"
+"statusno kodo 2.  S podano izbiro --invalid='fail' se izpiše opozorilo ob\n"
+"vsaki napaki pri pretvorbi izide z izhodno statusno kodo 2. S podano izbiro\n"
+" --invalid='warn' se diagnosticira vsaka napaka pri pretvorbi, izhodna\n"
+"statusna koda pa je 0.  S podano izbiro --invalid='ignore' se napake pri\n"
+"pretvorbi ne diagnosticirajo, program pa izide z izhodno statusno kodo 0.\n"
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -7037,113 +7192,129 @@ msgid ""
 "  $ ls -lh | %s --header --field 5 --from=iec --padding=10\n"
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 msgstr ""
+"\n"
+"Zgledi:\n"
+"  $ %s --to=si 1000\n"
+"            -> \"1.0K\"\n"
+"  $ %s --to=iec 2048\n"
+"           -> \"2.0K\"\n"
+"  $ %s --to=iec-i 4096\n"
+"           -> \"4.0Ki\"\n"
+"  $ echo 1K | %s --from=si\n"
+"           -> \"1000\"\n"
+"  $ echo 1K | %s --from=iec\n"
+"           -> \"1024\"\n"
+"  $ df | %s --header --field 2 --to=si\n"
+"  $ ls -l | %s --header --field 5 --to=iec\n"
+"  $ ls -lh | %s --header --field 5 --from=iec --padding=10\n"
+"  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, c-format
 msgid "format %s has no %% directive"
 msgstr "dolo�ilo %s ne vsebuje direktive %%"
 
-#: src/numfmt.c:990
-#, fuzzy, c-format
+#: src/numfmt.c:1003
+#, c-format
 msgid "invalid format %s (width overflow)"
-msgstr "neveljavna Å¡irina oblike"
+msgstr "neveljavni format %s (prekora�itev širine)"
+
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr ""
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr "dolo�ilo %s se zaklju�i z %%"
 
-#: src/numfmt.c:1010
-#, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
-msgstr ""
+#: src/numfmt.c:1030
+#, fuzzy, c-format
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
+msgstr "neveljavni format %s, direktiva mora biti v obliki %%['][-][N]f"
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr "dolo�ilo %s vsebuje preve� direktiv %%"
 
-#: src/numfmt.c:1070
-#, fuzzy, c-format
-msgid "invalid suffix in input '%s': '%s'"
-msgstr "neveljavna pripona pri %s%s argumentu '%s'"
+#: src/numfmt.c:1081
+#, c-format
+msgid "invalid suffix in input %s: %s"
+msgstr "neveljavna pripona pri vhodu %s: %s"
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
-msgstr ""
+msgstr "vrednost prevelika za izpis: '%Lg' (razmislite o uporabi --to)"
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
-msgstr ""
+msgstr "vrednost prevelika za izpis: '%Lg' (vrednosti > 999Y niso podprte)"
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
-msgstr ""
+msgid "large input value %s: possible precision loss"
+msgstr "velika vhodna vrednost %s: mogo�a izguba natan�nosti"
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
-msgstr ""
+msgstr "vhodna vrstica je prekratka, manjkajo Å¡tevila za pretvorbo v polju %ld"
 
-#: src/numfmt.c:1388
-#, fuzzy, c-format
-msgid "invalid padding value '%s'"
-msgstr "neveljavni razpon strani %s"
+#: src/numfmt.c:1403
+#, c-format
+msgid "invalid padding value %s"
+msgstr "neveljavna vrednost polnila %s"
 
-#: src/numfmt.c:1401
-#, fuzzy, c-format
-msgid "invalid field value '%s'"
-msgstr "neveljavna številka polja: »%s«"
+#: src/numfmt.c:1417
+#, c-format
+msgid "invalid field value %s"
+msgstr "neveljavna vrednost polja %s"
 
-#: src/numfmt.c:1430
-#, fuzzy, c-format
-msgid "invalid header value '%s'"
-msgstr "neveljavni datum %s"
+#: src/numfmt.c:1447
+#, c-format
+msgid "invalid header value %s"
+msgstr "neveljavna vrednost glave %s"
 
-#: src/numfmt.c:1456
-#, fuzzy, c-format
+#: src/numfmt.c:1473
+#, c-format
 msgid "--grouping cannot be combined with --format"
-msgstr "datote�nih operandov ni mogo�e kombinirati z izbiro --files0-from."
+msgstr "izbire --grouping ni mogo�e kombinirati z izbiro --format"
 
-#: src/numfmt.c:1458
-#, fuzzy, c-format
-msgid "--padding cannot be combined with --format"
-msgstr "datote�nih operandov ni mogo�e kombinirati z izbiro --files0-from."
-
-#: src/numfmt.c:1463
-#, fuzzy, c-format
+#: src/numfmt.c:1478
+#, c-format
 msgid "no conversion option specified"
-msgstr "podanih je ve� izbir -i"
+msgstr "nobena izbira za pretvorbo ni podana"
 
-#: src/numfmt.c:1471
-#, fuzzy, c-format
+#: src/numfmt.c:1486
+#, c-format
 msgid "grouping cannot be combined with --to"
-msgstr "datote�nih operandov ni mogo�e kombinirati z izbiro --files0-from."
+msgstr "grupiranja ni mogo�e kombinirati z izbiro --to"
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
-msgstr ""
+msgstr "grupiranje v tem lokaliziranem okolju nima u�inka"
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
-msgstr ""
+msgstr "izbira --header je preklicana z vnosom iz ukazne vrstice"
 
-#: src/numfmt.c:1511
-#, fuzzy, c-format
+#: src/numfmt.c:1526
+#, c-format
 msgid "error reading input"
-msgstr "napaka pri branju %s"
+msgstr "napaka pri branju vhoda"
 
-#: src/numfmt.c:1520
-#, fuzzy, c-format
+#: src/numfmt.c:1535
+#, c-format
 msgid "failed to convert some of the input numbers"
-msgstr "onemogo�enje standardnega izhoda ni uspelo"
+msgstr "pretvorba nekaterih vhodnih Å¡tevil ni uspela"
 
-#: src/od.c:294
+#: src/od.c:320
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -7156,7 +7327,7 @@ msgstr ""
 "  ali:   %s --traditional [IZBIRA] [DATOTEKA] [[+]ODMIK[.][b] [[+]OZNAKA][.]"
 "[b]]\n"
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -7172,8 +7343,7 @@ msgstr ""
 "standardnega vhoda.\n"
 "\n"
 
-#: src/od.c:307
-#, fuzzy
+#: src/od.c:333
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
 "if the last operand begins with + or (if there are 2 operands) a digit.\n"
@@ -7182,7 +7352,6 @@ msgid ""
 "For OFFSET and LABEL, a 0x or 0X prefix indicates hexadecimal;\n"
 "suffixes may be . for octal and b for multiply by 512.\n"
 msgstr ""
-"\n"
 "Če sta uporabljena tako prva kot druga oblika klica, se upošteva druga,\n"
 "kadar se zadnji operand za�ne s + ali (kadar sta dva operanda) s števko.\n"
 "Operand ODMIK pomeni izbiro -j ODMIK. OZNAKA je psevdonaslov prvega\n"
@@ -7190,58 +7359,64 @@ msgstr ""
 "predpona 0x ali 0X naznanja šestnajstiški zapis. Pripone so lahko . za\n"
 "osmiški zapis ali b za množenje s 512.\n"
 
-#: src/od.c:318
+#: src/od.c:344
 #, fuzzy
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
-"  -A, --address-radix=OSNOVA  OSNOVA pri izpisu odmikov v datoteki (doxn)\n"
+"  -A, --address-radix=OSNOVA  izhodni zapis za odmike v datoteki; OSNOVA "
+"je \n"
+"                                eden od znakov [doxn] (decimalni, osmiški,\n"
+"                                šestnajstiški, noben)\n"
 "  -j, --skip-bytes=ŠTEVILO    pri vsaki datoteki presko�imo prvih ŠTEVILO "
 "bajtov\n"
 
-#: src/od.c:323
-#, fuzzy
+#: src/od.c:350
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
 "  -N, --read-bytes=Å TEVILO    izpis omejim na Å TEVILO bajtov v vsaki "
 "datoteki\n"
 "  -S Å TEVILO, --strings[=Å TEVILO]  zaporedje, dolgo vsaj Å TEVILO bajtov, \n"
-"                                izpiši kot niz\n"
+"                                izpiši kot niz (privzeto 3)\n"
 "  -t, --format=TIP            dolo�i obliko ali oblike izpisov\n"
 "  -v, --output-duplicates     ne uporabi * za oznako izpuš�enih vrstic\n"
-"  -w, --width[=ŠTEVILO]       v vsaki vrstici izpiši ŠTEVILO bajtov\n"
-"      --traditional           sprejemi argumente v tradicionalni obliki\n"
+"  -w[ŠTEVILO], --width[=ŠTEVILO]  v vsaki vrstici izpiši ŠTEVILO bajtov\n"
+"                                (privzeto 32)\n"
+"      --traditional           sprejmi argumente v tretji zgoraj navedeni "
+"obliki\n"
 
-#: src/od.c:336
-#, fuzzy
+#: src/od.c:363
 msgid ""
 "\n"
 "\n"
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 "\n"
+"\n"
 "Dolo�ila v tradicionalni obliki lahko kombiniramo in se sestavljajo:\n"
 "  -a   isto kot -t a,  poimenovani znaki, brez osmega bita\n"
 "  -b   isto kot -t o1, osmiški izpis bajtov\n"
-"  -c   isto kot -t c,  ASCII; neizpisljive znake uvedi z obratno poševnico\n"
+"  -c   isto kot -t c,  neizpisljive znake uvedi z obratno poševnico\n"
 "  -d   isto kot -t u2, desetiški izpis dvobajtnih nepredzna�enih enot\n"
 
-#: src/od.c:345
+#: src/od.c:372
 msgid ""
 "  -f   same as -t fF, select floats\n"
 "  -i   same as -t dI, select decimal ints\n"
@@ -7258,22 +7433,22 @@ msgstr ""
 "  -s   isto kot -t d2, desetiški izpis dvobajtnih enot\n"
 "  -x   isto kot -t x2, šestnajstiški izpis dvobajtnih enot\n"
 
-#: src/od.c:353
-#, fuzzy
+#: src/od.c:380
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 "\n"
-"TIP je lahko eno ali ve� dolo�il s seznama:\n"
 "\n"
-"  a            poimenovani znaki\n"
-"  c            znaki ASCII; neizpisljivi znaki uvedeni z obratno poševnico\n"
+"TIP je lahko eno ali ve� dolo�il s seznama:\n"
+"  a          poimenovani znaki, brez osmega bita\n"
+"  c          izpisljivi znaki; neizpisljivi znaki uvedeni z obratno "
+"poševnico\n"
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -7287,8 +7462,7 @@ msgstr ""
 "  u[ENOTA]   nepredzna�eno desetiško celo število dolžine ENOTA bajtov\n"
 "  x[ENOTA]   šestnajstiško število dolžine ENOTA bajtov\n"
 
-#: src/od.c:367
-#, fuzzy
+#: src/od.c:394
 msgid ""
 "\n"
 "SIZE is a number.  For TYPE in [doux], SIZE may also be C for\n"
@@ -7302,15 +7476,18 @@ msgstr ""
 "L (dolžina tipa long). Če je TIP f, je lahko ENOTA tudi F za dolžino\n"
 "tipa float, D (dolžina tipa double) ali L (dolžina tipa long double).\n"
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
 "each output line.\n"
 msgstr ""
+"\n"
+"Dodajanje pripone z h kateremukoli tipu izpiše izpisljiv znak na koncu "
+"vsake\n"
+"izpisane vrstice.\n"
 
-#: src/od.c:379
-#, fuzzy
+#: src/od.c:406
 msgid ""
 "\n"
 "\n"
@@ -7323,16 +7500,22 @@ msgid ""
 "and so on for G, T, P, E, Z, Y.\n"
 msgstr ""
 "\n"
-"K ima lahko množiteljsko pripono:\n"
-"b za množenje s 512, kB = 1000, K = 1024, MB = 1000×1000, M = 1024×1024,\n"
-"GB = 1000×1000×1000, G = 1024×1024×1024, in tako dalje za T, P, E, Z, Y.\n"
+"\n"
+"BAJTI so zapisani šestnajstiško, �e je podana predpona 0x ali 0X, in \n"
+"imajo lahko množiteljsko pripono:\n"
+"  b    512\n"
+"  KB   1000\n"
+"  K    1024\n"
+"  MB   1000×1000\n"
+"  M    1024×1024\n"
+"in tako dalje za G, T, P, E, Z, Y.\n"
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, c-format
 msgid "invalid type string %s"
 msgstr "neveljavna oznaka tipa %s"
 
-#: src/od.c:649
+#: src/od.c:690
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7341,7 +7524,7 @@ msgstr ""
 "neveljavna oznaka tip %s;\n"
 "ta sistem ne omogo�a %lu-bajtnega celoštevil�nega tipa"
 
-#: src/od.c:770
+#: src/od.c:811
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7350,36 +7533,36 @@ msgstr ""
 "neveljavna oznaka tip %s;\n"
 "ta sistem ne omogo�a %lu-bajtnega zapisa v plavajo�i vejici"
 
-#: src/od.c:828
+#: src/od.c:869
 #, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr "neveljavni znak %c v oznaki tipa %s"
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr "ni mogo�e prek konca kombiniranega vhoda"
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr "neveljavna osnova naslovov »%c«; veljavne so možnosti d, o, x in n"
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr "tip ne sme biti dolo�en, kadar iznašamo nize"
 
-#: src/od.c:1810
+#: src/od.c:1863
 msgid "compatibility mode supports at most one file"
 msgstr "združljivostni na�in podpira najve� eno datoteko"
 
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr "vsota presko�enih in prebranih bajtov je prevelika"
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr "opozorilo: neveljavna Å¡irina %lu; namesto nje jemljemo %d"
@@ -7395,7 +7578,6 @@ msgid "standard input is closed"
 msgstr "standardni vhod je zaprt"
 
 #: src/paste.c:439
-#, fuzzy
 msgid ""
 "Write lines consisting of the sequentially corresponding lines from\n"
 "each FILE, separated by TABs, to standard output.\n"
@@ -7405,7 +7587,6 @@ msgstr ""
 "istoležno\n"
 "vrstico iz druge DATOTEKE, in tako naprej do konca seznama DATOTEK. ÄŒe\n"
 "DATOTEKA ni podana ali je enaka -, beremo s standardnega vhoda.\n"
-"\n"
 
 #: src/paste.c:447
 msgid ""
@@ -7543,12 +7724,12 @@ msgstr "Kdaj"
 msgid "Where"
 msgstr "Kje"
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr "Uporaba: %s [IZBIRA]... [UPORABNIK]...\n"
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -7564,7 +7745,7 @@ msgstr ""
 "  -p              v dolgi obliki izpusti uporabnikovo datoteko .plan\n"
 "  -s              kratka oblika izpisa (privzeto)\n"
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -7580,7 +7761,7 @@ msgstr ""
 "ra�unalnika\n"
 "                  in �as neaktivnosti\n"
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, c-format
 msgid ""
 "\n"
@@ -7591,7 +7772,7 @@ msgstr ""
 "Poenostavljeni program »finger«: izpis informacij o uporbnikih.\n"
 "Datoteka UTMP bo %s.\n"
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr "uporabniško ime ni podano; pri izbiri -l mora biti podano vsaj eno"
@@ -7677,11 +7858,9 @@ msgid "Page %<PRIuMAX>"
 msgstr "Stran %<PRIuMAX>"
 
 #: src/pr.c:2757
-#, fuzzy
 msgid "Paginate or columnate FILE(s) for printing.\n"
 msgstr ""
 "Oštevil�imo strani ali poravnamo besedilo v DATOTEKI v stolpce za izpis.\n"
-"\n"
 
 #: src/pr.c:2763
 msgid ""
@@ -7813,11 +7992,13 @@ msgstr ""
 "                    brez opozoril, kadar ni mogo�e odpreti datoteke\n"
 
 #: src/pr.c:2820
+#, fuzzy
 msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
@@ -7828,7 +8009,7 @@ msgstr ""
 "                    -s[ZNAK] izklju�i okrajšanje vrstic za vse tristolp�ne\n"
 "                    izbire (-STOLPEC|-a -STOLPEC|-m), razen �e je podan -w\n"
 
-#: src/pr.c:2827
+#: src/pr.c:2828
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
 "                    separate columns by STRING,\n"
@@ -7843,7 +8024,7 @@ msgstr ""
 "                    isto kot -S\" \"), brez u�inka na nastavitve stolpcev\n"
 "  -t, --omit-header brez zglavja in repa\n"
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 msgid ""
 "  -T, --omit-pagination\n"
 "                    omit page headers and trailers, eliminate any "
@@ -7867,7 +8048,7 @@ msgstr ""
 "72);\n"
 "                    samo besedilo v ve� stolpcih; -s[znak] izklopi\n"
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
 "                    set page width to PAGE_WIDTH (72) characters always,\n"
@@ -7882,7 +8063,7 @@ msgstr ""
 "na\n"
 "                    izbiri -s in -S\n"
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 msgid ""
 "\n"
 "-t is implied if PAGE_LENGTH <= 10.  With no FILE, or when FILE is -, read\n"
@@ -7905,7 +8086,8 @@ msgstr ""
 "Če SPREMENLJIVKA ni podana, izpiše imena in vrednosti vseh spremenljivk.\n"
 
 #: src/printenv.c:69
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+#, fuzzy
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr "  -0, --null     vrstice naj se zaklju�ijo z znakom NUL, ne LF\n"
 
 #: src/printf.c:79
@@ -8023,12 +8205,12 @@ msgstr "opozorilo: odve�ni argumenti za�enši s %s niso bili upoštevani"
 msgid "F. Pinard"
 msgstr "François Pinard"
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, c-format
 msgid "%s (for regexp %s)"
 msgstr "%s (za regularni izraz %s)"
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
@@ -8037,16 +8219,14 @@ msgstr ""
 "Uporaba: %s [IZBIRA]... [VHOD]...  (brez -G)\n"
 "  ali:   %s -G [IZBIRA]... [VHOD [IZHOD]]\n"
 
-#: src/ptx.c:1821
-#, fuzzy
+#: src/ptx.c:1824
 msgid ""
 "Output a permuted index, including context, of the words in the input "
 "files.\n"
 msgstr ""
 "Izpis permutiranega kazala gesel v vhodnih datotekah, skupaj s kontekstom.\n"
-"\n"
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
 "  -G, --traditional              behave more like System V 'ptx'\n"
@@ -8057,7 +8237,7 @@ msgstr ""
 "  -F, --flag-truncation=NIZ      za ozna�evanje okrajšanih vrstic uporabi "
 "NIZ\n"
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
 "  -O, --format=roff              generate output as roff directives\n"
@@ -8072,7 +8252,7 @@ msgstr ""
 "  -S, --sentence-regexp=REGIZR   za konce vrstic ali konce stavkov\n"
 "  -T, --format=tex               izpis v obliki stavnega jezika tex\n"
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -8092,7 +8272,7 @@ msgstr ""
 "  -o, --only-file=FILE           preberi le seznam besed iz navedene "
 "DATOTEKE\n"
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -8103,16 +8283,16 @@ msgstr ""
 "  -t, --typeset-mode               - ni izvedeno -\n"
 "  -w, --width=Å TEVILO            Å¡irina izhoda v znakih, brez sklicev\n"
 
-#: src/ptx.c:1854
+#: src/ptx.c:1857
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
 "\n"
-"Kadar DATOTEKA ni podana ali je enaka -, se bere standardni vhod. Privzeto\n"
-"ozna�evanje okrajšanih vrstic je »-F /«.\n"
+"ÄŒe DATOTEKA ni podana, ali pa je enaka -, se bere s standardnega vhoda.\n"
+"Privzeto je »-F /«.\n"
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, c-format
 msgid "invalid gap width: %s"
 msgstr "neveljavna Å¡irina razmaka: %s"
@@ -8122,7 +8302,7 @@ msgid ""
 "Print the full filename of the current working directory.\n"
 "\n"
 msgstr ""
-"Izpišemo celotno pot trenutnega delovnega imenika.\n"
+"Izpiše se celotna pot trenutnega delovnega imenika.\n"
 "\n"
 
 #: src/pwd.c:61
@@ -8135,22 +8315,28 @@ msgstr ""
 "                  povezave\n"
 "  -P, --physical  brez vseh simbolnih povezav\n"
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+
+#: src/pwd.c:169
 #, c-format
 msgid "failed to chdir to %s"
 msgstr "menjava imenika v %s ni uspela"
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, c-format
 msgid "failed to stat %s"
 msgstr "branje statistike %s ni uspelo"
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr "imeniškega vnosa z ujemajo�im inodom v %s ni mo� najti"
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, c-format
 msgid "ignoring non-option arguments"
 msgstr "ne-izbirnih argumentov ne upoštevamo"
@@ -8160,8 +8346,8 @@ msgstr "ne-izbirnih argumentov ne upoštevamo"
 msgid "Dmitry V. Levin"
 msgstr "Dmitry V. Levin"
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Uporaba: %s [IZBIRA]... DATOTEKA...\n"
@@ -8209,8 +8395,7 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 "  -m, --canonicalize-missing   kanoniziran izpis vsake komponente vsake "
 "simbolne\n"
@@ -8221,11 +8406,13 @@ msgstr ""
 "  -q, --quiet,\n"
 "  -s, --silent                 brez izpisa ve�ine poro�il o napakah\n"
 "  -v, --verbose                z poro�ili o napakah\n"
+"  -z, --zero                   izpis razmejen z znaki NUL namesto nove "
+"vrstice\n"
 
 #: src/readlink.c:152
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring --no-newline with multiple arguments"
-msgstr "ne-izbirnih argumentov ne upoštevamo"
+msgstr "izbire --no-newline z ve� argumenti ne upoštevamo"
 
 #: src/realpath.c:72
 msgid ""
@@ -8238,6 +8425,7 @@ msgstr ""
 "\n"
 
 #: src/realpath.c:77
+#, fuzzy
 msgid ""
 "  -e, --canonicalize-existing  all components of the path must exist\n"
 "  -m, --canonicalize-missing   no components of the path need exist\n"
@@ -8247,7 +8435,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 "  -e, --canonicalize-existing  vse komponente poti morajo obstajati\n"
@@ -8278,41 +8466,42 @@ msgstr "%s: naj se spustimo v imenik %s, ki je zavarovan proti pisanju? "
 msgid "%s: descend into directory %s? "
 msgstr "%s: naj se spustimo v podimenik %s? "
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr "%s: naj se odstrani %s %s, ki je zavarovana proti pisanju? "
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, c-format
 msgid "%s: remove %s %s? "
 msgstr "%s: naj se odstrani %s %s? "
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, c-format
 msgid "removed directory: %s\n"
 msgstr "odstranjen imenik: %s\n"
 
-#: src/remove.c:444
+#: src/remove.c:447
 #, c-format
-msgid "cannot remove directory: %s"
-msgstr "imenika ni mogo�e odstraniti: %s"
+msgid "refusing to remove %s or %s directory: skipping %s"
+msgstr "zavra�a se odstranitev %s ali imenika %s: izpusti se %s"
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
-msgstr "preskakujemo %s, ker je na drugi napravi"
+msgstr "izpusti se %s, ker je na drugi napravi"
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, c-format
 msgid "traversal failed: %s"
 msgstr "pre�enje ni uspelo: %s"
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -8334,7 +8523,7 @@ msgid ""
 "prompt\n"
 "  -i                    prompt before every removal\n"
 msgstr ""
-"Odstranimo navedene DATOTEKE.\n"
+"Odstranijo se navedene DATOTEKE.\n"
 "\n"
 "  -f, --force           brez opozoril o neobstoje�ih datotekah ali izbirah,\n"
 "                        brez zahteve po potrditvi pred vsakim brisanjem\n"
@@ -8344,16 +8533,16 @@ msgstr ""
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 "  -I                    zahtevamo potrditev pred brisanjem treh ali ve� "
 "datotek,\n"
-"                        ali pri rekurzivnem brisanju. Manj mote�e kot -i, "
+"                        ali pri rekurzivnem brisanju; manj mote�e kot -i, "
 "vseeno\n"
 "                        pa varuje pred ve�ino napak.\n"
 "      --interactive[=KDAJ]  potrditev glede na KDAJ: never (nikoli), once \n"
@@ -8429,13 +8618,21 @@ msgstr ""
 
 #: src/rm.c:342
 #, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr "%s: naj vse argumente rekurzivno odstranimo? "
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] "%s: naj se %zu argumentov rekurzivno odstrani? "
+msgstr[1] "%s: naj se %zu argument rekurzivno odstrani? "
+msgstr[2] "%s: naj se %zu argumenta rekurzivno odstranita? "
+msgstr[3] "%s: naj se %zu argumenti rekurzivno odstranijo? "
 
-#: src/rm.c:343
+#: src/rm.c:345
 #, c-format
-msgid "%s: remove all arguments? "
-msgstr "%s: naj se odstranijo vsi argumenti? "
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] "%s: naj se odstrani %zu argumentov? "
+msgstr[1] "%s: naj se odstrani %zu argument? "
+msgstr[2] "%s: naj se odstranita %zu argumenta? "
+msgstr[3] "%s: naj se odstranijo %zu argumenti? "
 
 #: src/rmdir.c:134 src/rmdir.c:233
 #, c-format
@@ -8490,12 +8687,13 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
+"Požene program v drugem varnostnem kontekstu SELinux.\n"
+"Če ni podan ne KONTEKST in ne UKAZ, se izpiše trenutni varnostni kontekst.\n"
 
 #: src/runcon.c:94
-#, fuzzy
 msgid ""
 "  CONTEXT            Complete security context\n"
 "  -c, --compute      compute process transition context before modifying\n"
@@ -8505,9 +8703,6 @@ msgid ""
 "  -l, --range=RANGE  levelrange\n"
 "\n"
 msgstr ""
-"Požene program v drugem varnostnem kontekstu.\n"
-"Če ni podan ne KONTEKST, ne UKAZ, izpiše trenutni varnostni kontekst.\n"
-"\n"
 "  CONTEXT            popoln varnostni kontekst\n"
 "  -c, --compute      pred spremembo izra�unaj prehodni kontekst procesa\n"
 "  -t, --type=TIP     tip (v enaki vlogi kot starš)\n"
@@ -8550,41 +8745,46 @@ msgstr "podati morate -c, -t, -u, -l, -r ali kontekst"
 msgid "no command specified"
 msgstr "ukaz ni dolo�en"
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr "%s lahko uporabite le z jedrom SELinux"
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, c-format
 msgid "failed to compute a new context"
 msgstr "izra�un novega konteksta ni uspel"
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, c-format
 msgid "failed to set new user %s"
 msgstr "nastavitev novega uporabnika %s ni uspela"
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, c-format
 msgid "failed to set new type %s"
 msgstr "nastavitev novega tipa %s ni uspela"
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, c-format
 msgid "failed to set new range %s"
 msgstr "nastavitev novega obsega %s ni uspela"
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, c-format
 msgid "failed to set new role %s"
 msgstr "nastavitev nove vloge %s ni uspela"
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, c-format
 msgid "unable to set security context %s"
 msgstr "varnostnega konteksta %s ni mogo�e nastaviti"
 
+#: src/selinux.c:127 src/selinux.c:300
+#, c-format
+msgid "error canonicalizing %s"
+msgstr "napaka pri kanoniziranju %s"
+
 #: src/seq.c:68
 #, c-format
 msgid ""
@@ -8598,19 +8798,16 @@ msgstr ""
 
 #: src/seq.c:73
 msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n"
-msgstr ""
+msgstr "Izpišemo števila od PRVEGA do ZADNJEGA s podanim KORAKOM.\n"
 
 #: src/seq.c:79
-#, fuzzy
 msgid ""
 "  -f, --format=FORMAT      use printf style floating-point FORMAT\n"
 "  -s, --separator=STRING   use STRING to separate numbers (default: \\n)\n"
 "  -w, --equal-width        equalize width by padding with leading zeroes\n"
 msgstr ""
-"Izpišemo števila od PRVEGA do ZADNJEGA s podanim KORAKOM.\n"
-"\n"
-"  -f, --format DOLOÄŒILO    uporabi oblikovno DOLOÄŒILO kot v printf(3)\n"
-"  -s, --separator NIZ      uporabi NIZ kot lo�ilo med števili (privzeto: "
+"  -f, --format=DOLOÄŒILO    uporabi oblikovno DOLOÄŒILO kot v printf(3)\n"
+"  -s, --separator=NIZ      uporabi NIZ kot lo�ilo med števili (privzeto: "
 "\\n)\n"
 "  -w, --equal-width        polja dopolni do enake Å¡irine z vodilnimi "
 "ni�lami\n"
@@ -8620,6 +8817,8 @@ msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
@@ -8627,11 +8826,13 @@ msgstr ""
 "\n"
 "Če sta bodisi PRVO bodisi KORAK izpuš�ena, se zanju uporabi privzeta\n"
 "vrednost 1; izpuš�eni KORAK zavzame vrednost 1 celo takrat, kot je\n"
-"ZADNJE manjše od PRVEGA. PRVO, KORAK in ZADNJE so tolma�ena kot\n"
-"števila s plavajo�o vejico. KORAK je navadno pozitiven, �e je PRVO\n"
-"število manjše od ZADNJEGA, sicer pa negativen.\n"
+"ZADNJE manjše od PRVEGA. Sekvenca se kon�a, ko vsota trenutne vrednosti\n"
+"in KORAKA preseže vrednost ZADNJEGA števila.\n"
+"PRVO, KORAK in ZADNJE so tolma�ena kot števila s plavajo�o vejico.\n"
+"KORAK je navadno pozitiven, �e je PRVO število manjše od ZADNJEGA, \n"
+"sicer pa negativen.\n"
 
-#: src/seq.c:94
+#: src/seq.c:96
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
 "it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n"
@@ -8642,97 +8843,36 @@ msgstr ""
 "Å¡tevila\n"
 "predstavljena v fiksni natan�nosti PREC, sicer pa %g.\n"
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, c-format
 msgid "invalid floating point argument: %s"
 msgstr "argument ni neveljavno število v plavajo�i vejici: %s"
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr "dolo�ilo %s vsebuje neznano direktivo %%%c"
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr "pri izpisu polj enake širine ni dovoljeno podati oblikovnega dolo�ila"
 
-#: src/setuidgid.c:49
-#, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-"Uporaba: %s [KRATKA_IZBIRA]... UPORABNIK UKAZ [ARGUMENT]...\n"
-"  ali:   %s [DOLGA_IZBIRA]\n"
-
-#: src/setuidgid.c:55
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-"Izpusti vse dodatne skupine, privzame Å¡tevilki uporabnika in skupine (UID \n"
-"in GID) navedenega UPORABNIKA ter požene UKAZ z vsemi podanimi ARGUMENTI.\n"
-"Ob izhodu vrne statusno kodo 111, �e ni bilo mogo�e privzeti zahtevanih UID\n"
-"in GID, sicer pa vrne izhodno statusno kodo UKAZA.\n"
-"Program je uporaben le, kadar ga poganja superuporabnik (UID=0).\n"
-"\n"
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-"  -g GID[,GID1...]  nastavi tudi primarni ID skupine na števil�ni GID, ter\n"
-"                    (�e je podano) dodatni ID skupine na GID1...\n"
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr "neznana Å¡tevilka uporabnika (UID): %s"
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr "za uporabo user-ID %s morate uporabiti tudi -g"
-
-#: src/setuidgid.c:190
-#, c-format
-msgid "failed to set supplemental group(s)"
-msgstr "dodatne skupine ni mogo�e nastaviti"
-
-#: src/setuidgid.c:200
-#, c-format
-msgid "cannot set group-ID to %lu"
-msgstr "nastavitev GID na %lu ni mogo�a"
-
-#: src/setuidgid.c:204
-#, c-format
-msgid "cannot set user-ID to %lu"
-msgstr "nastavitev UID na %lu ni mogo�a"
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr "Colin Plumb"
 
-#: src/shred.c:148
-#, fuzzy
+#: src/shred.c:170
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
 "for even very expensive hardware probing to recover the data.\n"
 msgstr ""
 "Vsebino navedene DATOTEKE uni�imo tako, da prek nje ve�krat zapišemo\n"
-"drugo vsebino.\n"
-"\n"
+"drugo vsebino, s �imer je branje uni�enih podatkov mo�no oteženo tudi\n"
+"s specializiranimi orodji.\n"
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -8746,30 +8886,35 @@ msgstr ""
 "  -s, --size=N   uni�imo podano število bajtov (dovoljene pripone K, M, "
 "G...)\n"
 
-#: src/shred.c:161
+#: src/shred.c:183
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
 "  -z, --zero     add a final overwrite with zeros to hide shredding\n"
 msgstr ""
-"  -u, --remove   datoteko po uni�enju vsebine skrajšaj in odstrani\n"
+"  -u, --remove[=KAKO]   datoteko po uni�enju vsebine skrajšaj in odstrani;\n"
+"                   glej nižje\n"
 "  -v, --verbose  s prikazom napredka med delom\n"
 "  -x, --exact    brez zaokroževanja velikosti datotek do polnega bloka\n"
 "                   (privzeto za predmete, ki niso navadne datoteke)\n"
 "  -z, --zero     na koncu zapiši prek datoteke ni�le, da se prikrije "
 "uni�enje\n"
 
-#: src/shred.c:170
+#: src/shred.c:192
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 "\n"
@@ -8777,12 +8922,16 @@ msgstr ""
 "\n"
 "DATOTEKE odstranimo le, �e je podana izbira --remove (-u). Privzeto "
 "datoteke\n"
-"ne odstranimo, kar je primerneje za delo z napravami (npr. /dev/hda). Pri "
-"delu \n"
-"z navadnimi datotekami ve�ina uporablja izbiro --remove.\n"
-"\n"
+"ne odstranimo, kar je primerneje za delo z napravami (npr. /dev/hda), ker "
+"teh\n"
+"datotek ne smemo odstraniti.\n"
+"Neobvezni parameter KAKO ozna�uje, kako se odstrani imeniški vnos:\n"
+"»unlink«: uporabi se standardni sistemski klic unlink()\n"
+"»wipe«: pred brisanjem zabrišemo bajte v imenu\n"
+"»wipesync«: vsak zabrisani bajt sinhroniziramo z diskom\n"
+"Privzeti na�in je »wipesync«, kar pa je lahko potratno.\n"
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -8802,7 +8951,7 @@ msgstr ""
 "datote�nega sistema:\n"
 "\n"
 
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -8824,7 +8973,7 @@ msgstr ""
 "  strežnik NFS podjetja Network Appliace\n"
 "\n"
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -8838,7 +8987,7 @@ msgstr ""
 "* stisnjeni datote�ni sistemi\n"
 "\n"
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -8862,7 +9011,7 @@ msgstr ""
 "in oddaljenih zrcalih. Teh izvodov ne moremo odstraniti in iz njih je\n"
 "mogo�e rekonstruirati uni�eno datoteko.\n"
 
-#: src/shred.c:215
+#: src/shred.c:241
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
 "of the file that cannot be removed, and that will allow a shredded file\n"
@@ -8872,127 +9021,127 @@ msgstr ""
 "in oddaljenih zrcalih. Teh izvodov ne moremo odstraniti in iz njih je\n"
 "mogo�e rekonstruirati uni�eno datoteko.\n"
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, c-format
 msgid "%s: fdatasync failed"
 msgstr "%s: klic fdatasync ni uspel"
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr "%s: fsync ni uspel"
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr "%s: ni mogo�e previti na za�etek"
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr "%s: prehod %lu/%lu (%s)..."
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, c-format
 msgid "%s: error writing at offset %s"
 msgstr "%s: napaka med pisanjem pri odmiku %s"
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s: klic lseek ni uspel"
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, c-format
 msgid "%s: file too large"
 msgstr "%s: datoteka prevelika"
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr "%s: prehod %lu/%lu (%s)...%s"
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr "%s: prehod %lu/%lu (%s)...%s/%s %d%%"
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, c-format
 msgid "%s: fstat failed"
 msgstr "%s: klic fstat ni uspel"
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, c-format
 msgid "%s: invalid file type"
 msgstr "%s: neveljavni tip datoteke"
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr "%s: velikost datoteke negativna"
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, c-format
 msgid "%s: error truncating"
 msgstr "%s: napaka pri krajšanju"
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, c-format
 msgid "%s: fcntl failed"
 msgstr "%s: klic fcntl ni uspel"
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr "%s: ni mogo�e uni�iti datoteke, v katero smemo le dodajati"
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr "%s: odstranjujemo"
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, c-format
 msgid "%s: renamed to %s"
 msgstr "%s: preimenovano v %s"
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, c-format
 msgid "%s: failed to remove"
 msgstr "%s: ni mogo�e odstraniti"
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr "%s: odstranjeno"
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, c-format
 msgid "%s: failed to close"
 msgstr "%s: ni mogo�e zapreti"
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, c-format
 msgid "%s: failed to open for writing"
 msgstr "%s: ni mogo�e odpreti za pisanje"
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, c-format
 msgid "%s: invalid number of passes"
 msgstr "%s: neveljavno Å¡tevilo prehodov"
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, c-format
 msgid "multiple random sources specified"
 msgstr "naveden je ve� kot en izvor naklju�nih števil"
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, c-format
 msgid "%s: invalid file size"
 msgstr "%s: neveljavna velikost datoteke"
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -9003,14 +9152,12 @@ msgstr ""
 "  ali:   %s [IZBIRA]... [ARGUMENT]...\n"
 "  ali:   %s -i SP-ZG [IZBIRA]...\n"
 
-#: src/shuf.c:54
-#, fuzzy
+#: src/shuf.c:67
 msgid "Write a random permutation of the input lines to standard output.\n"
-msgstr ""
-"Naklju�no permutacijo vrstic na vhodu zapišemo na standardni izhod.\n"
-"\n"
+msgstr "Naklju�no permutacijo vrstic na vhodu zapišemo na standardni izhod.\n"
 
-#: src/shuf.c:60
+#: src/shuf.c:73
+#, fuzzy
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
 "  -i, --input-range=LO-HI   treat each number LO through HI as an input "
@@ -9018,43 +9165,54 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
 msgstr ""
 "  -e, --echo                obravnavaj vsak ARG kot vhodno vrstico\n"
 "  -i, --input-range=SP-ZG   obravnavaj vsako Å¡tevilo SP..ZG kot vhodno "
 "vrstico\n"
-"  -n, --head-lines=VRSTICE  izpiši najve� navedeno število VRSTIC\n"
+"  -n, --head-count=ŠTEVILO  izpiši najve� navedeno ŠTEVILO vrstic\n"
 "  -o, --output=DATOTEKA     zapiši rezultat na DATOTEKO namesto na std. "
 "izhod\n"
 "      --random-source=DATOTEKA  preberi naklju�ne bajte iz datoteke\n"
+"  -r. --repeat              pri izhodnih vrsticah je dovoljeno ponavljanje\n"
 "  -z, --zero-terminated     zaklju�i vrstice z \\0, ne z znakom za novo "
 "vrstico\n"
 
-#: src/shuf.c:244
+#: src/shuf.c:228
+#, c-format
+msgid "too many input lines"
+msgstr "preve� vrstic na vhodu"
+
+#: src/shuf.c:431
 #, c-format
 msgid "multiple -i options specified"
 msgstr "podanih je ve� izbir -i"
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, c-format
 msgid "invalid input range %s"
 msgstr "neveljavni vhodni razpon %s"
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, c-format
 msgid "invalid line count %s"
 msgstr "neveljavno Å¡tevilo vrstic %s"
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, c-format
 msgid "multiple output files specified"
 msgstr "podana je ve� kot ena izhodna datoteka"
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, c-format
 msgid "cannot combine -e and -i options"
 msgstr "izbir -e in -i ni mogo�e kombinirati"
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr ""
+
 #: src/sleep.c:44
 #, c-format
 msgid ""
@@ -9077,25 +9235,23 @@ msgstr ""
 "velja premor za vsoto njihovih vrednosti.\n"
 "\n"
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, c-format
 msgid "invalid time interval %s"
 msgstr "neveljavni �asovni interval %s"
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr "ure s stvarnim �asom ni mo� prebrati"
 
-#: src/sort.c:399
-#, fuzzy
+#: src/sort.c:427
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr ""
-"Vsebino vseh DATOTEK na vhodu združimo, uredimo, in izpišemo na standarni "
+"Vsebino vseh DATOTEK na vhodu združimo, uredimo in izpišemo na standarni "
 "izhod.\n"
-"\n"
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
@@ -9103,7 +9259,7 @@ msgstr ""
 "Izbire pri urejanju:\n"
 "\n"
 
-#: src/sort.c:409
+#: src/sort.c:437
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
 "  -d, --dictionary-order      consider only blanks and alphanumeric "
@@ -9114,7 +9270,7 @@ msgstr ""
 "  -d, --dictionary-order      upoštevaj samo �rke, števke in presledke\n"
 "  -f, --ignore-case           male in velike �rke so enakovredne\n"
 
-#: src/sort.c:415
+#: src/sort.c:443
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
 "  -i, --ignore-nonprinting    consider only printable characters\n"
@@ -9124,13 +9280,13 @@ msgstr ""
 "  -i, --ignore-nonprinting    v klju�ih upoštevaj samo izpisljive znake\n"
 "  -M, --month-sort            klju�e uredi: (neznano) < »jan« < ... < »dec«\n"
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 "  -h, --human-numeric-sort    primerjaj �loveku umljiv zapis (npr. 2K, 1G)\n"
 
-#: src/sort.c:423
+#: src/sort.c:451
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
 "  -R, --random-sort           sort by random hash of keys\n"
@@ -9142,7 +9298,7 @@ msgstr ""
 "      --random-source=DATOTEKA  beri naklju�ne bajte iz DATOTEKE\n"
 "  -r, --reverse               izpis v obrnjenem vrstnem redu\n"
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -9156,7 +9312,7 @@ msgstr ""
 "                                števil�no -n, naklju�no -R, razli�ica -V\n"
 "  -V, --version-sort          uredi po številki razli�ice v besedilu\n"
 
-#: src/sort.c:437
+#: src/sort.c:465
 msgid ""
 "Other options:\n"
 "\n"
@@ -9164,7 +9320,7 @@ msgstr ""
 "Druge izbire:\n"
 "\n"
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
@@ -9172,7 +9328,7 @@ msgstr ""
 "      --batch-size=N        združuj najve� N vhodov naenkrat; pri ve�jem\n"
 "                            številu uporabi za�asne datoteke\n"
 
-#: src/sort.c:445
+#: src/sort.c:473
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
 "  -C, --check=quiet, --check=silent  like -c, but do not report first bad "
@@ -9187,7 +9343,7 @@ msgstr ""
 "      --compress-program=PROGRAM  za�asne datoteke stisni s PROGRAMOM; pri\n"
 "                            dekomprimiranju uporabi »PROGRAM -d«\n"
 
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -9201,7 +9357,7 @@ msgstr ""
 "                            imena so zaklju�ena z NUL; �e je DATOTEKA »-« ,\n"
 "                            se bere standardni vhod\n"
 
-#: src/sort.c:459
+#: src/sort.c:487
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
 "  -m, --merge               merge already sorted files; do not sort\n"
@@ -9210,7 +9366,7 @@ msgstr ""
 "  -m, --merge               že urejene datoteke združi brez ponovnega "
 "urejanja\n"
 
-#: src/sort.c:463
+#: src/sort.c:491
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "  -s, --stable              stabilize sort by disabling last-resort "
@@ -9223,7 +9379,7 @@ msgstr ""
 "                              primerjav\n"
 "  -S, --buffer-size=VELIKOST  dolo�i VELIKOST izravnalnika\n"
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -9248,12 +9404,7 @@ msgstr ""
 "                              sicer izpiši samo prve od zaporednih enakih "
 "vrstic\n"
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr ""
-"  -z, --zero-terminated     vrstice naj se zaklju�ijo z znakom NUL, ne LF\n"
-
-#: src/sort.c:483
+#: src/sort.c:511
 msgid ""
 "\n"
 "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is "
@@ -9282,7 +9433,7 @@ msgstr ""
 "\n"
 "VELIKOSTI lahko sledi ena od naslednji multiplikativnih pripon:\n"
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -9302,133 +9453,118 @@ msgstr ""
 "obnašanje\n"
 "(urejanje po Å¡tevilski vrednosti bajtov), uporabite LC_ALL=C.\n"
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, c-format
 msgid "waiting for %s [-d]"
 msgstr "�akamo na %s [-d]"
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr "%s [-d] se je zaklju�il nenormalno"
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, c-format
 msgid "cannot create temporary file in %s"
 msgstr "za�asne datoteke v %s ni mogo�e ustvariti"
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr "odpiranje ni uspelo"
 
-#: src/sort.c:970
+#: src/sort.c:998
 msgid "fflush failed"
 msgstr "klic fflush ni uspel"
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr "zapiranje ni uspelo"
 
-#: src/sort.c:986
-#, c-format
-msgid "dup2 failed"
-msgstr "klic dup2 ni uspel"
-
-#: src/sort.c:1103
-#, c-format
-msgid "couldn't execute %s"
-msgstr "ni mogo�e izvesti %s"
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 msgid "couldn't create temporary file"
 msgstr "za�asne datoteke ni mogo�e ustvariti"
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, c-format
 msgid "couldn't create process for %s -d"
 msgstr "ni mogo�e ustvariti procesa za %s -d"
 
-#: src/sort.c:1161
-#, c-format
-msgid "couldn't execute %s -d"
-msgstr "ni mogo�e izvesti %s -d"
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, c-format
 msgid "warning: cannot remove: %s"
 msgstr "opozorilo: ni mo� odstraniti %s"
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, c-format
 msgid "invalid --%s argument %s"
 msgstr "neveljavni --%s argument %s"
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, c-format
 msgid "minimum --%s argument is %s"
 msgstr "najmanjši --%s argument je %s"
 
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, c-format
 msgid "--%s argument %s too large"
 msgstr "--%s argument %s je prevelik"
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr "najve�ji dovoljeni argument --%s pri trenutni vrednosti rlimit je %s"
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr "število vzporednih stolpcev mora biti ve�je od ni�"
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr "poizvedba po statusu ni uspela"
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr "branje ni uspelo"
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, c-format
 msgid "string transformation failed"
 msgstr "pretvorba niza ni uspela"
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, c-format
 msgid "the untransformed string was %s"
 msgstr "nepretvorjeni niz je bil %s"
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr "^ brez ujemanja za klju�\n"
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr "uporabljen opuš�en klju� »%s«; nadomestite ga z »%s«"
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr "klju� %lu ima širino ni� in ne bo upoštevan"
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr ""
 "vode�i presledki so pomembni pri klju�u %lu; morda morate navesti tudi »b«"
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr "klju� %lu je števil�en in se razteza prek ve� polj"
 
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
@@ -9437,126 +9573,125 @@ msgstr[1] "izbira »-%s« ni bila upoštevana"
 msgstr[2] "izbiri »-%s« nista bili upoštevani"
 msgstr[3] "izbire »-%s« niso bile upoštevane"
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr "izbira »-r« se nanaša le na primerjanje v skrajni sili"
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr "pisanje ni uspelo"
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr "%s: %s:%s: neurejenost: "
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr "standardna napaka"
 
-#: src/sort.c:3698
+#: src/sort.c:3738
 msgid "cannot read"
 msgstr "branje ni mogo�e"
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, c-format
 msgid "%s: invalid field specification %s"
 msgstr "%s: neveljavno dolo�ilo polja: %s"
 
-#: src/sort.c:3987
+#: src/sort.c:4028
 #, c-format
 msgid "options '-%s' are incompatible"
 msgstr "izbire »-%s« so nezdružljive"
 
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, c-format
 msgid "%s: invalid count at start of %s"
 msgstr "%s: neveljavni števec na za�etku %s"
 
-#: src/sort.c:4295
+#: src/sort.c:4336
 msgid "invalid number after '-'"
 msgstr "neveljavno število za »-«"
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 msgid "invalid number after '.'"
 msgstr "neveljavno število za ».«"
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr "zablodeli znak v dolo�ilu polja"
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, c-format
 msgid "multiple compress programs specified"
 msgstr "podan je ve� kot en program za stiskanje"
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
 msgstr "neveljavno število za�etka polja"
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
 msgstr "številka polja je ni�"
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr "znakovni zamik je ni�"
 
-#: src/sort.c:4407
+#: src/sort.c:4448
 msgid "invalid number after ','"
 msgstr "neveljavno število za »,«"
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr "prazen tabulator"
 
 # POZOR!!! Razisci, kaj program res tu pocne!
 # ! INEXACT
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, c-format
 msgid "cannot read file names from %s"
 msgstr "ni mogo�e prebrati imen datotek iz %s"
 
 # ! INEXACT
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr "%s:%lu: neveljavno ime datoteke (dolžina ni�)"
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, c-format
 msgid "no input from %s"
 msgstr "ni vhoda iz %s"
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr "z uporabo %s pravil za urejanje"
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr "z uporabo preproste primerjave bajtov"
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr "dodatni operand %s pri izbiri -%c ni dovoljen"
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr "dolžina pripone mora biti najmanj %zu"
 
-#: src/split.c:204
+#: src/split.c:203
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr "Uporaba: %s [IZBIRA]... [VHOD [PREDPONA]]\n"
 
-#: src/split.c:208
-#, fuzzy
+#: src/split.c:207
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
 "size is 1000 lines, and default PREFIX is 'x'.  With no INPUT, or when "
@@ -9566,24 +9701,22 @@ msgstr ""
 "Datoteko VHOD razrežemo na kose enake dolžine, poimenovane PREDPONAaa,\n"
 "PREDPONAab...; privzeta dolžina je 1000 vrstic, privzeta PREDPONA pa »x«.\n"
 "ÄŒe VHOD ni podan ali je enak -, se bere s standardnega vhoda.\n"
-"\n"
 
-#: src/split.c:216
+#: src/split.c:215
 #, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
 "  -a, --suffix-length=N   uporabi pripone dolžine N (privzeto %d)\n"
@@ -9596,10 +9729,11 @@ msgstr ""
 "      --filter=SKRIPT     izhod podamo SKRIPTU ukazne lupine; ime datoteke\n"
 "                            je podano s $FILE\n"
 "  -l, --lines=ŠTEVILO     dolo�imo ŠTEVILO vrstic v izhodni datoteki\n"
-"  -n, --number=KOSOV      ustvari KOSOV izhodnih datotek.  Glejte nižje.\n"
+"  -n, --number=KOSOV      ustvari KOSOV izhodnih datotek; glejte razlago "
+"nižje\n"
 "  -u, --unbuffered        takoj prepiši vhod na izhod z »-n r/...«\n"
 
-#: src/split.c:229
+#: src/split.c:228
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
 "                            output file is opened\n"
@@ -9607,7 +9741,7 @@ msgstr ""
 "      --verbose           z izpisom diagnostike tik\n"
 "                            preden odpremo posami�no datoteko\n"
 
-#: src/split.c:236
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -9628,190 +9762,190 @@ msgstr ""
 "r/K/N   podobno, vendar izpiši le vsak izpiši K-ti kos od N-tih \n"
 "        na standardni izhod\n"
 
-#: src/split.c:354
+#: src/split.c:353
 #, c-format
 msgid "output file suffixes exhausted"
 msgstr "pripone izhodnih datotek so iz�rpane"
 
-#: src/split.c:366
+#: src/split.c:365
 #, c-format
 msgid "creating file %s\n"
 msgstr "ustvarjanje datoteke %s\n"
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr "%s bi pisal prek vhoda; prekinjamo"
 
-#: src/split.c:391
+#: src/split.c:390
 #, c-format
 msgid "failed to set FILE environment variable"
 msgstr "nastavitev spremenljivke FILE ni uspela"
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr "izvajamo s FILE=%s\n"
 
-#: src/split.c:395
+#: src/split.c:394
 #, c-format
 msgid "failed to create pipe"
 msgstr "ni mogo�e ustvariti cevovoda"
 
-#: src/split.c:409
+#: src/split.c:408
 #, c-format
 msgid "closing prior pipe"
 msgstr "zapiramo prejšnji cevovod"
 
-#: src/split.c:411
+#: src/split.c:410
 #, c-format
 msgid "closing output pipe"
 msgstr "zapiramo izhodni cevovod"
 
-#: src/split.c:415
+#: src/split.c:414
 #, c-format
 msgid "moving input pipe"
 msgstr "prestavljamo vhodni cevovod"
 
-#: src/split.c:417
+#: src/split.c:416
 #, c-format
 msgid "closing input pipe"
 msgstr "zapiramo vhodni cevovod"
 
-#: src/split.c:422
+#: src/split.c:421
 #, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr "ukaz ni bil uspešno izveden: \"%s -c %s\""
 
-#: src/split.c:428
+#: src/split.c:427
 #, c-format
 msgid "failed to close input pipe"
 msgstr "zapiranje vhodnega cevovoda ni uspelo"
 
-#: src/split.c:464
+#: src/split.c:463
 #, c-format
 msgid "waiting for child process"
 msgstr "�akamo na nasledniški proces"
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr "pri FILE=%s prejeli signal %s od ukaza: %s"
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr "pri FILE=%s prejeli izhodno kodo %d od ukaza: %s"
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr "neznani status ukaza (0x%X)"
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr "razcep na ve� kot en na�in ni mogo�"
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, c-format
 msgid "%s: invalid number of chunks"
 msgstr "%s: neveljavno Å¡tevilo kosov"
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, c-format
 msgid "%s: invalid chunk number"
 msgstr "%s: neveljavno Å¡tevilo kosa"
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr "%s: neveljavno dolžina pripone"
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr "%s: neveljavno Å¡tevilo bajtov"
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr "%s: neveljavno Å¡tevilo vrstic"
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, c-format
 msgid "line count option -%s%c... is too large"
 msgstr "Å¡tevec vrstic -%s%c... je prevelik"
 
-#: src/split.c:1248
+#: src/split.c:1298
 #, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr "%s: neveljavna za�etna vrednost za števil�no pripono"
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, c-format
 msgid "%s: invalid IO block size"
 msgstr "%s: neveljavna velikost V/I bloka"
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr "--filter ne obdeluje kosa, zapisanega na standardni izhod"
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr ""
 "za�etna vrednost števil�ne pripone je prevelika glede na dolžino pripone"
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, c-format
 msgid "%s: cannot determine file size"
 msgstr "%s: velikosti datoteke ni mogo�e ugotoviti"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr "Michael Meskes"
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, c-format
 msgid "failed to canonicalize %s"
 msgstr "kanoniziranje %s ni uspelo"
 
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr "opozorilo: neprepoznana izbira »\\%c«"
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, c-format
 msgid "%s: invalid directive"
 msgstr "%s: neveljavna direktiva"
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, c-format
 msgid "warning: backslash at end of format"
 msgstr "opozorilo: obratna poševnica na koncu formatnega dolo�ila"
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr "uporaba %s za oznako standardnega vhoda ne deluje v datote�nem na�inu"
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, c-format
 msgid "cannot read file system information for %s"
 msgstr "ni mogo�e prebrati datote�nega sistema %s"
 
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, c-format
 msgid "cannot stat standard input"
 msgstr "statusa standardnega vhoda ni mogo�e ugotoviti"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -9827,7 +9961,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -9837,30 +9971,30 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr " Naprava: %Dh/%dd\tInod: %-10i  Povezave: %-5h  Tip naprave: %t,%T\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr " Naprava: %Dh/%dd\tInod: %-10i  Povezave: %h\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr "  Dostop: (%04a/%10.10A)  UID: (%5u/%8U)  GID: (%5g/%8G)\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, c-format
 msgid "Context: %C\n"
 msgstr "Kontekst: %C\n"
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -9872,39 +10006,36 @@ msgstr ""
 "Spremem.: %z\n"
 " Rojstvo: %w\n"
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
-msgstr ""
+msgstr "Izpišemo status datoteke ali datote�nega sistema.\n"
 
-#: src/stat.c:1356
-#, fuzzy
+#: src/stat.c:1418
 msgid ""
 "  -L, --dereference     follow links\n"
 "  -f, --file-system     display file system status instead of file status\n"
 msgstr ""
-"Izpis statusa datoteke ali datote�nega sistema.\n"
-"\n"
 "  -L, --dereference     s sledenjem povezav\n"
 "  -f, --file-system     izpis statusa datote�nega sistema, ne statusa "
 "datoteke\n"
 
-#: src/stat.c:1360
+#: src/stat.c:1422
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 "  -c, --format=OBLIKA   namesto privzete uporabi podano OBLIKO;\n"
 "                          nova vrstica za vsako uporabo OBLIKE\n"
 "      --printf=OBLIKA   podobno kot --format, vendar s tolma�enjem ubežnih\n"
 "                          zaporedij in brez izpisa obvezne zaklju�ne nove \n"
-"                          verstice; �e jo želite, dodajte \\n v OBLIKO.\n"
+"                          verstice; �e jo želite, dodajte \\n v OBLIKO\n"
 "  -t, --terse           izpis podatkov v zgoš�eni obliki\n"
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 msgid ""
 "\n"
 "The valid format sequences for files (without --file-system):\n"
@@ -9924,7 +10055,7 @@ msgstr ""
 "  %B - velikost v bajtih za vsak blok, ki ga javi »%b«\n"
 "  %C - niz z varnostnim kontekstom SELinux\n"
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 msgid ""
 "  %d   device number in decimal\n"
 "  %D   device number in hex\n"
@@ -9940,7 +10071,7 @@ msgstr ""
 "  %g - Å¡tevilka skupine (GID) lastnika\n"
 "  %G - ime skupine lastnika\n"
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 msgid ""
 "  %h   number of hard links\n"
 "  %i   inode number\n"
@@ -9949,8 +10080,8 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 "  %h - Å¡tevilo trdih povezav\n"
 "  %i - Å¡tevilka inoda\n"
@@ -9959,10 +10090,13 @@ msgstr ""
 "  %N - ime datoteke (ciljne datoteke, �e gre za simbolno povezavo)\n"
 "  %o - namig o optimalni velikosti V/I bloka\n"
 "  %s - skupna velikost v bajtih\n"
-"  %t - glavna številka zvrsti enote, šestnajstiško\n"
-"  %T - pomožna številka zvrsti enote, šestnajstiško\n"
+"  %t - glavna številka zvrsti enote, šestnajstiško, za blo�ne/znakovne "
+"enote\n"
+"  %T - pomožna številka zvrsti enote, šestnajstiško, za blo�ne/znakovne "
+"enote\n"
 
-#: src/stat.c:1399
+#: src/stat.c:1461
+#, fuzzy
 msgid ""
 "  %u   user ID of owner\n"
 "  %U   user name of owner\n"
@@ -9970,10 +10104,10 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 "  %u - uporabniška številka (UID) lastnika\n"
@@ -9988,7 +10122,7 @@ msgstr ""
 "  %Z - �as zadnje spremembe inoda, v sekundah od 1970-01-01\n"
 "\n"
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 msgid ""
 "Valid format sequences for file systems:\n"
 "\n"
@@ -10006,7 +10140,7 @@ msgstr ""
 "  %d - število prostih inodov v datote�nem sistemu\n"
 "  %f - število prostih blokov v datote�nem sistemu\n"
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 msgid ""
 "  %i   file system ID in hex\n"
 "  %l   maximum length of filenames\n"
@@ -10030,12 +10164,10 @@ msgid "Usage: %s OPTION... COMMAND\n"
 msgstr "Uporaba: %s IZBIRA... UKAZ\n"
 
 #: src/stdbuf.c:91
-#, fuzzy
 msgid ""
 "Run COMMAND, with modified buffering operations for its standard streams.\n"
 msgstr ""
 "Izvedi UKAZ z modificiranimi izravnalnimi operacijami za standardne tokove.\n"
-"\n"
 
 #: src/stdbuf.c:97
 msgid ""
@@ -10099,22 +10231,27 @@ msgstr ""
 "vhod \n"
 "in izhod, zato nastavitve »stdbuf« nanje nimajo u�inka.\n"
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, c-format
 msgid "failed to find %s"
 msgstr "neuspelo iskanje %s"
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, c-format
 msgid "failed to update the environment with %s"
 msgstr "posodobitev okolja z %s ni uspela"
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr "vrsti�no izravnavanje standardnega vhoda ni smiselno"
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, c-format
+msgid "you must specify a buffering mode option"
+msgstr "navesti morate izbiro izravnalnega na�ina"
+
+#: src/stty.c:516
 #, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -10125,19 +10262,16 @@ msgstr ""
 "  ali:   %s [-F ENOTA] [--file=ENOTA] [-a|-all]\n"
 "  ali:   %s [-F ENOTA] [--file=ENOTA] [-g|--save]\n"
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
-msgstr ""
+msgstr "Izpišemo ali spremenimo lastnosti terminala.\n"
 
-#: src/stty.c:525
-#, fuzzy
+#: src/stty.c:528
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
 "  -g, --save         print all current settings in a stty-readable form\n"
 "  -F, --file=DEVICE  open and use the specified DEVICE instead of stdin\n"
 msgstr ""
-"Izpišemo ali spremenimo lastnosti terminala.\n"
-"\n"
 "  -a, --all          izpiši vse trenutne nastavitve v �loveku berljivi "
 "obliki\n"
 "  -g, --save         izpiši vse trenutne nastavitve v obliki, ki jo bere "
@@ -10145,7 +10279,7 @@ msgstr ""
 "  -F, --file=ENOTA   odpri in uporabi navedeno ENOTO namesto standardnega "
 "vhoda\n"
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
@@ -10156,7 +10290,7 @@ msgstr ""
 "ozna�uje nastavitve, ki so razširitve standarda POSIX. Dejansko\n"
 "dostopne nastavitve so odvisne od sistema.\n"
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -10171,7 +10305,7 @@ msgstr ""
 "   eof ZNAK      ZNAK bo zaklju�il datoteko (kon�al vhod)\n"
 "   eol ZNAK      ZNAK bo zaklju�il vrstico\n"
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -10183,7 +10317,7 @@ msgstr ""
 "   intr ZNAK     ZNAK bo poslal signal za prekinitev\n"
 "   kill ZNAK     ZNAK bo pobrisal trenutno vrstico\n"
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -10195,7 +10329,7 @@ msgstr ""
 " * rprnt ZNAK    ZNAK bo obnovil (ponovno izrisal) trenutno vrstico\n"
 "   start ZNAK    ZNAK bo ponovno pognal ustavljeni izhod\n"
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -10207,7 +10341,7 @@ msgstr ""
 " * swtch ZNAK    ZNAK bo preklopil v drugo plast lupine\n"
 " * werase ZNAK   ZNAK bo pobrisal nazadnje vneseno besedo\n"
 
-#: src/stty.c:562
+#: src/stty.c:565
 msgid ""
 "\n"
 "Special settings:\n"
@@ -10222,7 +10356,7 @@ msgstr ""
 " * cols N        sporo�i jedru, da uporabljamo terminal z N stolpci\n"
 " * columns N     isto kot cols N\n"
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -10235,7 +10369,7 @@ msgstr ""
 "   min N         z -icanon; naj bo N znakov minimum pri branju\n"
 "   ospeed N      izhodno hitrost nastavimo na N bitov/s\n"
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -10249,8 +10383,7 @@ msgstr ""
 "   time N        z -icanon, nastavi iztek �asa pri branju na N desetink "
 "sekunde\n"
 
-#: src/stty.c:581
-#, fuzzy
+#: src/stty.c:584
 msgid ""
 "\n"
 "Control settings:\n"
@@ -10265,10 +10398,11 @@ msgstr ""
 "   [-]clocal     onemogo�i modemske krmilne signale\n"
 "   [-]cread      omogo�i sprejem vhoda\n"
 " * [-]crtscts    omogo�i usklajevanje RTS/CTS\n"
+" * [-]cdtrdsr    omogo�i usklajevanje DTR/DSR\n"
 "   csN           nastavi velikost znaka v bitih na N; N je v intervalu "
 "[5..8]\n"
 
-#: src/stty.c:590
+#: src/stty.c:593
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
 "   [-]hup        send a hangup signal when the last process closes the tty\n"
@@ -10276,6 +10410,7 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 "   [-]cstopb     dva kon�na bita za znak (pri »-« je en sam)\n"
 "   [-]hup        pošlji signal za odložitev, ko zadnji proces zapre "
@@ -10283,8 +10418,9 @@ msgstr ""
 "   [-]hupcl      isto kot [-]hup\n"
 "   [-]parenb     pošiljaj paritetni bit na izhodu in ga pri�akuj na vhodu\n"
 "   [-]parodd     izberi liho pariteto (oziroma sodo pri »-«)\n"
+"   [-]cmspar     uporabi stalno parnost (mark/space)\n"
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -10300,7 +10436,7 @@ msgstr ""
 "   [-]ignbrk     ne upoštevaj prekinitvenih znakov\n"
 "   [-]igncr      ne upoštevaj znaka za pomik na levi rob\n"
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -10314,12 +10450,12 @@ msgstr ""
 "   [-]inpck      omogo�i preverjanje paritete na vhodu\n"
 "   [-]istrip     najvišji (osmi) bit znakov vedno postavi na ni�\n"
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr ""
 " * [-]iutf8      privzemi, da znaki na vhodu uporabljajo kodiranje UTF-8\n"
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -10336,7 +10472,7 @@ msgstr ""
 "   [-]parmrk     ozna�i napako v pariteti z zaporedjem 255-0-ZNAK\n"
 "   [-]tandem     isto kot [-]ixoff\n"
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -10353,10 +10489,11 @@ msgstr ""
 "[0..1]\n"
 " * nlN           slog zakasnitve pri skoku v naslednjo vrsto; N je v [0..1]\n"
 
-#: src/stty.c:631
+#: src/stty.c:635
+#, fuzzy
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
@@ -10369,7 +10506,7 @@ msgstr ""
 " * [-]onlcr      pretvori znake NL v CR\n"
 " * [-]onlret     znak NL opravi še pomik na za�etek vrste\n"
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -10385,7 +10522,7 @@ msgstr ""
 " * -tabs         isto kot tab3\n"
 " * vtN           slog zakasnitve pri vertikalnem tabulatorju; N je v [0..1]\n"
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -10399,7 +10536,7 @@ msgstr ""
 " * crtkill       pobriši celotno vrstico ob upoštevanju echoprt in echoe\n"
 " * -crtkill      pobriši celotno vrstico ob upoštevanju echoctl in echok\n"
 
-#: src/stty.c:654
+#: src/stty.c:658
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
 "   [-]echo       echo input characters\n"
@@ -10413,7 +10550,7 @@ msgstr ""
 "   [-]echoe      isti kot [-]crterase\n"
 "   [-]echok      izpiši znak za novo vrstico po brisanju vrstice\n"
 
-#: src/stty.c:661
+#: src/stty.c:665
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
 "   [-]echonl     echo newline even if not echoing other characters\n"
@@ -10427,7 +10564,7 @@ msgstr ""
 "   [-]icanon     omogo�i posebne znake erase, kill, werase in rprnt\n"
 "   [-]iexten     omogo�i posebne znake, ki niso del priporo�ila POSIX\n"
 
-#: src/stty.c:668
+#: src/stty.c:672
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
 "   [-]noflsh     disable flushing after interrupt and quit special "
@@ -10445,7 +10582,7 @@ msgstr ""
 " * [-]xcase      skupaj z icanon, predhodi vse velike �rke z obratno\n"
 "                 poševnico »\\«\n"
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -10459,7 +10596,7 @@ msgstr ""
 "   cbreak        isto kot -icanon\n"
 "   -cbreak       isto kot icanon\n"
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -10471,7 +10608,7 @@ msgstr ""
 "   -cooked       isto kot raw\n"
 "   crt           isto kot echoe echoctl echoke\n"
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -10485,7 +10622,7 @@ msgstr ""
 "   ek            znaka erase in kill na njuni privzeti vrednosti\n"
 "   evenp         isto kot parenb -parodd cs7\n"
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -10501,7 +10638,7 @@ msgstr ""
 "   nl            isto kot -icrnl -onlcr\n"
 "   -nl           isto kot icrnl -inlcr -igncr onlcr -ocrnl -onlret\n"
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -10515,7 +10652,7 @@ msgstr ""
 "   pass8         isto kot -parenb -istrip cs8\n"
 "   -pass8        isto kot parenb istrip cs7\n"
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -10527,7 +10664,7 @@ msgstr ""
 "                 -imaxbel -opost -isig -icanon -xcase min 1 time 0\n"
 "   -raw          isto kot cooked\n"
 
-#: src/stty.c:716
+#: src/stty.c:720
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
 "                 -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n"
@@ -10543,7 +10680,7 @@ msgstr ""
 "                 -xcase -tostop -echoprt echoctl echoke, vsi posebni znaki\n"
 "                 na njihove privzete vrednosti\n"
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -10558,12 +10695,12 @@ msgstr ""
 "ali pa v notacijah ^c, 0x37, 0177 ali 127; s posebnimi vrednostmi ^-\n"
 "in undef prekli�emo nastavitve posebnih znakov.\n"
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, c-format
 msgid "only one device may be specified"
 msgstr "navedena je lahko samo ena enota"
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
@@ -10572,43 +10709,43 @@ msgstr ""
 "izbiri za izpis v �loveku berljivi obliki ter obliki, ki jo lahko prebere\n"
 "stty, sta si nasprotujo�i"
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr "pri dolo�anju sloga izhoda ni mogo�e nastavljati na�inov"
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr "%s: ne-blokirnega na�ina ni mogo�e ponovno zagnati"
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, c-format
 msgid "invalid argument %s"
 msgstr "neveljavni argument %s"
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, c-format
 msgid "missing argument to %s"
 msgstr "izbiri %s manjka argument"
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, c-format
 msgid "invalid line discipline %s"
 msgstr "neveljavni komunikacijski protokol %s"
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr "%s: vseh zahtevanih operacij se ni dalo izvesti"
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr "%s: ni podatka o velikosti te enote"
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, c-format
 msgid "invalid integer argument %s"
 msgstr "neveljavni celoštevil�ni argument %s"
@@ -10665,21 +10802,22 @@ msgstr "      --help     ta navodila\n"
 msgid "      --version  output version information and exit\n"
 msgstr "      --version  razli�ica programa\n"
 
-#: src/system.h:544
-#, fuzzy
+#: src/system.h:543
 msgid ""
 "\n"
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
-"Obvezni argumenti, navedeni pri dolgi obliki izbire, veljajo tudi za "
+"\n"
+"Argumenti, navedeni kot obvezni pri dolgi obliki izbire, so obvezni tudi za "
 "kratko.\n"
 
-#: src/system.h:552
+#: src/system.h:551
+#, fuzzy
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 "\n"
 "VELIKOST je celo Å¡tevilo, ki mu lahko sledi enota (npr. 10M = "
@@ -10687,7 +10825,7 @@ msgstr ""
 "Enote so K, M, G, T, P, E, Z, Y (potence 1024) ali KB, MB... (potence "
 "1000).\n"
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -10701,37 +10839,37 @@ msgstr ""
 "BLOCKSIZE. Privzeta enota je 1024 bajtov (512 pri nastavljenem "
 "POSIXLY_CORRECT).\n"
 
-#: src/system.h:571
+#: src/system.h:570
 #, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
+"%s online help: <%s>\n"
 msgstr ""
 "\n"
-"Napake v programu %s sporo�ite na %s\n"
+"Spletna pomo� %s: <%s>\n"
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr ""
 "Napake v prevodu %s sporo�ite na <http://translationproject.org/team/sl."
 "html>\n"
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr "Za popolno dokumentacijo poženite: info coreutils '%s invocation'\n"
 
-#: src/system.h:596
+#: src/system.h:591
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Poskusite »%s --help« za iz�rpnejša navodila\n"
 
-#: src/system.h:628
+#: src/system.h:633
 #, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -10752,7 +10890,6 @@ msgid "Jay Lepreau"
 msgstr "Jay Lepreau"
 
 #: src/tac.c:137
-#, fuzzy
 msgid ""
 "Write each FILE to standard output, last line first.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -10760,7 +10897,6 @@ msgstr ""
 "Vsako od DATOTEK prepišemo na standardni izhod v obratnem vrstnem redu, od\n"
 "zadnje vrstice proti prvi. ÄŒe DATOTEKA ni podana ali je enaka -, beremo s\n"
 "standardnega vhoda.\n"
-"\n"
 
 #: src/tac.c:144
 msgid ""
@@ -10818,7 +10954,7 @@ msgid "Ian Lance Taylor"
 msgstr "Ian Lance Taylor"
 
 #: src/tail.c:262
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Print the last %d lines of each FILE to standard output.\n"
 "With more than one FILE, precede each with a header giving the file name.\n"
@@ -10828,14 +10964,11 @@ msgstr ""
 "Če je podana ve� kot ena DATOTEKA, izpišemo pred tem še glavo z imenom\n"
 "datoteke. ÄŒe DATOTEKA ni podana ali je enaka -, beremo s standardnega "
 "vhoda.\n"
-"\n"
 
 #: src/tail.c:270
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
 "  -c, --bytes=K            izpiši zadnjih K bajtov datoteke; uporabite -c "
 "+K\n"
@@ -10845,27 +10978,25 @@ msgstr ""
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 "  -f, --follow[={name|descriptor}]  pri datotekah, ki rastejo, sledimo\n"
-"                           trenutnemu koncu datoteke; -f, --follow in\n"
-"                           --follow=descriptor so sopomenke\n"
+"                           trenutnemu koncu datoteke; prazen neobvezni\n"
+"                           argument se obravnava kot 'descriptor'\n"
 "  -F                       isto kot --follow=name --retry\n"
 
-#: src/tail.c:281
+#: src/tail.c:280
 #, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
 "  -n, --lines=K            izpiši zadnjih K vrstic namesto privzetih %d;\n"
 "                           uporabite -n +K za izpis vrstic za�enši z K-to\n"
@@ -10876,40 +11007,34 @@ msgstr ""
 "branjih;\n"
 "                           s tem preverimo, ali vmes ni bila izbrisana ali\n"
 "                           preimenovana (uporabno pri dnevniških "
-"datotekah).\n"
-"                           Z inotify je ta izbira redkokdaj uporabna.\n"
+"datotekah);\n"
+"                           z inotify je ta izbira redkokdaj uporabna.\n"
 
-#: src/tail.c:294
+#: src/tail.c:293
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 "      --pid=PID            obenem z -f: proces zaklju�imo, ko PID ugasne\n"
 "  -q, --quiet, --silent    vedno brez izpisa glave z imenom datoteke\n"
-"      --retry              datoteko poskušaj odpreti, �etudi ni dostopna v\n"
-"                             trenutku, ko poženemo tail ali pa postane\n"
-"                             nedostopna kasneje -- uporabno skupaj s "
-"sledenjem\n"
-"                             imena (izbira --follow-name)\n"
+"      --retry              datoteko poskušaj odpreti, �etudi ni dostopna\n"
 
-#: src/tail.c:301
+#: src/tail.c:298
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 "  -s, --sleep-interval=N   skupaj z -f, premor približno N sekund\n"
-"                             (privzeto 1,0 sekunda) med ponovitvami.\n"
-"                             Z inotify in --pid=P, preveri proces P najmanj\n"
+"                             (privzeto 1,0 sekunda) med ponovitvami;\n"
+"                             z inotify in --pid=P, preveri proces P najmanj\n"
 "                             vsakih N sekund.\n"
 "  -v, --verbose            vedno z izpisom glave z imenom datoteke\n"
 
-#: src/tail.c:310
+#: src/tail.c:307
 msgid ""
 "\n"
 "If the first character of K (the number of bytes or lines) is a '+',\n"
@@ -10927,7 +11052,7 @@ msgstr ""
 "b za množenje s 512, kB = 1000, K = 1024, MB = 1000×1000, M = 1024×1024,\n"
 "GB = 1000×1000×1000, G = 1024×1024×1024, in tako dalje za T, P, E, Z, Y.\n"
 
-#: src/tail.c:319
+#: src/tail.c:316
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
 "means that even if a tail'ed file is renamed, tail will continue to track\n"
@@ -10945,27 +11070,22 @@ msgstr ""
 "»tail«  periodi�no poskusi odpreti datoteko in tako preverja, ali ta še\n"
 "obstaja, ali pa je bila vmes zbrisana ter ponovno ustvarjena.\n"
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr "zapiramo %s (fd=%d)"
 
-#: src/tail.c:453
-#, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr "%s: premik na relativni odmik %s ni mogo�"
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr "%s: premik na odmik %s (relativno od konca) ni mogo�"
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr "ni mo� ugotoviti lokacije %s, uporabljamo programsko izpraševanje"
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
@@ -10974,133 +11094,143 @@ msgstr ""
 "neprepoznan tip datote�nega sistema 0x%08lx za %s.  Prosimo, javite to "
 "napako na %s. namesto tega uporabljamo programsko izpraševanje"
 
-#: src/tail.c:963
+#: src/tail.c:965
+#, c-format
+msgid "%s has been replaced with a symbolic link. giving up on this name"
+msgstr "%s je bila nadomeš�ena s simbolno povezavo; opuš�amo"
+
+#: src/tail.c:980
 #, c-format
 msgid "%s has become inaccessible"
 msgstr "%s je postala nedostopna"
 
-#: src/tail.c:980
+#: src/tail.c:997
 #, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr ""
 "%s je bila nadomeš�ena z datoteko, kateri ni mo� slediti konca; opuš�amo"
 
-#: src/tail.c:989
+#: src/tail.c:1006
 #, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr "%s je bila nadomeš�ena z datoteko na oddaljeni lokaciji; opuš�amo"
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, c-format
 msgid "%s has become accessible"
 msgstr "%s je postala dostopna"
 
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr "%s se je pojavila;  sledimo konec nove datoteka"
 
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr "%s je bila zamenjana;  sledimo konec nove datoteke"
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr "%s: ne-blokirnega na�ina ni mogo�e spremeniti"
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr "%s: datoteka je porezana"
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr "nobene datoteke ni ve�"
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, c-format
 msgid "cannot watch parent directory of %s"
 msgstr "opazovanje nadimenika %s ni mogo�e"
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, c-format
 msgid "inotify resources exhausted"
 msgstr "viri za inotify so iz�rpani"
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, c-format
 msgid "cannot watch %s"
 msgstr "opazovanje %s ni mogo�e"
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr "napaka pri nadzoru dogodka inotify"
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, c-format
 msgid "error reading inotify event"
 msgstr "napaka pri branju dogodka inotify"
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr "%s: koncu te zvrsti datoteke ni mogo�e slediti; s tem imenom odnehamo"
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, c-format
 msgid "number in %s is too large"
 msgstr "Å¡tevilo v %s je preveliko"
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr "%s: neveljavno najve�je število nespremenjenih statusov med odpiranji"
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr "%s: neveljavna Å¡tevilka procesa (PID)"
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr "%s: neveljavno Å¡tevilo sekund"
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr "izbira je uporabljena v neveljavnem kontekstu -- %c"
 
-#: src/tail.c:2034
+#: src/tail.c:2096
+#, c-format
+msgid "warning: --retry ignored; --retry is useful only when following"
+msgstr "opozorilo: --retry ni upoštevan; --retry je uporabna samo pri sledenju"
+
+#: src/tail.c:2100
 #, c-format
-msgid "warning: --retry is useful mainly when following by name"
-msgstr "opozorilo: izbira --retry je ve�inoma uporabna le, kadar ji sledi ime"
+msgid "warning: --retry only effective for the initial open"
+msgstr "opozorilo: --retry ima u�inek le pri za�etnem odprtju"
 
-#: src/tail.c:2038
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
 msgstr "opozorilo: PID ni upoštevan; --pid=PID je uporabno samo pri sledenju"
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr "opozorilo: izbira --pid=PID na tem sistemu ni podprta"
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, c-format
 msgid "cannot follow %s by name"
 msgstr "sledenje %s po imenu ni mogo�e"
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr "opozorilo: sledenje standardnemu vhodu za vekomaj ni u�inkovito"
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr "ni mo� uporabiti inotify, uporabljamo programsko izpraševanje"
@@ -11373,21 +11503,21 @@ msgid "extra argument %s"
 msgstr "odve�en argument %s"
 
 #: src/timeout.c:112
-#, fuzzy, c-format
+#, c-format
 msgid "warning: sigprocmask"
-msgstr "opozorilo: timer_create"
+msgstr "opozorilo: sigprocmask"
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr "opozorilo: timer_settime"
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr "opozorilo: timer_create"
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
@@ -11396,38 +11526,34 @@ msgstr ""
 "Uporaba: %s [IZBIRA] TRAJANJE UKAZ [ARGUMENT]...\n"
 "  ali:   %s [IZBIRA]\n"
 
-#: src/timeout.c:229
-#, fuzzy
+#: src/timeout.c:232
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
-msgstr ""
-"Poženi UKAZ, in ga pobij, �e po TRAJANJE sekund še te�e.\n"
-"\n"
-"Obvezni argumenti, navedeni pri dolgi obliki izbire, veljajo tudi za "
-"kratko.\n"
+msgstr "Poženi UKAZ, in ga pobij, �e po TRAJANJE sekund še te�e.\n"
 
-#: src/timeout.c:235
-#, fuzzy
+#: src/timeout.c:238
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
+"      --preserve-status\n"
+"                   zaklju�i z istim statusom kot UKAZ, tudi v primeru, �e\n"
+"                   je pretekel podani �as\n"
 "      --foreground\n"
 "                   kadar ukaza »timeout« je poganjamo interaktivi iz ukazne\n"
 "                   lupine, dovoli UKAZU, da s terminala bere in prejema\n"
-"                   signale. V tem na�inu nasledniški procesi UKAZA po "
+"                   signale; v tem na�inu nasledniški procesi UKAZA po "
 "izteku\n"
 "                   ne bodo prekinjeni.\n"
 "  -k, --kill-after=TRAJANJE\n"
@@ -11435,10 +11561,10 @@ msgstr ""
 "                   še vedno te�e, pošlji signal KILL.\n"
 "  -s, --signal=SIGNAL\n"
 "                   dolo�imo signala, ki ga procesu pošljemo ob izteku �asa\n"
-"                   SIGNAL lahko podamo z imenom (npr. »HUP«) ali številko.\n"
-"                   Seznam signalov lahko izvemo z ukazom »kill -l«.\n"
+"                   SIGNAL lahko podamo z imenom (npr. »HUP«) ali številko;\n"
+"                   seznam signalov lahko izvemo z ukazom »kill -l«.\n"
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 msgid ""
 "\n"
 "DURATION is a floating point number with an optional suffix:\n"
@@ -11449,8 +11575,7 @@ msgstr ""
 "TRAJANJE je realno Å¡tevilo z neobvezno pripono:\n"
 "»s« za sekunde (privzeto), »m« za minute, »h« za ure in »d« za dneve.\n"
 
-#: src/timeout.c:259
-#, fuzzy
+#: src/timeout.c:262
 msgid ""
 "\n"
 "If the command times out, and --preserve-status is not set, then exit with\n"
@@ -11461,24 +11586,25 @@ msgid ""
 "case the exit status is 128+9 rather than 124.\n"
 msgstr ""
 "\n"
-"Če se ukaz ob preteku �asa še izvaja, se vrne izhodna statusna koda 124,\n"
-"sicer pa normalna izhodna statusna koda UKAZA. ÄŒe SIGNAL ni podan, se\n"
-"pošlje signal TERM. Signal TERM pobije vsak proces, ki ne blokira ali \n"
-"prestreže tega signala. Pri nekaterih procesih je morda treba uporabiti\n"
-"signal KILL (9), ki ga ni mogo�e prestre�i.  Ob poslanem signalu KILL(9)\n"
-"izhodni status ni 124, ampak 128+9.\n"
+"Če se ukaz ob preteku �asa še izvaja in ni bila podana izbira \n"
+"--preserve-status, se vrne izhodna statusna koda 124, sicer pa normalna\n"
+"izhodna statusna koda UKAZA. Če SIGNAL ni podan, se pošlje signal TERM.\n"
+"Signal TERM pobije vsak proces, ki ne blokira ali prestreže tega signala.\n"
+"Pri nekaterih procesih je morda treba uporabiti signal KILL (9), ki ga ni\n"
+"mogo�e prestre�i.  Ob poslanem signalu KILL(9) izhodni status ni 124,\n"
+"ampak 128+9.\n"
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr "opozorilo: pomnilniških izmetov ni mogo�e onemogo�iti"
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, c-format
 msgid "error waiting for command"
 msgstr "napaka pri �akanju na ukaz"
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr "nadzorovani ukaz je izvrgel pomnilniško sliko"
@@ -11509,7 +11635,6 @@ msgid "setting times of %s"
 msgstr "nastavljanje �asov %s"
 
 #: src/touch.c:213
-#, fuzzy
 msgid ""
 "Update the access and modification times of each FILE to the current time.\n"
 "\n"
@@ -11526,7 +11651,6 @@ msgstr ""
 "\n"
 "DATOTEKA, enaka »-«, se obravnava posebej in povzro�i spremembo �asov pri\n"
 "datoteki, povezani s standardnim izhodom.\n"
-"\n"
 
 #: src/touch.c:225
 msgid ""
@@ -11858,7 +11982,6 @@ msgid "Usage: %s OPTION... FILE...\n"
 msgstr "Uporaba: %s IZBIRA... DATOTEKA...\n"
 
 #: src/truncate.c:97
-#, fuzzy
 msgid ""
 "Shrink or extend the size of each FILE to the specified size\n"
 "\n"
@@ -11868,14 +11991,13 @@ msgid ""
 "If a FILE is shorter, it is extended and the extended part (hole)\n"
 "reads as zero bytes.\n"
 msgstr ""
-"Zmanjšaj ali pove�aj VELIKOST DATOTEKE do navedene vrednosti.\n"
+"VELIKOST DATOTEKE se zmanjša ali pove�a do navedene vrednosti.\n"
 "\n"
-"ÄŒe DATOTEKA ne obstaja, se ustvari.\n"
+"ÄŒe DATOTEKA ne obstaja, se jo ustvari.\n"
 "\n"
 "Če je VELIKOST DATOTEKE ve�ja od navedene, so dodatni podatki izgubljeni.\n"
-"Če je VELIKOST DATOTEKE manjša od navedene, se podaljša tako, da se do\n"
+"Če je VELIKOST DATOTEKE manjša od navedene, se ta podaljša tako, da se do\n"
 "predpisane dolžine dopolni z znaki \\0.\n"
-"\n"
 
 #: src/truncate.c:109
 msgid "  -c, --no-create        do not create any files\n"
@@ -11891,10 +12013,10 @@ msgstr ""
 #: src/truncate.c:115
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 "  -r, --reference=DATOTEKA  uporabi velikost navedene DATOTEKE\n"
-"  -s, --size=VELIKOST    nastavi ali spremeni datoteko na navedeno VELIKOST\n"
+"  -s, --size=VELIKOST    nastavi ali spremeni VELIKOST datoteke (v bajtih)\n"
 
 #: src/truncate.c:121
 msgid ""
@@ -11979,16 +12101,16 @@ msgid ""
 "\n"
 msgstr ""
 "Uporaba: %s [IZBIRA] [DATOTEKA]\n"
-"Zapišemo povsem urejen seznam, usklajen z delno ureditvijo v DATOTEKI.\n"
-"ÄŒe DATOTEKA ni podana ali je enaka -, beremo s standardnega vhoda.\n"
+"Zapiše se povsem urejen seznam, usklajen z delno ureditvijo v DATOTEKI.\n"
+"ÄŒe DATOTEKA ni podana ali je enaka -, se bere s standardnega vhoda.\n"
 "\n"
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr "%s: liho Å¡tevilo vnosov na vhodu"
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr "%s: zanka na vhodu:"
@@ -11999,7 +12121,7 @@ msgid ""
 "\n"
 "  -s, --silent, --quiet   print nothing, only return an exit status\n"
 msgstr ""
-"Izpišemo ime enote terminala, s katere beremo standardni vhod.\n"
+"Izpiše se ime enote terminala, s katere se bere standardni vhod.\n"
 "\n"
 "  -s, --silent, --quiet   ni�esar ne izpiši, samo vrni izhodni status\n"
 
@@ -12017,7 +12139,7 @@ msgid ""
 "  -n, --nodename           print the network node hostname\n"
 "  -r, --kernel-release     print the kernel release\n"
 msgstr ""
-"Izpišemo razli�ne sistemske podatke. Brez IZBIRE je isto kot -s.\n"
+"Izpišejo se razli�ni sistemski podatki. Brez IZBIRE je isto kot -s.\n"
 "\n"
 "  -a, --all                izpiši vse podatke v naslednjem vrstnem redu;\n"
 "                             z izjemo -p in -i, �e nista znana\n"
@@ -12044,7 +12166,7 @@ msgid ""
 "Print machine architecture.\n"
 "\n"
 msgstr ""
-"Izpiši arhitekturo sistema.\n"
+"Izpiše se arhitektura sistema.\n"
 "\n"
 
 #: src/uname.c:286
@@ -12053,17 +12175,13 @@ msgid "cannot get system name"
 msgstr "ime sistema ni ugotovljivo"
 
 #: src/unexpand.c:117
-#, fuzzy
 msgid ""
 "Convert blanks in each FILE to tabs, writing to standard output.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
-"Presledke v vsaki DATOTEKI nadomestimo s tabulatorji in rezultat zapišemo "
-"na\n"
-"standardni izhod. ÄŒe DATOTEKA ni podana ali je enaka -, beremo s "
-"standardnega\n"
-"vhoda.\n"
-"\n"
+"Presledki v vsaki DATOTEKI se nadomestijo s tabulatorji, rezultat se zapiše\n"
+"na standardni izhod. ÄŒe DATOTEKA ni podana ali je enaka -, se bere s\n"
+"standardnega vhoda.\n"
 
 #: src/unexpand.c:124
 msgid ""
@@ -12072,8 +12190,9 @@ msgid ""
 "  -t, --tabs=N     have tabs N characters apart instead of 8 (enables -a)\n"
 "  -t, --tabs=LIST  use comma separated LIST of tab positions (enables -a)\n"
 msgstr ""
-"  -a, --all           pretvorimo vse prazne prostore, ne le vodilnih\n"
-"      --first-only    navzlic izbiri -a pretvorimo samo vodilne presledke\n"
+"  -a, --all           pretvorijo se vsi prazni prostori, ne le vodilni\n"
+"      --first-only    navzlic izbiri -a se pretvorijo samo vodilni "
+"presledki\n"
 "  -t, --tabs=Å TEVILO  tabulatorji naj bodo Å TEVILO znakov narazen namesto\n"
 "                        privzetih 8 (omogo�i -a)\n"
 "  -t, --tabs=SEZNAM   z vejicami lo�en seznam eksplicitnih položajev "
@@ -12090,59 +12209,74 @@ msgstr "razmik med tabulatorji je prevelik"
 msgid "tab stop value is too large"
 msgstr "vrednost tabulatorja je prevelika"
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr "Uporaba: %s [IZBIRA]... [VHOD [IZHOD]]\n"
 
-#: src/uniq.c:138
-#, fuzzy
+#: src/uniq.c:174
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
 "writing to OUTPUT (or standard output).\n"
 "\n"
 "With no options, matching lines are merged to the first occurrence.\n"
 msgstr ""
-"Filtriraj soslednje ujemajo�e se vrstice pri branju z VHODA (ali\n"
+"Filtrira se soslednje ujemajo�e se vrstice pri branju z VHODA (ali\n"
 "standardnega vhoda) in pisanju na IZHOD (ali standardni izhod).\n"
 "\n"
 "ÄŒe ni navedena nobena IZBIRA, se zaporedne enake vrstice nadomestijo z eno.\n"
-"\n"
 
-#: src/uniq.c:147
+#: src/uniq.c:183
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
 msgstr ""
-"  -c, --count           na za�etku vsake vrstice izpišemo tudi število "
+"  -c, --count           na za�etku vsake vrstice izpiši tudi število "
 "ponovitev\n"
-"  -d, --repeated        izpišemo samo podvojene vrstice\n"
+"  -d, --repeated        izpiši samo podvojene vrstice, po eno za vsako "
+"skupino\n"
 
-#: src/uniq.c:151
+#: src/uniq.c:187
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
-"  -i, --ignore-case     ignore differences in case when comparing\n"
-"  -s, --skip-chars=N    avoid comparing the first N characters\n"
-"  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
 msgstr ""
 "  -D, --all-repeated[=RAZMEJITEV]  izpiši vse podvojene vrstice\n"
 "                        RAZMEJITEV={none (privzeto), prepend, separate}\n"
 "                        Posamezne izpise razmejujejo prazne vrstice.\n"
-"  -f, --skip-fields=N   pri primerjanju izpusti prvih N polj\n"
+
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr "  -f, --skip-fields=N   pri primerjanju izpusti prvih N polj\n"
+
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
+msgstr ""
+"      --group[=METODA]  prikaži vse elemente, skupine lo�i s prazno vrstico\n"
+"                          METODA={separate (privzeto), prepend, append, "
+"both}\n"
+
+#: src/uniq.c:199
+#, fuzzy
+msgid ""
+"  -i, --ignore-case     ignore differences in case when comparing\n"
+"  -s, --skip-chars=N    avoid comparing the first N characters\n"
+"  -u, --unique          only print unique lines\n"
+msgstr ""
 "  -i, --ignore-case     male in velike �rke obravnavaj enakovredno\n"
 "  -s, --skip-chars=N    pri primerjanju izpusti prvih N znakov\n"
 "  -u, --unique          izpiši samo nepodvojene vrstice\n"
 "  -z, --zero-terminated  vrstice zaklju�i z znakom NUL, ne LF\n"
 
-#: src/uniq.c:161
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr "  -w, --check-chars=N   primerjamo prvih N znakov v vrstici\n"
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 msgid ""
 "\n"
 "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n"
@@ -12152,7 +12286,7 @@ msgstr ""
 "Polje je zaporedje praznih znakov (navadno presledkov ali tabulatorjev), ki\n"
 "mu sledi zaporedje nepraznih znakov. Polja se presko�ijo pred znaki.\n"
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 msgid ""
 "\n"
 "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n"
@@ -12164,24 +12298,34 @@ msgstr ""
 "Vhod je treba najprej urediti, ali uporabiti »sort -u« brez »uniq«.\n"
 "Primerjava upošteva lokalizirana pravila, navedena v »LC_COLLATE«.\n"
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, c-format
 msgid "too many repeated lines"
 msgstr "preve� ponovljenih vrstic"
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
 msgstr "neveljavno število presko�enih polj"
 
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
 msgstr "neveljavno število presko�enih bajtov"
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
 msgstr "neveljavno Å¡tevilo primerjanih bajtov"
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr "izbira --group ni združljiva z izbirami -c/-d/-D-u"
+
+#: src/uniq.c:652
+#, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr "izpis Å¡tevila ponovitev pri izpisu vseh vrstic v skupinah ni smiseln"
+
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr "izpis vseh podvojenih vrstic skupaj s Å¡tevilom ponovitev ni smiseln"
@@ -12203,11 +12347,6 @@ msgstr ""
 "Odstranitev navedene DATOTEKE s klicem funkcije unlink(2).\n"
 "\n"
 
-#: src/unlink.c:86
-#, c-format
-msgid "cannot unlink %s"
-msgstr "s klicem unlink ni mogo�e odstraniti %s"
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -12238,9 +12377,9 @@ msgstr[2] "pokonci %ld dni %2d:%02d,  "
 msgstr[3] "pokonci %ld dni %2d:%02d,  "
 
 #: src/uptime.c:149
-#, fuzzy, c-format
+#, c-format
 msgid "up  %2d:%02d,  "
-msgstr "pokonci %ld dni %2d:%02d,  "
+msgstr "pokonci  %2d:%02d,  "
 
 #: src/uptime.c:151
 #, c-format
@@ -12256,18 +12395,18 @@ msgstr[3] "%lu uporabniki"
 msgid ",  load average: %.2f"
 msgstr ",  povpr. obremenitev %.2f"
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
 "the number of users on the system, and the average number of jobs\n"
 "in the run queue over the last 1, 5 and 15 minutes."
 msgstr ""
-"Izpiše trenutni �as, �as, ki je pretekel od zagona ra�unalnika, število\n"
+"Izpiše se trenutni �as, �as, ki je pretekel od zagona ra�unalnika, število\n"
 "trenutno prijavljenih uporabnikov in povpre�no število opravil v �akalni\n"
 "vrsti v zadnji minuti, petih minutah in 15 minutah."
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
@@ -12276,12 +12415,12 @@ msgstr ""
 "Spe�i procesi, ki\n"
 "jih ni mogo�e prekiniti, tudi prispevajo k prikazu obremenitve.\n"
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr "\n"
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
@@ -12297,8 +12436,8 @@ msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
 "\n"
 msgstr ""
-"Seznam trenutno prijavljenih uporabnikov zapišemo na DATOTEKO.\n"
-"Če DATOTEKA ni navedena, uporabimo %s. Obi�ajno je DATOTEKA %s.\n"
+"Seznam trenutno prijavljenih uporabnikov se zapiše na DATOTEKO.\n"
+"Če DATOTEKA ni navedena, se uporabi %s. Obi�ajno je DATOTEKA %s.\n"
 "\n"
 
 #: src/wc.c:117
@@ -12313,7 +12452,7 @@ msgid ""
 "  -m, --chars            print the character counts\n"
 "  -l, --lines            print the newline counts\n"
 msgstr ""
-"Izpiše število bajtov, besed in vrstic v vsaki od podanih DATOTEK, ter\n"
+"Izpiše se število bajtov, besed in vrstic v vsaki od podanih DATOTEK, ter\n"
 "skupne vrednosti, �e je bila podana ve� kot ena DATOTEKA. Če DATOTEKA ni \n"
 "podana ali je enaka -, se bere s standardnega vhoda.  Beseda je definirana\n"
 "kot neprazno zaporedje znakov, razmejeno s presledki.\n"
@@ -12521,23 +12660,167 @@ msgstr ""
 "Ponavljaje izpisujemo vrstico s podanim NIZOM (privzeto »y«).\n"
 "\n"
 
-#~ msgid "using single-precision arithmetic"
-#~ msgstr "z uporabo aritmetike enojne natan�nosti"
+#~ msgid "cannot create pipe"
+#~ msgstr "ni mogo�e ustvariti cevovoda"
 
-#~ msgid "using arbitrary-precision arithmetic"
-#~ msgstr "z uporabo aritmetike z poljubno natan�nostjo"
+#~ msgid "%s subprocess failed"
+#~ msgstr "podproces %s ni uspel"
 
-#, fuzzy
-#~ msgid "  returning value: '%s'\n"
-#~ msgstr "ustvarjanje datoteke %s\n"
+#~ msgid "_open_osfhandle failed"
+#~ msgstr "klic _open_osfhandle ni uspel"
 
-#, fuzzy
-#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n"
-#~ msgstr "Uporaba: %s [IZBIRA] IME...\n"
+#~ msgid "cannot restore fd %d: dup2 failed"
+#~ msgstr "ni mogo�e obnoviti fd %d: klic dup2 ni uspel"
 
-#, fuzzy
-#~ msgid "no valid suffix found\n"
-#~ msgstr "%s: neveljavno dolžina pripone"
+#~ msgid "%s subprocess"
+#~ msgstr "podproces %s"
+
+#~ msgid "%s subprocess got fatal signal %d"
+#~ msgstr "podproces %s je prejel terminalni signal %d"
+
+#~ msgid "failed to set additional groups"
+#~ msgstr "dodatnih skupin ni uspelo nastaviti"
+
+#~ msgid "mount point %s already traversed"
+#~ msgstr "priklopna to�ka %s je bila že pre�esana"
+
+#~ msgid "%s: cannot lseek back to original position"
+#~ msgstr "%s: premik na za�etni položaj ni mogo�"
+
+#~ msgid "%s: failed to reset file pointer"
+#~ msgstr "%s: ni mogo�e nastaviti datote�nega kazalca"
+
+#~ msgid "cannot reposition file pointer for %s"
+#~ msgstr "ni mogo�e premakniti datote�nega kazalca za %s"
+
+#~ msgid ""
+#~ "  -Z, --context[=CTX]  set the SELinux security context of each NAME to\n"
+#~ "                         default type, or CTX if specified\n"
+#~ msgstr ""
+#~ "  -Z, --context[=KONTEKST]  za vsako IME nastavi varnostni kontekst "
+#~ "SELinux na\n"
+#~ "                       privzeti tip, ali na KONTEKST, �e je ta podan\n"
+
+#~ msgid ""
+#~ "  -Z, --context[=CTX]  set the SELinux security context of NAME to\n"
+#~ "                         default type, or to CTX if specified\n"
+#~ msgstr ""
+#~ "  -Z, --context[=KONTEKST]  nastavi varnostni kontekst SELinux za IME "
+#~ "na \n"
+#~ "                          privzeto vrednost, ali na KONTEKST, �e je ta "
+#~ "podan\n"
+
+#~ msgid "out of memory (requested %zu bytes)"
+#~ msgstr "zmanjkalo pomnilnika (zahtevanih %zu bajtov)"
+
+#~ msgid "--padding cannot be combined with --format"
+#~ msgstr "izbire --padding ni mogo�e kombinirati z izbiro --format"
+
+#~ msgid ""
+#~ "Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
+#~ "  or:  %s LONG-OPTION\n"
+#~ msgstr ""
+#~ "Uporaba: %s [KRATKA_IZBIRA]... UPORABNIK UKAZ [ARGUMENT]...\n"
+#~ "  ali:   %s [DOLGA_IZBIRA]\n"
+
+#~ msgid ""
+#~ "Drop any supplemental groups, assume the user-ID and group-ID of the "
+#~ "specified\n"
+#~ "USER (numeric ID or user name), and run COMMAND with any specified "
+#~ "ARGUMENTs.\n"
+#~ "Exit with status 111 if unable to assume the required user and group ID.\n"
+#~ "Otherwise, exit with the exit status of COMMAND.\n"
+#~ "This program is useful only when run by root (user ID zero).\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Izpusti vse dodatne skupine, privzame Å¡tevilki uporabnika in skupine "
+#~ "(UID \n"
+#~ "in GID) navedenega UPORABNIKA ter požene UKAZ z vsemi podanimi "
+#~ "ARGUMENTI.\n"
+#~ "Ob izhodu vrne statusno kodo 111, �e ni bilo mogo�e privzeti zahtevanih "
+#~ "UID\n"
+#~ "in GID, sicer pa vrne izhodno statusno kodo UKAZA.\n"
+#~ "Program je uporaben le, kadar ga poganja superuporabnik (UID=0).\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, "
+#~ "and\n"
+#~ "                      (if specified) supplemental group IDs to GID1, ...\n"
+#~ msgstr ""
+#~ "  -g GID[,GID1...]  nastavi tudi primarni ID skupine na števil�ni GID, "
+#~ "ter\n"
+#~ "                      (�e je podano) dodatni ID skupine na GID1...\n"
+
+#~ msgid "unknown user-ID: %s"
+#~ msgstr "neznana Å¡tevilka uporabnika (UID): %s"
+
+#~ msgid "to use user-ID %s you need to use -g too"
+#~ msgstr "za uporabo user-ID %s morate uporabiti tudi -g"
+
+#~ msgid "cannot set group-ID to %lu"
+#~ msgstr "nastavitev GID na %lu ni mogo�a"
+
+#~ msgid "cannot set user-ID to %lu"
+#~ msgstr "nastavitev UID na %lu ni mogo�a"
+
+#~ msgid "failed to get file system create context"
+#~ msgstr "branje konteksta ustvarjenja datote�nega sistema ni uspelo"
+
+#~ msgid "warning: "
+#~ msgstr "opozorilo: "
+
+#~ msgid "long option '--megabytes' is deprecated and will soon be removed"
+#~ msgstr ""
+#~ "raba dolge izbire »--megabytes« je odsvetovana, v kratkem bo izbira "
+#~ "ukinjena"
+
+#~ msgid "Usage: %s [OPTION]... [USERNAME]\n"
+#~ msgstr "Uporaba: %s [IZBIRA]... [UPORABNIK]\n"
+
+#~ msgid ""
+#~ "      --strict         with --check, exit non-zero for any invalid input\n"
+#~ msgstr ""
+#~ "      --strict         (skupaj s --check) zaklju�i z napako za neveljaven "
+#~ "vhod\n"
+
+#~ msgid "failed to redirect stderr to /dev/null"
+#~ msgstr "preusmeritev standardnega izhoda za napake na /dev/null ni uspela"
+
+#~ msgid "invalid number: '%s'"
+#~ msgstr "neveljavno Å¡tevilo: '%s'"
+
+#~ msgid ""
+#~ "\n"
+#~ "With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Kadar DATOTEKA ni podana ali je enaka -, se bere standardni vhod. "
+#~ "Privzeto\n"
+#~ "ozna�evanje okrajšanih vrstic je »-F /«.\n"
+
+#~ msgid "cannot remove directory: %s"
+#~ msgstr "imenika ni mogo�e odstraniti: %s"
+
+#~ msgid "dup2 failed"
+#~ msgstr "klic dup2 ni uspel"
+
+#~ msgid "couldn't execute %s"
+#~ msgstr "ni mogo�e izvesti %s"
+
+#~ msgid "couldn't execute %s -d"
+#~ msgstr "ni mogo�e izvesti %s -d"
+
+#~ msgid ""
+#~ "\n"
+#~ "Report %s bugs to %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Napake v programu %s sporo�ite na %s\n"
+
+#~ msgid "warning: --retry is useful mainly when following by name"
+#~ msgstr ""
+#~ "opozorilo: izbira --retry je ve�inoma uporabna le, kadar ji sledi ime"
 
 #~ msgid "reading %s"
 #~ msgstr "beremo %s"
@@ -12576,6 +12859,12 @@ msgstr ""
 #~ "kot\n"
 #~ "                        --summarize\n"
 
+#~ msgid "using single-precision arithmetic"
+#~ msgstr "z uporabo aritmetike enojne natan�nosti"
+
+#~ msgid "using arbitrary-precision arithmetic"
+#~ msgstr "z uporabo aritmetike z poljubno natan�nostjo"
+
 #~ msgid ""
 #~ "  none, off       never make backups (even if --backup is given)\n"
 #~ "  numbered, t     make numbered backups\n"
@@ -13069,9 +13358,6 @@ msgstr ""
 #~ msgid "FATAL: cannot return to .. from %s"
 #~ msgstr "USODNA NAPAKA: iz imenika %s  ni dosegljiv imenik .."
 
-#~ msgid "cannot remove %s directory %s"
-#~ msgstr "%s imenika %s ni mogo�e odstraniti"
-
 #~ msgid "cannot remove root directory %s"
 #~ msgstr "korenskega imenika %s ni mogo�e odstraniti"
 
@@ -13471,9 +13757,6 @@ msgstr ""
 #~ msgid "cannot set permissions of fifo %s"
 #~ msgstr "ni mogo�e spremeniti dovoljenj za FIFO %s"
 
-#~ msgid "cannot set permissions of %s"
-#~ msgstr "ni mogo�e nastaviti dovoljenj za %s"
-
 #~ msgid ""
 #~ "This program is free software; you can redistribute it and/or modify\n"
 #~ "it under the terms of the GNU General Public License as published by\n"
diff --git a/po/sv.gmo b/po/sv.gmo
index 45878e07..a885d547 100644
--- a/po/sv.gmo
+++ b/po/sv.gmo
diff --git a/po/sv.po b/po/sv.po
index 90de06c5..4bb9273e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,19 +1,19 @@
 # Swedish messages for coreutils.
-# Copyright © 1997, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
+# Copyright © 1997, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
 # This file is distributed under the same license as the coreutils package.
 # Peter Antman <peter.antman@abc.se>, 1997.
 # Thomas Olsson <cid95tho@lustudat.student.lu.se>, 1997.
 # Daniel Resare <daniel@resare.com> 1999, 2000.
-# Göran Uddeborg <goeran@uddeborg.se>, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013.
+# Göran Uddeborg <goeran@uddeborg.se>, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014.
 #
-# $Revision: 1.174 $
+# $Revision: 1.185 $
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: coreutils 8.20-pre3\n"
+"Project-Id-Version: coreutils 8.23-pre1\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
-"PO-Revision-Date: 2013-02-12 11:19+0100\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
+"PO-Revision-Date: 2014-07-18 17:56+0200\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -40,82 +40,125 @@ msgstr "Giltiga argument är:"
 msgid "error closing file"
 msgstr "fel när fil stängdes"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "skrivfel"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "bevarar rättigheter på %s"
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "Okänt systemfel"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "tom normal fil"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "normal fil"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "katalog"
 
-#: lib/file-type.c:44
-msgid "block special file"
-msgstr "blockspecialfil"
-
-#: lib/file-type.c:47
-msgid "character special file"
-msgstr "teckenspecialfil"
-
-#: lib/file-type.c:50
-msgid "fifo"
-msgstr "fifo"
-
-#: lib/file-type.c:53
+#: lib/file-type.c:46
 msgid "symbolic link"
 msgstr "symbolisk länk"
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "uttag (socket)"
-
-#: lib/file-type.c:59
+#: lib/file-type.c:52
 msgid "message queue"
 msgstr "meddelandekö"
 
-#: lib/file-type.c:62
+#: lib/file-type.c:55
 msgid "semaphore"
 msgstr "semafor"
 
-#: lib/file-type.c:65
+#: lib/file-type.c:58
 msgid "shared memory object"
 msgstr "delat minne-objekt"
 
-#: lib/file-type.c:68
+#: lib/file-type.c:61
 msgid "typed memory object"
 msgstr "typat minne-objekt"
 
-#: lib/file-type.c:70
+#: lib/file-type.c:66
+msgid "block special file"
+msgstr "blockspecialfil"
+
+#: lib/file-type.c:69
+msgid "character special file"
+msgstr "teckenspecialfil"
+
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr "sammanhängande data"
+
+#: lib/file-type.c:75
+msgid "fifo"
+msgstr "fifo"
+
+#: lib/file-type.c:78
+msgid "door"
+msgstr "dörr"
+
+#: lib/file-type.c:81
+msgid "multiplexed block special file"
+msgstr "multiplexad blockspecialfil"
+
+#: lib/file-type.c:84
+msgid "multiplexed character special file"
+msgstr "multiplexad teckenspecialfil"
+
+#: lib/file-type.c:87
+msgid "multiplexed file"
+msgstr "multiplexad fil"
+
+#: lib/file-type.c:90
+msgid "named file"
+msgstr "namngiven fil"
+
+#: lib/file-type.c:93
+msgid "network special file"
+msgstr "nätverksspecialfil"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr "migrerad fil med data"
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr "migrerad fil utan data"
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr "port"
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "uttag (socket)"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr "övertäckningsfil"
+
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "konstig fil"
 
 #: lib/gai_strerror.c:57
 msgid "Address family for hostname not supported"
-msgstr "Adressfamiljen för värdnamnet stöds inte"
+msgstr "Adressfamiljen för värdnamnet stödjs inte"
 
 #: lib/gai_strerror.c:58
 msgid "Temporary failure in name resolution"
@@ -131,7 +174,7 @@ msgstr "Oreparabelt fel i namnuppslagning"
 
 #: lib/gai_strerror.c:61
 msgid "ai_family not supported"
-msgstr "ai_family stöds inte"
+msgstr "ai_family stödjs inte"
 
 #: lib/gai_strerror.c:62
 msgid "Memory allocation failure"
@@ -147,11 +190,11 @@ msgstr "Namn eller tjänst okänd"
 
 #: lib/gai_strerror.c:65
 msgid "Servname not supported for ai_socktype"
-msgstr "Servname stöds inte för ai_socktype"
+msgstr "Servname stödjs inte för ai_socktype"
 
 #: lib/gai_strerror.c:66
 msgid "ai_socktype not supported"
-msgstr "ai_socktype stöds inte"
+msgstr "ai_socktype stödjs inte"
 
 #: lib/gai_strerror.c:67
 msgid "System error"
@@ -244,18 +287,18 @@ msgstr "%s: flaggan �-W %s� tar inget argument\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: flaggan �-W %s� kräver ett argument\n"
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr "kan inte ändra rättigheter på %s"
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "kan inte skapa katalog %s"
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr "minnet slut"
@@ -372,7 +415,7 @@ msgstr "Reguljärt uttryck för stort"
 msgid "Unmatched ) or \\)"
 msgstr "Ensam ) eller \\)"
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 msgid "No previous regular expression"
 msgstr "Inget tidigare reguljärt uttryck"
 
@@ -397,7 +440,7 @@ msgstr "använd --no-preserve-root för att åsidosätta detta säkerhetsskydd"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[yYjJ]"
 
@@ -407,11 +450,11 @@ msgstr "^[yYjJ]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, c-format
 msgid "setting permissions for %s"
 msgstr "sätter rättigheter på %s"
@@ -552,18 +595,6 @@ msgstr "Strömavbrott"
 msgid "Resource lost"
 msgstr "Förlorad resurs"
 
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, c-format
-msgid "cannot create pipe"
-msgstr "kan inte skapa rör"
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, c-format
-msgid "%s subprocess failed"
-msgstr "underprocessen %s misslyckades"
-
 #: lib/strsignal.c:114
 #, c-format
 msgid "Real-time signal %d"
@@ -775,7 +806,7 @@ msgstr ""
 "Rapportera fel i %s till %s\n"
 "Rapportera kommentarer om översättningen till <tp-sv@listor.tp-sv.se>\n"
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s hemsida: <%s>\n"
@@ -785,31 +816,11 @@ msgstr "%s hemsida: <%s>\n"
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr "%s hemsida: <http://www.gnu.org/software/%s/>\n"
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr ""
 "Allmän hjälp med att använda GNU-program: <http://www.gnu.org/gethelp/>\n"
 
-#: lib/w32spawn.h:43
-#, c-format
-msgid "_open_osfhandle failed"
-msgstr "_open_osfhandle misslyckades"
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr "kan inte återställa fb %d: dup2 misslyckades"
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr "underprocessen %s"
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr "underprocessen %s fick en ödesdiger signal %d"
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr "standard in"
@@ -831,7 +842,7 @@ msgstr "okänd ström"
 msgid "failed to reopen %s with mode %s"
 msgstr "misslyckades att öppna om %s i läge %s"
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr "strängjämförelse misslyckades"
@@ -893,10 +904,10 @@ msgstr ""
 "  -i, --ignore-garbage  vid avkodning, bortse från ickealfabetiska tecken\n"
 "  -w, --wrap=KOL        bryt kodade rader efter KOL tecken (76 som "
 "standard).\n"
-"                          Använd 0 för att så av radbrytning\n"
+"                          Använd 0 för att slå av radbrytning\n"
 "\n"
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -919,48 +930,47 @@ msgstr ""
 "att försöka återhämta från tecken utanför alfabetet i den kodade\n"
 "strömmen.\n"
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "läsfel"
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, c-format
 msgid "invalid input"
 msgstr "ogiltig indata"
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, c-format
 msgid "invalid wrap size: %s"
 msgstr "ogiltig radbrytningslängd: %s"
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, c-format
 msgid "extra operand %s"
 msgstr "extra operand %s"
 
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, c-format
 msgid "closing standard input"
 msgstr "stänger standard in"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -989,12 +999,12 @@ msgstr ""
 #: src/basename.c:60
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
 "  -a, --multiple       stöd flera argument och behandla varje som ett NAMN\n"
-"  -s, --suffix=ÄNDELSE ta bort ett avslutande ÄNDELSE\n"
-"  -z, --zero           separera utdata med NOLL istället för nyrad\n"
+"  -s, --suffix=ÄNDELSE ta bort ett avslutande ÄNDELSE, implicerar -a\n"
+"  -z, --zero           avsluta varje utmatad rad med NOLL, inte nyrad\n"
 
 #: src/basename.c:67
 #, c-format
@@ -1013,32 +1023,31 @@ msgstr ""
 "  %s -s .h include/stdio.h  → �stdio�\n"
 "  %s -a any/str1 any/str2   → �str1� följt av �str2�\n"
 
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, c-format
 msgid "missing operand"
 msgstr "argument saknas"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr "Torbjörn Granlund"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 msgid "Richard M. Stallman"
 msgstr "Richard M. Stallman"
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1095,7 +1104,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr "kan inte göra �ioctl� på %s"
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr "standard ut"
@@ -1112,14 +1121,14 @@ msgstr "Russell Coker"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 msgid "Jim Meyering"
 msgstr "Jim Meyering"
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, c-format
 msgid "failed to create security context: %s"
 msgstr "kunde inte skapa säkerhetskontext: %s"
@@ -1129,8 +1138,8 @@ msgstr "kunde inte skapa säkerhetskontext: %s"
 msgid "failed to set %s security context component to %s"
 msgstr "kunde inte sätta %s-komponenten av säkerhetskontexten till %s"
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, c-format
 msgid "failed to get security context of %s"
 msgstr "kunde inte ta reda på säkerhetskontext för %s"
@@ -1140,18 +1149,18 @@ msgstr "kunde inte ta reda på säkerhetskontext för %s"
 msgid "can't apply partial context to unlabeled file %s"
 msgstr "det går inte att sätta en partiell kontext på filen %s utan etikett"
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, c-format
 msgid "failed to change context of %s to %s"
 msgstr "kunde inte byta kontext på %s till %s"
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
 msgstr "kan inte komma åt %s"
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, c-format
 msgid "cannot read directory %s"
 msgstr "kan inte läsa katalog %s"
@@ -1161,13 +1170,14 @@ msgstr "kan inte läsa katalog %s"
 msgid "changing security context of %s\n"
 msgstr "ändrar säkerhetskontext för %s\n"
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, c-format
 msgid "fts_read failed"
 msgstr "fts_read misslyckades"
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, c-format
 msgid "fts_close failed"
 msgstr "fts_close misslyckades"
@@ -1186,11 +1196,11 @@ msgstr ""
 
 #: src/chcon.c:357
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
-"Ändra säkerhetskontext för varje FIL till KONTEXT.\n"
+"Ändra SELinux-säkerhetskontext för varje FIL till KONTEXT.\n"
 "Med --reference, ändra säkerhetskontext för varje FIL till den hos RFIL.\n"
 
 #: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94
@@ -1203,7 +1213,7 @@ msgstr ""
 "      --dereference      ändra referensen för varje symbolisk länk (detta "
 "är\n"
 "                         standard) istället för den symboliska länken själv\n"
-"  -h, --no-dereference   ändra symboliska länkar istället för referade "
+"  -h, --no-dereference   ändra symboliska länkar istället för refererade "
 "filer\n"
 
 #: src/chcon.c:369
@@ -1220,7 +1230,7 @@ msgstr ""
 "  -l, --range=INTERVALL  sätt intervallet INTERVALL i målets "
 "säkerhetskontext\n"
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
 "      --preserve-root    fail to operate recursively on '/'\n"
@@ -1272,36 +1282,37 @@ msgstr ""
 "  -P                     följ inga symboliska länkar (normalfall)\n"
 "\n"
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr "-R --dereference kräver antingen -H eller -L"
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr "-R -h kräver -P"
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, c-format
 msgid "missing operand after %s"
 msgstr "operand saknas efter %s"
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, c-format
 msgid "invalid context: %s"
 msgstr "ogiltig kontext: %s"
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr "motstridiga specificerare för säkerhetskontext angivna"
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, c-format
 msgid "failed to get attributes of %s"
 msgstr "kunde inte hämta attribut för %s"
@@ -1330,7 +1341,7 @@ msgstr ""
 "Med --reference, ändra gruppen för varje FIL till den hos RFIL.\n"
 "\n"
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
@@ -1370,47 +1381,47 @@ msgstr ""
 "  %s staff /u      Ändra gruppen för /u till �staff�.\n"
 "  %s -hR staff /u  Ändra gruppen för /u och underfiler till �staff�.\n"
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
 msgstr "hämtar nya attribut för %s"
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr "varken den symboliska länken %s eller det den refererar har ändrats\n"
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr "rättigheterna hos %s ändrade från %04lo (%s) till %04lo (%s)\n"
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr "kunde inte ändra rättigheterna på %s från %04lo (%s) till %04lo (%s)\n"
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr "rättigheterna hos %s är oförändrat %04lo (%s)\n"
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr "det går inte att ändra den lösa symboliska länken %s"
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, c-format
 msgid "changing permissions of %s"
 msgstr "ändrar rättigheter på %s"
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr "%s: nya rättigheter är %s, inte %s"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1421,7 +1432,7 @@ msgstr ""
 "   eller:   %s [FLAGGA]... OKTAL-RÄTTIGHET FIL...\n"
 "   eller:   %s [FLAGGA]... --reference=RFIL FIL...\n"
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 msgid ""
 "Change the mode of each FILE to MODE.\n"
 "With --reference, change the mode of each FILE to that of RFILE.\n"
@@ -1431,17 +1442,17 @@ msgstr ""
 "Med --reference, ändra rättigheter för varje FIL till dem hos RFIL.\n"
 "\n"
 
-#: src/chmod.c:391
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
 "      --reference=RFIL   använd RFILs rättigheter istället för ett\n"
 "                         RÄTTIGHETSvärde\n"
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr "  -R, --recursive        ändra filer och kataloger rekursivt\n"
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 msgid ""
 "\n"
 "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n"
@@ -1449,12 +1460,12 @@ msgstr ""
 "\n"
 "Varje RÄTTIGHET har formen �[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7}+�.\n"
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr "kan inte kombinera rättighets- och --reference-flaggor"
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, c-format
 msgid "invalid mode: %s"
 msgstr "ogiltig rättighet: %s"
@@ -1602,29 +1613,24 @@ msgstr ""
 "Exempel:\n"
 "  %s root /u        Ändra ägare av /u till �root�.\n"
 "  %s root:staff /u  Samma, men ändra även dess grupp till �staff�.\n"
-"  %s -hR root /u    Ändra ägare av /u och underfiller �root�.\n"
+"  %s -hR root /u    Ändra ägare av /u och underfiler till �root�.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr "Roland McGrath"
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr "ogiltig grupp %s"
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, c-format
 msgid "invalid group list %s"
 msgstr "ogiltig grupplista %s"
 
-#: src/chroot.c:117
-#, c-format
-msgid "failed to set additional groups"
-msgstr "misslyckades att sätta tilläggsgrupper"
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
@@ -1633,15 +1639,15 @@ msgstr ""
 "Användning: %s [FLAGGA] NYROT [KOMMANDO [ARG]...]\n"
 "   eller:   %s FLAGGA\n"
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
 msgstr ""
-"Kör KOMMANDO med rootkatalogen satt till NYROOT.\n"
+"Kör KOMMANDO med rotkatalogen satt till NYROOT.\n"
 "\n"
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
@@ -1650,7 +1656,7 @@ msgstr ""
 "använda\n"
 "  --groups=G_LISTA       ange tilläggsgrupper som g1,g2,..,gN\n"
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 msgid ""
 "\n"
 "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n"
@@ -1658,28 +1664,42 @@ msgstr ""
 "\n"
 "Om inget kommando angivs, kör �${SHELL} -i� (standard: �/bin/sh -i�).\n"
 
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, c-format
 msgid "cannot change root directory to %s"
 msgstr "kan inte ändra rotkatalog till %s"
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, c-format
 msgid "cannot chdir to root directory"
 msgstr "kan inte byta katalog till rotkatalog"
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr "ingen grupp angiven för okänt uid: %d"
+
+#: src/chroot.c:383
+#, c-format
+msgid "failed to get supplemental groups"
+msgstr "misslyckades att hämta tilläggsgrupp(er)"
+
+#: src/chroot.c:395
+#, c-format
+msgid "failed to %s supplemental groups"
+msgstr "misslyckades att %s tilläggsgrupp(er)"
+
+#: src/chroot.c:402
 #, c-format
 msgid "failed to set group-ID"
 msgstr "misslyckades att sätta grupp-ID"
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, c-format
 msgid "failed to set user-ID"
 msgstr "misslyckades att sätta användar-ID"
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, c-format
 msgid "failed to run command %s"
 msgstr "misslyckades att köra kommandot %s"
@@ -1712,7 +1732,7 @@ msgstr ""
 "Skriv CRC-kontrollsumma och byteantal för varje FIL.\n"
 "\n"
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr "Användning: %s [FLAGGA]... FIL1 FIL2\n"
@@ -1779,7 +1799,7 @@ msgid ""
 "  %s -3 file1 file2  Print lines in file1 not in file2, and vice versa.\n"
 msgstr ""
 "\n"
-"Exampel:\n"
+"Exempel:\n"
 "  %s -12 fil1 fil2  Skriv ut endast rader som finns i både fil1 och fil2.\n"
 "  %s -3  fil1 fil2  Skriv ut rader i fil1 som inte finns i fil2, och "
 "omvänt.\n"
@@ -1799,294 +1819,332 @@ msgstr "multipla avgränsare angivna"
 msgid "empty %s not allowed"
 msgstr "tom %s är inte tillåtet"
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr "fel vid läsning av %s"
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, c-format
 msgid "cannot lseek %s"
 msgstr "kan inte göra lseek i %s"
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr "fel vid skrivning av %s"
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, c-format
 msgid "%s: failed to get extents info"
 msgstr "%s: misslyckades att hämta information om utsträckningar"
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, c-format
 msgid "%s: write failed"
-msgstr "%s: misslyckaes skriva"
+msgstr "%s: misslyckades skriva"
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, c-format
 msgid "failed to extend %s"
 msgstr "misslyckades att utöka %s"
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, c-format
 msgid "clearing permissions for %s"
 msgstr "tar bort rättigheter på %s"
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "misslyckades att bevara ägare av %s"
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
 msgstr "misslyckades att hitta filen %s"
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, c-format
 msgid "failed to preserve authorship for %s"
 msgstr "misslyckades att bevara författarskap för %s"
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
+#, c-format
+msgid "failed to set default file creation context to %s"
+msgstr "misslyckades att sätta standardkontext för skapade filer till %s"
+
+#: src/copy.c:820
+#, c-format
+msgid "failed to set default file creation context for %s"
+msgstr "misslyckades att sätta standardkontext för skapade filer på %s"
+
+#: src/copy.c:846
+#, c-format
+msgid "failed to set the security context of %s"
+msgstr "misslyckades att sätta säkerhetskontexten på %s"
+
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
 msgid "cannot open %s for reading"
 msgstr "kan inte öppna %s för läsning"
 
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, c-format
 msgid "cannot fstat %s"
 msgstr "kan inte göra fstat på %s"
 
-#: src/copy.c:820
+#: src/copy.c:935
 #, c-format
 msgid "skipping file %s, as it was replaced while being copied"
 msgstr "hoppar över fil %s eftersom den byttes ut medan den kopierades"
 
-#: src/copy.c:850
-#, c-format
-msgid "failed to get file system create context"
-msgstr "misslyckades att hämta skapandekontexten för filsystemet"
-
-#: src/copy.c:864
-#, c-format
-msgid "failed to set the security context of %s to %s"
-msgstr "misslyckades att sätta säkerhetskontexten för %s till %s"
-
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
 msgid "cannot remove %s"
 msgstr "kan inte ta bort %s"
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
 msgstr "tog bort %s\n"
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr "skriver inte via en lös symbolisk länk %s"
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, c-format
 msgid "cannot create regular file %s"
 msgstr "kan inte skapa normal fil %s"
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, c-format
 msgid "failed to clone %s from %s"
 msgstr "misslyckades att klona %s från %s"
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr "bevarar tider på %s"
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
 #, c-format
 msgid "failed to close %s"
 msgstr "misslyckades att stänga %s"
 
-#: src/copy.c:1471
+#: src/copy.c:1580
+#, c-format
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
+msgstr "%s: ersätt %s, åsidosätt rättigheterna %04lo (%s)? "
+
+#: src/copy.c:1581
 #, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
-msgstr "%s: försök skriva över %s, åsidosätt rättigheterna %04lo (%s)? "
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr "%s: oskrivbar %s (rättigheter %04lo, %s); försök ändå? "
 
-#: src/copy.c:1478
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
 msgstr "%s: skriva över %s? "
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr "(säkerhetskopia: %s)"
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr "misslyckades att återställa standardkontext för filskapande"
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, c-format
 msgid "cannot create hard link %s to %s"
 msgstr "kan inte skapa hård länk %s till %s"
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, c-format
 msgid "cannot stat %s"
 msgstr "kan inte ta status på %s"
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, c-format
 msgid "omitting directory %s"
 msgstr "utesluter katalog %s"
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr "varning: källfil %s angiven mer än en gång"
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
 msgstr "%s och %s är samma fil"
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr "kan inte skriva över icke-katalog %s med katalog %s"
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr "kommer inte skriva över nyligen skapade %s med %s"
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr "kan inte skriva över katalog %s med icke-katalog"
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr "kan inte flytta katalog på icke-katalog: %s → %s"
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr "säkerhetskopiering av %s skulle förstöra källan;  %s inte flyttad"
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr "säkerhetskopiering av %s skulle förstöra källan;  %s inte kopierad"
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
 msgstr "kan inte göra säkerhetskopia %s"
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr "kommer inte kopiera %s genom en nyskapad symlänk %s"
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr "kan inte kopiera en katalog, %s, på sig själv, %s"
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr "kommer inte skapa hård länk %s till katalog %s"
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr "kan inte flytta %s till en underkatalog till sig själv, %s"
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, c-format
 msgid "cannot move %s to %s"
 msgstr "kan inte flytta %s till %s"
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr "flytt mellan enheter misslyckades: %s till %s; kan inte ta bort målet"
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, c-format
-msgid "failed to set default file creation context to %s"
-msgstr "misslyckades att sätta standardkontext för skapade filer till %s"
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr "kan inte kopiera cyklisk symbolisk länk %s"
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr "%s: kan bara skapa relativa symboliska länkar i aktuell katalog"
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr "kan inte skapa symbolisk länk %s till %s"
 
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, c-format
 msgid "cannot create fifo %s"
 msgstr "kan inte skapa fifo %s"
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, c-format
 msgid "cannot create special file %s"
 msgstr "kan inte skapa specialfil %s"
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, c-format
 msgid "cannot read symbolic link %s"
 msgstr "kan inte läsa symbolisk länk %s"
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, c-format
 msgid "cannot create symbolic link %s"
 msgstr "kan inte skapa symbolisk länk %s"
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
 msgstr "%s har okänd filtyp"
 
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, c-format
 msgid "cannot un-backup %s"
 msgstr "kan inte avsäkerhetskopiera %s"
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr "%s → %s (återta säkerhetskopia)\n"
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr "Alex Deymo"
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr "Användning: %s --coreutils-prog=PROGRAMNAMN [PARAMETRAR]…\n"
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+"Kör det inbyggda programmet PROGRAMNAMN med de angivna PARAMETRARNA.\n"
+"\n"
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+"\n"
+"Använd: �%s --coreutils-prog=PROGRAMNAMN --help� för hjälp med individuella "
+"program.\n"
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, c-format
+msgid "unknown program %s"
+msgstr "okänt program %s"
+
+#: src/cp.c:157 src/mv.c:288
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -2097,11 +2155,11 @@ msgstr ""
 "   eller:   %s [FLAGGA]... KÄLLA... KATALOG\n"
 "   eller:   %s [FLAGGA]... -t KATALOG KÄLLA...\n"
 
-#: src/cp.c:162
+#: src/cp.c:163
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
 msgstr "Kopiera KÄLLA till DEST, eller flera KÄLLOR till KATALOG.\n"
 
-#: src/cp.c:168
+#: src/cp.c:169
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
 "      --attributes-only        don't copy the file data, just the "
@@ -2123,7 +2181,7 @@ msgstr ""
 "rekursivt\n"
 "  -d                           samma som --no-dereference --preserve=links\n"
 
-#: src/cp.c:177
+#: src/cp.c:178
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
 "                                 opened, remove it and try again (this "
@@ -2144,15 +2202,15 @@ msgstr ""
 "  -H                           följ symboliska länkar på kommandoraden i "
 "KÄLLA\n"
 
-#: src/cp.c:186
+#: src/cp.c:187
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
 "  -L, --dereference            always follow symbolic links in SOURCE\n"
 msgstr ""
-"  -l, --link                   hårdlänka filer istället fär att kopiera\n"
+"  -l, --link                   hårdlänka filer istället för att kopiera\n"
 "  -L, --dereference            följ alltid symboliska länkar i KÄLLA\n"
 
-#: src/cp.c:190
+#: src/cp.c:191
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
 "                                 a previous -i option)\n"
@@ -2163,7 +2221,7 @@ msgstr ""
 "                                 en tidigare flagga -i)\n"
 "  -P, --no-dereference         följ aldrig symboliska länkar i KÄLLA\n"
 
-#: src/cp.c:195
+#: src/cp.c:196
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
 "      --preserve[=ATTR_LIST]   preserve the specified attributes (default:\n"
@@ -2180,7 +2238,7 @@ msgstr ""
 "xattr,\n"
 "                                 all\n"
 
-#: src/cp.c:203
+#: src/cp.c:204
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                use full source file name under DIRECTORY\n"
@@ -2188,7 +2246,7 @@ msgstr ""
 "      --no-preserve=ATTR_LISTA bevara inte de angivna attributen\n"
 "      --parents                lägg till källsökvägen till KATALOG\n"
 
-#: src/cp.c:207
+#: src/cp.c:208
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
 "      --reflink[=WHEN]         control clone/CoW copies. See below\n"
@@ -2201,7 +2259,7 @@ msgstr ""
 "      --remove-destination     ta bort varje befintlig destinationsfil före\n"
 "                                 försök att öppna den (jämför med --force)\n"
 
-#: src/cp.c:213
+#: src/cp.c:214
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
 "      --strip-trailing-slashes  remove any trailing slashes from each "
@@ -2213,7 +2271,7 @@ msgstr ""
 "från\n"
 "                                 varje KÄLL-argument\n"
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -2227,7 +2285,7 @@ msgstr ""
 "  -t, --target-directory=KATALOG  flytta alla KÄLLOR till KATALOG\n"
 "  -T, --no-target-directory    behandla DEST som en vanlig fil\n"
 
-#: src/cp.c:224
+#: src/cp.c:225
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
 "                                 than the destination file or when the\n"
@@ -2241,7 +2299,21 @@ msgstr ""
 "  -v, --verbose                berätta vad som görs\n"
 "  -x, --one-file-system        stanna inom detta filsystem\n"
 
-#: src/cp.c:233
+#: src/cp.c:232
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+"  -Z                           sätt SELinux-säkerhetskontext på "
+"destinationsfilen\n"
+"                                 till standardtypen\n"
+"      --context[=KTX]          som -Z, eller om KTX anges, sätt då SELinux- "
+"eller\n"
+"                                 SMACK-säkerhetskontext till KTX\n"
+
+#: src/cp.c:240
 msgid ""
 "\n"
 "By default, sparse SOURCE files are detected by a crude heuristic and the\n"
@@ -2268,7 +2340,7 @@ msgstr ""
 "kopieringen eller, om --reflink=auto anges, faller tillbaka på en\n"
 "standardkopiering.\n"
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 msgid ""
 "\n"
 "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n"
@@ -2279,12 +2351,11 @@ msgid ""
 msgstr ""
 "\n"
 "Ändelsen på säkerhetskopior är �~� om inte annat anges av --suffix eller\n"
-"SIMPLE_BACKUP_SUFFIX.  Versionhanteringen kan styras med --backup-flaggan "
-"eller\n"
-"med miljövariabeln VERSION_CONTROL.  Den kan ha följande värden:\n"
+"SIMPLE_BACKUP_SUFFIX.  Versionshanteringen kan styras med --backup-flaggan\n"
+"eller med miljövariabeln VERSION_CONTROL.  Den kan ha följande värden:\n"
 "\n"
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2296,7 +2367,7 @@ msgstr ""
 "  existing, nil   numrerade om det redan finns numrerade, annars enkla\n"
 "  simple, never   gör alltid enkla säkerhetskopior\n"
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2308,222 +2379,233 @@ msgstr ""
 "backup-flaggorna är givna, och KÄLLA och DEST är samma namn på en befintlig\n"
 "normal fil.\n"
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, c-format
 msgid "failed to preserve times for %s"
 msgstr "misslyckades att bevara tider för %s"
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, c-format
 msgid "failed to preserve permissions for %s"
 msgstr "misslyckades att bevara rättigheter på %s"
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, c-format
 msgid "cannot make directory %s"
 msgstr "kan inte skapa katalog %s"
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr "%s finns men är inte en katalog"
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
 #, c-format
 msgid "failed to access %s"
 msgstr "misslyckades att komma åt %s"
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, c-format
 msgid "missing file operand"
 msgstr "filoperand saknas"
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, c-format
 msgid "missing destination file operand after %s"
 msgstr "destinationfilsoperand saknas efter %s"
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr ""
 "det går inte att kombinera --target-directory (-t) och --no-target-directory "
 "(-T)"
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, c-format
 msgid "target %s is not a directory"
 msgstr "målet %s är inte en katalog"
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr "med --parents måste destinationen vara en katalog"
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, c-format
 msgid "multiple target directories specified"
 msgstr "multipla målkataloger angivna"
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr ""
+"varning: ignorerar --context; det kräver en kärna som har SELinux aktiverat"
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr "kan inte göra både hårda och symboliska länkar"
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr "flaggorna --backup och --no-clobber är ömsesidigt uteslutande"
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr "--reflink kan endast användas med --sparse=auto"
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr "säkerhetskopietyp"
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, c-format
+msgid "cannot set target context and preserve it"
+msgstr "det går inte att både sätta målkontext och bevara den"
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr "kan inte bevara säkerhetskontext utan en kärna med SELinux"
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr "kan inte bevara utökade attribut, cp byggdes utan stöd för xattr"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr "Stuart Kemp"
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr "indata försvann"
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr "%s: radnummer utanför intervallet"
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, c-format
 msgid "%s: %s: line number out of range"
 msgstr "%s: %s: radnummer utanför intervallet"
 
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, c-format
 msgid " on repetition %s\n"
 msgstr " vid upprepning %s\n"
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, c-format
 msgid "%s: %s: match not found"
 msgstr "%s: %s: ingen träff"
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr "fel i sökning med reguljärt uttryck"
 
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, c-format
 msgid "write error for %s"
 msgstr "skrivfel för %s"
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, c-format
 msgid "%s: integer expected after delimiter"
 msgstr "%s: heltal förväntades efter avskiljare"
 
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr "%s: upprepningsoperatorn måste avslutas med �}�"
 
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr "%s}: heltal krävs mellan �{� och �}�"
 
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr "%s: avslutande avskiljare �%c� saknas"
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr "%s: felaktigt reguljärt uttryck: %s"
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr "%s: felaktigt mönster"
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr "%s: radnummer måste vara större än noll"
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr "radnummer %s är lägre än föregående radnummer, %s"
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr "varning: radnummer %s är detsamma som föregående radnummer"
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr "saknar formatbeskrivning i ändelse"
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr "felaktig formatbeskrivning i ändelse: %c"
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr "felaktig formatbeskrivning i ändelse: \\%.3o"
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr "ogiltiga flaggor formatbeskrivning: %%%c%c"
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr "för många %%-formatbeskrivningar i ändelse"
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr "saknar %%-formatbeskrivning i ändelse"
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr "%s: felaktigt tal"
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr "Användning: %s [FLAGGA]... FIL MÖNSTER...\n"
 
-#: src/csplit.c:1455
+#: src/csplit.c:1483
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
 "and output byte counts of each piece to standard output.\n"
@@ -2531,7 +2613,7 @@ msgstr ""
 "Skriv ut delar av FIL avdelade med MÖNSTER till filer �xx00�, �xx01�, …,\n"
 "och skriv ut byte-antal för varje del till standard ut.\n"
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2542,7 +2624,11 @@ msgstr ""
 "  -f, --prefix=PREFIX        använd PREFIX i stället för �xx�\n"
 "  -k, --keep-files           ta inte bort utfiler vid fel\n"
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr "  -m, --suppress-matched     utelämna rader som matchar MÖNSTER\n"
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
@@ -2552,7 +2638,7 @@ msgstr ""
 "  -s, --quiet, --silent      skriv inte ut storleken på utmatningsfiler\n"
 "  -z, --elide-empty-files    ta bort tomma utmatningsfiler\n"
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
@@ -2561,7 +2647,7 @@ msgstr ""
 "Läs standard in om FIL är -. Varje MÖNSTER kan vara:\n"
 "\n"
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 msgid ""
 "\n"
 "  INTEGER            copy up to but not including specified line number\n"
@@ -2588,20 +2674,16 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr "David M. Ihnat"
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr "fält och positioner numreras från 1"
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr "Användning: %s FLAGGA... [FIL]...\n"
 
-#: src/cut.c:193
+#: src/cut.c:176
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr "Skriv valda delar av rader från varje FIL till standard ut.\n"
 
-#: src/cut.c:199
+#: src/cut.c:182
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
 "  -c, --characters=LIST   select only these characters\n"
@@ -2612,7 +2694,7 @@ msgstr ""
 "  -d, --delimiter=AVSKILJ använd AVSKILJ i stället för TAB som "
 "fältavskiljare\n"
 
-#: src/cut.c:204
+#: src/cut.c:187
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
 "                            that contains no delimiter character, unless\n"
@@ -2620,10 +2702,10 @@ msgid ""
 "  -n                      (ignored)\n"
 msgstr ""
 "  -f, --fields=LISTA      välj endast dessa fält; skriv också ut rader som\n"
-"                            saknar avkiljare, om inte flaggan -s anges\n"
+"                            saknar avskiljare, om inte flaggan -s anges\n"
 "  -n                      (ignorerad)\n"
 
-#: src/cut.c:210
+#: src/cut.c:193
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
 "                            or fields\n"
@@ -2632,7 +2714,7 @@ msgstr ""
 "eller \n"
 "                            fälten\n"
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
@@ -2640,9 +2722,9 @@ msgid ""
 msgstr ""
 "  -s, --only-delimited    skriv inte ut rader som saknar fältavskiljare\n"
 "      --output-delimiter=STRÄNG  använd STRÄNG som avskiljare vid utmatning\n"
-"                           standard är att avända inmatningsavskiljaren\n"
+"                           standard är att använda inmatningsavskiljaren\n"
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2651,10 +2733,10 @@ msgid ""
 msgstr ""
 "\n"
 "Använd en och endast en av -b, -c eller -f.  Varje LISTA består av ett\n"
-"intervall, eller flera intervall avskilda med komman.  Utvald indata\n"
+"intervall, eller flera intervall avskiljda med komman.  Utvald indata\n"
 "skrivs i samma ordning som den läses, och skrivs exakt en gång.\n"
 
-#: src/cut.c:227
+#: src/cut.c:210
 msgid ""
 "Each range is one of:\n"
 "\n"
@@ -2674,58 +2756,62 @@ msgstr ""
 "\n"
 "Utan FIL eller när FIL är -, läs standard in.\n"
 
-#: src/cut.c:367 src/cut.c:493
+#: src/cut.c:300 src/cut.c:394
 msgid "invalid byte, character or field list"
 msgstr "felaktig byte-, tecken- eller fältlista"
 
-#: src/cut.c:387
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr "fält och positioner numreras från 1"
+
+#: src/cut.c:320
 msgid "invalid range with no endpoint: -"
 msgstr "ogiltigt intervall utan slutpunkt: -"
 
-#: src/cut.c:403
+#: src/cut.c:334
 msgid "invalid decreasing range"
 msgstr "ogiltigt sjunkande intervall"
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, c-format
 msgid "byte offset %s is too large"
 msgstr "byteposition %s är för stor"
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, c-format
 msgid "field number %s is too large"
 msgstr "fältnummer %s är för stort"
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr "endast en sorts lista får användas"
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr "avskiljaren måste vara endast ett tecken"
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr "du måste specificera en lista med byte, tecken eller fält"
 
-#: src/cut.c:850
+#: src/cut.c:790
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr "en indataavskiljare kan endast specificeras vid arbete på fält"
 
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
 msgstr ""
-"att undertrycka ej avskilda rader är endast rimligt\n"
+"att undertrycka ej avskiljda rader är endast rimligt\n"
 "\tvid arbete på fält"
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr "saknar fältlista"
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr "saknar lista med positionsangivelser"
 
@@ -2768,7 +2854,7 @@ msgid ""
 msgstr ""
 "  -r, --reference=FIL       visa den tidpunkt då FIL senast modifierades\n"
 "  -R, --rfc-2822            skriv ut tid och datum enligt formatet RFC 2822\n"
-"                            Exampel: Mon, 07 Aug 2006 12:34:56 +0200\n"
+"                            Exempel: Mon, 07 Aug 2006 12:34:56 +0200\n"
 
 #: src/date.c:147
 msgid ""
@@ -2778,7 +2864,7 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 "      --rfc-3339=TIDSPEC    skriv ut tid och datum enligt formatet RFC "
 "3339.\n"
@@ -2790,7 +2876,8 @@ msgstr ""
 "blanktecken:\n"
 "                            2006-08-07 12:34:56+02:00\n"
 "  -s, --set=STRÄNG          sätt tiden som den beskrivs i STRÄNG\n"
-"  -u, --utc, --universal    sätt eller visa tiden i Universell Tid (UTC)\n"
+"  -u, --utc, --universal    sätt eller visa koordinerad universell tid "
+"(UTC)\n"
 
 #: src/date.c:158
 msgid ""
@@ -2996,10 +3083,10 @@ msgstr ""
 "Visa den lokala tiden för klockan 9 nästa fredag i Helsingfors i Finland\n"
 "  $ date --date='TZ=\"Europe/Helsinki\" 09:00 next Fri'\n"
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr "standard in"
@@ -3041,7 +3128,7 @@ msgstr ""
 msgid "cannot set date"
 msgstr "kan inte ställa klockan"
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, c-format
 msgid "time %s is out of range"
 msgstr "tiden %s är utanför tillåtet intervall"
@@ -3052,7 +3139,7 @@ msgstr "tiden %s är utanför tillåtet intervall"
 msgid "Paul Rubin"
 msgstr "Paul Rubin"
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
@@ -3061,7 +3148,7 @@ msgstr ""
 "Användning: %s [OPERAND]...\n"
 "   eller:   %s FLAGGA\n"
 
-#: src/dd.c:526
+#: src/dd.c:532
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
 "\n"
@@ -3079,7 +3166,7 @@ msgstr ""
 "  count=N         kopiera endast N inblock\n"
 "  ibs=BYTE        läs upp till BYTE byte åt gången (standard: 512)\n"
 
-#: src/dd.c:535
+#: src/dd.c:541
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
 "  iflag=FLAGS     read as per the comma separated symbol list\n"
@@ -3102,7 +3189,7 @@ msgstr ""
 "                  standard fel; �noxfer� utelämnar överföringsstatistik,\n"
 "                  �none� utelämnar allt\n"
 
-#: src/dd.c:546
+#: src/dd.c:552
 msgid ""
 "\n"
 "N and BYTES may be followed by the following multiplicative suffixes:\n"
@@ -3120,7 +3207,7 @@ msgstr ""
 "Varje KONV-symbol kan vara:\n"
 "\n"
 
-#: src/dd.c:555
+#: src/dd.c:561
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
 "  ebcdic    from ASCII to EBCDIC\n"
@@ -3147,7 +3234,7 @@ msgstr ""
 "            det används med block eller unblock, fyll ut med blanktecken\n"
 "            istället för nulltecken\n"
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -3163,7 +3250,7 @@ msgstr ""
 "  fdatasync  skriv fysiskt data till utfilen före avslut\n"
 "  fsync     d:o, men skriv även metadata\n"
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -3177,75 +3264,75 @@ msgstr ""
 "  append    lägg-till-läge (meningsfullt endast för utmatning, conv=notrunc\n"
 "              rekommenderas)\n"
 
-#: src/dd.c:583
+#: src/dd.c:589
 msgid "  cio       use concurrent I/O for data\n"
 msgstr "  cio       använd samtidig I/O för data\n"
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr "  direct    använd direkt I/O för data\n"
 
-#: src/dd.c:587
+#: src/dd.c:593
 msgid "  directory  fail unless a directory\n"
 msgstr "  directory  misslyckas om inte en katalog\n"
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr "  dsync     använd synkroniserad I/O för data\n"
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr "  sync      d:o, men även för metadata\n"
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr "  fullblock  ackumulera hela block av indata (endast iflag)\n"
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr "  nonblock  använd icke blockerande I/O\n"
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr "  noatime   uppdatera inte åtkomsttiden\n"
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr "  nocache   kasta mellanlagrade data\n"
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr "  noctty    tilldela inte styrterminal från fil\n"
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr "  nofollow  följ inte symboliska länkar\n"
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr "  nolinks   misslyckas ifall flera länkar\n"
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr "  binary    använd binär I/O för data\n"
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr "  text      använd text-I/O för data\n"
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr "  count_bytes  behandla �count=N� som ett antal byte (endast iflag)\n"
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr "  skip_bytes  behandla �skip=N� som ett antal byte (endast iflag)\n"
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr "  seek_bytes  behandla �seek=N� som ett antal byte (endast oflag)\n"
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, c-format
 msgid ""
 "\n"
@@ -3272,7 +3359,17 @@ msgstr ""
 "  18335302+0 poster ut\n"
 "  9387674624 byte (9.4 GB) kopierade, 34.6279 sekunder, 271 MB/s\n"
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr "minnet slut av indatabuffert av storlek %zu byte (%s)"
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr "minnet slut av utdatabuffert av storlek %zu byte (%s)"
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
@@ -3281,21 +3378,21 @@ msgstr ""
 "%<PRIuMAX>+%<PRIuMAX> poster in\n"
 "%<PRIuMAX>+%<PRIuMAX> poster ut\n"
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
 msgstr[0] "%<PRIuMAX> avhuggen post\n"
 msgstr[1] "%<PRIuMAX> avhuggna poster\n"
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
 msgstr[0] "%<PRIuMAX> byte (%s) kopierad"
 msgstr[1] "%<PRIuMAX> byte (%s) kopierade"
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr "Oändligt B"
 
@@ -3309,83 +3406,83 @@ msgstr "Oändligt B"
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
 msgstr ", %g s, %s/s\n"
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, c-format
 msgid "closing input file %s"
 msgstr "stänger infil %s"
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr "stänger utdatafil %s"
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr "misslyckades att slå av O_DIRECT: %s"
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, c-format
 msgid "writing to %s"
 msgstr "skrivning till %s"
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, c-format
 msgid "unrecognized operand %s"
 msgstr "okänd operand %s"
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 msgid "invalid conversion"
 msgstr "ogiltig konvertering"
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 msgid "invalid input flag"
 msgstr "ogiltig inflagga"
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 msgid "invalid output flag"
 msgstr "ogiltig utflagga"
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 msgid "invalid status flag"
 msgstr "ogiltig statusflagga"
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, c-format
 msgid "invalid number %s"
 msgstr "ogiltigt antal %s"
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr "kan inte kombinera något par av {ascii,ebcdic,ibm}"
 
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, c-format
 msgid "cannot combine block and unblock"
 msgstr "kan inte kombinera block och unblock"
 
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, c-format
 msgid "cannot combine lcase and ucase"
 msgstr "kan inte kombinera lcase och ucase"
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, c-format
 msgid "cannot combine excl and nocreat"
 msgstr "kan inte kombinera excl och nocreate"
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, c-format
 msgid "cannot combine direct and nocache"
 msgstr "det går inte att kombinera direct och nocache"
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
@@ -3394,72 +3491,62 @@ msgstr ""
 "varning: går runt fel i kärnan i lseek för fil (%s)\n"
 "  med mt_type=0x%0lx -- se <sys/mtio.h> för en lista av typer"
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, c-format
 msgid "%s: cannot skip"
 msgstr "%s: kan inte hoppa över"
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, c-format
 msgid "%s: cannot seek"
 msgstr "%s: kan inte söka"
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr "spill i filposition vid läsning av filen %s"
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr "varning: ogiltig filposition efter misslyckad läsning"
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr "kan inte kringgå fel i kärnan trots allt"
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, c-format
 msgid "setting flags for %s"
 msgstr "sätter flaggor för %s"
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr "minnet slut av indatabuffert av storlek %zu byte (%s)"
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr "minnet slut av utdatabuffert av storlek %zu byte (%s)"
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr "%s: kan inte hoppa över till angiven position"
 
-#: src/dd.c:2133
+#: src/dd.c:2172
 #, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
 msgstr "misslyckades att hugga av vid %<PRIdMAX> byte i utdatafil %s"
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr "fdatasync misslyckades för %s"
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
 msgstr "fsync misslyckades för %s"
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, c-format
 msgid "failed to open %s"
 msgstr "misslyckades att öppna %s"
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
@@ -3468,96 +3555,105 @@ msgstr ""
 "positionen för stor: kan inte hugga av till en längd av seek=%<PRIuMAX> (%lu-"
 "byte-)block"
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr "misslyckades att hugga av vid %<PRIuMAX> byte i utdatafil %s"
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, c-format
 msgid "failed to discard cache for: %s"
 msgstr "misslyckades att kasta mellanlager för: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr "Paul Eggert"
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr "Filsystem"
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr "Typ"
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr "block"
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr "Använt"
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr "Tillgängligt"
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr "Anv%"
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr "Inoder"
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr "IAnvänt"
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr "ILediga"
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr "IAnv%"
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr "Monterat på"
 
-#: src/df.c:383
+#: src/df.c:207
+msgid "File"
+msgstr "Fil"
+
+#: src/df.c:387
 #, c-format
-msgid "option --output: field '%s' unknown"
-msgstr "flaggan --output: fältet �%s� är okänt"
+msgid "option --output: field %s unknown"
+msgstr "flaggan --output: fältet %s är okänt"
 
-#: src/df.c:390
+#: src/df.c:394
 #, c-format
-msgid "option --output: field '%s' used more than once"
-msgstr "flaggan --output: fältet �%s� angivet mer än en gång"
+msgid "option --output: field %s used more than once"
+msgstr "flaggan --output: fältet %s angivet mer än en gång"
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr "Storlek"
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr "Ledigt"
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr "Kapacitet"
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
 msgstr "%s-%s"
 
-#: src/df.c:1210
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr "kan inte komma åt %s: övermonterat av en annan enhet"
+
+#: src/df.c:1384
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
 "or all file systems by default.\n"
@@ -3565,27 +3661,28 @@ msgstr ""
 "Visa information om filsystemet där varje FIL ligger, eller annars alla\n"
 "filsystem.\n"
 
-#: src/df.c:1217
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
 "  -a, --all             tag med låtsasfilsystem\n"
-"  -B, --block-size=STRL  skala storlekar med STRL före de skrivs ut.  T.ex.\n"
-"                           �-BM� skriver storleka i enheter av 1 048 576 "
-"byte.\n"
-"                           Se STORLEKsformat nedan.\n"
+"  -B, --block-size=STRL  skala storlekar med STRL före de skrivs ut; t.ex.\n"
+"                           �-BM� skriver storlekar i enheter av 1 048 576 "
+"byte;\n"
+"                           se STORLEKsformat nedan.\n"
 "      --total           skriv ut en totalsumma\n"
-"  -h, --human-readable  skriv storlekar i läsbart format (t.ex. 1K 234M 2G)\n"
-"  -H, --si              d:o, men använd potenser av 1000 istället för 1024\n"
+"  -h, --human-readable  skriv storlekar i multiplar av 1024 (t.ex. 1023M)\n"
+"  -H, --si              skriv storlekar i multiplar av 1000 (t.ex. 1,1M)\n"
 
-#: src/df.c:1227
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -3599,7 +3696,7 @@ msgstr ""
 "      --no-sync         anropa inte sync innan information hämtas "
 "(normalfall)\n"
 
-#: src/df.c:1234
+#: src/df.c:1409
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
 "                               or print all fields if FIELD_LIST is "
@@ -3611,7 +3708,8 @@ msgid ""
 "  -x, --exclude-type=TYPE   limit listing to file systems not of type TYPE\n"
 "  -v                    (ignored)\n"
 msgstr ""
-"      --output[=FÄLTLISTA]  använd utformatet definerat av FÄLTLISTA, eller\n"
+"      --output[=FÄLTLISTA]  använd utformatet definierat av FÄLTLISTA, "
+"eller\n"
 "                              skriv alla fält om FÄLTLISTA utelämnas.\n"
 "  -P, --portability     använd POSIX-format\n"
 "      --sync            anropa sync innan information hämtas\n"
@@ -3620,46 +3718,38 @@ msgstr ""
 "  -x, --exclude-type=TYP  utelämna filsystem av typ TYP\n"
 "  -v                    (ignorerad)\n"
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
 "\n"
 "FÄLTLISTA är en kommaseparerad lista med kolumner som skall vara med.  "
 "Giltiga\n"
 "fältnamn är: �source�, �fstype�, �itotal�, �iused�, �iavail�, �ipcent�,\n"
-"�size�, �used�, �avail�, �pcent� och �target� (se infosidan).\n"
+"�size�, �used�, �avail�, �pcent�, �file� och �target� (se infosidan).\n"
 
-#: src/df.c:1285
+#: src/df.c:1460
 #, c-format
 msgid "options %s and %s are mutually exclusive"
 msgstr "flaggorna %s och %s är ömsesidigt uteslutande"
 
-#: src/df.c:1335
-msgid "warning: "
-msgstr "varning: "
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr "den långa flaggan �--megabytes� undanbedes och kommer snart tas bort"
-
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr "filsystemstypen %s är både vald och exkluderad"
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr "Varning: "
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 msgid "cannot read table of mounted file systems"
 msgstr "kan inte läsa tabellen över monterade filsystem"
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr "inga filsystem bearbetade"
@@ -3669,7 +3759,7 @@ msgstr "inga filsystem bearbetade"
 msgid "H. Peter Anvin"
 msgstr "H. Peter Anvin"
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr "Användning: %s [FLAGGA]... [FIL]\n"
@@ -3749,12 +3839,12 @@ msgid ""
 msgstr ""
 "Skriv ut NAMN med dess sista snedstrecksfria komponent och avslutande "
 "snedstreck\n"
-"borttagna; om NAMN inte innehåller någora /, skriv �.� (som betyder aktuell\n"
+"borttagna; om NAMN inte innehåller några /, skriv �.� (som betyder aktuell\n"
 "katalog)\n"
 
 #: src/dirname.c:59
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
-msgstr "  -z, --zero     separera utmatningen med NOLL istället för nyrad\n"
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
+msgstr "  -z, --zero     avsluta varje utmatad rad med NOLL, inte nyrad\n"
 
 #: src/dirname.c:64
 #, c-format
@@ -3771,7 +3861,7 @@ msgstr ""
 "  %s dir1/str dir2/str  → �dir1� följt av �dir2�\n"
 "  %s stdio.h            → �.�.\n"
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -3780,14 +3870,13 @@ msgstr ""
 "Användning: %s [FLAGGA]... [FIL]...\n"
 "   eller:   %s [FLAGGA]... --files0-from=F\n"
 
-#: src/du.c:274
+#: src/du.c:285
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr "Sammanfatta diskanvändningen för varje FIL, rekursivt för kataloger.\n"
 
-#: src/du.c:280
+#: src/du.c:291
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3795,8 +3884,7 @@ msgid ""
 "                          larger due to holes in ('sparse') files, internal\n"
 "                          fragmentation, indirect blocks, and the like\n"
 msgstr ""
-"  -0, --null            avsluta varje utrad med en 0-byte istället för "
-"nyrad\n"
+"  -0, --null            avsluta varje utmatad rad med NOLL, inte nyrad\n"
 "  -a, --all             skriv ut värden för alla filer, inte bara kataloger\n"
 "      --apparent-size   skriv skenbar storlek, istället för diskanvändning;\n"
 "                          även om den skenbara storleken normalt är mindre, "
@@ -3806,11 +3894,11 @@ msgstr ""
 "                          intern fragmentering, indirekta block, och "
 "liknande\n"
 
-#: src/du.c:289
+#: src/du.c:300
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3821,10 +3909,10 @@ msgid ""
 "                          line argument;  --max-depth=0 is the same as\n"
 "                          --summarize\n"
 msgstr ""
-"  -B, --block-size=STRL  skala storlekar med STRL före de skrivs ut.  T.ex.\n"
-"                           �-BM� skriver storleka i enheter av 1 048 576 "
-"byte.\n"
-"                           Se STORLEKsformat nedan.\n"
+"  -B, --block-size=STRL  skala storlekar med STRL före de skrivs ut; t.ex.\n"
+"                           skriver �-BM� storlekar i enheter av 1 048 576 "
+"byte;\n"
+"                           se STORLEKsformat nedan.\n"
 "  -b, --bytes           likvärdigt med �--apparent-size --block-size=1�\n"
 "  -c, --total           rapportera totalsumman\n"
 "  -D, --dereference-args  följ endast symboliska länkar som är uppräknade "
@@ -3835,22 +3923,25 @@ msgstr ""
 "                          kommandoradsargumentet; --max-depth=0 är detsamma\n"
 "                          som --summarize\n"
 
-#: src/du.c:302
+#: src/du.c:313
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
-"      --files0-from=F   summera diskanvändning för de NOLL-terminerade\n"
-"                          filnamnen som anges i filen F;\n"
-"                          Om F är - så läs namn från standard in\n"
+"      --files0-from=F   summera diskanvändning för de\n"
+"                          NOLL-terminerade filnamnen som anges i filen F;\n"
+"                          om F är - så läs namn från standard in\n"
 "  -H                    detsamma som --dereference-args (-D)\n"
 "  -h, --human-readable  skriv storlekar i läsbart format (t.ex. 1K 234M 2G)\n"
+"      --inodes          lista information om inodsanvändning istället för\n"
+"                           blockanvändning\n"
 
-#: src/du.c:310
+#: src/du.c:322
 msgid ""
 "  -k                    like --block-size=1K\n"
 "  -L, --dereference     dereference all symbolic links\n"
@@ -3862,20 +3953,21 @@ msgstr ""
 "  -l, --count-links     räkna storlek flera gånger för hårda länkar\n"
 "  -m                    som --block-size=1M\n"
 
-#: src/du.c:316
+#: src/du.c:328
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
 "  -P, --no-dereference  följ inga symboliska länkar (detta är normalfallet)\n"
-"  -S, --separate-dirs   ta inte med storlek på underkataloger\n"
+"  -S, --separate-dirs   ta för kataloger inte med storlek på underkataloger\n"
 "      --si              som -h men i exponenter av 1000 istället för 1024\n"
 "  -s, --summarize       visa bara summan för varje argument\n"
 
-#: src/du.c:322
+#: src/du.c:334
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
 "                          or entries greater than SIZE if negative\n"
@@ -3884,25 +3976,24 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
 msgstr ""
 "  -t, --threshold=STORLEK  uteslut poster som är mindre än STORLEK om den "
 "är \n"
-"                          positivt, eller poster större än STORLEK om den "
-"är\n"
+"                          positiv, eller poster större än STORLEK om den är\n"
 "                          negativ\n"
 "      --time            visa tiden för senaste ändring av filer i "
 "katalogen,\n"
 "                          eller någon av dess underkataloger\n"
 "      --time=ORD        visa tid som ORD istället för modifieringstid:\n"
 "                          atime, access, use, ctime eller status\n"
-"      --time-style=STIL  visa tider med stilen STIL:\n"
-"                         full-iso, long-iso, iso, +FORMAT\n"
+"      --time-style=STIL  visa tider med stilen STIL, som kan vara:\n"
+"                         full-iso, long-iso, iso eller +FORMAT;\n"
 "                         FORMAT tolkas so för �date�\n"
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
@@ -3912,65 +4003,66 @@ msgstr ""
 "      --exclude=MÖNSTER    utelämna filer som matchar MÖNSTER\n"
 "  -x, --one-file-system    hoppa över kataloger på andra filsystem\n"
 
-#: src/du.c:386
+#: src/du.c:398
 msgid "Infinity"
 msgstr "Oändligt"
 
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr "monteringspunkten %s är redan traverserad"
-
-#: src/du.c:624
+#: src/du.c:636
 #, c-format
 msgid "fts_read failed: %s"
 msgstr "fts_read misslyckades: %s"
 
-#: src/du.c:780
+#: src/du.c:787
 #, c-format
 msgid "invalid maximum depth %s"
 msgstr "ogiltigt maxdjup %s"
 
-#: src/du.c:809
+#: src/du.c:816
 #, c-format
 msgid "invalid --threshold argument '-0'"
 msgstr "felaktigt argument till --threshold �-0�"
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr "kan inte samtidigt bara visa summan och alla storlekar"
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr "varning: att summera är detsamma som att använda --max-depth=0"
 
-#: src/du.c:900
+#: src/du.c:911
 #, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr "varning: att summera står i konflikt med --max-depth=%lu"
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+"varning: flaggorna --apparent-size och -b har ingen effekt med --inodes"
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 msgid "file operands cannot be combined with --files0-from"
 msgstr "filoperander kan inte kombineras med --files0-from"
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr "%s: läsfel"
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr "när filnamn läses från standard in tillåts inte filnamnet %s"
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 msgid "invalid zero-length file name"
 msgstr "ogiltigt filnamn med längd noll"
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr "totalt"
 
@@ -4059,7 +4151,7 @@ msgid ""
 "  \\0NNN   byte with octal value NNN (1 to 3 digits)\n"
 "  \\xHH    byte with hexadecimal value HH (1 to 2 digits)\n"
 msgstr ""
-"  \\0NNN   byte med kotalt värde NNN (1 till 3 siffror)\n"
+"  \\0NNN   byte med oktalt värde NNN (1 till 3 siffror)\n"
 "  \\xHH    byte med hexadecimalt värde HH (1 till 2 siffror)\n"
 
 #. This is a proper name. See the gettext manual, section Names.
@@ -4079,12 +4171,11 @@ msgstr "Sätt varje NAMN till VÄRDE i miljön och kör KOMMANDO.\n"
 #: src/env.c:61
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
 "  -i, --ignore-environment  börja med en tom miljö\n"
-"  -0, --null           avsluta varje utmatad rad med en 0-byte istället för\n"
-"                         nyrad\n"
+"  -0, --null           avsluta varje utmatad rad med NOLL, inte nyrad\n"
 "  -u, --unset=NAMN     ta bort variabeln från miljön\n"
 
 #: src/env.c:68
@@ -4159,16 +4250,16 @@ msgid "input line is too long"
 msgstr "för lång rad in"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr "Mike Parker"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr "James Youngman"
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
@@ -4178,7 +4269,7 @@ msgstr ""
 "   eller:   %s FLAGGA\n"
 "\n"
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -4197,7 +4288,7 @@ msgstr ""
 "\n"
 "  ARG1 & ARG2       ARG1 om inget av argumenten är null eller 0, annars 0\n"
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -4215,7 +4306,7 @@ msgstr ""
 "  ARG1 >= ARG2      ARG1 är större än eller lika med ARG2\n"
 "  ARG1 > ARG2       ARG1 är större än ARG2\n"
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
@@ -4225,7 +4316,7 @@ msgstr ""
 "  ARG1 + ARG2       aritmetisk summa av ARG1 och ARG2\n"
 "  ARG1 - ARG2       aritmetisk differens mellan ARG1 och ARG2\n"
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -4238,7 +4329,7 @@ msgstr ""
 "  ARG1 / ARG2       aritmetisk kvot av ARG1 dividerat med ARG2\n"
 "  ARG1 % ARG2       aritmetisk rest av ARG1 dividerat med ARG2\n"
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -4256,7 +4347,7 @@ msgstr ""
 "  index STRÄNG BOKST         index i STRÄNG där BOKST påträffats, eller 0\n"
 "  length STRÄNG              längden av STRÄNG\n"
 
-#: src/expr.c:251
+#: src/expr.c:250
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
 "                               keyword like 'match' or an operator like '/'\n"
@@ -4269,7 +4360,7 @@ msgstr ""
 "�/�\n"
 "  ( UTTRYCK )                värdet av UTTRYCK\n"
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -4286,7 +4377,7 @@ msgstr ""
 "returneras \n"
 "antalet tecken som överensstämmer, eller 0.\n"
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -4297,32 +4388,32 @@ msgstr ""
 "Slutstatus är 0 om UTTRYCK varken är tomt eller 0, 1 om UTTRYCK är tomt\n"
 "eller 0, 2 om UTTRYCK är syntaktiskt felaktigt och 3 om ett fel uppstod.\n"
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, c-format
 msgid "syntax error"
 msgstr "syntaxfel"
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, c-format
 msgid "error in regular expression matcher"
 msgstr "fel i matchningen av reguljärt uttryck"
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, c-format
 msgid "non-integer argument"
 msgstr "argument som inte är heltal"
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr "division med noll"
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr "sätt LC_ALL='C' för att kringgå problemet"
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, c-format
 msgid "the strings compared were %s and %s"
 msgstr "de jämförda strängarna var %s och %s"
@@ -4332,27 +4423,27 @@ msgstr "de jämförda strängarna var %s och %s"
 msgid "Niels Moller"
 msgstr "Niels Möller"
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
 msgstr "Lucas primtalstest misslyckades.  Detta skall inte hända"
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
 msgstr "squfof köspill"
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, c-format
 msgid "%s is not a valid positive integer"
 msgstr "%s är inte ett giltigt positivt heltal"
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr "%s är för stort"
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
@@ -4362,7 +4453,7 @@ msgstr ""
 "   eller:   %s FLAGGA\n"
 "\n"
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
 "are specified on the command line, read them from standard input.\n"
@@ -4404,7 +4495,7 @@ msgid ""
 "The option -WIDTH is an abbreviated form of --width=DIGITS.\n"
 msgstr ""
 "Formatera om varje stycke i FILen/-erna, skriv till standard ut.\n"
-"Flaggan -BREDD är en förkortad form av --widht=SIFFROR.\n"
+"Flaggan -BREDD är en förkortad form av --width=SIFFROR.\n"
 
 #: src/fmt.c:278
 msgid ""
@@ -4418,10 +4509,6 @@ msgstr ""
 "                              sätt tillbaka prefixet på omformaterade rader\n"
 "  -s, --split-only          dela långa rader, men justera ej\n"
 
-# Det är ett fel att detta meddelande är markerat c-format.  Men av den
-# anledningen måste ordet efter procenttecknet starta med o, u, x, etc.
-# Jag har felrapporterat, och går runt problemet genom att skriva "utav"
-# istället för "av".
 #: src/fmt.c:287
 #, no-c-format
 msgid ""
@@ -4434,7 +4521,7 @@ msgstr ""
 "raden\n"
 "  -u, --uniform-spacing     ett mellanslag mellan ord, två efter meningar\n"
 "  -w, --width=LÄNGD         maximal radlängd (standardvärde 75 kolumner)\n"
-"  -g, --goal=LÄNGD          målradlängd (standard är 93 % utav bredden)\n"
+"  -g, --goal=LÄNGD          målradlängd (standard är 93 % av bredden)\n"
 
 #: src/fmt.c:359
 #, c-format
@@ -4474,17 +4561,17 @@ msgid "invalid number of columns: %s"
 msgstr "felaktigt antal kolumner: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr "Padraig Brady"
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, c-format
 msgid "Usage: %s\n"
 msgstr "Användning: %s\n"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
@@ -4493,12 +4580,12 @@ msgstr ""
 "skalskript.\n"
 "\n"
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, c-format
 msgid "failed to get groups for user %s"
 msgstr "kunde inte avgöra grupper för användaren %s"
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, c-format
 msgid "failed to get groups for the current process"
 msgstr "kunde inte avgöra grupper för dem aktuella processen"
@@ -4524,22 +4611,22 @@ msgstr ""
 "för den aktuella processen (som kan vara annorlunda om gruppdatabasen har\n"
 "ändrats).\n"
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, c-format
 msgid "cannot get real UID"
 msgstr "kan inte få fram verklig UID"
 
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, c-format
 msgid "cannot get effective GID"
 msgstr "kan inte få fram effektiv GID"
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, c-format
 msgid "cannot get real GID"
 msgstr "kan inte få fram verklig GID"
 
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, c-format
 msgid "%s: no such user"
 msgstr "%s: ingen sådan användare"
@@ -4593,58 +4680,48 @@ msgstr ""
 "b 512, kB 1000, K 1024, MB 1000·1000, M 1024·1024,\n"
 "GB 1000·1000·1000, G 1024·1024·1024, och så vidare för T, P, E, Z, Y.\n"
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr "%s: filen har krympt för mycket"
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, c-format
 msgid "%s: number of bytes is too large"
 msgstr "%s: antal byte är för stort"
 
-#: src/head.c:440
-#, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr "%s: kan inte söka tillbaka till startposition"
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr "%s: kan inte söka till position %s"
 
-#: src/head.c:673
+#: src/head.c:423 src/tail.c:457
 #, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "%s: misslyckades att återställa filpekaren"
-
-#: src/head.c:798
-#, c-format
-msgid "cannot reposition file pointer for %s"
-msgstr "kan inte flytta filpekaren för %s"
+msgid "%s: cannot seek to relative offset %s"
+msgstr "%s: kan inte söka till relativ position %s"
 
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr "%s: %s är så stor att den inte kan representeras"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr "antal rader"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr "antal byte"
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr "felaktigt antal rader"
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr "felaktigt antal byte"
 
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, c-format
 msgid "invalid trailing option -- %c"
 msgstr "ogiltig avslutande flagga -- %c"
@@ -4690,41 +4767,48 @@ msgid "cannot determine hostname"
 msgstr "kan inte avgöra värdnamnet"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr "Arnold Robbins"
 
-#: src/id.c:81
+#: src/id.c:84
 #, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
-msgstr "Användning: %s [FLAGGA]... [ANVÄNDARNAMN]\n"
+msgid "Usage: %s [OPTION]... [USER]\n"
+msgstr "Användning: %s [FLAGGA]… [ANVÄNDARE]\n"
 
-#: src/id.c:82
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
 msgstr ""
-"Skriv ut användar- och gruppinformation om ANVÄNDARNAMN,\n"
-"eller (när ANVÄNDARNAMN utelämnas) om den aktuella användaren.\n"
+"Skriv ut användar- och gruppinformation om den angivna ANVÄNDAREN,\n"
+"eller (när ANVÄNDARE utelämnas) om den aktuella användaren.\n"
 "\n"
-"  -a              ignoreras, finns för kompabilitet med andra versioner\n"
-"  -Z, --context   skriv endast säkerhetskontexten för den aktuella "
-"användaren\n"
+
+#: src/id.c:90
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
+msgstr ""
+"  -a              ignoreras, finns för kompatibilitet med andra versioner\n"
+"  -Z, --context   skriv endast säkerhetskontexten för processen\n"
 "  -g, --group     skriv endast gällande grupp-ID\n"
 "  -G, --groups    skriv alla grupp-ID\n"
 "  -n, --name      skriv ett namn i stället för ett nummer, gäller -ugG\n"
 "  -r, --real      skriv verklig ID i stället för den gällande, gäller -ugG\n"
 "  -u, --user      skriv endast gällande användar-ID\n"
+"  -z, --zero      separera poster med NOLL-tecken, inte mellanslag;\n"
+"                    inte tillåtet i standardformatet\n"
 
-#: src/id.c:96
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
@@ -4732,116 +4816,126 @@ msgstr ""
 "\n"
 "Utan någon FLAGGA skrivs lite användbar, identifierad information ut.\n"
 
-#: src/id.c:140
+#: src/id.c:151
+#, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr "--context (-Z) fungerar endast med en kärna med SELinux/SMACK"
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr "--context (-Z) fungerar endast med en kärna med SELinux"
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr "kan inte visa säkerhetskontext när en användare är angiven"
 
-#: src/id.c:178
+#: src/id.c:198
 #, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr "kan inte skriva �endast� för mer än ett val"
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr "kan inte skriva ut bara namn eller faktiskt ID på standardformat"
 
-#: src/id.c:199
+#: src/id.c:209
+#, c-format
+msgid "option --zero not permitted in default format"
+msgstr "flaggan --zero är inte tillåten i standardformatet"
+
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
 msgstr "kan inte få processkontexten"
 
-#: src/id.c:224
+#: src/id.c:265
 #, c-format
 msgid "cannot get effective UID"
-msgstr "kan inte få fram effekiv UID"
+msgstr "kan inte få fram effektiv UID"
 
-#: src/id.c:311
+#: src/id.c:354
 #, c-format
 msgid "cannot find name for user ID %s"
 msgstr "kan inte hitta ett namn för användar-ID %s"
 
-#: src/id.c:329
+#: src/id.c:372
 #, c-format
 msgid "uid=%s"
 msgstr "uid=%s"
 
-#: src/id.c:334
+#: src/id.c:377
 #, c-format
 msgid " gid=%s"
 msgstr " gid=%s"
 
-#: src/id.c:341
+#: src/id.c:384
 #, c-format
 msgid " euid=%s"
 msgstr " euid=%s"
 
-#: src/id.c:349
+#: src/id.c:392
 #, c-format
 msgid " egid=%s"
 msgstr " egid=%s"
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr " grupper="
 
-#: src/id.c:393
+#: src/id.c:437
 #, c-format
 msgid " context=%s"
 msgstr " kontext=%s"
 
-#: src/install.c:373
+#: src/install.c:376
 #, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr "varning: %s: misslyckades att byta kontext till %s"
 
-#: src/install.c:414
+#: src/install.c:417
 #, c-format
 msgid "creating directory %s"
 msgstr "skapar katalog %s"
 
-#: src/install.c:482
+#: src/install.c:485
 #, c-format
 msgid "cannot change ownership of %s"
 msgstr "kan inte byta ägare av %s"
 
-#: src/install.c:506
+#: src/install.c:509
 #, c-format
 msgid "cannot set time stamps for %s"
 msgstr "kan inte sätta tidsstämpel för %s"
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, c-format
 msgid "fork system call failed"
 msgstr "systemanropet fork misslyckades"
 
-#: src/install.c:531
+#: src/install.c:535
 #, c-format
 msgid "cannot run %s"
 msgstr "kan inte köra %s"
 
-#: src/install.c:535
+#: src/install.c:539
 #, c-format
 msgid "waiting for strip"
 msgstr "väntar på strip"
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr "strip-processen slutade onormalt"
 
-#: src/install.c:558
+#: src/install.c:565
 #, c-format
 msgid "invalid user %s"
 msgstr "ogiltig användare %s"
 
-#: src/install.c:594
+#: src/install.c:601
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -4854,7 +4948,7 @@ msgstr ""
 "   eller:   %s [FLAGGA]... -t KATALOG KÄLLA...\n"
 "   eller:   %s [FLAGGA]... -d KATALOG...\n"
 
-#: src/install.c:601
+#: src/install.c:608
 msgid ""
 "\n"
 "This install program copies files (often just compiled) into destination\n"
@@ -4878,7 +4972,7 @@ msgstr ""
 "Det fjärde formatet skapar KATALOG(er) inklusive eventuella "
 "föräldrakataloger.\n"
 
-#: src/install.c:615
+#: src/install.c:622
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
 "  -b                  like --backup but does not accept an argument\n"
@@ -4891,13 +4985,13 @@ msgid ""
 msgstr ""
 "      --backup[=STYR]  säkerhetskopiera varje befintlig destination\n"
 "  -b                  som --backup, fast tar inget argument\n"
-"  -C, --compare       jämför varje par of käll- och destinationsfiler, och\n"
+"  -C, --compare       jämför varje par av käll- och destinationsfiler, och\n"
 "                        modifiera i några fall inte destinationen alls\n"
 "  -c                  (ignoreras)\n"
 "  -d, --directory     betrakta alla argument som kataloger; skapa dem\n"
 "                        inklusive eventuella föräldrakataloger\n"
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -4915,7 +5009,7 @@ msgstr ""
 "xr-x\n"
 "  -o, --owner=ÄGARE   sätt ägare (endast superanvändare)\n"
 
-#: src/install.c:631
+#: src/install.c:638
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
 "files\n"
@@ -4938,65 +5032,66 @@ msgstr ""
 "  -T, --no-target-directory  behandla DEST som en vanlig fil\n"
 "  -v, --verbose       skriv namnet på varje katalog som skapas\n"
 
-#: src/install.c:641
+#: src/install.c:648
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
 "      --preserve-context  bevara SELinux-säkerhetskontext\n"
-"  -Z, --context=KONTEXT  sätt SELinux-säkerhetskontext på filer och "
-"kataloger\n"
+"  -Z                      sätt SELinux-säkerhetskontext på "
+"destinationsfilen\n"
+"                            till standardtypen\n"
+"      --context[=KTX]     som -Z, eller om KTX anges, sätt då SELinux- "
+"eller\n"
+"                            SMACK-säkerhetskontext till KTX\n"
 
-#: src/install.c:859
+#: src/install.c:696 src/unlink.c:86
+#, c-format
+msgid "cannot unlink %s"
+msgstr "kan inte ta bort %s"
+
+#: src/install.c:877
 #, c-format
 msgid ""
 "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
 msgstr "VARNING: ignorerar --preserve-context; denna kärna har inte SELinux."
 
-#: src/install.c:869
-#, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
-msgstr "VARNING: ignorerar --context (-Z); denna kärna har inte SELinux."
-
-#: src/install.c:886
+#: src/install.c:917
 #, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr "strip-flaggan kan inte användas vid installation av en katalog"
 
-#: src/install.c:889
+#: src/install.c:920
 #, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr "målkatalog kan inte användas vid installation av en katalog"
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr "det går inte att tvinga målkontext till %s och bevara den"
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, c-format
 msgid "invalid mode %s"
 msgstr "ogiltig rättighet %s"
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr ""
 "VARNING: ignorerar flaggan --strip-program eftersom flaggan -s inte angavs"
 
-#: src/install.c:959
+#: src/install.c:1001
 #, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr ""
 "flaggorna --compare (-C) och --preserve-timestamps är ömsesidigt uteslutande"
 
-#: src/install.c:966
+#: src/install.c:1008
 #, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr "flaggorna --compare (-C) och --strip är ömsesidigt uteslutande"
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -5009,7 +5104,7 @@ msgstr ""
 msgid "Mike Haertel"
 msgstr "Mike Haertel"
 
-#: src/join.c:191
+#: src/join.c:195
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
 "standard output.  The default join field is the first, delimited\n"
@@ -5029,7 +5124,7 @@ msgstr ""
 "                     eller 2, motsvarande FIL1 eller FIL2\n"
 "  -e TOM           ersätt tomma inmatningsfält med TOM\n"
 
-#: src/join.c:200
+#: src/join.c:204
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
 "  -j FIELD          equivalent to '-1 FIELD -2 FIELD'\n"
@@ -5041,7 +5136,7 @@ msgstr ""
 "  -o FORMAT         följ FORMAT när utskriftsrader konstrueras\n"
 "  -t TECKEN         använd TECKEN som fältseparator för in- och utmatning\n"
 
-#: src/join.c:206
+#: src/join.c:210
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
 "  -1 FIELD          join on this FIELD of file 1\n"
@@ -5061,7 +5156,11 @@ msgstr ""
 "  --header          hantera första raden i varje fil som filhuvuden,\n"
 "                      skriv dem utan att försöka att para ihop dem\n"
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr "  -z, --zero-terminated     radavgränsare är NOLL, inte nyrad\n"
+
+#: src/join.c:225
 msgid ""
 "\n"
 "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n"
@@ -5096,47 +5195,47 @@ msgstr ""
 "Om indata inte är sorterad och några rader inte kan förenas, ges ett\n"
 "varningsmeddelande.\n"
 
-#: src/join.c:403
+#: src/join.c:410
 #, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
 msgstr "%s:%<PRIuMAX>: är inte sorterad: %.*s"
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, c-format
 msgid "invalid field number: %s"
 msgstr "felaktigt fältnummer: %s"
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, c-format
 msgid "invalid field specifier: %s"
 msgstr "felaktig fältspecifikation: %s"
 
-#: src/join.c:877
+#: src/join.c:884
 #, c-format
 msgid "invalid file number in field spec: %s"
 msgstr "felaktigt filnummer i fältspec: %s"
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr "inkompatibla join-fält %lu, %lu"
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr "motsägelsefulla ersättningssträngar för tomma fält"
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, c-format
 msgid "multi-character tab %s"
 msgstr "flerteckenstabulator %s"
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr "inkompatibla tabulatorer"
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr "båda filerna kan inte vara standard in"
@@ -5256,47 +5355,47 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr "kan inte skapa länk %s till %s"
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr "%s: hård länk inte tillåten för katalog"
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, c-format
 msgid "%s: cannot overwrite directory"
 msgstr "%s: kan inte skriva över katalog"
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
 msgstr "%s: ersätt %s? "
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, c-format
 msgid "failed to create symbolic link %s"
 msgstr "misslyckades att skapa symbolisk länk %s"
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr "misslyckades att skapa symbolisk länk %s → %s"
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr "misslyckades att skapa hård länk till %.0s%s"
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, c-format
 msgid "failed to create hard link %s"
 msgstr "misslyckades att skapa hård länk %s"
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, c-format
 msgid "failed to create hard link %s => %s"
 msgstr "misslyckades att skapa hård länk %s ⇒ %s"
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -5309,7 +5408,7 @@ msgstr ""
 "    eller:  %s [FLAGGA]... MÃ…L... KATALOG      (format 3)\n"
 "    eller:  %s [FLAGGA]... -t KATALOG MÃ…L...   (format 4)\n"
 
-#: src/ln.c:381
+#: src/ln.c:398
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
 "In the 2nd form, create a link to TARGET in the current directory.\n"
@@ -5320,7 +5419,7 @@ msgid ""
 "can hold arbitrary text; if later resolved, a relative link is\n"
 "interpreted in relation to its parent directory.\n"
 msgstr ""
-"I det första formatet, skapa en link till MÅL med namnet LÄNKNAMN.\n"
+"I det första formatet, skapa en länk till MÅL med namnet LÄNKNAMN.\n"
 "I det andra formatet, skapa en länk till MÅL i aktuell katalog.\n"
 "I de tredje och fjärde formaten, skapa länkar till varje MÅL i KATALOG.\n"
 "Skapa hårda länkar om inget annat anges, symboliska länkar med --symbolic.\n"
@@ -5328,7 +5427,7 @@ msgstr ""
 "Symboliska länkar kan innehålla godtycklig text.  Om de senare löses\n"
 "upp tolkas en relativ länk i förhållande till sin föräldrakatalog.\n"
 
-#: src/ln.c:394
+#: src/ln.c:411
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
 "file\n"
@@ -5343,12 +5442,12 @@ msgstr ""
 "      --backup[=STYR]         säkerhetskopiera varje befintlig destination\n"
 "  -b                          som --backup, fast tar inget argument\n"
 "  -d, -F, --directory         tillåt superanvändaren att försöka hårt länka\n"
-"                                kataloger (obs: detta kommer formodligen\n"
+"                                kataloger (obs: detta kommer förmodligen\n"
 "                                misslyckas på grund av systemrestriktioner,\n"
 "                                även för superanvändaren)\n"
 "  -f, --force                 ta bort befintliga destinationsfiler\n"
 
-#: src/ln.c:402
+#: src/ln.c:419
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
 "  -L, --logical               dereference TARGETs that are symbolic links\n"
@@ -5370,7 +5469,7 @@ msgstr ""
 "  -s, --symbolic              gör symboliska länkar istället för hårda "
 "länkar\n"
 
-#: src/ln.c:411
+#: src/ln.c:428
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
 "  -t, --target-directory=DIRECTORY  specify the DIRECTORY in which to "
@@ -5384,7 +5483,7 @@ msgstr ""
 "  -T, --no-target-directory   behandla alltid LÄNKNAMN som en vanlig fil\n"
 "  -v, --verbose               skriv namnet på varje länkad fil\n"
 
-#: src/ln.c:433
+#: src/ln.c:450
 #, c-format
 msgid ""
 "\n"
@@ -5395,13 +5494,13 @@ msgstr ""
 "Användning av -s ignorerar -L och -P.  Annars styr den sist angivna flaggan\n"
 "beteendet när ett MÅL är en symbolisk länk, som standard %s.\n"
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr ""
 "det går inte att kombinera --target-directory och --no-target-directory"
 
-#: src/ln.c:588
+#: src/ln.c:605
 #, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr "kan inte göra --relative utan --symbolic"
@@ -5434,7 +5533,7 @@ msgstr "inget inloggningsnamn"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 msgid "%b %e  %Y"
 msgstr "%e %b  %Y"
 
@@ -5443,94 +5542,94 @@ msgstr "%e %b  %Y"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 msgid "%b %e %H:%M"
 msgstr "%e %b %H.%M"
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr "ignorerar ogiltigt värde på miljövariabeln QUOTING_STYLE: %s"
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr "ignorerar felaktig bredd i miljövariabeln COLUMNS: %s"
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr "ignorerar felaktigt tabulatorsteg i miljövariabeln TABSIZE: %s"
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, c-format
 msgid "invalid line width: %s"
 msgstr "felaktig radlängd: %s"
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, c-format
 msgid "invalid tab size: %s"
 msgstr "felaktigt tabulatorsteg %s"
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, c-format
 msgid "invalid time style format %s"
 msgstr "felaktigt tidsstilsformat %s"
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 msgid "Valid arguments are:\n"
 msgstr "Giltiga argument är:\n"
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr "  - +FORMAT (t.ex., +%H.%M) för ett format i �date�-stil\n"
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr "fel vid initiering av månadssträngar"
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, c-format
 msgid "unrecognized prefix: %s"
 msgstr "okänt prefix: %s"
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr "obegripligt värde på LS_COLORS-miljövariabeln"
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, c-format
 msgid "cannot open directory %s"
 msgstr "kan inte öppna katalog %s"
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, c-format
 msgid "cannot determine device and inode of %s"
 msgstr "kan inte avgöra enhet och inod för %s"
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, c-format
 msgid "%s: not listing already-listed directory"
 msgstr "%s: listar inte redan listad katalog"
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, c-format
 msgid "reading directory %s"
 msgstr "läser katalog %s"
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, c-format
 msgid "closing directory %s"
 msgstr "stänger katalog %s"
 
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, c-format
 msgid "cannot compare file names %s and %s"
 msgstr "kan inte jämföra filnamnen %s och %s"
 
-#: src/ls.c:4721
+#: src/ls.c:4781
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
 "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n"
@@ -5538,7 +5637,7 @@ msgstr ""
 "Visa information om FILerna (aktuell katalog om inget anges).  Sortera\n"
 "posterna alfabetiskt om ingen av -cftuvSUX eller --sort anges.\n"
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
 "  -A, --almost-all           do not list implied . and ..\n"
@@ -5551,53 +5650,51 @@ msgstr ""
 "      --author               med -l, skriv ut författare för varje fil\n"
 "  -b, --escape               skriv C:s specialkoder för ickegrafiska tecken\n"
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
-"  -B, --block-size=STRL      skala storlekar med STRL före de skrivs ut.  T."
+"  -B, --block-size=STRL      skala storlekar med STRL före de skrivs ut; t."
 "ex.\n"
-"                               �--block-size=M� skriver storleka i enheter "
+"                               skriver �--block-size=M� storlekar i enheter "
 "av\n"
-"                               1 048 576 byte.  Se STORLEKsformat nedan.\n"
+"                               1 048 576 byte; se STORLEKsformat nedan.\n"
 "  -B, --ignore-backups       lista inte underförstådda poster som slutar på "
 "~\n"
 "  -c                         med -lt: sortera efter och visa ctime, (tid "
 "för\n"
-"                               senaste ändring av filstatusinformation)\n"
-"                               med -l: visa ctime och sortera alfabetiskt\n"
+"                               senaste ändring av filstatusinformation);\n"
+"                               med -l: visa ctime och sortera alfabetiskt;\n"
 "                               annars: sortera efter ctime, nyast först\n"
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 "  -C                         lista poster kolumnvis\n"
-"      --color[=NÄR]          färglägg utskriften.  NÄR är som standard "
+"      --color[=NÄR]          färglägg utskriften; NÄR är som standard "
 "�always�\n"
 "                               eller kan vara �never� eller �auto�.  Mer\n"
 "                               information nedan\n"
-"  -d, --directory            lista kataloger istället för deras innehåll,\n"
-"                               och följ inte symboliska länkar\n"
+"  -d, --directory            lista själva katalogerna, inte deras innehåll\n"
 "  -D, --dired                anpassa utdata för Emacs dired-funktion\n"
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
 "  -F, --classify             append indicator (one of */=>@|) to entries\n"
@@ -5614,42 +5711,45 @@ msgstr ""
 "                               single-column -1, verbose -l, vertical -C\n"
 "      --full-time            som -l --time-style=full-iso\n"
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr "  -g                         som -l, men skriv inte ut ägare\n"
 
-#: src/ls.c:4763
+#: src/ls.c:4823
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 "      --group-directories-first\n"
 "                             gruppera kataloger före filer.\n"
-"                               utöka med en flagga --sort, men användning\n"
+"                               kan utökas med en flagga --sort, men "
+"användning\n"
 "                               av --sort=none (-U) avaktiverar gruppering\n"
 
-#: src/ls.c:4769
+#: src/ls.c:4829
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
 "  -G, --no-group             i långa listningar: skriv inte ut gruppnamn\n"
-"  -h, --human-readable       med -l, skriv storlekar i läsbart format\n"
-"                               (t.ex. 1K 234M 2G)\n"
+"  -h, --human-readable       med -l och/eller -s, skriv storlekar läsbart "
+"för\n"
+"                               en människa (t.ex. 1K 234M 2G)\n"
 "      --si                   d:o, men använd potenser av 1000, inte 1024\n"
 
-#: src/ls.c:4775
+#: src/ls.c:4835
 msgid ""
 "  -H, --dereference-command-line\n"
 "                             follow symbolic links listed on the command "
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
@@ -5659,12 +5759,12 @@ msgstr ""
 "      --dereference-command-line-symlink-to-dir\n"
 "                            följ varje kommandoradsargument som är en "
 "symbolisk\n"
-"                            länk som pekar på en katalog\n"
+"                              länk som pekar på en katalog\n"
 "      --hide=MÖNSTER        visa inte underförstådda poster som matchar "
 "MÖNSTER\n"
-"                               (åsidosätts av -a eller -A)\n"
+"                              (åsidosätts av -a eller -A)\n"
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
 "names:\n"
@@ -5673,18 +5773,19 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 "      --indicator-style=ORD  lägg till en indikator med stil ORD till "
 "postnamn:\n"
 "                               none (standard), slash (-p),\n"
-"                               file-type (-p), classify (-F)\n"
+"                               file-type (--file-type), classify (-F)\n"
 "  -i, --inode                visa indexnummer för varje fil\n"
 "  -I, --ignore=MÖNSTER       visa inte underförstådda poster som matchar\n"
 "                               skalMÖNSTER\n"
-"  -k, --kibibytes            använd 1024-bytesblock\n"
+"  -k, --kibibytes            använd som standard 1024-bytesblock för\n"
+"                               diskanvändning\n"
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -5701,7 +5802,7 @@ msgstr ""
 "  -m                         fyll bredden med en kommaseparerad lista av "
 "poster\n"
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -5719,11 +5820,11 @@ msgstr ""
 "  -p, --indicator-style=slash\n"
 "                             lägg till en /-indikator till kataloger\n"
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -5740,7 +5841,7 @@ msgstr ""
 "                               literal, locale, shell, shell-always, c, "
 "escape\n"
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
 "  -R, --recursive            list subdirectories recursively\n"
@@ -5752,48 +5853,56 @@ msgstr ""
 "  -s, --size                 skriv allokerade storleken i block för varje "
 "fil\n"
 
-#: src/ls.c:4825
+#: src/ls.c:4886
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 "  -S                         sortera efter filstorlek\n"
-"      --sort=ORD             sortera ORDvis istället för efter namn: none -"
-"U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=ORD             visa tid som ORD istället för modifieringstid:\n"
-"                             atime, access, use, ctime eller status; använd\n"
-"                             angiven tid som sorteringsnyckel om --"
+"      --sort=ORD             sortera enligt ORD istället för namn: none (-"
+"U),\n"
+"                               size (-S), time (-t), version (-v),\n"
+"                               extension (-X)\n"
+"      --time=ORD             med -l, visa tid som ORD istället för standard\n"
+"                               modifieringstid: atime eller access eller\n"
+"                               use (-u), ctime eller status (-c); använd "
+"även\n"
+"                               angiven tid som sorteringsnyckel om --"
 "sort=time\n"
 
-#: src/ls.c:4835
+#: src/ls.c:4896
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
-msgstr ""
-"      --time-style=STIL      med -l, visa tider i med stil STIL:\n"
-"                             full-iso, long-sio, iso, locale, +FORMAT\n"
-"                             FORMAT tolkas som �date�; om FORMAT är\n"
-"                             FORMAT1<nyrad>FORMAT2, används FORMAT1 för "
-"gamla\n"
-"                             filer och FORMAT2 för nyare filer;\n"
-"                             vid tillägg av prefixet �posix-� till STIL, "
-"gäller\n"
-"                             STIL endast utanför lokalen POSIX\n"
-
-#: src/ls.c:4844
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
+msgstr ""
+"      --time-style=STIL      med -l, visa tider med STIL:\n"
+"                               full-iso, long-sio, iso, locale eller "
+"+FORMAT;\n"
+"                               FORMAT tolkas som i �date�; om FORMAT är\n"
+"                               FORMAT1<nyrad>FORMAT2, då används FORMAT1 "
+"för\n"
+"                               gamla filer och FORMAT2 för nyare filer;\n"
+"                               om STIL har prefixet �posix-� har STIL "
+"effekt\n"
+"                               endast utanför lokalen POSIX\n"
+
+#: src/ls.c:4908
 msgid ""
 "  -t                         sort by modification time, newest first\n"
 "  -T, --tabsize=COLS         assume tab stops at each COLS instead of 8\n"
@@ -5801,38 +5910,36 @@ msgstr ""
 "  -t                         sortera efter modifieringstid, nyast först\n"
 "  -T, --tabsize=KOLUMN       antag tabulatorsteg varje KOLUMN, inte var 8:e\n"
 
-#: src/ls.c:4848
+#: src/ls.c:4912
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
 msgstr ""
-"  -u                         med -lt: sortera efter och visa åtkomsttid\n"
+"  -u                         med -lt: sortera efter och visa åtkomsttid;\n"
 "                               med -l: visa åtkomsttid men sortera "
-"alfabetiskt\n"
+"alfabetiskt;\n"
 "                               annars: sortera enligt åtkomsttid\n"
 "  -U                         sortera inte; lista poster i katalogordning\n"
 "  -v                         naturlig sortering av (versions)nummer i text\n"
 
-#: src/ls.c:4855
+#: src/ls.c:4919
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 "  -w, --width=KOLUMN         anta skärmbredd istället för aktuellt värde\n"
 "  -x                         lista poster radvis istället för kolumnvis\n"
 "  -X                         sortera alfabetiskt efter ändelser\n"
-"  -Z, --context              skriv eventuell SELinuxsäkerhetskontext för\n"
-"                               varje fil\n"
+"  -Z, --context              skriv eventuell säkerhetskontext för varje fil\n"
 "  -1                         lista en fil per rad\n"
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -5844,10 +5951,10 @@ msgstr ""
 "Användning av färger för att särskilja filtyper är avslaget både som\n"
 "standard och med --color=never.  Med --color=auto, skriver ls ut\n"
 "färgkoder endast när standard ut är anslutet till en terminal.\n"
-"Miljövariablen LS_COLORS kan ändra instaällningen  Använd kommandot\n"
+"Miljövariablen LS_COLORS kan ändra inställningen.  Använd kommandot\n"
 "dircolors för att sätta den.\n"
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -5924,28 +6031,25 @@ msgstr "  -t, --text           läs i textläge (standard)\n"
 #: src/md5sum.c:195
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
 "\n"
-"De tre följande flaggorna är användbara enbart vid verifikation av\n"
+"De fyra följande flaggorna är användbara enbart vid verifikation av\n"
 "kontrollsummor:\n"
 "      --quiet          skriv inte OK för varje verifierad fil\n"
 "      --status         skriv inte ut något, statuskoden visar resultatet\n"
+"      --strict         returnera nollskilt vid felformaterade "
+"kontrollsummerader\n"
 "  -w, --warn           varna för felaktigt formaterade kontrollsummerader\n"
 "\n"
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-"      --strict         med --check, avsluta med status skild från noll vid\n"
-"                         alla fel i indata\n"
-
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, c-format
 msgid ""
 "\n"
@@ -5960,66 +6064,66 @@ msgstr ""
 "med en kontrollsumma, ett tecken som indikerar typen (�*� för binärt,\n"
 "blanktecken för text), och namnet på varje FIL.\n"
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, c-format
 msgid "%s: too many checksum lines"
 msgstr "%s: för många kontrollsummerader"
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr "%s: %<PRIuMAX>: felaktigt formaterad %s-kontrollsummerad"
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr "%s: MISSLYCKADES att öppna eller läsa\n"
 
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr "MISSLYCKADES"
 
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr "OK"
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr "%s: inga korrekt formaterade %s-kontrollsummerader funna"
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
 msgstr[0] "VARNING: %<PRIuMAX> rad är felaktigt formaterad"
 msgstr[1] "VARNING: %<PRIuMAX> rader är felaktigt formaterade"
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
 msgstr[0] "VARNING: %<PRIuMAX> listad fil kunde inte läsas"
 msgstr[1] "VARNING: %<PRIuMAX> listade filer kunde inte läsas"
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
 msgstr[0] "VARNING: %<PRIuMAX> beräknad kontrollsumma stämde INTE"
 msgstr[1] "VARNING: %<PRIuMAX> beräknade kontrollsummor stämde INTE"
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
 msgstr "--tag stödjer inte läget --text"
 
-#: src/md5sum.c:766
+#: src/md5sum.c:770
 #, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr "flaggan --tag är meningslös när kontrollsummor verifieras"
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
@@ -6027,102 +6131,133 @@ msgstr ""
 "flaggorna --binary och --text är meningsfulla enbart när kontrollsummor\n"
 "verifieras"
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr "flaggan --status är meningsfull enbart när kontrollsummor verifieras"
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr "flaggan --warn är meningsfull enbart när kontrollsummor verifieras "
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr "flaggan --quiet är meningsfull enbart när kontrollsummor verifieras"
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr "flaggan --strict är meningsfull enbart när kontrollsummor verifieras"
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr "Användning: %s [FLAGGA]... KATALOG...\n"
 
-#: src/mkdir.c:57
+#: src/mkdir.c:59
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
 msgstr "Skapa KATALOG(er), om de inte redan finns.\n"
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 "  -m, --mode=RÄTTIGHET sätt filrättigheter (som i chmod), inte rwxrwxrwx - "
 "umask\n"
 "  -p, --parents     inget fel om den finns, gör föräldrakataloger vid behov\n"
 "  -v, --verbose     skriv meddelande för varje skapad katalog\n"
-"  -Z, --context=KTX  sätt SELinuxsäkerhetskontexten på varje skapad katalog\n"
-"                      till KTX\n"
 
-#: src/mkdir.c:168
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+"  -Z                   sätt SELinux-säkerhetskontext på varje skapad "
+"katalog\n"
+"                         till standardtypen\n"
+"      --context[=KTX]  som -Z, eller om KTX anges, sätt då SELinux- eller\n"
+"                         SMACK-säkerhetskontext till KTX\n"
+
+#: src/mkdir.c:127 src/mkdir.c:172
+#, c-format
+msgid "failed to set default creation context for %s"
+msgstr "misslyckades att sätta standardkontext för %s"
+
+#: src/mkdir.c:191
+#, c-format
+msgid "failed to restore context for %s"
+msgstr "misslyckades att återställa kontext för %s"
+
+#: src/mkdir.c:231
 #, c-format
 msgid "created directory %s"
 msgstr "skapade katalog %s"
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr ""
+"varning: ignorerar --context (-Z); det kräver en kärna med SELinux/SMACK"
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr "Användning: %s [FLAGGA]... NAMN...\n"
 
-#: src/mkfifo.c:52
+#: src/mkfifo.c:54
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
 msgstr "Skapa namngivna rör (FIFO) med de givna NAMNen.\n"
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
 msgstr ""
 "  -m, --mode=RÄTTIGHET sätt filrättighetsbitar till RÄTTIGHET, inte a=rw - "
 "umask\n"
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
-"  -Z, --context=KTX  sätt SELinux-säkerhetskontexten på varje NAMN till KTX\n"
+"  -Z                   sätt SELinux-säkerhetskontext till standardtypen\n"
+"      --context[=KTX]  som -Z, eller om KTX anges, sätt då SELinux- eller\n"
+"                         SMACK-säkerhetskontext till KTX\n"
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, c-format
 msgid "invalid mode"
 msgstr "felaktig rättighet"
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr "rättigheter måste ange endast filrättighetsbitar"
 
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
+#, c-format
+msgid "cannot set permissions of %s"
+msgstr "kan sätta rättigheter på %s"
+
+#: src/mknod.c:54
 #, c-format
 msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr "Användning: %s [FLAGGA]... NAMN TYP [ÖVRE LÄGRE]\n"
 
-#: src/mknod.c:54
+#: src/mknod.c:56
 msgid "Create the special file NAME of the given TYPE.\n"
 msgstr "Skapa specialfilen NAMN av angiven TYP.\n"
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr ""
-"  -Z, --context=KTX  sätt SELinux-säkerhetskontexten på NAMN till KTX\n"
-
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -6136,7 +6271,7 @@ msgstr ""
 "tolkas det som hexadecimalt; annars, om det börjar med 0 som oktalt;\n"
 "annars som decimalt.  TYP får vara:\n"
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 msgid ""
 "\n"
 "  b      create a block (buffered) special file\n"
@@ -6148,71 +6283,71 @@ msgstr ""
 "  c, u   skapa en (obuffrad) teckenspecialfil\n"
 "  p      skapa en FIFO\n"
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 msgid "Special files require major and minor device numbers."
-msgstr "Specialfiler kräver övre och undre enhetsnummer"
+msgstr "Specialfiler kräver övre och undre enhetsnummer."
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 msgid "Fifos do not have major and minor device numbers."
 msgstr "Fifo:er har inte övre och undre enhetsnummer."
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, c-format
 msgid "block special files not supported"
-msgstr "blockspecialfiler stöds inte"
+msgstr "blockspecialfiler stödjs inte"
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, c-format
 msgid "character special files not supported"
-msgstr "teckenspecialfiler stöds inte"
+msgstr "teckenspecialfiler stödjs inte"
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, c-format
 msgid "invalid major device number %s"
 msgstr "ogiltigt övre enhetsnummer %s"
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, c-format
 msgid "invalid minor device number %s"
 msgstr "ogiltigt undre enhetsnummer %s"
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, c-format
 msgid "invalid device %s %s"
 msgstr "ogiltig enhet %s %s"
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, c-format
 msgid "invalid device type %s"
 msgstr "ogiltig enhetstyp %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr "Eric Blake"
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr "Användning: %s [FLAGGA]... [MALL]\n"
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
 "TEMPLATE must contain at least 3 consecutive 'X's in last component.\n"
 "If TEMPLATE is not specified, use tmp.XXXXXXXXXX, and --tmpdir is implied.\n"
 msgstr ""
-"Skapa en temporarfil eller -katalog, säkert, och skriv dess namn.\n"
+"Skapa en temporärfil eller -katalog, säkert, och skriv dess namn.\n"
 "MALL måste innehålla åtminstone 3 �X� i följd i sin sista komponent.\n"
 "Om MALL inte är angivet, används tmp.XXXXXXXXXX, och --tmpdir är implicit.\n"
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
 "Filer skapas u+rw, och kataloger u+rwx, minus begränsningar från umask.\n"
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
@@ -6223,96 +6358,88 @@ msgstr ""
 "  -q, --quiet         utelämna meddelanden när det inte går att skapa filer/"
 "kataloger\n"
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
-"      --suffix=SUFF   lägg till SUFF till MALL.  SUFF får inte innehålla "
-"ett\n"
+"      --suffix=SUFF   lägg till SUFF till MALL; SUFF får inte innehålla ett\n"
 "                        snedstreck.  Denna flagga är implicit om MALL inte\n"
 "                        slutar med X.\n"
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
-"      --tmpdir[=KAT]  tolka MALL relativt KAT.  Om KAT inte anges använd\n"
+"  -p KAT, --tmpdir[=KAT]  tolka MALL relativt KAT; om KAT inte anges använd\n"
 "                        $TMPDIR om den är satt, annars /tmp.  Med denna\n"
 "                        flagga får MALL inte vara ett absolut namn.  Till\n"
 "                        skillnad mot -t får MALL innehålla snedstreck, men\n"
 "                        mktemp skapar endast den sista komponenten.\n"
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
 msgstr ""
-"  -p KAT              använd KAT som ett prefix, implicerar -t [undanbedes]\n"
 "  -t                  tolka MALL som en ensam filnamnskomponent,\n"
 "                        relativt en katalog: $TMPDIR, om det är satt, "
 "annars\n"
 "                        katalogen som angetts via -p, annars /tmp "
 "[undanbedes]\n"
 
-#: src/mktemp.c:223
-#, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr "misslyckades att omdirigera standard fel till /dev/null"
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, c-format
 msgid "too many templates"
 msgstr "för många mallar"
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr "med --suffix måste mallen %s sluta med X"
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr "ogiltigt suffix %s, innehåller katalogseparator"
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr "för få X i mallen %s"
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr "ogiltig mall, %s, innehåller katalogseparator"
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr "ogiltig mall, %s, med --tmpdir får den inte vara absolut"
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, c-format
 msgid "failed to create directory via template %s"
 msgstr "misslyckades att skapa en katalog via mallen %s"
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, c-format
 msgid "failed to create file via template %s"
 msgstr "misslyckades att skapa en fil via mallen %s"
 
-#: src/mv.c:292
+#: src/mv.c:294
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
 msgstr "Byt namn på KÄLLA till DEST eller flytta KÄLLor till KATALOG.\n"
 
-#: src/mv.c:298
+#: src/mv.c:300
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
 "file\n"
@@ -6331,7 +6458,7 @@ msgstr ""
 "  -n, --no-clobber             skriv inte över existerade filer\n"
 "Om du anger mer än en av -i, -f, -n har endast den sista någon effekt.\n"
 
-#: src/mv.c:307
+#: src/mv.c:309
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
@@ -6342,7 +6469,7 @@ msgstr ""
 "                                 KÄLLargument\n"
 "  -S, --suffix=ÄNDELSE         ersätt den vanliga säkerhetskopieändelsen\n"
 
-#: src/mv.c:312
+#: src/mv.c:314
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
 "DIRECTORY\n"
@@ -6351,14 +6478,18 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
 "  -t, --target-directory=KATALOG  flytta alla KÄLLargument in i KATALOG\n"
-"  -T, --no-target-directory  behandla DEST som en vanlig fil\n"
+"  -T, --no-target-directory    behandla DEST som en vanlig fil\n"
 "  -u, --update                 flytta endast när KÄLLfilen är nyare än\n"
 "                                 destinationsfilen eller när "
 "destinationsfilen\n"
 "                                 inte finns\n"
 "  -v, --verbose                förklara vad som görs\n"
+"  -Z, --context                sätt SELinux-säkerhetskontext på målet till\n"
+"                                 standardtypen\n"
 
 #: src/nice.c:72
 #, c-format
@@ -6576,7 +6707,7 @@ msgstr ""
 "möjligt,\n"
 "�$HOME/nohup.out� annars.\n"
 "Om standard fel är en terminal, omdirigera den till standard ut.\n"
-"För att spara utadata till FIL, använd �%s KOMMANDO > FIL�.\n"
+"För att spara utdata till FIL, använd �%s KOMMANDO > FIL�.\n"
 
 #: src/nohup.c:127
 #, c-format
@@ -6606,7 +6737,7 @@ msgstr "misslyckades att ställa in kopian av standard fel att stängas vid exec
 #: src/nohup.c:198
 #, c-format
 msgid "ignoring input and redirecting stderr to stdout"
-msgstr "ingorerar indata och omdirigerar standard fel och standard ut"
+msgstr "ignorerar indata och omdirigerar standard fel och standard ut"
 
 #: src/nohup.c:199
 #, c-format
@@ -6635,7 +6766,7 @@ msgid ""
 "\n"
 msgstr ""
 "Skriv antalet processorenheter som är tillgängliga för den aktuella "
-"procesen,\n"
+"processen,\n"
 "vilket kan vara mindre än antalet inkopplade processorer\n"
 "\n"
 
@@ -6653,77 +6784,72 @@ msgid "%s: invalid number to ignore"
 msgstr "%s: felaktigt antal att ignorera"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
 msgstr "Assaf Gordon"
 
-#: src/numfmt.c:676
+#: src/numfmt.c:659
 #, c-format
-msgid "value too large to be converted: '%s'"
-msgstr "värdet är för stort för att konverteras: �%s�"
+msgid "value too large to be converted: %s"
+msgstr "värdet är för stort för att konverteras: %s"
 
-#: src/numfmt.c:680
+#: src/numfmt.c:663
 #, c-format
-msgid "invalid number: '%s'"
-msgstr "ogiltigt tal: �%s�"
+msgid "invalid number: %s"
+msgstr "ogiltigt antal: %s"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
-msgstr "bortser från suffix i indata: �%s� (överväg att använda --from)"
+msgid "rejecting suffix in input: %s (consider using --from)"
+msgstr "bortser från suffix i indata: %s (överväg att använda --from)"
 
-#: src/numfmt.c:688
+#: src/numfmt.c:671
 #, c-format
-msgid "invalid suffix in input: '%s'"
-msgstr "felaktigt suffix i indata: �%s�"
+msgid "invalid suffix in input: %s"
+msgstr "felaktigt suffix i indata: %s"
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
-msgstr "saknat suffix �i� i indata: �%s� (t.ex. Ki/Mi/Gi)"
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
+msgstr "saknat suffix �i� i indata: %s (t.ex. Ki/Mi/Gi)"
 
-#: src/numfmt.c:723
+#: src/numfmt.c:722 src/numfmt.c:768
 #, c-format
 msgid "failed to prepare value '%Lf' for printing"
 msgstr "misslyckades förbereda värdet �%Lf� för utskrift"
 
-#: src/numfmt.c:787
+#: src/numfmt.c:791
 #, c-format
-msgid "invalid unit size: '%s'"
-msgstr "felaktigt enhetssteg: �%s�"
+msgid "invalid unit size: %s"
+msgstr "felaktigt enhetssteg: %s"
 
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
-#, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr "slut på minne (begärde %zu byte)"
-
-#: src/numfmt.c:813
+#: src/numfmt.c:814
 #, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
 msgstr "Användning: %s [FLAGGA]… [NUMMER]…\n"
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
 msgstr "Formaterar om TAL, eller talen från standard in om inga är givna.\n"
 
-#: src/numfmt.c:820
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
 msgstr "      --debug          skriv varningar om ogiltig indata\n"
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
 "  -d, --delimiter=X    använd X istället för blanka som fältseparator\n"
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr "      --field=N        ersätt talet i indatafält N (standard är 1)\n"
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
@@ -6731,7 +6857,7 @@ msgstr ""
 "      --format=FORMAT  använd flyttalsformat FORMAT av typ printf;\n"
 "                         se FORMAT nedan för detaljer\n"
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
@@ -6741,14 +6867,14 @@ msgstr ""
 "är\n"
 "                         �none�; se ENHET nedan\n"
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr ""
 "      --from-unit=N    ange indatas enhetsstorlek (istället för standard 1)\n"
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
@@ -6759,7 +6885,7 @@ msgstr ""
 "                         t.ex. 1 000 000  (vilket betyder att det inte har\n"
 "                         någon effekt i lokalen C/POSIX)\n"
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
@@ -6767,7 +6893,7 @@ msgstr ""
 "      --header[=N]     skriv (utan konvertering) de första N rubrikraderna;\n"
 "                         N blir 1 som standard om det inte anges\n"
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
@@ -6775,7 +6901,7 @@ msgstr ""
 "      --invalid=SÄTT   felhanteringssätt för felaktiga tal: SÄTT kan vara:\n"
 "                         abort (standard), fail, warn, ignore\n"
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -6786,11 +6912,11 @@ msgid ""
 msgstr ""
 "      --padding=N      fyll ut utdata till N tecken; positivt N kommer\n"
 "                         högerjustera; negativt N kommer vänsterjustera;\n"
-"                         utfyllnad ingoreras om utdata är bredare än N;\n"
+"                         utfyllnad ignoreras om utdata är bredare än N;\n"
 "                         standard är att automatiskt fylla ut om ett\n"
 "                         blanktecken finns\n"
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
@@ -6801,29 +6927,29 @@ msgstr ""
 "                         up, down, from-zero (standard), towards-zero, "
 "nearest\n"
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
 msgstr ""
-"      --suffix=SUFFIX  använd SUFFIX för att skriva ut tal, och accptera "
+"      --suffix=SUFFIX  använd SUFFIX för att skriva ut tal, och acceptera "
 "ett\n"
 "                         möjligt SUFFIX i indatatal\n"
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
 "      --to=ENHET       skala automatiskt utdatatal till ENHETer; se ENHET "
 "nedan\n"
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr ""
 "      --to-unit=N      enhetsstorlek på utdata (istället för standard 1)\n"
 
-#: src/numfmt.c:877
+#: src/numfmt.c:878
 msgid ""
 "\n"
 "UNIT options:\n"
@@ -6831,12 +6957,12 @@ msgstr ""
 "\n"
 "ENHETSflaggor:\n"
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr ""
 "  none       ingen automatisk skalning görs; suffix kommer orsaka ett fel\n"
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -6844,48 +6970,68 @@ msgid ""
 "               1M = 1000000,\n"
 "               1Mi = 1048576,\n"
 msgstr ""
-"  auto       acceptera valfria en-/tvåteckenssuffix:\n"
+"  auto       acceptera valfria en-/tvåbokstavssuffix:\n"
 "               1K = 1000,\n"
 "               1Ki = 1024,\n"
 "               1M = 1000000,\n"
 "               1Mi = 1048576,\n"
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
 "               1M = 1000000,\n"
 "               ...\n"
 msgstr ""
+"  si         acceptera valfria enbokstavssuffix:\n"
+"               1K = 1000,\n"
+"               1M = 1000000,\n"
+"               …\n"
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
 "               1M = 1048576,\n"
 "               ...\n"
 msgstr ""
+"  iec        acceptera valfria enbokstavssuffix:\n"
+"               1K = 1024,\n"
+"               1M = 1048576,\n"
+"               …\n"
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
 "               1Mi = 1048576,\n"
 "               ...\n"
 msgstr ""
+"  iec-i      acceptera valfria tvåbokstavssuffix:\n"
+"               1Ki = 1024,\n"
+"               1Mi = 1048576,\n"
+"               …\n"
 
-#: src/numfmt.c:905
+#: src/numfmt.c:906
 #, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
+"\n"
+"FORMAT måste passa för att skriva ett flyttalsargument �%f�.  En möjlig\n"
+"apostrof (%'f) kommer aktivera --grouping (om det stödjs av den aktuella\n"
+"lokalen).  Ett möjligt värde på bredd (%10f) kommer fylla utdata.  En "
+"möjlig\n"
+"nolla (%010f) i bredden kommer fylla talet med nollor.  Ett möjligt "
+"negativt\n"
+"värde (%-10f) kommer vänsterställa utdata.\n"
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -6896,8 +7042,17 @@ msgid ""
 "diagnosed, but the exit status is 0.  With --invalid='ignore' conversion\n"
 "errors are not diagnosed and the exit status is 0.\n"
 msgstr ""
+"\n"
+"Slutstatus är 0 om alla indatatal kunde konverteras.  Som standard kommer\n"
+"%s sluta vid det första konverteringsfelet med slutstatus 2.  Med\n"
+"--invalid='fail' skrivs en varning för varje konverteringsfel och "
+"slutstatus\n"
+"är 2.  Med --invalid='warn' diagnostiseras varje konverteringsfel, men\n"
+"slutstatus är 0.  Med --invalid='ignore' diagnostiseras inte "
+"konverteringsfel\n"
+"och slutstatusen är 0.\n"
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -6917,113 +7072,130 @@ msgid ""
 "  $ ls -lh | %s --header --field 5 --from=iec --padding=10\n"
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 msgstr ""
+"\n"
+"Exempel:\n"
+"  $ %s --to=si 1000\n"
+"           → �1.0K�\n"
+"  $ %s --to=iec 2048\n"
+"           → �2.0K�\n"
+"  $ %s --to=iec-i 4096\n"
+"           → �4.0Ki�\n"
+"  $ echo 1K | %s --from=si\n"
+"           → �1000�\n"
+"  $ echo 1K | %s --from=iec\n"
+"           → �1024�\n"
+"  $ df | %s --header --field 2 --to=si\n"
+"  $ ls -l | %s --header --field 5 --to=iec\n"
+"  $ ls -lh | %s --header --field 5 --from=iec --padding=10\n"
+"  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, c-format
 msgid "format %s has no %% directive"
 msgstr "målet %s har inget %%-direktiv"
 
-#: src/numfmt.c:990
+#: src/numfmt.c:1003
 #, c-format
 msgid "invalid format %s (width overflow)"
 msgstr "felaktigt format %s (spill i bredden)"
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr "utfyllnad med --format åsidosätter --padding"
+
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr "format %s avslutas med %%"
 
-#: src/numfmt.c:1010
+#: src/numfmt.c:1030
 #, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
-msgstr ""
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
+msgstr "ogiltigt format %s, direktivet måste vara %%[0]['][-][N]f"
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr "format %s har för många %%-direktiv"
 
-#: src/numfmt.c:1070
+#: src/numfmt.c:1081
 #, c-format
-msgid "invalid suffix in input '%s': '%s'"
-msgstr "felaktigt suffix i indata �%s�: %s"
+msgid "invalid suffix in input %s: %s"
+msgstr "felaktigt suffix i indata %s: %s"
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
-msgstr ""
+msgstr "värdet är för stort för att skrivas: �%Lg� (överväg att använda --to)"
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
 msgstr ""
+"värdet är för stort för att skrivas: �%Lg� (kan inte hantera värden > 999Y)"
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
-msgstr ""
+msgid "large input value %s: possible precision loss"
+msgstr "stort indatavärde %s: möjlig förlust av precision"
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
-msgstr ""
+msgstr "indataraden är för kort, inga tal fanns att konvertera i fält %ld"
 
-#: src/numfmt.c:1388
+#: src/numfmt.c:1403
 #, c-format
-msgid "invalid padding value '%s'"
-msgstr "ogiltigt utfyllnadsvärde �%s�"
+msgid "invalid padding value %s"
+msgstr "ogiltigt utfyllnadsvärde %s"
 
-#: src/numfmt.c:1401
+#: src/numfmt.c:1417
 #, c-format
-msgid "invalid field value '%s'"
-msgstr "felaktigt fältvärde �%s�"
+msgid "invalid field value %s"
+msgstr "felaktigt fältvärde %s"
 
-#: src/numfmt.c:1430
+#: src/numfmt.c:1447
 #, c-format
-msgid "invalid header value '%s'"
-msgstr "ogiltigt huvudvärde �%s�"
+msgid "invalid header value %s"
+msgstr "ogiltigt huvudvärde %s"
 
-#: src/numfmt.c:1456
+#: src/numfmt.c:1473
 #, c-format
 msgid "--grouping cannot be combined with --format"
 msgstr "--grouping kan inte kombineras med --format"
 
-#: src/numfmt.c:1458
-#, c-format
-msgid "--padding cannot be combined with --format"
-msgstr "--padding kan inte kombineras med --format"
-
-#: src/numfmt.c:1463
+#: src/numfmt.c:1478
 #, c-format
 msgid "no conversion option specified"
 msgstr "ingen konverteringsflagga angiven"
 
-#: src/numfmt.c:1471
+#: src/numfmt.c:1486
 #, c-format
 msgid "grouping cannot be combined with --to"
 msgstr "gruppering kan inte kombineras med --to"
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
-msgstr ""
+msgstr "gruppering har ingen effekt i den här lokalen"
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
-msgstr ""
+msgstr "--header ignoreras vid kommandoradsindata"
 
-#: src/numfmt.c:1511
+#: src/numfmt.c:1526
 #, c-format
 msgid "error reading input"
 msgstr "fel vid läsning av indata"
 
-#: src/numfmt.c:1520
+#: src/numfmt.c:1535
 #, c-format
 msgid "failed to convert some of the input numbers"
 msgstr "misslyckades att konvertera några av indatatalen"
 
-#: src/od.c:294
+#: src/od.c:320
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -7032,11 +7204,11 @@ msgid ""
 "[b]]\n"
 msgstr ""
 "Användning: %s [FLAGGA]... [FIL]...\n"
-"   eller:   %s [-abcdfilosx]... [FIL] [[+]FÖRSKUTNING[.][b]]\n"
-"   eller:   %s --traditional [FLAGGA]... [FIL] [[+]FÖRSKUTNING[.][b] [+]"
+"   eller:   %s [-abcdfilosx]... [FIL] [[+]FÖRSKJUTNING[.][b]]\n"
+"   eller:   %s --traditional [FLAGGA]... [FIL] [[+]FÖRSKJUTNING[.][b] [+]"
 "[ETIKETT][.][b]]\n"
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -7048,11 +7220,11 @@ msgstr ""
 "\n"
 "Skriv en otvetydig representation, normalt oktala tecken, av FIL till\n"
 "standard ut.  Med mer än ett FIL-argument, slå samman dem i den\n"
-"angivna orningen som indata.  Utan FIL eller om FIL är -, läs standard\n"
+"angivna ordningen som indata.  Utan FIL eller om FIL är -, läs standard\n"
 "in.\n"
 "\n"
 
-#: src/od.c:307
+#: src/od.c:333
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
 "if the last operand begins with + or (if there are 2 operands) a digit.\n"
@@ -7062,39 +7234,42 @@ msgid ""
 "suffixes may be . for octal and b for multiply by 512.\n"
 msgstr ""
 "Om både det första och andra anropsformatet är tillämpligt, används\n"
-"det andra formate om den sista operanden börjar med + eller (om det\n"
+"det andra formatet om den sista operanden börjar med + eller (om det\n"
 "finns två operander) en siffra.  En operand FÖRSKJUTNING betyder -j\n"
 "FÖRSKJUTNING.  ETIKETT är den första skrivna bytens pseudoadress,\n"
 "vilken ökas så länge utmatningen pågår.  För FÖRSKJUTNING och ETIKETT\n"
 "indikerar förstavelserna 0x eller 0X hexadecimalt, ändelser kan vara\n"
 ". för oktalt och b multiplicerar med 512.\n"
 
-#: src/od.c:318
+#: src/od.c:344
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
-"  -A, --address-radix=RADIX   utformat för filpositioner.  RADIX är en av\n"
+"  -A, --address-radix=RADIX   utformat för filpositioner; RADIX är en av\n"
 "                                [doxn], för Decimal, Oktal, Hex eller iNgen\n"
+"      --endian={big|little}   byt plats på indatabyte:ar enligt angiven\n"
+"                                byteordning\n"
 "  -j, --skip-bytes=BYTE       hoppa först över BYTE byte i indata\n"
 
-#: src/od.c:323
+#: src/od.c:350
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
-"  -N, --read-bytes=BYTE       begränsa utmatning till BYTE  byte från "
-"indata\n"
+"  -N, --read-bytes=BYTE       begränsa utmatning till BYTE byte från indata\n"
 "  -S BYTE, --strings[=BYTE]   skriv ut strängar med minst BYTE grafiska "
-"tecken.\n"
+"tecken;\n"
 "                                3 underförstås när BYTE inte anges\n"
 "  -t, --format=TYP            välj format för utmatning\n"
 "  -v, --output-duplicates     använd inte * för att markera undertryckta "
@@ -7103,26 +7278,26 @@ msgstr ""
 "                                32 underförstås när BYTE inte anges\n"
 "      --traditional           acceptera argument i tredje formatet ovan\n"
 
-#: src/od.c:336
+#: src/od.c:363
 msgid ""
 "\n"
 "\n"
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 "\n"
 "\n"
 "Traditionella formatspecifikationer kan blandas, de ackumuleras:\n"
-"  -a   samma som -t a,  välj namngivna tecken, ingorera höga biten\n"
+"  -a   samma som -t a,  välj namngivna tecken, ignorera höga biten\n"
 "  -b   samma som -t o1, välj oktala byte\n"
-"  -c   samma som -t c,  välj ASCII-tecken eller sekvenser med omvänt "
-"snedstreck\n"
-"  -d   samma som -t u2, välj desimala 2-bytenheter utan tecken\n"
+"  -c   samma som -t c,  välj skrivbara tecken eller sekvenser med omvänt\n"
+"                          snedstreck\n"
+"  -d   samma som -t u2, välj decimala 2-byteenheter utan tecken\n"
 
-#: src/od.c:345
+#: src/od.c:372
 msgid ""
 "  -f   same as -t fF, select floats\n"
 "  -i   same as -t dI, select decimal ints\n"
@@ -7136,23 +7311,23 @@ msgstr ""
 "  -l   samma som -t dL, välj decimala långa heltal\n"
 "  -o   samma som -t o2, välj oktala 2-byteenheter\n"
 "  -s   samma som -t d2, välj decimala 2-byteenheter\n"
-"  -x   samma som -t x2, välj hexadecimala 2-bytenheter\n"
+"  -x   samma som -t x2, välj hexadecimala 2-byteenheter\n"
 
-#: src/od.c:353
+#: src/od.c:380
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 "\n"
 "\n"
 "TYP skapas av en eller fler av dessa specifikationer:\n"
 "  a          namngivet tecken, ignorera höga biten\n"
-"  c          ASCII-tecken eller sekvens med omvänt snedstreck\n"
+"  c          skrivbara tecken eller sekvens med omvänt snedstreck\n"
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -7166,7 +7341,7 @@ msgstr ""
 "  u[STORLEK]    decimalt utan tecken, STORLEK byte per heltal\n"
 "  x[STORLEK]    hexadecimalt, STORLEK byte per heltal\n"
 
-#: src/od.c:367
+#: src/od.c:394
 msgid ""
 "\n"
 "SIZE is a number.  For TYPE in [doux], SIZE may also be C for\n"
@@ -7180,14 +7355,18 @@ msgstr ""
 "sizeof(long).  Om TYP är f kan STORLEK också vara F för sizeof(float), D\n"
 "för sizeof(double) eller L för sizeof(long double).\n"
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
 "each output line.\n"
 msgstr ""
+"\n"
+"Att lägga till ett z-suffix till valfri typ visar skrivbara tecken vid "
+"slutet\n"
+"av varje utdatarad.\n"
 
-#: src/od.c:379
+#: src/od.c:406
 msgid ""
 "\n"
 "\n"
@@ -7209,12 +7388,12 @@ msgstr ""
 "  M    1024·1024\n"
 "och så vidare för G, T, P, E, Z, Y.\n"
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, c-format
 msgid "invalid type string %s"
 msgstr "ogiltig typsträng %s"
 
-#: src/od.c:649
+#: src/od.c:690
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7223,7 +7402,7 @@ msgstr ""
 "ogiltig typsträng %s;\n"
 "detta system har ingen %lu-bytes heltalstyp"
 
-#: src/od.c:770
+#: src/od.c:811
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7232,38 +7411,38 @@ msgstr ""
 "ogiltig typsträng %s;\n"
 "detta system har ingen %lu-bytes flyttalstyp"
 
-#: src/od.c:828
+#: src/od.c:869
 #, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr "ogiltigt tecken �%c� i typsträngen %s"
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr "kan inte hoppa förbi slutet på en kombinerad inmatning"
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr ""
 "ogiltig radix för utmatningsadress �%c�; måste vara ett tecken från [doxn]"
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr "ingen typ kan anges när strängar sparas"
 
-#: src/od.c:1810
+#: src/od.c:1863
 msgid "compatibility mode supports at most one file"
 msgstr "kompatibilitetsläge stödjer högst en fil"
 
 # "skip-bytes" och "read-bytes" är flaggor
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr "skip-bytes + read-bytes är för stort"
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr "varning: ogiltig bredd %lu; använder %d i stället"
@@ -7427,12 +7606,12 @@ msgstr "När"
 msgid "Where"
 msgstr "Var"
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr "Användning: %s [FLAGGA]... [ANVÄNDARE]...\n"
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -7442,14 +7621,14 @@ msgid ""
 "  -s              do short format output, this is the default\n"
 msgstr ""
 "\n"
-"  -l             skriv ut i långt format\n"
-"  -b             utelämna användarens hemkatalog och skal i det långa "
+"  -l              skriv ut i långt format för den angivna ANVÄNDAREn\n"
+"  -b              utelämna användarens hemkatalog och skal i det långa "
 "formatet\n"
-"  -h             utelämna användarens projektfil i det långa formatet\n"
-"  -p             utelämna användarens planfil i det långa formatet\n"
-"  -s             skriv ut i kort format\n"
+"  -h              utelämna användarens projektfil i det långa formatet\n"
+"  -p              utelämna användarens planfil i det långa formatet\n"
+"  -s              skriv ut i kort format, detta är standard\n"
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -7458,14 +7637,14 @@ msgid ""
 "                  in short format\n"
 msgstr ""
 "  -f             utelämna raden med kolumnrubriker i kort format\n"
-"  -w             utelämna anävndarens fullständiga namn i kort format\n"
+"  -w             utelämna användarens fullständiga namn i kort format\n"
 "  -i             utelämna användarens fullständiga namn och fjärrvärd i "
 "kort\n"
 "                 format\n"
-"  -q             utelämna användarens fullstädniga namn, fjärrvärd och \n"
+"  -q             utelämna användarens fullständiga namn, fjärrvärd och \n"
 "                 overksamma tiden i kort format\n"
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, c-format
 msgid ""
 "\n"
@@ -7476,10 +7655,10 @@ msgstr ""
 "Ett lättviktigt �finger�-program; skriver ut användarinformation.\n"
 "utmp-filen kommer att vara %s.\n"
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, c-format
 msgid "no username specified; at least one must be specified when using -l"
-msgstr "inget användarnamn angivet; åtminstone ett måsta anges när -l används"
+msgstr "inget användarnamn angivet; åtminstone ett måste anges när -l används"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/pr.c:330
@@ -7694,19 +7873,20 @@ msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
 "  -s[TECKEN], --separator[=TECKEN]\n"
 "                    åtskilj kolumner med ett enda tecken, standard för "
 "TECKEN\n"
-"                    är tabulatortecknet utan -w och �inget tecken� med -w\n"
+"                    är tabulatortecknet utan -w och �inget tecken� med -w.\n"
 "                    -s[TECKEN] slår av avhuggning för alla tre "
 "kolumnflaggorna\n"
 "                    (-KOLUMN|-a KOLUMN|-m) utom när -w är angivet\n"
 
-#: src/pr.c:2827
+#: src/pr.c:2828
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
 "                    separate columns by STRING,\n"
@@ -7722,7 +7902,7 @@ msgstr ""
 "kolumnflaggor\n"
 "  -t, --omit-header  utelämna sidhuvud och sidfot\n"
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 msgid ""
 "  -T, --omit-pagination\n"
 "                    omit page headers and trailers, eliminate any "
@@ -7744,7 +7924,7 @@ msgstr ""
 "                    sätt sidbredd till SIDBREDD (72) kolumner vid utmatning\n"
 "                    med flera textkolumner, -s[TECKEN] slår av (72)\n"
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
 "                    set page width to PAGE_WIDTH (72) characters always,\n"
@@ -7757,7 +7937,7 @@ msgstr ""
 "                    utmatning, hugg av rader utom om flagga -J är satt,\n"
 "                    ingen koppling till -S eller -s\n"
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 msgid ""
 "\n"
 "-t is implied if PAGE_LENGTH <= 10.  With no FILE, or when FILE is -, read\n"
@@ -7781,10 +7961,8 @@ msgstr ""
 "\n"
 
 #: src/printenv.c:69
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
-msgstr ""
-"  -0, --null     avsluta varje utmatad rad med en 0-byte, istället för "
-"nyrad\n"
+msgid "  -0, --null     end each output line with NUL, not newline\n"
+msgstr "  -0, --null     avsluta varje utmatad rad med NOLL, inte nyrad\n"
 
 #: src/printf.c:79
 #, c-format
@@ -7901,12 +8079,12 @@ msgstr "varning: ignorerar överflödiga argument, startar med %s"
 msgid "F. Pinard"
 msgstr "François Pinard"
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, c-format
 msgid "%s (for regexp %s)"
 msgstr "%s (för reguljäruttrycket %s)"
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
@@ -7915,14 +8093,14 @@ msgstr ""
 "Användning: %s [FLAGGA]... [INFIL]... (utan -G)\n"
 "  eller:    %s -G [FLAGGA]... [INFIL [UTFIL]]\n"
 
-#: src/ptx.c:1821
+#: src/ptx.c:1824
 msgid ""
 "Output a permuted index, including context, of the words in the input "
 "files.\n"
 msgstr ""
 "Mata ut ett permuterat index, med sammanhang, av orden i indatafilerna.\n"
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
 "  -G, --traditional              behave more like System V 'ptx'\n"
@@ -7930,10 +8108,10 @@ msgid ""
 msgstr ""
 "  -A, --auto-reference           skriv ut automatiskt genererade referenser\n"
 "  -G, --traditional              uppträd mer som System V:s �ptx�\n"
-"  -F, --flag-truncation=STRÄNG   använd STRÄNG för att markera avhuggnar "
+"  -F, --flag-truncation=STRÄNG   använd STRÄNG för att markera avhuggna "
 "rader\n"
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
 "  -O, --format=roff              generate output as roff directives\n"
@@ -7947,7 +8125,7 @@ msgstr ""
 "  -S, --sentence-regexp=REGUTTR  för radslut eller meningsslut\n"
 "  -T, --format=tex               generera utdata som TeX-direktiv\n"
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -7956,7 +8134,7 @@ msgid ""
 "  -i, --ignore-file=FILE         read ignore word list from FILE\n"
 "  -o, --only-file=FILE           read only word list from this FILE\n"
 msgstr ""
-"  -W, --word-regexp=REGUTTR      använd REGUTTRY för att macha varje "
+"  -W, --word-regexp=REGUTTR      använd REGUTTRY för att matcha varje "
 "nyckelord\n"
 "  -b, --break-file=FIL           ordmellanrumstecken i denna FIL\n"
 "  -f, --ignore-case              gör om gemener till versaler för sortering\n"
@@ -7965,7 +8143,7 @@ msgstr ""
 "  -o, --only-file=FIL            läs lista av ord att endast använda från "
 "FIL\n"
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -7977,15 +8155,15 @@ msgstr ""
 "  -w, --width=ANTAL              utmatningsbredd i kolumner, utan "
 "referenser\n"
 
-#: src/ptx.c:1854
+#: src/ptx.c:1857
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
 "\n"
-"Utan FIL eller om FIL är -, läs standard in.  �-F /� är standard.\n"
+"Utan FIL, eller när FIL är -, läs standard in.  Standard är �-F /�.\n"
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, c-format
 msgid "invalid gap width: %s"
 msgstr "ogiltig gapbredd: %s"
@@ -8007,22 +8185,30 @@ msgstr ""
 "symlänkar\n"
 "  -P, --physical  undvik alla symlänkar\n"
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+"\n"
+"Om ingen flagga anges antas -P.\n"
+
+#: src/pwd.c:169
 #, c-format
 msgid "failed to chdir to %s"
 msgstr "misslyckades att ändra katalog till %s"
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, c-format
 msgid "failed to stat %s"
 msgstr "misslyckades att ta status på %s"
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr "kunde inte hitta katalogpost i %s med matchande i-nod"
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, c-format
 msgid "ignoring non-option arguments"
 msgstr "ignorerar argument som inte är flaggor"
@@ -8032,8 +8218,8 @@ msgstr "ignorerar argument som inte är flaggor"
 msgid "Dmitry V. Levin"
 msgstr "Dmitry V. Levin"
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Användning: %s [FLAGGA]... FIL...\n"
@@ -8078,8 +8264,7 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 "  -m, --canonicalize-missing    gör kanoniskt genom att följa varje "
 "symbolisk\n"
@@ -8090,7 +8275,8 @@ msgstr ""
 "  -q, --quiet,\n"
 "  -s, --silent                  undertryck de flesta meddelanden\n"
 "  -v, --verbose                 rapportera felmeddelanden\n"
-"  -z, --zero                    separera utdata med NOLL istället för nyrad\n"
+"  -z, --zero                    avsluta varje utmatad rad med NOLL, inte "
+"nyrad\n"
 
 #: src/readlink.c:152
 #, c-format
@@ -8117,7 +8303,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 "  -e, --canonicalize-existing  alla komponenter i sökvägen måste finnas\n"
@@ -8130,7 +8316,8 @@ msgstr ""
 "      --relative-base=FIL      skriv absoluta sökvägar om de inte är under "
 "FIL\n"
 "  -s, --strip, --no-symlinks   expandera inte symlänkar\n"
-"  -z, --zero                   separera utdata med NOLL istället för nyrad\n"
+"  -z, --zero                   avsluta varje utmatad rad med NOLL, inte "
+"nyrad\n"
 "\n"
 
 #: src/relpath.c:130
@@ -8147,41 +8334,42 @@ msgstr "%s: gå ner i skrivskyddad katalog %s? "
 msgid "%s: descend into directory %s? "
 msgstr "%s: gå ner i katalog %s? "
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr "%s: ta bort skrivskyddad %s %s? "
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, c-format
 msgid "%s: remove %s %s? "
 msgstr "%s: ta bort %s %s? "
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, c-format
 msgid "removed directory: %s\n"
 msgstr "tog bort katalog: %s\n"
 
-#: src/remove.c:444
+#: src/remove.c:447
 #, c-format
-msgid "cannot remove directory: %s"
-msgstr "kan inte ta bort katalog: %s"
+msgid "refusing to remove %s or %s directory: skipping %s"
+msgstr "vägrar att ta bort %s eller så är %s en katalog: hoppar över %s"
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr "hoppar över %s, eftersom den är på en annan enhet"
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, c-format
 msgid "traversal failed: %s"
 msgstr "traversering misslyckades: %s"
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -8213,19 +8401,19 @@ msgstr ""
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 "  -I                    fråga en gång före mer än tre filer tas bort, eller\n"
-"                          vid rekursiv borttagning.  Mindre påträngande än -"
+"                          vid rekursiv borttagning; mindre påträngande än -"
 "i,\n"
 "                          men skyddar ändå mot de flesta misstag\n"
 "      --interactive[=NÄR]  fråga enligt NÄR: never, once (-I), eller\n"
-"                          always (-i).  Utan NÄR, fråga alltid\n"
+"                          always (-i); utan NÄR, fråga alltid\n"
 
 #: src/rm.c:149
 msgid ""
@@ -8264,7 +8452,7 @@ msgstr ""
 "eller\n"
 "-R) för att ta bort varje uppräknad katalog också, tillsammans med hela "
 "dess\n"
-"inenhåll.\n"
+"innehåll.\n"
 
 #: src/rm.c:168
 #, c-format
@@ -8298,13 +8486,17 @@ msgstr ""
 
 #: src/rm.c:342
 #, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr "%s: ta bort alla argument rekursivt? "
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] "%s: ta bort %zu argument rekursivt? "
+msgstr[1] "%s: ta bort %zu argument rekursivt? "
 
-#: src/rm.c:343
+#: src/rm.c:345
 #, c-format
-msgid "%s: remove all arguments? "
-msgstr "%s: ta bort alla argument? "
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] "%s: ta bort %zu argument? "
+msgstr[1] "%s: ta bort %zu argument? "
 
 #: src/rmdir.c:134 src/rmdir.c:233
 #, c-format
@@ -8359,10 +8551,10 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
-"Kör ett program i en annan säkerhetskontext.\n"
+"Kör ett program i en annan SELinux-säkerhetskontext.\n"
 "Med varken KONTEXT eller KOMMANDO, skriv ut den aktuella "
 "säkerhetskontexten.\n"
 
@@ -8419,41 +8611,46 @@ msgstr "du måste ange -c, -t, -u, -l, -r eller kontext"
 msgid "no command specified"
 msgstr "inget kommando angivet"
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr "%s kan bara användas på en SELinuxkärna"
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, c-format
 msgid "failed to compute a new context"
 msgstr "misslyckades att beräkna en ny kontext"
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, c-format
 msgid "failed to set new user %s"
 msgstr "misslyckades att sätta ny användare %s"
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, c-format
 msgid "failed to set new type %s"
 msgstr "misslyckades att sätta ny typ %s"
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, c-format
 msgid "failed to set new range %s"
 msgstr "misslyckades att sätta nytt intervall %s"
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, c-format
 msgid "failed to set new role %s"
 msgstr "misslyckades att sätta ny roll %s"
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, c-format
 msgid "unable to set security context %s"
 msgstr "kan inte sätta säkerhetskontext %s"
 
+#: src/selinux.c:127 src/selinux.c:300
+#, c-format
+msgid "error canonicalizing %s"
+msgstr "fel vid kanonisering av %s"
+
 #: src/seq.c:68
 #, c-format
 msgid ""
@@ -8486,6 +8683,8 @@ msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
@@ -8493,11 +8692,12 @@ msgstr ""
 "\n"
 "Om FÖRSTA eller ÖKNING utelämnas, sätts de till 1. Det vill säga, en\n"
 "utelämnad ÖKNING sätts till 1 även när SISTA är mindre än FÖRSTA.\n"
-"FÖRSTA, ÖKNING och SISTA tolkas som flyttal.  ÖKNING är normalt\n"
-"positivt om FÖRSTA är mindre än SISTA och ÖKNING är normalt negativt\n"
-"om FÖRSTA är större än SISTA.\n"
+"Sekvensen av tal slutar när summan av det aktuella talet och ÖKNING\n"
+"skulle bli större än SISTA.  FÖRSTA, ÖKNING och SISTA tolkas som\n"
+"flyttalsvärden.  ÖKNING är normalt positivt om FÖRSTA är mindre än\n"
+"SISTA och ÖKNING är normalt negativt om FÖRSTA är större än SISTA.\n"
 
-#: src/seq.c:94
+#: src/seq.c:96
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
 "it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n"
@@ -8507,89 +8707,27 @@ msgstr ""
 "standard är det %.PRECf om FÖRSTA, ÖKNING och SISTA alla är\n"
 "fixpunktsdecimaltal med maximal precision PREC, och annars %g.\n"
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, c-format
 msgid "invalid floating point argument: %s"
 msgstr "felaktigt flyttalsargument: %s"
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr "formatet %s har okänt %%%c-direktiv"
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr "formatsträng får inte anges när strängar med lika bredd skrivs"
 
-#: src/setuidgid.c:49
-#, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-"Användning: %s [KORT-FLAGGA]... ANVÄNDARE KOMMANDO [ARGUMENT]...\n"
-"   eller:   %s LÃ…NG-FLAGGA\n"
-
-#: src/setuidgid.c:55
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-"Släpp eventuella tilläggsgrupper, anta användar-ID och grupp-ID för\n"
-"den angivna ANVÄNDAREn (numeriskt ID eller användarnamn), och kör\n"
-"KOMMANDO med angivna ARGUMENT.  Avsluta med status 111 om det inte\n"
-"gick att anta begärda användar- och grupp-ID.  Annars, avsluta med\n"
-"slutstatus hos KOMMANDO.  Detta program är användbart endast när det\n"
-"körs av root (användar-ID noll).\n"
-"\n"
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-"  -g GID[,GID1...]  sätt också den primära grupp-ID:n till den numeriska "
-"GID,\n"
-"                    och (om angivet) tilläggsgrupp-ID:n till GID1, ...\n"
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr "okänt användar-ID: %s"
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr "för att använda användar-ID %s behöver du använda -g också"
-
-#: src/setuidgid.c:190
-#, c-format
-msgid "failed to set supplemental group(s)"
-msgstr "misslyckades att sätta tilläggsgrupp(er)"
-
-#: src/setuidgid.c:200
-#, c-format
-msgid "cannot set group-ID to %lu"
-msgstr "kan inte sätta grupp-id till %lu"
-
-#: src/setuidgid.c:204
-#, c-format
-msgid "cannot set user-ID to %lu"
-msgstr "kan inte sätta användar-id till %lu"
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr "Colin Plumb"
 
-#: src/shred.c:148
+#: src/shred.c:170
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
 "for even very expensive hardware probing to recover the data.\n"
@@ -8597,7 +8735,7 @@ msgstr ""
 "Skriv över de angivna FIL(erna) upprepade gånger, för att göra det svårare\n"
 "även för väldigt dyra hårdvaruutrustningar att ta fram data.\n"
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -8610,30 +8748,35 @@ msgstr ""
 "      --random-source=FIL  hämta slumpbyte:ar från FIL\n"
 "  -s, --size=N   strimla detta antal byte (ändelse som K, M, G fungerar)\n"
 
-#: src/shred.c:161
+#: src/shred.c:183
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
 "  -z, --zero     add a final overwrite with zeros to hide shredding\n"
 msgstr ""
-"  -u, --remove   stympa och ta bort filen efter överskrivningen\n"
+"  -u, --remove[=HUR]  hugg av och ta bort filen efter överskrivningen; se "
+"nedan\n"
 "  -v, --verbose  följ processen\n"
 "  -x, --exact    avrunda inte filstorlekar upp till nästa hela block;\n"
 "                   detta är standardfallet för icke-normala filer\n"
 "  -z, --zero     lägg till en avslutande överskrivning med nollor för att\n"
 "                   dölja strimlandet\n"
 
-#: src/shred.c:170
+#: src/shred.c:192
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 "\n"
@@ -8642,11 +8785,15 @@ msgstr ""
 "Ta bort FIL(er) om --remove (-u) anges.  Standard är att inte ta bort "
 "filerna\n"
 "för det är vanligt att arbeta på enhetsfiler som /dev/hda, och dessa filer\n"
-"bör inte tas bort.  När man kör på en vanlig fil använder de flesta flaggan\n"
-"--remove.\n"
+"bör inte tas bort.\n"
+"Den frivilliga parametern HUR anger hur katalogposter skall tas bort:\n"
+"�unlink� ⇒ använd ett vanligt anrop av unlink.\n"
+"�wipe� ⇒ förvilla även först byte i namnet.\n"
+"�wipesync� ⇒ synkronisera även varje förvillad byte till disk.\n"
+"Standardläget är �wipesync�, men observera att detta kan vara dyrt.\n"
 "\n"
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -8665,7 +8812,7 @@ msgstr ""
 "lägen:\n"
 "\n"
 
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -8685,7 +8832,7 @@ msgstr ""
 "* filsystem som tar ögonblicksbilder, såsom Network Appliances NFS-server\n"
 "\n"
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -8696,10 +8843,10 @@ msgstr ""
 "* filsystem som mellanlagrar på temporära platser, såsom klienter till\n"
 "NFS version 3\n"
 "\n"
-"* comprimerade filsystem\n"
+"* komprimerade filsystem\n"
 "\n"
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -8720,7 +8867,7 @@ msgstr ""
 "mount (man mount).\n"
 "\n"
 
-#: src/shred.c:215
+#: src/shred.c:241
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
 "of the file that cannot be removed, and that will allow a shredded file\n"
@@ -8731,128 +8878,128 @@ msgstr ""
 "av filen som inte kan tas bort, och som kan göra det möjligt att återta en\n"
 "strimlad fil senare.\n"
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, c-format
 msgid "%s: fdatasync failed"
 msgstr "%s: fdatasync misslyckades"
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr "%s: fsync misslyckades"
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr "%s: kan inte backa till början"
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr "%s: pass %lu/%lu (%s)..."
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, c-format
 msgid "%s: error writing at offset %s"
 msgstr "%s: fel vid skrivning vid position %s"
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s: lseek misslyckades"
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, c-format
 msgid "%s: file too large"
 msgstr "%s: filen är för stor"
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr "%s: pass %lu/%lu (%s)...%s"
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, c-format
 msgid "%s: fstat failed"
 msgstr "%s: fstat misslyckades"
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, c-format
 msgid "%s: invalid file type"
 msgstr "%s: ogiltig filtyp"
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr "%s: filen har negativ storlek"
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, c-format
 msgid "%s: error truncating"
 msgstr "%s: fel vid avhuggning"
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, c-format
 msgid "%s: fcntl failed"
 msgstr "%s: fcntl misslyckades"
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr ""
-"%s: kan inte skriva över filidentiferare som bara är öppnad för tillägg"
+"%s: kan inte skriva över filidentifierare som bara är öppnad för tillägg"
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr "%s: tar bort"
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, c-format
 msgid "%s: renamed to %s"
 msgstr "%s: namnändrad till %s"
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, c-format
 msgid "%s: failed to remove"
 msgstr "%s: misslyckades att ta bort"
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr "%s: borttagen"
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, c-format
 msgid "%s: failed to close"
 msgstr "%s: misslyckades att stänga"
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, c-format
 msgid "%s: failed to open for writing"
 msgstr "%s: misslyckades öppna för skrivning"
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, c-format
 msgid "%s: invalid number of passes"
 msgstr "%s: ogiltigt antal pass"
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, c-format
 msgid "multiple random sources specified"
 msgstr "multipla slumpkällor angivna"
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, c-format
 msgid "%s: invalid file size"
 msgstr "%s: ogiltig filstorlek"
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -8863,11 +9010,11 @@ msgstr ""
 "  eller:    %s -e [FLAGGA]... [ARG]\n"
 "  eller:    %s -i LÅ-HÖ [FLAGGA]...\n"
 
-#: src/shuf.c:54
+#: src/shuf.c:67
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr "Skriv en slumpvis permutation av indataraderna till standard ut.\n"
 
-#: src/shuf.c:60
+#: src/shuf.c:73
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
 "  -i, --input-range=LO-HI   treat each number LO through HI as an input "
@@ -8875,7 +9022,7 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
 msgstr ""
 "  -e, --echo                behandla varje ARG som en indatarad\n"
 "  -i, --input-range=LÅ-HÖ   behandla varje nummer LÅ till HÖ som en "
@@ -8884,33 +9031,43 @@ msgstr ""
 "  -o, --output=FIL          skriv resultatet till FIL istället för standard "
 "ut\n"
 "      --random-source=FIL   hämta slumpbyte:ar från FIL\n"
-"  -z, --zero-terminated     avsluta rader med 0-byte, inte nyrad\n"
+"  -r, --repeat              utskrivna rader kan upprepas\n"
+
+#: src/shuf.c:228
+#, c-format
+msgid "too many input lines"
+msgstr "för många indatarader"
 
-#: src/shuf.c:244
+#: src/shuf.c:431
 #, c-format
 msgid "multiple -i options specified"
 msgstr "multipla -l-flaggor angivna"
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, c-format
 msgid "invalid input range %s"
 msgstr "ogiltigt indataintervall %s"
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, c-format
 msgid "invalid line count %s"
 msgstr "felaktig radantal %s"
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, c-format
 msgid "multiple output files specified"
 msgstr "multipla utfiler angivna"
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, c-format
 msgid "cannot combine -e and -i options"
 msgstr "det går inte att kombinera flaggorna -e och -i"
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr "inga rader att upprepa"
+
 #: src/sleep.c:44
 #, c-format
 msgid ""
@@ -8930,24 +9087,24 @@ msgstr ""
 "(standardval), �m� för minuter, �h� för timmar eller �d� för dagar.\n"
 "Till skillnad från de flesta implementationer som kräver att ANTAL är\n"
 "ett heltal, kan ANTAL här vara ett valfritt flyttal.  Med två eller\n"
-"flera agument, gör paus så länge som summan av dem anger\n"
+"flera argument, gör paus så länge som summan av dem anger\n"
 "\n"
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, c-format
 msgid "invalid time interval %s"
 msgstr "felaktigt tidsintervall: %s"
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr "kan inte läsa realtidsklockan"
 
-#: src/sort.c:399
+#: src/sort.c:427
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr "Skriv en sorterad sammanfogning av alla FIL(er) till standard ut.\n"
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
@@ -8955,7 +9112,7 @@ msgstr ""
 "Sorteringsflaggor:\n"
 "\n"
 
-#: src/sort.c:409
+#: src/sort.c:437
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
 "  -d, --dictionary-order      consider only blanks and alphanumeric "
@@ -8967,7 +9124,7 @@ msgstr ""
 "tecken\n"
 "  -f, --ignore-case           byt gemener mot versaler\n"
 
-#: src/sort.c:415
+#: src/sort.c:443
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
 "  -i, --ignore-nonprinting    consider only printable characters\n"
@@ -8977,13 +9134,13 @@ msgstr ""
 "  -i, --ignore-nonprinting    beakta endast skrivbara tecken\n"
 "  -M, --month-sort            jämför (okänd) < �JAN� < … < �DEC�\n"
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 "  -h, --human-numeric-sort    jämför mänskligt läsbara tal (t.ex., 2K 1G)\n"
 
-#: src/sort.c:423
+#: src/sort.c:451
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
 "  -R, --random-sort           sort by random hash of keys\n"
@@ -8995,7 +9152,7 @@ msgstr ""
 "      --random-source=FIL     hämta slumpbyte:ar från FIL\n"
 "  -r, --reverse               vänd på resultatet av jämförelserna\n"
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -9011,7 +9168,7 @@ msgstr ""
 "  -V, --version-sort          naturlig sortering av (versions)nummer i text\n"
 "\n"
 
-#: src/sort.c:437
+#: src/sort.c:465
 msgid ""
 "Other options:\n"
 "\n"
@@ -9019,7 +9176,7 @@ msgstr ""
 "Andra flaggor:\n"
 "\n"
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
@@ -9027,7 +9184,7 @@ msgstr ""
 "      --batch-size=ANTAL    slå samman högst ANTAL indatafiler åt gången,\n"
 "                            använd temporärfiler för fler\n"
 
-#: src/sort.c:445
+#: src/sort.c:473
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
 "  -C, --check=quiet, --check=silent  like -c, but do not report first bad "
@@ -9042,7 +9199,7 @@ msgstr ""
 "      --compress-program=PROG  komprimera temporärfiler med PROG;\n"
 "                              packa upp dem med PROG -d\n"
 
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -9051,14 +9208,14 @@ msgid ""
 "                            If F is - then read names from standard input\n"
 msgstr ""
 "      --debug               annotera delarna av raden som används för "
-"sotrering,\n"
-"                              och varna om tveksam använding till standard "
+"sortering,\n"
+"                              och varna om tveksam användning till standard "
 "fel\n"
 "      --files0-from=F       läs indata från filerna som anges med\n"
 "                            nollterminerade namn i filen F.\n"
 "                            Om F är - så läs namn från standard in\n"
 
-#: src/sort.c:459
+#: src/sort.c:487
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
 "  -m, --merge               merge already sorted files; do not sort\n"
@@ -9067,7 +9224,7 @@ msgstr ""
 "typ\n"
 "  -m, --merge               slå samman redan sorterade filer, sortera inte\n"
 
-#: src/sort.c:463
+#: src/sort.c:491
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "  -s, --stable              stabilize sort by disabling last-resort "
@@ -9080,7 +9237,7 @@ msgstr ""
 "                              sista-utvägsjämförelse\n"
 "  -S, --buffer-size=STORLEK använd STORLEK för huvudminnesbuffert\n"
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -9107,11 +9264,7 @@ msgstr ""
 "                              utan -c, skriv ut endast den första av flera "
 "lika\n"
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr "  -z, --zero-terminated     avsluta rader med byte 0, inte ny rad\n"
-
-#: src/sort.c:483
+#: src/sort.c:511
 msgid ""
 "\n"
 "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is "
@@ -9133,7 +9286,7 @@ msgstr ""
 "NYCKELDEF är F[.C][FLGR][,F[.C][FLGR]] för start och slutposition, där F är "
 "ett\n"
 "fältnummer och C en teckenpositionen inom fältet; båda börjar på 1, och som\n"
-"standard är slutpositionen radens slut   Om vare sig -t eller -b är på\n"
+"standard är slutpositionen radens slut.   Om vare sig -t eller -b är på\n"
 "räknas tecken i fältet från början av föregående blanktecken.  FLGR är\n"
 "en eller flera enbokstavs ordningsflaggor [bdfgiMhnRrV], vilka ersätter\n"
 "globala ordningsflaggor för den nyckeln.  Om ingen nyckel är angiven, "
@@ -9142,7 +9295,7 @@ msgstr ""
 "\n"
 "STORLEK kan följas av följande multiplikativa ändelser:\n"
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -9163,255 +9316,240 @@ msgstr ""
 "Sätt LC_ALL=C för att få traditionell sorteringsordning som använder\n"
 "de underliggande bytevärdena.\n"
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, c-format
 msgid "waiting for %s [-d]"
 msgstr "väntar på %s [-d]"
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr "%s [-d] avslutade oväntat"
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, c-format
 msgid "cannot create temporary file in %s"
 msgstr "det går inte att skapa en temporärfil i %s"
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr "misslyckades öppna"
 
-#: src/sort.c:970
+#: src/sort.c:998
 msgid "fflush failed"
 msgstr "fflush misslyckades"
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr "misslyckades stänga"
 
-#: src/sort.c:986
-#, c-format
-msgid "dup2 failed"
-msgstr "dup2 misslyckades"
-
-#: src/sort.c:1103
-#, c-format
-msgid "couldn't execute %s"
-msgstr "det gick inte att köra %s"
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 msgid "couldn't create temporary file"
 msgstr "det går inte att skapa temporärfil"
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, c-format
 msgid "couldn't create process for %s -d"
 msgstr "det gick inte att skapa en process för %s -d"
 
-#: src/sort.c:1161
-#, c-format
-msgid "couldn't execute %s -d"
-msgstr "det gick inte att köra %s -d"
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, c-format
 msgid "warning: cannot remove: %s"
 msgstr "varning: kan inte ta bort: %s"
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, c-format
 msgid "invalid --%s argument %s"
 msgstr "felaktigt argument %2$s till --%1$s"
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, c-format
 msgid "minimum --%s argument is %s"
 msgstr "minsta argument till --%s är %s"
 
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, c-format
 msgid "--%s argument %s too large"
 msgstr "argument %2$s till %1$s är för stort"
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr "maximalt argument till --%s vid aktuell rlimit är %s"
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr "antal parallella måste skilt från noll"
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr "misslyckades ta status"
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr "misslyckades läsa"
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, c-format
 msgid "string transformation failed"
 msgstr "strängtransformation misslyckades"
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, c-format
 msgid "the untransformed string was %s"
 msgstr "den otransformerade strängen var %s"
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr "^ ingen match för nyckel\n"
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr "förlegad nyckel %s använd, överväg %s istället"
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr "nyckel %lu har noll bredd och kommer att ignoreras"
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr ""
 "inledande blanksteg är betydande i nyckel %lu, överväg att även ange �b�"
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr "nyckel %lu är numerisk och spänner över flera fält"
 
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
 msgstr[0] "flaggan �-%s� ignoreras"
 msgstr[1] "flaggorna �-%s� ignoreras"
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr "alternativet �-r� gäller bara som en sista utvägs jämförelse"
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
-msgstr "misslyckaes skriva"
+msgstr "misslyckades skriva"
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr "%s: %s:%s: oordning: "
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr "standard fel"
 
-#: src/sort.c:3698
+#: src/sort.c:3738
 msgid "cannot read"
 msgstr "kan inte läsa"
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, c-format
 msgid "%s: invalid field specification %s"
 msgstr "%s: felaktig fältspecifikation %s"
 
-#: src/sort.c:3987
+#: src/sort.c:4028
 #, c-format
 msgid "options '-%s' are incompatible"
 msgstr "flaggorna �-%s� är inkompatibla"
 
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, c-format
 msgid "%s: invalid count at start of %s"
 msgstr "%s: felaktigt antal i början på %s"
 
-#: src/sort.c:4295
+#: src/sort.c:4336
 msgid "invalid number after '-'"
 msgstr "felaktigt nummer efter �-�"
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 msgid "invalid number after '.'"
 msgstr "felaktigt nummer efter �.�"
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr "extra tecken i fältspecifikation"
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, c-format
 msgid "multiple compress programs specified"
 msgstr "multipla komprimeringsprogram angivna"
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
 msgstr "felaktigt nummer vid fältstart"
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
 msgstr "fältnummer är noll"
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr "teckenplats är noll"
 
-#: src/sort.c:4407
+#: src/sort.c:4448
 msgid "invalid number after ','"
 msgstr "felaktigt nummer efter �,�"
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr "tom tabulator"
 
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, c-format
 msgid "cannot read file names from %s"
 msgstr "kan inte läsa filnamn från %s"
 
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr "%s:%lu: ogiltigt filnamn med längd noll"
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, c-format
 msgid "no input from %s"
 msgstr "ingen indata från %s"
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr "använder %s-sorteringsregler"
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr "använder enkel bytejämförelse"
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr "extra operand %s inte tillåten med -%c"
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr "ändelsens längd behöver vara åtminstone %zu"
 
-#: src/split.c:204
+#: src/split.c:203
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr "Användning: %s [FLAGGA]... [INFIL [PREFIX]]\n"
 
-#: src/split.c:208
+#: src/split.c:207
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
 "size is 1000 lines, and default PREFIX is 'x'.  With no INPUT, or when "
@@ -9422,40 +9560,39 @@ msgstr ""
 "Standardstorlek är 1000 rader, och standardprefix är �x�.  Utan INFIL,\n"
 "eller när INFIL är -, läs standard in.\n"
 
-#: src/split.c:216
+#: src/split.c:215
 #, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
 "  -a, --suffix-length=N   använd ändelser av längd N (standard %d)\n"
-"      --additional-suffix=Sändelse  lägg till en extra ÄNDELSE på filnamn.\n"
+"      --additional-suffix=ÄNDELSE  lägg till en extra ÄNDELSE på filnamn\n"
 "  -b, --bytes=STORLEK     placera STORLEK byte i varje utfil\n"
 "  -C, --line-bytes=STORLEK  placera max STORLEK byte med rader per utfil\n"
 "  -d, --numeric-suffixes[=FRÅN]  använd numeriska ändelser istället för\n"
-"                                   alfabetiska.  FRÅN ändrar startvärdet (0\n"
+"                                   alfabetiska; FRÅN ändrar startvärdet (0\n"
 "                                   som standard).\n"
 "  -e, --elide-empty-files  generera inte tomma utfiler med �-n�\n"
 "      --filter=KOMMANDO   skriv till skalKOMMANDO; filnamnet är $FILE\n"
 "  -l, --lines=ANTAL       placera ANTAL rader i varje utfil\n"
-"  -n, --number=BITAR      generera BITAR utfiler.  Se nedan\n"
+"  -n, --number=BITAR      generera BITAR utfiler; se förklaring nedan\n"
 "  -u, --unbuffered        kopiera omedelbart indata till utdata med �-n r/"
 "…�\n"
 "\n"
 
-#: src/split.c:229
+#: src/split.c:228
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
 "                            output file is opened\n"
@@ -9463,7 +9600,7 @@ msgstr ""
 "      --verbose           skriv ett meddelande strax före varje\n"
 "                            utfil öppnas\n"
 
-#: src/split.c:236
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -9483,189 +9620,189 @@ msgstr ""
 "r/N     som �l� men använd turordningsdistribution\n"
 "r/K/N   likadant men mata bara ut K:e av N till standard ut\n"
 
-#: src/split.c:354
+#: src/split.c:353
 #, c-format
 msgid "output file suffixes exhausted"
 msgstr "slut på utfiländelser"
 
-#: src/split.c:366
+#: src/split.c:365
 #, c-format
 msgid "creating file %s\n"
 msgstr "skapar filen %s\n"
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr "%s skulle skriva över indata, avbryter"
 
-#: src/split.c:391
+#: src/split.c:390
 #, c-format
 msgid "failed to set FILE environment variable"
 msgstr "misslyckades att sätta miljövariabeln FILE"
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr "kör med FIL=%s\n"
 
-#: src/split.c:395
+#: src/split.c:394
 #, c-format
 msgid "failed to create pipe"
 msgstr "misslyckades att skapa rör"
 
-#: src/split.c:409
+#: src/split.c:408
 #, c-format
 msgid "closing prior pipe"
 msgstr "stänger tidigare rör"
 
-#: src/split.c:411
+#: src/split.c:410
 #, c-format
 msgid "closing output pipe"
 msgstr "stänger utdatarör"
 
-#: src/split.c:415
+#: src/split.c:414
 #, c-format
 msgid "moving input pipe"
 msgstr "flyttar indatarör"
 
-#: src/split.c:417
+#: src/split.c:416
 #, c-format
 msgid "closing input pipe"
 msgstr "stänger indatafil"
 
-#: src/split.c:422
+#: src/split.c:421
 #, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr "misslyckades att köra kommandot �%s -c %s�"
 
-#: src/split.c:428
+#: src/split.c:427
 #, c-format
 msgid "failed to close input pipe"
 msgstr "misslyckades att stänga indatarör"
 
-#: src/split.c:464
+#: src/split.c:463
 #, c-format
 msgid "waiting for child process"
 msgstr "väntar på barnprocess"
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr "med FILE=%s, signal %s från kommando: %s"
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr "med FILE=%s, slutkod %d från kommando: %s"
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr "okänd status från kommando (0x%X)"
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr "kan inte dela på mer än ett sätt"
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, c-format
 msgid "%s: invalid number of chunks"
 msgstr "%s: ogiltigt antal bitar"
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, c-format
 msgid "%s: invalid chunk number"
 msgstr "%s: felaktigt bitantal"
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr "%s: felaktig ändelselängd"
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr "%s: felaktigt antal byte"
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr "%s: felaktigt antal rader"
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, c-format
 msgid "line count option -%s%c... is too large"
 msgstr "radantalsflagga -%s%c... är för stor"
 
-#: src/split.c:1248
+#: src/split.c:1298
 #, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr "%s: felaktigt startvärde för numerisk ändelse"
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, c-format
 msgid "%s: invalid IO block size"
 msgstr "%s: ogiltig blockstorlek för IO"
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr "--filter bearbetar inte en bit extraherad till standard ut"
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr "numerisk ändelses startvärde är för stort för ändelselängden"
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, c-format
 msgid "%s: cannot determine file size"
 msgstr "%s: kan inte avgöra filstorlek"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr "Michael Meskes"
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, c-format
 msgid "failed to canonicalize %s"
 msgstr "misslyckades att kanonisera %s"
 
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr "varning: okänd sekvens med omvänt snedstreck �\\%c�"
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, c-format
 msgid "%s: invalid directive"
 msgstr "%s: ogiltigt direktiv"
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, c-format
 msgid "warning: backslash at end of format"
 msgstr "varning: omvänt snedstreck vid slutet av formatet"
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr "användning av %s att betyda standard in fungerar inte i filsystemsläge"
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, c-format
 msgid "cannot read file system information for %s"
 msgstr "kan inte läsa filsysteminformation för %s"
 
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, c-format
 msgid "cannot stat standard input"
 msgstr "kan inte ta status på standard in"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -9674,14 +9811,14 @@ msgid ""
 "Inodes: Total: %-10c Free: %d\n"
 msgstr ""
 "  Filen: �%n�\n"
-"     ID: %-8i Namnlängd: %-7öl Typ: %T\n"
+"     ID: %-8i Namnlängd: %-7l Typ: %T\n"
 "Blockstorlek: %-10s Grundläggande blockstorlek: %S\n"
 "Block: Totalt: %-10b Fria: %-10f Tillgängliga: %a\n"
-"Inoder: Totalt: %-10c Free: %d\n"
+"Inoder: Totalt: %-10c Fria: %d\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -9691,30 +9828,30 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr "Enhet: %Dh/%dd\tInod: %-10i  Länkar: %-5h Typ av enhet: %t,%T\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr "Enhet: %Dh/%dd\tInode: %-10i  Länkar:%h\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr "Ã…tkomst: (%04a/%10.10A)  Uid: (%5u/%8U)  Gid: (%5g/%8G)\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, c-format
 msgid "Context: %C\n"
 msgstr "Kontext: %C\n"
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -9726,11 +9863,11 @@ msgstr ""
 "    Ändring: %z\n"
 "       Född: %w\n"
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
 msgstr "Visa fil- eller filsystemstatus.\n"
 
-#: src/stat.c:1356
+#: src/stat.c:1418
 msgid ""
 "  -L, --dereference     follow links\n"
 "  -f, --file-system     display file system status instead of file status\n"
@@ -9738,13 +9875,13 @@ msgstr ""
 "  -L, --dereference     följ länkar\n"
 "  -f, --file-system     visa filsystemstatus istället för filstatus\n"
 
-#: src/stat.c:1360
+#: src/stat.c:1422
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 "  -c  --format=FORMAT   använd angivet FORMAT istället för standardformat;\n"
@@ -9752,11 +9889,11 @@ msgstr ""
 "FORMAT\n"
 "      --printf=FORMAT   som --format, men tolka specialkoder med omvänt\n"
 "                          snedstreck, och skriv inte ut en obligatorisk\n"
-"                          avslutande nyrad.  Om du vill ha en nyrad, ta med\n"
-"                          \\n i FORMAT.\n"
+"                          avslutande nyrad; om du vill ha en nyrad, ta med\n"
+"                          \\n i FORMAT\n"
 "  -t, --terse           skriv informationen på kortfattad form\n"
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 msgid ""
 "\n"
 "The valid format sequences for files (without --file-system):\n"
@@ -9774,9 +9911,9 @@ msgstr ""
 "  %A   åtkomsträttigheter i format läsbart för människa\n"
 "  %b   antal använda block (se %B)\n"
 "  %B   storleken i byte på varje block rapporterat av %b\n"
-"  %C   SELinux säkerhetskontextsträng\n"
+"  %C   SELinux-säkerhetskontextsträng\n"
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 msgid ""
 "  %d   device number in decimal\n"
 "  %D   device number in hex\n"
@@ -9792,7 +9929,7 @@ msgstr ""
 "  %g   grupp-ID på ägare\n"
 "  %G   gruppnamn på ägare\n"
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 msgid ""
 "  %h   number of hard links\n"
 "  %i   inode number\n"
@@ -9801,8 +9938,8 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 "  %h   antal hårda länkar\n"
 "  %i   inodnummer\n"
@@ -9811,10 +9948,10 @@ msgstr ""
 "  %N   citerat filnamn, med dereferens om symbolisk länk\n"
 "  %o   tips om optimal storlek för I/O-överföringar\n"
 "  %s   total storlek, i byte\n"
-"  %t   övre enhetsnummer hexadecimalt\n"
-"  %T   undre enhetsnummer hexadecimalt\n"
+"  %t   övre enhetsnummer hexadecimalt, för tecken-/blockenhetsspecialfiler\n"
+"  %T   undre enhetsnummer hexadecimalt, för tecken-/blockenhetsspecialfiler\n"
 
-#: src/stat.c:1399
+#: src/stat.c:1461
 msgid ""
 "  %u   user ID of owner\n"
 "  %U   user name of owner\n"
@@ -9822,25 +9959,25 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 "  %u   användar-ID på ägare\n"
 "  %U   användarnamn på ägare\n"
 "  %w   filens födelsetid, läsbar för människa, eller - om okänd\n"
 "  %W   filens födelsetid, sekunder sedan Epok, eller 0 om okänd\n"
-"  %x   filens åtkomsttid, läsbar för människa\n"
-"  %X   filens åtkomsttid, sekunder sedan Epok\n"
-"  %y   filens modifieringstid, läsbar för människa\n"
-"  %Y   filens modifieringstid, sekunder sedan Epok\n"
-"  %z   filens ändringstid, läsbar för människa\n"
-"  %Z   filens ändringstid, sekunder sedan Epok\n"
+"  %x   senaste åtkomsttid, läsbar för människa\n"
+"  %X   senaste åtkomsttid, sekunder sedan Epok\n"
+"  %y   senaste datamodifieringstid, läsbar för människa\n"
+"  %Y   senaste datamodifieringstid, sekunder sedan Epok\n"
+"  %z   senaste statusändringstid, läsbar för människa\n"
+"  %Z   senaste statusändringstid, sekunder sedan Epok\n"
 "\n"
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 msgid ""
 "Valid format sequences for file systems:\n"
 "\n"
@@ -9858,7 +9995,7 @@ msgstr ""
 "  %d   fria filnoder i filsystem\n"
 "  %f   fria block i filsystem\n"
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 msgid ""
 "  %i   file system ID in hex\n"
 "  %l   maximum length of filenames\n"
@@ -9885,7 +10022,7 @@ msgstr "Användning: %s FLAGGA... KOMMANDO\n"
 msgid ""
 "Run COMMAND, with modified buffering operations for its standard streams.\n"
 msgstr ""
-"Kör KOMMANDO, med modifierad buffringsoperationer för dess "
+"Kör KOMMANDO, med modifierade buffringsoperationer för dess "
 "standardströmmar.\n"
 
 #: src/stdbuf.c:97
@@ -9929,7 +10066,7 @@ msgstr ""
 "Annars är LÄGE ett tal som kan följas av ett av följande:\n"
 "KB 1000, K 1024, MB 1000·1000, M 1024·1024, och så vidare för G, T, P, E, Z, "
 "Y.\n"
-"I detta fall kommer strömmen vara fullt buffrad med buffertstorleken sattt "
+"I detta fall kommer strömmen vara fullt buffrad med buffertstorleken satt "
 "till\n"
 "LÄGE byte.\n"
 
@@ -9945,28 +10082,33 @@ msgstr ""
 "\n"
 "OBSERVERA: Om KOMMANDO justerar buffringen på sina standardströmmar (�tee� "
 "gör\n"
-"det t.ex.) då kommer detta at åsidosätta motsvarande inställningar ändrade "
+"det t.ex.) då kommer detta att åsidosätta motsvarande inställningar ändrade "
 "av\n"
 "�stdbuf�.  Vidare använder några filter (som �dd� och �cat� etc.) inte "
 "strömmar\n"
 "för I/O, och påverkas alltså inte av �stdbuf�-inställningar.\n"
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, c-format
 msgid "failed to find %s"
 msgstr "misslyckades att hitta %s"
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, c-format
 msgid "failed to update the environment with %s"
 msgstr "misslyckades att uppdatera miljön med %s"
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr "radbuffring av standard in är meningslöst"
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, c-format
+msgid "you must specify a buffering mode option"
+msgstr "du måste ange en flagga för buffringsläge"
+
+#: src/stty.c:516
 #, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -9977,11 +10119,11 @@ msgstr ""
 "    eller:  %s [-F ENHETS | --file=ENHETS] [-a|--all]\n"
 "    eller:  %s [-F ENHETS | --file=ENHETS] [-g|--save]\n"
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
 msgstr "Skriv ut eller ändra terminalkarakteristik.\n"
 
-#: src/stty.c:525
+#: src/stty.c:528
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
 "  -g, --save         print all current settings in a stty-readable form\n"
@@ -9992,7 +10134,7 @@ msgstr ""
 "  -F, --file=ENHET   öppna och använd angiven ENHET istället för standard "
 "in\n"
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
@@ -10003,7 +10145,7 @@ msgstr ""
 "icke-POSIX-inställning.  Det underliggande systemet definierar vilka\n"
 "inställningar som är tillgängliga.\n"
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -10017,7 +10159,7 @@ msgstr ""
 "   eof TECKEN    TECKEN skickar ett filslut (avsluta inmatning)\n"
 "   eol TECKEN    TECKEN avslutar raden\n"
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -10029,7 +10171,7 @@ msgstr ""
 "   intr TECKEN   TECKEN skickar en avbrottssignal\n"
 "   kill TECKEN   TECKEN raderar nuvarande rad\n"
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -10041,7 +10183,7 @@ msgstr ""
 " * rprnt TECKEN  TECKEN ritar om nuvarande rad\n"
 "   start TECKEN  TECKEN startar utskrift igen efter att ha stoppat den\n"
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -10053,7 +10195,7 @@ msgstr ""
 " * swtch TECKEN  TECKEN byter till ett annat skal\n"
 " * werase TECKEN TECKEN raderar det senast skrivna ordet\n"
 
-#: src/stty.c:562
+#: src/stty.c:565
 msgid ""
 "\n"
 "Special settings:\n"
@@ -10063,11 +10205,11 @@ msgid ""
 msgstr ""
 "\n"
 "Specialinställningar:\n"
-"   N             sätt in- och utmatninshastighet till N baud\n"
+"   N             sätt in- och utmatningshastighet till N baud\n"
 " * cols N        säg till kärnan att terminalen har N kolumner\n"
 " * columns N     samma som cols N\n"
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -10081,7 +10223,7 @@ msgstr ""
 "läsning\n"
 "   ospeed N      sätt utmatningshastighet till N\n"
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -10095,7 +10237,7 @@ msgstr ""
 "   time N        med -icanon, sätt timeout för läsning till N tiondels "
 "sekunder\n"
 
-#: src/stty.c:581
+#: src/stty.c:584
 msgid ""
 "\n"
 "Control settings:\n"
@@ -10113,7 +10255,7 @@ msgstr ""
 " * [-]cdtrdse    möjliggör DTR/DSR-handskakning\n"
 "   csN           sätt teckenstorleken till N bitar, N i [5..8]\n"
 
-#: src/stty.c:590
+#: src/stty.c:593
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
 "   [-]hup        send a hangup signal when the last process closes the tty\n"
@@ -10121,6 +10263,7 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 "   [-]cstopb     använd två stoppbitar per tecken (en med �-�)\n"
 "   [-]hup        skicka en påläggningssignal när sista processen stänger "
@@ -10129,8 +10272,9 @@ msgstr ""
 "   [-]parenb     generera paritetsbit i utdata och förvänta paritetsbit i "
 "indata\n"
 "   [-]parodd     ställ in udda paritet (eller jämn paritet med �-�)\n"
+" * [-]cmspar     använd �fast� (märke/blank) paritet\n"
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -10146,7 +10290,7 @@ msgstr ""
 "   [-]ignbrk     ignorera avbrottstecken\n"
 "   [-]igncr      ignorera vagnretur\n"
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -10161,11 +10305,11 @@ msgstr ""
 "   [-]inpck      möjliggör paritetskontroll av indata\n"
 "   [-]istrip     rensa den höga (8:e) biten i ett inmatningstecken\n"
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr " * [-]iutf8      anta inmatningstecken är UTF-8-kodade\n"
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -10182,7 +10326,7 @@ msgstr ""
 "   [-]parmrk     markera paritetsfel (med en 255-0 teckensekvens)\n"
 "   [-]tandem     samma som [-]ixoff\n"
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -10198,25 +10342,25 @@ msgstr ""
 " * ffN           fördröjning på sidmatning, N är [0-1]\n"
 " * nlN           fördröjning på nyrad, N är [0-1]\n"
 
-#: src/stty.c:631
+#: src/stty.c:635
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
 " * [-]onlret     newline performs a carriage return\n"
 msgstr ""
 " * [-]ocrnl      översätt vagnretur till nyrad\n"
-" * [-]ofdel      använd raderingstecken till utfyllnad, istället för "
-"nulltecken\n"
-" * [-]ofill      använd utfyllnadstecken istället för tidstagning \n"
-"                 vid fördröjningar\n"
+" * [-]ofdel      använd raderingstecken till utfyllnad, istället för NOLL-"
+"tecken\n"
+" * [-]ofill      använd utfyllnadstecken istället för tidstagning vid \n"
+"                   fördröjningar\n"
 " * [-]olcuc      översätt gemener till versaler\n"
 " * [-]onlcr      översätt nyrad till vagnretur-nyrad\n"
 " * [-]onlret     nyrad utför vagnretur\n"
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -10232,7 +10376,7 @@ msgstr ""
 " * -tabs         samma som tab3\n"
 " * vtN           fördröjning på vertikal tabulator, N är [0-1]\n"
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -10248,7 +10392,7 @@ msgstr ""
 " * -crtkill      radera hela raden genom att använda inställningarna\n"
 "                 för echoctl och echok\n"
 
-#: src/stty.c:654
+#: src/stty.c:658
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
 "   [-]echo       echo input characters\n"
@@ -10262,7 +10406,7 @@ msgstr ""
 "   [-]echoe      samma som [-]crterase\n"
 "   [-]echok      eka ett nyrad efter ett dödatecken\n"
 
-#: src/stty.c:661
+#: src/stty.c:665
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
 "   [-]echonl     echo newline even if not echoing other characters\n"
@@ -10276,7 +10420,7 @@ msgstr ""
 "   [-]icanon     möjliggör specialtecknen erase, kill, werase och rprnt\n"
 "   [-]iexten     möjliggör specialtecken som inte är POSIX-tecken\n"
 
-#: src/stty.c:668
+#: src/stty.c:672
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
 "   [-]noflsh     disable flushing after interrupt and quit special "
@@ -10293,7 +10437,7 @@ msgstr ""
 " * [-]xcase      tillsammans med icanon, används �\\� som kontrollsekvens\n"
 "                 för versaltecken\n"
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -10307,7 +10451,7 @@ msgstr ""
 "   cbreak        samma som -icanon\n"
 "   -cbreak       samma som icanon\n"
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -10320,7 +10464,7 @@ msgstr ""
 "   -cooked       samma som raw\n"
 "   crt           samma som echoe echoctl echoke\n"
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -10334,7 +10478,7 @@ msgstr ""
 "   ek            radera- och återställtecken till sina standardvärden\n"
 "   evenp         samma som parenb -parodd cs7\n"
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -10350,7 +10494,7 @@ msgstr ""
 "   nl            samma som -icrnl -onlcr\n"
 "   -nl           samma som icrnl -inlcr -igncr onlcr -ocrnl -onlret\n"
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -10364,7 +10508,7 @@ msgstr ""
 "   pass8         samma som -parenb -istrip cs8\n"
 "   -pass8        samma som parenb istrip cs7\n"
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -10376,7 +10520,7 @@ msgstr ""
 "                 -imaxbel -opost -isig -icanon -xcase min 1 time 0\n"
 "   -raw          samma som cooked\n"
 
-#: src/stty.c:716
+#: src/stty.c:720
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
 "                 -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n"
@@ -10392,7 +10536,7 @@ msgstr ""
 "                 -xcase -tostop -echoprt echoctl echoke, \n"
 "                 alla specialtecken till sina standardvärden\n"
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -10406,12 +10550,12 @@ msgstr ""
 "tolkas TECKEN ordagrant, eller kodat som i ^c, 0x37, 0177 eller 127;\n"
 "specialvärdet ^- eller undef används för att stänga av specialtecken.\n"
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, c-format
 msgid "only one device may be specified"
 msgstr "endast en enhet får anges"
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
@@ -10420,43 +10564,43 @@ msgstr ""
 "flaggorna för utförlig och stty-läsbar utmatningsstil är ömsesidigt\n"
 "uteslutande"
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr "när en utmatningstyp specificeras, kan inte inställningar göras"
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr "%s: kan inte starta om icke-blockerande läge"
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, c-format
 msgid "invalid argument %s"
 msgstr "felaktigt argument %s"
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, c-format
 msgid "missing argument to %s"
 msgstr "argument saknas till %s"
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, c-format
 msgid "invalid line discipline %s"
 msgstr "felaktig linjedisciplin %s"
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr "%s: kunde inte utföra alla efterfrågade operationer"
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr "%s: ingen storleksinformation på denna enhet"
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, c-format
 msgid "invalid integer argument %s"
 msgstr "felaktigt heltalsargument %s"
@@ -10514,7 +10658,7 @@ msgstr "      --help     visa denna hjälptext och avsluta\n"
 msgid "      --version  output version information and exit\n"
 msgstr "      --version  visa versionsinformation och avsluta\n"
 
-#: src/system.h:544
+#: src/system.h:543
 msgid ""
 "\n"
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -10523,19 +10667,20 @@ msgstr ""
 "Obligatoriska argument till långa flaggor är obligatoriska även för de "
 "korta.\n"
 
-#: src/system.h:552
+#: src/system.h:551
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 "\n"
-"STORLEK är ett heltal och eventuell enhet (exampel: 10M är 10·1024·1024).\n"
+"Argumentet STORLEK är ett heltal och eventuell enhet (exempel: 10K är "
+"10·1024).\n"
 "Enheter är K, M, G, T, P, E, Z, Y (multiplar av 1024) eller KB, MB, …\n"
 "(multiplar av 1000).\n"
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -10548,38 +10693,37 @@ msgstr ""
 "och miljövariablerna %s_BLOCK_SIZE, BLOCK_SIZE och BLOCKSIZE.  Annars\n"
 "är enheten som standard 1024 byte (eller 512 om POSIXLY_CORRECT är satt).\n"
 
-#: src/system.h:571
+#: src/system.h:570
 #, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
+"%s online help: <%s>\n"
 msgstr ""
 "\n"
-"Rapportera fel i %s till %s.\n"
-"Rapportera kommentarer om översättningen till <tp-sv@listor.tp-sv.se>.\n"
+"%s hjälp på nätet: <%s>\n"
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr ""
 "Rapportera anmärkningar på översättningen av %s till <tp-sv@listor.tp-sv."
 "se>\n"
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr "För fullständig dokumentation, kör: info coreutils '%s invocation'\n"
 
-#: src/system.h:596
+#: src/system.h:591
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Försök med �%s --help� för mer information.\n"
 
-#: src/system.h:628
+#: src/system.h:633
 #, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -10676,88 +10820,81 @@ msgstr ""
 
 #: src/tail.c:270
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
-"  -c, --bytes=K            skriv ut de K sista byten; alternativt, använd -c "
-"+K\n"
-"                           för att skriva ut byte med början på den K:e i "
+"  -c, --bytes=K            skriv ut de K sista byten; eller använd -c +K "
+"för\n"
+"                             att skriva ut byte med början på den K:e i "
 "varje\n"
-"                           fil\n"
+"                             fil\n"
 
 #: src/tail.c:274
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 "  -f, --follow[={namn|filidentifierare}]\n"
 "                           skriv ut nya rader i takt med att filen växer;\n"
-"                           -f, --follow och --follow=descriptor är\n"
-"                           likvärdiga\n"
+"                             ett utelämnat argument betyder "
+"�filidentifierare�\n"
 "  -F                       samma som --follow=name --retry\n"
 
-#: src/tail.c:281
+#: src/tail.c:280
 #, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
 "  -n, --lines=K            skriv ut de sista K raderna istället för de "
 "sista\n"
-"                           %d, eller använd -n +K för att skriva ut rader "
+"                             %d; eller använd -n +K för att skriva ut rader "
 "med\n"
-"                           början från den K:e\n"
+"                             början från den K:e\n"
 "      --max-unchanged-stats=N\n"
-"                           med --follow=name, öppna om en FIL som inte har\n"
-"                           ändrat storlek efter N (standard %d) iterationer\n"
-"                           för att se om den har tagits bort eller ändrat "
-"namn\n"
-"                           (detta är det vanliga fallet för roterade "
-"loggfiler)-\n"
-"                           Med inotify är denna flagga sällan användbar.\n"
+"                           med --follow=name, återöppna en FIL som inte har\n"
+"                             ändrat storlek efter N (standard %d) "
+"iterationer\n"
+"                             för att se om den har tagits bort eller fått "
+"nytt\n"
+"                             namn (detta är det vanliga för roterade "
+"loggfiler);\n"
+"                             med inotify är denna flagga sällan meningsfull\n"
 
-#: src/tail.c:294
+#: src/tail.c:293
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 "      --pid=PID            med -f, avsluta efter att process-id PID dör\n"
 "  -q, --quiet, --silent    skriv aldrig ut huvuden med filnamn\n"
-"      --retry              fortsätt försöka öppan en fil även när den är\n"
-"                             eller blir oåtkomlig; användbart när man "
-"följer\n"
-"                             enligt namn, t.ex., med --follow=namn\n"
+"      --retry              fortsätt försöka öppna en fil om den är "
+"oåtkomlig\n"
 
-#: src/tail.c:301
+#: src/tail.c:298
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 "  -s, --sleep-interval=N   med -f, sov i ungefär N sekunder (standard 1,0)\n"
-"                             mellan iterationer.\n"
-"                             Med inotify och --pid=P, kontrollera process P\n"
-"                             åtminstone var N:e sekund.\n"
+"                             mellan iterationer;\n"
+"                             med inotify och --pid=P, kontrollera process P\n"
+"                             åtminstone var N:e sekund\n"
 "  -v, --verbose            skriv alltid ut huvuden med filnamn\n"
 
-#: src/tail.c:310
+#: src/tail.c:307
 msgid ""
 "\n"
 "If the first character of K (the number of bytes or lines) is a '+',\n"
@@ -10772,10 +10909,10 @@ msgstr ""
 "utmatning med den K:te posten räknat från början av varje fil.  Skriv\n"
 "annars ut de sista K posterna i filen.  K kan ha en multiplikativ ändelse:\n"
 "b 512, kB 1000, K 1024, MB 1000·1000, M 1024·1024,\n"
-"GB 1000·1000·1000, G 1024·1024·1024, and so on for T, P, E, Z, Y.\n"
+"GB 1000·1000·1000, G 1024·1024·1024, och så vidare för T, P, E, Z, Y.\n"
 "\n"
 
-#: src/tail.c:319
+#: src/tail.c:316
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
 "means that even if a tail'ed file is renamed, tail will continue to track\n"
@@ -10792,27 +10929,22 @@ msgstr ""
 "tail följer den namngivna filen på ett sätt som hanterar att dess namn\n"
 "ändras, eller att filen tas bort eller skapas.\n"
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr "stänger %s (fd=%d)"
 
-#: src/tail.c:453
-#, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr "%s: kan inte söka till relativ position %s"
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr "%s: kan inte söka till slut-relativ position %s"
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr "kan inte avgöra platsen för %s.  återgår till pollning"
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
@@ -10821,132 +10953,143 @@ msgstr ""
 "okänd filsystemtyp 0x%08lx för %s.  Rapportera gärna detta till %s.  Återgår "
 "till pollning"
 
-#: src/tail.c:963
+#: src/tail.c:965
+#, c-format
+msgid "%s has been replaced with a symbolic link. giving up on this name"
+msgstr "%s har ersatts av en symbolisk länk.  ger upp detta namn"
+
+#: src/tail.c:980
 #, c-format
 msgid "%s has become inaccessible"
 msgstr "%s har blivit oåtkomlig"
 
-#: src/tail.c:980
+#: src/tail.c:997
 #, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr "%s har ersatts av en fil som inte kan följas; ger upp detta namn"
 
-#: src/tail.c:989
+#: src/tail.c:1006
 #, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr "%s har ersatts av en fjärrfil.  ger upp detta namn"
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, c-format
 msgid "%s has become accessible"
 msgstr "%s har blivit åtkomlig"
 
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr "%s har dykt upp; följer slutet på en ny fil"
 
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr "%s har bytts ut, följer slutet på den nya filen"
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr "%s: kan inte ändra icke-blockerande läge"
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr "%s: filen avhuggen"
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr "inga fler filer"
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, c-format
 msgid "cannot watch parent directory of %s"
 msgstr "kan inte bevaka föräldrakatalog till %s"
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, c-format
 msgid "inotify resources exhausted"
 msgstr "slut på inotify-resurser"
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, c-format
 msgid "cannot watch %s"
 msgstr "kan inte bevaka %s"
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr "fel vid övervakning av inotify-händelse"
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, c-format
 msgid "error reading inotify event"
 msgstr "fel vid läsning av inotify-händelse"
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr "%s: kan inte följa slutet på denna sorts fil, ger upp med detta namn"
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, c-format
 msgid "number in %s is too large"
 msgstr "tal i %s är för stort"
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr "%s: ogiltigt antal oförändrade status mellan öppningar"
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr "%s: felaktigt PID"
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr "%s: ogiltigt antal sekunder"
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr "flagga använd i felaktigt sammanhang -- %c"
 
-#: src/tail.c:2034
+#: src/tail.c:2096
 #, c-format
-msgid "warning: --retry is useful mainly when following by name"
-msgstr "varning: --retry är huvudsakligen användbar när filer följs via namn"
+msgid "warning: --retry ignored; --retry is useful only when following"
+msgstr ""
+"varning: --retry ignoreras; --pid=PID är meningsfull bara när man följer"
+
+#: src/tail.c:2100
+#, c-format
+msgid "warning: --retry only effective for the initial open"
+msgstr "varning: --retry har endast effekt för det ursprungliga öppnandet"
 
-#: src/tail.c:2038
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
 msgstr "varning: PID ignorerad, --pid=PID är användbar bara när man följer"
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
-msgstr "varning: --pid=PID stöds inte på detta system"
+msgstr "varning: --pid=PID stödjs inte på detta system"
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, c-format
 msgid "cannot follow %s by name"
 msgstr "kan inte följa %s vid namn"
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
-msgstr "varning: att följa standar in obegränsat är ineffektivt"
+msgstr "varning: att följa standard in obegränsat är ineffektivt"
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr "inotify kan inte användas, återgår till pollning"
@@ -11060,7 +11203,7 @@ msgstr ""
 "  ( UTTRYCK )                  UTTRYCK är sant\n"
 "  ! UTTRYCK                    UTTRYCK är falskt\n"
 "  UTTRYCK1 -a UTTRYCK2         både UTTRYCK1 och UTTRYCK2 är sanna\n"
-"  UTTRYCK1 -o UTTRYCK2         något av UTTRYCK1 eler UTTRYCK2 är sant\n"
+"  UTTRYCK1 -o UTTRYCK2         något av UTTRYCK1 eller UTTRYCK2 är sant\n"
 
 #: src/test.c:729
 msgid ""
@@ -11145,7 +11288,7 @@ msgid ""
 "  -s FILE     FILE exists and has a size greater than zero\n"
 msgstr ""
 "  -L FIL      FIL finns och är en symbolisk länk (samma som -h)\n"
-"  -O FIL      FIL finns coh ägs av verksam användar-ID\n"
+"  -O FIL      FIL finns och ägs av verksam användar-ID\n"
 "  -p FIL      FIL finns och är ett namngivet rör\n"
 "  -r FIL      FIL finns och läsning är tillåten\n"
 "  -s FIL      FIL finns och har större storlek än noll\n"
@@ -11158,7 +11301,7 @@ msgid ""
 "  -w FILE     FILE exists and write permission is granted\n"
 "  -x FILE     FILE exists and execute (or search) permission is granted\n"
 msgstr ""
-"  -S FIL      FIL existterar och är ett uttag (socket)\n"
+"  -S FIL      FIL existerar och är ett uttag (socket)\n"
 "  -t FI       filidentifierare FI är öppnad mot en terminal\n"
 "  -u FIL      FIL existerar och dess set-user-ID-bit är satt\n"
 "  -w FIL      FIL existerar och skrivning är tillåten\n"
@@ -11216,17 +11359,17 @@ msgstr "extra argument %s"
 msgid "warning: sigprocmask"
 msgstr "varning: sigprocmask"
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr "varning: timer_settime"
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr "varning: timer_create"
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
@@ -11235,44 +11378,43 @@ msgstr ""
 "Användning: %s [FLAGGA] LÖPTID KOMMANDO [ARG]...\n"
 "   eller:   %s [FLAGGA]\n"
 
-#: src/timeout.c:229
+#: src/timeout.c:232
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
 msgstr "Starta KOMMANDO, och döda det om det fortfarande kör efter LÖPTID.\n"
 
-#: src/timeout.c:235
+#: src/timeout.c:238
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
 "      --preserve-status\n"
 "                 avsluta med samma status som KOMMANDO, även när tiden för\n"
-"                 kommandot löper ut\n"
+"                   kommandot löper ut\n"
 "      --foreground\n"
-"                 När timeout inte körs direkt från en skalprompt, låt\n"
-"                 KOMMANDO läsa från TTY:n och ta emot TTY-signaler.  I\n"
-"                 detta läge kommer tiden för barn till KOMMANDO inte gå ut.\n"
+"                 när timeout inte körs direkt från en skalprompt, låt\n"
+"                 KOMMANDO läsa från TTY:n och ta emot TTY-signaler; i\n"
+"                 detta läge kommer tiden för barn till KOMMANDO inte gå ut\n"
 "  -k, --kill-after=LÖPTID\n"
-"                 skicka också en KILL-signal om KOMMANDO fortfarande kör\n"
-"                 så länge efter att den upsprungliga signalen skickades.\n"
+"                 skicka även en KILL-signal om KOMMANDO fortfarande kör så\n"
+"                   här länge efter att den ursprungliga signalen skickades\n"
 "  -s, --signal=SIGNAL\n"
-"                 ange signalen som skall skickas när tiden går ut.\n"
-"                 SIGNAL kan vara ett namn som �HUP� eller ett nummer.\n"
-"                 Se �kill -l� för en lista på signaler.\n"
+"                 ange signalen som skall skickas när tiden går ut;\n"
+"                   SIGNAL kan vara ett namn som �HUP� eller ett nummer;\n"
+"                   se �kill -l� för en lista över signaler\n"
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 msgid ""
 "\n"
 "DURATION is a floating point number with an optional suffix:\n"
@@ -11284,7 +11426,7 @@ msgstr ""
 "�s� för sekunder (standard), �m� för minuter, �h� för timmar eller �d� för\n"
 "dagar.\n"
 
-#: src/timeout.c:259
+#: src/timeout.c:262
 msgid ""
 "\n"
 "If the command times out, and --preserve-status is not set, then exit with\n"
@@ -11305,17 +11447,17 @@ msgstr ""
 "vilket\n"
 "fall slutstatusen är 128+9 istället för 124.\n"
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr "varning: det gick inte att avaktivera minnesdumpar"
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, c-format
 msgid "error waiting for command"
 msgstr "fel vid inväntande av kommando"
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr "det bevakade programmet skrev en minnesdump"
@@ -11516,13 +11658,13 @@ msgid ""
 "  [:xdigit:]      all hexadecimal digits\n"
 "  [=CHAR=]        all characters which are equivalent to CHAR\n"
 msgstr ""
-"  [:graph:]       alla utskrivbara tecken, ej blanka\n"
+"  [:graph:]       alla skrivbara tecken, ej blanka\n"
 "  [:lower:]       alla gemena bokstäver\n"
 "  [:print:]       alla skrivbara tecken, inklusive mellanrum\n"
 "  [:punct:]       alla tecken för interpunktion\n"
 "  [:space:]       alla horisontella och vertikala blanka\n"
 "  [:upper:]       alla versala bokstäver\n"
-"  [:xdigit:]      alla hexidecimala siffror\n"
+"  [:xdigit:]      alla hexadecimala siffror\n"
 "  [=TECKEN=]      alla tecken som är lika med TECKEN\n"
 
 #: src/tr.c:338
@@ -11572,7 +11714,7 @@ msgstr "intervallets ändpunkter för �%s-%s� är i omvänd sorteringsordnin
 #: src/tr.c:829
 #, c-format
 msgid "invalid repeat count %s in [c*n] construct"
-msgstr "ogiltig upprepningsantal %s i konstruktionen [c*n]"
+msgstr "ogiltigt upprepningsantal %s i konstruktionen [c*n]"
 
 #: src/tr.c:910
 #, c-format
@@ -11648,7 +11790,7 @@ msgid ""
 "when translating with complemented character classes,\n"
 "string2 must map all characters in the domain to one"
 msgstr ""
-"vid översättning med kompleterande teckenklasser måste sträng2\n"
+"vid översättning med kompletterande teckenklasser måste sträng2\n"
 "översätta alla tecken i domänen till ett"
 
 #: src/tr.c:1538
@@ -11669,7 +11811,7 @@ msgstr "Två strängar måste ges vid översättning"
 msgid "Only one string may be given when deleting without squeezing repeats."
 msgstr ""
 "Endast en sträng får anges när man tar bort utan att pressa samman\n"
-"upprepaningar."
+"upprepningar."
 
 #: src/true.c:38
 #, c-format
@@ -11725,10 +11867,10 @@ msgstr ""
 #: src/truncate.c:115
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 "  -r, --reference=RFIL   basera storlek på RFIL\n"
-"  -s, --size=STORLEK     ange eller justera filstorlek med STORLEK\n"
+"  -s, --size=STORLEK     ange eller justera filstorlek med STORLEK byte\n"
 
 #: src/truncate.c:121
 msgid ""
@@ -11815,12 +11957,12 @@ msgstr ""
 "FIL.  �Utan FIL eller om FIL är -, läs standard in.\n"
 "\n"
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr "%s: indata innehåller ett udda antal element"
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr "%s: indata innehåller en slinga:"
@@ -11918,12 +12060,12 @@ msgstr "tabulatorer är för långt isär"
 msgid "tab stop value is too large"
 msgstr "tabulatorsteg är för stort"
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr "Användning: %s [FLAGGA]… [INFIL [UTFIL]]\n"
 
-#: src/uniq.c:138
+#: src/uniq.c:174
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
 "writing to OUTPUT (or standard output).\n"
@@ -11935,39 +12077,52 @@ msgstr ""
 "\n"
 "Utan flaggor slås matchande rader samman till den första förekomsten.\n"
 
-#: src/uniq.c:147
+#: src/uniq.c:183
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
 msgstr ""
 "  -c, --count           skriv antalet gånger raden förekom framför raden\n"
-"  -d, --repeated        skriv endast rader som förekommer flera gånger\n"
+"  -d, --repeated        skriv endast repeterade rader, en för varje grupp\n"
+
+#: src/uniq.c:187
+msgid ""
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
+msgstr ""
+"  -D, --all-repeated[=METOD]  skriv ut alla upprepade rader\n"
+"                          grupper kan avdelas med en tom rad\n"
+"                          METOD={none(standard),prepend,separate}\n"
+
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr "  -f, --skip-fields=N   undvik att jämföra de första N fälten\n"
+
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
+msgstr ""
+"      --group[=METOD]   visa alla saker, separera grupper med en tom rad\n"
+"                          METOD={separate(standard),prepend,append,both}\n"
 
-#: src/uniq.c:151
+#: src/uniq.c:199
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
 "  -i, --ignore-case     ignore differences in case when comparing\n"
 "  -s, --skip-chars=N    avoid comparing the first N characters\n"
 "  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
 msgstr ""
-"  -D, --all-repeated[=avgränsningsmetod]  skriv alla upprepade rader\n"
-"                        avgränsningsmetod={none(standard),prepend,separate}\n"
-"                        Avgränsning görs med blanka rader.\n"
-"  -f, --skip-fields=N   undvik jämförelse av de första N fälten\n"
 "  -i, --ignore-case     ignorera skillnader i skiftläge vid jämförelse\n"
 "  -s, --skip-chars=N    undvik jämförelse av de första N tecknen\n"
 "  -u, --unique          skriv endast unika rader\n"
-"  -z, --zero-terminated  avsluta rader med 0-byte, inte nyrad\n"
 
-#: src/uniq.c:161
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr "  -w, --check-chars=N   jämför inte mer än N tecken i rader\n"
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 msgid ""
 "\n"
 "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n"
@@ -11978,7 +12133,7 @@ msgstr ""
 "tabulatorer) och sedan tecken som ej är blanka.  Fält hoppas över före\n"
 "tecken.\n"
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 msgid ""
 "\n"
 "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n"
@@ -11990,24 +12145,34 @@ msgstr ""
 "Du kanske vill sortera indata först, eller använda �sort -u� utan �uniq�.\n"
 "Dessutom, jämförelser tar hänsyn till reglerna som anges av �LC_COLLATE�.\n"
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, c-format
 msgid "too many repeated lines"
 msgstr "för många upprepade rader"
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
 msgstr "ogiltigt antal fält att hoppa över"
 
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
 msgstr "ogiltigt antal byte att hoppa över"
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
 msgstr "ogiltigt antal byte att jämföra"
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr "--group är ömsesidigt uteslutande med -c/-d/-D/-u"
+
+#: src/uniq.c:652
+#, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr "att gruppera och skriva antal repetitioner är meningslöst"
+
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr ""
@@ -12030,11 +12195,6 @@ msgstr ""
 "Anropa funktionen unlink för att ta bort angiven FIL.\n"
 "\n"
 
-#: src/unlink.c:86
-#, c-format
-msgid "cannot unlink %s"
-msgstr "kan inte ta bort %s"
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -12079,7 +12239,7 @@ msgstr[1] "%lu användare"
 msgid ",  load average: %.2f"
 msgstr ",  medellast: %.2f"
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -12090,7 +12250,7 @@ msgstr ""
 "användare på systemet och medelvärdet av antalet jobb i körkön under\n"
 "de senaste 1, 5 och 15 minuterna."
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
@@ -12099,12 +12259,12 @@ msgstr ""
 "  Processer som sover i ett tillstånd\n"
 "som inte går att avbryta bidrar också till lastgenomsnittet.\n"
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr "\n"
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
@@ -12120,7 +12280,7 @@ msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
 "\n"
 msgstr ""
-"Skriv ut vilka som är påloggade enligt FIL.\n"
+"Skriv ut vilka som är inloggade enligt FIL.\n"
 "Om FIL inte är angiven, använd %s.  %s som FIL är vanligt.\n"
 "\n"
 
@@ -12338,152 +12498,5 @@ msgid ""
 "Repeatedly output a line with all specified STRING(s), or 'y'.\n"
 "\n"
 msgstr ""
-"Skriv gång på gång en rad med alla specifierade STRÄNG(ar), eller �y�\n"
-"\n"
-
-#~ msgid "using single-precision arithmetic"
-#~ msgstr "använder aritmetik med enkel precision"
-
-#~ msgid "using arbitrary-precision arithmetic"
-#~ msgstr "använder aritmetik med godtycklig precision"
-
-#~ msgid ""
-#~ "simple_strtod_human:\n"
-#~ "  input string: '%s'\n"
-#~ "  locale decimal-point: '%s'\n"
-#~ msgstr ""
-#~ "simple_strtod_human:\n"
-#~ "  inmatningssträng: �%s�\n"
-#~ "  lokalens decimalkomma: �%s�\n"
-
-#~ msgid ""
-#~ "  parsed numeric value: %Lf\n"
-#~ "  input precision = %d\n"
-#~ msgstr ""
-#~ "  tolkat numeriskt värde: %Lf\n"
-#~ "  inmatningsprecision = %d\n"
-
-#~ msgid "  Auto-scaling, found 'i', switching to base %d\n"
-#~ msgstr "  Automatskalning, hittade �i�, byter till bas %d\n"
-
-#~ msgid "  suffix power=%d^%d = %Lf\n"
-#~ msgstr "  suffixkoeffecient=%d^%d = %Lf\n"
-
-#~ msgid "  returning value: %Lf (%LG)\n"
-#~ msgstr "  returvärde: %Lf (%LG)\n"
-
-#~ msgid "double_to_human:\n"
-#~ msgstr "double_to_human:\n"
-
-#~ msgid "  no scaling, returning (grouped) value: %'.*Lf\n"
-#~ msgstr "  ingen skalning, returnerar (grupperat) värde: %'.*Lf\n"
-
-#~ msgid "  no scaling, returning value: %.*Lf\n"
-#~ msgstr "  ingen skalning, returnerar värdet: %.*Lf\n"
-
-#~ msgid "  scaled value to %Lf * %0.f ^ %d\n"
-#~ msgstr "  skalat värde till %Lf · %0.f ^ %d\n"
-
-#~ msgid "  after rounding, value=%Lf * %0.f ^ %d\n"
-#~ msgstr "  efter avrundning, värde=%Lf · %0.f ^ %d\n"
-
-#~ msgid "  returning value: '%s'\n"
-#~ msgstr "  returnerar värde: �%s�\n"
-
-#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n"
-#~ msgstr "Användning: %s [FLAGGOR] [TAL]\n"
-
-#~ msgid "no valid suffix found\n"
-#~ msgstr "ingen giltig ändelse funnen\n"
-
-#~ msgid "reading %s"
-#~ msgstr "läser %s"
-
-#~ msgid "writing %s"
-#~ msgstr "skriver %s"
-
-#~ msgid "closing %s"
-#~ msgstr "stänger %s"
-
-#~ msgid "accessing %s"
-#~ msgstr "bearbetar %s"
-
-#~ msgid "opening %s"
-#~ msgstr "öppnar %s"
-
-#~ msgid ""
-#~ "  -x, --one-file-system    skip directories on different file systems\n"
-#~ "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
-#~ "      --exclude=PATTERN    exclude files that match PATTERN\n"
-#~ "  -d, --max-depth=N     print the total for a directory (or file, with --"
-#~ "all)\n"
-#~ "                          only if it is N or fewer levels below the "
-#~ "command\n"
-#~ "                          line argument;  --max-depth=0 is the same as\n"
-#~ "                          --summarize\n"
-#~ msgstr ""
-#~ "  -x, --one-file-system   hoppa över kataloger på andra filsystem\n"
-#~ "  -X, --exclude-from=FIL  hoppa över filer som matchar mönster i FIL\n"
-#~ "      --exclude=MÖNSTER   hoppa över filer som matchar MÖNSTER.\n"
-#~ "  -d, --max-depth=N     skriv summan för en katalog (eller fil, med --"
-#~ "all)\n"
-#~ "                          endast om den är N eller färre nivåer nedanför\n"
-#~ "                          kommandoradsargumentet; --max-depth=0 är "
-#~ "detsamma som\n"
-#~ "                          --summarize\n"
-
-#~ msgid ""
-#~ "  none, off       never make backups (even if --backup is given)\n"
-#~ "  numbered, t     make numbered backups\n"
-#~ "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
-#~ "  simple, never   always make simple backups\n"
-#~ "\n"
-#~ msgstr ""
-#~ "  none, off       gör aldrig säkerhetskopior (ens om --backup anges)\n"
-#~ "  numbered, t     gör numrerade säkerhetskopior\n"
-#~ "  existing, nil   numrerade om det redan finns numrerade, annars enkla\n"
-#~ "  simple, never   gör alltid enkla säkerhetskopior\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "WARNING: --page-increment is deprecated; use --line-increment instead"
-#~ msgstr ""
-#~ "VARNING: --page-increment undanbedes, använd --line-increment istället"
-
-#~ msgid "All arguments to long options are mandatory for short options.\n"
-#~ msgstr "Alla argument till långa flaggor är obligatoriska korta flaggor.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "RADIX is d for decimal, o for octal, x for hexadecimal or n for none.\n"
-#~ "BYTES is hexadecimal with 0x or 0X prefix, and may have a multiplier "
-#~ "suffix:\n"
-#~ "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
-#~ "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n"
-#~ "Adding a z suffix to any type displays printable characters at the end of "
-#~ "each\n"
-#~ "output line.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "RADIX är d för decimalt, o för oktalt, x för hexadecimalt eller n för "
-#~ "inget.\n"
-#~ "BYTE är hexadecimalt med 0x eller 0X som prefix, och kan ha ett "
-#~ "multiplikativt\n"
-#~ "suffix:\n"
-#~ "b 512, kB 1000, K 1024, MB 1000·1000, M 1024·1024,\n"
-#~ "GB 1000·1000·1000, G 1024·1024·1024, and so on for T, P, E, Z, Y.\n"
-#~ "Genom att lägga till ett z till någon typ visas skrivbara tecken på "
-#~ "slutet av\n"
-#~ "varje rad.\n"
-
-#~ msgid ""
-#~ "Option --string without a number implies 3; option --width without a "
-#~ "number\n"
-#~ "implies 32.  By default, od uses -A o -t oS -w16.\n"
-#~ msgstr ""
-#~ "Flaggan --string utan ett tal implicerar 3.  Flaggan --width utan ett "
-#~ "tal\n"
-#~ "implicerar 32.  I normalläge använder od -A o -t d2 -w16.\n"
-
-#~ msgid "Usage: %s [OPTION]... FILE\n"
-#~ msgstr "Användning: %s [FLAGGA]... FIL\n"
+"Skriv gång på gång en rad med alla specificerade STRÄNG(ar), eller �y�\n"
+"\n"
diff --git a/po/tr.gmo b/po/tr.gmo
index 8f2edcd8..30301e1e 100644
--- a/po/tr.gmo
+++ b/po/tr.gmo
diff --git a/po/tr.po b/po/tr.po
index e72ab3d5..9087d634 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: coreutils 5.3.0\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
 "PO-Revision-Date: 2005-03-14 04:17+0200\n"
 "Last-Translator: Deniz Akkus Kanca <deniz@arayan.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -39,84 +39,135 @@ msgstr "Geçerli argümanlar:"
 msgid "error closing file"
 msgstr "girdi dosyası %s kapatılıyor"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "yazma hatası"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, fuzzy, c-format
 msgid "preserving permissions for %s"
 msgstr "%s'in izinleri ayarlanıyor"
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "Bilinmeyen sistem hatası"
 
 #
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "normal boÅŸ dosya"
 
 #
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "normal dosya"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "dizin"
 
+#: lib/file-type.c:46
+msgid "symbolic link"
+msgstr "sembolik baÄŸ"
+
+#: lib/file-type.c:52
+msgid "message queue"
+msgstr "ileti kuyruÄŸu"
+
+#: lib/file-type.c:55
+msgid "semaphore"
+msgstr "semafor"
+
+#
+#: lib/file-type.c:58
+msgid "shared memory object"
+msgstr "paylaşımlı bellek nesnesi"
+
+#
+#: lib/file-type.c:61
+msgid "typed memory object"
+msgstr "türlenmiş bellek nesnesi"
+
 #
-#: lib/file-type.c:44
+#: lib/file-type.c:66
 msgid "block special file"
 msgstr "blok özel dosyası"
 
 #
-#: lib/file-type.c:47
+#: lib/file-type.c:69
 msgid "character special file"
 msgstr "karakter özel dosyası"
 
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr ""
+
 #
-#: lib/file-type.c:50
+#: lib/file-type.c:75
 msgid "fifo"
 msgstr "fifo"
 
-#: lib/file-type.c:53
-msgid "symbolic link"
-msgstr "sembolik baÄŸ"
+#: lib/file-type.c:78
+msgid "door"
+msgstr ""
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "soket"
+#
+#: lib/file-type.c:81
+#, fuzzy
+msgid "multiplexed block special file"
+msgstr "blok özel dosyası"
 
-#: lib/file-type.c:59
-msgid "message queue"
-msgstr "ileti kuyruÄŸu"
+#
+#: lib/file-type.c:84
+#, fuzzy
+msgid "multiplexed character special file"
+msgstr "karakter özel dosyası"
 
-#: lib/file-type.c:62
-msgid "semaphore"
-msgstr "semafor"
+#: lib/file-type.c:87
+msgid "multiplexed file"
+msgstr ""
 
 #
-#: lib/file-type.c:65
-msgid "shared memory object"
-msgstr "paylaşımlı bellek nesnesi"
+#: lib/file-type.c:90
+#, fuzzy
+msgid "named file"
+msgstr "garip dosya"
 
 #
-#: lib/file-type.c:68
-msgid "typed memory object"
-msgstr "türlenmiş bellek nesnesi"
+#: lib/file-type.c:93
+#, fuzzy
+msgid "network special file"
+msgstr "blok özel dosyası"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr ""
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr ""
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr ""
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "soket"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr ""
 
 #
-#: lib/file-type.c:70
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "garip dosya"
 
@@ -256,18 +307,18 @@ msgstr "%s: `-W %s' seçeneği argümansız kullanılır\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: `%s' seçeneği bir argümanla kullanılır\n"
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr "%s'in eriÅŸim izinleri deÄŸiÅŸtirilemiyor"
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "%s dizini oluşturulamıyor"
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr "bellek tükendi"
@@ -391,7 +442,7 @@ msgstr "düzenli ifade (regular expression) aramasında hata oluştu"
 msgid "Unmatched ) or \\)"
 msgstr ""
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 #, fuzzy
 msgid "No previous regular expression"
 msgstr "düzenli ifade (regular expression) aramasında hata oluştu"
@@ -417,7 +468,7 @@ msgstr "--no-preserver-root seçeneğini kullanarak bu güvenlik tedbirini aşı
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[eE]"
 
@@ -427,11 +478,11 @@ msgstr "^[eE]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[hH]"
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, c-format
 msgid "setting permissions for %s"
 msgstr "%s'in izinleri ayarlanıyor"
@@ -578,18 +629,6 @@ msgstr "açma işlemi başarısız"
 msgid "Resource lost"
 msgstr ""
 
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, fuzzy, c-format
-msgid "cannot create pipe"
-msgstr "%s fifosu oluşturulamadı"
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, fuzzy, c-format
-msgid "%s subprocess failed"
-msgstr "%s: arama (seek) başarısız"
-
 #: lib/strsignal.c:114
 #, c-format
 msgid "Real-time signal %d"
@@ -798,7 +837,7 @@ msgstr ""
 "Yazılım hatalarını <%s> adresine,\n"
 "çeviri hatalarını <gnu-tr@belgeler.org> adresine bildirin.\n"
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr ""
@@ -808,30 +847,10 @@ msgstr ""
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr ""
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr ""
 
-#: lib/w32spawn.h:43
-#, fuzzy, c-format
-msgid "_open_osfhandle failed"
-msgstr "açma işlemi başarısız"
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr ""
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr ""
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr ""
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr ""
@@ -855,7 +874,7 @@ msgid "failed to reopen %s with mode %s"
 msgstr "%s açılamadı"
 
 #
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr "dizge karşılaştırması başarısız"
@@ -897,15 +916,11 @@ msgid "Simon Josefsson"
 msgstr ""
 
 #: src/base64.c:60
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
 "Base64 encode or decode FILE, or standard input, to standard output.\n"
 msgstr ""
-"Kullanım: %s [SECENEK] [DOSYA]...\n"
-"  veya:  %s [SECENEK] --check [DOSYA]\n"
-"%s (%d-bit) sağlama toplamlarını kontrol eder veya yazar.\n"
-"DOSYA adı verilmediğinde veya - olduğunda standart girdiden okur.\n"
 
 #: src/base64.c:67
 msgid ""
@@ -917,7 +932,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -934,49 +949,48 @@ msgid ""
 "from any other non-alphabet bytes in the encoded stream.\n"
 msgstr ""
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "okuma hatası"
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, fuzzy, c-format
 msgid "invalid input"
 msgstr "geçersiz girdi bayrağı: %s"
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, fuzzy, c-format
 msgid "invalid wrap size: %s"
 msgstr "geçersiz sekme boyutu: %s"
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, c-format
 msgid "extra operand %s"
 msgstr "`%s' operandı fazla"
 
 #
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, c-format
 msgid "closing standard input"
 msgstr "standart girdi kapatılıyor"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -1008,8 +1022,8 @@ msgstr ""
 #: src/basename.c:60
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/basename.c:67
@@ -1023,33 +1037,32 @@ msgid ""
 "  %s -a any/str1 any/str2   -> \"str1\" followed by \"str2\"\n"
 msgstr ""
 
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, c-format
 msgid "missing operand"
 msgstr "eksik iÅŸlenen"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 #, fuzzy
 msgid "Richard M. Stallman"
 msgstr "Torbjorn Granlund ve Richard M. Stallman"
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1102,7 +1115,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr "`%s  üzerinde ioctl başarısız"
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr "standart çıktı"
@@ -1119,15 +1132,15 @@ msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 #, fuzzy
 msgid "Jim Meyering"
 msgstr "Jim Meyering ve Paul Eggert"
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, fuzzy, c-format
 msgid "failed to create security context: %s"
 msgstr "%s'nın sahipliği değiştirilemedi\n"
@@ -1137,8 +1150,8 @@ msgstr "%s'nın sahipliği değiştirilemedi\n"
 msgid "failed to set %s security context component to %s"
 msgstr ""
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, fuzzy, c-format
 msgid "failed to get security context of %s"
 msgstr "%s'nın öznitelikleri alınamadı"
@@ -1148,18 +1161,18 @@ msgstr "%s'nın öznitelikleri alınamadı"
 msgid "can't apply partial context to unlabeled file %s"
 msgstr ""
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, fuzzy, c-format
 msgid "failed to change context of %s to %s"
 msgstr "%s'nın sahipliği %s olarak değiştirilemedi\n"
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
 msgstr "%s'e eriÅŸilemedi"
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, c-format
 msgid "cannot read directory %s"
 msgstr "%s dizini okunamıyor"
@@ -1169,13 +1182,14 @@ msgstr "%s dizini okunamıyor"
 msgid "changing security context of %s\n"
 msgstr "%s'nın erişim izinleri değiştiriliyor"
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, c-format
 msgid "fts_read failed"
 msgstr "fts_read başarısız oldu"
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, fuzzy, c-format
 msgid "fts_close failed"
 msgstr "kapatma işlemi başarısız"
@@ -1193,7 +1207,7 @@ msgstr ""
 
 #: src/chcon.c:357
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
@@ -1214,7 +1228,7 @@ msgid ""
 "  -l, --range=RANGE      set range RANGE in the target security context\n"
 msgstr ""
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 #, fuzzy
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
@@ -1224,18 +1238,11 @@ msgstr ""
 "      --preserve-root    `/' üzerinde döngüsel işlem yapma\n"
 
 #: src/chcon.c:379
-#, fuzzy
 msgid ""
 "      --reference=RFILE  use RFILE's security context rather than "
 "specifying\n"
 "                         a CONTEXT value\n"
 msgstr ""
-"  -f, --silent, --quiet  çoğu hata iletisini bastırır.\n"
-"      --reference=RDOSYA RDOSYA'nın grup değerini kullanır, GRUP değerini\n"
-"                         deÄŸil.\n"
-"  -R, --recursive        dizin ve dosyalar üzerinde çevrimli işlem yapar.\n"
-"  -v, --verbose          işlenen her dosya için bir durum iletisi gösterir.\n"
-"\n"
 
 #: src/chcon.c:383 src/chgrp.c:140 src/chown.c:118
 msgid "  -R, --recursive        operate on files and directories recursively\n"
@@ -1270,36 +1277,37 @@ msgstr ""
 "  -P                     hiç bir sembolik bağı gezmez (öntanımlı)\n"
 "\n"
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr "-R --dereference ile ya -H veya -L kullanılmalıdır"
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr "-R -h ile -P kullanılmalıdır"
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, c-format
 msgid "missing operand after %s"
 msgstr "`%s'den sonra eksik iÅŸlenen"
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, fuzzy, c-format
 msgid "invalid context: %s"
 msgstr "geçersiz kip: %s"
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr ""
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, c-format
 msgid "failed to get attributes of %s"
 msgstr "%s'nın öznitelikleri alınamadı"
@@ -1325,7 +1333,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
@@ -1358,47 +1366,47 @@ msgid ""
 "  %s -hR staff /u  Change the group of /u and subfiles to \"staff\".\n"
 msgstr ""
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
 msgstr "%s'nın yeni öznitelikleri alınıyor"
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr "ne sembolik baÄŸ %s ne de imlediÄŸi dosya deÄŸiÅŸtirilmedi\n"
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, fuzzy, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr "%s'nin kipi %04lo (%s) olarak deÄŸiÅŸtirildi\n"
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, fuzzy, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr "%s'nın kipi %04lo (%s) olarak değiştirilemedi\n"
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr "%s'nin kipi %04lo (%s) olarak korundu\n"
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, fuzzy, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr "%s sembolik bağı oluşturulamadı"
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, c-format
 msgid "changing permissions of %s"
 msgstr "%s'nın erişim izinleri değiştiriliyor"
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, fuzzy, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr "%s'in izinleri ayarlanıyor"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1409,40 +1417,33 @@ msgstr ""
 "  veya:  %s [SEÇENEK]... SEKİZLİK-KİP DOSYA\n"
 "  veya:  %s [SEÇENEK]... --reference=REFDOSYA DOSYA...\n"
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 msgid ""
 "Change the mode of each FILE to MODE.\n"
 "With --reference, change the mode of each FILE to that of RFILE.\n"
 "\n"
 msgstr ""
 
-#: src/chmod.c:391
-#, fuzzy
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
-"  -f, --silent, --quiet  çoğu hata iletisini bastırır.\n"
-"      --reference=RDOSYA RDOSYA'nın grup değerini kullanır, GRUP değerini\n"
-"                         deÄŸil.\n"
-"  -R, --recursive        dizin ve dosyalar üzerinde çevrimli işlem yapar.\n"
-"  -v, --verbose          işlenen her dosya için bir durum iletisi gösterir.\n"
-"\n"
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr ""
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 msgid ""
 "\n"
 "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n"
 msgstr ""
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr "kip ve --reference seçenekleri birleştirilemez"
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, c-format
 msgid "invalid mode: %s"
 msgstr "geçersiz kip: %s"
@@ -1582,26 +1583,21 @@ msgid ""
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr ""
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr "geçersiz grup %s"
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, fuzzy, c-format
 msgid "invalid group list %s"
 msgstr "geçersiz grup %s"
 
-#: src/chroot.c:117
-#, fuzzy, c-format
-msgid "failed to set additional groups"
-msgstr "%s durumlanamadı"
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
@@ -1610,7 +1606,7 @@ msgstr ""
 "Kullanımı: %s [SEÇENEK] YENİKÖK [KOMUT...]\n"
 "    veya:  %s SEÇENEK\n"
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
@@ -1618,13 +1614,13 @@ msgstr ""
 "KOMUT'u kök dizin YENİKÖK olarak çalıştırır.\n"
 "\n"
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
 msgstr ""
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 #, fuzzy
 msgid ""
 "\n"
@@ -1633,28 +1629,42 @@ msgstr ""
 "\n"
 "Eğer komut verilmemişse, ``${SHELL} -i''yi çalıştırır (öntanımlı: /bin/sh).\n"
 
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, c-format
 msgid "cannot change root directory to %s"
 msgstr "kök dizini %s olarak değiştirilemedi"
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, c-format
 msgid "cannot chdir to root directory"
 msgstr "kök dizinine geçilemedi"
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr ""
+
+#: src/chroot.c:383
+#, fuzzy, c-format
+msgid "failed to get supplemental groups"
+msgstr "ek grup listesi alınamadı"
+
+#: src/chroot.c:395
+#, fuzzy, c-format
+msgid "failed to %s supplemental groups"
+msgstr "ek grup atanamadı"
+
+#: src/chroot.c:402
 #, fuzzy, c-format
 msgid "failed to set group-ID"
 msgstr "%s durumlanamadı"
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, fuzzy, c-format
 msgid "failed to set user-ID"
 msgstr "%s durumlanamadı"
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, fuzzy, c-format
 msgid "failed to run command %s"
 msgstr "%s komutu çalıştırılamadı"
@@ -1686,7 +1696,7 @@ msgstr ""
 "Her DOSYA'nın CRC sağlama toplamlarını ve bayt sayılarını yazdırır.\n"
 "\n"
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr "Kullanım: %s [SEÇENEK]... DOSYA1 DOSYA2\n"
@@ -1763,294 +1773,327 @@ msgstr "birden fazla çıktı dosyası belirtilmiş"
 msgid "empty %s not allowed"
 msgstr "-c seçeneği ile ekstra işlenen %s kullanılamaz"
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr "%s'i okunurken hata"
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, c-format
 msgid "cannot lseek %s"
 msgstr "%s'de lseek yapılamadı"
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr "%s'e yazarken hata"
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, fuzzy, c-format
 msgid "%s: failed to get extents info"
 msgstr "%s: silinemedi"
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, fuzzy, c-format
 msgid "%s: write failed"
 msgstr "yazma başarısız oldu"
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, fuzzy, c-format
 msgid "failed to extend %s"
 msgstr "%s açılamadı"
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, fuzzy, c-format
 msgid "clearing permissions for %s"
 msgstr "%s'in izinleri ayarlanıyor"
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "%s'nin sahiplik bilgileri korunamadı"
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
 msgstr "%s dosyasına bakılamadı"
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, c-format
 msgid "failed to preserve authorship for %s"
 msgstr "%s'nin yazar bilgileri korunamadı"
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
+#, fuzzy, c-format
+msgid "failed to set default file creation context to %s"
+msgstr "%s'nın öznitelikleri alınamadı"
+
+#: src/copy.c:820
+#, fuzzy, c-format
+msgid "failed to set default file creation context for %s"
+msgstr "%s'nın öznitelikleri alınamadı"
+
+#: src/copy.c:846
+#, fuzzy, c-format
+msgid "failed to set the security context of %s"
+msgstr "%s'nın öznitelikleri alınamadı"
+
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
 msgid "cannot open %s for reading"
 msgstr "%s okumak için açılamadı"
 
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, c-format
 msgid "cannot fstat %s"
 msgstr "%s'nin dosya durumu (fstat) alınamadı"
 
-#: src/copy.c:820
+#: src/copy.c:935
 #, c-format
 msgid "skipping file %s, as it was replaced while being copied"
 msgstr "kopyalandığı esnada değiştirildiği için %s dosyası atlandı"
 
-#: src/copy.c:850
-#, fuzzy, c-format
-msgid "failed to get file system create context"
-msgstr "standart hatanın kopyası, exec sonunda kapanmaya ayarlanamadı"
-
-#: src/copy.c:864
-#, fuzzy, c-format
-msgid "failed to set the security context of %s to %s"
-msgstr "%s'in grup üyeliği %s olarak değiştirilemedi\n"
-
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
 msgid "cannot remove %s"
 msgstr "%s silinemedi"
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
 msgstr "%s silindi\n"
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr ""
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, c-format
 msgid "cannot create regular file %s"
 msgstr "normal dosya %s oluşturulamadı"
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, fuzzy, c-format
 msgid "failed to clone %s from %s"
 msgstr "%s açılamadı"
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr "%s'in zaman damgaları korundu"
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
 #, fuzzy, c-format
 msgid "failed to close %s"
 msgstr "%s açılamadı"
 
-#: src/copy.c:1471
+#: src/copy.c:1580
 #, fuzzy, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
 msgstr "%s: %s'ın, %04lo kipi gözardı edilerek, üzerine yazılsın mı?"
 
-#: src/copy.c:1478
+#: src/copy.c:1581
+#, c-format
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr ""
+
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
 msgstr "%s: %s'ın üzerine yazılsın mı?"
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr " (yedek: %s)"
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr ""
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, c-format
 msgid "cannot create hard link %s to %s"
 msgstr "%s sabit bağı %s'e bağlanamadı"
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, c-format
 msgid "cannot stat %s"
 msgstr "%s durumlanamadı"
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, c-format
 msgid "omitting directory %s"
 msgstr "%s dizini atlanıyor"
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr "uyarı: %s kaynak dosyası bir defadan çok belirtilmiş"
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
 msgstr "%s ve %s aynı dosya"
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr "Dizin olmayan %s'un üzerine dizin %s yazılamaz"
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr "yeni oluşturulmuş %s'un üzerine %s yazılamaz"
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr "Dizin %s'ın üzerine dizin olmayan bir dosya yazılamaz"
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr "bir dizin, dizin olmayanın üzerine taşınamaz: %s -> %s"
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr "%s'ı yedeklemek kaynağı yok eder;  %s taşınmadı"
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr "%s'ı yedeklemek kaynağı yok eder;  %s kopyalanmadı"
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
 msgstr "%s yedeklenemedi"
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, fuzzy, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr "yeni oluşturulmuş %s'un üzerine %s yazılamaz"
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr "bir dizin, %s, kendi içine kopyalanamaz, %s"
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr "Dizine sabit baÄŸ oluÅŸturulmayacak: sabit baÄŸ %s, dizin %s"
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr "%s kendi alt dizinine taşınamaz, %s"
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, c-format
 msgid "cannot move %s to %s"
 msgstr "%s %s'e taşınamadı"
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr "aygıt arası taşıma başarısız: %s'yı %s'a; hedef silinemedi"
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, fuzzy, c-format
-msgid "failed to set default file creation context to %s"
-msgstr "%s'nın öznitelikleri alınamadı"
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr "çevrimli sembolik bağ %s kopyalanamaz"
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr "%s: göreceli sembolik bağlar yalnızca mevcut dizinde oluşturulabilir"
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr "sembolik bağ %s, %s'e bağlanamadı"
 
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, c-format
 msgid "cannot create fifo %s"
 msgstr "%s fifosu oluşturulamadı"
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, c-format
 msgid "cannot create special file %s"
 msgstr "özel dosya %s oluşturulamadı"
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, c-format
 msgid "cannot read symbolic link %s"
 msgstr "%s sembolik bağı okunamadı"
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, c-format
 msgid "cannot create symbolic link %s"
 msgstr "%s sembolik bağı oluşturulamadı"
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
 msgstr "%s bilinmeyen dosya türüne sahip"
 
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, c-format
 msgid "cannot un-backup %s"
 msgstr "%s yedeklemesi geri alınamadı"
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr "%s -> %s (yedeklemeyi geri al)\n"
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr ""
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr ""
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, fuzzy, c-format
+msgid "unknown program %s"
+msgstr "bilinmeyen kullanıcı kimliği: %s"
+
+#: src/cp.c:157 src/mv.c:288
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -2061,14 +2104,14 @@ msgstr ""
 "  veya:   %s [SEÇENEK]... KAYNAK... DİZİN\n"
 "  veya:   %s [SEÇENEK]... -t DİZİN KAYNAK...\n"
 
-#: src/cp.c:162
+#: src/cp.c:163
 #, fuzzy
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 "KAYNAK'ı HEDEF'e kopyalar veya birden fazla KAYNAK'ı DİZİN'e kopyalar.\n"
 "\n"
 
-#: src/cp.c:168
+#: src/cp.c:169
 #, fuzzy
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
@@ -2090,7 +2133,7 @@ msgstr ""
 "içeriğini kopyalar\n"
 "  -d                           --no-dereference --preserve=link ile aynı\n"
 
-#: src/cp.c:177
+#: src/cp.c:178
 #, fuzzy
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
@@ -2110,20 +2153,20 @@ msgstr ""
 "  -i, --interactive            üzerine yazmadan önce sorar\n"
 "  -H                           komut satırında sembolik bağları izler\n"
 
-#: src/cp.c:186
+#: src/cp.c:187
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
 "  -L, --dereference            always follow symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:190
+#: src/cp.c:191
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
 "                                 a previous -i option)\n"
 "  -P, --no-dereference         never follow symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:195
+#: src/cp.c:196
 #, fuzzy
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
@@ -2145,7 +2188,7 @@ msgstr ""
 "                                 diğer öznitelikler:\n"
 "                                 links,all\n"
 
-#: src/cp.c:203
+#: src/cp.c:204
 #, fuzzy
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
@@ -2155,7 +2198,7 @@ msgstr ""
 "      --parents                kaynak yolunu DÄ°ZÄ°N'in sonuna ekler\n"
 "  -P                           --no-dereference ile aynı\n"
 
-#: src/cp.c:207
+#: src/cp.c:208
 #, fuzzy
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
@@ -2169,7 +2212,7 @@ msgstr ""
 "denemeden\n"
 "                                 siler (--force ile karşılaştır)\n"
 
-#: src/cp.c:213
+#: src/cp.c:214
 #, fuzzy
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
@@ -2186,7 +2229,7 @@ msgstr ""
 "kesmeleri\n"
 "                                 (/) kaldırır\n"
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -2200,7 +2243,7 @@ msgstr ""
 "  -t, --target-directory=DİZİN bütün KAYNAK argümanlarını DİZİN'e taşır\n"
 "  -T, --no-target-directory    HEDEF'i normal bir dosya kabul eder\n"
 
-#: src/cp.c:224
+#: src/cp.c:225
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
 "                                 than the destination file or when the\n"
@@ -2216,7 +2259,15 @@ msgstr ""
 "  -v, --verbose                ne yapıldığını anlatır\n"
 "  -x, --one-file-system        bu dosya sisteminde kalır\n"
 
-#: src/cp.c:233
+#: src/cp.c:232
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/cp.c:240
 #, fuzzy
 msgid ""
 "\n"
@@ -2243,7 +2294,7 @@ msgstr ""
 "kullanın.\n"
 "\n"
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 #, fuzzy
 msgid ""
 "\n"
@@ -2260,7 +2311,7 @@ msgstr ""
 "VERSION_CONTROL çevre değişkeninden belirlenebilir. Geçerli değerler:\n"
 "\n"
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2273,7 +2324,7 @@ msgstr ""
 "basit\n"
 "  simple, never   her zaman basit yedekleme yap\n"
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2285,220 +2336,230 @@ msgstr ""
 "KAYNAK ve HEDEF deÄŸiÅŸkenleri birbirine eÅŸit olup\n"
 "mevcut, normal bir dosyayı gösteriyorlarsa KAYNAK'ın bir yedeğini alır.\n"
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, c-format
 msgid "failed to preserve times for %s"
 msgstr "%s'in zaman damgaları korunamadı"
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, c-format
 msgid "failed to preserve permissions for %s"
 msgstr "%s'in izinleri korunamadı"
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, c-format
 msgid "cannot make directory %s"
 msgstr "dizin %s oluşturulamadı"
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr "%s var ama bir dizin deÄŸil"
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
 #, fuzzy, c-format
 msgid "failed to access %s"
 msgstr "%s açılamadı"
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, c-format
 msgid "missing file operand"
 msgstr "dosya iÅŸleyeni eksik"
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, c-format
 msgid "missing destination file operand after %s"
 msgstr "%s sonrasında hedef dosya işleyeni eksik"
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, fuzzy, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr "--target-directory (-t) ve --no-target-directory (-T) birleÅŸtirilemez"
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, c-format
 msgid "target %s is not a directory"
 msgstr "hedef %s bir dizin deÄŸil"
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, fuzzy, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr "dosya yolları korunurken hedef bir dizin olmalı"
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, c-format
 msgid "multiple target directories specified"
 msgstr "birden fazla hedef dizin belirtilmiÅŸ"
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr ""
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr "hem sabit hem sembolik baÄŸ oluÅŸturulamaz"
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, fuzzy, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr "--string ve --check seçenekleri aynı anda kullanılamaz"
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr ""
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr "yedekleme türü"
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, c-format
+msgid "cannot set target context and preserve it"
+msgstr ""
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr ""
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr ""
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr "girdi yok oldu"
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr "%s: satır sayısı kapsam dışı"
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, fuzzy, c-format
 msgid "%s: %s: line number out of range"
 msgstr "%s: `%s': satır sayısı kapsam dışı"
 
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, c-format
 msgid " on repetition %s\n"
 msgstr " %s tekrarda\n"
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, fuzzy, c-format
 msgid "%s: %s: match not found"
 msgstr "%s: `%s': eşleşme bulunamadı"
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr "düzenli ifade (regular expression) aramasında hata oluştu"
 
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, fuzzy, c-format
 msgid "write error for %s"
 msgstr "`%s' için yazım hatası"
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, c-format
 msgid "%s: integer expected after delimiter"
 msgstr "%s: ayraçtan sonra tamsayı olmalı"
 
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, fuzzy, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr "%s: tekrar sayımında `}' gerekli"
 
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, fuzzy, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr "%s}: `{' ve `}' arasına tamsayı yazılmalı"
 
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, fuzzy, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr "%s: kapatan ayraç `%c' eksik"
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr "%s: geçersiz düzenli ifade(regular expression): %s"
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr "%s: geçersiz kalıp"
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr "%s: satır sayısı 0'dan büyük olmalı"
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, fuzzy, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr "satır numarası `%s' bir önceki satır numarası %s den daha küçük"
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, fuzzy, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr "uyarı: satır numarası `%s' bir önceki satır numarası ile aynı"
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr "sonekte dönüşüm belirleyicisi eksik"
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr "sonekte geçersiz dönüşüm belirleyicisi: %c"
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr "sonekte geçersiz dönüşüm belirleyicisi: \\%.3o"
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, fuzzy, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr "%.*s: geçersiz çevrim tanımı"
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr "sonekte gereğinden fazla %% dönüşüm belirleyicisi var"
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr "sonekte %% dönüşüm belirleyicisi eksik"
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr "%s: geçersiz sayı"
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr "Kullanım: %s [SEÇENEK]... DOSYA KALIP...\n"
 
-#: src/csplit.c:1455
+#: src/csplit.c:1483
 #, fuzzy
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
@@ -2509,7 +2570,7 @@ msgstr ""
 "her parçanın bayt sayısını standart çıktıya yazar.\n"
 "\n"
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, fuzzy, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2520,7 +2581,11 @@ msgstr ""
 "  -f, --prefix=ÖNEK          `xx' yerine ÖNEKi kullanır\n"
 "  -k, --keep-files           hata olduğunda çıktı dosyalarını silmez\n"
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr ""
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
@@ -2531,7 +2596,7 @@ msgstr ""
 "  -s, --quiet, --silent      çıktı dosyalarının bayt büyüklüklerini vermez\n"
 "  -z, --elide-empty-files    boş çıktı dosyalarını siler\n"
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
@@ -2540,7 +2605,7 @@ msgstr ""
 "Eğer DOSYA - olarak verilmişse, standart girdiyi okur. Her KALIP, aşağıdaki\n"
 "seçeneklerden olabilir:\n"
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 #, fuzzy
 msgid ""
 "\n"
@@ -2569,23 +2634,19 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr ""
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr ""
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, fuzzy, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr "Kullanım: %s [SEÇENEK]... [DOSYA]...\n"
 
-#: src/cut.c:193
+#: src/cut.c:176
 #, fuzzy
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr ""
 "Her DOSYA'daki satırların seçilen bölümlerini standart çıktıya yazdırır.\n"
 "\n"
 
-#: src/cut.c:199
+#: src/cut.c:182
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
 "  -c, --characters=LIST   select only these characters\n"
@@ -2595,7 +2656,7 @@ msgstr ""
 "  -c, --characters=LİSTE  sadece bu karakterleri gösterir\n"
 "  -d, --delimiter=AYRAÇ   Alan ayracı olarak TAB yerine AYRAÇ'ı kullanır\n"
 
-#: src/cut.c:204
+#: src/cut.c:187
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
 "                            that contains no delimiter character, unless\n"
@@ -2608,7 +2669,7 @@ msgstr ""
 "                          satırları yazdırır.\n"
 "  -n                      (yoksayılır)\n"
 
-#: src/cut.c:210
+#: src/cut.c:193
 #, fuzzy
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
@@ -2616,7 +2677,7 @@ msgid ""
 msgstr ""
 "      --complement        seçili bayt, karakter veya alan kümelerini tümler\n"
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
@@ -2626,7 +2687,7 @@ msgstr ""
 "      --output-delimeter=DÄ°ZGE\n"
 "                          çıktı ayracı olarak DİZGE'yi kullanır \n"
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2634,7 +2695,7 @@ msgid ""
 "in the same order that it is read, and is written exactly once.\n"
 msgstr ""
 
-#: src/cut.c:227
+#: src/cut.c:210
 #, fuzzy
 msgid ""
 "Each range is one of:\n"
@@ -2659,49 +2720,53 @@ msgstr ""
 "\n"
 "DOSYA belirtilmediÄŸinde veya - olarak verildiÄŸinde standart girdiden okur.\n"
 
-#: src/cut.c:367 src/cut.c:493
+#: src/cut.c:300 src/cut.c:394
 #, fuzzy
 msgid "invalid byte, character or field list"
 msgstr "geçersiz bayt veya alan listesi"
 
-#: src/cut.c:387
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr ""
+
+#: src/cut.c:320
 #, fuzzy
 msgid "invalid range with no endpoint: -"
 msgstr "geçersiz genişlik seçeneği: %s"
 
-#: src/cut.c:403
+#: src/cut.c:334
 #, fuzzy
 msgid "invalid decreasing range"
 msgstr "Geçersiz sayfa aralığı `%s'"
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, c-format
 msgid "byte offset %s is too large"
 msgstr "bayt görecesi %s çok büyük"
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, c-format
 msgid "field number %s is too large"
 msgstr "alan numarası %s çok büyük"
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr "sadece bir liste türü belirtilebilir"
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr "ayraç tek karakter olmalıdır"
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr "bayt, karakter ya da alan listesi belirtilmelidir"
 
-#: src/cut.c:850
+#: src/cut.c:790
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr "sadece alanlar üzerinde işlem yaparken bir ayraç belirtilebilir"
 
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
@@ -2709,11 +2774,11 @@ msgstr ""
 "ayrılmamış alanları atlamak sadece alanlar üzerinde işlem\n"
 "\tyapılırken anlamlı"
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr "alan listesi eksik"
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr "konum listesi eksik"
 
@@ -2731,6 +2796,7 @@ msgid "Display the current time in the given FORMAT, or set the system date.\n"
 msgstr ""
 
 #: src/date.c:134
+#, fuzzy
 msgid ""
 "  -d, --date=STRING         display time described by STRING, not 'now'\n"
 "  -f, --file=DATEFILE       like --date once for each line of DATEFILE\n"
@@ -2739,6 +2805,18 @@ msgid ""
 "                            'hours', 'minutes', 'seconds', or 'ns' for date\n"
 "                            and time to the indicated precision.\n"
 msgstr ""
+"Verilen BİÇEMde zamanı gösterir, ya da sistem zamanını değiştirir.\n"
+"\n"
+"  -d, --date=DİZGE       DIZGE ile tanımlanan zamanı gösterir, şimdiki "
+"zamanı\n"
+"                         deÄŸil\n"
+"  -f, --file=DOSYA       DOSYAnın her satırı için  --date uygulanır\n"
+"      --iso-8601[=BİRİM] ISO-8601 uyumlu tarih/zaman dizgesi gösterir.\n"
+"                         BİRİM=`date' sadece tarihi (öntanımlı),\n"
+"                         `hours', `minutes', `seconds' veya `ns' ile tarih "
+"ve\n"
+"                         zaman 'saat', 'dakika', 'saniye' veya nanosaniye\n"
+"                         hassasiyetinde gösterilir.\n"
 
 #: src/date.c:142
 #, fuzzy
@@ -2762,7 +2840,7 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 
 #: src/date.c:158
@@ -2948,10 +3026,10 @@ msgid ""
 "  $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n"
 msgstr ""
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr "standart girdi"
@@ -2992,7 +3070,7 @@ msgstr ""
 msgid "cannot set date"
 msgstr "tarih ayarlanamadı"
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, c-format
 msgid "time %s is out of range"
 msgstr "%s zamanı aralık dışı"
@@ -3003,7 +3081,7 @@ msgstr "%s zamanı aralık dışı"
 msgid "Paul Rubin"
 msgstr ""
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
@@ -3012,7 +3090,7 @@ msgstr ""
 "Kullanımı: %s [İŞLEYEN]...\n"
 "    veya:  %s SEÇENEK\n"
 
-#: src/dd.c:526
+#: src/dd.c:532
 #, fuzzy
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
@@ -3032,7 +3110,7 @@ msgstr ""
 "  count=BLOK      yalnızca BLOK sayıda girdi bloğu kopyalar\n"
 "  ibs=BAYT        bir seferde BAYT bayt okur\n"
 
-#: src/dd.c:535
+#: src/dd.c:541
 #, fuzzy
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
@@ -3053,7 +3131,7 @@ msgstr ""
 "  seek=BLOK       çıktının başında obs boyunda BLOK sayısında blok atlar\n"
 "  skip=BLOK       girdinin başında ibs boyunda BLOK sayısında blok atlar\n"
 
-#: src/dd.c:546
+#: src/dd.c:552
 #, fuzzy
 msgid ""
 "\n"
@@ -3072,7 +3150,7 @@ msgstr ""
 "Her CONV sembolü:\n"
 "\n"
 
-#: src/dd.c:555
+#: src/dd.c:561
 #, fuzzy
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
@@ -3103,7 +3181,7 @@ msgstr ""
 "yerine\n"
 "            boÅŸlukla doldurur\n"
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -3119,7 +3197,7 @@ msgstr ""
 "  fdatasync bitirmeden önce çıktı dosya verisini fiziken yazdırır\n"
 "  fsync     fdatasync gibi fakat ek olarak meta veriyi de yazdırır\n"
 
-#: src/dd.c:576
+#: src/dd.c:582
 #, fuzzy
 msgid ""
 "\n"
@@ -3133,81 +3211,81 @@ msgstr ""
 "\n"
 "  append    ekleme kipi (yalnız çıktı için geçerli)\n"
 
-#: src/dd.c:583
+#: src/dd.c:589
 #, fuzzy
 msgid "  cio       use concurrent I/O for data\n"
 msgstr "  direct    veri için direkt I/O kullanır\n"
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr "  direct    veri için direkt I/O kullanır\n"
 
-#: src/dd.c:587
+#: src/dd.c:593
 #, fuzzy
 msgid "  directory  fail unless a directory\n"
 msgstr "  direct    veri için direkt I/O kullanır\n"
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr "  dsync    veri için senkron I/O kullanır\n"
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr "  sync      önceki gibi fakat meta veri için de geçerli\n"
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr "  nonblock  bloklamayan I/O kullanır\n"
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr ""
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr ""
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr ""
 "  noctty    dosyadan kontrol eden terminali ayarlamaz\n"
 " terminal from file\n"
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr "  nofollow  sembolik bağları izlemez\n"
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr ""
 
-#: src/dd.c:610
+#: src/dd.c:616
 #, fuzzy
 msgid "  binary    use binary I/O for data\n"
 msgstr "  direct    veri için direkt I/O kullanır\n"
 
-#: src/dd.c:612
+#: src/dd.c:618
 #, fuzzy
 msgid "  text      use text I/O for data\n"
 msgstr "  direct    veri için direkt I/O kullanır\n"
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr ""
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3237,28 +3315,38 @@ msgstr ""
 "Seçenekler:\n"
 "\n"
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
 "%<PRIuMAX>+%<PRIuMAX> records out\n"
 msgstr ""
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, fuzzy, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
 msgstr[0] "budanmış kayıt"
 msgstr[1] "budanmış kayıt"
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, fuzzy, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
 msgstr[0] "%s bayt (%s) kopyalandı"
 msgstr[1] "%s bayt (%s) kopyalandı"
 
-#: src/dd.c:720
+#: src/dd.c:785
 #, fuzzy
 msgid "Infinity B"
 msgstr "Sonsuz"
@@ -3273,90 +3361,90 @@ msgstr "Sonsuz"
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, fuzzy, c-format
 msgid ", %g s, %s/s\n"
 msgstr ", %g saniye, %s/s\n"
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, c-format
 msgid "closing input file %s"
 msgstr "girdi dosyası %s kapatılıyor"
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr "çıktı dosyası %s kapatılıyor"
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, fuzzy, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr "%s dizinine chdir başarısız"
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, c-format
 msgid "writing to %s"
 msgstr "%s'e yazılıyor"
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, c-format
 msgid "unrecognized operand %s"
 msgstr "geçersiz işleyen %s"
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 #, fuzzy
 msgid "invalid conversion"
 msgstr "geçersiz dönüşüm: %s"
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 #, fuzzy
 msgid "invalid input flag"
 msgstr "geçersiz girdi bayrağı: %s"
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 #, fuzzy
 msgid "invalid output flag"
 msgstr "geçersiz çıktı bayrağı: %s"
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 #, fuzzy
 msgid "invalid status flag"
 msgstr "geçersiz durum bayrağı: %s"
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, c-format
 msgid "invalid number %s"
 msgstr "geçersiz sayı %s"
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr "{ascii, ebcdic, ibm} deÄŸerlerinin herhangi ikisi birleÅŸtirilemez"
 
 #
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, c-format
 msgid "cannot combine block and unblock"
 msgstr "`block' ve `unblock' seçenekleri aynı anda kullanılamaz"
 
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, c-format
 msgid "cannot combine lcase and ucase"
 msgstr ""
 "`lcase' (küçük harf) ve `ucase' (büyük harf) seçenekleri aynı anda "
 "kullanılamaz"
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, c-format
 msgid "cannot combine excl and nocreat"
 msgstr "`excl' ve `nocreat' seçenekleri birleştirilemez"
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, fuzzy, c-format
 msgid "cannot combine direct and nocache"
 msgstr "`excl' ve `nocreat' seçenekleri birleştirilemez"
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
@@ -3366,168 +3454,167 @@ msgstr ""
 "alternatifler\n"
 "  kullanılıyor -- tür listesi için <sys/mtio.h>'e bakın"
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, fuzzy, c-format
 msgid "%s: cannot skip"
 msgstr "%s: aranamadı"
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, c-format
 msgid "%s: cannot seek"
 msgstr "%s: aranamadı"
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr "%s dosya okunurken görece taşması"
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, fuzzy, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr "uyarı: başarısız okumadan sonra garip dosya atlaması"
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr "çekirdek hatası bertaraf edilemedi"
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, c-format
 msgid "setting flags for %s"
 msgstr "%s için seçenekler belirtiliyor"
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, fuzzy, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr "%s: görece %s'ye ilerlenemiyor (seek)"
 
-#: src/dd.c:2133
+#: src/dd.c:2172
 #, fuzzy, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
 msgstr "çıktı dosyasında %s bayt ileriye gidildi %s"
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr "%s için fdatasync başarısız"
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
 msgstr "%s için fsync başarısız"
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, c-format
 msgid "failed to open %s"
 msgstr "%s açılamadı"
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
 "blocks"
 msgstr ""
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, fuzzy, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr "çıktı dosyasında %s bayt ileriye gidildi %s"
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, fuzzy, c-format
 msgid "failed to discard cache for: %s"
 msgstr "%s dizinine chdir başarısız"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr ""
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr "Dosyasistemi"
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr "Tür"
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr "blok"
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr "Dolu"
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr "BoÅŸ"
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr "Kull%"
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr "Dosyaindeksi"
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr "Dolu"
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr "BoÅŸ"
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr "IKull%"
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr "Bağlanılan yer"
 
-#: src/df.c:383
-#, c-format
-msgid "option --output: field '%s' unknown"
+#: src/df.c:207
+msgid "File"
 msgstr ""
 
-#: src/df.c:390
+#: src/df.c:387
+#, fuzzy, c-format
+msgid "option --output: field %s unknown"
+msgstr "çıktı dosyası %s kapatılıyor"
+
+#: src/df.c:394
 #, fuzzy, c-format
-msgid "option --output: field '%s' used more than once"
+msgid "option --output: field %s used more than once"
 msgstr "uyarı: %s kaynak dosyası bir defadan çok belirtilmiş"
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr "Boy"
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr "BoÅŸ"
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr "Kapasite"
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
 msgstr ""
 
-#: src/df.c:1210
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr ""
+
+#: src/df.c:1384
 #, fuzzy
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
@@ -3537,26 +3624,20 @@ msgstr ""
 "veya öntanımlı olarak bütün dosyasistemleri hakkında bilgi gösterir.\n"
 "\n"
 
-#: src/df.c:1217
-#, fuzzy
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
-"  -a, --all             0 bloÄŸa sahip dosyasistemlerini de dahil eder.\n"
-"  -b  --block-size=BOY  BOY baytlık bloklar kullanır\n"
-"  -h, --human-readable  boyutları insan okuyabilir biçemde gösterir\n"
-"                        (örn., 1K 234M 2G)\n"
-"  -H, --si              yukarıdaki gibi fakat 1000'in katlarını kullanır,\n"
-"                        1024'ün değil.\n"
 
-#: src/df.c:1227
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -3570,7 +3651,7 @@ msgstr ""
 "      --no-sync         (öntanımlı) kullanım bilgisini almadan önce sync\n"
 "                        yapmaz\n"
 
-#: src/df.c:1234
+#: src/df.c:1409
 #, fuzzy
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
@@ -3592,43 +3673,34 @@ msgstr ""
 "                        dosyasistemleri ile sınırlar\n"
 "  -v                    (yoksayılır)\n"
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
 
-#: src/df.c:1285
+#: src/df.c:1460
 #, fuzzy, c-format
 msgid "options %s and %s are mutually exclusive"
-msgstr "tarih belirten bu seçenekler birlikte kullanılamaz"
-
-#: src/df.c:1335
-#, fuzzy
-msgid "warning: "
-msgstr "Uyarı: "
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr ""
+msgstr "--string ve --check seçenekleri aynı anda kullanılamaz"
 
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr "dosyasistem türü %s hem seçili hem dışarlanmış"
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr "Uyarı: "
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 #, fuzzy
 msgid "cannot read table of mounted file systems"
 msgstr "%s bağlanmış dosyasistemleri tablosu okunamadı"
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr ""
@@ -3638,7 +3710,7 @@ msgstr ""
 msgid "H. Peter Anvin"
 msgstr ""
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr "Kullanım: %s [SEÇENEK]... [DOSYA]\n"
@@ -3732,7 +3804,7 @@ msgstr ""
 
 #: src/dirname.c:59
 #, fuzzy
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
 msgstr ""
 " -z, --zero-terminated     satırları  satır-sonu karakteri (\\n) \n"
 "                          yerine 0'la (0 baytı) bitirir\n"
@@ -3747,7 +3819,7 @@ msgid ""
 "  %s stdio.h            -> \".\"\n"
 msgstr ""
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -3756,7 +3828,7 @@ msgstr ""
 "Kullanım: %s [SEÇENEK]... DOSYA\n"
 "  veya:   %s [SEÇENEK]... --files0-from=F\n"
 
-#: src/du.c:274
+#: src/du.c:285
 #, fuzzy
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr ""
@@ -3764,11 +3836,10 @@ msgstr ""
 "\n"
 
 #
-#: src/du.c:280
+#: src/du.c:291
 #, fuzzy
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3789,12 +3860,12 @@ msgstr ""
 "  -c, --total           toplam hesaplar\n"
 "  -D, --dereference-args  sembolik bağ olduğu zaman DOSYA'ları takip eder\n"
 
-#: src/du.c:289
+#: src/du.c:300
 #, fuzzy
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3815,15 +3886,16 @@ msgstr ""
 "                        seviye aşağıda ise gösterir. \n"
 "                        --max-depth=0, --summarize ile aynıdır.\n"
 
-#: src/du.c:302
+#: src/du.c:313
 #, fuzzy
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
 "      --files0-from=F   F dosyasında isimleri belirtilen, sonu NUL ile "
 "biten\n"
@@ -3838,7 +3910,7 @@ msgstr ""
 "  -k                    --block-size=1K gibi\n"
 "  -l, --count-links     Eğer sabit bağ var ise, boyları toplama tekrar alır\n"
 
-#: src/du.c:310
+#: src/du.c:322
 msgid ""
 "  -k                    like --block-size=1K\n"
 "  -L, --dereference     dereference all symbolic links\n"
@@ -3846,12 +3918,13 @@ msgid ""
 "  -m                    like --block-size=1M\n"
 msgstr ""
 
-#: src/du.c:316
+#: src/du.c:328
 #, fuzzy
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
@@ -3862,8 +3935,7 @@ msgstr ""
 "  -S, --separate-dirs   altdizinlerin boyutunu dahil etmez\n"
 "  -s, --summarize       her argüman için yalnızca toplamı gösterir\n"
 
-#: src/du.c:322
-#, fuzzy
+#: src/du.c:334
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
 "                          or entries greater than SIZE if negative\n"
@@ -3872,95 +3944,78 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
 msgstr ""
-"  -S                      dosya büyüklüğüne göre sıralar\n"
-"      --sort=SÖZCÜK       sözcükte belirtilen değere göre sıralar: \n"
-"                            extension -X (uzantı), none -U (boş), \n"
-"                            size -S (büyüklük), time -t (zaman),\n"
-"                            version -v (sürüm), status -c (durum)\n"
-"                            time -t (değişim zamanı),\n"
-"                            atime -u (erişim zaman damgası),\n"
-"                            access -u (erişim zamanı),\n"
-"                            use -u (kullanım zamanı)\n"
-"      --time=SÖZCÜK       -l ile zamanı SÖZCÜKte belirtilen değer olarak\n"
-"                          gösterir\n"
-"                            atime (erişim zaman damgası), \n"
-"                            access (erişim), use (kullanım zamanı), \n"
-"                            ctime (dosya durum bilgisi değişim zamanı) veya\n"
-"                            status (durum); eÄŸer --sort=time belirtilmiÅŸse\n"
-"                            seçilen zaman değerine göre sıralar.\n"
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
 "  -x, --one-file-system    skip directories on different file systems\n"
 msgstr ""
 
-#: src/du.c:386
-#, fuzzy
+#: src/du.c:398
 msgid "Infinity"
 msgstr "Sonsuz"
 
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr ""
-
-#: src/du.c:624
+#: src/du.c:636
 #, fuzzy, c-format
 msgid "fts_read failed: %s"
 msgstr "fts_read başarısız oldu"
 
-#: src/du.c:780
+#: src/du.c:787
 #, c-format
 msgid "invalid maximum depth %s"
 msgstr "geçersiz maksimum derinlik %s"
 
-#: src/du.c:809
+#: src/du.c:816
 #, fuzzy, c-format
 msgid "invalid --threshold argument '-0'"
-msgstr "%s argümanı geçersiz"
+msgstr "tamsayı argüman olarak `%s' geçersiz"
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr "hem özetleyip hem bütün girdiler gösterilemez"
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr "uyarı: özetlemek --max-depth=0 ile aynı"
 
-#: src/du.c:900
+#: src/du.c:911
 #, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr "uyarı: özetlemek --max-depth=%lu ile çakışıyor"
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 #, fuzzy
 msgid "file operands cannot be combined with --files0-from"
 msgstr "Dosya iÅŸleyenleri --files0-from ile birleÅŸtirilemez"
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr "%s: okuma hatası"
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr ""
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 msgid "invalid zero-length file name"
 msgstr "geçersiz sıfır uzunluklu dosya adı"
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr "toplam"
 
@@ -4062,7 +4117,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
 "Her çevre değişkeni İSİM için bir DEĞER atar ve KOMUTu çalıştırır.\n"
@@ -4147,16 +4202,16 @@ msgid "input line is too long"
 msgstr "girdi satırı fazla uzun"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr ""
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
@@ -4165,7 +4220,7 @@ msgstr ""
 "Kullanımı: %s İFADE\n"
 "    veya:  %s SEÇENEK\n"
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -4181,7 +4236,7 @@ msgstr ""
 "  ARG1 | ARG2       eÄŸer ARG1 boÅŸ veya 0 ise ARG2, deÄŸil ise ARG1\n"
 "  ARG1 & ARG2       eğer iki argüman da 0 veya boş ise ARG2, değil ise ARG1\n"
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -4199,7 +4254,7 @@ msgstr ""
 "  ARG1 >= ARG2      ARG1 büyük ya da eşittir ARG2\n"
 "  ARG1 > ARG2       ARG1 büyüktür ARG2\n"
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
@@ -4209,7 +4264,7 @@ msgstr ""
 "  ARG1 + ARG2       aritmetik toplama iÅŸlemi\n"
 "  ARG1 - ARG2       aritmetik çıkarma işlemi\n"
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -4222,7 +4277,7 @@ msgstr ""
 "  ARG1 / ARG2       aritmetik bölme işleminde bölümü verir\n"
 "  ARG1 % ARG2      aritmetik bölme işleminde kalanı verir\n"
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -4243,7 +4298,7 @@ msgstr ""
 "konum\n"
 "  length DİZGE               DİZGEnin karakter sayısı\n"
 
-#: src/expr.c:251
+#: src/expr.c:250
 #, fuzzy
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
@@ -4258,7 +4313,7 @@ msgstr ""
 "\n"
 "  ( Ä°FADE )                  Ä°FADEnin deÄŸeri\n"
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -4276,7 +4331,7 @@ msgstr ""
 "arasındaki eşleşen dizge ile ya da null ile sonuçlanır; eğer \\(ve \\)\n"
 "kullanılmamışsa eşleşen karakter sayısıyla ya da 0 ile sonuçlanır.\n"
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -4288,33 +4343,33 @@ msgstr ""
 "1,\n"
 "eğer İFADE sözdizim hatası içeriyor ise 2, bir hata var ise 3 olur.\n"
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, c-format
 msgid "syntax error"
 msgstr "sözdizimi hatası"
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, fuzzy, c-format
 msgid "error in regular expression matcher"
 msgstr "düzenli ifade (regular expression) aramasında hata oluştu"
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, fuzzy, c-format
 msgid "non-integer argument"
 msgstr "nümerik olmayan argüman"
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr "sıfırla bölüm"
 
 #
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, fuzzy, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr "Problemi devre dışı bırakmak için LC_ALL='C' tanımlayın."
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, fuzzy, c-format
 msgid "the strings compared were %s and %s"
 msgstr "Karşılaştırılan dizgeler %s ve %s idi."
@@ -4324,27 +4379,27 @@ msgstr "Karşılaştırılan dizgeler %s ve %s idi."
 msgid "Niels Moller"
 msgstr ""
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
 msgstr ""
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
 msgstr ""
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, fuzzy, c-format
 msgid "%s is not a valid positive integer"
 msgstr "`%s' bir pozitif tamsayı değil."
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr "%s çok büyük"
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
@@ -4353,7 +4408,7 @@ msgstr ""
 "Kullanımı: %s [SAYI]...\n"
 "    veya:  %s SEÇENEK\n"
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 #, fuzzy
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
@@ -4467,28 +4522,28 @@ msgid "invalid number of columns: %s"
 msgstr "geçersiz sütun sayısı: `%s'"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr ""
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, fuzzy, c-format
 msgid "Usage: %s\n"
 msgstr "Kullanım: %s [SEÇENEK]\n"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
 msgstr ""
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, fuzzy, c-format
 msgid "failed to get groups for user %s"
 msgstr "%s'in grup üyeliği %s olarak değiştirilemedi\n"
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, fuzzy, c-format
 msgid "failed to get groups for the current process"
 msgstr "%s'in grup üyeliği %s olarak değiştirilemedi\n"
@@ -4510,22 +4565,22 @@ msgid ""
 "the current process (which may differ if the groups database has changed).\n"
 msgstr ""
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, fuzzy, c-format
 msgid "cannot get real UID"
 msgstr "kullanıcı kimliği atanamıyor"
 
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, fuzzy, c-format
 msgid "cannot get effective GID"
-msgstr "%s izlenemedi"
+msgstr "günün zamanı belirlenemedi"
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, fuzzy, c-format
 msgid "cannot get real GID"
 msgstr "kullanıcı kimliği atanamıyor"
 
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, fuzzy, c-format
 msgid "%s: no such user"
 msgstr "%s: Böyle bir kullanıcı yok"
@@ -4584,58 +4639,48 @@ msgstr ""
 "Her CONV sembolü:\n"
 "\n"
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr "%s: dosya fazla küçülmüş"
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, c-format
 msgid "%s: number of bytes is too large"
 msgstr "%s: bayt sayısı fazla büyük"
 
-#: src/head.c:440
-#, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr "%s: orjinal konuma geri gidilemiyor (lseek)"
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr "%s: %s görecesine ilerleme (seek) yapılamıyor"
 
-#: src/head.c:673
-#, fuzzy, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "%s: silinemedi"
-
-#: src/head.c:798
+#: src/head.c:423 src/tail.c:457
 #, c-format
-msgid "cannot reposition file pointer for %s"
-msgstr "%s üzerinde lseek başarısız"
+msgid "%s: cannot seek to relative offset %s"
+msgstr "%s: görece %s'ye ilerlenemiyor (seek)"
 
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr "%s: %s bu bilgisayarda kullanılamayacak kadar büyük bir sayı"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr "satır sayısı"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr "bayt sayısı"
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr "geçersiz satır sayısı"
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr "geçersiz bayt sayısı"
 
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, fuzzy, c-format
 msgid "invalid trailing option -- %c"
 msgstr "geçersiz seçenek -- %c"
@@ -4681,28 +4726,34 @@ msgid "cannot determine hostname"
 msgstr "makina ismi saptanamadı"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr ""
 
-#: src/id.c:81
-#, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
-msgstr "Kullanımı: %s [SEÇENEK]... [KULLANICI-İSMİ]\n"
+#: src/id.c:84
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]... [USER]\n"
+msgstr "Kullanımı: %s [SEÇENEK]... [KULLANICI]...\n"
 
-#: src/id.c:82
-#, fuzzy
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
+msgstr ""
+
+#: src/id.c:90
+#, fuzzy
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
 msgstr ""
 "KULLANICI-İSMİ ya da çalıştıran kullanıcı hakkındaki bilgileri gösterir.\n"
 "\n"
@@ -4713,7 +4764,7 @@ msgstr ""
 "  -r, --real      -ugG için etkin kimlik yerine gerçek kimliği gösterir\n"
 "  -u, --user      sadece kullanıcı kimliğini gösterir\n"
 
-#: src/id.c:96
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
@@ -4721,116 +4772,126 @@ msgstr ""
 "\n"
 "SEÇENEK belirtilmeksizin bazı yararlı kullanıcı bilgileri gösterir.\n"
 
-#: src/id.c:140
+#: src/id.c:151
+#, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr ""
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr ""
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr ""
 
-#: src/id.c:178
+#: src/id.c:198
 #, fuzzy, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr "-C -l -b seçenekleri beraber kullanılmaz"
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr "öntanımlı biçemde gerçek kimlikler veya gerçek isimler gösterilemez"
 
-#: src/id.c:199
+#: src/id.c:209
+#, fuzzy, c-format
+msgid "option --zero not permitted in default format"
+msgstr "öntanımlı biçemde gerçek kimlikler veya gerçek isimler gösterilemez"
+
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
 msgstr ""
 
-#: src/id.c:224
+#: src/id.c:265
 #, fuzzy, c-format
 msgid "cannot get effective UID"
-msgstr "%s izlenemedi"
+msgstr "günün zamanı belirlenemedi"
 
-#: src/id.c:311
+#: src/id.c:354
 #, fuzzy, c-format
 msgid "cannot find name for user ID %s"
 msgstr "%u kullanıcı kimliğinin ismi bulunamıyor"
 
-#: src/id.c:329
+#: src/id.c:372
 #, c-format
 msgid "uid=%s"
 msgstr ""
 
-#: src/id.c:334
+#: src/id.c:377
 #, c-format
 msgid " gid=%s"
 msgstr ""
 
-#: src/id.c:341
+#: src/id.c:384
 #, c-format
 msgid " euid=%s"
 msgstr ""
 
-#: src/id.c:349
+#: src/id.c:392
 #, c-format
 msgid " egid=%s"
 msgstr ""
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr " gruplar="
 
-#: src/id.c:393
+#: src/id.c:437
 #, c-format
 msgid " context=%s"
 msgstr ""
 
-#: src/install.c:373
+#: src/install.c:376
 #, fuzzy, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr "uyarı: %s dizinine geçilemiyor"
 
-#: src/install.c:414
+#: src/install.c:417
 #, c-format
 msgid "creating directory %s"
 msgstr "dizin %s oluÅŸturuluyor"
 
-#: src/install.c:482
+#: src/install.c:485
 #, c-format
 msgid "cannot change ownership of %s"
 msgstr "%s'in sahipliÄŸi deÄŸiÅŸtirilemiyor"
 
-#: src/install.c:506
+#: src/install.c:509
 #, c-format
 msgid "cannot set time stamps for %s"
 msgstr "%s için zaman damgalama yapılamadı"
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, c-format
 msgid "fork system call failed"
 msgstr "fork sistem çağrısı başarısız"
 
-#: src/install.c:531
+#: src/install.c:535
 #, fuzzy, c-format
 msgid "cannot run %s"
 msgstr "strip çalıştırılamadı"
 
-#: src/install.c:535
+#: src/install.c:539
 #, fuzzy, c-format
 msgid "waiting for strip"
 msgstr "%s'e yazılıyor"
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr ""
 
-#: src/install.c:558
+#: src/install.c:565
 #, c-format
 msgid "invalid user %s"
 msgstr "geçersiz kullanıcı %s"
 
-#: src/install.c:594
+#: src/install.c:601
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -4843,7 +4904,7 @@ msgstr ""
 "  veya:   %s [SEÇENEK]... -t DİZİN KAYNAK...\n"
 "  veya:   %s [SEÇENEK]... -d DİZİN...\n"
 
-#: src/install.c:601
+#: src/install.c:608
 #, fuzzy
 msgid ""
 "\n"
@@ -4862,7 +4923,7 @@ msgstr ""
 "Dördüncü biçemde, ilgili DİZİN(ler)in bütün öğelerini oluşturur.\n"
 "\n"
 
-#: src/install.c:615
+#: src/install.c:622
 #, fuzzy
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
@@ -4880,7 +4941,7 @@ msgstr ""
 "  -d, --directory     bütün argümanları dizin adı olarak alır; belirtilen\n"
 "                        dizinlerin tüm öğelerini oluşturur\n"
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -4899,7 +4960,7 @@ msgstr ""
 "                      gibi)\n"
 "  -o, --owner=SAHİP   sahibi atar (yalnızca süper-kullanıcı)\n"
 
-#: src/install.c:631
+#: src/install.c:638
 #, fuzzy
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
@@ -4921,60 +4982,57 @@ msgstr ""
 "-T, --no-target-directory  HEDEF'i normal bir dosya kabul eder\n"
 "  -v, --verbose       oluşturuldukça her dizinin adını gösterir\n"
 
-#: src/install.c:641
+#: src/install.c:648
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
 
-#: src/install.c:859
+#: src/install.c:696 src/unlink.c:86
 #, c-format
-msgid ""
-"WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
-msgstr ""
+msgid "cannot unlink %s"
+msgstr "%s bağı çözülemedi"
 
-#: src/install.c:869
+#: src/install.c:877
 #, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
+msgid ""
+"WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
 msgstr ""
 
-#: src/install.c:886
+#: src/install.c:917
 #, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr "bir dizin kurulurken strip seçeneği kullanılamaz"
 
-#: src/install.c:889
+#: src/install.c:920
 #, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr "bir dizin kurulurken hedef dizin belirlenemez"
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr ""
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, c-format
 msgid "invalid mode %s"
 msgstr "geçersiz kip %s"
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr ""
 
-#: src/install.c:959
+#: src/install.c:1001
 #, fuzzy, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr "--string ve --check seçenekleri aynı anda kullanılamaz"
 
-#: src/install.c:966
+#: src/install.c:1008
 #, fuzzy, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr "tarih belirten bu seçenekler birlikte kullanılamaz"
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -4987,7 +5045,7 @@ msgstr ""
 msgid "Mike Haertel"
 msgstr "Mike Haertel ve Paul Eggert"
 
-#: src/join.c:191
+#: src/join.c:195
 #, fuzzy
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
@@ -5008,7 +5066,7 @@ msgstr ""
 "                    gelinmesine göre 1 veya 2 olabilir.\n"
 "  -e YAZI           eksik girdi alanlarını YAZI ile değiştirir\n"
 
-#: src/join.c:200
+#: src/join.c:204
 #, fuzzy
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
@@ -5021,7 +5079,7 @@ msgstr ""
 "  -o BİÇEM          çıktı satırını oluştururken BİÇEM'i kullanır\n"
 "  -t HARF           HARFi girdi ve çıktı alanlarını ayırmakta kullanır\n"
 
-#: src/join.c:206
+#: src/join.c:210
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
 "  -1 FIELD          join on this FIELD of file 1\n"
@@ -5033,7 +5091,14 @@ msgid ""
 "                      print them without trying to pair them\n"
 msgstr ""
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+#, fuzzy
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr ""
+" -z, --zero-terminated     satırları  satır-sonu karakteri (\\n) \n"
+"                          yerine 0'la (0 baytı) bitirir\n"
+
+#: src/join.c:225
 #, fuzzy
 msgid ""
 "\n"
@@ -5064,47 +5129,47 @@ msgstr ""
 "\n"
 "Önemli: DOSYA1 ve DOSYA2 birleştirme alanına göre sıralı olmalıdır.\n"
 
-#: src/join.c:403
+#: src/join.c:410
 #, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
 msgstr ""
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, c-format
 msgid "invalid field number: %s"
 msgstr "geçersiz alan numarası: %s"
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, fuzzy, c-format
 msgid "invalid field specifier: %s"
 msgstr "geçersiz alan belirleyicisi: `%s'"
 
-#: src/join.c:877
+#: src/join.c:884
 #, fuzzy, c-format
 msgid "invalid file number in field spec: %s"
 msgstr "alan tanımlamasında geçersiz dosya numarası: `%s'"
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr ""
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr ""
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, fuzzy, c-format
 msgid "multi-character tab %s"
 msgstr "tab yerine kullanılacak `%s' bir karakterden oluşmalı"
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr "uyumsuz sekme"
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr "her iki dosya da standart girdi olamaz"
@@ -5228,47 +5293,47 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr "%s sabit bağı %s'e bağlanamadı"
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr "%s: dizinde sabit baÄŸa izin verilmiyor"
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, c-format
 msgid "%s: cannot overwrite directory"
 msgstr "%s: dizinin üzerine yazılamaz"
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
 msgstr "%s: %s'un üzerine yazılsın mı?"
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, fuzzy, c-format
 msgid "failed to create symbolic link %s"
 msgstr "%s sembolik bağı oluşturulamadı"
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, fuzzy, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr "sembolik bağ %s, %s'e bağlanamadı"
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, fuzzy, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr "%s sabit bağı %s'e bağlanamadı"
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, fuzzy, c-format
 msgid "failed to create hard link %s"
 msgstr "%s sabit bağı %s'e bağlanamadı"
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, fuzzy, c-format
 msgid "failed to create hard link %s => %s"
 msgstr "%s sabit bağı %s'e bağlanamadı"
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -5281,7 +5346,7 @@ msgstr ""
 " veya:    %s [SEÇENEK]...  HEDEF...DİZİN          (3. biçem)\n"
 " veya:    %s [SEÇENEK]...  -t DİZİN HEDEF...      (4. biçem)\n"
 
-#: src/ln.c:381
+#: src/ln.c:398
 #, fuzzy
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
@@ -5301,7 +5366,7 @@ msgstr ""
 "mevcut olmak zorundadır.\n"
 "\n"
 
-#: src/ln.c:394
+#: src/ln.c:411
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
 "file\n"
@@ -5323,8 +5388,7 @@ msgstr ""
 "                              bu işlem başarısız olacaktır)\n"
 "  -f, --force                 önceden var olan hedef dosyaları siler\n"
 
-#: src/ln.c:402
-#, fuzzy
+#: src/ln.c:419
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
 "  -L, --logical               dereference TARGETs that are symbolic links\n"
@@ -5335,13 +5399,8 @@ msgid ""
 "location\n"
 "  -s, --symbolic              make symbolic links instead of hard links\n"
 msgstr ""
-"  -n, --no-dereference        bir dizine sembolik baÄŸ olan hedefi sanki "
-"normal\n"
-"                                bir dosyaymış gibi işler\n"
-"  -i, --interactive           hedefleri silmeden önce sorar\n"
-"  -s, --symbolic              sabit baÄŸ yerine sembolik baÄŸ oluÅŸturur\n"
 
-#: src/ln.c:411
+#: src/ln.c:428
 #, fuzzy
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
@@ -5356,7 +5415,7 @@ msgstr ""
 "  -T, --no-target-directory   BAĞ_ADI'nı normal bir dosya gibi kullanır\n"
 "  -v, --verbose               bağlamadan önce her dosyanın adını gösterir\n"
 
-#: src/ln.c:433
+#: src/ln.c:450
 #, c-format
 msgid ""
 "\n"
@@ -5364,12 +5423,12 @@ msgid ""
 "behavior when a TARGET is a symbolic link, defaulting to %s.\n"
 msgstr ""
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, fuzzy, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr "--target-directory ve --no-target-directory birleÅŸtirilemez"
 
-#: src/ln.c:588
+#: src/ln.c:605
 #, fuzzy, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr "%s sembolik bağı oluşturulamadı"
@@ -5402,7 +5461,7 @@ msgstr "kullanıcı ismi yok"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
@@ -5411,97 +5470,97 @@ msgstr "%b %e  %Y"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 msgid "%b %e %H:%M"
 msgstr "%b %e %H:%M"
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr "çevre değişkeni QUOTING_STYLE'da bulunan geçersiz değer yoksayıldı: %s"
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr ""
 "çevre değişkeni COLUMNS'da belirtilen geçersiz genişlik değeri yoksayıldı: %s"
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr ""
 "çevre değişkeni TABSIZE'da bulunan geçersiz sekme boyutu yoksayıldı: %s"
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, c-format
 msgid "invalid line width: %s"
 msgstr "geçersiz satır genişliği: %s"
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, c-format
 msgid "invalid tab size: %s"
 msgstr "geçersiz sekme boyutu: %s"
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, c-format
 msgid "invalid time style format %s"
 msgstr "geçersiz tarih biçemi %s"
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 #, fuzzy
 msgid "Valid arguments are:\n"
 msgstr "Geçerli argümanlar:"
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr ""
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr ""
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, c-format
 msgid "unrecognized prefix: %s"
 msgstr "tanımlanmamış önek: %s"
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr "çevre değişkeni LS_COLORS'da taranamaz değer"
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, c-format
 msgid "cannot open directory %s"
 msgstr "dizin %s açılamadı"
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, c-format
 msgid "cannot determine device and inode of %s"
 msgstr "%s'nın aygıtı ve i-düğümü belirlenemedi"
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, c-format
 msgid "%s: not listing already-listed directory"
 msgstr "%s: önceden listelenmiş dizin tekrar listelenmedi"
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, c-format
 msgid "reading directory %s"
 msgstr "dizin %s okunuyor"
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, c-format
 msgid "closing directory %s"
 msgstr "%s dizini kapatılıyor"
 
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, c-format
 msgid "cannot compare file names %s and %s"
 msgstr "%s ve %s dosya adları karşılaştırılamaz"
 
-#: src/ls.c:4721
+#: src/ls.c:4781
 #, fuzzy
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
@@ -5512,7 +5571,7 @@ msgstr ""
 "sıralar.\n"
 "\n"
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 #, fuzzy
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
@@ -5527,18 +5586,18 @@ msgstr ""
 "  -b, --escape               grafik olmayan karakterleri sekizlik\n"
 "                             değerlerle gösterir\n"
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 #, fuzzy
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
 "      --block-size=BOY       BOY baytta bloklar kullanır\n"
@@ -5549,16 +5608,15 @@ msgstr ""
 "                             -l ile: ctime'ı göster ve isme göre sıralar\n"
 "                             tek başına: ctime'a göre sıralar\n"
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 #, fuzzy
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 "  -C                         Çıktıyı sütunlar halinde gösterir\n"
@@ -5573,7 +5631,7 @@ msgstr ""
 "                             sembolik bağları izlemez.\n"
 "  -D, --dired                Emacs dired kipine uygun çıktı verir\n"
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 #, fuzzy
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
@@ -5592,23 +5650,24 @@ msgstr ""
 "                               -1 tek sütun,  -l uzun,  -C dikey\n"
 "      --full-time            -l --time-style=full-iso gibi\n"
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr ""
 
-#: src/ls.c:4763
+#: src/ls.c:4823
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 
-#: src/ls.c:4769
+#: src/ls.c:4829
 #, fuzzy
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
@@ -5619,7 +5678,7 @@ msgstr ""
 "  -H, --si              yukarıdaki gibi fakat 1000'in katlarını kullanır,\n"
 "                        1024'ün değil.\n"
 
-#: src/ls.c:4775
+#: src/ls.c:4835
 #, fuzzy
 msgid ""
 "  -H, --dereference-command-line\n"
@@ -5627,7 +5686,7 @@ msgid ""
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
@@ -5646,7 +5705,7 @@ msgstr ""
 "      --hide=KALIP           KALIP'a uyan örtük girdileri göstermez\n"
 "                             (-a veya -A ile etkisizleÅŸtirilir)\n"
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 #, fuzzy
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
@@ -5656,7 +5715,7 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 "      --indicator-style=SÖZCÜK  girdi isimlerine SÖZCÜK tarzında belirteç\n"
 "                             ekler: none (boş -- öntanımlı),\n"
@@ -5667,7 +5726,7 @@ msgstr ""
 "                             göstermez\n"
 "  -k                         --block-size=1K gibi\n"
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -5684,7 +5743,7 @@ msgstr ""
 "                               bilgilerini deÄŸil\n"
 "  -m                         satırı virgül ayraçlı girdilerle doldurur\n"
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 #, fuzzy
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
@@ -5704,12 +5763,12 @@ msgstr ""
 "                               kullanır\n"
 "  -p, --file-type            bilgilere belirteç ekler ( /=@| dan biri) \n"
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 #, fuzzy
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -5729,7 +5788,7 @@ msgstr ""
 "                               shell-always (her zaman kabuk), c (C dili), \n"
 "                               escape (kaçış karakterli)\n"
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 #, fuzzy
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
@@ -5742,17 +5801,19 @@ msgstr ""
 "  -s, --size                 -l ile her dosyanın boyutunu blok olarak\n"
 "                             gösterir\n"
 
-#: src/ls.c:4825
+#: src/ls.c:4886
 #, fuzzy
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 "  -S                      dosya büyüklüğüne göre sıralar\n"
 "      --sort=SÖZCÜK       sözcükte belirtilen değere göre sıralar: \n"
@@ -5771,17 +5832,19 @@ msgstr ""
 "                            status (durum); eÄŸer --sort=time belirtilmiÅŸse\n"
 "                            seçilen zaman değerine göre sıralar.\n"
 
-#: src/ls.c:4835
+#: src/ls.c:4896
 #, fuzzy
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
 msgstr ""
 "      --time-style=BİÇEM     zamanı BİÇEM biçeminde gösterir:\n"
 "                             full-iso, long-iso, iso, locale, +BİÇEM\n"
@@ -5796,17 +5859,17 @@ msgstr ""
 "  -T, --tabsize=SÜT          öntanımlı 8 değeri yerine her SÜT değerinde\n"
 "                             sekme olduÄŸunu varsayar.\n"
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 msgid ""
 "  -t                         sort by modification time, newest first\n"
 "  -T, --tabsize=COLS         assume tab stops at each COLS instead of 8\n"
 msgstr ""
 
-#: src/ls.c:4848
+#: src/ls.c:4912
 #, fuzzy
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
@@ -5820,14 +5883,13 @@ msgstr ""
 "gösterir\n"
 "  -v                         sürüme göre sıralar\n"
 
-#: src/ls.c:4855
+#: src/ls.c:4919
 #, fuzzy
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 "  -w, --width=SÃœTUN          ekran geniÅŸliÄŸini SÃœTUNa ayarlar\n"
@@ -5835,7 +5897,7 @@ msgstr ""
 "  -X                         girdi sonekine göre alfabetik sıralar\n"
 "  -1                         her satıra bir dosya olarak listeler\n"
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -5844,7 +5906,7 @@ msgid ""
 "variable can change the settings.  Use the dircolors command to set it.\n"
 msgstr ""
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -5918,9 +5980,11 @@ msgstr ""
 #, fuzzy
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
@@ -5932,12 +5996,7 @@ msgstr ""
 "                          uyarı verir\n"
 "\n"
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -5952,49 +6011,49 @@ msgstr ""
 "olarak, her satırı bir sağlama toplamı ile yazdırır, tür belirtir (ikilik\n"
 "için `*' , metin için ` ') ve DOSYA'nın ismini yazar.\n"
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, c-format
 msgid "%s: too many checksum lines"
 msgstr "%s: çok fazla sağlama satırı"
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr "%s: %<PRIuMAX>: yanlış biçemlenmiş %s sağlama satırı"
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr "%s:açma veya okuma BAŞARISIZ\n"
 
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr "BAÅžARISIZ"
 
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr "Tamam"
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr "%s: doğru biçemlenmiş %s sağlama toplam satırı bulunamadı"
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, fuzzy, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
 msgstr[0] "%s: %<PRIuMAX>: yanlış biçemlenmiş %s sağlama satırı"
 msgstr[1] "%s: %<PRIuMAX>: yanlış biçemlenmiş %s sağlama satırı"
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, fuzzy, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
 msgstr[0] "Uyarı: listelenmiş dosyanın %<PRIuMAX> / %<PRIuMAX> kısmı okunamadı"
 msgstr[1] "Uyarı: listelenmiş dosyanın %<PRIuMAX> / %<PRIuMAX> kısmı okunamadı"
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, fuzzy, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
@@ -6003,63 +6062,61 @@ msgstr[0] ""
 msgstr[1] ""
 "UYARI: Hesaplanmış sağlamaların %<PRIuMAX> / %<PRIuMAX> kısmı eşleşmedi"
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
 msgstr ""
 
-#: src/md5sum.c:766
+#: src/md5sum.c:770
 #, fuzzy, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr "--status seçeneği yalnızca sağlama toplam kontrolü sırasında anlamlı"
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
 msgstr ""
 " --binary ve --text seçenekleri sağlama toplamlarını kontrol ederken geçersiz"
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr "--status seçeneği yalnızca sağlama toplam kontrolü sırasında anlamlı"
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr "--warn seçeneği yalnızca sağlama toplam kontrolü sırasında anlamlı"
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, fuzzy, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr "--status seçeneği yalnızca sağlama toplam kontrolü sırasında anlamlı"
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, fuzzy, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr "--status seçeneği yalnızca sağlama toplam kontrolü sırasında anlamlı"
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr "Kullanım: %s [SEÇENEK]... DİZİN...\n"
 
-#: src/mkdir.c:57
+#: src/mkdir.c:59
 #, fuzzy
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
 msgstr ""
 "EÄŸer yoksa, ilgili DÄ°ZÄ°N(ler)i oluÅŸturur.\n"
 "\n"
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
 #, fuzzy
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 "  -m, --mode=KÄ°P    izin kipini belirtir (chmod gibi), \n"
 "                      rwxrwxrwx öntanımlı değer\n"
@@ -6067,24 +6124,49 @@ msgstr ""
 "                    gerektiği şekilde üst dizinleri oluşturur\n"
 "  -v, --verbose     oluşturulan her dizin için bir ileti çıktılar\n"
 
-#: src/mkdir.c:168
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/mkdir.c:127 src/mkdir.c:172
+#, fuzzy, c-format
+msgid "failed to set default creation context for %s"
+msgstr "%s'nın öznitelikleri alınamadı"
+
+#: src/mkdir.c:191
+#, fuzzy, c-format
+msgid "failed to restore context for %s"
+msgstr "%s'in zaman damgaları korunamadı"
+
+#: src/mkdir.c:231
 #, c-format
 msgid "created directory %s"
 msgstr "dizin %s oluÅŸturuldu"
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr ""
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr "Kullanımı: %s [SEÇENEK]... İSİM...\n"
 
-#: src/mkfifo.c:52
+#: src/mkfifo.c:54
 #, fuzzy
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
 msgstr ""
 "İsimli veri yollarını (FIFO) belirtilen İSİM'lerle oluşturur.\n"
 "\n"
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 #, fuzzy
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
@@ -6092,38 +6174,41 @@ msgstr ""
 "  -m, --mode=KÄ°P     izin kipini belirtilen deÄŸere deÄŸiÅŸtirir\n"
 "                     (chmod gibi) varsayılan değer: rw\n"
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, c-format
 msgid "invalid mode"
 msgstr "geçersiz kip"
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr ""
 
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
+#, c-format
+msgid "cannot set permissions of %s"
+msgstr "'%s'nın izinleri belirtilemedi"
+
+#: src/mknod.c:54
 #, c-format
 msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr "Kullanım: %s [SEÇENEK]...İSİM TİP [MAJÖR MİNÖR]\n"
 
-#: src/mknod.c:54
+#: src/mknod.c:56
 #, fuzzy
 msgid "Create the special file NAME of the given TYPE.\n"
 msgstr ""
 "Belirtilen TÜR'de belirtilen İSİM'de özel dosya oluşturur.\n"
 "\n"
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr ""
-
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -6138,7 +6223,7 @@ msgstr ""
 "başlarlarsa, sekizlik olarak algılanır. Bütün diğer değerler onluk olarak\n"
 "algılanır. TÜR, aşağıdaki değerlerde olabilir:\n"
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 msgid ""
 "\n"
 "  b      create a block (buffered) special file\n"
@@ -6150,151 +6235,145 @@ msgstr ""
 "  c, u   özel karakter (önbellekli) dosyası oluşturur\n"
 "  p      FIFO oluÅŸturur\n"
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 msgid "Special files require major and minor device numbers."
 msgstr "Özel dosyalar, majör ve minör aygıt numaraları gerektirir."
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 msgid "Fifos do not have major and minor device numbers."
 msgstr "Fifoların majör ve minör aygıt numarası bulunmaz. %s"
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, c-format
 msgid "block special files not supported"
 msgstr "özel blok dosyalar desteklenmiyor"
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, c-format
 msgid "character special files not supported"
 msgstr "özel karakter dosyaları desteklenmiyor"
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, c-format
 msgid "invalid major device number %s"
 msgstr "geçersiz majör aygıt numarası %s"
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, c-format
 msgid "invalid minor device number %s"
 msgstr "geçersiz minör aygıt numarası %s"
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, c-format
 msgid "invalid device %s %s"
 msgstr "geçersiz aygıt %s %s"
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, c-format
 msgid "invalid device type %s"
 msgstr "geçersiz aygıt türü %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr ""
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr "Kullanım: %s [SEÇENEK]... [DOSYA]\n"
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
 "TEMPLATE must contain at least 3 consecutive 'X's in last component.\n"
 "If TEMPLATE is not specified, use tmp.XXXXXXXXXX, and --tmpdir is implied.\n"
 msgstr ""
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
 "  -q, --quiet         suppress diagnostics about file/dir-creation failure\n"
 msgstr ""
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
 msgstr ""
 
-#: src/mktemp.c:223
-#, fuzzy, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr "standart hata yeniden yönlendirilemedi"
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, fuzzy, c-format
 msgid "too many templates"
 msgstr "çok fazla tekrar eden satır"
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr ""
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr ""
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr ""
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr ""
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr ""
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, fuzzy, c-format
 msgid "failed to create directory via template %s"
 msgstr "%s dizini oluşturulamıyor"
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, fuzzy, c-format
 msgid "failed to create file via template %s"
 msgstr "%s'in zaman damgaları korunamadı"
 
-#: src/mv.c:292
+#: src/mv.c:294
 #, fuzzy
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 "KAYNAK'ı HEDEF olarak yeniden adlandırır veya KAYNAK'ları DİZİN'e taşır.\n"
 "\n"
 
-#: src/mv.c:298
+#: src/mv.c:300
 #, fuzzy
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
@@ -6314,7 +6393,7 @@ msgstr ""
 "  -i, --interactive            üzerine yazmadan önce sorar\n"
 "                                  --reply=query ile aynı\n"
 
-#: src/mv.c:307
+#: src/mv.c:309
 #, fuzzy
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
@@ -6332,7 +6411,8 @@ msgstr ""
 "  -S, --suffix=SONEK           öntanımlı sonek yerine SONEK değerini "
 "kullanır.\n"
 
-#: src/mv.c:312
+#: src/mv.c:314
+#, fuzzy
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
 "DIRECTORY\n"
@@ -6341,6 +6421,8 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
 "  -t, --target-directory=DİZİN  bütün KAYNAK argümanlarını DİZİN'e taşır\n"
 "  -T, --no-target-directory     HEDEF'i normal bir dosya kabul eder\n"
@@ -6641,95 +6723,90 @@ msgid "%s: invalid number to ignore"
 msgstr "%s: geçersiz satır sayısı"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
 msgstr ""
 
-#: src/numfmt.c:676
+#: src/numfmt.c:659
 #, fuzzy, c-format
-msgid "value too large to be converted: '%s'"
+msgid "value too large to be converted: %s"
 msgstr "%s: değer tamamen dönüştürülmedi"
 
-#: src/numfmt.c:680
+#: src/numfmt.c:663
 #, fuzzy, c-format
-msgid "invalid number: '%s'"
+msgid "invalid number: %s"
 msgstr "geçersiz sayı %s"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
+msgid "rejecting suffix in input: %s (consider using --from)"
 msgstr ""
 
-#: src/numfmt.c:688
+#: src/numfmt.c:671
 #, fuzzy, c-format
-msgid "invalid suffix in input: '%s'"
-msgstr "tamsayı argüman olarak `%s' geçersiz"
+msgid "invalid suffix in input: %s"
+msgstr "geçersiz girdi bayrağı: %s"
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
 msgstr ""
 
-#: src/numfmt.c:723
+#: src/numfmt.c:722 src/numfmt.c:768
 #, fuzzy, c-format
 msgid "failed to prepare value '%Lf' for printing"
 msgstr "%s: yazmak için açılamadı"
 
-#: src/numfmt.c:787
+#: src/numfmt.c:791
 #, fuzzy, c-format
-msgid "invalid unit size: '%s'"
+msgid "invalid unit size: %s"
 msgstr "geçersiz sekme boyutu: %s"
 
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
-#, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr ""
-
-#: src/numfmt.c:813
+#: src/numfmt.c:814
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
 msgstr "Kullanımı: %s [SEÇENEK]... [KULLANICI]...\n"
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
 msgstr ""
 
-#: src/numfmt.c:820
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
 msgstr ""
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
 msgstr ""
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
 "                         see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr ""
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
@@ -6737,19 +6814,19 @@ msgid ""
 "locale)\n"
 msgstr ""
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
 msgstr ""
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
 msgstr ""
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -6759,40 +6836,40 @@ msgid ""
 "                         is found\n"
 msgstr ""
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
 "nearest\n"
 msgstr ""
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
 msgstr ""
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr ""
 
-#: src/numfmt.c:877
+#: src/numfmt.c:878
 msgid ""
 "\n"
 "UNIT options:\n"
 msgstr ""
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr ""
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -6801,7 +6878,7 @@ msgid ""
 "               1Mi = 1048576,\n"
 msgstr ""
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
@@ -6809,7 +6886,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
@@ -6817,7 +6894,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
@@ -6825,18 +6902,18 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:905
+#: src/numfmt.c:906
 #, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -6848,7 +6925,7 @@ msgid ""
 "errors are not diagnosed and the exit status is 0.\n"
 msgstr ""
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -6869,113 +6946,112 @@ msgid ""
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 msgstr ""
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, fuzzy, c-format
 msgid "format %s has no %% directive"
 msgstr "hedef %s bir dizin deÄŸil"
 
-#: src/numfmt.c:990
+#: src/numfmt.c:1003
 #, fuzzy, c-format
 msgid "invalid format %s (width overflow)"
 msgstr "geçersiz biçem genişliği"
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr ""
+
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr ""
 
-#: src/numfmt.c:1010
+#: src/numfmt.c:1030
 #, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
 msgstr ""
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr ""
 
-#: src/numfmt.c:1070
+#: src/numfmt.c:1081
 #, fuzzy, c-format
-msgid "invalid suffix in input '%s': '%s'"
-msgstr "tamsayı argüman olarak `%s' geçersiz"
+msgid "invalid suffix in input %s: %s"
+msgstr "geçersiz girdi bayrağı: %s"
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
 msgstr ""
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
 msgstr ""
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
+msgid "large input value %s: possible precision loss"
 msgstr ""
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
 
-#: src/numfmt.c:1388
+#: src/numfmt.c:1403
 #, fuzzy, c-format
-msgid "invalid padding value '%s'"
-msgstr "Geçersiz sayfa aralığı `%s'"
+msgid "invalid padding value %s"
+msgstr "`%s' geçerli bir zaman dizgesi değil"
 
-#: src/numfmt.c:1401
+#: src/numfmt.c:1417
 #, fuzzy, c-format
-msgid "invalid field value '%s'"
-msgstr "geçersiz alan numarası: `%s'"
+msgid "invalid field value %s"
+msgstr "geçersiz alan numarası: %s"
 
-#: src/numfmt.c:1430
+#: src/numfmt.c:1447
 #, fuzzy, c-format
-msgid "invalid header value '%s'"
-msgstr "`%s' geçerli bir zaman dizgesi değil"
+msgid "invalid header value %s"
+msgstr "geçersiz başlık numaralama tarzı: %s"
 
-#: src/numfmt.c:1456
+#: src/numfmt.c:1473
 #, fuzzy, c-format
 msgid "--grouping cannot be combined with --format"
 msgstr "Dosya iÅŸleyenleri --files0-from ile birleÅŸtirilemez"
 
-#: src/numfmt.c:1458
-#, fuzzy, c-format
-msgid "--padding cannot be combined with --format"
-msgstr "Dosya iÅŸleyenleri --files0-from ile birleÅŸtirilemez"
-
-#: src/numfmt.c:1463
+#: src/numfmt.c:1478
 #, fuzzy, c-format
 msgid "no conversion option specified"
-msgstr "birden fazla -l veya -t seçeneği belirtilmiş"
+msgstr "süreç kimliği belirtilmemiş"
 
-#: src/numfmt.c:1471
+#: src/numfmt.c:1486
 #, fuzzy, c-format
 msgid "grouping cannot be combined with --to"
 msgstr "Dosya iÅŸleyenleri --files0-from ile birleÅŸtirilemez"
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
 msgstr ""
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
 msgstr ""
 
-#: src/numfmt.c:1511
+#: src/numfmt.c:1526
 #, fuzzy, c-format
 msgid "error reading input"
 msgstr "%s'i okunurken hata"
 
-#
-#: src/numfmt.c:1520
-#, fuzzy, c-format
+#: src/numfmt.c:1535
+#, c-format
 msgid "failed to convert some of the input numbers"
-msgstr "standart çıktı yeniden yönlendirilemedi"
+msgstr ""
 
-#: src/od.c:294
+#: src/od.c:320
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -6988,7 +7064,7 @@ msgstr ""
 "veya: %s --traditional [SEÇENEK] [DOSYA] [[+]GÖRELİ[.][b] [[+]ETİKET]][.]"
 "[b]\n"
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -7003,7 +7079,7 @@ msgstr ""
 "standart girdiden okur.\n"
 "\n"
 
-#: src/od.c:307
+#: src/od.c:333
 #, fuzzy
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
@@ -7034,26 +7110,25 @@ msgstr ""
 "             terskesikle gösteririldikleri gibi yazar\n"
 "             (Örnek: 'od -t c' tab karakteri gördüğünde '\t' yazar)\n"
 
-#: src/od.c:318
-#, fuzzy
+#: src/od.c:344
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
-"  -A, --address-radix=RADIX   adresleri RADIX sayı sisteminde yazar\n"
-"  -j, --skip-bytes=BAYT       her dosyanın ilk BAYT baytını atlar\n"
 
-#: src/od.c:323
+#: src/od.c:350
 #, fuzzy
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
@@ -7066,7 +7141,7 @@ msgstr ""
 "  -w, --width[=BAYT]          her satıra BAYT bayt yazar\n"
 "      --traditional           geleneksel formda argüman kabul eder\n"
 
-#: src/od.c:336
+#: src/od.c:363
 #, fuzzy
 msgid ""
 "\n"
@@ -7074,7 +7149,7 @@ msgid ""
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 "\n"
@@ -7086,7 +7161,7 @@ msgstr ""
 "                    karakterlerini seçer\n"
 "  -d   veya -t u2,  işsaretsiz (unsigned) ondalık kısa sayıları seçer\n"
 
-#: src/od.c:345
+#: src/od.c:372
 msgid ""
 "  -f   same as -t fF, select floats\n"
 "  -i   same as -t dI, select decimal ints\n"
@@ -7101,16 +7176,16 @@ msgstr ""
 "  -o   veya -t o2,  8lik 2 bayt sayıları seçer\n"
 "  -x   veya -t x2,  16lik 2 bayt sayıları seçer\n"
 
-#: src/od.c:353
+#: src/od.c:380
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -7126,7 +7201,7 @@ msgstr ""
 "             için SAYI bayt kullanır\n"
 "  x[SAYI]    16lik sayı olarak yazar, her sayı için SAYI bayt kullanır\n"
 
-#: src/od.c:367
+#: src/od.c:394
 #, fuzzy
 msgid ""
 "\n"
@@ -7143,14 +7218,14 @@ msgstr ""
 "F,  sizeof(double) anlamına gelen D veya sizeof(long double) anlamına\n"
 "gelen L de gelebilir.\n"
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
 "each output line.\n"
 msgstr ""
 
-#: src/od.c:379
+#: src/od.c:406
 #, fuzzy
 msgid ""
 "\n"
@@ -7164,19 +7239,17 @@ msgid ""
 "and so on for G, T, P, E, Z, Y.\n"
 msgstr ""
 "\n"
-"BLOK ve BAYTlar aşağıdaki çarpan sonekleri ile bitebilirler:\n"
-"xM M, c 1, w 2, b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
-"GB 1000*1000*1000, G 1024*1024*1024, ve T, P, E, Z, Y. için diğerleri\n"
-"\n"
-"Her CONV sembolü:\n"
-"\n"
+"BOY aşağıdakilerin biri (veya aşağıdakilerin biri ile sonlanan bir tamsayı)\n"
+"olabilir:\n"
+"kB 1000, K 1024, MB 1000*1000, M 1024*1024, ve G, T, P, E, Z, Y için "
+"diÄŸerleri.\n"
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, fuzzy, c-format
 msgid "invalid type string %s"
 msgstr "geçersiz format  `%s'"
 
-#: src/od.c:649
+#: src/od.c:690
 #, fuzzy, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7185,7 +7258,7 @@ msgstr ""
 "geçersiz format `%s';\n"
 "bu sistem, yerleşik %lu baytlık tamsayı türü desteklemiyor"
 
-#: src/od.c:770
+#: src/od.c:811
 #, fuzzy, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7194,39 +7267,39 @@ msgstr ""
 "geçersiz format `%s';\n"
 "bu sistem %lu baytlık bir kayan ondalık (floating point) türü desteklemiyor"
 
-#: src/od.c:828
+#: src/od.c:869
 #, fuzzy, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr "format `%2$s' içinde geçersiz `%1$c' karakteri"
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr ""
 "girdinin dikkate alınmayacak  bölümü toplam girdiden \n"
 "daha büyük verilmiş"
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, fuzzy, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr "geçersiz çıktı adres radix'i `%c'; [doxn] harflerinden biri olmalı"
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr "dizgeler çıktılanırken tür belirtilemez"
 
-#: src/od.c:1810
+#: src/od.c:1863
 #, fuzzy
 msgid "compatibility mode supports at most one file"
 msgstr "Eski kullanım kipi en fazla bir dosya destekler."
 
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr "atlanacak baytlar + okunacak baytlar çok büyük"
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr "uyarı: geçersiz genişlik %lu; %d kullanılıyor"
@@ -7387,12 +7460,12 @@ msgstr "   zaman"
 msgid "Where"
 msgstr "  yer"
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr "Kullanımı: %s [SEÇENEK]... [KULLANICI]...\n"
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -7408,7 +7481,7 @@ msgstr ""
 "  -p              uzun biçemde kullanıcının plan dosyasını göstermez\n"
 "  -s              kısa biçemde çıktı üretir, öntanımlı\n"
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -7424,7 +7497,7 @@ msgstr ""
 "zamanını\n"
 "                  göstermez\n"
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -7435,7 +7508,7 @@ msgstr ""
 "Basit bir`finger' uygulaması;  kullanıcı bilgilerini gösterir.\n"
 "utmp dosyası olarak %s kullanılacaktır.\n"
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr ""
@@ -7681,7 +7754,8 @@ msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
@@ -7691,7 +7765,7 @@ msgstr ""
 "                    diğer hiçbir seçeneğin satırları kısaltmasına\n"
 "                    izin vermez\n"
 
-#: src/pr.c:2827
+#: src/pr.c:2828
 #, fuzzy
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
@@ -7707,7 +7781,7 @@ msgstr ""
 "                    bu seçenek diğer kolon seçeneklerini etkilemez\n"
 "  -t, --omit-header sayfalara başlık ve bitiş koymaz\n"
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 #, fuzzy
 msgid ""
 "  -T, --omit-pagination\n"
@@ -7736,7 +7810,7 @@ msgstr ""
 "istiyor-\n"
 "                    sanız -w seçeneğini mutlaka kullanın\n"
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 #, fuzzy
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
@@ -7753,7 +7827,7 @@ msgstr ""
 "seçenek\n"
 "                    ve -s ,-S  seçenekleri birbirlerini etkilemezler\n"
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 #, fuzzy
 msgid ""
 "\n"
@@ -7778,7 +7852,7 @@ msgstr ""
 
 #: src/printenv.c:69
 #, fuzzy
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr ""
 " -z, --zero-terminated     satırları  satır-sonu karakteri (\\n) \n"
 "                          yerine 0'la (0 baytı) bitirir\n"
@@ -7900,12 +7974,12 @@ msgstr "uyarı: `%s'den başlayarak fazladan argümanlar yoksayıldı"
 msgid "F. Pinard"
 msgstr "F. Pinard"
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, fuzzy, c-format
 msgid "%s (for regexp %s)"
 msgstr "%s (`%s' düzenli ifadesi için)"
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
@@ -7914,7 +7988,7 @@ msgstr ""
 "Kullanım: %s [SEÇENEK]... [GİRDİ]...   (-G olmaksızın)\n"
 "    veya: %s -G [SEÇENEK]... [GİRDİ [ÇIKTI]]\n"
 
-#: src/ptx.c:1821
+#: src/ptx.c:1824
 #, fuzzy
 msgid ""
 "Output a permuted index, including context, of the words in the input "
@@ -7923,7 +7997,7 @@ msgstr ""
 "girdi dosyasındaki kelimelerin (contextleriyle beraber),bir permutasyonunu \n"
 " oluÅŸturur.\n"
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 #, fuzzy
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
@@ -7937,7 +8011,7 @@ msgstr ""
 " -F, --flag-truncation=DİZGE     Satırları kesmesi gerektiğinde satırı \n"
 "                                 kestiÄŸi yeri  DÄ°ZGE (string) ile belirtir\n"
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 #, fuzzy
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
@@ -7958,7 +8032,7 @@ msgstr ""
 "                                 expression (düzenli ifade) ) \n"
 " -T, --format=tex                TeX formatında çıktı oluştur\n"
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -7980,7 +8054,7 @@ msgstr ""
 " -o, --only-file=DOSYA           girdide sadece DOSYA'daki kelimeleri\n"
 "                                 dikkate alır\n"
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -7993,17 +8067,16 @@ msgstr ""
 " -w, --width=SAYI                çıktıdaki kolon sayısı SAYI olur \n"
 "                                 (referans hariç)\n"
 
-#: src/ptx.c:1854
+#: src/ptx.c:1857
 #, fuzzy
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
 "\n"
-"DOSYA belirtilmediÄŸinde veya - olduÄŸunda standart girdiden okur. \n"
-"`-F /' seçeneği verilmiş gibi çalışır\n"
+"DOSYA verilmemiÅŸse veya DOSYA - ise, standart girdi okunur.\n"
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, c-format
 msgid "invalid gap width: %s"
 msgstr "geçersiz boşluk genişliği: %s"
@@ -8022,22 +8095,28 @@ msgid ""
 "  -P, --physical  avoid all symlinks\n"
 msgstr ""
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+
+#: src/pwd.c:169
 #, c-format
 msgid "failed to chdir to %s"
 msgstr "%s dizinine chdir başarısız"
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, c-format
 msgid "failed to stat %s"
 msgstr "%s durumlanamadı"
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr "%s içinde eşleşen i-düğümlü dizin girdisi bulunamadı"
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, c-format
 msgid "ignoring non-option arguments"
 msgstr "seçenek olmayan argümanlar yoksayılıyor"
@@ -8047,8 +8126,8 @@ msgstr "seçenek olmayan argümanlar yoksayılıyor"
 msgid "Dmitry V. Levin"
 msgstr ""
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Kullanım: %s [SEÇENEK]... DOSYA...\n"
@@ -8101,8 +8180,7 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 "  -f, --canonicalize      verilen yolun bileÅŸenlerinde yer alan her "
 "sembolik\n"
@@ -8134,7 +8212,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 
@@ -8152,41 +8230,42 @@ msgstr "%s: korumalı dizin %s'nin içine inilsin mi?"
 msgid "%s: descend into directory %s? "
 msgstr "%s: %s dizininin içine inilsin mi?"
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr "%s: korumalı %s %s silinsin mi?"
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, c-format
 msgid "%s: remove %s %s? "
 msgstr "%s: %s %s silinsin mi?"
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, c-format
 msgid "removed directory: %s\n"
 msgstr "%s dizini silindi\n"
 
-#: src/remove.c:444
-#, fuzzy, c-format
-msgid "cannot remove directory: %s"
-msgstr "dizin %s silinemiyor"
+#: src/remove.c:447
+#, c-format
+msgid "refusing to remove %s or %s directory: skipping %s"
+msgstr ""
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr ""
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, fuzzy, c-format
 msgid "traversal failed: %s"
 msgstr "okuma başarısız oldu"
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -8211,12 +8290,12 @@ msgstr ""
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 
 #: src/rm.c:149
@@ -8280,13 +8359,17 @@ msgstr ""
 
 #: src/rm.c:342
 #, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr ""
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/rm.c:343
+#: src/rm.c:345
 #, fuzzy, c-format
-msgid "%s: remove all arguments? "
-msgstr "%s: %s %s silinsin mi?"
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] "%s: %s %s silinsin mi?"
+msgstr[1] "%s: %s %s silinsin mi?"
 
 #: src/rmdir.c:134 src/rmdir.c:233
 #, c-format
@@ -8340,7 +8423,7 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
 
@@ -8390,41 +8473,46 @@ msgstr ""
 msgid "no command specified"
 msgstr "süreç kimliği belirtilmemiş"
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr ""
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, fuzzy, c-format
 msgid "failed to compute a new context"
 msgstr "%s açılamadı"
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, fuzzy, c-format
 msgid "failed to set new user %s"
 msgstr "%s durumlanamadı"
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, fuzzy, c-format
 msgid "failed to set new type %s"
 msgstr "%s durumlanamadı"
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, fuzzy, c-format
 msgid "failed to set new range %s"
 msgstr "%s durumlanamadı"
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, fuzzy, c-format
 msgid "failed to set new role %s"
 msgstr "%s durumlanamadı"
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, fuzzy, c-format
 msgid "unable to set security context %s"
 msgstr "%s'in izinleri eski haline getirilemedi"
 
+#: src/selinux.c:127 src/selinux.c:300
+#, fuzzy, c-format
+msgid "error canonicalizing %s"
+msgstr "%s'i okunurken hata"
+
 #: src/seq.c:68
 #, c-format
 msgid ""
@@ -8461,6 +8549,8 @@ msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
@@ -8474,94 +8564,34 @@ msgstr ""
 "Belirtildiği takdirde BİÇEM en azından bir tane printf tarzı gerçel\n"
 "sayı çıktı biçemi (%e, %f, %g den birini) içermelidir.\n"
 
-#: src/seq.c:94
+#: src/seq.c:96
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
 "it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n"
 "decimal numbers with maximum precision PREC, and to %g otherwise.\n"
 msgstr ""
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, c-format
 msgid "invalid floating point argument: %s"
 msgstr "gerçel sayı argüman geçersiz: %s"
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, fuzzy, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr "%s bilinmeyen dosya türüne sahip"
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr "eş genişlikli dizgeler için biçem dizgesi belirtilmeyebilir"
 
-#: src/setuidgid.c:49
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-"Kullanımı: %s KULLANICIADI BİÇEM [ARGÜMAN]...\n"
-"    veya:  %s SEÇENEK\n"
-
-#: src/setuidgid.c:55
-#, fuzzy
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-"Ek grupları bırakır, belirtilen KULLANICIADI'nın kullanıcı ve grup\n"
-"kimliklerini alır ve KOMUT'u belirtilen ARGÜMAN'larla çalıştırır.\n"
-"Eğer gereken UID ve GID'i alamamışsa 111 durumu ile çıkar.\n"
-"Aksi halde, KOMUT'un çıkış durumu ile çıkar.\n"
-"Bu program yalnızca root (UID=0) tarafından çalıştırıldığı zaman "
-"faydalıdır.\n"
-"\n"
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr "bilinmeyen kullanıcı kimliği: %s"
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr ""
-
-#: src/setuidgid.c:190
-#, fuzzy, c-format
-msgid "failed to set supplemental group(s)"
-msgstr "ek grup atanamadı"
-
-#: src/setuidgid.c:200
-#, c-format
-msgid "cannot set group-ID to %lu"
-msgstr "grup kimliği %lu olarak atanamıyor"
-
-#: src/setuidgid.c:204
-#, c-format
-msgid "cannot set user-ID to %lu"
-msgstr "kullanıcı kimliği %lu olarak atanamıyor"
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr ""
 
-#: src/shred.c:148
+#: src/shred.c:170
 #, fuzzy
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
@@ -8571,7 +8601,7 @@ msgstr ""
 "çözümleri ile bile dosya içeriğinin kurtarılabilmesini zorlaştırır.\n"
 "\n"
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, fuzzy, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -8586,9 +8616,10 @@ msgstr ""
 "  -s, --size=N   N sayıda baytı bu işlemden geçirir\n"
 "                (k, M, G gibi sonekler kabul edilir)\n"
 
-#: src/shred.c:161
+#: src/shred.c:183
+#, fuzzy
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
@@ -8601,15 +8632,20 @@ msgstr ""
 "  -z, --zero     işlemi gizlemek için en son olarak üzerine sıfırlarla "
 "yazar\n"
 
-#: src/shred.c:170
+#: src/shred.c:192
+#, fuzzy
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 "\n"
@@ -8623,7 +8659,7 @@ msgstr ""
 "çalıştırıldığı zaman genelde --remove seçeneği kullanılır.\n"
 "\n"
 
-#: src/shred.c:180
+#: src/shred.c:206
 #, fuzzy
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
@@ -8640,7 +8676,7 @@ msgstr ""
 "komutunun işe yaramadığı dosya sistemleri örneklenmiştir:\n"
 "\n"
 
-#: src/shred.c:188
+#: src/shred.c:214
 #, fuzzy
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
@@ -8664,7 +8700,7 @@ msgstr ""
 "  kaydeden dosya sistemleri\n"
 "\n"
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -8673,7 +8709,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -8685,7 +8721,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:215
+#: src/shred.c:241
 #, fuzzy
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
@@ -8701,127 +8737,127 @@ msgstr ""
 "silinemeyen kopyalarını taşıyabilir ve bu shred işleminden geçirilmiş\n"
 "bir dosyanın tekrar oluşturulabilmesini sağlayabilir.\n"
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, c-format
 msgid "%s: fdatasync failed"
 msgstr "%s: fdatasync başarısız"
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr "%s: fsync başarısız"
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr "%s: geri gelinemiyor"
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr "%s: geçiş %lu/%lu (%s)"
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, c-format
 msgid "%s: error writing at offset %s"
 msgstr "%s %s göreli konumunda yazdırma hatası"
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s: arama (lseek) başarısız"
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, c-format
 msgid "%s: file too large"
 msgstr "%s: dosya çok büyük"
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr "%s: geçiş %lu/%lu (%s)...%s"
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr "%s: geçiş %lu/%lu (%s)...%s/%s %d%%"
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, c-format
 msgid "%s: fstat failed"
 msgstr "%s: fstat başarısız"
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, c-format
 msgid "%s: invalid file type"
 msgstr "%s: geçersiz dosya tipi"
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr "%s: dosya büyüklüğü negatif"
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, c-format
 msgid "%s: error truncating"
 msgstr "%s: kısaltmada hata"
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, c-format
 msgid "%s: fcntl failed"
 msgstr "%s: fcntl başarısız"
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr "%s: yalnızca eklenebilir kipte dosya belirteçine shred uygulanamaz"
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr "%s: siliniyor"
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, c-format
 msgid "%s: renamed to %s"
 msgstr "%s: %s olarak yeniden adlandırıldı"
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, c-format
 msgid "%s: failed to remove"
 msgstr "%s: silinemedi"
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr "%s: silindi"
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, c-format
 msgid "%s: failed to close"
 msgstr "%s: kapatılamadı"
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, c-format
 msgid "%s: failed to open for writing"
 msgstr "%s: yazmak için açılamadı"
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, c-format
 msgid "%s: invalid number of passes"
 msgstr "%s geçersiz sayıda geçiş"
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, fuzzy, c-format
 msgid "multiple random sources specified"
 msgstr "birden fazla çıktı dosyası belirtilmiş"
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, c-format
 msgid "%s: invalid file size"
 msgstr "%s: geçersiz dosya büyüklüğü"
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -8832,14 +8868,11 @@ msgstr ""
 "    veya:  %s [SEÇENEK]... İLK SON\n"
 "   ya da:  %s [SEÇENEK]... İLK ARTIŞ SON\n"
 
-#: src/shuf.c:54
-#, fuzzy
+#: src/shuf.c:67
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr ""
-"Her DOSYA'daki satırların seçilen bölümlerini standart çıktıya yazdırır.\n"
-"\n"
 
-#: src/shuf.c:60
+#: src/shuf.c:73
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
 "  -i, --input-range=LO-HI   treat each number LO through HI as an input "
@@ -8847,34 +8880,44 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
 msgstr ""
 
-#: src/shuf.c:244
+#: src/shuf.c:228
+#, fuzzy, c-format
+msgid "too many input lines"
+msgstr "çok fazla tekrar eden satır"
+
+#: src/shuf.c:431
 #, fuzzy, c-format
 msgid "multiple -i options specified"
 msgstr "birden fazla -l veya -t seçeneği belirtilmiş"
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, fuzzy, c-format
 msgid "invalid input range %s"
 msgstr "geçersiz girdi bayrağı: %s"
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, fuzzy, c-format
 msgid "invalid line count %s"
 msgstr "geçersiz satır genişliği: %s"
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, c-format
 msgid "multiple output files specified"
 msgstr "birden fazla çıktı dosyası belirtilmiş"
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, fuzzy, c-format
 msgid "cannot combine -e and -i options"
 msgstr "kip ve --reference seçenekleri birleştirilemez"
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr ""
+
 #: src/sleep.c:44
 #, fuzzy, c-format
 msgid ""
@@ -8896,17 +8939,17 @@ msgstr ""
 "değer gerekirken, burada SAYI bir gerçel sayı olabilir.\n"
 "\n"
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, fuzzy, c-format
 msgid "invalid time interval %s"
 msgstr "`%s' zaman aralığı geçersiz"
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr "gerçekzaman saati okunamıyor"
 
-#: src/sort.c:399
+#: src/sort.c:427
 #, fuzzy
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr ""
@@ -8919,13 +8962,13 @@ msgstr ""
 "Sıralama seçenekleri:\n"
 "\n"
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
 msgstr ""
 
-#: src/sort.c:409
+#: src/sort.c:437
 #, fuzzy
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
@@ -8943,7 +8986,7 @@ msgstr ""
 "  -f, --ignore-case           sıralarken büyük/küçük harf farklılıklarını \n"
 "                              dikkate almaz \n"
 
-#: src/sort.c:415
+#: src/sort.c:443
 #, fuzzy
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
@@ -8970,12 +9013,12 @@ msgstr ""
 "  -r, --reverse               tersine sıralar\n"
 "\n"
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 
-#: src/sort.c:423
+#: src/sort.c:451
 #, fuzzy
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
@@ -9003,7 +9046,7 @@ msgstr ""
 "  -r, --reverse               tersine sıralar\n"
 "\n"
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -9013,19 +9056,19 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/sort.c:437
+#: src/sort.c:465
 msgid ""
 "Other options:\n"
 "\n"
 msgstr ""
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
 msgstr ""
 
-#: src/sort.c:445
+#: src/sort.c:473
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
 "  -C, --check=quiet, --check=silent  like -c, but do not report first bad "
@@ -9034,7 +9077,7 @@ msgid ""
 "                              decompress them with PROG -d\n"
 msgstr ""
 
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -9043,13 +9086,13 @@ msgid ""
 "                            If F is - then read names from standard input\n"
 msgstr ""
 
-#: src/sort.c:459
+#: src/sort.c:487
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
 "  -m, --merge               merge already sorted files; do not sort\n"
 msgstr ""
 
-#: src/sort.c:463
+#: src/sort.c:491
 #, fuzzy
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
@@ -9075,7 +9118,7 @@ msgstr ""
 "                            baştan sona bayt bayt karşılaştırır)\n"
 "  -S, --buffer-size=SAYI    ana bellekten SAYI genişliğinde alan kullanır\n"
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, fuzzy, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -9099,13 +9142,7 @@ msgstr ""
 "                            kullanılmadığında sıralama yaparken aynı olan \n"
 "                            satırlardan sadece birini yazar \n"
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr ""
-" -z, --zero-terminated     satırları  satır-sonu karakteri (\\n) \n"
-"                          yerine 0'la (0 baytı) bitirir\n"
-
-#: src/sort.c:483
+#: src/sort.c:511
 #, fuzzy
 msgid ""
 "\n"
@@ -9137,7 +9174,7 @@ msgstr ""
 "\n"
 "SAYI'dan sonra aşağıdaki soneklerden biri gelebilir:\n"
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -9158,260 +9195,245 @@ msgstr ""
 "bayt değerlerine göre sıralama için LC_ALL çevre değişkenine C değerini "
 "atayın.\n"
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, fuzzy, c-format
 msgid "waiting for %s [-d]"
 msgstr "%s'e yazılıyor"
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr ""
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, fuzzy, c-format
 msgid "cannot create temporary file in %s"
 msgstr "geçici dosya %s oluşturulamadı"
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr "açma işlemi başarısız"
 
-#: src/sort.c:970
+#: src/sort.c:998
 msgid "fflush failed"
 msgstr "fflush başarısız"
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr "kapatma işlemi başarısız"
 
-#: src/sort.c:986
-#, fuzzy, c-format
-msgid "dup2 failed"
-msgstr "açma işlemi başarısız"
-
-#: src/sort.c:1103
-#, c-format
-msgid "couldn't execute %s"
-msgstr ""
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 #, fuzzy
 msgid "couldn't create temporary file"
 msgstr "geçici dosya oluşturulamadı"
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, fuzzy, c-format
 msgid "couldn't create process for %s -d"
 msgstr "%s dizini oluşturulamıyor"
 
-#: src/sort.c:1161
-#, c-format
-msgid "couldn't execute %s -d"
-msgstr ""
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, c-format
 msgid "warning: cannot remove: %s"
 msgstr "uyarı: %s silinemedi"
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, fuzzy, c-format
 msgid "invalid --%s argument %s"
 msgstr "%s argümanı geçersiz"
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, fuzzy, c-format
 msgid "minimum --%s argument is %s"
 msgstr "%s argümanı `%s' için belirsiz"
 
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, fuzzy, c-format
 msgid "--%s argument %s too large"
 msgstr "%s: `%.*s' sayımı fazla büyük"
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr ""
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr ""
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr "stat başarısız"
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr "okuma başarısız oldu"
 
 #
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, fuzzy, c-format
 msgid "string transformation failed"
 msgstr "dizge karşılaştırması başarısız"
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, c-format
 msgid "the untransformed string was %s"
 msgstr ""
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr ""
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr ""
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr ""
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr ""
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr ""
 
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, fuzzy, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
-msgstr[0] "%s: `%s' seçeneği belirsiz\n"
-msgstr[1] "%s: `%s' seçeneği belirsiz\n"
+msgstr[0] "%s: `-W %s' seçeneği belirsiz\n"
+msgstr[1] "%s: `-W %s' seçeneği belirsiz\n"
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr ""
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr "yazma başarısız oldu"
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr "%s: %s:%s: sırasız: "
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr "standart hata"
 
-#: src/sort.c:3698
+#: src/sort.c:3738
 #, fuzzy
 msgid "cannot read"
 msgstr "%s: geri gelinemiyor"
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, fuzzy, c-format
 msgid "%s: invalid field specification %s"
 msgstr "%s: geçersiz alan tanımı `%s'"
 
-#: src/sort.c:3987
-#, fuzzy, c-format
+#: src/sort.c:4028
+#, c-format
 msgid "options '-%s' are incompatible"
-msgstr "%s: `%s' seçeneği belirsiz\n"
+msgstr ""
 
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, fuzzy, c-format
 msgid "%s: invalid count at start of %s"
 msgstr "%s: `%s' başlangıcında geçersiz sayım"
 
-#: src/sort.c:4295
+#: src/sort.c:4336
 #, fuzzy
 msgid "invalid number after '-'"
 msgstr "`-' den sonra geçersiz sayı"
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 #, fuzzy
 msgid "invalid number after '.'"
 msgstr "`.' dan sonra geçersiz sayı"
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr "alan tanımında fazla harf"
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, fuzzy, c-format
 msgid "multiple compress programs specified"
 msgstr "birden fazla hedef dizin belirtilmiÅŸ"
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
 msgstr "alan başlangıcında geçersiz sayı"
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
 msgstr "alan numarası sıfır"
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr "sıralama anahtarında belirtilen karakter yeri sıfır"
 
-#: src/sort.c:4407
+#: src/sort.c:4448
 #, fuzzy
 msgid "invalid number after ','"
 msgstr "`,' den sonra geçersiz sayı"
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr "boÅŸ sekme"
 
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, c-format
 msgid "cannot read file names from %s"
 msgstr "%s'den dosya adları okunamadı"
 
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, fuzzy, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr "geçersiz sıfır uzunluklu dosya adı"
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, fuzzy, c-format
 msgid "no input from %s"
 msgstr "girdi dosyası %s kapatılıyor"
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr ""
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr ""
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, fuzzy, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr "-c seçeneği ile ekstra işlenen %s kullanılamaz"
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr ""
 
-#: src/split.c:204
+#: src/split.c:203
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr "Kullanım: %s [SEÇENEK] [GİRDİ [ÖNEK]]\n"
 
-#: src/split.c:208
+#: src/split.c:207
 #, fuzzy
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
@@ -9424,32 +9446,25 @@ msgstr ""
 "GIRDI belirtilmediğinde veya - olduğunda standart girdiyi kullanır\n"
 "\n"
 
-#: src/split.c:216
-#, fuzzy, c-format
+#: src/split.c:215
+#, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
-"  -a, --suffix-length=N   parça isimlerinin ONEK'ten sonraki bölümlerinin \n"
-"                          uzunluğu N olur ( -a kullanılmadıkça %d) \n"
-"  -b, --bytes=SAYI        dosyayı N bayt parçalara böler\n"
-"  -C, --line-bytes=SAYI   parçaların her satırında en fazla N bayt olur\n"
-"  -d, --numeric-suffixes  alfabetik değil, nümerik sonekler kullanır\n"
-"  -l, --lines=SAYI        her parçada N tane satır olur\n"
 
-#: src/split.c:229
+#: src/split.c:228
 #, fuzzy
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
@@ -9460,7 +9475,7 @@ msgstr ""
 "hata'ya\n"
 "                          yazılır)\n"
 
-#: src/split.c:236
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -9472,190 +9487,190 @@ msgid ""
 "r/K/N   likewise but only output Kth of N to stdout\n"
 msgstr ""
 
-#: src/split.c:354
+#: src/split.c:353
 #, fuzzy, c-format
 msgid "output file suffixes exhausted"
 msgstr "kullanacak parça ismi kalmadı"
 
-#: src/split.c:366
+#: src/split.c:365
 #, fuzzy, c-format
 msgid "creating file %s\n"
 msgstr "`%s' dosyası oluşturuluyor\n"
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr ""
 
-#: src/split.c:391
+#: src/split.c:390
 #, fuzzy, c-format
 msgid "failed to set FILE environment variable"
 msgstr "çevre değişkeni LS_COLORS'da taranamaz değer"
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr ""
 
-#: src/split.c:395
+#: src/split.c:394
 #, fuzzy, c-format
 msgid "failed to create pipe"
 msgstr "%s durumlanamadı"
 
-#: src/split.c:409
+#: src/split.c:408
 #, fuzzy, c-format
 msgid "closing prior pipe"
 msgstr "%s dizini kapatılıyor"
 
-#: src/split.c:411
+#: src/split.c:410
 #, fuzzy, c-format
 msgid "closing output pipe"
 msgstr "çıktı dosyası %s kapatılıyor"
 
-#: src/split.c:415
+#: src/split.c:414
 #, fuzzy, c-format
 msgid "moving input pipe"
 msgstr "girdi dosyası %s kapatılıyor"
 
-#: src/split.c:417
+#: src/split.c:416
 #, fuzzy, c-format
 msgid "closing input pipe"
 msgstr "girdi dosyası %s kapatılıyor"
 
-#: src/split.c:422
+#: src/split.c:421
 #, fuzzy, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr "%s komutu çalıştırılamadı"
 
-#: src/split.c:428
+#: src/split.c:427
 #, fuzzy, c-format
 msgid "failed to close input pipe"
 msgstr "%s: kapatılamadı"
 
-#: src/split.c:464
+#: src/split.c:463
 #, c-format
 msgid "waiting for child process"
 msgstr ""
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr ""
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr ""
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr ""
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr "-C -l -b seçenekleri beraber kullanılmaz"
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, fuzzy, c-format
 msgid "%s: invalid number of chunks"
 msgstr "%s: geçersiz saniye sayısı"
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, fuzzy, c-format
 msgid "%s: invalid chunk number"
 msgstr "%s: geçersiz sayı"
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr "%s: -a seçeneğine verilen arguman geçersiz"
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr "%s: geçersiz bayt sayısı"
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr "%s: geçersiz satır sayısı"
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, c-format
 msgid "line count option -%s%c... is too large"
 msgstr "satır sayma seçeneği -%s%c... fazla büyük"
 
-#: src/split.c:1248
+#: src/split.c:1298
 #, fuzzy, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr "geçersiz başlangıç satır numarası: %s"
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, fuzzy, c-format
 msgid "%s: invalid IO block size"
 msgstr "%s: geçersiz dosya büyüklüğü"
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr ""
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr ""
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, fuzzy, c-format
 msgid "%s: cannot determine file size"
 msgstr "makina ismi saptanamadı"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr ""
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, fuzzy, c-format
 msgid "failed to canonicalize %s"
 msgstr "%s açılamadı"
 
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, fuzzy, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr "%s: `%c%s' seçeneği bilinmiyor\n"
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, fuzzy, c-format
 msgid "%s: invalid directive"
 msgstr "%%%c: yönerge geçersiz"
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, fuzzy, c-format
 msgid "warning: backslash at end of format"
 msgstr "dizge sonunda geçersiz terskesik gösterimi"
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr ""
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, c-format
 msgid "cannot read file system information for %s"
 msgstr "%s için dosyasistem bilgisi okunamadı"
 
 #
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, fuzzy, c-format
 msgid "cannot stat standard input"
 msgstr "standart girdi kapatılıyor"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -9666,7 +9681,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -9674,30 +9689,30 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, c-format
 msgid "Context: %C\n"
 msgstr ""
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -9705,27 +9720,27 @@ msgid ""
 " Birth: %w\n"
 msgstr ""
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
 msgstr ""
 
-#: src/stat.c:1356
+#: src/stat.c:1418
 msgid ""
 "  -L, --dereference     follow links\n"
 "  -f, --file-system     display file system status instead of file status\n"
 msgstr ""
 
-#: src/stat.c:1360
+#: src/stat.c:1422
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 #, fuzzy
 msgid ""
 "\n"
@@ -9745,7 +9760,7 @@ msgstr ""
 "  %B   `%b' ile verilen her bloÄŸun bayt cinsinden boyu\n"
 "  %b   Ayrılan blok sayısı (bkz. %B)\n"
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 #, fuzzy
 msgid ""
 "  %d   device number in decimal\n"
@@ -9762,7 +9777,7 @@ msgstr ""
 "  %G   Sahibin grup adı\n"
 "  %g   Sahibin grup kimlik no'su\n"
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 #, fuzzy
 msgid ""
 "  %h   number of hard links\n"
@@ -9772,8 +9787,8 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 "  %h   Sabit bağ sayısı\n"
 "  %i   Idüğüm sayısı\n"
@@ -9784,7 +9799,7 @@ msgstr ""
 "  %T   Onaltılık minör aygıt türü\n"
 "  %t   Onaltılık majör aygıt türü\n"
 
-#: src/stat.c:1399
+#: src/stat.c:1461
 #, fuzzy
 msgid ""
 "  %u   user ID of owner\n"
@@ -9793,10 +9808,10 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 "  %U   Sahibin kullanıcı adı\n"
@@ -9809,7 +9824,7 @@ msgstr ""
 "  %z   Son dosya değişim zamanı\n"
 "\n"
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 #, fuzzy
 msgid ""
 "Valid format sequences for file systems:\n"
@@ -9828,7 +9843,7 @@ msgstr ""
 "  %d   Dosya sisteminde boş dosya düğümleri\n"
 "  %f   Dosya sisteminde boÅŸ bloklar\n"
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 #, fuzzy
 msgid ""
 "  %i   file system ID in hex\n"
@@ -9896,22 +9911,27 @@ msgid ""
 "and are thus unaffected by 'stdbuf' settings.\n"
 msgstr ""
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, fuzzy, c-format
 msgid "failed to find %s"
 msgstr "%s açılamadı"
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, c-format
 msgid "failed to update the environment with %s"
 msgstr ""
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr ""
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, c-format
+msgid "you must specify a buffering mode option"
+msgstr ""
+
+#: src/stty.c:516
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -9922,11 +9942,11 @@ msgstr ""
 "    veya:  %s [-F AYGIT] [--file=AYGIT] [-a|--all]\n"
 "   ya da:  %s [-F AYGIT] [--file=AYGIT] [-g|--save]\n"
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
 msgstr ""
 
-#: src/stty.c:525
+#: src/stty.c:528
 #, fuzzy
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
@@ -9939,7 +9959,7 @@ msgstr ""
 "  -g, --save         tüm ayarları stty-okuyabilir biçimde gösterir\n"
 "  -F, --file=AYGIT   stdGirdi yerine belirtilen AYGITI açar ve kullanır\n"
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
@@ -9949,7 +9969,7 @@ msgstr ""
 "AYARdan önceki seçimlik `-' anlamı ters çevirir. * karakteri POSIX olmayan\n"
 "ayarları gösterir. Hangi ayarların kullanılabileceği sisteme göre değişir.\n"
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -9963,7 +9983,7 @@ msgstr ""
 "  eof KRKT      KRKT dosya sonu karakteri olacak  (girdiyi sonlandırır)\n"
 "  eol KRKT      KRKT satır sonu karakteri olacak\n"
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -9975,7 +9995,7 @@ msgstr ""
 "  intr KRKT     KRKT bir kesme (SIGINT) sinyali gönderecektir\n"
 "  kill KRKT     KRKT bulunulan satırı silecektir\n"
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -9987,7 +10007,7 @@ msgstr ""
 "* rprnt KRKT    KRKT bulunulan satırı yeniden yazacaktır\n"
 "  start KRKT    KRKT durdurulduktan sonra çıktıyı yeniden başlatacaktır\n"
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -9999,7 +10019,7 @@ msgstr ""
 "* swtch KRKT    KRKT başka bir kabuk katmanına geçecektir\n"
 "* werase KRKT   KRKT son sözcüğü silecektir\n"
 
-#: src/stty.c:562
+#: src/stty.c:565
 #, fuzzy
 msgid ""
 "\n"
@@ -10014,7 +10034,7 @@ msgstr ""
 " * cols N        çekirdeğe terminal genişliğini N karakter olarak bildirir\n"
 "* columns N      cols N ile aynı\n"
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -10029,7 +10049,7 @@ msgstr ""
 "                sayısını N yapar\n"
 "  ospeed N      çıktı hızını N olarak ayarlar\n"
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -10042,7 +10062,7 @@ msgstr ""
 "  speed         terminal hızını gösterir\n"
 "  time N        -icanon ile okuma zaman aşımını N/10 saniyeye ayarlar\n"
 
-#: src/stty.c:581
+#: src/stty.c:584
 #, fuzzy
 msgid ""
 "\n"
@@ -10060,7 +10080,7 @@ msgstr ""
 "* [-]crtscts    RTS/CTS uzlaşmasını etkinleştirir\n"
 "  csN           karakter bit sayısını N olarak ayarlar, [5..8 bit arasında]\n"
 
-#: src/stty.c:590
+#: src/stty.c:593
 #, fuzzy
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
@@ -10069,6 +10089,7 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 "  [-]cstopb     her karakter için iki durma biti kullanılır (`-' ile bir)\n"
 "  [-]hup        son işlem tty'yi kapatırken kapatma (SIGHUP) sinyali "
@@ -10078,7 +10099,7 @@ msgstr ""
 "beklenir\n"
 "  [-]parodd     tek eşlik biti kullanılır (`-' ile çift)\n"
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -10095,7 +10116,7 @@ msgstr ""
 "  [-]ignbrk     kırma karakterlerini yoksayar\n"
 "  [-]igncr      satır başı karakterlerini yoksayar\n"
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -10110,11 +10131,11 @@ msgstr ""
 "  [-]inpck      girdi eÅŸlik denetimini etkinleÅŸtirir\n"
 "  [-]istrip     girdi karakterlerinin yüksek (8.) bitini temizler\n"
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr " * [-]iutf8      girdi karakterlerinin UTF-8 kodlu olduÄŸunu varsayar\n"
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -10131,7 +10152,7 @@ msgstr ""
 "  [-]parmrk     eşlik hatalarını imler (255-0-karakter sıralamasıyla)\n"
 "  [-]tandem     [-]ixoff ile aynı\n"
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -10147,10 +10168,11 @@ msgstr ""
 "* ffN           sayfa başı tarzı gecikme, N [0..1] arasında\n"
 "* nlN           alt satıra geçiş tarzı gecikme, N [0..1] arasında\n"
 
-#: src/stty.c:631
+#: src/stty.c:635
+#, fuzzy
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
@@ -10164,7 +10186,7 @@ msgstr ""
 "* [-]onlcr      alt satıra geçişi satır başı olarak yorumlar\n"
 "* [-]onlret     alt satıra geçiş karakteri satır başı yapar\n"
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -10180,7 +10202,7 @@ msgstr ""
 "* -tabs         tab3 ile aynı\n"
 "* vtN           düşey sekme tarzı gecikme, N [0..1] arasında\n"
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -10195,7 +10217,7 @@ msgstr ""
 "* crtkill       satırları echoprt ve echoe ayarlarına uygun olarak siler\n"
 "* -crtkill      satırları echoctl ve echok ayarlarına uygun olarak siler\n"
 
-#: src/stty.c:654
+#: src/stty.c:658
 #, fuzzy
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
@@ -10210,7 +10232,7 @@ msgstr ""
 "  [-]echoe      [-]crterase ile aynı\n"
 "  [-]echok      karakteri sildikten sonra bir alt satıra geçiş yansılar\n"
 
-#: src/stty.c:661
+#: src/stty.c:665
 #, fuzzy
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
@@ -10228,7 +10250,7 @@ msgstr ""
 "                karakterlerini etkinleÅŸtirir\n"
 "  [-]iexten     POSIX olmayan özel karakterleri etkinleştirir\n"
 
-#: src/stty.c:668
+#: src/stty.c:672
 #, fuzzy
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
@@ -10245,7 +10267,7 @@ msgstr ""
 "* [-]tostop     terminale yazmaya çalışan artalandaki işleri durdurur\n"
 "* [-]xcase      icanon ile, büyük harfleri `\\' ile önceleyerek gösterir\n"
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -10259,7 +10281,7 @@ msgstr ""
 "  cbreak        -icanon ile aynı\n"
 "  -cbreak       icanon ile aynı\n"
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -10272,7 +10294,7 @@ msgstr ""
 "  -cooked       raw ile aynı\n"
 "  crt           echoe echoctl echoke ile aynı\n"
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -10287,7 +10309,7 @@ msgstr ""
 "                değerleriyle aynı\n"
 "  evenp         parenb -parodd cs7 ile aynı\n"
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -10303,7 +10325,7 @@ msgstr ""
 "  nl            -icrnl -onlcr ile aynı\n"
 "  -nl           icrnl -inlcr -igncr onlcr -ocrnl -onlret ile aynı\n"
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -10317,7 +10339,7 @@ msgstr ""
 "  pass8         -parenb -istrip cs8 ile aynı\n"
 "  -pass8        parenb istrip cs7 ile aynı\n"
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -10329,7 +10351,7 @@ msgstr ""
 "                -imaxbel -opost -isig -icanon -xcase min 1 time 0 ile aynı\n"
 "  -raw          cooked ile aynı\n"
 
-#: src/stty.c:716
+#: src/stty.c:720
 #, fuzzy
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
@@ -10346,7 +10368,7 @@ msgstr ""
 "                -xcase -tostop -echoprt echoctl echoke, tüm özel\n"
 "                karakterlerin öntanımlı değerleriyle aynı.\n"
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -10362,12 +10384,12 @@ msgstr ""
 "ya da 127 olarak gösterilmiş bir karakter olabilir. ^- veya undef değerleri\n"
 "bu özel karakteri geçersiz kılar\n"
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, c-format
 msgid "only one device may be specified"
 msgstr "sadee tek aygıt belirtilebilir"
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
@@ -10376,43 +10398,43 @@ msgstr ""
 "ayrıntılı çıktı seçenekleri ile stty-okuyabilir tarzı çıktı\n"
 "seçenekleri birlikte kullanılamaz"
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr "bir çıktı tarzı belirtildiğinde kipler ayarlanamaz"
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr "%s: bloklamayan kip sıfırlanamadı"
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, fuzzy, c-format
 msgid "invalid argument %s"
 msgstr "%s argümanı geçersiz"
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, fuzzy, c-format
 msgid "missing argument to %s"
 msgstr "`%s'de argüman kayıp"
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, fuzzy, c-format
 msgid "invalid line discipline %s"
 msgstr "geçersiz satır belirleyicisi `%s'"
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr "%s: istenen işlemlerin tümü yapılamıyor"
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr "%s: bu aygıt için boyut bilgileri yok"
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, fuzzy, c-format
 msgid "invalid integer argument %s"
 msgstr "tamsayı argüman olarak `%s' geçersiz"
@@ -10469,7 +10491,7 @@ msgid "      --version  output version information and exit\n"
 msgstr "      --version  sürüm bilgisini gösterir ve çıkar\n"
 
 #
-#: src/system.h:544
+#: src/system.h:543
 #, fuzzy
 msgid ""
 "\n"
@@ -10478,15 +10500,15 @@ msgstr ""
 "Uzun seçenekler için zorunlu olan argümanlar kısa seçenekler için de "
 "zorunludur.\n"
 
-#: src/system.h:552
+#: src/system.h:551
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -10495,36 +10517,33 @@ msgid ""
 "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n"
 msgstr ""
 
-#: src/system.h:571
-#, fuzzy, c-format
+#: src/system.h:570
+#, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
+"%s online help: <%s>\n"
 msgstr ""
-"\n"
-"Yazılım hatalarını <%s> adresine,\n"
-"çeviri hatalarını <gnu-tr@belgeler.org> adresine bildirin.\n"
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr ""
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr ""
 
-#: src/system.h:596
+#: src/system.h:591
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Daha fazla bilgi için `%s --help' yazın.\n"
 
-#: src/system.h:628
+#: src/system.h:633
 #, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -10623,18 +10642,16 @@ msgstr ""
 
 #: src/tail.c:270
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
 
 #: src/tail.c:274
+#, fuzzy
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 "  -f, --follow[={name|descriptor}]\n"
@@ -10647,18 +10664,17 @@ msgstr ""
 "                           descriptor'ını  kullanarak izler.\n"
 "  -F                       --follow=name --retry 'ın aynısı \n"
 
-#: src/tail.c:281
+#: src/tail.c:280
 #, fuzzy, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
 "  -n, --lines=SAYI         son %d satır yerine son SAYI satırı yazar\n"
 "      --max-unchanged-stats=N\n"
@@ -10671,14 +10687,12 @@ msgstr ""
 "yapar)\n"
 
 #
-#: src/tail.c:294
+#: src/tail.c:293
 #, fuzzy
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 "      --pid=PID           -f ile kullanılır. Proses numarası PID olan "
 "proses\n"
@@ -10690,16 +10704,16 @@ msgstr ""
 "eder \n"
 "  -v,  --verbose           dosya isimlerini gösteren başlıklar yazar\n"
 
-#: src/tail.c:301
+#: src/tail.c:298
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 
-#: src/tail.c:310
+#: src/tail.c:307
 #, fuzzy
 msgid ""
 "\n"
@@ -10717,7 +10731,7 @@ msgstr ""
 "b = 512, k = 1024, m = 1024*1024.\n"
 "\n"
 
-#: src/tail.c:319
+#: src/tail.c:316
 #, fuzzy
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
@@ -10733,161 +10747,164 @@ msgstr ""
 "silinse, sonra yerine başka bir deneme dosyası oluşsa bütün bunlardan\n"
 "sonra tail `deneme' dosyasının içinde olanları göstermeye devam eder).\n"
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr "%s kapatılıyor (fd=%d)"
 
-#: src/tail.c:453
-#, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr "%s: görece %s'ye ilerlenemiyor (seek)"
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr "%s: dosyanın sonundan %s görecesine geri gidilemiyor (seek)"
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr ""
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
 "reverting to polling"
 msgstr ""
 
-#: src/tail.c:963
+#: src/tail.c:965
+#, fuzzy, c-format
+msgid "%s has been replaced with a symbolic link. giving up on this name"
+msgstr "`%s' ismi artık izlenemeyecek bir dosyaya ait"
+
+#: src/tail.c:980
 #, fuzzy, c-format
 msgid "%s has become inaccessible"
 msgstr "`%s' dosyası okunamaz  hale geldi"
 
-#: src/tail.c:980
+#: src/tail.c:997
 #, fuzzy, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr "`%s' ismi artık izlenemeyecek bir dosyaya ait"
 
-#: src/tail.c:989
+#: src/tail.c:1006
 #, fuzzy, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr "`%s' ismi artık izlenemeyecek bir dosyaya ait"
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, fuzzy, c-format
 msgid "%s has become accessible"
 msgstr "`%s' dosyası tekrar okunabilir hale geldi"
 
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, fuzzy, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr "`%s' ortaya çıktı; yeni dosyanın sonu takip ediliyor"
 
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, fuzzy, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr "`%s' tekrar okunabilir hale geldi; yeni dosyayı izlemeye devam"
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr "%s: bloklamayan kip deÄŸiÅŸtirilemedi"
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr "%s: dosya kısaldı"
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr "üzerinde çalışabilecek dosya kalmadı"
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, fuzzy, c-format
 msgid "cannot watch parent directory of %s"
 msgstr "şimdiki dizin durumlanamadı (şimdi %s)"
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, fuzzy, c-format
 msgid "inotify resources exhausted"
 msgstr "bellek tükendi"
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, fuzzy, c-format
 msgid "cannot watch %s"
 msgstr "`touch' %s yapılamadı"
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr ""
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, fuzzy, c-format
 msgid "error reading inotify event"
 msgstr "%s'i okunurken hata"
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr "%s: tail bu çeşit dosyayı takip edemez"
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, fuzzy, c-format
 msgid "number in %s is too large"
 msgstr "`%s' içindeki sayı çok büyük"
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr "%s:--max-unchanged-stats seçeneğiyle verilen argüman geçersiz"
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr "%s: geçersiz PID"
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr "%s: geçersiz saniye sayısı"
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr ""
 
-#: src/tail.c:2034
+#: src/tail.c:2096
 #, fuzzy, c-format
-msgid "warning: --retry is useful mainly when following by name"
+msgid "warning: --retry ignored; --retry is useful only when following"
+msgstr "uyarı: --pid=PID sadece -f seçeneğiyle kullanıldığında bir anlam taşır"
+
+#: src/tail.c:2100
+#, c-format
+msgid "warning: --retry only effective for the initial open"
 msgstr ""
-"uyarı: --retry seçeneği sadece --follow=name seçeneğiyle kullanıldığında \n"
-" bir anlam taşır"
 
-#: src/tail.c:2038
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
 msgstr "uyarı: --pid=PID sadece -f seçeneğiyle kullanıldığında bir anlam taşır"
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr "uyarı: --pid=PID bu sistemde desteklenmiyor"
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, c-format
 msgid "cannot follow %s by name"
 msgstr "%s adı ile takip edilemiyor"
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr "uyarı: standart girdiyi sonsuza dek takip etmek verimli değildir"
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr ""
@@ -11166,17 +11183,17 @@ msgstr "%s argümanı fazla"
 msgid "warning: sigprocmask"
 msgstr ""
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr ""
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr ""
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
@@ -11185,34 +11202,29 @@ msgstr ""
 "Kullanımı: %s BİÇEM [ARGÜMAN]...\n"
 "    veya:  %s SEÇENEK\n"
 
-#
-#: src/timeout.c:229
-#, fuzzy
+#: src/timeout.c:232
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
 msgstr ""
-"Uzun seçenekler için zorunlu olan argümanlar kısa seçenekler için de "
-"zorunludur.\n"
 
-#: src/timeout.c:235
+#: src/timeout.c:238
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 msgid ""
 "\n"
 "DURATION is a floating point number with an optional suffix:\n"
@@ -11220,7 +11232,7 @@ msgid ""
 "days.\n"
 msgstr ""
 
-#: src/timeout.c:259
+#: src/timeout.c:262
 msgid ""
 "\n"
 "If the command times out, and --preserve-status is not set, then exit with\n"
@@ -11231,17 +11243,17 @@ msgid ""
 "case the exit status is 128+9 rather than 124.\n"
 msgstr ""
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr ""
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, fuzzy, c-format
 msgid "error waiting for command"
 msgstr "%s'e yazarken hata"
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr ""
@@ -11633,7 +11645,7 @@ msgstr ""
 #: src/truncate.c:115
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 
 #: src/truncate.c:121
@@ -11719,12 +11731,12 @@ msgstr ""
 "(tsort = topological sort, topolojik sıralama)\n"
 "\n"
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr "%s: girdide tek sayılı andaç var"
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr "%s: girdide bir döngü (döngü=loop, Graph Teorideki anlamında)  var"
@@ -11825,12 +11837,12 @@ msgstr "sekmeler fazla aralı"
 msgid "tab stop value is too large"
 msgstr "sekme boyu %s çok büyük"
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr "Kullanım: %s [SEÇENEK]... [GİRDİ [ÇIKTI]]\n"
 
-#: src/uniq.c:138
+#: src/uniq.c:174
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
 "writing to OUTPUT (or standard output).\n"
@@ -11838,45 +11850,46 @@ msgid ""
 "With no options, matching lines are merged to the first occurrence.\n"
 msgstr ""
 
-#: src/uniq.c:147
+#: src/uniq.c:183
+#, fuzzy
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
 msgstr ""
 "  -c, --count           her satır başına tekrar sayısını yazar\n"
 "  -d, --repeated        sadece aynısından iki tane olan satırları gösterir\n"
 
-#: src/uniq.c:151
-#, fuzzy
+#: src/uniq.c:187
+msgid ""
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
+msgstr ""
+
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr ""
+
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
+msgstr ""
+
+#: src/uniq.c:199
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
 "  -i, --ignore-case     ignore differences in case when comparing\n"
 "  -s, --skip-chars=N    avoid comparing the first N characters\n"
 "  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
 msgstr ""
-"  -D --all-repeated[=delimit-method] sadece birden fazla olan satırları "
-"yazar\n"
-"                        delimit-method ÅŸu deÄŸerleri alabilir:\n"
-"                         none: satırları ayırmaz \n"
-"                               (delimit-method belirtilmediÄŸinde none \n"
-"                                kullanılır)\n"
-"                        prepend: her satır grubunun başına boşluk koyar\n"
-"                        separate: satır gruplarının arasına  boşluk koyar\n"
-"  -f, --skip-fields=N   ilk N alanı karşılaştırmaz\n"
-"  -i, --ignore-case     büyük/küçük harf farklılıklarını dikkate almaz\n"
-"  -s, --skip-chars=N    ilk N karakteri karşılaştırmaz\n"
-"  -u, --unique          sadece özgün satırları karşılaştır\n"
-
-#: src/uniq.c:161
+
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr ""
 "  -w, --check-chars=N   her satırda N'den fazla karakter karşılaştırmaz\n"
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 #, fuzzy
 msgid ""
 "\n"
@@ -11887,7 +11900,7 @@ msgstr ""
 "Aralıksız devam eden boşluklara alan denir\n"
 "-s ve -f seçenekleri kullanıldığında alanlar karakterlerden önce atlanır.\n"
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 msgid ""
 "\n"
 "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n"
@@ -11895,24 +11908,36 @@ msgid ""
 "Also, comparisons honor the rules specified by 'LC_COLLATE'.\n"
 msgstr ""
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, c-format
 msgid "too many repeated lines"
 msgstr "çok fazla tekrar eden satır"
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
 msgstr "atlanacak alan sayısı geçersiz"
 
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
 msgstr "atlanacak bayt sayısı geçersiz"
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
 msgstr "karşılaştırılacak bayt sayısı geçersiz"
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr ""
+
+#: src/uniq.c:652
+#, fuzzy, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr ""
+"hem aynı olan satırların yazılmasına izin vermek hem de aynı\n"
+" olan satırların sayısını yazdırmak anlamsız"
+
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr ""
@@ -11936,11 +11961,6 @@ msgstr ""
 "Belirtilen DOSYA'yı silmek için 'unlink' (bağ çöz) işlevini çağırın.\n"
 "\n"
 
-#: src/unlink.c:86
-#, c-format
-msgid "cannot unlink %s"
-msgstr "%s bağı çözülemedi"
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -11985,7 +12005,7 @@ msgstr[1] "%lu kullanıcı"
 msgid ",  load average: %.2f"
 msgstr " çalışıyor,  yük ortalaması: %.2f"
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, fuzzy, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -11999,19 +12019,19 @@ msgstr ""
 "DOSYA belirtilmezse %s kullanılır. Dosya olarak %s kullanımı yaygındır.\n"
 "\n"
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
 "an uninterruptible sleep state also contribute to the load average.\n"
 msgstr ""
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr ""
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, fuzzy, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
@@ -12240,169 +12260,53 @@ msgid ""
 msgstr ""
 "Belirtilmişse DİZGE(ler)den, yoksa `y'den oluşan satırları sürekli üretir.\n"
 
-#, fuzzy
-#~ msgid "  returning value: '%s'\n"
-#~ msgstr "`%s' dosyası oluşturuluyor\n"
-
-#, fuzzy
-#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n"
-#~ msgstr "Kullanım: %s [SEÇENEK] İSİM...\n"
-
-#, fuzzy
-#~ msgid "no valid suffix found\n"
-#~ msgstr "%s: -a seçeneğine verilen arguman geçersiz"
-
-#~ msgid "reading %s"
-#~ msgstr "%s okunuyor"
-
-#~ msgid "writing %s"
-#~ msgstr "%s yazılıyor"
-
-#~ msgid "closing %s"
-#~ msgstr "%s kapatılıyor "
-
-#~ msgid "accessing %s"
-#~ msgstr "%s'e eriÅŸiliyor"
-
-#~ msgid "opening %s"
-#~ msgstr "%s açılıyor"
-
-#~ msgid ""
-#~ "Usage: %s NAME\n"
-#~ "  or:  %s OPTION\n"
-#~ msgstr ""
-#~ "Kullanımı: %s İSİM\n"
-#~ "    veya:  %s SEÇENEK\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "  none, off       never make backups (even if --backup is given)\n"
-#~ "  numbered, t     make numbered backups\n"
-#~ "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
-#~ "  simple, never   always make simple backups\n"
-#~ "\n"
-#~ msgstr ""
-#~ "  none, off       hiç yedekleme yapma (--backup kullanılsa bile)\n"
-#~ "  numbered, t     numaralanmış yedekleme yap\n"
-#~ "  existing, nil   eğer numaralanmış yedekler var ise numaralanmış, yoksa "
-#~ "basit\n"
-#~ "  simple, never   her zaman basit yedekleme yap\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "WARNING: --page-increment is deprecated; use --line-increment instead"
-#~ msgstr "--allow-missing seçeneği kaldırılacaktır; yerine --retry kullanın"
-
-#~ msgid "All arguments to long options are mandatory for short options.\n"
-#~ msgstr ""
-#~ "Uzun seçenekler için zorunlu argümanlar kısa seçenekler için de "
-#~ "zorunludur.\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "RADIX is d for decimal, o for octal, x for hexadecimal or n for none.\n"
-#~ "BYTES is hexadecimal with 0x or 0X prefix, and may have a multiplier "
-#~ "suffix:\n"
-#~ "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
-#~ "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n"
-#~ "Adding a z suffix to any type displays printable characters at the end of "
-#~ "each\n"
-#~ "output line.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "RADIX yerine sayı sistemini belirtmek için bir harf yazılır:\n"
-#~ "onluk sistem için d, sekizlik sistem için o, 16lik sistem için x ve "
-#~ "hiçbiri\n"
-#~ "için n. BAYT'ın başına 0x veya 0X koyarak bu sayının 16lik sistemde \n"
-#~ "olduğunu belirtebilirsiniz. Sonuna b koyarsanız 512 ile, k koyarsanız\n"
-#~ "1024 ile, m koyarsanız 1048576 ile çarpılmasını istediğinizi belirtmis\n"
-#~ "olursunuz. Herhangi bir ÅŸekilin sonuna ( ÅŸekiller: a,c,d,f,o,u,x) z\n"
-#~ "eklerseniz od her satırın sonuna o satırdaki tüm okunabilir karakterleri\n"
-#~ "yazar."
-
-#, fuzzy
-#~ msgid ""
-#~ "Option --string without a number implies 3; option --width without a "
-#~ "number\n"
-#~ "implies 32.  By default, od uses -A o -t oS -w16.\n"
-#~ msgstr ""
-#~ "--string in ardından bir sayı belirtilmemişse 3 belirtilmiş gibi kabul\n"
-#~ "eder. --width in ardından bir sayı belirtilmemişse 32 belirtilmiş kabul "
-#~ "eder.\n"
-#~ "Aksi belirtilmedikçe od -A o -t d2 -w 16 seçeneklerini kullanır\n"
-
-#~ msgid "Usage: %s [OPTION]... FILE\n"
-#~ msgstr "Kullanım: %s [SEÇENEK]... [DOSYA]\n"
-
-#~ msgid "Password:"
-#~ msgstr "Parola:"
-
-#~ msgid "getpass: cannot open /dev/tty"
-#~ msgstr "getpass: dev/tty açılamıyor"
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: kuraldışı seçenek -- %c\n"
 
-#~ msgid "cannot set groups"
-#~ msgstr "gruplar atanamıyor"
+#~ msgid "block size"
+#~ msgstr "blok uzunluÄŸu"
 
-#~ msgid "cannot set group id"
-#~ msgstr "grup kimliği atanamıyor"
+#~ msgid "cannot change owner and/or group of %s"
+#~ msgstr "%s'in sahibi ve/veya grubu deÄŸiÅŸtirilemiyor"
 
-#~ msgid "cannot set user id"
-#~ msgstr "kullanıcı kimliği atanamıyor"
+#~ msgid "cannot chdir to directory %s"
+#~ msgstr "%s dizinine geçilemedi"
 
-#~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n"
-#~ msgstr "Kullanımı: %s [SEÇENEK]... [-] [KULLANICI [ARG]...]\n"
+#~ msgid "openat: unable to restore working directory"
+#~ msgstr "openat: çalışma dizinine geri dönülemedi"
 
-#~ msgid ""
-#~ "Change the effective user id and group id to that of USER.\n"
-#~ "\n"
-#~ "  -, -l, --login               make the shell a login shell\n"
-#~ "  -c, --command=COMMAND        pass a single COMMAND to the shell with -"
-#~ "c\n"
-#~ "  -f, --fast                   pass -f to the shell (for csh or tcsh)\n"
-#~ "  -m, --preserve-environment   do not reset environment variables\n"
-#~ "  -p                           same as -m\n"
-#~ "  -s, --shell=SHELL            run SHELL if /etc/shells allows it\n"
-#~ msgstr ""
-#~ "Etkin kullanıcı ve grup kimliklerini KULLANICI olarak değiştirir.\n"
-#~ "\n"
-#~ "  -, -l, --login               kabuÄŸu bir giriÅŸ kabuÄŸu yapar\n"
-#~ "  -c, --command=KOMUT          -c ile kabukta tek bir KOMUT çalıştırır\n"
-#~ "  -f, --fast                   kabuğu -f ile çalıştırır (csh veya tcsh "
-#~ "için)\n"
-#~ "  -m, --preserve-environment   çevre değişkenlerini sıfırlamaz\n"
-#~ "  -p                           -m ile aynı\n"
-#~ "  -s, --shell=KABUK            /etc/shells dosyasında varsa KABUĞU "
-#~ "çalıştırır\n"
+#~ msgid "cannot get the login group of a numeric UID"
+#~ msgstr "bir sayısal kullanıcı-kimliğin grubu alınamıyor"
 
+#
 #~ msgid ""
-#~ "\n"
-#~ "A mere - implies -l.   If USER not given, assume root.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
 #~ msgstr ""
-#~ "\n"
-#~ "Sadece - ile -l uygulanır.   KULLANICI verilmezse root varsayılır.\n"
-
-#~ msgid "user %s does not exist"
-#~ msgstr "%s diye bir kullanıcı yok"
-
-#~ msgid "incorrect password"
-#~ msgstr "parola yanlış"
+#~ "Bu bir serbest yazılımdır; kopyalama koşulları için kaynak koduna "
+#~ "bakınız.\n"
+#~ "Hiçbir garantisi yoktur; hatta SATILABİLİRLİĞİ veya HERHANGİ BİR AMACA\n"
+#~ "UYGUNLUĞU için bile garanti verilmez.\n"
 
-#~ msgid "using restricted shell %s"
-#~ msgstr "kısıtlı kabuk %s kullanılıyor"
+#~ msgid "Usage: %s [OPTION] [FILE]...\n"
+#~ msgstr "Kullanım: %s [SEÇENEK] [DOSYA]...\n"
 
-#~ msgid "warning: cannot change directory to %s"
-#~ msgstr "uyarı: %s dizinine geçilemiyor"
+#
+#~ msgid "closing standard output"
+#~ msgstr "standart çıktı kapatılıyor"
 
-#, fuzzy
 #~ msgid ""
 #~ "Change the group of each FILE to GROUP.\n"
 #~ "With --reference, change the group of each FILE to that of RFILE.\n"
 #~ "\n"
 #~ "  -c, --changes          like verbose but report only when a change is "
 #~ "made\n"
-#~ "  -f, --silent, --quiet  suppress most error messages\n"
-#~ "  -v, --verbose          output a diagnostic for every file processed\n"
+#~ "      --dereference      affect the referent of each symbolic link, "
+#~ "rather\n"
+#~ "                         than the symbolic link itself (this is the "
+#~ "default)\n"
 #~ msgstr ""
 #~ "Her DOSYA'nın grup üyeliğini GRUP olarak değiştirir.\n"
 #~ "--reference ile, her DOSYA'nın grup üyeliğini RDOSYA'nınkine değiştirir.\n"
@@ -12414,16 +12318,15 @@ msgstr ""
 #~ "                         sembolik bağı değil (öntanımlı).\n"
 
 #~ msgid ""
-#~ "      --no-preserve-root  do not treat `/' specially (the default)\n"
-#~ "      --preserve-root     fail to operate recursively on `/'\n"
+#~ "      --no-preserve-root do not treat `/' specially (the default)\n"
+#~ "      --preserve-root    fail to operate recursively on `/'\n"
 #~ msgstr ""
 #~ "      --no-preserve-root `/' için özel işlem yapma (öntanımlı)\n"
 #~ "      --preserve-root    `/' üzerinde döngüsel işlem yapma\n"
 
-#, fuzzy
 #~ msgid ""
 #~ "  -f, --silent, --quiet  suppress most error messages\n"
-#~ "      --reference=RFILE  use RFILE's group rather than specifying a\n"
+#~ "      --reference=RFILE  use RFILE's group rather than the specifying\n"
 #~ "                         GROUP value\n"
 #~ "  -R, --recursive        operate on files and directories recursively\n"
 #~ "  -v, --verbose          output a diagnostic for every file processed\n"
@@ -12439,6 +12342,9 @@ msgstr ""
 #~ "gösterir.\n"
 #~ "\n"
 
+#~ msgid "%s"
+#~ msgstr "%s"
+
 #~ msgid ""
 #~ "Change the mode of each FILE to MODE.\n"
 #~ "\n"
@@ -12462,7 +12368,16 @@ msgstr ""
 #~ "                             REFDOSYA'nın kipini kullanır\n"
 #~ "  -R, --recursive           Yinelemeli olarak dosya ve dizinleri iÅŸler\n"
 
-#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Each MODE is one or more of the letters ugoa, one of the symbols +-= and\n"
+#~ "one or more of the letters rwxXstugo.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Her KİP ugoa harflerinden biri veya bir kaçından, +-= sembollerinden "
+#~ "birinden\n"
+#~ "ve rwxXstugo harflerinden biri veya bir kaçından oluşur.\n"
+
 #~ msgid ""
 #~ "Change the owner and/or group of each FILE to OWNER and/or GROUP.\n"
 #~ "With --reference, change the owner and group of each FILE to those of "
@@ -12470,10 +12385,10 @@ msgstr ""
 #~ "\n"
 #~ "  -c, --changes          like verbose but report only when a change is "
 #~ "made\n"
-#~ "      --dereference      affect the referent of each symbolic link (this "
-#~ "is\n"
-#~ "                         the default), rather than the symbolic link "
-#~ "itself\n"
+#~ "      --dereference      affect the referent of each symbolic link, "
+#~ "rather\n"
+#~ "                         than the symbolic link itself (this is the "
+#~ "default)\n"
 #~ msgstr ""
 #~ "Her DOSYA'nın sahibi ve/veya grubunu SAHİP ve/veya GRUP olarak "
 #~ "deÄŸiÅŸtirir.\n"
@@ -12486,11 +12401,10 @@ msgstr ""
 #~ "      --dereference      her sembolik bağın imlediği dosyayı değiştirir,\n"
 #~ "                         sembolik bağı değil (öntanımlı).\n"
 
-#, fuzzy
 #~ msgid ""
 #~ "  -f, --silent, --quiet  suppress most error messages\n"
 #~ "      --reference=RFILE  use RFILE's owner and group rather than\n"
-#~ "                         specifying OWNER:GROUP values\n"
+#~ "                         the specifying OWNER:GROUP values\n"
 #~ "  -R, --recursive        operate on files and directories recursively\n"
 #~ "  -v, --verbose          output a diagnostic for every file processed\n"
 #~ "\n"
@@ -12505,98 +12419,14 @@ msgstr ""
 #~ "gösterir.\n"
 #~ "\n"
 
-#, fuzzy
-#~ msgid ""
-#~ "Display the current time in the given FORMAT, or set the system date.\n"
-#~ "\n"
-#~ "  -d, --date=STRING         display time described by STRING, not `now'\n"
-#~ "  -f, --file=DATEFILE       like --date once for each line of DATEFILE\n"
-#~ msgstr ""
-#~ "Verilen BİÇEMde zamanı gösterir, ya da sistem zamanını değiştirir.\n"
-#~ "\n"
-#~ "  -d, --date=DİZGE       DIZGE ile tanımlanan zamanı gösterir, şimdiki "
-#~ "zamanı\n"
-#~ "                         deÄŸil\n"
-#~ "  -f, --file=DOSYA       DOSYAnın her satırı için  --date uygulanır\n"
-#~ "      --iso-8601[=BİRİM] ISO-8601 uyumlu tarih/zaman dizgesi gösterir.\n"
-#~ "                         BİRİM=`date' sadece tarihi (öntanımlı),\n"
-#~ "                         `hours', `minutes', `seconds' veya `ns' ile "
-#~ "tarih ve\n"
-#~ "                         zaman 'saat', 'dakika', 'saniye' veya "
-#~ "nanosaniye\n"
-#~ "                         hassasiyetinde gösterilir.\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "SIZE may be (or may be an integer optionally followed by) one of "
-#~ "following:\n"
-#~ "KB 1000, K 1024, MB 1000*1000, M 1024*1024, and so on for G, T, P, E, Z, "
-#~ "Y.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "BOY aşağıdakilerin biri (veya aşağıdakilerin biri ile sonlanan bir "
-#~ "tamsayı)\n"
-#~ "olabilir:\n"
-#~ "kB 1000, K 1024, MB 1000*1000, M 1024*1024, ve G, T, P, E, Z, Y için "
-#~ "diÄŸerleri.\n"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: kuraldışı seçenek -- %c\n"
-
-#~ msgid "block size"
-#~ msgstr "blok uzunluÄŸu"
-
-#~ msgid "cannot change owner and/or group of %s"
-#~ msgstr "%s'in sahibi ve/veya grubu deÄŸiÅŸtirilemiyor"
-
-#~ msgid "cannot chdir to directory %s"
-#~ msgstr "%s dizinine geçilemedi"
-
-#~ msgid "openat: unable to restore working directory"
-#~ msgstr "openat: çalışma dizinine geri dönülemedi"
-
-#~ msgid "cannot get the login group of a numeric UID"
-#~ msgstr "bir sayısal kullanıcı-kimliğin grubu alınamıyor"
-
-#
-#~ msgid ""
-#~ "This is free software; see the source for copying conditions.  There is "
-#~ "NO\n"
-#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
-#~ "PURPOSE.\n"
-#~ msgstr ""
-#~ "Bu bir serbest yazılımdır; kopyalama koşulları için kaynak koduna "
-#~ "bakınız.\n"
-#~ "Hiçbir garantisi yoktur; hatta SATILABİLİRLİĞİ veya HERHANGİ BİR AMACA\n"
-#~ "UYGUNLUĞU için bile garanti verilmez.\n"
-
-#~ msgid "Usage: %s [OPTION] [FILE]...\n"
-#~ msgstr "Kullanım: %s [SEÇENEK] [DOSYA]...\n"
-
-#
-#~ msgid "closing standard output"
-#~ msgstr "standart çıktı kapatılıyor"
-
-#~ msgid ""
-#~ "      --no-preserve-root do not treat `/' specially (the default)\n"
-#~ "      --preserve-root    fail to operate recursively on `/'\n"
-#~ msgstr ""
-#~ "      --no-preserve-root `/' için özel işlem yapma (öntanımlı)\n"
-#~ "      --preserve-root    `/' üzerinde döngüsel işlem yapma\n"
+#~ msgid "reading %s"
+#~ msgstr "%s okunuyor"
 
-#~ msgid "%s"
-#~ msgstr "%s"
+#~ msgid "writing %s"
+#~ msgstr "%s yazılıyor"
 
-#~ msgid ""
-#~ "\n"
-#~ "Each MODE is one or more of the letters ugoa, one of the symbols +-= and\n"
-#~ "one or more of the letters rwxXstugo.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Her KİP ugoa harflerinden biri veya bir kaçından, +-= sembollerinden "
-#~ "birinden\n"
-#~ "ve rwxXstugo harflerinden biri veya bir kaçından oluşur.\n"
+#~ msgid "closing %s"
+#~ msgstr "%s kapatılıyor "
 
 #~ msgid "cannot overwrite directory %s"
 #~ msgstr "%s dizininin üzerine yazılamaz"
@@ -12618,6 +12448,9 @@ msgstr ""
 #~ "VERSION_CONTROL çevre değişkeninden belirlenebilir. Geçerli değerler:\n"
 #~ "\n"
 
+#~ msgid "accessing %s"
+#~ msgstr "%s'e eriÅŸiliyor"
+
 #~ msgid ""
 #~ "warning: --version-control (-V) is obsolete;  support for it\n"
 #~ "will be removed in some future release.  Use --backup=%s instead."
@@ -12681,6 +12514,9 @@ msgstr ""
 #~ msgid "unrecognized operand %s=%s"
 #~ msgstr "geçersiz işleyen %s=%s"
 
+#~ msgid "opening %s"
+#~ msgstr "%s açılıyor"
+
 #~ msgid "file offset out of range"
 #~ msgstr "dosya göreli konumu aralık dışı"
 
@@ -12760,6 +12596,12 @@ msgstr ""
 #~ msgid "%s: number of bytes is large"
 #~ msgstr "%s: bayt sayısı büyük"
 
+#~ msgid "%s: cannot lseek back to original position"
+#~ msgstr "%s: orjinal konuma geri gidilemiyor (lseek)"
+
+#~ msgid "cannot reposition file pointer for %s"
+#~ msgstr "%s üzerinde lseek başarısız"
+
 #~ msgid "unrecognized option `-%c'"
 #~ msgstr "bilinmeyen seçenek `-%c'"
 
@@ -12769,9 +12611,6 @@ msgstr ""
 #~ msgid "cannot print only user and only group"
 #~ msgstr "sadece kullanıcı ya da sadece grup gösterilemez"
 
-#~ msgid "cannot get supplemental group list"
-#~ msgstr "ek grup listesi alınamadı"
-
 #~ msgid "cannot obtain time stamps for %s"
 #~ msgstr "%s için zaman damgaları alınamadı"
 
@@ -12791,6 +12630,9 @@ msgstr ""
 #~ msgid "value %s is so large that it is not representable"
 #~ msgstr "%s değeri gösterilemeyece kadar büyük"
 
+#~ msgid "invalid field number: `%s'"
+#~ msgstr "geçersiz alan numarası: `%s'"
+
 #~ msgid "invalid field number for file 1: `%s'"
 #~ msgstr "dosya 1 icin geçersiz alan numarası : `%s'"
 
@@ -12810,6 +12652,18 @@ msgstr ""
 #~ msgstr "Sabit bağ %s %s'e bağlanıyor"
 
 #~ msgid ""
+#~ "  -n, --no-dereference        treat destination that is a symlink to a\n"
+#~ "                                directory as if it were a normal file\n"
+#~ "  -i, --interactive           prompt whether to remove destinations\n"
+#~ "  -s, --symbolic              make symbolic links instead of hard links\n"
+#~ msgstr ""
+#~ "  -n, --no-dereference        bir dizine sembolik baÄŸ olan hedefi sanki "
+#~ "normal\n"
+#~ "                                bir dosyaymış gibi işler\n"
+#~ "  -i, --interactive           hedefleri silmeden önce sorar\n"
+#~ "  -s, --symbolic              sabit baÄŸ yerine sembolik baÄŸ oluÅŸturur\n"
+
+#~ msgid ""
 #~ "\n"
 #~ "By default, color is not used to distinguish types of files.  That is\n"
 #~ "equivalent to using --color=none.  Using the --color option without the\n"
@@ -12867,15 +12721,53 @@ msgstr ""
 #~ msgid "cannot set permissions of fifo %s"
 #~ msgstr "'%s' fifosunun izinleri deÄŸiÅŸtirilemedi"
 
-#~ msgid "cannot set permissions of %s"
-#~ msgstr "'%s'nın izinleri belirtilemedi"
-
 #~ msgid "cannot get priority"
 #~ msgstr "öncelik alınamadı"
 
 #~ msgid "cannot set priority"
 #~ msgstr "öncelik ayarlanamadı"
 
+#~ msgid "All arguments to long options are mandatory for short options.\n"
+#~ msgstr ""
+#~ "Uzun seçenekler için zorunlu argümanlar kısa seçenekler için de "
+#~ "zorunludur.\n"
+
+#~ msgid ""
+#~ "  -A, --address-radix=RADIX   decide how file offsets are printed\n"
+#~ "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
+#~ msgstr ""
+#~ "  -A, --address-radix=RADIX   adresleri RADIX sayı sisteminde yazar\n"
+#~ "  -j, --skip-bytes=BAYT       her dosyanın ilk BAYT baytını atlar\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "RADIX is d for decimal, o for octal, x for hexadecimal or n for none.\n"
+#~ "BYTES is hexadecimal with 0x or 0X prefix, it is multiplied by 512\n"
+#~ "with b suffix, by 1024 with k and by 1048576 with m.  Adding a z suffix "
+#~ "to\n"
+#~ "any type adds a display of printable characters to the end of each line\n"
+#~ "of output.  "
+#~ msgstr ""
+#~ "\n"
+#~ "RADIX yerine sayı sistemini belirtmek için bir harf yazılır:\n"
+#~ "onluk sistem için d, sekizlik sistem için o, 16lik sistem için x ve "
+#~ "hiçbiri\n"
+#~ "için n. BAYT'ın başına 0x veya 0X koyarak bu sayının 16lik sistemde \n"
+#~ "olduğunu belirtebilirsiniz. Sonuna b koyarsanız 512 ile, k koyarsanız\n"
+#~ "1024 ile, m koyarsanız 1048576 ile çarpılmasını istediğinizi belirtmis\n"
+#~ "olursunuz. Herhangi bir ÅŸekilin sonuna ( ÅŸekiller: a,c,d,f,o,u,x) z\n"
+#~ "eklerseniz od her satırın sonuna o satırdaki tüm okunabilir karakterleri\n"
+#~ "yazar."
+
+#~ msgid ""
+#~ "--string without a number implies 3.  --width without a number\n"
+#~ "implies 32.  By default, od uses -A o -t d2 -w 16.\n"
+#~ msgstr ""
+#~ "--string in ardından bir sayı belirtilmemişse 3 belirtilmiş gibi kabul\n"
+#~ "eder. --width in ardından bir sayı belirtilmemişse 32 belirtilmiş kabul "
+#~ "eder.\n"
+#~ "Aksi belirtilmedikçe od -A o -t d2 -w 16 seçeneklerini kullanır\n"
+
 #~ msgid "skip argument"
 #~ msgstr "atlanacak bayt sayısı olarak verilen değer hatalı (-j nin argümanı)"
 
@@ -12950,6 +12842,14 @@ msgstr ""
 #~ "  \\v      imleci düşey sekme kadar ilerletir\n"
 
 #~ msgid ""
+#~ "\n"
+#~ "With no FILE or if FILE is -, read Standard Input.  `-F /' by default.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "DOSYA belirtilmediÄŸinde veya - olduÄŸunda standart girdiden okur. \n"
+#~ "`-F /' seçeneği verilmiş gibi çalışır\n"
+
+#~ msgid ""
 #~ "This program is free software; you can redistribute it and/or modify\n"
 #~ "it under the terms of the GNU General Public License as published by\n"
 #~ "the Free Software Foundation; either version 2, or (at your option)\n"
@@ -12986,6 +12886,9 @@ msgstr ""
 #~ "olacaksınız; yoksa Free Software Foundation, Inc., 59 Temple Place\n"
 #~ "Suite 330, Boston, MA  02111-1307, USA. adresinden isteyebilirsiniz.\n"
 
+#~ msgid "Usage: %s [OPTION]... FILE\n"
+#~ msgstr "Kullanım: %s [SEÇENEK]... [DOSYA]\n"
+
 #~ msgid "cannot chdir from %s to .."
 #~ msgstr "%s dizininden ..'ye geçilemedi"
 
@@ -13033,6 +12936,35 @@ msgstr ""
 #~ msgid "invalid format string: `%s'"
 #~ msgstr "biçem dizgesi geçersiz: `%s'"
 
+#~ msgid ""
+#~ "Usage: %s USERNAME COMMAND [ARGUMENT]...\n"
+#~ "  or:  %s OPTION\n"
+#~ msgstr ""
+#~ "Kullanımı: %s KULLANICIADI BİÇEM [ARGÜMAN]...\n"
+#~ "    veya:  %s SEÇENEK\n"
+
+#~ msgid ""
+#~ "Drop any supplemental groups, assume the user-ID and group-ID of\n"
+#~ "the specified USERNAME, and run COMMAND with any specified ARGUMENTs.\n"
+#~ "Exit with status 111 if unable to assume the required UID and GID.\n"
+#~ "Otherwise, exit with the exit status of COMMAND.\n"
+#~ "This program is useful only when run by root (UID=0).\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Ek grupları bırakır, belirtilen KULLANICIADI'nın kullanıcı ve grup\n"
+#~ "kimliklerini alır ve KOMUT'u belirtilen ARGÜMAN'larla çalıştırır.\n"
+#~ "Eğer gereken UID ve GID'i alamamışsa 111 durumu ile çıkar.\n"
+#~ "Aksi halde, KOMUT'un çıkış durumu ile çıkar.\n"
+#~ "Bu program yalnızca root (UID=0) tarafından çalıştırıldığı zaman "
+#~ "faydalıdır.\n"
+#~ "\n"
+
+#~ msgid "cannot set group-ID to %lu"
+#~ msgstr "grup kimliği %lu olarak atanamıyor"
+
+#~ msgid "cannot set user-ID to %lu"
+#~ msgstr "kullanıcı kimliği %lu olarak atanamıyor"
+
 #~ msgid "Usage: %s [OPTIONS] FILE [...]\n"
 #~ msgstr "Kullanım: %s [SEÇENEK] DOSYA [...]\n"
 
@@ -13040,6 +12972,22 @@ msgstr ""
 #~ msgstr "sıralama boyu"
 
 #~ msgid ""
+#~ "  -a, --suffix-length=N   use suffixes of length N (default %d)\n"
+#~ "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
+#~ "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output "
+#~ "file\n"
+#~ "  -d, --numeric-suffixes  use numeric suffixes instead of alphabetic\n"
+#~ "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
+#~ msgstr ""
+#~ "  -a, --suffix-length=N   parça isimlerinin ONEK'ten sonraki "
+#~ "bölümlerinin \n"
+#~ "                          uzunluğu N olur ( -a kullanılmadıkça %d) \n"
+#~ "  -b, --bytes=SAYI        dosyayı N bayt parçalara böler\n"
+#~ "  -C, --line-bytes=SAYI   parçaların her satırında en fazla N bayt olur\n"
+#~ "  -d, --numeric-suffixes  alfabetik değil, nümerik sonekler kullanır\n"
+#~ "  -l, --lines=SAYI        her parçada N tane satır olur\n"
+
+#~ msgid ""
 #~ "\n"
 #~ "SIZE may have a multiplier suffix: b for 512, k for 1K, m for 1 Meg.\n"
 #~ msgstr ""
@@ -13080,6 +13028,59 @@ msgstr ""
 #~ msgid "new_mode: mode\n"
 #~ msgstr "yeni_kip: kip\n"
 
+#~ msgid "Password:"
+#~ msgstr "Parola:"
+
+#~ msgid "getpass: cannot open /dev/tty"
+#~ msgstr "getpass: dev/tty açılamıyor"
+
+#~ msgid "cannot set groups"
+#~ msgstr "gruplar atanamıyor"
+
+#~ msgid "cannot set group id"
+#~ msgstr "grup kimliği atanamıyor"
+
+#~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n"
+#~ msgstr "Kullanımı: %s [SEÇENEK]... [-] [KULLANICI [ARG]...]\n"
+
+#~ msgid ""
+#~ "Change the effective user id and group id to that of USER.\n"
+#~ "\n"
+#~ "  -, -l, --login               make the shell a login shell\n"
+#~ "  -c, --command=COMMAND        pass a single COMMAND to the shell with -"
+#~ "c\n"
+#~ "  -f, --fast                   pass -f to the shell (for csh or tcsh)\n"
+#~ "  -m, --preserve-environment   do not reset environment variables\n"
+#~ "  -p                           same as -m\n"
+#~ "  -s, --shell=SHELL            run SHELL if /etc/shells allows it\n"
+#~ msgstr ""
+#~ "Etkin kullanıcı ve grup kimliklerini KULLANICI olarak değiştirir.\n"
+#~ "\n"
+#~ "  -, -l, --login               kabuÄŸu bir giriÅŸ kabuÄŸu yapar\n"
+#~ "  -c, --command=KOMUT          -c ile kabukta tek bir KOMUT çalıştırır\n"
+#~ "  -f, --fast                   kabuğu -f ile çalıştırır (csh veya tcsh "
+#~ "için)\n"
+#~ "  -m, --preserve-environment   çevre değişkenlerini sıfırlamaz\n"
+#~ "  -p                           -m ile aynı\n"
+#~ "  -s, --shell=KABUK            /etc/shells dosyasında varsa KABUĞU "
+#~ "çalıştırır\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "A mere - implies -l.   If USER not given, assume root.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Sadece - ile -l uygulanır.   KULLANICI verilmezse root varsayılır.\n"
+
+#~ msgid "user %s does not exist"
+#~ msgstr "%s diye bir kullanıcı yok"
+
+#~ msgid "incorrect password"
+#~ msgstr "parola yanlış"
+
+#~ msgid "using restricted shell %s"
+#~ msgstr "kısıtlı kabuk %s kullanılıyor"
+
 #~ msgid "stdin: read error"
 #~ msgstr "standart girdi: okuma hatası"
 
@@ -13116,6 +13117,15 @@ msgstr ""
 #~ msgid "`%s' option is obsolete; use `%s-%c %<PRIuMAX>'"
 #~ msgstr "`%s' seçeneği eski: yerine `%s -%c %<PRIuMAX>' kullanın"
 
+#~ msgid "the --allow-missing option is deprecated; use --retry instead"
+#~ msgstr "--allow-missing seçeneği kaldırılacaktır; yerine --retry kullanın"
+
+#~ msgid "warning: --retry is useful only when following by name"
+#~ msgstr ""
+#~ "uyarı: --retry seçeneği sadece --follow=name seçeneğiyle "
+#~ "kullanıldığında \n"
+#~ " bir anlam taşır"
+
 #~ msgid "%s: integer expression expected\n"
 #~ msgstr "%s: tamsayı ifade beklendi\n"
 
@@ -13231,6 +13241,29 @@ msgstr ""
 #~ "sadece ilkini CIKTI'ya (veya standart çıktı) yazar\n"
 #~ "\n"
 
+#~ msgid ""
+#~ "  -D, --all-repeated[=delimit-method] print all duplicate lines\n"
+#~ "                        delimit-method={none(default),prepend,separate}\n"
+#~ "                        Delimiting is done with blank lines.\n"
+#~ "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+#~ "  -i, --ignore-case     ignore differences in case when comparing\n"
+#~ "  -s, --skip-chars=N    avoid comparing the first N characters\n"
+#~ "  -u, --unique          only print unique lines\n"
+#~ msgstr ""
+#~ "  -D --all-repeated[=delimit-method] sadece birden fazla olan satırları "
+#~ "yazar\n"
+#~ "                        delimit-method ÅŸu deÄŸerleri alabilir:\n"
+#~ "                         none: satırları ayırmaz \n"
+#~ "                               (delimit-method belirtilmediÄŸinde none \n"
+#~ "                                kullanılır)\n"
+#~ "                        prepend: her satır grubunun başına boşluk koyar\n"
+#~ "                        separate: satır gruplarının arasına  boşluk "
+#~ "koyar\n"
+#~ "  -f, --skip-fields=N   ilk N alanı karşılaştırmaz\n"
+#~ "  -i, --ignore-case     büyük/küçük harf farklılıklarını dikkate almaz\n"
+#~ "  -s, --skip-chars=N    ilk N karakteri karşılaştırmaz\n"
+#~ "  -u, --unique          sadece özgün satırları karşılaştır\n"
+
 #~ msgid "`-%lu' option is obsolete; use `-f %lu'"
 #~ msgstr "`-%lu' seçeneği eski; yerine  `-f %lu' kullanın"
 
diff --git a/po/uk.gmo b/po/uk.gmo
index 68e67201..9f4f60b6 100644
--- a/po/uk.gmo
+++ b/po/uk.gmo
diff --git a/po/uk.po b/po/uk.po
index c4b07a32..3336dc7f 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -4,13 +4,13 @@
 #
 # Maxim Dziumanenko <dziumanenko@gmail.com>, 2007-2009.
 # sevenfourk <sevenfourk@gmail.com>, 2009.
-# Yuri Chornoivan <yurchor@ukr.net>, 2011, 2012, 2013.
+# Yuri Chornoivan <yurchor@ukr.net>, 2011, 2012, 2013, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: coreutils 8.20-pre3\n"
+"Project-Id-Version: coreutils 8.23-pre1\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
-"PO-Revision-Date: 2013-02-11 22:58+0200\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
+"PO-Revision-Date: 2014-07-14 12:19+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\n"
@@ -39,76 +39,119 @@ msgstr "Допу�тимі аргументи:"
 msgid "error closing file"
 msgstr "помилка при закритті файла"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "помилка запи�у"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "збереженн� прав до�тупу дл� %s"
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "�евідома �и�темна помилка"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "звичайний порожній файл"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "звичайний файл"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "каталог"
 
-#: lib/file-type.c:44
-msgid "block special file"
-msgstr "файл блочного при�трою"
-
-#: lib/file-type.c:47
-msgid "character special file"
-msgstr "файл �имвольного при�трою"
-
-#: lib/file-type.c:50
-msgid "fifo"
-msgstr "fifo"
-
-#: lib/file-type.c:53
+#: lib/file-type.c:46
 msgid "symbolic link"
 msgstr "�имволічне по�иланн�"
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "�окет"
-
-#: lib/file-type.c:59
+#: lib/file-type.c:52
 msgid "message queue"
 msgstr "черга повідомлень"
 
-#: lib/file-type.c:62
+#: lib/file-type.c:55
 msgid "semaphore"
 msgstr "�емафор"
 
-#: lib/file-type.c:65
+#: lib/file-type.c:58
 msgid "shared memory object"
 msgstr "об'єкт �пільній пам'�ті"
 
-#: lib/file-type.c:68
+#: lib/file-type.c:61
 msgid "typed memory object"
 msgstr "об'єкт типізованої пам'�ті"
 
-#: lib/file-type.c:70
+#: lib/file-type.c:66
+msgid "block special file"
+msgstr "файл блочного при�трою"
+
+#: lib/file-type.c:69
+msgid "character special file"
+msgstr "файл �имвольного при�трою"
+
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr "неперервні дані"
+
+#: lib/file-type.c:75
+msgid "fifo"
+msgstr "fifo"
+
+#: lib/file-type.c:78
+msgid "door"
+msgstr "двері"
+
+#: lib/file-type.c:81
+msgid "multiplexed block special file"
+msgstr "�пеціальний файл ущільненого блокового при�трою"
+
+#: lib/file-type.c:84
+msgid "multiplexed character special file"
+msgstr "�пеціальний файл ущільненого �имвольного при�трою"
+
+#: lib/file-type.c:87
+msgid "multiplexed file"
+msgstr "ущільнений файл"
+
+#: lib/file-type.c:90
+msgid "named file"
+msgstr "іменований файл"
+
+#: lib/file-type.c:93
+msgid "network special file"
+msgstr "�пеціальний мережевий файл"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr "перене�ений файл з даними"
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr "перене�ений файл без даних"
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr "порт"
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "�окет"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr "забілюванн�"
+
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "дивний файл"
 
@@ -243,18 +286,18 @@ msgstr "%s: додаванн� аргументів до параметра «-W
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: до параметра «-W %s» �лід додати аргумент\n"
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr "�е вдало�� змінити права до�тупу до %s"
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "�е вдало�� �творити каталог %s"
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr "пам'�ть вичерпано"
@@ -372,7 +415,7 @@ msgstr "Розмір виразу надто великий"
 msgid "Unmatched ) or \\)"
 msgstr "�епарна ) чи \\)"
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 msgid "No previous regular expression"
 msgstr "Від�утній попередній регул�рний вираз"
 
@@ -398,7 +441,7 @@ msgstr ""
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[yY]"
 
@@ -408,11 +451,11 @@ msgstr "^[yY]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, c-format
 msgid "setting permissions for %s"
 msgstr "в�тановленн� прав до�тупу дл� %s"
@@ -553,18 +596,6 @@ msgstr "Відмова живленн�"
 msgid "Resource lost"
 msgstr "Втрачено ре�ур�"
 
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, c-format
-msgid "cannot create pipe"
-msgstr "не вдало�� �творити канал"
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, c-format
-msgid "%s subprocess failed"
-msgstr "помилка підпроце�у %s"
-
 #: lib/strsignal.c:114
 #, c-format
 msgid "Real-time signal %d"
@@ -773,7 +804,7 @@ msgstr ""
 msgid "Report %s bugs to: %s\n"
 msgstr "Про вади у %s повідомл�йте на адре�у %s\n"
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Домашн� �торінка %s: <%s>\n"
@@ -783,30 +814,10 @@ msgstr "Домашн� �торінка %s: <%s>\n"
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr "%s домашн� �торінка: <http://www.gnu.org/software/%s/>\n"
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr "Загальна довідка з ПЗ GNU: <http://www.gnu.org/gethelp/>\n"
 
-#: lib/w32spawn.h:43
-#, c-format
-msgid "_open_osfhandle failed"
-msgstr "Помилка _open_osfhandle"
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr "не вдало�� відновити файловий де�криптор %d: помилка dup2"
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr "дочірній проце� %s"
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr "дочірнім проце�ом %s отримано �игнал щодо аварійного завершенн� %d"
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr "stdin"
@@ -828,7 +839,7 @@ msgstr "невідомий потік"
 msgid "failed to reopen %s with mode %s"
 msgstr "не вдало�� повторно відкрити %s у режимі %s"
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr "помилка порівн�нн� р�дків"
@@ -851,17 +862,17 @@ msgstr "не вдало�� виконати форматований вивід
 #: lib/xstrtol-error.c:63
 #, c-format
 msgid "invalid %s%s argument '%s'"
-msgstr "некоректний аргумент %s%s — '%s'"
+msgstr "некоректний аргумент %s%s — «%s»"
 
 #: lib/xstrtol-error.c:68
 #, c-format
 msgid "invalid suffix in %s%s argument '%s'"
-msgstr "некоректний �уфік� у аргументі %s%s: '%s'"
+msgstr "некоректний �уфік� у аргументі %s%s: «%s»"
 
 #: lib/xstrtol-error.c:72
 #, c-format
 msgid "%s%s argument '%s' too large"
-msgstr "%s%s, аргумент '%s' є занадто об’ємним"
+msgstr "%s%s, аргумент «%s» є занадто об'ємним"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/base64.c:40
@@ -894,7 +905,7 @@ msgstr ""
 "                          0 вимикає перене�енн� р�дків.\n"
 "\n"
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -917,48 +928,47 @@ msgstr ""
 "формального алфавіту base64.  Вказуйте ключ --ignore-garbage, щоб\n"
 "�пробувати ігнорувати неалфавітні знаки в закодованому потоці.\n"
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "помилка читанн�"
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, c-format
 msgid "invalid input"
 msgstr "неправильні вхідні дані"
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, c-format
 msgid "invalid wrap size: %s"
 msgstr "неправильна величина перено�у: %s"
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, c-format
 msgid "extra operand %s"
 msgstr "зайвий операнд %s"
 
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, c-format
 msgid "closing standard input"
 msgstr "закриваєть�� �тандартний потік вводу"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -987,12 +997,12 @@ msgstr ""
 #: src/basename.c:60
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
 "  -a, --multiple       увімкнути підтримку декількох аргументів, вважати "
 "кожен з них ��ЗВОЮ\n"
-"  -s, --suffix=СУФІКС  вилучити кінцевий СУФІКС\n"
+"  -s, --suffix=СУФІКС  вилучити кінцевий СУФІКС; додає -a\n"
 "  -z, --zero           відокремлювати пункти у виведенні �имволом NUL, а не "
 "�имволом нового р�дка\n"
 
@@ -1013,32 +1023,31 @@ msgstr ""
 "  %s -s .h include/stdio.h  -> «stdio»\n"
 "  %s -a any/str1 any/str2   -> «str1», потім «str2»\n"
 
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, c-format
 msgid "missing operand"
 msgstr "від�утній операнд"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr "Torbjorn Granlund"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 msgid "Richard M. Stallman"
 msgstr "Richard M. Stallman"
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1095,7 +1104,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr "помилка ioctl на %s"
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr "�тандартний вивід"
@@ -1112,14 +1121,14 @@ msgstr "Russell Coker"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 msgid "Jim Meyering"
 msgstr "Jim Meyering"
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, c-format
 msgid "failed to create security context: %s"
 msgstr "не вдало�� �творити контек�ту безпеки: %s"
@@ -1129,8 +1138,8 @@ msgstr "не вдало�� �творити контек�ту безпеки:
 msgid "failed to set %s security context component to %s"
 msgstr "не вдало�� в�тановити %s контек�т безпеки компоненту %s"
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, c-format
 msgid "failed to get security context of %s"
 msgstr "не вдало�� в�тановити контек�т безпеки %s"
@@ -1140,18 +1149,18 @@ msgstr "не вдало�� в�тановити контек�т безпеки
 msgid "can't apply partial context to unlabeled file %s"
 msgstr "не вдало�� за�то�увати ча�тковий контек�т дл� непозначеного файла %s"
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, c-format
 msgid "failed to change context of %s to %s"
 msgstr "не вдало�� змінити контек�т %s на %s"
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
 msgstr "не вдало�� отримати до�туп до %s"
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, c-format
 msgid "cannot read directory %s"
 msgstr "не вдало�� прочитати каталог %s"
@@ -1161,13 +1170,14 @@ msgstr "не вдало�� прочитати каталог %s"
 msgid "changing security context of %s\n"
 msgstr "зміна контек�ту безпеки дл� %s\n"
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, c-format
 msgid "fts_read failed"
 msgstr "помилка при операції fts_read"
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, c-format
 msgid "fts_close failed"
 msgstr "помилка fts_close"
@@ -1186,11 +1196,11 @@ msgstr ""
 
 #: src/chcon.c:357
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
-"Змінює контек�т безпеки кожного файла Ф�ЙЛ на КО�ТЕКСТ.\n"
+"Змінює контек�т захи�ту SELinux кожного файла Ф�ЙЛ на КО�ТЕКСТ.\n"
 "З ключем  --reference, змінює контек�т безпеки кожного Ф�ЙЛа на контек�т "
 "ЗФ�ЙЛа.\n"
 
@@ -1220,7 +1230,7 @@ msgstr ""
 "  -l, --range=ДІ�П�ЗО�   в�тановити діапазон ДІ�П�ЗО� у цільовому контек�ті "
 "безпеки\n"
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
 "      --preserve-root    fail to operate recursively on '/'\n"
@@ -1273,36 +1283,37 @@ msgstr ""
 "  -P                     не переходити за �имвольними по�иланн�ми (типово)\n"
 "\n"
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr "Дл� комбінації ключів -R --dereference �лід вказати -H або -L"
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr "при вказуванні -R -h потрібно вказати -P"
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, c-format
 msgid "missing operand after %s"
 msgstr "пропущений операнд пі�л� %s"
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, c-format
 msgid "invalid context: %s"
 msgstr "неправильний контек�т: %s"
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr "вказано конфліктні �пецифікатори контек�ту безпеки"
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, c-format
 msgid "failed to get attributes of %s"
 msgstr "помилка отриманн� атрибутів %s"
@@ -1332,7 +1343,7 @@ msgstr ""
 "ЗФ�ЙЛ�.\n"
 "\n"
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
@@ -1373,48 +1384,48 @@ msgstr ""
 "  %s staff /u      Змінює групу /u на \"staff\".\n"
 "  %s -hR staff /u  Змінює групу /u та вкладених файлів на \"staff\".\n"
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
 msgstr "отримують�� нові атрибути %s"
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr ""
 "ані �имвольне по�иланн� %s, ані об'єкт на �кий воно вказує, не були змінені\n"
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr "режим %s змінено з %04lo (%s) на %04lo (%s)\n"
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr "не вдало�� змінити режим %s з %04lo (%s) на %04lo (%s)\n"
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr "права до�тупу %s залишені �к %04lo (%s)\n"
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr "обробка небезпечного �имвольного по�иланн� %s неможлива"
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, c-format
 msgid "changing permissions of %s"
 msgstr "зміна прав до�тупу дл� %s"
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr "%s: нові права до�тупу %s, а не %s"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1425,7 +1436,7 @@ msgstr ""
 "       або:    %s [КЛЮЧ]... ВІСІМК-РЕЖИМ Ф�ЙЛ...\n"
 "       або:    %s [КЛЮЧ]... --reference=ЗФ�ЙЛ Ф�ЙЛ...\n"
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 msgid ""
 "Change the mode of each FILE to MODE.\n"
 "With --reference, change the mode of each FILE to that of RFILE.\n"
@@ -1436,17 +1447,17 @@ msgstr ""
 "ЗФ�ЙЛ�.\n"
 "\n"
 
-#: src/chmod.c:391
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
 "      --reference=ЗФ�ЙЛ  викори�товувати режим ЗФ�ЙЛа, замі�ть значень "
 "РЕЖИМ\n"
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr "  -R, --recursive        змінювати файли і каталоги рекур�ивно\n"
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 msgid ""
 "\n"
 "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n"
@@ -1454,12 +1465,12 @@ msgstr ""
 "\n"
 "РЕЖИМ вказуєть�� у формі '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n"
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr "не можна викори�товувати разом ключі режиму та --reference"
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, c-format
 msgid "invalid mode: %s"
 msgstr "неправильний режим: %s"
@@ -1610,26 +1621,21 @@ msgstr ""
 "  %s -hR root /u    Змінює вла�ника /u та вкладених файлів на \"root\".\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr "Roland McGrath"
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr "неправильна група %s"
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, c-format
 msgid "invalid group list %s"
 msgstr "некоректний �пи�ок груп %s"
 
-#: src/chroot.c:117
-#, c-format
-msgid "failed to set additional groups"
-msgstr "не вдало�� в�тановити додаткові групи"
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
@@ -1638,7 +1644,7 @@ msgstr ""
 "Викори�танн�: %s [П�Р�МЕТР] �ОВИЙКОРІ�Ь [КОМ��Д� [�РГУМЕ�Т]...]\n"
 "  або:  %s П�Р�МЕТР\n"
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
@@ -1646,7 +1652,7 @@ msgstr ""
 "Виконує КОМ��ДУ з вказаним кореневим каталогом.\n"
 "\n"
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
@@ -1654,36 +1660,50 @@ msgstr ""
 "  --userspec=КОР:ГРУП�   вказати кори�тувача і групу (ід. або назву)\n"
 "  --groups=СПИСОК_ГРУП   вказати додаткові групи у форматі гр1,гр2,…,грN\n"
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 msgid ""
 "\n"
 "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n"
 msgstr ""
 "\n"
-"Якщо команду не вказано, виконати '${SHELL} -i' (default: '/bin/sh -i').\n"
+"Якщо команду не вказано, виконати «${SHELL} -i» (типово «/bin/sh -i»).\n"
 
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, c-format
 msgid "cannot change root directory to %s"
 msgstr "не вдало�� змінити кореневий каталог на %s"
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, c-format
 msgid "cannot chdir to root directory"
 msgstr "не вдало�� перейти до кореневого каталогу"
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr "не вказано групи дл� невідомого UID: %d"
+
+#: src/chroot.c:383
+#, c-format
+msgid "failed to get supplemental groups"
+msgstr "не вдало�� отримати �пи�ок додаткових груп"
+
+#: src/chroot.c:395
+#, c-format
+msgid "failed to %s supplemental groups"
+msgstr "не вдало�� %s �пи�ок додаткових груп"
+
+#: src/chroot.c:402
 #, c-format
 msgid "failed to set group-ID"
 msgstr "не вдало�� в�тановити ідентифікатор групи"
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, c-format
 msgid "failed to set user-ID"
 msgstr "не вдало�� в�тановити ідентифікатор кори�тувача"
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, c-format
 msgid "failed to run command %s"
 msgstr "не вдало�� виконати команду %s"
@@ -1715,7 +1735,7 @@ msgstr ""
 "Виводить контрольну �уму (CRC) та чи�ло байт дл� кожного Ф�ЙЛ�.\n"
 "\n"
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr "Викори�танн�: %s [КЛЮЧ]... Ф�ЙЛ1 Ф�ЙЛ2\n"
@@ -1801,297 +1821,336 @@ msgstr "задано декілька розділювачів"
 msgid "empty %s not allowed"
 msgstr "порожній р�док %s є неприпу�тимим"
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr "помилка читанн� %s"
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, c-format
 msgid "cannot lseek %s"
 msgstr "не вдало�� виконати lseek дл� %s"
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr "помилка запи�у %s"
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, c-format
 msgid "%s: failed to get extents info"
 msgstr "%s: не вдало�� отримати дані щодо розширень"
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, c-format
 msgid "%s: write failed"
 msgstr "%s: помилка під ча� �проби запи�у"
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, c-format
 msgid "failed to extend %s"
 msgstr "не вдало�� розширити %s"
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, c-format
 msgid "clearing permissions for %s"
 msgstr "очищенн� прав до�тупу дл� %s"
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "не вдало�� зберегти вла�ника %s"
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
 msgstr "не вдало�� найти файл %s"
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, c-format
 msgid "failed to preserve authorship for %s"
 msgstr "не вдало�� зберегти автора %s"
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
+#, c-format
+msgid "failed to set default file creation context to %s"
+msgstr "помилка в�тановленн� типового контек�ту дл� �творенн� файлів %s"
+
+#: src/copy.c:820
+#, c-format
+msgid "failed to set default file creation context for %s"
+msgstr "помилка в�тановленн� типового контек�ту дл� �творенн� файлів %s"
+
+#: src/copy.c:846
+#, c-format
+msgid "failed to set the security context of %s"
+msgstr "не вдало�� в�тановити контек�т захи�ту %s"
+
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
 msgid "cannot open %s for reading"
 msgstr "не вдало�� відкрити %s дл� читанн�"
 
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, c-format
 msgid "cannot fstat %s"
 msgstr "не вдало�� виконати fstat дл� %s"
 
-#: src/copy.c:820
+#: src/copy.c:935
 #, c-format
 msgid "skipping file %s, as it was replaced while being copied"
 msgstr "пропущено файл %s, о�кільки він був замінений під ча� копіюванн�"
 
-#: src/copy.c:850
-#, c-format
-msgid "failed to get file system create context"
-msgstr "не вдало�� отримати контек�т файлової �и�теми дл� �творенн� файлів"
-
-#: src/copy.c:864
-#, c-format
-msgid "failed to set the security context of %s to %s"
-msgstr "не вдало�� в�тановити контек�т безпеки %s на %s"
-
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
 msgid "cannot remove %s"
 msgstr "не вдало�� вилучити %s"
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
 msgstr "вилучено %s\n"
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr "запи� через через ви��че �имвольне по�иланн� %s не виконуєть��"
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, c-format
 msgid "cannot create regular file %s"
 msgstr "не вдало�� �творити звичайний файл %s"
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, c-format
 msgid "failed to clone %s from %s"
 msgstr "не вдало�� клонувати %s з %s"
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr "збереженн� відмітки про ча� %s"
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
 #, c-format
 msgid "failed to close %s"
 msgstr "не вдало�� закрити %s"
 
-#: src/copy.c:1471
+#: src/copy.c:1580
+#, c-format
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
+msgstr "%s: замінити %s, незважаючи на права до�тупу %04lo (%s)? "
+
+#: src/copy.c:1581
 #, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
-msgstr "%s: намагати�ь перепи�ати %s, незважаючи на права до�тупу %04lo (%s)? "
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr "%s: непридатний до запи�у %s (режим %04lo, %s); �пробувати пори це? "
 
-#: src/copy.c:1478
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
 msgstr "%s: перепи�ати %s? "
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr " (резервна копі�: %s)"
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr "помилка при відновленні типового контек�ту при �творенні файла"
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, c-format
 msgid "cannot create hard link %s to %s"
 msgstr "не вдало�� �творити жор�тке по�иланн� %s на %s"
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, c-format
 msgid "cannot stat %s"
 msgstr "не вдало�� виконати stat дл� %s"
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, c-format
 msgid "omitting directory %s"
 msgstr "пропу�к каталогу %s"
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr "попередженн�: вхідний файл %s вказаний більше одного разу"
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
 msgstr "%s та %s - один і той �амий файл"
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr "не можна перезапи�ати файл %s, що не є каталогом, каталогом %s"
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr "не перепи�уєть�� щойно �творений %s %s"
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr "не можна перезапи�увати каталог %s файлом, що не є каталогом"
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr "не можна перейменувати каталог на файл, що не є каталогом: %s -> %s"
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr "збереженн� запа�ної копії %s знищить оригінал; %s не перене�ений"
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr "збереженн� запа�ної копії %s знищить оригінал; %s не �копійовано"
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
 msgstr "не вдало�� �творити резервну копію дл� %s"
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr "не буде копіювати�� %s через щойно �творене �имвольне по�иланн� %s"
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr "не вдало�� �копіювати каталог, %s, у �амого �ебе, %s"
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr "жор�тке по�иланн� %s на каталог %s не буде �творено"
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr "не вдало�� перене�ти %s у �вій вла�ний підкаталог, %s"
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, c-format
 msgid "cannot move %s to %s"
 msgstr "не вдало�� перемі�тити %s у %s"
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr ""
 "помилка при переміщенні з при�трою %s на при�трій %s: не вдало�� вилучити "
 "цільовий файл"
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, c-format
-msgid "failed to set default file creation context to %s"
-msgstr "помилка в�тановленн� типового контек�ту дл� �творенн� файлів %s"
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr "не вдало�� �копіювати циклічне �имвольне по�иланн� %s"
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr ""
 "%s: відно�ні �имвольні по�иланн� можна �творювати лише у поточному каталозі"
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr "не вдало�� �творити �имвольне по�иланн� %s на %s"
 
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, c-format
 msgid "cannot create fifo %s"
 msgstr "не вдало�� �творити чергу %s"
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, c-format
 msgid "cannot create special file %s"
 msgstr "не вдало�� �творити �пеціальній файл %s"
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, c-format
 msgid "cannot read symbolic link %s"
 msgstr "не вдало�� прочитати �имвольне по�иланн� %s"
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, c-format
 msgid "cannot create symbolic link %s"
 msgstr "не вдало�� �творити �имвольне по�иланн� %s"
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
 msgstr "%s має невідомий тип файла"
 
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, c-format
 msgid "cannot un-backup %s"
 msgstr "не вдало�� відновити %s з резервної копії"
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr "%s -> %s (відновленн�)\n"
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr "Alex Deymo"
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr "Кори�туванн�: %s --coreutils-prog=��ЗВ�_ПРОГР�МИ [П�Р�МЕТРИ]... \n"
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+"Виконати вбудовану програму ��ЗВ�_ПРОГР�МИ із вказаними параметрами "
+"П�Р�МЕТРИ.\n"
+"\n"
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+"\n"
+"Кори�туванн�: «%s --coreutils-prog=��ЗВ�_ПРОГР�МИ --help» дл� отриманн� "
+"довідки із вказаної програми.\n"
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, c-format
+msgid "unknown program %s"
+msgstr "невідома програма, %s"
+
+#: src/cp.c:157 src/mv.c:288
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -2102,11 +2161,11 @@ msgstr ""
 "       або:    %s [КЛЮЧ]... ДЖЕРЕЛО... К�Т�ЛОГ\n"
 "       або:    %s [КЛЮЧ]... -t К�Т�ЛОГ ДЖЕРЕЛО...\n"
 
-#: src/cp.c:162
+#: src/cp.c:163
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
 msgstr "Копіює ДЖЕРЕЛО у ЦІЛЬ, або декілька ДЖЕРЕЛ у К�Т�ЛОГ.\n"
 
-#: src/cp.c:168
+#: src/cp.c:169
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
 "      --attributes-only        don't copy the file data, just the "
@@ -2128,7 +2187,7 @@ msgstr ""
 "  -d                           те �аме, що й --no-dereference --"
 "preserve=link\n"
 
-#: src/cp.c:177
+#: src/cp.c:178
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
 "                                 opened, remove it and try again (this "
@@ -2149,7 +2208,7 @@ msgstr ""
 "n )\n"
 "  -H                           �лідувати за �имвольним по�иланн�м у ДЖЕРЕЛО\n"
 
-#: src/cp.c:186
+#: src/cp.c:187
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
 "  -L, --dereference            always follow symbolic links in SOURCE\n"
@@ -2158,7 +2217,7 @@ msgstr ""
 "  -L, --dereference            завжди �лідувати за �имволічним по�иланн�м у "
 "ДЖЕРЕЛО\n"
 
-#: src/cp.c:190
+#: src/cp.c:191
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
 "                                 a previous -i option)\n"
@@ -2169,7 +2228,7 @@ msgstr ""
 "  -P, --no-dereference         ніколи не йти за �имволічними по�иланн�ми у "
 "ДЖЕРЕЛО\n"
 
-#: src/cp.c:195
+#: src/cp.c:196
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
 "      --preserve[=ATTR_LIST]   preserve the specified attributes (default:\n"
@@ -2185,7 +2244,7 @@ msgstr ""
 "                                 додаткові атрибути: context, links, xattr, "
 "all\n"
 
-#: src/cp.c:203
+#: src/cp.c:204
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                use full source file name under DIRECTORY\n"
@@ -2193,7 +2252,7 @@ msgstr ""
 "      --no-preserve=СПИС_�ТТР  не зберігати вказані атрибути\n"
 "      --parents                добавить вихідний шл�х до К�Т�ЛОГУ\n"
 
-#: src/cp.c:207
+#: src/cp.c:208
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
 "      --reflink[=WHEN]         control clone/CoW copies. See below\n"
@@ -2206,7 +2265,7 @@ msgstr ""
 "      --remove-destination     вилучати кожен цільовий файл, перш ніж\n"
 "                                 копіювати його (протилежні�ть до --force)\n"
 
-#: src/cp.c:213
+#: src/cp.c:214
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
 "      --strip-trailing-slashes  remove any trailing slashes from each "
@@ -2218,7 +2277,7 @@ msgstr ""
 "      --strip-trailing-slashes вилучає у�і кінцеві похилі ри�ки з кожного\n"
 "                               аргументу ДЖЕРЕЛО\n"
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -2233,7 +2292,7 @@ msgstr ""
 "      --target-directory=К�Т�ЛОГ  �копіювати в�і ДЖЕРЕЛ� у К�Т�ЛОГ\n"
 "  -T, --no-target-directory    вважати ЦІЛЬ звичайним файлом\n"
 
-#: src/cp.c:224
+#: src/cp.c:225
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
 "                                 than the destination file or when the\n"
@@ -2247,7 +2306,21 @@ msgstr ""
 "  -v, --verbose                по��нювати що зроблено\n"
 "  -x, --one-file-system        залишати�ь у межах однієї файлової �и�теми\n"
 
-#: src/cp.c:233
+#: src/cp.c:232
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+"  -Z                   в�тановити типовий тип контек�ту безпеки SELinux\n"
+"                         дл� файла призначенн�\n"
+"      --context[=CTX]  подібний до -Z, �кщо вказано CTX, в�тановити контек�т "
+"безпеки\n"
+"                         SELinux або SMACK відповідно до вказаного значенн�\n"
+"                         контек�ту CTX\n"
+
+#: src/cp.c:240
 msgid ""
 "\n"
 "By default, sparse SOURCE files are detected by a crude heuristic and the\n"
@@ -2278,7 +2351,7 @@ msgstr ""
 "неможливо, копіюванн� зазнає невдачі або, �кщо вказано --reflink=auto,\n"
 "повернеть�� до �тандартного режиму.\n"
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 msgid ""
 "\n"
 "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n"
@@ -2294,7 +2367,7 @@ msgstr ""
 "VERSION_CONTROL. Можливі значенн�:\n"
 "\n"
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2308,7 +2381,7 @@ msgstr ""
 "                  нумеровані інакше �творювати про�ті\n"
 "  simple. never   завжди �творювати про�ті копії\n"
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2319,222 +2392,234 @@ msgstr ""
 "Коли вказані ключі -f та -b, та SOURCE збігаєть�� з DEST cp �творює\n"
 "резервну копію DEST.\n"
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, c-format
 msgid "failed to preserve times for %s"
 msgstr "не вдало�� зберегти мітки ча�у дл� %s"
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, c-format
 msgid "failed to preserve permissions for %s"
 msgstr "не вдало�� зберегти права до�тупу дл� %s"
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, c-format
 msgid "cannot make directory %s"
 msgstr "не вдало�� �творити каталог %s"
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr "%s і�нує, але не є каталогом"
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
 #, c-format
 msgid "failed to access %s"
 msgstr "не вдало�� отримати до�туп до %s"
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, c-format
 msgid "missing file operand"
 msgstr "пропущений операнд, що вказує файл"
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, c-format
 msgid "missing destination file operand after %s"
 msgstr "пі�л� %s пропущений операнд, що вказує цільовий файл"
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr ""
 "не можна викори�товувати водноча� --target-directory (-t) і --no-target-"
 "directory (-T)"
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, c-format
 msgid "target %s is not a directory"
 msgstr "вказана ціль %s не є каталогом"
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr "при заданому --parents ціль повинна бути каталогом"
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, c-format
 msgid "multiple target directories specified"
 msgstr "вказано декілька цільових каталогів"
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr ""
+"попередженн�: ігноруємо --context; дл� його викори�танн� потрібне �дро з "
+"підтримкою SELinux"
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr "не можна �творювати жор�тке та �имвольне по�иланн� одноча�но"
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr "параметри --backup і --no-clobber не можна викори�товувати одноча�но"
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr "--reflink можна викори�товувати лише разом з --sparse=auto"
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr "тип резервної копії"
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, c-format
+msgid "cannot set target context and preserve it"
+msgstr "не можна одноча�но в�тановлювати контек�т призначенн� і зберігати його"
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr "не можна зберігати контек�т безпеки, �кщо �дро не підтримує SELinux"
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr "не вдало�� зберегти розширені атрибути, cp зібрано без підтримки xattr"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr "Stuart Kemp"
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr "ввід �тав недо�тупний"
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr "%s: номер р�дка поза допу�тимими межами"
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, c-format
 msgid "%s: %s: line number out of range"
 msgstr "%s: %s: номер р�дка поза допу�тимими межами"
 
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, c-format
 msgid " on repetition %s\n"
 msgstr " при повторі %s\n"
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, c-format
 msgid "%s: %s: match not found"
 msgstr "%s: %s: відповідні�ть не знайдено"
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr "помилка пошуку регул�рного виразу"
 
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, c-format
 msgid "write error for %s"
 msgstr "помилка запи�у дл� %s"
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, c-format
 msgid "%s: integer expected after delimiter"
 msgstr "%s: пі�л� розділювача очікуєть�� ціле чи�ло"
 
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, c-format
 msgid "%s: '}' is required in repeat count"
-msgstr "%s: при вказуванні чи�ла повторів �лід додати '}'"
+msgstr "%s: при вказуванні чи�ла повторів �лід додати «}»"
 
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, c-format
 msgid "%s}: integer required between '{' and '}'"
-msgstr "%s: між '{' та '}' має бути вказано ціле чи�ло"
+msgstr "%s: між «{» та «}» має бути вказано ціле чи�ло"
 
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, c-format
 msgid "%s: closing delimiter '%c' missing"
-msgstr "%s: пропущено кінцевий роздільник '%c'"
+msgstr "%s: пропущено кінцевий роздільник «%c»"
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr "%s: неприпу�тимий регул�рний вираз: %s"
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr "%s: неприпу�тимий шаблон"
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr "%s: номер р�дка повинен бути більше нул�"
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr "номер р�дка %s менше номеру попереднього р�дка, %s"
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr "попередженн�: номер р�дка %s дорівнює попередньому номеру р�дка"
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr "пропущений �пецифікатор перетворенн� у �уфік�і"
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr "неправильний �пецифікатор перетворенн� у �уфік�і: %c"
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr "неправильний �пецифікатор перетворенн� у �уфік�і: \\%.3o"
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr "некоректні прапорці у �пецифікації перетворенн�: %%%c%c"
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr "надто багато опи�ів перетворенн� (%%) у �уфік�і"
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr "пропущено опи� перетворенн� (%%) у �уфік�і"
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr "%s: неприпу�тимий чи�ло"
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr "Викори�танн�: %s [КЛЮЧ]... Ф�ЙЛ Ш�БЛО�...\n"
 
-#: src/csplit.c:1455
+#: src/csplit.c:1483
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
 "and output byte counts of each piece to standard output.\n"
@@ -2542,7 +2627,7 @@ msgstr ""
 "Виводить ча�тини Ф�ЙЛ�, розділені Ш�БЛО�ОМ (Ш�БЛО��МИ), до файлів 'xx00',\n"
 "'xx01', ... та виводить чи�ло байт у кожній ча�тині на �тандартний вивід.\n"
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2554,7 +2639,12 @@ msgstr ""
 "  -f, --prefix=ПРЕФІКС       викори�товувати ПРЕФІКС замі�ть 'xx'\n"
 "  -k, --keep-files           не вилучати файли виводу при помилках\n"
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr ""
+"  -m, --suppress-matched     не виводити р�дки, що відповідають зразку\n"
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
@@ -2564,7 +2654,7 @@ msgstr ""
 "  -s, --quiet, --silent      не виводити розміри вихідних файлів\n"
 "  -z, --elide-empty-files    вилучати порожні файли виводу\n"
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
@@ -2573,7 +2663,7 @@ msgstr ""
 "Якщо Ф�ЙЛ вказаний �к -, читає �тандартний ввід.  Ш�БЛО� вказуєть��\n"
 "на�тупним чином:\n"
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 msgid ""
 "\n"
 "  INTEGER            copy up to but not including specified line number\n"
@@ -2599,21 +2689,17 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr "David M. Ihnat"
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr "пол� та позиції нумерують�� з 1"
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr "Викори�танн�: %s КЛЮЧ... [Ф�ЙЛ]...\n"
 
-#: src/cut.c:193
+#: src/cut.c:176
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr ""
 "Виводить вибрані ча�тини р�дків з кожного Ф�ЙЛ� на �тандартний вивід.\n"
 
-#: src/cut.c:199
+#: src/cut.c:182
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
 "  -c, --characters=LIST   select only these characters\n"
@@ -2624,7 +2710,7 @@ msgstr ""
 "  -d, --delimiter=РОЗДІЛЮВ�Ч     викори�товувати РОЗДІЛЮВ�Ч дл� розділенн�\n"
 "                                 полів замі�ть табул�ції\n"
 
-#: src/cut.c:204
+#: src/cut.c:187
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
 "                            that contains no delimiter character, unless\n"
@@ -2636,7 +2722,7 @@ msgstr ""
 "                                 �кщо не вказаний ключ -s\n"
 "  -n                             (ігноруєть��)\n"
 
-#: src/cut.c:210
+#: src/cut.c:193
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
 "                            or fields\n"
@@ -2644,7 +2730,7 @@ msgstr ""
 "      --complement        доповнити множину вибраних байтів, знаків "
 "або                             полів.\n"
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
@@ -2656,7 +2742,7 @@ msgstr ""
 "                                при виводі, типово викори�товуєть��\n"
 "                                розділювач дл� вводу\n"
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2669,7 +2755,7 @@ msgstr ""
 "Вибрані ча�тини вхідного файла вивод�ть�� у тому пор�дку, у �кому вони,\n"
 "з'�вл�ють�� на вході, та вивод�ть�� рівно один раз.\n"
 
-#: src/cut.c:227
+#: src/cut.c:210
 msgid ""
 "Each range is one of:\n"
 "\n"
@@ -2689,46 +2775,50 @@ msgstr ""
 "\n"
 "Якщо Ф�ЙЛ не вказаний або вказаний �к -, читає �тандартний ввід.\n"
 
-#: src/cut.c:367 src/cut.c:493
+#: src/cut.c:300 src/cut.c:394
 msgid "invalid byte, character or field list"
 msgstr "некоректний байт, �имвол або �пи�ок полів"
 
-#: src/cut.c:387
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr "пол� та позиції нумерують�� з 1"
+
+#: src/cut.c:320
 msgid "invalid range with no endpoint: -"
 msgstr "неправильний діапазон без кінцевого значенн�: -"
 
-#: src/cut.c:403
+#: src/cut.c:334
 msgid "invalid decreasing range"
 msgstr "неприпу�тимий �падаючий діапазон"
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, c-format
 msgid "byte offset %s is too large"
 msgstr "байтовий з�ув %s надто великий"
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, c-format
 msgid "field number %s is too large"
 msgstr "номер пол� %s надто великий"
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr "можна вказати лише один тип �пи�ку"
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr "розділювач повинен бути одним �имволом"
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr "треба вказати �пи�ок байт, �имволів або полів"
 
-#: src/cut.c:850
+#: src/cut.c:790
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr "розділювач дл� вхідних даних можна вказувати лише при обробці полів"
 
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
@@ -2736,11 +2826,11 @@ msgstr ""
 "заборона виводу р�дків, що не мі�т�ть розділювачів,\n"
 "має �ен� лише при роботі з пол�ми"
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr "від�утній �пи�ок полів"
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr "від�утній �пи�ок позицій"
 
@@ -2794,14 +2884,14 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 "       --rfc-3339[=СПЕЦ]    виве�ти дату/ча� у форматі RFC 3339\n"
 "                            СПЕЦ='date', 'seconds' або 'ns' дл� отриманн�\n"
 "                            дати та ча�у з вказаною точні�тю.\n"
 "  -s,  --set=РЯДОК          в�тановити ча�, що опи�уєть�� РЯДКОМ\n"
 "  -u, --utc, --universal    показати або в�тановити універ�альний\n"
-"                            координований ча�\n"
+"                            координований ча� (UTC)\n"
 
 #: src/date.c:158
 msgid ""
@@ -3007,10 +3097,10 @@ msgstr ""
 "Показати локальний ча� дл� 9:00 на�тупної п'�тниці у Києві\n"
 "  $ date --date='TZ=\"Europe/Kiev\" 09:00 next Fri'\n"
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr "�тандартний ввід"
@@ -3053,7 +3143,7 @@ msgstr ""
 msgid "cannot set date"
 msgstr "не вдало�� в�тановити дату"
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, c-format
 msgid "time %s is out of range"
 msgstr "ча� %s поза допу�тимим діапазоном"
@@ -3064,7 +3154,7 @@ msgstr "ча� %s поза допу�тимим діапазоном"
 msgid "Paul Rubin"
 msgstr "Paul Rubin"
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
@@ -3073,7 +3163,7 @@ msgstr ""
 "Викори�танн�: %s [ОПЕР��Д]...\n"
 "       або:    %s КЛЮЧ\n"
 
-#: src/dd.c:526
+#: src/dd.c:532
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
 "\n"
@@ -3092,7 +3182,7 @@ msgstr ""
 "  count=ЧИСЛО     копіювати лише вказане ЧИСЛО вхідних блоків\n"
 "  ibs=ЧИСЛО       читати вказане ЧИСЛО байт за раз (типово 512)\n"
 
-#: src/dd.c:535
+#: src/dd.c:541
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
 "  iflag=FLAGS     read as per the comma separated symbol list\n"
@@ -3117,7 +3207,7 @@ msgstr ""
 "                  «noxfer» — придушити виведенн� �тати�тики передаванн�,\n"
 "                  «none» — придушити виведенн� будь-�ких даних\n"
 
-#: src/dd.c:546
+#: src/dd.c:552
 msgid ""
 "\n"
 "N and BYTES may be followed by the following multiplicative suffixes:\n"
@@ -3135,7 +3225,7 @@ msgstr ""
 "Кожен елемент СПИСКУ дл� conv може бути:\n"
 "\n"
 
-#: src/dd.c:555
+#: src/dd.c:561
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
 "  ebcdic    from ASCII to EBCDIC\n"
@@ -3165,7 +3255,7 @@ msgstr ""
 "  sync      доповнювати кожен вхідний блок нул�ми до розміру ibs; �кщо\n"
 "              вживаєть�� разом з block або unblock, доповнювати пробілами\n"
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -3181,7 +3271,7 @@ msgstr ""
 "  fdatasync фізично запи�ати файл виводу перед завершенн�м\n"
 "  fsync     аналогічно, але запи�ати також метадані\n"
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -3195,81 +3285,81 @@ msgstr ""
 "  append    режим додаванн� (має �ен� дл� виводу; рекомендуєть��  "
 "conv=notrunc)\n"
 
-#: src/dd.c:583
+#: src/dd.c:589
 msgid "  cio       use concurrent I/O for data\n"
 msgstr "  cio       викори�товувати конкурентне введенн�-виведенн� дл� дати\n"
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr "  direct    викори�товувати пр�мий ввід/вивід дл� даних\n"
 
-#: src/dd.c:587
+#: src/dd.c:593
 msgid "  directory  fail unless a directory\n"
 msgstr "  directory  помилка, �кщо не є каталогом\n"
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr "  dsync     викори�товувати �инхронізований ввід/вивід дл� даних\n"
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr "  sync      те �аме, але також дл� метаданих\n"
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr "  fullblock  акумулювати повні блоки вводу (лише iflag)\n"
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr "  nonblock  викори�товувати ввід/вивід без блокуванн�\n"
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr "  noatime   не оновлювати ча� о�таннього до�тупу\n"
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr "  nocache   відкинути кешовані дані\n"
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr "  noctty    не призначати керівний термінал з файла\n"
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr "  nofollow  не �лідувати за �имвольним по�иланн�м\n"
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr "  nolinks   помилка, �кщо знайдено декілька по�илань\n"
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr "  binary    викори�товувати двійковий ввід/вивід дл� даних\n"
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr "  text      викори�товувати тек�товий ввід/вивід дл� даних\n"
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr ""
 "  count_bytes  вважати «count=N» визначенн�м кілько�ті байтів (лише дл� "
 "iflag)\n"
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr ""
 "  skip_bytes  вважати «skip=N» визначенн�м кілько�ті байтів (лише дл� "
 "iflag)\n"
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr ""
 "  seek_bytes  вважати «seek=N» визначенн�м кілько�ті байтів (лише дл� "
 "oflag)\n"
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, c-format
 msgid ""
 "\n"
@@ -3299,7 +3389,17 @@ msgstr ""
 "Ключі:\n"
 "\n"
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr "пам'�ть вичерпано буфером введенн� даних розміром у %zu байтів (%s)"
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr "пам'�ть вичерпано буфером виведенн� даних розміром у %zu байтів (%s)"
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
@@ -3308,7 +3408,7 @@ msgstr ""
 "%<PRIuMAX>+%<PRIuMAX> запи�ів прочитано\n"
 "%<PRIuMAX>+%<PRIuMAX> запи�ів запи�ано\n"
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
@@ -3316,7 +3416,7 @@ msgstr[0] "%<PRIuMAX> обрізаний запи�\n"
 msgstr[1] "%<PRIuMAX> обрізані запи�и\n"
 msgstr[2] "%<PRIuMAX> обрізаних запи�ів\n"
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
@@ -3324,7 +3424,7 @@ msgstr[0] " �копійовано %<PRIuMAX> байт (%s)"
 msgstr[1] " �копійовано %<PRIuMAX> байти (%s)"
 msgstr[2] " �копійовано %<PRIuMAX> байтів (%s)"
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr "�е�кінчені�ть"
 
@@ -3338,83 +3438,83 @@ msgstr "�е�кінчені�ть"
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
 msgstr ", %g �, %s/s\n"
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, c-format
 msgid "closing input file %s"
 msgstr "закритт� вхідного файла %s"
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr "закритт� файла виводу %s"
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr "не вдало�� вимкнути O_DIRECT: %s"
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, c-format
 msgid "writing to %s"
 msgstr "запи� у %s"
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, c-format
 msgid "unrecognized operand %s"
 msgstr "операнд %s не розпізнаний"
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 msgid "invalid conversion"
 msgstr "неприпу�тиме перетворенн�"
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 msgid "invalid input flag"
 msgstr "неприпу�тима ознака входу"
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 msgid "invalid output flag"
 msgstr "неприпу�тимий ознака виводу"
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 msgid "invalid status flag"
 msgstr "неприпу�тимий ознака �тату�у"
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, c-format
 msgid "invalid number %s"
 msgstr "неправильний номер %s"
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr "не можна одноча�но викори�товувати будь-�кі два з {ascii,ebcdic,ibm}"
 
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, c-format
 msgid "cannot combine block and unblock"
 msgstr "не можна одноча�но викори�товувати block та unblock"
 
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, c-format
 msgid "cannot combine lcase and ucase"
 msgstr "не можна одноча�но викори�товувати lcase та ucase"
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, c-format
 msgid "cannot combine excl and nocreat"
 msgstr "не можна одноча�но викори�товувати excl та nocreat"
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, c-format
 msgid "cannot combine direct and nocache"
 msgstr "не можна одноча�но викори�товувати direct і nocache"
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
@@ -3423,72 +3523,62 @@ msgstr ""
 "попередженн�: обходить�� помилка lseek у �дрі дл� файла (%s)\n"
 "  mt_type=0x%0lx -- �м. <sys/mtio.h> дл� �пи�ку типів"
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, c-format
 msgid "%s: cannot skip"
 msgstr "%s: не вдало�� пропу�тити"
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, c-format
 msgid "%s: cannot seek"
 msgstr "%s: не вдало�� з�унути вказівник файла"
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr "переповненн� з�уву при читанні файла %s"
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr "попередженн�: некоректний з�ув файла пі�л� помилки читанн�"
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr "не вдало�� обійти помилку �дра"
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, c-format
 msgid "setting flags for %s"
 msgstr "в�тановленн� ознак дл� %s"
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr "пам'�ть вичерпано буфером введенн� даних розміром у %zu байтів (%s)"
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr "пам'�ть вичерпано буфером виведенн� даних розміром у %zu байтів (%s)"
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr "%s: не вдало�� перемі�тити вказівник позиції на вказану кількі�ть"
 
-#: src/dd.c:2133
+#: src/dd.c:2172
 #, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
 msgstr "не вдало�� обрізати до %<PRIdMAX> у файлі виведенн� даних %s"
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr "операці� fdatasync дл� %s завершила�ь помилкою"
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
 msgstr "операці� fsync дл� %s завершила�ь помилкою"
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, c-format
 msgid "failed to open %s"
 msgstr "не вдало�� відкрити %s"
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
@@ -3497,96 +3587,105 @@ msgstr ""
 "з�ув надто великий: не вдало�� обрізати до величини seek=%<PRIuMAX> (%lu-"
 "байтних) блоків"
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr "не вдало�� обрізати до %<PRIuMAX> у файлі виведенн� даних %s"
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, c-format
 msgid "failed to discard cache for: %s"
 msgstr "помилка під ча� відкиданн� кешу дл� %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr "Paul Eggert"
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr "Ф. �и�тема"
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr "Тип"
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr "блоків"
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr "Вик"
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr "До�тупно"
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr "Вик%"
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr "І-вузлів"
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr "Викор"
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr "Вільн"
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr "Вик%"
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr "змонтований на"
 
-#: src/df.c:383
+#: src/df.c:207
+msgid "File"
+msgstr "Файл"
+
+#: src/df.c:387
 #, c-format
-msgid "option --output: field '%s' unknown"
-msgstr "параметр --output: поле «%s» є невідомим"
+msgid "option --output: field %s unknown"
+msgstr "параметр --output: поле %s є невідомим"
 
-#: src/df.c:390
+#: src/df.c:394
 #, c-format
-msgid "option --output: field '%s' used more than once"
-msgstr "параметр --output: поле «%s» викори�тано декілька разів"
+msgid "option --output: field %s used more than once"
+msgstr "параметр --output: поле %s викори�тано декілька разів"
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr "Розм"
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr "До�т"
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr "В�ього"
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
 msgstr "%s-%s"
 
-#: src/df.c:1210
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr "не вдало�� отримати до�туп до %s: повторно змонтовано іншим при�троєм"
+
+#: src/df.c:1384
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
 "or all file systems by default.\n"
@@ -3594,16 +3693,17 @@ msgstr ""
 "Показати інформацію про файлову �и�тему, на �кій розташований кожен\n"
 "з Ф�ЙЛІВ, або, типово, про у�і файлові �и�теми.\n"
 
-#: src/df.c:1217
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
 "  -a, --all             включати віртуальні файлові �и�теми\n"
 "  -B, --block-size=РОЗМІР викори�товувати блоки вказаного РОЗМІРУ. Приклад:\n"
@@ -3613,11 +3713,11 @@ msgstr ""
 "\n"
 "      --total           виводити під�умок\n"
 "  -h, --human-readable  виводити розміри у зручному дл� людини вигл�ді\n"
-"                         (наприклад, 1K 234M 2G)\n"
-"  -H, --si              те �аме, але викори�товувати �тупені 1000, а не "
-"1024\n"
+"                         (наприклад, 1023M)\n"
+"  -H, --si              те �аме, але викори�товувати �тепені 1000 "
+"(наприклад, 1.1G)\n"
 
-#: src/df.c:1227
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -3633,7 +3733,7 @@ msgstr ""
 "      --no-sync         не викликати sync перед отриманн�м інформації про\n"
 "                        викори�танн� блоків (типово)\n"
 
-#: src/df.c:1234
+#: src/df.c:1409
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
 "                               or print all fields if FIELD_LIST is "
@@ -3657,48 +3757,38 @@ msgstr ""
 "  -x, --exclude-type=ТИП  виключати файлові �и�теми вказаного ТИПУ\n"
 "  -v                    (ігноруєть��)\n"
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
 "\n"
 "СПИСОК_ПОЛІВ — відокремлений комами �пи�ок �товпчиків, �кі �лід включити.\n"
 "Можливі назви �товпчиків: 'source', 'fstype', 'itotal', 'iused', 'iavail', "
 "'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' і 'target' (див. �торінку info).\n"
+"'size', 'used', 'avail', 'pcent', 'file'  і 'target' (див. �торінку info).\n"
 
-#: src/df.c:1285
+#: src/df.c:1460
 #, c-format
 msgid "options %s and %s are mutually exclusive"
 msgstr "параметри %s і %s не можна викори�товувати одноча�но"
 
-#: src/df.c:1335
-msgid "warning: "
-msgstr "попередженн�: "
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr ""
-"довга вер�і� параметра «--megabytes» вважаєть�� за�тарілою, �коро її буде "
-"вилучено"
-
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr "файлова �и�тема типа %s і вибрана, і виключена"
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr "Попередженн�: "
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 msgid "cannot read table of mounted file systems"
 msgstr "%помилка при читані змонтованих файлових �и�тем"
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr "не вказана жодна файлова �и�тема"
@@ -3708,7 +3798,7 @@ msgstr "не вказана жодна файлова �и�тема"
 msgid "H. Peter Anvin"
 msgstr "H. Peter Anvin"
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr "Викори�танн�: %s [КЛЮЧ]... [Ф�ЙЛ]\n"
@@ -3796,7 +3886,7 @@ msgstr ""
 "\n"
 
 #: src/dirname.c:59
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
 msgstr ""
 "  -z, --zero     завершувати кожен р�док нуль-байтом замі�ть розриву р�дка\n"
 
@@ -3815,7 +3905,7 @@ msgstr ""
 "  %s dir1/str dir2/str  -> «dir1», потім «dir2»\n"
 "  %s stdio.h            -> «.»\n"
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -3824,14 +3914,13 @@ msgstr ""
 "Викори�танн�: %s [КЛЮЧ]... [Ф�ЙЛ]...\n"
 "       або:    %s [КЛЮЧ]... --files0-from=Ф\n"
 
-#: src/du.c:274
+#: src/du.c:285
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr "Сумарне викори�танн� ди�кового про�тору кожного Ф�ЙЛ�, з каталогами.\n"
 
-#: src/du.c:280
+#: src/du.c:291
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3839,7 +3928,7 @@ msgid ""
 "                          larger due to holes in ('sparse') files, internal\n"
 "                          fragmentation, indirect blocks, and the like\n"
 msgstr ""
-"  -0, --null            завершувати кожен р�док виведених даних 0-байтом "
+"  -0, --null            завершувати кожен р�док виведених даних нуль-байтом "
 "замі�ть �имволу\n"
 "                          нового р�дка\n"
 "  -a, --all             виводить об��г дл� у�іх файлів, а не лише каталогів\n"
@@ -3848,11 +3937,11 @@ msgstr ""
 "                          іноді він може бути більшим через дірки у файлах,\n"
 "                          внутрішньої фрагментації, непр�мих блоків та т.і.\n"
 
-#: src/du.c:289
+#: src/du.c:300
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3879,14 +3968,15 @@ msgstr ""
 "�аме, що і дл�\n"
 "                          --summarize\n"
 
-#: src/du.c:302
+#: src/du.c:313
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
 "      --files0-from=Ф   виве�ти звіт про файли, чиї назви (завершені\n"
 "                          нулем) перераховані у файлі Ф\n"
@@ -3894,9 +3984,11 @@ msgstr ""
 "вводу\n"
 "  -H                    еквівалент ключа --dereference-args (-D)\n"
 "  -h, --human-readable  виводити розміри у зручному дл� людини вигл�ді\n"
-"                          (наприклад, 1K 234M 2G)\n"
+"                          (наприклад 1K 234M 2G)\n"
+"      --inodes          виве�ти дані щодо викори�танн� inode замі�ть даних "
+"щодо викори�танн� блоків\n"
 
-#: src/du.c:310
+#: src/du.c:322
 msgid ""
 "  -k                    like --block-size=1K\n"
 "  -L, --dereference     dereference all symbolic links\n"
@@ -3908,21 +4000,22 @@ msgstr ""
 "  -l, --count-links     прочитати кожне жор�тке по�иланн� �к окремий файл\n"
 "  -m                    �к --block-size=1M\n"
 
-#: src/du.c:316
+#: src/du.c:328
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
 "  -P, --no-dereference  не �лідувати за �имвольним по�иланн�м (типово)\n"
-"  -S, --separate-dirs   не включати розмір каталогів\n"
+"  -S, --separate-dirs   не включати розмір підкаталогів\n"
 "      --si              подібне до -h, але з викори�танн�м мір, кратних до "
 "1000, а не 1024\n"
 "  -s, --summarize       виводити лише зведенн� дл� кожного аргументу\n"
 
-#: src/du.c:322
+#: src/du.c:334
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
 "                          or entries greater than SIZE if negative\n"
@@ -3931,12 +4024,12 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
 msgstr ""
 "  -t, --threshold=РОЗМІР  виключити запи�и, менші за РОЗМІР, �кщо додатне,\n"
-"                          або запи�и, більші за РОЗМІР, �кщо від’ємне\n"
+"                          або запи�и, більші за РОЗМІР, �кщо від'ємне\n"
 "      --time            виводити ча� о�танньої зміни будь-�кого файла у\n"
 "                          каталозі або у�іх його підкаталогів\n"
 "      --time=СЛОВО      виводити вказаний у СЛОВО ча�, а не ча� \n"
@@ -3945,7 +4038,7 @@ msgstr ""
 "                          full-iso, long-iso, iso, +ФОРМ�Т\n"
 "                          ФОРМ�Т інтерпретуєть�� �к у 'date'\n"
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
@@ -3956,65 +4049,66 @@ msgstr ""
 "      --exclude=ЗР�ЗОК     виключити файли, назви �ких відповідають ЗР�ЗКУ\n"
 "  -x, --one-file-system    пропу�кати каталоги на різних файлових �и�темах\n"
 
-#: src/du.c:386
+#: src/du.c:398
 msgid "Infinity"
 msgstr "�е�кінчені�ть"
 
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr "обхід точки монтуванн� %s вже здій�нено"
-
-#: src/du.c:624
+#: src/du.c:636
 #, c-format
 msgid "fts_read failed: %s"
 msgstr "помилка fts_read: %s"
 
-#: src/du.c:780
+#: src/du.c:787
 #, c-format
 msgid "invalid maximum depth %s"
 msgstr "неприпу�тима мак�имальна глибина %s"
 
-#: src/du.c:809
+#: src/du.c:816
 #, c-format
 msgid "invalid --threshold argument '-0'"
 msgstr "некоректний аргумент --threshold «-0»"
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr "не можна одноча�но підбивати зведенн� та виводити в�і елементи"
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr "попередженн�: підбитт� зведенн� це те ж �аме, що й --max-depth=0"
 
-#: src/du.c:900
+#: src/du.c:911
 #, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr "попередженн�: підбитт� зведенн� конфліктує з --max-depth=%lu"
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+"попередженн�: параметри --apparent-size і -b не працюватимуть з --inodes"
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 msgid "file operands cannot be combined with --files0-from"
 msgstr "операнди-файли не можна викори�товувати разом з --files0-from"
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr "%s: помилка читанн�"
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr "при читанні імен файлів з stdin, не допу�кають�� назви файлів %s"
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 msgid "invalid zero-length file name"
 msgstr "неправильна назва файла нульової довжини"
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr "загалом"
 
@@ -4125,12 +4219,12 @@ msgstr ""
 #: src/env.c:61
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
 "  -i, --ignore-environment   почати з порожнім оточенн�м\n"
-"  -0, --null                 завершувати кожне з виведених р�дків 0-байтом, "
-"а не розривом р�дка\n"
+"  -0, --null                 завершувати кожен з виведених р�дків нуль-"
+"байтом, а не розривом р�дка\n"
 "  -u, --unset=��ЗВ�          вилучити з оточенн� ��ЗВИ\n"
 
 #: src/env.c:68
@@ -4208,16 +4302,16 @@ msgid "input line is too long"
 msgstr "вхідний р�док надто великий"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr "Mike Parker"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr "James Youngman"
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
@@ -4226,7 +4320,7 @@ msgstr ""
 "Викори�танн�: %s ВИР�З\n"
 "       або:    %s КЛЮЧ\n"
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -4244,7 +4338,7 @@ msgstr ""
 "\n"
 "  �РГ1 & �РГ2       �РГ1, �кщо обидва відмінні від нул�, інакше 0\n"
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -4262,7 +4356,7 @@ msgstr ""
 "  �РГ1 >= �РГ2      �РГ1 більше або дорівнює �РГ2\n"
 "  �РГ1 > �РГ2       �РГ1 більше �РГ2\n"
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
@@ -4272,7 +4366,7 @@ msgstr ""
 "  �РГ1 + �РГ2       арифметична �ума �РГ1 та �РГ2\n"
 "  �РГ1 - �РГ2       арифметична різниц� �РГ1 та �РГ2\n"
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -4285,7 +4379,7 @@ msgstr ""
 "  �РГ1 / �РГ2       арифметична ча�тка від �РГ1 та �РГ2\n"
 "  �РГ1 % AРГ2       арифметичний залишок від діленн� �РГ1 на �РГ2\n"
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -4304,7 +4398,7 @@ msgstr ""
 "                            з СИМВОЛІВ, інакше 0\n"
 "  length РЯДОК              довжина РЯДК�\n"
 
-#: src/expr.c:251
+#: src/expr.c:250
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
 "                               keyword like 'match' or an operator like '/'\n"
@@ -4317,7 +4411,7 @@ msgstr ""
 "\n"
 "  ( ВИР�З )                  значенн� ВИР�ЗУ\n"
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -4336,7 +4430,7 @@ msgstr ""
 "�кщо \\( та \\) не викори�товують��, то повертаєть�� кількі�ть відповідних "
 "�имволів.\n"
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -4348,32 +4442,32 @@ msgstr ""
 "ВИР�З порожній або 0; 2, �кщо ВИР�З �интак�ично неправильний; та 3,\n"
 "�кщо виникла помилка.\n"
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, c-format
 msgid "syntax error"
 msgstr "�интак�ична помилка"
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, c-format
 msgid "error in regular expression matcher"
 msgstr "помилка у механізмі відповідно�ті регул�рних виразів"
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, c-format
 msgid "non-integer argument"
 msgstr "не цілочи�ловий аргумент"
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr "діленн� на нуль"
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr "Щоб обійти цю проблему, в�тановіть LC_ALL='C'"
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, c-format
 msgid "the strings compared were %s and %s"
 msgstr "р�дки, що порівнювали�ь %s та %s."
@@ -4383,27 +4477,27 @@ msgstr "р�дки, що порівнювали�ь %s та %s."
 msgid "Niels Moller"
 msgstr "Niels Moller"
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
 msgstr "�е вдало�� перевірити про�тоту за те�том Люка. Цього не мало �тати��."
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
 msgstr "переповненн� черги squfof"
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, c-format
 msgid "%s is not a valid positive integer"
 msgstr "%s не є правильним цілим додатнім чи�лом"
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr "%s надто велике"
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
@@ -4412,7 +4506,7 @@ msgstr ""
 "Викори�танн�: %s [ЧИСЛО]...\n"
 "       або:    %s КЛЮЧ\n"
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
 "are specified on the command line, read them from standard input.\n"
@@ -4519,17 +4613,17 @@ msgid "invalid number of columns: %s"
 msgstr "неправильне чи�ло �товпчиків: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr "Padraig Brady"
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, c-format
 msgid "Usage: %s\n"
 msgstr "Викори�танн�: %s\n"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
@@ -4538,12 +4632,12 @@ msgstr ""
 "�ценарі�х.\n"
 "\n"
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, c-format
 msgid "failed to get groups for user %s"
 msgstr "помилка при отриманні груп кори�тувачів %s"
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, c-format
 msgid "failed to get groups for the current process"
 msgstr "не вдало�� отримати групи дл� поточного проце�у"
@@ -4570,22 +4664,22 @@ msgstr ""
 "було\n"
 "змінено базу даних груп).\n"
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, c-format
 msgid "cannot get real UID"
 msgstr "не вдало�� в�тановити �правжній UID"
 
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, c-format
 msgid "cannot get effective GID"
 msgstr "не вдало�� отримати ефективний GID"
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, c-format
 msgid "cannot get real GID"
 msgstr "не вдало�� в�тановити �правжній GID"
 
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, c-format
 msgid "%s: no such user"
 msgstr "%s: такого кори�тувача не і�нує"
@@ -4636,58 +4730,48 @@ msgstr ""
 "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
 "GB 1000*1000*1000, G 1024*1024*1024 тощо дл� T, P, E, Z, Y.\n"
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr "%s: файл надто �коротив��"
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, c-format
 msgid "%s: number of bytes is too large"
 msgstr "%s: чи�ло байт надто великий"
 
-#: src/head.c:440
-#, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr "ю%s: не вдало�� вернуть вказівник файла на початкову позицію"
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr "%s: не вдало�� перейти до позиції %s"
 
-#: src/head.c:673
-#, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "%s: не вдало�� �кинути вказівник на файл"
-
-#: src/head.c:798
+#: src/head.c:423 src/tail.c:457
 #, c-format
-msgid "cannot reposition file pointer for %s"
-msgstr "не вдало�� перемі�тити вказівник файла дл� %s"
+msgid "%s: cannot seek to relative offset %s"
+msgstr "%s: не вдало�� перемі�тити вказівник позиції на %s"
 
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr "%s: %s на�тільки великий, що його неможливо машинно пред�тавити"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr "чи�ло р�дків"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr "чи�ло байт"
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr "неправильна кількі�ть р�дків"
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr "неправильна кількі�ть байт"
 
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, c-format
 msgid "invalid trailing option -- %c"
 msgstr "неправильний завершальний ключ -- '%c'"
@@ -4732,40 +4816,48 @@ msgid "cannot determine hostname"
 msgstr "не вдало�� визначити назву машини"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr "Arnold Robbins"
 
-#: src/id.c:81
+#: src/id.c:84
 #, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
+msgid "Usage: %s [OPTION]... [USER]\n"
 msgstr "Викори�танн�: %s [КЛЮЧ]... [КОРИСТУВ�Ч]\n"
 
-#: src/id.c:82
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
 msgstr ""
-"Виводить відомо�ті про ім'� та групу КОРИСТУВ�Ч� або (�кщо не\n"
-"вказано КОРИСТУВ�Ч�) дл� поточного кори�тувача.\n"
+"Виве�ти дані щодо кори�тувача і групи дл� вказаного кори�тувача\n"
+"або (�кщо кори�тувача не вказано) дл� поточного кори�тувача.\n"
 "\n"
+
+#: src/id.c:90
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
+msgstr ""
 "  -a              ігнорувати, визначено лише дл� �умі�но�ті\n"
-"  -Z, --context   виводити лише контек�т безпеки поточного кори�тувача\n"
+"  -Z, --context   виводити лише контек�т безпеки проце�у\n"
 "  -g, --group     виводити лише ID групи\n"
 "  -G, --groups    виводити лише додаткові групи\n"
 "  -n, --name      виводити назва замі�ть номера, дл� ключів -ugG\n"
 "  -r, --real      виводити дій�ні, а не ефективні ID, дл� ключів -ugG\n"
 "  -u, --user      виводити лише ID кори�тувача\n"
+"  -z, --zero      розмежовувати запи�и �имволами NUL, а не пробілами;\n"
+"                    не можна викори�товувати у типовому форматі\n"
 
-#: src/id.c:96
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
@@ -4773,116 +4865,126 @@ msgstr ""
 "\n"
 "Якщо КЛЮЧІ не вказані, виводить �тандартний набір кори�них відомо�тей.\n"
 
-#: src/id.c:140
+#: src/id.c:151
+#, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr "--context (-Z) працює, �кщо �дро має підтримку SELinux або SMACK"
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr "--context (-Z) працює, �кщо �дро має підтримку SELinux"
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr "не можна виводити контек�т безпеки, коли вказано кори�тувача"
 
-#: src/id.c:178
+#: src/id.c:198
 #, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr "не можна виводити \"only\" дл� більш ніж одного варіанту"
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr "не можна виводити лише назви або дій�ні ID у типовому форматі"
 
-#: src/id.c:199
+#: src/id.c:209
+#, c-format
+msgid "option --zero not permitted in default format"
+msgstr "у типовому форматі не можна викори�товувати параметр --zero"
+
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
 msgstr "не можна отримати контек�т проце�у"
 
-#: src/id.c:224
+#: src/id.c:265
 #, c-format
 msgid "cannot get effective UID"
 msgstr "не вдало�� отримати ефективний UID"
 
-#: src/id.c:311
+#: src/id.c:354
 #, c-format
 msgid "cannot find name for user ID %s"
 msgstr "не вдало�� визначити ім'� кори�тувача дл� ID %s"
 
-#: src/id.c:329
+#: src/id.c:372
 #, c-format
 msgid "uid=%s"
 msgstr "uid=%s"
 
-#: src/id.c:334
+#: src/id.c:377
 #, c-format
 msgid " gid=%s"
 msgstr " gid=%s"
 
-#: src/id.c:341
+#: src/id.c:384
 #, c-format
 msgid " euid=%s"
 msgstr " euid=%s"
 
-#: src/id.c:349
+#: src/id.c:392
 #, c-format
 msgid " egid=%s"
 msgstr " egid=%s"
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr " групи="
 
-#: src/id.c:393
+#: src/id.c:437
 #, c-format
 msgid " context=%s"
 msgstr " контек�т=%s"
 
-#: src/install.c:373
+#: src/install.c:376
 #, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr "попередженн�: %s: не вдало�� змінити контек�т у %s"
 
-#: src/install.c:414
+#: src/install.c:417
 #, c-format
 msgid "creating directory %s"
 msgstr "�творенн� каталогу %s"
 
-#: src/install.c:482
+#: src/install.c:485
 #, c-format
 msgid "cannot change ownership of %s"
 msgstr "не вдало�� змінити вла�ника %s"
 
-#: src/install.c:506
+#: src/install.c:509
 #, c-format
 msgid "cannot set time stamps for %s"
 msgstr "не вдало�� в�тановити мітки ча�у дл� %s"
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, c-format
 msgid "fork system call failed"
 msgstr "�и�темний виклик fork завершив�� помилкою"
 
-#: src/install.c:531
+#: src/install.c:535
 #, c-format
 msgid "cannot run %s"
 msgstr "не вдало�� запу�тити %s"
 
-#: src/install.c:535
+#: src/install.c:539
 #, c-format
 msgid "waiting for strip"
 msgstr "очікуванн� strip"
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr "проце� strip завершив�� помилкою"
 
-#: src/install.c:558
+#: src/install.c:565
 #, c-format
 msgid "invalid user %s"
 msgstr "неправильний кори�тувач %s"
 
-#: src/install.c:594
+#: src/install.c:601
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -4895,7 +4997,7 @@ msgstr ""
 "       або    %s [КЛЮЧ]... -t К�Т�ЛОГ ДЖЕРЕЛО...\n"
 "       або    %s [КЛЮЧ]... -d К�Т�ЛОГ...\n"
 
-#: src/install.c:601
+#: src/install.c:608
 msgid ""
 "\n"
 "This install program copies files (often just compiled) into destination\n"
@@ -4920,7 +5022,7 @@ msgstr ""
 "вла�ника/групу.  В четвертій формі �творює в�і компоненти вказаних\n"
 "К�Т�ЛОГІВ.\n"
 
-#: src/install.c:615
+#: src/install.c:622
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
 "  -b                  like --backup but does not accept an argument\n"
@@ -4939,7 +5041,7 @@ msgstr ""
 "  -d, --directory     вважати в�і аргументи каталогами; �творювати в�і\n"
 "                        компоненти вказаних каталогів\n"
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -4956,7 +5058,7 @@ msgstr ""
 "  -m, --mode=РЕЖИМ    в�тановлювати РЕЖИМ (�к chmod), а не rwxr-xr-x\n"
 "  -o, --owner=ВЛ�С�ИК в�тановлювати ВЛ�С�ИК� (лише дл� �уперкори�тувача)\n"
 
-#: src/install.c:631
+#: src/install.c:638
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
 "files\n"
@@ -4978,68 +5080,70 @@ msgstr ""
 "  -T, --no-target-directory вважати ЦІЛЬ звичайним файлом\n"
 "  -v, --verbose       виводити назву кожного �творюваного каталогу\n"
 
-#: src/install.c:641
+#: src/install.c:648
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
-msgstr ""
-"      --preserve-context  зберегти контек�т безпеки SELinux\n"
-"  -Z, --context=CONTEXT  в�тановити контек�т безпеки SELinux дл� файлів та "
-"каталогів\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
+msgstr ""
+"      --preserve-context  зберігати контек�т безпеки SELinux\n"
+"      -Z                  в�тановити типовий тип контек�ту безпеки SELinux\n"
+"                            дл� файла призначенн�\n"
+"      --context[=CTX]     подібний до -Z, �кщо вказано CTX, в�тановити "
+"контек�т безпеки\n"
+"                            SELinux або SMACK відповідно до вказаного "
+"значенн�\n"
+"                            контек�ту CTX\n"
+
+#: src/install.c:696 src/unlink.c:86
+#, c-format
+msgid "cannot unlink %s"
+msgstr "не вдало�� вилучити по�иланн� %s"
 
-#: src/install.c:859
+#: src/install.c:877
 #, c-format
 msgid ""
 "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
 msgstr ""
 "Попередженн�: --preserve-context ігноруєть��; �дро не підтримує SELinux."
 
-#: src/install.c:869
-#, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
-msgstr "Попередженн�: --context (-Z) ігноруєть��; �дро не підтримує SELinux."
-
-#: src/install.c:886
+#: src/install.c:917
 #, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr "при в�тановленні каталогу не можна вживати ключ strip"
 
-#: src/install.c:889
+#: src/install.c:920
 #, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr "при в�тановленні каталогу не можна вказувати цільовий каталог"
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr "не можна приму�ово вказувати контек�т та %s зберігати його "
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, c-format
 msgid "invalid mode %s"
 msgstr "неправильний режим %s"
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr ""
 "ПОПЕРЕДЖЕ��Я: ігноруємо параметр --strip-program, о�кільки параметр -s не "
 "вказано"
 
-#: src/install.c:959
+#: src/install.c:1001
 #, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr ""
 "параметри --compare (-C) і --preserve-timestamps не можна викори�товувати "
 "одноча�но"
 
-#: src/install.c:966
+#: src/install.c:1008
 #, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr "параметри --compare (-C) і --strip не можна викори�товувати одноча�но"
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -5053,7 +5157,7 @@ msgstr ""
 msgid "Mike Haertel"
 msgstr "Mike Haertel"
 
-#: src/join.c:191
+#: src/join.c:195
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
 "standard output.  The default join field is the first, delimited\n"
@@ -5072,7 +5176,7 @@ msgstr ""
 "                       номером (1 або 2)\n"
 "  -e РЯДОК           замінювати при виводі порожні р�дки вказаним РЯДКОМ\n"
 
-#: src/join.c:200
+#: src/join.c:204
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
 "  -j FIELD          equivalent to '-1 FIELD -2 FIELD'\n"
@@ -5084,7 +5188,7 @@ msgstr ""
 "  -o ФОРМ�Т          виводити відповідно до ФОРМ�ТУ\n"
 "  -t З��К            викори�товувати З��К розділенн� полів вводу та виводу\n"
 
-#: src/join.c:206
+#: src/join.c:210
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
 "  -1 FIELD          join on this FIELD of file 1\n"
@@ -5104,7 +5208,13 @@ msgstr ""
 "  --header          вважати перший р�док кожного файла заголовками полів,\n"
 "                      виве�ти їх без �проб знайти дл� них пари\n"
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr ""
+"  -z, --zero-terminated     завершувати р�дки нульовим байтом, а не �имволом "
+"нового р�дка\n"
+
+#: src/join.c:225
 msgid ""
 "\n"
 "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n"
@@ -5140,47 +5250,47 @@ msgstr ""
 "�кі�ь з р�дків не може бути об'єднано, буде показано повідомленн�\n"
 "з попередженн�м про це.\n"
 
-#: src/join.c:403
+#: src/join.c:410
 #, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
 msgstr "%s:%<PRIuMAX>: не впор�дковано: %.*s"
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, c-format
 msgid "invalid field number: %s"
 msgstr "неправильний номер пол�: %s"
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, c-format
 msgid "invalid field specifier: %s"
 msgstr "неправильна �пецифікаці� пол�: %s"
 
-#: src/join.c:877
+#: src/join.c:884
 #, c-format
 msgid "invalid file number in field spec: %s"
 msgstr "неправильний номер файла у �пецифікації пол�: %s"
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr "пол� об'єднанн� %lu, %lu не�умі�ні"
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr "конфліктуючі р�дки заміни дл� порожнього пол�"
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, c-format
 msgid "multi-character tab %s"
 msgstr "багатознакова табул�ці� %s"
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr "не�умі�на табул�ці�"
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr "замі�ть обох файлів не можна вказувати одноча�но �тандартний ввід"
@@ -5300,47 +5410,47 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr "не вдало�� �творити по�иланн� %s на %s"
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr "%s: не допу�каєть�� �творювати жор�ткі по�иланн� на каталоги"
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, c-format
 msgid "%s: cannot overwrite directory"
 msgstr "%s: не вдало�� перезапи�ати каталог"
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
 msgstr "%s: замінити %s? "
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, c-format
 msgid "failed to create symbolic link %s"
 msgstr "не вдало�� �творити �имволічне по�иланн� %s"
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr "не вдало�� �творити �имволічне по�иланн� %s -> %s"
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr "не вдало�� �творити жор�тке по�иланн� на %.0s%s"
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, c-format
 msgid "failed to create hard link %s"
 msgstr "не вдало�� �творити жор�тке по�иланн� %s"
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, c-format
 msgid "failed to create hard link %s => %s"
 msgstr "не вдало�� �творити жор�тке по�иланн� %s => %s"
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -5353,7 +5463,7 @@ msgstr ""
 "         або  %s [КЛЮЧ]... ПРИЗ��ЧЕ��Я... К�Т�ЛОГ      (3-� форма)\n"
 "         або  %s [КЛЮЧ]... -t К�Т�ЛОГ ПРИЗ��ЧЕ��Я...   (4-а форма)\n"
 
-#: src/ln.c:381
+#: src/ln.c:398
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
 "In the 2nd form, create a link to TARGET in the current directory.\n"
@@ -5376,7 +5486,7 @@ msgstr ""
 "визначенн� ПРИЗ��ЧЕ��Я відно�не по�иланн� визначатиметь�� на о�нові\n"
 "батьків�ького каталогу по�иланн�.\n"
 
-#: src/ln.c:394
+#: src/ln.c:411
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
 "file\n"
@@ -5396,7 +5506,7 @@ msgstr ""
 "                              �уперкори�тувача)\n"
 "  -f, --force                 вилучати вже �творені цільові файли\n"
 
-#: src/ln.c:402
+#: src/ln.c:419
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
 "  -L, --logical               dereference TARGETs that are symbolic links\n"
@@ -5420,7 +5530,7 @@ msgstr ""
 "  -s, --symbolic              �творювати �имволічні по�иланн�, замі�ть "
 "жор�тких\n"
 
-#: src/ln.c:411
+#: src/ln.c:428
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
 "  -t, --target-directory=DIRECTORY  specify the DIRECTORY in which to "
@@ -5437,7 +5547,7 @@ msgstr ""
 "  -v, --verbose               виводити назву кожного файла перед �творенн�м "
 "по�иланн�\n"
 
-#: src/ln.c:433
+#: src/ln.c:450
 #, c-format
 msgid ""
 "\n"
@@ -5450,13 +5560,13 @@ msgstr ""
 "визначає роботу програми, �кщо призначенн�м є �имволічне по�иланн�.\n"
 "Типове значенн�: %s.\n"
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr ""
 "не можна одноча�но викори�товувати --target-directory і --no-target-directory"
 
-#: src/ln.c:588
+#: src/ln.c:605
 #, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr "не можна виконувати --relative без --symbolic"
@@ -5489,7 +5599,7 @@ msgstr "реє�траційне ім'� від�утнє"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
@@ -5498,95 +5608,95 @@ msgstr "%b %e  %Y"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 msgid "%b %e %H:%M"
 msgstr "%b %e %H:%M"
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr "проігноровано неправильне значенн� змінної оточенн� QUOTING_STYLE: %s"
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr "проігноровано неправильну довжину змінної �ередовища COLUMNS: %s"
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr ""
 "проігноровано неправильний розмір табул�ції змінної оточенн� TABSIZE: %s"
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, c-format
 msgid "invalid line width: %s"
 msgstr "неправильна довжина р�дка: %s"
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, c-format
 msgid "invalid tab size: %s"
 msgstr "неправильний розмір табул�ції: %s"
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, c-format
 msgid "invalid time style format %s"
 msgstr "неправильний формат ча�у %s"
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 msgid "Valid arguments are:\n"
 msgstr "Коректні аргументи:\n"
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr "  - +ФОРМ�Т (наприклад +%H:%M) дл� формату у �тилі 'date'\n"
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr "помилка під ча� ініціалізації р�дків мі��ців"
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, c-format
 msgid "unrecognized prefix: %s"
 msgstr "не розпізнаний префік�: %s"
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr "незрозуміле значенн� змінної оточенн� LS_COLORS"
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, c-format
 msgid "cannot open directory %s"
 msgstr "не вдало�� відкрити каталог %s"
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, c-format
 msgid "cannot determine device and inode of %s"
 msgstr "не вдало�� визначити при�трій та inode дл� %s"
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, c-format
 msgid "%s: not listing already-listed directory"
 msgstr "%s: пропущено вже перелічений каталогу"
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, c-format
 msgid "reading directory %s"
 msgstr "читанн� каталогу %s"
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, c-format
 msgid "closing directory %s"
 msgstr "закритт� каталогу %s"
 
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, c-format
 msgid "cannot compare file names %s and %s"
 msgstr "не вдало�� порівн�ти назви файлів %s та %s"
 
-#: src/ls.c:4721
+#: src/ls.c:4781
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
 "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n"
@@ -5595,7 +5705,7 @@ msgstr ""
 "Впор�дковує у алфавітному пор�дку, �кщо не вказано ні --sort, ні один з\n"
 "параметрів -cftuSUX.\n"
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
 "  -A, --almost-all           do not list implied . and ..\n"
@@ -5609,17 +5719,17 @@ msgstr ""
 "  -b, --escape               виводити ві�імкові керівні по�лідовно�ті\n"
 "                             замі�ть неграфічних знаків\n"
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
 "      --block-size=РОЗМІР    викори�товувати блоки розміром РОЗМІР.\n"
@@ -5635,27 +5745,25 @@ msgstr ""
 "                              у іншому випадку впор�дкувати за ча�ом зміни,\n"
 "                              найновіші — перші\n"
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 "  -C                         виводити �пи�ок у декілька колонок\n"
 "      --color[=КОЛИ]         вказує, чи позначати типи файлів кольором.\n"
-"                               КОЛИ може бути «never» (не позначати),\n"
-"                               «always» (виділ�ти) або «auto» (залежить від\n"
-"                               термінала)\n"
+"                               КОЛИ може бути «never», «auto» або\n"
+"                               «always» (типовий)\n"
 "  -d, --directory            виводити назви каталогів, а не їх змі�т, а\n"
 "                               також не �лідувати за �имволічним по�иланн�м\n"
 "  -D, --dired                �творити виведені дані у режимі Emacs dired\n"
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
 "  -F, --classify             append indicator (one of */=>@|) to entries\n"
@@ -5671,15 +5779,16 @@ msgstr ""
 "                               single-column -1, verbose -l, vertical -C\n"
 "      --full-time            виводити повну дату та ча�\n"
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr "  -g                         �к і -l, але не виводити вла�ника\n"
 
-#: src/ls.c:4763
+#: src/ls.c:4823
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 "      --group-directories-first\n"
@@ -5688,26 +5797,27 @@ msgstr ""
 "                               але викори�танн� --sort=none (-U) вимикає\n"
 "                               групуванн�\n"
 
-#: src/ls.c:4769
+#: src/ls.c:4829
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
 "  -G, --no-group             у довгому �пи�ку, не виводити назви груп\n"
-"  -h, --human-readable       виводити розміри у зручному дл� людини вигл�ді\n"
+"  -h, --human-readable       з -l і/або -s виводити розміри у зручному дл� "
+"людини вигл�ді\n"
 "                               (наприклад, 1K 234M 2G)\n"
 "  -H, --si                   те �аме, але виводити �тупені 1000, а не 1024\n"
 
-#: src/ls.c:4775
+#: src/ls.c:4835
 msgid ""
 "  -H, --dereference-command-line\n"
 "                             follow symbolic links listed on the command "
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
@@ -5722,7 +5832,7 @@ msgstr ""
 "      --hide=Ш�БЛО�          не виводити файли, що відповідають Ш�БЛО�У\n"
 "                             оболонки (�ка�овуєть�� ключами -a або -A)\n"
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
 "names:\n"
@@ -5731,7 +5841,7 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 "      --indicator-style=СТИЛЬ додавати до назв елементів індикатор з\n"
 "                               вказаним СТИЛЕМ: none (типово), slash (-p),\n"
@@ -5740,7 +5850,7 @@ msgstr ""
 "  -I, --ignore=Ш�БЛО�        не виводити файли, що відповідають Ш�БЛО�У\n"
 "  -k, --kibibytes            викори�товувати 1024-байтові блоки\n"
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -5755,7 +5865,7 @@ msgstr ""
 "                               по�илаєть�� по�иланн�\n"
 "  -m                         виводити �пи�ок на в�ю ширину через кому\n"
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -5771,11 +5881,11 @@ msgstr ""
 "  -o                         �к -l, але не виводити інформацію про групу\n"
 "  -p,  --indicator-style=slash  додавати індикатор / до каталогів\n"
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -5790,7 +5900,7 @@ msgstr ""
 "      --quoting-style=СЛОВО  викори�товувати вид оточенн� дужками СЛОВО:\n"
 "                               literal, shell, shell-always, c, escape\n"
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
 "  -R, --recursive            list subdirectories recursively\n"
@@ -5801,36 +5911,42 @@ msgstr ""
 "  -R, --recursive            рекур�ивно виводити каталоги\n"
 "  -s, --size                 виводити розмір кожного файла, у блоках\n"
 
-#: src/ls.c:4825
+#: src/ls.c:4886
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 "  -S                         �ортувати за розміром файла\n"
-"      --sort=СЛОВО           extension -X, none -U, size -S, time -t,\n"
-"                             version -v, status -c, time -t, atime -u,\n"
-"                             access -u, use -u\n"
+"      --sort=СЛОВО           режиму упор�дковуванн� (замі�ть «за назвою»):\n"
+"                              none (-U), size (-S), time (-t),\n"
+"                              version (-v), extension (-X)\n"
 "      --time=СЛОВО           з -l, виводити замі�ть ча�у зміни ча�,\n"
-"                             вказаний СЛОВОМ: atime, access, use, ctime або\n"
-"                             status; �кщо --sort=time, викори�товувати\n"
-"                             вказаний ча� �к ключ �ортуванн�\n"
+"                              вказаний СЛОВОМ: atime, access, use (-u), "
+"ctime або\n"
+"                              status (-c); �кщо --sort=time, "
+"викори�товувати\n"
+"                              вказаний ча� �к ключ �ортуванн�\n"
 
-#: src/ls.c:4835
+#: src/ls.c:4896
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
 msgstr ""
 "      --time-style=СТИЛЬ     з -l, виводити ча� викори�товуючи СТИЛЬ:\n"
 "                             full-iso, long-iso, iso, locale, +ФОРМ�Т.\n"
@@ -5841,7 +5957,7 @@ msgstr ""
 "префік�\n"
 "                             'posix-', то він діє лише не у POSIX локалі\n"
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 msgid ""
 "  -t                         sort by modification time, newest first\n"
 "  -T, --tabsize=COLS         assume tab stops at each COLS instead of 8\n"
@@ -5850,10 +5966,10 @@ msgstr ""
 "�початку\n"
 "  -T, --tabsize=ЧИСЛО        крок табул�ції дорівнює ЧИСЛУ замі�ть 8\n"
 
-#: src/ls.c:4848
+#: src/ls.c:4912
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
@@ -5868,23 +5984,21 @@ msgstr ""
 "тек�товому\n"
 "                              форматі\n"
 
-#: src/ls.c:4855
+#: src/ls.c:4919
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 "  -w, --width=ЧИСЛО          задає ширину екрана замі�ть поточного значенн�\n"
 "  -x                         вивід �пи�ку р�дками, а не �товпчиками\n"
 "  -X                         �ортувати за розширенн�м у алфавітному пор�дку\n"
-"  -Z, --context              виводити контек�т безпеки SELinux дл� кожного "
-"файла\n"
+"  -Z, --context              виводити контек�т безпеки дл� кожного файла\n"
 "  -1                         виводити по одному файлу у р�дку\n"
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -5899,7 +6013,7 @@ msgstr ""
 "Змінити параметри можна за допомогою змінної �ередовища LS_COLORS.\n"
 "Дл� в�тановленн� цієї змінної �кори�тайте�� командою dircolors.\n"
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -5978,33 +6092,30 @@ msgstr "  -t, --text           читати у тек�товому режимі
 #: src/md5sum.c:195
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
 "\n"
-"Три наведених нижче параметра викори�товують�� лише при перевірці "
+"Чотири наведених нижче параметри викори�товують�� лише під ча� перевірки "
 "контрольних �ум:\n"
 "      --quiet          не виводити підтвердженн� дл� кожного у�пішно "
 "перевіреного\n"
 "                         файла\n"
 "      --status         не виконувати вивід, код завершенн� показує\n"
 "                         у�піх перевірки\n"
+"      --strict         виводити ненульовий код завершенн� дл� р�дків "
+"контрольних\n"
+"                         �ум з помилками у форматуванні\n"
 "  -w, --warn           попереджувати про неправильно �формовані р�дки у\n"
 "                         �пи�ку контрольних �ум\n"
 "\n"
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-"      --strict         з --check вийти з ненульовим кодом дл� будь-�кого "
-"некоректного\n"
-"                       джерела вхідних даних\n"
-
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, c-format
 msgid ""
 "\n"
@@ -6019,35 +6130,35 @@ msgstr ""
 "Типово виводить р�док з контрольною �умою, �имвол, що вказує на\n"
 "тип файла («*» дл� двійкових, « » дл� тек�тових), та назву кожного Ф�ЙЛа.\n"
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, c-format
 msgid "%s: too many checksum lines"
 msgstr "%s: надто багато р�дків контрольних �ум"
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr "%s: %<PRIuMAX>: неправильно �кладений р�док контрольної �уми %s"
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr "%s: не вдало�� відкрити або прочитати\n"
 
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr "ПОМИЛК�"
 
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr "Гаразд"
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr "%s: не знайдено правильно �кладених р�дків контрольних �ум %s"
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
@@ -6055,7 +6166,7 @@ msgstr[0] "ПОПЕРЕДЖЕ��Я: %<PRIuMAX> р�док має помилко
 msgstr[1] "ПОПЕРЕДЖЕ��Я: %<PRIuMAX> р�дки мають помилкове форматуванн�"
 msgstr[2] "ПОПЕРЕДЖЕ��Я: %<PRIuMAX> р�дків мають помилкове форматуванн�"
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
@@ -6063,7 +6174,7 @@ msgstr[0] "ПОПЕРЕДЖЕ��Я: не вдало�� прочитати %<PR
 msgstr[1] "ПОПЕРЕДЖЕ��Я: не вдало�� прочитати %<PRIuMAX> вказані файли"
 msgstr[2] "ПОПЕРЕДЖЕ��Я: не вдало�� прочитати %<PRIuMAX> вказаних файлів"
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
@@ -6071,118 +6182,153 @@ msgstr[0] "ПОПЕРЕДЖЕ��Я: �Е збігла�ь %<PRIuMAX> обчи�
 msgstr[1] "ПОПЕРЕДЖЕ��Я: �Е збігли�ь %<PRIuMAX> обчи�лені контрольні �уми"
 msgstr[2] "ПОПЕРЕДЖЕ��Я: �Е збігли�ь %<PRIuMAX> обчи�лених контрольних �ум"
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
 msgstr "підтримки --tag у режимі --text не передбачено"
 
-#: src/md5sum.c:766
+#: src/md5sum.c:770
 #, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr "ключ --tag не має �ен�у під ча� перевірки контрольних �ум"
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
 msgstr "ключі --binary та --text не мають �ен�у при перевірці контрольних �ум"
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr "ключ --status має �ен� лише при перевірці контрольних �ум"
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr "ключ --warn має �ен� лише при перевірці контрольних �ум"
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr "ключ --quiet має �ен� лише при перевірці контрольних �ум"
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr "ключ --strict має �ен� лише при перевірці контрольних �ум"
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr "Викори�танн�: %s [КЛЮЧ]... К�Т�ЛОГ...\n"
 
-#: src/mkdir.c:57
+#: src/mkdir.c:59
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
 msgstr "Створює DIRECTORY, �кщо він ще не і�нує.\n"
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 "  -m, --mode=MODE   в�тановити код до�тупу (�к у chmod)\n"
 "  -p, --parents     не виводити помилок �кщо каталог і�нує,\n"
 "                     при потребі �творювати батьків�ькі каталоги\n"
 "  -v, --verbose     виводити повідомленн� про кожен �творений каталог\n"
-"  -Z, --context=CTX  в�тановити контек�т безпеки SELinux кожного �твореного\n"
-"                      каталогу на CTX\n"
 
-#: src/mkdir.c:168
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+"  -Z                   в�тановити типовий тип контек�ту безпеки SELinux дл� "
+"у�іх\n"
+"                         �творених каталогів\n"
+"      --context[=CTX]  подібний до -Z, �кщо вказано CTX, в�тановити контек�т "
+"безпеки\n"
+"                         SELinux або SMACK відповідно до вказаного значенн�\n"
+"                         контек�ту CTX\n"
+
+#: src/mkdir.c:127 src/mkdir.c:172
+#, c-format
+msgid "failed to set default creation context for %s"
+msgstr "помилка в�тановленн� типового контек�ту дл� �творенн� %s"
+
+#: src/mkdir.c:191
+#, c-format
+msgid "failed to restore context for %s"
+msgstr "не вдало�� зберегти мітки ча�у дл� %s"
+
+#: src/mkdir.c:231
 #, c-format
 msgid "created directory %s"
 msgstr "�творений каталог %s"
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr ""
+"попередженн�: ігноруємо --context; дл� його викори�танн� потрібне �дро з "
+"підтримкою SELinux або SMACK"
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr "Викори�танн�: %s [КЛЮЧ]... ��ЗВ�...\n"
 
-#: src/mkfifo.c:52
+#: src/mkfifo.c:54
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
 msgstr "Створює іменовані канали (FIFO) дл� вказаного NAME.\n"
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
 msgstr ""
 "  -m, --mode=РЕЖИМ   в�тановити права до�тупу у РЕЖИМ, а не  a=rw - umask\n"
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
-"  -Z, --context=КО�  в�тановити контек�т безпеки SELinux дл� кожної ��ЗВИ у "
-"КО�\n"
+"  -Z                   в�тановити типовий тип контек�ту безпеки SELinux\n"
+"      --context[=CTX]  подібний до -Z, �кщо вказано CTX, в�тановити контек�т "
+"безпеки\n"
+"                         SELinux або SMACK відповідно до вказаного значенн�\n"
+"                         контек�ту CTX\n"
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, c-format
 msgid "invalid mode"
 msgstr "неправильний режим"
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr "режим повинен визначати лише біти прав до�тупу до файла"
 
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
+#, c-format
+msgid "cannot set permissions of %s"
+msgstr "не вдало�� в�тановити права до�тупу до %s"
+
+#: src/mknod.c:54
 #, c-format
 msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr "Викори�танн�: %s [КЛЮЧ]... ��ЗВ� ТИП [ОС�ОВ�ИЙ ДРУГОРЯД�ИЙ]\n"
 
-#: src/mknod.c:54
+#: src/mknod.c:56
 msgid "Create the special file NAME of the given TYPE.\n"
 msgstr "Створює �пеціальній файл з назвою NAME та типом TYPE.\n"
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr ""
-"  -Z, --context=КО�  в�тановити контек�т безпеки SELinux дл� ��ЗВ� у КО�\n"
-
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -6197,7 +6343,7 @@ msgstr ""
 "ші�тнадц�ткові чи�ла; �кщо починають�� з 0 - �к ві�імкові;\n"
 "інакше �к де��ткові.  ТИП може приймати на�тупні значенн�:\n"
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 msgid ""
 "\n"
 "  b      create a block (buffered) special file\n"
@@ -6209,57 +6355,57 @@ msgstr ""
 "  c, u   �творити файл �имвольного при�трою (не буферизований)\n"
 "  p      �творити іменований канал\n"
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 msgid "Special files require major and minor device numbers."
 msgstr ""
 "Дл� �пеціального файла повинні бути вказані о�новний та другор�дний номери "
 "при�трою."
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 msgid "Fifos do not have major and minor device numbers."
 msgstr "У файлів-черг немає о�новного та другор�дного чи�ла при�трою."
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, c-format
 msgid "block special files not supported"
 msgstr "блочні �пеціальні файли не підтримують��"
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, c-format
 msgid "character special files not supported"
 msgstr "знакові �пеціальні файли не підтримують��"
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, c-format
 msgid "invalid major device number %s"
 msgstr "неправильне о�новне чи�ло при�трою %s"
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, c-format
 msgid "invalid minor device number %s"
 msgstr "неправильне другор�дне чи�ло при�трою %s"
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, c-format
 msgid "invalid device %s %s"
 msgstr "неправильний при�трій %s %s"
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, c-format
 msgid "invalid device type %s"
 msgstr "неправильний тип при�трою %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr "Eric Blake"
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr "Викори�танн�: %s [КЛЮЧ]... [Ш�БЛО�]\n"
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
 "TEMPLATE must contain at least 3 consecutive 'X's in last component.\n"
@@ -6270,14 +6416,14 @@ msgstr ""
 "компоненті. Якщо Ш�БЛО� не вказано, викори�товуєть�� tmp.XXXXXXXXXX і\n"
 "додаєть�� параметр --tmpdir.\n"
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
 "Файли буде �творено з правами u+rw, каталоги — u+rwx, міну� обмеженн� "
 "umask.\n"
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
@@ -6289,12 +6435,12 @@ msgstr ""
 "  -q, --quiet         вимкнути діагно�тику щодо помилок �творенн� файлів і "
 "каталогів\n"
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
 "      --suffix=СУФФ   додавати СУФФ до Ш�БЛО�у. СУФФ не повинен мі�тити "
 "�имволів\n"
@@ -6302,87 +6448,80 @@ msgstr ""
 "                        Цей параметр буде викори�тано, �кщо Ш�БЛО� не "
 "завершуєть�� на X.\n"
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
-"  --tmpdir[=К�Т]   інтерпретувати Ш�БЛО� відно�но К�Т. Якщо К�Т не\n"
+"  -p К�Т, --tmpdir[=К�Т] інтерпретувати Ш�БЛО� відно�но каталогу К�Т. Якщо "
+"К�Т не\n"
 "                     вказано, викори�товуєть�� $TMPDIR, �кщо значенн� не\n"
 "                     задане, викори�товуєть�� /tmp., Ш�БЛО� не повинен бути\n"
 "                     аб�олютною назвою. �а відміну від -t, Ш�БЛО� може\n"
 "                     мі�тити похилі ри�ки, але mktemp �творюватиме лише\n"
 "                     о�танній компонент таких запи�ів.\n"
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
 msgstr ""
-"  -p К�Т�ЛОГ          викори�товувати К�Т�ЛОГ �к префік�; додає -t "
-"[за�тарілий]\n"
 "  -t                  вважати Ш�БЛО� одиночним компонентом назви файла,\n"
 "                        відно�но каталогу: $TMPDIR, �кщо в�тановлено; у "
 "іншому\n"
 "                        разі каталог вказуєть�� у -p; інакше /tmp "
 "[за�таріло]\n"
 
-#: src/mktemp.c:223
-#, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr "не вдало�� пере�пр�мувати stderr до /dev/null"
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, c-format
 msgid "too many templates"
 msgstr "надто багато шаблонів"
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr "у разі визначенн� --suffix, шаблон %s має завершувати на X"
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr "некоректний шаблон, %s, мі�тить �имвол розділенн� каталогів"
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr "надто мало �имволів X у шаблоні %s"
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr "неправильний шаблон, %s, мі�тить �имвол розділенн� каталогів"
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr "неправильний шаблон, %s; з --tmpdir, він не може бути аб�олютним"
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, c-format
 msgid "failed to create directory via template %s"
 msgstr "не вдало�� �творити каталог через шаблон %s"
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, c-format
 msgid "failed to create file via template %s"
 msgstr "не вдало�� �творити файл через шаблон %s"
 
-#: src/mv.c:292
+#: src/mv.c:294
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 "Перейменовує ДЖЕРЕЛО у ПРИЗ��ЧЕ��Я, або переміщує ДЖЕРЕЛ� до К�Т�ЛОГУ.\n"
 
-#: src/mv.c:298
+#: src/mv.c:300
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
 "file\n"
@@ -6403,7 +6542,7 @@ msgstr ""
 "Якщо буде вказано декілька -i, -f, -n, братиметь�� до уваги лише о�танній\n"
 "параметр.\n"
 
-#: src/mv.c:307
+#: src/mv.c:309
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
@@ -6414,7 +6553,7 @@ msgstr ""
 "                               аргументу ДЖЕРЕЛО\n"
 "  -S, --suffix=СУФІКС          перевизначає �уфік� дл� резервних копій\n"
 
-#: src/mv.c:312
+#: src/mv.c:314
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
 "DIRECTORY\n"
@@ -6423,6 +6562,8 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
 "  -t, --target-directory=К�Т�ЛОГ перемі�тити в�і ДЖЕРЕЛ� у К�Т�ЛОГ\n"
 "  -T, --no-target-directory    вважати ЦІЛЬ звичайним файлом\n"
@@ -6430,6 +6571,9 @@ msgstr ""
 "                                 новіший ніж цільовий файл, або коли\n"
 "                                 цільовий файл від�утній\n"
 "  -v, --verbose                по��нювати виконувані дії\n"
+"  -Z, --context                в�тановити типовий тип контек�ту захи�ту "
+"SELinux\n"
+"                                 дл� призначенн�\n"
 
 #: src/nice.c:72
 #, c-format
@@ -6732,58 +6876,53 @@ msgid "%s: invalid number to ignore"
 msgstr "%s: некоректне чи�ло дл� виключенн�"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
 msgstr "Assaf Gordon"
 
-#: src/numfmt.c:676
+#: src/numfmt.c:659
 #, c-format
-msgid "value too large to be converted: '%s'"
-msgstr "значенн� є надто великим дл� перетворенн�: «%s»"
+msgid "value too large to be converted: %s"
+msgstr "значенн� є надто великим дл� перетворенн�: %s"
 
-#: src/numfmt.c:680
+#: src/numfmt.c:663
 #, c-format
-msgid "invalid number: '%s'"
-msgstr "некоректне чи�ло: «%s»"
+msgid "invalid number: %s"
+msgstr "некоректне чи�ло: %s"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
+msgid "rejecting suffix in input: %s (consider using --from)"
 msgstr ""
-"відкидаємо �уфік� «%s» у вхідних даних (варто викори�товувати --from дл� "
-"його збереженн�)"
+"відкидаємо �уфік� %s у вхідних даних (варто викори�товувати --from дл� його "
+"збереженн�)"
 
-#: src/numfmt.c:688
+#: src/numfmt.c:671
 #, c-format
-msgid "invalid suffix in input: '%s'"
-msgstr "некоректний �уфік� у вхідних даних: «%s»"
+msgid "invalid suffix in input: %s"
+msgstr "некоректний �уфік� у вхідних даних: %s"
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
-msgstr "у вхідних даних не ви�тачає �уфік�а «i»: «%s» (наприклад Ki/Mi/Gi)"
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
+msgstr "у вхідних даних не ви�тачає �уфік�а «i»: %s (наприклад Ki/Mi/Gi)"
 
-#: src/numfmt.c:723
+#: src/numfmt.c:722 src/numfmt.c:768
 #, c-format
 msgid "failed to prepare value '%Lf' for printing"
 msgstr "не вдало�� приготувати значенн� «%Lf» дл� виводу"
 
-#: src/numfmt.c:787
-#, c-format
-msgid "invalid unit size: '%s'"
-msgstr "некоректна одиниц� розміру: «%s»"
-
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
+#: src/numfmt.c:791
 #, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr "переповненн� пам’�ті (запитано %zu байтів)"
+msgid "invalid unit size: %s"
+msgstr "некоректна одиниц� розміру: %s"
 
-#: src/numfmt.c:813
+#: src/numfmt.c:814
 #, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
 msgstr "Кори�туванн�: %s [П�Р�МЕТР]... [ЧИСЛО]...\n"
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
@@ -6791,26 +6930,26 @@ msgstr ""
 "Виконати переформатуванн� чи�ла ЧИСЛО або чи�ел зі �тандартного джерела "
 "даних, �кщо ЧИСЛО не вказано.\n"
 
-#: src/numfmt.c:820
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
 msgstr ""
 "      --debug          виводити попередженн� щодо некоректних вхідних даних\n"
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
 "  -d, --delimiter=X    викори�товувати X замі�ть пробілу дл� відокремленн� "
 "полів\n"
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
 "      --field=N        замі�ити чи�ло у полі N вхідних даних (типове поле -- "
 "1)\n"
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
@@ -6818,7 +6957,7 @@ msgstr ""
 "      --format=ФОРМ�Т  викори�товувати форматуванн� у �тилі printf;\n"
 "                         див. докладний опи� форматів нижче\n"
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
@@ -6828,7 +6967,7 @@ msgstr ""
 "типове значенн� -- 'none';\n"
 "                         див. опи� одиниць нижче\n"
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
@@ -6836,7 +6975,7 @@ msgstr ""
 "      --from-unit=N    вказати розмірні�ть одиниці у вхідних даних (замі�ть "
 "типової 1)\n"
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
@@ -6847,7 +6986,7 @@ msgstr ""
 "наприклад 1.000.000\n"
 "                         (не працюватиме у локалі C/POSIX)\n"
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
@@ -6855,7 +6994,7 @@ msgstr ""
 "      --header[=N]     виве�ти (без перетворенн�) перші N р�дків заголовка;\n"
 "                         �кщо не вказано, типовим значенн�м є 1\n"
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
@@ -6865,7 +7004,7 @@ msgstr ""
 "помилками),\n"
 "                  warn (попередити), ignore (ігнорувати).\n"
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -6877,13 +7016,13 @@ msgstr ""
 "      --padding=N     доповнити виведені дані до N �имволів.\n"
 "                      Викори�танн� додатного N призведе до вирівнюванн� "
 "праворуч\n"
-"                      Від’ємні N вирівнюватимуть дані ліворуч.\n"
+"                      Від'ємні N вирівнюватимуть дані ліворуч.\n"
 "                      Зауваженн�: �кщо виведені дані будуть довшими за N,\n"
 "                      доповненн� не відбуватиметь��. Типовим є автоматичне "
 "доповненн�,\n"
 "                      �кщо буде ви�влено пробіли.\n"
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
@@ -6896,7 +7035,7 @@ msgstr ""
 "нул�),\n"
 "                         nearest (до найближчого цілого\n"
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
@@ -6905,21 +7044,21 @@ msgstr ""
 "СУФІКС\n"
 "                         у вхідних даних.\n"
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
 "      --to=ОДИ�ИЦЯ     автоматично ма�штабувати виведені чи�ла за ОДИ�ИЦЕЮ; "
 "див. опи� одиниць нижче\n"
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr ""
 "      --to-unit=N      розмірні�ть одиниці у виведених даних (замі�ть "
 "типової 1)\n"
 
-#: src/numfmt.c:877
+#: src/numfmt.c:878
 msgid ""
 "\n"
 "UNIT options:\n"
@@ -6927,13 +7066,13 @@ msgstr ""
 "\n"
 "Параметри одиниць:\n"
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr ""
 "  none       без автоматичного ма�штабуванн�; викори�танн� �уфік�ів призведе "
 "до повідомленн� про помилку\n"
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -6947,7 +7086,7 @@ msgstr ""
 "               1M = 1000000,\n"
 "               1Mi = 1048576,\n"
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
@@ -6959,7 +7098,7 @@ msgstr ""
 "               1M = 1000000,\n"
 "               ...\n"
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
@@ -6971,7 +7110,7 @@ msgstr ""
 "               1M = 1048576,\n"
 "               ...\n"
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
@@ -6983,26 +7122,27 @@ msgstr ""
 "               1Mi = 1048576,\n"
 "               ...\n"
 
-#: src/numfmt.c:905
+#: src/numfmt.c:906
 #, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
 "\n"
 "ФОРМ�Т має відповідати виведенню одного аргументу з рухомою крапкою -- "
 "«%f».\n"
 "Викори�танн� лапки (%'f) увімкне параметр --grouping (�кщо він підтримуєть�� "
 "поточною локаллю).\n"
-"Додаткове визначенн� довжини (%10f) призведе до доповненн� виведених даних. "
-"Додаткові від’ємні\n"
+"Додаткове визначенн� довжини (%10f) призведе до доповненн� виведених даних.\n"
+"Додаткова нульова дожина (%010f) призведе до нульового доповненн� чи�ла. "
+"Додаткові від'ємні\n"
 "значенн� довжини (%-10f) вирівнюватимуть виведенн� ліворуч.\n"
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -7024,7 +7164,7 @@ msgstr ""
 "буде 0. Якщо буде вказано --invalid='ignore', про помилки перетворенн� не\n"
 "повідомл�тиметь��, а �таном виходу буде 0.\n"
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -7061,118 +7201,118 @@ msgstr ""
 "  $ ls -lh | %s --header --field 5 --from=iec --padding=10\n"
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, c-format
 msgid "format %s has no %% directive"
 msgstr "формат %s не мі�тить директиву %%"
 
-#: src/numfmt.c:990
+#: src/numfmt.c:1003
 #, c-format
 msgid "invalid format %s (width overflow)"
 msgstr "некоректний формат %s (переповненн� ширини)"
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr "--format доповненн� перевизначає --padding"
+
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr "формат %s закінчуєть�� у %%"
 
-#: src/numfmt.c:1010
+#: src/numfmt.c:1030
 #, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
-msgstr "некоректний формат %s, ін�трукцією має бути %%['][-][N]f"
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
+msgstr "некоректний формат %s, ін�трукцією має бути %%[0]['][-][N]f"
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr "формат %s має надто багато директив %%"
 
-#: src/numfmt.c:1070
+#: src/numfmt.c:1081
 #, c-format
-msgid "invalid suffix in input '%s': '%s'"
-msgstr "некоректний �уфік� у вхідних даних «%s»: «%s»"
+msgid "invalid suffix in input %s: %s"
+msgstr "некоректний �уфік� у вхідних даних %s: %s"
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
 msgstr ""
 "значенн� є надто великим дл� виведенн�: «%Lg» (варто �кори�тати�� --to)"
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
 msgstr ""
 "значенн� є надто великим дл� виведенн�: «%Lg» (обробка значень більше 999Y "
 "неможлива)"
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
-msgstr "занадто велике вхідне значенн�, «%s», можлива втрата точно�ті"
+msgid "large input value %s: possible precision loss"
+msgstr "занадто велике вхідне значенн�, %s, можлива втрата точно�ті"
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
 "надто короткий р�док вхідних даних, у полі %ld не ви�влено чи�ел дл� "
 "форматуванн�"
 
-#: src/numfmt.c:1388
+#: src/numfmt.c:1403
 #, c-format
-msgid "invalid padding value '%s'"
-msgstr "некоректне значенн� доповненн� «%s»"
+msgid "invalid padding value %s"
+msgstr "некоректне значенн� доповненн� %s"
 
-#: src/numfmt.c:1401
+#: src/numfmt.c:1417
 #, c-format
-msgid "invalid field value '%s'"
-msgstr "некоректне значенн� пол�, «%s»"
+msgid "invalid field value %s"
+msgstr "некоректне значенн� пол�, %s"
 
-#: src/numfmt.c:1430
+#: src/numfmt.c:1447
 #, c-format
-msgid "invalid header value '%s'"
-msgstr "некоректне значенн� заголовка, «%s»"
+msgid "invalid header value %s"
+msgstr "некоректне значенн� заголовка, %s"
 
-#: src/numfmt.c:1456
+#: src/numfmt.c:1473
 #, c-format
 msgid "--grouping cannot be combined with --format"
 msgstr "--grouping не можна викори�товувати разом з --format"
 
-#: src/numfmt.c:1458
-#, c-format
-msgid "--padding cannot be combined with --format"
-msgstr "--padding не можна викори�товувати разом з --format"
-
-#: src/numfmt.c:1463
+#: src/numfmt.c:1478
 #, c-format
 msgid "no conversion option specified"
 msgstr "не вказано параметра перетворенн�"
 
-#: src/numfmt.c:1471
+#: src/numfmt.c:1486
 #, c-format
 msgid "grouping cannot be combined with --to"
 msgstr "grouping не можна викори�товувати разом з --to"
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
 msgstr "групуванн� не діє у цій локалі"
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
 msgstr ""
 "--header проігноровано, о�кільки вхідні дані надход�ть з командного р�дка"
 
-#: src/numfmt.c:1511
+#: src/numfmt.c:1526
 #, c-format
 msgid "error reading input"
 msgstr "помилка під ча� �проби читанн� вхідних даних"
 
-#: src/numfmt.c:1520
+#: src/numfmt.c:1535
 #, c-format
 msgid "failed to convert some of the input numbers"
 msgstr "не вдало�� перетворити де�кі з вхідних чи�ел"
 
-#: src/od.c:294
+#: src/od.c:320
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -7185,7 +7325,7 @@ msgstr ""
 "       або:    %s --traditional [КЛЮЧ]... [Ф�ЙЛ] [[+]ЗСУВ[.][b] [+][МІТК�][.]"
 "[b]]\n"
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -7200,7 +7340,7 @@ msgstr ""
 "�тандартний ввід.\n"
 "\n"
 
-#: src/od.c:307
+#: src/od.c:333
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
 "if the last operand begins with + or (if there are 2 operands) a digit.\n"
@@ -7217,10 +7357,12 @@ msgstr ""
 "ші�тнадц�ткові чи�ла, �уфік� . -- �к ві�імкові, а �уфік� b\n"
 "помножує на 512.\n"
 
-#: src/od.c:318
+#: src/od.c:344
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
 "  -A, --address-radix=ОС�ОВ�  виводити з�ув у файлах викори�товуючи\n"
@@ -7229,17 +7371,18 @@ msgstr ""
 "                              ОС�ОВОЮ може бути одна з літер [doxn],\n"
 "                              де��ткова, ві�імкова, ші�тнадц�ткова або\n"
 "                              ні�ка\n"
+"      --endian={big|little}   в�тановити вказаний пор�док байтів\n"
 "  -j, --skip-bytes=�          пропу�тить перші � байт\n"
 
-#: src/od.c:323
+#: src/od.c:350
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
@@ -7253,14 +7396,14 @@ msgstr ""
 "                                Якщо N не вказано, буде викори�тано 32\n"
 "      --traditional           приймати аргументи у традиційній формі\n"
 
-#: src/od.c:336
+#: src/od.c:363
 msgid ""
 "\n"
 "\n"
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 "\n"
@@ -7268,10 +7411,11 @@ msgstr ""
 "Традиційні �пецифікації формату можна змішувати, вони акумулюють��:\n"
 "  -a   �инонім -t a,  іменовані знаки\n"
 "  -b   �инонім -t o1, ві�імкові байти\n"
-"  -c   �инонім -t c,  ASCII-знаки або керівні по�лідовно�ті з '\\'\n"
+"  -c   �инонім -t c,  придатні до показу �имовли або керівні по�лідовно�ті з "
+"'\\'\n"
 "  -d   �инонім -t u2, беззнакові де��ткові двобайтові одиниці\n"
 
-#: src/od.c:345
+#: src/od.c:372
 msgid ""
 "  -f   same as -t fF, select floats\n"
 "  -i   same as -t dI, select decimal ints\n"
@@ -7287,21 +7431,21 @@ msgstr ""
 "  -s   �инонім -t d2, де��ткові двобайтові одиниці\n"
 "  -x   �инонім -t x2, ші�тнадц�ткові двобайтові одиниці\n"
 
-#: src/od.c:353
+#: src/od.c:380
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 "\n"
 "\n"
 "ТИП може �кладати�ь з одного або більше на�тупних опи�ів:\n"
 "  a          іменований знак\n"
-"  c          ASCII-знак або керівна по�лідовні�ть з '\\'\n"
+"  c          придатний до показу �имвол або керівна по�лідовні�ть з '\\'\n"
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -7315,7 +7459,7 @@ msgstr ""
 "  u[ЧИСЛО]   беззнакове де��ткове ціле розміром вказане ЧИСЛО байт\n"
 "  x[ЧИСЛО]   ші�тнадц�ткове ціле розміром вказане ЧИСЛО байт\n"
 
-#: src/od.c:367
+#: src/od.c:394
 msgid ""
 "\n"
 "SIZE is a number.  For TYPE in [doux], SIZE may also be C for\n"
@@ -7329,7 +7473,7 @@ msgstr ""
 "I (int) або L (long), �кщо ТИП дорівнює f, ЧИСЛО може бути F (float),\n"
 "D (double) або L (long double).\n"
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
@@ -7340,7 +7484,7 @@ msgstr ""
 "�имволів\n"
 "наприкінці кожного р�дка виведених даних.\n"
 
-#: src/od.c:379
+#: src/od.c:406
 msgid ""
 "\n"
 "\n"
@@ -7362,12 +7506,12 @@ msgstr ""
 "  M    1024*1024\n"
 "тощо дл� G, T, P, E, Z, Y.\n"
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, c-format
 msgid "invalid type string %s"
 msgstr "неправильний р�док типу %s"
 
-#: src/od.c:649
+#: src/od.c:690
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7376,7 +7520,7 @@ msgstr ""
 "неправильно вказаний р�док типу %s;\n"
 "ц� �и�тема не підтримує %lu-байтове цілого типу"
 
-#: src/od.c:770
+#: src/od.c:811
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7385,38 +7529,38 @@ msgstr ""
 "неправильно вказаний тип %s;\n"
 "ц� �и�тема не підтримує %lu-байтове типу з плаваючою комою"
 
-#: src/od.c:828
+#: src/od.c:869
 #, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr "неправильний знак '%c' у р�дку типу %s"
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr "неможливо перейти за межу о�таннього вхідного файла"
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr ""
 "неправильно вказана о�нова �и�теми чи�ленн� '%c', повинна бути одним з "
 "�имволів [doxn]"
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr "при дампі р�дків не можна вказувати тип"
 
-#: src/od.c:1810
+#: src/od.c:1863
 msgid "compatibility mode supports at most one file"
 msgstr "у режимі �умі�но�ті підтримуєть�� не більше одного файла."
 
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr "значенн� skip-bytes + read-bytes надто велике"
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr "попередженн�: неправильна ширина %lu; буде викори�тана %d"
@@ -7579,12 +7723,12 @@ msgstr "Коли"
 msgid "Where"
 msgstr "Де"
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr "Викори�танн�: %s [КЛЮЧ]... [КОРИСТУВ�Ч]...\n"
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -7603,7 +7747,7 @@ msgstr ""
 "                  кори�тувача\n"
 "  -s              короткий формат виводу, типово викори�товуєть��\n"
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -7618,7 +7762,7 @@ msgstr ""
 "  -q              опу�тити у короткому форматі повне ім'� кори�тувача,\n"
 "                  назву віддаленої машини та ча� неактивно�ті\n"
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, c-format
 msgid ""
 "\n"
@@ -7629,7 +7773,7 @@ msgstr ""
 "Спрощена програма 'finger';  виводить відомо�ті про кори�тувача.\n"
 "У �кладі файла utmp буде викори�товувати�� %s.\n"
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr ""
@@ -7850,17 +7994,19 @@ msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
 "  -s[З��К],--separator[=З��К]\n"
 "                    розділ�ти колонки одним знаком, типово З��К дорівнює\n"
-"                    табул�ції, без ключа -w, та порожній, �кщо є ключ -w\n"
+"                    табул�ції, без ключа -w, та порожній, �кщо є ключ -w.\n"
 "                    -s[З��К] вимикає урізанн� р�дків дл� у�іх трьох ключів\n"
-"                    дл� колонок (-ЧИСЛО |-a -ЧИСЛО|-m), �кщо немає ключа -w\n"
+"                    дл� колонок (-ЧИСЛО |-a -ЧИСЛО|-m), �кщо немає ключа -"
+"w.\n"
 
-#: src/pr.c:2827
+#: src/pr.c:2828
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
 "                    separate columns by STRING,\n"
@@ -7877,7 +8023,7 @@ msgstr ""
 "                    на ключі дл� колонок\n"
 "  -t, --omit-header не виводити заголовки\n"
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 msgid ""
 "  -T, --omit-pagination\n"
 "                    omit page headers and trailers, eliminate any "
@@ -7899,7 +8045,7 @@ msgstr ""
 "                    в�тановити ШИРИ�У_СТОРІ�КИ (72) у �товпчиках дл�\n"
 "                    виводу у декілька колонок, -s[знак] вимикає (72)\n"
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
 "                    set page width to PAGE_WIDTH (72) characters always,\n"
@@ -7912,7 +8058,7 @@ msgstr ""
 "                    �кщо не вказаний ключ -J; не змінюєть�� ключами -S чи -"
 "s\n"
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 msgid ""
 "\n"
 "-t is implied if PAGE_LENGTH <= 10.  With no FILE, or when FILE is -, read\n"
@@ -7936,9 +8082,9 @@ msgstr ""
 "\n"
 
 #: src/printenv.c:69
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr ""
-"  -0, --null     завершувати кожен р�док 0-байтом замі�ть розриву р�дка\n"
+"  -0, --null     завершувати кожен р�док нуль-байтом замі�ть розриву р�дка\n"
 
 #: src/printf.c:79
 #, c-format
@@ -8056,12 +8202,12 @@ msgstr "попередженн�: зайві аргументи проігнор
 msgid "F. Pinard"
 msgstr "Ф. Пінард"
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, c-format
 msgid "%s (for regexp %s)"
 msgstr "%s (дл� регул�рного виразу %s)"
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
@@ -8070,7 +8216,7 @@ msgstr ""
 "Викори�танн�: %s [КЛЮЧ]... [ВХІД]... (без -G)\n"
 "       або:    %s -G [КЛЮЧ]... [ВХІД [ВИХІД]]\n"
 
-#: src/ptx.c:1821
+#: src/ptx.c:1824
 msgid ""
 "Output a permuted index, including context, of the words in the input "
 "files.\n"
@@ -8078,7 +8224,7 @@ msgstr ""
 "Виводить пере�тавлений алфавітний вказівник �лів вхідних файлів, включаючи "
 "контек�т.\n"
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
 "  -G, --traditional              behave more like System V 'ptx'\n"
@@ -8089,7 +8235,7 @@ msgstr ""
 "  -F, --flag-truncation=РЯДОК    викори�товувати РЯДОК дл� позначенн� "
 "обрізаних р�дків\n"
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
 "  -O, --format=roff              generate output as roff directives\n"
@@ -8104,7 +8250,7 @@ msgstr ""
 "  -S, --sentence-regexp=REGEXP   дл� кінц� р�дків або кінц� речень\n"
 "  -T, --format=tex               генерувати вивід у вигл�ді директив TeX\n"
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -8123,7 +8269,7 @@ msgstr ""
 "  -o, --only-file=Ф�ЙЛ           лише прочитати �пи�ок �лів з заданого "
 "Ф�ЙЛ�\n"
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -8135,16 +8281,16 @@ msgstr ""
 "  -w, --width=ЧИСЛО              ширина виводу у �товпчиках, без урахуванн� "
 "по�илань\n"
 
-#: src/ptx.c:1854
+#: src/ptx.c:1857
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
 "\n"
-"Якщо Ф�ЙЛ не вказаний або вказаний �к -, читає �тандартний ввід.\n"
-"Типово вважаєть�� вказаним '-F /'.\n"
+"Якщо вхідний файл не вказаний, або �кщо вказано �имвол -,\n"
+"викори�товуєть�� �тандартне джерело вхідних даних. Типовим є «-F /».\n"
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, c-format
 msgid "invalid gap width: %s"
 msgstr "неправильна ширина інтервалу: %s"
@@ -8166,22 +8312,30 @@ msgstr ""
 "мі�т�ть�� �имволічні по�иланн�\n"
 "  -P, --physical  пропу�тити в�і �имволічні по�иланн�\n"
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+"\n"
+"Якщо не вказано параметрів, буде викори�тано параметр -P.\n"
+
+#: src/pwd.c:169
 #, c-format
 msgid "failed to chdir to %s"
 msgstr "помилка зміни каталогу на %s"
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, c-format
 msgid "failed to stat %s"
 msgstr "помилка отриманн� атрибутів %s"
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr "у %s не знайдено запи� каталогу з відповідним i-node"
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, c-format
 msgid "ignoring non-option arguments"
 msgstr "аргументи, що не є ключами проігноровані"
@@ -8191,8 +8345,8 @@ msgstr "аргументи, що не є ключами проігнорован
 msgid "Dmitry V. Levin"
 msgstr "Dmitry V. Levin"
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Викори�танн�: %s [КЛЮЧ]... Ф�ЙЛ...\n"
@@ -8238,8 +8392,7 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 "  -m, --canonicalize-missing    отримати канонічну назва файла шл�хом\n"
 "                                рекур�ивного �лідуванн� по у�ім �имвольним\n"
@@ -8277,7 +8430,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 "  -e, --canonicalize-existing  в�і компоненти шл�ху мають і�нувати\n"
@@ -8308,41 +8461,42 @@ msgstr "%s: Ñ�пуÑ�титьÑ�Ñ� у захищений від запиÑ�у каÑ
 msgid "%s: descend into directory %s? "
 msgstr "%s: �пу�тить�� у каталог %s? "
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr "%s: вилучити захищений від запи�у %s %s? "
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, c-format
 msgid "%s: remove %s %s? "
 msgstr "%s: вилучити %s %s? "
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, c-format
 msgid "removed directory: %s\n"
 msgstr "вилучено каталог: %s\n"
 
-#: src/remove.c:444
+#: src/remove.c:447
 #, c-format
-msgid "cannot remove directory: %s"
-msgstr "не вдало�� вилучити каталог: %s"
+msgid "refusing to remove %s or %s directory: skipping %s"
+msgstr "відмовлено у вилученні каталогу %s або %s: пропу�каємо %s"
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr "припущено %s, о�кільки він розташований на іншому при�трої"
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, c-format
 msgid "traversal failed: %s"
 msgstr "помилка під ча� обходу: %s"
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -8374,12 +8528,12 @@ msgstr ""
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 "  -I                    питати перед вилученн�м більш ніж трьох файлів або\n"
 "                          при рекур�ивному вилученні.  Менш набридливий ніж\n"
@@ -8454,13 +8608,19 @@ msgstr ""
 
 #: src/rm.c:342
 #, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr "%s: вилучити у�і аргументи рекур�ивно? "
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] "%s: вилучити %zu аргумент рекур�ивно? "
+msgstr[1] "%s: вилучити %zu аргументи рекур�ивно? "
+msgstr[2] "%s: вилучити %zu аргументів рекур�ивно? "
 
-#: src/rm.c:343
+#: src/rm.c:345
 #, c-format
-msgid "%s: remove all arguments? "
-msgstr "%s: вилучити у�і аргументи? "
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] "%s: вилучити %zu аргумент? "
+msgstr[1] "%s: вилучити %zu аргументи? "
+msgstr[2] "%s: вилучити %zu аргументів? "
 
 #: src/rmdir.c:134 src/rmdir.c:233
 #, c-format
@@ -8514,10 +8674,10 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
-"Запу�тити програму з іншим контек�том безпеки.\n"
+"Запу�тити програму з іншим контек�том захи�ту SELinux.\n"
 "�кщо не вказано ні КО�ТЕКСТ, ані КОМ��Д�, виводить�� поточний контек�т "
 "безпеки.\n"
 
@@ -8574,41 +8734,46 @@ msgstr "�лід вказати -c, -t, -u, -l, -r, або контек�т"
 msgid "no command specified"
 msgstr "не вказано команду"
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr "%s можна викори�товувати лише у �ередовищі з підтримкою SELinux у �дрі"
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, c-format
 msgid "failed to compute a new context"
 msgstr "помилка при обчи�ленні нового контек�ту"
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, c-format
 msgid "failed to set new user %s"
 msgstr "помилка при в�тановленні нового кори�тувача %s"
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, c-format
 msgid "failed to set new type %s"
 msgstr "помилка при в�тановленні нового типу %s"
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, c-format
 msgid "failed to set new range %s"
 msgstr "помилка при в�тановленні нового діапазону %s"
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, c-format
 msgid "failed to set new role %s"
 msgstr "помилка при в�тановленні нової ролі %s"
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, c-format
 msgid "unable to set security context %s"
 msgstr "не вдало�� в�тановити контек�т безпеки %s"
 
+#: src/selinux.c:127 src/selinux.c:300
+#, c-format
+msgid "error canonicalizing %s"
+msgstr "помилка під ча� �проби перетворити у канонічну форму %s"
+
 #: src/seq.c:68
 #, c-format
 msgid ""
@@ -8640,18 +8805,22 @@ msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
 msgstr ""
 "\n"
-"Якщо не вказані ПЕРШЕ або ПРИРІСТ, типово викори�товуєть�� 1.  Тобто\n"
+"Якщо не вказані ПЕРШЕ або ПРИРІСТ, типово викори�товуєть�� 1. Тобто\n"
 "ПРИРІСТ типово приймаєть�� за 1, навіть �кщо ОСТ���ІЙ менше\n"
-"ПЕРШОГО.  ПЕРШИЙ, ОСТ���ІЙ та ПРИРІСТ вважають�� чи�лами з рухомою\n"
-"комою.  ПРИРІСТ повинен бути додатнім, �кщо ПЕРШИЙ менше\n"
+"ПЕРШОГО. По�лідовні�ть обриваєть��, коли �ума поточного чи�ла і\n"
+"ПРИРОСТУ перевищує чи�ло ОСТ���ІЙ.\n"
+"ПЕРШИЙ, ОСТ���ІЙ та ПРИРІСТ вважають�� чи�лами з рухомою\n"
+"комою. ПРИРІСТ повинен бути додатнім, �кщо ПЕРШИЙ менше\n"
 "ОСТ���ЬОГО, та від'ємним у іншому випадку.\n"
 
-#: src/seq.c:94
+#: src/seq.c:96
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
 "it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n"
@@ -8661,91 +8830,27 @@ msgstr ""
 "типове значенн� %.PRECf �кщо ПЕРШЕ, ПРИРІСТ, та ОСТ���Є є чи�лами \n"
 "з плаваючою комою з мак�имальною точні�тю ТОЧ�, та %g у іншому випадку.\n"
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, c-format
 msgid "invalid floating point argument: %s"
 msgstr "неправильний аргумент з плаваючою комою: %s"
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr "формат мі�тить %s невідому директиву %%%c"
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr "при виводі р�дків однакової ширини формат можна не вказувати"
 
-#: src/setuidgid.c:49
-#, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-"Викори�танн�: %s [СКОРОЧЕ�ИЙ-П�Р�МЕТР]... КОРИСТУВ�Ч КОМ��Д� [�РГУМЕ�Т]...\n"
-"  або  %s П�Р�МЕТР-ПОВ�ІСТЮ\n"
-
-#: src/setuidgid.c:55
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-"Скидає в�і додаткові групи, в�тановлює ідентифікатори\n"
-"кори�тувача та групи �к у вказаного КОРИСТУВ�Ч� та запу�кає КОМ��ДУ\n"
-"з вказаними �РГУМЕ�Т�МИ.  Завершуєть�� зі �тату�ом 111, �кщо \n"
-"не вдало�� в�тановити потрібні ідентифікатори кори�тувача та групи.  У\n"
-"іншому випадку повертаєть�� вихідний �тату� КОМ��ДИ.  Ц� програма\n"
-"має �ен� лише дл� root (UID=0).\n"
-"\n"
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-"  -g GID[,GID1...]  також в�тановити головний ідентифікатор групи у значенн� "
-"GID, та\n"
-"                    (�кщо вказано) ідентифікатори додаткових груп ID у "
-"GID1, ...\n"
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr "невідомий ідентифікатор кори�тувача: %s"
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr ""
-"дл� викори�танн� ідентифікатора кори�тувача %s �лід викори�товувати -g too"
-
-#: src/setuidgid.c:190
-#, c-format
-msgid "failed to set supplemental group(s)"
-msgstr "не вдало�� в�тановити додаткові групи"
-
-#: src/setuidgid.c:200
-#, c-format
-msgid "cannot set group-ID to %lu"
-msgstr "не вдало�� в�тановити ідентифікатор групи рівним %lu"
-
-#: src/setuidgid.c:204
-#, c-format
-msgid "cannot set user-ID to %lu"
-msgstr "не вдало�� в�тановити ідентифікатор кори�тувача рівним %lu"
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr "Colin Plumb"
 
-#: src/shred.c:148
+#: src/shred.c:170
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
 "for even very expensive hardware probing to recover the data.\n"
@@ -8753,7 +8858,7 @@ msgstr ""
 "Перезапи�ує декілька раз вказані файли, щоб у�кладнити відновленн�\n"
 "навіть з викори�танн�м дуже коштовного обладнанн�.\n"
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -8766,41 +8871,53 @@ msgstr ""
 "      --random-source=Ф�ЙЛ  брати випадкові дані з Ф�ЙЛа\n"
 "  -s, --size=N   очи�тити N байт (можливі �уфік�и, подібні до K, M, G)\n"
 
-#: src/shred.c:161
+#: src/shred.c:183
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
 "  -z, --zero     add a final overwrite with zeros to hide shredding\n"
 msgstr ""
-"  -u, --remove   обрізати та вилучати файл пі�л� перезапи�и\n"
+"  -u, --remove[=СПОСІБ] обрізати та вилучати файл пі�л� перезапи�и\n"
 "  -v, --verbose  виводити по�туп\n"
 "  -x, --exact    не округл�ти розміри файлів до на�тупного цілого блоку;\n"
 "                   типово дл� незвичних файлів\n"
 "  -z, --zero     перезапи�ати у конці нул�ми, щоб �ховати змішуванн�\n"
 
-#: src/shred.c:170
+#: src/shred.c:192
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 "\n"
 "Якщо Ф�ЙЛ вказаний �к -, змішувати �тандартний вивід.\n"
 "\n"
-"Вилучає Ф�ЙЛИ, �кщо вказаний --remove (-u).  Типово файли не\n"
-"вилучають��, о�кільки ча�то обробл�ють�� файли-при�трої на зразок\n"
-"/dev/hda, а такі файли не треба вилучати.  При обробці звичайних\n"
-"файлів більші�ть людей викори�товує ключ --remove.\n"
+"Вилучає Ф�ЙЛИ, �кщо вказано --remove (-u).  Типово файли не\n"
+"вилучають��, о�кільки ча�то обробл�ють�� файли-при�трої, подібні до\n"
+"/dev/hda, а такі файли не треба вилучати.\n"
+"За допомогою необов'�зкового параметра СПОСІБ можна визначити �по�іб "
+"вилученн�\n"
+"запи�у каталогу:\n"
+"'unlink' => викори�тати �тандартний виклик unlink.\n"
+"'wipe' => також виконати змішуванн� байтів у назві.\n"
+"'wipesync' => також �инхронізувати у�і змішані байти з ди�ком.\n"
+"Типовим є режим 'wipesync', але варто пам'�тати, що цей режим може бути "
+"доволі\n"
+"вимогливим до ре�ур�ів комп'ютера.\n"
 "\n"
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -8818,7 +8935,7 @@ msgstr ""
 "режимах файлової �и�теми:\n"
 "\n"
 
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -8840,7 +8957,7 @@ msgstr ""
 "  NFS-�ервер від Network Appliance\n"
 "\n"
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -8854,7 +8971,7 @@ msgstr ""
 "* �ти�нені файлові �и�теми\n"
 "\n"
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -8874,7 +8991,7 @@ msgstr ""
 "конкретної файлової �и�теми у файлі /etc/fstab, згідно документації на\n"
 "�торінці man дл� mount (man mount).\n"
 
-#: src/shred.c:215
+#: src/shred.c:241
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
 "of the file that cannot be removed, and that will allow a shredded file\n"
@@ -8884,127 +9001,127 @@ msgstr ""
 "мі�тити копії файла, �кі не можна вилучити, і �кі пізніше надають змогу\n"
 "відновити знищений файл.\n"
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, c-format
 msgid "%s: fdatasync failed"
 msgstr "%s: операці� fdatasync завершила�ь невдало"
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr "%s: операці� fsync завершила�ь невдало"
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr "%s: не вдало�� відкотити�ь"
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr "%s: прохід %lu/%lu (%s)..."
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, c-format
 msgid "%s: error writing at offset %s"
 msgstr "%s: помилка запи�и за з�увом %s"
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s: операці� lseek завершила�ь помилкою"
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, c-format
 msgid "%s: file too large"
 msgstr "%s: файл надто великий"
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr "%s: прохід %lu/%lu (%s)...%s"
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr "%s: прохід %lu/%lu (%s)...%s/%s %d%%"
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, c-format
 msgid "%s: fstat failed"
 msgstr "%s: операці� fstat завершила�ь помилкою"
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, c-format
 msgid "%s: invalid file type"
 msgstr "%s: неправильний тип файла"
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr "%s: файл має від'ємний розмір"
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, c-format
 msgid "%s: error truncating"
 msgstr "%s: помилка при �короченні"
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, c-format
 msgid "%s: fcntl failed"
 msgstr "%s: операці� fcntl завершила�ь помилкою"
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr "%s: не вдало�� нарізати файловий де�криптор з лише з правом додаванн�"
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr "%s:  вилученн�"
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, c-format
 msgid "%s: renamed to %s"
 msgstr "%s: перейменований на %s"
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, c-format
 msgid "%s: failed to remove"
 msgstr "%s: не вдало�� вилучити"
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr "%s: вилучено"
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, c-format
 msgid "%s: failed to close"
 msgstr "%s: не вдало�� закрити"
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, c-format
 msgid "%s: failed to open for writing"
 msgstr "%s: не вдало�� відкрити дл� читанн�"
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, c-format
 msgid "%s: invalid number of passes"
 msgstr "%s: неправильна кількі�ть проходів"
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, c-format
 msgid "multiple random sources specified"
 msgstr "вказано декілька форматів виводу"
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, c-format
 msgid "%s: invalid file size"
 msgstr "%s: неправильний розмір файла"
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -9015,11 +9132,11 @@ msgstr ""
 "  або:  %s -e [КЛЮЧ]... [�РГУМЕ�Т]...\n"
 "  або:  %s -i �ИЖ-ВИЩ [КЛЮЧ]...\n"
 
-#: src/shuf.c:54
+#: src/shuf.c:67
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr "Виводить випадково пере�тавлені вхідні р�дки на �тандартний вивід.\n"
 
-#: src/shuf.c:60
+#: src/shuf.c:73
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
 "  -i, --input-range=LO-HI   treat each number LO through HI as an input "
@@ -9027,7 +9144,7 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
 msgstr ""
 "  -e, --echo                вважати кожен �РГУМЕ�Т вхідним р�дком\n"
 "  -i, --input-range=�ИЖ-ВИЩ вважати чи�ла від �ИЖ до ВИЩ вхідним р�дком\n"
@@ -9035,35 +9152,43 @@ msgstr ""
 "  -o, --output=Ф�ЙЛ         виве�ти результат у Ф�ЙЛ, а не �тандартний "
 "вивід\n"
 "      --random-source=Ф�ЙЛ  випадкові дані з Ф�ЙЛа\n"
-"  -z, --zero-terminated     завершувати р�дки нульовим байтом, а не "
-"�имволом\n"
-"                            нового р�дка\n"
+"  -r, --repeat              р�дки у виведених даних можуть повторювати��\n"
+
+#: src/shuf.c:228
+#, c-format
+msgid "too many input lines"
+msgstr "занадто багато р�дків вхідних даних"
 
-#: src/shuf.c:244
+#: src/shuf.c:431
 #, c-format
 msgid "multiple -i options specified"
 msgstr "задано декілька ключів -i"
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, c-format
 msgid "invalid input range %s"
 msgstr "неприпу�тимий вхідний діапазон %s"
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, c-format
 msgid "invalid line count %s"
 msgstr "неправильна кількі�ть р�дків %s"
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, c-format
 msgid "multiple output files specified"
 msgstr "задано декілька файлів дл� виводу"
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, c-format
 msgid "cannot combine -e and -i options"
 msgstr "не можна одноча�но викори�товувати ключі -e та -i"
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr "немає р�дків дл� повторенн�"
+
 #: src/sleep.c:44
 #, c-format
 msgid ""
@@ -9086,21 +9211,21 @@ msgstr ""
 "може бути довільним чи�лом з плаваючою комою.\n"
 "\n"
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, c-format
 msgid "invalid time interval %s"
 msgstr "неправильний інтервал ча�у %s"
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr "не вдало�� прочитати значенн� таймеру реального ча�у"
 
-#: src/sort.c:399
+#: src/sort.c:427
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr "Виве�ти �ортоване �полученн� у�іх Ф�ЙЛ(ів) на �тандартний вивід.\n"
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
@@ -9108,7 +9233,7 @@ msgstr ""
 "Ключі, що вказують пор�док:\n"
 "\n"
 
-#: src/sort.c:409
+#: src/sort.c:437
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
 "  -d, --dictionary-order      consider only blanks and alphanumeric "
@@ -9119,7 +9244,7 @@ msgstr ""
 "  -d, --dictionary-order      розгл�дати лише пропу�ки, літери та цифри\n"
 "  -f, --ignore-case           ігнорувати регі�тр літер\n"
 
-#: src/sort.c:415
+#: src/sort.c:443
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
 "  -i, --ignore-nonprinting    consider only printable characters\n"
@@ -9129,14 +9254,14 @@ msgstr ""
 "  -i, --ignore-nonprinting    розгл�дати лише друковані знаки\n"
 "  -M, --month-sort            порівнювати (невідомо) < 'JAN' < ... < 'DEC'\n"
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 "  -h, --human-numeric-sort    порівнювати значенн� у зручному дл� читанн� "
 "форматі (приклад: 2к 1Г)\n"
 
-#: src/sort.c:423
+#: src/sort.c:451
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
 "  -R, --random-sort           sort by random hash of keys\n"
@@ -9148,7 +9273,7 @@ msgstr ""
 "      --random-source=Ф�ЙЛ    випадкові дані з Ф�ЙЛ�\n"
 "  -r, --reverse               зворотний пор�док порівн�нн�\n"
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -9164,7 +9289,7 @@ msgstr ""
 "  -V, --version-sort          �ортувати за номером вер�ії\n"
 "\n"
 
-#: src/sort.c:437
+#: src/sort.c:465
 msgid ""
 "Other options:\n"
 "\n"
@@ -9172,7 +9297,7 @@ msgstr ""
 "Інші параметри:\n"
 "\n"
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
@@ -9181,7 +9306,7 @@ msgstr ""
 "одразу;\n"
 "                            дл� решти викори�товувати тимча�ові файли\n"
 
-#: src/sort.c:445
+#: src/sort.c:473
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
 "  -C, --check=quiet, --check=silent  like -c, but do not report first bad "
@@ -9196,7 +9321,7 @@ msgstr ""
 "      --compress-program=ПРОГ  �ти�кати тимча�ові файли командою ПРОГ;\n"
 "                   розпаковувати командою ПРОГ -d\n"
 
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -9214,7 +9339,7 @@ msgstr ""
 "джерела\n"
 "                            вхідних даних\n"
 
-#: src/sort.c:459
+#: src/sort.c:487
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
 "  -m, --merge               merge already sorted files; do not sort\n"
@@ -9224,7 +9349,7 @@ msgstr ""
 "  -m, --merge               об'єднати вже впор�дковані файли; не "
 "впор�дковувати\n"
 
-#: src/sort.c:463
+#: src/sort.c:491
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "  -s, --stable              stabilize sort by disabling last-resort "
@@ -9237,7 +9362,7 @@ msgstr ""
 "  -S, --buffer-size=РОЗМІР\n"
 "                   викори�товувати в пам'�ті буфер вказаного РОЗМІРУ\n"
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -9262,13 +9387,7 @@ msgstr ""
 "  -u, --unique     з -c, �уворо перевір�ти пор�док;\n"
 "                     без -c, виводити лише перше з кількох рівних\n"
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr ""
-"  -z, --zero-terminated     завершувати р�дки нульовим байтом, а не �имволом "
-"нового р�дка\n"
-
-#: src/sort.c:483
+#: src/sort.c:511
 msgid ""
 "\n"
 "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is "
@@ -9299,7 +9418,7 @@ msgstr ""
 "\n"
 "Пі�л� РОЗМІРУ можна вказувати такі �уфік�и-мультиплікатори:\n"
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -9319,132 +9438,117 @@ msgstr ""
 "Щоб отримати традиційний пор�док, що викори�товує �и�темні значенн� байт,\n"
 "в�тановіть LC_ALL=C.\n"
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, c-format
 msgid "waiting for %s [-d]"
 msgstr "очікуванн� %s [-d]"
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr "%s [-d] аварійно завершений"
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, c-format
 msgid "cannot create temporary file in %s"
 msgstr "не вдало�� �творити тимча�овий файл у %s"
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr "операці� відкритт� завершила�ь помилкою"
 
-#: src/sort.c:970
+#: src/sort.c:998
 msgid "fflush failed"
 msgstr "операці� fflush завершила�ь помилкою"
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr "помилка закритт�"
 
-#: src/sort.c:986
-#, c-format
-msgid "dup2 failed"
-msgstr "помилка dup2"
-
-#: src/sort.c:1103
-#, c-format
-msgid "couldn't execute %s"
-msgstr "неможливо виконати %s"
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 msgid "couldn't create temporary file"
 msgstr "не вдало�� �творити тимча�овий файл"
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, c-format
 msgid "couldn't create process for %s -d"
 msgstr "неможливо �творити проце� дл� %s -d"
 
-#: src/sort.c:1161
-#, c-format
-msgid "couldn't execute %s -d"
-msgstr "неможливо виконати %s -d"
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, c-format
 msgid "warning: cannot remove: %s"
 msgstr "попередженн�, не вдало�� вилучити: %s"
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, c-format
 msgid "invalid --%s argument %s"
 msgstr "некоректний аргумент --%s %s"
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, c-format
 msgid "minimum --%s argument is %s"
 msgstr "мінімальним аргументом --%s є %s"
 
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, c-format
 msgid "--%s argument %s too large"
 msgstr "аргумент --%s %s є занадто великим"
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr "мак�имум --%s аргумент з поточним rlimit що дорівнює %s"
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr "кількі�ть паралельних впор�дкувань має бути ненульовою"
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr "операці� stat завершила�ь помилкою"
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr "помилка читанн�"
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, c-format
 msgid "string transformation failed"
 msgstr "помилка перетворенн� р�дків"
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, c-format
 msgid "the untransformed string was %s"
 msgstr "Р�док до перетворенн� %s"
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr "^ не знайдено збігів з ключем\n"
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr "викори�тано за�тарілий ключ «%s»; вам варто �кори�тати�� ключем «%s»"
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr "ключ %lu має нульову ширину, його буде проігноровано"
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr "початкові пробіли у ключі %lu буде враховано; варто також вказати «b»"
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr "ключ %lu є чи�ловим, він охоплює декілька полів"
 
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
@@ -9452,122 +9556,122 @@ msgstr[0] "параметр «-%s» проігноровано"
 msgstr[1] "параметри «-%s» проігноровано"
 msgstr[2] "параметри «-%s» проігноровано"
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr "параметр «-r» за�то�овуєть�� лише у разі, �кщо збігів не ви�влено"
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr "запи� завершив�� помилкою"
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr "%s: %s:%s: неправильний пор�док: "
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr "�тандартна помилка"
 
-#: src/sort.c:3698
+#: src/sort.c:3738
 msgid "cannot read"
 msgstr "не вдало�� прочитати"
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, c-format
 msgid "%s: invalid field specification %s"
 msgstr "%s: неправильна �пецифікаці� пол� %s"
 
-#: src/sort.c:3987
+#: src/sort.c:4028
 #, c-format
 msgid "options '-%s' are incompatible"
 msgstr "не�умі�ні параметри '-%s'"
 
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, c-format
 msgid "%s: invalid count at start of %s"
 msgstr "%s: неправильний лічильник на початку %s"
 
-#: src/sort.c:4295
+#: src/sort.c:4336
 msgid "invalid number after '-'"
 msgstr "неправильне чи�ло пі�л� '-'"
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 msgid "invalid number after '.'"
 msgstr "неправильне чи�ло пі�л� '.'"
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr "зайвий знак у �пецифікації пол�"
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, c-format
 msgid "multiple compress programs specified"
 msgstr "вказано декілька програм �ти�канн�"
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
 msgstr "неправильне чи�ло на початку пол�"
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
 msgstr "нульовий номер пол�"
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr "нульовий знаковий з�ув"
 
-#: src/sort.c:4407
+#: src/sort.c:4448
 msgid "invalid number after ','"
 msgstr "неправильне чи�ло пі�л� ','"
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr "порожн� табул�ці�"
 
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, c-format
 msgid "cannot read file names from %s"
 msgstr "не вдало�� прочитати назви файлів з %s"
 
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr "%s:%lu: некоректна нульова довжина назви файла"
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, c-format
 msgid "no input from %s"
 msgstr "немає вхідних даних з %s"
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr "викори�товують�� правила впор�дковуванн� %s"
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr "викори�товуєть�� про�те порівн�нн� байтів"
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr "додатковий операнд %s не припу�тимий з -%c"
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr "довжина �уфік�а не повинна бути меншою за %zu"
 
-#: src/split.c:204
+#: src/split.c:203
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr "Викори�танн�: %s [П�Р�МЕТР]... [ВХІД�І_Д��І [ПРЕФІКС]]\n"
 
-#: src/split.c:208
+#: src/split.c:207
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
 "size is 1000 lines, and default PREFIX is 'x'.  With no INPUT, or when "
@@ -9579,22 +9683,21 @@ msgstr ""
 "дорівнює 'x'.  Якщо ВХІД�І_Д��І не вказано або вказано �к -, читає\n"
 "дані зі �тандартного джерела даних.\n"
 
-#: src/split.c:216
+#: src/split.c:215
 #, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
 "  -a, --suffix-length=�   викори�товувати �уфік�и довжини � (типово %d)\n"
@@ -9611,7 +9714,7 @@ msgstr ""
 "  -u, --unbuffered        копіювати вхідні дані безпо�ередньо до виведенн� з "
 "«-n r/...»\n"
 
-#: src/split.c:229
+#: src/split.c:228
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
 "                            output file is opened\n"
@@ -9619,7 +9722,7 @@ msgstr ""
 "      --verbose           виводити діагно�тичні повідомленн�\n"
 "                          перед відкритт�м кожного файла виводу\n"
 
-#: src/split.c:236
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -9639,192 +9742,192 @@ msgstr ""
 "r/N     подібно до «l», але з викори�танн�м циклічного перебиранн�\n"
 "r/K/N   те �аме, але виве�ти лише K-ий з N до stdout\n"
 
-#: src/split.c:354
+#: src/split.c:353
 #, c-format
 msgid "output file suffixes exhausted"
 msgstr "вичерпано �уфік�и дл� вихідних файлів"
 
-#: src/split.c:366
+#: src/split.c:365
 #, c-format
 msgid "creating file %s\n"
 msgstr "�творюєть�� файл %s\n"
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr "%s перепише вхідні дані; перериваємо роботу"
 
-#: src/split.c:391
+#: src/split.c:390
 #, c-format
 msgid "failed to set FILE environment variable"
 msgstr "не вдало�� в�тановити змінну �ередовища FILE"
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr "виконанн� з FILE=%s\n"
 
-#: src/split.c:395
+#: src/split.c:394
 #, c-format
 msgid "failed to create pipe"
 msgstr "не вдало�� �творити канал"
 
-#: src/split.c:409
+#: src/split.c:408
 #, c-format
 msgid "closing prior pipe"
 msgstr "закритт� попереднього каналу"
 
-#: src/split.c:411
+#: src/split.c:410
 #, c-format
 msgid "closing output pipe"
 msgstr "закритт� каналу виведенн�"
 
-#: src/split.c:415
+#: src/split.c:414
 #, c-format
 msgid "moving input pipe"
 msgstr "пере�уванн� каналу введенн�"
 
-#: src/split.c:417
+#: src/split.c:416
 #, c-format
 msgid "closing input pipe"
 msgstr "закритт� каналу введенн�"
 
-#: src/split.c:422
+#: src/split.c:421
 #, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr "не вдало�� виконати команду: «%s -c %s»"
 
-#: src/split.c:428
+#: src/split.c:427
 #, c-format
 msgid "failed to close input pipe"
 msgstr "не вдало�� закрити канал вхідних даних"
 
-#: src/split.c:464
+#: src/split.c:463
 #, c-format
 msgid "waiting for child process"
 msgstr "очікуванн� на дочірній проце�"
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr "при FILE=%s, �игнал %s від команди: %s"
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr "при FILE=%s, код виходу %d від команди: %s"
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr "невідомий �тан від команди (0x%X)"
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr "не можна розбивати одразу кількома методами"
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, c-format
 msgid "%s: invalid number of chunks"
 msgstr "%s: некоректна кількі�ть фрагментів"
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, c-format
 msgid "%s: invalid chunk number"
 msgstr "%s: некоректний номер фрагмента"
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr "%s: неправильна довжина �уфік�у"
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr "%s: неправильна кількі�ть байт"
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr "%s: неправильна кількі�ть р�дків"
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, c-format
 msgid "line count option -%s%c... is too large"
 msgstr "ключ кілько�ті р�дків -%s%c... надто великий"
 
-#: src/split.c:1248
+#: src/split.c:1298
 #, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr "%s: некоректне початкове значенн� у чи�ловому �уфік�і"
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, c-format
 msgid "%s: invalid IO block size"
 msgstr "%s: некоректний розмір блоку введенн�-виведенн�"
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr "--filter не обробл�є фрагменти, видобуті до stdout"
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr ""
 "початкове значенн� чи�лового �уфік�а є занадто великим дл� довжини �уфік�а"
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, c-format
 msgid "%s: cannot determine file size"
 msgstr "%s: не вдало�� визначити розмір файла"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr "Michael Meskes"
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, c-format
 msgid "failed to canonicalize %s"
 msgstr "не вдало�� перетворити у канонічну форму %s"
 
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr "попередженн�: керівна по�лідовні�ть '\\%c' не розпізнана"
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, c-format
 msgid "%s: invalid directive"
 msgstr "%s: неправильна директива"
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, c-format
 msgid "warning: backslash at end of format"
 msgstr "попередженн�: зворотна похила ри�ка наприкінці формату"
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr ""
 "викори�танн� %s дл� позначенн� �тандартного введенн� не працює у режимі "
 "файлової �и�теми"
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, c-format
 msgid "cannot read file system information for %s"
 msgstr "не вдало�� прочитати інформацію файлової �и�теми дл� %s"
 
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, c-format
 msgid "cannot stat standard input"
 msgstr "не вдало�� виконати stat дл� �тандартного джерела вхідних даних"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -9840,7 +9943,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -9850,30 +9953,30 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr "При�трій: %Dh/%dd\tInode: %-10i  По�иланн�: %-5h Тип при�трою: %t,%T\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr "При�трій: %Dh/%dd\tInode: %-10i  По�иланн�: %h\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr "До�туп: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, c-format
 msgid "Context: %C\n"
 msgstr "Контек�т: %C\n"
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -9885,11 +9988,11 @@ msgstr ""
 " Зміна: %z\n"
 "Створ.: %w\n"
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
 msgstr "Показати файл або �тан файлової �и�теми.\n"
 
-#: src/stat.c:1356
+#: src/stat.c:1418
 msgid ""
 "  -L, --dereference     follow links\n"
 "  -f, --file-system     display file system status instead of file status\n"
@@ -9897,13 +10000,13 @@ msgstr ""
 "  -L, --dereference     �лідувати за по�иланн�м\n"
 "  -f, --file-system     показати �тан файлової �и�теми, а не файла\n"
 
-#: src/stat.c:1360
+#: src/stat.c:1422
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 "  -c  --format=ФОРМ�Т   викори�товувати вказаний ФОРМ�Т, а не типовий;\n"
@@ -9915,7 +10018,7 @@ msgstr ""
 "\\n.\n"
 "  -t, --terse           виводити дані у компактній формі\n"
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 msgid ""
 "\n"
 "The valid format sequences for files (without --file-system):\n"
@@ -9935,7 +10038,7 @@ msgstr ""
 "  %B   розмір блоку, що повідомл�єть�� %b, у байтах\n"
 "  %C   р�док з контек�том безпеки SELinux\n"
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 msgid ""
 "  %d   device number in decimal\n"
 "  %D   device number in hex\n"
@@ -9951,7 +10054,7 @@ msgstr ""
 "  %g   ідентифікатор групи-вла�ника\n"
 "  %G   назва групи-вла�ника\n"
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 msgid ""
 "  %h   number of hard links\n"
 "  %i   inode number\n"
@@ -9960,8 +10063,8 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 "  %h   кількі�ть жор�тких по�илань\n"
 "  %i   кількі�ть inode\n"
@@ -9970,10 +10073,12 @@ msgstr ""
 "  %N   екранована назва файла, �имвольні по�иланн� розіменовують��\n"
 "  %o   оптимальний розмір блоку введенн�-виведенн�\n"
 "  %s   повний розмір, у байтах\n"
-"  %t   о�новний тип при�трою, ші�тнадц�тковий\n"
-"  %T   другор�дний тип при�трою, ші�тнадц�тковий\n"
+"  %t   о�новний тип при�трою, ші�тнадц�тковий, дл� �пеціальних файлів "
+"�имвольних або блокових при�троїв\n"
+"  %T   другор�дний тип при�трою, ші�тнадц�тковий, дл� �пеціальних файлів "
+"�имвольних або блокових при�троїв\n"
 
-#: src/stat.c:1399
+#: src/stat.c:1461
 msgid ""
 "  %u   user ID of owner\n"
 "  %U   user name of owner\n"
@@ -9981,25 +10086,26 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 "  %u   ідентифікатор кори�тувача-вла�ника\n"
 "  %U   ім'� кори�тувача-вла�ника\n"
-"  %w   ча� �творенн� файла у зручному дл� читанн� форматі; - �кщо невідомий\n"
+"  %w   ча� �творенн� файла у зручному дл� читанн� форматі; -, �кщо "
+"невідомий\n"
 "  %W   ча� �творенн� файла у �екундах від початку Епохи; 0 �кщо невідомий\n"
-"  %x   ча� о�танньої до�тупу\n"
+"  %x   ча� о�танньої до�тупу у зручному дл� читанн� форматі\n"
 "  %X   ча� о�танньої до�тупу у �екундах з початку Епохи\n"
-"  %y   ча� о�танньої зміни\n"
+"  %y   ча� о�танньої зміни у зручному дл� читанн� форматі\n"
 "  %Y   ча� о�танньої зміни у �екундах з початку Епохи\n"
-"  %z   ча� о�танньої зміни\n"
+"  %z   ча� о�танньої зміни у зручному дл� читанн� форматі\n"
 "  %Z   ча� о�танньої зміни у �екундах з початку Епохи\n"
 "\n"
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 msgid ""
 "Valid format sequences for file systems:\n"
 "\n"
@@ -10017,7 +10123,7 @@ msgstr ""
 "  %d   кількі�ть вільних файлових вузлів у файловій �и�темі\n"
 "  %f   кількі�ть вільних блоків у файловій �и�темі\n"
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 msgid ""
 "  %i   file system ID in hex\n"
 "  %l   maximum length of filenames\n"
@@ -10107,22 +10213,27 @@ msgstr ""
 "Крім того, де�кі фільтри (зокрема dd і cat) не викори�товують потоки дл�\n"
 "введенн�/виведенн�, отже параметри stdbuf на них не впливають.\n"
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, c-format
 msgid "failed to find %s"
 msgstr "не вдало�� знайти %s"
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, c-format
 msgid "failed to update the environment with %s"
 msgstr "не вдало�� оновити �ередовища за допомогою %s"
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr "р�дкова буферизаці� stdin не має �ен�у"
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, c-format
+msgid "you must specify a buffering mode option"
+msgstr "вам �лід вказати параметр режиму буферизації"
+
+#: src/stty.c:516
 #, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -10133,11 +10244,11 @@ msgstr ""
 "       або    %s [-F ПРИСТРІЙ] [--file=ПРИСТРІЙ] [-a|--all]\n"
 "       або    %s [-F ПРИСТРІЙ] [--file=ПРИСТРІЙ] [-g|--save]\n"
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
 msgstr "Виводить або змінює характери�тики термінала.\n"
 
-#: src/stty.c:525
+#: src/stty.c:528
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
 "  -g, --save         print all current settings in a stty-readable form\n"
@@ -10150,7 +10261,7 @@ msgstr ""
 "                  відкрити та викори�товувати вказаний при�трій замі�ть\n"
 "                  �тандартного вводу\n"
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
@@ -10161,7 +10272,7 @@ msgstr ""
 "позначені параметри, не опи�ані у �тандарті POSIX.  До�тупні�ть того чи\n"
 "іншого параметру визначаєть�� �и�темою, що викори�товуєть��.\n"
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -10176,7 +10287,7 @@ msgstr ""
 "  eof СИМВОЛ      СИМВОЛ буде означати кінець файла (припиненн� вводу)\n"
 "  eol СИМВОЛ      СИМВОЛ буде означати кінець р�дка\n"
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -10188,7 +10299,7 @@ msgstr ""
 "  intr СИМВОЛ     СИМВОЛ буде над�илати �игнал перериванн�\n"
 "  kill СИМВОЛ     СИМВОЛ буде �тирати поточний р�док\n"
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -10201,7 +10312,7 @@ msgstr ""
 "* rprnt СИМВОЛ    СИМВОЛ буде перери�овувати поточний р�док\n"
 "  start СИМВОЛ    СИМВОЛ буде відновлювати ввід\n"
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -10213,7 +10324,7 @@ msgstr ""
 "* swtch СИМВОЛ    СИМВОЛ буде перемикати рівень �кладно�ті оболонки\n"
 "* werase СИМВОЛ   СИМВОЛ буде �тирати о�таннє введене �лово\n"
 
-#: src/stty.c:562
+#: src/stty.c:565
 msgid ""
 "\n"
 "Special settings:\n"
@@ -10228,7 +10339,7 @@ msgstr ""
 "* cols �        повідомити �дру, що термінал має � �товпчиків\n"
 "* columns �     �инонім cols\n"
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -10242,7 +10353,7 @@ msgstr ""
 "                �имволів дл� завершенн� операції читанн�\n"
 "  ospeed �      в�тановити швидкі�ть виводу\n"
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -10256,7 +10367,7 @@ msgstr ""
 "  time �        викори�товуєть�� з -icanon, в�тановити ча�ову межу дл�\n"
 "                операції читанн� рівним � де��тим �екунди\n"
 
-#: src/stty.c:581
+#: src/stty.c:584
 msgid ""
 "\n"
 "Control settings:\n"
@@ -10274,7 +10385,7 @@ msgstr ""
 " * [-]cdtrdsr    дозволити керуванн� потоком DTR/DSR\n"
 "   cs�           в�тановити розмір �имволу рівним � біт, � від 5 до 8\n"
 
-#: src/stty.c:590
+#: src/stty.c:593
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
 "   [-]hup        send a hangup signal when the last process closes the tty\n"
@@ -10282,6 +10393,7 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 "  [-]cstopb     два біти розділенн� у �имволі (один, �кщо з '-')\n"
 "  [-]hup        над�илати �игнал обриву термінальної лінії, коли о�танній\n"
@@ -10292,8 +10404,10 @@ msgstr ""
 "                на вводі\n"
 "  [-]parodd     в�тановити перевірку на непарні�ть (або парні�ть, �кщо з "
 "'-')\n"
+" * [-]cmspar    викори�товувати парні�ть за прилипанн�м (позначкою або "
+"пробілом)\n"
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -10309,7 +10423,7 @@ msgstr ""
 "  [-]ignbrk     ігнорувати �имволи перериванн�\n"
 "  [-]igncr      ігнорувати �имволи переведенн� каретки\n"
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -10324,11 +10438,11 @@ msgstr ""
 "  [-]inpck      викори�товувати перевірку парно�ті вводу\n"
 "  [-]istrip     очищати �тарший (во�ьмий) біт �имволів, що ввод�ть��\n"
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr " * [-]iutf8      вважати, що вхідні знаки у кодуванні UTF-8\n"
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -10344,7 +10458,7 @@ msgstr ""
 "  [-]parmrk     відмічати помилки парно�ті (по�лідовні�тю з 255 нулів)\n"
 "  [-]tandem     �инонім [-]xioff\n"
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -10360,10 +10474,10 @@ msgstr ""
 "* ff�           пауза пі�л� переведенн� �торінки, діапазон � [0..1]\n"
 "* nl�           пауза пі�л� нового р�дка, діапазон � [0..1]\n"
 
-#: src/stty.c:631
+#: src/stty.c:635
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
@@ -10373,10 +10487,11 @@ msgstr ""
 "* [-]ofdel      заповнювати �имволами затиранн� замі�ть нулів\n"
 "* [-]ofill      викори�товувати �имволи заповненн� дл� затримок\n"
 "* [-]olcuc      перетворювати маленькі літери на великі\n"
-"* [-]onlcr      перетворювати переведенн� р�дка у переведенн� каретки\n"
+"* [-]onlcr      перетворювати переведенн� р�дка у переведенн� каретки-розрив "
+"р�дка\n"
 "* [-]onlret     переведенн� р�дка призводить до переведенн� каретки\n"
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -10393,7 +10508,7 @@ msgstr ""
 "* -tabs         �инонім tab3\n"
 "* vt�           пауза пі�л� вертикальної табул�ції, діапазон � [0..1]\n"
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -10407,7 +10522,7 @@ msgstr ""
 "* crtkill       �тирати ве�ь р�док, згідно з параметрами echoprt та echoe\n"
 "* -crtkill      �тирати ве�ь р�док, згідно з параметрами echoctl та echok\n"
 
-#: src/stty.c:654
+#: src/stty.c:658
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
 "   [-]echo       echo input characters\n"
@@ -10421,7 +10536,7 @@ msgstr ""
 "  [-]echoe      �инонім [-]crterase\n"
 "  [-]echok      відображати переведенн� р�дка пі�л� �имволу знищенн�\n"
 
-#: src/stty.c:661
+#: src/stty.c:665
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
 "   [-]echonl     echo newline even if not echoing other characters\n"
@@ -10437,7 +10552,7 @@ msgstr ""
 "  [-]icanon     викори�товувати �пец�имволи erase, kill, werase, та rprnt\n"
 "  [-]iexten     викори�товувати �пец�имволи, не опи�ані у �тандарті POSIX\n"
 
-#: src/stty.c:668
+#: src/stty.c:672
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
 "   [-]noflsh     disable flushing after interrupt and quit special "
@@ -10454,7 +10569,7 @@ msgstr ""
 "                на термінал\n"
 "* [-]xcase      відображати '\\' дл� великих літер, вживаєть�� з icanon\n"
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -10468,7 +10583,7 @@ msgstr ""
 "  cbreak        �инонім -icanon\n"
 "  -cbreak       �инонім icanon\n"
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -10480,7 +10595,7 @@ msgstr ""
 "  -cooked       �инонім raw\n"
 "  crt           �инонім echoe echoctl echoke\n"
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -10494,7 +10609,7 @@ msgstr ""
 "  ek            в�тановити типові значенн� дл� �имволів erase та kill\n"
 "  evenp         �инонім parenb -parodd cs7\n"
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -10510,7 +10625,7 @@ msgstr ""
 "  nl            �инонім -icrnl -onlcr\n"
 "  -nl           �инонім icrnl -inlcr -igncr onlcr -ocrnl -onlret\n"
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -10524,7 +10639,7 @@ msgstr ""
 "  pass8         �инонім -parenb -istrip cs8\n"
 "  -pass8        �инонім parenb istrip cs7\n"
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -10536,7 +10651,7 @@ msgstr ""
 "                -imaxbel -opost -isig -icanon -xcase min 1 time 0\n"
 "  -raw          �инонім cooked\n"
 
-#: src/stty.c:716
+#: src/stty.c:720
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
 "                 -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n"
@@ -10552,7 +10667,7 @@ msgstr ""
 "                -xcase -tostop -echoprt echoctl echoke, в�і �пец�имволи\n"
 "                мають типове значенн�\n"
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -10567,12 +10682,12 @@ msgstr ""
 "буквально або вказують�� у �к ^c, 0x37, 0177 або 127; дл� �ка�уванн�\n"
 "�пеціальних �имволів �лужать значенн� ^- та undef.\n"
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, c-format
 msgid "only one device may be specified"
 msgstr "можна вказати лише одне при�трій"
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
@@ -10581,43 +10696,43 @@ msgstr ""
 "ключі дл� виводу у тек�товому та виводі, зрозумілому програмі stty,\n"
 "виключають один одного"
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr "при вказуванні �тилю виводу не можна в�тановлювати режим"
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr "%s: не вдало�� переініціалізувати неблокуючий режим"
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, c-format
 msgid "invalid argument %s"
 msgstr "неправильний аргумент %s"
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, c-format
 msgid "missing argument to %s"
 msgstr "пропущений аргумент дл� %s"
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, c-format
 msgid "invalid line discipline %s"
 msgstr "неправильна line discipline %s"
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr "%s: не вдало�� виконати в�і запитані дії"
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr "%s: дл� цього при�трою немає відомо�тей про розмір"
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, c-format
 msgid "invalid integer argument %s"
 msgstr "неправильний цілий аргумент %s"
@@ -10679,7 +10794,7 @@ msgstr ""
 "      --version  показати інформацію про вер�ію та вийти\n"
 "\n"
 
-#: src/system.h:544
+#: src/system.h:543
 msgid ""
 "\n"
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -10688,20 +10803,20 @@ msgstr ""
 "Обов'�зкові аргументи дл� довгих форм запи�у параметрів є обов'�зковими і "
 "дл� �корочених форм.\n"
 
-#: src/system.h:552
+#: src/system.h:551
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 "\n"
-"РОЗМІР є цілим чи�лом з додатковим значенн�м одиниці (приклад: 10M = "
-"10*1024*1024).\n"
+"РОЗМІР є цілим чи�лом з додатковим значенн�м одиниці (приклад: 10K = "
+"10*1024).\n"
 "Одиниц�ми можуть бути K, M, G, T, P, E, Z, Y (�тепені 1024) або KB, MB... "
 "(�тепені 1000).\n"
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -10715,39 +10830,39 @@ msgstr ""
 "Якщо розмір не буде знайдено, типовою одиницею буде 1024 байтів\n"
 "(або 512, �кщо в�тановлено POSIXLY_CORRECT).\n"
 
-#: src/system.h:571
+#: src/system.h:570
 #, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
+"%s online help: <%s>\n"
 msgstr ""
 "\n"
-"Про вади у %s повідомл�йте на адре�у %s.\n"
+"Довідкові дані щодо %s у мережі: <%s>\n"
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr ""
 "Повідомте %s про помилку у перекладі на <http://translationproject.org/team/"
 ">\n"
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr ""
 "Ознайомити�� з повною документацією можна за допомогою команди info "
 "coreutils '%s invocation'\n"
 
-#: src/system.h:596
+#: src/system.h:591
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Спробуйте '%s --help' дл� одержанн� додаткової інформації.\n"
 
-#: src/system.h:628
+#: src/system.h:633
 #, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -10843,10 +10958,8 @@ msgstr ""
 
 #: src/tail.c:270
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
 "  -c, --bytes=�            виве�ти о�танні � байтів; вкажіть «-c +�»,\n"
 "                           щоб виведенн� було розпочато з �-го байта кожного "
@@ -10856,8 +10969,7 @@ msgstr ""
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 "  -f, --follow[={name|descriptor}]\n"
@@ -10866,18 +10978,17 @@ msgstr ""
 "                           -f, --follow та --follow=descriptor еквівалентні\n"
 "  -F                       еквівалент --follow=name --retry\n"
 
-#: src/tail.c:281
+#: src/tail.c:280
 #, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
 "  -n, --lines=�            виводити о�танні � р�дків, а не о�танні %d\n"
 "                           �кори�тайте�� -n +K дл� виведенн� р�дків з �-го\n"
@@ -10890,27 +11001,24 @@ msgstr ""
 "                           ротації �и�темних протокольних файлів)\n"
 "                           З inotify цей параметр малокори�ний.\n"
 
-#: src/tail.c:294
+#: src/tail.c:293
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 "      --pid=PID            з ключем -f, перервати��, коли проце� PID\n"
 "                           завершує роботу\n"
 "  -q, --quiet, --silent    не виводити заголовки з назвами файлів\n"
 "      --retry              повторювати �проби відкрити файл, навіть �кщо\n"
-"                             до�туп до нього буде втрачено, кори�но, �кщо \n"
-"                             вказано назву файла, тобто з --follow=name\n"
+"                             до�туп до нього буде втрачено\n"
 
-#: src/tail.c:301
+#: src/tail.c:298
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 "  -s, --sleep-interval=�   з ключем -f, перевір�ти отриманн� нових даних\n"
@@ -10919,7 +11027,7 @@ msgstr ""
 "                             проце� P принаймні кожні � �екунд.\n"
 "  -v, --verbose            завжди виводити заголовки з назвами файлів\n"
 
-#: src/tail.c:310
+#: src/tail.c:307
 msgid ""
 "\n"
 "If the first character of K (the number of bytes or lines) is a '+',\n"
@@ -10937,7 +11045,7 @@ msgstr ""
 "GB 1000*1000*1000, G 1024*1024*1024 тощо дл� T, P, E, Z, Y.\n"
 "\n"
 
-#: src/tail.c:319
+#: src/tail.c:316
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
 "means that even if a tail'ed file is renamed, tail will continue to track\n"
@@ -10956,28 +11064,23 @@ msgstr ""
 "уваги\n"
 "його перейменуванн�, вилученн� або �творенн�.\n"
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr "закритт� %s (fd=%d)"
 
-#: src/tail.c:453
-#, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr "%s: не вдало�� перемі�тити вказівник позиції на %s"
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr "%s: не вдало�� перемі�тити вказівник позиції на %s відно�но кінц�"
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr ""
 "не вдало�� визначити розташуванн� %s. Повертаємо�� до �по�обу опитуванн�"
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
@@ -10986,139 +11089,149 @@ msgstr ""
 "�ерозпізнаний тип файлової �и�теми 0x%08lx дл� %s. Будь ла�ка, повідомте про "
 "нього до %s. Повертаємо�� до про�того опитуванн�."
 
-#: src/tail.c:963
+#: src/tail.c:965
+#, c-format
+msgid "%s has been replaced with a symbolic link. giving up on this name"
+msgstr "%s було замінено �имволічним по�иланн�м. Кінець виводу дл� цієї назви"
+
+#: src/tail.c:980
 #, c-format
 msgid "%s has become inaccessible"
 msgstr "%s �тав недо�тупний"
 
-#: src/tail.c:980
+#: src/tail.c:997
 #, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr ""
 "%s був замінений файлом, дл� �кого tail неза�то�овний; кінець виводу дл� "
 "цієї назви"
 
-#: src/tail.c:989
+#: src/tail.c:1006
 #, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr "%s було замінено віддаленим файлом. Кінець виводу дл� цієї назви"
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, c-format
 msgid "%s has become accessible"
 msgstr "%s �тав до�тупний"
 
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr "%s з'�вив��; початий вивід дл� нового файла"
 
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr "%s був заміщений; вивід продовжуєть�� дл� нового файла"
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr "%s: не вдало�� змінити неблокуючий режим"
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr "%s: файл обрізаний"
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr "більше немає файлів"
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, c-format
 msgid "cannot watch parent directory of %s"
 msgstr "не вдало�� виконати �по�тереженн� за батьків�ьким каталогом %s"
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, c-format
 msgid "inotify resources exhausted"
 msgstr "вичерпано ре�ур�и inotify"
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, c-format
 msgid "cannot watch %s"
 msgstr "не вдало�� виконати �по�тереженн� за %s"
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr "помилка під ча� �теженн� за подією inotify"
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, c-format
 msgid "error reading inotify event"
 msgstr "помилка під ча� �проби читанн� події inotify"
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr ""
 "%s: не можна �тежити за кінцем файла такого типу; вивід продовжуєть�� дл� "
 "нового файла"
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, c-format
 msgid "number in %s is too large"
 msgstr "чи�ло у %s надто велике"
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr ""
 "%s: неправильна мак�имальна кількі�ть не змінених параметрів між відкритт�ми"
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr "%s: неправильний PID"
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr "%s: неправильне чи�ло �екунд"
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr "параметр викори�товує неправильний контек�т -- %c"
 
-#: src/tail.c:2034
+#: src/tail.c:2096
 #, c-format
-msgid "warning: --retry is useful mainly when following by name"
+msgid "warning: --retry ignored; --retry is useful only when following"
 msgstr ""
-"попередженн�: ключ --retry кори�ний лише при �лідуванні за назвою файла"
+"попередженн�: --retry проігноровано; --retry кори�ний лише при �лідуванні"
 
-#: src/tail.c:2038
+#: src/tail.c:2100
+#, c-format
+msgid "warning: --retry only effective for the initial open"
+msgstr "попередженн�: --retry працюватиме лише дл� початкового відкритт�"
+
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
 msgstr ""
 "попередженн�: PID ігнорований; ключ --pid=PID кори�ний лише при �лідуванні"
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr "попередженн�: --pid=PID не підтримуєть�� на цій �и�темі"
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, c-format
 msgid "cannot follow %s by name"
 msgstr "не вдало�� �лідувати за %s за назвою"
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr "попередженн�: не�кінченне �теженн� за �тандартним вводом неефективне"
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr "не можна викори�товувати inotify, повертаємо�� до �по�обу опитуванн�"
@@ -11389,17 +11502,17 @@ msgstr "зайвий аргумент %s"
 msgid "warning: sigprocmask"
 msgstr "попередженн�: sigprocmask"
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr "попередженн�: timer_settime"
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr "попередженн�: timer_create"
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
@@ -11408,29 +11521,28 @@ msgstr ""
 "Викори�танн�: %s [П�Р�МЕТР] ТРИВ�ЛІСТЬ КОМ��Д� [�РГУМЕ�Т]...\n"
 "       або:    %s [П�Р�МЕТР]\n"
 
-#: src/timeout.c:229
+#: src/timeout.c:232
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
 msgstr ""
 "Запу�тити КОМ��ДУ і завершити її роботу, �кщо її не буде завершено прот�гом "
 "ча�у ТРИВ�ЛІСТЬ.\n"
 
-#: src/timeout.c:235
+#: src/timeout.c:238
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
 "      --preserve-status\n"
 "                 вийти зі �таном рівним �тану КОМ��ДИ, навіть �кщо ча�\n"
@@ -11454,7 +11566,7 @@ msgstr ""
 "                 Перегл�нути �пи�ок �игналів можна за допомогою команди\n"
 "                 «kill -l»\n"
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 msgid ""
 "\n"
 "DURATION is a floating point number with an optional suffix:\n"
@@ -11465,7 +11577,7 @@ msgstr ""
 "ТРИВ�ЛІСТЬ — чи�ло з плаваючою крапкою з додатковим �уфік�ом:\n"
 "«s» — �екунди (типовий), «m» — хвилини, «h» — години або «d» — дні.\n"
 
-#: src/timeout.c:259
+#: src/timeout.c:262
 msgid ""
 "\n"
 "If the command times out, and --preserve-status is not set, then exit with\n"
@@ -11485,17 +11597,17 @@ msgstr ""
 "бути перехоплено. Якщо наді�лано �игнал KILL (9), �таном виходу буде\n"
 "128+9, а не 124.\n"
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr "попередженн�: �проба вимиканн� дампів �дра завершила�� невдало"
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, c-format
 msgid "error waiting for command"
 msgstr "помилка під ча� очікуванн� на команду"
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr ""
@@ -11908,7 +12020,7 @@ msgstr ""
 #: src/truncate.c:115
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 "  -r, --reference=RФ�ЙЛ  о�новний розмір RФ�ЙЛ�\n"
 "  -s, --size=РОЗМІР      в�тановити або змінити розмір файла, відповідно до "
@@ -12000,12 +12112,12 @@ msgstr ""
 "�тандартний ввід.\n"
 "\n"
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr "%s: на вході мі�тить�� непарна кількі�ть лек�ем"
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr "%s: на вході мі�тить�� цикл:"
@@ -12103,12 +12215,12 @@ msgstr "позиції табулÑ�ції надто далеко одна віÐ
 msgid "tab stop value is too large"
 msgstr "розмір табул�ції надто великий"
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr "Викори�танн�: %s [КЛЮЧ]... [ВХІД [ВИХІД]]\n"
 
-#: src/uniq.c:138
+#: src/uniq.c:174
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
 "writing to OUTPUT (or standard output).\n"
@@ -12121,39 +12233,54 @@ msgstr ""
 "Якщо не вказано параметрів, відповідні р�дки об'єднують�� з р�дками,\n"
 "ви�вленими першими.\n"
 
-#: src/uniq.c:147
+#: src/uniq.c:183
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
 msgstr ""
 "  -c, --count           виводити чи�ло повторів на початку кожного р�дка\n"
-"  -d, --repeated        виводити лише р�дки, що повторюють��\n"
+"  -d, --repeated        виводити лише р�дки, що повторюють��, один дл� "
+"кожної з груп\n"
+
+#: src/uniq.c:187
+msgid ""
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
+msgstr ""
+"  -D, --all-repeated[=МЕТОД]   виве�ти у�і р�дки-дублікати\n"
+"                          групи можна відокремлювати порожнім р�дком\n"
+"                          МЕТОД={none(типовий),prepend,separate}\n"
+
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr "  -f, --skip-fields=N   уникати порівн�нн� перших N полів\n"
 
-#: src/uniq.c:151
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
+msgstr ""
+"      --group[=МЕТОД]   показати у�і запи�, відокремивши групи порожніми "
+"р�дками\n"
+"                          МЕТОД={separate(типовий),prepend,append,both}\n"
+
+#: src/uniq.c:199
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
 "  -i, --ignore-case     ignore differences in case when comparing\n"
 "  -s, --skip-chars=N    avoid comparing the first N characters\n"
 "  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
 msgstr ""
-"  -D, --all-repeated[=delimit-method] виве�ти в�і р�дки, що повторюють��\n"
-"                        delimit-method={none(типово),prepend,separate)}\n"
-"                        Розділенн� виконуєть�� за порожніми р�дками.\n"
-"  -f, --skip-fields=�   не порівнювати перші � полів\n"
 "  -i, --ignore-case     ігнорувати при порівн�нні регі�тр\n"
 "  -s, --skip-chars=�    не порівнювати перші � знаків\n"
 "  -u, --unique          виводити лише р�дки, що не повторюють��\n"
-"  -z, --zero-terminated кінцеві р�дки з 0 байта, без �имволу нового р�дка\n"
 
-#: src/uniq.c:161
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr "  -w, --check-chars=�   порівнювати перші � знаків р�дків\n"
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 msgid ""
 "\n"
 "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n"
@@ -12163,7 +12290,7 @@ msgstr ""
 "Полем вважаєть�� по�лідовні�ть пробільних знаків, за �кою\n"
 "йдуть не пробільні знаки. Спочатку пропу�кають�� пол�, потім �имволи.\n"
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 msgid ""
 "\n"
 "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n"
@@ -12177,24 +12304,34 @@ msgstr ""
 "Крім того, під ча� порівн�нн� викори�товують�� правила, в�тановлені змінною\n"
 "LC_COLLATE.\n"
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, c-format
 msgid "too many repeated lines"
 msgstr "надто багато р�дків, що повторюють��"
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
 msgstr "неправильна кількі�ть полів, що пропу�кають��"
 
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
 msgstr "неправильна кількі�ть байт, що пропу�кають��"
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
 msgstr "неправильна кількі�ть байт, що порівнюють��"
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr "--group не можна викори�товувати разом з -c/-d/-D/-u"
+
+#: src/uniq.c:652
+#, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr "одноча�не групуванн� і виведенн� даних щодо повторів не має �ен�у"
+
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr "вивід у�іх р�дків, що повторюють�� та чи�ла повторів не має �ен�у"
@@ -12216,11 +12353,6 @@ msgstr ""
 "Викликає функцію unlink дл� вилученн� вказаного Ф�ЙЛ�.\n"
 "\n"
 
-#: src/unlink.c:86
-#, c-format
-msgid "cannot unlink %s"
-msgstr "не вдало�� вилучити по�иланн� %s"
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -12267,7 +12399,7 @@ msgstr[2] "%lu кори�тувачів"
 msgid ",  load average: %.2f"
 msgstr ", �ередн� завантажені�ть: %.2f"
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -12278,7 +12410,7 @@ msgstr ""
 "кори�тувачів у �и�темі та �ереднє чи�ло завдань у черзі запу�ку за\n"
 "о�танні 1, 5 та 15 хвилин."
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
@@ -12287,12 +12419,12 @@ msgstr ""
 "  Проце�и у\n"
 "�тані неперервного �ну також впливають на �ереднє завантаженн�.\n"
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr "\n"
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
@@ -12532,6 +12664,168 @@ msgstr ""
 "'y'.\n"
 "\n"
 
+#~ msgid "cannot create pipe"
+#~ msgstr "не вдало�� �творити канал"
+
+#~ msgid "%s subprocess failed"
+#~ msgstr "помилка підпроце�у %s"
+
+#~ msgid "_open_osfhandle failed"
+#~ msgstr "Помилка _open_osfhandle"
+
+#~ msgid "cannot restore fd %d: dup2 failed"
+#~ msgstr "не вдало�� відновити файловий де�криптор %d: помилка dup2"
+
+#~ msgid "%s subprocess"
+#~ msgstr "дочірній проце� %s"
+
+#~ msgid "%s subprocess got fatal signal %d"
+#~ msgstr "дочірнім проце�ом %s отримано �игнал щодо аварійного завершенн� %d"
+
+#~ msgid "failed to set additional groups"
+#~ msgstr "не вдало�� в�тановити додаткові групи"
+
+#~ msgid "mount point %s already traversed"
+#~ msgstr "обхід точки монтуванн� %s вже здій�нено"
+
+#~ msgid "%s: cannot lseek back to original position"
+#~ msgstr "ю%s: не вдало�� вернуть вказівник файла на початкову позицію"
+
+#~ msgid "%s: failed to reset file pointer"
+#~ msgstr "%s: не вдало�� �кинути вказівник на файл"
+
+#~ msgid "cannot reposition file pointer for %s"
+#~ msgstr "не вдало�� перемі�тити вказівник файла дл� %s"
+
+#~ msgid ""
+#~ "  -Z, --context[=CTX]  set the SELinux security context of each NAME to\n"
+#~ "                         default type, or CTX if specified\n"
+#~ msgstr ""
+#~ "  -Z, --context[=КО�]  в�тановити контек�т захи�ту SELinux дл� кожної "
+#~ "��ЗВИ у типове\n"
+#~ "                       значенн� або у значенн� КО�\n"
+
+#~ msgid ""
+#~ "  -Z, --context[=CTX]  set the SELinux security context of NAME to\n"
+#~ "                         default type, or to CTX if specified\n"
+#~ msgstr ""
+#~ "  -Z, --context[=КО�]  в�тановити контек�т захи�ту SELinux дл� ��ЗВИ у "
+#~ "типове\n"
+#~ "                       значенн� або у значенн� КО�\n"
+
+#~ msgid "out of memory (requested %zu bytes)"
+#~ msgstr "переповненн� пам'�ті (запитано %zu байтів)"
+
+#~ msgid "--padding cannot be combined with --format"
+#~ msgstr "--padding не можна викори�товувати разом з --format"
+
+#~ msgid ""
+#~ "Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
+#~ "  or:  %s LONG-OPTION\n"
+#~ msgstr ""
+#~ "Викори�танн�: %s [СКОРОЧЕ�ИЙ-П�Р�МЕТР]... КОРИСТУВ�Ч КОМ��Д� "
+#~ "[�РГУМЕ�Т]...\n"
+#~ "  або  %s П�Р�МЕТР-ПОВ�ІСТЮ\n"
+
+#~ msgid ""
+#~ "Drop any supplemental groups, assume the user-ID and group-ID of the "
+#~ "specified\n"
+#~ "USER (numeric ID or user name), and run COMMAND with any specified "
+#~ "ARGUMENTs.\n"
+#~ "Exit with status 111 if unable to assume the required user and group ID.\n"
+#~ "Otherwise, exit with the exit status of COMMAND.\n"
+#~ "This program is useful only when run by root (user ID zero).\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Скидає в�і додаткові групи, в�тановлює ідентифікатори\n"
+#~ "кори�тувача та групи �к у вказаного КОРИСТУВ�Ч� та запу�кає КОМ��ДУ\n"
+#~ "з вказаними �РГУМЕ�Т�МИ.  Завершуєть�� зі �тату�ом 111, �кщо \n"
+#~ "не вдало�� в�тановити потрібні ідентифікатори кори�тувача та групи.  У\n"
+#~ "іншому випадку повертаєть�� вихідний �тату� КОМ��ДИ.  Ц� програма\n"
+#~ "має �ен� лише дл� root (UID=0).\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, "
+#~ "and\n"
+#~ "                      (if specified) supplemental group IDs to GID1, ...\n"
+#~ msgstr ""
+#~ "  -g GID[,GID1...]  також в�тановити головний ідентифікатор групи у "
+#~ "значенн� GID, та\n"
+#~ "                    (�кщо вказано) ідентифікатори додаткових груп ID у "
+#~ "GID1, ...\n"
+
+#~ msgid "unknown user-ID: %s"
+#~ msgstr "невідомий ідентифікатор кори�тувача: %s"
+
+#~ msgid "to use user-ID %s you need to use -g too"
+#~ msgstr ""
+#~ "дл� викори�танн� ідентифікатора кори�тувача %s �лід викори�товувати -g too"
+
+#~ msgid "cannot set group-ID to %lu"
+#~ msgstr "не вдало�� в�тановити ідентифікатор групи рівним %lu"
+
+#~ msgid "cannot set user-ID to %lu"
+#~ msgstr "не вдало�� в�тановити ідентифікатор кори�тувача рівним %lu"
+
+#~ msgid "failed to get file system create context"
+#~ msgstr "не вдало�� отримати контек�т файлової �и�теми дл� �творенн� файлів"
+
+#~ msgid "warning: "
+#~ msgstr "попередженн�: "
+
+#~ msgid "long option '--megabytes' is deprecated and will soon be removed"
+#~ msgstr ""
+#~ "довга вер�і� параметра «--megabytes» вважаєть�� за�тарілою, �коро її буде "
+#~ "вилучено"
+
+#~ msgid "Usage: %s [OPTION]... [USERNAME]\n"
+#~ msgstr "Викори�танн�: %s [КЛЮЧ]... [КОРИСТУВ�Ч]\n"
+
+#~ msgid ""
+#~ "      --strict         with --check, exit non-zero for any invalid input\n"
+#~ msgstr ""
+#~ "      --strict         з --check вийти з ненульовим кодом дл� будь-�кого "
+#~ "некоректного\n"
+#~ "                       джерела вхідних даних\n"
+
+#~ msgid "failed to redirect stderr to /dev/null"
+#~ msgstr "не вдало�� пере�пр�мувати stderr до /dev/null"
+
+#~ msgid "invalid number: '%s'"
+#~ msgstr "некоректне чи�ло: «%s»"
+
+#~ msgid ""
+#~ "\n"
+#~ "With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Якщо Ф�ЙЛ не вказаний або вказаний �к -, читає �тандартний ввід.\n"
+#~ "Типово вважаєть�� вказаним '-F /'.\n"
+
+#~ msgid "cannot remove directory: %s"
+#~ msgstr "не вдало�� вилучити каталог: %s"
+
+#~ msgid "dup2 failed"
+#~ msgstr "помилка dup2"
+
+#~ msgid "couldn't execute %s"
+#~ msgstr "неможливо виконати %s"
+
+#~ msgid "couldn't execute %s -d"
+#~ msgstr "неможливо виконати %s -d"
+
+#~ msgid ""
+#~ "\n"
+#~ "Report %s bugs to %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Про вади у %s повідомл�йте на адре�у %s.\n"
+
+#~ msgid "warning: --retry is useful mainly when following by name"
+#~ msgstr ""
+#~ "попередженн�: ключ --retry кори�ний лише при �лідуванні за назвою файла"
+
 #~ msgid "using single-precision arithmetic"
 #~ msgstr "викори�танн� арифметики з фік�ованою точні�тю"
 
diff --git a/po/vi.gmo b/po/vi.gmo
index 99178911..6e1d3509 100644
--- a/po/vi.gmo
+++ b/po/vi.gmo
diff --git a/po/vi.po b/po/vi.po
index 724f7169..01c038a3 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,27 +1,28 @@
 # Vietnamese translation for CoreUtils.
-# Copyright © 2012 Free Software Foundation, Inc.
+# Bản dịch tiếng Việt cho CoreUtils.
+# Copyright © 2014 Free Software Foundation, Inc.
 # This file is distributed under the same license as the coreutils package.
 # Phan Vinh Thinh <teppi82@gmail.com>, 2005.
 # Clytie Siddall <clytie@riverland.net.au>, 2007-2010.
 # Nguyá»…n VÅ© HÆ°ng <vuhung16plus@gmail.com>, 2011-2012.
-# Trần Ng�c Quân <vnwildman@gmail.com>, 2012.
+# Trần Ng�c Quân <vnwildman@gmail.com>, 2012-2014.
 # Nguyễn Thái Ng�c Duy <pclouds@gmail.com>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: coreutils-8.20-pre1\n"
+"Project-Id-Version: coreutils-8.23-pre1\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
-"PO-Revision-Date: 2012-12-11 13:35+0700\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
+"PO-Revision-Date: 2014-07-17 07:25+0700\n"
 "Last-Translator: Trần Ng�c Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Team-Website: <http://translationproject.org/team/vi.html>\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LocFactoryEditor 1.8\n"
+"X-Language-Team-Website: <http://translationproject.org/team/vi.html>\n"
+"X-Generator: Poedit 1.5.5\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
 #: lib/argmatch.c:133
@@ -32,7 +33,7 @@ msgstr "tham số %s cho %s không hợp lệ"
 #: lib/argmatch.c:134
 #, c-format
 msgid "ambiguous argument %s for %s"
-msgstr "đối số không rõ ràng %s cho %s"
+msgstr "đối số chưa rõ ràng %s cho %s"
 
 #: lib/argmatch.c:153
 msgid "Valid arguments are:"
@@ -42,76 +43,119 @@ msgstr "Những đối số hợp lệ:"
 msgid "error closing file"
 msgstr "lỗi đóng tập tin"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "lá»—i ghi"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "giữ nguyên quy�n hạn cho %s"
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
-msgstr "Lỗi hệ thống lạ"
+msgstr "Lỗi hệ thống chưa biết"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
-msgstr "tập tin trống thông thư�ng"
+msgstr "tập tin rỗng thông thư�ng"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "tập tin thông thư�ng"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "thư mục"
 
-#: lib/file-type.c:44
-msgid "block special file"
-msgstr "tập tin đặc biệt khối"
-
-#: lib/file-type.c:47
-msgid "character special file"
-msgstr "tập tin đặc biệt ký tự"
-
-#: lib/file-type.c:50
-msgid "fifo"
-msgstr "fifo"
-
-#: lib/file-type.c:53
+#: lib/file-type.c:46
 msgid "symbolic link"
 msgstr "liên kết m�m"
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "socket"
-
-#: lib/file-type.c:59
+#: lib/file-type.c:52
 msgid "message queue"
 msgstr "hàng đợi thông điệp"
 
-#: lib/file-type.c:62
+#: lib/file-type.c:55
 msgid "semaphore"
 msgstr "c� hiệu"
 
-#: lib/file-type.c:65
+#: lib/file-type.c:58
 msgid "shared memory object"
 msgstr "đối tượng bộ nhớ chia sẻ"
 
-#: lib/file-type.c:68
+#: lib/file-type.c:61
 msgid "typed memory object"
 msgstr "đối tượng bộ nhớ đặt kiểu"
 
-#: lib/file-type.c:70
+#: lib/file-type.c:66
+msgid "block special file"
+msgstr "tập tin đặc biệt khối"
+
+#: lib/file-type.c:69
+msgid "character special file"
+msgstr "tập tin đặc biệt ký tự"
+
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr "dữ liệu liên tiếp"
+
+#: lib/file-type.c:75
+msgid "fifo"
+msgstr "fifo"
+
+#: lib/file-type.c:78
+msgid "door"
+msgstr "cá»­a"
+
+#: lib/file-type.c:81
+msgid "multiplexed block special file"
+msgstr "tập tin đặc biệt khối đa phức hợp"
+
+#: lib/file-type.c:84
+msgid "multiplexed character special file"
+msgstr "tập tin đặc biệt ký tự đa phức hợp"
+
+#: lib/file-type.c:87
+msgid "multiplexed file"
+msgstr "tập tin đa phức hợp"
+
+#: lib/file-type.c:90
+msgid "named file"
+msgstr "tập tin tên"
+
+#: lib/file-type.c:93
+msgid "network special file"
+msgstr "tập tin đặc biệt mạng"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr "chuyển đổi tập tin với dữ liệu"
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr "chuyển đổi tập tin không cùng dữ liệu"
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr "cổng"
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "socket"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr "b� trắng"
+
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "tập tin kỳ lạ"
 
@@ -246,21 +290,21 @@ msgstr "%s: tùy ch�n “-W %s� không cho phép có đối số\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: tùy ch�n “-W %s� cần một đối số\n"
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr "không thay đổi được quy�n hạn của %s"
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "không tạo được thư mục %s"
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
-msgstr "cạn bộ nhớ"
+msgstr "hết bộ nhớ"
 
 #: lib/openat-die.c:38
 #, c-format
@@ -374,7 +418,7 @@ msgstr "Biểu thức chính quy quá lớn"
 msgid "Unmatched ) or \\)"
 msgstr "Có một ký tự “)� hay “\\)� lẻ đôi"
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 msgid "No previous regular expression"
 msgstr "Không có biểu thức chính quy đi trước"
 
@@ -399,7 +443,7 @@ msgstr "hãy dùng “--no-preserve-root� để b� qua kiểm tra này"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[yYcC]"
 
@@ -409,14 +453,14 @@ msgstr "^[yYcC]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[nNkK]"
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, c-format
 msgid "setting permissions for %s"
-msgstr "đang thiết lập quy�n hạn cho %s"
+msgstr "đang cài đặt quy�n hạn cho %s"
 
 #: lib/siglist.h:31
 msgid "Hangup"
@@ -436,7 +480,7 @@ msgstr "Câu lệnh không đúng"
 
 #: lib/siglist.h:43
 msgid "Trace/breakpoint trap"
-msgstr "Bẫy tìm đư�ng / điểm ngắt"
+msgstr "Bẫy tìm đư�ng hoặc điểm ngắt"
 
 #: lib/siglist.h:46
 msgid "Aborted"
@@ -460,7 +504,7 @@ msgstr "Lỗi phân đoạn"
 
 #: lib/siglist.h:61
 msgid "Broken pipe"
-msgstr "�ng dẫn bị ngắt"
+msgstr "�ng dẫn bị h�ng"
 
 #: lib/siglist.h:64
 msgid "Alarm clock"
@@ -554,18 +598,6 @@ msgstr "Gián đoạn trong việc cấp năng lượng"
 msgid "Resource lost"
 msgstr "Mất tài nguyên"
 
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, c-format
-msgid "cannot create pipe"
-msgstr "không thể tạo ống dẫn"
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, c-format
-msgid "%s subprocess failed"
-msgstr "tiến trình con %s bị lỗi"
-
 #: lib/strsignal.c:114
 #, c-format
 msgid "Real-time signal %d"
@@ -645,7 +677,7 @@ msgstr ""
 "Giấy phép GPL pb3+: Giấy phép Công cộng GNU phiên bản 3 hay sau\n"
 "<http://gnu.org/licenses/gpl.html>\n"
 "�ây là phần m�m tự do: bạn có quy�n sửa đổi và phát hành lại nó.\n"
-"KHÔNG CÓ BẢO HÀNH GÌ CẢ, với đi�u khiển được pháp luật cho phép.\n"
+"KHÔNG CÓ BẢO HÀNH GÌ CẢ, với đi�u kiện được pháp luật cho phép.\n"
 "\n"
 
 #. TRANSLATORS: %s denotes an author name.
@@ -775,7 +807,7 @@ msgstr ""
 msgid "Report %s bugs to: %s\n"
 msgstr "Thông báo lỗi %s tới: %s\n"
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Trang chủ %s: <%s>\n"
@@ -785,31 +817,11 @@ msgstr "Trang chủ %s: <%s>\n"
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr "Trang chủ %s: <http://www.gnu.org/software/%s/>\n"
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr ""
 "Trợ giúp chung v� sử dụng phần m�m GNU: <http://www.gnu.org/gethelp/>\n"
 
-#: lib/w32spawn.h:43
-#, c-format
-msgid "_open_osfhandle failed"
-msgstr "_open_osfhandle gặp lỗi"
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr "không thể phục hồi bộ mô tả tập tin %d: dup2 bị lỗi"
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr "tiến trình con %s"
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr "tiến trình con %s đã nhận tín hiệu nghiệm tr�ng %d"
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr "đầu vào tiêu chuẩn"
@@ -831,7 +843,7 @@ msgstr "không hiểu luồng dữ liệu"
 msgid "failed to reopen %s with mode %s"
 msgstr "không mở lại được %s với chế độ %s"
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr "gặp lỗi khi so sánh các chuỗi"
@@ -872,15 +884,13 @@ msgid "Simon Josefsson"
 msgstr "Simon Josefsson"
 
 #: src/base64.c:60
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
 "Base64 encode or decode FILE, or standard input, to standard output.\n"
 msgstr ""
-"Cách dùng: %s [TÙY_CHỌN] [TẬP_TIN]\n"
-"\n"
+"Cách dùng: %s [TÙY_CHỌN]... [TẬP_TIN]\n"
 "Mã hoá/giải mã Base64 TẬP_TIN hoặc đầu vào chuẩn ra đầu ra chuẩn.\n"
-"\n"
 
 #: src/base64.c:67
 msgid ""
@@ -898,7 +908,7 @@ msgstr ""
 "                         Giá trị 0 thì tắt chức năng ngắt dòng\n"
 "\n"
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -922,48 +932,47 @@ msgstr ""
 "�--ignore-garbage� để thử phục hồi khi luồng đã mã hoá chứa byte khác chữ "
 "cái.\n"
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "lỗi đ�c"
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, c-format
 msgid "invalid input"
 msgstr "đầu vào sai"
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, c-format
 msgid "invalid wrap size: %s"
 msgstr "sai kích cỡ ngắt dòng: %s"
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, c-format
 msgid "extra operand %s"
 msgstr "toán hạng thừa %s"
 
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, c-format
 msgid "closing standard input"
 msgstr "đang đóng đầu vào tiêu chuẩn"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -979,27 +988,25 @@ msgid ""
 "  or:  %s OPTION... NAME...\n"
 msgstr ""
 "Cách dùng: %s TÊN [HẬU_T�]\n"
-"     hoặc: %s TÙY_CHỌN...TÊN...\n"
+"          hoặc: %s TÙY_CHỌN...TÊN...\n"
 
 #: src/basename.c:53
-#, fuzzy
 msgid ""
 "Print NAME with any leading directory components removed.\n"
 "If specified, also remove a trailing SUFFIX.\n"
 msgstr ""
-"In ra TÊN mà không có thành phần thư mục đứng ở đầu.\n"
-"Nếu chỉ ra, thì còn xóa HẬU_T� theo sau.\n"
-"\n"
+"Hiển thị TÊN mà không có thành phần thư mục dẫn đầu.\n"
+"Nếu chỉ định thì còn xóa HẬU_T� theo sau.\n"
 
 #: src/basename.c:60
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
 "  -a, --multiple       hỗ trợ đa tham số và xử lý từng tham số như là một "
 "TÊN\n"
-"  -s, --suffix=SUFFIX  gỡ b� đuôi phụ tố SUFFIX\n"
+"  -s, --suffix=HẬU_T�  gỡ b� đuôi phụ tố SUFFIX; ý là -a\n"
 "  -z, --zero           ngăn cách kết xuất với NUL thay vì dòng mới\n"
 
 #: src/basename.c:67
@@ -1017,34 +1024,33 @@ msgstr ""
 "  %s /usr/bin/sort          -> “sort�\n"
 "  %s include/stdio.h .h     -> “stdio�\n"
 "  %s -s .h include/stdio.h  -> “stdio�\n"
-"  %s -a any/str1 any/str2   -> “str1� theo sau bởi “str2�\n"
+"  %s -a any/str1 any/str2   -> “str1� theo sau là “str2�\n"
 
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, c-format
 msgid "missing operand"
 msgstr "thiếu toán hạng"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr "Torbjorn Granlund"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 msgid "Richard M. Stallman"
 msgstr "Richard M. Stallman"
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1061,7 +1067,7 @@ msgid ""
 "  -n, --number             number all output lines\n"
 "  -s, --squeeze-blank      suppress repeated empty output lines\n"
 msgstr ""
-"Ghép nối các FILE, hoặc đầu vào tiêu chuẩn, xuất đầu ra chuẩn.\n"
+"Ghép nối các TẬP-TIN, hoặc đầu vào tiêu chuẩn, ra  đầu ra tiêu chuẩn.\n"
 "\n"
 "  -A, --show-all           tương đương với “-vET�\n"
 "  -b, --number-nonblank    đánh số dòng kết quả không rỗng\n"
@@ -1094,14 +1100,14 @@ msgstr ""
 "Ví dụ:\n"
 "  %s f - g  Xuất nội dung của f, tiếp đến là đầu vào tiêu chuẩn, rồi đến nội "
 "dung của g.\n"
-"  %s        Sao chép đầu vào tiêu chuẩn tới đầu ra tiêu chuẩn.\n"
+"  %s        Sao chép đầu từ đầu vào tiêu chuẩn sang đầu ra tiêu chuẩn.\n"
 
 #: src/cat.c:326
 #, c-format
 msgid "cannot do ioctl on %s"
 msgstr "không thực hiện được ioctl trên %s"
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr "đầu ra chuẩn"
@@ -1118,14 +1124,14 @@ msgstr "Russell Coker"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 msgid "Jim Meyering"
 msgstr "Jim Meyering"
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, c-format
 msgid "failed to create security context: %s"
 msgstr "gặp lỗi khi tạo ngữ cảnh bảo mật: %s"
@@ -1135,8 +1141,8 @@ msgstr "gặp lỗi khi tạo ngữ cảnh bảo mật: %s"
 msgid "failed to set %s security context component to %s"
 msgstr "gặp lỗi khi đặt thành phần ngữ cảnh bảo mật %s thành %s"
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, c-format
 msgid "failed to get security context of %s"
 msgstr "gặp lỗi khi lấy ngữ cảnh bảo mật của %s"
@@ -1146,18 +1152,18 @@ msgstr "gặp lỗi khi lấy ngữ cảnh bảo mật của %s"
 msgid "can't apply partial context to unlabeled file %s"
 msgstr "không thể áp dụng ngữ cảnh đặc thù cho tập tin không có nhãn %s"
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, c-format
 msgid "failed to change context of %s to %s"
 msgstr "gặp lỗi khi thay đổi ngữ cảnh của %s thành %s"
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
 msgstr "không thể truy cập %s"
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, c-format
 msgid "cannot read directory %s"
 msgstr "không đ�c được thư mục %s"
@@ -1167,13 +1173,14 @@ msgstr "không đ�c được thư mục %s"
 msgid "changing security context of %s\n"
 msgstr "đang thay đổi ngữ cảnh bảo mật của %s\n"
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, c-format
 msgid "fts_read failed"
 msgstr "fts_read bị lỗi"
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, c-format
 msgid "fts_close failed"
 msgstr "fts_close bị lỗi"
@@ -1191,16 +1198,14 @@ msgstr ""
 "     hoặc: %s [TÙY_CHỌN]... --reference=TẬP_TIN_TC TẬP_TIN...\n"
 
 #: src/chcon.c:357
-#, fuzzy
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
-"Thay đổi ngữ cảnh bảo mật của mỗi TẬP_TIN thành NGỮ_CẢNH.\n"
-"Khi có --reference, ngữ cảnh bảo mật của từng TẬP_TIN được lấy từ "
+"Thay đổi ngữ cảnh bảo mật của từng TẬP_TIN thành NGỮ_CẢNH.\n"
+"Khi có --reference, ngữ cảnh bảo mật cho từng TẬP_TIN được lấy từ "
 "TẬP_TIN_TC.\n"
-"\n"
 
 #: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94
 msgid ""
@@ -1212,8 +1217,8 @@ msgstr ""
 "      --dereference      tác động đến nơi chỉ đến của mỗi liên kết m�m (đây "
 "là\n"
 "                         mặc định), hơn là tự bản thân liên kết m�m đó\n"
-"  -h, --no-dereference   tác động đến liên kết tượng trưng thay vì tham "
-"chiếu đến tập tin\n"
+"  -h, --no-dereference   tác động đến liên kết m�m thay vì tham chiếu đến "
+"tập tin\n"
 
 #: src/chcon.c:369
 msgid ""
@@ -1228,12 +1233,12 @@ msgstr ""
 "  -l, --range=PHẠM_VI    đặt PHẠM_VI trong ngữ cảnh bảo mật đích\n"
 "\n"
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
 "      --preserve-root    fail to operate recursively on '/'\n"
 msgstr ""
-"      --no-preserve-root không coi �/� là đặc biệt (mặc định)\n"
+"      --no-preserve-root không coi “/� là đặc biệt (mặc định)\n"
 "      --preserve-root    không thực hiện đệ quy trên “/�\n"
 
 #: src/chcon.c:379
@@ -1243,7 +1248,7 @@ msgid ""
 "                         a CONTEXT value\n"
 msgstr ""
 "    --reference=TẬP_TIN_TC  sử dụng ngữ cảnh bảo mật của TẬP_TIN_TC\n"
-"                         thay vì chỉ định NGỮ_CẢNH\n"
+"                         thay cho việc chỉ định giá trị cho NGỮ_CẢNH\n"
 
 #: src/chcon.c:383 src/chgrp.c:140 src/chown.c:118
 msgid "  -R, --recursive        operate on files and directories recursively\n"
@@ -1283,36 +1288,37 @@ msgstr ""
 "  -P                     không đi qua bất kỳ liên kết m�m nào (mặc định)\n"
 "\n"
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr "-R --dereference cần hoặc -H hoặc -L"
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr "-R -h cần -P"
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, c-format
 msgid "missing operand after %s"
 msgstr "thiếu toán hạng sau %s"
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, c-format
 msgid "invalid context: %s"
 msgstr "ngữ cảnh không hợp lệ: %s"
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr "chỉ ra các toán tử ngữ cảnh bảo mật xung đột với nhau"
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, c-format
 msgid "failed to get attributes of %s"
 msgstr "gặp lỗi khi lấy thuộc tính của %s"
@@ -1341,7 +1347,7 @@ msgstr ""
 "Khi có --reference, nhóm của mỗi TẬP_TIN được lấy từ TẬP_TIN_TC.\n"
 "\n"
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
@@ -1382,48 +1388,48 @@ msgstr ""
 "  %s staff /u      Thay đổi nhóm của /u thành “staff�.\n"
 "  %s -hR staff /u  Thay đổi nhóm của /u và các tập tin con thành “staff�.\n"
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
 msgstr "lấy thuộc tính mới của %s"
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr "liên kết m�m %s chưa thay đổi, đích đến cũng vậy\n"
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr "chế độ của %s đã thay đổi từ %04lo (%s) thành %04lo (%s)\n"
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr "gặp lỗi khi chuyển đổi chế độ của %s từ %04lo (%s) thành %04lo (%s)\n"
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr "chế độ của %s vẫn là %04lo (%s)\n"
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr ""
 "không thể thực hiện trên liên kết m�m không đầu (không tham chiếu vào đâu) %s"
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, c-format
 msgid "changing permissions of %s"
 msgstr "thay đổi quy�n hạn của %s"
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr "%s: quy�n hạn mới là %s, không phải %s"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1434,7 +1440,7 @@ msgstr ""
 "     hoặc: %s [TÙY_CHỌN]... CHẾ_�Ộ_B�T_PHÂN TẬP_TIN...\n"
 "     hoặc: %s [TÙY_CHỌN]... --reference=TẬP_TIN_TC TẬP_TIN...\n"
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 msgid ""
 "Change the mode of each FILE to MODE.\n"
 "With --reference, change the mode of each FILE to that of RFILE.\n"
@@ -1445,31 +1451,31 @@ msgstr ""
 "TẬP_TIN_TC.\n"
 "\n"
 
-#: src/chmod.c:391
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
 "      --reference=TẬP_TIN_TC  sử dụng chế độ của TẬP_TIN_TC thay vì giá trị "
 "MODE\n"
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr ""
 "  -R, --recursive        thay đổi các tập tin và thư mục một cách đệ qui\n"
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 msgid ""
 "\n"
 "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n"
 msgstr ""
 "\n"
-"Mỗi CHẾ_�Ộ có dạng �[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+�.\n"
+"Mỗi CHẾ_�Ộ có dạng “[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+�.\n"
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr "không thể dùng chung chế độ và tùy ch�n --reference"
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, c-format
 msgid "invalid mode: %s"
 msgstr "chế độ sai: %s"
@@ -1621,26 +1627,21 @@ msgstr ""
 "“root�.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr "Roland McGrath"
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr "nhóm không hợp lệ %s"
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, c-format
 msgid "invalid group list %s"
 msgstr "danh sách nhóm không hợp lệ %s"
 
-#: src/chroot.c:117
-#, c-format
-msgid "failed to set additional groups"
-msgstr "gặp lỗi khi đặt nhóm phụ"
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
@@ -1649,13 +1650,13 @@ msgstr ""
 "Cách dùng: %s [TÙY_CHỌN] G�C_MỚI [LỆNH [�.S�]...]\n"
 "     hoặc: %s TÙY_CHỌN\n"
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
 msgstr "Chạy câu LỆNH với thư mục gốc (root) đặt là G�C_MỚI.\n"
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
@@ -1665,37 +1666,51 @@ msgstr ""
 "dùng\n"
 "  --groups=G_LIST        chỉ ra các nhóm phụ kiểu g1,g2,..,gN\n"
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 msgid ""
 "\n"
 "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n"
 msgstr ""
 "\n"
-"Nếu không đưa ra câu lệnh, thì chạy câu lệnh “${SHELL} -i� (mặc định: �/bin/"
+"Nếu không đưa ra câu lệnh, thì chạy câu lệnh “${SHELL} -i� (mặc định: “/bin/"
 "sh -i�).\n"
 
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, c-format
 msgid "cannot change root directory to %s"
 msgstr "không chuyển đổi được thư mục gốc thành %s"
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, c-format
 msgid "cannot chdir to root directory"
 msgstr "không chuyển được sang thư mục gốc"
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr "chưa chỉ ra nhóm cho mã số ngư�i dùng chưa biết: %d"
+
+#: src/chroot.c:383
+#, c-format
+msgid "failed to get supplemental groups"
+msgstr "gặp lỗi khi lấy các nhóm phụ"
+
+#: src/chroot.c:395
+#, c-format
+msgid "failed to %s supplemental groups"
+msgstr "gặp lỗi khi %s (các) nhóm phụ"
+
+#: src/chroot.c:402
 #, c-format
 msgid "failed to set group-ID"
 msgstr "gặp lỗi khi đặt mã số nhóm (GID)"
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, c-format
 msgid "failed to set user-ID"
 msgstr "gặp lỗi khi đặt mã số ngư�i dùng (UID)"
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, c-format
 msgid "failed to run command %s"
 msgstr "gặp lỗi khi chạy câu lệnh %s"
@@ -1717,7 +1732,7 @@ msgid ""
 "  or:  %s [OPTION]\n"
 msgstr ""
 "Cách dùng: %s [TẬP_TIN]...\n"
-"     hoặc: %s [TÙY_CHỌN]\n"
+"         hoặc: %s [TÙY_CHỌN]\n"
 
 #: src/cksum.c:268
 msgid ""
@@ -1727,7 +1742,7 @@ msgstr ""
 "In ra tổng kiểm tra CRC và số byte của mỗi TẬP_TIN.\n"
 "\n"
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr "Cách dùng: %s [TÙY_CHỌN]... TẬP_TIN1 TẬP_TIN2\n"
@@ -1768,8 +1783,8 @@ msgid ""
 "  --nocheck-order   do not check that the input is correctly sorted\n"
 msgstr ""
 "\n"
-"  --check-order     kiểm tra dữ liệu nhập vào được sắp xếp đúng, thậm chí\n"
-"                     nếu m�i dòng nhập vào đ�u có thể kết đôi được\n"
+"  --check-order     kiểm tra dữ liệu đầu vào được sắp xếp đúng, thậm chí\n"
+"                     nếu m�i dòng đầu vào đ�u có thể kết đôi được\n"
 "  --nocheck-order   không kiểm tra xem đầu vào đã xắp xếp đúng chưa\n"
 
 #: src/comm.c:128
@@ -1813,295 +1828,333 @@ msgstr "xác định nhi�u hơn một dấu cách"
 msgid "empty %s not allowed"
 msgstr "không cho phép %s trống"
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr "lỗi đ�c %s"
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, c-format
 msgid "cannot lseek %s"
 msgstr "không lseek được %s"
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr "lá»—i ghi %s"
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, c-format
 msgid "%s: failed to get extents info"
 msgstr "%s: lỗi lấy ngữ cảnh hiện th�i"
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, c-format
 msgid "%s: write failed"
 msgstr "%s: lá»—i ghi"
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, c-format
 msgid "failed to extend %s"
 msgstr "gặp lỗi khi mở rộng %s"
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, c-format
 msgid "clearing permissions for %s"
 msgstr "đang gột quy�n hạn cho %s"
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "gặp lỗi khi giữ lại quy�n sở hữu của %s"
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
 msgstr "gặp lỗi khi tìm kiếm tập tin %s"
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, c-format
 msgid "failed to preserve authorship for %s"
 msgstr "gặp lỗi khi bảo tồn nguồn tác giả của %s"
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
+#, c-format
+msgid "failed to set default file creation context to %s"
+msgstr "gặp lỗi khi đặt ngữ cảnh tạo tập tin mặc định thành %s"
+
+#: src/copy.c:820
+#, c-format
+msgid "failed to set default file creation context for %s"
+msgstr "gặp lỗi khi đặt ngữ cảnh tạo tập tin mặc định thành %s"
+
+#: src/copy.c:846
+#, c-format
+msgid "failed to set the security context of %s"
+msgstr "gặp lỗi khi đặt ngữ cảnh bảo mật của %s"
+
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
 msgid "cannot open %s for reading"
 msgstr "không mở được %s để đ�c"
 
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, c-format
 msgid "cannot fstat %s"
 msgstr "không fstat được %s"
 
-#: src/copy.c:820
+#: src/copy.c:935
 #, c-format
 msgid "skipping file %s, as it was replaced while being copied"
 msgstr "b� qua tập tin %s, vì nó bị thay thế trong khi sao chép"
 
-#: src/copy.c:850
-#, c-format
-msgid "failed to get file system create context"
-msgstr "gặp lỗi khi lấy ngữ cảnh tạo hệ thống tập tin"
-
-#: src/copy.c:864
-#, c-format
-msgid "failed to set the security context of %s to %s"
-msgstr "gặp lỗi khi đặt ngữ cảnh bảo mật của %s thành %s"
-
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
 msgid "cannot remove %s"
 msgstr "không gỡ b� được %s"
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
 msgstr "đã xóa %s\n"
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr "không phải ghi qua liên kết m�m theo sát %s"
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, c-format
 msgid "cannot create regular file %s"
 msgstr "không tạo được tập tin thông thư�ng %s"
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, c-format
 msgid "failed to clone %s from %s"
 msgstr "gặp lỗi khi nhân bản %s từ %s"
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr "bảo tồn các giá trị th�i gian cho %s"
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
-#, fuzzy, c-format
+#, c-format
 msgid "failed to close %s"
-msgstr "gặp lỗi khi mở %s"
+msgstr "gặp lỗi khi đóng %s"
+
+#: src/copy.c:1580
+#, c-format
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
+msgstr "%s: thay thế %s, đè lên chế độ %04lo (%s)? "
 
-#: src/copy.c:1471
+#: src/copy.c:1581
 #, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
-msgstr "%s: thử ghi đè lên %s, cũng có quy�n cao hơn chế độ %04lo (%s)? "
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr "%s: không thể ghi %s (chế độ %04lo, %s); vẫn thử? "
 
-#: src/copy.c:1478
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
 msgstr "%s: ghi đè %s? "
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr " (sao lÆ°u: %s)"
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr "gặp lỗi khi phục hồi ngữ cảnh tạo tập tin mặc định"
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, c-format
 msgid "cannot create hard link %s to %s"
 msgstr "không tạo được liên kết cứng %s tới %s"
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, c-format
 msgid "cannot stat %s"
 msgstr "không thể stat %s"
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, c-format
 msgid "omitting directory %s"
 msgstr "b� qua thư mục %s"
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr "cảnh báo: tập tin nguồn %s được chỉ ra nhi�u hơn một lần"
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
 msgstr "%s và %s là cùng một tập tin"
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr "không thể ghi đè %s (không phải thư mục) bằng thư mục %s"
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr "sẽ không ghi đè %s vừa mới tạo bằng %s"
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr "không thể ghi đè thư mục %s bằng cái không phải thư mục"
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr "không thể chuyển thư mục vào cái không phải thư mục: %s -> %s"
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr "sao lưu %s sẽ phá hủy nguồn; không di chuyển %s"
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr "sao lưu %s sẽ phá hủy nguồn; không sao chép %s"
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
 msgstr "không sao lưu được %s"
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr "sẽ không sao chép %s qua liên kết m�m vừa mới tạo %s"
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr "không sao chép được một thư mục (%s) vào chính nó (%s)"
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr "sẽ không tạo liên kết cứng %s tới thư mục %s"
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr "không di chuyển được %s vào một thư mục con của chính nó (%s)"
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, c-format
 msgid "cannot move %s to %s"
 msgstr "không di chuyển được %s vào %s"
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr ""
 "gặp lỗi khi di chuyển giữa các thiết bị: %s tới %s; không xóa được đích"
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, c-format
-msgid "failed to set default file creation context to %s"
-msgstr "gặp lỗi khi đặt ngữ cảnh tạo tập tin mặc định thành %s"
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr "không sao chép được liên kết m�m vòng tròn %s"
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr "%s: chỉ tạo được liên kết m�m tương đối trong thư mục hiện th�i"
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr "không tạo được liên kết m�m %s tới %s"
 
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, c-format
 msgid "cannot create fifo %s"
 msgstr "không tạo được fifo %s"
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, c-format
 msgid "cannot create special file %s"
 msgstr "không tạo được tập tin đặc biệt %s"
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, c-format
 msgid "cannot read symbolic link %s"
 msgstr "không đ�c được liên kết m�m %s"
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, c-format
 msgid "cannot create symbolic link %s"
 msgstr "không tạo được liên kết m�m %s"
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
 msgstr "%s có kiểu tập tin chưa lạ"
 
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, c-format
 msgid "cannot un-backup %s"
 msgstr "không thể hủy sao lưu %s"
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr "%s -> %s (hủy sao lưu)\n"
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr "Alex Deymo"
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr "Cách dùng: %s --coreutils-prog=TÊN_CHƯƠNG_TRÌNH [C�C_��I_S�]... \n"
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+"Thực thi chương trình dựng sẵn CHƯƠNG_TRÌNH với C�C_��I_S� đã cho.\n"
+"\n"
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+"\n"
+"Gõ lệnh: “%s --coreutils-prog=TÊN_CHƯƠNG_TRÌNH --help� để xem trợ giúp v� "
+"từng chương trình cụ thể.\n"
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, c-format
+msgid "unknown program %s"
+msgstr "không hiểu chương trình %s"
+
+#: src/cp.c:157 src/mv.c:288
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -2112,14 +2165,11 @@ msgstr ""
 "     hoặc: %s [TÙY_CHỌN]... NGUỒN... THƯ_MỤC\n"
 "     hoặc: %s [TÙY_CHỌN]... -t THƯ_MỤC NGUỒN...\n"
 
-#: src/cp.c:162
-#, fuzzy
+#: src/cp.c:163
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
-msgstr ""
-"Sao chép NGUỒN tới ��CH hoặc nhi�u NGUỒN tới THƯ_MỤC.\n"
-"\n"
+msgstr "Sao chép NGUỒN tới ��CH hoặc nhi�u NGUỒN tới THƯ_MỤC.\n"
 
-#: src/cp.c:168
+#: src/cp.c:169
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
 "      --attributes-only        don't copy the file data, just the "
@@ -2142,8 +2192,7 @@ msgstr ""
 "  -d                           giống như “--no-dereference --"
 "preserve=links�\n"
 
-#: src/cp.c:177
-#, fuzzy
+#: src/cp.c:178
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
 "                                 opened, remove it and try again (this "
@@ -2156,15 +2205,16 @@ msgid ""
 "  -H                           follow command-line symbolic links in SOURCE\n"
 msgstr ""
 "  -f, --force                  nếu không mở được tập tin đích\n"
-"                                 thì xóa nó và thử lại (dư nếu dùng tùy ch�n "
-"�-n�)\n"
+"                                 thì xóa nó và thử lại (tùy ch�n này bị b� "
+"qua\n"
+"                                 khi tùy ch�n “-n� cũng đồng th�i được "
+"dùng)\n"
 "  -i, --interactive            h�i lại trước khi ghi đè\n"
-"                               (có quy�n cao hơn một tùy ch�n “-n� đặt "
-"trÆ°á»›c)\n"
+"                               (ghi đè lên tùy ch�n “-n� đặt trước nó)\n"
 "  -H                           đi theo các liên kết m�m của dòng lệnh trong "
 "NGUá»’N\n"
 
-#: src/cp.c:186
+#: src/cp.c:187
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
 "  -L, --dereference            always follow symbolic links in SOURCE\n"
@@ -2172,7 +2222,7 @@ msgstr ""
 "  -l, --link                   liên kết tập tin thay vào sao chép\n"
 "  -L, --dereference            luôn luôn theo liên kết m�m trong SOURCE\n"
 
-#: src/cp.c:190
+#: src/cp.c:191
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
 "                                 a previous -i option)\n"
@@ -2184,7 +2234,7 @@ msgstr ""
 "  -P, --no-dereference         không bao gi� nên theo liên kết m�m trong "
 "NGUá»’N\n"
 
-#: src/cp.c:195
+#: src/cp.c:196
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
 "      --preserve[=ATTR_LIST]   preserve the specified attributes (default:\n"
@@ -2205,7 +2255,7 @@ msgstr ""
 "                                         * xattr\n"
 "                                         * all          tất cả\n"
 
-#: src/cp.c:203
+#: src/cp.c:204
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                use full source file name under DIRECTORY\n"
@@ -2213,7 +2263,7 @@ msgstr ""
 "      --no-preserve=DANH_S�CH_THUỘC_T�NH  không giữ các thuộc tính chỉ ra\n"
 "      --parents                dùng tên tập tin nguồn đầy đủ dưới THƯ_MỤC\n"
 
-#: src/cp.c:207
+#: src/cp.c:208
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
 "      --reflink[=WHEN]         control clone/CoW copies. See below\n"
@@ -2228,7 +2278,7 @@ msgstr ""
 "                                trước khi thử mở nó (tương phản với “--"
 "force�)\n"
 
-#: src/cp.c:213
+#: src/cp.c:214
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
 "      --strip-trailing-slashes  remove any trailing slashes from each "
@@ -2240,7 +2290,7 @@ msgstr ""
 "      --strip-trailing-slashes gỡ b� m�i dấu gạch ngược đi theo kh�i mỗi\n"
 "                               đối số NGUỒN\n"
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -2253,7 +2303,7 @@ msgstr ""
 "  -t, --target-directory=THƯ_MỤC  sao chép m�i đối số NGUỒN vào THƯ_MỤC\n"
 "  -T, --no-target-directory    coi ��CH là một tập tin thông thư�ng\n"
 
-#: src/cp.c:224
+#: src/cp.c:225
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
 "                                 than the destination file or when the\n"
@@ -2267,7 +2317,21 @@ msgstr ""
 "  -v, --verbose                cho biết cụ thể những gì đã thực hiện\n"
 "  -x, --one-file-system        chỉ thực hiện trên hệ thống tập tin này\n"
 
-#: src/cp.c:233
+#: src/cp.c:232
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+"  -Z                           đặt ngữ cảnh an ninh SELinux của các tập tin "
+"đích\n"
+"                                thành kiểu mặc định\n"
+"      --context[=NGỮ_CẢNH]     giống với -Z, hoặc nếu NGỮ_CẢNH được chỉ định "
+"thì đặt ngữ cảnh\n"
+"                               an ninh SELinux hay SMACK thành NGỮ_CẢNH\n"
+
+#: src/cp.c:240
 msgid ""
 "\n"
 "By default, sparse SOURCE files are detected by a crude heuristic and the\n"
@@ -2296,7 +2360,7 @@ msgstr ""
 "không sao chép được hay “--reflink=auto� được chỉ ra thì phục hồi việc sao "
 "chép tiêu chuẩn.\n"
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 msgid ""
 "\n"
 "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n"
@@ -2312,7 +2376,7 @@ msgstr ""
 "hoặc qua biến môi trư�ng VERSION_CONTROL.  Có những giá trị sau:\n"
 "\n"
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2325,7 +2389,7 @@ msgstr ""
 "giản\n"
 "  simple, never   luôn luôn tạo sao lưu đơn giản\n"
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2337,233 +2401,241 @@ msgstr ""
 "khi đưa ra hai tùy ch�n force (ép buộc) và backup (sao lưu)\n"
 "và NGUỒN và ��CH cùng là một tên cho một tập tin thông thư�ng đã tồn tại.\n"
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, c-format
 msgid "failed to preserve times for %s"
 msgstr "gặp lỗi khi bảo tồn các th�i gian cho %s"
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, c-format
 msgid "failed to preserve permissions for %s"
 msgstr "gặp lỗi bảo tồn quy�n hạn cho %s"
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, c-format
 msgid "cannot make directory %s"
 msgstr "không tạo được thư mục %s"
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr "%s có nhưng không phải là thư mục"
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
-#, fuzzy, c-format
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
+#, c-format
 msgid "failed to access %s"
-msgstr "gặp lỗi khi mở %s"
+msgstr "gặp lỗi khi truy cập %s"
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, c-format
 msgid "missing file operand"
 msgstr "thiếu toán hạng tập tin"
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, c-format
 msgid "missing destination file operand after %s"
 msgstr "thiếu toán hạng tập tin đích đến sau %s"
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr ""
 "không thể kết hợp --target-directory (-t) và --no-target-directory (-T)"
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, c-format
 msgid "target %s is not a directory"
 msgstr "đích %s không phải là một thư mục"
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr "khi dùng tùy ch�n “--parents� thì đích đến phải là thư mục"
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, c-format
 msgid "multiple target directories specified"
 msgstr "đã chỉ ra nhi�u hơn một thư mục đích"
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr "CẢNH B�O: b� qua --context vì nhân không hỗ trợ SELinux như yêu cầu"
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr "không thể tạo được đồng th�i liên kết m�m và cứng"
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr "hai tùy ch�n “-backup� và “-no-clobber� loại từ lẫn nhau"
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr "--reflink chỉ có thể dùng với --sparse=auto"
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr "kiểu sao lưu"
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, c-format
+msgid "cannot set target context and preserve it"
+msgstr "không thể đặt ngữ cảnh đích thành và bảo tồn nó"
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr "không thể bảo tồn ngữ cảnh bảo mật trên hệ thống không hỗ trợ SELinux"
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr ""
 "không thể bảo tồn thuộc tính mở rộng vì cp được tạo không có hỗ trợ xattr"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr "Stuart Kemp"
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr "đầu vào đã biến mất"
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr "%s: số dòng vượt quá giới hạn"
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, c-format
 msgid "%s: %s: line number out of range"
 msgstr "%s: %s: số dòng vượt quá giới hạn"
 
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, c-format
 msgid " on repetition %s\n"
 msgstr " khi lặp lại %s\n"
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, c-format
 msgid "%s: %s: match not found"
 msgstr "%s: %s: không tìm thấy"
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr "lỗi trong biểu thức chính quy tìm kiếm"
 
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, c-format
 msgid "write error for %s"
 msgstr "lá»—i ghi cho %s"
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, c-format
 msgid "%s: integer expected after delimiter"
 msgstr "%s: cần số nguyên sau dấu phân cách"
 
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr "%s: cần “}� trong số lượng lặp lại"
 
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr "%s}: cần số nguyên giữa “{� và “}�"
 
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr "%s: thiếu dấu phân cách đóng “%c�"
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr "%s: biểu thức chính quy không hợp lệ: %s"
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr "%s: mẫu sai"
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr "%s: số thứ tự dòng phải lớn hơn không"
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr "số thứ tự dòng %s nh� hơn số thứ tự dòng đứng trước, %s"
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr "cảnh bảo: số thứ tự dòng %s trùng với số thứ tự dòng đứng trước"
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr "hậu tố thiếu sự xác định chuyển đổi"
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr "hậu tố chứa sự xác định chuyển đổi sai: %c"
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr "hậu tố chứa sự xác định chuyển đổi sai: \\%.3o"
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr "C� sai trong chỉ định hoán đổi: %%%c%c"
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr "hậu tố chứa quá nhi�u sự xác định chuyển đổi %%"
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr "hậu tố thiếu sự xác định chuyển đổi %%"
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr "%s: số sai"
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr "Cách dùng: %s [TÙY_CHỌN]... TẬP_TIN MẪU...\n"
 
-#: src/csplit.c:1455
-#, fuzzy
+#: src/csplit.c:1483
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
 "and output byte counts of each piece to standard output.\n"
 msgstr ""
-"�ưa ra các phần của TẬP_TIN ngăn cách bởi (các) MẪU thành các tập tin "
+"Xuất ra các phần của TẬP_TIN ngăn cách bởi (các) MẪU thành các tập tin "
 "“xx00�,\n"
 "“xx01�, v.v., và in ra đầu ra tiêu chuẩn kích thước theo byte của mỗi phần.\n"
-"\n"
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2574,7 +2646,11 @@ msgstr ""
 "  -f, --prefix=TIỀN_T�       dùng TIỀN_T� thay cho “xx�\n"
 "  -k, --keep-files           không xóa tập tin xuất khi có lỗi\n"
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr "  -m, --suppress-matched     cấm các dòng khớp MẪU\n"
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
@@ -2584,7 +2660,7 @@ msgstr ""
 "  -s, --quiet, --silent      không in ra kích thước của mỗi tập tin xuất\n"
 "  -z, --elide-empty-files    xóa tập tin xuất rỗng\n"
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
@@ -2592,7 +2668,7 @@ msgstr ""
 "\n"
 "��c đầu vào tiêu chuẩn nếu TẬP_TIN là “-�  Mỗi MẪU có thể là:\n"
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 msgid ""
 "\n"
 "  INTEGER            copy up to but not including specified line number\n"
@@ -2621,23 +2697,16 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr "David M. Ihnat"
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr "các trư�ng và vị trí đ�u đánh số từ 1"
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr "Cách dùng: %s TÙY_CHỌN... [TẬP_TIN]...\n"
 
-#: src/cut.c:193
-#, fuzzy
+#: src/cut.c:176
 msgid "Print selected parts of lines from each FILE to standard output.\n"
-msgstr ""
-"In ra đầu ra tiêu chuẩn phần đã ch�n của các dòng từ mỗi TẬP_TIN.\n"
-"\n"
+msgstr "In ra đầu ra tiêu chuẩn phần đã ch�n của các dòng từ mỗi TẬP_TIN.\n"
 
-#: src/cut.c:199
+#: src/cut.c:182
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
 "  -c, --characters=LIST   select only these characters\n"
@@ -2648,7 +2717,7 @@ msgstr ""
 "  -d, --delimiter=DẤU     sử dụng DẤU này thay cho TAB, để phân cách các "
 "trư�ng\n"
 
-#: src/cut.c:204
+#: src/cut.c:187
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
 "                            that contains no delimiter character, unless\n"
@@ -2660,7 +2729,7 @@ msgstr ""
 "                            ra tùy ch�n “-s�\n"
 "  -n                      (bị b� qua)\n"
 
-#: src/cut.c:210
+#: src/cut.c:193
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
 "                            or fields\n"
@@ -2668,7 +2737,7 @@ msgstr ""
 "      --complement        bổ sung tập hợp các byte, ký tự hoặc trư�ng đã "
 "ch�n\n"
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
@@ -2679,7 +2748,7 @@ msgstr ""
 "                            kết quả in ra. Mặc định là ký tự phân cách đầu "
 "vào.\n"
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2692,7 +2761,7 @@ msgstr ""
 "bằng dấu phẩy. �ầu vào đã ch�n được ghi theo cùng một thứ tự\n"
 "với việc đ�c; nó được ghi chỉ một lần.\n"
 
-#: src/cut.c:227
+#: src/cut.c:210
 msgid ""
 "Each range is one of:\n"
 "\n"
@@ -2712,47 +2781,50 @@ msgstr ""
 "\n"
 "Khi không có TẬP_TIN, hoặc khi TẬP_TIN là “-�, đ�c đầu vào tiêu chuẩn.\n"
 
-#: src/cut.c:367 src/cut.c:493
-#, fuzzy
+#: src/cut.c:300 src/cut.c:394
 msgid "invalid byte, character or field list"
-msgstr "sai danh sách byte hoặc trư�ng"
+msgstr "sai byte, ký tự hoặc danh sách trư�ng"
 
-#: src/cut.c:387
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr "các trư�ng và vị trí đ�u đánh số từ 1"
+
+#: src/cut.c:320
 msgid "invalid range with no endpoint: -"
 msgstr "phạm vi sai không có điểm cuối: -"
 
-#: src/cut.c:403
+#: src/cut.c:334
 msgid "invalid decreasing range"
 msgstr "phạm vi giảm dần sai"
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, c-format
 msgid "byte offset %s is too large"
 msgstr "offset theo byte %s là quá lớn"
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, c-format
 msgid "field number %s is too large"
 msgstr "số trư�ng %s là quá lớn"
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr "chỉ có thể đưa ra một dạng danh sách"
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr "dấu phân cách phải là một ký tự đơn"
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr "cần chỉ ra danh sách các byte, ký tự, hoặc trư�ng"
 
-#: src/cut.c:850
+#: src/cut.c:790
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr "chỉ đưa ra dấu phân cách dữ liệu vào khi thực hiện với trư�ng"
 
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
@@ -2760,11 +2832,11 @@ msgstr ""
 "b� đi các dòng không phân cách chỉ có tác dụng\n"
 "\tkhi thực hiện với trư�ng"
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr "thiếu danh sách các trư�ng"
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr "thiếu danh sách các vị trí"
 
@@ -2783,9 +2855,10 @@ msgstr ""
 #: src/date.c:128
 msgid "Display the current time in the given FORMAT, or set the system date.\n"
 msgstr ""
+"Hiển thị th�i gian hiện tại ở �ỊNH-DẠNG đã cho, hoặc đặt ngày tháng cho hệ "
+"thống.\n"
 
 #: src/date.c:134
-#, fuzzy
 msgid ""
 "  -d, --date=STRING         display time described by STRING, not 'now'\n"
 "  -f, --file=DATEFILE       like --date once for each line of DATEFILE\n"
@@ -2794,9 +2867,6 @@ msgid ""
 "                            'hours', 'minutes', 'seconds', or 'ns' for date\n"
 "                            and time to the indicated precision.\n"
 msgstr ""
-"Hiển thị th�i gian hiện th�i trong �ỊNH_DẠNG đưa ra, hoặc đặt ngày của hệ "
-"thống.\n"
-"\n"
 "  -d, --date=STRING         hiển thị th�i gian theo STRING, không phải "
 "“now�\n"
 "  -f, --file=DATEFILE       giống --date một lần cho mỗi dòng của DATEFILE\n"
@@ -2804,7 +2874,7 @@ msgstr ""
 "                            TIMESPEC=“date� chỉ cho ngày (mặc định),\n"
 "                            “hours�, “minutes�, “seconds�, hoặc “ns� cho "
 "ngày và\n"
-"                            th�i gian với độ chính xác đã chỉ.\n"
+"                            th�i gian với độ chính xác đã cho.\n"
 
 #: src/date.c:142
 msgid ""
@@ -2824,16 +2894,17 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 "       --rfc-3339=�ẶC_TẢ_GIỜ  đưa ra ngày và gi� dạng tương thích RFC 3339.\n"
-"                              �ẶC_TẢ_GIỜ xác định độ chính xác �date�\n"
-"                              (ngày tháng), �seconds� (giây) hoặc �ns�\n"
-"                              (nanô-giây).\n"
-"                              Các thành phần ngày và gi� định giới bằng một\n"
-"                              dấu cách đơn: 2006-08-07 12:34:56-06:00\n"
+"                            �ẶC_TẢ_GIỜ xác định độ chính xác “date�\n"
+"                            (ngày tháng), “seconds� (giây) hoặc “ns�\n"
+"                            (nanô-giây).\n"
+"                            Các thành phần ngày và gi� ngăn cách nhau bằng "
+"má»™t\n"
+"                            dấu cách đơn: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=CHUỖI           đặt th�i gian theo mẫu của CHUỖI\n"
-"  -u, --utc, --universal    in ra hay đặt Th�i gian Quốc tế\n"
+"  -u, --utc, --universal    in ra hay đặt Th�i gian Quốc tế (UTC)\n"
 
 #: src/date.c:158
 msgid ""
@@ -2859,7 +2930,7 @@ msgstr ""
 "  %A   tên đầy đủ của ngày trong tuần của mi�n địa phương (Thứ hai..Chủ "
 "nhật)\n"
 "  %b   tên ngắn g�n của các tháng của mi�n địa phương (Thg 1..Thg 12)\n"
-"  %B   tên đầy đủ của các tháng của mi�n địa phương (Tháng một..Tháng mư�i "
+"  %B   tên đầy đủ của các tháng của mi�n địa phương (Tháng giêng..Tháng mư�i "
 "hai)\n"
 "  %c   th�i gian và ngày của mi�n địa phương (v.d. 14:36:33 MSD Thứ ba  26 "
 "Thg 4 2005)\n"
@@ -3043,10 +3114,10 @@ msgstr ""
 "Hiện th�i gian địa phương lúc 9AM ngày thứ 6 sắp tới ở b� Tây nước Mỹ\n"
 "  $ date --date=\"TZ=\"America/Los_Angeles\" 09:00 next Fri�\n"
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr "đầu vào chuẩn"
@@ -3087,7 +3158,7 @@ msgstr ""
 msgid "cannot set date"
 msgstr "không đặt được ngày"
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, c-format
 msgid "time %s is out of range"
 msgstr "th�i gian %s vượt ra ngoài giới hạn"
@@ -3098,7 +3169,7 @@ msgstr "th�i gian %s vượt ra ngoài giới hạn"
 msgid "Paul Rubin"
 msgstr "Paul Rubin"
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
@@ -3107,7 +3178,7 @@ msgstr ""
 "Cách dùng: %s [TO�N_HẠNG]...\n"
 "     hoặc: %s TÙY_CHỌN\n"
 
-#: src/dd.c:526
+#: src/dd.c:532
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
 "\n"
@@ -3126,7 +3197,7 @@ msgstr ""
 "  count=S�        chỉ sao chép S� khối đầu vào\n"
 "  ibs=BYTES       đ�c BYTES byte mỗi lần (mặc định: 512)\n"
 
-#: src/dd.c:535
+#: src/dd.c:541
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
 "  iflag=FLAGS     read as per the comma separated symbol list\n"
@@ -3146,9 +3217,9 @@ msgstr ""
 "  seek=KH�I       b� qua KH�I khối với kích thước obs ở đầu đầu ra\n"
 "  skip=KH�I       b� qua KH�I khối với kích thước ibs ở đầu đầu vào\n"
 "  status=C�I-GÌ   C�I-GÌ sẽ được chặn lại khi kết xuất ra đầu ra lỗi;\n"
-"                  `noxfer' b� đi thông kê truy�n tải, `none' chặn tất cả\n"
+"                  “noxfer� b� đi thông kê truy�n tải, “none� chặn tất cả\n"
 
-#: src/dd.c:546
+#: src/dd.c:552
 msgid ""
 "\n"
 "N and BYTES may be followed by the following multiplicative suffixes:\n"
@@ -3175,7 +3246,7 @@ msgstr ""
 "Mỗi ký hiệu CONV có thể là:\n"
 "\n"
 
-#: src/dd.c:555
+#: src/dd.c:561
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
 "  ebcdic    from ASCII to EBCDIC\n"
@@ -3203,7 +3274,7 @@ msgstr ""
 "             sử dụng với block hoặc unblock, thêm bằng khoảng trắng thay vì "
 "NUL\n"
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -3219,7 +3290,7 @@ msgstr ""
 "  fdatasync ghi vật lý dữ liệu tập tin kết quả lên đĩa trước khi thoát\n"
 "  fsync     như trên, nhưng đồng th�i ghi cả siêu dữ liệu\n"
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -3233,75 +3304,75 @@ msgstr ""
 "  append    chế độ nối thêm\n"
 "              (chỉ có ích cho đầu ra; cũng đ� nghị “conv=notrunc�)\n"
 
-#: src/dd.c:583
+#: src/dd.c:589
 msgid "  cio       use concurrent I/O for data\n"
 msgstr "  cio       dùng I/O đồng quy cho dữ liệu\n"
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr "  direct    sử dụng I/O trực tiếp cho dữ liệu\n"
 
-#: src/dd.c:587
+#: src/dd.c:593
 msgid "  directory  fail unless a directory\n"
 msgstr "  directory   không thành công nếu không phải thư mục\n"
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr "  dsync     dùng I/O đã đồng bộ cho dữ liệu\n"
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr "  sync      như trên, nhưng đồng th�i cho cả siêu dữ liệu\n"
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
-msgstr "  fullblock  tích luỹ các khối đầy đủ dữ liệu nhập vào (chỉ iflag)\n"
+msgstr "  fullblock  tích luỹ các khối đầy đủ dữ liệu đầu vào (chỉ iflag)\n"
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr "  nonblock  sử dụng I/O không đặt khối\n"
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr "  noatime   không cập nhật gi� truy cập\n"
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr "  nochace   b� qua dữ liệu tạm lưu\n"
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr "  noctty    không ấn định thiết bị cuối đi�u khiển từ tập tin\n"
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr "  nofollow  không đi theo liên kết m�m\n"
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr "  nolinks   lỗi nếu có nhi�u liên kết\n"
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr "  binary    sử dụng I/O nhị phân cho dữ liệu\n"
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr "  text      sử dụng I/O văn bản cho dữ liệu\n"
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
-msgstr "  count_bytes  coi �count=N� như là số lượng byte (chỉ với c� iflag)\n"
+msgstr "  count_bytes  coi “count=N� như là số lượng byte (chỉ với c� iflag)\n"
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
-msgstr "  skip_bytes  coi treat �skip=N� là số lượng byte (chỉ c� ilag)\n"
+msgstr "  skip_bytes  coi treat “skip=N� là số lượng byte (chỉ c� ilag)\n"
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
-msgstr "  seek_bytes  coi �seek=N� là số lượng byte (chỉ c� oflag)\n"
+msgstr "  seek_bytes  coi “seek=N� là số lượng byte (chỉ c� oflag)\n"
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, c-format
 msgid ""
 "\n"
@@ -3323,35 +3394,45 @@ msgstr ""
 "\n"
 "  $ dd if=/dev/zero of=/dev/null& pid=$!\n"
 "  $ kill -%s $pid; sleep 1; kill $pid\n"
-"  18335302+0 mục ghi vào\n"
-"  18335302+0 mục ghi ra\n"
-"  9387674624 byte (9.4 GB) đã sao chép, 34.6279 giây, 271 MB/giây\n"
+"  đ�c vào 18335302+0\n"
+"  ghi ra 18335302+0\n"
+"  đã sao chép 9387674624 byte (9.4 GB), 34.6279 giây, 271 MB/giây\n"
 "\n"
 "Tùy ch�n:\n"
 "\n"
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr "thiếu bộ nhớ vì vùng nhớ đệm đầu vào có cỡ %zu byte (%s)"
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr "thiếu bộ nhớ vì vùng nhớ đệm ra có cỡ %zu byte (%s)"
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
 "%<PRIuMAX>+%<PRIuMAX> records out\n"
 msgstr ""
-"%<PRIuMAX>+%<PRIuMAX> mục ghi vào\n"
-"%<PRIuMAX>+%<PRIuMAX> mục ghi ra\n"
+"đ�c vào %<PRIuMAX>+%<PRIuMAX>\n"
+"ghi ra %<PRIuMAX>+%<PRIuMAX>\n"
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
 msgstr[0] "%<PRIuMAX> mục ghi bị cắt ngắn\n"
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
-msgstr[0] "%<PRIuMAX> byte (%s) đã sao chép"
+msgstr[0] "đã chép %<PRIuMAX> byte (%s)"
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr "B vô cùng"
 
@@ -3365,83 +3446,83 @@ msgstr "B vô cùng"
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
 msgstr ", %g s, %s/s\n"
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, c-format
 msgid "closing input file %s"
 msgstr "đóng tập tin vào %s"
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr "đóng tập tin ra %s"
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr "gặp lỗi khi tắt O_DIRECT: %s"
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, c-format
 msgid "writing to %s"
 msgstr "đang ghi vào %s"
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, c-format
 msgid "unrecognized operand %s"
 msgstr "toán hạng không nhận ra %s"
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 msgid "invalid conversion"
 msgstr "sai chuyển đổi"
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 msgid "invalid input flag"
 msgstr "c� đầu vào không hợp lệ"
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 msgid "invalid output flag"
 msgstr "c� đầu ra không hợp lệ"
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 msgid "invalid status flag"
 msgstr "c� trạng thái không hợp lệ"
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, c-format
 msgid "invalid number %s"
 msgstr "số không hợp lệ %s"
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr "không thể kết hợp hai trong số {ascii,ebcdic,ibm}"
 
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, c-format
 msgid "cannot combine block and unblock"
 msgstr "không thể kết hợp block và unblock"
 
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, c-format
 msgid "cannot combine lcase and ucase"
 msgstr "không thể kết hợp lcase (chữ thư�ng) và ucase (chữ HOA)"
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, c-format
 msgid "cannot combine excl and nocreat"
 msgstr "không thể kết hợp excl và nocreat"
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, c-format
 msgid "cannot combine direct and nocache"
 msgstr "không thể kết hợp direct và nocache"
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
@@ -3450,72 +3531,62 @@ msgstr ""
 "cảnh báo: đang gỡ rối lỗi nhân lseek cho tập tin (%s)\n"
 "  có mt_type=0x%0lx -- xem <sys/mtio.h> để biết danh sách các kiểu"
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, c-format
 msgid "%s: cannot skip"
 msgstr "%s: không thể b� qua"
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, c-format
 msgid "%s: cannot seek"
 msgstr "%s: không thể di chuyển vị trí đ�c"
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr "offset bị tràn khi đ�c tập tin %s"
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr "cảnh báo: offset tập tin không hợp lệ sau lỗi đ�c"
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr "vậy không làm việc được với lỗi của nhân"
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, c-format
 msgid "setting flags for %s"
-msgstr "đang thiết lập c� cho %s"
+msgstr "đang cài đặt c� cho %s"
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr "thiếu bộ nhớ vì vùng nhớ đệm đầu vào có cỡ %zu byte (%s)"
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr "thiếu bộ nhớ vì vùng nhớ đệm ra có cỡ %zu byte (%s)"
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr "%s: không thể nhảy đến tới offset đưa ra"
 
-#: src/dd.c:2133
-#, fuzzy, c-format
+#: src/dd.c:2172
+#, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
-msgstr "gặp lỗi khi cắt ngắn ở %<PRIuMAX> byte trong tập tin kết quả %s"
+msgstr "gặp lỗi khi cắt ngắn ở %<PRIdMAX> byte trong tập tin kết xuất %s"
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr "fdatasync bị lỗi cho %s"
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
 msgstr "fsync bị lỗi cho %s"
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, c-format
 msgid "failed to open %s"
 msgstr "gặp lỗi khi mở %s"
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
@@ -3524,125 +3595,133 @@ msgstr ""
 "độ lệch quá lớn: không thể cắt ngắn thành chi�u dài seek=%<PRIuMAX> (%lu-"
 "byte) khối"
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr "gặp lỗi khi cắt ngắn ở %<PRIuMAX> byte trong tập tin kết quả %s"
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, c-format
 msgid "failed to discard cache for: %s"
 msgstr "không thể b� qua cache: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr "Paul Eggert"
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr "Hệ thống tập tin"
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr "Kiểu"
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr "khối"
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr "Dùng"
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr "Còn"
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr "%Dùng"
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr "Inode"
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr "IDùng"
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr "ITrống"
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr "%IDùng"
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr "Gắn vào"
 
-#: src/df.c:383
+#: src/df.c:207
+msgid "File"
+msgstr "Tập tin"
+
+#: src/df.c:387
 #, c-format
-msgid "option --output: field '%s' unknown"
-msgstr ""
+msgid "option --output: field %s unknown"
+msgstr "tùy ch�n --output: không hiểu trư�ng “%s�"
 
-#: src/df.c:390
-#, fuzzy, c-format
-msgid "option --output: field '%s' used more than once"
-msgstr "cảnh báo: tập tin nguồn %s được chỉ ra nhi�u hơn một lần"
+#: src/df.c:394
+#, c-format
+msgid "option --output: field %s used more than once"
+msgstr "tùy ch�n --output: trư�ng “%s� được dùng nhi�u hơn một lần"
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr "Cỡ"
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr "Còn"
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr "Dung lượng"
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
 msgstr "%2$s-%1$s"
 
-#: src/df.c:1210
-#, fuzzy
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr "không thể truy cập %s: over-mounted bởi thiết bị khác"
+
+#: src/df.c:1384
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
 "or all file systems by default.\n"
 msgstr ""
-"Hiển thị thông tin v� hệ thống tập tin chứa mỗi TẬP_TIN,\n"
+"Hiển thị thông tin v� hệ thống tập tin nơi mà TẬP_TIN cư ngụ,\n"
 "hoặc tất cả các tập tin theo mặc định.\n"
-"\n"
 
-#: src/df.c:1217
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
 "  -a, --all             gồm cả những hệ thống tập tin giả\n"
-"  -B, --block-size=CỠ   dùng khối kích CỠ trước khi in. Ví dụ: \n"
-"                          “-BM� sẽ in cỡ của đơn vị theo 1,048,576 bytes.\n"
-"                          Xem định dạng CỠ dưới đây.\n"
-"      --total           xuất một tổng số tổng quát\n"
-"  -h, --human-readable  hiện kích cỡ ở dạng dễ đ�c (v.d. 1K 234M 2G)\n"
-"  -H, --si              như trên, nhưng dùng số mũ 1000 thay cho 1024\n"
+"  -B, --block-size=CỠ   biến đổi cỡ theo CỠ trước khi in. Ví dụ: \n"
+"                          “-BM� sẽ in cỡ của đơn vị theo 1,048,576 bytes;\n"
+"                          xem định dạng CỠ ở phía dưới.\n"
+"      --total           xuất một tổng số tổng hợp cả đĩa\n"
+"  -h, --human-readable  hiển thị kích cỡ theo dạng mũ 1024 (v.d. 1023M)\n"
+"  -H, --si              hiển thị kích cỡ theo dạng mũ 1000 (v.d. 1.1G)\n"
 
-#: src/df.c:1227
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -3656,8 +3735,7 @@ msgstr ""
 "      --no-sync         không g�i sync trước khi lấy thông tin sử dụng (mặc "
 "định)\n"
 
-#: src/df.c:1234
-#, fuzzy
+#: src/df.c:1409
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
 "                               or print all fields if FIELD_LIST is "
@@ -3669,48 +3747,51 @@ msgid ""
 "  -x, --exclude-type=TYPE   limit listing to file systems not of type TYPE\n"
 "  -v                    (ignored)\n"
 msgstr ""
+"      --output[=D.S�CH_TRƯỜNG] dùng định dạng kết xuất được định nghĩa bởi D."
+"S�CH_TRƯỜNG,\n"
+"                          hay hiển thị tất cả các trư�ng nếu D.S�CH_TRƯỜNG "
+"để trống.\n"
 "  -P, --portability     sử dụng định dạng kết quả POSIX\n"
 "      --sync            g�i sync trước khi lấy thông tin\n"
 "  -t, --type=KIỂU       chỉ liệt kê các hệ thống tập tin KIỂU\n"
 "  -T, --print-type      in ra kiểu hệ thống tập tin\n"
-"  -x, --exclude-type=KIỂU  chỉ liệt kê các hệ thống tập tin không phải KIỂU\n"
+"  -x, --exclude-type=KIỂU  giới hạn liệt kê các hệ thống tập tin không phải "
+"KIỂU\n"
 "  -v                    (bị b� qua)\n"
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
+"\n"
+"D.S�CH_TRƯỜNG là danh sách các trư�ng được ngăn cách nhau bởi dấu phẩy các "
+"cột được bao gồm.\n"
+"Các tên trư�ng hợp lệ là: “source�, “fstype�, “itotal�, “iused�, “iavail�, "
+"“ipcent�,\n"
+"“size�, “used�, “avail�, “pcent�, “file� và “target� (xem trang info).\n"
 
-#: src/df.c:1285
-#, fuzzy, c-format
+#: src/df.c:1460
+#, c-format
 msgid "options %s and %s are mutually exclusive"
-msgstr "hai tùy ch�n “--compare� (-C) và “--strip� loại từ lẫn nhau"
-
-#: src/df.c:1335
-msgid "warning: "
-msgstr "cảnh báo: "
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr "tùy ch�n dài �--megabytes� đã lỗi th�i và sẽ sớm bị loại b�"
+msgstr "hai tùy ch�n “%s� và “%s� loại từ lẫn nhau"
 
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr "dạng hệ thống tập tin %s đã được cả ch�n và loại b�"
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr "Cảnh báo: "
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 msgid "cannot read table of mounted file systems"
 msgstr "không đ�c được bảng các hệ thống tập tin đã gắn"
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr "không có hệ thống tập tin được xử lý"
@@ -3720,7 +3801,7 @@ msgstr "không có hệ thống tập tin được xử lý"
 msgid "H. Peter Anvin"
 msgstr "H. Peter Anvin"
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr "Cách dùng: %s [TÙY_CHỌN]... [TẬP_TIN]\n"
@@ -3738,7 +3819,7 @@ msgstr ""
 "\n"
 "Nhận ra định dạng kết quả:\n"
 "  -b, --sh, --bourne-shell    đưa ra mã Bourne shell đặt LS_COLORS\n"
-"  -c, --csh, --c-shell        đưa ra mã C shell đặt LS_COLORS\n"
+"  -c, --csh, --c-shell            đưa ra mã C shell đặt LS_COLORS\n"
 "  -p, --print-database        xuất các giá trị mặc định\n"
 
 #: src/dircolors.c:108
@@ -3805,9 +3886,8 @@ msgstr ""
 "\n"
 
 #: src/dirname.c:59
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
-msgstr ""
-"  -0, --null     ngắt dòng bằng NUL thay vì kí tự xuống dòng ở đầu ra\n"
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
+msgstr "  -z, --zero     kết thúc dòng bằng NUL thay vì kí tự dòng mới\n"
 
 #: src/dirname.c:64
 #, c-format
@@ -3824,7 +3904,7 @@ msgstr ""
 "  %s dir1/str dir2/str  -> “dir1� theo sau bởi “dir2�\n"
 "  %s stdio.h            -> “.�.\n"
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -3833,18 +3913,15 @@ msgstr ""
 "Cách dùng: %s [TÙY_CHỌN]... [TẬP_TIN]...\n"
 "     hoặc: %s [TÙY_CHỌN]... --files0-from=F\n"
 
-#: src/du.c:274
-#, fuzzy
+#: src/du.c:285
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr ""
-"Tính tổng không gian đĩa mỗi TẬP_TIN sử dụng, đệ quy cho các thư mục.\n"
-"\n"
+"Tính tổng không gian đĩa cho từng TẬP_TIN sử dụng, một cách đệ quy trong thư "
+"mục.\n"
 
-#: src/du.c:280
-#, fuzzy
+#: src/du.c:291
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3852,20 +3929,22 @@ msgid ""
 "                          larger due to holes in ('sparse') files, internal\n"
 "                          fragmentation, indirect blocks, and the like\n"
 msgstr ""
-"  -a, --all             ghi số đếm cho m�i tập tin, không chỉ thư mục\n"
+"  -0, --null            kết thúc từng dòng kết xuất bằng NUL thay vì dòng "
+"má»›i\n"
+"  -a, --all             ghi tổng số lượng cho m�i tập tin, không chỉ thư "
+"mục\n"
 "      --apparent-size   in ra kích cỡ hiển thị, thay cho sử dụng đĩa; mặc "
 "dù\n"
 "                          kích cỡ hiển thị thư�ng nh� hơn, đôi khi nó\n"
-"                          lớn hơn do các lỗ hổng trong tập tin (�sparse�),\n"
+"                          lớn hơn do các lỗ hổng trong tập tin (“sparse�),\n"
 "                          sự phân mảnh, khối gián tiếp, và những thứ tương "
 "tá»±\n"
 
-#: src/du.c:289
-#, fuzzy
+#: src/du.c:300
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3876,33 +3955,38 @@ msgid ""
 "                          line argument;  --max-depth=0 is the same as\n"
 "                          --summarize\n"
 msgstr ""
-"  -B, --block-size=SIZE   làm cỡ to hơn SIZE lần trước khi in. Ví dụ: \n"
-"                           �-BM� sẽ in đơn vị dạng 1,048,576 bytes.\n"
-"                          Xem định dạng SIZE dưới đây.\n"
+"  -B, --block-size=CỠ   làm cỡ to hơn SIZE lần trước khi in. Ví dụ: \n"
+"                           “-BM� sẽ in đơn vị dạng 1,048,576 bytes;\n"
+"                           xem định dạng CỠ ở phía dưới đây.\n"
 "  -b, --bytes           tương đương “--apparent-size --block-size=1�\n"
-"  -c, --total           đưa ra một tổng tổng quát\n"
+"  -c, --total           đưa ra một báo cáo tổng cộng\n"
 "  -D, --dereference-args  không theo liên kết m�m được \n"
 "                          liệt kê trên dòng lệnh\n"
+"  -d, --max-depth=N     chỉ hiển thị toàn bộ thư mục (hoặc tập tin, khi có --"
+"all)\n"
+"                          nếu nó là N hay ít hơn mức theo sau tham số\n"
+"                          dòng lệnh;  --max-depth=0 tương đương với\n"
+"                          --summarize\n"
 
-#: src/du.c:302
-#, fuzzy
+#: src/du.c:313
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
-"      --files0-from=F   tính tổng sử dụng đĩa của các tập tin có tên dừng "
-"bởi\n"
-"                          NUL chỉ ra trong tập tin F\n"
+"      --files0-from=F   tính tổng sử dụng đĩa của các tập tin có tên\n"
+"                          kết thúc bằng NUL chỉ ra trong tập tin F\n"
+"                          nếu F là - thì sẽ đ�c các tên từ đầu vào tiêu "
+"chuẩn\n"
 "  -H                    tương đương với “--dereference-args (-D)�\n"
 "  -h, --human-readable  in kích cỡ với định dạng dễ đ�c (v.d. 1K 234M 2G)\n"
-"      --si              giống “-h�, nhưng dùng 1000 lũy thừa thay cho 1024\n"
+"      --inodes          liệt kê thông tin theo inode thay cho khối\n"
 
-#: src/du.c:310
-#, fuzzy
+#: src/du.c:322
 msgid ""
 "  -k                    like --block-size=1K\n"
 "  -L, --dereference     dereference all symbolic links\n"
@@ -3910,27 +3994,25 @@ msgid ""
 "  -m                    like --block-size=1M\n"
 msgstr ""
 "  -k                    giống “--block-size=1K�\n"
+"  -L, --dereference     không theo liên kết m�m\n"
 "  -l, --count-links     tính kích cỡ rất nhi�u lần nếu có liên kết cứng\n"
 "  -m                    giống “--block-size=1M�\n"
 
-#: src/du.c:316
-#, fuzzy
+#: src/du.c:328
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
-"  -L, --dereference     không liên kết m�i liên kết m�m\n"
 "  -P, --no-dereference  không đi theo liên kết m�m nào (đây là mặc định)\n"
-"  -0, --null            kết thúc mỗi dòng kết quả bằng 0 byte thay cho dòng "
-"má»›i\n"
-"  -S, --separate-dirs   không thêm kích cơ của thư mục con\n"
+"  -S, --separate-dirs   với thư mục thì không thêm kích cỡ của thư mục con\n"
+"      --si              giống -h, nhưng theo số mũ 1000 chứ không phải 1024\n"
 "  -s, --summarize       chỉ hiển thị tổng số cho mỗi đối số\n"
 
-#: src/du.c:322
-#, fuzzy
+#: src/du.c:334
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
 "                          or entries greater than SIZE if negative\n"
@@ -3939,14 +4021,14 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
-msgstr ""
-"      --time            hiển thị gi� sửa đổi cuối cùng của bất cứ tập tin "
-"nào\n"
-"                          trong thư mục, hoặc của bất cứ thư mục con nào của "
-"nó\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
+msgstr ""
+"  -t, --threshold=CỠ    loại trừ các mục nh� hơn CỠ nếu dương,\n"
+"                          hoặc lớn hơn CỠ nếu âm\n"
+"      --time            hiển thị gi� sửa đổi cuối cùng của m�i tập tin\n"
+"                          trong thư mục, hoặc m�i thư mục con của nó\n"
 "      --time=TỪ         hiển thị gi� theo TỪ thay cho gi� sửa đổi:\n"
 "                                * atime      gi� truy cập\n"
 "                                * access     gi� truy cập\n"
@@ -3960,73 +4042,78 @@ msgstr ""
 "                                * +�ỊNH_DẠNG\n"
 "                              �ỊNH_DẠNG dùng như của lệnh “date�\n"
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
 "  -x, --one-file-system    skip directories on different file systems\n"
 msgstr ""
+"  -X, --exclude-from=TẬP-TIN  loại trừ các tập tin khớp mẫu bất kỳ trong TẬP-"
+"TIN\n"
+"      --exclude=MẪU        loại trừ các tập tin khớp MẪU\n"
+"  -x, --one-file-system    b� qua các thư mục trên hệ thống tập tin khác\n"
 
-#: src/du.c:386
+#: src/du.c:398
 msgid "Infinity"
 msgstr "Vô hạn"
 
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr "điểm gắn `%s' đã sẵn được đảo ngược"
-
-#: src/du.c:624
+#: src/du.c:636
 #, c-format
 msgid "fts_read failed: %s"
 msgstr "fts_read gặp lỗi: %s"
 
-#: src/du.c:780
+#: src/du.c:787
 #, c-format
 msgid "invalid maximum depth %s"
 msgstr "độ sâu tối đa “%s� không hợp lệ"
 
-#: src/du.c:809
-#, fuzzy, c-format
+#: src/du.c:816
+#, c-format
 msgid "invalid --threshold argument '-0'"
-msgstr "sai đối số “--%s� %s"
+msgstr "tham số --threshold không hợp lệ “-0�"
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr "không thể đồng th�i tóm tắt, và hiển thị m�i mục"
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr "cảnh báo: tóm tắt là giống với sử dụng “--max-depth=0�"
 
-#: src/du.c:900
+#: src/du.c:911
 #, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr "cảnh báo: tóm tắt xung đột với “--max-depth=%lu�"
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+"cảnh báo: tùy ch�n --apparent-size và -b không có tác dụng gì với --inodes"
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 msgid "file operands cannot be combined with --files0-from"
 msgstr "toán hạng tập tin không thể kết hợp với “--file0-from�"
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr "%s: lỗi đ�c"
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr ""
 "đ�c các tên tập tin từ đầu vào tiêu chuẩn thì không cho phép tên tập tin %s"
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 msgid "invalid zero-length file name"
 msgstr "sai tên tập tin chi�u dài bằng không"
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr "tổng"
 
@@ -4129,19 +4216,16 @@ msgstr "Cách dùng: %s [TÙY_CHỌN]... [-] [TÊN=GIÃ�_TRỊ]... [LỆNH [Ä�.Sá
 
 #: src/env.c:55
 msgid "Set each NAME to VALUE in the environment and run COMMAND.\n"
-msgstr ""
+msgstr "�ặt từng TÊN thành GI�-TRỊ trong biến môi trư�ng và chạy LỆNH.\n"
 
 #: src/env.c:61
-#, fuzzy
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
-"�ặt mỗi TÊN thành GI�_TRỊ trong môi trư�ng và chạy câu LỆNH.\n"
-"\n"
 "  -i, --ignore-environment   bắt đầu với một môi trư�ng rỗng\n"
-"  -0, --null           kết thúc mỗi dòng kết xuất bằng 0 byte thay cho ký tự "
+"  -0, --null           kết thúc mỗi dòng kết xuất bằng NUL thay cho ký tự "
 "dòng mới\n"
 "  -u, --unset=TÊN      xóa biến TÊN kh�i môi trư�ng\n"
 
@@ -4170,15 +4254,13 @@ msgid "cannot specify --null (-0) with command"
 msgstr "không thể xác định --null (0) với câu lệnh"
 
 #: src/expand.c:107
-#, fuzzy
 msgid ""
 "Convert tabs in each FILE to spaces, writing to standard output.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
 "Chuyển đổi tab trong mỗi TẬP_TIN thành khoảng trắng, ghi ra đầu ra tiêu "
 "chuẩn.\n"
-"Khi không có TẬP_TIN, hoặc khi TẬP_TIN là “-�, đ�c đầu vào tiêu chuẩn.\n"
-"\n"
+"Khi không có TẬP_TIN, hoặc khi TẬP_TIN là “-�, đ�c đầu từ vào tiêu chuẩn.\n"
 
 #: src/expand.c:114
 msgid ""
@@ -4218,19 +4300,19 @@ msgstr "kích cỡ tab phải tăng dần"
 #: src/expand.c:325 src/expand.c:344 src/unexpand.c:373 src/unexpand.c:418
 #, c-format
 msgid "input line is too long"
-msgstr "dòng nhập vào quá dài"
+msgstr "dòng đầu vào quá dài"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr "Mike Parker"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr "James Youngman"
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
@@ -4239,7 +4321,7 @@ msgstr ""
 "Cách dùng: %s BIỂU_THỨC\n"
 "     hoặc: %s TÙY_CHỌN\n"
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -4259,7 +4341,7 @@ msgstr ""
 "  �.S�1 & �.S�2     �.S�1 nếu mỗi đối số không phải rỗng hay 0, ngược lại "
 "thì 0\n"
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -4277,7 +4359,7 @@ msgstr ""
 "  �.S�1 >= �.S�2    �.S�1 lớn hơn hoặc bằng �.S�2\n"
 "  �.S�1 > �.S�2     �.S�1 lớn hơn �.S�2\n"
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
@@ -4287,7 +4369,7 @@ msgstr ""
 "  �.S�1 + �.S�2     tổng số h�c của �.S�1 và �.S�2\n"
 "  �.S�1 - �.S�2     hiệu số h�c của �.S�1 và �.S�2\n"
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -4300,7 +4382,7 @@ msgstr ""
 "  �.S�1 / �.S�2     thương số h�c của �.S�1 chia cho �.S�2\n"
 "  �.S�1 % �.S�2     phần dư khi �.S�1 chia cho �.S�2\n"
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -4319,7 +4401,7 @@ msgstr ""
 "0\n"
 "  length CHUỖI               chi�u dài CHUỖI\n"
 
-#: src/expr.c:251
+#: src/expr.c:250
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
 "                               keyword like 'match' or an operator like '/'\n"
@@ -4333,7 +4415,7 @@ msgstr ""
 "\n"
 "  ( BIỂU_THỨC )              giá trị của BIỂU_THỨC\n"
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -4351,7 +4433,7 @@ msgstr ""
 "Khớp mẫu sẽ trả lại chuỗi tương ứng giữa “\\(� và “\\)� hoặc rỗng.\n"
 "Nếu không dùng “\\(� và “\\)�, chúng sẽ trả lại số ký tự tương ứng hoặc 0.\n"
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -4365,32 +4447,32 @@ msgstr ""
 " * 2 nếu BIỂU_THỨC sai cú pháp\n"
 " * 3 nếu gặp lỗi.\n"
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, c-format
 msgid "syntax error"
 msgstr "lỗi cú pháp"
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, c-format
 msgid "error in regular expression matcher"
 msgstr "lỗi trong hàm khớp biểu thức chính quy"
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, c-format
 msgid "non-integer argument"
 msgstr "đối số không phải số nguyên"
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr "chia cho không"
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr "đặt “LC_ALL=�C�� để tránh vấn đ�"
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, c-format
 msgid "the strings compared were %s and %s"
 msgstr "đã so sánh hai chuỗi %s và %s"
@@ -4400,27 +4482,27 @@ msgstr "đã so sánh hai chuỗi %s và %s"
 msgid "Niels Moller"
 msgstr "Niels Moller"
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
 msgstr "Kiểm tra số nguyên tố Lucas gặp lỗi. �ây là đi�u không nên xảy ra"
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
 msgstr "tràn hàng đợi squfof"
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, c-format
 msgid "%s is not a valid positive integer"
 msgstr "%s không phải là một số nguyên dương hợp lệ"
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr "%s là quá lớn"
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
@@ -4429,7 +4511,7 @@ msgstr ""
 "Cách dùng: %s [S�]...\n"
 "     hoặc: %s TÙY_CHỌN\n"
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
 "are specified on the command line, read them from standard input.\n"
@@ -4465,14 +4547,12 @@ msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n"
 msgstr "Cách dùng: %s [-RỘNG] [TÙY_CHỌN]... [TẬP_TIN]...\n"
 
 #: src/fmt.c:271
-#, fuzzy
 msgid ""
 "Reformat each paragraph in the FILE(s), writing to standard output.\n"
 "The option -WIDTH is an abbreviated form of --width=DIGITS.\n"
 msgstr ""
-"�ịnh dạng lại mỗi đoạn văn trong (các) TẬP_TIN, cũng ghi ra đầu ra tiêu "
-"chuẩn.\n"
-"Tùy ch�n “-RỘNG� viết tắt tùy ch�n “--width=CHỮ_S��.\n"
+"�ịnh dạng lại mỗi đoạn văn trong (các) TẬP_TIN, ghi ra đầu ra tiêu chuẩn.\n"
+"Tùy ch�n “-RỘNG� là dạng viết tắt của tùy ch�n “--width=CHỮ_S��.\n"
 
 #: src/fmt.c:278
 msgid ""
@@ -4517,14 +4597,12 @@ msgid "invalid width: %s"
 msgstr "chi�u rộng sai: %s"
 
 #: src/fold.c:70
-#, fuzzy
 msgid ""
 "Wrap input lines in each FILE (standard input by default), writing to\n"
 "standard output.\n"
 msgstr ""
-"Ngắt dòng đưa vào của mỗi TẬP_TIN (đầu vào tiêu chuẩn theo mặc định),\n"
+"Ngắt dòng cho từng TẬP_TIN (đầu vào tiêu chuẩn theo mặc định),\n"
 "ghi ra đầu ra tiêu chuẩn.\n"
-"\n"
 
 #: src/fold.c:77
 msgid ""
@@ -4542,17 +4620,17 @@ msgid "invalid number of columns: %s"
 msgstr "sai số cột: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr "Padraig Brady"
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, c-format
 msgid "Usage: %s\n"
 msgstr "Cách dùng: %s\n"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
@@ -4561,12 +4639,12 @@ msgstr ""
 "văn lệnh shell.\n"
 "\n"
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, c-format
 msgid "failed to get groups for user %s"
 msgstr "gặp lỗi khi lấy các nhóm cho ngư�i dùng %s"
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, c-format
 msgid "failed to get groups for the current process"
 msgstr "gặp lỗi khi lấy các nhóm cho tiến trình hiện th�i"
@@ -4591,38 +4669,35 @@ msgstr ""
 "TÊN_NGƯỜI_DÙNG, cho tiến trình hiện th�i (mà có thể khác nếu\n"
 "cơ sở dữ liệu nhóm bị thay đổi).\n"
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, c-format
 msgid "cannot get real UID"
 msgstr "không thể lấy UID thực"
 
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, c-format
 msgid "cannot get effective GID"
 msgstr "không thể lấy kết quả GID"
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, c-format
 msgid "cannot get real GID"
 msgstr "không thể lấy GID thực"
 
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, c-format
 msgid "%s: no such user"
 msgstr "%s: không có ngư�i dùng này"
 
 #: src/head.c:109
-#, fuzzy
 msgid ""
 "Print the first 10 lines of each FILE to standard output.\n"
 "With more than one FILE, precede each with a header giving the file name.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
-"In 10 dòng đầu tiên của mỗi TẬP_TIN ra đầu ra tiêu chuẩn.\n"
-"Khi có vài TẬP_TIN, đắt trước mỗi tập tin một phần đầu cho biết tên tập tin "
-"tin.\n"
-"Khi không có TẬP_TIN, hoặc khi TẬP_TIN là “-�, đ�c đầu vào tiêu chuẩn.\n"
-"\n"
+"In 10 dòng đầu tiên của mỗi TẬP_TIN ra đầu ra tiêu chuẩn. Khi có nhi�u\n"
+"hơn một TẬP_TIN, treo thêm trước bằng một phần đầu cho biết tên tập tin.\n"
+"Khi không có TẬP_TIN, hoặc khi TẬP_TIN là “-�, đ�c từ đầu vào tiêu chuẩn.\n"
 
 #: src/head.c:117
 msgid ""
@@ -4660,58 +4735,48 @@ msgstr ""
 "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
 "GB 1000*1000*1000, G 1024*1024*1024, và tương tự với T, P, E, Z, Y.\n"
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr "%s: tập tin đã rút ngắt quá nhi�u"
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, c-format
 msgid "%s: number of bytes is too large"
 msgstr "%s: số byte quá lớn"
 
-#: src/head.c:440
-#, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr "%s: không thể lseek lại vị trí gốc"
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr "%s: không thể tìm tới offset %s"
 
-#: src/head.c:673
+#: src/head.c:423 src/tail.c:457
 #, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "%s: gặp lỗi khi đặt lại con tr� tập tin"
-
-#: src/head.c:798
-#, c-format
-msgid "cannot reposition file pointer for %s"
-msgstr "không thể đặt lại vị trí của cái chỉ tập tin cho %s"
+msgid "%s: cannot seek to relative offset %s"
+msgstr "%s: không thể di chuyển tới offset tương đối %s"
 
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr "%s: %s quá lớn nên không thể đại diện"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr "số dòng"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr "số byte"
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr "sai số dòng"
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr "sai số byte"
 
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, c-format
 msgid "invalid trailing option -- %c"
 msgstr "sai tùy ch�n theo sau “-- %c�"
@@ -4756,40 +4821,49 @@ msgid "cannot determine hostname"
 msgstr "không thể quyết định tên máy"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr "Arnold Robbins"
 
-#: src/id.c:81
+#: src/id.c:84
 #, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
-msgstr "Cách dùng: %s [TÙY_CHỌN]... [TÊN_NGƯỜI_DÙNG]\n"
+msgid "Usage: %s [OPTION]... [USER]\n"
+msgstr "Cách dùng: %s [TÙY_CHỌN]... [NGƯỜI_DÙNG]\n"
 
-#: src/id.c:82
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
 msgstr ""
 "In thông tin v� ngư�i dùng và nhóm đối với TÊN_NGƯỜI_DÙNG đưa ra,\n"
-"hoặc (khi không đưa ra TÊN_NGƯỜI_DÙNG) v� ngư�i dùng hiện th�i.\n"
+"hoặc (khi không đưa ra TÊN_NGƯỜI_DÙNG) v� ngư�i dùng hiện tại.\n"
 "\n"
-"  -a              b� qua để tương thích với các phiên bản khác\n"
-"  -Z, --context   chỉ in ngữ cảnh bảo mật của ngư�i dùng hiện th�i\n"
-"  -g, --group     chỉ in ID của nhóm hoạt động\n"
-"  -G, --groups    in ID của m�i nhóm\n"
-"  -n, --name      in ra tên thay cho số, dùng cho các tùy ch�n “-ugG�\n"
-"  -r, --real      in ra ID thực sự thay cho ID hoạt động, dùng với “-ugG�\n"
-"  -u, --user      chỉ in ra ID hoạt động của ngư�i dùng\n"
 
-#: src/id.c:96
+#: src/id.c:90
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
+msgstr ""
+"  -a             b� qua để tương thích với các phiên bản khác\n"
+"  -Z, --context  chỉ in ngữ cảnh bảo mật của tiến trình\n"
+"  -g, --group    chỉ in mã số của nhóm chịu tác động\n"
+"  -G, --groups   in mã số của m�i nhóm\n"
+"  -n, --name     in ra tên thay cho số, dùng cho các tùy ch�n “-ugG�\n"
+"  -r, --real     in ra mã số thực sự thay cho mã số chịu tác động, dùng với "
+"“-ugG�\n"
+"  -u, --user     chỉ in ra mã số của ngư�i dùng chịu tác động\n"
+"  -z, --zero     ngăn các các mục băng ký tự NUL, không phải khoảng trắng;\n"
+"                   không cho phép ở định dạng mặc định\n"
+
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
@@ -4797,116 +4871,126 @@ msgstr ""
 "\n"
 "Khi không có TÙY_CHỌN, in ra một vài bộ thông tin xác định có ích.\n"
 
-#: src/id.c:140
+#: src/id.c:151
+#, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr "--context chỉ hoạt động với nhân có hỗ trợ SELinux/SMACK"
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr "--context (-Z) chỉ hoạt động với hệ thống hỗ trợ SELinux"
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
-msgstr "không thể in ngữ cảnh bảo mật khi ghi rõ ngư�i dùng"
+msgstr "không thể in ngữ cảnh bảo mật khi đã chỉ định ngư�i dùng"
 
-#: src/id.c:178
+#: src/id.c:198
 #, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr "không thể dùng “only� (chỉ in) nếu có nhi�u lựa ch�n"
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr "không thể chỉ in tên hoặc ID thật ở dạng mặc định"
 
-#: src/id.c:199
+#: src/id.c:209
+#, c-format
+msgid "option --zero not permitted in default format"
+msgstr "không cho phép tùy ch�n --zero ở định dạng mặc định"
+
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
 msgstr "không thể lấy ngữ cảnh tiến trình"
 
-#: src/id.c:224
+#: src/id.c:265
 #, c-format
 msgid "cannot get effective UID"
 msgstr "không thể lấy UID kết quả"
 
-#: src/id.c:311
+#: src/id.c:354
 #, c-format
 msgid "cannot find name for user ID %s"
 msgstr "không tìm thấy tên cho ID %s"
 
-#: src/id.c:329
+#: src/id.c:372
 #, c-format
 msgid "uid=%s"
 msgstr "uid=%s"
 
-#: src/id.c:334
+#: src/id.c:377
 #, c-format
 msgid " gid=%s"
 msgstr " gid=%s"
 
-#: src/id.c:341
+#: src/id.c:384
 #, c-format
 msgid " euid=%s"
 msgstr " euid=%s"
 
-#: src/id.c:349
+#: src/id.c:392
 #, c-format
 msgid " egid=%s"
 msgstr " egid=%s"
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr " nhóm="
 
-#: src/id.c:393
+#: src/id.c:437
 #, c-format
 msgid " context=%s"
 msgstr "ngữ cảnh=%s"
 
-#: src/install.c:373
+#: src/install.c:376
 #, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr "cảnh báo: %s lỗi thay đổi ngữ cảnh thành %s"
 
-#: src/install.c:414
+#: src/install.c:417
 #, c-format
 msgid "creating directory %s"
 msgstr "đang tạo thư mục %s"
 
-#: src/install.c:482
+#: src/install.c:485
 #, c-format
 msgid "cannot change ownership of %s"
 msgstr "không thay đổi được quy�n sở hữu của %s"
 
-#: src/install.c:506
+#: src/install.c:509
 #, c-format
 msgid "cannot set time stamps for %s"
 msgstr "không đặt được nhãn th�i gian cho %s"
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, c-format
 msgid "fork system call failed"
 msgstr "cuộc g�i hệ thống fork (tạo tiến trình con) bị lỗi"
 
-#: src/install.c:531
+#: src/install.c:535
 #, c-format
 msgid "cannot run %s"
 msgstr "không chạy được %s"
 
-#: src/install.c:535
+#: src/install.c:539
 #, c-format
 msgid "waiting for strip"
 msgstr "đang đợi strip"
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr "tiến trình strip đã kết thúc bất thư�ng"
 
-#: src/install.c:558
+#: src/install.c:565
 #, c-format
 msgid "invalid user %s"
 msgstr "sai ngư�i dùng %s"
 
-#: src/install.c:594
+#: src/install.c:601
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -4919,8 +5003,7 @@ msgstr ""
 "     hoặc: %s [TÙY_CHỌN]... -t THƯ_MỤC  NGUỒN...\n"
 "     hoặc: %s [TÙY_CHỌN]... -d THƯ_MỤC...\n"
 
-#: src/install.c:601
-#, fuzzy
+#: src/install.c:608
 msgid ""
 "\n"
 "This install program copies files (often just compiled) into destination\n"
@@ -4935,18 +5018,15 @@ msgid ""
 msgstr ""
 "\n"
 "Chương trình cài đặt này sao chép các tập tin (thư�ng vừa mới biên dịch)\n"
-"vào các vị trí đích được bạn ch�n.\n"
-"Muốn tải v� và cài đặt một gói sẵn sàng dùng vào một hệ thống GNU/Linux\n"
-"thì bạn nên sử dụng một trình quản lý gói phần m�m để thay thế,\n"
-"v.d. yum(1) hay apt-get(1).\n"
-"\n"
-"Theo ba kiểu đầu tiên, sao chép NGUỒN vào ��CH hoặc\n"
-"đồng th�i nhi�u NGUỒN vào THƯ_MỤC đã có,\n"
-"cũng thiết lập các chế độ quy�n hạn và chủ sở hữu/nhóm.\n"
-"Theo kiểu thứ tư, tạo m�i thành phần của (các) THƯ_MỤC đưa ra.\n"
+"vào các vị trí đích được bạn ch�n. Muốn tải v� và cài đặt một gói sẵn có\n"
+"thể dùng vào một hệ thống GNU/Linux thì bạn nên sử dụng một trình quản lý\n"
+"gói phần m�m để thay thế, ví dụ yum(1) hay apt-get(1).\n"
 "\n"
+"Theo ba kiểu đầu tiên, sao chép NGUỒN vào ��CH hoặc đồng th�i nhi�u NGUỒN\n"
+"vào THƯ_MỤC đã có, cũng cài đặt các chế độ quy�n hạn và chủ sở hữu/nhóm.\n"
+"Theo kiểu thứ tư, tạo m�i thành phần của (các) THƯ_MỤC đưa ra.\n"
 
-#: src/install.c:615
+#: src/install.c:622
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
 "  -b                  like --backup but does not accept an argument\n"
@@ -4961,12 +5041,12 @@ msgstr ""
 "  -b                    giống “--backup� nhưng không chấp nhận đối số\n"
 "  -c                    (bị b� qua)\n"
 "  -C, --compare      so sánh mỗi cặp tập tin nguồn và đích,\n"
-"\t\t\t\tvà trong một số trư�ng hợp nào đó\n"
-"\t\t\t\tcũng không sửa đổi đích bằng cách nào cả\n"
-"  -d, --directory       coi m�i đối số là tên thư mục; tạo tất cả các\n"
-"                          thành phần của thư mục chỉ ra\n"
+"                      và trong một số trư�ng hợp nào đó\n"
+"                      cũng không sửa đổi đích bằng cách nào cả\n"
+"  -d, --directory    coi m�i đối số là tên thư mục; tạo tất cả các\n"
+"                      thành phần của thư mục chỉ ra\n"
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -4981,12 +5061,12 @@ msgstr ""
 "cuối,\n"
 "                        sau đó sao chép NGUỒN tới ��CH\n"
 "  -g, --group=NHÓM    đặt quy�n sở hữu nhóm, thay cho nhóm\n"
-"                          của tiến trình hiện th�i\n"
+"                        của tiến trình hiện th�i\n"
 "  -m, --mode=CHẾ_�Ộ   đặt chế độ quy�n hạn (như trong chmod),\n"
-"                          thay cho “rwxr-xr-x�\n"
+"                        thay cho “rwxr-xr-x�\n"
 "  -o, --owner=SỞ_HỮU  đặt quy�n sở hữu (chỉ cho siêu ngư�i dùng)\n"
 
-#: src/install.c:631
+#: src/install.c:638
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
 "files\n"
@@ -5008,64 +5088,64 @@ msgstr ""
 "  -T, --no-target-directory   coi ��CH như một tập tin thông thư�ng\n"
 "  -v, --verbose       in ra tên của mỗi thư mục khi tạo ra nó\n"
 
-#: src/install.c:641
+#: src/install.c:648
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
 "      --preserve-context  bảo tồn ngữ cảnh bảo mật SELinux\n"
-"  -Z, --context=NGỮ_CẢNH  đặt ngữ cảnh bảo mật SELinux\n"
-"                          của các tập tin và thư mục\n"
+"  -Z                      đặt ngữ cảnh an ninh SELinux của các tập tin đích\n"
+"                                thành kiểu mặc định\n"
+"      --context[=NGỮ_CẢNH] giống với -Z, hoặc nếu NGỮ_CẢNH được chỉ định thì "
+"đặt\n"
+"                          ngữ cảnh an ninh SELinux hay SMACK thành NGỮ_CẢNH\n"
+
+#: src/install.c:696 src/unlink.c:86
+#, c-format
+msgid "cannot unlink %s"
+msgstr "không thể hủy liên kết %s"
 
-#: src/install.c:859
+#: src/install.c:877
 #, c-format
 msgid ""
 "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
 msgstr "CẢNH B�O: b� qua --preserve-context vì hệ thống không hỗ trợ SELinux"
 
-#: src/install.c:869
-#, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
-msgstr "CẢNH B�O: b� qua -context (-Z) vì hệ thống không hỗ trợ SELinux"
-
-#: src/install.c:886
+#: src/install.c:917
 #, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr "không được dùng tùy ch�n strip khi cài đặt thư mục"
 
-#: src/install.c:889
+#: src/install.c:920
 #, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr "không cho phép dùng thư mục đích khi cài đặt thư mục"
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr "không thể ép buộc ngữ cảnh đích thành %s rồi bảo tồn nó"
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, c-format
 msgid "invalid mode %s"
 msgstr "chế độ sai %s"
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr "CẢNH B�O: b� qua “--strip-program� vì không đưa ra tùy ch�n “-s�"
 
-#: src/install.c:959
+#: src/install.c:1001
 #, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr ""
 "hai tùy ch�n “--compare� (-C) và “--preserve-timestamps� loại từ lẫn nhau"
 
-#: src/install.c:966
+#: src/install.c:1008
 #, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr "hai tùy ch�n “--compare� (-C) và “--strip� loại từ lẫn nhau"
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -5079,7 +5159,7 @@ msgstr ""
 msgid "Mike Haertel"
 msgstr "Mike Haertel"
 
-#: src/join.c:191
+#: src/join.c:195
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
 "standard output.  The default join field is the first, delimited\n"
@@ -5099,7 +5179,7 @@ msgstr ""
 "FILENUM2\n"
 "  -e EMPTY          thay thế các trư�ng nhập thiếu bằng EMPTY\n"
 
-#: src/join.c:200
+#: src/join.c:204
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
 "  -j FIELD          equivalent to '-1 FIELD -2 FIELD'\n"
@@ -5113,7 +5193,7 @@ msgstr ""
 "  -t K�_TỰ          dùng K�_TỰ làm ký tự phân chia trư�ng đưa vào và kết quả "
 "ra\n"
 
-#: src/join.c:206
+#: src/join.c:210
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
 "  -1 FIELD          join on this FIELD of file 1\n"
@@ -5128,14 +5208,19 @@ msgstr ""
 "                     nhưng b� đi các dòng nhập đã nối lại\n"
 "  -1 TRƯỜNG         nối lại ở TRƯỜNG này của tập tin 1\n"
 "  -2 TRƯỜNG         nối lại ở TRƯỜNG này của tập tin 2\n"
-"  --check-order     kiểm tra dữ liệu nhập vào được sắp xếp đúng không,\n"
-"                     thậm chí nếu tất cả các dòng nhập vào\n"
+"  --check-order     kiểm tra dữ liệu đầu vào được sắp xếp đúng không,\n"
+"                     thậm chí nếu tất cả các dòng đầu vào\n"
 "                     có khả năng ghép cặp\n"
-"  --nocheck-order   đừng kiểm tra dữ liệu nhập vào được sắp xếp đúng không\n"
+"  --nocheck-order   đừng kiểm tra dữ liệu đầu vào được sắp xếp đúng không\n"
 "  --header          xử lý dòng đầu của từng tập tin là dòng đầu trư�ng,\n"
 "                     in ra mà không thử kết đôi\n"
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr ""
+"  -z, --zero-terminated     kết thúc dòng bằng NUL, thay cho ký tự dòng mới\n"
+
+#: src/join.c:225
 msgid ""
 "\n"
 "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n"
@@ -5162,57 +5247,57 @@ msgstr ""
 "hoặc “0�. FORMAT  kết xuất mặc định đưa ra trư�ng để nối lại,\n"
 "những trư�ng còn lại trong FILE1, các trư�ng còn lại\n"
 "trong FILE2, cả phân cách bởi CHAR.\n"
-"Nếu FORMAT là từ khoá �auto�, thế thì dòng đầu tiên\n"
+"Nếu FORMAT là từ khoá “auto�, thế thì dòng đầu tiên\n"
 "của mối tập tin được xác định bằng số trư�ng xuất ra bởi mỗi dòng.\n"
 "\n"
 "Quan tr�ng: FILE1 và FILE2 phải được sắp xếp theo vùng nối lại.\n"
 "V.d. dùng “sort -k 1b,1� nếu “join� không có tùy ch�n.\n"
-"hay sử dụng “join -t ''� nếu �sort� không có tùy ch�n.\n"
+"hay sử dụng \"join -t ''\" nếu “sort� không có tùy ch�n.\n"
 "Ghi chú: việc so sánh tùy theo quy tắc của “LC_COLLATE�.\n"
 "Nếu đầu vào không phải được sắp xếp và một số dòng nào đó\n"
 "không nối lại được, một thông điệp cảnh báo sẽ được hiển thị.\n"
 
-#: src/join.c:403
-#, fuzzy, c-format
+#: src/join.c:410
+#, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
-msgstr "%s:%ju: chưa được sắp xếp: %.*s"
+msgstr "%s:%<PRIuMAX>: chưa được sắp xếp: %.*s"
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, c-format
 msgid "invalid field number: %s"
 msgstr "số thứ tự trư�ng sai: %s"
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, c-format
 msgid "invalid field specifier: %s"
 msgstr "sự xác định trư�ng sai: %s"
 
-#: src/join.c:877
+#: src/join.c:884
 #, c-format
 msgid "invalid file number in field spec: %s"
 msgstr "sai số thứ tự tập tin trong sự xác định trư�ng: %s"
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr "không tương thích nối lại hai trư�ng %lu, %lu"
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr "xung đột các chuỗi thay thế trư�ng rỗng"
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, c-format
 msgid "multi-character tab %s"
 msgstr "khoảng tab đa ký tự %s"
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr "các khoảng tab không tương thích với nhau"
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr "cả hai tập tin không thể là đầu vào chuẩn"
@@ -5229,11 +5314,8 @@ msgstr ""
 "     hoặc: %s -t [T�N_HIỆU]...\n"
 
 #: src/kill.c:82
-#, fuzzy
 msgid "Send signals to processes, or list signals.\n"
-msgstr ""
-"Gửi tín hiệu tới tiến trình, hoặc liệt kê các tín hiệu.\n"
-"\n"
+msgstr "Gửi tín hiệu tới tiến trình, hoặc liệt kê các tín hiệu.\n"
 
 #: src/kill.c:88
 msgid ""
@@ -5290,7 +5372,7 @@ msgstr "không thể kết hợp tín hiệu với “-l� hoặc “-t�"
 #: src/kill.c:305
 #, c-format
 msgid "no process ID specified"
-msgstr "chưa ghi rõ ID tiến trình"
+msgstr "chưa chỉ định ID tiến trình"
 
 #: src/libstdbuf.c:109
 #, c-format
@@ -5334,47 +5416,47 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr "không tạo được liên kết %s tới %s"
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr "%s: không cho phép liên kết cứng tới thư mục"
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, c-format
 msgid "%s: cannot overwrite directory"
 msgstr "%s: không ghi đè được thư mục"
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
 msgstr "%s: thay thế %s không? "
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, c-format
 msgid "failed to create symbolic link %s"
 msgstr "không tạo được liên kết m�m %s"
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr "không tạo được liên kết m�m %s -> %s"
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr "không tạo được liên kết cứng tới %.0s%s"
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, c-format
 msgid "failed to create hard link %s"
 msgstr "không tạo được liên kết cứng %s"
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, c-format
 msgid "failed to create hard link %s => %s"
 msgstr "không tạo được liên kết cứng %s => %s"
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -5387,8 +5469,7 @@ msgstr ""
 "     hoặc: %s [TÙY_CHỌN]... ��CH... THƯ_MỤC         (dạng thứ 3)\n"
 "     hoặc: %s [TÙY_CHỌN]... -t THƯ_MỤC ��CH...      (dạng thứ 4)\n"
 
-#: src/ln.c:381
-#, fuzzy
+#: src/ln.c:398
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
 "In the 2nd form, create a link to TARGET in the current directory.\n"
@@ -5401,16 +5482,15 @@ msgid ""
 msgstr ""
 "Theo kiểu thứ 1, tạo một liên kết tới ��CH với tên TÊN_LIÊN_KẾT.\n"
 "Theo kiểu thứ 2, tạo một liên kết tới ��CH trong thư mục hiện tại.\n"
-"Theo kiểu thứ 3 và thứ 4, tạo liên kết tới mỗi ��CH trong THƯ_MỤC.\n"
-"Tạo liên kết cứng theo mặc định, liên kết m�m với tùy ch�n--symbolic.\n"
+"Theo kiểu thứ 3 và thứ 4, tạo liên kết tới từng ��CH trong THƯ_MỤC.\n"
+"Tạo liên kết cứng theo mặc định, liên kết m�m với tùy ch�n --symbolic.\n"
 "Theo mặc định, mỗi đích (tên của liên kết mới) phải tồn tại.\n"
 "Khi tạo liên kết cứng, mỗi ��CH phải tồn tại sẵn. Liên kết m�m\n"
 "có thể chứa văn bản tùy ý; nếu được giải quyết v� sau, một liên kết tương "
 "đối\n"
 "được hiểu là mối quan hệ với thư mục cấp trên.\n"
-"\n"
 
-#: src/ln.c:394
+#: src/ln.c:411
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
 "file\n"
@@ -5432,7 +5512,7 @@ msgstr ""
 "                               thậm chí đối với siêu ngư�i dùng)\n"
 "  -f, --force                 xóa các tập tin tồn tại ở nơi đến\n"
 
-#: src/ln.c:402
+#: src/ln.c:419
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
 "  -L, --logical               dereference TARGETs that are symbolic links\n"
@@ -5444,19 +5524,15 @@ msgid ""
 "  -s, --symbolic              make symbolic links instead of hard links\n"
 msgstr ""
 "  -i, --interactive           nhắc có nên gỡ b� đích hay không\n"
-"  -L, --logical               b� tham chiếu đến ��CH mà nó là liên kết tượng "
-"trÆ°ng\n"
+"  -L, --logical               b� tham chiếu đến ��CH mà nó là liên kết m�m\n"
 "  -n, --no-dereference        xử lý LINK_NAME như các tập tin thông thư�ng\n"
-"                                nếu nó là liên kết tượng trưng đến một thư "
-"mục\n"
-"  -P, --physical              tạo liên kết cứng trực tiếp đến liên kết tượng "
-"trÆ°ng\n"
-"  -r, --relative              tạo liên kết tượng trưng tương đỗi tới vị trí "
-"liên kết\n"
-"  -s, --symbolic              tạo liên kết tượng trưng thay cho liên kết "
-"cứng\n"
+"                                nếu nó là liên kết m�m đến một thư mục\n"
+"  -P, --physical              tạo liên kết cứng trực tiếp đến liên kết m�m\n"
+"  -r, --relative              tạo liên kết m�m tương đỗi tới vị trí liên "
+"kết\n"
+"  -s, --symbolic              tạo liên kết m�m thay cho liên kết cứng\n"
 
-#: src/ln.c:411
+#: src/ln.c:428
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
 "  -t, --target-directory=DIRECTORY  specify the DIRECTORY in which to "
@@ -5472,25 +5548,26 @@ msgstr ""
 "thư�ng\n"
 "  -v, --verbose               in ra tên của mỗi tập tin đã liên kết\n"
 
-#: src/ln.c:433
-#, fuzzy, c-format
+#: src/ln.c:450
+#, c-format
 msgid ""
 "\n"
 "Using -s ignores -L and -P.  Otherwise, the last option specified controls\n"
 "behavior when a TARGET is a symbolic link, defaulting to %s.\n"
 msgstr ""
-"Sử dụng tùy ch�n -s thì l� cả hai -L và -P. Không thì tùy ch�n đưa ra cuối "
+"\n"
+"Sử dụng tuỳ ch�n -s thì l� cả hai -L và -P. Không thì tuỳ ch�n đưa ra cuối "
 "cùng sẽ\n"
-"đi�u khiển ứng xử khi nguồn là một liên kết tượng trưng; mặc định là %s.\n"
+"đi�u khiển ứng xử khi NGUỒN là một liên kết m�m; mặc định là %s.\n"
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr ""
 "không thể kết hợp “--target-directory� và “--no-target-directory� [loại từ "
 "lẫn nhau !]"
 
-#: src/ln.c:588
+#: src/ln.c:605
 #, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr "không thực hiện tùy ch�n --relative mà không có --symbolic"
@@ -5523,7 +5600,7 @@ msgstr "không có tên đăng nhập"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 msgid "%b %e  %Y"
 msgstr "%e %b  %Y"
 
@@ -5532,107 +5609,106 @@ msgstr "%e %b  %Y"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 msgid "%b %e %H:%M"
 msgstr "%H:%M %e %b"
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr ""
 "đang b� qua giá trị sai của biến môi trư�ng kiểu dáng trích dẫn "
 "QUOTING_STYLE: %s"
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr "đang b� qua b� rộng sai trong biến môi trư�ng cột COLUMNS: %s"
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr "đang b� qua kích cỡ tab sai trong biến môi trư�ng TABSIZE: %s"
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, c-format
 msgid "invalid line width: %s"
 msgstr "sai b� rộng dòng: %s"
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, c-format
 msgid "invalid tab size: %s"
 msgstr "sai kích cỡ tab: %s"
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, c-format
 msgid "invalid time style format %s"
 msgstr "sai định dạng kiểu th�i gian %s"
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 msgid "Valid arguments are:\n"
 msgstr "�ối số không hợp lệ là:\n"
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr "  - +FORMAT (e.g., +%H:%M) cho định dạng “date�-style\n"
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr "lỗi khởi tạo các chuỗi tháng"
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, c-format
 msgid "unrecognized prefix: %s"
 msgstr "không hiểu ti�n tố: %s"
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr ""
 "giá trị không thể phân tích cho biến môi trư�ng đặc tả màu sắc LS_COLORS"
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, c-format
 msgid "cannot open directory %s"
 msgstr "không mở được thư mục %s"
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, c-format
 msgid "cannot determine device and inode of %s"
 msgstr "không nhận ra thiết bị và inode của %s"
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, c-format
 msgid "%s: not listing already-listed directory"
 msgstr "%s: không liệt kê thư mục đã liệt kê"
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, c-format
 msgid "reading directory %s"
 msgstr "đang đ�c thư mục %s"
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, c-format
 msgid "closing directory %s"
 msgstr "đang đóng thư mục %s"
 
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, c-format
 msgid "cannot compare file names %s and %s"
 msgstr "không so sánh được tên tập tin %s và %s"
 
-#: src/ls.c:4721
-#, fuzzy
+#: src/ls.c:4781
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
 "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n"
 msgstr ""
-"Liệt kê thông tin v� các FILE (thư mục hiện th�i theo mặc định).\n"
-"Sắp xếp các mục theo bảng chữ cái nếu không có “-cftuvSUX� hoặc “--sort�.\n"
-"\n"
+"Liệt kê thông tin v� các TẬP-TIN (thư mục hiện th�i theo mặc định).\n"
+"Sắp xếp các mục theo bảng chữ cái nếu không có “-cftuvSUX� cũng không “--"
+"sort�.\n"
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
 "  -A, --almost-all           do not list implied . and ..\n"
@@ -5646,58 +5722,56 @@ msgstr ""
 "  -b, --escape               in ra thoát chuỗi kiểu-C cho ký tự không thể\n"
 "                             hiển thị\n"
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
-"      --block-size=SIZE       biến đổi kích cỡ SIZE trước khi in chúng. Ví "
+"      --block-size=SIZE      biến đổi kích cỡ SIZE trước khi in chúng. Ví "
 "dụ:\n"
-"                               �--block-size=M� in kích thước theo đơn vị "
+"                               “--block-size=M� in kích thước theo đơn vị "
 "của\n"
 "                               1,048,576 bytes.  Xem định dạng SIZE ở dưới "
 "đây.\n"
 "  -B, --ignore-backups       không liệt kê các mục có đuôi “~� mhư ngầm "
 "định\n"
-"  -c                         với “-lt�: sắp xếp theo, và hiển thị ctime\n"
-"                             (th�i gian sửa đổi cuối cùng của thông tin\n"
-"                             trạng thái tập tin)\n"
+"  -c                         với “-lt� và “show�. “ctime� (th�i gian sửa\n"
+"                             đổi cuối cùng của thông tin trạng thái tập "
+"tin)\n"
 "                             với “-l�: hiển thị ctime và sắp xếp theo tên "
 "nếu\n"
 "                             không: sắp xếp theo ctime, sớm hơn xếp trước\n"
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 "  -C                         liệt kê các mục theo cột\n"
-"      --color[=KHI]          phân biệt kết xuất theo màu sắc.\n"
-"                               KHI có thể là:\n"
+"      --color[=KHI]          tô màu kết xuất. KHI có thể là:\n"
 "                               * never   không bao gi�\n"
-"                               * always  luôn luôn (mặc định)\n"
 "                               * auto    tá»± Ä‘á»™ng\n"
+"                               * always  luôn luôn (mặc định)\n"
 "                               Thông tin thêm xem ở dưới đây\n"
-"  -d, --directory            liệt kê mục nhập thư mục thay vì nội dung,\n"
-"                               và không chỉ tới đích của liên kết m�m\n"
+"  -d, --directory            liệt kê bản thân thư mục thay vì nội dung của "
+"chúng\n"
 "  -D, --dired                tạo kết xuất thích hợp với chế độ dired của "
 "Emacs\n"
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
 "  -F, --classify             append indicator (one of */=>@|) to entries\n"
@@ -5720,16 +5794,17 @@ msgstr ""
 "                               * vertical -C       thẳng đứng\n"
 "      --full-time            giống “-l --time-style=full-iso�\n"
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr ""
 "  -g                         giống “-l�, nhưng không liệt kê ngư�i sở hữu\n"
 
-#: src/ls.c:4763
+#: src/ls.c:4823
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 "      --group-directories-first\n"
@@ -5738,27 +5813,27 @@ msgstr ""
 "                              nhưng bất cứ lần nào dùng “--sort=none� (-U)\n"
 "                              sẽ tắt chức năng nhóm lại.\n"
 
-#: src/ls.c:4769
+#: src/ls.c:4829
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
 "  -G, --no-group             trong danh sách dài, không in ra tên nhóm\n"
-"  -h, --human-readable       với “-l�, in kích cỡ ở dạng dễ đ�c\n"
+"  -h, --human-readable       với “-l�, và/hoặc -s, in kích cỡ ở dạng dễ đ�c\n"
 "                               (v.d. 1K 234M 2G)\n"
-"      --si                   giống trên, nhưng dùng 1000 lũy thừa, không "
+"      --si                   giống trên, nhưng dùng hệ số mũ 1000, không "
 "phải 1024\n"
 
-#: src/ls.c:4775
+#: src/ls.c:4835
 msgid ""
 "  -H, --dereference-command-line\n"
 "                             follow symbolic links listed on the command "
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
@@ -5766,13 +5841,13 @@ msgstr ""
 "  -H, --dereference-command-line\n"
 "                             đi theo liên kết m�m liệt kê trên dòng lệnh\n"
 "      --dereference-command-line-symlink-to-dir\n"
-"                             đi theo mỗi liên kết m�m trên dòng lệnh\n"
+"                             đi theo mỗi liên kết m�m trên dòng lệnh cái mà\n"
 "                               chỉ tới một thư mục\n"
 "      --hide=MẪU             không liệt kê những mục tương ứng với MẪU của "
 "shell\n"
-"                               (ghi đè bởi “-a� hoặc “-A�)\n"
+"                               (bị ghi đè bởi “-a� hoặc “-A�)\n"
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
 "names:\n"
@@ -5781,17 +5856,20 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 "      --indicator-style=TỪ   nối thêm vào tên mục chỉ thị với dạng TỪ:\n"
-"                              không có(mặc định), dấu gạch (-p)\n"
-"                              kiểu tập tin(--file-type),  phân loại(-F)\n"
+"                              * none      không có (mặc định)\n"
+"                              * slash     dấu gạch chéo (-p)\n"
+"                              * file-type kiểu tập tin (--file-type)\n"
+"                              * classify  phân loại (-F)\n"
 "  -i, --inode                in ra số chỉ mục của mỗi tập tin\n"
-"  -I, --ignore=MẪU           không liệt kê các mục tương ứng với MẪU của "
-"shell\n"
-"  -k, --kibibytes                         sử dụng khối 1024-byte\n"
+"  -I, --ignore=MẪU           không liệt kê các mục tương ứng với MẪU của hệ "
+"v�\n"
+"  -k, --kibibytes            mặc định dùng khối 1024-byte cho dung lượng đĩa "
+"đã dùng\n"
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -5808,7 +5886,7 @@ msgstr ""
 "  -m                         liệt kê li�n nhau các mục, cách nhau bởi dấu "
 "phẩy\n"
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -5826,19 +5904,18 @@ msgstr ""
 "  -p, --indicator-style=slash\n"
 "                             nối thêm vào thư mục chỉ thị “/�\n"
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
 "                               literal, locale, shell, shell-always, c, "
 "escape\n"
 msgstr ""
-"  -q, --hide-control-chars   in dấu “?� thay cho các ký tự không phải đồ "
-"h�a\n"
+"  -q, --hide-control-chars   in dấu “?� thay cho các ký tự không đồ h�a\n"
 "      --show-control-chars   hiển thị các ký tự không phải đồ h�a như chúng "
 "có\n"
 "                               (mặc định trừ khi chương trình là “ls� và "
@@ -5848,12 +5925,12 @@ msgstr ""
 "      --quoting-style=TỪ     dùng dạng trích dẫn TỪ cho tên các mục:\n"
 "                               * literal       văn chương\n"
 "                               * locale        mi�n địa phương\n"
-"                               * shell         shell\n"
-"                               * shell-always  luôn luôn shell\n"
+"                               * shell         hệ v�\n"
+"                               * shell-always  luôn luôn hệ v�\n"
 "                               * c\n"
 "                               * escape        thoát\n"
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
 "  -R, --recursive            list subdirectories recursively\n"
@@ -5865,45 +5942,49 @@ msgstr ""
 "  -s, --size                 in kích cỡ đã cấp phát của mỗi tập tin, theo "
 "khối\n"
 
-#: src/ls.c:4825
+#: src/ls.c:4886
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 "  -S                         sắp xếp theo kích cỡ tập tin\n"
 "      --sort=TỪ              sắp xếp theo TỪ thay cho tên:\n"
-"                               * extension -X  phần mở rộng\n"
 "                               * none -U       không có\n"
 "                               * size -S       kích cỡ\n"
 "                               * time -t       th�i gian\n"
 "                               * version -v    phiên bản\n"
+"                               * extension -X  phần đuôi mở rộng\n"
 "      --time=TỪ              với “-l�, hiển thị th�i gian theo TỪ\n"
-"                               thay vì th�i gian sửa đổi:\n"
+"                               thay cho th�i gian sửa mặc định:\n"
 "                               * atime -u      th�i gian truy cập cuối\n"
 "                               * access -u     th�i gian truy cập\n"
 "                               * use -u        th�i gian sử dụng\n"
 "                               * ctime -c      th�i gian thay đổi inode "
 "cuối\n"
 "                               * status -c     th�i gian lấy trạng thái\n"
-"                               dùng th�i gian chỉ ra làm tiêu\n"
+"                               đồng th�i dùng th�i gian chỉ ra làm tiêu\n"
 "                               chuẩn sắp xếp nếu “--sort=time�\n"
 
-#: src/ls.c:4835
+#: src/ls.c:4896
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
 msgstr ""
 "      --time-style=KIỂU_D�NG  với “-l�, hiển thị các th�i gian theo "
 "KIỂU_D�NG:\n"
@@ -5912,19 +5993,18 @@ msgstr ""
 "                               * iso        ISO\n"
 "                               * locale     mi�n địa phương\n"
 "                               * +�ỊNH_DẠNG.\n"
-"                               �ỊNH_DẠNG được giải thích giống như “date�;\n"
+"                               �ỊNH_DẠNG được dùng giống như lệnh “date�;\n"
 "                               nếu �ỊNH_DẠNG là "
-"��ỊNH_DẠNG1<dòng_mới>�ỊNH_DẠNG2�\n"
+"“�ỊNH_DẠNG1<dòng_mới>�ỊNH_DẠNG2�\n"
 "                               thì �ỊNH_DẠNG1 áp dụng cho các tập tin không\n"
-"                               phải vừa mở, và �ỊNH_DẠNG2 áp dụng cho các "
-"tập\n"
-"                               tin vừa mở;\n"
-"                               nếu KIỂU_D�NG có ti�n tố “posix-� đứng "
-"trÆ°á»›c,\n"
-"                               KIỂU_D�NG chỉ có tác động bên ngoài mi�n địa "
-"phÆ°Æ¡ng POSIX.\n"
+"                               được mở gần đây, và �ỊNH_DẠNG2 áp dụng cho "
+"các tập\n"
+"                               tin mới mở gần đây;\n"
+"                               nếu KIỂU_D�NG có ti�n tố “posix-�, KIỂU_D�NG\n"
+"                               chỉ có tác động bên ngoài mi�n địa phương "
+"POSIX.\n"
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 msgid ""
 "  -t                         sort by modification time, newest first\n"
 "  -T, --tabsize=COLS         assume tab stops at each COLS instead of 8\n"
@@ -5932,10 +6012,10 @@ msgstr ""
 "  -t                         sắp xếp theo th�i gian thay đổi\n"
 "  -T, --tabsize=COLS          giả định chi�u dài tab là COLS thay cho 8\n"
 
-#: src/ls.c:4848
+#: src/ls.c:4912
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
@@ -5945,29 +6025,28 @@ msgstr ""
 "                               với “-l�: hiển thị th�i gian truy cập và sắp "
 "xếp theo tên\n"
 "                               nếu không: sắp xếp theo th�i gian truy cập\n"
-"  -U                         không sắp xếp; liệt kê các mục theo thứ bậc của "
+"  -U                         không sắp xếp; liệt kê các mục theo thứ tự của "
 "thư mục\n"
 "  -v                         sắp xếp các số thứ tự (phiên bản) một cách tự "
 "nhiên bên trong văn bản\n"
 
-#: src/ls.c:4855
+#: src/ls.c:4919
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
-"  -w, --width=CỘT            giả sử chi�u rộng màn hình thay vì giá trị hiện "
-"th�i\n"
+"  -w, --width=CỘT            coi chi�u rộng màn hình là giá trị này thay cho "
+"giá trị hiện th�i\n"
 "  -x                         liệt kê các mục theo dòng thay vì theo cột\n"
 "  -X                         sắp xếp phần mở rộng các mục theo bảng chữ cái\n"
 "  -Z, --context              in bất kỳ ngữ cảnh bảo mật SELinux nào của mỗi "
 "tập tin\n"
 "  -1                         liệt kê một tập tin trên mỗi dòng\n"
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -5981,10 +6060,10 @@ msgstr ""
 "(màu = không bao gi�). Khi dùng “--color=auto� (màu = tự động),\n"
 "lệnh liệt kê “ls� chỉ xuất mã màu khi đầu ra tiêu chuẩn được kết nối\n"
 "đến một thiết bị cuối. Biến môi trư�ng “LS_COLORS� (màu sắc của ls)\n"
-"cũng có khả năng sửa đổi thiết lập này. Hãy sử dụng lệnh “dircolors� để đặt "
+"cũng có khả năng sửa đổi cài đặt này. Hãy sử dụng lệnh “dircolors� để đặt "
 "nó.\n"
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -6061,28 +6140,25 @@ msgstr "  -t, --text           đ�c ở chế độ văn bản (mặc định)
 #: src/md5sum.c:195
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
 "\n"
-"Ba tùy ch�n sau chỉ có ích khi tính tổng kiểm tra (checksum):\n"
+"Các tùy ch�n sau chỉ có ích khi thẩm tra tổng kiểm (checksum):\n"
 "      --quiet          đừng in ra OK cho mỗi tập tin được thẩm tra đúng\n"
 "      --status         không in ra gì cả, mã trạng thái cho biết thành công\n"
+"      --strict         thoát khác không nếu các dòng tổng kiểm có định dạng\n"
+"                         không đúng quy cách\n"
 "  -w, --warn           cảnh báo v� những dòng tổng kiểm tra có định dạng "
 "sai\n"
 "\n"
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-"      --strict         cùng --check, sẽ thoát với giá trị trả v� không phải\n"
-"                       số không với đầu vào bất kỳ\n"
-
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, c-format
 msgid ""
 "\n"
@@ -6097,175 +6173,199 @@ msgstr ""
 "một dòng ghi tổng kiểm tra, một ký tự chỉ dạng (�*� cho nhị phân,\n"
 "�dấu cách� cho văn bản), và tên cho mỗi FILE.\n"
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, c-format
 msgid "%s: too many checksum lines"
 msgstr "%s: quá nhi�u dòng tổng kiểm tra"
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr "%s: %<PRIuMAX>: dòng tổng kiểm tra %s có định dạng không đúng"
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr "%s: mở hoặc đ�c BỊ LỖI\n"
 
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr "BỊ LỖI"
 
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr "OK"
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr "%s: không tìm thấy dòng tổng kiểm tra %s với định dạng đúng"
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
 msgstr[0] "%<PRIuMAX>: dòng tổng kiểm tra có định dạng không đúng"
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
 msgstr[0] "CẢNH B�O: không đ�c được %<PRIuMAX>"
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
 msgstr[0] "CẢNH B�O: %<PRIuMAX> đã kiểm tra KHÔNG tương ứng"
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
 msgstr "--tag không hỗ trợ chế độ --text"
 
-#: src/md5sum.c:766
+#: src/md5sum.c:770
 #, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr "tùy ch�n “--tag� chỉ có ý nghĩa khi tính tổng kiểm tra"
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
 msgstr "các tùy ch�n “--binary� và “--text� mất ý nghĩa khi tính tổng kiểm tra"
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr "tùy ch�n “--status� chỉ có ý nghĩa khi tính tổng kiểm tra"
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr "tùy ch�n “--warn� chỉ có ý nghĩa khi tính tổng kiểm tra"
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr "tùy ch�n “--quiet� chỉ có ý nghĩa khi tính tổng kiểm tra"
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr "tùy ch�n “--status� chỉ có ý nghĩa khi tính tổng kiểm tra"
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr "Cách dùng: %s [TÙY_CHỌN]... THƯ_MỤC...\n"
 
-#: src/mkdir.c:57
-#, fuzzy
+#: src/mkdir.c:59
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
-msgstr ""
-"Tạo (các) THƯ_MỤC, nếu chúng chưa có.\n"
-"\n"
+msgstr "Tạo (các) THƯ_MỤC, nếu chúng chưa có.\n"
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 "  -m, --mode=CHẾ_�Ộ đặt chế độ tập tin (giống như chmod),\n"
-"                     thay cho “a=rwx - umask�\n"
+"                     không phải “a=rwx - umask�\n"
 "  -p, --parents     không đưa ra lỗi nếu có, tạo thư mục mẹ khi cần thiết\n"
 "  -v, --verbose     in ra thông báo mỗi khi tạo một thư mục\n"
-"  -Z, --context=NGỮ_CẢNH    đặt ngữ cảnh bảo mật SELinux\n"
-"                    của mỗi thư mục đã tạo thành NGỮ_CẢNH\n"
 
-#: src/mkdir.c:168
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+"  -Z                   đặt ngữ cảnh an ninh SELinux cho từng thư mục được "
+"tạo\n"
+"                         thành kiểu mặc định\n"
+"      --context[=NGỮ_CẢNH]  giống với -Z, hoặc nếu NGỮ_CẢNH được chỉ định "
+"thì\n"
+"                       đặt ngữ cảnh an ninh SELinux hay SMACK thành "
+"NGỮ_CẢNH\n"
+
+#: src/mkdir.c:127 src/mkdir.c:172
+#, c-format
+msgid "failed to set default creation context for %s"
+msgstr "gặp lỗi khi đặt ngữ cảnh tạo tập tin mặc định thành %s"
+
+#: src/mkdir.c:191
+#, c-format
+msgid "failed to restore context for %s"
+msgstr "gặp lỗi khi bảo tồn ngữ cảnh cho %s"
+
+#: src/mkdir.c:231
 #, c-format
 msgid "created directory %s"
 msgstr "đã tạo thư mục %s"
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr ""
+"CẢNH B�O: b� qua --context vì nhân không hỗ trợ SELinux/SMACK như yêu cầu"
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr "Cách dùng: %s [TÙY_CHỌN]... TÊN...\n"
 
-#: src/mkfifo.c:52
-#, fuzzy
+#: src/mkfifo.c:54
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
-msgstr ""
-"Tạo ống (pipe) có tên (FIFO) với TÊN chỉ ra.\n"
-"\n"
+msgstr "Tạo ống (pipe) có tên (FIFO) với TÊN chỉ ra.\n"
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
 msgstr ""
 "  -m, --mode=CHẾ_�Ộ  đặt quy�n hạn tập tin thành CHẾ_�Ộ,\n"
 "                              thay cho “a=rw - umask�\n"
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
-"  -Z, --context=NGỮ_CẢNH  đặt ngữ cảnh bảo mật SELinux\n"
-"                     của mỗi TÊN thành NGỮ_CẢNH\n"
+"  -Z                   đặt ngữ cảnh an ninh SELinux thành kiểu mặc định\n"
+"      --context[=NGỮ_CẢNH]  giống với -Z, hoặc nếu NGỮ_CẢNH được chỉ định "
+"thì\n"
+"                       đặt ngữ cảnh an ninh SELinux hay SMACK thành "
+"NGỮ_CẢNH\n"
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, c-format
 msgid "invalid mode"
 msgstr "chế độ không hợp lệ"
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr "chế độ phải xác định chỉ các bit đặt quy�n hạn tập tin"
 
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
+#, c-format
+msgid "cannot set permissions of %s"
+msgstr "không thay đổi được quy�n hạn của %s"
+
+#: src/mknod.c:54
 #, c-format
 msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr "Cách dùng: %s [TÙY_CHỌN]... TÊN KIỂU [LỚN NHỎ]\n"
 
-#: src/mknod.c:54
-#, fuzzy
+#: src/mknod.c:56
 msgid "Create the special file NAME of the given TYPE.\n"
-msgstr ""
-"Tạo tập tin đặc biệt với TÊN và KIỂU đưa ra.\n"
-"\n"
+msgstr "Tạo tập tin đặc biệt với TÊN và KIỂU đưa ra.\n"
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr ""
-"  -Z, --context=NGỮ_CẢNH   đặt ngữ cảnh bảo mật SELinux\n"
-"                           của TÊN thành NGỮ_CẢNH\n"
-
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -6283,7 +6383,7 @@ msgstr ""
 "  * gì khác     thập phân\n"
 "KIỂU có thể là:\n"
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 msgid ""
 "\n"
 "  b      create a block (buffered) special file\n"
@@ -6295,71 +6395,73 @@ msgstr ""
 "  c, u   tạo một tập tin đặc biệt kiểu ký tự (không có bộ đệm)\n"
 "  p      tạo một FIFO (VTRT: Vào Trước, Ra Trước)\n"
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 msgid "Special files require major and minor device numbers."
 msgstr "Tập tin đặc biệt yêu cầu các số thiết bị lớn và nh�."
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 msgid "Fifos do not have major and minor device numbers."
 msgstr "FIFO không có các số thiết bị lớn và nh�."
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, c-format
 msgid "block special files not supported"
 msgstr "không hỗ trợ tập tin đặc biệt kiểu khối"
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, c-format
 msgid "character special files not supported"
 msgstr "không hỗ trợ tập tin đặc biệt kiểu ký tự"
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, c-format
 msgid "invalid major device number %s"
 msgstr "sai số lớn của thiết bị %s"
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, c-format
 msgid "invalid minor device number %s"
 msgstr "sai số nh� của thiết bị %s"
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, c-format
 msgid "invalid device %s %s"
 msgstr "sai thiết bị %s %s"
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, c-format
 msgid "invalid device type %s"
 msgstr "sai kiểu thiết bị %s"
 
 # H� tên Anh
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr "Eric Blake"
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr "Cách dùng: %s [TÙY_CHỌN]... [MẪU]\n"
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
 "TEMPLATE must contain at least 3 consecutive 'X's in last component.\n"
 "If TEMPLATE is not specified, use tmp.XXXXXXXXXX, and --tmpdir is implied.\n"
 msgstr ""
-"Tạo tạm th�i một tập tin hay thư mục một cách an toàn, và in tên của nó.\n"
-"MẪU phải chứa ít nhất 3 chữ X liên tiếp trong thành phần cuối cùng.\n"
-"Không ghi rõ MẪU thì dùng “tmp.XXXXXXXXXX�, và “--tmpdir� được dùng.\n"
+"Tạo một tập tin hay thư mục tạm, một cách an toàn, và in ra tên của nó.\n"
+"MẪU phải chứa ít nhất 3 chữ X liên tiếp trong phần cuối cùng.\n"
+"Không chỉ định MẪU thì dùng “tmp.XXXXXXXXXX�, và “--tmpdir� được dùng.\n"
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
-msgstr "Tập tin được tạo u+rw, và thư mục u+rwu, không có ràng buộc umask.\n"
+msgstr ""
+"Tập tin được tạo với quy�n là u+rw, và thư mục u+rwu, không có ràng buộc "
+"umask.\n"
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
@@ -6370,100 +6472,91 @@ msgstr ""
 "  -q, --quiet         thu hồi các hàm chẩn đoán v� lỗi tạo tập tin hay thư "
 "mục\n"
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
-"      --suffix=HẬU_T� nối thêm hậu tố này vào MẪU. Không cho phép hậu tố "
+"      --suffix=HẬU_T� nối thêm HẬU_T� này vào MẪU. Không cho phép hậu tố "
 "chứa dấu sổ chéo.\n"
 "                        Tùy ch�n này được ngầm định nếu MẪU không kết thúc "
 "bằng chữ X.\n"
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
-"  --tmpdir[=THƯ_MỤC]   đ�c MẪU tương đối so với THƯ_MỤC. Không ghi rõ\n"
-"                       THƯ_MỤC thì dùng $TMPDIR (nếu đặt), không thì “/"
+"  -p DIR, --tmpdir[=THƯ_MỤC]  diễn giải MẪU tương đối so với THƯ_MỤC. Không "
+"chỉ định\n"
+"                        THƯ_MỤC thì dùng $TMPDIR (nếu đặt), không thì “/"
 "tmp�.\n"
-"                       Khi dùng tùy ch�n này, MẪU không thể là một tên "
+"                        Khi dùng tùy ch�n này, MẪU không thể là một tên "
 "tuyệt\n"
-"                       đối. Không giống như “-t�, MẪU có thể chứa dấu gạch\n"
-"                       ngược, nhưng mktemp chỉ tạo thành phần cuối cùng.\n"
+"                        đối. Không giống như “-t�, MẪU có thể chứa dấu gạch\n"
+"                        ngược, nhưng mktemp chỉ tạo thành phần cuối cùng.\n"
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
 msgstr ""
-"  -p THƯ_MỤC          dùng T.MỤC làm ti�n tố; ngầm định “-t� [bị phản đối]\n"
 "  -t                  diễn dịch MẪU là một thành phần tên tập tin đơn,\n"
-"                      tương đối so với một thư mục: $TMPDIR, nếu đặt;\n"
-"                      không thì thư mục được ghi rõ với “-p�;\n"
-"                      không thì “/tmp� [bị phản đối]\n"
+"                       tương đối so với một thư mục: $TMPDIR, nếu đặt;\n"
+"                       không thì dùng thư mục được chỉ ra bằng “-p�;\n"
+"                       không thì “/tmp� [không nên dùng]\n"
 
-#: src/mktemp.c:223
-#, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr "không chuyển hướng được đầu lỗi tiêu chuẩn tới /dev/null"
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, c-format
 msgid "too many templates"
 msgstr "quá nhi�u mẫu"
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr "dùng “--suffix� (hậu tố) thì mẫu %s phải kết thúc bằng chữ X"
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr "hậu tố không hợp lệ %s, chứa dấu phân cách thư mục"
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr "quá ít X trong mẫu %s"
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr "mẫu không hợp lệ, %s, chứa dấu phân cách thư mục"
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr "mẫu không hợp lệ, %s; với “--tmpdir� thì không thể là tuyệt đối"
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, c-format
 msgid "failed to create directory via template %s"
 msgstr "gặp lỗi khi tạo thư mục thông qua mẫu %s"
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, c-format
 msgid "failed to create file via template %s"
 msgstr "gặp lỗi khi tạo tập tin thông qua mẫu %s"
 
-#: src/mv.c:292
-#, fuzzy
+#: src/mv.c:294
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
-msgstr ""
-"�ổi tên NGUỒN thành ��CH, hoặc di chuyển (các) NGUỒN vào THƯ_MỤC.\n"
-"\n"
+msgstr "�ổi tên NGUỒN thành ��CH, hoặc di chuyển (các) NGUỒN vào THƯ_MỤC.\n"
 
-#: src/mv.c:298
+#: src/mv.c:300
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
 "file\n"
@@ -6475,17 +6568,18 @@ msgid ""
 "If you specify more than one of -i, -f, -n, only the final one takes "
 "effect.\n"
 msgstr ""
-"      --backup[=�IỀU_KHIỂN]    tạo bản sao lưu của mỗi tập tin đích đã có\n"
+"      --backup[=�IỀU_KHIỂN]    tạo bản sao lưu dự phòng của mỗi tập tin đích "
+"đã có\n"
 "  -b                           giống “--backup� nhưng không chấp nhận đối "
 "số\n"
 "  -f, --force                  không h�i lại trước khi ghi đè\n"
 "  -i, --interactive            h�i lại trước khi ghi đè\n"
 "  -n, --no-clobber             không ghi đè lên tập tin đã có\n"
 "\n"
-"Nếu bạn ghi rõ hơn một của những tùy ch�n “-i�, “-f� và “-n�\n"
-"thì chỉ tùy ch�n cuối cùng có tác động.\n"
+"Nếu bạn chỉ ra nhi�u hơn một trong số các tùy ch�n “-i�, “-f� và “-n�\n"
+"thì chỉ tùy ch�n cuối cùng được áp dụng.\n"
 
-#: src/mv.c:307
+#: src/mv.c:309
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
@@ -6496,7 +6590,7 @@ msgstr ""
 "NGUá»’N\n"
 "  -S, --suffix=HẬU_T�          ghi đè lên HẬU_T� thông thư�ng\n"
 
-#: src/mv.c:312
+#: src/mv.c:314
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
 "DIRECTORY\n"
@@ -6505,14 +6599,18 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
 "  -t, --target-directory=THƯ_MỤC  di chuyển m�i đối số NGUỒN vào THƯ_MỤC\n"
-"  -T, --no-target-directory       coi ��CH như một tập tin thông thư�ng\n"
+"  -T, --no-target-directory    coi ��CH như một tập tin thông thư�ng\n"
 "  -u, --update                 chỉ di chuyển khi tập tin NGUỒN mới hơn\n"
 "                                 tập tin ở nơi đến hoặc khi không có tập "
 "tin\n"
 "                                 ở nơi đến\n"
-"  -v, --verbose                nói rõ v� những gì đang thực hiện\n"
+"  -v, --verbose                giải thích đang làm gì\n"
+"  -Z, --context                đặt ngữ cảnh bảo mật SELinux của tập tin\n"
+"                                 đích thành kiểu mặc định\n"
 
 #: src/nice.c:72
 #, c-format
@@ -6520,7 +6618,7 @@ msgid "Usage: %s [OPTION] [COMMAND [ARG]...]\n"
 msgstr "Cách dùng: %s [TÙY_CHỌN] [LỆNH [�.S�]...]\n"
 
 #: src/nice.c:73
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Run COMMAND with an adjusted niceness, which affects process scheduling.\n"
 "With no COMMAND, print the current niceness.  Niceness values range from\n"
@@ -6531,12 +6629,11 @@ msgstr ""
 "Khi không có câu LỆNH, in ra giá trị nice hiện th�i. Giá trị nice nằm trong "
 "khoảng\n"
 "từ %d (ưu tiên v� th�i gian cao nhất) đến %d (ưu tiên ít nhất).\n"
-"\n"
-"  -n, --adjustment=N   cộng thêm N vào giá trị nice (mặc định 10)\n"
 
 #: src/nice.c:82
 msgid "  -n, --adjustment=N   add integer N to the niceness (default 10)\n"
 msgstr ""
+"  -n, --adjustment=N   thêm số nguyên N vào “niceness� (mặc định là 10)\n"
 
 #: src/nice.c:172
 #, c-format
@@ -6564,14 +6661,12 @@ msgid "Scott Bartram"
 msgstr "Scott Bartram"
 
 #: src/nl.c:179
-#, fuzzy
 msgid ""
 "Write each FILE to standard output, with line numbers added.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
-"In mỗi TẬP_TIN tới đầu ra tiêu chuẩn, với số thứ tự của các dòng ở đầu.\n"
+"In từng TẬP_TIN ra đầu ra tiêu chuẩn, có số thứ tự của các dòng ở đầu.\n"
 "Khi không có TẬP_TIN, hoặc khi TẬP_TIN là “-�, đ�c đầu vào tiêu chuẩn.\n"
-"\n"
 
 #: src/nl.c:186
 msgid ""
@@ -6813,118 +6908,130 @@ msgid "%s: invalid number to ignore"
 msgstr "%s: con số không hợp lệ cần b� qua"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
-msgstr ""
+msgstr "Assaf Gordon"
 
-#: src/numfmt.c:676
-#, fuzzy, c-format
-msgid "value too large to be converted: '%s'"
-msgstr "%s: giá trị chưa được chuyển đổi hoàn toàn"
+#: src/numfmt.c:659
+#, c-format
+msgid "value too large to be converted: %s"
+msgstr "giá trị là quá lớn nên không thể chuyển đổi: “%s�"
 
-#: src/numfmt.c:680
-#, fuzzy, c-format
-msgid "invalid number: '%s'"
-msgstr "số không hợp lệ %s"
+#: src/numfmt.c:663
+#, c-format
+msgid "invalid number: %s"
+msgstr "số không hợp lệ: %s"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
-msgstr ""
+msgid "rejecting suffix in input: %s (consider using --from)"
+msgstr "chối từ hậu tố ở đầu vào: “%s� (coi như sử dụng --from)"
 
-#: src/numfmt.c:688
-#, fuzzy, c-format
-msgid "invalid suffix in input: '%s'"
-msgstr "gặp hậu tố không hợp lệ trong %s%s đối số “%s�"
+#: src/numfmt.c:671
+#, c-format
+msgid "invalid suffix in input: %s"
+msgstr "gặp hậu tố không hợp lệ trong đầu vào: “%s�"
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
-msgstr ""
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
+msgstr "thiếu hậu tố “i� trong đầu vào: “%s� (ví dụ: Ki/Mi/Gi)"
 
-#: src/numfmt.c:723
-#, fuzzy, c-format
+#: src/numfmt.c:722 src/numfmt.c:768
+#, c-format
 msgid "failed to prepare value '%Lf' for printing"
-msgstr "mở %s để ghi gặp lỗi"
+msgstr "gặp lỗi khi chuẩn bị giá trị “%Lf� để in ấn"
 
-#: src/numfmt.c:787
-#, fuzzy, c-format
-msgid "invalid unit size: '%s'"
-msgstr "sai kích cỡ tab: %s"
-
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
+#: src/numfmt.c:791
 #, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr ""
+msgid "invalid unit size: %s"
+msgstr "kích thước đơn vị không hợp lệ: “%s�"
 
-#: src/numfmt.c:813
-#, fuzzy, c-format
+#: src/numfmt.c:814
+#, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
-msgstr "Cách dùng: %s [TÙY_CHỌN]... [NGƯỜI_DÙNG]...\n"
+msgstr "Cách dùng: %s [TÙY-CHỌN]... [S�]...\n"
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
 msgstr ""
+"�ịnh dạng lại S�, hoặc con số từ đầu vào tiêu chuẩn nếu không chỉ ra cái "
+"nào.\n"
 
-#: src/numfmt.c:820
-#, fuzzy
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
-msgstr ""
-"      --strict         cùng --check, sẽ thoát với giá trị trả v� không phải\n"
-"                       số không với đầu vào bất kỳ\n"
+msgstr "      --debug          hiển thị các cảnh báo đầu vào không hợp lệ\n"
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
+"  -d, --delimiter=X    dùng X thay vì khoảng trắng để phân tách các trư�ng\n"
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
+"      --field=N        thay thế con số trong trư�ng N (mặc định là 1)\n"
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
 msgstr ""
+"      --format=�ỊNH-DẠNG  sử dụng �ỊNH-DẠNG dấu chấm động cho hàm printf;\n"
+"                         xem �ỊNH-DẠNG ở phía dưới để có thêm thông tin chi "
+"tiết\n"
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
 "                         see UNIT below\n"
 msgstr ""
+"      --from=UNIT      hệ số biến-đổi-tự-động thành UNIT; mặc định là "
+"“none�.\n"
+"                         xem UNIT ở dưới đây\n"
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr ""
+"      --from-unit=N    chỉ ra kích thước đơn vị đầu vào (thay vì giá trị 1 "
+"theo mặc định)\n"
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
 "                         (which means it has no effect in the C/POSIX "
 "locale)\n"
 msgstr ""
+"      --grouping       sử dụng vùng-địa-phương-đã-định-nghĩa để nhóm chữ số, "
+"ví dụ 1,000,000\n"
+"                         (có nghĩa là không chịu ảnh hưởng vùng địa phương C/"
+"POSIX)\n"
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
 msgstr ""
+"      --header[=N]     in ra (mà không chuyển đổi) N dòng đầu tiên;\n"
+"                         N mặc định là 1 nếu không chỉ định rõ ràng\n"
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
 msgstr ""
+"      --invalid=MODE   chế độ sai: nó có thể là:\n"
+"                         abort (mặc định), fail, warn, ignore\n"
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -6933,44 +7040,60 @@ msgid ""
 "whitespace\n"
 "                         is found\n"
 msgstr ""
+"      --padding=N      đệm kết xuất N ký tự; N dương sẽ\n"
+"                         căn-phải; N âm căn-trái;\n"
+"                         việc đệm thêm sẽ bị b� qua nếu kết xuất rộng hơn "
+"N;\n"
+"                         mặc định là tự động đệm thêm nếu khoảng trắng\n"
+"                         được tìm thấy\n"
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
 "nearest\n"
 msgstr ""
+"      --round=METHOD   dùng METHOD để làm tròn khi biến đổi tỷ lệ; METHOD có "
+"thể là:\n"
+"                         up, down, from-zero (mặc định), towards-zero, "
+"nearest\n"
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
 msgstr ""
+"      --suffix=HẬU-T�  thêm HẬU-T� cho con số đầu ra, và chấp nhận\n"
+"                         HẬU-T� tùy ch�n trong con số đầu vào\n"
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
+"      --to=UNIT        con số cho biến đổi tỷ lệ tự động áp dụng cho UNIT; "
+"xem UNIT bên dưới\n"
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr ""
+"      --to-unit=N      kích thước đơn vị kết xuất (thay cho giá trị mặc định "
+"là 1)\n"
 
-#: src/numfmt.c:877
-#, fuzzy
+#: src/numfmt.c:878
 msgid ""
 "\n"
 "UNIT options:\n"
 msgstr ""
-"Tùy ch�n khác:\n"
 "\n"
+"Các tùy ch�n v� �ƠN-VỊ (UNIT):\n"
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr ""
+"  none       không áp dụng biến đổi tỷ lệ tự động; các hậu tố sẽ coi lỗi\n"
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -6978,43 +7101,66 @@ msgid ""
 "               1M = 1000000,\n"
 "               1Mi = 1048576,\n"
 msgstr ""
+"  auto       chấp nhận tùy ch�n hậu tố đơn/hai ký tự:\n"
+"               1K = 1000,\n"
+"               1Ki = 1024,\n"
+"               1M = 1000000,\n"
+"               1Mi = 1048576,\n"
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
 "               1M = 1000000,\n"
 "               ...\n"
 msgstr ""
+"  si         chấp nhận hậu tố là một ký tự đơn:\n"
+"               1K = 1000,\n"
+"               1M = 1000000,\n"
+"               ...\n"
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
 "               1M = 1048576,\n"
 "               ...\n"
 msgstr ""
+"  iec        chấp nhận tùy ch�n hậu tố đơn-ký-tự:\n"
+"               1K = 1024,\n"
+"               1M = 1048576,\n"
+"               ...\n"
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
 "               1Mi = 1048576,\n"
 "               ...\n"
 msgstr ""
+"  iec-i      chấp nhận tùy ch�n hậu tố dạng hai-ký-tự:\n"
+"               1Ki = 1024,\n"
+"               1Mi = 1048576,\n"
+"               ...\n"
 
-#: src/numfmt.c:905
+#: src/numfmt.c:906
 #, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
+"\n"
+"�ỊNH-DẠNG phải phù hợp cho việc hiển thị tham số dấu chấm động “%f�.\n"
+"Tùy ch�n trích dẫn (%'f) sẽ bật --grouping (nếu nó được hỗ trợ bởi mi�n địa\n"
+"phương hiện hành). Tùy ch�n độ rộng (%10f) sẽ đệm thêm khi kết xuất.\n"
+"Tùy ch�n độ rộng với số không (%010f) sẽ đệm bằng số không.\n"
+"Tùy ch�n độ rộng với giá trị âm (%-10f) sẽ căn l� trái.\n"
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -7025,8 +7171,19 @@ msgid ""
 "diagnosed, but the exit status is 0.  With --invalid='ignore' conversion\n"
 "errors are not diagnosed and the exit status is 0.\n"
 msgstr ""
+"\n"
+"Trạng thái thoát là 0 nếu tất cả các con số đầu vào đ�u được chuyển đổi.\n"
+"Theo mặc đinh, %s sẽ dừng tại nơi xảy ra lỗi chuyển đổi đầu tiên với trạng "
+"thái thoát là 2.\n"
+"Có tùy ch�n --invalid=“fail� cảnh báo sẽ đưa ra khi có các lỗi chuyển đổi "
+"xảy ra\n"
+"và thoát với trạng thái là 2. Có tùy ch�n --invalid=“warn� mỗi lỗi chuyển "
+"đổi được\n"
+"coi là sai, nhưng trạng thái thoát là 0. Tùy ch�n --invalid=“ignore� lỗi "
+"chuyển đổi\n"
+"không được chuẩn đoán và thoát với trạng thái là 0.\n"
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -7046,113 +7203,132 @@ msgid ""
 "  $ ls -lh | %s --header --field 5 --from=iec --padding=10\n"
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 msgstr ""
+"\n"
+"Ví dụ:\n"
+"  $ %s --to=si 1000\n"
+"            -> \"1.0K\"\n"
+"  $ %s --to=iec 2048\n"
+"           -> \"2.0K\"\n"
+"  $ %s --to=iec-i 4096\n"
+"           -> \"4.0Ki\"\n"
+"  $ echo 1K | %s --from=si\n"
+"           -> \"1000\"\n"
+"  $ echo 1K | %s --from=iec\n"
+"           -> \"1024\"\n"
+"  $ df | %s --header --field 2 --to=si\n"
+"  $ ls -l | %s --header --field 5 --to=iec\n"
+"  $ ls -lh | %s --header --field 5 --from=iec --padding=10\n"
+"  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, c-format
 msgid "format %s has no %% directive"
 msgstr "định dạng %s không có chỉ thị %%"
 
-#: src/numfmt.c:990
-#, fuzzy, c-format
+#: src/numfmt.c:1003
+#, c-format
 msgid "invalid format %s (width overflow)"
-msgstr "định dạng chi�u dài sai"
+msgstr "định dạng không hợp lệ %s (độ rộng bị tràn)"
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr "--format padding đè lên --padding"
+
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr "định dạng %s kết thúc bằng %%"
 
-#: src/numfmt.c:1010
+#: src/numfmt.c:1030
 #, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
-msgstr ""
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
+msgstr "định dạng %s không hợp lệ, chỉ dẫn phải là %%[0]['][-][N]f"
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr "định dạng %s có quá nhi�u chỉ thị %%"
 
-#: src/numfmt.c:1070
-#, fuzzy, c-format
-msgid "invalid suffix in input '%s': '%s'"
-msgstr "gặp hậu tố không hợp lệ trong %s%s đối số “%s�"
+#: src/numfmt.c:1081
+#, c-format
+msgid "invalid suffix in input %s: %s"
+msgstr "gặp hậu tố không hợp lệ trong đầu vào %s: “%s�"
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
 msgstr ""
+"giá trị quá lớn để có thể in: “%Lg� (hãy cân nhắc sử dụng tùy ch�n --to)"
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
-msgstr ""
+msgstr "giá trị quá lớn để có thể in: “%Lg� (không thể xử lý giá trị > 999Y)"
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
-msgstr ""
+msgid "large input value %s: possible precision loss"
+msgstr "giá trị đầu vào lớn “%s�: gần như chắc chắn là độ chính xác bị giảm"
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
+"dòng đầu vào quá ngắn, không tìm thấy con số nào để chuyển đổi trong trư�ng "
+"%ld"
 
-#: src/numfmt.c:1388
-#, fuzzy, c-format
-msgid "invalid padding value '%s'"
-msgstr "sai phạm vi trang %s"
+#: src/numfmt.c:1403
+#, c-format
+msgid "invalid padding value %s"
+msgstr "giá trị đệm không hợp lệ “%s�"
 
-#: src/numfmt.c:1401
-#, fuzzy, c-format
-msgid "invalid field value '%s'"
-msgstr "số thứ tự trư�ng sai: %s"
+#: src/numfmt.c:1417
+#, c-format
+msgid "invalid field value %s"
+msgstr "giá trị không hợp lệ cho trư�ng “%s�"
 
-#: src/numfmt.c:1430
-#, fuzzy, c-format
-msgid "invalid header value '%s'"
-msgstr "ngày sai %s�"
+#: src/numfmt.c:1447
+#, c-format
+msgid "invalid header value %s"
+msgstr "giá trị phần đầu không hợp lệ “%s�"
 
-#: src/numfmt.c:1456
-#, fuzzy, c-format
+#: src/numfmt.c:1473
+#, c-format
 msgid "--grouping cannot be combined with --format"
-msgstr "toán hạng tập tin không thể kết hợp với “--file0-from�"
+msgstr "--grouping không thể được tổ hợp cùng với --format"
 
-#: src/numfmt.c:1458
-#, fuzzy, c-format
-msgid "--padding cannot be combined with --format"
-msgstr "toán hạng tập tin không thể kết hợp với “--file0-from�"
-
-#: src/numfmt.c:1463
-#, fuzzy, c-format
+#: src/numfmt.c:1478
+#, c-format
 msgid "no conversion option specified"
-msgstr "đã chỉ ra nhi�u tùy ch�n “-i�"
+msgstr "chưa chỉ ra các tùy ch�n chuyển đổi"
 
-#: src/numfmt.c:1471
-#, fuzzy, c-format
+#: src/numfmt.c:1486
+#, c-format
 msgid "grouping cannot be combined with --to"
-msgstr "toán hạng tập tin không thể kết hợp với “--file0-from�"
+msgstr "việc nhóm không thể được tổ hợp cùng với --to"
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
-msgstr ""
+msgstr "việc nhóm các chữ số không ảnh hưởng đến vùng địa phương này"
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
-msgstr ""
+msgstr "--header bị b� qua với đầu vào dòng-lệnh"
 
-#: src/numfmt.c:1511
-#, fuzzy, c-format
+#: src/numfmt.c:1526
+#, c-format
 msgid "error reading input"
-msgstr "lỗi đ�c %s"
+msgstr "lỗi khi đ�c đầu vào"
 
-#: src/numfmt.c:1520
-#, fuzzy, c-format
+#: src/numfmt.c:1535
+#, c-format
 msgid "failed to convert some of the input numbers"
-msgstr "gặp lỗi khi vô hiệu hoá đầu vào tiêu chuẩn"
+msgstr "gặp lỗi khi chuyển đổi một số con số đầu vào"
 
-#: src/od.c:294
+#: src/od.c:320
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -7165,7 +7341,7 @@ msgstr ""
 "     hoặc: %s --traditional [TÙY_CHỌN]... [TẬP_TIN] [[+]HIỆU[.][b] [+][NHÃN]"
 "[.][b]]\n"
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -7182,8 +7358,7 @@ msgstr ""
 "Khi không có TẬP_TIN, hoặc khi TẬP_TIN là “-�, đ�c đầu vào tiêu chuẩn.\n"
 "\n"
 
-#: src/od.c:307
-#, fuzzy
+#: src/od.c:333
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
 "if the last operand begins with + or (if there are 2 operands) a digit.\n"
@@ -7192,66 +7367,76 @@ msgid ""
 "For OFFSET and LABEL, a 0x or 0X prefix indicates hexadecimal;\n"
 "suffixes may be . for octal and b for multiply by 512.\n"
 msgstr ""
-"\n"
 "Nếu áp dụng cả dạng g�i thứ nhất và thứ hai, thì dạng thứ hai có tác dụng\n"
 "nếu toán hạng cuối cùng bắt đầu với “+� hoặc (nếu có 2 toán hạng) một chữ "
 "số.\n"
 "Một toán hạng HIỆU có nghĩa “-j HIỆU�. NHÃN là một địa chỉ giả lập tại\n"
 "byte đầu tiên được in, tăng lên khi tiến trình đổ đang chạy. �ối với\n"
-"HIỆU và NHÃN, một ti�n tố “0x� hoặc “0X� cho biết nó là thập lục;\n"
+"HIỆU và NHÃN, một ti�n tố “0x� hoặc “0X� cho biết nó là dạng thập lục;\n"
 "hậu tố đuôi có thể là “.� đối với bát phân và “b� để nhân lên 512.\n"
 
-#: src/od.c:318
-#, fuzzy
+#: src/od.c:344
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
-"  -A, --address-radix=CƠ_S�   quyết định cách in các hiệu tập tin\n"
-"  -j, --skip-bytes=BYTE       b� qua BYTE byte đầu tiên từ đầu vào\n"
+"  -A, --address-radix=CƠ_S�   định dạng kết xuất cho offset tập tin. Cơ số "
+"là\n"
+"                                một trong [doxn]. �ây là những chữ viết tắt "
+"của:\n"
+"                                * Decimal cho Thập Phân\n"
+"                                * Octal   Bát Phân\n"
+"                                * heX     Thập lục phân\n"
+"                                * None    không\n"
+"      --endian={big|little}   tráo đổi thứ tự byte tuân theo thứ tự đã cho\n"
+"  -j, --skip-bytes=S�               b� qua S� byte đầu tiên từ đầu vào\n"
 
-#: src/od.c:323
-#, fuzzy
+#: src/od.c:350
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
 "  -N, --read-bytes=BYTE       giới hạn việc đổ thành BYTE byte dữ liệu vào\n"
 "  -S, BYTES --strings[=BYTE]  cho ra các chuỗi của ít nhất BYTE ký tự đồ "
 "h�a\n"
-"  -t, --format=KIỂU           ch�n (các) định dạng kết quả\n"
+"                                3 là mặc định khi không chỉ ra BYTE\n"
+"  -t, --format=KIỂU           ch�n (các) định dạng kết quả, hay các định "
+"dạng\n"
 "  -v, --output-duplicates     không dùng “*� để đánh dấu việc b� dòng\n"
 "  -w[BYTES], --width[=BYTE]   cho ra BYTE byte trên mỗi dòng\n"
-"      --traditional           chấp nhận đối số dạng truy�n thống\n"
+"                                32 là mặc định khi không chỉ ra BYTE\n"
+"      --traditional           chấp nhận đối số ở dạng thứ ba ở trên\n"
 
-#: src/od.c:336
-#, fuzzy
+#: src/od.c:363
 msgid ""
 "\n"
 "\n"
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 "\n"
+"\n"
 "Có thể kết hợp tham số ở dạng truy�n thống; chúng tích lũy:\n"
-" tham số   giống như     ch�n\n"
-"  -a        -t a         ký tự có tên, b� qua bit bậc cao\n"
-"  -b        -t o1        byte bát phân\n"
-"  -c        -t c         ký tự ASCII hoặc ký tự thoát \n"
-"  -d        -t u2        đơn vị hai byte thập phân không có chữ ký\n"
+" tham số   giống như   ch�n:\n"
+"  -a        -t a       ký tự có tên, l� đi bit bậc cao\n"
+"  -b        -t o1      byte bát phân\n"
+"  -c        -t c       ký tự ASCII hoặc ký tự thoát gạch ngược\n"
+"  -d        -t u2      đơn vị hai byte thập phân không dấu\n"
 
-#: src/od.c:345
+#: src/od.c:372
 msgid ""
 "  -f   same as -t fF, select floats\n"
 "  -i   same as -t dI, select decimal ints\n"
@@ -7268,22 +7453,21 @@ msgstr ""
 "  -s        -t d2        đơn vị 2 byte thập phân\n"
 "  -x        -t x2        đơn vị 2 byte thập lục\n"
 
-#: src/od.c:353
-#, fuzzy
+#: src/od.c:380
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 "\n"
-"KIỂU là một hoặc vài dạng sau:\n"
-"  a          ký tự có tên, b� qua bit bậc cao\n"
-"  c          ký tự ASCII hoặc thoát gạch ngược\n"
 "\n"
+"KIỂU làm từ một hoặc vài dạng đặc tả sau đây:\n"
+"  a         ký tự có tên, l� đi bit bậc cao\n"
+"  c         ký tự ASCII hoặc thoát chuỗi gạch ngược\n"
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -7298,8 +7482,7 @@ msgstr ""
 "  u[CỠ]     số thập phân không dấu\n"
 "  x[CỠ]     số thập lục\n"
 
-#: src/od.c:367
-#, fuzzy
+#: src/od.c:394
 msgid ""
 "\n"
 "SIZE is a number.  For TYPE in [doux], SIZE may also be C for\n"
@@ -7308,25 +7491,27 @@ msgid ""
 "for sizeof(double) or L for sizeof(long double).\n"
 msgstr ""
 "\n"
-"CỠ là một số.  �ối với KIỂU doux, CỠ còn có thể là:\n"
+"CỠ là một số.  �ối với KIỂU trong [doux], CỠ còn có thể là:\n"
 "  C   sizeof(char)         kích cỡ ký tự\n"
 "  S   sizeof(short)        kích cỡ ngắn\n"
 "  I   sizeof(int)          kích cỡ số nguyên\n"
 "  L   sizeof(long)         kích cỡ dài\n"
 "Nếu KIỂU là f, CỠ còn có thể là:\n"
 "  F   sizeof(float)        kích cỡ dấu chấm động\n"
-"  D   sizeof(double)       kích cỡ số chính đôi\n"
-"  L   sizeof(long double)  kích cỡ số chính đôi dài\n"
+"  D   sizeof(double)       kích cỡ chính\n"
+"  L   sizeof(long double)  kích cỡ chính đôi dài\n"
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
 "each output line.\n"
 msgstr ""
+"\n"
+"Thêm hậu tố z vào m�i ký tự có thể hiển thị được tại cuối của\n"
+"từng dòng kết xuất.\n"
 
-#: src/od.c:379
-#, fuzzy
+#: src/od.c:406
 msgid ""
 "\n"
 "\n"
@@ -7339,16 +7524,22 @@ msgid ""
 "and so on for G, T, P, E, Z, Y.\n"
 msgstr ""
 "\n"
-"K có thể đặt các hậu tố bội số sau:\n"
-"b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
-"GB 1000*1000*1000, G 1024*1024*1024, và tương tự với T, P, E, Z, Y.\n"
+"\n"
+"BYTES là dạng bát phân với ti�n tố 0x hoặc 0X, và có thể đặt các hậu tố bội "
+"số sau:\n"
+"  b    512\n"
+"  KB   1000\n"
+"  K    1024\n"
+"  MB   1000*1000\n"
+"  M    1024*1024\n"
+"và tương tự với G, T, P, E, Z, Y.\n"
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, c-format
 msgid "invalid type string %s"
 msgstr "sai chuỗi kiểu %s"
 
-#: src/od.c:649
+#: src/od.c:690
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7357,7 +7548,7 @@ msgstr ""
 "sai chuỗi kiểu %s;\n"
 "hệ thống này không cung cấp kiểu tích phân %lu byte"
 
-#: src/od.c:770
+#: src/od.c:811
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7366,36 +7557,36 @@ msgstr ""
 "sai chuỗi kiểu %s;\n"
 "hệ thống này không cung cấp kiểu dấu chấm động %lu byte"
 
-#: src/od.c:828
+#: src/od.c:869
 #, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr "sai ký tự “%c� trong chuỗi kiểu %s"
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr "không thể nhảy qua cuối của dữ liệu vào đã kết hợp"
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr "sai cơ số địa chỉ kết xuất “%c�; nó phải là một ký tự trong [doxn]"
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr "không chỉ ra được kiểu khi đổ các chuỗi"
 
-#: src/od.c:1810
+#: src/od.c:1863
 msgid "compatibility mode supports at most one file"
 msgstr "chế độ tương thích hỗ trợ nhi�u nhất một tập tin"
 
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr "skip-bytes + read-bytes là quá lớn"
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr "cảnh báo: sai chi�u rộng %lu nên dùng %d thay thế"
@@ -7411,16 +7602,14 @@ msgid "standard input is closed"
 msgstr "đầu vào tiêu chuẩn bị đóng"
 
 #: src/paste.c:439
-#, fuzzy
 msgid ""
 "Write lines consisting of the sequentially corresponding lines from\n"
 "each FILE, separated by TABs, to standard output.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
-"Viết các dòng bao gồm chuỗi các dòng tương ứng từ mỗi TẬP_TIN,\n"
+"Viết các dòng bao gồm chuỗi các dòng tương ứng từ từng TẬP_TIN,\n"
 "phân cách nhau bởi TAB, ra đầu ra tiêu chuẩn.\n"
 "Khi không có TẬP_TIN, hoặc khi TẬP_TIN là “-�, đ�c đầu vào tiêu chuẩn.\n"
-"\n"
 
 #: src/paste.c:447
 msgid ""
@@ -7495,7 +7684,7 @@ msgstr "Kaveh Ghazi"
 #. TRANSLATORS: Real name is unknown; at most 19 characters.
 #: src/pinky.c:242
 msgid "        ???"
-msgstr "        ???"
+msgstr "CHƯA �ẶT"
 
 #. TRANSLATORS: Idle time is unknown; at most 5 characters.
 #: src/pinky.c:266
@@ -7515,7 +7704,7 @@ msgstr "Tên thật: "
 #. TRANSLATORS: Real name is unknown; no hard limit.
 #: src/pinky.c:321
 msgid "???\n"
-msgstr "???\n"
+msgstr "CHƯA �ẶT\n"
 
 #: src/pinky.c:341
 #, c-format
@@ -7525,7 +7714,7 @@ msgstr "Thư mục: "
 #: src/pinky.c:343
 #, c-format
 msgid "Shell: "
-msgstr "Shell: "
+msgstr "Hệ v�: "
 
 #: src/pinky.c:362
 #, c-format
@@ -7561,12 +7750,12 @@ msgstr "Lúc"
 msgid "Where"
 msgstr "Tại"
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr "Cách dùng: %s [TÙY_CHỌN]... [NGƯỜI_DÙNG]...\n"
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -7583,7 +7772,7 @@ msgstr ""
 "  -p              b� đi tập tin kế hoạch của ngư�i dùng trong dạng dài\n"
 "  -s              xuất dạng ngắn, đây là mặc định\n"
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -7599,7 +7788,7 @@ msgstr ""
 "nghỉ\n"
 "                  trong dạng ngắn\n"
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, c-format
 msgid ""
 "\n"
@@ -7610,11 +7799,11 @@ msgstr ""
 "Một chương trình “finger� nhẹ;  in ra thông tin v� ngư�i dùng.\n"
 "Tập tin “utmp� sẽ là %s.\n"
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr ""
-"chưa đưa ra tên ngư�i dùng; cần chỉ ra ít nhất một tên ngư�i dùng khi dùng �-"
+"chưa đưa ra tên ngư�i dùng; cần chỉ ra ít nhất một tên ngư�i dùng khi dùng “-"
 "l�"
 
 #. This is a proper name. See the gettext manual, section Names.
@@ -7698,11 +7887,8 @@ msgid "Page %<PRIuMAX>"
 msgstr "Trang %<PRIuMAX>"
 
 #: src/pr.c:2757
-#, fuzzy
 msgid "Paginate or columnate FILE(s) for printing.\n"
-msgstr ""
-"Dàn trang hoặc dàn cột (các) TẬP_TIN để in.\n"
-"\n"
+msgstr "�ánh số trang hoặc dàn cột (các) TẬP_TIN để in.\n"
 
 #: src/pr.c:2763
 msgid ""
@@ -7808,7 +7994,7 @@ msgstr ""
 "  -n[PHÂN_C�CH[CHỮ_S�]], --number-lines[=PHÂN_C�CH[CHỮ_S�]]\n"
 "                    đánh số dòng, sử dụng CHỮ_S� (5) chữ số, sau đó "
 "PHÂN_C�CH (TAB),\n"
-"                    mặc định đếm bắt đầu từ dòng thứ nhất của tập tin nhập "
+"                    mặc định đếm bắt đầu từ dòng thứ nhất của tập tin đầu "
 "vào\n"
 "  -N, --first-line-number=S�\n"
 "                    bắt đầu đếm với S� tại dòng thứ nhất của\n"
@@ -7834,19 +8020,20 @@ msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
 "  -s[K�_TỰ],--separator[=K�_TỰ]\n"
 "                    phân chia các cột bằng một ký tự đơn,\n"
 "                    mặc định cho K�_TỰ là ký tự <TAB> không có “-w�\n"
-"                    và �no char� với “-w�\n"
+"                    và “no char� với “-w�\n"
 "                    “-s[K�_TỰ]� b� việc cắt ngắn dòng của tất cả 3 tùy ch�n "
 "cá»™t\n"
 "                    (-CỘT|-a -CỘT|-m) trừ khi đặt “-w�\n"
 
-#: src/pr.c:2827
+#: src/pr.c:2828
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
 "                    separate columns by STRING,\n"
@@ -7862,7 +8049,7 @@ msgstr ""
 "                    không ảnh hưởng đến các tùy ch�n cột\n"
 "  -t, --omit-header  b� đi phần đầu và phần đi theo của các trang\n"
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 msgid ""
 "  -T, --omit-pagination\n"
 "                    omit page headers and trailers, eliminate any "
@@ -7884,7 +8071,7 @@ msgstr ""
 "                    đặt chi�u rộng trang thành chi�u RỘNG_TRANG (72) ký tự\n"
 "                    chỉ cho kết quả đa cột văn bản, “-s[ký_tự]� tắt đi (72)\n"
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
 "                    set page width to PAGE_WIDTH (72) characters always,\n"
@@ -7898,7 +8085,7 @@ msgstr ""
 "                    cắt ngắn các dòng, trừ khi đặt tùy ch�n “-J�,\n"
 "                    không can thiệp với “-S� hoặc “-s�\n"
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 msgid ""
 "\n"
 "-t is implied if PAGE_LENGTH <= 10.  With no FILE, or when FILE is -, read\n"
@@ -7922,9 +8109,9 @@ msgstr ""
 "\n"
 
 #: src/printenv.c:69
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr ""
-"  -0, --null     kết thúc mỗi dòng kết xuất bằng 0 byte thay cho ký tự dòng "
+"  -0, --null     kết thúc mỗi dòng kết xuất bằng NUL, thay cho ký tự dòng "
 "má»›i\n"
 
 #: src/printf.c:79
@@ -8041,12 +8228,12 @@ msgstr "cảnh báo: b� qua các đối số thừa nên bắt đầu từ %s"
 msgid "F. Pinard"
 msgstr "F. Pinard"
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, c-format
 msgid "%s (for regexp %s)"
 msgstr "%s (cho biểu thức chính quy %s)"
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
@@ -8055,17 +8242,15 @@ msgstr ""
 "Cách dùng: %s [TÙY_CHỌN]... [VÀO]...   (không có “-G�)\n"
 "     hoặc: %s -G [TÙY_CHỌN]... [VÀO [RA]]\n"
 
-#: src/ptx.c:1821
-#, fuzzy
+#: src/ptx.c:1824
 msgid ""
 "Output a permuted index, including context, of the words in the input "
 "files.\n"
 msgstr ""
-"�ưa ra một chỉ mục đã hoán vị, bao gồm ngữ cảnh,\n"
-"của những từ trong các tập tin đưa vào.\n"
-"\n"
+"�ưa ra một chỉ mục đã hoán vị, bao gồm ngữ cảnh, của những từ trong các tập "
+"tin đầu vào.\n"
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
 "  -G, --traditional              behave more like System V 'ptx'\n"
@@ -8075,7 +8260,7 @@ msgstr ""
 "  -G, --traditional              làm việc giống với “ptx� của System V\n"
 "  -F, --flag-truncation=CHUỖI    dùng CHUỖI để đánh dấu sự cắt dòng\n"
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
 "  -O, --format=roff              generate output as roff directives\n"
@@ -8086,12 +8271,12 @@ msgstr ""
 "  -M, --macro-name=CHUỖI         tên vĩ lệnh để sử dụng thay cho “xx�\n"
 "  -O, --format=roff              tạo ra kết quả như chỉ thị roff\n"
 "  -R, --right-side-refs          đặt sự chỉ đến ở bên phải, không đếm trong "
-"�-w�\n"
+"“-w�\n"
 "  -S, --sentence-regexp=BTCQ     cho cuối các dòng hoặc cuối các câu\n"
 "                                   (BTCQ: biểu thức chính quy)\n"
 "  -T, --format=tex               tạo kết quả như chỉ thị TeX\n"
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -8109,7 +8294,7 @@ msgstr ""
 "  -i, --ignore-file=TẬP_TIN      đ�c danh sách từ b� qua từ TẬP_TIN\n"
 "  -o, --only-file=TẬP_TIN        chỉ đ�c danh sách từ từ TẬP_TIN này\n"
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -8122,16 +8307,16 @@ msgstr ""
 "  -w, --width=S�                 chi�u rộng kết quả theo cột, b� đi sự tham "
 "khảo\n"
 
-#: src/ptx.c:1854
+#: src/ptx.c:1857
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
 "\n"
-"Khi không có TẬP_TIN hoặc khi TẬP_TIN là “-�, đ�c đầu vào tiêu chuẩn. “-F /� "
-"theo mặc định.\n"
+"Không chỉ ra TẬP_TIN, hoặc khi TẬP_TIN là “-�, thì đ�c từ đầu vào tiêu "
+"chuẩn. Mặc định là “-F /�.\n"
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, c-format
 msgid "invalid gap width: %s"
 msgstr "chi�u rộng chỗ trống sai: %s"
@@ -8149,26 +8334,33 @@ msgid ""
 "  -L, --logical   use PWD from environment, even if it contains symlinks\n"
 "  -P, --physical  avoid all symlinks\n"
 msgstr ""
-"  -L, --logical   dùng PWD từ môi trư�ng, thậm chí nếu nó chứa liên kết "
-"tượng trưng\n"
-"  -P, --physical  tránh m�i liên kết tượng trưng\n"
+"  -L, --logical   dùng PWD từ môi trư�ng, thậm chí nếu nó chứa liên kết m�m\n"
+"  -P, --physical  tránh m�i liên kết m�m\n"
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+"\n"
+"Nếu không có tùy ch�n nào được chỉ ra, thì coi là -P.\n"
+
+#: src/pwd.c:169
 #, c-format
 msgid "failed to chdir to %s"
 msgstr "gặp lỗi khi chdir (chuyển đổi thư mục) sang %s"
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, c-format
 msgid "failed to stat %s"
 msgstr "gặp lỗi khi stat (lấy trạng thái v�) %s"
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr "không tìm thấy mục nhập thư mục trong %s có inode tương ứng"
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, c-format
 msgid "ignoring non-option arguments"
 msgstr "đang b� qua các đối số không-phải-tùy-ch�n"
@@ -8178,8 +8370,8 @@ msgstr "đang b� qua các đối số không-phải-tùy-ch�n"
 msgid "Dmitry V. Levin"
 msgstr "Dmitry V. Levin"
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Cách dùng: %s [TÙY_CHỌN]... TẬP_TIN...\n"
@@ -8212,7 +8404,6 @@ msgstr ""
 "            tất cả thành phầu của đư�ng dẫn phải tồn tại\n"
 
 #: src/readlink.c:75
-#, fuzzy
 msgid ""
 "  -m, --canonicalize-missing    canonicalize by following every symlink in\n"
 "                                every component of the given name "
@@ -8223,21 +8414,23 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 "  -m, --canonicalize-missing    làm hợp quy tắc bằng cách theo đệ quy\n"
-"            m�i liên kết m�m sau trong m�i thành phần của đư�ng dẫn đưa ra,\n"
-"            và không cần sự tồn tại của các thành phần\n"
+"                                 m�i liên kết m�m sau trong m�i thành phần\n"
+"                                 của đư�ng dẫn đưa ra, và không cần sự\n"
+"                                 tồn tại của các thành phần\n"
 "  -n, --no-newline              không đưa ra ký tự dòng mới đi theo\n"
-"  -q, --quiet                   không xuất chi tiết\n"
+"  -q, --quiet,\n"
 "  -s, --silent                  b� đi hầu hết các thông báo lỗi\n"
 "  -v, --verbose                 báo cáo các thông báo lỗi\n"
+"  -z, --zero                    ngăn cách kết xuất bằng NUL thay vì dòng "
+"má»›i\n"
 
 #: src/readlink.c:152
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring --no-newline with multiple arguments"
-msgstr "đang b� qua các đối số không-phải-tùy-ch�n"
+msgstr "bở qua tùy ch�n --no-newline khi có nhi�u đối số"
 
 #: src/realpath.c:72
 msgid ""
@@ -8259,7 +8452,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 "  -e, --canonicalize-existing  tất cả các bộ phận hợp thành đư�ng đẫn phải "
@@ -8270,8 +8463,9 @@ msgstr ""
 "m�m\n"
 "  -P, --physical               giải quyết liên kết m�m khi gặp (mặc định)\n"
 "  -q, --quiet                  ngăn chặn phần lớn các báo lỗi\n"
-"      --relative-to=FILE       in ra đư�ng dẫn tương đối với FILE\n"
-"      --relative-base=FILE     in ra đư�ng dẫn tuyệt đối với FILE trừ các\n"
+"      --relative-to=TẬP-TIN    in ra đư�ng dẫn tương đối với TẬP-TIN\n"
+"      --relative-base=TẬP-TIN  in ra đư�ng dẫn tuyệt đối với TẬP-TIN trừ "
+"các\n"
 "                                đư�ng dẫn nằm trong\n"
 "  -s, --strip, --no-symlinks   không mở rộng liên kết m�m\n"
 "  -z, --zero                   ngăn cách kết xuất với NUL thay vì tạo dòng "
@@ -8292,41 +8486,42 @@ msgstr "%s: đi vào thư mục đã bảo vệ chống ghi %s không? "
 msgid "%s: descend into directory %s? "
 msgstr "%s: đi vào thư mục %s không? "
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr "%s: xóa %s có bảo vệ chống ghi đè %s không?(k/c) "
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, c-format
 msgid "%s: remove %s %s? "
 msgstr "%s: xóa %s %s không?(k/c) "
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, c-format
 msgid "removed directory: %s\n"
 msgstr "đã xóa thư mục: %s\n"
 
-#: src/remove.c:444
+#: src/remove.c:447
 #, c-format
-msgid "cannot remove directory: %s"
-msgstr "không xóa được thư mục: %s"
+msgid "refusing to remove %s or %s directory: skipping %s"
+msgstr "từ chối gỡ b� thư mục %s hay %s: b� qua %s"
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr "đang b� qua %s, vì nó nằm trên thiết bị khác"
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, c-format
 msgid "traversal failed: %s"
 msgstr "lỗi theo cây: %s"
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -8358,18 +8553,18 @@ msgstr ""
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 "  -I                    h�i mỗi một lần xóa nhi�u hơn 3 tập tin, hoặc:\n"
 "                         khi di chuyển đệ quy. �t phi�n toái hơn“-i�\n"
 "                         trong khi vẫn đưa lại khả năng bảo vệ tránh\n"
 "                         kh�i phần lớn lỗi.\n"
-"      --interactive[=KHI]  h�i KHI nào:\n"
+"      --interactive[=KHI]  h�i KHI:\n"
 "                             * never        không bao gi�\n"
 "                             * once (-I)    một lần\n"
 "                             * always (-i)  luôn luôn\n"
@@ -8438,17 +8633,19 @@ msgstr ""
 "Chú ý rằng nếu dùng lệnh “rm� để xóa b� một tập tin nào đó,\n"
 "vẫn có khả năng phục hồi một phần hoặc toàn bộ nội dung của tập tin đó\n"
 "(nếu có đủ kỹ năng và/hay th�i gian).\n"
-"�ể đảm bảo rằng nội dung không phục hồi được, hãy sử dụng “shred�.\n"
+"�ể đảm bảo rằng nội dung không phục hồi được, hãy sử dụng lệnh “shred�.\n"
 
 #: src/rm.c:342
 #, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr "%s: xóa đệ quy m�i đối số không? "
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] "%s: xóa đệ quy %zu đối số không? "
 
-#: src/rm.c:343
+#: src/rm.c:345
 #, c-format
-msgid "%s: remove all arguments? "
-msgstr "%s: xóa m�i đối số không? "
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] "%s: xóa %zu đối số không? "
 
 #: src/rmdir.c:134 src/rmdir.c:233
 #, c-format
@@ -8501,12 +8698,13 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
+"Chạy một ứng dụng trong một ngữ cảnh bảo mật SELinux khác.\n"
+"Nếu không có NGỮ-CẢNH hoặc không LỆNH, hiển thị ngữ cảnh bảo mật hiện tại.\n"
 
 #: src/runcon.c:94
-#, fuzzy
 msgid ""
 "  CONTEXT            Complete security context\n"
 "  -c, --compute      compute process transition context before modifying\n"
@@ -8516,13 +8714,10 @@ msgid ""
 "  -l, --range=RANGE  levelrange\n"
 "\n"
 msgstr ""
-"Chạy chương trình ở ngữ cảnh bảo mật khác.\n"
-"Không có NGỮ_CẢNH, cũng không có LỆNH thì in ra ngữ cảnh bảo mật hiện th�i.\n"
-"\n"
-"  NGỮ_CẢNH           ngữ cảnh bảo mật hoàn toàn\n"
+"  NGỮ_CẢNH           toàn bộ ngữ cảnh bảo mật\n"
 "  -c, --compute      tính ngữ cảnh chuyển tiếp tiến trình trước khi sửa đổi\n"
 "  -t, --type=KIỂU    kiểu (cho cùng một vai tr� với đi�u mẹ)\n"
-"  -u, --user=NGƯỜI_DÙNG    nhận diện ngư�i dùng\n"
+"  -u, --user=NGƯỜI_DÙNG định danh ngư�i dùng\n"
 "  -r, --role=VAI_TRÒ vai trò\n"
 "  -l, --range=PHẠM_VI phạm vi cấp\n"
 "\n"
@@ -8555,48 +8750,53 @@ msgstr "gặp lỗi khi lấy ngữ cảnh hiện th�i"
 #: src/runcon.c:187
 #, c-format
 msgid "you must specify -c, -t, -u, -l, -r, or context"
-msgstr "phải ghi rõ tùy ch�n “-c�, “-t�, “-u�, “-l�, “-r� hay ngữ cảnh"
+msgstr "phải chỉ định tùy ch�n “-c�, “-t�, “-u�, “-l�, “-r� hay ngữ cảnh"
 
 #: src/runcon.c:195
 #, c-format
 msgid "no command specified"
-msgstr "chưa ghi rõ lệnh"
+msgstr "chưa chỉ định lệnh"
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr "%s dùng được chỉ với hạt nhân SELinux"
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, c-format
 msgid "failed to compute a new context"
 msgstr "gặp lỗi khi tính ngữ cảnh mới"
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, c-format
 msgid "failed to set new user %s"
 msgstr "gặp lỗi khi đặt ngư�i dùng mới %s"
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, c-format
 msgid "failed to set new type %s"
 msgstr "gặp lỗi khi đặt kiểu mới %s"
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, c-format
 msgid "failed to set new range %s"
 msgstr "gặp lỗi khi đặt phạm vi mới %s"
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, c-format
 msgid "failed to set new role %s"
 msgstr "gặp lỗi khi đặt vai trò mới %s"
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, c-format
 msgid "unable to set security context %s"
 msgstr "không thể đặt ngữ cảnh bảo mật %s"
 
+#: src/selinux.c:127 src/selinux.c:300
+#, c-format
+msgid "error canonicalizing %s"
+msgstr "không thể chuẩn hóa (canonicalizing) %s"
+
 #: src/seq.c:68
 #, c-format
 msgid ""
@@ -8606,21 +8806,18 @@ msgid ""
 msgstr ""
 "Cách dùng: %s [TÙY_CHỌN]... CU�I\n"
 "     hoặc: %s [TÙY_CHỌN]... �ẦU CU�I\n"
-"     hoặc: %s [TÙY_CHỌN]... �ẦU �Ộ_TĂNG CU�I\n"
+"     hoặc: %s [TÙY_CHỌN]... �ẦU CÔNG_SAI CU�I\n"
 
 #: src/seq.c:73
 msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n"
-msgstr ""
+msgstr "In ra các con số từ �ẦU đến CU�I, tăng theo BƯỚC.\n"
 
 #: src/seq.c:79
-#, fuzzy
 msgid ""
 "  -f, --format=FORMAT      use printf style floating-point FORMAT\n"
 "  -s, --separator=STRING   use STRING to separate numbers (default: \\n)\n"
 "  -w, --equal-width        equalize width by padding with leading zeroes\n"
 msgstr ""
-"In các số từ �ẦU đến CU�I, cộng thêm �Ộ_TĂNG sau mỗi số.\n"
-"\n"
 "  -f, --format=�ỊNH_DẠNG   sử dụng �ỊNH_DẠNG dấu chấm động kiểu printf\n"
 "  -s, --separator=CHUỖI    dùng CHUỖI để phân cách các số (mặc định: \\n)\n"
 "  -w, --equal-width        cân bằng chi�u rộng bằng cách thêm các số 0 vào "
@@ -8631,121 +8828,62 @@ msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
 msgstr ""
 "\n"
-"Nếu b� qua �ẦU hoặc �Ộ_TĂNG, thì mặc định thành 1.\n"
-"Tức là �Ộ_TĂNG bị b� qua mặc định thành 1 thậm chí khi CU�I nh� hơn �ẦU.\n"
-"�ẦU, �Ộ_TĂNG, và CU�I biên dịch như các giá trị dấu chấm động.\n"
-"�Ộ_TĂNG thư�ng là dương nếu �ẦU nh� hơn CU�I,\n"
-"và �Ộ_TĂNG thư�ng là âm nếu �ẦU lớn hơn CU�I.\n"
+"Nếu b� qua �ẦU hoặc CÔNG_SAI, thì mặc định là 1. Tức là, CÔNG_SAI\n"
+"bị b� qua, mặc định đặt thành 1 ngay cả khi CU�I nh� hơn �ẦU.\n"
+"Chuỗi số được kết thúc khi tổng giá trị của số hiện tại và\n"
+"CÔNG_SAI sẽ trở nên lớn hơn CU�I.\n"
+"�ẦU, CÔNG_SAI, và CU�I biên dịch như các giá trị dấu chấm động.\n"
+"CÔNG_SAI thư�ng là dương nếu �ẦU nh� hơn CU�I, và\n"
+"CÔNG_SAI thư�ng là âm nếu �ẦU lớn hơn CU�I.\n"
 
-#: src/seq.c:94
+#: src/seq.c:96
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
 "it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n"
 "decimal numbers with maximum precision PREC, and to %g otherwise.\n"
 msgstr ""
 "�ỊNH_DẠNG phải thích hợp để in ra một đối số kiểu “double�;\n"
-"nó có giá trị mặc định là “%.PRECf� nếu �ẦU, �Ộ_TĂNG, và CU�I\n"
+"nó có giá trị mặc định là “%.PRECf� nếu �ẦU, CÔNG_SAI, và CU�I\n"
 "đ�u là số thập phân dấu chấm cố định có độ chính xác tối đa PREC,\n"
 "và nếu không thì là %g.\n"
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, c-format
 msgid "invalid floating point argument: %s"
 msgstr "sai đối số dấu chấm động: %s"
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr "không hiểu định dạng %s có chỉ thị %%%c"
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr ""
 "không được chỉ ra chuỗi định dạng khi in các chuỗi có chi�u rộng bằng nhau"
 
-#: src/setuidgid.c:49
-#, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-"Cách dùng: %s [TÙY_CHỌN_NGẮN]... NGƯỜI_DÙNG LỆNH [��I_S�]...\n"
-"     hoặc: %s TÙY_CHỌN_DÀI\n"
-
-#: src/setuidgid.c:55
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-"B� m�i nhóm phụ, giả sử ID ngư�i dùng và ID nhóm của NGƯỜI_DÙNG\n"
-"chỉ ra (ID thuộc số hay tên ngư�i dùng), và chạy câu LỆNH với m�i ��I_S� đưa "
-"ra.\n"
-"Thoát với trạng thái 111 nếu không thể dùng UID và GID yêu cầu.\n"
-"Nếu không, thoát với trạng thái thoát của câu LỆNH.\n"
-"Chương trình này chỉ có ích khi chạy bởi root (UID=0).\n"
-"\n"
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-"  -g GID[,GID1...]  cũng đặt ID nhóm chính thành GID thuộc số\n"
-"                     và (nếu chỉ ra) đặt các ID nhóm phụ thành GID1, ...\n"
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr "ID ngư�i dùng lạ: %s"
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr "để sử dụng ID ngư�i dùng %s thì phải cũng dùng tùy ch�n “-g�"
-
-#: src/setuidgid.c:190
-#, c-format
-msgid "failed to set supplemental group(s)"
-msgstr "gặp lỗi khi đặt (các) nhóm phụ"
-
-#: src/setuidgid.c:200
-#, c-format
-msgid "cannot set group-ID to %lu"
-msgstr "không đặt được ID nhóm thành %lu"
-
-#: src/setuidgid.c:204
-#, c-format
-msgid "cannot set user-ID to %lu"
-msgstr "không đặt được ID ngư�i dùng thành %lu"
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr "Colin Plumb"
 
-#: src/shred.c:148
-#, fuzzy
+#: src/shred.c:170
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
 "for even very expensive hardware probing to recover the data.\n"
 msgstr ""
-"Ghi đè nhi�u lần (các) TẬP_TIN chỉ ra, để làm cho việc phục hồi dù\n"
+"Viết chèn nhi�u lần (các) TẬP_TIN chỉ ra, để làm cho việc phục hồi dù\n"
 "bằng các thiết bị đắt ti�n cũng khó khăn.\n"
-"\n"
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -8754,48 +8892,55 @@ msgid ""
 "  -s, --size=N   shred this many bytes (suffixes like K, M, G accepted)\n"
 msgstr ""
 "  -f, --force    Thay đổi quy�n hạn để cho phép ghi nhớ nếu cần thiết\n"
-"  -n, --iterations=S�    ghi đè S� lần thay cho giá trị mặc định (%d)\n"
-"      --random-source=TẬP_TIN    Lấy các byte ngẫu nhiên từ tập tin này\n"
+"  -n, --iterations=S�  ghi đè S� lần thay cho giá trị mặc định (%d)\n"
+"      --random-source=TẬP_TIN  Lấy các byte ngẫu nhiên từ tập tin này\n"
 "  -s, --size=N   shred số byte này (chấp nhận các hậu tố K, M, G, v.d. "
 "“102K�)\n"
 
-#: src/shred.c:161
+#: src/shred.c:183
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
 "  -z, --zero     add a final overwrite with zeros to hide shredding\n"
 msgstr ""
-"  -u, --remove   cắt ngắn và xóa tập tin sau khi ghi đè\n"
+"  -u, --remove[=HOW] cắt ngắn và xóa tập tin sau khi ghi đè; Xem ở dưới\n"
 "  -v, --verbose  hiển thị tiến trình\n"
 "  -x, --exact    không làm tròn kích cỡ tập tin đến khối đầy tiếp theo;\n"
 "                   đây là mặc định cho các tập tin không thông thư�ng\n"
 "  -z, --zero     thêm một lần ghi đè cuối cùng bằng các số 0 để giấu việc "
 "dùng shred\n"
 
-#: src/shred.c:170
+#: src/shred.c:192
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 "\n"
 "Nếu TẬP_TIN là “-�, shred đầu ra tiêu chuẩn.\n"
 "\n"
 "Xóa (các) TẬP_TIN nếu có chỉ ra “--remove� (-u).\n"
-"Mặc định là không xóa tập tin vì nó thư�ng thao tác trên tập tin thiết bị\n"
+"Mặc định là không xóa tập tin vì lệnh thư�ng thao tác trên tập tin thiết bị\n"
 "như “/dev/hda�, và không nên xóa b� những tập tin này.\n"
-"Khi thao tác trên tập tin thông thư�ng, phần lớn ngư�i dùng sử dụng\n"
-"tùy ch�n “--remove�.\n"
+"�ối số của tùy ch�n HOW chỉ ra cách gỡ b� các mục tin thư mục:\n"
+"“unlink� => dùng cú g�i unlink tiêu chuẩn.\n"
+"“wipe� => cũng tẩy các byte đầu trong tên.\n"
+"“wipesync� => cũng đồng bộ từng byte xóa lên đĩa.\n"
+"Chế độ mặc định là “wipesync�. nhưng nó có thể hơi xoa hoa.\n"
 "\n"
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -8813,7 +8958,7 @@ msgstr ""
 "thực hiện đúng trên chúng ở m�i chế độ của hệ thống tập tin:\n"
 "\n"
 
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -8834,7 +8979,7 @@ msgstr ""
 "  NFS Network Appliance\n"
 "\n"
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -8848,7 +8993,7 @@ msgstr ""
 "* hệ thống tập tin đã nén\n"
 "\n"
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -8863,144 +9008,144 @@ msgstr ""
 "(thì shred chỉ có tác động bị hạn chế) chỉ ở chế độ “data=journal�\n"
 "(dữ liệu = nhật ký), mà làm nhật ký các dữ liệu thêm vào chỉ siêu dữ liệu.\n"
 "Trong cả hai chế độ “data=ordered� (dữ liệu = thứ tự) (mặc định)\n"
-"và “data=writeback� (dữ liệu = ghi v�), shred thức hiện như bình thư�ng.\n"
+"và “data=writeback� (dữ liệu = ghi ngược), shred thực hiện như bình thư�ng.\n"
 "Vẫn còn có thể thay đổi chế độ làm nhật ký của ext3 bằng cách thêm\n"
 "tùy ch�n “data=gì� vào các tùy ch�n gắn kết cho một hệ thống tập tin nào đó\n"
 "trong tập tin “/etc/fstab�, như diễn tả trên trang hướng dẫn v� chức năng\n"
 "mount (man mount).\n"
 "\n"
 
-#: src/shred.c:215
+#: src/shred.c:241
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
 "of the file that cannot be removed, and that will allow a shredded file\n"
 "to be recovered later.\n"
 msgstr ""
-"Thêm vào đó, bản sao lưu hệ thống tập tin và máy nhân ở xa\n"
+"Thêm vào đó, bản sao lưu hệ thống tập tin và máy chứa bản sao ở xa\n"
 "có thể chứa bản sao của tập tin không thể xóa, và do đó cho phép\n"
 "phục hồi tập tin đã bị tẩy bởi shred.\n"
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, c-format
 msgid "%s: fdatasync failed"
 msgstr "%s: fdatasync bị lỗi"
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr "%s: fsync bị lỗi"
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr "%s: không thể tua lại"
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr "%s: thực hiện %lu/%lu (%s)..."
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, c-format
 msgid "%s: error writing at offset %s"
 msgstr "%s: lỗi ghi tại hiệu %s"
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s: lseek bị lỗi"
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, c-format
 msgid "%s: file too large"
 msgstr "%s: tập tin quá lớn"
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr "%s: lần %lu/%lu (%s)...%s"
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr "%s: lần %lu/%lu (%s)...%s/%s %d%%"
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, c-format
 msgid "%s: fstat failed"
 msgstr "%s: fstat bị lỗi"
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, c-format
 msgid "%s: invalid file type"
 msgstr "%s: sai dạng tập tin"
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr "%s: tập tin có kích cỡ âm"
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, c-format
 msgid "%s: error truncating"
 msgstr "%s: lỗi cắt ngắn"
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, c-format
 msgid "%s: fcntl failed"
 msgstr "%s: fcntl bị lỗi"
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr "%s: không thể shred mô tả tập tin chỉ cho phép nối thêm vào"
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr "%s: đang xóa"
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, c-format
 msgid "%s: renamed to %s"
 msgstr "%s: đã đổi tên thành %s"
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, c-format
 msgid "%s: failed to remove"
 msgstr "%s: lỗi xóa"
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr "%s: đã xóa"
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, c-format
 msgid "%s: failed to close"
 msgstr "%s: lỗi đóng"
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, c-format
 msgid "%s: failed to open for writing"
 msgstr "%s: lỗi mở để ghi"
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, c-format
 msgid "%s: invalid number of passes"
 msgstr "%s: sai số lần thực hiện"
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, c-format
 msgid "multiple random sources specified"
 msgstr "đã chỉ ra nhi�u nguồn ngẫu nhiên"
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, c-format
 msgid "%s: invalid file size"
 msgstr "%s: sai kích cỡ tập tin"
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -9011,15 +9156,12 @@ msgstr ""
 "     hoặc: %s -e [TÙY_CHỌN]... [�.S�]...\n"
 "     hoặc: %s -i LO-HI [TÙY_CHỌN]...\n"
 
-#: src/shuf.c:54
-#, fuzzy
+#: src/shuf.c:67
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr ""
-"In ra đầu ra tiêu chuẩn một tập hợp hoán vị ngẫu nhiên của các dòng nhập "
-"vào.\n"
-"\n"
+"In ra đầu ra tiêu chuẩn một tập hợp hoán vị ngẫu nhiên các dòng đầu vào.\n"
 
-#: src/shuf.c:60
+#: src/shuf.c:73
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
 "  -i, --input-range=LO-HI   treat each number LO through HI as an input "
@@ -9027,43 +9169,52 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
 msgstr ""
-"  -e, --echo                coi mỗi �.S� là một dòng nhập vào\n"
-"  -i, --input-range=THẤP-CAO  coi mỗi con số từ THẤP đến CAO là\n"
-"                            một dòng nhập vào\n"
-"  -n, --head-count=S�       xuất nhi�u nhất S� dòng\n"
+"  -e, --echo                coi mỗi �.S� là một dòng đầu vào\n"
+"  -i, --input-range=THẤP-CAO coi mỗi con số từ THẤP đến CAO là\n"
+"                              một dòng đầu vào\n"
+"  -n, --head-count=S�_LƯỢNG xuất nhi�u nhất là S� dòng\n"
 "  -o, --output=TẬP_TIN      ghi kết quả vào tập tin này,\n"
 "                            thay cho đầu ra tiêu chuẩn\n"
 "      --random-source=TẬP_TIN  lấy các byte ngẫu nhiên từ tập tin này\n"
-"  -z, --zero-terminated     kết thúc dòng bằng 0 byte, không phải ký tự dòng "
-"má»›i\n"
+"  -r, --repeat              các dòng xuất có thể được lặp lại\n"
 
-#: src/shuf.c:244
+#: src/shuf.c:228
+#, c-format
+msgid "too many input lines"
+msgstr "quá nhi�u dòng đầu vào"
+
+#: src/shuf.c:431
 #, c-format
 msgid "multiple -i options specified"
 msgstr "đã chỉ ra nhi�u tùy ch�n “-i�"
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, c-format
 msgid "invalid input range %s"
-msgstr "sai phạm vi nhập vào %s"
+msgstr "vùng đầu vào %s không hợp lệ"
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, c-format
 msgid "invalid line count %s"
 msgstr "sai đếm dòng %s"
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, c-format
 msgid "multiple output files specified"
 msgstr "đã chỉ ra nhi�u tập tin kết quả"
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, c-format
 msgid "cannot combine -e and -i options"
 msgstr "không thể kết hợp hai tùy ch�n “-e� và “-i�"
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr "không có dòng nào để lặp"
+
 #: src/sleep.c:44
 #, c-format
 msgid ""
@@ -9085,30 +9236,26 @@ msgstr ""
 " * m    phút\n"
 " * h    gi�\n"
 " * d    ngày\n"
-"Không giống như phần lớn bản thực hiện yêu cầu S� là số nguyên,\n"
-"ở đây S� có thể là số thực dấu chấm động.\n"
-"�ưa ra hai đối số hoặc nhi�u hơn thì tạm dừng trong th�i gian là tổng các "
-"giá trị đó.\n"
+"Không giống như phần lớn mã thực thi yêu cầu S� là số nguyên,\n"
+"ở đây S� có thể là số thực dấu chấm động. �ưa ra hai đối số\n"
+"hoặc nhi�u hơn thì tạm dừng trong th�i gian là tổng các giá trị đó.\n"
 "\n"
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, c-format
 msgid "invalid time interval %s"
 msgstr "sai khoảng th�i gian %s"
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr "không đ�c được đồng hồ th�i gian thực"
 
-#: src/sort.c:399
-#, fuzzy
+#: src/sort.c:427
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
-msgstr ""
-"Ghi ra đầu ra tiêu chuẩn bản ghép nối đã sắp xếp của tất cả TẬP_TIN.\n"
-"\n"
+msgstr "Ghi ra đầu ra tiêu chuẩn bản ghép nối đã sắp xếp của tất cả TẬP_TIN.\n"
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
@@ -9116,7 +9263,7 @@ msgstr ""
 "Tùy ch�n sắp xếp:\n"
 "\n"
 
-#: src/sort.c:409
+#: src/sort.c:437
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
 "  -d, --dictionary-order      consider only blanks and alphanumeric "
@@ -9127,7 +9274,7 @@ msgstr ""
 "  -d, --dictionary-order      tính chỉ các dấu cách và các ký tự chữ-cái/số\n"
 "  -f, --ignore-case           tính chữ thư�ng là chữ hoa\n"
 
-#: src/sort.c:415
+#: src/sort.c:443
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
 "  -i, --ignore-nonprinting    consider only printable characters\n"
@@ -9135,15 +9282,15 @@ msgid ""
 msgstr ""
 "  -g, --general-numeric-sort  so sánh theo giá trị thuộc số kiểu chung\n"
 "  -i, --ignore-nonprinting    tính chỉ các ký tự có thể in được\n"
-"  -M, --month-sort            so sánh (không hiểu) < “Th1� < ... < �Th12�\n"
+"  -M, --month-sort            so sánh (không hiểu) < “Th1� < ... < “Th12�\n"
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 "  -h, --human-numeric-sort    so sánh các số mà ngư�i đ�c được (v.d. 2K 1G)\n"
 
-#: src/sort.c:423
+#: src/sort.c:451
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
 "  -R, --random-sort           sort by random hash of keys\n"
@@ -9155,7 +9302,7 @@ msgstr ""
 "      --random-source=TẬP_TIN lấy các byte ngẫu nhiên từ tập tin này\n"
 "  -r, --reverse               đảo ngược kết quả so sánh\n"
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -9164,18 +9311,18 @@ msgid ""
 "  -V, --version-sort          natural sort of (version) numbers within text\n"
 "\n"
 msgstr ""
-"      --sort=TỪ             sắp xếp theo TỪ:\n"
-" * general-numeric -g\t\tthuộc số kiểu chung\n"
-" * human-numeric -h\t\tthuộc số kiểu ngư�i\n"
-" * month -M\t\t\t\ttháng\n"
-" * numeric -n\t\t\tthuộc số\n"
-" * random -R\t\t\tngẫu nhiên\n"
-" * version -V\t\t\tphiên bản\n"
+"      --sort=TỪ               sắp xếp theo TỪ:\n"
+"                               * general-numeric -g\t\tthuộc số kiểu chung\n"
+"                               * human-numeric -h\t\tthuộc số kiểu ngư�i\n"
+"                               * month -M\t\t\t\ttháng\n"
+"                               * numeric -n\t\t\tthuộc số\n"
+"                               * random -R\t\t\tngẫu nhiên\n"
+"                               * version -V\t\t\tphiên bản\n"
 "  -V, --version-sort          sắp xếp số thứ tự (phiên bản) một cách tự "
 "nhiên bên trong văn bản\n"
 "\n"
 
-#: src/sort.c:437
+#: src/sort.c:465
 msgid ""
 "Other options:\n"
 "\n"
@@ -9183,7 +9330,7 @@ msgstr ""
 "Tùy ch�n khác:\n"
 "\n"
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
@@ -9191,7 +9338,7 @@ msgstr ""
 "      --batch-size=S�      gộp lại đồng th�i nhi�u nhất S� đầu vào;\n"
 "                           nếu cần hơn, hãy sử dụng các tập tin tạm th�i\n"
 
-#: src/sort.c:445
+#: src/sort.c:473
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
 "  -C, --check=quiet, --check=silent  like -c, but do not report first bad "
@@ -9208,7 +9355,7 @@ msgstr ""
 "                          nén các đồ tạm th�i bằng chương trình này;\n"
 "                          để giải nén cũng đặt “-d�\n"
 
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -9216,13 +9363,17 @@ msgid ""
 "                            NUL-terminated names in file F;\n"
 "                            If F is - then read names from standard input\n"
 msgstr ""
-"      --debug               ,\n"
-"                              and warn about questionable usage to stderr\n"
-"      --files0-from=F       read input from the files specified by\n"
-"                            NUL-terminated names in file F;\n"
-"                            If F is - then read names from standard input\n"
+"      --debug               diễn giải thành phần của dòng được dùng để sắp "
+"xếp,\n"
+"                              và cảnh báo v� các dùng đáng ng� ra đầu ra lỗi "
+"chuẩn\n"
+"      --files0-from=F       đ�c các tên đầu vào từ tập tin đã chỉ ra.\n"
+"                            các tên trong tập tin F được ngăn cách bằn ký tự "
+"NUL;\n"
+"                            Nếu F là - thì đ�c các tên này từ đầu vào tiêu "
+"chuẩn\n"
 
-#: src/sort.c:459
+#: src/sort.c:487
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
 "  -m, --merge               merge already sorted files; do not sort\n"
@@ -9231,7 +9382,7 @@ msgstr ""
 "  -m, --merge               hòa trộn các tập tin đã sắp xếp rồi; chứ không\n"
 "                            sắp xếp\n"
 
-#: src/sort.c:463
+#: src/sort.c:491
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "  -s, --stable              stabilize sort by disabling last-resort "
@@ -9244,7 +9395,7 @@ msgstr ""
 "lại cuối cùng\n"
 "  -S, --buffer-size=CỠ      dùng CỠ cho bộ nhớ đệm chính\n"
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -9267,12 +9418,7 @@ msgstr ""
 "  -u, --unique            nếu có “-c�, kiểm tra có thứ tự chặt chẽ;\n"
 "                          khi không có “-c�, chỉ xuất kết quả chạy đầu tiên\n"
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr ""
-"  -z, --zero-terminated   kết thúc dòng với 0 byte, thay cho ký tự dòng mới\n"
-
-#: src/sort.c:483
+#: src/sort.c:511
 msgid ""
 "\n"
 "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is "
@@ -9304,7 +9450,7 @@ msgstr ""
 "\n"
 "CỠ có thể theo bởi hậu tố là bội số của:\n"
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -9324,254 +9470,238 @@ msgstr ""
 "Biến môi trư�ng địa phương ảnh hưởng đến thứ tự sắp xếp.\n"
 "�ặt “LC_ALL=C� để dùng thứ tự sắp xếp truy�n thống theo giá trị byte gốc.\n"
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, c-format
 msgid "waiting for %s [-d]"
 msgstr "đang đợi %s [-d]"
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr "%s [-d] đã chấm dứt bất thư�ng"
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, c-format
 msgid "cannot create temporary file in %s"
 msgstr "không tạo được tập tin tạm th�i trong %s"
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr "gặp lỗi khi mở"
 
-#: src/sort.c:970
+#: src/sort.c:998
 msgid "fflush failed"
 msgstr "fflush bị lỗi"
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr "gặp lỗi khi đóng"
 
-#: src/sort.c:986
-#, c-format
-msgid "dup2 failed"
-msgstr "dup2 bị lỗi"
-
-#: src/sort.c:1103
-#, c-format
-msgid "couldn't execute %s"
-msgstr "không thể thực hiện %s"
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 msgid "couldn't create temporary file"
 msgstr "không tạo được tập tin tạm th�i"
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, c-format
 msgid "couldn't create process for %s -d"
 msgstr "không tạo được tiến trình cho %s -d"
 
-#: src/sort.c:1161
-#, c-format
-msgid "couldn't execute %s -d"
-msgstr "không thể thực hiện %s -d"
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, c-format
 msgid "warning: cannot remove: %s"
 msgstr "cảnh báo: không xóa được: %s"
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, c-format
 msgid "invalid --%s argument %s"
 msgstr "sai đối số “--%s� %s"
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, c-format
 msgid "minimum --%s argument is %s"
 msgstr "đối số “--%s� tối thiểu là %s"
 
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, c-format
 msgid "--%s argument %s too large"
 msgstr "tùy ch�n --%s nhận đối số %s quá lớn"
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr "đối số “--%s� tối đa theo giới hạn rlimit hiện th�i là %s"
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr "số song song không thể là không"
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr "gặp lỗi khi lấy trạng thái v� tập tin"
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr "gặp lỗi khi đ�c"
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, c-format
 msgid "string transformation failed"
 msgstr "gặp lỗi khi chuyển dạng chuỗi"
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, c-format
 msgid "the untransformed string was %s"
 msgstr "chuỗi chưa được chuyển dạng là %s"
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr "^ không có kết quả khớp\n"
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr "đang dùng khóa cũ “%s�; hãy dùng khóa mới “%s� để thay thế"
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr "Khóa %lu có chi�u ngang là 0 và sẽ bị b� qua"
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr "có dấu cách ở đầu là quan tr�ng trong khóa %lu; hãy chỉ định “b�"
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr "Khóa %lu là số và trải rộng nhi�u trư�ng"
 
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
 msgstr[0] "các tùy ch�n “-%s� bị b� qua"
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, c-format
 msgid "option '-r' only applies to last-resort comparison"
-msgstr "Tùy ch�n �-r� chỉ áp dụng được cho so sánh phần cuối"
+msgstr "Tùy ch�n “-r� chỉ áp dụng được cho so sánh phần cuối"
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr "gặp lỗi khi ghi"
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr "%s: %s:%s: sai thứ tự: "
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr "lỗi tiêu chuẩn"
 
-#: src/sort.c:3698
+#: src/sort.c:3738
 msgid "cannot read"
 msgstr "không thể đ�c"
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, c-format
 msgid "%s: invalid field specification %s"
 msgstr "%s: sai xác định trư�ng %s"
 
-#: src/sort.c:3987
+#: src/sort.c:4028
 #, c-format
 msgid "options '-%s' are incompatible"
 msgstr "các tùy ch�n “-%s� không tương thích với nhau"
 
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, c-format
 msgid "%s: invalid count at start of %s"
 msgstr "%s: sai số đếm tại đầu của %s"
 
-#: src/sort.c:4295
+#: src/sort.c:4336
 msgid "invalid number after '-'"
 msgstr "số sai nằm sau “-�"
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 msgid "invalid number after '.'"
 msgstr "số sai nằm sau “.�"
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr "ký tự rác trong l�i xác định trư�ng"
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, c-format
 msgid "multiple compress programs specified"
 msgstr "đã chỉ ra nhi�u chương trình nén"
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
 msgstr "số sai tại đầu trư�ng"
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
 msgstr "số của trư�ng là không"
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr "hiệu ký tự là không"
 
-#: src/sort.c:4407
+#: src/sort.c:4448
 msgid "invalid number after ','"
 msgstr "số sai ở sau “,�"
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr "khoảng tab trống"
 
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, c-format
 msgid "cannot read file names from %s"
 msgstr "không đ�c được tên tập tin từ %s"
 
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr "%s:%lu: sai tên tập tin chi�u dài không"
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, c-format
 msgid "no input from %s"
-msgstr "không có dữ liệu nhập vào từ %s"
+msgstr "không có dữ liệu đầu vào từ %s"
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr "dùng luật sắp xếp %s"
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr "dùng so sánh byte đơn giản"
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr "không cho phép toán hạng thêm %s với “-%c�"
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr "chi�u dài hậu tố tổi thiểu là %zu"
 
-#: src/split.c:204
+#: src/split.c:203
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr "Cách dùng: %s [TÙY_CHỌN]... [�ẦU_VÀO [TIỀN_T�]]\n"
 
-#: src/split.c:208
-#, fuzzy
+#: src/split.c:207
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
 "size is 1000 lines, and default PREFIX is 'x'.  With no INPUT, or when "
@@ -9582,41 +9712,39 @@ msgstr ""
 "TIỀN_T�ab, v.v.; kích cỡ mặc định là 1000 dòng, và TIỀN_T� mặc định\n"
 "là “x�.  Khi không có dữ liệu VÀO, hoặc khi dữ liệu VÀO là “-�,\n"
 "đ�c đầu vào tiêu chuẩn.\n"
-"\n"
 
-#: src/split.c:216
+#: src/split.c:215
 #, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
 "  -a, --suffix-length=N   sử dụng các hậu tố với chi�u dài N (mặc định %d)\n"
-"      --additional-suffix=SUFFIX  nối thêm hậu tố SUFFIX vàp têm tập tin.\n"
+"      --additional-suffix=SUFFIX  nối thêm hậu tố SUFFIX vàp tên tập tin.\n"
 "  -b, --bytes=SIZE        đặt SIZE byte cho mỗi tập tin kết quả\n"
 "  -C, --line-bytes=SIZE   đặt nhi�u nhất CỠ byte dòng cho mỗi tập tin kết "
 "quả\n"
 "  -d, --numeric-suffixes[=FROM]  sử dụng hậu tố kiểu số thay cho chữ cái\n"
 "                           FROM thay đổi giá trị khởi đầu (mặc định là 0).\n"
 "  -e, --elide-empty-files không tạo file trống với “-n�\n"
-"      --filter=LỆNH       ghi vào LỆNH shell; với tên tập tin $FILE\n"
+"      --filter=LỆNH       ghi vào LỆNH hệ v�; với tên tập tin $FILE\n"
 "  -l, --lines=S�          đặt S� dòng cho mỗi tập tin kết quả\n"
-"  -n, --number=CHUNKS     sinh CHUNKS tập tin.  Xem dưới đây\n"
-"  -u, --unbuffered        Sao chép trực tiếp từ đầu vào tới đầu ra với “-n "
+"  -n, --number=CHUNKS     tạo ra CHUNKS tập tin.  Xem giải thích ở dưới đây\n"
+"  -u, --unbuffered        sao chép trực tiếp từ đầu vào tới đầu ra với “-n "
 "r/...�\n"
 
-#: src/split.c:229
+#: src/split.c:228
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
 "                            output file is opened\n"
@@ -9624,7 +9752,7 @@ msgstr ""
 "      --verbose           in thông tin chẩn đoán đúng trước\n"
 "                            khi mở mỗi tập tin kết xuất\n"
 
-#: src/split.c:236
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -9644,191 +9772,191 @@ msgstr ""
 "r/N     tương tự “l� nhưng dùng phân phối round-robin\n"
 "r/K/N   tương tự nhưng chỉ xuất xuất phần thứ K trên N ra stdout\n"
 
-#: src/split.c:354
+#: src/split.c:353
 #, c-format
 msgid "output file suffixes exhausted"
 msgstr "cạn các đuôi (hậu tố) kết xuất"
 
-#: src/split.c:366
+#: src/split.c:365
 #, c-format
 msgid "creating file %s\n"
 msgstr "đang tạo tập tin %s\n"
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr "%s muốn ghi đè kết xuất; đang b� qua"
 
-#: src/split.c:391
+#: src/split.c:390
 #, c-format
 msgid "failed to set FILE environment variable"
 msgstr "Không đặt được biến môi trư�ng FILE"
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr "thá»±c thi vá»›i FILE=%s\n"
 
-#: src/split.c:395
+#: src/split.c:394
 #, c-format
 msgid "failed to create pipe"
 msgstr "không tạo được pipe"
 
-#: src/split.c:409
+#: src/split.c:408
 #, c-format
 msgid "closing prior pipe"
 msgstr "đóng pipe trước"
 
-#: src/split.c:411
+#: src/split.c:410
 #, c-format
 msgid "closing output pipe"
 msgstr "đóng pipe xuất ra"
 
-#: src/split.c:415
+#: src/split.c:414
 #, c-format
 msgid "moving input pipe"
 msgstr "di chuyển pipe đầu vào"
 
-#: src/split.c:417
+#: src/split.c:416
 #, c-format
 msgid "closing input pipe"
 msgstr "đóng pipe đầu vào"
 
-#: src/split.c:422
+#: src/split.c:421
 #, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr "gặp lỗi khi chạy câu lệnh: “%s -c %s�"
 
-#: src/split.c:428
+#: src/split.c:427
 #, c-format
 msgid "failed to close input pipe"
 msgstr "không thể đóng pipe đầu vào"
 
-#: src/split.c:464
+#: src/split.c:463
 #, c-format
 msgid "waiting for child process"
 msgstr "đợi tiến trình con"
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr "với FILE=%s, tín hiệu %s từ dòng lệnh: %s"
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr "với FILE=%s, thoát %d từ dòng lệnh: %s"
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr "trạng thái chưa được biết đến từ câu lệnh (0x%X)"
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr "không thể chia theo vài cách"
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, c-format
 msgid "%s: invalid number of chunks"
 msgstr "%s: sai số gói"
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, c-format
 msgid "%s: invalid chunk number"
 msgstr "%s: sai số mảnh"
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr "%s: sai chi�u dài hậu tố"
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr "%s: số byte sai"
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr "%s: số dòng sai"
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, c-format
 msgid "line count option -%s%c... is too large"
 msgstr "tùy ch�n số đếm dòng “-%s%c...� là quá lớn"
 
-#: src/split.c:1248
+#: src/split.c:1298
 #, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr "%s: sai giá trị bắt đầu cho hậu tố dạng số"
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, c-format
 msgid "%s: invalid IO block size"
 msgstr "%s: cỡ khối IO không hợp lệ"
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr "--filter không xử lý bó được xuất ra stdout"
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr "giá trị hậu tố bằng số khởi đầu quá lớn so với độ dài hậu tố"
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, c-format
 msgid "%s: cannot determine file size"
 msgstr "%s: không thể xác định cỡ tập tin"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr "Michael Meskes"
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, c-format
 msgid "failed to canonicalize %s"
 msgstr "không thể chuẩn hóa %s"
 
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr "cảnh báo: không nhận ra dãy thoát “\\%c�"
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, c-format
 msgid "%s: invalid directive"
 msgstr "%s: sai chỉ thị"
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, c-format
 msgid "warning: backslash at end of format"
 msgstr "cảnh báo: định dạng kết thúc bằng gạch ngược"
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr ""
 "sử dụng %s để đại diện đầu vào tiêu chuẩn cũng không hoạt động trong chế độ "
 "hệ thống tập tin"
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, c-format
 msgid "cannot read file system information for %s"
 msgstr "không đ�c được thông tin hệ thống tập tin cho %s"
 
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, c-format
 msgid "cannot stat standard input"
 msgstr "không thể lấy trạng thái v� đầu vào tiêu chuẩn"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -9836,48 +9964,49 @@ msgid ""
 "Blocks: Total: %-10b Free: %-10f Available: %a\n"
 "Inodes: Total: %-10c Free: %d\n"
 msgstr ""
-"  Tập tin: \"%n\"\n"
-"    ID: %-8i Namelen: %-7l Kiểu: %T\n"
-"Cỡ block: %-10s Cỡ block cơ bản: %S\n"
-"Block: Tổng: %-10b Trống: %-10f Sẵn dùng: %a\n"
-"Inode: Tổng: %-10c Trống: %d\n"
+"Tập tin: \"%n\"\n"
+"     ID: %-8i Chi�u dài tên: %-7l Kiểu: %T\n"
+"Cỡ khối: %-10s Cỡ khối cơ sở: %S\n"
+"   Khối: Tổng: %-10b Trống: %-10f Sẵn dùng: %a\n"
+"  Inode: Tổng: %-10c Trống: %d\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
 msgstr ""
-"  Tập tin: %N\n"
-"  Cỡ: %-10s\tBlock: %-10b IO Block: %-6o %F\n"
+" Tập tin: %N\n"
+"      Cỡ: %-10s\tKhối: %-10b  Khối vào/ra: %-6o %F\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
-msgstr "Thiết bị: %Dh/%dd\tInode: %-10i  Liên kết: %-5h Kiểu thiết bị: %t,%T\n"
+msgstr "Thiết bị: %Dh/%dd\tInode: %-10i Liên kết: %-5h Kiểu thiết bị: %t,%T\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
-msgstr "Thiết bị: %Dh/%dd\tInode: %-10i  Liên kết: %h\n"
+msgstr "Thiết bị: %Dh/%dd\tInode: %-10i Liên kết: %h\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
-msgstr "Truy cập: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
+msgstr ""
+"Truy cập: (%04a/%10.10A)  Mã ngư�i dùng: (%5u/%8U)   Mã nhóm: (%5g/%8G)\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, c-format
 msgid "Context: %C\n"
 msgstr "Ngữ cảnh: %C\n"
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -9889,42 +10018,39 @@ msgstr ""
 "Thay đổi: %z\n"
 "Ngày tạo: %w\n"
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
-msgstr ""
+msgstr "Hiển thị trạng thái của tập tin hay hệ thống tập tin.\n"
 
-#: src/stat.c:1356
-#, fuzzy
+#: src/stat.c:1418
 msgid ""
 "  -L, --dereference     follow links\n"
 "  -f, --file-system     display file system status instead of file status\n"
 msgstr ""
-"Hiển thị trạng thái của tập tin hay hệ thống tập tin.\n"
-"\n"
 "  -L, --dereference     theo các liên kết\n"
 "  -f, --file-system     hiển thị trạng thái của hệ thống tập tin\n"
-"                        thay cho trạng thái của tập tin\n"
+"                         thay cho trạng thái của tập tin\n"
 
-#: src/stat.c:1360
+#: src/stat.c:1422
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 "  -c  --format=�ỊNH_DẠNG dùng �ỊNH_DẠNG đưa ra thay cho định dạng mặc định;\n"
 "                         xuất một ký tự dòng mới sau mỗi lần dùng �ỊNH_DẠNG\n"
 "      --printf=�ỊNH_DẠNG giống “--format�, nhưng phiên dịch thoát chuỗi dấu "
 "gạch\n"
-"                         ngược, và không kết xuất ký tự dòng mới đi theo. "
-"Muốn\n"
-"                         tạo dòng mới thì thêm “\\n� vào trong chuỗi "
+"                         ngược, và không kết xuất ký tự dòng mới ở cuối "
+"dòng. Muốn\n"
+"                         tạo dòng mới thì thêm \\n vào trong chuỗi "
 "�ỊNH_DẠNG.\n"
-"  -t, --terse           in ra thông tin dưới dạng ngắn\n"
+"  -t, --terse            in ra thông tin dưới dạng ngắn\n"
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 msgid ""
 "\n"
 "The valid format sequences for files (without --file-system):\n"
@@ -9939,12 +10065,12 @@ msgstr ""
 "Các chuỗi định dạng đúng cho các tập tin (không có --file-system):\n"
 "\n"
 "  %a   quy�n truy cập theo dạng bát phân\n"
-"  %A   quy�n truy cập theo dạng dễ đ�c\n"
+"  %A   quy�n truy cập theo dạng cho con ngư�i đ�c\n"
 "  %b   số khối đã cấp phát (xem %B)\n"
 "  %B   kích cỡ theo byte của mỗi khối được %b thông báo\n"
 "  %C   chuỗi ngữ cảnh bảo mật SELinux\n"
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 msgid ""
 "  %d   device number in decimal\n"
 "  %D   device number in hex\n"
@@ -9960,7 +10086,7 @@ msgstr ""
 "  %g   ID nhóm của ngư�i sở hữu\n"
 "  %G   tên nhóm của ngư�i sở hữu\n"
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 msgid ""
 "  %h   number of hard links\n"
 "  %i   inode number\n"
@@ -9969,20 +10095,22 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 "  %h   số liên kết cứng\n"
 "  %i   số hiệu inode\n"
 "  %m   điểm gắn kết\n"
 "  %n   tên tập tin\n"
 "  %N   tên tập tin đã trích dẫn (b� liên kết nếu là liên kết m�m)\n"
-"  %o   kích cỡ khối I/O\n"
+"  %o   kích cỡ khối I/O tối ưu\n"
 "  %s   tổng kích cỡ theo byte\n"
-"  %t   kiểu thiết bị lớn theo dạng thập lục\n"
-"  %T   kiểu thiết bị nh� theo dạng thập lục\n"
+"  %t   kiểu thiết bị lớn theo dạng thập lục,\n"
+"         cho các tập tin ký-tự/khối đặc biệt\n"
+"  %T   kiểu thiết bị nh� theo dạng thập lục,\n"
+"         cho các tập tin ký-tự/khối đặc biệt\n"
 
-#: src/stat.c:1399
+#: src/stat.c:1461
 msgid ""
 "  %u   user ID of owner\n"
 "  %U   user name of owner\n"
@@ -9990,25 +10118,25 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
-"  %u   ID của ngư�i sở hữu\n"
+"  %u   mã số của ngư�i sở hữu\n"
 "  %U   tên ngư�i dùng của ngư�i sở hữu\n"
-"  %w   th�i điểm sinh ra tập tin, con ngư�i đ�c được; - nếu không hiểu\n"
-"  %W   th�i điểm sinh ra tập tin; số giây từ Epoch; 0 nếu không hiểu\n"
-"  %x   th�i gian truy cập cuối cùng, con ngư�i đ�c được\n"
+"  %w   th�i điểm sinh ra tập tin, dạng cho con ngư�i đ�c; - nếu không hiểu\n"
+"  %W   th�i điểm sinh ra tập tin; số giây tính từ Epoch; 0 nếu không hiểu\n"
+"  %x   th�i gian truy cập cuối cùng, dạng cho con ngư�i đ�c\n"
 "  %X   th�i gian truy cập cuối cùng, theo giây kể từ Epoch\n"
-"  %y   th�i gian sửa đổi cuối cùng, con ngư�i đ�c được\n"
-"  %Y   th�i gian sửa đổi cuối cùng, theo giây kể từ Epoch\n"
-"  %z   th�i gian thay đổi cuối cùng, con ngư�i đ�c được\n"
-"  %Z   th�i gian thay đổi cuối cùng, theo giây kể từ Epoch\n"
+"  %y   th�i gian sửa đổi dữ liệu cuối cùng, dạng cho con ngư�i đ�c\n"
+"  %Y   th�i gian sửa đổi dữ liệu cuối cùng, theo giây kể từ Epoch\n"
+"  %z   th�i gian thay đổi trạng thái cuối cùng, dạng cho con ngư�i đ�c\n"
+"  %Z   th�i gian thay đổi trạng thái cuối cùng, theo giây kể từ Epoch\n"
 "\n"
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 msgid ""
 "Valid format sequences for file systems:\n"
 "\n"
@@ -10026,7 +10154,7 @@ msgstr ""
 "  %d   số nút tập tin còn trống trong hệ thống tập tin\n"
 "  %f   số khối còn trống trong hệ thống tập tin\n"
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 msgid ""
 "  %i   file system ID in hex\n"
 "  %l   maximum length of filenames\n"
@@ -10050,13 +10178,11 @@ msgid "Usage: %s OPTION... COMMAND\n"
 msgstr "Cách dùng: %s TÙY_CHỌN... LỆNH\n"
 
 #: src/stdbuf.c:91
-#, fuzzy
 msgid ""
 "Run COMMAND, with modified buffering operations for its standard streams.\n"
 msgstr ""
-"Chạy câu LỆNH, với thao tác bị sửa đổi để chuyển hoán đệm cho các luồng tiêu "
-"chuẩn.\n"
-"\n"
+"Chạy câu LỆNH, với thao tác sửa đổi bộ đệm cho các luồng dữ liệu tiêu chuẩn "
+"của nó.\n"
 
 #: src/stdbuf.c:97
 msgid ""
@@ -10115,68 +10241,68 @@ msgid ""
 msgstr ""
 "\n"
 "GHI CHÚ: nếu câu LỆNH đi�u chỉnh việc chuyển hoán đệm các luồng tiêu chuẩn\n"
-"(v.d. “tee�) thì cũng ghi đè lên các thiết lập tương ứng bị “stdbuf� sửa "
-"đổi.\n"
+"(v.d. “tee�) thì cũng ghi đè lên các cài đặt tương ứng bị “stdbuf� sửa đổi.\n"
 "Ngoài ra còn có một số bộ l�c (v.d. “dd� và “cat�) mà không dùng luồng với "
 "đầu I/O,\n"
-"thì không bị tác động bởi thiết lập “stdbuf�.\n"
+"thì không bị tác động bởi cài đặt “stdbuf�.\n"
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, c-format
 msgid "failed to find %s"
 msgstr "không tìm thấy %s"
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, c-format
 msgid "failed to update the environment with %s"
 msgstr "gặp lỗi khi cập nhật môi trư�ng dùng %s"
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr "vô ích khi chuyển hoán đệm theo dòng đầu vào tiêu chuẩn"
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, c-format
+msgid "you must specify a buffering mode option"
+msgstr "bạn phải chỉ định tùy ch�n chế độ đệm"
+
+#: src/stty.c:516
 #, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
 "  or:  %s [-F DEVICE | --file=DEVICE] [-a|--all]\n"
 "  or:  %s [-F DEVICE | --file=DEVICE] [-g|--save]\n"
 msgstr ""
-"Cách dùng: %s [-F THIẾT_BỊ | --file=THIẾT_BỊ] [CÀI-�ẶT]...\n"
+"Cách dùng: %s [-F THIẾT_BỊ | --file=THIẾT_BỊ] [CÀI_�ẶT]...\n"
 "     hoặc: %s [-F THIẾT_BỊ | --file=THIẾT_BỊ] [-a|--all]\n"
 "     hoặc: %s [-F THIẾT_BỊ | --file=THIẾT_BỊ] [-g|--save]\n"
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
-msgstr ""
+msgstr "Hiển thị hoặc thay đổi đặc tính thiết bị cuối.\n"
 
-#: src/stty.c:525
-#, fuzzy
+#: src/stty.c:528
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
 "  -g, --save         print all current settings in a stty-readable form\n"
 "  -F, --file=DEVICE  open and use the specified DEVICE instead of stdin\n"
 msgstr ""
-"In hoặc thay đổi các đặc điểm của thiết bị cuối.\n"
-"\n"
-"  -a, --all          in m�i thiết lập hiện th�i ở dạng dễ đ�c cho ngư�i "
-"dùng\n"
-"  -g, --save         in m�i thiết lập hiện th�i ở dạng stty có thể đ�c\n"
-"  -F, --file=TH.BỊ   mở và dùng THIẾT_BỊ thay cho đầu vào tiêu chuẩn\n"
+"  -a, --all          in m�i cài đặt hiện th�i ở dạng con ngư�i có thể đ�c\n"
+"  -g, --save         in m�i cài đặt hiện th�i ở dạng stty có thể đ�c\n"
+"  -F, --file=THIẾT_BỊ mở và dùng THIẾT_BỊ thay cho đầu vào tiêu chuẩn\n"
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
 "settings.  The underlying system defines which settings are available.\n"
 msgstr ""
 "\n"
-"Một “-� không bắt buộc ở trước THIẾT_LẬP chỉ ra sự phủ định.\n"
-"Một “*� đánh dấu thiết lập không phải POSIX.\n"
-"Hệ thống nằm dưới xác định những thiết lập có thể.\n"
+"Một “-� không bắt buộc ở trước CÀI �ẶT chỉ ra sự phủ định.\n"
+"Một “*� đánh dấu cài đặt không phải POSIX.\n"
+"Hệ thống nằm dưới định nghĩa các cài đặt có thể.\n"
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -10187,11 +10313,11 @@ msgstr ""
 "\n"
 "Ký tự đặc biệt:\n"
 " * dsusp K�_TỰ   K�_TỰ sẽ gửi một tín hiệu dừng của thiết bị cuối khi\n"
-"                     tràn dữ liệu vào\n"
-"   eof K�_TỰ     K�_TỰ sẽ gửi một kết thúc tập tin (dừng nhập vào)\n"
+"                     đẩy dữ liệu vào\n"
+"   eof K�_TỰ     K�_TỰ sẽ gửi một kết thúc tập tin (dừng đầu vào)\n"
 "   eol K�_TỰ     K�_TỰ sẽ kết thúc dòng\n"
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -10203,7 +10329,7 @@ msgstr ""
 "   intr K�_TỰ    K�_TỰ sẽ gửi một tín hiệu gián đoạn\n"
 "   kill K�_TỰ    K�_TỰ sẽ xóa dòng hiện th�i\n"
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -10215,7 +10341,7 @@ msgstr ""
 " * rprnt K�_TỰ   K�_TỰ sẽ vẽ lại dòng hiện th�i\n"
 "   start K�_TỰ   K�_TỰ sẽ chạy lại kết quả sau khi dừng nó\n"
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -10227,7 +10353,7 @@ msgstr ""
 " * swtch K�_TỰ   K�_TỰ sẽ chuyển sang một lớp shell khác\n"
 " * werase K�_TỰ  K�_TỰ sẽ xóa từ đã gõ cuối cùng\n"
 
-#: src/stty.c:562
+#: src/stty.c:565
 msgid ""
 "\n"
 "Special settings:\n"
@@ -10236,12 +10362,12 @@ msgid ""
 " * columns N     same as cols N\n"
 msgstr ""
 "\n"
-"Thiết lập đặc biệt:\n"
-"   N             đặt tốc độ nhập vào và kết xuất thành N baud\n"
+"Cài đặt đặc biệt:\n"
+"   N             đặt tốc độ đầu vào và kết xuất thành N baud\n"
 " * cols N        cho hạt nhân biết thiết bị cuối có N cột\n"
 " * columns N     giống như “cols N�\n"
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -10249,12 +10375,12 @@ msgid ""
 "read\n"
 "   ospeed N      set the output speed to N\n"
 msgstr ""
-"   ispeed N      đặt tốc độ nhập vào thành N\n"
+"   ispeed N      đặt tốc độ đầu vào thành N\n"
 " * line N        dùng kỷ luật dòng N\n"
 "   min N         với “-icanon�, đ�c ít nhất N ký tự mỗi lần đ�c\n"
 "   ospeed N      đặt tốc độ đưa kết quả ra thành N\n"
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -10268,8 +10394,7 @@ msgstr ""
 "   time N        với “-icanon�, đặt th�i gian ch� đ�c\n"
 "                   thành N phần mư�i của một giây\n"
 
-#: src/stty.c:581
-#, fuzzy
+#: src/stty.c:584
 msgid ""
 "\n"
 "Control settings:\n"
@@ -10280,13 +10405,14 @@ msgid ""
 "   csN           set character size to N bits, N in [5..8]\n"
 msgstr ""
 "\n"
-"Thiết lập đi�u khiển:\n"
+"Cài đặt đi�u khiển:\n"
 "   [-]clocal     b� tín hiệu đi�u khiển bộ đi�u giải\n"
 "   [-]cread      cho phép nhận dữ liệu vào\n"
 " * [-]crtscts    bật dùng tiến trình bắt tay RTS/CTS\n"
+" * [-]cdtrdsr    bật dùng tiến trình bắt tay DTR/DSR\n"
 "   csN           đặt kích cỡ ký tự thành N bit, N nằm trong [5..8]\n"
 
-#: src/stty.c:590
+#: src/stty.c:593
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
 "   [-]hup        send a hangup signal when the last process closes the tty\n"
@@ -10294,6 +10420,7 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 "   [-]cstopb     dùng hai bit dừng cho mỗi ký tự (một với “-�)\n"
 "   [-]hup        gửi tín hiệu treo khi tiến trình cuối cùng đóng tty\n"
@@ -10301,8 +10428,9 @@ msgstr ""
 "   [-]parenb     tạo bit tương tính chẵn lẻ trong kết quả\n"
 "                  và ch� bit tính chẵn lẻ trong dữ liệu vào\n"
 "   [-]parodd     đặt tính chẵn lẻ kiểu là lẻ (hoặc đặt “-� thì chẵn)\n"
+" * [-]cmspar     dùng \"stick\" chẵn lẻ (mark/space)\n"
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -10312,13 +10440,13 @@ msgid ""
 "   [-]igncr      ignore carriage return\n"
 msgstr ""
 "\n"
-"Thiết lập đầu vào:\n"
+"Cài đặt đầu vào:\n"
 "   [-]brkint     sự ngắt gây ra một tín hiệu gián đoạn\n"
 "   [-]icrnl      chuyển return thành dòng mới\n"
 "   [-]ignbrk     b� qua ký tự ngắt\n"
 "   [-]igncr      b� qua return\n"
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -10331,13 +10459,13 @@ msgstr ""
 "tá»±\n"
 "   [-]inlcr      chuyển dòng mới thành return\n"
 "   [-]inpck      bật dùng kiểm tra tính chẵn lẻ đầu vào\n"
-"   [-]istrip     gột bit cao (thứ 8) của các ký tự nhập vào\n"
+"   [-]istrip     gột bit cao (thứ 8) của các ký tự đầu vào\n"
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr " * [-]iutf8      coi như các ký tự đưa vào được mã hóa UTF-8\n"
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -10354,7 +10482,7 @@ msgstr ""
 "   [-]parmrk     đánh dấu lỗi tính chẵn lẻ (với một dãy 255-0 ký tự)\n"
 "   [-]tandem     giống như “[-]ixoff�\n"
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -10364,30 +10492,30 @@ msgid ""
 " * nlN           newline delay style, N in [0..1]\n"
 msgstr ""
 "\n"
-"Thiết lập đầu ra:\n"
+"Cài đặt đầu ra:\n"
 " * bsN           kiểu trì hoãn của xóa lùi, N nằm trong [0..1]\n"
 " * crN           kiểu trì hoãn của return, N nằm trong [0..3]\n"
 " * ffN           kiểu trì hoãn của thụt dòng, N nằm trong [0..1]\n"
 " * nlN           kiểu trì hoãn của dòng mới, N nằm trong [0..1]\n"
 
-#: src/stty.c:631
+#: src/stty.c:635
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
 " * [-]onlret     newline performs a carriage return\n"
 msgstr ""
 " * [-]ocrnl      chuyển return thành dòng mới\n"
-" * [-]ofdel      dùng các ký tự xóa để làm đầy thay cho các ký tự rỗng\n"
+" * [-]ofdel      dùng các ký tự xóa để làm đầy thay cho các ký tự NUL\n"
 " * [-]ofill      dùng các ký tự làm đầy (độn thêm) thay cho th�i gian trì "
 "hoãn\n"
-" * [-]olcuc      chuyển ký tự viết thư�ng thành viết hoa\n"
+" * [-]olcuc      chuyển ký tự viết thư�ng thành viết HOA\n"
 " * [-]onlcr      chuyển dòng mới thành return-dòng mới\n"
 " * [-]onlret     dòng mới tạo ra một return\n"
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -10403,7 +10531,7 @@ msgstr ""
 " * -tabs         giống như “tab3�\n"
 " * vtN           kiểu trì hoãn của tab d�c, N nằm trong [0..1]\n"
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -10412,12 +10540,12 @@ msgid ""
 " * -crtkill      kill all line by obeying the echoctl and echok settings\n"
 msgstr ""
 "\n"
-"Thiết lập nội bộ:\n"
+"Cài đặt nội bộ:\n"
 "   [-]crterase   đưa ra ký tự xóa như backspace-space-backspace\n"
-" * crtkill       diệt toàn dòng theo thiết lập echoprt và echoe\n"
-" * -crtkill      diệt toàn dòng theo thiết lập echoctl và echok\n"
+" * crtkill       diệt toàn dòng theo cài đặt echoprt và echoe\n"
+" * -crtkill      diệt toàn dòng theo cài đặt echoctl và echok\n"
 
-#: src/stty.c:654
+#: src/stty.c:658
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
 "   [-]echo       echo input characters\n"
@@ -10426,12 +10554,12 @@ msgid ""
 "   [-]echok      echo a newline after a kill character\n"
 msgstr ""
 " * [-]ctlecho    đưa ra ký tự control ở dạng mũ (“^c�)\n"
-"   [-]echo       đưa ra ký tự nhập vào\n"
+"   [-]echo       đưa ra ký tự đầu vào\n"
 " * [-]echoctl    giống như “[-]ctlecho�\n"
 "   [-]echoe      giống như “[-]crterase�\n"
 "   [-]echok      đưa ra một dòng mới sau một ký tự diệt\n"
 
-#: src/stty.c:661
+#: src/stty.c:665
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
 "   [-]echonl     echo newline even if not echoing other characters\n"
@@ -10445,7 +10573,7 @@ msgstr ""
 "   [-]icanon     bật dùng các ký tự đặc biệt xóa, diệt, werase, và rprnt\n"
 "   [-]iexten     bật dùng các ký tự đặc biệt không phải POSIX\n"
 
-#: src/stty.c:668
+#: src/stty.c:672
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
 "   [-]noflsh     disable flushing after interrupt and quit special "
@@ -10460,7 +10588,7 @@ msgstr ""
 " * [-]tostop     dừng các công việc n�n mà thử ghi vào thiết bị cuối\n"
 " * [-]xcase      với “icanon�, thoát với “\\� cho các ký tự viết hoa\n"
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -10469,12 +10597,12 @@ msgid ""
 "   -cbreak       same as icanon\n"
 msgstr ""
 "\n"
-"Thiết lập tổ hợp:\n"
+"Cài đặt tổ hợp:\n"
 " * [-]LCASE      giống như “[-]lcase�\n"
 "   cbreak        giống như “-icanon�\n"
 "   -cbreak       giống như “icanon�\n"
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -10487,7 +10615,7 @@ msgstr ""
 "   -cooked       giống như “raw�\n"
 "   crt           giống như “echoe echoctl echoke�\n"
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -10501,7 +10629,7 @@ msgstr ""
 "   ek            các ký tự xóa và diệt tới giá trị mặc định của chúng\n"
 "   evenp         giống như “parenb -parodd cs7�\n"
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -10517,7 +10645,7 @@ msgstr ""
 "   nl            giống như “-icrnl -onlcr�\n"
 "   -nl           giống như “icrnl -inlcr -igncr onlcr -ocrnl -onlret�\n"
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -10531,7 +10659,7 @@ msgstr ""
 "   pass8         giống như “-parenb -istrip cs8�\n"
 "   -pass8        giống như “parenb istrip cs7�\n"
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -10544,7 +10672,7 @@ msgstr ""
 "                   -imaxbel -opost -isig -icanon -xcase min 1 time 0�\n"
 "   -raw          giống như “cooked�\n"
 
-#: src/stty.c:716
+#: src/stty.c:720
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
 "                 -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n"
@@ -10554,14 +10682,14 @@ msgid ""
 "                 characters to their default values\n"
 msgstr ""
 "   sane          giống như:\n"
-"                 �cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
+"                 “cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
 "                 -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n"
 "                 -onocr -onlret -ofill -ofdel nl0 cr0 tab0 bs0 vt0 ff0\n"
 "                 isig icanon iexten echo echoe echok -echonl -noflsh\n"
 "                 -xcase -tostop -echoprt echoctl echoke�,\n"
 "                 mỗi ký tự đặc biệt cũng có giá trị mặc định\n"
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -10573,16 +10701,15 @@ msgstr ""
 "�i�u khiển đư�ng tty kết nối tới đầu vào tiêu chuẩn.  Khi không\n"
 "có đối số, in ra tốc độ đư�ng truy�n baud, kỷ luật đư�ng truy�n, và\n"
 "sự lệch hướng kh�i giá trị stty hữu tỷ.\n"
-"Trong thiết lập K�_TỰ là các chữ cái hoặc mã hoá như ^c, 0x37, 0177 hoặc "
-"127,\n"
+"Trong cài đặt K�_TỰ là các chữ cái hoặc mã hoá như ^c, 0x37, 0177 hoặc 127,\n"
 "giá trị đặc biệt “^-� hoặc “undef� dùng để tắt b� các ký tự đặc biệt.\n"
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, c-format
 msgid "only one device may be specified"
 msgstr "chỉ có thể đưa ra một thiết bị"
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
@@ -10591,43 +10718,43 @@ msgstr ""
 "các tùy ch�n cho dạng kết quả chi tiết và dạng có thể đ�c stty\n"
 "loại trừ lẫn nhau"
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr "khi chỉ ra dạng kết quả, không được đặt các chế độ"
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr "%s: không đặt lại được chế độ non-blocking (không chặn)"
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, c-format
 msgid "invalid argument %s"
 msgstr "đối số sai %s"
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, c-format
 msgid "missing argument to %s"
 msgstr "thiếu đối số cho %s"
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, c-format
 msgid "invalid line discipline %s"
 msgstr "sai kỷ luật của dòng %s"
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr "%s: không thể thực hiện m�i thao tác yêu cầu"
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr "%s: không có thông tin kích cỡ cho thiết bị này"
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, c-format
 msgid "invalid integer argument %s"
 msgstr "sai đối số kiểu số nguyên %s"
@@ -10672,7 +10799,7 @@ msgid ""
 "for details about the options it supports.\n"
 msgstr ""
 "\n"
-"GHI CHÚ: shell của bạn có thể có lệnh %s riêng của nó,\n"
+"CHÚ �: shell của bạn có thể có lệnh %s riêng của nó,\n"
 "mà nó lại thư�ng có quy�n cao hơn lệnh từ gói này.\n"
 "Hãy tham khảo tài liệu hướng dẫn của shell\n"
 "để tìm chi tiết v� các tùy ch�n được hỗ trợ.\n"
@@ -10685,29 +10812,28 @@ msgstr "      --help     hiển thị trợ giúp này rồi thoát\n"
 msgid "      --version  output version information and exit\n"
 msgstr "      --version  đưa ra thông tin phiên bản rồi thoát\n"
 
-#: src/system.h:544
-#, fuzzy
+#: src/system.h:543
 msgid ""
 "\n"
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
-"Các đối số bắt buộc phải có với tùy ch�n dài cũng bắt buộc với tùy ch�n "
-"ngắn.\n"
+"\n"
+"M�i đối số bắt buộc phải có khi dùng tùy ch�n dài thì tùy ch�n ngắn cũng "
+"vậy.\n"
 
-#: src/system.h:552
+#: src/system.h:551
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 "\n"
-"SIZE là số nguyên và các đơn vị tùy ch�nt (ví dụ: 10M là 10*1024*1024).  Các "
-"đon vị\n"
-"là K, M, G, T, P, E, Z, Y (số mũ của 1024) hay KB, MB, ... (số mũ của "
-"1000).\n"
+"CỠ là số nguyên và các đơn vị tùy ch�n (ví dụ: 10M là 10*1024*1024).\n"
+"Các đơn vị là K, M, G, T, P, E, Z, Y (số mũ của 1024) hay KB, MB, ... (số mũ "
+"của 1000).\n"
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -10720,38 +10846,38 @@ msgstr ""
 "và các biến đổi môi trư�ng %s_BLOCK_SIZE, BLOCK_SIZE và BLOCKSIZE.\n"
 "Không thì đơn vị mặc định là 1024 byte (hoặc 512 nếu đặt POSIXLY_CORRECT).\n"
 
-#: src/system.h:571
+#: src/system.h:570
 #, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
+"%s online help: <%s>\n"
 msgstr ""
 "\n"
-"Thông báo lỗi “%s� cho <%s>\n"
+"Trợ giúp trực tuyến %s: <%s>\n"
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr ""
 "Hãy thông báo lỗi dịch “%s� cho <http://translationproject.org/team/vi."
 "html>\n"
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr ""
 "�ể xem tài liệu hướng dẫn đầy đủ, hãy đ�c: info coreutils \"%s invocation\"\n"
 
-#: src/system.h:596
+#: src/system.h:591
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Hãy thử lệnh “%s --help� (trợ giúp) để biết thêm thông tin.\n"
 
-#: src/system.h:628
+#: src/system.h:633
 #, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -10772,14 +10898,13 @@ msgid "Jay Lepreau"
 msgstr "Jay Lepreau"
 
 #: src/tac.c:137
-#, fuzzy
 msgid ""
 "Write each FILE to standard output, last line first.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
-"Ghi mỗi TẬP_TIN ra đầu ra tiêu chuẩn, in dòng cuối cùng đầu tiên.\n"
-"Khi không có TẬP_TIN hoặc khi TẬP_TIN là “-�, đ�c đầu vào tiêu chuẩn.\n"
-"\n"
+"Ghi mỗi TẬP_TIN ra đầu ra tiêu chuẩn, dòng cuối cùng được hiển thị đầu "
+"tiên.\n"
+"Khi không có TẬP_TIN hoặc khi TẬP_TIN là -, đ�c từ đầu vào tiêu chuẩn.\n"
 
 #: src/tac.c:144
 msgid ""
@@ -10805,7 +10930,7 @@ msgstr "mục ghi quá lớn"
 #: src/tac.c:450
 #, c-format
 msgid "failed to create temporary file in %s"
-msgstr "gặp lỗi khi tạo tập tin tạm trong %s "
+msgstr "gặp lỗi khi tạo tập tin tạm trong %s"
 
 #: src/tac.c:458
 #, c-format
@@ -10838,7 +10963,7 @@ msgid "Ian Lance Taylor"
 msgstr "Ian Lance Taylor"
 
 #: src/tail.c:262
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Print the last %d lines of each FILE to standard output.\n"
 "With more than one FILE, precede each with a header giving the file name.\n"
@@ -10846,88 +10971,83 @@ msgid ""
 msgstr ""
 "In ra %d dòng cuối cùng của mỗi TẬP_TIN ra đầu ra tiêu chuẩn.\n"
 "Khi có vài TẬP_TIN, thì đầu tiên in ra phần đầu cho biết tên tập tin.\n"
-"Khi không có TẬP_TIN, hoặc khi TẬP_TIN là “-�, đ�c đầu vào tiêu chuẩn.\n"
+"Khi không có TẬP_TIN, hoặc khi TẬP_TIN là -, thì đ�c đầu vào tiêu chuẩn.\n"
 "\n"
 
 #: src/tail.c:270
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
 "  -c, --bytes=K            xuất K byte cuối cùng; hoặc dùng “-c +K� để xuất\n"
-"                           các byte bắt đầu với byte thứ K của mỗi tập tin\n"
+"                            các byte bắt đầu với byte thứ K của từng tập "
+"tin\n"
 
 #: src/tail.c:274
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
-"  -f, --follow[={tên|mô_tả}]\n"
-"                          in ra dữ liệu đã nối thêm vào cuối tập tin; “-f�,\n"
-"                           “--follow�, và “--follow=mô_tả� là tương đương\n"
+"  -f, --follow[={name|descriptor}]\n"
+"                               (tạm dịch: tên|"
+"mô_tả)                          in ra dữ liệu đã nối thêm vào cuối tập tin;\n"
+"                           nếu vắng mặt đối số nghĩa là “descriptor�\n"
 "  -F                      giống như “--follow=tên --retry�\n"
 
-#: src/tail.c:281
+#: src/tail.c:280
 #, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
 "  -n, --lines=K            xuất K dòng cuối cùng, thay cho %d cuối cùng "
 "hoặc\n"
-"                           dùng “-n +K� để xuất các dòng bắt đầu từ dòng thứ "
-"K\n"
+"                             dùng “-n +K� để xuất các dòng bắt đầu từ dòng "
+"thứ K\n"
 "      --max-unchanged-stats=N\n"
-"                           với “--follow=tên�, mở lại một FILE không có\n"
-"                           kích cỡ thay đổi sau N (mặc định %d) lần lặp lại\n"
+"                           với “--follow=tên�, mở lại một TẬP-TIN không "
+"thay\n"
+"                           đổi kích cỡ sau N (mặc định %d) lần lặp lại\n"
 "                           để xem nó có bị b� liên kết hay đổi tên chưa\n"
-"                          (đây thư�ng là trư�ng hợp các tập tin theo dõi đã\n"
-"                          quay vòng). Khi đã có inotify, chức năng này trở\n"
-"                          nên không cần thiết.\n"
+"                           (đây thư�ng là trư�ng hợp các tập tin theo dõi "
+"đã\n"
+"                           quay vòng). Khi đã có inotify, chức năng này trở\n"
+"                           nên ít hữu dụng.\n"
 
-#: src/tail.c:294
+#: src/tail.c:293
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 "      --pid=S�             với “-f� thì chấm dứt sau khi tiến trình S� chết\n"
 "  -q, --quiet, --silent    không bao gi� xuất phần đầu chỉ ra tên tập tin\n"
-"      --retry              cứ thử mở một tập tin nào đó, thậm chí nếu\n"
-"                           nó vẫn (hoặc trở thành) không tới được;\n"
-"                           có ích khi đi theo tên, tức là dùng “--"
-"follow=name�\n"
+"      --retry              cố thử mở tập tin ngay cả khi không thể truy cập\n"
 
-#: src/tail.c:301
+#: src/tail.c:298
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 "  -s, --sleep-interval=N   với “-f� thì ngủ trong khoảng N giây\n"
-"                             (mặc định 1.0) giữa hai lần lặp lại.\n"
-"                             Khi có inotify và --pid=P, kiểm tra\n"
+"                             (mặc định 1.0) giữa hai lần lặp lại;\n"
+"                             khi có inotify và --pid=P, kiểm tra\n"
 "                             tiến trình P \n"
 "                             ít nhất một lần mỗi N giây.\n"
 "  -v, --verbose            lúc nào cũng xuất phần đầu chỉ ra tên tập tin\n"
 
-#: src/tail.c:310
+#: src/tail.c:307
 msgid ""
 "\n"
 "If the first character of K (the number of bytes or lines) is a '+',\n"
@@ -10946,7 +11066,7 @@ msgstr ""
 "GB 1000*1000*1000, G 1024*1024*1024, và tương tự như thế với T, P, E, Z, Y.\n"
 "\n"
 
-#: src/tail.c:319
+#: src/tail.c:316
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
 "means that even if a tail'ed file is renamed, tail will continue to track\n"
@@ -10965,27 +11085,22 @@ msgstr ""
 "Nó khiến tail theo dõi tập tin có tên đưa ra\n"
 "bằng một cách làm cho thích nghi việc thay tên, gỡ b� và tạo.\n"
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr "đang đóng %s (fd=%d)"
 
-#: src/tail.c:453
-#, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr "%s: không thể di chuyển tới offset tương đối %s"
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr "%s: không thể di chuyển vị trí đ�c tới offset đối với cuối %s"
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr "không thể quyết định vị trí của %s thì phục hồi việc thăm dò"
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
@@ -10994,134 +11109,144 @@ msgstr ""
 "không nhận ra hệ thống tập tin kiểu 0x%08lx cho %s. xin hãy báo cáo đi�u này "
 "cho %s. trở lại để polling"
 
-#: src/tail.c:963
+#: src/tail.c:965
+#, c-format
+msgid "%s has been replaced with a symbolic link. giving up on this name"
+msgstr "%s bị thay thế bằng một liên kết m�m nên chịu thua tên này"
+
+#: src/tail.c:980
 #, c-format
 msgid "%s has become inaccessible"
 msgstr "%s đã trở thành không thể truy cập"
 
-#: src/tail.c:980
+#: src/tail.c:997
 #, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr "%s bị thay thế bởi tập tin không thể tail nên đầu hàng với tên này"
 
-#: src/tail.c:989
+#: src/tail.c:1006
 #, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr "%s bị thay thế bằng một tập tin từ xa thì chịu thua v� tên này"
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, c-format
 msgid "%s has become accessible"
 msgstr "%s đã trở thành có thể truy cập"
 
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr "%s đã xuất hiện; đi theo cuối của tập tin mới"
 
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr "%s bị thay thế; đi theo cuối của tập tin mới"
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr "%s: không thay đổi được chế độ không chặn"
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr "%s: tập tin đã bị cắt ngắn"
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr "không còn tập tin nào"
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, c-format
 msgid "cannot watch parent directory of %s"
 msgstr "không thể theo dõi thư mục mẹ của %s"
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, c-format
 msgid "inotify resources exhausted"
 msgstr "Dùng hết tài nguyên inotify"
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, c-format
 msgid "cannot watch %s"
 msgstr "không thể theo dõi %s"
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr "gặp lỗi khi theo dõi sự kiện inotify"
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, c-format
 msgid "error reading inotify event"
 msgstr "gặp lỗi khi đ�c sự kiện inotify"
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr "%s: không thể đi theo cuối của kiểu tập tin này; đầu hàng với tên này"
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, c-format
 msgid "number in %s is too large"
 msgstr "%s chứa một con số quá lớn"
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr "%s: sai số trạng thái không thay đổi tối đa giữa các lần mở"
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr "%s: sai PID"
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr "%s: sai số giây"
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr "tùy ch�n dùng theo ngữ cảnh sai -- %c"
 
-#: src/tail.c:2034
+#: src/tail.c:2096
 #, c-format
-msgid "warning: --retry is useful mainly when following by name"
-msgstr "cảnh báo: “--retry� thư�ng có ích khi theo sau theo tên"
+msgid "warning: --retry ignored; --retry is useful only when following"
+msgstr "cảnh báo: “--retry� bị b� qua; “--retry� chỉ có ích khi theo sau"
 
-#: src/tail.c:2038
+#: src/tail.c:2100
+#, c-format
+msgid "warning: --retry only effective for the initial open"
+msgstr "cảnh báo: --retry chỉ có tác động đến việc mở khởi tạo"
+
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
 msgstr "cảnh báo: PID bị b� qua; “--pid=PID� chỉ có ích khi theo sau"
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr "cảnh báo: không hỗ trợ “--pid=PID� trên hệ thống này"
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, c-format
 msgid "cannot follow %s by name"
 msgstr "không thể theo sau %s theo tên"
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr ""
 "cảnh báo: không hiệu quả khi theo sau đầu vào tiêu chuẩn một cách không giới "
 "hạn"
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr "inotify không dùng được thì phục hồi việc trưng cầu"
@@ -11159,7 +11284,7 @@ msgstr "sai số nguyên %s"
 
 #: src/test.c:241
 msgid "')' expected"
-msgstr "cần �)�"
+msgstr "cần “)�"
 
 #: src/test.c:244
 #, c-format
@@ -11391,21 +11516,21 @@ msgid "extra argument %s"
 msgstr "tham số thêm %s"
 
 #: src/timeout.c:112
-#, fuzzy, c-format
+#, c-format
 msgid "warning: sigprocmask"
-msgstr "cảnh báo: timer_create"
+msgstr "cảnh báo: sigprocmask"
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr "cảnh báo: timer_settime"
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr "cảnh báo: timer_create"
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
@@ -11414,49 +11539,46 @@ msgstr ""
 "Cách dùng: %s [TÙY_CHỌN] THỜI_LƯỢNG LỆNH [�.S�]...]\n"
 "  or:  %s [TÙY_CHỌN]\n"
 
-#: src/timeout.c:229
-#, fuzzy
+#: src/timeout.c:232
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
-msgstr ""
-"Khởi chạy LỆNH, và buộc kết thúc nó nếu vẫn còn chạy sau THỜI_LƯỢNG.\n"
-"\n"
-"Các đối số bắt buộc phải sử dụng cùng với tùy ch�n dài cũng bắt buộc với tùy "
-"ch�n ngắn.\n"
+msgstr "Khởi chạy LỆNH, và buộc kết thúc nó nếu vẫn còn chạy sau THỜI_LƯỢNG.\n"
 
-#: src/timeout.c:235
-#, fuzzy
+#: src/timeout.c:238
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
-"  --foreground\n"
+"      --preserve-status\n"
+"                 thoát cùng trạng thái với LỆNH, ngay cả khi\n"
+"                   lệnh gặp lỗi quá gi�\n"
+"      --foreground\n"
 "                 Khi không chạy, sẽ bị hết gi� trực tiếp từ shell prompt,\n"
-"                 cho phép COMMAND đ�c tín hiệu từ TTY và nhận TTY.\n"
-"                 Trong chế độ này, con của COMMAND sẽ không bị hết gi�.\n"
+"                   cho phép COMMAND đ�c tín hiệu từ TTY và nhận TTY.\n"
+"                   Trong chế độ này, con của COMMAND sẽ không bị hết gi�.\n"
 "  -k, --kill-after=THỜI_LƯỢNG\n"
-"                 cũng gửi một tín hiệu KILL (buộc kết thúc) nếu\n"
-"                     LỆNH vẫn còn chạy\n"
-"                 Trong th�i lượng này sau khi gửi tín hiệu gốc.\n"
+"                 đồng th�i gửi tín hiệu KILL (buộc kết thúc) nếu LỆNH vẫn "
+"còn chạy\n"
+"                   sau th�i lượng này tính từ khi tín hiệu khởi tạo được "
+"gá»­i.\n"
 "  -s, --signal=T�N_HIỆU\n"
-"                 ghi rõ tín hiệu cần gửi khi quá hạn.\n"
+"                 chỉ định tín hiệu cần gửi khi quá hạn.\n"
 "                  T�N_HIỆU có thể là một tên như “HUP�,\n"
 "                  hoặc một con số.\n"
 "                  Xem “kill -l� để thấy một danh sách các tín hiệu.\n"
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 msgid ""
 "\n"
 "DURATION is a floating point number with an optional suffix:\n"
@@ -11467,8 +11589,7 @@ msgstr ""
 "DURATION là một số thực chấm động với hậu số tùy ch�n:\n"
 "“s� cho giây (mặc định), “m� cho phút, “h� cho gi� và “d� cho ngày.\n"
 
-#: src/timeout.c:259
-#, fuzzy
+#: src/timeout.c:262
 msgid ""
 "\n"
 "If the command times out, and --preserve-status is not set, then exit with\n"
@@ -11479,26 +11600,24 @@ msgid ""
 "case the exit status is 128+9 rather than 124.\n"
 msgstr ""
 "\n"
-"Nếu câu lệnh quá hạn thì thoát với trạng thái 124,\n"
-"không thì thoát với trạng thái của câu lệnh đó.\n"
-"Không đưa ra tín hiệu thì gửi tín hiệu TERM khi quá hạn.\n"
-"Tín hiệu TERM ép buộc kết thúc bất cứ tiến trình nào\n"
-"không chặn hay bắt tín hiệu đó. �ối với tiến trình khác,\n"
-"có thể cần sử dụng tín hiệu KILL (9) vì không thể bắt tín hiệu đó.\n"
-"Nếu tín hiệu KILL (9) được gửi đi, trạng thái thoát sẽ là 128+9 thay vì "
-"124.\n"
+"Nếu câu lệnh quá hạn, và --preserve-status không được đặt, thì thoát\n"
+"với trạng thái 124. Không thì thoát với trạng thái của câu LỆNH đó.\n"
+"Không đưa ra tín hiệu thì gửi tín hiệu TERM khi quá hạn. Tín hiệu TERM\n"
+"ép buộc kết thúc bất cứ tiến trình nào không chặn hay bắt tín hiệu đó.\n"
+"Nó là cần thiết để sử dụng tín hiệu KILL (9) vì không thể bắt tín hiệu đó,\n"
+"trong trư�ng hợp đó trạng thái thoát sẽ là 128+9 thay vì 124.\n"
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr "cảnh báo: tắt core dump gặp lỗi"
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, c-format
 msgid "error waiting for command"
 msgstr "gặp lỗi khi đợi câu lệnh"
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr "lệnh theo dõi đã đổ lõi"
@@ -11529,7 +11648,6 @@ msgid "setting times of %s"
 msgstr "đang đặt th�i gian của %s"
 
 #: src/touch.c:213
-#, fuzzy
 msgid ""
 "Update the access and modification times of each FILE to the current time.\n"
 "\n"
@@ -11542,12 +11660,11 @@ msgstr ""
 "Cập nhật các th�i gian truy cập và sửa đổi của mỗi TẬP_TIN\n"
 "lên th�i gian hiện tại.\n"
 "\n"
-"�ối số TẬP_TIN không tồn tại thì được tạo trống,\n"
-"nếu không đựa ra “-c� hay “-h�.\n"
-"\n"
-"Chuỗi đối số TẬP_TIN “-� được xử lý đặc biệt và gây ra tiến trình\n"
-"touch thay đổi các th�i gian của tập tin liên quan đến đầu ra tiêu chuẩn.\n"
+"�ối số TẬP_TIN không tồn tại thì được tạo mới, trừ phi dùng \"-c\" hay \"-h"
+"\".\n"
 "\n"
+"Chuỗi đối số TẬP_TIN \"-\" được xử lý đặc biệt và gây ra tiến trình\n"
+"touch thay đổi các th�i gian của tập tin tổ hợp với đầu ra tiêu chuẩn.\n"
 
 #: src/touch.c:225
 msgid ""
@@ -11614,7 +11731,7 @@ msgstr "không chỉ ra được th�i gian từ vài nguồn"
 msgid ""
 "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'"
 msgstr ""
-"cảnh báo: “touch %s� là cách cũ; hãy dùng �touch -t %04ld%02d%02d%02d%02d."
+"cảnh báo: “touch %s� là cách cũ; hãy dùng “touch -t %04ld%02d%02d%02d%02d."
 "%02d�"
 
 #: src/tr.c:286
@@ -11739,7 +11856,7 @@ msgstr ""
 "Chỉ đảm bảo rằng [:lower:] và [:upper:] sẽ mở rộng\n"
 "theo thứ tự tăng dần; dùng trong TẬP_HỢP2 khi chuyển đổi,\n"
 "thì chỉ có thể sử dụng chúng theo cặp\n"
-"để ghi rõ cách chuyển đổi chữ hoa/thư�ng.\n"
+"để ghi rõ cách chuyển đổi chữ HOA/thư�ng.\n"
 "Tùy ch�n “-s� dùng TẬP_HỢP1\n"
 "nếu không chuyển đổi và cũng không xóa;\n"
 "có thì chức năng vắt dùng TẬP_HỢP2 và xảy ra\n"
@@ -11752,7 +11869,7 @@ msgid ""
 "\tinterpreted as the 2-byte sequence \\0%c%c, %c"
 msgstr ""
 "cảnh báo: dãy thoát bát phân chưa rõ ràng “\\%c%c%c�\n"
-"đang được biên dịch như dãy 2 byte \\0%c%c, “%c�"
+"đang được biên dịch như dãy 2 byte “\\0%c%c, %c�"
 
 #: src/tr.c:518
 #, c-format
@@ -11887,7 +12004,6 @@ msgid "Usage: %s OPTION... FILE...\n"
 msgstr "Cách dùng: %s TÙY_CHỌN... TẬP_TIN...\n"
 
 #: src/truncate.c:97
-#, fuzzy
 msgid ""
 "Shrink or extend the size of each FILE to the specified size\n"
 "\n"
@@ -11899,12 +12015,11 @@ msgid ""
 msgstr ""
 "Thu nh� hoặc mở rộng kích cỡ của mỗi TẬP_TIN thành kích cỡ đưa ra.\n"
 "\n"
-"Một đối số TẬP_TIN chưa tồn tại thì được tạo.\n"
-"\n"
-"Nếu một tập tin nào đó vẫn lớn hơn kích cỡ đưa ra thì dữ liệu thừa bị mất.\n"
-"Nếu một tập tin nào đó vẫn nh� hơn thì nó được mở rộng\n"
-"và phần mở rộng (lỗ) được đ�c là số không byte.\n"
+"�ối số TẬP_TIN nếu chưa có thì được tạo mới.\n"
 "\n"
+"Nếu TẬP_TIN lớn hơn kích cỡ đưa ra thì dữ liệu thừa bị mất.\n"
+"Nếu TẬP_TIN nh� hơn thì nó được mở rộng\n"
+"và phần mở rộng (lỗ) được đi�n đầy bằng số không\n"
 
 #: src/truncate.c:109
 msgid "  -c, --no-create        do not create any files\n"
@@ -11919,10 +12034,10 @@ msgstr ""
 #: src/truncate.c:115
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 "  -r, --reference=TẬP-TIN-TC dựa trên cỡ của tập tin dùng để tham chiếu\n"
-"  -s, --size=SIZE       đặt hoặc đi�u chỉnh cỡ tập tin bằng SIZE\n"
+"  -s, --size=CỠ        đặt hoặc đi�u chỉnh cỡ tập tin theo CỠ này\n"
 
 #: src/truncate.c:121
 msgid ""
@@ -11933,8 +12048,8 @@ msgid ""
 msgstr ""
 "\n"
 "Kích CỠ cũng có thể theo sau một của những ký tự sửa đổi này:\n"
-"�+� tăng theo, �-� giảm theo, �<� nhi�u nhất, �>� ít nhất\n"
-"�/� làm tròn xuống bội số cho, � %� làm tròn lên bội số cho\n"
+"�+� tăng theo, “-� giảm theo, “<� nhi�u nhất, “>� ít nhất\n"
+"�/� làm tròn xuống bội số cho, “ %� làm tròn lên bội số cho\n"
 
 #: src/truncate.c:149
 #, c-format
@@ -11944,7 +12059,7 @@ msgstr "tràn các khối byte %<PRIdMAX> * %<PRIdMAX> cho tập tin %s"
 #: src/truncate.c:173
 #, c-format
 msgid "%s has unusable, apparently negative size"
-msgstr "%s có kích cỡ vô ích có vẻ là âm"
+msgstr "%s vô ích, kích cỡ có vẻ là âm"
 
 #: src/truncate.c:183 src/truncate.c:384
 #, c-format
@@ -11964,7 +12079,7 @@ msgstr "tràn việc mở rộng kích cỡ của tập tin %s"
 #: src/truncate.c:230
 #, c-format
 msgid "failed to truncate %s at %<PRIdMAX> bytes"
-msgstr "không cắt được %s ở byte thứ %<PRIdMAX> "
+msgstr "không cắt được %s ở byte thứ %<PRIdMAX>"
 
 #: src/truncate.c:303
 #, c-format
@@ -12010,12 +12125,12 @@ msgstr ""
 "Khi không có TẬP_TIN, hoặc khi TẬP_TIN là “-�, đ�c đầu vào tiêu chuẩn.\n"
 "\n"
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr "%s: dữ liệu vào chứa một số lẻ các hiệu bài"
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr "%s: dữ liệu vào chứa một vòng lặp:"
@@ -12080,14 +12195,13 @@ msgid "cannot get system name"
 msgstr "không lấy được tên hệ thống"
 
 #: src/unexpand.c:117
-#, fuzzy
 msgid ""
 "Convert blanks in each FILE to tabs, writing to standard output.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 msgstr ""
-"Chuyển thành tab khoảng trắng trong mỗi TẬP_TIN, ghi ra đầu ra tiêu chuẩn.\n"
-"Khi không có TẬP_TIN hoặc khi TẬP_TIN là “-�, đ�c đầu vào tiêu chuẩn.\n"
-"\n"
+"Chuyển khoảng trắng trong mỗi TẬP_TIN thành tab, ghi ra đầu ra tiêu chuẩn.\n"
+"Khi không có TẬP_TIN hoặc khi TẬP_TIN là \"-\", thì đ�c từ đầu vào tiêu "
+"chuẩn.\n"
 
 #: src/unexpand.c:124
 msgid ""
@@ -12115,13 +12229,12 @@ msgstr "tab phân cách nhau quá xa"
 msgid "tab stop value is too large"
 msgstr "chi�u dài tab là quá lớn"
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr "Cách dùng: %s [TÙY_CHỌN]... [VÀO [RA]]\n"
 
-#: src/uniq.c:138
-#, fuzzy
+#: src/uniq.c:174
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
 "writing to OUTPUT (or standard output).\n"
@@ -12129,50 +12242,65 @@ msgid ""
 "With no options, matching lines are merged to the first occurrence.\n"
 msgstr ""
 "L�c các dòng k� nhau tương ứng từ VÀO (hoặc đầu vào tiêu chuẩn).\n"
-"cũng ghi vào RA (hoặc đầu ra tiêu chuẩn).\n"
-"\n"
-"Không có tùy ch�n thì các dòng tương ứng được gộp lại đối với lần gặp thứ "
-"nhất.\n"
+"cũng ghi vào �ẦU-RA (hoặc đầu ra tiêu chuẩn).\n"
 "\n"
+"Không có tuỳ ch�n thì các dòng được hòa trộn lại cho đến khi khớp mẫu xảy "
+"ra.\n"
 
-#: src/uniq.c:147
+#: src/uniq.c:183
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
 msgstr ""
 "  -c, --count           thêm vào trước các dòng số lần lặp lại của chúng\n"
-"  -d, --repeated        chỉ in những dòng lặp lại\n"
+"  -d, --repeated        chỉ in những dòng lặp lại, một lần cho mỗi nhóm\n"
 
-#: src/uniq.c:151
+#: src/uniq.c:187
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
-"  -i, --ignore-case     ignore differences in case when comparing\n"
-"  -s, --skip-chars=N    avoid comparing the first N characters\n"
-"  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
 msgstr ""
 "  -D, --all-repeated[=phương_pháp_định_giới]\n"
 "                        in m�i dòng trùng\n"
+"                        Có thể định giới bằng dòng trắng.\n"
+"                        phương_pháp_định_giới là:\n"
+"                         * none      không (mặc định)\n"
+"                         * prepend   thêm vào trước\n"
+"                         * separate  phân cách\n"
+
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr "  -f, --skip-fields=N   không so sánh N trư�ng đầu tiên\n"
+
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
+msgstr ""
+"      --group[=PHƯƠNG THỨC]  hiện m�i mục, ngăn cách nhóm bằng dòng trống\n"
 "                        phương_pháp_định_giới là:\n"
-"                         * none      không có (mặc định)\n"
+"                         * none      không (mặc định)\n"
 "                         * prepend   thêm vào trước\n"
 "                         * separate  phân cách\n"
-"                        Có định giới bằng dòng trắng.\n"
-"  -f, --skip-fields=N   không so sánh N trư�ng đầu tiên\n"
-"  -i, --ignore-case     không phân biệt chữ hoa/thư�ng khi so sánh\n"
+"                         * both      cả hai\n"
+
+#: src/uniq.c:199
+msgid ""
+"  -i, --ignore-case     ignore differences in case when comparing\n"
+"  -s, --skip-chars=N    avoid comparing the first N characters\n"
+"  -u, --unique          only print unique lines\n"
+msgstr ""
+"  -i, --ignore-case     không phân biệt chữ HOA/thư�ng khi so sánh\n"
 "  -s, --skip-chars=N    không so sánh N ký tự đầu tiên\n"
 "  -u, --unique          chỉ in mỗi dòng duy nhất\n"
-"  -z, --zero-terminated kết thúc dòng với 0 byte,\n"
-"                        không phải ký tự dòng mới\n"
 
-#: src/uniq.c:161
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr "  -w, --check-chars=N   so sánh nhi�u nhất N ký tự trên dòng\n"
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 msgid ""
 "\n"
 "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n"
@@ -12183,7 +12311,7 @@ msgstr ""
 "và/hay khoảng TAB), rồi các ký tự không trắng.\n"
 "B� qua các trư�ng trước khi các ký tự.\n"
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 msgid ""
 "\n"
 "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n"
@@ -12193,27 +12321,37 @@ msgstr ""
 "\n"
 "Ghi chú: “uniq� không phát hiện dòng lặp lại nếu chúng không k� nhau.\n"
 "Trước tiên có lẽ bạn muốn sắp xếp kết xuất, hoặc dùng “sort -u� không có "
-"�uniq�.\n"
+"“uniq�.\n"
 "Hơn nữa, sự so sánh tùy theo quy tắc của “LC_COLLATE�.\n"
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, c-format
 msgid "too many repeated lines"
 msgstr "quá nhi�u dòng lặp lại"
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
 msgstr "sai số trư�ng cần b� qua"
 
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
 msgstr "sai số byte cần b� qua"
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
 msgstr "sai số byte cần so sánh"
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr "--group không được dùng cùng với -c/-d/-D/-u"
+
+#: src/uniq.c:652
+#, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr "số đếm lặp lại in và nhóm là không có ý nghĩa"
+
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr "in ra m�i dòng trùng và số đếm lặp lại là không có ý nghĩa"
@@ -12235,11 +12373,6 @@ msgstr ""
 "G�i hàm “unlink� để xóa TẬP_TIN chỉ ra.\n"
 "\n"
 
-#: src/unlink.c:86
-#, c-format
-msgid "cannot unlink %s"
-msgstr "không thể hủy liên kết %s"
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -12267,9 +12400,9 @@ msgid_plural "up %ld days %2d:%02d,  "
 msgstr[0] "chạy %ld ngày %2d:%02d,  "
 
 #: src/uptime.c:149
-#, fuzzy, c-format
+#, c-format
 msgid "up  %2d:%02d,  "
-msgstr "chạy %ld ngày %2d:%02d,  "
+msgstr "chạy %2d:%02d,  "
 
 #: src/uptime.c:151
 #, c-format
@@ -12282,7 +12415,7 @@ msgstr[0] "%lu ngư�i dùng"
 msgid ",  load average: %.2f"
 msgstr ",  mức tải trung bình: %.2f"
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -12293,7 +12426,7 @@ msgstr ""
 "số ngư�i dùng trên hệ thống, và số trung bình các công việc\n"
 "trong hàng đợi chạy trong 1, 5 và 15 phút cuối cùng."
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
@@ -12302,12 +12435,12 @@ msgstr ""
 " Các tiến trình đang ngủ\n"
 "không gián đoạn được thì cũng được tính trong tr�ng tải trung bình.\n"
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr "\n"
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
@@ -12498,7 +12631,7 @@ msgid ""
 "      --writable    same as -T\n"
 msgstr ""
 "  -T, -w, --mesg    thêm trạng thái thư của ngư�i dùng như “+�, “-� hoặc "
-"�?�\n"
+"“?�\n"
 "  -u, --users       liệt kê những ngư�i dùng đã đăng nhập\n"
 "      --message     giống như “-T�\n"
 "      --writable    giống như “-T�\n"
@@ -12512,7 +12645,7 @@ msgid ""
 msgstr ""
 "\n"
 "Nếu không chỉ ra TẬP_TIN, sử dụng %s .  %s như là TẬP_TIN chung.\n"
-"Nếu đưa ra �.S�1 �.S�2, giả sử “-m�: thư�ng là “am i� hoặc “mom likes�.\n"
+"Nếu đưa ra �.S�1 �.S�2, coi là “-m�: thư�ng là “am i� hoặc “mom likes�.\n"
 
 #: src/whoami.c:45
 msgid ""
@@ -12546,6 +12679,161 @@ msgstr ""
 "In lặp lại một dòng với tất cả CHUỖI chỉ ra, hoặc “y�.\n"
 "\n"
 
+#~ msgid "cannot create pipe"
+#~ msgstr "không thể tạo ống dẫn"
+
+#~ msgid "%s subprocess failed"
+#~ msgstr "tiến trình con %s bị lỗi"
+
+#~ msgid "_open_osfhandle failed"
+#~ msgstr "_open_osfhandle gặp lỗi"
+
+#~ msgid "cannot restore fd %d: dup2 failed"
+#~ msgstr "không thể phục hồi bộ mô tả tập tin %d: dup2 bị lỗi"
+
+#~ msgid "%s subprocess"
+#~ msgstr "tiến trình con %s"
+
+#~ msgid "%s subprocess got fatal signal %d"
+#~ msgstr "tiến trình con %s đã nhận tín hiệu nghiêm tr�ng %d"
+
+#~ msgid "failed to set additional groups"
+#~ msgstr "gặp lỗi khi đặt nhóm phụ"
+
+#~ msgid "mount point %s already traversed"
+#~ msgstr "điểm gắn “%s� đã sẵn được đảo ngược"
+
+#~ msgid "%s: cannot lseek back to original position"
+#~ msgstr "%s: không thể lseek lại vị trí gốc"
+
+#~ msgid "%s: failed to reset file pointer"
+#~ msgstr "%s: gặp lỗi khi đặt lại con tr� tập tin"
+
+#~ msgid "cannot reposition file pointer for %s"
+#~ msgstr "không thể đặt lại vị trí của cái chỉ tập tin cho %s"
+
+#~ msgid ""
+#~ "  -Z, --context[=CTX]  set the SELinux security context of each NAME to\n"
+#~ "                         default type, or CTX if specified\n"
+#~ msgstr ""
+#~ "  -Z, --context[=NGỮ_CẢNH]  đặt ngữ cảnh bảo mật SELinux của mỗi\n"
+#~ "                     TÊN thành mặc định hoặc NGỮ_CẢNH nếu nó được đưa ra\n"
+
+#~ msgid ""
+#~ "  -Z, --context[=CTX]  set the SELinux security context of NAME to\n"
+#~ "                         default type, or to CTX if specified\n"
+#~ msgstr ""
+#~ "  -Z, --context[=NGỮ_CẢNH]   đặt ngữ cảnh bảo mật SELinux của TÊN\n"
+#~ "                           thành mặc định hoặc NGỮ_CẢNH nếu nó được đưa "
+#~ "ra\n"
+
+#~ msgid "out of memory (requested %zu bytes)"
+#~ msgstr "hết bộ nhớ (cần %zu byte)"
+
+#~ msgid "--padding cannot be combined with --format"
+#~ msgstr "--padding không thể được tổ hợp cùng với --format"
+
+#~ msgid ""
+#~ "Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
+#~ "  or:  %s LONG-OPTION\n"
+#~ msgstr ""
+#~ "Cách dùng: %s [TÙY_CHỌN_NGẮN]... NGƯỜI_DÙNG LỆNH [��I_S�]...\n"
+#~ "     hoặc: %s TÙY_CHỌN_DÀI\n"
+
+#~ msgid ""
+#~ "Drop any supplemental groups, assume the user-ID and group-ID of the "
+#~ "specified\n"
+#~ "USER (numeric ID or user name), and run COMMAND with any specified "
+#~ "ARGUMENTs.\n"
+#~ "Exit with status 111 if unable to assume the required user and group ID.\n"
+#~ "Otherwise, exit with the exit status of COMMAND.\n"
+#~ "This program is useful only when run by root (user ID zero).\n"
+#~ "\n"
+#~ msgstr ""
+#~ "B� m�i nhóm phụ, coi là ID ngư�i dùng và ID nhóm của NGƯỜI_DÙNG\n"
+#~ "chỉ ra (ID thuộc số hay tên ngư�i dùng), và chạy câu LỆNH với m�i ��I_S� "
+#~ "Ä‘Æ°a ra.\n"
+#~ "Thoát với trạng thái 111 nếu không thể dùng UID và GID yêu cầu.\n"
+#~ "Nếu không, thoát với trạng thái thoát của câu LỆNH.\n"
+#~ "Chương trình này chỉ có ích khi chạy bởi root (UID=0).\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, "
+#~ "and\n"
+#~ "                      (if specified) supplemental group IDs to GID1, ...\n"
+#~ msgstr ""
+#~ "  -g GID[,GID1...]  cũng đặt ID nhóm chính thành GID thuộc số\n"
+#~ "                      và (nếu chỉ ra) đặt các ID nhóm phụ thành "
+#~ "GID1, ...\n"
+
+#~ msgid "unknown user-ID: %s"
+#~ msgstr "ID ngư�i dùng lạ: %s"
+
+#~ msgid "to use user-ID %s you need to use -g too"
+#~ msgstr "để sử dụng ID ngư�i dùng %s thì phải cũng dùng tùy ch�n “-g�"
+
+#~ msgid "cannot set group-ID to %lu"
+#~ msgstr "không đặt được ID nhóm thành %lu"
+
+#~ msgid "cannot set user-ID to %lu"
+#~ msgstr "không đặt được ID ngư�i dùng thành %lu"
+
+#~ msgid "failed to get file system create context"
+#~ msgstr "gặp lỗi khi lấy ngữ cảnh tạo hệ thống tập tin"
+
+#~ msgid "warning: "
+#~ msgstr "cảnh báo: "
+
+#~ msgid "long option '--megabytes' is deprecated and will soon be removed"
+#~ msgstr "tùy ch�n dài “--megabytes� đã lỗi th�i và sẽ sớm bị loại b�"
+
+#~ msgid "Usage: %s [OPTION]... [USERNAME]\n"
+#~ msgstr "Cách dùng: %s [TÙY_CHỌN]... [TÊN_NGƯỜI_DÙNG]\n"
+
+#~ msgid ""
+#~ "      --strict         with --check, exit non-zero for any invalid input\n"
+#~ msgstr ""
+#~ "      --strict         cùng --check, sẽ thoát với giá trị trả v� không "
+#~ "phải\n"
+#~ "                       số không với đầu vào bất kỳ\n"
+
+#~ msgid "failed to redirect stderr to /dev/null"
+#~ msgstr "không chuyển hướng được đầu lỗi tiêu chuẩn tới /dev/null"
+
+#~ msgid "invalid number: '%s'"
+#~ msgstr "số không hợp lệ: “%s�"
+
+#~ msgid ""
+#~ "\n"
+#~ "With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Khi không có TẬP_TIN hoặc khi TẬP_TIN là “-�, đ�c đầu vào tiêu chuẩn. “-"
+#~ "F /� theo mặc định.\n"
+
+#~ msgid "cannot remove directory: %s"
+#~ msgstr "không xóa được thư mục: %s"
+
+#~ msgid "dup2 failed"
+#~ msgstr "dup2 bị lỗi"
+
+#~ msgid "couldn't execute %s"
+#~ msgstr "không thể thực hiện %s"
+
+#~ msgid "couldn't execute %s -d"
+#~ msgstr "không thể thực hiện %s -d"
+
+#~ msgid ""
+#~ "\n"
+#~ "Report %s bugs to %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Thông báo lỗi “%s� cho <%s>\n"
+
+#~ msgid "warning: --retry is useful mainly when following by name"
+#~ msgstr "cảnh báo: “--retry� thư�ng có ích khi theo sau theo tên"
+
 #~ msgid "using single-precision arithmetic"
 #~ msgstr "đang sử dụng chức năng sự tính chính xác đơn"
 
@@ -12553,15 +12841,58 @@ msgstr ""
 #~ msgstr "đang sử dụng chức năng sự tính chính xác tùy ý"
 
 #, fuzzy
-#~ msgid "  returning value: '%s'\n"
-#~ msgstr "đang tạo tập tin %s\n"
+#~ msgid "  suffix power=%d^%d = %Lf\n"
+#~ msgstr "Sự chuyển đổi ký tự xuống dòng CR/LF"
 
 #, fuzzy
+#~ msgid "  returning value: %Lf (%LG)\n"
+#~ msgstr "  biến đổi tỷ lệ thành %Lf * %0.f ^ %d\n"
+
+#~ msgid "double_to_human:\n"
+#~ msgstr "double_to_human:\n"
+
+#~ msgid "  scaled value to %Lf * %0.f ^ %d\n"
+#~ msgstr "  biến đổi tỷ lệ thành %Lf * %0.f ^ %d\n"
+
+#~ msgid "  after rounding, value=%Lf * %0.f ^ %d\n"
+#~ msgstr "  sau khi làm tròn, giá trị=%Lf * %0.f ^ %d\n"
+
+#~ msgid "  returning value: '%s'\n"
+#~ msgstr "  trả v� giá trị: “%s�\n"
+
 #~ msgid "Usage: %s [OPTIONS] [NUMBER]\n"
-#~ msgstr "Cách dùng: %s [TÙY-CHỌN] TÊN...\n"
+#~ msgstr "Cách dùng: %s [TÙY-CHỌN] [S�]\n"
+
+#, fuzzy
+#~ msgid "  After padding: '%s'\n"
+#~ msgstr "S&au một đoạn văn:"
+
+#, fuzzy
+#~ msgid "trimming suffix '%s'\n"
+#~ msgstr "Hậu tố không được hỗ trợ: “%s�.\n"
 
 #, fuzzy
 #~ msgid "no valid suffix found\n"
+#~ msgstr "%s: không tìm thấy siêu khối nhật ký hợp lệ\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "extracting Fields:\n"
+#~ "  input: '%s'\n"
+#~ "  field: %d\n"
+#~ msgstr "quá nhi�u vùng nhập vào\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "  TOO FEW FIELDS!\n"
+#~ "  prefix: '%s'\n"
+#~ msgstr "quá nhi�u vùng nhập vào\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "  prefix: '%s'\n"
+#~ "  number: '%s'\n"
+#~ "  suffix: '%s'\n"
 #~ msgstr "%s: sai chi�u dài hậu tố"
 
 #~ msgid "reading %s"
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index 3febf9d7..e29fcf02 100644
--- a/po/zh_CN.gmo
+++ b/po/zh_CN.gmo
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ff3d381b..998157b7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: coreutils 8.11-pre1\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
 "PO-Revision-Date: 2011-03-28 00:26+0800\n"
 "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -40,76 +40,124 @@ msgstr "有效的�数为："
 msgid "error closing file"
 msgstr "关闭文件时出错"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "写入错误"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "%s 的�留��"
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "未知的系统错误"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "普通空文件"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "普通文件"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "目录"
 
-#: lib/file-type.c:44
-msgid "block special file"
-msgstr "�特殊文件"
-
-#: lib/file-type.c:47
-msgid "character special file"
-msgstr "字符特殊文件"
-
-#: lib/file-type.c:50
-msgid "fifo"
-msgstr "先进先出"
-
-#: lib/file-type.c:53
+#: lib/file-type.c:46
 msgid "symbolic link"
 msgstr "符�链接"
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "套接字"
-
-#: lib/file-type.c:59
+#: lib/file-type.c:52
 msgid "message queue"
 msgstr "消�队列"
 
-#: lib/file-type.c:62
+#: lib/file-type.c:55
 msgid "semaphore"
 msgstr "信��"
 
-#: lib/file-type.c:65
+#: lib/file-type.c:58
 msgid "shared memory object"
 msgstr "共享内存对象"
 
-#: lib/file-type.c:68
+#: lib/file-type.c:61
 msgid "typed memory object"
 msgstr "共享内存对象"
 
-#: lib/file-type.c:70
+#: lib/file-type.c:66
+msgid "block special file"
+msgstr "�特殊文件"
+
+#: lib/file-type.c:69
+msgid "character special file"
+msgstr "字符特殊文件"
+
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr ""
+
+#: lib/file-type.c:75
+msgid "fifo"
+msgstr "先进先出"
+
+#: lib/file-type.c:78
+msgid "door"
+msgstr ""
+
+#: lib/file-type.c:81
+#, fuzzy
+msgid "multiplexed block special file"
+msgstr "�特殊文件"
+
+#: lib/file-type.c:84
+#, fuzzy
+msgid "multiplexed character special file"
+msgstr "字符特殊文件"
+
+#: lib/file-type.c:87
+#, fuzzy
+msgid "multiplexed file"
+msgstr "多角色"
+
+#: lib/file-type.c:90
+#, fuzzy
+msgid "named file"
+msgstr "�怪文件"
+
+#: lib/file-type.c:93
+#, fuzzy
+msgid "network special file"
+msgstr "�特殊文件"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr ""
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr ""
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr ""
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "套接字"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr ""
+
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "�怪文件"
 
@@ -244,18 +292,18 @@ msgstr "%s：选项\"-W %s\"��许带�数\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s：选项\"-W %s\"必需带�数\n"
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr "无法更改%s 的��"
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "无法创建目录%s"
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr "内存耗尽"
@@ -372,7 +420,7 @@ msgstr "正则表达�过长"
 msgid "Unmatched ) or \\)"
 msgstr "未匹�的 ) 或 \\)"
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 msgid "No previous regular expression"
 msgstr "缺少之�的正则表达�"
 
@@ -397,7 +445,7 @@ msgstr "使用 --no-preserve-root 选项跳过安全模�"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[yY]"
 
@@ -407,11 +455,11 @@ msgstr "^[yY]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, c-format
 msgid "setting permissions for %s"
 msgstr "设置%s 的��"
@@ -552,18 +600,6 @@ msgstr "电�错误"
 msgid "Resource lost"
 msgstr "资�丢失"
 
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, fuzzy, c-format
-msgid "cannot create pipe"
-msgstr "无法创建先进先出文件%s"
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, fuzzy, c-format
-msgid "%s subprocess failed"
-msgstr "%s：检索失败"
-
 #: lib/strsignal.c:114
 #, c-format
 msgid "Real-time signal %d"
@@ -772,7 +808,7 @@ msgstr ""
 msgid "Report %s bugs to: %s\n"
 msgstr "请� %2$s 报告 %1$s 的错误\n"
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s 的主页：<%s>\n"
@@ -782,30 +818,10 @@ msgstr "%s 的主页：<%s>\n"
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr "%s 项目主页：<http://www.gnu.org/software/%s/>\n"
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr "GNU 软件一般性帮助：<http://www.gnu.org/gethelp/>\n"
 
-#: lib/w32spawn.h:43
-#, fuzzy, c-format
-msgid "_open_osfhandle failed"
-msgstr "打开失败"
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr ""
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr ""
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr ""
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr "标准输入"
@@ -827,7 +843,7 @@ msgstr "未知�"
 msgid "failed to reopen %s with mode %s"
 msgstr "以%s 模��新打开%s 失败"
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr "字符串比较出现错误"
@@ -891,7 +907,7 @@ msgstr ""
 "  -w, --wrap=字符数\t在指定的字符数�自动�行(默认为76)，0 为�用自动�行\n"
 "\n"
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -912,48 +928,47 @@ msgstr ""
 "包�一些�有效 Base64 字符的新行字符。�以�试用 --ignore-garbage 选项���"
 "加密�中任何� base64 字符。\n"
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "读�错误"
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, c-format
 msgid "invalid input"
 msgstr "输入无效"
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, c-format
 msgid "invalid wrap size: %s"
 msgstr "无效的�行字符数：%s"
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, c-format
 msgid "extra operand %s"
 msgstr "�外的�作数 %s"
 
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, c-format
 msgid "closing standard input"
 msgstr "关闭标准输入"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -984,8 +999,8 @@ msgstr ""
 #: src/basename.c:60
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/basename.c:67
@@ -999,32 +1014,31 @@ msgid ""
 "  %s -a any/str1 any/str2   -> \"str1\" followed by \"str2\"\n"
 msgstr ""
 
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, c-format
 msgid "missing operand"
 msgstr "缺少�作数"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr "Torbjorn Granlund"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 msgid "Richard M. Stallman"
 msgstr "Richard M. Stallman"
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1080,7 +1094,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr "无法在 %s 上执行 ioctrl"
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr "标准输出"
@@ -1097,14 +1111,14 @@ msgstr "Russell Coker"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 msgid "Jim Meyering"
 msgstr "Jim Meyering"
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, c-format
 msgid "failed to create security context: %s"
 msgstr "创建安全环境失败：%s"
@@ -1114,8 +1128,8 @@ msgstr "创建安全环境失败：%s"
 msgid "failed to set %s security context component to %s"
 msgstr "设置%s 安全环境组件到%s 失败"
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, c-format
 msgid "failed to get security context of %s"
 msgstr "无法�得%s 的安全环境"
@@ -1125,18 +1139,18 @@ msgstr "无法�得%s 的安全环境"
 msgid "can't apply partial context to unlabeled file %s"
 msgstr "部分关�无法应用于文件%s"
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, c-format
 msgid "failed to change context of %s to %s"
 msgstr "改�%s 的环境到%s 失败"
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
 msgstr "无法访问%s"
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, c-format
 msgid "cannot read directory %s"
 msgstr "无法读�目录%s"
@@ -1146,13 +1160,14 @@ msgstr "无法读�目录%s"
 msgid "changing security context of %s\n"
 msgstr "正在更改%s 的安全环境\n"
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, c-format
 msgid "fts_read failed"
 msgstr "fts_read 失败"
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, c-format
 msgid "fts_close failed"
 msgstr "fts_close 失败"
@@ -1171,7 +1186,7 @@ msgstr ""
 #: src/chcon.c:357
 #, fuzzy
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
@@ -1202,7 +1217,7 @@ msgstr ""
 "  -l, --range=范围 \t\t设置指定范围的目标安全环境\n"
 "\n"
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 #, fuzzy
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
@@ -1253,36 +1268,37 @@ msgstr ""
 "  -P         ��历任何符�链接(默认)\n"
 "\n"
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr "-R --dereference 需�-H 或-L 其中之一"
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr "-R -h 需�-P"
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, c-format
 msgid "missing operand after %s"
 msgstr "%s �缺少�作数"
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, c-format
 msgid "invalid context: %s"
 msgstr "无效模�：%s"
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr "给出的安全环境说明冲�"
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, c-format
 msgid "failed to get attributes of %s"
 msgstr "无法�得%s 的属性"
@@ -1313,7 +1329,7 @@ msgstr ""
 "\n"
 "  -h, --no-dereference\t\t影�符�连接而�引用的文件。\n"
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
@@ -1348,47 +1364,47 @@ msgstr ""
 "  %s staff /u            将 /u 的属组更改为\"staff\"。\n"
 "  %s -hR staff /u    将 /u �其�目录下所有文件的属组更改为\"staff\"。\n"
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
 msgstr "检查 %s 的新属性"
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr "符�链接%s 和该链接所指示的对象都未被更改\n"
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, fuzzy, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr "%s 的��模�已更改为%04lo (%s)\n"
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, fuzzy, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr "无法将%s 的��模�更改为%04lo (%s)\n"
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr "%s 的��模��留为%04lo (%s)\n"
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr "无法创建符�链接%s"
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, c-format
 msgid "changing permissions of %s"
 msgstr "更改%s 的��"
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr "%s：新的��为%s，而�%s"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1399,7 +1415,7 @@ msgstr ""
 "　或：%s [选项]... 八进制模� 文件...\n"
 "　或：%s [选项]... --reference=�考文件 文件...\n"
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 #, fuzzy
 msgid ""
 "Change the mode of each FILE to MODE.\n"
@@ -1411,19 +1427,15 @@ msgstr ""
 "\n"
 "  -h, --no-dereference\t\t影�符�连接而�引用的文件。\n"
 
-#: src/chmod.c:391
-#, fuzzy
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
-"      --reference=�考文件\t使用指定�考文件的安全环境，而�指定值\n"
-"  -R, --recursive        \t递归处�所有的文件��目录\n"
-"  -v, --verbose          \t为处�的所有文件显示诊断信�\n"
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr ""
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 #, fuzzy
 msgid ""
 "\n"
@@ -1432,12 +1444,12 @@ msgstr ""
 "\n"
 "�� MODE 都应属于这类形�\"[ugoa]*([-+=]([rwxXst]*|[ugo]))+\"。\n"
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr "无法组�使用 mode 和 --reference 选项"
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, c-format
 msgid "invalid mode: %s"
 msgstr "无效模�：%s"
@@ -1578,26 +1590,21 @@ msgstr ""
 "  %s -hR root /u\t将 /u �其�目录下所有文件的属主更改为\"root\"。\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr "Roland McGrath"
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr "无效的组%s"
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, c-format
 msgid "invalid group list %s"
 msgstr "无效的组列表%s"
 
-#: src/chroot.c:117
-#, c-format
-msgid "failed to set additional groups"
-msgstr "设置附加组失败"
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
@@ -1606,7 +1613,7 @@ msgstr ""
 "用法：%s [选项] 新根 [命令 [�数]...]\n"
 "　或：%s 选项\n"
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
@@ -1614,7 +1621,7 @@ msgstr ""
 "以指定的新根为�行指定命令时的的根目录。\n"
 "\n"
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
@@ -1622,7 +1629,7 @@ msgstr ""
 "  --userspec=用户:组      指定所用的用户�用户组(�使用\"数字\"或\"�字\")\n"
 "  --groups=组列表         指定�供选择的用户组列表，形如组1，组2，组3...\n"
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 #, fuzzy
 msgid ""
 "\n"
@@ -1631,28 +1638,42 @@ msgstr ""
 "\n"
 "如果没有指定命令，则�行\"${SHELL} -i\" (默认：/bin/sh)。\n"
 
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, c-format
 msgid "cannot change root directory to %s"
 msgstr "无法进入目录%s"
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, c-format
 msgid "cannot chdir to root directory"
 msgstr "无法切�到根目录"
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr ""
+
+#: src/chroot.c:383
+#, fuzzy, c-format
+msgid "failed to get supplemental groups"
+msgstr "设置附加组失败"
+
+#: src/chroot.c:395
+#, fuzzy, c-format
+msgid "failed to %s supplemental groups"
+msgstr "设置附加组失败"
+
+#: src/chroot.c:402
 #, c-format
 msgid "failed to set group-ID"
 msgstr "设置组ID 失败"
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, c-format
 msgid "failed to set user-ID"
 msgstr "设置用户ID 失败"
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, c-format
 msgid "failed to run command %s"
 msgstr "无法�行命令%s"
@@ -1684,7 +1705,7 @@ msgstr ""
 "输出�个文件的 CRC 校验值和字节统计。\n"
 "\n"
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr "用法：%s [选项]... 文件1 文件2\n"
@@ -1768,294 +1789,327 @@ msgstr "已定义多�分隔符"
 msgid "empty %s not allowed"
 msgstr "��许空的%s"
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr "读�%s 时出错"
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, c-format
 msgid "cannot lseek %s"
 msgstr "无法lseek %s"
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr "写入%s 出错"
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, c-format
 msgid "%s: failed to get extents info"
 msgstr "%s：无法获得 extent 信�"
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, c-format
 msgid "%s: write failed"
 msgstr "%s：写入失败"
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, c-format
 msgid "failed to extend %s"
 msgstr "扩展%s 失败"
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, c-format
 msgid "clearing permissions for %s"
 msgstr "清除%s 的��"
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "无法�留%s 的所有者"
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
 msgstr "查阅文件%s 失败"
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, c-format
 msgid "failed to preserve authorship for %s"
 msgstr "�留%s 的作者失败"
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
+#, c-format
+msgid "failed to set default file creation context to %s"
+msgstr "无法�得%s 的创建环境"
+
+#: src/copy.c:820
+#, fuzzy, c-format
+msgid "failed to set default file creation context for %s"
+msgstr "无法�得%s 的创建环境"
+
+#: src/copy.c:846
+#, fuzzy, c-format
+msgid "failed to set the security context of %s"
+msgstr "设置%s 的安全环境为%s 失败"
+
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
 msgid "cannot open %s for reading"
 msgstr "无法打开%s 读�数�"
 
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, c-format
 msgid "cannot fstat %s"
 msgstr "无法获�%s 的文件状�(fstat)"
 
-#: src/copy.c:820
+#: src/copy.c:935
 #, c-format
 msgid "skipping file %s, as it was replaced while being copied"
 msgstr "跳过文件%s，因为在准备�制时它已被其它文件�代"
 
-#: src/copy.c:850
-#, c-format
-msgid "failed to get file system create context"
-msgstr "获�文件系统创建环境失败"
-
-#: src/copy.c:864
-#, c-format
-msgid "failed to set the security context of %s to %s"
-msgstr "设置%s 的安全环境为%s 失败"
-
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
 msgid "cannot remove %s"
 msgstr "无法删除%s"
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
 msgstr "已删除%s\n"
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr "无法通过符�链接%s 进行�作"
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, c-format
 msgid "cannot create regular file %s"
 msgstr "无法创建普通文件%s"
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, fuzzy, c-format
 msgid "failed to clone %s from %s"
 msgstr "克隆%s 失败"
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr "正在�留 %s 的时间"
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
 #, fuzzy, c-format
 msgid "failed to close %s"
-msgstr "打开%s 失败"
+msgstr "克隆%s 失败"
 
-#: src/copy.c:1471
-#, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
+#: src/copy.c:1580
+#, fuzzy, c-format
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
 msgstr "%s：是�覆盖%s，而��会��模�%04lo (%s)？ "
 
-#: src/copy.c:1478
+#: src/copy.c:1581
+#, c-format
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr ""
+
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
 msgstr "%s：是�覆盖%s？ "
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr " (备份：%s)"
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr "��默认文件创建环境失败"
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, c-format
 msgid "cannot create hard link %s to %s"
 msgstr "无法创建指�%2$s 的硬链接%1$s"
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, c-format
 msgid "cannot stat %s"
 msgstr "无法获�%s 的文件状�(stat)"
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, c-format
 msgid "omitting directory %s"
 msgstr "略过目录%s"
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr "警告：指定��文件%s 多于一次"
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
 msgstr "%s 与%s 为�一文件"
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr "无法以目录%2$s �覆盖�目录%1$s"
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr "�会以%2$s 覆盖刚创建的%1$s"
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr "无法以�目录�覆盖目录%s"
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr "无法将目录移动至�目录：%s -> %s"
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr "备份%s 会破��文件；未移动%s"
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr "备份%s 会破��文件；未�制%s"
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
 msgstr "无法备份%s"
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr "�会以%s 覆盖刚创建的%s"
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr "无法将目录%s �制到自己%s"
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr "�会创建指�目录%2$s 的硬链接%1$s"
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr "无法将目录%s 移动至自身的�目录%s 下"
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, c-format
 msgid "cannot move %s to %s"
 msgstr "无法将%s 移动至%s"
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr "无法进行跨设备的移动：%s 至%s；无法删除目标"
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, c-format
-msgid "failed to set default file creation context to %s"
-msgstr "无法�得%s 的创建环境"
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr "无法�制循环的符�链接%s"
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr "%s：�能于当�目录中创建相对的符�链接"
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr "无法创建指�%2$s 的符�链接%1$s"
 
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, c-format
 msgid "cannot create fifo %s"
 msgstr "无法创建先进先出文件%s"
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, c-format
 msgid "cannot create special file %s"
 msgstr "无法创建特殊文件%s"
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, c-format
 msgid "cannot read symbolic link %s"
 msgstr "无法读�符�链接%s"
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, c-format
 msgid "cannot create symbolic link %s"
 msgstr "无法创建符�链接%s"
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
 msgstr "%s 的文件类型�详"
 
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, c-format
 msgid "cannot un-backup %s"
 msgstr "无法将%s 的备份还原"
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr "%s -> %s (还原备份)\n"
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr ""
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr ""
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, fuzzy, c-format
+msgid "unknown program %s"
+msgstr "未知�"
+
+#: src/cp.c:157 src/mv.c:288
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -2066,14 +2120,14 @@ msgstr ""
 "　或：%s [选项]... �文件... 目录\n"
 "　或：%s [选项]... -t 目录 �文件...\n"
 
-#: src/cp.c:162
+#: src/cp.c:163
 #, fuzzy
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 "将�文件�制至目标文件，或将多个�文件�制至目标目录。\n"
 "\n"
 
-#: src/cp.c:168
+#: src/cp.c:169
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
 "      --attributes-only        don't copy the file data, just the "
@@ -2093,7 +2147,7 @@ msgstr ""
 "      --copy-contents\t\t在递归处�是�制特殊文件内容\n"
 "  -d\t\t\t\t等于--no-dereference --preserve=links\n"
 
-#: src/cp.c:177
+#: src/cp.c:178
 #, fuzzy
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
@@ -2111,7 +2165,7 @@ msgstr ""
 "  -i, --interactive\t\t覆盖�询问(使��的 -n 选项失效)\n"
 "  -H\t\t\t\t跟��文件中的命令行符�链接\n"
 
-#: src/cp.c:186
+#: src/cp.c:187
 #, fuzzy
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
@@ -2120,7 +2174,7 @@ msgstr ""
 "  -l, --link\t\t\t链接文件而��制\n"
 "  -L, --dereference\t\t总是跟�符�链接\n"
 
-#: src/cp.c:190
+#: src/cp.c:191
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
 "                                 a previous -i option)\n"
@@ -2129,7 +2183,7 @@ msgstr ""
 "  -n, --no-clobber\t\t��覆盖已存在的文件(使��的 -i 选项失效)\n"
 "  -P, --no-dereference\t\t�跟��文件中的符�链接\n"
 
-#: src/cp.c:195
+#: src/cp.c:196
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
 "      --preserve[=ATTR_LIST]   preserve the specified attributes (default:\n"
@@ -2142,7 +2196,7 @@ msgstr ""
 "      --preserve[=属性列表\t��指定的属性(默认：模�,所有�,时间戳)，如果\n"
 "\t\t\t\t\t�能��附加属性：环境�链接�xattr 等\n"
 
-#: src/cp.c:203
+#: src/cp.c:204
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                use full source file name under DIRECTORY\n"
@@ -2150,7 +2204,7 @@ msgstr ""
 "      --sno-preserve=属性列表\t��留指定的文件属性\n"
 "      --parents\t\t\t�制�在目标目录创建��文件路径中的所有目录\n"
 
-#: src/cp.c:207
+#: src/cp.c:208
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
 "      --reflink[=WHEN]         control clone/CoW copies. See below\n"
@@ -2163,7 +2217,7 @@ msgstr ""
 "      --remove-destination\t�试打开目标文件�先删除已存在的目的地\n"
 "\t\t\t\t\t文件 (相对于 --force 选项)\n"
 
-#: src/cp.c:213
+#: src/cp.c:214
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
 "      --strip-trailing-slashes  remove any trailing slashes from each "
@@ -2173,7 +2227,7 @@ msgstr ""
 "      --sparse=WHEN\t\t控制创建稀�文件的方�\n"
 "      --strip-trailing-slashes\t删除�数中所有�文件/目录末端的斜�\n"
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -2187,7 +2241,7 @@ msgstr ""
 "                                           �制至目标目录\n"
 "  -T, --no-target-directory\t将目标目录视作普通文件\n"
 
-#: src/cp.c:224
+#: src/cp.c:225
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
 "                                 than the destination file or when the\n"
@@ -2200,7 +2254,15 @@ msgstr ""
 "  -v, --verbose\t\t显示详细的进行步骤\n"
 "  -x, --one-file-system\t�跨越文件系统进行�作\n"
 
-#: src/cp.c:233
+#: src/cp.c:232
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/cp.c:240
 msgid ""
 "\n"
 "By default, sparse SOURCE files are detected by a crude heuristic and the\n"
@@ -2226,7 +2288,7 @@ msgstr ""
 "情况下��制。如果�制失败或者�时指定了--reflink=auto，则返回标准�制模"
 "�。\n"
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 #, fuzzy
 msgid ""
 "\n"
@@ -2242,7 +2304,7 @@ msgstr ""
 "���选择。以下是�用的��值：\n"
 "\n"
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2255,7 +2317,7 @@ msgstr ""
 "份\n"
 "  simple, never   永远使用普通方�备份\n"
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2266,220 +2328,230 @@ msgstr ""
 "有一个特别情况：如果�时指定--force 和--backup 选项，而�文件和目标文件\n"
 "是�一个已存在的一般文件的�，cp 会将�文件备份。\n"
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, c-format
 msgid "failed to preserve times for %s"
 msgstr "无法�留%s 的时间"
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, c-format
 msgid "failed to preserve permissions for %s"
 msgstr "�留%s 的��失败"
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, c-format
 msgid "cannot make directory %s"
 msgstr "无法创建目录%s"
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr "%s 存在但并�目录"
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
 #, fuzzy, c-format
 msgid "failed to access %s"
-msgstr "打开%s 失败"
+msgstr "克隆%s 失败"
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, c-format
 msgid "missing file operand"
 msgstr "缺少了文件�作数"
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, c-format
 msgid "missing destination file operand after %s"
 msgstr "在%s �缺少了��作的目标文件"
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr "无法�时使用--target-directory (-t) 和--no-target-directory (-T) 选项"
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, c-format
 msgid "target %s is not a directory"
 msgstr "目标%s �是目录"
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr "当跟�--parents 选项时，目的地必须是目录"
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, c-format
 msgid "multiple target directories specified"
 msgstr "指定了多个目标目录"
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, fuzzy, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr "警告：忽略--context (-Z) �数，当��行的内核没有�用SELinux 支�"
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr "无法�时创建硬链接�符�链接"
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr "选项--backup 和 --no-clobber 互斥"
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr "--reflink �能与--sparse=auto 一起用"
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr "备份方�"
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, fuzzy, c-format
+msgid "cannot set target context and preserve it"
+msgstr "无法对%s 强制为目标环境，��原样"
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr "无法在未�用SELinux 支�的内核上使用安全环境"
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr "无法�留扩展属性，当�使用的 cp 副本编译时没有�用 xattr 支�"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr "Stuart Kemp"
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr "输入消失"
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr "%s：行数超出范围"
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, c-format
 msgid "%s: %s: line number out of range"
 msgstr "%s：%s：行数超出范围"
 
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, c-format
 msgid " on repetition %s\n"
 msgstr " 在循环�%s\n"
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, c-format
 msgid "%s: %s: match not found"
 msgstr "%s：%s：无匹�"
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr "正则表达��索时出错"
 
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, c-format
 msgid "write error for %s"
 msgstr "写入%s 时出错"
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, c-format
 msgid "%s: integer expected after delimiter"
 msgstr "%s：分界符�应该跟�整数"
 
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, fuzzy, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr "%s：在��计数中需�\"}\"字符"
 
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, fuzzy, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr "%s}：在\"{\"和\"}\"之间需�一个整数声明"
 
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, fuzzy, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr "%s：闭�定义符\"%c\"缺失"
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr "%s：无效的正则表达�：%s"
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr "%s：无效的模�"
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr "%s：行�必须大于0"
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr "行�%s 比先�的行�%s 更�"
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr "警告：行�%s 比先�的行�更�"
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr "下标中丢失了转�规格"
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr "下标中出现无效的转�规格：%c"
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr "下标中出现无效的转�规格：\\%.3o"
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr "无效的转�声明%%%c%c"
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr "下标中出现过多的%% 转�规格字符"
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr "下标中丢失了%% 转�规格字符"
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr "%s：无效数字"
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr "用法：%s [选项]... 文件 格�...\n"
 
-#: src/csplit.c:1455
+#: src/csplit.c:1483
 #, fuzzy
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
@@ -2489,7 +2561,7 @@ msgstr ""
 "�时�个分�文件的字节数也将被输出到标准输出。\n"
 "\n"
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, fuzzy, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2500,7 +2572,11 @@ msgstr ""
 "  -f, --prefix=�缀\t\t使用指定�缀代替\"xx\"\n"
 "  -k, --keep-files\t\t�移除错误的输出文件\n"
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr ""
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
@@ -2510,7 +2586,7 @@ msgstr ""
 "  -s, --quiet, --silent\t�显示输出文件的尺寸计数\n"
 "  -z, --elide-empty-files\t删除空的输出文件\n"
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
@@ -2518,7 +2594,7 @@ msgstr ""
 "\n"
 "如果文件为\"-\"，则读�标准输入。�个\"格�\"�以是：\n"
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 #, fuzzy
 msgid ""
 "\n"
@@ -2544,23 +2620,19 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr "David M. Ihnat"
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr "��从1 开始计数"
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr "用法：%s [选项]... [文件]...\n"
 
-#: src/cut.c:193
+#: src/cut.c:176
 #, fuzzy
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr ""
 "从�个文件中输出指定部分到标准输出。\n"
 "\n"
 
-#: src/cut.c:199
+#: src/cut.c:182
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
 "  -c, --characters=LIST   select only these characters\n"
@@ -2570,7 +2642,7 @@ msgstr ""
 "  -c, --characters=列表\t\t�选中指定的这些字符\n"
 "  -d, --delimiter=分界符\t使用指定分界符代替制表符作为区域分界\n"
 
-#: src/cut.c:204
+#: src/cut.c:187
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
 "                            that contains no delimiter character, unless\n"
@@ -2581,13 +2653,13 @@ msgstr ""
 "\t\t\t\t行，除�-s 选项被指定\n"
 "  -n\t\t\t\t(忽略)\n"
 
-#: src/cut.c:210
+#: src/cut.c:193
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
 "                            or fields\n"
 msgstr "      --complement\t\t补全选中的字节�字符或域\n"
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
@@ -2598,7 +2670,7 @@ msgstr ""
 "å…¥\n"
 "\t\t\t\t的分界符\n"
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2610,7 +2682,7 @@ msgstr ""
 "用逗�隔\n"
 "开��时显示的��类别。您的输入顺�将作为读�顺�，�个仅能输入一次。\n"
 
-#: src/cut.c:227
+#: src/cut.c:210
 msgid ""
 "Each range is one of:\n"
 "\n"
@@ -2629,47 +2701,51 @@ msgstr ""
 "\n"
 "当没有文件�数，或者文件�存在时，从标准输入读�\n"
 
-#: src/cut.c:367 src/cut.c:493
+#: src/cut.c:300 src/cut.c:394
 #, fuzzy
 msgid "invalid byte, character or field list"
 msgstr "无效的字节或域列表"
 
-#: src/cut.c:387
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr "��从1 开始计数"
+
+#: src/cut.c:320
 msgid "invalid range with no endpoint: -"
 msgstr "无终点的无效的范围：-"
 
-#: src/cut.c:403
+#: src/cut.c:334
 msgid "invalid decreasing range"
 msgstr "无效的缩�的范围"
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, c-format
 msgid "byte offset %s is too large"
 msgstr "字节�移�%s 过大"
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, c-format
 msgid "field number %s is too large"
 msgstr "域编�%s 过大"
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr "�能指定列表中的一�类型"
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr "分界符必须是�个字符"
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr "您必须指定一组字节�字符或域的列表"
 
-#: src/cut.c:850
+#: src/cut.c:790
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr "�有当�作域时��以指定输入分界符"
 
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
@@ -2677,11 +2753,11 @@ msgstr ""
 "清除没有分界符的行�有在\n"
 "\t�作域时�有�义"
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr "缺少域列表"
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr "缺少�置列表"
 
@@ -2727,7 +2803,7 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 "      --rfc-3339=TIMESPEC\t以RFC 3339 格�输出日期和时间。\n"
 "\t\t\t\tTIMESPEC=`date'，`seconds'，或 `ns' \n"
@@ -2929,10 +3005,10 @@ msgid ""
 "  $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n"
 msgstr ""
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr "标准输入"
@@ -2972,7 +3048,7 @@ msgstr ""
 msgid "cannot set date"
 msgstr "无法设置日期"
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, c-format
 msgid "time %s is out of range"
 msgstr "时间%s 超出范围"
@@ -2983,7 +3059,7 @@ msgstr "时间%s 超出范围"
 msgid "Paul Rubin"
 msgstr "Paul Rubin"
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
@@ -2992,7 +3068,7 @@ msgstr ""
 "用法：%s [�作数] ...\n"
 "　或：%s 选项\n"
 
-#: src/dd.c:526
+#: src/dd.c:532
 #, fuzzy
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
@@ -3011,7 +3087,7 @@ msgstr ""
 "  count=�数\t�将指定个�数�制到�\n"
 "  ibs=比特数\t一次读�的比特数(默认：512)\n"
 
-#: src/dd.c:535
+#: src/dd.c:541
 #, fuzzy
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
@@ -3033,7 +3109,7 @@ msgstr ""
 "  skip=�数\t在输入开始处跳过指定的�数\n"
 "  status=noxfer\t�止传输统计\n"
 
-#: src/dd.c:546
+#: src/dd.c:552
 #, fuzzy
 msgid ""
 "\n"
@@ -3052,7 +3128,7 @@ msgstr ""
 "�个 CONV 符��能为：\n"
 "\n"
 
-#: src/dd.c:555
+#: src/dd.c:561
 #, fuzzy
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
@@ -3078,7 +3154,7 @@ msgstr ""
 "  sync\t\t将�个输入数��以NUL 字符填满至ibs 的大�；当��block\n"
 "\t\t或unblock 时，会以空格代替NUL 字符填充\n"
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -3094,7 +3170,7 @@ msgstr ""
 "  fdatasync\t结��将输出文件数�写入�盘\n"
 "  fsync\t类似上�，但是元数�也一�写入\n"
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -3107,75 +3183,75 @@ msgstr ""
 "\n"
 "  append\t追加模�(仅对输出有�义；��了conv=notrunc)\n"
 
-#: src/dd.c:583
+#: src/dd.c:589
 msgid "  cio       use concurrent I/O for data\n"
 msgstr "  cio\t使用并行I/O 存�模�\n"
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr "  direct\t使用直接I/O 存�模�\n"
 
-#: src/dd.c:587
+#: src/dd.c:593
 msgid "  directory  fail unless a directory\n"
 msgstr "  directory\t除�是目录，�则 directory 失败\n"
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr "  dsync\t\t使用�步I/O 存�模�\n"
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr "  sync\t\t与上者类似，但�时也对元数�生效\n"
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr "  fullblock\t为输入积累完整�(仅iflag)\n"
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr "  nonblock\t使用无阻塞I/O 存�模�\n"
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr "  noatime\t�更新存�时间\n"
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr "  nocache\t丢弃缓存数�\n"
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr "  noctty\t�根�文件指派控制终端\n"
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr "  nofollow\t�跟�链接文件\n"
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr "  nolinks\t如果有多�链接，则nolinks 失败\n"
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr "  binary\t使用二进制I/O 存�模�\n"
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr "  text\t使用文本I/O 存�模�\n"
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr ""
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3204,7 +3280,17 @@ msgstr ""
 "�用选项有：\n"
 "\n"
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr "%zu 字节的输入缓冲导致内存耗尽(%s)"
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr "%zu 字节的输出缓冲导致内存耗尽(%s)"
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
@@ -3213,19 +3299,19 @@ msgstr ""
 "记录了%<PRIuMAX>+%<PRIuMAX> 的读入\n"
 "记录了%<PRIuMAX>+%<PRIuMAX> 的写出\n"
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
 msgstr[0] "%<PRIuMAX> 个被截断了的�\n"
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
 msgstr[0] "%<PRIuMAX>字节(%s)已�制"
 
-#: src/dd.c:720
+#: src/dd.c:785
 msgid "Infinity B"
 msgstr "无穷� B"
 
@@ -3239,83 +3325,83 @@ msgstr "无穷� B"
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, c-format
 msgid ", %g s, %s/s\n"
 msgstr "，%g 秒，%s/秒\n"
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, c-format
 msgid "closing input file %s"
 msgstr "正在关闭输入文件%s"
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr "正在关闭输出文件%s"
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr "无法关闭O_DIRECT：%s"
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, c-format
 msgid "writing to %s"
 msgstr "正在写入%s"
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, c-format
 msgid "unrecognized operand %s"
 msgstr "无法识别的�作数%s"
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 msgid "invalid conversion"
 msgstr "转�无效"
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 msgid "invalid input flag"
 msgstr "输入标志无效"
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 msgid "invalid output flag"
 msgstr "输出标志无效"
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 msgid "invalid status flag"
 msgstr "状�标志无效"
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, c-format
 msgid "invalid number %s"
 msgstr "无效的数字%s"
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr "��将{ascii�ebcdic�idm}中的任�两个结�使用"
 
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, c-format
 msgid "cannot combine block and unblock"
 msgstr "��将block 和unblock 结�使用"
 
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, c-format
 msgid "cannot combine lcase and ucase"
 msgstr "��将lcase 和ucase 结�使用"
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, c-format
 msgid "cannot combine excl and nocreat"
 msgstr "��将excl 和nocreat 结�使用"
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, c-format
 msgid "cannot combine direct and nocache"
 msgstr "��将direct 和nocreat 结�使用"
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
@@ -3324,169 +3410,168 @@ msgstr ""
 "警告：暂时��有关文件%s 的lseek 内核错误\n"
 "  错误地�在mt_type=0x%0lx -- 有关mt_type 类型的列表请�考<sys/mtio.h>"
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, c-format
 msgid "%s: cannot skip"
 msgstr "%s：无法跳过"
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, c-format
 msgid "%s: cannot seek"
 msgstr "%s：无法�索"
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr "读入文件%s 时�移�溢出"
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr "警告：文件读�失败��移错误"
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr "无法��内核的错误"
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, c-format
 msgid "setting flags for %s"
 msgstr "正在设置%s 的标记"
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr "%zu 字节的输入缓冲导致内存耗尽(%s)"
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr "%zu 字节的输出缓冲导致内存耗尽(%s)"
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr "%s：无法跳至指定�移�"
 
-#: src/dd.c:2133
+#: src/dd.c:2172
 #, fuzzy, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
 msgstr "无法针对输出文件%2$s 的%1$<PRIuMAX> 字节处实施截断"
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr "%s 的fdatasync 失败"
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
 msgstr "%s 的fsync 失败"
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, c-format
 msgid "failed to open %s"
 msgstr "打开%s 失败"
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
 "blocks"
 msgstr "�移�过大：无法在seek=%<PRIuMAX> (%lu-字节) �的长度上实施截断"
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr "无法针对输出文件%2$s 的%1$<PRIuMAX> 字节处实施截断"
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, c-format
 msgid "failed to discard cache for: %s"
 msgstr "无法丢弃缓存：%s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr "Paul Eggert"
 
 # ## Proof reading to here.
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr "文件系统"
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr "类型"
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr "�"
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr "已用"
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr "�用"
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr "已用%"
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr "Inode"
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr "已用(I)"
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr "�用(I)"
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr "已用(I)%"
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr "挂载点"
 
-#: src/df.c:383
-#, c-format
-msgid "option --output: field '%s' unknown"
+#: src/df.c:207
+msgid "File"
 msgstr ""
 
-#: src/df.c:390
+#: src/df.c:387
+#, fuzzy, c-format
+msgid "option --output: field %s unknown"
+msgstr "正在关闭输出文件%s"
+
+#: src/df.c:394
 #, fuzzy, c-format
-msgid "option --output: field '%s' used more than once"
+msgid "option --output: field %s used more than once"
 msgstr "警告：指定��文件%s 多于一次"
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr "容�"
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr "�用"
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr "��"
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
 msgstr ""
 
-#: src/df.c:1210
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr ""
+
+#: src/df.c:1384
 #, fuzzy
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
@@ -3495,17 +3580,18 @@ msgstr ""
 "显示�个文件所在的文件系统的信�，默认是显示所有文件系统。\n"
 "\n"
 
-#: src/df.c:1217
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
 #, fuzzy
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
 "  -a, --all\t\t包�虚拟文件系统\n"
 "  -B, --block-size=大�\t使用指定字节数的�。例如-BM 以 1,248,576\n"
@@ -3513,7 +3599,7 @@ msgstr ""
 "  -h, --human-readable\t以�读性较好的格�显示尺寸(例如：1K 234M 2G)\n"
 "  -H, --si\t\t计算时使用1000 为基底而�1024\n"
 
-#: src/df.c:1227
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -3526,7 +3612,7 @@ msgstr ""
 "  -l, --local\t\t�显示本机的文件系统\n"
 "      --no-sync\t\t�得使用�数���进行�步动作(默认)\n"
 
-#: src/df.c:1234
+#: src/df.c:1409
 #, fuzzy
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
@@ -3546,42 +3632,33 @@ msgstr ""
 "  -x, --exclude-type=类型\t�显示文件系统�是指定类型信�\n"
 "  -v\t\t\t(忽略)\n"
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
 
-#: src/df.c:1285
+#: src/df.c:1460
 #, fuzzy, c-format
 msgid "options %s and %s are mutually exclusive"
 msgstr "选项--compare (-C) 和--strip 是互斥的"
 
-#: src/df.c:1335
-#, fuzzy
-msgid "warning: "
-msgstr "警告："
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr ""
-
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr "�能�时选择和排除文件系统类型%s"
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr "警告："
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 msgid "cannot read table of mounted file systems"
 msgstr "%s 无法读�已挂载上的文件系统的目录"
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr "未处�文件系统"
@@ -3591,7 +3668,7 @@ msgstr "未处�文件系统"
 msgid "H. Peter Anvin"
 msgstr "H. Peter Anvin"
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr "用法：%s [选项]... [文件]\n"
@@ -3676,7 +3753,7 @@ msgstr ""
 
 #: src/dirname.c:59
 #, fuzzy
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
 msgstr "  -0, --null     以空字符而�新行符结��一输出行\n"
 
 #: src/dirname.c:64
@@ -3693,7 +3770,7 @@ msgstr ""
 "  %s /usr/bin/\t输出\"/usr\"。\n"
 "  %s stdio.h\t\t输出\".\"。\n"
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -3702,18 +3779,17 @@ msgstr ""
 "用法：%s [选项]... [文件]...\n"
 "　或：%s [选项]... --files0-from=F\n"
 
-#: src/du.c:274
+#: src/du.c:285
 #, fuzzy
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr ""
 "计算�个文件的�盘用�，目录则�总用�。\n"
 "\n"
 
-#: src/du.c:280
+#: src/du.c:291
 #, fuzzy
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3726,12 +3802,12 @@ msgstr ""
 "\t\t\t�一些，但有时它会因为稀�文件间的\"洞\"�内部碎\n"
 "\t\t\t片��直接引用的�等原因而�大。\n"
 
-#: src/du.c:289
+#: src/du.c:300
 #, fuzzy
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3748,15 +3824,16 @@ msgstr ""
 "  -c, --total\t\t显示总计信�\n"
 "  -D, --dereference-args\t解除命令行中列出的符�连接\n"
 
-#: src/du.c:302
+#: src/du.c:313
 #, fuzzy
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
 "      --files0-from=F\t计算文件F 中以NUL 结尾的文件�对应�用的�盘空间\n"
 "\t\t\t如果F 的值是\"-\"，则从标准输入读入文件�\n"
@@ -3764,7 +3841,7 @@ msgstr ""
 "  -h, --human-readable\t以�读性较好的方�显示尺寸(例如：1K 234M 2G)\n"
 "      --si\t\t类似-h，但在计算时使用1000 为基底而�1024\n"
 
-#: src/du.c:310
+#: src/du.c:322
 #, fuzzy
 msgid ""
 "  -k                    like --block-size=1K\n"
@@ -3776,12 +3853,13 @@ msgstr ""
 "  -l, --count-links\t如果是硬连接，就多次计算其尺寸\n"
 "  -m\t\t\t等于--block-size=1M\n"
 
-#: src/du.c:316
+#: src/du.c:328
 #, fuzzy
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
@@ -3791,7 +3869,7 @@ msgstr ""
 "  -S, --separate-dirs\t�包括�目录的�用�\n"
 "  -s, --summarize\t�分别计算命令列中�个�数所�的总用�\n"
 
-#: src/du.c:322
+#: src/du.c:334
 #, fuzzy
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
@@ -3801,9 +3879,9 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
 msgstr ""
 "      --time\t\t显示目录或该目录�目录下所有文件的最�修改时间\n"
 "      --time=WORD\t显示WORD 时间，而�修改时间：\n"
@@ -3811,73 +3889,73 @@ msgstr ""
 "      --time-style=样�\t按照指定样�显示时间(样�解释规则�\"date\"命令)：\n"
 "\t\t\tfull-iso，long-iso，iso，+FORMAT\n"
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
 "  -x, --one-file-system    skip directories on different file systems\n"
 msgstr ""
 
-#: src/du.c:386
+#: src/du.c:398
 #, fuzzy
 msgid "Infinity"
 msgstr "无穷� B"
 
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr ""
-
-#: src/du.c:624
+#: src/du.c:636
 #, c-format
 msgid "fts_read failed: %s"
 msgstr "fts_read 失败：%s"
 
-#: src/du.c:780
+#: src/du.c:787
 #, c-format
 msgid "invalid maximum depth %s"
 msgstr "目录最大深度%s 无效"
 
-#: src/du.c:809
+#: src/du.c:816
 #, fuzzy, c-format
 msgid "invalid --threshold argument '-0'"
 msgstr "无效的 --%s �数%s"
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr "�能既显示总用�，�时�显示�个项目"
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr "警告：显示总用�等价于使用--max-depth=0"
 
-#: src/du.c:900
+#: src/du.c:911
 #, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr "警告：显示总用�的选项和--max-depth=%lu 互斥"
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 msgid "file operands cannot be combined with --files0-from"
 msgstr "文件�作数�能于--files0-from �数一起使用"
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr "%s：读�出错"
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr "当从标准输入读�时，��许指定文件�%s"
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 msgid "invalid zero-length file name"
 msgstr "无效的零长度文件�"
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr "总用�"
 
@@ -3986,7 +4064,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
 "设置一个环境��的\"�称=键值\"并�行命令。\n"
@@ -4067,16 +4145,16 @@ msgid "input line is too long"
 msgstr "输入行太长"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr "Mike Parker"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr "James Youngman"
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
@@ -4085,7 +4163,7 @@ msgstr ""
 "用法：%s 表达�\n"
 "　或：%s 选项\n"
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -4103,7 +4181,7 @@ msgstr ""
 "\n"
 "  ARG1 & ARG2       若两边的值都�为0 或为空，则返回ARG1，�则返回 0\n"
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -4121,7 +4199,7 @@ msgstr ""
 "  ARG1 >= ARG2      ARG1 大于或等于ARG2\n"
 "  ARG1 > ARG2       ARG1 大于ARG2\n"
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
@@ -4131,7 +4209,7 @@ msgstr ""
 "  ARG1 + ARG2       计算 ARG1 与ARG2 相加之和\n"
 "  ARG1 - ARG2       计算 ARG1 与ARG2 相�之差\n"
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -4144,7 +4222,7 @@ msgstr ""
 "  ARG1 / ARG2       计算 ARG1 与ARG2 相除之商\n"
 "  ARG1 % ARG2       计算 ARG1 与ARG2 相除之余数\n"
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -4162,7 +4240,7 @@ msgstr ""
 "  index 字符串 字符\t\t在字符串中�现字符的地方建立下标，或者标0\n"
 "  length 字符串\t\t\t字符串的长度\n"
 
-#: src/expr.c:251
+#: src/expr.c:250
 #, fuzzy
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
@@ -4175,7 +4253,7 @@ msgstr ""
 "\n"
 "  ( 表达� )\t\t\t表达�的值\n"
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -4192,7 +4270,7 @@ msgstr ""
 "\"和\"\\\"，\n"
 "则会返回匹�字符数�或是 0。\n"
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -4203,32 +4281,32 @@ msgstr ""
 "若表达�的值既�是空也�是 0，退出状�值为 0；若表达�的值为空或为 0，\n"
 "退出状�值为 1。如果表达�的�法无效，则会在出错时返回退出状�值 3。\n"
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, c-format
 msgid "syntax error"
 msgstr "语法错误"
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, c-format
 msgid "error in regular expression matcher"
 msgstr "正则表达�匹�器出错"
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, c-format
 msgid "non-integer argument"
 msgstr "�整数�数"
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr "除以零"
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr "请设置LC_ALL='C' 以��出现问题。"
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, c-format
 msgid "the strings compared were %s and %s"
 msgstr "已比较的字符串为%s 和%s"
@@ -4238,27 +4316,27 @@ msgstr "已比较的字符串为%s 和%s"
 msgid "Niels Moller"
 msgstr ""
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
 msgstr ""
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
 msgstr ""
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, c-format
 msgid "%s is not a valid positive integer"
 msgstr "%s �是有效的正整数"
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr "%s 太大"
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
@@ -4267,7 +4345,7 @@ msgstr ""
 "用法：%s [数字]...\n"
 "　或：%s 选项\n"
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
 "are specified on the command line, read them from standard input.\n"
@@ -4372,17 +4450,17 @@ msgid "invalid number of columns: %s"
 msgstr "无效的列数：%s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr "Padraig Brady"
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, c-format
 msgid "Usage: %s\n"
 msgstr "用法：%s\n"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
@@ -4390,12 +4468,12 @@ msgstr ""
 "为Shell 脚本格�输出基于�作平�的�制�数。\n"
 "\n"
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, c-format
 msgid "failed to get groups for user %s"
 msgstr "获�用户%s 的属组失败"
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, c-format
 msgid "failed to get groups for the current process"
 msgstr "获�当�进程用户组失败"
@@ -4420,22 +4498,22 @@ msgstr ""
 "户组数�库�生�更时�能导致差异)。\n"
 "\n"
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, fuzzy, c-format
 msgid "cannot get real UID"
 msgstr "无法设置用户ID"
 
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, fuzzy, c-format
 msgid "cannot get effective GID"
 msgstr "无法�消%s 的引用"
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, fuzzy, c-format
 msgid "cannot get real GID"
 msgstr "无法设置用户ID"
 
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, fuzzy, c-format
 msgid "%s: no such user"
 msgstr "%s：无此用户"
@@ -4489,58 +4567,48 @@ msgstr ""
 "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
 "GB 1000*1000*1000, G 1024*1024*1024, 对于T, P, E, Z, Y �样适用。\n"
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr "%s：文件被过度收缩"
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, c-format
 msgid "%s: number of bytes is too large"
 msgstr "%s：字节数过大"
 
-#: src/head.c:440
-#, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr "%s：lseek 无法回溯到�始�置"
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr "%s：无法检索到�移�%s"
 
-#: src/head.c:673
-#, fuzzy, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "%s：删除失败"
-
-#: src/head.c:798
+#: src/head.c:423 src/tail.c:457
 #, c-format
-msgid "cannot reposition file pointer for %s"
-msgstr "无法��%s 的文件指针"
+msgid "%s: cannot seek to relative offset %s"
+msgstr "%s：无法检索相对�移� %s"
 
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr "%s：%s 过大以至于无法表示"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr "�数数目错误"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr "字节数"
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr "无效的��%s"
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr "无效的��%s"
 
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, c-format
 msgid "invalid trailing option -- %c"
 msgstr "无效的加附选项 -- %c"
@@ -4585,27 +4653,34 @@ msgid "cannot determine hostname"
 msgstr "无法确定主机�"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr "Arnold Robbins"
 
-#: src/id.c:81
-#, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
-msgstr "用法：%s [选项]... [用户�]\n"
+#: src/id.c:84
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]... [USER]\n"
+msgstr "用法: %s [选项]... [用户]...\n"
 
-#: src/id.c:82
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
+msgstr ""
+
+#: src/id.c:90
+#, fuzzy
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
 msgstr ""
 "显示指定用户或当�用户(当未指定用户时)的用户与组信�。\n"
 "\n"
@@ -4617,7 +4692,7 @@ msgstr ""
 "  -r, --real\t\t显示真实ID 而�有效ID，与-ugG 一起使用\n"
 "  -u, --user\t\t仅显示有效用户ID\n"
 
-#: src/id.c:96
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
@@ -4625,116 +4700,126 @@ msgstr ""
 "\n"
 "如果�附带任何选项，程�会显示一些�供识别用户身份的有用信�。\n"
 
-#: src/id.c:140
+#: src/id.c:151
+#, fuzzy, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr "--context (-Z) 选项�能在开�SELinux 支�的内核上使用"
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr "--context (-Z) 选项�能在开�SELinux 支�的内核上使用"
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr "�能显示特定用户的安全环境"
 
-#: src/id.c:178
+#: src/id.c:198
 #, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr "有多�选择，无法输出唯一的"
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr "以默认格�无法�显示�称或�显示真实ID。"
 
-#: src/id.c:199
+#: src/id.c:209
+#, fuzzy, c-format
+msgid "option --zero not permitted in default format"
+msgstr "以默认格�无法�显示�称或�显示真实ID。"
+
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
 msgstr "�能得到进程环境"
 
-#: src/id.c:224
+#: src/id.c:265
 #, fuzzy, c-format
 msgid "cannot get effective UID"
 msgstr "无法�消%s 的引用"
 
-#: src/id.c:311
+#: src/id.c:354
 #, fuzzy, c-format
 msgid "cannot find name for user ID %s"
 msgstr "无法找到ID 为%lu 的用户的�称"
 
-#: src/id.c:329
+#: src/id.c:372
 #, fuzzy, c-format
 msgid "uid=%s"
 msgstr "uid=%lu"
 
-#: src/id.c:334
+#: src/id.c:377
 #, fuzzy, c-format
 msgid " gid=%s"
 msgstr " gid=%lu"
 
-#: src/id.c:341
+#: src/id.c:384
 #, fuzzy, c-format
 msgid " euid=%s"
 msgstr " euid=%lu"
 
-#: src/id.c:349
+#: src/id.c:392
 #, fuzzy, c-format
 msgid " egid=%s"
 msgstr " egid=%lu"
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr " 组="
 
-#: src/id.c:393
+#: src/id.c:437
 #, c-format
 msgid " context=%s"
 msgstr " 环境=%s"
 
-#: src/install.c:373
+#: src/install.c:376
 #, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr "警告：%s：切�到%s 用户环境失败"
 
-#: src/install.c:414
+#: src/install.c:417
 #, c-format
 msgid "creating directory %s"
 msgstr "正在创建目录%s"
 
-#: src/install.c:482
+#: src/install.c:485
 #, c-format
 msgid "cannot change ownership of %s"
 msgstr "无法更改%s 的所有�"
 
-#: src/install.c:506
+#: src/install.c:509
 #, c-format
 msgid "cannot set time stamps for %s"
 msgstr "无法设置%s 的时间戳"
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, c-format
 msgid "fork system call failed"
 msgstr "创建系统进程(fork)出错"
 
-#: src/install.c:531
+#: src/install.c:535
 #, c-format
 msgid "cannot run %s"
 msgstr "无法�行%s"
 
-#: src/install.c:535
+#: src/install.c:539
 #, c-format
 msgid "waiting for strip"
 msgstr "等待拆解"
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr "拆解过程�正常中止"
 
-#: src/install.c:558
+#: src/install.c:565
 #, c-format
 msgid "invalid user %s"
 msgstr "无效的用户%s"
 
-#: src/install.c:594
+#: src/install.c:601
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -4747,7 +4832,7 @@ msgstr ""
 "　或：%s [选项]... -t 目录 �文件...\n"
 "　或：%s [选项]... -d 目录...\n"
 
-#: src/install.c:601
+#: src/install.c:608
 #, fuzzy
 msgid ""
 "\n"
@@ -4771,7 +4856,7 @@ msgstr ""
 "件。\n"
 "\n"
 
-#: src/install.c:615
+#: src/install.c:622
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
 "  -b                  like --backup but does not accept an argument\n"
@@ -4788,7 +4873,7 @@ msgstr ""
 "  -C, --compare\t\t比较�组�文件和目标文件，在一些情况下�修改目标文件\n"
 "  -d, --directory\t将所有�数视为目录�称；为指定的目录创建所有组件\n"
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -4804,7 +4889,7 @@ msgstr ""
 "  -m, --mode=模�\t自行设置��模�(�chmod)，而�是rwxr-xr-x\n"
 "  -o, --owner=所有者\t自行设置所有者(�适用于超级用户)\n"
 
-#: src/install.c:631
+#: src/install.c:638
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
 "files\n"
@@ -4825,62 +4910,57 @@ msgstr ""
 "  -T, --no-target-directory\t将目标文件视为普通文件\n"
 "  -v, --verbose\t\t\t创建目录时显示其�称\n"
 
-#: src/install.c:641
+#: src/install.c:648
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
-"      --preserve-context\t��SELinux 的安全环境\n"
-"  -Z, --context=CONTEXT\t\t设置文件和目录的SELinux 安全环境\n"
 
-#: src/install.c:859
+#: src/install.c:696 src/unlink.c:86
+#, c-format
+msgid "cannot unlink %s"
+msgstr "无法清除%s 的链接"
+
+#: src/install.c:877
 #, c-format
 msgid ""
 "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
 msgstr "警告：忽略--preserve-context �数，当��行的内核没有�用SELinux 支�"
 
-#: src/install.c:869
-#, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
-msgstr "警告：忽略--context (-Z) �数，当��行的内核没有�用SELinux 支�"
-
-#: src/install.c:886
+#: src/install.c:917
 #, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr "安装目录时�能用strip 选项"
 
-#: src/install.c:889
+#: src/install.c:920
 #, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr "安装目录时�能用目标目录选项"
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr "无法对%s 强制为目标环境，��原样"
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, c-format
 msgid "invalid mode %s"
 msgstr "无效模�%s"
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr "警告：忽略--strip-program 选项，因为-s 选项没有指明"
 
-#: src/install.c:959
+#: src/install.c:1001
 #, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr "选项--compare (-C) 和--preserve-timestamps 是互斥的"
 
-#: src/install.c:966
+#: src/install.c:1008
 #, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr "选项--compare (-C) 和--strip 是互斥的"
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -4892,7 +4972,7 @@ msgstr "当您使用��许的比特数指定模�是--compare (-C) 选项被
 msgid "Mike Haertel"
 msgstr "Mike Haertel"
 
-#: src/join.c:191
+#: src/join.c:195
 #, fuzzy
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
@@ -4911,7 +4991,7 @@ msgstr ""
 "                      \t此选项用于根�指定文件编�输出��对的行目。\n"
 "  -e 字符    \t\t将缺失的输入区�替�为指定字符\n"
 
-#: src/join.c:200
+#: src/join.c:204
 #, fuzzy
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
@@ -4924,7 +5004,7 @@ msgstr ""
 "  -o 格� \t\t按照指定格�构造输出行\n"
 "  -t 字符 \t\t使用指定字符作为输入和输出的分隔符\n"
 
-#: src/join.c:206
+#: src/join.c:210
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
 "  -1 FIELD          join on this FIELD of file 1\n"
@@ -4942,7 +5022,12 @@ msgstr ""
 "  --nocheck-order   \t�检查输入是�正确排�\n"
 "  --header          \t将首行视作域的头部，直接输出而�对其进行匹�\n"
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+#, fuzzy
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr "  -z, --zero-terminated\t以0 字节而�新行作为行尾标志\n"
+
+#: src/join.c:225
 #, fuzzy
 msgid ""
 "\n"
@@ -4973,47 +5058,47 @@ msgstr ""
 "注�，所进行的比较�从\"LC_COLLATE\"所指定的的规则。\n"
 "如果输入没有被排�并导致�些行无法�并，将会显示警告信�。\n"
 
-#: src/join.c:403
+#: src/join.c:410
 #, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
 msgstr ""
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, c-format
 msgid "invalid field number: %s"
 msgstr "无效的区�编�%s"
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, c-format
 msgid "invalid field specifier: %s"
 msgstr "无效的区�定义符：%s"
 
-#: src/join.c:877
+#: src/join.c:884
 #, c-format
 msgid "invalid file number in field spec: %s"
 msgstr "在区�定义中出现无效的文件编�：%s"
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr "�兼容的连接区�%lu，%lu"
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr "有冲�的空区�替�字符串"
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, c-format
 msgid "multi-character tab %s"
 msgstr "多字符标签%s"
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr "�兼容的标签"
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr "�能从标准输入�时读�两个文件"
@@ -5135,47 +5220,47 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr "无法创建指�%2$s 的链接%1$s"
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr "%s: ��许将硬链接指�目录"
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, c-format
 msgid "%s: cannot overwrite directory"
 msgstr "%s：无法覆盖目录"
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
 msgstr "%s：是�替�%s？ "
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, c-format
 msgid "failed to create symbolic link %s"
 msgstr "无法创建符�链接%s"
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr "无法创建符�链接%s -> %s"
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr "无法创建硬链接%.0s%s"
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, c-format
 msgid "failed to create hard link %s"
 msgstr "无法创建硬链接%s"
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, c-format
 msgid "failed to create hard link %s => %s"
 msgstr "无法创建硬链接%s => %s"
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -5188,7 +5273,7 @@ msgstr ""
 "　或：%s [选项]... 目标... 目录\t(第三�格�)\n"
 "　或：%s [选项]... -t 目录 目标...\t(第四�格�)\n"
 
-#: src/ln.c:381
+#: src/ln.c:398
 #, fuzzy
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
@@ -5208,7 +5293,7 @@ msgstr ""
 "当链接解�正常时，将其解�为一个与其父目录关�的链接。\n"
 "\n"
 
-#: src/ln.c:394
+#: src/ln.c:411
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
 "file\n"
@@ -5225,7 +5310,7 @@ msgstr ""
 "  -d, -F, --directory\t\t创建指�目录的硬链接(�适用于超级用户)\n"
 "  -f, --force\t\t\t强行删除任何已存在的目标文件\n"
 
-#: src/ln.c:402
+#: src/ln.c:419
 #, fuzzy
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
@@ -5244,7 +5329,7 @@ msgstr ""
 "\t\t\t\t接备份或删除\n"
 "  -s, --symbolic\t\t创建符�链接而�硬链接\n"
 
-#: src/ln.c:411
+#: src/ln.c:428
 #, fuzzy
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
@@ -5259,7 +5344,7 @@ msgstr ""
 "  -T, --no-target-directory\t将链接�称当作普通文件\n"
 "  -v, --verbose\t\t链接�先列出�个文件的�称\n"
 
-#: src/ln.c:433
+#: src/ln.c:450
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -5270,12 +5355,12 @@ msgstr ""
 "�则当�为一个符�链接(默认%s)时，会由最�指定的一个选项�控制行为。\n"
 "\n"
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr "无法�时使用 --target-directory 和 --no-target-directory"
 
-#: src/ln.c:588
+#: src/ln.c:605
 #, fuzzy, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr "无法创建符�链接%s"
@@ -5308,7 +5393,7 @@ msgstr "无登录�"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 msgid "%b %e  %Y"
 msgstr "%b %e %Y"
 
@@ -5317,95 +5402,95 @@ msgstr "%b %e %Y"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 msgid "%b %e %H:%M"
 msgstr "%b %e %H:%M"
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr "忽略无效的环境��QUOTING_STYLE 的键值：%s"
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr "忽略无效的环境�� COLUMNS 所示的宽度值：%s"
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr "忽略无效的环境�� TABSIZE 所示的制表符尺寸值：%s"
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, c-format
 msgid "invalid line width: %s"
 msgstr "无效的行宽：%s"
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, c-format
 msgid "invalid tab size: %s"
 msgstr "无效的制表符尺寸：%s"
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, c-format
 msgid "invalid time style format %s"
 msgstr "无效的日期时间格�%s"
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 #, fuzzy
 msgid "Valid arguments are:\n"
 msgstr "有效的�数为："
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr ""
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr "�始化月份字符串出错"
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, c-format
 msgid "unrecognized prefix: %s"
 msgstr "无法识别的�缀：%s"
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr "LS_COLORS 环境��中存在无法解些的值"
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, c-format
 msgid "cannot open directory %s"
 msgstr "无法打开目录%s"
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, c-format
 msgid "cannot determine device and inode of %s"
 msgstr "无法决定%s 所在的设备�inode"
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, c-format
 msgid "%s: not listing already-listed directory"
 msgstr "%s：�会�列出已�列出的目录"
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, c-format
 msgid "reading directory %s"
 msgstr "正在读�目录%s"
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, c-format
 msgid "closing directory %s"
 msgstr "关闭目录%s"
 
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, c-format
 msgid "cannot compare file names %s and %s"
 msgstr "无法比较文件�%s 和 %s"
 
-#: src/ls.c:4721
+#: src/ls.c:4781
 #, fuzzy
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
@@ -5415,7 +5500,7 @@ msgstr ""
 "如果�指定-cftuvSUX 或--sort 选项，则根�字�大�排�。\n"
 "\n"
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
 "  -A, --almost-all           do not list implied . and ..\n"
@@ -5428,18 +5513,18 @@ msgstr ""
 "      --author\t\t\t与-l �时使用时列出�个文件的作者\n"
 "  -b, --escape\t\t\t以八进制溢出�列表示��打�的字符\n"
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 #, fuzzy
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
 "      --block-size=大�\t\t�以指定大�的字节为��。例如\n"
@@ -5449,16 +5534,15 @@ msgstr ""
 "\t\t\t\t状�最�更改的时间)\n"
 "\t\t\t\t��-l：显示ctime 但根��称排�\t\t\t\t其他情况：按ctime 排�\n"
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 #, fuzzy
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 "  -C\t\t\t\t��由上至下列出项目\n"
@@ -5467,7 +5551,7 @@ msgstr ""
 "  -d, --directory\t\t当�到目录时列出目录本身而�目录内的文件\n"
 "  -D, --dired\t\t\t产生适�Emacs 的dired 模�使用的结果\n"
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 #, fuzzy
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
@@ -5483,25 +5567,28 @@ msgstr ""
 "\t\t\t\t��-1，详细-l，垂直-C\n"
 "      --full-time\t\t�-l --time-style=full-iso\n"
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr "  -g\t\t\t\t类似-l，但�列出所有者\n"
 
-#: src/ls.c:4763
+#: src/ls.c:4823
+#, fuzzy
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 "      --group-directories-first\n"
 "\t\t\t在文件�分组目录。此选项�与--sort 一起使用，\n"
 "\t\t\t但是一旦使用--sort=none (-U)将�用分组\n"
 
-#: src/ls.c:4769
+#: src/ls.c:4829
+#, fuzzy
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
@@ -5510,14 +5597,15 @@ msgstr ""
 "\t\t\t\t(例如 1K 234M 2G)\n"
 "      --si\t\t\t�上�类似，但是使用1000 为基底而�1024\n"
 
-#: src/ls.c:4775
+#: src/ls.c:4835
+#, fuzzy
 msgid ""
 "  -H, --dereference-command-line\n"
 "                             follow symbolic links listed on the command "
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
@@ -5529,7 +5617,7 @@ msgstr ""
 "      --hide=PATTERN         \t��符�PATTERN 模�的项目\n"
 "\t\t\t\t(-a 或 -A 将覆盖此选项)\n"
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 #, fuzzy
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
@@ -5539,7 +5627,7 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 "      --indicator-style=方�\t指定在�个项目�称�加上指示符�方�：\n"
 "\t\t\t\tnone (默认)，classify (-F)，file-type (-p)\n"
@@ -5547,7 +5635,7 @@ msgstr ""
 "  -I, --ignore=PATTERN\t\t�显示任何符�指定shell PATTERN 的项目\n"
 "  -k\t\t\t\t�--block-size=1K\n"
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -5561,7 +5649,7 @@ msgstr ""
 "\t\t\t\t的对象而并�符�链接本身的信�\n"
 "  -m\t\t\t\t所有项目以逗�分隔，并填满整行行宽\n"
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
 "  -N, --literal              print raw entry names (don't treat e.g. "
@@ -5576,12 +5664,12 @@ msgstr ""
 "  -o\t\t\t\t类似 -l，但�列出有关组的信�\n"
 "  -p,  --indicator-style=slash\t对目录加上表示符�\"/\"\n"
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 #, fuzzy
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -5595,7 +5683,7 @@ msgstr ""
 "      --quoting-style=方�\t使用指定的quoting 方�显示�目的�称：\n"
 "\t\t\t\tliteral�locale�shell�shell-always�c�escape\n"
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
 "  -R, --recursive            list subdirectories recursively\n"
@@ -5606,16 +5694,19 @@ msgstr ""
 "  -R, --recursive\t\t递归显示�目录\n"
 "  -s, --size\t\t\t以�数形�显示�个文件分�的尺寸\n"
 
-#: src/ls.c:4825
+#: src/ls.c:4886
+#, fuzzy
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 "  -S\t\t\t\t根�文件大�排�\n"
 "      --sort=WORD\t\t以下是�选用的WORD 和它们代表的相应选项：\n"
@@ -5628,17 +5719,19 @@ msgstr ""
 "\t\t\t\t间：atime�access�use�ctime 或status；加上\n"
 "\t\t\t\t--sort=time 选项时会以指定时间作为排�关键字\n"
 
-#: src/ls.c:4835
+#: src/ls.c:4896
 #, fuzzy
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
 msgstr ""
 "      --time-style=STYLE\t和-l �时使用时根�STYLE 代表的格�显示时间：\n"
 "\t\t\t\tfull-iso�iso�locale�posix-iso�+FORMAT。\n"
@@ -5650,7 +5743,7 @@ msgstr ""
 "  -t\t\t\t\t根�修改时间排�\n"
 "  -T, --tabsize=宽度\t指定制表符(Tab)的宽度，而�8 个字符\n"
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 #, fuzzy
 msgid ""
 "  -t                         sort by modification time, newest first\n"
@@ -5659,10 +5752,11 @@ msgstr ""
 "  -t\t\t\t按修改时间排�\n"
 "  -T, --tabsize=COLS\t指定制表符(Tab)的宽度，而�8个字符\n"
 
-#: src/ls.c:4848
+#: src/ls.c:4912
+#, fuzzy
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
@@ -5673,13 +5767,13 @@ msgstr ""
 "  -U\t\t\t�进行排�；按照目录顺�列出项目\n"
 "  -v\t\t\t在文本中进行数字(版本)的自然排�\n"
 
-#: src/ls.c:4855
+#: src/ls.c:4919
+#, fuzzy
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 "  -w, --width=COLS\t自行指定�幕宽度而�使用目�的数值\n"
@@ -5687,7 +5781,7 @@ msgstr ""
 "  -X\t\t\t根�扩展�排�\n"
 "  -1\t\t\t�行�列出一个文件\n"
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -5702,7 +5796,7 @@ msgstr ""
 "LS_COLORS 环境���改�此设置，�使用 dircolors 命令�设置。\n"
 "\n"
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -5773,11 +5867,14 @@ msgid "  -t, --text           read in text mode (default)\n"
 msgstr "  -t, --text\t\t以纯文本模�读�(默认)\n"
 
 #: src/md5sum.c:195
+#, fuzzy
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
@@ -5788,12 +5885,7 @@ msgstr ""
 "  -w, --warn\t\t对格��准确的校验和行进行警告\n"
 "\n"
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -5807,107 +5899,106 @@ msgstr ""
 "样�格�相�。默认的输出模�时输出一行校验和的校验结果，并有一个字符�\n"
 "表示文件类型(\"*\"代表二进制，\" \"代表纯文本)，并�时显示�个文件的�称。\n"
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, c-format
 msgid "%s: too many checksum lines"
 msgstr "%s：校验和的行数过多"
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr "%s：%<PRIuMAX>：%s 的校验和行目格��适当"
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr "%s：打开或读�失败\n"
 
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr "失败"
 
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr "确定"
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr "%s：找�到格�适用的%s 校验和"
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
 msgstr[0] "警告：%<PRIuMAX> 行的格��适当"
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
 msgstr[0] "警告：%<PRIuMAX> 个列出的文件无法读�"
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
 msgstr[0] "警告：%<PRIuMAX> 个校验和�匹�"
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
 msgstr ""
 
-#: src/md5sum.c:766
+#: src/md5sum.c:770
 #, fuzzy, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr "�有在校验时--status 选项�有�义"
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
 msgstr "在校验时--binary 和--text 选项是无�义的"
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr "�有在校验时--status 选项�有�义"
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr "�有在校验时--warn 选项�有�义"
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr "�有在校验时--quiet 选项�有�义"
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, fuzzy, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr "�有在校验时--status 选项�有�义"
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr "用法：%s [选项]... 目录...\n"
 
-#: src/mkdir.c:57
+#: src/mkdir.c:59
 #, fuzzy
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
 msgstr ""
 "若指定目录�存在则创建目录。\n"
 "\n"
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
+#, fuzzy
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 "  -m, --mode=模�   \t设置��模�(类似chmod)，而�是rwxrwxrwx �umask\n"
 "  -p, --parents     \t需�时创建目标目录的上层目录，但�使这些目录已存在也�"
@@ -5915,61 +6006,89 @@ msgstr ""
 "  -v, --verbose     \t�次创建新目录都显示信�\n"
 "  -Z, --context=CTX  \t将�个创建的目录的SELinux 安全环境设置为CTX\n"
 
-#: src/mkdir.c:168
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/mkdir.c:127 src/mkdir.c:172
+#, fuzzy, c-format
+msgid "failed to set default creation context for %s"
+msgstr "无法�得%s 的创建环境"
+
+#: src/mkdir.c:191
+#, fuzzy, c-format
+msgid "failed to restore context for %s"
+msgstr "无法�留%s 的时间"
+
+#: src/mkdir.c:231
 #, c-format
 msgid "created directory %s"
 msgstr "已创建目录 %s"
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, fuzzy, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr "警告：忽略--context (-Z) �数，当��行的内核没有�用SELinux 支�"
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr "用法：%s [选项]... �称...\n"
 
-#: src/mkfifo.c:52
+#: src/mkfifo.c:54
 #, fuzzy
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
 msgstr ""
 "以指定的�称创建先进先出文件(FIFO)。\n"
 "\n"
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
 msgstr ""
 "  -m, --mode=模�   \t设置��模�(类似chmod)，而�是rwxrwxrwx �umask\n"
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
-msgstr "  -Z, --context=CTX  \t将�个创建的目录的SELinux 安全环境设置为CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, c-format
 msgid "invalid mode"
 msgstr "无效的��模�"
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr "模�必须�指定文件许��"
 
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
+#, fuzzy, c-format
+msgid "cannot set permissions of %s"
+msgstr "无法更改%s 的��"
+
+#: src/mknod.c:54
 #, c-format
 msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr "用法：%s [选项]... �称 类型 [主设备� 次设备�]\n"
 
-#: src/mknod.c:54
+#: src/mknod.c:56
 #, fuzzy
 msgid "Create the special file NAME of the given TYPE.\n"
 msgstr ""
 "创建指定类型和�称的特殊文件。\n"
 "\n"
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr "  -Z, --context=CTX \t将对应�称文件的SELinux 安全环境设置为CTX\n"
-
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -5983,7 +6102,7 @@ msgstr ""
 "解�；如果以\"0\"开头，则被视作八进制数；其余情况下被视作�进制数。\n"
 "�用的类型包括：\n"
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 msgid ""
 "\n"
 "  b      create a block (buffered) special file\n"
@@ -5995,55 +6114,55 @@ msgstr ""
 "  c, u   创建(没有缓冲的)字符特殊文件\n"
 "  p      创建先进先出(FIFO)特殊文件\n"
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 msgid "Special files require major and minor device numbers."
 msgstr "创建�设备文件时，必需指定主�次设备�。"
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 msgid "Fifos do not have major and minor device numbers."
 msgstr "先进先出(FIFO)文件�需�指定主�次设备�。"
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, c-format
 msgid "block special files not supported"
 msgstr "�支�区�特殊文件"
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, c-format
 msgid "character special files not supported"
 msgstr "�支�字符特殊文件"
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, c-format
 msgid "invalid major device number %s"
 msgstr "无效的主设备� %s"
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, c-format
 msgid "invalid minor device number %s"
 msgstr "无效的次设备� %s"
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, c-format
 msgid "invalid device %s %s"
 msgstr "无效的设备文件%s %s"
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, c-format
 msgid "invalid device type %s"
 msgstr "无效的设备类型 %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr "Eric Blake"
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr "用法：%s [选项]... [TEMPLATE]\n"
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 #, fuzzy
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
@@ -6054,12 +6173,12 @@ msgstr ""
 "TEMPLATE 最�部分必须�有至少 3 个连续的 X。\n"
 "如果 TEMPLATE 没有指定，将会使用 tmp.XXXXXXXXXX。\n"
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
@@ -6069,22 +6188,24 @@ msgstr ""
 "  -u, --dry-run       �创建任何东西，仅打�出�字。(仅供测试)\n"
 "  -q, --quiet         �显示任何有关文件或目录创建错误信�\n"
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
+#, fuzzy
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
 "      --suffix=SUFF   将 SUFF 添加至 TEMPLATE。SUFF �能带斜�。\n"
 "                        若 TEMPLATE �以 X 结尾，则此选项��实现。\n"
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
+#, fuzzy
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
 "  --tmpdir[=DIR]        将TEMPLATE 和DIR 目录关�。如果DIR 没有被指定，则\n"
@@ -6093,9 +6214,9 @@ msgstr ""
 "                        与-t ��，TEMPLATE �许带斜线。\n"
 "                        但此�情况下mktemp 仅以斜线�部分生�目录。\n"
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
+#, fuzzy
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
@@ -6105,59 +6226,54 @@ msgstr ""
 "\t\t\t(如果设置了该�数的�)；此目录也�以通过-p 指定；还�\n"
 "\t\t\t以通过/tmp指定[�推�]\n"
 
-#: src/mktemp.c:223
-#, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr "�定�标准错误到/dev/null 失败"
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, c-format
 msgid "too many templates"
 msgstr "模�过多"
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr "使用 --suffix，模� %s 必须以 X 结尾"
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr "无效�缀 %s，�有目录分隔符"
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr "模�%s 中X 太少"
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr "无效模�，%s，包�目录分隔符"
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr "无效模�，%s；如果与--tmpdir �时使用则��以是�对路径"
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, c-format
 msgid "failed to create directory via template %s"
 msgstr "无法通过模�%s 创建目录"
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, c-format
 msgid "failed to create file via template %s"
 msgstr "无法通过模�%s 创建文件"
 
-#: src/mv.c:292
+#: src/mv.c:294
 #, fuzzy
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 "将�文件�命�为目标文件，或将�文件移动至指定目录。\n"
 "\n"
 
-#: src/mv.c:298
+#: src/mv.c:300
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
 "file\n"
@@ -6176,7 +6292,7 @@ msgstr ""
 "  -n, --no-clobber             �覆盖已存在文件\n"
 "如果您指定了-i�-f�-n 中的多个，仅最�一个生效。\n"
 
-#: src/mv.c:307
+#: src/mv.c:309
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
 "SOURCE\n"
@@ -6186,7 +6302,8 @@ msgstr ""
 "      --strip-trailing-slashes\t去掉�个�文件�数尾部的斜线\n"
 "  -S, --suffix=SUFFIX\t\t替�常用的备份文件�缀\n"
 
-#: src/mv.c:312
+#: src/mv.c:314
+#, fuzzy
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
 "DIRECTORY\n"
@@ -6195,6 +6312,8 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
 "  -t, --target-directory=DIRECTORY\t将所有�数指定的�文件或目录\n"
 "\t\t\t\t\t移动至 指定目录\n"
@@ -6490,95 +6609,90 @@ msgid "%s: invalid number to ignore"
 msgstr "%s：无效的忽略数"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
 msgstr ""
 
-#: src/numfmt.c:676
+#: src/numfmt.c:659
 #, fuzzy, c-format
-msgid "value too large to be converted: '%s'"
+msgid "value too large to be converted: %s"
 msgstr "%s：给定值�能完全转�"
 
-#: src/numfmt.c:680
+#: src/numfmt.c:663
 #, fuzzy, c-format
-msgid "invalid number: '%s'"
+msgid "invalid number: %s"
 msgstr "无效的数字%s"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
+msgid "rejecting suffix in input: %s (consider using --from)"
 msgstr ""
 
-#: src/numfmt.c:688
+#: src/numfmt.c:671
 #, fuzzy, c-format
-msgid "invalid suffix in input: '%s'"
+msgid "invalid suffix in input: %s"
 msgstr "�法的�缀在%s%s �数\"%s\""
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
 msgstr ""
 
-#: src/numfmt.c:723
+#: src/numfmt.c:722 src/numfmt.c:768
 #, fuzzy, c-format
 msgid "failed to prepare value '%Lf' for printing"
 msgstr "%s：无法以写模�打开"
 
-#: src/numfmt.c:787
+#: src/numfmt.c:791
 #, fuzzy, c-format
-msgid "invalid unit size: '%s'"
+msgid "invalid unit size: %s"
 msgstr "无效的制表符尺寸：%s"
 
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
-#, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr ""
-
-#: src/numfmt.c:813
+#: src/numfmt.c:814
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
 msgstr "用法: %s [选项]... [用户]...\n"
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
 msgstr ""
 
-#: src/numfmt.c:820
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
 msgstr ""
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
 msgstr ""
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
 "                         see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr ""
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
@@ -6586,19 +6700,19 @@ msgid ""
 "locale)\n"
 msgstr ""
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
 msgstr ""
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
 msgstr ""
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -6608,30 +6722,30 @@ msgid ""
 "                         is found\n"
 msgstr ""
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
 "nearest\n"
 msgstr ""
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
 msgstr ""
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr ""
 
-#: src/numfmt.c:877
+#: src/numfmt.c:878
 #, fuzzy
 msgid ""
 "\n"
@@ -6640,11 +6754,11 @@ msgstr ""
 "其他选项：\n"
 "\n"
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr ""
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -6653,7 +6767,7 @@ msgid ""
 "               1Mi = 1048576,\n"
 msgstr ""
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
@@ -6661,7 +6775,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
@@ -6669,7 +6783,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
@@ -6677,18 +6791,18 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:905
+#: src/numfmt.c:906
 #, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -6700,7 +6814,7 @@ msgid ""
 "errors are not diagnosed and the exit status is 0.\n"
 msgstr ""
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -6721,112 +6835,112 @@ msgid ""
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 msgstr ""
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, c-format
 msgid "format %s has no %% directive"
 msgstr "格�%s 没有%% 指令"
 
-#: src/numfmt.c:990
+#: src/numfmt.c:1003
 #, fuzzy, c-format
 msgid "invalid format %s (width overflow)"
 msgstr "无效的格�宽度"
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr ""
+
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr "格�%s 以%% 结�"
 
-#: src/numfmt.c:1010
+#: src/numfmt.c:1030
 #, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
 msgstr ""
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr "格�%s 中%% 指令过多"
 
-#: src/numfmt.c:1070
+#: src/numfmt.c:1081
 #, fuzzy, c-format
-msgid "invalid suffix in input '%s': '%s'"
+msgid "invalid suffix in input %s: %s"
 msgstr "�法的�缀在%s%s �数\"%s\""
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
 msgstr ""
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
 msgstr ""
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
+msgid "large input value %s: possible precision loss"
 msgstr ""
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
 
-#: src/numfmt.c:1388
+#: src/numfmt.c:1403
 #, fuzzy, c-format
-msgid "invalid padding value '%s'"
+msgid "invalid padding value %s"
 msgstr "页�范围%s 无效"
 
-#: src/numfmt.c:1401
+#: src/numfmt.c:1417
 #, fuzzy, c-format
-msgid "invalid field value '%s'"
+msgid "invalid field value %s"
 msgstr "无效的区�编�%s"
 
-#: src/numfmt.c:1430
+#: src/numfmt.c:1447
 #, fuzzy, c-format
-msgid "invalid header value '%s'"
+msgid "invalid header value %s"
 msgstr "无效的日期%s"
 
-#: src/numfmt.c:1456
+#: src/numfmt.c:1473
 #, fuzzy, c-format
 msgid "--grouping cannot be combined with --format"
 msgstr "文件�作数�能于--files0-from �数一起使用"
 
-#: src/numfmt.c:1458
-#, fuzzy, c-format
-msgid "--padding cannot be combined with --format"
-msgstr "文件�作数�能于--files0-from �数一起使用"
-
-#: src/numfmt.c:1463
+#: src/numfmt.c:1478
 #, fuzzy, c-format
 msgid "no conversion option specified"
 msgstr "指定了多个-i 选项"
 
-#: src/numfmt.c:1471
+#: src/numfmt.c:1486
 #, fuzzy, c-format
 msgid "grouping cannot be combined with --to"
 msgstr "文件�作数�能于--files0-from �数一起使用"
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
 msgstr ""
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
 msgstr ""
 
-#: src/numfmt.c:1511
+#: src/numfmt.c:1526
 #, fuzzy, c-format
 msgid "error reading input"
 msgstr "读�%s 时出错"
 
-#: src/numfmt.c:1520
+#: src/numfmt.c:1535
 #, fuzzy, c-format
 msgid "failed to convert some of the input numbers"
 msgstr "标准输入��用，无法�定�"
 
-#: src/od.c:294
+#: src/od.c:320
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -6838,7 +6952,7 @@ msgstr ""
 "　或：%s [-abcdfilosx]... [文件] [[+]�移�[.][b]]\n"
 "　或：%s --traditional [选项]... [文件] [[+]�移�[.][b] [+][标签][.][b]]\n"
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -6853,7 +6967,7 @@ msgstr ""
 "如果没有指定文件，或指定文件为\"-\"，程�从标准输入读�数�。\n"
 "\n"
 
-#: src/od.c:307
+#: src/od.c:333
 #, fuzzy
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
@@ -6870,26 +6984,25 @@ msgstr ""
 "��累积过程递增。�移�和标签如果冠以\"0x\"或\"0X\"�缀则\n"
 "表示�六进制数；�缀\".\"代表八进制数，�缀\"b\"表示乘以 512。\n"
 
-#: src/od.c:318
-#, fuzzy
+#: src/od.c:344
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
-"  -A, --address-radix=�始�移\t设置�显示的文件的�始�移�\n"
-"  -j, --skip-bytes=字节数\t略过指定字节数的输入内容\n"
 
-#: src/od.c:323
+#: src/od.c:350
 #, fuzzy
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
@@ -6900,7 +7013,7 @@ msgstr ""
 "  -w, --width[=字节数]\t\t�一行�输出指定的字节数\n"
 "      --traditional\t\t接�传统形��交的�数\n"
 
-#: src/od.c:336
+#: src/od.c:363
 #, fuzzy
 msgid ""
 "\n"
@@ -6908,7 +7021,7 @@ msgid ""
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 "\n"
@@ -6918,7 +7031,7 @@ msgstr ""
 "  -c\t� -t c， 使用ASCII 字符，或者�斜�正�的特殊字符\n"
 "  -d\t� -t u2，使用无符��进制�字节字符\n"
 
-#: src/od.c:345
+#: src/od.c:372
 msgid ""
 "  -f   same as -t fF, select floats\n"
 "  -i   same as -t dI, select decimal ints\n"
@@ -6934,14 +7047,14 @@ msgstr ""
 "  -s\t� -t d2，指定�字节���进制数的对照输出格�\n"
 "  -x\t� -t x2，指定�字节���六进制数的对照输出格�\n"
 
-#: src/od.c:353
+#: src/od.c:380
 #, fuzzy
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 "\n"
 "TYPE 是由下�一�或几��数组�的：\n"
@@ -6949,7 +7062,7 @@ msgstr ""
 "  a\t\t�定义字符，忽略高�字节\n"
 "  c\t\tASCII �字符或者是�斜线字串(如\\n)\n"
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -6963,7 +7076,7 @@ msgstr ""
 "  u[尺寸]\t无符��进制数，�个整形数�指定尺寸的字节\n"
 "  x[尺寸]\t�六进制数，�个整形数�指定尺寸的字节\n"
 
-#: src/od.c:367
+#: src/od.c:394
 #, fuzzy
 msgid ""
 "\n"
@@ -6980,14 +7093,14 @@ msgstr ""
 "F 代表 sizeof(float)�D 代表sizeof(double)，或 L 代表\n"
 "sizeof(long double)。\n"
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
 "each output line.\n"
 msgstr ""
 
-#: src/od.c:379
+#: src/od.c:406
 #, fuzzy
 msgid ""
 "\n"
@@ -7005,12 +7118,12 @@ msgstr ""
 "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
 "GB 1000*1000*1000, G 1024*1024*1024, 对于T, P, E, Z, Y �样适用。\n"
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, c-format
 msgid "invalid type string %s"
 msgstr "无效类型的字符串%s"
 
-#: src/od.c:649
+#: src/od.c:690
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7019,7 +7132,7 @@ msgstr ""
 "无效的类型字符串%s；\n"
 "系统无法�供对%lu-字节整形类型数值的支�"
 
-#: src/od.c:770
+#: src/od.c:811
 #, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -7028,36 +7141,36 @@ msgstr ""
 "无效的类型字符串%s；\n"
 "系统无法�供对%lu-字节浮点类型数值的支�"
 
-#: src/od.c:828
+#: src/od.c:869
 #, fuzzy, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr "无效字符\"%c\"出现在类型字符串%s 中"
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr "无法略过输入内容的报尾"
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, fuzzy, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr "无效的输出地�基数\"%c\"，它必须是 [doxn] 四个字符中的一个"
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr "在转储字符串时�能指定类型"
 
-#: src/od.c:1810
+#: src/od.c:1863
 msgid "compatibility mode supports at most one file"
 msgstr "兼容模�最多支�一个文件"
 
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr "略过字节数+ 读入字节数的值过大"
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr "警告：无效的宽度值%lu，已使用%d 代替"
@@ -7219,12 +7332,12 @@ msgstr "从"
 msgid "Where"
 msgstr "�自"
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr "用法: %s [选项]... [用户]...\n"
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -7240,7 +7353,7 @@ msgstr ""
 "  -p\t在长格�中�略用户的计划文件\n"
 "  -s\t输出短格�信�(默认)\n"
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -7253,7 +7366,7 @@ msgstr ""
 "  -i\t在短格�中�略用户全�以�远程主机\n"
 "  -q\t在短格�中�略用户全��远程主机以�空闲时间\n"
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -7264,7 +7377,7 @@ msgstr ""
 "一个轻�级的\"finger\"程�，用于显示用户信�。\n"
 "用到的utmp 文件为%s。\n"
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr "没有指定用户�，当使用-l 选项时至少需�指定一个"
@@ -7466,11 +7579,13 @@ msgstr ""
 "\t\t\t当文件无法打开时忽略警告\n"
 
 #: src/pr.c:2820
+#, fuzzy
 msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
@@ -7479,7 +7594,7 @@ msgstr ""
 "\t\t\t�外除�-w 选项被指定，�则\"-s[CHAR]\"会�蔽三个列相关\n"
 "\t\t\t的截行选项(-COLUMN|-a -COLUMN|-m)\n"
 
-#: src/pr.c:2827
+#: src/pr.c:2828
 #, fuzzy
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
@@ -7495,7 +7610,7 @@ msgstr ""
 "\t\t\t分�选项无影�\n"
 "  -t, --omit-header\t忽略页眉和页脚\n"
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 msgid ""
 "  -T, --omit-pagination\n"
 "                    omit page headers and trailers, eliminate any "
@@ -7516,7 +7631,7 @@ msgstr ""
 "\t\t\t为多�页�输出将设置为指定的字符数(默认72)，\n"
 "\t\t\t仅当-s[char] 选项��用时有效(���默认值 72)。\n"
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
 "                    set page width to PAGE_WIDTH (72) characters always,\n"
@@ -7528,7 +7643,7 @@ msgstr ""
 "\t\t\t总是将页宽设置为指定的(默认72)字符数，\n"
 "\t\t\t除�-J 选项�用总是截断行，此�数与-S 或-s 冲�\n"
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 msgid ""
 "\n"
 "-t is implied if PAGE_LENGTH <= 10.  With no FILE, or when FILE is -, read\n"
@@ -7552,7 +7667,8 @@ msgstr ""
 "\n"
 
 #: src/printenv.c:69
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+#, fuzzy
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr "  -0, --null     以空字符而�新行符结��一输出行\n"
 
 #: src/printf.c:79
@@ -7667,12 +7783,12 @@ msgstr "警告：从%s 开始已忽略超�的�数"
 msgid "F. Pinard"
 msgstr "F. Pinard"
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, c-format
 msgid "%s (for regexp %s)"
 msgstr "%s (正则表达� %s)"
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
@@ -7681,7 +7797,7 @@ msgstr ""
 "用法：%s [选项]... [输入]... (�包括 -G 选项)\n"
 "　或：%s -G [选项]... [输入 [输出]]\n"
 
-#: src/ptx.c:1821
+#: src/ptx.c:1824
 #, fuzzy
 msgid ""
 "Output a permuted index, including context, of the words in the input "
@@ -7690,7 +7806,7 @@ msgstr ""
 "输出一串预排的文件索引信�，包括输入文件中���的环境。\n"
 "\n"
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 #, fuzzy
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
@@ -7701,7 +7817,7 @@ msgstr ""
 "  -G,--traditional\t\t行为类似System V 的\"ptx\"\n"
 "  -F,--flag-trunctaion=字符串\t使用指定字符串�标识行的截断\n"
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 #, fuzzy
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
@@ -7716,7 +7832,7 @@ msgstr ""
 "  -S, --sentence-regexp=正则表达�\t用于匹�行末或�末\n"
 "  -T, --format=tex\t\t生�TeX 格�输出\n"
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -7732,7 +7848,7 @@ msgstr ""
 "  -i, --ignore-file=文件\t从指定文件中读�忽略��的列表\n"
 "  -o, --only-file=文件\t\t�从指定文件中读���列表\n"
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -7743,17 +7859,16 @@ msgstr ""
 "  -t, --typeset-mode\t\t -- 此功能尚未实现 --\n"
 "  -w, --width=数值\t\t�列的输出宽度，�计关�引用\n"
 
-#: src/ptx.c:1854
+#: src/ptx.c:1857
 #, fuzzy
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
 "\n"
-"如果�指定文件，或者文件为 \"-\"，程�将从标准输入读�数�。默认时��\n"
-"\"-F /\"选项。\n"
+"如果没有指定文件，或者文件为\"-\"，则从标准输入读�。\n"
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, c-format
 msgid "invalid gap width: %s"
 msgstr "无效的间隙宽度：%s"
@@ -7774,22 +7889,28 @@ msgstr ""
 "  -L, --logical\t\t使用环境��中的PWD，�使其中包�符�链接\n"
 "  -P, --physical\t��所有符�链接\n"
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+
+#: src/pwd.c:169
 #, c-format
 msgid "failed to chdir to %s"
 msgstr "无法切�到目录%s"
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, c-format
 msgid "failed to stat %s"
 msgstr "获�%s 的文件状�失败(stat)"
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr "在匹�的inode %s 上找�到目录入�"
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, c-format
 msgid "ignoring non-option arguments"
 msgstr "忽略�是选项的�数"
@@ -7799,8 +7920,8 @@ msgstr "忽略�是选项的�数"
 msgid "Dmitry V. Levin"
 msgstr "Dmitry V. Levin"
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "用法：%s [选项]... 文件...\n"
@@ -7841,8 +7962,7 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 "  -m, --canonicalize-missing\t递归跟�给出文件�的所有符�链接以标准化，\n"
 "\t\t\t\t但�对组件存在性作出�求\n"
@@ -7873,7 +7993,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 
@@ -7891,41 +8011,42 @@ msgstr "%s：是�进入有写�护的目录%s ？"
 msgid "%s: descend into directory %s? "
 msgstr "%s：是�进入目录%s? "
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr "%s：是�删除有写�护的%s %s？"
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, c-format
 msgid "%s: remove %s %s? "
 msgstr "%s：是�删除%s %s？"
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, c-format
 msgid "removed directory: %s\n"
 msgstr "已删除目录：%s\n"
 
-#: src/remove.c:444
-#, c-format
-msgid "cannot remove directory: %s"
-msgstr "无法删除目录：%s"
+#: src/remove.c:447
+#, fuzzy, c-format
+msgid "refusing to remove %s or %s directory: skipping %s"
+msgstr "无法删除%s 目录%s"
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr "跳过%s，因为它�于��的设备上"
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, c-format
 msgid "traversal failed: %s"
 msgstr "�历失败：%s"
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -7954,15 +8075,16 @@ msgstr ""
 "  -i\t\t\t在删除�需�确认\n"
 
 #: src/rm.c:142
+#, fuzzy
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 "  -I\t\t\t在删除超过三个文件或者递归删除��求确认。此选项比-i �\n"
 "\t\t\t示内容更少，但�样�以阻止大多数错误�生\n"
@@ -8030,14 +8152,16 @@ msgstr ""
 "该文件的内容无法还原，请考虑使用shred。\n"
 
 #: src/rm.c:342
-#, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr "%s：递归删除所有�数？"
+#, fuzzy, c-format
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] "%s：递归删除所有�数？"
 
-#: src/rm.c:343
-#, c-format
-msgid "%s: remove all arguments? "
-msgstr "%s：删除所有�数？"
+#: src/rm.c:345
+#, fuzzy, c-format
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] "%s：删除所有�数？"
 
 #: src/rmdir.c:134 src/rmdir.c:233
 #, c-format
@@ -8090,7 +8214,7 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
 
@@ -8151,41 +8275,46 @@ msgstr "您必须指定-c，-t，-u，-l，-r 或环境"
 msgid "no command specified"
 msgstr "没有指定命令"
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr "%s �能用于�用了SELinux 支�的内核"
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, c-format
 msgid "failed to compute a new context"
 msgstr "计算新的环境失败"
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, c-format
 msgid "failed to set new user %s"
 msgstr "设置新用户%s 失败"
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, c-format
 msgid "failed to set new type %s"
 msgstr "设置新类型%s 失败"
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, c-format
 msgid "failed to set new range %s"
 msgstr "设置新范围%s 失败"
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, c-format
 msgid "failed to set new role %s"
 msgstr "设置新角色%s 失败"
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, c-format
 msgid "unable to set security context %s"
 msgstr "无法设置安全环境%s"
 
+#: src/selinux.c:127 src/selinux.c:300
+#, fuzzy, c-format
+msgid "error canonicalizing %s"
+msgstr "标准化%s 失败"
+
 #: src/seq.c:68
 #, c-format
 msgid ""
@@ -8215,10 +8344,13 @@ msgstr ""
 "  -w, --equal-width\t在列�添加0 使得宽度相�\n"
 
 #: src/seq.c:86
+#, fuzzy
 msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
@@ -8228,7 +8360,7 @@ msgstr ""
 "首数�增�和尾数�以浮点数形�解释。当首数�于尾数时增�一般为正值，\n"
 "相�在首数大于尾数时增�一般为负数。\n"
 
-#: src/seq.c:94
+#: src/seq.c:96
 #, fuzzy
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
@@ -8238,86 +8370,27 @@ msgstr ""
 "指定的格�必须适用于显示\"double\"类型的�数；当首数�增�和尾数�为指定\n"
 "精确度的定点�进制数时默认为\"%.精确度f\"，�则默认为\"%g\"。\n"
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, c-format
 msgid "invalid floating point argument: %s"
 msgstr "无效的浮点�数：%s"
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr "格�%s 中包�未知%%%c 指令"
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr "当输出等宽字符串时�应�指定格�字符串"
 
-#: src/setuidgid.c:49
-#, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-"用法：%s [短选项]... 用户 命令 [�数]...\n"
-"　或：%s 长选项\n"
-
-#: src/setuidgid.c:55
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-"使用指定的用户(数字ID 或者用户�) 替代原有用户ID 和组ID �行连��数的指定命"
-"令\n"
-"如果无法指定请求的用户和组ID 则以状��111 退出，�则以所执行命令的终止状��"
-"退出。\n"
-"此程�通常仅在使用root �行时有用 (root 的用户ID 为0)。\n"
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-"  -g GID[,GID1...]\t将主组ID 设置为指定的数字GID，如果指定了GID1，\n"
-"\t\t\t\t则�时添加这些附加组ID，...\n"
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr "未知的用户ID：%s"
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr "您应当将-g 与用户ID %s 一起使用"
-
-#: src/setuidgid.c:190
-#, c-format
-msgid "failed to set supplemental group(s)"
-msgstr "设置附加组失败"
-
-#: src/setuidgid.c:200
-#, c-format
-msgid "cannot set group-ID to %lu"
-msgstr "无法设置组ID 为%lu"
-
-#: src/setuidgid.c:204
-#, c-format
-msgid "cannot set user-ID to %lu"
-msgstr "无法设置用户ID 为%lu"
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr "Colin Plumb"
 
-#: src/shred.c:148
+#: src/shred.c:170
 #, fuzzy
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
@@ -8326,7 +8399,7 @@ msgstr ""
 "多次覆盖文件，使得�使是昂贵的硬件探测仪器也难以将数��原。\n"
 "\n"
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -8339,9 +8412,10 @@ msgstr ""
 "      --random-source=文件\t从指定文件中�出�机字节\n"
 "  -s, --size=N\t\t粉碎数�为指定字节的碎片(�使用K�M 和G 作为��)\n"
 
-#: src/shred.c:161
+#: src/shred.c:183
+#, fuzzy
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
@@ -8352,15 +8426,20 @@ msgstr ""
 "  -x, --exact\t\t�将文件大�增加至最接近的�大�\n"
 "  -z, --zero \t\t最�一次使用0 进行覆盖以��覆盖动作\n"
 
-#: src/shred.c:170
+#: src/shred.c:192
+#, fuzzy
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 "\n"
@@ -8371,7 +8450,7 @@ msgstr ""
 "一般文件时，�大多数人都会使用--remove 选项。\n"
 "\n"
 
-#: src/shred.c:180
+#: src/shred.c:206
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
 "that the file system overwrites data in place.  This is the traditional\n"
@@ -8387,7 +8466,7 @@ msgstr ""
 "例�：\n"
 "\n"
 
-#: src/shred.c:188
+#: src/shred.c:214
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
 "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
@@ -8407,7 +8486,7 @@ msgstr ""
 "* 会�时进行快照记录的文件系统，�Network Applicance 的NFS �务器\n"
 "\n"
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -8420,7 +8499,7 @@ msgstr ""
 "* 压缩文件系统\n"
 "\n"
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -8438,7 +8517,7 @@ msgstr ""
 "您�以查看mount 的man 页�以获得详细信�。\n"
 "\n"
 
-#: src/shred.c:215
+#: src/shred.c:241
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
 "of the file that cannot be removed, and that will allow a shredded file\n"
@@ -8448,127 +8527,127 @@ msgstr ""
 "包��能被删除的文件副本，这将会\n"
 "�许碎片文件被��。\n"
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, c-format
 msgid "%s: fdatasync failed"
 msgstr "%s：fadatsync 失败"
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr "%s：fsync 失败"
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr "%s：无法�绕�作"
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr "%s：第%lu 次，共%lu 次 (%s)..."
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, c-format
 msgid "%s: error writing at offset %s"
 msgstr "%s：在�置%s 写入时出现错误"
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s：lseek 失败"
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, c-format
 msgid "%s: file too large"
 msgstr "%s：文件过大"
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr "%s：第%lu 次，共%lu 次 (%s)...%s"
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr "%s：第%lu 次，共%lu 次 (%s)...%s/%s %d%%"
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, c-format
 msgid "%s: fstat failed"
 msgstr "%s：获�文件状�失败(fstat)"
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, c-format
 msgid "%s: invalid file type"
 msgstr "%s：无效的文件类型"
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr "%s：文件的大�为负数"
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, c-format
 msgid "%s: error truncating"
 msgstr "%s：截断文件时出错"
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, c-format
 msgid "%s: fcntl failed"
 msgstr "%s：文件控制�作失败(fcntl)"
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr "%s：�能对��追加数�的文件�述符(file descriptor) 进行粉碎"
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr "%s：正在删除"
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, c-format
 msgid "%s: renamed to %s"
 msgstr "%s：�称已更改为 %s"
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, c-format
 msgid "%s: failed to remove"
 msgstr "%s：删除失败"
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr "%s：已删除"
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, c-format
 msgid "%s: failed to close"
 msgstr "%s：无法关闭"
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, c-format
 msgid "%s: failed to open for writing"
 msgstr "%s：无法以写模�打开"
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, c-format
 msgid "%s: invalid number of passes"
 msgstr "%s：覆盖次数无效"
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, c-format
 msgid "multiple random sources specified"
 msgstr "指定了多个�机�"
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, c-format
 msgid "%s: invalid file size"
 msgstr "%s：文件大�无效"
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -8579,14 +8658,15 @@ msgstr ""
 "　或者:  %s -e [选项]... [�数]...\n"
 "　或者:  %s -i LO-HI [选项]...\n"
 
-#: src/shuf.c:54
+#: src/shuf.c:67
 #, fuzzy
 msgid "Write a random permutation of the input lines to standard output.\n"
 msgstr ""
 "把输入行按�机顺�输出到标准输出。\n"
 "\n"
 
-#: src/shuf.c:60
+#: src/shuf.c:73
+#, fuzzy
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
 "  -i, --input-range=LO-HI   treat each number LO through HI as an input "
@@ -8594,7 +8674,7 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
 msgstr ""
 "  -e, --echo\t\t\t将�个�数视为输入行\n"
 "  -i, --input-range=LO-HI\t将LO 到HI 的�个数字视为输入行\n"
@@ -8603,31 +8683,41 @@ msgstr ""
 "      --random-source=文件\t从指定文件获得�机比特\n"
 "  -z, --zero-terminated\t以0 结�行而�新行\n"
 
-#: src/shuf.c:244
+#: src/shuf.c:228
+#, fuzzy, c-format
+msgid "too many input lines"
+msgstr "��行过多"
+
+#: src/shuf.c:431
 #, c-format
 msgid "multiple -i options specified"
 msgstr "指定了多个-i 选项"
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, c-format
 msgid "invalid input range %s"
 msgstr "无效的输入范围：%s"
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, c-format
 msgid "invalid line count %s"
 msgstr "无效的行数%s"
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, c-format
 msgid "multiple output files specified"
 msgstr "指定了多个输出文件"
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, c-format
 msgid "cannot combine -e and -i options"
 msgstr "�能�时指定-e 和-i 选项"
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr ""
+
 #: src/sleep.c:44
 #, fuzzy, c-format
 msgid ""
@@ -8648,24 +8738,24 @@ msgstr ""
 "如果�数个数超过2 个，暂�的总时间为�个�数的值的和。\n"
 "\n"
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, c-format
 msgid "invalid time interval %s"
 msgstr "无效的时间间隔%s"
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, c-format
 msgid "cannot read realtime clock"
 msgstr "无法读�实时时钟"
 
-#: src/sort.c:399
+#: src/sort.c:427
 #, fuzzy
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr ""
 "串�排�所有指定文件并将结果写到标准输出。\n"
 "\n"
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
@@ -8673,7 +8763,7 @@ msgstr ""
 "排�选项：\n"
 "\n"
 
-#: src/sort.c:409
+#: src/sort.c:437
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
 "  -d, --dictionary-order      consider only blanks and alphanumeric "
@@ -8684,7 +8774,7 @@ msgstr ""
 "  -d, --dictionary-order\t�考虑空白区域和字�字符\n"
 "  -f, --ignore-case\t\t忽略字�大�写\n"
 
-#: src/sort.c:415
+#: src/sort.c:443
 #, fuzzy
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
@@ -8696,12 +8786,12 @@ msgstr ""
 "  -M, --month-sort\t\t比较 (未知) < \"一月\" < ... < \"�二月\"\n"
 "\t\t\t\t在LC_ALL=C 时为(unknown) < `JAN' < ... < `DEC'\n"
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr "  -h, --human-numeric-sort    使用易读性数字(例如： 2K 1G)\n"
 
-#: src/sort.c:423
+#: src/sort.c:451
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
 "  -R, --random-sort           sort by random hash of keys\n"
@@ -8713,7 +8803,7 @@ msgstr ""
 "      --random-source=文件\t从指定文件中获得�机字节\n"
 "  -r, --reverse\t\t\t逆�输出排�结果\n"
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -8728,7 +8818,7 @@ msgstr ""
 "  -V, --version-sort\t\t在文本内进行自然版本排�\n"
 "\n"
 
-#: src/sort.c:437
+#: src/sort.c:465
 msgid ""
 "Other options:\n"
 "\n"
@@ -8736,7 +8826,7 @@ msgstr ""
 "其他选项：\n"
 "\n"
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
@@ -8744,7 +8834,7 @@ msgstr ""
 "      --batch-size=NMERGE\t一次最多�并NMERGE 个输入；如果输入更多\n"
 "\t\t\t\t\t则使用临时文件\n"
 
-#: src/sort.c:445
+#: src/sort.c:473
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
 "  -C, --check=quiet, --check=silent  like -c, but do not report first bad "
@@ -8758,7 +8848,7 @@ msgstr ""
 "      --compress-program=程�\t使用指定程�压缩临时文件；使用该程�\n"
 "\t\t\t\t\t的-d �数解压缩文件\n"
 
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -8771,7 +8861,7 @@ msgstr ""
 "      --files0-from=文件\t从指定文件读�以NUL 终止的�称，如果该文件被\n"
 "\t\t\t\t\t指定为\"-\"则从标准输入读文件�\n"
 
-#: src/sort.c:459
+#: src/sort.c:487
 #, fuzzy
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
@@ -8781,7 +8871,7 @@ msgstr ""
 "\t\t\t\t�看POS 语法。\n"
 "  -m, --merge\t\t\t�并已排�的文件，��进行排�\n"
 
-#: src/sort.c:463
+#: src/sort.c:491
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "  -s, --stable              stabilize sort by disabling last-resort "
@@ -8792,7 +8882,7 @@ msgstr ""
 "  -s, --stable\t\t\t�用last-resort 比较以稳定比较算法\n"
 "  -S, --buffer-size=大�\t指定主内存缓存大�\n"
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -8812,11 +8902,7 @@ msgstr ""
 "      --parallel=N\t\t将�时�行的排�数改�为N\n"
 "  -u, --unique\t\t��-c，严格校验排�；���-c，则�输出一次排�结果\n"
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr "  -z, --zero-terminated\t以0 字节而�新行作为行尾标志\n"
-
-#: src/sort.c:483
+#: src/sort.c:511
 #, fuzzy
 msgid ""
 "\n"
@@ -8844,7 +8930,7 @@ msgstr ""
 "\n"
 "指定的大��以使用以下��之一：\n"
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -8863,257 +8949,242 @@ msgstr ""
 "本地环境��会影�排�结果。\n"
 "如果希望以字节的自然值获得最传统的排�结果，请设置LC_ALL=C。\n"
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, c-format
 msgid "waiting for %s [-d]"
 msgstr "等待 %s [-d]"
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr "%s [-d] �正常结�"
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, c-format
 msgid "cannot create temporary file in %s"
 msgstr "无法在%s 创建临时文件"
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr "打开失败"
 
-#: src/sort.c:970
+#: src/sort.c:998
 msgid "fflush failed"
 msgstr "冲洗�失败(fflush)"
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr "关闭失败"
 
-#: src/sort.c:986
-#, c-format
-msgid "dup2 failed"
-msgstr "�制已打开文件�述符失败(dup2)"
-
-#: src/sort.c:1103
-#, c-format
-msgid "couldn't execute %s"
-msgstr "无法执行%s"
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 msgid "couldn't create temporary file"
 msgstr "无法创建临时文件"
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, c-format
 msgid "couldn't create process for %s -d"
 msgstr "无法创建进程%s -d"
 
-#: src/sort.c:1161
-#, c-format
-msgid "couldn't execute %s -d"
-msgstr "无法执行%s -d"
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, c-format
 msgid "warning: cannot remove: %s"
 msgstr "警告：无法删除：%s"
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, c-format
 msgid "invalid --%s argument %s"
 msgstr "无效的 --%s �数%s"
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, c-format
 msgid "minimum --%s argument is %s"
 msgstr "最� --%s �数是%s"
 
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, c-format
 msgid "--%s argument %s too large"
 msgstr "--%s �数%s 太长"
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr "最大 --%s �数在当�资��制(rlimit)设置下是%s"
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr "�个的数字必须�为零"
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr "获�文件状�失败(stat)"
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr "读�失败"
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, c-format
 msgid "string transformation failed"
 msgstr "字符串转�失败"
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, c-format
 msgid "the untransformed string was %s"
 msgstr "未转�的字符串为%s"
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr "^ 没有匹�项\n"
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, fuzzy, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr "使用了旧的值%s，考虑转为使用%s"
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr "值%lu 宽度为零，忽略"
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, fuzzy, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr "值%lu 开头有大�空格，考虑�时指定\"b\""
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr "值%lu 为数字且跨多个域"
 
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, fuzzy, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
 msgstr[0] "选项\"-%s\"被忽略"
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, fuzzy, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr "选项\"-r\" 仅用于last-resort 比较"
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr "写入失败"
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr "%s：%s:%s：无�： "
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr "标准错误"
 
-#: src/sort.c:3698
+#: src/sort.c:3738
 #, fuzzy
 msgid "cannot read"
 msgstr "%s：无法�绕�作"
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, c-format
 msgid "%s: invalid field specification %s"
 msgstr "%s：无效的区�规格%s"
 
-#: src/sort.c:3987
+#: src/sort.c:4028
 #, fuzzy, c-format
 msgid "options '-%s' are incompatible"
 msgstr "选项\"-%s\"�兼容"
 
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, c-format
 msgid "%s: invalid count at start of %s"
 msgstr "%s：在%s 处的计数无效"
 
-#: src/sort.c:4295
+#: src/sort.c:4336
 #, fuzzy
 msgid "invalid number after '-'"
 msgstr "在\"-\"�的编�无效"
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 #, fuzzy
 msgid "invalid number after '.'"
 msgstr "在\".\"�的编�无效"
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr "区�中有孤立字符"
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, c-format
 msgid "multiple compress programs specified"
 msgstr "指定了多个压缩程�"
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
 msgstr "区�起始处的编�无效"
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
 msgstr "区�编�为零"
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr "字符�移�为零"
 
-#: src/sort.c:4407
+#: src/sort.c:4448
 #, fuzzy
 msgid "invalid number after ','"
 msgstr "在\",\"�的编�无效"
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr "空标签"
 
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, c-format
 msgid "cannot read file names from %s"
 msgstr "无法从%s 中读�文件�"
 
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr "%s：%lu：无效的 0 长度文件�"
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, c-format
 msgid "no input from %s"
 msgstr "没有�自%s 的输入"
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr "使用%s 排�规则"
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr "使用简�字节比较"
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr "��许�外的�作数%s 与-%c 一起使用"
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr "�缀长度至少应为%zu"
 
-#: src/split.c:204
+#: src/split.c:203
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr "用法：%s [选项]... [输入 [�缀]]\n"
 
-#: src/split.c:208
+#: src/split.c:207
 #, fuzzy
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
@@ -9126,22 +9197,21 @@ msgstr ""
 "者文件为\"-\"，则从标准输入读�数�。\n"
 "\n"
 
-#: src/split.c:216
+#: src/split.c:215
 #, fuzzy, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
 "  -a, --suffix-length=N\t指定�缀长度为N (默认为%d)\n"
@@ -9153,13 +9223,13 @@ msgstr ""
 "  -n, --number=�数\t\t生��数输出文件。�看下�的说明。\n"
 "  -u, --unbuffered\t\t立�使用-n r/... �制输入到输出\n"
 
-#: src/split.c:229
+#: src/split.c:228
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
 "                            output file is opened\n"
 msgstr "      --verbose\t\t在�个输出文件打开�输出文件特�\n"
 
-#: src/split.c:236
+#: src/split.c:235
 #, fuzzy
 msgid ""
 "\n"
@@ -9180,189 +9250,189 @@ msgstr ""
 "r/N\t类似l 但使用轮询分�\n"
 "r/K/N\t类似r/N 但尽将N 个文件中的第K 个输出到标准输出\n"
 
-#: src/split.c:354
+#: src/split.c:353
 #, c-format
 msgid "output file suffixes exhausted"
 msgstr "已排除输出文件�缀"
 
-#: src/split.c:366
+#: src/split.c:365
 #, c-format
 msgid "creating file %s\n"
 msgstr "正在创建文件%s\n"
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr ""
 
-#: src/split.c:391
+#: src/split.c:390
 #, fuzzy, c-format
 msgid "failed to set FILE environment variable"
 msgstr "更新%s 的环境失败"
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr ""
 
-#: src/split.c:395
+#: src/split.c:394
 #, fuzzy, c-format
 msgid "failed to create pipe"
 msgstr "无法创建硬链接%s"
 
-#: src/split.c:409
+#: src/split.c:408
 #, fuzzy, c-format
 msgid "closing prior pipe"
 msgstr "关闭目录%s"
 
-#: src/split.c:411
+#: src/split.c:410
 #, fuzzy, c-format
 msgid "closing output pipe"
 msgstr "正在关闭输出文件%s"
 
-#: src/split.c:415
+#: src/split.c:414
 #, fuzzy, c-format
 msgid "moving input pipe"
 msgstr "正在关闭输入文件%s"
 
-#: src/split.c:417
+#: src/split.c:416
 #, fuzzy, c-format
 msgid "closing input pipe"
 msgstr "正在关闭输入文件%s"
 
-#: src/split.c:422
+#: src/split.c:421
 #, fuzzy, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr "无法�行命令%s"
 
-#: src/split.c:428
+#: src/split.c:427
 #, fuzzy, c-format
 msgid "failed to close input pipe"
 msgstr "关闭目录 %s 失败"
 
-#: src/split.c:464
+#: src/split.c:463
 #, fuzzy, c-format
 msgid "waiting for child process"
 msgstr "等待拆解"
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr ""
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr ""
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr "�自命令的未知状� (0x%X)"
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr "无法以多于一�的方�切分输入"
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, c-format
 msgid "%s: invalid number of chunks"
 msgstr "%s：无效的�数"
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, c-format
 msgid "%s: invalid chunk number"
 msgstr "%s：无效�数"
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr "%s：文件类型无效"
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr "%s：无效的字节数"
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr "%s：无效的行数"
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, c-format
 msgid "line count option -%s%c... is too large"
 msgstr "行数选项-%s%c... 过大"
 
-#: src/split.c:1248
+#: src/split.c:1298
 #, fuzzy, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr "无效的起始行�：%s"
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, c-format
 msgid "%s: invalid IO block size"
 msgstr "%s：无效的IO �大�"
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr ""
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr ""
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, c-format
 msgid "%s: cannot determine file size"
 msgstr "%s：无法确定文件大�"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr "Michael Meskes"
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, c-format
 msgid "failed to canonicalize %s"
 msgstr "标准化%s 失败"
 
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, fuzzy, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr "警告：无法识别的转义字符\"\\%c\""
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, c-format
 msgid "%s: invalid directive"
 msgstr "%s：无效指令"
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, c-format
 msgid "warning: backslash at end of format"
 msgstr "警告：格�末尾出现�斜�"
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr "用 %s 进行标准输入在文件系统模�下无法工作"
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, c-format
 msgid "cannot read file system information for %s"
 msgstr "无法为 %s 读�文件系统信�"
 
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, c-format
 msgid "cannot stat standard input"
 msgstr "无法从标准输入获�文件信�(stat)"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -9378,7 +9448,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -9388,30 +9458,30 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr "设备：%Dh/%dd\tInode：%-10i  硬链接：%-5h 设备类型：%t,%T\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr "设备：%Dh/%dd\tInode：%-10i  硬链接：%h\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr "��：(%04a/%10.10A)  Uid：(%5u/%8U)   Gid：(%5g/%8G)\n"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, c-format
 msgid "Context: %C\n"
 msgstr "环境：%C\n"
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -9423,11 +9493,11 @@ msgstr ""
 "最近改动：%z\n"
 "创建时间：%w\n"
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
 msgstr ""
 
-#: src/stat.c:1356
+#: src/stat.c:1418
 #, fuzzy
 msgid ""
 "  -L, --dereference     follow links\n"
@@ -9438,13 +9508,14 @@ msgstr ""
 "  -L, --dereference\t跟�链接\n"
 "  -f, --file-system\t显示文件系统状�而�文件状�\n"
 
-#: src/stat.c:1360
+#: src/stat.c:1422
+#, fuzzy
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 "  -c --format=格�\t使用指定输出格�代替默认值，�用一次指定格��一新行\n"
@@ -9453,7 +9524,7 @@ msgstr ""
 "\t\t\t\t加入\"\\n\"\n"
 "  -t, --terse\t\t使用简�格�输出\n"
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 #, fuzzy
 msgid ""
 "\n"
@@ -9474,7 +9545,7 @@ msgstr ""
 "  %B   以字节为��输出%b 所报告的�个�的大�\n"
 "  %C   SELinux 安全环境字符串\n"
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 #, fuzzy
 msgid ""
 "  %d   device number in decimal\n"
@@ -9491,7 +9562,7 @@ msgstr ""
 "  %g\t文件的属组ID\n"
 "  %G\t文件的属组组�\n"
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 #, fuzzy
 msgid ""
 "  %h   number of hard links\n"
@@ -9501,8 +9572,8 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 "  %h\t硬链接数�\n"
 "  %i\tInode 编�\n"
@@ -9514,7 +9585,7 @@ msgstr ""
 "  %t\t�六进制主设备类型\n"
 "  %T\t�六进制�设备类型\n"
 
-#: src/stat.c:1399
+#: src/stat.c:1461
 #, fuzzy
 msgid ""
 "  %u   user ID of owner\n"
@@ -9523,10 +9594,10 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 "  %u\t文件的属主ID\n"
@@ -9541,7 +9612,7 @@ msgstr ""
 "  %Z\t从UNIX 元年起以秒计的上次更改时间\n"
 "\n"
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 #, fuzzy
 msgid ""
 "Valid format sequences for file systems:\n"
@@ -9560,7 +9631,7 @@ msgstr ""
 "  %d\t文件系统中空闲文件节点数\n"
 "  %f\t文件系统中空闲�数\n"
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 #, fuzzy
 msgid ""
 "  %i   file system ID in hex\n"
@@ -9653,22 +9724,27 @@ msgstr ""
 "还有�些滤件程�(如dd 和cat 之类)，它们�使用输入输出�，\n"
 "因此��stdbuf 设置的影�。\n"
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, c-format
 msgid "failed to find %s"
 msgstr "查找%s 失败"
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, c-format
 msgid "failed to update the environment with %s"
 msgstr "更新%s 的环境失败"
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr "对标准输入进行行缓冲无�义"
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, fuzzy, c-format
+msgid "you must specify a buffering mode option"
+msgstr "您必须为%2$s 中指定一个相关的%1$s"
+
+#: src/stty.c:516
 #, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -9679,11 +9755,11 @@ msgstr ""
 "　或：%s [-F 设备 | --file=设备] [-a|--all]\n"
 "　或：%s [-F 设备 | --file=设备] [-g|--save]\n"
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
 msgstr ""
 
-#: src/stty.c:525
+#: src/stty.c:528
 #, fuzzy
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
@@ -9696,7 +9772,7 @@ msgstr ""
 "  -g, --save\t\t以stty �读�的格�输出当�全部设置\n"
 "  -F, --file=设备\t打开并使用指定设备代替标准输入\n"
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
@@ -9706,7 +9782,7 @@ msgstr ""
 "�选- 在设置�的指示中，* 标记出了�POSIX 标准的设置。以下系\n"
 "统定义象�了哪些设置是有效的。\n"
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -9720,7 +9796,7 @@ msgstr ""
 "   eof\t字符\t表示文件末尾而��的字符(用于终止输入)\n"
 "   eol\t字符\t为表示行尾而��的字符\n"
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -9732,7 +9808,7 @@ msgstr ""
 "   intr 字符\t用于��中断信�的字符\n"
 "   kill 字符\t用于擦除当�终端行的字符\n"
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -9744,7 +9820,7 @@ msgstr ""
 " * rprnt 字符\t用于�绘当�行的字符\n"
 "   start 字符\t在�止��新开�输出的字符\n"
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -9756,7 +9832,7 @@ msgstr ""
 " * swtch 字符\t在��的shell 层次间切�的字符\n"
 " * werase 字符\t擦除�一个输入的��的字符\n"
 
-#: src/stty.c:562
+#: src/stty.c:565
 msgid ""
 "\n"
 "Special settings:\n"
@@ -9770,7 +9846,7 @@ msgstr ""
 " * cols N\t统治内核终端上有N �\n"
 " * columns N\t等于cols N\n"
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -9783,7 +9859,7 @@ msgstr ""
 "   min N\t和 -icanon ��使用，设置�次一完整读入的最�字符数为<N>\n"
 "   ospeed N\t设置输出速度为N 波特\n"
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -9796,7 +9872,7 @@ msgstr ""
 "   speed\t输出终端速度(��为波特)\n"
 "   time N\t和-icanon ��使用，设置读�超时为N 个�分之一秒\n"
 
-#: src/stty.c:581
+#: src/stty.c:584
 #, fuzzy
 msgid ""
 "\n"
@@ -9814,7 +9890,7 @@ msgstr ""
 " * [-]crtscts\t�用RTS/CTS �手\n"
 "   csN\t\t设置字符大�为N �，N 的范围为5 到8\n"
 
-#: src/stty.c:590
+#: src/stty.c:593
 #, fuzzy
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
@@ -9823,6 +9899,7 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 "   [-]cstopb\t�个字符使用2 ��止� (����1 ���\"-\"��)\n"
 "   [-]hup\t当最�一个进程关闭标准终端���挂起信�\n"
@@ -9830,7 +9907,7 @@ msgstr ""
 "   [-]parenb\t对输出生�奇�校验�并等待输入的奇�校验�\n"
 "   [-]parodd\t设置校验�为奇数 (��\"-\"则为�数)\n"
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -9846,7 +9923,7 @@ msgstr ""
 "   [-]ignbrk\t忽略中断字符\n"
 "   [-]igncr\t忽略回车\n"
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -9860,11 +9937,11 @@ msgstr ""
 "   [-]inpck\t�用输入奇�性校验\n"
 "   [-]istrip\t剥除输入字符的高8 �比特\n"
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr " * [-]iutf8\t�定输入字符都是UTF-8 编�\n"
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -9880,7 +9957,7 @@ msgstr ""
 "   [-]parmrk\t标记奇�校验错误 (结�255-0 字符�列)\n"
 "   [-]tandem\t等于[-]ixoff\n"
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -9896,10 +9973,11 @@ msgstr ""
 " * ffN\t\t�页延迟的风格，N 的值为0 至1\n"
 " * nlN\t\t�行延迟的风格，N 的值为0 至1\n"
 
-#: src/stty.c:631
+#: src/stty.c:635
+#, fuzzy
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
@@ -9912,7 +9990,7 @@ msgstr ""
 " * [-]onlcr\t将�行符转�为回车\n"
 " * [-]onlret\t使得�行符的行为表现和回车相�\n"
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -9928,7 +10006,7 @@ msgstr ""
 " * -tabs\t等于tab3\n"
 " * vtN\t\t垂直制表符延迟的风格，N 的值为0 至1\n"
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -9942,7 +10020,7 @@ msgstr ""
 " * crtkill\t�照echoprt 和echoe 的设置清除所有行\n"
 " * -crtkill\t�照echoctl 和echol 的设置清除所有行\n"
 
-#: src/stty.c:654
+#: src/stty.c:658
 #, fuzzy
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
@@ -9957,7 +10035,7 @@ msgstr ""
 "   [-]echoe    等于[-]crterase\n"
 "   [-]echok\t在�清除一个字符�输出一次�行\n"
 
-#: src/stty.c:661
+#: src/stty.c:665
 #, fuzzy
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
@@ -9972,7 +10050,7 @@ msgstr ""
 "   [-]icanon\t�用erase�kill�werase 和rprnt 等特殊字符\n"
 "   [-]iexten\t�许POSIX 标准以外的特殊字符\n"
 
-#: src/stty.c:668
+#: src/stty.c:672
 #, fuzzy
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
@@ -9988,7 +10066,7 @@ msgstr ""
 " * [-]tostop\t中止�试�终端写入数�的��任务\n"
 " * [-]xcase\t和icanon ��使用，用转义符\"\\\"退出大写状�\n"
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -10002,7 +10080,7 @@ msgstr ""
 "   cbreak\t等于-icanon\n"
 "   -cbreak\t等于icanon\n"
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -10014,7 +10092,7 @@ msgstr ""
 "   -cooked\t等于-raw\n"
 "   crt\t\t等于echoe echoctl echoke\n"
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -10027,7 +10105,7 @@ msgstr ""
 "   ek\t\t清除所有字符，将它们回溯为默认值\n"
 "   evenp\t等于parenb -parodd cs7\n"
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -10043,7 +10121,7 @@ msgstr ""
 "   nl\t\t等于-icrnl -onlcr\n"
 "   -nl\t\t等于icrnl -inlcr -igncr onlcr -ocrnl -onlret\n"
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -10057,7 +10135,7 @@ msgstr ""
 "   pass8\t等于-parenb -istrip cs8\n"
 "   -pass8\t等于parenb istrip cs7\n"
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -10069,7 +10147,7 @@ msgstr ""
 "                 -imaxbel -opost -isig -icanon -xcase min 1 time 0\n"
 "   -raw\t等于cooked\n"
 
-#: src/stty.c:716
+#: src/stty.c:720
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
 "                 -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n"
@@ -10085,7 +10163,7 @@ msgstr ""
 "\t\t-xcase -tostop -echoprt echoctl echoke，所有特殊字符�\n"
 "\t\t使用默认值\n"
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -10099,55 +10177,55 @@ msgstr ""
 "规则以�与标准stty 设置间的�差。在设置中，字符会被�字读�或是被编�为^c�\n"
 "0x37�0177 或127 这样的字符，其中有特殊值^- 或undef 被用于�止特殊字符。\n"
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, c-format
 msgid "only one device may be specified"
 msgstr "�能指定一个设备"
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
 "mutually exclusive"
 msgstr "verbose 和 stty-readable 两�输入风格的选项是互相抵触的"
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr "当指定了输出风格时，模��能�被设置"
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr "%s：无法�置�阻塞模�"
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, c-format
 msgid "invalid argument %s"
 msgstr "无效的�数 %s"
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, c-format
 msgid "missing argument to %s"
 msgstr "缺少%s 的�数"
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, c-format
 msgid "invalid line discipline %s"
 msgstr "无效的行约�%s"
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr "%s：无法执行所有请求的�作"
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr "%s：此设备没有大�信�"
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, c-format
 msgid "invalid integer argument %s"
 msgstr "无效的整数�数%s"
@@ -10202,22 +10280,22 @@ msgstr "      --help\t\t显示此帮助信�并退出\n"
 msgid "      --version  output version information and exit\n"
 msgstr "      --version\t\t显示版本信�并退出\n"
 
-#: src/system.h:544
+#: src/system.h:543
 #, fuzzy
 msgid ""
 "\n"
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "长选项必须使用的�数对于短选项时也是必需使用的。\n"
 
-#: src/system.h:552
+#: src/system.h:551
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -10230,36 +10308,34 @@ msgstr ""
 "� BLOCKSIZE 环境��中第一个�用的 SIZE ��。\n"
 "�则，默认��是 1024 字节(或是 512，若设定 POSIXLY_CORRECT 的�)。\n"
 
-#: src/system.h:571
-#, c-format
+#: src/system.h:570
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
-msgstr ""
-"\n"
-"请�%2$s 报告%1$s 的错误\n"
+"%s online help: <%s>\n"
+msgstr "%s 的主页：<%s>\n"
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr ""
 "请�<http://translationproject.org/team/zh_CN.html> 报告%s 的翻译错误\n"
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr "�获�完整文档，请�行：info coreutils '%s invocation'\n"
 
-#: src/system.h:596
+#: src/system.h:591
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "请�试执行\"%s --help\"�获�更多信�。\n"
 
-#: src/system.h:628
+#: src/system.h:633
 #, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -10357,21 +10433,20 @@ msgstr ""
 "\n"
 
 #: src/tail.c:270
+#, fuzzy
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
 "  -c, --bytes=K\t\t输出最�K 字节；�外，使用-c +K 从�个文件的\n"
 "\t\t\t第K 字节输出\n"
 
 #: src/tail.c:274
+#, fuzzy
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 "  -f, --follow[={name|descriptor}]\n"
@@ -10379,18 +10454,17 @@ msgstr ""
 "\t\t\t-f, --follow 等于--follow=descriptor \n"
 "  -F\t\t�--follow=name --retry\n"
 
-#: src/tail.c:281
-#, c-format
+#: src/tail.c:280
+#, fuzzy, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
 "  -n, --lines=K\t输出最�K 行，代替最�%d 行；使用-n +K 从�个文件的第K 字节"
 "输出\n"
@@ -10400,33 +10474,32 @@ msgstr ""
 "\t\t\t\t接或�命�(这是循环日志文件的通常情况)。\n"
 "\t\t\t\t由于有inotify，这个选项很少使用。\n"
 
-#: src/tail.c:294
+#: src/tail.c:293
+#, fuzzy
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 "      --pid=PID\t\t� -f 一起使用，当 PID 所对应的进程死去�终止\n"
 "  -q, --quiet, --silent\t�输出给出文件�的头\n"
 "      --retry\t\t�使目标文件��访问�然试图打开；在与�数\n"
 "\t\t\t--follow=name �时使用时常常有用。\n"
 
-#: src/tail.c:301
+#: src/tail.c:298
 #, fuzzy
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 "  -s, --sleep-interval=秒数\t�-f 一起使用，在迭代间暂�约指定秒数的时间\n"
 "\t\t\t\t(默认1.0 秒)\n"
 "  -v, --verbose\t\t总是输出给出文件�的头\n"
 
-#: src/tail.c:310
+#: src/tail.c:307
 #, fuzzy
 msgid ""
 "\n"
@@ -10445,7 +10518,7 @@ msgstr ""
 "GB 1000*1000*1000，G 1024*1024*1024，以�T，P，E，Z，Y。\n"
 "\n"
 
-#: src/tail.c:319
+#: src/tail.c:316
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
 "means that even if a tail'ed file is renamed, tail will continue to track\n"
@@ -10459,159 +10532,164 @@ msgstr ""
 "tail 定期追踪打开给定�称的文件，以确认它是�被删除或被其它�些程��新创建"
 "过。\n"
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr "正在关闭 %s (fd=%d)"
 
-#: src/tail.c:453
-#, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr "%s：无法检索相对�移� %s"
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr "%s：无法检索相对�移�的末尾 %s"
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr "无法定� %s 的�置，回归为 polling 机制"
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
 "reverting to polling"
 msgstr ""
 
-#: src/tail.c:963
+#: src/tail.c:965
+#, fuzzy, c-format
+msgid "%s has been replaced with a symbolic link. giving up on this name"
+msgstr "%s 已被替�为一个远程文件，放弃跟踪"
+
+#: src/tail.c:980
 #, c-format
 msgid "%s has become inaccessible"
 msgstr "%s 已��访问"
 
-#: src/tail.c:980
+#: src/tail.c:997
 #, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr "%s 已被替�为tail 无法处�的文件，放弃跟踪"
 
-#: src/tail.c:989
+#: src/tail.c:1006
 #, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr "%s 已被替�为一个远程文件，放弃跟踪"
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, c-format
 msgid "%s has become accessible"
 msgstr "%s 已��以访问"
 
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr "%s 已被建立，正在跟�新文件的末尾"
 
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr "%s 已被替�，正在跟�新文件的末尾"
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr "%s：无法更改�阻塞模�"
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr "%s：文件已截断"
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr "没有剩余文件"
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, c-format
 msgid "cannot watch parent directory of %s"
 msgstr "无法监视%s 的上级目录"
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, c-format
 msgid "inotify resources exhausted"
 msgstr "inotify 资�耗尽"
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, c-format
 msgid "cannot watch %s"
 msgstr "无法监视%s"
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr "监视inotify 事件出错"
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, c-format
 msgid "error reading inotify event"
 msgstr "读�inotify 事件出错"
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr "%s：无法跟�此类型文件的末尾，已放弃"
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, c-format
 msgid "number in %s is too large"
 msgstr "%s 中的数字过大"
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr "%s：两次打开的间隔因过大而无效"
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr "%s：无效的进程�"
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr "%s：无效的秒数"
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr "在未定义环境中的无效选项 -- %c"
 
-#: src/tail.c:2034
+#: src/tail.c:2096
+#, fuzzy, c-format
+msgid "warning: --retry ignored; --retry is useful only when following"
+msgstr "警告：已忽略进程�，�有在跟�模�下--pid=PID 选项�是有用的"
+
+#: src/tail.c:2100
 #, c-format
-msgid "warning: --retry is useful mainly when following by name"
-msgstr "警告：--retry �数需�在��附加�称�使用"
+msgid "warning: --retry only effective for the initial open"
+msgstr ""
 
-#: src/tail.c:2038
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
 msgstr "警告：已忽略进程�，�有在跟�模�下--pid=PID 选项�是有用的"
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr "警告：此系统�支�--pid=PID"
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, c-format
 msgid "cannot follow %s by name"
 msgstr "无法按�称跟�%s"
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr "警告：无�期跟�标准输入是无用的"
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr "无法使用 inotify 机制，回归为 polling 机制"
@@ -10881,17 +10959,17 @@ msgstr "多余的�数%s"
 msgid "warning: sigprocmask"
 msgstr ""
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr ""
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr ""
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
@@ -10900,7 +10978,7 @@ msgstr ""
 "用法：%s [选项] �留时间 命令 [�数]...\n"
 "　或：%s 选项\n"
 
-#: src/timeout.c:229
+#: src/timeout.c:232
 #, fuzzy
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
 msgstr ""
@@ -10908,24 +10986,23 @@ msgstr ""
 "\n"
 "长选项必须使用的�数对于短选项时也是必需使用的。\n"
 
-#: src/timeout.c:235
+#: src/timeout.c:238
 #, fuzzy
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
 "  -k, --kill-after=�留时间\n"
 "\t\t�始信��出�指定时间内如果进程�在�行则�其��KILL 信�。  -s, --"
@@ -10933,7 +11010,7 @@ msgstr ""
 "\t\t指定在超时时��的信�。信��以是类似\"HUP\"的信��或是信�数。\n"
 "\t\t查看\"kill -l\"以获得信�列表\n"
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 #, fuzzy
 msgid ""
 "\n"
@@ -10946,7 +11023,7 @@ msgstr ""
 "\"s\"代表秒(默认值)，\"m\"代表分，\"h\"代表�时，\"d\"代表天。\n"
 "\n"
 
-#: src/timeout.c:259
+#: src/timeout.c:262
 #, fuzzy
 msgid ""
 "\n"
@@ -10963,17 +11040,17 @@ msgstr ""
 "程。\n"
 "对于�一些进程�能需�使用KILL (9)信�，当然此信��能被�获。\n"
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr ""
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, c-format
 msgid "error waiting for command"
 msgstr "等待命令出错"
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr ""
@@ -11359,9 +11436,10 @@ msgid ""
 msgstr "  -o, --io-blocks\t将SIZE 视为IO �数而�使用字节数\n"
 
 #: src/truncate.c:115
+#, fuzzy
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 "  -r, --reference=文件   使用此文件的大�\n"
 "  -s, --size=大�\t使用此大�\n"
@@ -11456,12 +11534,12 @@ msgstr ""
 "如果�指定文件，或者文件为\"-\"，则从标准输入读�数�。\n"
 "\n"
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr "%s：输入内容的行数为奇数"
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr "%s：输入内容中�有循环段�："
@@ -11557,12 +11635,12 @@ msgstr "制表符过于分散"
 msgid "tab stop value is too large"
 msgstr "制表符�长过大"
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr "用法：%s [选项]... [文件]\n"
 
-#: src/uniq.c:138
+#: src/uniq.c:174
 #, fuzzy
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
@@ -11575,39 +11653,45 @@ msgstr ""
 "�附加任何选项时匹�行将在首次出现处被�并。\n"
 "\n"
 
-#: src/uniq.c:147
+#: src/uniq.c:183
+#, fuzzy
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
 msgstr ""
 "  -c, --count\t\t在�行�加上表示相应行目出现次数的�缀编�\n"
 "  -d, --repeated\t�输出��的行\n"
 
-#: src/uniq.c:151
+#: src/uniq.c:187
+msgid ""
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
+msgstr ""
+
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr ""
+
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
+msgstr ""
+
+#: src/uniq.c:199
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
 "  -i, --ignore-case     ignore differences in case when comparing\n"
 "  -s, --skip-chars=N    avoid comparing the first N characters\n"
 "  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
-msgstr ""
-"  -D, --all-repeated[=delimit-method\t显示所有��的行\n"
-"\t\t\tdelimit-method={none(default),prepend,separate}\n"
-"\t\t\t以空行为界�\n"
-"  -f, --skip-fields=N\t比较时跳过�N 列\n"
-"  -i, --ignore-case\t在比较的时候�区分大�写\n"
-"  -s, --skip-chars=N\t比较时跳过�N 个字符\n"
-"  -u, --unique\t\t�显示唯一的行\n"
-"  -z, --zero-terminated\t使用'\\0'作为行结�符，而�是新�行\n"
-
-#: src/uniq.c:161
+msgstr ""
+
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr "  -w, --check-chars=N\t对�行第N 个字符以�的内容�作对照\n"
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 msgid ""
 "\n"
 "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n"
@@ -11617,7 +11701,7 @@ msgstr ""
 "若域中为先空字符(通常包括空格以�制表符)，然��空字符，域中字符�的空字符将"
 "被跳过。\n"
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 #, fuzzy
 msgid ""
 "\n"
@@ -11630,24 +11714,34 @@ msgstr ""
 "如果您想先对输入排�，使用没有uniq 的\"sort -u\"。\n"
 "�时，比较�从\"LC_COLLATE\" ��所指定的规则。\n"
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, c-format
 msgid "too many repeated lines"
 msgstr "��行过多"
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
 msgstr "�略过的区�数�无效"
 
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
 msgstr "�略过的字节数�无效"
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
 msgstr "�对照的字节数�无效"
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr ""
+
+#: src/uniq.c:652
+#, fuzzy, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr "�时输出��的行和��计数是没有�义的"
+
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr "�时输出��的行和��计数是没有�义的"
@@ -11669,11 +11763,6 @@ msgstr ""
 "调用 unlink 函数删除指定的文件。\n"
 "\n"
 
-#: src/unlink.c:86
-#, c-format
-msgid "cannot unlink %s"
-msgstr "无法清除%s 的链接"
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -11716,7 +11805,7 @@ msgstr[0] "%lu 个用户"
 msgid ",  load average: %.2f"
 msgstr "，平�负载：%.2f"
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -11726,19 +11815,19 @@ msgstr ""
 "输出当�时间，系统�动时间，当�登录用户数以�最近1�5 和15 分钟系统�行\n"
 "队列中的平�任务数。"
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
 "an uninterruptible sleep state also contribute to the load average.\n"
 msgstr "  处于��中断�眠状�的程��样影�系统平�负载。\n"
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr "\n"
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
@@ -11969,24 +12058,6 @@ msgstr ""
 "��输出一行指定的字符串，或者��输出\"y\"。\n"
 "\n"
 
-#~ msgid "using single-precision arithmetic"
-#~ msgstr "使用�精度�算"
-
-#~ msgid "using arbitrary-precision arithmetic"
-#~ msgstr "使用任�精度�算"
-
-#, fuzzy
-#~ msgid "  returning value: '%s'\n"
-#~ msgstr "正在创建文件%s\n"
-
-#, fuzzy
-#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n"
-#~ msgstr "用法：%s [选项] �称...\n"
-
-#, fuzzy
-#~ msgid "no valid suffix found\n"
-#~ msgstr "%s：文件类型无效"
-
 #~ msgid ""
 #~ "\n"
 #~ "Examples:\n"
@@ -11998,18 +12069,131 @@ msgstr ""
 #~ "  %s /usr/bin/sort       输出\"sort\"。\n"
 #~ "  %s include/stdio.h .h  输出\"stdio\"。\n"
 
+#~ msgid ""
+#~ "Change the group of each FILE to GROUP.\n"
+#~ "With --reference, change the group of each FILE to that of RFILE.\n"
+#~ "\n"
+#~ "  -c, --changes          like verbose but report only when a change is "
+#~ "made\n"
+#~ "      --dereference      affect the referent of each symbolic link (this "
+#~ "is\n"
+#~ "                         the default), rather than the symbolic link "
+#~ "itself\n"
+#~ msgstr ""
+#~ "将�个指定文件的所属组设置为指定值。\n"
+#~ "如果使用 --reference，则将�个文件的所属组设置为与指定�考文件相�。\n"
+#~ "\n"
+#~ "  -c, --changes\t\t\t类似 --verbose，但�在有更改时�显示结果\n"
+#~ "      --dereference\t\t影�符�链接所指示的对象，而�符�链接本身(默认"
+#~ "值)\n"
+
+#~ msgid ""
+#~ "  -f, --silent, --quiet  suppress most error messages\n"
+#~ "      --reference=RFILE  use RFILE's group rather than specifying a\n"
+#~ "                         GROUP value\n"
+#~ "  -R, --recursive        operate on files and directories recursively\n"
+#~ "  -v, --verbose          output a diagnostic for every file processed\n"
+#~ "\n"
+#~ msgstr ""
+#~ "  -f, --silent, --quiet\t\t去除大部份错误信�\n"
+#~ "      --reference=RFILE\t\t使用�考文件的所属组，而�指定值\n"
+#~ "  -R, --recursive\t\t递归处�所有的文件��目录\n"
+#~ "  -v, --verbose\t\t\t为处�的所有文件显示诊断信�\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Change the mode of each FILE to MODE.\n"
+#~ "\n"
+#~ "  -c, --changes           like verbose but report only when a change is "
+#~ "made\n"
+#~ msgstr ""
+#~ "将�个文件的模�更改为指定值。\n"
+#~ "\n"
+#~ "  -c, --changes\t\t类似 --verbose，但�在有更改时�显示结果\n"
+
+#~ msgid ""
+#~ "      --no-preserve-root  do not treat `/' specially (the default)\n"
+#~ "      --preserve-root     fail to operate recursively on `/'\n"
+#~ msgstr ""
+#~ "      --no-preserve-root\t�特殊对待根目录(默认)\n"
+#~ "      --preserve-root\t\t�止对根目录进行递归�作\n"
+
+#~ msgid ""
+#~ "  -f, --silent, --quiet   suppress most error messages\n"
+#~ "  -v, --verbose           output a diagnostic for every file processed\n"
+#~ "      --reference=RFILE   use RFILE's mode instead of MODE values\n"
+#~ "  -R, --recursive         change files and directories recursively\n"
+#~ msgstr ""
+#~ "  -f, --silent, --quiet\t去除大部份的错误信�\n"
+#~ "  -v, --verbose\t\t为处�的所有文件显示诊断信�\n"
+#~ "      --reference=�考文件\t使用指定�考文件的模�，而�自行指定��模�\n"
+#~ "  -R, --recursive\t\t以递归方�更改所有的文件��目录\n"
+
+#~ msgid ""
+#~ "Change the owner and/or group of each FILE to OWNER and/or GROUP.\n"
+#~ "With --reference, change the owner and group of each FILE to those of "
+#~ "RFILE.\n"
+#~ "\n"
+#~ "  -c, --changes          like verbose but report only when a change is "
+#~ "made\n"
+#~ "      --dereference      affect the referent of each symbolic link (this "
+#~ "is\n"
+#~ "                         the default), rather than the symbolic link "
+#~ "itself\n"
+#~ msgstr ""
+#~ "更改�个文件的所有者和/或所属组。\n"
+#~ "当使用 --referebce �数时，将文件的所有者和所属组更改为与指定�考文件相"
+#~ "�。\n"
+#~ "\n"
+#~ "  -c, --changes\t\t\t类似 verbose，但�在有更改时�显示结果\n"
+#~ "      --dereference\t\t�影�的是符�链接所指示的对象，而�符�链接本身\n"
+
+#~ msgid ""
+#~ "  -f, --silent, --quiet  suppress most error messages\n"
+#~ "      --reference=RFILE  use RFILE's owner and group rather than\n"
+#~ "                         specifying OWNER:GROUP values\n"
+#~ "  -R, --recursive        operate on files and directories recursively\n"
+#~ "  -v, --verbose          output a diagnostic for every file processed\n"
+#~ "\n"
+#~ msgstr ""
+#~ "  -f, --silent, --quiet\t去除大部份的错误信�\n"
+#~ "      --reference=�考文件\t使用�考文件的所属组，而�指定值\n"
+#~ "  -R, --recursive\t\t递归处�所有的文件��目录\n"
+#~ "  -v, --verbose\t\t\t为处�的所有文件显示诊断信�\n"
+#~ "\n"
+
+#~ msgid "failed to set additional groups"
+#~ msgstr "设置附加组失败"
+
 #~ msgid "reading %s"
 #~ msgstr "正在读入%s"
 
 #~ msgid "writing %s"
 #~ msgstr "正在写入%s"
 
+#~ msgid "failed to get file system create context"
+#~ msgstr "获�文件系统创建环境失败"
+
 #~ msgid "closing %s"
 #~ msgstr "正在关闭 %s"
 
+#~ msgid "cannot create link %s"
+#~ msgstr "无法创建链接%s"
+
 #~ msgid "accessing %s"
 #~ msgstr "正在访问%s"
 
+#~ msgid ""
+#~ "Display the current time in the given FORMAT, or set the system date.\n"
+#~ "\n"
+#~ "  -d, --date=STRING         display time described by STRING, not `now'\n"
+#~ "  -f, --file=DATEFILE       like --date once for each line of DATEFILE\n"
+#~ msgstr ""
+#~ "以给定的格�显示当�时间，或是设置系统日期。\n"
+#~ "\n"
+#~ "  -d,--date=字符串\t\t显示指定字符串所�述的时间，而�当�时间\n"
+#~ "  -f,--file=日期文件\t\t类似--date，从日期文件中按行读入时间�述\n"
+
 #~ msgid "opening %s"
 #~ msgstr "正在打开%s"
 
@@ -12038,19 +12222,45 @@ msgstr ""
 #~ "\t\t\t当N 为指定数值时计算深度为N；\n"
 #~ "\t\t\t--max-depth=0 等于--summarize\n"
 
-#, fuzzy
+#~ msgid "using arbitrary-precision arithmetic"
+#~ msgstr "使用任�精度�算"
+
+#~ msgid "using single-precision arithmetic"
+#~ msgstr "使用�精度�算"
+
+#~ msgid "%s: cannot lseek back to original position"
+#~ msgstr "%s：lseek 无法回溯到�始�置"
+
+#~ msgid "cannot reposition file pointer for %s"
+#~ msgstr "无法��%s 的文件指针"
+
+#~ msgid "Usage: %s [OPTION]... [USERNAME]\n"
+#~ msgstr "用法：%s [选项]... [用户�]\n"
+
 #~ msgid ""
-#~ "  none, off       never make backups (even if --backup is given)\n"
-#~ "  numbered, t     make numbered backups\n"
-#~ "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
-#~ "  simple, never   always make simple backups\n"
-#~ "\n"
+#~ "WARNING: --preserve_context is deprecated; use --preserve-context instead"
+#~ msgstr "警告：�推�使用--preserve_context，请使用--preserve-context"
+
+#~ msgid ""
+#~ "      --preserve-context  preserve SELinux security context\n"
+#~ "  -Z, --context=CONTEXT  set SELinux security context of files and "
+#~ "directories\n"
+#~ msgstr ""
+#~ "      --preserve-context\t��SELinux 的安全环境\n"
+#~ "  -Z, --context=CONTEXT\t\t设置文件和目录的SELinux 安全环境\n"
+
+#~ msgid ""
+#~ "  -Z, --context=CTX  set the SELinux security context of each NAME to "
+#~ "CTX\n"
 #~ msgstr ""
-#~ "  none, off       �进行备份(�使使用了--backup 选项)\n"
-#~ "  numbered, t     备份文件加上数字进行排�\n"
-#~ "  existing, nil   若有数字的备份文件已�存在则使用数字，�则使用普通方�备"
-#~ "份\n"
-#~ "  simple, never   永远使用普通方�备份\n"
+#~ "  -Z, --context=CTX  \t将�个创建的目录的SELinux 安全环境设置为CTX\n"
+
+#~ msgid ""
+#~ "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
+#~ msgstr "  -Z, --context=CTX \t将对应�称文件的SELinux 安全环境设置为CTX\n"
+
+#~ msgid "failed to redirect stderr to /dev/null"
+#~ msgstr "�定�标准错误到/dev/null 失败"
 
 #~ msgid ""
 #~ "WARNING: --page-increment is deprecated; use --line-increment instead"
@@ -12060,6 +12270,13 @@ msgstr ""
 #~ msgstr "长选项必须用的�数在使用短选项时也是必须的。\n"
 
 #~ msgid ""
+#~ "  -A, --address-radix=RADIX   decide how file offsets are printed\n"
+#~ "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
+#~ msgstr ""
+#~ "  -A, --address-radix=�始�移\t设置�显示的文件的�始�移�\n"
+#~ "  -j, --skip-bytes=字节数\t略过指定字节数的输入内容\n"
+
+#~ msgid ""
 #~ "\n"
 #~ "RADIX is d for decimal, o for octal, x for hexadecimal or n for none.\n"
 #~ "BYTES is hexadecimal with 0x or 0X prefix, and may have a multiplier "
@@ -12087,9 +12304,72 @@ msgstr ""
 #~ "�带数字的--string 选项代表3；�带数字的--width 选项代表32。\n"
 #~ "默认情况下od 使用 -A o -t oS -w16 �数。\n"
 
+#~ msgid ""
+#~ "\n"
+#~ "With no FILE or if FILE is -, read Standard Input.  `-F /' by default.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "如果�指定文件，或者文件为 \"-\"，程�将从标准输入读�数�。默认时��\n"
+#~ "\"-F /\"选项。\n"
+
 #~ msgid "Usage: %s [OPTION]... FILE\n"
 #~ msgstr "用法：%s [选项]... 文件\n"
 
+#~ msgid "cannot remove directory: %s"
+#~ msgstr "无法删除目录：%s"
+
+#~ msgid ""
+#~ "Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
+#~ "  or:  %s LONG-OPTION\n"
+#~ msgstr ""
+#~ "用法：%s [短选项]... 用户 命令 [�数]...\n"
+#~ "　或：%s 长选项\n"
+
+#~ msgid ""
+#~ "Drop any supplemental groups, assume the user-ID and group-ID of the "
+#~ "specified\n"
+#~ "USER (numeric ID or user name), and run COMMAND with any specified "
+#~ "ARGUMENTs.\n"
+#~ "Exit with status 111 if unable to assume the required user and group ID.\n"
+#~ "Otherwise, exit with the exit status of COMMAND.\n"
+#~ "This program is useful only when run by root (user ID zero).\n"
+#~ "\n"
+#~ msgstr ""
+#~ "使用指定的用户(数字ID 或者用户�) 替代原有用户ID 和组ID �行连��数的指定"
+#~ "命令\n"
+#~ "如果无法指定请求的用户和组ID 则以状��111 退出，�则以所执行命令的终止状"
+#~ "��退出。\n"
+#~ "此程�通常仅在使用root �行时有用 (root 的用户ID 为0)。\n"
+
+#~ msgid ""
+#~ "  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, "
+#~ "and\n"
+#~ "                    (if specified) supplemental group IDs to GID1, ...\n"
+#~ msgstr ""
+#~ "  -g GID[,GID1...]\t将主组ID 设置为指定的数字GID，如果指定了GID1，\n"
+#~ "\t\t\t\t则�时添加这些附加组ID，...\n"
+
+#~ msgid "unknown user-ID: %s"
+#~ msgstr "未知的用户ID：%s"
+
+#~ msgid "to use user-ID %s you need to use -g too"
+#~ msgstr "您应当将-g 与用户ID %s 一起使用"
+
+#~ msgid "cannot set group-ID to %lu"
+#~ msgstr "无法设置组ID 为%lu"
+
+#~ msgid "cannot set user-ID to %lu"
+#~ msgstr "无法设置用户ID 为%lu"
+
+#~ msgid "dup2 failed"
+#~ msgstr "�制已打开文件�述符失败(dup2)"
+
+#~ msgid "couldn't execute %s"
+#~ msgstr "无法执行%s"
+
+#~ msgid "couldn't execute %s -d"
+#~ msgstr "无法执行%s -d"
+
 #~ msgid "Password:"
 #~ msgstr "密�："
 
@@ -12102,9 +12382,6 @@ msgstr ""
 #~ msgid "cannot set group id"
 #~ msgstr "无法设置组ID"
 
-#~ msgid "cannot set user id"
-#~ msgstr "无法设置用户ID"
-
 #~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n"
 #~ msgstr "用法：%s [选项]... [-] [用户 [�数]... ]\n"
 
@@ -12147,109 +12424,6 @@ msgstr ""
 #~ msgid "warning: cannot change directory to %s"
 #~ msgstr "警告：无法切�到目录%s"
 
-#, fuzzy
-#~ msgid ""
-#~ "Change the group of each FILE to GROUP.\n"
-#~ "With --reference, change the group of each FILE to that of RFILE.\n"
-#~ "\n"
-#~ "  -c, --changes          like verbose but report only when a change is "
-#~ "made\n"
-#~ "  -f, --silent, --quiet  suppress most error messages\n"
-#~ "  -v, --verbose          output a diagnostic for every file processed\n"
-#~ msgstr ""
-#~ "将�个指定文件的所属组设置为指定值。\n"
-#~ "如果使用 --reference，则将�个文件的所属组设置为与指定�考文件相�。\n"
-#~ "\n"
-#~ "  -c, --changes\t\t\t类似 --verbose，但�在有更改时�显示结果\n"
-#~ "      --dereference\t\t影�符�链接所指示的对象，而�符�链接本身(默认"
-#~ "值)\n"
-
-#~ msgid ""
-#~ "      --no-preserve-root  do not treat `/' specially (the default)\n"
-#~ "      --preserve-root     fail to operate recursively on `/'\n"
-#~ msgstr ""
-#~ "      --no-preserve-root\t�特殊对待根目录(默认)\n"
-#~ "      --preserve-root\t\t�止对根目录进行递归�作\n"
-
-#~ msgid ""
-#~ "  -f, --silent, --quiet  suppress most error messages\n"
-#~ "      --reference=RFILE  use RFILE's group rather than specifying a\n"
-#~ "                         GROUP value\n"
-#~ "  -R, --recursive        operate on files and directories recursively\n"
-#~ "  -v, --verbose          output a diagnostic for every file processed\n"
-#~ "\n"
-#~ msgstr ""
-#~ "  -f, --silent, --quiet\t\t去除大部份错误信�\n"
-#~ "      --reference=RFILE\t\t使用�考文件的所属组，而�指定值\n"
-#~ "  -R, --recursive\t\t递归处�所有的文件��目录\n"
-#~ "  -v, --verbose\t\t\t为处�的所有文件显示诊断信�\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Change the mode of each FILE to MODE.\n"
-#~ "\n"
-#~ "  -c, --changes           like verbose but report only when a change is "
-#~ "made\n"
-#~ msgstr ""
-#~ "将�个文件的模�更改为指定值。\n"
-#~ "\n"
-#~ "  -c, --changes\t\t类似 --verbose，但�在有更改时�显示结果\n"
-
-#~ msgid ""
-#~ "  -f, --silent, --quiet   suppress most error messages\n"
-#~ "  -v, --verbose           output a diagnostic for every file processed\n"
-#~ "      --reference=RFILE   use RFILE's mode instead of MODE values\n"
-#~ "  -R, --recursive         change files and directories recursively\n"
-#~ msgstr ""
-#~ "  -f, --silent, --quiet\t去除大部份的错误信�\n"
-#~ "  -v, --verbose\t\t为处�的所有文件显示诊断信�\n"
-#~ "      --reference=�考文件\t使用指定�考文件的模�，而�自行指定��模�\n"
-#~ "  -R, --recursive\t\t以递归方�更改所有的文件��目录\n"
-
-#~ msgid ""
-#~ "Change the owner and/or group of each FILE to OWNER and/or GROUP.\n"
-#~ "With --reference, change the owner and group of each FILE to those of "
-#~ "RFILE.\n"
-#~ "\n"
-#~ "  -c, --changes          like verbose but report only when a change is "
-#~ "made\n"
-#~ "      --dereference      affect the referent of each symbolic link (this "
-#~ "is\n"
-#~ "                         the default), rather than the symbolic link "
-#~ "itself\n"
-#~ msgstr ""
-#~ "更改�个文件的所有者和/或所属组。\n"
-#~ "当使用 --referebce �数时，将文件的所有者和所属组更改为与指定�考文件相"
-#~ "�。\n"
-#~ "\n"
-#~ "  -c, --changes\t\t\t类似 verbose，但�在有更改时�显示结果\n"
-#~ "      --dereference\t\t�影�的是符�链接所指示的对象，而�符�链接本身\n"
-
-#~ msgid ""
-#~ "  -f, --silent, --quiet  suppress most error messages\n"
-#~ "      --reference=RFILE  use RFILE's owner and group rather than\n"
-#~ "                         specifying OWNER:GROUP values\n"
-#~ "  -R, --recursive        operate on files and directories recursively\n"
-#~ "  -v, --verbose          output a diagnostic for every file processed\n"
-#~ "\n"
-#~ msgstr ""
-#~ "  -f, --silent, --quiet\t去除大部份的错误信�\n"
-#~ "      --reference=�考文件\t使用�考文件的所属组，而�指定值\n"
-#~ "  -R, --recursive\t\t递归处�所有的文件��目录\n"
-#~ "  -v, --verbose\t\t\t为处�的所有文件显示诊断信�\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Display the current time in the given FORMAT, or set the system date.\n"
-#~ "\n"
-#~ "  -d, --date=STRING         display time described by STRING, not `now'\n"
-#~ "  -f, --file=DATEFILE       like --date once for each line of DATEFILE\n"
-#~ msgstr ""
-#~ "以给定的格�显示当�时间，或是设置系统日期。\n"
-#~ "\n"
-#~ "  -d,--date=字符串\t\t显示指定字符串所�述的时间，而�当�时间\n"
-#~ "  -f,--file=日期文件\t\t类似--date，从日期文件中按行读入时间�述\n"
-
 #~ msgid ""
 #~ "\n"
 #~ "SIZE may be (or may be an integer optionally followed by) one of "
@@ -12261,12 +12435,34 @@ msgstr ""
 #~ "SIZE �以是一个�选的整数，��跟�以下��中的一个：\n"
 #~ "KB 1000，K 1024，MB 1000*1000，M 1024*1024，还有 G�T�P�E�Z�Y。\n"
 
-#~ msgid "cannot create link %s"
-#~ msgstr "无法创建链接%s"
+#~ msgid ""
+#~ "\n"
+#~ "Report %s bugs to %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "请�%2$s 报告%1$s 的错误\n"
+
+#~ msgid "warning: --retry is useful mainly when following by name"
+#~ msgstr "警告：--retry �数需�在��附加�称�使用"
 
 #~ msgid ""
-#~ "WARNING: --preserve_context is deprecated; use --preserve-context instead"
-#~ msgstr "警告：�推�使用--preserve_context，请使用--preserve-context"
+#~ "  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
+#~ "                        delimit-method={none(default),prepend,separate}\n"
+#~ "                        Delimiting is done with blank lines\n"
+#~ "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+#~ "  -i, --ignore-case     ignore differences in case when comparing\n"
+#~ "  -s, --skip-chars=N    avoid comparing the first N characters\n"
+#~ "  -u, --unique          only print unique lines\n"
+#~ "  -z, --zero-terminated  end lines with 0 byte, not newline\n"
+#~ msgstr ""
+#~ "  -D, --all-repeated[=delimit-method\t显示所有��的行\n"
+#~ "\t\t\tdelimit-method={none(default),prepend,separate}\n"
+#~ "\t\t\t以空行为界�\n"
+#~ "  -f, --skip-fields=N\t比较时跳过�N 列\n"
+#~ "  -i, --ignore-case\t在比较的时候�区分大�写\n"
+#~ "  -s, --skip-chars=N\t比较时跳过�N 个字符\n"
+#~ "  -u, --unique\t\t�显示唯一的行\n"
+#~ "  -z, --zero-terminated\t使用'\\0'作为行结�符，而�是新�行\n"
 
 #~ msgid "truncating %s"
 #~ msgstr "正在截断%s"
@@ -12469,9 +12665,6 @@ msgstr ""
 #~ msgid "FATAL: cannot return to .. from %s"
 #~ msgstr "致命错误：�能回到%s 的上级目录(..)"
 
-#~ msgid "cannot remove %s directory %s"
-#~ msgstr "无法删除%s 目录%s"
-
 #~ msgid "cannot remove root directory %s"
 #~ msgstr "无法删除根目录%s"
 
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index f8fb1357..af3ace4e 100644
--- a/po/zh_TW.gmo
+++ b/po/zh_TW.gmo
diff --git a/po/zh_TW.po b/po/zh_TW.po
index fb56c53f..45a63902 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: coreutils 5.3.0\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2013-02-14 15:56+0000\n"
+"POT-Creation-Date: 2014-07-18 20:17+0100\n"
 "PO-Revision-Date: 2005-07-02 04:13+0800\n"
 "Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -42,77 +42,124 @@ msgstr "有效的�數為："
 msgid "error closing file"
 msgstr "正在關閉輸入檔 %s"
 
-#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130
-#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286
-#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297
-#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925
-#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978
-#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307
-#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
+#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131
+#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286
+#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338
+#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793
+#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362
+#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939
 #: src/unexpand.c:426 src/unexpand.c:442
 #, c-format
 msgid "write error"
 msgstr "寫入時發生錯誤"
 
-#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617
+#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751
 #, fuzzy, c-format
 msgid "preserving permissions for %s"
 msgstr "正在更改 %s 的權�"
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "�明的系統錯誤"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular empty file"
 msgstr "普通空白檔案"
 
-#: lib/file-type.c:38
+#: lib/file-type.c:40
 msgid "regular file"
 msgstr "普通檔案"
 
-#: lib/file-type.c:41
+#: lib/file-type.c:43
 msgid "directory"
 msgstr "目錄"
 
-#: lib/file-type.c:44
-msgid "block special file"
-msgstr "�塊特殊檔案"
-
-#: lib/file-type.c:47
-msgid "character special file"
-msgstr "字元特殊檔案"
-
-#: lib/file-type.c:50
-msgid "fifo"
-msgstr "fifo"
-
-#: lib/file-type.c:53
+#: lib/file-type.c:46
 msgid "symbolic link"
 msgstr "符號連�"
 
-#: lib/file-type.c:56
-msgid "socket"
-msgstr "socket"
-
-#: lib/file-type.c:59
+#: lib/file-type.c:52
 msgid "message queue"
 msgstr "訊�佇列"
 
-#: lib/file-type.c:62
+#: lib/file-type.c:55
 msgid "semaphore"
 msgstr "semaphore"
 
-#: lib/file-type.c:65
+#: lib/file-type.c:58
 msgid "shared memory object"
 msgstr "共用記憶體物件"
 
-#: lib/file-type.c:68
+#: lib/file-type.c:61
 #, fuzzy
 msgid "typed memory object"
 msgstr "共用記憶體物件"
 
-#: lib/file-type.c:70
+#: lib/file-type.c:66
+msgid "block special file"
+msgstr "�塊特殊檔案"
+
+#: lib/file-type.c:69
+msgid "character special file"
+msgstr "字元特殊檔案"
+
+#: lib/file-type.c:72
+msgid "contiguous data"
+msgstr ""
+
+#: lib/file-type.c:75
+msgid "fifo"
+msgstr "fifo"
+
+#: lib/file-type.c:78
+msgid "door"
+msgstr ""
+
+#: lib/file-type.c:81
+#, fuzzy
+msgid "multiplexed block special file"
+msgstr "�塊特殊檔案"
+
+#: lib/file-type.c:84
+#, fuzzy
+msgid "multiplexed character special file"
+msgstr "字元特殊檔案"
+
+#: lib/file-type.c:87
+msgid "multiplexed file"
+msgstr ""
+
+#: lib/file-type.c:90
+#, fuzzy
+msgid "named file"
+msgstr "�正常的檔案"
+
+#: lib/file-type.c:93
+#, fuzzy
+msgid "network special file"
+msgstr "�塊特殊檔案"
+
+#: lib/file-type.c:96
+msgid "migrated file with data"
+msgstr ""
+
+#: lib/file-type.c:99
+msgid "migrated file without data"
+msgstr ""
+
+#: lib/file-type.c:102
+msgid "port"
+msgstr ""
+
+#: lib/file-type.c:105
+msgid "socket"
+msgstr "socket"
+
+#: lib/file-type.c:108
+msgid "whiteout"
+msgstr ""
+
+#: lib/file-type.c:110
 msgid "weird file"
 msgstr "�正常的檔案"
 
@@ -252,18 +299,18 @@ msgstr "%s：�項‘-W %s’�����數使用\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s：�項‘%s’需��數\n"
 
-#: lib/mkdir-p.c:196 src/install.c:484
+#: lib/mkdir-p.c:181 src/install.c:487
 #, c-format
 msgid "cannot change permissions of %s"
 msgstr "無法更改%s的權�"
 
-#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722
+#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735
 #, c-format
 msgid "cannot create directory %s"
 msgstr "無法建立目錄%s"
 
-#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219
-#: src/split.c:929 src/tac.c:434
+#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231
+#: src/tac.c:434
 #, c-format
 msgid "memory exhausted"
 msgstr "記憶體耗盡"
@@ -387,7 +434,7 @@ msgstr "在正��算��尋時發生錯誤"
 msgid "Unmatched ) or \\)"
 msgstr ""
 
-#: lib/regcomp.c:704
+#: lib/regcomp.c:707
 #, fuzzy
 msgid "No previous regular expression"
 msgstr "在正��算��尋時發生錯誤"
@@ -413,7 +460,7 @@ msgstr ""
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: lib/rpmatch.c:147
+#: lib/rpmatch.c:150
 msgid "^[yY]"
 msgstr "^[yY]"
 
@@ -423,11 +470,11 @@ msgstr "^[yY]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: lib/rpmatch.c:160
+#: lib/rpmatch.c:163
 msgid "^[nN]"
 msgstr "^[nN]"
 
-#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516
+#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523
 #, c-format
 msgid "setting permissions for %s"
 msgstr "正在更改 %s 的權�"
@@ -574,18 +621,6 @@ msgstr "開啟時發生錯誤"
 msgid "Resource lost"
 msgstr ""
 
-#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264
-#: lib/spawn-pipe.c:267
-#, fuzzy, c-format
-msgid "cannot create pipe"
-msgstr "無法建立 FIFO %s"
-
-#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282
-#: lib/wait-process.c:356
-#, fuzzy, c-format
-msgid "%s subprocess failed"
-msgstr "關閉時發生錯誤"
-
 #: lib/strsignal.c:114
 #, c-format
 msgid "Real-time signal %d"
@@ -790,7 +825,7 @@ msgstr ""
 "\n"
 "請� <%s> 回報錯誤。\n"
 
-#: lib/version-etc.c:251 src/system.h:573
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr ""
@@ -800,30 +835,10 @@ msgstr ""
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr ""
 
-#: lib/version-etc.c:256 src/system.h:574
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr ""
 
-#: lib/w32spawn.h:43
-#, fuzzy, c-format
-msgid "_open_osfhandle failed"
-msgstr "開啟時發生錯誤"
-
-#: lib/w32spawn.h:84
-#, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr ""
-
-#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr ""
-
-#: lib/wait-process.c:274 lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-msgstr ""
-
 #: lib/xfreopen.c:35
 msgid "stdin"
 msgstr ""
@@ -846,7 +861,7 @@ msgstr "�明的系統錯誤"
 msgid "failed to reopen %s with mode %s"
 msgstr "無法�留%s的時間"
 
-#: lib/xmemcoll.c:39 src/expr.c:886
+#: lib/xmemcoll.c:39 src/expr.c:878
 #, c-format
 msgid "string comparison failed"
 msgstr "字串比較出�錯誤"
@@ -887,15 +902,11 @@ msgid "Simon Josefsson"
 msgstr ""
 
 #: src/base64.c:60
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
 "Base64 encode or decode FILE, or standard input, to standard output.\n"
 msgstr ""
-"用法：%s [�項] [檔案]...\n"
-"  或：%s [�項] --check [檔案]\n"
-"�出或檢查 %s (%d �元) 總和檢查值。\n"
-"如果沒有指定 <檔案> 或 <檔案> 是 -，則由標準輸入讀�資料。\n"
 
 #: src/base64.c:67
 msgid ""
@@ -907,7 +918,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70
+#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -924,48 +935,47 @@ msgid ""
 "from any other non-alphabet bytes in the encoded stream.\n"
 msgstr ""
 
-#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437
-#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74
-#: src/tee.c:204 src/tr.c:1644
+#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465
+#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570
+#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644
 #, c-format
 msgid "read error"
 msgstr "讀�時發生錯誤"
 
-#: src/base64.c:230
+#: src/base64.c:231
 #, fuzzy, c-format
 msgid "invalid input"
 msgstr "輸入旗標無效：%s"
 
-#: src/base64.c:267
+#: src/base64.c:268
 #, fuzzy, c-format
 msgid "invalid wrap size: %s"
 msgstr "無效的類型‘%s’"
 
-#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605
-#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74
-#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961
-#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449
-#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319
-#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797
-#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470
-#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827
-#: src/whoami.c:79
+#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612
+#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74
+#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968
+#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463
+#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507
+#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554
+#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81
+#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79
 #, c-format
 msgid "extra operand %s"
 msgstr "出�多餘的�數 %s"
 
-#: src/base64.c:318 src/cat.c:781
+#: src/base64.c:319 src/cat.c:781
 #, c-format
 msgid "closing standard input"
 msgstr "關閉標準輸入"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36
-#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39
+#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39
 #: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33
-#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39
-#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33
-#: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
+#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41
+#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35
+#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53
 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63
 #: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59
 #: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60
@@ -996,8 +1006,8 @@ msgstr ""
 #: src/basename.c:60
 msgid ""
 "  -a, --multiple       support multiple arguments and treat each as a NAME\n"
-"  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n"
-"  -z, --zero           separate output with NUL rather than newline\n"
+"  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n"
+"  -z, --zero           end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/basename.c:67
@@ -1011,33 +1021,32 @@ msgid ""
 "  %s -a any/str1 any/str2   -> \"str1\" followed by \"str2\"\n"
 msgstr ""
 
-#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526
-#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371
-#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77
-#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111
+#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529
+#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399
+#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77
+#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111
 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236
-#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137
-#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782
-#: src/unlink.c:75
+#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561
+#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75
 #, c-format
 msgid "missing operand"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110
-#: src/split.c:49
+#: src/split.c:48
 msgid "Torbjorn Granlund"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50
+#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49
 #: src/tee.c:35 src/uniq.c:41
 #, fuzzy
 msgid "Richard M. Stallman"
 msgstr "Torbjorn Granlund � Richard M. Stallman"
 
-#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105
-#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
+#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105
+#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58
 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
@@ -1091,7 +1100,7 @@ msgstr ""
 msgid "cannot do ioctl on %s"
 msgstr "無法�‘%s’執行輸出入控制 (ioctl)"
 
-#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86
+#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86
 #, c-format
 msgid "standard output"
 msgstr "標準輸出"
@@ -1108,14 +1117,14 @@ msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58
-#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33
-#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36
-#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34
-#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33
+#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33
+#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37
+#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31
+#: src/tail.c:72 src/tr.c:37 src/true.c:33
 msgid "Jim Meyering"
 msgstr ""
 
-#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238
+#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237
 #, fuzzy, c-format
 msgid "failed to create security context: %s"
 msgstr "無法更改 %s 的�有者\n"
@@ -1125,8 +1134,8 @@ msgstr "無法更改 %s 的�有者\n"
 msgid "failed to set %s security context component to %s"
 msgstr ""
 
-#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221
-#: src/stat.c:702
+#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221
+#: src/stat.c:730
 #, fuzzy, c-format
 msgid "failed to get security context of %s"
 msgstr "無法�得 %s 的屬性"
@@ -1136,18 +1145,18 @@ msgstr "無法�得 %s 的屬性"
 msgid "can't apply partial context to unlabeled file %s"
 msgstr ""
 
-#: src/chcon.c:193
+#: src/chcon.c:190
 #, fuzzy, c-format
 msgid "failed to change context of %s to %s"
 msgstr "無法將 %s 的�有者更改為 %s\n"
 
-#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581
-#: src/du.c:457 src/ls.c:2981
+#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606
+#: src/du.c:472 src/ls.c:3036
 #, c-format
 msgid "cannot access %s"
 msgstr "無法存� %s"
 
-#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437
+#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452
 #, c-format
 msgid "cannot read directory %s"
 msgstr "無法讀�目錄 %s 的內容"
@@ -1157,13 +1166,14 @@ msgstr "無法讀�目錄 %s 的內容"
 msgid "changing security context of %s\n"
 msgstr "正在更改 %s 的權�"
 
-#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562
+#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567
+#: src/selinux.c:323
 #, c-format
 msgid "fts_read failed"
 msgstr "fts_read 失敗"
 
-#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642
-#: src/remove.c:576
+#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654
+#: src/remove.c:581 src/selinux.c:334
 #, fuzzy, c-format
 msgid "fts_close failed"
 msgstr "關閉時發生錯誤"
@@ -1181,7 +1191,7 @@ msgstr ""
 
 #: src/chcon.c:357
 msgid ""
-"Change the security context of each FILE to CONTEXT.\n"
+"Change the SELinux security context of each FILE to CONTEXT.\n"
 "With --reference, change the security context of each FILE to that of "
 "RFILE.\n"
 msgstr ""
@@ -1202,7 +1212,7 @@ msgid ""
 "  -l, --range=RANGE      set range RANGE in the target security context\n"
 msgstr ""
 
-#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:387 src/chown.c:110
+#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110
 #, fuzzy
 msgid ""
 "      --no-preserve-root  do not treat '/' specially (the default)\n"
@@ -1217,16 +1227,11 @@ msgstr ""
 "  -v, --verbose         詳細顯示進行的步驟\n"
 
 #: src/chcon.c:379
-#, fuzzy
 msgid ""
 "      --reference=RFILE  use RFILE's security context rather than "
 "specifying\n"
 "                         a CONTEXT value\n"
 msgstr ""
-"  -f, --silent, --quiet  去除大部份的錯誤訊�\n"
-"      --reference=�考檔 使用<�考檔>的所屬群組，而�自行指定<群組>\n"
-"  -R, --recursive        �時處�目錄之下的所有的檔案��目錄\n"
-"  -v, --verbose          處��個檔案時都會顯示訊�\n"
 
 #: src/chcon.c:383 src/chgrp.c:140 src/chown.c:118
 msgid "  -R, --recursive        operate on files and directories recursively\n"
@@ -1251,36 +1256,37 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267
+#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266
 #, c-format
 msgid "-R --dereference requires either -H or -L"
 msgstr "�時使用 -R --dereference 時還需� -H 或 -L �項"
 
-#: src/chcon.c:524
+#: src/chcon.c:522
 #, c-format
 msgid "-R -h requires -P"
 msgstr "�時使用 -R -h 時還需� -P �項"
 
-#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282
-#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79
-#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785
+#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281
+#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79
+#: src/mknod.c:172 src/tr.c:1785
 #, c-format
 msgid "missing operand after %s"
 msgstr "%s 後�缺少了�數"
 
-#: src/chcon.c:562 src/runcon.c:251
+#: src/chcon.c:560 src/runcon.c:250
 #, fuzzy, c-format
 msgid "invalid context: %s"
 msgstr "權�無效: %s"
 
-#: src/chcon.c:569
+#: src/chcon.c:566
 #, c-format
 msgid "conflicting security context specifiers given"
 msgstr ""
 
-#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536
-#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491
-#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347
+#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539
+#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168
+#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276
+#: src/rm.c:331 src/touch.c:347
 #, c-format
 msgid "failed to get attributes of %s"
 msgstr "無法�得 %s 的屬性"
@@ -1306,7 +1312,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/chgrp.c:118 src/chmod.c:382 src/chown.c:89
+#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89
 msgid ""
 "  -c, --changes          like verbose but report only when a change is made\n"
 "  -f, --silent, --quiet  suppress most error messages\n"
@@ -1337,47 +1343,47 @@ msgid ""
 "  %s -hR staff /u  Change the group of /u and subfiles to \"staff\".\n"
 msgstr ""
 
-#: src/chmod.c:126
+#: src/chmod.c:127
 #, c-format
 msgid "getting new attributes of %s"
 msgstr "正在檢查 %s 的最新屬性"
 
-#: src/chmod.c:149 src/chown-core.c:147
+#: src/chmod.c:151 src/chown-core.c:147
 #, c-format
 msgid "neither symbolic link %s nor referent has been changed\n"
 msgstr "符號�� %s 和該��所指示的�象都沒有更改\n"
 
-#: src/chmod.c:163
+#: src/chmod.c:165
 #, fuzzy, c-format
 msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n"
 msgstr "%s 的權�模�已更改為 %04lo (%s)\n"
 
-#: src/chmod.c:166
+#: src/chmod.c:168
 #, fuzzy, c-format
 msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n"
 msgstr "無法將 %s 的權�模�更改為 %04lo (%s)\n"
 
-#: src/chmod.c:169
+#: src/chmod.c:171
 #, c-format
 msgid "mode of %s retained as %04lo (%s)\n"
 msgstr "%s 的權�模��留為 %04lo (%s)\n"
 
-#: src/chmod.c:236
+#: src/chmod.c:238
 #, fuzzy, c-format
 msgid "cannot operate on dangling symlink %s"
 msgstr "無法建立符號�� %s"
 
-#: src/chmod.c:276
+#: src/chmod.c:278
 #, c-format
 msgid "changing permissions of %s"
 msgstr "正在更改 %s 的權�"
 
-#: src/chmod.c:311
+#: src/chmod.c:314
 #, fuzzy, c-format
 msgid "%s: new permissions are %s, not %s"
 msgstr "正在更改 %s 的權�"
 
-#: src/chmod.c:371
+#: src/chmod.c:374
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -1388,38 +1394,33 @@ msgstr ""
 "  或：%s [�項]... 八進�模� 檔案...\n"
 "  或：%s [�項]... --reference=�考檔 檔案...\n"
 
-#: src/chmod.c:377
+#: src/chmod.c:380
 msgid ""
 "Change the mode of each FILE to MODE.\n"
 "With --reference, change the mode of each FILE to that of RFILE.\n"
 "\n"
 msgstr ""
 
-#: src/chmod.c:391
-#, fuzzy
+#: src/chmod.c:394
 msgid "      --reference=RFILE  use RFILE's mode instead of MODE values\n"
 msgstr ""
-"  -f, --silent, --quiet  去除大部份的錯誤訊�\n"
-"      --reference=�考檔 使用<�考檔>的所屬群組，而�自行指定<群組>\n"
-"  -R, --recursive        �時處�目錄之下的所有的檔案��目錄\n"
-"  -v, --verbose          處��個檔案時都會顯示訊�\n"
 
-#: src/chmod.c:394
+#: src/chmod.c:397
 msgid "  -R, --recursive        change files and directories recursively\n"
 msgstr ""
 
-#: src/chmod.c:399
+#: src/chmod.c:402
 msgid ""
 "\n"
 "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n"
 msgstr ""
 
-#: src/chmod.c:513
+#: src/chmod.c:516
 #, c-format
 msgid "cannot combine mode and --reference options"
 msgstr "如果自行指定權�，���時�� --reference �項一起使用"
 
-#: src/chmod.c:544
+#: src/chmod.c:547
 #, c-format
 msgid "invalid mode: %s"
 msgstr "權�無效: %s"
@@ -1557,26 +1558,21 @@ msgid ""
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/chroot.c:34
+#: src/chroot.c:38
 msgid "Roland McGrath"
 msgstr ""
 
-#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120
+#: src/chroot.c:135 src/install.c:583
 #, c-format
 msgid "invalid group %s"
 msgstr "群組 %s 無效"
 
-#: src/chroot.c:109
+#: src/chroot.c:150
 #, fuzzy, c-format
 msgid "invalid group list %s"
 msgstr "群組 %s 無效"
 
-#: src/chroot.c:117
-#, fuzzy, c-format
-msgid "failed to set additional groups"
-msgstr "無法�得%s的屬性"
-
-#: src/chroot.c:132
+#: src/chroot.c:186
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n"
@@ -1585,7 +1581,7 @@ msgstr ""
 "用法：%s 根目錄 [指令...]\n"
 "  或：%s �項\n"
 
-#: src/chroot.c:137
+#: src/chroot.c:191
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
@@ -1593,40 +1589,54 @@ msgstr ""
 "以新的目錄作為 <根目錄> 並執行 <指令>。\n"
 "\n"
 
-#: src/chroot.c:142
+#: src/chroot.c:196
 msgid ""
 "  --userspec=USER:GROUP  specify user and group (ID or name) to use\n"
 "  --groups=G_LIST        specify supplementary groups as g1,g2,..,gN\n"
 msgstr ""
 
-#: src/chroot.c:149
+#: src/chroot.c:203
 msgid ""
 "\n"
 "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n"
 msgstr ""
 
-#: src/chroot.c:202
+#: src/chroot.c:311
 #, c-format
 msgid "cannot change root directory to %s"
 msgstr "無法以 %s 作為根目錄"
 
-#: src/chroot.c:206
+#: src/chroot.c:315
 #, c-format
 msgid "cannot chdir to root directory"
 msgstr ""
 
-#: src/chroot.c:247
+#: src/chroot.c:358
+#, c-format
+msgid "no group specified for unknown uid: %d"
+msgstr ""
+
+#: src/chroot.c:383
+#, fuzzy, c-format
+msgid "failed to get supplemental groups"
+msgstr "無法改變所屬群組至沒有�稱的群組"
+
+#: src/chroot.c:395
+#, fuzzy, c-format
+msgid "failed to %s supplemental groups"
+msgstr "無法改變所屬群組至沒有�稱的群組"
+
+#: src/chroot.c:402
 #, fuzzy, c-format
 msgid "failed to set group-ID"
 msgstr "無法�得%s的屬性"
 
-#: src/chroot.c:253
+#: src/chroot.c:405
 #, fuzzy, c-format
 msgid "failed to set user-ID"
 msgstr "無法�得%s的屬性"
 
-#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365
-#: src/timeout.c:454
+#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457
 #, fuzzy, c-format
 msgid "failed to run command %s"
 msgstr "無法執行 %s 指令"
@@ -1658,7 +1668,7 @@ msgstr ""
 "�出�個 <檔案> 的 CRC 總和檢查值��元組總數。\n"
 "\n"
 
-#: src/comm.c:103 src/join.c:187
+#: src/comm.c:103 src/join.c:191
 #, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr "用法：%s [�項]... 檔案1 檔案2\n"
@@ -1733,294 +1743,327 @@ msgstr "正在關閉輸出檔%s"
 msgid "empty %s not allowed"
 msgstr "使用 -c 時��許指定�外的�數‘%s’"
 
-#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148
-#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699
-#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548
-#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782
-#: src/tail.c:1812 src/uniq.c:394
+#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148
+#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699
+#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552
+#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840
+#: src/tail.c:1870 src/uniq.c:464
 #, c-format
 msgid "error reading %s"
 msgstr "讀� %s 時發生錯誤"
 
-#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425
+#: src/copy.c:205 src/copy.c:356 src/copy.c:367
 #, c-format
 msgid "cannot lseek %s"
 msgstr "無法 lseek %s"
 
-#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151
+#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390
 #, c-format
 msgid "error writing %s"
 msgstr "寫入 %s 時發生錯誤"
 
-#: src/copy.c:313
+#: src/copy.c:323
 #, fuzzy, c-format
 msgid "%s: failed to get extents info"
 msgstr "%s：無法移除"
 
-#: src/copy.c:373
+#: src/copy.c:383
 #, fuzzy, c-format
 msgid "%s: write failed"
 msgstr "寫入時發生錯誤"
 
-#: src/copy.c:442 src/copy.c:1083
+#: src/copy.c:452 src/copy.c:1189
 #, fuzzy, c-format
 msgid "failed to extend %s"
 msgstr "無法�留%s的時間"
 
-#: src/copy.c:662
+#: src/copy.c:687
 #, fuzzy, c-format
 msgid "clearing permissions for %s"
 msgstr "正在更改 %s 的權�"
 
-#: src/copy.c:697 src/copy.c:2480 src/cp.c:329
+#: src/copy.c:722 src/copy.c:2600 src/cp.c:336
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "無法�留%s的�有者�所屬群組"
 
-#: src/copy.c:723
+#: src/copy.c:748
 #, c-format
 msgid "failed to lookup file %s"
 msgstr ""
 
-#: src/copy.c:728
+#: src/copy.c:753
 #, fuzzy, c-format
 msgid "failed to preserve authorship for %s"
 msgstr "無法�留%s的著作者"
 
-#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854
-#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678
+#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279
+#: src/mkfifo.c:143 src/mknod.c:199
+#, fuzzy, c-format
+msgid "failed to set default file creation context to %s"
+msgstr "無法�得 %s 的屬性"
+
+#: src/copy.c:820
+#, fuzzy, c-format
+msgid "failed to set default file creation context for %s"
+msgstr "無法�得 %s 的屬性"
+
+#: src/copy.c:846
+#, fuzzy, c-format
+msgid "failed to set the security context of %s"
+msgstr "無法�得 %s 的屬性"
+
+#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855
+#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678
 #, c-format
 msgid "cannot open %s for reading"
 msgstr "無法開啟 %s 來讀�資料"
 
-#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261
-#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140
+#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300
+#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140
 #, c-format
 msgid "cannot fstat %s"
 msgstr "無法 fstat %s"
 
-#: src/copy.c:820
+#: src/copy.c:935
 #, c-format
 msgid "skipping file %s, as it was replaced while being copied"
 msgstr "略�檔案 %s，因為準備複製時它已被其它檔案�代"
 
-#: src/copy.c:850
-#, c-format
-msgid "failed to get file system create context"
-msgstr ""
-
-#: src/copy.c:864
-#, fuzzy, c-format
-msgid "failed to set the security context of %s to %s"
-msgstr "無法將 %s 的所屬群組更改為 %s\n"
-
-#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314
-#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431
+#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330
+#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432
 #, c-format
 msgid "cannot remove %s"
 msgstr "無法移除 %s"
 
-#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945
-#: src/remove.c:375
+#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073
+#: src/remove.c:376
 #, c-format
 msgid "removed %s\n"
 msgstr "已移除%s\n"
 
-#: src/copy.c:926
+#: src/copy.c:1032
 #, c-format
 msgid "not writing through dangling symlink %s"
 msgstr ""
 
-#: src/copy.c:964
+#: src/copy.c:1070
 #, c-format
 msgid "cannot create regular file %s"
 msgstr "無法建立普通檔案 %s"
 
-#: src/copy.c:985
+#: src/copy.c:1091
 #, fuzzy, c-format
 msgid "failed to clone %s from %s"
 msgstr "無法�留%s的時間"
 
-#: src/copy.c:1098 src/copy.c:2541
+#: src/copy.c:1204 src/copy.c:2674
 #, c-format
 msgid "preserving times for %s"
 msgstr "�留%s的時間"
 
-#: src/copy.c:1175 src/copy.c:1181 src/head.c:862 src/touch.c:172
+#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172
 #: src/truncate.c:417
 #, fuzzy, c-format
 msgid "failed to close %s"
 msgstr "無法�留%s的時間"
 
-#: src/copy.c:1471
+#: src/copy.c:1580
 #, fuzzy, c-format
-msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? "
+msgid "%s: replace %s, overriding mode %04lo (%s)? "
 msgstr "%s：是�覆寫 %s，而��會權�模� %04lo? "
 
-#: src/copy.c:1478
+#: src/copy.c:1581
+#, c-format
+msgid "%s: unwritable %s (mode %04lo, %s); try anyway? "
+msgstr ""
+
+#: src/copy.c:1588
 #, c-format
 msgid "%s: overwrite %s? "
 msgstr "%s：是�覆寫 %s? "
 
-#: src/copy.c:1547
+#: src/copy.c:1658
 #, c-format
 msgid " (backup: %s)"
 msgstr " (備份：%s)"
 
-#: src/copy.c:1557
+#: src/copy.c:1668
 #, c-format
 msgid "failed to restore the default file creation context"
 msgstr ""
 
-#: src/copy.c:1589
+#: src/copy.c:1706
 #, c-format
 msgid "cannot create hard link %s to %s"
 msgstr "��以建立連至 %2$s 的實際�� (hard link) %1$s"
 
-#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604
-#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145
-#: src/stat.c:1239 src/truncate.c:363
+#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738
+#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145
+#: src/stat.c:1301 src/truncate.c:363
 #, c-format
 msgid "cannot stat %s"
 msgstr "無法 stat %s"
 
-#: src/copy.c:1650
+#: src/copy.c:1777
 #, c-format
 msgid "omitting directory %s"
 msgstr "略� %s 目錄"
 
-#: src/copy.c:1664
+#: src/copy.c:1791
 #, c-format
 msgid "warning: source file %s specified more than once"
 msgstr "警告：指定了來�檔 %s 多於一次"
 
-#: src/copy.c:1712 src/ln.c:246
+#: src/copy.c:1841 src/ln.c:262
 #, c-format
 msgid "%s and %s are the same file"
 msgstr "%s � %s 為�一檔案"
 
-#: src/copy.c:1811
+#: src/copy.c:1939
 #, c-format
 msgid "cannot overwrite non-directory %s with directory %s"
 msgstr "��以將目錄 %2$s 覆寫�目錄 %1$s"
 
-#: src/copy.c:1829 src/ln.c:214
+#: src/copy.c:1957 src/ln.c:230
 #, c-format
 msgid "will not overwrite just-created %s with %s"
 msgstr "�會以 %2$s 覆寫剛建立的 %1$s"
 
-#: src/copy.c:1847
+#: src/copy.c:1975
 #, c-format
 msgid "cannot overwrite directory %s with non-directory"
 msgstr "��以將目錄 %s 覆寫��目錄"
 
-#: src/copy.c:1861
+#: src/copy.c:1989
 #, c-format
 msgid "cannot move directory onto non-directory: %s -> %s"
 msgstr "移動目錄時目的地��以�是目錄：%s -> %s"
 
-#: src/copy.c:1891
+#: src/copy.c:2019
 #, c-format
 msgid "backing up %s would destroy source;  %s not moved"
 msgstr "將 %s 備份會破壞來�檔，因此�移動 %s。"
 
-#: src/copy.c:1892
+#: src/copy.c:2020
 #, c-format
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr "將 %s 備份會破壞來�檔，因此�複製 %s。"
 
-#: src/copy.c:1915 src/ln.c:276
+#: src/copy.c:2043 src/ln.c:292
 #, c-format
 msgid "cannot backup %s"
 msgstr "無法備份%s"
 
-#: src/copy.c:1979
+#: src/copy.c:2107
 #, fuzzy, c-format
 msgid "will not copy %s through just-created symlink %s"
 msgstr "�會以 %2$s 覆寫剛建立的 %1$s"
 
-#: src/copy.c:2056
+#: src/copy.c:2184
 #, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr "��以將目錄 %s 複製�為自身 (%s)"
 
-#: src/copy.c:2073
+#: src/copy.c:2201
 #, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr "�會建立連至目錄 %2$s 的實際�� (hard link) %1$s"
 
-#: src/copy.c:2123
+#: src/copy.c:2258
 #, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr "��以將目錄 %s 複製至自身的�目錄 (%s)"
 
-#: src/copy.c:2166
+#: src/copy.c:2301
 #, c-format
 msgid "cannot move %s to %s"
 msgstr "無法將 %s 移動至 %s"
 
-#: src/copy.c:2178
+#: src/copy.c:2317
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr "無法進行跨�置的移動 (%s至%s)；無法移除目標檔案或目錄"
 
-#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113
-#: src/mknod.c:166
-#, fuzzy, c-format
-msgid "failed to set default file creation context to %s"
-msgstr "無法�得 %s 的屬性"
-
-#: src/copy.c:2246
+#: src/copy.c:2357
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr "無法複製循環的符號��%s"
 
-#: src/copy.c:2355
+#: src/copy.c:2477
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr "%s：�能於目�的目錄中建立相�符號��"
 
-#: src/copy.c:2362
+#: src/copy.c:2484
 #, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr "��以建立連至 %2$s 的符號�� %1$s"
 
-#: src/copy.c:2416 src/mkfifo.c:132
+#: src/copy.c:2536 src/mkfifo.c:169
 #, c-format
 msgid "cannot create fifo %s"
 msgstr "無法建立 FIFO %s"
 
-#: src/copy.c:2425
+#: src/copy.c:2545
 #, c-format
 msgid "cannot create special file %s"
 msgstr "無法建立特殊檔案 %s"
 
-#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921
+#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983
 #, c-format
 msgid "cannot read symbolic link %s"
 msgstr "無法讀�符號�� %s"
 
-#: src/copy.c:2463
+#: src/copy.c:2583
 #, c-format
 msgid "cannot create symbolic link %s"
 msgstr "無法建立符號�� %s"
 
-#: src/copy.c:2495
+#: src/copy.c:2615
 #, c-format
 msgid "%s has unknown file type"
 msgstr "%s的檔案類型�詳"
 
-#: src/copy.c:2644 src/ln.c:358
+#: src/copy.c:2778 src/ln.c:375
 #, c-format
 msgid "cannot un-backup %s"
 msgstr "無法將 %s 的備份還原"
 
-#: src/copy.c:2648
+#: src/copy.c:2782
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr "%s -> %s (還原備份)\n"
 
-#: src/cp.c:156 src/mv.c:286
+#. This is a proper name. See the gettext manual, section Names.
+#: src/coreutils.c:47
+msgid "Alex Deymo"
+msgstr ""
+
+#: src/coreutils.c:67
+#, c-format
+msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"
+msgstr ""
+
+#: src/coreutils.c:70
+msgid ""
+"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n"
+"\n"
+msgstr ""
+
+#: src/coreutils.c:86
+#, c-format
+msgid ""
+"\n"
+"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"
+msgstr ""
+
+#: src/coreutils.c:178 src/coreutils.c:202
+#, c-format
+msgid "unknown program %s"
+msgstr ""
+
+#: src/cp.c:157 src/mv.c:288
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -2031,14 +2074,14 @@ msgstr ""
 "  或：%s [�項]... 來�... 目錄\n"
 "  或：%s [�項]... -t 目錄 來�...\n"
 
-#: src/cp.c:162
+#: src/cp.c:163
 #, fuzzy
 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 "將 <來�> 檔案複製至 <目的地>，或將多個 <檔案> 複製至指定 <目錄>。\n"
 "\n"
 
-#: src/cp.c:168
+#: src/cp.c:169
 #, fuzzy
 msgid ""
 "  -a, --archive                same as -dR --preserve=all\n"
@@ -2058,7 +2101,7 @@ msgstr ""
 "      --copy-contents          當使用�迴模�時複製特殊檔案的內容\n"
 "  -d                           等於 --no-dereference --preserve=link\n"
 
-#: src/cp.c:177
+#: src/cp.c:178
 #, fuzzy
 msgid ""
 "  -f, --force                  if an existing destination file cannot be\n"
@@ -2077,20 +2120,20 @@ msgstr ""
 "  -i, --interactive            覆寫檔案�需�確�\n"
 "  -H                           使用指令列中的符號��指示的真正目的地\n"
 
-#: src/cp.c:186
+#: src/cp.c:187
 msgid ""
 "  -l, --link                   hard link files instead of copying\n"
 "  -L, --dereference            always follow symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:190
+#: src/cp.c:191
 msgid ""
 "  -n, --no-clobber             do not overwrite an existing file (overrides\n"
 "                                 a previous -i option)\n"
 "  -P, --no-dereference         never follow symbolic links in SOURCE\n"
 msgstr ""
 
-#: src/cp.c:195
+#: src/cp.c:196
 #, fuzzy
 msgid ""
 "  -p                           same as --preserve=mode,ownership,timestamps\n"
@@ -2107,7 +2150,7 @@ msgstr ""
 "                                 (�設值為：mode,ownership,timestamps)\n"
 "                                 �外的屬性有：links�all\n"
 
-#: src/cp.c:203
+#: src/cp.c:204
 #, fuzzy
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
@@ -2117,7 +2160,7 @@ msgstr ""
 "      --parents                複製�先在 <目錄> 建立來�路徑中的所有目錄\n"
 "  -P                           等於 ‘--no-dereference’\n"
 
-#: src/cp.c:207
+#: src/cp.c:208
 #, fuzzy
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
@@ -2130,7 +2173,7 @@ msgstr ""
 "      --remove-destination     嘗試開啟目的地檔案�先移除已存在的目的地\n"
 "                               檔案 (與 --force �項��)\n"
 
-#: src/cp.c:213
+#: src/cp.c:214
 #, fuzzy
 msgid ""
 "      --sparse=WHEN            control creation of sparse files. See below\n"
@@ -2142,7 +2185,7 @@ msgstr ""
 "      --sparse=WHEN            控制建立 sparse 檔案的方�\n"
 "      --strip-trailing-slashes 移除�數中所有 <來�> 檔案/目錄末端的斜號\n"
 
-#: src/cp.c:218
+#: src/cp.c:219
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -2155,7 +2198,7 @@ msgstr ""
 "  -t, --target-directory=目錄  將所有 <來�> 檔案/目錄複製至指定的 <目錄>\n"
 "  -T, --no-target-directory    將 <目的地> 看作普通檔案處�\n"
 
-#: src/cp.c:224
+#: src/cp.c:225
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
 "                                 than the destination file or when the\n"
@@ -2168,7 +2211,15 @@ msgstr ""
 "  -v, --verbose                詳細顯示進行的步驟\n"
 "  -x, --one-file-system        �會跨越檔案系統進行�作\n"
 
-#: src/cp.c:233
+#: src/cp.c:232
+msgid ""
+"  -Z                           set SELinux security context of destination\n"
+"                                 file to default type\n"
+"      --context[=CTX]          like -Z, or if CTX is specified then set the\n"
+"                                 SELinux or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/cp.c:240
 #, fuzzy
 msgid ""
 "\n"
@@ -2191,7 +2242,7 @@ msgstr ""
 "<目的地> 檔案。使用 --sparse=never 會�止產生 sparse 檔案。\n"
 "\n"
 
-#: src/cp.c:245 src/install.c:649 src/ln.c:420 src/mv.c:322
+#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326
 #, fuzzy
 msgid ""
 "\n"
@@ -2207,7 +2258,7 @@ msgstr ""
 "變數來�擇。以下是�用的變數值：\n"
 "\n"
 
-#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329
+#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -2219,7 +2270,7 @@ msgstr ""
 "  existing, nil   若有數字的備份檔已經存在則使用數字，�則使用普通方�備份\n"
 "  simple, never   永�使用普通方�備份\n"
 
-#: src/cp.c:258
+#: src/cp.c:265
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -2230,220 +2281,230 @@ msgstr ""
 "有一個特別情�：如果�時指定 --force 和 --backup �項，而且 <來�> 和\n"
 "<目的地> 是�一個已存在的普通檔案的話，cp 會將 <來�> 檔案備份。\n"
 
-#: src/cp.c:317
+#: src/cp.c:324
 #, c-format
 msgid "failed to preserve times for %s"
 msgstr "無法�留 %s 的時間"
 
-#: src/cp.c:348
+#: src/cp.c:355
 #, c-format
 msgid "failed to preserve permissions for %s"
 msgstr "無法�留 %s 的權�"
 
-#: src/cp.c:475
+#: src/cp.c:482
 #, c-format
 msgid "cannot make directory %s"
 msgstr "無法建立目錄 %s"
 
-#: src/cp.c:524 src/cp.c:543
+#: src/cp.c:531 src/cp.c:550
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr "%s已存在但�是目錄"
 
-#: src/cp.c:570 src/cp.c:1069 src/install.c:402 src/install.c:844 src/ln.c:123
-#: src/ln.c:181 src/ln.c:202 src/ln.c:515 src/mv.c:154 src/mv.c:400
+#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133
+#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405
 #, fuzzy, c-format
 msgid "failed to access %s"
 msgstr "無法�留%s的時間"
 
-#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181
+#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297
 #: src/touch.c:429 src/truncate.c:354
 #, c-format
 msgid "missing file operand"
 msgstr "缺少了檔案作為�數"
 
-#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436
+#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450
 #, c-format
 msgid "missing destination file operand after %s"
 msgstr "%s 後缺少了目的地檔案"
 
-#: src/cp.c:601 src/install.c:926 src/mv.c:445
+#: src/cp.c:608 src/install.c:968 src/mv.c:459
 #, fuzzy, c-format
 msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)"
 msgstr "--target-directory (-t) 和 --no-target-directory (-T) ���時使用"
 
-#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847
-#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403
-#: src/mv.c:459
+#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930
+#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408
+#: src/mv.c:473
 #, c-format
 msgid "target %s is not a directory"
 msgstr "目的地 %s �是目錄"
 
-#: src/cp.c:728
+#: src/cp.c:735
 #, fuzzy, c-format
 msgid "with --parents, the destination must be a directory"
 msgstr "當�留路徑時，目的地必須是目錄"
 
-#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395
+#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400
 #, c-format
 msgid "multiple target directories specified"
 msgstr "指定了多於一個目的地目錄"
 
-#: src/cp.c:1110
+#: src/cp.c:1116 src/install.c:903
+#, c-format
+msgid "warning: ignoring --context; it requires an SELinux-enabled kernel"
+msgstr ""
+
+#: src/cp.c:1137
 #, c-format
 msgid "cannot make both hard and symbolic links"
 msgstr "無法�時建立實際�符號��"
 
-#: src/cp.c:1117 src/mv.c:466
+#: src/cp.c:1144 src/mv.c:480
 #, fuzzy, c-format
 msgid "options --backup and --no-clobber are mutually exclusive"
 msgstr "�能�時使用 --string � --check �項"
 
-#: src/cp.c:1123
+#: src/cp.c:1150
 #, c-format
 msgid "--reflink can be used only with --sparse=auto"
 msgstr ""
 
-#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474
+#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488
 msgid "backup type"
 msgstr "備份方�"
 
-#: src/cp.c:1156
+#: src/cp.c:1186 src/install.c:944
+#, c-format
+msgid "cannot set target context and preserve it"
+msgstr ""
+
+#: src/cp.c:1190
 #, c-format
 msgid "cannot preserve security context without an SELinux-enabled kernel"
 msgstr ""
 
-#: src/cp.c:1162
+#: src/cp.c:1206
 #, c-format
 msgid "cannot preserve extended attributes, cp is built without xattr support"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/csplit.c:41 src/dd.c:46
+#: src/csplit.c:42 src/dd.c:46
 msgid "Stuart Kemp"
 msgstr ""
 
-#: src/csplit.c:531
+#: src/csplit.c:543
 #, c-format
 msgid "input disappeared"
 msgstr "輸入資料消失了"
 
-#: src/csplit.c:660 src/csplit.c:671
+#: src/csplit.c:673 src/csplit.c:684
 #, c-format
 msgid "%s: line number out of range"
 msgstr "%s：行號超出範�以外"
 
-#: src/csplit.c:700
+#: src/csplit.c:713
 #, fuzzy, c-format
 msgid "%s: %s: line number out of range"
 msgstr "%s：‘%s’：行號超出範�以外"
 
-#: src/csplit.c:703 src/csplit.c:752
+#: src/csplit.c:716 src/csplit.c:772
 #, c-format
 msgid " on repetition %s\n"
 msgstr ""
 
-#: src/csplit.c:746
+#: src/csplit.c:766
 #, fuzzy, c-format
 msgid "%s: %s: match not found"
 msgstr "%s：‘%s’：找�到符�的字串"
 
-#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273
+#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273
 #, c-format
 msgid "error in regular expression search"
 msgstr "在正��算��尋時發生錯誤"
 
-#: src/csplit.c:983
+#: src/csplit.c:1006
 #, fuzzy, c-format
 msgid "write error for %s"
 msgstr "寫入‘%s’時發生錯誤"
 
-#: src/csplit.c:1059
+#: src/csplit.c:1082
 #, c-format
 msgid "%s: integer expected after delimiter"
 msgstr "%s：分隔符號後應該是整數"
 
-#: src/csplit.c:1075
+#: src/csplit.c:1098
 #, fuzzy, c-format
 msgid "%s: '}' is required in repeat count"
 msgstr "%s：�複的數目後應該是 ‘}’ 字元"
 
-#: src/csplit.c:1085
+#: src/csplit.c:1108
 #, fuzzy, c-format
 msgid "%s}: integer required between '{' and '}'"
 msgstr "%s}：‘{’ 和 ‘}’ 之間必須是整數"
 
-#: src/csplit.c:1112
+#: src/csplit.c:1135
 #, fuzzy, c-format
 msgid "%s: closing delimiter '%c' missing"
 msgstr "%s：缺少了�閉分隔符號 ‘%c’"
 
-#: src/csplit.c:1129
+#: src/csplit.c:1152
 #, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr "%s：無效的正�表示�：%s"
 
-#: src/csplit.c:1162
+#: src/csplit.c:1185
 #, c-format
 msgid "%s: invalid pattern"
 msgstr "%s：無效的樣�"
 
-#: src/csplit.c:1165
+#: src/csplit.c:1188
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr "%s：行號必須大於零"
 
-#: src/csplit.c:1171
+#: src/csplit.c:1194
 #, fuzzy, c-format
 msgid "line number %s is smaller than preceding line number, %s"
 msgstr "行號 ‘%s’ �於之�的行號 ‘%s’"
 
-#: src/csplit.c:1177
+#: src/csplit.c:1200
 #, fuzzy, c-format
 msgid "warning: line number %s is the same as preceding line number"
 msgstr "警告：行號 ‘%s’ 和之�的行號一樣"
 
-#: src/csplit.c:1255
+#: src/csplit.c:1278
 #, c-format
 msgid "missing conversion specifier in suffix"
 msgstr "後置字串缺少了字串轉�字符"
 
-#: src/csplit.c:1261
+#: src/csplit.c:1284
 #, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr "後置字串的字串轉�字符無效：%c"
 
-#: src/csplit.c:1264
+#: src/csplit.c:1287
 #, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr "後置字串的字串轉�字符無效：\\%.3o"
 
-#: src/csplit.c:1269
+#: src/csplit.c:1292
 #, fuzzy, c-format
 msgid "invalid flags in conversion specification: %%%c%c"
 msgstr "%s：無效的欄��格‘%s’"
 
-#: src/csplit.c:1286
+#: src/csplit.c:1309
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr "後置字串�有�多的 %% 字串轉��格"
 
-#: src/csplit.c:1300
+#: src/csplit.c:1323
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr "後置字串缺少了 %% 字串轉��格"
 
-#: src/csplit.c:1347
+#: src/csplit.c:1371
 #, c-format
 msgid "%s: invalid number"
 msgstr "%s：無效的號碼"
 
-#: src/csplit.c:1451
+#: src/csplit.c:1479
 #, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr "用法：%s [�項]... 檔案 樣�...\n"
 
-#: src/csplit.c:1455
+#: src/csplit.c:1483
 #, fuzzy
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n"
@@ -2452,7 +2513,7 @@ msgstr ""
 "根據 <樣�> 分割 <檔案>，並將之輸出至 ‘xx01’�‘xx02’ 等等的檔案，\n"
 "�時在標準輸出顯示�個分割部份的�元組數目。\n"
 
-#: src/csplit.c:1462
+#: src/csplit.c:1490
 #, fuzzy, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT  use sprintf FORMAT instead of %02d\n"
@@ -2463,7 +2524,11 @@ msgstr ""
 "  -f, --prefix=�置字串      以 <�置字串> 代替 ‘xx’\n"
 "  -k, --keep-files           �到錯誤時�移除輸出檔\n"
 
-#: src/csplit.c:1467
+#: src/csplit.c:1495
+msgid "  -m, --suppress-matched     suppress the lines matching PATTERN\n"
+msgstr ""
+
+#: src/csplit.c:1498
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
@@ -2473,7 +2538,7 @@ msgstr ""
 "  -s, --quiet, --silent      ��出輸出檔的大�\n"
 "  -z, --elide-empty-files    移除空白的輸出檔\n"
 
-#: src/csplit.c:1474
+#: src/csplit.c:1505
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
@@ -2481,7 +2546,7 @@ msgstr ""
 "\n"
 "若 <檔案> 是 - 則由標準輸入讀�資料。�一個 <樣�> �以是：\n"
 
-#: src/csplit.c:1478
+#: src/csplit.c:1509
 #, fuzzy
 msgid ""
 "\n"
@@ -2507,21 +2572,17 @@ msgstr ""
 msgid "David M. Ihnat"
 msgstr ""
 
-#: src/cut.c:64 src/cut.c:372
-msgid "fields and positions are numbered from 1"
-msgstr ""
-
-#: src/cut.c:189
+#: src/cut.c:172
 #, fuzzy, c-format
 msgid "Usage: %s OPTION... [FILE]...\n"
 msgstr "用法：%s [�項]... [檔案]...\n"
 
-#: src/cut.c:193
+#: src/cut.c:176
 #, fuzzy
 msgid "Print selected parts of lines from each FILE to standard output.\n"
 msgstr "在標準輸出中顯示�個 <檔案> �一行中指定的部份。\n"
 
-#: src/cut.c:199
+#: src/cut.c:182
 msgid ""
 "  -b, --bytes=LIST        select only these bytes\n"
 "  -c, --characters=LIST   select only these characters\n"
@@ -2531,7 +2592,7 @@ msgstr ""
 "  -c, --characters=LIST   �顯示指定的字元\n"
 "  -d, --delimiter=DELIM   以 DELIM 字元代替 TAB 作為欄�的分隔符號\n"
 
-#: src/cut.c:204
+#: src/cut.c:187
 msgid ""
 "  -f, --fields=LIST       select only these fields;  also print any line\n"
 "                            that contains no delimiter character, unless\n"
@@ -2542,14 +2603,14 @@ msgstr ""
 "                            �一行，除��� -s �項一起使用\n"
 "  -n                      (�會作任何處�)\n"
 
-#: src/cut.c:210
+#: src/cut.c:193
 #, fuzzy
 msgid ""
 "      --complement        complement the set of selected bytes, characters\n"
 "                            or fields\n"
 msgstr "      --verbose           開啟�個輸出檔之�都在標準錯誤輸出顯示訊�\n"
 
-#: src/cut.c:214
+#: src/cut.c:197
 msgid ""
 "  -s, --only-delimited    do not print lines not containing delimiters\n"
 "      --output-delimiter=STRING  use STRING as the output delimiter\n"
@@ -2559,7 +2620,7 @@ msgstr ""
 "      --output-delimiter=字串  以 <字串> 作為輸出資料的分隔符號\n"
 "                               �設是使用輸入資料的分隔符號\n"
 
-#: src/cut.c:221
+#: src/cut.c:204
 msgid ""
 "\n"
 "Use one, and only one of -b, -c or -f.  Each LIST is made up of one\n"
@@ -2567,7 +2628,7 @@ msgid ""
 "in the same order that it is read, and is written exactly once.\n"
 msgstr ""
 
-#: src/cut.c:227
+#: src/cut.c:210
 #, fuzzy
 msgid ""
 "Each range is one of:\n"
@@ -2591,59 +2652,63 @@ msgstr ""
 "\n"
 "如果沒有指定 <檔案> 或 <檔案> 是 -，則由標準輸入讀�資料。\n"
 
-#: src/cut.c:367 src/cut.c:493
+#: src/cut.c:300 src/cut.c:394
 #, fuzzy
 msgid "invalid byte, character or field list"
 msgstr "無效的�元組或欄��項"
 
-#: src/cut.c:387
+#: src/cut.c:305 src/cut.c:345
+msgid "fields and positions are numbered from 1"
+msgstr ""
+
+#: src/cut.c:320
 #, fuzzy
 msgid "invalid range with no endpoint: -"
 msgstr "無效的寬度�項：‘%s’"
 
-#: src/cut.c:403
+#: src/cut.c:334
 #, fuzzy
 msgid "invalid decreasing range"
 msgstr "無效的類型‘%s’"
 
-#: src/cut.c:482
+#: src/cut.c:383
 #, c-format
 msgid "byte offset %s is too large"
 msgstr "�元組�置 %s �大"
 
-#: src/cut.c:485
+#: src/cut.c:386
 #, c-format
 msgid "field number %s is too large"
 msgstr "欄�數目 %s �大"
 
-#: src/cut.c:795 src/cut.c:803
+#: src/cut.c:735 src/cut.c:743
 msgid "only one type of list may be specified"
 msgstr "指定�置時�能使用一種格�"
 
-#: src/cut.c:812 src/numfmt.c:1408
+#: src/cut.c:752 src/numfmt.c:1425
 #, c-format
 msgid "the delimiter must be a single character"
 msgstr "分隔符號必須是�好一個字元"
 
-#: src/cut.c:847
+#: src/cut.c:787
 msgid "you must specify a list of bytes, characters, or fields"
 msgstr "必須指定一系列的�元組�字元或欄�"
 
-#: src/cut.c:850
+#: src/cut.c:790
 msgid "an input delimiter may be specified only when operating on fields"
 msgstr "�有在處�欄�時�能指定分隔符號"
 
-#: src/cut.c:854
+#: src/cut.c:794
 msgid ""
 "suppressing non-delimited lines makes sense\n"
 "\tonly when operating on fields"
 msgstr "�有在處�欄�時��以去除沒有分隔符號的�一行"
 
-#: src/cut.c:870
+#: src/cut.c:800
 msgid "missing list of fields"
 msgstr "缺少了欄�數值"
 
-#: src/cut.c:872
+#: src/cut.c:802
 msgid "missing list of positions"
 msgstr "缺少了表示�置的數值"
 
@@ -2683,7 +2748,7 @@ msgid ""
 "                            Date and time components are separated by\n"
 "                            a single space: 2006-08-07 12:34:56-06:00\n"
 "  -s, --set=STRING          set time described by STRING\n"
-"  -u, --utc, --universal    print or set Coordinated Universal Time\n"
+"  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n"
 msgstr ""
 
 #: src/date.c:158
@@ -2815,10 +2880,10 @@ msgid ""
 "  $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n"
 msgstr ""
 
-#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498
-#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362
-#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126
-#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196
+#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496
+#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362
+#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126
+#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196
 #, c-format
 msgid "standard input"
 msgstr "標準輸出"
@@ -2856,7 +2921,7 @@ msgstr ""
 msgid "cannot set date"
 msgstr "無法設定時間"
 
-#: src/date.c:558 src/du.c:371
+#: src/date.c:558 src/du.c:383
 #, c-format
 msgid "time %s is out of range"
 msgstr "時間 %s 超出�接�的範�"
@@ -2867,7 +2932,7 @@ msgstr "時間 %s 超出�接�的範�"
 msgid "Paul Rubin"
 msgstr ""
 
-#: src/dd.c:521
+#: src/dd.c:527
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPERAND]...\n"
@@ -2876,7 +2941,7 @@ msgstr ""
 "用法：%s [檔案]...\n"
 "  或：%s [�項]\n"
 
-#: src/dd.c:526
+#: src/dd.c:532
 #, fuzzy
 msgid ""
 "Copy a file, converting and formatting according to the operands.\n"
@@ -2895,7 +2960,7 @@ msgstr ""
 "  count=�段數目  �複製指定 <�段數目> 的輸入資料\n"
 "  ibs=�元組      �次讀�指定的 <�元組>\n"
 
-#: src/dd.c:535
+#: src/dd.c:541
 #, fuzzy
 msgid ""
 "  if=FILE         read from FILE instead of stdin\n"
@@ -2915,7 +2980,7 @@ msgstr ""
 "  skip=�段數目   先略�以 ibs 為單�的指定 <�段數目> 的輸入資料\n"
 "  status=noxfer   �顯示輸入/輸出�果\n"
 
-#: src/dd.c:546
+#: src/dd.c:552
 #, fuzzy
 msgid ""
 "\n"
@@ -2932,7 +2997,7 @@ msgstr ""
 "GB=1000*1000*1000，G=1024*1024*1024，還有 T/P/E/Z/Y 如此類推。\n"
 "�個 <關�字> �以是：\n"
 
-#: src/dd.c:555
+#: src/dd.c:561
 #, fuzzy
 msgid ""
 "  ascii     from EBCDIC to ASCII\n"
@@ -2960,7 +3025,7 @@ msgstr ""
 "  sync      將�個輸入資料�段以 NUL 字元填滿至 ibs 的大�；\n"
 "            當�� block 或 unblock 時，會以空格代替 NUL 字元填充\n"
 
-#: src/dd.c:568
+#: src/dd.c:574
 msgid ""
 "  excl      fail if the output file already exists\n"
 "  nocreat   do not create the output file\n"
@@ -2976,7 +3041,7 @@ msgstr ""
 "  fdatasync 真正將資料寫入�碟後���程�\n"
 "  fsync     類似 fdatasync，並寫入元資料\n"
 
-#: src/dd.c:576
+#: src/dd.c:582
 msgid ""
 "\n"
 "Each FLAG symbol may be:\n"
@@ -2985,76 +3050,76 @@ msgid ""
 "suggested)\n"
 msgstr ""
 
-#: src/dd.c:583
+#: src/dd.c:589
 msgid "  cio       use concurrent I/O for data\n"
 msgstr ""
 
-#: src/dd.c:585
+#: src/dd.c:591
 msgid "  direct    use direct I/O for data\n"
 msgstr ""
 
-#: src/dd.c:587
+#: src/dd.c:593
 #, fuzzy
 msgid "  directory  fail unless a directory\n"
 msgstr "建立目錄時�能指定目的地目錄"
 
-#: src/dd.c:589
+#: src/dd.c:595
 msgid "  dsync     use synchronized I/O for data\n"
 msgstr ""
 
-#: src/dd.c:591
+#: src/dd.c:597
 msgid "  sync      likewise, but also for metadata\n"
 msgstr ""
 
-#: src/dd.c:592
+#: src/dd.c:598
 msgid "  fullblock  accumulate full blocks of input (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:595
+#: src/dd.c:601
 msgid "  nonblock  use non-blocking I/O\n"
 msgstr ""
 
-#: src/dd.c:597
+#: src/dd.c:603
 msgid "  noatime   do not update access time\n"
 msgstr ""
 
-#: src/dd.c:600
+#: src/dd.c:606
 msgid "  nocache   discard cached data\n"
 msgstr ""
 
-#: src/dd.c:603
+#: src/dd.c:609
 msgid "  noctty    do not assign controlling terminal from file\n"
 msgstr ""
 
-#: src/dd.c:606
+#: src/dd.c:612
 msgid "  nofollow  do not follow symlinks\n"
 msgstr ""
 
-#: src/dd.c:608
+#: src/dd.c:614
 msgid "  nolinks   fail if multiply-linked\n"
 msgstr ""
 
-#: src/dd.c:610
+#: src/dd.c:616
 msgid "  binary    use binary I/O for data\n"
 msgstr ""
 
-#: src/dd.c:612
+#: src/dd.c:618
 msgid "  text      use text I/O for data\n"
 msgstr ""
 
-#: src/dd.c:614
+#: src/dd.c:620
 msgid "  count_bytes  treat 'count=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:617
+#: src/dd.c:623
 msgid "  skip_bytes  treat 'skip=N' as a byte count (iflag only)\n"
 msgstr ""
 
-#: src/dd.c:620
+#: src/dd.c:626
 msgid "  seek_bytes  treat 'seek=N' as a byte count (oflag only)\n"
 msgstr ""
 
-#: src/dd.c:625
+#: src/dd.c:631
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3083,26 +3148,36 @@ msgstr ""
 "�項包括：\n"
 "\n"
 
-#: src/dd.c:683
+#: src/dd.c:676
+#, c-format
+msgid "memory exhausted by input buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:698
+#, c-format
+msgid "memory exhausted by output buffer of size %zu bytes (%s)"
+msgstr ""
+
+#: src/dd.c:748
 #, c-format
 msgid ""
 "%<PRIuMAX>+%<PRIuMAX> records in\n"
 "%<PRIuMAX>+%<PRIuMAX> records out\n"
 msgstr ""
 
-#: src/dd.c:689
+#: src/dd.c:754
 #, fuzzy, c-format
 msgid "%<PRIuMAX> truncated record\n"
 msgid_plural "%<PRIuMAX> truncated records\n"
 msgstr[0] "個被截斷了的�段"
 
-#: src/dd.c:701
+#: src/dd.c:766
 #, fuzzy, c-format
 msgid "%<PRIuMAX> byte (%s) copied"
 msgid_plural "%<PRIuMAX> bytes (%s) copied"
 msgstr[0] "複製了 %s �元組 (%s)"
 
-#: src/dd.c:720
+#: src/dd.c:785
 #, fuzzy
 msgid "Infinity B"
 msgstr "無�"
@@ -3117,87 +3192,87 @@ msgstr "無�"
 #. but that was incorrect for languages like Polish.  To fix this
 #. bug we now use SI symbols even though they're a bit more
 #. confusing in English.
-#: src/dd.c:733
+#: src/dd.c:798
 #, fuzzy, c-format
 msgid ", %g s, %s/s\n"
 msgstr "，%g 秒，%s/s\n"
 
-#: src/dd.c:812
+#: src/dd.c:877
 #, c-format
 msgid "closing input file %s"
 msgstr "正在關閉輸入檔 %s"
 
-#: src/dd.c:819
+#: src/dd.c:884
 #, c-format
 msgid "closing output file %s"
 msgstr "正在關閉輸出檔%s"
 
-#: src/dd.c:1022
+#: src/dd.c:1089
 #, fuzzy, c-format
 msgid "failed to turn off O_DIRECT: %s"
 msgstr "無法更改%s的所屬群組為 %s\n"
 
-#: src/dd.c:1093 src/dd.c:1942
+#: src/dd.c:1160 src/dd.c:1976
 #, c-format
 msgid "writing to %s"
 msgstr "正在寫入 %s"
 
-#: src/dd.c:1207 src/dd.c:1261
+#: src/dd.c:1274 src/dd.c:1328
 #, c-format
 msgid "unrecognized operand %s"
 msgstr "無法識別�數 %s"
 
-#: src/dd.c:1218
+#: src/dd.c:1285
 #, fuzzy
 msgid "invalid conversion"
 msgstr "轉�用的關�字無效：%s"
 
-#: src/dd.c:1221 src/dd.c:1297
+#: src/dd.c:1288 src/dd.c:1364
 #, fuzzy
 msgid "invalid input flag"
 msgstr "輸入旗標無效：%s"
 
-#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303
+#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370
 #, fuzzy
 msgid "invalid output flag"
 msgstr "輸出旗標無效：%s"
 
-#: src/dd.c:1227
+#: src/dd.c:1294
 #, fuzzy
 msgid "invalid status flag"
 msgstr "狀態旗標無效：%s"
 
-#: src/dd.c:1266 src/truncate.c:310
+#: src/dd.c:1333 src/truncate.c:310
 #, c-format
 msgid "invalid number %s"
 msgstr "數字 %s 無效"
 
-#: src/dd.c:1348
+#: src/dd.c:1415
 #, c-format
 msgid "cannot combine any two of {ascii,ebcdic,ibm}"
 msgstr "���時使用 ascii, ebcdic, ibm 中的任何二個"
 
-#: src/dd.c:1350
+#: src/dd.c:1417
 #, c-format
 msgid "cannot combine block and unblock"
 msgstr "���時使用 block 和 unblock"
 
-#: src/dd.c:1352
+#: src/dd.c:1419
 #, c-format
 msgid "cannot combine lcase and ucase"
 msgstr "���時使用 lcase 和 ucase"
 
-#: src/dd.c:1354
+#: src/dd.c:1421
 #, c-format
 msgid "cannot combine excl and nocreat"
 msgstr "���時使用 excl 和 nocreat"
 
-#: src/dd.c:1357
+#: src/dd.c:1424
 #, fuzzy, c-format
 msgid "cannot combine direct and nocache"
 msgstr "���時使用 excl 和 nocreat"
 
-#: src/dd.c:1514
+#: src/dd.c:1582
 #, c-format
 msgid ""
 "warning: working around lseek kernel bug for file (%s)\n"
@@ -3206,168 +3281,167 @@ msgstr ""
 "警告：暫時��有關檔案 (%s) 的 lseek 核心錯誤，檔案的 mt_type=0x%0lx ─\n"
 "      有關 mt_type 類型的清單請�考 <sys/mtio.h>"
 
-#: src/dd.c:1601
+#: src/dd.c:1670
 #, fuzzy, c-format
 msgid "%s: cannot skip"
 msgstr "%s：無法�尋"
 
-#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683
+#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764
 #, c-format
 msgid "%s: cannot seek"
 msgstr "%s：無法�尋"
 
-#: src/dd.c:1663
+#: src/dd.c:1744
 #, c-format
 msgid "offset overflow while reading file %s"
 msgstr ""
 
-#: src/dd.c:1675
+#: src/dd.c:1756
 #, fuzzy, c-format
 msgid "warning: invalid file offset after failed read"
 msgstr "警告：寬度 %lu 是無效的；以 %d 代替"
 
-#: src/dd.c:1679
+#: src/dd.c:1760
 #, c-format
 msgid "cannot work around kernel bug after all"
 msgstr "無法�開系統核心的錯誤"
 
-#: src/dd.c:1822
+#: src/dd.c:1903
 #, c-format
 msgid "setting flags for %s"
 msgstr ""
 
-#: src/dd.c:1875
-#, c-format
-msgid "memory exhausted by input buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1889
-#, c-format
-msgid "memory exhausted by output buffer of size %zu bytes (%s)"
-msgstr ""
-
-#: src/dd.c:1922
+#: src/dd.c:1957
 #, fuzzy, c-format
 msgid "%s: cannot skip to specified offset"
 msgstr "%s：無法�尋至相��置 %s%s"
 
-#: src/dd.c:2133
+#: src/dd.c:2172
 #, fuzzy, c-format
 msgid "failed to truncate to %<PRIdMAX> bytes in output file %s"
 msgstr "略�輸出檔%2$s的最� %1$s 個�元組"
 
-#: src/dd.c:2146
+#: src/dd.c:2185
 #, c-format
 msgid "fdatasync failed for %s"
 msgstr "%s 的 fdatasync 失敗"
 
-#: src/dd.c:2156
+#: src/dd.c:2195
 #, c-format
 msgid "fsync failed for %s"
 msgstr "%s 的 fsync 失敗"
 
-#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165
+#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165
 #, fuzzy, c-format
 msgid "failed to open %s"
 msgstr "無法�留%s的時間"
 
-#: src/dd.c:2246
+#: src/dd.c:2285
 #, c-format
 msgid ""
 "offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
 "blocks"
 msgstr ""
 
-#: src/dd.c:2267
+#: src/dd.c:2306
 #, fuzzy, c-format
 msgid "failed to truncate to %<PRIuMAX> bytes in output file %s"
 msgstr "略�輸出檔%2$s的最� %1$s 個�元組"
 
-#: src/dd.c:2283 src/dd.c:2289
+#: src/dd.c:2322 src/dd.c:2328
 #, fuzzy, c-format
 msgid "failed to discard cache for: %s"
 msgstr "無法更改%s的所屬群組為 %s\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32
-#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67
+#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32
+#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67
 msgid "Paul Eggert"
 msgstr ""
 
-#: src/df.c:172
+#: src/df.c:174
 msgid "Filesystem"
 msgstr "檔案系統"
 
-#: src/df.c:175
+#: src/df.c:177
 msgid "Type"
 msgstr "é¡žåž‹"
 
-#: src/df.c:178 src/df.c:542
+#: src/df.c:180 src/df.c:547
 msgid "blocks"
 msgstr "�段"
 
-#: src/df.c:181
+#: src/df.c:183
 msgid "Used"
 msgstr "已用"
 
-#: src/df.c:184
+#: src/df.c:186
 msgid "Available"
 msgstr "�用"
 
-#: src/df.c:187
+#: src/df.c:189
 msgid "Use%"
 msgstr "已用%"
 
-#: src/df.c:190
+#: src/df.c:192
 msgid "Inodes"
 msgstr "Inode"
 
-#: src/df.c:193
+#: src/df.c:195
 msgid "IUsed"
 msgstr "I已用"
 
-#: src/df.c:196
+#: src/df.c:198
 msgid "IFree"
 msgstr "I�用"
 
-#: src/df.c:199
+#: src/df.c:201
 msgid "IUse%"
 msgstr "I已用%"
 
-#: src/df.c:202
+#: src/df.c:204
 msgid "Mounted on"
 msgstr "掛載點"
 
-#: src/df.c:383
-#, c-format
-msgid "option --output: field '%s' unknown"
+#: src/df.c:207
+msgid "File"
 msgstr ""
 
-#: src/df.c:390
+#: src/df.c:387
+#, fuzzy, c-format
+msgid "option --output: field %s unknown"
+msgstr "正在關閉輸出檔%s"
+
+#: src/df.c:394
 #, fuzzy, c-format
-msgid "option --output: field '%s' used more than once"
+msgid "option --output: field %s used more than once"
 msgstr "警告：指定了來�檔 %s 多於一次"
 
-#: src/df.c:410 src/df.c:449
+#: src/df.c:415 src/df.c:454
 msgid "Size"
 msgstr "容�"
 
-#: src/df.c:414 src/df.c:451
+#: src/df.c:419 src/df.c:456
 msgid "Avail"
 msgstr "�用"
 
-#: src/df.c:474
+#: src/df.c:479
 msgid "Capacity"
 msgstr "容�"
 
 #. TRANSLATORS: this is the "1K-blocks" header in "df" output.
 #. TRANSLATORS: this is the "1024-blocks" header in "df -P".
-#: src/df.c:545 src/df.c:554
+#: src/df.c:550 src/df.c:559
 #, c-format
 msgid "%s-%s"
 msgstr ""
 
-#: src/df.c:1210
+#: src/df.c:1215
+#, c-format
+msgid "cannot access %s: over-mounted by another device"
+msgstr ""
+
+#: src/df.c:1384
 #, fuzzy
 msgid ""
 "Show information about the file system on which each FILE resides,\n"
@@ -3376,24 +3450,20 @@ msgstr ""
 "顯示�個 <檔案> 所在的檔案系統的資訊，�設是顯示所有檔案系統。\n"
 "\n"
 
-#: src/df.c:1217
-#, fuzzy
+#. TRANSLATORS: The thousands and decimal separators are best
+#. adjusted to an appropriate default for your locale.
+#: src/df.c:1393
 msgid ""
 "  -a, --all             include dummy file systems\n"
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "      --total           produce a grand total\n"
-"  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n"
+"  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n"
 msgstr ""
-"  -a, --all             包括大�為 0 個�段的檔案系統\n"
-"  -B, --block-size=大� �段以指定 <大�> 的�元組為單�\n"
-"  -h, --human-readable  以容易�解的格��出檔案系統大� (例如 1K 234M 2G)\n"
-"  -H, --si              類似 -h，但以 1000 為單�而�是 1024\n"
 
-#: src/df.c:1227
+#: src/df.c:1402
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -3406,7 +3476,7 @@ msgstr ""
 "  -l, --local           �顯示本機的檔案系統\n"
 "      --no-sync         �得使用�資料��進行 sync 動作 (�設)\n"
 
-#: src/df.c:1234
+#: src/df.c:1409
 #, fuzzy
 msgid ""
 "      --output[=FIELD_LIST]  use the output format defined by FIELD_LIST,\n"
@@ -3426,43 +3496,34 @@ msgstr ""
 "  -x, --exclude-type=類型   ��出�是指定 <類型> 的檔案系統資訊\n"
 "  -v                    (此�項�作處�)\n"
 
-#: src/df.c:1248
+#: src/df.c:1423
 msgid ""
 "\n"
 "FIELD_LIST is a comma-separated list of columns to be included.  Valid\n"
 "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n"
-"'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n"
+"'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n"
 msgstr ""
 
-#: src/df.c:1285
+#: src/df.c:1460
 #, fuzzy, c-format
 msgid "options %s and %s are mutually exclusive"
-msgstr "�出日期所用的�項是互相矛盾的"
-
-#: src/df.c:1335
-#, fuzzy
-msgid "warning: "
-msgstr "警告："
-
-#: src/df.c:1336
-msgid "long option '--megabytes' is deprecated and will soon be removed"
-msgstr ""
+msgstr "�能�時使用 --string � --check �項"
 
-#: src/df.c:1442
+#: src/df.c:1610
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr "�能�時�擇和排除檔案系統類型 %s"
 
-#: src/df.c:1500
+#: src/df.c:1668
 msgid "Warning: "
 msgstr "警告："
 
-#: src/df.c:1502 src/stat.c:814
+#: src/df.c:1670 src/stat.c:842
 #, fuzzy
 msgid "cannot read table of mounted file systems"
 msgstr "%s 無法讀�已掛載的檔案系統的�單"
 
-#: src/df.c:1539
+#: src/df.c:1707
 #, c-format
 msgid "no file systems processed"
 msgstr ""
@@ -3472,7 +3533,7 @@ msgstr ""
 msgid "H. Peter Anvin"
 msgstr ""
 
-#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105
+#: src/dircolors.c:97 src/uptime.c:198 src/users.c:105
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]\n"
 msgstr "用法：%s [�項]... [檔案]\n"
@@ -3557,7 +3618,7 @@ msgstr ""
 
 #: src/dirname.c:59
 #, fuzzy
-msgid "  -z, --zero     separate output with NUL rather than newline\n"
+msgid "  -z, --zero     end each output line with NUL, not newline\n"
 msgstr ""
 "  -z, --zero-terminated     以�元組 0 而� newline 字元作為�行的��字元\n"
 
@@ -3571,7 +3632,7 @@ msgid ""
 "  %s stdio.h            -> \".\"\n"
 msgstr ""
 
-#: src/du.c:270 src/sort.c:394 src/wc.c:112
+#: src/du.c:281 src/sort.c:422 src/wc.c:112
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -3580,7 +3641,7 @@ msgstr ""
 "用法：%s [�項]... [檔案]...\n"
 "  或：%s [�項]... --files0-from=F\n"
 
-#: src/du.c:274
+#: src/du.c:285
 #, fuzzy
 msgid "Summarize disk usage of each FILE, recursively for directories.\n"
 msgstr ""
@@ -3588,11 +3649,10 @@ msgstr ""
 "\n"
 
 # (Abel) doesn't need to translate into such detail for --apparent-size
-#: src/du.c:280
+#: src/du.c:291
 #, fuzzy
 msgid ""
-"  -0, --null            end each output line with 0 byte rather than "
-"newline\n"
+"  -0, --null            end each output line with NUL, not newline\n"
 "  -a, --all             write counts for all files, not just directories\n"
 "      --apparent-size   print apparent sizes, rather than disk usage; "
 "although\n"
@@ -3609,12 +3669,12 @@ msgstr ""
 "  -c, --total           �出所有項目相加後的總用�\n"
 "  -D, --dereference-args  �找出符號��所指示的真正目的地\n"
 
-#: src/du.c:289
+#: src/du.c:300
 #, fuzzy
 msgid ""
-"  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n"
-"                           '-BM' prints sizes in units of 1,048,576 bytes.\n"
-"                           See SIZE format below.\n"
+"  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n"
+"                           '-BM' prints sizes in units of 1,048,576 bytes;\n"
+"                           see SIZE format below\n"
 "  -b, --bytes           equivalent to '--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference only symlinks that are listed on the\n"
@@ -3632,15 +3692,16 @@ msgstr ""
 "                        (若使用 --all �項，也會顯示檔案的佔用�)；\n"
 "                        --max-depth=0 的效果等於 --summarize\n"
 
-#: src/du.c:302
+#: src/du.c:313
 #, fuzzy
 msgid ""
-"      --files0-from=F   summarize disk usage of the NUL-terminated file\n"
-"                          names specified in file F;\n"
-"                          If F is - then read names from standard input\n"
+"      --files0-from=F   summarize disk usage of the\n"
+"                          NUL-terminated file names specified in file F;\n"
+"                          if F is -, then read names from standard input\n"
 "  -H                    equivalent to --dereference-args (-D)\n"
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
+"      --inodes          list inode usage information instead of block usage\n"
 msgstr ""
 "      --files0-from=F   總�檔案 F 中所有檔案�稱的使用�，而且所有檔案�稱\n"
 "                        都以 NUL 字元作為�尾\n"
@@ -3651,7 +3712,7 @@ msgstr ""
 "  -k                    � --block-size=1K\n"
 "  -l, --count-links     將所有實際�� (hard link) 的大�也計算在內\n"
 
-#: src/du.c:310
+#: src/du.c:322
 msgid ""
 "  -k                    like --block-size=1K\n"
 "  -L, --dereference     dereference all symbolic links\n"
@@ -3659,12 +3720,13 @@ msgid ""
 "  -m                    like --block-size=1M\n"
 msgstr ""
 
-#: src/du.c:316
+#: src/du.c:328
 #, fuzzy
 msgid ""
 "  -P, --no-dereference  don't follow any symbolic links (this is the "
 "default)\n"
-"  -S, --separate-dirs   do not include size of subdirectories\n"
+"  -S, --separate-dirs   for directories do not include size of "
+"subdirectories\n"
 "      --si              like -h, but use powers of 1000 not 1024\n"
 "  -s, --summarize       display only a total for each argument\n"
 msgstr ""
@@ -3674,8 +3736,7 @@ msgstr ""
 "  -S, --separate-dirs   �包括�目錄的佔用�\n"
 "  -s, --summarize       �分別計算�個檔案�數所佔的總用�\n"
 
-#: src/du.c:322
-#, fuzzy
+#: src/du.c:334
 msgid ""
 "  -t, --threshold=SIZE  exclude entries smaller than SIZE if positive,\n"
 "                          or entries greater than SIZE if negative\n"
@@ -3684,89 +3745,78 @@ msgid ""
 "                          directory, or any of its subdirectories\n"
 "      --time=WORD       show time as WORD instead of modification time:\n"
 "                          atime, access, use, ctime or status\n"
-"      --time-style=STYLE  show times using style STYLE:\n"
-"                          full-iso, long-iso, iso, +FORMAT\n"
-"                          FORMAT is interpreted like 'date'\n"
+"      --time-style=STYLE  show times using STYLE, which can be:\n"
+"                            full-iso, long-iso, iso, or +FORMAT;\n"
+"                            FORMAT is interpreted like in 'date'\n"
 msgstr ""
-"  -S                         根據檔案大�排�\n"
-"      --sort=WORD            以下是��用的 WORD 和它們代表的相應�項：\n"
-"                               extension -X       status   -c\n"
-"                               none      -U       time     -t\n"
-"                               size      -S       atime    -u\n"
-"                               time      -t       access   -u\n"
-"                               version   -v       use      -u\n"
-"      --time=WORD            顯示 WORD 所代表的時間而�修改時間：\n"
-"                               atime�access�use�ctime 或 status；加上\n"
-"                               --sort=time �項時會以指定時間作為排�索引\n"
 
-#: src/du.c:333
+#: src/du.c:345
 msgid ""
 "  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n"
 "      --exclude=PATTERN    exclude files that match PATTERN\n"
 "  -x, --one-file-system    skip directories on different file systems\n"
 msgstr ""
 
-#: src/du.c:386
-#, fuzzy
+#: src/du.c:398
 msgid "Infinity"
 msgstr "無�"
 
-#: src/du.c:507
-#, c-format
-msgid "mount point %s already traversed"
-msgstr ""
-
-#: src/du.c:624
+#: src/du.c:636
 #, fuzzy, c-format
 msgid "fts_read failed: %s"
 msgstr "fts_read 失敗"
 
-#: src/du.c:780
+#: src/du.c:787
 #, c-format
 msgid "invalid maximum depth %s"
 msgstr "最大深度 %s 無效"
 
-#: src/du.c:809
+#: src/du.c:816
 #, fuzzy, c-format
 msgid "invalid --threshold argument '-0'"
-msgstr "�數無效: %s"
+msgstr "無效的行號增加值：‘%s’"
 
-#: src/du.c:887
+#: src/du.c:898
 #, c-format
 msgid "cannot both summarize and show all entries"
 msgstr "�能�顯示總用�，�時�顯示�個項目"
 
-#: src/du.c:894
+#: src/du.c:905
 #, c-format
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr "警告：顯示總用�等於使用 --max-depth=0"
 
-#: src/du.c:900
+#: src/du.c:911
 #, c-format
 msgid "warning: summarizing conflicts with --max-depth=%lu"
 msgstr "警告：顯示總用�的�項和 --max-depth=%lu 互相抵觸"
 
-#: src/du.c:966 src/sort.c:4533 src/wc.c:668
+#: src/du.c:922
+#, c-format
+msgid "warning: options --apparent-size and -b are ineffective with --inodes"
+msgstr ""
+
+#: src/du.c:987 src/sort.c:4574 src/wc.c:668
 #, fuzzy
 msgid "file operands cannot be combined with --files0-from"
 msgstr "有檔案作為�數時��和 --files0-from 一起使用。"
 
-#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349
+#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349
 #: src/tac.c:505 src/tac.c:585 src/wc.c:733
 #, c-format
 msgid "%s: read error"
 msgstr "%s：讀�時發生錯誤"
 
-#: src/du.c:1040 src/sort.c:4562 src/wc.c:747
+#: src/du.c:1061 src/sort.c:4603 src/wc.c:747
 #, c-format
 msgid "when reading file names from stdin, no file name of %s allowed"
 msgstr ""
 
-#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768
+#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768
 msgid "invalid zero-length file name"
 msgstr "檔案�稱無效 (長度為零)"
 
-#: src/du.c:1088 src/ls.c:2649 src/wc.c:791
+#: src/du.c:1109 src/ls.c:2692 src/wc.c:791
 msgid "total"
 msgstr "總計"
 
@@ -3866,7 +3916,7 @@ msgstr ""
 #: src/env.c:61
 msgid ""
 "  -i, --ignore-environment  start with an empty environment\n"
-"  -0, --null           end each output line with 0 byte rather than newline\n"
+"  -0, --null           end each output line with NUL, not newline\n"
 "  -u, --unset=NAME     remove variable from the environment\n"
 msgstr ""
 
@@ -3941,16 +3991,16 @@ msgid "input line is too long"
 msgstr "輸入內容�長"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34
+#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34
 msgid "Mike Parker"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/expr.c:152 src/groups.c:36
+#: src/expr.c:151 src/groups.c:36
 msgid "James Youngman"
 msgstr ""
 
-#: src/expr.c:203
+#: src/expr.c:202
 #, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
@@ -3959,7 +4009,7 @@ msgstr ""
 "用法：%s 表示�\n"
 "  或：%s �項\n"
 
-#: src/expr.c:211
+#: src/expr.c:210
 msgid ""
 "\n"
 "Print the value of EXPRESSION to standard output.  A blank line below\n"
@@ -3970,7 +4020,7 @@ msgid ""
 "  ARG1 & ARG2       ARG1 if neither argument is null or 0, otherwise 0\n"
 msgstr ""
 
-#: src/expr.c:220
+#: src/expr.c:219
 msgid ""
 "\n"
 "  ARG1 < ARG2       ARG1 is less than ARG2\n"
@@ -3981,14 +4031,14 @@ msgid ""
 "  ARG1 > ARG2       ARG1 is greater than ARG2\n"
 msgstr ""
 
-#: src/expr.c:229
+#: src/expr.c:228
 msgid ""
 "\n"
 "  ARG1 + ARG2       arithmetic sum of ARG1 and ARG2\n"
 "  ARG1 - ARG2       arithmetic difference of ARG1 and ARG2\n"
 msgstr ""
 
-#: src/expr.c:236
+#: src/expr.c:235
 #, no-c-format
 msgid ""
 "\n"
@@ -3997,7 +4047,7 @@ msgid ""
 "  ARG1 % ARG2       arithmetic remainder of ARG1 divided by ARG2\n"
 msgstr ""
 
-#: src/expr.c:242
+#: src/expr.c:241
 msgid ""
 "\n"
 "  STRING : REGEXP   anchored pattern match of REGEXP in STRING\n"
@@ -4008,7 +4058,7 @@ msgid ""
 "  length STRING              length of STRING\n"
 msgstr ""
 
-#: src/expr.c:251
+#: src/expr.c:250
 msgid ""
 "  + TOKEN                    interpret TOKEN as a string, even if it is a\n"
 "                               keyword like 'match' or an operator like '/'\n"
@@ -4016,7 +4066,7 @@ msgid ""
 "  ( EXPRESSION )             value of EXPRESSION\n"
 msgstr ""
 
-#: src/expr.c:257
+#: src/expr.c:256
 msgid ""
 "\n"
 "Beware that many operators need to be escaped or quoted for shells.\n"
@@ -4026,7 +4076,7 @@ msgid ""
 "0.\n"
 msgstr ""
 
-#: src/expr.c:264
+#: src/expr.c:263
 msgid ""
 "\n"
 "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -4034,32 +4084,32 @@ msgid ""
 "or 0, 2 if EXPRESSION is syntactically invalid, and 3 if an error occurred.\n"
 msgstr ""
 
-#: src/expr.c:278
+#: src/expr.c:277
 #, c-format
 msgid "syntax error"
 msgstr "格�錯誤"
 
-#: src/expr.c:599 src/ptx.c:283
+#: src/expr.c:591 src/ptx.c:284
 #, fuzzy, c-format
 msgid "error in regular expression matcher"
 msgstr "在正��算��尋時發生錯誤"
 
-#: src/expr.c:791 src/expr.c:828
+#: src/expr.c:783 src/expr.c:820
 #, fuzzy, c-format
 msgid "non-integer argument"
 msgstr "�數�果�是數字"
 
-#: src/expr.c:793 src/truncate.c:314
+#: src/expr.c:785 src/truncate.c:314
 #, c-format
 msgid "division by zero"
 msgstr "被 0 整除"
 
-#: src/expr.c:887 src/sort.c:2044
+#: src/expr.c:879 src/sort.c:2077
 #, fuzzy, c-format
 msgid "set LC_ALL='C' to work around the problem"
 msgstr "請設定 LC_ALL='C' ���題出�。"
 
-#: src/expr.c:889
+#: src/expr.c:881
 #, fuzzy, c-format
 msgid "the strings compared were %s and %s"
 msgstr "�比較的字串為%s�%s。"
@@ -4069,27 +4119,27 @@ msgstr "�比較的字串為%s�%s。"
 msgid "Niels Moller"
 msgstr ""
 
-#: src/factor.c:1283 src/factor.c:1383 src/factor.c:1459
+#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443
 #, c-format
 msgid "Lucas prime test failure.  This should not happen"
 msgstr ""
 
-#: src/factor.c:2092
+#: src/factor.c:2076
 #, c-format
 msgid "squfof queue overflow"
 msgstr ""
 
-#: src/factor.c:2419
+#: src/factor.c:2403
 #, fuzzy, c-format
 msgid "%s is not a valid positive integer"
 msgstr "‘%s’ �是有效的正整數"
 
-#: src/factor.c:2442 src/od.c:1646 src/od.c:1715
+#: src/factor.c:2426 src/od.c:1687 src/od.c:1768
 #, c-format
 msgid "%s is too large"
 msgstr "%s �長"
 
-#: src/factor.c:2454
+#: src/factor.c:2438
 #, c-format
 msgid ""
 "Usage: %s [NUMBER]...\n"
@@ -4098,7 +4148,7 @@ msgstr ""
 "用法：%s [數字]...\n"
 "  或：%s �項\n"
 
-#: src/factor.c:2459
+#: src/factor.c:2443
 #, fuzzy
 msgid ""
 "Print the prime factors of each specified integer NUMBER.  If none\n"
@@ -4205,28 +4255,28 @@ msgid "invalid number of columns: %s"
 msgstr "無效的欄�數目：‘%s’"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
+#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78
 #: src/truncate.c:37
 msgid "Padraig Brady"
 msgstr ""
 
-#: src/getlimits.c:65
+#: src/getlimits.c:66
 #, fuzzy, c-format
 msgid "Usage: %s\n"
 msgstr "用法：%s [�項] [檔案]...\n"
 
-#: src/getlimits.c:69
+#: src/getlimits.c:70
 msgid ""
 "Output platform dependent limits in a format useful for shell scripts.\n"
 "\n"
 msgstr ""
 
-#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184
+#: src/group-list.c:69 src/id.c:412
 #, fuzzy, c-format
 msgid "failed to get groups for user %s"
 msgstr "無法將 %s 的所屬群組更改為 %s\n"
 
-#: src/group-list.c:74 src/id.c:370
+#: src/group-list.c:74 src/id.c:415
 #, fuzzy, c-format
 msgid "failed to get groups for the current process"
 msgstr "無法將 %s 的所屬群組更改為 %s\n"
@@ -4248,22 +4298,22 @@ msgid ""
 "the current process (which may differ if the groups database has changed).\n"
 msgstr ""
 
-#: src/groups.c:105 src/id.c:233
+#: src/groups.c:105 src/id.c:274
 #, fuzzy, c-format
 msgid "cannot get real UID"
 msgstr "���時�略使用者和所屬群組"
 
-#: src/groups.c:110 src/id.c:241
+#: src/groups.c:110 src/id.c:282
 #, fuzzy, c-format
 msgid "cannot get effective GID"
-msgstr "無法設定時間"
+msgstr "無法讀�時間"
 
-#: src/groups.c:115 src/id.c:246
+#: src/groups.c:115 src/id.c:287
 #, fuzzy, c-format
 msgid "cannot get real GID"
 msgstr "���時�略使用者和所屬群組"
 
-#: src/groups.c:128 src/id.c:206
+#: src/groups.c:128 src/id.c:246
 #, fuzzy, c-format
 msgid "%s: no such user"
 msgstr "%s：此用戶�存在"
@@ -4316,58 +4366,48 @@ msgstr ""
 "GB=1000*1000*1000，G=1024*1024*1024，還有 T/P/E/Z/Y 如此類推。\n"
 "�個 <關�字> �以是：\n"
 
-#: src/head.c:154
+#: src/head.c:151
 #, c-format
 msgid "%s: file has shrunk too much"
 msgstr ""
 
-#: src/head.c:227 src/head.c:1051
+#: src/head.c:237 src/head.c:1052
 #, c-format
 msgid "%s: number of bytes is too large"
 msgstr "%s：�元組數目�大"
 
-#: src/head.c:440
-#, fuzzy, c-format
-msgid "%s: cannot lseek back to original position"
-msgstr "%s：無法�尋至原來�置"
-
-#: src/head.c:612 src/head.c:691 src/tail.c:449
+#: src/head.c:422 src/tail.c:453
 #, c-format
 msgid "%s: cannot seek to offset %s"
 msgstr "%s：無法�尋至�置 %s"
 
-#: src/head.c:673
+#: src/head.c:423 src/tail.c:457
 #, fuzzy, c-format
-msgid "%s: failed to reset file pointer"
-msgstr "%s：無法移除"
-
-#: src/head.c:798
-#, c-format
-msgid "cannot reposition file pointer for %s"
-msgstr "無法將 %s 的檔案指標�新定�"
+msgid "%s: cannot seek to relative offset %s"
+msgstr "%s：無法�尋至相��置 %s%s"
 
-#: src/head.c:885
+#: src/head.c:886
 #, c-format
 msgid "%s: %s is so large that it is not representable"
 msgstr "%s：%s�大，因此無法表示"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of lines"
 msgstr "行數"
 
-#: src/head.c:886
+#: src/head.c:887
 msgid "number of bytes"
 msgstr "�元組數目"
 
-#: src/head.c:893 src/tail.c:1947
+#: src/head.c:894 src/tail.c:2005
 msgid "invalid number of lines"
 msgstr "無效的行數"
 
-#: src/head.c:894 src/tail.c:1948
+#: src/head.c:895 src/tail.c:2006
 msgid "invalid number of bytes"
 msgstr "無效的�元組數目"
 
-#: src/head.c:981 src/head.c:1039
+#: src/head.c:982 src/head.c:1040
 #, fuzzy, c-format
 msgid "invalid trailing option -- %c"
 msgstr "�項無效 ─ %c"
@@ -4411,28 +4451,34 @@ msgid "cannot determine hostname"
 msgstr "無法決定主機�稱"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/id.c:38 src/touch.c:42
+#: src/id.c:40 src/touch.c:42
 msgid "Arnold Robbins"
 msgstr ""
 
-#: src/id.c:81
-#, c-format
-msgid "Usage: %s [OPTION]... [USERNAME]\n"
-msgstr "用法：%s [�項]... [用戶�稱]\n"
+#: src/id.c:84
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]... [USER]\n"
+msgstr "用法：%s [�項]... [檔案]...\n"
 
-#: src/id.c:82
-#, fuzzy
+#: src/id.c:85
 msgid ""
-"Print user and group information for the specified USERNAME,\n"
-"or (when USERNAME omitted) for the current user.\n"
+"Print user and group information for the specified USER,\n"
+"or (when USER omitted) for the current user.\n"
 "\n"
-"  -a              ignore, for compatibility with other versions\n"
-"  -Z, --context   print only the security context of the current user\n"
-"  -g, --group     print only the effective group ID\n"
-"  -G, --groups    print all group IDs\n"
-"  -n, --name      print a name instead of a number, for -ugG\n"
-"  -r, --real      print the real ID instead of the effective ID, with -ugG\n"
-"  -u, --user      print only the effective user ID\n"
+msgstr ""
+
+#: src/id.c:90
+#, fuzzy
+msgid ""
+"  -a             ignore, for compatibility with other versions\n"
+"  -Z, --context  print only the security context of the process\n"
+"  -g, --group    print only the effective group ID\n"
+"  -G, --groups   print all group IDs\n"
+"  -n, --name     print a name instead of a number, for -ugG\n"
+"  -r, --real     print the real ID instead of the effective ID, with -ugG\n"
+"  -u, --user     print only the effective user ID\n"
+"  -z, --zero     delimit entries with NUL characters, not whitespace;\n"
+"                   not permitted in default format\n"
 msgstr ""
 "顯示有關 <用戶�稱> 的資訊，沒有指定的話則顯示目�的用戶的資訊。\n"
 "\n"
@@ -4443,7 +4489,7 @@ msgstr ""
 "  -r, --real      �� -u/-g/-G �項時，顯示真正的 ID 而�是 effective ID\n"
 "  -u, --user      �顯示 effective user ID\n"
 
-#: src/id.c:96
+#: src/id.c:103
 msgid ""
 "\n"
 "Without any OPTION, print some useful set of identified information.\n"
@@ -4451,116 +4497,126 @@ msgstr ""
 "\n"
 "�加上任何�項的話，顯示一些有用的身分識別資訊。\n"
 
-#: src/id.c:140
+#: src/id.c:151
+#, c-format
+msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel"
+msgstr ""
+
+#: src/id.c:156
 #, c-format
 msgid "--context (-Z) works only on an SELinux-enabled kernel"
 msgstr ""
 
-#: src/id.c:175
+#: src/id.c:195
 #, c-format
 msgid "cannot print security context when user specified"
 msgstr ""
 
-#: src/id.c:178
+#: src/id.c:198
 #, fuzzy, c-format
 msgid "cannot print \"only\" of more than one choice"
 msgstr "�能用超�一種方�進行分割"
 
-#: src/id.c:185
+#: src/id.c:205
 #, c-format
 msgid "cannot print only names or real IDs in default format"
 msgstr "在�設的輸出格�中��能�顯示�稱或者真正的 ID"
 
-#: src/id.c:199
+#: src/id.c:209
+#, fuzzy, c-format
+msgid "option --zero not permitted in default format"
+msgstr "在�設的輸出格�中��能�顯示�稱或者真正的 ID"
+
+#: src/id.c:225
 #, c-format
 msgid "can't get process context"
 msgstr ""
 
-#: src/id.c:224
+#: src/id.c:265
 #, fuzzy, c-format
 msgid "cannot get effective UID"
-msgstr "無法設定時間"
+msgstr "無法讀�時間"
 
-#: src/id.c:311
+#: src/id.c:354
 #, fuzzy, c-format
 msgid "cannot find name for user ID %s"
 msgstr "%s: 找�到 UID 為 %lu 的用戶�稱\n"
 
-#: src/id.c:329
+#: src/id.c:372
 #, c-format
 msgid "uid=%s"
 msgstr ""
 
-#: src/id.c:334
+#: src/id.c:377
 #, c-format
 msgid " gid=%s"
 msgstr ""
 
-#: src/id.c:341
+#: src/id.c:384
 #, c-format
 msgid " euid=%s"
 msgstr ""
 
-#: src/id.c:349
+#: src/id.c:392
 #, c-format
 msgid " egid=%s"
 msgstr ""
 
-#: src/id.c:377
+#: src/id.c:421
 msgid " groups="
 msgstr ""
 
-#: src/id.c:393
+#: src/id.c:437
 #, c-format
 msgid " context=%s"
 msgstr ""
 
-#: src/install.c:373
+#: src/install.c:376
 #, fuzzy, c-format
 msgid "warning: %s: failed to change context to %s"
 msgstr "無法建立目錄%s"
 
-#: src/install.c:414
+#: src/install.c:417
 #, c-format
 msgid "creating directory %s"
 msgstr "正在建立目錄 %s"
 
-#: src/install.c:482
+#: src/install.c:485
 #, c-format
 msgid "cannot change ownership of %s"
 msgstr "無法更改 %s 的�有權"
 
-#: src/install.c:506
+#: src/install.c:509
 #, c-format
 msgid "cannot set time stamps for %s"
 msgstr "無法設定 %s 的檔案時間"
 
-#: src/install.c:527 src/split.c:426 src/timeout.c:439
+#: src/install.c:531 src/split.c:425 src/timeout.c:442
 #, c-format
 msgid "fork system call failed"
 msgstr "調用 fork() 系統函�失敗"
 
-#: src/install.c:531
+#: src/install.c:535
 #, fuzzy, c-format
 msgid "cannot run %s"
 msgstr "無法執行 strip 指令"
 
-#: src/install.c:535
+#: src/install.c:539
 #, fuzzy, c-format
 msgid "waiting for strip"
 msgstr "正在寫入 %s"
 
-#: src/install.c:537
+#: src/install.c:541
 #, c-format
 msgid "strip process terminated abnormally"
 msgstr ""
 
-#: src/install.c:558
+#: src/install.c:565
 #, c-format
 msgid "invalid user %s"
 msgstr "使用者 %s 無效"
 
-#: src/install.c:594
+#: src/install.c:601
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -4573,7 +4629,7 @@ msgstr ""
 "  或：%s [�項]... -t 目錄 來�...\n"
 "  或：%s [�項]... -d 目錄...\n"
 
-#: src/install.c:601
+#: src/install.c:608
 #, fuzzy
 msgid ""
 "\n"
@@ -4592,7 +4648,7 @@ msgstr ""
 "在第四種格�中，會建立所有指定的目錄�它們的所有上層目錄。\n"
 "\n"
 
-#: src/install.c:615
+#: src/install.c:622
 #, fuzzy
 msgid ""
 "      --backup[=CONTROL]  make a backup of each existing destination file\n"
@@ -4610,7 +4666,7 @@ msgstr ""
 "  -d, --directory     所有�數都作為目錄處�；而且會建立指定目錄的所有主目"
 "錄\n"
 
-#: src/install.c:624
+#: src/install.c:631
 msgid ""
 "  -D                  create all leading components of DEST except the "
 "last,\n"
@@ -4627,7 +4683,7 @@ msgstr ""
 "  -m, --mode=模�     自行指定權�模� (� chmod)，而�是 rwxr-xr-x\n"
 "  -o, --owner=�有者  自行指定�有者 (��用於最大權力使用者)\n"
 
-#: src/install.c:631
+#: src/install.c:638
 #, fuzzy
 msgid ""
 "  -p, --preserve-timestamps   apply access/modification times of SOURCE "
@@ -4649,60 +4705,57 @@ msgstr ""
 "  -T, --no-target-directory    將目的地看�普通檔案\n"
 "  -v, --verbose       建立�個目錄時都顯示�稱\n"
 
-#: src/install.c:641
+#: src/install.c:648
 msgid ""
 "      --preserve-context  preserve SELinux security context\n"
-"  -Z, --context=CONTEXT  set SELinux security context of files and "
-"directories\n"
+"  -Z                      set SELinux security context of destination\n"
+"                            file to default type\n"
+"      --context[=CTX]     like -Z, or if CTX is specified then set the\n"
+"                            SELinux or SMACK security context to CTX\n"
 msgstr ""
 
-#: src/install.c:859
+#: src/install.c:696 src/unlink.c:86
 #, c-format
-msgid ""
-"WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
-msgstr ""
+msgid "cannot unlink %s"
+msgstr "無法 unlink %s"
 
-#: src/install.c:869
+#: src/install.c:877
 #, c-format
-msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled"
+msgid ""
+"WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled"
 msgstr ""
 
-#: src/install.c:886
+#: src/install.c:917
 #, c-format
 msgid "the strip option may not be used when installing a directory"
 msgstr "建立目錄時�能用 strip �項"
 
-#: src/install.c:889
+#: src/install.c:920
 #, c-format
 msgid "target directory not allowed when installing a directory"
 msgstr "建立目錄時�能指定目的地目錄"
 
-#: src/install.c:893
-#, c-format
-msgid "cannot force target context to %s and preserve it"
-msgstr ""
-
-#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326
+#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351
 #, c-format
 msgid "invalid mode %s"
 msgstr "權�模� %s 無效"
 
-#: src/install.c:954
+#: src/install.c:996
 #, c-format
 msgid "WARNING: ignoring --strip-program option as -s option was not specified"
 msgstr ""
 
-#: src/install.c:959
+#: src/install.c:1001
 #, fuzzy, c-format
 msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive"
 msgstr "�能�時使用 --string � --check �項"
 
-#: src/install.c:966
+#: src/install.c:1008
 #, fuzzy, c-format
 msgid "options --compare (-C) and --strip are mutually exclusive"
 msgstr "�出日期所用的�項是互相矛盾的"
 
-#: src/install.c:972
+#: src/install.c:1014
 #, c-format
 msgid ""
 "the --compare (-C) option is ignored when you specify a mode with non-"
@@ -4714,7 +4767,7 @@ msgstr ""
 msgid "Mike Haertel"
 msgstr ""
 
-#: src/join.c:191
+#: src/join.c:195
 #, fuzzy
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
@@ -4734,7 +4787,7 @@ msgstr ""
 "2>\n"
 "  -e 字串           當缺少輸入欄�時，以 <字串> 代替\n"
 
-#: src/join.c:200
+#: src/join.c:204
 #, fuzzy
 msgid ""
 "  -i, --ignore-case  ignore differences in case when comparing fields\n"
@@ -4747,7 +4800,7 @@ msgstr ""
 "  -o 格�           當輸出時�從指定 <格�>\n"
 "  -t 字元           以 <字元> 作為輸入和輸出的欄�分隔符號\n"
 
-#: src/join.c:206
+#: src/join.c:210
 msgid ""
 "  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
 "  -1 FIELD          join on this FIELD of file 1\n"
@@ -4759,7 +4812,13 @@ msgid ""
 "                      print them without trying to pair them\n"
 msgstr ""
 
-#: src/join.c:218
+#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204
+#, fuzzy
+msgid "  -z, --zero-terminated     line delimiter is NUL, not newline\n"
+msgstr ""
+"  -z, --zero-terminated     以�元組 0 而� newline 字元作為�行的��字元\n"
+
+#: src/join.c:225
 #, fuzzy
 msgid ""
 "\n"
@@ -4785,47 +4844,47 @@ msgstr ""
 "�併的欄�，然後是 <檔案1> 的其它欄�，最後是 <檔案2> 的其它欄�，全部皆以\n"
 "<字元> 來分隔。\n"
 
-#: src/join.c:403
+#: src/join.c:410
 #, c-format
 msgid "%s:%<PRIuMAX>: is not sorted: %.*s"
 msgstr ""
 
-#: src/join.c:840 src/join.c:1038
+#: src/join.c:847 src/join.c:1045
 #, c-format
 msgid "invalid field number: %s"
 msgstr "無效的欄�編號：%s"
 
-#: src/join.c:861 src/join.c:870
+#: src/join.c:868 src/join.c:877
 #, fuzzy, c-format
 msgid "invalid field specifier: %s"
 msgstr "無效的欄��格：‘%s’"
 
-#: src/join.c:877
+#: src/join.c:884
 #, fuzzy, c-format
 msgid "invalid file number in field spec: %s"
 msgstr "欄��格中�有無效的檔案編號：‘%s’"
 
-#: src/join.c:920
+#: src/join.c:927
 #, c-format
 msgid "incompatible join fields %lu, %lu"
 msgstr ""
 
-#: src/join.c:1049
+#: src/join.c:1056
 #, c-format
 msgid "conflicting empty-field replacement strings"
 msgstr ""
 
-#: src/join.c:1101 src/sort.c:4468
+#: src/join.c:1108 src/sort.c:4509
 #, fuzzy, c-format
 msgid "multi-character tab %s"
 msgstr "分隔欄�字元‘%s’多於一個字元"
 
-#: src/join.c:1105 src/sort.c:4473
+#: src/join.c:1112 src/sort.c:4514
 #, c-format
 msgid "incompatible tabs"
 msgstr ""
 
-#: src/join.c:1174
+#: src/join.c:1185
 #, c-format
 msgid "both files cannot be standard input"
 msgstr "兩個檔案�能都是標準輸入"
@@ -4931,47 +4990,47 @@ msgstr ""
 msgid "cannot create link %s to %s"
 msgstr "無法建立連至 %2$s 的�� %1$s"
 
-#: src/ln.c:190
+#: src/ln.c:206
 #, c-format
 msgid "%s: hard link not allowed for directory"
 msgstr "%s: ��許將實際�� (hard link) 連至目錄"
 
-#: src/ln.c:255
+#: src/ln.c:271
 #, c-format
 msgid "%s: cannot overwrite directory"
 msgstr "%s：��以覆寫目錄"
 
-#: src/ln.c:260
+#: src/ln.c:276
 #, c-format
 msgid "%s: replace %s? "
 msgstr "%s：是�置� %s? "
 
-#: src/ln.c:345
+#: src/ln.c:362
 #, fuzzy, c-format
 msgid "failed to create symbolic link %s"
 msgstr "無法建立符號�� %s"
 
-#: src/ln.c:346
+#: src/ln.c:363
 #, fuzzy, c-format
 msgid "failed to create symbolic link %s -> %s"
 msgstr "��以建立連至 %2$s 的符號�� %1$s"
 
-#: src/ln.c:348
+#: src/ln.c:365
 #, fuzzy, c-format
 msgid "failed to create hard link to %.0s%s"
 msgstr "��以建立連至 %2$s 的實際�� (hard link) %1$s"
 
-#: src/ln.c:351
+#: src/ln.c:368
 #, fuzzy, c-format
 msgid "failed to create hard link %s"
 msgstr "��以建立連至 %2$s 的實際�� (hard link) %1$s"
 
-#: src/ln.c:352
+#: src/ln.c:369
 #, fuzzy, c-format
 msgid "failed to create hard link %s => %s"
 msgstr "��以建立連至 %2$s 的實際�� (hard link) %1$s"
 
-#: src/ln.c:374
+#: src/ln.c:391
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [-T] TARGET LINK_NAME   (1st form)\n"
@@ -4983,7 +5042,7 @@ msgstr ""
 "  或：%s [�項]... 來�... 目錄   (第二種格�)\n"
 "  或：%s -d [�項]... 目錄...     (第三種格�)\n"
 
-#: src/ln.c:381
+#: src/ln.c:398
 #, fuzzy
 msgid ""
 "In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
@@ -5003,7 +5062,7 @@ msgstr ""
 "都必須存在。\n"
 "\n"
 
-#: src/ln.c:394
+#: src/ln.c:411
 #, fuzzy
 msgid ""
 "      --backup[=CONTROL]      make a backup of each existing destination "
@@ -5022,8 +5081,7 @@ msgstr ""
 "者)\n"
 "  -f, --force                 強迫移除任何已存在的目的地檔案\n"
 
-#: src/ln.c:402
-#, fuzzy
+#: src/ln.c:419
 msgid ""
 "  -i, --interactive           prompt whether to remove destinations\n"
 "  -L, --logical               dereference TARGETs that are symbolic links\n"
@@ -5034,13 +5092,8 @@ msgid ""
 "location\n"
 "  -s, --symbolic              make symbolic links instead of hard links\n"
 msgstr ""
-"  -n, --no-dereference        如果目的地是一個連�至�目錄的符號��，會將\n"
-"                              該符號��當作普通檔案處�，會先備份或移除該\n"
-"                              ��\n"
-"  -i, --interactive           確�是�移除目的地檔案\n"
-"  -s, --symbolic              建立符號��而�是實際��\n"
 
-#: src/ln.c:411
+#: src/ln.c:428
 #, fuzzy
 msgid ""
 "  -S, --suffix=SUFFIX         override the usual backup suffix\n"
@@ -5054,7 +5107,7 @@ msgstr ""
 "      --target-directory=目錄 在指定 <目錄> 中建立��\n"
 "  -v, --verbose               連��先�出�個檔案的�稱\n"
 
-#: src/ln.c:433
+#: src/ln.c:450
 #, c-format
 msgid ""
 "\n"
@@ -5062,12 +5115,12 @@ msgid ""
 "behavior when a TARGET is a symbolic link, defaulting to %s.\n"
 msgstr ""
 
-#: src/ln.c:554
+#: src/ln.c:571
 #, fuzzy, c-format
 msgid "cannot combine --target-directory and --no-target-directory"
 msgstr "%s已存在但�是目錄"
 
-#: src/ln.c:588
+#: src/ln.c:605
 #, fuzzy, c-format
 msgid "cannot do --relative without --symbolic"
 msgstr "無法建立符號�� %s"
@@ -5098,7 +5151,7 @@ msgstr "%s：無效的號碼"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:732
+#: src/ls.c:734
 #, fuzzy
 msgid "%b %e  %Y"
 msgstr "%Y-%m-%d %H:%M"
@@ -5108,96 +5161,96 @@ msgstr "%Y-%m-%d %H:%M"
 #. Note %b is handled specially by ls and aligned correctly.
 #. Note also that specifying a width as in %5b is erroneous as strftime
 #. will count bytes rather than characters in multibyte locales.
-#: src/ls.c:745
+#: src/ls.c:747
 #, fuzzy
 msgid "%b %e %H:%M"
 msgstr "%Y-%m-%d %H:%M"
 
-#: src/ls.c:1580
+#: src/ls.c:1590
 #, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr "忽略無效的環境變數 QUOTING_STYLE 的變數值：%s"
 
-#: src/ls.c:1599
+#: src/ls.c:1609
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr "忽略無效的環境變數 COLUMNS 的寬度數值：%s"
 
-#: src/ls.c:1629
+#: src/ls.c:1639
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr "忽略無效的環境變數 TABSIZE 的 tab 字元定�值：%s"
 
-#: src/ls.c:1750 src/ptx.c:1975
+#: src/ls.c:1760 src/ptx.c:1978
 #, fuzzy, c-format
 msgid "invalid line width: %s"
 msgstr "無效的寬度：‘%s’"
 
-#: src/ls.c:1824
+#: src/ls.c:1834
 #, fuzzy, c-format
 msgid "invalid tab size: %s"
 msgstr "無效的類型‘%s’"
 
-#: src/ls.c:2033
+#: src/ls.c:2043
 #, fuzzy, c-format
 msgid "invalid time style format %s"
 msgstr "%2$s的�數%1$s無效"
 
-#: src/ls.c:2057
+#: src/ls.c:2067
 #, fuzzy
 msgid "Valid arguments are:\n"
 msgstr "有效的�數為："
 
-#: src/ls.c:2061
+#: src/ls.c:2071
 msgid "  - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n"
 msgstr ""
 
-#: src/ls.c:2096
+#: src/ls.c:2106
 #, c-format
 msgid "error initializing month strings"
 msgstr ""
 
-#: src/ls.c:2407
+#: src/ls.c:2450
 #, fuzzy, c-format
 msgid "unrecognized prefix: %s"
 msgstr "無法識別的�項‘-%c’"
 
-#: src/ls.c:2437
+#: src/ls.c:2480
 #, c-format
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr "LS_COLORS 環境變數中存在無法分�的值"
 
-#: src/ls.c:2514 src/pwd.c:161
+#: src/ls.c:2557 src/pwd.c:164
 #, fuzzy, c-format
 msgid "cannot open directory %s"
 msgstr "無法建立目錄%s"
 
-#: src/ls.c:2529
+#: src/ls.c:2572
 #, fuzzy, c-format
 msgid "cannot determine device and inode of %s"
 msgstr "無法將 %s 的檔案指標�新定�"
 
-#: src/ls.c:2538
+#: src/ls.c:2581
 #, fuzzy, c-format
 msgid "%s: not listing already-listed directory"
 msgstr "無法建立目錄%s"
 
-#: src/ls.c:2615 src/pwd.c:229
+#: src/ls.c:2658 src/pwd.c:232
 #, fuzzy, c-format
 msgid "reading directory %s"
 msgstr "無法建立目錄%s"
 
-#: src/ls.c:2630
+#: src/ls.c:2673
 #, fuzzy, c-format
 msgid "closing directory %s"
 msgstr "無法進入%s目錄"
 
-#: src/ls.c:3302
+#: src/ls.c:3362
 #, fuzzy, c-format
 msgid "cannot compare file names %s and %s"
 msgstr "�比較的字串為%s�%s。"
 
-#: src/ls.c:4721
+#: src/ls.c:4781
 #, fuzzy
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
@@ -5207,7 +5260,7 @@ msgstr ""
 "如果�指定 -cftuSUX 或 --sort 任何一個�項，則根據字�大�排�。\n"
 "\n"
 
-#: src/ls.c:4728
+#: src/ls.c:4788
 #, fuzzy
 msgid ""
 "  -a, --all                  do not ignore entries starting with .\n"
@@ -5221,18 +5274,18 @@ msgstr ""
 "      --author               �出�個檔案的著作者\n"
 "  -b, --escape               以八進�溢出�列表示��列�的字元\n"
 
-#: src/ls.c:4734
+#: src/ls.c:4794
 #, fuzzy
 msgid ""
-"      --block-size=SIZE      scale sizes by SIZE before printing them.  E."
+"      --block-size=SIZE      scale sizes by SIZE before printing them; e."
 "g.,\n"
 "                               '--block-size=M' prints sizes in units of\n"
-"                               1,048,576 bytes.  See SIZE format below.\n"
+"                               1,048,576 bytes; see SIZE format below\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
 "  -c                         with -lt: sort by, and show, ctime (time of "
 "last\n"
-"                               modification of file status information)\n"
-"                               with -l: show ctime and sort by name\n"
+"                               modification of file status information);\n"
+"                               with -l: show ctime and sort by name;\n"
 "                               otherwise: sort by ctime, newest first\n"
 msgstr ""
 "      --block-size=大�      �段以指定 <大�> 的�元組為單�\n"
@@ -5242,16 +5295,15 @@ msgstr ""
 "                             �� -l ：顯示 ctime 但根據�稱排�\n"
 "                             �則    ：根據 ctime 排�\n"
 
-#: src/ls.c:4744
+#: src/ls.c:4804
 #, fuzzy
 msgid ""
 "  -C                         list entries by columns\n"
-"      --color[=WHEN]         colorize the output.  WHEN defaults to "
-"'always'\n"
-"                               or can be 'never' or 'auto'.  More info "
-"below\n"
-"  -d, --directory            list directory entries instead of contents,\n"
-"                               and do not dereference symbolic links\n"
+"      --color[=WHEN]         colorize the output; WHEN can be 'never', "
+"'auto',\n"
+"                               or 'always' (the default); more info below\n"
+"  -d, --directory            list directories themselves, not their "
+"contents\n"
 "  -D, --dired                generate output designed for Emacs' dired mode\n"
 msgstr ""
 "  -C                         �欄由上至下列出項目\n"
@@ -5260,7 +5312,7 @@ msgstr ""
 "  -d, --directory            當�到目錄時列出目錄本身而�目錄內的檔案\n"
 "  -D, --dired                產生�� Emacs 的 dired 模�使用的�果\n"
 
-#: src/ls.c:4752
+#: src/ls.c:4812
 #, fuzzy
 msgid ""
 "  -f                         do not sort, enable -aU, disable -ls --color\n"
@@ -5276,23 +5328,24 @@ msgstr ""
 "                               single-column -1，verbose -l，vertical -C\n"
 "      --full-time            � -l --time-style=full-iso\n"
 
-#: src/ls.c:4760
+#: src/ls.c:4820
 msgid "  -g                         like -l, but do not list owner\n"
 msgstr ""
 
-#: src/ls.c:4763
+#: src/ls.c:4823
 msgid ""
 "      --group-directories-first\n"
-"                             group directories before files.\n"
-"                               augment with a --sort option, but any\n"
+"                             group directories before files;\n"
+"                               can be augmented with a --sort option, but "
+"any\n"
 "                               use of --sort=none (-U) disables grouping\n"
 msgstr ""
 
-#: src/ls.c:4769
+#: src/ls.c:4829
 #, fuzzy
 msgid ""
 "  -G, --no-group             in a long listing, don't print group names\n"
-"  -h, --human-readable       with -l, print sizes in human readable format\n"
+"  -h, --human-readable       with -l and/or -s, print human readable sizes\n"
 "                               (e.g., 1K 234M 2G)\n"
 "      --si                   likewise, but use powers of 1000 not 1024\n"
 msgstr ""
@@ -5301,7 +5354,7 @@ msgstr ""
 "  -h, --human-readable  以容易�解的格��出檔案系統大� (例如 1K 234M 2G)\n"
 "  -H, --si              類似 -h，但以 1000 為單�而�是 1024\n"
 
-#: src/ls.c:4775
+#: src/ls.c:4835
 #, fuzzy
 msgid ""
 "  -H, --dereference-command-line\n"
@@ -5309,7 +5362,7 @@ msgid ""
 "line\n"
 "      --dereference-command-line-symlink-to-dir\n"
 "                             follow each command line symbolic link\n"
-"                             that points to a directory\n"
+"                               that points to a directory\n"
 "      --hide=PATTERN         do not list implied entries matching shell "
 "PATTERN\n"
 "                               (overridden by -a or -A)\n"
@@ -5320,7 +5373,7 @@ msgstr ""
 "      --si                   類似 -h，但� 1000 的次方而�是 1024\n"
 "  -H, --dereference-command-line    使用指令列中的符號��指示的真正目的地\n"
 
-#: src/ls.c:4785
+#: src/ls.c:4845
 #, fuzzy
 msgid ""
 "      --indicator-style=WORD  append indicator with style WORD to entry "
@@ -5330,7 +5383,7 @@ msgid ""
 "  -i, --inode                print the index number of each file\n"
 "  -I, --ignore=PATTERN       do not list implied entries matching shell "
 "PATTERN\n"
-"  -k, --kibibytes            use 1024-byte blocks\n"
+"  -k, --kibibytes            default to 1024-byte blocks for disk usage\n"
 msgstr ""
 "      --indicator-style=方� 指定在�個項目�稱後加上指示符號 <方�>：\n"
 "                               none (�設)，classify (-F)，file-type (-p)\n"
@@ -5338,7 +5391,7 @@ msgstr ""
 "  -I, --ignore=樣�          ��出任何符� shell �用字元 <樣�> 的項目\n"
 "  -k                         � --block-size=1K\n"
 
-#: src/ls.c:4795
+#: src/ls.c:4855
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -5352,7 +5405,7 @@ msgstr ""
 "                               的目標而並�符號��本身的資訊\n"
 "  -m                         所有項目以逗號分隔，並填滿整行行寬\n"
 
-#: src/ls.c:4803
+#: src/ls.c:4863
 #, fuzzy
 msgid ""
 "  -n, --numeric-uid-gid      like -l, but list numeric user and group IDs\n"
@@ -5369,12 +5422,12 @@ msgstr ""
 "  -o                         類似 -l，但�列出有關群組的資訊\n"
 "  -p, --file-type            加上檔案類型的指示符號 (/=@| 其中一個)\n"
 
-#: src/ls.c:4811
+#: src/ls.c:4871
 #, fuzzy
 msgid ""
-"  -q, --hide-control-chars   print ? instead of non graphic characters\n"
-"      --show-control-chars   show non graphic characters as-is (default\n"
-"                             unless program is 'ls' and output is a "
+"  -q, --hide-control-chars   print ? instead of nongraphic characters\n"
+"      --show-control-chars   show nongraphic characters as-is (the default,\n"
+"                               unless program is 'ls' and output is a "
 "terminal)\n"
 "  -Q, --quote-name           enclose entry names in double quotes\n"
 "      --quoting-style=WORD   use quoting style WORD for entry names:\n"
@@ -5389,7 +5442,7 @@ msgstr ""
 "                               literal�locale�shell�shell-always�c�"
 "escape\n"
 
-#: src/ls.c:4820
+#: src/ls.c:4881
 #, fuzzy
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
@@ -5401,17 +5454,19 @@ msgstr ""
 "  -R, --recursive            �時列出所有�目錄層\n"
 "  -s, --size                 以�段大�為單�列出所有檔案的大�\n"
 
-#: src/ls.c:4825
+#: src/ls.c:4886
 #, fuzzy
 msgid ""
 "  -S                         sort by file size\n"
-"      --sort=WORD            sort by WORD instead of name: none -U,\n"
-"                             extension -X, size -S, time -t, version -v\n"
-"      --time=WORD            with -l, show time as WORD instead of "
-"modification\n"
-"                             time: atime -u, access -u, use -u, ctime -c,\n"
-"                             or status -c; use specified time as sort key\n"
-"                             if --sort=time\n"
+"      --sort=WORD            sort by WORD instead of name: none (-U), size (-"
+"S),\n"
+"                               time (-t), version (-v), extension (-X)\n"
+"      --time=WORD            with -l, show time as WORD instead of default\n"
+"                               modification time: atime or access or use (-"
+"u)\n"
+"                               ctime or status (-c); also use specified "
+"time\n"
+"                               as sort key if --sort=time\n"
 msgstr ""
 "  -S                         根據檔案大�排�\n"
 "      --sort=WORD            以下是��用的 WORD 和它們代表的相應�項：\n"
@@ -5424,17 +5479,19 @@ msgstr ""
 "                               atime�access�use�ctime 或 status；加上\n"
 "                               --sort=time �項時會以指定時間作為排�索引\n"
 
-#: src/ls.c:4835
+#: src/ls.c:4896
 #, fuzzy
 msgid ""
 "      --time-style=STYLE     with -l, show times using style STYLE:\n"
-"                             full-iso, long-iso, iso, locale, +FORMAT.\n"
-"                             FORMAT is interpreted like 'date'; if FORMAT "
-"is\n"
-"                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
-"                             non-recent files and FORMAT2 to recent files;\n"
-"                             if STYLE is prefixed with 'posix-', STYLE\n"
-"                             takes effect only outside the POSIX locale\n"
+"                               full-iso, long-iso, iso, locale, or +FORMAT;\n"
+"                               FORMAT is interpreted like in 'date'; if "
+"FORMAT\n"
+"                               is FORMAT1<newline>FORMAT2, then FORMAT1 "
+"applies\n"
+"                               to non-recent files and FORMAT2 to recent "
+"files;\n"
+"                               if STYLE is prefixed with 'posix-', STYLE\n"
+"                               takes effect only outside the POSIX locale\n"
 msgstr ""
 "      --time-style=樣�      根據 <樣�> 所代表的格�顯示時間：\n"
 "                               full-iso�long-iso�iso�locale�+FORMAT\n"
@@ -5446,17 +5503,17 @@ msgstr ""
 "  -t                         根據修改時間排�\n"
 "  -T, --tabsize=寬度         �行指定 tab 的 <寬度>，而� 8 個字元\n"
 
-#: src/ls.c:4844
+#: src/ls.c:4908
 msgid ""
 "  -t                         sort by modification time, newest first\n"
 "  -T, --tabsize=COLS         assume tab stops at each COLS instead of 8\n"
 msgstr ""
 
-#: src/ls.c:4848
+#: src/ls.c:4912
 #, fuzzy
 msgid ""
-"  -u                         with -lt: sort by, and show, access time\n"
-"                               with -l: show access time and sort by name\n"
+"  -u                         with -lt: sort by, and show, access time;\n"
+"                               with -l: show access time and sort by name;\n"
 "                               otherwise: sort by access time\n"
 "  -U                         do not sort; list entries in directory order\n"
 "  -v                         natural sort of (version) numbers within text\n"
@@ -5467,21 +5524,20 @@ msgstr ""
 "  -U                         �進行排�；�檔案系統原有的次�列出項目\n"
 "  -v                         根據版本進行排�\n"
 
-#: src/ls.c:4855
+#: src/ls.c:4919
 #, fuzzy
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
 "  -X                         sort alphabetically by entry extension\n"
-"  -Z, --context              print any SELinux security context of each "
-"file\n"
+"  -Z, --context              print any security context of each file\n"
 "  -1                         list one file per line\n"
 msgstr ""
 "  -f, --fields=LIST       �顯示指定的欄�；�時也�出��分隔符號的\n"
 "                            �一行，除�使用了 -s �項\n"
 "  -n                      (�會作任何處�)\n"
 
-#: src/ls.c:4865
+#: src/ls.c:4929
 msgid ""
 "\n"
 "Using color to distinguish file types is disabled both by default and\n"
@@ -5490,7 +5546,7 @@ msgid ""
 "variable can change the settings.  Use the dircolors command to set it.\n"
 msgstr ""
 
-#: src/ls.c:4872
+#: src/ls.c:4936
 msgid ""
 "\n"
 "Exit status:\n"
@@ -5564,9 +5620,11 @@ msgstr ""
 #, fuzzy
 msgid ""
 "\n"
-"The following three options are useful only when verifying checksums:\n"
+"The following four options are useful only when verifying checksums:\n"
 "      --quiet          don't print OK for each successfully verified file\n"
 "      --status         don't output anything, status code shows success\n"
+"      --strict         exit non-zero for improperly formatted checksum "
+"lines\n"
 "  -w, --warn           warn about improperly formatted checksum lines\n"
 "\n"
 msgstr ""
@@ -5574,12 +5632,7 @@ msgstr ""
 "      --status            �顯示任何�果，�用回傳值表示是��功\n"
 "  -w, --warn              �於�一行�有�正確格�的總和檢查值都顯示警告\n"
 
-#: src/md5sum.c:203
-msgid ""
-"      --strict         with --check, exit non-zero for any invalid input\n"
-msgstr ""
-
-#: src/md5sum.c:208
+#: src/md5sum.c:206
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -5593,170 +5646,196 @@ msgstr ""
 "的輸出�果。�設模�是�出總和檢查值，一個代表檔案類型的字元 (‘*’表示二元\n"
 "碼，‘ ’[空格] 表示文字)，��個 <檔案> 的�稱。\n"
 
-#: src/md5sum.c:523
+#: src/md5sum.c:521
 #, fuzzy, c-format
 msgid "%s: too many checksum lines"
 msgstr "%s：找�到正確格�的 %s 總和檢查值"
 
-#: src/md5sum.c:547
+#: src/md5sum.c:545
 #, fuzzy, c-format
 msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
 msgstr "%s：%lu：該行的 %s 總和檢查值格��正確"
 
-#: src/md5sum.c:572
+#: src/md5sum.c:570
 #, c-format
 msgid "%s: FAILED open or read\n"
 msgstr "%s：開啟或讀�時發生錯誤\n"
 
-#: src/md5sum.c:595
+#: src/md5sum.c:593
 msgid "FAILED"
 msgstr "錯誤"
 
-#: src/md5sum.c:597
+#: src/md5sum.c:595
 msgid "OK"
 msgstr "正確"
 
-#: src/md5sum.c:621
+#: src/md5sum.c:619
 #, c-format
 msgid "%s: no properly formatted %s checksum lines found"
 msgstr "%s：找�到正確格�的 %s 總和檢查值"
 
-#: src/md5sum.c:631
+#: src/md5sum.c:629
 #, fuzzy, c-format
 msgid "WARNING: %<PRIuMAX> line is improperly formatted"
 msgid_plural "WARNING: %<PRIuMAX> lines are improperly formatted"
 msgstr[0] "%s：%lu：該行的 %s 總和檢查值格��正確"
 
-#: src/md5sum.c:639
+#: src/md5sum.c:637
 #, fuzzy, c-format
 msgid "WARNING: %<PRIuMAX> listed file could not be read"
 msgid_plural "WARNING: %<PRIuMAX> listed files could not be read"
 msgstr[0] "警告：無法讀入 %2$d 個%3$s的其中 %1$d 個"
 msgstr[1] "警告：無法讀入 %2$d 個%3$s的其中 %1$d 個"
 
-#: src/md5sum.c:647
+#: src/md5sum.c:645
 #, fuzzy, c-format
 msgid "WARNING: %<PRIuMAX> computed checksum did NOT match"
 msgid_plural "WARNING: %<PRIuMAX> computed checksums did NOT match"
 msgstr[0] "警告：%2$d 個計算出來的%3$s的其中 %1$d 個並�匹�"
 msgstr[1] "警告：%2$d 個計算出來的%3$s的其中 %1$d 個並�匹�"
 
-#: src/md5sum.c:760
+#: src/md5sum.c:764
 #, c-format
 msgid "--tag does not support --text mode"
 msgstr ""
 
-#: src/md5sum.c:766
+#: src/md5sum.c:770
 #, fuzzy, c-format
 msgid "the --tag option is meaningless when verifying checksums"
 msgstr "�項 --status �有在驗證總和檢查值時�有�義"
 
-#: src/md5sum.c:773
+#: src/md5sum.c:777
 #, c-format
 msgid ""
 "the --binary and --text options are meaningless when verifying checksums"
 msgstr "當驗證總和檢查值時，�項 --binary � --text 是沒有�義的"
 
-#: src/md5sum.c:781
+#: src/md5sum.c:785
 #, c-format
 msgid "the --status option is meaningful only when verifying checksums"
 msgstr "�項 --status �有在驗證總和檢查值時�有�義"
 
-#: src/md5sum.c:788
+#: src/md5sum.c:792
 #, c-format
 msgid "the --warn option is meaningful only when verifying checksums"
 msgstr "�項 --warn �有在驗證總和檢查值時�有�義"
 
-#: src/md5sum.c:795
+#: src/md5sum.c:799
 #, fuzzy, c-format
 msgid "the --quiet option is meaningful only when verifying checksums"
 msgstr "�項 --status �有在驗證總和檢查值時�有�義"
 
-#: src/md5sum.c:802
+#: src/md5sum.c:806
 #, fuzzy, c-format
 msgid "the --strict option is meaningful only when verifying checksums"
 msgstr "�項 --status �有在驗證總和檢查值時�有�義"
 
-#: src/mkdir.c:56 src/rmdir.c:164
+#: src/mkdir.c:58 src/rmdir.c:164
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... DIRECTORY...\n"
 msgstr "用法：%s [�項]... [檔案]...\n"
 
-#: src/mkdir.c:57
+#: src/mkdir.c:59
 #, fuzzy
 msgid "Create the DIRECTORY(ies), if they do not already exist.\n"
 msgstr ""
 "若目錄�是已經存在則建立目錄。\n"
 "\n"
 
-#: src/mkdir.c:63
+#: src/mkdir.c:65
 #, fuzzy
 msgid ""
 "  -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n"
 "  -p, --parents     no error if existing, make parent directories as needed\n"
 "  -v, --verbose     print a message for each created directory\n"
-"  -Z, --context=CTX  set the SELinux security context of each created\n"
-"                      directory to CTX\n"
 msgstr ""
 "  -m, --mode=模�   設定權� <模�> (類似 chmod)，而�是 rwxrwxrwx 減 umask\n"
 "  -p, --parents     需�時建立上層目錄，如目錄早已存在則�當作錯誤\n"
 "  -v, --verbose     �次建立新目錄都顯示訊�\n"
 
-#: src/mkdir.c:168
+#: src/mkdir.c:70
+msgid ""
+"  -Z                   set SELinux security context of each created "
+"directory\n"
+"                         to the default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
+msgstr ""
+
+#: src/mkdir.c:127 src/mkdir.c:172
+#, fuzzy, c-format
+msgid "failed to set default creation context for %s"
+msgstr "無法�得 %s 的屬性"
+
+#: src/mkdir.c:191
+#, fuzzy, c-format
+msgid "failed to restore context for %s"
+msgstr "無法�留 %s 的時間"
+
+#: src/mkdir.c:231
 #, fuzzy, c-format
 msgid "created directory %s"
 msgstr "無法建立目錄%s"
 
-#: src/mkfifo.c:51 src/pathchk.c:89
+#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133
+#, c-format
+msgid ""
+"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel"
+msgstr ""
+
+#: src/mkfifo.c:53 src/pathchk.c:89
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... NAME...\n"
 msgstr "用法：%s [�項]... [檔案]...\n"
 
-#: src/mkfifo.c:52
+#: src/mkfifo.c:54
 #, fuzzy
 msgid "Create named pipes (FIFOs) with the given NAMEs.\n"
 msgstr ""
 "以指定的 <�稱> 建立 named pipe (FIFO)。\n"
 "\n"
 
-#: src/mkfifo.c:58 src/mknod.c:60
+#: src/mkfifo.c:60 src/mknod.c:62
 #, fuzzy
 msgid ""
 "  -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n"
 msgstr "  -m, --mode=模�   指定權�模� (類似 chmod)，而�是 a=rw 減 umask\n"
 
-#: src/mkfifo.c:61
+#: src/mkfifo.c:63 src/mknod.c:65
 msgid ""
-"  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n"
+"  -Z                   set the SELinux security context to default type\n"
+"      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n"
+"                         or SMACK security context to CTX\n"
 msgstr ""
 
-#: src/mkfifo.c:121 src/mknod.c:127
+#: src/mkfifo.c:153 src/mknod.c:150
 #, fuzzy, c-format
 msgid "invalid mode"
 msgstr "無效的數字"
 
-#: src/mkfifo.c:126 src/mknod.c:132
+#: src/mkfifo.c:160 src/mknod.c:157
 #, c-format
 msgid "mode must specify only file permission bits"
 msgstr ""
 
-#: src/mknod.c:52
+#: src/mkfifo.c:174 src/mknod.c:269
+#, fuzzy, c-format
+msgid "cannot set permissions of %s"
+msgstr "無法更改%s的權�"
+
+#: src/mknod.c:54
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"
 msgstr "用法：%s [�項]... SET1 [SET2]\n"
 
-#: src/mknod.c:54
+#: src/mknod.c:56
 #, fuzzy
 msgid "Create the special file NAME of the given TYPE.\n"
 msgstr ""
 "建立指定 <類型> � <�稱> 的特殊檔案。\n"
 "\n"
 
-#: src/mknod.c:63
-msgid "  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n"
-msgstr ""
-
-#: src/mknod.c:68
+#: src/mknod.c:72
 msgid ""
 "\n"
 "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n"
@@ -5765,7 +5844,7 @@ msgid ""
 "otherwise, as decimal.  TYPE may be:\n"
 msgstr ""
 
-#: src/mknod.c:75
+#: src/mknod.c:79
 #, fuzzy
 msgid ""
 "\n"
@@ -5781,153 +5860,147 @@ msgstr ""
 "  c, u   建立 (沒有緩�的) 字元特殊檔案\n"
 "  p      建立 FIFO 特殊檔案\n"
 
-#: src/mknod.c:150
+#: src/mknod.c:175
 #, fuzzy
 msgid "Special files require major and minor device numbers."
 msgstr "建立�塊特殊檔案時，必需指定 major 和 minor �置編號"
 
-#: src/mknod.c:160
+#: src/mknod.c:185
 #, fuzzy
 msgid "Fifos do not have major and minor device numbers."
 msgstr "無效的開始行號：‘%s’"
 
-#: src/mknod.c:176
+#: src/mknod.c:210
 #, fuzzy, c-format
 msgid "block special files not supported"
 msgstr "�塊特殊檔案"
 
-#: src/mknod.c:185
+#: src/mknod.c:219
 #, fuzzy, c-format
 msgid "character special files not supported"
 msgstr "字元特殊檔案"
 
-#: src/mknod.c:201
+#: src/mknod.c:235
 #, fuzzy, c-format
 msgid "invalid major device number %s"
 msgstr "無效的開始行號：‘%s’"
 
-#: src/mknod.c:206
+#: src/mknod.c:240
 #, fuzzy, c-format
 msgid "invalid minor device number %s"
 msgstr "無效的開始行號：‘%s’"
 
-#: src/mknod.c:211
+#: src/mknod.c:245
 #, fuzzy, c-format
 msgid "invalid device %s %s"
 msgstr "%2$s的�數%1$s無效"
 
-#: src/mknod.c:225
+#: src/mknod.c:264
 #, fuzzy, c-format
 msgid "invalid device type %s"
 msgstr "%2$s的�數%1$s無效"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/mktemp.c:37
+#: src/mktemp.c:36
 msgid "Eric Blake"
 msgstr ""
 
-#: src/mktemp.c:68
+#: src/mktemp.c:66
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [TEMPLATE]\n"
 msgstr "用法：%s [�項]... [檔案]\n"
 
-#: src/mktemp.c:69
+#: src/mktemp.c:67
 msgid ""
 "Create a temporary file or directory, safely, and print its name.\n"
 "TEMPLATE must contain at least 3 consecutive 'X's in last component.\n"
 "If TEMPLATE is not specified, use tmp.XXXXXXXXXX, and --tmpdir is implied.\n"
 msgstr ""
 
-#: src/mktemp.c:74
+#: src/mktemp.c:72
 msgid ""
 "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n"
 msgstr ""
 
-#: src/mktemp.c:78
+#: src/mktemp.c:76
 msgid ""
 "  -d, --directory     create a directory, not a file\n"
 "  -u, --dry-run       do not create anything; merely print a name (unsafe)\n"
 "  -q, --quiet         suppress diagnostics about file/dir-creation failure\n"
 msgstr ""
 
-#: src/mktemp.c:83
+#: src/mktemp.c:81
 msgid ""
-"      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain "
+"      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a "
 "slash.\n"
 "                        This option is implied if TEMPLATE does not end in "
-"X.\n"
+"X\n"
 msgstr ""
 
-#: src/mktemp.c:87
+#: src/mktemp.c:85
 msgid ""
-"      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n"
+"  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n"
 "                        specified, use $TMPDIR if set, else /tmp.  With\n"
-"                        this option, TEMPLATE must not be an absolute name.\n"
-"                        Unlike with -t, TEMPLATE may contain slashes, but\n"
+"                        this option, TEMPLATE must not be an absolute name;\n"
+"                        unlike with -t, TEMPLATE may contain slashes, but\n"
 "                        mktemp creates only the final component\n"
 msgstr ""
 
-#: src/mktemp.c:95
+#: src/mktemp.c:92
 msgid ""
-"  -p DIR              use DIR as a prefix; implies -t [deprecated]\n"
 "  -t                  interpret TEMPLATE as a single file name component,\n"
 "                        relative to a directory: $TMPDIR, if set; else the\n"
 "                        directory specified via -p; else /tmp [deprecated]\n"
 msgstr ""
 
-#: src/mktemp.c:223
-#, fuzzy, c-format
-msgid "failed to redirect stderr to /dev/null"
-msgstr "標準輸出"
-
-#: src/mktemp.c:229
+#: src/mktemp.c:210
 #, fuzzy, c-format
 msgid "too many templates"
 msgstr "�複的行數�多"
 
-#: src/mktemp.c:249
+#: src/mktemp.c:230
 #, c-format
 msgid "with --suffix, template %s must end in X"
 msgstr ""
 
-#: src/mktemp.c:274 src/split.c:1130
+#: src/mktemp.c:255 src/split.c:1180
 #, c-format
 msgid "invalid suffix %s, contains directory separator"
 msgstr ""
 
-#: src/mktemp.c:279
+#: src/mktemp.c:260
 #, c-format
 msgid "too few X's in template %s"
 msgstr ""
 
-#: src/mktemp.c:292
+#: src/mktemp.c:276
 #, c-format
 msgid "invalid template, %s, contains directory separator"
 msgstr ""
 
-#: src/mktemp.c:306
+#: src/mktemp.c:290
 #, c-format
 msgid "invalid template, %s; with --tmpdir, it may not be absolute"
 msgstr ""
 
-#: src/mktemp.c:326
+#: src/mktemp.c:311
 #, fuzzy, c-format
 msgid "failed to create directory via template %s"
 msgstr "無法建立目錄%s"
 
-#: src/mktemp.c:336
+#: src/mktemp.c:322
 #, fuzzy, c-format
 msgid "failed to create file via template %s"
 msgstr "無法�留 %s 的時間"
 
-#: src/mv.c:292
+#: src/mv.c:294
 #, fuzzy
 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
 msgstr ""
 "將 <來�> �稱更改為 <目的地> �稱，或將 <來�> 檔案移動至 <目錄>。\n"
 "\n"
 
-#: src/mv.c:298
+#: src/mv.c:300
 #, fuzzy
 msgid ""
 "      --backup[=CONTROL]       make a backup of each existing destination "
@@ -5945,7 +6018,7 @@ msgstr ""
 "  -f, --force                  覆寫檔案��會進行確�，等於 --reply=yes\n"
 "  -i, --interactive            覆寫檔案�必須先確�，等於 --reply=query\n"
 
-#: src/mv.c:307
+#: src/mv.c:309
 #, fuzzy
 msgid ""
 "      --strip-trailing-slashes  remove any trailing slashes from each "
@@ -5957,7 +6030,7 @@ msgstr ""
 "      --strip-trailing-slashes 移除�數中所有 <來�> 檔案/目錄末端的斜號\n"
 "  -S, --suffix=後置字串        自行指定備份檔的 <後置字串>\n"
 
-#: src/mv.c:312
+#: src/mv.c:314
 #, fuzzy
 msgid ""
 "  -t, --target-directory=DIRECTORY  move all SOURCE arguments into "
@@ -5967,6 +6040,8 @@ msgid ""
 "                                 than the destination file or when the\n"
 "                                 destination file is missing\n"
 "  -v, --verbose                explain what is being done\n"
+"  -Z, --context                set SELinux security context of destination\n"
+"                                 file to default type\n"
 msgstr ""
 "      --target-directory=目錄  將所有 <來�> 檔案/目錄移動至 <目錄>\n"
 "  -u, --update                 �在 <來�> 檔案比目的地檔案新，或目的地檔案\n"
@@ -6244,95 +6319,90 @@ msgid "%s: invalid number to ignore"
 msgstr "%s：無效的行數"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/numfmt.c:35
+#: src/numfmt.c:36
 msgid "Assaf Gordon"
 msgstr ""
 
-#: src/numfmt.c:676
+#: src/numfmt.c:659
 #, c-format
-msgid "value too large to be converted: '%s'"
+msgid "value too large to be converted: %s"
 msgstr ""
 
-#: src/numfmt.c:680
+#: src/numfmt.c:663
 #, fuzzy, c-format
-msgid "invalid number: '%s'"
+msgid "invalid number: %s"
 msgstr "數字 %s 無效"
 
-#: src/numfmt.c:684
+#: src/numfmt.c:667
 #, c-format
-msgid "rejecting suffix in input: '%s' (consider using --from)"
+msgid "rejecting suffix in input: %s (consider using --from)"
 msgstr ""
 
-#: src/numfmt.c:688
+#: src/numfmt.c:671
 #, fuzzy, c-format
-msgid "invalid suffix in input: '%s'"
-msgstr "無效的行號增加值：‘%s’"
+msgid "invalid suffix in input: %s"
+msgstr "輸入旗標無效：%s"
 
-#: src/numfmt.c:692
+#: src/numfmt.c:675
 #, c-format
-msgid "missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)"
+msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)"
 msgstr ""
 
-#: src/numfmt.c:723
+#: src/numfmt.c:722 src/numfmt.c:768
 #, fuzzy, c-format
 msgid "failed to prepare value '%Lf' for printing"
 msgstr "%s：無法開啟來寫入資料"
 
-#: src/numfmt.c:787
+#: src/numfmt.c:791
 #, fuzzy, c-format
-msgid "invalid unit size: '%s'"
+msgid "invalid unit size: %s"
 msgstr "無效的類型‘%s’"
 
-#: src/numfmt.c:802 src/numfmt.c:1025 src/numfmt.c:1032
-#, c-format
-msgid "out of memory (requested %zu bytes)"
-msgstr ""
-
-#: src/numfmt.c:813
+#: src/numfmt.c:814
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [NUMBER]...\n"
 msgstr "用法：%s [�項]... [檔案]...\n"
 
-#: src/numfmt.c:816
+#: src/numfmt.c:817
 msgid ""
 "Reformat NUMBER(s), or the numbers from standard input if none are "
 "specified.\n"
 msgstr ""
 
-#: src/numfmt.c:820
+#: src/numfmt.c:821
 msgid "      --debug          print warnings about invalid input\n"
 msgstr ""
 
-#: src/numfmt.c:823
+#: src/numfmt.c:824
 msgid ""
 "  -d, --delimiter=X    use X instead of whitespace for field delimiter\n"
 msgstr ""
 
-#: src/numfmt.c:826
+#: src/numfmt.c:827
 msgid ""
 "      --field=N        replace the number in input field N (default is 1)\n"
 msgstr ""
 
-#: src/numfmt.c:829
+#: src/numfmt.c:830
 msgid ""
 "      --format=FORMAT  use printf style floating-point FORMAT;\n"
 "                         see FORMAT below for details\n"
 msgstr ""
 
-#: src/numfmt.c:833
+#: src/numfmt.c:834
 msgid ""
 "      --from=UNIT      auto-scale input numbers to UNITs; default is "
 "'none';\n"
 "                         see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:837
+#: src/numfmt.c:838
 msgid ""
 "      --from-unit=N    specify the input unit size (instead of the default "
 "1)\n"
 msgstr ""
 
-#: src/numfmt.c:840
+#: src/numfmt.c:841
 msgid ""
 "      --grouping       use locale-defined grouping of digits, e.g. "
 "1,000,000\n"
@@ -6340,19 +6410,19 @@ msgid ""
 "locale)\n"
 msgstr ""
 
-#: src/numfmt.c:844
+#: src/numfmt.c:845
 msgid ""
 "      --header[=N]     print (without converting) the first N header lines;\n"
 "                         N defaults to 1 if not specified\n"
 msgstr ""
 
-#: src/numfmt.c:848
+#: src/numfmt.c:849
 msgid ""
 "      --invalid=MODE   failure mode for invalid numbers: MODE can be:\n"
 "                         abort (default), fail, warn, ignore\n"
 msgstr ""
 
-#: src/numfmt.c:852
+#: src/numfmt.c:853
 msgid ""
 "      --padding=N      pad the output to N characters; positive N will\n"
 "                         right-align; negative N will left-align;\n"
@@ -6362,40 +6432,40 @@ msgid ""
 "                         is found\n"
 msgstr ""
 
-#: src/numfmt.c:859
+#: src/numfmt.c:860
 msgid ""
 "      --round=METHOD   use METHOD for rounding when scaling; METHOD can be:\n"
 "                         up, down, from-zero (default), towards-zero, "
 "nearest\n"
 msgstr ""
 
-#: src/numfmt.c:863
+#: src/numfmt.c:864
 msgid ""
 "      --suffix=SUFFIX  add SUFFIX to output numbers, and accept optional\n"
 "                         SUFFIX in input numbers\n"
 msgstr ""
 
-#: src/numfmt.c:867
+#: src/numfmt.c:868
 msgid ""
 "      --to=UNIT        auto-scale output numbers to UNITs; see UNIT below\n"
 msgstr ""
 
-#: src/numfmt.c:870
+#: src/numfmt.c:871
 msgid ""
 "      --to-unit=N      the output unit size (instead of the default 1)\n"
 msgstr ""
 
-#: src/numfmt.c:877
+#: src/numfmt.c:878
 msgid ""
 "\n"
 "UNIT options:\n"
 msgstr ""
 
-#: src/numfmt.c:880
+#: src/numfmt.c:881
 msgid "  none       no auto-scaling is done; suffixes will trigger an error\n"
 msgstr ""
 
-#: src/numfmt.c:883
+#: src/numfmt.c:884
 msgid ""
 "  auto       accept optional single/two letter suffix:\n"
 "               1K = 1000,\n"
@@ -6404,7 +6474,7 @@ msgid ""
 "               1Mi = 1048576,\n"
 msgstr ""
 
-#: src/numfmt.c:889
+#: src/numfmt.c:890
 msgid ""
 "  si         accept optional single letter suffix:\n"
 "               1K = 1000,\n"
@@ -6412,7 +6482,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:894
+#: src/numfmt.c:895
 msgid ""
 "  iec        accept optional single letter suffix:\n"
 "               1K = 1024,\n"
@@ -6420,7 +6490,7 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:899
+#: src/numfmt.c:900
 msgid ""
 "  iec-i      accept optional two-letter suffix:\n"
 "               1Ki = 1024,\n"
@@ -6428,18 +6498,18 @@ msgid ""
 "               ...\n"
 msgstr ""
 
-#: src/numfmt.c:905
+#: src/numfmt.c:906
 #, c-format
 msgid ""
 "\n"
 "FORMAT must be suitable for printing one floating-point argument '%f'.\n"
 "Optional quote (%'f) will enable --grouping (if supported by current "
 "locale).\n"
-"Optional width value (%10f) will pad output. Optional negative width values\n"
-"(%-10f) will left-pad output.\n"
+"Optional width value (%10f) will pad output. Optional zero (%010f) width\n"
+"will zero pad the number. Optional negative values (%-10f) will left align.\n"
 msgstr ""
 
-#: src/numfmt.c:912
+#: src/numfmt.c:913
 #, c-format
 msgid ""
 "\n"
@@ -6451,7 +6521,7 @@ msgid ""
 "errors are not diagnosed and the exit status is 0.\n"
 msgstr ""
 
-#: src/numfmt.c:921
+#: src/numfmt.c:922
 #, c-format
 msgid ""
 "\n"
@@ -6472,112 +6542,112 @@ msgid ""
 "  $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n"
 msgstr ""
 
-#: src/numfmt.c:974 src/seq.c:212
+#: src/numfmt.c:976 src/seq.c:214
 #, fuzzy, c-format
 msgid "format %s has no %% directive"
 msgstr "目的地 %s �是目錄"
 
-#: src/numfmt.c:990
+#: src/numfmt.c:1003
 #, fuzzy, c-format
 msgid "invalid format %s (width overflow)"
 msgstr "%2$s的�數%1$s無效"
 
-#: src/numfmt.c:1007 src/seq.c:229
+#: src/numfmt.c:1008
+#, c-format
+msgid "--format padding overridding --padding"
+msgstr ""
+
+#: src/numfmt.c:1027 src/seq.c:231
 #, c-format
 msgid "format %s ends in %%"
 msgstr ""
 
-#: src/numfmt.c:1010
+#: src/numfmt.c:1030
 #, c-format
-msgid "invalid format %s, directive must be %%['][-][N]f"
+msgid "invalid format %s, directive must be %%[0]['][-][N]f"
 msgstr ""
 
-#: src/numfmt.c:1018 src/seq.c:236
+#: src/numfmt.c:1038 src/seq.c:238
 #, c-format
 msgid "format %s has too many %% directives"
 msgstr ""
 
-#: src/numfmt.c:1070
+#: src/numfmt.c:1081
 #, fuzzy, c-format
-msgid "invalid suffix in input '%s': '%s'"
-msgstr "無效的行號增加值：‘%s’"
+msgid "invalid suffix in input %s: %s"
+msgstr "輸入旗標無效：%s"
 
-#: src/numfmt.c:1092
+#: src/numfmt.c:1103
 #, c-format
 msgid "value too large to be printed: '%Lg' (consider using --to)"
 msgstr ""
 
-#: src/numfmt.c:1100
+#: src/numfmt.c:1111
 #, c-format
 msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)"
 msgstr ""
 
-#: src/numfmt.c:1184
+#: src/numfmt.c:1196
 #, c-format
-msgid "large input value '%s': possible precision loss"
+msgid "large input value %s: possible precision loss"
 msgstr ""
 
-#: src/numfmt.c:1293
+#: src/numfmt.c:1308
 #, c-format
 msgid "input line is too short, no numbers found to convert in field %ld"
 msgstr ""
 
-#: src/numfmt.c:1388
+#: src/numfmt.c:1403
 #, fuzzy, c-format
-msgid "invalid padding value '%s'"
-msgstr "無效的類型‘%s’"
+msgid "invalid padding value %s"
+msgstr "日期無效：‘%s’"
 
-#: src/numfmt.c:1401
+#: src/numfmt.c:1417
 #, fuzzy, c-format
-msgid "invalid field value '%s'"
-msgstr "無效的欄�號碼：‘%s’"
+msgid "invalid field value %s"
+msgstr "無效的欄�編號：%s"
 
-#: src/numfmt.c:1430
+#: src/numfmt.c:1447
 #, fuzzy, c-format
-msgid "invalid header value '%s'"
-msgstr "日期無效：‘%s’"
+msgid "invalid header value %s"
+msgstr "無效的欄�號碼：‘%s’"
 
-#: src/numfmt.c:1456
+#: src/numfmt.c:1473
 #, fuzzy, c-format
 msgid "--grouping cannot be combined with --format"
 msgstr "有檔案作為�數時��和 --files0-from 一起使用。"
 
-#: src/numfmt.c:1458
-#, fuzzy, c-format
-msgid "--padding cannot be combined with --format"
-msgstr "有檔案作為�數時��和 --files0-from 一起使用。"
-
-#: src/numfmt.c:1463
+#: src/numfmt.c:1478
 #, fuzzy, c-format
 msgid "no conversion option specified"
-msgstr "-l 或 -t �項使用了多於一次"
+msgstr "未指定進程編號"
 
-#: src/numfmt.c:1471
+#: src/numfmt.c:1486
 #, fuzzy, c-format
 msgid "grouping cannot be combined with --to"
 msgstr "有檔案作為�數時��和 --files0-from 一起使用。"
 
-#: src/numfmt.c:1473
+#: src/numfmt.c:1488
 #, c-format
 msgid "grouping has no effect in this locale"
 msgstr ""
 
-#: src/numfmt.c:1486
+#: src/numfmt.c:1501
 #, c-format
 msgid "--header ignored with command-line input"
 msgstr ""
 
-#: src/numfmt.c:1511
+#: src/numfmt.c:1526
 #, fuzzy, c-format
 msgid "error reading input"
 msgstr "讀� %s 時發生錯誤"
 
-#: src/numfmt.c:1520
-#, fuzzy, c-format
+#: src/numfmt.c:1535
+#, c-format
 msgid "failed to convert some of the input numbers"
-msgstr "標準輸出"
+msgstr ""
 
-#: src/od.c:294
+#: src/od.c:320
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -6588,7 +6658,7 @@ msgstr ""
 "用法：%s [�項]... [檔案]...\n"
 "  或：%s --traditional [檔案] [[+]�移值 [[+]標號]]\n"
 
-#: src/od.c:300
+#: src/od.c:326
 msgid ""
 "\n"
 "Write an unambiguous representation, octal bytes by default,\n"
@@ -6604,7 +6674,7 @@ msgstr ""
 "輸入讀�資料。\n"
 "\n"
 
-#: src/od.c:307
+#: src/od.c:333
 #, fuzzy
 msgid ""
 "If first and second call formats both apply, the second format is assumed\n"
@@ -6625,26 +6695,25 @@ msgstr ""
 "  a          ASCII 字元或以 ASCII 字元代表的控制字元\n"
 "  c          ASCII 字兀或�斜號溢出�列\n"
 
-#: src/od.c:318
-#, fuzzy
+#: src/od.c:344
 msgid ""
-"  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n"
+"  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n"
 "                                of [doxn], for Decimal, Octal, Hex or None\n"
+"      --endian={big|little}   swap input bytes according the specified "
+"order\n"
 "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
 msgstr ""
-"  -A, --address-radix=RADIX   決定基準��的單�\n"
-"  -j, --skip-bytes=�元組     先略�指定 <�元組> 的輸入資料\n"
 
-#: src/od.c:323
+#: src/od.c:350
 #, fuzzy
 msgid ""
 "  -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n"
 "  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic "
-"chars.\n"
+"chars;\n"
 "                                3 is implied when BYTES is not specified\n"
 "  -t, --format=TYPE           select output format or formats\n"
 "  -v, --output-duplicates     do not use * to mark line suppression\n"
-"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n"
+"  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n"
 "                                32 is implied when BYTES is not specified\n"
 "      --traditional           accept arguments in third form above\n"
 msgstr ""
@@ -6655,7 +6724,7 @@ msgstr ""
 "  -w, --width[=�元組]        �行顯示指定的 <�元組> 數目\n"
 "      --traditional           接�舊�的�項\n"
 
-#: src/od.c:336
+#: src/od.c:363
 #, fuzzy
 msgid ""
 "\n"
@@ -6663,7 +6732,7 @@ msgid ""
 "Traditional format specifications may be intermixed; they accumulate:\n"
 "  -a   same as -t a,  select named characters, ignoring high-order bit\n"
 "  -b   same as -t o1, select octal bytes\n"
-"  -c   same as -t c,  select ASCII characters or backslash escapes\n"
+"  -c   same as -t c,  select printable characters or backslash escapes\n"
 "  -d   same as -t u2, select unsigned decimal 2-byte units\n"
 msgstr ""
 "\n"
@@ -6673,7 +6742,7 @@ msgstr ""
 "  -c   等於 -t c，  顯示 ASCII 字元或�斜號溢出�列\n"
 "  -d   等於 -t u2， 顯示�進� unsigned short\n"
 
-#: src/od.c:345
+#: src/od.c:372
 #, fuzzy
 msgid ""
 "  -f   same as -t fF, select floats\n"
@@ -6690,16 +6759,16 @@ msgstr ""
 "  -o   等於 -t o2， 顯示八進� short integer\n"
 "  -x   等於 -t x2， 顯示�六進� short integer\n"
 
-#: src/od.c:353
+#: src/od.c:380
 msgid ""
 "\n"
 "\n"
 "TYPE is made up of one or more of these specifications:\n"
 "  a          named character, ignoring high-order bit\n"
-"  c          ASCII character or backslash escape\n"
+"  c          printable character or backslash escape\n"
 msgstr ""
 
-#: src/od.c:360
+#: src/od.c:387
 msgid ""
 "  d[SIZE]    signed decimal, SIZE bytes per integer\n"
 "  f[SIZE]    floating point, SIZE bytes per integer\n"
@@ -6713,7 +6782,7 @@ msgstr ""
 "  u[大�]    無正負號的�進�數，�個整數佔指定 <大�> 的�元組\n"
 "  x[大�]    �六進�數，�個整數佔指定 <大�> 的�元組\n"
 
-#: src/od.c:367
+#: src/od.c:394
 #, fuzzy
 msgid ""
 "\n"
@@ -6728,14 +6797,14 @@ msgstr ""
 "表示 sizeof(long) 的 L。如果 <格�> 是 f，<大�> �以是表示 sizeof(float)\n"
 "的 F�表示 sizeof(double) 的 D 或表示 sizeof(long double) 的 L。\n"
 
-#: src/od.c:374
+#: src/od.c:401
 msgid ""
 "\n"
 "Adding a z suffix to any type displays printable characters at the end of\n"
 "each output line.\n"
 msgstr ""
 
-#: src/od.c:379
+#: src/od.c:406
 #, fuzzy
 msgid ""
 "\n"
@@ -6749,17 +6818,15 @@ msgid ""
 "and so on for G, T, P, E, Z, Y.\n"
 msgstr ""
 "\n"
-"<�段數目> � <�元組> �以加上以下的單�：\n"
-"xM=M，c=1，w=2，b=512，kB=1000，K=1024，MB=1000000，M=1048576，\n"
-"GB=1000*1000*1000，G=1024*1024*1024，還有 T/P/E/Z/Y 如此類推。\n"
-"�個 <關�字> �以是：\n"
+"<大�> �以是以下的單� (單���加上整數)：\n"
+"kB=1000，K=1024，MB=1000*1000，M=1024*1024，還有 G/T/P/E/Z/Y 如此類推。\n"
 
-#: src/od.c:639 src/od.c:759
+#: src/od.c:680 src/od.c:800
 #, fuzzy, c-format
 msgid "invalid type string %s"
 msgstr "無效的類型‘%s’"
 
-#: src/od.c:649
+#: src/od.c:690
 #, fuzzy, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -6768,7 +6835,7 @@ msgstr ""
 "‘%s’是無效的類型；\n"
 "此系統�支� %lu �元組的整數"
 
-#: src/od.c:770
+#: src/od.c:811
 #, fuzzy, c-format
 msgid ""
 "invalid type string %s;\n"
@@ -6777,37 +6844,37 @@ msgstr ""
 "‘%s’是無效的類型；\n"
 "此系統�支� %lu �元組的浮點數"
 
-#: src/od.c:828
+#: src/od.c:869
 #, fuzzy, c-format
 msgid "invalid character '%c' in type string %s"
 msgstr "類型‘%2$s’中�有無效的字元‘%1$c’。"
 
-#: src/od.c:1053
+#: src/od.c:1094
 #, c-format
 msgid "cannot skip past end of combined input"
 msgstr "無法移至�併後的輸入資料的末端之後"
 
-#: src/od.c:1609
+#: src/od.c:1650
 #, fuzzy, c-format
 msgid "invalid output address radix '%c'; it must be one character from [doxn]"
 msgstr "輸出��的基數‘%c’是無效的；基數必須是 [doxn] 四個字元其中之一"
 
-#: src/od.c:1735
+#: src/od.c:1788
 #, c-format
 msgid "no type may be specified when dumping strings"
 msgstr "傾�字串時�能指定類型"
 
-#: src/od.c:1810
+#: src/od.c:1863
 #, fuzzy
 msgid "compatibility mode supports at most one file"
 msgstr "在相容性模�下，最多�能有三個�數"
 
-#: src/od.c:1831
+#: src/od.c:1884
 #, c-format
 msgid "skip-bytes + read-bytes is too large"
 msgstr ""
 
-#: src/od.c:1874
+#: src/od.c:1927
 #, c-format
 msgid "warning: invalid width %lu; using %d instead"
 msgstr "警告：寬度 %lu 是無效的；以 %d 代替"
@@ -6963,12 +7030,12 @@ msgstr ""
 msgid "Where"
 msgstr ""
 
-#: src/pinky.c:493
+#: src/pinky.c:495
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [USER]...\n"
 msgstr "用法：%s [�項]... [檔案]...\n"
 
-#: src/pinky.c:494
+#: src/pinky.c:496
 msgid ""
 "\n"
 "  -l              produce long format output for the specified USERs\n"
@@ -6978,7 +7045,7 @@ msgid ""
 "  -s              do short format output, this is the default\n"
 msgstr ""
 
-#: src/pinky.c:502
+#: src/pinky.c:504
 msgid ""
 "  -f              omit the line of column headings in short format\n"
 "  -w              omit the user's full name in short format\n"
@@ -6987,7 +7054,7 @@ msgid ""
 "                  in short format\n"
 msgstr ""
 
-#: src/pinky.c:511
+#: src/pinky.c:513
 #, c-format
 msgid ""
 "\n"
@@ -6995,7 +7062,7 @@ msgid ""
 "The utmp file will be %s.\n"
 msgstr ""
 
-#: src/pinky.c:595
+#: src/pinky.c:597
 #, fuzzy, c-format
 msgid "no username specified; at least one must be specified when using -l"
 msgstr "使用�項 --string 時�能�指定檔案"
@@ -7213,7 +7280,8 @@ msgid ""
 "  -s[CHAR], --separator[=CHAR]\n"
 "                    separate columns by a single character, default for "
 "CHAR\n"
-"                    is the <TAB> character without -w and 'no char' with -w\n"
+"                    is the <TAB> character without -w and 'no char' with -"
+"w.\n"
 "                    -s[CHAR] turns off line truncation of all 3 column\n"
 "                    options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
 msgstr ""
@@ -7224,7 +7292,7 @@ msgstr ""
 "                    和欄�有關的�項截斷�行的資料： -欄��-a -欄��\n"
 "                    -m\n"
 
-#: src/pr.c:2827
+#: src/pr.c:2828
 #, fuzzy
 msgid ""
 "  -S[STRING], --sep-string[=STRING]\n"
@@ -7240,7 +7308,7 @@ msgstr ""
 "                    欄�有關的�項\n"
 "  -t, --omit-header ��出標頭和註腳\n"
 
-#: src/pr.c:2834
+#: src/pr.c:2835
 #, fuzzy
 msgid ""
 "  -T, --omit-pagination\n"
@@ -7264,7 +7332,7 @@ msgstr ""
 "å…ƒ]\n"
 "                    會關閉此效果\n"
 
-#: src/pr.c:2844
+#: src/pr.c:2845
 #, fuzzy
 msgid ""
 "  -W, --page-width=PAGE_WIDTH\n"
@@ -7278,7 +7346,7 @@ msgstr ""
 "                    強行截短至符��寬，除��時使用 -J �項；�會影響 -S\n"
 "                    或 -s �項\n"
 
-#: src/pr.c:2852
+#: src/pr.c:2853
 #, fuzzy
 msgid ""
 "\n"
@@ -7299,7 +7367,7 @@ msgstr ""
 
 #: src/printenv.c:69
 #, fuzzy
-msgid "  -0, --null     end each output line with 0 byte rather than newline\n"
+msgid "  -0, --null     end each output line with NUL, not newline\n"
 msgstr ""
 "  -z, --zero-terminated     以�元組 0 而� newline 字元作為�行的��字元\n"
 
@@ -7398,12 +7466,12 @@ msgstr ""
 msgid "F. Pinard"
 msgstr ""
 
-#: src/ptx.c:419
+#: src/ptx.c:420
 #, fuzzy, c-format
 msgid "%s (for regexp %s)"
 msgstr "%s (�於正�表示�‘%s’)"
 
-#: src/ptx.c:1817
+#: src/ptx.c:1820
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT]...   (without -G)\n"
@@ -7412,7 +7480,7 @@ msgstr ""
 "用法：%s [�項]... [輸入]...   (沒有 -G)\n"
 "  或：%s -G [�項]... [輸入 [輸出]]\n"
 
-#: src/ptx.c:1821
+#: src/ptx.c:1824
 #, fuzzy
 msgid ""
 "Output a permuted index, including context, of the words in the input "
@@ -7421,14 +7489,14 @@ msgstr ""
 "顯示輸入檔中所有字詞排列後的索引，並包括該字詞�後的文字。\n"
 "\n"
 
-#: src/ptx.c:1827
+#: src/ptx.c:1830
 msgid ""
 "  -A, --auto-reference           output automatically generated references\n"
 "  -G, --traditional              behave more like System V 'ptx'\n"
 "  -F, --flag-truncation=STRING   use STRING for flagging line truncations\n"
 msgstr ""
 
-#: src/ptx.c:1832
+#: src/ptx.c:1835
 msgid ""
 "  -M, --macro-name=STRING        macro name to use instead of 'xx'\n"
 "  -O, --format=roff              generate output as roff directives\n"
@@ -7437,7 +7505,7 @@ msgid ""
 "  -T, --format=tex               generate output as TeX directives\n"
 msgstr ""
 
-#: src/ptx.c:1839
+#: src/ptx.c:1842
 msgid ""
 "  -W, --word-regexp=REGEXP       use REGEXP to match each keyword\n"
 "  -b, --break-file=FILE          word break characters in this FILE\n"
@@ -7447,7 +7515,7 @@ msgid ""
 "  -o, --only-file=FILE           read only word list from this FILE\n"
 msgstr ""
 
-#: src/ptx.c:1847
+#: src/ptx.c:1850
 msgid ""
 "  -r, --references               first field of each line is a reference\n"
 "  -t, --typeset-mode               - not implemented -\n"
@@ -7455,17 +7523,16 @@ msgid ""
 "excluded\n"
 msgstr ""
 
-#: src/ptx.c:1854
+#: src/ptx.c:1857
 #, fuzzy
 msgid ""
 "\n"
-"With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n"
+"With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n"
 msgstr ""
 "\n"
-"如果沒有指定 <檔案> 或 <檔案> 是 -，則由標準輸入讀入資料。\n"
-"�設使用‘-F /’�項。\n"
+"如果沒有指定<檔案>或<檔案>是 -，則由標準輸入讀�資料。\n"
 
-#: src/ptx.c:1948
+#: src/ptx.c:1951
 #, fuzzy, c-format
 msgid "invalid gap width: %s"
 msgstr "無效的寬度：‘%s’"
@@ -7482,22 +7549,28 @@ msgid ""
 "  -P, --physical  avoid all symlinks\n"
 msgstr ""
 
-#: src/pwd.c:166
+#: src/pwd.c:67
+msgid ""
+"\n"
+"If no option is specified, -P is assumed.\n"
+msgstr ""
+
+#: src/pwd.c:169
 #, fuzzy, c-format
 msgid "failed to chdir to %s"
 msgstr "無法更改%s的所屬群組為 %s\n"
 
-#: src/pwd.c:170 src/pwd.c:277 src/split.c:373
+#: src/pwd.c:173 src/pwd.c:280 src/split.c:372
 #, fuzzy, c-format
 msgid "failed to stat %s"
 msgstr "無法�得%s的屬性"
 
-#: src/pwd.c:235
+#: src/pwd.c:238
 #, c-format
 msgid "couldn't find directory entry in %s with matching i-node"
 msgstr ""
 
-#: src/pwd.c:362
+#: src/pwd.c:367
 #, fuzzy, c-format
 msgid "ignoring non-option arguments"
 msgstr "��項的�數�多"
@@ -7507,8 +7580,8 @@ msgstr "��項的�數�多"
 msgid "Dmitry V. Levin"
 msgstr ""
 
-#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147
-#: src/stat.c:1349 src/touch.c:212
+#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169
+#: src/stat.c:1411 src/touch.c:212
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "用法：%s [�項]... [檔案]...\n"
@@ -7542,8 +7615,7 @@ msgid ""
 "  -q, --quiet,\n"
 "  -s, --silent                  suppress most error messages\n"
 "  -v, --verbose                 report error messages\n"
-"  -z, --zero                    separate output with NUL rather than "
-"newline\n"
+"  -z, --zero                    end each output line with NUL, not newline\n"
 msgstr ""
 
 #: src/readlink.c:152
@@ -7568,7 +7640,7 @@ msgid ""
 "      --relative-to=FILE       print the resolved path relative to FILE\n"
 "      --relative-base=FILE     print absolute paths unless paths below FILE\n"
 "  -s, --strip, --no-symlinks   don't expand symlinks\n"
-"  -z, --zero                   separate output with NUL rather than newline\n"
+"  -z, --zero                   end each output line with NUL, not newline\n"
 "\n"
 msgstr ""
 
@@ -7586,41 +7658,42 @@ msgstr "無法建立目錄%s"
 msgid "%s: descend into directory %s? "
 msgstr "無法進入%s目錄"
 
-#. TRANSLATORS: You may find it more convenient to
-#. translate "%s: remove %s (write-protected) %s? "
-#. instead.  It should avoid grammatical problems
-#. with the output of file_type.
-#: src/remove.c:290
+#. TRANSLATORS: In the next two strings the second %s is
+#. replaced by the type of the file.  To avoid grammatical
+#. problems, it may be more convenient to translate these
+#. strings instead as: "%1$s: %3$s is write-protected and
+#. is of type '%2$s' -- remove it? ".
+#: src/remove.c:291
 #, c-format
 msgid "%s: remove write-protected %s %s? "
 msgstr "%s：是�移除有防寫�護的%s%s? "
 
-#: src/remove.c:291
+#: src/remove.c:292
 #, c-format
 msgid "%s: remove %s %s? "
 msgstr "%s：是�移除%s%s? "
 
-#: src/remove.c:374
+#: src/remove.c:375
 #, fuzzy, c-format
 msgid "removed directory: %s\n"
 msgstr "無法建立目錄%s"
 
-#: src/remove.c:444
-#, fuzzy, c-format
-msgid "cannot remove directory: %s"
-msgstr "無法建立目錄%s"
+#: src/remove.c:447
+#, c-format
+msgid "refusing to remove %s or %s directory: skipping %s"
+msgstr ""
 
-#: src/remove.c:500
+#: src/remove.c:505
 #, c-format
 msgid "skipping %s, since it's on a different device"
 msgstr ""
 
-#: src/remove.c:520
+#: src/remove.c:525
 #, fuzzy, c-format
 msgid "traversal failed: %s"
 msgstr "讀入時發生錯誤"
 
-#: src/remove.c:526
+#: src/remove.c:531
 #, c-format
 msgid ""
 "unexpected failure: fts_info=%d: %s\n"
@@ -7645,12 +7718,12 @@ msgstr ""
 msgid ""
 "  -I                    prompt once before removing more than three files, "
 "or\n"
-"                          when removing recursively.  Less intrusive than -"
+"                          when removing recursively; less intrusive than -"
 "i,\n"
 "                          while still giving protection against most "
 "mistakes\n"
 "      --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n"
-"                          always (-i).  Without WHEN, prompt always\n"
+"                          always (-i); without WHEN, prompt always\n"
 msgstr ""
 
 #: src/rm.c:149
@@ -7715,13 +7788,15 @@ msgstr ""
 
 #: src/rm.c:342
 #, c-format
-msgid "%s: remove all arguments recursively? "
-msgstr ""
+msgid "%s: remove %zu argument recursively? "
+msgid_plural "%s: remove %zu arguments recursively? "
+msgstr[0] ""
 
-#: src/rm.c:343
+#: src/rm.c:345
 #, fuzzy, c-format
-msgid "%s: remove all arguments? "
-msgstr "%s：是�移除%s%s? "
+msgid "%s: remove %zu argument? "
+msgid_plural "%s: remove %zu arguments? "
+msgstr[0] "%s：是�移除%s%s? "
 
 #: src/rmdir.c:134 src/rmdir.c:233
 #, fuzzy, c-format
@@ -7773,7 +7848,7 @@ msgstr ""
 
 #: src/runcon.c:87
 msgid ""
-"Run a program in a different security context.\n"
+"Run a program in a different SELinux security context.\n"
 "With neither CONTEXT nor COMMAND, print the current security context.\n"
 msgstr ""
 
@@ -7823,41 +7898,46 @@ msgstr ""
 msgid "no command specified"
 msgstr "未指定進程編號"
 
-#: src/runcon.c:201
+#: src/runcon.c:200
 #, c-format
 msgid "%s may be used only on a SELinux kernel"
 msgstr ""
 
-#: src/runcon.c:227
+#: src/runcon.c:226
 #, fuzzy, c-format
 msgid "failed to compute a new context"
 msgstr "無法�留%s的時間"
 
-#: src/runcon.c:241
+#: src/runcon.c:240
 #, fuzzy, c-format
 msgid "failed to set new user %s"
 msgstr "無法�得%s的屬性"
 
-#: src/runcon.c:243
+#: src/runcon.c:242
 #, fuzzy, c-format
 msgid "failed to set new type %s"
 msgstr "無法�得%s的屬性"
 
-#: src/runcon.c:245
+#: src/runcon.c:244
 #, fuzzy, c-format
 msgid "failed to set new range %s"
 msgstr "無法�得%s的屬性"
 
-#: src/runcon.c:247
+#: src/runcon.c:246
 #, fuzzy, c-format
 msgid "failed to set new role %s"
 msgstr "無法�得%s的屬性"
 
-#: src/runcon.c:255
+#: src/runcon.c:254
 #, c-format
 msgid "unable to set security context %s"
 msgstr ""
 
+#: src/selinux.c:127 src/selinux.c:300
+#, fuzzy, c-format
+msgid "error canonicalizing %s"
+msgstr "讀� %s 時發生錯誤"
+
 #: src/seq.c:68
 #, fuzzy, c-format
 msgid ""
@@ -7884,98 +7964,48 @@ msgid ""
 "\n"
 "If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n"
 "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n"
+"The sequence of numbers ends when the sum of the current number and\n"
+"INCREMENT would become greater than LAST.\n"
 "FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
 "INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
 "INCREMENT is usually negative if FIRST is greater than LAST.\n"
 msgstr ""
 
-#: src/seq.c:94
+#: src/seq.c:96
 msgid ""
 "FORMAT must be suitable for printing one argument of type 'double';\n"
 "it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n"
 "decimal numbers with maximum precision PREC, and to %g otherwise.\n"
 msgstr ""
 
-#: src/seq.c:140
+#: src/seq.c:142
 #, fuzzy, c-format
 msgid "invalid floating point argument: %s"
 msgstr "無效的開始行號：‘%s’"
 
-#: src/seq.c:232
+#: src/seq.c:234
 #, fuzzy, c-format
 msgid "format %s has unknown %%%c directive"
 msgstr "%s的檔案類型�詳"
 
-#: src/seq.c:555
+#: src/seq.c:557
 #, fuzzy, c-format
 msgid "format string may not be specified when printing equal width strings"
 msgstr "傾�字串時�能指定類型"
 
-#: src/setuidgid.c:49
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n"
-"  or:  %s LONG-OPTION\n"
-msgstr ""
-"用法：%s [檔案]...\n"
-"  或：%s [�項]\n"
-
-#: src/setuidgid.c:55
-msgid ""
-"Drop any supplemental groups, assume the user-ID and group-ID of the "
-"specified\n"
-"USER (numeric ID or user name), and run COMMAND with any specified "
-"ARGUMENTs.\n"
-"Exit with status 111 if unable to assume the required user and group ID.\n"
-"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (user ID zero).\n"
-"\n"
-msgstr ""
-
-#: src/setuidgid.c:64
-msgid ""
-"  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n"
-"                    (if specified) supplemental group IDs to GID1, ...\n"
-msgstr ""
-
-#: src/setuidgid.c:162
-#, c-format
-msgid "unknown user-ID: %s"
-msgstr ""
-
-#: src/setuidgid.c:173
-#, c-format
-msgid "to use user-ID %s you need to use -g too"
-msgstr ""
-
-#: src/setuidgid.c:190
-#, fuzzy, c-format
-msgid "failed to set supplemental group(s)"
-msgstr "無法改變所屬群組至沒有�稱的群組"
-
-#: src/setuidgid.c:200
-#, fuzzy, c-format
-msgid "cannot set group-ID to %lu"
-msgstr "���時�略使用者和所屬群組"
-
-#: src/setuidgid.c:204
-#, fuzzy, c-format
-msgid "cannot set user-ID to %lu"
-msgstr "���時�略使用者和所屬群組"
-
 #. This is a proper name. See the gettext manual, section Names.
 #: src/shred.c:74
 msgid "Colin Plumb"
 msgstr ""
 
-#: src/shred.c:148
+#: src/shred.c:170
 #, fuzzy
 msgid ""
 "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
 "for even very expensive hardware probing to recover the data.\n"
 msgstr "�複覆寫 <檔案>，使得�使是昂貴的硬體�測儀器也難以將資料復原。\n"
 
-#: src/shred.c:155
+#: src/shred.c:177
 #, fuzzy, c-format
 msgid ""
 "  -f, --force    change permissions to allow writing if necessary\n"
@@ -7987,9 +8017,10 @@ msgstr ""
 "  -n, --iterations=N  自行指定�複覆寫的次數 (�設為 %d 次)\n"
 "  -s, --size=N   覆寫指定的�元組數目 (�接� K�M�G 等等的單�)\n"
 
-#: src/shred.c:161
+#: src/shred.c:183
+#, fuzzy
 msgid ""
-"  -u, --remove   truncate and remove file after overwriting\n"
+"  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n"
 "  -v, --verbose  show progress\n"
 "  -x, --exact    do not round file sizes up to the next full block;\n"
 "                   this is the default for non-regular files\n"
@@ -8001,15 +8032,20 @@ msgstr ""
 "                 �設會使用這種模�\n"
 "  -z, --zero     最後一次會使用 0 �元組進行覆寫來隱�覆寫動作\n"
 
-#: src/shred.c:170
+#: src/shred.c:192
+#, fuzzy
 msgid ""
 "\n"
 "If FILE is -, shred standard output.\n"
 "\n"
 "Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n"
 "the files because it is common to operate on device files like /dev/hda,\n"
-"and those files usually should not be removed.  When operating on regular\n"
-"files, most people use the --remove option.\n"
+"and those files usually should not be removed.\n"
+"The optional HOW parameter indicates how to remove a directory entry:\n"
+"'unlink' => use a standard unlink call.\n"
+"'wipe' => also first obfuscate bytes in the name.\n"
+"'wipesync' => also sync each obfuscated byte to disk.\n"
+"The default mode is 'wipesync', but note it can be expensive.\n"
 "\n"
 msgstr ""
 "\n"
@@ -8019,7 +8055,7 @@ msgstr ""
 "因為覆寫� /dev/hda 等的�置檔案是很普�的，而這些檔案通常�應移除。\n"
 "當覆寫普通檔案時，絕大多數人都應該使用 --remove �項。\n"
 
-#: src/shred.c:180
+#: src/shred.c:206
 #, fuzzy
 msgid ""
 "CAUTION: Note that shred relies on a very important assumption:\n"
@@ -8035,7 +8071,7 @@ msgstr ""
 "的檔案系統都�符��件。以下是會令 shred 無效的檔案系統的例�：\n"
 "\n"
 
-#: src/shred.c:188
+#: src/shred.c:214
 #, fuzzy
 msgid ""
 "* log-structured or journaled file systems, such as those supplied with\n"
@@ -8056,7 +8092,7 @@ msgstr ""
 "� 會�時進行快照紀錄的檔案系統，例如 Network Applicance 的 NFS 伺�器\n"
 "\n"
 
-#: src/shred.c:198
+#: src/shred.c:224
 msgid ""
 "* file systems that cache in temporary locations, such as NFS\n"
 "version 3 clients\n"
@@ -8065,7 +8101,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:205
+#: src/shred.c:231
 msgid ""
 "In the case of ext3 file systems, the above disclaimer applies\n"
 "(and shred is thus of limited effectiveness) only in data=journal mode,\n"
@@ -8077,7 +8113,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/shred.c:215
+#: src/shred.c:241
 #, fuzzy
 msgid ""
 "In addition, file system backups and remote mirrors may contain copies\n"
@@ -8091,127 +8127,127 @@ msgstr ""
 "�外，檔案系統的備份��端的 mirror 都�能�有該檔案的複製本，這些複製本\n"
 "都是無法移除的，而且�以用來將以 shred 處��的檔案�復原狀。\n"
 
-#: src/shred.c:295
+#: src/shred.c:340
 #, c-format
 msgid "%s: fdatasync failed"
 msgstr "%s：fdatasync 發生錯誤"
 
-#: src/shred.c:306
+#: src/shred.c:351
 #, c-format
 msgid "%s: fsync failed"
 msgstr "%s：fsync 發生錯誤"
 
-#: src/shred.c:383
+#: src/shred.c:461
 #, c-format
 msgid "%s: cannot rewind"
 msgstr "%s：無法�後�尋"
 
-#: src/shred.c:402
+#: src/shred.c:481
 #, c-format
 msgid "%s: pass %lu/%lu (%s)..."
 msgstr "%1$s：%3$lu 次之第 %2$lu 次 (%4$s)..."
 
-#: src/shred.c:452
+#: src/shred.c:529
 #, c-format
 msgid "%s: error writing at offset %s"
 msgstr "%s：在 %s �置寫入資料時發生錯誤"
 
-#: src/shred.c:470
+#: src/shred.c:549
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s：lseek 發生錯誤"
 
-#: src/shred.c:481
+#: src/shred.c:561
 #, c-format
 msgid "%s: file too large"
 msgstr "%s：檔案�大"
 
-#: src/shred.c:504
+#: src/shred.c:585
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s"
 msgstr "%1$s：%3$lu 次之第 %2$lu 次 (%4$s)...%5$s"
 
-#: src/shred.c:520
+#: src/shred.c:601
 #, c-format
 msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
 msgstr "%1$s：%3$lu 次之第 %2$lu 次 (%4$s)...%5$s/%6$s %7$d%%"
 
-#: src/shred.c:767
+#: src/shred.c:859
 #, c-format
 msgid "%s: fstat failed"
 msgstr "%s：fstat 發生錯誤"
 
-#: src/shred.c:778
+#: src/shred.c:870
 #, c-format
 msgid "%s: invalid file type"
 msgstr "%s：檔案類型�正確"
 
-#: src/shred.c:797
+#: src/shred.c:875
 #, c-format
 msgid "%s: file has negative size"
 msgstr "%s：檔案的大�為負數"
 
-#: src/shred.c:864 src/sort.c:932 src/split.c:378
+#: src/shred.c:969 src/sort.c:960 src/split.c:377
 #, c-format
 msgid "%s: error truncating"
 msgstr "%s：截斷檔案時發生錯誤"
 
-#: src/shred.c:880
+#: src/shred.c:989
 #, c-format
 msgid "%s: fcntl failed"
 msgstr "%s：fcntl 發生錯誤"
 
-#: src/shred.c:885
+#: src/shred.c:994
 #, c-format
 msgid "%s: cannot shred append-only file descriptor"
 msgstr "%s：�能將��加上資料的檔案�述� (file descriptor) 進行 shred 動作"
 
-#: src/shred.c:967
+#: src/shred.c:1078
 #, c-format
 msgid "%s: removing"
 msgstr "%s：正在移除"
 
-#: src/shred.c:991
+#: src/shred.c:1102
 #, c-format
 msgid "%s: renamed to %s"
 msgstr "%s：更改�稱為 %s"
 
-#: src/shred.c:1013
+#: src/shred.c:1124
 #, c-format
 msgid "%s: failed to remove"
 msgstr "%s：無法移除"
 
-#: src/shred.c:1017
+#: src/shred.c:1128
 #, c-format
 msgid "%s: removed"
 msgstr "%s：已經移除"
 
-#: src/shred.c:1024 src/shred.c:1067
+#: src/shred.c:1135 src/shred.c:1178
 #, c-format
 msgid "%s: failed to close"
 msgstr "%s：無法關閉"
 
-#: src/shred.c:1060
+#: src/shred.c:1171
 #, c-format
 msgid "%s: failed to open for writing"
 msgstr "%s：無法開啟來寫入資料"
 
-#: src/shred.c:1125
+#: src/shred.c:1236
 #, c-format
 msgid "%s: invalid number of passes"
 msgstr ""
 
-#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441
+#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482
 #, fuzzy, c-format
 msgid "multiple random sources specified"
 msgstr "正在關閉輸出檔%s"
 
-#: src/shred.c:1148
+#: src/shred.c:1264
 #, c-format
 msgid "%s: invalid file size"
 msgstr ""
 
-#: src/shuf.c:48
+#: src/shuf.c:61
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]\n"
@@ -8221,12 +8257,11 @@ msgstr ""
 "用法：%s [�項]... [輸入]...   (沒有 -G)\n"
 "  或：%s -G [�項]... [輸入 [輸出]]\n"
 
-#: src/shuf.c:54
-#, fuzzy
+#: src/shuf.c:67
 msgid "Write a random permutation of the input lines to standard output.\n"
-msgstr "在標準輸出中顯示�個 <檔案> �一行中指定的部份。\n"
+msgstr ""
 
-#: src/shuf.c:60
+#: src/shuf.c:73
 msgid ""
 "  -e, --echo                treat each ARG as an input line\n"
 "  -i, --input-range=LO-HI   treat each number LO through HI as an input "
@@ -8234,34 +8269,44 @@ msgid ""
 "  -n, --head-count=COUNT    output at most COUNT lines\n"
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
 "      --random-source=FILE  get random bytes from FILE\n"
-"  -z, --zero-terminated     end lines with 0 byte, not newline\n"
+"  -r, --repeat              output lines can be repeated\n"
 msgstr ""
 
-#: src/shuf.c:244
+#: src/shuf.c:228
+#, fuzzy, c-format
+msgid "too many input lines"
+msgstr "�複的行數�多"
+
+#: src/shuf.c:431
 #, fuzzy, c-format
 msgid "multiple -i options specified"
 msgstr "-l 或 -t �項使用了多於一次"
 
-#: src/shuf.c:264
+#: src/shuf.c:452
 #, fuzzy, c-format
 msgid "invalid input range %s"
 msgstr "輸入旗標無效：%s"
 
-#: src/shuf.c:277
+#: src/shuf.c:465
 #, fuzzy, c-format
 msgid "invalid line count %s"
 msgstr "無效的寬度：‘%s’"
 
-#: src/shuf.c:284 src/sort.c:4435
+#: src/shuf.c:472 src/sort.c:4476
 #, fuzzy, c-format
 msgid "multiple output files specified"
 msgstr "正在關閉輸出檔%s"
 
-#: src/shuf.c:310
+#: src/shuf.c:502
 #, fuzzy, c-format
 msgid "cannot combine -e and -i options"
 msgstr "如果自行指定權�，���時�� --reference �項一起使用"
 
+#: src/shuf.c:586
+#, c-format
+msgid "no lines to repeat"
+msgstr ""
+
 #: src/sleep.c:44
 #, c-format
 msgid ""
@@ -8276,17 +8321,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/sleep.c:135 src/timeout.c:320
+#: src/sleep.c:135 src/timeout.c:323
 #, fuzzy, c-format
 msgid "invalid time interval %s"
 msgstr "無效的欄�號碼：‘%s’"
 
-#: src/sleep.c:146 src/tail.c:1219
+#: src/sleep.c:146 src/tail.c:1252
 #, fuzzy, c-format
 msgid "cannot read realtime clock"
 msgstr "無法建立��%s"
 
-#: src/sort.c:399
+#: src/sort.c:427
 #, fuzzy
 msgid "Write sorted concatenation of all FILE(s) to standard output.\n"
 msgstr ""
@@ -8295,13 +8340,13 @@ msgstr ""
 "排��項：\n"
 "\n"
 
-#: src/sort.c:405
+#: src/sort.c:433
 msgid ""
 "Ordering options:\n"
 "\n"
 msgstr ""
 
-#: src/sort.c:409
+#: src/sort.c:437
 #, fuzzy
 msgid ""
 "  -b, --ignore-leading-blanks  ignore leading blanks\n"
@@ -8313,7 +8358,7 @@ msgstr ""
 "  -d, --dictionary-order      �考慮空白字元�英文字和數字\n"
 "  -f, --ignore-case           排��先將�寫字元轉�為大寫\n"
 
-#: src/sort.c:415
+#: src/sort.c:443
 #, fuzzy
 msgid ""
 "  -g, --general-numeric-sort  compare according to general numerical value\n"
@@ -8327,12 +8372,12 @@ msgstr ""
 "  -r, --reverse               以相�的次�排列\n"
 "\n"
 
-#: src/sort.c:420
+#: src/sort.c:448
 msgid ""
 "  -h, --human-numeric-sort    compare human readable numbers (e.g., 2K 1G)\n"
 msgstr ""
 
-#: src/sort.c:423
+#: src/sort.c:451
 #, fuzzy
 msgid ""
 "  -n, --numeric-sort          compare according to string numerical value\n"
@@ -8347,7 +8392,7 @@ msgstr ""
 "  -r, --reverse               以相�的次�排列\n"
 "\n"
 
-#: src/sort.c:429
+#: src/sort.c:457
 msgid ""
 "      --sort=WORD             sort according to WORD:\n"
 "                                general-numeric -g, human-numeric -h, month -"
@@ -8357,19 +8402,19 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/sort.c:437
+#: src/sort.c:465
 msgid ""
 "Other options:\n"
 "\n"
 msgstr ""
 
-#: src/sort.c:441
+#: src/sort.c:469
 msgid ""
 "      --batch-size=NMERGE   merge at most NMERGE inputs at once;\n"
 "                            for more use temp files\n"
 msgstr ""
 
-#: src/sort.c:445
+#: src/sort.c:473
 msgid ""
 "  -c, --check, --check=diagnose-first  check for sorted input; do not sort\n"
 "  -C, --check=quiet, --check=silent  like -c, but do not report first bad "
@@ -8378,7 +8423,7 @@ msgid ""
 "                              decompress them with PROG -d\n"
 msgstr ""
 
-#: src/sort.c:452
+#: src/sort.c:480
 msgid ""
 "      --debug               annotate the part of the line used to sort,\n"
 "                              and warn about questionable usage to stderr\n"
@@ -8387,13 +8432,13 @@ msgid ""
 "                            If F is - then read names from standard input\n"
 msgstr ""
 
-#: src/sort.c:459
+#: src/sort.c:487
 msgid ""
 "  -k, --key=KEYDEF          sort via a key; KEYDEF gives location and type\n"
 "  -m, --merge               merge already sorted files; do not sort\n"
 msgstr ""
 
-#: src/sort.c:463
+#: src/sort.c:491
 #, fuzzy
 msgid ""
 "  -o, --output=FILE         write result to FILE instead of standard output\n"
@@ -8411,7 +8456,7 @@ msgstr ""
 "  -s, --stable              �進行最後的整行比較排�\n"
 "  -S, --buffer-size=大�    指定記憶緩��的 <大�>\n"
 
-#: src/sort.c:469
+#: src/sort.c:497
 #, fuzzy, c-format
 msgid ""
 "  -t, --field-separator=SEP  use SEP instead of non-blank to blank "
@@ -8431,12 +8476,7 @@ msgstr ""
 "  -u, --unique                    �� -c：嚴格檢查資料是��次�排列\n"
 "                                  沒有 -c：�到多行相�的資料時�顯示第一行\n"
 
-#: src/sort.c:478
-msgid "  -z, --zero-terminated     end lines with 0 byte, not newline\n"
-msgstr ""
-"  -z, --zero-terminated     以�元組 0 而� newline 字元作為�行的��字元\n"
-
-#: src/sort.c:483
+#: src/sort.c:511
 #, fuzzy
 msgid ""
 "\n"
@@ -8462,7 +8502,7 @@ msgstr ""
 "\n"
 "<大�> �以加上如下的單�：\n"
 
-#: src/sort.c:496
+#: src/sort.c:524
 msgid ""
 "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
 "\n"
@@ -8481,259 +8521,244 @@ msgstr ""
 "和語系有關的環境變數會影響排��果。\n"
 "如果�以�元組數值作為排列次�，請設定環境變數 LC_ALL=C。\n"
 
-#: src/sort.c:697
+#: src/sort.c:725
 #, fuzzy, c-format
 msgid "waiting for %s [-d]"
 msgstr "正在寫入 %s"
 
-#: src/sort.c:702
+#: src/sort.c:730
 #, c-format
 msgid "%s [-d] terminated abnormally"
 msgstr ""
 
-#: src/sort.c:856
+#: src/sort.c:884
 #, fuzzy, c-format
 msgid "cannot create temporary file in %s"
 msgstr "無法建立暫存檔"
 
-#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713
-#: src/sort.c:3804 src/sort.c:3807
+#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753
+#: src/sort.c:3844 src/sort.c:3847
 msgid "open failed"
 msgstr "開啟時發生錯誤"
 
-#: src/sort.c:970
+#: src/sort.c:998
 #, fuzzy
 msgid "fflush failed"
 msgstr "關閉時發生錯誤"
 
-#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706
+#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747
 msgid "close failed"
 msgstr "關閉時發生錯誤"
 
-#: src/sort.c:986
-#, fuzzy, c-format
-msgid "dup2 failed"
-msgstr "開啟時發生錯誤"
-
-#: src/sort.c:1103
-#, c-format
-msgid "couldn't execute %s"
-msgstr ""
-
-#: src/sort.c:1110
+#: src/sort.c:1140
 #, fuzzy
 msgid "couldn't create temporary file"
 msgstr "無法建立暫存檔"
 
-#: src/sort.c:1149
+#: src/sort.c:1179
 #, fuzzy, c-format
 msgid "couldn't create process for %s -d"
 msgstr "無法建立目錄%s"
 
-#: src/sort.c:1161
-#, c-format
-msgid "couldn't execute %s -d"
-msgstr ""
-
-#: src/sort.c:1220
+#: src/sort.c:1252
 #, fuzzy, c-format
 msgid "warning: cannot remove: %s"
 msgstr "無法建立目錄%s"
 
-#: src/sort.c:1306
+#: src/sort.c:1338
 #, fuzzy, c-format
 msgid "invalid --%s argument %s"
 msgstr "�數無效: %s"
 
-#: src/sort.c:1309
+#: src/sort.c:1341
 #, fuzzy, c-format
 msgid "minimum --%s argument is %s"
 msgstr "%2$s的�數%1$s�明確"
 
-#: src/sort.c:1324
+#: src/sort.c:1356
 #, fuzzy, c-format
 msgid "--%s argument %s too large"
 msgstr "%s：數字‘%.*s’�大"
 
-#: src/sort.c:1327
+#: src/sort.c:1359
 #, c-format
 msgid "maximum --%s argument with current rlimit is %s"
 msgstr ""
 
-#: src/sort.c:1409
+#: src/sort.c:1441
 #, c-format
 msgid "number in parallel must be nonzero"
 msgstr ""
 
-#: src/sort.c:1494
+#: src/sort.c:1526
 msgid "stat failed"
 msgstr "stat 時發生錯誤"
 
-#: src/sort.c:1755
+#: src/sort.c:1788
 msgid "read failed"
 msgstr "讀入時發生錯誤"
 
-#: src/sort.c:2043
+#: src/sort.c:2076
 #, fuzzy, c-format
 msgid "string transformation failed"
 msgstr "字串比較出�錯誤"
 
-#: src/sort.c:2046
+#: src/sort.c:2079
 #, c-format
 msgid "the untransformed string was %s"
 msgstr ""
 
-#: src/sort.c:2209
+#: src/sort.c:2242
 #, c-format
 msgid "^ no match for key\n"
 msgstr ""
 
-#: src/sort.c:2389
+#: src/sort.c:2422
 #, c-format
 msgid "obsolescent key %s used; consider %s instead"
 msgstr ""
 
-#: src/sort.c:2395
+#: src/sort.c:2428
 #, c-format
 msgid "key %lu has zero width and will be ignored"
 msgstr ""
 
-#: src/sort.c:2406
+#: src/sort.c:2439
 #, c-format
 msgid "leading blanks are significant in key %lu; consider also specifying 'b'"
 msgstr ""
 
-#: src/sort.c:2419
+#: src/sort.c:2452
 #, c-format
 msgid "key %lu is numeric and spans multiple fields"
 msgstr ""
 
-#: src/sort.c:2451
+#: src/sort.c:2484
 #, fuzzy, c-format
 msgid "option '-%s' is ignored"
 msgid_plural "options '-%s' are ignored"
-msgstr[0] "%s：�項‘%s’�明確\n"
+msgstr[0] "%s：�項‘-W %s’�明確\n"
 
-#: src/sort.c:2457
+#: src/sort.c:2490
 #, c-format
 msgid "option '-r' only applies to last-resort comparison"
 msgstr ""
 
-#: src/sort.c:2731 src/sort.c:2740
+#: src/sort.c:2764 src/sort.c:2773
 msgid "write failed"
 msgstr "寫入時發生錯誤"
 
-#: src/sort.c:2783
+#: src/sort.c:2816
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr "%s： %s：%s：次��正確："
 
-#: src/sort.c:2786
+#: src/sort.c:2819
 msgid "standard error"
 msgstr "標準錯誤輸出"
 
-#: src/sort.c:3698
+#: src/sort.c:3738
 #, fuzzy
 msgid "cannot read"
 msgstr "%s：無法�後�尋"
 
-#: src/sort.c:3976
+#: src/sort.c:4017
 #, fuzzy, c-format
 msgid "%s: invalid field specification %s"
 msgstr "%s：無效的欄��格‘%s’"
 
-#: src/sort.c:3987
-#, fuzzy, c-format
+#: src/sort.c:4028
+#, c-format
 msgid "options '-%s' are incompatible"
-msgstr "%s：�項‘%s’�明確\n"
+msgstr ""
 
-#: src/sort.c:4038
+#: src/sort.c:4079
 #, fuzzy, c-format
 msgid "%s: invalid count at start of %s"
 msgstr "%s：‘%s’開始部份的數字無效"
 
-#: src/sort.c:4295
+#: src/sort.c:4336
 #, fuzzy
 msgid "invalid number after '-'"
 msgstr "‘-’後的數字無效"
 
-#: src/sort.c:4302 src/sort.c:4388 src/sort.c:4416
+#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457
 #, fuzzy
 msgid "invalid number after '.'"
 msgstr "‘.’後的數字無效"
 
-#: src/sort.c:4315 src/sort.c:4421
+#: src/sort.c:4356 src/sort.c:4462
 msgid "stray character in field spec"
 msgstr "欄��格出���法的字元"
 
-#: src/sort.c:4362
+#: src/sort.c:4403
 #, fuzzy, c-format
 msgid "multiple compress programs specified"
 msgstr "指定了多於一個目的地目錄"
 
-#: src/sort.c:4379
+#: src/sort.c:4420
 msgid "invalid number at field start"
 msgstr "欄��格開始部份的數字無效"
 
-#: src/sort.c:4383 src/sort.c:4411
+#: src/sort.c:4424 src/sort.c:4452
 msgid "field number is zero"
 msgstr "欄�是 0"
 
-#: src/sort.c:4392
+#: src/sort.c:4433
 msgid "character offset is zero"
 msgstr "字元�移值是 0"
 
-#: src/sort.c:4407
+#: src/sort.c:4448
 #, fuzzy
 msgid "invalid number after ','"
 msgstr "‘,’後的數字無效"
 
-#: src/sort.c:4457
+#: src/sort.c:4498
 #, c-format
 msgid "empty tab"
 msgstr ""
 
-#: src/sort.c:4550 src/wc.c:692
+#: src/sort.c:4591 src/wc.c:692
 #, c-format
 msgid "cannot read file names from %s"
 msgstr "無法從 %s 讀�檔案�稱"
 
-#: src/sort.c:4572
+#: src/sort.c:4613
 #, fuzzy, c-format
 msgid "%s:%lu: invalid zero-length file name"
 msgstr "檔案�稱無效 (長度為零)"
 
-#: src/sort.c:4578
+#: src/sort.c:4619
 #, fuzzy, c-format
 msgid "no input from %s"
 msgstr "正在關閉輸入檔 %s"
 
-#: src/sort.c:4624
+#: src/sort.c:4665
 #, c-format
 msgid "using %s sorting rules"
 msgstr ""
 
-#: src/sort.c:4627
+#: src/sort.c:4668
 #, c-format
 msgid "using simple byte comparison"
 msgstr ""
 
-#: src/sort.c:4658
+#: src/sort.c:4699
 #, fuzzy, c-format
 msgid "extra operand %s not allowed with -%c"
 msgstr "使用 -c 時��許指定�外的�數‘%s’"
 
-#: src/split.c:187
+#: src/split.c:186
 #, c-format
 msgid "the suffix length needs to be at least %zu"
 msgstr ""
 
-#: src/split.c:204
+#: src/split.c:203
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n"
 msgstr "用法：%s [�項] [輸入 [�置字串]]\n"
 
-#: src/split.c:208
+#: src/split.c:207
 #, fuzzy
 msgid ""
 "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
@@ -8746,38 +8771,32 @@ msgstr ""
 "或 <輸入> 是 -，則由標準輸入讀入資料。\n"
 "\n"
 
-#: src/split.c:216
-#, fuzzy, c-format
+#: src/split.c:215
+#, c-format
 msgid ""
 "  -a, --suffix-length=N   generate suffixes of length N (default %d)\n"
-"      --additional-suffix=SUFFIX  append an additional SUFFIX to file "
-"names.\n"
+"      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n"
 "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
 "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n"
 "  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of "
-"alphabetic.\n"
-"                                   FROM changes the start value (default "
-"0).\n"
+"alphabetic;\n"
+"                                   FROM changes the start value (default 0)\n"
 "  -e, --elide-empty-files  do not generate empty output files with '-n'\n"
 "      --filter=COMMAND    write to shell COMMAND; file name is $FILE\n"
 "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
-"  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n"
+"  -n, --number=CHUNKS     generate CHUNKS output files; see explanation "
+"below\n"
 "  -u, --unbuffered        immediately copy input to output with '-n r/...'\n"
 msgstr ""
-"  -a, --suffix-length=N   後置字串的長度為 N (�設值是 %d)\n"
-"  -b, --bytes=大�        指定�個輸出檔的 <大�>，以�元組為單�\n"
-"  -C, --line-bytes=大�   �個輸出檔放入�行數的完整資料，但 <大�> �會\n"
-"                          超出指定�元組數目\n"
-"  -l, --lines=行數        �個輸出檔放入指定 <行數> 的資料\n"
 
-#: src/split.c:229
+#: src/split.c:228
 #, fuzzy
 msgid ""
 "      --verbose           print a diagnostic just before each\n"
 "                            output file is opened\n"
 msgstr "      --verbose           開啟�個輸出檔之�都在標準錯誤輸出顯示訊�\n"
 
-#: src/split.c:236
+#: src/split.c:235
 msgid ""
 "\n"
 "CHUNKS may be:\n"
@@ -8789,189 +8808,189 @@ msgid ""
 "r/K/N   likewise but only output Kth of N to stdout\n"
 msgstr ""
 
-#: src/split.c:354
+#: src/split.c:353
 #, fuzzy, c-format
 msgid "output file suffixes exhausted"
 msgstr "輸出檔的後置字串已用盡"
 
-#: src/split.c:366
+#: src/split.c:365
 #, fuzzy, c-format
 msgid "creating file %s\n"
 msgstr "正在建立檔案‘%s’\n"
 
-#: src/split.c:375
+#: src/split.c:374
 #, c-format
 msgid "%s would overwrite input; aborting"
 msgstr ""
 
-#: src/split.c:391
+#: src/split.c:390
 #, fuzzy, c-format
 msgid "failed to set FILE environment variable"
 msgstr "LS_COLORS 環境變數中存在無法分�的值"
 
-#: src/split.c:393
+#: src/split.c:392
 #, c-format
 msgid "executing with FILE=%s\n"
 msgstr ""
 
-#: src/split.c:395
+#: src/split.c:394
 #, fuzzy, c-format
 msgid "failed to create pipe"
 msgstr "無法�得%s的屬性"
 
-#: src/split.c:409
+#: src/split.c:408
 #, fuzzy, c-format
 msgid "closing prior pipe"
 msgstr "無法進入%s目錄"
 
-#: src/split.c:411
+#: src/split.c:410
 #, fuzzy, c-format
 msgid "closing output pipe"
 msgstr "正在關閉輸出檔%s"
 
-#: src/split.c:415
+#: src/split.c:414
 #, fuzzy, c-format
 msgid "moving input pipe"
 msgstr "正在關閉輸入檔 %s"
 
-#: src/split.c:417
+#: src/split.c:416
 #, fuzzy, c-format
 msgid "closing input pipe"
 msgstr "正在關閉輸入檔 %s"
 
-#: src/split.c:422
+#: src/split.c:421
 #, fuzzy, c-format
 msgid "failed to run command: \"%s -c %s\""
 msgstr "無法執行 %s 指令"
 
-#: src/split.c:428
+#: src/split.c:427
 #, fuzzy, c-format
 msgid "failed to close input pipe"
 msgstr "%s：無法關閉"
 
-#: src/split.c:464
+#: src/split.c:463
 #, c-format
 msgid "waiting for child process"
 msgstr ""
 
-#: src/split.c:474
+#: src/split.c:473
 #, c-format
 msgid "with FILE=%s, signal %s from command: %s"
 msgstr ""
 
-#: src/split.c:482
+#: src/split.c:481
 #, c-format
 msgid "with FILE=%s, exit %d from command: %s"
 msgstr ""
 
-#: src/split.c:489 src/timeout.c:494
+#: src/split.c:488 src/timeout.c:497
 #, c-format
 msgid "unknown status from command (0x%X)"
 msgstr ""
 
-#: src/split.c:1052
+#: src/split.c:1102
 #, c-format
 msgid "cannot split in more than one way"
 msgstr "�能用超�一種方�進行分割"
 
-#: src/split.c:1065 src/split.c:1205 src/split.c:1376
+#: src/split.c:1115 src/split.c:1255 src/split.c:1426
 #, fuzzy, c-format
 msgid "%s: invalid number of chunks"
 msgstr "%s：無效的秒數"
 
-#: src/split.c:1069
+#: src/split.c:1119
 #, fuzzy, c-format
 msgid "%s: invalid chunk number"
 msgstr "%s：無效的號碼"
 
-#: src/split.c:1119
+#: src/split.c:1169
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr "%s：無效的後置字串長度"
 
-#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180
+#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr "%s：無效的�元組數目"
 
-#: src/split.c:1163 src/split.c:1310
+#: src/split.c:1213 src/split.c:1360
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr "%s：無效的行數"
 
-#: src/split.c:1236
+#: src/split.c:1286
 #, fuzzy, c-format
 msgid "line count option -%s%c... is too large"
 msgstr "%s：數字‘%.*s’�大"
 
-#: src/split.c:1248
+#: src/split.c:1298
 #, fuzzy, c-format
 msgid "%s: invalid start value for numerical suffix"
 msgstr "無效的開始行號：‘%s’"
 
-#: src/split.c:1276
+#: src/split.c:1326
 #, fuzzy, c-format
 msgid "%s: invalid IO block size"
 msgstr "%s：進程編號無效"
 
-#: src/split.c:1297
+#: src/split.c:1347
 #, c-format
 msgid "--filter does not process a chunk extracted to stdout"
 msgstr ""
 
-#: src/split.c:1334
+#: src/split.c:1384
 #, c-format
 msgid "numerical suffix start value is too large for the suffix length"
 msgstr ""
 
-#: src/split.c:1369
+#: src/split.c:1419
 #, fuzzy, c-format
 msgid "%s: cannot determine file size"
 msgstr "無法決定主機�稱"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/stat.c:173
+#: src/stat.c:178
 msgid "Michael Meskes"
 msgstr ""
 
-#: src/stat.c:857
+#: src/stat.c:887
 #, fuzzy, c-format
 msgid "failed to canonicalize %s"
 msgstr "無法�留%s的時間"
 
-#: src/stat.c:1069
+#: src/stat.c:1129
 #, fuzzy, c-format
 msgid "warning: unrecognized escape '\\%c'"
 msgstr "%s：無法識別的�項‘%c%s’\n"
 
-#: src/stat.c:1124
+#: src/stat.c:1184
 #, fuzzy, c-format
 msgid "%s: invalid directive"
 msgstr "%s：檔案類型�正確"
 
-#: src/stat.c:1170
+#: src/stat.c:1231
 #, fuzzy, c-format
 msgid "warning: backslash at end of format"
 msgstr "字串末端的�斜號溢出�列無效"
 
-#: src/stat.c:1201
+#: src/stat.c:1262
 #, c-format
 msgid "using %s to denote standard input does not work in file system mode"
 msgstr ""
 
-#: src/stat.c:1208
+#: src/stat.c:1269
 #, fuzzy, c-format
 msgid "cannot read file system information for %s"
 msgstr "無法將 %s 的檔案指標�新定�"
 
-#: src/stat.c:1228
+#: src/stat.c:1290
 #, fuzzy, c-format
 msgid "cannot stat standard input"
 msgstr "關閉標準輸入"
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' with --file-system, and NOT from printf.
-#: src/stat.c:1264
+#: src/stat.c:1326
 msgid ""
 "  File: \"%n\"\n"
 "    ID: %-8i Namelen: %-7l Type: %T\n"
@@ -8982,7 +9001,7 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1287
+#: src/stat.c:1349
 msgid ""
 "  File: %N\n"
 "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
@@ -8990,30 +9009,30 @@ msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1297
+#: src/stat.c:1359
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %-5h Device type: %t,%T\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1305
+#: src/stat.c:1367
 msgid "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1314
+#: src/stat.c:1376
 msgid "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 msgstr ""
 
 #. TRANSLATORS: This string uses format specifiers from
 #. 'stat --help' without --file-system, and NOT from printf.
-#: src/stat.c:1324
+#: src/stat.c:1386
 #, c-format
 msgid "Context: %C\n"
 msgstr ""
 
-#: src/stat.c:1332
+#: src/stat.c:1394
 msgid ""
 "Access: %x\n"
 "Modify: %y\n"
@@ -9021,27 +9040,27 @@ msgid ""
 " Birth: %w\n"
 msgstr ""
 
-#: src/stat.c:1350
+#: src/stat.c:1412
 msgid "Display file or file system status.\n"
 msgstr ""
 
-#: src/stat.c:1356
+#: src/stat.c:1418
 msgid ""
 "  -L, --dereference     follow links\n"
 "  -f, --file-system     display file system status instead of file status\n"
 msgstr ""
 
-#: src/stat.c:1360
+#: src/stat.c:1422
 msgid ""
 "  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n"
 "                          output a newline after each use of FORMAT\n"
 "      --printf=FORMAT   like --format, but interpret backslash escapes,\n"
-"                          and do not output a mandatory trailing newline.\n"
-"                          If you want a newline, include \\n in FORMAT\n"
+"                          and do not output a mandatory trailing newline;\n"
+"                          if you want a newline, include \\n in FORMAT\n"
 "  -t, --terse           print the information in terse form\n"
 msgstr ""
 
-#: src/stat.c:1371
+#: src/stat.c:1433
 #, fuzzy
 msgid ""
 "\n"
@@ -9060,7 +9079,7 @@ msgstr ""
 "  %a - 以八進�數字方�表示存�權�\n"
 "  %b - 佔用的�碟�段數目\n"
 
-#: src/stat.c:1380
+#: src/stat.c:1442
 #, fuzzy
 msgid ""
 "  %d   device number in decimal\n"
@@ -9077,7 +9096,7 @@ msgstr ""
 "  %G - 所屬群組的�稱\n"
 "  %g - 所屬群組的號碼\n"
 
-#: src/stat.c:1388
+#: src/stat.c:1450
 #, fuzzy
 msgid ""
 "  %h   number of hard links\n"
@@ -9087,8 +9106,8 @@ msgid ""
 "  %N   quoted file name with dereference if symbolic link\n"
 "  %o   optimal I/O transfer size hint\n"
 "  %s   total size, in bytes\n"
-"  %t   major device type in hex\n"
-"  %T   minor device type in hex\n"
+"  %t   major device type in hex, for character/block device special files\n"
+"  %T   minor device type in hex, for character/block device special files\n"
 msgstr ""
 "  %h - 實際連� (hard link) 的數目\n"
 "  %i - Inode 號碼\n"
@@ -9099,7 +9118,7 @@ msgstr ""
 "  %T - 特殊檔案或�置檔案的�六進� minor 號碼\n"
 "  %t - 特殊檔案或�置檔案的�六進� major 號碼\n"
 
-#: src/stat.c:1399
+#: src/stat.c:1461
 #, fuzzy
 msgid ""
 "  %u   user ID of owner\n"
@@ -9108,10 +9127,10 @@ msgid ""
 "  %W   time of file birth, seconds since Epoch; 0 if unknown\n"
 "  %x   time of last access, human-readable\n"
 "  %X   time of last access, seconds since Epoch\n"
-"  %y   time of last modification, human-readable\n"
-"  %Y   time of last modification, seconds since Epoch\n"
-"  %z   time of last change, human-readable\n"
-"  %Z   time of last change, seconds since Epoch\n"
+"  %y   time of last data modification, human-readable\n"
+"  %Y   time of last data modification, seconds since Epoch\n"
+"  %z   time of last status change, human-readable\n"
+"  %Z   time of last status change, seconds since Epoch\n"
 "\n"
 msgstr ""
 "  %U - �有者的用戶�稱\n"
@@ -9123,7 +9142,7 @@ msgstr ""
 "  %Z - 由 Epoch 時間至最後更改 inode 資訊的時間之間經�的秒數\n"
 "  %z - 最後更改 inode 資訊的時間\n"
 
-#: src/stat.c:1413
+#: src/stat.c:1475
 #, fuzzy
 msgid ""
 "Valid format sequences for file systems:\n"
@@ -9142,7 +9161,7 @@ msgstr ""
 "  %d - 檔案系統剩餘�用的最大檔案數目\n"
 "  %f - 檔案系統的剩餘空間\n"
 
-#: src/stat.c:1422
+#: src/stat.c:1484
 #, fuzzy
 msgid ""
 "  %i   file system ID in hex\n"
@@ -9210,22 +9229,27 @@ msgid ""
 "and are thus unaffected by 'stdbuf' settings.\n"
 msgstr ""
 
-#: src/stdbuf.c:226
+#: src/stdbuf.c:241
 #, fuzzy, c-format
 msgid "failed to find %s"
 msgstr "無法�留%s的時間"
 
-#: src/stdbuf.c:246 src/stdbuf.c:278
+#: src/stdbuf.c:265 src/stdbuf.c:299
 #, c-format
 msgid "failed to update the environment with %s"
 msgstr ""
 
-#: src/stdbuf.c:320
+#: src/stdbuf.c:345
 #, c-format
 msgid "line buffering stdin is meaningless"
 msgstr ""
 
-#: src/stty.c:513
+#: src/stdbuf.c:376
+#, c-format
+msgid "you must specify a buffering mode option"
+msgstr ""
+
+#: src/stty.c:516
 #, c-format
 msgid ""
 "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n"
@@ -9233,25 +9257,25 @@ msgid ""
 "  or:  %s [-F DEVICE | --file=DEVICE] [-g|--save]\n"
 msgstr ""
 
-#: src/stty.c:519
+#: src/stty.c:522
 msgid "Print or change terminal characteristics.\n"
 msgstr ""
 
-#: src/stty.c:525
+#: src/stty.c:528
 msgid ""
 "  -a, --all          print all current settings in human-readable form\n"
 "  -g, --save         print all current settings in a stty-readable form\n"
 "  -F, --file=DEVICE  open and use the specified DEVICE instead of stdin\n"
 msgstr ""
 
-#: src/stty.c:532
+#: src/stty.c:535
 msgid ""
 "\n"
 "Optional - before SETTING indicates negation.  An * marks non-POSIX\n"
 "settings.  The underlying system defines which settings are available.\n"
 msgstr ""
 
-#: src/stty.c:537
+#: src/stty.c:540
 msgid ""
 "\n"
 "Special characters:\n"
@@ -9260,7 +9284,7 @@ msgid ""
 "   eol CHAR      CHAR will end the line\n"
 msgstr ""
 
-#: src/stty.c:544
+#: src/stty.c:547
 msgid ""
 " * eol2 CHAR     alternate CHAR for ending the line\n"
 "   erase CHAR    CHAR will erase the last character typed\n"
@@ -9268,7 +9292,7 @@ msgid ""
 "   kill CHAR     CHAR will erase the current line\n"
 msgstr ""
 
-#: src/stty.c:550
+#: src/stty.c:553
 msgid ""
 " * lnext CHAR    CHAR will enter the next character quoted\n"
 "   quit CHAR     CHAR will send a quit signal\n"
@@ -9276,7 +9300,7 @@ msgid ""
 "   start CHAR    CHAR will restart the output after stopping it\n"
 msgstr ""
 
-#: src/stty.c:556
+#: src/stty.c:559
 msgid ""
 "   stop CHAR     CHAR will stop the output\n"
 "   susp CHAR     CHAR will send a terminal stop signal\n"
@@ -9284,7 +9308,7 @@ msgid ""
 " * werase CHAR   CHAR will erase the last word typed\n"
 msgstr ""
 
-#: src/stty.c:562
+#: src/stty.c:565
 msgid ""
 "\n"
 "Special settings:\n"
@@ -9293,7 +9317,7 @@ msgid ""
 " * columns N     same as cols N\n"
 msgstr ""
 
-#: src/stty.c:569
+#: src/stty.c:572
 msgid ""
 "   ispeed N      set the input speed to N\n"
 " * line N        use line discipline N\n"
@@ -9302,7 +9326,7 @@ msgid ""
 "   ospeed N      set the output speed to N\n"
 msgstr ""
 
-#: src/stty.c:575
+#: src/stty.c:578
 msgid ""
 " * rows N        tell the kernel that the terminal has N rows\n"
 " * size          print the number of rows and columns according to the "
@@ -9311,7 +9335,7 @@ msgid ""
 "   time N        with -icanon, set read timeout of N tenths of a second\n"
 msgstr ""
 
-#: src/stty.c:581
+#: src/stty.c:584
 msgid ""
 "\n"
 "Control settings:\n"
@@ -9322,7 +9346,7 @@ msgid ""
 "   csN           set character size to N bits, N in [5..8]\n"
 msgstr ""
 
-#: src/stty.c:590
+#: src/stty.c:593
 msgid ""
 "   [-]cstopb     use two stop bits per character (one with '-')\n"
 "   [-]hup        send a hangup signal when the last process closes the tty\n"
@@ -9330,9 +9354,10 @@ msgid ""
 "   [-]parenb     generate parity bit in output and expect parity bit in "
 "input\n"
 "   [-]parodd     set odd parity (or even parity with '-')\n"
+" * [-]cmspar     use \"stick\" (mark/space) parity\n"
 msgstr ""
 
-#: src/stty.c:597
+#: src/stty.c:601
 msgid ""
 "\n"
 "Input settings:\n"
@@ -9342,7 +9367,7 @@ msgid ""
 "   [-]igncr      ignore carriage return\n"
 msgstr ""
 
-#: src/stty.c:605
+#: src/stty.c:609
 msgid ""
 "   [-]ignpar     ignore characters with parity errors\n"
 " * [-]imaxbel    beep and do not flush a full input buffer on a character\n"
@@ -9351,11 +9376,11 @@ msgid ""
 "   [-]istrip     clear high (8th) bit of input characters\n"
 msgstr ""
 
-#: src/stty.c:612
+#: src/stty.c:616
 msgid " * [-]iutf8      assume input characters are UTF-8 encoded\n"
 msgstr ""
 
-#: src/stty.c:615
+#: src/stty.c:619
 msgid ""
 " * [-]iuclc      translate uppercase characters to lowercase\n"
 " * [-]ixany      let any character restart output, not only start character\n"
@@ -9365,7 +9390,7 @@ msgid ""
 "   [-]tandem     same as [-]ixoff\n"
 msgstr ""
 
-#: src/stty.c:623
+#: src/stty.c:627
 msgid ""
 "\n"
 "Output settings:\n"
@@ -9375,17 +9400,17 @@ msgid ""
 " * nlN           newline delay style, N in [0..1]\n"
 msgstr ""
 
-#: src/stty.c:631
+#: src/stty.c:635
 msgid ""
 " * [-]ocrnl      translate carriage return to newline\n"
-" * [-]ofdel      use delete characters for fill instead of null characters\n"
+" * [-]ofdel      use delete characters for fill instead of NUL characters\n"
 " * [-]ofill      use fill (padding) characters instead of timing for delays\n"
 " * [-]olcuc      translate lowercase characters to uppercase\n"
 " * [-]onlcr      translate newline to carriage return-newline\n"
 " * [-]onlret     newline performs a carriage return\n"
 msgstr ""
 
-#: src/stty.c:639
+#: src/stty.c:643
 msgid ""
 " * [-]onocr      do not print carriage returns in the first column\n"
 "   [-]opost      postprocess output\n"
@@ -9395,7 +9420,7 @@ msgid ""
 " * vtN           vertical tab delay style, N in [0..1]\n"
 msgstr ""
 
-#: src/stty.c:647
+#: src/stty.c:651
 msgid ""
 "\n"
 "Local settings:\n"
@@ -9404,7 +9429,7 @@ msgid ""
 " * -crtkill      kill all line by obeying the echoctl and echok settings\n"
 msgstr ""
 
-#: src/stty.c:654
+#: src/stty.c:658
 msgid ""
 " * [-]ctlecho    echo control characters in hat notation ('^c')\n"
 "   [-]echo       echo input characters\n"
@@ -9413,7 +9438,7 @@ msgid ""
 "   [-]echok      echo a newline after a kill character\n"
 msgstr ""
 
-#: src/stty.c:661
+#: src/stty.c:665
 msgid ""
 " * [-]echoke     same as [-]crtkill\n"
 "   [-]echonl     echo newline even if not echoing other characters\n"
@@ -9422,7 +9447,7 @@ msgid ""
 "   [-]iexten     enable non-POSIX special characters\n"
 msgstr ""
 
-#: src/stty.c:668
+#: src/stty.c:672
 msgid ""
 "   [-]isig       enable interrupt, quit, and suspend special characters\n"
 "   [-]noflsh     disable flushing after interrupt and quit special "
@@ -9432,7 +9457,7 @@ msgid ""
 " * [-]xcase      with icanon, escape with '\\' for uppercase characters\n"
 msgstr ""
 
-#: src/stty.c:675
+#: src/stty.c:679
 msgid ""
 "\n"
 "Combination settings:\n"
@@ -9441,7 +9466,7 @@ msgid ""
 "   -cbreak       same as icanon\n"
 msgstr ""
 
-#: src/stty.c:682
+#: src/stty.c:686
 msgid ""
 "   cooked        same as brkint ignpar istrip icrnl ixon opost isig\n"
 "                 icanon, eof and eol characters to their default values\n"
@@ -9449,7 +9474,7 @@ msgid ""
 "   crt           same as echoe echoctl echoke\n"
 msgstr ""
 
-#: src/stty.c:688
+#: src/stty.c:692
 msgid ""
 "   dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
 "                 kill ^u\n"
@@ -9458,7 +9483,7 @@ msgid ""
 "   evenp         same as parenb -parodd cs7\n"
 msgstr ""
 
-#: src/stty.c:695
+#: src/stty.c:699
 msgid ""
 "   -evenp        same as -parenb cs8\n"
 " * [-]lcase      same as xcase iuclc olcuc\n"
@@ -9468,7 +9493,7 @@ msgid ""
 "   -nl           same as icrnl -inlcr -igncr onlcr -ocrnl -onlret\n"
 msgstr ""
 
-#: src/stty.c:703
+#: src/stty.c:707
 msgid ""
 "   oddp          same as parenb parodd cs7\n"
 "   -oddp         same as -parenb cs8\n"
@@ -9477,7 +9502,7 @@ msgid ""
 "   -pass8        same as parenb istrip cs7\n"
 msgstr ""
 
-#: src/stty.c:710
+#: src/stty.c:714
 msgid ""
 "   raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
 "                 -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n"
@@ -9485,7 +9510,7 @@ msgid ""
 "   -raw          same as cooked\n"
 msgstr ""
 
-#: src/stty.c:716
+#: src/stty.c:720
 msgid ""
 "   sane          same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
 "                 -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n"
@@ -9495,7 +9520,7 @@ msgid ""
 "                 characters to their default values\n"
 msgstr ""
 
-#: src/stty.c:724
+#: src/stty.c:728
 msgid ""
 "\n"
 "Handle the tty line connected to standard input.  Without arguments,\n"
@@ -9504,55 +9529,55 @@ msgid ""
 "127; special values ^- or undef used to disable special characters.\n"
 msgstr ""
 
-#: src/stty.c:796
+#: src/stty.c:800
 #, fuzzy, c-format
 msgid "only one device may be specified"
 msgstr "�能指定一個�數"
 
-#: src/stty.c:826
+#: src/stty.c:830
 #, fuzzy, c-format
 msgid ""
 "the options for verbose and stty-readable output styles are\n"
 "mutually exclusive"
 msgstr "�能�時使用 --string � --check �項"
 
-#: src/stty.c:832
+#: src/stty.c:836
 #, c-format
 msgid "when specifying an output style, modes may not be set"
 msgstr ""
 
-#: src/stty.c:847
+#: src/stty.c:851
 #, c-format
 msgid "%s: couldn't reset non-blocking mode"
 msgstr ""
 
-#: src/stty.c:892 src/stty.c:1002
+#: src/stty.c:896 src/stty.c:1006
 #, fuzzy, c-format
 msgid "invalid argument %s"
 msgstr "�數無效: %s"
 
-#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957
-#: src/stty.c:977
+#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961
+#: src/stty.c:981
 #, fuzzy, c-format
 msgid "missing argument to %s"
 msgstr "%2$s的�數%1$s�明確"
 
-#: src/stty.c:983
+#: src/stty.c:987
 #, fuzzy, c-format
 msgid "invalid line discipline %s"
 msgstr "無效的欄��格：‘%s’"
 
-#: src/stty.c:1053
+#: src/stty.c:1057
 #, c-format
 msgid "%s: unable to perform all requested operations"
 msgstr ""
 
-#: src/stty.c:1399
+#: src/stty.c:1403
 #, c-format
 msgid "%s: no size information for this device"
 msgstr ""
 
-#: src/stty.c:1920
+#: src/stty.c:1924
 #, fuzzy, c-format
 msgid "invalid integer argument %s"
 msgstr "無效的行號增加值：‘%s’"
@@ -9605,22 +9630,22 @@ msgstr "      --help     顯示此求助說明並離開\n"
 msgid "      --version  output version information and exit\n"
 msgstr "      --version  顯示版本資訊並離開\n"
 
-#: src/system.h:544
+#: src/system.h:543
 #, fuzzy
 msgid ""
 "\n"
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "長�項必須用的�數在使用短�項時也是必須的。\n"
 
-#: src/system.h:552
+#: src/system.h:551
 msgid ""
 "\n"
-"SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n"
-"are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of "
-"1000).\n"
+"The SIZE argument is an integer and optional unit (example: 10K is "
+"10*1024).\n"
+"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n"
 msgstr ""
 
-#: src/system.h:561
+#: src/system.h:560
 #, c-format
 msgid ""
 "\n"
@@ -9629,35 +9654,33 @@ msgid ""
 "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n"
 msgstr ""
 
-#: src/system.h:571
-#, fuzzy, c-format
+#: src/system.h:570
+#, c-format
 msgid ""
 "\n"
-"Report %s bugs to %s\n"
+"%s online help: <%s>\n"
 msgstr ""
-"\n"
-"請� <%s> 回報錯誤。\n"
 
 #. TRANSLATORS: Replace LANG_CODE in this URL with your language code
 #. <http://translationproject.org/team/LANG_CODE.html> to form one of
 #. the URLs at http://translationproject.org/team/.  Otherwise, replace
 #. the entire URL with your translation team's email address.
-#: src/system.h:585
+#: src/system.h:580
 #, c-format
 msgid "Report %s translation bugs to <http://translationproject.org/team/>\n"
 msgstr ""
 
-#: src/system.h:589
+#: src/system.h:584
 #, c-format
 msgid "For complete documentation, run: info coreutils '%s invocation'\n"
 msgstr ""
 
-#: src/system.h:596
+#: src/system.h:591
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "請嘗試執行‘%s --help’來��更多資訊。\n"
 
-#: src/system.h:628
+#: src/system.h:633
 #, c-format
 msgid ""
 "WARNING: Circular directory structure.\n"
@@ -9756,18 +9779,16 @@ msgstr ""
 
 #: src/tail.c:270
 msgid ""
-"  -c, --bytes=K            output the last K bytes; alternatively, use -c "
-"+K\n"
-"                           to output bytes starting with the Kth of each "
-"file\n"
+"  -c, --bytes=K            output the last K bytes; or use -c +K to output\n"
+"                             bytes starting with the Kth of each file\n"
 msgstr ""
 
 #: src/tail.c:274
+#, fuzzy
 msgid ""
 "  -f, --follow[={name|descriptor}]\n"
 "                           output appended data as the file grows;\n"
-"                           -f, --follow, and --follow=descriptor are\n"
-"                           equivalent\n"
+"                             an absent option argument means 'descriptor'\n"
 "  -F                       same as --follow=name --retry\n"
 msgstr ""
 "  -f, --follow[={name|descriptor}]\n"
@@ -9776,18 +9797,17 @@ msgstr ""
 "  -F                       等於 --follow=name --retry\n"
 
 # --max-consecutive-size-changes is undocumented  -- maddog
-#: src/tail.c:281
+#: src/tail.c:280
 #, fuzzy, c-format
 msgid ""
 "  -n, --lines=K            output the last K lines, instead of the last %d;\n"
-"                           or use -n +K to output lines starting with the "
-"Kth\n"
+"                             or use -n +K to output starting with the Kth\n"
 "      --max-unchanged-stats=N\n"
 "                           with --follow=name, reopen a FILE which has not\n"
-"                           changed size after N (default %d) iterations\n"
-"                           to see if it has been unlinked or renamed\n"
-"                           (this is the usual case of rotated log files).\n"
-"                           With inotify, this option is rarely useful.\n"
+"                             changed size after N (default %d) iterations\n"
+"                             to see if it has been unlinked or renamed\n"
+"                             (this is the usual case of rotated log files);\n"
+"                             with inotify, this option is rarely useful\n"
 msgstr ""
 "  -n, --lines=N            顯示最後 N 行而�是 %d 行\n"
 "      --max-unchanged-stats=N\n"
@@ -9799,14 +9819,12 @@ msgstr ""
 "                           �� --follow=name 時，如果 <檔案> 連續 N 次\n"
 "                           改變大�，則�定此檔案已經被改�。\n"
 
-#: src/tail.c:294
+#: src/tail.c:293
 #, fuzzy
 msgid ""
 "      --pid=PID            with -f, terminate after process ID, PID dies\n"
 "  -q, --quiet, --silent    never output headers giving file names\n"
-"      --retry              keep trying to open a file even when it is or\n"
-"                             becomes inaccessible; useful when following by\n"
-"                             name, i.e., with --follow=name\n"
+"      --retry              keep trying to open a file if it is inaccessible\n"
 msgstr ""
 "      --pid=PID            �� -f �項時，tail 會在指定的程� (識別碼\n"
 "                           為 PID) 退出後中止\n"
@@ -9815,16 +9833,16 @@ msgstr ""
 "                           (�設為 1 秒)\n"
 "  -v, --verbose            一定顯示任何標明檔案�稱的標頭\n"
 
-#: src/tail.c:301
+#: src/tail.c:298
 msgid ""
 "  -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n"
-"                             (default 1.0) between iterations.\n"
-"                             With inotify and --pid=P, check process P at\n"
-"                             least once every N seconds.\n"
+"                             (default 1.0) between iterations;\n"
+"                             with inotify and --pid=P, check process P at\n"
+"                             least once every N seconds\n"
 "  -v, --verbose            always output headers giving file names\n"
 msgstr ""
 
-#: src/tail.c:310
+#: src/tail.c:307
 #, fuzzy
 msgid ""
 "\n"
@@ -9841,7 +9859,7 @@ msgstr ""
 "m 則是 1048576 (1M)。\n"
 "\n"
 
-#: src/tail.c:319
+#: src/tail.c:316
 #, fuzzy
 msgid ""
 "With --follow (-f), tail defaults to following the file descriptor, which\n"
@@ -9857,159 +9875,164 @@ msgstr ""
 "的檔案，方法是�複地開啟檔案，看看它是�已被移除和其它程�會��產生該\n"
 "檔案。\n"
 
-#: src/tail.c:378
+#: src/tail.c:368
 #, c-format
 msgid "closing %s (fd=%d)"
 msgstr "正在關閉 %s (fd=%d)"
 
-#: src/tail.c:453
-#, fuzzy, c-format
-msgid "%s: cannot seek to relative offset %s"
-msgstr "%s：無法�尋至相��置 %s%s"
-
-#: src/tail.c:457
+#: src/tail.c:461
 #, fuzzy, c-format
 msgid "%s: cannot seek to end-relative offset %s"
 msgstr "%s：無法�尋至末端相��置 %s%s"
 
-#: src/tail.c:894
+#: src/tail.c:898
 #, c-format
 msgid "cannot determine location of %s. reverting to polling"
 msgstr ""
 
-#: src/tail.c:906
+#: src/tail.c:910
 #, c-format
 msgid ""
 "unrecognized file system type 0x%08lx for %s. please report this to %s. "
 "reverting to polling"
 msgstr ""
 
-#: src/tail.c:963
+#: src/tail.c:965
+#, fuzzy, c-format
+msgid "%s has been replaced with a symbolic link. giving up on this name"
+msgstr "%s：被一個無法 tail 的檔案�代；�會�檢查此檔案�稱"
+
+#: src/tail.c:980
 #, fuzzy, c-format
 msgid "%s has become inaccessible"
 msgstr "已無法存�‘%s’"
 
-#: src/tail.c:980
+#: src/tail.c:997
 #, fuzzy, c-format
 msgid "%s has been replaced with an untailable file; giving up on this name"
 msgstr "%s：被一個無法 tail 的檔案�代；�會�檢查此檔案�稱"
 
-#: src/tail.c:989
+#: src/tail.c:1006
 #, fuzzy, c-format
 msgid "%s has been replaced with a remote file. giving up on this name"
 msgstr "%s：被一個無法 tail 的檔案�代；�會�檢查此檔案�稱"
 
-#: src/tail.c:1010
+#: src/tail.c:1027
 #, fuzzy, c-format
 msgid "%s has become accessible"
 msgstr "已經�以存�‘%s’"
 
-#: src/tail.c:1018
+#: src/tail.c:1035
 #, fuzzy, c-format
 msgid "%s has appeared;  following end of new file"
 msgstr "‘%s’已出�；正在檢查新檔案的末端"
 
-#: src/tail.c:1029
+#: src/tail.c:1046
 #, fuzzy, c-format
 msgid "%s has been replaced;  following end of new file"
 msgstr "‘%s’已被�代；正在檢查新檔案的末端"
 
-#: src/tail.c:1130
+#: src/tail.c:1163
 #, fuzzy, c-format
 msgid "%s: cannot change nonblocking mode"
 msgstr "無法更改%s的�有者和/或所屬群組"
 
-#: src/tail.c:1172 src/tail.c:1287
+#: src/tail.c:1205 src/tail.c:1342
 #, c-format
 msgid "%s: file truncated"
 msgstr "%s：檔案被截斷了"
 
-#: src/tail.c:1196 src/tail.c:1442
+#: src/tail.c:1229 src/tail.c:1498
 #, c-format
 msgid "no files remaining"
 msgstr "已沒有任何剩餘的檔案"
 
-#: src/tail.c:1369
+#: src/tail.c:1424
 #, fuzzy, c-format
 msgid "cannot watch parent directory of %s"
 msgstr "無法 stat 目�的目錄 (�在是 %s)"
 
-#: src/tail.c:1372 src/tail.c:1387
+#: src/tail.c:1427 src/tail.c:1442
 #, fuzzy, c-format
 msgid "inotify resources exhausted"
 msgstr "記憶體耗盡"
 
-#: src/tail.c:1390 src/tail.c:1519
+#: src/tail.c:1445 src/tail.c:1577
 #, fuzzy, c-format
 msgid "cannot watch %s"
 msgstr "無法�‘%s’執行輸出入控制 (ioctl)"
 
-#: src/tail.c:1473
+#: src/tail.c:1529
 #, c-format
 msgid "error monitoring inotify event"
 msgstr ""
 
-#: src/tail.c:1493
+#: src/tail.c:1549
 #, fuzzy, c-format
 msgid "error reading inotify event"
 msgstr "讀� %s 時發生錯誤"
 
-#: src/tail.c:1786
+#: src/tail.c:1844
 #, c-format
 msgid "%s: cannot follow end of this type of file; giving up on this name"
 msgstr "%s：無法檢查此類檔案的末端；�會�檢查此檔案�稱"
 
-#: src/tail.c:1903
+#: src/tail.c:1961
 #, fuzzy, c-format
 msgid "number in %s is too large"
 msgstr "%s �長"
 
-#: src/tail.c:1975
+#: src/tail.c:2033
 #, c-format
 msgid "%s: invalid maximum number of unchanged stats between opens"
 msgstr "%s：開啟檔案� stat 資料沒有改變的最大次數無效"
 
-#: src/tail.c:1991
+#: src/tail.c:2049
 #, c-format
 msgid "%s: invalid PID"
 msgstr "%s：無效的 PID"
 
-#: src/tail.c:2010
+#: src/tail.c:2068
 #, c-format
 msgid "%s: invalid number of seconds"
 msgstr "%s：無效的秒數"
 
-#: src/tail.c:2026
+#: src/tail.c:2084
 #, c-format
 msgid "option used in invalid context -- %c"
 msgstr ""
 
-#: src/tail.c:2034
+#: src/tail.c:2096
 #, fuzzy, c-format
-msgid "warning: --retry is useful mainly when following by name"
-msgstr "警告：�有檢查檔案�稱時 --retry �項�會有效"
+msgid "warning: --retry ignored; --retry is useful only when following"
+msgstr "警告：會忽略 PID；--pid=PID �項�在�斷檢查檔案時�會有效"
+
+#: src/tail.c:2100
+#, c-format
+msgid "warning: --retry only effective for the initial open"
+msgstr ""
 
-#: src/tail.c:2038
+#: src/tail.c:2105
 #, c-format
 msgid "warning: PID ignored; --pid=PID is useful only when following"
 msgstr "警告：會忽略 PID；--pid=PID �項�在�斷檢查檔案時�會有效"
 
-#: src/tail.c:2041
+#: src/tail.c:2108
 #, c-format
 msgid "warning: --pid=PID is not supported on this system"
 msgstr "警告：此系統�支� --pid=PID �項"
 
-#: src/tail.c:2142
+#: src/tail.c:2209
 #, fuzzy, c-format
 msgid "cannot follow %s by name"
 msgstr "無法建立暫存檔"
 
-#: src/tail.c:2148
+#: src/tail.c:2215
 #, c-format
 msgid "warning: following standard input indefinitely is ineffective"
 msgstr ""
 
-#: src/tail.c:2209
+#: src/tail.c:2291
 #, c-format
 msgid "inotify cannot be used, reverting to polling"
 msgstr ""
@@ -10217,17 +10240,17 @@ msgstr "�數�多"
 msgid "warning: sigprocmask"
 msgstr ""
 
-#: src/timeout.c:145
+#: src/timeout.c:146
 #, c-format
 msgid "warning: timer_settime"
 msgstr ""
 
-#: src/timeout.c:150
+#: src/timeout.c:151
 #, c-format
 msgid "warning: timer_create"
 msgstr ""
 
-#: src/timeout.c:225
+#: src/timeout.c:228
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n"
@@ -10236,31 +10259,29 @@ msgstr ""
 "用法：%s [檔案]...\n"
 "  或：%s [�項]\n"
 
-#: src/timeout.c:229
-#, fuzzy
+#: src/timeout.c:232
 msgid "Start COMMAND, and kill it if still running after DURATION.\n"
-msgstr "長�項必須用的�數在使用短�項時也是必須的。\n"
+msgstr ""
 
-#: src/timeout.c:235
+#: src/timeout.c:238
 msgid ""
 "      --preserve-status\n"
 "                 exit with the same status as COMMAND, even when the\n"
-"                 command times out\n"
+"                   command times out\n"
 "      --foreground\n"
-"                 When not running timeout directly from a shell prompt,\n"
-"                 allow COMMAND to read from the TTY and receive TTY "
-"signals.\n"
-"                 In this mode, children of COMMAND will not be timed out.\n"
+"                 when not running timeout directly from a shell prompt,\n"
+"                   allow COMMAND to read from the TTY and get TTY signals;\n"
+"                   in this mode, children of COMMAND will not be timed out\n"
 "  -k, --kill-after=DURATION\n"
 "                 also send a KILL signal if COMMAND is still running\n"
-"                 this long after the initial signal was sent.\n"
+"                   this long after the initial signal was sent\n"
 "  -s, --signal=SIGNAL\n"
-"                 specify the signal to be sent on timeout.\n"
-"                 SIGNAL may be a name like 'HUP' or a number.\n"
-"                 See 'kill -l' for a list of signals\n"
+"                 specify the signal to be sent on timeout;\n"
+"                   SIGNAL may be a name like 'HUP' or a number;\n"
+"                   see 'kill -l' for a list of signals\n"
 msgstr ""
 
-#: src/timeout.c:254
+#: src/timeout.c:257
 msgid ""
 "\n"
 "DURATION is a floating point number with an optional suffix:\n"
@@ -10268,7 +10289,7 @@ msgid ""
 "days.\n"
 msgstr ""
 
-#: src/timeout.c:259
+#: src/timeout.c:262
 msgid ""
 "\n"
 "If the command times out, and --preserve-status is not set, then exit with\n"
@@ -10279,17 +10300,17 @@ msgid ""
 "case the exit status is 128+9 rather than 124.\n"
 msgstr ""
 
-#: src/timeout.c:363
+#: src/timeout.c:366
 #, c-format
 msgid "warning: disabling core dumps failed"
 msgstr ""
 
-#: src/timeout.c:471
+#: src/timeout.c:474
 #, fuzzy, c-format
 msgid "error waiting for command"
 msgstr "寫入 %s 時發生錯誤"
 
-#: src/timeout.c:482
+#: src/timeout.c:485
 #, c-format
 msgid "the monitored command dumped core"
 msgstr ""
@@ -10663,7 +10684,7 @@ msgstr ""
 #: src/truncate.c:115
 msgid ""
 "  -r, --reference=RFILE  base size on RFILE\n"
-"  -s, --size=SIZE        set or adjust the file size by SIZE\n"
+"  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"
 msgstr ""
 
 #: src/truncate.c:121
@@ -10748,12 +10769,12 @@ msgstr ""
 "<檔案> 是 -，則由標準輸入讀�資料。\n"
 "\n"
 
-#: src/tsort.c:472
+#: src/tsort.c:471
 #, fuzzy, c-format
 msgid "%s: input contains an odd number of tokens"
 msgstr "%s：將輸入資料排�時出�迴圈："
 
-#: src/tsort.c:518
+#: src/tsort.c:517
 #, c-format
 msgid "%s: input contains a loop:"
 msgstr "%s：將輸入資料排�時出�迴圈："
@@ -10833,12 +10854,12 @@ msgstr ""
 msgid "tab stop value is too large"
 msgstr "tab 字元寬度 %s �長"
 
-#: src/uniq.c:134
+#: src/uniq.c:170
 #, c-format
 msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
 msgstr "用法：%s [�項]... [輸入 [輸出]]\n"
 
-#: src/uniq.c:138
+#: src/uniq.c:174
 msgid ""
 "Filter adjacent matching lines from INPUT (or standard input),\n"
 "writing to OUTPUT (or standard output).\n"
@@ -10846,40 +10867,45 @@ msgid ""
 "With no options, matching lines are merged to the first occurrence.\n"
 msgstr ""
 
-#: src/uniq.c:147
+#: src/uniq.c:183
+#, fuzzy
 msgid ""
 "  -c, --count           prefix lines by the number of occurrences\n"
-"  -d, --repeated        only print duplicate lines\n"
+"  -d, --repeated        only print duplicate lines, one for each group\n"
 msgstr ""
 "  -c, --count           �行�加上出�次數\n"
 "  -d, --repeated        ��出�複的資料\n"
 
-#: src/uniq.c:151
-#, fuzzy
+#: src/uniq.c:187
+msgid ""
+"  -D, --all-repeated[=METHOD]  print all duplicate lines\n"
+"                          groups can be delimited with an empty line\n"
+"                          METHOD={none(default),prepend,separate}\n"
+msgstr ""
+
+#: src/uniq.c:192
+msgid "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+msgstr ""
+
+#: src/uniq.c:195
+msgid ""
+"      --group[=METHOD]  show all items, separating groups with an empty "
+"line\n"
+"                          METHOD={separate(default),prepend,append,both}\n"
+msgstr ""
+
+#: src/uniq.c:199
 msgid ""
-"  -D, --all-repeated[=delimit-method]  print all duplicate lines\n"
-"                        delimit-method={none(default),prepend,separate}\n"
-"                        Delimiting is done with blank lines\n"
-"  -f, --skip-fields=N   avoid comparing the first N fields\n"
 "  -i, --ignore-case     ignore differences in case when comparing\n"
 "  -s, --skip-chars=N    avoid comparing the first N characters\n"
 "  -u, --unique          only print unique lines\n"
-"  -z, --zero-terminated  end lines with 0 byte, not newline\n"
-msgstr ""
-"  -D, --all-repeated[=分隔方�]\n"
-"                        �出所有�複的資料\n"
-"                        分隔方�={none(�設)�prepend�separate}\n"
-"                        會使用空行來分隔資料。\n"
-"  -f, --skip-fields=N   �比較最�的 N 個欄�\n"
-"  -i, --ignore-case     比較時忽略大�寫\n"
-"  -s, --skip-chars=N    �比較最�的 N 個字元\n"
-"  -u, --unique          ��出沒有�複的資料\n"
-
-#: src/uniq.c:161
+msgstr ""
+
+#: src/uniq.c:207
 msgid "  -w, --check-chars=N   compare no more than N characters in lines\n"
 msgstr "  -w, --check-chars=N   �行比較�多於 N 個字元\n"
 
-#: src/uniq.c:166
+#: src/uniq.c:212
 #, fuzzy
 msgid ""
 "\n"
@@ -10890,7 +10916,7 @@ msgstr ""
 "一個欄�是由一組空白字元加上一組�空白的字元組�的。\n"
 "當�時指定略�欄�和略�字元�作比較時，會先略�欄�。\n"
 
-#: src/uniq.c:171
+#: src/uniq.c:217
 msgid ""
 "\n"
 "Note: 'uniq' does not detect repeated lines unless they are adjacent.\n"
@@ -10898,24 +10924,34 @@ msgid ""
 "Also, comparisons honor the rules specified by 'LC_COLLATE'.\n"
 msgstr ""
 
-#: src/uniq.c:358
+#: src/uniq.c:428
 #, c-format
 msgid "too many repeated lines"
 msgstr "�複的行數�多"
 
-#: src/uniq.c:521
+#: src/uniq.c:604
 msgid "invalid number of fields to skip"
 msgstr "�略�的欄�數目無效"
 
-#: src/uniq.c:530
+#: src/uniq.c:613
 msgid "invalid number of bytes to skip"
 msgstr "�略�的�元組數目無效"
 
-#: src/uniq.c:539
+#: src/uniq.c:623
 msgid "invalid number of bytes to compare"
 msgstr "�比較的�元組數目無效"
 
-#: src/uniq.c:558
+#: src/uniq.c:645
+#, c-format
+msgid "--group is mutually exclusive with -c/-d/-D/-u"
+msgstr ""
+
+#: src/uniq.c:652
+#, fuzzy, c-format
+msgid "grouping and printing repeat counts is meaningless"
+msgstr "顯示�行�複的資籵�計算該行的�複次數是沒有�義的"
+
+#: src/uniq.c:659
 #, c-format
 msgid "printing all duplicated lines and repeat counts is meaningless"
 msgstr "顯示�行�複的資籵�計算該行的�複次數是沒有�義的"
@@ -10937,11 +10973,6 @@ msgstr ""
 "��調用 unlink 函�來移除指定的 <檔案>。\n"
 "\n"
 
-#: src/unlink.c:86
-#, c-format
-msgid "cannot unlink %s"
-msgstr "無法 unlink %s"
-
 #: src/uptime.c:125
 #, c-format
 msgid "couldn't get boot time"
@@ -10984,7 +11015,7 @@ msgstr[0] "%lu 個使用者"
 msgid ",  load average: %.2f"
 msgstr ",  平�負載�: %.2f"
 
-#: src/uptime.c:197
+#: src/uptime.c:199
 #, c-format
 msgid ""
 "Print the current time, the length of time the system has been up,\n"
@@ -10992,19 +11023,19 @@ msgid ""
 "in the run queue over the last 1, 5 and 15 minutes."
 msgstr ""
 
-#: src/uptime.c:206
+#: src/uptime.c:208
 #, c-format
 msgid ""
 "  Processes in\n"
 "an uninterruptible sleep state also contribute to the load average.\n"
 msgstr ""
 
-#: src/uptime.c:210
+#: src/uptime.c:212
 #, c-format
 msgid "\n"
 msgstr ""
 
-#: src/uptime.c:212
+#: src/uptime.c:214
 #, fuzzy, c-format
 msgid ""
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
@@ -11170,14 +11201,12 @@ msgid ""
 msgstr ""
 
 #: src/who.c:673
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "If FILE is not specified, use %s.  %s as FILE is common.\n"
 "If ARG1 ARG2 given, -m presumed: 'am i' or 'mom likes' are usual.\n"
 msgstr ""
-"根據 <檔案> 的內容，顯示哪些人目然已經登入系統。如果沒有指定，\n"
-"�設會使用 %s。使用 %s 作為檔案也很普�。\n"
 
 #: src/whoami.c:45
 msgid ""
@@ -11209,123 +11238,43 @@ msgstr ""
 "�複�出�一�指定的 <字串>，如沒有指定則�設為 ‘y’。\n"
 "\n"
 
-#, fuzzy
-#~ msgid "  returning value: '%s'\n"
-#~ msgstr "正在建立檔案‘%s’\n"
-
-#, fuzzy
-#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n"
-#~ msgstr "用法：%s [�項] [檔案]...\n"
-
-#, fuzzy
-#~ msgid "no valid suffix found\n"
-#~ msgstr "%s：無效的後置字串長度"
-
-#~ msgid "reading %s"
-#~ msgstr "讀� %s"
-
-#~ msgid "writing %s"
-#~ msgstr "寫入 %s"
-
-#~ msgid "closing %s"
-#~ msgstr "關閉 %s"
-
-#~ msgid "accessing %s"
-#~ msgstr "正在存� %s"
-
-#~ msgid "opening %s"
-#~ msgstr "開啟 %s 中"
-
-#~ msgid ""
-#~ "Usage: %s NAME\n"
-#~ "  or:  %s OPTION\n"
-#~ msgstr ""
-#~ "用法：%s 檔案�稱\n"
-#~ "  或：%s �項\n"
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s：��法的�項 ─ %c\n"
 
-#, fuzzy
-#~ msgid ""
-#~ "  none, off       never make backups (even if --backup is given)\n"
-#~ "  numbered, t     make numbered backups\n"
-#~ "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
-#~ "  simple, never   always make simple backups\n"
-#~ "\n"
-#~ msgstr ""
-#~ "  none, off       �會進行備份 (�使使用了 --backup �項也�會)\n"
-#~ "  numbered, t     備份檔會加上數字\n"
-#~ "  existing, nil   若有數字的備份檔已經存在則使用數字，�則使用普通方�備"
-#~ "份\n"
-#~ "  simple, never   永�使用普通方�備份\n"
+#~ msgid "cannot change owner and/or group of %s"
+#~ msgstr "無法更改%s的�有者和/或所屬群組"
 
-#~ msgid "All arguments to long options are mandatory for short options.\n"
-#~ msgstr "長�項必須用的�數在使用短�項時也是必須的。\n"
+#~ msgid "cannot chdir to directory %s"
+#~ msgstr "無法進入%s目錄"
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "RADIX is d for decimal, o for octal, x for hexadecimal or n for none.\n"
-#~ "BYTES is hexadecimal with 0x or 0X prefix, and may have a multiplier "
-#~ "suffix:\n"
-#~ "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n"
-#~ "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n"
-#~ "Adding a z suffix to any type displays printable characters at the end of "
-#~ "each\n"
-#~ "output line.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "RADIX 的�擇為：d 表示�進�，o 表示八進�，h 表示�六進�，或 n 表示\n"
-#~ "�顯示基準��。<�元組> �以是�置 0x 或 0X 的�六進�數字；如果 <�元組"
-#~ ">\n"
-#~ "後加上 b 字元表示將數字乘以 512，加上 k 表示乘以 1024，加上 m 表示乘以\n"
-#~ "1048576。在任何 <格�> 後加上 z 字元會在�行輸出後顯示相應的�列�字元。"
+#~ msgid "cannot get the login group of a numeric UID"
+#~ msgstr "無法�得 UID 數值所代表的登入群組"
 
-#, fuzzy
 #~ msgid ""
-#~ "Option --string without a number implies 3; option --width without a "
-#~ "number\n"
-#~ "implies 32.  By default, od uses -A o -t oS -w16.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
 #~ msgstr ""
-#~ " \n"
-#~ "--string �加數字表示字串長度是 3。--width �加數字表示寬度是 32。�設\n"
-#~ "od 使用的�項是 -A o -t d2 -w 16。\n"
-
-#, fuzzy
-#~ msgid "Usage: %s [OPTION]... FILE\n"
-#~ msgstr "用法：%s [�項]... [檔案]...\n"
-
-#, fuzzy
-#~ msgid "getpass: cannot open /dev/tty"
-#~ msgstr "無法開啟目錄%s"
-
-#, fuzzy
-#~ msgid "cannot set groups"
-#~ msgstr "���時�略使用者和所屬群組"
-
-#, fuzzy
-#~ msgid "cannot set group id"
-#~ msgstr "���時�略使用者和所屬群組"
-
-#, fuzzy
-#~ msgid "cannot set user id"
-#~ msgstr "���時�略使用者和所屬群組"
+#~ "這是自由軟體；請�考原始碼的版權�明。本軟體��供任何�證，甚至�會包括\n"
+#~ "�售性或�用於任何特定目的的�證。\n"
 
-#, fuzzy
-#~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n"
-#~ msgstr "用法：%s [�項]... [檔案]...\n"
+#~ msgid "Usage: %s [OPTION] [FILE]...\n"
+#~ msgstr "用法：%s [�項] [檔案]...\n"
 
-#, fuzzy
-#~ msgid "warning: cannot change directory to %s"
-#~ msgstr "無法建立目錄%s"
+#~ msgid "closing standard output"
+#~ msgstr "關閉標準輸出"
 
-#, fuzzy
 #~ msgid ""
 #~ "Change the group of each FILE to GROUP.\n"
 #~ "With --reference, change the group of each FILE to that of RFILE.\n"
 #~ "\n"
 #~ "  -c, --changes          like verbose but report only when a change is "
 #~ "made\n"
-#~ "  -f, --silent, --quiet  suppress most error messages\n"
-#~ "  -v, --verbose          output a diagnostic for every file processed\n"
+#~ "      --dereference      affect the referent of each symbolic link, "
+#~ "rather\n"
+#~ "                         than the symbolic link itself (this is the "
+#~ "default)\n"
 #~ msgstr ""
 #~ "將�個 <檔案> 的所屬群組設定為 <群組>。\n"
 #~ "加上 --reference 的話，會�考 <�考檔> 的群組來設定。\n"
@@ -11334,10 +11283,9 @@ msgstr ""
 #~ "      --dereference      會影響符號��所指定的目的地檔案，\n"
 #~ "                         而�符號��本身 (�設)\n"
 
-#, fuzzy
 #~ msgid ""
 #~ "  -f, --silent, --quiet  suppress most error messages\n"
-#~ "      --reference=RFILE  use RFILE's group rather than specifying a\n"
+#~ "      --reference=RFILE  use RFILE's group rather than the specifying\n"
 #~ "                         GROUP value\n"
 #~ "  -R, --recursive        operate on files and directories recursively\n"
 #~ "  -v, --verbose          output a diagnostic for every file processed\n"
@@ -11348,6 +11296,9 @@ msgstr ""
 #~ "  -R, --recursive        �時處�目錄之下的所有的檔案��目錄\n"
 #~ "  -v, --verbose          處��個檔案時都會顯示訊�\n"
 
+#~ msgid "%s"
+#~ msgstr "%s"
+
 #~ msgid ""
 #~ "Change the mode of each FILE to MODE.\n"
 #~ "\n"
@@ -11369,7 +11320,15 @@ msgstr ""
 #~ "      --reference=�考檔 使用<�考檔>的權�，而�自行指定<權�>\n"
 #~ "  -R, --recursive        �時處�目錄之下的所有的檔案��目錄\n"
 
-#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Each MODE is one or more of the letters ugoa, one of the symbols +-= and\n"
+#~ "one or more of the letters rwxXstugo.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "<模�> 由三部份組�：一個或以上的 ugoa 字元�+-= 符號其中一個�\n"
+#~ "和一個或以上的 rwxXstugo 字元。\n"
+
 #~ msgid ""
 #~ "Change the owner and/or group of each FILE to OWNER and/or GROUP.\n"
 #~ "With --reference, change the owner and group of each FILE to those of "
@@ -11377,10 +11336,10 @@ msgstr ""
 #~ "\n"
 #~ "  -c, --changes          like verbose but report only when a change is "
 #~ "made\n"
-#~ "      --dereference      affect the referent of each symbolic link (this "
-#~ "is\n"
-#~ "                         the default), rather than the symbolic link "
-#~ "itself\n"
+#~ "      --dereference      affect the referent of each symbolic link, "
+#~ "rather\n"
+#~ "                         than the symbolic link itself (this is the "
+#~ "default)\n"
 #~ msgstr ""
 #~ "更改�個 <檔案> 的 <�有者> �/或 <所屬群組>。\n"
 #~ "\n"
@@ -11388,11 +11347,10 @@ msgstr ""
 #~ "      --dereference      �影響的是符號��所指示的�象，而�符號��本"
 #~ "身\n"
 
-#, fuzzy
 #~ msgid ""
 #~ "  -f, --silent, --quiet  suppress most error messages\n"
 #~ "      --reference=RFILE  use RFILE's owner and group rather than\n"
-#~ "                         specifying OWNER:GROUP values\n"
+#~ "                         the specifying OWNER:GROUP values\n"
 #~ "  -R, --recursive        operate on files and directories recursively\n"
 #~ "  -v, --verbose          output a diagnostic for every file processed\n"
 #~ "\n"
@@ -11403,56 +11361,14 @@ msgstr ""
 #~ "  -R, --recursive        處�所有目錄中的檔案��目錄\n"
 #~ "  -v, --verbose          處�任何檔案都會顯示訊�\n"
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "SIZE may be (or may be an integer optionally followed by) one of "
-#~ "following:\n"
-#~ "KB 1000, K 1024, MB 1000*1000, M 1024*1024, and so on for G, T, P, E, Z, "
-#~ "Y.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "<大�> �以是以下的單� (單���加上整數)：\n"
-#~ "kB=1000，K=1024，MB=1000*1000，M=1024*1024，還有 G/T/P/E/Z/Y 如此類推。\n"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s：��法的�項 ─ %c\n"
-
-#~ msgid "cannot change owner and/or group of %s"
-#~ msgstr "無法更改%s的�有者和/或所屬群組"
-
-#~ msgid "cannot chdir to directory %s"
-#~ msgstr "無法進入%s目錄"
-
-#~ msgid "cannot get the login group of a numeric UID"
-#~ msgstr "無法�得 UID 數值所代表的登入群組"
-
-#~ msgid ""
-#~ "This is free software; see the source for copying conditions.  There is "
-#~ "NO\n"
-#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
-#~ "PURPOSE.\n"
-#~ msgstr ""
-#~ "這是自由軟體；請�考原始碼的版權�明。本軟體��供任何�證，甚至�會包括\n"
-#~ "�售性或�用於任何特定目的的�證。\n"
-
-#~ msgid "Usage: %s [OPTION] [FILE]...\n"
-#~ msgstr "用法：%s [�項] [檔案]...\n"
-
-#~ msgid "closing standard output"
-#~ msgstr "關閉標準輸出"
+#~ msgid "reading %s"
+#~ msgstr "讀� %s"
 
-#~ msgid "%s"
-#~ msgstr "%s"
+#~ msgid "writing %s"
+#~ msgstr "寫入 %s"
 
-#~ msgid ""
-#~ "\n"
-#~ "Each MODE is one or more of the letters ugoa, one of the symbols +-= and\n"
-#~ "one or more of the letters rwxXstugo.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "<模�> 由三部份組�：一個或以上的 ugoa 字元�+-= 符號其中一個�\n"
-#~ "和一個或以上的 rwxXstugo 字元。\n"
+#~ msgid "closing %s"
+#~ msgstr "關閉 %s"
 
 #~ msgid "cannot overwrite directory %s"
 #~ msgstr "無法覆寫 %s 目錄"
@@ -11473,6 +11389,9 @@ msgstr ""
 #~ "變數來�擇。以下是�用的變數值：\n"
 #~ "\n"
 
+#~ msgid "accessing %s"
+#~ msgstr "正在存� %s"
+
 #~ msgid ""
 #~ "warning: --version-control (-V) is obsolete;  support for it\n"
 #~ "will be removed in some future release.  Use --backup=%s instead."
@@ -11502,6 +11421,9 @@ msgstr ""
 #~ msgid "unrecognized operand %s=%s"
 #~ msgstr "無法識別�數 %s=%s"
 
+#~ msgid "opening %s"
+#~ msgstr "開啟 %s 中"
+
 #~ msgid "file offset out of range"
 #~ msgstr "檔案內容�置超出範�以外"
 
@@ -11573,6 +11495,13 @@ msgstr ""
 #~ msgid "%s: number of bytes is large"
 #~ msgstr "%s：�元組數目�大"
 
+#, fuzzy
+#~ msgid "%s: cannot lseek back to original position"
+#~ msgstr "%s：無法�尋至原來�置"
+
+#~ msgid "cannot reposition file pointer for %s"
+#~ msgstr "無法將 %s 的檔案指標�新定�"
+
 #~ msgid "unrecognized option `-%c'"
 #~ msgstr "無法識別的�項‘-%c’"
 
@@ -11600,6 +11529,9 @@ msgstr ""
 #~ msgid "value %s is so large that it is not representable"
 #~ msgstr "因為數值 %s �大，所以無法表示"
 
+#~ msgid "invalid field number: `%s'"
+#~ msgstr "無效的欄�號碼：‘%s’"
+
 #~ msgid "invalid field number for file 1: `%s'"
 #~ msgstr "檔案 1 的欄�號碼是無效的：‘%s’"
 
@@ -11620,6 +11552,20 @@ msgstr ""
 #~ msgstr "正在建立連至%2$s的實際�� (hard link)%1$s"
 
 #~ msgid ""
+#~ "  -n, --no-dereference        treat destination that is a symlink to a\n"
+#~ "                                directory as if it were a normal file\n"
+#~ "  -i, --interactive           prompt whether to remove destinations\n"
+#~ "  -s, --symbolic              make symbolic links instead of hard links\n"
+#~ msgstr ""
+#~ "  -n, --no-dereference        如果目的地是一個連�至�目錄的符號��，會"
+#~ "å°‡\n"
+#~ "                              該符號��當作普通檔案處�，會先備份或移除"
+#~ "該\n"
+#~ "                              ��\n"
+#~ "  -i, --interactive           確�是�移除目的地檔案\n"
+#~ "  -s, --symbolic              建立符號��而�是實際��\n"
+
+#~ msgid ""
 #~ "\n"
 #~ "By default, color is not used to distinguish types of files.  That is\n"
 #~ "equivalent to using --color=none.  Using the --color option without the\n"
@@ -11667,10 +11613,6 @@ msgstr ""
 #~ msgstr "無法更改%s的權�"
 
 #, fuzzy
-#~ msgid "cannot set permissions of %s"
-#~ msgstr "無法更改%s的權�"
-
-#, fuzzy
 #~ msgid "cannot get priority"
 #~ msgstr "無法建立目錄%s"
 
@@ -11678,6 +11620,40 @@ msgstr ""
 #~ msgid "cannot set priority"
 #~ msgstr "無法建立目錄%s"
 
+#~ msgid "All arguments to long options are mandatory for short options.\n"
+#~ msgstr "長�項必須用的�數在使用短�項時也是必須的。\n"
+
+#~ msgid ""
+#~ "  -A, --address-radix=RADIX   decide how file offsets are printed\n"
+#~ "  -j, --skip-bytes=BYTES      skip BYTES input bytes first\n"
+#~ msgstr ""
+#~ "  -A, --address-radix=RADIX   決定基準��的單�\n"
+#~ "  -j, --skip-bytes=�元組     先略�指定 <�元組> 的輸入資料\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "RADIX is d for decimal, o for octal, x for hexadecimal or n for none.\n"
+#~ "BYTES is hexadecimal with 0x or 0X prefix, it is multiplied by 512\n"
+#~ "with b suffix, by 1024 with k and by 1048576 with m.  Adding a z suffix "
+#~ "to\n"
+#~ "any type adds a display of printable characters to the end of each line\n"
+#~ "of output.  "
+#~ msgstr ""
+#~ "\n"
+#~ "RADIX 的�擇為：d 表示�進�，o 表示八進�，h 表示�六進�，或 n 表示\n"
+#~ "�顯示基準��。<�元組> �以是�置 0x 或 0X 的�六進�數字；如果 <�元組"
+#~ ">\n"
+#~ "後加上 b 字元表示將數字乘以 512，加上 k 表示乘以 1024，加上 m 表示乘以\n"
+#~ "1048576。在任何 <格�> 後加上 z 字元會在�行輸出後顯示相應的�列�字元。"
+
+#~ msgid ""
+#~ "--string without a number implies 3.  --width without a number\n"
+#~ "implies 32.  By default, od uses -A o -t d2 -w 16.\n"
+#~ msgstr ""
+#~ " \n"
+#~ "--string �加數字表示字串長度是 3。--width �加數字表示寬度是 32。�設\n"
+#~ "od 使用的�項是 -A o -t d2 -w 16。\n"
+
 #~ msgid "skip argument"
 #~ msgstr "略��數"
 
@@ -11740,6 +11716,14 @@ msgstr ""
 #~ "  \\v      垂直定�字元\n"
 
 #~ msgid ""
+#~ "\n"
+#~ "With no FILE or if FILE is -, read Standard Input.  `-F /' by default.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "如果沒有指定 <檔案> 或 <檔案> 是 -，則由標準輸入讀入資料。\n"
+#~ "�設使用‘-F /’�項。\n"
+
+#~ msgid ""
 #~ "This program is free software; you can redistribute it and/or modify\n"
 #~ "it under the terms of the GNU General Public License as published by\n"
 #~ "the Free Software Foundation; either version 2, or (at your option)\n"
@@ -11772,6 +11756,10 @@ msgstr ""
 #~ "MA 02111-1307, USA.\n"
 
 #, fuzzy
+#~ msgid "Usage: %s [OPTION]... FILE\n"
+#~ msgstr "用法：%s [�項]... [檔案]...\n"
+
+#, fuzzy
 #~ msgid "cannot chdir from %s to .."
 #~ msgstr "無法進入%s目錄"
 
@@ -11814,12 +11802,43 @@ msgstr ""
 #~ msgid "invalid format string: `%s'"
 #~ msgstr "無效的類型‘%s’"
 
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s USERNAME COMMAND [ARGUMENT]...\n"
+#~ "  or:  %s OPTION\n"
+#~ msgstr ""
+#~ "用法：%s [檔案]...\n"
+#~ "  或：%s [�項]\n"
+
+#, fuzzy
+#~ msgid "cannot set group-ID to %lu"
+#~ msgstr "���時�略使用者和所屬群組"
+
+#, fuzzy
+#~ msgid "cannot set user-ID to %lu"
+#~ msgstr "���時�略使用者和所屬群組"
+
 #~ msgid "Usage: %s [OPTIONS] FILE [...]\n"
 #~ msgstr "用法：%s [�項] 檔案 [...]\n"
 
 #~ msgid "sort size"
 #~ msgstr "排�記憶緩��"
 
+#, fuzzy
+#~ msgid ""
+#~ "  -a, --suffix-length=N   use suffixes of length N (default %d)\n"
+#~ "  -b, --bytes=SIZE        put SIZE bytes per output file\n"
+#~ "  -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output "
+#~ "file\n"
+#~ "  -d, --numeric-suffixes  use numeric suffixes instead of alphabetic\n"
+#~ "  -l, --lines=NUMBER      put NUMBER lines per output file\n"
+#~ msgstr ""
+#~ "  -a, --suffix-length=N   後置字串的長度為 N (�設值是 %d)\n"
+#~ "  -b, --bytes=大�        指定�個輸出檔的 <大�>，以�元組為單�\n"
+#~ "  -C, --line-bytes=大�   �個輸出檔放入�行數的完整資料，但 <大�> �會\n"
+#~ "                          超出指定�元組數目\n"
+#~ "  -l, --lines=行數        �個輸出檔放入指定 <行數> 的資料\n"
+
 #~ msgid ""
 #~ "\n"
 #~ "SIZE may have a multiplier suffix: b for 512, k for 1K, m for 1 Meg.\n"
@@ -11864,6 +11883,22 @@ msgstr ""
 #~ "警告：--version-control (-V) �項已經�時；將來的版本隨時�能��支�\n"
 #~ "此�項。請使用 --backup=%s。"
 
+#, fuzzy
+#~ msgid "getpass: cannot open /dev/tty"
+#~ msgstr "無法開啟目錄%s"
+
+#, fuzzy
+#~ msgid "cannot set groups"
+#~ msgstr "���時�略使用者和所屬群組"
+
+#, fuzzy
+#~ msgid "cannot set group id"
+#~ msgstr "���時�略使用者和所屬群組"
+
+#, fuzzy
+#~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n"
+#~ msgstr "用法：%s [�項]... [檔案]...\n"
+
 #~ msgid "stdin: read error"
 #~ msgstr "標準輸入：讀�資料時發生錯誤"
 
@@ -11896,6 +11931,9 @@ msgstr ""
 #~ msgid "`%s' option is obsolete; use `%s-%c %<PRIuMAX>'"
 #~ msgstr "‘%s’�項已�時；請使用‘%s-%c %.*s’"
 
+#~ msgid "warning: --retry is useful only when following by name"
+#~ msgstr "警告：�有檢查檔案�稱時 --retry �項�會有效"
+
 #, fuzzy
 #~ msgid "creating %s"
 #~ msgstr "正在建立檔案‘%s’\n"
@@ -11947,6 +11985,24 @@ msgstr ""
 #~ "將 <輸入> (�設為標準輸入) 的資料中�行連續相�的資料�棄至�剩一行，\n"
 #~ "並在 <輸出> 顯示�果 (�設會在標準輸出顯示�果)。\n"
 
+#~ msgid ""
+#~ "  -D, --all-repeated[=delimit-method] print all duplicate lines\n"
+#~ "                        delimit-method={none(default),prepend,separate}\n"
+#~ "                        Delimiting is done with blank lines.\n"
+#~ "  -f, --skip-fields=N   avoid comparing the first N fields\n"
+#~ "  -i, --ignore-case     ignore differences in case when comparing\n"
+#~ "  -s, --skip-chars=N    avoid comparing the first N characters\n"
+#~ "  -u, --unique          only print unique lines\n"
+#~ msgstr ""
+#~ "  -D, --all-repeated[=分隔方�]\n"
+#~ "                        �出所有�複的資料\n"
+#~ "                        分隔方�={none(�設)�prepend�separate}\n"
+#~ "                        會使用空行來分隔資料。\n"
+#~ "  -f, --skip-fields=N   �比較最�的 N 個欄�\n"
+#~ "  -i, --ignore-case     比較時忽略大�寫\n"
+#~ "  -s, --skip-chars=N    �比較最�的 N 個字元\n"
+#~ "  -u, --unique          ��出沒有�複的資料\n"
+
 #~ msgid "`-%lu' option is obsolete; use `-f %lu'"
 #~ msgstr "‘-%lu’�項已�時；請使用‘-f %lu’"
 
diff --git a/src/base64.c b/src/base64.c
index 0a400680..b0656043 100644
--- a/src/base64.c
+++ b/src/base64.c
@@ -1,5 +1,5 @@
 /* Base64 encode/decode strings or files.
-   Copyright (C) 2004-2013 Free Software Foundation, Inc.
+   Copyright (C) 2004-2014 Free Software Foundation, Inc.
 
    This file is part of Base64.
 
@@ -89,15 +89,16 @@ from any other non-alphabet bytes in the encoded stream.\n"),
   exit (status);
 }
 
+#define ENC_BLOCKSIZE (1024*3*10)
+#define ENC_B64BLOCKSIZE BASE64_LENGTH (ENC_BLOCKSIZE)
 /* Note that increasing this may decrease performance if --ignore-garbage
-   is used, because of the memmove operation below. */
-#define BLOCKSIZE 3072
-#define B64BLOCKSIZE BASE64_LENGTH (BLOCKSIZE)
+   is used, because of the memmove operation below.  */
+#define DEC_BLOCKSIZE (1024*3)
+#define DEC_B64BLOCKSIZE BASE64_LENGTH (DEC_BLOCKSIZE)
 
 /* Ensure that BLOCKSIZE is a multiple of 3 and 4.  */
-#if BLOCKSIZE % 12 != 0
-# error "invalid BLOCKSIZE"
-#endif
+verify (ENC_BLOCKSIZE % 12 == 0);
+verify (DEC_BLOCKSIZE % 12 == 0);
 
 static void
 wrap_write (const char *buffer, size_t len,
@@ -120,7 +121,7 @@ wrap_write (const char *buffer, size_t len,
 
         if (to_write == 0)
           {
-            if (fputs ("\n", out) < 0)
+            if (fputc ('\n', out) == EOF)
               error (EXIT_FAILURE, errno, _("write error"));
             *current_column = 0;
           }
@@ -138,8 +139,8 @@ static void
 do_encode (FILE *in, FILE *out, uintmax_t wrap_column)
 {
   size_t current_column = 0;
-  char inbuf[BLOCKSIZE];
-  char outbuf[B64BLOCKSIZE];
+  char inbuf[ENC_BLOCKSIZE];
+  char outbuf[ENC_B64BLOCKSIZE];
   size_t sum;
 
   do
@@ -149,14 +150,14 @@ do_encode (FILE *in, FILE *out, uintmax_t wrap_column)
       sum = 0;
       do
         {
-          n = fread (inbuf + sum, 1, BLOCKSIZE - sum, in);
+          n = fread (inbuf + sum, 1, ENC_BLOCKSIZE - sum, in);
           sum += n;
         }
-      while (!feof (in) && !ferror (in) && sum < BLOCKSIZE);
+      while (!feof (in) && !ferror (in) && sum < ENC_BLOCKSIZE);
 
       if (sum > 0)
         {
-          /* Process input one block at a time.  Note that BLOCKSIZE %
+          /* Process input one block at a time.  Note that ENC_BLOCKSIZE %
              3 == 0, so that no base64 pads will appear in output. */
           base64_encode (inbuf, sum, outbuf, BASE64_LENGTH (sum));
 
@@ -164,10 +165,10 @@ do_encode (FILE *in, FILE *out, uintmax_t wrap_column)
                       &current_column, out);
         }
     }
-  while (!feof (in) && !ferror (in) && sum == BLOCKSIZE);
+  while (!feof (in) && !ferror (in) && sum == ENC_BLOCKSIZE);
 
   /* When wrapping, terminate last line. */
-  if (wrap_column && current_column > 0 && fputs ("\n", out) < 0)
+  if (wrap_column && current_column > 0 && fputc ('\n', out) == EOF)
     error (EXIT_FAILURE, errno, _("write error"));
 
   if (ferror (in))
@@ -177,8 +178,8 @@ do_encode (FILE *in, FILE *out, uintmax_t wrap_column)
 static void
 do_decode (FILE *in, FILE *out, bool ignore_garbage)
 {
-  char inbuf[B64BLOCKSIZE];
-  char outbuf[BLOCKSIZE];
+  char inbuf[DEC_B64BLOCKSIZE];
+  char outbuf[DEC_BLOCKSIZE];
   size_t sum;
   struct base64_decode_context ctx;
 
@@ -193,7 +194,7 @@ do_decode (FILE *in, FILE *out, bool ignore_garbage)
       sum = 0;
       do
         {
-          n = fread (inbuf + sum, 1, B64BLOCKSIZE - sum, in);
+          n = fread (inbuf + sum, 1, DEC_B64BLOCKSIZE - sum, in);
 
           if (ignore_garbage)
             {
@@ -210,7 +211,7 @@ do_decode (FILE *in, FILE *out, bool ignore_garbage)
           if (ferror (in))
             error (EXIT_FAILURE, errno, _("read error"));
         }
-      while (sum < B64BLOCKSIZE && !feof (in));
+      while (sum < DEC_B64BLOCKSIZE && !feof (in));
 
       /* The following "loop" is usually iterated just once.
          However, when it processes the final input buffer, we want
@@ -220,7 +221,7 @@ do_decode (FILE *in, FILE *out, bool ignore_garbage)
         {
           if (k == 1 && ctx.i == 0)
             break;
-          n = BLOCKSIZE;
+          n = DEC_BLOCKSIZE;
           ok = base64_decode_ctx (&ctx, inbuf, (k == 0 ? sum : 0), outbuf, &n);
 
           if (fwrite (outbuf, 1, n, out) < n)
diff --git a/src/basename.c b/src/basename.c
index 074d284d..95215399 100644
--- a/src/basename.c
+++ b/src/basename.c
@@ -1,5 +1,5 @@
 /* basename -- strip directory and suffix from file names
-   Copyright (C) 1990-2013 Free Software Foundation, Inc.
+   Copyright (C) 1990-2014 Free Software Foundation, Inc.
 
    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
@@ -59,8 +59,8 @@ If specified, also remove a trailing SUFFIX.\n\
 
       fputs (_("\
   -a, --multiple       support multiple arguments and treat each as a NAME\n\
-  -s, --suffix=SUFFIX  remove a trailing SUFFIX\n\
-  -z, --zero           separate output with NUL rather than newline\n\
+  -s, --suffix=SUFFIX  remove a trailing SUFFIX; implies -a\n\
+  -z, --zero           end each output line with NUL, not newline\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
@@ -146,6 +146,7 @@ main (int argc, char **argv)
         {
         case 's':
           suffix = optarg;
+          /* Fall through: -s implies -a.  */
 
         case 'a':
           multiple_names = true;
diff --git a/src/cat.c b/src/cat.c
index 650cb20f..8aef79fa 100644
--- a/src/cat.c
+++ b/src/cat.c
@@ -1,5 +1,5 @@
 /* cat -- concatenate files and print on the standard output.
-   Copyright (C) 1988-2013 Free Software Foundation, Inc.
+   Copyright (C) 1988-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/chcon.c b/src/chcon.c
index 56f2caa5..cda06612 100644
--- a/src/chcon.c
+++ b/src/chcon.c
@@ -1,5 +1,5 @@
 /* chcon -- change security context of files
-   Copyright (C) 2005-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
    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
@@ -91,7 +91,7 @@ static struct option const long_options[] =
    setting any portions selected via the global variables, specified_user,
    specified_role, etc.  */
 static int
-compute_context_from_mask (security_context_t context, context_t *ret)
+compute_context_from_mask (char const *context, context_t *ret)
 {
   bool ok = true;
   context_t new_context = context_new (context);
@@ -140,9 +140,9 @@ compute_context_from_mask (security_context_t context, context_t *ret)
 static int
 change_file_context (int fd, char const *file)
 {
-  security_context_t file_context = NULL;
-  context_t context;
-  security_context_t context_string;
+  char *file_context = NULL;
+  context_t context IF_LINT (= 0);
+  char const * context_string;
   int errors = 0;
 
   if (specified_context == NULL)
@@ -170,22 +170,19 @@ change_file_context (int fd, char const *file)
 
       if (compute_context_from_mask (file_context, &context))
         return 1;
+
+      context_string = context_str (context);
     }
   else
     {
-      /* FIXME: this should be done exactly once, in main.  */
-      context = context_new (specified_context);
-      if (!context)
-        abort ();
+      context_string = specified_context;
     }
 
-  context_string = context_str (context);
-
   if (file_context == NULL || ! STREQ (context_string, file_context))
     {
       int fail = (affect_symlink_referent
-                  ?  setfileconat (fd, file, context_string)
-                  : lsetfileconat (fd, file, context_string));
+                  ?  setfileconat (fd, file, se_const (context_string))
+                  : lsetfileconat (fd, file, se_const (context_string)));
 
       if (fail)
         {
@@ -195,8 +192,11 @@ change_file_context (int fd, char const *file)
         }
     }
 
-  context_free (context);
-  freecon (file_context);
+  if (specified_context == NULL)
+    {
+      context_free (context);
+      freecon (file_context);
+    }
 
   return errors;
 }
@@ -355,7 +355,7 @@ Usage: %s [OPTION]... CONTEXT FILE...\n\
 "),
         program_name, program_name, program_name);
       fputs (_("\
-Change the security context of each FILE to CONTEXT.\n\
+Change the SELinux security context of each FILE to CONTEXT.\n\
 With --reference, change the security context of each FILE to that of RFILE.\n\
 "), stdout);
 
@@ -409,8 +409,6 @@ one takes effect.\n\
 int
 main (int argc, char **argv)
 {
-  security_context_t ref_context = NULL;
-
   /* Bit flags that control how fts works.  */
   int bit_flags = FTS_PHYSICAL;
 
@@ -542,6 +540,8 @@ main (int argc, char **argv)
 
   if (reference_file)
     {
+      char *ref_context = NULL;
+
       if (getfilecon (reference_file, &ref_context) < 0)
         error (EXIT_FAILURE, errno, _("failed to get security context of %s"),
                quote (reference_file));
@@ -555,13 +555,10 @@ main (int argc, char **argv)
     }
   else
     {
-      context_t context;
       specified_context = argv[optind++];
-      context = context_new (specified_context);
-      if (!context)
-        error (EXIT_FAILURE, 0, _("invalid context: %s"),
+      if (security_check_context (se_const (specified_context)) < 0)
+        error (EXIT_FAILURE, errno, _("invalid context: %s"),
                quotearg_colon (specified_context));
-      context_free (context);
     }
 
   if (reference_file && component_specified)
diff --git a/src/chgrp.c b/src/chgrp.c
index c70855d3..c7297c81 100644
--- a/src/chgrp.c
+++ b/src/chgrp.c
@@ -1,5 +1,5 @@
 /* chgrp -- change group ownership of files
-   Copyright (C) 1989-2013 Free Software Foundation, Inc.
+   Copyright (C) 1989-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/chmod.c b/src/chmod.c
index 2c25ce6d..756ec5a4 100644
--- a/src/chmod.c
+++ b/src/chmod.c
@@ -1,5 +1,5 @@
 /* chmod -- change permission modes of files
-   Copyright (C) 1989-2013 Free Software Foundation, Inc.
+   Copyright (C) 1989-2014 Free Software Foundation, Inc.
 
    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
@@ -111,7 +111,8 @@ static struct option const long_options[] =
    The old mode was OLD_MODE, but it was changed to NEW_MODE.  */
 
 static bool
-mode_changed (char const *file, mode_t old_mode, mode_t new_mode)
+mode_changed (int dir_fd, char const *file, char const *file_full_name,
+              mode_t old_mode, mode_t new_mode)
 {
   if (new_mode & (S_ISUID | S_ISGID | S_ISVTX))
     {
@@ -120,10 +121,11 @@ mode_changed (char const *file, mode_t old_mode, mode_t new_mode)
 
       struct stat new_stats;
 
-      if (stat (file, &new_stats) != 0)
+      if (fstatat (dir_fd, file, &new_stats, 0) != 0)
         {
           if (! force_silent)
-            error (0, errno, _("getting new attributes of %s"), quote (file));
+            error (0, errno, _("getting new attributes of %s"),
+                   quote (file_full_name));
           return false;
         }
 
@@ -283,7 +285,8 @@ process_file (FTS *fts, FTSENT *ent)
   if (verbosity != V_off)
     {
       bool changed = (chmod_succeeded
-                      && mode_changed (file, old_mode, new_mode));
+                      && mode_changed (fts->fts_cwd_fd, file, file_full_name,
+                                       old_mode, new_mode));
 
       if (changed || verbosity == V_high)
         {
diff --git a/src/chown-core.c b/src/chown-core.c
index 3a3044e0..cdcd53aa 100644
--- a/src/chown-core.c
+++ b/src/chown-core.c
@@ -1,5 +1,5 @@
 /* chown-core.c -- core functions for changing ownership.
-   Copyright (C) 2000-2013 Free Software Foundation, Inc.
+   Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
    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
@@ -68,7 +68,7 @@ chopt_init (struct Chown_option *chopt)
 }
 
 extern void
-chopt_free (struct Chown_option *chopt ATTRIBUTE_UNUSED)
+chopt_free (struct Chown_option *chopt _GL_UNUSED)
 {
   /* Deliberately do not free chopt->user_name or ->group_name.
      They're not always allocated.  */
diff --git a/src/chown-core.h b/src/chown-core.h
index f6c808bc..86b33cd2 100644
--- a/src/chown-core.h
+++ b/src/chown-core.h
@@ -1,6 +1,6 @@
 /* chown-core.h -- types and prototypes shared by chown and chgrp.
 
-   Copyright (C) 2000-2013 Free Software Foundation, Inc.
+   Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/chown.c b/src/chown.c
index 9db0a569..13a19233 100644
--- a/src/chown.c
+++ b/src/chown.c
@@ -1,5 +1,5 @@
 /* chown -- change user and group ownership of files
-   Copyright (C) 1989-2013 Free Software Foundation, Inc.
+   Copyright (C) 1989-2014 Free Software Foundation, Inc.
 
    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
@@ -226,10 +226,9 @@ main (int argc, char **argv)
 
         case FROM_OPTION:
           {
-            char *u_dummy, *g_dummy;
             const char *e = parse_user_spec (optarg,
                                              &required_uid, &required_gid,
-                                             &u_dummy, &g_dummy);
+                                             NULL, NULL);
             if (e)
               error (EXIT_FAILURE, 0, "%s: %s", e, quote (optarg));
             break;
diff --git a/src/chroot.c b/src/chroot.c
index 1c1a9769..fff0b533 100644
--- a/src/chroot.c
+++ b/src/chroot.c
@@ -1,5 +1,5 @@
 /* chroot -- run command or shell with special root directory
-   Copyright (C) 1995-2013 Free Software Foundation, Inc.
+   Copyright (C) 1995-2014 Free Software Foundation, Inc.
 
    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
@@ -20,11 +20,15 @@
 #include <getopt.h>
 #include <stdio.h>
 #include <sys/types.h>
+#include <pwd.h>
 #include <grp.h>
 
 #include "system.h"
 #include "error.h"
+#include "ignore-value.h"
+#include "mgetgroups.h"
 #include "quote.h"
+#include "root-dev-ino.h"
 #include "userspec.h"
 #include "xstrtol.h"
 
@@ -37,6 +41,11 @@
 # define MAXGID GID_T_MAX
 #endif
 
+static inline bool uid_unset (uid_t uid) { return uid == (uid_t) -1; }
+static inline bool gid_unset (gid_t gid) { return gid == (gid_t) -1; }
+#define uid_set(x) (!uid_unset (x))
+#define gid_set(x) (!gid_unset (x))
+
 enum
 {
   GROUPS = UCHAR_MAX + 1,
@@ -53,23 +62,36 @@ static struct option const long_opts[] =
 };
 
 #if ! HAVE_SETGROUPS
-/* At least Interix lacks supplemental group support.  Define an
-   always-successful replacement to avoid checking for setgroups
-   availability everywhere, just to support broken platforms. */
+/* At least Interix lacks supplemental group support.  */
 static int
-setgroups (size_t size ATTRIBUTE_UNUSED, gid_t const *list ATTRIBUTE_UNUSED)
+setgroups (size_t size, gid_t const *list _GL_UNUSED)
 {
-  return 0;
+  if (size == 0)
+    {
+      /* Return success when clearing supplemental groups
+         as ! HAVE_SETGROUPS should only be the case on
+         platforms that don't support supplemental groups.  */
+      return 0;
+    }
+  else
+    {
+      errno = ENOTSUP;
+      return -1;
+    }
 }
 #endif
 
-/* Call setgroups to set the supplementary groups to those listed in GROUPS.
-   GROUPS is a comma separated list of supplementary groups (names or numbers).
-   Parse that list, converting any names to numbers, and call setgroups on the
-   resulting numbers.  Upon any failure give a diagnostic and return nonzero.
+/* Determine the group IDs for the specified supplementary GROUPS,
+   which is a comma separated list of supplementary groups (names or numbers).
+   Allocate an array for the parsed IDs and store it in PGIDS,
+   which may be allocated even on parse failure.
+   Update the number of parsed groups in PN_GIDS on success.
+   Upon any failure return nonzero, and issue diagnostic if SHOW_ERRORS is true.
    Otherwise return zero.  */
+
 static int
-set_additional_groups (char const *groups)
+parse_additional_groups (char const *groups, GETGROUPS_T **pgids,
+                         size_t *pn_gids, bool show_errors)
 {
   GETGROUPS_T *gids = NULL;
   size_t n_gids_allocated = 0;
@@ -84,7 +106,19 @@ set_additional_groups (char const *groups)
       unsigned long int value;
 
       if (xstrtoul (tmp, NULL, 10, &value, "") == LONGINT_OK && value <= MAXGID)
-        g = getgrgid (value);
+        {
+          while (isspace (to_uchar (*tmp)))
+            tmp++;
+          if (*tmp != '+')
+            {
+              /* Handle the case where the name is numeric.  */
+              g = getgrnam (tmp);
+              if (g != NULL)
+                value = g->gr_gid;
+            }
+          /* Flag that we've got a group from the number.  */
+          g = (struct group *) (intptr_t) ! NULL;
+        }
       else
         {
           g = getgrnam (tmp);
@@ -94,9 +128,15 @@ set_additional_groups (char const *groups)
 
       if (g == NULL)
         {
-          error (0, errno, _("invalid group %s"), quote (tmp));
           ret = -1;
-          continue;
+
+          if (show_errors)
+            {
+              error (0, errno, _("invalid group %s"), quote (tmp));
+              continue;
+            }
+
+          break;
         }
 
       if (n_gids == n_gids_allocated)
@@ -106,22 +146,36 @@ set_additional_groups (char const *groups)
 
   if (ret == 0 && n_gids == 0)
     {
-      error (0, 0, _("invalid group list %s"), quote (groups));
+      if (show_errors)
+        error (0, 0, _("invalid group list %s"), quote (groups));
       ret = -1;
     }
 
+  *pgids = gids;
+
   if (ret == 0)
-    {
-      ret = setgroups (n_gids, gids);
-      if (ret)
-        error (0, errno, _("failed to set additional groups"));
-    }
+    *pn_gids = n_gids;
 
   free (buffer);
-  free (gids);
   return ret;
 }
 
+static bool
+is_root (const char* dir)
+{
+  struct dev_ino root_ino;
+  if (! get_root_dev_ino (&root_ino))
+    error (EXIT_CANCELED, errno, _("failed to get attributes of %s"),
+           quote ("/"));
+
+  struct stat arg_st;
+  if (stat (dir, &arg_st) == -1)
+    error (EXIT_CANCELED, errno, _("failed to get attributes of %s"),
+           quote (dir));
+
+  return SAME_INODE (root_ino, arg_st);
+}
+
 void
 usage (int status)
 {
@@ -159,9 +213,18 @@ int
 main (int argc, char **argv)
 {
   int c;
-  char const *userspec = NULL;
+
+  /* Input user and groups spec.  */
+  char *userspec = NULL;
+  char const *username = NULL;
   char const *groups = NULL;
 
+  /* Parsed user and group IDs.  */
+  uid_t uid = -1;
+  gid_t gid = -1;
+  GETGROUPS_T *out_gids = NULL;
+  size_t n_gids = 0;
+
   initialize_main (&argc, &argv);
   set_program_name (argv[0]);
   setlocale (LC_ALL, "");
@@ -176,8 +239,16 @@ main (int argc, char **argv)
       switch (c)
         {
         case USERSPEC:
-          userspec = optarg;
-          break;
+          {
+            userspec = optarg;
+            /* Treat 'user:' just like 'user'
+               as we lookup the primary group by default
+               (and support doing so for UIDs as well as names.  */
+            size_t userlen = strlen (userspec);
+            if (userlen && userspec[userlen - 1] == ':')
+              userspec[userlen - 1] = '\0';
+            break;
+          }
 
         case GROUPS:
           groups = optarg;
@@ -198,12 +269,51 @@ main (int argc, char **argv)
       usage (EXIT_CANCELED);
     }
 
-  if (chroot (argv[optind]) != 0)
-    error (EXIT_CANCELED, errno, _("cannot change root directory to %s"),
-           argv[optind]);
+  /* Only do chroot specific actions if actually changing root.
+     The main difference here is that we don't change working dir.  */
+  if (! is_root (argv[optind]))
+    {
+      /* We have to look up users and groups twice.
+        - First, outside the chroot to load potentially necessary passwd/group
+          parsing plugins (e.g. NSS);
+        - Second, inside chroot to redo parsing in case IDs are different.
+          Within chroot lookup is the main justification for having
+          the --user option supported by the chroot command itself.  */
+      if (userspec)
+        ignore_value (parse_user_spec (userspec, &uid, &gid, NULL, NULL));
+
+      /* If no gid is supplied or looked up, do so now.
+        Also lookup the username for use with getgroups.  */
+      if (uid_set (uid) && (! groups || gid_unset (gid)))
+        {
+          const struct passwd *pwd;
+          if ((pwd = getpwuid (uid)))
+            {
+              if (gid_unset (gid))
+                gid = pwd->pw_gid;
+              username = pwd->pw_name;
+            }
+        }
 
-  if (chdir ("/"))
-    error (EXIT_CANCELED, errno, _("cannot chdir to root directory"));
+      if (groups && *groups)
+        ignore_value (parse_additional_groups (groups, &out_gids, &n_gids,
+                                               false));
+#if HAVE_SETGROUPS
+      else if (! groups && gid_set (gid) && username)
+        {
+          int ngroups = xgetgroups (username, gid, &out_gids);
+          if (0 < ngroups)
+            n_gids = ngroups;
+        }
+#endif
+
+      if (chroot (argv[optind]) != 0)
+        error (EXIT_CANCELED, errno, _("cannot change root directory to %s"),
+               argv[optind]);
+
+      if (chdir ("/"))
+        error (EXIT_CANCELED, errno, _("cannot chdir to root directory"));
+    }
 
   if (argc == optind + 1)
     {
@@ -221,51 +331,78 @@ main (int argc, char **argv)
       argv += optind + 1;
     }
 
-  bool fail = false;
-
   /* Attempt to set all three: supplementary groups, group ID, user ID.
      Diagnose any failures.  If any have failed, exit before execvp.  */
   if (userspec)
     {
-      uid_t uid = -1;
-      gid_t gid = -1;
-      char *user;
-      char *group;
-      char const *err = parse_user_spec (userspec, &uid, &gid, &user, &group);
+      char const *err = parse_user_spec (userspec, &uid, &gid, NULL, NULL);
 
-      if (err)
+      if (err && uid_unset (uid) && gid_unset (gid))
         error (EXIT_CANCELED, errno, "%s", err);
+    }
 
-      free (user);
-      free (group);
-
-      if (groups && set_additional_groups (groups))
-        fail = true;
-
-      if (gid != (gid_t) -1 && setgid (gid))
+  /* If no gid is supplied or looked up, do so now.
+     Also lookup the username for use with getgroups.  */
+  if (uid_set (uid) && (! groups || gid_unset (gid)))
+    {
+      const struct passwd *pwd;
+      if ((pwd = getpwuid (uid)))
+        {
+          if (gid_unset (gid))
+            gid = pwd->pw_gid;
+          username = pwd->pw_name;
+        }
+      else if (gid_unset (gid))
         {
-          error (0, errno, _("failed to set group-ID"));
-          fail = true;
+          error (EXIT_CANCELED, errno,
+                 _("no group specified for unknown uid: %d"), (int) uid);
         }
+    }
 
-      if (uid != (uid_t) -1 && setuid (uid))
+  GETGROUPS_T *gids = out_gids;
+  GETGROUPS_T *in_gids = NULL;
+  if (groups && *groups)
+    {
+      if (parse_additional_groups (groups, &in_gids, &n_gids, !n_gids) != 0)
         {
-          error (0, errno, _("failed to set user-ID"));
-          fail = true;
+          if (! n_gids)
+            exit (EXIT_CANCELED);
+          /* else look-up outside the chroot worked, then go with those.  */
         }
+      else
+        gids = in_gids;
     }
-  else
+#if HAVE_SETGROUPS
+  else if (! groups && gid_set (gid) && username)
     {
-      /* Yes, this call is identical to the one above.
-         However, when --userspec and --groups groups are used together,
-         we don't want to call this function until after parsing USER:GROUP,
-         and it must be called before setuid.  */
-      if (groups && set_additional_groups (groups))
-        fail = true;
+      int ngroups = xgetgroups (username, gid, &in_gids);
+      if (ngroups <= 0)
+        {
+          if (! n_gids)
+            error (EXIT_CANCELED, errno,
+                   _("failed to get supplemental groups"));
+          /* else look-up outside the chroot worked, then go with those.  */
+        }
+      else
+        {
+          n_gids = ngroups;
+          gids = in_gids;
+        }
     }
+#endif
+
+  if ((uid_set (uid) || groups) && setgroups (n_gids, gids) != 0)
+    error (EXIT_CANCELED, errno, _("failed to %s supplemental groups"),
+           gids ? "set" : "clear");
+
+  free (in_gids);
+  free (out_gids);
+
+  if (gid_set (gid) && setgid (gid))
+    error (EXIT_CANCELED, errno, _("failed to set group-ID"));
 
-  if (fail)
-    exit (EXIT_CANCELED);
+  if (uid_set (uid) && setuid (uid))
+    error (EXIT_CANCELED, errno, _("failed to set user-ID"));
 
   /* Execute the given command.  */
   execvp (argv[0], argv);
diff --git a/src/cksum.c b/src/cksum.c
index 26571c7c..8db39a48 100644
--- a/src/cksum.c
+++ b/src/cksum.c
@@ -1,5 +1,5 @@
 /* cksum -- calculate and print POSIX checksums and sizes of files
-   Copyright (C) 1992-2013 Free Software Foundation, Inc.
+   Copyright (C) 1992-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/comm.c b/src/comm.c
index b3248101..5a3eec68 100644
--- a/src/comm.c
+++ b/src/comm.c
@@ -1,5 +1,5 @@
 /* comm -- compare two sorted files line by line.
-   Copyright (C) 1986-2013 Free Software Foundation, Inc.
+   Copyright (C) 1986-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/copy.c b/src/copy.c
index 3f2cc2b0..26d5bdd2 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -1,5 +1,5 @@
 /* copy.c -- core functions for copying files and directories
-   Copyright (C) 1989-2013 Free Software Foundation, Inc.
+   Copyright (C) 1989-2014 Free Software Foundation, Inc.
 
    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
@@ -51,6 +51,7 @@
 #include "ignore-value.h"
 #include "ioblksize.h"
 #include "quote.h"
+#include "root-uid.h"
 #include "same.h"
 #include "savedir.h"
 #include "stat-size.h"
@@ -60,6 +61,7 @@
 #include "write-any-file.h"
 #include "areadlink.h"
 #include "yesno.h"
+#include "selinux.h"
 
 #if USE_XATTR
 # include <attr/error_context.h>
@@ -96,6 +98,14 @@ rpl_mkfifo (char const *file, mode_t mode)
 #define SAME_GROUP(A, B) ((A).st_gid == (B).st_gid)
 #define SAME_OWNER_AND_GROUP(A, B) (SAME_OWNER (A, B) && SAME_GROUP (A, B))
 
+/* LINK_FOLLOWS_SYMLINKS is tri-state; if it is -1, we don't know
+   how link() behaves, so assume we can't hardlink symlinks in that case.  */
+#if defined HAVE_LINKAT || ! LINK_FOLLOWS_SYMLINKS
+# define CAN_HARDLINK_SYMLINKS 1
+#else
+# define CAN_HARDLINK_SYMLINKS 0
+#endif
+
 struct dir_list
 {
   struct dir_list *parent;
@@ -107,7 +117,7 @@ struct dir_list
 #define DEST_INFO_INITIAL_CAPACITY 61
 
 static bool copy_internal (char const *src_name, char const *dst_name,
-                           bool new_dst, dev_t device,
+                           bool new_dst, struct stat const *parent,
                            struct dir_list *ancestors,
                            const struct cp_options *x,
                            bool command_line_arg,
@@ -471,7 +481,7 @@ errno_unsupported (int err)
 
 #if USE_XATTR
 static void
-copy_attr_error (struct error_context *ctx ATTRIBUTE_UNUSED,
+copy_attr_error (struct error_context *ctx _GL_UNUSED,
                  char const *fmt, ...)
 {
   if (!errno_unsupported (errno))
@@ -487,7 +497,7 @@ copy_attr_error (struct error_context *ctx ATTRIBUTE_UNUSED,
 }
 
 static void
-copy_attr_allerror (struct error_context *ctx ATTRIBUTE_UNUSED,
+copy_attr_allerror (struct error_context *ctx _GL_UNUSED,
                  char const *fmt, ...)
 {
   int err = errno;
@@ -500,15 +510,27 @@ copy_attr_allerror (struct error_context *ctx ATTRIBUTE_UNUSED,
 }
 
 static char const *
-copy_attr_quote (struct error_context *ctx ATTRIBUTE_UNUSED, char const *str)
+copy_attr_quote (struct error_context *ctx _GL_UNUSED, char const *str)
 {
   return quote (str);
 }
 
 static void
-copy_attr_free (struct error_context *ctx ATTRIBUTE_UNUSED,
-                char const *str ATTRIBUTE_UNUSED)
+copy_attr_free (struct error_context *ctx _GL_UNUSED,
+                char const *str _GL_UNUSED)
+{
+}
+
+/* Exclude SELinux extended attributes that are otherwise handled,
+   and are problematic to copy again.  Also honor attributes
+   configured for exclusion in /etc/xattr.conf.
+   FIXME: Should we handle POSIX ACLs similarly?
+   Return zero to skip.  */
+static int
+check_selinux_attr (const char *name, struct error_context *ctx)
 {
+  return STRNCMP_LIT (name, "security.selinux")
+         && attr_copy_check_permissions (name, ctx);
 }
 
 /* If positive SRC_FD and DST_FD descriptors are passed,
@@ -521,6 +543,7 @@ copy_attr (char const *src_path, int src_fd,
   int ret;
   bool all_errors = (!x->data_copy_required || x->require_preserve_xattr);
   bool some_errors = (!all_errors && !x->reduce_diagnostics);
+  bool selinux_done = (x->preserve_security_context || x->set_security_context);
   struct error_context ctx =
   {
     .error = all_errors ? copy_attr_allerror : copy_attr_error,
@@ -528,10 +551,12 @@ copy_attr (char const *src_path, int src_fd,
     .quote_free = copy_attr_free
   };
   if (0 <= src_fd && 0 <= dst_fd)
-    ret = attr_copy_fd (src_path, src_fd, dst_path, dst_fd, 0,
+    ret = attr_copy_fd (src_path, src_fd, dst_path, dst_fd,
+                        selinux_done ? check_selinux_attr : NULL,
                         (all_errors || some_errors ? &ctx : NULL));
   else
-    ret = attr_copy_file (src_path, dst_path, 0,
+    ret = attr_copy_file (src_path, dst_path,
+                          selinux_done ? check_selinux_attr : NULL,
                           (all_errors || some_errors ? &ctx : NULL));
 
   return ret == 0;
@@ -539,11 +564,11 @@ copy_attr (char const *src_path, int src_fd,
 #else /* USE_XATTR */
 
 static bool
-copy_attr (char const *src_path ATTRIBUTE_UNUSED,
-           int src_fd ATTRIBUTE_UNUSED,
-           char const *dst_path ATTRIBUTE_UNUSED,
-           int dst_fd ATTRIBUTE_UNUSED,
-           struct cp_options const *x ATTRIBUTE_UNUSED)
+copy_attr (char const *src_path _GL_UNUSED,
+           int src_fd _GL_UNUSED,
+           char const *dst_path _GL_UNUSED,
+           int dst_fd _GL_UNUSED,
+           struct cp_options const *x _GL_UNUSED)
 {
   return true;
 }
@@ -573,7 +598,7 @@ copy_dir (char const *src_name_in, char const *dst_name_in, bool new_dst,
   struct cp_options non_command_line_options = *x;
   bool ok = true;
 
-  name_space = savedir (src_name_in);
+  name_space = savedir (src_name_in, SAVEDIR_SORT_FASTREAD);
   if (name_space == NULL)
     {
       /* This diagnostic is a bit vague because savedir can fail in
@@ -596,7 +621,7 @@ copy_dir (char const *src_name_in, char const *dst_name_in, bool new_dst,
       char *dst_name = file_name_concat (dst_name_in, namep, NULL);
       bool first_dir_created = *first_dir_created_per_command_line_arg;
 
-      ok &= copy_internal (src_name, dst_name, new_dst, src_sb->st_dev,
+      ok &= copy_internal (src_name, dst_name, new_dst, src_sb,
                            ancestors, &non_command_line_options, false,
                            &first_dir_created,
                            &local_copy_into_self, NULL);
@@ -736,6 +761,96 @@ set_author (const char *dst_name, int dest_desc, const struct stat *src_sb)
 #endif
 }
 
+/* Set the default security context for the process.  New files will
+   have this security context set.  Also existing files can have their
+   context adjusted based on this process context, by
+   set_file_security_ctx() called with PROCESS_LOCAL=true.
+   This should be called before files are created so there is no race
+   where a file may be present without an appropriate security context.
+   Based on CP_OPTIONS, diagnose warnings and fail when appropriate.
+   Return FALSE on failure, TRUE on success.  */
+
+static bool
+set_process_security_ctx (char const *src_name, char const *dst_name,
+                          mode_t mode, bool new_dst, const struct cp_options *x)
+{
+  if (x->preserve_security_context)
+    {
+      /* Set the default context for the process to match the source.  */
+      bool all_errors = !x->data_copy_required || x->require_preserve_context;
+      bool some_errors = !all_errors && !x->reduce_diagnostics;
+      char *con;
+
+      if (0 <= lgetfilecon (src_name, &con))
+        {
+          if (setfscreatecon (con) < 0)
+            {
+              if (all_errors || (some_errors && !errno_unsupported (errno)))
+                error (0, errno,
+                       _("failed to set default file creation context to %s"),
+                       quote (con));
+              if (x->require_preserve_context)
+                {
+                  freecon (con);
+                  return false;
+                }
+            }
+          freecon (con);
+        }
+      else
+        {
+          if (all_errors || (some_errors && !errno_unsupported (errno)))
+            {
+              error (0, errno,
+                     _("failed to get security context of %s"),
+                     quote (src_name));
+            }
+          if (x->require_preserve_context)
+            return false;
+        }
+    }
+  else if (x->set_security_context)
+    {
+      /* With -Z, adjust the default context for the process
+         to have the type component adjusted as per the destination path.  */
+      if (new_dst && defaultcon (dst_name, mode) < 0
+          && ! ignorable_ctx_err (errno))
+        {
+          error (0, errno,
+                 _("failed to set default file creation context for %s"),
+                 quote (dst_name));
+        }
+    }
+
+  return true;
+}
+
+/* Reset the security context of DST_NAME, to that already set
+   as the process default if PROCESS_LOCAL is true.  Otherwise
+   adjust the type component of DST_NAME's security context as
+   per the system default for that path.  Issue warnings upon
+   failure, when allowed by various settings in CP_OPTIONS.
+   Return FALSE on failure, TRUE on success.  */
+
+static bool
+set_file_security_ctx (char const *dst_name, bool process_local,
+                       bool recurse, const struct cp_options *x)
+{
+  bool all_errors = (!x->data_copy_required
+                     || x->require_preserve_context);
+  bool some_errors = !all_errors && !x->reduce_diagnostics;
+
+  if (! restorecon (dst_name, recurse, process_local))
+    {
+      if (all_errors || (some_errors && !errno_unsupported (errno)))
+        error (0, errno, _("failed to set the security context of %s"),
+               quote_n (0, dst_name));
+      return false;
+    }
+
+  return true;
+}
+
 /* Change the file mode bits of the file identified by DESC or NAME to MODE.
    Use DESC if DESC is valid and fchmod is available, NAME otherwise.  */
 
@@ -833,45 +948,24 @@ copy_reg (char const *src_name, char const *dst_name,
       dest_errno = errno;
 
       /* When using cp --preserve=context to copy to an existing destination,
-         use the default context rather than that of the source.  Why?
-         1) the src context may prohibit writing, and
-         2) because it's more consistent to use the same context
-         that is used when the destination file doesn't already exist.  */
-      if (x->preserve_security_context && 0 <= dest_desc)
+         reset the context as per the default context, which has already been
+         set according to the src.
+         When using the mutually exclusive -Z option, then adjust the type of
+         the existing context according to the system default for the dest.
+         Note we set the context here, _after_ the file is opened, lest the
+         new context disallow that.  */
+      if ((x->set_security_context || x->preserve_security_context)
+          && 0 <= dest_desc)
         {
-          bool all_errors = (!x->data_copy_required
-                             || x->require_preserve_context);
-          bool some_errors = !all_errors && !x->reduce_diagnostics;
-          security_context_t con = NULL;
-
-          if (getfscreatecon (&con) < 0)
+          if (! set_file_security_ctx (dst_name, x->preserve_security_context,
+                                       false, x))
             {
-              if (all_errors || (some_errors && !errno_unsupported (errno)))
-                error (0, errno, _("failed to get file system create context"));
               if (x->require_preserve_context)
                 {
                   return_val = false;
                   goto close_src_and_dst_desc;
                 }
             }
-
-          if (con)
-            {
-              if (fsetfilecon (dest_desc, con) < 0)
-                {
-                  if (all_errors || (some_errors && !errno_unsupported (errno)))
-                    error (0, errno,
-                           _("failed to set the security context of %s to %s"),
-                           quote_n (0, dst_name), quote_n (1, con));
-                  if (x->require_preserve_context)
-                    {
-                      return_val = false;
-                      freecon (con);
-                      goto close_src_and_dst_desc;
-                    }
-                }
-              freecon (con);
-            }
         }
 
       if (dest_desc < 0 && x->unlink_dest_after_failed_open)
@@ -887,6 +981,18 @@ copy_reg (char const *src_name, char const *dst_name,
 
           /* Tell caller that the destination file was unlinked.  */
           *new_dst = true;
+
+          /* Ensure there is no race where a file may be left without
+             an appropriate security context.  */
+          if (x->set_security_context)
+            {
+              if (! set_process_security_ctx (src_name, dst_name, dst_mode,
+                                              *new_dst, x))
+                {
+                  return_val = false;
+                  goto close_src_desc;
+                }
+            }
         }
     }
 
@@ -1127,7 +1233,7 @@ preserve_metadata:
     {
       bool access_changed = false;
 
-      if (!(sb.st_mode & S_IWUSR) && geteuid () != 0)
+      if (!(sb.st_mode & S_IWUSR) && geteuid () != ROOT_UID)
         access_changed = fchmod_or_lchmod (dest_desc, dst_name, 0600) == 0;
 
       if (!copy_attr (src_name, source_desc, dst_name, dest_desc, x)
@@ -1459,8 +1565,9 @@ writable_destination (char const *file, mode_t mode)
           || euidaccess (file, W_OK) == 0);
 }
 
-static void
-overwrite_prompt (char const *dst_name, struct stat const *dst_sb)
+static bool
+overwrite_ok (struct cp_options const *x, char const *dst_name,
+              struct stat const *dst_sb)
 {
   if (! writable_destination (dst_name, dst_sb->st_mode))
     {
@@ -1468,7 +1575,10 @@ overwrite_prompt (char const *dst_name, struct stat const *dst_sb)
       strmode (dst_sb->st_mode, perms);
       perms[10] = '\0';
       fprintf (stderr,
-               _("%s: try to overwrite %s, overriding mode %04lo (%s)? "),
+               (x->move_mode || x->unlink_dest_before_opening
+                || x->unlink_dest_after_failed_open)
+               ? _("%s: replace %s, overriding mode %04lo (%s)? ")
+               : _("%s: unwritable %s (mode %04lo, %s); try anyway? "),
                program_name, quote (dst_name),
                (unsigned long int) (dst_sb->st_mode & CHMOD_MODE_BITS),
                &perms[1]);
@@ -1478,6 +1588,8 @@ overwrite_prompt (char const *dst_name, struct stat const *dst_sb)
       fprintf (stderr, _("%s: overwrite %s? "),
                program_name, quote (dst_name));
     }
+
+  return yesno ();
 }
 
 /* Initialize the hash table implementing a set of F_triple entries
@@ -1532,8 +1644,7 @@ abandon_move (const struct cp_options *x,
                || (x->interactive == I_UNSPECIFIED
                    && x->stdin_tty
                    && ! writable_destination (dst_name, dst_sb->st_mode)))
-              && (overwrite_prompt (dst_name, dst_sb), 1)
-              && ! yesno ()));
+              && ! overwrite_ok (x, dst_name, dst_sb)));
 }
 
 /* Print --verbose output on standard output, e.g. 'new' -> 'old'.
@@ -1557,18 +1668,23 @@ restore_default_fscreatecon_or_die (void)
            _("failed to restore the default file creation context"));
 }
 
-/* Create a hard link DST_NAME to SRC_NAME, honoring the REPLACE and
-   VERBOSE settings.  Return true upon success.  Otherwise, diagnose
-   the failure and return false.
-   If SRC_NAME is a symbolic link it will not be followed.  If the system
-   doesn't support hard links to symbolic links, then DST_NAME will
-   be created as a symbolic link to SRC_NAME.  */
+/* Create a hard link DST_NAME to SRC_NAME, honoring the REPLACE, VERBOSE and
+   DEREFERENCE settings.  Return true upon success.  Otherwise, diagnose the
+   failure and return false.  If SRC_NAME is a symbolic link, then it will not
+   be followed unless DEREFERENCE is true.
+   If the system doesn't support hard links to symbolic links, then DST_NAME
+   will be created as a symbolic link to SRC_NAME.  */
 static bool
 create_hard_link (char const *src_name, char const *dst_name,
-                  bool replace, bool verbose)
+                  bool replace, bool verbose, bool dereference)
 {
-  /* We want to guarantee that symlinks are not followed.  */
-  bool link_failed = (linkat (AT_FDCWD, src_name, AT_FDCWD, dst_name, 0) != 0);
+  /* We want to guarantee that symlinks are not followed, unless requested.  */
+  int flags = 0;
+  if (dereference)
+    flags = AT_SYMLINK_FOLLOW;
+
+  bool link_failed = (linkat (AT_FDCWD, src_name, AT_FDCWD, dst_name, flags)
+                      != 0);
 
   /* If the link failed because of an existing destination,
      remove that file and then call link again.  */
@@ -1581,7 +1697,8 @@ create_hard_link (char const *src_name, char const *dst_name,
         }
       if (verbose)
         printf (_("removed %s\n"), quote (dst_name));
-      link_failed = (linkat (AT_FDCWD, src_name, AT_FDCWD, dst_name, 0) != 0);
+      link_failed = (linkat (AT_FDCWD, src_name, AT_FDCWD, dst_name, flags)
+                     != 0);
     }
 
   if (link_failed)
@@ -1594,12 +1711,22 @@ create_hard_link (char const *src_name, char const *dst_name,
   return true;
 }
 
+/* Return true if the current file should be (tried to be) dereferenced:
+   either for DEREF_ALWAYS or for DEREF_COMMAND_LINE_ARGUMENTS in the case
+   where the current file is a COMMAND_LINE_ARG; otherwise return false.  */
+static inline bool _GL_ATTRIBUTE_PURE
+should_dereference (const struct cp_options *x, bool command_line_arg)
+{
+  return x->dereference == DEREF_ALWAYS
+         || (x->dereference == DEREF_COMMAND_LINE_ARGUMENTS
+             && command_line_arg);
+}
+
 /* Copy the file SRC_NAME to the file DST_NAME.  The files may be of
    any type.  NEW_DST should be true if the file DST_NAME cannot
    exist because its parent directory was just created; NEW_DST should
-   be false if DST_NAME might already exist.  DEVICE is the device
-   number of the parent directory, or 0 if the parent of this file is
-   not known.  ANCESTORS points to a linked, null terminated list of
+   be false if DST_NAME might already exist.  A nonnull PARENT describes the
+   parent directory.  ANCESTORS points to a linked, null terminated list of
    devices and inodes of parent directories of SRC_NAME.  COMMAND_LINE_ARG
    is true iff SRC_NAME was specified on the command line.
    FIRST_DIR_CREATED_PER_COMMAND_LINE_ARG is both input and output.
@@ -1609,7 +1736,7 @@ create_hard_link (char const *src_name, char const *dst_name,
 static bool
 copy_internal (char const *src_name, char const *dst_name,
                bool new_dst,
-               dev_t device,
+               struct stat const *parent,
                struct dir_list *ancestors,
                const struct cp_options *x,
                bool command_line_arg,
@@ -1669,6 +1796,8 @@ copy_internal (char const *src_name, char const *dst_name,
       record_file (x->src_info, src_name, &src_sb);
     }
 
+  bool dereference = should_dereference (x, command_line_arg);
+
   if (!new_dst)
     {
       /* Regular files can be created by writing through symbolic
@@ -1747,7 +1876,7 @@ copy_internal (char const *src_name, char const *dst_name,
                       /* Note we currently replace DST_NAME unconditionally,
                          even if it was a newer separate file.  */
                       if (! create_hard_link (earlier_file, dst_name, true,
-                                              x->verbose))
+                                              x->verbose, dereference))
                         {
                           goto un_backup;
                         }
@@ -1761,7 +1890,7 @@ copy_internal (char const *src_name, char const *dst_name,
              returning early, and hence not copying/moving the file.
              This may be due to an interactive 'negative' reply to the
              prompt about the existing file.  It may also be due to the
-             use of the --reply=no option.
+             use of the --no-clobber option.
 
              cp and mv treat -i and -f differently.  */
           if (x->move_mode)
@@ -1788,8 +1917,7 @@ copy_internal (char const *src_name, char const *dst_name,
               if (! S_ISDIR (src_mode)
                   && (x->interactive == I_ALWAYS_NO
                       || (x->interactive == I_ASK_USER
-                          && (overwrite_prompt (dst_name, &dst_sb), 1)
-                          && ! yesno ())))
+                          && ! overwrite_ok (x, dst_name, &dst_sb))))
                 return true;
             }
 
@@ -2077,7 +2205,8 @@ copy_internal (char const *src_name, char const *dst_name,
         }
       else
         {
-          if (! create_hard_link (earlier_file, dst_name, true, x->verbose))
+          if (! create_hard_link (earlier_file, dst_name, true, x->verbose,
+                                  dereference))
             goto un_backup;
 
           return true;
@@ -2092,6 +2221,12 @@ copy_internal (char const *src_name, char const *dst_name,
             emit_verbose (src_name, dst_name,
                           backup_succeeded ? dst_backup : NULL);
 
+          if (x->set_security_context)
+            {
+              /* -Z failures are only warnings currently.  */
+              (void) set_file_security_ctx (dst_name, false, true, x);
+            }
+
           if (rename_succeeded)
             *rename_succeeded = true;
 
@@ -2171,8 +2306,12 @@ copy_internal (char const *src_name, char const *dst_name,
 
       /* The rename attempt has failed.  Remove any existing destination
          file so that a cross-device 'mv' acts as if it were really using
-         the rename syscall.  */
-      if (unlink (dst_name) != 0 && errno != ENOENT)
+         the rename syscall.  Note both src and dst must both be directories
+         or not, and this is enforced above.  Therefore we check the src_mode
+         and operate on dst_name here as a tighter constraint and also because
+         src_mode is readily available here.  */
+      if ((S_ISDIR (src_mode) ? rmdir (dst_name) : unlink (dst_name)) != 0
+          && errno != ENOENT)
         {
           error (0, errno,
              _("inter-device move failed: %s to %s; unable to remove target"),
@@ -2197,40 +2336,12 @@ copy_internal (char const *src_name, char const *dst_name,
 
   delayed_ok = true;
 
-  if (x->preserve_security_context)
-    {
-      bool all_errors = !x->data_copy_required || x->require_preserve_context;
-      bool some_errors = !all_errors && !x->reduce_diagnostics;
-      security_context_t con;
-
-      if (0 <= lgetfilecon (src_name, &con))
-        {
-          if (setfscreatecon (con) < 0)
-            {
-              if (all_errors || (some_errors && !errno_unsupported (errno)))
-                error (0, errno,
-                       _("failed to set default file creation context to %s"),
-                       quote (con));
-              if (x->require_preserve_context)
-                {
-                  freecon (con);
-                  return false;
-                }
-            }
-          freecon (con);
-        }
-      else
-        {
-          if (all_errors || (some_errors && !errno_unsupported (errno)))
-            {
-              error (0, errno,
-                     _("failed to get security context of %s"),
-                     quote (src_name));
-            }
-          if (x->require_preserve_context)
-            return false;
-        }
-    }
+  /* If required, set the default security context for new files.
+     Also for existing files this is used as a reference
+     when copying the context with --preserve=context.
+     FIXME: Do we need to consider dst_mode_bits here?  */
+  if (! set_process_security_ctx (src_name, dst_name, src_mode, new_dst, x))
+    return false;
 
   if (S_ISDIR (src_mode))
     {
@@ -2308,10 +2419,21 @@ copy_internal (char const *src_name, char const *dst_name,
       else
         {
           omitted_permissions = 0;
+
+          /* For directories, the process global context could be reset for
+             descendents, so use it to set the context for existing dirs here.
+             This will also give earlier indication of failure to set ctx.  */
+          if (x->set_security_context || x->preserve_security_context)
+            if (! set_file_security_ctx (dst_name, x->preserve_security_context,
+                                         false, x))
+              {
+                if (x->require_preserve_context)
+                  goto un_backup;
+              }
         }
 
       /* Decide whether to copy the contents of the directory.  */
-      if (x->one_file_system && device != 0 && device != src_sb.st_dev)
+      if (x->one_file_system && parent && parent->st_dev != src_sb.st_dev)
         {
           /* Here, we are crossing a file system boundary and cp's -x option
              is in effect: so don't copy the contents of this directory. */
@@ -2373,18 +2495,16 @@ copy_internal (char const *src_name, char const *dst_name,
      should not follow the link.  We can approximate the desired
      behavior by skipping this hard-link creating block and instead
      copying the symlink, via the 'S_ISLNK'- copying code below.
-     LINK_FOLLOWS_SYMLINKS is tri-state; if it is -1, we don't know
-     how link() behaves, so we use the fallback case for safety.
 
      Note gnulib's linkat module, guarantees that the symlink is not
      dereferenced.  However its emulation currently doesn't maintain
      timestamps or ownership so we only call it when we know the
      emulation will not be needed.  */
   else if (x->hard_link
-           && !(LINK_FOLLOWS_SYMLINKS && S_ISLNK (src_mode)
+           && !(! CAN_HARDLINK_SYMLINKS && S_ISLNK (src_mode)
                 && x->dereference == DEREF_NEVER))
     {
-      if (! create_hard_link (src_name, dst_name, false, false))
+      if (! create_hard_link (src_name, dst_name, false, false, dereference))
         goto un_backup;
     }
   else if (S_ISREG (src_mode)
@@ -2496,6 +2616,19 @@ copy_internal (char const *src_name, char const *dst_name,
       goto un_backup;
     }
 
+  /* With -Z or --preserve=context, set the context for existing files.
+     Note this is done already for copy_reg() for reasons described therein.  */
+  if (!new_dst && !x->copy_as_regular && !S_ISDIR (src_mode)
+      && (x->set_security_context || x->preserve_security_context))
+    {
+      if (! set_file_security_ctx (dst_name, x->preserve_security_context,
+                                   false, x))
+        {
+           if (x->require_preserve_context)
+             goto un_backup;
+        }
+    }
+
   if (command_line_arg && x->dest_info)
     {
       /* Now that the destination file is very likely to exist,
@@ -2508,7 +2641,7 @@ copy_internal (char const *src_name, char const *dst_name,
   /* If we've just created a hard-link due to cp's --link option,
      we're done.  */
   if (x->hard_link && ! S_ISDIR (src_mode)
-      && !(LINK_FOLLOWS_SYMLINKS && S_ISLNK (src_mode)
+      && !(! CAN_HARDLINK_SYMLINKS && S_ISLNK (src_mode)
            && x->dereference == DEREF_NEVER))
     return delayed_ok;
 
@@ -2544,12 +2677,8 @@ copy_internal (char const *src_name, char const *dst_name,
         }
     }
 
-  /* The operations beyond this point may dereference a symlink.  */
-  if (dest_is_symlink)
-    return delayed_ok;
-
   /* Avoid calling chown if we know it's not necessary.  */
-  if (x->preserve_ownership
+  if (!dest_is_symlink && x->preserve_ownership
       && (new_dst || !SAME_OWNER_AND_GROUP (src_sb, dst_sb)))
     {
       switch (set_owner (x, dst_name, -1, &src_sb, new_dst, &dst_sb))
@@ -2563,12 +2692,17 @@ copy_internal (char const *src_name, char const *dst_name,
         }
     }
 
-  set_author (dst_name, -1, &src_sb);
-
+  /* Set xattrs after ownership as changing owners will clear capabilities.  */
   if (x->preserve_xattr && ! copy_attr (src_name, -1, dst_name, -1, x)
       && x->require_preserve_xattr)
     return false;
 
+  /* The operations beyond this point may dereference a symlink.  */
+  if (dest_is_symlink)
+    return delayed_ok;
+
+  set_author (dst_name, -1, &src_sb);
+
   if (x->preserve_mode || x->move_mode)
     {
       if (copy_acl (src_name, -1, dst_name, -1, src_mode) != 0
@@ -2693,7 +2827,7 @@ copy (char const *src_name, char const *dst_name,
   top_level_dst_name = dst_name;
 
   bool first_dir_created_per_command_line_arg = false;
-  return copy_internal (src_name, dst_name, nonexistent_dst, 0, NULL,
+  return copy_internal (src_name, dst_name, nonexistent_dst, NULL, NULL,
                         options, true,
                         &first_dir_created_per_command_line_arg,
                         copy_into_self, rename_succeeded);
@@ -2718,7 +2852,7 @@ cp_options_default (struct cp_options *x)
     priv_freeset (pset);
   }
 #else
-  x->chown_privileges = x->owner_privileges = (geteuid () == 0);
+  x->chown_privileges = x->owner_privileges = (geteuid () == ROOT_UID);
 #endif
 }
 
@@ -2746,8 +2880,12 @@ owner_failure_ok (struct cp_options const *x)
   return ((errno == EPERM || errno == EINVAL) && !x->owner_privileges);
 }
 
-/* Return the user's umask, caching the result.  */
+/* Return the user's umask, caching the result.
 
+   FIXME: If the destination's parent directory has has a default ACL,
+   some operating systems (e.g., GNU/Linux's "POSIX" ACLs) use that
+   ACL's mask rather than the process umask.  Currently, the callers
+   of cached_umask incorrectly assume that this situation cannot occur.  */
 extern mode_t
 cached_umask (void)
 {
diff --git a/src/copy.h b/src/copy.h
index cf72d3cc..bf194d91 100644
--- a/src/copy.h
+++ b/src/copy.h
@@ -1,5 +1,5 @@
 /* core functions for copying files and directories
-   Copyright (C) 1989-2013 Free Software Foundation, Inc.
+   Copyright (C) 1989-2014 Free Software Foundation, Inc.
 
    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
@@ -159,6 +159,9 @@ struct cp_options
   bool preserve_timestamps;
   bool explicit_no_preserve_mode;
 
+  /* If true, attempt to set specified security context */
+  bool set_security_context;
+
   /* Enabled for mv, and for cp by the --preserve=links option.
      If true, attempt to preserve in the destination files any
      logical hard links between the source files.  If used with cp's
diff --git a/src/coreutils-arch.c b/src/coreutils-arch.c
new file mode 100644
index 00000000..899cc937
--- /dev/null
+++ b/src/coreutils-arch.c
@@ -0,0 +1,32 @@
+/* arch -- wrapper to uname with the right uname_mode.
+   Copyright (C) 2014 Free Software Foundation, Inc.
+
+   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 3 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/>.  */
+
+/* Written by Alex Deymo <deymo@chromium.org>.  */
+
+#include <config.h>
+#include "system.h"
+
+#include "uname.h"
+/* Ensure that the main for uname is declared even if the tool is not being
+   built in this single-binary. */
+int _single_binary_main_uname (int argc, char** argv) ATTRIBUTE_NORETURN;
+int _single_binary_main_arch (int argc, char** argv) ATTRIBUTE_NORETURN;
+
+int _single_binary_main_arch (int argc, char** argv)
+{
+  uname_mode = UNAME_ARCH;
+  _single_binary_main_uname (argc, argv);
+}
diff --git a/src/coreutils-dir.c b/src/coreutils-dir.c
new file mode 100644
index 00000000..4b488f41
--- /dev/null
+++ b/src/coreutils-dir.c
@@ -0,0 +1,32 @@
+/* dir -- wrapper to ls with the right ls_mode.
+   Copyright (C) 2014 Free Software Foundation, Inc.
+
+   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 3 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/>.  */
+
+/* Written by Alex Deymo <deymo@chromium.org>.  */
+
+#include <config.h>
+#include "system.h"
+
+#include "ls.h"
+/* Ensure that the main for ls is declared even if the tool is not being built
+   in this single-binary. */
+int _single_binary_main_ls (int argc, char** argv) ATTRIBUTE_NORETURN;
+int _single_binary_main_dir (int argc, char** argv) ATTRIBUTE_NORETURN;
+
+int _single_binary_main_dir (int argc, char** argv)
+{
+  ls_mode = LS_MULTI_COL;
+  _single_binary_main_ls (argc, argv);
+}
diff --git a/src/coreutils-vdir.c b/src/coreutils-vdir.c
new file mode 100644
index 00000000..036367f6
--- /dev/null
+++ b/src/coreutils-vdir.c
@@ -0,0 +1,32 @@
+/* vdir -- wrapper to ls with the right ls_mode.
+   Copyright (C) 2014 Free Software Foundation, Inc.
+
+   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 3 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/>.  */
+
+/* Written by Alex Deymo <deymo@chromium.org>.  */
+
+#include <config.h>
+#include "system.h"
+
+#include "ls.h"
+/* Ensure that the main for ls is declared even if the tool is not being built
+   in this single-binary. */
+int _single_binary_main_ls (int argc, char** argv) ATTRIBUTE_NORETURN;
+int _single_binary_main_vdir (int argc, char** argv) ATTRIBUTE_NORETURN;
+
+int _single_binary_main_vdir (int argc, char** argv)
+{
+  ls_mode = LS_LONG_FORMAT;
+  _single_binary_main_ls (argc, argv);
+}
diff --git a/src/coreutils.c b/src/coreutils.c
new file mode 100644
index 00000000..c459b1d6
--- /dev/null
+++ b/src/coreutils.c
@@ -0,0 +1,205 @@
+/* Copyright (C) 2014 Free Software Foundation, Inc.
+
+   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 3 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/>.  */
+
+/* coreutils.c aggregates the functionality of every other tool into a single
+   binary multiplexed by the value of argv[0]. This is enabled by passing
+   --enable-single-binary to configure.
+
+   Written by Alex Deymo <deymo@chromium.org>.  */
+
+#include <config.h>
+#include <getopt.h>
+#include <stdio.h>
+#if HAVE_PRCTL
+# include <sys/prctl.h>
+#endif
+
+#include "system.h"
+#include "error.h"
+#include "quote.h"
+
+#ifdef SINGLE_BINARY
+/* Declare the main function on each one of the selected tools.  This name
+   needs to match the one passed as CFLAGS on single-binary.mk (generated
+   by gen-single-binary.sh). */
+# define SINGLE_BINARY_PROGRAM(prog_name_str, main_name) \
+  int _single_binary_main_##main_name (int, char**) ATTRIBUTE_NORETURN;
+# include "coreutils.h"
+# undef SINGLE_BINARY_PROGRAM
+#endif
+
+/* The official name of this program (e.g., no 'g' prefix).  */
+#define PROGRAM_NAME "coreutils"
+
+#define AUTHORS \
+  proper_name ("Alex Deymo")
+
+void
+launch_program (const char *prog_name, int prog_argc, char **prog_argv);
+
+static struct option const long_options[] =
+{
+  {GETOPT_HELP_OPTION_DECL},
+  {GETOPT_VERSION_OPTION_DECL},
+  {NULL, 0, NULL, 0}
+};
+
+
+void
+usage (int status)
+{
+  if (status != EXIT_SUCCESS)
+    emit_try_help ();
+  else
+    {
+      printf (_("\
+Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"),
+              program_name);
+      fputs (_("\
+Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n\
+\n"), stdout);
+      fputs (HELP_OPTION_DESCRIPTION, stdout);
+      fputs (VERSION_OPTION_DESCRIPTION, stdout);
+
+      printf ("\n\
+Built-in programs:\n"
+#ifdef SINGLE_BINARY
+/* XXX: Ideally we#d like to present "install" here, not "ginstall".  */
+# define SINGLE_BINARY_PROGRAM(prog_name_str, main_name) " " prog_name_str
+# include "coreutils.h"
+# undef SINGLE_BINARY_PROGRAM
+#endif
+  "\n");
+
+      printf (_("\
+\n\
+Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"),
+              program_name);
+      emit_ancillary_info ();
+    }
+  exit (status);
+}
+
+void
+launch_program (const char *prog_name, int prog_argc, char **prog_argv)
+{
+  int (*prog_main)(int, char **) = NULL;
+
+  /* Ensure that at least one parameter was passed.  */
+  if (!prog_argc || !prog_argv || !prog_argv[0] || !prog_name)
+    return;
+
+#ifdef SINGLE_BINARY
+  if (false);
+  /* Lookup the right main program.  */
+# define SINGLE_BINARY_PROGRAM(prog_name_str, main_name) \
+  else if (STREQ (prog_name_str, prog_name)) \
+    prog_main = _single_binary_main_##main_name;
+# include "coreutils.h"
+# undef SINGLE_BINARY_PROGRAM
+#endif
+
+  if (! prog_main)
+    return;
+
+#if HAVE_PRCTL && defined PR_SET_NAME
+  /* Not being able to set the program name is not a fatal error.  */
+  prctl (PR_SET_NAME, prog_argv[0]);
+#endif
+#if HAVE_PRCTL && defined PR_SET_MM_ARG_START
+  /* Shift the beginning of the command line to prog_argv[0] (if set) so
+     /proc/pid/cmdline reflects the right value.  */
+  prctl (PR_SET_MM_ARG_START, prog_argv[0]);
+#endif
+
+  exit ((*prog_main) (prog_argc, prog_argv));
+}
+
+int
+main (int argc, char **argv)
+{
+  char *prog_name = last_component (argv[0]);
+  int optc;
+
+  /* Map external name to internal name.  */
+  char ginstall[] = "ginstall";
+  if (STREQ (prog_name, "install"))
+    prog_name = ginstall;
+
+  /* If this program is called directly as "coreutils" or if the value of
+     argv[0] is an unknown tool (which "coreutils" is), we proceed and parse
+     the options.  */
+  launch_program (prog_name, argc, argv);
+
+  /* No known program was selected via argv[0].  Try parsing the first
+     argument as --coreutils-prog=PROGRAM to determine the program.  The
+     invocation for this case should be:
+       path/to/coreutils --coreutils-prog=someprog someprog ...
+     The third argument is what the program will see as argv[0].  */
+
+  if (argc >= 2)
+    {
+      size_t nskip = 0;
+      char *arg_name = NULL;
+
+      /* If calling coreutils directly, the "script" name isn't passed.
+         Distinguish the two cases with a -shebang suffix.  */
+      if (STRPREFIX (argv[1], "--coreutils-prog="))
+        {
+          nskip = 1;
+          arg_name = prog_name = argv[1] + strlen ("--coreutils-prog=");
+        }
+      else if (STRPREFIX (argv[1], "--coreutils-prog-shebang="))
+        {
+          nskip = 2;
+          prog_name = argv[1] + strlen ("--coreutils-prog-shebang=");
+          if (argc >= 3)
+            arg_name = last_component (argv[2]);
+          else
+            arg_name = prog_name;
+        }
+
+      if (nskip)
+        {
+          argv[nskip] = arg_name; /* XXX: Discards any specified path.  */
+          launch_program (prog_name, argc - nskip, argv + nskip);
+          error (EXIT_FAILURE, 0, _("unknown program %s"), quote (prog_name));
+        }
+    }
+
+  /* No known program was selected.  From here on, we behave like any other
+     coreutils program.  */
+  initialize_main (&argc, &argv);
+  set_program_name (argv[0]);
+  setlocale (LC_ALL, "");
+  bindtextdomain (PACKAGE, LOCALEDIR);
+  textdomain (PACKAGE);
+  atexit (close_stdout);
+
+  if ((optc = getopt_long (argc, argv, "", long_options, NULL)) != -1)
+    switch (optc)
+      {
+      case_GETOPT_HELP_CHAR;
+
+      case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+      }
+
+  /* Only print the error message when no options have been passed
+     to coreutils.  */
+  if (optind == 1 && prog_name && !STREQ (prog_name, "coreutils"))
+    error (0, 0, _("unknown program %s"), quote (prog_name));
+
+  usage (EXIT_FAILURE);
+}
diff --git a/src/cp-hash.c b/src/cp-hash.c
index 9ef23fc4..258aff76 100644
--- a/src/cp-hash.c
+++ b/src/cp-hash.c
@@ -1,5 +1,5 @@
 /* cp-hash.c  -- file copying (hash search routines)
-   Copyright (C) 1989-2013 Free Software Foundation, Inc.
+   Copyright (C) 1989-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/cp.c b/src/cp.c
index e235b326..99cafa7f 100644
--- a/src/cp.c
+++ b/src/cp.c
@@ -1,5 +1,5 @@
 /* cp.c  -- file copying (main routines)
-   Copyright (C) 1989-2013 Free Software Foundation, Inc.
+   Copyright (C) 1989-2014 Free Software Foundation, Inc.
 
    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
@@ -141,6 +141,7 @@ static struct option const long_opts[] =
   {"target-directory", required_argument, NULL, 't'},
   {"update", no_argument, NULL, 'u'},
   {"verbose", no_argument, NULL, 'v'},
+  {GETOPT_SELINUX_CONTEXT_OPTION_DECL},
   {GETOPT_HELP_OPTION_DECL},
   {GETOPT_VERSION_OPTION_DECL},
   {NULL, 0, NULL, 0}
@@ -228,6 +229,12 @@ Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n\
   -v, --verbose                explain what is being done\n\
   -x, --one-file-system        stay on this file system\n\
 "), stdout);
+      fputs (_("\
+  -Z                           set SELinux security context of destination\n\
+                                 file to default type\n\
+      --context[=CTX]          like -Z, or if CTX is specified then set the\n\
+                                 SELinux or SMACK security context to CTX\n\
+"), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
       fputs (_("\
@@ -782,8 +789,9 @@ cp_option_init (struct cp_options *x)
   x->preserve_mode = false;
   x->preserve_timestamps = false;
   x->explicit_no_preserve_mode = false;
-  x->preserve_security_context = false;
-  x->require_preserve_context = false;
+  x->preserve_security_context = false; /* -a or --preserve=context.  */
+  x->require_preserve_context = false;  /* --preserve=context.  */
+  x->set_security_context = false;      /* -Z, set sys default context. */
   x->preserve_xattr = false;
   x->reduce_diagnostics = false;
   x->require_preserve_xattr = false;
@@ -854,7 +862,8 @@ decode_preserve_arg (char const *arg, struct cp_options *x, bool on_off)
         *comma++ = 0;
 
       /* process S.  */
-      val = XARGMATCH ("--preserve", s, preserve_args, preserve_vals);
+      val = XARGMATCH (on_off ? "--preserve" : "--no-preserve",
+                       s, preserve_args, preserve_vals);
       switch (val)
         {
         case PRESERVE_MODE:
@@ -875,8 +884,8 @@ decode_preserve_arg (char const *arg, struct cp_options *x, bool on_off)
           break;
 
         case PRESERVE_CONTEXT:
-          x->preserve_security_context = on_off;
           x->require_preserve_context = on_off;
+          x->preserve_security_context = on_off;
           break;
 
         case PRESERVE_XATTR:
@@ -917,6 +926,7 @@ main (int argc, char **argv)
   bool copy_contents = false;
   char *target_directory = NULL;
   bool no_target_directory = false;
+  char const *scontext = NULL;
 
   initialize_main (&argc, &argv);
   set_program_name (argv[0]);
@@ -933,7 +943,7 @@ main (int argc, char **argv)
      we'll actually use backup_suffix_string.  */
   backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
 
-  while ((c = getopt_long (argc, argv, "abdfHilLnprst:uvxPRS:T",
+  while ((c = getopt_long (argc, argv, "abdfHilLnprst:uvxPRS:TZ",
                            long_opts, NULL))
          != -1)
     {
@@ -1091,6 +1101,23 @@ main (int argc, char **argv)
           x.one_file_system = true;
           break;
 
+        case 'Z':
+          /* politely decline if we're not on a selinux-enabled kernel.  */
+          if (selinux_enabled)
+            {
+              if (optarg)
+                scontext = optarg;
+              else
+                x.set_security_context = true;
+            }
+          else if (optarg)
+            {
+              error (0, 0,
+                     _("warning: ignoring --context; "
+                       "it requires an SELinux-enabled kernel"));
+            }
+          break;
+
         case 'S':
           make_backups = true;
           backup_suffix_string = optarg;
@@ -1134,7 +1161,7 @@ main (int argc, char **argv)
 
   if (x.dereference == DEREF_UNDEFINED)
     {
-      if (x.recursive)
+      if (x.recursive && ! x.hard_link)
         /* This is compatible with FreeBSD.  */
         x.dereference = DEREF_NEVER;
       else
@@ -1149,13 +1176,30 @@ main (int argc, char **argv)
   if (x.unlink_dest_after_failed_open && (x.hard_link || x.symbolic_link))
     x.unlink_dest_before_opening = true;
 
-  if (x.preserve_security_context)
-    {
-      if (!selinux_enabled)
-        error (EXIT_FAILURE, 0,
-               _("cannot preserve security context "
-                 "without an SELinux-enabled kernel"));
-    }
+  /* Ensure -Z overrides -a.  */
+  if ((x.set_security_context || scontext)
+      && ! x.require_preserve_context)
+    x.preserve_security_context = false;
+
+  if (x.preserve_security_context && (x.set_security_context || scontext))
+    error (EXIT_FAILURE, 0,
+           _("cannot set target context and preserve it"));
+
+  if (x.require_preserve_context && ! selinux_enabled)
+    error (EXIT_FAILURE, 0,
+           _("cannot preserve security context "
+             "without an SELinux-enabled kernel"));
+
+  /* FIXME: This handles new files.  But what about existing files?
+     I.E. if updating a tree, new files would have the specified context,
+     but shouldn't existing files be updated for consistency like this?
+       if (scontext)
+         restorecon (dst_path, 0, true);
+   */
+  if (scontext && setfscreatecon (se_const (scontext)) < 0)
+    error (EXIT_FAILURE, errno,
+           _("failed to set default file creation context to %s"),
+           quote (scontext));
 
 #if !USE_XATTR
   if (x.require_preserve_xattr)
diff --git a/src/csplit.c b/src/csplit.c
index 22f3ad4b..a30f09b7 100644
--- a/src/csplit.c
+++ b/src/csplit.c
@@ -1,5 +1,5 @@
 /* csplit - split a file into sections determined by context lines
-   Copyright (C) 1991-2013 Free Software Foundation, Inc.
+   Copyright (C) 1991-2014 Free Software Foundation, Inc.
 
    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
@@ -19,6 +19,7 @@
 
 #include <config.h>
 
+#include <assert.h>
 #include <getopt.h>
 #include <sys/types.h>
 #include <signal.h>
@@ -166,6 +167,9 @@ static bool volatile remove_files;
 /* If true, remove all output files which have a zero length. */
 static bool elide_empty_files;
 
+/* If true, suppress the lines that match the PATTERN */
+static bool suppress_matched;
+
 /* The compiled pattern arguments, which determine how to split
    the input file. */
 static struct control *controls;
@@ -176,6 +180,13 @@ static size_t control_used;
 /* The set of signals that are caught.  */
 static sigset_t caught_signals;
 
+/* For long options that have no equivalent short option, use a
+   non-character as a pseudo short option, starting with CHAR_MAX + 1.  */
+enum
+{
+  SUPPRESS_MATCHED_OPTION = CHAR_MAX + 1
+};
+
 static struct option const longopts[] =
 {
   {"digits", required_argument, NULL, 'n'},
@@ -185,6 +196,7 @@ static struct option const longopts[] =
   {"elide-empty-files", no_argument, NULL, 'z'},
   {"prefix", required_argument, NULL, 'f'},
   {"suffix-format", required_argument, NULL, 'b'},
+  {"suppress-matched", no_argument, NULL, SUPPRESS_MATCHED_OPTION},
   {GETOPT_HELP_OPTION_DECL},
   {GETOPT_VERSION_OPTION_DECL},
   {NULL, 0, NULL, 0}
@@ -601,6 +613,7 @@ find_line (uintmax_t linenum)
 
   for (b = head;;)
     {
+      assert (b);
       if (linenum < b->start_line + b->num_lines)
         {
           /* The line is in this buffer. */
@@ -717,15 +730,19 @@ process_line_count (const struct control *p, uintmax_t repetition)
 {
   uintmax_t linenum;
   uintmax_t last_line_to_save = p->lines_required * (repetition + 1);
-  struct cstring *line;
 
   create_output_file ();
 
-  linenum = get_first_line_in_buffer ();
+  /* Ensure that the line number specified is not 1 greater than
+     the number of lines in the file.
+     When suppressing matched lines, check before the loop. */
+  if (no_more_lines () && suppress_matched)
+    handle_line_error (p, repetition);
 
+  linenum = get_first_line_in_buffer ();
   while (linenum++ < last_line_to_save)
     {
-      line = remove_line ();
+      struct cstring *line = remove_line ();
       if (line == NULL)
         handle_line_error (p, repetition);
       save_line_to_file (line);
@@ -733,9 +750,12 @@ process_line_count (const struct control *p, uintmax_t repetition)
 
   close_output_file ();
 
+  if (suppress_matched)
+    remove_line ();
+
   /* Ensure that the line number specified is not 1 greater than
      the number of lines in the file. */
-  if (no_more_lines ())
+  if (no_more_lines () && !suppress_matched)
     handle_line_error (p, repetition);
 }
 
@@ -778,6 +798,9 @@ process_regexp (struct control *p, uintmax_t repetition)
   if (!ignore)
     create_output_file ();
 
+  if (suppress_matched && current_line > 0)
+    remove_line ();
+
   /* If there is no offset for the regular expression, or
      it is positive, then it is not necessary to buffer the lines. */
 
@@ -1324,6 +1347,7 @@ main (int argc, char **argv)
   control_used = 0;
   suppress_count = false;
   remove_files = true;
+  suppress_matched = false;
   prefix = DEFAULT_PREFIX;
 
   while ((optc = getopt_long (argc, argv, "f:b:kn:sqz", longopts, NULL)) != -1)
@@ -1357,6 +1381,10 @@ main (int argc, char **argv)
         elide_empty_files = true;
         break;
 
+      case SUPPRESS_MATCHED_OPTION:
+        suppress_matched = true;
+        break;
+
       case_GETOPT_HELP_CHAR;
 
       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
@@ -1465,6 +1493,9 @@ and output byte counts of each piece to standard output.\n\
   -k, --keep-files           do not remove output files on errors\n\
 "), stdout);
       fputs (_("\
+  -m, --suppress-matched     suppress the lines matching PATTERN\n\
+"), stdout);
+      fputs (_("\
   -n, --digits=DIGITS        use specified number of digits instead of 2\n\
   -s, --quiet, --silent      do not print counts of output file sizes\n\
   -z, --elide-empty-files    remove empty output files\n\
diff --git a/src/cu-progs.mk b/src/cu-progs.mk
index dba03ad0..66ebd1b8 100644
--- a/src/cu-progs.mk
+++ b/src/cu-progs.mk
@@ -1,6 +1,7 @@
 ## Automatically generated by gen-lists-of-programs.sh.  DO NOT EDIT BY HAND!
 no_install__progs =
 no_install__progs += src/arch
+no_install__progs += src/coreutils
 no_install__progs += src/hostname
 build_if_possible__progs =
 build_if_possible__progs += src/chroot
diff --git a/src/cut.c b/src/cut.c
index 494aad77..312551f0 100644
--- a/src/cut.c
+++ b/src/cut.c
@@ -1,5 +1,5 @@
 /* cut - remove parts of lines of files
-   Copyright (C) 1997-2013 Free Software Foundation, Inc.
+   Copyright (C) 1997-2014 Free Software Foundation, Inc.
    Copyright (C) 1984 David M. Ihnat
 
    This program is free software: you can redistribute it and/or modify
@@ -53,24 +53,6 @@
     }									\
   while (0)
 
-/* Append LOW, HIGH to the list RP of range pairs, allocating additional
-   space if necessary.  Update local variable N_RP.  When allocating,
-   update global variable N_RP_ALLOCATED.  */
-
-#define ADD_RANGE_PAIR(rp, low, high)			\
-  do							\
-    {							\
-      if (low == 0 || high == 0)			\
-        FATAL_ERROR (_("fields and positions are numbered from 1")); \
-      if (n_rp >= n_rp_allocated)			\
-        {						\
-          (rp) = X2NREALLOC (rp, &n_rp_allocated);	\
-        }						\
-      rp[n_rp].lo = (low);				\
-      rp[n_rp].hi = (high);				\
-      ++n_rp;						\
-    }							\
-  while (0)
 
 struct range_pair
   {
@@ -78,6 +60,36 @@ struct range_pair
     size_t hi;
   };
 
+/* Array of `struct range_pair' holding all the finite ranges. */
+static struct range_pair *rp;
+
+/* Pointer inside RP.  When checking if a byte or field is selected
+   by a finite range, we check if it is between CURRENT_RP.LO
+   and CURRENT_RP.HI.  If the byte or field index is greater than
+   CURRENT_RP.HI then we make CURRENT_RP to point to the next range pair. */
+static struct range_pair *current_rp;
+
+/* Number of finite ranges specified by the user. */
+static size_t n_rp;
+
+/* Number of `struct range_pair's allocated. */
+static size_t n_rp_allocated;
+
+
+/* Append LOW, HIGH to the list RP of range pairs, allocating additional
+   space if necessary.  Update global variable N_RP.  When allocating,
+   update global variable N_RP_ALLOCATED.  */
+
+static void
+add_range_pair (size_t lo, size_t hi)
+{
+  if (n_rp == n_rp_allocated)
+    rp = X2NREALLOC (rp, &n_rp_allocated);
+  rp[n_rp].lo = lo;
+  rp[n_rp].hi = hi;
+  ++n_rp;
+}
+
 /* This buffer is used to support the semantics of the -s option
    (or lack of same) when the specified field list includes (does
    not include) the first field.  In both of those cases, the entire
@@ -90,26 +102,6 @@ static char *field_1_buffer;
 /* The number of bytes allocated for FIELD_1_BUFFER.  */
 static size_t field_1_bufsize;
 
-/* The largest field or byte index used as an endpoint of a closed
-   or degenerate range specification;  this doesn't include the starting
-   index of right-open-ended ranges.  For example, with either range spec
-   '2-5,9-', '2-3,5,9-' this variable would be set to 5.  */
-static size_t max_range_endpoint;
-
-/* If nonzero, this is the index of the first field in a range that goes
-   to end of line. */
-static size_t eol_range_start;
-
-/* This is a bit vector.
-   In byte mode, which bytes to output.
-   In field mode, which DELIM-separated fields to output.
-   Both bytes and fields are numbered starting with 1,
-   so the zeroth bit of this array is unused.
-   A field or byte K has been selected if
-   (K <= MAX_RANGE_ENDPOINT and is_printable_field(K))
-    || (EOL_RANGE_START > 0 && K >= EOL_RANGE_START).  */
-static unsigned char *printable_field;
-
 enum operating_mode
   {
     undefined_mode,
@@ -117,22 +109,22 @@ enum operating_mode
     /* Output characters that are in the given bytes. */
     byte_mode,
 
-    /* Output the given delimeter-separated fields. */
+    /* Output the given delimiter-separated fields. */
     field_mode
   };
 
 static enum operating_mode operating_mode;
 
-/* If true do not output lines containing no delimeter characters.
+/* If true do not output lines containing no delimiter characters.
    Otherwise, all such lines are printed.  This option is valid only
    with field mode.  */
 static bool suppress_non_delimited;
 
-/* If nonzero, print all bytes, characters, or fields _except_
+/* If true, print all bytes, characters, or fields _except_
    those that were specified.  */
 static bool complement;
 
-/* The delimeter character for field mode. */
+/* The delimiter character for field mode. */
 static unsigned char delim;
 
 /* True if the --output-delimiter=STRING option was specified.  */
@@ -148,15 +140,6 @@ static char *output_delimiter_string;
 /* True if we have ever read standard input. */
 static bool have_read_stdin;
 
-#define HT_RANGE_START_INDEX_INITIAL_CAPACITY 31
-
-/* The set of range-start indices.  For example, given a range-spec list like
-   '-b1,3-5,4-9,15-', the following indices will be recorded here: 1, 3, 15.
-   Note that although '4' looks like a range-start index, it is in the middle
-   of the '3-5' range, so it doesn't count.
-   This table is created/used IFF output_delimiter_specified is set.  */
-static Hash_table *range_start_ht;
-
 /* For long options that have no equivalent short option, use a
    non-character as a pseudo short option, starting with CHAR_MAX + 1.  */
 enum
@@ -239,103 +222,57 @@ With no FILE, or when FILE is -, read standard input.\n\
   exit (status);
 }
 
-static inline void
-mark_range_start (size_t i)
-{
-  /* Record the fact that 'i' is a range-start index.  */
-  void *ent_from_table = hash_insert (range_start_ht, (void*) i);
-  if (ent_from_table == NULL)
-    {
-      /* Insertion failed due to lack of memory.  */
-      xalloc_die ();
-    }
-  assert ((size_t) ent_from_table == i);
-}
-
-static inline void
-mark_printable_field (size_t i)
-{
-  size_t n = i / CHAR_BIT;
-  printable_field[n] |= (1 << (i % CHAR_BIT));
-}
-
-static inline bool
-is_printable_field (size_t i)
+/* Comparison function for qsort to order the list of
+   struct range_pairs.  */
+static int
+compare_ranges (const void *a, const void *b)
 {
-  size_t n = i / CHAR_BIT;
-  return (printable_field[n] >> (i % CHAR_BIT)) & 1;
+  int a_start = ((const struct range_pair *) a)->lo;
+  int b_start = ((const struct range_pair *) b)->lo;
+  return a_start < b_start ? -1 : a_start > b_start;
 }
 
-static size_t
-hash_int (const void *x, size_t tablesize)
-{
-#ifdef UINTPTR_MAX
-  uintptr_t y = (uintptr_t) x;
-#else
-  size_t y = (size_t) x;
-#endif
-  return y % tablesize;
-}
+/* Reallocate Range Pair entries, with corresponding
+   entries outside the range of each specified entry.  */
 
-static bool
-hash_compare_ints (void const *x, void const *y)
+static void
+complement_rp (void)
 {
-  return (x == y) ? true : false;
-}
+  if (complement)
+    {
+      struct range_pair *c = rp;
+      size_t n = n_rp;
+      size_t i;
 
-static bool
-is_range_start_index (size_t i)
-{
-  return hash_lookup (range_start_ht, (void *) i) ? true : false;
-}
+      rp = NULL;
+      n_rp = 0;
+      n_rp_allocated = 0;
 
-/* Return nonzero if the K'th field or byte is printable.
-   When returning nonzero, if RANGE_START is non-NULL,
-   set *RANGE_START to true if K is the beginning of a range, and to
-   false otherwise.  */
+      if (c[0].lo > 1)
+        add_range_pair (1, c[0].lo - 1);
 
-static bool
-print_kth (size_t k, bool *range_start)
-{
-  bool k_selected
-    = ((0 < eol_range_start && eol_range_start <= k)
-       || (k <= max_range_endpoint && is_printable_field (k)));
+      for (i = 1; i < n; ++i)
+        {
+          if (c[i-1].hi + 1 == c[i].lo)
+            continue;
 
-  bool is_selected = k_selected ^ complement;
-  if (range_start && is_selected)
-    *range_start = is_range_start_index (k);
+          add_range_pair (c[i-1].hi + 1, c[i].lo - 1);
+        }
 
-  return is_selected;
-}
+      if (c[n-1].hi < SIZE_MAX)
+        add_range_pair (c[n-1].hi + 1, SIZE_MAX);
 
-/* Comparison function for qsort to order the list of
-   struct range_pairs.  */
-static int
-compare_ranges (const void *a, const void *b)
-{
-  int a_start = ((const struct range_pair *) a)->lo;
-  int b_start = ((const struct range_pair *) b)->lo;
-  return a_start < b_start ? -1 : a_start > b_start;
+      free (c);
+    }
 }
 
-/* Given the list of field or byte range specifications FIELDSTR, set
-   MAX_RANGE_ENDPOINT and allocate and initialize the PRINTABLE_FIELD
-   array.  If there is a right-open-ended range, set EOL_RANGE_START
-   to its starting index.  FIELDSTR should be composed of one or more
-   numbers or ranges of numbers, separated by blanks or commas.
-   Incomplete ranges may be given: '-m' means '1-m'; 'n-' means 'n'
-   through end of line.  Return true if FIELDSTR contains at least
-   one field specification, false otherwise.  */
-
-/* FIXME-someday:  What if the user wants to cut out the 1,000,000-th
-   field of some huge input file?  This function shouldn't have to
-   allocate a table of a million bits just so we can test every
-   field < 10^6 with an array dereference.  Instead, consider using
-   an adaptive approach: if the range of selected fields is too large,
-   but only a few fields/byte-offsets are actually selected, use a
-   hash table.  If the range of selected fields is too large, and
-   too many are selected, then resort to using the range-pairs (the
-   'rp' array) directly.  */
+/* Given the list of field or byte range specifications FIELDSTR,
+   allocate and initialize the RP array. FIELDSTR should
+   be composed of one or more numbers or ranges of numbers, separated
+   by blanks or commas.  Incomplete ranges may be given: '-m' means '1-m';
+   'n-' means 'n' through end of line.
+   Return true if FIELDSTR contains at least one field specification,
+   false otherwise.  */
 
 static bool
 set_fields (const char *fieldstr)
@@ -348,14 +285,10 @@ set_fields (const char *fieldstr)
   bool field_found = false;	/* True if at least one field spec
                                    has been processed.  */
 
-  struct range_pair *rp = NULL;
-  size_t n_rp = 0;
-  size_t n_rp_allocated = 0;
   size_t i;
   bool in_digits = false;
 
-  /* Collect and store in RP the range end points.
-     It also sets EOL_RANGE_START if appropriate.  */
+  /* Collect and store in RP the range end points. */
 
   while (true)
     {
@@ -390,10 +323,8 @@ set_fields (const char *fieldstr)
                  In any case, 'initial' contains the start of the range. */
               if (!rhs_specified)
                 {
-                  /* 'n-'.  From 'initial' to end of line.  If we've already
-                     seen an M- range, ignore subsequent N- unless N < M.  */
-                  if (eol_range_start == 0 || initial < eol_range_start)
-                    eol_range_start = initial;
+                  /* 'n-'.  From 'initial' to end of line. */
+                  add_range_pair (initial, SIZE_MAX);
                   field_found = true;
                 }
               else
@@ -402,54 +333,23 @@ set_fields (const char *fieldstr)
                   if (value < initial)
                     FATAL_ERROR (_("invalid decreasing range"));
 
-                  /* Is there already a range going to end of line? */
-                  if (eol_range_start != 0)
-                    {
-                      /* Yes.  Is the new sequence already contained
-                         in the old one?  If so, no processing is
-                         necessary. */
-                      if (initial < eol_range_start)
-                        {
-                          /* No, the new sequence starts before the
-                             old.  Does the old range going to end of line
-                             extend into the new range?  */
-                          if (eol_range_start <= value)
-                            {
-                              /* Yes.  Simply move the end of line marker. */
-                              eol_range_start = initial;
-                            }
-                          else
-                            {
-                              /* No.  A simple range, before and disjoint from
-                                 the range going to end of line.  Fill it. */
-                              ADD_RANGE_PAIR (rp, initial, value);
-                            }
-
-                          /* In any case, some fields were selected. */
-                          field_found = true;
-                        }
-                    }
-                  else
-                    {
-                      /* There is no range going to end of line. */
-                      ADD_RANGE_PAIR (rp, initial, value);
-                      field_found = true;
-                    }
-                  value = 0;
+                  add_range_pair (initial, value);
+                  field_found = true;
                 }
+              value = 0;
             }
           else
             {
               /* A simple field number, not a range. */
-              ADD_RANGE_PAIR (rp, value, value);
+              if (value == 0)
+                FATAL_ERROR (_("fields and positions are numbered from 1"));
+              add_range_pair (value, value);
               value = 0;
               field_found = true;
             }
 
           if (*fieldstr == '\0')
-            {
-              break;
-            }
+            break;
 
           fieldstr++;
           lhs_specified = false;
@@ -470,7 +370,8 @@ set_fields (const char *fieldstr)
             lhs_specified = 1;
 
           /* Detect overflow.  */
-          if (!DECIMAL_DIGIT_ACCUMULATE (value, *fieldstr - '0', size_t))
+          if (!DECIMAL_DIGIT_ACCUMULATE (value, *fieldstr - '0', size_t)
+              || value == SIZE_MAX)
             {
               /* In case the user specified -c$(echo 2^64|bc),22,
                  complain only about the first number.  */
@@ -493,51 +394,62 @@ set_fields (const char *fieldstr)
         FATAL_ERROR (_("invalid byte, character or field list"));
     }
 
-  max_range_endpoint = 0;
-  for (i = 0; i < n_rp; i++)
+  qsort (rp, n_rp, sizeof (rp[0]), compare_ranges);
+
+  /* Merge range pairs (e.g. `2-5,3-4' becomes `2-5'). */
+  for (i = 0; i < n_rp; ++i)
     {
-      if (rp[i].hi > max_range_endpoint)
-        max_range_endpoint = rp[i].hi;
+      for (size_t j = i + 1; j < n_rp; ++j)
+        {
+          if (rp[j].lo <= rp[i].hi)
+            {
+              rp[i].hi = MAX (rp[j].hi, rp[i].hi);
+              memmove (rp + j, rp + j + 1, (n_rp - j - 1) * sizeof *rp);
+              n_rp--;
+              j--;
+            }
+          else
+            break;
+        }
     }
 
-  /* Allocate an array large enough so that it may be indexed by
-     the field numbers corresponding to all finite ranges
-     (i.e. '2-6' or '-4', but not '5-') in FIELDSTR.  */
+  complement_rp ();
 
-  if (max_range_endpoint)
-    printable_field = xzalloc (max_range_endpoint / CHAR_BIT + 1);
+  /* After merging, reallocate RP so we release memory to the system.
+     Also add a sentinel at the end of RP, to avoid out of bounds access
+     and for performance reasons.  */
+  ++n_rp;
+  rp = xrealloc (rp, n_rp * sizeof (struct range_pair));
+  rp[n_rp - 1].lo = rp[n_rp - 1].hi = SIZE_MAX;
 
-  qsort (rp, n_rp, sizeof (rp[0]), compare_ranges);
+  return field_found;
+}
 
-  /* Set the array entries corresponding to integers in the ranges of RP.  */
-  for (i = 0; i < n_rp; i++)
-    {
-      /* Ignore any range that is subsumed by the to-EOL range.  */
-      if (eol_range_start && eol_range_start <= rp[i].lo)
-        continue;
-
-      /* Record the range-start indices, i.e., record each start
-         index that is not part of any other (lo..hi] range.  */
-      size_t rsi_candidate = complement ? rp[i].hi + 1 : rp[i].lo;
-      if (output_delimiter_specified
-          && !is_printable_field (rsi_candidate))
-        mark_range_start (rsi_candidate);
-
-      for (size_t j = rp[i].lo; j <= rp[i].hi; j++)
-        mark_printable_field (j);
-    }
+/* Increment *ITEM_IDX (i.e. a field or byte index),
+   and if required CURRENT_RP.  */
 
-  if (output_delimiter_specified
-      && !complement
-      && eol_range_start
-      && max_range_endpoint
-      && (max_range_endpoint < eol_range_start
-          || !is_printable_field (eol_range_start)))
-    mark_range_start (eol_range_start);
+static inline void
+next_item (size_t *item_idx)
+{
+  (*item_idx)++;
+  if ((*item_idx) > current_rp->hi)
+    current_rp++;
+}
 
-  free (rp);
+/* Return nonzero if the K'th field or byte is printable. */
 
-  return field_found;
+static inline bool
+print_kth (size_t k)
+{
+  return current_rp->lo <= k;
+}
+
+/* Return nonzero if K'th byte is the beginning of a range. */
+
+static inline bool
+is_range_start_index (size_t k)
+{
+  return k == current_rp->lo;
 }
 
 /* Read from stream STREAM, printing to standard output any selected bytes.  */
@@ -552,7 +464,8 @@ cut_bytes (FILE *stream)
 
   byte_idx = 0;
   print_delimiter = false;
-  while (1)
+  current_rp = rp;
+  while (true)
     {
       int c;		/* Each character from the file. */
 
@@ -563,6 +476,7 @@ cut_bytes (FILE *stream)
           putchar ('\n');
           byte_idx = 0;
           print_delimiter = false;
+          current_rp = rp;
         }
       else if (c == EOF)
         {
@@ -572,16 +486,19 @@ cut_bytes (FILE *stream)
         }
       else
         {
-          bool range_start;
-          bool *rs = output_delimiter_specified ? &range_start : NULL;
-          if (print_kth (++byte_idx, rs))
+          next_item (&byte_idx);
+          if (print_kth (byte_idx))
             {
-              if (rs && *rs && print_delimiter)
+              if (output_delimiter_specified)
                 {
-                  fwrite (output_delimiter_string, sizeof (char),
-                          output_delimiter_length, stdout);
+                  if (print_delimiter && is_range_start_index (byte_idx))
+                    {
+                      fwrite (output_delimiter_string, sizeof (char),
+                              output_delimiter_length, stdout);
+                    }
+                  print_delimiter = true;
                 }
-              print_delimiter = true;
+
               putchar (c);
             }
         }
@@ -598,6 +515,8 @@ cut_fields (FILE *stream)
   bool found_any_selected_field = false;
   bool buffer_first_field;
 
+  current_rp = rp;
+
   c = getc (stream);
   if (c == EOF)
     return;
@@ -611,7 +530,7 @@ cut_fields (FILE *stream)
      and the first field has been selected, or if non-delimited lines
      must be suppressed and the first field has *not* been selected.
      That is because a non-delimited line has exactly one field.  */
-  buffer_first_field = (suppress_non_delimited ^ !print_kth (1, NULL));
+  buffer_first_field = (suppress_non_delimited ^ !print_kth (1));
 
   while (1)
     {
@@ -619,7 +538,6 @@ cut_fields (FILE *stream)
         {
           ssize_t len;
           size_t n_bytes;
-          bool got_line;
 
           len = getndelim2 (&field_1_buffer, &field_1_bufsize, 0,
                             GETNLINE_NO_LIMIT, delim, '\n', stream);
@@ -636,14 +554,13 @@ cut_fields (FILE *stream)
           assert (n_bytes != 0);
 
           c = 0;
-          got_line = field_1_buffer[n_bytes - 1] == '\n';
 
           /* If the first field extends to the end of line (it is not
              delimited) and we are printing all non-delimited lines,
              print this one.  */
-          if (to_uchar (field_1_buffer[n_bytes - 1]) != delim || got_line)
+          if (to_uchar (field_1_buffer[n_bytes - 1]) != delim)
             {
-              if (suppress_non_delimited && !(got_line && delim == '\n'))
+              if (suppress_non_delimited)
                 {
                   /* Empty.  */
                 }
@@ -651,24 +568,36 @@ cut_fields (FILE *stream)
                 {
                   fwrite (field_1_buffer, sizeof (char), n_bytes, stdout);
                   /* Make sure the output line is newline terminated.  */
-                  if (! got_line)
+                  if (field_1_buffer[n_bytes - 1] != '\n')
                     putchar ('\n');
                   c = '\n';
                 }
               continue;
             }
-          if (print_kth (1, NULL))
+          if (print_kth (1))
             {
               /* Print the field, but not the trailing delimiter.  */
               fwrite (field_1_buffer, sizeof (char), n_bytes - 1, stdout);
-              found_any_selected_field = true;
+
+              /* With -d$'\n' don't treat the last '\n' as a delimiter.  */
+              if (delim == '\n')
+                {
+                  int last_c = getc (stream);
+                  if (last_c != EOF)
+                    {
+                      ungetc (last_c, stream);
+                      found_any_selected_field = true;
+                    }
+                }
+              else
+                found_any_selected_field = true;
             }
-          ++field_idx;
+          next_item (&field_idx);
         }
 
       int prev_c = c;
 
-      if (print_kth (field_idx, NULL))
+      if (print_kth (field_idx))
         {
           if (found_any_selected_field)
             {
@@ -691,21 +620,32 @@ cut_fields (FILE *stream)
             }
         }
 
-      if (c == '\n' || c == EOF)
+      /* With -d$'\n' don't treat the last '\n' as a delimiter.  */
+      if (delim == '\n' && c == delim)
+        {
+          int last_c = getc (stream);
+          if (last_c != EOF)
+            ungetc (last_c, stream);
+          else
+            c = last_c;
+        }
+
+      if (c == delim)
+        next_item (&field_idx);
+      else if (c == '\n' || c == EOF)
         {
           if (found_any_selected_field
               || !(suppress_non_delimited && field_idx == 1))
             {
-              if (c == '\n' || prev_c != '\n')
+              if (c == '\n' || prev_c != '\n' || delim == '\n')
                 putchar ('\n');
             }
           if (c == EOF)
             break;
           field_idx = 1;
+          current_rp = rp;
           found_any_selected_field = false;
         }
-      else if (c == delim)
-        field_idx++;
     }
 }
 
@@ -854,16 +794,6 @@ main (int argc, char **argv)
     FATAL_ERROR (_("suppressing non-delimited lines makes sense\n\
 \tonly when operating on fields"));
 
-  if (output_delimiter_specified)
-    {
-      range_start_ht = hash_initialize (HT_RANGE_START_INDEX_INITIAL_CAPACITY,
-                                        NULL, hash_int,
-                                        hash_compare_ints, NULL);
-      if (range_start_ht == NULL)
-        xalloc_die ();
-
-    }
-
   if (! set_fields (spec_list_string))
     {
       if (operating_mode == field_mode)
@@ -890,8 +820,6 @@ main (int argc, char **argv)
     for (ok = true; optind < argc; optind++)
       ok &= cut_file (argv[optind]);
 
-  if (range_start_ht)
-    hash_free (range_start_ht);
 
   if (have_read_stdin && fclose (stdin) == EOF)
     {
diff --git a/src/date.c b/src/date.c
index ec66f767..ef04cb58 100644
--- a/src/date.c
+++ b/src/date.c
@@ -1,5 +1,5 @@
 /* date - print or set the system date and time
-   Copyright (C) 1989-2013 Free Software Foundation, Inc.
+   Copyright (C) 1989-2014 Free Software Foundation, Inc.
 
    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
@@ -151,7 +151,7 @@ Display the current time in the given FORMAT, or set the system date.\n\
                             Date and time components are separated by\n\
                             a single space: 2006-08-07 12:34:56-06:00\n\
   -s, --set=STRING          set time described by STRING\n\
-  -u, --utc, --universal    print or set Coordinated Universal Time\n\
+  -u, --utc, --universal    print or set Coordinated Universal Time (UTC)\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
diff --git a/src/dcgen b/src/dcgen
index 233fefd0..a994be4d 100755
--- a/src/dcgen
+++ b/src/dcgen
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 # dcgen -- convert dircolors.hin to dircolors.h.
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/src/dd.c b/src/dd.c
index c98e578f..1e387f3d 100644
--- a/src/dd.c
+++ b/src/dd.c
@@ -1,5 +1,5 @@
 /* dd -- convert a file while copying it.
-   Copyright (C) 1985-2013 Free Software Foundation, Inc.
+   Copyright (C) 1985-2014 Free Software Foundation, Inc.
 
    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
@@ -136,9 +136,7 @@ enum
 enum
   {
     STATUS_NOXFER = 01,
-    STATUS_NOCOUNTS = 02,
-    STATUS_LAST = STATUS_NOCOUNTS,
-    STATUS_NONE = STATUS_LAST | (STATUS_LAST - 1)
+    STATUS_NONE = 02
   };
 
 /* The name of the input file, or NULL for the standard input. */
@@ -236,6 +234,9 @@ static uintmax_t r_truncate = 0;
 static char newline_character = '\n';
 static char space_character = ' ';
 
+/* Input buffer. */
+static char *ibuf;
+
 /* Output buffer. */
 static char *obuf;
 
@@ -273,9 +274,9 @@ struct symbol_value
 /* Conversion symbols, for conv="...".  */
 static struct symbol_value const conversions[] =
 {
-  {"ascii", C_ASCII | C_TWOBUFS},	/* EBCDIC to ASCII. */
-  {"ebcdic", C_EBCDIC | C_TWOBUFS},	/* ASCII to EBCDIC. */
-  {"ibm", C_IBM | C_TWOBUFS},	/* Slightly different ASCII to EBCDIC. */
+  {"ascii", C_ASCII | C_UNBLOCK | C_TWOBUFS},	/* EBCDIC to ASCII. */
+  {"ebcdic", C_EBCDIC | C_BLOCK | C_TWOBUFS},	/* ASCII to EBCDIC. */
+  {"ibm", C_IBM | C_BLOCK | C_TWOBUFS},	/* Different ASCII to EBCDIC. */
   {"block", C_BLOCK | C_TWOBUFS},	/* Variable to fixed length records. */
   {"unblock", C_UNBLOCK | C_TWOBUFS},	/* Fixed to variable length records. */
   {"lcase", C_LCASE | C_TWOBUFS},	/* Translate upper to lower case. */
@@ -380,24 +381,29 @@ static struct symbol_value const statuses[] =
 /* Translation table formed by applying successive transformations. */
 static unsigned char trans_table[256];
 
+/* Standard translation tables, taken from POSIX 1003.1-2013.
+   Beware of imitations; there are lots of ASCII<->EBCDIC tables
+   floating around the net, perhaps valid for some applications but
+   not correct here.  */
+
 static char const ascii_to_ebcdic[] =
 {
   '\000', '\001', '\002', '\003', '\067', '\055', '\056', '\057',
   '\026', '\005', '\045', '\013', '\014', '\015', '\016', '\017',
   '\020', '\021', '\022', '\023', '\074', '\075', '\062', '\046',
   '\030', '\031', '\077', '\047', '\034', '\035', '\036', '\037',
-  '\100', '\117', '\177', '\173', '\133', '\154', '\120', '\175',
+  '\100', '\132', '\177', '\173', '\133', '\154', '\120', '\175',
   '\115', '\135', '\134', '\116', '\153', '\140', '\113', '\141',
   '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
   '\370', '\371', '\172', '\136', '\114', '\176', '\156', '\157',
   '\174', '\301', '\302', '\303', '\304', '\305', '\306', '\307',
   '\310', '\311', '\321', '\322', '\323', '\324', '\325', '\326',
   '\327', '\330', '\331', '\342', '\343', '\344', '\345', '\346',
-  '\347', '\350', '\351', '\112', '\340', '\132', '\137', '\155',
+  '\347', '\350', '\351', '\255', '\340', '\275', '\232', '\155',
   '\171', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
   '\210', '\211', '\221', '\222', '\223', '\224', '\225', '\226',
   '\227', '\230', '\231', '\242', '\243', '\244', '\245', '\246',
-  '\247', '\250', '\251', '\300', '\152', '\320', '\241', '\007',
+  '\247', '\250', '\251', '\300', '\117', '\320', '\137', '\007',
   '\040', '\041', '\042', '\043', '\044', '\025', '\006', '\027',
   '\050', '\051', '\052', '\053', '\054', '\011', '\012', '\033',
   '\060', '\061', '\032', '\063', '\064', '\065', '\066', '\010',
@@ -407,10 +413,10 @@ static char const ascii_to_ebcdic[] =
   '\130', '\131', '\142', '\143', '\144', '\145', '\146', '\147',
   '\150', '\151', '\160', '\161', '\162', '\163', '\164', '\165',
   '\166', '\167', '\170', '\200', '\212', '\213', '\214', '\215',
-  '\216', '\217', '\220', '\232', '\233', '\234', '\235', '\236',
-  '\237', '\240', '\252', '\253', '\254', '\255', '\256', '\257',
+  '\216', '\217', '\220', '\152', '\233', '\234', '\235', '\236',
+  '\237', '\240', '\252', '\253', '\254', '\112', '\256', '\257',
   '\260', '\261', '\262', '\263', '\264', '\265', '\266', '\267',
-  '\270', '\271', '\272', '\273', '\274', '\275', '\276', '\277',
+  '\270', '\271', '\272', '\273', '\274', '\241', '\276', '\277',
   '\312', '\313', '\314', '\315', '\316', '\317', '\332', '\333',
   '\334', '\335', '\336', '\337', '\352', '\353', '\354', '\355',
   '\356', '\357', '\372', '\373', '\374', '\375', '\376', '\377'
@@ -463,21 +469,21 @@ static char const ebcdic_to_ascii[] =
   '\220', '\221', '\026', '\223', '\224', '\225', '\226', '\004',
   '\230', '\231', '\232', '\233', '\024', '\025', '\236', '\032',
   '\040', '\240', '\241', '\242', '\243', '\244', '\245', '\246',
-  '\247', '\250', '\133', '\056', '\074', '\050', '\053', '\041',
+  '\247', '\250', '\325', '\056', '\074', '\050', '\053', '\174',
   '\046', '\251', '\252', '\253', '\254', '\255', '\256', '\257',
-  '\260', '\261', '\135', '\044', '\052', '\051', '\073', '\136',
+  '\260', '\261', '\041', '\044', '\052', '\051', '\073', '\176',
   '\055', '\057', '\262', '\263', '\264', '\265', '\266', '\267',
-  '\270', '\271', '\174', '\054', '\045', '\137', '\076', '\077',
+  '\270', '\271', '\313', '\054', '\045', '\137', '\076', '\077',
   '\272', '\273', '\274', '\275', '\276', '\277', '\300', '\301',
   '\302', '\140', '\072', '\043', '\100', '\047', '\075', '\042',
   '\303', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
   '\150', '\151', '\304', '\305', '\306', '\307', '\310', '\311',
   '\312', '\152', '\153', '\154', '\155', '\156', '\157', '\160',
-  '\161', '\162', '\313', '\314', '\315', '\316', '\317', '\320',
-  '\321', '\176', '\163', '\164', '\165', '\166', '\167', '\170',
-  '\171', '\172', '\322', '\323', '\324', '\325', '\326', '\327',
+  '\161', '\162', '\136', '\314', '\315', '\316', '\317', '\320',
+  '\321', '\345', '\163', '\164', '\165', '\166', '\167', '\170',
+  '\171', '\172', '\322', '\323', '\324', '\133', '\326', '\327',
   '\330', '\331', '\332', '\333', '\334', '\335', '\336', '\337',
-  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
+  '\340', '\341', '\342', '\343', '\344', '\135', '\346', '\347',
   '\173', '\101', '\102', '\103', '\104', '\105', '\106', '\107',
   '\110', '\111', '\350', '\351', '\352', '\353', '\354', '\355',
   '\175', '\112', '\113', '\114', '\115', '\116', '\117', '\120',
@@ -646,6 +652,65 @@ Options are:\n\
   exit (status);
 }
 
+static char *
+human_size (size_t n)
+{
+  static char hbuf[LONGEST_HUMAN_READABLE + 1];
+  int human_opts =
+    (human_autoscale | human_round_to_nearest | human_base_1024
+     | human_space_before_unit | human_SI | human_B);
+  return human_readable (n, hbuf, human_opts, 1, 1);
+}
+
+/* Ensure input buffer IBUF is allocated.  */
+
+static void
+alloc_ibuf (void)
+{
+  if (ibuf)
+    return;
+
+  char *real_buf = malloc (input_blocksize + INPUT_BLOCK_SLOP);
+  if (!real_buf)
+    error (EXIT_FAILURE, 0,
+           _("memory exhausted by input buffer of size %zu bytes (%s)"),
+           input_blocksize, human_size (input_blocksize));
+
+  real_buf += SWAB_ALIGN_OFFSET;	/* allow space for swab */
+
+  ibuf = ptr_align (real_buf, page_size);
+}
+
+/* Ensure output buffer OBUF is allocated/initialized.  */
+
+static void
+alloc_obuf (void)
+{
+  if (obuf)
+    return;
+
+  if (conversions_mask & C_TWOBUFS)
+    {
+      /* Page-align the output buffer, too.  */
+      char *real_obuf = malloc (output_blocksize + OUTPUT_BLOCK_SLOP);
+      if (!real_obuf)
+        error (EXIT_FAILURE, 0,
+               _("memory exhausted by output buffer of size %zu bytes (%s)"),
+               output_blocksize, human_size (output_blocksize));
+      obuf = ptr_align (real_obuf, page_size);
+    }
+  else
+    {
+      alloc_ibuf ();
+      obuf = ibuf;
+    }
+
+  /* Write a sentinel to the slop after the buffer,
+   to allow efficient checking for NUL blocks.  */
+  assert (sizeof (uintptr_t) <= OUTPUT_BLOCK_SLOP);
+  memset (obuf + output_blocksize, 1, sizeof (uintptr_t));
+}
+
 static void
 translate_charset (char const *new_trans)
 {
@@ -676,7 +741,7 @@ print_stats (void)
   double delta_s;
   char const *bytes_per_second;
 
-  if ((status_flags & STATUS_NONE) == STATUS_NONE)
+  if (status_flags & STATUS_NONE)
     return;
 
   fprintf (stderr,
@@ -969,12 +1034,13 @@ iread (int fd, char *buf, size_t size)
       if (0 < prev_nread && prev_nread < size)
         {
           uintmax_t prev = prev_nread;
-          error (0, 0, ngettext (("warning: partial read (%"PRIuMAX" byte); "
-                                  "suggest iflag=fullblock"),
-                                 ("warning: partial read (%"PRIuMAX" bytes); "
-                                  "suggest iflag=fullblock"),
-                                 select_plural (prev)),
-                 prev);
+          if (!(status_flags & STATUS_NONE))
+            error (0, 0, ngettext (("warning: partial read (%"PRIuMAX" byte); "
+                                    "suggest iflag=fullblock"),
+                                   ("warning: partial read (%"PRIuMAX" bytes); "
+                                    "suggest iflag=fullblock"),
+                                   select_plural (prev)),
+                   prev);
           warn_partial_read = false;
         }
 
@@ -1018,7 +1084,8 @@ iwrite (int fd, char const *buf, size_t size)
   if ((output_flags & O_DIRECT) && size < output_blocksize)
     {
       int old_flags = fcntl (STDOUT_FILENO, F_GETFL);
-      if (fcntl (STDOUT_FILENO, F_SETFL, old_flags & ~O_DIRECT) != 0)
+      if (fcntl (STDOUT_FILENO, F_SETFL, old_flags & ~O_DIRECT) != 0
+          && !(status_flags & STATUS_NONE))
         error (0, errno, _("failed to turn off O_DIRECT: %s"),
                quote (output_file));
 
@@ -1511,9 +1578,11 @@ skip_via_lseek (char const *filename, int fdesc, off_t offset, int whence)
       && ioctl (fdesc, MTIOCGET, &s2) == 0
       && MT_SAME_POSITION (s1, s2))
     {
-      error (0, 0, _("warning: working around lseek kernel bug for file (%s)\n\
-  of mt_type=0x%0lx -- see <sys/mtio.h> for the list of types"),
-             filename, s2.mt_type);
+      if (!(status_flags & STATUS_NONE))
+        error (0, 0, _("warning: working around lseek kernel bug for file "
+                       "(%s)\n  of mt_type=0x%0lx -- "
+                       "see <sys/mtio.h> for the list of types"),
+               filename, s2.mt_type);
       errno = 0;
       new_position = -1;
     }
@@ -1526,7 +1595,7 @@ skip_via_lseek (char const *filename, int fdesc, off_t offset, int whence)
 
 /* Throw away RECORDS blocks of BLOCKSIZE bytes plus BYTES bytes on
    file descriptor FDESC, which is open with read permission for FILE.
-   Store up to BLOCKSIZE bytes of the data at a time in BUF, if
+   Store up to BLOCKSIZE bytes of the data at a time in IBUF or OBUF, if
    necessary. RECORDS or BYTES must be nonzero. If FDESC is
    STDIN_FILENO, advance the input offset. Return the number of
    records remaining, i.e., that were not skipped because EOF was
@@ -1535,7 +1604,7 @@ skip_via_lseek (char const *filename, int fdesc, off_t offset, int whence)
 
 static uintmax_t
 skip (int fdesc, char const *file, uintmax_t records, size_t blocksize,
-      size_t *bytes, char *buf)
+      size_t *bytes)
 {
   uintmax_t offset = records * blocksize + *bytes;
 
@@ -1607,6 +1676,18 @@ skip (int fdesc, char const *file, uintmax_t records, size_t blocksize,
         }
       /* else file_size && offset > OFF_T_MAX or file ! seekable */
 
+      char *buf;
+      if (fdesc == STDIN_FILENO)
+        {
+          alloc_ibuf ();
+          buf = ibuf;
+        }
+      else
+        {
+          alloc_obuf ();
+          buf = obuf;
+        }
+
       do
         {
           ssize_t nread = iread_fnc (fdesc, buf, records ? blocksize : *bytes);
@@ -1671,7 +1752,7 @@ advance_input_after_read_error (size_t nbytes)
           if (offset == input_offset)
             return true;
           diff = input_offset - offset;
-          if (! (0 <= diff && diff <= nbytes))
+          if (! (0 <= diff && diff <= nbytes) && !(status_flags & STATUS_NONE))
             error (0, 0, _("warning: invalid file offset after failed read"));
           if (0 <= skip_via_lseek (input_file, STDIN_FILENO, diff, SEEK_CUR))
             return true;
@@ -1823,26 +1904,12 @@ set_fd_flags (int fd, int add_flags, char const *name)
     }
 }
 
-static char *
-human_size (size_t n)
-{
-  static char hbuf[LONGEST_HUMAN_READABLE + 1];
-  int human_opts =
-    (human_autoscale | human_round_to_nearest | human_base_1024
-     | human_space_before_unit | human_SI | human_B);
-  return human_readable (n, hbuf, human_opts, 1, 1);
-}
-
 /* The main loop.  */
 
 static int
 dd_copy (void)
 {
-  char *ibuf, *bufstart;	/* Input buffer. */
-  /* These are declared static so that even though we don't free the
-     buffers, valgrind will recognize that there is no "real" leak.  */
-  static char *real_buf;	/* real buffer address before alignment */
-  static char *real_obuf;
+  char *bufstart;		/* Input buffer. */
   ssize_t nread;		/* Bytes read in the current block.  */
 
   /* If nonzero, then the previously read block was partial and
@@ -1869,45 +1936,12 @@ dd_copy (void)
      It is necessary when accessing raw (i.e. character special) disk
      devices on Unixware or other SVR4-derived system.  */
 
-  real_buf = malloc (input_blocksize + INPUT_BLOCK_SLOP);
-  if (!real_buf)
-    error (EXIT_FAILURE, 0,
-           _("memory exhausted by input buffer of size %zu bytes (%s)"),
-           input_blocksize, human_size (input_blocksize));
-
-  ibuf = real_buf;
-  ibuf += SWAB_ALIGN_OFFSET;	/* allow space for swab */
-
-  ibuf = ptr_align (ibuf, page_size);
-
-  if (conversions_mask & C_TWOBUFS)
-    {
-      /* Page-align the output buffer, too.  */
-      real_obuf = malloc (output_blocksize + OUTPUT_BLOCK_SLOP);
-      if (!real_obuf)
-        error (EXIT_FAILURE, 0,
-               _("memory exhausted by output buffer of size %zu bytes (%s)"),
-               output_blocksize, human_size (output_blocksize));
-      obuf = ptr_align (real_obuf, page_size);
-    }
-  else
-    {
-      real_obuf = NULL;
-      obuf = ibuf;
-    }
-
-  /* Write a sentinel to the slop after the buffer,
-     to allow efficient checking for NUL blocks.  */
-  assert (sizeof (uintptr_t) <= OUTPUT_BLOCK_SLOP);
-  memset (obuf + output_blocksize, 1, sizeof (uintptr_t));
-
   if (skip_records != 0 || skip_bytes != 0)
     {
       uintmax_t us_bytes = input_offset + (skip_records * input_blocksize)
                            + skip_bytes;
       uintmax_t us_blocks = skip (STDIN_FILENO, input_file,
-                                  skip_records, input_blocksize, &skip_bytes,
-                                  ibuf);
+                                  skip_records, input_blocksize, &skip_bytes);
       us_bytes -= input_offset;
 
       /* POSIX doesn't say what to do when dd detects it has been
@@ -1916,7 +1950,8 @@ dd_copy (void)
              1. file is too small
              2. pipe has not enough data
              3. partial reads  */
-      if (us_blocks || (!input_offset_overflow && us_bytes))
+      if ((us_blocks || (!input_offset_overflow && us_bytes))
+          && !(status_flags & STATUS_NONE))
         {
           error (0, 0,
                  _("%s: cannot skip to specified offset"), quote (input_file));
@@ -1927,8 +1962,7 @@ dd_copy (void)
     {
       size_t bytes = seek_bytes;
       uintmax_t write_records = skip (STDOUT_FILENO, output_file,
-                                      seek_records, output_blocksize, &bytes,
-                                      obuf);
+                                      seek_records, output_blocksize, &bytes);
 
       if (write_records != 0 || bytes != 0)
         {
@@ -1955,6 +1989,9 @@ dd_copy (void)
   if (max_records == 0 && max_bytes == 0)
     return exit_status;
 
+  alloc_ibuf ();
+  alloc_obuf ();
+
   while (1)
     {
       if (r_partial + r_full >= max_records + !!max_bytes)
@@ -1981,7 +2018,9 @@ dd_copy (void)
 
       if (nread < 0)
         {
-          error (0, errno, _("error reading %s"), quote (input_file));
+          if (!(conversions_mask & C_NOERROR) || !(status_flags & STATUS_NONE))
+            error (0, errno, _("error reading %s"), quote (input_file));
+
           if (conversions_mask & C_NOERROR)
             {
               print_stats ();
diff --git a/src/df.c b/src/df.c
index 05151319..3ef5d33b 100644
--- a/src/df.c
+++ b/src/df.c
@@ -1,5 +1,5 @@
 /* df - summarize free disk space
-   Copyright (C) 1991-2013 Free Software Foundation, Inc.
+   Copyright (C) 1991-2014 Free Software Foundation, Inc.
 
    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
@@ -44,13 +44,13 @@
   proper_name ("Paul Eggert")
 
 /* Filled with device numbers of examined file systems to avoid
-   duplicities in output.  */
-struct devlist
+   duplicates in output.  */
+static struct devlist
 {
   dev_t dev_num;
   struct mount_entry *me;
   struct devlist *next;
-};
+} *device_list;
 
 /* If true, show even file systems with zero size or
    uninteresting types.  */
@@ -143,7 +143,9 @@ typedef enum
   IUSED_FIELD,  /* inodes used */
   IAVAIL_FIELD, /* inodes available */
   IPCENT_FIELD, /* inodes used in percent */
-  TARGET_FIELD  /* mount point */
+  TARGET_FIELD, /* mount point */
+  FILE_FIELD,   /* specified file name */
+  INVALID_FIELD /* validation marker */
 } display_field_t;
 
 /* Flag if a field contains a block, an inode or another value.  */
@@ -199,11 +201,15 @@ static struct field_data_t field_data[] = {
     "ipcent", INODE_FLD, N_("IUse%"),       4, MBS_ALIGN_RIGHT, false },
 
   [TARGET_FIELD] = { TARGET_FIELD,
-    "target", OTHER_FLD, N_("Mounted on"),  0, MBS_ALIGN_LEFT,  false }
+    "target", OTHER_FLD, N_("Mounted on"),  0, MBS_ALIGN_LEFT,  false },
+
+  [FILE_FIELD] = { FILE_FIELD,
+    "file",   OTHER_FLD, N_("File"),        0, MBS_ALIGN_LEFT,  false }
 };
 
 static char const *all_args_string =
-  "source,fstype,itotal,iused,iavail,ipcent,size,used,avail,pcent,target";
+  "source,fstype,itotal,iused,iavail,ipcent,size,"
+  "used,avail,pcent,file,target";
 
 /* Storage for the definition of output columns.  */
 static struct field_data_t **columns;
@@ -237,8 +243,7 @@ enum
   NO_SYNC_OPTION = CHAR_MAX + 1,
   SYNC_OPTION,
   TOTAL_OPTION,
-  OUTPUT_OPTION,
-  MEGABYTES_OPTION  /* FIXME: remove long opt in Aug 2013 */
+  OUTPUT_OPTION
 };
 
 static struct option const long_options[] =
@@ -249,7 +254,6 @@ static struct option const long_options[] =
   {"human-readable", no_argument, NULL, 'h'},
   {"si", no_argument, NULL, 'H'},
   {"local", no_argument, NULL, 'l'},
-  {"megabytes", no_argument, NULL, MEGABYTES_OPTION}, /* obsolescent,  */
   {"output", optional_argument, NULL, OUTPUT_OPTION},
   {"portability", no_argument, NULL, 'P'},
   {"print-type", no_argument, NULL, 'T'},
@@ -287,7 +291,7 @@ static void
 alloc_table_row (void)
 {
   nrows++;
-  table = xnrealloc (table, nrows, sizeof (char *));
+  table = xnrealloc (table, nrows, sizeof (char **));
   table[nrows - 1] = xnmalloc (ncolumns, sizeof (char *));
 }
 
@@ -369,7 +373,7 @@ decode_output_arg (char const *arg)
         *comma++ = 0;
 
       /* process S.  */
-      display_field_t field = -1;
+      display_field_t field = INVALID_FIELD;
       for (unsigned int i = 0; i < ARRAY_CARDINALITY (field_data); i++)
         {
           if (STREQ (field_data[i].arg, s))
@@ -378,17 +382,17 @@ decode_output_arg (char const *arg)
               break;
             }
         }
-      if (field == -1)
+      if (field == INVALID_FIELD)
         {
-          error (0, 0, _("option --output: field '%s' unknown"), s);
+          error (0, 0, _("option --output: field %s unknown"), quote (s));
           usage (EXIT_FAILURE);
         }
 
       if (field_data[field].used)
         {
           /* Prevent the fields from being used more than once.  */
-          error (0, 0, _("option --output: field '%s' used more than once"),
-                 field_data[field].arg);
+          error (0, 0, _("option --output: field %s used more than once"),
+                 quote (field_data[field].arg));
           usage (EXIT_FAILURE);
         }
 
@@ -403,6 +407,7 @@ decode_output_arg (char const *arg)
         case IAVAIL_FIELD:
         case IPCENT_FIELD:
         case TARGET_FIELD:
+        case FILE_FIELD:
           alloc_field (field, NULL);
           break;
 
@@ -539,7 +544,7 @@ get_header (void)
           char *num = human_readable (output_block_size, buf, opts, 1, 1);
 
           /* Reset the header back to the default in OUTPUT_MODE.  */
-          header = N_("blocks");
+          header = _("blocks");
 
           /* TRANSLATORS: this is the "1K-blocks" header in "df" output.  */
           if (asprintf (&cell, _("%s-%s"), num, header) == -1)
@@ -599,75 +604,115 @@ excluded_fstype (const char *fstype)
 }
 
 /* Filter mount list by skipping duplicate entries.
-   In the case of duplicities - based on to the device number - the mount entry
+   In the case of duplicates - based on the device number - the mount entry
    with a '/' in its me_devname (i.e. not pseudo name like tmpfs) wins.
    If both have a real devname (e.g. bind mounts), then that with the shorter
-   me_mountdir wins.  */
+   me_mountdir wins.  With DEVICES_ONLY == true (set with df -a), only update
+   the global device_list, rather than filtering the global mount_list.  */
 
 static void
-filter_mount_list (void)
+filter_mount_list (bool devices_only)
 {
   struct mount_entry *me;
 
-  /* Store of already-processed device numbers.  */
-  struct devlist *devlist_head = NULL;
-
-  /* Sort all 'wanted' entries into the list devlist_head.  */
-  for (me = mount_list; me; me = me->me_next)
+  /* Sort all 'wanted' entries into the list device_list.  */
+  for (me = mount_list; me;)
     {
       struct stat buf;
       struct devlist *devlist;
+      struct mount_entry *discard_me = NULL;
 
+      /* TODO: On Linux we might avoid this stat() and another in get_dev()
+         by using the device IDs available from /proc/self/mountinfo.
+         read_file_system_list() could populate me_dev from those
+         for efficiency and accuracy.  */
       if (-1 == stat (me->me_mountdir, &buf))
         {
-          ;  /* Stat failed - add ME to be able to complain about it later.  */
+          /* Stat failed - add ME to be able to complain about it later.  */
+          buf.st_dev = me->me_dev;
         }
       else
         {
-          /* If the device name is a real path name ...  */
-          if (strchr (me->me_devname, '/'))
-            {
-              /* ... try to find its device number in the devlist.  */
-              for (devlist = devlist_head; devlist; devlist = devlist->next)
-                if (devlist->dev_num == buf.st_dev)
-                  break;
+          /* If we've already seen this device...  */
+          for (devlist = device_list; devlist; devlist = devlist->next)
+            if (devlist->dev_num == buf.st_dev)
+              break;
 
-              if (devlist)
+          if (devlist)
+            {
+              /* ...let the shorter mountdir win.  */
+              if ((strchr (me->me_devname, '/')
+                   && ! strchr (devlist->me->me_devname, '/'))
+                  || (strlen (devlist->me->me_mountdir)
+                      > strlen (me->me_mountdir))
+                  /* or one overmounted on a different device.  */
+                  || ! STREQ (devlist->me->me_devname, me->me_devname))
                 {
-                  /* Let the shorter mountdir win.  */
-                  if (   !strchr (devlist->me->me_devname, '/')
-                      || ( strlen (devlist->me->me_mountdir)
-                         > strlen (me->me_mountdir)))
-                    {
-                       /* FIXME: free ME - the others are also not free()d.  */
-                      devlist->me = me;
-                    }
-                  continue; /* ... with the loop over the mount_list.  */
+                  /* Discard mount entry for existing device.  */
+                  discard_me = devlist->me;
+                  devlist->me = me;
+                }
+              else
+                {
+                  /* Discard mount entry currently being processed.  */
+                  discard_me = me;
                 }
+
             }
         }
 
-      /* Add the device number to the global list devlist.  */
-      devlist = xmalloc (sizeof *devlist);
-      devlist->me = me;
-      devlist->dev_num = buf.st_dev;
-      devlist->next = devlist_head;
-      devlist_head = devlist;
+      if (discard_me)
+        {
+          me = me->me_next;
+          if (! devices_only)
+            free_mount_entry (discard_me);
+        }
+      else
+        {
+          /* Add the device number to the global list devlist.  */
+          devlist = xmalloc (sizeof *devlist);
+          devlist->me = me;
+          devlist->dev_num = buf.st_dev;
+          devlist->next = device_list;
+          device_list = devlist;
+
+          me = me->me_next;
+        }
     }
 
   /* Finally rebuild the mount_list from the devlist.  */
-  mount_list = NULL;
-  while (devlist_head)
+  if (! devices_only) {
+    mount_list = NULL;
+    while (device_list)
+      {
+        /* Add the mount entry.  */
+        me = device_list->me;
+        me->me_next = mount_list;
+        mount_list = me;
+        /* Free devlist entry and advance.  */
+        struct devlist *devlist = device_list->next;
+        free (device_list);
+        device_list = devlist;
+      }
+  }
+}
+
+/* Search a mount entry list for device id DEV.
+   Return the corresponding device name if found or NULL if not.  */
+
+static char const * _GL_ATTRIBUTE_PURE
+devname_for_dev (dev_t dev)
+{
+  struct devlist *dl = device_list;
+
+  while (dl)
     {
-      /* Add the mount entry.  */
-      me = devlist_head->me;
-      me->me_next = mount_list;
-      mount_list = me;
-      /* Free devlist entry and advance.  */
-      struct devlist *devlist = devlist_head->next;
-      free (devlist_head);
-      devlist_head = devlist;
+      if (dl->dev_num == dev)
+        return dl->me->me_devname;
+      dl = dl->next;
     }
+
+  return NULL;
 }
 
 /* Return true if N is a known integer value.  On many file systems,
@@ -824,7 +869,7 @@ add_to_grand_total (struct field_values_t *bv, struct field_values_t *iv)
    when df is invoked with no non-option argument.  See below for details.  */
 
 static void
-get_dev (char const *disk, char const *mount_point,
+get_dev (char const *disk, char const *mount_point, char const* file,
          char const *stat_file, char const *fstype,
          bool me_dummy, bool me_remote,
          const struct fs_usage *force_fsu,
@@ -839,6 +884,11 @@ get_dev (char const *disk, char const *mount_point,
   if (!selected_fstype (fstype) || excluded_fstype (fstype))
     return;
 
+  /* Ignore relative MOUNT_POINTs, which are present for example
+     in /proc/mounts on Linux with network namespaces.  */
+  if (!force_fsu && mount_point && ! IS_ABSOLUTE_FILE_NAME (mount_point))
+    return;
+
   /* If MOUNT_POINT is NULL, then the file system is not mounted, and this
      program reports on the file system that the special file is on.
      It would be better to report on the unmounted file system,
@@ -851,9 +901,40 @@ get_dev (char const *disk, char const *mount_point,
     fsu = *force_fsu;
   else if (get_fs_usage (stat_file, disk, &fsu))
     {
-      error (0, errno, "%s", quote (stat_file));
-      exit_status = EXIT_FAILURE;
-      return;
+      /* If we can't access a system provided entry due
+         to it not being present (now), or due to permissions,
+         just output placeholder values rather than failing.  */
+      if (process_all && (errno == EACCES || errno == ENOENT))
+        {
+          if (! show_all_fs)
+            return;
+
+          fstype = "-";
+          fsu.fsu_blocksize = fsu.fsu_blocks = fsu.fsu_bfree =
+          fsu.fsu_bavail = fsu.fsu_files = fsu.fsu_ffree = UINTMAX_MAX;
+        }
+      else
+        {
+          error (0, errno, "%s", quote (stat_file));
+          exit_status = EXIT_FAILURE;
+          return;
+        }
+    }
+  else if (process_all && show_all_fs)
+    {
+      /* Ensure we don't output incorrect stats for over-mounted directories.
+         Discard stats when the device name doesn't match.  */
+      struct stat sb;
+      if (stat (stat_file, &sb) == 0)
+        {
+          char const * devname = devname_for_dev (sb.st_dev);
+          if (devname && ! STREQ (devname, disk))
+            {
+              fstype = "-";
+              fsu.fsu_blocksize = fsu.fsu_blocks = fsu.fsu_bfree =
+              fsu.fsu_bavail = fsu.fsu_files = fsu.fsu_ffree = UINTMAX_MAX;
+            }
+        }
     }
 
   if (fsu.fsu_blocks == 0 && !show_all_fs && !show_listed_fs)
@@ -867,6 +948,9 @@ get_dev (char const *disk, char const *mount_point,
   if (! disk)
     disk = "-";			/* unknown */
 
+  if (! file)
+    file = "-";			/* unspecified */
+
   char *dev_name = xstrdup (disk);
   char *resolved_dev;
 
@@ -914,6 +998,7 @@ get_dev (char const *disk, char const *mount_point,
           v = NULL;
           break;
         default:
+          v = NULL; /* Avoid warnings where assert() is not __noreturn__.  */
           assert (!"bad field_type");
         }
 
@@ -998,6 +1083,10 @@ get_dev (char const *disk, char const *mount_point,
             break;
           }
 
+        case FILE_FIELD:
+          cell = xstrdup (file);
+          break;
+
         case TARGET_FIELD:
 #ifdef HIDE_AUTOMOUNT_PREFIX
           /* Don't print the first directory name in MOUNT_POINT if it's an
@@ -1025,6 +1114,33 @@ get_dev (char const *disk, char const *mount_point,
   free (dev_name);
 }
 
+/* Scan the mount list returning the _last_ device found for MOUNT.
+   NULL is returned if MOUNT not found.  The result is malloced.  */
+static char *
+last_device_for_mount (char const* mount)
+{
+  struct mount_entry const *me;
+  struct mount_entry const *le = NULL;
+
+  for (me = mount_list; me; me = me->me_next)
+    {
+      if (STREQ (me->me_mountdir, mount))
+        le = me;
+    }
+
+  if (le)
+    {
+      char *devname = le->me_devname;
+      char *canon_dev = canonicalize_file_name (devname);
+      if (canon_dev && IS_ABSOLUTE_FILE_NAME (canon_dev))
+        return canon_dev;
+      free (canon_dev);
+      return xstrdup (le->me_devname);
+    }
+  else
+    return NULL;
+}
+
 /* If DISK corresponds to a mount point, show its usage
    and return true.  Otherwise, return false.  */
 static bool
@@ -1032,18 +1148,75 @@ get_disk (char const *disk)
 {
   struct mount_entry const *me;
   struct mount_entry const *best_match = NULL;
+  bool best_match_accessible = false;
+  bool eclipsed_device = false;
+  char const *file = disk;
 
+  char *resolved = canonicalize_file_name (disk);
+  if (resolved && IS_ABSOLUTE_FILE_NAME (resolved))
+    disk = resolved;
+
+  size_t best_match_len = SIZE_MAX;
   for (me = mount_list; me; me = me->me_next)
-    if (STREQ (disk, me->me_devname))
-      best_match = me;
+    {
+      /* TODO: Should cache canon_dev in the mount_entry struct.  */
+      char *devname = me->me_devname;
+      char *canon_dev = canonicalize_file_name (me->me_devname);
+      if (canon_dev && IS_ABSOLUTE_FILE_NAME (canon_dev))
+        devname = canon_dev;
+
+      if (STREQ (disk, devname))
+        {
+          char *last_device = last_device_for_mount (me->me_mountdir);
+          eclipsed_device = last_device && ! STREQ (last_device, devname);
+          size_t len = strlen (me->me_mountdir);
+
+          if (! eclipsed_device
+              && (! best_match_accessible || len < best_match_len))
+            {
+              struct stat disk_stats;
+              bool this_match_accessible = false;
+
+              if (stat (me->me_mountdir, &disk_stats) == 0)
+                best_match_accessible = this_match_accessible = true;
+
+              if (this_match_accessible
+                  || (! best_match_accessible && len < best_match_len))
+                {
+                  best_match = me;
+                  if (len == 1) /* Traditional root.  */
+                    {
+                      free (last_device);
+                      free (canon_dev);
+                      break;
+                    }
+                  else
+                    best_match_len = len;
+                }
+            }
+
+          free (last_device);
+        }
+
+      free (canon_dev);
+    }
+
+  free (resolved);
 
   if (best_match)
     {
-      get_dev (best_match->me_devname, best_match->me_mountdir, NULL,
+      get_dev (best_match->me_devname, best_match->me_mountdir, file, NULL,
                best_match->me_type, best_match->me_dummy,
                best_match->me_remote, NULL, false);
       return true;
     }
+  else if (eclipsed_device)
+    {
+      error (0, 0, _("cannot access %s: over-mounted by another device"),
+             quote (file));
+      exit_status = EXIT_FAILURE;
+      return true;
+    }
 
   return false;
 }
@@ -1068,17 +1241,19 @@ get_point (const char *point, const struct stat *statp)
       size_t best_match_len = 0;
 
       for (me = mount_list; me; me = me->me_next)
-      if (!STREQ (me->me_type, "lofs")
-          && (!best_match || best_match->me_dummy || !me->me_dummy))
         {
-          size_t len = strlen (me->me_mountdir);
-          if (best_match_len <= len && len <= resolved_len
-              && (len == 1 /* root file system */
-                  || ((len == resolved_len || resolved[len] == '/')
-                      && STREQ_LEN (me->me_mountdir, resolved, len))))
+          if (!STREQ (me->me_type, "lofs")
+              && (!best_match || best_match->me_dummy || !me->me_dummy))
             {
-              best_match = me;
-              best_match_len = len;
+              size_t len = strlen (me->me_mountdir);
+              if (best_match_len <= len && len <= resolved_len
+                  && (len == 1 /* root file system */
+                      || ((len == resolved_len || resolved[len] == '/')
+                          && STREQ_LEN (me->me_mountdir, resolved, len))))
+                {
+                  best_match = me;
+                  best_match_len = len;
+                }
             }
         }
     }
@@ -1125,7 +1300,7 @@ get_point (const char *point, const struct stat *statp)
       }
 
   if (best_match)
-    get_dev (best_match->me_devname, best_match->me_mountdir, point,
+    get_dev (best_match->me_devname, best_match->me_mountdir, point, point,
              best_match->me_type, best_match->me_dummy, best_match->me_remote,
              NULL, false);
   else
@@ -1138,7 +1313,7 @@ get_point (const char *point, const struct stat *statp)
       char *mp = find_mount_point (point, statp);
       if (mp)
         {
-          get_dev (NULL, mp, NULL, NULL, false, false, NULL, false);
+          get_dev (NULL, mp, point, NULL, NULL, false, false, NULL, false);
           free (mp);
         }
     }
@@ -1165,11 +1340,10 @@ get_all_entries (void)
 {
   struct mount_entry *me;
 
-  if (!show_all_fs)
-    filter_mount_list ();
+  filter_mount_list (show_all_fs);
 
   for (me = mount_list; me; me = me->me_next)
-    get_dev (me->me_devname, me->me_mountdir, NULL, me->me_type,
+    get_dev (me->me_devname, me->me_mountdir, NULL, NULL, me->me_type,
              me->me_dummy, me->me_remote, NULL, true);
 }
 
@@ -1214,15 +1388,16 @@ or all file systems by default.\n\
 
       emit_mandatory_arg_note ();
 
+      /* TRANSLATORS: The thousands and decimal separators are best
+         adjusted to an appropriate default for your locale.  */
       fputs (_("\
   -a, --all             include dummy file systems\n\
-  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n\
-                           '-BM' prints sizes in units of 1,048,576 bytes.\n\
-                           See SIZE format below.\n\
+  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n\
+                           '-BM' prints sizes in units of 1,048,576 bytes;\n\
+                           see SIZE format below\n\
       --total           produce a grand total\n\
-  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M 2G)\
-\n\
-  -H, --si              likewise, but use powers of 1000 not 1024\n\
+  -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n\
+  -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n\
 "), stdout);
       fputs (_("\
   -i, --inodes          list inode information instead of block usage\n\
@@ -1248,7 +1423,7 @@ or all file systems by default.\n\
       fputs (_("\n\
 FIELD_LIST is a comma-separated list of columns to be included.  Valid\n\
 field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n\
-'size', 'used', 'avail', 'pcent' and 'target' (see info page).\n\
+'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n\
 "), stdout);
       emit_ancillary_info ();
     }
@@ -1328,13 +1503,6 @@ main (int argc, char **argv)
         case 'l':
           show_local_fs = true;
           break;
-        case MEGABYTES_OPTION:
-          /* Distinguish between the long and the short option.
-             As we want to remove the long option soon,
-             give a warning when the long form is used.  */
-          error (0, 0, "%s%s", _("warning: "),
-            _("long option '--megabytes' is deprecated"
-              " and will soon be removed"));
         case 'm': /* obsolescent, exists for BSD compatibility */
           human_output_opts = 0;
           output_block_size = 1024 * 1024;
@@ -1527,7 +1695,7 @@ main (int argc, char **argv)
       if (print_grand_total)
         get_dev ("total",
                  (field_data[SOURCE_FIELD].used ? "-" : "total"),
-                 NULL, NULL, false, false, &grand_fsu, false);
+                 NULL, NULL, NULL, false, false, &grand_fsu, false);
 
       print_table ();
     }
diff --git a/src/dircolors.c b/src/dircolors.c
index 5610f083..99605367 100644
--- a/src/dircolors.c
+++ b/src/dircolors.c
@@ -1,5 +1,5 @@
 /* dircolors - output commands to set the LS_COLOR environment variable
-   Copyright (C) 1996-2013 Free Software Foundation, Inc.
+   Copyright (C) 1996-2014 Free Software Foundation, Inc.
    Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000 H. Peter Anvin
 
    This program is free software: you can redistribute it and/or modify
diff --git a/src/dircolors.h b/src/dircolors.h
index f243c192..7b501079 100644
--- a/src/dircolors.h
+++ b/src/dircolors.h
@@ -2,7 +2,7 @@ static char const G_line[] =
 {
   '#',' ','C','o','n','f','i','g','u','r','a','t','i','o','n',' ','f','i','l','e',' ','f','o','r',' ','d','i','r','c','o','l','o','r','s',',',' ','a',' ','u','t','i','l','i','t','y',' ','t','o',' ','h','e','l','p',' ','y','o','u',' ','s','e','t',' ','t','h','e',0,
   '#',' ','L','S','_','C','O','L','O','R','S',' ','e','n','v','i','r','o','n','m','e','n','t',' ','v','a','r','i','a','b','l','e',' ','u','s','e','d',' ','b','y',' ','G','N','U',' ','l','s',' ','w','i','t','h',' ','t','h','e',' ','-','-','c','o','l','o','r',' ','o','p','t','i','o','n','.',0,
-  '#',' ','C','o','p','y','r','i','g','h','t',' ','(','C',')',' ','1','9','9','6','-','2','0','1','3',' ','F','r','e','e',' ','S','o','f','t','w','a','r','e',' ','F','o','u','n','d','a','t','i','o','n',',',' ','I','n','c','.',0,
+  '#',' ','C','o','p','y','r','i','g','h','t',' ','(','C',')',' ','1','9','9','6','-','2','0','1','4',' ','F','r','e','e',' ','S','o','f','t','w','a','r','e',' ','F','o','u','n','d','a','t','i','o','n',',',' ','I','n','c','.',0,
   '#',' ','C','o','p','y','i','n','g',' ','a','n','d',' ','d','i','s','t','r','i','b','u','t','i','o','n',' ','o','f',' ','t','h','i','s',' ','f','i','l','e',',',' ','w','i','t','h',' ','o','r',' ','w','i','t','h','o','u','t',' ','m','o','d','i','f','i','c','a','t','i','o','n',',',0,
   '#',' ','a','r','e',' ','p','e','r','m','i','t','t','e','d',' ','p','r','o','v','i','d','e','d',' ','t','h','e',' ','c','o','p','y','r','i','g','h','t',' ','n','o','t','i','c','e',' ','a','n','d',' ','t','h','i','s',' ','n','o','t','i','c','e',' ','a','r','e',' ','p','r','e','s','e','r','v','e','d','.',0,
   '#',' ','T','h','e',' ','k','e','y','w','o','r','d','s',' ','C','O','L','O','R',',',' ','O','P','T','I','O','N','S',',',' ','a','n','d',' ','E','I','G','H','T','B','I','T',' ','(','h','o','n','o','r','e','d',' ','b','y',' ','t','h','e',0,
@@ -28,14 +28,17 @@ static char const G_line[] =
   'T','E','R','M',' ','e','t','e','r','m','-','c','o','l','o','r',0,
   'T','E','R','M',' ','g','n','o','m','e',0,
   'T','E','R','M',' ','g','n','o','m','e','-','2','5','6','c','o','l','o','r',0,
+  'T','E','R','M',' ','h','u','r','d',0,
   'T','E','R','M',' ','j','f','b','t','e','r','m',0,
   'T','E','R','M',' ','k','o','n','s','o','l','e',0,
   'T','E','R','M',' ','k','t','e','r','m',0,
   'T','E','R','M',' ','l','i','n','u','x',0,
   'T','E','R','M',' ','l','i','n','u','x','-','c',0,
   'T','E','R','M',' ','m','a','c','h','-','c','o','l','o','r',0,
+  'T','E','R','M',' ','m','a','c','h','-','g','n','u','-','c','o','l','o','r',0,
   'T','E','R','M',' ','m','l','t','e','r','m',0,
   'T','E','R','M',' ','p','u','t','t','y',0,
+  'T','E','R','M',' ','p','u','t','t','y','-','2','5','6','c','o','l','o','r',0,
   'T','E','R','M',' ','r','x','v','t',0,
   'T','E','R','M',' ','r','x','v','t','-','2','5','6','c','o','l','o','r',0,
   'T','E','R','M',' ','r','x','v','t','-','c','y','g','w','i','n',0,
@@ -106,18 +109,25 @@ static char const G_line[] =
   ' ','#',' ','a','r','c','h','i','v','e','s',' ','o','r',' ','c','o','m','p','r','e','s','s','e','d',' ','(','b','r','i','g','h','t',' ','r','e','d',')',0,
   '.','t','a','r',' ','0','1',';','3','1',0,
   '.','t','g','z',' ','0','1',';','3','1',0,
+  '.','a','r','c',' ','0','1',';','3','1',0,
   '.','a','r','j',' ','0','1',';','3','1',0,
   '.','t','a','z',' ','0','1',';','3','1',0,
+  '.','l','h','a',' ','0','1',';','3','1',0,
+  '.','l','z','4',' ','0','1',';','3','1',0,
   '.','l','z','h',' ','0','1',';','3','1',0,
   '.','l','z','m','a',' ','0','1',';','3','1',0,
   '.','t','l','z',' ','0','1',';','3','1',0,
   '.','t','x','z',' ','0','1',';','3','1',0,
+  '.','t','z','o',' ','0','1',';','3','1',0,
+  '.','t','7','z',' ','0','1',';','3','1',0,
   '.','z','i','p',' ','0','1',';','3','1',0,
   '.','z',' ','0','1',';','3','1',0,
   '.','Z',' ','0','1',';','3','1',0,
   '.','d','z',' ','0','1',';','3','1',0,
   '.','g','z',' ','0','1',';','3','1',0,
+  '.','l','r','z',' ','0','1',';','3','1',0,
   '.','l','z',' ','0','1',';','3','1',0,
+  '.','l','z','o',' ','0','1',';','3','1',0,
   '.','x','z',' ','0','1',';','3','1',0,
   '.','b','z','2',' ','0','1',';','3','1',0,
   '.','b','z',' ','0','1',';','3','1',0,
@@ -131,11 +141,13 @@ static char const G_line[] =
   '.','e','a','r',' ','0','1',';','3','1',0,
   '.','s','a','r',' ','0','1',';','3','1',0,
   '.','r','a','r',' ','0','1',';','3','1',0,
+  '.','a','l','z',' ','0','1',';','3','1',0,
   '.','a','c','e',' ','0','1',';','3','1',0,
   '.','z','o','o',' ','0','1',';','3','1',0,
   '.','c','p','i','o',' ','0','1',';','3','1',0,
   '.','7','z',' ','0','1',';','3','1',0,
   '.','r','z',' ','0','1',';','3','1',0,
+  '.','c','a','b',' ','0','1',';','3','1',0,
   '#',' ','i','m','a','g','e',' ','f','o','r','m','a','t','s',0,
   '.','j','p','g',' ','0','1',';','3','5',0,
   '.','j','p','e','g',' ','0','1',';','3','5',0,
@@ -191,6 +203,7 @@ static char const G_line[] =
   '.','a','a','c',' ','0','0',';','3','6',0,
   '.','a','u',' ','0','0',';','3','6',0,
   '.','f','l','a','c',' ','0','0',';','3','6',0,
+  '.','m','4','a',' ','0','0',';','3','6',0,
   '.','m','i','d',' ','0','0',';','3','6',0,
   '.','m','i','d','i',' ','0','0',';','3','6',0,
   '.','m','k','a',' ','0','0',';','3','6',0,
diff --git a/src/dircolors.hin b/src/dircolors.hin
index 6dfd1136..89ebf5a1 100644
--- a/src/dircolors.hin
+++ b/src/dircolors.hin
@@ -1,7 +1,7 @@
 # Configuration file for dircolors, a utility to help you set the
 # LS_COLORS environment variable used by GNU ls with the --color option.
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 # Copying and distribution of this file, with or without modification,
 # are permitted provided the copyright notice and this notice are preserved.
 
@@ -29,14 +29,17 @@ TERM dtterm
 TERM eterm-color
 TERM gnome
 TERM gnome-256color
+TERM hurd
 TERM jfbterm
 TERM konsole
 TERM kterm
 TERM linux
 TERM linux-c
 TERM mach-color
+TERM mach-gnu-color
 TERM mlterm
 TERM putty
+TERM putty-256color
 TERM rxvt
 TERM rxvt-256color
 TERM rxvt-cygwin
@@ -112,18 +115,25 @@ EXEC 01;32
  # archives or compressed (bright red)
 .tar 01;31
 .tgz 01;31
+.arc 01;31
 .arj 01;31
 .taz 01;31
+.lha 01;31
+.lz4 01;31
 .lzh 01;31
 .lzma 01;31
 .tlz 01;31
 .txz 01;31
+.tzo 01;31
+.t7z 01;31
 .zip 01;31
 .z   01;31
 .Z   01;31
 .dz  01;31
 .gz  01;31
+.lrz 01;31
 .lz  01;31
+.lzo 01;31
 .xz  01;31
 .bz2 01;31
 .bz  01;31
@@ -137,11 +147,13 @@ EXEC 01;32
 .ear 01;31
 .sar 01;31
 .rar 01;31
+.alz 01;31
 .ace 01;31
 .zoo 01;31
 .cpio 01;31
 .7z  01;31
 .rz  01;31
+.cab 01;31
 
 # image formats
 .jpg 01;35
@@ -200,6 +212,7 @@ EXEC 01;32
 .aac 00;36
 .au 00;36
 .flac 00;36
+.m4a 00;36
 .mid 00;36
 .midi 00;36
 .mka 00;36
diff --git a/src/dirname.c b/src/dirname.c
index 94eec9de..e0599a36 100644
--- a/src/dirname.c
+++ b/src/dirname.c
@@ -1,6 +1,6 @@
 /* dirname -- strip suffix from file name
 
-   Copyright (C) 1990-2013 Free Software Foundation, Inc.
+   Copyright (C) 1990-2014 Free Software Foundation, Inc.
 
    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
@@ -57,7 +57,7 @@ removed; if NAME contains no /'s, output '.' (meaning the current directory).\n\
 \n\
 "), stdout);
       fputs (_("\
-  -z, --zero     separate output with NUL rather than newline\n\
+  -z, --zero     end each output line with NUL, not newline\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
diff --git a/src/du.c b/src/du.c
index a80a1770..0966326b 100644
--- a/src/du.c
+++ b/src/du.c
@@ -1,5 +1,5 @@
 /* du -- summarize disk usage
-   Copyright (C) 1988-2013 Free Software Foundation, Inc.
+   Copyright (C) 1988-2014 Free Software Foundation, Inc.
 
    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
@@ -78,6 +78,9 @@ struct duinfo
   /* Size of files in directory.  */
   uintmax_t size;
 
+  /* Number of inodes in directory.  */
+  uintmax_t inodes;
+
   /* Latest time stamp found.  If tmax.tv_sec == TYPE_MINIMUM (time_t)
      && tmax.tv_nsec < 0, no time stamp has been found.  */
   struct timespec tmax;
@@ -88,6 +91,7 @@ static inline void
 duinfo_init (struct duinfo *a)
 {
   a->size = 0;
+  a->inodes = 0;
   a->tmax.tv_sec = TYPE_MINIMUM (time_t);
   a->tmax.tv_nsec = -1;
 }
@@ -97,6 +101,7 @@ static inline void
 duinfo_set (struct duinfo *a, uintmax_t size, struct timespec tmax)
 {
   a->size = size;
+  a->inodes = 1;
   a->tmax = tmax;
 }
 
@@ -106,6 +111,7 @@ duinfo_add (struct duinfo *a, struct duinfo const *b)
 {
   uintmax_t sum = a->size + b->size;
   a->size = a->size <= sum ? sum : UINTMAX_MAX;
+  a->inodes = a->inodes + b->inodes;
   if (timespec_cmp (a->tmax, b->tmax) < 0)
     a->tmax = b->tmax;
 }
@@ -154,6 +160,9 @@ static intmax_t opt_threshold = 0;
 /* Human-readable options for output.  */
 static int human_output_opts;
 
+/* Output inodes count instead of blocks used.  */
+static bool opt_inodes = false;
+
 /* If true, print most recently modified date, using the specified format.  */
 static bool opt_time = false;
 
@@ -197,7 +206,8 @@ enum
   HUMAN_SI_OPTION,
   FTS_DEBUG,
   TIME_OPTION,
-  TIME_STYLE_OPTION
+  TIME_STYLE_OPTION,
+  INODES_OPTION
 };
 
 static struct option const long_options[] =
@@ -214,6 +224,7 @@ static struct option const long_options[] =
   {"exclude-from", required_argument, NULL, 'X'},
   {"files0-from", required_argument, NULL, FILES0_FROM_OPTION},
   {"human-readable", no_argument, NULL, 'h'},
+  {"inodes", no_argument, NULL, INODES_OPTION},
   {"si", no_argument, NULL, HUMAN_SI_OPTION},
   {"max-depth", required_argument, NULL, 'd'},
   {"null", no_argument, NULL, '0'},
@@ -278,7 +289,7 @@ Summarize disk usage of each FILE, recursively for directories.\n\
       emit_mandatory_arg_note ();
 
       fputs (_("\
-  -0, --null            end each output line with 0 byte rather than newline\n\
+  -0, --null            end each output line with NUL, not newline\n\
   -a, --all             write counts for all files, not just directories\n\
       --apparent-size   print apparent sizes, rather than disk usage; although\
 \n\
@@ -287,9 +298,9 @@ Summarize disk usage of each FILE, recursively for directories.\n\
                           fragmentation, indirect blocks, and the like\n\
 "), stdout);
       fputs (_("\
-  -B, --block-size=SIZE  scale sizes by SIZE before printing them.  E.g.,\n\
-                           '-BM' prints sizes in units of 1,048,576 bytes.\n\
-                           See SIZE format below.\n\
+  -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n\
+                           '-BM' prints sizes in units of 1,048,576 bytes;\n\
+                           see SIZE format below\n\
   -b, --bytes           equivalent to '--apparent-size --block-size=1'\n\
   -c, --total           produce a grand total\n\
   -D, --dereference-args  dereference only symlinks that are listed on the\n\
@@ -300,12 +311,13 @@ Summarize disk usage of each FILE, recursively for directories.\n\
                           --summarize\n\
 "), stdout);
       fputs (_("\
-      --files0-from=F   summarize disk usage of the NUL-terminated file\n\
-                          names specified in file F;\n\
-                          If F is - then read names from standard input\n\
+      --files0-from=F   summarize disk usage of the\n\
+                          NUL-terminated file names specified in file F;\n\
+                          if F is -, then read names from standard input\n\
   -H                    equivalent to --dereference-args (-D)\n\
   -h, --human-readable  print sizes in human readable format (e.g., 1K 234M 2G)\
 \n\
+      --inodes          list inode usage information instead of block usage\n\
 "), stdout);
       fputs (_("\
   -k                    like --block-size=1K\n\
@@ -315,7 +327,7 @@ Summarize disk usage of each FILE, recursively for directories.\n\
 "), stdout);
       fputs (_("\
   -P, --no-dereference  don't follow any symbolic links (this is the default)\n\
-  -S, --separate-dirs   do not include size of subdirectories\n\
+  -S, --separate-dirs   for directories do not include size of subdirectories\n\
       --si              like -h, but use powers of 1000 not 1024\n\
   -s, --summarize       display only a total for each argument\n\
 "), stdout);
@@ -326,9 +338,9 @@ Summarize disk usage of each FILE, recursively for directories.\n\
                           directory, or any of its subdirectories\n\
       --time=WORD       show time as WORD instead of modification time:\n\
                           atime, access, use, ctime or status\n\
-      --time-style=STYLE  show times using style STYLE:\n\
-                          full-iso, long-iso, iso, +FORMAT\n\
-                          FORMAT is interpreted like 'date'\n\
+      --time-style=STYLE  show times using STYLE, which can be:\n\
+                            full-iso, long-iso, iso, or +FORMAT;\n\
+                            FORMAT is interpreted like in 'date'\n\
 "), stdout);
       fputs (_("\
   -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n\
@@ -394,7 +406,10 @@ print_only_size (uintmax_t n_bytes)
 static void
 print_size (const struct duinfo *pdui, const char *string)
 {
-  print_only_size (pdui->size);
+  print_only_size (opt_inodes
+                   ? pdui->inodes
+                   : pdui->size);
+
   if (opt_time)
     {
       putchar ('\t');
@@ -499,15 +514,11 @@ process_file (FTS *fts, FTSENT *ent)
           break;
 
         case FTS_DC:
-          if (cycle_warning_required (fts, ent))
+          /* If not following symlinks and not a (bind) mount point.  */
+          if (cycle_warning_required (fts, ent)
+              && ! di_set_lookup (di_mnt, sb->st_dev, sb->st_ino))
             {
-              /* If this is a mount point, then diagnose it and avoid
-                 the cycle.  */
-              if (di_set_lookup (di_mnt, sb->st_dev, sb->st_ino))
-                error (0, 0, _("mount point %s already traversed"),
-                       quote (file));
-              else
-                emit_cycle_warning (file);
+              emit_cycle_warning (file);
               return false;
             }
           return true;
@@ -589,9 +600,10 @@ process_file (FTS *fts, FTSENT *ent)
       || level == 0)
     {
       /* Print or elide this entry according to the --threshold option.  */
+      uintmax_t v = opt_inodes ? dui_to_print.inodes : dui_to_print.size;
       if (opt_threshold < 0
-          ? dui_to_print.size <= -opt_threshold
-          : dui_to_print.size >= opt_threshold)
+          ? v <= -opt_threshold
+          : v >= opt_threshold)
         print_size (&dui_to_print, file);
     }
 
@@ -670,12 +682,7 @@ fill_mount_table (void)
 
       mnt_free = mnt_ent;
       mnt_ent = mnt_ent->me_next;
-
-      free (mnt_free->me_devname);
-      free (mnt_free->me_mountdir);
-      if (mnt_free->me_type_malloced)
-        free (mnt_free->me_type);
-      free (mnt_free);
+      free_mount_entry (mnt_free);
     }
 }
 
@@ -858,6 +865,10 @@ main (int argc, char **argv)
           add_exclude (exclude, optarg, EXCLUDE_WILDCARDS);
           break;
 
+        case INODES_OPTION:
+          opt_inodes = true;
+          break;
+
         case TIME_OPTION:
           opt_time = true;
           time_type =
@@ -904,6 +915,16 @@ main (int argc, char **argv)
   if (opt_summarize_only)
     max_depth = 0;
 
+  if (opt_inodes)
+    {
+      if (apparent_size)
+        {
+          error (0, 0, _("warning: options --apparent-size and -b are "
+                         "ineffective with --inodes"));
+        }
+      output_block_size = 1;
+    }
+
   /* Process time style if printing last times.  */
   if (opt_time)
     {
diff --git a/src/echo.c b/src/echo.c
index 58e69751..93f4a820 100644
--- a/src/echo.c
+++ b/src/echo.c
@@ -1,5 +1,5 @@
 /* echo.c, derived from code echo.c in Bash.
-   Copyright (C) 1987-2013 Free Software Foundation, Inc.
+   Copyright (C) 1987-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/env.c b/src/env.c
index c31d1658..2b37d986 100644
--- a/src/env.c
+++ b/src/env.c
@@ -1,5 +1,5 @@
 /* env - run a program in a modified environment
-   Copyright (C) 1986-2013 Free Software Foundation, Inc.
+   Copyright (C) 1986-2014 Free Software Foundation, Inc.
 
    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
@@ -60,7 +60,7 @@ Set each NAME to VALUE in the environment and run COMMAND.\n\
 
       fputs (_("\
   -i, --ignore-environment  start with an empty environment\n\
-  -0, --null           end each output line with 0 byte rather than newline\n\
+  -0, --null           end each output line with NUL, not newline\n\
   -u, --unset=NAME     remove variable from the environment\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
diff --git a/src/expand.c b/src/expand.c
index 0b12b025..082b5d4e 100644
--- a/src/expand.c
+++ b/src/expand.c
@@ -1,5 +1,5 @@
 /* expand - convert tabs to spaces
-   Copyright (C) 1989-2013 Free Software Foundation, Inc.
+   Copyright (C) 1989-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/expr.c b/src/expr.c
index b4fa808a..a97663a1 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -1,5 +1,5 @@
 /* expr -- evaluate expressions.
-   Copyright (C) 1986-2013 Free Software Foundation, Inc.
+   Copyright (C) 1986-2014 Free Software Foundation, Inc.
 
    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
@@ -44,8 +44,6 @@
    int, the widest unsigned type that GMP supports.  */
 verify (SIZE_MAX <= ULONG_MAX);
 
-static void integer_overflow (char) ATTRIBUTE_NORETURN;
-
 #ifndef HAVE_GMP
 # define HAVE_GMP 0
 #endif
@@ -53,6 +51,7 @@ static void integer_overflow (char) ATTRIBUTE_NORETURN;
 #if HAVE_GMP
 # include <gmp.h>
 #else
+static void integer_overflow (char) ATTRIBUTE_NORETURN;
 /* Approximate gmp.h well enough for expr.c's purposes.  */
 typedef intmax_t mpz_t[1];
 static void mpz_clear (mpz_t z) { (void) z; }
@@ -278,6 +277,7 @@ syntax_error (void)
   error (EXPR_INVALID, 0, _("syntax error"));
 }
 
+#if ! HAVE_GMP
 /* Report an integer overflow for operation OP and exit.  */
 static void
 integer_overflow (char op)
@@ -285,15 +285,7 @@ integer_overflow (char op)
   error (EXPR_FAILURE, ERANGE, "%c", op);
   abort (); /* notreached */
 }
-
-static void die (int errno_val, char const *msg)
-  ATTRIBUTE_NORETURN;
-static void
-die (int errno_val, char const *msg)
-{
-  error (EXPR_FAILURE, errno_val, "%s", msg);
-  abort (); /* notreached */
-}
+#endif
 
 int
 main (int argc, char **argv)
diff --git a/src/extent-scan.c b/src/extent-scan.c
index 5d25b9aa..805997a7 100644
--- a/src/extent-scan.c
+++ b/src/extent-scan.c
@@ -1,5 +1,5 @@
 /* extent-scan.c -- core functions for scanning extents
-   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -28,9 +28,7 @@
 #include "xstrtol.h"
 
 
-/* Work around Linux kernel issues on BTRFS and EXT4 before 2.6.39.
-   FIXME: remove in 2013, or whenever we're pretty confident
-   that the offending, unpatched kernels are no longer in use.  */
+/* Work around Linux kernel issues on BTRFS and EXT4.  */
 static bool
 extent_need_sync (void)
 {
@@ -218,7 +216,7 @@ extent_scan_read (struct extent_scan *scan)
 }
 #else
 extern bool
-extent_scan_read (struct extent_scan *scan ATTRIBUTE_UNUSED)
+extent_scan_read (struct extent_scan *scan _GL_UNUSED)
 {
   scan->initial_scan_failed = true;
   errno = ENOTSUP;
diff --git a/src/extent-scan.h b/src/extent-scan.h
index c2c318c9..fa800343 100644
--- a/src/extent-scan.h
+++ b/src/extent-scan.h
@@ -1,5 +1,5 @@
 /* core functions for efficient reading sparse files
-   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/extract-magic b/src/extract-magic
index 98e9d871..5b6f6185 100644
--- a/src/extract-magic
+++ b/src/extract-magic
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 # Derive #define directives from specially formatted 'case ...:' statements.
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/src/factor.c b/src/factor.c
index 8f1542a2..63924d54 100644
--- a/src/factor.c
+++ b/src/factor.c
@@ -1,5 +1,5 @@
 /* factor -- print prime factors of n.
-   Copyright (C) 1986-2013 Free Software Foundation, Inc.
+   Copyright (C) 1986-2014 Free Software Foundation, Inc.
 
    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
@@ -689,22 +689,6 @@ verify (W <= WIDE_UINT_BITS);
    This flag is used only in the GMP code.  */
 static bool dev_debug = false;
 
-/* Like error(0, 0, ...), but without an implicit newline.
-   Also a noop unless the global DEV_DEBUG is set.
-   TODO: Replace with variadic macro in system.h or
-   move to a separate module.  */
-static inline void
-devmsg (char const *fmt, ...)
-{
-  if (dev_debug)
-    {
-      va_list ap;
-      va_start (ap, fmt);
-      vfprintf (stderr, fmt, ap);
-      va_end (ap);
-    }
-}
-
 /* Prove primality or run probabilistic tests.  */
 static bool flag_prove_primality = true;
 
@@ -791,7 +775,7 @@ factor_using_division (uintmax_t *t1p, uintmax_t t1, uintmax_t t0,
     {
       for (;;)
         {
-          uintmax_t q1, q0, hi, lo ATTRIBUTE_UNUSED;
+          uintmax_t q1, q0, hi, lo _GL_UNUSED;
 
           q0 = t0 * primes_dtab[i].binv;
           umul_ppmm (hi, lo, q0, p);
@@ -933,7 +917,7 @@ static const unsigned char  binvert_table[128] =
     _q0 = (u0) * _di;                                                   \
     if ((u1) >= (d))                                                    \
       {                                                                 \
-        uintmax_t _p1, _p0 ATTRIBUTE_UNUSED;                            \
+        uintmax_t _p1, _p0 _GL_UNUSED;                            \
         umul_ppmm (_p1, _p0, _q0, d);                                   \
         (q1) = ((u1) - _p1) * _di;                                      \
         (q0) = _q0;                                                     \
@@ -948,7 +932,7 @@ static const unsigned char  binvert_table[128] =
 /* x B (mod n). */
 #define redcify(r_prim, r, n)                                           \
   do {                                                                  \
-    uintmax_t _redcify_q ATTRIBUTE_UNUSED;                              \
+    uintmax_t _redcify_q _GL_UNUSED;                              \
     udiv_qrnnd (_redcify_q, r_prim, r, 0, n);                           \
   } while (0)
 
@@ -981,7 +965,7 @@ static const unsigned char  binvert_table[128] =
 static inline uintmax_t
 mulredc (uintmax_t a, uintmax_t b, uintmax_t m, uintmax_t mi)
 {
-  uintmax_t rh, rl, q, th, tl ATTRIBUTE_UNUSED, xh;
+  uintmax_t rh, rl, q, th, tl _GL_UNUSED, xh;
 
   umul_ppmm (rh, rl, a, b);
   q = rl * mi;
@@ -1001,7 +985,7 @@ mulredc2 (uintmax_t *r1p,
           uintmax_t a1, uintmax_t a0, uintmax_t b1, uintmax_t b0,
           uintmax_t m1, uintmax_t m0, uintmax_t mi)
 {
-  uintmax_t r1, r0, q, p1, p0 ATTRIBUTE_UNUSED, t1, t0, s1, s0;
+  uintmax_t r1, r0, q, p1, p0 _GL_UNUSED, t1, t0, s1, s0;
   mi = -mi;
   assert ( (a1 >> (W_TYPE_SIZE - 1)) == 0);
   assert ( (b1 >> (W_TYPE_SIZE - 1)) == 0);
@@ -1271,7 +1255,7 @@ prime_p (uintmax_t n)
           a_prim = s0 % n;
         else
           {
-            uintmax_t dummy ATTRIBUTE_UNUSED;
+            uintmax_t dummy _GL_UNUSED;
             udiv_qrnnd (dummy, a_prim, s1, s0, n);
           }
       }
@@ -1803,7 +1787,7 @@ isqrt2 (uintmax_t nh, uintmax_t nl)
   /* Do we need more than one iteration? */
   for (;;)
     {
-      uintmax_t r ATTRIBUTE_UNUSED;
+      uintmax_t r _GL_UNUSED;
       uintmax_t q, y;
       udiv_qrnnd (q, r, nh, nl, x);
       y = (x + q) / 2;
diff --git a/src/find-mount-point.c b/src/find-mount-point.c
index 662e46fc..869d81c6 100644
--- a/src/find-mount-point.c
+++ b/src/find-mount-point.c
@@ -1,5 +1,5 @@
 /* find-mount-point.c -- find the root mount point for a file.
-   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/find-mount-point.h b/src/find-mount-point.h
index 52213db7..c8a66dd8 100644
--- a/src/find-mount-point.h
+++ b/src/find-mount-point.h
@@ -1,5 +1,5 @@
 /* find-mount-point.h -- find the root mount point for a file.
-   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/fmt.c b/src/fmt.c
index d3f53690..dbd180b4 100644
--- a/src/fmt.c
+++ b/src/fmt.c
@@ -1,5 +1,5 @@
 /* GNU fmt -- simple text formatter.
-   Copyright (C) 1994-2013 Free Software Foundation, Inc.
+   Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/fold.c b/src/fold.c
index e2358651..444dc8b4 100644
--- a/src/fold.c
+++ b/src/fold.c
@@ -1,5 +1,5 @@
 /* fold -- wrap each input line to fit in specified width.
-   Copyright (C) 1991-2013 Free Software Foundation, Inc.
+   Copyright (C) 1991-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/fs-is-local.h b/src/fs-is-local.h
index f44f1e72..2a7deee0 100644
--- a/src/fs-is-local.h
+++ b/src/fs-is-local.h
@@ -22,16 +22,20 @@ is_local_fs_type (unsigned long int magic)
       case S_MAGIC_CIFS: return 0;
       case S_MAGIC_CODA: return 0;
       case S_MAGIC_COH: return 1;
+      case S_MAGIC_CONFIGFS: return 1;
       case S_MAGIC_CRAMFS: return 1;
       case S_MAGIC_CRAMFS_WEND: return 1;
       case S_MAGIC_DEBUGFS: return 1;
       case S_MAGIC_DEVFS: return 1;
       case S_MAGIC_DEVPTS: return 1;
       case S_MAGIC_ECRYPTFS: return 1;
+      case S_MAGIC_EFIVARFS: return 1;
       case S_MAGIC_EFS: return 1;
+      case S_MAGIC_EXOFS: return 1;
       case S_MAGIC_EXT: return 1;
       case S_MAGIC_EXT2: return 1;
       case S_MAGIC_EXT2_OLD: return 1;
+      case S_MAGIC_F2FS: return 1;
       case S_MAGIC_FAT: return 1;
       case S_MAGIC_FHGFS: return 0;
       case S_MAGIC_FUSEBLK: return 0;
@@ -40,6 +44,9 @@ is_local_fs_type (unsigned long int magic)
       case S_MAGIC_GFS: return 0;
       case S_MAGIC_GPFS: return 0;
       case S_MAGIC_HFS: return 1;
+      case S_MAGIC_HFS_PLUS: return 1;
+      case S_MAGIC_HFS_X: return 1;
+      case S_MAGIC_HOSTFS: return 1;
       case S_MAGIC_HPFS: return 1;
       case S_MAGIC_HUGETLBFS: return 1;
       case S_MAGIC_MTD_INODE_FS: return 1;
@@ -51,6 +58,7 @@ is_local_fs_type (unsigned long int magic)
       case S_MAGIC_JFFS2: return 1;
       case S_MAGIC_JFS: return 1;
       case S_MAGIC_KAFS: return 0;
+      case S_MAGIC_LOGFS: return 1;
       case S_MAGIC_LUSTRE: return 0;
       case S_MAGIC_MINIX: return 1;
       case S_MAGIC_MINIX_30: return 1;
@@ -78,20 +86,23 @@ is_local_fs_type (unsigned long int magic)
       case S_MAGIC_RPC_PIPEFS: return 1;
       case S_MAGIC_SECURITYFS: return 1;
       case S_MAGIC_SELINUX: return 1;
+      case S_MAGIC_SMACK: return 1;
       case S_MAGIC_SMB: return 0;
+      case S_MAGIC_SNFS: return 0;
       case S_MAGIC_SOCKFS: return 1;
       case S_MAGIC_SQUASHFS: return 1;
       case S_MAGIC_SYSFS: return 1;
       case S_MAGIC_SYSV2: return 1;
       case S_MAGIC_SYSV4: return 1;
       case S_MAGIC_TMPFS: return 1;
+      case S_MAGIC_UBIFS: return 1;
       case S_MAGIC_UDF: return 1;
       case S_MAGIC_UFS: return 1;
       case S_MAGIC_UFS_BYTESWAPPED: return 1;
       case S_MAGIC_USBDEVFS: return 1;
       case S_MAGIC_V9FS: return 1;
       case S_MAGIC_VMHGFS: return 0;
-      case S_MAGIC_VXFS: return 1;
+      case S_MAGIC_VXFS: return 0;
       case S_MAGIC_VZFS: return 1;
       case S_MAGIC_XENFS: return 1;
       case S_MAGIC_XENIX: return 1;
diff --git a/src/fs.h b/src/fs.h
index 721f1516..4ed73c60 100644
--- a/src/fs.h
+++ b/src/fs.h
@@ -19,24 +19,31 @@
 # define S_MAGIC_CIFS 0xFF534D42
 # define S_MAGIC_CODA 0x73757245
 # define S_MAGIC_COH 0x012FF7B7
+# define S_MAGIC_CONFIGFS 0x62656570
 # define S_MAGIC_CRAMFS 0x28CD3D45
 # define S_MAGIC_CRAMFS_WEND 0x453DCD28
 # define S_MAGIC_DEBUGFS 0x64626720
 # define S_MAGIC_DEVFS 0x1373
 # define S_MAGIC_DEVPTS 0x1CD1
 # define S_MAGIC_ECRYPTFS 0xF15F
+# define S_MAGIC_EFIVARFS 0xDE5E81E4
 # define S_MAGIC_EFS 0x00414A53
+# define S_MAGIC_EXOFS 0x5DF5
 # define S_MAGIC_EXT 0x137D
 # define S_MAGIC_EXT2 0xEF53
 # define S_MAGIC_EXT2_OLD 0xEF51
+# define S_MAGIC_F2FS 0xF2F52010
 # define S_MAGIC_FAT 0x4006
 # define S_MAGIC_FHGFS 0x19830326
 # define S_MAGIC_FUSEBLK 0x65735546
 # define S_MAGIC_FUSECTL 0x65735543
 # define S_MAGIC_FUTEXFS 0x0BAD1DEA
-# define S_MAGIC_GFS 0x1161970
+# define S_MAGIC_GFS 0x01161970
 # define S_MAGIC_GPFS 0x47504653
 # define S_MAGIC_HFS 0x4244
+# define S_MAGIC_HFS_PLUS 0x482B
+# define S_MAGIC_HFS_X 0x4858
+# define S_MAGIC_HOSTFS 0x00C0FFEE
 # define S_MAGIC_HPFS 0xF995E849
 # define S_MAGIC_HUGETLBFS 0x958458F6
 # define S_MAGIC_MTD_INODE_FS 0x11307854
@@ -48,6 +55,7 @@
 # define S_MAGIC_JFFS2 0x72B6
 # define S_MAGIC_JFS 0x3153464A
 # define S_MAGIC_KAFS 0x6B414653
+# define S_MAGIC_LOGFS 0xC97E8168
 # define S_MAGIC_LUSTRE 0x0BD00BD0
 # define S_MAGIC_MINIX 0x137F
 # define S_MAGIC_MINIX_30 0x138F
@@ -62,7 +70,7 @@
 # define S_MAGIC_NILFS 0x3434
 # define S_MAGIC_NTFS 0x5346544E
 # define S_MAGIC_OPENPROM 0x9FA1
-# define S_MAGIC_OCFS2 0x7461636f
+# define S_MAGIC_OCFS2 0x7461636F
 # define S_MAGIC_PANFS 0xAAD7AAEA
 # define S_MAGIC_PIPEFS 0x50495045
 # define S_MAGIC_PROC 0x9FA0
@@ -75,13 +83,16 @@
 # define S_MAGIC_RPC_PIPEFS 0x67596969
 # define S_MAGIC_SECURITYFS 0x73636673
 # define S_MAGIC_SELINUX 0xF97CFF8C
+# define S_MAGIC_SMACK 0x43415D53
 # define S_MAGIC_SMB 0x517B
+# define S_MAGIC_SNFS 0xBEEFDEAD
 # define S_MAGIC_SOCKFS 0x534F434B
 # define S_MAGIC_SQUASHFS 0x73717368
 # define S_MAGIC_SYSFS 0x62656572
 # define S_MAGIC_SYSV2 0x012FF7B6
 # define S_MAGIC_SYSV4 0x012FF7B5
 # define S_MAGIC_TMPFS 0x01021994
+# define S_MAGIC_UBIFS 0x24051905
 # define S_MAGIC_UDF 0x15013346
 # define S_MAGIC_UFS 0x00011954
 # define S_MAGIC_UFS_BYTESWAPPED 0x54190100
diff --git a/src/getlimits.c b/src/getlimits.c
index 7c1fbe26..597efd82 100644
--- a/src/getlimits.c
+++ b/src/getlimits.c
@@ -1,5 +1,5 @@
 /* getlimits - print various platform dependent limits.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
@@ -21,6 +21,7 @@
 #include <sys/types.h>
 #include <float.h>
 
+#include "ftoastr.h"
 #include "system.h"
 #include "long-options.h"
 
@@ -97,6 +98,19 @@ decimal_absval_add_one (char *buf)
   return result;
 }
 
+#define PRINT_FLOATTYPE(N, T, FTOASTR, BUFSIZE)                         \
+static void                                                             \
+N (T x)                                                                 \
+{                                                                       \
+  char buf[BUFSIZE];                                                    \
+  FTOASTR (buf, sizeof buf, FTOASTR_LEFT_JUSTIFY, 0, x);                \
+  puts (buf);                                                           \
+}
+
+PRINT_FLOATTYPE (print_FLT, float, ftoastr, FLT_BUFSIZE_BOUND)
+PRINT_FLOATTYPE (print_DBL, double, dtoastr, DBL_BUFSIZE_BOUND)
+PRINT_FLOATTYPE (print_LDBL, long double, ldtoastr, LDBL_BUFSIZE_BOUND)
+
 int
 main (int argc, char **argv)
 {
@@ -127,8 +141,8 @@ main (int argc, char **argv)
     }
 
 #define print_float(TYPE)                                                \
-  printf (#TYPE"_MIN=%Le\n", (long double)TYPE##_MIN);                   \
-  printf (#TYPE"_MAX=%Le\n", (long double)TYPE##_MAX);
+  printf (#TYPE"_MIN="); print_##TYPE (TYPE##_MIN);                      \
+  printf (#TYPE"_MAX="); print_##TYPE (TYPE##_MAX);
 
   /* Variable sized ints */
   print_int (CHAR);
diff --git a/src/group-list.c b/src/group-list.c
index 7d4995b5..823384f5 100644
--- a/src/group-list.c
+++ b/src/group-list.c
@@ -1,5 +1,5 @@
 /* group-list.c --Print a list of group IDs or names.
-   Copyright (C) 1989-2013 Free Software Foundation, Inc.
+   Copyright (C) 1989-2014 Free Software Foundation, Inc.
 
    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
@@ -35,7 +35,7 @@
 extern bool
 print_group_list (const char *username,
                   uid_t ruid, gid_t rgid, gid_t egid,
-                  bool use_names)
+                  bool use_names, char delim)
 {
   bool ok = true;
   struct passwd *pwd = NULL;
@@ -52,7 +52,7 @@ print_group_list (const char *username,
 
   if (egid != rgid)
     {
-      putchar (' ');
+      putchar (delim);
       if (!print_group (egid, use_names))
         ok = false;
     }
@@ -79,7 +79,7 @@ print_group_list (const char *username,
     for (i = 0; i < n_groups; i++)
       if (groups[i] != rgid && groups[i] != egid)
         {
-          putchar (' ');
+          putchar (delim);
           if (!print_group (groups[i], use_names))
             ok = false;
         }
diff --git a/src/group-list.h b/src/group-list.h
index 3fac8871..806f78fd 100644
--- a/src/group-list.h
+++ b/src/group-list.h
@@ -1,6 +1,6 @@
 /* group-list.h -- prototypes shared by id and groups.
 
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
@@ -16,4 +16,4 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 bool print_group (gid_t, bool);
-bool print_group_list (const char *, uid_t, gid_t, gid_t, bool);
+bool print_group_list (const char *, uid_t, gid_t, gid_t, bool, char);
diff --git a/src/groups.c b/src/groups.c
index 53332d56..f19ff0ac 100644
--- a/src/groups.c
+++ b/src/groups.c
@@ -1,5 +1,5 @@
 /* groups -- print the groups a user is in
-   Copyright (C) 1989-2013 Free Software Foundation, Inc.
+   Copyright (C) 1989-2014 Free Software Foundation, Inc.
 
    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
@@ -114,13 +114,13 @@ main (int argc, char **argv)
       if (rgid == NO_GID && errno)
         error (EXIT_FAILURE, errno, _("cannot get real GID"));
 
-      if (!print_group_list (NULL, ruid, rgid, egid, true))
+      if (!print_group_list (NULL, ruid, rgid, egid, true, ' '))
         ok = false;
       putchar ('\n');
     }
   else
     {
-      /* At least one argument.  Divulge the details of the specified users. */
+      /* At least one argument.  Divulge the details of the specified users.  */
       while (optind < argc)
         {
           struct passwd *pwd = getpwnam (argv[optind]);
@@ -130,7 +130,7 @@ main (int argc, char **argv)
           rgid = egid = pwd->pw_gid;
 
           printf ("%s : ", argv[optind]);
-          if (!print_group_list (argv[optind++], ruid, rgid, egid, true))
+          if (!print_group_list (argv[optind++], ruid, rgid, egid, true, ' '))
             ok = false;
           putchar ('\n');
         }
diff --git a/src/head.c b/src/head.c
index d79d5f7d..65bd52a1 100644
--- a/src/head.c
+++ b/src/head.c
@@ -1,5 +1,5 @@
 /* head -- output first part of file(s)
-   Copyright (C) 1989-2013 Free Software Foundation, Inc.
+   Copyright (C) 1989-2014 Free Software Foundation, Inc.
 
    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
@@ -34,6 +34,7 @@
 #include "error.h"
 #include "full-read.h"
 #include "quote.h"
+#include "quotearg.h"
 #include "safe-read.h"
 #include "xfreopen.h"
 #include "xstrtol.h"
@@ -70,7 +71,6 @@ enum Copy_fd_status
   {
     COPY_FD_OK = 0,
     COPY_FD_READ_ERROR,
-    COPY_FD_WRITE_ERROR,
     COPY_FD_UNEXPECTED_EOF
   };
 
@@ -147,9 +147,6 @@ diagnose_copy_fd_failure (enum Copy_fd_status err, char const *filename)
     case COPY_FD_READ_ERROR:
       error (0, errno, _("error reading %s"), quote (filename));
       break;
-    case COPY_FD_WRITE_ERROR:
-      error (0, errno, _("error writing %s"), quote (filename));
-      break;
     case COPY_FD_UNEXPECTED_EOF:
       error (0, errno, _("%s: file has shrunk too much"), quote (filename));
       break;
@@ -167,11 +164,25 @@ write_header (const char *filename)
   first_file = false;
 }
 
-/* Copy no more than N_BYTES from file descriptor SRC_FD to O_STREAM.
-   Return an appropriate indication of success or failure. */
+/* Write N_BYTES from BUFFER to stdout.
+   Exit immediately on error with a single diagnostic.  */
+
+static void
+xwrite_stdout (char const *buffer, size_t n_bytes)
+{
+  if (n_bytes > 0 && fwrite (buffer, 1, n_bytes, stdout) < n_bytes)
+    {
+      clearerr (stdout); /* To avoid redundant close_stdout diagnostic.  */
+      error (EXIT_FAILURE, errno, _("error writing %s"),
+             quote ("standard output"));
+    }
+}
+
+/* Copy no more than N_BYTES from file descriptor SRC_FD to stdout.
+   Return an appropriate indication of success or read failure.  */
 
 static enum Copy_fd_status
-copy_fd (int src_fd, FILE *o_stream, uintmax_t n_bytes)
+copy_fd (int src_fd, uintmax_t n_bytes)
 {
   char buf[BUFSIZ];
   const size_t buf_size = sizeof (buf);
@@ -189,14 +200,13 @@ copy_fd (int src_fd, FILE *o_stream, uintmax_t n_bytes)
       if (n_read == 0 && n_bytes != 0)
         return COPY_FD_UNEXPECTED_EOF;
 
-      if (fwrite (buf, 1, n_read, o_stream) < n_read)
-        return COPY_FD_WRITE_ERROR;
+      xwrite_stdout (buf, n_read);
     }
 
   return COPY_FD_OK;
 }
 
-/* Print all but the last N_ELIDE lines from the input available via
+/* Print all but the last N_ELIDE bytes from the input available via
    the non-seekable file descriptor FD.  Return true upon success.
    Give a diagnostic and return false upon error.  */
 static bool
@@ -282,22 +292,12 @@ elide_tail_bytes_pipe (const char *filename, int fd, uintmax_t n_elide_0)
 
           /* Output any (but maybe just part of the) elided data from
              the previous round.  */
-          if ( ! first)
-            {
-              /* Don't bother checking for errors here.
-                 If there's a failure, the test of the following
-                 fwrite or in close_stdout will catch it.  */
-              fwrite (b[!i] + READ_BUFSIZE, 1, n_elide - delta, stdout);
-            }
+          if (! first)
+            xwrite_stdout (b[!i] + READ_BUFSIZE, n_elide - delta);
           first = false;
 
-          if (n_elide < n_read
-              && fwrite (b[i], 1, n_read - n_elide, stdout) < n_read - n_elide)
-            {
-              error (0, errno, _("write error"));
-              ok = false;
-              break;
-            }
+          if (n_elide < n_read)
+            xwrite_stdout (b[i], n_read - n_elide);
         }
 
       free (b[0]);
@@ -313,18 +313,34 @@ elide_tail_bytes_pipe (const char *filename, int fd, uintmax_t n_elide_0)
       size_t n_read;
       bool buffered_enough;
       size_t i, i_next;
-      char **b;
+      char **b = NULL;
       /* Round n_elide up to a multiple of READ_BUFSIZE.  */
       size_t rem = READ_BUFSIZE - (n_elide % READ_BUFSIZE);
       size_t n_elide_round = n_elide + rem;
       size_t n_bufs = n_elide_round / READ_BUFSIZE + 1;
-      b = xcalloc (n_bufs, sizeof *b);
+      size_t n_alloc = 0;
+      size_t n_array_alloc = 0;
 
       buffered_enough = false;
       for (i = 0, i_next = 1; !eof; i = i_next, i_next = (i_next + 1) % n_bufs)
         {
-          if (b[i] == NULL)
-            b[i] = xmalloc (READ_BUFSIZE);
+          if (n_array_alloc == i)
+            {
+              /* reallocate between 16 and n_bufs entries.  */
+              if (n_array_alloc == 0)
+                n_array_alloc = MIN (n_bufs, 16);
+              else if (n_array_alloc <= n_bufs / 2)
+                n_array_alloc *= 2;
+              else
+                n_array_alloc = n_bufs;
+              b = xnrealloc (b, n_array_alloc, sizeof *b);
+            }
+
+          if (! buffered_enough)
+            {
+              b[i] = xmalloc (READ_BUFSIZE);
+              n_alloc = i + 1;
+            }
           n_read = full_read (fd, b[i], READ_BUFSIZE);
           if (n_read < READ_BUFSIZE)
             {
@@ -341,14 +357,7 @@ elide_tail_bytes_pipe (const char *filename, int fd, uintmax_t n_elide_0)
             buffered_enough = true;
 
           if (buffered_enough)
-            {
-              if (fwrite (b[i_next], 1, n_read, stdout) < n_read)
-                {
-                  error (0, errno, _("write error"));
-                  ok = false;
-                  goto free_mem;
-                }
-            }
+            xwrite_stdout (b[i_next], n_read);
         }
 
       /* Output any remainder: rem bytes from b[i] + n_read.  */
@@ -359,12 +368,12 @@ elide_tail_bytes_pipe (const char *filename, int fd, uintmax_t n_elide_0)
               size_t n_bytes_left_in_b_i = READ_BUFSIZE - n_read;
               if (rem < n_bytes_left_in_b_i)
                 {
-                  fwrite (b[i] + n_read, 1, rem, stdout);
+                  xwrite_stdout (b[i] + n_read, rem);
                 }
               else
                 {
-                  fwrite (b[i] + n_read, 1, n_bytes_left_in_b_i, stdout);
-                  fwrite (b[i_next], 1, rem - n_bytes_left_in_b_i, stdout);
+                  xwrite_stdout (b[i] + n_read, n_bytes_left_in_b_i);
+                  xwrite_stdout (b[i_next], rem - n_bytes_left_in_b_i);
                 }
             }
           else if (i + 1 == n_bufs)
@@ -383,12 +392,12 @@ elide_tail_bytes_pipe (const char *filename, int fd, uintmax_t n_elide_0)
                */
               size_t y = READ_BUFSIZE - rem;
               size_t x = n_read - y;
-              fwrite (b[i_next], 1, x, stdout);
+              xwrite_stdout (b[i_next], x);
             }
         }
 
     free_mem:
-      for (i = 0; i < n_bufs; i++)
+      for (i = 0; i < n_alloc; i++)
         free (b[i]);
       free (b);
 
@@ -396,53 +405,53 @@ elide_tail_bytes_pipe (const char *filename, int fd, uintmax_t n_elide_0)
     }
 }
 
-/* Print all but the last N_ELIDE lines from the input available
-   via file descriptor FD.  Return true upon success.
+/* Call lseek (FD, OFFSET, WHENCE), where file descriptor FD
+   corresponds to the file FILENAME.  WHENCE must be SEEK_SET or
+   SEEK_CUR.  Return the resulting offset.  Give a diagnostic and
+   return -1 if lseek fails.  */
+
+static off_t
+elseek (int fd, off_t offset, int whence, char const *filename)
+{
+  off_t new_offset = lseek (fd, offset, whence);
+  char buf[INT_BUFSIZE_BOUND (offset)];
+
+  if (new_offset < 0)
+    error (0, errno,
+           _(whence == SEEK_SET
+             ? N_("%s: cannot seek to offset %s")
+             : N_("%s: cannot seek to relative offset %s")),
+           quotearg_colon (filename),
+           offtostr (offset, buf));
+
+  return new_offset;
+}
+
+/* For the file FILENAME with descriptor FD, output all but the last N_ELIDE
+   bytes.  If SIZE is nonnegative, this is a regular file positioned
+   at START_POS with SIZE bytes.  Return true on success.
    Give a diagnostic and return false upon error.  */
 
 /* NOTE: if the input file shrinks by more than N_ELIDE bytes between
    the length determination and the actual reading, then head fails.  */
 
 static bool
-elide_tail_bytes_file (const char *filename, int fd, uintmax_t n_elide)
+elide_tail_bytes_file (const char *filename, int fd, uintmax_t n_elide,
+                       off_t current_pos, off_t size)
 {
-  struct stat stats;
-
-  if (presume_input_pipe || fstat (fd, &stats) || ! S_ISREG (stats.st_mode))
-    {
-      return elide_tail_bytes_pipe (filename, fd, n_elide);
-    }
+  if (size < 0)
+    return elide_tail_bytes_pipe (filename, fd, n_elide);
   else
     {
-      off_t current_pos, end_pos;
-      uintmax_t bytes_remaining;
-      off_t diff;
-      enum Copy_fd_status err;
-
-      if ((current_pos = lseek (fd, 0, SEEK_CUR)) == -1
-          || (end_pos = lseek (fd, 0, SEEK_END)) == -1)
-        {
-          error (0, errno, _("cannot lseek %s"), quote (filename));
-          return false;
-        }
-
       /* Be careful here.  The current position may actually be
          beyond the end of the file.  */
-      bytes_remaining = (diff = end_pos - current_pos) < 0 ? 0 : diff;
+      off_t diff = size - current_pos;
+      off_t bytes_remaining = diff < 0 ? 0 : diff;
 
       if (bytes_remaining <= n_elide)
         return true;
 
-      /* Seek back to 'current' position, then copy the required
-         number of bytes from fd.  */
-      if (lseek (fd, 0, current_pos) == -1)
-        {
-          error (0, errno, _("%s: cannot lseek back to original position"),
-                 quote (filename));
-          return false;
-        }
-
-      err = copy_fd (fd, stdout, bytes_remaining - n_elide);
+      enum Copy_fd_status err = copy_fd (fd, bytes_remaining - n_elide);
       if (err == COPY_FD_OK)
         return true;
 
@@ -485,6 +494,13 @@ elide_tail_lines_pipe (const char *filename, int fd, uintmax_t n_elide)
       n_read = safe_read (fd, tmp->buffer, BUFSIZ);
       if (n_read == 0 || n_read == SAFE_READ_ERROR)
         break;
+
+      if (! n_elide)
+        {
+          xwrite_stdout (tmp->buffer, n_read);
+          continue;
+        }
+
       tmp->nbytes = n_read;
       tmp->nlines = 0;
       tmp->next = NULL;
@@ -520,7 +536,7 @@ elide_tail_lines_pipe (const char *filename, int fd, uintmax_t n_elide)
           last = last->next = tmp;
           if (n_elide < total_lines - first->nlines)
             {
-              fwrite (first->buffer, 1, first->nbytes, stdout);
+              xwrite_stdout (first->buffer, first->nbytes);
               tmp = first;
               total_lines -= first->nlines;
               first = first->next;
@@ -549,7 +565,7 @@ elide_tail_lines_pipe (const char *filename, int fd, uintmax_t n_elide)
 
   for (tmp = first; n_elide < total_lines - tmp->nlines; tmp = tmp->next)
     {
-      fwrite (tmp->buffer, 1, tmp->nbytes, stdout);
+      xwrite_stdout (tmp->buffer, tmp->nbytes);
       total_lines -= tmp->nlines;
     }
 
@@ -565,7 +581,7 @@ elide_tail_lines_pipe (const char *filename, int fd, uintmax_t n_elide)
           ++tmp->nlines;
           --n;
         }
-      fwrite (tmp->buffer, 1, p - tmp->buffer, stdout);
+      xwrite_stdout (tmp->buffer, p - tmp->buffer);
     }
 
 free_lbuffers:
@@ -579,10 +595,10 @@ free_lbuffers:
 }
 
 /* Output all but the last N_LINES lines of the input stream defined by
-   FD, START_POS, and END_POS.
+   FD, START_POS, and SIZE.
    START_POS is the starting position of the read pointer for the file
    associated with FD (may be nonzero).
-   END_POS is the file offset of EOF (one larger than offset of last byte).
+   SIZE is the file size in bytes.
    Return true upon success.
    Give a diagnostic and return false upon error.
 
@@ -592,11 +608,11 @@ free_lbuffers:
 static bool
 elide_tail_lines_seekable (const char *pretty_filename, int fd,
                            uintmax_t n_lines,
-                           off_t start_pos, off_t end_pos)
+                           off_t start_pos, off_t size)
 {
   char buffer[BUFSIZ];
   size_t bytes_read;
-  off_t pos = end_pos;
+  off_t pos = size;
 
   /* Set 'bytes_read' to the size of the last, probably partial, buffer;
      0 < 'bytes_read' <= 'BUFSIZ'.  */
@@ -606,13 +622,8 @@ elide_tail_lines_seekable (const char *pretty_filename, int fd,
   /* Make 'pos' a multiple of 'BUFSIZ' (0 if the file is short), so that all
      reads will be on block boundaries, which might increase efficiency.  */
   pos -= bytes_read;
-  if (lseek (fd, pos, SEEK_SET) < 0)
-    {
-      char offset_buf[INT_BUFSIZE_BOUND (pos)];
-      error (0, errno, _("%s: cannot seek to offset %s"),
-             pretty_filename, offtostr (pos, offset_buf));
-      return false;
-    }
+  if (elseek (fd, pos, SEEK_SET, pretty_filename) < 0)
+    return false;
   bytes_read = safe_read (fd, buffer, bytes_read);
   if (bytes_read == SAFE_READ_ERROR)
     {
@@ -620,8 +631,11 @@ elide_tail_lines_seekable (const char *pretty_filename, int fd,
       return false;
     }
 
+  /* n_lines == 0 case needs special treatment. */
+  const bool all_lines = !n_lines;
+
   /* Count the incomplete line on files that don't end with a newline.  */
-  if (bytes_read && buffer[bytes_read - 1] != '\n')
+  if (n_lines && bytes_read && buffer[bytes_read - 1] != '\n')
     --n_lines;
 
   while (1)
@@ -631,11 +645,16 @@ elide_tail_lines_seekable (const char *pretty_filename, int fd,
       size_t n = bytes_read;
       while (n)
         {
-          char const *nl;
-          nl = memrchr (buffer, '\n', n);
-          if (nl == NULL)
-            break;
-          n = nl - buffer;
+          if (all_lines)
+            n -= 1;
+          else
+            {
+              char const *nl;
+              nl = memrchr (buffer, '\n', n);
+              if (nl == NULL)
+                break;
+              n = nl - buffer;
+            }
           if (n_lines-- == 0)
             {
               /* Found it.  */
@@ -644,16 +663,10 @@ elide_tail_lines_seekable (const char *pretty_filename, int fd,
               if (start_pos < pos)
                 {
                   enum Copy_fd_status err;
-                  if (lseek (fd, start_pos, SEEK_SET) < 0)
-                    {
-                      /* Failed to reposition file pointer.  */
-                      error (0, errno,
-                         "%s: unable to restore file pointer to initial offset",
-                             quote (pretty_filename));
-                      return false;
-                    }
+                  if (elseek (fd, start_pos, SEEK_SET, pretty_filename) < 0)
+                    return false;
 
-                  err = copy_fd (fd, stdout, pos - start_pos);
+                  err = copy_fd (fd, pos - start_pos);
                   if (err != COPY_FD_OK)
                     {
                       diagnose_copy_fd_failure (err, pretty_filename);
@@ -662,19 +675,11 @@ elide_tail_lines_seekable (const char *pretty_filename, int fd,
                 }
 
               /* Output the initial portion of the buffer
-                 in which we found the desired newline byte.
-                 Don't bother testing for failure for such a small amount.
-                 Any failure will be detected upon close.  */
-              fwrite (buffer, 1, n + 1, stdout);
+                 in which we found the desired newline byte.  */
+              xwrite_stdout (buffer, n + 1);
 
               /* Set file pointer to the byte after what we've output.  */
-              if (lseek (fd, pos + n + 1, SEEK_SET) < 0)
-                {
-                  error (0, errno, _("%s: failed to reset file pointer"),
-                         quote (pretty_filename));
-                  return false;
-                }
-              return true;
+              return 0 <= elseek (fd, pos + n + 1, SEEK_SET, pretty_filename);
             }
         }
 
@@ -685,13 +690,8 @@ elide_tail_lines_seekable (const char *pretty_filename, int fd,
           return true;
         }
       pos -= BUFSIZ;
-      if (lseek (fd, pos, SEEK_SET) < 0)
-        {
-          char offset_buf[INT_BUFSIZE_BOUND (pos)];
-          error (0, errno, _("%s: cannot seek to offset %s"),
-                 pretty_filename, offtostr (pos, offset_buf));
-          return false;
-        }
+      if (elseek (fd, pos, SEEK_SET, pretty_filename) < 0)
+        return false;
 
       bytes_read = safe_read (fd, buffer, BUFSIZ);
       if (bytes_read == SAFE_READ_ERROR)
@@ -707,37 +707,28 @@ elide_tail_lines_seekable (const char *pretty_filename, int fd,
     }
 }
 
-/* Print all but the last N_ELIDE lines from the input available
-   via file descriptor FD.  Return true upon success.
+/* For the file FILENAME with descriptor FD, output all but the last N_ELIDE
+   lines.  If SIZE is nonnegative, this is a regular file positioned
+   at START_POS with SIZE bytes.  Return true on success.
    Give a diagnostic and return nonzero upon error.  */
 
 static bool
-elide_tail_lines_file (const char *filename, int fd, uintmax_t n_elide)
+elide_tail_lines_file (const char *filename, int fd, uintmax_t n_elide,
+                       off_t current_pos, off_t size)
 {
-  if (!presume_input_pipe)
+  if (size < 0)
+    return elide_tail_lines_pipe (filename, fd, n_elide);
+  else
     {
       /* Find the offset, OFF, of the Nth newline from the end,
          but not counting the last byte of the file.
          If found, write from current position to OFF, inclusive.
          Otherwise, just return true.  */
 
-      off_t start_pos = lseek (fd, 0, SEEK_CUR);
-      off_t end_pos = lseek (fd, 0, SEEK_END);
-      if (0 <= start_pos && start_pos < end_pos)
-        {
-          /* If the file is empty, we're done.  */
-          if (end_pos == 0)
-            return true;
-
-          return elide_tail_lines_seekable (filename, fd, n_elide,
-                                            start_pos, end_pos);
-        }
-
-      /* lseek failed or the end offset precedes start.
-         Fall through.  */
+      return (size <= current_pos
+              || elide_tail_lines_seekable (filename, fd, n_elide,
+                                            current_pos, size));
     }
-
-  return elide_tail_lines_pipe (filename, fd, n_elide);
 }
 
 static bool
@@ -759,8 +750,7 @@ head_bytes (const char *filename, int fd, uintmax_t bytes_to_write)
         }
       if (bytes_read == 0)
         break;
-      if (fwrite (buffer, 1, bytes_read, stdout) < bytes_read)
-        error (EXIT_FAILURE, errno, _("write error"));
+      xwrite_stdout (buffer, bytes_read);
       bytes_to_write -= bytes_read;
     }
   return true;
@@ -792,16 +782,13 @@ head_lines (const char *filename, int fd, uintmax_t lines_to_write)
                gotten to had we been reading one byte at a time.  */
             if (lseek (fd, -n_bytes_past_EOL, SEEK_CUR) < 0)
               {
-                int e = errno;
                 struct stat st;
                 if (fstat (fd, &st) != 0 || S_ISREG (st.st_mode))
-                  error (0, e, _("cannot reposition file pointer for %s"),
-                         quote (filename));
+                  elseek (fd, -n_bytes_past_EOL, SEEK_CUR, filename);
               }
             break;
           }
-      if (fwrite (buffer, 1, bytes_to_write, stdout) < bytes_to_write)
-        error (EXIT_FAILURE, errno, _("write error"));
+      xwrite_stdout (buffer, bytes_to_write);
     }
   return true;
 }
@@ -815,14 +802,28 @@ head (const char *filename, int fd, uintmax_t n_units, bool count_lines,
 
   if (elide_from_end)
     {
-      if (count_lines)
+      off_t current_pos = -1, size = -1;
+      if (! presume_input_pipe)
         {
-          return elide_tail_lines_file (filename, fd, n_units);
+          struct stat st;
+          if (fstat (fd, &st) != 0)
+            {
+              error (0, errno, _("cannot fstat %s"),
+                     quotearg_colon (filename));
+              return false;
+            }
+          if (S_ISREG (st.st_mode))
+            {
+              size = st.st_size;
+              current_pos = elseek (fd, 0, SEEK_CUR, filename);
+              if (current_pos < 0)
+                return false;
+            }
         }
+      if (count_lines)
+        return elide_tail_lines_file (filename, fd, n_units, current_pos, size);
       else
-        {
-          return elide_tail_bytes_file (filename, fd, n_units);
-        }
+        return elide_tail_bytes_file (filename, fd, n_units, current_pos, size);
     }
   if (count_lines)
     return head_lines (filename, fd, n_units);
diff --git a/src/hostid.c b/src/hostid.c
index b2d218cc..5b40eb01 100644
--- a/src/hostid.c
+++ b/src/hostid.c
@@ -1,6 +1,6 @@
 /* print the hexadecimal identifier for the current host
 
-   Copyright (C) 1997-2013 Free Software Foundation, Inc.
+   Copyright (C) 1997-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/hostname.c b/src/hostname.c
index d0a4d754..bab51ae4 100644
--- a/src/hostname.c
+++ b/src/hostname.c
@@ -1,5 +1,5 @@
 /* hostname - set or print the name of current host system
-   Copyright (C) 1994-2013 Free Software Foundation, Inc.
+   Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/id.c b/src/id.c
index b5a7214d..ccd1e879 100644
--- a/src/id.c
+++ b/src/id.c
@@ -1,5 +1,5 @@
 /* id -- print real and effective UIDs and GIDs
-   Copyright (C) 1989-2013 Free Software Foundation, Inc.
+   Copyright (C) 1989-2014 Free Software Foundation, Inc.
 
    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
@@ -30,6 +30,8 @@
 #include "mgetgroups.h"
 #include "quote.h"
 #include "group-list.h"
+#include "smack.h"
+#include "userspec.h"
 
 /* The official name of this program (e.g., no 'g' prefix).  */
 #define PROGRAM_NAME "id"
@@ -38,8 +40,8 @@
   proper_name ("Arnold Robbins"), \
   proper_name ("David MacKenzie")
 
-/* If nonzero, output only the SELinux context. -Z */
-static int just_context = 0;
+/* If nonzero, output only the SELinux context.  */
+static bool just_context = 0;
 
 static void print_user (uid_t uid);
 static void print_full_info (const char *username);
@@ -56,7 +58,7 @@ static bool ok = true;
 
 /* The SELinux context.  Start with a known invalid value so print_full_info
    knows when 'context' has not been set to a meaningful value.  */
-static security_context_t context = NULL;
+static char *context = NULL;
 
 static struct option const longopts[] =
 {
@@ -66,6 +68,7 @@ static struct option const longopts[] =
   {"name", no_argument, NULL, 'n'},
   {"real", no_argument, NULL, 'r'},
   {"user", no_argument, NULL, 'u'},
+  {"zero", no_argument, NULL, 'z'},
   {GETOPT_HELP_OPTION_DECL},
   {GETOPT_VERSION_OPTION_DECL},
   {NULL, 0, NULL, 0}
@@ -78,18 +81,22 @@ usage (int status)
     emit_try_help ();
   else
     {
-      printf (_("Usage: %s [OPTION]... [USERNAME]\n"), program_name);
+      printf (_("Usage: %s [OPTION]... [USER]\n"), program_name);
       fputs (_("\
-Print user and group information for the specified USERNAME,\n\
-or (when USERNAME omitted) for the current user.\n\
-\n\
-  -a              ignore, for compatibility with other versions\n\
-  -Z, --context   print only the security context of the current user\n\
-  -g, --group     print only the effective group ID\n\
-  -G, --groups    print all group IDs\n\
-  -n, --name      print a name instead of a number, for -ugG\n\
-  -r, --real      print the real ID instead of the effective ID, with -ugG\n\
-  -u, --user      print only the effective user ID\n\
+Print user and group information for the specified USER,\n\
+or (when USER omitted) for the current user.\n\
+\n"),
+             stdout);
+      fputs (_("\
+  -a             ignore, for compatibility with other versions\n\
+  -Z, --context  print only the security context of the process\n\
+  -g, --group    print only the effective group ID\n\
+  -G, --groups   print all group IDs\n\
+  -n, --name     print a name instead of a number, for -ugG\n\
+  -r, --real     print the real ID instead of the effective ID, with -ugG\n\
+  -u, --user     print only the effective user ID\n\
+  -z, --zero     delimit entries with NUL characters, not whitespace;\n\
+                   not permitted in default format\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
@@ -107,6 +114,9 @@ main (int argc, char **argv)
 {
   int optc;
   int selinux_enabled = (is_selinux_enabled () > 0);
+  bool smack_enabled = is_smack_enabled ();
+  bool opt_zero = false;
+  char *pw_name = NULL;
 
   /* If true, output the list of all group IDs. -G */
   bool just_group_list = false;
@@ -125,7 +135,7 @@ main (int argc, char **argv)
 
   atexit (close_stdout);
 
-  while ((optc = getopt_long (argc, argv, "agnruGZ", longopts, NULL)) != -1)
+  while ((optc = getopt_long (argc, argv, "agnruzGZ", longopts, NULL)) != -1)
     {
       switch (optc)
         {
@@ -134,11 +144,18 @@ main (int argc, char **argv)
           break;
 
         case 'Z':
-          /* politely decline if we're not on a selinux-enabled kernel. */
+          /* politely decline if we're not on a SELinux/SMACK-enabled kernel. */
+#ifdef HAVE_SMACK
+          if (!selinux_enabled && !smack_enabled)
+            error (EXIT_FAILURE, 0,
+                   _("--context (-Z) works only on "
+                     "an SELinux/SMACK-enabled kernel"));
+#else
           if (!selinux_enabled)
             error (EXIT_FAILURE, 0,
                    _("--context (-Z) works only on an SELinux-enabled kernel"));
-          just_context = 1;
+#endif
+          just_context = true;
           break;
 
         case 'g':
@@ -153,6 +170,9 @@ main (int argc, char **argv)
         case 'u':
           just_user = true;
           break;
+        case 'z':
+          opt_zero = true;
+          break;
         case 'G':
           just_group_list = true;
           break;
@@ -184,26 +204,47 @@ main (int argc, char **argv)
     error (EXIT_FAILURE, 0,
            _("cannot print only names or real IDs in default format"));
 
-  /* If we are on a selinux-enabled kernel, no user is specified, and
+  if (default_format && opt_zero)
+    error (EXIT_FAILURE, 0,
+           _("option --zero not permitted in default format"));
+
+  /* If we are on a SELinux/SMACK-enabled kernel, no user is specified, and
      either --context is specified or none of (-u,-g,-G) is specified,
      and we're not in POSIXLY_CORRECT mode, get our context.  Otherwise,
      leave the context variable alone - it has been initialized to an
      invalid value that will be not displayed in print_full_info().  */
-  if (selinux_enabled
-      && n_ids == 0
+  if (n_ids == 0
       && (just_context
           || (default_format && ! getenv ("POSIXLY_CORRECT"))))
     {
       /* Report failure only if --context (-Z) was explicitly requested.  */
-      if (getcon (&context) && just_context)
+      if ((selinux_enabled && getcon (&context) && just_context)
+          || (smack_enabled
+              && smack_new_label_from_self (&context) < 0
+              && just_context))
         error (EXIT_FAILURE, 0, _("can't get process context"));
     }
 
   if (n_ids == 1)
     {
-      struct passwd *pwd = getpwnam (argv[optind]);
+      struct passwd *pwd = NULL;
+      const char *spec = argv[optind];
+      /* Disallow an empty spec here as parse_user_spec() doesn't
+         give an error for that as it seems it's a valid way to
+         specify a noop or "reset special bits" depending on the system.  */
+      if (*spec)
+        {
+          if (parse_user_spec (spec, &euid, NULL, NULL, NULL) == NULL)
+            {
+              /* parse_user_spec will only extract a numeric spec,
+                 so we lookup that here to verify and also retrieve
+                 the PW_NAME used subsequently in group lookup.  */
+              pwd = getpwuid (euid);
+            }
+        }
       if (pwd == NULL)
-        error (EXIT_FAILURE, 0, _("%s: no such user"), argv[optind]);
+        error (EXIT_FAILURE, 0, _("%s: no such user"), spec);
+      pw_name = xstrdup (pwd->pw_name);
       ruid = euid = pwd->pw_uid;
       rgid = egid = pwd->pw_gid;
     }
@@ -258,7 +299,8 @@ main (int argc, char **argv)
     }
   else if (just_group_list)
     {
-      if (!print_group_list (argv[optind], ruid, rgid, egid, use_name))
+      if (!print_group_list (pw_name, ruid, rgid, egid, use_name,
+                             opt_zero ? '\0' : ' '))
         ok = false;
     }
   else if (just_context)
@@ -267,10 +309,11 @@ main (int argc, char **argv)
     }
   else
     {
-      print_full_info (argv[optind]);
+      print_full_info (pw_name);
     }
-  putchar ('\n');
+  putchar (opt_zero ? '\0' : '\n');
 
+  IF_LINT (free (pw_name));
   exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
 }
 
@@ -356,19 +399,20 @@ print_full_info (const char *username)
     gid_t *groups;
     int i;
 
-    int n_groups = xgetgroups (username, (pwd ? pwd->pw_gid : -1),
-                               &groups);
+    gid_t primary_group;
+    if (username)
+      primary_group = pwd ? pwd->pw_gid : -1;
+    else
+      primary_group = egid;
+
+    int n_groups = xgetgroups (username, primary_group, &groups);
     if (n_groups < 0)
       {
         if (username)
-          {
-            error (0, errno, _("failed to get groups for user %s"),
-                   quote (username));
-          }
+          error (0, errno, _("failed to get groups for user %s"),
+                 quote (username));
         else
-          {
-            error (0, errno, _("failed to get groups for the current process"));
-          }
+          error (0, errno, _("failed to get groups for the current process"));
         ok = false;
         return;
       }
diff --git a/src/install.c b/src/install.c
index 94374df3..c3424227 100644
--- a/src/install.c
+++ b/src/install.c
@@ -1,5 +1,5 @@
 /* install - copy files and set attributes
-   Copyright (C) 1989-2013 Free Software Foundation, Inc.
+   Copyright (C) 1989-2014 Free Software Foundation, Inc.
 
    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
@@ -218,8 +218,8 @@ need_copy (const char *src_name, const char *dest_name,
   /* compare SELinux context if preserving */
   if (selinux_enabled && x->preserve_security_context)
     {
-      security_context_t file_scontext = NULL;
-      security_context_t to_scontext = NULL;
+      char *file_scontext = NULL;
+      char *to_scontext = NULL;
       bool scontext_match;
 
       if (getfilecon (src_name, &file_scontext) == -1)
@@ -279,7 +279,6 @@ cp_option_init (struct cp_options *x)
   x->reduce_diagnostics=false;
   x->data_copy_required = true;
   x->require_preserve = false;
-  x->require_preserve_context = false;
   x->require_preserve_xattr = false;
   x->recursive = false;
   x->sparse_mode = SPARSE_AUTO;
@@ -295,7 +294,9 @@ cp_option_init (struct cp_options *x)
 
   x->open_dangling_dest_symlink = false;
   x->update = false;
-  x->preserve_security_context = false;
+  x->require_preserve_context = false;  /* Not used by install currently.  */
+  x->preserve_security_context = false; /* Whether to copy context from src.  */
+  x->set_security_context = false;    /* Whether to set sys default context.  */
   x->preserve_xattr = false;
   x->verbose = false;
   x->dest_info = NULL;
@@ -305,12 +306,13 @@ cp_option_init (struct cp_options *x)
 #ifdef ENABLE_MATCHPATHCON
 /* Modify file context to match the specified policy.
    If an error occurs the file will remain with the default directory
-   context.  */
+   context.  Note this sets the context to that returned by matchpathcon,
+   and thus discards MLS levels and user identity of the FILE.  */
 static void
 setdefaultfilecon (char const *file)
 {
   struct stat st;
-  security_context_t scontext = NULL;
+  char *scontext = NULL;
   static bool first_call = true;
 
   if (selinux_enabled != 1)
@@ -359,7 +361,8 @@ setdefaultfilecon (char const *file)
   first_call = false;
 
   /* If there's an error determining the context, or it has none,
-     return to allow default context */
+     return to allow default context.  Note the "<<none>>" check
+     is only needed for libselinux < 1.20 (2005-01-04).  */
   if ((matchpathcon (file, st.st_mode, &scontext) != 0)
       || STREQ (scontext, "<<none>>"))
     {
@@ -515,16 +518,17 @@ change_timestamps (struct stat const *src_sb, char const *dest)
    magic numbers vary so much from system to system that making
    it portable would be very difficult.  Not worth the effort. */
 
-static void
+static bool
 strip (char const *name)
 {
   int status;
+  bool ok = false;
   pid_t pid = fork ();
 
   switch (pid)
     {
     case -1:
-      error (EXIT_FAILURE, errno, _("fork system call failed"));
+      error (0, errno, _("fork system call failed"));
       break;
     case 0:			/* Child. */
       execlp (strip_program, strip_program, name, NULL);
@@ -532,11 +536,14 @@ strip (char const *name)
       break;
     default:			/* Parent. */
       if (waitpid (pid, &status, 0) < 0)
-        error (EXIT_FAILURE, errno, _("waiting for strip"));
+        error (0, errno, _("waiting for strip"));
       else if (! WIFEXITED (status) || WEXITSTATUS (status))
-        error (EXIT_FAILURE, 0, _("strip process terminated abnormally"));
+        error (0, 0, _("strip process terminated abnormally"));
+      else
+        ok = true;      /* strip succeeded */
       break;
     }
+  return ok;
 }
 
 /* Initialize the user and group ownership of the files to install. */
@@ -640,8 +647,10 @@ In the 4th form, create all components of the given DIRECTORY(ies).\n\
 "), stdout);
       fputs (_("\
       --preserve-context  preserve SELinux security context\n\
-  -Z, --context=CONTEXT  set SELinux security context of files and directories\
-\n\
+  -Z                      set SELinux security context of destination\n\
+                            file to default type\n\
+      --context[=CTX]     like -Z, or if CTX is specified then set the\n\
+                            SELinux or SMACK security context to CTX\n\
 "), stdout);
 
       fputs (HELP_OPTION_DESCRIPTION, stdout);
@@ -681,7 +690,12 @@ install_file_in_file (const char *from, const char *to,
   if (! copy_file (from, to, x))
     return false;
   if (strip_files)
-    strip (to);
+    if (! strip (to))
+      {
+        if (unlink (to) != 0)  /* Cleanup.  */
+          error (EXIT_FAILURE, errno, _("cannot unlink %s"), to);
+        return false;
+      }
   if (x->preserve_timestamps && (strip_files || ! S_ISREG (from_sb.st_mode))
       && ! change_timestamps (&from_sb, to))
     return false;
@@ -692,8 +706,7 @@ install_file_in_file (const char *from, const char *to,
    Return true if successful.  */
 
 static bool
-install_file_in_file_parents (char const *from, char *to,
-                              struct cp_options *x)
+mkancesdirs_safe_wd (char const *from, char *to, struct cp_options *x)
 {
   bool save_working_directory =
     ! (IS_ABSOLUTE_FILE_NAME (from) && IS_ABSOLUTE_FILE_NAME (to));
@@ -723,8 +736,18 @@ install_file_in_file_parents (char const *from, char *to,
           return false;
         }
     }
+  return status == EXIT_SUCCESS;
+}
+
+/* Copy file FROM onto file TO, creating any missing parent directories of TO.
+   Return true if successful.  */
 
-  return (status == EXIT_SUCCESS && install_file_in_file (from, to, x));
+static bool
+install_file_in_file_parents (char const *from, char *to,
+                              const struct cp_options *x)
+{
+  return (mkancesdirs_safe_wd (from, to, (struct cp_options *)x)
+          && install_file_in_file (from, to, x));
 }
 
 /* Copy file FROM into directory TO_DIR, keeping its same name,
@@ -733,11 +756,16 @@ install_file_in_file_parents (char const *from, char *to,
 
 static bool
 install_file_in_dir (const char *from, const char *to_dir,
-                     const struct cp_options *x)
+                     const struct cp_options *x, bool mkdir_and_install)
 {
   const char *from_base = last_component (from);
   char *to = file_name_concat (to_dir, from_base, NULL);
-  bool ret = install_file_in_file (from, to, x);
+  bool ret = true;
+
+  if (mkdir_and_install)
+    ret = mkancesdirs_safe_wd (from, to, (struct cp_options *)x);
+
+  ret = ret && install_file_in_file (from, to, x);
   free (to);
   return ret;
 }
@@ -758,7 +786,7 @@ main (int argc, char **argv)
   int n_files;
   char **file;
   bool strip_program_specified = false;
-  security_context_t scontext = NULL;
+  char const *scontext = NULL;
   /* set iff kernel has extra selinux system calls */
   selinux_enabled = (0 < is_selinux_enabled ());
 
@@ -782,7 +810,7 @@ main (int argc, char **argv)
      we'll actually use backup_suffix_string.  */
   backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
 
-  while ((optc = getopt_long (argc, argv, "bcCsDdg:m:o:pt:TvS:Z:", long_options,
+  while ((optc = getopt_long (argc, argv, "bcCsDdg:m:o:pt:TvS:Z", long_options,
                               NULL)) != -1)
     {
       switch (optc)
@@ -837,16 +865,6 @@ main (int argc, char **argv)
           if (target_directory)
             error (EXIT_FAILURE, 0,
                    _("multiple target directories specified"));
-          else
-            {
-              struct stat st;
-              if (stat (optarg, &st) != 0)
-                error (EXIT_FAILURE, errno, _("failed to access %s"),
-                       quote (optarg));
-              if (! S_ISDIR (st.st_mode))
-                error (EXIT_FAILURE, 0, _("target %s is not a directory"),
-                       quote (optarg));
-            }
           target_directory = optarg;
           break;
         case 'T':
@@ -854,7 +872,7 @@ main (int argc, char **argv)
           break;
 
         case PRESERVE_CONTEXT_OPTION:
-          if ( ! selinux_enabled)
+          if (! selinux_enabled)
             {
               error (0, 0, _("WARNING: ignoring --preserve-context; "
                              "this kernel is not SELinux-enabled"));
@@ -864,14 +882,27 @@ main (int argc, char **argv)
           use_default_selinux_context = false;
           break;
         case 'Z':
-          if ( ! selinux_enabled)
+          if (selinux_enabled)
             {
-              error (0, 0, _("WARNING: ignoring --context (-Z); "
-                             "this kernel is not SELinux-enabled"));
-              break;
+              /* Disable use of the install(1) specific setdefaultfilecon().
+                 Note setdefaultfilecon() is different from the newer and more
+                 generic restorecon() in that the former sets the context of
+                 the dest files to that returned by matchpathcon directly,
+                 thus discarding MLS level and user identity of the file.
+                 TODO: consider removing setdefaultfilecon() in future.  */
+              use_default_selinux_context = false;
+
+              if (optarg)
+                scontext = optarg;
+              else
+                x.set_security_context = true;
+            }
+          else if (optarg)
+            {
+              error (0, 0,
+                     _("warning: ignoring --context; "
+                       "it requires an SELinux-enabled kernel"));
             }
-          scontext = optarg;
-          use_default_selinux_context = false;
           break;
         case_GETOPT_HELP_CHAR;
         case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
@@ -888,10 +919,17 @@ main (int argc, char **argv)
     error (EXIT_FAILURE, 0,
            _("target directory not allowed when installing a directory"));
 
-  if (x.preserve_security_context && scontext != NULL)
-    error (EXIT_FAILURE, 0,
-           _("cannot force target context to %s and preserve it"),
-           quote (scontext));
+  if (target_directory)
+    {
+      struct stat st;
+      bool stat_success = stat (target_directory, &st) == 0 ? true : false;
+      if (! mkdir_and_install && ! stat_success)
+        error (EXIT_FAILURE, errno, _("failed to access %s"),
+               quote (target_directory));
+      if (stat_success && ! S_ISDIR (st.st_mode))
+        error (EXIT_FAILURE, 0, _("target %s is not a directory"),
+               quote (target_directory));
+    }
 
   if (backup_suffix_string)
     simple_backup_suffix = xstrdup (backup_suffix_string);
@@ -901,7 +939,11 @@ main (int argc, char **argv)
                                    version_control_string)
                    : no_backups);
 
-  if (scontext && setfscreatecon (scontext) < 0)
+  if (x.preserve_security_context && (x.set_security_context || scontext))
+    error (EXIT_FAILURE, 0,
+           _("cannot set target context and preserve it"));
+
+  if (scontext && setfscreatecon (se_const (scontext)) < 0)
     error (EXIT_FAILURE, errno,
            _("failed to set default file creation context to %s"),
            quote (scontext));
@@ -994,7 +1036,8 @@ main (int argc, char **argv)
           int i;
           dest_info_init (&x);
           for (i = 0; i < n_files; i++)
-            if (! install_file_in_dir (file[i], target_directory, &x))
+            if (! install_file_in_dir (file[i], target_directory, &x,
+                                       mkdir_and_install))
               exit_status = EXIT_FAILURE;
         }
     }
diff --git a/src/ioblksize.h b/src/ioblksize.h
index 1ae93255..55aaeae1 100644
--- a/src/ioblksize.h
+++ b/src/ioblksize.h
@@ -1,5 +1,5 @@
 /* I/O block size definitions for coreutils
-   Copyright (C) 1989-2013 Free Software Foundation, Inc.
+   Copyright (C) 1989-2014 Free Software Foundation, Inc.
 
    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
@@ -20,7 +20,7 @@
 #include "stat-size.h"
 
 
-/* As of Jul 2011, 64KiB is determined to be the minimium
+/* As of May 2014, 128KiB is determined to be the minimium
    blksize to best minimize system call overhead.
    This can be tested with this script:
 
@@ -33,23 +33,29 @@
    done
 
    With the results shown for these systems:
-   system-1 = 1.7GHz pentium-m with 400MHz DDR2 RAM, arch=i686
-   system-2 = 2.1GHz i3-2310M with 1333MHz DDR3 RAM, arch=x86_64
-   system-3 = 3.2GHz i7-970 with 1333MHz DDR3, arch=x86_64
+   system #1: 1.7GHz pentium-m with 400MHz DDR2 RAM, arch=i686
+   system #2: 2.1GHz i3-2310M with 1333MHz DDR3 RAM, arch=x86_64
+   system #3: 3.2GHz i7-970 with 1333MHz DDR3, arch=x86_64
+   system #4: 2.20GHz Xeon E5-2660 with 1333MHz DDR3, arch=x86_64
+   system #5: 2.30GHz i7-3615QM with 1600MHz DDR3, arch=x86_64
+   system #6: 1.30GHz i5-4250U with 1-channel 1600MHz DDR3, arch=x86_64
+   system #7: 3.55GHz IBM,8231-E2B with 1066MHz DDR3, POWER7 revision 2.1
+
+                per-system transfer rate (GB/s)
+   blksize   #1    #2    #3    #4    #5    #6    #7
+   ------------------------------------------------------------------------
+      1024  .73   1.7   2.6   .64   1.0   2.5   1.3
+      2048  1.3   3.0   4.4   1.2   2.0   4.4   2.5
+      4096  2.4   5.1   6.5   2.3   3.7   7.4   4.8
+      8192  3.5   7.3   8.5   4.0   6.0  10.4   9.2
+     16384  3.9   9.4  10.1   6.3   8.3  13.3  16.8
+     32768  5.2   9.9  11.1   8.1  10.7  13.2  28.0
+     65536  5.3  11.2  12.0  10.6  12.8  16.1  41.4
+    131072  5.5  11.8  12.3  12.1  14.0  16.7  54.8
+    262144  5.7  11.6  12.5  12.3  14.7  16.4  40.0
+    524288  5.7  11.4  12.5  12.1  14.7  15.5  34.5
+   1048576  5.8  11.4  12.6  12.2  14.9  15.7  36.5
 
-   blksize  system-1   system-2   system-3
-   ---------------------------------------
-      1024  734 MB/s   1.7 GB/s   2.6 GB/s
-      2048  1.3 GB/s   3.0 GB/s   4.4 GB/s
-      4096  2.4 GB/s   5.1 GB/s   6.5 GB/s
-      8192  3.5 GB/s   7.3 GB/s   8.5 GB/s
-     16384  3.9 GB/s   9.4 GB/s  10.1 GB/s
-     32768  5.2 GB/s   9.9 GB/s  11.1 GB/s
-     65536  5.3 GB/s  11.2 GB/s  12.0 GB/s
-    131072  5.5 GB/s  11.8 GB/s  12.3 GB/s
-    262144  5.7 GB/s  11.6 GB/s  12.5 GB/s
-    524288  5.7 GB/s  11.4 GB/s  12.5 GB/s
-   1048576  5.8 GB/s  11.4 GB/s  12.6 GB/s
 
    Note that this is to minimize system call overhead.
    Other values may be appropriate to minimize file system
@@ -57,14 +63,14 @@
    the readahead setting is 128KiB which was read using:
 
    file="."
-   device=$(df -P --local "$file" | tail -n1 | cut -d' ' -f1)
+   device=$(df --output=source --local "$file" | tail -n1)
    echo $(( $(blockdev --getra $device) * 512 ))
 
    However there isn't a portable way to get the above.
    In the future we could use the above method if available
    and default to io_blksize() if not.
  */
-enum { IO_BUFSIZE = 64*1024 };
+enum { IO_BUFSIZE = 128*1024 };
 static inline size_t
 io_blksize (struct stat sb)
 {
diff --git a/src/join.c b/src/join.c
index 11e647cf..5c26e78a 100644
--- a/src/join.c
+++ b/src/join.c
@@ -1,5 +1,5 @@
 /* join - join lines of two files on a common field
-   Copyright (C) 1991-2013 Free Software Foundation, Inc.
+   Copyright (C) 1991-2014 Free Software Foundation, Inc.
 
    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
@@ -161,6 +161,7 @@ static struct option const longopts[] =
   {"ignore-case", no_argument, NULL, 'i'},
   {"check-order", no_argument, NULL, CHECK_ORDER_OPTION},
   {"nocheck-order", no_argument, NULL, NOCHECK_ORDER_OPTION},
+  {"zero-terminated", no_argument, NULL, 'z'},
   {"header", no_argument, NULL, HEADER_LINE_OPTION},
   {GETOPT_HELP_OPTION_DECL},
   {GETOPT_VERSION_OPTION_DECL},
@@ -177,6 +178,9 @@ static bool ignore_case;
    join them without checking for ordering */
 static bool join_header_lines;
 
+/* The character marking end of line. Default to \n. */
+static char eolchar = '\n';
+
 void
 usage (int status)
 {
@@ -213,6 +217,9 @@ by whitespace.  When FILE1 or FILE2 (not both) is -, read standard input.\n\
   --header          treat the first line in each file as field headers,\n\
                       print them without trying to pair them\n\
 "), stdout);
+      fputs (_("\
+  -z, --zero-terminated     line delimiter is NUL, not newline\n\
+"), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
       fputs (_("\
@@ -445,7 +452,7 @@ get_line (FILE *fp, struct line **linep, int which)
   else
     line = init_linep (linep);
 
-  if (! readlinebuffer (&line->buf, fp))
+  if (! readlinebuffer_delim (&line->buf, fp, eolchar))
     {
       if (ferror (fp))
         error (EXIT_FAILURE, errno, _("read error"));
@@ -614,7 +621,7 @@ prjoin (struct line const *line1, struct line const *line2)
             break;
           putchar (output_separator);
         }
-      putchar ('\n');
+      putchar (eolchar);
     }
   else
     {
@@ -636,7 +643,7 @@ prjoin (struct line const *line1, struct line const *line2)
       prfields (line1, join_field_1, autocount_1);
       prfields (line2, join_field_2, autocount_2);
 
-      putchar ('\n');
+      putchar (eolchar);
     }
 }
 
@@ -1017,7 +1024,7 @@ main (int argc, char **argv)
   issued_disorder_warning[0] = issued_disorder_warning[1] = false;
   check_input_order = CHECK_ORDER_DEFAULT;
 
-  while ((optc = getopt_long (argc, argv, "-a:e:i1:2:j:o:t:v:",
+  while ((optc = getopt_long (argc, argv, "-a:e:i1:2:j:o:t:v:z",
                               longopts, NULL))
          != -1)
     {
@@ -1107,6 +1114,10 @@ main (int argc, char **argv)
           }
           break;
 
+        case 'z':
+          eolchar = 0;
+          break;
+
         case NOCHECK_ORDER_OPTION:
           check_input_order = CHECK_ORDER_DISABLED;
           break;
diff --git a/src/kill.c b/src/kill.c
index d1b836b6..724667e0 100644
--- a/src/kill.c
+++ b/src/kill.c
@@ -1,5 +1,5 @@
 /* kill -- send a signal to a process
-   Copyright (C) 2002-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
    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
@@ -306,7 +306,7 @@ main (int argc, char **argv)
       usage (EXIT_FAILURE);
     }
 
-  return (list
-          ? list_signals (table, optind < argc ? argv + optind : NULL)
-          : send_signals (signum, argv + optind));
+  exit (list
+        ? list_signals (table, optind < argc ? argv + optind : NULL)
+        : send_signals (signum, argv + optind));
 }
diff --git a/src/libstdbuf.c b/src/libstdbuf.c
index ac7a1339..1281b9de 100644
--- a/src/libstdbuf.c
+++ b/src/libstdbuf.c
@@ -1,5 +1,5 @@
 /* libstdbuf -- a shared lib to preload to setup stdio buffering for a command
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -127,7 +127,8 @@ apply_mode (FILE *stream, const char *mode)
     }
 }
 
-__attribute__ ((constructor)) static void
+/* Use __attribute to avoid elision of __attribute__ on SUNPRO_C etc.  */
+static void __attribute ((constructor))
 stdbuf (void)
 {
   char *e_mode = getenv ("_STDBUF_E");
diff --git a/src/link.c b/src/link.c
index 4611107a..9f18fe2e 100644
--- a/src/link.c
+++ b/src/link.c
@@ -1,5 +1,5 @@
 /* link utility for GNU.
-   Copyright (C) 2001-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/ln.c b/src/ln.c
index 1aa14732..42bccfce 100644
--- a/src/ln.c
+++ b/src/ln.c
@@ -1,5 +1,5 @@
 /* 'ln' program to create links between files.
-   Copyright (C) 1986-2013 Free Software Foundation, Inc.
+   Copyright (C) 1986-2014 Free Software Foundation, Inc.
 
    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
@@ -103,8 +103,18 @@ static struct option const long_options[] =
   {NULL, 0, NULL, 0}
 };
 
+/* Return true when the passed ERR implies
+   that a file does not or could not exist.  */
+
+static bool
+errno_nonexisting (int err)
+{
+  return err == ENOENT || err == ENAMETOOLONG || err == ENOTDIR || err == ELOOP;
+}
+
+
 /* FILE is the last operand of this command.  Return true if FILE is a
-   directory.  But report an error there is a problem accessing FILE,
+   directory.  But report an error if there is a problem accessing FILE,
    or if FILE does not exist but would have to refer to an existing
    directory if it referred to anything at all.  */
 
@@ -119,7 +129,7 @@ target_directory_operand (char const *file)
     (dereference_dest_dir_symlinks ? stat (file, &st) : lstat (file, &st));
   int err = (stat_result == 0 ? 0 : errno);
   bool is_a_dir = !err && S_ISDIR (st.st_mode);
-  if (err && err != ENOENT)
+  if (err && ! errno_nonexisting (errno))
     error (EXIT_FAILURE, err, _("failed to access %s"), quote (file));
   if (is_a_dir < looks_like_a_dir)
     error (EXIT_FAILURE, err, _("target %s is not a directory"), quote (file));
@@ -132,22 +142,28 @@ target_directory_operand (char const *file)
 static char *
 convert_abs_rel (const char *from, const char *target)
 {
-  char *realtarget = canonicalize_filename_mode (target, CAN_MISSING);
-  char *realfrom = canonicalize_filename_mode (from, CAN_MISSING);
-
-  /* Write to a PATH_MAX buffer.  */
-  char *relative_from = xmalloc (PATH_MAX);
+  /* Get dirname to generate paths relative to.  We don't resolve
+     the full TARGET as the last component could be an existing symlink.  */
+  char *targetdir = dir_name (target);
 
-  /* Get dirname to generate paths relative to.  */
-  realtarget[dir_len (realtarget)] = '\0';
+  char *realdest = canonicalize_filename_mode (targetdir, CAN_MISSING);
+  char *realfrom = canonicalize_filename_mode (from, CAN_MISSING);
 
-  if (!relpath (realfrom, realtarget, relative_from, PATH_MAX))
+  char *relative_from = NULL;
+  if (realdest && realfrom)
     {
-      free (relative_from);
-      relative_from = NULL;
+      /* Write to a PATH_MAX buffer.  */
+      relative_from = xmalloc (PATH_MAX);
+
+      if (!relpath (realfrom, realdest, relative_from, PATH_MAX))
+        {
+          free (relative_from);
+          relative_from = NULL;
+        }
     }
 
-  free (realtarget);
+  free (targetdir);
+  free (realdest);
   free (realfrom);
 
   return relative_from ? relative_from : xstrdup (from);
@@ -327,7 +343,8 @@ do_link (const char *source, const char *dest)
     {
       /* Right after creating a hard link, do this: (note dest name and
          source_stats, which are also the just-linked-destinations stats) */
-      record_file (dest_set, dest, &source_stats);
+      if (! symbolic_link)
+        record_file (dest_set, dest, &source_stats);
 
       if (verbose)
         {
diff --git a/src/local.mk b/src/local.mk
index 982cd4da..c0d04d68 100644
--- a/src/local.mk
+++ b/src/local.mk
@@ -1,7 +1,7 @@
 # Make coreutils programs.                             -*-Makefile-*-
 # This is included by the top-level Makefile.am.
 
-## Copyright (C) 1990-2013 Free Software Foundation, Inc.
+## Copyright (C) 1990-2014 Free Software Foundation, Inc.
 
 ## 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
@@ -37,8 +37,7 @@ pkglibexec_PROGRAMS = @pkglibexec_PROGRAMS@
 # Needed by the testsuite.
 noinst_PROGRAMS =		\
   src/getlimits			\
-  src/make-prime-list		\
-  src/setuidgid
+  src/make-prime-list
 
 noinst_HEADERS =		\
   src/chown-core.h		\
@@ -106,6 +105,9 @@ src_cksum_LDADD = $(LDADD)
 src_comm_LDADD = $(LDADD)
 src_nproc_LDADD = $(LDADD)
 src_cp_LDADD = $(LDADD)
+if !SINGLE_BINARY
+src_coreutils_LDADD = $(LDADD)
+endif
 src_csplit_LDADD = $(LDADD)
 src_cut_LDADD = $(LDADD)
 src_date_LDADD = $(LDADD)
@@ -151,6 +153,7 @@ src_mv_LDADD = $(LDADD)
 src_nice_LDADD = $(LDADD)
 src_nl_LDADD = $(LDADD)
 src_nohup_LDADD = $(LDADD)
+src_numfmt_LDADD = $(LDADD)
 src_od_LDADD = $(LDADD)
 src_paste_LDADD = $(LDADD)
 src_pathchk_LDADD = $(LDADD)
@@ -166,7 +169,6 @@ src_rm_LDADD = $(LDADD)
 src_rmdir_LDADD = $(LDADD)
 src_runcon_LDADD = $(LDADD)
 src_seq_LDADD = $(LDADD)
-src_setuidgid_LDADD = $(LDADD)
 src_sha1sum_LDADD = $(LDADD)
 src_sha224sum_LDADD = $(LDADD)
 src_sha256sum_LDADD = $(LDADD)
@@ -228,13 +230,21 @@ copy_ldadd += $(LIB_SELINUX)
 src_chcon_LDADD += $(LIB_SELINUX)
 src_ginstall_LDADD += $(LIB_SELINUX)
 src_id_LDADD += $(LIB_SELINUX)
+src_id_LDADD += $(LIB_SMACK)
 src_ls_LDADD += $(LIB_SELINUX)
+src_ls_LDADD += $(LIB_SMACK)
 src_mkdir_LDADD += $(LIB_SELINUX)
+src_mkdir_LDADD += $(LIB_SMACK)
 src_mkfifo_LDADD += $(LIB_SELINUX)
+src_mkfifo_LDADD += $(LIB_SMACK)
 src_mknod_LDADD += $(LIB_SELINUX)
+src_mknod_LDADD += $(LIB_SMACK)
 src_runcon_LDADD += $(LIB_SELINUX)
 src_stat_LDADD += $(LIB_SELINUX)
 
+# for nvlist_lookup_uint64_array
+src_stat_LDADD += $(LIB_NVPAIR)
+
 # for gettime, settime, utimecmp, utimens
 copy_ldadd += $(LIB_CLOCK_GETTIME)
 src_date_LDADD += $(LIB_CLOCK_GETTIME)
@@ -288,6 +298,15 @@ src_stdbuf_LDADD += $(LIBICONV)
 src_timeout_LDADD += $(LIBICONV)
 src_truncate_LDADD += $(LIBICONV)
 
+# for libcrypto hash routines
+src_md5sum_LDADD += $(LIB_CRYPTO)
+src_sort_LDADD += $(LIB_CRYPTO)
+src_sha1sum_LDADD += $(LIB_CRYPTO)
+src_sha224sum_LDADD += $(LIB_CRYPTO)
+src_sha256sum_LDADD += $(LIB_CRYPTO)
+src_sha384sum_LDADD += $(LIB_CRYPTO)
+src_sha512sum_LDADD += $(LIB_CRYPTO)
+
 # for canon_host
 src_pinky_LDADD += $(GETADDRINFO_LIB)
 src_who_LDADD += $(GETADDRINFO_LIB)
@@ -307,6 +326,10 @@ RELEASE_YEAR = \
   `sed -n '/.*COPYRIGHT_YEAR = \([0-9][0-9][0-9][0-9]\) };/s//\1/p' \
     $(top_srcdir)/lib/version-etc.c`
 
+selinux_sources = \
+  src/selinux.c \
+  src/selinux.h
+
 copy_sources = \
   src/copy.c \
   src/cp-hash.c \
@@ -318,12 +341,16 @@ copy_sources = \
 # to install before applying any user-specified name transformations.
 
 transform = s/ginstall/install/; $(program_transform_name)
-src_ginstall_SOURCES = src/install.c src/prog-fprintf.c $(copy_sources)
+src_ginstall_SOURCES = src/install.c src/prog-fprintf.c $(copy_sources) \
+		       $(selinux_sources)
 
 # This is for the '[' program.  Automake transliterates '[' and '/' to '_'.
 src___SOURCES = src/lbracket.c
 
-src_cp_SOURCES = src/cp.c $(copy_sources)
+nodist_src_coreutils_SOURCES = src/coreutils.h
+src_coreutils_SOURCES = src/coreutils.c
+
+src_cp_SOURCES = src/cp.c $(copy_sources) $(selinux_sources)
 src_dir_SOURCES = src/ls.c src/ls-dir.c
 src_vdir_SOURCES = src/ls.c src/ls-vdir.c
 src_id_SOURCES = src/id.c src/group-list.c
@@ -336,12 +363,15 @@ src_kill_SOURCES = src/kill.c src/operand2sig.c
 src_realpath_SOURCES = src/realpath.c src/relpath.c src/relpath.h
 src_timeout_SOURCES = src/timeout.c src/operand2sig.c
 
-src_mv_SOURCES = src/mv.c src/remove.c $(copy_sources)
+src_mv_SOURCES = src/mv.c src/remove.c $(copy_sources) $(selinux_sources)
 src_rm_SOURCES = src/rm.c src/remove.c
 
-src_mkdir_SOURCES = src/mkdir.c src/prog-fprintf.c
+src_mkdir_SOURCES = src/mkdir.c src/prog-fprintf.c $(selinux_sources)
 src_rmdir_SOURCES = src/rmdir.c src/prog-fprintf.c
 
+src_mkfifo_SOURCES = src/mkfifo.c $(selinux_sources)
+src_mknod_SOURCES = src/mknod.c $(selinux_sources)
+
 src_df_SOURCES = src/df.c src/find-mount-point.c
 src_stat_SOURCES = src/stat.c src/find-mount-point.c
 
@@ -364,7 +394,7 @@ src_ginstall_CPPFLAGS = -DENABLE_MATCHPATHCON=1 $(AM_CPPFLAGS)
 
 # Ensure we don't link against libcoreutils.a as that lib is
 # not compiled with -fPIC which causes issues on 64 bit at least
-src_libstdbuf_so_LDADD =
+src_libstdbuf_so_LDADD = $(LIBINTL)
 
 # Note libstdbuf is only compiled if GCC is available
 # (as per the check in configure.ac), so these flags should be available.
@@ -372,6 +402,46 @@ src_libstdbuf_so_LDADD =
 src_libstdbuf_so_LDFLAGS = -shared
 src_libstdbuf_so_CFLAGS = -fPIC $(AM_CFLAGS)
 
+BUILT_SOURCES += src/coreutils.h
+if SINGLE_BINARY
+# Single binary dependencies
+src_coreutils_CFLAGS = -DSINGLE_BINARY $(AM_CFLAGS)
+#src_coreutils_LDFLAGS = $(AM_LDFLAGS)
+src_coreutils_LDADD = $(single_binary_deps) $(LDADD) $(single_binary_libs)
+src_coreutils_DEPENDENCIES = $(LDADD) $(single_binary_deps)
+
+include $(top_srcdir)/src/single-binary.mk
+
+# Creates symlinks or shebangs to the installed programs when building
+# coreutils single binary.
+EXTRA_src_coreutils_DEPENDENCIES = src/coreutils_$(single_binary_install_type)
+endif SINGLE_BINARY
+
+CLEANFILES += src/coreutils_symlinks
+src/coreutils_symlinks: Makefile
+	$(AM_V_GEN)touch $@
+	$(AM_V_at)for i in $(single_binary_progs); do \
+		rm -f src/$$i$(EXEEXT) || exit $$?; \
+		$(LN_S) -s coreutils$(EXEEXT) src/$$i$(EXEEXT) || exit $$?; \
+	done
+
+CLEANFILES += src/coreutils_shebangs
+src/coreutils_shebangs: Makefile
+	$(AM_V_GEN)touch $@
+	$(AM_V_at)for i in $(single_binary_progs); do \
+		rm -f src/$$i$(EXEEXT) || exit $$?; \
+		printf '#!%s --coreutils-prog-shebang=%s\n' \
+			$(abs_top_builddir)/src/coreutils$(EXEEXT) $$i \
+			>src/$$i$(EXEEXT) || exit $$?; \
+		chmod a+x,a-w src/$$i$(EXEEXT) || exit $$?; \
+	done
+
+clean-local:
+	$(AM_V_at)for i in $(single_binary_progs); do \
+		rm -f src/$$i$(EXEEXT) || exit $$?; \
+	done
+
+
 BUILT_SOURCES += src/dircolors.h
 src/dircolors.h: src/dcgen src/dircolors.hin
 	$(AM_V_GEN)rm -f $@ $@-t
@@ -403,8 +473,8 @@ AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = src/false src/test
 # Also compare against /usr/include/linux/magic.h
 .PHONY: src/fs-magic-compare
 src/fs-magic-compare: src/fs-magic src/fs-kernel-magic src/fs-def
-	join -v1 -t@ src/fs-magic src/fs-def
-	join -v1 -t@ src/fs-kernel-magic src/fs-def
+	@join -v1 -t@ src/fs-magic src/fs-def
+	@join -v1 -t@ src/fs-kernel-magic src/fs-def
 
 CLEANFILES += src/fs-def
 src/fs-def: src/fs.h
@@ -434,7 +504,7 @@ fs_normalize_perl_subst =			\
 
 CLEANFILES += src/fs-magic
 src/fs-magic: Makefile
-	man statfs \
+	@MANPAGER= man statfs \
 	  |perl -ne '/File system types:/.../Nobody kno/ and print'	\
 	  |grep 0x | perl -p						\
 	    $(fs_normalize_perl_subst)					\
@@ -442,13 +512,23 @@ src/fs-magic: Makefile
 	  | $(ASSORT)							\
 	  > $@-t && mv $@-t $@
 
+DISTCLEANFILES += src/fs-latest-magic.h
+# This rule currently gets the latest header, but probably isn't general
+# enough to enable by default.
+#	@kgit='https://git.kernel.org/cgit/linux/kernel/git'; \
+#	wget -q $$kgit/torvalds/linux.git/plain/include/uapi/linux/magic.h \
+#	  -O $@
+src/fs-latest-magic.h:
+	@touch $@
+
 CLEANFILES += src/fs-kernel-magic
-src/fs-kernel-magic: Makefile
-	perl -ne '/^#define.*0x/ and print' /usr/include/linux/magic.h	\
+src/fs-kernel-magic: Makefile src/fs-latest-magic.h
+	@perl -ne '/^#define.*0x/ and print'				\
+	  /usr/include/linux/magic.h src/fs-latest-magic.h		\
 	  | perl -p							\
 	    $(fs_normalize_perl_subst)					\
 	  | grep -Ev 'S_MAGIC_EXT[34]|STACK_END'			\
-	  | $(ASSORT)							\
+	  | $(ASSORT) -u						\
 	  > $@-t && mv $@-t $@
 
 BUILT_SOURCES += src/fs-is-local.h
@@ -482,6 +562,22 @@ src/version.h: Makefile
 	$(AM_V_at)chmod a-w $@t
 	$(AM_V_at)mv $@t $@
 
+# Generates a list of macro invocations like:
+#   SINGLE_BINARY_PROGRAM(program_name_str, main_name)
+# once for each program list on $(single_binary_progs). Note that
+# for [ the macro invocation is:
+#   SINGLE_BINARY_PROGRAM("[", _)
+DISTCLEANFILES += src/coreutils.h
+src/coreutils.h: Makefile
+	$(AM_V_GEN)rm -f $@
+	$(AM_V_at)for prog in $(single_binary_progs); do	\
+	  prog=`basename $$prog`;				\
+	  main=`echo $$prog | tr '[' '_'`;			\
+	  echo "SINGLE_BINARY_PROGRAM(\"$$prog\", $$main)";	\
+	done | sort > $@t
+	$(AM_V_at)chmod a-w $@t
+	$(AM_V_at)mv $@t $@
+
 DISTCLEANFILES += src/version.c src/version.h
 MAINTAINERCLEANFILES += $(BUILT_SOURCES)
 
diff --git a/src/logname.c b/src/logname.c
index b655e4a2..6afa1b50 100644
--- a/src/logname.c
+++ b/src/logname.c
@@ -1,5 +1,5 @@
 /* logname -- print user's login name
-   Copyright (C) 1990-2013 Free Software Foundation, Inc.
+   Copyright (C) 1990-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/longlong.h b/src/longlong.h
index 46816429..25116130 100644
--- a/src/longlong.h
+++ b/src/longlong.h
@@ -1,6 +1,6 @@
 /* longlong.h -- definitions for mixed size 32/64 bit arithmetic.
 
-Copyright 1991-2013 Free Software Foundation, Inc.
+Copyright 1991-2014 Free Software Foundation, Inc.
 
 This file is free software; you can redistribute it and/or modify it under the
 terms of the GNU Lesser General Public License as published by the Free
@@ -138,30 +138,30 @@ along with this file.  If not, see http://www.gnu.org/licenses/.  */
    or want.  */
 
 #ifdef _LONG_LONG_LIMB
-#define count_leading_zeros_gcc_clz(count,x)    \
-  do {                                          \
-    ASSERT ((x) != 0);                          \
-    (count) = __builtin_clzll (x);              \
+#define count_leading_zeros_gcc_clz(count,x)	\
+  do {						\
+    ASSERT ((x) != 0);				\
+    (count) = __builtin_clzll (x);		\
   } while (0)
 #else
-#define count_leading_zeros_gcc_clz(count,x)    \
-  do {                                          \
-    ASSERT ((x) != 0);                          \
-    (count) = __builtin_clzl (x);               \
+#define count_leading_zeros_gcc_clz(count,x)	\
+  do {						\
+    ASSERT ((x) != 0);				\
+    (count) = __builtin_clzl (x);		\
   } while (0)
 #endif
 
 #ifdef _LONG_LONG_LIMB
-#define count_trailing_zeros_gcc_ctz(count,x)   \
-  do {                                          \
-    ASSERT ((x) != 0);                          \
-    (count) = __builtin_ctzll (x);              \
+#define count_trailing_zeros_gcc_ctz(count,x)	\
+  do {						\
+    ASSERT ((x) != 0);				\
+    (count) = __builtin_ctzll (x);		\
   } while (0)
 #else
-#define count_trailing_zeros_gcc_ctz(count,x)   \
-  do {                                          \
-    ASSERT ((x) != 0);                          \
-    (count) = __builtin_ctzl (x);               \
+#define count_trailing_zeros_gcc_ctz(count,x)	\
+  do {						\
+    ASSERT ((x) != 0);				\
+    (count) = __builtin_ctzl (x);		\
   } while (0)
 #endif
 
@@ -222,27 +222,27 @@ along with this file.  If not, see http://www.gnu.org/licenses/.  */
   __asm__("cttz %1,%0" : "=r"(COUNT) : "r"(X))
 #endif /* clz/ctz using cix */
 
-#if ! defined (count_leading_zeros)                             \
+#if ! defined (count_leading_zeros)				\
   && defined (__GNUC__) && ! defined (LONGLONG_STANDALONE)
 /* ALPHA_CMPBGE_0 gives "cmpbge $31,src,dst", ie. test src bytes == 0.
    "$31" is written explicitly in the asm, since an "r" constraint won't
    select reg 31.  There seems no need to worry about "r31" syntax for cray,
-   since gcc itself (pre-release 3.4) emits just $31 in various places.  */
-#define ALPHA_CMPBGE_0(dst, src)                                        \
+   since gcc itself (pre-release 3.4) emits just $31 in various places.	 */
+#define ALPHA_CMPBGE_0(dst, src)					\
   do { asm ("cmpbge $31, %1, %0" : "=r" (dst) : "r" (src)); } while (0)
 /* Zero bytes are turned into bits with cmpbge, a __clz_tab lookup counts
    them, locating the highest non-zero byte.  A second __clz_tab lookup
    counts the leading zero bits in that byte, giving the result.  */
-#define count_leading_zeros(count, x)                                   \
-  do {                                                                  \
-    UWtype  __clz__b, __clz__c, __clz__x = (x);                         \
-    ALPHA_CMPBGE_0 (__clz__b,  __clz__x);           /* zero bytes */    \
-    __clz__b = __clz_tab [(__clz__b >> 1) ^ 0x7F];  /* 8 to 1 byte */   \
-    __clz__b = __clz__b * 8 - 7;                    /* 57 to 1 shift */ \
-    __clz__x >>= __clz__b;                                              \
-    __clz__c = __clz_tab [__clz__x];                /* 8 to 1 bit */    \
-    __clz__b = 65 - __clz__b;                                           \
-    (count) = __clz__b - __clz__c;                                      \
+#define count_leading_zeros(count, x)					\
+  do {									\
+    UWtype  __clz__b, __clz__c, __clz__x = (x);				\
+    ALPHA_CMPBGE_0 (__clz__b,  __clz__x);	    /* zero bytes */	\
+    __clz__b = __clz_tab [(__clz__b >> 1) ^ 0x7F];  /* 8 to 1 byte */	\
+    __clz__b = __clz__b * 8 - 7;		    /* 57 to 1 shift */ \
+    __clz__x >>= __clz__b;						\
+    __clz__c = __clz_tab [__clz__x];		    /* 8 to 1 bit */	\
+    __clz__b = 65 - __clz__b;						\
+    (count) = __clz__b - __clz__c;					\
   } while (0)
 #define COUNT_LEADING_ZEROS_NEED_CLZ_TAB
 #endif /* clz using cmpbge */
@@ -298,14 +298,14 @@ long __MPN(count_leading_zeros) (UDItype);
    code using "al<bl" arithmetically comes out making an actual 0 or 1 in a
    register, which takes an extra cycle.  */
 #define sub_ddmmss(sh, sl, ah, al, bh, bl)      \
-  do {                                          \
-    UWtype __x;                                 \
-    __x = (al) - (bl);                          \
-    if ((al) < (bl))                            \
-      (sh) = (ah) - (bh) - 1;                   \
-    else                                        \
-      (sh) = (ah) - (bh);                       \
-    (sl) = __x;                                 \
+  do {						\
+    UWtype __x;					\
+    __x = (al) - (bl);				\
+    if ((al) < (bl))				\
+      (sh) = (ah) - (bh) - 1;			\
+    else					\
+      (sh) = (ah) - (bh);			\
+    (sl) = __x;					\
   } while (0)
 #if defined (__GNUC__) && ! defined (__INTEL_COMPILER)
 /* Do both product parts in assembly, since that gives better code with
@@ -423,7 +423,7 @@ long __MPN(count_leading_zeros) (UDItype);
 	     "rIJ" ((USItype) (bl)))
 #endif
 
-#if defined (__arm__) && W_TYPE_SIZE == 32
+#if defined (__arm__) && !defined (__thumb__) && W_TYPE_SIZE == 32
 #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
   __asm__ ("adds\t%1, %4, %5\n\tadc\t%0, %2, %3"			\
 	   : "=r" (sh), "=&r" (sl)					\
@@ -513,7 +513,7 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype *, UWtype, UWtype, UWtype);
 #define UDIV_TIME 200
 #endif /* LONGLONG_STANDALONE */
 #endif
-/* This is a bizarre test, but GCC doesn't define useful common symbol. */
+/* This is a bizarre test, but GCC doesn't define any useful common symbol. */
 #if defined (__ARM_ARCH_5__)  || defined (__ARM_ARCH_5T__) || \
     defined (__ARM_ARCH_5E__) || defined (__ARM_ARCH_5TE__)|| \
     defined (__ARM_ARCH_6__)  || defined (__ARM_ARCH_6J__) || \
@@ -529,23 +529,16 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype *, UWtype, UWtype, UWtype);
 #endif /* __arm__ */
 
 #if defined (__aarch64__) && W_TYPE_SIZE == 64
+/* FIXME: Extend the immediate range for the low word by using both
+   ADDS and SUBS, since they set carry in the same way.  */
 #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-  __asm__ ("adds\t%1, %4, %5\n\tadc\t%0, %2, %3"			\
+  __asm__ ("adds\t%1, %x4, %5\n\tadc\t%0, %x2, %x3"			\
 	   : "=r" (sh), "=&r" (sl)					\
-	   : "r" (ah), "rZ" (bh), "%r" (al), "rI" (bl) __CLOBBER_CC)
+	   : "rZ" (ah), "rZ" (bh), "%r" (al), "rI" (bl) __CLOBBER_CC)
 #define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-  do {									\
-    if (__builtin_constant_p (bl))					\
-      {									\
-	__asm__ ("subs\t%1, %4, %5\n\tsbc\t%0, %2, %3"			\
-		 : "=r" (sh), "=&r" (sl)				\
-		 : "r" (ah), "r" (bh), "r" (al), "rI" (bl) __CLOBBER_CC); \
-      }									\
-    else /* only bh might be a constant */				\
-      __asm__ ("subs\t%1, %4, %5\n\tsbc\t%0, %2, %3"			\
-	       : "=r" (sh), "=&r" (sl)					\
-	       : "r" (ah), "rZ" (bh), "r" (al), "rI" (bl) __CLOBBER_CC);\
-    } while (0)
+  __asm__ ("subs\t%1, %x4, %5\n\tsbc\t%0, %x2, %x3"			\
+	   : "=r,r" (sh), "=&r,&r" (sl)					\
+	   : "rZ,rZ" (ah), "rZ,rZ" (bh), "r,Z" (al), "rI,r" (bl) __CLOBBER_CC)
 #define umul_ppmm(ph, pl, m0, m1) \
   do {									\
     UDItype __m0 = (m0), __m1 = (m1);					\
@@ -554,6 +547,8 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype *, UWtype, UWtype, UWtype);
   } while (0)
 #define count_leading_zeros(count, x) \
   __asm__ ("clz\t%0, %1" : "=r" (count) : "r" (x))
+#define count_trailing_zeros(count, x) \
+  __asm__ ("rbit\t%0, %1\n\tclz\t%0, %0" : "=r" (count) : "r" (x))
 #define COUNT_LEADING_ZEROS_0 64
 #endif /* __aarch64__ */
 
@@ -952,7 +947,7 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype *, UWtype, UWtype, UWtype);
    being 1 code byte smaller.  "31-__cbtmp" is a workaround, probably at the
    cost of one extra instruction.  Do this for "i386" too, since that means
    generic x86.  */
-#if ! defined (count_leading_zeros) && __GNUC__ < 3                     \
+#if ! defined (count_leading_zeros) && __GNUC__ < 3			\
   && (HAVE_HOST_CPU_i386						\
       || HAVE_HOST_CPU_i686						\
       || HAVE_HOST_CPU_pentiumpro					\
@@ -1033,7 +1028,7 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype *, UWtype, UWtype, UWtype);
     ASSERT ((x) != 0);							\
     __asm__ ("bsfq %1,%q0" : "=r" (count) : "rm" ((UDItype)(x)));	\
   } while (0)
-#endif /* x86_64 */
+#endif /* __amd64__ */
 
 #if defined (__i860__) && W_TYPE_SIZE == 32
 #define rshift_rhlc(r,h,l,c) \
@@ -1162,7 +1157,7 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype *, UWtype, UWtype, UWtype);
      || defined (__mc68030__) || defined (mc68030) \
      || defined (__mc68040__) || defined (mc68040) \
      || defined (__mc68060__) || defined (mc68060) \
-     || defined (__NeXT__))                        \
+     || defined (__NeXT__))			   \
   && ! defined (__mcpu32__)
 #define count_leading_zeros(count, x) \
   __asm__ ("bfffo %1{%b2:%b2},%0"					\
@@ -1315,42 +1310,42 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype *, UWtype, UWtype, UWtype);
    the system vendor compilers.  (Is that vendor compilers with inline asm,
    or what?)  */
 
-#if (HAVE_HOST_CPU_FAMILY_power || HAVE_HOST_CPU_FAMILY_powerpc)        \
+#if (HAVE_HOST_CPU_FAMILY_power || HAVE_HOST_CPU_FAMILY_powerpc)	\
   && W_TYPE_SIZE == 32
 #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
   do {									\
     if (__builtin_constant_p (bh) && (bh) == 0)				\
-      __asm__ ("{a%I4|add%I4c} %1,%3,%4\n\t{aze|addze} %0,%2"		\
-	     : "=r" (sh), "=&r" (sl) : "r" (ah), "%r" (al), "rI" (bl));\
+      __asm__ ("add%I4c %1,%3,%4\n\taddze %0,%2"			\
+	     : "=r" (sh), "=&r" (sl) : "r" (ah), "%r" (al), "rI" (bl));	\
     else if (__builtin_constant_p (bh) && (bh) == ~(USItype) 0)		\
-      __asm__ ("{a%I4|add%I4c} %1,%3,%4\n\t{ame|addme} %0,%2"		\
-	     : "=r" (sh), "=&r" (sl) : "r" (ah), "%r" (al), "rI" (bl));\
+      __asm__ ("add%I4c %1,%3,%4\n\taddme %0,%2"			\
+	     : "=r" (sh), "=&r" (sl) : "r" (ah), "%r" (al), "rI" (bl));	\
     else								\
-      __asm__ ("{a%I5|add%I5c} %1,%4,%5\n\t{ae|adde} %0,%2,%3"		\
+      __asm__ ("add%I5c %1,%4,%5\n\tadde %0,%2,%3"			\
 	     : "=r" (sh), "=&r" (sl)					\
 	     : "r" (ah), "r" (bh), "%r" (al), "rI" (bl));		\
   } while (0)
 #define sub_ddmmss(sh, sl, ah, al, bh, bl) \
   do {									\
     if (__builtin_constant_p (ah) && (ah) == 0)				\
-      __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{sfze|subfze} %0,%2"	\
+      __asm__ ("subf%I3c %1,%4,%3\n\tsubfze %0,%2"			\
 	       : "=r" (sh), "=&r" (sl) : "r" (bh), "rI" (al), "r" (bl));\
     else if (__builtin_constant_p (ah) && (ah) == ~(USItype) 0)		\
-      __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{sfme|subfme} %0,%2"	\
+      __asm__ ("subf%I3c %1,%4,%3\n\tsubfme %0,%2"			\
 	       : "=r" (sh), "=&r" (sl) : "r" (bh), "rI" (al), "r" (bl));\
     else if (__builtin_constant_p (bh) && (bh) == 0)			\
-      __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{ame|addme} %0,%2"		\
+      __asm__ ("subf%I3c %1,%4,%3\n\taddme %0,%2"			\
 	       : "=r" (sh), "=&r" (sl) : "r" (ah), "rI" (al), "r" (bl));\
     else if (__builtin_constant_p (bh) && (bh) == ~(USItype) 0)		\
-      __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{aze|addze} %0,%2"		\
+      __asm__ ("subf%I3c %1,%4,%3\n\taddze %0,%2"			\
 	       : "=r" (sh), "=&r" (sl) : "r" (ah), "rI" (al), "r" (bl));\
     else								\
-      __asm__ ("{sf%I4|subf%I4c} %1,%5,%4\n\t{sfe|subfe} %0,%3,%2"	\
+      __asm__ ("subf%I4c %1,%5,%4\n\tsubfe %0,%3,%2"			\
 	       : "=r" (sh), "=&r" (sl)					\
 	       : "r" (ah), "r" (bh), "rI" (al), "r" (bl));		\
   } while (0)
 #define count_leading_zeros(count, x) \
-  __asm__ ("{cntlz|cntlzw} %0,%1" : "=r" (count) : "r" (x))
+  __asm__ ("cntlzw %0,%1" : "=r" (count) : "r" (x))
 #define COUNT_LEADING_ZEROS_0 32
 #if HAVE_HOST_CPU_FAMILY_powerpc
 #if __GMP_GNUC_PREREQ (4,4)
@@ -1398,55 +1393,55 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype *, UWtype, UWtype, UWtype);
 #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
   do {									\
     if (__builtin_constant_p (bh) && (bh) == 0)				\
-      __asm__ ("{a%I4|add%I4c} %1,%3,%4\n\t{aze|addze} %0,%2"		\
-	     : "=r" (sh), "=&r" (sl) : "r" (ah), "%r" (al), "rI" (bl));\
+      __asm__ ("add%I4c %1,%3,%4\n\taddze %0,%2"			\
+	     : "=r" (sh), "=&r" (sl) : "r" (ah), "%r" (al), "rI" (bl));	\
     else if (__builtin_constant_p (bh) && (bh) == ~(UDItype) 0)		\
-      __asm__ ("{a%I4|add%I4c} %1,%3,%4\n\t{ame|addme} %0,%2"		\
-	     : "=r" (sh), "=&r" (sl) : "r" (ah), "%r" (al), "rI" (bl));\
+      __asm__ ("add%I4c %1,%3,%4\n\taddme %0,%2"			\
+	     : "=r" (sh), "=&r" (sl) : "r" (ah), "%r" (al), "rI" (bl));	\
     else								\
-      __asm__ ("{a%I5|add%I5c} %1,%4,%5\n\t{ae|adde} %0,%2,%3"		\
+      __asm__ ("add%I5c %1,%4,%5\n\tadde %0,%2,%3"			\
 	     : "=r" (sh), "=&r" (sl)					\
 	     : "r" (ah), "r" (bh), "%r" (al), "rI" (bl));		\
   } while (0)
 /* We use "*rI" for the constant operand here, since with just "I", gcc barfs.
    This might seem strange, but gcc folds away the dead code late.  */
 #define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-  do {									      \
-    if (__builtin_constant_p (bl) && bl > -0x8000 && bl <= 0x8000) {	      \
-	if (__builtin_constant_p (ah) && (ah) == 0)			      \
-	  __asm__ ("{ai|addic} %1,%3,%4\n\t{sfze|subfze} %0,%2"		      \
+  do {									\
+    if (__builtin_constant_p (bl) && bl > -0x8000 && bl <= 0x8000) {	\
+	if (__builtin_constant_p (ah) && (ah) == 0)			\
+	  __asm__ ("addic %1,%3,%4\n\tsubfze %0,%2"			\
 		   : "=r" (sh), "=&r" (sl) : "r" (bh), "rI" (al), "*rI" (-bl)); \
-	else if (__builtin_constant_p (ah) && (ah) == ~(UDItype) 0)	      \
-	  __asm__ ("{ai|addic} %1,%3,%4\n\t{sfme|subfme} %0,%2"		      \
+	else if (__builtin_constant_p (ah) && (ah) == ~(UDItype) 0)	\
+	  __asm__ ("addic %1,%3,%4\n\tsubfme %0,%2"			\
 		   : "=r" (sh), "=&r" (sl) : "r" (bh), "rI" (al), "*rI" (-bl)); \
-	else if (__builtin_constant_p (bh) && (bh) == 0)		      \
-	  __asm__ ("{ai|addic} %1,%3,%4\n\t{ame|addme} %0,%2"		      \
+	else if (__builtin_constant_p (bh) && (bh) == 0)		\
+	  __asm__ ("addic %1,%3,%4\n\taddme %0,%2"			\
 		   : "=r" (sh), "=&r" (sl) : "r" (ah), "rI" (al), "*rI" (-bl)); \
-	else if (__builtin_constant_p (bh) && (bh) == ~(UDItype) 0)	      \
-	  __asm__ ("{ai|addic} %1,%3,%4\n\t{aze|addze} %0,%2"		      \
+	else if (__builtin_constant_p (bh) && (bh) == ~(UDItype) 0)	\
+	  __asm__ ("addic %1,%3,%4\n\taddze %0,%2"			\
 		   : "=r" (sh), "=&r" (sl) : "r" (ah), "rI" (al), "*rI" (-bl)); \
-	else								      \
-	  __asm__ ("{ai|addic} %1,%4,%5\n\t{sfe|subfe} %0,%3,%2"	      \
-		   : "=r" (sh), "=&r" (sl)				      \
-		   : "r" (ah), "r" (bh), "rI" (al), "*rI" (-bl));	      \
-      } else {								      \
-	if (__builtin_constant_p (ah) && (ah) == 0)			      \
-	  __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{sfze|subfze} %0,%2"	      \
-		   : "=r" (sh), "=&r" (sl) : "r" (bh), "rI" (al), "r" (bl));  \
-	else if (__builtin_constant_p (ah) && (ah) == ~(UDItype) 0)	      \
-	  __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{sfme|subfme} %0,%2"	      \
-		   : "=r" (sh), "=&r" (sl) : "r" (bh), "rI" (al), "r" (bl));  \
-	else if (__builtin_constant_p (bh) && (bh) == 0)		      \
-	  __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{ame|addme} %0,%2"	      \
-		   : "=r" (sh), "=&r" (sl) : "r" (ah), "rI" (al), "r" (bl));  \
-	else if (__builtin_constant_p (bh) && (bh) == ~(UDItype) 0)	      \
-	  __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{aze|addze} %0,%2"	      \
-		   : "=r" (sh), "=&r" (sl) : "r" (ah), "rI" (al), "r" (bl));  \
-	else								      \
-	  __asm__ ("{sf%I4|subf%I4c} %1,%5,%4\n\t{sfe|subfe} %0,%3,%2"	      \
-		   : "=r" (sh), "=&r" (sl)				      \
-		   : "r" (ah), "r" (bh), "rI" (al), "r" (bl));		      \
-      }									      \
+	else								\
+	  __asm__ ("addic %1,%4,%5\n\tsubfe %0,%3,%2"			\
+		   : "=r" (sh), "=&r" (sl)				\
+		   : "r" (ah), "r" (bh), "rI" (al), "*rI" (-bl));	\
+    } else {								\
+	if (__builtin_constant_p (ah) && (ah) == 0)			\
+	  __asm__ ("subf%I3c %1,%4,%3\n\tsubfze %0,%2"			\
+		   : "=r" (sh), "=&r" (sl) : "r" (bh), "rI" (al), "r" (bl)); \
+	else if (__builtin_constant_p (ah) && (ah) == ~(UDItype) 0)	\
+	  __asm__ ("subf%I3c %1,%4,%3\n\tsubfme %0,%2"			\
+		   : "=r" (sh), "=&r" (sl) : "r" (bh), "rI" (al), "r" (bl)); \
+	else if (__builtin_constant_p (bh) && (bh) == 0)		\
+	  __asm__ ("subf%I3c %1,%4,%3\n\taddme %0,%2"			\
+		   : "=r" (sh), "=&r" (sl) : "r" (ah), "rI" (al), "r" (bl)); \
+	else if (__builtin_constant_p (bh) && (bh) == ~(UDItype) 0)	\
+	  __asm__ ("subf%I3c %1,%4,%3\n\taddze %0,%2"			\
+		   : "=r" (sh), "=&r" (sl) : "r" (ah), "rI" (al), "r" (bl)); \
+	else								\
+	  __asm__ ("subf%I4c %1,%5,%4\n\tsubfe %0,%3,%2"		\
+		   : "=r" (sh), "=&r" (sl)				\
+		   : "r" (ah), "r" (bh), "rI" (al), "r" (bl));		\
+    }									\
   } while (0)
 #endif /* ! _LONG_LONG_LIMB */
 #define count_leading_zeros(count, x) \
@@ -1760,12 +1755,31 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype *, UWtype, UWtype, UWtype);
       "	subccc	%r6,%7,%%g0\n"						\
       "	subc	%r2,%3,%0"						\
 	  : "=r" (sh), "=&r" (sl)					\
-	  : "rJ" (ah), "rI" (bh), "rJ" (al), "rI" (bl),		\
+	  : "rJ" (ah), "rI" (bh), "rJ" (al), "rI" (bl),			\
 	    "rJ" ((al) >> 32), "rI" ((bl) >> 32)			\
 	   __CLOBBER_CC)
+#if __VIS__ >= 0x300
+#undef add_ssaaaa
+#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
+  __asm__ (								\
+       "addcc	%r4, %5, %1\n"						\
+      "	addxc	%r2, %r3, %0"						\
+	  : "=r" (sh), "=&r" (sl)					\
+	  : "rJ" (ah), "rJ" (bh), "%rJ" (al), "rI" (bl) __CLOBBER_CC)
+#define umul_ppmm(ph, pl, m0, m1) \
+  do {									\
+    UDItype __m0 = (m0), __m1 = (m1);					\
+    (pl) = __m0 * __m1;							\
+    __asm__ ("umulxhi\t%2, %1, %0"					\
+	     : "=r" (ph)						\
+	     : "%r" (__m0), "r" (__m1));				\
+  } while (0)
+#define count_leading_zeros(count, x) \
+  __asm__ ("lzd\t%1,%0" : "=r" (count) : "r" (x))
+#endif
 #endif
 
-#if defined (__vax__) && W_TYPE_SIZE == 32
+#if (defined (__vax) || defined (__vax__)) && W_TYPE_SIZE == 32
 #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
   __asm__ ("addl2 %5,%1\n\tadwc %3,%0"					\
 	   : "=g" (sh), "=&g" (sl)					\
@@ -1805,7 +1819,7 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype *, UWtype, UWtype, UWtype);
 	     : "g" ((USItype) (x)));					\
   } while (0)
 #endif
-#endif /* __vax__ */
+#endif /* vax */
 
 #if defined (__z8000__) && W_TYPE_SIZE == 16
 #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
@@ -1866,11 +1880,11 @@ extern UWtype mpn_umul_ppmm (UWtype *, UWtype, UWtype);
 
 #if ! defined (umul_ppmm) && HAVE_NATIVE_mpn_umul_ppmm  \
   && ! defined (LONGLONG_STANDALONE)
-#define umul_ppmm(wh, wl, u, v)						      \
-  do {									      \
-    UWtype __umul_ppmm__p0;						      \
-    (wh) = mpn_umul_ppmm (&__umul_ppmm__p0, (UWtype) (u), (UWtype) (v));      \
-    (wl) = __umul_ppmm__p0;						      \
+#define umul_ppmm(wh, wl, u, v)						\
+  do {									\
+    UWtype __umul_ppmm__p0;						\
+    (wh) = mpn_umul_ppmm (&__umul_ppmm__p0, (UWtype) (u), (UWtype) (v));\
+    (wl) = __umul_ppmm__p0;						\
   } while (0)
 #endif
 
@@ -1879,11 +1893,11 @@ extern UWtype mpn_umul_ppmm_r (UWtype, UWtype, UWtype *);
 
 #if ! defined (umul_ppmm) && HAVE_NATIVE_mpn_umul_ppmm_r	\
   && ! defined (LONGLONG_STANDALONE)
-#define umul_ppmm(wh, wl, u, v)						      \
-  do {									      \
-    UWtype __umul_ppmm__p0;						      \
-    (wh) = mpn_umul_ppmm_r ((UWtype) (u), (UWtype) (v), &__umul_ppmm__p0);    \
-    (wl) = __umul_ppmm__p0;						      \
+#define umul_ppmm(wh, wl, u, v)						\
+  do {									\
+    UWtype __umul_p0;							\
+    (wh) = mpn_umul_ppmm_r ((UWtype) (u), (UWtype) (v), &__umul_p0);	\
+    (wl) = __umul_p0;							\
   } while (0)
 #endif
 
@@ -1894,10 +1908,10 @@ extern UWtype mpn_udiv_qrnnd (UWtype *, UWtype, UWtype, UWtype);
   && ! defined (LONGLONG_STANDALONE)
 #define udiv_qrnnd(q, r, n1, n0, d)					\
   do {									\
-    UWtype __udiv_qrnnd__r;						\
-    (q) = mpn_udiv_qrnnd (&__udiv_qrnnd__r,				\
+    UWtype __udiv_qrnnd_r;						\
+    (q) = mpn_udiv_qrnnd (&__udiv_qrnnd_r,				\
 			  (UWtype) (n1), (UWtype) (n0), (UWtype) d);	\
-    (r) = __udiv_qrnnd__r;						\
+    (r) = __udiv_qrnnd_r;						\
   } while (0)
 #endif
 
@@ -1908,10 +1922,10 @@ extern UWtype mpn_udiv_qrnnd_r (UWtype, UWtype, UWtype, UWtype *);
   && ! defined (LONGLONG_STANDALONE)
 #define udiv_qrnnd(q, r, n1, n0, d)					\
   do {									\
-    UWtype __udiv_qrnnd__r;						\
+    UWtype __udiv_qrnnd_r;						\
     (q) = mpn_udiv_qrnnd_r ((UWtype) (n1), (UWtype) (n0), (UWtype) d,	\
-			    &__udiv_qrnnd__r);				\
-    (r) = __udiv_qrnnd__r;						\
+			    &__udiv_qrnnd_r);				\
+    (r) = __udiv_qrnnd_r;						\
   } while (0)
 #endif
 
@@ -1933,7 +1947,7 @@ extern UWtype mpn_udiv_qrnnd_r (UWtype, UWtype, UWtype, UWtype *);
   do {									\
     UWtype __x;								\
     __x = (al) - (bl);							\
-    (sh) = (ah) - (bh) - ((al) < (bl));                                 \
+    (sh) = (ah) - (bh) - ((al) < (bl));					\
     (sl) = __x;								\
   } while (0)
 #endif
diff --git a/src/ls.c b/src/ls.c
index f1ed43bd..cd5996eb 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -1,5 +1,5 @@
 /* 'dir', 'vdir' and 'ls' directory listing programs for GNU.
-   Copyright (C) 1985-2013 Free Software Foundation, Inc.
+   Copyright (C) 1985-2014 Free Software Foundation, Inc.
 
    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
@@ -101,12 +101,14 @@
 #include "obstack.h"
 #include "quote.h"
 #include "quotearg.h"
+#include "smack.h"
 #include "stat-size.h"
 #include "stat-time.h"
 #include "strftime.h"
 #include "xstrtol.h"
 #include "areadlink.h"
 #include "mbsalign.h"
+#include "dircolors.h"
 
 /* Include <sys/capability.h> last to avoid a clash of <sys/types.h>
    include guards with some premature versions of libcap.
@@ -185,7 +187,7 @@ verify (sizeof filetype_letter - 1 == arg_directory + 1);
 enum acl_type
   {
     ACL_T_NONE,
-    ACL_T_SELINUX_ONLY,
+    ACL_T_LSM_CONTEXT_ONLY,
     ACL_T_YES
   };
 
@@ -205,8 +207,8 @@ struct fileinfo
        zero.  */
     mode_t linkmode;
 
-    /* SELinux security context.  */
-    security_context_t scontext;
+    /* security context.  */
+    char *scontext;
 
     bool stat_ok;
 
@@ -215,7 +217,7 @@ struct fileinfo
     bool linkok;
 
     /* For long listings, true if the file has an access control list,
-       or an SELinux security context.  */
+       or a security context.  */
     enum acl_type acl_type;
 
     /* For color listings, true if a regular file has capability info.  */
@@ -962,25 +964,33 @@ static struct obstack subdired_obstack;
 static struct obstack dev_ino_obstack;
 
 /* Push a pair onto the device/inode stack.  */
-#define DEV_INO_PUSH(Dev, Ino)						\
-  do									\
-    {									\
-      struct dev_ino *di;						\
-      obstack_blank (&dev_ino_obstack, sizeof (struct dev_ino));	\
-      di = -1 + (struct dev_ino *) obstack_next_free (&dev_ino_obstack); \
-      di->st_dev = (Dev);						\
-      di->st_ino = (Ino);						\
-    }									\
-  while (0)
+static void
+dev_ino_push (dev_t dev, ino_t ino)
+{
+  void *vdi;
+  struct dev_ino *di;
+  int dev_ino_size = sizeof *di;
+  obstack_blank (&dev_ino_obstack, dev_ino_size);
+  vdi = obstack_next_free (&dev_ino_obstack);
+  di = vdi;
+  di--;
+  di->st_dev = dev;
+  di->st_ino = ino;
+}
 
 /* Pop a dev/ino struct off the global dev_ino_obstack
    and return that struct.  */
 static struct dev_ino
 dev_ino_pop (void)
 {
-  assert (sizeof (struct dev_ino) <= obstack_object_size (&dev_ino_obstack));
-  obstack_blank (&dev_ino_obstack, -(int) (sizeof (struct dev_ino)));
-  return *(struct dev_ino *) obstack_next_free (&dev_ino_obstack);
+  void *vdi;
+  struct dev_ino *di;
+  int dev_ino_size = sizeof *di;
+  assert (dev_ino_size <= obstack_object_size (&dev_ino_obstack));
+  obstack_blank (&dev_ino_obstack, -dev_ino_size);
+  vdi = obstack_next_free (&dev_ino_obstack);
+  di = vdi;
+  return *di;
 }
 
 /* Note the use commented out below:
@@ -1978,7 +1988,7 @@ decode_switches (int argc, char **argv)
   if (file_type <= indicator_style)
     {
       char const *p;
-      for (p = "*=>@|" + indicator_style - file_type; *p; p++)
+      for (p = &"*=>@|"[indicator_style - file_type]; *p; p++)
         set_char_quoting (filename_quoting_options, *p, 1);
     }
 
@@ -2317,6 +2327,30 @@ enum parse_state
     PS_FAIL
   };
 
+
+/* Check if the content of TERM is a valid name in dircolors.  */
+
+static bool
+known_term_type (void)
+{
+  char const *term = getenv ("TERM");
+  if (! term || ! *term)
+    return false;
+
+  char const *line = G_line;
+  while (line - G_line < sizeof (G_line))
+    {
+      if (STRNCMP_LIT (line, "TERM ") == 0)
+        {
+          if (STREQ (term, line + 5))
+            return true;
+        }
+      line += strlen (line) + 1;
+    }
+
+  return false;
+}
+
 static void
 parse_ls_color (void)
 {
@@ -2327,7 +2361,16 @@ parse_ls_color (void)
   struct color_ext_type *ext;	/* Extension we are working on */
 
   if ((p = getenv ("LS_COLORS")) == NULL || *p == '\0')
-    return;
+    {
+      /* LS_COLORS takes precedence, but if that's not set then
+         honor the COLORTERM and TERM env variables so that
+         we only go with the internal ANSI color codes if the
+         former is non empty or the latter is set to a known value.  */
+      char const *colorterm = getenv ("COLORTERM");
+      if (! (colorterm && *colorterm) && ! known_term_type ())
+        print_with_color = false;
+      return;
+    }
 
   ext = NULL;
   strcpy (label, "??");
@@ -2542,7 +2585,7 @@ print_dir (char const *name, char const *realname, bool command_line_arg)
           return;
         }
 
-      DEV_INO_PUSH (dir_stat.st_dev, dir_stat.st_ino);
+      dev_ino_push (dir_stat.st_dev, dir_stat.st_ino);
     }
 
   if (recursive || print_dir_name)
@@ -2638,7 +2681,7 @@ print_dir (char const *name, char const *realname, bool command_line_arg)
      contents listed rather than being mentioned here as files.  */
 
   if (recursive)
-    extract_dirs_from_files (name, command_line_arg);
+    extract_dirs_from_files (name, false);
 
   if (format == long_format || print_block_size)
     {
@@ -2734,7 +2777,7 @@ has_capability (char const *name)
 }
 #else
 static bool
-has_capability (char const *name ATTRIBUTE_UNUSED)
+has_capability (char const *name _GL_UNUSED)
 {
   errno = ENOTSUP;
   return false;
@@ -2749,7 +2792,12 @@ free_ent (struct fileinfo *f)
   free (f->name);
   free (f->linkname);
   if (f->scontext != UNKNOWN_SECURITY_CONTEXT)
-    freecon (f->scontext);
+    {
+      if (is_smack_enabled ())
+        free (f->scontext);
+      else
+        freecon (f->scontext);
+    }
 }
 
 /* Empty the table of files.  */
@@ -2790,8 +2838,8 @@ errno_unsupported (int err)
 }
 
 /* Cache *getfilecon failure, when it's trivial to do so.
-   Like getfilecon/lgetfilecon, but when F's st_dev says it's on a known-
-   SELinux-challenged file system, fail with ENOTSUP immediately.  */
+   Like getfilecon/lgetfilecon, but when F's st_dev says it's doesn't
+   support getting the security context, fail with ENOTSUP immediately.  */
 static int
 getfilecon_cache (char const *file, struct fileinfo *f, bool deref)
 {
@@ -2804,9 +2852,16 @@ getfilecon_cache (char const *file, struct fileinfo *f, bool deref)
       errno = ENOTSUP;
       return -1;
     }
-  int r = (deref
-           ? getfilecon (file, &f->scontext)
-           : lgetfilecon (file, &f->scontext));
+  int r = 0;
+#ifdef HAVE_SMACK
+  if (is_smack_enabled ())
+    r = smack_new_label_from_path (file, "security.SMACK64", deref,
+                                   &f->scontext);
+  else
+#endif
+    r = (deref
+         ? getfilecon (file, &f->scontext)
+         : lgetfilecon (file, &f->scontext));
   if (r < 0 && errno_unsupported (errno))
     unsupported_device = f->stat.st_dev;
   return r;
@@ -2997,13 +3052,18 @@ gobble_file (char const *name, enum filetype type, ino_t inode,
 
       if (format == long_format || print_scontext)
         {
-          bool have_selinux = false;
+          bool have_scontext = false;
           bool have_acl = false;
           int attr_len = getfilecon_cache (absolute_name, f, do_deref);
           err = (attr_len < 0);
 
           if (err == 0)
-            have_selinux = ! STREQ ("unlabeled", f->scontext);
+            {
+              if (is_smack_enabled ())
+                have_scontext = ! STREQ ("_", f->scontext);
+              else
+                have_scontext = ! STREQ ("unlabeled", f->scontext);
+            }
           else
             {
               f->scontext = UNKNOWN_SECURITY_CONTEXT;
@@ -3023,10 +3083,10 @@ gobble_file (char const *name, enum filetype type, ino_t inode,
               have_acl = (0 < n);
             }
 
-          f->acl_type = (!have_selinux && !have_acl
+          f->acl_type = (!have_scontext && !have_acl
                          ? ACL_T_NONE
-                         : (have_selinux && !have_acl
-                            ? ACL_T_SELINUX_ONLY
+                         : (have_scontext && !have_acl
+                            ? ACL_T_LSM_CONTEXT_ONLY
                             : ACL_T_YES));
           any_has_acl |= f->acl_type != ACL_T_NONE;
 
@@ -3773,7 +3833,7 @@ print_long_format (const struct fileinfo *f)
   struct tm *when_local;
 
   /* Compute the mode string, except remove the trailing space if no
-     file in this directory has an ACL or SELinux security context.  */
+     file in this directory has an ACL or security context.  */
   if (f->stat_ok)
     filemodestring (&f->stat, modebuf);
   else
@@ -3784,7 +3844,7 @@ print_long_format (const struct fileinfo *f)
     }
   if (! any_has_acl)
     modebuf[10] = '\0';
-  else if (f->acl_type == ACL_T_SELINUX_ONLY)
+  else if (f->acl_type == ACL_T_LSM_CONTEXT_ONLY)
     modebuf[10] = '.';
   else if (f->acl_type == ACL_T_YES)
     modebuf[10] = '+';
@@ -4732,21 +4792,21 @@ Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n\
   -b, --escape               print C-style escapes for nongraphic characters\n\
 "), stdout);
       fputs (_("\
-      --block-size=SIZE      scale sizes by SIZE before printing them.  E.g.,\n\
+      --block-size=SIZE      scale sizes by SIZE before printing them; e.g.,\n\
                                '--block-size=M' prints sizes in units of\n\
-                               1,048,576 bytes.  See SIZE format below.\n\
+                               1,048,576 bytes; see SIZE format below\n\
   -B, --ignore-backups       do not list implied entries ending with ~\n\
   -c                         with -lt: sort by, and show, ctime (time of last\n\
-                               modification of file status information)\n\
-                               with -l: show ctime and sort by name\n\
+                               modification of file status information);\n\
+                               with -l: show ctime and sort by name;\n\
                                otherwise: sort by ctime, newest first\n\
 "), stdout);
       fputs (_("\
   -C                         list entries by columns\n\
-      --color[=WHEN]         colorize the output.  WHEN defaults to 'always'\n\
-                               or can be 'never' or 'auto'.  More info below\n\
-  -d, --directory            list directory entries instead of contents,\n\
-                               and do not dereference symbolic links\n\
+      --color[=WHEN]         colorize the output; WHEN can be 'never', 'auto',\
+\n\
+                               or 'always' (the default); more info below\n\
+  -d, --directory            list directories themselves, not their contents\n\
   -D, --dired                generate output designed for Emacs' dired mode\n\
 "), stdout);
       fputs (_("\
@@ -4762,13 +4822,13 @@ Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n\
 "), stdout);
       fputs (_("\
       --group-directories-first\n\
-                             group directories before files.\n\
-                               augment with a --sort option, but any\n\
+                             group directories before files;\n\
+                               can be augmented with a --sort option, but any\n\
                                use of --sort=none (-U) disables grouping\n\
 "), stdout);
       fputs (_("\
   -G, --no-group             in a long listing, don't print group names\n\
-  -h, --human-readable       with -l, print sizes in human readable format\n\
+  -h, --human-readable       with -l and/or -s, print human readable sizes\n\
                                (e.g., 1K 234M 2G)\n\
       --si                   likewise, but use powers of 1000 not 1024\n\
 "), stdout);
@@ -4777,7 +4837,7 @@ Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n\
                              follow symbolic links listed on the command line\n\
       --dereference-command-line-symlink-to-dir\n\
                              follow each command line symbolic link\n\
-                             that points to a directory\n\
+                               that points to a directory\n\
       --hide=PATTERN         do not list implied entries matching shell PATTERN\
 \n\
                                (overridden by -a or -A)\n\
@@ -4790,7 +4850,7 @@ Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n\
   -i, --inode                print the index number of each file\n\
   -I, --ignore=PATTERN       do not list implied entries matching shell PATTERN\
 \n\
-  -k, --kibibytes            use 1024-byte blocks\n\
+  -k, --kibibytes            default to 1024-byte blocks for disk usage\n\
 "), stdout);
       fputs (_("\
   -l                         use a long listing format\n\
@@ -4809,9 +4869,10 @@ Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n\
                              append / indicator to directories\n\
 "), stdout);
       fputs (_("\
-  -q, --hide-control-chars   print ? instead of non graphic characters\n\
-      --show-control-chars   show non graphic characters as-is (default\n\
-                             unless program is 'ls' and output is a terminal)\n\
+  -q, --hide-control-chars   print ? instead of nongraphic characters\n\
+      --show-control-chars   show nongraphic characters as-is (the default,\n\
+                               unless program is 'ls' and output is a terminal)\
+\n\
   -Q, --quote-name           enclose entry names in double quotes\n\
       --quoting-style=WORD   use quoting style WORD for entry names:\n\
                                literal, locale, shell, shell-always, c, escape\
@@ -4824,30 +4885,33 @@ Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n\
 "), stdout);
       fputs (_("\
   -S                         sort by file size\n\
-      --sort=WORD            sort by WORD instead of name: none -U,\n\
-                             extension -X, size -S, time -t, version -v\n\
-      --time=WORD            with -l, show time as WORD instead of modification\
-\n\
-                             time: atime -u, access -u, use -u, ctime -c,\n\
-                             or status -c; use specified time as sort key\n\
-                             if --sort=time\n\
+      --sort=WORD            sort by WORD instead of name: none (-U), size (-S)\
+,\n\
+                               time (-t), version (-v), extension (-X)\n\
+      --time=WORD            with -l, show time as WORD instead of default\n\
+                               modification time: atime or access or use (-u)\n\
+                               ctime or status (-c); also use specified time\n\
+                               as sort key if --sort=time\n\
 "), stdout);
       fputs (_("\
       --time-style=STYLE     with -l, show times using style STYLE:\n\
-                             full-iso, long-iso, iso, locale, +FORMAT.\n\
-                             FORMAT is interpreted like 'date'; if FORMAT is\n\
-                             FORMAT1<newline>FORMAT2, FORMAT1 applies to\n\
-                             non-recent files and FORMAT2 to recent files;\n\
-                             if STYLE is prefixed with 'posix-', STYLE\n\
-                             takes effect only outside the POSIX locale\n\
+                               full-iso, long-iso, iso, locale, or +FORMAT;\n\
+                               FORMAT is interpreted like in 'date'; if FORMAT\
+\n\
+                               is FORMAT1<newline>FORMAT2, then FORMAT1 applies\
+\n\
+                               to non-recent files and FORMAT2 to recent files;\
+\n\
+                               if STYLE is prefixed with 'posix-', STYLE\n\
+                               takes effect only outside the POSIX locale\n\
 "), stdout);
       fputs (_("\
   -t                         sort by modification time, newest first\n\
   -T, --tabsize=COLS         assume tab stops at each COLS instead of 8\n\
 "), stdout);
       fputs (_("\
-  -u                         with -lt: sort by, and show, access time\n\
-                               with -l: show access time and sort by name\n\
+  -u                         with -lt: sort by, and show, access time;\n\
+                               with -l: show access time and sort by name;\n\
                                otherwise: sort by access time\n\
   -U                         do not sort; list entries in directory order\n\
   -v                         natural sort of (version) numbers within text\n\
@@ -4856,7 +4920,7 @@ Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n\
   -w, --width=COLS           assume screen width instead of current value\n\
   -x                         list entries by lines instead of by columns\n\
   -X                         sort alphabetically by entry extension\n\
-  -Z, --context              print any SELinux security context of each file\n\
+  -Z, --context              print any security context of each file\n\
   -1                         list one file per line\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
diff --git a/src/make-prime-list.c b/src/make-prime-list.c
index 4ec01cf3..c01b1200 100644
--- a/src/make-prime-list.c
+++ b/src/make-prime-list.c
@@ -3,7 +3,7 @@
    Contributed to the GNU project by Torbjörn Granlund and Niels Möller
    Contains code from GNU MP.
 
-Copyright 2012-2013 Free Software Foundation, Inc.
+Copyright 2012-2014 Free Software Foundation, Inc.
 
 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
diff --git a/src/md5sum.c b/src/md5sum.c
index b4378115..cc6dd49e 100644
--- a/src/md5sum.c
+++ b/src/md5sum.c
@@ -1,5 +1,5 @@
 /* Compute checksums of files or strings.
-   Copyright (C) 1995-2013 Free Software Foundation, Inc.
+   Copyright (C) 1995-2014 Free Software Foundation, Inc.
 
    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
@@ -194,15 +194,13 @@ With no FILE, or when FILE is -, read standard input.\n\
 "), stdout);
       fputs (_("\
 \n\
-The following three options are useful only when verifying checksums:\n\
+The following four options are useful only when verifying checksums:\n\
       --quiet          don't print OK for each successfully verified file\n\
       --status         don't output anything, status code shows success\n\
+      --strict         exit non-zero for improperly formatted checksum lines\n\
   -w, --warn           warn about improperly formatted checksum lines\n\
 \n\
 "), stdout);
-      fputs (_("\
-      --strict         with --check, exit non-zero for any invalid input\n\
-"), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
       printf (_("\
@@ -657,11 +655,17 @@ digest_check (const char *checkfile_name)
           && (!strict || n_improperly_formatted_lines == 0));
 }
 
+/* If ESCAPE is true, then translate each NEWLINE byte to the string, "\\n",
+   and each backslash to "\\\\".  */
 static void
-print_filename (char const *file)
+print_filename (char const *file, bool escape)
 {
-  /* Translate each NEWLINE byte to the string, "\\n",
-     and each backslash to "\\\\".  */
+  if (! escape)
+    {
+      fputs (file, stdout);
+      return;
+    }
+
   while (*file)
     {
       switch (*file)
@@ -823,14 +827,23 @@ main (int argc, char **argv)
             ok = false;
           else
             {
+              /* We don't really need to escape, and hence detect, the '\\'
+                 char, and not doing so should be both forwards and backwards
+                 compatible, since only escaped lines would have a '\\' char at
+                 the start.  However just in case users are directly comparing
+                 against old (hashed) outputs, in the presence of files
+                 containing '\\' characters, we decided to not simplify the
+                 output in this case.  */
+              bool needs_escape = strchr (file, '\\') || strchr (file, '\n');
+
               if (prefix_tag)
                 {
-                  if (strchr (file, '\n') || strchr (file, '\\'))
+                  if (needs_escape)
                     putchar ('\\');
 
                   fputs (DIGEST_TYPE_STRING, stdout);
                   fputs (" (", stdout);
-                  print_filename (file);
+                  print_filename (file, needs_escape);
                   fputs (") = ", stdout);
                 }
 
@@ -838,7 +851,7 @@ main (int argc, char **argv)
 
               /* Output a leading backslash if the file name contains
                  a newline or backslash.  */
-              if (!prefix_tag && (strchr (file, '\n') || strchr (file, '\\')))
+              if (!prefix_tag && needs_escape)
                 putchar ('\\');
 
               for (i = 0; i < (digest_hex_bytes / 2); ++i)
@@ -850,7 +863,7 @@ main (int argc, char **argv)
 
                   putchar (file_is_binary ? '*' : ' ');
 
-                  print_filename (file);
+                  print_filename (file, needs_escape);
                 }
 
               putchar ('\n');
diff --git a/src/mkdir.c b/src/mkdir.c
index a94f96e1..eb9693cc 100644
--- a/src/mkdir.c
+++ b/src/mkdir.c
@@ -1,5 +1,5 @@
 /* mkdir -- make directories
-   Copyright (C) 1990-2013 Free Software Foundation, Inc.
+   Copyright (C) 1990-2014 Free Software Foundation, Inc.
 
    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
@@ -29,6 +29,8 @@
 #include "prog-fprintf.h"
 #include "quote.h"
 #include "savewd.h"
+#include "selinux.h"
+#include "smack.h"
 
 /* The official name of this program (e.g., no 'g' prefix).  */
 #define PROGRAM_NAME "mkdir"
@@ -64,8 +66,12 @@ Create the DIRECTORY(ies), if they do not already exist.\n\
   -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n\
   -p, --parents     no error if existing, make parent directories as needed\n\
   -v, --verbose     print a message for each created directory\n\
-  -Z, --context=CTX  set the SELinux security context of each created\n\
-                      directory to CTX\n\
+"), stdout);
+      fputs (_("\
+  -Z                   set SELinux security context of each created directory\n\
+                         to the default type\n\
+      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n\
+                         or SMACK security context to CTX\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
@@ -81,8 +87,8 @@ struct mkdir_options
      made.  */
   int (*make_ancestor_function) (char const *, char const *, void *);
 
-  /* Mode for ancestor directory.  */
-  mode_t ancestor_mode;
+  /* Umask value in effect.  */
+  mode_t umask_value;
 
   /* Mode for directory itself.  */
   mode_t mode;
@@ -90,6 +96,9 @@ struct mkdir_options
   /* File mode bits affected by MODE.  */
   mode_t mode_bits;
 
+  /* Set the SELinux File Context.  */
+  bool set_security_context;
+
   /* If not null, format to use when reporting newly made directories.  */
   char const *created_directory_format;
 };
@@ -112,10 +121,26 @@ static int
 make_ancestor (char const *dir, char const *component, void *options)
 {
   struct mkdir_options const *o = options;
-  int r = mkdir (component, o->ancestor_mode);
+
+  if (o->set_security_context && defaultcon (dir, S_IFDIR) < 0
+      && ! ignorable_ctx_err (errno))
+    error (0, errno, _("failed to set default creation context for %s"),
+           quote (dir));
+
+  mode_t user_wx = S_IWUSR | S_IXUSR;
+  bool self_denying_umask = (o->umask_value & user_wx) != 0;
+  if (self_denying_umask)
+    umask (o->umask_value & ~user_wx);
+  int r = mkdir (component, S_IRWXUGO);
+  if (self_denying_umask)
+    {
+      int mkdir_errno = errno;
+      umask (o->umask_value);
+      errno = mkdir_errno;
+    }
   if (r == 0)
     {
-      r = ! (o->ancestor_mode & S_IRUSR);
+      r = (o->umask_value & S_IRUSR) != 0;
       announce_mkdir (dir, options);
     }
   return r;
@@ -126,11 +151,48 @@ static int
 process_dir (char *dir, struct savewd *wd, void *options)
 {
   struct mkdir_options const *o = options;
-  return (make_dir_parents (dir, wd, o->make_ancestor_function, options,
-                            o->mode, announce_mkdir,
-                            o->mode_bits, (uid_t) -1, (gid_t) -1, true)
-          ? EXIT_SUCCESS
-          : EXIT_FAILURE);
+  bool set_defaultcon = false;
+
+  /* If possible set context before DIR created.  */
+  if (o->set_security_context)
+    {
+      if (! o->make_ancestor_function)
+        set_defaultcon = true;
+      else
+        {
+          char *pdir = dir_name (dir);
+          struct stat st;
+          if (STREQ (pdir, ".")
+              || (stat (pdir, &st) == 0 && S_ISDIR (st.st_mode)))
+            set_defaultcon = true;
+          free (pdir);
+        }
+      if (set_defaultcon && defaultcon (dir, S_IFDIR) < 0
+          && ! ignorable_ctx_err (errno))
+        error (0, errno, _("failed to set default creation context for %s"),
+               quote (dir));
+    }
+
+  int ret = (make_dir_parents (dir, wd, o->make_ancestor_function, options,
+                               o->mode, announce_mkdir,
+                               o->mode_bits, (uid_t) -1, (gid_t) -1, true)
+             ? EXIT_SUCCESS
+             : EXIT_FAILURE);
+
+  /* FIXME: Due to the current structure of make_dir_parents()
+     we don't have the facility to call defaultcon() before the
+     final component of DIR is created.  So for now, create the
+     final component with the context from previous component
+     and here we set the context for the final component. */
+  if (ret == EXIT_SUCCESS && o->set_security_context && ! set_defaultcon)
+    {
+      if (! restorecon (last_component (dir), false, false)
+          && ! ignorable_ctx_err (errno))
+        error (0, errno, _("failed to restore context for %s"),
+               quote (dir));
+    }
+
+  return ret;
 }
 
 int
@@ -138,13 +200,14 @@ main (int argc, char **argv)
 {
   const char *specified_mode = NULL;
   int optc;
-  security_context_t scontext = NULL;
+  char const *scontext = NULL;
   struct mkdir_options options;
 
   options.make_ancestor_function = NULL;
   options.mode = S_IRWXUGO;
   options.mode_bits = 0;
   options.created_directory_format = NULL;
+  options.set_security_context = false;
 
   initialize_main (&argc, &argv);
   set_program_name (argv[0]);
@@ -154,7 +217,7 @@ main (int argc, char **argv)
 
   atexit (close_stdout);
 
-  while ((optc = getopt_long (argc, argv, "pm:vZ:", longopts, NULL)) != -1)
+  while ((optc = getopt_long (argc, argv, "pm:vZ", longopts, NULL)) != -1)
     {
       switch (optc)
         {
@@ -168,7 +231,24 @@ main (int argc, char **argv)
           options.created_directory_format = _("created directory %s");
           break;
         case 'Z':
-          scontext = optarg;
+          if (is_smack_enabled ())
+            {
+              /* We don't yet support -Z to restore context with SMACK.  */
+              scontext = optarg;
+            }
+          else if (is_selinux_enabled () > 0)
+            {
+              if (optarg)
+                scontext = optarg;
+              else
+                options.set_security_context = true;
+            }
+          else if (optarg)
+            {
+              error (0, 0,
+                     _("warning: ignoring --context; "
+                       "it requires an SELinux/SMACK-enabled kernel"));
+            }
           break;
         case_GETOPT_HELP_CHAR;
         case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
@@ -183,16 +263,29 @@ main (int argc, char **argv)
       usage (EXIT_FAILURE);
     }
 
-  if (scontext && setfscreatecon (scontext) < 0)
-    error (EXIT_FAILURE, errno,
-           _("failed to set default file creation context to %s"),
-           quote (scontext));
+  /* FIXME: This assumes mkdir() is done in the same process.
+     If that's not always the case we would need to call this
+     like we do when options.set_security_context == true.  */
+  if (scontext)
+    {
+      int ret = 0;
+      if (is_smack_enabled ())
+        ret = smack_set_label_for_self (scontext);
+      else
+        ret = setfscreatecon (se_const (scontext));
+
+      if (ret < 0)
+        error (EXIT_FAILURE, errno,
+               _("failed to set default file creation context to %s"),
+               quote (scontext));
+    }
+
 
   if (options.make_ancestor_function || specified_mode)
     {
       mode_t umask_value = umask (0);
-
-      options.ancestor_mode = (S_IRWXUGO & ~umask_value) | (S_IWUSR | S_IXUSR);
+      umask (umask_value);
+      options.umask_value = umask_value;
 
       if (specified_mode)
         {
@@ -205,7 +298,7 @@ main (int argc, char **argv)
           free (change);
         }
       else
-        options.mode = S_IRWXUGO & ~umask_value;
+        options.mode = S_IRWXUGO;
     }
 
   exit (savewd_process_files (argc - optind, argv + optind,
diff --git a/src/mkfifo.c b/src/mkfifo.c
index 76291e5b..415ae562 100644
--- a/src/mkfifo.c
+++ b/src/mkfifo.c
@@ -1,5 +1,5 @@
 /* mkfifo -- make fifo's (named pipes)
-   Copyright (C) 1990-2013 Free Software Foundation, Inc.
+   Copyright (C) 1990-2014 Free Software Foundation, Inc.
 
    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
@@ -26,6 +26,8 @@
 #include "error.h"
 #include "modechange.h"
 #include "quote.h"
+#include "selinux.h"
+#include "smack.h"
 
 /* The official name of this program (e.g., no 'g' prefix).  */
 #define PROGRAM_NAME "mkfifo"
@@ -59,7 +61,9 @@ Create named pipes (FIFOs) with the given NAMEs.\n\
   -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n\
 "), stdout);
       fputs (_("\
-  -Z, --context=CTX  set the SELinux security context of each NAME to CTX\n\
+  -Z                   set the SELinux security context to default type\n\
+      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n\
+                         or SMACK security context to CTX\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
@@ -75,7 +79,8 @@ main (int argc, char **argv)
   char const *specified_mode = NULL;
   int exit_status = EXIT_SUCCESS;
   int optc;
-  security_context_t scontext = NULL;
+  char const *scontext = NULL;
+  bool set_security_context = false;
 
   initialize_main (&argc, &argv);
   set_program_name (argv[0]);
@@ -85,7 +90,7 @@ main (int argc, char **argv)
 
   atexit (close_stdout);
 
-  while ((optc = getopt_long (argc, argv, "m:Z:", longopts, NULL)) != -1)
+  while ((optc = getopt_long (argc, argv, "m:Z", longopts, NULL)) != -1)
     {
       switch (optc)
         {
@@ -93,7 +98,24 @@ main (int argc, char **argv)
           specified_mode = optarg;
           break;
         case 'Z':
-          scontext = optarg;
+          if (is_smack_enabled ())
+            {
+              /* We don't yet support -Z to restore context with SMACK.  */
+              scontext = optarg;
+            }
+          else if (is_selinux_enabled () > 0)
+            {
+              if (optarg)
+                scontext = optarg;
+              else
+                set_security_context = true;
+            }
+          else if (optarg)
+            {
+              error (0, 0,
+                     _("warning: ignoring --context; "
+                       "it requires an SELinux/SMACK-enabled kernel"));
+            }
           break;
         case_GETOPT_HELP_CHAR;
         case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
@@ -108,18 +130,30 @@ main (int argc, char **argv)
       usage (EXIT_FAILURE);
     }
 
-  if (scontext && setfscreatecon (scontext) < 0)
-    error (EXIT_FAILURE, errno,
-           _("failed to set default file creation context to %s"),
-           quote (scontext));
+  if (scontext)
+    {
+      int ret = 0;
+      if (is_smack_enabled ())
+        ret = smack_set_label_for_self (scontext);
+      else
+        ret = setfscreatecon (se_const (scontext));
+
+      if (ret < 0)
+        error (EXIT_FAILURE, errno,
+               _("failed to set default file creation context to %s"),
+               quote (scontext));
+    }
 
   newmode = MODE_RW_UGO;
   if (specified_mode)
     {
+      mode_t umask_value;
       struct mode_change *change = mode_compile (specified_mode);
       if (!change)
         error (EXIT_FAILURE, 0, _("invalid mode"));
-      newmode = mode_adjust (newmode, false, umask (0), change, NULL);
+      umask_value = umask (0);
+      umask (umask_value);
+      newmode = mode_adjust (newmode, false, umask_value, change, NULL);
       free (change);
       if (newmode & ~S_IRWXUGO)
         error (EXIT_FAILURE, 0,
@@ -127,11 +161,21 @@ main (int argc, char **argv)
     }
 
   for (; optind < argc; ++optind)
-    if (mkfifo (argv[optind], newmode) != 0)
-      {
-        error (0, errno, _("cannot create fifo %s"), quote (argv[optind]));
-        exit_status = EXIT_FAILURE;
-      }
+    {
+      if (set_security_context)
+        defaultcon (argv[optind], S_IFIFO);
+      if (mkfifo (argv[optind], newmode) != 0)
+        {
+          error (0, errno, _("cannot create fifo %s"), quote (argv[optind]));
+          exit_status = EXIT_FAILURE;
+        }
+      else if (specified_mode && lchmod (argv[optind], newmode) != 0)
+        {
+          error (0, errno, _("cannot set permissions of %s"),
+                 quote (argv[optind]));
+          exit_status = EXIT_FAILURE;
+        }
+    }
 
   exit (exit_status);
 }
diff --git a/src/mknod.c b/src/mknod.c
index 7cfc708d..8f547e9c 100644
--- a/src/mknod.c
+++ b/src/mknod.c
@@ -1,5 +1,5 @@
 /* mknod -- make special files
-   Copyright (C) 1990-2013 Free Software Foundation, Inc.
+   Copyright (C) 1990-2014 Free Software Foundation, Inc.
 
    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
@@ -26,6 +26,8 @@
 #include "error.h"
 #include "modechange.h"
 #include "quote.h"
+#include "selinux.h"
+#include "smack.h"
 #include "xstrtol.h"
 
 /* The official name of this program (e.g., no 'g' prefix).  */
@@ -61,7 +63,9 @@ Create the special file NAME of the given TYPE.\n\
   -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n\
 "), stdout);
       fputs (_("\
-  -Z, --context=CTX  set the SELinux security context of NAME to CTX\n\
+  -Z                   set the SELinux security context to default type\n\
+      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n\
+                         or SMACK security context to CTX\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
@@ -92,7 +96,8 @@ main (int argc, char **argv)
   int optc;
   int expected_operands;
   mode_t node_type;
-  security_context_t scontext = NULL;
+  char const *scontext = NULL;
+  bool set_security_context = false;
 
   initialize_main (&argc, &argv);
   set_program_name (argv[0]);
@@ -102,7 +107,7 @@ main (int argc, char **argv)
 
   atexit (close_stdout);
 
-  while ((optc = getopt_long (argc, argv, "m:Z:", longopts, NULL)) != -1)
+  while ((optc = getopt_long (argc, argv, "m:Z", longopts, NULL)) != -1)
     {
       switch (optc)
         {
@@ -110,7 +115,24 @@ main (int argc, char **argv)
           specified_mode = optarg;
           break;
         case 'Z':
-          scontext = optarg;
+          if (is_smack_enabled ())
+            {
+              /* We don't yet support -Z to restore context with SMACK.  */
+              scontext = optarg;
+            }
+          else if (is_selinux_enabled () > 0)
+            {
+              if (optarg)
+                scontext = optarg;
+              else
+                set_security_context = true;
+            }
+          else if (optarg)
+            {
+              error (0, 0,
+                     _("warning: ignoring --context; "
+                       "it requires an SELinux/SMACK-enabled kernel"));
+            }
           break;
         case_GETOPT_HELP_CHAR;
         case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
@@ -122,10 +144,13 @@ main (int argc, char **argv)
   newmode = MODE_RW_UGO;
   if (specified_mode)
     {
+      mode_t umask_value;
       struct mode_change *change = mode_compile (specified_mode);
       if (!change)
         error (EXIT_FAILURE, 0, _("invalid mode"));
-      newmode = mode_adjust (newmode, false, umask (0), change, NULL);
+      umask_value = umask (0);
+      umask (umask_value);
+      newmode = mode_adjust (newmode, false, umask_value, change, NULL);
       free (change);
       if (newmode & ~S_IRWXUGO)
         error (EXIT_FAILURE, 0,
@@ -161,10 +186,19 @@ main (int argc, char **argv)
       usage (EXIT_FAILURE);
     }
 
-  if (scontext && setfscreatecon (scontext) < 0)
-    error (EXIT_FAILURE, errno,
-           _("failed to set default file creation context to %s"),
-           quote (scontext));
+  if (scontext)
+    {
+      int ret = 0;
+      if (is_smack_enabled ())
+        ret = smack_set_label_for_self (scontext);
+      else
+        ret = setfscreatecon (se_const (scontext));
+
+      if (ret < 0)
+        error (EXIT_FAILURE, errno,
+               _("failed to set default file creation context to %s"),
+               quote (scontext));
+    }
 
   /* Only check the first character, to allow mnemonic usage like
      'mknod /dev/rst0 character 18 0'. */
@@ -211,12 +245,17 @@ main (int argc, char **argv)
           error (EXIT_FAILURE, 0, _("invalid device %s %s"), s_major, s_minor);
 #endif
 
+        if (set_security_context)
+          defaultcon (argv[optind], node_type);
+
         if (mknod (argv[optind], newmode | node_type, device) != 0)
           error (EXIT_FAILURE, errno, "%s", quote (argv[optind]));
       }
       break;
 
     case 'p':			/* 'pipe' */
+      if (set_security_context)
+        defaultcon (argv[optind], S_IFIFO);
       if (mkfifo (argv[optind], newmode) != 0)
         error (EXIT_FAILURE, errno, "%s", quote (argv[optind]));
       break;
@@ -226,5 +265,9 @@ main (int argc, char **argv)
       usage (EXIT_FAILURE);
     }
 
+  if (specified_mode && lchmod (argv[optind], newmode) != 0)
+    error (EXIT_FAILURE, errno, _("cannot set permissions of %s"),
+           quote (argv[optind]));
+
   exit (EXIT_SUCCESS);
 }
diff --git a/src/mktemp.c b/src/mktemp.c
index aef140af..2bd80bae 100644
--- a/src/mktemp.c
+++ b/src/mktemp.c
@@ -1,5 +1,5 @@
 /* Create a temporary file or directory, safely.
-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    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
@@ -26,7 +26,6 @@
 #include "error.h"
 #include "filenamecat.h"
 #include "quote.h"
-#include "stdio--.h"
 #include "tempname.h"
 
 /* The official name of this program (e.g., no 'g' prefix).  */
@@ -43,7 +42,6 @@ static const char *default_template = "tmp.XXXXXXXXXX";
 enum
 {
   SUFFIX_OPTION = CHAR_MAX + 1,
-  TMPDIR_OPTION
 };
 
 static struct option const longopts[] =
@@ -52,7 +50,7 @@ static struct option const longopts[] =
   {"quiet", no_argument, NULL, 'q'},
   {"dry-run", no_argument, NULL, 'u'},
   {"suffix", required_argument, NULL, SUFFIX_OPTION},
-  {"tmpdir", optional_argument, NULL, TMPDIR_OPTION},
+  {"tmpdir", optional_argument, NULL, 'p'},
   {GETOPT_HELP_OPTION_DECL},
   {GETOPT_VERSION_OPTION_DECL},
   {NULL, 0, NULL, 0}
@@ -81,24 +79,21 @@ Files are created u+rw, and directories u+rwx, minus umask restrictions.\n\
   -q, --quiet         suppress diagnostics about file/dir-creation failure\n\
 "), stdout);
       fputs (_("\
-      --suffix=SUFF   append SUFF to TEMPLATE.  SUFF must not contain slash.\n\
-                        This option is implied if TEMPLATE does not end in X.\n\
+      --suffix=SUFF   append SUFF to TEMPLATE; SUFF must not contain a slash.\n\
+                        This option is implied if TEMPLATE does not end in X\n\
 "), stdout);
       fputs (_("\
-      --tmpdir[=DIR]  interpret TEMPLATE relative to DIR.  If DIR is not\n\
+  -p DIR, --tmpdir[=DIR]  interpret TEMPLATE relative to DIR; if DIR is not\n\
                         specified, use $TMPDIR if set, else /tmp.  With\n\
-                        this option, TEMPLATE must not be an absolute name.\n\
-                        Unlike with -t, TEMPLATE may contain slashes, but\n\
+                        this option, TEMPLATE must not be an absolute name;\n\
+                        unlike with -t, TEMPLATE may contain slashes, but\n\
                         mktemp creates only the final component\n\
 "), stdout);
-      fputs ("\n", stdout);
       fputs (_("\
-  -p DIR              use DIR as a prefix; implies -t [deprecated]\n\
   -t                  interpret TEMPLATE as a single file name component,\n\
                         relative to a directory: $TMPDIR, if set; else the\n\
                         directory specified via -p; else /tmp [deprecated]\n\
 "), stdout);
-      fputs ("\n", stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
       emit_ancillary_info ();
@@ -151,7 +146,7 @@ main (int argc, char **argv)
 {
   char const *dest_dir;
   char const *dest_dir_arg = NULL;
-  bool suppress_stderr = false;
+  bool suppress_file_err = false;
   int c;
   unsigned int n_args;
   char *template;
@@ -185,7 +180,7 @@ main (int argc, char **argv)
           use_dest_dir = true;
           break;
         case 'q':
-          suppress_stderr = true;
+          suppress_file_err = true;
           break;
         case 't':
           use_dest_dir = true;
@@ -195,11 +190,6 @@ main (int argc, char **argv)
           dry_run = true;
           break;
 
-        case TMPDIR_OPTION:
-          use_dest_dir = true;
-          dest_dir_arg = optarg;
-          break;
-
         case SUFFIX_OPTION:
           suffix = optarg;
           break;
@@ -214,15 +204,6 @@ main (int argc, char **argv)
         }
     }
 
-  if (suppress_stderr)
-    {
-      /* From here on, redirect stderr to /dev/null.
-         A diagnostic from getopt_long, above, would still go to stderr.  */
-      if (!freopen ("/dev/null", "wb", stderr))
-        error (EXIT_FAILURE, errno,
-               _("failed to redirect stderr to /dev/null"));
-    }
-
   n_args = argc - optind;
   if (2 <= n_args)
     {
@@ -283,9 +264,12 @@ main (int argc, char **argv)
       if (deprecated_t_option)
         {
           char *env = getenv ("TMPDIR");
-          dest_dir = (env && *env
-                      ? env
-                      : (dest_dir_arg ? dest_dir_arg : "/tmp"));
+          if (env && *env)
+            dest_dir = env;
+          else if (dest_dir_arg && *dest_dir_arg)
+            dest_dir = dest_dir_arg;
+          else
+            dest_dir = "/tmp";
 
           if (last_component (template) != template)
             error (EXIT_FAILURE, 0,
@@ -323,8 +307,9 @@ main (int argc, char **argv)
       int err = mkdtemp_len (dest_name, suffix_len, x_count, dry_run);
       if (err != 0)
         {
-          error (0, errno, _("failed to create directory via template %s"),
-                 quote (template));
+          if (!suppress_file_err)
+            error (0, errno, _("failed to create directory via template %s"),
+                   quote (template));
           status = EXIT_FAILURE;
         }
     }
@@ -333,8 +318,9 @@ main (int argc, char **argv)
       int fd = mkstemp_len (dest_name, suffix_len, x_count, dry_run);
       if (fd < 0 || (!dry_run && close (fd) != 0))
         {
-          error (0, errno, _("failed to create file via template %s"),
-                 quote (template));
+          if (!suppress_file_err)
+            error (0, errno, _("failed to create file via template %s"),
+                   quote (template));
           status = EXIT_FAILURE;
         }
     }
@@ -348,7 +334,9 @@ main (int argc, char **argv)
         {
           int saved_errno = errno;
           remove (dest_name);
-          error (EXIT_FAILURE, saved_errno, _("write error"));
+          if (!suppress_file_err)
+            error (0, saved_errno, _("write error"));
+          status = EXIT_FAILURE;
         }
     }
 
diff --git a/src/mv.c b/src/mv.c
index 1cfcd82f..1db404ff 100644
--- a/src/mv.c
+++ b/src/mv.c
@@ -1,5 +1,5 @@
 /* mv -- move or rename files
-   Copyright (C) 1986-2013 Free Software Foundation, Inc.
+   Copyright (C) 1986-2014 Free Software Foundation, Inc.
 
    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
@@ -55,6 +55,7 @@ static bool remove_trailing_slashes;
 static struct option const long_options[] =
 {
   {"backup", optional_argument, NULL, 'b'},
+  {"context", no_argument, NULL, 'Z'},
   {"force", no_argument, NULL, 'f'},
   {"interactive", no_argument, NULL, 'i'},
   {"no-clobber", no_argument, NULL, 'n'},
@@ -120,6 +121,7 @@ cp_option_init (struct cp_options *x)
   x->preserve_timestamps = true;
   x->explicit_no_preserve_mode= false;
   x->preserve_security_context = selinux_enabled;
+  x->set_security_context = false;
   x->reduce_diagnostics = false;
   x->data_copy_required = true;
   x->require_preserve = false;  /* FIXME: maybe make this an option */
@@ -316,6 +318,8 @@ If you specify more than one of -i, -f, -n, only the final one takes effect.\n\
                                  than the destination file or when the\n\
                                  destination file is missing\n\
   -v, --verbose                explain what is being done\n\
+  -Z, --context                set SELinux security context of destination\n\
+                                 file to default type\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
@@ -350,6 +354,7 @@ main (int argc, char **argv)
   bool no_target_directory = false;
   int n_files;
   char **file;
+  bool selinux_enabled = (0 < is_selinux_enabled ());
 
   initialize_main (&argc, &argv);
   set_program_name (argv[0]);
@@ -368,7 +373,7 @@ main (int argc, char **argv)
      we'll actually use backup_suffix_string.  */
   backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
 
-  while ((c = getopt_long (argc, argv, "bfint:uvS:T", long_options, NULL))
+  while ((c = getopt_long (argc, argv, "bfint:uvS:TZ", long_options, NULL))
          != -1)
     {
       switch (c)
@@ -418,6 +423,15 @@ main (int argc, char **argv)
           make_backups = true;
           backup_suffix_string = optarg;
           break;
+        case 'Z':
+          /* As a performance enhancement, don't even bother trying
+             to "restorecon" when not on an selinux-enabled kernel.  */
+          if (selinux_enabled)
+            {
+              x.preserve_security_context = false;
+              x.set_security_context = true;
+            }
+          break;
         case_GETOPT_HELP_CHAR;
         case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
         default:
diff --git a/src/nice.c b/src/nice.c
index 04fd3bf6..488ef95a 100644
--- a/src/nice.c
+++ b/src/nice.c
@@ -1,5 +1,5 @@
 /* nice -- run a program with modified niceness
-   Copyright (C) 1990-2013 Free Software Foundation, Inc.
+   Copyright (C) 1990-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/nl.c b/src/nl.c
index 96716aa1..982f468e 100644
--- a/src/nl.c
+++ b/src/nl.c
@@ -1,5 +1,5 @@
 /* nl -- number lines of files
-   Copyright (C) 1989-2013 Free Software Foundation, Inc.
+   Copyright (C) 1989-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/nohup.c b/src/nohup.c
index 075c4cda..eca1f512 100644
--- a/src/nohup.c
+++ b/src/nohup.c
@@ -1,5 +1,5 @@
 /* nohup -- run a command immune to hangups, with output to a non-tty
-   Copyright (C) 2003-2013 Free Software Foundation, Inc.
+   Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/nproc.c b/src/nproc.c
index 5bd6610d..9bfc8b39 100644
--- a/src/nproc.c
+++ b/src/nproc.c
@@ -1,5 +1,5 @@
 /* nproc - print the number of processors.
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/numfmt.c b/src/numfmt.c
index 8c21c2b3..206866ac 100644
--- a/src/numfmt.c
+++ b/src/numfmt.c
@@ -1,5 +1,5 @@
 /* Reformat numbers like 11505426432 to the more human-readable 11G
-   Copyright (C) 2012 Free Software Foundation, Inc.
+   Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
    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
@@ -23,6 +23,7 @@
 
 #include "mbsalign.h"
 #include "argmatch.h"
+#include "c-ctype.h"
 #include "error.h"
 #include "quote.h"
 #include "system.h"
@@ -169,6 +170,7 @@ static int grouping = 0;
 static char *padding_buffer = NULL;
 static size_t padding_buffer_size = 0;
 static long int padding_width = 0;
+static long int zero_padding_width = 0;
 static const char *format_str = NULL;
 static char *format_str_prefix = NULL;
 static char *format_str_suffix = NULL;
@@ -197,22 +199,6 @@ static int decimal_point_length;
 /* debugging for developers.  Enables devmsg().  */
 static bool dev_debug = false;
 
-/* Like error(0, 0, ...), but without an implicit newline.
-   Also a noop unless the global DEV_DEBUG is set.
-   TODO: Replace with variadic macro in system.h or
-   move to a separate module.  */
-static inline void
-devmsg (char const *fmt, ...)
-{
-  if (dev_debug)
-    {
-      va_list ap;
-      va_start (ap, fmt);
-      vfprintf (stderr, fmt, ap);
-      va_end (ap);
-    }
-}
-
 static inline int
 default_scale_base (enum scale_type scale)
 {
@@ -272,7 +258,7 @@ suffix_power (const char suf)
 }
 
 static inline const char *
-suffix_power_character (unsigned int power)
+suffix_power_char (unsigned int power)
 {
   switch (power)
     {
@@ -469,14 +455,10 @@ simple_strtod_int (const char *input_str,
     *negative = false;
 
   *endptr = (char *) input_str;
-  while (*endptr && isdigit (**endptr))
+  while (*endptr && c_isdigit (**endptr))
     {
       int digit = (**endptr) - '0';
 
-      /* can this happen in some strange locale?  */
-      if (digit < 0 || digit > 9)
-        return SSE_INVALID_NUMBER;
-
       if (digits > MAX_UNSCALED_DIGITS)
         e = SSE_OK_PRECISION_LOSS;
 
@@ -598,8 +580,9 @@ simple_strtod_human (const char *input_str,
   /* 'scale_auto' is checked below.  */
   int scale_base = default_scale_base (allowed_scaling);
 
-  devmsg ("simple_strtod_human:\n  input string: '%s'\n  "
-          "locale decimal-point: '%s'\n", input_str, decimal_point);
+  devmsg ("simple_strtod_human:\n  input string: %s\n  "
+          "locale decimal-point: %s\n",
+          quote_n (0, input_str), quote_n (1, decimal_point));
 
   enum simple_strtod_error e =
     simple_strtod_float (input_str, endptr, value, precision);
@@ -614,7 +597,7 @@ simple_strtod_human (const char *input_str,
       /* process suffix.  */
 
       /* Skip any blanks between the number and suffix.  */
-      while (isblank (**endptr))
+      while (isblank (to_uchar (**endptr)))
         (*endptr)++;
 
       if (!valid_suffix (**endptr))
@@ -673,29 +656,29 @@ simple_strtod_fatal (enum simple_strtod_error err, char const *input_str)
       abort ();
 
     case SSE_OVERFLOW:
-      msgid = N_("value too large to be converted: '%s'");
+      msgid = N_("value too large to be converted: %s");
       break;
 
     case SSE_INVALID_NUMBER:
-      msgid = N_("invalid number: '%s'");
+      msgid = N_("invalid number: %s");
       break;
 
     case SSE_VALID_BUT_FORBIDDEN_SUFFIX:
-      msgid = N_("rejecting suffix in input: '%s' (consider using --from)");
+      msgid = N_("rejecting suffix in input: %s (consider using --from)");
       break;
 
     case SSE_INVALID_SUFFIX:
-      msgid = N_("invalid suffix in input: '%s'");
+      msgid = N_("invalid suffix in input: %s");
       break;
 
     case SSE_MISSING_I_SUFFIX:
-      msgid = N_("missing 'i' suffix in input: '%s' (e.g Ki/Mi/Gi)");
+      msgid = N_("missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)");
       break;
 
     }
 
   if (_invalid != inval_ignore)
-    error (conv_exit_code, 0, gettext (msgid), input_str);
+    error (conv_exit_code, 0, gettext (msgid), quote (input_str));
 }
 
 /* Convert VAL to a human format string in BUF.  */
@@ -704,6 +687,21 @@ double_to_human (long double val, int precision,
                  char *buf, size_t buf_size,
                  enum scale_type scale, int group, enum round_type round)
 {
+  int num_size;
+  char fmt[64];
+  verify (sizeof (fmt) > (INT_BUFSIZE_BOUND (zero_padding_width)
+                          + INT_BUFSIZE_BOUND (precision)
+                          + 10 /* for %.Lf  etc.  */));
+
+  char *pfmt = fmt;
+  *pfmt++ = '%';
+
+  if (group)
+    *pfmt++ = '\'';
+
+  if (zero_padding_width)
+    pfmt += snprintf (pfmt, sizeof (fmt) - 2, "0%ld", zero_padding_width);
+
   devmsg ("double_to_human:\n");
 
   if (scale == scale_none)
@@ -716,9 +714,10 @@ double_to_human (long double val, int precision,
               "  no scaling, returning (grouped) value: %'.*Lf\n" :
               "  no scaling, returning value: %.*Lf\n", precision, val);
 
-      int i = snprintf (buf, buf_size, (group) ? "%'.*Lf" : "%.*Lf",
-                        precision, val);
-      if (i < 0 || i >= (int) buf_size)
+      stpcpy (pfmt, ".*Lf");
+
+      num_size = snprintf (buf, buf_size, fmt, precision, val);
+      if (num_size < 0 || num_size >= (int) buf_size)
         error (EXIT_FAILURE, 0,
                _("failed to prepare value '%Lf' for printing"), val);
       return;
@@ -760,13 +759,18 @@ double_to_human (long double val, int precision,
 
   devmsg ("  after rounding, value=%Lf * %0.f ^ %d\n", val, scale_base, power);
 
-  snprintf (buf, buf_size, (show_decimal_point) ? "%.1Lf%s" : "%.0Lf%s",
-            val, suffix_power_character (power));
+  stpcpy (pfmt, show_decimal_point ? ".1Lf%s" : ".0Lf%s");
+
+  /* buf_size - 1 used here to ensure place for possible scale_IEC_I suffix.  */
+  num_size = snprintf (buf, buf_size - 1, fmt, val, suffix_power_char (power));
+  if (num_size < 0 || num_size >= (int) buf_size - 1)
+    error (EXIT_FAILURE, 0,
+           _("failed to prepare value '%Lf' for printing"), val);
 
   if (scale == scale_IEC_I && power > 0)
-    strncat (buf, "i", buf_size - strlen (buf) - 1);
+    strncat (buf, "i", buf_size - num_size - 1);
 
-  devmsg ("  returning value: '%s'\n", buf);
+  devmsg ("  returning value: %s\n", quote (buf));
 
   return;
 }
@@ -784,7 +788,7 @@ unit_to_umax (const char *n_string)
   s_err = xstrtoumax (n_string, &end, 10, &n, "KMGTPEZY");
 
   if (s_err != LONGINT_OK || *end || n == 0)
-    error (EXIT_FAILURE, 0, _("invalid unit size: '%s'"), n_string);
+    error (EXIT_FAILURE, 0, _("invalid unit size: %s"), quote (n_string));
 
   return n;
 }
@@ -797,10 +801,7 @@ setup_padding_buffer (size_t min_size)
     return;
 
   padding_buffer_size = min_size + 1;
-  padding_buffer = realloc (padding_buffer, padding_buffer_size);
-  if (!padding_buffer)
-    error (EXIT_FAILURE, 0, _("out of memory (requested %zu bytes)"),
-           padding_buffer_size);
+  padding_buffer = xrealloc (padding_buffer, padding_buffer_size);
 }
 
 void
@@ -905,8 +906,8 @@ UNIT options:\n"), stdout);
       fputs (_("\n\
 FORMAT must be suitable for printing one floating-point argument '%f'.\n\
 Optional quote (%'f) will enable --grouping (if supported by current locale).\n\
-Optional width value (%10f) will pad output. Optional negative width values\n\
-(%-10f) will left-pad output.\n\
+Optional width value (%10f) will pad output. Optional zero (%010f) width\n\
+will zero pad the number. Optional negative values (%-10f) will left align.\n\
 "), stdout);
 
       printf (_("\n\
@@ -966,6 +967,7 @@ parse_format_string (char const *fmt)
   size_t suffix_pos;
   long int pad = 0;
   char *endptr = NULL;
+  bool zero_padding = false;
 
   for (i = 0; !(fmt[i] == '%' && fmt[i + 1] != '%'); i += (fmt[i] == '%') + 1)
     {
@@ -976,13 +978,24 @@ parse_format_string (char const *fmt)
     }
 
   i++;
-  i += strspn (fmt + i, " ");
-  if (fmt[i] == '\'')
+  while (true)
     {
-      grouping = 1;
-      i++;
+      size_t skip = strspn (fmt + i, " ");
+      i += skip;
+      if (fmt[i] == '\'')
+        {
+          grouping = 1;
+          i++;
+        }
+      else if (fmt[i] == '0')
+        {
+          zero_padding = true;
+          i++;
+        }
+      else if (! skip)
+        break;
     }
-  i += strspn (fmt + i, " ");
+
   errno = 0;
   pad = strtol (fmt + i, &endptr, 10);
   if (errno == ERANGE)
@@ -991,6 +1004,9 @@ parse_format_string (char const *fmt)
 
   if (endptr != (fmt + i) && pad != 0)
     {
+      if (debug && padding_width && !(zero_padding && pad > 0))
+        error (0, 0, _("--format padding overridding --padding"));
+
       if (pad < 0)
         {
           padding_alignment = MBS_ALIGN_LEFT;
@@ -998,8 +1014,12 @@ parse_format_string (char const *fmt)
         }
       else
         {
-          padding_width = pad;
+          if (zero_padding)
+            zero_padding_width = pad;
+          else
+            padding_width = pad;
         }
+
     }
   i = endptr - fmt;
 
@@ -1008,7 +1028,7 @@ parse_format_string (char const *fmt)
 
   if (fmt[i] != 'f')
     error (EXIT_FAILURE, 0, _("invalid format %s,"
-                              " directive must be %%['][-][N]f"),
+                              " directive must be %%[0]['][-][N]f"),
            quote (fmt));
   i++;
   suffix_pos = i;
@@ -1019,27 +1039,18 @@ parse_format_string (char const *fmt)
              quote (fmt));
 
   if (prefix_len)
-    {
-      format_str_prefix = xstrndup (fmt, prefix_len);
-      if (!format_str_prefix)
-        error (EXIT_FAILURE, 0, _("out of memory (requested %zu bytes)"),
-               prefix_len + 1);
-    }
+    format_str_prefix = xstrndup (fmt, prefix_len);
   if (fmt[suffix_pos] != '\0')
-    {
-      format_str_suffix = strdup (fmt + suffix_pos);
-      if (!format_str_suffix)
-        error (EXIT_FAILURE, 0, _("out of memory (requested %zu bytes)"),
-               strlen (fmt + suffix_pos));
-    }
+    format_str_suffix = xstrdup (fmt + suffix_pos);
 
   devmsg ("format String:\n  input: %s\n  grouping: %s\n"
                    "  padding width: %ld\n  alignment: %s\n"
-                   "  prefix: '%s'\n  suffix: '%s'\n",
-          quote (fmt), (grouping) ? "yes" : "no",
+                   "  prefix: %s\n  suffix: %s\n",
+          quote_n (0, fmt), (grouping) ? "yes" : "no",
           padding_width,
           (padding_alignment == MBS_ALIGN_LEFT) ? "Left" : "Right",
-          format_str_prefix, format_str_suffix);
+          quote_n (1, format_str_prefix ? format_str_prefix : ""),
+          quote_n (2, format_str_suffix ? format_str_suffix : ""));
 }
 
 /* Parse a numeric value (with optional suffix) from a string.
@@ -1067,8 +1078,8 @@ parse_human_number (const char *str, long double /*output */ *value,
   if (ptr && *ptr != '\0')
     {
       if (_invalid != inval_ignore)
-        error (conv_exit_code, 0, _("invalid suffix in input '%s': '%s'"),
-               str, ptr);
+        error (conv_exit_code, 0, _("invalid suffix in input %s: %s"),
+               quote_n (0, str), quote_n (1, ptr));
       e = SSE_INVALID_SUFFIX;
     }
   return e;
@@ -1107,7 +1118,8 @@ prepare_padded_number (const long double val, size_t precision)
   if (suffix)
     strncat (buf, suffix, sizeof (buf) - strlen (buf) -1);
 
-  devmsg ("formatting output:\n  value: %Lf\n  humanized: '%s'\n", val, buf);
+  devmsg ("formatting output:\n  value: %Lf\n  humanized: %s\n",
+          val, quote (buf));
 
   if (padding_width && strlen (buf) < padding_width)
     {
@@ -1115,7 +1127,7 @@ prepare_padded_number (const long double val, size_t precision)
       mbsalign (buf, padding_buffer, padding_buffer_size, &w,
                 padding_alignment, MBA_UNIBYTE_ONLY);
 
-      devmsg ("  After padding: '%s'\n", padding_buffer);
+      devmsg ("  After padding: %s\n", quote (padding_buffer));
     }
   else
     {
@@ -1151,7 +1163,7 @@ process_suffixed_number (char *text, long double *result, size_t *precision)
         {
           /* trim suffix, ONLY if it's at the end of the text.  */
           *possible_suffix = '\0';
-          devmsg ("trimming suffix '%s'\n", suffix);
+          devmsg ("trimming suffix %s\n", quote (suffix));
         }
       else
         devmsg ("no valid suffix found\n");
@@ -1159,7 +1171,7 @@ process_suffixed_number (char *text, long double *result, size_t *precision)
 
   /* Skip white space - always.  */
   char *p = text;
-  while (*p && isblank (*p))
+  while (*p && isblank (to_uchar (*p)))
     ++p;
   const unsigned int skip_count = text - p;
 
@@ -1181,7 +1193,8 @@ process_suffixed_number (char *text, long double *result, size_t *precision)
   long double val = 0;
   enum simple_strtod_error e = parse_human_number (p, &val, precision);
   if (e == SSE_OK_PRECISION_LOSS && debug)
-    error (0, 0, _("large input value '%s': possible precision loss"), p);
+    error (0, 0, _("large input value %s: possible precision loss"),
+           quote (p));
 
   if (from_unit_size != 1 || to_unit_size != 1)
     val = (val * from_unit_size) / to_unit_size;
@@ -1194,8 +1207,7 @@ process_suffixed_number (char *text, long double *result, size_t *precision)
 /* Skip the requested number of fields in the input string.
    Returns a pointer to the *delimiter* of the requested field,
    or a pointer to NUL (if reached the end of the string).  */
-static inline char *
-__attribute ((pure))
+static inline char * _GL_ATTRIBUTE_PURE
 skip_fields (char *buf, int fields)
 {
   char *ptr = buf;
@@ -1214,9 +1226,9 @@ skip_fields (char *buf, int fields)
   else
     while (*ptr && fields--)
       {
-        while (*ptr && isblank (*ptr))
+        while (*ptr && isblank (to_uchar (*ptr)))
           ++ptr;
-        while (*ptr && !isblank (*ptr))
+        while (*ptr && !isblank (to_uchar (*ptr)))
           ++ptr;
       }
   return ptr;
@@ -1242,7 +1254,8 @@ extract_fields (char *line, int _field,
   *_data = NULL;
   *_suffix = NULL;
 
-  devmsg ("extracting Fields:\n  input: '%s'\n  field: %d\n", line, _field);
+  devmsg ("extracting Fields:\n  input: %s\n  field: %d\n",
+          quote (line), _field);
 
   if (field > 1)
     {
@@ -1252,7 +1265,7 @@ extract_fields (char *line, int _field,
       if (*ptr == '\0')
         {
           /* not enough fields in the input - print warning?  */
-          devmsg ("  TOO FEW FIELDS!\n  prefix: '%s'\n", *_prefix);
+          devmsg ("  TOO FEW FIELDS!\n  prefix: %s\n", quote (*_prefix));
           return;
         }
 
@@ -1272,8 +1285,10 @@ extract_fields (char *line, int _field,
   else
     *_suffix = NULL;
 
-  devmsg ("  prefix: '%s'\n  number: '%s'\n  suffix: '%s'\n",
-          *_prefix, *_data, *_suffix);
+  devmsg ("  prefix: %s\n  number: %s\n  suffix: %s\n",
+          quote_n (0, *_prefix ? *_prefix : ""),
+          quote_n (1, *_data),
+          quote_n (2, *_suffix ? *_suffix : ""));
 }
 
 
@@ -1385,7 +1400,8 @@ main (int argc, char **argv)
         case PADDING_OPTION:
           if (xstrtol (optarg, NULL, 10, &padding_width, "") != LONGINT_OK
               || padding_width == 0)
-            error (EXIT_FAILURE, 0, _("invalid padding value '%s'"), optarg);
+            error (EXIT_FAILURE, 0, _("invalid padding value %s"),
+                   quote (optarg));
           if (padding_width < 0)
             {
               padding_alignment = MBS_ALIGN_LEFT;
@@ -1398,7 +1414,8 @@ main (int argc, char **argv)
         case FIELD_OPTION:
           if (xstrtol (optarg, NULL, 10, &field, "") != LONGINT_OK
               || field <= 0)
-            error (EXIT_FAILURE, 0, _("invalid field value '%s'"), optarg);
+            error (EXIT_FAILURE, 0, _("invalid field value %s"),
+                   quote (optarg));
           break;
 
         case 'd':
@@ -1427,8 +1444,8 @@ main (int argc, char **argv)
             {
               if (xstrtoumax (optarg, NULL, 10, &header, "") != LONGINT_OK
                   || header == 0)
-                error (EXIT_FAILURE, 0, _("invalid header value '%s'"),
-                       optarg);
+                error (EXIT_FAILURE, 0, _("invalid header value %s"),
+                       quote (optarg));
             }
           else
             {
@@ -1454,8 +1471,6 @@ main (int argc, char **argv)
 
   if (format_str != NULL && grouping)
     error (EXIT_FAILURE, 0, _("--grouping cannot be combined with --format"));
-  if (format_str != NULL && padding_width > 0)
-    error (EXIT_FAILURE, 0, _("--padding cannot be combined with --format"));
 
   /* Warn about no-op.  */
   if (debug && scale_from == scale_none && scale_to == scale_none
diff --git a/src/od.c b/src/od.c
index ffccd741..7bc0e2a8 100644
--- a/src/od.c
+++ b/src/od.c
@@ -1,5 +1,5 @@
 /* od -- dump files in octal and other formats
-   Copyright (C) 1992-2013 Free Software Foundation, Inc.
+   Copyright (C) 1992-2014 Free Software Foundation, Inc.
 
    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
@@ -23,6 +23,7 @@
 #include <getopt.h>
 #include <sys/types.h>
 #include "system.h"
+#include "argmatch.h"
 #include "error.h"
 #include "ftoastr.h"
 #include "quote.h"
@@ -259,13 +260,37 @@ static enum size_spec integral_type_size[MAX_INTEGRAL_TYPE_SIZE + 1];
 #define MAX_FP_TYPE_SIZE sizeof (long double)
 static enum size_spec fp_type_size[MAX_FP_TYPE_SIZE + 1];
 
+#ifndef WORDS_BIGENDIAN
+# define WORDS_BIGENDIAN 0
+#endif
+
+/* Use native endianess by default.  */
+static bool input_swap;
+
 static char const short_options[] = "A:aBbcDdeFfHhIij:LlN:OoS:st:vw::Xx";
 
 /* For long options that have no equivalent short option, use a
    non-character as a pseudo short option, starting with CHAR_MAX + 1.  */
 enum
 {
-  TRADITIONAL_OPTION = CHAR_MAX + 1
+  TRADITIONAL_OPTION = CHAR_MAX + 1,
+  ENDIAN_OPTION,
+};
+
+enum endian_type
+{
+  endian_little,
+  endian_big
+};
+
+static char const *const endian_args[] =
+{
+  "little", "big", NULL
+};
+
+static enum endian_type const endian_types[] =
+{
+  endian_little, endian_big
 };
 
 static struct option const long_options[] =
@@ -278,6 +303,7 @@ static struct option const long_options[] =
   {"strings", optional_argument, NULL, 'S'},
   {"traditional", no_argument, NULL, TRADITIONAL_OPTION},
   {"width", optional_argument, NULL, 'w'},
+  {"endian", required_argument, NULL, ENDIAN_OPTION },
 
   {GETOPT_HELP_OPTION_DECL},
   {GETOPT_VERSION_OPTION_DECL},
@@ -316,18 +342,19 @@ suffixes may be . for octal and b for multiply by 512.\n\
       emit_mandatory_arg_note ();
 
       fputs (_("\
-  -A, --address-radix=RADIX   output format for file offsets.  RADIX is one\n\
+  -A, --address-radix=RADIX   output format for file offsets; RADIX is one\n\
                                 of [doxn], for Decimal, Octal, Hex or None\n\
+      --endian={big|little}   swap input bytes according the specified order\n\
   -j, --skip-bytes=BYTES      skip BYTES input bytes first\n\
 "), stdout);
       fputs (_("\
   -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n\
-  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic chars.\
+  -S BYTES, --strings[=BYTES]  output strings of at least BYTES graphic chars;\
 \n\
                                 3 is implied when BYTES is not specified\n\
   -t, --format=TYPE           select output format or formats\n\
   -v, --output-duplicates     do not use * to mark line suppression\n\
-  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line.\n\
+  -w[BYTES], --width[=BYTES]  output BYTES bytes per output line;\n\
                                 32 is implied when BYTES is not specified\n\
       --traditional           accept arguments in third form above\n\
 "), stdout);
@@ -339,7 +366,7 @@ suffixes may be . for octal and b for multiply by 512.\n\
 Traditional format specifications may be intermixed; they accumulate:\n\
   -a   same as -t a,  select named characters, ignoring high-order bit\n\
   -b   same as -t o1, select octal bytes\n\
-  -c   same as -t c,  select ASCII characters or backslash escapes\n\
+  -c   same as -t c,  select printable characters or backslash escapes\n\
   -d   same as -t u2, select unsigned decimal 2-byte units\n\
 "), stdout);
       fputs (_("\
@@ -355,7 +382,7 @@ Traditional format specifications may be intermixed; they accumulate:\n\
 \n\
 TYPE is made up of one or more of these specifications:\n\
   a          named character, ignoring high-order bit\n\
-  c          ASCII character or backslash escape\n\
+  c          printable character or backslash escape\n\
 "), stdout);
       fputs (_("\
   d[SIZE]    signed decimal, SIZE bytes per integer\n\
@@ -400,13 +427,27 @@ N (size_t fields, size_t blank, void const *block,                      \
    char const *FMT_STRING, int width, int pad)                          \
 {                                                                       \
   T const *p = block;                                                   \
-  size_t i;                                                             \
+  uintmax_t i;                                                          \
   int pad_remaining = pad;                                              \
   for (i = fields; blank < i; i--)                                      \
     {                                                                   \
       int next_pad = pad * (i - 1) / fields;                            \
       int adjusted_width = pad_remaining - next_pad + width;            \
-      T x = *p++;                                                       \
+      T x;                                                              \
+      if (input_swap && sizeof (T) > 1)                                 \
+        {                                                               \
+          size_t j;                                                     \
+          union {                                                       \
+            T x;                                                        \
+            char b[sizeof (T)];                                         \
+          } u;                                                          \
+          for (j = 0; j < sizeof (T); j++)                              \
+            u.b[j] = ((const char *) p)[sizeof (T) - 1 - j];            \
+          x = u.x;                                                      \
+        }                                                               \
+      else                                                              \
+        x = *p;                                                         \
+      p++;                                                              \
       ACTION;                                                           \
       pad_remaining = next_pad;                                         \
     }                                                                   \
@@ -416,7 +457,7 @@ N (size_t fields, size_t blank, void const *block,                      \
   PRINT_FIELDS (N, T, fmt_string, xprintf (fmt_string, adjusted_width, x))
 
 #define PRINT_FLOATTYPE(N, T, FTOASTR, BUFSIZE)                         \
-  PRINT_FIELDS (N, T, fmt_string ATTRIBUTE_UNUSED,                      \
+  PRINT_FIELDS (N, T, fmt_string _GL_UNUSED,                      \
                 char buf[BUFSIZE];                                      \
                 FTOASTR (buf, sizeof buf, 0, 0, x);                     \
                 xprintf ("%*s", adjusted_width, buf))
@@ -452,11 +493,11 @@ dump_hexl_mode_trailer (size_t n_bytes, const char *block)
 
 static void
 print_named_ascii (size_t fields, size_t blank, void const *block,
-                   const char *unused_fmt_string ATTRIBUTE_UNUSED,
+                   const char *unused_fmt_string _GL_UNUSED,
                    int width, int pad)
 {
   unsigned char const *p = block;
-  size_t i;
+  uintmax_t i;
   int pad_remaining = pad;
   for (i = fields; blank < i; i--)
     {
@@ -483,11 +524,11 @@ print_named_ascii (size_t fields, size_t blank, void const *block,
 
 static void
 print_ascii (size_t fields, size_t blank, void const *block,
-             const char *unused_fmt_string ATTRIBUTE_UNUSED, int width,
+             const char *unused_fmt_string _GL_UNUSED, int width,
              int pad)
 {
   unsigned char const *p = block;
-  size_t i;
+  uintmax_t i;
   int pad_remaining = pad;
   for (i = fields; blank < i; i--)
     {
@@ -1056,8 +1097,8 @@ skip (uintmax_t n_skip)
 }
 
 static void
-format_address_none (uintmax_t address ATTRIBUTE_UNUSED,
-                     char c ATTRIBUTE_UNUSED)
+format_address_none (uintmax_t address _GL_UNUSED,
+                     char c _GL_UNUSED)
 {
 }
 
@@ -1664,6 +1705,18 @@ main (int argc, char **argv)
           traditional = true;
           break;
 
+        case ENDIAN_OPTION:
+          switch (XARGMATCH ("--endian", optarg, endian_args, endian_types))
+            {
+              case endian_big:
+                  input_swap = ! WORDS_BIGENDIAN;
+                  break;
+              case endian_little:
+                  input_swap = WORDS_BIGENDIAN;
+                  break;
+            }
+          break;
+
           /* The next several cases map the traditional format
              specification options to the corresponding modern format
              specs.  GNU od accepts any combination of old- and
diff --git a/src/operand2sig.c b/src/operand2sig.c
index 6936f1d2..eb40f364 100644
--- a/src/operand2sig.c
+++ b/src/operand2sig.c
@@ -1,5 +1,5 @@
 /* operand2sig.c -- common function for parsing signal specifications
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/operand2sig.h b/src/operand2sig.h
index 4a799176..04d27d1a 100644
--- a/src/operand2sig.h
+++ b/src/operand2sig.h
@@ -1,6 +1,6 @@
 /* operand2sig.h -- prototype for signal specification function
 
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/paste.c b/src/paste.c
index bc9fa76c..3663aaf6 100644
--- a/src/paste.c
+++ b/src/paste.c
@@ -1,5 +1,5 @@
 /* paste - merge lines of files
-   Copyright (C) 1997-2013 Free Software Foundation, Inc.
+   Copyright (C) 1997-2014 Free Software Foundation, Inc.
    Copyright (C) 1984 David M. Ihnat
 
    This program is free software: you can redistribute it and/or modify
@@ -62,7 +62,7 @@ static bool have_read_stdin;
    corresponding lines from each file in parallel. */
 static bool serial_merge;
 
-/* The delimeters between lines of input files (used cyclically). */
+/* The delimiters between lines of input files (used cyclically). */
 static char *delims;
 
 /* A pointer to the character after the end of 'delims'. */
diff --git a/src/pathchk.c b/src/pathchk.c
index 28567d08..4b3884fe 100644
--- a/src/pathchk.c
+++ b/src/pathchk.c
@@ -1,5 +1,5 @@
 /* pathchk -- check whether file names are valid or portable
-   Copyright (C) 1991-2013 Free Software Foundation, Inc.
+   Copyright (C) 1991-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/pinky.c b/src/pinky.c
index e6838ae6..c48e1705 100644
--- a/src/pinky.c
+++ b/src/pinky.c
@@ -1,5 +1,5 @@
 /* GNU's pinky.
-   Copyright (C) 1992-2013 Free Software Foundation, Inc.
+   Copyright (C) 1992-2014 Free Software Foundation, Inc.
 
    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
@@ -466,12 +466,14 @@ short_pinky (const char *filename,
              const int argc_names, char *const argv_names[])
 {
   size_t n_users;
-  STRUCT_UTMP *utmp_buf;
+  STRUCT_UTMP *utmp_buf = NULL;
 
   if (read_utmp (filename, &n_users, &utmp_buf, 0) != 0)
     error (EXIT_FAILURE, errno, "%s", filename);
 
   scan_entries (n_users, utmp_buf, argc_names, argv_names);
+
+  IF_LINT (free (utmp_buf));
 }
 
 static void
diff --git a/src/pr.c b/src/pr.c
index f4b0b694..1515b4a4 100644
--- a/src/pr.c
+++ b/src/pr.c
@@ -1,5 +1,5 @@
 /* pr -- convert text files for printing.
-   Copyright (C) 1988-2013 Free Software Foundation, Inc.
+   Copyright (C) 1988-2014 Free Software Foundation, Inc.
 
    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
@@ -2820,7 +2820,8 @@ Paginate or columnate FILE(s) for printing.\n\
       fputs (_("\
   -s[CHAR], --separator[=CHAR]\n\
                     separate columns by a single character, default for CHAR\n\
-                    is the <TAB> character without -w and \'no char\' with -w\n\
+                    is the <TAB> character without -w and \'no char\' with -w.\
+\n\
                     -s[CHAR] turns off line truncation of all 3 column\n\
                     options (-COLUMN|-a -COLUMN|-m) except -w is set\n\
 "), stdout);
diff --git a/src/printenv.c b/src/printenv.c
index 066649d3..e1faeb5f 100644
--- a/src/printenv.c
+++ b/src/printenv.c
@@ -1,5 +1,5 @@
 /* printenv -- print all or part of environment
-   Copyright (C) 1989-2013 Free Software Foundation, Inc.
+   Copyright (C) 1989-2014 Free Software Foundation, Inc.
 
    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
@@ -67,7 +67,7 @@ If no VARIABLE is specified, print name and value pairs for them all.\n\
 "),
               program_name);
       fputs (_("\
-  -0, --null     end each output line with 0 byte rather than newline\n\
+  -0, --null     end each output line with NUL, not newline\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
diff --git a/src/printf.c b/src/printf.c
index fd795a3d..7d523100 100644
--- a/src/printf.c
+++ b/src/printf.c
@@ -1,5 +1,5 @@
 /* printf - format and print data
-   Copyright (C) 1990-2013 Free Software Foundation, Inc.
+   Copyright (C) 1990-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/prog-fprintf.c b/src/prog-fprintf.c
index e800f867..4d3b449f 100644
--- a/src/prog-fprintf.c
+++ b/src/prog-fprintf.c
@@ -1,5 +1,5 @@
 /* prog-fprintf.c - common formating output functions and definitions
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/prog-fprintf.h b/src/prog-fprintf.h
index 10282f07..93df75a7 100644
--- a/src/prog-fprintf.h
+++ b/src/prog-fprintf.h
@@ -1,5 +1,5 @@
 /* prog-fprintf.h - common formating output functions and definitions
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/ptx.c b/src/ptx.c
index f9936732..d165e966 100644
--- a/src/ptx.c
+++ b/src/ptx.c
@@ -1,5 +1,5 @@
 /* Permuted index for GNU, with keywords in their context.
-   Copyright (C) 1990-2013 Free Software Foundation, Inc.
+   Copyright (C) 1990-2014 Free Software Foundation, Inc.
    François Pinard <pinard@iro.umontreal.ca>, 1988.
 
    This program is free software: you can redistribute it and/or modify
@@ -166,7 +166,7 @@ static int total_line_count;	/* total number of lines seen so far */
 static const char **input_file_name;	/* array of text input file names */
 static int *file_line_count;	/* array of 'total_line_count' values at end */
 
-static BLOCK text_buffer;	/* file to study */
+static BLOCK *text_buffers;	/* files to study */
 
 /* SKIP_NON_WHITE used only for getting or skipping the reference.  */
 
@@ -232,6 +232,7 @@ typedef struct
     DELTA left;			/* distance to left context start */
     DELTA right;		/* distance to right context end */
     int reference;		/* reference descriptor */
+    size_t file_index;		/* corresponding file  */
   }
 OCCURS;
 
@@ -744,7 +745,7 @@ digest_word_file (const char *file_name, WORD_TABLE *table)
 `----------------------------------------------------------------------*/
 
 static void
-find_occurs_in_text (void)
+find_occurs_in_text (size_t file_index)
 {
   char *cursor;			/* for scanning the source text */
   char *scan;			/* for scanning the source text also */
@@ -760,6 +761,8 @@ find_occurs_in_text (void)
   char *word_end;		/* end of word */
   char *next_context_start;	/* next start of left context */
 
+  const BLOCK *text_buffer = &text_buffers[file_index];
+
   /* reference_length is always used within 'if (input_reference)'.
      However, GNU C diagnoses that it may be used uninitialized.  The
      following assignment is merely to shut it up.  */
@@ -775,19 +778,19 @@ find_occurs_in_text (void)
      found inside it.  Also, unconditionally assigning these variable has
      the happy effect of shutting up lint.  */
 
-  line_start = text_buffer.start;
+  line_start = text_buffer->start;
   line_scan = line_start;
   if (input_reference)
     {
-      SKIP_NON_WHITE (line_scan, text_buffer.end);
+      SKIP_NON_WHITE (line_scan, text_buffer->end);
       reference_length = line_scan - line_start;
-      SKIP_WHITE (line_scan, text_buffer.end);
+      SKIP_WHITE (line_scan, text_buffer->end);
     }
 
   /* Process the whole buffer, one line or one sentence at a time.  */
 
-  for (cursor = text_buffer.start;
-       cursor < text_buffer.end;
+  for (cursor = text_buffer->start;
+       cursor < text_buffer->end;
        cursor = next_context_start)
     {
 
@@ -805,11 +808,11 @@ find_occurs_in_text (void)
          This test also accounts for the case of an incomplete line or
          sentence at the end of the buffer.  */
 
-      next_context_start = text_buffer.end;
+      next_context_start = text_buffer->end;
       if (context_regex.string)
         switch (re_search (&context_regex.pattern, cursor,
-                           text_buffer.end - cursor,
-                           0, text_buffer.end - cursor, &context_regs))
+                           text_buffer->end - cursor,
+                           0, text_buffer->end - cursor, &context_regs))
           {
           case -2:
             matcher_error ();
@@ -915,7 +918,7 @@ find_occurs_in_text (void)
                     total_line_count++;
                     line_scan++;
                     line_start = line_scan;
-                    SKIP_NON_WHITE (line_scan, text_buffer.end);
+                    SKIP_NON_WHITE (line_scan, text_buffer->end);
                     reference_length = line_scan - line_start;
                   }
                 else
@@ -956,7 +959,7 @@ find_occurs_in_text (void)
 
           occurs_cursor = occurs_table[0] + number_of_occurs[0];
 
-          /* Define the refence field, if any.  */
+          /* Define the reference field, if any.  */
 
           if (auto_reference)
             {
@@ -973,7 +976,7 @@ find_occurs_in_text (void)
                     total_line_count++;
                     line_scan++;
                     line_start = line_scan;
-                    SKIP_NON_WHITE (line_scan, text_buffer.end);
+                    SKIP_NON_WHITE (line_scan, text_buffer->end);
                   }
                 else
                   line_scan++;
@@ -1007,6 +1010,7 @@ find_occurs_in_text (void)
           occurs_cursor->key = possible_key;
           occurs_cursor->left = context_start - possible_key.start;
           occurs_cursor->right = context_end - possible_key.start;
+          occurs_cursor->file_index = file_index;
 
           number_of_occurs[0]++;
         }
@@ -1356,9 +1360,10 @@ define_all_fields (OCCURS *occurs)
   char *left_context_start;	/* start of left context */
   char *right_context_end;	/* end of right context */
   char *left_field_start;	/* conservative start for 'head'/'before' */
-  int file_index;		/* index in text input file arrays */
   const char *file_name;	/* file name for reference */
   int line_ordinal;		/* line ordinal for reference */
+  const char *buffer_start;	/* start of buffered file for this occurs */
+  const char *buffer_end;	/* end of buffered file for this occurs */
 
   /* Define 'keyafter', start of left context and end of right context.
      'keyafter' starts at the saved position for keyword and extend to the
@@ -1371,6 +1376,9 @@ define_all_fields (OCCURS *occurs)
   left_context_start = keyafter.start + occurs->left;
   right_context_end = keyafter.start + occurs->right;
 
+  buffer_start = text_buffers[occurs->file_index].start;
+  buffer_end = text_buffers[occurs->file_index].end;
+
   cursor = keyafter.end;
   while (cursor < right_context_end
          && cursor <= keyafter.start + keyafter_max_width)
@@ -1422,13 +1430,13 @@ define_all_fields (OCCURS *occurs)
   if (truncation_string)
     {
       cursor = before.start;
-      SKIP_WHITE_BACKWARDS (cursor, text_buffer.start);
+      SKIP_WHITE_BACKWARDS (cursor, buffer_start);
       before_truncation = cursor > left_context_start;
     }
   else
     before_truncation = 0;
 
-  SKIP_WHITE (before.start, text_buffer.end);
+  SKIP_WHITE (before.start, buffer_end);
 
   /* The tail could not take more columns than what has been left in the
      left context field, and a gap is mandatory.  It starts after the
@@ -1443,7 +1451,7 @@ define_all_fields (OCCURS *occurs)
   if (tail_max_width > 0)
     {
       tail.start = keyafter.end;
-      SKIP_WHITE (tail.start, text_buffer.end);
+      SKIP_WHITE (tail.start, buffer_end);
 
       tail.end = tail.start;
       cursor = tail.end;
@@ -1489,7 +1497,7 @@ define_all_fields (OCCURS *occurs)
   if (head_max_width > 0)
     {
       head.end = before.start;
-      SKIP_WHITE_BACKWARDS (head.end, text_buffer.start);
+      SKIP_WHITE_BACKWARDS (head.end, buffer_start);
 
       head.start = left_field_start;
       while (head.start + head_max_width < head.end)
@@ -1520,21 +1528,16 @@ define_all_fields (OCCURS *occurs)
     {
 
       /* Construct the reference text in preallocated space from the file
-         name and the line number.  Find out in which file the reference
-         occurred.  Standard input yields an empty file name.  Insure line
-         numbers are one based, even if they are computed zero based.  */
+         name and the line number.  Standard input yields an empty file name.
+         Ensure line numbers are 1 based, even if they are computed 0 based.  */
 
-      file_index = 0;
-      while (file_line_count[file_index] < occurs->reference)
-        file_index++;
-
-      file_name = input_file_name[file_index];
+      file_name = input_file_name[occurs->file_index];
       if (!file_name)
         file_name = "";
 
       line_ordinal = occurs->reference + 1;
-      if (file_index > 0)
-        line_ordinal -= file_line_count[file_index - 1];
+      if (occurs->file_index > 0)
+        line_ordinal -= file_line_count[occurs->file_index - 1];
 
       sprintf (reference.start, "%s:%d", file_name, line_ordinal);
       reference.end = reference.start + strlen (reference.start);
@@ -1853,7 +1856,7 @@ Output a permuted index, including context, of the words in the input files.\n\
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
       fputs (_("\
 \n\
-With no FILE or if FILE is -, read Standard Input.  '-F /' by default.\n\
+With no FILE, or when FILE is -, read standard input.  Default is '-F /'.\n\
 "), stdout);
       emit_ancillary_info ();
     }
@@ -2015,6 +2018,8 @@ main (int argc, char **argv)
         case 10:
           output_format = XARGMATCH ("--format", optarg,
                                      format_args, format_vals);
+          break;
+
         case_GETOPT_HELP_CHAR;
 
         case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
@@ -2032,6 +2037,7 @@ main (int argc, char **argv)
 
       input_file_name = xmalloc (sizeof *input_file_name);
       file_line_count = xmalloc (sizeof *file_line_count);
+      text_buffers =    xmalloc (sizeof *text_buffers);
       number_input_files = 1;
       input_file_name[0] = NULL;
     }
@@ -2040,6 +2046,7 @@ main (int argc, char **argv)
       number_input_files = argc - optind;
       input_file_name = xmalloc (number_input_files * sizeof *input_file_name);
       file_line_count = xmalloc (number_input_files * sizeof *file_line_count);
+      text_buffers    = xmalloc (number_input_files * sizeof *text_buffers);
 
       for (file_index = 0; file_index < number_input_files; file_index++)
         {
@@ -2058,6 +2065,7 @@ main (int argc, char **argv)
       number_input_files = 1;
       input_file_name = xmalloc (sizeof *input_file_name);
       file_line_count = xmalloc (sizeof *file_line_count);
+      text_buffers    = xmalloc (sizeof *text_buffers);
       if (!*argv[optind] || STREQ (argv[optind], "-"))
         input_file_name[0] = NULL;
       else
@@ -2124,11 +2132,12 @@ main (int argc, char **argv)
 
   for (file_index = 0; file_index < number_input_files; file_index++)
     {
+      BLOCK *text_buffer = text_buffers + file_index;
 
-      /* Read the file in core, than study it.  */
+      /* Read the file in core, then study it.  */
 
-      swallow_file_in_memory (input_file_name[file_index], &text_buffer);
-      find_occurs_in_text ();
+      swallow_file_in_memory (input_file_name[file_index], text_buffer);
+      find_occurs_in_text (file_index);
 
       /* Maintain for each file how many lines has been read so far when its
          end is reached.  Incrementing the count first is a simple kludge to
diff --git a/src/pwd.c b/src/pwd.c
index ea8a767e..d126ed75 100644
--- a/src/pwd.c
+++ b/src/pwd.c
@@ -1,5 +1,5 @@
 /* pwd - print current directory
-   Copyright (C) 1994-2013 Free Software Foundation, Inc.
+   Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
    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
@@ -64,6 +64,9 @@ Print the full filename of the current working directory.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
+      fputs (_("\n\
+If no option is specified, -P is assumed.\n\
+"), stdout);
       printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME);
       emit_ancillary_info ();
     }
@@ -324,7 +327,9 @@ int
 main (int argc, char **argv)
 {
   char *wd;
-  /* POSIX requires a default of -L, but most scripts expect -P.  */
+  /* POSIX requires a default of -L, but most scripts expect -P.
+     Currently shells default to -L, while stand-alone
+     pwd implementations default to -P.  */
   bool logical = (getenv ("POSIXLY_CORRECT") != NULL);
 
   initialize_main (&argc, &argv);
diff --git a/src/readlink.c b/src/readlink.c
index 665a25cf..f46d948e 100644
--- a/src/readlink.c
+++ b/src/readlink.c
@@ -1,5 +1,5 @@
 /* readlink -- display value of a symbolic link.
-   Copyright (C) 2002-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
    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
@@ -81,7 +81,7 @@ usage (int status)
   -q, --quiet,\n\
   -s, --silent                  suppress most error messages\n\
   -v, --verbose                 report error messages\n\
-  -z, --zero                    separate output with NUL rather than newline\n\
+  -z, --zero                    end each output line with NUL, not newline\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
@@ -174,5 +174,5 @@ main (int argc, char **argv)
         }
     }
 
-  return status;
+  exit (status);
 }
diff --git a/src/realpath.c b/src/realpath.c
index 292c8f3b..0c553271 100644
--- a/src/realpath.c
+++ b/src/realpath.c
@@ -1,5 +1,5 @@
 /* realpath - print the resolved path
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
    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
@@ -51,7 +51,7 @@ static struct option const longopts[] =
   {"relative-to", required_argument, NULL, RELATIVE_TO_OPTION},
   {"relative-base", required_argument, NULL, RELATIVE_BASE_OPTION},
   {"quiet", no_argument, NULL, 'q'},
-  {"strip", no_argument, NULL, 's' /* FIXME: deprecate in 2013 or so */},
+  {"strip", no_argument, NULL, 's'},
   {"no-symlinks", no_argument, NULL, 's'},
   {"zero", no_argument, NULL, 'z'},
   {"logical", no_argument, NULL, 'L'},
@@ -83,7 +83,7 @@ all but the last component must exist\n\
       --relative-to=FILE       print the resolved path relative to FILE\n\
       --relative-base=FILE     print absolute paths unless paths below FILE\n\
   -s, --strip, --no-symlinks   don't expand symlinks\n\
-  -z, --zero                   separate output with NUL rather than newline\n\
+  -z, --zero                   end each output line with NUL, not newline\n\
 \n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
diff --git a/src/relpath.c b/src/relpath.c
index 5a93afe4..29472e57 100644
--- a/src/relpath.c
+++ b/src/relpath.c
@@ -1,5 +1,5 @@
 /* relpath - print the relative path
-   Copyright (C) 2012-2013 Free Software Foundation, Inc.
+   Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/relpath.h b/src/relpath.h
index 0439d330..9017653a 100644
--- a/src/relpath.h
+++ b/src/relpath.h
@@ -1,5 +1,5 @@
 /* relpath - print the relative path
-   Copyright (C) 2012-2013 Free Software Foundation, Inc.
+   Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/remove.c b/src/remove.c
index cdbbec5b..4cc4a081 100644
--- a/src/remove.c
+++ b/src/remove.c
@@ -1,5 +1,5 @@
 /* remove.c -- core functions for removing files and directories
-   Copyright (C) 1988-2013 Free Software Foundation, Inc.
+   Copyright (C) 1988-2014 Free Software Foundation, Inc.
 
    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
@@ -283,10 +283,11 @@ prompt (FTS const *fts, FTSENT const *ent, bool is_dir,
 
           fprintf (stderr,
                    (write_protected
-                    /* TRANSLATORS: You may find it more convenient to
-                       translate "%s: remove %s (write-protected) %s? "
-                       instead.  It should avoid grammatical problems
-                       with the output of file_type.  */
+                    /* TRANSLATORS: In the next two strings the second %s is
+                       replaced by the type of the file.  To avoid grammatical
+                       problems, it may be more convenient to translate these
+                       strings instead as: "%1$s: %3$s is write-protected and
+                       is of type '%2$s' -- remove it? ".  */
                     ? _("%s: remove write-protected %s %s? ")
                     : _("%s: remove %s %s? ")),
                    program_name, file_type (sbuf), quoted_name);
@@ -437,17 +438,21 @@ rm_fts (FTS *fts, FTSENT *ent, struct rm_options const *x)
       /* Perform checks that can apply only for command-line arguments.  */
       if (ent->fts_level == FTS_ROOTLEVEL)
         {
-          /* If the basename of a command line argument is "." or "..",
+          /* POSIX says:
+             If the basename of a command line argument is "." or "..",
              diagnose it and do nothing more with that argument.  */
           if (dot_or_dotdot (last_component (ent->fts_accpath)))
             {
-              error (0, 0, _("cannot remove directory: %s"),
-                     quote (ent->fts_path));
+              error (0, 0,
+                     _("refusing to remove %s or %s directory: skipping %s"),
+                     quote_n (0, "."), quote_n (1, ".."),
+                     quote_n (2, ent->fts_path));
               fts_skip_tree (fts, ent);
               return RM_ERROR;
             }
 
-          /* If a command line argument resolves to "/" (and --preserve-root
+          /* POSIX also says:
+             If a command line argument resolves to "/" (and --preserve-root
              is in effect -- default) diagnose and skip it.  */
           if (ROOT_DEV_INO_CHECK (x->root_dev_ino, ent->fts_statp))
             {
diff --git a/src/remove.h b/src/remove.h
index 9ac54d43..2563553d 100644
--- a/src/remove.h
+++ b/src/remove.h
@@ -1,6 +1,6 @@
 /* Remove directory entries.
 
-   Copyright (C) 1998-2013 Free Software Foundation, Inc.
+   Copyright (C) 1998-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/rm.c b/src/rm.c
index 3e187cf8..5baea153 100644
--- a/src/rm.c
+++ b/src/rm.c
@@ -1,5 +1,5 @@
 /* 'rm' file deletion utility for GNU.
-   Copyright (C) 1988-2013 Free Software Foundation, Inc.
+   Copyright (C) 1988-2014 Free Software Foundation, Inc.
 
    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
@@ -141,10 +141,10 @@ Remove (unlink) the FILE(s).\n\
 "), stdout);
       fputs (_("\
   -I                    prompt once before removing more than three files, or\n\
-                          when removing recursively.  Less intrusive than -i,\n\
+                          when removing recursively; less intrusive than -i,\n\
                           while still giving protection against most mistakes\n\
       --interactive[=WHEN]  prompt according to WHEN: never, once (-I), or\n\
-                          always (-i).  Without WHEN, prompt always\n\
+                          always (-i); without WHEN, prompt always\n\
 "), stdout);
       fputs (_("\
       --one-file-system  when removing a hierarchy recursively, skip any\n\
@@ -244,7 +244,7 @@ main (int argc, char **argv)
           break;
 
         case 'I':
-          x.interactive = RMI_NEVER;
+          x.interactive = RMI_SOMETIMES;
           x.ignore_missing_files = false;
           prompt_once = true;
           break;
@@ -339,9 +339,13 @@ main (int argc, char **argv)
     {
       fprintf (stderr,
                (x.recursive
-                ? _("%s: remove all arguments recursively? ")
-                : _("%s: remove all arguments? ")),
-               program_name);
+                ? ngettext ("%s: remove %zu argument recursively? ",
+                            "%s: remove %zu arguments recursively? ",
+                            select_plural (n_files))
+                : ngettext ("%s: remove %zu argument? ",
+                            "%s: remove %zu arguments? ",
+                            select_plural (n_files))),
+               program_name, n_files);
       if (!yesno ())
         exit (EXIT_SUCCESS);
     }
diff --git a/src/rmdir.c b/src/rmdir.c
index 81ef2a99..e67d3b00 100644
--- a/src/rmdir.c
+++ b/src/rmdir.c
@@ -1,6 +1,6 @@
 /* rmdir -- remove directories
 
-   Copyright (C) 1990-2013 Free Software Foundation, Inc.
+   Copyright (C) 1990-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/runcon.c b/src/runcon.c
index 8a0b34e9..14ccc3d5 100644
--- a/src/runcon.c
+++ b/src/runcon.c
@@ -1,5 +1,5 @@
 /* runcon -- run command with specified security context
-   Copyright (C) 2005-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
    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
@@ -85,7 +85,7 @@ Usage: %s CONTEXT COMMAND [args]\n\
   or:  %s [ -c ] [-u USER] [-r ROLE] [-t TYPE] [-l RANGE] COMMAND [args]\n\
 "), program_name, program_name);
       fputs (_("\
-Run a program in a different security context.\n\
+Run a program in a different SELinux security context.\n\
 With neither CONTEXT nor COMMAND, print the current security context.\n\
 "), stdout);
 
@@ -115,9 +115,9 @@ main (int argc, char **argv)
   char *user = NULL;
   char *type = NULL;
   char *context = NULL;
-  security_context_t cur_context = NULL;
-  security_context_t file_context = NULL;
-  security_context_t new_context = NULL;
+  char *cur_context = NULL;
+  char *file_context = NULL;
+  char *new_context = NULL;
   bool compute_trans = false;
 
   context_t con;
@@ -197,8 +197,8 @@ main (int argc, char **argv)
     }
 
   if (is_selinux_enabled () != 1)
-    error (EXIT_FAILURE, 0,
-           _("%s may be used only on a SELinux kernel"), program_name);
+    error (EXIT_FAILURE, 0, _("%s may be used only on a SELinux kernel"),
+           program_name);
 
   if (context)
     {
@@ -223,8 +223,7 @@ main (int argc, char **argv)
           /* compute result of process transition */
           if (security_compute_create (cur_context, file_context,
                                        SECCLASS_PROCESS, &new_context) != 0)
-            error (EXIT_FAILURE, errno,
-                   _("failed to compute a new context"));
+            error (EXIT_FAILURE, errno, _("failed to compute a new context"));
           /* free contexts */
           freecon (file_context);
           freecon (cur_context);
diff --git a/src/selinux.c b/src/selinux.c
new file mode 100644
index 00000000..ae454f8a
--- /dev/null
+++ b/src/selinux.c
@@ -0,0 +1,341 @@
+/* selinux - core functions for maintaining SELinux labeling
+   Copyright (C) 2012-2014 Free Software Foundation, Inc.
+
+   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 3 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/>.  */
+
+/* Written by Daniel Walsh <dwalsh@redhat.com> */
+
+#include <config.h>
+#include <selinux/selinux.h>
+#include <selinux/context.h>
+#include <sys/types.h>
+
+#include "error.h"
+#include "system.h"
+#include "canonicalize.h"
+#include "dosname.h"
+#include "xfts.h"
+#include "quote.h"
+#include "selinux.h"
+
+#if HAVE_SELINUX_SELINUX_H
+
+# if ! HAVE_MODE_TO_SECURITY_CLASS
+/*
+  This function has been added to libselinux-2.1.12-5, but is here
+  for support with older versions of SELinux
+
+  Translates a mode into an Internal SELinux security_class definition.
+  Returns 0 on failure, with errno set to EINVAL.
+*/
+static security_class_t
+mode_to_security_class (mode_t m)
+{
+
+  if (S_ISREG (m))
+    return string_to_security_class ("file");
+  if (S_ISDIR (m))
+    return string_to_security_class ("dir");
+  if (S_ISCHR (m))
+    return string_to_security_class ("chr_file");
+  if (S_ISBLK (m))
+    return string_to_security_class ("blk_file");
+  if (S_ISFIFO (m))
+    return string_to_security_class ("fifo_file");
+  if (S_ISLNK (m))
+    return string_to_security_class ("lnk_file");
+  if (S_ISSOCK (m))
+    return string_to_security_class ("sock_file");
+
+  errno = EINVAL;
+  return 0;
+}
+# endif
+
+/*
+  This function takes a PATH and a MODE and then asks SELinux what the label
+  of the path object would be if the current process label created it.
+  It then returns the label.
+
+  Returns -1 on failure.  errno will be set appropriately.
+*/
+
+static int
+computecon (char const *path, mode_t mode, char **con)
+{
+  char *scon = NULL;
+  char *tcon = NULL;
+  security_class_t tclass;
+  int rc = -1;
+
+  char *dir = dir_name (path);
+  if (!dir)
+    goto quit;
+  if (getcon (&scon) < 0)
+    goto quit;
+  if (getfilecon (dir, &tcon) < 0)
+    goto quit;
+  tclass = mode_to_security_class (mode);
+  if (!tclass)
+    goto quit;
+  rc = security_compute_create (scon, tcon, tclass, con);
+
+quit:
+  free (dir);
+  freecon (scon);
+  freecon (tcon);
+  return rc;
+}
+
+/*
+  This function takes a path and a mode, it calls computecon to get the
+  label of the path object if the current process created it, then it calls
+  matchpathcon to get the default type for the object.  It substitutes the
+  default type into label.  It tells the SELinux Kernel to label all new file
+  system objects created by the current process with this label.
+
+  Returns -1 on failure.  errno will be set appropriately.
+*/
+int
+defaultcon (char const *path, mode_t mode)
+{
+  int rc = -1;
+  char *scon = NULL;
+  char *tcon = NULL;
+  context_t scontext = 0, tcontext = 0;
+  const char *contype;
+  char *constr;
+  char *newpath = NULL;
+
+  if (! IS_ABSOLUTE_FILE_NAME (path))
+    {
+      /* Generate absolute path as required by subsequent matchpathcon(),
+         with libselinux < 2.1.5 2011-0826.  */
+      newpath = canonicalize_filename_mode (path, CAN_MISSING);
+      if (! newpath)
+        error (EXIT_FAILURE, errno, _("error canonicalizing %s"),
+               quote (path));
+      path = newpath;
+    }
+
+  if (matchpathcon (path, mode, &scon) < 0)
+    {
+      /* "No such file or directory" is a confusing error,
+         when processing files, when in fact it was the
+         associated default context that was not found.
+         Therefore map the error to something more appropriate
+         to the context in which we're using matchpathcon().  */
+      if (errno == ENOENT)
+        errno = ENODATA;
+      goto quit;
+    }
+  if (computecon (path, mode, &tcon) < 0)
+    goto quit;
+  if (!(scontext = context_new (scon)))
+    goto quit;
+  if (!(tcontext = context_new (tcon)))
+    goto quit;
+
+  if (!(contype = context_type_get (scontext)))
+    goto quit;
+  if (context_type_set (tcontext, contype))
+    goto quit;
+  if (!(constr = context_str (tcontext)))
+    goto quit;
+
+  rc = setfscreatecon (constr);
+
+quit:
+  context_free (scontext);
+  context_free (tcontext);
+  freecon (scon);
+  freecon (tcon);
+  free (newpath);
+  return rc;
+}
+
+/*
+  This function takes a PATH of an existing file system object, and a LOCAL
+  boolean that indicates whether the function should set the object's label
+  to the default for the local process, or one using system wide settings.
+  If LOCAL == true, it will ask the SELinux Kernel what the default label
+  for all objects created should be and then sets the label on the object.
+  Otherwise it calls matchpathcon on the object to ask the system what the
+  default label should be, extracts the type field and then modifies the file
+  system object.  Note only the type field is updated, thus preserving MLS
+  levels and user identity etc. of the PATH.
+
+  Returns -1 on failure.  errno will be set appropriately.
+*/
+static int
+restorecon_private (char const *path, bool local)
+{
+  int rc = -1;
+  struct stat sb;
+  char *scon = NULL;
+  char *tcon = NULL;
+  context_t scontext = 0, tcontext = 0;
+  const char *contype;
+  char *constr;
+  int fd;
+
+  if (local)
+    {
+      if (getfscreatecon (&tcon) < 0)
+        return rc;
+      if (!tcon)
+        {
+          errno = ENODATA;
+          return rc;
+        }
+      rc = lsetfilecon (path, tcon);
+      freecon (tcon);
+      return rc;
+    }
+
+  fd = open (path, O_RDONLY | O_NOFOLLOW);
+  if (fd == -1 && (errno != ELOOP))
+    goto quit;
+
+  if (fd != -1)
+    {
+      if (fstat (fd, &sb) < 0)
+        goto quit;
+    }
+  else
+    {
+      if (lstat (path, &sb) < 0)
+        goto quit;
+    }
+
+  if (matchpathcon (path, sb.st_mode, &scon) < 0)
+    {
+      /* "No such file or directory" is a confusing error,
+         when processing files, when in fact it was the
+         associated default context that was not found.
+         Therefore map the error to something more appropriate
+         to the context in which we're using matchpathcon().  */
+      if (errno == ENOENT)
+        errno = ENODATA;
+      goto quit;
+    }
+  if (!(scontext = context_new (scon)))
+    goto quit;
+
+  if (fd != -1)
+    {
+      if (fgetfilecon (fd, &tcon) < 0)
+        goto quit;
+    }
+  else
+    {
+      if (lgetfilecon (path, &tcon) < 0)
+        goto quit;
+    }
+
+  if (!(tcontext = context_new (tcon)))
+    goto quit;
+
+  if (!(contype = context_type_get (scontext)))
+    goto quit;
+  if (context_type_set (tcontext, contype))
+    goto quit;
+  if (!(constr = context_str (tcontext)))
+    goto quit;
+
+  if (fd != -1)
+    rc = fsetfilecon (fd, constr);
+  else
+    rc = lsetfilecon (path, constr);
+
+quit:
+  if (fd != -1)
+    close (fd);
+  context_free (scontext);
+  context_free (tcontext);
+  freecon (scon);
+  freecon (tcon);
+  return rc;
+}
+
+/*
+  This function takes three parameters:
+
+  PATH of an existing file system object.
+
+  A RECURSE boolean which if the file system object is a directory, will
+  call restorecon_private on every file system object in the directory.
+
+  A LOCAL boolean that indicates whether the function should set object labels
+  to the default for the local process, or use system wide settings.
+
+  Returns false on failure.  errno will be set appropriately.
+*/
+bool
+restorecon (char const *path, bool recurse, bool local)
+{
+  char *newpath = NULL;
+  FTS *fts;
+  bool ok = true;
+
+  if (! IS_ABSOLUTE_FILE_NAME (path) && ! local)
+    {
+      /* Generate absolute path as required by subsequent matchpathcon(),
+         with libselinux < 2.1.5 2011-0826.  Also generating the absolute
+         path before the fts walk, will generate absolute paths in the
+         fts entries, which may be quicker to process in any case.  */
+      newpath = canonicalize_filename_mode (path, CAN_MISSING);
+      if (! newpath)
+        error (EXIT_FAILURE, errno, _("error canonicalizing %s"),
+               quote (path));
+    }
+
+  const char *ftspath[2] = { newpath ? newpath : path, NULL };
+
+  if (! recurse)
+    {
+      ok = restorecon_private (*ftspath, local) != -1;
+      free (newpath);
+      return ok;
+    }
+
+  fts = xfts_open ((char *const *) ftspath, FTS_PHYSICAL, NULL);
+  while (1)
+    {
+      FTSENT *ent;
+
+      ent = fts_read (fts);
+      if (ent == NULL)
+        {
+          if (errno != 0)
+            {
+              error (0, errno, _("fts_read failed"));
+              ok = false;
+            }
+          break;
+        }
+
+      ok &= restorecon_private (fts->fts_path, local) != -1;
+    }
+
+  if (fts_close (fts) != 0)
+    {
+      error (0, errno, _("fts_close failed"));
+      ok = false;
+    }
+
+  free (newpath);
+  return ok;
+}
+#endif
diff --git a/src/selinux.h b/src/selinux.h
new file mode 100644
index 00000000..8afaa495
--- /dev/null
+++ b/src/selinux.h
@@ -0,0 +1,47 @@
+/* selinux - core functions for maintaining SELinux labeling
+   Copyright (C) 2012-2014 Free Software Foundation, Inc.
+
+   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 3 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/>.  */
+
+/* Written by Daniel Walsh <dwalsh@redhat.com> */
+
+#ifndef COREUTILS_SELINUX_H
+# define COREUTILS_SELINUX_H
+
+/* Return true if ERR corresponds to an unsupported request,
+   or if there is no context or it's inaccessible.  */
+static inline bool
+ignorable_ctx_err (int err)
+{
+  return err == ENOTSUP || err == ENODATA;
+}
+
+# if HAVE_SELINUX_SELINUX_H
+
+extern bool restorecon (char const *path, bool recurse, bool preserve);
+extern int defaultcon (char const *path, mode_t mode);
+
+# else
+
+static inline bool
+restorecon (char const *path, bool recurse, bool preserve)
+{ errno = ENOTSUP; return false; }
+
+static inline int
+defaultcon (char const *path, mode_t mode)
+{ errno = ENOTSUP; return -1; }
+
+# endif
+
+#endif
diff --git a/src/seq.c b/src/seq.c
index acbe2350..1124358c 100644
--- a/src/seq.c
+++ b/src/seq.c
@@ -1,5 +1,5 @@
 /* seq - print sequence of numbers to standard output.
-   Copyright (C) 1994-2013 Free Software Foundation, Inc.
+   Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
    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
@@ -87,6 +87,8 @@ Print numbers from FIRST to LAST, in steps of INCREMENT.\n\
 \n\
 If FIRST or INCREMENT is omitted, it defaults to 1.  That is, an\n\
 omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n\
+The sequence of numbers ends when the sum of the current number and\n\
+INCREMENT would become greater than LAST.\n\
 FIRST, INCREMENT, and LAST are interpreted as floating point values.\n\
 INCREMENT is usually positive if FIRST is smaller than LAST, and\n\
 INCREMENT is usually negative if FIRST is greater than LAST.\n\
@@ -602,7 +604,7 @@ main (int argc, char **argv)
       if (asprintf (&s2, "%0.Lf", last.value) < 0)
         xalloc_die ();
 
-      if (seq_fast (s1, s2))
+      if (*s1 != '-' && *s2 != '-' && seq_fast (s1, s2))
         {
           IF_LINT (free (s1));
           IF_LINT (free (s2));
diff --git a/src/setuidgid.c b/src/setuidgid.c
deleted file mode 100644
index ed6b65d2..00000000
--- a/src/setuidgid.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/* setuidgid - run a command with the UID and GID of a specified user
-   Copyright (C) 2003-2013 Free Software Foundation, Inc.
-
-   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 3 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/>.  */
-
-/* Written by Jim Meyering  */
-
-#include <config.h>
-#include <getopt.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <pwd.h>
-#include <grp.h>
-
-#include "system.h"
-
-#include "error.h"
-#include "long-options.h"
-#include "mgetgroups.h"
-#include "quote.h"
-#include "xstrtol.h"
-
-#define PROGRAM_NAME "setuidgid"
-
-/* I wrote this program from scratch, based on the description of
-   D.J. Bernstein's program: http://cr.yp.to/daemontools/setuidgid.html.  */
-#define AUTHORS proper_name ("Jim Meyering")
-
-#define SETUIDGID_FAILURE 111
-
-void
-usage (int status)
-{
-  if (status != EXIT_SUCCESS)
-    emit_try_help ();
-  else
-    {
-      printf (_("\
-Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n\
-  or:  %s LONG-OPTION\n\
-"),
-              program_name, program_name);
-
-      fputs (_("\
-Drop any supplemental groups, assume the user-ID and group-ID of the specified\
-\n\
-USER (numeric ID or user name), and run COMMAND with any specified ARGUMENTs.\n\
-Exit with status 111 if unable to assume the required user and group ID.\n\
-Otherwise, exit with the exit status of COMMAND.\n\
-This program is useful only when run by root (user ID zero).\n\
-\n\
-"), stdout);
-      fputs (_("\
-  -g GID[,GID1...]  also set the primary group-ID to the numeric GID, and\n\
-                    (if specified) supplemental group IDs to GID1, ...\n\
-"), stdout);
-      fputs (HELP_OPTION_DESCRIPTION, stdout);
-      fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      emit_ancillary_info ();
-    }
-  exit (status);
-}
-
-int
-main (int argc, char **argv)
-{
-  uid_t uid;
-  GETGROUPS_T *gids = NULL;
-  size_t n_gids = 0;
-  size_t n_gids_allocated = 0;
-  gid_t primary_gid;
-
-  initialize_main (&argc, &argv);
-  set_program_name (argv[0]);
-  setlocale (LC_ALL, "");
-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
-
-  initialize_exit_failure (SETUIDGID_FAILURE);
-  atexit (close_stdout);
-
-  parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE_NAME, Version,
-                      usage, AUTHORS, (char const *) NULL);
-  {
-    int c;
-    while ((c = getopt_long (argc, argv, "+g:", NULL, NULL)) != -1)
-      {
-        switch (c)
-          {
-            case 'g':
-              {
-                unsigned long int tmp_ul;
-                char *gr = optarg;
-                char *ptr;
-                while (true)
-                  {
-                    if (! (xstrtoul (gr, &ptr, 10, &tmp_ul, NULL) == LONGINT_OK
-                           && tmp_ul <= GID_T_MAX))
-                      error (SETUIDGID_FAILURE, 0, _("invalid group %s"),
-                             quote (gr));
-                    if (n_gids == n_gids_allocated)
-                      gids = X2NREALLOC (gids, &n_gids_allocated);
-                    gids[n_gids++] = tmp_ul;
-
-                    if (*ptr == '\0')
-                      break;
-                    if (*ptr != ',')
-                      {
-                        error (0, 0, _("invalid group %s"), quote (gr));
-                        usage (SETUIDGID_FAILURE);
-                      }
-                    gr = ptr + 1;
-                  }
-                break;
-              }
-
-            default:
-              usage (SETUIDGID_FAILURE);
-          }
-      }
-  }
-
-  if (argc <= optind + 1)
-    {
-      if (argc < optind + 1)
-        error (0, 0, _("missing operand"));
-      else
-        error (0, 0, _("missing operand after %s"), quote (argv[optind]));
-      usage (SETUIDGID_FAILURE);
-    }
-
-  {
-    const struct passwd *pwd;
-    unsigned long int tmp_ul;
-    char *user = argv[optind];
-    char *ptr;
-    bool have_uid = false;
-
-    if (xstrtoul (user, &ptr, 10, &tmp_ul, "") == LONGINT_OK
-        && tmp_ul <= UID_T_MAX)
-      {
-        uid = tmp_ul;
-        have_uid = true;
-      }
-
-    if (!have_uid)
-      {
-        pwd = getpwnam (user);
-        if (pwd == NULL)
-          {
-            error (0, errno, _("unknown user-ID: %s"), quote (user));
-            usage (SETUIDGID_FAILURE);
-          }
-        uid = pwd->pw_uid;
-      }
-    else if (n_gids == 0)
-      {
-        pwd = getpwuid (uid);
-        if (pwd == NULL)
-          {
-            error (0, errno,
-                   _("to use user-ID %s you need to use -g too"), quote (user));
-            usage (SETUIDGID_FAILURE);
-          }
-      }
-
-#if HAVE_SETGROUPS
-    if (n_gids == 0)
-      {
-        int n = xgetgroups (pwd->pw_name, pwd->pw_gid, &gids);
-        if (n <= 0)
-          error (SETUIDGID_FAILURE, errno,
-                 _("failed to get groups for user %s"), quote (pwd->pw_name));
-        n_gids = n;
-      }
-
-    if (setgroups (n_gids, gids))
-      error (SETUIDGID_FAILURE, errno,
-             _("failed to set supplemental group(s)"));
-
-    primary_gid = gids[0];
-#else
-    primary_gid = pwd->pw_gid;
-#endif
-  }
-
-  if (setgid (primary_gid))
-    error (SETUIDGID_FAILURE, errno,
-           _("cannot set group-ID to %lu"), (unsigned long int) primary_gid);
-
-  if (setuid (uid))
-    error (SETUIDGID_FAILURE, errno,
-           _("cannot set user-ID to %lu"), (unsigned long int) uid);
-
-  {
-    char **cmd = argv + optind + 1;
-    int exit_status;
-    execvp (*cmd, cmd);
-    exit_status = (errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE);
-
-    error (0, errno, _("failed to run command %s"), quote (*cmd));
-    exit (exit_status);
-  }
-}
diff --git a/src/shred.c b/src/shred.c
index 9b869cdc..bd88e383 100644
--- a/src/shred.c
+++ b/src/shred.c
@@ -1,6 +1,6 @@
 /* shred.c - overwrite files and devices to make it harder to recover data
 
-   Copyright (C) 1999-2013 Free Software Foundation, Inc.
+   Copyright (C) 1999-2014 Free Software Foundation, Inc.
    Copyright (C) 1997, 1998, 1999 Colin Plumb.
 
    This program is free software: you can redistribute it and/or modify
@@ -80,8 +80,12 @@
 #include <assert.h>
 #include <setjmp.h>
 #include <sys/types.h>
+#ifdef __linux__
+# include <sys/mtio.h>
+#endif
 
 #include "system.h"
+#include "argmatch.h"
 #include "xstrtol.h"
 #include "error.h"
 #include "fcntl--.h"
@@ -104,12 +108,30 @@ enum { SECTOR_SIZE = 512 };
 enum { SECTOR_MASK = SECTOR_SIZE - 1 };
 verify (0 < SECTOR_SIZE && (SECTOR_SIZE & SECTOR_MASK) == 0);
 
+enum remove_method
+{
+  remove_none = 0,      /* the default: only wipe data.  */
+  remove_unlink,        /* don't obfuscate name, just unlink.  */
+  remove_wipe,          /* obfuscate name before unlink.  */
+  remove_wipesync       /* obfuscate name, syncing each byte, before unlink.  */
+};
+
+static char const *const remove_args[] =
+{
+  "unlink", "wipe", "wipesync", NULL
+};
+
+static enum remove_method const remove_methods[] =
+{
+  remove_unlink, remove_wipe, remove_wipesync
+};
+
 struct Options
 {
   bool force;		/* -f flag: chmod files if necessary */
   size_t n_iterations;	/* -n flag: Number of iterations */
   off_t size;		/* -s flag: size of file */
-  bool remove_file;	/* -u flag: remove file after shredding */
+  enum remove_method remove_file; /* -u flag: remove file after shredding */
   bool verbose;		/* -v flag: Print progress */
   bool exact;		/* -x flag: Do not round up file size */
   bool zero_fill;	/* -z flag: Add a final zero pass */
@@ -129,7 +151,7 @@ static struct option const long_opts[] =
   {"iterations", required_argument, NULL, 'n'},
   {"size", required_argument, NULL, 's'},
   {"random-source", required_argument, NULL, RANDOM_SOURCE_OPTION},
-  {"remove", no_argument, NULL, 'u'},
+  {"remove", optional_argument, NULL, 'u'},
   {"verbose", no_argument, NULL, 'v'},
   {"zero", no_argument, NULL, 'z'},
   {GETOPT_HELP_OPTION_DECL},
@@ -159,7 +181,7 @@ for even very expensive hardware probing to recover the data.\n\
   -s, --size=N   shred this many bytes (suffixes like K, M, G accepted)\n\
 "), DEFAULT_PASSES);
       fputs (_("\
-  -u, --remove   truncate and remove file after overwriting\n\
+  -u, --remove[=HOW]  truncate and remove file after overwriting; See below\n\
   -v, --verbose  show progress\n\
   -x, --exact    do not round file sizes up to the next full block;\n\
                    this is the default for non-regular files\n\
@@ -173,8 +195,12 @@ If FILE is -, shred standard output.\n\
 \n\
 Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n\
 the files because it is common to operate on device files like /dev/hda,\n\
-and those files usually should not be removed.  When operating on regular\n\
-files, most people use the --remove option.\n\
+and those files usually should not be removed.\n\
+The optional HOW parameter indicates how to remove a directory entry:\n\
+'unlink' => use a standard unlink call.\n\
+'wipe' => also first obfuscate bytes in the name.\n\
+'wipesync' => also sync each obfuscated byte to disk.\n\
+The default mode is 'wipesync', but note it can be expensive.\n\
 \n\
 "), stdout);
       fputs (_("\
@@ -222,6 +248,25 @@ to be recovered later.\n\
   exit (status);
 }
 
+/*
+ * Determine if pattern type is periodic or not.
+ */
+static bool
+periodic_pattern (int type)
+{
+  if (type <= 0)
+    return false;
+
+  unsigned char r[3];
+  unsigned int bits = type & 0xfff;
+
+  bits |= bits << 12;
+  r[0] = (bits >> 4) & 255;
+  r[1] = (bits >> 8) & 255;
+  r[2] = bits & 255;
+
+  return (r[0] != r[1]) || (r[0] != r[2]);
+}
 
 /*
  * Fill a buffer with a fixed pattern.
@@ -337,19 +382,43 @@ direct_mode (int fd, bool enable)
 #endif
 }
 
+/* Rewind FD; its status is ST.  */
+static bool
+dorewind (int fd, struct stat const *st)
+{
+  if (S_ISCHR (st->st_mode))
+    {
+#ifdef __linux__
+      /* In the Linux kernel, lseek does not work on tape devices; it
+         returns a randomish value instead.  Try the low-level tape
+         rewind operation first.  */
+      struct mtop op;
+      op.mt_op = MTREW;
+      op.mt_count = 1;
+      if (ioctl (fd, MTIOCTOP, &op) == 0)
+        return true;
+#endif
+    }
+  off_t offset = lseek (fd, 0, SEEK_SET);
+  if (0 < offset)
+    errno = EINVAL;
+  return offset == 0;
+}
+
 /*
- * Do pass number k of n, writing "size" bytes of the given pattern "type"
- * to the file descriptor fd.   Qname, k and n are passed in only for verbose
- * progress message purposes.  If n == 0, no progress messages are printed.
+ * Do pass number K of N, writing *SIZEP bytes of the given pattern TYPE
+ * to the file descriptor FD.  K and N are passed in only for verbose
+ * progress message purposes.  If N == 0, no progress messages are printed.
  *
- * If *sizep == -1, the size is unknown, and it will be filled in as soon
- * as writing fails.
+ * If *SIZEP == -1, the size is unknown, and it will be filled in as soon
+ * as writing fails with ENOSPC.
  *
  * Return 1 on write error, -1 on other error, 0 on success.
  */
 static int
-dopass (int fd, char const *qname, off_t *sizep, int type,
-        struct randread_source *s, unsigned long int k, unsigned long int n)
+dopass (int fd, struct stat const *st, char const *qname, off_t *sizep,
+        int type, struct randread_source *s,
+        unsigned long int k, unsigned long int n)
 {
   off_t size = *sizep;
   off_t offset;			/* Current file posiiton */
@@ -359,37 +428,47 @@ dopass (int fd, char const *qname, off_t *sizep, int type,
   size_t soff;			/* Offset into buffer for next write */
   ssize_t ssize;		/* Return value from write */
 
-  /* Fill pattern buffer.  Aligning it to a 32-bit boundary speeds up randread
-     in some cases.  */
-  typedef uint32_t fill_pattern_buffer[3 * 1024];
-  union
-  {
-    fill_pattern_buffer buffer;
-    char c[sizeof (fill_pattern_buffer)];
-    unsigned char u[sizeof (fill_pattern_buffer)];
-  } r;
-
-  off_t sizeof_r = sizeof r;
+  /* Fill pattern buffer.  Aligning it to a page so we can do direct I/O.  */
+  size_t page_size = getpagesize ();
+#define PERIODIC_OUTPUT_SIZE (60 * 1024)
+#define NONPERIODIC_OUTPUT_SIZE (64 * 1024)
+  verify (PERIODIC_OUTPUT_SIZE % 3 == 0);
+  size_t output_size = periodic_pattern (type)
+                       ? PERIODIC_OUTPUT_SIZE : NONPERIODIC_OUTPUT_SIZE;
+#define PAGE_ALIGN_SLOP (page_size - 1)                /* So directio works */
+#define FILLPATTERN_SIZE (((output_size + 2) / 3) * 3) /* Multiple of 3 */
+#define PATTERNBUF_SIZE (PAGE_ALIGN_SLOP + FILLPATTERN_SIZE)
+  void *fill_pattern_mem = xmalloc (PATTERNBUF_SIZE);
+  unsigned char *pbuf = ptr_align (fill_pattern_mem, page_size);
+
   char pass_string[PASS_NAME_SIZE];	/* Name of current pass */
   bool write_error = false;
-  bool first_write = true;
+  bool other_error = false;
 
   /* Printable previous offset into the file */
   char previous_offset_buf[LONGEST_HUMAN_READABLE + 1];
   char const *previous_human_offset IF_LINT ( = 0);
 
-  if (lseek (fd, 0, SEEK_SET) == -1)
+  /* As a performance tweak, avoid direct I/O for small sizes,
+     as it's just a performance rather then security consideration,
+     and direct I/O can often be unsupported for small non aligned sizes.  */
+  bool try_without_directio = 0 < size && size < output_size;
+  if (! try_without_directio)
+    direct_mode (fd, true);
+
+  if (! dorewind (fd, st))
     {
       error (0, errno, _("%s: cannot rewind"), qname);
-      return -1;
+      other_error = true;
+      goto free_pattern_mem;
     }
 
   /* Constant fill patterns need only be set up once. */
   if (type >= 0)
     {
-      lim = (0 <= size && size < sizeof_r ? size : sizeof_r);
-      fillpattern (type, r.u, lim);
-      passname (r.u, pass_string);
+      lim = (0 <= size && size < FILLPATTERN_SIZE ? size : FILLPATTERN_SIZE);
+      fillpattern (type, pbuf, lim);
+      passname (pbuf, pass_string);
     }
   else
     {
@@ -408,8 +487,8 @@ dopass (int fd, char const *qname, off_t *sizep, int type,
   while (true)
     {
       /* How much to write this time? */
-      lim = sizeof r;
-      if (0 <= size && size - offset < sizeof_r)
+      lim = output_size;
+      if (0 <= size && size - offset < output_size)
         {
           if (size < offset)
             break;
@@ -418,11 +497,11 @@ dopass (int fd, char const *qname, off_t *sizep, int type,
             break;
         }
       if (type < 0)
-        randread (s, &r, lim);
+        randread (s, pbuf, lim);
       /* Loop to retry partial writes. */
-      for (soff = 0; soff < lim; soff += ssize, first_write = false)
+      for (soff = 0; soff < lim; soff += ssize)
         {
-          ssize = write (fd, r.c + soff, lim - soff);
+          ssize = write (fd, pbuf + soff, lim - soff);
           if (ssize <= 0)
             {
               if (size < 0 && (ssize == 0 || errno == ENOSPC))
@@ -436,17 +515,15 @@ dopass (int fd, char const *qname, off_t *sizep, int type,
                   int errnum = errno;
                   char buf[INT_BUFSIZE_BOUND (uintmax_t)];
 
-                  /* If the first write of the first pass for a given file
-                     has just failed with EINVAL, turn off direct mode I/O
-                     and try again.  This works around a bug in Linux kernel
-                     2.4 whereby opening with O_DIRECT would succeed for some
-                     file system types (e.g., ext3), but any attempt to
-                     access a file through the resulting descriptor would
-                     fail with EINVAL.  */
-                  if (k == 1 && first_write && errno == EINVAL)
+                  /* Retry without direct I/O since this may not be supported
+                     at all on some (file) systems, or with the current size.
+                     I.E. a specified --size that is not aligned, or when
+                     dealing with slop at the end of a file with --exact.  */
+                  if (! try_without_directio && errno == EINVAL)
                     {
                       direct_mode (fd, false);
                       ssize = 0;
+                      try_without_directio = true;
                       continue;
                     }
                   error (0, errnum, _("%s: error writing at offset %s"),
@@ -455,8 +532,10 @@ dopass (int fd, char const *qname, off_t *sizep, int type,
                   /* 'shred' is often used on bad media, before throwing it
                      out.  Thus, it shouldn't give up on bad blocks.  This
                      code works because lim is always a multiple of
-                     SECTOR_SIZE, except at the end.  */
-                  verify (sizeof r % SECTOR_SIZE == 0);
+                     SECTOR_SIZE, except at the end.  This size constraint
+                     also enables direct I/O on some (file) systems.  */
+                  verify (PERIODIC_OUTPUT_SIZE % SECTOR_SIZE == 0);
+                  verify (NONPERIODIC_OUTPUT_SIZE % SECTOR_SIZE == 0);
                   if (errnum == EIO && 0 <= size && (soff | SECTOR_MASK) < lim)
                     {
                       size_t soff1 = (soff | SECTOR_MASK) + 1;
@@ -469,7 +548,8 @@ dopass (int fd, char const *qname, off_t *sizep, int type,
                         }
                       error (0, errno, _("%s: lseek failed"), qname);
                     }
-                  return -1;
+                  other_error = true;
+                  goto free_pattern_mem;
                 }
             }
         }
@@ -479,7 +559,8 @@ dopass (int fd, char const *qname, off_t *sizep, int type,
       if (offset > OFF_T_MAX - (off_t) soff)
         {
           error (0, 0, _("%s: file too large"), qname);
-          return -1;
+          other_error = true;
+          goto free_pattern_mem;
         }
 
       offset += soff;
@@ -536,7 +617,10 @@ dopass (int fd, char const *qname, off_t *sizep, int type,
               if (dosync (fd, qname) != 0)
                 {
                   if (errno != EIO)
-                    return -1;
+                    {
+                      other_error = true;
+                      goto free_pattern_mem;
+                    }
                   write_error = true;
                 }
             }
@@ -547,11 +631,18 @@ dopass (int fd, char const *qname, off_t *sizep, int type,
   if (dosync (fd, qname) != 0)
     {
       if (errno != EIO)
-        return -1;
+        {
+          other_error = true;
+          goto free_pattern_mem;
+        }
       write_error = true;
     }
 
-  return write_error;
+free_pattern_mem:
+  memset (pbuf, 0, FILLPATTERN_SIZE);
+  free (fill_pattern_mem);
+
+  return other_error ? -1 : write_error;
 }
 
 /*
@@ -752,13 +843,14 @@ do_wipefd (int fd, char const *qname, struct randint_source *s,
 {
   size_t i;
   struct stat st;
-  off_t size;			/* Size to write, size to read */
-  unsigned long int n;		/* Number of passes for printing purposes */
+  off_t size;		/* Size to write, size to read */
+  off_t i_size = 0;	/* For small files, initial size to overwrite inode */
+  unsigned long int n;	/* Number of passes for printing purposes */
   int *passarray;
   bool ok = true;
   struct randread_source *rs;
 
-  n = 0;		/* dopass takes n -- 0 to mean "don't print progress" */
+  n = 0;		/* dopass takes n == 0 to mean "don't print progress" */
   if (flags->verbose)
     n = flags->n_iterations + flags->zero_fill;
 
@@ -778,8 +870,11 @@ do_wipefd (int fd, char const *qname, struct randint_source *s,
       error (0, 0, _("%s: invalid file type"), qname);
       return false;
     }
-
-  direct_mode (fd, true);
+  else if (S_ISREG (st.st_mode) && st.st_size < 0)
+    {
+      error (0, 0, _("%s: file has negative size"), qname);
+      return false;
+    }
 
   /* Allocate pass array */
   passarray = xnmalloc (flags->n_iterations, sizeof *passarray);
@@ -787,19 +882,28 @@ do_wipefd (int fd, char const *qname, struct randint_source *s,
   size = flags->size;
   if (size == -1)
     {
-      /* Accept a length of zero only if it's a regular file.
-         For any other type of file, try to get the size another way.  */
       if (S_ISREG (st.st_mode))
         {
           size = st.st_size;
-          if (size < 0)
+
+          if (! flags->exact)
             {
-              error (0, 0, _("%s: file has negative size"), qname);
-              return false;
+              /* Round up to the nearest block size to clear slack space.  */
+              off_t remainder = size % ST_BLKSIZE (st);
+              if (size && size < ST_BLKSIZE (st))
+                i_size = size;
+              if (remainder != 0)
+                {
+                  off_t size_incr = ST_BLKSIZE (st) - remainder;
+                  size += MIN (size_incr, OFF_T_MAX - size);
+                }
             }
         }
       else
         {
+          /* The behavior of lseek is unspecified, but in practice if
+             it returns a positive number that's the size of this
+             device.  */
           size = lseek (fd, 0, SEEK_END);
           if (size <= 0)
             {
@@ -808,63 +912,68 @@ do_wipefd (int fd, char const *qname, struct randint_source *s,
               size = -1;
             }
         }
-
-      /* Allow 'rounding up' only for regular files.  */
-      if (0 <= size && !(flags->exact) && S_ISREG (st.st_mode))
-        {
-          size += ST_BLKSIZE (st) - 1 - (size - 1) % ST_BLKSIZE (st);
-
-          /* If in rounding up, we've just overflowed, use the maximum.  */
-          if (size < 0)
-            size = TYPE_MAXIMUM (off_t);
-        }
     }
+  else if (S_ISREG (st.st_mode)
+           && st.st_size < MIN (ST_BLKSIZE (st), size))
+    i_size = st.st_size;
 
   /* Schedule the passes in random order. */
   genpattern (passarray, flags->n_iterations, s);
 
   rs = randint_get_source (s);
 
-  /* Do the work */
-  for (i = 0; i < flags->n_iterations; i++)
+  while (true)
     {
-      int err = dopass (fd, qname, &size, passarray[i], rs, i + 1, n);
-      if (err)
+      off_t pass_size;
+      unsigned long int pn = n;
+
+      if (i_size)
         {
-          if (err < 0)
-            {
-              memset (passarray, 0, flags->n_iterations * sizeof (int));
-              free (passarray);
-              return false;
-            }
-          ok = false;
+          pass_size = i_size;
+          i_size = 0;
+          pn = 0;
         }
-    }
-
-  memset (passarray, 0, flags->n_iterations * sizeof (int));
-  free (passarray);
+      else if (size)
+        {
+          pass_size = size;
+          size = 0;
+        }
+      /* TODO: consider handling tail packing by
+         writing the tail padding as a separate pass,
+         (that would not rewind).  */
+      else
+        break;
 
-  if (flags->zero_fill)
-    {
-      int err = dopass (fd, qname, &size, 0, rs, flags->n_iterations + 1, n);
-      if (err)
+      for (i = 0; i < flags->n_iterations + flags->zero_fill; i++)
         {
-          if (err < 0)
-            return false;
-          ok = false;
+          int err = 0;
+          int type = i < flags->n_iterations ? passarray[i] : 0;
+
+          err = dopass (fd, &st, qname, &pass_size, type, rs, i + 1, pn);
+
+          if (err)
+            {
+              ok = false;
+              if (err < 0)
+                goto wipefd_out;
+            }
         }
     }
 
-  /* Okay, now deallocate the data.  The effect of ftruncate on
+  /* Now deallocate the data.  The effect of ftruncate on
      non-regular files is unspecified, so don't worry about any
      errors reported for them.  */
   if (flags->remove_file && ftruncate (fd, 0) != 0
       && S_ISREG (st.st_mode))
     {
       error (0, errno, _("%s: error truncating"), qname);
-      return false;
+      ok = false;
+      goto wipefd_out;
     }
 
+wipefd_out:
+  memset (passarray, 0, flags->n_iterations * sizeof (int));
+  free (passarray);
   return ok;
 }
 
@@ -926,8 +1035,8 @@ incname (char *name, size_t len)
 
 /*
  * Repeatedly rename a file with shorter and shorter names,
- * to obliterate all traces of the file name on any system that
- * adds a trailing delimiter to on-disk file names and reuses
+ * to obliterate all traces of the file name (and length) on any system
+ * that adds a trailing delimiter to on-disk file names and reuses
  * the same directory slot.  Finally, unlink it.
  * The passed-in filename is modified in place to the new filename.
  * (Which is unlinked if this function succeeds, but is still present if
@@ -960,13 +1069,15 @@ wipename (char *oldname, char const *qoldname, struct Options const *flags)
   char *qdir = xstrdup (quotearg_colon (dir));
   bool first = true;
   bool ok = true;
+  int dir_fd = -1;
 
-  int dir_fd = open (dir, O_RDONLY | O_DIRECTORY | O_NOCTTY | O_NONBLOCK);
+  if (flags->remove_file == remove_wipesync)
+    dir_fd = open (dir, O_RDONLY | O_DIRECTORY | O_NOCTTY | O_NONBLOCK);
 
   if (flags->verbose)
     error (0, 0, _("%s: removing"), qoldname);
 
-  while (len)
+  while ((flags->remove_file != remove_unlink) && len)
     {
       memset (base, nameset[0], len);
       base[len] = 0;
@@ -1120,7 +1231,7 @@ main (int argc, char **argv)
           {
             uintmax_t tmp;
             if (xstrtoumax (optarg, NULL, 10, &tmp, NULL) != LONGINT_OK
-                || MIN (UINT32_MAX, SIZE_MAX / sizeof (int)) < tmp)
+                || MIN (ULONG_MAX, SIZE_MAX / sizeof (int)) <= tmp)
               {
                 error (EXIT_FAILURE, 0, _("%s: invalid number of passes"),
                        quotearg_colon (optarg));
@@ -1136,14 +1247,19 @@ main (int argc, char **argv)
           break;
 
         case 'u':
-          flags.remove_file = true;
+          if (optarg == NULL)
+            flags.remove_file = remove_wipesync;
+          else
+            flags.remove_file = XARGMATCH ("--remove", optarg,
+                                           remove_args, remove_methods);
           break;
 
         case 's':
           {
             uintmax_t tmp;
-            if (xstrtoumax (optarg, NULL, 0, &tmp, "cbBkKMGTPEZY0")
-                != LONGINT_OK)
+            if ((xstrtoumax (optarg, NULL, 0, &tmp, "cbBkKMGTPEZY0")
+                 != LONGINT_OK)
+                || OFF_T_MAX < tmp)
               {
                 error (EXIT_FAILURE, 0, _("%s: invalid file size"),
                        quotearg_colon (optarg));
diff --git a/src/shuf.c b/src/shuf.c
index 71ac3e60..2505be6f 100644
--- a/src/shuf.c
+++ b/src/shuf.c
@@ -1,6 +1,6 @@
 /* Shuffle lines of text.
 
-   Copyright (C) 2006-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
    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
@@ -25,6 +25,7 @@
 #include "error.h"
 #include "fadvise.h"
 #include "getopt.h"
+#include "linebuffer.h"
 #include "quote.h"
 #include "quotearg.h"
 #include "randint.h"
@@ -38,6 +39,18 @@
 
 #define AUTHORS proper_name ("Paul Eggert")
 
+/* For reservoir-sampling, allocate the reservoir lines in batches.  */
+enum { RESERVOIR_LINES_INCREMENT = 1024 };
+
+/* reservoir-sampling introduces CPU overhead for small inputs.
+   So only enable it for inputs >= this limit.
+   This limit was determined using these commands:
+     $ for p in $(seq 7); do src/seq $((10**$p)) > 10p$p.in; done
+     $ for p in $(seq 7); do time shuf-nores -n10 10p$p.in >/dev/null; done
+     $ for p in $(seq 7); do time shuf -n10 10p$p.in >/dev/null; done  .*/
+enum { RESERVOIR_MIN_INPUT = 8192 * 1024 };
+
+
 void
 usage (int status)
 {
@@ -63,7 +76,10 @@ Write a random permutation of the input lines to standard output.\n\
   -n, --head-count=COUNT    output at most COUNT lines\n\
   -o, --output=FILE         write result to FILE instead of standard output\n\
       --random-source=FILE  get random bytes from FILE\n\
-  -z, --zero-terminated     end lines with 0 byte, not newline\n\
+  -r, --repeat              output lines can be repeated\n\
+"), stdout);
+      fputs (_("\
+  -z, --zero-terminated     line delimiter is NUL, not newline\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
@@ -91,18 +107,13 @@ static struct option const long_opts[] =
   {"head-count", required_argument, NULL, 'n'},
   {"output", required_argument, NULL, 'o'},
   {"random-source", required_argument, NULL, RANDOM_SOURCE_OPTION},
+  {"repeat", no_argument, NULL, 'r'},
   {"zero-terminated", no_argument, NULL, 'z'},
   {GETOPT_HELP_OPTION_DECL},
   {GETOPT_VERSION_OPTION_DECL},
   {0, 0, 0, 0},
 };
 
-static bool
-input_numbers_option_used (size_t lo_input, size_t hi_input)
-{
-  return ! (lo_input == SIZE_MAX && hi_input == 0);
-}
-
 static void
 input_from_argv (char **operand, int n_operands, char eolbyte)
 {
@@ -135,6 +146,114 @@ next_line (char *line, char eolbyte, size_t n)
   return p + 1;
 }
 
+/* Return the size of the input if possible or OFF_T_MAX if not.  */
+
+static off_t
+input_size (void)
+{
+  off_t file_size;
+
+  struct stat stat_buf;
+  if (fstat (STDIN_FILENO, &stat_buf) != 0)
+    return OFF_T_MAX;
+  if (usable_st_size (&stat_buf))
+    file_size = stat_buf.st_size;
+  else
+    return OFF_T_MAX;
+
+  off_t input_offset = lseek (STDIN_FILENO, 0, SEEK_CUR);
+  if (input_offset < 0)
+    return OFF_T_MAX;
+
+  file_size -= input_offset;
+
+  return file_size;
+}
+
+/* Read all lines and store up to K permuted lines in *OUT_RSRV.
+   Return the number of lines read, up to a maximum of K.  */
+
+static size_t
+read_input_reservoir_sampling (FILE *in, char eolbyte, size_t k,
+                               struct randint_source *s,
+                               struct linebuffer **out_rsrv)
+{
+  randint n_lines = 0;
+  size_t n_alloc_lines = MIN (k, RESERVOIR_LINES_INCREMENT);
+  struct linebuffer *line = NULL;
+  struct linebuffer *rsrv;
+
+  rsrv = xcalloc (n_alloc_lines, sizeof (struct linebuffer));
+
+  /* Fill the first K lines, directly into the reservoir.  */
+  while (n_lines < k
+         && (line =
+             readlinebuffer_delim (&rsrv[n_lines], in, eolbyte)) != NULL)
+    {
+      n_lines++;
+
+      /* Enlarge reservoir.  */
+      if (n_lines >= n_alloc_lines)
+        {
+          n_alloc_lines += RESERVOIR_LINES_INCREMENT;
+          rsrv = xnrealloc (rsrv, n_alloc_lines, sizeof (struct linebuffer));
+          memset (&rsrv[n_lines], 0,
+                  RESERVOIR_LINES_INCREMENT * sizeof (struct linebuffer));
+        }
+    }
+
+  /* last line wasn't NULL - so there may be more lines to read.  */
+  if (line != NULL)
+    {
+      struct linebuffer dummy;
+      initbuffer (&dummy);  /* space for lines not put in reservoir.  */
+
+      /* Choose the fate of the next line, with decreasing probability (as
+         n_lines increases in size).
+
+         If the line will be used, store it directly in the reservoir.
+         Otherwise, store it in dummy space.
+
+         With 'struct linebuffer', storing into existing buffer will reduce
+         re-allocations (will only re-allocate if the new line is longer than
+         the currently allocated space).  */
+      do
+        {
+          randint j = randint_choose (s, n_lines + 1);  /* 0 .. n_lines.  */
+          line = (j < k) ? (&rsrv[j]) : (&dummy);
+        }
+      while (readlinebuffer_delim (line, in, eolbyte) != NULL && n_lines++);
+
+      if (! n_lines)
+        error (EXIT_FAILURE, EOVERFLOW, _("too many input lines"));
+
+      freebuffer (&dummy);
+    }
+
+  /* no more input lines, or an input error.  */
+  if (ferror (in))
+    error (EXIT_FAILURE, errno, _("read error"));
+
+  *out_rsrv = rsrv;
+  return MIN (k, n_lines);
+}
+
+static int
+write_permuted_output_reservoir (size_t n_lines, struct linebuffer *lines,
+                                 size_t const *permutation)
+{
+  size_t i;
+
+  for (i = 0; i < n_lines; i++)
+    {
+      const struct linebuffer *p = &lines[permutation[i]];
+      if (fwrite (p->buffer, sizeof (char), p->length, stdout) != p->length)
+        return -1;
+    }
+
+  return 0;
+}
+
 /* Read data from file IN.  Input lines are delimited by EOLBYTE;
    silently append a trailing EOLBYTE if the file ends in some other
    byte.  Store a pointer to the resulting array of lines into *PLINE.
@@ -152,6 +271,15 @@ read_input (FILE *in, char eolbyte, char ***pline)
   size_t i;
   size_t n_lines;
 
+  /* TODO: We should limit the amount of data read here,
+     to less than RESERVOIR_MIN_INPUT.  I.E. adjust fread_file() to support
+     taking a byte limit.  We'd then need to ensure we handle a line spanning
+     this boundary.  With that in place we could set use_reservoir_sampling
+     when used==RESERVOIR_MIN_INPUT, and have read_input_reservoir_sampling()
+     call a wrapper function to populate a linebuffer from the internal pline
+     or if none left, stdin.  Doing that would give better performance by
+     avoiding the reservoir CPU overhead when reading < RESERVOIR_MIN_INPUT
+     from a pipe, and allow us to dispense with the input_size() function.  */
   if (!(buf = fread_file (in, &used)))
     error (EXIT_FAILURE, errno, _("read error"));
 
@@ -173,27 +301,81 @@ read_input (FILE *in, char eolbyte, char ***pline)
   return n_lines;
 }
 
+/* Output N_LINES lines to stdout from LINE array,
+   chosen by the indices in PERMUTATION.
+   PERMUTATION and LINE must have at least N_LINES elements.
+   Strings in LINE must include the line-terminator character.  */
 static int
-write_permuted_output (size_t n_lines, char * const *line, size_t lo_input,
-                       size_t const *permutation, char eolbyte)
+write_permuted_lines (size_t n_lines, char *const *line,
+                      size_t const *permutation)
 {
   size_t i;
 
-  if (line)
-    for (i = 0; i < n_lines; i++)
-      {
-        char * const *p = line + permutation[i];
-        size_t len = p[1] - p[0];
-        if (fwrite (p[0], sizeof *p[0], len, stdout) != len)
-          return -1;
-      }
-  else
-    for (i = 0; i < n_lines; i++)
-      {
-        unsigned long int n = lo_input + permutation[i];
-        if (printf ("%lu%c", n, eolbyte) < 0)
-          return -1;
-      }
+  for (i = 0; i < n_lines; i++)
+    {
+      char *const *p = line + permutation[i];
+      size_t len = p[1] - p[0];
+      if (fwrite (p[0], sizeof *p[0], len, stdout) != len)
+        return -1;
+    }
+
+  return 0;
+}
+
+/* Output N_LINES of numbers to stdout, from PERMUTATION array.
+   PERMUTATION must have at least N_LINES elements.  */
+static int
+write_permuted_numbers (size_t n_lines, size_t lo_input,
+                        size_t const *permutation, char eolbyte)
+{
+  size_t i;
+
+  for (i = 0; i < n_lines; i++)
+    {
+      unsigned long int n = lo_input + permutation[i];
+      if (printf ("%lu%c", n, eolbyte) < 0)
+        return -1;
+    }
+
+  return 0;
+}
+
+/* Output COUNT numbers to stdout, chosen randomly from range
+   LO_INPUT through HI_INPUT.  */
+static int
+write_random_numbers (struct randint_source *s, size_t count,
+                      size_t lo_input, size_t hi_input, char eolbyte)
+{
+  size_t i;
+  const randint range = hi_input - lo_input + 1;
+
+  for (i = 0; i < count; i++)
+    {
+      unsigned long int j = lo_input + randint_choose (s, range);
+      if (printf ("%lu%c", j, eolbyte) < 0)
+        return -1;
+    }
+
+  return 0;
+}
+
+/* Output COUNT lines to stdout from LINES array.
+   LINES must have at least N_LINES elements in it.
+   Strings in LINES_ must include the line-terminator character.  */
+static int
+write_random_lines (struct randint_source *s, size_t count,
+                    char *const *lines, size_t n_lines)
+{
+  size_t i;
+
+  for (i = 0; i < count; i++)
+    {
+      const randint j = randint_choose (s, n_lines);
+      char *const *p = lines + j;
+      size_t len = p[1] - p[0];
+      if (fwrite (p[0], sizeof *p[0], len, stdout) != len)
+        return -1;
+    }
 
   return 0;
 }
@@ -202,6 +384,7 @@ int
 main (int argc, char **argv)
 {
   bool echo = false;
+  bool input_range = false;
   size_t lo_input = SIZE_MAX;
   size_t hi_input = 0;
   size_t head_lines = SIZE_MAX;
@@ -209,14 +392,18 @@ main (int argc, char **argv)
   char *random_source = NULL;
   char eolbyte = '\n';
   char **input_lines = NULL;
+  bool use_reservoir_sampling = false;
+  bool repeat = false;
 
   int optc;
   int n_operands;
   char **operand;
   size_t n_lines;
-  char **line;
+  char **line = NULL;
+  struct linebuffer *reservoir = NULL;
   struct randint_source *randint_source;
-  size_t *permutation;
+  size_t *permutation = NULL;
+  int i;
 
   initialize_main (&argc, &argv);
   set_program_name (argv[0]);
@@ -226,7 +413,7 @@ main (int argc, char **argv)
 
   atexit (close_stdout);
 
-  while ((optc = getopt_long (argc, argv, "ei:n:o:z", long_opts, NULL)) != -1)
+  while ((optc = getopt_long (argc, argv, "ei:n:o:rz", long_opts, NULL)) != -1)
     switch (optc)
       {
       case 'e':
@@ -240,8 +427,9 @@ main (int argc, char **argv)
           char const *hi_optarg = optarg;
           bool invalid = !p;
 
-          if (input_numbers_option_used (lo_input, hi_input))
+          if (input_range)
             error (EXIT_FAILURE, 0, _("multiple -i options specified"));
+          input_range = true;
 
           if (p)
             {
@@ -291,6 +479,10 @@ main (int argc, char **argv)
         random_source = optarg;
         break;
 
+      case 'r':
+        repeat = true;
+        break;
+
       case 'z':
         eolbyte = '\0';
         break;
@@ -304,67 +496,113 @@ main (int argc, char **argv)
   n_operands = argc - optind;
   operand = argv + optind;
 
+  /* Check invalid usage.  */
+  if (echo && input_range)
+    {
+      error (0, 0, _("cannot combine -e and -i options"));
+      usage (EXIT_FAILURE);
+    }
+  if (input_range ? 0 < n_operands : !echo && 1 < n_operands)
+    {
+      error (0, 0, _("extra operand %s"), quote (operand[1]));
+      usage (EXIT_FAILURE);
+    }
+
+  /* Prepare input.  */
   if (echo)
     {
-      if (input_numbers_option_used (lo_input, hi_input))
-        error (EXIT_FAILURE, 0, _("cannot combine -e and -i options"));
       input_from_argv (operand, n_operands, eolbyte);
       n_lines = n_operands;
       line = operand;
     }
-  else if (input_numbers_option_used (lo_input, hi_input))
+  else if (input_range)
     {
-      if (n_operands)
-        {
-          error (0, 0, _("extra operand %s"), quote (operand[0]));
-          usage (EXIT_FAILURE);
-        }
       n_lines = hi_input - lo_input + 1;
       line = NULL;
     }
   else
     {
-      switch (n_operands)
-        {
-        case 0:
-          break;
-
-        case 1:
-          if (! (STREQ (operand[0], "-") || freopen (operand[0], "r", stdin)))
-            error (EXIT_FAILURE, errno, "%s", operand[0]);
-          break;
-
-        default:
-          error (0, 0, _("extra operand %s"), quote (operand[1]));
-          usage (EXIT_FAILURE);
-        }
+      /* If an input file is specified, re-open it as stdin.  */
+      if (n_operands == 1)
+        if (! (STREQ (operand[0], "-") || ! head_lines
+               || freopen (operand[0], "r", stdin)))
+          error (EXIT_FAILURE, errno, "%s", operand[0]);
 
       fadvise (stdin, FADVISE_SEQUENTIAL);
 
-      n_lines = read_input (stdin, eolbyte, &input_lines);
-      line = input_lines;
+      if (! repeat && head_lines != SIZE_MAX
+          && (! head_lines || input_size () > RESERVOIR_MIN_INPUT))
+        {
+          use_reservoir_sampling = true;
+          n_lines = SIZE_MAX;   /* unknown number of input lines, for now.  */
+        }
+      else
+        {
+          n_lines = read_input (stdin, eolbyte, &input_lines);
+          line = input_lines;
+        }
     }
 
-  head_lines = MIN (head_lines, n_lines);
+  if (! repeat)
+    head_lines = MIN (head_lines, n_lines);
 
   randint_source = randint_all_new (random_source,
-                                    randperm_bound (head_lines, n_lines));
+                                    (use_reservoir_sampling || repeat
+                                     ? SIZE_MAX
+                                     : randperm_bound (head_lines, n_lines)));
   if (! randint_source)
     error (EXIT_FAILURE, errno, "%s", quotearg_colon (random_source));
 
+  if (use_reservoir_sampling)
+    {
+      /* Instead of reading the entire file into 'line',
+         use reservoir-sampling to store just "head_lines" random lines.  */
+      n_lines = read_input_reservoir_sampling (stdin, eolbyte, head_lines,
+                                               randint_source, &reservoir);
+      head_lines = n_lines;
+    }
+
   /* Close stdin now, rather than earlier, so that randint_all_new
      doesn't have to worry about opening something other than
      stdin.  */
-  if (! (echo || input_numbers_option_used (lo_input, hi_input))
+  if (! (echo || input_range)
       && (fclose (stdin) != 0))
     error (EXIT_FAILURE, errno, _("read error"));
 
-  permutation = randperm_new (randint_source, head_lines, n_lines);
+  if (!repeat)
+    permutation = randperm_new (randint_source, head_lines, n_lines);
 
   if (outfile && ! freopen (outfile, "w", stdout))
     error (EXIT_FAILURE, errno, "%s", quotearg_colon (outfile));
-  if (write_permuted_output (head_lines, line, lo_input, permutation, eolbyte)
-      != 0)
+
+  /* Generate output according to requested method */
+  if (repeat)
+    {
+      if (head_lines == 0)
+        i = 0;
+      else
+        {
+          if (n_lines == 0)
+            error (EXIT_FAILURE, 0, _("no lines to repeat"));
+          if (input_range)
+            i = write_random_numbers (randint_source, head_lines,
+                                      lo_input, hi_input, eolbyte);
+          else
+            i = write_random_lines (randint_source, head_lines, line, n_lines);
+        }
+    }
+  else
+    {
+      if (use_reservoir_sampling)
+        i = write_permuted_output_reservoir (n_lines, reservoir, permutation);
+      else if (input_range)
+        i = write_permuted_numbers (head_lines, lo_input,
+                                    permutation, eolbyte);
+      else
+        i = write_permuted_lines (head_lines, line, permutation);
+    }
+
+  if (i != 0)
     error (EXIT_FAILURE, errno, _("write error"));
 
 #ifdef lint
@@ -375,7 +613,14 @@ main (int argc, char **argv)
       free (input_lines[0]);
       free (input_lines);
     }
+  if (reservoir)
+    {
+      size_t j;
+      for (j = 0; j < n_lines; ++j)
+        freebuffer (&reservoir[j]);
+      free (reservoir);
+    }
 #endif
 
-  return EXIT_SUCCESS;
+  exit (EXIT_SUCCESS);
 }
diff --git a/src/single-binary.mk b/src/single-binary.mk
new file mode 100644
index 00000000..cc836d75
--- /dev/null
+++ b/src/single-binary.mk
@@ -0,0 +1,480 @@
+## Automatically generated by gen-single-binary.sh.  DO NOT EDIT BY HAND!
+src_libsinglebin_dir_a_DEPENDENCIES = src/libsinglebin_ls.a
+src_libsinglebin_vdir_a_DEPENDENCIES = src/libsinglebin_ls.a
+src_libsinglebin_arch_a_DEPENDENCIES = src/libsinglebin_uname.a
+# Command arch
+noinst_LIBRARIES += src/libsinglebin_arch.a
+src_libsinglebin_arch_a_SOURCES = src/coreutils-arch.c
+src_libsinglebin_arch_a_ldadd =  src/libsinglebin_uname.a
+src_libsinglebin_arch_a_CFLAGS = "-Dmain=_single_binary_main_arch(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_arch"  -Dusage=_usage_arch $(src_coreutils_CFLAGS)
+# Command hostname
+noinst_LIBRARIES += src/libsinglebin_hostname.a
+src_libsinglebin_hostname_a_SOURCES = src/hostname.c
+src_libsinglebin_hostname_a_ldadd =   $(GETHOSTNAME_LIB)
+src_libsinglebin_hostname_a_CFLAGS = "-Dmain=_single_binary_main_hostname(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_hostname"  -Dusage=_usage_hostname $(src_coreutils_CFLAGS)
+# Command chroot
+noinst_LIBRARIES += src/libsinglebin_chroot.a
+src_libsinglebin_chroot_a_SOURCES = src/chroot.c
+src_libsinglebin_chroot_a_CFLAGS = "-Dmain=_single_binary_main_chroot(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_chroot"  -Dusage=_usage_chroot $(src_coreutils_CFLAGS)
+# Command df
+noinst_LIBRARIES += src/libsinglebin_df.a
+src_libsinglebin_df_a_SOURCES =   src/df.c src/find-mount-point.c
+src_libsinglebin_df_a_ldadd =   $(LIBICONV)
+src_libsinglebin_df_a_CFLAGS = "-Dmain=_single_binary_main_df(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_df"  -Dusage=_usage_df $(src_coreutils_CFLAGS)
+# Command hostid
+noinst_LIBRARIES += src/libsinglebin_hostid.a
+src_libsinglebin_hostid_a_SOURCES = src/hostid.c
+src_libsinglebin_hostid_a_CFLAGS = "-Dmain=_single_binary_main_hostid(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_hostid"  -Dusage=_usage_hostid $(src_coreutils_CFLAGS)
+# Command nice
+noinst_LIBRARIES += src/libsinglebin_nice.a
+src_libsinglebin_nice_a_SOURCES = src/nice.c
+src_libsinglebin_nice_a_CFLAGS = "-Dmain=_single_binary_main_nice(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_nice"  -Dusage=_usage_nice $(src_coreutils_CFLAGS)
+# Command pinky
+noinst_LIBRARIES += src/libsinglebin_pinky.a
+src_libsinglebin_pinky_a_SOURCES = src/pinky.c
+src_libsinglebin_pinky_a_ldadd =   $(GETADDRINFO_LIB)
+src_libsinglebin_pinky_a_CFLAGS = "-Dmain=_single_binary_main_pinky(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_pinky"  -Dusage=_usage_pinky $(src_coreutils_CFLAGS)
+# Command stdbuf
+noinst_LIBRARIES += src/libsinglebin_stdbuf.a
+src_libsinglebin_stdbuf_a_SOURCES = src/stdbuf.c
+src_libsinglebin_stdbuf_a_ldadd =   $(LIBICONV)
+src_libsinglebin_stdbuf_a_CFLAGS = "-Dmain=_single_binary_main_stdbuf(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_stdbuf"  -Dusage=_usage_stdbuf $(src_coreutils_CFLAGS)
+# Command stty
+noinst_LIBRARIES += src/libsinglebin_stty.a
+src_libsinglebin_stty_a_SOURCES = src/stty.c
+src_libsinglebin_stty_a_CFLAGS = "-Dmain=_single_binary_main_stty(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_stty"  -Dusage=_usage_stty $(src_coreutils_CFLAGS)
+# Command uptime
+noinst_LIBRARIES += src/libsinglebin_uptime.a
+src_libsinglebin_uptime_a_SOURCES = src/uptime.c
+src_libsinglebin_uptime_a_ldadd =   $(GETLOADAVG_LIBS)
+src_libsinglebin_uptime_a_CFLAGS = "-Dmain=_single_binary_main_uptime(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_uptime"  -Dusage=_usage_uptime $(src_coreutils_CFLAGS)
+# Command users
+noinst_LIBRARIES += src/libsinglebin_users.a
+src_libsinglebin_users_a_SOURCES = src/users.c
+src_libsinglebin_users_a_CFLAGS = "-Dmain=_single_binary_main_users(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_users"  -Dusage=_usage_users $(src_coreutils_CFLAGS)
+# Command who
+noinst_LIBRARIES += src/libsinglebin_who.a
+src_libsinglebin_who_a_SOURCES = src/who.c
+src_libsinglebin_who_a_ldadd =   $(GETADDRINFO_LIB)
+src_libsinglebin_who_a_CFLAGS = "-Dmain=_single_binary_main_who(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_who"  -Dusage=_usage_who $(src_coreutils_CFLAGS)
+# Command _
+noinst_LIBRARIES += src/libsinglebin__.a
+src_libsinglebin___a_SOURCES =   src/lbracket.c
+src_libsinglebin___a_ldadd =   $(src_test_LDADD)
+src_libsinglebin___a_CFLAGS = "-Dmain=_single_binary_main__(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main__"  -Dusage=_usage__ $(src_coreutils_CFLAGS)
+# Command base64
+noinst_LIBRARIES += src/libsinglebin_base64.a
+src_libsinglebin_base64_a_SOURCES = src/base64.c
+src_libsinglebin_base64_a_CFLAGS = "-Dmain=_single_binary_main_base64(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_base64"  -Dusage=_usage_base64 $(src_coreutils_CFLAGS)
+# Command basename
+noinst_LIBRARIES += src/libsinglebin_basename.a
+src_libsinglebin_basename_a_SOURCES = src/basename.c
+src_libsinglebin_basename_a_CFLAGS = "-Dmain=_single_binary_main_basename(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_basename"  -Dusage=_usage_basename $(src_coreutils_CFLAGS)
+# Command cat
+noinst_LIBRARIES += src/libsinglebin_cat.a
+src_libsinglebin_cat_a_SOURCES = src/cat.c
+src_libsinglebin_cat_a_ldadd =   $(LIBICONV)
+src_libsinglebin_cat_a_CFLAGS = "-Dmain=_single_binary_main_cat(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_cat"  -Dusage=_usage_cat $(src_coreutils_CFLAGS)
+# Command chcon
+noinst_LIBRARIES += src/libsinglebin_chcon.a
+src_libsinglebin_chcon_a_SOURCES = src/chcon.c
+src_libsinglebin_chcon_a_ldadd =   $(LIB_SELINUX)
+src_libsinglebin_chcon_a_CFLAGS = "-Dmain=_single_binary_main_chcon(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_chcon"  -Dusage=_usage_chcon $(src_coreutils_CFLAGS)
+# Command chgrp
+noinst_LIBRARIES += src/libsinglebin_chgrp.a
+src_libsinglebin_chgrp_a_SOURCES =   src/chgrp.c src/chown-core.c
+src_libsinglebin_chgrp_a_CFLAGS = "-Dmain=_single_binary_main_chgrp(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_chgrp"  -Dusage=_usage_chgrp $(src_coreutils_CFLAGS)
+# Command chmod
+noinst_LIBRARIES += src/libsinglebin_chmod.a
+src_libsinglebin_chmod_a_SOURCES = src/chmod.c
+src_libsinglebin_chmod_a_CFLAGS = "-Dmain=_single_binary_main_chmod(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_chmod"  -Dusage=_usage_chmod $(src_coreutils_CFLAGS)
+# Command chown
+noinst_LIBRARIES += src/libsinglebin_chown.a
+src_libsinglebin_chown_a_SOURCES =   src/chown.c src/chown-core.c
+src_libsinglebin_chown_a_CFLAGS = "-Dmain=_single_binary_main_chown(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_chown"  -Dusage=_usage_chown $(src_coreutils_CFLAGS)
+# Command cksum
+noinst_LIBRARIES += src/libsinglebin_cksum.a
+src_libsinglebin_cksum_a_SOURCES = src/cksum.c
+src_libsinglebin_cksum_a_CFLAGS = "-Dmain=_single_binary_main_cksum(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_cksum"  -Dusage=_usage_cksum $(src_coreutils_CFLAGS)
+# Command comm
+noinst_LIBRARIES += src/libsinglebin_comm.a
+src_libsinglebin_comm_a_SOURCES = src/comm.c
+src_libsinglebin_comm_a_CFLAGS = "-Dmain=_single_binary_main_comm(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_comm"  -Dusage=_usage_comm $(src_coreutils_CFLAGS)
+# Command cp
+noinst_LIBRARIES += src/libsinglebin_cp.a
+src_libsinglebin_cp_a_SOURCES =   src/cp.c $(copy_sources) $(selinux_sources)
+src_libsinglebin_cp_a_ldadd =   $(copy_ldadd)  $(LIBICONV)
+src_libsinglebin_cp_a_CFLAGS = "-Dmain=_single_binary_main_cp(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_cp"  -Dusage=_usage_cp $(src_coreutils_CFLAGS)
+# Command csplit
+noinst_LIBRARIES += src/libsinglebin_csplit.a
+src_libsinglebin_csplit_a_SOURCES = src/csplit.c
+src_libsinglebin_csplit_a_CFLAGS = "-Dmain=_single_binary_main_csplit(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_csplit"  -Dusage=_usage_csplit $(src_coreutils_CFLAGS)
+# Command cut
+noinst_LIBRARIES += src/libsinglebin_cut.a
+src_libsinglebin_cut_a_SOURCES = src/cut.c
+src_libsinglebin_cut_a_CFLAGS = "-Dmain=_single_binary_main_cut(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_cut"  -Dusage=_usage_cut $(src_coreutils_CFLAGS)
+# Command date
+noinst_LIBRARIES += src/libsinglebin_date.a
+src_libsinglebin_date_a_SOURCES = src/date.c
+src_libsinglebin_date_a_ldadd =   $(LIB_CLOCK_GETTIME)
+src_libsinglebin_date_a_CFLAGS = "-Dmain=_single_binary_main_date(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_date"  -Dusage=_usage_date $(src_coreutils_CFLAGS)
+# Command dd
+noinst_LIBRARIES += src/libsinglebin_dd.a
+src_libsinglebin_dd_a_SOURCES = src/dd.c
+src_libsinglebin_dd_a_ldadd =   $(LIB_GETHRXTIME)  $(LIB_FDATASYNC)
+src_libsinglebin_dd_a_CFLAGS = "-Dmain=_single_binary_main_dd(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_dd"  -Dusage=_usage_dd $(src_coreutils_CFLAGS)
+# Command dir
+noinst_LIBRARIES += src/libsinglebin_dir.a
+src_libsinglebin_dir_a_SOURCES = src/coreutils-dir.c
+src_libsinglebin_dir_a_ldadd =   $(src_ls_LDADD) src/libsinglebin_ls.a
+src_libsinglebin_dir_a_CFLAGS = "-Dmain=_single_binary_main_dir(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_dir"  -Dusage=_usage_dir $(src_coreutils_CFLAGS)
+# Command dircolors
+noinst_LIBRARIES += src/libsinglebin_dircolors.a
+src_libsinglebin_dircolors_a_SOURCES = src/dircolors.c
+src_libsinglebin_dircolors_a_CFLAGS = "-Dmain=_single_binary_main_dircolors(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_dircolors"  -Dusage=_usage_dircolors $(src_coreutils_CFLAGS)
+# Command dirname
+noinst_LIBRARIES += src/libsinglebin_dirname.a
+src_libsinglebin_dirname_a_SOURCES = src/dirname.c
+src_libsinglebin_dirname_a_CFLAGS = "-Dmain=_single_binary_main_dirname(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_dirname"  -Dusage=_usage_dirname $(src_coreutils_CFLAGS)
+# Command du
+noinst_LIBRARIES += src/libsinglebin_du.a
+src_libsinglebin_du_a_SOURCES = src/du.c
+src_libsinglebin_du_a_ldadd =   $(LIBICONV)
+src_libsinglebin_du_a_CFLAGS = "-Dmain=_single_binary_main_du(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_du"  -Dusage=_usage_du $(src_coreutils_CFLAGS)
+# Command echo
+noinst_LIBRARIES += src/libsinglebin_echo.a
+src_libsinglebin_echo_a_SOURCES = src/echo.c
+src_libsinglebin_echo_a_CFLAGS = "-Dmain=_single_binary_main_echo(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_echo"  -Dusage=_usage_echo $(src_coreutils_CFLAGS)
+# Command env
+noinst_LIBRARIES += src/libsinglebin_env.a
+src_libsinglebin_env_a_SOURCES = src/env.c
+src_libsinglebin_env_a_CFLAGS = "-Dmain=_single_binary_main_env(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_env"  -Dusage=_usage_env $(src_coreutils_CFLAGS)
+# Command expand
+noinst_LIBRARIES += src/libsinglebin_expand.a
+src_libsinglebin_expand_a_SOURCES = src/expand.c
+src_libsinglebin_expand_a_CFLAGS = "-Dmain=_single_binary_main_expand(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_expand"  -Dusage=_usage_expand $(src_coreutils_CFLAGS)
+# Command expr
+noinst_LIBRARIES += src/libsinglebin_expr.a
+src_libsinglebin_expr_a_SOURCES = src/expr.c
+src_libsinglebin_expr_a_ldadd =   $(LIB_GMP)
+src_libsinglebin_expr_a_CFLAGS = "-Dmain=_single_binary_main_expr(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_expr"  -Dusage=_usage_expr $(src_coreutils_CFLAGS)
+# Command factor
+noinst_LIBRARIES += src/libsinglebin_factor.a
+src_libsinglebin_factor_a_SOURCES = src/factor.c
+src_libsinglebin_factor_a_ldadd =   $(LIB_GMP)  $(LIBICONV)
+src_libsinglebin_factor_a_CFLAGS = "-Dmain=_single_binary_main_factor(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_factor"  -Dusage=_usage_factor $(src_coreutils_CFLAGS)
+# Command false
+noinst_LIBRARIES += src/libsinglebin_false.a
+src_libsinglebin_false_a_SOURCES = src/false.c
+src_libsinglebin_false_a_CFLAGS = "-Dmain=_single_binary_main_false(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_false"  -Dusage=_usage_false $(src_coreutils_CFLAGS)
+# Command fmt
+noinst_LIBRARIES += src/libsinglebin_fmt.a
+src_libsinglebin_fmt_a_SOURCES = src/fmt.c
+src_libsinglebin_fmt_a_CFLAGS = "-Dmain=_single_binary_main_fmt(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_fmt"  -Dusage=_usage_fmt $(src_coreutils_CFLAGS)
+# Command fold
+noinst_LIBRARIES += src/libsinglebin_fold.a
+src_libsinglebin_fold_a_SOURCES = src/fold.c
+src_libsinglebin_fold_a_CFLAGS = "-Dmain=_single_binary_main_fold(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_fold"  -Dusage=_usage_fold $(src_coreutils_CFLAGS)
+# Command ginstall
+noinst_LIBRARIES += src/libsinglebin_ginstall.a
+src_libsinglebin_ginstall_a_SOURCES =   src/install.c src/prog-fprintf.c $(copy_sources) $(selinux_sources)
+src_libsinglebin_ginstall_a_ldadd =   $(copy_ldadd)  $(LIB_SELINUX)  $(LIB_CLOCK_GETTIME)
+src_libsinglebin_ginstall_a_CFLAGS = "-Dmain=_single_binary_main_ginstall(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_ginstall"  -Dusage=_usage_ginstall $(src_coreutils_CFLAGS)
+src_libsinglebin_ginstall_a_CPPFLAGS =   -DENABLE_MATCHPATHCON=1 $(AM_CPPFLAGS)
+# Command groups
+noinst_LIBRARIES += src/libsinglebin_groups.a
+src_libsinglebin_groups_a_SOURCES =   src/groups.c src/group-list.c
+src_libsinglebin_groups_a_CFLAGS = "-Dmain=_single_binary_main_groups(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_groups"  -Dusage=_usage_groups $(src_coreutils_CFLAGS)
+# Command head
+noinst_LIBRARIES += src/libsinglebin_head.a
+src_libsinglebin_head_a_SOURCES = src/head.c
+src_libsinglebin_head_a_CFLAGS = "-Dmain=_single_binary_main_head(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_head"  -Dusage=_usage_head $(src_coreutils_CFLAGS)
+# Command id
+noinst_LIBRARIES += src/libsinglebin_id.a
+src_libsinglebin_id_a_SOURCES =   src/id.c src/group-list.c
+src_libsinglebin_id_a_ldadd =   $(LIB_SELINUX)  $(LIB_SMACK)
+src_libsinglebin_id_a_CFLAGS = "-Dmain=_single_binary_main_id(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_id"  -Dusage=_usage_id $(src_coreutils_CFLAGS)
+# Command join
+noinst_LIBRARIES += src/libsinglebin_join.a
+src_libsinglebin_join_a_SOURCES = src/join.c
+src_libsinglebin_join_a_CFLAGS = "-Dmain=_single_binary_main_join(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_join"  -Dusage=_usage_join $(src_coreutils_CFLAGS)
+# Command kill
+noinst_LIBRARIES += src/libsinglebin_kill.a
+src_libsinglebin_kill_a_SOURCES =   src/kill.c src/operand2sig.c
+src_libsinglebin_kill_a_ldadd =   $(LIBTHREAD)
+src_libsinglebin_kill_a_CFLAGS = "-Dmain=_single_binary_main_kill(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_kill"  -Dusage=_usage_kill $(src_coreutils_CFLAGS)
+# Command link
+noinst_LIBRARIES += src/libsinglebin_link.a
+src_libsinglebin_link_a_SOURCES = src/link.c
+src_libsinglebin_link_a_CFLAGS = "-Dmain=_single_binary_main_link(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_link"  -Dusage=_usage_link $(src_coreutils_CFLAGS)
+# Command ln
+noinst_LIBRARIES += src/libsinglebin_ln.a
+src_libsinglebin_ln_a_SOURCES =   src/ln.c src/relpath.c src/relpath.h
+src_libsinglebin_ln_a_CFLAGS = "-Dmain=_single_binary_main_ln(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_ln"  -Dusage=_usage_ln $(src_coreutils_CFLAGS)
+# Command logname
+noinst_LIBRARIES += src/libsinglebin_logname.a
+src_libsinglebin_logname_a_SOURCES = src/logname.c
+src_libsinglebin_logname_a_CFLAGS = "-Dmain=_single_binary_main_logname(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_logname"  -Dusage=_usage_logname $(src_coreutils_CFLAGS)
+# Command ls
+noinst_LIBRARIES += src/libsinglebin_ls.a
+src_libsinglebin_ls_a_SOURCES =   src/ls.c src/ls-ls.c
+src_libsinglebin_ls_a_ldadd =   $(LIB_SELINUX)  $(LIB_SMACK)  $(LIB_CLOCK_GETTIME)  $(LIB_CAP)  $(LIB_ACL)
+src_libsinglebin_ls_a_CFLAGS = "-Dmain=_single_binary_main_ls(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_ls"  -Dusage=_usage_ls $(src_coreutils_CFLAGS)
+# Command md5sum
+noinst_LIBRARIES += src/libsinglebin_md5sum.a
+src_libsinglebin_md5sum_a_SOURCES = src/md5sum.c
+src_libsinglebin_md5sum_a_ldadd =   $(LIB_CRYPTO)
+src_libsinglebin_md5sum_a_CFLAGS = "-Dmain=_single_binary_main_md5sum(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_md5sum"  -Dusage=_usage_md5sum $(src_coreutils_CFLAGS)
+src_libsinglebin_md5sum_a_CPPFLAGS =   -DHASH_ALGO_MD5=1 $(AM_CPPFLAGS)
+# Command mkdir
+noinst_LIBRARIES += src/libsinglebin_mkdir.a
+src_libsinglebin_mkdir_a_SOURCES =   src/mkdir.c src/prog-fprintf.c $(selinux_sources)
+src_libsinglebin_mkdir_a_ldadd =   $(LIB_SELINUX)  $(LIB_SMACK)
+src_libsinglebin_mkdir_a_CFLAGS = "-Dmain=_single_binary_main_mkdir(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_mkdir"  -Dusage=_usage_mkdir $(src_coreutils_CFLAGS)
+# Command mkfifo
+noinst_LIBRARIES += src/libsinglebin_mkfifo.a
+src_libsinglebin_mkfifo_a_SOURCES =   src/mkfifo.c $(selinux_sources)
+src_libsinglebin_mkfifo_a_ldadd =   $(LIB_SELINUX)  $(LIB_SMACK)
+src_libsinglebin_mkfifo_a_CFLAGS = "-Dmain=_single_binary_main_mkfifo(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_mkfifo"  -Dusage=_usage_mkfifo $(src_coreutils_CFLAGS)
+# Command mknod
+noinst_LIBRARIES += src/libsinglebin_mknod.a
+src_libsinglebin_mknod_a_SOURCES =   src/mknod.c $(selinux_sources)
+src_libsinglebin_mknod_a_ldadd =   $(LIB_SELINUX)  $(LIB_SMACK)
+src_libsinglebin_mknod_a_CFLAGS = "-Dmain=_single_binary_main_mknod(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_mknod"  -Dusage=_usage_mknod $(src_coreutils_CFLAGS)
+# Command mktemp
+noinst_LIBRARIES += src/libsinglebin_mktemp.a
+src_libsinglebin_mktemp_a_SOURCES = src/mktemp.c
+src_libsinglebin_mktemp_a_CFLAGS = "-Dmain=_single_binary_main_mktemp(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_mktemp"  -Dusage=_usage_mktemp $(src_coreutils_CFLAGS)
+# Command mv
+noinst_LIBRARIES += src/libsinglebin_mv.a
+src_libsinglebin_mv_a_SOURCES =   src/mv.c src/remove.c $(copy_sources) $(selinux_sources)
+src_libsinglebin_mv_a_ldadd =   $(copy_ldadd)  $(remove_ldadd)
+src_libsinglebin_mv_a_CFLAGS = "-Dmain=_single_binary_main_mv(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_mv"  -Dusage=_usage_mv $(src_coreutils_CFLAGS)
+# Command nl
+noinst_LIBRARIES += src/libsinglebin_nl.a
+src_libsinglebin_nl_a_SOURCES = src/nl.c
+src_libsinglebin_nl_a_CFLAGS = "-Dmain=_single_binary_main_nl(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_nl"  -Dusage=_usage_nl $(src_coreutils_CFLAGS)
+# Command nproc
+noinst_LIBRARIES += src/libsinglebin_nproc.a
+src_libsinglebin_nproc_a_SOURCES = src/nproc.c
+src_libsinglebin_nproc_a_CFLAGS = "-Dmain=_single_binary_main_nproc(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_nproc"  -Dusage=_usage_nproc $(src_coreutils_CFLAGS)
+# Command nohup
+noinst_LIBRARIES += src/libsinglebin_nohup.a
+src_libsinglebin_nohup_a_SOURCES = src/nohup.c
+src_libsinglebin_nohup_a_CFLAGS = "-Dmain=_single_binary_main_nohup(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_nohup"  -Dusage=_usage_nohup $(src_coreutils_CFLAGS)
+# Command numfmt
+noinst_LIBRARIES += src/libsinglebin_numfmt.a
+src_libsinglebin_numfmt_a_SOURCES = src/numfmt.c
+src_libsinglebin_numfmt_a_CFLAGS = "-Dmain=_single_binary_main_numfmt(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_numfmt"  -Dusage=_usage_numfmt $(src_coreutils_CFLAGS)
+# Command od
+noinst_LIBRARIES += src/libsinglebin_od.a
+src_libsinglebin_od_a_SOURCES = src/od.c
+src_libsinglebin_od_a_CFLAGS = "-Dmain=_single_binary_main_od(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_od"  -Dusage=_usage_od $(src_coreutils_CFLAGS)
+# Command paste
+noinst_LIBRARIES += src/libsinglebin_paste.a
+src_libsinglebin_paste_a_SOURCES = src/paste.c
+src_libsinglebin_paste_a_CFLAGS = "-Dmain=_single_binary_main_paste(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_paste"  -Dusage=_usage_paste $(src_coreutils_CFLAGS)
+# Command pathchk
+noinst_LIBRARIES += src/libsinglebin_pathchk.a
+src_libsinglebin_pathchk_a_SOURCES = src/pathchk.c
+src_libsinglebin_pathchk_a_CFLAGS = "-Dmain=_single_binary_main_pathchk(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_pathchk"  -Dusage=_usage_pathchk $(src_coreutils_CFLAGS)
+# Command pr
+noinst_LIBRARIES += src/libsinglebin_pr.a
+src_libsinglebin_pr_a_SOURCES = src/pr.c
+src_libsinglebin_pr_a_ldadd =   $(LIB_CLOCK_GETTIME)
+src_libsinglebin_pr_a_CFLAGS = "-Dmain=_single_binary_main_pr(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_pr"  -Dusage=_usage_pr $(src_coreutils_CFLAGS)
+# Command printenv
+noinst_LIBRARIES += src/libsinglebin_printenv.a
+src_libsinglebin_printenv_a_SOURCES = src/printenv.c
+src_libsinglebin_printenv_a_CFLAGS = "-Dmain=_single_binary_main_printenv(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_printenv"  -Dusage=_usage_printenv $(src_coreutils_CFLAGS)
+# Command printf
+noinst_LIBRARIES += src/libsinglebin_printf.a
+src_libsinglebin_printf_a_SOURCES = src/printf.c
+src_libsinglebin_printf_a_ldadd =   $(LIBICONV)
+src_libsinglebin_printf_a_CFLAGS = "-Dmain=_single_binary_main_printf(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_printf"  -Dusage=_usage_printf $(src_coreutils_CFLAGS)
+# Command ptx
+noinst_LIBRARIES += src/libsinglebin_ptx.a
+src_libsinglebin_ptx_a_SOURCES = src/ptx.c
+src_libsinglebin_ptx_a_ldadd =   $(LIBICONV)
+src_libsinglebin_ptx_a_CFLAGS = "-Dmain=_single_binary_main_ptx(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_ptx"  -Dusage=_usage_ptx $(src_coreutils_CFLAGS)
+# Command pwd
+noinst_LIBRARIES += src/libsinglebin_pwd.a
+src_libsinglebin_pwd_a_SOURCES = src/pwd.c
+src_libsinglebin_pwd_a_CFLAGS = "-Dmain=_single_binary_main_pwd(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_pwd"  -Dusage=_usage_pwd $(src_coreutils_CFLAGS)
+# Command readlink
+noinst_LIBRARIES += src/libsinglebin_readlink.a
+src_libsinglebin_readlink_a_SOURCES = src/readlink.c
+src_libsinglebin_readlink_a_CFLAGS = "-Dmain=_single_binary_main_readlink(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_readlink"  -Dusage=_usage_readlink $(src_coreutils_CFLAGS)
+# Command realpath
+noinst_LIBRARIES += src/libsinglebin_realpath.a
+src_libsinglebin_realpath_a_SOURCES =   src/realpath.c src/relpath.c src/relpath.h
+src_libsinglebin_realpath_a_ldadd =   $(LIBICONV)
+src_libsinglebin_realpath_a_CFLAGS = "-Dmain=_single_binary_main_realpath(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_realpath"  -Dusage=_usage_realpath $(src_coreutils_CFLAGS)
+# Command rm
+noinst_LIBRARIES += src/libsinglebin_rm.a
+src_libsinglebin_rm_a_SOURCES =   src/rm.c src/remove.c
+src_libsinglebin_rm_a_ldadd =   $(remove_ldadd)
+src_libsinglebin_rm_a_CFLAGS = "-Dmain=_single_binary_main_rm(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_rm"  -Dusage=_usage_rm $(src_coreutils_CFLAGS)
+# Command rmdir
+noinst_LIBRARIES += src/libsinglebin_rmdir.a
+src_libsinglebin_rmdir_a_SOURCES =   src/rmdir.c src/prog-fprintf.c
+src_libsinglebin_rmdir_a_CFLAGS = "-Dmain=_single_binary_main_rmdir(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_rmdir"  -Dusage=_usage_rmdir $(src_coreutils_CFLAGS)
+# Command runcon
+noinst_LIBRARIES += src/libsinglebin_runcon.a
+src_libsinglebin_runcon_a_SOURCES = src/runcon.c
+src_libsinglebin_runcon_a_ldadd =   $(LIB_SELINUX)
+src_libsinglebin_runcon_a_CFLAGS = "-Dmain=_single_binary_main_runcon(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_runcon"  -Dusage=_usage_runcon $(src_coreutils_CFLAGS)
+# Command seq
+noinst_LIBRARIES += src/libsinglebin_seq.a
+src_libsinglebin_seq_a_SOURCES = src/seq.c
+src_libsinglebin_seq_a_CFLAGS = "-Dmain=_single_binary_main_seq(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_seq"  -Dusage=_usage_seq $(src_coreutils_CFLAGS)
+# Command sha1sum
+noinst_LIBRARIES += src/libsinglebin_sha1sum.a
+src_libsinglebin_sha1sum_a_SOURCES =   src/md5sum.c
+src_libsinglebin_sha1sum_a_ldadd =   $(LIB_CRYPTO)
+src_libsinglebin_sha1sum_a_CFLAGS = "-Dmain=_single_binary_main_sha1sum(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_sha1sum"  -Dusage=_usage_sha1sum $(src_coreutils_CFLAGS)
+src_libsinglebin_sha1sum_a_CPPFLAGS =   -DHASH_ALGO_SHA1=1 $(AM_CPPFLAGS)
+# Command sha224sum
+noinst_LIBRARIES += src/libsinglebin_sha224sum.a
+src_libsinglebin_sha224sum_a_SOURCES =   src/md5sum.c
+src_libsinglebin_sha224sum_a_ldadd =   $(LIB_CRYPTO)
+src_libsinglebin_sha224sum_a_CFLAGS = "-Dmain=_single_binary_main_sha224sum(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_sha224sum"  -Dusage=_usage_sha224sum $(src_coreutils_CFLAGS)
+src_libsinglebin_sha224sum_a_CPPFLAGS =   -DHASH_ALGO_SHA224=1 $(AM_CPPFLAGS)
+# Command sha256sum
+noinst_LIBRARIES += src/libsinglebin_sha256sum.a
+src_libsinglebin_sha256sum_a_SOURCES =   src/md5sum.c
+src_libsinglebin_sha256sum_a_ldadd =   $(LIB_CRYPTO)
+src_libsinglebin_sha256sum_a_CFLAGS = "-Dmain=_single_binary_main_sha256sum(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_sha256sum"  -Dusage=_usage_sha256sum $(src_coreutils_CFLAGS)
+src_libsinglebin_sha256sum_a_CPPFLAGS =   -DHASH_ALGO_SHA256=1 $(AM_CPPFLAGS)
+# Command sha384sum
+noinst_LIBRARIES += src/libsinglebin_sha384sum.a
+src_libsinglebin_sha384sum_a_SOURCES =   src/md5sum.c
+src_libsinglebin_sha384sum_a_ldadd =   $(LIB_CRYPTO)
+src_libsinglebin_sha384sum_a_CFLAGS = "-Dmain=_single_binary_main_sha384sum(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_sha384sum"  -Dusage=_usage_sha384sum $(src_coreutils_CFLAGS)
+src_libsinglebin_sha384sum_a_CPPFLAGS =   -DHASH_ALGO_SHA384=1 $(AM_CPPFLAGS)
+# Command sha512sum
+noinst_LIBRARIES += src/libsinglebin_sha512sum.a
+src_libsinglebin_sha512sum_a_SOURCES =   src/md5sum.c
+src_libsinglebin_sha512sum_a_ldadd =   $(LIB_CRYPTO)
+src_libsinglebin_sha512sum_a_CFLAGS = "-Dmain=_single_binary_main_sha512sum(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_sha512sum"  -Dusage=_usage_sha512sum $(src_coreutils_CFLAGS)
+src_libsinglebin_sha512sum_a_CPPFLAGS =   -DHASH_ALGO_SHA512=1 $(AM_CPPFLAGS)
+# Command shred
+noinst_LIBRARIES += src/libsinglebin_shred.a
+src_libsinglebin_shred_a_SOURCES = src/shred.c
+src_libsinglebin_shred_a_ldadd =   $(LIB_FDATASYNC)
+src_libsinglebin_shred_a_CFLAGS = "-Dmain=_single_binary_main_shred(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_shred"  -Dusage=_usage_shred $(src_coreutils_CFLAGS)
+# Command shuf
+noinst_LIBRARIES += src/libsinglebin_shuf.a
+src_libsinglebin_shuf_a_SOURCES = src/shuf.c
+src_libsinglebin_shuf_a_CFLAGS = "-Dmain=_single_binary_main_shuf(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_shuf"  -Dusage=_usage_shuf $(src_coreutils_CFLAGS)
+# Command sleep
+noinst_LIBRARIES += src/libsinglebin_sleep.a
+src_libsinglebin_sleep_a_SOURCES = src/sleep.c
+src_libsinglebin_sleep_a_ldadd =   $(LIB_NANOSLEEP)
+src_libsinglebin_sleep_a_CFLAGS = "-Dmain=_single_binary_main_sleep(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_sleep"  -Dusage=_usage_sleep $(src_coreutils_CFLAGS)
+# Command sort
+noinst_LIBRARIES += src/libsinglebin_sort.a
+src_libsinglebin_sort_a_SOURCES = src/sort.c
+src_libsinglebin_sort_a_ldadd =   $(LIB_EACCESS)  $(LIB_NANOSLEEP)  $(LIB_CRYPTO)  $(LIB_PTHREAD)
+src_libsinglebin_sort_a_CFLAGS = "-Dmain=_single_binary_main_sort(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_sort"  -Dusage=_usage_sort $(src_coreutils_CFLAGS)
+# Command split
+noinst_LIBRARIES += src/libsinglebin_split.a
+src_libsinglebin_split_a_SOURCES = src/split.c
+src_libsinglebin_split_a_ldadd =   $(LIBICONV)
+src_libsinglebin_split_a_CFLAGS = "-Dmain=_single_binary_main_split(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_split"  -Dusage=_usage_split $(src_coreutils_CFLAGS)
+# Command stat
+noinst_LIBRARIES += src/libsinglebin_stat.a
+src_libsinglebin_stat_a_SOURCES =   src/stat.c src/find-mount-point.c
+src_libsinglebin_stat_a_ldadd =   $(LIB_SELINUX)  $(LIB_NVPAIR)
+src_libsinglebin_stat_a_CFLAGS = "-Dmain=_single_binary_main_stat(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_stat"  -Dusage=_usage_stat $(src_coreutils_CFLAGS)
+# Command sum
+noinst_LIBRARIES += src/libsinglebin_sum.a
+src_libsinglebin_sum_a_SOURCES = src/sum.c
+src_libsinglebin_sum_a_CFLAGS = "-Dmain=_single_binary_main_sum(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_sum"  -Dusage=_usage_sum $(src_coreutils_CFLAGS)
+# Command sync
+noinst_LIBRARIES += src/libsinglebin_sync.a
+src_libsinglebin_sync_a_SOURCES = src/sync.c
+src_libsinglebin_sync_a_CFLAGS = "-Dmain=_single_binary_main_sync(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_sync"  -Dusage=_usage_sync $(src_coreutils_CFLAGS)
+# Command tac
+noinst_LIBRARIES += src/libsinglebin_tac.a
+src_libsinglebin_tac_a_SOURCES = src/tac.c
+src_libsinglebin_tac_a_CFLAGS = "-Dmain=_single_binary_main_tac(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_tac"  -Dusage=_usage_tac $(src_coreutils_CFLAGS)
+# Command tail
+noinst_LIBRARIES += src/libsinglebin_tail.a
+src_libsinglebin_tail_a_SOURCES = src/tail.c
+src_libsinglebin_tail_a_ldadd =   $(LIB_NANOSLEEP)
+src_libsinglebin_tail_a_CFLAGS = "-Dmain=_single_binary_main_tail(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_tail"  -Dusage=_usage_tail $(src_coreutils_CFLAGS)
+# Command tee
+noinst_LIBRARIES += src/libsinglebin_tee.a
+src_libsinglebin_tee_a_SOURCES = src/tee.c
+src_libsinglebin_tee_a_CFLAGS = "-Dmain=_single_binary_main_tee(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_tee"  -Dusage=_usage_tee $(src_coreutils_CFLAGS)
+# Command test
+noinst_LIBRARIES += src/libsinglebin_test.a
+src_libsinglebin_test_a_SOURCES = src/test.c
+src_libsinglebin_test_a_ldadd =   $(LIB_EACCESS)
+src_libsinglebin_test_a_CFLAGS = "-Dmain=_single_binary_main_test(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_test"  -Dusage=_usage_test $(src_coreutils_CFLAGS)
+# Command timeout
+noinst_LIBRARIES += src/libsinglebin_timeout.a
+src_libsinglebin_timeout_a_SOURCES =   src/timeout.c src/operand2sig.c
+src_libsinglebin_timeout_a_ldadd =   $(LIB_TIMER_TIME)  $(LIBICONV)
+src_libsinglebin_timeout_a_CFLAGS = "-Dmain=_single_binary_main_timeout(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_timeout"  -Dusage=_usage_timeout $(src_coreutils_CFLAGS)
+# Command touch
+noinst_LIBRARIES += src/libsinglebin_touch.a
+src_libsinglebin_touch_a_SOURCES = src/touch.c
+src_libsinglebin_touch_a_ldadd =   $(LIB_CLOCK_GETTIME)
+src_libsinglebin_touch_a_CFLAGS = "-Dmain=_single_binary_main_touch(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_touch"  -Dusage=_usage_touch $(src_coreutils_CFLAGS)
+# Command tr
+noinst_LIBRARIES += src/libsinglebin_tr.a
+src_libsinglebin_tr_a_SOURCES = src/tr.c
+src_libsinglebin_tr_a_CFLAGS = "-Dmain=_single_binary_main_tr(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_tr"  -Dusage=_usage_tr $(src_coreutils_CFLAGS)
+# Command true
+noinst_LIBRARIES += src/libsinglebin_true.a
+src_libsinglebin_true_a_SOURCES = src/true.c
+src_libsinglebin_true_a_CFLAGS = "-Dmain=_single_binary_main_true(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_true"  -Dusage=_usage_true $(src_coreutils_CFLAGS)
+# Command truncate
+noinst_LIBRARIES += src/libsinglebin_truncate.a
+src_libsinglebin_truncate_a_SOURCES = src/truncate.c
+src_libsinglebin_truncate_a_ldadd =   $(LIBICONV)
+src_libsinglebin_truncate_a_CFLAGS = "-Dmain=_single_binary_main_truncate(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_truncate"  -Dusage=_usage_truncate $(src_coreutils_CFLAGS)
+# Command tsort
+noinst_LIBRARIES += src/libsinglebin_tsort.a
+src_libsinglebin_tsort_a_SOURCES = src/tsort.c
+src_libsinglebin_tsort_a_CFLAGS = "-Dmain=_single_binary_main_tsort(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_tsort"  -Dusage=_usage_tsort $(src_coreutils_CFLAGS)
+# Command tty
+noinst_LIBRARIES += src/libsinglebin_tty.a
+src_libsinglebin_tty_a_SOURCES = src/tty.c
+src_libsinglebin_tty_a_CFLAGS = "-Dmain=_single_binary_main_tty(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_tty"  -Dusage=_usage_tty $(src_coreutils_CFLAGS)
+# Command uname
+noinst_LIBRARIES += src/libsinglebin_uname.a
+src_libsinglebin_uname_a_SOURCES =   src/uname.c src/uname-uname.c
+src_libsinglebin_uname_a_ldadd =   $(GETHOSTNAME_LIB)
+src_libsinglebin_uname_a_CFLAGS = "-Dmain=_single_binary_main_uname(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_uname"  -Dusage=_usage_uname $(src_coreutils_CFLAGS)
+# Command unexpand
+noinst_LIBRARIES += src/libsinglebin_unexpand.a
+src_libsinglebin_unexpand_a_SOURCES = src/unexpand.c
+src_libsinglebin_unexpand_a_CFLAGS = "-Dmain=_single_binary_main_unexpand(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_unexpand"  -Dusage=_usage_unexpand $(src_coreutils_CFLAGS)
+# Command uniq
+noinst_LIBRARIES += src/libsinglebin_uniq.a
+src_libsinglebin_uniq_a_SOURCES = src/uniq.c
+src_libsinglebin_uniq_a_CFLAGS = "-Dmain=_single_binary_main_uniq(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_uniq"  -Dusage=_usage_uniq $(src_coreutils_CFLAGS)
+# Command unlink
+noinst_LIBRARIES += src/libsinglebin_unlink.a
+src_libsinglebin_unlink_a_SOURCES = src/unlink.c
+src_libsinglebin_unlink_a_CFLAGS = "-Dmain=_single_binary_main_unlink(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_unlink"  -Dusage=_usage_unlink $(src_coreutils_CFLAGS)
+# Command vdir
+noinst_LIBRARIES += src/libsinglebin_vdir.a
+src_libsinglebin_vdir_a_SOURCES = src/coreutils-vdir.c
+src_libsinglebin_vdir_a_ldadd =   $(src_ls_LDADD) src/libsinglebin_ls.a
+src_libsinglebin_vdir_a_CFLAGS = "-Dmain=_single_binary_main_vdir(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_vdir"  -Dusage=_usage_vdir $(src_coreutils_CFLAGS)
+# Command wc
+noinst_LIBRARIES += src/libsinglebin_wc.a
+src_libsinglebin_wc_a_SOURCES = src/wc.c
+src_libsinglebin_wc_a_CFLAGS = "-Dmain=_single_binary_main_wc(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_wc"  -Dusage=_usage_wc $(src_coreutils_CFLAGS)
+# Command whoami
+noinst_LIBRARIES += src/libsinglebin_whoami.a
+src_libsinglebin_whoami_a_SOURCES = src/whoami.c
+src_libsinglebin_whoami_a_CFLAGS = "-Dmain=_single_binary_main_whoami(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_whoami"  -Dusage=_usage_whoami $(src_coreutils_CFLAGS)
+# Command yes
+noinst_LIBRARIES += src/libsinglebin_yes.a
+src_libsinglebin_yes_a_SOURCES = src/yes.c
+src_libsinglebin_yes_a_CFLAGS = "-Dmain=_single_binary_main_yes(int, char**)  ATTRIBUTE_NORETURN; int _single_binary_main_yes"  -Dusage=_usage_yes $(src_coreutils_CFLAGS)
diff --git a/src/sleep.c b/src/sleep.c
index b9163bc4..e24c2512 100644
--- a/src/sleep.c
+++ b/src/sleep.c
@@ -1,5 +1,5 @@
 /* sleep - delay for a specified amount of time.
-   Copyright (C) 1984-2013 Free Software Foundation, Inc.
+   Copyright (C) 1984-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/sort.c b/src/sort.c
index 7410abca..c2493192 100644
--- a/src/sort.c
+++ b/src/sort.c
@@ -1,5 +1,5 @@
 /* sort - sort lines of text (with all kinds of options).
-   Copyright (C) 1988-2013 Free Software Foundation, Inc.
+   Copyright (C) 1988-2014 Free Software Foundation, Inc.
 
    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
@@ -221,7 +221,7 @@ struct keyfield
   bool general_numeric;		/* Flag for general, numeric comparison.
                                    Handle numbers in exponential notation. */
   bool human_numeric;		/* Flag for sorting by human readable
-                                   units with either SI xor IEC prefixes. */
+                                   units with either SI or IEC prefixes. */
   bool month;			/* Flag for comparison by month name. */
   bool reverse;			/* Reverse the sense of comparison. */
   bool version;			/* sort by version number */
@@ -373,6 +373,34 @@ static bool debug;
    number are present, temp files will be used. */
 static unsigned int nmerge = NMERGE_DEFAULT;
 
+/* Output an error to stderr using async-signal-safe routines, and _exit().
+   This can be used safely from signal handlers,
+   and between fork() and exec() of multithreaded processes.  */
+
+static void async_safe_die (int, const char *) ATTRIBUTE_NORETURN;
+static void
+async_safe_die (int errnum, const char *errstr)
+{
+  ignore_value (write (STDERR_FILENO, errstr, strlen (errstr)));
+
+  /* Even if defined HAVE_STRERROR_R, we can't use it,
+     as it may return a translated string etc. and even if not
+     may malloc() which is unsafe.  We might improve this
+     by testing for sys_errlist and using that if available.
+     For now just report the error number.  */
+  if (errnum)
+    {
+      char errbuf[INT_BUFSIZE_BOUND (errnum)];
+      char *p = inttostr (errnum, errbuf);
+      ignore_value (write (STDERR_FILENO, ": errno ", 8));
+      ignore_value (write (STDERR_FILENO, p, strlen (p)));
+    }
+
+  ignore_value (write (STDERR_FILENO, "\n", 1));
+
+  _exit (SORT_FAILURE);
+}
+
 /* Report MESSAGE for FILE, then clean up and exit.
    If FILE is null, it represents standard output.  */
 
@@ -476,7 +504,7 @@ Other options:\n\
 \n\
 "), DEFAULT_TMPDIR);
       fputs (_("\
-  -z, --zero-terminated     end lines with 0 byte, not newline\n\
+  -z, --zero-terminated     line delimiter is NUL, not newline\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
@@ -982,8 +1010,8 @@ move_fd_or_die (int oldfd, int newfd)
 {
   if (oldfd != newfd)
     {
-      if (dup2 (oldfd, newfd) < 0)
-        error (SORT_FAILURE, errno, _("dup2 failed"));
+      /* This should never fail for our usage.  */
+      dup2 (oldfd, newfd);
       close (oldfd);
     }
 }
@@ -1095,13 +1123,15 @@ maybe_create_temp (FILE **pfp, bool survive_fd_exhaustion)
         }
       else if (node->pid == 0)
         {
+          /* Being the child of a multithreaded program before exec(),
+             we're restricted to calling async-signal-safe routines here.  */
           close (pipefds[1]);
           move_fd_or_die (tempfd, STDOUT_FILENO);
           move_fd_or_die (pipefds[0], STDIN_FILENO);
 
-          if (execlp (compress_program, compress_program, (char *) NULL) < 0)
-            error (SORT_FAILURE, errno, _("couldn't execute %s"),
-                   compress_program);
+          execlp (compress_program, compress_program, (char *) NULL);
+
+          async_safe_die (errno, "couldn't execute compress program");
         }
     }
 
@@ -1153,13 +1183,15 @@ open_temp (struct tempnode *temp)
       break;
 
     case 0:
+      /* Being the child of a multithreaded program before exec(),
+         we're restricted to calling async-signal-safe routines here.  */
       close (pipefds[0]);
       move_fd_or_die (tempfd, STDIN_FILENO);
       move_fd_or_die (pipefds[1], STDOUT_FILENO);
 
       execlp (compress_program, compress_program, "-d", (char *) NULL);
-      error (SORT_FAILURE, errno, _("couldn't execute %s -d"),
-             compress_program);
+
+      async_safe_die (errno, "couldn't execute compress program (with -d)");
 
     default:
       temp->pid = child;
@@ -1557,7 +1589,8 @@ initbuf (struct buffer *buf, size_t line_bytes, size_t alloc)
 static inline struct line *
 buffer_linelim (struct buffer const *buf)
 {
-  return (struct line *) (buf->buf + buf->alloc);
+  void *linelim = buf->buf + buf->alloc;
+  return linelim;
 }
 
 /* Return a pointer to the first character of the field specified
@@ -3204,8 +3237,17 @@ merge_tree_init (size_t nthreads, size_t nlines, struct line *dest)
 
 /* Destroy the merge tree. */
 static void
-merge_tree_destroy (struct merge_node *merge_tree)
+merge_tree_destroy (size_t nthreads, struct merge_node *merge_tree)
 {
+  size_t n_nodes = nthreads * 2;
+  struct merge_node *node = merge_tree;
+
+  while (n_nodes--)
+    {
+      pthread_mutex_destroy (&node->lock);
+      node++;
+    }
+
   free (merge_tree);
 }
 
@@ -3321,8 +3363,8 @@ queue_insert (struct merge_node_queue *queue, struct merge_node *node)
   pthread_mutex_lock (&queue->mutex);
   heap_insert (queue->priority_queue, node);
   node->queued = true;
-  pthread_mutex_unlock (&queue->mutex);
   pthread_cond_signal (&queue->cond);
+  pthread_mutex_unlock (&queue->mutex);
 }
 
 /* Pop the top node off the priority QUEUE, lock the node, return it.  */
@@ -3607,8 +3649,6 @@ sortlines (struct line *restrict lines, size_t nthreads,
       queue_insert (queue, node);
       merge_loop (queue, total_lines, tfp, temp_output);
     }
-
-  pthread_mutex_destroy (&node->lock);
 }
 
 /* Scan through FILES[NTEMPS .. NFILES-1] looking for files that are
@@ -3912,13 +3952,14 @@ sort (char *const *files, size_t nfiles, char const *output_file,
               queue_init (&queue, nthreads);
               struct merge_node *merge_tree =
                 merge_tree_init (nthreads, buf.nlines, line);
-              struct merge_node *root = merge_tree + 1;
 
-              sortlines (line, nthreads, buf.nlines, root,
+              sortlines (line, nthreads, buf.nlines, merge_tree + 1,
                          &queue, tfp, temp_output);
+
+#ifdef lint
+              merge_tree_destroy (nthreads, merge_tree);
               queue_destroy (&queue);
-              pthread_mutex_destroy (&root->lock);
-              merge_tree_destroy (merge_tree);
+#endif
             }
           else
             write_unique (line - 1, tfp, temp_output);
diff --git a/src/split.c b/src/split.c
index e5e75f0f..dacacaa8 100644
--- a/src/split.c
+++ b/src/split.c
@@ -1,5 +1,5 @@
 /* split.c -- split a file into pieces.
-   Copyright (C) 1988-2013 Free Software Foundation, Inc.
+   Copyright (C) 1988-2014 Free Software Foundation, Inc.
 
    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
@@ -33,7 +33,6 @@
 #include "error.h"
 #include "fd-reopen.h"
 #include "fcntl--.h"
-#include "full-read.h"
 #include "full-write.h"
 #include "ioblksize.h"
 #include "quote.h"
@@ -215,15 +214,15 @@ is -, read standard input.\n\
 
       fprintf (stdout, _("\
   -a, --suffix-length=N   generate suffixes of length N (default %d)\n\
-      --additional-suffix=SUFFIX  append an additional SUFFIX to file names.\n\
+      --additional-suffix=SUFFIX  append an additional SUFFIX to file names\n\
   -b, --bytes=SIZE        put SIZE bytes per output file\n\
   -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n\
-  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of alphabetic.\n\
-                                   FROM changes the start value (default 0).\n\
+  -d, --numeric-suffixes[=FROM]  use numeric suffixes instead of alphabetic;\n\
+                                   FROM changes the start value (default 0)\n\
   -e, --elide-empty-files  do not generate empty output files with '-n'\n\
       --filter=COMMAND    write to shell COMMAND; file name is $FILE\n\
   -l, --lines=NUMBER      put NUMBER lines per output file\n\
-  -n, --number=CHUNKS     generate CHUNKS output files.  See below\n\
+  -n, --number=CHUNKS     generate CHUNKS output files; see explanation below\n\
   -u, --unbuffered        immediately copy input to output with '-n r/...'\n\
 "), DEFAULT_SUFFIX_LENGTH);
       fputs (_("\
@@ -526,8 +525,8 @@ bytes_split (uintmax_t n_bytes, char *buf, size_t bufsize, uintmax_t max_files)
 
   do
     {
-      n_read = full_read (STDIN_FILENO, buf, bufsize);
-      if (n_read < bufsize && errno)
+      n_read = safe_read (STDIN_FILENO, buf, bufsize);
+      if (n_read == SAFE_READ_ERROR)
         error (EXIT_FAILURE, errno, "%s", infile);
       bp_out = buf;
       to_read = n_read;
@@ -562,7 +561,7 @@ bytes_split (uintmax_t n_bytes, char *buf, size_t bufsize, uintmax_t max_files)
             }
         }
     }
-  while (n_read == bufsize);
+  while (n_read);
 
   /* Ensure NUMBER files are created, which truncates
      any existing files or notifies any consumers on fifos.
@@ -584,8 +583,8 @@ lines_split (uintmax_t n_lines, char *buf, size_t bufsize)
 
   do
     {
-      n_read = full_read (STDIN_FILENO, buf, bufsize);
-      if (n_read < bufsize && errno)
+      n_read = safe_read (STDIN_FILENO, buf, bufsize);
+      if (n_read == SAFE_READ_ERROR)
         error (EXIT_FAILURE, errno, "%s", infile);
       bp = bp_out = buf;
       eob = bp + n_read;
@@ -614,64 +613,117 @@ lines_split (uintmax_t n_lines, char *buf, size_t bufsize)
             }
         }
     }
-  while (n_read == bufsize);
+  while (n_read);
 }
-
+
 /* Split into pieces that are as large as possible while still not more
    than N_BYTES bytes, and are split on line boundaries except
-   where lines longer than N_BYTES bytes occur.
-   FIXME: Allow N_BYTES to be any uintmax_t value, and don't require a
-   buffer of size N_BYTES, in case N_BYTES is very large.  */
+   where lines longer than N_BYTES bytes occur. */
 
 static void
-line_bytes_split (size_t n_bytes)
+line_bytes_split (uintmax_t n_bytes, char *buf, size_t bufsize)
 {
-  char *bp;
-  bool eof = false;
-  size_t n_buffered = 0;
-  char *buf = xmalloc (n_bytes);
+  size_t n_read;
+  uintmax_t n_out = 0;      /* for each split.  */
+  size_t n_hold = 0;
+  char *hold = NULL;        /* for lines > bufsize.  */
+  size_t hold_size = 0;
+  bool split_line = false;  /* Whether a \n was output in a split.  */
 
   do
     {
-      /* Fill up the full buffer size from the input file.  */
-
-      size_t to_read = n_bytes - n_buffered;
-      size_t n_read = full_read (STDIN_FILENO, buf + n_buffered, to_read);
-      if (n_read < to_read && errno)
+      n_read = safe_read (STDIN_FILENO, buf, bufsize);
+      if (n_read == SAFE_READ_ERROR)
         error (EXIT_FAILURE, errno, "%s", infile);
-
-      n_buffered += n_read;
-      if (n_buffered != n_bytes)
+      size_t n_left = n_read;
+      char *sob = buf;
+      while (n_left)
         {
-          if (n_buffered == 0)
-            break;
-          eof = true;
-        }
+          size_t split_rest = 0;
+          char *eoc = NULL;
+          char *eol;
 
-      /* Find where to end this chunk.  */
-      bp = buf + n_buffered;
-      if (n_buffered == n_bytes)
-        {
-          while (bp > buf && bp[-1] != '\n')
-            bp--;
-        }
+          /* Determine End Of Chunk and/or End of Line,
+             which are used below to select what to write or buffer.  */
+          if (n_bytes - n_out - n_hold <= n_left)
+            {
+              /* Have enough for split.  */
+              split_rest = n_bytes - n_out - n_hold;
+              eoc = sob + split_rest - 1;
+              eol = memrchr (sob, '\n', split_rest);
+            }
+          else
+            eol = memrchr (sob, '\n', n_left);
 
-      /* If chunk has no newlines, use all the chunk.  */
-      if (bp == buf)
-        bp = buf + n_buffered;
+          /* Output hold space if possible.  */
+          if (n_hold && !(!eol && n_out))
+            {
+              cwrite (n_out == 0, hold, n_hold);
+              n_out += n_hold;
+              if (n_hold > bufsize)
+                hold = xrealloc (hold, bufsize);
+              n_hold = 0;
+              hold_size = bufsize;
+            }
 
-      /* Output the chars as one output file.  */
-      cwrite (true, buf, bp - buf);
+          /* Output to eol if present.  */
+          if (eol)
+            {
+              split_line = true;
+              size_t n_write = eol - sob + 1;
+              cwrite (n_out == 0, sob, n_write);
+              n_out += n_write;
+              n_left -= n_write;
+              sob += n_write;
+              if (eoc)
+                split_rest -= n_write;
+            }
 
-      /* Discard the chars we just output; move rest of chunk
-         down to be the start of the next chunk.  Source and
-         destination probably overlap.  */
-      n_buffered -= bp - buf;
-      if (n_buffered > 0)
-        memmove (buf, bp, n_buffered);
+          /* Output to eoc or eob if possible.  */
+          if (n_left && !split_line)
+            {
+              size_t n_write = eoc ? split_rest : n_left;
+              cwrite (n_out == 0, sob, n_write);
+              n_out += n_write;
+              n_left -= n_write;
+              sob += n_write;
+              if (eoc)
+                split_rest -= n_write;
+            }
+
+          /* Update hold if needed.  */
+          if ((eoc && split_rest) || (!eoc && n_left))
+            {
+              size_t n_buf = eoc ? split_rest : n_left;
+              if (hold_size - n_hold < n_buf)
+                {
+                  if (hold_size <= SIZE_MAX - bufsize)
+                    hold_size += bufsize;
+                  else
+                    xalloc_die ();
+                  hold = xrealloc (hold, hold_size);
+                }
+              memcpy (hold + n_hold, sob, n_buf);
+              n_hold += n_buf;
+              n_left -= n_buf;
+              sob += n_buf;
+            }
+
+          /* Reset for new split.  */
+          if (eoc)
+            {
+              n_out = 0;
+              split_line = false;
+            }
+        }
     }
-  while (!eof);
-  free (buf);
+  while (n_read);
+
+  /* Handle no eol at end of file.  */
+  if (n_hold)
+    cwrite (n_out == 0, hold, n_hold);
+
+  free (hold);
 }
 
 /* -n l/[K/]N: Write lines to files of approximately file size / N.
@@ -709,8 +761,8 @@ lines_chunk_split (uintmax_t k, uintmax_t n, char *buf, size_t bufsize,
   while (n_written < file_size)
     {
       char *bp = buf, *eob;
-      size_t n_read = full_read (STDIN_FILENO, buf, bufsize);
-      if (n_read < bufsize && errno)
+      size_t n_read = safe_read (STDIN_FILENO, buf, bufsize);
+      if (n_read == SAFE_READ_ERROR)
         error (EXIT_FAILURE, errno, "%s", infile);
       else if (n_read == 0)
         break; /* eof.  */
@@ -804,8 +856,8 @@ bytes_chunk_extract (uintmax_t k, uintmax_t n, char *buf, size_t bufsize,
 
   while (start < end)
     {
-      size_t n_read = full_read (STDIN_FILENO, buf, bufsize);
-      if (n_read < bufsize && errno)
+      size_t n_read = safe_read (STDIN_FILENO, buf, bufsize);
+      if (n_read == SAFE_READ_ERROR)
         error (EXIT_FAILURE, errno, "%s", infile);
       else if (n_read == 0)
         break; /* eof.  */
@@ -926,7 +978,7 @@ lines_rr (uintmax_t k, uintmax_t n, char *buf, size_t bufsize)
   else
     {
       if (SIZE_MAX < n)
-        error (exit_failure, 0, "%s", _("memory exhausted"));
+        xalloc_die ();
       files = xnmalloc (n, sizeof *files);
 
       /* Generate output file names. */
@@ -945,8 +997,6 @@ lines_rr (uintmax_t k, uintmax_t n, char *buf, size_t bufsize)
   while (true)
     {
       char *bp = buf, *eob;
-      /* Use safe_read() rather than full_read() here
-         so that we process available data immediately.  */
       size_t n_read = safe_read (STDIN_FILENO, buf, bufsize);
       if (n_read == SAFE_READ_ERROR)
         error (EXIT_FAILURE, errno, "%s", infile);
@@ -1408,7 +1458,7 @@ main (int argc, char **argv)
       break;
 
     case type_byteslines:
-      line_bytes_split (n_units);
+      line_bytes_split (n_units, buf, in_blk_size);
       break;
 
     case type_chunk_bytes:
diff --git a/src/stat.c b/src/stat.c
index dd210d18..b65dbe55 100644
--- a/src/stat.c
+++ b/src/stat.c
@@ -1,5 +1,5 @@
 /* stat.c -- display file or file system status
-   Copyright (C) 2001-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
    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
@@ -152,6 +152,11 @@ statfs (char const *filename, struct fs_info *buf)
 # endif
 #endif
 
+#if HAVE_GETATTRAT
+# include <attr.h>
+# include <sys/nvpair.h>
+#endif
+
 /* FIXME: these are used by printf.c, too */
 #define isodigit(c) ('0' <= (c) && (c) <= '7')
 #define octtobin(c) ((c) - '0')
@@ -179,7 +184,6 @@ enum
 
 static struct option const long_options[] =
 {
-  {"context", no_argument, 0, 'Z'},
   {"dereference", no_argument, NULL, 'L'},
   {"file-system", no_argument, NULL, 'f'},
   {"format", required_argument, NULL, 'c'},
@@ -276,6 +280,8 @@ human_fstype (STRUCT_STATVFS const *statfsbuf)
       return "coda";
     case S_MAGIC_COH: /* 0x012FF7B7 local */
       return "coh";
+    case S_MAGIC_CONFIGFS: /* 0x62656570 local */
+      return "configfs";
     case S_MAGIC_CRAMFS: /* 0x28CD3D45 local */
       return "cramfs";
     case S_MAGIC_CRAMFS_WEND: /* 0x453DCD28 local */
@@ -288,14 +294,20 @@ human_fstype (STRUCT_STATVFS const *statfsbuf)
       return "devpts";
     case S_MAGIC_ECRYPTFS: /* 0xF15F local */
       return "ecryptfs";
+    case S_MAGIC_EFIVARFS: /* 0xDE5E81E4 local */
+      return "efivarfs";
     case S_MAGIC_EFS: /* 0x00414A53 local */
       return "efs";
+    case S_MAGIC_EXOFS: /* 0x5DF5 local */
+      return "exofs";
     case S_MAGIC_EXT: /* 0x137D local */
       return "ext";
     case S_MAGIC_EXT2: /* 0xEF53 local */
       return "ext2/ext3";
     case S_MAGIC_EXT2_OLD: /* 0xEF51 local */
       return "ext2";
+    case S_MAGIC_F2FS: /* 0xF2F52010 local */
+      return "f2fs";
     case S_MAGIC_FAT: /* 0x4006 local */
       return "fat";
     case S_MAGIC_FHGFS: /* 0x19830326 remote */
@@ -306,12 +318,18 @@ human_fstype (STRUCT_STATVFS const *statfsbuf)
       return "fusectl";
     case S_MAGIC_FUTEXFS: /* 0x0BAD1DEA local */
       return "futexfs";
-    case S_MAGIC_GFS: /* 0x1161970 remote */
+    case S_MAGIC_GFS: /* 0x01161970 remote */
       return "gfs/gfs2";
     case S_MAGIC_GPFS: /* 0x47504653 remote */
       return "gpfs";
     case S_MAGIC_HFS: /* 0x4244 local */
       return "hfs";
+    case S_MAGIC_HFS_PLUS: /* 0x482B local */
+      return "hfs+";
+    case S_MAGIC_HFS_X: /* 0x4858 local */
+      return "hfsx";
+    case S_MAGIC_HOSTFS: /* 0x00C0FFEE local */
+      return "hostfs";
     case S_MAGIC_HPFS: /* 0xF995E849 local */
       return "hpfs";
     case S_MAGIC_HUGETLBFS: /* 0x958458F6 local */
@@ -334,6 +352,8 @@ human_fstype (STRUCT_STATVFS const *statfsbuf)
       return "jfs";
     case S_MAGIC_KAFS: /* 0x6B414653 remote */
       return "k-afs";
+    case S_MAGIC_LOGFS: /* 0xC97E8168 local */
+      return "logfs";
     case S_MAGIC_LUSTRE: /* 0x0BD00BD0 remote */
       return "lustre";
     case S_MAGIC_MINIX: /* 0x137F local */
@@ -362,7 +382,7 @@ human_fstype (STRUCT_STATVFS const *statfsbuf)
       return "ntfs";
     case S_MAGIC_OPENPROM: /* 0x9FA1 local */
       return "openprom";
-    case S_MAGIC_OCFS2: /* 0x7461636f remote */
+    case S_MAGIC_OCFS2: /* 0x7461636F remote */
       return "ocfs2";
     case S_MAGIC_PANFS: /* 0xAAD7AAEA remote */
       return "panfs";
@@ -391,8 +411,12 @@ human_fstype (STRUCT_STATVFS const *statfsbuf)
       return "securityfs";
     case S_MAGIC_SELINUX: /* 0xF97CFF8C local */
       return "selinux";
+    case S_MAGIC_SMACK: /* 0x43415D53 local */
+      return "smackfs";
     case S_MAGIC_SMB: /* 0x517B remote */
       return "smb";
+    case S_MAGIC_SNFS: /* 0xBEEFDEAD remote */
+      return "snfs";
     case S_MAGIC_SOCKFS: /* 0x534F434B local */
       return "sockfs";
     case S_MAGIC_SQUASHFS: /* 0x73717368 local */
@@ -405,6 +429,8 @@ human_fstype (STRUCT_STATVFS const *statfsbuf)
       return "sysv4";
     case S_MAGIC_TMPFS: /* 0x01021994 local */
       return "tmpfs";
+    case S_MAGIC_UBIFS: /* 0x24051905 local */
+      return "ubifs";
     case S_MAGIC_UDF: /* 0x15013346 local */
       return "udf";
     case S_MAGIC_UFS: /* 0x00011954 local */
@@ -417,7 +443,9 @@ human_fstype (STRUCT_STATVFS const *statfsbuf)
       return "v9fs";
     case S_MAGIC_VMHGFS: /* 0xBACBACBC remote */
       return "vmhgfs";
-    case S_MAGIC_VXFS: /* 0xA501FCF5 local */
+    case S_MAGIC_VXFS: /* 0xA501FCF5 remote */
+      /* Veritas File System can run in single instance or clustered mode,
+         so mark as remote to cater for the latter case.  */
       return "vxfs";
     case S_MAGIC_VZFS: /* 0x565A4653 local */
       return "vzfs";
@@ -583,7 +611,7 @@ out_minus_zero (char *pformat, size_t prefix_len)
    acts like printf's %f format.  */
 static void
 out_epoch_sec (char *pformat, size_t prefix_len,
-               struct stat const *statbuf ATTRIBUTE_UNUSED,
+               struct stat const *statbuf _GL_UNUSED,
                struct timespec arg)
 {
   char *dot = memchr (pformat, '.', prefix_len);
@@ -714,7 +742,7 @@ out_file_context (char *pformat, size_t prefix_len, char const *filename)
 /* Print statfs info.  Return zero upon success, nonzero upon failure.  */
 static bool ATTRIBUTE_WARN_UNUSED_RESULT
 print_statfs (char *pformat, size_t prefix_len, unsigned int m,
-              char const *filename,
+              int fd, char const *filename,
               void const *data)
 {
   STRUCT_STATVFS const *statfsbuf = data;
@@ -815,17 +843,19 @@ find_bind_mount (char const * name)
       tried_mount_list = true;
     }
 
+  struct stat name_stats;
+  if (stat (name, &name_stats) != 0)
+    return NULL;
+
   struct mount_entry *me;
   for (me = mount_list; me; me = me->me_next)
     {
       if (me->me_dummy && me->me_devname[0] == '/'
           && STREQ (me->me_mountdir, name))
         {
-          struct stat name_stats;
           struct stat dev_stats;
 
-          if (stat (name, &name_stats) == 0
-              && stat (me->me_devname, &dev_stats) == 0
+          if (stat (me->me_devname, &dev_stats) == 0
               && SAME_INODE (name_stats, dev_stats))
             {
               bind_mount = me->me_devname;
@@ -886,6 +916,38 @@ print_mount_point:
   return fail;
 }
 
+static struct timespec
+get_birthtime (int fd, char const *filename, struct stat const *st)
+{
+  struct timespec ts = get_stat_birthtime (st);
+
+#if HAVE_GETATTRAT
+  if (ts.tv_nsec < 0)
+    {
+      nvlist_t *response;
+      if ((fd < 0
+           ? getattrat (AT_FDCWD, XATTR_VIEW_READWRITE, filename, &response)
+           : fgetattr (fd, XATTR_VIEW_READWRITE, &response))
+          == 0)
+        {
+          uint64_t *val;
+          uint_t n;
+          if (nvlist_lookup_uint64_array (response, A_CRTIME, &val, &n) == 0
+              && 2 <= n
+              && val[0] <= TYPE_MAXIMUM (time_t)
+              && val[1] < 1000000000 * 2 /* for leap seconds */)
+            {
+              ts.tv_sec = val[0];
+              ts.tv_nsec = val[1];
+            }
+          nvlist_free (response);
+        }
+    }
+#endif
+
+  return ts;
+}
+
 /* Map a TS with negative TS.tv_nsec to {0,0}.  */
 static inline struct timespec
 neg_to_zero (struct timespec ts)
@@ -899,7 +961,7 @@ neg_to_zero (struct timespec ts)
 /* Print stat info.  Return zero upon success, nonzero upon failure.  */
 static bool
 print_stat (char *pformat, size_t prefix_len, unsigned int m,
-            char const *filename, void const *data)
+            int fd, char const *filename, void const *data)
 {
   struct stat *statbuf = (struct stat *) data;
   struct passwd *pw_ent;
@@ -955,7 +1017,6 @@ print_stat (char *pformat, size_t prefix_len, unsigned int m,
       out_uint (pformat, prefix_len, statbuf->st_uid);
       break;
     case 'U':
-      setpwent ();
       pw_ent = getpwuid (statbuf->st_uid);
       out_string (pformat, prefix_len,
                   pw_ent ? pw_ent->pw_name : "UNKNOWN");
@@ -964,7 +1025,6 @@ print_stat (char *pformat, size_t prefix_len, unsigned int m,
       out_uint (pformat, prefix_len, statbuf->st_gid);
       break;
     case 'G':
-      setgrent ();
       gw_ent = getgrgid (statbuf->st_gid);
       out_string (pformat, prefix_len,
                   gw_ent ? gw_ent->gr_name : "UNKNOWN");
@@ -992,7 +1052,7 @@ print_stat (char *pformat, size_t prefix_len, unsigned int m,
       break;
     case 'w':
       {
-        struct timespec t = get_stat_birthtime (statbuf);
+        struct timespec t = get_birthtime (fd, filename, statbuf);
         if (t.tv_nsec < 0)
           out_string (pformat, prefix_len, "-");
         else
@@ -1001,7 +1061,7 @@ print_stat (char *pformat, size_t prefix_len, unsigned int m,
       break;
     case 'W':
       out_epoch_sec (pformat, prefix_len, statbuf,
-                     neg_to_zero (get_stat_birthtime (statbuf)));
+                     neg_to_zero (get_birthtime (fd, filename, statbuf)));
       break;
     case 'x':
       out_string (pformat, prefix_len, human_time (get_stat_atime (statbuf)));
@@ -1076,9 +1136,9 @@ print_esc_char (char c)
    calling PRINT_FUNC for each %-directive encountered.
    Return zero upon success, nonzero upon failure.  */
 static bool ATTRIBUTE_WARN_UNUSED_RESULT
-print_it (char const *format, char const *filename,
+print_it (char const *format, int fd, char const *filename,
           bool (*print_func) (char *, size_t, unsigned int,
-                              char const *, void const *),
+                              int, char const *, void const *),
           void const *data)
 {
   bool fail = false;
@@ -1127,7 +1187,8 @@ print_it (char const *format, char const *filename,
                 putchar ('%');
                 break;
               default:
-                fail |= print_func (dest, len + 1, fmt_code, filename, data);
+                fail |= print_func (dest, len + 1, fmt_code,
+                                    fd, filename, data);
                 break;
               }
             break;
@@ -1210,7 +1271,7 @@ do_statfs (char const *filename, char const *format)
       return false;
     }
 
-  bool fail = print_it (format, filename, print_statfs, &statfsbuf);
+  bool fail = print_it (format, -1, filename, print_statfs, &statfsbuf);
   return ! fail;
 }
 
@@ -1219,11 +1280,12 @@ static bool ATTRIBUTE_WARN_UNUSED_RESULT
 do_stat (char const *filename, char const *format,
          char const *format2)
 {
+  int fd = STREQ (filename, "-") ? 0 : -1;
   struct stat statbuf;
 
-  if (STREQ (filename, "-"))
+  if (0 <= fd)
     {
-      if (fstat (STDIN_FILENO, &statbuf) != 0)
+      if (fstat (fd, &statbuf) != 0)
         {
           error (0, errno, _("cannot stat standard input"));
           return false;
@@ -1243,7 +1305,7 @@ do_stat (char const *filename, char const *format,
   if (S_ISBLK (statbuf.st_mode) || S_ISCHR (statbuf.st_mode))
     format = format2;
 
-  bool fail = print_it (format, filename, print_stat, &statbuf);
+  bool fail = print_it (format, fd, filename, print_stat, &statbuf);
   return ! fail;
 }
 
@@ -1361,8 +1423,8 @@ Display file or file system status.\n\
   -c  --format=FORMAT   use the specified FORMAT instead of the default;\n\
                           output a newline after each use of FORMAT\n\
       --printf=FORMAT   like --format, but interpret backslash escapes,\n\
-                          and do not output a mandatory trailing newline.\n\
-                          If you want a newline, include \\n in FORMAT\n\
+                          and do not output a mandatory trailing newline;\n\
+                          if you want a newline, include \\n in FORMAT\n\
   -t, --terse           print the information in terse form\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
@@ -1393,8 +1455,8 @@ The valid format sequences for files (without --file-system):\n\
   %N   quoted file name with dereference if symbolic link\n\
   %o   optimal I/O transfer size hint\n\
   %s   total size, in bytes\n\
-  %t   major device type in hex\n\
-  %T   minor device type in hex\n\
+  %t   major device type in hex, for character/block device special files\n\
+  %T   minor device type in hex, for character/block device special files\n\
 "), stdout);
       fputs (_("\
   %u   user ID of owner\n\
@@ -1403,10 +1465,10 @@ The valid format sequences for files (without --file-system):\n\
   %W   time of file birth, seconds since Epoch; 0 if unknown\n\
   %x   time of last access, human-readable\n\
   %X   time of last access, seconds since Epoch\n\
-  %y   time of last modification, human-readable\n\
-  %Y   time of last modification, seconds since Epoch\n\
-  %z   time of last change, human-readable\n\
-  %Z   time of last change, seconds since Epoch\n\
+  %y   time of last data modification, human-readable\n\
+  %Y   time of last data modification, seconds since Epoch\n\
+  %z   time of last status change, human-readable\n\
+  %Z   time of last status change, seconds since Epoch\n\
 \n\
 "), stdout);
 
diff --git a/src/stdbuf.c b/src/stdbuf.c
index 38e9bee7..92ee2826 100644
--- a/src/stdbuf.c
+++ b/src/stdbuf.c
@@ -1,5 +1,5 @@
 /* stdbuf -- setup the standard streams for a command
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    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
@@ -187,7 +187,12 @@ static void
 set_LD_PRELOAD (void)
 {
   int ret;
-  char *old_libs = getenv ("LD_PRELOAD");
+#ifdef __APPLE__
+  char const *preload_env = "DYLD_INSERT_LIBRARIES";
+#else
+  char const *preload_env = "LD_PRELOAD";
+#endif
+  char *old_libs = getenv (preload_env);
   char *LD_PRELOAD;
 
   /* Note this would auto add the appropriate search path for "libstdbuf.so":
@@ -195,7 +200,17 @@ set_LD_PRELOAD (void)
      However we want the lookup done for the exec'd command not stdbuf.
 
      Since we don't link against libstdbuf.so add it to PKGLIBEXECDIR
-     rather than to LIBDIR.  */
+     rather than to LIBDIR.
+
+     Note we could add "" as the penultimate item in the following list
+     to enable searching for libstdbuf.so in the default system lib paths.
+     However that would not indicate an error if libstdbuf.so was not found.
+     Also while this could support auto selecting the right arch in a multilib
+     environment, what we really want is to auto select based on the arch of the
+     command being run, rather than that of stdbuf itself.  This is currently
+     not supported due to the unusual need for controlling the stdio buffering
+     of programs that are a different architecture to the default on the
+     system (and that of stdbuf itself).  */
   char const *const search_path[] = {
     program_path,
     PKGLIBEXECDIR,
@@ -229,9 +244,9 @@ set_LD_PRELOAD (void)
   /* FIXME: Do we need to support libstdbuf.dll, c:, '\' separators etc?  */
 
   if (old_libs)
-    ret = asprintf (&LD_PRELOAD, "LD_PRELOAD=%s:%s", old_libs, libstdbuf);
+    ret = asprintf (&LD_PRELOAD, "%s=%s:%s", preload_env, old_libs, libstdbuf);
   else
-    ret = asprintf (&LD_PRELOAD, "LD_PRELOAD=%s", libstdbuf);
+    ret = asprintf (&LD_PRELOAD, "%s=%s", preload_env, libstdbuf);
 
   if (ret < 0)
     xalloc_die ();
@@ -239,6 +254,10 @@ set_LD_PRELOAD (void)
   free (libstdbuf);
 
   ret = putenv (LD_PRELOAD);
+#ifdef __APPLE__
+  if (ret == 0)
+    ret = putenv ("DYLD_FORCE_FLAT_NAMESPACE=y");
+#endif
 
   if (ret != 0)
     {
@@ -248,12 +267,14 @@ set_LD_PRELOAD (void)
     }
 }
 
-/* Populate environ with _STDBUF_I=$MODE _STDBUF_O=$MODE _STDBUF_E=$MODE  */
+/* Populate environ with _STDBUF_I=$MODE _STDBUF_O=$MODE _STDBUF_E=$MODE.
+   Return TRUE if any environment variables set.   */
 
-static void
+static bool
 set_libstdbuf_options (void)
 {
-  unsigned int i;
+  bool env_set = false;
+  size_t i;
 
   for (i = 0; i < ARRAY_CARDINALITY (stdbuf); i++)
     {
@@ -278,8 +299,12 @@ set_libstdbuf_options (void)
                      _("failed to update the environment with %s"),
                      quote (var));
             }
+
+          env_set = true;
         }
     }
+
+  return env_set;
 }
 
 int
@@ -346,9 +371,11 @@ main (int argc, char **argv)
       usage (EXIT_CANCELED);
     }
 
-  /* FIXME: Should we mandate at least one option?  */
-
-  set_libstdbuf_options ();
+  if (! set_libstdbuf_options ())
+    {
+      error (0, 0, _("you must specify a buffering mode option"));
+      usage (EXIT_CANCELED);
+    }
 
   /* Try to preload libstdbuf first from the same path as
      stdbuf is running from.  */
diff --git a/src/stty.c b/src/stty.c
index ee891a59..3c485786 100644
--- a/src/stty.c
+++ b/src/stty.c
@@ -1,5 +1,5 @@
 /* stty -- change and print terminal line settings
-   Copyright (C) 1990-2013 Free Software Foundation, Inc.
+   Copyright (C) 1990-2014 Free Software Foundation, Inc.
 
    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
@@ -205,6 +205,9 @@ static struct mode_info const mode_info[] =
 {
   {"parenb", control, REV, PARENB, 0},
   {"parodd", control, REV, PARODD, 0},
+#ifdef CMSPAR
+  {"cmspar", control, REV, CMSPAR, 0},
+#endif
   {"cs5", control, 0, CS5, CSIZE},
   {"cs6", control, 0, CS6, CSIZE},
   {"cs7", control, 0, CS7, CSIZE},
@@ -593,6 +596,7 @@ Control settings:\n\
    [-]hupcl      same as [-]hup\n\
    [-]parenb     generate parity bit in output and expect parity bit in input\n\
    [-]parodd     set odd parity (or even parity with '-')\n\
+ * [-]cmspar     use \"stick\" (mark/space) parity\n\
 "), stdout);
       fputs (_("\
 \n\
@@ -630,7 +634,7 @@ Output settings:\n\
 "), stdout);
       fputs (_("\
  * [-]ocrnl      translate carriage return to newline\n\
- * [-]ofdel      use delete characters for fill instead of null characters\n\
+ * [-]ofdel      use delete characters for fill instead of NUL characters\n\
  * [-]ofill      use fill (padding) characters instead of timing for delays\n\
  * [-]olcuc      translate lowercase characters to uppercase\n\
  * [-]onlcr      translate newline to carriage return-newline\n\
@@ -745,7 +749,7 @@ main (int argc, char **argv)
   int argi = 0;
   int opti = 1;
   bool require_set_attr;
-  bool speed_was_set ATTRIBUTE_UNUSED;
+  bool speed_was_set _GL_UNUSED;
   bool verbose_output;
   bool recoverable_output;
   int k;
diff --git a/src/sum.c b/src/sum.c
index 9ebcc424..442b7ad8 100644
--- a/src/sum.c
+++ b/src/sum.c
@@ -1,5 +1,5 @@
 /* sum -- checksum and count the blocks in a file
-   Copyright (C) 1986-2013 Free Software Foundation, Inc.
+   Copyright (C) 1986-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/sync.c b/src/sync.c
index 03b8e530..8c890432 100644
--- a/src/sync.c
+++ b/src/sync.c
@@ -1,5 +1,5 @@
 /* sync - update the super block
-   Copyright (C) 1994-2013 Free Software Foundation, Inc.
+   Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/system.h b/src/system.h
index 1677999e..162446c1 100644
--- a/src/system.h
+++ b/src/system.h
@@ -1,5 +1,5 @@
 /* system-dependent definitions for coreutils
-   Copyright (C) 1989-2013 Free Software Foundation, Inc.
+   Copyright (C) 1989-2014 Free Software Foundation, Inc.
 
    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
@@ -330,7 +330,7 @@ enum
 #define GETOPT_VERSION_OPTION_DECL \
   "version", no_argument, NULL, GETOPT_VERSION_CHAR
 #define GETOPT_SELINUX_CONTEXT_OPTION_DECL \
-  "context", required_argument, NULL, 'Z'
+  "context", optional_argument, NULL, 'Z'
 
 #define case_GETOPT_HELP_CHAR			\
   case GETOPT_HELP_CHAR:			\
@@ -425,10 +425,6 @@ enum
 # define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
 #endif
 
-#ifndef ATTRIBUTE_UNUSED
-# define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
-#endif
-
 /* The warn_unused_result attribute appeared first in gcc-3.4.0 */
 #undef ATTRIBUTE_WARN_UNUSED_RESULT
 #if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 4)
@@ -500,21 +496,24 @@ ptr_align (void const *ptr, size_t alignment)
    Note the word after the buffer must be non NUL. */
 
 static inline bool _GL_ATTRIBUTE_PURE
-is_nul (const char *buf, size_t bufsize)
+is_nul (void const *buf, size_t bufsize)
 {
   typedef uintptr_t word;
+  void const *vp;
+  char const *cbuf = buf;
+  word const *wp = buf;
 
   /* Find first nonzero *word*, or the word with the sentinel.  */
-  word *wp = (word *) buf;
   while (*wp++ == 0)
     continue;
 
   /* Find the first nonzero *byte*, or the sentinel.  */
-  char *cp = (char *) (wp - 1);
+  vp = wp - 1;
+  char const *cp = vp;
   while (*cp++ == 0)
     continue;
 
-  return cp > buf + bufsize;
+  return cbuf + bufsize < cp;
 }
 
 /* If 10*Accum + Digit_val is larger than the maximum value for Type,
@@ -550,8 +549,8 @@ static inline void
 emit_size_note (void)
 {
   fputs (_("\n\
-SIZE is an integer and optional unit (example: 10M is 10*1024*1024).  Units\n\
-are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (powers of 1000).\n\
+The SIZE argument is an integer and optional unit (example: 10K is 10*1024).\n\
+Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n\
 "), stdout);
 }
 
@@ -568,11 +567,7 @@ Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n\
 static inline void
 emit_ancillary_info (void)
 {
-  printf (_("\nReport %s bugs to %s\n"), last_component (program_name),
-          PACKAGE_BUGREPORT);
-  printf (_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
-  fputs (_("General help using GNU software: <http://www.gnu.org/gethelp/>\n"),
-         stdout);
+  printf (_("\n%s online help: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
   /* Don't output this redundant message for English locales.
      Note we still output for 'C' so that it gets included in the man page.  */
   const char *lc_messages = setlocale (LC_MESSAGES, NULL);
@@ -622,6 +617,16 @@ usable_st_size (struct stat const *sb)
 
 void usage (int status) ATTRIBUTE_NORETURN;
 
+/* Like error(0, 0, ...), but without an implicit newline.
+   Also a noop unless the global DEV_DEBUG is set.  */
+#define devmsg(...)			\
+  do					\
+    {					\
+      if (dev_debug)			\
+        fprintf (stderr, __VA_ARGS__);	\
+    }					\
+  while (0)
+
 #define emit_cycle_warning(file_name)	\
   do					\
     {					\
@@ -652,3 +657,9 @@ stzncpy (char *restrict dest, char const *restrict src, size_t len)
 #ifndef ARRAY_CARDINALITY
 # define ARRAY_CARDINALITY(Array) (sizeof (Array) / sizeof *(Array))
 #endif
+
+/* Avoid const warnings by casting to more portable type.
+   This is to cater for the incorrect const function declarations
+   in selinux.h before libselinux-2.3 (May 2014).
+   When version >= 2.3 is ubiquitous remove this function.  */
+static inline char * se_const (char const * sctx) { return (char *) sctx; }
diff --git a/src/tac-pipe.c b/src/tac-pipe.c
index f29db43c..8e634f3e 100644
--- a/src/tac-pipe.c
+++ b/src/tac-pipe.c
@@ -1,6 +1,6 @@
 /* tac from a pipe.
 
-   Copyright (C) 1997-2013 Free Software Foundation, Inc.
+   Copyright (C) 1997-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/tac.c b/src/tac.c
index c6a8cf69..c76afc77 100644
--- a/src/tac.c
+++ b/src/tac.c
@@ -1,5 +1,5 @@
 /* tac - concatenate and print files in reverse
-   Copyright (C) 1988-2013 Free Software Foundation, Inc.
+   Copyright (C) 1988-2014 Free Software Foundation, Inc.
 
    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
@@ -409,7 +409,7 @@ record_or_unlink_tempfile (char const *fn, FILE *fp)
 #else
 
 static void
-record_or_unlink_tempfile (char const *fn, FILE *fp ATTRIBUTE_UNUSED)
+record_or_unlink_tempfile (char const *fn, FILE *fp _GL_UNUSED)
 {
   unlink (fn);
 }
diff --git a/src/tail.c b/src/tail.c
index ca851ee6..5ff738df 100644
--- a/src/tail.c
+++ b/src/tail.c
@@ -1,5 +1,5 @@
 /* tail -- output the last part of file(s)
-   Copyright (C) 1989-2013 Free Software Foundation, Inc.
+   Copyright (C) 1989-2014 Free Software Foundation, Inc.
 
    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
@@ -268,25 +268,24 @@ With no FILE, or when FILE is -, read standard input.\n\
       emit_mandatory_arg_note ();
 
      fputs (_("\
-  -c, --bytes=K            output the last K bytes; alternatively, use -c +K\n\
-                           to output bytes starting with the Kth of each file\n\
+  -c, --bytes=K            output the last K bytes; or use -c +K to output\n\
+                             bytes starting with the Kth of each file\n\
 "), stdout);
      fputs (_("\
   -f, --follow[={name|descriptor}]\n\
                            output appended data as the file grows;\n\
-                           -f, --follow, and --follow=descriptor are\n\
-                           equivalent\n\
+                             an absent option argument means 'descriptor'\n\
   -F                       same as --follow=name --retry\n\
 "), stdout);
      printf (_("\
   -n, --lines=K            output the last K lines, instead of the last %d;\n\
-                           or use -n +K to output lines starting with the Kth\n\
+                             or use -n +K to output starting with the Kth\n\
       --max-unchanged-stats=N\n\
                            with --follow=name, reopen a FILE which has not\n\
-                           changed size after N (default %d) iterations\n\
-                           to see if it has been unlinked or renamed\n\
-                           (this is the usual case of rotated log files).\n\
-                           With inotify, this option is rarely useful.\n\
+                             changed size after N (default %d) iterations\n\
+                             to see if it has been unlinked or renamed\n\
+                             (this is the usual case of rotated log files);\n\
+                             with inotify, this option is rarely useful\n\
 "),
              DEFAULT_N_LINES,
              DEFAULT_MAX_N_UNCHANGED_STATS_BETWEEN_OPENS
@@ -294,15 +293,13 @@ With no FILE, or when FILE is -, read standard input.\n\
      fputs (_("\
       --pid=PID            with -f, terminate after process ID, PID dies\n\
   -q, --quiet, --silent    never output headers giving file names\n\
-      --retry              keep trying to open a file even when it is or\n\
-                             becomes inaccessible; useful when following by\n\
-                             name, i.e., with --follow=name\n\
+      --retry              keep trying to open a file if it is inaccessible\n\
 "), stdout);
      fputs (_("\
   -s, --sleep-interval=N   with -f, sleep for approximately N seconds\n\
-                             (default 1.0) between iterations.\n\
-                             With inotify and --pid=P, check process P at\n\
-                             least once every N seconds.\n\
+                             (default 1.0) between iterations;\n\
+                             with inotify and --pid=P, check process P at\n\
+                             least once every N seconds\n\
   -v, --verbose            always output headers giving file names\n\
 "), stdout);
      fputs (HELP_OPTION_DESCRIPTION, stdout);
@@ -342,13 +339,6 @@ pretty_name (struct File_spec const *f)
   return (STREQ (f->name, "-") ? _("standard input") : f->name);
 }
 
-static void
-xwrite_stdout (char const *buffer, size_t n_bytes)
-{
-  if (n_bytes > 0 && fwrite (buffer, 1, n_bytes, stdout) == 0)
-    error (EXIT_FAILURE, errno, _("write error"));
-}
-
 /* Record a file F with descriptor FD, size SIZE, status ST, and
    blocking status BLOCKING.  */
 
@@ -388,6 +378,20 @@ write_header (const char *pretty_filename)
   first_file = false;
 }
 
+/* Write N_BYTES from BUFFER to stdout.
+   Exit immediately on error with a single diagnostic.  */
+
+static void
+xwrite_stdout (char const *buffer, size_t n_bytes)
+{
+  if (n_bytes > 0 && fwrite (buffer, 1, n_bytes, stdout) < n_bytes)
+    {
+      clearerr (stdout); /* To avoid redundant close_stdout diagnostic.  */
+      error (EXIT_FAILURE, errno, _("error writing %s"),
+             quote ("standard output"));
+    }
+}
+
 /* Read and output N_BYTES of file PRETTY_FILENAME starting at the current
    position in FD.  If N_BYTES is COPY_TO_EOF, then copy until end of file.
    If N_BYTES is COPY_A_BUFFER, then copy at most one buffer's worth.
@@ -948,7 +952,20 @@ recheck (struct File_spec *f, bool blocking)
      then mark the file as not tailable.  */
   f->tailable = !(reopen_inaccessible_files && fd == -1);
 
-  if (fd == -1 || fstat (fd, &new_stats) < 0)
+  if (! disable_inotify && ! lstat (f->name, &new_stats)
+      && S_ISLNK (new_stats.st_mode))
+    {
+      /* Diagnose the edge case where a regular file is changed
+         to a symlink.  We avoid inotify with symlinks since
+         it's awkward to match between symlink name and target.  */
+      ok = false;
+      f->errnum = -1;
+      f->ignore = true;
+
+      error (0, 0, _("%s has been replaced with a symbolic link. "
+                     "giving up on this name"), quote (pretty_name (f)));
+    }
+  else if (fd == -1 || fstat (fd, &new_stats) < 0)
     {
       ok = false;
       f->errnum = errno;
@@ -1054,16 +1071,32 @@ recheck (struct File_spec *f, bool blocking)
 }
 
 /* Return true if any of the N_FILES files in F are live, i.e., have
-   open file descriptors.  */
+   open file descriptors, or should be checked again (see --retry).
+   When following descriptors, checking should only continue when any
+   of the files is not yet ignored.  */
 
 static bool
 any_live_files (const struct File_spec *f, size_t n_files)
 {
   size_t i;
 
+  if (reopen_inaccessible_files && follow_mode == Follow_name)
+    return true;  /* continue following for -F option */
+
   for (i = 0; i < n_files; i++)
-    if (0 <= f[i].fd)
-      return true;
+    {
+      if (0 <= f[i].fd)
+        {
+          return true;
+        }
+      else
+        {
+          if (reopen_inaccessible_files && follow_mode == Follow_descriptor)
+            if (! f[i].ignore)
+              return true;
+        }
+    }
+
   return false;
 }
 
@@ -1191,7 +1224,7 @@ tail_forever (struct File_spec *f, size_t n_files, double sleep_interval)
           f[i].size += bytes_read;
         }
 
-      if (! any_live_files (f, n_files) && ! reopen_inaccessible_files)
+      if (! any_live_files (f, n_files))
         {
           error (0, 0, _("no files remaining"));
           break;
@@ -1238,6 +1271,23 @@ any_remote_file (const struct File_spec *f, size_t n_files)
   return false;
 }
 
+/* Return true if any of the N_FILES files in F is a symlink.
+   Note we don't worry about the edge case where "-" exists,
+   since that will have the same consequences for inotify,
+   which is the only context this function is currently used.  */
+
+static bool
+any_symlinks (const struct File_spec *f, size_t n_files)
+{
+  size_t i;
+
+  struct stat st;
+  for (i = 0; i < n_files; i++)
+    if (lstat (f[i].name, &st) == 0 && S_ISLNK (st.st_mode))
+      return true;
+  return false;
+}
+
 /* Return true if any of the N_FILES files in F represents
    stdin and is tailable.  */
 
@@ -1272,7 +1322,12 @@ static void
 check_fspec (struct File_spec *fspec, int wd, int *prev_wd)
 {
   struct stat stats;
-  char const *name = pretty_name (fspec);
+  char const *name;
+
+  if (fspec->fd == -1)
+    return;
+
+  name = pretty_name (fspec);
 
   if (fstat (fspec->fd, &stats) != 0)
     {
@@ -1432,6 +1487,7 @@ tail_forever_inotify (int wd, struct File_spec *f, size_t n_files,
     {
       struct File_spec *fspec;
       struct inotify_event *ev;
+      void *void_ev;
 
       /* When following by name without --retry, and the last file has
          been unlinked or renamed-away, diagnose it and return.  */
@@ -1493,7 +1549,8 @@ tail_forever_inotify (int wd, struct File_spec *f, size_t n_files,
             error (EXIT_FAILURE, errno, _("error reading inotify event"));
         }
 
-      ev = (struct inotify_event *) (evbuf + evbuf_off);
+      void_ev = evbuf + evbuf_off;
+      ev = void_ev;
       evbuf_off += sizeof (*ev) + ev->len;
 
       if (ev->len) /* event on ev->name in watched directory  */
@@ -1516,6 +1573,7 @@ tail_forever_inotify (int wd, struct File_spec *f, size_t n_files,
           int new_wd = inotify_add_watch (wd, f[j].name, inotify_wd_mask);
           if (new_wd < 0)
             {
+              /* Can get ENOENT for a dangling symlink for example.  */
               error (0, errno, _("cannot watch %s"), quote (f[j].name));
               continue;
             }
@@ -2030,8 +2088,17 @@ parse_options (int argc, char **argv,
         }
     }
 
-  if (reopen_inaccessible_files && follow_mode != Follow_name)
-    error (0, 0, _("warning: --retry is useful mainly when following by name"));
+  if (reopen_inaccessible_files)
+    {
+      if (!forever)
+        {
+          reopen_inaccessible_files = false;
+          error (0, 0, _("warning: --retry ignored; --retry is useful"
+                         " only when following"));
+        }
+      else if (follow_mode == Follow_descriptor)
+        error (0, 0, _("warning: --retry only effective for the initial open"));
+    }
 
   if (pid && !forever)
     error (0, 0,
@@ -2149,6 +2216,10 @@ main (int argc, char **argv)
                      " indefinitely is ineffective"));
   }
 
+  /* Don't read anything if we'll never output anything.  */
+  if (! n_units && ! forever && ! from_start)
+    exit (EXIT_SUCCESS);
+
   F = xnmalloc (n_files, sizeof *F);
   for (i = 0; i < n_files; i++)
     F[i].name = file[i];
@@ -2178,6 +2249,15 @@ main (int argc, char **argv)
          in this case because it would miss any updates to the file
          that were not initiated from the local system.
 
+         any_symlinks() checks if the user has specified any symbolic links.
+         inotify is not used in this case because it returns updated _targets_
+         which would not match the specified names.  If we tried to always
+         use the target names, then we would miss changes to the symlink itself.
+
+         ok is false when one of the files specified could not be opened for
+         reading.  In this case and when following by descriptor,
+         tail_forever_inotify() cannot be used (in its current implementation).
+
          FIXME: inotify doesn't give any notification when a new
          (remote) file or directory is mounted on top a watched file.
          When follow_mode == Follow_name we would ideally like to detect that.
@@ -2189,7 +2269,9 @@ main (int argc, char **argv)
          is recreated, then we don't recheck any new file when
          follow_mode == Follow_name  */
       if (!disable_inotify && (tailable_stdin (F, n_files)
-                               || any_remote_file (F, n_files)))
+                               || any_remote_file (F, n_files)
+                               || any_symlinks (F, n_files)
+                               || (!ok && follow_mode == Follow_descriptor)))
         disable_inotify = true;
 
       if (!disable_inotify)
diff --git a/src/tee.c b/src/tee.c
index e5165de1..be365604 100644
--- a/src/tee.c
+++ b/src/tee.c
@@ -1,5 +1,5 @@
 /* tee - read from standard input and write to standard output and files.
-   Copyright (C) 1985-2013 Free Software Foundation, Inc.
+   Copyright (C) 1985-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/test.c b/src/test.c
index 20382097..75968798 100644
--- a/src/test.c
+++ b/src/test.c
@@ -2,7 +2,7 @@
 
 /* Modified to run with the GNU shell by bfox. */
 
-/* Copyright (C) 1987-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1987-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/timeout.c b/src/timeout.c
index 2ffd2b11..68baa23c 100644
--- a/src/timeout.c
+++ b/src/timeout.c
@@ -1,5 +1,5 @@
 /* timeout -- run a command with bounded time
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
@@ -118,7 +118,7 @@ unblock_signal (int sig)
    as that's more useful in practice than reporting an error.
    '0' means don't timeout.  */
 static void
-settimeout (double duration)
+settimeout (double duration, bool warn)
 {
 
   /* We configure timers below so that SIGALRM is sent on expiry.
@@ -142,11 +142,12 @@ settimeout (double duration)
         return;
       else
         {
-          error (0, errno, _("warning: timer_settime"));
+          if (warn)
+            error (0, errno, _("warning: timer_settime"));
           timer_delete (timerid);
         }
     }
-  else if (errno != ENOSYS)
+  else if (warn && errno != ENOSYS)
     error (0, errno, _("warning: timer_create"));
 #endif
 
@@ -190,10 +191,12 @@ cleanup (int sig)
     {
       if (kill_after)
         {
+          int saved_errno = errno; /* settimeout may reset.  */
           /* Start a new timeout after which we'll send SIGKILL.  */
           term_signal = SIGKILL;
-          settimeout (kill_after);
+          settimeout (kill_after, false);
           kill_after = 0; /* Don't let later signals reset kill alarm.  */
+          errno = saved_errno;
         }
 
       /* Send the signal directly to the monitored child,
@@ -235,18 +238,18 @@ Start COMMAND, and kill it if still running after DURATION.\n\
       fputs (_("\
       --preserve-status\n\
                  exit with the same status as COMMAND, even when the\n\
-                 command times out\n\
+                   command times out\n\
       --foreground\n\
-                 When not running timeout directly from a shell prompt,\n\
-                 allow COMMAND to read from the TTY and receive TTY signals.\n\
-                 In this mode, children of COMMAND will not be timed out.\n\
+                 when not running timeout directly from a shell prompt,\n\
+                   allow COMMAND to read from the TTY and get TTY signals;\n\
+                   in this mode, children of COMMAND will not be timed out\n\
   -k, --kill-after=DURATION\n\
                  also send a KILL signal if COMMAND is still running\n\
-                 this long after the initial signal was sent.\n\
+                   this long after the initial signal was sent\n\
   -s, --signal=SIGNAL\n\
-                 specify the signal to be sent on timeout.\n\
-                 SIGNAL may be a name like 'HUP' or a number.\n\
-                 See 'kill -l' for a list of signals\n"), stdout);
+                 specify the signal to be sent on timeout;\n\
+                   SIGNAL may be a name like 'HUP' or a number;\n\
+                   see 'kill -l' for a list of signals\n"), stdout);
 
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
@@ -437,7 +440,7 @@ main (int argc, char **argv)
   if (monitored_pid == -1)
     {
       error (0, errno, _("fork system call failed"));
-      return EXIT_CANCELED;
+      exit (EXIT_CANCELED);
     }
   else if (monitored_pid == 0)
     {                           /* child */
@@ -452,14 +455,14 @@ main (int argc, char **argv)
       /* exit like sh, env, nohup, ...  */
       exit_status = (errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE);
       error (0, errno, _("failed to run command %s"), quote (argv[0]));
-      return exit_status;
+      exit (exit_status);
     }
   else
     {
       pid_t wait_result;
       int status;
 
-      settimeout (timeout);
+      settimeout (timeout, true);
 
       while ((wait_result = waitpid (monitored_pid, &status, 0)) < 0
              && errno == EINTR)
@@ -497,8 +500,8 @@ main (int argc, char **argv)
         }
 
       if (timed_out && !preserve_status)
-        return EXIT_TIMEDOUT;
+        exit (EXIT_TIMEDOUT);
       else
-        return status;
+        exit (status);
     }
 }
diff --git a/src/touch.c b/src/touch.c
index 3a3ffbe0..1ba24269 100644
--- a/src/touch.c
+++ b/src/touch.c
@@ -1,5 +1,5 @@
 /* touch -- change modification and access times of files
-   Copyright (C) 1987-2013 Free Software Foundation, Inc.
+   Copyright (C) 1987-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/tr.c b/src/tr.c
index d45e3dff..06858f91 100644
--- a/src/tr.c
+++ b/src/tr.c
@@ -1,5 +1,5 @@
 /* tr -- a filter to translate characters
-   Copyright (C) 1991-2013 Free Software Foundation, Inc.
+   Copyright (C) 1991-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/true.c b/src/true.c
index 804141c0..8a1c4f92 100644
--- a/src/true.c
+++ b/src/true.c
@@ -1,5 +1,5 @@
 /* Exit with a status code indicating success.
-   Copyright (C) 1999-2013 Free Software Foundation, Inc.
+   Copyright (C) 1999-2014 Free Software Foundation, Inc.
 
    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
@@ -64,6 +64,8 @@ main (int argc, char **argv)
       bindtextdomain (PACKAGE, LOCALEDIR);
       textdomain (PACKAGE);
 
+      /* Note true(1) will return EXIT_FAILURE in the
+         edge case where writes fail with GNU specific options.  */
       atexit (close_stdout);
 
       if (STREQ (argv[1], "--help"))
diff --git a/src/truncate.c b/src/truncate.c
index 8349cb61..f3125092 100644
--- a/src/truncate.c
+++ b/src/truncate.c
@@ -1,5 +1,5 @@
 /* truncate -- truncate or extend the length of files.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    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
@@ -114,7 +114,7 @@ reads as zero bytes.\n\
 "), stdout);
       fputs (_("\
   -r, --reference=RFILE  base size on RFILE\n\
-  -s, --size=SIZE        set or adjust the file size by SIZE\n"), stdout);
+  -s, --size=SIZE        set or adjust the file size by SIZE bytes\n"), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
       emit_size_note ();
@@ -420,5 +420,5 @@ main (int argc, char **argv)
         }
     }
 
-  return errors ? EXIT_FAILURE : EXIT_SUCCESS;
+  exit (errors ? EXIT_FAILURE : EXIT_SUCCESS);
 }
diff --git a/src/tsort.c b/src/tsort.c
index d22f1f05..661c7173 100644
--- a/src/tsort.c
+++ b/src/tsort.c
@@ -1,5 +1,5 @@
 /* tsort - topological sort.
-   Copyright (C) 1998-2013 Free Software Foundation, Inc.
+   Copyright (C) 1998-2014 Free Software Foundation, Inc.
 
    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
@@ -280,7 +280,7 @@ record_relation (struct item *j, struct item *k)
 }
 
 static bool
-count_items (struct item *unused ATTRIBUTE_UNUSED)
+count_items (struct item *unused _GL_UNUSED)
 {
   n_strings++;
   return false;
@@ -347,8 +347,7 @@ detect_loop (struct item *k)
                         {
                           struct item *tmp = loop->qlink;
 
-                          fprintf (stderr, "%s: %s\n", program_name,
-                                   loop->str);
+                          error (0, 0, "%s", loop->str);
 
                           /* Until we encounter K again.  */
                           if (loop == k)
diff --git a/src/tty.c b/src/tty.c
index 312bf422..16301e12 100644
--- a/src/tty.c
+++ b/src/tty.c
@@ -1,5 +1,5 @@
 /* tty -- print the name of the terminal connected to standard input
-   Copyright (C) 1990-2013 Free Software Foundation, Inc.
+   Copyright (C) 1990-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/uname.c b/src/uname.c
index cfcd0a33..e3bed488 100644
--- a/src/uname.c
+++ b/src/uname.c
@@ -1,6 +1,6 @@
 /* uname -- print system information
 
-   Copyright (C) 1989-2013 Free Software Foundation, Inc.
+   Copyright (C) 1989-2014 Free Software Foundation, Inc.
 
    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
@@ -321,9 +321,9 @@ main (int argc, char **argv)
           if (element == unknown)
             {
               cpu_type_t cputype;
-              size_t s = sizeof cputype;
+              size_t cs = sizeof cputype;
               NXArchInfo const *ai;
-              if (sysctlbyname ("hw.cputype", &cputype, &s, NULL, 0) == 0
+              if (sysctlbyname ("hw.cputype", &cputype, &cs, NULL, 0) == 0
                   && (ai = NXGetArchInfoFromCpuType (cputype,
                                                      CPU_SUBTYPE_MULTIPLE))
                   != NULL)
diff --git a/src/unexpand.c b/src/unexpand.c
index 1803cd57..505e223c 100644
--- a/src/unexpand.c
+++ b/src/unexpand.c
@@ -1,5 +1,5 @@
 /* unexpand - convert blanks to tabs
-   Copyright (C) 1989-2013 Free Software Foundation, Inc.
+   Copyright (C) 1989-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/uniq.c b/src/uniq.c
index 5efdad7d..54200ff4 100644
--- a/src/uniq.c
+++ b/src/uniq.c
@@ -1,5 +1,5 @@
 /* uniq -- remove duplicate lines from a sorted file
-   Copyright (C) 1986-2013 Free Software Foundation, Inc.
+   Copyright (C) 1986-2014 Free Software Foundation, Inc.
 
    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
@@ -108,11 +108,47 @@ static enum delimit_method const delimit_method_map[] =
 /* Select whether/how to delimit groups of duplicate lines.  */
 static enum delimit_method delimit_groups;
 
+enum grouping_method
+{
+  /* No grouping, when "--group" isn't used */
+  GM_NONE,
+
+  /* Delimiter preceges all groups.  --group=prepend */
+  GM_PREPEND,
+
+  /* Delimiter follows all groups.   --group=append */
+  GM_APPEND,
+
+  /* Delimiter between groups.    --group[=separate] */
+  GM_SEPARATE,
+
+  /* Delimiter before and after each group. --group=both */
+  GM_BOTH
+};
+
+static char const *const grouping_method_string[] =
+{
+  "prepend", "append", "separate", "both", NULL
+};
+
+static enum grouping_method const grouping_method_map[] =
+{
+  GM_PREPEND, GM_APPEND, GM_SEPARATE, GM_BOTH
+};
+
+static enum grouping_method grouping = GM_NONE;
+
+enum
+{
+  GROUP_OPTION = CHAR_MAX + 1
+};
+
 static struct option const longopts[] =
 {
   {"count", no_argument, NULL, 'c'},
   {"repeated", no_argument, NULL, 'd'},
   {"all-repeated", optional_argument, NULL, 'D'},
+  {"group", optional_argument, NULL, GROUP_OPTION},
   {"ignore-case", no_argument, NULL, 'i'},
   {"unique", no_argument, NULL, 'u'},
   {"skip-fields", required_argument, NULL, 'f'},
@@ -146,17 +182,27 @@ With no options, matching lines are merged to the first occurrence.\n\
 
      fputs (_("\
   -c, --count           prefix lines by the number of occurrences\n\
-  -d, --repeated        only print duplicate lines\n\
+  -d, --repeated        only print duplicate lines, one for each group\n\
+"), stdout);
+     fputs (_("\
+  -D, --all-repeated[=METHOD]  print all duplicate lines\n\
+                          groups can be delimited with an empty line\n\
+                          METHOD={none(default),prepend,separate}\n\
 "), stdout);
      fputs (_("\
-  -D, --all-repeated[=delimit-method]  print all duplicate lines\n\
-                        delimit-method={none(default),prepend,separate}\n\
-                        Delimiting is done with blank lines\n\
   -f, --skip-fields=N   avoid comparing the first N fields\n\
+"), stdout);
+     fputs (_("\
+      --group[=METHOD]  show all items, separating groups with an empty line\n\
+                          METHOD={separate(default),prepend,append,both}\n\
+"), stdout);
+     fputs (_("\
   -i, --ignore-case     ignore differences in case when comparing\n\
   -s, --skip-chars=N    avoid comparing the first N characters\n\
   -u, --unique          only print unique lines\n\
-  -z, --zero-terminated  end lines with 0 byte, not newline\n\
+"), stdout);
+      fputs (_("\
+  -z, --zero-terminated     line delimiter is NUL, not newline\n\
 "), stdout);
      fputs (_("\
   -w, --check-chars=N   compare no more than N characters in lines\n\
@@ -293,27 +339,48 @@ check_file (const char *infile, const char *outfile, char delimiter)
   initbuffer (prevline);
 
   /* The duplication in the following 'if' and 'else' blocks is an
-     optimization to distinguish the common case (in which none of
-     the following options has been specified: --count, -repeated,
-     --all-repeated, --unique) from the others.  In the common case,
-     this optimization lets uniq output each different line right away,
-     without waiting to see if the next one is different.  */
+     optimization to distinguish between when we can print input
+     lines immediately (1. & 2.) or not.
+
+     1. --group => all input lines are printed.
+        checking for unique/duplicated lines is used only for printing
+        group separators.
 
+     2. The default case in which none of these options has been specified:
+          --count, --repeated,  --all-repeated, --unique
+        In the default case, this optimization lets uniq output each different
+        line right away, without waiting to see if the next one is different.
+
+     3. All other cases.
+  */
   if (output_unique && output_first_repeated && countmode == count_none)
     {
       char *prevfield IF_LINT ( = NULL);
       size_t prevlen IF_LINT ( = 0);
+      bool first_group_printed = false;
 
       while (!feof (stdin))
         {
           char *thisfield;
           size_t thislen;
+          bool new_group;
+
           if (readlinebuffer_delim (thisline, stdin, delimiter) == 0)
             break;
+
           thisfield = find_field (thisline);
           thislen = thisline->length - 1 - (thisfield - thisline->buffer);
-          if (prevline->length == 0
-              || different (thisfield, prevfield, thislen, prevlen))
+
+          new_group = (prevline->length == 0
+                       || different (thisfield, prevfield, thislen, prevlen));
+
+          if (new_group && grouping != GM_NONE
+              && (grouping == GM_PREPEND || grouping == GM_BOTH
+                  || (first_group_printed && (grouping == GM_APPEND
+                                              || grouping == GM_SEPARATE))))
+            putchar (delimiter);
+
+          if (new_group || grouping != GM_NONE)
             {
               fwrite (thisline->buffer, sizeof (char),
                       thisline->length, stdout);
@@ -321,8 +388,11 @@ check_file (const char *infile, const char *outfile, char delimiter)
               SWAP_LINES (prevline, thisline);
               prevfield = thisfield;
               prevlen = thislen;
+              first_group_printed = true;
             }
         }
+      if ((grouping == GM_BOTH || grouping == GM_APPEND) && first_group_printed)
+        putchar (delimiter);
     }
   else
     {
@@ -415,6 +485,7 @@ main (int argc, char **argv)
   int nfiles = 0;
   char const *file[2];
   char delimiter = '\n';	/* change with --zero-terminated, -z */
+  bool output_option_used = false;   /* if true, one of -u/-d/-D/-c was used */
 
   file[0] = file[1] = "-";
   initialize_main (&argc, &argv);
@@ -498,10 +569,12 @@ main (int argc, char **argv)
 
         case 'c':
           countmode = count_occurrences;
+          output_option_used = true;
           break;
 
         case 'd':
           output_unique = false;
+          output_option_used = true;
           break;
 
         case 'D':
@@ -513,6 +586,16 @@ main (int argc, char **argv)
             delimit_groups = XARGMATCH ("--all-repeated", optarg,
                                         delimit_method_string,
                                         delimit_method_map);
+          output_option_used = true;
+          break;
+
+        case GROUP_OPTION:
+          if (optarg == NULL)
+            grouping = GM_SEPARATE;
+          else
+            grouping = XARGMATCH ("--group", optarg,
+                                  grouping_method_string,
+                                  grouping_method_map);
           break;
 
         case 'f':
@@ -532,6 +615,7 @@ main (int argc, char **argv)
 
         case 'u':
           output_first_repeated = false;
+          output_option_used = true;
           break;
 
         case 'w':
@@ -552,6 +636,23 @@ main (int argc, char **argv)
         }
     }
 
+  /* Note we could allow --group with -D at least, and that would
+     avoid the need to specify a grouping method to --all-repeated.
+     It was thought best to avoid deprecating those parameters though
+     and keep --group separate to other options.  */
+  if (grouping != GM_NONE && output_option_used)
+    {
+      error (0, 0, _("--group is mutually exclusive with -c/-d/-D/-u"));
+      usage (EXIT_FAILURE);
+    }
+
+  if (grouping != GM_NONE && countmode != count_none)
+    {
+      error (0, 0,
+           _("grouping and printing repeat counts is meaningless"));
+      usage (EXIT_FAILURE);
+    }
+
   if (countmode == count_occurrences && output_later_repeated)
     {
       error (0, 0,
diff --git a/src/unlink.c b/src/unlink.c
index e822fd69..260a5301 100644
--- a/src/unlink.c
+++ b/src/unlink.c
@@ -1,5 +1,5 @@
 /* unlink utility for GNU.
-   Copyright (C) 2001-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/uptime.c b/src/uptime.c
index 8e8f2ca6..4ab914f3 100644
--- a/src/uptime.c
+++ b/src/uptime.c
@@ -1,5 +1,5 @@
 /* GNU's uptime.
-   Copyright (C) 1992-2013 Free Software Foundation, Inc.
+   Copyright (C) 1992-2014 Free Software Foundation, Inc.
 
    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
@@ -176,7 +176,7 @@ static void
 uptime (const char *filename, int options)
 {
   size_t n_users;
-  STRUCT_UTMP *utmp_buf;
+  STRUCT_UTMP *utmp_buf = NULL;
 
 #if HAVE_UTMPX_H || HAVE_UTMP_H
   if (read_utmp (filename, &n_users, &utmp_buf, options) != 0)
@@ -184,6 +184,8 @@ uptime (const char *filename, int options)
 #endif
 
   print_uptime (n_users, utmp_buf);
+
+  IF_LINT (free (utmp_buf));
 }
 
 void
diff --git a/src/users.c b/src/users.c
index d1c8137f..ee44c815 100644
--- a/src/users.c
+++ b/src/users.c
@@ -1,5 +1,5 @@
 /* GNU's users.
-   Copyright (C) 1992-2013 Free Software Foundation, Inc.
+   Copyright (C) 1992-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/wc.c b/src/wc.c
index 93decd7e..4909d9fe 100644
--- a/src/wc.c
+++ b/src/wc.c
@@ -1,5 +1,5 @@
 /* wc - print the number of lines, words, and bytes in files
-   Copyright (C) 1985-2013 Free Software Foundation, Inc.
+   Copyright (C) 1985-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/who.c b/src/who.c
index 6b44c4bb..f07cee61 100644
--- a/src/who.c
+++ b/src/who.c
@@ -1,5 +1,5 @@
 /* GNU's who.
-   Copyright (C) 1992-2013 Free Software Foundation, Inc.
+   Copyright (C) 1992-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/whoami.c b/src/whoami.c
index dfa28da3..7301abb1 100644
--- a/src/whoami.c
+++ b/src/whoami.c
@@ -1,6 +1,6 @@
 /* whoami -- print effective userid
 
-   Copyright (C) 1989-2013 Free Software Foundation, Inc.
+   Copyright (C) 1989-2014 Free Software Foundation, Inc.
 
    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
diff --git a/src/yes.c b/src/yes.c
index b87b5430..97213124 100644
--- a/src/yes.c
+++ b/src/yes.c
@@ -1,5 +1,5 @@
 /* yes - output a string repeatedly until killed
-   Copyright (C) 1991-2013 Free Software Foundation, Inc.
+   Copyright (C) 1991-2014 Free Software Foundation, Inc.
 
    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
diff --git a/tests/Coreutils.pm b/tests/Coreutils.pm
index 71b15165..cfa41a96 100644
--- a/tests/Coreutils.pm
+++ b/tests/Coreutils.pm
@@ -1,7 +1,7 @@
 package Coreutils;
 # This is a testing framework.
 
-# Copyright (C) 1998-2013 Free Software Foundation, Inc.
+# Copyright (C) 1998-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/CuSkip.pm b/tests/CuSkip.pm
index b296fcbc..d0cfdb54 100644
--- a/tests/CuSkip.pm
+++ b/tests/CuSkip.pm
@@ -1,7 +1,7 @@
 package CuSkip;
 # Skip a test: emit diag to log and to stderr, and exit 77
 
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/CuTmpdir.pm b/tests/CuTmpdir.pm
index 024b1bc9..7e73f65e 100644
--- a/tests/CuTmpdir.pm
+++ b/tests/CuTmpdir.pm
@@ -1,7 +1,7 @@
 package CuTmpdir;
 # create, then chdir into a temporary sub-directory
 
-# Copyright (C) 2007-2013 Free Software Foundation, Inc.
+# Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/chgrp/basic.sh b/tests/chgrp/basic.sh
index 4e0d1811..153b36c3 100755
--- a/tests/chgrp/basic.sh
+++ b/tests/chgrp/basic.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # make sure chgrp is reasonable
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/chgrp/default-no-deref.sh b/tests/chgrp/default-no-deref.sh
index 03849e50..c8c1da24 100755
--- a/tests/chgrp/default-no-deref.sh
+++ b/tests/chgrp/default-no-deref.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that chgrp -R does not dereference symlinks.
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/chgrp/deref.sh b/tests/chgrp/deref.sh
index b7f6e8f9..97eadfd0 100755
--- a/tests/chgrp/deref.sh
+++ b/tests/chgrp/deref.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # see if chgrp can change the group of a symlink
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/chgrp/no-x.sh b/tests/chgrp/no-x.sh
index 2f3239f3..27248af4 100755
--- a/tests/chgrp/no-x.sh
+++ b/tests/chgrp/no-x.sh
@@ -2,7 +2,7 @@
 # Make sure chgrp gives the right diagnostic for a readable,
 # but inaccessible directory.
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/chgrp/posix-H.sh b/tests/chgrp/posix-H.sh
index 95676691..093d5181 100755
--- a/tests/chgrp/posix-H.sh
+++ b/tests/chgrp/posix-H.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test POSIX-mandated -H option.
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/chgrp/recurse.sh b/tests/chgrp/recurse.sh
index 6ad7a10c..cd973838 100755
--- a/tests/chgrp/recurse.sh
+++ b/tests/chgrp/recurse.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ad-hoc tests of chgrp with -R and -H or -L and symlinks
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/chmod/c-option.sh b/tests/chmod/c-option.sh
index 23fffeab..03e1db9a 100755
--- a/tests/chmod/c-option.sh
+++ b/tests/chmod/c-option.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Verify that chmod's --changes (-c) option works.
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
@@ -31,10 +31,21 @@ chmod u=rwx $file || fail=1
 chmod -c g=rwx $file > out || fail=1
 chmod -c g=rwx $file > empty || fail=1
 
-test -s empty && fail=1
+compare /dev/null empty || fail=1
 case "$(cat out)" in
   "mode of 'f' changed from 0744 "?rwxr--r--?" to 0774 "?rwxrwxr--?) ;;
   *) cat out; fail=1 ;;
 esac
 
+# From V5.1.0 to 8.22 this would stat the wrong file and
+# give an erroneous ENOENT diagnostic
+mkdir -p a/b || framework_failure_
+# chmod g+s might fail as detailed in setgid.sh
+# but we don't care about those edge cases here
+chmod g+s a/b
+# This should never warn, but it did when special
+# bits are set on b (the common case under test)
+chmod -c -R g+w a 2>err
+compare /dev/null err || fail=1
+
 Exit $fail
diff --git a/tests/chmod/equal-x.sh b/tests/chmod/equal-x.sh
index de7ff547..75a2fa1a 100755
--- a/tests/chmod/equal-x.sh
+++ b/tests/chmod/equal-x.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test "chmod =x" and the like.
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/chmod/equals.sh b/tests/chmod/equals.sh
index f0dc9e67..4daba4be 100755
--- a/tests/chmod/equals.sh
+++ b/tests/chmod/equals.sh
@@ -3,7 +3,7 @@
 # Before fileutils-4.1.2, some of them didn't.
 # Also, before coreutils-5.3.1, =[ugo] sometimes didn't work.
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/chmod/inaccessible.sh b/tests/chmod/inaccessible.sh
index 0863a6e3..2ef2a61f 100755
--- a/tests/chmod/inaccessible.sh
+++ b/tests/chmod/inaccessible.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test for the bug fixed on 2006-09-20.
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/chmod/no-x.sh b/tests/chmod/no-x.sh
index 76c8fa40..64e81ed8 100755
--- a/tests/chmod/no-x.sh
+++ b/tests/chmod/no-x.sh
@@ -2,7 +2,7 @@
 # Make sure chmod gives the right diagnostic for a readable,
 # but inaccessible directory.
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/chmod/octal.sh b/tests/chmod/octal.sh
index eaf39208..895c8348 100755
--- a/tests/chmod/octal.sh
+++ b/tests/chmod/octal.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ensure that chmod diagnoses a certain type of invalid mode string
 
-# Copyright (C) 2005-2013 Free Software Foundation, Inc.
+# Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/chmod/setgid.sh b/tests/chmod/setgid.sh
index fac37e84..0c0722de 100755
--- a/tests/chmod/setgid.sh
+++ b/tests/chmod/setgid.sh
@@ -3,7 +3,7 @@
 # on directories with the setgid bit set.  Also, check that the GNU octal
 # notations work.
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/chmod/silent.sh b/tests/chmod/silent.sh
index 30529ac1..5d5dcb58 100755
--- a/tests/chmod/silent.sh
+++ b/tests/chmod/silent.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ensure that chgrp, chmod, chown -f don't print some diagnostics
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/chmod/thru-dangling.sh b/tests/chmod/thru-dangling.sh
index e6053d0f..4a137e81 100755
--- a/tests/chmod/thru-dangling.sh
+++ b/tests/chmod/thru-dangling.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test for proper error and exit code of chmod on a dangling symlink.
 
-# Copyright (C) 2007-2013 Free Software Foundation, Inc.
+# Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/chmod/umask-x.sh b/tests/chmod/umask-x.sh
index 33166e41..9e0e0012 100755
--- a/tests/chmod/umask-x.sh
+++ b/tests/chmod/umask-x.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test that chmod -x file reports an error if the result is executable.
 
-# Copyright (C) 2005-2013 Free Software Foundation, Inc.
+# Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/chmod/usage.sh b/tests/chmod/usage.sh
index 2187e35c..7e27e7ce 100755
--- a/tests/chmod/usage.sh
+++ b/tests/chmod/usage.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Verify that chmod works correctly with odd option combinations.
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/chown/basic.sh b/tests/chown/basic.sh
index e80a065c..d4b2b9b0 100755
--- a/tests/chown/basic.sh
+++ b/tests/chown/basic.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # make sure chown --from=... works
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/chown/deref.sh b/tests/chown/deref.sh
index 2372f98f..e576a9f9 100755
--- a/tests/chown/deref.sh
+++ b/tests/chown/deref.sh
@@ -2,7 +2,7 @@
 # For coreutils-5.2.1 and earlier, chown --dereference would skip
 # symlinks having owner/group matching the specified owner/group.
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/chown/preserve-root.sh b/tests/chown/preserve-root.sh
index 76594180..176c7c4f 100755
--- a/tests/chown/preserve-root.sh
+++ b/tests/chown/preserve-root.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Verify that --preserve-root works.
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/chown/separator.sh b/tests/chown/separator.sh
index 2a05fb2d..f5ecb5bb 100755
--- a/tests/chown/separator.sh
+++ b/tests/chown/separator.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Make sure "chown USER:GROUP FILE" works, and similar tests with separators.
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 
 # 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
@@ -31,6 +31,12 @@ test -n "$id_g" || framework_failure_
 id_gn=$(id -gn) || framework_failure_
 test -n "$id_gn" || framework_failure_
 
+# Systems with both local and external groups with conflicting IDs,
+# were seen to fail this test erroneously with EPERM errors.
+test $(getent group | grep "^$id_gn:" | wc -l) = 1 ||
+  skip_ "group '$id_gn' not biunique: " \
+        "$(getent group | grep "^$id_gn:" | tr '\n' ',')"
+
 # FreeBSD 6.x's getgrnam fails to look up a group name containing
 # a space. On such a system, skip this test if the group name contains
 # a byte not in the portable filename character set.
diff --git a/tests/cp/abuse.sh b/tests/cp/abuse.sh
index 1a092dee..80eb1d62 100755
--- a/tests/cp/abuse.sh
+++ b/tests/cp/abuse.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ensure that cp does not write through a just-copied symlink
 
-# Copyright (C) 2007-2013 Free Software Foundation, Inc.
+# Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/acl.sh b/tests/cp/acl.sh
index d7c4f2ff..36a5d298 100755
--- a/tests/cp/acl.sh
+++ b/tests/cp/acl.sh
@@ -2,7 +2,7 @@
 # copy files/directories across file system boundaries
 # and make sure acls are preserved appropriately
 
-# Copyright (C) 2005-2013 Free Software Foundation, Inc.
+# Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
 # 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
@@ -53,7 +53,7 @@ test "$acl1" = "$acl2" || fail=1
 echo > a/file || framework_failure_ # add some data
 test -s a/file || framework_failure_
 cp -p --attributes-only a/file b/ || fail=1
-test -s b/file && fail=1
+compare /dev/null b/file || fail=1
 acl2=$(cd b && getfacl file) || framework_failure_
 test "$acl1" = "$acl2" || fail=1
 
diff --git a/tests/cp/attr-existing.sh b/tests/cp/attr-existing.sh
index 81334a2c..7e48fbbc 100755
--- a/tests/cp/attr-existing.sh
+++ b/tests/cp/attr-existing.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Make sure cp --attributes-only doesn't truncate existing data
 
-# Copyright 2012-2013 Free Software Foundation, Inc.
+# Copyright 2012-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/backup-1.sh b/tests/cp/backup-1.sh
index 1244de62..033f8a93 100755
--- a/tests/cp/backup-1.sh
+++ b/tests/cp/backup-1.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test cp backup.
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/backup-dir.sh b/tests/cp/backup-dir.sh
index 9dc18acd..2b11fd18 100755
--- a/tests/cp/backup-dir.sh
+++ b/tests/cp/backup-dir.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that cp -b doesn't back up directories.
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/backup-is-src.sh b/tests/cp/backup-is-src.sh
index 5b6f3138..ae2502e5 100755
--- a/tests/cp/backup-is-src.sh
+++ b/tests/cp/backup-is-src.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test cp backup to source file.
 
-# Copyright (C) 1998-2013 Free Software Foundation, Inc.
+# Copyright (C) 1998-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/capability.sh b/tests/cp/capability.sh
index 61a60cd0..fb3bc1c8 100755
--- a/tests/cp/capability.sh
+++ b/tests/cp/capability.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure cp --preserves copies capabilities
 
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/cp-HL.sh b/tests/cp/cp-HL.sh
index 93052dd6..bdc31ed5 100755
--- a/tests/cp/cp-HL.sh
+++ b/tests/cp/cp-HL.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # test cp's -H and -L options
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/cp-a-selinux.sh b/tests/cp/cp-a-selinux.sh
index e7bdcf1d..58887d27 100755
--- a/tests/cp/cp-a-selinux.sh
+++ b/tests/cp/cp-a-selinux.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
-# Ensure that cp -a and cp --preserve=context work properly.
+# Ensure that cp -Z, -a and cp --preserve=context work properly.
 # In particular, test on a writable NFS partition.
 # Check also locally if --preserve=context, -a and --preserve=all
 # does work
 
-# Copyright (C) 2007-2013 Free Software Foundation, Inc.
+# Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
 # 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
@@ -37,9 +37,66 @@ cp -a c d 2>err || framework_failure_
 cp --preserve=context c e || framework_failure_
 cp --preserve=all c f || framework_failure_
 ls -Z d | grep $ctx || fail=1
-test -s err && fail=1   #there must be no stderr output for -a
+# there must be no stderr output for -a
+compare /dev/null err || fail=1
 ls -Z e | grep $ctx || fail=1
 ls -Z f | grep $ctx || fail=1
+rm -f f
+
+# Check handling of existing dirs which requires specific handling
+# due to recursion, and was handled incorrectly in coreutils-8.22
+# Note standard permissions are updated for existing directories
+# in the destination, so SELinux contexts should be updated too.
+chmod o+rw restore/existing_dir
+mkdir -p backup/existing_dir/ || framework_failure_
+ls -Zd backup/existing_dir | grep $ctx && framework_failure_
+touch backup/existing_dir/file || framework_failure_
+chcon $ctx backup/existing_dir/file || framework_failure_
+# Set the dir context to ensure it is reset
+mkdir -p --context="$ctx" restore/existing_dir || framework_failure_
+# Copy and ensure existing directories updated
+cp -a backup/. restore/
+ls -Zd restore/existing_dir | grep $ctx &&
+  { ls -lZd restore/existing_dir; fail=1; }
+
+# Check restorecon (-Z) functionality for file and directory
+get_selinux_type() { ls -Zd "$1" | sed -n 's/.*:\(.*_t\):.*/\1/p'; }
+# Also make a dir with our known context
+mkdir c_d || framework_failure_
+chcon $ctx c_d || framework_failure_
+# Get the type of this known context for file and dir
+old_type_f=$(get_selinux_type c)
+old_type_d=$(get_selinux_type c_d)
+# Setup copies for manipulation with restorecon
+# and get the adjusted type for comparison
+cp -a c Z1 || fail=1
+cp -a c_d Z1_d || fail=1
+if restorecon Z1 Z1_d 2>/dev/null; then
+  new_type_f=$(get_selinux_type Z1)
+  new_type_d=$(get_selinux_type Z1_d)
+
+  # Ensure -Z sets the type like restorecon does
+  cp -Z c Z2 || fail=1
+  cpZ_type_f=$(get_selinux_type Z2)
+  test "$cpZ_type_f" = "$new_type_f" || fail=1
+
+  # Ensuze -Z overrides -a and that dirs are handled too
+  cp -aZ c Z3 || fail=1
+  cp -aZ c_d Z3_d || fail=1
+  cpaZ_type_f=$(get_selinux_type Z3)
+  cpaZ_type_d=$(get_selinux_type Z3_d)
+  test "$cpaZ_type_f" = "$new_type_f" || fail=1
+  test "$cpaZ_type_d" = "$new_type_d" || fail=1
+
+  # Ensure -Z sets the type for existing files
+  mkdir -p existing/c_d || framework_failure_
+  touch existing/c || framework_failure_
+  cp -aZ c c_d existing || fail=1
+  cpaZ_type_f=$(get_selinux_type existing/c)
+  cpaZ_type_d=$(get_selinux_type existing/c_d)
+  test "$cpaZ_type_f" = "$new_type_f" || fail=1
+  test "$cpaZ_type_d" = "$new_type_d" || fail=1
+fi
 
 skip=0
 # Create a file system, then mount it with the context=... option.
@@ -54,27 +111,30 @@ test $skip = 1 \
 
 cd mnt                                       || framework_failure_
 
-echo > f                                     || framework_failure_
-
+# Create files with hopefully different contexts
+echo > ../f                                  || framework_failure_
 echo > g                                     || framework_failure_
+test "$(stat -c%C ../f)" = "$(stat -c%C g)" &&
+  skip_ "files on separate file systems have the same security context"
+
 # /bin/cp from coreutils-6.7-3.fc7 would fail this test by letting cp
 # succeed (giving no diagnostics), yet leaving the destination file empty.
-cp -a f g 2>err || fail=1
+cp -a ../f g 2>err || fail=1
 test -s g       || fail=1     # The destination file must not be empty.
-test -s err     && fail=1     # There must be no stderr output.
+compare /dev/null err || fail=1
 
 # =====================================================
 # Here, we expect cp to succeed and not warn with "Operation not supported"
 rm -f g
 echo > g
-cp --preserve=all f g 2>err || fail=1
+cp --preserve=all ../f g 2>err || fail=1
 test -s g || fail=1
 grep "Operation not supported" err && fail=1
 
 # =====================================================
 # The same as above except destination does not exist
 rm -f g
-cp --preserve=all f g 2>err || fail=1
+cp --preserve=all ../f g 2>err || fail=1
 test -s g || fail=1
 grep "Operation not supported" err && fail=1
 
@@ -94,21 +154,52 @@ echo > g
 # =====================================================
 # Here, we expect cp to fail, because it cannot set the SELinux
 # security context through NFS or a mount with fixed context.
-cp --preserve=context f g 2> out && fail=1
+cp --preserve=context ../f g 2> out && fail=1
 # Here, we *do* expect the destination to be empty.
-test -s g && fail=1
-sed "s/ .g' to .*//" out > k
+compare /dev/null g || fail=1
+sed "s/ .g'.*//" out > k
 mv k out
 compare exp out || fail=1
 
 rm -f g
 echo > g
 # Check if -a option doesn't silence --preserve=context option diagnostics
-cp -a --preserve=context f g 2> out2 && fail=1
+cp -a --preserve=context ../f g 2> out2 && fail=1
 # Here, we *do* expect the destination to be empty.
-test -s g && fail=1
-sed "s/ .g' to .*//" out2 > k
+compare /dev/null g || fail=1
+sed "s/ .g'.*//" out2 > k
 mv k out2
 compare exp out2 || fail=1
 
+for no_g_cmd in '' 'rm -f g'; do
+  # restorecon equivalent.  Note even though the context
+  # returned from matchpathcon() will not match $ctx
+  # the resulting ENOTSUP warning will be suppressed.
+   # With absolute path
+  $no_g_cmd
+  cp -Z ../f $(realpath g) || fail=1
+   # With relative path
+  $no_g_cmd
+  cp -Z ../f g || fail=1
+   # -Z overrides -a
+  $no_g_cmd
+  cp -Z -a ../f g || fail=1
+   # -Z doesn't take an arg
+  $no_g_cmd
+  cp -Z "$ctx" ../f g && fail=1
+
+  # Explicit context
+  $no_g_cmd
+   # Explicitly defaulting to the global $ctx should work
+  cp --context="$ctx" ../f g || fail=1
+   # --context overrides -a
+  $no_g_cmd
+  cp -a --context="$ctx" ../f g || fail=1
+done
+
+# Mutually exlusive options
+cp -Z --preserve=context ../f g && fail=1
+cp --preserve=context -Z ../f g && fail=1
+cp --preserve=context --context="$ctx" ../f g && fail=1
+
 Exit $fail
diff --git a/tests/cp/cp-deref.sh b/tests/cp/cp-deref.sh
index 3194fda9..63a1c22d 100755
--- a/tests/cp/cp-deref.sh
+++ b/tests/cp/cp-deref.sh
@@ -2,7 +2,7 @@
 # cp -RL dir1 dir2' must handle the case in which each of dir1 and dir2
 # contain a symlink pointing to some third directory.
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/cp-i.sh b/tests/cp/cp-i.sh
index 74e9b12f..9f2905e6 100755
--- a/tests/cp/cp-i.sh
+++ b/tests/cp/cp-i.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test whether cp -i prompts in the right place.
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/cp-mv-backup.sh b/tests/cp/cp-mv-backup.sh
index 6ebd644c..e313b72c 100755
--- a/tests/cp/cp-mv-backup.sh
+++ b/tests/cp/cp-mv-backup.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test basic --backup functionality for both cp and mv.
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/cp-mv-enotsup-xattr.sh b/tests/cp/cp-mv-enotsup-xattr.sh
index e091b44b..f46977b6 100755
--- a/tests/cp/cp-mv-enotsup-xattr.sh
+++ b/tests/cp/cp-mv-enotsup-xattr.sh
@@ -3,7 +3,7 @@
 # as expected on file system without their support and do show correct
 # diagnostics when required
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
@@ -69,19 +69,19 @@ grep -F "$xattr_pair" out_a >/dev/null \
 # This should pass without diagnostics
 cp -a xattr/a noxattr/ 2>err || fail=1
 test -s noxattr/a   || fail=1  # destination file must not be empty
-test -s err         && fail=1  # there must be no stderr output
+compare /dev/null err || fail=1
 
 rm -f err noxattr/a
 
 # This should pass without diagnostics (new file)
 cp --preserve=all xattr/a noxattr/ 2>err || fail=1
 test -s noxattr/a   || fail=1  # destination file must not be empty
-test -s err         && fail=1  # there must be no stderr output
+compare /dev/null err || fail=1
 
 # This should pass without diagnostics (existing file)
 cp --preserve=all xattr/a noxattr/ 2>err || fail=1
 test -s noxattr/a   || fail=1  # destination file must not be empty
-test -s err         && fail=1  # there must be no stderr output
+compare /dev/null err || fail=1
 
 rm -f err noxattr/a
 
@@ -104,6 +104,26 @@ rm -f err noxattr/a
 # This should pass without diagnostics
 mv xattr/a noxattr/ 2>err || fail=1
 test -s noxattr/a         || fail=1  # destination file must not be empty
-test -s err               && fail=1  # there must be no stderr output
+compare /dev/null err || fail=1
+
+# This should pass and copy xattrs of the symlink
+# since the xattrs used here are not in the 'user.' namespace.
+# Up to and including coreutils-8.22 xattrs of symlinks
+# were not copied across file systems.
+ln -s 'foo' xattr/symlink || framework_failure_
+# Note 'user.' namespace is only supported on regular files/dirs
+# so use the 'trusted.' namespace here
+txattr='trusted.overlay.whiteout'
+if setfattr -hn "$txattr" -v y xattr/symlink; then
+  # Note only root can read the 'trusted.' namespace
+  if getfattr -h -m- -d xattr/symlink | grep -F "$txattr"; then
+    mv xattr/symlink noxattr/ || fail=1
+    getfattr -h -m- -d noxattr/symlink | grep -F "$txattr" || fail=1
+  else
+    echo "failed to get '$txattr' xattr. skipping symlink check" >&2
+  fi
+else
+  echo "failed to set '$txattr' xattr. skipping symlink check" >&2
+fi
 
 Exit $fail
diff --git a/tests/cp/cp-parents.sh b/tests/cp/cp-parents.sh
index cebf672a..e326d6bd 100755
--- a/tests/cp/cp-parents.sh
+++ b/tests/cp/cp-parents.sh
@@ -2,7 +2,7 @@
 # cp -R --parents dir-specified-with-trailing-slash/ other-dir
 # would get a failed assertion.
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/deref-slink.sh b/tests/cp/deref-slink.sh
index aa3c2507..b81997be 100755
--- a/tests/cp/deref-slink.sh
+++ b/tests/cp/deref-slink.sh
@@ -2,7 +2,7 @@
 # Demonstrate bug when using -d with an existing destination file
 # that is a symlink.
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/dir-rm-dest.sh b/tests/cp/dir-rm-dest.sh
index 83a1b4c9..2723631d 100755
--- a/tests/cp/dir-rm-dest.sh
+++ b/tests/cp/dir-rm-dest.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # verify that cp's --remove-destination option works with -R
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/dir-slash.sh b/tests/cp/dir-slash.sh
index 5bbaa813..42bf0696 100755
--- a/tests/cp/dir-slash.sh
+++ b/tests/cp/dir-slash.sh
@@ -2,7 +2,7 @@
 # Make sure that cp -R DIR1 DIR2 does the right thing
 # when DIR1 is written with a trailing slash.
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/dir-vs-file.sh b/tests/cp/dir-vs-file.sh
index 3c5f70c5..5398656e 100755
--- a/tests/cp/dir-vs-file.sh
+++ b/tests/cp/dir-vs-file.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # A directory may not replace an existing file.
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/existing-perm-dir.sh b/tests/cp/existing-perm-dir.sh
index 4c167b98..46f1be0d 100755
--- a/tests/cp/existing-perm-dir.sh
+++ b/tests/cp/existing-perm-dir.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Make sure cp -p doesn't "restore" permissions it shouldn't (Bug#9170).
 
-# Copyright 2011-2013 Free Software Foundation, Inc.
+# Copyright 2011-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/existing-perm-race.sh b/tests/cp/existing-perm-race.sh
index d1b87776..c12cbb85 100755
--- a/tests/cp/existing-perm-race.sh
+++ b/tests/cp/existing-perm-race.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Make sure cp -p isn't too generous with existing file permissions.
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/fail-perm.sh b/tests/cp/fail-perm.sh
index 8665449a..83518417 100755
--- a/tests/cp/fail-perm.sh
+++ b/tests/cp/fail-perm.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/fiemap-2.sh b/tests/cp/fiemap-2.sh
index 3f8eb006..79e2c1c4 100755
--- a/tests/cp/fiemap-2.sh
+++ b/tests/cp/fiemap-2.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Exercise a few more corners of the fiemap-copying code.
 
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/fiemap-FMR.sh b/tests/cp/fiemap-FMR.sh
index ad4dfed5..7c9e3198 100755
--- a/tests/cp/fiemap-FMR.sh
+++ b/tests/cp/fiemap-FMR.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Trigger a free-memory read bug in cp from coreutils-[8.11..8.19]
 
-# Copyright (C) 2012-2013 Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/fiemap-empty.sh b/tests/cp/fiemap-empty.sh
index 29439d7c..34aec424 100755
--- a/tests/cp/fiemap-empty.sh
+++ b/tests/cp/fiemap-empty.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test cp reads unwritten extents efficiently
 
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/fiemap-perf.sh b/tests/cp/fiemap-perf.sh
index d3747990..10bb7324 100755
--- a/tests/cp/fiemap-perf.sh
+++ b/tests/cp/fiemap-perf.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ensure that a sparse file is copied efficiently, by default
 
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/file-perm-race.sh b/tests/cp/file-perm-race.sh
index 7157c923..5a01675c 100755
--- a/tests/cp/file-perm-race.sh
+++ b/tests/cp/file-perm-race.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Make sure cp -p isn't too generous with file permissions.
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/into-self.sh b/tests/cp/into-self.sh
index 347b8589..124be241 100755
--- a/tests/cp/into-self.sh
+++ b/tests/cp/into-self.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Confirm that copying a directory into itself gets a proper diagnostic.
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/link-deref.sh b/tests/cp/link-deref.sh
new file mode 100755
index 00000000..1b666589
--- /dev/null
+++ b/tests/cp/link-deref.sh
@@ -0,0 +1,125 @@
+#!/bin/sh
+# Exercise cp --link's behavior regarding the dereferencing of symbolic links.
+
+# Copyright (C) 2013-2014 Free Software Foundation, Inc.
+
+# 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 3 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/>.
+
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
+print_ver_ cp
+
+if grep '^#define HAVE_LINKAT 1' "$CONFIG_HEADER" > /dev/null \
+   || grep '^#define LINK_FOLLOWS_SYMLINKS 0' "$CONFIG_HEADER" > /dev/null; then
+  # With this config cp will attempt to linkat() to hardlink a symlink.
+  # So now double check the current file system supports this operation.
+  ln -s testtarget test_sl || framework_failure_
+  ln -P test_sl test_hl_sl || framework_failure_
+  ino_sl="$(stat -c '%i' test_sl)" || framework_failure_
+  ino_hl="$(stat -c '%i' test_hl_sl)" || framework_failure_
+  test "$ino_sl" = "$ino_hl" && can_hardlink_to_symlink=1
+fi
+
+mkdir dir              || framework_failure_
+> file                 || framework_failure_
+ln -s dir     dirlink  || framework_failure_
+ln -s file    filelink || framework_failure_
+ln -s nowhere danglink || framework_failure_
+
+# printf format of the output line.
+outformat='%s|result=%s|inode=%s|type=%s|error=%s\n'
+
+for src in dirlink filelink danglink; do
+  # Get symlink's target.
+  tgt=$(readlink $src) || framework_failure_
+  # Get inodes and file type of the symlink (src) and its target (tgt).
+  # Note: this will fail for 'danglink'; catch it.
+  ino_src="$(stat -c '%i' $src)" || framework_failure_
+  typ_src="$(stat -c '%F' $src)" || framework_failure_
+  ino_tgt="$(stat -c '%i' $tgt 2>/dev/null)" || ino_tgt=
+  typ_tgt="$(stat -c '%F' $tgt 2>/dev/null)" || typ_tgt=
+
+  for o in '' -L -H -P; do
+
+    # Skip the -P case where we don't or can't hardlink symlinks
+    ! test "$can_hardlink_to_symlink" && test "$o" = '-P' && continue
+
+    for r in '' -R; do
+
+      command="cp --link $o $r $src dst"
+      $command 2> err
+      result=$?
+
+      # Get inode and file type of the destination (which may fail, too).
+      ino_dst="$(stat -c '%i' dst 2>/dev/null)" || ini_dst=
+      typ_dst="$(stat -c '%F' dst 2>/dev/null)" || typ_dst=
+
+      # Print the actual result in a certain format.
+      printf "$outformat" \
+        "$command"   \
+        "$result"   \
+        "$ino_dst"  \
+        "$typ_dst"  \
+        "$(cat err)"  \
+        > out
+
+      # What was expected?
+      if [ "$o" = "-P" ]; then
+        # cp --link should not dereference if -P is given.
+        exp_result=0
+        exp_inode=$ino_src
+        exp_ftype=$typ_src
+        exp_error=
+      elif [ "$src" = 'danglink' ]; then
+        # Dereferencing should fail for the 'danglink'.
+        exp_result=1
+        exp_inode=
+        exp_ftype=
+        exp_error="cp: cannot stat 'danglink': No such file or directory"
+      elif [ "$src" = 'dirlink' ] && [ "$r" != '-R' ]; then
+        # Dereferencing should fail for the 'dirlink' without -R.
+        exp_result=1
+        exp_inode=
+        exp_ftype=
+        exp_error="cp: omitting directory 'dirlink'"
+      elif [ "$src" = 'dirlink' ]; then
+        # cp --link -R 'dirlink' should create a new directory.
+        exp_result=0
+        exp_inode=$ino_dst
+        exp_ftype=$typ_dst
+        exp_error=
+      else
+        # cp --link 'filelink' should create a hard link to the target.
+        exp_result=0
+        exp_inode=$ino_tgt
+        exp_ftype=$typ_tgt
+        exp_error=
+      fi
+
+      # Print the expected result in a certain format.
+      printf "$outformat" \
+        "$command"   \
+        "$exp_result" \
+        "$exp_inode"  \
+        "$exp_ftype"  \
+        "$exp_error"  \
+        > exp
+
+      compare exp out || { ls -lid $src $tgt dst; fail=1; }
+
+      rm -rf dst err exp out || framework_failure_
+    done
+  done
+done
+
+Exit $fail
diff --git a/tests/cp/link-heap.sh b/tests/cp/link-heap.sh
index 62d7de00..594ade89 100755
--- a/tests/cp/link-heap.sh
+++ b/tests/cp/link-heap.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ensure that cp --preserve=link --link doesn't waste heap
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
@@ -19,7 +19,7 @@
 . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 print_ver_ cp
 expensive_
-require_ulimit_
+require_ulimit_v_
 
 a=$(printf %031d 0)
 b=$(printf %031d 1)
diff --git a/tests/cp/link-no-deref.sh b/tests/cp/link-no-deref.sh
index 755d8922..13fd0ef5 100755
--- a/tests/cp/link-no-deref.sh
+++ b/tests/cp/link-no-deref.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that cp --link --no-dereference works properly
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/link-preserve.sh b/tests/cp/link-preserve.sh
index 52df843c..c2cfd4ae 100755
--- a/tests/cp/link-preserve.sh
+++ b/tests/cp/link-preserve.sh
@@ -2,7 +2,7 @@
 # ensure that 'cp -d' preserves hard-links between command line arguments
 # ensure that --preserve=links works with -RH and -RL
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/link-symlink.sh b/tests/cp/link-symlink.sh
index b328b717..9aab0b85 100755
--- a/tests/cp/link-symlink.sh
+++ b/tests/cp/link-symlink.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that cp -a --link maintains timestamps if possible
 
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/link.sh b/tests/cp/link.sh
index 50e42bd8..034a6275 100755
--- a/tests/cp/link.sh
+++ b/tests/cp/link.sh
@@ -2,7 +2,7 @@
 # Make sure cp --link -f works when the target exists.
 # This failed for 4.0z (due to a bug introduced in that test release).
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/nfs-removal-race.sh b/tests/cp/nfs-removal-race.sh
index b606784e..6969e8bd 100755
--- a/tests/cp/nfs-removal-race.sh
+++ b/tests/cp/nfs-removal-race.sh
@@ -13,7 +13,7 @@
 # This test is skipped on systems that lack LD_PRELOAD support; that's fine.
 # Similarly, on a system that lacks <dlfcn.h> or __xstat, skipping it is fine.
 
-# Copyright (C) 2012-2013 Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
 # 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
@@ -30,6 +30,7 @@
 
 . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 print_ver_ cp
+require_gcc_shared_
 
 # Replace each stat call with a call to this wrapper.
 cat > k.c <<'EOF' || framework_failure_
@@ -57,8 +58,8 @@ __xstat (int ver, const char *path, struct stat *st)
 EOF
 
 # Then compile/link it:
-$CC -shared -fPIC -O2 k.c -o k.so -ldl \
-  || framework_failure_ 'failed to compile with -shared -fPIC'
+gcc_shared_ k.c k.so \
+  || framework_failure_ 'failed to build shared library'
 
 touch d2 || framework_failure_
 echo xyz > src || framework_failure_
diff --git a/tests/cp/no-ctx.sh b/tests/cp/no-ctx.sh
new file mode 100755
index 00000000..8b1328a4
--- /dev/null
+++ b/tests/cp/no-ctx.sh
@@ -0,0 +1,64 @@
+#!/bin/sh
+# Ensure we handle file systems returning no SELinux context,
+# which triggered a segmentation fault in coreutils-8.22.
+# This test is skipped on systems that lack LD_PRELOAD support; that's fine.
+# Similarly, on a system that lacks lgetfilecon altogether, skipping it is fine.
+
+# Copyright (C) 2014 Free Software Foundation, Inc.
+
+# 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 3 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/>.
+
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
+print_ver_ cp
+require_gcc_shared_
+require_selinux_
+
+# Replace each getfilecon and lgetfilecon call with a call to these stubs.
+cat > k.c <<'EOF' || framework_failure_
+#include <stdio.h>
+#include <selinux/selinux.h>
+#include <errno.h>
+
+int getfilecon (const char *path, char **con)
+{
+  /* Leave a marker so we can identify if the function was intercepted.  */
+  fclose(fopen("preloaded", "w"));
+
+  errno=ENODATA;
+  return -1;
+}
+
+int lgetfilecon (const char *path, char **con)
+{ return getfilecon (path, con); }
+EOF
+
+# Then compile/link it:
+gcc_shared_ k.c k.so \
+  || skip_ 'failed to build SELinux shared library'
+
+touch file_src
+
+# New file with SELinux context optionally included
+LD_PRELOAD=./k.so cp -a file_src file_dst || fail=1
+
+# Existing file with SELinux context optionally included
+LD_PRELOAD=./k.so cp -a file_src file_dst || fail=1
+
+# ENODATA should give an immediate error when required to preserve ctx
+# This is debatable, and maybe we should not fail when no context available?
+LD_PRELOAD=./k.so cp --preserve=context file_src file_dst && fail=1
+
+test -e preloaded || skip_ 'LD_PRELOAD interception failed'
+
+Exit $fail
diff --git a/tests/cp/no-deref-link1.sh b/tests/cp/no-deref-link1.sh
index b950622f..50a94d37 100755
--- a/tests/cp/no-deref-link1.sh
+++ b/tests/cp/no-deref-link1.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # cp from 3.16 fails this test
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/no-deref-link2.sh b/tests/cp/no-deref-link2.sh
index dd8af5c6..cf07bf9e 100755
--- a/tests/cp/no-deref-link2.sh
+++ b/tests/cp/no-deref-link2.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # cp from 3.16 fails this test
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/no-deref-link3.sh b/tests/cp/no-deref-link3.sh
index c8dadee9..a8416855 100755
--- a/tests/cp/no-deref-link3.sh
+++ b/tests/cp/no-deref-link3.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # cp from 3.16 fails this test
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/parent-perm-race.sh b/tests/cp/parent-perm-race.sh
index e46d1483..b7ea9143 100755
--- a/tests/cp/parent-perm-race.sh
+++ b/tests/cp/parent-perm-race.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Make sure cp -pR --parents isn't too generous with parent permissions.
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/parent-perm.sh b/tests/cp/parent-perm.sh
index 46869e27..0a9c41e0 100755
--- a/tests/cp/parent-perm.sh
+++ b/tests/cp/parent-perm.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that cp --parents works properly with a preexisting dest. directory
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/perm.sh b/tests/cp/perm.sh
index 620bd55f..8311cd21 100755
--- a/tests/cp/perm.sh
+++ b/tests/cp/perm.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Make sure the permission-preserving code in copy.c (mv, cp, install) works.
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/preserve-2.sh b/tests/cp/preserve-2.sh
index 68369d37..ac2fcf6a 100755
--- a/tests/cp/preserve-2.sh
+++ b/tests/cp/preserve-2.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ensure that cp's --preserve=X,Y option is parsed properly
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/preserve-gid.sh b/tests/cp/preserve-gid.sh
index 0a0bacdd..f141ac14 100755
--- a/tests/cp/preserve-gid.sh
+++ b/tests/cp/preserve-gid.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Verify that cp -p preserves GID when it is possible.
 
-# Copyright (C) 2007-2013 Free Software Foundation, Inc.
+# Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
 # 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
@@ -117,8 +117,9 @@ t1() {
   u=$1; shift
   g=$1; shift
   t0 "$f" "$u" "$g" \
-      setuidgid -g "$nameless_gid1,$nameless_gid2" \
-      "$nameless_uid" env PATH="$tmp_path" "$@"
+      chroot --user=+$nameless_uid:+$nameless_gid1 \
+             --groups="+$nameless_gid1,+$nameless_gid2" \
+        / env PATH="$tmp_path" "$@"
 }
 
 t1 a0 "$nameless_uid" "$nameless_gid1" cp
diff --git a/tests/cp/preserve-link.sh b/tests/cp/preserve-link.sh
index 9497598b..b7e4aa28 100755
--- a/tests/cp/preserve-link.sh
+++ b/tests/cp/preserve-link.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Exercise the fix for http://debbugs.gnu.org/8419
 
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/preserve-mode.sh b/tests/cp/preserve-mode.sh
index 188a20e5..3b36defc 100755
--- a/tests/cp/preserve-mode.sh
+++ b/tests/cp/preserve-mode.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ensure that cp's --no-preserve=mode works correctly
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/preserve-slink-time.sh b/tests/cp/preserve-slink-time.sh
index 4c12679b..c6c3548f 100755
--- a/tests/cp/preserve-slink-time.sh
+++ b/tests/cp/preserve-slink-time.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Verify that cp -Pp preserves times even on symlinks.
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/proc-short-read.sh b/tests/cp/proc-short-read.sh
index f596aced..bd665620 100755
--- a/tests/cp/proc-short-read.sh
+++ b/tests/cp/proc-short-read.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # exercise cp's short-read failure when operating on >4KB files in /proc
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/proc-zero-len.sh b/tests/cp/proc-zero-len.sh
index 5416c7db..3fcd5aab 100755
--- a/tests/cp/proc-zero-len.sh
+++ b/tests/cp/proc-zero-len.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that cp copies contents of non-empty "regular" file with st_size==0
 
-# Copyright (C) 2007-2013 Free Software Foundation, Inc.
+# Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
 # 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
@@ -27,13 +27,20 @@ test -r $f || f=empty
 cat $f > out || fail=1
 
 # With coreutils-6.9, this would create a zero-length "exp" file.
-cp $f exp || fail=1
+# Skip this test on architectures like aarch64 where the inode
+# number of the file changed during the cp run.
+cp $f exp 2>err \
+  || { fail=1;
+       grep 'replaced while being copied' \
+         && skip_ "File $f is being replaced while being copied"; }
 
 # Don't simply compare contents; they might differ,
 # e.g., if CPU freq changes between cat and cp invocations.
 # Instead, simply compare whether they're both nonempty.
-test -s out && { rm -f out; echo nonempty > out; }
-test -s exp && { rm -f exp; echo nonempty > exp; }
+test -s out \
+  && { rm -f out; echo nonempty > out; }
+test -s exp \
+  && { rm -f exp; echo nonempty > exp; }
 
 compare exp out || fail=1
 
diff --git a/tests/cp/r-vs-symlink.sh b/tests/cp/r-vs-symlink.sh
index dfe01f31..9398c9b4 100755
--- a/tests/cp/r-vs-symlink.sh
+++ b/tests/cp/r-vs-symlink.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # cp -r should not create symlinks.  Fixed in fileutils-4.1.5.
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/reflink-auto.sh b/tests/cp/reflink-auto.sh
index 03560506..a16fdc66 100755
--- a/tests/cp/reflink-auto.sh
+++ b/tests/cp/reflink-auto.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test cp --reflink=auto
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/reflink-perm.sh b/tests/cp/reflink-perm.sh
index 3f22630e..52f5e257 100755
--- a/tests/cp/reflink-perm.sh
+++ b/tests/cp/reflink-perm.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test cp --reflink copies permissions
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
@@ -20,8 +20,8 @@
 print_ver_ cp
 
 
-: > time_check
-: > file
+> time_check
+> file
 ts='2009-08-28 19:00'
 touch -d "$ts" file || framework_failure_
 test time_check -nt file || skip_ "The system clock is wrong"
@@ -38,8 +38,8 @@ test copy -nt file && fail=1
 # Ensure that --attributes-only overrides --reflink completely
 echo > file2 # file with data
 cp --reflink=auto --preserve --attributes-only file2 empty_copy || fail=1
-test -s empty_copy && fail=1
+compare /dev/null empty_copy || fail=1
 cp --reflink=always --preserve --attributes-only file2 empty_copy || fail=1
-test -s empty_copy && fail=1
+compare /dev/null empty_copy || fail=1
 
 Exit $fail
diff --git a/tests/cp/same-file.sh b/tests/cp/same-file.sh
index 003a62ba..f62a9a72 100755
--- a/tests/cp/same-file.sh
+++ b/tests/cp/same-file.sh
@@ -2,7 +2,7 @@
 # Test some of cp's options and how cp handles situations in
 # which a naive implementation might overwrite the source file.
 
-# Copyright (C) 1998-2013 Free Software Foundation, Inc.
+# Copyright (C) 1998-2014 Free Software Foundation, Inc.
 
 # 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
@@ -189,9 +189,9 @@ cat <<\EOF | sed "$remove_these_sed" > expected
 0 -bf (foo sl1 -> foo sl2 sl2.~1~ -> foo)
 0 -bdf (foo sl1 -> foo sl2 -> foo sl2.~1~ -> foo)
 1 -l [cp: cannot create hard link 'sl2' to 'sl1'] (foo sl1 -> foo sl2 -> foo)
-0 -fl (foo sl1 -> foo sl2 -> foo)
-0 -bl (foo sl1 -> foo sl2 -> foo sl2.~1~ -> foo)
-0 -bfl (foo sl1 -> foo sl2 -> foo sl2.~1~ -> foo)
+0 -fl (foo sl1 -> foo sl2)
+0 -bl (foo sl1 -> foo sl2 sl2.~1~ -> foo)
+0 -bfl (foo sl1 -> foo sl2 sl2.~1~ -> foo)
 
 1 [cp: 'foo' and 'hardlink' are the same file] (foo hardlink)
 1 -d [cp: 'foo' and 'hardlink' are the same file] (foo hardlink)
diff --git a/tests/cp/slink-2-slink.sh b/tests/cp/slink-2-slink.sh
index cf469160..19a28621 100755
--- a/tests/cp/slink-2-slink.sh
+++ b/tests/cp/slink-2-slink.sh
@@ -2,7 +2,7 @@
 # 'test cp --update A B' where A and B are both symlinks that point
 # to the same file
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/sparse-fiemap.sh b/tests/cp/sparse-fiemap.sh
index 47ddf294..7aa24715 100755
--- a/tests/cp/sparse-fiemap.sh
+++ b/tests/cp/sparse-fiemap.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test cp --sparse=always through fiemap copy
 
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
 # 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
@@ -64,7 +64,8 @@ fi
 f()
 {
   sed 's/ [a-z,][a-z,]*$//' $@ \
-    | $AWK '/^ *[0-9]/ {printf "%d %d ", $2, (NF<5 ? $NF : $5) } END {print ""}'
+    | $AWK '/^ *[0-9]/ {printf "%d %d ", $2, (NF>=6 ? $6 : (NF<5 ? $NF : $5)) }
+            END {print ""}'
 }
 
 for i in $(seq 1 2 21); do
diff --git a/tests/cp/sparse-to-pipe.sh b/tests/cp/sparse-to-pipe.sh
index f8c1d1e8..b800e069 100755
--- a/tests/cp/sparse-to-pipe.sh
+++ b/tests/cp/sparse-to-pipe.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # copy a sparse file to a pipe, to exercise some seldom-used parts of copy.c
 
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/sparse.sh b/tests/cp/sparse.sh
index ed288ad8..d6cc4c4b 100755
--- a/tests/cp/sparse.sh
+++ b/tests/cp/sparse.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test cp --sparse=always
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/special-bits.sh b/tests/cp/special-bits.sh
index c8fb3dc1..a55eea21 100755
--- a/tests/cp/special-bits.sh
+++ b/tests/cp/special-bits.sh
@@ -2,7 +2,7 @@
 # make sure 'cp -p' preserves special bits
 # This works only when run as root.
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
@@ -42,7 +42,7 @@ set _ $(ls -l b); shift; p1=$1
 set _ $(ls -l b2); shift; p2=$1
 test $p1 = $p2 || fail=1
 
-setuidgid $NON_ROOT_USERNAME env PATH="$PATH" cp -p c c2 || fail=1
+chroot --user=$NON_ROOT_USERNAME / env PATH="$PATH" cp -p c c2 || fail=1
 set _ $(ls -l c); shift; p1=$1
 set _ $(ls -l c2); shift; p2=$1
 test $p1 = $p2 && fail=1
diff --git a/tests/cp/special-f.sh b/tests/cp/special-f.sh
index c416e126..ee01bb33 100755
--- a/tests/cp/special-f.sh
+++ b/tests/cp/special-f.sh
@@ -2,7 +2,7 @@
 # Ensure that "cp -Rf fifo E" unlinks E and retries.
 # Up until coreutils-6.10.171, it would not.
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/src-base-dot.sh b/tests/cp/src-base-dot.sh
index 3dbfa052..599f4cdc 100755
--- a/tests/cp/src-base-dot.sh
+++ b/tests/cp/src-base-dot.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that "mkdir x y; cd y; cp -ab ../x/. ." is a successful, silent, no-op.
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/symlink-slash.sh b/tests/cp/symlink-slash.sh
index 85acb69c..1ae846b6 100755
--- a/tests/cp/symlink-slash.sh
+++ b/tests/cp/symlink-slash.sh
@@ -2,7 +2,7 @@
 # Make sure that cp -dR dereferences a symlink arg if its name is
 # written with a trailing slash.
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/cp/thru-dangling.sh b/tests/cp/thru-dangling.sh
index 383bf41f..f4a609d5 100755
--- a/tests/cp/thru-dangling.sh
+++ b/tests/cp/thru-dangling.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that cp works as documented, when the destination is a dangling symlink
 
-# Copyright (C) 2007-2013 Free Software Foundation, Inc.
+# Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/dd/ascii.sh b/tests/dd/ascii.sh
new file mode 100755
index 00000000..7dc39cc9
--- /dev/null
+++ b/tests/dd/ascii.sh
@@ -0,0 +1,73 @@
+#!/bin/sh
+# test conv=ascii
+
+# Copyright (C) 2014 Free Software Foundation, Inc.
+
+# 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 3 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/>.
+
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
+print_ver_ dd
+
+{
+  # Two lines, EBCDIC " A A" and " A  ", followed by all the bytes in order.
+  printf '\100\301\100\301\100\301\100\100' &&
+  printf $(printf '\\%03o' $(seq 0 255));
+} >in || framework_failure_
+
+{
+  # The converted lines, with trailing spaces removed.
+  printf ' A A\n A\n' &&
+  printf '\000\001\002\003\n\234\011\206\177\n' &&
+  printf '\227\215\216\013\n\014\015\016\017\n' &&
+  printf '\020\021\022\023\n\235\205\010\207\n' &&
+  printf '\030\031\222\217\n\034\035\036\037\n' &&
+  printf '\200\201\202\203\n\204\012\027\033\n' &&
+  printf '\210\211\212\213\n\214\005\006\007\n' &&
+  printf '\220\221\026\223\n\224\225\226\004\n' &&
+  printf '\230\231\232\233\n\024\025\236\032\n' &&
+  printf '\040\240\241\242\n\243\244\245\246\n' &&
+  printf '\247\250\325\056\n\074\050\053\174\n' &&
+  printf '\046\251\252\253\n\254\255\256\257\n' &&
+  printf '\260\261\041\044\n\052\051\073\176\n' &&
+  printf '\055\057\262\263\n\264\265\266\267\n' &&
+  printf '\270\271\313\054\n\045\137\076\077\n' &&
+  printf '\272\273\274\275\n\276\277\300\301\n' &&
+  printf '\302\140\072\043\n\100\047\075\042\n' &&
+  printf '\303\141\142\143\n\144\145\146\147\n' &&
+  printf '\150\151\304\305\n\306\307\310\311\n' &&
+  printf '\312\152\153\154\n\155\156\157\160\n' &&
+  printf '\161\162\136\314\n\315\316\317\320\n' &&
+  printf '\321\345\163\164\n\165\166\167\170\n' &&
+  printf '\171\172\322\323\n\324\133\326\327\n' &&
+  printf '\330\331\332\333\n\334\335\336\337\n' &&
+  printf '\340\341\342\343\n\344\135\346\347\n' &&
+  printf '\173\101\102\103\n\104\105\106\107\n' &&
+  printf '\110\111\350\351\n\352\353\354\355\n' &&
+  printf '\175\112\113\114\n\115\116\117\120\n' &&
+  printf '\121\122\356\357\n\360\361\362\363\n' &&
+  printf '\134\237\123\124\n\125\126\127\130\n' &&
+  printf '\131\132\364\365\n\366\367\370\371\n' &&
+  printf '\060\061\062\063\n\064\065\066\067\n' &&
+  printf '\070\071\372\373\n\374\375\376\377\n';
+} >exp || framework_failure_
+
+dd if=in of=out conv=ascii cbs=4 || fail=1
+
+compare exp out \
+  || { od -v -to1 exp > exp2 || framework_failure_;
+       od -v -to1 out > out2 || framework_failure_;
+       compare exp2 out2;
+       fail=1; }
+
+Exit $fail
diff --git a/tests/dd/bytes.sh b/tests/dd/bytes.sh
index a2734536..1b72cc4c 100755
--- a/tests/dd/bytes.sh
+++ b/tests/dd/bytes.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2012-2013 Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/dd/direct.sh b/tests/dd/direct.sh
index 8870911d..f6065cae 100755
--- a/tests/dd/direct.sh
+++ b/tests/dd/direct.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ensure that dd's oflag=direct works
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/dd/misc.sh b/tests/dd/misc.sh
index b9ad31ab..f877fddf 100755
--- a/tests/dd/misc.sh
+++ b/tests/dd/misc.sh
@@ -2,7 +2,7 @@
 # Ensure dd treats '--' properly.
 # Also test some flag values.
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 
 # 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
@@ -32,10 +32,12 @@ ln -s $tmp_in $tmp_sym || framework_failure_
 
 # check status=none suppresses all output to stderr
 dd status=none if=$tmp_in of=/dev/null 2> err || fail=1
-test -s err && fail=1
+compare /dev/null err || fail=1
+dd status=none if=$tmp_in skip=2 of=/dev/null 2> err || fail=1
+compare /dev/null err || fail=1
 # check status=none is cumulative with status=noxfer
 dd status=none status=noxfer if=$tmp_in of=/dev/null 2> err || fail=1
-test -s err && fail=1
+compare /dev/null err || fail=1
 
 dd if=$tmp_in of=$tmp_out 2> /dev/null || fail=1
 compare $tmp_in $tmp_out || fail=1
diff --git a/tests/dd/no-allocate.sh b/tests/dd/no-allocate.sh
new file mode 100755
index 00000000..62170b9b
--- /dev/null
+++ b/tests/dd/no-allocate.sh
@@ -0,0 +1,70 @@
+#!/bin/sh
+# make sure that dd doesn't allocate memory unnecessarily
+
+# Copyright (C) 2013-2014 Free Software Foundation, Inc.
+
+# 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 3 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/>.
+
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
+print_ver_ dd
+require_ulimit_v_
+
+# count and skip are zero, we don't need to allocate memory
+(ulimit -v 20000; dd  bs=30M count=0) || fail=1
+(ulimit -v 20000; dd ibs=30M count=0) || fail=1
+(ulimit -v 20000; dd obs=30M count=0) || fail=1
+
+check_dd_seek_alloc() {
+  local file="$1"
+  local buf="$2"
+  test "$file" = 'in' && { dd_file=if; dd_op=skip; }
+  test "$file" = 'out' && { dd_file=of; dd_op=seek; }
+  test "$buf" = 'in' && { dd_buf=ibs; }
+  test "$buf" = 'out' && { dd_buf=obs; }
+  test "$buf" = 'both' && { dd_buf=bs; }
+
+  # Provide input to the "tape"
+  timeout 10 dd count=1 if=/dev/zero of=tape&
+
+  # Allocate buffer and read from the "tape"
+  (ulimit -v 20000; timeout 10 dd $dd_buf=30M $dd_op=1 count=0 $dd_file=tape)
+  local ret=$?
+
+  # Be defensive in case the tape reader is blocked for some reason
+  test $ret = 124 && framework_failure_
+
+  # This should happen without delay,
+  # and is used to ensure we've not multiple writers to the "tape"
+  wait
+
+  # We want the "tape" reader to fail iff allocating
+  # a large buffer corresponding to the file being read
+  case "$file$buf" in
+    inout|outin) test $ret = 0;;
+    *) test $ret != 0;;
+  esac
+}
+
+# Use a fifo for which seek fails, but read does not.
+# For non seekable output we need to allocate a buffer
+# when simulating seeking with a read.
+if mkfifo tape; then
+  for file in 'in' 'out'; do
+    for buf in 'both' 'in' 'out'; do
+      check_dd_seek_alloc "$file" "$buf" || fail=1
+    done
+  done
+fi
+
+Exit $fail
diff --git a/tests/dd/nocache.sh b/tests/dd/nocache.sh
index 73774053..4756663d 100755
--- a/tests/dd/nocache.sh
+++ b/tests/dd/nocache.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure dd handles the 'nocache' flag
 
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/dd/not-rewound.sh b/tests/dd/not-rewound.sh
index c869eb83..4b38c216 100755
--- a/tests/dd/not-rewound.sh
+++ b/tests/dd/not-rewound.sh
@@ -2,7 +2,7 @@
 # Make sure dd does the right thing when the input file descriptor
 # is not rewound.
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/dd/reblock.sh b/tests/dd/reblock.sh
index bba29f87..ccae9459 100755
--- a/tests/dd/reblock.sh
+++ b/tests/dd/reblock.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # test dd reblocking vs. bs=
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/dd/skip-seek-past-dev.sh b/tests/dd/skip-seek-past-dev.sh
index 87f6469e..5eb7ab5a 100755
--- a/tests/dd/skip-seek-past-dev.sh
+++ b/tests/dd/skip-seek-past-dev.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # test diagnostics are printed immediately when seeking beyond device.
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
@@ -33,7 +33,7 @@ get_device_size() {
 
 # Get path to device the current dir is on.
 # Note df can only get fs size, not device size.
-device=$(df -P . | tail -n1 | cut -d' ' -f1) || framework_failure_
+device=$(df --output=source . | tail -n1) || framework_failure_
 
 dev_size=$(get_device_size "$device") ||
   skip_ "failed to determine size of $device"
diff --git a/tests/dd/skip-seek-past-file.sh b/tests/dd/skip-seek-past-file.sh
index d379b753..8ed1d3f6 100755
--- a/tests/dd/skip-seek-past-file.sh
+++ b/tests/dd/skip-seek-past-file.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # test diagnostics are printed when seeking too far in seekable files.
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/dd/skip-seek.pl b/tests/dd/skip-seek.pl
index bb574bde..e2a7d022 100755
--- a/tests/dd/skip-seek.pl
+++ b/tests/dd/skip-seek.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Test dd's skip and seek options.
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/dd/skip-seek2.sh b/tests/dd/skip-seek2.sh
index a85db9a9..aa6d65dd 100755
--- a/tests/dd/skip-seek2.sh
+++ b/tests/dd/skip-seek2.sh
@@ -2,7 +2,7 @@
 # show how to skip an amount that is smaller than the nominal block size.
 # There's a more realistic example in the documentation.
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/dd/sparse.sh b/tests/dd/sparse.sh
index d9de985a..a7e90d2b 100755
--- a/tests/dd/sparse.sh
+++ b/tests/dd/sparse.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2012-2013 Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
 # 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
@@ -61,8 +61,15 @@ if test $(kb_alloc file.in) -gt 3000; then
   dd if=file.in of=file.out bs=2M conv=sparse
   test 2500 -lt $(kb_alloc file.out) || fail=1
 
+  # Note we recreate a sparse file first to avoid
+  # speculative preallocation seen in XFS, where a write() that
+  # extends a file can preallocate some extra space that
+  # a subsequent seek will not convert to a hole.
+  rm -f file.out
+  truncate --size=3M file.out
+
   # Ensure that this 1MiB string of NULs *is* converted to a hole.
-  dd if=file.in of=file.out bs=1M conv=sparse
+  dd if=file.in of=file.out bs=1M conv=sparse,notrunc
   test $(kb_alloc file.out) -lt 2500 || fail=1
 
 fi
diff --git a/tests/dd/stderr.sh b/tests/dd/stderr.sh
index a1b0b894..d0a304a7 100755
--- a/tests/dd/stderr.sh
+++ b/tests/dd/stderr.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure dd recognizes failure to write to stderr.
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/dd/unblock-sync.sh b/tests/dd/unblock-sync.sh
index 239e2f2b..72fd2ab0 100755
--- a/tests/dd/unblock-sync.sh
+++ b/tests/dd/unblock-sync.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that dd conv=unblock,sync works.
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/dd/unblock.pl b/tests/dd/unblock.pl
index 6dc7efc0..586b7b4d 100755
--- a/tests/dd/unblock.pl
+++ b/tests/dd/unblock.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Exercise dd's conv=unblock mode
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/df/df-P.sh b/tests/df/df-P.sh
index 635b4cb2..aff6e1b5 100755
--- a/tests/df/df-P.sh
+++ b/tests/df/df-P.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that df -P is not affected by BLOCK_SIZE settings
 
-# Copyright (C) 2007-2013 Free Software Foundation, Inc.
+# Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/df/df-output.sh b/tests/df/df-output.sh
index a10f2706..b2715885 100644..100755
--- a/tests/df/df-output.sh
+++ b/tests/df/df-output.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Exercise df's --output option.
 
-# Copyright (C) 2012-2013 Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
 # 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
@@ -67,11 +67,11 @@ compare exp out || fail=1
 # that --o (without argument) is identical to the full list.
 
 cat <<\EOF > exp || framework_failure_
-Filesystem Type Inodes IUsed IFree IUse% Size Used Avail Use% Mounted on
+Filesystem Type Inodes IUsed IFree IUse% Size Used Avail Use% File Mounted on
 EOF
 
 df -h --o=source,fstype,itotal,iused,iavail,ipcent \
- --o=size,used,avail,pcent,target '.' >out || fail=1
+ --o=size,used,avail,pcent,file,target '.' >out || fail=1
 sed -e '1 {
           s/ [ ]*/ /g
           q
@@ -127,4 +127,14 @@ compare exp out2 || fail=1
 df --help > out || fail=1
 grep ' --output' out >/dev/null || { fail=1; cat out; }
 
+# Ensure that the FILE field contains the argument.
+cat <<\EOF > exp || framework_failure_
+.
+exp
+EOF
+
+df --output=file '.' exp >out || fail=1
+sed '1d' out > out2
+compare exp out2 || fail=1
+
 Exit $fail
diff --git a/tests/df/df-symlink.sh b/tests/df/df-symlink.sh
new file mode 100755
index 00000000..6d96bd2a
--- /dev/null
+++ b/tests/df/df-symlink.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+# Ensure that df dereferences symlinks to disk nodes
+
+# Copyright (C) 2013-2014 Free Software Foundation, Inc.
+
+# 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 3 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/>.
+
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
+print_ver_ df
+
+disk=$(df --out=source '.' | tail -n1) ||
+  skip_ "cannot determine '.' file system"
+
+ln -s "$disk" symlink || framework_failure_
+
+df --out=source,target "$disk" > exp || skip_ "cannot get info for $disk"
+df --out=source,target symlink > out || fail=1
+compare exp out || fail=1
+
+# Ensure we output the same values for device nodes and '.'
+# This was not the case in coreutil-8.22 on systems
+# where the device in the mount list was a symlink itself.
+# I.E. '.' => /dev/mapper/fedora-home -> /dev/dm-2
+df --out=source,target '.' > out || fail=1
+compare exp out || fail=1
+
+Exit $fail
diff --git a/tests/df/header.sh b/tests/df/header.sh
index 3e61ba71..664ef800 100755
--- a/tests/df/header.sh
+++ b/tests/df/header.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that "df ." outputs a header.
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/df/no-mtab-status.sh b/tests/df/no-mtab-status.sh
index 896a9fe5..9ea2036d 100755
--- a/tests/df/no-mtab-status.sh
+++ b/tests/df/no-mtab-status.sh
@@ -2,7 +2,7 @@
 # Test df's behaviour when the mount list cannot be read.
 # This test is skipped on systems that lack LD_PRELOAD support; that's fine.
 
-# Copyright (C) 2012-2013 Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
 # 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
@@ -19,9 +19,16 @@
 
 . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 print_ver_ df
+require_gcc_shared_
 
 df || skip_ "df fails"
 
+grep '^#define HAVE_MNTENT_H 1' $CONFIG_HEADER > /dev/null \
+      || skip_ "no mntent.h available to confirm the interface"
+
+grep '^#define HAVE_GETMNTENT 1' $CONFIG_HEADER > /dev/null \
+      || skip_ "getmntent is not used on this system"
+
 # Simulate "mtab" failure.
 cat > k.c <<'EOF' || framework_failure_
 #include <stdio.h>
@@ -44,8 +51,8 @@ struct mntent *getmntent (FILE *fp)
 EOF
 
 # Then compile/link it:
-$CC -shared -fPIC -ldl -O2 k.c -o k.so \
-  || skip_ "getmntent hack does not work on this platform"
+gcc_shared_ k.c k.so \
+  || framework_failure_ 'failed to build shared library'
 
 # Test if LD_PRELOAD works:
 LD_PRELOAD=./k.so df
diff --git a/tests/df/over-mount-device.sh b/tests/df/over-mount-device.sh
new file mode 100755
index 00000000..a85ce8db
--- /dev/null
+++ b/tests/df/over-mount-device.sh
@@ -0,0 +1,57 @@
+#!/bin/sh
+# Ensure that df /dev/loop0 errors out if overmounted by another device
+
+# Copyright (C) 2014 Free Software Foundation, Inc.
+
+# 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 3 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/>.
+
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
+print_ver_ df
+require_root_
+
+cwd=$(pwd)
+cleanup_() { cd /; umount "$cwd/mnt"; umount "$cwd/mnt"; }
+
+skip=0
+
+# Create 2 file systems
+for i in 1 2; do
+  dd if=/dev/zero of=blob$i bs=8192 count=200 > /dev/null 2>&1 \
+                                             || skip=1
+  mkfs -t ext2 -F blob$i \
+    || skip_ "failed to create ext2 file system"
+done
+
+# Mount both at the same place (eclipsing the first)
+mkdir mnt                                    || skip=1
+mount -oloop blob1 mnt                       || skip=1
+eclipsed_dev=$(df --o=source mnt | tail -n1) || skip=1
+mount -oloop blob2 mnt                       || skip=1
+
+test $skip = 1 \
+  && skip_ "insufficient mount/ext2 support"
+
+df . || skip_ "failed to lookup the device for the current dir"
+
+echo "df: cannot access '$eclipsed_dev': over-mounted by another device" > exp
+
+# We should get an error for the eclipsed device and continue
+df $eclipsed_dev . > out 2> err && fail=1
+
+# header and single entry in output
+test $(wc -l < out) = 2 || fail=1
+
+compare exp err || fail=1
+
+Exit $fail
diff --git a/tests/df/problematic-chars.sh b/tests/df/problematic-chars.sh
index 86953213..bdabf0c0 100755
--- a/tests/df/problematic-chars.sh
+++ b/tests/df/problematic-chars.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that df outputs one line per entry
 
-# Copyright (C) 2012-2013 Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/df/skip-duplicates.sh b/tests/df/skip-duplicates.sh
index ad5249b5..52b9014a 100755
--- a/tests/df/skip-duplicates.sh
+++ b/tests/df/skip-duplicates.sh
@@ -2,7 +2,7 @@
 # Test df's behavior when the mount list contains duplicate entries.
 # This test is skipped on systems that lack LD_PRELOAD support; that's fine.
 
-# Copyright (C) 2012-2013 Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
 # 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
@@ -19,65 +19,108 @@
 
 . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 print_ver_ df
+require_gcc_shared_
 
-df || skip_ "df fails"
+# We use --local here so as to not activate
+# potentially very many remote mounts.
+df --local || skip_ "df fails"
 
-# Simulate an mtab file with two entries of the same device number.
+export CU_NONROOT_FS=$(df --local --output=target 2>&1 | grep /. | head -n1)
+test -z "$CU_NONROOT_FS" && unique_entries=1 || unique_entries=2
+
+grep '^#define HAVE_MNTENT_H 1' $CONFIG_HEADER > /dev/null \
+      || skip_ "no mntent.h available to confirm the interface"
+
+grep '^#define HAVE_GETMNTENT 1' $CONFIG_HEADER > /dev/null \
+      || skip_ "getmntent is not used on this system"
+
+# Simulate an mtab file to test various cases.
 cat > k.c <<'EOF' || framework_failure_
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <mntent.h>
 
+#define STREQ(a, b) (strcmp (a, b) == 0)
+
 struct mntent *getmntent (FILE *fp)
 {
+  static char *nonroot_fs;
+  static int done;
+
   /* Prove that LD_PRELOAD works. */
-  static int done = 0;
   if (!done)
     {
       fclose (fopen ("x", "w"));
       ++done;
     }
 
-  static struct mntent mntent;
+  static struct mntent mntents[] = {
+    {.mnt_fsname="/short",  .mnt_dir="/invalid/mount/dir"},
+    {.mnt_fsname="fsname",  .mnt_dir="/",},
+    {.mnt_fsname="/fsname", .mnt_dir="/."},
+    {.mnt_fsname="/fsname", .mnt_dir="/"},
+    {.mnt_fsname="virtfs",  .mnt_dir="/NONROOT", .mnt_type="fstype1"},
+    {.mnt_fsname="virtfs2", .mnt_dir="/NONROOT", .mnt_type="fstype2"},
+    {.mnt_fsname="netns",   .mnt_dir="net:[1234567]"},
+  };
+
+  if (done == 1)
+    {
+      nonroot_fs = getenv ("CU_NONROOT_FS");
+      if (!nonroot_fs || !*nonroot_fs)
+        nonroot_fs = "/"; /* merge into / entries.  */
+    }
+
+  if (done == 1 && !getenv ("CU_TEST_DUPE_INVALID"))
+    done++;  /* skip the first entry.  */
 
-  while (done++ < 4)
+  while (done++ <= 7)
     {
-      /* File system - Mounted on
-         fsname       /
-         /fsname      /root
-         /fsname      /
-      */
-      mntent.mnt_fsname = (done == 2) ? "fsname" : "/fsname";
-      mntent.mnt_dir = (done == 3) ? "/root" : "/";
-      mntent.mnt_type = "-";
-
-      return &mntent;
+      if (!mntents[done-2].mnt_type)
+        mntents[done-2].mnt_type = "-";
+      if (STREQ (mntents[done-2].mnt_dir, "/NONROOT"))
+        mntents[done-2].mnt_dir = nonroot_fs;
+      return &mntents[done-2];
     }
+
   return NULL;
 }
 EOF
 
 # Then compile/link it:
-gcc --std=gnu99 -shared -fPIC -ldl -O2 k.c -o k.so \
-  || skip_ "getmntent hack does not work on this platform"
+gcc_shared_ k.c k.so \
+  || framework_failure_ 'failed to build shared library'
 
 # Test if LD_PRELOAD works:
 LD_PRELOAD=./k.so df
 test -f x || skip_ "internal test failure: maybe LD_PRELOAD doesn't work?"
 
-# The fake mtab file should only contain 2 entries, both
+# The fake mtab file should only contain entries
 # having the same device number; thus the output should
-# consist of a header and one entry.
-LD_PRELOAD=./k.so df >out || fail=1
-test $(wc -l <out) -eq 2 || { fail=1; cat out; }
+# consist of a header and unique entries.
+LD_PRELOAD=./k.so df -T >out || fail=1
+test $(wc -l <out) -eq $(expr 1 + $unique_entries) || { fail=1; cat out; }
+
+# Ensure we don't fail when unable to stat (currently) unavailable entries
+LD_PRELOAD=./k.so CU_TEST_DUPE_INVALID=1 df -T >out || fail=1
+test $(wc -l <out) -eq $(expr 1 + $unique_entries) || { fail=1; cat out; }
 
 # df should also prefer "/fsname" over "fsname"
-test $(grep -c '/fsname' <out) -eq 1 || { fail=1; cat out; }
-# ... and "/fsname" with '/' as Mounted on over '/root'
-test $(grep -c '/root' <out) -eq 0 || { fail=1; cat out; }
+if test "$unique_entries" = 2; then
+  test $(grep -c '/fsname' <out) -eq 1 || { fail=1; cat out; }
+  # ... and "/fsname" with '/' as Mounted on over '/.'
+  test $(grep -cF '/.' <out) -eq 0 || { fail=1; cat out; }
+fi
+
+# df should use the last seen devname (mnt_fsname) and devtype (mnt_type)
+test $(grep -c 'virtfs2.*fstype2' <out) -eq 1 || { fail=1; cat out; }
 
 # Ensure that filtering duplicates does not affect -a processing.
 LD_PRELOAD=./k.so df -a >out || fail=1
-test $(wc -l <out) -eq 4 || { fail=1; cat out; }
+test $(wc -l <out) -eq 6 || { fail=1; cat out; }
+# Ensure placeholder "-" values used for the eclipsed "virtfs"
+test $(grep -c 'virtfs *-' <out) -eq 1 || { fail=1; cat out; }
 
 # Ensure that filtering duplicates does not affect
 # argument processing (now without the fake getmntent()).
diff --git a/tests/df/skip-rootfs.sh b/tests/df/skip-rootfs.sh
index 9c5d0a9f..94f32c6b 100755
--- a/tests/df/skip-rootfs.sh
+++ b/tests/df/skip-rootfs.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test df's behavior for skipping the pseudo "rootfs" file system.
 
-# Copyright (C) 2012-2013 Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/df/total-unprocessed.sh b/tests/df/total-unprocessed.sh
index f6885d5e..9b17c8aa 100755
--- a/tests/df/total-unprocessed.sh
+++ b/tests/df/total-unprocessed.sh
@@ -2,7 +2,7 @@
 # Ensure that df exits non-Zero and writes an error message when
 # --total is used but no file system has been processed.
 
-# Copyright (C) 2012-2013 Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
 # 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
@@ -25,11 +25,13 @@ cat <<\EOF > exp || framework_failure_
 df: no file systems processed
 EOF
 
-# The following simply finds no match for the combination
-# of the options --local and FS-type nfs together with the
-# argument ".". It must exit non-Zero nonetheless.
-df --local -t nfs --total '.' 2>out && fail=1
-compare exp out || fail=1
+# Check we exit with non-Zero.
+# Note we don't check when the file system can't be determined
+# as -t filtering is not applied in that case.
+if test "$(df --output=fstype . | tail -n1)" != '-'; then
+  df -t _non_existent_fstype_ --total . 2>out && fail=1
+  compare exp out || fail=1
+fi
 
 cat <<\EOF > exp || framework_failure_
 df: '_does_not_exist_': No such file or directory
diff --git a/tests/df/total-verify.sh b/tests/df/total-verify.sh
index a045ccf9..63cbe8f7 100755
--- a/tests/df/total-verify.sh
+++ b/tests/df/total-verify.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure "df --total" computes accurate totals
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/df/unreadable.sh b/tests/df/unreadable.sh
index 5ab2972b..4ad23373 100755
--- a/tests/df/unreadable.sh
+++ b/tests/df/unreadable.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ensure that df can handle an unreadable argument
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/du/2g.sh b/tests/du/2g.sh
index 17ca13e1..f766d4d9 100755
--- a/tests/du/2g.sh
+++ b/tests/du/2g.sh
@@ -3,7 +3,7 @@
 # Before coreutils-5.93, on systems with a signed, 32-bit stat.st_blocks
 # one of du's computations would overflow.
 
-# Copyright (C) 2005-2013 Free Software Foundation, Inc.
+# Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
 # 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
@@ -27,10 +27,7 @@ very_expensive_
 
 # Get number of free kilobytes on current partition, so we can
 # skip this test if there is insufficient free space.
-
-# This technique relies on the fact that the 'Available' kilobyte
-# count is the number just before the one with a trailing '%'.
-free_kb=$(df -kP .|tail -1|sed 's/ [0-9][0-9]*%.*//;s/ *$//;s/.* //')
+free_kb=$(df -k --output=avail . | tail -n1)
 case "$free_kb" in
   [0-9]*) ;;
   *) skip_ "invalid size from df: $free_kb";;
diff --git a/tests/du/8gb.sh b/tests/du/8gb.sh
index 8c172397..399fe7e5 100755
--- a/tests/du/8gb.sh
+++ b/tests/du/8gb.sh
@@ -2,7 +2,7 @@
 # Ensure that du does not rely on narrow types like size_t for
 # file sizes or sums.
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/du/basic.sh b/tests/du/basic.sh
index a97e08cc..75bc9be1 100755
--- a/tests/du/basic.sh
+++ b/tests/du/basic.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Compare actual numbers from du, assuming block size matches mine.
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/du/bigtime.sh b/tests/du/bigtime.sh
index 64e68610..eebdeb04 100755
--- a/tests/du/bigtime.sh
+++ b/tests/du/bigtime.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Exercise du on a file with a big time stamp.
 
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/du/bind-mount-dir-cycle.sh b/tests/du/bind-mount-dir-cycle.sh
index c70b41fb..ac6bf2e2 100755
--- a/tests/du/bind-mount-dir-cycle.sh
+++ b/tests/du/bind-mount-dir-cycle.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Exercise du's new ability to handle bind-mount-induced dir cycles.
 
-# Copyright (C) 2012-2013 Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
 # 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
@@ -27,12 +27,11 @@ mount --bind a a/b \
   || skip_ "This test requires mount with a working --bind option."
 
 echo a > exp || framework_failure_
-echo "du: mount point 'a/b' already traversed" > exp-err || framework_failure_
 
-du a > out 2> err && fail=1
+du a > out 2> err || fail=1
 sed 's/^[0-9][0-9]*	//' out > k && mv k out
 
-compare exp-err err || fail=1
+compare /dev/null err || fail=1
 compare exp out || fail=1
 
 Exit $fail
diff --git a/tests/du/deref-args.sh b/tests/du/deref-args.sh
index c1c5a4d4..50e525a1 100755
--- a/tests/du/deref-args.sh
+++ b/tests/du/deref-args.sh
@@ -2,7 +2,7 @@
 # Ensure that --dereference-args (-D) gives reasonable names.
 # This test would fail for coreutils-5.0.91.
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/du/deref.sh b/tests/du/deref.sh
index 7ac9aedb..543b7395 100755
--- a/tests/du/deref.sh
+++ b/tests/du/deref.sh
@@ -4,7 +4,7 @@
 # Also, up to coreutils-8.5, du -L sometimes incorrectly
 # counted the space of the followed symlinks.
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/du/exclude.sh b/tests/du/exclude.sh
index c9e0ef56..26ba598e 100755
--- a/tests/du/exclude.sh
+++ b/tests/du/exclude.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # make sure du's --exclude option works
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/du/fd-leak.sh b/tests/du/fd-leak.sh
index e278e70e..ba8518e1 100755
--- a/tests/du/fd-leak.sh
+++ b/tests/du/fd-leak.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # check for file descriptor leak
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/du/files0-from-dir.sh b/tests/du/files0-from-dir.sh
index d305fad0..67088434 100755
--- a/tests/du/files0-from-dir.sh
+++ b/tests/du/files0-from-dir.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ensure that du and wc handle --files0-from=DIR
 
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/du/files0-from.pl b/tests/du/files0-from.pl
index 7bb82ab9..13c03c0c 100755
--- a/tests/du/files0-from.pl
+++ b/tests/du/files0-from.pl
@@ -2,7 +2,7 @@
 # Exercise du's --files0-from option.
 # FIXME: keep this file in sync with tests/misc/wc-files0-from.
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/du/hard-link.sh b/tests/du/hard-link.sh
index 052cb4e3..1d431e4c 100755
--- a/tests/du/hard-link.sh
+++ b/tests/du/hard-link.sh
@@ -3,7 +3,7 @@
 # Likewise for excluded directories.
 # Ensure that hard links _are_ listed twice when using --count-links.
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/du/inacc-dest.sh b/tests/du/inacc-dest.sh
index 88e18945..578237c3 100755
--- a/tests/du/inacc-dest.sh
+++ b/tests/du/inacc-dest.sh
@@ -2,7 +2,7 @@
 # Prior to coreutils-6.5, an inaccessible destination dir (chmod a-x)
 # would cause du to exit prematurely on systems with native openat support.
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/du/inacc-dir.sh b/tests/du/inacc-dir.sh
index 911c04fc..4c053909 100755
--- a/tests/du/inacc-dir.sh
+++ b/tests/du/inacc-dir.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Ensure that du counts the size of an inaccessible directory.
-# Copyright (C) 2007-2013 Free Software Foundation, Inc.
+# Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/du/inaccessible-cwd.sh b/tests/du/inaccessible-cwd.sh
index cd00444b..663e0401 100755
--- a/tests/du/inaccessible-cwd.sh
+++ b/tests/du/inaccessible-cwd.sh
@@ -2,7 +2,7 @@
 # Ensure that even when run from an inaccessible directory, du can still
 # operate on accessible directories elsewhere.
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/du/inodes.sh b/tests/du/inodes.sh
new file mode 100755
index 00000000..6d2c28bb
--- /dev/null
+++ b/tests/du/inodes.sh
@@ -0,0 +1,140 @@
+#!/bin/sh
+# exercise du's --inodes option
+
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
+
+# 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 3 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/>.
+
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
+print_ver_ du
+
+# An empty directory uses only 1 inode.
+mkdir d || framework_failure_
+printf '1\td\n' > exp || framework_failure_
+
+du --inodes d > out 2>err || fail=1
+compare exp out || fail=1
+compare /dev/null err || fail=1
+
+# Add a regular file: 2 inodes used.
+touch d/f || framework_failure_
+printf '2\td\n' > exp || framework_failure_
+
+du --inodes d > out 2>err || fail=1
+compare exp out || fail=1
+compare /dev/null err || fail=1
+
+# Add a hardlink to the file: still only 2 inodes used.
+ln -v d/f d/h || framework_failure_
+du --inodes d > out 2>err || fail=1
+compare exp out || fail=1
+compare /dev/null err || fail=1
+
+# Now count also hardlinks (-l,--count-links): 3 inodes.
+printf '3\td\n' > exp || framework_failure_
+du --inodes -l d > out 2>err || fail=1
+compare exp out || fail=1
+compare /dev/null err || fail=1
+
+# Create a directory and summarize: 3 inodes.
+mkdir d/d || framework_failure_
+du --inodes -s d > out 2>err || fail=1
+compare exp out || fail=1
+compare /dev/null err || fail=1
+
+# Count inodes separated: 1-2.
+printf '1\td/d\n2\td\n' > exp || framework_failure_
+du --inodes -S d > out 2>err || fail=1
+compare exp out || fail=1
+compare /dev/null err || fail=1
+
+# Count inodes cumulative (default): 1-3.
+printf '1\td/d\n3\td\n' > exp || framework_failure_
+du --inodes d > out 2>err || fail=1
+compare exp out || fail=1
+compare /dev/null err || fail=1
+
+# Count all items: 1-1-3.
+# Sort output because the directory entry order is not defined.
+# Also replace the hardlink with the original file name because
+# the system may either return 'd/f' or 'd/h' first, and du(1)
+# will ignore the other one.
+printf '1\td/d\n1\td/f\n3\td\n' | sort > exp || framework_failure_
+du --inodes -a d > out.tmp 2>err || fail=1
+sed 's/h$/f/' out.tmp | sort >out || framework_failure_
+compare exp out || fail=1
+compare /dev/null err || fail=1
+
+# Count all items and hardlinks again: 1-1-1-4
+# Sort output because the directory entry order is not defined.
+printf '1\td/d\n1\td/h\n1\td/f\n4\td\n' | sort > exp || framework_failure_
+du --inodes -al d > out.tmp 2>err || fail=1
+sort <out.tmp >out || framework_failure_
+compare exp out || fail=1
+compare /dev/null err || fail=1
+
+# Run with total (-c) line: 1-3-3
+printf '1\td/d\n3\td\n3\ttotal\n' > exp || framework_failure_
+du --inodes -c d > out 2>err || fail=1
+compare exp out || fail=1
+compare /dev/null err || fail=1
+
+# Create another file in the subdirectory: 2-4
+touch d/d/f || framework_failure_
+printf '2\td/d\n4\td\n' > exp || framework_failure_
+du --inodes d > out 2>err || fail=1
+compare exp out || fail=1
+compare /dev/null err || fail=1
+
+# Ensure human output (-h, --si) works.
+rm -rf d || framework_failure_
+mkdir d || framework_failure_
+seq --format="d/file%g" 1023 | xargs touch || framework_failure_
+printf '1.0K\td\n' > exp || framework_failure_
+du --inodes -h d > out 2>err || fail=1
+compare exp out || fail=1
+compare /dev/null err || fail=1
+
+printf '1.1k\td\n' > exp || framework_failure_
+du --inodes --si d > out 2>err || fail=1
+compare exp out || fail=1
+compare /dev/null err || fail=1
+
+# Verify --inodes ignores -B.
+printf '1024\td\n' > exp || framework_failure_
+du --inodes -B10 d > out 2>err || fail=1
+compare exp out || fail=1
+compare /dev/null err || fail=1
+
+# Verify --inodes works with --threshold.
+printf '1024\td\n' > exp || framework_failure_
+du --inodes --threshold=1000 d > out 2>err || fail=1
+compare exp out || fail=1
+compare /dev/null err || fail=1
+
+du --inodes --threshold=-1000 d > out 2>err || fail=1
+compare /dev/null out || fail=1
+compare /dev/null err || fail=1
+
+# Verify --inodes raises a warning for --apparent-size and -b.
+du --inodes -b d > out 2>err || fail=1
+grep ' ineffective ' err >/dev/null || { fail=1; cat out err; }
+
+du --inodes --apparent-size d > out 2>err || fail=1
+grep ' ineffective ' err >/dev/null || { fail=1; cat out err; }
+
+# Ensure that --inodes is mentioned in the usage.
+du --help > out || fail=1
+grep ' --inodes ' out >/dev/null || { fail=1; cat out; }
+Exit $fail
diff --git a/tests/du/long-from-unreadable.sh b/tests/du/long-from-unreadable.sh
index 18bf384d..e343bb56 100755
--- a/tests/du/long-from-unreadable.sh
+++ b/tests/du/long-from-unreadable.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Show fts fails on old-fashioned systems.
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
@@ -31,6 +31,11 @@
 . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 print_ver_ du
 
+# ecryptfs for example uses some of the file name space
+# for encrypting filenames, so we must check dynamically.
+name_max=$(stat -f -c %l .)
+test "$name_max" -ge '200' || skip_ "NAME_MAX=$name_max is not sufficient"
+
 proc_file=/proc/self/fd
 if test ! -d $proc_file; then
   skip_ 'This test would fail, since your system lacks /proc support.'
diff --git a/tests/du/long-sloop.sh b/tests/du/long-sloop.sh
index faeabbf2..5168ac00 100755
--- a/tests/du/long-sloop.sh
+++ b/tests/du/long-sloop.sh
@@ -3,7 +3,7 @@
 # Show that du fails with ELOOP (Too many levels of symbolic links)
 # when it encounters that condition.
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/du/max-depth.sh b/tests/du/max-depth.sh
index 36167ff0..4d201095 100755
--- a/tests/du/max-depth.sh
+++ b/tests/du/max-depth.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # exercise du's --max-depth=N option
 
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/du/move-dir-while-traversing.sh b/tests/du/move-dir-while-traversing.sh
index ab670984..046dad90 100755
--- a/tests/du/move-dir-while-traversing.sh
+++ b/tests/du/move-dir-while-traversing.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Trigger a failed assertion in coreutils-8.9 and earlier.
 
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/du/no-deref.sh b/tests/du/no-deref.sh
index 65e5e4ad..0708bd35 100755
--- a/tests/du/no-deref.sh
+++ b/tests/du/no-deref.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that by default, du doesn't dereference command-line symlinks.
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/du/no-x.sh b/tests/du/no-x.sh
index 492bfa08..625eb96a 100755
--- a/tests/du/no-x.sh
+++ b/tests/du/no-x.sh
@@ -2,7 +2,7 @@
 # Make sure du gives the right diagnostic for a readable,
 # but inaccessible directory.
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/du/one-file-system.sh b/tests/du/one-file-system.sh
index f53b8853..db18d9b7 100755
--- a/tests/du/one-file-system.sh
+++ b/tests/du/one-file-system.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test for bugs in du's --one-file-system (-x) option.
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/du/restore-wd.sh b/tests/du/restore-wd.sh
index 5300554e..605399e4 100755
--- a/tests/du/restore-wd.sh
+++ b/tests/du/restore-wd.sh
@@ -2,7 +2,7 @@
 # due to a bug in glibc's ftw.c, in some cases, nftw w/FTW_CHDIR
 # would not restore the working directory.
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/du/slash.sh b/tests/du/slash.sh
index f0222784..3073cb1b 100755
--- a/tests/du/slash.sh
+++ b/tests/du/slash.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # 'du /' would omit the '/' on the last line.
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/du/threshold.sh b/tests/du/threshold.sh
index ee5217db..1985a6be 100644..100755
--- a/tests/du/threshold.sh
+++ b/tests/du/threshold.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Exercise du's --threshold option.
 
-# Copyright (C) 2013 Free Software Foundation, Inc.
+# Copyright (C) 2013-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/du/trailing-slash.sh b/tests/du/trailing-slash.sh
index 9fc51237..d6a935ad 100755
--- a/tests/du/trailing-slash.sh
+++ b/tests/du/trailing-slash.sh
@@ -2,7 +2,7 @@
 # Ensure that du works properly for an argument that refers to a
 # symbolic link, and that is specified with a trailing slash.
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/du/two-args.sh b/tests/du/two-args.sh
index f3dea761..b5ec3024 100755
--- a/tests/du/two-args.sh
+++ b/tests/du/two-args.sh
@@ -2,7 +2,7 @@
 # Make sure 'du d/1 d/2' works.
 # That command failed with du from fileutils-4.0q.
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/envvar-check b/tests/envvar-check
index 3846caea..b6d94b4c 100644
--- a/tests/envvar-check
+++ b/tests/envvar-check
@@ -1,7 +1,7 @@
 # -*- sh -*-
 # Check environment variables for sane values while testing.
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
@@ -43,6 +43,7 @@ vars='
   SIMPLE_BACKUP_SUFFIX
   TABSIZE
   TERM
+  COLORTERM
   TIME_STYLE
   TMPDIR
   VERSION_CONTROL
diff --git a/tests/factor/create-test.sh b/tests/factor/create-test.sh
index c81a8283..b9519725 100755
--- a/tests/factor/create-test.sh
+++ b/tests/factor/create-test.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Create the factor test scripts.
 
-# Copyright (C) 2012-2013 Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
 test_name=$1
 template=$2
diff --git a/tests/factor/run.sh b/tests/factor/run.sh
index dfe11648..d7bae642 100644..100755
--- a/tests/factor/run.sh
+++ b/tests/factor/run.sh
@@ -10,7 +10,7 @@
 #
 # See: tests/factor/create-test.sh
 
-# Copyright (C) 2012-2013 Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
 . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 
diff --git a/tests/fmt/base.pl b/tests/fmt/base.pl
index d74c1643..c6b97878 100755
--- a/tests/fmt/base.pl
+++ b/tests/fmt/base.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Basic tests for "fmt".
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/fmt/goal-option.sh b/tests/fmt/goal-option.sh
index 6f7b0e6c..d2d60c83 100755
--- a/tests/fmt/goal-option.sh
+++ b/tests/fmt/goal-option.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Exercise the fmt -g option.
 
-# Copyright (C) 2012-2013 Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/fmt/long-line.sh b/tests/fmt/long-line.sh
index 60f4a17e..33a85016 100755
--- a/tests/fmt/long-line.sh
+++ b/tests/fmt/long-line.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # make sure fmt -s works even on long lines
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/id-context.sh b/tests/id/context.sh
index dc023033..4629c1a0 100755
--- a/tests/misc/id-context.sh
+++ b/tests/id/context.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Ensure that "id" outputs SELinux context only without specified user
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/id/gnu-zero-uids.sh b/tests/id/gnu-zero-uids.sh
index 1b8739e1..89ca3097 100755
--- a/tests/id/gnu-zero-uids.sh
+++ b/tests/id/gnu-zero-uids.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # On GNU, 'id' must fail for processes with zero UIDs.
 
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/id/no-context.sh b/tests/id/no-context.sh
index 7038beb2..7b699278 100755
--- a/tests/id/no-context.sh
+++ b/tests/id/no-context.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # With POSIXLY_CORRECT, id must not print context=...
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/id/setgid.sh b/tests/id/setgid.sh
new file mode 100755
index 00000000..6d9d74f4
--- /dev/null
+++ b/tests/id/setgid.sh
@@ -0,0 +1,40 @@
+#!/bin/sh
+# Verify that id [-G] prints the right group when run set-GID.
+
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
+
+# 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 3 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/>.
+
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
+print_ver_ id
+require_root_
+
+# Construct a different group number
+gp1=$(expr $NON_ROOT_GID + 1)
+
+echo $gp1 > exp || framework_failure_
+
+# With coreutils-8.16 and earlier, id -G would print both:
+#  $gp1 $NON_ROOT_GID
+chroot --user=$NON_ROOT_USERNAME:+$gp1 --groups='' / env PATH="$PATH" \
+  id -G > out || fail=1
+compare exp out || fail=1
+
+# With coreutils-8.22 and earlier, id would erroneously print
+#  groups=$NON_ROOT_GID
+chroot --user=$NON_ROOT_USERNAME:+$gp1 --groups='' / env PATH="$PATH" \
+  id > out || fail=1
+grep -F "groups=$gp1" out || { cat out; fail=1; }
+
+Exit $fail
diff --git a/tests/id/smack.sh b/tests/id/smack.sh
new file mode 100755
index 00000000..227db3e8
--- /dev/null
+++ b/tests/id/smack.sh
@@ -0,0 +1,37 @@
+#!/bin/sh
+# SMACK test for the id-command.
+# Derived from tests/id/context.sh and tests/id/no-context.sh.
+# Copyright (C) 2014 Free Software Foundation, Inc.
+
+# 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 3 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/>.
+
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
+print_ver_ id
+
+require_smack_
+
+# Check the string "context=" presence without specified user.
+id > out || fail=1
+grep 'context=' out || { cat out; fail=1; }
+
+# Check context=" is absent without specified user in conforming mode.
+POSIXLY_CORRECT=1 id > out || fail=1
+grep 'context=' out && fail=1
+
+# Check the string "context=" absence with specified user.
+# But if the current user is nameless, skip this part.
+id -nu > /dev/null && id $(id -nu) > out
+grep 'context=' out && fail=1
+
+Exit $fail
diff --git a/tests/id/uid.sh b/tests/id/uid.sh
new file mode 100755
index 00000000..919ffbe2
--- /dev/null
+++ b/tests/id/uid.sh
@@ -0,0 +1,37 @@
+#!/bin/sh
+# Ensure that "id" works with numeric user ids
+# Copyright (C) 2013-2014 Free Software Foundation, Inc.
+
+# 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 3 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/>.
+
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
+print_ver_ id
+
+uid=$(id -u) || fail=1
+user=$(id -nu) || fail=1
+
+# Ensure the empty user spec is discarded
+id '' && fail=1
+
+for mode in '' '-G' '-g'; do
+  id $mode $user > user_out || fail=1 # lookup name for comparison
+
+  id $mode $uid > uid_out || fail=1   # lookup name "$uid" before id "$uid"
+  compare user_out uid_out || fail=1
+
+  id $mode +$uid > uid_out || fail=1  # lookup only id "$uid"
+  compare user_out uid_out || fail=1
+done
+
+Exit $fail
diff --git a/tests/id/zero.sh b/tests/id/zero.sh
new file mode 100755
index 00000000..c826ff43
--- /dev/null
+++ b/tests/id/zero.sh
@@ -0,0 +1,64 @@
+#!/bin/sh
+# Exercise "id --zero".
+
+# Copyright (C) 2013-2014 Free Software Foundation, Inc.
+
+# 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 3 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/>.
+
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
+print_ver_ id
+
+u="$( id -nu )"
+id || fail=1
+id "$u" || fail=1
+
+# id(1) should refuse --zero in default format.
+echo 'id: option --zero not permitted in default format' > err-exp \
+  || framework_failure_
+id --zero > out 2>err && fail=1
+compare /dev/null out || fail=1
+compare err-exp   err || fail=1
+
+# Create a nice list of users.
+# Add $USER to ensure we have at least one explicit entry.
+users="$u"
+# Add a few typical users to test single group and multiple groups.
+for u in root man postfix sshd nobody ; do
+  id $u >/dev/null 2>&1 && users="$users $u"
+done
+# Add $users and '' (implicit $USER) to list to process.
+printf '%s\n' $users '' >> users || framework_failure_
+
+# Exercise "id -z" with various options.
+printf '\n' > exp || framework_failure_
+> out || framework_failure_
+
+while read u ; do
+  for o in g gr G Gr u ur ; do
+    for n in '' n ; do
+      printf   '%s: ' "id -${o}${n}[z] $u" >> exp || framework_failure_
+      printf '\n%s: ' "id -${o}${n}[z] $u" >> out || framework_failure_
+      # There may be no name corresponding to an id, so don't check
+      # exit status when in name lookup mode
+      id -${o}${n}  $u >> exp || { test -z "$n" && fail=1; }
+      id -${o}${n}z $u  > tmp || { test -z "$n" && fail=1; }
+      head -c-1 < tmp >> out || framework_failure_
+    done
+  done
+done < users
+printf '\n' >> out || framework_failure_
+tr '\0' ' ' < out > out2 || framework_failure_
+compare exp out2 || fail=1
+
+Exit $fail
diff --git a/tests/init.sh b/tests/init.sh
index bd2048e2..fbd293d6 100644..100755
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -1,6 +1,6 @@
 # source this file; set up for tests
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
@@ -201,6 +201,8 @@ else
       *x*) opts_=-x ;;
       *) opts_= ;;
     esac
+    re_shell=$re_shell_
+    export re_shell
     exec "$re_shell_" $opts_ "$0" --no-reexec "$@"
     echo "$ME_: exec failed" 1>&2
     exit 127
diff --git a/tests/install/basic-1.sh b/tests/install/basic-1.sh
index 2e231645..0c0d1de8 100755
--- a/tests/install/basic-1.sh
+++ b/tests/install/basic-1.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Basic tests for "install".
 
-# Copyright (C) 1998-2013 Free Software Foundation, Inc.
+# Copyright (C) 1998-2014 Free Software Foundation, Inc.
 
 # 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
@@ -46,13 +46,17 @@ is not readable, so skipping the remaining tests in this file."
 cp "$just_built_dd" . || fail=1
 cp $dd $dd2 || fail=1
 
-strip $dd2 \
-  || warn_ "WARNING!!! Your strip command doesn't seem to work,
+strip=-s
+if ! strip $dd2; then
+  ! test -e $abs_top_builddir/src/coreutils \
+    && warn_ "WARNING!!! Your strip command doesn't seem to work,
 so skipping the test of install's --strip option."
+  strip=
+fi
 
 # This test would fail with 3.16s when using versions of strip that
 # don't work on read-only files (the one from binutils works fine).
-ginstall -s -c -m 555 $dd $dir || fail=1
+ginstall $strip -c -m 555 $dd $dir || fail=1
 # Make sure the source file is still around.
 test -f $dd || fail=1
 
@@ -112,4 +116,31 @@ ginstall: creating directory 'sub3/a/b/c'
 'file' -> 'sub3/a/b/c/file'
 EOF
 
+# Test -D together with -t (available since coreutils >= 8.23).
+# Let ginstall create a completely new destination hierarchy.
+ginstall -t sub4/a/b/c -Dv file >out 2>&1 || fail=1
+compare - out <<\EOF || fail=1
+ginstall: creating directory 'sub4'
+ginstall: creating directory 'sub4/a'
+ginstall: creating directory 'sub4/a/b'
+ginstall: creating directory 'sub4/a/b/c'
+'file' -> 'sub4/a/b/c/file'
+EOF
+
+# Ensure that -D with an already existing file as -t's option argument fails.
+touch sub4/file_exists || framework_failure_
+ginstall -t sub4/file_exists -Dv file >out 2>&1 && fail=1
+compare - out <<\EOF || fail=1
+ginstall: target 'sub4/file_exists' is not a directory
+EOF
+
+# Ensure that -D with an already existing directory for -t's option argument
+# succeeds.
+mkdir sub4/dir_exists || framework_failure_
+touch sub4/dir_exists || framework_failure_
+ginstall -t sub4/dir_exists -Dv file >out 2>&1 || fail=1
+compare - out <<\EOF || fail=1
+'file' -> 'sub4/dir_exists/file'
+EOF
+
 Exit $fail
diff --git a/tests/install/create-leading.sh b/tests/install/create-leading.sh
index 54a81b77..0bff21db 100755
--- a/tests/install/create-leading.sh
+++ b/tests/install/create-leading.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Test -D option.
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/install/d-slashdot.sh b/tests/install/d-slashdot.sh
index d6751891..044b8bf5 100755
--- a/tests/install/d-slashdot.sh
+++ b/tests/install/d-slashdot.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that ginstall -d works with arguments specified with a trailing "/.".
 
-# Copyright (C) 2005-2013 Free Software Foundation, Inc.
+# Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
 # 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
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
-print_ver_ install
+print_ver_ ginstall
 
 
 ginstall -d d1/. || fail=1
diff --git a/tests/install/install-C-root.sh b/tests/install/install-C-root.sh
index d8a8d846..473725af 100755
--- a/tests/install/install-C-root.sh
+++ b/tests/install/install-C-root.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure "install -C" compares owner and group.
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
@@ -20,6 +20,7 @@
 print_ver_ ginstall
 require_root_
 skip_if_setgid_
+skip_if_nondefault_group_
 
 u1=1
 u2=2
diff --git a/tests/install/install-C-selinux.sh b/tests/install/install-C-selinux.sh
index 8513d50b..722e5b01 100755
--- a/tests/install/install-C-selinux.sh
+++ b/tests/install/install-C-selinux.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure "install -C" compares SELinux context.
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
@@ -19,7 +19,7 @@
 . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 print_ver_ ginstall
 require_selinux_
-
+skip_if_nondefault_group_
 
 echo test > a || framework_failure_
 chcon -u system_u a || skip_ "chcon doesn't work"
diff --git a/tests/install/install-C.sh b/tests/install/install-C.sh
index 7d3582c4..9ee1685a 100755
--- a/tests/install/install-C.sh
+++ b/tests/install/install-C.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure "install -C" works. (basic tests)
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
@@ -19,6 +19,31 @@
 . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 print_ver_ ginstall
 skip_if_setgid_
+skip_if_nondefault_group_
+
+# Note if a group is not specified, install(1) will assume that a file
+# would be installed with the current user's group ID, and thus if the
+# file is the same except that it does have a different group due to
+# its parent directory being g+s for example, then the copy will be
+# done again redundantly in a futile attempt to reset the group ID to
+# that of the current user.
+#
+#  install -d -g wheel -m 2775 test  # Create setgid dir
+#  touch test/a                      # Create source
+#  install -Cv -m664 test/a test/i1  # install source with mode
+#  install -Cv -m664 test/i1 test/i2 # install dest
+#  install -Cv -m664 test/i1 test/i2 # again to see redundant install
+#
+# Similarly if an existing file exists that is the same and has the
+# current users group ID, but when an actual install of the file would
+# reset to a different group ID due to the directory being g+s for example,
+# then the install will not be done when it should.
+#
+#  install -Cv -m664 -g "$(id -nrg)" test/i1 test/i2 # set i2 to uesr's gid
+#  install -Cv -m664 test/i1 test/i2 # this should install but doesn't
+#
+# Therefore we skip the test in the presence of setgid dirs
+# An additional complication on HFS is that it...
 
 mode1=0644
 mode2=0755
@@ -29,7 +54,7 @@ echo test > a || framework_failure_
 echo "'a' -> 'b'" > out_installed_first || framework_failure_
 echo "removed 'b'
 'a' -> 'b'" > out_installed_second || framework_failure_
-: > out_empty || framework_failure_
+> out_empty || framework_failure_
 
 # destination file does not exist
 ginstall -Cv -m$mode1 a b > out || fail=1
diff --git a/tests/install/strip-program.sh b/tests/install/strip-program.sh
index 8950d50c..874329ae 100755
--- a/tests/install/strip-program.sh
+++ b/tests/install/strip-program.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure "install -s --strip-program=PROGRAM" uses the program to strip
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
@@ -33,4 +33,8 @@ echo aBc > exp || fail=1
 ginstall src dest -s --strip-program=./b || fail=1
 compare exp dest || fail=1
 
+# Check that install cleans up properly if strip fails.
+ginstall src dest2 -s --strip-program=./FOO && fail=1
+test -e dest2 && fail=1
+
 Exit $fail
diff --git a/tests/install/trap.sh b/tests/install/trap.sh
index 87887b2e..235cd1d1 100755
--- a/tests/install/trap.sh
+++ b/tests/install/trap.sh
@@ -2,7 +2,7 @@
 # Ensure that 'install -s' doesn't infloop when its parent
 # process traps CHLD signal.
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 
 # 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
@@ -24,7 +24,7 @@ print_ver_ ginstall
 # Use a subshell and an exec to work around a bug in FreeBSD 5.0 /bin/sh.
 (
   # ash doesn't support "trap '' CHLD"; it knows only signal numbers.
-  sig=$("$abs_top_builddir/src/kill" -l CHLD 2>/dev/null) && trap '' $sig
+  sig=$(env kill -l CHLD 2>/dev/null) && trap '' $sig
 
   # Before 2004-04-21, install would infloop, in the 'while (wait...' loop:
   exec ginstall -s "$abs_top_builddir/src/ginstall$EXEEXT" .
diff --git a/tests/ln/backup-1.sh b/tests/ln/backup-1.sh
index d712b2f8..15aff2d0 100755
--- a/tests/ln/backup-1.sh
+++ b/tests/ln/backup-1.sh
@@ -2,7 +2,7 @@
 # Try to create a symlink with backup where the destination file exists
 # and the backup file name is a hard link to the destination file.
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/ln/hard-backup.sh b/tests/ln/hard-backup.sh
index 18ed0311..5f867bc9 100755
--- a/tests/ln/hard-backup.sh
+++ b/tests/ln/hard-backup.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that 'ln --backup F F' gives a proper diagnostic.
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/ln/hard-to-sym.sh b/tests/ln/hard-to-sym.sh
index 26de099a..995d3cf6 100755
--- a/tests/ln/hard-to-sym.sh
+++ b/tests/ln/hard-to-sym.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Tests for ln -L/-P.
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/ln/misc.sh b/tests/ln/misc.sh
index 5db1bacf..0615d6c5 100755
--- a/tests/ln/misc.sh
+++ b/tests/ln/misc.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Miscellaneous tests for "ln".
 
-# Copyright (C) 1998-2013 Free Software Foundation, Inc.
+# Copyright (C) 1998-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/ln/relative.sh b/tests/ln/relative.sh
index 0418b8a0..5cf280a5 100755
--- a/tests/ln/relative.sh
+++ b/tests/ln/relative.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test "ln --relative".
 
-# Copyright (C) 2012-2013 Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
 # 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
@@ -29,4 +29,25 @@ test $(readlink usr/bin/foo) = '../lib/foo/foo' || fail=1
 ln -sr usr/bin/foo usr/lib/foo/link-to-foo
 test $(readlink usr/lib/foo/link-to-foo) = 'foo' || fail=1
 
+# Correctly update an existing link, which was broken in <= 8.21
+ln -s dir1/dir2/f existing_link
+ln -srf here existing_link
+test $(readlink existing_link) = 'here' || fail=1
+
+# Demonstrate resolved symlinks used to generate relative links
+# so here, 'web/latest' will not be linked to the intermediate 'latest' link.
+# You'd probably want to use realpath(1) in conjunction
+# with ln(1) without --relative to give greater control.
+ln -s release1 alpha
+ln -s release2 beta
+ln -s beta latest
+mkdir web
+ln -sr latest web/latest
+test $(readlink web/latest) = '../release2' || fail=1
+
+# Expect this to fail with exit status 1, or to succeed quietly (freebsd).
+# Prior to coreutils-8.23, it would segfault.
+ln -sr '' F
+case $? in [01]) ;; *) fail=1;; esac
+
 Exit $fail
diff --git a/tests/ln/sf-1.sh b/tests/ln/sf-1.sh
index cb864af4..17e67a9f 100755
--- a/tests/ln/sf-1.sh
+++ b/tests/ln/sf-1.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test "ln -sf".
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 
 # 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
@@ -20,12 +20,27 @@
 print_ver_ ln
 
 echo foo > a || framework_failure_
-ln -s . b || framework_failure_
 
+# Check that a target directory of '.' is supported
+# and that indirectly specifying the same target and link name
+# through that is detected.
+ln -s . b || framework_failure_
 ln -sf a b > err 2>&1 && fail=1
 case $(cat err) in
   *'are the same file') ;;
   *) fail=1 ;;
 esac
 
+# Ensure we replace symlinks that don't or can't link to an existing target.
+# coreutils-8.22 would fail to replace {ENOTDIR,ELOOP,ENAMETOOLONG}_link below.
+name_max_plus1=$(expr $(stat -f -c %l .) + 1)
+test $name_max_plus1 -gt 1 || skip_ 'Error determining NAME_MAX'
+long_name=$(printf '%0*d' $name_max_plus1 0)
+for f in '' f; do
+  ln -s$f missing ENOENT_link || fail=1
+  ln -s$f a/b ENOTDIR_link || fail=1
+  ln -s$f ELOOP_link ELOOP_link || fail=1
+  ln -s$f "$long_name" ENAMETOOLONG_link || fail=1
+done
+
 Exit $fail
diff --git a/tests/ln/slash-decorated-nonexistent-dest.sh b/tests/ln/slash-decorated-nonexistent-dest.sh
index baf5f77f..6e537a9b 100755
--- a/tests/ln/slash-decorated-nonexistent-dest.sh
+++ b/tests/ln/slash-decorated-nonexistent-dest.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ensure that touch f; ln -T f no-such-file/ does not mistakenly succeed
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/ln/target-1.sh b/tests/ln/target-1.sh
index 3e59cbc9..2ddad3fc 100755
--- a/tests/ln/target-1.sh
+++ b/tests/ln/target-1.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test "ln --target-dir" with one file.
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/local.mk b/tests/local.mk
index 9be19702..e0f1f84e 100644
--- a/tests/local.mk
+++ b/tests/local.mk
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-.
 
-## Copyright (C) 2007-2013 Free Software Foundation, Inc.
+## Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
 ## 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
@@ -65,7 +65,7 @@ TESTS_ENVIRONMENT =				\
   abs_top_builddir='$(abs_top_builddir)'	\
   abs_top_srcdir='$(abs_top_srcdir)'		\
   abs_srcdir='$(abs_srcdir)'			\
-  built_programs='$(built_programs)'		\
+  built_programs='$(built_programs) $(single_binary_progs)' \
   host_os=$(host_os)				\
   host_triplet='$(host_triplet)'		\
   srcdir='$(srcdir)'				\
@@ -77,7 +77,6 @@ TESTS_ENVIRONMENT =				\
   EGREP='$(EGREP)'				\
   EXEEXT='$(EXEEXT)'				\
   MAKE=$(MAKE)					\
-  PACKAGE_BUGREPORT='$(PACKAGE_BUGREPORT)'	\
   PACKAGE_VERSION=$(PACKAGE_VERSION)		\
   PERL='$(PERL)'				\
   PREFERABLY_POSIX_SHELL='$(PREFERABLY_POSIX_SHELL)' \
@@ -116,16 +115,18 @@ all_root_tests =				\
   tests/cp/sparse-fiemap.sh			\
   tests/dd/skip-seek-past-dev.sh		\
   tests/df/problematic-chars.sh			\
+  tests/df/over-mount-device.sh			\
   tests/du/bind-mount-dir-cycle.sh		\
+  tests/id/setgid.sh				\
   tests/install/install-C-root.sh		\
   tests/ls/capability.sh			\
   tests/ls/nameless-uid.sh			\
   tests/misc/chcon.sh				\
   tests/misc/chroot-credentials.sh		\
-  tests/misc/id-setgid.sh			\
   tests/misc/selinux.sh				\
   tests/misc/truncate-owned-by-other.sh		\
   tests/mkdir/writable-under-readonly.sh	\
+  tests/mkdir/smack-root.sh			\
   tests/mv/sticky-to-xpart.sh			\
   tests/rm/fail-2eperm.sh			\
   tests/rm/no-give-up.sh			\
@@ -162,6 +163,7 @@ all_tests =					\
   tests/rm/ext3-perf.sh				\
   tests/rm/cycle.sh				\
   tests/cp/link-heap.sh				\
+  tests/cp/no-ctx.sh				\
   tests/misc/tty-eof.pl				\
   tests/tail-2/inotify-hash-abuse.sh		\
   tests/tail-2/inotify-hash-abuse2.sh		\
@@ -202,6 +204,7 @@ all_tests =					\
   tests/rm/r-2.sh				\
   tests/rm/r-3.sh				\
   tests/rm/r-4.sh				\
+  tests/rm/r-root.sh				\
   tests/rm/readdir-bug.sh			\
   tests/rm/rm1.sh				\
   tests/touch/empty-file.sh			\
@@ -238,6 +241,7 @@ all_tests =					\
   tests/misc/xstrtol.pl				\
   tests/tail-2/pid.sh				\
   tests/misc/od.pl				\
+  tests/misc/od-endian.sh			\
   tests/misc/od-float.sh			\
   tests/misc/mktemp.pl				\
   tests/misc/arch.sh				\
@@ -245,8 +249,9 @@ all_tests =					\
   tests/pr/pr-tests.pl				\
   tests/misc/pwd-option.sh			\
   tests/misc/chcon-fail.sh			\
+  tests/misc/coreutils.sh			\
   tests/misc/cut.pl				\
-  tests/misc/cut-huge-to-eol-range.sh		\
+  tests/misc/cut-huge-range.sh			\
   tests/misc/wc.pl				\
   tests/misc/wc-files0-from.pl			\
   tests/misc/wc-files0.sh			\
@@ -261,6 +266,7 @@ all_tests =					\
   tests/misc/csplit.sh				\
   tests/misc/csplit-1000.sh			\
   tests/misc/csplit-heap.sh			\
+  tests/misc/csplit-suppress-matched.pl		\
   tests/misc/date-sec.sh			\
   tests/misc/dircolors.pl			\
   tests/misc/dirname.pl				\
@@ -274,9 +280,7 @@ all_tests =					\
   tests/misc/groups-version.sh			\
   tests/misc/head-c.sh				\
   tests/misc/head-pos.sh			\
-  tests/misc/id-context.sh			\
-  tests/misc/id-groups.sh			\
-  tests/misc/id-setgid.sh			\
+  tests/misc/head-write-error.sh		\
   tests/misc/md5sum.pl				\
   tests/misc/md5sum-bsd.sh			\
   tests/misc/md5sum-newline.pl			\
@@ -311,9 +315,11 @@ all_tests =					\
   tests/misc/sha384sum.pl			\
   tests/misc/sha512sum.pl			\
   tests/misc/shred-exact.sh			\
+  tests/misc/shred-negative.sh			\
   tests/misc/shred-passes.sh			\
   tests/misc/shred-remove.sh			\
   tests/misc/shuf.sh				\
+  tests/misc/shuf-reservoir.sh			\
   tests/misc/sort.pl				\
   tests/misc/sort-benchmark-random.sh		\
   tests/misc/sort-compress.sh			\
@@ -344,6 +350,7 @@ all_tests =					\
   tests/split/b-chunk.sh			\
   tests/split/fail.sh				\
   tests/split/lines.sh				\
+  tests/split/line-bytes.sh			\
   tests/split/l-chunk.sh			\
   tests/split/r-chunk.sh			\
   tests/split/numeric.sh			\
@@ -389,6 +396,8 @@ all_tests =					\
   tests/misc/uniq-perf.sh			\
   tests/misc/xattr.sh				\
   tests/tail-2/wait.sh				\
+  tests/tail-2/retry.sh				\
+  tests/tail-2/symlink.sh				\
   tests/chmod/c-option.sh			\
   tests/chmod/equal-x.sh			\
   tests/chmod/equals.sh				\
@@ -427,6 +436,7 @@ all_tests =					\
   tests/cp/file-perm-race.sh			\
   tests/cp/into-self.sh				\
   tests/cp/link.sh				\
+  tests/cp/link-deref.sh			\
   tests/cp/link-no-deref.sh			\
   tests/cp/link-preserve.sh			\
   tests/cp/link-symlink.sh			\
@@ -457,13 +467,16 @@ all_tests =					\
   tests/df/header.sh				\
   tests/df/df-P.sh				\
   tests/df/df-output.sh				\
+  tests/df/df-symlink.sh			\
   tests/df/unreadable.sh			\
   tests/df/total-unprocessed.sh			\
   tests/df/no-mtab-status.sh			\
   tests/df/skip-duplicates.sh			\
   tests/df/skip-rootfs.sh			\
+  tests/dd/ascii.sh				\
   tests/dd/direct.sh				\
   tests/dd/misc.sh				\
+  tests/dd/no-allocate.sh				\
   tests/dd/nocache.sh				\
   tests/dd/not-rewound.sh			\
   tests/dd/reblock.sh				\
@@ -490,6 +503,7 @@ all_tests =					\
   tests/du/inacc-dest.sh			\
   tests/du/inacc-dir.sh				\
   tests/du/inaccessible-cwd.sh			\
+  tests/du/inodes.sh				\
   tests/du/long-from-unreadable.sh		\
   tests/du/long-sloop.sh			\
   tests/du/max-depth.sh				\
@@ -504,6 +518,11 @@ all_tests =					\
   tests/du/two-args.sh				\
   tests/id/gnu-zero-uids.sh			\
   tests/id/no-context.sh			\
+  tests/id/context.sh				\
+  tests/id/uid.sh				\
+  tests/id/setgid.sh				\
+  tests/id/zero.sh				\
+  tests/id/smack.sh				\
   tests/install/basic-1.sh			\
   tests/install/create-leading.sh		\
   tests/install/d-slashdot.sh			\
@@ -524,6 +543,7 @@ all_tests =					\
   tests/ls/color-clear-to-eol.sh		\
   tests/ls/color-dtype-dir.sh			\
   tests/ls/color-norm.sh			\
+  tests/ls/color-term.sh			\
   tests/ls/dangle.sh				\
   tests/ls/dired.sh				\
   tests/ls/file-type.sh				\
@@ -552,14 +572,18 @@ all_tests =					\
   tests/mkdir/p-1.sh				\
   tests/mkdir/p-2.sh				\
   tests/mkdir/p-3.sh				\
+  tests/mkdir/p-acl.sh				\
   tests/mkdir/p-slashdot.sh			\
   tests/mkdir/p-thru-slink.sh			\
   tests/mkdir/p-v.sh				\
   tests/mkdir/parents.sh			\
   tests/mkdir/perm.sh				\
   tests/mkdir/selinux.sh			\
+  tests/mkdir/restorecon.sh			\
   tests/mkdir/special-1.sh			\
   tests/mkdir/t-slash.sh			\
+  tests/mkdir/smack-no-root.sh			\
+  tests/mkdir/smack-root.sh			\
   tests/mv/acl.sh				\
   tests/mv/atomic.sh				\
   tests/mv/atomic2.sh				\
@@ -650,7 +674,7 @@ $(factor_tests): $(tf)/run.sh $(tf)/create-test.sh
 	$(AM_V_at)$(SHELL) $(srcdir)/$(tf)/create-test.sh $@ \
 	  $(srcdir)/$(tf)/run.sh > $@-t
 	$(AM_V_at)chmod a+x $@-t
-	$(AM_V_at)mv $@-t $@
+	$(AM_V_at)mv -f $@-t $@
 
 CLEANFILES += $(factor_tests)
 
diff --git a/tests/ls/abmon-align.sh b/tests/ls/abmon-align.sh
index 4c7dc296..7630889e 100755
--- a/tests/ls/abmon-align.sh
+++ b/tests/ls/abmon-align.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure ls output is aligned when using abbreviated months from the locale
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/ls/block-size.sh b/tests/ls/block-size.sh
index 2ae5a0c5..c4861629 100755
--- a/tests/ls/block-size.sh
+++ b/tests/ls/block-size.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Exercise ls --block-size and related options.
 
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
 # 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
@@ -30,18 +30,18 @@ for size in 1024 4096 262144; do
 done
 touch -d '2001-01-01 00:00' file* || fail=1
 
-size_etc='s/[^ ]* *[^ ]* *[^ ]* *[^ ]* *//'
+size_etc='s/[^ ]* *[^ ]* *//'
 
-ls -l * | sed "$size_etc" >../out || fail=1
-POSIXLY_CORRECT=1 ls -l * | sed "$size_etc" >>../out || fail=1
-POSIXLY_CORRECT=1 ls -k -l * | sed "$size_etc" >>../out || fail=1
+ls -og * | sed "$size_etc" >../out || fail=1
+POSIXLY_CORRECT=1 ls -og * | sed "$size_etc" >>../out || fail=1
+POSIXLY_CORRECT=1 ls -k -og * | sed "$size_etc" >>../out || fail=1
 
 for var in BLOCKSIZE BLOCK_SIZE LS_BLOCK_SIZE; do
   for blocksize in 1 512 1K 1KiB; do
     (eval $var=$blocksize && export $var &&
-     ls -l * &&
-     ls -l -k * &&
-     ls -l -k --block-size=$blocksize *
+     ls -og * &&
+     ls -og -k * &&
+     ls -og -k --block-size=$blocksize *
     ) | sed "$size_etc" >>../out || fail=1
   done
 done
diff --git a/tests/ls/capability.sh b/tests/ls/capability.sh
index 6b41a39f..54ba296c 100755
--- a/tests/ls/capability.sh
+++ b/tests/ls/capability.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure "ls --color" properly colorizes file with capability.
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/ls/color-clear-to-eol.sh b/tests/ls/color-clear-to-eol.sh
index 3d393f47..a9cc6e91 100755
--- a/tests/ls/color-clear-to-eol.sh
+++ b/tests/ls/color-clear-to-eol.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ensure that ls --color works well when a colored name is wrapped
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/ls/color-dtype-dir.sh b/tests/ls/color-dtype-dir.sh
index fc96e21f..559a1884 100755
--- a/tests/ls/color-dtype-dir.sh
+++ b/tests/ls/color-dtype-dir.sh
@@ -4,7 +4,7 @@
 # directories the same as the first one -- but only on a file system
 # with dirent.d_type support.
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
@@ -30,7 +30,7 @@ chmod o+w other-writable || framework_failure_
 chmod o+t sticky || framework_failure_
 
 
-ls --color=always > out || fail=1
+TERM=xterm ls --color=always > out || fail=1
 cat -A out > o1 || fail=1
 mv o1 out || fail=1
 
diff --git a/tests/ls/color-norm.sh b/tests/ls/color-norm.sh
index 9910903b..23c01871 100755
--- a/tests/ls/color-norm.sh
+++ b/tests/ls/color-norm.sh
@@ -3,7 +3,7 @@
 # I.E. that it uses NORMAL to style non file name output and
 # file names with no associated color (unless FILE is also set).
 
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/ls/color-term.sh b/tests/ls/color-term.sh
new file mode 100755
index 00000000..8eb3783a
--- /dev/null
+++ b/tests/ls/color-term.sh
@@ -0,0 +1,48 @@
+#!/bin/sh
+# Ensure "ls --color" doesn't output colors for TERM=dumb
+
+# Copyright (C) 2014 Free Software Foundation, Inc.
+
+# 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 3 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/>.
+
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
+print_ver_ ls
+
+# Output time as something constant
+export TIME_STYLE="+norm"
+
+touch exe || framework_failure_
+chmod u+x exe || framework_failure_
+
+# output colors
+LS_COLORS='' COLORTERM='nonempty' TERM='' ls --color=always exe >> out || fail=1
+LS_COLORS='' COLORTERM='' TERM='xterm' ls --color=always exe >> out || fail=1
+
+# Don't output colors
+LS_COLORS='' COLORTERM='' TERM='dumb' ls --color=always exe >> out || fail=1
+LS_COLORS='' COLORTERM='' TERM='' ls --color=always exe >> out || fail=1
+
+cat -A out > out.display || framework_failure_
+mv out.display out || framework_failure_
+
+cat <<\EOF > exp || framework_failure_
+^[[0m^[[01;32mexe^[[0m$
+^[[0m^[[01;32mexe^[[0m$
+exe$
+exe$
+EOF
+
+compare exp out || fail=1
+
+Exit $fail
diff --git a/tests/ls/dangle.sh b/tests/ls/dangle.sh
index e22519d9..628f760b 100755
--- a/tests/ls/dangle.sh
+++ b/tests/ls/dangle.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Make sure ls properly handles dangling symlinks vs. ls's -L, -H, options.
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/ls/dired.sh b/tests/ls/dired.sh
index 82110034..e87590e7 100755
--- a/tests/ls/dired.sh
+++ b/tests/ls/dired.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # make sure --dired option works
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/ls/file-type.sh b/tests/ls/file-type.sh
index 62a7dcf7..0afa4d4e 100755
--- a/tests/ls/file-type.sh
+++ b/tests/ls/file-type.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # contrast ls -F, ls -p, and ls --indicator-style=file-type
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/ls/follow-slink.sh b/tests/ls/follow-slink.sh
index e099b602..3357439a 100755
--- a/tests/ls/follow-slink.sh
+++ b/tests/ls/follow-slink.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # make sure ls -L always follows symlinks
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/ls/getxattr-speedup.sh b/tests/ls/getxattr-speedup.sh
index 224362f0..0144571e 100755
--- a/tests/ls/getxattr-speedup.sh
+++ b/tests/ls/getxattr-speedup.sh
@@ -4,7 +4,7 @@
 # This test is skipped on systems that lack LD_PRELOAD support; that's fine.
 # Similarly, on a system that lacks getxattr altogether, skipping it is fine.
 
-# Copyright (C) 2012-2013 Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
 # 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
@@ -21,6 +21,7 @@
 
 . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 print_ver_ ls
+require_gcc_shared_
 
 # Replace each getxattr and lgetxattr call with a call to these stubs.
 # Count those and write the total number of calls to the file "x"
@@ -47,8 +48,8 @@ ssize_t lgetxattr(const char *path, const char *name, void *value, size_t size)
 EOF
 
 # Then compile/link it:
-$CC -shared -fPIC -O2 k.c -o k.so \
-  || framework_failure_ 'failed to compile with -shared -fPIC'
+gcc_shared_ k.c k.so \
+  || framework_failure_ 'failed to build shared library'
 
 # Create a few files:
 seq 20 | xargs touch || framework_failure_
diff --git a/tests/ls/infloop.sh b/tests/ls/infloop.sh
index a441ec2c..48d356a0 100755
--- a/tests/ls/infloop.sh
+++ b/tests/ls/infloop.sh
@@ -2,7 +2,7 @@
 # show that the following no longer makes ls infloop
 # mkdir loop; cd loop; ln -s ../loop sub; ls -RL
 # Also ensure ls exits with status = 2 in that case.
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/ls/inode.sh b/tests/ls/inode.sh
index 8d4bc79d..e09efa60 100755
--- a/tests/ls/inode.sh
+++ b/tests/ls/inode.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Make sure that ls -i works properly on symlinks.
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/ls/m-option.sh b/tests/ls/m-option.sh
index a66df9a9..2255b6eb 100755
--- a/tests/ls/m-option.sh
+++ b/tests/ls/m-option.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # exercise the -m option
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/ls/multihardlink.sh b/tests/ls/multihardlink.sh
index a7344444..4407ba61 100755
--- a/tests/ls/multihardlink.sh
+++ b/tests/ls/multihardlink.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure "ls --color" properly colorizes hard linked files.
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/ls/nameless-uid.sh b/tests/ls/nameless-uid.sh
index a7b9417c..db6c56ea 100755
--- a/tests/ls/nameless-uid.sh
+++ b/tests/ls/nameless-uid.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that ls -l works on files with nameless uid and/or gid
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/ls/no-arg.sh b/tests/ls/no-arg.sh
index a89780e0..e356a296 100755
--- a/tests/ls/no-arg.sh
+++ b/tests/ls/no-arg.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # make sure ls and 'ls -R' do the right thing when invoked with no arguments.
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/ls/no-cap.sh b/tests/ls/no-cap.sh
index 283f4f42..a75180c2 100755
--- a/tests/ls/no-cap.sh
+++ b/tests/ls/no-cap.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ensure that an empty "ca=" attribute disables ls's capability-checking
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/ls/proc-selinux-segfault.sh b/tests/ls/proc-selinux-segfault.sh
index 65790911..1b7a39be 100755
--- a/tests/ls/proc-selinux-segfault.sh
+++ b/tests/ls/proc-selinux-segfault.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ls -l /proc/sys would segfault when built against libselinux1 2.0.15-2+b1
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/ls/readdir-mountpoint-inode.sh b/tests/ls/readdir-mountpoint-inode.sh
index 07839713..83ebe68c 100755
--- a/tests/ls/readdir-mountpoint-inode.sh
+++ b/tests/ls/readdir-mountpoint-inode.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ensure that ls -i works also for mount points
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
@@ -21,9 +21,9 @@ print_ver_ ls
 
 # We use --local here so as to not activate
 # potentially very many remote mounts.
-mount_points=$(df --local -P 2>&1 | sed -n 's,.*[0-9]% \(/.\),\1,p')
-test -z "$mount_points" &&
-   skip_ "this test requires a non-root mount point"
+df --local --out=target | sed -n '/^\/./p' > mount_points
+test -s mount_points ||
+  skip_ "this test requires a non-root mount point"
 
 # Given e.g., /dev/shm, produce the list of GNU ls options that
 # let us list just that entry using readdir data from its parent:
@@ -48,23 +48,23 @@ ls_ignore_options()
 inode_via_readdir()
 {
   mount_point=$1
-  base=$(basename $mount_point)
-  case $base in
+  base=$(basename "$mount_point")
+  case "$base" in
     .*) skip_ 'mount point component starts with "."' ;;
     *[*?]*) skip_ 'mount point component contains "?" or "*"' ;;
   esac
   opts=$(ls_ignore_options "$base")
-  parent_dir=$(dirname $mount_point)
-  eval "ls -i $opts $parent_dir" | sed 's/ .*//'
+  parent_dir=$(dirname "$mount_point")
+  eval "ls -i $opts '$parent_dir'" | sed 's/ .*//'
 }
 
-for dir in $mount_points; do
-  readdir_inode=$(inode_via_readdir $dir)
+while read dir; do
+  readdir_inode=$(inode_via_readdir "$dir")
   test $? = 77 && continue
-  stat_inode=$(timeout 1 stat --format=%i $dir)
+  stat_inode=$(timeout 1 stat --format=%i "$dir")
   # If stat fails or says the inode is 0, skip $dir.
   case $stat_inode in 0|'') continue;; esac
   test "$readdir_inode" = "$stat_inode" || fail=1
-done
+done < mount_points
 
 Exit $fail
diff --git a/tests/ls/recursive.sh b/tests/ls/recursive.sh
index 94a414a2..be2d849b 100755
--- a/tests/ls/recursive.sh
+++ b/tests/ls/recursive.sh
@@ -2,7 +2,7 @@
 # 4.1.1 and 4.1.2 had a bug whereby some recursive listings
 # didn't include a blank line between per-directory groups of files.
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/ls/root-rel-symlink-color.sh b/tests/ls/root-rel-symlink-color.sh
index d90148da..2318a479 100755
--- a/tests/ls/root-rel-symlink-color.sh
+++ b/tests/ls/root-rel-symlink-color.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Exercise the 8.17 ls bug with coloring relative-named symlinks in "/".
 
-# Copyright (C) 2012-2013 Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/ls/rt-1.sh b/tests/ls/rt-1.sh
index 50ad1fd2..99c62afe 100755
--- a/tests/ls/rt-1.sh
+++ b/tests/ls/rt-1.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Make sure name is used as secondary key when sorting on mtime or ctime.
 
-# Copyright (C) 1998-2013 Free Software Foundation, Inc.
+# Copyright (C) 1998-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/ls/slink-acl.sh b/tests/ls/slink-acl.sh
index e02478a4..8ba3be15 100755
--- a/tests/ls/slink-acl.sh
+++ b/tests/ls/slink-acl.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # verify that ls -lL works when applied to a symlink to an ACL'd file
 
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/ls/stat-dtype.sh b/tests/ls/stat-dtype.sh
index 8bfc69d1..01da0c8a 100755
--- a/tests/ls/stat-dtype.sh
+++ b/tests/ls/stat-dtype.sh
@@ -3,7 +3,7 @@
 # Also check for the dtype-related (and fs-type dependent) bug
 # in coreutils-6.0 that made ls -CF columns misaligned.
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/ls/stat-failed.sh b/tests/ls/stat-failed.sh
index cdd7a4e9..9de018f3 100755
--- a/tests/ls/stat-failed.sh
+++ b/tests/ls/stat-failed.sh
@@ -2,7 +2,7 @@
 # Verify that ls works properly when it fails to stat a file that is
 # not mentioned on the command line.
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/ls/stat-free-color.sh b/tests/ls/stat-free-color.sh
index 3aacf961..72a09bb6 100755
--- a/tests/ls/stat-free-color.sh
+++ b/tests/ls/stat-free-color.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Show that --color need not use stat, as long as we have d_type support.
 
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,12 +18,16 @@
 
 . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 print_ver_ ls
-require_strace_ stat
+
+# Note this list of _file name_ stat functions must be
+# as cross platform as possible and so doesn't include
+# fstatat64 as that's not available on aarch64 for example.
+stats='stat,lstat,stat64,lstat64,newfstatat'
+
+require_strace_ $stats
 require_dirent_d_type_
 
-for i in 1 2 3; do
-  ln -s nowhere dangle-$i || framework_failure_
-done
+ln -s nowhere dangle || framework_failure_
 
 # Disable enough features via LS_COLORS so that ls --color
 # can do its job without calling stat (other than the obligatory
@@ -53,17 +57,18 @@ eval $(dircolors -b color-without-stat)
 # To avoid counting those, first get a baseline count by running
 # ls with only the --help option.  Then, compare that with the
 # invocation under test.
-strace -o log-help -e stat,lstat,stat64,lstat64 ls --help >/dev/null || fail=1
+strace -o log-help -e $stats ls --help >/dev/null || fail=1
 n_lines_help=$(wc -l < log-help)
 
-strace -o log -e stat,lstat,stat64,lstat64 ls --color=always . || fail=1
+strace -o log -e $stats ls --color=always . || fail=1
 n_lines=$(wc -l < log)
 
 n_stat=$(expr $n_lines - $n_lines_help)
 
-# Expect one or two stat calls.
+# Expect one stat call.
 case $n_stat in
-  1) ;;
+  0) skip_ 'No stat calls recognized on this platform' ;;
+  1) ;; # Corresponding to stat(".")
   *) fail=1; head -n30 log* ;;
 esac
 
diff --git a/tests/ls/stat-free-symlinks.sh b/tests/ls/stat-free-symlinks.sh
index 33cd16a8..0bc4c6aa 100755
--- a/tests/ls/stat-free-symlinks.sh
+++ b/tests/ls/stat-free-symlinks.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ensure that ls does not stat a symlink in an unusual case
 
-# Copyright (C) 2007-2013 Free Software Foundation, Inc.
+# Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/ls/stat-vs-dirent.sh b/tests/ls/stat-vs-dirent.sh
index b54f5503..57c718a9 100755
--- a/tests/ls/stat-vs-dirent.sh
+++ b/tests/ls/stat-vs-dirent.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that d_ino (from ls -di) and st_ino (from stat --format=%i) match.
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
@@ -30,7 +30,7 @@ while :; do
     d_ino=$(sed -n '1s/^ *\([0-9][0-9]*\) .*/\1/p;q' tmp)
 
     # Extract the name of the corresponding directory entry.
-    file=$(sed -n '1s/^ *[0-9][0-9]*  *//p;q' tmp)
+    file=$(sed -n '1s/^ *[0-9][0-9]* //p;q' tmp)
 
     # Get its inode number (stat.st_ino) via stat(1)'s call to lstat.
     st_ino=$(stat --format=%i "$t/$file")
diff --git a/tests/ls/symlink-slash.sh b/tests/ls/symlink-slash.sh
index 5e64a52b..da5da28f 100755
--- a/tests/ls/symlink-slash.sh
+++ b/tests/ls/symlink-slash.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Do dereference a symlink arg if its name is written with a trailing slash.
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/ls/time-style-diag.sh b/tests/ls/time-style-diag.sh
index e9d32989..d292c982 100755
--- a/tests/ls/time-style-diag.sh
+++ b/tests/ls/time-style-diag.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that an invalid --time-style=ARG is diagnosed the way we want.
 
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/ls/x-option.sh b/tests/ls/x-option.sh
index f1bc69d9..f009cdc2 100755
--- a/tests/ls/x-option.sh
+++ b/tests/ls/x-option.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Exercise the -x option.
 
-# Copyright (C) 2007-2013 Free Software Foundation, Inc.
+# Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/arch.sh b/tests/misc/arch.sh
index db2b784f..95369067 100755
--- a/tests/misc/arch.sh
+++ b/tests/misc/arch.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that arch output is equal to uname -m
 
-# Copyright (C) 2007-2013 Free Software Foundation, Inc.
+# Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/base64.pl b/tests/misc/base64.pl
index 5d1d2621..54e2cc21 100755
--- a/tests/misc/base64.pl
+++ b/tests/misc/base64.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Exercise base64.
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/basename.pl b/tests/misc/basename.pl
index b84412bb..3aace6f8 100755
--- a/tests/misc/basename.pl
+++ b/tests/misc/basename.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 # Test basename.
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/cat-buf.sh b/tests/misc/cat-buf.sh
index 17fd936f..592b5a1d 100755
--- a/tests/misc/cat-buf.sh
+++ b/tests/misc/cat-buf.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that cat outputs processed data immediately.
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/cat-proc.sh b/tests/misc/cat-proc.sh
index 77f548e4..7b826ef3 100755
--- a/tests/misc/cat-proc.sh
+++ b/tests/misc/cat-proc.sh
@@ -2,7 +2,7 @@
 # Ensure that cat -E produces same output as cat, module '$'s,
 # even when applied to a file in /proc.
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/chcon-fail.sh b/tests/misc/chcon-fail.sh
index c9b651b7..77b91d3b 100755
--- a/tests/misc/chcon-fail.sh
+++ b/tests/misc/chcon-fail.sh
@@ -2,7 +2,7 @@
 # Ensure that chcon fails when it should.
 # These tests don't use any actual SE Linux syscalls.
 
-# Copyright (C) 2007-2013 Free Software Foundation, Inc.
+# Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/chcon.sh b/tests/misc/chcon.sh
index aace5389..ec573967 100755
--- a/tests/misc/chcon.sh
+++ b/tests/misc/chcon.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # exercise chcon
 
-# Copyright (C) 2007-2013 Free Software Foundation, Inc.
+# Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/chroot-credentials.sh b/tests/misc/chroot-credentials.sh
index 8eb658d9..b06e8b7f 100755
--- a/tests/misc/chroot-credentials.sh
+++ b/tests/misc/chroot-credentials.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Verify that the credentials are changed correctly.
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
@@ -22,31 +22,96 @@ print_ver_ chroot
 
 require_root_
 
+grep '^#define HAVE_SETGROUPS 1' "$CONFIG_HEADER" >/dev/null \
+  && HAVE_SETGROUPS=1
+
+root=$(id -nu 0) || skip_ "Couldn't look up root username"
+
+# verify numeric IDs looked up similarly to names
+NON_ROOT_UID=$(id -u $NON_ROOT_USERNAME)
+NON_ROOT_GROUP=$NON_ROOT_GID # Used where we want name lookups to occur
+
+# "uid:" is supported (unlike chown etc.) since we treat it like "uid"
+chroot --userspec=$NON_ROOT_UID: / true || fail=1
+
+# verify that invalid groups are diagnosed
+for g in ' ' ',' '0trail'; do
+  test "$(chroot --groups="$g" / id -G)" && fail=1
+done
 
 # Verify that root credentials are kept.
-test $(chroot / whoami) = root || fail=1
+test $(chroot / whoami) = "$root" || fail=1
 test "$(groups)" = "$(chroot / groups)" || fail=1
 
 # Verify that credentials are changed correctly.
 whoami_after_chroot=$(
   chroot --userspec=$NON_ROOT_USERNAME:$NON_ROOT_GROUP / whoami
 )
-test "$whoami_after_chroot" != root || fail=1
+test "$whoami_after_chroot" != "$root" || fail=1
+
+# Verify that when specifying only a group we don't change the
+# list of supplemental groups
+test "$(chroot --userspec=:$NON_ROOT_GROUP / id -G)" = \
+     "$NON_ROOT_GID $(id -G)" || fail=1
+
+if ! test "$HAVE_SETGROUPS"; then
+  Exit $fail
+fi
+
 
 # Verify that there are no additional groups.
 id_G_after_chroot=$(
   chroot --userspec=$NON_ROOT_USERNAME:$NON_ROOT_GROUP \
     --groups=$NON_ROOT_GROUP / id -G
 )
-test "$id_G_after_chroot" = $NON_ROOT_GROUP || fail=1
+test "$id_G_after_chroot" = $NON_ROOT_GID || fail=1
+
+# Verify that when specifying only the user name we get all their groups
+test "$(chroot --userspec=$NON_ROOT_USERNAME / id -G)" = \
+     "$(id -G $NON_ROOT_USERNAME)" || fail=1
 
-# Verify that when specifying only the user name we get the current
-# primary group ID.
-test "$(chroot --userspec=$NON_ROOT_USERNAME / id -g)" = "$(id -g)" \
-    || fail=1
+# Ditto with trailing : on the user name.
+test "$(chroot --userspec=$NON_ROOT_USERNAME: / id -G)" = \
+     "$(id -G $NON_ROOT_USERNAME)" || fail=1
+
+# Verify that when specifying only the user and clearing supplemental groups
+# that we only get the primary group
+test "$(chroot --userspec=$NON_ROOT_USERNAME --groups='' / id -G)" = \
+     $NON_ROOT_GID || fail=1
+
+# Verify that when specifying only the UID we get all their groups
+test "$(chroot --userspec=$NON_ROOT_UID / id -G)" = \
+     "$(id -G $NON_ROOT_USERNAME)" || fail=1
+
+# Verify that when specifying only the user and clearing supplemental groups
+# that we only get the primary group. Note this variant with prepended '+'
+# results in no lookups in the name database which could be useful depending
+# on your chroot setup.
+test "$(chroot --userspec=+$NON_ROOT_UID:+$NON_ROOT_GID --groups='' / id -G)" =\
+     $NON_ROOT_GID || fail=1
 
 # Verify that when specifying only a group we get the current user ID
 test "$(chroot --userspec=:$NON_ROOT_GROUP / id -u)" = "$(id -u)" \
-    || fail=1
+  || fail=1
+
+# verify that arbitrary numeric IDs are supported
+test "$(chroot --userspec=1234:+5678 --groups=' +8765,4321' / id -G)" \
+  || fail=1
+
+# demonstrate that extraneous commas are supported
+test "$(chroot --userspec=1234:+5678 --groups=',8765,,4321,' / id -G)" \
+  || fail=1
+
+# demonstrate that --groups is not cumulative
+test "$(chroot --groups='invalid ignored' --groups='' / id -G)" \
+  || fail=1
+
+if ! id -u +12342; then
+  # Ensure supplemental groups cleared from some arbitrary unknown ID
+  test "$(chroot --userspec=+12342:+5678 / id -G)" = '5678' || fail=1
+
+  # Ensure we fail when we don't know what groups to set for an unknown ID
+  chroot --userspec=+12342 / true && fail=1
+fi
 
 Exit $fail
diff --git a/tests/misc/chroot-fail.sh b/tests/misc/chroot-fail.sh
index 86095f3c..a84826fd 100755
--- a/tests/misc/chroot-fail.sh
+++ b/tests/misc/chroot-fail.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Verify that internal failure in chroot gives exact status.
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
@@ -20,6 +20,7 @@
 . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 print_ver_ chroot
 
+require_built_ chroot
 
 # These tests verify exact status of internal failure; since none of
 # them actually run a command, we don't need root privileges
@@ -28,16 +29,20 @@ test $? = 125 || fail=1
 chroot --- / true # unknown option
 test $? = 125 || fail=1
 
-# chroot("/") succeeds for non-root users on some systems, but not all.
-if chroot / true ; then
-  chroot / sh -c 'exit 2' # exit status propagation
-  test $? = 2 || fail=1
-  chroot / . # invalid command
-  test $? = 126 || fail=1
-  chroot / no_such # no such command
-  test $? = 127 || fail=1
-else
-  test $? = 125 || fail=1
-fi
+# Note chroot("/") succeeds for non-root users on some systems, but not all,
+# however we avoid the chroot() with "/" to have common behvavior.
+chroot / sh -c 'exit 2' # exit status propagation
+test $? = 2 || fail=1
+chroot / . # invalid command
+test $? = 126 || fail=1
+chroot / no_such # no such command
+test $? = 127 || fail=1
+
+# Ensure we don't chdir("/") when not changing root
+# to allow only changing user ids for a command.
+for dir in '/' '/.' '/../'; do
+  curdir=$(chroot "$dir" env pwd) || fail=1
+  test "$curdir" = '/' && fail=1
+done
 
 Exit $fail
diff --git a/tests/misc/close-stdout.sh b/tests/misc/close-stdout.sh
index 8ea08487..4da696c4 100755
--- a/tests/misc/close-stdout.sh
+++ b/tests/misc/close-stdout.sh
@@ -2,7 +2,7 @@
 # Ensure that several programs work fine, even with stdout initially closed.
 # This is effectively a test of closeout.c's close_stdout function.
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/comm.pl b/tests/misc/comm.pl
index 62711bda..c96939b1 100755
--- a/tests/misc/comm.pl
+++ b/tests/misc/comm.pl
@@ -2,7 +2,7 @@
 # -*- perl -*-
 # Test comm
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/coreutils.sh b/tests/misc/coreutils.sh
new file mode 100755
index 00000000..a22bc9f6
--- /dev/null
+++ b/tests/misc/coreutils.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+# Verify behavior of separate coreutils multicall binary
+
+# Copyright (C) 2014 Free Software Foundation, Inc.
+
+# 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 3 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/>.
+
+
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
+print_ver_ coreutils
+
+test -s "$abs_top_builddir/src/coreutils.h" \
+ || skip_ "multicall binary is disabled"
+
+# Yes outputs all its params so is good to verify argv manipulations
+echo 'y' > exp
+coreutils --coreutils-prog=yes | head -n10 | uniq > out
+compare exp out || fail=1
+
+# Ensure if incorrect program passed, we diagnose
+echo "coreutils: unknown program 'blah'" > exp
+coreutils --coreutils-prog='blah' --help 2>err && fail=1
+compare exp err || fail=1
+
+Exit $fail
diff --git a/tests/misc/csplit-1000.sh b/tests/misc/csplit-1000.sh
index 26cb8a8c..6757a464 100755
--- a/tests/misc/csplit-1000.sh
+++ b/tests/misc/csplit-1000.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # cause a 1-byte heap buffer overrun
 
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/csplit-heap.sh b/tests/misc/csplit-heap.sh
index 82945a78..03fc9a36 100755
--- a/tests/misc/csplit-heap.sh
+++ b/tests/misc/csplit-heap.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ensure that csplit uses a bounded amount of memory
 
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
 # 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
@@ -19,7 +19,7 @@
 . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 print_ver_ csplit
 
-require_ulimit_
+require_ulimit_v_
 
 (
  ulimit -v 20000
diff --git a/tests/misc/csplit-suppress-matched.pl b/tests/misc/csplit-suppress-matched.pl
new file mode 100755
index 00000000..cea64e4f
--- /dev/null
+++ b/tests/misc/csplit-suppress-matched.pl
@@ -0,0 +1,213 @@
+#!/usr/bin/perl
+
+# Copyright (C) 2013-2014 Free Software Foundation, Inc.
+
+# 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 3 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/>.
+
+use strict;
+use Data::Dumper;
+
+my $limits = getlimits ();
+
+my $prog = 'csplit';
+
+# Turn off localization of executable's output.
+@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
+
+# Input from 'seq 6'
+my $IN_SEQ_6 =<<EOF;
+1
+2
+3
+4
+5
+6
+EOF
+
+# Input from a possible run of 'uniq --group'
+# (groups separated by empty lines)
+my $IN_UNIQ =<<EOF;
+a
+a
+YY
+
+XX
+b
+b
+YY
+
+XX
+c
+YY
+
+XX
+d
+d
+d
+EOF
+
+# Standard Coreotils::run_tests() structure, except the addition of
+# "OUTPUTS" array, containing the expected content of the output files.
+# See code below for conversion into PRE/CMP/POST checks.
+my @csplit_tests =
+(
+  # without --suppress-matched,
+  # the newline (matched line) appears in the output files
+  ["re-base", "-q - '/^\$/' '{*}'", {IN_PIPE => $IN_UNIQ},
+    {OUTPUTS => [ "a\na\nYY\n", "\nXX\nb\nb\nYY\n","\nXX\nc\nYY\n",
+                  "\nXX\nd\nd\nd\n" ] }],
+
+  # the newline (matched line) does not appears in the output files
+  ["re-1", " --suppress-matched -q - '/^\$/' '{*}'", {IN_PIPE => $IN_UNIQ},
+    {OUTPUTS => ["a\na\nYY\n", "XX\nb\nb\nYY\n", "XX\nc\nYY\n",
+                 "XX\nd\nd\nd\n"]}],
+
+  # the 'XX' (matched line + offset 1) does not appears in the output files.
+  # the newline appears in the files (before each split, at the end of the file)
+  ["re-2", "--suppress-matched -q - '/^\$/1' '{*}'", {IN_PIPE => $IN_UNIQ},
+    {OUTPUTS => ["a\na\nYY\n\n","b\nb\nYY\n\n","c\nYY\n\n","d\nd\nd\n"]}],
+
+  # the 'YY' (matched line + offset of -1) does not appears in the output files
+  # the newline appears in the files (as the first line of the new split)
+  ["re-3", " --suppress-matched -q - '/^\$/-1' '{*}'", {IN_PIPE => $IN_UNIQ},
+    {OUTPUTS => ["a\na\n", "\nXX\nb\nb\n", "\nXX\nc\n", "\nXX\nd\nd\nd\n"]}],
+
+  # Test two consecutive matched lines
+  # without suppress-matched, the second file should contain a single newline.
+  ["re-4.1", "-q - '/^\$/' '{*}'", {IN_PIPE => "a\n\n\nb\n"},
+    {OUTPUTS => [ "a\n", "\n", "\nb\n" ]}],
+  # suppress-matched will cause the second file to be empty.
+  ["re-4.2", "--suppress-match -q - '/^\$/' '{*}'", {IN_PIPE => "a\n\n\nb\n"},
+    {OUTPUTS => [ "a\n", "", "b\n" ]}],
+  # suppress-matched + elide-empty should output just two files.
+  ["re-4.3", "--suppress-match -zq - '/^\$/' '{*}'", {IN_PIPE => "a\n\n\nb\n"},
+    {OUTPUTS => [ "a\n", "b\n" ]}],
+
+
+  # Test a matched-line as the last line
+  # default: last file with newline should be created.
+  ["re-5.1", "-q - '/^\$/' '{*}'", {IN_PIPE => "a\n\nb\n\n"},
+    {OUTPUTS => [ "a\n", "\nb\n", "\n" ]}],
+  # suppress-matched - last empty files should be created.
+  ["re-5.2", "--suppress-match -q - '/^\$/' '{*}'", {IN_PIPE => "a\n\nb\n\n"},
+    {OUTPUTS => [ "a\n", "b\n", "" ]}],
+  # suppress-matched + elide-empty: just two files should be created.
+  ["re-5.3", "--suppress-match -zq - '/^\$/' '{*}'", {IN_PIPE => "a\n\nb\n\n"},
+    {OUTPUTS => [ "a\n", "b\n" ]}],
+
+  # without suppress-matched,
+  # the matched lines (2/4/6) appears in the output files
+  ["int-base",    '-q - 2 4 6', {IN_PIPE => $IN_SEQ_6},
+    {OUTPUTS => [ "1\n", "2\n3\n", "4\n5\n", "6\n" ]}],
+  # suppress matched - the matching lines (2/4/6) should not appear.
+  ["int-1", '--suppress-matched -q - 2 4 6', {IN_PIPE => $IN_SEQ_6},
+    {OUTPUTS => [ "1\n", "3\n", "5\n", "" ]}],
+  # suppress matched + elide-empty
+  ["int-2", '--suppress-matched -zq - 2 4 6', {IN_PIPE => $IN_SEQ_6},
+    {OUTPUTS => [ "1\n", "3\n", "5\n" ]}],
+);
+
+
+
+=pod
+The following loop translate the above @Tests to a Cureutils::run_tests()
+compatible structure. It converts "OUTPUTS" key into "CMP" + "POST" keys:
+1. Each element in the OUTPUTS key is expected to be an output file
+   from csplit (named xx00, xx01, xx02...)
+   create a "CMP" key for each one, with the output and the filename.
+2. Add a "POST" key, ensuring no extra files have been created.
+   (e.g. if there are 4 expected outputs, xx00 to xx03,
+    ensure xx04 doesn't exist).
+3. Add a "PRE" key, deleting all existing 'xx*' files.
+
+Example:
+
+Before conversion:
+   my @csplit_tests =
+   (
+     ["1", '-z -q - 2 4 6',
+       {IN_PIPE => "1\n2\n3\n4\n5\n6\n"},
+       {OUTPUTS => [ "1\n", "2\n3\n", "4\n5\n", "6\n" ],
+     ]
+   )
+
+After conversion:
+
+   my @csplit_tests =
+   (
+     ["1", '-z -q - 2 4 6',
+       {IN_PIPE => "1\n2\n3\n4\n5\n6\n"},
+       {PRE => sub { unlink glob './xx??' ; }},
+       {CMP => ["1\n",    {'xx00'=> undef}]},
+       {CMP => ["2\n3\n", {'xx01'=> undef}]},
+       {CMP => ["4\n5\n", {'xx02'=> undef}]},
+       {CMP => ["6\n",    {'xx03'=> undef}]},
+       {POST => sub { die "extra file" if -e 'xx04'}},
+     ],
+    );
+=cut
+my @Tests;
+foreach my $t (@csplit_tests)
+  {
+    my ($test_name, $cmdline, @others) = @$t;
+    my $new_ent = [$test_name, $cmdline];
+
+    my $out_file_num = 0 ;
+
+    foreach my $e (@others)
+      {
+        die "Internal error: expecting a hash (e.g. IN_PIPE/OUTPUTS/ERR)" .
+            "in test '$test_name', got $e"
+            unless ref $e && (ref $e eq 'HASH');
+
+        my ($key, $value) = each %$e;
+        if ($key eq 'OUTPUTS')
+          {
+            # Convert each expected OUTPUT to a 'CMP' key.
+            foreach my $output (@$value)
+              {
+                my $filename = sprintf("xx%02d",$out_file_num++);
+                my $cmp = {CMP => [ $output, { $filename => undef}]};
+                push @$new_ent, $cmp;
+              }
+
+            # Add a 'POST' check
+            # Ensure no extra files have been created.
+            my $filename = sprintf("xx%02d",$out_file_num++);
+            my $post = { POST => sub { die "Test failed: an extraneous file " .
+                                "'$filename' has been created\n"
+                                if -e $filename; } } ;
+            push @$new_ent, $post;
+
+            # before running each test, cleanup the 'xx00' files
+            # from previous runs.
+            my $pre = { PRE => sub { unlink glob "./xx??"; } };
+            push @$new_ent, $pre;
+          }
+        else
+          {
+            # pass other entities as-is (e.g. OUT, ERR, OUT_SUBST, EXIT)
+            # run_tests() will know how to handle them.
+            push @$new_ent, $e;
+          }
+      }
+
+    push @Tests, $new_ent;
+  }
+
+my $save_temps = $ENV{DEBUG};
+my $verbose = $ENV{VERBOSE};
+
+my $fail = run_tests ($prog, $prog, \@Tests, $save_temps, $verbose);
+exit $fail;
diff --git a/tests/misc/csplit.sh b/tests/misc/csplit.sh
index 24c21aaf..da09c1f0 100755
--- a/tests/misc/csplit.sh
+++ b/tests/misc/csplit.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # various csplit tests
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/cut-huge-range.sh b/tests/misc/cut-huge-range.sh
new file mode 100755
index 00000000..e2c4108c
--- /dev/null
+++ b/tests/misc/cut-huge-range.sh
@@ -0,0 +1,64 @@
+#!/bin/sh
+# Ensure that cut does not allocate mem for large ranges
+
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
+
+# 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 3 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/>.
+
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
+print_ver_ cut
+require_ulimit_v_
+getlimits_
+
+# sed script to subtract one from the input.
+# Each input line should consist of a positive decimal number.
+# Each output line's number is one less than the input's.
+# There's no limit (other than line length) on the number's magnitude.
+subtract_one='
+  s/$/@/
+  : again
+  s/0@/@9/
+  s/1@/0/
+  s/2@/1/
+  s/3@/2/
+  s/4@/3/
+  s/5@/4/
+  s/6@/5/
+  s/7@/6/
+  s/8@/7/
+  s/9@/8/
+  t again
+'
+
+# Ensure we can cut up to our sentinel value.
+# This is currently SIZE_MAX, but could be raised to UINTMAX_MAX
+# if we didn't allocate memory for each line as a unit.
+# Don't use expr to subtract one, since SIZE_MAX may exceed its maximum value.
+CUT_MAX=$(echo $SIZE_MAX | sed "$subtract_one")
+
+# From coreutils-8.10 through 8.20, this would make cut try to allocate
+# a 256MiB bit vector.  With a 20MB limit on VM, the following would fail.
+(ulimit -v 20000; : | cut -b$CUT_MAX- > err 2>&1) || fail=1
+
+# Up to and including coreutils-8.21, cut would allocate possibly needed
+# memory upfront.  Subsequently extra memory is no longer needed.
+(ulimit -v 20000; : | cut -b1-$CUT_MAX >> err 2>&1) || fail=1
+
+# Explicitly disallow values above CUT_MAX
+(ulimit -v 20000; : | cut -b$SIZE_MAX 2>/dev/null) && fail=1
+(ulimit -v 20000; : | cut -b$SIZE_OFLOW 2>/dev/null) && fail=1
+
+compare /dev/null err || fail=1
+
+Exit $fail
diff --git a/tests/misc/cut.pl b/tests/misc/cut.pl
index 41e9e209..04188621 100755
--- a/tests/misc/cut.pl
+++ b/tests/misc/cut.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Test "cut".
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
@@ -144,15 +144,17 @@ my @Tests =
   ['newline-12', '-s', '-d:', '-f1', {IN=>"a:1\nb:"}, {OUT=>"a\nb\n"}],
   ['newline-13', '-d:', '-f1-', {IN=>"a1:\n:"}, {OUT=>"a1:\n:\n"}],
   # newline processing for fields when -d == '\n'
-  ['newline-14', "-d'\n'", '-f1', {IN=>"a:1\nb:"}, {OUT=>"a:1\nb:\n"}],
+  ['newline-14', "-d'\n'", '-f1', {IN=>"a:1\nb:"}, {OUT=>"a:1\n"}],
   ['newline-15', '-s', "-d'\n'", '-f1', {IN=>"a:1\nb:"}, {OUT=>"a:1\n"}],
-  ['newline-16', '-s', "-d'\n'", '-f2', {IN=>"\nb"}, {OUT=>""}],
+  ['newline-16', '-s', "-d'\n'", '-f2', {IN=>"\nb"}, {OUT=>"b\n"}],
   ['newline-17', '-s', "-d'\n'", '-f1', {IN=>"\nb"}, {OUT=>"\n"}],
-  ['newline-18', "-d'\n'", '-f2', {IN=>"\nb"}, {OUT=>"\nb\n"}],
-  ['newline-19', "-d'\n'", '-f1', {IN=>"\nb"}, {OUT=>"\nb\n"}],
+  ['newline-18', "-d'\n'", '-f2', {IN=>"\nb"}, {OUT=>"b\n"}],
+  ['newline-19', "-d'\n'", '-f1', {IN=>"\nb"}, {OUT=>"\n"}],
   ['newline-20', '-s', "-d'\n'", '-f1-', {IN=>"\n"}, {OUT=>"\n"}],
-  ['newline-21', '-s', "-d'\n'", '-f1-', {IN=>"\nb"}, {OUT=>"\n"}],
+  ['newline-21', '-s', "-d'\n'", '-f1-', {IN=>"\nb"}, {OUT=>"\nb\n"}],
   ['newline-22', "-d'\n'", '-f1-', {IN=>"\nb"}, {OUT=>"\nb\n"}],
+  ['newline-23', "-d'\n'", '-f1-', '--ou=:', {IN=>"a\nb\n"}, {OUT=>"a:b\n"}],
+  ['newline-24', "-d'\n'", '-f1,2', '--ou=:', {IN=>"a\nb\n"}, {OUT=>"a:b\n"}],
 
   # New functionality:
   ['out-delim1', '-c1-3,5-', '--output-d=:', {IN=>"abcdefg\n"},
@@ -210,6 +212,8 @@ my @Tests =
                                          {IN=>"123456\n"}, {OUT=>"23456\n"}],
   ['EOL-subsumed-3', '--complement -b3,4-4,5,2-',
                                          {IN=>"123456\n"}, {OUT=>"1\n"}],
+  ['EOL-subsumed-4', '--output-d=: -b1-2,2-3,3-',
+                                        {IN=>"1234\n"}, {OUT=>"1234\n"}],
  );
 
 if ($mb_locale ne 'C')
diff --git a/tests/misc/date-next-dow.pl b/tests/misc/date-next-dow.pl
index 3c79e22a..a1c21127 100755
--- a/tests/misc/date-next-dow.pl
+++ b/tests/misc/date-next-dow.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Test "date".
 
-# Copyright (C) 2005-2013 Free Software Foundation, Inc.
+# Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/date-sec.sh b/tests/misc/date-sec.sh
index 67048c13..9c001fdc 100755
--- a/tests/misc/date-sec.sh
+++ b/tests/misc/date-sec.sh
@@ -3,7 +3,7 @@
 # date --date="21:04 +0100" +%S' always prints '00'.
 # Before coreutils-5.2.1, it would print the seconds from the current time.
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/date.pl b/tests/misc/date.pl
index d0b3517c..40be4cab 100755
--- a/tests/misc/date.pl
+++ b/tests/misc/date.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Test "date".
 
-# Copyright (C) 2005-2013 Free Software Foundation, Inc.
+# Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
 # 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
@@ -287,6 +287,13 @@ my @Tests =
       {ERR => "date: invalid date '\\260'\n"},
       {EXIT => 1},
      ],
+
+     # From coreutils-5.3.0 to 8.22 inclusive
+     # this would either infinite loop or crash
+     ['invalid-TZ-crash', "-d 'TZ=\"\"\"'",
+      {ERR => "date: invalid date 'TZ=\"\"\"'\n"},
+      {EXIT => 1},
+     ],
     );
 
 # Repeat the cross-dst test, using Jan 1, 2005 and every interval from 1..364.
diff --git a/tests/misc/dircolors.pl b/tests/misc/dircolors.pl
index 061e372f..a70a8c5d 100755
--- a/tests/misc/dircolors.pl
+++ b/tests/misc/dircolors.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Simple dircolors tests.
 
-# Copyright (C) 1998-2013 Free Software Foundation, Inc.
+# Copyright (C) 1998-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/dirname.pl b/tests/misc/dirname.pl
index 43182a8c..34c905d4 100755
--- a/tests/misc/dirname.pl
+++ b/tests/misc/dirname.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Test "dirname".
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/env-null.sh b/tests/misc/env-null.sh
index 3cbbcbd5..9b9c95e7 100755
--- a/tests/misc/env-null.sh
+++ b/tests/misc/env-null.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Verify behavior of env -0 and printenv -0.
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
@@ -40,7 +40,7 @@ compare out1 out2 || fail=1
 # env -0 does not work if a command is specified.
 env -0 echo hi > out
 test $? = 125 || fail=1
-test -s out && fail=1
+compare /dev/null out || fail=1
 
 # Test env -0 on a one-variable environment.
 printf 'a=b\nc=\0' > exp || framework_failure_
@@ -53,7 +53,7 @@ env "$(printf 'a=b\nc=')" printenv -0 a > out || fail=1
 compare exp out || fail=1
 env -u a printenv -0 a > out
 test $? = 1 || fail=1
-test -s out && fail=1
+compare /dev/null out || fail=1
 env -u b "$(printf 'a=b\nc=')" printenv -0 b a > out
 test $? = 1 || fail=1
 compare exp out || fail=1
diff --git a/tests/misc/env.sh b/tests/misc/env.sh
index 7c9e8fdc..d06a1fb0 100755
--- a/tests/misc/env.sh
+++ b/tests/misc/env.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Verify behavior of env.
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
@@ -20,16 +20,24 @@
 . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 print_ver_ env
 
+# A simple shebang program to call "echo" from symlinks like "./-u" or "./--".
+echo "#!$abs_top_builddir/src/echo simple_echo" > simple_echo \
+  || framework_failure_
+chmod a+x simple_echo || framework_failure_
+
+# Verify we can run the shebang which is not the case if
+# there are spaces in $abs_top_builddir.
+./simple_echo || skip_ "Error running simple_echo script"
 
 # Verify clearing the environment
 a=1
 export a
 env - > out || fail=1
-test -s out && fail=1
+compare /dev/null out || fail=1
 env -i > out || fail=1
-test -s out && fail=1
+compare /dev/null out || fail=1
 env -u a -i -u a -- > out || fail=1
-test -s out && fail=1
+compare /dev/null out || fail=1
 env -i -- a=b > out || fail=1
 echo a=b > exp || framework_failure_
 compare exp out || fail=1
@@ -62,7 +70,7 @@ fi
 
 ENV_TEST1=a
 export ENV_TEST1
-: >out || framework_failure_
+>out || framework_failure_
 env ENV_TEST2= > all || fail=1
 grep '^ENV_TEST' all | LC_ALL=C sort >> out || framework_failure_
 env -u ENV_TEST1 ENV_TEST3=c > all || fail=1
@@ -105,9 +113,10 @@ export PATH
 # Use -- to end options (but not variable assignments).
 # On some systems, execve("-i") invokes a shebang script ./-i on PATH as
 # '/bin/sh -i', rather than '/bin/sh -- -i', which doesn't do what we want.
-# Avoid the issue by using an executable rather than a script.
+# Avoid the issue by using a shebang to 'echo' passing a second parameter
+# before the '-i'. See the definition of simple_echo before.
 # Test -u, rather than -i, to minimize PATH problems.
-ln -s "$abs_top_builddir/src/echo" ./-u || framework_failure_
+ln -s "simple_echo" ./-u || framework_failure_
 case $(env -u echo echo good) in
   good) ;;
   *) fail=1 ;;
@@ -117,16 +126,16 @@ case $(env -u echo -- echo good) in
   *) fail=1 ;;
 esac
 case $(env -- -u pass) in
-  pass) ;;
+  *pass) ;;
   *) fail=1 ;;
 esac
 
 # After options have ended, the first argument not containing = is a program.
 env a=b -- true
 test $? = 127 || fail=1
-ln -s "$abs_top_builddir/src/echo" ./-- || framework_failure_
+ln -s "simple_echo" ./-- || framework_failure_
 case $(env a=b -- true || echo fail) in
-  true) ;;
+  *true) ;;
   *) fail=1 ;;
 esac
 
diff --git a/tests/misc/expand.pl b/tests/misc/expand.pl
index 30be9f91..939e22b8 100755
--- a/tests/misc/expand.pl
+++ b/tests/misc/expand.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Exercise expand.
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/expr.pl b/tests/misc/expr.pl
index 9b957a5c..c084b118 100755
--- a/tests/misc/expr.pl
+++ b/tests/misc/expr.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Basic tests for "expr".
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/factor.pl b/tests/misc/factor.pl
index 042a8469..294b814f 100755
--- a/tests/misc/factor.pl
+++ b/tests/misc/factor.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Basic tests for "factor".
 
-# Copyright (C) 1998-2013 Free Software Foundation, Inc.
+# Copyright (C) 1998-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/false-status.sh b/tests/misc/false-status.sh
index 33afc0f3..77bea451 100755
--- a/tests/misc/false-status.sh
+++ b/tests/misc/false-status.sh
@@ -1,7 +1,8 @@
 #!/bin/sh
 # ensure that false exits nonzero even with --help or --version
+# and ensure that true exits nonzero when it can't write --help or --version
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
@@ -17,9 +18,14 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
-print_ver_ false
+print_ver_ false true
 
-false --version > /dev/null && fail=1
-false --help > /dev/null && fail=1
+env false --version > /dev/null && fail=1
+env false --help > /dev/null && fail=1
+
+if test -w /dev/full && test -c /dev/full; then
+  env true --version > /dev/full && fail=1
+  env true --help > /dev/full && fail=1
+fi
 
 Exit $fail
diff --git a/tests/misc/fold.pl b/tests/misc/fold.pl
index 1d197bb4..69b0c5b5 100755
--- a/tests/misc/fold.pl
+++ b/tests/misc/fold.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Exercise fold.
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/groups-dash.sh b/tests/misc/groups-dash.sh
index 598c3164..0aed2229 100755
--- a/tests/misc/groups-dash.sh
+++ b/tests/misc/groups-dash.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ensure groups handles -- sanely
 
-# Copyright (C) 2007-2013 Free Software Foundation, Inc.
+# Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/groups-version.sh b/tests/misc/groups-version.sh
index 5f87b325..a867701c 100755
--- a/tests/misc/groups-version.sh
+++ b/tests/misc/groups-version.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ensure groups --version output is similar to id --version
 
-# Copyright (C) 2007-2013 Free Software Foundation, Inc.
+# Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/head-c.sh b/tests/misc/head-c.sh
index 6807c4d5..d6433d0d 100755
--- a/tests/misc/head-c.sh
+++ b/tests/misc/head-c.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
-# exercise the fix of 2001-08-18, based on test case from Ian Bruce
+# exercise head -c
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,13 +18,28 @@
 
 . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 print_ver_ head
+require_ulimit_v_
+getlimits_
 
+# exercise the fix of 2001-08-18, based on test case from Ian Bruce
 echo abc > in || framework_failure_
-
 (head -c1; head -c1) < in > out || fail=1
 case "$(cat out)" in
   ab) ;;
   *) fail=1 ;;
 esac
 
+# Test for a bug in coreutils 5.0.1 through 8.22.
+printf 'abc\ndef\n' > in1 || framework_failure_
+(dd bs=1 skip=1 count=0 status=none && head -c-4) < in1 > out1 || fail=1
+case "$(cat out1)" in
+  bc) ;;
+  *) fail=1 ;;
+esac
+
+# Only allocate memory as needed.
+# Coreutils <= 8.21 would allocate memory up front
+# based on the value passed to -c
+(ulimit -v 20000; head --bytes=-$SSIZE_MAX < /dev/null) || fail=1
+
 Exit $fail
diff --git a/tests/misc/head-elide-tail.pl b/tests/misc/head-elide-tail.pl
index 71e00c6c..3c178d69 100755
--- a/tests/misc/head-elide-tail.pl
+++ b/tests/misc/head-elide-tail.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Exercise head's --bytes=-N option.
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
@@ -52,6 +52,8 @@ my @Tests =
    ['elide-l2', "--lines=-1", {IN=>"a"}, {OUT=>''}],
    ['elide-l3', "--lines=-1", {IN=>"a\nb"}, {OUT=>"a\n"}],
    ['elide-l4', "--lines=-1", {IN=>"a\nb\n"}, {OUT=>"a\n"}],
+   ['elide-l5', "--lines=-0", {IN=>"a\nb\n"}, {OUT=>"a\nb\n"}],
+   ['elide-l6', "--lines=-0", {IN=>"a\nb"}, {OUT=>"a\nb"}],
   );
 
 if ($ENV{RUN_EXPENSIVE_TESTS})
@@ -80,9 +82,10 @@ if ($ENV{RUN_EXPENSIVE_TESTS})
       }
 
     $s =~ s/(.)/$1\n/g;
-    for my $file_size (0..20)
+    $s .= 'u'; # test without trailing '\n'
+    for my $file_size (0..21)
       {
-        for my $n_elide (0..20)
+        for my $n_elide (0..21)
           {
             my $input = substr $s, 0, 2 * $file_size;
             my $out_len = $n_elide < $file_size ? $file_size - $n_elide : 0;
diff --git a/tests/misc/head-pos.sh b/tests/misc/head-pos.sh
index cb08d72e..1cf9e04b 100755
--- a/tests/misc/head-pos.sh
+++ b/tests/misc/head-pos.sh
@@ -2,7 +2,7 @@
 # When reading a specified number of lines, ensure that the output
 # file pointer is positioned just after those lines.
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/head-write-error.sh b/tests/misc/head-write-error.sh
new file mode 100755
index 00000000..22ecf993
--- /dev/null
+++ b/tests/misc/head-write-error.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# Ensure we diagnose and not continue writing to
+# the output if we get a write error.
+
+# Copyright (C) 2014 Free Software Foundation, Inc.
+
+# 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 3 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/>.
+
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
+print_ver_ head
+
+if ! test -w /dev/full || ! test -c /dev/full; then
+  skip_ '/dev/full is required'
+fi
+
+# We can't use /dev/zero as that's bypassed in the --lines case
+# due to lseek() indicating it has a size of zero.
+yes | head -c10M > bigseek || framework_failure_
+
+# This is the single output diagnostic expected,
+# (without the possibly varying :strerror(ENOSPC) suffix).
+printf '%s\n' "head: error writing 'standard output'" > exp
+
+# Memory is bounded in these cases
+for item in lines bytes; do
+  for N in 0 1; do
+    # pipe case
+    yes | timeout 10s head --$item=-$N > /dev/full 2> errt && fail=1
+    test $? = 124 && fail=1
+    sed 's/\(head:.*\):.*/\1/' errt > err
+    compare exp err || fail=1
+
+    # seekable case
+    timeout 10s head --$item=-$N bigseek > /dev/full 2> errt && fail=1
+    test $? = 124 && fail=1
+    sed 's/\(head:.*\):.*/\1/' errt > err
+    compare exp err || fail=1
+  done
+done
+
+Exit $fail
diff --git a/tests/misc/head.pl b/tests/misc/head.pl
index d92a0a5c..159d4efc 100755
--- a/tests/misc/head.pl
+++ b/tests/misc/head.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # test head
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/help-version.sh b/tests/misc/help-version.sh
index 00f30cd0..0598557f 100755
--- a/tests/misc/help-version.sh
+++ b/tests/misc/help-version.sh
@@ -2,7 +2,7 @@
 # Make sure all of these programs work properly
 # when invoked with --help or --version.
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
@@ -70,47 +70,38 @@ done
 test "x$v" = "x$VERSION" \
   || fail_ "--version-\$VERSION mismatch"
 
-for lang in C fr da; do
-  for i in $built_programs; do
-
-    # Skip 'test'; it doesn't accept --help or --version.
-    test $i = test && continue;
-
-    # false fails even when invoked with --help or --version.
-    if test $i = false; then
-      env LC_MESSAGES=$lang $i --help >/dev/null && fail=1
-      env LC_MESSAGES=$lang $i --version >/dev/null && fail=1
-      continue
-    fi
+for i in $built_programs; do
 
-    # The just-built install executable is always named 'ginstall'.
-    test $i = install && i=ginstall
-
-    # Make sure they exit successfully, under normal conditions.
-    env $i --help    > h-$i     || fail=1
-    env $i --version >/dev/null || fail=1
-
-    # Make sure they mention the bug-reporting address in --help output.
-    grep "$PACKAGE_BUGREPORT" h-$i > /dev/null || fail=1
-    rm -f h-$i
-
-    # Make sure they fail upon 'disk full' error.
-    if test -w /dev/full && test -c /dev/full; then
-      env $i --help    >/dev/full 2>/dev/null && fail=1
-      env $i --version >/dev/full 2>/dev/null && fail=1
-      status=$?
-      test $i = [ && prog=lbracket || prog=$(echo $i|sed "s/$EXEEXT$//")
-      eval "expected=\$expected_failure_status_$prog"
-      test x$expected = x && expected=1
-      if test $status = $expected; then
-        : # ok
-      else
-        fail=1
-        echo "*** $i: bad exit status '$status' (expected $expected)," 1>&2
-        echo "  with --help or --version output redirected to /dev/full" 1>&2
-      fi
+  # Skip 'test'; it doesn't accept --help or --version.
+  test $i = test && continue
+
+  # false fails even when invoked with --help or --version.
+  # true and false are tested with these options separately.
+  test $i = false || test $i = true && continue
+
+  # The just-built install executable is always named 'ginstall'.
+  test $i = install && i=ginstall
+
+  # Make sure they exit successfully, under normal conditions.
+  env $i --help    >/dev/null || fail=1
+  env $i --version >/dev/null || fail=1
+
+  # Make sure they fail upon 'disk full' error.
+  if test -w /dev/full && test -c /dev/full; then
+    env $i --help    >/dev/full 2>/dev/null && fail=1
+    env $i --version >/dev/full 2>/dev/null && fail=1
+    status=$?
+    test $i = [ && prog=lbracket || prog=$(echo $i|sed "s/$EXEEXT$//")
+    eval "expected=\$expected_failure_status_$prog"
+    test x$expected = x && expected=1
+    if test $status = $expected; then
+      : # ok
+    else
+      fail=1
+      echo "*** $i: bad exit status '$status' (expected $expected)," 1>&2
+      echo "  with --help or --version output redirected to /dev/full" 1>&2
     fi
-  done
+  fi
 done
 
 bigZ_in=bigZ-in.Z
@@ -248,7 +239,7 @@ parted_setup () { args="-s $tmp_in mklabel gpt"
 # something more than --help or --version.
 for i in $built_programs; do
   # Skip these.
-  case $i in chroot|stty|tty|false|chcon|runcon) continue;; esac
+  case $i in chroot|stty|tty|false|chcon|runcon|coreutils) continue;; esac
 
   rm -rf $tmp_in $tmp_in2 $tmp_dir $tmp_out $bigZ_in $zin $zin2
   echo z |gzip > $zin
diff --git a/tests/misc/invalid-opt.pl b/tests/misc/invalid-opt.pl
index 1d7701f0..bcf6ee71 100755
--- a/tests/misc/invalid-opt.pl
+++ b/tests/misc/invalid-opt.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # exercise the 'invalid option' handling code in each program
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/join.pl b/tests/misc/join.pl
index 9b93794d..cf3f4bd4 100755
--- a/tests/misc/join.pl
+++ b/tests/misc/join.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Test join.
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
@@ -275,6 +275,26 @@ my @tv = (
  [ "ID1 Name\n1 A\n", ""],
    "ID1 Name\n1 A\n", 0],
 
+# Zero-terminated lines
+['z1', '-z',
+ ["a\0c\0e\0", "a\0b\0c\0"], "a\0c\0", 0],
+
+# not zero-terminated, but related to the code change:
+#  the old readlinebuffer() auto-added '\n' to the last line.
+#  the new readlinebuffer_delim() does not.
+#  Ensure it doesn't matter.
+['z2', '',
+ ["a\nc\ne\n", "a\nb\nc"], "a\nc\n", 0],
+['z3', '',
+ ["a\nc\ne", "a\nb\nc"], "a\nc\n", 0],
+# missing last NUL at the end of the last line (=end of file)
+['z4', '-z',
+ ["a\0c\0e", "a\0b\0c"], "a\0c\0", 0],
+# edge-case: the embedded newlines should treated as
+# part of the nul-terminated line
+['z5', '-z -a1 -a2',
+ ["a\n1\0c 3\0","b\n8\0c 9\0"], "a\n1\0b\n8\0c 3 9\0"],
+
 );
 
 # Convert the above old-style test vectors to the newer
diff --git a/tests/misc/ls-misc.pl b/tests/misc/ls-misc.pl
index 5bf7b9eb..a47e70b7 100755
--- a/tests/misc/ls-misc.pl
+++ b/tests/misc/ls-misc.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 1998-2013 Free Software Foundation, Inc.
+# Copyright (C) 1998-2014 Free Software Foundation, Inc.
 
 # 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
@@ -303,9 +303,12 @@ my @Tests =
             . "\e[37;44msticky$e\n"
          },
 
+        {PRE => sub {
+         push_ls_colors('ow=34;42:tw=30;42:sg=30;43:su=37;41:st=37;44'); }},
         {POST => sub {
          unlink qw(setuid setgid);
-         foreach my $dir (qw(owr owt sticky)) {rmdir $dir} }},
+         foreach my $dir (qw(owr owt sticky)) {rmdir $dir}
+         restore_ls_colors; }},
          ],
 
      # For 5.97 and earlier, --file-type acted like --indicator-style=slash.
diff --git a/tests/misc/ls-time.sh b/tests/misc/ls-time.sh
index 80e400f4..3ce4a91c 100755
--- a/tests/misc/ls-time.sh
+++ b/tests/misc/ls-time.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test some of ls's sorting options.
 
-# Copyright (C) 1998-2013 Free Software Foundation, Inc.
+# Copyright (C) 1998-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/md5sum-bsd.sh b/tests/misc/md5sum-bsd.sh
index 6b70f21a..f73e0622 100755
--- a/tests/misc/md5sum-bsd.sh
+++ b/tests/misc/md5sum-bsd.sh
@@ -2,7 +2,7 @@
 # 'md5sum' tests for generation and checking of
 # BSD traditional and alternate formats (md5 [-r])
 
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
 # 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
@@ -70,7 +70,7 @@ nl='
 tab='	'
 rm check.md5
 for i in 'a\b' 'a\' "a${nl}b" "a${tab}b"; do
-  :> "$i"
+  > "$i"
   md5sum --tag "$i" >> check.md5
 done
 md5sum --strict -c check.md5 || fail=1
diff --git a/tests/misc/md5sum-newline.pl b/tests/misc/md5sum-newline.pl
index ad1b6acb..b418d5b4 100755
--- a/tests/misc/md5sum-newline.pl
+++ b/tests/misc/md5sum-newline.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Newline tests for "md5sum".
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/md5sum-parallel.sh b/tests/misc/md5sum-parallel.sh
index 648bfa5b..92f66296 100755
--- a/tests/misc/md5sum-parallel.sh
+++ b/tests/misc/md5sum-parallel.sh
@@ -2,7 +2,7 @@
 # Ensure that md5sum prints each checksum atomically
 # so that concurrent md5sums don't intersperse their output
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/md5sum.pl b/tests/misc/md5sum.pl
index 5192d55f..0aa0056f 100755
--- a/tests/misc/md5sum.pl
+++ b/tests/misc/md5sum.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Basic tests for "md5sum".
 
-# Copyright (C) 1998-2013 Free Software Foundation, Inc.
+# Copyright (C) 1998-2014 Free Software Foundation, Inc.
 
 # 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
@@ -38,7 +38,9 @@ my @Tests =
                                 {OUT=>"d174ab98d277d9f5a5611c2c9f419d9f  f\n"}],
      ['7', {IN=> {f=> '1234567890' x 8}},
                                 {OUT=>"57edf4a22be3c955ac49da2e2107b67a  f\n"}],
-     ['backslash', {IN=> {".\\foo"=> ''}},
+     ['backslash-1', {IN=> {".\nfoo"=> ''}},
+                                {OUT=>"\\$degenerate  .\\nfoo\n"}],
+     ['backslash-2', {IN=> {".\\foo"=> ''}},
                                 {OUT=>"\\$degenerate  .\\\\foo\n"}],
      ['check-1', '--check', {AUX=> {f=> ''}},
                                 {IN=> {'f.md5' => "$degenerate  f\n"}},
diff --git a/tests/misc/mknod.sh b/tests/misc/mknod.sh
index 30f363f6..fb907f16 100755
--- a/tests/misc/mknod.sh
+++ b/tests/misc/mknod.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that mknod, mkfifo, mkdir -m MODE work with a restrictive umask
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/mktemp.pl b/tests/misc/mktemp.pl
index b15b6694..13ee03f5 100755
--- a/tests/misc/mktemp.pl
+++ b/tests/misc/mktemp.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Test "mktemp".
 
-# Copyright (C) 2007-2013 Free Software Foundation, Inc.
+# Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
 # 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
@@ -55,14 +55,12 @@ my @Tests =
     (
      # test-name, [option, option, ...] {OUT=>"expected-output"}
      #
-     ['too-many', 'a b',
+     ['too-many', '-q a b',
       {ERR=>"$prog: too many templates\n"
        . "Try '$prog --help' for more information.\n"}, {EXIT => 1} ],
-     ['too-many-q', '-q a b', {EXIT => 1} ],
 
-     ['too-few-x', 'foo.XX', {EXIT => 1},
+     ['too-few-x', '-q foo.XX', {EXIT => 1},
       {ERR=>"$prog: too few X's in template 'foo.XX'\n"}],
-     ['too-few-xq', '-q foo.XX', {EXIT => 1} ],
 
      ['1f', 'bar.XXXX', {OUT => "bar.ZZZZ\n"},
       {OUT_SUBST => 's,\.....$,.ZZZZ,'},
@@ -148,11 +146,9 @@ my @Tests =
 
      ['suffix6f', 'aXXXX/b', {EXIT=>1},
       {ERR=>"$prog: invalid suffix '/b', contains directory separator\n"}],
-     ['suffix6f-q', '-q aXXXX/b', {EXIT=>1}],
 
      ['suffix7f', '--suffix= aXXXXb', {EXIT=>1},
       {ERR=>"$prog: with --suffix, template 'aXXXXb' must end in X\n"}],
-     ['suffix7f-q', '-q --suffix= aXXXXb', {EXIT=>1}],
      ['suffix7d', '-d --suffix=aXXXXb ""', {EXIT=>1},
       {ERR=>"$prog: with --suffix, template '' must end in X\n"}],
 
diff --git a/tests/misc/nice-fail.sh b/tests/misc/nice-fail.sh
index 3e054354..3bf823ab 100755
--- a/tests/misc/nice-fail.sh
+++ b/tests/misc/nice-fail.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Verify that internal failure in nice gives exact status.
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/nice.sh b/tests/misc/nice.sh
index acee0f44..26a01ca9 100755
--- a/tests/misc/nice.sh
+++ b/tests/misc/nice.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Test "nice".
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 # 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
@@ -81,12 +81,12 @@ if test x$(nice -n -1 nice 2> /dev/null) = x0 ; then
   if test -w /dev/full && test -c /dev/full; then
     nice -n -1 nice > out 2> /dev/full
     test $? = 125 || fail=1
-    test -s out && fail=1
+    compare /dev/null out || fail=1
   fi
 else
   # superuser - change succeeds
   nice -n -1 nice 2> err || fail=1
-  test -s err && fail=1
+  compare /dev/null err || fail=1
   test x$(nice -n -1 nice) = x-1 || fail=1
   test x$(nice --1 nice) = x-1 || fail=1
 fi
diff --git a/tests/misc/nl.sh b/tests/misc/nl.sh
index dfa7b237..676c75d7 100755
--- a/tests/misc/nl.sh
+++ b/tests/misc/nl.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # exercise nl functionality
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/nohup.sh b/tests/misc/nohup.sh
index 91d9e6a2..b3f4274c 100755
--- a/tests/misc/nohup.sh
+++ b/tests/misc/nohup.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # test nohup
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
@@ -63,12 +63,17 @@ rm -f nohup.out err
 # to stderr must be fatal.  Requires stdout to be terminal.
 if test -w /dev/full && test -c /dev/full; then
 (
+  # POSIX shells immediately exit the subshell on exec error.
+  # So check we can write to /dev/tty before the exec, which
+  # isn't possible if we've no controlling tty for example.
+  test -c /dev/tty && >/dev/tty || exit 0
+
   exec >/dev/tty
   test -t 1 || exit 0
   nohup echo hi 2> /dev/full
   test $? = 125 || fail=1
   test -f nohup.out || fail=1
-  test -s nohup.out && fail=1
+  compare /dev/null nohup.out || fail=1
   rm -f nohup.out
   exit $fail
 ) || fail=1
@@ -81,7 +86,7 @@ if test -t 1; then
   # It must exist.
   test -f nohup.out || fail=1
   # It must be empty.
-  test -s nohup.out && fail=1
+  compare /dev/null nohup.out || fail=1
 fi
 
 cat <<\EOF > exp || fail=1
@@ -101,7 +106,7 @@ if test -t 1; then
   # It must exist.
   test -f nohup.out || fail=1
   # It must be empty.
-  test -s nohup.out && fail=1
+  compare /dev/null nohup.out || fail=1
 fi
 
 cat <<\EOF > exp || fail=1
diff --git a/tests/misc/nproc-avail.sh b/tests/misc/nproc-avail.sh
index 8b0e8dcb..1a7e7219 100755
--- a/tests/misc/nproc-avail.sh
+++ b/tests/misc/nproc-avail.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that "nproc" is less than or equal to "nproc --all".
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/nproc-positive.sh b/tests/misc/nproc-positive.sh
index d82dc930..c8fe9bae 100755
--- a/tests/misc/nproc-positive.sh
+++ b/tests/misc/nproc-positive.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that nproc prints a number > 0
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/numfmt.pl b/tests/misc/numfmt.pl
index 61917fb8..dfb4b2e0 100644..100755
--- a/tests/misc/numfmt.pl
+++ b/tests/misc/numfmt.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Basic tests for "numfmt".
 
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
 # 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
@@ -260,7 +260,7 @@ my @Tests =
      #   so these are 40 of "M", not 40,000,000.
      ['mix-1', '--suffix=M --from=si 40M',     {OUT=>"40M"}],
 
-     # These are fourty-million Ms .
+     # These are forty-million Ms .
      ['mix-2', '--suffix=M --from=si 40MM',     {OUT=>"40000000M"}],
 
      ['mix-3', '--suffix=M --from=auto 40MM',     {OUT=>"40000000M"}],
@@ -695,11 +695,11 @@ my @Tests =
              {EXIT=>1}],
      ['fmt-err-4', '--format "%d"',
              {ERR=>"$prog: invalid format '%d', " .
-                   "directive must be %['][-][N]f\n"},
+                   "directive must be %[0]['][-][N]f\n"},
              {EXIT=>1}],
      ['fmt-err-5', '--format "% -43 f"',
              {ERR=>"$prog: invalid format '% -43 f', " .
-                   "directive must be %['][-][N]f\n"},
+                   "directive must be %[0]['][-][N]f\n"},
              {EXIT=>1}],
      ['fmt-err-6', '--format "%f %f"',
              {ERR=>"$prog: format '%f %f' has too many % directives\n"},
@@ -708,9 +708,6 @@ my @Tests =
              {ERR=>"$prog: invalid format '%123456789012345678901234567890f'".
                    " (width overflow)\n"},
              {EXIT=>1}],
-     ['fmt-err-8', '--format "%f" --padding 20',
-             {ERR=>"$prog: --padding cannot be combined with --format\n"},
-             {EXIT=>1}],
      ['fmt-err-9', '--format "%f" --grouping',
              {ERR=>"$prog: --grouping cannot be combined with --format\n"},
              {EXIT=>1}],
@@ -748,6 +745,17 @@ my @Tests =
      ['fmt-15', '--format "--%100000f--" --to=si 4200',
                   {OUT=>"--" . " " x 99996 . "4.2K--" }],
 
+     # --format padding overrides --padding
+     ['fmt-16', '--format="%6f" --padding=66 1234',{OUT=>"  1234"}],
+
+     # zero padding
+     ['fmt-17', '--format="%06f" 1234',{OUT=>"001234"}],
+     # also support spaces (which are ignored as spacing is handled separately)
+     ['fmt-18', '--format="%0 6f" 1234',{OUT=>"001234"}],
+     # handle generic padding in combination
+     ['fmt-22', '--format="%06f" --padding=7 1234',{OUT=>" 001234"}],
+     ['fmt-23', '--format="%06f" --padding=-7 1234',{OUT=>"001234 "}],
+
 
      ## Check all errors again, this time with --invalid=fail
      ##  Input will be printed without conversion,
@@ -881,13 +889,20 @@ my @Locale_Tests =
      ['lcl-fmt-4', '--format "--%-10f--" --to=si 5000000',
              {OUT=>"--5,0M      --"},
              {ENV=>"LC_ALL=$locale"}],
+     # handle zero/grouping in combination
+     ['lcl-fmt-5', '--format="%\'06f" 1234',{OUT=>"01 234"},
+             {ENV=>"LC_ALL=$locale"}],
+     ['lcl-fmt-6', '--format="%0\'6f" 1234',{OUT=>"01 234"},
+             {ENV=>"LC_ALL=$locale"}],
+     ['lcl-fmt-7', '--format="%0\'\'6f" 1234',{OUT=>"01 234"},
+             {ENV=>"LC_ALL=$locale"}],
 
   );
 if ($locale ne 'C')
   {
     # Reset locale to 'C' if LOCALE_FR_UTF8 doesn't output as expected
     # as determined by the separate printf program.
-    open(LOC_NUM, "LC_ALL=$locale printf \"%'d\" 1234|")
+    open(LOC_NUM, "env LC_ALL=$locale printf \"%'d\" 1234|")
       or die "Can't fork command: $!";
     my $loc_num = <LOC_NUM>;
     close(LOC_NUM) || die "Failed to read grouped number from printf";
diff --git a/tests/misc/od-N.sh b/tests/misc/od-N.sh
index 8a741fb1..247ea546 100755
--- a/tests/misc/od-N.sh
+++ b/tests/misc/od-N.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Verify that 'od -N N' reads no more than N bytes of input.
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/od-endian.sh b/tests/misc/od-endian.sh
new file mode 100755
index 00000000..a01ae0a8
--- /dev/null
+++ b/tests/misc/od-endian.sh
@@ -0,0 +1,49 @@
+#!/bin/sh
+# verify that od --endian works properly
+
+# Copyright (C) 2014 Free Software Foundation, Inc.
+
+# 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 3 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/>.
+
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
+print_ver_ od
+
+in='0123456789abcdef'
+
+NL='
+'
+
+# rev(1) is not generally available, so here's a simplistic
+# implementation sufficient for our purposes.
+rev() {
+  while read line; do
+    printf '%s' "$line" | sed "s/./&\\$NL/g" | tac | paste -s -d ''
+  done
+}
+
+in_swapped() { printf '%s' "$in" | sed "s/.\{$1\}/&\\$NL/g" | rev |tr -d '\n'; }
+
+for e in little big; do
+  test $e = little && eo=big || eo=little
+  for s in 1 2 4 8 16; do
+    for t in x f; do
+      od -t $t$s --endian=$e /dev/null > /dev/null 2>&1 || continue
+      printf '%s' "$in" | od -An -t $t$s --endian=$e  > out1
+      in_swapped  "$s"  | od -An -t $t$s --endian=$eo > out2
+      compare out1 out2 || fail=1
+    done
+  done
+done
+
+Exit $fail
diff --git a/tests/misc/od-float.sh b/tests/misc/od-float.sh
index 306c3abe..8a8e29b2 100755
--- a/tests/misc/od-float.sh
+++ b/tests/misc/od-float.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test od on floating-point values.
 
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/od-multiple-t.sh b/tests/misc/od-multiple-t.sh
index 2b8de711..451fa2f5 100755
--- a/tests/misc/od-multiple-t.sh
+++ b/tests/misc/od-multiple-t.sh
@@ -2,7 +2,7 @@
 # verify that multiple -t specifiers to od align well
 # This would fail before coreutils-6.13.
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/od-x8.sh b/tests/misc/od-x8.sh
index f55e1b70..6e72dee7 100755
--- a/tests/misc/od-x8.sh
+++ b/tests/misc/od-x8.sh
@@ -2,7 +2,7 @@
 # verify that od -t x8 works properly
 # This would fail before coreutils-4.5.2.
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/od.pl b/tests/misc/od.pl
index 0649b1c6..edddf4e3 100755
--- a/tests/misc/od.pl
+++ b/tests/misc/od.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Exercise od
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
@@ -57,6 +57,13 @@ my @Tests =
      # even if the kernel reports that the file has stat.st_size = 0.
      ['j-proc', "-An -c -j $proc_file_byte_count $proc_file",
                                {IN=>{f2=>'e'}}, {OUT=>"   e\n"}],
+
+     # Ensure that a large width does not cause trouble.
+     # From coreutils-7.0 through coreutils-8.21, these would print
+     # approximately 128KiB of padding.
+     ['wide-a',   '-a -w65537 -An', {IN=>{g=>'x'}}, {OUT=>"   x\n"}],
+     ['wide-c',   '-c -w65537 -An', {IN=>{g=>'x'}}, {OUT=>"   x\n"}],
+     ['wide-x', '-tx1 -w65537 -An', {IN=>{g=>'B'}}, {OUT=>" 42\n"}],
     );
 
 my $save_temps = $ENV{DEBUG};
diff --git a/tests/misc/paste.pl b/tests/misc/paste.pl
index 783a5d42..04f8ec07 100755
--- a/tests/misc/paste.pl
+++ b/tests/misc/paste.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Test paste.
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/pathchk1.sh b/tests/misc/pathchk1.sh
index eed71d5f..616e763f 100755
--- a/tests/misc/pathchk1.sh
+++ b/tests/misc/pathchk1.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # pathchk tests
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/printenv.sh b/tests/misc/printenv.sh
index e7dbbeef..054b02c2 100755
--- a/tests/misc/printenv.sh
+++ b/tests/misc/printenv.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Verify behavior of printenv.
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
@@ -37,7 +37,7 @@ fi
 # Printing a single variable's value.
 env -- printenv ENV_TEST > out
 test $? = 1 || fail=1
-test -s out && fail=1
+compare /dev/null out || fail=1
 echo a > exp || framework_failure_
 ENV_TEST=a env -- printenv ENV_TEST > out || fail=1
 compare exp out || fail=1
@@ -76,6 +76,6 @@ compare exp out || fail=1
 # Bug present through coreutils 8.0.
 env a=b=c printenv a=b > out
 test $? = 1 || fail=1
-test -s out && fail=1
+compare /dev/null out || fail=1
 
 Exit $fail
diff --git a/tests/misc/printf-cov.pl b/tests/misc/printf-cov.pl
index 44250aab..3d797284 100755
--- a/tests/misc/printf-cov.pl
+++ b/tests/misc/printf-cov.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # improve printf.c test coverage
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/printf-hex.sh b/tests/misc/printf-hex.sh
index d59899cb..27503fae 100755
--- a/tests/misc/printf-hex.sh
+++ b/tests/misc/printf-hex.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # make sure that only two hex. digits are consumed in a \xHHH sequence
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/printf-surprise.sh b/tests/misc/printf-surprise.sh
index 0db6f7b1..6083806d 100755
--- a/tests/misc/printf-surprise.sh
+++ b/tests/misc/printf-surprise.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Detect printf(3) failure even when it doesn't set stream error indicator
 
-# Copyright (C) 2007-2013 Free Software Foundation, Inc.
+# Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
 # 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
@@ -20,8 +20,7 @@ prog=printf
 
 . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 print_ver_ printf
-
-require_ulimit_
+require_ulimit_v_
 
 
 # Up to coreutils-6.9, "printf %.Nf 0" would encounter an ENOMEM internal
diff --git a/tests/misc/printf.sh b/tests/misc/printf.sh
index d2ff3edb..b2292252 100755
--- a/tests/misc/printf.sh
+++ b/tests/misc/printf.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # basic tests for printf
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/ptx-overrun.sh b/tests/misc/ptx-overrun.sh
index a89a1b2c..be9fb524 100755
--- a/tests/misc/ptx-overrun.sh
+++ b/tests/misc/ptx-overrun.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
-# Trigger a heap-clobbering bug in ptx from coreutils-6.10 and earlier.
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
@@ -19,12 +18,12 @@
 . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 print_ver_ ptx
 
+# Trigger a heap-clobbering bug in ptx from coreutils-6.10 and earlier.
 # Using a long file name makes an abort more likely.
 # Even with no file name, valgrind detects the buffer overrun.
 f=01234567890123456789012345678901234567890123456789
 touch $f empty || framework_failure_
 
-
 # Specifying a regular expression ending in a lone backslash
 # would cause ptx to write beyond the end of a malloc'd buffer.
 ptx -F '\'      $f < /dev/null  > out || fail=1
@@ -32,4 +31,14 @@ ptx -S 'foo\'   $f < /dev/null >> out || fail=1
 ptx -W 'bar\\\' $f < /dev/null >> out || fail=1
 compare out empty || fail=1
 
+
+# Trigger an invalid heap reference noticed by gcc -fsanitize=address
+# from coreutils-8.22 and earlier.  As well as an invalid memory reference,
+# the issue can be seen in the output, with non deterministice whitespace
+# trimming when multiple files are specified.
+printf '%s\n' 'This is a ptx whitespace Trimming test' > ws.in
+ptx ws.in ws.in | sort | uniq -u > out
+compare /dev/null out || fail=1
+
+
 Exit $fail
diff --git a/tests/misc/ptx.pl b/tests/misc/ptx.pl
index b36eeb98..8a91d616 100755
--- a/tests/misc/ptx.pl
+++ b/tests/misc/ptx.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
@@ -33,6 +33,13 @@ my @Tests =
 
 # with coreutils-6.12 and earlier, this would act like "ptx F1 F1"
 ["2files", '-g1 -w1', {IN=>{F1=>"a"}}, {IN=>{F2=>"b"}}, {OUT=>"  a\n  b\n"}],
+
+# with coreutils-8.22 and earlier, the --format long option would
+# fall through into the --help case.
+["format-r", '--format=roff', {IN=>"foo\n"},
+                              {OUT=>".xx \"\" \"\" \"foo\" \"\"\n"}],
+["format-t", '--format=tex',  {IN=>"foo\n"},
+                              {OUT=>"\\xx {}{}{foo}{}{}\n"}],
 );
 
 @Tests = triple_test \@Tests;
diff --git a/tests/misc/pwd-long.sh b/tests/misc/pwd-long.sh
index 3b3f83d4..1ba0c1a9 100755
--- a/tests/misc/pwd-long.sh
+++ b/tests/misc/pwd-long.sh
@@ -2,7 +2,7 @@
 # -*- perl -*-
 # Ensure that pwd works even when run from a very deep directory.
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/pwd-option.sh b/tests/misc/pwd-option.sh
index 9733e108..0eba9429 100755
--- a/tests/misc/pwd-option.sh
+++ b/tests/misc/pwd-option.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that pwd options work.
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
@@ -21,7 +21,7 @@ print_ver_ pwd
 
 mkdir -p a/b || framework_failure_
 ln -s a/b c || framework_failure_
-base=$(env -- pwd)
+base=$(env -- pwd -P)
 
 # Remove any logical paths from $PWD.
 cd "$base" || framework_failure_
diff --git a/tests/misc/readlink-fp-loop.sh b/tests/misc/readlink-fp-loop.sh
index 6c7f70ac..4ae2dc52 100755
--- a/tests/misc/readlink-fp-loop.sh
+++ b/tests/misc/readlink-fp-loop.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # readlink from 6.9 would fail with a false-positive symlink loop error
 
-# Copyright (C) 2007-2013 Free Software Foundation, Inc.
+# Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 
 . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 print_ver_ readlink
-cwd=$("$abs_top_builddir/src/pwd")
+cwd=$(env pwd -P)
 
 # To trigger this bug, we have to construct a name/situation during
 # the resolution of which the code dereferences the same symlink (S)
diff --git a/tests/misc/readlink-root.sh b/tests/misc/readlink-root.sh
index ddd49092..f33574cb 100755
--- a/tests/misc/readlink-root.sh
+++ b/tests/misc/readlink-root.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # tests for canonicalize-existing mode (readlink -e) on /.
 
-# Copyright (C) 2012-2013 Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/realpath.sh b/tests/misc/realpath.sh
index 7a8bf497..257b9f24 100755
--- a/tests/misc/realpath.sh
+++ b/tests/misc/realpath.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Validate realpath operation
 
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/runcon-no-reorder.sh b/tests/misc/runcon-no-reorder.sh
index 27656c7d..ca8ad5b3 100755
--- a/tests/misc/runcon-no-reorder.sh
+++ b/tests/misc/runcon-no-reorder.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that runcon does not reorder its arguments.
 
-# Copyright (C) 2007-2013 Free Software Foundation, Inc.
+# Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
 # 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
@@ -27,7 +27,7 @@ echo "$diag" > exp || framework_failure_
 # On such a system it fails with the above diagnostic, which is fine.
 # Before the no-reorder change, it would have failed with a diagnostic
 # about -j being an invalid option.
-runcon $(id -Z) true -j 2> out && : > exp
+runcon $(id -Z) true -j 2> out && > exp
 
 # When run on a system with no /selinux/context (i.e., in a chroot),
 # it chcon fails with this: "runcon: invalid context: \
diff --git a/tests/misc/selinux.sh b/tests/misc/selinux.sh
index b30bcbcf..2a8ad89f 100755
--- a/tests/misc/selinux.sh
+++ b/tests/misc/selinux.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test SELinux-related options.
 
-# Copyright (C) 2007-2013 Free Software Foundation, Inc.
+# Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
 # 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
@@ -44,6 +44,12 @@ done
 # ensure that ls -l output includes the ".".
 c=$(ls -l f|cut -c11); test "$c" = . || fail=1
 
+# Copy with an invalid context and ensure it fails
+# Note this may succeed when root and selinux is in permissive mode
+if test "$(getenforce)" = Enforcing; then
+  cp --context='invalid-selinux-context' f f.cp && fail=1
+fi
+
 # Copy each to a new directory and ensure that context is preserved.
 cp -r --preserve=all d f p s1 || fail=1
 for i in d f p; do
diff --git a/tests/misc/seq-long-double.sh b/tests/misc/seq-long-double.sh
index 45e2f05f..78ed50f5 100755
--- a/tests/misc/seq-long-double.sh
+++ b/tests/misc/seq-long-double.sh
@@ -3,7 +3,7 @@
 # Ensure that seq prints exactly two numbers for a 2-number integral
 # range at the limit of floating point precision.
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/seq.pl b/tests/misc/seq.pl
index b3496d62..92484363 100755
--- a/tests/misc/seq.pl
+++ b/tests/misc/seq.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Test "seq".
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 
 # 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
@@ -143,6 +143,9 @@ my @Tests =
    ['not-fast-1', qw(1 3 1), {OUT => [qw(1)]}],
    ['not-fast-2', qw(1 1 4.2), {OUT => [qw(1 2 3 4)]}],
    ['not-fast-3', qw(1 1 0)],
+   # In 8.20..8.22 a start or end of -0 was broken
+   ['not-fast-4', qw(-0 10), {OUT => [qw(-0 1 2 3 4 5 6 7 8 9 10)]}],
+   ['not-fast-5', qw(1 -0)],
 
    # Ensure the correct parameters are passed to the fast path
    ['fast-1', qw(4), {OUT => [qw(1 2 3 4)]}],
diff --git a/tests/misc/sha1sum-vec.pl b/tests/misc/sha1sum-vec.pl
index 6df91d64..14005a76 100755
--- a/tests/misc/sha1sum-vec.pl
+++ b/tests/misc/sha1sum-vec.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Sample vectors for "sha1sum".
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/sha1sum.pl b/tests/misc/sha1sum.pl
index 327c4dd8..fdb243a0 100755
--- a/tests/misc/sha1sum.pl
+++ b/tests/misc/sha1sum.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Test "sha1sum".
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
@@ -44,7 +44,9 @@ my @Tests =
                         {OUT=>"50abf5706a150990a08b2c5ea40fa0e585554732  f\n"}],
      ['million-a', {IN=> {f=> 'a' x 1000000}},
                         {OUT=>"34aa973cd4c4daa4f61eeb2bdbad27316534016f  f\n"}],
-     ['bs-sha', {IN=> {".\\foo"=> ''}},
+     ['bs-sha-1', {IN=> {".\nfoo"=> ''}},
+                        {OUT=>"\\$sha_degenerate  .\\nfoo\n"}],
+     ['bs-sha-2', {IN=> {".\\foo"=> ''}},
                         {OUT=>"\\$sha_degenerate  .\\\\foo\n"}],
      # The sha1sum and md5sum drivers share a lot of code.
      # Ensure that sha1sum does *not* share the part that makes
diff --git a/tests/misc/sha224sum.pl b/tests/misc/sha224sum.pl
index ef881280..384738b8 100755
--- a/tests/misc/sha224sum.pl
+++ b/tests/misc/sha224sum.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Test "sha224sum".
 
-# Copyright (C) 2005-2013 Free Software Foundation, Inc.
+# Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/sha256sum.pl b/tests/misc/sha256sum.pl
index 2ad38e6e..e5f29392 100755
--- a/tests/misc/sha256sum.pl
+++ b/tests/misc/sha256sum.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Test "sha256sum".
 
-# Copyright (C) 2005-2013 Free Software Foundation, Inc.
+# Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/sha384sum.pl b/tests/misc/sha384sum.pl
index 22e95e15..eafbf5b4 100755
--- a/tests/misc/sha384sum.pl
+++ b/tests/misc/sha384sum.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Test "sha384sum".
 
-# Copyright (C) 2005-2013 Free Software Foundation, Inc.
+# Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/sha512sum.pl b/tests/misc/sha512sum.pl
index 5e121339..c4a1cd4a 100755
--- a/tests/misc/sha512sum.pl
+++ b/tests/misc/sha512sum.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Test "sha512sum".
 
-# Copyright (C) 2005-2013 Free Software Foundation, Inc.
+# Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/shred-exact.sh b/tests/misc/shred-exact.sh
index 0cdc91fc..5434229c 100755
--- a/tests/misc/shred-exact.sh
+++ b/tests/misc/shred-exact.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
-# make sure that neither --exact nor --zero gobbles a command line argument
+# Test functionality of --exact
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
@@ -20,6 +20,7 @@
 print_ver_ shred
 
 
+# make sure that neither --exact nor --zero gobbles a command line argument
 for opt in --exact --zero; do
   echo a > a || fail=1
   echo bb > b || fail=1
@@ -33,4 +34,16 @@ for opt in --exact --zero; do
   test -f c && fail=1
 done
 
+
+# make sure direct I/O is handled appropriately at end of file
+# Create a 1MiB file as we'll probably not be using blocks larger than that
+# (i.e. we want to test failed writes not at the start).
+truncate -s1MiB file.slop || framework_failure_
+truncate -s+1 file.slop || framework_failure_
+shred --exact -n2 file.slop || fail=1
+
+# make sure direct I/O is handled appropriately at start of file
+truncate -s1 file.slop || framework_failure_
+shred --exact -n2 file.slop || fail=1
+
 Exit $fail
diff --git a/tests/misc/id-groups.sh b/tests/misc/shred-negative.sh
index ff3dc59f..86cbf3e0 100755
--- a/tests/misc/id-groups.sh
+++ b/tests/misc/shred-negative.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
-# Ensure that "id" outputs groups for a user
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Exercise shred -s-3 FILE
+
+# Copyright (C) 2014 Free Software Foundation, Inc.
 
 # 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
@@ -16,8 +17,12 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
-print_ver_ id
+print_ver_ shred
+
+echo 'shred: -2: invalid file size' > exp || framework_failure_
+echo 1234 > f || framework_failure_
 
-id -G $(id -nu) || fail=1
+shred -s-2 f 2>err && fail=1
+compare exp err || fail=1
 
 Exit $fail
diff --git a/tests/misc/shred-passes.sh b/tests/misc/shred-passes.sh
index cfdd68e9..268af950 100755
--- a/tests/misc/shred-passes.sh
+++ b/tests/misc/shred-passes.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Verify the operations done by shred
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
@@ -20,9 +20,9 @@
 print_ver_ shred
 
 
-# shred a single letter, zero length file which should result in
+# shred a single letter, which should result in
 # 3 random passes and a single rename.
-touch f || framework_failure_
+printf 1 > f || framework_failure_
 echo "\
 shred: f: pass 1/3 (random)...
 shred: f: pass 2/3 (random)...
@@ -31,9 +31,21 @@ shred: f: removing
 shred: f: renamed to 0
 shred: f: removed" > exp || framework_failure_
 
+shred -v -u f 2>out || fail=1
+
+compare exp out || fail=1
+
+# Likewise but for a zero length file
+# to bypass the data passes
+touch f || framework_failure_
+echo "\
+shred: f: removing
+shred: f: renamed to 0
+shred: f: removed" > exp || framework_failure_
 
 shred -v -u f 2>out || fail=1
 
 compare exp out || fail=1
 
+
 Exit $fail
diff --git a/tests/misc/shred-remove.sh b/tests/misc/shred-remove.sh
index 891dc2d2..9765e352 100755
--- a/tests/misc/shred-remove.sh
+++ b/tests/misc/shred-remove.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
-# Exercise a bug that was fixed in shred-4.0l
+# Exercise shred --remove
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 
 # 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
@@ -21,16 +21,27 @@ print_ver_ shred
 skip_if_root_
 
 # The length of the basename is what matters.
-# In this case, shred would try to rename the file 256^10 times
+# In this case, shred-4.0l would try to rename the file 256^10 times
 # before terminating.
 file=0123456789
 touch $file || framework_failure_
 chmod u-w $file || framework_failure_
 
-
 # This would take so long that it appears to infloop
 # when using version from fileutils-4.0k.
 # When the command completes, expect it to fail.
-shred -u $file > /dev/null 2>&1 && fail=1 || :
+shred -u $file > /dev/null 2>&1 && fail=1
+rm -f $file || framework_failure_
+
+# Ensure all --remove methods at least unlink the file
+for mode in '' '=unlink' '=wipe' '=wipesync'; do
+  touch $file || framework_failure_
+  shred -n0 --remove"$mode" $file || fail=1
+  test -e $file && fail=1
+done
+
+# Ensure incorrect params are diagnosed
+touch $file || framework_failure_
+shred -n0 --remove=none $file 2>/dev/null && fail=1
 
 Exit $fail
diff --git a/tests/misc/shuf-reservoir.sh b/tests/misc/shuf-reservoir.sh
new file mode 100755
index 00000000..aa9edbea
--- /dev/null
+++ b/tests/misc/shuf-reservoir.sh
@@ -0,0 +1,73 @@
+#!/bin/sh
+# Exercise shuf's reservoir-sampling code
+# NOTE:
+#  These tests do not check valid randomness,
+#  they just check memory allocation related code.
+
+# Copyright (C) 2013-2014 Free Software Foundation, Inc.
+
+# 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 3 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/>.
+
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
+print_ver_ shuf
+expensive_
+require_valgrind_
+
+# Only exit with error for leaks when in development mode
+# in which case we enable code to suppress inconsequential leaks.
+grep '^#define lint 1' "$CONFIG_HEADER" && leaklevel=full || leaklevel=summary
+
+# Run "shuf" with specific number of input lines and output lines
+# Check the output for expected number of lines.
+run_shuf_n()
+{
+  INPUT_LINES="$1"
+  OUTPUT_LINES="$2"
+
+  # Critical memory-related bugs will cause a segfault here
+  # (with varying numbers of input/output lines)
+  seq "$INPUT_LINES" | valgrind --leak-check=$leaklevel --error-exitcode=1 \
+  shuf -n "$OUTPUT_LINES" -o "out_${INPUT_LINES}_${OUTPUT_LINES}" || return 1
+
+  EXPECTED_LINES="$OUTPUT_LINES"
+  test "$INPUT_LINES" -lt "$OUTPUT_LINES" && EXPECTED_LINES="$INPUT_LINES"
+
+  # There is no sure way to verify shuffled output (as it is random).
+  # Ensure we have the correct number of all numeric lines non duplicated lines.
+  GOOD_LINES=$(grep '^[0-9][0-9]*$' "out_${INPUT_LINES}_${OUTPUT_LINES}" |
+               sort -un | wc -l) || framework_failure_
+  LINES=$(wc -l < "out_${INPUT_LINES}_${OUTPUT_LINES}") || framework_failure_
+
+  test "$EXPECTED_LINES" -eq "$GOOD_LINES" || return 1
+  test "$EXPECTED_LINES" -eq "$LINES" || return 1
+
+  return 0
+}
+
+# Test multiple combinations of input lines and output lines.
+# (e.g. small number of input lines and large number of output lines,
+#  and vice-versa. Also, each reservoir allocation uses a 1024-lines batch,
+#  so test 1023/1024/1025 and related values).
+TEST_LINES="0 1 5 1023 1024 1025 3071 3072 3073"
+
+for IN_N in $TEST_LINES; do
+  for OUT_N in $TEST_LINES; do
+    run_shuf_n "$IN_N" "$OUT_N" || {
+      fail=1
+      echo "shuf-reservoir-sampling failed with IN_N=$IN_N OUT_N=$OUT_N" >&2;
+    }
+  done
+done
+
+Exit $fail
diff --git a/tests/misc/shuf.sh b/tests/misc/shuf.sh
index 9c9526d4..d7251d1d 100755
--- a/tests/misc/shuf.sh
+++ b/tests/misc/shuf.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that shuf randomizes its input.
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
@@ -43,6 +43,10 @@ compare in out1 || { fail=1; echo "not a permutation" 1>&2; }
 t=$(shuf -e a b c d e | sort | fmt)
 test "$t" = 'a b c d e' || { fail=1; echo "not a permutation" 1>&2; }
 
+# coreutils-8.22 dumps core.
+shuf -er
+test $? -eq 1 || fail=1
+
 # Before coreutils-6.3, this would infloop.
 # "seq 1860" produces 8193 (8K + 1) bytes of output.
 seq 1860 | shuf > /dev/null || fail=1
@@ -57,4 +61,104 @@ cmp out exp || { fail=1; echo "missing NUL terminator?" 1>&2; }
 timeout 10 shuf -i1-$SIZE_MAX -n2 >/dev/null ||
   { fail=1; echo "couldn't get a small subset" >&2; }
 
+# Ensure shuf -n0 doesn't read any input or open specified files
+touch unreadable || framework_failure_
+chmod 0 unreadable || framework_failure_
+if ! test -r unreadable; then
+  shuf -n0 unreadable || fail=1
+  shuf -n1 unreadable && fail=1
+fi
+
+# Multiple -n is accepted, should use the smallest value
+shuf -n10 -i0-9 -n3 -n20 > exp || framework_failure_
+c=$(wc -l < exp) || framework_failure_
+test "$c" -eq 3 || { fail=1; echo "Multiple -n failed">&2 ; }
+
+# Test error conditions
+
+# -i and -e must not be used together
+: | shuf -i0-9 -e A B &&
+  { fail=1; echo "shuf did not detect erroneous -e and -i usage.">&2 ; }
+# Test invalid value for -n
+: | shuf -nA &&
+  { fail=1; echo "shuf did not detect erroneous -n usage.">&2 ; }
+# Test multiple -i
+shuf -i0-9 -n10 -i8-90 &&
+  { fail=1; echo "shuf did not detect multiple -i usage.">&2 ; }
+# Test invalid range
+for ARG in '1' 'A' '1-' '1-A'; do
+  shuf -i$ARG &&
+    { fail=1; echo "shuf did not detect erroneous -i$ARG usage.">&2 ; }
+done
+
+# multiple -o are forbidden
+shuf -i0-9 -o A -o B &&
+  { fail=1; echo "shuf did not detect erroneous multiple -o usage.">&2 ; }
+# multiple random-sources are forbidden
+shuf -i0-9 --random-source A --random-source B &&
+  { fail=1; echo "shuf did not detect multiple --random-source usage.">&2 ; }
+
+# Test --repeat option
+
+# --repeat without count should return an indefinite number of lines
+shuf --rep -i 0-10 | head -n 1000 > exp || framework_failure_
+c=$(wc -l < exp) || framework_failure_
+test "$c" -eq 1000 \
+  || { fail=1; echo "--repeat does not repeat indefinitely">&2 ; }
+
+# --repeat can output more values than the input range
+shuf --rep -i0-9 -n1000 > exp || framework_failure_
+c=$(wc -l < exp) || framework_failure_
+test "$c" -eq 1000 || { fail=1; echo "--repeat with --count failed">&2 ; }
+
+# Check output values (this is not bullet-proof, but drawing 1000 values
+# between 0 and 9 should produce all values, unless there's a bug in shuf
+# or a very poor random source, or extremely bad luck)
+c=$(sort -nu exp | paste -s -d ' ') || framework_failure_
+test "$c" = "0 1 2 3 4 5 6 7 8 9" ||
+  { fail=1; echo "--repeat produced bad output">&2 ; }
+
+# check --repeat with non-zero low value
+shuf --rep -i222-233 -n2000 > exp || framework_failure_
+c=$(cat exp | sort -nu | paste -s -d ' ') || framework_failure_
+test "$c" = "222 223 224 225 226 227 228 229 230 231 232 233" ||
+ { fail=1; echo "--repeat produced bad output with non-zero low">&2 ; }
+
+# --repeat,-i,count=0 should not fail and produce no output
+shuf --rep -i0-9 -n0 > exp || framework_failure_
+# file size should be zero (no output from shuf)
+test \! -s exp ||
+  { fail=1; echo "--repeat,-i0-9,-n0 produced bad output">&2 ; }
+
+# --repeat with -e, without count, should repeat indefinitely
+shuf --rep -e A B C D | head -n 1000 > exp || framework_failure_
+c=$(wc -l < exp) || framework_failure_
+test "$c" -eq 1000 ||
+  { fail=1; echo "--repeat,-e does not repeat indefinitely">&2 ; }
+
+# --repeat with STDIN, without count, should repeat indefinitely
+printf "A\nB\nC\nD\nE\n" | shuf --rep | head -n 1000 > exp || framework_failure_
+c=$(wc -l < exp) || framework_failure_
+test "$c" -eq 1000 ||
+  { fail=1; echo "--repeat,STDIN does not repeat indefinitely">&2 ; }
+
+# --repeat with STDIN,count - can return move values than input lines
+printf "A\nB\nC\nD\nE\n" | shuf --rep -n2000 > exp || framework_failure_
+c=$(wc -l < exp) || framework_failure_
+test "$c" -eq 2000 ||
+  { fail=1; echo "--repeat,STDIN,count failed">&2 ; }
+
+# Check output values (this is not bullet-proof, but drawing 2000 values
+# between A and E should produce all values, unless there's a bug in shuf
+# or a very poor random source, or extremely bad luck)
+c=$(sort -u exp | paste -s -d ' ') || framework_failure_
+test "$c" = "A B C D E" ||
+  { fail=1; echo "--repeat,STDIN,count produced bad output">&2 ; }
+
+# --repeat,stdin,count=0 should not fail and produce no output
+printf "A\nB\nC\nD\nE\n" | shuf --rep -n0 > exp || framework_failure_
+# file size should be zero (no output from shuf)
+test \! -s exp ||
+  { fail=1; echo "--repeat,STDIN,-n0 produced bad output">&2 ; }
+
 Exit $fail
diff --git a/tests/misc/sort-NaN-infloop.sh b/tests/misc/sort-NaN-infloop.sh
index 2ec13ee0..9c6e021a 100755
--- a/tests/misc/sort-NaN-infloop.sh
+++ b/tests/misc/sort-NaN-infloop.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # exercise the NaN-infloop bug in coreutils-8.13
 
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/sort-benchmark-random.sh b/tests/misc/sort-benchmark-random.sh
index 04f2af99..c074301f 100755
--- a/tests/misc/sort-benchmark-random.sh
+++ b/tests/misc/sort-benchmark-random.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Benchmark sort on randomly generated data.
 
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/sort-compress-hang.sh b/tests/misc/sort-compress-hang.sh
index 1b1f3a9c..cc1e6d36 100755
--- a/tests/misc/sort-compress-hang.sh
+++ b/tests/misc/sort-compress-hang.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test for sort --compress hang
 
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/sort-compress-proc.sh b/tests/misc/sort-compress-proc.sh
index 3888fdb6..d06eb56f 100755
--- a/tests/misc/sort-compress-proc.sh
+++ b/tests/misc/sort-compress-proc.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test use of compression subprocesses by sort
 
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/sort-compress.sh b/tests/misc/sort-compress.sh
index c7587c43..8f215b8b 100755
--- a/tests/misc/sort-compress.sh
+++ b/tests/misc/sort-compress.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test use of compression by sort
 
-# Copyright (C) 2007-2013 Free Software Foundation, Inc.
+# Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
 # 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
@@ -39,7 +39,7 @@ chmod +x gzip
 # Use a subshell and an exec to work around a bug in FreeBSD 5.0 /bin/sh.
 (
   # ash doesn't support "trap '' CHLD"; it knows only signal numbers.
-  sig=$("$abs_top_builddir/src/kill" -l CHLD 2>/dev/null) && trap '' $sig
+  sig=$(env kill -l CHLD 2>/dev/null) && trap '' $sig
 
   # This should force the use of child processes for "compression"
   PATH=.:$PATH exec sort -S 1k --compress-program=gzip in > /dev/null
diff --git a/tests/misc/sort-continue.sh b/tests/misc/sort-continue.sh
index bd569d0d..1c4030d9 100755
--- a/tests/misc/sort-continue.sh
+++ b/tests/misc/sort-continue.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Tests for file descriptor exhaustion.
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/sort-debug-keys.sh b/tests/misc/sort-debug-keys.sh
index 9d4f8295..ff1e19b6 100755
--- a/tests/misc/sort-debug-keys.sh
+++ b/tests/misc/sort-debug-keys.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test annotation of sort keys
 
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/sort-debug-warn.sh b/tests/misc/sort-debug-warn.sh
index c9f1b9f3..fd16829b 100755
--- a/tests/misc/sort-debug-warn.sh
+++ b/tests/misc/sort-debug-warn.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test warnings for sort options
 
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/sort-discrim.sh b/tests/misc/sort-discrim.sh
index 0dac3a9d..e3cd1907 100755
--- a/tests/misc/sort-discrim.sh
+++ b/tests/misc/sort-discrim.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test discriminator-based sorting.
 
-# Copyright (C) 2012-2013 Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/sort-exit-early.sh b/tests/misc/sort-exit-early.sh
index 83a55f51..2a70253e 100755
--- a/tests/misc/sort-exit-early.sh
+++ b/tests/misc/sort-exit-early.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test 'sort' exits early on inaccessible inputs or output
 
-# Copyright (C) 2012-2013 Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/sort-files0-from.pl b/tests/misc/sort-files0-from.pl
index d843b646..77c1b1aa 100755
--- a/tests/misc/sort-files0-from.pl
+++ b/tests/misc/sort-files0-from.pl
@@ -2,7 +2,7 @@
 # Exercise sort's --files0-from option.
 # FIXME: keep this file in sync with tests/du/files0-from.
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/sort-float.sh b/tests/misc/sort-float.sh
index dd3c079c..7a4e8292 100755
--- a/tests/misc/sort-float.sh
+++ b/tests/misc/sort-float.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure sort -g sorts floating point limits correctly
 
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/sort-merge-fdlimit.sh b/tests/misc/sort-merge-fdlimit.sh
index bcd023ae..0df7aa66 100755
--- a/tests/misc/sort-merge-fdlimit.sh
+++ b/tests/misc/sort-merge-fdlimit.sh
@@ -2,7 +2,7 @@
 # Test whether sort avoids opening more file descriptors than it is
 # allowed when merging files.
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
@@ -19,7 +19,6 @@
 
 . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 print_ver_ sort
-require_ulimit_
 
 mkdir in err || framework_failure_
 
diff --git a/tests/misc/sort-merge.pl b/tests/misc/sort-merge.pl
index 5b940f25..06e3c15f 100755
--- a/tests/misc/sort-merge.pl
+++ b/tests/misc/sort-merge.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Test "sort -m".
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/sort-month.sh b/tests/misc/sort-month.sh
index 99008367..40c814da 100755
--- a/tests/misc/sort-month.sh
+++ b/tests/misc/sort-month.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test sorting of abbreviated months from the locale
 
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/sort-rand.sh b/tests/misc/sort-rand.sh
index 4313eb2f..2397fb4b 100755
--- a/tests/misc/sort-rand.sh
+++ b/tests/misc/sort-rand.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that sort --sort-random doesn't sort.
 
-# Copyright (C) 2005-2013 Free Software Foundation, Inc.
+# Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/sort-spinlock-abuse.sh b/tests/misc/sort-spinlock-abuse.sh
index 768fc1f4..49ed920f 100755
--- a/tests/misc/sort-spinlock-abuse.sh
+++ b/tests/misc/sort-spinlock-abuse.sh
@@ -2,7 +2,7 @@
 # trigger a bug that would make parallel sort use 100% of one or more
 # CPU while blocked on output.
 
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/sort-stale-thread-mem.sh b/tests/misc/sort-stale-thread-mem.sh
index 78fa2cda..78defd23 100755
--- a/tests/misc/sort-stale-thread-mem.sh
+++ b/tests/misc/sort-stale-thread-mem.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Trigger a bug that would cause 'sort' to reference stale thread stack memory.
 
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/sort-u-FMR.sh b/tests/misc/sort-u-FMR.sh
index c13e9823..3019cbe8 100755
--- a/tests/misc/sort-u-FMR.sh
+++ b/tests/misc/sort-u-FMR.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Before 8.19, this would trigger a free-memory read.
 
-# Copyright (C) 2012-2013 Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/sort-unique-segv.sh b/tests/misc/sort-unique-segv.sh
index 58893158..148dc243 100755
--- a/tests/misc/sort-unique-segv.sh
+++ b/tests/misc/sort-unique-segv.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # parallel sort with --unique (-u) would segfault
 
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/sort-unique.sh b/tests/misc/sort-unique.sh
index f34df96e..d7a7629c 100755
--- a/tests/misc/sort-unique.sh
+++ b/tests/misc/sort-unique.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test 'sort -u'.
 
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/sort-version.sh b/tests/misc/sort-version.sh
index d9686fbe..d8db1e1c 100755
--- a/tests/misc/sort-version.sh
+++ b/tests/misc/sort-version.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # exercise sort's --sort=version option
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/sort.pl b/tests/misc/sort.pl
index 59c30e56..db732094 100755
--- a/tests/misc/sort.pl
+++ b/tests/misc/sort.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/stat-birthtime.sh b/tests/misc/stat-birthtime.sh
index b30c972b..f06ddea8 100755
--- a/tests/misc/stat-birthtime.sh
+++ b/tests/misc/stat-birthtime.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ensure that stat attempts birthtime access
 
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/stat-fmt.sh b/tests/misc/stat-fmt.sh
index 547f5b8f..3982f23b 100755
--- a/tests/misc/stat-fmt.sh
+++ b/tests/misc/stat-fmt.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ensure that stat properly handles a format string ending with %
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/stat-hyphen.sh b/tests/misc/stat-hyphen.sh
index a817b285..9f090a0f 100755
--- a/tests/misc/stat-hyphen.sh
+++ b/tests/misc/stat-hyphen.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # demonstrate that stat - works and stat -f - does not.
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/stat-mount.sh b/tests/misc/stat-mount.sh
index f94c77cb..ab1ff479 100755
--- a/tests/misc/stat-mount.sh
+++ b/tests/misc/stat-mount.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test stat -c%m
 
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
 # 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
@@ -19,8 +19,10 @@
 . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 print_ver_ stat
 
-df_mnt=$(df -P . | sed -n '2s/.* \([^ ]*$\)/\1/p')
 stat_mnt=$(stat -c%m .) || fail=1
-test "$stat_mnt" || fail=1
+case "$stat_mnt" in
+  /*) ;;
+  *) fail=1;;
+esac
 
 Exit $fail
diff --git a/tests/misc/stat-nanoseconds.sh b/tests/misc/stat-nanoseconds.sh
index 9c891b76..30c47c02 100755
--- a/tests/misc/stat-nanoseconds.sh
+++ b/tests/misc/stat-nanoseconds.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Exercise format strings involving %:X, %:Y, etc.
 
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/stat-printf.pl b/tests/misc/stat-printf.pl
index fb31043f..5021130d 100755
--- a/tests/misc/stat-printf.pl
+++ b/tests/misc/stat-printf.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Test "stat --printf".
 
-# Copyright (C) 2005-2013 Free Software Foundation, Inc.
+# Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/stat-slash.sh b/tests/misc/stat-slash.sh
index 47aa7907..465de2ed 100755
--- a/tests/misc/stat-slash.sh
+++ b/tests/misc/stat-slash.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # demonstrate that stat handles trailing slashes correctly
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/stdbuf.sh b/tests/misc/stdbuf.sh
index 12347ecc..e0ca3530 100755
--- a/tests/misc/stdbuf.sh
+++ b/tests/misc/stdbuf.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Exercise stdbuf functionality
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
@@ -50,6 +50,8 @@ stdbuf -o$SIZE_OFLOW true # size too large
 test $? = 125 || fail=1
 stdbuf -iL true # line buffering stdin disallowed
 test $? = 125 || fail=1
+stdbuf true # a buffering mode must be specified
+test $? = 125 || fail=1
 stdbuf -i0 -o0 -e0 true || fail=1 #check all files
 stdbuf -o1 . # invalid command
 test $? = 126 || fail=1
diff --git a/tests/misc/stty-invalid.sh b/tests/misc/stty-invalid.sh
index c6400fcf..36bc8aa0 100755
--- a/tests/misc/stty-invalid.sh
+++ b/tests/misc/stty-invalid.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that stty diagnoses invalid inputs, rather than silently misbehaving.
 
-# Copyright (C) 2007-2013 Free Software Foundation, Inc.
+# Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/stty-pairs.sh b/tests/misc/stty-pairs.sh
index be5b6f84..1a7c26cf 100755
--- a/tests/misc/stty-pairs.sh
+++ b/tests/misc/stty-pairs.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Make sure stty can parse most of its options - in pairs [expensive].
 
-# Copyright (C) 1998-2013 Free Software Foundation, Inc.
+# Copyright (C) 1998-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/stty-row-col.sh b/tests/misc/stty-row-col.sh
index 586674ad..729d6f91 100755
--- a/tests/misc/stty-row-col.sh
+++ b/tests/misc/stty-row-col.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Test "stty" with rows and columns.
 
-# Copyright (C) 1998-2013 Free Software Foundation, Inc.
+# Copyright (C) 1998-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/stty.sh b/tests/misc/stty.sh
index 2f9b9a3b..ab1c78de 100755
--- a/tests/misc/stty.sh
+++ b/tests/misc/stty.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Make sure stty can parse most of its options.
 
-# Copyright (C) 1998-2013 Free Software Foundation, Inc.
+# Copyright (C) 1998-2014 Free Software Foundation, Inc.
 
 # 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
@@ -52,7 +52,10 @@ for opt in $options; do
   # other serial control settings give the same error. So skip them.
   # Also on ppc*|sparc* glibc platforms 'icanon' gives the same error.
   # See: http://debbugs.gnu.org/7228#14
-  case $opt in parenb|parodd|cstopb|crtscts|cdtrdsr|icanon) continue;; esac
+  case $opt in
+    parenb|parodd|cmspar) continue;;
+    cstopb|crtscts|cdtrdsr|icanon) continue;;
+  esac
 
   stty $opt || fail=1
 
diff --git a/tests/misc/sum-sysv.sh b/tests/misc/sum-sysv.sh
index a1e8cee9..7624685f 100755
--- a/tests/misc/sum-sysv.sh
+++ b/tests/misc/sum-sysv.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # make sure 'sum -s' works for input whose sum of bytes is larger than 2^32
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/sum.pl b/tests/misc/sum.pl
index 3cabcc53..696eda4b 100755
--- a/tests/misc/sum.pl
+++ b/tests/misc/sum.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Test "sum".
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/tac-2-nonseekable.sh b/tests/misc/tac-2-nonseekable.sh
index ef434807..c27694c1 100755
--- a/tests/misc/tac-2-nonseekable.sh
+++ b/tests/misc/tac-2-nonseekable.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ensure that tac works with two or more non-seekable inputs
 
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/tac-continue.sh b/tests/misc/tac-continue.sh
index 95f37d7b..d4280650 100755
--- a/tests/misc/tac-continue.sh
+++ b/tests/misc/tac-continue.sh
@@ -3,7 +3,7 @@
 # when it encounters an error with say the first one.
 # With coreutils-5.2.1 and earlier, this test would fail.
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/tac.pl b/tests/misc/tac.pl
index b064b9d2..0f21affd 100755
--- a/tests/misc/tac.pl
+++ b/tests/misc/tac.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/tail.pl b/tests/misc/tail.pl
index bc6e6d4a..6798eb05 100755
--- a/tests/misc/tail.pl
+++ b/tests/misc/tail.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Test tail.
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/tee-dash.sh b/tests/misc/tee-dash.sh
index 9e511beb..761a4780 100755
--- a/tests/misc/tee-dash.sh
+++ b/tests/misc/tee-dash.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # test for "tee -".
 
-# Copyright (C) 2005-2013 Free Software Foundation, Inc.
+# Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/tee.sh b/tests/misc/tee.sh
index bbaf99b7..f0072bfd 100755
--- a/tests/misc/tee.sh
+++ b/tests/misc/tee.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # test for basic tee functionality.
 
-# Copyright (C) 2005-2013 Free Software Foundation, Inc.
+# Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/test-diag.pl b/tests/misc/test-diag.pl
index 81ab60d8..14d0f4d5 100755
--- a/tests/misc/test-diag.pl
+++ b/tests/misc/test-diag.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Test the diagnostics of "test".
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/test.pl b/tests/misc/test.pl
index ee9150d7..b27adb48 100755
--- a/tests/misc/test.pl
+++ b/tests/misc/test.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/timeout-blocked.pl b/tests/misc/timeout-blocked.pl
index 6f16ba4c..b5f31c96 100755
--- a/tests/misc/timeout-blocked.pl
+++ b/tests/misc/timeout-blocked.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Test that timeout handles blocked SIGALRM from its parent.
 
-# Copyright (C) 2013 Free Software Foundation, Inc.
+# Copyright (C) 2013-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/timeout-group.sh b/tests/misc/timeout-group.sh
index 35a6be0b..23c1b065 100755
--- a/tests/misc/timeout-group.sh
+++ b/tests/misc/timeout-group.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # test program group handling
 
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/timeout-parameters.sh b/tests/misc/timeout-parameters.sh
index 06cdfb39..fca30f0b 100755
--- a/tests/misc/timeout-parameters.sh
+++ b/tests/misc/timeout-parameters.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Validate timeout parameter combinations
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/timeout.sh b/tests/misc/timeout.sh
index 6b5a6f10..8eaeef95 100755
--- a/tests/misc/timeout.sh
+++ b/tests/misc/timeout.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Validate timeout basic operation
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
@@ -51,7 +51,7 @@ test $? = 124 && fail=1
 # Use a subshell and an exec to work around a bug in FreeBSD 5.0 /bin/sh.
 (
   # ash doesn't support "trap '' CHLD"; it knows only signal numbers.
-  sig=$("$abs_top_builddir/src/kill" -l CHLD 2>/dev/null) && trap '' $sig
+  sig=$(env kill -l CHLD 2>/dev/null) && trap '' $sig
 
   exec timeout 10 true
 ) || fail=1
diff --git a/tests/misc/tr-case-class.sh b/tests/misc/tr-case-class.sh
index 1294f965..952aae45 100755
--- a/tests/misc/tr-case-class.sh
+++ b/tests/misc/tr-case-class.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test case conversion classes
 
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/tr.pl b/tests/misc/tr.pl
index 89693f91..e7018e79 100755
--- a/tests/misc/tr.pl
+++ b/tests/misc/tr.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/truncate-dangling-symlink.sh b/tests/misc/truncate-dangling-symlink.sh
index 5386ce2d..c5bbc3b6 100755
--- a/tests/misc/truncate-dangling-symlink.sh
+++ b/tests/misc/truncate-dangling-symlink.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Make sure truncate can create a file through a dangling symlink.
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/truncate-dir-fail.sh b/tests/misc/truncate-dir-fail.sh
index 8bd67b6e..8ff09179 100755
--- a/tests/misc/truncate-dir-fail.sh
+++ b/tests/misc/truncate-dir-fail.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Make sure truncate fails for a directory.
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/truncate-fail-diag.sh b/tests/misc/truncate-fail-diag.sh
index 8e5f07ba..9f242d34 100755
--- a/tests/misc/truncate-fail-diag.sh
+++ b/tests/misc/truncate-fail-diag.sh
@@ -5,7 +5,7 @@
 # open ("missing/", O_CREAT & (O_WRONLY | O_RDWR), ...) -> EISDIR
 # open ("missing/file", O_CREAT & (O_WRONLY | O_RDWR), ...) -> ENOENT
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/truncate-fifo.sh b/tests/misc/truncate-fifo.sh
index 58e5c14e..c2c0bbfc 100755
--- a/tests/misc/truncate-fifo.sh
+++ b/tests/misc/truncate-fifo.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Make sure truncate works on fifos without hanging
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/truncate-no-create-missing.sh b/tests/misc/truncate-no-create-missing.sh
index 6fa1f0c6..1cf55330 100755
--- a/tests/misc/truncate-no-create-missing.sh
+++ b/tests/misc/truncate-no-create-missing.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that truncate -c no-such-file doesn't fail.
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/truncate-overflow.sh b/tests/misc/truncate-overflow.sh
index dd0fc730..72ed626b 100755
--- a/tests/misc/truncate-overflow.sh
+++ b/tests/misc/truncate-overflow.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Validate truncate integer overflow
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/truncate-owned-by-other.sh b/tests/misc/truncate-owned-by-other.sh
index e7f7157c..e70badb6 100755
--- a/tests/misc/truncate-owned-by-other.sh
+++ b/tests/misc/truncate-owned-by-other.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Demonstrate that "truncate -s0 writable-but-owned-by-other" works.
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
@@ -21,16 +21,15 @@ print_ver_ truncate
 
 require_root_
 
-group_num=$(id -g $NON_ROOT_USERNAME)
-
 # Create a file owned by root, and writable by $NON_ROOT_USERNAME.
 echo > root-owned || framework_failure_
-chgrp +$group_num . root-owned || framework_failure_
+chgrp +$NON_ROOT_GID . root-owned || framework_failure_
 chmod g+w root-owned
 
 # Ensure that the current directory is searchable by $NON_ROOT_USERNAME.
 chmod g+x .
 
-setuidgid $NON_ROOT_USERNAME env PATH="$PATH" truncate -s0 root-owned || fail=1
+chroot --user=$NON_ROOT_USERNAME / env PATH="$PATH" \
+  truncate -s0 root-owned || fail=1
 
 Exit $fail
diff --git a/tests/misc/truncate-parameters.sh b/tests/misc/truncate-parameters.sh
index 21713d99..d9e6d64d 100755
--- a/tests/misc/truncate-parameters.sh
+++ b/tests/misc/truncate-parameters.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Validate truncate parameter combinations
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/truncate-relative.sh b/tests/misc/truncate-relative.sh
index fbbd4f97..3daa073e 100755
--- a/tests/misc/truncate-relative.sh
+++ b/tests/misc/truncate-relative.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Validate truncate relative sizes
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/tsort.pl b/tests/misc/tsort.pl
index 5e598c74..e59af328 100755
--- a/tests/misc/tsort.pl
+++ b/tests/misc/tsort.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Test "tsort".
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/tty-eof.pl b/tests/misc/tty-eof.pl
index 755ffac0..b4d36de6 100755
--- a/tests/misc/tty-eof.pl
+++ b/tests/misc/tty-eof.pl
@@ -4,7 +4,7 @@
 # Do the same for all programs that can read stdin,
 # require no arguments and that write to standard output.
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/unexpand.pl b/tests/misc/unexpand.pl
index a1ce5c52..8c5b693b 100755
--- a/tests/misc/unexpand.pl
+++ b/tests/misc/unexpand.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Test "unexpand".
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/uniq-perf.sh b/tests/misc/uniq-perf.sh
index 35dff8e5..31c40e53 100755
--- a/tests/misc/uniq-perf.sh
+++ b/tests/misc/uniq-perf.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # before coreutils-8.10, seq 100000|uniq -f 10000000000 would run for days
 
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/uniq.pl b/tests/misc/uniq.pl
index 140a49b4..d07f15f1 100755
--- a/tests/misc/uniq.pl
+++ b/tests/misc/uniq.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Test uniq.
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
@@ -80,23 +80,8 @@ sub add_z_variants($)
   return @new;
 }
 
-# I've only ever triggered the problem in a non-C locale.
-my $locale = $ENV{LOCALE_FR};
-! defined $locale || $locale eq 'none'
-  and CuSkip::skip "$prog: skipping this test -- no appropriate locale\n";
-
-# See if isblank returns true for nbsp.
-my $x = qx!env printf '\xa0'| LC_ALL=$locale tr '[:blank:]' x!;
-# If so, expect just one line of output in the schar test.
-# Otherwise, expect two.
-my $in = " y z\n\xa0 y z\n";
-my $schar_exp = $x eq 'x' ? " y z\n" : $in;
-
 my @Tests =
 (
-  # Test for a subtle, system-and-locale-dependent bug in uniq.
- ['schar', '-f1',  {IN => $in}, {OUT => $schar_exp},
-  {ENV => "LC_ALL=$locale"}],
  ['1', '', {IN=>''}, {OUT=>''}],
  ['2', '', {IN=>"a\na\n"}, {OUT=>"a\n"}],
  ['3', '', {IN=>"a\na"}, {OUT=>"a\n"}],
@@ -199,8 +184,76 @@ my @Tests =
  # Check that --zero-terminated is synonymous with -z.
  ['123', '--zero-terminated', {IN=>"a\na\nb"}, {OUT=>"a\na\nb\0"}],
  ['124', '--zero-terminated', {IN=>"a\0a\0b"}, {OUT=>"a\0b\0"}],
+ # Check ignore-case
+ ['125', '',              {IN=>"A\na\n"}, {OUT=>"A\na\n"}],
+ ['126', '-i',            {IN=>"A\na\n"}, {OUT=>"A\n"}],
+ ['127', '--ignore-case', {IN=>"A\na\n"}, {OUT=>"A\n"}],
+ # Check grouping
+ ['128', '--group=prepend', {IN=>"a\na\nb\n"}, {OUT=>"\na\na\n\nb\n"}],
+ ['129', '--group=append',  {IN=>"a\na\nb\n"}, {OUT=>"a\na\n\nb\n\n"}],
+ ['130', '--group=separate',{IN=>"a\na\nb\n"}, {OUT=>"a\na\n\nb\n"}],
+ # no explicit grouping = separate
+ ['131', '--group',         {IN=>"a\na\nb\n"}, {OUT=>"a\na\n\nb\n"}],
+ ['132', '--group=both',    {IN=>"a\na\nb\n"}, {OUT=>"\na\na\n\nb\n\n"}],
+ # Grouping in the special case of a single group
+ ['133', '--group=prepend', {IN=>"a\na\n"}, {OUT=>"\na\na\n"}],
+ ['134', '--group=append',  {IN=>"a\na\n"}, {OUT=>"a\na\n\n"}],
+ ['135', '--group=separate',{IN=>"a\na\n"}, {OUT=>"a\na\n"}],
+ ['136', '--group',         {IN=>"a\na\n"}, {OUT=>"a\na\n"}],
+ # Grouping with empty input - should never print anything
+ ['137', '--group=prepend',  {IN=>""}, {OUT=>""}],
+ ['138', '--group=append',   {IN=>""}, {OUT=>""}],
+ ['139', '--group=separate', {IN=>""}, {OUT=>""}],
+ ['140', '--group=both',     {IN=>""}, {OUT=>""}],
+ # Grouping with other options - must fail
+ ['141', '--group -c',       {IN=>""}, {OUT=>""}, {EXIT=>1},
+  {ERR=>"$prog: --group is mutually exclusive with -c/-d/-D/-u\n" .
+        "Try 'uniq --help' for more information.\n"}],
+ ['142', '--group -d',       {IN=>""}, {OUT=>""}, {EXIT=>1},
+  {ERR=>"$prog: --group is mutually exclusive with -c/-d/-D/-u\n" .
+        "Try 'uniq --help' for more information.\n"}],
+ ['143', '--group -u',       {IN=>""}, {OUT=>""}, {EXIT=>1},
+  {ERR=>"$prog: --group is mutually exclusive with -c/-d/-D/-u\n" .
+        "Try 'uniq --help' for more information.\n"}],
+ ['144', '--group -D',       {IN=>""}, {OUT=>""}, {EXIT=>1},
+  {ERR=>"$prog: --group is mutually exclusive with -c/-d/-D/-u\n" .
+        "Try 'uniq --help' for more information.\n"}],
+ # Grouping with badoption
+ ['145', '--group=badoption',{IN=>""}, {OUT=>""}, {EXIT=>1},
+  {ERR=>"$prog: invalid argument 'badoption' for '--group'\n" .
+        "Valid arguments are:\n" .
+        "  - 'prepend'\n" .
+        "  - 'append'\n" .
+        "  - 'separate'\n" .
+        "  - 'both'\n" .
+        "Try '$prog --help' for more information.\n"}],
 );
 
+# Locale related tests
+
+my $locale = $ENV{LOCALE_FR};
+if ( defined $locale && $locale ne 'none' )
+  {
+    # I've only ever triggered the problem in a non-C locale.
+
+    # See if isblank returns true for nbsp.
+    my $x = qx!env printf '\xa0'| LC_ALL=$locale tr '[:blank:]' x!;
+    # If so, expect just one line of output in the schar test.
+    # Otherwise, expect two.
+    my $in = " y z\n\xa0 y z\n";
+    my $schar_exp = $x eq 'x' ? " y z\n" : $in;
+
+    my @Locale_Tests =
+    (
+      # Test for a subtle, system-and-locale-dependent bug in uniq.
+      ['schar', '-f1',  {IN => $in}, {OUT => $schar_exp},
+        {ENV => "LC_ALL=$locale"}]
+    );
+
+    push @Tests, @Locale_Tests;
+  }
+
+
 # Set _POSIX2_VERSION=199209 in the environment of each obs-plus* test.
 foreach my $t (@Tests)
   {
diff --git a/tests/misc/wc-files0-from.pl b/tests/misc/wc-files0-from.pl
index a14bf97f..4ff10019 100755
--- a/tests/misc/wc-files0-from.pl
+++ b/tests/misc/wc-files0-from.pl
@@ -2,7 +2,7 @@
 # Exercise wc's --files0-from option.
 # FIXME: keep this file in sync with tests/du/files0-from.
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/wc-files0.sh b/tests/misc/wc-files0.sh
index 06be054d..37fd1ab0 100755
--- a/tests/misc/wc-files0.sh
+++ b/tests/misc/wc-files0.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Show that wc's new --files0-from option works.
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/wc-parallel.sh b/tests/misc/wc-parallel.sh
index bf6b7b29..01005820 100755
--- a/tests/misc/wc-parallel.sh
+++ b/tests/misc/wc-parallel.sh
@@ -2,7 +2,7 @@
 # Ensure that wc prints counts atomically
 # so that concurrent processes don't intersperse their output
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/wc.pl b/tests/misc/wc.pl
index ed2feafd..076ce049 100755
--- a/tests/misc/wc.pl
+++ b/tests/misc/wc.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Basic tests for "wc".
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/xattr.sh b/tests/misc/xattr.sh
index 6eccc10d..f208090f 100755
--- a/tests/misc/xattr.sh
+++ b/tests/misc/xattr.sh
@@ -3,7 +3,7 @@
 # attributes and install does not preserve extended attributes.
 # cp -a should preserve xattr, error diagnostics should not be displayed
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
@@ -66,7 +66,7 @@ getfattr -d c >out_c || skip_ "failed to get xattr of file"
 grep -F "$xattr_pair" out_c || fail=1
 
 # cp's -a option must produce no diagnostics.
-cp -a a d 2>err && test -s err && fail=1
+cp -a a d 2>err && { compare /dev/null err || fail=1; }
 getfattr -d d >out_d || skip_ "failed to get xattr of file"
 grep -F "$xattr_pair" out_d || fail=1
 
diff --git a/tests/misc/xstrtol.pl b/tests/misc/xstrtol.pl
index b2f38b61..fed8d7d6 100755
--- a/tests/misc/xstrtol.pl
+++ b/tests/misc/xstrtol.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # exercise xstrtol's diagnostics via pr
 
-# Copyright (C) 2007-2013 Free Software Foundation, Inc.
+# Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mkdir/p-1.sh b/tests/mkdir/p-1.sh
index 76c4517f..e08fd33d 100755
--- a/tests/mkdir/p-1.sh
+++ b/tests/mkdir/p-1.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test "mkdir -p".
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mkdir/p-2.sh b/tests/mkdir/p-2.sh
index 14a0a453..874a56af 100755
--- a/tests/mkdir/p-2.sh
+++ b/tests/mkdir/p-2.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Just like p-1, but with an absolute path.
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mkdir/p-3.sh b/tests/mkdir/p-3.sh
index 8cc7f3cf..6d55adee 100755
--- a/tests/mkdir/p-3.sh
+++ b/tests/mkdir/p-3.sh
@@ -3,7 +3,7 @@
 # causes immediate failure.  Also, ensure that we don't create
 # subsequent, relative command-line arguments in the wrong place.
 
-# Copyright (C) 2005-2013 Free Software Foundation, Inc.
+# Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/misc/cut-huge-to-eol-range.sh b/tests/mkdir/p-acl.sh
index 42cecfd7..dd4473a9 100755
--- a/tests/misc/cut-huge-to-eol-range.sh
+++ b/tests/mkdir/p-acl.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
-# Ensure that cut does not allocate mem for a range like -b9999999999999-
+# Test "mkdir -p" with default ACLs.
 
-# Copyright (C) 2012-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 
 # 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
@@ -17,14 +17,19 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
-print_ver_ cut
-require_ulimit_
-getlimits_
+print_ver_ mkdir
 
-# From coreutils-8.10 through 8.20, this would make cut try to allocate
-# a 256MiB bit vector.  With a 20MB limit on VM, the following would fail.
-(ulimit -v 20000; : | cut -b$INT_MAX- > err 2>&1) || fail=1
+require_setfacl_
 
-compare /dev/null err || fail=1
+mkdir d || framework_failure_
+setfacl -d -m group::rwx d || framework_failure_
+umask 077
+
+mkdir --parents d/e || fail=1
+ls_l=$(ls -ld d/e) || fail=1
+case $ls_l in
+  d???rw[sx]*) ;;
+  *) fail=1 ;;
+esac
 
 Exit $fail
diff --git a/tests/mkdir/p-slashdot.sh b/tests/mkdir/p-slashdot.sh
index cfeead3a..bbca9ad7 100755
--- a/tests/mkdir/p-slashdot.sh
+++ b/tests/mkdir/p-slashdot.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that mkdir -p works with arguments specified with a trailing "/.".
 
-# Copyright (C) 2005-2013 Free Software Foundation, Inc.
+# Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mkdir/p-thru-slink.sh b/tests/mkdir/p-thru-slink.sh
index 510ba39b..a884a386 100755
--- a/tests/mkdir/p-thru-slink.sh
+++ b/tests/mkdir/p-thru-slink.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that mkdir -p foo/bar works when foo is a symbolic link to a directory
 
-# Copyright (C) 2005-2013 Free Software Foundation, Inc.
+# Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mkdir/p-v.sh b/tests/mkdir/p-v.sh
index 665b1a35..a6a51cbc 100755
--- a/tests/mkdir/p-v.sh
+++ b/tests/mkdir/p-v.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test mkdir -pv.
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mkdir/parents.sh b/tests/mkdir/parents.sh
index ef6830e7..786f08f9 100755
--- a/tests/mkdir/parents.sh
+++ b/tests/mkdir/parents.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # make sure mkdir's -p options works properly
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mkdir/perm.sh b/tests/mkdir/perm.sh
index 671f0049..bf0f6a8e 100755
--- a/tests/mkdir/perm.sh
+++ b/tests/mkdir/perm.sh
@@ -2,7 +2,7 @@
 # Verify that mkdir's '-m MODE' option works properly
 # with various umask settings.
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mkdir/restorecon.sh b/tests/mkdir/restorecon.sh
new file mode 100755
index 00000000..14a8b899
--- /dev/null
+++ b/tests/mkdir/restorecon.sh
@@ -0,0 +1,72 @@
+#!/bin/sh
+# test mkdir, mknod, mkfifo -Z
+
+# Copyright (C) 2013-2014 Free Software Foundation, Inc.
+
+# 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 3 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/>.
+
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
+print_ver_ mkdir
+require_selinux_
+
+
+get_selinux_type() { ls -Zd "$1" | sed -n 's/.*:\(.*_t\):.*/\1/p'; }
+
+mkdir subdir || framework_failure_
+chcon 'root:object_r:tmp_t:s0' subdir || framework_failure_
+cd subdir
+
+# --- mkdir -Z ---
+# Since in a tmp_t dir, dirs can be created as user_tmp_t ...
+mkdir standard || framework_failure_
+mkdir restored || framework_failure_
+if restorecon restored 2>/dev/null; then
+  # ... but when restored can be set to user_home_t
+  # So ensure the type for these mkdir -Z cases matches
+  # the directory type as set by restorecon.
+  mkdir -Z single || fail=1
+  # Run these as separate processes in case global context
+  # set for an arg, impacts on another arg
+  for dir in single_p single_p/existing multi/ple; do
+    mkdir -Zp "$dir" || fail=1
+  done
+  restored_type=$(get_selinux_type 'restored')
+  test "$(get_selinux_type 'single')" = "$restored_type" || fail=1
+  test "$(get_selinux_type 'single_p')" = "$restored_type" || fail=1
+  test "$(get_selinux_type 'single_p/existing')" = "$restored_type" || fail=1
+  test "$(get_selinux_type 'multi')" = "$restored_type" || fail=1
+  test "$(get_selinux_type 'multi/ple')" = "$restored_type" || fail=1
+fi
+if test "$fail" = '1'; then
+  ls -UZd standard restored
+  ls -UZd single single_p single_p/existing multi multi/ple
+fi
+
+# --- mknod -Z and mkfifo -Z ---
+# Assume if selinux present that we can create fifos
+for cmd_w_arg in 'mknod' 'mkfifo'; do
+  # In OpenBSD's /bin/sh, mknod is a shell built-in.
+  # Running via "env" ensures we run our program and not the built-in.
+  basename="$cmd_w_arg"
+  test "$basename" = 'mknod' && nt='p' || nt=''
+  env -- $cmd_w_arg $basename $nt || fail=1
+  env -- $cmd_w_arg ${basename}_restore $nt || fail=1
+  if restorecon ${basename}_restore 2>/dev/null; then
+    env -- $cmd_w_arg -Z ${basename}_Z $nt || fail=1
+    restored_type=$(get_selinux_type "${basename}_restore")
+    test "$(get_selinux_type ${basename}_Z)" = "$restored_type" || fail=1
+  fi
+done
+
+Exit $fail
diff --git a/tests/mkdir/selinux.sh b/tests/mkdir/selinux.sh
index e68f77b8..983ceb57 100755
--- a/tests/mkdir/selinux.sh
+++ b/tests/mkdir/selinux.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ensure that an invalid context doesn't cause a segfault
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
@@ -32,7 +32,7 @@ msg="failed to set default file creation context to '$c':"
 for cmd_w_arg in 'mkdir dir' 'mknod b p' 'mkfifo f'; do
   # In OpenBSD's /bin/sh, mknod is a shell built-in.
   # Running via "env" ensures we run our program and not the built-in.
-  env -- $cmd_w_arg -Z $c 2> out && fail=1
+  env -- $cmd_w_arg --context=$c 2> out && fail=1
   set $cmd_w_arg; cmd=$1
   echo "$cmd: $msg" > exp || fail=1
 
diff --git a/tests/mkdir/smack-no-root.sh b/tests/mkdir/smack-no-root.sh
new file mode 100755
index 00000000..527940b3
--- /dev/null
+++ b/tests/mkdir/smack-no-root.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+# SMACK test for the mkdir,mknod, mkfifo commands.
+# Derived from tests/mkdir/selinux.sh.
+# Ensure that an unsettable SMACK label doesn't cause a segfault.
+
+# Copyright (C) 2014 Free Software Foundation, Inc.
+
+# 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 3 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/>.
+
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
+print_ver_ mkdir mkfifo mknod
+
+require_smack_
+
+c=arbitrary-smack-label
+msg="failed to set default file creation context to '$c':"
+
+for cmd in 'mkdir dir' 'mknod b p' 'mkfifo f'; do
+  $cmd --context="$c" 2> out && fail=1
+  set $cmd
+  echo "$1: $msg" > exp || fail=1
+
+  sed -e 's/ Operation not permitted$//' out > k || fail=1
+  mv k out || fail=1
+  compare exp out || fail=1
+done
+
+Exit $fail
diff --git a/tests/misc/id-setgid.sh b/tests/mkdir/smack-root.sh
index f29eec07..8d7ec9b7 100755
--- a/tests/misc/id-setgid.sh
+++ b/tests/mkdir/smack-root.sh
@@ -1,7 +1,9 @@
 #!/bin/sh
-# Verify that id -G prints the right group when run set-GID.
+# SMACK test for the mkdir,mknod, mkfifo commands.
+# Derived from tests/mkdir/selinux.sh.
+# Ensure that SMACK label gets set.
 
-# Copyright (C) 2012-2013 Free Software Foundation, Inc.
+# Copyright (C) 2014 Free Software Foundation, Inc.
 
 # 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
@@ -17,18 +19,18 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
-print_ver_ id
-require_root_
-
-g=$(id -u $NON_ROOT_USERNAME) || framework_failure_
+print_ver_ mkdir mkfifo mknod
 
-# Construct a different group number.
-gp1=$(expr $g + 1)
+require_smack_
+require_root_
 
-echo $gp1 > exp || framework_failure_
+c=arbitrary-smack-label
 
-setuidgid -g $gp1 $NON_ROOT_USERNAME env PATH="$PATH" id -G > out || fail=1
-compare exp out || fail=1
-# With coreutils-8.16 and earlier, id -G would print both: $gp1 $g
+for cmd in 'mkdir dir' 'mknod b p' 'mkfifo f'; do
+  $cmd --context="$c" || { fail=1; continue; }
+  set $cmd
+  ls -dZ $2 > out || fail=1
+  test "$(cut -f1 -d' ' out)" = "$c" || { cat out; fail=1; }
+done
 
 Exit $fail
diff --git a/tests/mkdir/special-1.sh b/tests/mkdir/special-1.sh
index 5557e39d..8c65a757 100755
--- a/tests/mkdir/special-1.sh
+++ b/tests/mkdir/special-1.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # verify that mkdir honors special bits in MODE
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mkdir/t-slash.sh b/tests/mkdir/t-slash.sh
index 15c7d3cc..d9e8d3eb 100755
--- a/tests/mkdir/t-slash.sh
+++ b/tests/mkdir/t-slash.sh
@@ -2,7 +2,7 @@
 # Ensure that mkdir works with arguments specified with and without
 # a trailing slash.
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mkdir/writable-under-readonly.sh b/tests/mkdir/writable-under-readonly.sh
index ab467238..e7c4a9ca 100755
--- a/tests/mkdir/writable-under-readonly.sh
+++ b/tests/mkdir/writable-under-readonly.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # FIXME: convert this to a root-only test.
 
-# Copyright (C) 2005-2013 Free Software Foundation, Inc.
+# Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mv/acl.sh b/tests/mv/acl.sh
index 97f5b048..f681f5d0 100755
--- a/tests/mv/acl.sh
+++ b/tests/mv/acl.sh
@@ -2,7 +2,7 @@
 # move files/directories across file system boundaries
 # and make sure acls are preserved
 
-# Copyright (C) 2005-2013 Free Software Foundation, Inc.
+# Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mv/atomic.sh b/tests/mv/atomic.sh
index 0c5393ec..a026bd5b 100755
--- a/tests/mv/atomic.sh
+++ b/tests/mv/atomic.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ensure that mv doesn't first unlink its destination in one particular case
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mv/atomic2.sh b/tests/mv/atomic2.sh
index a98a6518..92a8e436 100755
--- a/tests/mv/atomic2.sh
+++ b/tests/mv/atomic2.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ensure that mv doesn't first unlink a multi-hard-linked destination
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mv/backup-dir.sh b/tests/mv/backup-dir.sh
index f76f3386..682173d4 100755
--- a/tests/mv/backup-dir.sh
+++ b/tests/mv/backup-dir.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure "mv --verbose --backup" works the same for dirs and non-dirs.
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mv/backup-is-src.sh b/tests/mv/backup-is-src.sh
index a0d7a917..4208d91e 100755
--- a/tests/mv/backup-is-src.sh
+++ b/tests/mv/backup-is-src.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Force mv to use the copying code.
 
-# Copyright (C) 1998-2013 Free Software Foundation, Inc.
+# Copyright (C) 1998-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mv/childproof.sh b/tests/mv/childproof.sh
index 4f14aa2e..c212b83d 100755
--- a/tests/mv/childproof.sh
+++ b/tests/mv/childproof.sh
@@ -3,7 +3,7 @@
 # With fileutils-4.1 and earlier, this test would fail for cp and mv.
 # With coreutils-6.9 and earlier, this test would fail for ln.
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mv/diag.sh b/tests/mv/diag.sh
index ecac8529..b38fb18c 100755
--- a/tests/mv/diag.sh
+++ b/tests/mv/diag.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # make sure we get proper diagnostics: e.g., with --target-dir=d but no args
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mv/dir-file.sh b/tests/mv/dir-file.sh
index 6f655752..bb32f356 100755
--- a/tests/mv/dir-file.sh
+++ b/tests/mv/dir-file.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # mv must fail when src and dest are mismatched directory/non-directory.
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mv/dir2dir.sh b/tests/mv/dir2dir.sh
index 17c5b33e..7a8f7fd3 100755
--- a/tests/mv/dir2dir.sh
+++ b/tests/mv/dir2dir.sh
@@ -2,7 +2,7 @@
 # Ensure that mv prints the right diagnostic for a dir->dir move
 # where the destination directory is not empty.
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mv/dup-source.sh b/tests/mv/dup-source.sh
index 76efbb98..d3b56c5e 100755
--- a/tests/mv/dup-source.sh
+++ b/tests/mv/dup-source.sh
@@ -4,7 +4,7 @@
 # made this fail:  cp a a d/
 # Ensure that mv fails with a similar command.
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mv/force.sh b/tests/mv/force.sh
index 4b435dd8..05adabc5 100755
--- a/tests/mv/force.sh
+++ b/tests/mv/force.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # move a file onto itself
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mv/hard-2.sh b/tests/mv/hard-2.sh
index 4fa1d78f..0b2880a2 100755
--- a/tests/mv/hard-2.sh
+++ b/tests/mv/hard-2.sh
@@ -2,7 +2,7 @@
 # Ensure that moving hard-linked arguments onto existing destinations works.
 # Likewise when using cp --preserve=link.
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mv/hard-3.sh b/tests/mv/hard-3.sh
index c40a7081..a3acd1a6 100755
--- a/tests/mv/hard-3.sh
+++ b/tests/mv/hard-3.sh
@@ -2,7 +2,7 @@
 # Ensure that using 'cp --preserve=link' to copy hard-linked arguments
 # onto existing destinations works, even when one of the link operations fails.
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mv/hard-4.sh b/tests/mv/hard-4.sh
index f74b1ec7..d518e3bc 100755
--- a/tests/mv/hard-4.sh
+++ b/tests/mv/hard-4.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ensure that mv removes a in this case: touch a; ln a b; mv a b
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mv/hard-link-1.sh b/tests/mv/hard-link-1.sh
index 9468e91f..fdf355a3 100755
--- a/tests/mv/hard-link-1.sh
+++ b/tests/mv/hard-link-1.sh
@@ -2,7 +2,7 @@
 # move a directory containing hard-linked files and
 # make sure the links are preserved
 
-# Copyright (C) 1998-2013 Free Software Foundation, Inc.
+# Copyright (C) 1998-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mv/hard-verbose.sh b/tests/mv/hard-verbose.sh
index 6672ae7c..45491ab0 100755
--- a/tests/mv/hard-verbose.sh
+++ b/tests/mv/hard-verbose.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ensure that mv's --verbose options works even in this unusual case
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mv/i-1.pl b/tests/mv/i-1.pl
index dfa6c515..84902ee2 100755
--- a/tests/mv/i-1.pl
+++ b/tests/mv/i-1.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Make sure a 'n' reply to 'mv -i...' aborts the move operation.
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mv/i-2.sh b/tests/mv/i-2.sh
index adf87263..4202b5c5 100755
--- a/tests/mv/i-2.sh
+++ b/tests/mv/i-2.sh
@@ -2,7 +2,7 @@
 # Test both cp and mv for their behavior with -if and -fi
 # The standards (POSIX and SuS) dictate annoyingly inconsistent behavior.
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
@@ -36,7 +36,7 @@ cp -if e f < y > out 2>&1 || fail=1
 
 # Make sure out contains the prompt.
 case "$(cat out)" in
-  "cp: try to overwrite 'f', overriding mode 0000 (---------)?"*) ;;
+  "cp: replace 'f', overriding mode 0000 (---------)?"*) ;;
   *) fail=1 ;;
 esac
 
diff --git a/tests/mv/i-3.sh b/tests/mv/i-3.sh
index 9f66edc6..8c58d5d3 100755
--- a/tests/mv/i-3.sh
+++ b/tests/mv/i-3.sh
@@ -2,7 +2,7 @@
 # Make sure that 'mv file unwritable-file' prompts the user
 # and that 'mv -f file unwritable-file' doesn't.
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
 # 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
@@ -46,13 +46,13 @@ check_overwrite_prompt()
 {
   local delay="$1"
   case "$(cat out)" in
-    "mv: try to overwrite 'g', overriding mode 0000"*) ;;
+    "mv: replace 'g', overriding mode 0000"*) ;;
     *) sleep $delay; return 1;;
   esac
 }
 
 # Wait for up to 12.7 seconds for the expected prompt.
-retry_delay_ check_overwrite_prompt .1 7 || fail=1
+retry_delay_ check_overwrite_prompt .1 7 || { fail=1; cat out; }
 
 kill $pid
 
diff --git a/tests/mv/i-4.sh b/tests/mv/i-4.sh
index 6d54ef7b..b366bc46 100755
--- a/tests/mv/i-4.sh
+++ b/tests/mv/i-4.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # make sure 'mv -i a b' does its job with a positive response
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mv/i-5.sh b/tests/mv/i-5.sh
index cb57ca4b..c69f1784 100755
--- a/tests/mv/i-5.sh
+++ b/tests/mv/i-5.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Make sure 'mv -i dir file' prompts before failing.
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mv/i-link-no.sh b/tests/mv/i-link-no.sh
index 38305b74..67a8ff9c 100755
--- a/tests/mv/i-link-no.sh
+++ b/tests/mv/i-link-no.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Show that mv doesn't preserve links to files the user has declined to move.
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mv/into-self-2.sh b/tests/mv/into-self-2.sh
index 4200bbb6..4109d9e6 100755
--- a/tests/mv/into-self-2.sh
+++ b/tests/mv/into-self-2.sh
@@ -3,7 +3,7 @@
 # Consider the case where SRC and DEST are on different
 # partitions and DEST is a symlink to SRC.
 
-# Copyright (C) 1998-2013 Free Software Foundation, Inc.
+# Copyright (C) 1998-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mv/into-self-3.sh b/tests/mv/into-self-3.sh
index 6f224831..52069b88 100755
--- a/tests/mv/into-self-3.sh
+++ b/tests/mv/into-self-3.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # move a directory into itself, with a twist
 
-# Copyright (C) 1998-2013 Free Software Foundation, Inc.
+# Copyright (C) 1998-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mv/into-self-4.sh b/tests/mv/into-self-4.sh
index 7aa5111f..ac78f90b 100755
--- a/tests/mv/into-self-4.sh
+++ b/tests/mv/into-self-4.sh
@@ -2,7 +2,7 @@
 # confirm that 'mv symlink symlink' doesn't remove symlink
 # Based on an example from David Luyer.
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mv/into-self.sh b/tests/mv/into-self.sh
index 38b0809f..76aefa26 100755
--- a/tests/mv/into-self.sh
+++ b/tests/mv/into-self.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Demonstrate how mv fails when it tries to move a directory into itself.
 
-# Copyright (C) 1998-2013 Free Software Foundation, Inc.
+# Copyright (C) 1998-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mv/leak-fd.sh b/tests/mv/leak-fd.sh
index 8d83d6a0..6b81f5cb 100755
--- a/tests/mv/leak-fd.sh
+++ b/tests/mv/leak-fd.sh
@@ -2,7 +2,7 @@
 # Exercise mv's file-descriptor-leak bug, reported against coreutils-5.2.1
 # and fixed (properly) on 2004-10-21.
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mv/mv-n.sh b/tests/mv/mv-n.sh
index d829c63b..30ba35bb 100755
--- a/tests/mv/mv-n.sh
+++ b/tests/mv/mv-n.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test whether mv -n works as documented (not overwrite target).
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mv/mv-special-1.sh b/tests/mv/mv-special-1.sh
index b2a0a19c..34449150 100755
--- a/tests/mv/mv-special-1.sh
+++ b/tests/mv/mv-special-1.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Test "mv" with special files.
 
-# Copyright (C) 1998-2013 Free Software Foundation, Inc.
+# Copyright (C) 1998-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mv/no-target-dir.sh b/tests/mv/no-target-dir.sh
index 55a63109..ac65ff7f 100755
--- a/tests/mv/no-target-dir.sh
+++ b/tests/mv/no-target-dir.sh
@@ -2,7 +2,7 @@
 # ensure that --no-target-directory (-T) works when the destination is
 # an empty directory.
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mv/part-fail.sh b/tests/mv/part-fail.sh
index 08ffadcd..71ee30c0 100755
--- a/tests/mv/part-fail.sh
+++ b/tests/mv/part-fail.sh
@@ -4,7 +4,7 @@
 # This is a bit fragile since it relies on the string used
 # for EPERM: 'permission denied'.
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mv/part-hardlink.sh b/tests/mv/part-hardlink.sh
index cb8e8d22..8eacaabc 100755
--- a/tests/mv/part-hardlink.sh
+++ b/tests/mv/part-hardlink.sh
@@ -4,7 +4,7 @@
 # For additional constraints, see the comment in copy.c.
 # Before coreutils-5.2.1, this test would fail.
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mv/part-rename.sh b/tests/mv/part-rename.sh
index aa2265b1..ba68f6e6 100755
--- a/tests/mv/part-rename.sh
+++ b/tests/mv/part-rename.sh
@@ -1,9 +1,7 @@
 #!/bin/sh
-# Moving a directory specified with a trailing slash from one partition to
-# another, and giving it a different name at the destination would cause mv
-# to get a failed assertion.
+# Test various cases for moving directories across file systems
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
@@ -23,9 +21,37 @@ print_ver_ mv
 cleanup_() { rm -rf "$other_partition_tmpdir"; }
 . "$abs_srcdir/tests/other-fs-tmpdir"
 
+
+# Moving a directory specified with a trailing slash from one partition to
+# another, and giving it a different name at the destination would cause mv
+# to get a failed assertion.
 mkdir foo || framework_failure_
+mv foo/ "$other_partition_tmpdir/bar" || fail=1
 
 
-mv foo/ "$other_partition_tmpdir/bar" || fail=1
+# Moving a non directory from source shouldn't replace empty dir in dest
+touch bar || framework_failure_
+mv bar "$other_partition_tmpdir/" && fail=1
+
+
+# Moving a directory from source shouldn't replace non directory in dest
+mkdir bar2
+touch "$other_partition_tmpdir/bar2"
+mv bar2 "$other_partition_tmpdir/" && fail=1
+
+
+# As per POSIX moving directory from source should replace empty dir in dest
+mkdir bar3
+touch bar3/file
+mkdir "$other_partition_tmpdir/bar3"
+mv bar3 "$other_partition_tmpdir/" || fail=1
+test -e "$other_partition_tmpdir/bar3/file" || fail=1
+
+
+# As per POSIX moving directory from source shouldn't update dir in dest
+mkdir bar3
+touch bar3/file2
+mv bar3 "$other_partition_tmpdir/" && fail=1
+test -e "$other_partition_tmpdir/bar3/file2" && fail=1
 
 Exit $fail
diff --git a/tests/mv/part-symlink.sh b/tests/mv/part-symlink.sh
index 8eb73f2e..9604d873 100755
--- a/tests/mv/part-symlink.sh
+++ b/tests/mv/part-symlink.sh
@@ -2,7 +2,7 @@
 # make sure cp and mv can handle many combinations of local and
 # other-partition regular/symlink'd files.
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
@@ -88,7 +88,8 @@ for copy in cp mv; do
           # Normalize the program name in the error output,
           # remove any site-dependent part of other-partition file name,
           # and put brackets around the output.
-          test -s .err && {
+          test -s .err \
+            && {
             echo ' [' | tr -d '\n'
             sed 's/^[^:][^:]*\(..\):/\1:/;s,'"$other_partition_tmpdir/,," .err |
               tr -d '\n'
diff --git a/tests/mv/partition-perm.sh b/tests/mv/partition-perm.sh
index 7fbd2b23..713988f7 100755
--- a/tests/mv/partition-perm.sh
+++ b/tests/mv/partition-perm.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Make sure permissions are preserved when moving from one partition to another.
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 
 # 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
@@ -21,11 +21,11 @@ print_ver_ mv
 cleanup_() { rm -rf "$other_partition_tmpdir"; }
 . "$abs_srcdir/tests/other-fs-tmpdir"
 
-: > file
-chmod a=rwx file
+> file || framework_failure_
+chmod a=rwx file || framework_failure_
 
 umask 077
-mv file "$other_partition_tmpdir"
+mv file "$other_partition_tmpdir" || framework_failure_
 
 test -f file && fail=1
 test -f "$other_partition_tmpdir/file" || fail=1
diff --git a/tests/mv/perm-1.sh b/tests/mv/perm-1.sh
index 88fbbdd9..2826c61f 100755
--- a/tests/mv/perm-1.sh
+++ b/tests/mv/perm-1.sh
@@ -2,7 +2,7 @@
 # ensure that mv gives one diagnostic, not two, when failing
 # due to lack of permissions
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mv/sticky-to-xpart.sh b/tests/mv/sticky-to-xpart.sh
index b9afc685..e0c99e94 100755
--- a/tests/mv/sticky-to-xpart.sh
+++ b/tests/mv/sticky-to-xpart.sh
@@ -4,7 +4,7 @@
 # mv: cannot remove 'x': Operation not permitted
 # Affects coreutils-6.0-6.9.
 
-# Copyright (C) 2007-2013 Free Software Foundation, Inc.
+# Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
 # 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
@@ -42,7 +42,7 @@ chmod go+x . || framework_failure_
 
 # Ensure that $NON_ROOT_USERNAME can access the required version of mv.
 version=$(
-  setuidgid $NON_ROOT_USERNAME env PATH="$PATH" mv --version |
+  chroot --user=$NON_ROOT_USERNAME / env PATH="$PATH" mv --version |
   sed -n '1s/.* //p'
 )
 case $version in
@@ -50,7 +50,7 @@ case $version in
   *) skip_ "cannot access just-built mv as user $NON_ROOT_USERNAME";;
 esac
 
-setuidgid $NON_ROOT_USERNAME env PATH="$PATH" \
+chroot --user=$NON_ROOT_USERNAME / env PATH="$PATH" \
   mv t/root-owned "$other_partition_tmpdir" 2> out-t && fail=1
 
 # On some systems, we get 'Not owner'.  Convert it.
diff --git a/tests/mv/symlink-onto-hardlink-to-self.sh b/tests/mv/symlink-onto-hardlink-to-self.sh
index 1e2bf817..f3e8ff98 100755
--- a/tests/mv/symlink-onto-hardlink-to-self.sh
+++ b/tests/mv/symlink-onto-hardlink-to-self.sh
@@ -4,7 +4,7 @@
 # but not NetBSD), prior to coreutils-8.16, the mv would successfully perform
 # a no-op.  I.e., surprisingly, mv s1 s2 would succeed, yet fail to remove s1.
 
-# Copyright (C) 2012-2013 Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mv/symlink-onto-hardlink.sh b/tests/mv/symlink-onto-hardlink.sh
index 0e62de7f..5b4dead0 100755
--- a/tests/mv/symlink-onto-hardlink.sh
+++ b/tests/mv/symlink-onto-hardlink.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that mv works with a few symlink-onto-hard-link cases.
 
-# Copyright (C) 2012-2013 Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mv/to-symlink.sh b/tests/mv/to-symlink.sh
index cce4b768..70ca6179 100755
--- a/tests/mv/to-symlink.sh
+++ b/tests/mv/to-symlink.sh
@@ -2,7 +2,7 @@
 # Make sure that the copying code used in an inter-partition
 # move unlinks a destination symlink before opening it.
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mv/trailing-slash.sh b/tests/mv/trailing-slash.sh
index 98a99133..e3225025 100755
--- a/tests/mv/trailing-slash.sh
+++ b/tests/mv/trailing-slash.sh
@@ -4,7 +4,7 @@
 # Also, ensure that "mv dir non-exist-dir/" works.
 # Also, ensure that "cp dir non-exist-dir/" works.
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/mv/update.sh b/tests/mv/update.sh
index 0bc770d8..4c0553a5 100755
--- a/tests/mv/update.sh
+++ b/tests/mv/update.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # make sure --update works as advertised
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
 # 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
@@ -30,7 +30,7 @@ for interactive in '' -i; do
     # With coreutils-6.9 and earlier, using --update with -i would
     # mistakenly elicit a prompt.
     $cp_or_mv $interactive --update old new < /dev/null > out 2>&1 || fail=1
-    test -s out && fail=1
+    compare /dev/null out || fail=1
     case "$(cat new)" in new) ;; *) fail=1 ;; esac
     case "$(cat old)" in old) ;; *) fail=1 ;; esac
   done
diff --git a/tests/other-fs-tmpdir b/tests/other-fs-tmpdir
index c141b9e6..e82058ad 100644
--- a/tests/other-fs-tmpdir
+++ b/tests/other-fs-tmpdir
@@ -4,7 +4,7 @@
 # of the current directory.  If one is found, create a temporary directory
 # inside it.
 
-# Copyright (C) 1998-2013 Free Software Foundation, Inc.
+# Copyright (C) 1998-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/pr/pr-tests.pl b/tests/pr/pr-tests.pl
index 9efd019e..10947ac9 100755
--- a/tests/pr/pr-tests.pl
+++ b/tests/pr/pr-tests.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Test pr.
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/readlink/can-e.sh b/tests/readlink/can-e.sh
index 114e8640..a6415b94 100755
--- a/tests/readlink/can-e.sh
+++ b/tests/readlink/can-e.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # tests for canonicalize-existing mode (readlink -e).
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 
 # 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
@@ -20,7 +20,7 @@
 print_ver_ readlink
 
 pwd=$(pwd)
-my_pwd=$("$abs_top_builddir/src/pwd")
+my_pwd=$(env pwd -P)
 tmp=d
 
 mkdir $tmp || framework_failure_
diff --git a/tests/readlink/can-f.sh b/tests/readlink/can-f.sh
index 2a1021a7..2a980fa8 100755
--- a/tests/readlink/can-f.sh
+++ b/tests/readlink/can-f.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # tests for canonicalize mode (readlink -f).
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 
 # 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
@@ -20,7 +20,7 @@
 print_ver_ readlink
 
 pwd=$(pwd)
-my_pwd=$("$abs_top_builddir/src/pwd")
+my_pwd=$(env pwd -P)
 tmp=d
 
 mkdir $tmp || framework_failure_
diff --git a/tests/readlink/can-m.sh b/tests/readlink/can-m.sh
index ae498bdd..768c552b 100755
--- a/tests/readlink/can-m.sh
+++ b/tests/readlink/can-m.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # tests for canonicalize-missing mode (readlink -m).
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 
 # 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
@@ -20,7 +20,7 @@
 print_ver_ readlink
 
 pwd=$(pwd)
-my_pwd=$("$abs_top_builddir/src/pwd")
+my_pwd=$(env pwd -P)
 tmp=d
 
 mkdir $tmp || framework_failure_
diff --git a/tests/readlink/multi.sh b/tests/readlink/multi.sh
index 3b915443..e4878ecc 100755
--- a/tests/readlink/multi.sh
+++ b/tests/readlink/multi.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # test multiple argument handling.
 
-# Copyright (C) 2012-2013 Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
 # 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
@@ -40,7 +40,7 @@ compare exp out || fail=1
 # Note the edge case that the last xargs run may not have a delimiter
 rm out || framework_failure_
 printf '/1\0/1\0/1' > exp || framework_failure_
-printf '/1 /1 /1' | xargs -n2 readlink -n -m --zero >> out || fail=1
+printf '/1 /1 /1 ' | xargs -n2 readlink -n -m --zero >> out || fail=1
 compare exp out || fail=1
 
 Exit $fail
diff --git a/tests/readlink/rl-1.sh b/tests/readlink/rl-1.sh
index 97d5ab3f..ede0a915 100755
--- a/tests/readlink/rl-1.sh
+++ b/tests/readlink/rl-1.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # test for readlink mode.
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rm/cycle.sh b/tests/rm/cycle.sh
index 881d84b2..589ee73a 100755
--- a/tests/rm/cycle.sh
+++ b/tests/rm/cycle.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # rm (coreutils-4.5.4) could be tricked into mistakenly reporting a cycle.
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rm/d-1.sh b/tests/rm/d-1.sh
index cfe38ad5..dd7cfd0f 100755
--- a/tests/rm/d-1.sh
+++ b/tests/rm/d-1.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test "rm --dir --verbose".
 
-# Copyright (C) 2012-2013 Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rm/d-2.sh b/tests/rm/d-2.sh
index 3b8ca664..87fb100c 100755
--- a/tests/rm/d-2.sh
+++ b/tests/rm/d-2.sh
@@ -2,7 +2,7 @@
 # Ensure that 'rm -d dir' (i.e., without --recursive) gives a reasonable
 # diagnostic when failing.
 
-# Copyright (C) 2012-2013 Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rm/d-3.sh b/tests/rm/d-3.sh
index b3bd0b10..646ecd06 100755
--- a/tests/rm/d-3.sh
+++ b/tests/rm/d-3.sh
@@ -2,7 +2,7 @@
 # Ensure that 'rm -d -i dir' (i.e., without --recursive) gives a prompt and
 # then deletes the directory if it is empty
 
-# Copyright (C) 2012-2013 Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rm/dangling-symlink.sh b/tests/rm/dangling-symlink.sh
index 62c66915..1e5cdfa9 100755
--- a/tests/rm/dangling-symlink.sh
+++ b/tests/rm/dangling-symlink.sh
@@ -4,7 +4,7 @@
 # But for fileutils-4.1.9, it would do the former and
 # for fileutils-4.1.10 the latter.
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rm/deep-1.sh b/tests/rm/deep-1.sh
index 5f4b63ef..1f1b307c 100755
--- a/tests/rm/deep-1.sh
+++ b/tests/rm/deep-1.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test "rm" with a deep hierarchy.
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rm/deep-2.sh b/tests/rm/deep-2.sh
index a03cd965..c3ea0856 100755
--- a/tests/rm/deep-2.sh
+++ b/tests/rm/deep-2.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure rm -r DIR does not prompt for very long full relative names in DIR.
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
@@ -25,6 +25,11 @@ require_perl_
 # the offending euidaccess_stat call.
 skip_if_root_
 
+# ecryptfs for example uses some of the file name space
+# for encrypting filenames, so we must check dynamically.
+name_max=$(stat -f -c %l .)
+test "$name_max" -ge '200' || skip_ "NAME_MAX=$name_max is not sufficient"
+
 mkdir x || framework_failure_
 cd x || framework_failure_
 
@@ -41,7 +46,7 @@ echo n > no || framework_failure_
 rm ---presume-input-tty -r x < no > out || fail=1
 
 # expect empty output
-test -s out && fail=1
+compare /dev/null out || fail=1
 
 # the directory must have been removed
 test -d x && fail=1
diff --git a/tests/rm/dir-no-w.sh b/tests/rm/dir-no-w.sh
index da52155c..de9035e9 100755
--- a/tests/rm/dir-no-w.sh
+++ b/tests/rm/dir-no-w.sh
@@ -2,7 +2,7 @@
 # rm (without -r) must give a diagnostic for any directory.
 # It must not prompt, even if that directory is unwritable.
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rm/dir-nonrecur.sh b/tests/rm/dir-nonrecur.sh
index fa3168e8..45956da7 100755
--- a/tests/rm/dir-nonrecur.sh
+++ b/tests/rm/dir-nonrecur.sh
@@ -2,7 +2,7 @@
 # Ensure that 'rm dir' (i.e., without --recursive) gives a reasonable
 # diagnostic when failing.
 
-# Copyright (C) 2005-2013 Free Software Foundation, Inc.
+# Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rm/dot-rel.sh b/tests/rm/dot-rel.sh
index 69956c57..4e1a8ce0 100755
--- a/tests/rm/dot-rel.sh
+++ b/tests/rm/dot-rel.sh
@@ -2,7 +2,7 @@
 # Use rm -r to remove two non-empty dot-relative directories.
 # This would have failed between 2004-10-18 and 2004-10-21.
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rm/empty-inacc.sh b/tests/rm/empty-inacc.sh
index 78d14155..e3771530 100755
--- a/tests/rm/empty-inacc.sh
+++ b/tests/rm/empty-inacc.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that rm -rf removes an empty-and-inaccessible directory.
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rm/empty-name.pl b/tests/rm/empty-name.pl
index 4c94ebc0..b6ee6ad5 100755
--- a/tests/rm/empty-name.pl
+++ b/tests/rm/empty-name.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Make sure that rm -r '' fails.
 
-# Copyright (C) 1998-2013 Free Software Foundation, Inc.
+# Copyright (C) 1998-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rm/ext3-perf.sh b/tests/rm/ext3-perf.sh
index e24c8098..ef4fee46 100755
--- a/tests/rm/ext3-perf.sh
+++ b/tests/rm/ext3-perf.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ensure that "rm -rf DIR-with-many-entries" is not O(N^2)
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rm/f-1.sh b/tests/rm/f-1.sh
index 7837580f..0fc95c4f 100755
--- a/tests/rm/f-1.sh
+++ b/tests/rm/f-1.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test "rm -f" with a nonexistent file.
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rm/fail-2eperm.sh b/tests/rm/fail-2eperm.sh
index 0f1a4fa5..6e8ce9ba 100755
--- a/tests/rm/fail-2eperm.sh
+++ b/tests/rm/fail-2eperm.sh
@@ -2,7 +2,7 @@
 # Like fail-eperm, but the failure must be for a file encountered
 # while trying to remove the containing directory with the sticky bit set.
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
@@ -32,14 +32,14 @@ touch a/b || framework_failure_
 # Try to ensure that $NON_ROOT_USERNAME can access
 # the required version of rm.
 rm_version=$(
-  setuidgid $NON_ROOT_USERNAME env PATH="$PATH" rm --version |
+  chroot --user=$NON_ROOT_USERNAME / env PATH="$PATH" rm --version |
   sed -n '1s/.* //p'
 )
 case $rm_version in
   $PACKAGE_VERSION) ;;
   *) skip_ "cannot access just-built rm as user $NON_ROOT_USERNAME";;
 esac
-setuidgid $NON_ROOT_USERNAME env PATH="$PATH" rm -rf a 2> out-t && fail=1
+chroot --user=$NON_ROOT_USERNAME / env PATH="$PATH" rm -rf a 2> out-t && fail=1
 
 # On some systems, we get 'Not owner'.  Convert it.
 # On other systems (HPUX), we get 'Permission denied'.  Convert it, too.
diff --git a/tests/rm/fail-eacces.sh b/tests/rm/fail-eacces.sh
index 2167a047..dd31ea4c 100755
--- a/tests/rm/fail-eacces.sh
+++ b/tests/rm/fail-eacces.sh
@@ -4,7 +4,7 @@
 # With the symlink, rm from coreutils-6.9 would fail with a misleading
 # ELOOP diagnostic.
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rm/fail-eperm.xpl b/tests/rm/fail-eperm.xpl
index fb46445e..b167d0ba 100755
--- a/tests/rm/fail-eperm.xpl
+++ b/tests/rm/fail-eperm.xpl
@@ -2,7 +2,7 @@
 # Ensure that rm gives the expected diagnostic when failing to remove a file
 # owned by some other user in a directory with the sticky bit set.
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rm/hash.sh b/tests/rm/hash.sh
index e10879b8..6bc82bdc 100755
--- a/tests/rm/hash.sh
+++ b/tests/rm/hash.sh
@@ -3,7 +3,7 @@
 # Before then, rm would fail occasionally, sometimes via
 # a failed assertion, others with a seg fault.
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rm/i-1.sh b/tests/rm/i-1.sh
index 32aba21d..6a4ca64b 100755
--- a/tests/rm/i-1.sh
+++ b/tests/rm/i-1.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test "rm -i".
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rm/i-never.sh b/tests/rm/i-never.sh
index fc4e9412..6302174a 100755
--- a/tests/rm/i-never.sh
+++ b/tests/rm/i-never.sh
@@ -2,7 +2,7 @@
 # Ensure that rm --interactive=never works does not prompt, even for
 # an unwritable file.
 
-# Copyright (C) 2007-2013 Free Software Foundation, Inc.
+# Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rm/i-no-r.sh b/tests/rm/i-no-r.sh
index 4304f051..8a535faf 100755
--- a/tests/rm/i-no-r.sh
+++ b/tests/rm/i-no-r.sh
@@ -3,7 +3,7 @@
 # recurse into directory DIR.  rm -i (without -r) must fail in that case.
 # Fixed in coreutils-4.5.2.
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rm/ignorable.sh b/tests/rm/ignorable.sh
index 645982c5..8d656eea 100755
--- a/tests/rm/ignorable.sh
+++ b/tests/rm/ignorable.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that rm -f existing-non-dir/anything exits successfully
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rm/inaccessible.sh b/tests/rm/inaccessible.sh
index 9408a18b..e3c48dfe 100755
--- a/tests/rm/inaccessible.sh
+++ b/tests/rm/inaccessible.sh
@@ -2,7 +2,7 @@
 # Ensure that rm works even when run from a directory
 # for which the user has no access at all.
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rm/interactive-always.sh b/tests/rm/interactive-always.sh
index 1dfb5a69..627d923e 100755
--- a/tests/rm/interactive-always.sh
+++ b/tests/rm/interactive-always.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test the --interactive[=WHEN] changes added to coreutils 6.0
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
@@ -72,13 +72,13 @@ no WHEN
 WHEN=never
 .
 WHEN=once
-rm: remove all arguments recursively? .
+rm: remove 2 arguments recursively? .
 WHEN=always
 @remove_empty 'file4-1'? @remove_empty 'file4-2'? .
 -f overrides --interactive
 .
 --interactive overrides -f
-rm: remove all arguments recursively? .
+rm: remove 1 argument recursively? .
 EOF
 
 compare expout out || fail=1
diff --git a/tests/rm/interactive-once.sh b/tests/rm/interactive-once.sh
index d138b752..db10bba6 100755
--- a/tests/rm/interactive-once.sh
+++ b/tests/rm/interactive-once.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test the -I option added to coreutils 6.0
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
@@ -30,19 +30,36 @@ rm -f out err || framework_failure_
 # The prompt has a trailing space, and no newline, so an extra
 # 'echo .' is inserted after each rm to make it obvious what was asked.
 
-echo 'one file, no recursion' > err || fail=1
+echo 'one file, no recursion' > err || framework_failure_
 rm -I file1-* < in-n >> out 2>> err || fail=1
 echo . >> err || fail=1
 test -f file1-1 && fail=1
 
-echo 'three files, no recursion' >> err || fail=1
+echo 'one file, read only, answer no' >> err || framework_failure_
+if ls /dev/stdin >/dev/null 2>&1; then
+  touch file1-1 || framework_failure_
+  chmod a-w file1-1 || framework_failure_
+  if ! test -w file1-1; then
+    # root won't get prompted
+    write_prot_msg1="rm: remove write-protected regular empty file 'file1-1'? "
+  fi
+  rm ---presume-input-tty -I file1-* < in-n >> out 2>> err || fail=1
+  echo . >> err || fail=1
+  if test "$write_prot_msg1"; then
+    test -f file1-1 || fail=1
+  fi
+else
+  echo '.' >> err || framework_failure_
+fi
+
+echo 'three files, no recursion' >> err || framework_failure_
 rm -I file2-* < in-n >> out 2>> err || fail=1
 echo . >> err || fail=1
 test -f file2-1 && fail=1
 test -f file2-2 && fail=1
 test -f file2-3 && fail=1
 
-echo 'four files, no recursion, answer no' >> err || fail=1
+echo 'four files, no recursion, answer no' >> err || framework_failure_
 rm -I file3-* < in-n >> out 2>> err || fail=1
 echo . >> err || fail=1
 test -f file3-1 || fail=1
@@ -50,7 +67,7 @@ test -f file3-2 || fail=1
 test -f file3-3 || fail=1
 test -f file3-4 || fail=1
 
-echo 'four files, no recursion, answer yes' >> err || fail=1
+echo 'four files, no recursion, answer yes' >> err || framework_failure_
 rm -I file3-* < in-y >> out 2>> err || fail=1
 echo . >> err || fail=1
 test -f file3-1 && fail=1
@@ -58,23 +75,45 @@ test -f file3-2 && fail=1
 test -f file3-3 && fail=1
 test -f file3-4 && fail=1
 
-echo 'one file, recursion, answer no' >> err || fail=1
+echo 'four files, no recursion, 1 read only, answer yes no' >> err \
+  || framework_failure_
+if ls /dev/stdin >/dev/null 2>&1; then
+  touch file3-1 file3-2 file3-3 file3-4 || framework_failure_
+  echo non_empty > file3-4 || framework_failure_ # to shorten diagnostic
+  chmod a-w file3-4 || framework_failure_
+  if ! test -w file3-4; then
+    # root won't get prompted
+    write_prot_msg2="rm: remove write-protected regular file 'file3-4'? "
+  fi
+  cat in-y in-n | rm ---presume-input-tty -I file3-* >> out 2>> err || fail=1
+  echo . >> err || fail=1
+  test -f file3-1 && fail=1
+  test -f file3-2 && fail=1
+  test -f file3-3 && fail=1
+  if test "$write_prot_msg2"; then
+    test -f file3-4 || fail=1
+  fi
+else
+  echo 'rm: remove 4 arguments? .' >> err || framework_failure_
+fi
+
+echo 'one file, recursion, answer no' >> err || framework_failure_
 rm -I -R dir1-* < in-n >> out 2>> err || fail=1
 echo . >> err || fail=1
 test -d dir1-1 || fail=1
 
-echo 'one file, recursion, answer yes' >> err || fail=1
+echo 'one file, recursion, answer yes' >> err || framework_failure_
 rm -I -R dir1-* < in-y >> out 2>> err || fail=1
 echo . >> err || fail=1
 test -d dir1-1 && fail=1
 
-echo 'multiple files, recursion, answer no' >> err || fail=1
+echo 'multiple files, recursion, answer no' >> err || framework_failure_
 rm -I -R dir2-* < in-n >> out 2>> err || fail=1
 echo . >> err || fail=1
 test -d dir2-1 || fail=1
 test -d dir2-2 || fail=1
 
-echo 'multiple files, recursion, answer yes' >> err || fail=1
+echo 'multiple files, recursion, answer yes' >> err || framework_failure_
 rm -I -R dir2-* < in-y >> out 2>> err || fail=1
 echo . >> err || fail=1
 test -d dir2-1 && fail=1
@@ -82,23 +121,27 @@ test -d dir2-2 && fail=1
 
 cat <<\EOF > expout || fail=1
 EOF
-cat <<\EOF > experr || fail=1
+cat <<EOF > experr || fail=1
 one file, no recursion
 .
+one file, read only, answer no
+$write_prot_msg1.
 three files, no recursion
 .
 four files, no recursion, answer no
-rm: remove all arguments? .
+rm: remove 4 arguments? .
 four files, no recursion, answer yes
-rm: remove all arguments? .
+rm: remove 4 arguments? .
+four files, no recursion, 1 read only, answer yes no
+rm: remove 4 arguments? $write_prot_msg2.
 one file, recursion, answer no
-rm: remove all arguments recursively? .
+rm: remove 1 argument recursively? .
 one file, recursion, answer yes
-rm: remove all arguments recursively? .
+rm: remove 1 argument recursively? .
 multiple files, recursion, answer no
-rm: remove all arguments recursively? .
+rm: remove 2 arguments recursively? .
 multiple files, recursion, answer yes
-rm: remove all arguments recursively? .
+rm: remove 2 arguments recursively? .
 EOF
 
 compare expout out || fail=1
diff --git a/tests/rm/ir-1.sh b/tests/rm/ir-1.sh
index f2068fd6..86a5595f 100755
--- a/tests/rm/ir-1.sh
+++ b/tests/rm/ir-1.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test "rm -ir".
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rm/isatty.sh b/tests/rm/isatty.sh
index b0d7a06a..0ff8d1fa 100755
--- a/tests/rm/isatty.sh
+++ b/tests/rm/isatty.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Make sure 'chown 0 f; rm f' prompts before removing f.
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rm/many-dir-entries-vs-OOM.sh b/tests/rm/many-dir-entries-vs-OOM.sh
index c867a46e..c45453d7 100755
--- a/tests/rm/many-dir-entries-vs-OOM.sh
+++ b/tests/rm/many-dir-entries-vs-OOM.sh
@@ -2,7 +2,7 @@
 # In coreutils-8.12, rm,du,chmod, etc. would use too much memory
 # when processing a directory with many entries (as in > 100,000).
 
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
 # 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
@@ -19,6 +19,7 @@
 
 . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 print_ver_ rm du chmod
+require_ulimit_v_
 
 expensive_
 
diff --git a/tests/rm/no-give-up.sh b/tests/rm/no-give-up.sh
index 915970d1..41070c9d 100755
--- a/tests/rm/no-give-up.sh
+++ b/tests/rm/no-give-up.sh
@@ -2,7 +2,7 @@
 # With rm from coreutils-5.2.1 and earlier, 'rm -r' would mistakenly
 # give up too early under some conditions.
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 
 # 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
@@ -30,7 +30,8 @@ chmod go=x . || framework_failure_
 
 
 # This must fail, since '.' is not writable by $NON_ROOT_USERNAME.
-setuidgid $NON_ROOT_USERNAME env PATH="$PATH" rm -rf d 2>/dev/null && fail=1
+chroot --user=$NON_ROOT_USERNAME / env PATH="$PATH" \
+  rm -rf d 2>/dev/null && fail=1
 
 # d must remain.
 test -d d || fail=1
diff --git a/tests/rm/one-file-system.sh b/tests/rm/one-file-system.sh
index 54a81892..09a0464b 100755
--- a/tests/rm/one-file-system.sh
+++ b/tests/rm/one-file-system.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Demonstrate rm's new --one-file-system option.
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rm/one-file-system2.sh b/tests/rm/one-file-system2.sh
index 94bf442e..e4e8a417 100755
--- a/tests/rm/one-file-system2.sh
+++ b/tests/rm/one-file-system2.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Verify --one-file-system does delete within a file system
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rm/r-1.sh b/tests/rm/r-1.sh
index 362e6adb..6e1d6089 100755
--- a/tests/rm/r-1.sh
+++ b/tests/rm/r-1.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test "rm -r --verbose".
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rm/r-2.sh b/tests/rm/r-2.sh
index 34c9f282..a8049bd2 100755
--- a/tests/rm/r-2.sh
+++ b/tests/rm/r-2.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test "rm -r --verbose".
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rm/r-3.sh b/tests/rm/r-3.sh
index 91e80516..82c35bed 100755
--- a/tests/rm/r-3.sh
+++ b/tests/rm/r-3.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Create and remove a directory with more than 254 files.
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rm/r-4.sh b/tests/rm/r-4.sh
index 94702a6d..095f1516 100755
--- a/tests/rm/r-4.sh
+++ b/tests/rm/r-4.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Try to remove '.' and '..' recursively.
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
@@ -22,11 +22,26 @@ print_ver_ rm
 mkdir d || framework_failure_
 touch d/a || framework_failure_
 
-rm -fr d/. 2>/dev/null && fail=1
-rm -fr d/./ 2>/dev/null && fail=1
-rm -fr d/.//// 2>/dev/null && fail=1
-rm -fr d/.. 2>/dev/null && fail=1
-rm -fr d/../ 2>/dev/null && fail=1
+# Expected error diagnostic as grep pattern.
+exp="^rm: refusing to remove '\.' or '\.\.' directory: skipping '.*'\$"
+
+rmtest()
+{
+  # Try removing - expecting failure.
+  rm -fr "$1" 2> err && fail=1
+
+  # Ensure the expected error diagnostic is output.
+  grep "$exp" err || { cat err; fail=1; }
+
+  return $fail
+}
+
+rmtest 'd/.'     || fail=1
+rmtest 'd/./'    || fail=1
+rmtest 'd/.////' || fail=1
+rmtest 'd/..'    || fail=1
+rmtest 'd/../'   || fail=1
+
 
 # This test is too dangerous -- if there's a bug you're wiped out!
 # rm -fr / 2>/dev/null && fail=1
diff --git a/tests/rm/r-root.sh b/tests/rm/r-root.sh
new file mode 100755
index 00000000..e17b85bd
--- /dev/null
+++ b/tests/rm/r-root.sh
@@ -0,0 +1,256 @@
+#!/bin/sh
+# Try to remove '/' recursively.
+
+# Copyright (C) 2013-2014 Free Software Foundation, Inc.
+
+# 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 3 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/>.
+
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
+print_ver_ rm
+
+# POSIX mandates rm(1) to skip '/' arguments.  This test verifies this mandated
+# behavior as well as the --preserve-root and --no-preserve-root options.
+# Especially the latter case is a live fire exercise as rm(1) is supposed to
+# enter the unlinkat() system call.  Therefore, limit the risk as much
+# as possible -- if there's a bug this test would wipe the system out!
+
+# Faint-hearted: skip this test for the 'root' user.
+skip_if_root_
+
+# Pull the teeth from rm(1) by intercepting the unlinkat() system call via the
+# LD_PRELOAD environment variable.  This requires shared libraries to work.
+require_gcc_shared_
+
+# This isn't terribly expensive, but it must not be run under heavy load.
+# The reason is the conservative 'timeout' setting below to limit possible
+# damage in the worst case which yields a race under heavy load.
+# Marking this test as "expensive" therefore is a compromise, i.e., adding
+# this test to the list ensures it still gets _some_ (albeit minimal)
+# coverage while not causing false-positive failures in day to day runs.
+expensive_
+
+cat > k.c <<'EOF' || framework_failure_
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+int unlinkat (int dirfd, const char *pathname, int flags)
+{
+  /* Prove that LD_PRELOAD works: create the evidence file "x".  */
+  fclose (fopen ("x", "w"));
+
+  /* Immediately terminate, unless indicated otherwise.  */
+  if (! getenv("CU_TEST_SKIP_EXIT"))
+    _exit (0);
+
+  /* Pretend success.  */
+  return 0;
+}
+EOF
+
+# Then compile/link it:
+gcc_shared_ k.c k.so \
+  || framework_failure_ 'failed to build shared library'
+
+#-------------------------------------------------------------------------------
+# exercise_rm_r_root: shell function to test "rm -r '/'"
+# The caller must provide the FILE to remove as well as any options
+# which should be passed to 'rm'.
+# Paranoia mode on:
+# For the worst case where both rm(1) would fail to refuse to process the "/"
+# argument (in the cases without the --no-preserve-root option), and
+# intercepting the unlinkat(1) system call would fail (which actually already
+# has been proven to work above), and the current non root user has
+# write access to "/", limit the damage to the current file system via
+# the --one-file-system option.
+# Furthermore, run rm(1) via timeout(1) that kills that process after
+# a maximum of 2 seconds.
+exercise_rm_r_root ()
+{
+  # Remove the evidence file "x"; verify that.
+  rm -f x   || framework_failure_
+  test -f x && framework_failure_
+
+  local skip_exit=
+  if [ "$CU_TEST_SKIP_EXIT" = 1 ]; then
+    # Pass on this variable into 'rm's environment.
+    skip_exit='CU_TEST_SKIP_EXIT=1'
+  fi
+
+  timeout --signal=KILL 2 \
+    env LD_PRELOAD=./k.so $skip_exit \
+      rm -rv --one-file-system "$@" > out 2> err
+
+  return $?
+}
+
+# Verify that "rm -r dir" basically works.
+mkdir   dir || framework_failure_
+rm -r   dir || framework_failure_
+test -d dir && framework_failure_
+
+# Now verify that intercepting unlinkat() works:
+# rm(1) must succeed as before, but this time both the evidence file "x"
+# and the test file / directory must still exist afterward.
+mkdir dir || framework_failure_
+> file    || framework_failure_
+
+skip=
+for file in dir file ; do
+  exercise_rm_r_root "$file" || skip=1
+  test -e "$file"            || skip=1
+  test -f x                  || skip=1
+
+  test $skip = 1 \
+    && { cat out; cat err; \
+         skip_ "internal test failure: maybe LD_PRELOAD doesn't work?"; }
+done
+
+# "rm -r /" without --no-preserve-root should output the following
+# diagnostic error message.
+cat <<EOD > exp || framework_failure_
+rm: it is dangerous to operate recursively on '/'
+rm: use --no-preserve-root to override this failsafe
+EOD
+
+#-------------------------------------------------------------------------------
+# Exercise "rm -r /" without and with the --preserve-root option.
+# Exercise various synonyms of "/" including symlinks to it.
+# Expect a non-Zero exit status.
+# Prepare a few symlinks to "/".
+ln -s /        rootlink  || framework_failure_
+ln -s rootlink rootlink2 || framework_failure_
+ln -sr /       rootlink3 || framework_failure_
+
+for opts in           \
+  '/'                 \
+  '--preserve-root /' \
+  '//'                \
+  '///'               \
+  '////'              \
+  'rootlink/'         \
+  'rootlink2/'        \
+  'rootlink3/'        ; do
+
+  exercise_rm_r_root $opts \
+    && fail=1
+
+  # For some of the synonyms, the error diagnostic slightly differs from that
+  # of the basic "/" case (see gnulib's fts_open' and ROOT_DEV_INO_WARN):
+  #   rm: it is dangerous to operate recursively on 'FILE' (same as '/')
+  # Strip that part off for the following comparison.
+  sed "s/\(rm: it is dangerous to operate recursively on\).*$/\1 '\/'/" err \
+    > err2 || framework_failure_
+
+  # Expect nothing in 'out' and the above error diagnostic in 'err2'.
+  # As rm(1) should have skipped the "/" argument, it does not call unlinkat().
+  # Therefore, the evidence file "x" should not exist.
+  compare /dev/null out  || fail=1
+  compare exp       err2 || fail=1
+  test -f x              && fail=1
+
+  # Do nothing more if this test failed.
+  test $fail = 1 && { cat out; cat err; Exit $fail; }
+done
+
+#-------------------------------------------------------------------------------
+# Exercise "rm -r file1 / file2".
+# Expect a non-Zero exit status representing failure to remove "/",
+# yet 'file1' and 'file2' should be removed.
+> file1 || framework_failure_
+> file2 || framework_failure_
+
+# Now that we know that 'rm' won't call the unlinkat() system function for "/",
+# we could probably execute it without the LD_PRELOAD'ed safety net.
+# Nevertheless, it's still better to use it for this test.
+# Tell the unlinkat() replacement function to not _exit(0) immediately
+# by setting the following variable.
+CU_TEST_SKIP_EXIT=1
+
+exercise_rm_r_root --preserve-root file1 '/' file2 \
+  && fail=1
+
+unset CU_TEST_SKIP_EXIT
+
+cat <<EOD > out_removed
+removed 'file1'
+removed 'file2'
+EOD
+
+# The above error diagnostic should appear in 'err'.
+# Both 'file1' and 'file2' should be removed.  Simply verify that in the
+# "out" file, as the replacement unlinkat() dummy did not remove them.
+# Expect the evidence file "x" to exist.
+compare out_removed out || fail=1
+compare exp         err || fail=1
+test -f x               || fail=1
+
+# Do nothing more if this test failed.
+test $fail = 1 && { cat out; cat err; Exit $fail; }
+
+#-------------------------------------------------------------------------------
+# Exercise various synonyms of "/" having a trailing "." or ".." in the name.
+# This triggers another check in the code first and therefore leads to a
+# different diagnostic.  However, we want to test anyway to protect against
+# future reordering of the checks in the code.
+# Expect that other error diagnostic in 'err' and nothing in 'out'.
+# Expect a non-Zero exit status.  The evidence file "x" should not exist.
+for file in      \
+  '//.'          \
+  '/./'          \
+  '/.//'         \
+  '/../'         \
+  '/.././'       \
+  '/etc/..'      \
+  'rootlink/..'  \
+  'rootlink2/.'  \
+  'rootlink3/./' ; do
+
+  test -d "$file" || continue   # if e.g. /etc does not exist.
+
+  exercise_rm_r_root --preserve-root "$file" \
+    && fail=1
+
+  grep "^rm: refusing to remove '\.' or '\.\.' directory: skipping" err \
+    || fail=1
+
+  compare /dev/null out  || fail=1
+  test -f x              && fail=1
+
+  # Do nothing more if this test failed.
+  test $fail = 1 && { cat out; cat err; Exit $fail; }
+done
+
+#-------------------------------------------------------------------------------
+# Until now, it was all just fun.
+# Now exercise the --no-preserve-root option with which rm(1) should enter
+# the intercepted unlinkat() system call.
+# As the interception code terminates the process immediately via _exit(0),
+# the exit status should be 0.
+# Use the option --interactive=never to bypass the following prompt:
+#   "rm: descend into write-protected directory '/'?"
+exercise_rm_r_root  --interactive=never --no-preserve-root '/' \
+  || fail=1
+
+# The 'err' file should not contain the above error diagnostic.
+grep "^rm: it is dangerous to operate recursively on '/'" err \
+  && fail=1
+
+# Instead, rm(1) should have called the intercepted unlinkat() function,
+# i.e. the evidence file "x" should exist.
+test -f x || fail=1
+
+test $fail = 1 && { cat out; cat err; }
+
+Exit $fail
diff --git a/tests/rm/read-only.sh b/tests/rm/read-only.sh
index dbb3f540..377305cd 100755
--- a/tests/rm/read-only.sh
+++ b/tests/rm/read-only.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that rm -f nonexistent-file-on-read-only-fs succeeds.
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
@@ -42,7 +42,7 @@ test $skip = 1 \
 # Applying rm -f to a nonexistent file on a read-only file system must succeed.
 rm -f mnt/no-such > out 2>&1 || fail=1
 # It must produce no diagnostic.
-test -s out && fail=1
+compare /dev/null out || fail=1
 
 # However, trying to remove an existing file must fail.
 rm -f mnt/f > out 2>&1 && fail=1
diff --git a/tests/rm/readdir-bug.sh b/tests/rm/readdir-bug.sh
index 58d864f9..d54a71c1 100755
--- a/tests/rm/readdir-bug.sh
+++ b/tests/rm/readdir-bug.sh
@@ -2,7 +2,7 @@
 # Exercise the Darwin/MacOS bug worked around on 2006-09-29,
 # whereby rm would fail to remove all entries in a directory.
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rm/rm1.sh b/tests/rm/rm1.sh
index 6c6b865e..575a78dd 100755
--- a/tests/rm/rm1.sh
+++ b/tests/rm/rm1.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # exercise another small part of remove.c
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rm/rm2.sh b/tests/rm/rm2.sh
index df1990ff..93ca66e2 100755
--- a/tests/rm/rm2.sh
+++ b/tests/rm/rm2.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # exercise another small part of remove.c
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rm/rm3.sh b/tests/rm/rm3.sh
index 4b5e6b32..dda27a60 100755
--- a/tests/rm/rm3.sh
+++ b/tests/rm/rm3.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # exercise another small part of remove.c
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rm/rm4.sh b/tests/rm/rm4.sh
index eff2b583..60eb4a78 100755
--- a/tests/rm/rm4.sh
+++ b/tests/rm/rm4.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ensure that 'rm dir' fails without --recursive
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rm/rm5.sh b/tests/rm/rm5.sh
index 3112026f..6ccd6c6b 100755
--- a/tests/rm/rm5.sh
+++ b/tests/rm/rm5.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # a basic test of rm -ri
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rm/sunos-1.sh b/tests/rm/sunos-1.sh
index 7336540f..cc8a02b7 100755
--- a/tests/rm/sunos-1.sh
+++ b/tests/rm/sunos-1.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Make sure that rm -r '' fails.
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rm/unread2.sh b/tests/rm/unread2.sh
index 139f9f00..977d557d 100755
--- a/tests/rm/unread2.sh
+++ b/tests/rm/unread2.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # exercise one small part of remove.c
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rm/unread3.sh b/tests/rm/unread3.sh
index b094ae76..a8df825c 100755
--- a/tests/rm/unread3.sh
+++ b/tests/rm/unread3.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that rm works even from an unreadable working directory.
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rm/unreadable.pl b/tests/rm/unreadable.pl
index 614dcfe9..7f0cd3d6 100755
--- a/tests/rm/unreadable.pl
+++ b/tests/rm/unreadable.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # Test "rm" and unreadable directories.
 
-# Copyright (C) 1998-2013 Free Software Foundation, Inc.
+# Copyright (C) 1998-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rm/v-slash.sh b/tests/rm/v-slash.sh
index b04e2187..69730a19 100755
--- a/tests/rm/v-slash.sh
+++ b/tests/rm/v-slash.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # avoid extra slashes in --verbose output
 
-# Copyright (C) 2007-2013 Free Software Foundation, Inc.
+# Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rmdir/fail-perm.sh b/tests/rmdir/fail-perm.sh
index dea42c7d..1072feef 100755
--- a/tests/rmdir/fail-perm.sh
+++ b/tests/rmdir/fail-perm.sh
@@ -2,7 +2,7 @@
 # For unwritable directory 'd', 'rmdir -p d d/e/f' would emit
 # diagnostics but would not fail.  Fixed in 5.1.2.
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rmdir/ignore.sh b/tests/rmdir/ignore.sh
index 2eb14cc6..487dd9fd 100755
--- a/tests/rmdir/ignore.sh
+++ b/tests/rmdir/ignore.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # make sure rmdir's --ignore-fail-on-non-empty option works
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/rmdir/t-slash.sh b/tests/rmdir/t-slash.sh
index 01e1b518..8d010412 100755
--- a/tests/rmdir/t-slash.sh
+++ b/tests/rmdir/t-slash.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # make sure rmdir -p works on a directory specified with a trailing slash
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/sample-test b/tests/sample-test
index 0bf49487..a6dcc21b 100644
--- a/tests/sample-test
+++ b/tests/sample-test
@@ -1,7 +1,7 @@
 #!/bin/sh
 # FIXME
 
-# Copyright (C) 2013 Free Software Foundation, Inc.
+# Copyright (C) 2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/split/additional-suffix.sh b/tests/split/additional-suffix.sh
index 73fcdc49..7a4d2d7b 100755
--- a/tests/split/additional-suffix.sh
+++ b/tests/split/additional-suffix.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # show that 'split --additional-suffix=SUFFIX' works.
 
-# Copyright (C) 2012-2013 Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/split/b-chunk.sh b/tests/split/b-chunk.sh
index e80699fd..86f95a05 100755
--- a/tests/split/b-chunk.sh
+++ b/tests/split/b-chunk.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # test splitting into 3 chunks
 
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
 # 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
@@ -23,7 +23,7 @@ print_ver_ split
 # in which case no data is extracted, or empty files are written
 split -n 10 /dev/null || fail=1
 test "$(stat -c %s x* | uniq -c | sed 's/^ *//; s/ /x/')" = "10x0" || fail=1
-rm x??
+rm -f x??
 
 # Ensure --elide-empty-files is honored
 split -e -n 10 /dev/null || fail=1
diff --git a/tests/split/fail.sh b/tests/split/fail.sh
index 6272e9b5..33694129 100755
--- a/tests/split/fail.sh
+++ b/tests/split/fail.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # split must fail when given length/count of zero.
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/split/filter.sh b/tests/split/filter.sh
index 3520b7af..fed8c7a4 100755
--- a/tests/split/filter.sh
+++ b/tests/split/filter.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Exercise split's new --filter option.
 
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/split/guard-input.sh b/tests/split/guard-input.sh
index 357ed543..56b3158b 100755
--- a/tests/split/guard-input.sh
+++ b/tests/split/guard-input.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ensure split doesn't overwrite input with output.
 
-# Copyright (C) 2012-2013 Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/split/l-chunk.sh b/tests/split/l-chunk.sh
index 63968d15..792c5569 100755
--- a/tests/split/l-chunk.sh
+++ b/tests/split/l-chunk.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # test splitting into newline delineated chunks (-n l/...)
 
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
 # 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
@@ -71,7 +71,7 @@ DEBUGGING=
 test "$DEBUGGING" && test "$VERBOSE" && set +x
 for ELIDE_EMPTY in '' '-e'; do
   for IO_BLKSIZE in 1 2 5 10 80 100; do
-    : > out
+    > out
     test "$DEBUGGING" && printf "\n---io-blk-size=$IO_BLKSIZE $ELIDE_EMPTY\n"
     for N in 6 8 12 15 22; do
       rm -f x*
@@ -119,15 +119,15 @@ test "$DEBUGGING" && test "$VERBOSE" && set -x
 
 
 # Check extraction of particular chunks
-: > out
+> out
 printf '1\n12345\n' > exp
 split -n l/13/15 in > out
 compare exp out || fail=1
-: > out
+> out
 printf '' > exp
 split -n l/14/15 in > out
 compare exp out || fail=1
-: > out
+> out
 printf '1\n12345\n1\n' > exp
 split -n l/15/15 in > out
 compare exp out || fail=1
diff --git a/tests/split/line-bytes.sh b/tests/split/line-bytes.sh
new file mode 100755
index 00000000..5f6f505b
--- /dev/null
+++ b/tests/split/line-bytes.sh
@@ -0,0 +1,86 @@
+#!/bin/sh
+# test -C, --lines-bytes
+
+# Copyright (C) 2013-2014 Free Software Foundation, Inc.
+
+# 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 3 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/>.
+
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
+print_ver_ split
+require_ulimit_v_
+
+
+# Ensure memory is not allocated up front
+(ulimit -v 20000; split -C 'G' /dev/null) || fail=1
+
+
+# Ensure correct operation with various split and buffer size combinations
+
+lines=\
+1~2222~3~4
+
+printf '%s' "$lines" | tr '~' '\n' > in || framework_failure_
+
+cat <<\EOF > splits_exp
+1 1 1 1 1 1 1 1 1 1
+2 2 2 1 2 1
+2 3 2 2 1
+2 4 3 1
+2 5 3
+2 5 3
+7 3
+7 3
+9 1
+9 1
+10
+EOF
+
+seq 0 9 | tr -d '\n' > no_eol_in
+
+cat <<\EOF > no_eol_splits_exp
+1 1 1 1 1 1 1 1 1 1
+2 2 2 2 2
+3 3 3 1
+4 4 2
+5 5
+6 4
+7 3
+8 2
+9 1
+10
+10
+EOF
+
+for b in $(seq 10); do
+  > splits
+  > no_eol_splits
+  for s in $(seq 11); do
+    rm x??
+    split ---io=$b -C$s in || fail=1
+    cat x* > out || framework_failure_
+    compare in out || fail=1
+    stat -c %s x* | paste -s -d ' ' >> splits
+
+    rm x??
+    split ---io=$b -C$s no_eol_in || fail=1
+    cat x* > out || framework_failure_
+    cat xaa
+    compare no_eol_in out || fail=1
+    stat -c %s x* | paste -s -d ' ' >> no_eol_splits
+  done
+  compare splits_exp splits || fail=1
+  compare no_eol_splits_exp no_eol_splits || fail=1
+done
+
+Exit $fail
diff --git a/tests/split/lines.sh b/tests/split/lines.sh
index d78bc202..09dc8c77 100755
--- a/tests/split/lines.sh
+++ b/tests/split/lines.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # show that 'split --lines=2' works.
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/split/numeric.sh b/tests/split/numeric.sh
index 1fd9b6f5..6467cb7f 100755
--- a/tests/split/numeric.sh
+++ b/tests/split/numeric.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Show that split --numeric-suffixes[=from] works.
 
-# Copyright (C) 2012-2013 Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/split/r-chunk.sh b/tests/split/r-chunk.sh
index f4c4fd22..8a5f221e 100755
--- a/tests/split/r-chunk.sh
+++ b/tests/split/r-chunk.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # test splitting into round-robin chunks
 
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
 # 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
@@ -19,8 +19,6 @@
 . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 print_ver_ split
 
-require_ulimit_
-
 # N can be greater than the file size
 # in which case no data is extracted, or empty files are written
 split -n r/10 /dev/null || fail=1
@@ -34,7 +32,7 @@ stat x?? 2>/dev/null && fail=1
 printf '1\n2\n3\n4\n5\n' > in || framework_failure_
 
 split -n r/3 in > out || fail=1
-test -s out && fail=1
+compare /dev/null out || fail=1
 
 split -n r/1/3 in > r1 || fail=1
 split -n r/2/3 in > r2 || fail=1
diff --git a/tests/split/suffix-auto-length.sh b/tests/split/suffix-auto-length.sh
index 4beab031..40d95af9 100755
--- a/tests/split/suffix-auto-length.sh
+++ b/tests/split/suffix-auto-length.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test the suffix auto widening functionality
 
-# Copyright (C) 2012-2013 Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/split/suffix-length.sh b/tests/split/suffix-length.sh
index 466d8a7c..af5e95ee 100755
--- a/tests/split/suffix-length.sh
+++ b/tests/split/suffix-length.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Show that split -a works.
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/tail-2/F-vs-missing.sh b/tests/tail-2/F-vs-missing.sh
index 0f744042..d47b3022 100755
--- a/tests/tail-2/F-vs-missing.sh
+++ b/tests/tail-2/F-vs-missing.sh
@@ -3,7 +3,7 @@
 # Before coreutils-8.6, tail -F missing/file would not
 # notice any subsequent availability of the missing/file.
 
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/tail-2/F-vs-rename.sh b/tests/tail-2/F-vs-rename.sh
index 4f3ad5eb..3e31ec8c 100755
--- a/tests/tail-2/F-vs-rename.sh
+++ b/tests/tail-2/F-vs-rename.sh
@@ -3,7 +3,7 @@
 # Before coreutils-8.3, tail -F a b would stop tracking additions to b
 # after "mv a b".
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/tail-2/append-only.sh b/tests/tail-2/append-only.sh
index 93d0b323..7414da3e 100755
--- a/tests/tail-2/append-only.sh
+++ b/tests/tail-2/append-only.sh
@@ -2,7 +2,7 @@
 # Ensure that tail -f works on an append-only file
 # Requires root access to do chattr +a, as well as an ext[23] or xfs file system
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/tail-2/assert-2.sh b/tests/tail-2/assert-2.sh
index 13cb3e02..930e422a 100755
--- a/tests/tail-2/assert-2.sh
+++ b/tests/tail-2/assert-2.sh
@@ -3,7 +3,7 @@
 # Due to a race condition in the test, the 'assert' script would get
 # the UMR on Solaris only some of the time, and not at all on Linux/GNU.
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/tail-2/assert.sh b/tests/tail-2/assert.sh
index ee7cec8c..35a10da2 100755
--- a/tests/tail-2/assert.sh
+++ b/tests/tail-2/assert.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test for assertion failure in "test".
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/tail-2/big-4gb.sh b/tests/tail-2/big-4gb.sh
index 4e7463c6..cfd867b7 100755
--- a/tests/tail-2/big-4gb.sh
+++ b/tests/tail-2/big-4gb.sh
@@ -2,7 +2,7 @@
 # Demonstrate a bug in 'tail -cN' when operating on files of size 4G and larger
 # Fixed in coreutils-4.5.2.
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/tail-2/flush-initial.sh b/tests/tail-2/flush-initial.sh
index c9f7f4e7..fd14eae9 100755
--- a/tests/tail-2/flush-initial.sh
+++ b/tests/tail-2/flush-initial.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # inotify-based tail -f didn't flush its initial output before blocking
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/tail-2/follow-name.sh b/tests/tail-2/follow-name.sh
index ba480fee..f70baec3 100755
--- a/tests/tail-2/follow-name.sh
+++ b/tests/tail-2/follow-name.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ensure that --follow=name does not imply --retry
 
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/tail-2/follow-stdin.sh b/tests/tail-2/follow-stdin.sh
index b2ccba35..1769ee2c 100755
--- a/tests/tail-2/follow-stdin.sh
+++ b/tests/tail-2/follow-stdin.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # tail -f - would fail with the initial inotify implementation
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@ timeout 1 tail -f < in > out 2> err
 test $? = 124 || fail=1
 
 # Ensure there was no error output.
-test -s err && fail=1
+compare /dev/null err || fail=1
 
 # Ensure there was
 compare exp out || fail=1
diff --git a/tests/tail-2/infloop-1.sh b/tests/tail-2/infloop-1.sh
index a4afb675..37d081f3 100755
--- a/tests/tail-2/infloop-1.sh
+++ b/tests/tail-2/infloop-1.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # This test would fail with tail from pre-1.22i textutils.
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 
 # 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
@@ -22,7 +22,8 @@ print_ver_ tail
 yes > t &
 yes_pid=$!
 while :; do
-  test -s t && break
+  test -s t \
+    && break
   sleep .1
 done
 tail -n 1 t &
diff --git a/tests/tail-2/inotify-hash-abuse.sh b/tests/tail-2/inotify-hash-abuse.sh
index b9c7f108..6492049d 100755
--- a/tests/tail-2/inotify-hash-abuse.sh
+++ b/tests/tail-2/inotify-hash-abuse.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Exercise an abort-inducing flaw in inotify-enabled tail -F.
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/tail-2/inotify-hash-abuse2.sh b/tests/tail-2/inotify-hash-abuse2.sh
index 7dbefdd3..6018448f 100755
--- a/tests/tail-2/inotify-hash-abuse2.sh
+++ b/tests/tail-2/inotify-hash-abuse2.sh
@@ -2,7 +2,7 @@
 # Exercise an abort-inducing flaw in inotify-enabled tail -F.
 # Like inotify-hash-abuse, but without a hard-coded "9".
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/tail-2/inotify-race.sh b/tests/tail-2/inotify-race.sh
index cc0f61b3..c25f354a 100755
--- a/tests/tail-2/inotify-race.sh
+++ b/tests/tail-2/inotify-race.sh
@@ -5,7 +5,7 @@
 # indefinitely if no *other* data is appended, but it would be printed as
 # soon as any additional appended data is detected.
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
@@ -37,26 +37,30 @@ case $(cat gdb.out) in
     *) skip_ "can't run gdb";;
 esac
 
+break_src="$abs_top_builddir/src/tail.c"
+break_line=$(grep -n ^tail_forever_inotify "$break_src") || framework_failure_
+break_line=$(echo "$break_line" | cut -d: -f1) || framework_failure_
+
 # See if gdb works and
-# tail_forever_inotify is compiled and not inlined
+# tail_forever_inotify is compiled and run
 timeout 10s gdb -nx --batch-silent                 \
-    --eval-command='break tail_forever_inotify'    \
+    --eval-command="break $break_line"             \
     --eval-command='run -f file'                   \
     --eval-command='quit'                          \
-    tail < /dev/null > gdb.out 2>&1
+    tail < /dev/null > gdb.out 2>&1 || skip_ 'breakpoint not hit'
 
 # FIXME: The above is seen to _intermittently_ fail with:
 # warning: .dynamic section for "/lib/libc.so.6" is not at the expected address
 # warning: difference appears to be caused by prelink, adjusting expectations
-test -s gdb.out && { cat gdb.out; skip_ "can't set breakpoints in tail"; }
+compare /dev/null gdb.out || skip_ "can't set breakpoints in tail"
 
 # Run "tail -f file", stopping to append a line just before
 # inotify initialization, and then continue.  Before the fix,
 # that just-appended line would never be output.
 timeout 10s gdb -nx --batch-silent                 \
-    --eval-command='break tail_forever_inotify'    \
+    --eval-command="break $break_line"             \
     --eval-command='run -f file >> tail.out'       \
-    --eval-command="shell echo never-seen-with-tail-7.5 >> file" \
+    --eval-command='shell echo never-seen-with-tail-7.5 >> file' \
     --eval-command='continue'                      \
     --eval-command='quit'                          \
     tail < /dev/null > /dev/null 2>&1 &
diff --git a/tests/tail-2/inotify-rotate.sh b/tests/tail-2/inotify-rotate.sh
index 4a16202d..1c942cc3 100755
--- a/tests/tail-2/inotify-rotate.sh
+++ b/tests/tail-2/inotify-rotate.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ensure that tail -F handles rotation
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
@@ -47,7 +47,7 @@ for i in $(seq 50); do
     # Normally less than a second is required here, but with heavy load
     # and a lot of disk activity, even 20 seconds is insufficient, which
     # leads to this timeout killing tail before the "ok" is written below.
-    :>k && :>x || framework_failure_ failed to initialize files
+    >k && >x || framework_failure_ failed to initialize files
     timeout 40 tail -F k > out 2>&1 &
     pid=$!
     sleep .1
diff --git a/tests/tail-2/pid.sh b/tests/tail-2/pid.sh
index 19e6a18b..ef440818 100755
--- a/tests/tail-2/pid.sh
+++ b/tests/tail-2/pid.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test the --pid option of tail.
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/tail-2/pipe-f.sh b/tests/tail-2/pipe-f.sh
index e0cf3c6d..eaa928fb 100755
--- a/tests/tail-2/pipe-f.sh
+++ b/tests/tail-2/pipe-f.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ensure that :|tail -f doesn't hang, per POSIX
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/tail-2/pipe-f2.sh b/tests/tail-2/pipe-f2.sh
index 63091e39..13ccd0b3 100755
--- a/tests/tail-2/pipe-f2.sh
+++ b/tests/tail-2/pipe-f2.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that "tail -f fifo" tails indefinitely.
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/tail-2/proc-ksyms.sh b/tests/tail-2/proc-ksyms.sh
index 243bb9b9..3f799649 100755
--- a/tests/tail-2/proc-ksyms.sh
+++ b/tests/tail-2/proc-ksyms.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Prior to textutils-2.0.17, 'tail /proc/ksyms' would segfault on Linux.
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/tail-2/retry.sh b/tests/tail-2/retry.sh
new file mode 100755
index 00000000..dbe66a4e
--- /dev/null
+++ b/tests/tail-2/retry.sh
@@ -0,0 +1,114 @@
+#!/bin/sh
+# Exercise tail's behavior regarding missing files with/without --retry.
+
+# Copyright (C) 2013-2014 Free Software Foundation, Inc.
+
+# 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 3 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/>.
+
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
+print_ver_ tail
+
+# Function to check the expected line count in 'out'.
+# Called via retry_delay_().  Sleep some time - see retry_delay_() - if the
+# line count is still smaller than expected.
+wait4lines_ ()
+{
+  local delay=$1
+  local elc=$2   # Expected line count.
+  [ "$( wc -l < out )" -ge "$elc" ] || { sleep $delay; return 1; }
+}
+
+# === Test:
+# Retry without --follow results in a warning.
+touch file
+tail --retry file > out 2>&1 || fail=1
+[ $( wc -l < out ) = 1 ]                     || fail=1
+grep -F 'tail: warning: --retry ignored' out || fail=1
+
+# === Test:
+# The same with a missing file: expect error message and exit 1.
+tail --retry missing > out 2>&1 && fail=1
+[ $( wc -l < out ) = 2 ]                     || fail=1
+grep -F 'tail: warning: --retry ignored' out || fail=1
+
+# === Test:
+# Ensure that "tail --retry --follow=name" waits for the file to appear.
+# Clear 'out' so that we can check its contents without races
+>out                            || framework_failure_
+timeout 10 tail -s.1 --follow=name --retry missing >out 2>&1 & pid=$!
+retry_delay_ wait4lines_ .1 6 1 || fail=1  # Wait for "cannot open" error.
+echo "X" > missing              || fail=1
+retry_delay_ wait4lines_ .1 6 3 || fail=1  # Wait for the expected output.
+kill $pid
+wait $pid
+# Expect 3 lines in the output file.
+[ $( wc -l < out ) = 3 ]   || { fail=1; cat out; }
+grep -F 'cannot open' out  || { fail=1; cat out; }
+grep -F 'has appeared' out || { fail=1; cat out; }
+grep '^X$' out             || { fail=1; cat out; }
+rm -f missing out          || framework_failure_
+
+# === Test:
+# Ensure that "tail --retry --follow=descriptor" waits for the file to appear.
+# tail-8.21 failed at this (since the implementation of the inotify support).
+timeout 10 tail -s.1 --follow=descriptor --retry missing >out 2>&1 & pid=$!
+retry_delay_ wait4lines_ .1 6 2 || fail=1  # Wait for "cannot open" error.
+echo "X" > missing              || fail=1
+retry_delay_ wait4lines_ .1 6 4 || fail=1  # Wait for the expected output.
+kill $pid
+wait $pid
+# Expect 4 lines in the output file.
+[ $( wc -l < out ) = 4 ]   || { fail=1; cat out; }
+grep -F 'retry only effective for the initial open' out \
+                           || { fail=1; cat out; }
+grep -F 'cannot open' out  || { fail=1; cat out; }
+grep -F 'has appeared' out || { fail=1; cat out; }
+grep '^X$' out             || { fail=1; cat out; }
+rm -f missing out          || framework_failure_
+
+# === Test:
+# Ensure that tail --follow=descriptor --retry exits when the file appears
+# untailable. Expect exit status 1.
+timeout 10 tail -s.1 --follow=descriptor --retry missing >out 2>&1 & pid=$!
+retry_delay_ wait4lines_ .1 6 2 || fail=1  # Wait for "cannot open" error.
+mkdir missing                   || fail=1  # Create untailable 'missing'.
+retry_delay_ wait4lines_ .1 6 4 || fail=1  # Wait for the expected output.
+wait $pid
+rc=$?
+[ $( wc -l < out ) = 4 ]                       || { fail=1; cat out; }
+grep -F 'retry only effective for the initial open' out \
+                                               || { fail=1; cat out; }
+grep -F 'cannot open' out                      || { fail=1; cat out; }
+grep -F 'replaced with an untailable file' out || { fail=1; cat out; }
+grep -F 'no files remaining' out               || { fail=1; cat out; }
+[ $rc = 1 ]                                    || { fail=1; cat out; }
+rm -fd missing out                             || framework_failure_
+
+# === Test:
+# Ensure that --follow=descriptor (without --retry) does *not wait* for the
+# file to appear.  Expect 2 lines in the output file ("cannot open" +
+# "no files remaining") and exit status 1.
+tail --follow=descriptor missing >out 2>&1 && fail=1
+[ $( wc -l < out ) = 2 ]         || { fail=1; cat out; }
+grep -F 'cannot open' out        || { fail=1; cat out; }
+grep -F 'no files remaining' out || { fail=1; cat out; }
+
+# === Test:
+# Likewise for --follow=name (without --retry).
+tail --follow=name missing >out 2>&1 && fail=1
+[ $( wc -l < out ) = 2 ]         || { fail=1; cat out; }
+grep -F 'cannot open' out        || { fail=1; cat out; }
+grep -F 'no files remaining' out || { fail=1; cat out; }
+
+Exit $fail
diff --git a/tests/tail-2/start-middle.sh b/tests/tail-2/start-middle.sh
index 67d5b1a9..dbf9bae8 100755
--- a/tests/tail-2/start-middle.sh
+++ b/tests/tail-2/start-middle.sh
@@ -2,7 +2,7 @@
 # Verify that tail works even when it's reading from a file
 # that is not at its beginning.  Based on a report from John Roll.
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/tail-2/symlink.sh b/tests/tail-2/symlink.sh
new file mode 100755
index 00000000..b21f9e15
--- /dev/null
+++ b/tests/tail-2/symlink.sh
@@ -0,0 +1,78 @@
+#!/bin/sh
+# Ensure tail tracks symlinks properly.
+
+# Copyright (C) 2013-2014 Free Software Foundation, Inc.
+
+# 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 3 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/>.
+
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
+print_ver_ tail
+
+# Function to check the expected line count in 'out'.
+# Called via retry_delay_().  Sleep some time - see retry_delay_() - if the
+# line count is still smaller than expected.
+wait4lines_ ()
+{
+  local delay=$1
+  local elc=$2   # Expected line count.
+  [ "$( wc -l < out )" -ge "$elc" ] || { sleep $delay; return 1; }
+}
+
+# Ensure changing targets of cli specified symlinks are handled.
+# Prior to v8.22, inotify would fail to recognize changes in the targets.
+# Clear 'out' so that we can check its contents without races.
+>out                            || framework_failure_
+ln -nsf target symlink          || framework_failure_
+timeout 10 tail -s.1 -F symlink >out 2>&1 & pid=$!
+retry_delay_ wait4lines_ .1 6 1 || fail=1  # Wait for "cannot open..."
+echo "X" > target               || fail=1
+retry_delay_ wait4lines_ .1 6 3 || fail=1  # Wait for the expected output.
+kill $pid
+wait $pid
+# Expect 3 lines in the output file.
+[ $( wc -l < out ) = 3 ]   || { fail=1; cat out; }
+grep -F 'cannot open' out  || { fail=1; cat out; }
+grep -F 'has appeared' out || { fail=1; cat out; }
+grep '^X$' out             || { fail=1; cat out; }
+rm -f target out           || framework_failure_
+
+# Ensure we correctly handle the source symlink itself changing.
+# I.E. that we don't operate solely on the targets.
+# Clear 'out' so that we can check its contents without races.
+>out                            || framework_failure_
+echo "X1" > target1             || framework_failure_
+ln -nsf target1 symlink         || framework_failure_
+timeout 10 tail -s.1 -F symlink >out 2>&1 & pid=$!
+retry_delay_ wait4lines_ .1 6 1 || fail=1  # Wait for the expected output.
+ln -nsf target2 symlink         || framework_failure_
+retry_delay_ wait4lines_ .1 6 2 || fail=1  # Wait for "become inaccess..."
+echo "X2" > target2             || fail=1
+retry_delay_ wait4lines_ .1 6 4 || fail=1  # Wait for the expected output.
+kill $pid
+wait $pid
+# Expect 4 lines in the output file.
+[ $( wc -l < out ) = 4 ]    || { fail=1; cat out; }
+grep -F 'become inacce' out || { fail=1; cat out; }
+grep -F 'has appeared' out  || { fail=1; cat out; }
+grep '^X1$' out             || { fail=1; cat out; }
+grep '^X2$' out             || { fail=1; cat out; }
+rm -f target1 target2 out   || framework_failure_
+
+# Note other symlink edge cases are currently just diagnosed
+# rather than being handled. I.E. if you specify a missing item,
+# or existing file that later change to a symlink, if inotify
+# is in use, you'll get a diagnostic saying that link will
+# no longer be tailed.
+
+Exit $fail
diff --git a/tests/tail-2/tail-n0f.sh b/tests/tail-2/tail-n0f.sh
index a8d37597..1d020ac9 100755
--- a/tests/tail-2/tail-n0f.sh
+++ b/tests/tail-2/tail-n0f.sh
@@ -2,7 +2,7 @@
 # Make sure that 'tail -n0 -f' and 'tail -c0 -f' sleep
 # rather than doing what amounted to a busy-wait.
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
@@ -29,6 +29,11 @@ require_proc_pid_status_
 touch empty || framework_failure_
 echo anything > nonempty || framework_failure_
 
+# First verify that -[nc]0 without -f, exit without reading
+touch unreadable || framework_failure_
+chmod 0 unreadable || framework_failure_
+tail -c0 unreadable || fail=1
+tail -n0 unreadable || fail=1
 
 for inotify in ---disable-inotify ''; do
   for file in empty nonempty; do
diff --git a/tests/tail-2/wait.sh b/tests/tail-2/wait.sh
index 529b9459..3dec55c0 100755
--- a/tests/tail-2/wait.sh
+++ b/tests/tail-2/wait.sh
@@ -2,7 +2,7 @@
 # Make sure that 'tail -f' returns immediately if a file doesn't exist
 # while 'tail -F' waits for it to appear.
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
@@ -51,8 +51,8 @@ for inotify in ---disable-inotify ''; do
 
   grep -Ev 'inotify (resources exhausted|cannot be used)' tail.err > x
   mv x tail.err
-  test -s tail.err && fail=1
-  :>tail.err
+  compare /dev/null tail.err || fail=1
+  >tail.err
 
   tail_F()
   {
diff --git a/tests/touch/60-seconds.sh b/tests/touch/60-seconds.sh
index 3f90fbb2..f0d5b89e 100755
--- a/tests/touch/60-seconds.sh
+++ b/tests/touch/60-seconds.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # touch -t would mistakenly reject a time specifying "60" seconds
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/touch/dangling-symlink.sh b/tests/touch/dangling-symlink.sh
index 0d63edba..9adfd4bd 100755
--- a/tests/touch/dangling-symlink.sh
+++ b/tests/touch/dangling-symlink.sh
@@ -2,7 +2,7 @@
 # Make sure touch can create a file through a dangling symlink.
 # This was broken in the 4.0[e-i] test releases.
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/touch/empty-file.sh b/tests/touch/empty-file.sh
index 6a654839..e6d1b334 100755
--- a/tests/touch/empty-file.sh
+++ b/tests/touch/empty-file.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Make sure touch can set the mtime on an empty file.
 
-# Copyright (C) 1998-2013 Free Software Foundation, Inc.
+# Copyright (C) 1998-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/touch/fail-diag.sh b/tests/touch/fail-diag.sh
index 0be1b6e5..191ec30c 100755
--- a/tests/touch/fail-diag.sh
+++ b/tests/touch/fail-diag.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # make sure touch gives reasonable diagnostics
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/touch/fifo.sh b/tests/touch/fifo.sh
index a67637f5..71ae7791 100755
--- a/tests/touch/fifo.sh
+++ b/tests/touch/fifo.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Make sure touch works on fifos without hanging.
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/touch/no-create-missing.sh b/tests/touch/no-create-missing.sh
index fe60282c..7ce63b1b 100755
--- a/tests/touch/no-create-missing.sh
+++ b/tests/touch/no-create-missing.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that touch -c no-such-file no longer fails (it did in 4.1.8).
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 # 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
@@ -24,13 +24,11 @@ touch -c no-file > /dev/null 2>&1 || fail=1
 touch -cm no-file > /dev/null 2>&1 || fail=1
 touch -ca no-file > /dev/null 2>&1 || fail=1
 
-test="$abs_top_builddir/src/test"
-
 # If >&- works, test "touch -c -" etc.
 # >&- apparently does not work in HP-UX 11.23.
 # This test is ineffective unless /dev/stdout also works.
-if "$test" -w /dev/stdout >/dev/null &&
-   "$test" ! -w /dev/stdout >&-; then
+if env test -w /dev/stdout >/dev/null &&
+   env test ! -w /dev/stdout >&-; then
   touch -c - >&- 2> /dev/null || fail=1
   touch -cm - >&- 2> /dev/null || fail=1
   touch -ca - >&- 2> /dev/null || fail=1
diff --git a/tests/touch/no-dereference.sh b/tests/touch/no-dereference.sh
index c7697782..0f4fdca9 100755
--- a/tests/touch/no-dereference.sh
+++ b/tests/touch/no-dereference.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that touch -h works.
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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
@@ -29,7 +29,7 @@ ln -s file link || framework_failure_
 touch -h no-file 2> err && fail=1
 test -s err || fail=1
 touch -h -c no-file 2> err || fail=1
-test -s err && fail=1
+compare /dev/null err || fail=1
 
 # -h works on regular files
 touch -h file || fail=1
@@ -49,7 +49,7 @@ grep '^#define HAVE_LUTIMES 1' "$CONFIG_HEADER" > /dev/null ||
 touch -h dangling 2> err
 case $? in
   0) test -f nowhere && fail=1
-     test -s err && fail=1;;
+     compare /dev/null err || fail=1;;
   1) grep 'Function not implemented' err \
        && skip_ 'this system lacks the utimensat function'
      fail=1;;
@@ -69,14 +69,12 @@ esac
 # Test interactions with -.
 touch -h - > file || fail=1
 
-test="$abs_top_builddir/src/test"
-
 # If >&- works, test "touch -ch -" etc.
 # >&- apparently does not work in HP-UX 11.23.
 # This test is ineffective unless /dev/stdout also works.
 # If stdout is open, it is not a symlink.
-if "$test" -w /dev/stdout >/dev/null &&
-   "$test" ! -w /dev/stdout >&-; then
+if env test -w /dev/stdout >/dev/null &&
+   env test ! -w /dev/stdout >&-; then
   touch -h - >&- && fail=1
   touch -h -c - >&- || fail=1
 fi
diff --git a/tests/touch/no-rights.sh b/tests/touch/no-rights.sh
index 135810cb..085c8307 100755
--- a/tests/touch/no-rights.sh
+++ b/tests/touch/no-rights.sh
@@ -2,7 +2,7 @@
 # Make sure touch can update the times on a file that is neither
 # readable nor writable.
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/touch/not-owner.sh b/tests/touch/not-owner.sh
index a111ef3a..c822f0b5 100755
--- a/tests/touch/not-owner.sh
+++ b/tests/touch/not-owner.sh
@@ -2,7 +2,7 @@
 # Make sure that touch gives reasonable diagnostics when applied
 # to an unwritable directory owned by some other user.
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/touch/now-owned-by-other.sh b/tests/touch/now-owned-by-other.sh
index 4c88fc94..d01097ed 100755
--- a/tests/touch/now-owned-by-other.sh
+++ b/tests/touch/now-owned-by-other.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Demonstrate that "touch -d now writable-but-owned-by-other" works.
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 # 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
@@ -20,16 +20,15 @@
 print_ver_ touch
 require_root_
 
-group_num=$(id -g $NON_ROOT_USERNAME)
-
 # Create a file owned by root, and writable by $NON_ROOT_USERNAME.
 echo > root-owned || framework_failure_
-chgrp +$group_num . root-owned || framework_failure_
+chgrp +$NON_ROOT_GID . root-owned || framework_failure_
 chmod g+w root-owned
 
 # Ensure that the current directory is searchable by $NON_ROOT_USERNAME.
 chmod g+x .
 
-setuidgid $NON_ROOT_USERNAME env PATH="$PATH" touch -d now root-owned || fail=1
+chroot --user=$NON_ROOT_USERNAME / env PATH="$PATH" \
+  touch -d now root-owned || fail=1
 
 Exit $fail
diff --git a/tests/touch/obsolescent.sh b/tests/touch/obsolescent.sh
index 3f1d9b0f..7dd1418b 100755
--- a/tests/touch/obsolescent.sh
+++ b/tests/touch/obsolescent.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test touch with obsolescent 8- or 10-digit time stamps.
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/touch/read-only.sh b/tests/touch/read-only.sh
index e9f2bd9f..d2397385 100755
--- a/tests/touch/read-only.sh
+++ b/tests/touch/read-only.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ensure that touch can operate on read-only files
 
-# Copyright (C) 2005-2013 Free Software Foundation, Inc.
+# Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
 # 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
@@ -20,7 +20,7 @@
 print_ver_ touch
 skip_if_root_
 
-: > read-only || framework_failure_
+> read-only || framework_failure_
 chmod 444 read-only || framework_failure_
 
 
diff --git a/tests/touch/relative.sh b/tests/touch/relative.sh
index eeb56853..396c2f11 100755
--- a/tests/touch/relative.sh
+++ b/tests/touch/relative.sh
@@ -2,7 +2,7 @@
 # Demonstrate using a combination of --reference and --date to
 # set the time of a file back by an arbitrary amount.
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 
 # 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
diff --git a/tests/touch/trailing-slash.sh b/tests/touch/trailing-slash.sh
index 4dbd2776..7e6eb908 100755
--- a/tests/touch/trailing-slash.sh
+++ b/tests/touch/trailing-slash.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that touch honors trailing slash.
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
 # 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